代码更新

lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_CHECK.wql

@@ -98,7 +98,7 @@
 
 	IF 输入.flag = "2"
 		QUERY
-			SELECT
+			SELECT DISTINCT
             	dtl.check_code,
             	(
             	    CASE

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

@@ -17,6 +17,8 @@
 	输入.pcsn					                 TYPEAS s_string
 	输入.struct_id					             TYPEAS s_string
 	输入.iostorinv_id					         TYPEAS s_string
+	输入.width					         TYPEAS s_string
+	输入.thickness					         TYPEAS s_string
 
 [临时表]
 	--这边列出来的临时表就会在运行期动态创建
@@ -122,3 +124,54 @@
 			ENDSELECT
 		ENDQUERY
 	ENDIF
+
+    IF 输入.flag = "5"
+		QUERY
+            SELECT
+              	sub.width,
+              	sub.thickness
+            FROM
+                ST_IVT_IOStorInvDis dis
+                LEFT JOIN pdm_bi_subpackagerelation sub ON sub.package_box_sn = dis.box_no
+            WHERE
+                1 = 1
+
+                OPTION 输入.iostorinv_id <> ""
+                        dis.iostorinv_id = 输入.iostorinv_id
+                ENDOPTION
+
+                group by sub.width,sub.thickness
+
+			ENDSELECT
+		ENDQUERY
+	ENDIF
+
+    IF 输入.flag = "6"
+		QUERY
+            SELECT
+                sub.package_box_sn AS box_no,
+                MAX( sub.product_description ) AS material_name,
+                SUM( sub.net_weight ) AS qty
+            FROM
+              	ST_IVT_IOStorInvDis dis
+              	LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn
+            WHERE
+                1 = 1
+
+                OPTION 输入.iostorinv_id <> ""
+                        dis.iostorinv_id = 输入.iostorinv_id
+                ENDOPTION
+
+                OPTION 输入.width <> ""
+                        sub.width = 输入.width
+                ENDOPTION
+
+                OPTION 输入.thickness <> ""
+                        sub.width = 输入.thickness
+                ENDOPTION
+
+                group by sub.package_box_sn
+
+			ENDSELECT
+		ENDQUERY
+	ENDIF