From 59318daa1e045fcbd504735f712a1880594a5233 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 26 三月 2026 08:55:30 +0800
Subject: [PATCH] #解决拣选回库后库存丢失问题，库存明细的预留字段与工作明细预留字段不一致情况
---
src/main/resources/mapper/asrs/LocDetlMapper.xml | 88 ++++++++++++++++++++++++++++++++------------
1 files changed, 64 insertions(+), 24 deletions(-)
diff --git a/src/main/resources/mapper/asrs/LocDetlMapper.xml b/src/main/resources/mapper/asrs/LocDetlMapper.xml
index 9cc232f..b2aabac 100644
--- a/src/main/resources/mapper/asrs/LocDetlMapper.xml
+++ b/src/main/resources/mapper/asrs/LocDetlMapper.xml
@@ -55,30 +55,70 @@
</resultMap>
<sql id="batchSeq">
- <if test="batch != null and batch != ''">
- and d.batch = #{batch}
- </if>
- <if test="brand != null and brand != ''">
- and d.brand = #{brand}
- </if>
- <if test="standby1 != null and standby1 != ''">
- and d.standby1 = #{standby1}
- </if>
- <if test="standby2 != null and standby2 != ''">
- and d.standby2 = #{standby2}
- </if>
- <if test="standby3 != null and standby3 != ''">
- and d.standby3 = #{standby3}
- </if>
- <if test="boxType1 != null and boxType1 != ''">
- and d.box_type1 = #{boxType1}
- </if>
- <if test="boxType2 != null and boxType2 != ''">
- and d.box_type2 = #{boxType2}
- </if>
- <if test="boxType3 != null and boxType3 != ''">
- and d.box_type3 = #{boxType3}
- </if>
+ <choose>
+ <when test="batch != null and batch != ''">
+ and d.batch = #{batch}
+ </when>
+ <otherwise>
+-- and (d.batch IS NULL OR d.batch = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="brand != null and brand != ''">
+ and d.brand = #{brand}
+ </when>
+<!-- <otherwise>-->
+<!-- and (d.brand IS NULL OR d.brand = '')-->
+<!-- </otherwise>-->
+ </choose>
+ <choose>
+ <when test="standby1 != null and standby1 != ''">
+ and d.standby1 = #{standby1}
+ </when>
+<!-- <otherwise>-->
+<!-- and (d.standby1 IS NULL OR d.standby1 = '')-->
+<!-- </otherwise>-->
+ </choose>
+ <choose>
+ <when test="standby2 != null and standby2 != ''">
+ and d.standby2 = #{standby2}
+ </when>
+<!-- <otherwise>-->
+<!-- and (d.standby2 IS NULL OR d.standby2 = '')-->
+<!-- </otherwise>-->
+ </choose>
+ <choose>
+ <when test="standby3 != null and standby3 != ''">
+ and d.standby3 = #{standby3}
+ </when>
+<!-- <otherwise>-->
+<!-- and (d.standby3 IS NULL OR d.standby3 = '')-->
+<!-- </otherwise>-->
+ </choose>
+ <choose>
+ <when test="boxType1 != null and boxType1 != ''">
+ and d.box_type1 = #{boxType1}
+ </when>
+<!-- <otherwise>-->
+<!-- and (d.box_type1 IS NULL OR d.box_type1 = '')-->
+<!-- </otherwise>-->
+ </choose>
+ <choose>
+ <when test="boxType2 != null and boxType2 != ''">
+ and d.box_type2 = #{boxType2}
+ </when>
+<!-- <otherwise>-->
+<!-- and (d.box_type2 IS NULL OR d.box_type2 = '')-->
+<!-- </otherwise>-->
+ </choose>
+ <choose>
+ <when test="boxType3 != null and boxType3 != ''">
+ and d.box_type3 = #{boxType3}
+ </when>
+<!-- <otherwise>-->
+<!-- and (d.box_type3 IS NULL OR d.box_type3 = '')-->
+<!-- </otherwise>-->
+ </choose>
</sql>
<sql id="batchSeqA">
--
Gitblit v1.9.1