质量 缺陷类型 NC处理

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

@@ -56,7 +56,8 @@ public class MesNcProcessingController {
 
             }
 
-            ncProcessingService.saveNc(serialNumber, person, type, AuthUtil.getOrganizeCode());
+            ncProcessingService.saveNc(serialNumber, person, type, "CK01");
+//            ncProcessingService.saveNc(serialNumber, person, type, AuthUtil.getOrganizeCode());
             return ResultBean.success("查询成功");
         } catch (ImppBusiException imppException) {
             return ResultBean.fail(imppException);

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

@@ -127,7 +127,7 @@ public class MesNcProcessingService implements IMesNcProcessingService {
             zrsum = (rb.getResultList().get(0)).toString();
         }
 
-        if (type == MesPcnExtEnumUtil.NC_TYPE.REWORK.getValue()) {
+        if (type == MesPcnExtEnumUtil.NC_TYPE.NORMAL.getValue()) {
             MesMove move = new MesMove();
             move.setMatnr(part.getPartNo());
             move.setOrganizeCode(org);
@@ -139,14 +139,16 @@ public class MesNcProcessingService implements IMesNcProcessingService {
             move.setZrsum(zrsum);
             move.setPostDate(TimeTool.getToday());
             move.setPostTime(TimeTool.getTimeShortWithColon());
-            ConvertBean.serviceModelInitialize(move, AuthUtil.getSessionUser().getUserName());
+            ConvertBean.serviceModelInitialize(move, "LML");
+//            ConvertBean.serviceModelInitialize(move, AuthUtil.getSessionUser().getUserName());
             moveRepository.save(move);
         }
 
         defectRecordList.forEach(k -> {
             k.setNcType(type);
             k.setPerson(person);
-            ConvertBean.serviceModelUpdate(k, AuthUtil.getSessionUser().getUserName());
+            ConvertBean.serviceModelUpdate(k, "LML");
+//            ConvertBean.serviceModelUpdate(k, AuthUtil.getSessionUser().getUserName());
         });
 
         defectRecordRepository.saveAll(defectRecordList);