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 /// ///零件号 /// - [ImporterHeader(Name = "零件号")] + [ImporterHeader(Name = "零件号", FixAllSpace = true)] public string MaterialCode { get; set; } /// ///零件名称 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 { + /// + /// 大众看板结算 + /// public class VWKanBanDto: AuditedEntityDtoBase { /// 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 /// 请求条件 /// 实体DTO列表 - Task> GetListAsync(Guid parentId, ScrapClaimsRequestDto input); + Task> 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 { + /// + /// CP7报废和索赔 + /// public class ScrapClaimsDto : AuditedEntityDtoBase { /// 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 { + /// + /// 大众备件结算明细DTO + /// public class SparePartDto : AuditedEntityDtoBase { /// 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> GetListAsync(Guid id, ScrapClaimsRequestDto input) + virtual public async Task> 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 @@ - + 根据筛选条件获取实体列表