diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesQmsScrapService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesQmsScrapService.java index d39b185..3cc719c 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesQmsScrapService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesQmsScrapService.java @@ -43,11 +43,11 @@ public class MesQmsScrapService extends BaseMesService implements I DdlPreparedPack.getInPackList(idList, "pid", packBean); List partInspectionDetails = partInspectionDetailRDao.findByHqlWhere(packBean); Map> idDetailListMap = partInspectionDetails.stream().collect(Collectors.groupingBy(MesPartInspectionDetail::getPid)); - - Map> workOrderPartMap = mesPartInspectionList.stream().collect(Collectors.groupingBy(MesPartInspection::getPartNo)); + //43326 电子化检验,发送给QMS的数据,按照零件号+责任人类型分组发送 + Map> workOrderPartMap = mesPartInspectionList.stream().collect(Collectors.groupingBy(p -> p.getPartNo() +"="+p.getResponsibleParty())); //根据物料对可疑品分组 for (Map.Entry> stringListEntry : workOrderPartMap.entrySet()) { - String key = stringListEntry.getKey(); + String keyPartNo = stringListEntry.getKey().split("=")[0]; List mesPartInspections = stringListEntry.getValue(); MesPartInspection next = mesPartInspections.iterator().next(); List mesPartInspectionDetails = new ArrayList<>(); @@ -62,7 +62,7 @@ public class MesQmsScrapService extends BaseMesService implements I mesQmsScrap.setSource("MES"); double sum = mesPartInspections.stream().mapToDouble(MesPartInspection::getRejectQty).sum(); mesQmsScrap.setRejectQty((int) sum); - mesQmsScrap.setPartNo(key); + mesQmsScrap.setPartNo(keyPartNo); mesQmsScrap.setPartName(next.getPartName()); String defectTypeName = mesPartInspectionDetails.stream().map(MesPartInspectionDetail::getDefectTypeName).collect(Collectors.joining(";")); mesQmsScrap.setDefectTypeName(defectTypeName);