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

demand: 组树规则重构，虚拟单增加香港-缅甸快递逻辑。

Browse Source 
committer: heyu
This commit is contained in:
aike 2025-06-25 17:38:30 +08:00
parent ed5eea160e
commit 7a8c1f77a3
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4929,9 +4929,13 @@ public class EmisBaseService {
if (emisWaybillSave.getMasterBillCode().equals(emisWaybillSave.getBillCode())) { if (emisWaybillSave.getMasterBillCode().equals(emisWaybillSave.getBillCode())) {
throw new EmisBizError(EmisBizErrorType.FAIL, "运单号主单号不能相同"); throw new EmisBizError(EmisBizErrorType.FAIL, "运单号主单号不能相同");
} }
if (!"078".equals(emisWaybillSave.getTransLineType()) && !"002".equals(emisWaybillSave.getTransLineType()) && !"012".equals(emisWaybillSave.getTransLineType()) Set<String> allowedTypes = new HashSet<>();
&& !"014".equals(emisWaybillSave.getTransLineType())) { allowedTypes.add("078");
throw new EmisBizError(EmisBizErrorType.FAIL, "虚拟单只支持线路为缅甸快递/缅甸快递进口/柬埔寨快递进口"); allowedTypes.add("002");
allowedTypes.add("012");
allowedTypes.add("014");
if (!allowedTypes.contains(emisWaybillSave.getTransLineType())) {
throw new EmisBizError(EmisBizErrorType.FAIL, "虚拟单只支持线路为香港-缅甸快递/缅甸快递/缅甸快递进口/柬埔寨快递进口");
} }
EmisWaybill masterWaybill = emisWaybillMapper EmisWaybill masterWaybill = emisWaybillMapper
.selectMasterWaybillByBillCode(emisWaybillSave.getMasterBillCode()); .selectMasterWaybillByBillCode(emisWaybillSave.getMasterBillCode());