From f0200ee72775a8fc59c35f7005a849f9a46fa5bb Mon Sep 17 00:00:00 2001
From: 44673626 <44673626@qq.com>
Date: Wed, 17 Nov 2021 15:13:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=8A=A5=E8=A1=A8=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E4=B8=AD=E5=8E=BB=E6=8E=89=E7=A9=BA=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Entities/Invoices/InvoiceDtoBase.cs                     | 2 +-
 .../Entities/VWKanBan/VWKanBanDto.cs                        | 3 +++
 .../Entities/VWScrapClaims/IScrapClaimsAppService.cs        | 2 +-
 .../Entities/VWScrapClaims/ScrapClaimsDto.cs                | 3 +++
 .../Entities/VWSparePart/SparePartDto.cs                    | 3 +++
 .../Entities/VWScrapClaims/ScrapClaimsAppService.cs         | 6 +++---
 .../SettleAccount.Application/SettleAccount.Application.xml | 2 +-
 7 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Invoices/InvoiceDtoBase.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Invoices/InvoiceDtoBase.cs
index ac59e86a..3f51d4cd 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Invoices/InvoiceDtoBase.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Invoices/InvoiceDtoBase.cs
@@ -242,7 +242,7 @@ namespace Win.Sfs.SettleAccount.Entities.Invoices
         /// <summary>
         ///零件号
         /// </summary>
-        [ImporterHeader(Name = "零件号")]
+        [ImporterHeader(Name = "零件号", FixAllSpace = true)]
         public string MaterialCode { get; set; }
         /// <summary>
         ///零件名称
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWKanBan/VWKanBanDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWKanBan/VWKanBanDto.cs
index 30d746e8..b54ce9f2 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWKanBan/VWKanBanDto.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWKanBan/VWKanBanDto.cs
@@ -9,6 +9,9 @@ using Win.Sfs.Shared.DtoBase;
 
 namespace Win.Sfs.SettleAccount.Entities.VWKanBan
 {
+    /// <summary>
+    /// 大众看板结算
+    /// </summary>
     public  class VWKanBanDto:  AuditedEntityDtoBase<Guid>
     {
         /// <summary>
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/IScrapClaimsAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/IScrapClaimsAppService.cs
index 3adbf5d6..28a18ca3 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/IScrapClaimsAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/IScrapClaimsAppService.cs
@@ -43,7 +43,7 @@ namespace Win.Sfs.SettleAccount.Entities.VWScrapClaims
         /// <param name="input">请求条件</param>
         /// <returns>实体DTO列表</returns>
 
-        Task<PagedResultDto<ScrapClaimsDto>> GetListAsync(Guid parentId, ScrapClaimsRequestDto input);
+        Task<PagedResultDto<ScrapClaimsDto>> GetListAsync(ScrapClaimsRequestDto input);
 
 
 
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsDto.cs
index f2055002..363c8e11 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsDto.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsDto.cs
@@ -7,6 +7,9 @@ using Win.Sfs.Shared.DtoBase;
 
 namespace Win.Sfs.SettleAccount.Entities.VWScrapClaims
 {
+    /// <summary>
+    /// CP7报废和索赔
+    /// </summary>
     public class ScrapClaimsDto : AuditedEntityDtoBase<Guid>
     {
         /// <summary>
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartDto.cs
index 40b1f7e6..ac77efef 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartDto.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartDto.cs
@@ -7,6 +7,9 @@ using Win.Sfs.Shared.DtoBase;
 
 namespace Win.Sfs.SettleAccount.Entities.VWSparePart
 {
+    /// <summary>
+    /// 大众备件结算明细DTO
+    /// </summary>
     public class SparePartDto : AuditedEntityDtoBase<Guid>
     {
         /// <summary>
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/VWScrapClaims/ScrapClaimsAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/VWScrapClaims/ScrapClaimsAppService.cs
index 3208404f..a2f3aa3c 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/VWScrapClaims/ScrapClaimsAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/VWScrapClaims/ScrapClaimsAppService.cs
@@ -208,11 +208,11 @@ namespace Win.Sfs.SettleAccount.Entities.VWScrapClaims
         [HttpPost]
         [Route("list")]
         //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<PagedResultDto<ScrapClaimsDto>> GetListAsync(Guid id, ScrapClaimsRequestDto input)
+        virtual public async Task<PagedResultDto<ScrapClaimsDto>> GetListAsync(ScrapClaimsRequestDto input)
         {
-            if (input.ParentId != Guid.Empty)
+            if (!string.IsNullOrEmpty(input.Version))
             {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "ParentId", Logic = EnumFilterLogic.And, Value = input.ParentId.ToString() });
+                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version });
             }
             else
             {
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml
index 30684b63..20ed6029 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml
@@ -1616,7 +1616,7 @@
             <param name="input"></param>
             <returns></returns>
         </member>
-        <member name="M:Win.Sfs.SettleAccount.Entities.VWScrapClaims.ScrapClaimsAppService.GetListAsync(System.Guid,Win.Sfs.SettleAccount.Entities.VWScrapClaims.ScrapClaimsRequestDto)">
+        <member name="M:Win.Sfs.SettleAccount.Entities.VWScrapClaims.ScrapClaimsAppService.GetListAsync(Win.Sfs.SettleAccount.Entities.VWScrapClaims.ScrapClaimsRequestDto)">
             <summary>
             根据筛选条件获取实体列表
             </summary>