逻辑变更

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<String, List<MesDefectWarnConfig>> alarmConfigMap = alarmConfigList.stream().collect(Collectors.groupingBy(MesDefectWarnConfig::getDefectLocation));
 
         //返修完成需要标记绿色
-        Map<String, List<MesPartInspectionDetail>> detailMap = detailList.stream().collect(Collectors.groupingBy(MesPartInspectionDetail::getDefectLocation));
+        Map<String, List<MesPartInspectionDetail>> 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()) &&
+            if(detailMap.containsKey(k.getDefectLocation()+frontBack) &&
-                    detailMap.get(k.getDefectLocation()).stream().allMatch(MesPartInspectionDetail::getReworkFinished)){
+                    detailMap.get(k.getDefectLocation()+frontBack).stream().allMatch(MesPartInspectionDetail::getReworkFinished)){
                 k.setIsflg(true);
                 k.setColour(MesExtEnumUtil.COLOR.GREEN.getValue());
             }