From 139776ad07bd9566663e6b6c91f1be07664bd6a4 Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Fri, 3 Mar 2023 12:14:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mps/service/impl/RawFoilServiceImpl.java | 2 +- .../mps/service/impl/ShippingServiceImpl.java | 2 +- .../org/nl/wms/pda/mps/wql/PDA_RAWFOIL_01.wql | 8 +++++--- .../SlittingproductionplanServiceImpl.java | 2 ++ .../wms/pdm/wql/PDM_BI_SLIDTTINGPLAN_01.wql | 5 +++++ .../src/main/java/org/nl/wms/pdm/wql/pdm.xls | Bin 250368 -> 250368 bytes .../java/org/nl/wms/sch/tasks/InHotTask.java | 2 +- .../wms/pdm/order/slittingplan/index.vue | 1 + 8 files changed, 16 insertions(+), 6 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java index 1433f5f61..92089b448 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java @@ -288,7 +288,7 @@ public class RawFoilServiceImpl implements RawFoilService { JSONObject raw_jo = whereJson.getJSONObject("raw_jo"); WQLObject rawTab = WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder"); // 生箔工单表 - JSONObject jsonRaw = rawTab.query("mfg_order_name = '" + raw_jo.getString("mfg_order_name") + "'").uniqueResult(0); + JSONObject jsonRaw = rawTab.query("container_name = '" + raw_jo.getString("container_name") + "'").uniqueResult(0); if (!StrUtil.equals(jsonRaw.getString("status"), "03")) throw new BadRequestException("工单不为确认下卷"); //查询该母卷号对应的任务 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 3a5c5fcd2..4ed2d2f25 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 @@ -388,7 +388,7 @@ public class ShippingServiceImpl implements ShippingService { if (StrUtil.isEmpty(qzzno)) { throw new BadRequestException("气涨轴不能为空!"); } - JSONArray plan = WQLObject.getWQLObject("pdm_bi_slittingproductionplan").query("qzzno = '" + qzzno + "'").getResultJSONArray(0); + JSONArray plan = WQLObject.getWQLObject("pdm_bi_slittingproductionplan").query("qzzno = '" + qzzno + "' AND is_delete = '0' AND is_child_tz_ok = '1' AND status = '01'").getResultJSONArray(0); if (ObjectUtil.isEmpty(plan)) { throw new BadRequestException("未找到气涨轴【" + qzzno + "】对应的分切计划!"); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_RAWFOIL_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_RAWFOIL_01.wql index c7448df7d..5602cb1f3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_RAWFOIL_01.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_RAWFOIL_01.wql @@ -53,6 +53,8 @@ ivt.empty_point_status = '02' AND ivt.full_point_status = '01' + AND + ivt.is_used = '1' AND NOT EXISTS ( SELECT @@ -87,8 +89,9 @@ ST_IVT_CoolPointIvt ivt WHERE ivt.full_point_status = '01' - - AND NOT EXISTS ( + AND + ivt.is_used = '1' + AND NOT EXISTS ( SELECT * FROM @@ -195,7 +198,6 @@ OPTION 输入.container_name <> "" der.container_name = 输入.container_name ENDOPTION - ENDSELECT ENDPAGEQUERY ENDIF diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/SlittingproductionplanServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/SlittingproductionplanServiceImpl.java index f33b22208..8c61a0762 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/SlittingproductionplanServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/SlittingproductionplanServiceImpl.java @@ -55,6 +55,7 @@ public class SlittingproductionplanServiceImpl implements Slittingproductionplan String is_parent_ok = MapUtil.getStr(whereJson, "is_parent_ok"); String is_child_tz_ok = MapUtil.getStr(whereJson, "is_child_tz_ok"); String is_child_ps_ok = MapUtil.getStr(whereJson, "is_child_ps_ok"); + String is_call = MapUtil.getStr(whereJson, "is_call"); String begin_time = MapUtil.getStr(whereJson, "begin_time"); String end_time = MapUtil.getStr(whereJson, "end_time"); @@ -68,6 +69,7 @@ public class SlittingproductionplanServiceImpl implements Slittingproductionplan map.put("is_parent_ok", is_parent_ok); map.put("is_child_tz_ok", is_child_tz_ok); map.put("is_child_ps_ok", is_child_ps_ok); + map.put("is_call", is_call); if (ObjectUtil.isNotEmpty(resource_name)) map.put("resource_name","%"+resource_name+"%"); if (ObjectUtil.isNotEmpty(parent_container_name)) map.put("parent_container_name","%"+parent_container_name+"%"); if (ObjectUtil.isNotEmpty(container_name)) map.put("container_name","%"+container_name+"%"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_SLIDTTINGPLAN_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_SLIDTTINGPLAN_01.wql index e79649224..ca1f0e376 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_SLIDTTINGPLAN_01.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_SLIDTTINGPLAN_01.wql @@ -26,6 +26,7 @@ 输入.is_child_ps_ok TYPEAS s_string 输入.is_child_tz_ok TYPEAS s_string 输入.is_parent_ok TYPEAS s_string + 输入.is_call TYPEAS s_string [临时表] @@ -102,6 +103,10 @@ plan.is_child_ps_ok = 输入.is_child_ps_ok ENDOPTION + OPTION 输入.is_call <> "" + plan.is_call = 输入.is_call + ENDOPTION + OPTION 输入.begin_time <> "" plan.manufacture_date >= 输入.begin_time ENDOPTION diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls index d986a55b2f8432eda4fc80e88e08d8639b962702..4ae655b17f2f639e173476e0058bdbb43e8606e6 100644 GIT binary patch delta 9389 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 delta 9471 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