From 28b1e0d497d419569c81ca39fdb27690087db4e0 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:59:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=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

---
 .../repository/todo/ReservationStockInOrderDO.java          | 6 ++++++
 .../ReservationStockInOrderMapper.xml                       | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDO.java
index 59d5dbf0c..90f6645e9 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDO.java
@@ -384,6 +384,12 @@ public class ReservationStockInOrderDO extends BaseVOEntity {
     @ApiModelProperty(name = "入库时间查询条件结束日期")
     private String storageTimeEnd;
 
+    @ApiModelProperty(name = "入库时间查询条件开始日期")
+    private String expectTimeStart;
+
+    @ApiModelProperty(name = "入库时间查询条件结束日期")
+    private String expectTimeEnd;
+
     @ApiModelProperty("入库明细-物料名称（商品名称），模糊匹配")
     private String materialName;
 
diff --git a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
index 77893449b..4b7876504 100644
--- a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
@@ -444,6 +444,12 @@
         <if test="storageTimeEnd != null and storageTimeEnd != ''">
             and date_format(a.storage_time,'%Y-%m-%d') &lt;= #{storageTimeEnd}
         </if>
+        <if test="expectTimeStart != null and expectTimeStart != ''">
+            and date_format(a.expect_time,'%Y-%m-%d') &gt;= #{expectTimeStart}
+        </if>
+        <if test="expectTimeEnd != null and expectTimeEnd != ''">
+            and date_format(a.expect_time,'%Y-%m-%d') &lt;= #{expectTimeEnd}
+        </if>
         <!-- 入库明细：物料名称、物料编码（同一明细行同时满足；与计划数量汇总口径一致）。关联 material_base_info 避免明细冗余名称与主档不一致时筛不到 -->
         <if test="(materialName != null and materialName != '') or (materialCode != null and materialCode != '')">
             and exists (