From 796bb99a8b9ed861cfd8656c6c0ddaea66b0985f Mon Sep 17 00:00:00 2001
From: rcx <3084692334@qq.com>
Date: Fri, 11 Sep 2026 14:28:55 +0800
Subject: [PATCH] =?UTF-8?q?fix(wms):=20=E5=87=BA=E5=BA=93=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E5=88=97=E8=A1=A8=E4=B8=8D=E5=86=8D=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=B7=B2=E8=BD=AF=E5=88=A0=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E5=8D=95,=20=E5=8F=8D=E5=AE=A1=E7=94=9F=E6=88=90=E7=9A=84?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E8=AE=B0=E5=BD=95=E5=8F=AF=E8=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/outOrderAbnormal/OutOrderAbnormalMapper.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mhd_wms/src/main/resources/mapper/outOrderAbnormal/OutOrderAbnormalMapper.xml b/mhd_wms/src/main/resources/mapper/outOrderAbnormal/OutOrderAbnormalMapper.xml
index 0a3c003a5..6c33ec34b 100644
--- a/mhd_wms/src/main/resources/mapper/outOrderAbnormal/OutOrderAbnormalMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/outOrderAbnormal/OutOrderAbnormalMapper.xml
@@ -101,10 +101,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="orderTypeCode != null  and orderTypeCode != ''">
             and b.order_type_code = #{orderTypeCode}
         </if>
-        <choose>
-            <when test="delFlag != null"> and b.del_flag = #{delFlag} </when>
-            <otherwise> and b.del_flag = 1 </otherwise>
-        </choose>
+        <!-- 不默认过滤 b.del_flag: 反审后出库单已软删(del_flag=2), 默认 b.del_flag=1 会让反审生成的异常记录在列表中消失;
+             仅当前端显式传 delFlag 时才过滤 -->
+        <if test="delFlag != null"> and b.del_flag = #{delFlag} </if>
     </sql>
 
     <select id="queryList" parameterType="com.mhd.wms.domain.outOrderAbnormal.repository.todo.OutOrderAbnormalDO" resultMap="OutOrderAbnormalResult">
@@ -112,7 +111,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <include refid="selectOutOrderAbnormalPo11"/>
             <include refid="com.mhd.wms.domain.stockOutOrder.repository.mapper.StockOutOrderMapper.joinStockOutOrderPoYc"/>
         from out_order_abnormal a
-        left join stock_out_order b on a.out_order_number = b.out_order_number and b.del_flag = 1
+        <!-- 不按 b.del_flag 限定: 出库单号唯一, 关联活动单或反审归档单均按单号取数, 保证反审异常记录能带出出库单信息 -->
+        left join stock_out_order b on a.out_order_number = b.out_order_number
         <where>
             <include refid="selectOutOrderAbnormalPo1"/>
             <include refid="joinStockOutOrderPoWhere"/>