✨ 管理端运单列表与详情按运次下发，首页待办按运次去重

管理端列表/待处理/详情/统计切到共享运次服务，运次主键按字符串下发；首页「重新派单待处理」的 feed 与角标改为按运次键在库层分组去重，一张配载单的多张子单被拒只出一条待办。重新派单写入与组织过滤未动。
2026-10-17 19:47:56 +08:00
parent 751b246d8e
commit 5d980278f2
6 changed files with 865 additions and 146 deletions
@@ -92,4 +92,30 @@ public class AdminWaybillCardVO implements Serializable {
 	@Schema(description = "采购方是否已付款（预留）")
 	private Boolean buyerPaid;

+	/* ===== 运次（一趟车）字段：列表按运次下发，卡片的展示单号与路线取这些 ===== */
+
+	@Schema(description = "运次主键：配载单主键或运单主键，按字符串下发（19 位雪花号按数字下发会被前端取整）")
+	private String tripId;
+
+	@Schema(description = "配载单号，未配载为空")
+	private String loadingNo;
+
+	@Schema(description = "展示单号：有配载取配载单号，否则取运单号")
+	private String tripNo;
+
+	@Schema(description = "途经站点：整趟车中间各站按顺序以「 → 」连接，无中间站为空")
+	private String viaName;
+
+	@Schema(description = "站点数（整趟车，含起终点）")
+	private Integer stationCount;
+
+	@Schema(description = "货物汇总（整趟车，同名货物合并且单位一致时取数量合计）")
+	private String cargoSummary;
+
+	@Schema(description = "合计重量（整趟车同单位时才有值，单位不一致为空）")
+	private String totalWeight;
+
+	@Schema(description = "子运单数（可见口径；配载运次即整趟车的子单数）")
+	private Integer waybillCount;
+
 }
@@ -135,6 +135,29 @@ public class AdminWaybillDetailVO implements Serializable {
 	@Schema(description = "途打卡记录")
 	private List<DriverEnrouteRecordVO> enrouteRecords;

+	/* ===== 运次（一趟车）字段：详情按运次下发，与司机端接单页同一口径 ===== */
+
+	@Schema(description = "运次主键：配载单主键或运单主键，按字符串下发（19 位雪花号按数字下发会被前端取整）")
+	private String tripId;
+
+	@Schema(description = "配载单号，未配载为空")
+	private String loadingNo;
+
+	@Schema(description = "展示单号：有配载取配载单号，否则取运单号")
+	private String tripNo;
+
+	@Schema(description = "途经站点：整趟车中间各站按顺序以「 → 」连接，无中间站为空")
+	private String viaName;
+
+	@Schema(description = "站点数（整趟车，含起终点）")
+	private Integer stationCount;
+
+	@Schema(description = "货物汇总（整趟车，同名货物合并且单位一致时取数量合计）")
+	private String cargoSummary;
+
+	@Schema(description = "站点任务安排（整趟车按实际途经顺序，第 1 站即 ①；配载运次含每站装卸与货物条目）")
+	private List<TripStationVO> stations;
+
 	@Data
 	@Schema(description = "装卸点")
 	public static class AdminRoutePointVO implements Serializable {