From 95cdf38ab0aea2d623f30a811a53e7168661c0be 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 11:26: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/ReservationStockInOrderDTO.java | 13 +++++++++++++
 .../todo/ReservationStockOutOrderDTO.java           |  8 ++++++++
 2 files changed, 21 insertions(+)

diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDTO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDTO.java
index 805cf43be..8b51c7abd 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDTO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDTO.java
@@ -458,4 +458,17 @@ public class ReservationStockInOrderDTO extends ReservationStockInOrderBaseDTO {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date pushTimeEnd;
+
+    private String xfStatus;
+    @ApiModelProperty(name = "入库时间查询条件开始日期")
+    private String storageTimeStart;
+
+    @ApiModelProperty(name = "入库时间查询条件结束日期")
+    private String storageTimeEnd;
+
+    @ApiModelProperty(name = "入库时间查询条件开始日期")
+    private String expectTimeStart;
+
+    @ApiModelProperty(name = "入库时间查询条件结束日期")
+    private String expectTimeEnd;
 }
\ No newline at end of file
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java
index fe9bfa965..6e379099f 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java
@@ -536,4 +536,12 @@ public class ReservationStockOutOrderDTO extends ReservationStockOutOrderBaseDTO
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date pushTimeEnd;
+
+    @ApiModelProperty(name = "出库时间查询条件开始日期")
+    private String outboundDateStart;
+
+    @ApiModelProperty(name = "出库时间查询条件结束日期")
+    private String outboundDateEnd;
+
+    private String xfStatus;
 }
\ No newline at end of file