From 900b7c3e7c0d887574a2fc62973749d6b479f95b Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 17 十二月 2024 14:59:21 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/OrderDetlPakoutMapper.xml |   61 +++++++++---------------------
 1 files changed, 18 insertions(+), 43 deletions(-)

diff --git a/src/main/resources/mapper/OrderDetlPakoutMapper.xml b/src/main/resources/mapper/OrderDetlPakoutMapper.xml
index 737b736..1300fc1 100644
--- a/src/main/resources/mapper/OrderDetlPakoutMapper.xml
+++ b/src/main/resources/mapper/OrderDetlPakoutMapper.xml
@@ -47,22 +47,27 @@
         <result column="memo" property="memo" />
         <result column="pakin_pakout_status" property="pakinPakoutStatus" />
         <result column="line_number" property="lineNumber" />
+        <result column="standby1" property="standby1" />
+        <result column="standby2" property="standby2" />
+        <result column="standby3" property="standby3" />
 
     </resultMap>
+
+    <sql id="standbyAll">
+        and batch = #{batch}
+        and line_number = #{lineNumber}
+        and specs = #{specs}
+        and standby1 = #{standby1}
+        and standby2 = #{standby2}
+        and standby3 = #{standby3}
+    </sql>
 
     <select id="selectItem" resultMap="BaseResultMap">
         select * from man_order_detl_pakout
         where 1=1
         and order_id = #{orderId}
         and matnr = #{matnr}
-        <choose>
-            <when test="batch != null and batch != ''">
-                and batch = #{batch}
-            </when>
-            <otherwise>
-                and (batch IS NULL OR batch = '')
-            </otherwise>
-        </choose>
+        <include refid="standbyAll"></include>
     </select>
 
     <select id="selectItemByOrderNo" resultMap="BaseResultMap">
@@ -70,9 +75,7 @@
         where 1=1
         and order_no = #{orderNo}
         and matnr = #{matnr}
-        <if test="batch!=null and batch!='' ">
-            and batch = #{batch}
-        </if>
+        <include refid="standbyAll"></include>
     </select>
 
     <select id="selectWorkingDetls" resultMap="BaseResultMap">
@@ -133,14 +136,7 @@
         where 1=1
         and order_id = #{orderId}
         and matnr = #{matnr}
-        <choose>
-            <when test="batch != null and batch != ''">
-                and batch = #{batch}
-            </when>
-            <otherwise>
-                and (batch IS NULL OR batch = '')
-            </otherwise>
-        </choose>
+        <include refid="standbyAll"></include>
     </update>
 
     <update id="decrease">
@@ -149,14 +145,7 @@
         where 1=1
         and order_no = #{orderNo}
         and matnr = #{matnr}
-        <choose>
-            <when test="batch != null and batch != ''">
-                and batch = #{batch}
-            </when>
-            <otherwise>
-                and (batch IS NULL OR batch = '')
-            </otherwise>
-        </choose>
+        <include refid="standbyAll"></include>
     </update>
 
     <update id="modifyStatus">
@@ -176,14 +165,7 @@
         where 1=1
         and order_no = #{orderNo}
         and matnr = #{matnr}
-        <choose>
-            <when test="batch != null and batch != ''">
-                and batch = #{batch}
-            </when>
-            <otherwise>
-                and (batch IS NULL OR batch = '')
-            </otherwise>
-        </choose>
+        <include refid="standbyAll"></include>
     </update>
 
     <update id="increaseWorkQty">
@@ -192,14 +174,7 @@
         where 1=1
         and order_id = #{orderId}
         and matnr = #{matnr}
-        <choose>
-            <when test="batch != null and batch != ''">
-                and batch = #{batch}
-            </when>
-            <otherwise>
-                and (batch IS NULL OR batch = '')
-            </otherwise>
-        </choose>
+        <include refid="standbyAll"></include>
     </update>
 
 </mapper>

--
Gitblit v1.9.1