From 0d7d52ef60900f43f41c108ab9e897e1883d69d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Thu, 4 Jun 2026 14:17:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8D=AE=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=9F=A5=E8=AF=A2;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reservationStockInOrder/ReservationStockInOrderMapper.xml | 2 +-
 .../ReservationStockOutOrderMapper.xml                        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
index 168b0d090..0cac472fe 100644
--- a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
@@ -432,7 +432,7 @@
         <if test="businessType != null  and businessType != ''">
             and a.BUSINESS_TYPE = #{businessType}
         </if>
-        <if test="reservationOrderSource != null">
+        <if test="reservationOrderSource != null and reservationOrderSource != ''">
             and a.RESERVATION_ORDER_SOURCE = #{reservationOrderSource}
         </if>
         <if test="createByName != null  and createByName != ''">
diff --git a/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml
index 26c5e8dce..e0d7fdaa3 100644
--- a/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml
@@ -325,10 +325,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="issueStatus != null">
             and a.ISSUE_STATUS = #{issueStatus}
         </if>
-        <if test="reservationOrderSource != null">
+        <if test="reservationOrderSource != null and orderTypeName != ''">
             and a.RESERVATION_ORDER_SOURCE = #{reservationOrderSource}
         </if>
-        <if test="needTransportFlag != null">
+        <if test="needTransportFlag != null and orderTypeName != ''">
             and a.NEED_TRANSPORT_FLAG = #{needTransportFlag}
         </if>
         <if test="createByName != null  and createByName != ''">