From 650924be7cce5c36241e1d8170cd72567d330108 Mon Sep 17 00:00:00 2001 From: jun Date: Wed, 12 Jun 2024 19:54:13 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/serviceimpl/busi/MesInputDefectRecordService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java index 4436928..b2cee29 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java @@ -731,7 +731,7 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService Map> alarmConfigMap = alarmConfigList.stream().collect(Collectors.groupingBy(MesDefectWarnConfig::getDefectLocation)); //返修完成需要标记绿色 - Map> detailMap = detailList.stream().collect(Collectors.groupingBy(MesPartInspectionDetail::getDefectLocation)); + Map> detailMap = detailList.stream().collect(Collectors.groupingBy(t->t.getDefectLocation()+t.getFrontBack())); locationConfigList.forEach(k -> { k.setFrontBack(frontBack); @@ -740,8 +740,8 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService k.setColour(MesExtEnumUtil.COLOR.YELLOW.getValue()); } - if(detailMap.containsKey(k.getDefectLocation()) && - detailMap.get(k.getDefectLocation()).stream().allMatch(MesPartInspectionDetail::getReworkFinished)){ + if(detailMap.containsKey(k.getDefectLocation()+frontBack) && + detailMap.get(k.getDefectLocation()+frontBack).stream().allMatch(MesPartInspectionDetail::getReworkFinished)){ k.setIsflg(true); k.setColour(MesExtEnumUtil.COLOR.GREEN.getValue()); }