From 1977f441c3624e88ec352995d3dc958d78937d3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com> Date: Wed, 18 Mar 2026 16:40:58 +0800 Subject: [PATCH] =?UTF-8?q?PC=E6=8B=A3=E8=B4=A7=E4=BB=BB=E5=8A=A1=E9=9B=86?= =?UTF-8?q?=E8=B4=A7=E4=BD=8D=E4=B8=8B=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/warehouse/WarehouseApplicationService.java | 4 ++-- .../repository/po/StorageLocationLinkagePO.java | 6 ++++++ .../domain/warehouse/service/WarehouseDomainService.java | 9 ++++++++- .../interfaces/facadeApi/warehouse/WarehouseApi.java | 4 ++-- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/warehouse/WarehouseApplicationService.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/warehouse/WarehouseApplicationService.java index 8aa850b83..4c8b96457 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/warehouse/WarehouseApplicationService.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/warehouse/WarehouseApplicationService.java @@ -223,8 +223,8 @@ public class WarehouseApplicationService { * @param warehouseId * @return WarehousePO */ - public List getWarehouseChildren(Long warehouseId){ - return warehouseDomainService.getWarehouseChildren(warehouseId); + public List getWarehouseChildren(Long warehouseId, String storageLocationType){ + return warehouseDomainService.getWarehouseChildren(warehouseId, storageLocationType); } } diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/storageLocation/repository/po/StorageLocationLinkagePO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/storageLocation/repository/po/StorageLocationLinkagePO.java index 3451818f8..d16f8843b 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/storageLocation/repository/po/StorageLocationLinkagePO.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/storageLocation/repository/po/StorageLocationLinkagePO.java @@ -33,5 +33,11 @@ public class StorageLocationLinkagePO implements Serializable { @Excel(name = "库位名称") private String name; + @ApiModelProperty("库区种类编码") + private String storageLocationType; + + @ApiModelProperty("库区种类名称") + private String storageLocationTypeName; + } diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/warehouse/service/WarehouseDomainService.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/warehouse/service/WarehouseDomainService.java index ae425892e..5dfc179e0 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/warehouse/service/WarehouseDomainService.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/warehouse/service/WarehouseDomainService.java @@ -149,7 +149,7 @@ public class WarehouseDomainService { * @param warehouseId * @return WarehousePO */ - public List getWarehouseChildren(Long warehouseId){ + public List getWarehouseChildren(Long warehouseId, String storageLocationType){ if (warehouseId == null){ AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(SecurityUtils.getLoginUser().getUserid()); if (associationWarehouseCacheDO == null){ @@ -184,10 +184,17 @@ public class WarehouseDomainService { List storageLocationPOS = storageLocationListMap.get(storageSectionPO.getStorageCode()); if (!CollectionUtils.isEmpty(storageLocationPOS)){ storageLocationPOS.forEach(storageLocationPO -> { + // 按 storageLocationType 过滤 + if (storageLocationType != null && !storageLocationType.isEmpty() + && !storageLocationType.equals(storageLocationPO.getStorageLocationType())) { + return; + } StorageLocationLinkagePO storageLocationLinkagePO = new StorageLocationLinkagePO(); storageLocationLinkagePO.setId(storageLocationPO.getStorageLocationId()); storageLocationLinkagePO.setCode(storageLocationPO.getStorageLocationCode()); storageLocationLinkagePO.setName(storageLocationPO.getStorageLocationName()); + storageLocationLinkagePO.setStorageLocationType(storageLocationPO.getStorageLocationType()); + storageLocationLinkagePO.setStorageLocationTypeName(storageLocationPO.getStorageLocationTypeName()); storageLocationLinkagePOList.add(storageLocationLinkagePO); }); } diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facadeApi/warehouse/WarehouseApi.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facadeApi/warehouse/WarehouseApi.java index e8cd397b0..7c9138208 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facadeApi/warehouse/WarehouseApi.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facadeApi/warehouse/WarehouseApi.java @@ -115,9 +115,9 @@ public class WarehouseApi extends BaseController{ @ApiOperation("获取仓库及下库区及库位") @GetMapping("/getWarehouseChildren") - public AjaxResult getWarehouseChildren(Long warehouseId) + public AjaxResult getWarehouseChildren(Long warehouseId, String storageLocationType) { - return AjaxResult.success(warehouseApplicationService.getWarehouseChildren(warehouseId)); + return AjaxResult.success(warehouseApplicationService.getWarehouseChildren(warehouseId, storageLocationType)); }