From 6fecc262b1182d66d79fcc36d34d117bef02f7a9 Mon Sep 17 00:00:00 2001 From: weicw1996 Date: Tue, 13 Oct 2026 13:54:51 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E5=8F=B8=E6=9C=BA=E7=AB=AF?= =?UTF-8?q?=E8=BF=90=E5=8D=95=E5=8D=A1=E7=89=87=E8=A1=A5=E8=BF=90=E8=BE=93?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DriverWaybillCardVO 加 transportOrgType，toCard 按运单是否带配载单号判定 common/load；司机端详情、首页当前任务与列表共用该出口 --- .../springblade/transport/pojo/vo/DriverWaybillCardVO.java | 3 +++ .../transport/service/impl/DriverWaybillServiceImpl.java | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/DriverWaybillCardVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/DriverWaybillCardVO.java index 57e394d1..323db157 100644 --- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/DriverWaybillCardVO.java +++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/DriverWaybillCardVO.java @@ -150,6 +150,9 @@ public class DriverWaybillCardVO implements Serializable { @Schema(description = "运输方式文案：公路运输等") private String transportType; + @Schema(description = "运输组织：common普通 / load配载") + private String transportOrgType; + @Schema(description = "计划发货时间") private String planShipTime; 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 9158ce0d..0a06a6b0 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 @@ -102,6 +102,10 @@ public class DriverWaybillServiceImpl implements IDriverWaybillService { private static final String STATUS_COMPLETED = "completed"; private static final String STATUS_CANCELLED = "cancelled"; + /** 运输组织类型：运单有配载单号即配载（load），否则普通（common） */ + private static final String TRANSPORT_COMMON = "common"; + private static final String TRANSPORT_LOAD = "load"; + /** 小程序「待接单」对应的后端业务状态 */ private static final List PENDING_STATUSES = Arrays.asList( STATUS_PENDING, STATUS_WAITING_DISPATCH, STATUS_DISPATCHING @@ -734,6 +738,7 @@ public class DriverWaybillServiceImpl implements IDriverWaybillService { card.setCargoQuantity(weightText); card.setTotalWeight(weightText); card.setTransportType(toTransportTypeLabel(waybill.getTransportType())); + card.setTransportOrgType(Func.isNotBlank(waybill.getLoadingNo()) ? TRANSPORT_LOAD : TRANSPORT_COMMON); card.setPlanShipTime(formatLocalDateYmd(waybill.getEstimatedStartTime())); card.setPlanFinishTime(formatLocalDateYmd(waybill.getEstimatedEndTime())); card.setRemark(Func.toStr(waybill.getRemark(), ""));