From e2da7177f06c7fd39382730f640beef97c71ecc9 Mon Sep 17 00:00:00 2001
From: rcx <3084692334@qq.com>
Date: Thu, 10 Sep 2026 16:38:34 +0800
Subject: [PATCH] =?UTF-8?q?fix(oms/wms):=20=E5=87=BA=E5=BA=93=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E5=87=BA=E5=BA=93=E6=97=B6=E9=97=B4=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E4=B8=A5=E6=A0=BC=E6=8C=89=E5=87=BA=E4=BB=93=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?outbound=5Fdate=EF=BC=88=E5=8E=BB=E9=99=A4=E5=BB=BA=E6=A1=A3?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=85=9C=E5=BA=95=EF=BC=89=EF=BC=8C=E6=89=80?=
 =?UTF-8?q?=E8=A7=81=E5=8D=B3=E6=89=80=E7=AD=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ExecutionOutMaterialDetailMapper.xml             |  6 +++---
 .../OutMaterialDetail/OutMaterialDetailMapper.xml    | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/mhd_oms/src/main/resources/mapper/executionOutMaterialDetail/ExecutionOutMaterialDetailMapper.xml b/mhd_oms/src/main/resources/mapper/executionOutMaterialDetail/ExecutionOutMaterialDetailMapper.xml
index b03103e99..d1ef3d9f6 100644
--- a/mhd_oms/src/main/resources/mapper/executionOutMaterialDetail/ExecutionOutMaterialDetailMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/executionOutMaterialDetail/ExecutionOutMaterialDetailMapper.xml
@@ -565,12 +565,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="outOrderExpectEndTime != null">
                 and b.expect_time &lt;= #{outOrderExpectEndTime}
             </if>
-            <!-- 出库时间区间（统计当天出库）：优先实际出库时间OUTBOUND_TIME，为空按出仓日期OUTBOUND_DATE，再为空按建档时间兜底 -->
+            <!-- 出库时间区间（统计当天出库）：严格按出仓日期OUTBOUND_DATE过滤（页面所见即所筛） -->
             <if test="outboundDateStart != null and outboundDateStart != ''">
-                and date_format(IFNULL(b.OUTBOUND_TIME, IFNULL(b.OUTBOUND_DATE, b.create_time)), '%Y-%m-%d') &gt;= #{outboundDateStart}
+                and date_format(b.OUTBOUND_DATE, '%Y-%m-%d') &gt;= #{outboundDateStart}
             </if>
             <if test="outboundDateEnd != null and outboundDateEnd != ''">
-                and date_format(IFNULL(b.OUTBOUND_TIME, IFNULL(b.OUTBOUND_DATE, b.create_time)), '%Y-%m-%d') &lt;= #{outboundDateEnd}
+                and date_format(b.OUTBOUND_DATE, '%Y-%m-%d') &lt;= #{outboundDateEnd}
             </if>
             and a.del_flag = 1
             and b.del_flag = 1
diff --git a/mhd_wms/src/main/resources/mapper/OutMaterialDetail/OutMaterialDetailMapper.xml b/mhd_wms/src/main/resources/mapper/OutMaterialDetail/OutMaterialDetailMapper.xml
index ea10d3357..0a76a1efb 100644
--- a/mhd_wms/src/main/resources/mapper/OutMaterialDetail/OutMaterialDetailMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/OutMaterialDetail/OutMaterialDetailMapper.xml
@@ -404,7 +404,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
       出库明细查询（关联出库单）：
       口径：仅已出库及后续完成状态(b.status in (9,12,13)：已出库/已复核/已交接，与出库排名统计同口径)；
             仅取 level=1 主行防父子行重复计数；
-            实际出仓日期筛选 IFNULL(b.outbound_date, b.create_time)；
+            实际出仓日期筛选 b.outbound_date；
       注意：达梦数据库分页包裹查询不允许重复列名，单头列需与明细表 a 列名错开
             （b.out_order_number、b.warehouse_*、b.quantity 等与明细同名的列不重复查，明细行自带）
     -->
@@ -474,12 +474,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
             <!-- 出库状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-波次中 6-拣货中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭 12-已复核 13-已交接，只统计已出库(9/12/13)的明细 -->
             and b.status in (9, 12, 13)
-            <!-- 实际出仓日期区间（为空的历史单按建档时间兜底），用于统计当天出库 -->
+            <!-- 实际出仓日期区间，用于统计当天出库（严格按出仓日期outbound_date过滤） -->
             <if test="outboundDateStart != null and outboundDateStart != ''">
-                and date_format(IFNULL(b.outbound_date, b.create_time), '%Y-%m-%d') &gt;= #{outboundDateStart}
+                and date_format(b.outbound_date, '%Y-%m-%d') &gt;= #{outboundDateStart}
             </if>
             <if test="outboundDateEnd != null and outboundDateEnd != ''">
-                and date_format(IFNULL(b.outbound_date, b.create_time), '%Y-%m-%d') &lt;= #{outboundDateEnd}
+                and date_format(b.outbound_date, '%Y-%m-%d') &lt;= #{outboundDateEnd}
             </if>
             and a.level = 1
             and a.del_flag = 1
@@ -580,10 +580,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
             and b.status in (9, 12, 13)
             <if test="outboundDateStart != null and outboundDateStart != ''">
-                and date_format(IFNULL(b.outbound_date, b.create_time), '%Y-%m-%d') &gt;= #{outboundDateStart}
+                and date_format(b.outbound_date, '%Y-%m-%d') &gt;= #{outboundDateStart}
             </if>
             <if test="outboundDateEnd != null and outboundDateEnd != ''">
-                and date_format(IFNULL(b.outbound_date, b.create_time), '%Y-%m-%d') &lt;= #{outboundDateEnd}
+                and date_format(b.outbound_date, '%Y-%m-%d') &lt;= #{outboundDateEnd}
             </if>
             and a.level = 1
             and a.del_flag = 1