From 1e6b4d88290ccd79b51bed3acb805750a0ea7d01 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期二, 12 八月 2025 15:25:23 +0800
Subject: [PATCH] 记录输送线异常日志

---
 src/main/resources/mapper/OrderDetlPakinMapper.xml |   72 ++++++++++++++++++++++++++++++++----
 1 files changed, 64 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/mapper/OrderDetlPakinMapper.xml b/src/main/resources/mapper/OrderDetlPakinMapper.xml
index 85639b1..3f3e522 100644
--- a/src/main/resources/mapper/OrderDetlPakinMapper.xml
+++ b/src/main/resources/mapper/OrderDetlPakinMapper.xml
@@ -57,14 +57,70 @@
     </resultMap>
 
     <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}
+        <choose>
+            <when test="batch != null and batch != ''">
+                and batch = #{batch}
+            </when>
+            <otherwise>
+                and (batch IS NULL OR batch = '')
+            </otherwise>
+        </choose>
+        <choose>
+            <when test="brand != null and brand != ''">
+                and brand = #{brand}
+            </when>
+            <otherwise>
+                and (brand IS NULL OR brand = '')
+            </otherwise>
+        </choose>
+        <choose>
+            <when test="standby1 != null and standby1 != ''">
+                and standby1 = #{standby1}
+            </when>
+            <otherwise>
+                and (standby1 IS NULL OR standby1 = '')
+            </otherwise>
+        </choose>
+        <choose>
+            <when test="standby2 != null and standby2 != ''">
+                and standby2 = #{standby2}
+            </when>
+            <otherwise>
+                and (standby2 IS NULL OR standby2 = '')
+            </otherwise>
+        </choose>
+        <choose>
+            <when test="standby3 != null and standby3 != ''">
+                and standby3 = #{standby3}
+            </when>
+            <otherwise>
+                and (standby3 IS NULL OR standby3 = '')
+            </otherwise>
+        </choose>
+        <choose>
+            <when test="boxType1 != null and boxType1 != ''">
+                and box_type1 = #{boxType1}
+            </when>
+            <otherwise>
+                and (box_type1 IS NULL OR box_type1 = '')
+            </otherwise>
+        </choose>
+        <choose>
+            <when test="boxType2 != null and boxType2 != ''">
+                and box_type2 = #{boxType2}
+            </when>
+            <otherwise>
+                and (box_type2 IS NULL OR box_type2 = '')
+            </otherwise>
+        </choose>
+        <choose>
+            <when test="boxType3 != null and boxType3 != ''">
+                and box_type3 = #{boxType3}
+            </when>
+            <otherwise>
+                and (box_type3 IS NULL OR box_type3 = '')
+            </otherwise>
+        </choose>
     </sql>
     <sql id="standbyAllMemo">
         --         and line_number = #{lineNumber}

--
Gitblit v1.9.1