From b15c43739d5f14aa3164301bccb1fa5022075966 Mon Sep 17 00:00:00 2001
From: "DESKTOP-5DIJMF9\\admin" <2388969634@qq.com>
Date: Mon, 17 Feb 2025 11:24:28 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96=E5=85=A5=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

---
 .../impl/RawAssistIStorServiceImpl.java       |  7 ++--
 .../st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql  | 34 +------------------
 2 files changed, 4 insertions(+), 37 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java
index 5a480c8a9..5803d752c 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java
@@ -107,6 +107,7 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
             } else {
                 map.put("pcsn", "%" + pcsn + "%");
             }
+            map.put("flag", "29");
         }
 
         // 空格查询
@@ -122,6 +123,7 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
             } else {
                 map.put("sap_pcsn", "%" + sap_pcsn + "%");
             }
+            map.put("flag", "29");
         }
 
         // 空格查询
@@ -138,6 +140,7 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
                 map.put("box_no", "%" + box_no + "%");
 
             }
+            map.put("flag", "29");
         }
 
         // 空格查询
@@ -173,10 +176,6 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
             map.put("in_stor_id", in_stor_id);
         }
 
-        if (ObjectUtil.isNotEmpty(map.get("sap_pcsn_in"))) {
-            map.put("flag", "29");
-        }
-
         JSONObject jo = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "iostorinv_id desc");
         return jo;
     }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql
index 23396f964..d52262e8b 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql
@@ -273,7 +273,7 @@
                         ios.input_time <= 输入.end_time
                     ENDOPTION
             ) ios2
-            LEFT JOIN (
+            inner JOIN (
                 SELECT
                     dis.iostorinv_id
                 FROM
@@ -372,38 +372,6 @@
                         ios.input_time <= 输入.end_time
                     ENDOPTION
             ) ios2
-            LEFT JOIN (
-                SELECT
-                    dis.iostorinv_id
-                FROM
-                    st_ivt_iostorinvdis dis
-                WHERE
-                    1 = 1
-                    OPTION 输入.box_no <> ""
-                        dis.box_no like 输入.box_no
-                    ENDOPTION
-
-                    OPTION 输入.box_no_in <> ""
-                        dis.box_no IN 输入.box_no_in
-                    ENDOPTION
-
-                    OPTION 输入.pcsn <> ""
-                           dis.pcsn like 输入.pcsn
-                    ENDOPTION
-
-                    OPTION 输入.pcsn_in <> ""
-                        dis.pcsn IN 输入.pcsn_in
-                    ENDOPTION
-
-                    OPTION 输入.sap_pcsn <> ""
-                           sub.sap_pcsn like 输入.sap_pcsn
-                    ENDOPTION
-
-                    OPTION 输入.sap_pcsn_in <> ""
-                        sub.sap_pcsn IN 输入.sap_pcsn_in
-                    ENDOPTION
-                    GROUP BY dis.iostorinv_id
-            ) dis2 ON dis2.iostorinv_id = ios2.iostorinv_id
             INNER JOIN (
                 SELECT
                     dtl.iostorinv_id,