From f1c2f71e873fb7bfde2c8d6183790eeaba2bf4ed Mon Sep 17 00:00:00 2001 From: gsz Date: Wed, 9 Oct 2024 10:14:02 +0800 Subject: [PATCH] =?UTF-8?q?43326=20=E7=94=B5=E5=AD=90=E5=8C=96=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=EF=BC=8C=E5=8F=91=E9=80=81=E7=BB=99QMS=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=E6=8C=89=E7=85=A7=E9=9B=B6=E4=BB=B6?= =?UTF-8?q?=E5=8F=B7+=E8=B4=A3=E4=BB=BB=E4=BA=BA=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=88=86=E7=BB=84=E5=8F=91=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/apiservice/serviceimpl/base/MesQmsScrapService.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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);