From 7621792533ef8981c47f50be9bac81a029a28dad Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 19 Jun 2024 00:57:52 +0800 Subject: [PATCH 1/2] step --- .../step/MesProductionDataSaveStepService.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionDataSaveStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionDataSaveStepService.java index 2fba363..e58f9c6 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionDataSaveStepService.java +++ b/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); From d71a9a9856fdaf08061dd57f2467896cd6666ad5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=AE=E7=AC=91=E7=9D=80=E9=9D=A2=E5=AF=B9=E6=98=8E?= =?UTF-8?q?=E5=A4=A9?= <752558143@qq.com> Date: Wed, 19 Jun 2024 01:35:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B1=95=E7=A4=BA=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/pcn/apiservice/schedulejob/MesSaveVariableJob.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/schedulejob/MesSaveVariableJob.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/schedulejob/MesSaveVariableJob.java index a7a4812..2965988 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/schedulejob/MesSaveVariableJob.java +++ b/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("请添加需要报工的工厂代码!");