weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

仓库过滤查询

Browse Source
This commit is contained in:
秦鸿展
2026-02-10 15:12:36 +08:00
parent 507cbf0f1e
commit 49ba1cc8fd
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/application/service/materialInventory/MaterialInventoryApplicationService.java
+16 -4
View File
@@ -56,8 +56,14 @@ public class MaterialInventoryApplicationService {
if (topOrganizationId != null && topOrganizationId != 1){ if (topOrganizationId != null && topOrganizationId != 1){
materialInventoryDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId()); materialInventoryDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
} }
AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid()); // 前端有传warehouseId则优先使用传参；未传时才使用“用户关联仓库”作为默认值
materialInventoryDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId()); if (materialInventoryDO.getWarehouseId() == null) {
AssociationWarehouseCacheDO associationWarehouseCacheDO =
SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
if (associationWarehouseCacheDO != null) {
materialInventoryDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId());
}
}
} }
return materialInventoryDomainService.queryList(materialInventoryDO); return materialInventoryDomainService.queryList(materialInventoryDO);
} }
@@ -337,8 +343,14 @@ public class MaterialInventoryApplicationService {
if (topOrganizationId != null && topOrganizationId != 1){ if (topOrganizationId != null && topOrganizationId != 1){
materialInventoryDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId()); materialInventoryDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
} }
AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid()); // 前端有传warehouseId则优先使用传参；未传时才使用“用户关联仓库”作为默认值
materialInventoryDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId()); if (materialInventoryDO.getWarehouseId() == null) {
AssociationWarehouseCacheDO associationWarehouseCacheDO =
SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
if (associationWarehouseCacheDO != null) {
materialInventoryDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId());
}
}
} }
List<MaterialInventoryPO> materialInventoryPOS = materialInventoryDomainService.queryList(materialInventoryDO); List<MaterialInventoryPO> materialInventoryPOS = materialInventoryDomainService.queryList(materialInventoryDO);
if (CollectionUtils.isNotEmpty(materialInventoryPOS)){ if (CollectionUtils.isNotEmpty(materialInventoryPOS)){