From 1377d825145931726606c450a9a187bac2d098bc Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 25 Jul 2024 22:22:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E6=8A=A5=E5=91=8A=E5=8A=A0?= =?UTF-8?q?=E4=B8=8D=E8=89=AF=E6=95=B0=E9=87=8F+=E9=A6=96=E6=A3=80?= =?UTF-8?q?=E9=97=B8=E5=8F=A3=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/op/open/mapper/OpenMapper.java | 2 +- .../op/open/service/impl/OpenServiceImpl.java | 32 ++++--- .../main/resources/mapper/open/OpenMapper.xml | 4 +- .../com/op/quality/domain/QcStaticTable.java | 9 ++ .../quality/mapper/QcStaticTableMapper.java | 2 + .../impl/QcStaticTableServiceImpl.java | 84 ++++++++++++++++++- .../quality/QcCheckTaskProduceMapper.xml | 4 +- .../mapper/quality/QcStaticTableMapper.xml | 19 ++++- 8 files changed, 135 insertions(+), 21 deletions(-) diff --git a/op-modules/op-open/src/main/java/com/op/open/mapper/OpenMapper.java b/op-modules/op-open/src/main/java/com/op/open/mapper/OpenMapper.java index 2e3074e5..df9c304c 100644 --- a/op-modules/op-open/src/main/java/com/op/open/mapper/OpenMapper.java +++ b/op-modules/op-open/src/main/java/com/op/open/mapper/OpenMapper.java @@ -86,7 +86,7 @@ public interface OpenMapper { String getSampNum(QcCheckTaskProduceDTO sampQua); - Date getLastTask(QcCheckTaskProduceDTO qcCheckTaskProduce); + String getLastTask(QcCheckTaskProduceDTO qcCheckTaskProduce); List getNoticesGroup(SysNoticeGroup noticeQo); 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 8684c5b7..37379384 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 @@ -391,11 +391,12 @@ public class OpenServiceImpl implements OpenService { public int insertQcCheckTaskProduce(QcCheckTaskProduceDTO qcCheckTaskProduce) { DynamicDataSourceContextHolder.push("ds_" + qcCheckTaskProduce.getFactoryCode()); logger.info("创建检验任务"+qcCheckTaskProduce.getCheckType()+":"+JSONObject.toJSONString(qcCheckTaskProduce)); - // 1分钟不允许存在两条 - Date lastData = openMapper.getLastTask(qcCheckTaskProduce); - if(this.oneMinHas(lastData)){ - logger.info("【重复创建任务】orderNo:"+qcCheckTaskProduce.getOrderNo()+";"+"incomeBatchNo:"+qcCheckTaskProduce.getIncomeBatchNo()); - return 0; + // 同一个工单同一个批次，上个检验没完成，下一个不允许执行 + String lastStatus = openMapper.getLastTask(qcCheckTaskProduce); + if(StringUtils.isNotBlank(lastStatus) && !"2".equals(lastStatus)){ + //logger.info("【重复创建任务】orderNo:"+qcCheckTaskProduce.getOrderNo()+";"+"incomeBatchNo:"+qcCheckTaskProduce.getIncomeBatchNo()); + logger.info("【重复创建任务】"+JSONObject.toJSONString(qcCheckTaskProduce)); + return -100; } qcCheckTaskProduce.setCreateTime(DateUtils.getNowDate()); @@ -646,13 +647,20 @@ public class OpenServiceImpl implements OpenService { } public static void main(String args[]){ - // 创建两个日期时间对象 - LocalDateTime dateTime1 = LocalDateTime.of(2024, 4, 18, 9, 33); // 2023年1月1日 10:30 - LocalDateTime dateTime2 = LocalDateTime.now(); // 2023年1月2日 11:45 - // 计算分钟差 - long minutesBetween = Duration.between(dateTime1, dateTime2).toMinutes(); - if(minutesBetween<=1){ - System.out.println("++++++++++++检验任务1分钟内生成过，不再重复创建++++++++++++++"); +// // 创建两个日期时间对象 +// LocalDateTime dateTime1 = LocalDateTime.of(2024, 4, 18, 9, 33); // 2023年1月1日 10:30 +// LocalDateTime dateTime2 = LocalDateTime.now(); // 2023年1月2日 11:45 +// // 计算分钟差 +// long minutesBetween = Duration.between(dateTime1, dateTime2).toMinutes(); +// if(minutesBetween<=1){ +// System.out.println("++++++++++++检验任务1分钟内生成过，不再重复创建++++++++++++++"); +// } + + int f = -100; + if(f != -100){ + System.out.println("-100"); + }else{ + System.out.println("0"); } } diff --git a/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml b/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml index 5c780a38..5bf9cb6f 100644 --- a/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml +++ b/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml @@ -207,8 +207,8 @@ where end_value>= #{quality} and #{quality}>=start_value and del_flag = '0' and check_type = #{checkType} - + select check_status from qc_check_task where check_type = #{checkType} and order_no= #{orderNo} and income_batch_no = #{incomeBatchNo} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java index af74ce19..554cafdf 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java @@ -74,6 +74,7 @@ public class QcStaticTable extends BaseEntity { private String workCenter; private String recordId; + private String detailId; private String checkNo; @JsonFormat(pattern = "yyyy-MM-dd") @@ -108,6 +109,14 @@ public class QcStaticTable extends BaseEntity { private BigDecimal upperDiff; private BigDecimal downDiff; + public String getDetailId() { + return detailId; + } + + public void setDetailId(String detailId) { + this.detailId = detailId; + } + public BigDecimal getUpperDiff() { return upperDiff; } 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 f696c237..5de6c48b 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 @@ -79,4 +79,6 @@ public interface QcStaticTableMapper { List getProjectList(String checkType); QcStaticTable getUpAndDown(QcStaticTable qcStaticTable); + @MapKey("detailId") + Map defectMap(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 b4314e0d..61b0197b 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 @@ -177,15 +177,21 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { }else if(qcStaticTable.getShiftId().equals("2")){ detailMap = qcStaticTableMapper.getProjectDetailNight(qcStaticTable); } - Map picsMap = qcStaticTableMapper.picsMap(qcStaticTable); + + Map defectMap = qcStaticTableMapper.defectMap(qcStaticTable); + if(defectMap.size()==0){ + defectMap.put("0",null); + } + for (QcStaticTable project : projects) { - this.getDataFromMap(detailMap, project, picsMap); + this.getDataFromMap(detailMap, project, picsMap,defectMap); } return projects; } - private void getDataFromMap(Map detailMap, QcStaticTable project, Map picsMap) { + private void getDataFromMap(Map detailMap, QcStaticTable project, Map picsMap, + Map defectMap) { String keystr = project.getProjectId() + "08"; QcStaticTable detail = detailMap.get(keystr); if (detail != null) { @@ -194,6 +200,12 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { } else if (detail != null && StringUtils.isNotBlank(detail.getStatus())) { project.setColumn080090(detail.getStatus().equals("Y") ? "✓" : "✘"); } + + QcStaticTable defect = defectMap.get(detail.getDetailId()); + if(defect != null && StringUtils.isNotBlank(defect.getRemark())){ + project.setColumn080090(project.getColumn080090()+" "+defect.getRemark()); + } + QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); if (urlDTO != null) { project.setColumn080090(project.getColumn080090() + "," + urlDTO.getProjectId().replace("&", "&"));//projectId存的照片路径 @@ -210,6 +222,12 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { } else if (detail != null && StringUtils.isNotBlank(detail.getStatus())) { project.setColumn090100(detail.getStatus().equals("Y") ? "✓" : "✘"); } + + QcStaticTable defect = defectMap.get(detail.getDetailId()); + if(defect != null && StringUtils.isNotBlank(defect.getRemark())){ + project.setColumn090100(project.getColumn090100()+" "+defect.getRemark()); + } + QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); if (urlDTO != null) { project.setColumn090100(project.getColumn090100() + "," + urlDTO.getProjectId().replace("&", "&"));//projectId存的照片路径 @@ -226,6 +244,12 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { } else if (detail != null && StringUtils.isNotBlank(detail.getStatus())) { project.setColumn100110(detail.getStatus().equals("Y") ? "✓" : "✘"); } + + QcStaticTable defect = defectMap.get(detail.getDetailId()); + if(defect != null && StringUtils.isNotBlank(defect.getRemark())){ + project.setColumn100110(project.getColumn100110()+" "+defect.getRemark()); + } + QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); if (urlDTO != null) { project.setColumn100110(project.getColumn100110() + "," + urlDTO.getProjectId().replace("&", "&"));//projectId存的照片路径 @@ -242,6 +266,12 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { } else if (detail != null && detail != null && StringUtils.isNotBlank(detail.getStatus())) { project.setColumn110120(detail.getStatus().equals("Y") ? "✓" : "✘"); } + + QcStaticTable defect = defectMap.get(detail.getDetailId()); + if(defect != null && StringUtils.isNotBlank(defect.getRemark())){ + project.setColumn110120(project.getColumn110120()+" "+defect.getRemark()); + } + QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); if (urlDTO != null) { project.setColumn110120(project.getColumn110120() + "," + urlDTO.getProjectId().replace("&", "&"));//projectId存的照片路径 @@ -258,6 +288,12 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { } else if (detail != null && StringUtils.isNotBlank(detail.getStatus())) { project.setColumn123133(detail.getStatus().equals("Y") ? "✓" : "✘"); } + + QcStaticTable defect = defectMap.get(detail.getDetailId()); + if(defect != null && StringUtils.isNotBlank(defect.getRemark())){ + project.setColumn123133(project.getColumn123133()+" "+defect.getRemark()); + } + QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); if (urlDTO != null) { project.setColumn123133(project.getColumn123133() + "," + urlDTO.getProjectId().replace("&", "&"));//projectId存的照片路径 @@ -274,6 +310,12 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { } else if (detail != null && StringUtils.isNotBlank(detail.getStatus())) { project.setColumn133143(detail.getStatus().equals("Y") ? "✓" : "✘"); } + + QcStaticTable defect = defectMap.get(detail.getDetailId()); + if(defect != null && StringUtils.isNotBlank(defect.getRemark())){ + project.setColumn133143(project.getColumn133143()+" "+defect.getRemark()); + } + QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); if (urlDTO != null) { project.setColumn133143(project.getColumn133143() + "," + urlDTO.getProjectId().replace("&", "&"));//projectId存的照片路径 @@ -290,6 +332,12 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { } else if (detail != null && StringUtils.isNotBlank(detail.getStatus())) { project.setColumn143153(detail.getStatus().equals("Y") ? "✓" : "✘"); } + + QcStaticTable defect = defectMap.get(detail.getDetailId()); + if(defect != null && StringUtils.isNotBlank(defect.getRemark())){ + project.setColumn143153(project.getColumn143153()+" "+defect.getRemark()); + } + QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); if (urlDTO != null) { project.setColumn143153(project.getColumn143153() + "," + urlDTO.getProjectId().replace("&", "&"));//projectId存的照片路径 @@ -306,6 +354,12 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { } else if (detail != null && StringUtils.isNotBlank(detail.getStatus())) { project.setColumn153163(detail.getStatus().equals("Y") ? "✓" : "✘"); } + + QcStaticTable defect = defectMap.get(detail.getDetailId()); + if(defect != null && StringUtils.isNotBlank(defect.getRemark())){ + project.setColumn153163(project.getColumn153163()+" "+defect.getRemark()); + } + QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); if (urlDTO != null) { project.setColumn153163(project.getColumn153163() + "," + urlDTO.getProjectId().replace("&", "&"));//projectId存的照片路径 @@ -322,6 +376,12 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { } else if (detail != null && StringUtils.isNotBlank(detail.getStatus())) { project.setColumn163173(detail.getStatus().equals("Y") ? "✓" : "✘"); } + + QcStaticTable defect = defectMap.get(detail.getDetailId()); + if(defect != null && StringUtils.isNotBlank(defect.getRemark())){ + project.setColumn163173(project.getColumn163173()+" "+defect.getRemark()); + } + QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); if (urlDTO != null) { project.setColumn163173(project.getColumn163173() + "," + urlDTO.getProjectId().replace("&", "&"));//projectId存的照片路径 @@ -338,6 +398,12 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { } else if (detail != null && StringUtils.isNotBlank(detail.getStatus())) { project.setColumn180190(detail.getStatus().equals("Y") ? "✓" : "✘"); } + + QcStaticTable defect = defectMap.get(detail.getDetailId()); + if(defect != null && StringUtils.isNotBlank(defect.getRemark())){ + project.setColumn180190(project.getColumn180190()+" "+defect.getRemark()); + } + QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); if (urlDTO != null) { project.setColumn180190(project.getColumn180190() + "," + urlDTO.getProjectId().replace("&", "&"));//projectId存的照片路径 @@ -354,6 +420,12 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { } else if (detail != null && StringUtils.isNotBlank(detail.getStatus())) { project.setColumn190200(detail.getStatus().equals("Y") ? "✓" : "✘"); } + + QcStaticTable defect = defectMap.get(detail.getDetailId()); + if(defect != null && StringUtils.isNotBlank(defect.getRemark())){ + project.setColumn190200(project.getColumn190200()+" "+defect.getRemark()); + } + QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); if (urlDTO != null) { project.setColumn190200(project.getColumn190200() + "," + urlDTO.getProjectId().replace("&", "&"));//projectId存的照片路径 @@ -370,6 +442,12 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { } else if (detail != null && StringUtils.isNotBlank(detail.getStatus())) { project.setColumn200210(detail.getStatus().equals("Y") ? "✓" : "✘"); } + + QcStaticTable defect = defectMap.get(detail.getDetailId()); + if(defect != null && StringUtils.isNotBlank(defect.getRemark())){ + project.setColumn200210(project.getColumn200210()+" "+defect.getRemark()); + } + QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); if (urlDTO != null) { project.setColumn200210(project.getColumn200210() + "," + urlDTO.getProjectId().replace("&", "&"));//projectId存的照片路径 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 e1e48ab3..403088fa 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 @@ -379,7 +379,7 @@ select '','','', qct.order_no, qct.material_code, qct.material_name, qct.quality, qct.unit, - qct.supplier_code, qct.supplier_name, qct.income_time,'','', + qct.supplier_code, qct.supplier_name,CONVERT(varchar(10), qct.income_time, 120) income_time,'','', null,'', qct.check_type,'巡检检验' check_name,CONVERT(varchar(10),qct.create_time, 120) createTimeStr, qct.confirm,qct.confirm_man_name from qc_check_task qct @@ -409,7 +409,7 @@ and qct.check_type = 'checkTypeSCXJ' GROUP BY qct.order_no, qct.material_code, qct.material_name, qct.quality, qct.unit, - qct.supplier_code, qct.supplier_name, qct.income_time, qct.check_type,CONVERT(varchar(10),qct.create_time, 120), + qct.supplier_code, qct.supplier_name,CONVERT(varchar(10), qct.income_time, 120), qct.check_type,CONVERT(varchar(10),qct.create_time, 120), qct.confirm,qct.confirm_man_name ) t left join pro_order_workorder pow on pow.workorder_code = t.order_no 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 9d49b5ec..bceeaf5c 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 @@ -154,6 +154,7 @@ +