From 6323e1efb067f80df0f848abf7062b7601f9a04a Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期一, 15 十二月 2025 14:19:28 +0800
Subject: [PATCH] 新增客户管理
---
tms/src/main/java/com/ruoyi/tms/domain/TmsDispatchOrder.java | 101 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 79 insertions(+), 22 deletions(-)
diff --git a/tms/src/main/java/com/ruoyi/tms/domain/TmsDispatchOrder.java b/tms/src/main/java/com/ruoyi/tms/domain/TmsDispatchOrder.java
index d8c923b..4b6783f 100644
--- a/tms/src/main/java/com/ruoyi/tms/domain/TmsDispatchOrder.java
+++ b/tms/src/main/java/com/ruoyi/tms/domain/TmsDispatchOrder.java
@@ -240,9 +240,7 @@
private String shipperRegionLabel;
- /** 鍑哄彂鍦板湴鍧� */
- @TableField("departure_address")
- private String departureAddress;
+
/** 鏀惰揣浜猴紙鍏宠仈鏀跺彂璐т汉淇℃伅锛� */
@@ -251,9 +249,6 @@
private Integer receiverId;
- /** 鐩殑鍦板湴鍧� */
- @TableField("destination_address")
- private String destinationAddress;
/** 鏀惰揣浜哄悕绉� */
@@ -267,10 +262,7 @@
private String actualVehicleType;
- /** 瀹為檯瑁呰溅寮�濮嬫椂闂� */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @TableField("actual_load_start")
- private Date actualLoadStart;
+
/** 鏀惰揣浜烘墜鏈哄彿 */
@@ -279,10 +271,7 @@
private String receiverMobile;
- /** 瀹為檯鍗歌溅瀹屾垚鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @TableField("actual_unload_end")
- private Date actualUnloadEnd;
+
/** 鏀惰揣浜哄湴鍧� */
@@ -290,11 +279,6 @@
@TableField("receiver_address")
private String receiverAddress;
-
- /** 瀹為檯鍑哄彂鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @TableField("actual_departure")
- private Date actualDeparture;
/** 鏀惰揣琛屾斂鍖哄煙 */
@@ -306,13 +290,34 @@
@TableField("receiver_region_label")
private String receiverRegionLabel;
+ /** 鍑哄彂鍦板湴鍧� */
+ @TableField("departure_address")
+ private String departureAddress;
+
+
+ /** 鐩殑鍦板湴鍧� */
+ @TableField("destination_address")
+ private String destinationAddress;
+
+ /** 瀹為檯鍑哄彂鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField("actual_departure")
+ private Date actualDeparture;
+
/** 瀹為檯鍒拌揪鏃堕棿 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("actual_arrival")
private Date actualArrival;
-
+ /** 瀹為檯鍗歌溅瀹屾垚鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField("actual_unload_end")
+ private Date actualUnloadEnd;
+ /** 瀹為檯瑁呰溅寮�濮嬫椂闂� */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField("actual_load_start")
+ private Date actualLoadStart;
/** 瀹炲彂鏁伴噺 */
@TableField("actual_quantity")
private BigDecimal actualQuantity;
@@ -393,7 +398,10 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("create_time")
private Date createTime;
-
+ @TableField(exist = false)
+ private String createTimeBegin;
+ @TableField(exist = false)
+ private String createTimeEnd;
/** 鏇存柊浜� */
@Excel(name = "鏇存柊浜�")
@@ -406,7 +414,10 @@
@Excel(name = "鏇存柊鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@TableField("update_time")
private Date updateTime;
-
+ @TableField(exist = false)
+ private String updateTimeBegin;
+ @TableField(exist = false)
+ private String updateTimeEnd;
/** 澶囨敞 */
@TableField("remark")
@@ -445,4 +456,50 @@
@TableField(exist = false)
private BigDecimal paymentPlanAmount;
+
+
+ @TableField("is_customs")
+ private Integer isCustoms;
+
+ @TableField("is_load")
+ private Integer isLoad;
+
+ @TableField("start_region_code")
+ private String startRegionCode;
+ @TableField("end_region_code")
+ private String endRegionCode;
+
+ @TableField("quote_detail_id")
+ private Integer quoteDetailId;
+
+ @TableField("operation_mode")
+ private Integer operationMode;
+ @Excel(name = "鍏宠仈鎶ヤ环鏂规ID")
+ @TableField("quote_plan_id")
+ private Integer quotePlanId;
+
+ /**
+ * 纭鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField("confirm_time")
+ private Date confirmTime;
+ @TableField(exist = false)
+ private String confirmTimeBegin;
+ @TableField(exist = false)
+ private String confirmTimeEnd;
+ /**
+ * 瀹屾垚鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField("ok_time")
+ private Date okTime;
+
+ @TableField(exist = false)
+ private String okTimeBegin;
+ @TableField(exist = false)
+ private String okTimeEnd;
+ @TableField("commission_model")
+ private Integer commissionModel;
+
}
\ No newline at end of file
--
Gitblit v1.8.0