From b1c10ef5ab87fa7e27078db3568b19233146c75f Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 19 Oct 2024 11:34:22 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95=20?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E7=9A=84=20=E7=94=9F=E4=BA=A7=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=AD=97=E6=AE=B5=20=E4=B8=B4=E6=97=B6=E5=9D=87?= =?UTF-8?q?=E5=86=99=E5=80=BC=20=E5=90=8E=E7=BB=AD=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java | 4 ++++ .../serviceimpl/base/roundness/MesTimeRoundnessService.java | 1 + 2 files changed, 5 insertions(+) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java index f50d110..2621f52 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java @@ -409,6 +409,7 @@ public class MesWorkOrderService extends BaseMesService implements //生产时间新增取当天 if (StringUtil.isEmpty(item.getProduceTime())) { item.setProduceTime(TimeTool.getToday()); + item.setProductTime(item.getProduceTime()); } item.setUnCompleteQty(item.getQty()); item.setFid(UUID.randomUUID().toString()); @@ -558,6 +559,7 @@ public class MesWorkOrderService extends BaseMesService implements MesException.throwMesBusiException("时间格式异常"); } item.setProduceTime(item.getPlanDate()); + item.setProductTime(item.getProduceTime()); } @Override @@ -742,6 +744,7 @@ public class MesWorkOrderService extends BaseMesService implements //生产时间新增取当天 if (StringUtil.isEmpty(item.getProduceTime())) { item.setProduceTime(TimeTool.getToday()); + item.setProductTime(item.getProduceTime()); } //若工单类型为排序 if (item.getWorkOrderType() == MesExtEnumUtil.ORDER_TYPE.SORT.getValue()) { @@ -1665,6 +1668,7 @@ public class MesWorkOrderService extends BaseMesService implements item.setPartName(mesProductionRecord.getPartName()); //生产时间新增取当天 item.setProduceTime(TimeTool.getToday()); + item.setProductTime(item.getProduceTime()); item.setUnCompleteQty(0d); item.setQty(value.stream().mapToDouble(MesProductionRecord::getQty).sum()); item.setReportedQty(item.getQty()); diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesTimeRoundnessService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesTimeRoundnessService.java index 6cb8d85..567d3c4 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesTimeRoundnessService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesTimeRoundnessService.java @@ -173,6 +173,7 @@ public class MesTimeRoundnessService implements IRoundnessStrategy { Date parse = format.parse(matchTime); String productTime = format.format(parse); mesWorkOrder.setProductTime(productTime); + mesWorkOrder.setProduceTime(productTime); // 11. 是否将生成日期减一天 // 班次 根据产线+计划时间匹配班次 DdlPackBean shiftPackBean = DdlPackBean.getDdlPackBean(detail.getOrganizeCode());