From 36696cc01bfd0ade286a599a49e21b86cccc263e Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期一, 30 三月 2026 15:21:33 +0800
Subject: [PATCH] 新增线上配置
---
tms/src/main/java/com/ruoyi/tms/domain/TmsDispatchOrder.java | 344 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 294 insertions(+), 50 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 e1bd3d5..ac8f5b1 100644
--- a/tms/src/main/java/com/ruoyi/tms/domain/TmsDispatchOrder.java
+++ b/tms/src/main/java/com/ruoyi/tms/domain/TmsDispatchOrder.java
@@ -8,6 +8,8 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import java.util.Date;
+import java.util.List;
+
import lombok.Data;
/**
* 璋冨害鍗曠鐞嗗璞� tms_dispatch_order
@@ -31,7 +33,7 @@
/** 瀹㈡埛ID */
- @Excel(name = "瀹㈡埛ID")
+
@TableField("customer_id")
private Integer customerId;
@@ -39,13 +41,13 @@
private String customerCode;
/** 瀹㈡埛缂栫爜 */
+ @Excel(name = "瀹㈡埛鍚嶇О")
@TableField("customer_name")
private String customerName;
/** 鍏宠仈椤圭洰ID */
- @Excel(name = "鍏宠仈椤圭洰ID")
@TableField("project_id")
private Integer projectId;
@@ -57,7 +59,6 @@
/** 鍏宠仈鍚堝悓Id */
- @Excel(name = "鍏宠仈鍚堝悓Id")
@TableField("contract_id")
private Integer contractId;
@@ -75,22 +76,21 @@
/** 璁㈠崟绫诲瀷锛屽叧鑱斿瓧鍏� */
- @Excel(name = "璁㈠崟绫诲瀷锛屽叧鑱斿瓧鍏�")
+ @Excel(name = "璁㈠崟绫诲瀷",dictType="order_type")
@TableField("order_type")
private Integer orderType;
/** 绛炬敹绫诲瀷锛屽叧鑱斿瓧鍏� */
- @Excel(name = "绛炬敹绫诲瀷锛屽叧鑱斿瓧鍏�")
@TableField("sign_type")
private Integer signType;
/** 涓婚┚椹跺憳 */
- @Excel(name = "涓婚┚椹跺憳")
+
@TableField("main_driver_id")
private Integer mainDriverId;
-
+ @Excel(name = "涓婚┚椹跺憳")
@TableField("main_driver_name")
private String mainDriverName;
@@ -98,12 +98,11 @@
/** 鍓┚椹跺憳 */
@TableField("assistant_driver_id")
private Integer assistantDriverId;
-
+ @Excel(name = "鍓┚椹跺憳")
@TableField("assistant_driver_name")
private String assistantDriverName;
/** 杞﹁締鏈嶅姟鍟咺D */
- @Excel(name = "杞﹁締鏈嶅姟鍟咺D")
@TableField("vehicle_provider_id")
private Integer vehicleProviderId;
@@ -114,7 +113,6 @@
/** 瑁呰揣鏈嶅姟鍟咺D */
- @Excel(name = "瑁呰揣鏈嶅姟鍟咺D")
@TableField("loading_service_provider_id")
private Integer loadingServiceProviderId;
@@ -126,7 +124,6 @@
/** 鎶ュ叧鏈嶅姟鍟咺D */
- @Excel(name = "鎶ュ叧鏈嶅姟鍟咺D")
@TableField("customs_service_provider_id")
private Integer customsServiceProviderId;
@@ -138,26 +135,24 @@
/** 鏄惁绱ф�ワ紝0=鏄紝1=鍚︼紝榛樿鍚� */
- @Excel(name = "鏄惁绱ф�ワ紝0=鏄紝1=鍚︼紝榛樿鍚�")
+ @Excel(name = "鏄惁绱ф��", readConverterExp = "0=鏄�,1=鍚�")
@TableField("is_urgent")
private Integer isUrgent;
/** 杩愯緭鏂瑰紡锛堝瓧鍏革級0=姹借繍锛�1=娴疯繍锛�2=绌鸿繍锛�3=娌宠繍锛�4=閾佽矾锛�5=鑱旇繍 */
- @Excel(name = "杩愯緭鏂瑰紡", readConverterExp = "瀛�=鍏�")
@TableField("transport_type")
private Integer transportType;
/** 閰嶈浇鏂瑰紡锛堝瓧鍏革級0=鏁存煖锛�1=鏁磋溅锛�2=鎷艰溅锛�3=鏁ｆ煖 */
- @Excel(name = "閰嶈浇鏂瑰紡", readConverterExp = "瀛�=鍏�")
@TableField("load_method")
private Integer loadMethod;
/** 瑕佹眰杩愯緭宸ュ叿绫诲瀷 */
- @Excel(name = "瑕佹眰杩愯緭宸ュ叿绫诲瀷")
+ @Excel(name = "涓嬪崟杞﹀瀷",dictType = "vehicle_type")
@TableField("required_vehicle_types")
private String requiredVehicleTypes;
@@ -171,7 +166,6 @@
/** 杞﹁締绠＄悊琛↖D */
- @Excel(name = "杞﹁締绠＄悊琛↖D")
@TableField("vehicle_id")
private Integer vehicleId;
@@ -183,19 +177,27 @@
/** 瑕佹眰鏈�鏃╁嚭鍙戞椂闂� */
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("earliest_departure")
private Date earliestDeparture;
+ /** 涓嬪崟鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @TableField("order_time")
+ private Date orderTime;
+ @TableField(exist = false)
+ private String orderTimeBegin;
+ @TableField(exist = false)
+ private String orderTimeEnd;
+
/** 鍙戣揣浜猴紙鍏宠仈鏀跺彂璐т汉淇℃伅锛� */
- @Excel(name = "鍙戣揣浜�", readConverterExp = "鍏�=鑱旀敹鍙戣揣浜轰俊鎭�")
@TableField("shipper_id")
private Integer shipperId;
/** 瑕佹眰鏈�鏅氬嚭鍙戞椂闂� */
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("latest_departure")
private Date latestDeparture;
@@ -213,7 +215,7 @@
/** 瑕佹眰鏈�鏃╁埌杈炬椂闂� */
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("earliest_arrival")
private Date earliestArrival;
@@ -225,13 +227,12 @@
/** 瑕佹眰鏈�鏅氬埌杈炬椂闂� */
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("latest_arrival")
private Date latestArrival;
/** 鍙戣揣琛屾斂鍖哄煙 */
- @Excel(name = "鍙戣揣琛屾斂鍖哄煙")
@TableField("shipper_region_code")
private String shipperRegionCode;
@@ -240,20 +241,14 @@
private String shipperRegionLabel;
- /** 鍑哄彂鍦板湴鍧� */
- @TableField("departure_address")
- private String departureAddress;
+
/** 鏀惰揣浜猴紙鍏宠仈鏀跺彂璐т汉淇℃伅锛� */
- @Excel(name = "鏀惰揣浜�", readConverterExp = "鍏�=鑱旀敹鍙戣揣浜轰俊鎭�")
@TableField("receiver_id")
private Integer receiverId;
- /** 鐩殑鍦板湴鍧� */
- @TableField("destination_address")
- private String destinationAddress;
/** 鏀惰揣浜哄悕绉� */
@@ -263,14 +258,12 @@
/** 瀹為檯杩愯緭宸ュ叿绫诲瀷 */
+ @Excel(name = "娲惧嚭杞﹀瀷",dictType = "vehicle_type")
@TableField("actual_vehicle_type")
private String actualVehicleType;
- /** 瀹為檯瑁呰溅寮�濮嬫椂闂� */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @TableField("actual_load_start")
- private Date actualLoadStart;
+
/** 鏀惰揣浜烘墜鏈哄彿 */
@@ -279,10 +272,7 @@
private String receiverMobile;
- /** 瀹為檯鍗歌溅瀹屾垚鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @TableField("actual_unload_end")
- private Date actualUnloadEnd;
+
/** 鏀惰揣浜哄湴鍧� */
@@ -291,14 +281,8 @@
private String receiverAddress;
- /** 瀹為檯鍑哄彂鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @TableField("actual_departure")
- private Date actualDeparture;
-
/** 鏀惰揣琛屾斂鍖哄煙 */
- @Excel(name = "鏀惰揣琛屾斂鍖哄煙")
@TableField("receiver_region_code")
private String receiverRegionCode;
@@ -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;
@@ -379,10 +384,11 @@
/** 鐘舵�� */
- @Excel(name = "鐘舵��")
+ @Excel(name = "鐘舵��",dictType = "tms_dispatch_order_status")
@TableField("status")
private Integer status;
-
+ @TableField(exist = false)
+ private List<Integer> inStatusList;
/** 鍒涘缓浜� */
@TableField("create_by")
@@ -393,7 +399,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 +415,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")
@@ -414,15 +426,247 @@
/** 搴旀敹璐圭敤鐢熸垚鐘舵�侊紝鍏宠仈瀛楀吀 0=鏈敓鎴�,1=宸茬敓鎴�,2=鐢熸垚澶辫触 */
- @Excel(name = "搴旀敹璐圭敤鐢熸垚鐘舵�侊紝鍏宠仈瀛楀吀 0=鏈敓鎴�,1=宸茬敓鎴�,2=鐢熸垚澶辫触")
+ @Excel(name = "搴旀敹璐圭敤鐢熸垚鐘舵��",dictType = "accounts_status")
@TableField("accounts_receivable_status")
private Integer accountsReceivableStatus;
/** 搴斾粯璐圭敤鐢熸垚鐘舵�侊紝鍏宠仈瀛楀吀 0=鏈敓鎴�,1=宸茬敓鎴�,2=鐢熸垚澶辫触 */
- @Excel(name = "搴斾粯璐圭敤鐢熸垚鐘舵�侊紝鍏宠仈瀛楀吀 0=鏈敓鎴�,1=宸茬敓鎴�,2=鐢熸垚澶辫触")
+ @Excel(name = "搴斾粯璐圭敤鐢熸垚鐘舵��",dictType = "accounts_status")
@TableField("accounts_payable_status")
private Integer accountsPayableStatus;
+ @TableField("collection_plan_id")
+ private Integer collectionPlanId;
+ @TableField(exist = false)
+ private Integer collectionPlanDetailId;
+ @TableField(exist = false)
+ private BigDecimal collectionPlanAmount;
+
+ @TableField(exist = false)
+ private String collectionPlanName;
+
+ @TableField("payment_plan_id")
+ private Integer paymentPlanId;
+
+ @TableField(exist = false)
+ private String paymentPlanName;
+ @TableField(exist = false)
+ private Integer paymentPlanDetailId;
+
+ @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;
+ @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;
+
+ @TableField(exist = false)
+ private List<TmsQuoteFee> quoteFeeItems;
+ @TableField(exist = false)
+ private List<TmsReceivableFeeItem> tmsReceivableFeeItems;
+
+ @TableField(exist = false)
+ private List<TmsPayableFeeItem> tmsPayableFeeItems;
+
+ @TableField("iscc")
+ private Integer iscc;
+
+
+ @TableField("close_why")
+ private Integer closeWhy;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField("close_time")
+ private Date closeTime;
+ @TableField("close_by")
+ private String closeBy;
+ @TableField("close_remark")
+ private String closeRemark;
+
+ @TableField("isfk")
+ private Integer isfk;
+
+
+
+ /** 鏄惁鎵撳嵃 */
+ @Excel(name = "鏄惁鎵撳嵃")
+ @TableField("is_print")
+ private Integer isPrint;
+
+
+ /** 鎵撳嵃娆℃暟 */
+ @Excel(name = "鎵撳嵃娆℃暟")
+ @TableField("print_count")
+ private Integer printCount;
+
+
+ /** 鎵撳嵃鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鎵撳嵃鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @TableField("print_time")
+ private Date printTime;
+
+
+ /** 鎵撳嵃浜� */
+ @Excel(name = "鎵撳嵃浜�")
+ @TableField("print_by")
+ private String printBy;
+
+
+ /** 鍏仈鍗曞彿 */
+ @Excel(name = "鍏仈鍗曞彿")
+ @TableField("six_link_no")
+ private String sixLinkNo;
+
+
+ /** 琛岄┒鍙ｅ哺 */
+ @Excel(name = "琛岄┒鍙ｅ哺")
+ @TableField("port_name")
+ private String portName;
+
+
+ /** 鎻愬崟鍙� / S/O */
+ @Excel(name = "鎻愬崟鍙� / S/O")
+ @TableField("bill_no")
+ private String billNo;
+
+
+ /** 鐮佸ご鍚� */
+ @Excel(name = "鐮佸ご鍚�")
+ @TableField("terminal_name")
+ private String terminalName;
+
+
+ /** 璐х墿鍚� */
+ @Excel(name = "璐х墿鍚�")
+ @TableField("cargo_name")
+ private String cargoName;
+
+
+ /** 浠舵暟 */
+ @Excel(name = "浠舵暟")
+ @TableField("piece_count")
+ private Integer pieceCount;
+
+
+ /** 閲嶉噺锛坘g锛� */
+ @Excel(name = "閲嶉噺", readConverterExp = "k=g")
+ @TableField("weight")
+ private BigDecimal weight;
+
+
+ /** 瀹㈡埛鑱旂粶浜� */
+ @Excel(name = "瀹㈡埛鑱旂粶浜�")
+ @TableField("contact_name")
+ private String contactName;
+
+
+ /** 鑱旂粶浜烘墜鏈哄彿 */
+ @Excel(name = "鑱旂粶浜烘墜鏈哄彿")
+ @TableField("contact_phone")
+ private String contactPhone;
+
+ /** 鍙ｅ哺 */
+ @TableField("port")
+ private String port;
+
+ /** 鏃犵紳鍙� */
+ @TableField("seamless_number")
+ private String seamlessNumber;
+
+ /** 鏃犵紳渚涘簲鍟� */
+ @TableField("seamless_supplier_id")
+ private Integer seamlessSupplierId;
+ /** 鏃犵紳渚涘簲鍟嗗悕绉� */
+ @TableField("seamless_supplier_name")
+ private String seamlessSupplierName;
+
+ @TableField("notes")
+ private String notes;
+
+ public void setCreateTimeBegin(String createTimeBegin) {
+ this.createTimeBegin = createTimeBegin==null? null :createTimeBegin+ " 00:00:00";
+
+ }
+
+ public void setCreateTimeEnd(String createTimeEnd) {
+ this.createTimeEnd = createTimeEnd==null?null:createTimeEnd+ " 23:59:59";
+ }
+
+ public void setUpdateTimeBegin(String updateTimeBegin) {
+ this.updateTimeBegin = updateTimeBegin==null? null :updateTimeBegin+ " 00:00:00";
+
+ }
+
+ public void setUpdateTimeEnd(String updateTimeEnd) {
+ this.updateTimeEnd = updateTimeEnd==null?null:updateTimeEnd+ " 23:59:59";
+ }
+
+ public void setConfirmTimeBegin(String confirmTimeBegin) {
+ this.confirmTimeBegin = confirmTimeBegin==null? null :confirmTimeBegin+ " 00:00:00";
+
+ }
+
+ public void setConfirmTimeEnd(String confirmTimeEnd) {
+ this.confirmTimeEnd = confirmTimeEnd==null?null:confirmTimeEnd+ " 23:59:59";
+ }
+
+ public void setOkTimeBegin(String okTimeBegin) {
+ this.okTimeBegin = okTimeBegin==null? null :okTimeBegin+ " 00:00:00";
+
+ }
+
+ public void setOkTimeEnd(String okTimeEnd) {
+ this.okTimeEnd = okTimeEnd==null?null:okTimeEnd+ " 23:59:59";
+ }
+
+ public void setOrderTimeBegin(String orderTimeBegin) {
+ this.orderTimeBegin = orderTimeBegin==null? null :orderTimeBegin+ " 00:00:00";
+
+ }
+
+ public void setOrderTimeEnd(String orderTimeEnd) {
+ this.orderTimeEnd = orderTimeEnd==null?null:orderTimeEnd+ " 23:59:59";
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0