diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/CAN_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/CAN_SA_SERVICE.cs index fc31f9e5..0849859f 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/CAN_SA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/CAN_SA_SERVICE.cs @@ -137,6 +137,7 @@ namespace Win.Sfs.SettleAccount.Bases //[Route("mainquery")] public virtual async Task> MainQueryAsync(TRequestMainInput input) { + var entitys = await _repository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount).ConfigureAwait(false); var totalCount = await _repository.GetCountByFilterAsync(input.Filters).ConfigureAwait(false); var dtos = ObjectMapper.Map, List>(entitys); 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 16b380c4..20159db2 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 @@ -442,6 +442,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ bj.PN = itm.GetProperty("PN", "");// bj.PO = itm.GetProperty("PO", ""); bj.ProductionGroup = itm.GetProperty("PartGroup", ""); + bj.SettleDate=DateTime.Parse(itm.GetProperty("SettleDate", "")); bj.LineCode = itm.LineCode; bj.BeginDate = itm.BeginDate; bj.EndDate = itm.EndDate; @@ -490,7 +491,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ SettleDate = itm.SettleDate, ProductionGroup = itm.ProductionGroup, LineCode = itm.LineCode, - ContractID = itm.ContractID + ContractID = itm.ContractID, + }; diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs index abac4de1..0f682dc5 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs @@ -49,11 +49,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ INormalEfCoreRepository repository, INormalEfCoreRepository detailRepository, INV_MNG invmng, - INormalEfCoreRepository priceRepository, + INormalEfCoreRepository priceRepository, INormalEfCoreRepository pricebjRepository, - PUB_CAN_SA_MNG pubMng, - BaseDomainService baseservice, - INormalEfCoreRepository notRepository + PUB_CAN_SA_MNG pubMng, + BaseDomainService baseservice, + INormalEfCoreRepository notRepository ) : base(excelImportService, snowflakeIdGenerator, commonManager, repository, detailRepository, invmng, baseservice) { 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 c100254d..5145f70d 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 @@ -360,9 +360,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers /// public virtual async Task ReceivedAsync(List p_invs) { - var invList = _repository.Where(p => p_invs.Contains(p.InvbillNum)).ToList();//所有提交发票信息 - int count = invList.Select(p => p.InvGroupNum).Distinct().Count(); if (count > 1) { @@ -1195,10 +1193,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers copyDic.Add(itm.GroupNum, itm.Amt); } - - - - Dictionary> invoiceMap = new Dictionary>(); var first=p_list.FirstOrDefault(); foreach (var itm in dic) @@ -2257,7 +2251,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers PO= inv1.GetProperty("PO", ""), DeliveryIndexNumber = inv1.GetProperty("DeliveryIndexNumber", ""),//交付索引号 PartName = inv1.GetProperty("PartName", ""),//零件名称 - PartGroup=inv1.GetProperty("CommodityGroup","") + PartGroup=inv1.GetProperty("CommodityGroup",""), + SettleDate=inv1.GetProperty("SettleDate", "") }; @@ -2313,6 +2308,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers entity.SetProperty("PartName", detail.PartName);//零件名称 entity.SetProperty("PartGroup", detail.PartGroup); entity.SetProperty("PN", detail.PN); + entity.SetProperty("SettleDate", detail.SettleDate); + _entityDetailList.Add(entity); } if (_entityDetailList.Count > 0) @@ -2337,6 +2334,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers clientCode: string.Empty, realAmt: readAmt ); + invbill.Site = "1049"; invbill.CreationTime = DateTime.Now; invbill.ClientCode = "C001"; invlist.Add(invbill);