jx pcn cell collect plc

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<String, Object>) stepResult.getData()).remove(MesPcnExtConstWords.USER_INFO);
         ((Map<String, Object>) stepResult.getData()).remove(MesPcnExtConstWords.SERIAL_NUMBER);
         ((Map<String, Object>) stepResult.getData()).remove(MesPcnExtConstWords.PRODUCT_SN);
@@ -119,6 +119,9 @@ public class SxThirdPartyPlcCollectProductDataHandler extends SxThirdPartyPlcCol
         ((Map<String, Object>) stepResult.getData()).put(MesPcnExtConstWords.WORK_ORDER_NO, plcCollectData.getWorkOrderNo());
         ((Map<String, Object>) stepResult.getData()).put(MesPcnExtConstWords.PART_NO, plcCollectData.getPartNo());
         ((Map<String, Object>) 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() {