From 0ab218b50c359af845d01eeeb0f4fc859a726250 Mon Sep 17 00:00:00 2001
From: "ZHOUZ\\Noble'lift" <1014987728@qq.com>
Date: Thu, 1 Dec 2022 23:28:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql    | 5 +----
 .../src/main/java/org/nl/wms/ext/wql/QCRM_001.wql           | 6 ++++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql
index 07fc98b82..45c6c51ac 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql
@@ -51,8 +51,6 @@
                 attr.sect_code,
                 attr.sect_name,
                 attr.stor_name,
-                point.point_code,
-                point.point_name,
                 mater.material_code,
                 mater.material_name,
                 unit.unit_name,
@@ -60,12 +58,11 @@
                 sub.sap_pcsn
                 FROM
                     ST_IVT_StructIvt ivt
-                    LEFT JOIN sch_base_point point ON ivt.struct_id = point.source_id
                     LEFT JOIN st_ivt_structattr attr ON ivt.struct_id = attr.struct_id
                     LEFT JOIN md_me_materialbase mater ON mater.material_id = ivt.material_id
                     LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = ivt.qty_unit_id
                     LEFT JOIN SCH_BASE_Region region ON region.region_id = ivt.region_id
-                    LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = ivt.pcsn
+                    LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = ivt.pcsn AND attr.storagevehicle_code = sub.package_box_sn
             WHERE
                  1 = 1
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/wql/QCRM_001.wql b/lms/nladmin-system/src/main/java/org/nl/wms/ext/wql/QCRM_001.wql
index e02bf8211..3e366aeae 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/wql/QCRM_001.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/wql/QCRM_001.wql
@@ -59,11 +59,13 @@
             	sub.thickness,
             	sub.net_weight AS netweight,
             	sub.length,
-            	'AC01' AS warehouse_code,
+            	stor.ext_id AS warehouse_code,
             	sub.date_of_production AS dateofproduction,
-            	sub.un_plan_product_property1 AS unplanproductproperty
+            	CONCAT(sub.un_plan_product_property1,sub.un_plan_product_property2,sub.un_plan_product_property3) AS unplanproductproperty
             FROM
             	pdm_bi_subpackagerelation sub
+            INNER JOIN st_ivt_structattr sa On sa.storagevehicle_code = sub.package_box_sn
+            INNER JOIN st_ivt_bsrealstorattr stor ON stor.stor_id = sa.stor_id
             WHERE
             	sub.`status` = '2'
             	OPTION 输入.material_code <> ""