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

@@ -632,7 +632,8 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
     private MesMove createMove(MesPartInspectionInputModel model, String source, String target, String org, String workCenterCode) {
         GenSerialNoModel serialNoModel = new GenSerialNoModel("INPUT_DEFECT_ZRSUM");
         serialNoModel.setPartNo(model.getPart().getPartNo());
-        ResultBean rb = syncFuncService.syncSerialNo(serialNoModel, AuthUtil.getSessionUser().getUserName(), org, 1);
+//        ResultBean rb = syncFuncService.syncSerialNo(serialNoModel, AuthUtil.getSessionUser().getUserName(), org, 1);
+        ResultBean rb = syncFuncService.syncSerialNo(serialNoModel, "系统", org, 1);
         String zrsum = "";
         if (null != rb && !CollectionUtils.isEmpty(rb.getResultList())) {
             zrsum = (rb.getResultList().get(0)).toString();
@@ -653,7 +654,8 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
         move.setMoveType(MesExtEnumUtil.MOVE_TYPE.SUSPICIOUS_MOVE.getValue());
         move.setProductSn(model.getSn());
         move.setWorkCenter(prodOrgExtService.getErpWorkCenterCode(org, workCenterCode));
-        ConvertBean.serviceModelInitialize(move, AuthUtil.getSessionUser().getUserName());
+//        ConvertBean.serviceModelInitialize(move, AuthUtil.getSessionUser().getUserName());
+        ConvertBean.serviceModelInitialize(move, "系统");
         return move;
     }
 

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

@@ -333,7 +333,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
                 newMesProductOffLine.setReportType(mesWorkOrderDb.getReportType());
                 newMesProductOffLine.setSapWorkCenter(mesWorkOrderDb.getErpWorkCenter());
                 newMesProductOffLine.setOrganizeCode(organizeCode);
-
+                newMesProductOffLine.setDescription(mesProductionRecord.getCompleteDateTime());
                 ConvertBean.serviceModelInitialize(newMesProductOffLine, userName);
                 mesProductOffLineList.add(newMesProductOffLine);
             }
@@ -637,7 +637,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
             newMesProductOffLine.setReportType(oldMesWorkOrder.getReportType());
             newMesProductOffLine.setSapWorkCenter(oldMesWorkOrder.getErpWorkCenter());
             newMesProductOffLine.setOrganizeCode(oldMesWorkOrder.getOrganizeCode());
-
+            newMesProductOffLine.setDescription(productionRecord.getCompleteDateTime());
             ConvertBean.serviceModelInitialize(newMesProductOffLine, userName);
             mesProductOffLineList.add(newMesProductOffLine);
         }

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSnCheckNosortStepService.java

@@ -143,7 +143,7 @@ public class MesProductSnCheckNosortStepService extends BaseStepService {
                 return stepResult.isCompleted(false).msg(String.format("%s主条码[%s]条码状态[%s]", suffixMsg, equipVariableCollectContext.getEquipVariableValue(), MesExtEnumUtil.PRODUCE_SN_STATUS.valueOfDescription(standardList.get(0).getSnStatus())));
 
             MesProductionPsInContext productionPsInContext = new MesProductionPsInContext(workCell, standardList.get(0)).messageSource(equipVariableCollectContext.getMessageSource());
-            if (!CollectionUtils.isEmpty(unknowList)) productionPsInContext.relateId(unknowList.get(0).getId(), unknowList.get(0).getProcessCode(), unknowList.get(0).getCraftCode());
+            if (!CollectionUtils.isEmpty(unknowList)) productionPsInContext.relateId(unknowList.get(0).getId(), standardList.get(0).getProcessCode(), standardList.get(0).getCraftCode());
             productionPsInContextList.add(productionPsInContext);
 
         }