diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/collect/SxThirdPartyPlcCollectProductDataHandler.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/collect/SxThirdPartyPlcCollectProductDataHandler.java index c57d9bb..c891806 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/collect/SxThirdPartyPlcCollectProductDataHandler.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/collect/SxThirdPartyPlcCollectProductDataHandler.java @@ -37,9 +37,11 @@ public class SxThirdPartyPlcCollectProductDataHandler extends SxThirdPartyPlcCol @Override public SxThirdPartyPlcCollectProductDataHandler doRetry(Object obj) { + if (isOpen) return this; + super.doRetry(obj); - if (isOpen) super.cancel(); + if (!isOpen) super.cancel(); SxThirdPartyPlcCollectDataModel plcCollectData = (SxThirdPartyPlcCollectDataModel) obj; @@ -139,10 +141,14 @@ public class SxThirdPartyPlcCollectProductDataHandler extends SxThirdPartyPlcCol } private void doSendScanQueueNextExec() { + + isOpen = false; + initStationRequestBean(); reqBean.getDataMap().put(MesPcnExtConstWords.RESULT, stepResult.isCompleted()); if (!StringUtils.isEmpty(stepResult.getMsg())) reqBean.getDataMap().put(MesPcnExtConstWords.INFO, stepResult.getMsg()); shippingDispatchService.doSendScanQueueNextExec(reqBean); + } private void initStationRequestBean() {