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

Merge pull request 'demand: 组树规则重构，虚拟单增加香港-缅甸快递逻辑。' (#71) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/71
This commit is contained in:
heyu 2025-06-25 18:02:20 +08:00
commit d4f2da5921
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -2844,8 +2844,7 @@ public class EmisBaseService {
} }
} }
if (("078".equals(waybill.getTransLineType()) || "002".equals(waybill.getTransLineType())) && StringUtil.isNotBlank(waybill.getVirtualRemark())) { if ("002".equals(waybill.getTransLineType()) && StringUtil.isNotBlank(waybill.getVirtualRemark())) { Date sendDate = waybill.getSendDate();
Date sendDate = waybill.getSendDate();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date limitDate = null; Date limitDate = null;
try { try {
@ -4860,6 +4859,9 @@ public class EmisBaseService {
)) { )) {
return; return;
} }
if ("078".equals(emisWaybillSave.getTransLineType())) {
return;
}
// 做问题件录入 // 做问题件录入
scanProblemInfo(emisWaybillSave,emisWaybillOld); scanProblemInfo(emisWaybillSave,emisWaybillOld);
} }
@ -4878,7 +4880,7 @@ public class EmisBaseService {
Map<String, Object> scanDatePromItem = new HashMap<>(); Map<String, Object> scanDatePromItem = new HashMap<>();
scanDatePromItem.put("billCode", emisWaybillSave.getBillCode()); scanDatePromItem.put("billCode", emisWaybillSave.getBillCode());
if ("078".equals(emisWaybillSave.getTransLineType()) || "002".equals(emisWaybillSave.getTransLineType())) { if ("002".equals(emisWaybillSave.getTransLineType())) {
scanDatePromItem.put("problemType", "173"); scanDatePromItem.put("problemType", "173");
scanDatePromItem.put("remark", "出口虚拟面单"); scanDatePromItem.put("remark", "出口虚拟面单");
} else { } else {
@ -4983,7 +4985,9 @@ public class EmisBaseService {
String virtualRemark = String.join(",", filterVirtualRemark); String virtualRemark = String.join(",", filterVirtualRemark);
masterWaybill.setVirtualRemark(virtualRemark); masterWaybill.setVirtualRemark(virtualRemark);
emisWaybillMapper.updateEmisWaybill(masterWaybill); emisWaybillMapper.updateEmisWaybill(masterWaybill);
emisWaybillProblemInfoService.deleteEmisWaybillProblemInfoByBillCode(emisWaybillSave.getBillCode()); if (!"078".equals(emisWaybillSave.getTransLineType())) {
emisWaybillProblemInfoService.deleteEmisWaybillProblemInfoByBillCode(emisWaybillSave.getBillCode());
}
// 重新计算提成 // 重新计算提成
emisCommissionProfitService.reCalcProfitByBillCode(emisWaybillSave.getBillCode()); emisCommissionProfitService.reCalcProfitByBillCode(emisWaybillSave.getBillCode());
} }