From c11e6f07b031eea6c7de4c5508b8dbf0ee01d2c7 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期三, 01 四月 2026 10:08:08 +0800
Subject: [PATCH] 去除不同报价方案，不能添加相同【客户-路线-车型】数据
---
tms/src/main/java/com/ruoyi/tms/domain/TmsFinanceDetail.java | 69 ++++++++++++++++++++++++++++++++++
1 files changed, 68 insertions(+), 1 deletions(-)
diff --git a/tms/src/main/java/com/ruoyi/tms/domain/TmsFinanceDetail.java b/tms/src/main/java/com/ruoyi/tms/domain/TmsFinanceDetail.java
index 8ae672e..7a2a7a7 100644
--- a/tms/src/main/java/com/ruoyi/tms/domain/TmsFinanceDetail.java
+++ b/tms/src/main/java/com/ruoyi/tms/domain/TmsFinanceDetail.java
@@ -12,7 +12,10 @@
import com.baomidou.mybatisplus.annotation.TableField;
import java.util.Date;
+import java.util.List;
+import com.ruoyi.tms.domain.vo.FinanceDetailItem;
+import com.ruoyi.tms.domain.vo.FinanceDetailRow;
import lombok.Data;
/**
@@ -37,7 +40,7 @@
*/
@Excel(name = "璐圭敤绫诲瀷")
@TableField("fee_type")
- private Integer feeType;
+ private String feeType;
/**
@@ -82,6 +85,12 @@
@TableField("dispatch_order_id")
private Integer dispatchOrderId;
+ @TableField(exist = false)
+ private String dispatchNo;
+
+ @TableField(exist = false)
+ private String customerName;
+
/** 鏁版嵁绫诲瀷 */
@Excel(name = "鏁版嵁绫诲瀷")
@@ -123,6 +132,29 @@
@TableField("update_by")
private String updateBy;
+ /**
+ * 鍗曚环
+ */
+ @TableField("price")
+ private BigDecimal price;
+
+ /**
+ * 璁¤垂鍗曚綅
+ */
+ @TableField("unit")
+ private String unit;
+
+ /**
+ * 甯佺
+ */
+ @TableField("currency")
+ private String currency;
+
+ /**
+ * 璁¤垂鏁伴噺
+ */
+ @TableField("count")
+ private Integer count;
/**
* 鏇存柊鏃堕棿
@@ -131,5 +163,40 @@
@TableField("update_time")
private Date updateTime;
+ @TableField("status")
+ private Integer status;
+
+ @TableField(exist = false)
+ private List<FinanceDetailItem> items;
+
+
+ @TableField(exist = false)
+ private List<FinanceDetailRow> rowItems;
+
+ /**
+ * 鏄惁搴斾粯锛�0鍚� 1鏄級
+ */
+ @Excel(name = "鏄惁搴斾粯", readConverterExp = "0=鍚�,1=鏄�")
+ @TableField("is_yf")
+ private Integer isYF;
+
+ @Excel(name = "搴斾粯鎶ヤ环浠锋牸")
+ @TableField("yf_price")
+ private BigDecimal yfPrice;
+
+ @Excel(name = "搴斾粯甯佺")
+ @TableField("yf_currency")
+ private String yfCurrency;
+ @TableField("yf_service_provider_id_type")
+ private String yfServiceProviderIdType;
+ @TableField("yf_service_provider_id")
+ private Integer yfServiceProviderId;
+ @TableField("yf_service_provider_name")
+ private String yfServiceProviderName;
+ @TableField("yf_service_provider_type")
+ private String yfServiceProviderType;
+
+ @TableField("remark")
+ private String remark;
}
--
Gitblit v1.8.0