From 1ccce539aa0d229698504817e7f3f28724648241 Mon Sep 17 00:00:00 2001 From: Administrator Date: Fri, 14 Jan 2022 13:02:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=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/PriceListAppServiceBJ.cs | 10 +++------- .../Reports/ReportServices/ReportMakeService.cs | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) 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 23ba0c90..70cd5823 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceBJ.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceBJ.cs @@ -163,13 +163,6 @@ namespace Win.Sfs.SettleAccount.Entities.Prices var result = await _exportImporter.UploadExcelImport(files, _excelImportService); - var list=result.Where(p => p.Type == 20).ToList(); - - - - - - var entityList = ObjectMapper.Map, List>(result); var _ls = entityList.Where(p=>p.EndDate.ToString().Contains("9999")).GroupBy(p => new { p.MaterialCode, p.CustomerCode,p.Type }).Select(p=>p.FirstOrDefault()); @@ -177,6 +170,9 @@ namespace Win.Sfs.SettleAccount.Entities.Prices { itm.Update(GuidGenerator.Create(),version); } + _ls=_ls.Where(p => p.Type == 20).ToList(); + + await _mng.ImportAsync(_ls.ToList(), version); return ApplicationConsts.SuccessStr; } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs index a895191a..377cba79 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs @@ -33,7 +33,7 @@ using Win.Sfs.SettleAccount.Reports.ReportRequestDto; namespace Win.Sfs.SettleAccount.Reports.ReportServices { [Authorize(SettleAccountPermissions.Reports.Default)] - + //[AllowAnonymous] [Route("api/settleaccount/ReportMakeService")] public class ReportService : ApplicationService {