Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_RAWFOILWORKORDER_01.wql

@@ -47,9 +47,11 @@
 	IF 输入.flag = "1"
 		PAGEQUERY
 			SELECT
-            	der.*
+            	der.*,
+            	ivt.point_code AS point_code2
             FROM
             	pdm_bi_rawfoilworkorder der
+            	LEFT JOIN ST_IVT_SbPointIvt ivt ON ivt.ext_code = der.resource_name
             WHERE
                 der.is_delete = '0'
 

lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql

@@ -135,11 +135,13 @@
                     	 mb.material_code,
                          mb.material_name,
                          mb.material_spec,
-                         mb.material_model
+                         mb.material_model,
+                         sub.sap_pcsn
                     FROM
                     	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
                     WHERE
                         1=1
                     OPTION 输入.iostorinv_id <> ""