From 87b4c2bc1ecf7d5fd11179afc3fc9b11b4986bfc Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Mon, 4 Aug 2025 19:18:09 +0800 Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=E6=9F=AC=E5=9F=94=E5=AF=A8?= =?UTF-8?q?=E5=BF=AB=E9=80=92=E6=BC=8F=E7=BB=84=E6=89=B9=E6=AC=A1=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E5=87=86=E7=A1=AE=E6=80=A7=E9=80=82=E5=BA=94=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20committer:=20heyu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xdadan/erp/emis/service/EmisBaseService.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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); + } } } }