diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Prices/PriceListDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Prices/PriceListDtoBase.cs index 17cac9b8..ed086fb5 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Prices/PriceListDtoBase.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Prices/PriceListDtoBase.cs @@ -133,7 +133,7 @@ public class PriceListImportDto /// [Display(Name = "零件号")] [Required(ErrorMessage = "{0}是必填项")] - [ImporterHeader(Name = "*Part No.")] + [ImporterHeader(Name = "Part No.")] public string PartNo { get; set; } /// /// 价格 @@ -143,17 +143,17 @@ public class PriceListImportDto /// /// 开始时间 /// - [ImporterHeader(Name = "*Valid From")] + [ImporterHeader(Name = "Valid From")] public DateTime ValidFrom { get; set; } /// /// 结束时间 /// - [ImporterHeader(Name = "*Valid To")] + [ImporterHeader(Name = "Valid To")] public DateTime ValidTo { get; set; } /// /// 客户编码 /// - [ImporterHeader(Name = "*Plant")] + [ImporterHeader(Name = "Plant")] public string Plant { get; set; } /// /// ES1 diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppService.cs index 5b3dfb58..f2c77895 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppService.cs @@ -77,7 +77,7 @@ public class PriceListAppService : SettleAccountApplicationBase _checkls.Add("1046"); _checkls.Add("104T"); result = result.Where(p => _checkls.Contains(p.Plant)).ToList(); - result.ForEach(t => t.PartNo = t.PartNo + new string(' ', 6) + t.ES1 + t.ES2); + result.Where(t => !string.IsNullOrEmpty(t.ES1) || !string.IsNullOrEmpty(t.ES2)).ForEach(t => t.PartNo = t.PartNo + new string(' ', 6) + t.ES1 + t.ES2); var entityList = ObjectMapper.Map, List>(result); entityList = entityList.GroupBy(p => new { p.LU, p.ClientCode, p.BeginTime, p.EndTime }).Select(p => p.FirstOrDefault()).ToList();