✨ 运次与运单下发多式联运标志,运输类型筛选分三档
transportOrgType 仍是 common/load 二值(组织形态维),另加 Boolean multimodal 表示挂了多联总单;两者可叠加,文案由前端组合。visibleRows 补选 master_no,否则派生永远为空。配载档筛选排掉挂总单的行,多式联运档只看 master_no。
This commit is contained in:
+4
-1
@@ -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;
|
||||
|
||||
|
||||
+4
-1
@@ -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 位雪花号按数字下发会被前端取整)")
|
||||
|
||||
+4
-1
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user