From 17f4d5593bd16b5c37e47696114d6c88196f79fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=AE=E7=AC=91=E7=9D=80=E9=9D=A2=E5=AF=B9=E6=98=8E?= =?UTF-8?q?=E5=A4=A9?= <752558143@qq.com> Date: Wed, 12 Jun 2024 19:52:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=95=E7=A4=BA=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../station/MesProductionNoSortModuleService.java | 1 + .../apiservice/serviceimpl/step/MesEndStepService.java | 15 +++++++++++++++ .../step/MesWorkOrderCheckNosortStepService.java | 4 ++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/MesProductionNoSortModuleService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/MesProductionNoSortModuleService.java index ea044cc..d9e3764 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/MesProductionNoSortModuleService.java +++ b/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 states, Map wcpcMap) { + init(reqBean); return true; } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesEndStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesEndStepService.java index b3fa353..ccd1d05 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesEndStepService.java +++ b/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, "完成工步执行成功"); } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkOrderCheckNosortStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkOrderCheckNosortStepService.java index b37c91a..9d47e78 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkOrderCheckNosortStepService.java +++ b/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 filterProductionPartContext(List productionPartContextList, Boolean flag) { - 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()); + 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.TRUE.getValue()) == 0)).collect(Collectors.toList()); } }