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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
王奎兴
2026-02-25 14:33:59 +08:00
parent 69d6952315 8443d739d1
commit 280ceaaa7c
34 changed files with 194 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/application/service/differentManage/DifferentManageApplicationService.java
+2 -2
View File
@@ -75,8 +75,8 @@ public class DifferentManageApplicationService {
differentManageDO.setTopOrganizationId(topOrganizationId);
}
} else {
// 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId
differentManageDO.setTopOrganizationId(null);
// 对于非2827组织，必须设置 topOrganizationId=2827
differentManageDO.setTopOrganizationId(2827L);
}
}
AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
mhd_wms/src/main/java/com/mhd/wms/application/service/handoverTaskOrder/HandoverTaskOrderApplicationService.java
+2 -2
View File
@@ -106,8 +106,8 @@ public class HandoverTaskOrderApplicationService {
handoverTaskOrderDO.setTopOrganizationId(topOrganizationId);
}
} else {
// 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId
handoverTaskOrderDO.setTopOrganizationId(null);
// 对于非2827组织，必须设置 topOrganizationId=2827
handoverTaskOrderDO.setTopOrganizationId(2827L);
}
}
AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
mhd_wms/src/main/java/com/mhd/wms/application/service/inventoryAdjustmentRecord/InventoryAdjustmentRecordApplicationService.java
+2 -2
View File
@@ -93,8 +93,8 @@ public class InventoryAdjustmentRecordApplicationService {
inventoryAdjustmentRecordDO.setTopOrganizationId(topOrganizationId);
}
} else {
// 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId
inventoryAdjustmentRecordDO.setTopOrganizationId(null);
// 对于非2827组织，必须设置 topOrganizationId=2827
inventoryAdjustmentRecordDO.setTopOrganizationId(2827L);
}
}
AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
mhd_wms/src/main/java/com/mhd/wms/application/service/investigationManage/InvestigationManageApplicationService.java
+2 -2
View File
@@ -107,8 +107,8 @@ public class InvestigationManageApplicationService {
investigationManageDO.setTopOrganizationId(topOrganizationId);
}
} else {
// 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId
investigationManageDO.setTopOrganizationId(null);
// 对于非2827组织，必须设置 topOrganizationId=2827
investigationManageDO.setTopOrganizationId(2827L);
}
}
AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
mhd_wms/src/main/java/com/mhd/wms/application/service/materialBaseInfo/MaterialBaseInfoApplicationService.java
+2 -2
View File
@@ -102,8 +102,8 @@ public class MaterialBaseInfoApplicationService {
materialBaseInfoDO.setTopOrganizationId(topOrganizationId);
}
} else {
// 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId
materialBaseInfoDO.setTopOrganizationId(null);
// 对于非2827组织，必须设置 topOrganizationId=2827
materialBaseInfoDO.setTopOrganizationId(2827L);
}
}
}
mhd_wms/src/main/java/com/mhd/wms/application/service/materialInventory/MaterialInventoryApplicationService.java
+2 -2
View File
@@ -94,8 +94,8 @@ public class MaterialInventoryApplicationService {
materialInventoryDO.setTopOrganizationId(topOrganizationId);
}
} else {
// 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId
materialInventoryDO.setTopOrganizationId(null);
// 对于非2827组织，必须设置 topOrganizationId=2827
materialInventoryDO.setTopOrganizationId(2827L);
}
}
// 前端有传warehouseId则优先使用传参；未传时才使用"用户关联仓库"作为默认值
mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java
+2 -2
View File
@@ -104,8 +104,8 @@ public class PickingOrderApplicationService {
pickingOrderDO.setTopOrganizationId(topOrganizationId);
}
} else {
// 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId
pickingOrderDO.setTopOrganizationId(null);
// 对于非2827组织，必须设置 topOrganizationId=2827
pickingOrderDO.setTopOrganizationId(2827L);
}
}
}
mhd_wms/src/main/java/com/mhd/wms/application/service/shiftManage/ShiftManageApplicationService.java
+2 -2
View File
@@ -110,8 +110,8 @@ public class ShiftManageApplicationService {
shiftManageDO.setTopOrganizationId(topOrganizationId);
}
} else {
// 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId
shiftManageDO.setTopOrganizationId(null);
// 对于非2827组织，必须设置 topOrganizationId=2827
shiftManageDO.setTopOrganizationId(2827L);
}
}
AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
mhd_wms/src/main/java/com/mhd/wms/application/service/statementStatistics/StatementStatisticsService.java
+2 -2
View File
@@ -96,8 +96,8 @@ public class StatementStatisticsService {
immediateInventoryDO.setTopOrganizationId(topOrganizationId);
}
} else {
// 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId
immediateInventoryDO.setTopOrganizationId(null);
// 对于非2827组织，必须设置 topOrganizationId=2827
immediateInventoryDO.setTopOrganizationId(2827L);
}
}
// 只有在用户没有明确指定仓库参数时，才使用缓存中的仓库信息
mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java
+2 -2
View File
@@ -111,8 +111,8 @@ public class StockInOrderApplicationService {
stockInOrderDO.setTopOrganizationId(topOrganizationId);
}
} else {
// 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId
stockInOrderDO.setTopOrganizationId(null);
// 对于非2827组织，必须设置 topOrganizationId=2827
stockInOrderDO.setTopOrganizationId(2827L);
}
}
// 前端有传warehouseId则优先使用传参；未传时才使用"用户关联仓库"作为默认值
mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java
+2 -2
View File
@@ -138,8 +138,8 @@ public class StockOutOrderApplicationService {
stockOutOrderDO.setTopOrganizationId(topOrganizationId);
}
} else {
// 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId
stockOutOrderDO.setTopOrganizationId(null);
// 对于非2827组织，必须设置 topOrganizationId=2827
stockOutOrderDO.setTopOrganizationId(2827L);
}
}
}
mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutTaskOrder/StockOutTaskOrderApplicationService.java
+2 -2
View File
@@ -89,8 +89,8 @@ public class StockOutTaskOrderApplicationService {
stockOutTaskOrderDO.setTopOrganizationId(topOrganizationId);
}
} else {
// 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId
stockOutTaskOrderDO.setTopOrganizationId(null);
// 对于非2827组织，必须设置 topOrganizationId=2827
stockOutTaskOrderDO.setTopOrganizationId(2827L);
}
}
AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java
+2 -2
View File
@@ -134,8 +134,8 @@ public class StockReceiptOrderApplicationService {
stockReceiptOrderDO.setTopOrganizationId(topOrganizationId);
}
} else {
// 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId
stockReceiptOrderDO.setTopOrganizationId(null);
// 对于非2827组织，必须设置 topOrganizationId=2827
stockReceiptOrderDO.setTopOrganizationId(2827L);
}
}
try {
mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java
+2 -2
View File
@@ -140,8 +140,8 @@ public class StockShelfOrderApplicationService {
stockShelfOrderDO.setTopOrganizationId(topOrganizationId);
}
} else {
// 如果 organizationId 不为 null，清空 topOrganizationId，确保查询使用 organizationId
stockShelfOrderDO.setTopOrganizationId(null);
// 对于非2827组织，必须设置 topOrganizationId=2827
stockShelfOrderDO.setTopOrganizationId(2827L);
}
}
try {