Merge remote-tracking branch 'refs/remotes/origin/master' into feature/payment-apply-bfi-sync

# Conflicts: # blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CustomerArchiveServiceImpl.java
2026-10-01 13:47:00 +08:00
parent 27756ba964 a5e89aa6dc
commit 4b3edf977c
206 changed files with 4885 additions and 4913 deletions
@@ -33,4 +33,6 @@ public class WaybillImportBatchRequest {
 	private String planName;
 	private String remark;
 	private List<Map<String, Object>> rows;
+	/** 分批确认导入时，是否追加到已有批次（首批为 false，后续批为 true）。 */
+	private Boolean append;
 }
@@ -56,7 +56,7 @@ public class LoadingManage extends TenantEntity {
 	@Schema(description = "货物名称")
 	private String cargoName;

-	@Schema(description = "车/船/航班/班列")
+	@Schema(description = "车牌号/船班号/船次号/班次号")
 	private String vehicleNo;

 	@Schema(description = "挂车车牌号")
@@ -162,7 +162,7 @@ public class Waybill extends TenantEntity {
 	@TableField(updateStrategy = FieldStrategy.ALWAYS)
 	private String driverRejectReason;

-	@Schema(description = "车/船/航班/班列号")
+	@Schema(description = "车牌号/船班号/船次号/班次号")
 	private String vehicleNo;

 	@Schema(description = "船长")
@@ -234,6 +234,9 @@ public class Waybill extends TenantEntity {
 	@Schema(description = "配载单号")
 	private String loadingNo;

+	@Schema(description = "配载标识号")
+	private String loadingIdentifier;
+
 	@Schema(description = "运单批次号")
 	private String batchNo;

@@ -80,6 +80,13 @@ public class AccidentRecordVO extends AccidentRecord {
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private LocalDateTime createTimeEnd;

+	/**
+	 * 创建人姓名
+	 */
+	@TableField(exist = false)
+	@Schema(description = "创建人姓名")
+	private String createUserName;
+
 	/**
 	 * 更新人姓名
 	 */
@@ -68,6 +68,10 @@ public class AnnualInspectionRecordVO extends AnnualInspectionRecord {
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private LocalDateTime createTimeEnd;

+	@TableField(exist = false)
+	@Schema(description = "创建人姓名")
+	private String createUserName;
+
 	@TableField(exist = false)
 	@Schema(description = "更新人姓名")
 	private String updateUserName;
@@ -58,6 +58,10 @@ public class CustomerArchiveVO extends CustomerArchive {
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private LocalDateTime createTimeEnd;

+	@TableField(exist = false)
+	@Schema(description = "创建人姓名")
+	private String createUserName;
+
 	@TableField(exist = false)
 	@Schema(description = "联系人")
 	private List<CustomerContactVO> contacts = new ArrayList<>();
@@ -69,4 +69,8 @@ public class DriverVO extends Driver {
 	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	private LocalDate warningDate;

+	@TableField(exist = false)
+	@Schema(description = "创建人姓名")
+	private String createUserName;
+
 }
@@ -25,5 +25,8 @@ public class EquipmentLedgerVO extends EquipmentLedger {
 	@Serial
 	private static final long serialVersionUID = 1L;
 	@TableField(exist = false)
+	@Schema(description = "创建人姓名")
+	private String createUserName;
+	@TableField(exist = false)
 	private String updateUserName;
 }
@@ -26,6 +26,10 @@ public class EtcRecordVO extends EtcRecord {
 	@Serial
 	private static final long serialVersionUID = 1L;

+	@TableField(exist = false)
+	@Schema(description = "创建人姓名")
+	private String createUserName;
+
 	@TableField(exist = false)
 	@Schema(description = "更新人姓名")
 	private String updateUserName;
@@ -63,6 +63,13 @@ public class InsuranceRecordVO extends InsuranceRecord {
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private LocalDateTime createTimeEnd;

+	/**
+	 * 创建人姓名
+	 */
+	@TableField(exist = false)
+	@Schema(description = "创建人姓名")
+	private String createUserName;
+
 	/**
 	 * 更新人姓名
 	 */
@@ -62,6 +62,13 @@ public class MaintenancePlanVO extends MaintenancePlan {
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private LocalDateTime createTimeEnd;

+	/**
+	 * 创建人姓名
+	 */
+	@TableField(exist = false)
+	@Schema(description = "创建人姓名")
+	private String createUserName;
+
 	/**
 	 * 更新人姓名
 	 */
@@ -62,6 +62,13 @@ public class MaintenanceRecordVO extends MaintenanceRecord {
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private LocalDateTime createTimeEnd;

+	/**
+	 * 创建人姓名
+	 */
+	@TableField(exist = false)
+	@Schema(description = "创建人姓名")
+	private String createUserName;
+
 	/**
 	 * 更新人姓名
 	 */
@@ -41,6 +41,11 @@ public class MasterOrderVO extends MasterOrder {
 	private List<Waybill> boundWaybills;
 	@TableField(exist = false)
 	private BigDecimal totalQuantity;
+	/**
+	 * 各品类已调度量（按货物名称+类型聚合，取各分段已调度量的最大值）
+	 */
+	@TableField(exist = false)
+	private Map<String, BigDecimal> dispatchedGoods;
 	@TableField(exist = false)
 	private String createUserName;
 	@TableField(exist = false)
@@ -66,6 +66,10 @@ public class MileageRecordVO extends MileageRecord {
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private LocalDateTime createTimeEnd;

+	@TableField(exist = false)
+	@Schema(description = "创建人姓名")
+	private String createUserName;
+
 	@TableField(exist = false)
 	@Schema(description = "更新人姓名")
 	private String updateUserName;
@@ -76,6 +76,10 @@ public class OilElectricRecordVO extends OilElectricRecord {
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private LocalDateTime createTimeEnd;

+	@TableField(exist = false)
+	@Schema(description = "创建人姓名")
+	private String createUserName;
+
 	@TableField(exist = false)
 	@Schema(description = "更新人姓名")
 	private String updateUserName;
@@ -49,6 +49,10 @@ public class OtherExpenseRecordVO extends OtherExpenseRecord {
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private LocalDateTime createTimeEnd;

+	@TableField(exist = false)
+	@Schema(description = "创建人姓名")
+	private String createUserName;
+
 	@TableField(exist = false)
 	@Schema(description = "更新人姓名")
 	private String updateUserName;
@@ -63,6 +63,13 @@ public class TireReplacementRecordVO extends TireReplacementRecord {
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private LocalDateTime createTimeEnd;

+	/**
+	 * 创建人姓名
+	 */
+	@TableField(exist = false)
+	@Schema(description = "创建人姓名")
+	private String createUserName;
+
 	/**
 	 * 更新人姓名
 	 */
@@ -57,6 +57,10 @@ public class TransportChangeRecordVO extends TransportChangeRecord {
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private LocalDateTime createTimeEnd;

+	@TableField(exist = false)
+	@Schema(description = "创建人姓名")
+	private String createUserName;
+
 	@TableField(exist = false)
 	@Schema(description = "更新人姓名")
 	private String updateUserName;
@@ -62,4 +62,8 @@ public class TransportShipVO extends TransportShip {
 	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	private LocalDate warningDate;

+	@TableField(exist = false)
+	@Schema(description = "创建人姓名")
+	private String createUserName;
+
 }
@@ -76,4 +76,8 @@ public class TransportVehicleVO extends TransportVehicle {
 	@Schema(description = "绑定司机")
 	private String boundDriver;

+	@TableField(exist = false)
+	@Schema(description = "创建人姓名")
+	private String createUserName;
+
 }
@@ -63,6 +63,13 @@ public class ViolationRecordVO extends ViolationRecord {
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private LocalDateTime createTimeEnd;

+	/**
+	 * 创建人姓名
+	 */
+	@TableField(exist = false)
+	@Schema(description = "创建人姓名")
+	private String createUserName;
+
 	/**
 	 * 更新人姓名
 	 */
@@ -25,6 +25,7 @@ public class VoucherFolderVO implements Serializable {
 	private String folderName;
 	private Long waybillId;
 	private String waybillNo;
+	private String loadingNo;
 	private Integer matched;
 	private String processStatus;
 	private String fileName;
@@ -0,0 +1,26 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ */
+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;
+
+/** 运单批量导入单行校验错误。 */
+@Data
+@Schema(description = "运单批量导入单行校验错误")
+public class WaybillImportRowErrorVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	@Schema(description = "行号（从0开始，相对当前批次）")
+	private Integer rowIndex;
+
+	@Schema(description = "错误信息")
+	private String errorMessage;
+}
@@ -0,0 +1,28 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ */
+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;
+import java.util.ArrayList;
+import java.util.List;
+
+/** 运单批量导入校验结果。 */
+@Data
+@Schema(description = "运单批量导入校验结果")
+public class WaybillImportValidateResultVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	@Schema(description = "是否全部通过")
+	private Boolean success;
+
+	@Schema(description = "校验错误列表")
+	private List<WaybillImportRowErrorVO> errors = new ArrayList<>();
+}
@@ -66,6 +66,10 @@ public class WaybillVO extends Waybill {
 	@Schema(description = "业务状态名称")
 	private String businessStatusName;

+	@TableField(exist = false)
+	@Schema(description = "运输方式名称")
+	private String transportTypeName;
+
 	@TableField(exist = false)
 	@Schema(description = "是否需要司机确认接单（过程配置接单节点）")
 	private Boolean requireAccept;