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

导入物料组织覆盖问题

Browse Source
This commit is contained in:
秦鸿展
2026-09-10 16:20:59 +08:00
parent 3276792bb5
commit 9704dbfb07
2 changed files with 6 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/materialBaseInfo/MaterialBaseInfoApplicationService.java
+3 -2
View File
@@ -573,10 +573,11 @@ public class MaterialBaseInfoApplicationService {
normalizeImportBarCodeWhenDuplicateOfHs(row); normalizeImportBarCodeWhenDuplicateOfHs(row);
fillIdsFromExistingMasterData(row); fillIdsFromExistingMasterData(row);
fillOrganizationFromShipperIfNeeded(row); fillOrganizationFromShipperIfNeeded(row);
if (!isValidOrgId(row.getOrganizationId()) && isValidOrgId(loginOrgId)) { // 登录组织优先：以登录账号的组织为准，覆盖货主解析带来的组织，避免用货主组织导致包装规格等主数据查不到
if (isValidOrgId(loginOrgId)) {
row.setOrganizationId(loginOrgId); row.setOrganizationId(loginOrgId);
} }
if (row.getTopOrganizationId() == null && isValidOrgId(loginTopOrgId)) { if (isValidOrgId(loginTopOrgId)) {
row.setTopOrganizationId(loginTopOrgId); row.setTopOrganizationId(loginTopOrgId);
} }
fillOrganizationName(row, loginUser); fillOrganizationName(row, loginUser);
mhd_wms/src/main/java/com/mhd/wms/application/service/materialBaseInfo/MaterialBaseInfoAsyncService.java
+3 -2
View File
@@ -128,10 +128,11 @@ public class MaterialBaseInfoAsyncService {
materialBaseInfoApplicationService.normalizeImportBarCodeWhenDuplicateOfHs(row); materialBaseInfoApplicationService.normalizeImportBarCodeWhenDuplicateOfHs(row);
materialBaseInfoApplicationService.fillIdsFromExistingMasterData(row); materialBaseInfoApplicationService.fillIdsFromExistingMasterData(row);
materialBaseInfoApplicationService.fillOrganizationFromShipperIfNeeded(row); materialBaseInfoApplicationService.fillOrganizationFromShipperIfNeeded(row);
if (!isValidOrgId(row.getOrganizationId()) && isValidOrgId(loginOrgId)) { // 登录组织优先：以登录账号的组织为准，覆盖货主解析带来的组织，避免用货主组织(如2841)导致包装规格等主数据查不到
if (isValidOrgId(loginOrgId)) {
row.setOrganizationId(loginOrgId); row.setOrganizationId(loginOrgId);
} }
if (row.getTopOrganizationId() == null && isValidOrgId(loginTopOrgId)) { if (isValidOrgId(loginTopOrgId)) {
row.setTopOrganizationId(loginTopOrgId); row.setTopOrganizationId(loginTopOrgId);
} }
materialBaseInfoApplicationService.fillOrganizationName(row, loginUser); materialBaseInfoApplicationService.fillOrganizationName(row, loginUser);