From 8a4f22bd0c706e0b5d4ee6fed0f327cfb318db7f Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 27 Dec 2022 20:51:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/StorPublicServiceImpl.java | 14 +++- .../wms/st/inbill/wql/QST_IVT_STORPUBLIC.wql | 78 +++++++++++++++++++ .../service/impl/CheckOutBillServiceImpl.java | 4 + .../st/outbill/wql/QST_IVT_CHECKOUTBILL.wql | 7 +- .../src/views/wms/st/outbill/AddDtl.vue | 9 +++ 5 files changed, 110 insertions(+), 2 deletions(-) create mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_STORPUBLIC.wql diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/StorPublicServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/StorPublicServiceImpl.java index 2a3d53b61..924d2ac77 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/StorPublicServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/StorPublicServiceImpl.java @@ -160,6 +160,7 @@ public class StorPublicServiceImpl implements StorPublicService { String struct_id_In = ""; String material_id_In = ""; String pcsn_In = ""; + String storagevehicle_code = from.getString("storagevehicle_code"); String quality_scode_In = ""; double change_qty = 0; if (ObjectUtil.isEmpty(from)) { @@ -204,8 +205,19 @@ public class StorPublicServiceImpl implements StorPublicService { sql_where.append(quality_scode_In); sql_where.append("'"); + JSONObject map = new JSONObject(); + map.put("flag", "1"); + map.put("struct_id", struct_id_In); + map.put("material_id", material_id_In); + map.put("pcsn", pcsn_In); + map.put("quality_scode", quality_scode_In); + if (StrUtil.equals(change_type_scode, "12")) { + if (ObjectUtil.isNotEmpty(storagevehicle_code)) map.put("storagevehicle_code",storagevehicle_code); + } + // 获取仓位物料信息 - JSONObject jo_in = wql.query(sql_where.toString()).uniqueResult(0); +// JSONObject jo_in = wql.query(sql_where.toString()).uniqueResult(0); + JSONObject jo_in = WQL.getWO("QST_IVT_STORPUBLIC").addParamMap(map).process().uniqueResult(0); switch (change_type_scode) { case "11": //11加冻结、减可用：出库分配、移库移出 if (jo_in != null) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_STORPUBLIC.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_STORPUBLIC.wql new file mode 100644 index 000000000..977acca30 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_STORPUBLIC.wql @@ -0,0 +1,78 @@ +[交易说明] + 交易名： + 所属模块： + 功能简述： + 版权所有： + 表引用： + 版本经历： + +[数据库] + --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 + +[IO定义] + ################################################# + ## 表字段对应输入参数 + ################################################# + 输入.flag TYPEAS s_string + 输入.struct_id TYPEAS s_string + 输入.material_id TYPEAS s_string + 输入.pcsn TYPEAS s_string + 输入.quality_scode TYPEAS s_string + 输入.storagevehicle_code TYPEAS s_string + + +[临时表] + --这边列出来的临时表就会在运行期动态创建 + +[临时变量] + --所有中间过程变量均可在此处定义 + +[业务过程] + + ########################################## + # 1、输入输出检查 # + ########################################## + + + ########################################## + # 2、主过程前处理 # + ########################################## + + + ########################################## + # 3、业务主过程 # + ########################################## + + IF 输入.flag = "1" + QUERY + SELECT + ivt.* + FROM + st_ivt_structivt ivt + LEFT JOIN st_ivt_structattr attr ON attr.struct_id = ivt.struct_id + WHERE + 1=1 + + OPTION 输入.struct_id <> "" + ivt.struct_id = 输入.struct_id + ENDOPTION + + OPTION 输入.material_id <> "" + ivt.material_id = 输入.material_id + ENDOPTION + + OPTION 输入.pcsn <> "" + ivt.pcsn = 输入.pcsn + ENDOPTION + + OPTION 输入.quality_scode <> "" + ivt.quality_scode = 输入.quality_scode + ENDOPTION + + OPTION 输入.storagevehicle_code <> "" + attr.storagevehicle_code = 输入.storagevehicle_code + ENDOPTION + + ENDSELECT + ENDQUERY + ENDIF \ No newline at end of file diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java index 661d66c60..2e7c0cf53 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java @@ -112,6 +112,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { map.put("end_time", MapUtil.getStr(whereJson, "end_time")); map.put("sap_pcsn", MapUtil.getStr(whereJson, "sap_pcsn")); map.put("stor_id", MapUtil.getStr(whereJson, "stor_id")); + map.put("package_box_sn", MapUtil.getStr(whereJson, "package_box_sn")); map.put("canuse_qty", "0"); if (StrUtil.isNotEmpty(map.get("material_code"))) { @@ -123,6 +124,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { if (StrUtil.isNotEmpty(map.get("sap_pcsn"))) { map.put("sap_pcsn", "%" + map.get("sap_pcsn") + "%"); } + if (StrUtil.isNotEmpty(map.get("package_box_sn"))) { + map.put("package_box_sn", "%" + map.get("package_box_sn") + "%"); + } JSONObject jo = WQL.getWO("QST_IVT_CHECKOUTBILL").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "ivt.struct_code ASC"); return jo; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql index d233913b1..474abd25d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql @@ -48,6 +48,7 @@ 输入.canuse_qty TYPEAS s_string 输入.sap_pcsn TYPEAS s_string 输入.cust_code TYPEAS s_string + 输入.package_box_sn TYPEAS s_string 输入.in_stor_id TYPEAS f_string [临时表] --这边列出来的临时表就会在运行期动态创建 @@ -362,7 +363,7 @@ LEFT JOIN SCH_BASE_Task task ON task.task_id = dis.task_id LEFT JOIN SCH_BASE_Point point2 ON point2.point_id = dis.point_id LEFT JOIN st_ivt_structattr attr ON attr.struct_id = dis.struct_id - LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn + LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn AND dis.box_no = sub.package_box_sn WHERE 1 = 1 OPTION 输入.iostorinvdtl_id <> "" @@ -539,6 +540,10 @@ sub.sap_pcsn like 输入.sap_pcsn ENDOPTION + OPTION 输入.package_box_sn <> "" + sub.package_box_sn like 输入.package_box_sn + ENDOPTION + OPTION 输入.pcsn <> "" ivt.pcsn like 输入.pcsn ENDOPTION diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/AddDtl.vue b/lms/nladmin-ui/src/views/wms/st/outbill/AddDtl.vue index 07f63ae68..1cbebdff2 100644 --- a/lms/nladmin-ui/src/views/wms/st/outbill/AddDtl.vue +++ b/lms/nladmin-ui/src/views/wms/st/outbill/AddDtl.vue @@ -40,6 +40,15 @@ class="filter-item" @keyup.enter.native="crud.toQuery" /> +