|
|
@ -1304,7 +1304,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers |
|
|
|
var adjdetails = p_adjlist.Where(p => ls.Contains(p.GroupNum)).ToList(); |
|
|
|
foreach (var detail in adjdetails) |
|
|
|
{ |
|
|
|
|
|
|
|
detail.InvBillNum = key; |
|
|
|
adjlist.Add(detail); |
|
|
|
} |
|
|
@ -1627,7 +1626,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers |
|
|
|
on new { LU = itm.LU, itm.PartCode, itm.BeginDate, itm.EndDate } equals new { itm1.LU, itm1.PartCode, itm1.BeginDate, itm1.EndDate } |
|
|
|
join itm2 in p_adjlist on new { itm.LU, itm.SettleDate } equals new { itm2.LU, itm2.SettleDate } |
|
|
|
select itm2; |
|
|
|
|
|
|
|
foreach (var itm in query1) |
|
|
|
{ |
|
|
|
itm.InvBillNum = key; |
|
|
@ -1656,16 +1654,13 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers |
|
|
|
{ |
|
|
|
groupList.AddRange(mapList); |
|
|
|
} |
|
|
|
|
|
|
|
if (p_first == true) |
|
|
|
{ |
|
|
|
|
|
|
|
var settleBillnum = string.Empty; |
|
|
|
|
|
|
|
if (businessType == EnumBusinessType.ZhiGongJianHBPO) |
|
|
|
{ |
|
|
|
var mng = await _pubMng.GetMainAsync(p_InvGroupNum); |
|
|
|
settleBillnum=mng.SettleBillNum; |
|
|
|
var mng = await _pubMng.GetMainAsync(p_InvGroupNum); |
|
|
|
settleBillnum = mng.SettleBillNum; |
|
|
|
var notsettle = _nothbpoRepository.Where(p => p.SettleBillNum == settleBillnum);//一次开票时查找不可结数据,追加需求
|
|
|
|
if (notsettle != null && notsettle.Count() > 0) |
|
|
|
{ |
|
|
@ -1751,7 +1746,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers |
|
|
|
if (p_first == true) |
|
|
|
{ |
|
|
|
var notsettle = _nothbpoRepository.Where(p => p.SettleBillNum == p_InvGroupNum);//一次开票时查找不可结数据,追加需求
|
|
|
|
|
|
|
|
if (notsettle != null && notsettle.Count() > 0) |
|
|
|
{ |
|
|
|
var innotls = new List<INVOICE_NOT_SETTLE>(); |
|
|
@ -1894,7 +1888,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers |
|
|
|
var invlist = new List<INVOICE_GRP>(); |
|
|
|
var salist = new List<TDetail>(); |
|
|
|
var adjlist = new List<PUB_ADJ_DETAIL>(); |
|
|
|
|
|
|
|
foreach (var itm in invoiceMap)//分组影响和
|
|
|
|
{ |
|
|
|
var key = itm.Key;//发票票号
|
|
|
|