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 d986a55b2..4ae655b17 100644 Binary files a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls and b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls differ 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 cce0f3b22..b9febbcf9 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 @@ -315,7 +315,7 @@ public class InHotTask extends AbstractAcsTask { } else { json.put("priority", priority_jo.getString("value")); } - json.put("acs_task_type", "8"); + json.put("acs_task_type", "6"); tab.insert(json); task_id = json.getString("task_id"); } diff --git a/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue b/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue index c7a3ff2da..5d390c828 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue @@ -526,6 +526,7 @@ const defaultForm = { is_parent_ok: null, is_child_tz_ok: null, is_child_ps_ok: null, + is_call: null, qzzno: null } export default {