|
@ -4,6 +4,7 @@ using System.Threading.Tasks; |
|
|
using Microsoft.AspNetCore.Authorization; |
|
|
using Microsoft.AspNetCore.Authorization; |
|
|
using Microsoft.AspNetCore.Mvc; |
|
|
using Microsoft.AspNetCore.Mvc; |
|
|
using SettleAccount.Domain.BQ; |
|
|
using SettleAccount.Domain.BQ; |
|
|
|
|
|
using Volo.Abp.Uow; |
|
|
using Win.Abp.Snowflakes; |
|
|
using Win.Abp.Snowflakes; |
|
|
using Win.Sfs.BaseData.ImportExcelCommon; |
|
|
using Win.Sfs.BaseData.ImportExcelCommon; |
|
|
using Win.Sfs.SettleAccount.Bases; |
|
|
using Win.Sfs.SettleAccount.Bases; |
|
@ -14,6 +15,10 @@ using Win.Sfs.SettleAccount.Entities.BQ.Dtos; |
|
|
using Win.Sfs.SettleAccount.Entities.BQ.Managers; |
|
|
using Win.Sfs.SettleAccount.Entities.BQ.Managers; |
|
|
using Win.Sfs.SettleAccount.ExportReports; |
|
|
using Win.Sfs.SettleAccount.ExportReports; |
|
|
using Win.Sfs.Shared.RepositoryBase; |
|
|
using Win.Sfs.Shared.RepositoryBase; |
|
|
|
|
|
using Win.Sfs.Shared.Filter; |
|
|
|
|
|
using System.Linq; |
|
|
|
|
|
using System.LinqAsync; |
|
|
|
|
|
using Microsoft.EntityFrameworkCore; |
|
|
|
|
|
|
|
|
namespace Win.Sfs.SettleAccount.Entities.BQ |
|
|
namespace Win.Sfs.SettleAccount.Entities.BQ |
|
|
{ |
|
|
{ |
|
@ -40,7 +45,18 @@ namespace Win.Sfs.SettleAccount.Entities.BQ |
|
|
|
|
|
|
|
|
public override async Task<IActionResult> GenerateSettlementOrder(PUB_NOT_SA_DETAIL_REQ_DTO input) |
|
|
public override async Task<IActionResult> GenerateSettlementOrder(PUB_NOT_SA_DETAIL_REQ_DTO input) |
|
|
{ |
|
|
{ |
|
|
var entitys = await _detailRepository.GetListByFilterAsync(input.Filters, input.Sorting, int.MaxValue, input.SkipCount).ConfigureAwait(false); |
|
|
|
|
|
|
|
|
var filters = input.Filters.ToLambda<PUB_NOT_SA_DETAIL>(); |
|
|
|
|
|
|
|
|
|
|
|
var query=await _detailRepository.GetQueryableAsync().ConfigureAwait(false); |
|
|
|
|
|
|
|
|
|
|
|
if (input.Filters.Count > 0) |
|
|
|
|
|
{ |
|
|
|
|
|
query =query.Where(input.Filters.ToLambda<PUB_NOT_SA_DETAIL>()); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
var entitys = query.AsNoTracking().ToList(); |
|
|
|
|
|
// var entitys = await _detailRepository.GetListByFilterAsync(input.Filters, input.Sorting, int.MaxValue, input.SkipCount).ConfigureAwait(false);
|
|
|
List<ERR_EXP_DTO> errorlist = new List<ERR_EXP_DTO>(); |
|
|
List<ERR_EXP_DTO> errorlist = new List<ERR_EXP_DTO>(); |
|
|
if (entitys == null) |
|
|
if (entitys == null) |
|
|
{ |
|
|
{ |
|
|