Commit 2a901c12e79674ea743aad27095406c5c45c2a0d

Authored by YunaiV
1 parent fd3d6ad8

✨ feat(select): 增加批次和仓库过滤功能,优化库存选择器

yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/MesWmMaterialStockController.java
@@ -139,8 +139,8 @@ public class MesWmMaterialStockController { @@ -139,8 +139,8 @@ public class MesWmMaterialStockController {
139 MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(), 139 MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(),
140 unitMeasure -> vo.setUnitMeasureName(unitMeasure.getName())); 140 unitMeasure -> vo.setUnitMeasureName(unitMeasure.getName()));
141 }); 141 });
142 - MapUtils.findAndThen(warehouseMap, vo.getWarehouseId(),  
143 - warehouse -> vo.setWarehouseName(warehouse.getName())); 142 + MapUtils.findAndThen(warehouseMap, vo.getWarehouseId(), warehouse ->
  143 + vo.setWarehouseCode(warehouse.getCode()).setWarehouseName(warehouse.getName()));
144 MapUtils.findAndThen(locationMap, vo.getLocationId(), 144 MapUtils.findAndThen(locationMap, vo.getLocationId(),
145 location -> vo.setLocationName(location.getName())); 145 location -> vo.setLocationName(location.getName()));
146 MapUtils.findAndThen(areaMap, vo.getAreaId(), 146 MapUtils.findAndThen(areaMap, vo.getAreaId(),
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockRespVO.java
@@ -49,6 +49,9 @@ public class MesWmMaterialStockRespVO { @@ -49,6 +49,9 @@ public class MesWmMaterialStockRespVO {
49 @Schema(description = "仓库编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") 49 @Schema(description = "仓库编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
50 private Long warehouseId; 50 private Long warehouseId;
51 51
  52 + @Schema(description = "仓库编码", example = "WH001")
  53 + private String warehouseCode;
  54 +
52 @Schema(description = "仓库名称", example = "原料仓") 55 @Schema(description = "仓库名称", example = "原料仓")
53 @ExcelProperty("仓库") 56 @ExcelProperty("仓库")
54 private String warehouseName; 57 private String warehouseName;