From 911393fb091fb2dfdc2962a47cec37ec3902cca2 Mon Sep 17 00:00:00 2001
From: weicw1996 <weicw1996@qq.com>
Date: Thu, 22 Oct 2026 13:33:45 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E8=BF=90=E5=8D=95=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=BE=85=E5=9B=9E=E5=8D=95=E7=A1=AE=E8=AE=A4=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=B8=B8=E9=87=8F=E5=B9=B6=E7=BA=B3=E5=85=A5=E7=BB=88?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

接单归一在需要确认接单的配置下会把非终态运单改成待执行/进行中，落库后即抹掉待回单确认。
---
 .../transport/support/WaybillProcessSupport.java   |  5 ++++-
 .../support/WaybillProcessSupportTest.java         | 14 ++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/WaybillProcessSupport.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/WaybillProcessSupport.java
index 4462c3a3..3d5ca5a7 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/WaybillProcessSupport.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/WaybillProcessSupport.java
@@ -49,6 +49,8 @@ public final class WaybillProcessSupport {
 
 	public static final String STATUS_PENDING = "pending";
 	public static final String STATUS_RUNNING = "running";
+	/** 司机已打完末位卡、回单需业务员确认，尚未生成应收应付 */
+	public static final String STATUS_PENDING_RETURN_CONFIRM = "pending_return_confirm";
 	public static final String ACCEPT_PENDING = "pending";
 	public static final String ACCEPT_ACCEPTED = "accepted";
 	public static final String ACCEPT_REJECTED = "rejected";
@@ -213,7 +215,8 @@ public final class WaybillProcessSupport {
 			|| "completed".equals(businessStatus)
 			|| "cancelled".equals(businessStatus)
 			|| "waiting_dispatch".equals(businessStatus)
-			|| "dispatching".equals(businessStatus);
+			|| "dispatching".equals(businessStatus)
+			|| STATUS_PENDING_RETURN_CONFIRM.equals(businessStatus);
 	}
 
 	/**
diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/support/WaybillProcessSupportTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/support/WaybillProcessSupportTest.java
index b09c82c4..8cd89e3c 100644
--- a/blade-service/blade-transport/src/test/java/org/springblade/transport/support/WaybillProcessSupportTest.java
+++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/support/WaybillProcessSupportTest.java
@@ -334,6 +334,20 @@ class WaybillProcessSupportTest {
 			"TRANSPORT_JSON 的回单启用且没有 confirmMode：缺字段当没配「无需确认完成」，否则会跳过本该人工确认的回单");
 	}
 
+	// ------------------------------------------------------------ 待回单确认
+
+	@Test
+	@DisplayName("待回单确认落库字面量为 pending_return_confirm，且接单归一不得改写它")
+	void pendingReturnConfirmIsTerminalStatus() {
+		assertEquals("pending_return_confirm", WaybillProcessSupport.STATUS_PENDING_RETURN_CONFIRM,
+			"库里存的是这个字面量，web 与小程序也按它判断，不能改名");
+		assertEquals(WaybillProcessSupport.STATUS_PENDING_RETURN_CONFIRM,
+			WaybillProcessSupport.normalizeBusinessStatus(WaybillProcessSupport.STATUS_PENDING_RETURN_CONFIRM, TRANSPORT_JSON),
+			"TRANSPORT_JSON 要求确认接单，未接单时归一结果本是 pending；运单已跑完全程，不能被改回待执行");
+		assertEquals(WaybillProcessSupport.STATUS_PENDING_RETURN_CONFIRM,
+			WaybillProcessSupport.normalizeBusinessStatus(WaybillProcessSupport.STATUS_PENDING_RETURN_CONFIRM, TRANSPORT_JSON, "accepted"));
+	}
+
 	// ------------------------------------------------------------ 结束门禁
 
 	@Test