From 4ab7c8b8b725d0280711045c56a477405e246695 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 10:17:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E4=B8=9A=E5=8A=A1=E5=8D=95?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ReservationStockOutOrderMapper.xml | 51 +++++++++++++------
1 file changed, 36 insertions(+), 15 deletions(-)
diff --git a/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml
index 3a3218fc5..6fa6c9a17 100644
--- a/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml
@@ -144,9 +144,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and a.out_order_id = #{outOrderId}
-
- and a.organization_id = #{organizationId}
-
and a.tms_order_number like concat('%', #{tmsOrderNumber}, '%')
@@ -220,9 +217,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and a.order_type_code = #{orderTypeCode}
-
- and a.order_type_name like concat('%', #{orderTypeName}, '%')
-
and a.customer_id = #{customerId}
@@ -292,9 +286,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and a.check_status < #{ltCheckStatus}
-
- and a.create_by_name like concat('%', #{createByName}, '%')
-
and a.update_by_name like concat('%', #{updateByName}, '%')
@@ -307,12 +298,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{item}
-
- and date_format(a.create_time,'%Y-%m-%d') >= #{createTimeStart}
-
-
- and date_format(a.create_time,'%Y-%m-%d') <= #{createTimeEnd}
-
and date_format(a.audit_time,'%Y-%m-%d') >= #{auditTimeStart}
@@ -331,6 +316,42 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and a.PUSH_STATUS = #{pushStatus}
+
+ and a.BUSINESS_NUMBER = #{businessNumber}
+
+
+ and a.BUSINESS_TYPE = #{businessType}
+
+
+ and a.ISSUE_STATUS = #{issueStatus}
+
+
+ and a.RESERVATION_ORDER_SOURCE = #{reservationOrderSource}
+
+
+ and a.NEED_TRANSPORT_FLAG = #{needTransportFlag}
+
+
+ and a.create_by_name like concat('%', #{createByName}, '%')
+
+
+ and date_format(a.create_time,'%Y-%m-%d') >= #{createTimeStart}
+
+
+ and date_format(a.create_time,'%Y-%m-%d') <= #{createTimeEnd}
+
+
+ and a.organization_id = #{organizationId}
+
+
+ and date_format(a.outbound_date,'%Y-%m-%d') >= #{outboundDateStart}
+
+
+ and date_format(a.outbound_date,'%Y-%m-%d') <= #{outboundDateEnd}
+
+
+ and a.order_type_name like concat('%', #{orderTypeName}, '%')
+