质量 缺陷类型 NC处理

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

@@ -36,7 +36,8 @@ public class MesNcProcessingController {
             // 数据校验
             ValidatorBean.checkNotNull(serialNumber, "产品条码不能为空");
 
-            return ResultBean.success("查询成功").setResultObject(ncProcessingService.queryProduceSn(serialNumber, AuthUtil.getOrganizeCode()));
+            return ResultBean.success("查询成功").setResultObject(ncProcessingService.queryProduceSn(serialNumber, "CK01"));
+//            return ResultBean.success("查询成功").setResultObject(ncProcessingService.queryProduceSn(serialNumber, AuthUtil.getOrganizeCode()));
         } catch (ImppBusiException imppException) {
             return ResultBean.fail(imppException);
         } catch (Exception e) {
@@ -59,7 +60,7 @@ public class MesNcProcessingController {
 
             }
 
-            ncProcessingService.saveNc(model.getSerialNumber(), model.getPerson(), model.getType(), "CK01");
+            ncProcessingService.saveNc(model.getSerialNumber(), model.getPerson(), model.getType(), AuthUtil.getOrganizeCode());
 //            ncProcessingService.saveNc(serialNumber, person, type, AuthUtil.getOrganizeCode());
             return ResultBean.success("查询成功");
         } catch (ImppBusiException imppException) {

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

@@ -80,7 +80,7 @@ public class MesNcProcessingService implements IMesNcProcessingService {
         //位置
         List<MesLocationConfig> locationConfigList = checkLocationConfig(org);
 
-        Map<String, MesDefectRecord> defectRecordMap = defectRecordList.stream().collect(Collectors.toMap(k -> k.getDefectLocation(), k -> k));
+        Map<String, List<MesDefectRecord>> defectRecordMap = defectRecordList.stream().collect(Collectors.groupingBy(k -> k.getDefectLocation()));
 
 
         Map<String, List<MesDefectRecord>> defectMap = defectRecordList.stream().collect(Collectors.groupingBy(k -> k.getDefectCode()));
@@ -139,16 +139,16 @@ public class MesNcProcessingService implements IMesNcProcessingService {
             move.setZrsum(zrsum);
             move.setPostDate(TimeTool.getToday());
             move.setPostTime(TimeTool.getTimeShortWithColon());
-            ConvertBean.serviceModelInitialize(move, "LML");
-//            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, "LML");
-//            ConvertBean.serviceModelUpdate(k, AuthUtil.getSessionUser().getUserName());
+//            ConvertBean.serviceModelUpdate(k, "LML");
+            ConvertBean.serviceModelUpdate(k, AuthUtil.getSessionUser().getUserName());
         });
 
         defectRecordRepository.saveAll(defectRecordList);