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

导入修改

Browse Source
This commit is contained in:
秦鸿展
2026-07-22 19:01:18 +08:00
parent 8ea6a82acd
commit effa681709
2 changed files with 36 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperApplicationService.java
+32 -19
View File
@@ -380,25 +380,38 @@ public class UserShipperApplicationService {
if (org.springframework.util.StringUtils.isEmpty(companyName)) continue; if (org.springframework.util.StringUtils.isEmpty(companyName)) continue;
total++; total++;
try { try {
UserShipperDO shipperDO = new UserShipperDO(); // 先按公司名称查是否已存在委托方
shipperDO.setShipperType(2); UserShipperEntity existingShipper = findFirstByShipperEnterpriseNameAcrossOrgs(companyName);
shipperDO.setDataSource(2); if (existingShipper != null && existingShipper.getShipperId() != null) {
shipperDO.setUserAccount(userAccount); // 已存在：只更新NC客户编码和org_code
shipperDO.setShipperEnterpriseName(companyName); appendOrganizationToExistingShipper(existingShipper,
String contactName = getCellStr(row.getCell(2)); SecurityUtils.getLoginUser().getUserPo().getOrganizationId(),
String contactPhone = getCellStr(row.getCell(3)); SecurityUtils.getLoginUser().getUserPo().getOrganizationName(),
// 联系人 -> user表 user_name + user_shipper表 user_name_shipper userAccount, SecurityUtils.getLoginUser());
shipperDO.setUserName(contactName); success++;
shipperDO.setUserNameShipper(contactName); } else {
// 联系电话 -> user表 user_phone UserShipperDO shipperDO = new UserShipperDO();
shipperDO.setUserPhone(contactPhone); shipperDO.setShipperType(2);
// 地址 -> user表 user_area_name，详细地址 -> user表 user_area_address shipperDO.setDataSource(2);
shipperDO.setUserAreaName(getCellStr(row.getCell(4))); shipperDO.setUserAccount(userAccount);
shipperDO.setUserAreaAddress(getCellStr(row.getCell(5))); shipperDO.setShipperEnterpriseName(companyName);
shipperDO.setRemark(getCellStr(row.getCell(6))); // 登录账号同时作为NC客户编码
shipperDO.setSettlementCurrency(getCellStr(row.getCell(7))); shipperDO.setCustomerNcCode(userAccount);
addShipper(shipperDO); String contactName = getCellStr(row.getCell(2));
success++; String contactPhone = getCellStr(row.getCell(3));
// 联系人 -> user表 user_name + user_shipper表 user_name_shipper
shipperDO.setUserName(contactName);
shipperDO.setUserNameShipper(contactName);
// 联系电话 -> user表 user_phone
shipperDO.setUserPhone(contactPhone);
// 地址 -> user表 user_area_name，详细地址 -> user表 user_area_address
shipperDO.setUserAreaName(getCellStr(row.getCell(4)));
shipperDO.setUserAreaAddress(getCellStr(row.getCell(5)));
shipperDO.setRemark(getCellStr(row.getCell(6)));
shipperDO.setSettlementCurrency(getCellStr(row.getCell(7)));
addShipper(shipperDO);
success++;
}
} catch (Exception e) { } catch (Exception e) {
failed++; failed++;
errors.add("第" + (i + 1) + "行[" + companyName + "]导入失败：" + e.getMessage()); errors.add("第" + (i + 1) + "行[" + companyName + "]导入失败：" + e.getMessage());
mhd_wms/src/main/java/com/mhd/wms/application/service/materialBaseInfo/MaterialBaseInfoApplicationService.java
+4 -1
View File
@@ -250,7 +250,10 @@ public class MaterialBaseInfoApplicationService {
} }
} }
Long shipperId = materialBaseInfoDO.getShipperId(); Long shipperId = materialBaseInfoDO.getShipperId();
String customerCodeNcJson = materialBaseInfoMapper.getCustomerCodeNcJson(shipperId.toString()); String customerCodeNcJson = null;
if (shipperId != null) {
customerCodeNcJson = materialBaseInfoMapper.getCustomerCodeNcJson(shipperId.toString());
}
if (customerCodeNcJson != null && !customerCodeNcJson.isEmpty()) { if (customerCodeNcJson != null && !customerCodeNcJson.isEmpty()) {
ObjectMapper objectMapper = new ObjectMapper(); ObjectMapper objectMapper = new ObjectMapper();
List<Map<String, Object>> listNc = null; List<Map<String, Object>> listNc = null;