From b624c3531f8f0747849591d78a1ba24e3a14e538 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 12 Jan 2024 13:59:35 +0800 Subject: [PATCH] =?UTF-8?q?jx=20pcn=20=E9=87=87=E9=9B=86plc=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=20=E8=BF=9E=E7=BB=AD=E6=89=AB=E7=A0=81=20=E5=81=B6?= =?UTF-8?q?=E5=8F=91=E9=87=87=E9=9B=86=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../busi/collect/SxThirdPartyPlcCollectProductDataHandler.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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() {