fix:报表优化

lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql

@@ -173,19 +173,6 @@
                         attr.stor_id = 输入.stor_id
                 ENDOPTION
 
-                OPTION 输入.sub_type = "1"
-                        DATEDIFF( NOW(), sub.date_of_production ) <= '90'
-                ENDOPTION
-
-                OPTION 输入.sub_type = "2"
-                        DATEDIFF( NOW(), sub.date_of_production ) > '60'
-                        AND DATEDIFF( NOW(), sub.date_of_production ) <= '90'
-                ENDOPTION
-
-                OPTION 输入.sub_type = "3"
-                       DATEDIFF( NOW(), sub.date_of_production ) > '90'
-                ENDOPTION
-
                 OPTION 输入.sect_id <> ""
                         attr.sect_id = 输入.sect_id
                 ENDOPTION
@@ -214,6 +201,10 @@
                         ivt.frozen_qty > 0
                 ENDOPTION
                 ) a
+                WHERE 1=1
+                 OPTION 输入.sub_type <> ""
+                      a.sub_type = 输入.sub_type
+                ENDOPTION
 			ENDSELECT
 		ENDPAGEQUERY
 	ENDIF
@@ -338,19 +329,6 @@
                         ivt.pcsn like 输入.pcsn
                  ENDOPTION
 
-                 OPTION 输入.sub_type = "1"
-                        DATEDIFF( NOW(), sub.date_of_production ) <= '90'
-                 ENDOPTION
-
-                 OPTION 输入.sub_type = "2"
-                        DATEDIFF( NOW(), sub.date_of_production ) > '60'
-                        AND DATEDIFF( NOW(), sub.date_of_production ) <= '90'
-                 ENDOPTION
-
-                 OPTION 输入.sub_type = "3"
-                       DATEDIFF( NOW(), sub.date_of_production ) > '90'
-                 ENDOPTION
-
                  OPTION 输入.sap_pcsn <> ""
                         sub.sap_pcsn like 输入.sap_pcsn
                  ENDOPTION
@@ -403,6 +381,9 @@
                 ) b ON a.pcsn = b.pcsn
                 WHERE
                 1=1
+                 OPTION 输入.sub_type <> ""
+                      a.sub_type = 输入.sub_type
+                ENDOPTION
                 order by a.instorage_time desc,a.package_box_sn
 			ENDSELECT
 		ENDQUERY

lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql

@@ -150,7 +150,7 @@
 
     IF 输入.flag = "2"
             PAGEQUERY
-                SELECT
+                SELECT DISTINCT
                     mst.stor_name,
                     dis.sect_name,
                     mst.bill_type,