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

入库管理查询仓库修改

Browse Source
This commit is contained in:
秦鸿展
2026-01-28 14:49:11 +08:00
parent 59df615137
commit 4b9c2978ae
6 changed files with 109 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/storageLocation/StorageLocationApplicationService.java
+24 -2
View File
@@ -49,8 +49,30 @@ public class StorageLocationApplicationService {
if (topOrganizationId != null && topOrganizationId != 1){
storageLocationDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
}
AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
storageLocationDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId());
// 只有当前端没有明确传仓库条件时，才使用用户关联仓库缓存进行过滤；
// 避免出现“单据仓库=常温仓，但库位列表仍显示保税仓”的错配问题。
boolean hasWarehouseFilter = storageLocationDO.getWarehouseId() != null
|| (storageLocationDO.getWarehouseCode() != null && !storageLocationDO.getWarehouseCode().trim().isEmpty())
|| (storageLocationDO.getWarehouseName() != null && !storageLocationDO.getWarehouseName().trim().isEmpty());
if (!hasWarehouseFilter) {
try {
AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
if (associationWarehouseCacheDO != null) {
if (associationWarehouseCacheDO.getWarehouseId() != null) {
storageLocationDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId());
}
if (associationWarehouseCacheDO.getWarehouseCode() != null && !associationWarehouseCacheDO.getWarehouseCode().trim().isEmpty()) {
storageLocationDO.setWarehouseCode(associationWarehouseCacheDO.getWarehouseCode());
}
if (associationWarehouseCacheDO.getWarehouseName() != null && !associationWarehouseCacheDO.getWarehouseName().trim().isEmpty()) {
storageLocationDO.setWarehouseName(associationWarehouseCacheDO.getWarehouseName());
}
}
} catch (Exception e) {
// 获取失败不影响查询（允许查询所有仓库，或由前端传参控制）
log.warn("获取用户关联仓库信息失败，将按前端条件查询库位数据，用户ID：{}，错误：{}", loginUser.getUserid(), e.getMessage());
}
}
}
return storageLocationDomainService.queryList(storageLocationDO);
}