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"
and b.expect_time <= #{outOrderExpectEndTime}
-
+
- and date_format(IFNULL(b.OUTBOUND_TIME, IFNULL(b.OUTBOUND_DATE, b.create_time)), '%Y-%m-%d') >= #{outboundDateStart}
+ and date_format(b.OUTBOUND_DATE, '%Y-%m-%d') >= #{outboundDateStart}
- and date_format(IFNULL(b.OUTBOUND_TIME, IFNULL(b.OUTBOUND_DATE, b.create_time)), '%Y-%m-%d') <= #{outboundDateEnd}
+ and date_format(b.OUTBOUND_DATE, '%Y-%m-%d') <= #{outboundDateEnd}
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"
and b.status in (9, 12, 13)
-
+
- and date_format(IFNULL(b.outbound_date, b.create_time), '%Y-%m-%d') >= #{outboundDateStart}
+ and date_format(b.outbound_date, '%Y-%m-%d') >= #{outboundDateStart}
- and date_format(IFNULL(b.outbound_date, b.create_time), '%Y-%m-%d') <= #{outboundDateEnd}
+ and date_format(b.outbound_date, '%Y-%m-%d') <= #{outboundDateEnd}
and a.level = 1
and a.del_flag = 1
@@ -580,10 +580,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and b.status in (9, 12, 13)
- and date_format(IFNULL(b.outbound_date, b.create_time), '%Y-%m-%d') >= #{outboundDateStart}
+ and date_format(b.outbound_date, '%Y-%m-%d') >= #{outboundDateStart}
- and date_format(IFNULL(b.outbound_date, b.create_time), '%Y-%m-%d') <= #{outboundDateEnd}
+ and date_format(b.outbound_date, '%Y-%m-%d') <= #{outboundDateEnd}
and a.level = 1
and a.del_flag = 1