Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/aspect/PcnRepositoryAspect.java

@@ -1,6 +1,6 @@
 package cn.estsh.i3plus.ext.mes.pcn.apiservice.aspect;
 
-import cn.estsh.i3plus.platform.common.tool.TimeTool;
+import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -116,6 +116,6 @@ public class PcnRepositoryAspect {
 
     private void updateBeanSync(BaseBean bean) {
         bean.setSystemSyncStatus(CommonEnumUtil.FALSE);
-        bean.setSystemSyncDatetime("");
+        bean.setSystemSyncDatetime(MesPcnExtConstWords.EMPTY);
     }
 }

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

@@ -618,7 +618,12 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
         partInspection.setWorkCenterCode(model.getWorkCenterCode());
         partInspection.setShiftCode(model.getShiftCode());
         partInspection.setSourceType(model.getSourceType());
-        ConvertBean.serviceModelInitialize(partInspection, AuthUtil.getSessionUser().getUserName());
+//        ConvertBean.serviceModelInitialize(partInspection, AuthUtil.getSessionUser().getUserName());
+        //42984 初检创建时修改人和修改时间不能赋值
+        partInspection.setCreateDatetime(TimeTool.getNowTime(true));
+        partInspection.setCreateUser(AuthUtil.getSessionUser().getUserName());
+        partInspection.setIsValid(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
+        partInspection.setIsDeleted(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
         return partInspection;
     }
 

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

@@ -358,6 +358,8 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService {
         spotCheckOrderTemp.setSpotCheckOrderResult(0);
         spotCheckOrderTemp.setSpotCheckTime("");
         spotCheckOrderTemp.setSpotCheckUser("");
+        spotCheckOrderTemp.setSystemSyncStatus(CommonEnumUtil.FALSE);
+        spotCheckOrderTemp.setSystemSyncDatetime("");
         ConvertBean.serviceModelInitialize(spotCheckOrderTemp, AuthUtil.getSessionUser().getUserName());
         spotCheckOrderTemp = spotCheckOrderRepository.insert(spotCheckOrderTemp);