领料单添加仓库id查询条件

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/dto/FetchMaterialPageDTO.java

@@ -20,8 +20,10 @@ public class FetchMaterialPageDTO {
    private List<Long> canteenIdList;
    @ApiModelProperty("档口id")
    private List<Long> stallIdList;
-   @ApiModelProperty("领料仓库id")
+   @ApiModelProperty("领料仓库id集合")
    private List<Long> warehouseIdList;
+   @ApiModelProperty("领料仓库id")
+   private Long warehouseId;
    @ApiModelProperty("提交状态(1待提交，2已提交)")
    private Integer commitStatus;
    @ApiModelProperty("领料状态(1已领，2未领)")

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/FetchMaterialMapper.xml

@@ -223,6 +223,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="content.stallId != null and content.stallId != ''">
             AND a.stall_id = #{content.stallId}
         </if>
+        <if test="content.warehouseId != null and content.warehouseId != ''">
+            AND a.warehouse_id = #{content.warehouseId}
+        </if>
     </where>
         order by a.create_time desc
     </select>