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 @@
and a.PUSH_STATUS = #{pushStatus}
+
+ and a.BUSINESS_TYPE = #{businessType}
+
+
+ and a.RESERVATION_ORDER_SOURCE = #{reservationOrderSource}
+
+
+ and a.create_by_name like concat('%', #{createByName}, '%')
+
+
+ and date_format(a.storage_time,'%Y-%m-%d') >= #{storageTimeStart}
+
+
+ and date_format(a.storage_time,'%Y-%m-%d') <= #{storageTimeEnd}
+
and exists (