Merge remote-tracking branch 'websoft/dev'

blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/AdminWaybillDetailVO.java

@@ -90,9 +90,12 @@ public class AdminWaybillDetailVO implements Serializable {
 	@Schema(description = "运输方式字典值：road 等")
 	private String transportMode;
 
-	@Schema(description = "运输组织：common普通 / load配载")
+	@Schema(description = "运输类型：common普通运输 / load配载运输")
 	private String transportOrgType;
 
+	@Schema(description = "是否挂多联总单：为真表示这趟含多式联运，与配载运输可叠加（不与 transportOrgType 互斥）")
+	private Boolean multimodal;
+
 	@Schema(description = "计划发货时间")
 	private String planShipTime;
 

blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/DriverPunchNodeVO.java

@@ -11,7 +11,6 @@ import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -103,8 +102,11 @@ public class DriverPunchNodeVO implements Serializable {
 	@Schema(description = "本节点是否需要采集里程（末位可打卡节点且计费规则含里程）")
 	private Boolean needMileage;
 
-	@Schema(description = "运单里程（公里），needMileage 为真时用于回显")
-	private BigDecimal mileage;
+	/**
+	 * 里程只有正整数口径（ADR-0023 决策 6），下发的是去尾随零的文本，如 "200" 而非 "200.00"。
+	 */
+	@Schema(description = "运单里程（公里，正整数文本），needMileage 为真时用于回显")
+	private String mileage;
 
 	@Schema(description = "已上传凭证图（已打卡回显）")
 	private List<DriverPunchPhotoVO> photos = new ArrayList<>();

blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/DriverWaybillCardVO.java

@@ -156,9 +156,12 @@ public class DriverWaybillCardVO implements Serializable {
 	@Schema(description = "运输方式文案：公路运输等")
 	private String transportType;
 
-	@Schema(description = "运输组织：common普通 / load配载")
+	@Schema(description = "运输类型：common普通运输 / load配载运输")
 	private String transportOrgType;
 
+	@Schema(description = "是否挂多联总单：为真表示这趟含多式联运，与配载运输可叠加（不与 transportOrgType 互斥）")
+	private Boolean multimodal;
+
 	/* ===== 运次（一趟车）字段：运次接口返回，旧运单接口不填 ===== */
 
 	@Schema(description = "运次主键：配载单主键或运单主键，按字符串下发（19 位雪花号按数字下发会被前端取整）")

blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/TripVO.java

@@ -54,9 +54,12 @@ public class TripVO implements Serializable {
 	@Schema(description = "配载单号，未配载为空")
 	private String loadingNo;
 
-	@Schema(description = "运输组织类型：load 公路配载 / common 普通运输")
+	@Schema(description = "运输类型：load 配载运输 / common 普通运输")
 	private String transportOrgType;
 
+	@Schema(description = "是否挂多联总单：为真表示这趟含多式联运，与配载运输可叠加（不与 transportOrgType 互斥）")
+	private Boolean multimodal;
+
 	@Schema(description = "状态：0待接单/1运输中/2已完成/3已取消，子单集合为空时为空")
 	private Integer status;
 

blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/WaybillPunchRecordItemVO.java

@@ -9,7 +9,6 @@ import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -62,8 +61,11 @@ public class WaybillPunchRecordItemVO implements Serializable {
 	@Schema(description = "本条是否需要采集里程（末位打卡节点且计费规则含里程）")
 	private Boolean needMileage;
 
-	@Schema(description = "运单里程（公里），needMileage 为真时用于回显")
-	private BigDecimal mileage;
+	/**
+	 * 里程只有正整数口径（ADR-0023 决策 6），下发的是去尾随零的文本，如 "200" 而非 "200.00"。
+	 */
+	@Schema(description = "运单里程（公里，正整数文本），needMileage 为真时用于回显")
+	private String mileage;
 
 	@Schema(description = "里程是否已冻结（运单已生成结算单，只能看不能改）")
 	private Boolean mileageLocked;