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

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;
     }