From bf075c57e7ffb50a091f985a5bc0fc562a31217d 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:23:27 +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

---
 .../todo/ReservationStockInOrderDO.java           |  6 ++++++
 .../todo/ReservationStockOutOrderDO.java          |  6 ++++++
 .../ReservationStockInOrderMapper.xml             | 15 +++++++++++++++
 3 files changed, 27 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 1ed02e523..59d5dbf0c 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
@@ -378,6 +378,12 @@ public class ReservationStockInOrderDO extends BaseVOEntity {
     @ApiModelProperty(name = "创建时间查询条件结束日期")
     private String createTimeEnd;
 
+    @ApiModelProperty(name = "入库时间查询条件开始日期")
+    private String storageTimeStart;
+
+    @ApiModelProperty(name = "入库时间查询条件结束日期")
+    private String storageTimeEnd;
+
     @ApiModelProperty("入库明细-物料名称（商品名称），模糊匹配")
     private String materialName;
 
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java
index 33b99b7a4..ad15a33aa 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java
@@ -363,6 +363,12 @@ public class ReservationStockOutOrderDO extends BaseVOEntity {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date outboundDate;
+
+    @ApiModelProperty(name = "出库时间查询条件开始日期")
+    private String outboundDateStart;
+
+    @ApiModelProperty(name = "出库时间查询条件结束日期")
+    private String outboundDateEnd;
     @ApiModelProperty("完成时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
diff --git a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
index 6f1389301..77893449b 100644
--- a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
@@ -429,6 +429,21 @@
         <if test="pushStatus != null">
             and a.PUSH_STATUS = #{pushStatus}
         </if>
+        <if test="businessType != null  and businessType != ''">
+            and a.BUSINESS_TYPE = #{businessType}
+        </if>
+        <if test="reservationOrderSource != null">
+            and a.RESERVATION_ORDER_SOURCE = #{reservationOrderSource}
+        </if>
+        <if test="createByName != null  and createByName != ''">
+            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}
+        </if>
+        <if test="storageTimeEnd != null and storageTimeEnd != ''">
+            and date_format(a.storage_time,'%Y-%m-%d') &lt;= #{storageTimeEnd}
+        </if>
         <!-- 入库明细：物料名称、物料编码（同一明细行同时满足；与计划数量汇总口径一致）。关联 material_base_info 避免明细冗余名称与主档不一致时筛不到 -->
         <if test="(materialName != null and materialName != '') or (materialCode != null and materialCode != '')">
             and exists (