From a343b4d1030c3b941b49bfb832a4c6e433b3868e Mon Sep 17 00:00:00 2001
From: cjy <tiankui_xing@163.com>
Date: Thu, 7 Nov 2024 20:14:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B1=87=E7=8E=87=E6=B7=BB=E5=8A=A0=E6=A0=B8?=
 =?UTF-8?q?=E7=AE=97=E6=B1=87=E7=8E=87=E5=8F=8A=E5=8F=91=E7=A5=A8=E6=B1=87?=
 =?UTF-8?q?=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DS.WMS.Core/Fee/Dtos/FeeCurrencyExchangeReq.cs  | 10 ++++++++++
 .../DS.WMS.Core/Fee/Dtos/FeeCurrencyExchangeRes.cs  | 11 +++++++++++
 .../DS.WMS.Core/Fee/Entity/FeeCurrencyExchange.cs   | 13 +++++++++++++
 3 files changed, 34 insertions(+)

diff --git a/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeCurrencyExchangeReq.cs b/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeCurrencyExchangeReq.cs
index 09d8cd27..fa8a1f12 100644
--- a/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeCurrencyExchangeReq.cs
+++ b/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeCurrencyExchangeReq.cs
@@ -38,6 +38,16 @@ public class FeeCurrencyExchangeReq
     /// </summary>
     public decimal? CustomValue { get; set; } = 0;
     /// <summary>
+    /// 核算汇率
+    /// </summary>
+    public decimal? CalculateValue { get; set; }
+
+
+    /// <summary>
+    /// 发票汇率
+    /// </summary>
+    public decimal? InvoiceValue { get; set; }
+    /// <summary>
     /// 开始日期
     /// </summary>
     public DateTime StartDate { get; set; }
diff --git a/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeCurrencyExchangeRes.cs b/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeCurrencyExchangeRes.cs
index d9ad258e..9e82f4cf 100644
--- a/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeCurrencyExchangeRes.cs
+++ b/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeCurrencyExchangeRes.cs
@@ -36,6 +36,17 @@ public class FeeCurrencyExchangeRes
     /// 海关汇率
     /// </summary>
     public decimal? CustomValue { get; set; } = 0;
+
+    /// <summary>
+    /// 核算汇率
+    /// </summary>
+    public decimal? CalculateValue { get; set; }
+
+
+    /// <summary>
+    /// 发票汇率
+    /// </summary>
+    public decimal? InvoiceValue { get; set; }
     /// <summary>
     /// 开始日期
     /// </summary>
diff --git a/ds-wms-service/DS.WMS.Core/Fee/Entity/FeeCurrencyExchange.cs b/ds-wms-service/DS.WMS.Core/Fee/Entity/FeeCurrencyExchange.cs
index 41dcff9a..710e41f3 100644
--- a/ds-wms-service/DS.WMS.Core/Fee/Entity/FeeCurrencyExchange.cs
+++ b/ds-wms-service/DS.WMS.Core/Fee/Entity/FeeCurrencyExchange.cs
@@ -37,6 +37,19 @@ public class FeeCurrencyExchange: BaseOrgModel<long>
     /// </summary>
     [SugarColumn(ColumnDescription = "海关汇率", IsNullable = true, Length = 18, DecimalDigits = 6, DefaultValue = "0")]
     public decimal? CustomValue { get; set; }
+
+    /// <summary>
+    /// 核算汇率
+    /// </summary>
+    [SugarColumn(ColumnDescription = "核算汇率", IsNullable = true, Length = 18, DecimalDigits = 6, DefaultValue = "0")]
+    public decimal? CalculateValue { get; set; }
+
+
+    /// <summary>
+    /// 发票汇率
+    /// </summary>
+    [SugarColumn(ColumnDescription = "发票汇率", IsNullable = true, Length = 18, DecimalDigits = 6, DefaultValue = "0")]
+    public decimal? InvoiceValue { get; set; }
     /// <summary>
     /// 开始日期
     /// </summary>