From d7b2c73a570f4a79144fbf9b555f3e6a98b5adf4 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:14:02 +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 +-
 .../reservationStockOutOrder/ReservationStockOutOrderMapper.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
index 3e5794e2b..168b0d090 100644
--- a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
@@ -273,7 +273,7 @@
             and a.order_type_code = #{orderTypeCode}
         </if>
         <if test="orderTypeName != null  and orderTypeName != ''">
-            and a.order_type_name like concat('%', #{orderTypeName}, '%')
+            and (a.BUSINESS_TYPE like concat('%', #{orderTypeName}, '%') or a.ORDER_TYPE_CODE like concat('%', #{orderTypeName}, '%'))
         </if>
         <if test="supplierId != null ">
             and a.supplier_id = #{supplierId}
diff --git a/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml
index 1143c110d..26c5e8dce 100644
--- a/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml
@@ -350,7 +350,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and date_format(a.outbound_date,'%Y-%m-%d') &lt;= #{outboundDateEnd}
         </if>
         <if test="orderTypeName != null  and orderTypeName != ''">
-            and a.order_type_name like concat('%', #{orderTypeName}, '%')
+            and (a.BUSINESS_TYPE like concat('%', #{orderTypeName}, '%') or a.ORDER_TYPE_CODE like concat('%', #{orderTypeName}, '%'))
         </if>
         <if test="xfStatus != null  and xfStatus != '' and xfStatus == '已下发'">
             and b.out_order_number is not null