From 581edafe3e8d3536049e12ddd2023ce04b9a86cc Mon Sep 17 00:00:00 2001
From: "DESKTOP-5DIJMF9\\admin" <2388969634@qq.com>
Date: Sun, 16 Feb 2025 10:59:00 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CheckOutBillServiceImpl.java |  2 +
 .../st/outbill/wql/QST_IVT_CHECKOUTBILL.wql   | 42 +++++--------------
 2 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
index 6008ce838..bc99cece1 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
@@ -124,6 +124,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
                 map.put("box_no", "%" + map.get("box_no") + "%");
 
             }
+            map.put("flag", "11");
         }
 
         if (StrUtil.isNotEmpty(map.get("width"))) {
@@ -146,6 +147,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
             } else {
                 map.put("pcsn", "%" + map.get("pcsn") + "%");
             }
+            map.put("flag", "11");
         }
 
         // 空格查询
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
index 6ab99b36d..7dad8b34f 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
@@ -160,39 +160,17 @@
            ) c ON ios.iostorinv_id = c.iostorinv_id
             LEFT JOIN (
                 SELECT
-                    dis.iostorinv_id
+                    SUM(a.plan_qty) AS plan_qty,
+                    a.iostorinv_id
                 FROM
-                    st_ivt_iostorinvdis dis
+                    st_ivt_iostorinvdis a
+                    LEFT JOIN ST_IVT_IOStorInv b ON a.iostorinv_id = b.iostorinv_id
                 WHERE
-                    1 = 1
-                    OPTION 输入.pcsn <> ""
-                            dis.pcsn like 输入.pcsn
-                    ENDOPTION
-                    OPTION 输入.pcsn_in <> ""
-                            dis.pcsn IN 输入.pcsn_in
-                    ENDOPTION
-                    OPTION 输入.box_no <> ""
-                         dis.box_no like 输入.box_no
-                    ENDOPTION
-                    OPTION 输入.box_no_in <> ""
-                        dis.box_no IN 输入.box_no_in
-                    ENDOPTION
-                GROUP BY
-                    dis.iostorinv_id
-                ) b ON b.iostorinv_id = ios.iostorinv_id
-                LEFT JOIN (
-                    SELECT
-                        SUM(a.plan_qty) AS plan_qty,
-                        a.iostorinv_id
-                    FROM
-                        st_ivt_iostorinvdis a
-                        LEFT JOIN ST_IVT_IOStorInv b ON a.iostorinv_id = b.iostorinv_id
-                    WHERE
-                        b.io_type = '1'
-                        and b.is_delete='0'
-                        and b.is_overdue = '0'
-                    GROUP BY a.iostorinv_id
-                ) a ON a.iostorinv_id = ios.iostorinv_id
+                    b.io_type = '1'
+                    and b.is_delete='0'
+                    and b.is_overdue = '0'
+                GROUP BY a.iostorinv_id
+            ) a ON a.iostorinv_id = ios.iostorinv_id
 			ENDSELECT
 		ENDPAGEQUERY
 	ENDIF
@@ -268,7 +246,7 @@
                  dtl.iostorinv_id,
                  dtl.vbeln
                ) c ON ios.iostorinv_id = c.iostorinv_id
-                LEFT JOIN (
+                inner JOIN (
                     SELECT
                         dis.iostorinv_id
                     FROM