From 34669fa71bd2cc4a4ff57d7d2440a95da998b6b5 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期一, 30 三月 2026 15:47:55 +0800
Subject: [PATCH] 修改异步
---
tms/src/main/java/com/ruoyi/tms/domain/TmsDispatchOrder.java | 199 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 174 insertions(+), 25 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 86d8425..ac8f5b1 100644
--- a/tms/src/main/java/com/ruoyi/tms/domain/TmsDispatchOrder.java
+++ b/tms/src/main/java/com/ruoyi/tms/domain/TmsDispatchOrder.java
@@ -33,7 +33,7 @@
/** 瀹㈡埛ID */
- @Excel(name = "瀹㈡埛ID")
+
@TableField("customer_id")
private Integer customerId;
@@ -41,13 +41,13 @@
private String customerCode;
/** 瀹㈡埛缂栫爜 */
+ @Excel(name = "瀹㈡埛鍚嶇О")
@TableField("customer_name")
private String customerName;
/** 鍏宠仈椤圭洰ID */
- @Excel(name = "鍏宠仈椤圭洰ID")
@TableField("project_id")
private Integer projectId;
@@ -59,7 +59,6 @@
/** 鍏宠仈鍚堝悓Id */
- @Excel(name = "鍏宠仈鍚堝悓Id")
@TableField("contract_id")
private Integer contractId;
@@ -77,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;
@@ -100,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;
@@ -116,7 +113,6 @@
/** 瑁呰揣鏈嶅姟鍟咺D */
- @Excel(name = "瑁呰揣鏈嶅姟鍟咺D")
@TableField("loading_service_provider_id")
private Integer loadingServiceProviderId;
@@ -128,7 +124,6 @@
/** 鎶ュ叧鏈嶅姟鍟咺D */
- @Excel(name = "鎶ュ叧鏈嶅姟鍟咺D")
@TableField("customs_service_provider_id")
private Integer customsServiceProviderId;
@@ -140,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;
@@ -173,7 +166,6 @@
/** 杞﹁締绠＄悊琛↖D */
- @Excel(name = "杞﹁締绠＄悊琛↖D")
@TableField("vehicle_id")
private Integer vehicleId;
@@ -191,7 +183,7 @@
/** 涓嬪崟鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd")
@TableField("order_time")
private Date orderTime;
@TableField(exist = false)
@@ -200,7 +192,6 @@
private String orderTimeEnd;
/** 鍙戣揣浜猴紙鍏宠仈鏀跺彂璐т汉淇℃伅锛� */
- @Excel(name = "鍙戣揣浜�", readConverterExp = "鍏�=鑱旀敹鍙戣揣浜轰俊鎭�")
@TableField("shipper_id")
private Integer shipperId;
@@ -242,7 +233,6 @@
/** 鍙戣揣琛屾斂鍖哄煙 */
- @Excel(name = "鍙戣揣琛屾斂鍖哄煙")
@TableField("shipper_region_code")
private String shipperRegionCode;
@@ -255,7 +245,6 @@
/** 鏀惰揣浜猴紙鍏宠仈鏀跺彂璐т汉淇℃伅锛� */
- @Excel(name = "鏀惰揣浜�", readConverterExp = "鍏�=鑱旀敹鍙戣揣浜轰俊鎭�")
@TableField("receiver_id")
private Integer receiverId;
@@ -269,6 +258,7 @@
/** 瀹為檯杩愯緭宸ュ叿绫诲瀷 */
+ @Excel(name = "娲惧嚭杞﹀瀷",dictType = "vehicle_type")
@TableField("actual_vehicle_type")
private String actualVehicleType;
@@ -293,7 +283,6 @@
/** 鏀惰揣琛屾斂鍖哄煙 */
- @Excel(name = "鏀惰揣琛屾斂鍖哄煙")
@TableField("receiver_region_code")
private String receiverRegionCode;
@@ -395,7 +384,7 @@
/** 鐘舵�� */
- @Excel(name = "鐘舵��")
+ @Excel(name = "鐘舵��",dictType = "tms_dispatch_order_status")
@TableField("status")
private Integer status;
@TableField(exist = false)
@@ -437,13 +426,13 @@
/** 搴旀敹璐圭敤鐢熸垚鐘舵�侊紝鍏宠仈瀛楀吀 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;
@@ -486,7 +475,6 @@
@TableField("operation_mode")
private Integer operationMode;
- @Excel(name = "鍏宠仈鎶ヤ环鏂规ID")
@TableField("quote_plan_id")
private Integer quotePlanId;
@@ -519,5 +507,166 @@
@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