From 7685ad79d046c16d9f1f5733f43f9a673a99f4e6 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Wed, 26 Nov 2025 14:50:09 +0800 Subject: [PATCH] =?UTF-8?q?demand:=20=20=E6=BC=8F=E7=BB=84=E6=89=B9?= =?UTF-8?q?=E6=AC=A1=E7=9B=B8=E5=85=B3=E9=9C=80=E6=B1=82=20committer:=20he?= =?UTF-8?q?yu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/EmisTmsSiteBatchMissServiceImpl.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java index 4b1a8d64e..ab40d097e 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java @@ -1071,11 +1071,22 @@ public class EmisTmsSiteBatchMissServiceImpl extends EmisBaseService implements if (CollectionUtil.isEmpty(currentRules)) { return true; } + boolean hasNextSite = false; + for (EmisTransPlanRule rule : currentRules) { + // 当前下一网点下的规则 + List nextRules = ruleList.stream() + .filter(r -> StringUtils.equals(r.getStartSiteCode(), rule.getNextSiteCode())) + .collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(nextRules)) { + hasNextSite = true; + break; + } + } // 检查是否为特殊运输线路类型或清关类型 boolean isSpecialTransLine = "004".equals(waybill.getTransLineType()) && ("24401".equals(waybill.getProductType()) || "24402".equals(waybill.getProductType())); boolean isSpecialCustomsClear = "2".equals(waybill.getCustomsClear()) && "2".equals(waybill.getTransType()); - if ((isSpecialTransLine || isSpecialCustomsClear) && currentRules.get(0).getStartSiteName().contains("机场")) { + if ((isSpecialTransLine || isSpecialCustomsClear) && !hasNextSite) { return true; }