From 9fa5c6294ed062807de41100b0fcdfc92e6ebdca Mon Sep 17 00:00:00 2001 From: zhaoxinyu Date: Thu, 28 Dec 2023 14:03:23 +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 --- .../src/SettleAccount.Application/Bases/PD_SERVICE.cs | 8 ++++---- .../src/SettleAccount.Domain/Bases/EntityBase.cs | 5 +++++ .../src/SettleAccount.Domain/Entities/BQ/BBAC_PD.cs | 4 ++++ .../src/SettleAccount.Domain/Entities/BQ/HBPO_PD.cs | 4 ++++ .../Entities/BQ/Managers/INV_MNG.cs | 11 ++++++++--- .../src/SettleAccount.Domain/Entities/BQ/PUB_PD.cs | 4 ++++ 6 files changed, 29 insertions(+), 7 deletions(-) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs index bd000b44..b7b6fe9b 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs @@ -289,19 +289,19 @@ namespace Win.Sfs.SettleAccount.Bases //[Route("mainquery")] public virtual async Task> MainQueryAsync(TRequestMainInput input) { - var invs= await _invRepository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount).ConfigureAwait(false); - var invbills = invs.Select(p => p.InvbillNum).ToList(); + //var invs= await _invRepository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount).ConfigureAwait(false); + //var invbills = invs.Select(p => p.InvbillNum).ToList(); var entitys = await _repository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount).ConfigureAwait(false); - entitys=entitys.Where(p => invbills.Contains(p.BillNum)).ToList(); + // entitys=entitys.Where(p => invbills.Contains(p.BillNum)).ToList(); var totalCount = await _repository.GetCountByFilterAsync(input.Filters).ConfigureAwait(false); var dtos = ObjectMapper.Map, List>(entitys); - dtos = dtos.Where(p => invbills.Contains(p.BillNum)).ToList(); + // dtos = dtos.Where(p => invbills.Contains(p.BillNum)).ToList(); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/EntityBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/EntityBase.cs index 3c818a4d..430f2947 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/EntityBase.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/EntityBase.cs @@ -98,6 +98,11 @@ namespace SettleAccount.Bases [Display(Name = "地点")] public virtual string Site { get; set; } + [Display(Name = "业务类型")] + public virtual EnumBusinessType BusinessType { get; set; } + + + } public interface ISA_BASE : ISBASE diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_PD.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_PD.cs index a3b018c3..3f4657ce 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_PD.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_PD.cs @@ -40,5 +40,9 @@ namespace SettleAccount.Domain.BQ InvGroupNum = invGroupNum; Site = site; } + public void SetBusinessType(EnumBusinessType enumBusinessType) + { + BusinessType = enumBusinessType; + } } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_PD.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_PD.cs index e1b20ad0..88141e87 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_PD.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_PD.cs @@ -40,5 +40,9 @@ namespace SettleAccount.Domain.BQ InvGroupNum = invGroupNum; Site = site; } + public void SetBusinessType(EnumBusinessType enumBusinessType) + { + BusinessType = enumBusinessType; + } } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs index c9439006..95365b7f 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs @@ -502,8 +502,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers settleBillNum: itm.InvGroupNum, state: SettleBillState.客户已收票, invGroupNum: itm.InvGroupNum, - site: string.Empty + site: itm.Site + + ); + bbac.SetBusinessType(itm.BusinessType); bbacmainlist.Add(bbac); } var bbacDetail = new List(); @@ -662,8 +665,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers settleBillNum: itm.InvGroupNum, state: SettleBillState.客户已收票, invGroupNum: itm.InvGroupNum, - site: string.Empty + site: itm.Site ); + bbac.SetBusinessType(itm.BusinessType); bbacmainlist.Add(bbac); } var bbacDetail = new List(); @@ -825,10 +829,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers settleBillNum: itm.InvGroupNum, state: SettleBillState.客户已收票, invGroupNum: itm.InvGroupNum, - site: string.Empty + site: itm.Site ); + pub.SetBusinessType(itm.BusinessType); bbacmainlist.Add(pub); } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_PD.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_PD.cs index c23b67d8..cb441879 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_PD.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_PD.cs @@ -40,5 +40,9 @@ namespace SettleAccount.Domain.BQ InvGroupNum = invGroupNum; Site = site; } + public void SetBusinessType(EnumBusinessType enumBusinessType) + { + BusinessType = enumBusinessType; + } } }