fix bug

2026-08-21 14:30:59 +08:00
parent bd2c53fc15
commit 7683ad804a
18 changed files with 576 additions and 119 deletions
@@ -80,6 +80,9 @@ public class LoadingManage extends TenantEntity {
 	@Schema(description = "承运商")
 	private String carrierName;

+	@Schema(description = "承运商合同ID")
+	private Long carrierContractId;
+
 	@Schema(description = "发货地址")
 	private String departureAddress;

@@ -127,6 +127,9 @@ public class Waybill extends TenantEntity {
 	@Schema(description = "承运商名称")
 	private String carrierName;

+	@Schema(description = "承运商合同ID")
+	private Long carrierContractId;
+
 	@Schema(description = "司机ID")
 	private Long driverId;

@@ -0,0 +1,58 @@
+/**
+ * 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>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.transport.pojo.vo;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 配载可选承运商合同视图类
+ *
+ * @author Chill
+ */
+@Data
+@Schema(description = "配载可选承运商合同")
+public class LoadingCarrierContractVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	@JsonSerialize(using = ToStringSerializer.class)
+	@Schema(description = "承运商合同ID")
+	private Long id;
+
+	@Schema(description = "承运商合同名称")
+	private String contractName;
+
+	@Schema(description = "承运商名称")
+	private String carrierName;
+
+}
@@ -0,0 +1,37 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ */
+package org.springblade.transport.pojo.vo;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 总单调度可选承运商视图类
+ *
+ * @author Chill
+ */
+@Data
+@Schema(description = "总单调度可选承运商")
+public class MasterOrderCarrierVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	@JsonSerialize(using = ToStringSerializer.class)
+	@Schema(description = "承运商合同ID")
+	private Long contractId;
+
+	@Schema(description = "承运商合同名称")
+	private String contractName;
+
+	@Schema(description = "承运商名称")
+	private String carrierName;
+
+}