From d912b196804c25ca25bc6c7f5636ebcbf01a7960 Mon Sep 17 00:00:00 2001
From: "xiangwei.zhang" <752558143@qq.com>
Date: Wed, 12 Feb 2025 20:52:23 +0800
Subject: [PATCH] =?UTF-8?q?45071=20=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=20?=
 =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E5=8F=B7=EF=BC=88=E6=B2=A1=E5=A1=AB=E5=86=99?=
 =?UTF-8?q?=E5=88=99=E9=BB=98=E8=AE=A40=EF=BC=89=EF=BC=8C=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4=E3=80=81=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceimpl/base/MesWorkOrderService.java        | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

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 de18e8a..8176698 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
@@ -624,12 +624,17 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
         }
         item.setShiftName(mesShift.getShiftName());
         try {
-            //拼接
-            item.setPlanStartTime(TimeTool.parseStringFormat(item.getPlanDate() + MesExtConstWords.ONE_SPACE + mesShift.getStartTime(),DateUtil.BASE_FORMAT1,DateUtil.BASE_FORMAT));
-            item.setPlanEndTime(TimeTool.parseStringFormat(item.getPlanDate() + MesExtConstWords.ONE_SPACE + mesShift.getEndTime(),DateUtil.BASE_FORMAT1,DateUtil.BASE_FORMAT));
-            int windowStartEndTimeCompare = DateUtilExt.compareDateTime(DateUtil.BASE_FORMAT, item.getPlanStartTime(), item.getPlanEndTime());
-            if (windowStartEndTimeCompare > 0) {
-                item.setPlanEndTime(TimeTool.pareDateToString(DateUtil.addDays(item.getPlanEndTime(), 1)));
+            if (StringUtil.isEmpty(item.getPlanStartTime())) {
+                //拼接
+                item.setPlanStartTime(TimeTool.parseStringFormat(item.getPlanDate() + MesExtConstWords.ONE_SPACE + mesShift.getStartTime(), DateUtil.BASE_FORMAT1, DateUtil.BASE_FORMAT));
+            }
+            if (StringUtil.isEmpty(item.getPlanEndTime())) {
+                //拼接
+                item.setPlanEndTime(TimeTool.parseStringFormat(item.getPlanDate() + MesExtConstWords.ONE_SPACE + mesShift.getEndTime(),DateUtil.BASE_FORMAT1,DateUtil.BASE_FORMAT));
+                int windowStartEndTimeCompare = DateUtilExt.compareDateTime(DateUtil.BASE_FORMAT, item.getPlanStartTime(), item.getPlanEndTime());
+                if (windowStartEndTimeCompare > 0) {
+                    item.setPlanEndTime(TimeTool.pareDateToString(DateUtil.addDays(item.getPlanEndTime(), 1)));
+                }
             }
         } catch (Exception e) {
             MesException.throwMesBusiException("时间格式异常");
@@ -699,7 +704,10 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
                 }
                 item.setProductSeq(productSeq + 1);
                 item.setWorkOrderSeq(seqList.get(index));
+            } else {
+                item.setProductSeq(Long.valueOf(item.getWorkOrderSeq()));
             }
+
             item.setSystemSyncStatus(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
             ConvertBean.serviceModelInitialize(item, item.getCreateUser());
             baseRDao.insert(item);