入库业务单添加查询条件;

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;
 

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 (