From b4e087745ce7d1cc826cc486b617fa52b18683df 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 18:32:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=AF=E5=90=A6=E4=B8=8B=E5=8F=91=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ReservationStockInOrderMapper.xml            | 12 ++++++------
 .../ReservationStockOutOrderMapper.xml           | 16 ++++++++--------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
index d4c3b92f8..bab114ef5 100644
--- a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
@@ -416,10 +416,10 @@
             and a.ORDER_DATE = #{orderDate}
         </if>
         <if test="createTimeStart != null and createTimeStart != ''">
-            and date_format(a.create_time,'%Y-%m-%d') &gt;= #{createTimeStart}
+            and a.create_time >= #{createTimeStart}
         </if>
         <if test="createTimeEnd != null and createTimeEnd != ''">
-            and date_format(a.create_time,'%Y-%m-%d') &lt;= #{createTimeEnd}
+            and a.create_time <![CDATA[ < ]]> date_add(#{createTimeEnd}, interval 1 day)
         </if>
         <if test="pushTimeStart != null">
             and PUSH_TIME <![CDATA[>=]]> #{pushTimeStart}
@@ -443,16 +443,16 @@
             and a.create_by_name like concat('%', #{createByName}, '%')
         </if>
         <if test="storageTimeStart != null and storageTimeStart != ''">
-            and date_format(a.storage_time,'%Y-%m-%d') &gt;= #{storageTimeStart}
+            and a.storage_time >= #{storageTimeStart}
         </if>
         <if test="storageTimeEnd != null and storageTimeEnd != ''">
-            and date_format(a.storage_time,'%Y-%m-%d') &lt;= #{storageTimeEnd}
+            and a.storage_time <![CDATA[ < ]]> date_add(#{storageTimeEnd}, interval 1 day)
         </if>
         <if test="expectTimeStart != null and expectTimeStart != ''">
-            and date_format(a.expect_time,'%Y-%m-%d') &gt;= #{expectTimeStart}
+            and a.expect_time >= #{expectTimeStart}
         </if>
         <if test="expectTimeEnd != null and expectTimeEnd != ''">
-            and date_format(a.expect_time,'%Y-%m-%d') &lt;= #{expectTimeEnd}
+            and a.expect_time <![CDATA[ < ]]> date_add(#{expectTimeEnd}, interval 1 day)
         </if>
         <if test="xfStatus != null  and xfStatus != '' and xfStatus == '已下发'">
             and a.issue_time is not null
diff --git a/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml
index 870077d54..0a8df156d 100644
--- a/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml
@@ -337,20 +337,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and a.create_by_name like concat('%', #{createByName}, '%')
         </if>
         <if test="createTimeStart != null and createTimeStart != ''">
-            and date_format(a.create_time,'%Y-%m-%d') &gt;= #{createTimeStart}
+            and a.create_time >= #{createTimeStart}
         </if>
         <if test="createTimeEnd != null and createTimeEnd != ''">
-            and date_format(a.create_time,'%Y-%m-%d') &lt;= #{createTimeEnd}
+            and a.create_time <![CDATA[ < ]]> date_add(#{createTimeEnd}, interval 1 day)
+        </if>
+        <if test="outboundDateStart != null and outboundDateStart != ''">
+            and a.outbound_date >= #{outboundDateStart}
+        </if>
+        <if test="outboundDateEnd != null and outboundDateEnd != ''">
+            and a.outbound_date <![CDATA[ < ]]> date_add(#{outboundDateEnd}, interval 1 day)
         </if>
         <if test="organizationId != null ">
             and a.organization_id = #{organizationId}
         </if>
-        <if test="outboundDateStart != null and outboundDateStart != ''">
-            and date_format(a.outbound_date,'%Y-%m-%d') &gt;= #{outboundDateStart}
-        </if>
-        <if test="outboundDateEnd != null and outboundDateEnd != ''">
-            and date_format(a.outbound_date,'%Y-%m-%d') &lt;= #{outboundDateEnd}
-        </if>
         <if test="orderTypeName != null  and orderTypeName != ''">
             and (a.BUSINESS_TYPE like concat('%', #{orderTypeName}, '%') or a.ORDER_TYPE_CODE like concat('%', #{orderTypeName}, '%'))
         </if>