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 1261432e..435972b3 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 @@ -660,7 +660,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ } - private async Task> ChangedPrice(EnumBusinessType businessType, List p_list) where T : SA_CAN_BASE, new() + private async Task> ChangedPrice(EnumBusinessType businessType, string site,List p_list) where T : SA_CAN_BASE, new() { List priceList = new List(); if (businessType == EnumBusinessType.BeiJian) @@ -688,7 +688,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ { var priceListEntity = priceList.Where(p => p.IsCancel == false) .Where(t => t.LU == itm.LU) - .Where(t => itm.SettleDate >= t.BeginTime && itm.SettleDate <= t.EndTime && t.ClientCode == itm.Site) + .Where(t => itm.SettleDate >= t.BeginTime && itm.SettleDate <= t.EndTime && t.ClientCode ==site) .OrderByDescending(t => t.Date) .ThenByDescending(t => t.CreationTime) .FirstOrDefault(); @@ -733,7 +733,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ { if (adj.Any())//假如存在调整单 { - var adjlist= await ChangedPrice(invoice.BusinessType, adj).ConfigureAwait(false); + var adjlist= await ChangedPrice(invoice.BusinessType,invoice.Site, adj).ConfigureAwait(false); ls.AddRange(adjlist); } // 获取所属站点信息 @@ -829,7 +829,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ { if (adj.Any())//假如存在调整单 { - var adjlist = await ChangedPrice(invoice.BusinessType, adj).ConfigureAwait(false); + var adjlist = await ChangedPrice(invoice.BusinessType, invoice.Site, adj).ConfigureAwait(false); ls.AddRange(adjlist); } @@ -936,7 +936,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ if (adj.Any())//假如存在调整单 { - var adjlist = await ChangedPrice(invoice.BusinessType, adj).ConfigureAwait(false); + var adjlist = await ChangedPrice(invoice.BusinessType, invoice.Site, adj).ConfigureAwait(false); ls.AddRange(adjlist); } foreach (var itm1 in ls) @@ -1027,7 +1027,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ { if (adj.Any())//假如存在调整单 { - var adjlist = await ChangedPrice(invoice.BusinessType, adj).ConfigureAwait(false); + var adjlist = await ChangedPrice(invoice.BusinessType, invoice.Site, adj).ConfigureAwait(false); ls.AddRange(adjlist); } // 获取所属站点信息 @@ -1129,7 +1129,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ if (adj.Any())//假如存在调整单 { - var adjlist = await ChangedPrice(invoice.BusinessType, adj).ConfigureAwait(false); + var adjlist = await ChangedPrice(invoice.BusinessType, invoice.Site, adj).ConfigureAwait(false); ls.AddRange(adjlist); } @@ -1243,7 +1243,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ if (adj.Any())//假如存在调整单 { - var adjlist = await ChangedPrice(invoice.BusinessType, adj).ConfigureAwait(false); + var adjlist = await ChangedPrice(invoice.BusinessType, invoice.Site, adj).ConfigureAwait(false); ls.AddRange(adjlist); } foreach (var itm1 in ls) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/GenerateJisInvoiceService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/GenerateJisInvoiceService.cs index 501e5171..b9d8daa8 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/GenerateJisInvoiceService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/GenerateJisInvoiceService.cs @@ -533,7 +533,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs { dic.Add(itm.GroupNum, itm.Amt); copyDic.Add(itm.GroupNum, itm.Amt); - } Dictionary> invoiceMap = new Dictionary>(); var first = p_list.FirstOrDefault();