From e0c8c988052cb5619c0f634913950ccbc6ef99df Mon Sep 17 00:00:00 2001
From: weicw1996 <weicw1996@qq.com>
Date: Thu, 22 Oct 2026 14:48:48 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E5=BE=85=E5=9B=9E=E5=8D=95?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=EF=BC=9A=E8=BF=90=E6=AC=A1=E5=8D=A1=E7=89=87?=
 =?UTF-8?q?=E4=B8=8B=E5=8F=91=E5=94=AF=E4=B8=80=E5=8E=9F=E5=A7=8B=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DriverWaybillServiceImpl.java        |  7 +++++
 .../service/impl/DriverTripCardTest.java      | 29 +++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/DriverWaybillServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/DriverWaybillServiceImpl.java
index 27226429..428c4398 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/DriverWaybillServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/DriverWaybillServiceImpl.java
@@ -1113,6 +1113,13 @@ public class DriverWaybillServiceImpl implements IDriverWaybillService {
 		card.setId(parseId(children.isEmpty() ? trip.getId() : children.get(0).getId()));
 		card.setWaybillNo(children.isEmpty() ? card.getTripNo() : Func.toStr(children.get(0).getWaybillNo(), ""));
 		card.setStatus(trip.getStatus());
+		// 原始业务状态只在整趟车子单状态唯一时下发：配载车混状态时一趟车没有唯一原始状态，给 null 由前端按数字态展示
+		List<String> childBusinessStatuses = children.stream()
+			.map(TripVO.TripWaybillVO::getBusinessStatus)
+			.filter(Func::isNotBlank)
+			.distinct()
+			.collect(Collectors.toList());
+		card.setBusinessStatus(childBusinessStatuses.size() == 1 ? childBusinessStatuses.get(0) : null);
 		card.setRequireAccept(trip.getRequireAccept());
 		card.setAcceptStatus(trip.getAcceptStatus());
 		card.setTransportOrgType(trip.getTransportOrgType());
diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverTripCardTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverTripCardTest.java
index 7bdcbba1..41189b41 100644
--- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverTripCardTest.java
+++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverTripCardTest.java
@@ -30,6 +30,7 @@ import org.springblade.transport.service.ITransportVehicleService;
 import org.springblade.transport.service.ITripQueryService;
 import org.springblade.transport.service.IWaybillService;
 import org.springblade.transport.support.CertificationGate;
+import org.springblade.transport.support.WaybillProcessSupport;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -147,6 +148,34 @@ class DriverTripCardTest {
 		assertEquals("桂A32523", card.getVehicleNo());
 	}
 
+	@Test
+	@DisplayName("运次卡片带唯一原始业务状态：子单都在待回单确认时下发 pending_return_confirm，数字态仍是 1")
+	void tripCardCarriesUniqueChildBusinessStatus() {
+		TripVO trip = loadingTrip();
+		trip.getWaybills().forEach(child -> child.setBusinessStatus(WaybillProcessSupport.STATUS_PENDING_RETURN_CONFIRM));
+		stubTripPage(1, trip);
+
+		IPage<DriverWaybillCardVO> page = runAsDriver(() -> service.tripPage(1, 10, null, null));
+
+		DriverWaybillCardVO card = page.getRecords().get(0);
+		assertEquals(WaybillProcessSupport.STATUS_PENDING_RETURN_CONFIRM, card.getBusinessStatus());
+		assertEquals(trip.getStatus(), card.getStatus(), "运次数字态口径不变，仍取运次状态");
+	}
+
+	@Test
+	@DisplayName("运次卡片原始业务状态：配载车混状态时给 null，由前端回退数字态")
+	void tripCardWithoutUniqueChildBusinessStatusGivesNull() {
+		TripVO trip = loadingTrip();
+		trip.getWaybills().get(0).setBusinessStatus(WaybillProcessSupport.STATUS_PENDING_RETURN_CONFIRM);
+		stubTripPage(1, trip);
+
+		IPage<DriverWaybillCardVO> page = runAsDriver(() -> service.tripPage(1, 10, null, null));
+
+		DriverWaybillCardVO card = page.getRecords().get(0);
+		assertNull(card.getBusinessStatus(), "一趟车里两种原始状态，没有唯一值可下发");
+		assertEquals(1, card.getStatus(), "混状态不影响运次数字态");
+	}
+
 	@Test
 	@DisplayName("运次列表不因配载卡去回查运单，也不写库")
 	void tripPageDoesNotLookUpWaybillsOrWrite() {