From 2856f266bdd076dbcd1ba32a15744fb607ed0e13 Mon Sep 17 00:00:00 2001 From: liuxy Date: Wed, 4 Jan 2023 18:15:24 +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 --- .../wms/st/outbill/service/impl/CheckOutBillServiceImpl.java | 2 ++ .../java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql | 4 ++-- .../src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT01.wql | 5 +++++ lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) 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 3c59f5619..b6ea3bb31 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 @@ -853,6 +853,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { jsonMap.put("flag", "1"); jsonMap.put("material_id", dtl.getString("material_id")); jsonMap.put("pcsn", dtl.getString("pcsn")); + jsonMap.put("box_no", dtl.getString("box_no")); jsonMap.put("sect_id", whereJson.getString("sect_id")); jsonMap.put("stor_id", whereJson.getString("stor_id")); @@ -1072,6 +1073,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { jsonMap.put("flag", "1"); jsonMap.put("material_id", dtl.getString("material_id")); jsonMap.put("pcsn", dtl.getString("pcsn")); + jsonMap.put("box_no", dtl.getString("box_no")); jsonMap.put("sect_id", whereJson.getString("sect_id")); jsonMap.put("stor_id", whereJson.getString("stor_id")); 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 acae27f81..14d636833 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 @@ -168,7 +168,7 @@ ST_IVT_IOStorInvDtl iosdtl LEFT JOIN md_me_materialbase mb ON mb.material_id = iosdtl.material_id LEFT JOIN ST_IVT_IOStorInv ios ON ios.iostorinv_id = iosdtl.iostorinv_id - LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = iosdtl.pcsn + LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = iosdtl.pcsn AND sub.package_box_sn = iosdtl.box_no WHERE 1=1 OPTION 输入.iostorinv_id <> "" @@ -679,7 +679,7 @@ LEFT JOIN md_me_materialbase mater ON dis.material_id = mater.material_id LEFT JOIN sch_base_point point ON dis.point_id = point.point_id LEFT JOIN sch_base_task task ON dis.task_id = task.task_id - LEFT JOIN pdm_bi_subpackagerelation sub ON dis.pcsn = sub.container_name + LEFT JOIN pdm_bi_subpackagerelation sub ON dis.pcsn = sub.container_name AND sub.package_box_sn = dis.box_no WHERE 1=1 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT01.wql index 1fd2d7823..3f85bd4c7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT01.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT01.wql @@ -24,6 +24,7 @@ 输入.iostorinv_id TYPEAS s_string 输入.iostorinvdtl_id TYPEAS s_string 输入.stor_id TYPEAS s_string + 输入.box_no TYPEAS s_string [临时表] --这边列出来的临时表就会在运行期动态创建 @@ -73,6 +74,10 @@ ivt.material_id = 输入.material_id ENDOPTION + OPTION 输入.box_no <> "" + attr.storagevehicle_code = 输入.box_no + ENDOPTION + OPTION 输入.sale_order_name <> "" sub.sale_order_name = 输入.sale_order_name ENDOPTION diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue b/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue index e15a65c1d..3252469a3 100644 --- a/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue +++ b/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue @@ -108,7 +108,7 @@ - +