From 4e441a7c1dcb2e2d9d43c4d83be60fcd5befc970 Mon Sep 17 00:00:00 2001
From: zhouz <>
Date: Wed, 21 Aug 2024 11:26:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=8A=A5=E8=A1=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/basedata/st/wql/QST_STRUCTIVT001.wql  | 33 ++++---------------
 .../nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql   |  2 +-
 2 files changed, 8 insertions(+), 27 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 f6d404c6f..a0a098a7a 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
@@ -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
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 0e5648aeb..1b58ebf3e 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
@@ -150,7 +150,7 @@
 
     IF 输入.flag = "2"
             PAGEQUERY
-                SELECT
+                SELECT DISTINCT
                     mst.stor_name,
                     dis.sect_name,
                     mst.bill_type,