From 8ce4dcbd701b40165b0dbf365f667932cf2a8916 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期五, 06 三月 2026 08:21:15 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/OrderDetlPakoutMapper.xml |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/mapper/OrderDetlPakoutMapper.xml b/src/main/resources/mapper/OrderDetlPakoutMapper.xml
index 7f70401..96844e9 100644
--- a/src/main/resources/mapper/OrderDetlPakoutMapper.xml
+++ b/src/main/resources/mapper/OrderDetlPakoutMapper.xml
@@ -57,13 +57,18 @@
 
     <sql id="standbyAll">
         and batch = #{batch}
-        and brand = #{brand}
-        and standby1 = #{standby1}
-        and standby2 = #{standby2}
-        and standby3 = #{standby3}
-        and box_type1 = #{boxType1}
-        and box_type2 = #{boxType2}
-        and box_type3 = #{boxType3}
+        <if test="brand != null and brand != ''">
+            and brand = #{brand}
+        </if>
+<!--        <if test="standby1 != null and standby1 != ''">-->
+<!--            and standby1 = #{standby1}-->
+<!--        </if>-->
+        <if test="standby2 != null and standby2 != ''">
+            and standby2 = #{standby2}
+        </if>
+        <if test="standby3 != null and standby3 != ''">
+            and standby3 = #{standby3}
+        </if>
     </sql>
     <sql id="standbyAllMemo">
         --         and line_number = #{lineNumber}

--
Gitblit v1.9.1