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

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;
 

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")

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 (