From 3849263b31a16a91ff08acaa42786ecfde76f33c Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期四, 27 十一月 2025 20:18:08 +0800
Subject: [PATCH] 提交
---
tms/src/main/java/com/ruoyi/tms/domain/TmsDispatchOrder.java | 561 +++++++++++++++++++++++++++++--------------------------
1 files changed, 294 insertions(+), 267 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 dae5e7e..201fa73 100644
--- a/tms/src/main/java/com/ruoyi/tms/domain/TmsDispatchOrder.java
+++ b/tms/src/main/java/com/ruoyi/tms/domain/TmsDispatchOrder.java
@@ -1,444 +1,471 @@
package com.ruoyi.tms.domain;
-
import com.fasterxml.jackson.annotation.JsonFormat;
-
import java.math.BigDecimal;
import java.util.Date;
-
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
-
import java.util.Date;
-
import lombok.Data;
-
/**
* 璋冨害鍗曠鐞嗗璞� tms_dispatch_order
*
* @author ruoyi
- * @date 2025-11-04
+ * @date 2025-11-10
*/
@Data
-public class TmsDispatchOrder {
+public class TmsDispatchOrder{
- /**
- * 涓婚敭ID
- */
- @TableId(value = "id", type = IdType.AUTO)
+ /** 涓婚敭ID */
+ @TableId(value="id",type = IdType.AUTO)
private Integer id;
- /**
- * 璋冨害鍗曞彿
- */
+ /** 璋冨害鍗曞彿 */
@Excel(name = "璋冨害鍗曞彿")
@TableField("dispatch_no")
private String dispatchNo;
- /**
- * 瀹㈡埛鍚嶇О
- */
- @Excel(name = "瀹㈡埛鍚嶇О")
+ /** 瀹㈡埛ID */
+ @Excel(name = "瀹㈡埛ID")
+ @TableField("customer_id")
+ private Integer customerId;
+
+ @TableField("customer_code")
+ private String customerCode;
+
+ /** 瀹㈡埛缂栫爜 */
@TableField("customer_name")
private String customerName;
- /**
- * 瀹㈡埛缂栫爜
- */
- @TableField("customer_code")
- private String customerCode;
+
+ /** 鍏宠仈椤圭洰ID */
+ @Excel(name = "鍏宠仈椤圭洰ID")
+ @TableField("project_id")
+ private Integer projectId;
- /**
- * 椤圭洰鍚嶇О
- */
+ /** 椤圭洰鍚嶇О */
@Excel(name = "椤圭洰鍚嶇О")
@TableField("project_name")
private String projectName;
- /**
- * 杩愯緭璁″垝缂栧彿
- */
- @Excel(name = "杩愯緭璁″垝缂栧彿")
- @TableField("transport_plan_no")
- private String transportPlanNo;
+ /** 鍏宠仈鍚堝悓Id */
+ @Excel(name = "鍏宠仈鍚堝悓Id")
+ @TableField("contract_id")
+ private Integer contractId;
- /**
- * 鍑哄彂鍦拌鏀垮尯鍩�
- */
- @Excel(name = "鍑哄彂鍦拌鏀垮尯鍩�")
- @TableField("departure_region")
- private String departureRegion;
+ /** 鍏宠仈鍚堝悓鍚嶇О */
+ @Excel(name = "鍏宠仈鍚堝悓鍚嶇О")
+ @TableField("contract_name")
+ private String contractName;
- /**
- * 鐩殑琛屾斂鍖哄煙
- */
- @Excel(name = "鐩殑琛屾斂鍖哄煙")
- @TableField("destination_region")
- private String destinationRegion;
-
-
- /**
- * 杩愯緭绾胯矾
- */
+ /** 杩愯緭绾胯矾 */
@Excel(name = "杩愯緭绾胯矾")
@TableField("transport_line")
- private Integer transportLine;
+ private String transportLine;
- /**
- * 杞﹁締鏈嶅姟鍟�
- */
- @Excel(name = "杞﹁締鏈嶅姟鍟�")
- @TableField("vehicle_provider")
- private Integer vehicleProvider;
+ /** 璁㈠崟绫诲瀷锛屽叧鑱斿瓧鍏� */
+ @Excel(name = "璁㈠崟绫诲瀷锛屽叧鑱斿瓧鍏�")
+ @TableField("order_type")
+ private Integer orderType;
- /**
- * 涓婚┚椹跺憳
- */
+ /** 绛炬敹绫诲瀷锛屽叧鑱斿瓧鍏� */
+ @Excel(name = "绛炬敹绫诲瀷锛屽叧鑱斿瓧鍏�")
+ @TableField("sign_type")
+ private Integer signType;
+
+
+ /** 涓婚┚椹跺憳 */
@Excel(name = "涓婚┚椹跺憳")
- @TableField("main_driver")
- private Integer mainDriver;
+ @TableField("main_driver_id")
+ private Integer mainDriverId;
+
+ @TableField("main_driver_name")
+ private String mainDriverName;
- /**
- * 鍓┚椹跺憳
- */
- @TableField("assistant_driver")
- private String assistantDriver;
+ /** 鍓┚椹跺憳 */
+ @TableField("assistant_driver_id")
+ private Integer assistantDriverId;
+
+ @TableField("assistant_driver_name")
+ private String assistantDriverName;
+
+ /** 杞﹁締鏈嶅姟鍟咺D */
+ @Excel(name = "杞﹁締鏈嶅姟鍟咺D")
+ @TableField("vehicle_provider_id")
+ private Integer vehicleProviderId;
+
+ /** 杞﹁締鏈嶅姟鍟嗗悕绉� */
+ @Excel(name = "杞﹁締鏈嶅姟鍟嗗悕绉�")
+ @TableField("vehicle_provider_name")
+ private String vehicleProviderName;
- /**
- * 瑕佹眰杩愯緭宸ュ叿绫诲瀷
- */
+ /** 瑁呰揣鏈嶅姟鍟咺D */
+ @Excel(name = "瑁呰揣鏈嶅姟鍟咺D")
+ @TableField("loading_service_provider_id")
+ private Integer loadingServiceProviderId;
+
+
+ /** 瑁呰揣鏈嶅姟鍟嗗悕绉� */
+ @Excel(name = "瑁呰揣鏈嶅姟鍟嗗悕绉�")
+ @TableField("loading_service_provider_name")
+ private String loadingServiceProviderName;
+
+
+ /** 鎶ュ叧鏈嶅姟鍟咺D */
+ @Excel(name = "鎶ュ叧鏈嶅姟鍟咺D")
+ @TableField("customs_service_provider_id")
+ private Integer customsServiceProviderId;
+
+
+ /** 鎶ュ叧鏈嶅姟鍟嗗悕绉� */
+ @Excel(name = "鎶ュ叧鏈嶅姟鍟嗗悕绉�")
+ @TableField("customs_service_provider_name")
+ private String customsServiceProviderName;
+
+
+ /** 鏄惁绱ф�ワ紝0=鏄紝1=鍚︼紝榛樿鍚� */
+ @Excel(name = "鏄惁绱ф�ワ紝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 = "瑕佹眰杩愯緭宸ュ叿绫诲瀷")
- @TableField("required_vehicle_type")
- private Integer requiredVehicleType;
+ @TableField("required_vehicle_types")
+ private String requiredVehicleTypes;
- /**
- * 杩愯緭宸ュ叿鍙风爜
- */
- @Excel(name = "杩愯緭宸ュ叿鍙风爜")
- @TableField("vehicle_number")
- private String vehicleNumber;
-
-
- /**
- * 杩愯緭鏂瑰紡
- */
- @TableField("transport_mode")
- private Integer transportMode;
-
-
- /**
- * 閰嶈浇鏂瑰紡
- */
- @TableField("load_mode")
- private Integer loadMode;
-
-
- /**
- * 璐у搧鍚嶇О
- */
- @TableField("goods_name")
- private String goodsName;
-
-
- /**
- * 鏁伴噺
- */
- @TableField("quantity")
- private BigDecimal quantity;
-
-
- /**
- * 璐у搧绫诲瀷
- */
- @TableField("goods_type")
- private String goodsType;
-
-
- /**
- * 閲嶉噺(kg)
- */
- @TableField("weight")
- private BigDecimal weight;
-
-
- /**
- * 鍑�閲�(kg)
- */
- @TableField("net_weight")
- private BigDecimal netWeight;
-
-
- /**
- * 浣撶Н(m鲁)
- */
- @TableField("volume")
- private BigDecimal volume;
-
-
- /**
- * 鏁ｄ欢鏁�
- */
- @TableField("loose_pieces")
- private Integer loosePieces;
-
-
- /**
- * 鏁寸鏁�
- */
- @TableField("full_containers")
- private Integer fullContainers;
-
-
- /**
- * 闆嗚绠卞彿
- */
+ /** 闆嗚绠卞彿 */
@TableField("container_no")
private String containerNo;
-
- /**
- * 鎵樻暟
- */
- @TableField("pallet_count")
- private Integer palletCount;
+ @TableField("container_id")
+ private Integer containerId;
- /**
- * 瑕佹眰鏈�鏃╁嚭鍙戞椂闂�
- */
+ /** 杞﹁締绠＄悊琛↖D */
+ @Excel(name = "杞﹁締绠＄悊琛↖D")
+ @TableField("vehicle_id")
+ private Integer vehicleId;
+
+
+ /** 杞︾墝鍙� */
+ @Excel(name = "杞︾墝鍙�")
+ @TableField("license_plate")
+ private String licensePlate;
+
+
+ /** 瑕佹眰鏈�鏃╁嚭鍙戞椂闂� */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("earliest_departure")
private Date earliestDeparture;
- /**
- * 瑕佹眰鏈�鏅氬嚭鍙戞椂闂�
- */
+ /** 鍙戣揣浜猴紙鍏宠仈鏀跺彂璐т汉淇℃伅锛� */
+ @Excel(name = "鍙戣揣浜�", readConverterExp = "鍏�=鑱旀敹鍙戣揣浜轰俊鎭�")
+ @TableField("shipper_id")
+ private Integer shipperId;
+
+
+ /** 瑕佹眰鏈�鏅氬嚭鍙戞椂闂� */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("latest_departure")
private Date latestDeparture;
- /**
- * 瑕佹眰鏈�鏃╁埌杈炬椂闂�
- */
+ /** 鍙戣揣浜哄悕绉� */
+ @Excel(name = "鍙戣揣浜哄悕绉�")
+ @TableField("shipper_name")
+ private String shipperName;
+
+
+ /** 鍙戣揣浜烘墜鏈哄彿 */
+ @Excel(name = "鍙戣揣浜烘墜鏈哄彿")
+ @TableField("shipper_mobile")
+ private String shipperMobile;
+
+
+ /** 瑕佹眰鏈�鏃╁埌杈炬椂闂� */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("earliest_arrival")
private Date earliestArrival;
- /**
- * 瑕佹眰鏈�鏅氬埌杈炬椂闂�
- */
+ /** 鍙戣揣浜哄湴鍧� */
+ @Excel(name = "鍙戣揣浜哄湴鍧�")
+ @TableField("shipper_address")
+ private String shipperAddress;
+
+
+ /** 瑕佹眰鏈�鏅氬埌杈炬椂闂� */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("latest_arrival")
private Date latestArrival;
- /**
- * 鍑哄彂鍦板湴鍧�
- */
- @TableField("departure_address")
- private String departureAddress;
+ /** 鍙戣揣琛屾斂鍖哄煙 */
+ @Excel(name = "鍙戣揣琛屾斂鍖哄煙")
+ @TableField("shipper_region_code")
+ private String shipperRegionCode;
+
+ @Excel(name = "鍙戣揣琛屾斂鍖哄煙")
+ @TableField("shipper_region_label")
+ private String shipperRegionLabel;
- /**
- * 鐩殑鍦板湴鍧�
- */
- @TableField("destination_address")
- private String destinationAddress;
- /**
- * 瀹為檯杩愯緭宸ュ叿绫诲瀷
- */
+
+ /** 鏀惰揣浜猴紙鍏宠仈鏀跺彂璐т汉淇℃伅锛� */
+ @Excel(name = "鏀惰揣浜�", readConverterExp = "鍏�=鑱旀敹鍙戣揣浜轰俊鎭�")
+ @TableField("receiver_id")
+ private Integer receiverId;
+
+
+
+
+ /** 鏀惰揣浜哄悕绉� */
+ @Excel(name = "鏀惰揣浜哄悕绉�")
+ @TableField("receiver_name")
+ private String receiverName;
+
+
+ /** 瀹為檯杩愯緭宸ュ叿绫诲瀷 */
@TableField("actual_vehicle_type")
private String actualVehicleType;
- /**
- * 瀹為檯瑁呰溅寮�濮嬫椂闂�
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @TableField("actual_load_start")
- private Date actualLoadStart;
- /**
- * 瀹為檯鍗歌溅瀹屾垚鏃堕棿
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @TableField("actual_unload_end")
- private Date actualUnloadEnd;
+
+ /** 鏀惰揣浜烘墜鏈哄彿 */
+ @Excel(name = "鏀惰揣浜烘墜鏈哄彿")
+ @TableField("receiver_mobile")
+ private String receiverMobile;
- /**
- * 瀹為檯鍑哄彂鏃堕棿
- */
+
+
+
+ /** 鏀惰揣浜哄湴鍧� */
+ @Excel(name = "鏀惰揣浜哄湴鍧�")
+ @TableField("receiver_address")
+ private String receiverAddress;
+
+
+
+ /** 鏀惰揣琛屾斂鍖哄煙 */
+ @Excel(name = "鏀惰揣琛屾斂鍖哄煙")
+ @TableField("receiver_region_code")
+ private String receiverRegionCode;
+
+ @Excel(name = "鏀惰揣琛屾斂鍖哄煙")
+ @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;
- /**
- * 瀹炲彂閲嶉噺(kg)
- */
+ /** 瀹炲彂閲嶉噺(kg) */
@TableField("actual_weight")
private BigDecimal actualWeight;
- /**
- * 瀹炲彂浣撶Н(m鲁)
- */
+ /** 瀹炲彂浣撶Н(m鲁) */
@TableField("actual_volume")
private BigDecimal actualVolume;
- /**
- * 澶嶇閲嶉噺(kg)
- */
+ /** 澶嶇閲嶉噺(kg) */
@TableField("reweigh_weight")
private BigDecimal reweighWeight;
- /**
- * 鐢靛瓙閿佺紪鍙�
- */
+
+
+ /** 鐢靛瓙閿佺紪鍙� */
@TableField("electronic_lock")
private String electronicLock;
- /**
- * 闆嗚绠卞彿
- */
- @TableField("container_info")
- private String containerInfo;
+ /** 杞︽澘鍙� */
+ @TableField("shelf_id")
+ private Integer shelfId;
+
+ @TableField("shelf_code")
+ private String shelfCode;
- /**
- * 杞︽澘鍙�
- */
- @TableField("car_plate")
- private String carPlate;
-
-
- /**
- * 绌鸿浇閲岀▼(Km)
- */
+ /** 绌鸿浇閲岀▼(Km) */
@TableField("empty_mileage")
private BigDecimal emptyMileage;
- /**
- * 绌鸿浇娌硅��(L)
- */
+ /** 绌鸿浇娌硅��(L) */
@TableField("empty_fuel")
private BigDecimal emptyFuel;
- /**
- * 閲嶈浇閲岀▼(Km)
- */
+ /** 閲嶈浇閲岀▼(Km) */
@TableField("loaded_mileage")
private BigDecimal loadedMileage;
- /**
- * 閲嶈浇娌硅��(L)
- */
+ /** 閲嶈浇娌硅��(L) */
@TableField("loaded_fuel")
private BigDecimal loadedFuel;
- /**
- * 鐝鍙�
- */
+ /** 鐝鍙� */
@TableField("shift_no")
private String shiftNo;
- /**
- * 绾胯矾鍙�
- */
+ /** 绾胯矾鍙� */
@TableField("line_no")
private String lineNo;
- /**
- * 鐘舵��
- */
+ /** 鐘舵�� */
@Excel(name = "鐘舵��")
@TableField("status")
private Integer status;
- /**
- * 鍒涘缓浜�
- */
+ /** 鍒涘缓浜� */
@TableField("create_by")
private String createBy;
- /**
- * 鍒涘缓鏃堕棿
- */
+ /** 鍒涘缓鏃堕棿 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("create_time")
private Date createTime;
- /**
- * 鏇存柊浜�
- */
+ /** 鏇存柊浜� */
@Excel(name = "鏇存柊浜�")
@TableField("update_by")
private String updateBy;
- /**
- * 鏇存柊鏃堕棿
- */
+ /** 鏇存柊鏃堕棿 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鏇存柊鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@TableField("update_time")
private Date updateTime;
- /**
- * 澶囨敞
- */
+ /** 澶囨敞 */
@TableField("remark")
private String remark;
-}
+ /** 搴旀敹璐圭敤鐢熸垚鐘舵�侊紝鍏宠仈瀛楀吀 0=鏈敓鎴�,1=宸茬敓鎴�,2=鐢熸垚澶辫触 */
+ @Excel(name = "搴旀敹璐圭敤鐢熸垚鐘舵�侊紝鍏宠仈瀛楀吀 0=鏈敓鎴�,1=宸茬敓鎴�,2=鐢熸垚澶辫触")
+ @TableField("accounts_receivable_status")
+ private Integer accountsReceivableStatus;
+
+
+ /** 搴斾粯璐圭敤鐢熸垚鐘舵�侊紝鍏宠仈瀛楀吀 0=鏈敓鎴�,1=宸茬敓鎴�,2=鐢熸垚澶辫触 */
+ @Excel(name = "搴斾粯璐圭敤鐢熸垚鐘舵�侊紝鍏宠仈瀛楀吀 0=鏈敓鎴�,1=宸茬敓鎴�,2=鐢熸垚澶辫触")
+ @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("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;
+}
\ No newline at end of file
--
Gitblit v1.8.0