From 7ad5355f2062e2d826048a0d67f9d1be4acf316f Mon Sep 17 00:00:00 2001 From: liux <963924687@qq.com> Date: Fri, 11 Jul 2025 18:04:04 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=8D=95=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BB=93=E5=BA=93id=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/canteen/core/ims/dto/FetchMaterialPageDTO.java | 4 +++- .../src/main/resources/mapper/ims/FetchMaterialMapper.xml | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) 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