责任人卡控

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesNcProcessingController.java

@@ -85,7 +85,7 @@ public class MesNcProcessingController {
             // 数据校验
             ValidatorBean.checkNotNull(model.getPartInspection(), "单据不能为空");
             ValidatorBean.checkNotNull(model.getPartInspectionDetailList(), "单据明细不能为空");
-            if (model.getType() != 10) {
+            if (model.getType() != 10 && model.getType() != 40) {
                 ValidatorBean.checkNotNull(model.getPerson(), "责任人不能为空");
             }
 

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

@@ -337,9 +337,9 @@ public class MesNcProcessingService implements IMesNcProcessingService {
             ConvertBean.serviceModelUpdate(sn, AuthUtil.getSessionUser().getUserName());
             partInspectionRepository.save(model.getPartInspection());
 
-            //移库 转正常、放行：8000移至2000  areaCode=2000
-            MesMove move = createMove(model, configService.getCfgValue(org, "UMLGO"), areaCode, org);
-//            MesMove move = createMove(model, configService.getCfgValue(org, "UMLGO"), configService.getCfgValue(org, "LGORT"), org);
+            //移库 转正常、放行：8000移至2000
+//            MesMove move = createMove(model, configService.getCfgValue(org, "UMLGO"), areaCode, org);
+            MesMove move = createMove(model, configService.getCfgValue(org, "UMLGO"), configService.getCfgValue(org, "LGORT"), org);
             moveRepository.save(move);
 
         } else if (type == MesExtEnumUtil.NC_TYPE.REWORK.getValue()) {
@@ -426,9 +426,9 @@ public class MesNcProcessingService implements IMesNcProcessingService {
             partInspectionRepository.save(model.getPartInspection());
 
 
-            //移库 转正常、放行：8000移至2000  areaCode=2000
-            MesMove move = createMove(model, configService.getCfgValue(org, "UMLGO"), areaCode, org);
-//            MesMove move = createMove(model, configService.getCfgValue(org, "UMLGO"), configService.getCfgValue(org, "LGORT"), org);
+            //移库 转正常、放行：8000移至2000
+//            MesMove move = createMove(model, configService.getCfgValue(org, "UMLGO"), areaCode, org);
+            MesMove move = createMove(model, configService.getCfgValue(org, "UMLGO"), configService.getCfgValue(org, "LGORT"), org);
             moveRepository.save(move);
 
         }