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 @@ and date_format(a.storage_time,'%Y-%m-%d') <= #{storageTimeEnd} + + and date_format(a.expect_time,'%Y-%m-%d') >= #{expectTimeStart} + + + and date_format(a.expect_time,'%Y-%m-%d') <= #{expectTimeEnd} + and exists (