Merge remote-tracking branch 'origin/dev' into dev

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/schedulejob/MesSaveVariableJob.java

@@ -35,9 +35,9 @@ public class MesSaveVariableJob extends BaseMesScheduleJob {
 
         log.info("保存工艺参数job -- START ");
 
-        String jobParam = this.getJobParam();
-        JSONObject jsonObject= JSONUtil.parseObj(jobParam);
-        String organizeCode = jsonObject.getStr("organizeCode");
+        /*String jobParam = this.getJobParam();
+        JSONObject jsonObject= JSONUtil.parseObj(jobParam);*/
+        String organizeCode = "CK01";
 
         if (null == organizeCode){
             log.error("请添加需要报工的工厂代码!");

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionDataSaveStepService.java

@@ -11,6 +11,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.concurrent.TimeUnit;
+
 /**
  * @Description : 保存加工结果工步
  * @Author : wangjie
@@ -35,15 +37,30 @@ public class MesProductionDataSaveStepService extends BaseStepService {
         //保存零件条码信息工步
         ((IStepService) SpringContextsUtil.getBean("mesProductSnSaveStepService")).execute(reqBean);
 
+        try {
+            TimeUnit.MILLISECONDS.sleep(5000L);
+        } catch (InterruptedException e) {
+        }
+
         //加工异常处理工步【此工步未整改】
         //((IStepService) SpringContextsUtil.getBean("mesProductResultErrorHandleStepService")).execute(reqBean);
 
         //生成加工记录工步
         ((IStepService) SpringContextsUtil.getBean("mesProductionRecordGenerateStepService")).execute(reqBean);
 
+        try {
+            TimeUnit.MILLISECONDS.sleep(5000L);
+        } catch (InterruptedException e) {
+        }
+
         //保存装配记录工步
         ((IStepService) SpringContextsUtil.getBean("mesAssemblySaveStepService")).execute(reqBean);
 
+        try {
+            TimeUnit.MILLISECONDS.sleep(5000L);
+        } catch (InterruptedException e) {
+        }
+
         //生产汇报工步 【此工步未整改】
         //((IStepService) SpringContextsUtil.getBean("mesReportGenerateStepService")).execute(reqBean);