Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev

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());
             }

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/MesProductionNoSortModuleService.java

@@ -152,6 +152,7 @@ public class MesProductionNoSortModuleService extends BaseModuleService {
     }
     @Override
     public boolean execStateModule(StationRequestBean reqBean, List<MesStateMachineStatus> states, Map<String, String> wcpcMap) {
+        init(reqBean);
         return true;
     }
 

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesAssemblyShowNosortStepService.java

@@ -312,9 +312,11 @@ public class MesAssemblyShowNosortStepService extends BaseStepService {
     private List<MesAssemblyShowContext> getAssemblyShowContextList(MesCellEquipContext cellEquipContext, List<MesProductionAssemblyContext> productionAssemblyContextList, MesProdRuleContext prodRuleContext, String workOrderNo) {
         if (CollectionUtils.isEmpty(productionAssemblyContextList)) return null;
         List<MesAssemblyShowContext> assemblyShowContextList = new ArrayList<>();
+        int index = 0;
         for (MesProductionAssemblyContext item : productionAssemblyContextList) {
             if (null == item) continue;
-            assemblyShowContextList.add(assemblyShowContext(item, prodRuleContext, workOrderNo));
+            index ++ ;
+            assemblyShowContextList.add(assemblyShowContext(item, prodRuleContext, workOrderNo).index(index));
         }
         assemblyShowContextList = assemblyShowContextList.stream().filter(o -> null != o).sorted(Comparator.comparing(MesAssemblyShowContext::getRouteSeq)).collect(Collectors.toList());
         return assemblyShowContextList;

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesEndStepService.java

@@ -61,6 +61,21 @@ public class MesEndStepService extends BaseStepService {
         mesProductionDispatchContextStepService.deleteProductResultContext(reqBean);
         mesProductionDispatchContextStepService.deleteReadySignalContext(reqBean);
 
+        mesProductionDispatchContextStepService.deleteMesRawPartChargingDataContext(reqBean);
+        mesProductionDispatchContextStepService.deletePartDataContext(reqBean);
+        mesProductionDispatchContextStepService.deleteProdRuleDataContext(reqBean);
+        mesProductionDispatchContextStepService.deleteProductionLockContext(reqBean);
+        mesProductionDispatchContextStepService.deleteProductionPartContext(reqBean);
+        mesProductionDispatchContextStepService.deleteProductionPartNoContext(reqBean);
+        mesProductionDispatchContextStepService.deleteProductionPsInContext(reqBean);
+        mesProductionDispatchContextStepService.deleteProductionPsOutContext(reqBean);
+        mesProductionDispatchContextStepService.deleteScanAssemblySnContext(reqBean);
+        mesProductionDispatchContextStepService.deleteSendProcessCmdContext(reqBean);
+        mesProductionDispatchContextStepService.deleteScanWorkOrderNoContext(reqBean);
+        mesProductionDispatchContextStepService.deleteScanProductSnContext(reqBean);
+        mesProductionDispatchContextStepService.deleteFunctionChooseCavityOrderContext(reqBean);
+
+
         return execSuccessCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult, "完成工步执行成功");
 
     }

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkOrderCheckNosortStepService.java

@@ -178,8 +178,8 @@ public class MesWorkOrderCheckNosortStepService extends BaseStepService {
 
     //根据是否空腔搜集数据
     private List<MesProductionPartContext> filterProductionPartContext(List<MesProductionPartContext> productionPartContextList, Boolean flag) {
-        return flag ? productionPartContextList.stream().filter(o -> (null != o && o.getIsFinishCode().compareTo(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) != 0)).collect(Collectors.toList()) :
+        return flag ? productionPartContextList.stream().filter(o -> (null != o && o.getIsFinishCode().compareTo(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) == 0)).collect(Collectors.toList()) :
-                productionPartContextList.stream().filter(o -> (null != o && o.getIsFinishCode().compareTo(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) == 0)).collect(Collectors.toList());
+                productionPartContextList.stream().filter(o -> (null != o && o.getIsFinishCode().compareTo(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) == 0)).collect(Collectors.toList());
     }
 
 }