diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs index 22ecc801..d7d77ef9 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs @@ -602,9 +602,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ return new JsonResult(new { Code = "200", Message = "审核成功" }); } [HttpPost] - public virtual async Task UpdateInvoice(string invbill, string remark) + public virtual async Task UpdateInvoice(INVOICE_GRP_DTO p_dto) { - var sucess = await _invMng.UpdateInvoiceAsync(invbill, remark).ConfigureAwait(false); + var sucess = await _invMng.UpdateInvoiceAsync(p_dto.InvbillNum, p_dto.FileName).ConfigureAwait(false); if (sucess) { return new JsonResult(new { Code = 200, Message = "更新成功" }); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs index b2cf0575..f6308c55 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs @@ -328,9 +328,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ public async Task BalanceSumExport(RequestDto input) { var entities = await _vmiBalanceSumRepository.GetListByFilterAsync(input.Filters, input.Sorting, int.MaxValue, input.SkipCount, true).ConfigureAwait(false); - // var totalCount = await _vmiBalanceSumRepository.GetCountByFilterAsync(input.Filters).ConfigureAwait(false); - - + // var totalCount = await _vmiBalanceSumRepository.GetCountByFilterAsync(input.Filters).ConfigureAwait(false); + if (entities.Count > 1000000) + { + throw new UserFriendlyException("导出行数超过100W不能导出,请重新录入查询条件导出", "400"); + } var dtos = _maper.Map, List>(entities); //var connectionString = this._serviceProvider.GetRequiredService().GetConnectionString("SettleAccountService"); //var options = new DbContextOptionsBuilder().UseSqlServer(connectionString).Options;