diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/dto/FetchMaterialPageDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/dto/FetchMaterialPageDTO.java index bf535fd..15c0018 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/dto/FetchMaterialPageDTO.java +++ b/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 canteenIdList; @ApiModelProperty("档口id") private List stallIdList; - @ApiModelProperty("领料仓库id") + @ApiModelProperty("领料仓库id集合") private List warehouseIdList; + @ApiModelProperty("领料仓库id") + private Long warehouseId; @ApiModelProperty("提交状态(1待提交,2已提交)") private Integer commitStatus; @ApiModelProperty("领料状态(1已领,2未领)") diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/FetchMaterialMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/FetchMaterialMapper.xml index 6da1aa5..13171d7 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/FetchMaterialMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/FetchMaterialMapper.xml @@ -223,6 +223,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND a.stall_id = #{content.stallId} + + AND a.warehouse_id = #{content.warehouseId} + order by a.create_time desc