From 4d9a028d82fa796fe65428ece19fa0c348f540a0 Mon Sep 17 00:00:00 2001
From: "xiangwei.zhang" <752558143@qq.com>
Date: Mon, 25 Nov 2024 10:54:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E4=B8=80=E5=A4=A9=E6=8A=A5=E5=B7=A5?=
 =?UTF-8?q?=E6=94=B9=E6=88=90=E5=89=8D20=E5=A4=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java
index 76931dc..ae320d4 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java
@@ -920,7 +920,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
         }
         //获取前一天的早班到当天早班的区间的所有加工记录，统计个数
         DdlPreparedPack.timeBuilder(
-                new SimpleDateFormat("yyyy-MM-dd").format(TimeTool.getDateBefore(new Date(), 1)) + startTime,
+                new SimpleDateFormat("yyyy-MM-dd").format(TimeTool.getDateBefore(new Date(), 20)) + startTime,
                 TimeTool.getToday() + startTime,
                 "completeDateTime", ddlPackBean, false);
 
@@ -1176,7 +1176,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
             item.setShiftCode(mesShift.getShiftCode());
             item.setShiftName(mesShift.getShiftName());
             String today = TimeTool.getToday();
-            String dayBefore = new SimpleDateFormat("yyyy-MM-dd").format(TimeTool.getDateBefore(new Date(), 1));
+            String dayBefore = new SimpleDateFormat("yyyy-MM-dd").format(TimeTool.getDateBefore(new Date(), 20));
             item.setPlanStartTime(dayBefore + " " + mesShift.getStartTime());
             item.setPlanEndTime(today + " " + mesShift.getEndTime());
 
@@ -1277,10 +1277,10 @@ public class MesWorkOrderService implements IMesWorkOrderService {
         newMesProductOffLine.setItemUnit(mesBom.getItemUnit());
         newMesProductOffLine.setWorkOrderNo(mesWorkOrder.getWorkOrderNo());
         newMesProductOffLine.setWorkOrderType(mesWorkOrder.getWorkOrderType());
-        newMesProductOffLine.setWorkCenterCode(mesWorkOrder.getWorkCenterCode());
+        newMesProductOffLine.setWorkCenterCode(mesProductVersion.getWorkCenterCode());
         newMesProductOffLine.setWorkCellCode(mesWorkOrder.getWorkCellCode());
         newMesProductOffLine.setReportType(mesWorkOrder.getReportType());
-        newMesProductOffLine.setSapWorkCenter(mesWorkOrder.getErpWorkCenter());
+        newMesProductOffLine.setSapWorkCenter(mesProductVersion.getWorkCenterCode());
         newMesProductOffLine.setOrganizeCode(mesWorkOrder.getOrganizeCode());
         newMesProductOffLine.setDescription(nowTime);
         newMesProductOffLine.setBomTotalSize(bomTotalSize);