|
|
@ -660,7 +660,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private async Task<List<T>> ChangedPrice<T>(EnumBusinessType businessType, List<PUB_ADJ_DETAIL> p_list) where T : SA_CAN_BASE, new() |
|
|
|
private async Task<List<T>> ChangedPrice<T>(EnumBusinessType businessType, string site,List<PUB_ADJ_DETAIL> p_list) where T : SA_CAN_BASE, new() |
|
|
|
{ |
|
|
|
List<PriceList> priceList = new List<PriceList>(); |
|
|
|
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<PUB_CAN_SA_DETAIL>(invoice.BusinessType, adj).ConfigureAwait(false); |
|
|
|
var adjlist= await ChangedPrice<PUB_CAN_SA_DETAIL>(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<BBAC_CAN_SA_DETAIL>(invoice.BusinessType, adj).ConfigureAwait(false); |
|
|
|
var adjlist = await ChangedPrice<BBAC_CAN_SA_DETAIL>(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<HBPO_CAN_SA_DETAIL>(invoice.BusinessType, adj).ConfigureAwait(false); |
|
|
|
var adjlist = await ChangedPrice<HBPO_CAN_SA_DETAIL>(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<PUB_CAN_SA_DETAIL>(invoice.BusinessType, adj).ConfigureAwait(false); |
|
|
|
var adjlist = await ChangedPrice<PUB_CAN_SA_DETAIL>(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<BBAC_CAN_SA_DETAIL>(invoice.BusinessType, adj).ConfigureAwait(false); |
|
|
|
var adjlist = await ChangedPrice<BBAC_CAN_SA_DETAIL>(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<HBPO_CAN_SA_DETAIL>(invoice.BusinessType, adj).ConfigureAwait(false); |
|
|
|
var adjlist = await ChangedPrice<HBPO_CAN_SA_DETAIL>(invoice.BusinessType, invoice.Site, adj).ConfigureAwait(false); |
|
|
|
ls.AddRange(adjlist); |
|
|
|
} |
|
|
|
foreach (var itm1 in ls) |
|
|
|