Merge remote-tracking branch 'origin/uat' into uat

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

@@ -1014,6 +1014,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
         if (Objects.isNull(mesWorkOrderDb)) {
             MesPcnException.throwMesBusiException("工单id为【%s】工单信息不存在", mesWorkOrder.getId());
         }
+        mesWorkOrderDb.setDescription(mesWorkOrder.getDescription());
         //查询物料信息
         MesPart mesPart = iMesPartService.getMesPartByPartNo(mesWorkOrderDb.getPartNo(), mesWorkOrderDb.getOrganizeCode());
         //查询产线信息
@@ -1055,7 +1056,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
         if (Objects.isNull(mesWorkOrderDb.getOrderFlag()) || !MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.P.getValue().equals(mesWorkOrderDb.getOrderFlag())) {
             //保存数据
             List<MesProductOffLine> mesProductOffLineList = new ArrayList<>();
-            String nowTime = TimeTool.getNowTime(true);
+            String nowTime = StringUtil.isEmpty(mesWorkOrder.getDescription())?TimeTool.getNowTime(true):mesWorkOrder.getDescription();
             for (MesBom mesBom : mesBoms) {
                 mesProductOffLineList.add(creatMesProductOffLine(mesWorkOrder, mesProductVersion, sn, mesBom, nowTime,mesBoms.size()));
             }