aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

demand: tms-报价管理-批量导入报价报错问题定位解决

Browse Source 
committer: heyu
This commit is contained in:
aike 2025-12-26 17:05:50 +08:00
parent b9354fdad7
commit 3cb257d4af
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
emis-biz/src/main/java/com/xdadan/erp/emis/service/excelCellStrategy/EmisWaybillCustomExportUtil.java
View File

@ -75,8 +75,8 @@ public class EmisWaybillCustomExportUtil {
// 报关收件人 (空) // 报关收件人 (空)
createCell(row, 2, "", dataStyle); createCell(row, 2, "", dataStyle);
// 收件人 (receiveName) // 收件人 (receiveCompany)
createCell(row, 3, waybill.getReceiveName() != null ? waybill.getReceiveName() : "", dataStyle); createCell(row, 3, waybill.getReceiveCompany() != null ? waybill.getReceiveCompany() : "", dataStyle);
// 英文收件人 (空) // 英文收件人 (空)
createCell(row, 4, "", dataStyle); createCell(row, 4, "", dataStyle);
@ -101,8 +101,8 @@ public class EmisWaybillCustomExportUtil {
// 收件人电话 (receiveMobile) // 收件人电话 (receiveMobile)
createCell(row, 9, waybill.getReceiveMobile() != null ? waybill.getReceiveMobile() : "", dataStyle); createCell(row, 9, waybill.getReceiveMobile() != null ? waybill.getReceiveMobile() : "", dataStyle);
// 发件人 (sendName) // 发件人 (sendCompany)
createCell(row, 10, waybill.getSendName() != null ? waybill.getSendName() : "", dataStyle); createCell(row, 10, waybill.getSendCompany() != null ? waybill.getSendCompany() : "", dataStyle);
// 发件人证件类型 (空) // 发件人证件类型 (空)
createCell(row, 11, "", dataStyle); createCell(row, 11, "", dataStyle);
@ -257,7 +257,7 @@ public class EmisWaybillCustomExportUtil {
} }
/** /**
* 构建完整地址（省·市·地址） * 构建完整地址（省市地址直接拼接）
*/ */
private static String buildAddress(String province, String city, String address) { private static String buildAddress(String province, String city, String address) {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
@ -265,15 +265,9 @@ public class EmisWaybillCustomExportUtil {
sb.append(province); sb.append(province);
} }
if (city != null && !city.trim().isEmpty()) { if (city != null && !city.trim().isEmpty()) {
if (sb.length() > 0) {
sb.append("·");
}
sb.append(city); sb.append(city);
} }
if (address != null && !address.trim().isEmpty()) { if (address != null && !address.trim().isEmpty()) {
if (sb.length() > 0) {
sb.append("·");
}
sb.append(address); sb.append(address);
} }
return sb.toString(); return sb.toString();

6
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisQuotePriceServiceImpl.java
View File

@ -392,7 +392,8 @@ public class EmisQuotePriceServiceImpl extends EmisBaseService implements IEmisQ
// 寄件区域 // 寄件区域
if (emisQuotePrice.getSendAreaName() != null && !emisQuotePrice.getSendAreaName().trim().isEmpty()) { if (emisQuotePrice.getSendAreaName() != null && !emisQuotePrice.getSendAreaName().trim().isEmpty()) {
EmisQuoteSendArea querySendArea = new EmisQuoteSendArea(); EmisQuoteSendArea querySendArea = new EmisQuoteSendArea();
querySendArea.setAreaName(emisQuotePrice.getSendAreaName()); // 使用params进行精确查询，避免触发模糊查询
querySendArea.getParams().put("areaName", emisQuotePrice.getSendAreaName());
querySendArea.setUseSiteCode(emisQuotePrice.getUseSiteCode()); querySendArea.setUseSiteCode(emisQuotePrice.getUseSiteCode());
List<EmisQuoteSendArea> sendAreaList = emisQuoteSendAreaMapper.selectEmisQuoteSendAreaList(querySendArea); List<EmisQuoteSendArea> sendAreaList = emisQuoteSendAreaMapper.selectEmisQuoteSendAreaList(querySendArea);
if (sendAreaList == null || sendAreaList.isEmpty()) { if (sendAreaList == null || sendAreaList.isEmpty()) {
@ -406,7 +407,8 @@ public class EmisQuotePriceServiceImpl extends EmisBaseService implements IEmisQ
// 派件区域 // 派件区域
if (emisQuotePrice.getDispAreaName() != null && !emisQuotePrice.getDispAreaName().trim().isEmpty()) { if (emisQuotePrice.getDispAreaName() != null && !emisQuotePrice.getDispAreaName().trim().isEmpty()) {
EmisQuoteDispArea queryDispArea = new EmisQuoteDispArea(); EmisQuoteDispArea queryDispArea = new EmisQuoteDispArea();
queryDispArea.setAreaName(emisQuotePrice.getDispAreaName()); // 使用params进行精确查询，避免触发模糊查询
queryDispArea.getParams().put("areaName", emisQuotePrice.getDispAreaName());
queryDispArea.setUseSiteCode(emisQuotePrice.getUseSiteCode()); queryDispArea.setUseSiteCode(emisQuotePrice.getUseSiteCode());
List<EmisQuoteDispArea> dispAreaList = emisQuoteDispAreaMapper.selectEmisQuoteDispAreaList(queryDispArea); List<EmisQuoteDispArea> dispAreaList = emisQuoteDispAreaMapper.selectEmisQuoteDispAreaList(queryDispArea);
if (dispAreaList == null || dispAreaList.isEmpty()) { if (dispAreaList == null || dispAreaList.isEmpty()) {