From d2ebdcbf7d42f43e1f37a159912f13012e7d1dbf Mon Sep 17 00:00:00 2001 From: yangyufu <1617486762@qq.com> Date: Thu, 10 Jul 2025 13:57:31 +0800 Subject: [PATCH] =?UTF-8?q?fix(wms):=20=E4=BF=AE=E5=A4=8D=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E6=9F=A5=E8=AF=A2=E4=B8=AD=E7=AE=B1=E5=AD=90=E6=9D=90?= =?UTF-8?q?=E8=B4=A8=E4=BF=A1=E6=81=AF=E9=97=AE=E9=A2=98=20-=20=E5=9C=A8?= =?UTF-8?q?=E5=AD=90=E6=9F=A5=E8=AF=A2=E4=B8=AD=E6=B7=BB=E5=8A=A0=20box=5F?= =?UTF-8?q?type=20=E5=AD=97=E6=AE=B5=20-=20=E6=96=B0=E5=A2=9E=E4=B8=8E=20m?= =?UTF-8?q?d=5Fme=5Fmaterialbase=20=E8=A1=A8=E7=9A=84=E5=B7=A6=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=EF=BC=8C=E8=8E=B7=E5=8F=96=E6=9D=90=E8=B4=A8=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=20-=20=E7=A7=BB=E9=99=A4=20bst=5Fivt=5Fboxinfo=20?= =?UTF-8?q?=E8=A1=A8=E7=9A=84=E5=B7=A6=E8=BF=9E=E6=8E=A5=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E5=86=8D=E4=BD=BF=E7=94=A8=E7=AE=B1=E5=9E=8B=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql b/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql index 19a03e98b..eac6cfdb5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql @@ -266,8 +266,8 @@ base.cust_name, dis.sect_name, dis.box_no, - bib.material_code box_material_code, - bib.material_name box_material_name, + sub.box_type box_material_code, + mmm.material_name box_material_name, dis.qty_unit_name, mater.material_code, mater.material_name, @@ -330,6 +330,7 @@ record.bill_code, record.container_name, record.package_box_sn, + record.box_type, record.sap_pcsn, max(record.customer_name) as customer_name, max(record.customer_description) as customer_description, @@ -353,7 +354,9 @@ record.bill_code, record.container_name, record.sap_pcsn, - record.package_box_sn) sub ON (sub.container_name = dis.pcsn AND sub.package_box_sn = dis.box_no AND sub.bill_id = mst.iostorinv_id) + record.package_box_sn, + record.box_type) sub ON (sub.container_name = dis.pcsn AND sub.package_box_sn = dis.box_no AND sub.bill_id = mst.iostorinv_id) + LEFT JOIN md_me_materialbase mmm ON sub.box_type = mmm.material_code LEFT JOIN md_cs_customerbase cust ON cust.cust_code = sub.customer_name LEFT JOIN (SELECT container_name, @@ -388,8 +391,8 @@ base.cust_name, dis.sect_name, dis.box_no, - bib.material_code box_material_code, - bib.material_name box_material_name, + sub.box_type box_material_code, + mmm.material_name box_material_name, dis.qty_unit_name, mater.material_code, mater.material_name, @@ -441,7 +444,6 @@ a.pcsn ) AS c inner JOIN st_ivt_iostorinvdis dis ON dis.iostorinvdis_id = c.iostorinvdis_id - LEFT JOIN bst_ivt_boxinfo bib ON dis.box_no = bib.box_no inner JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dis.iostorinv_id inner JOIN st_ivt_iostorinvdtl dtl ON dtl.iostorinvdtl_id = dis.iostorinvdtl_id LEFT JOIN md_cs_transportationbase base ON base.cust_code = mst.trans_code @@ -452,6 +454,7 @@ record.bill_code, record.container_name, record.package_box_sn, + record.box_type, record.sap_pcsn, max(record.customer_name) as customer_name, max(record.customer_description) as customer_description, @@ -475,7 +478,9 @@ record.bill_code, record.container_name, record.sap_pcsn, - record.package_box_sn) sub ON (sub.container_name = dis.pcsn AND sub.package_box_sn = dis.box_no AND sub.bill_id = mst.iostorinv_id) + record.package_box_sn, + record.box_type) sub ON (sub.container_name = dis.pcsn AND sub.package_box_sn = dis.box_no AND sub.bill_id = mst.iostorinv_id) + LEFT JOIN md_me_materialbase mmm ON sub.box_type = mmm.material_code LEFT JOIN md_cs_customerbase cust ON cust.cust_code = sub.customer_name LEFT JOIN (SELECT container_name,