From c5c68043871b5888527eaffa4573128c6dc485d0 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 26 三月 2026 08:59:11 +0800
Subject: [PATCH] #解决拣选回库后库存丢失问题,库存明细的预留字段与工作明细预留字段不一致情况

---
 src/main/resources/mapper/asrs/LocDetlMapper.xml |   54 +++++++++++++++++++++++++++---------------------------
 1 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/main/resources/mapper/asrs/LocDetlMapper.xml b/src/main/resources/mapper/asrs/LocDetlMapper.xml
index b2aabac..76a160b 100644
--- a/src/main/resources/mapper/asrs/LocDetlMapper.xml
+++ b/src/main/resources/mapper/asrs/LocDetlMapper.xml
@@ -193,65 +193,65 @@
             <when test="batch != null and batch != ''">
                 and batch = #{batch}
             </when>
-            <otherwise>
-                and (batch IS NULL OR batch = '')
-            </otherwise>
+<!--            <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>
+<!--            <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>
+<!--            <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>
+<!--            <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>
+<!--            <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>
+<!--            <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>
+<!--            <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>
+<!--            <otherwise>-->
+<!--                and (box_type3 IS NULL OR box_type3 = '')-->
+<!--            </otherwise>-->
         </choose>
     </sql>
 
@@ -307,7 +307,7 @@
         where 1=1
         and loc_no = #{locNo}
         and matnr = #{matnr}
-        <include refid="batchSeq"></include>
+        <include refid="batchSeqNew"></include>
     </delete>
 
     <update id="updateAnfme">
@@ -317,7 +317,7 @@
         where 1=1
         and loc_no = #{locNo}
         and matnr = #{matnr}
-        <include refid="batchSeq"></include>
+        <include refid="batchSeqNew"></include>
     </update>
 
     <update id="updateWeight">
@@ -327,7 +327,7 @@
         where 1=1
         and loc_no = #{locNo}
         and matnr = #{matnr}
-        <include refid="batchSeq"></include>
+        <include refid="batchSeqNew"></include>
     </update>
 
     <update id="updateBarcode">

--
Gitblit v1.9.1