Merge remote-tracking branch 'origin/dev_temp_xw_202502120000_45071' into test

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java

@@ -624,13 +624,18 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
         }
         item.setShiftName(mesShift.getShiftName());
         try {
+            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.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)));
                 }
+            }
         } catch (Exception e) {
             MesException.throwMesBusiException("时间格式异常");
         }
@@ -699,7 +704,12 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
                 }
                 item.setProductSeq(productSeq + 1);
                 item.setWorkOrderSeq(seqList.get(index));
+            } else {
+                if (!StringUtil.isEmpty(item.getWorkOrderSeq())) {
+                    item.setProductSeq(Long.valueOf(item.getWorkOrderSeq()));
+                }
             }
+
             item.setSystemSyncStatus(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
             ConvertBean.serviceModelInitialize(item, item.getCreateUser());
             baseRDao.insert(item);