From ddfa52a2ac14f403b3b92b9c67dbf30ca5363e83 Mon Sep 17 00:00:00 2001
From: "weicw1996@qq.com" <weicw1996@qq.com>
Date: Mon, 21 Sep 2026 06:24:31 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=20=E6=94=B6=E7=AA=84=E8=BF=90=E8=BE=93?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E6=9E=9A=E4=B8=BE=E4=B8=BA=E5=85=AC=E8=B7=AF?=
 =?UTF-8?q?/=E9=93=81=E8=B7=AF/=E6=B0=B4=E8=B7=AF/=E8=88=AA=E7=A9=BA?=
 =?UTF-8?q?=E5=9B=9B=E7=A7=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

运输计划导入校验白名单去掉「公路整车、公路配载/零担、跨境海运」

运单批量导入字典兜底值去掉多余枚举，仅保留四种运输方式
---
 .../transport/service/impl/TransportPlanServiceImpl.java      | 4 ++--
 .../transport/service/impl/WaybillImportBatchServiceImpl.java | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/TransportPlanServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/TransportPlanServiceImpl.java
index 9c574de..619a915 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/TransportPlanServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/TransportPlanServiceImpl.java
@@ -416,9 +416,9 @@ public class TransportPlanServiceImpl extends BaseServiceImpl<TransportPlanMappe
 		// 2. 校验运输类型枚举值
 		String transportType = trimToEmpty(excel.getTransportType());
 		if (Func.isNotEmpty(transportType)) {
-			List<String> validTransportTypes = List.of("公路整车", "公路配载/零担", "铁路运输", "水路运输", "跨境海运", "航空运输");
+			List<String> validTransportTypes = List.of("公路运输", "铁路运输", "水路运输", "航空运输");
 			if (!validTransportTypes.contains(transportType)) {
-				errors.add("运输类型需系统枚举值（公路整车、公路配载/零担、铁路运输、水路运输、跨境海运、航空运输）");
+				errors.add("运输类型需系统枚举值（公路运输、铁路运输、水路运输、航空运输）");
 			}
 		}
 
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/WaybillImportBatchServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/WaybillImportBatchServiceImpl.java
index b81a5b8..73cd624 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/WaybillImportBatchServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/WaybillImportBatchServiceImpl.java
@@ -980,8 +980,8 @@ public class WaybillImportBatchServiceImpl extends BaseServiceImpl<WaybillImport
 			// 字典读取失败时使用默认值。
 		}
 		if (options.isEmpty()) {
-			List<String> defaults = List.of("公路运输", "铁路运输", "水路运输", "航空运输",
-				"公路整车", "公路配载/零担", "铁路整车", "铁路零担", "水路", "航空", "多式联运", "管道运输", "其他");
+			// 运输方式仅支持公路、铁路、水路、航空四种
+			List<String> defaults = List.of("公路运输", "铁路运输", "水路运输", "航空运输");
 			defaults.forEach(value -> options.put(value, value));
 		}
 		return options;