From b29fbdbb4974c2eaff9dfd2b22ab3b1a52412c1e Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 27 Feb 2024 11:08:44 +0800 Subject: [PATCH] jx pcn cell collect plc --- .../busi/collect/SxThirdPartyPlcCollectProductDataHandler.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 3278568..b115711 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 @@ -50,7 +50,7 @@ public class SxThirdPartyPlcCollectProductDataHandler extends SxThirdPartyPlcCol if (isRetry || null == filterChain) instanceFilterChain(); - restoreStepResultData(plcCollectData); + restoreOtherParams(plcCollectData); super.doSubmit(); @@ -104,7 +104,7 @@ public class SxThirdPartyPlcCollectProductDataHandler extends SxThirdPartyPlcCol isRetry = false; } - private void restoreStepResultData(SxThirdPartyPlcCollectDataModel plcCollectData) { + private void restoreOtherParams(SxThirdPartyPlcCollectDataModel plcCollectData) { ((Map) stepResult.getData()).remove(MesPcnExtConstWords.USER_INFO); ((Map) stepResult.getData()).remove(MesPcnExtConstWords.SERIAL_NUMBER); ((Map) stepResult.getData()).remove(MesPcnExtConstWords.PRODUCT_SN); @@ -119,6 +119,9 @@ public class SxThirdPartyPlcCollectProductDataHandler extends SxThirdPartyPlcCol ((Map) stepResult.getData()).put(MesPcnExtConstWords.WORK_ORDER_NO, plcCollectData.getWorkOrderNo()); ((Map) stepResult.getData()).put(MesPcnExtConstWords.PART_NO, plcCollectData.getPartNo()); ((Map) stepResult.getData()).put(MesPcnExtConstWords.PART_NAME_RDD, plcCollectData.getPartNameRdd()); + + if (this.plcCollectData.getTimeOut().compareTo(plcCollectData.getTimeOut()) != 0) this.plcCollectData.timeOut(plcCollectData.getTimeOut()); + } private String[] getClearField() {