Browse Source

导入报表字段中去掉空格

branch_ccpg_220107
44673626 3 years ago
parent
commit
f0200ee727
  1. 2
      src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Invoices/InvoiceDtoBase.cs
  2. 3
      src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWKanBan/VWKanBanDto.cs
  3. 2
      src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/IScrapClaimsAppService.cs
  4. 3
      src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsDto.cs
  5. 3
      src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartDto.cs
  6. 6
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/VWScrapClaims/ScrapClaimsAppService.cs
  7. 2
      src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml

2
src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Invoices/InvoiceDtoBase.cs

@ -242,7 +242,7 @@ namespace Win.Sfs.SettleAccount.Entities.Invoices
/// <summary> /// <summary>
///零件号 ///零件号
/// </summary> /// </summary>
[ImporterHeader(Name = "零件号")] [ImporterHeader(Name = "零件号", FixAllSpace = true)]
public string MaterialCode { get; set; } public string MaterialCode { get; set; }
/// <summary> /// <summary>
///零件名称 ///零件名称

3
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 namespace Win.Sfs.SettleAccount.Entities.VWKanBan
{ {
/// <summary>
/// 大众看板结算
/// </summary>
public class VWKanBanDto: AuditedEntityDtoBase<Guid> public class VWKanBanDto: AuditedEntityDtoBase<Guid>
{ {
/// <summary> /// <summary>

2
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> /// <param name="input">请求条件</param>
/// <returns>实体DTO列表</returns> /// <returns>实体DTO列表</returns>
Task<PagedResultDto<ScrapClaimsDto>> GetListAsync(Guid parentId, ScrapClaimsRequestDto input); Task<PagedResultDto<ScrapClaimsDto>> GetListAsync(ScrapClaimsRequestDto input);

3
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 namespace Win.Sfs.SettleAccount.Entities.VWScrapClaims
{ {
/// <summary>
/// CP7报废和索赔
/// </summary>
public class ScrapClaimsDto : AuditedEntityDtoBase<Guid> public class ScrapClaimsDto : AuditedEntityDtoBase<Guid>
{ {
/// <summary> /// <summary>

3
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 namespace Win.Sfs.SettleAccount.Entities.VWSparePart
{ {
/// <summary>
/// 大众备件结算明细DTO
/// </summary>
public class SparePartDto : AuditedEntityDtoBase<Guid> public class SparePartDto : AuditedEntityDtoBase<Guid>
{ {
/// <summary> /// <summary>

6
src/Modules/SettleAccount/src/SettleAccount.Application/Entities/VWScrapClaims/ScrapClaimsAppService.cs

@ -208,11 +208,11 @@ namespace Win.Sfs.SettleAccount.Entities.VWScrapClaims
[HttpPost] [HttpPost]
[Route("list")] [Route("list")]
//[Authorize(SettleAccountPermissions.SettleAccounts.Default)] //[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 else
{ {

2
src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml

@ -1616,7 +1616,7 @@
<param name="input"></param> <param name="input"></param>
<returns></returns> <returns></returns>
</member> </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>
根据筛选条件获取实体列表 根据筛选条件获取实体列表
</summary> </summary>

Loading…
Cancel
Save