From f55a6f9d5b7eb924b8c6254f5c2676f0436cdfe6 Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Tue, 18 Jul 2023 09:35:11 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E5=88=86=E9=85=8D=E9=85=8D=E9=80=81?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=88=86=E5=8C=BA=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mps/service/impl/ShippingServiceImpl.java | 50 +++++++++++-------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java index 472e43610..3fa4c77d8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java @@ -11,6 +11,7 @@ import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; 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.pda.mps.service.CasingService; import org.nl.wms.pda.mps.service.ShippingService; import org.nl.wms.sch.tasks.CutConveyorTask; @@ -166,26 +167,27 @@ public class ShippingServiceImpl implements ShippingService { throw new BadRequestException("未找到气涨轴【" + qzzno + "】对应的分切计划!"); } - - //判断该气涨轴对应的分切计划是否呼叫，如果没有呼叫不允许配送 - //判断该接口是否需要卡MES是否呼叫 - JSONObject back_jo = WQLObject.getWQLObject("MD_PB_InterfaceBack").query("interface_name = 'callNextAssAndMomRoll'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(back_jo) && back_jo.getString("is_back").equals("1")) { - for (int i = 0; i < plan.size(); i++) { - JSONObject plan_jo = plan.getJSONObject(i); - String is_call = plan_jo.getString("is_call"); - if (StrUtil.equals("0", is_call)) { - throw new BadRequestException("子卷号为：" + plan_jo.getString("container_name") + "的分切计划未呼叫，不允许进行配送！"); - } - } - } - - JSONObject plan_jo = plan.getJSONObject(0); JSONObject cut_jo = WQLObject.getWQLObject("st_ivt_cutpointivt").query("ext_code = '" + resource_name + "'").uniqueResult(0); String product_area = cut_jo.getString("product_area"); String point_location = cut_jo.getString("point_location"); + //判断该气涨轴对应的分切计划是否呼叫，如果没有呼叫不允许配送 + //判断该接口是否需要卡MES是否呼叫 + JSONObject back_jo = WQLObject.getWQLObject("MD_PB_InterfaceBack").query("interface_name = 'callNextAssAndMomRoll'").uniqueResult(0); + if (ObjectUtil.isNotEmpty(back_jo) && "1".equals(back_jo.getString("is_back"))) { + String product_areas = back_jo.getString("product_area"); + if (StrUtil.isNotEmpty(product_areas) && product_areas.contains(product_area)){ + for (int i = 0; i < plan.size(); i++) { + JSONObject plan_jos = plan.getJSONObject(i); + String is_call = plan_jos.getString("is_call"); + if (StrUtil.equals("0", is_call)) { + throw new BadRequestException("子卷号为：" + plan_jos.getString("container_name") + "的分切计划未呼叫，不允许进行配送！"); + } + } + } + } + //判断当前输送线上是否超过最大负荷任务数量组3组 JSONArray cut_rows = WQL.getWO("PDA_02").addParam("flag", "13").addParam("qzzno", qzzno).addParam("product_area", product_area).addParam("point_location", point_location).process().getResultJSONArray(0); @@ -453,16 +455,22 @@ public class ShippingServiceImpl implements ShippingService { } //判断该气涨轴对应的分切计划是否呼叫，如果没有呼叫不允许配送 + //判断该接口是否需要卡MES是否呼叫 JSONObject back_jo = WQLObject.getWQLObject("MD_PB_InterfaceBack").query("interface_name = 'callNextAssAndMomRoll'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(back_jo) && back_jo.getString("is_back").equals("1")) { - for (int i = 0; i < plan.size(); i++) { - JSONObject plan_jo = plan.getJSONObject(i); - String is_call = plan_jo.getString("is_call"); - if (StrUtil.equals("0", is_call)) { - throw new BadRequestException("子卷号为：" + plan_jo.getString("container_name") + "的分切计划未呼叫，不允许进行配送！"); + if (ObjectUtil.isNotEmpty(back_jo) && "1".equals(back_jo.getString("is_back"))) { + String product_areas = back_jo.getString("product_area"); + if (StrUtil.isNotEmpty(product_areas) && product_areas.contains(product_area)){ + for (int i = 0; i < plan.size(); i++) { + JSONObject plan_jos = plan.getJSONObject(i); + String is_call = plan_jos.getString("is_call"); + if (StrUtil.equals("0", is_call)) { + throw new BadRequestException("子卷号为：" + plan_jos.getString("container_name") + "的分切计划未呼叫，不允许进行配送！"); + } } } } + + JSONObject jo = new JSONObject(); jo.put("message", "校验无误，可以进行配送！"); return jo;