From f656a9aa5dc1a583690d41e7a39593f42f62fa63 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 24 Jan 2024 15:53:17 +0800 Subject: [PATCH 01/26] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/quality/QcCheckTaskProduceMapper.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml index 5bc7d26b9..84736e09a 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml @@ -160,7 +160,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" qct.supplier_name supplierName, qct.income_time incomeTime, max(qct.create_time) createTime, - qct.check_loc checkLoc + qct.check_loc checkLoc, + qct.product_type productType, + qct.confirm_man_code confirmManCode, + qct.confirm_man_name confirmManName from qc_check_task qct left join pro_order_workorder pow on qct.order_no = pow.workorder_code where check_type = 'checkTypeSCXJ' From 2480f69d9754f740fa6a6db8cd7c326513257244 Mon Sep 17 00:00:00 2001 From: shaoyong Date: Wed, 24 Jan 2024 16:15:59 +0800 Subject: [PATCH 02/26] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E9=A6=96=E6=A3=80=E5=B7=A1=E6=A3=80=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quality/mapper/QcCheckReportIncomeMapper.java | 1 + .../impl/QcCheckReportProduceServiceImpl.java | 8 ++++++++ .../mapper/quality/QcCheckReportIncomeMapper.xml | 13 +++++++++++++ 3 files changed, 22 insertions(+) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckReportIncomeMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckReportIncomeMapper.java index 4d022ac74..c73f47c93 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckReportIncomeMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckReportIncomeMapper.java @@ -81,4 +81,5 @@ public interface QcCheckReportIncomeMapper { QcCheckReportIncome getXJTaskInfo(QcCheckReportIncome qcCheckReportIncome); QcCheckReportIncome getLastXJTaskInfo(QcCheckReportIncome qcCheckReportIncome); + QcCheckTaskProduce getLastProductTypeInfo(QcCheckTaskProduce qcCheckTaskProduce); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java index 69576ee20..02c5a766d 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java @@ -209,6 +209,14 @@ public class QcCheckReportProduceServiceImpl implements IQcCheckReportProduceSer qcStaticTable.setOrderNo(qcCheckTaskProduce.getOrderNo()); List checkInfos = qcStaticTableService.getXJCheckTableDetail(qcStaticTable); produce.setCheckInfos(checkInfos); + QcCheckTaskProduce lastProduce = qcCheckReportIncomeMapper.getLastProductTypeInfo(qcCheckTaskProduce); + if(lastProduce != null ){ + produce.setProductType(lastProduce.getProductType()); + produce.setCheckManCode(lastProduce.getCheckManCode()); + produce.setCheckManName(lastProduce.getCheckManName()); + produce.setConfirmManCode(lastProduce.getConfirmManCode()); + produce.setConfirmManName(lastProduce.getConfirmManName()); + } return produce; } diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml index 10a5874fc..19a6acd6a 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml @@ -217,6 +217,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where c.check_type='checkTypeSCXJ' and c.order_no = #{orderNo} order by c.create_time desc + insert into qc_check_task From 738c21b07c6c616117007726e02171fdf5e5e146 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 24 Jan 2024 17:37:37 +0800 Subject: [PATCH 03/26] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E8=B6=85=E6=97=B6=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quality/mapper/QcStaticTableMapper.java | 2 + .../impl/QcStaticTableServiceImpl.java | 222 +++++++++--------- .../mapper/quality/QcStaticTableMapper.xml | 25 ++ 3 files changed, 138 insertions(+), 111 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java index 7d4cbc8b7..dc9005276 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java @@ -62,4 +62,6 @@ public interface QcStaticTableMapper { List getLocList(); List getWorkcenter(); + @MapKey("recordId") + Map picsMap(QcStaticTable qcStaticTable); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java index 88661d284..afd6424ca 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java @@ -166,202 +166,202 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { public List getXJCheckTableDetail(QcStaticTable qcStaticTable) { List projects = qcStaticTableMapper.getXJProjects(qcStaticTable); Map detailMap = qcStaticTableMapper.getProjectDetail(qcStaticTable); + Map picsMap = qcStaticTableMapper.picsMap(qcStaticTable); for(QcStaticTable project:projects){ - this.getDataFromMap(detailMap,project); + this.getDataFromMap(detailMap,project,picsMap); } - return projects; } - private void getDataFromMap(Map detailMap,QcStaticTable project){ + private void getDataFromMap(Map detailMap,QcStaticTable project,Map picsMap){ String keystr = project.getProjectId()+"08"; QcStaticTable detail = detailMap.get(keystr); - if(detail!=null&&StringUtils.isNotBlank(detail.getRemark())){ - project.setColumn080090(detail.getRemark()); - List files = qmsFileMapper.getBaseFileBatch(detail.getRecordId()); - if (!CollectionUtils.isEmpty(files)) { - List pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList()); - String picurls = pics.stream().collect(Collectors.joining(",")); - project.setColumn080090(project.getColumn080090()+","+picurls); + if(detail!=null) { + if (StringUtils.isNotBlank(detail.getRemark())) { + project.setColumn080090(detail.getRemark()); + } else if (detail != null && StringUtils.isNotBlank(detail.getStatus())) { + project.setColumn080090(detail.getStatus().equals("Y") ? "✓" : "✘"); + } + QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); + if(urlDTO!=null){ + project.setColumn080090(project.getColumn080090()+","+urlDTO.getProjectId());//projectId存的照片路径 } - }else if(detail!=null&&StringUtils.isNotBlank(detail.getStatus())){ - project.setColumn080090(detail.getStatus().equals("Y")?"✓":"✘"); }else{ project.setColumn080090("-"); } keystr = project.getProjectId()+"09"; detail = detailMap.get(keystr); - if(detail!=null && StringUtils.isNotBlank(detail.getRemark())){ - project.setColumn090100(detail.getRemark()); - List files = qmsFileMapper.getBaseFileBatch(detail.getRecordId()); - if (!CollectionUtils.isEmpty(files)) { - List pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList()); - String picurls = pics.stream().collect(Collectors.joining(",")); - project.setColumn090100(project.getColumn090100()+","+picurls); + if(detail!=null){ + if(StringUtils.isNotBlank(detail.getRemark())){ + project.setColumn090100(detail.getRemark()); + }else if(detail!=null&&StringUtils.isNotBlank(detail.getStatus())){ + project.setColumn090100(detail.getStatus().equals("Y")?"✓":"✘"); + } + QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); + if(urlDTO!=null){ + project.setColumn090100(project.getColumn090100()+","+urlDTO.getProjectId());//projectId存的照片路径 } - }else if(detail!=null&&StringUtils.isNotBlank(detail.getStatus())){ - project.setColumn090100(detail.getStatus().equals("Y")?"✓":"✘"); }else{ project.setColumn090100("-"); } keystr = project.getProjectId()+"10"; detail = detailMap.get(keystr); - if(detail!=null && StringUtils.isNotBlank(detail.getRemark())){ - project.setColumn100110(detail.getRemark()); - List files = qmsFileMapper.getBaseFileBatch(detail.getRecordId()); - if (!CollectionUtils.isEmpty(files)) { - List pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList()); - String picurls = pics.stream().collect(Collectors.joining(",")); - project.setColumn100110(project.getColumn100110()+","+picurls); + if(detail!=null){ + if(StringUtils.isNotBlank(detail.getRemark())){ + project.setColumn100110(detail.getRemark()); + }else if(detail!=null&&StringUtils.isNotBlank(detail.getStatus())){ + project.setColumn100110(detail.getStatus().equals("Y")?"✓":"✘"); + } + QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); + if(urlDTO!=null){ + project.setColumn100110(project.getColumn100110()+","+urlDTO.getProjectId());//projectId存的照片路径 } - }else if(detail!=null&&StringUtils.isNotBlank(detail.getStatus())){ - project.setColumn100110(detail.getStatus().equals("Y")?"✓":"✘"); }else{ project.setColumn100110("-"); } keystr = project.getProjectId()+"11"; detail = detailMap.get(keystr); - if(detail!=null && StringUtils.isNotBlank(detail.getRemark())){ - project.setColumn110120(detail.getRemark()); - List files = qmsFileMapper.getBaseFileBatch(detail.getRecordId()); - if (!CollectionUtils.isEmpty(files)) { - List pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList()); - String picurls = pics.stream().collect(Collectors.joining(",")); - project.setColumn110120(project.getColumn110120()+","+picurls); + if(detail!=null){ + if(StringUtils.isNotBlank(detail.getRemark())){ + project.setColumn110120(detail.getRemark()); + }else if(detail!=null&&detail!=null && StringUtils.isNotBlank(detail.getStatus())){ + project.setColumn110120(detail.getStatus().equals("Y")?"✓":"✘"); + } + QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); + if(urlDTO!=null){ + project.setColumn110120(project.getColumn110120()+","+urlDTO.getProjectId());//projectId存的照片路径 } - }else if(detail!=null&&detail!=null && StringUtils.isNotBlank(detail.getStatus())){ - project.setColumn110120(detail.getStatus().equals("Y")?"✓":"✘"); }else{ project.setColumn110120("-"); } keystr = project.getProjectId()+"12"; detail = detailMap.get(keystr); - if(detail!=null && StringUtils.isNotBlank(detail.getRemark())){ - project.setColumn123133(detail.getRemark()); - List files = qmsFileMapper.getBaseFileBatch(detail.getRecordId()); - if (!CollectionUtils.isEmpty(files)) { - List pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList()); - String picurls = pics.stream().collect(Collectors.joining(",")); - project.setColumn123133(project.getColumn123133()+","+picurls); + if(detail!=null) { + if (StringUtils.isNotBlank(detail.getRemark())) { + project.setColumn123133(detail.getRemark()); + } else if (detail != null && StringUtils.isNotBlank(detail.getStatus())) { + project.setColumn123133(detail.getStatus().equals("Y") ? "✓" : "✘"); + } + QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); + if(urlDTO!=null){ + project.setColumn123133(project.getColumn123133()+","+urlDTO.getProjectId());//projectId存的照片路径 } - }else if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){ - project.setColumn123133(detail.getStatus().equals("Y")?"✓":"✘"); }else{ project.setColumn123133("-"); } keystr = project.getProjectId()+"13"; detail = detailMap.get(keystr); - if(detail!=null && StringUtils.isNotBlank(detail.getRemark())){ - project.setColumn133143(detail.getRemark()); - List files = qmsFileMapper.getBaseFileBatch(detail.getRecordId()); - if (!CollectionUtils.isEmpty(files)) { - List pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList()); - String picurls = pics.stream().collect(Collectors.joining(",")); - project.setColumn133143(project.getColumn133143()+","+picurls); + if(detail!=null){ + if(StringUtils.isNotBlank(detail.getRemark())){ + project.setColumn133143(detail.getRemark()); + }else if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){ + project.setColumn133143(detail.getStatus().equals("Y")?"✓":"✘"); + } + QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); + if(urlDTO!=null){ + project.setColumn133143(project.getColumn133143()+","+urlDTO.getProjectId());//projectId存的照片路径 } - }else if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){ - project.setColumn133143(detail.getStatus().equals("Y")?"✓":"✘"); }else{ project.setColumn133143("-"); } keystr = project.getProjectId()+"14"; detail = detailMap.get(keystr); - if(detail!=null && StringUtils.isNotBlank(detail.getRemark())){ - project.setColumn143153(detail.getRemark()); - List files = qmsFileMapper.getBaseFileBatch(detail.getRecordId()); - if (!CollectionUtils.isEmpty(files)) { - List pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList()); - String picurls = pics.stream().collect(Collectors.joining(",")); - project.setColumn143153(project.getColumn143153()+","+picurls); + if(detail!=null) { + if (StringUtils.isNotBlank(detail.getRemark())) { + project.setColumn143153(detail.getRemark()); + } else if (detail != null && StringUtils.isNotBlank(detail.getStatus())) { + project.setColumn143153(detail.getStatus().equals("Y") ? "✓" : "✘"); + } + QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); + if(urlDTO!=null){ + project.setColumn143153(project.getColumn143153()+","+urlDTO.getProjectId());//projectId存的照片路径 } - }else if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){ - project.setColumn143153(detail.getStatus().equals("Y")?"✓":"✘"); }else{ project.setColumn143153("-"); } keystr = project.getProjectId()+"15"; detail = detailMap.get(keystr); - if(detail!=null && StringUtils.isNotBlank(detail.getRemark())){ - project.setColumn153163(detail.getRemark()); - List files = qmsFileMapper.getBaseFileBatch(detail.getRecordId()); - if (!CollectionUtils.isEmpty(files)) { - List pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList()); - String picurls = pics.stream().collect(Collectors.joining(",")); - project.setColumn153163(project.getColumn153163()+","+picurls); + if(detail!=null) { + if (StringUtils.isNotBlank(detail.getRemark())) { + project.setColumn153163(detail.getRemark()); + } else if (detail != null && StringUtils.isNotBlank(detail.getStatus())) { + project.setColumn153163(detail.getStatus().equals("Y") ? "✓" : "✘"); + } + QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); + if(urlDTO!=null){ + project.setColumn153163(project.getColumn153163()+","+urlDTO.getProjectId());//projectId存的照片路径 } - }else if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){ - project.setColumn153163(detail.getStatus().equals("Y")?"✓":"✘"); }else{ project.setColumn153163("-"); } keystr = project.getProjectId()+"16"; detail = detailMap.get(keystr); - if(detail!=null && StringUtils.isNotBlank(detail.getRemark())){ - project.setColumn163173(detail.getRemark()); - List files = qmsFileMapper.getBaseFileBatch(detail.getRecordId()); - if (!CollectionUtils.isEmpty(files)) { - List pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList()); - String picurls = pics.stream().collect(Collectors.joining(",")); - project.setColumn163173(project.getColumn163173()+","+picurls); + if(detail!=null) { + if(StringUtils.isNotBlank(detail.getRemark())){ + project.setColumn163173(detail.getRemark()); + }else if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){ + project.setColumn163173(detail.getStatus().equals("Y")?"✓":"✘"); + } + QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); + if(urlDTO!=null){ + project.setColumn163173(project.getColumn163173()+","+urlDTO.getProjectId());//projectId存的照片路径 } - }else if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){ - project.setColumn163173(detail.getStatus().equals("Y")?"✓":"✘"); }else{ project.setColumn163173("-"); } keystr = project.getProjectId()+"18"; detail = detailMap.get(keystr); - if(detail!=null && StringUtils.isNotBlank(detail.getRemark())){ - project.setColumn180190(detail.getRemark()); - List files = qmsFileMapper.getBaseFileBatch(detail.getRecordId()); - if (!CollectionUtils.isEmpty(files)) { - List pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList()); - String picurls = pics.stream().collect(Collectors.joining(",")); - project.setColumn180190(project.getColumn180190()+","+picurls); + if(detail!=null) { + if(StringUtils.isNotBlank(detail.getRemark())){ + project.setColumn180190(detail.getRemark()); + }else if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){ + project.setColumn180190(detail.getStatus().equals("Y")?"✓":"✘"); + } + QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); + if(urlDTO!=null){ + project.setColumn180190(project.getColumn180190()+","+urlDTO.getProjectId());//projectId存的照片路径 } - }else if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){ - project.setColumn180190(detail.getStatus().equals("Y")?"✓":"✘"); }else{ project.setColumn180190("-"); } keystr = project.getProjectId()+"19"; detail = detailMap.get(keystr); - if(detail!=null && StringUtils.isNotBlank(detail.getRemark())){ - project.setColumn190200(detail.getRemark()); - List files = qmsFileMapper.getBaseFileBatch(detail.getRecordId()); - if (!CollectionUtils.isEmpty(files)) { - List pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList()); - String picurls = pics.stream().collect(Collectors.joining(",")); - project.setColumn190200(project.getColumn190200()+","+picurls); + if(detail!=null) { + if(StringUtils.isNotBlank(detail.getRemark())){ + project.setColumn190200(detail.getRemark()); + }else if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){ + project.setColumn190200(detail.getStatus().equals("Y")?"✓":"✘"); + } + QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); + if(urlDTO!=null){ + project.setColumn190200(project.getColumn190200()+","+urlDTO.getProjectId());//projectId存的照片路径 } - }else if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){ - project.setColumn190200(detail.getStatus().equals("Y")?"✓":"✘"); }else{ project.setColumn190200("-"); } keystr = project.getProjectId()+"20"; detail = detailMap.get(keystr); - if(detail!=null && StringUtils.isNotBlank(detail.getRemark())){ - project.setColumn200210(detail.getRemark()); - List files = qmsFileMapper.getBaseFileBatch(detail.getRecordId()); - if (!CollectionUtils.isEmpty(files)) { - List pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList()); - String picurls = pics.stream().collect(Collectors.joining(",")); - project.setColumn200210(project.getColumn200210()+","+picurls); + if(detail!=null) { + if(StringUtils.isNotBlank(detail.getRemark())){ + project.setColumn200210(detail.getRemark()); + }else if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){ + project.setColumn200210(detail.getStatus().equals("Y")?"✓":"✘"); + } + QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); + if(urlDTO!=null){ + project.setColumn200210(project.getColumn200210()+","+urlDTO.getProjectId());//projectId存的照片路径 } - }else if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){ - project.setColumn200210(detail.getStatus().equals("Y")?"✓":"✘"); }else{ project.setColumn200210("-"); } diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml index 8cd539fb4..1e5aca00a 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml @@ -230,4 +230,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" factory_code supplierCode from sys_factory where f_type = 'c' + From fefc4ea927a8331a38c2dba6ee6d9aa32a7f771e Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 24 Jan 2024 17:46:01 +0800 Subject: [PATCH 04/26] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E8=B6=85=E6=97=B6=E4=BC=98=E5=8C=962?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/QcStaticTableServiceImpl.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java index afd6424ca..5db072277 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java @@ -184,7 +184,7 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { } QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); if(urlDTO!=null){ - project.setColumn080090(project.getColumn080090()+","+urlDTO.getProjectId());//projectId存的照片路径 + project.setColumn080090(project.getColumn080090()+","+urlDTO.getProjectId().replace("&","&"));//projectId存的照片路径 } }else{ project.setColumn080090("-"); @@ -200,7 +200,7 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { } QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); if(urlDTO!=null){ - project.setColumn090100(project.getColumn090100()+","+urlDTO.getProjectId());//projectId存的照片路径 + project.setColumn090100(project.getColumn090100()+","+urlDTO.getProjectId().replace("&","&"));//projectId存的照片路径 } }else{ project.setColumn090100("-"); @@ -216,7 +216,7 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { } QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); if(urlDTO!=null){ - project.setColumn100110(project.getColumn100110()+","+urlDTO.getProjectId());//projectId存的照片路径 + project.setColumn100110(project.getColumn100110()+","+urlDTO.getProjectId().replace("&","&"));//projectId存的照片路径 } }else{ project.setColumn100110("-"); @@ -232,7 +232,7 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { } QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); if(urlDTO!=null){ - project.setColumn110120(project.getColumn110120()+","+urlDTO.getProjectId());//projectId存的照片路径 + project.setColumn110120(project.getColumn110120()+","+urlDTO.getProjectId().replace("&","&"));//projectId存的照片路径 } }else{ project.setColumn110120("-"); @@ -248,7 +248,7 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { } QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); if(urlDTO!=null){ - project.setColumn123133(project.getColumn123133()+","+urlDTO.getProjectId());//projectId存的照片路径 + project.setColumn123133(project.getColumn123133()+","+urlDTO.getProjectId().replace("&","&"));//projectId存的照片路径 } }else{ project.setColumn123133("-"); @@ -264,7 +264,7 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { } QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); if(urlDTO!=null){ - project.setColumn133143(project.getColumn133143()+","+urlDTO.getProjectId());//projectId存的照片路径 + project.setColumn133143(project.getColumn133143()+","+urlDTO.getProjectId().replace("&","&"));//projectId存的照片路径 } }else{ project.setColumn133143("-"); @@ -280,7 +280,7 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { } QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); if(urlDTO!=null){ - project.setColumn143153(project.getColumn143153()+","+urlDTO.getProjectId());//projectId存的照片路径 + project.setColumn143153(project.getColumn143153()+","+urlDTO.getProjectId().replace("&","&"));//projectId存的照片路径 } }else{ project.setColumn143153("-"); @@ -296,7 +296,7 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { } QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); if(urlDTO!=null){ - project.setColumn153163(project.getColumn153163()+","+urlDTO.getProjectId());//projectId存的照片路径 + project.setColumn153163(project.getColumn153163()+","+urlDTO.getProjectId().replace("&","&"));//projectId存的照片路径 } }else{ project.setColumn153163("-"); @@ -312,7 +312,7 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { } QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); if(urlDTO!=null){ - project.setColumn163173(project.getColumn163173()+","+urlDTO.getProjectId());//projectId存的照片路径 + project.setColumn163173(project.getColumn163173()+","+urlDTO.getProjectId().replace("&","&"));//projectId存的照片路径 } }else{ project.setColumn163173("-"); @@ -328,7 +328,7 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { } QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); if(urlDTO!=null){ - project.setColumn180190(project.getColumn180190()+","+urlDTO.getProjectId());//projectId存的照片路径 + project.setColumn180190(project.getColumn180190()+","+urlDTO.getProjectId().replace("&","&"));//projectId存的照片路径 } }else{ project.setColumn180190("-"); @@ -344,7 +344,7 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { } QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); if(urlDTO!=null){ - project.setColumn190200(project.getColumn190200()+","+urlDTO.getProjectId());//projectId存的照片路径 + project.setColumn190200(project.getColumn190200()+","+urlDTO.getProjectId().replace("&","&"));//projectId存的照片路径 } }else{ project.setColumn190200("-"); @@ -360,7 +360,7 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { } QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); if(urlDTO!=null){ - project.setColumn200210(project.getColumn200210()+","+urlDTO.getProjectId());//projectId存的照片路径 + project.setColumn200210(project.getColumn200210()+","+urlDTO.getProjectId().replace("&","&"));//projectId存的照片路径 } }else{ project.setColumn200210("-"); From 2e2e572fad1a939b0e2c7589c852da598ad2c14a Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 25 Jan 2024 13:44:43 +0800 Subject: [PATCH 05/26] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E8=B6=85=E6=97=B6=E4=BC=98=E5=8C=962?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/mes/MesReportWorkConsumeMapper.xml | 1 + .../src/main/java/com/op/open/service/impl/OpenServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml index 588831934..45bba0c25 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml @@ -47,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and attr3 = #{attr3} and attr4 = #{attr4} and factory_code = #{factoryCode} + and recoil = #{recoil} and del_flag = '0' diff --git a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java index a6c055a70..1d9d67cfc 100644 --- a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java +++ b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java @@ -466,7 +466,7 @@ public class OpenServiceImpl implements OpenService { try { StringBuilder postDataBuilder = new StringBuilder(); postDataBuilder.append("createTime=").append("dateTime"); - String result = HttpUtils.sendPost("http://lj.lanju.cn:8801/outside/api/mes/getUserList.do",postDataBuilder.toString()); + String result = HttpUtils.sendPost(hr_url,postDataBuilder.toString()); return success(result); } catch (Exception e) { e.printStackTrace(); From 11e92a706df1951932320d7707b470dc9473fea1 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 25 Jan 2024 13:44:59 +0800 Subject: [PATCH 06/26] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E8=B6=85=E6=97=B6=E4=BC=98=E5=8C=962?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java index f63e76c43..70d03ff18 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java @@ -380,6 +380,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { List lt_hwList =new ArrayList<>(); MesReportWorkConsume consumeqo = new MesReportWorkConsume(); consumeqo.setWorkorderCode(workOrder.getWorkorderCode()); + consumeqo.setRecoil("X"); List consumes = mesReportWorkConsumeMapper.selectMesReportWorkConsumeList(consumeqo); if(!CollectionUtils.isEmpty(consumes)){ for(MesReportWorkConsume consume:consumes){ From eb833b5630b2ae70d0785da51db17677c9bdd763 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 25 Jan 2024 16:30:44 +0800 Subject: [PATCH 07/26] =?UTF-8?q?=E5=B7=A1=E6=A3=80bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/quality/QcCheckTaskProduceMapper.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml index 84736e09a..052ac4030 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml @@ -172,7 +172,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" group by qct.factory_code, qct.order_no,qct.material_code,qct.material_name, qct.quality,qct.unit,qct.supplier_code,qct.supplier_name, - qct.income_time,qct.check_loc + qct.income_time,qct.check_loc, + qct.product_type,qct.confirm_man_code,qct.confirm_man_name From 3dc6d082751ed4e6c1b3d9d05add984cd3d77e7f Mon Sep 17 00:00:00 2001 From: A0010407 Date: Thu, 25 Jan 2024 16:40:04 +0800 Subject: [PATCH 08/26] =?UTF-8?q?2024-1-25-1=20=E5=9F=BA=E7=A1=80=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=A8=A1=E5=9D=97-=E5=B1=95=E7=A4=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E4=B8=8D=E5=85=A8=E9=97=AE=E9=A2=98-=E4=B8=B4?= =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/op/wms/controller/SysFactoryController.java | 7 ++----- .../main/java/com/op/wms/service/ISysFactoryService.java | 6 ++++-- .../com/op/wms/service/impl/SysFactoryServiceImpl.java | 9 ++++++--- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/SysFactoryController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/SysFactoryController.java index 69b6ff5a5..fa635b09e 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/SysFactoryController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/SysFactoryController.java @@ -102,11 +102,8 @@ public class SysFactoryController extends BaseController { } // 查询工作中心 -// @RequiresPermissions("wms:factory:getWorkCenterList") @GetMapping("/getWorkCenterList") - public TableDataInfo getWorkCenterList(SysFactory sysFactory) { - startPage(); - List list = sysFactoryService.getWorkCenterList(sysFactory); - return getDataTable(list); + public AjaxResult getWorkCenterList(SysFactory sysFactory) { + return sysFactoryService.getWorkCenterList(sysFactory); } } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/ISysFactoryService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/ISysFactoryService.java index ce4f9743c..331fb7f7c 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/ISysFactoryService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/ISysFactoryService.java @@ -1,6 +1,8 @@ package com.op.wms.service; import java.util.List; + +import com.op.common.core.web.domain.AjaxResult; import com.op.wms.domain.SysFactory; /** @@ -58,8 +60,8 @@ public interface ISysFactoryService { */ public int deleteSysFactoryByFactoryId(Long factoryId); - //好 - List getWorkCenterList(SysFactory sysFactory); + //查询工作中心 + AjaxResult getWorkCenterList(SysFactory sysFactory); //新增 判断逻辑 boolean checkFactoryCodeUnique(SysFactory sysFactory); diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/SysFactoryServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/SysFactoryServiceImpl.java index edfec7c21..442ccb4aa 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/SysFactoryServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/SysFactoryServiceImpl.java @@ -4,12 +4,14 @@ import java.util.List; import com.baomidou.dynamic.datasource.annotation.DS; import com.op.common.core.utils.DateUtils; +import com.op.common.core.web.domain.AjaxResult; import com.op.common.security.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.op.wms.mapper.SysFactoryMapper; import com.op.wms.domain.SysFactory; import com.op.wms.service.ISysFactoryService; +import static com.op.common.core.web.domain.AjaxResult.success; /** * 工厂模型Service业务层处理 @@ -99,15 +101,16 @@ public class SysFactoryServiceImpl implements ISysFactoryService { } /** - * 查询工厂模型列表 + * 查询工作中心 * * @param sysFactory 工厂模型 * @return 工厂模型 */ @Override @DS("#header.poolName") - public List getWorkCenterList(SysFactory sysFactory) { - return sysFactoryMapper.getWorkCenterList(sysFactory); + public AjaxResult getWorkCenterList(SysFactory sysFactory) { + List list= sysFactoryMapper.getWorkCenterList(sysFactory); + return success(list); } /** From fcb8e0467ef4d63f68a9c4b0c2bd2c06b4670096 Mon Sep 17 00:00:00 2001 From: shaoyong Date: Thu, 25 Jan 2024 17:24:17 +0800 Subject: [PATCH 09/26] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=BF=87=E7=A8=8B?= =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=8A=A5=E5=91=8A=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/quality/service/impl/QcCheckReportProduceServiceImpl.java | 1 + .../main/resources/mapper/quality/QcCheckReportIncomeMapper.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java index 02c5a766d..b69e7ef5b 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java @@ -232,6 +232,7 @@ public class QcCheckReportProduceServiceImpl implements IQcCheckReportProduceSer //最后一条巡检记录得确认人当最终确认人 QcCheckReportIncome lastData = qcCheckReportIncomeMapper.getLastXJTaskInfo(qcCheckReportIncome); if(lastData!=null ){ + taskInfo.setProductType(lastData.getProductType()); taskInfo.setConfirmManCode(lastData.getConfirmManCode()); taskInfo.setConfirmManName(lastData.getConfirmManName()); taskInfo.setConfirm(lastData.getConfirm()); diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml index 19a6acd6a..7abec76a6 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml @@ -208,6 +208,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT top 1 c.confirm, + c.product_type productType, c.confirm_man_code confirmManCode, c.confirm_man_name confirmManName, c.confirm_remark confirmRemark, From 7a603de1e217b3b16980b337fa90d60bcd5d4d1f Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 25 Jan 2024 17:37:14 +0800 Subject: [PATCH 10/26] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/op/sap/controller/SapController.java | 4 ++-- .../op-sap/src/main/java/com/op/sap/mapper/SapBomMapper.java | 2 ++ .../op-sap/src/main/resources/mapper/sap/SapBomMapper.xml | 5 ++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java b/op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java index 6c2c10400..7adb7076d 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java @@ -76,7 +76,7 @@ public class SapController extends BaseController { if(!"ds_999".equals(dateSource.get("poolName"))){ logger.info("++++++++++++" + dateSource.get("poolName") + "++++product同步开始++++++++++"); DynamicDataSourceContextHolder.push(dateSource.get("poolName"));// 这是数据源的key - + /**base_product**/ Date maxTime0 = sapBomMapper.getProductMaxTime(); if(maxTime0 != null){ Calendar calendar = Calendar.getInstance(); @@ -115,7 +115,7 @@ public class SapController extends BaseController { logger.info("++++++++++++" + dateSource.get("poolName") + "++++bom同步开始++++++++++"); DynamicDataSourceContextHolder.push(dateSource.get("poolName"));// 这是数据源的key - Date maxTime0 = sapBomMapper.getProductMaxTime(); + Date maxTime0 = sapBomMapper.getBomMaxTime(); if (maxTime0 != null) { Calendar calendar = Calendar.getInstance(); calendar.setTime(maxTime0); diff --git a/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapBomMapper.java b/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapBomMapper.java index b7796b816..1953efb20 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapBomMapper.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapBomMapper.java @@ -47,4 +47,6 @@ public interface SapBomMapper { Date getProductMaxTime(); Date getRouteMaxTime(); + + Date getBomMaxTime(); } diff --git a/op-modules/op-sap/src/main/resources/mapper/sap/SapBomMapper.xml b/op-modules/op-sap/src/main/resources/mapper/sap/SapBomMapper.xml index b7f9c979d..a13467251 100644 --- a/op-modules/op-sap/src/main/resources/mapper/sap/SapBomMapper.xml +++ b/op-modules/op-sap/src/main/resources/mapper/sap/SapBomMapper.xml @@ -78,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select factory_id from sys_factory where factory_code = #{factoryCode} @@ -288,6 +288,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + From ef93c6869d4e77f5e02acf2a6011556446b307a8 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 25 Jan 2024 17:50:14 +0800 Subject: [PATCH 11/26] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E5=A2=9E=E5=8A=A0bom?= =?UTF-8?q?=E5=8F=82=E8=80=83tab?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MesReportWorkConsumeController.java | 7 ++ .../op/mes/domain/MesReportWorkConsume.java | 73 +++++++++++++++++++ .../mapper/MesReportWorkConsumeMapper.java | 2 + .../service/IMesReportWorkConsumeService.java | 2 + .../impl/MesReportWorkConsumeServiceImpl.java | 7 ++ .../mapper/mes/MesReportWorkConsumeMapper.xml | 18 +++++ .../quality/QcCheckTaskProduceMapper.xml | 1 + 7 files changed, 110 insertions(+) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkConsumeController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkConsumeController.java index c67141d86..5a075762c 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkConsumeController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkConsumeController.java @@ -153,4 +153,11 @@ public class MesReportWorkConsumeController extends BaseController { public AjaxResult submitReportInfo(@RequestBody MesReportWork mesReportWork) { return toAjax(mesReportWorkConsumeService.submitReportInfo(mesReportWork)); } + + /**获取母子BOM**/ + @GetMapping("/getBomList") + public List getBomList(MesReportWorkConsume mesReportWorkConsume) { + List rlist = mesReportWorkConsumeService.getBomList(mesReportWorkConsume); + return rlist; + } } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWorkConsume.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWorkConsume.java index d1a1d7fb1..597b5c834 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWorkConsume.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWorkConsume.java @@ -72,6 +72,79 @@ public class MesReportWorkConsume extends BaseEntity { private String parentOrder; private String batch; private String recoil; + private String standardDosage; + private String lossRate; + private String lossAmount; + private String cilosses; + private String sanka; + private String productGroup; + private String productGroupName; + //上级物料 + private String pMaterialCode; + + public String getpMaterialCode() { + return pMaterialCode; + } + + public void setpMaterialCode(String pMaterialCode) { + this.pMaterialCode = pMaterialCode; + } + + public String getProductGroup() { + return productGroup; + } + + public void setProductGroup(String productGroup) { + this.productGroup = productGroup; + } + + public String getProductGroupName() { + return productGroupName; + } + + public void setProductGroupName(String productGroupName) { + this.productGroupName = productGroupName; + } + + public String getStandardDosage() { + return standardDosage; + } + + public void setStandardDosage(String standardDosage) { + this.standardDosage = standardDosage; + } + + public String getLossRate() { + return lossRate; + } + + public void setLossRate(String lossRate) { + this.lossRate = lossRate; + } + + public String getLossAmount() { + return lossAmount; + } + + public void setLossAmount(String lossAmount) { + this.lossAmount = lossAmount; + } + + public String getCilosses() { + return cilosses; + } + + public void setCilosses(String cilosses) { + this.cilosses = cilosses; + } + + public String getSanka() { + return sanka; + } + + public void setSanka(String sanka) { + this.sanka = sanka; + } public String getRecoil() { return recoil; diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkConsumeMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkConsumeMapper.java index b349ef97b..410ed0f39 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkConsumeMapper.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkConsumeMapper.java @@ -77,4 +77,6 @@ public interface MesReportWorkConsumeMapper { int addConsumePS(@Param("list")List rconsumes); List getSonConsumeList(MesReportWorkConsume mesReportWorkConsume); + + List getBomList(MesReportWorkConsume mesReportWorkConsume); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkConsumeService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkConsumeService.java index b3c49ded9..e2d134c2d 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkConsumeService.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkConsumeService.java @@ -82,4 +82,6 @@ public interface IMesReportWorkConsumeService { int submitConsumePS(List mesReportWorkConsume); int submitReportInfo(MesReportWork mesReportWork); + + List getBomList(MesReportWorkConsume mesReportWorkConsume); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java index 4cb75a1f9..b3adfb61e 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java @@ -252,4 +252,11 @@ public class MesReportWorkConsumeServiceImpl implements IMesReportWorkConsumeSer } return rconsumes; } + + @Override + @DS("#header.poolName") + public List getBomList(MesReportWorkConsume mesReportWorkConsume) { + List dtos = mesReportWorkConsumeMapper.getBomList(mesReportWorkConsume); + return dtos; + } } diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml index 45bba0c25..20c6b2e19 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml @@ -110,6 +110,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where mrwc.del_flag = '0' and pow.del_flag = '0' and pow.parent_order = #{workorderCode} + insert into mes_report_work_consume diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml index 052ac4030..806ecc9e5 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml @@ -124,6 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and qct.check_type = #{checkType} and q.type_code = #{typeCode} + order by qct.create_time desc + From 81d6af1ece59eb56d253c5903b5161beefd92d7e Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Mon, 29 Jan 2024 13:38:44 +0800 Subject: [PATCH 15/26] =?UTF-8?q?wms=E5=87=BA=E5=BA=93=E8=BF=87=E8=B4=A6?= =?UTF-8?q?=E4=BF=AE=E6=94=B923=E9=A1=B5=E9=9D=A2=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/wms/OdsProcureOutOrderMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml index 794291aca..39c851edd 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml @@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ods_procure_out_order where Active='1' - and Produce_Code = #{produceCode} + and Produce_Code like concat('%', #{produceCode}, '%') and User_Defined1 = #{userDefined1} GROUP BY Produce_Code,User_Defined1 @@ -83,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + From da4a5364db6d83249815e8298758ad28c5cdc5a7 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Mon, 29 Jan 2024 14:23:34 +0800 Subject: [PATCH 18/26] =?UTF-8?q?=E9=A6=96=E6=A3=80=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quality/service/impl/QcCheckTaskIncomeServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java index 9f910a44c..b17422bb0 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java @@ -649,12 +649,12 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { qcCheckTaskIncome.setCheckResult(result.equals("Y")?"1":"2"); qcCheckUnqualifiedMapper.updateQualityStatus(qcCheckTaskIncome); }else if("produce".equals(qcCheckTaskIncome.getTypeCode())){ - - if("checkTypeSC".equals(qcCheckTaskIncome.getCheckType())&&"N".equals(result)){ + if("checkTypeSC".equals(qcCheckTaskIncome.getCheckType())){ /**pro_order_workorder_batch-->qc_status->2**/ qcCheckTaskIncome.setStatus("2"); qcCheckUnqualifiedMapper.updateWorkOrderBatchStatus(qcCheckTaskIncome); - + } + if("checkTypeSC".equals(qcCheckTaskIncome.getCheckType())&&"N".equals(result)){ QcCheckTaskIncome recheck = new QcCheckTaskIncome(); recheck.setOldBelongTo(belongId); recheck.setBelongTo(recheck.getRecordId()); From 256c6eaac84009e0785a18d3a6eb1b2e78dc6824 Mon Sep 17 00:00:00 2001 From: shaoyong Date: Mon, 29 Jan 2024 17:57:55 +0800 Subject: [PATCH 19/26] =?UTF-8?q?=E6=9D=A5=E6=96=99=E6=A3=80=E9=AA=8C?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quality/controller/QcCheckTaskIncomeController.java | 5 +++++ .../java/com/op/quality/domain/QcCheckTaskDetail.java | 9 +++++++++ .../mapper/quality/QcCheckUnqualifiedMapper.xml | 1 + 3 files changed, 15 insertions(+) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java index 8fd191079..bf4b5556a 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java @@ -290,8 +290,13 @@ public class QcCheckTaskIncomeController extends BaseController { .map(QcCheckTaskDetail::getDefectQuality) .reduce(BigDecimal::add) // 使用summingBigDecimal()方法来求和，该方法内部实际上使用reduce()来实现 .orElse(BigDecimal.ZERO); + String defectSubclass = detailsWithSameCode.stream() + .map(QcCheckTaskDetail::getDefectSubclass) + .findFirst() + .orElse(""); QcCheckTaskDefect taskDefect = new QcCheckTaskDefect(); taskDefect.setDefectCode(defectCode); + taskDefect.setDefectSubclass(defectSubclass); taskDefect.setNoOkQuality(sum); return taskDefect; }) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDetail.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDetail.java index d66eace7d..05aaffe5e 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDetail.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDetail.java @@ -96,6 +96,7 @@ public class QcCheckTaskDetail extends BaseEntity { private String typeProjectId; private String defectCode; private BigDecimal defectQuality; + private String defectSubclass; private String checkType; private String fileListStr; private List files; @@ -369,6 +370,14 @@ public class QcCheckTaskDetail extends BaseEntity { this.defectQuality = defectQuality; } + public String getDefectSubclass() { + return defectSubclass; + } + + public void setDefectSubclass(String defectSubclass) { + this.defectSubclass = defectSubclass; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml index c19a7dd31..4d6a4555f 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml @@ -75,6 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" defect_subclass defectSubclass from qc_defect_type where defect_type = #{defectType} and del_flag='0' + order by create_time diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java index fecad0b34..b90324a91 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java @@ -34,7 +34,7 @@ import org.springframework.web.multipart.MultipartFile; /** * 设备管理Controller - * + * * @author Open Platform * @date 2023-07-20 */ @@ -199,7 +199,7 @@ public class BaseEquipmentController extends BaseController { response.setContentType("application/octet-stream;charset=UTF-8"); ServletOutputStream outputStream = response.getOutputStream(); //调用工具类 - workbook = ExcelMapUtil.initWorkbook(titleName, titleName, excelCols, null); + workbook = ExcelMapUtil.initWorkbook(titleName, null, excelCols, null); workbook.write(outputStream); } catch (Exception e) { e.printStackTrace(); From f8be5b6c77d3d5dd8845f656a5a2416aeb89d05b Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 31 Jan 2024 13:56:55 +0800 Subject: [PATCH 21/26] =?UTF-8?q?=E5=AE=9A=E9=87=8F=E5=80=BC=E5=88=86?= =?UTF-8?q?=E6=9E=90=E6=8A=A5=E8=A1=A8V1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/plan/ProOrderWorkorderMapper.xml | 70 +++++++++++-------- .../impl/QcCheckTaskIncomeServiceImpl.java | 10 +-- 2 files changed, 46 insertions(+), 34 deletions(-) diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml index f49debde1..9ca3c1f23 100644 --- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml +++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml @@ -42,6 +42,9 @@ + + + @@ -84,37 +87,44 @@ + insert into mes_prepare_detail From 4d6a680e2b0fbeafc6dfff6d34d1f16191fee218 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 31 Jan 2024 14:42:44 +0800 Subject: [PATCH 24/26] 3 --- .../src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml index 4de92b326..bc9ffc89b 100644 --- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml +++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml @@ -92,7 +92,7 @@ pow.route_code, pow.prod_line_code, pow.product_date,pow.shift_id, pow.parent_order, pow.ancestors, pow.status, pow.remark, pow.attr1, pow.attr2, pow.attr3, pow.attr4, pow.create_by, pow.create_time, pow.update_by, pow.update_time, pow.prod_type, pow.factory_code , pow.end_flag , pow.car_num,pow.sort_no, - pow.workorder_code_sap,pwd.material_code,pwd.material_name + pow.workorder_code_sap from pro_order_workorder pow and pow.workorder_code like concat('%', #{workorderCode}, '%') From f8ef2001218f7390e96b90365b7f7c49eec4bd16 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 31 Jan 2024 15:16:24 +0800 Subject: [PATCH 25/26] =?UTF-8?q?=E7=99=BD=E5=9D=AF=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B53?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/op/quality/controller/QuaController.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java index c0f5a9942..572ff945f 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java @@ -238,6 +238,14 @@ public class QuaController extends BaseController { List list = qcCheckTaskIncomeService.getLLWorkOrder(qcCheckTaskIncome); return getDataTable(list); } + + /**不良类型**/ + @PutMapping("/getDefectListPDA") + public List getDefectListPDA(@RequestBody QcDefectType qcDefectType) { + DynamicDataSourceContextHolder.push(qcDefectType.getFactoryCode()); + return qcCheckTaskIncomeService.getDefectList(qcDefectType); + } + /**获取生产工单列表**/ @GetMapping("/getWorkOrder") public TableDataInfo getWorkOrder(QcCheckTaskIncome qcCheckTaskIncome) { From 830afcd15745f22cca819bfad850f9ed55b50758 Mon Sep 17 00:00:00 2001 From: shaoyong Date: Thu, 1 Feb 2024 16:06:09 +0800 Subject: [PATCH 26/26] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/quality/QcCheckReportIncomeMapper.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml index 7abec76a6..04656d1fc 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml @@ -137,6 +137,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" td.create_time createTime, td.update_by updateBy, td.update_time updateTime, + td.defect_code defectCode, + td.defect_quality defectQuality, qctp.upper_diff upperDiff, qctp.down_diff downDiff, qctp.sample,