🔀 合并 dev 到 uat

2026-10-21 11:52:16 +08:00
parent 5a651562d3 c31e5f98ed
commit 4342b917e5
24 changed files with 791 additions and 129 deletions
@@ -150,6 +150,13 @@ public class Dept extends TenantEntity {
 	@Schema(description = "合同编码前缀")
 	private String contractCodePrefix;

+	/**
+	 * 合同初始流水号（该部门当年首个合同时从此号起编，范围1-999）
+	 */
+	@Schema(description = "合同初始流水号")
+	@TableField(updateStrategy = FieldStrategy.ALWAYS)
+	private Integer contractInitialSerial;
+
 	/**
 	 * 组织简称
 	 */
@@ -0,0 +1,48 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.transport.pojo.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 货物明细行：一条货物一行
+ * <p>
+ * 详情页逐行展示「货物名称 + 数量单位」，名称与数量分开给，前端不需要再从汇总串里拆。
+ */
+@Data
+@Schema(description = "货物明细行")
+public class CargoLineVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	@Schema(description = "货物名称")
+	private String cargoName;
+
+	@Schema(description = "数量（含单位，如 1000吨）；录入时只填了名称则为空")
+	private String quantity;
+}
@@ -67,6 +67,9 @@ public class DriverPunchNodeVO implements Serializable {
 	@Schema(description = "不可打卡的原因，供司机端展示")
 	private String lockReason;

+	@Schema(description = "运单已结束（完成/取消）：卡片仅展示、不可提交")
+	private Boolean ended;
+
 	@Schema(description = "是否展示该卡（在途可能因频次/时段隐藏）")
 	private Boolean visible;

@@ -67,6 +67,9 @@ public class DriverWaybillCardVO implements Serializable {
 	@Schema(description = "货物类别")
 	private String cargoCategory;

+	@Schema(description = "货物明细（详情返回）：一条一行，同名同单位的货物已合并数量")
+	private List<CargoLineVO> cargos;
+
 	@Schema(description = "重量（带单位）")
 	private String weight;

@@ -129,12 +129,21 @@ public class TripVO implements Serializable {
 	@Schema(description = "货物汇总：按货物名合并数量，同名同单位取合计")
 	private String cargoSummary;

+	@Schema(description = "货物明细：一条货物一行，同名同单位的货物已合并数量")
+	private List<CargoLineVO> cargos;
+
 	@Schema(description = "合计重量：全部子运单同单位时为数量合计，单位不一致时为空")
 	private BigDecimal totalQuantity;

 	@Schema(description = "合计重量的单位，与 totalQuantity 同时为空或同时有值")
 	private String quantityUnit;

+	@Schema(description = "计重合计：全部货物同单位时取该单位合计，单位不一致时只合计「吨」项（其余单位不参与）；无可用合计时为空")
+	private BigDecimal weighingQuantity;
+
+	@Schema(description = "计重合计的单位，与 weighingQuantity 同时为空或同时有值")
+	private String weighingUnit;
+
 	@Schema(description = "计划发货日期（配载单，未配载为空）")
 	private LocalDate estimatedStartDate;