展示组件

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