From 13aa767896290590440911c862599a315e723bce Mon Sep 17 00:00:00 2001 From: Administrator Date: Thu, 23 Jun 2022 15:06:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Prices/PriceListAppService.cs | 8 ++++++++ .../Entities/Prices/PriceListAppServiceBJ.cs | 9 +++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppService.cs index 05f553fc..c33ba1f8 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppService.cs @@ -206,6 +206,14 @@ namespace Win.Sfs.SettleAccount.Entities.Prices var result = await _exportImporter.UploadExcelImport(files, _excelImportService); + List _checkls = new List(); + _checkls.Add("100001"); + _checkls.Add("100053"); + _checkls.Add("100113"); + + result = result.Where(p => _checkls.Contains(p.CustomerCode)).ToList(); + + var entityList = ObjectMapper.Map, List>(result); var _ls = entityList.Where(p=>p.EndDate.ToString().Contains("9999")).OrderByDescending(p => p.BeginDate).GroupBy(p => new { p.MaterialCode, p.CustomerCode,p.Type }).Select(p=>p.FirstOrDefault()); diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceBJ.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceBJ.cs index e1613f35..1c0cfe76 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceBJ.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceBJ.cs @@ -159,18 +159,15 @@ namespace Win.Sfs.SettleAccount.Entities.Prices virtual public async Task ImportAsync([FromForm] IFormFileCollection files,string version) { ExportImporter _exportImporter = new ExportImporter(); - - - - var result = await _exportImporter.UploadExcelImport(files, _excelImportService); - List _checkls = new List(); _checkls.Add("100001"); _checkls.Add("100053"); _checkls.Add("100113"); - + // _checkls.Add("200067"); + result = result.Where(p => _checkls.Contains(p.CustomerCode)).ToList(); + var entityList = ObjectMapper.Map, List>(result); var _ls = entityList.Where(p=>p.EndDate.ToString().Contains("9999")).OrderByDescending(p => p.BeginDate).GroupBy(p => new { p.MaterialCode, p.CustomerCode,p.Type }).Select(p=>p.FirstOrDefault());