From 13c76290c452165e2276e2a7add96b215be20c57 Mon Sep 17 00:00:00 2001 From: zhouz <> Date: Wed, 7 Aug 2024 09:47:35 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=B0=83=E7=94=A8MES=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mps/service/impl/HandleBakingServiceImpl.java | 4 ++-- .../ivt/service/impl/CoolPointIvtServiceImpl.java | 3 ++- .../ivt/service/impl/HotPointIvtServiceImpl.java | 15 ++++++++++----- .../java/org/nl/wms/sch/tasks/InCoolIvtTask.java | 3 ++- .../main/java/org/nl/wms/sch/tasks/InHotTask.java | 3 ++- .../java/org/nl/wms/sch/tasks/OutHotTask.java | 3 ++- 6 files changed, 20 insertions(+), 11 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/HandleBakingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/HandleBakingServiceImpl.java index 4780ff19e..f6998423d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/HandleBakingServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/HandleBakingServiceImpl.java @@ -176,7 +176,7 @@ public class HandleBakingServiceImpl implements HandleBakingService { //判断该接口是否需要回传 JSONObject back_jo = WQLObject.getWQLObject("MD_PB_InterfaceBack").query("interface_name = 'momRollBakeInBound'").uniqueResult(0); if (ObjectUtil.isNotEmpty(back_jo) && "1".equals(back_jo.getString("is_back"))) { - new LmsToMesServiceImpl().momRollBakeInBound(param); + SpringContextHolder.getBean(LmsToMesService.class).momRollBakeInBound(param); } } else if (StrUtil.equals(option, "2")) { @@ -276,7 +276,7 @@ public class HandleBakingServiceImpl implements HandleBakingService { //判断该接口是否需要回传 JSONObject back_jo = WQLObject.getWQLObject("MD_PB_InterfaceBack").query("interface_name = 'momRollBakeOutBound'").uniqueResult(0); if (ObjectUtil.isNotEmpty(back_jo) && "1".equals(back_jo.getString("is_back"))) { - new LmsToMesServiceImpl().momRollBakeOutBound(param); + SpringContextHolder.getBean(LmsToMesService.class).momRollBakeOutBound(param); } } JSONObject result = new JSONObject(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CoolPointIvtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CoolPointIvtServiceImpl.java index 7966bf360..914870d0f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CoolPointIvtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CoolPointIvtServiceImpl.java @@ -19,6 +19,7 @@ import org.nl.modules.wql.util.SpringContextHolder; import org.nl.modules.wql.util.WqlUtil; import org.nl.system.service.param.impl.SysParamServiceImpl; import org.nl.wms.basedata.st.service.impl.UserAreaServiceImpl; +import org.nl.wms.ext.mes.service.LmsToMesService; import org.nl.wms.ext.mes.service.impl.LmsToMesServiceImpl; import org.nl.wms.pdm.ivt.service.CoolPointIvtService; import org.nl.wms.pdm.ivt.service.dto.CoolPointIvtDto; @@ -214,7 +215,7 @@ public class CoolPointIvtServiceImpl implements CoolPointIvtService { //判断该接口是否需要回传 JSONObject back_jo = WQLObject.getWQLObject("MD_PB_InterfaceBack").query("interface_name = 'momRollSemiFGInboundComplete'").uniqueResult(0); if (ObjectUtil.isNotEmpty(back_jo) && "1".equals(back_jo.getString("is_back"))) { - new LmsToMesServiceImpl().momRollSemiFGInboundComplete(param); + SpringContextHolder.getBean(LmsToMesService.class).momRollSemiFGInboundComplete(param); } } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/HotPointIvtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/HotPointIvtServiceImpl.java index c532a9115..f035cae30 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/HotPointIvtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/HotPointIvtServiceImpl.java @@ -19,6 +19,7 @@ import org.nl.modules.wql.util.SpringContextHolder; import org.nl.modules.wql.util.WqlUtil; import org.nl.system.service.param.impl.SysParamServiceImpl; import org.nl.wms.basedata.st.service.impl.UserAreaServiceImpl; +import org.nl.wms.ext.mes.service.LmsToMesService; import org.nl.wms.ext.mes.service.impl.LmsToMesServiceImpl; import org.nl.wms.pdm.ivt.service.HotPointIvtService; import org.nl.wms.pdm.ivt.service.dto.HotPointIvtDto; @@ -176,24 +177,25 @@ public class HotPointIvtServiceImpl implements HotPointIvtService { public void uploadMes(JSONObject form) { String flag = form.getString("flag"); + LmsToMesService lmsToMesService = SpringContextHolder.getBean(LmsToMesService.class); // 将入烘箱信息发送给mes JSONObject param = new JSONObject(); String userName = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MES_USERNAME").getValue(); String passWord = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MES_PASSWORD").getValue(); param.put("iContainerName", form.getString("container_name")); param.put("iResourceName", form.getString("ext_code")); - param.put("iMoveInDate", DateUtil.now()); - param.put("iPlanBakingTemperature", form.getDoubleValue("temperature")); - param.put("iPlanBakingTimer", form.getDoubleValue("oven_time")); param.put("UserName", userName); param.put("PassWord", passWord); //入箱回传 if ("1".equals(flag)) { //判断该接口是否需要回传 + param.put("iMoveInDate", DateUtil.now()); + param.put("iPlanBakingTemperature", form.getDoubleValue("temperature")); + param.put("iPlanBakingTimer", form.getDoubleValue("oven_time")); JSONObject back_jo = WQLObject.getWQLObject("MD_PB_InterfaceBack").query("interface_name = 'momRollBakeInBound'").uniqueResult(0); if (ObjectUtil.isNotEmpty(back_jo) && "1".equals(back_jo.getString("is_back"))) { - new LmsToMesServiceImpl().momRollBakeInBound(param); + lmsToMesService.momRollBakeInBound(param); } //将该母卷的入烘箱标识改为0 @@ -204,10 +206,13 @@ public class HotPointIvtServiceImpl implements HotPointIvtService { } //出箱回传 if ("2".equals(flag)) { + param.put("MoveOutDate", DateUtil.now()); + param.put("ActualBakingTemperature", form.getDoubleValue("temperature")); + param.put("ActualBakingTimer", form.getDoubleValue("oven_time")); //判断该接口是否需要回传 JSONObject back_jo = WQLObject.getWQLObject("MD_PB_InterfaceBack").query("interface_name = 'momRollBakeOutBound'").uniqueResult(0); if (ObjectUtil.isNotEmpty(back_jo) && "1".equals(back_jo.getString("is_back"))) { - new LmsToMesServiceImpl().momRollBakeOutBound(param); + lmsToMesService.momRollBakeOutBound(param); } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InCoolIvtTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InCoolIvtTask.java index eadda5aa4..5566f45a4 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InCoolIvtTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InCoolIvtTask.java @@ -14,6 +14,7 @@ import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; import org.nl.system.service.param.impl.SysParamServiceImpl; +import org.nl.wms.ext.mes.service.LmsToMesService; import org.nl.wms.ext.mes.service.impl.LmsToMesServiceImpl; import org.nl.wms.sch.AcsTaskDto; import org.nl.wms.sch.manage.AbstractAcsTask; @@ -149,7 +150,7 @@ public class InCoolIvtTask extends AbstractAcsTask { if (ObjectUtil.isNotEmpty(back_jo) && "1".equals(back_jo.getString("is_back"))) { String product_area = back_jo.getString("product_area"); if (StrUtil.isNotEmpty(product_area) && product_area.contains(jsonTask.getString("product_area"))) { - new LmsToMesServiceImpl().momRollSemiFGInboundComplete(param); + SpringContextHolder.getBean(LmsToMesService.class).momRollSemiFGInboundComplete(param); } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java index 3a37961da..9bb228c0f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java @@ -14,6 +14,7 @@ import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; import org.nl.system.service.param.impl.SysParamServiceImpl; +import org.nl.wms.ext.mes.service.LmsToMesService; import org.nl.wms.ext.mes.service.impl.LmsToMesServiceImpl; import org.nl.wms.pda.mps.service.mapper.HotMapper; import org.nl.wms.sch.AcsTaskDto; @@ -231,7 +232,7 @@ public class InHotTask extends AbstractAcsTask { if (ObjectUtil.isNotEmpty(back_jo) && "1".equals(back_jo.getString("is_back"))) { String product_area = back_jo.getString("product_area"); if (StrUtil.isNotEmpty(product_area) && product_area.contains(jsonTask.getString("product_area"))) { - new LmsToMesServiceImpl().momRollBakeInBound(param); + SpringContextHolder.getBean(LmsToMesService.class).momRollBakeInBound(param); } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutHotTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutHotTask.java index 61e349873..61108220a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutHotTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutHotTask.java @@ -13,6 +13,7 @@ import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; +import org.nl.wms.ext.mes.service.LmsToMesService; import org.nl.wms.ext.mes.service.impl.LmsToMesServiceImpl; import org.nl.wms.pda.mps.service.mapper.HotMapper; import org.nl.wms.sch.AcsTaskDto; @@ -213,7 +214,7 @@ public class OutHotTask extends AbstractAcsTask { if (ObjectUtil.isNotEmpty(back_jo) && "1".equals(back_jo.getString("is_back"))) { String product_area = back_jo.getString("product_area"); if (StrUtil.isNotEmpty(product_area) && product_area.contains(jsonTask.getString("product_area"))) { - new LmsToMesServiceImpl().momRollBakeOutBound(param); + SpringContextHolder.getBean(LmsToMesService.class).momRollBakeOutBound(param); } } }