Commit 88ddc22ed5ae5844a542206b93461800c103b351

Authored by YunaiV
1 parent 57a289ad

✨ feat(mes): 增加库位编号和相关查询功能

在库存物资选择对话框中新增库位编号字段,更新查询参数以支持库位的选择和过滤。调整相关组件以确保库位信息的正确显示和交互。
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockPageReqVO.java
@@ -27,6 +27,9 @@ public class MesWmMaterialStockPageReqVO extends PageParam { @@ -27,6 +27,9 @@ public class MesWmMaterialStockPageReqVO extends PageParam {
27 @Schema(description = "库区编号", example = "1") 27 @Schema(description = "库区编号", example = "1")
28 private Long locationId; 28 private Long locationId;
29 29
  30 + @Schema(description = "库位编号", example = "1")
  31 + private Long areaId;
  32 +
30 @Schema(description = "供应商编号", example = "1") 33 @Schema(description = "供应商编号", example = "1")
31 private Long vendorId; 34 private Long vendorId;
32 35
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java
@@ -28,6 +28,7 @@ public interface MesWmMaterialStockMapper extends BaseMapperX<MesWmMaterialStock @@ -28,6 +28,7 @@ public interface MesWmMaterialStockMapper extends BaseMapperX<MesWmMaterialStock
28 .likeIfPresent(MesWmMaterialStockDO::getBatchCode, reqVO.getBatchCode()) 28 .likeIfPresent(MesWmMaterialStockDO::getBatchCode, reqVO.getBatchCode())
29 .eqIfPresent(MesWmMaterialStockDO::getWarehouseId, reqVO.getWarehouseId()) 29 .eqIfPresent(MesWmMaterialStockDO::getWarehouseId, reqVO.getWarehouseId())
30 .eqIfPresent(MesWmMaterialStockDO::getLocationId, reqVO.getLocationId()) 30 .eqIfPresent(MesWmMaterialStockDO::getLocationId, reqVO.getLocationId())
  31 + .eqIfPresent(MesWmMaterialStockDO::getAreaId, reqVO.getAreaId())
31 .eqIfPresent(MesWmMaterialStockDO::getVendorId, reqVO.getVendorId()) 32 .eqIfPresent(MesWmMaterialStockDO::getVendorId, reqVO.getVendorId())
32 .eqIfPresent(MesWmMaterialStockDO::getFrozen, reqVO.getFrozen()) 33 .eqIfPresent(MesWmMaterialStockDO::getFrozen, reqVO.getFrozen())
33 .ne(MesWmMaterialStockDO::getQuantity, BigDecimal.ZERO) 34 .ne(MesWmMaterialStockDO::getQuantity, BigDecimal.ZERO)