From 1377d825145931726606c450a9a187bac2d098bc Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 25 Jul 2024 22:22:39 +0800 Subject: [PATCH 01/21] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E5=8A=A0=E4=B8=8D=E8=89=AF=E6=95=B0=E9=87=8F+=E9=A6=96?= =?UTF-8?q?=E6=A3=80=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 2e3074e56..df9c304cb 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 8684c5b79..373793847 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 5c780a38e..5bf9cb6f9 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 af74ce194..554cafdf4 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 f696c2376..5de6c48bd 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 b4314e0d5..61b0197b3 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 e1e48ab37..403088fa0 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 9d49b5ecd..bceeaf5cb 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 @@ + From cdd0b4548a60aee21af9facfea670ffba72ae375 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 25 Jul 2024 22:23:59 +0800 Subject: [PATCH 02/21] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E5=8A=A0=E4=B8=8D=E8=89=AF=E6=95=B0=E9=87=8F+=E9=A6=96?= =?UTF-8?q?=E6=A3=80=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 --- .../main/java/com/op/open/controller/OpenController.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java b/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java index eadd4fe8b..7137fcaa2 100644 --- a/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java +++ b/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java @@ -113,7 +113,13 @@ public class OpenController extends BaseController { return error("[factoryCode]不能为空"); } //添加检测任务 - return toAjax(openService.insertQcCheckTaskProduce(qcCheckTaskProduce)); + int flag = openService.insertQcCheckTaskProduce(qcCheckTaskProduce); + if(flag != -100){ + return toAjax(flag); + }else{ + return AjaxResult.error("该工单批次上次首检尚未结束，不允许重复发起"); + } + } /** From 5270236e81c1ae678921e85d7a6e2a55565f88ea Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 25 Jul 2024 22:34:13 +0800 Subject: [PATCH 03/21] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E5=8A=A0=E4=B8=8D=E8=89=AF=E6=95=B0=E9=87=8F+=E9=A6=96?= =?UTF-8?q?=E6=A3=80=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/mes/controller/MesReportWorkController.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java index 542aefeef..93e4fdf5f 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java @@ -56,8 +56,6 @@ import com.op.common.core.utils.poi.ExcelUtil; import com.op.common.core.web.page.TableDataInfo; import com.op.common.core.utils.poi.ExcelUtilDailyReport; -import static com.op.common.core.utils.poi.ExcelUtil.exportToExcel; - /** * 报工报表Controller * From b6a28ae2bbba65532dd0b3c5c7fbd02bbdd9e0b7 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Fri, 26 Jul 2024 17:41:38 +0800 Subject: [PATCH 04/21] =?UTF-8?q?wms=E6=88=90=E5=93=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E9=A1=B5=E9=9D=A2=E6=8E=A5=E5=8F=A32?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WmsProductPutController.java | 10 +- .../controller/WmsToWCSmissionController.java | 10 +- .../com/op/wms/domain/ProOrderWorkorder.java | 34 ++- .../domain/WmsProductProductionRecords.java | 258 ++++++++++++++++++ .../mapper/WmsProductPutRecordsMapper.java | 5 + .../op/wms/service/IWmsProductPutService.java | 4 + .../impl/WmsProductPutServiceImpl.java | 30 ++ .../mapper/wms/WmsProductPutRecordsMapper.xml | 102 +++++++ 8 files changed, 448 insertions(+), 5 deletions(-) create mode 100644 op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductProductionRecords.java diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsProductPutController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsProductPutController.java index 40699b084..97db642e6 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsProductPutController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsProductPutController.java @@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletResponse; import com.op.system.api.domain.wms.wmsReportWork; +import com.op.wms.domain.WmsProductProductionRecords; import com.op.wms.domain.WmsProductPut; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; @@ -136,6 +137,11 @@ public class WmsProductPutController extends BaseController { String rlist = wmsProductPutService.addReportListSap(mesReportWork); return AjaxResult.success(rlist); } - - + //查询--成品生产记录 + @GetMapping("/selectProductProductionRecords") + public TableDataInfo selectProductProductionRecords(WmsProductProductionRecords wmsProductProductionRecords) { + startPage(); + List result= wmsProductPutService.selectProductProductionRecords(wmsProductProductionRecords); + return getDataTable(result); + } } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java index 27fee1125..1751ad7d7 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java @@ -631,9 +631,15 @@ public class WmsToWCSmissionController { //保存--成品生产记录 @PostMapping("/finishedProductProductionRecords") public AjaxResult finishedProductProductionRecords(@RequestBody ProOrderWorkorder proOrderWorkorder) { - List list = wmsProductPutService.listProOrderWorkorder(proOrderWorkorder); - return success(list); + Integer result= wmsProductPutService.finishedProductProductionRecords(proOrderWorkorder); + return success(result); } +// //查询--成品生产记录 +// @PostMapping("/selectProductProductionRecords") +// public AjaxResult selectProductProductionRecords(@RequestBody WmsProductProductionRecords wmsProductProductionRecords) { +// List result= wmsProductPutService.selectProductProductionRecords(wmsProductProductionRecords); +// return success(result); +// } /** * 成品自动码垛完以后，RGV 接驳要入库的托盘，扫描 RFID 号，请求 WMS 获取入库托盘信息。 * 触发时机：扫描 RFID 编码，进行入库 diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/ProOrderWorkorder.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/ProOrderWorkorder.java index 66f677242..06478d045 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/ProOrderWorkorder.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/ProOrderWorkorder.java @@ -113,7 +113,11 @@ public class ProOrderWorkorder extends TreeEntity { */ @Excel(name = "产线编码") private String prodLineCode; - + /** + * 产线编码 + */ + @Excel(name = "产线名称") + private String prodLineName; /** * 工单生产日期 */ @@ -179,6 +183,24 @@ public class ProOrderWorkorder extends TreeEntity { */ @Excel(name = "产品类型") private String prodType; + @Excel(name = "托盘") + private String sn; + + public String getProdLineName() { + return prodLineName; + } + + public void setProdLineName(String prodLineName) { + this.prodLineName = prodLineName; + } + + public String getSn() { + return sn; + } + + public void setSn(String sn) { + this.sn = sn; + } /** * 是否为底层节点 1是 0不是 @@ -186,6 +208,16 @@ public class ProOrderWorkorder extends TreeEntity { @Excel(name = "是否为底层节点") private Integer endFlag; + private String quantity; + + public String getQuantity() { + return quantity; + } + + public void setQuantity(String quantity) { + this.quantity = quantity; + } + public Integer getEndFlag() { return endFlag; } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductProductionRecords.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductProductionRecords.java new file mode 100644 index 000000000..c91f73e04 --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductProductionRecords.java @@ -0,0 +1,258 @@ +package com.op.wms.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; + + +import java.util.Date; + +public class WmsProductProductionRecords extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * ID + */ + private String id; + + + private String siteCode; + /** + * 生产工单号 + */ + @Excel(name = "生产工单号") + private String productOrder; + + /** + * 产品名称 + */ + @Excel(name = "产品名称") + private String productName; + + /** + * 产品编码 + */ + @Excel(name = "产品编码") + private String productCode; + + /** + * 仓库编码 + */ + @Excel(name = "仓库编码") + private String whCode; + + /** + * 库区编码 + */ + @Excel(name = "库区编码") + private String waCode; + + /** + * 库位编码 + */ + @Excel(name = "库位编码") + private String wlCode; + + /** + * 托盘号 + */ + @Excel(name = "托盘号") + private String sn; + + /** + * 箱数 + */ + @Excel(name = "数量") + private String quantity; + + /** + * 预留字段1 + */ + @Excel(name = "预留字段1") + private String userDefined1; + + /** + * 预留字段2 + */ + @Excel(name = "预留字段2") + private String userDefined2; + + /** + * 预留字段3 + */ + @Excel(name = "预留字段3") + private String userDefined3; + + /** + * 预留字段4 + */ + @Excel(name = "预留字段4") + private String userDefined4; + + /** + * 预留字段5 + */ + @Excel(name = "预留字段5") + private String userDefined5; + @Excel(name = "批次") + private String batchCode; + @Excel(name = "产线名称") + private String lineName; + @Excel(name = "产线编号") + private String lineCode; + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "日期") + private Date productDate; + + public String getSiteCode() { + return siteCode; + } + + public void setSiteCode(String siteCode) { + this.siteCode = siteCode; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getProductOrder() { + return productOrder; + } + + public void setProductOrder(String productOrder) { + this.productOrder = productOrder; + } + + public String getProductName() { + return productName; + } + + public void setProductName(String productName) { + this.productName = productName; + } + + public String getProductCode() { + return productCode; + } + + public void setProductCode(String productCode) { + this.productCode = productCode; + } + + public String getWhCode() { + return whCode; + } + + public void setWhCode(String whCode) { + this.whCode = whCode; + } + + public String getWaCode() { + return waCode; + } + + public void setWaCode(String waCode) { + this.waCode = waCode; + } + + public String getWlCode() { + return wlCode; + } + + public void setWlCode(String wlCode) { + this.wlCode = wlCode; + } + + public String getSn() { + return sn; + } + + public void setSn(String sn) { + this.sn = sn; + } + + public String getQuantity() { + return quantity; + } + + public void setQuantity(String quantity) { + this.quantity = quantity; + } + + public String getUserDefined1() { + return userDefined1; + } + + public void setUserDefined1(String userDefined1) { + this.userDefined1 = userDefined1; + } + + public String getUserDefined2() { + return userDefined2; + } + + public void setUserDefined2(String userDefined2) { + this.userDefined2 = userDefined2; + } + + public String getUserDefined3() { + return userDefined3; + } + + public void setUserDefined3(String userDefined3) { + this.userDefined3 = userDefined3; + } + + public String getUserDefined4() { + return userDefined4; + } + + public void setUserDefined4(String userDefined4) { + this.userDefined4 = userDefined4; + } + + public String getUserDefined5() { + return userDefined5; + } + + public void setUserDefined5(String userDefined5) { + this.userDefined5 = userDefined5; + } + + public String getBatchCode() { + return batchCode; + } + + public void setBatchCode(String batchCode) { + this.batchCode = batchCode; + } + + public String getLineName() { + return lineName; + } + + public void setLineName(String lineName) { + this.lineName = lineName; + } + + public String getLineCode() { + return lineCode; + } + + public void setLineCode(String lineCode) { + this.lineCode = lineCode; + } + + public Date getProductDate() { + return productDate; + } + + public void setProductDate(Date productDate) { + this.productDate = productDate; + } +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutRecordsMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutRecordsMapper.java index 4189eade4..6d9eb8ae0 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutRecordsMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutRecordsMapper.java @@ -2,6 +2,7 @@ package com.op.wms.mapper; import java.util.List; +import com.op.wms.domain.WmsProductProductionRecords; import com.op.wms.domain.WmsProductPutRecords; /** @@ -58,4 +59,8 @@ public interface WmsProductPutRecordsMapper { * @return 结果 */ public int deleteWmsProductPutRecordsByIds(String[] ids); + + Integer insertProductProductionRecord(WmsProductProductionRecords wmsProductProductionRecords); + + List selectProductProductionRecords(WmsProductProductionRecords wmsProductProductionRecords); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java index 114b75f04..6535ef551 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java @@ -134,4 +134,8 @@ public interface IWmsProductPutService { List selectBaseEquipmentList(BaseEquipment baseEquipment); List listProOrderWorkorder(ProOrderWorkorder proOrderWorkorder); + + Integer finishedProductProductionRecords(ProOrderWorkorder proOrderWorkorder); + + List selectProductProductionRecords(WmsProductProductionRecords wmsProductProductionRecords); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java index b81c59635..7db9a07a6 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java @@ -997,6 +997,36 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { return workorderList; } + @Override + public Integer finishedProductProductionRecords(ProOrderWorkorder proOrderWorkorder) { + DynamicDataSourceContextHolder.push("ds_" + proOrderWorkorder.getFactoryCode()); + WmsProductProductionRecords wmsProductProductionRecords=new WmsProductProductionRecords(); + wmsProductProductionRecords.setSiteCode(proOrderWorkorder.getFactoryCode()); + wmsProductProductionRecords.setId(IdUtils.fastSimpleUUID()); + wmsProductProductionRecords.setSn(proOrderWorkorder.getSn()); + wmsProductProductionRecords.setQuantity(proOrderWorkorder.getQuantity()); + wmsProductProductionRecords.setBatchCode(proOrderWorkorder.getBatchCode()); + wmsProductProductionRecords.setProductOrder(proOrderWorkorder.getWorkorderCodeSap()); + wmsProductProductionRecords.setProductCode(proOrderWorkorder.getProductCode()); + wmsProductProductionRecords.setProductName(proOrderWorkorder.getProductName()); + wmsProductProductionRecords.setProductDate(new Date()); + wmsProductProductionRecords.setLineName(proOrderWorkorder.getProdLineName()); + wmsProductProductionRecords.setLineCode(proOrderWorkorder.getProdLineCode()); + wmsProductProductionRecords.setCreateBy(proOrderWorkorder.getCreateBy()); + wmsProductProductionRecords.setCreateTime(new Date()); + Integer result= wmsProductPutRecordsMapper.insertProductProductionRecord(wmsProductProductionRecords); + return result; + } + + @Override + @DS("#header.poolName") + public List selectProductProductionRecords(WmsProductProductionRecords wmsProductProductionRecords) { + // DynamicDataSourceContextHolder.push("ds_" + wmsProductProductionRecords.getSiteCode()); + + List records= wmsProductPutRecordsMapper.selectProductProductionRecords(wmsProductProductionRecords); + return records; + } + @Override public List FinishedProductSalesReturn(WmsRuturnPutEmbryo wmsRuturnPutEmbryo) { DynamicDataSourceContextHolder.push("ds_" + wmsRuturnPutEmbryo.getFactoryCode()); diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutRecordsMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutRecordsMapper.xml index 35e85c6b1..c1791b424 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutRecordsMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutRecordsMapper.xml @@ -139,4 +139,106 @@ #{id} + + insert into wms_product_production_records + + id, + product_order, + product_name, + product_code, + wh_code, + wa_code, + wl_code, + sn, + + user_defined1, + user_defined2, + user_defined3, + user_defined4, + user_defined5, + create_by, + create_time, + update_by, + update_time, + batch_code, + quantity, + lineName, + lineCode, + product_date, + siteCode, + + + #{id}, + #{productOrder}, + #{productName}, + #{productCode}, + #{whCode}, + #{waCode}, + #{wlCode}, + #{sn}, + + #{userDefined1}, + #{userDefined2}, + #{userDefined3}, + #{userDefined4}, + #{userDefined5}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{batchCode}, + #{quantity}, + #{lineName}, + #{lineCode}, + #{productDate}, + #{siteCode}, + + + From c5f0487ade6c95f1c1fb3621a5fb550b1755ee58 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Sat, 27 Jul 2024 10:43:03 +0800 Subject: [PATCH 05/21] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E5=BC=82=E6=AD=A5=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/QcCheckTaskProduceServiceImpl.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java index 9a4c18820..3c18292dd 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java @@ -7,10 +7,7 @@ import java.time.Duration; import java.time.LocalDateTime; import java.time.LocalTime; import java.util.*; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; +import java.util.concurrent.*; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; @@ -309,11 +306,11 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService } logger.info("质检检验企业微信提醒请求：" + JSONObject.toJSONString(wecharts)); if (!CollectionUtils.isEmpty(wecharts)) { - new Thread(() -> { + CompletableFuture.runAsync(() -> { + System.out.println("异步执行企业微信发送"); AjaxResult result = remoteOpenService.sendWeChartMessage(wecharts); logger.info("质检检验企业微信提醒结果：" + JSONObject.toJSONString(result)); - - }).start(); + }); } //发企业微信--------------------结束 } From 64c0c150f08279c1b86a0e2ec23b32b5f9e188c6 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Sat, 27 Jul 2024 10:43:48 +0800 Subject: [PATCH 06/21] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E5=BC=82=E6=AD=A5=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/api/domain/mes/BaseProductDTO.java | 40 +++++++++++++++++ .../op/open/controller/OpenController.java | 6 +++ .../java/com/op/open/service/OpenService.java | 3 ++ .../op/open/service/impl/OpenServiceImpl.java | 44 ++++++++++++++++++- 4 files changed, 91 insertions(+), 2 deletions(-) diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/BaseProductDTO.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/BaseProductDTO.java index ca164f14a..288abdcd1 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/BaseProductDTO.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/BaseProductDTO.java @@ -233,6 +233,46 @@ public class BaseProductDTO extends BaseEntity { /** 其它 */ @Excel(name = "其它") private String other; + /**标准模板**/ + private String mvgr5; + /**单位**/ + private String meins; + //转换分子 + private String umrez; + //转换分母 + private String umren; + + public String getUmren() { + return umren; + } + + public void setUmren(String umren) { + this.umren = umren; + } + + public String getUmrez() { + return umrez; + } + + public void setUmrez(String umrez) { + this.umrez = umrez; + } + + public String getMeins() { + return meins; + } + + public void setMeins(String meins) { + this.meins = meins; + } + + public String getMvgr5() { + return mvgr5; + } + + public void setMvgr5(String mvgr5) { + this.mvgr5 = mvgr5; + } public void setCategory(String category) { this.category = category; diff --git a/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java b/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java index 7137fcaa2..6a1acdf5d 100644 --- a/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java +++ b/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java @@ -12,6 +12,7 @@ import com.op.system.api.domain.DataSourcePropertyDTO; import com.op.system.api.domain.device.EquRepairOrderDTO; import com.op.system.api.domain.dto.WCSDTO; import com.op.system.api.domain.dto.WechartDTO; +import com.op.system.api.domain.mes.BaseProductDTO; import com.op.system.api.domain.quality.QcCheckTaskProduceDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -250,4 +251,9 @@ public class OpenController extends BaseController { public AjaxResult getDeliveryNoteDetail(@RequestBody Map paramMap) { return openService.getDeliveryNoteDetail(paramMap); } + //给oa提供的物料建议标准更新 + @PostMapping("/sendProductCheckNo") + public AjaxResult sendProductCheckNo(@RequestBody List dots) { + return openService.sendProductCheckNo(dots); + } } diff --git a/op-modules/op-open/src/main/java/com/op/open/service/OpenService.java b/op-modules/op-open/src/main/java/com/op/open/service/OpenService.java index f0d1f62c7..6b4caf766 100644 --- a/op-modules/op-open/src/main/java/com/op/open/service/OpenService.java +++ b/op-modules/op-open/src/main/java/com/op/open/service/OpenService.java @@ -5,6 +5,7 @@ import com.op.common.core.web.domain.AjaxResult; import com.op.system.api.domain.device.EquRepairOrderDTO; import com.op.system.api.domain.dto.WCSDTO; import com.op.system.api.domain.dto.WechartDTO; +import com.op.system.api.domain.mes.BaseProductDTO; import com.op.system.api.domain.mes.MesReportWorkDTO; import com.op.system.api.domain.quality.QcCheckTaskDTO; import com.op.system.api.domain.quality.QcCheckTaskProduceDTO; @@ -43,4 +44,6 @@ public interface OpenService { AjaxResult sendWeChartMessage(List wechartDTO); AjaxResult getDeliveryNoteDetail(Map paramMap); + + AjaxResult sendProductCheckNo(List dots); } 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 373793847..a1f7633a9 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 @@ -21,8 +21,10 @@ import com.op.system.api.domain.device.EquRepairOrderDTO; import com.op.system.api.domain.dto.WCSDTO; import com.op.system.api.domain.dto.WCSDataDTO; import com.op.system.api.domain.dto.WechartDTO; +import com.op.system.api.domain.mes.BaseProductDTO; import com.op.system.api.domain.mes.ProRfidProcessDetail; import com.op.system.api.domain.quality.*; +import com.op.system.api.domain.sap.SapSupplier; import org.apache.commons.lang.StringUtils; import java.text.SimpleDateFormat; @@ -615,7 +617,7 @@ public class OpenServiceImpl implements OpenService { @Override public AjaxResult sendWeChartMessage(List dtos) { try { - logger.info(JSONObject.toJSONString("open企业微信发送参数"+dtos)); + logger.info("open企业微信发送参数："+JSONObject.toJSONString(dtos)); String result = HttpUtils.sendPostWechart(weChartUrl, JSON.toJSONString(dtos)); return success(result); } catch (Exception e) { @@ -624,7 +626,45 @@ public class OpenServiceImpl implements OpenService { } } - + /** + * 物料编码+productCode + * 物料描述+productDescZh + * 物料组编码+productGroup + * 物料组名称+productGroupName + * 单位+meins + * 规格+productModel + * 计量转换分子+umrez + * 分母UMREZ+umren + * 检验标准+ mvgr5 + * 毛重（无\0）+ grosseight + * 体积 volume + * **/ + @Override + public AjaxResult sendProductCheckNo(List dtos) { + try { + logger.info("oa更新检验标准发送参数"+JSONObject.toJSONString(dtos)); +// int allsize = dtos.size(); +// if(CollectionUtils.isEmpty(dtos)){ +// return error("oa更新检验标准发送参数为空"); +// } +// int inserttimes = allsize / 100 + 1; +// for (int m = 0; m < inserttimes; m++) { +// List everyList; +// if (m < (inserttimes - 1)) { +// everyList = dtos.subList(m * 100, (m + 1) * 100); +// } else { +// everyList = dtos.subList(m * 100, allsize); +// } +// if (everyList.size() > 0) { +// sapBomMapper.addSupplierBatchs(everyList); +// } +// } + return success(); + } catch (Exception e) { + e.printStackTrace(); + return error(e.getMessage()); + } + } protected Boolean oneMinHas(Date lastData){ if(lastData != null){ From 53764c857ddeee695106cfb411beb985975baec6 Mon Sep 17 00:00:00 2001 From: yinq Date: Mon, 29 Jul 2024 09:54:19 +0800 Subject: [PATCH 07/21] =?UTF-8?q?update=20-=20ems=E6=B0=B4=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/report/ReportPointWaterMapper.xml | 39 +++++++++---------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/op-modules/op-energy/src/main/resources/mapper/report/ReportPointWaterMapper.xml b/op-modules/op-energy/src/main/resources/mapper/report/ReportPointWaterMapper.xml index 9b22b75d8..1cdab4a67 100644 --- a/op-modules/op-energy/src/main/resources/mapper/report/ReportPointWaterMapper.xml +++ b/op-modules/op-energy/src/main/resources/mapper/report/ReportPointWaterMapper.xml @@ -75,16 +75,16 @@ and price = #{price} and (report_point_water.monitor_id = #{monitorSubset} OR report_point_water.monitor_id IN - (SELECT t.monitor_id FROM base_monitor_info t WHERE FIND_IN_SET(#{monitorSubset}, ancestors))) + (SELECT t.monitor_id FROM base_monitor_info t WHERE dbo.FIND_IN_SET(#{monitorSubset}, ancestors) > 0)) - and begin_time between #{params.beginBeginTime} and #{params.endBeginTime} + and CONVERT(VARCHAR(17), begin_time, 120) between #{params.beginBeginTime} and #{params.endBeginTime} - and begin_time between #{params.startTime} and #{params.endTime} + and CONVERT(VARCHAR(17), begin_time, 120) between #{params.startTime} and #{params.endTime} - and begin_time between #{params.beginCollectTime} and #{params.endCollectTime} + and CONVERT(VARCHAR(17), begin_time, 120) between #{params.beginCollectTime} and #{params.endCollectTime} and begin_time = #{beginTime} and end_time = #{endTime} @@ -116,9 +116,9 @@ where report_point_water.objid = #{objid} select ert.monitor_id, ert.monitor_name, ert.pointTime, sum(if(ert.expend is null, 0, ert.expend)) expend from ( - select rpd.monitor_id, m.monitor_name, left(rpd.begin_time, 10) pointTime, rpd.expend + select rpd.monitor_id, m.monitor_name, left(CONVERT(VARCHAR(17), rpd.begin_time, 120), 10) pointTime, rpd.expend from report_point_water rpd left join base_monitor_info m on m.monitor_id = rpd.monitor_id @@ -158,7 +158,7 @@ and rpd.begin_time between #{startTime} and #{endTime} - and left(rpd.begin_time, 10) between #{startDay} and #{endDay} + and left(CONVERT(VARCHAR(17), rpd.begin_time, 120), 10) between #{startDay} and #{endDay} ) ert @@ -168,21 +168,21 @@ @@ -385,6 +406,22 @@ ) + + insert into base_product( + product_code,product_desc_zh,product_group,product_group_name, + meins,product_model,umrez,umren,mvgr5, + gross_weight,volume + ,create_by,create_time + ) values + + ( + #{item.productCode},#{item.productDescZh},#{item.productGroup},#{item.productGroupName}, + #{item.meins},#{item.productModel},#{item.umrez},#{item.umren},#{item.mvgr5}, + #{item.grossWeight},#{item.volume}, + 'oa',GETDATE() + ) + + + From e9c64c918f67799f66d1217aa164037dc9ca95be Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Mon, 29 Jul 2024 12:04:03 +0800 Subject: [PATCH 09/21] =?UTF-8?q?wms=E6=8F=90=E5=8D=95=E5=B0=8F=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/wms/OdsProcureOrderMapper.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml index a2ccd8c4a..6a6f837bd 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml @@ -48,7 +48,8 @@ and Site_code = #{siteCode} and Procure_Code = #{procureCode} - and Material_Code = #{materialCode} + and Material_Code like concat('%', #{materialCode}, + '%') and Material_Desc = #{materialDesc} and Plan_Date = #{planDate} and Plan_Number = #{planNumber} From 47c690e44453e1df237869342da971d07b097d3e Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Mon, 29 Jul 2024 12:26:56 +0800 Subject: [PATCH 10/21] =?UTF-8?q?oa=E6=9B=B4=E6=96=B0=E8=B4=A8=E6=A3=80?= =?UTF-8?q?=E6=A0=87=E5=87=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/op/sap/service/impl/SapItemSyncImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java index 598501d9d..dd59c69da 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java @@ -155,8 +155,8 @@ public class SapItemSyncImpl implements SapItemSyncService { String MVGR3_NM = maraTable.getString("MVGR3_NM"); String MVGR4 = maraTable.getString("MVGR4"); String MVGR4_NM = maraTable.getString("MVGR4_NM"); - String MVGR5 = maraTable.getString("MVGR5"); - String MVGR5_NM = maraTable.getString("MVGR5_NM"); +// String MVGR5 = maraTable.getString("MVGR5");//标准占用 +// String MVGR5_NM = maraTable.getString("MVGR5_NM");//批次最大数量占用 String LAEDA = maraTable.getString("LAEDA"); String ERSDA = maraTable.getString("LAEDA"); log.info(i+"物料基础数据同步数据输出----" + From 50080086d60bc9ed205a8551cf48ef8058f2f802 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Mon, 29 Jul 2024 12:28:09 +0800 Subject: [PATCH 11/21] =?UTF-8?q?oa=E6=9B=B4=E6=96=B0=E8=B4=A8=E6=A3=80?= =?UTF-8?q?=E6=A0=87=E5=87=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/quality/controller/QcCheckTaskIncomeController.java | 2 ++ .../op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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 e61a41608..411b51c10 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 @@ -242,6 +242,8 @@ public class QcCheckTaskIncomeController extends BaseController { @PostMapping("/createIncomeTask") public AjaxResult createIncomeTask(@RequestBody QcCheckTaskIncomeDTO qcCheckTaskIncome) { + logger.info("创建检验任务接收参数："+JSONObject.toJSONString(qcCheckTaskIncome)); + if (StringUtils.isBlank(qcCheckTaskIncome.getOrderNo())) { return error("[orderNo]不能为空"); } 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 d490b3070..b3bb01791 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 @@ -146,7 +146,7 @@ public class QcCheckTaskIncomeServiceImpl implements */ @Override public int insertQcCheckTaskIncome(QcCheckTaskIncome qcCheckTaskIncome) { - logger.info("创建检验任务接收参数："+JSONObject.toJSONString(qcCheckTaskIncome)); + logger.info("impl创建检验任务接收参数："+JSONObject.toJSONString(qcCheckTaskIncome)); DynamicDataSourceContextHolder.push("ds_" + qcCheckTaskIncome.getFactoryCode()); String bpDD = DateUtils.parseDateToStr(DateUtils.YYYYMMDD, DateUtils.getNowDate()); int liushuiNum = qcCheckTaskIncomeMapper.getTodayMaxNum(qcCheckTaskIncome); From dc1f1ecff258af6ad063f44ada18f3d93f0383f5 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Mon, 29 Jul 2024 14:35:31 +0800 Subject: [PATCH 12/21] =?UTF-8?q?wms=E7=89=A9=E6=96=99=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/wms/service/impl/OdsProcureOrderServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java index 1c65ab2f1..dcfc7c2ca 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java @@ -805,7 +805,11 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { order.setProcureCode(sapPurchaseOrderQuery1.get("orderNum")); order.setSiteCode(sapPurchaseOrderQuery1.get("werks")); //order.setUserDefined3(sapPurchaseOrderQuery1.get("ebelp"));//批次 - order.setMaterialCode(sapPurchaseOrderQuery1.get("matnr")); + String materialCode = sapPurchaseOrderQuery1.get("matnr"); + materialCode = "0000000" + materialCode; + order.setMaterialCode(materialCode); +// order.setMaterialCode(sapPurchaseOrderQuery1.get("matnr")); +// order.setMaterialCode("0000000"+order.getMaterialCode()); order.setMaterialDesc(sapPurchaseOrderQuery1.get("matnrName")); order.setActive("1"); List orderList = odsProcureOrderMapper.selectOdsProcureOrderList(order); From 90d1e52de8bcb1a31b61153016222824ac29257a Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 1 Aug 2024 11:06:50 +0800 Subject: [PATCH 13/21] =?UTF-8?q?=E6=89=B9=E6=AC=A1=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/plan/service/impl/ProOrderWorkorderServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java index 1377de7a6..e058e4f79 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java @@ -1191,7 +1191,7 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { return count; } @Override - @Transactional(rollbackFor = Exception.class) + //@Transactional(rollbackFor = Exception.class) @DS("#header.poolName") public int updateWorkOrderBatch(ProOrderWorkorderBatch proOrderWorkorderBatch) { String workOrderCode = proOrderWorkorderBatch.getWorkorderCode(); @@ -1218,10 +1218,10 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { if(proOrderWorkorderBatch.getNewBatchQuantity() != null){ Long newBatchQuantity = proOrderWorkorderBatch.getNewBatchQuantity(); - if(m==0 || m== workOrders.size()-1){ - // 设置子工单数量 + if(m==0){ batch.setNewBatchQuantity(newBatchQuantity); }else{ + // 设置子工单数量 batch.setNewBatchQuantity(workOrders.get(m-1).getUmrez() .multiply(new BigDecimal(newBatchQuantity)).longValue()); } From df6d74daca55095ebdb105386ee840872ed10492 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 1 Aug 2024 15:49:17 +0800 Subject: [PATCH 14/21] =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E6=8E=A5=E5=8F=A3sql?= =?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/mes/MesMapper.xml | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml index 171739763..4d619ce2e 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml @@ -362,22 +362,24 @@ group by check_result + + diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProduct.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProduct.java index 3ce336b19..2a656afe1 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProduct.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProduct.java @@ -352,6 +352,15 @@ public class BaseProduct extends BaseEntity { @Excel(name = "报工汇率") private BigDecimal reportRate; private String mvgr5Nm; + private String warehouseCycle; + + public String getWarehouseCycle() { + return warehouseCycle; + } + + public void setWarehouseCycle(String warehouseCycle) { + this.warehouseCycle = warehouseCycle; + } public String getMvgr5Nm() { return mvgr5Nm; diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProductAttached.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProductAttached.java index 2f021ecb1..1e4882764 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProductAttached.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProductAttached.java @@ -122,6 +122,15 @@ public class BaseProductAttached extends BaseEntity { */ @Excel(name = "其它") private String other; + private String warehouseCycle; + + public String getWarehouseCycle() { + return warehouseCycle; + } + + public void setWarehouseCycle(String warehouseCycle) { + this.warehouseCycle = warehouseCycle; + } public void setId(String id) { this.id = id; diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductAttachedMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductAttachedMapper.xml index 81ecda8b0..cdbd24949 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductAttachedMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductAttachedMapper.xml @@ -86,6 +86,7 @@ pc, iei, man_standar, + warehouse_cycle, spray_way, blank_diameter, blank_no, @@ -106,6 +107,7 @@ #{pc}, #{iei}, #{manStandar}, + #{warehouseCycle}, #{sprayWay}, #{blankDiameter}, #{blankNo}, @@ -149,7 +151,8 @@ update base_product_attached set iei = #{iei}, - man_standar = #{manStandar} + man_standar = #{manStandar}, + warehouse_cycle = #{warehouseCycle} where id = #{id} diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml index 901d89836..bd8b298f1 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml @@ -67,6 +67,8 @@ + + @@ -183,7 +185,7 @@ bpa.support_no, bpa.pvc, bpa.support_plate, - bpa.other + bpa.other,bpa.warehouse_cycle from base_product bp left join base_product_attached bpa on bpa.product_code = right(bp.product_code,11) where product_id = #{productId} From dab3247888114bed8854e0005bde90f5283a1e21 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Fri, 2 Aug 2024 10:08:29 +0800 Subject: [PATCH 18/21] =?UTF-8?q?=E4=BB=93=E5=BA=93=E6=A3=80=E9=AA=8C?= =?UTF-8?q?=E5=90=AF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op-mes/src/main/resources/mapper/mes/MesMapper.xml | 5 ++++- .../main/resources/mapper/quality/QcStaticTableMapper.xml | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml index 9caac7210..2e3e2d823 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml @@ -337,9 +337,12 @@ pow.unit from pro_order_workorder pow left join base_equipment be on pow.workorder_name = be.equipment_code and be.equipment_type_code = 'equ_type_bzx' - where pow.workorder_name = #{equCode} and pow.status = 'w2' + where pow.workorder_name = #{equCode} and CONVERT ( DATE, pow.product_date ) = CONVERT ( DATE, GETDATE( ) ) and pow.parent_order = '0' and pow.del_flag='0' + + and pow.workorder_code_sap = #{workorderCodeSap} +