diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index 521aac51b..4651d81a4 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -4960,11 +4960,16 @@ public class EmisBaseService { ("24401".equals(waybill.getProductType()) || "24402".equals(waybill.getProductType())); boolean isSpecialCustomsClear = "2".equals(waybill.getCustomsClear()) && "2".equals(waybill.getTransType()); + List filterIds = filterRules.stream().map(EmisTransPlanRule::getId).collect(Collectors.toList()); + if (isSpecialTransLine || isSpecialCustomsClear) { // 移除每个路径的最后一个元素 for (List path : allPaths) { if (!path.isEmpty()) { - path.remove(path.size() - 1); + EmisTransPlanRule emisTransPlanRule = path.get(path.size() - 1); + if(!filterIds.contains(emisTransPlanRule.getId())){ + path.remove(path.size() - 1); + } } } }