From a6b817d8ac40dc32fcc83c3f61838755749f61ac Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Tue, 7 Feb 2023 10:16:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=88=87=E8=AE=A1=E5=88=92=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SlittingproductionplanServiceImpl.java | 8 + .../wms/pdm/wql/PDM_BI_SLIDTTINGPLAN_01.wql | 20 ++ .../wms/pdm/order/slittingplan/index.vue | 198 ++++++++++++------ 3 files changed, 165 insertions(+), 61 deletions(-) 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 44fd22e15..68d608fe0 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 @@ -51,6 +51,10 @@ public class SlittingproductionplanServiceImpl implements Slittingproductionplan String resource_name = MapUtil.getStr(whereJson, "resource_name"); String parent_container_name = MapUtil.getStr(whereJson, "parent_container_name"); String container_name = MapUtil.getStr(whereJson, "container_name"); + String qzzno = MapUtil.getStr(whereJson, "qzzno"); + 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 begin_time = MapUtil.getStr(whereJson, "begin_time"); String end_time = MapUtil.getStr(whereJson, "end_time"); @@ -61,9 +65,13 @@ public class SlittingproductionplanServiceImpl implements Slittingproductionplan map.put("status", status); map.put("begin_time", begin_time); map.put("end_time", end_time); + 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); 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+"%"); + if (ObjectUtil.isNotEmpty(qzzno)) map.put("qzzno","%"+qzzno+"%"); JSONObject json = WQL.getWO("PDM_BI_SLIDTTINGPLAN_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "plan.container_name"); return json; 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 26aa2d787..e79649224 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 @@ -22,6 +22,10 @@ 输入.container_name TYPEAS s_string 输入.begin_time TYPEAS s_string 输入.end_time TYPEAS s_string + 输入.qzzno TYPEAS s_string + 输入.is_child_ps_ok TYPEAS s_string + 输入.is_child_tz_ok TYPEAS s_string + 输入.is_parent_ok TYPEAS s_string [临时表] @@ -82,6 +86,22 @@ plan.container_name like 输入.container_name ENDOPTION + OPTION 输入.qzzno <> "" + plan.qzzno like 输入.qzzno + ENDOPTION + + OPTION 输入.is_parent_ok <> "" + plan.is_parent_ok = 输入.is_parent_ok + ENDOPTION + + OPTION 输入.is_child_tz_ok <> "" + plan.is_child_tz_ok = 输入.is_child_tz_ok + ENDOPTION + + OPTION 输入.is_child_ps_ok <> "" + plan.is_child_ps_ok = 输入.is_child_ps_ok + ENDOPTION + OPTION 输入.begin_time <> "" plan.manufacture_date >= 输入.begin_time ENDOPTION 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 27076389c..04a9f4b3f 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 @@ -87,6 +87,7 @@ + + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -181,137 +256,137 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - +
@@ -320,40 +395,41 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -422,7 +498,7 @@ const defaultForm = { } export default { name: 'Slittingproductionplan', - dicts: ['product_area', 'order_type', 'cut_product_status', 'IS_OR_NOT', 'ware_house', 'paper_tube_or_frp'], + dicts: ['product_area', 'order_type', 'cut_product_status', 'ware_house', 'paper_tube_or_frp', 'IS_OR_NOT'], components: { pagination, crudOperation, rrOperation, udOperation }, mixins: [presenter(), header(), form(defaultForm), crud()], cruds() {