From 4f6e7ffa05881102c39bbbcc75b13d59534cd18a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B5=87=E6=96=87=E9=BE=99?= <mcc890916@hotmail.com>
Date: Thu, 19 Sep 2024 15:01:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=9C=AB=E6=AC=A1=E5=90=88?=
 =?UTF-8?q?=E4=BD=9C=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DS.WMS.Core/Info/Dtos/ClientInfoRes.cs    |  6 ++++-
 .../DS.WMS.Core/Info/Entity/InfoClient.cs     |  6 +++++
 .../Info/Method/ClientInfoService.cs          |  2 +-
 .../Settlement/Dtos/SettlementRequest.cs      | 24 +++++++++++++++++--
 4 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientInfoRes.cs b/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientInfoRes.cs
index 07b3d9f2..b7f69584 100644
--- a/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientInfoRes.cs
+++ b/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientInfoRes.cs
@@ -4,7 +4,6 @@ using DS.Module.Core.Enums;
 using DS.Module.Core.Extensions;
 using DS.WMS.Core.Info.Entity;
 using Masuit.Tools.Systems;
-using SqlSugar;
 
 namespace DS.WMS.Core.Info.Dtos;
 
@@ -418,6 +417,11 @@ public class ClientInfoRes
     /// </summary>
     public bool IsSupplier { get; set; }
 
+    /// <summary>
+    /// 末期合作时间
+    /// </summary>
+    public DateTime? ETD { get; set; }
+
     /// <summary>
     /// 客户等级：A/B/C/D
     /// </summary>
diff --git a/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClient.cs b/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClient.cs
index d3f67fcc..e59648e6 100644
--- a/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClient.cs
+++ b/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClient.cs
@@ -418,6 +418,12 @@ public class InfoClient : SharedOrgModel<long>
     [SugarColumn(ColumnDescription = "是否为供应商")]
     public bool IsSupplier { get; set; }
 
+    /// <summary>
+    /// 末期合作时间
+    /// </summary>
+    [SugarColumn(ColumnDescription = "末期合作时间", IsNullable = true)]
+    public DateTime? ETD { get; set; }
+
     /// <summary>
     /// 客户等级：A/B/C/D
     /// </summary>
diff --git a/ds-wms-service/DS.WMS.Core/Info/Method/ClientInfoService.cs b/ds-wms-service/DS.WMS.Core/Info/Method/ClientInfoService.cs
index 6a0eb122..750dc3af 100644
--- a/ds-wms-service/DS.WMS.Core/Info/Method/ClientInfoService.cs
+++ b/ds-wms-service/DS.WMS.Core/Info/Method/ClientInfoService.cs
@@ -403,7 +403,7 @@ public class ClientInfoService : ServiceBase, IClientInfoService
             data.ServiceItem = data.ServiceItem ?? string.Empty;
             var updateable = TenantDb.Updateable(data).RemoveDataCache($"{SqlSugarCacheConst.InfoClient}{User.TenantId}")
                 .IgnoreColumns(ignoreAllNullColumns: true)
-                .IgnoreColumns(x => new { x.Status, x.AuditStatus, x.AuditNote, x.AuditTime });
+                .IgnoreColumns(x => new { x.Status, x.ETD, x.AuditStatus, x.AuditNote, x.AuditTime });
 
             var list = (await GetUsageAsync(req.Id))?.Data;
             if (list != null && list.Exists(x => x.Id == req.Id && x.IsUsed))
diff --git a/ds-wms-service/DS.WMS.Core/Settlement/Dtos/SettlementRequest.cs b/ds-wms-service/DS.WMS.Core/Settlement/Dtos/SettlementRequest.cs
index 2650d23b..79a798e2 100644
--- a/ds-wms-service/DS.WMS.Core/Settlement/Dtos/SettlementRequest.cs
+++ b/ds-wms-service/DS.WMS.Core/Settlement/Dtos/SettlementRequest.cs
@@ -1,4 +1,5 @@
 using DS.WMS.Core.Application.Dtos;
+using DS.WMS.Core.Fee.Dtos;
 using DS.WMS.Core.Settlement.Entity;
 
 namespace DS.WMS.Core.Settlement.Dtos
@@ -14,10 +15,29 @@ namespace DS.WMS.Core.Settlement.Dtos
         public TEntity Settlement { get; set; }
 
         /// <summary>
-        /// 结算费用明细
+        /// 结算费用明细（付费申请结算用）
         /// </summary>
         public List<PaymentApplicationDetailDto>? Details { get; set; }
 
-        //public List<PaymentApplicationDtoV2> Applications { get; set; }
+        /// <summary>
+        /// 发票结算信息（发票结算用）
+        /// </summary>
+        public InvoiceSettlement[]? Invoices { get; set; }
+    }
+
+    /// <summary>
+    /// 发票结算信息
+    /// </summary>
+    public class InvoiceSettlement
+    {
+        /// <summary>
+        /// 发票ID
+        /// </summary>
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 汇率信息（当发票币别与结算币别一致时，此字段可为null）
+        /// </summary>
+        public ExchangeRate? ExchangeRate { get; set; }
     }
 }