|
|
|
@ -76,16 +76,16 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers |
|
|
|
{ |
|
|
|
} |
|
|
|
|
|
|
|
public virtual async Task<bool> SetForwardState(string p_groupBillnum, SettleBillState p_State) |
|
|
|
{ |
|
|
|
var _first = _repository.Where(p => p.InvbillNum == p_groupBillnum).FirstOrDefault(); |
|
|
|
if (_first != null) |
|
|
|
{ |
|
|
|
return await SetForwardState(_first, p_State); |
|
|
|
} |
|
|
|
return false; |
|
|
|
//public virtual async Task<bool> SetForwardState(string p_groupBillnum, SettleBillState p_State)
|
|
|
|
//{
|
|
|
|
// var _first = _repository.Where(p => p.InvbillNum == p_groupBillnum).FirstOrDefault();
|
|
|
|
// if (_first != null)
|
|
|
|
// {
|
|
|
|
// return await SetForwardState(_first, p_State);
|
|
|
|
// }
|
|
|
|
// return false;
|
|
|
|
|
|
|
|
} |
|
|
|
//}
|
|
|
|
|
|
|
|
private async Task<bool> SetSettleState(INVOICE_GRP p_entiy, SettleBillState p_State, bool IsForward = true) |
|
|
|
{ |
|
|
|
@ -140,67 +140,99 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers |
|
|
|
return false; |
|
|
|
} |
|
|
|
/// <summary>
|
|
|
|
/// 向前流程
|
|
|
|
/// 发票向前流程
|
|
|
|
/// </summary>
|
|
|
|
/// <param name="p_entiy"></param>
|
|
|
|
/// <param name="invs"></param>
|
|
|
|
/// <param name="p_State"></param>
|
|
|
|
/// <returns></returns>
|
|
|
|
/// <exception cref="BusinessException"></exception>
|
|
|
|
public virtual async Task<bool> SetForwardState(INVOICE_GRP p_entiy, SettleBillState p_State) |
|
|
|
public virtual async Task<bool> SetForwardState(List<string> p_invs, SettleBillState p_State) |
|
|
|
{ |
|
|
|
if (p_entiy.InvoiceState == InvoiceBillState.报废) |
|
|
|
{ |
|
|
|
throw new BusinessException("8989", "当前发票已报废不能进行操作"); |
|
|
|
} |
|
|
|
|
|
|
|
var state = p_State; |
|
|
|
switch (p_State) |
|
|
|
List<string> errors = new List<string>(); |
|
|
|
var appls = _repository.Where(p => p_invs.Contains(p.InvbillNum)).ToList(); |
|
|
|
if (appls.Count > 0) |
|
|
|
{ |
|
|
|
case SettleBillState.财务已审核: |
|
|
|
if (p_entiy.State == SettleBillState.商务已审核) |
|
|
|
{ |
|
|
|
var count = appls.Select(p => p.State).Distinct().Count(); |
|
|
|
if (count > 1) |
|
|
|
{ |
|
|
|
throw new UserFriendlyException($"提交发票状态不一致"); |
|
|
|
} |
|
|
|
|
|
|
|
p_entiy.State = state; |
|
|
|
} |
|
|
|
else |
|
|
|
{ |
|
|
|
throw new BusinessException("8989", "当前状态不是【商务已审核】,无法设置成【财务已审核】状态"); |
|
|
|
} |
|
|
|
break; |
|
|
|
case SettleBillState.商务已审核: |
|
|
|
if (p_entiy.State == SettleBillState.已开票) |
|
|
|
{ |
|
|
|
p_entiy.State = state; |
|
|
|
} |
|
|
|
else |
|
|
|
{ |
|
|
|
throw new BusinessException("8989", "当前状态不是【已开票】状态,无法设置成【商务已审核】"); |
|
|
|
} |
|
|
|
break; |
|
|
|
case SettleBillState.已扣减: |
|
|
|
if (p_entiy.State == SettleBillState.客户已收票) |
|
|
|
{ |
|
|
|
p_entiy.State = state; |
|
|
|
} |
|
|
|
else |
|
|
|
{ |
|
|
|
throw new BusinessException("8989", "当前状态不是【客户已收票】状态,无法设置成【已扣减】状态"); |
|
|
|
} |
|
|
|
break; |
|
|
|
} |
|
|
|
var flag = await SetSettleState(p_entiy, p_State, true); |
|
|
|
if (flag == true) |
|
|
|
{ |
|
|
|
var invlist = await _repository.Where(p => p.InvGroupNum == p_entiy.InvGroupNum).ToListAsync();//选择审批时只能整组审批
|
|
|
|
foreach (var itm in invlist) |
|
|
|
var nols = appls.Where(p => p.InvoiceState == InvoiceBillState.报废 || p.State == SettleBillState.客户已收票).ToList(); |
|
|
|
if (nols.Count > 0) |
|
|
|
{ |
|
|
|
itm.State = p_entiy.State; |
|
|
|
var invs = nols.Select(p => p.InvbillNum); |
|
|
|
throw new UserFriendlyException($"选择发票{string.Join("，", invs)}已报废或者已收票不能进行操作"); |
|
|
|
} |
|
|
|
await _repository.BatchUpdateAsync(invlist); |
|
|
|
var state = p_State; |
|
|
|
switch (p_State) |
|
|
|
{ |
|
|
|
case SettleBillState.财务已审核: |
|
|
|
foreach (var inv in appls) |
|
|
|
{ |
|
|
|
if (inv.State == SettleBillState.商务已审核) |
|
|
|
{ |
|
|
|
|
|
|
|
inv.State = state; |
|
|
|
} |
|
|
|
else |
|
|
|
{ |
|
|
|
errors.Add(inv.InvbillNum); |
|
|
|
} |
|
|
|
} |
|
|
|
if (errors.Count > 0) |
|
|
|
{ |
|
|
|
throw new UserFriendlyException($"发票{string.Join(",", errors)}当前状态不是【商务已审核】,无法设置成【财务已审核】状态"); |
|
|
|
} |
|
|
|
break; |
|
|
|
case SettleBillState.商务已审核: |
|
|
|
|
|
|
|
foreach (var inv in appls) |
|
|
|
{ |
|
|
|
if (inv.State == SettleBillState.已开票) |
|
|
|
{ |
|
|
|
|
|
|
|
inv.State = state; |
|
|
|
} |
|
|
|
else |
|
|
|
{ |
|
|
|
errors.Add(inv.InvbillNum); |
|
|
|
} |
|
|
|
} |
|
|
|
if (errors.Count > 0) |
|
|
|
{ |
|
|
|
throw new UserFriendlyException($"发票{string.Join(",", errors)}当前状态不是【已开票】,无法设置成【商务已审核】状态"); |
|
|
|
} |
|
|
|
break; |
|
|
|
case SettleBillState.已扣减: |
|
|
|
foreach (var inv in appls) |
|
|
|
{ |
|
|
|
|
|
|
|
if (inv.State == SettleBillState.客户已收票) |
|
|
|
{ |
|
|
|
|
|
|
|
inv.State = state; |
|
|
|
} |
|
|
|
else |
|
|
|
{ |
|
|
|
errors.Add(inv.InvbillNum); |
|
|
|
} |
|
|
|
} |
|
|
|
if (errors.Count > 0) |
|
|
|
{ |
|
|
|
throw new UserFriendlyException($"发票{string.Join(",", errors)}当前状态不是【客户已收票】,无法设置成【已扣减】状态"); |
|
|
|
} |
|
|
|
break; |
|
|
|
} |
|
|
|
|
|
|
|
await _repository.BatchUpdateAsync(appls); |
|
|
|
|
|
|
|
return true; |
|
|
|
} |
|
|
|
return false; |
|
|
|
else |
|
|
|
{ |
|
|
|
throw new UserFriendlyException($"选择发票不存在"); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
@ -210,58 +242,94 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers |
|
|
|
/// <param name="p_State"></param>
|
|
|
|
/// <returns></returns>
|
|
|
|
/// <exception cref="BusinessException"></exception>
|
|
|
|
public virtual async Task<bool> SetBackwardState(INVOICE_GRP p_entiy, SettleBillState p_State) |
|
|
|
public virtual async Task<bool> SetBackwardState(List<string> p_invs, SettleBillState p_State) |
|
|
|
{ |
|
|
|
var state = p_State; |
|
|
|
switch (state) |
|
|
|
|
|
|
|
List<string> errors = new List<string>(); |
|
|
|
var appls = _repository.Where(p => p_invs.Contains(p.InvbillNum)).ToList(); |
|
|
|
if (appls.Count > 0) |
|
|
|
{ |
|
|
|
case SettleBillState.商务已审核: |
|
|
|
if (p_entiy.State == SettleBillState.财务已审核) |
|
|
|
{ |
|
|
|
p_entiy.State = state; |
|
|
|
} |
|
|
|
else |
|
|
|
{ |
|
|
|
throw new BusinessException("8989", "当前状态不是【财务已审核】,无法设置成【商务已审核】状态"); |
|
|
|
} |
|
|
|
break; |
|
|
|
case SettleBillState.已开票: |
|
|
|
if (p_entiy.State == SettleBillState.商务已审核) |
|
|
|
{ |
|
|
|
p_entiy.State = state; |
|
|
|
} |
|
|
|
else |
|
|
|
{ |
|
|
|
throw new BusinessException("8989", "当前状态不是【商务已审核】状态,无法设置成【已开票】"); |
|
|
|
} |
|
|
|
break; |
|
|
|
case SettleBillState.客户已收票: |
|
|
|
if (p_entiy.State == SettleBillState.已扣减) |
|
|
|
{ |
|
|
|
p_entiy.State = state; |
|
|
|
} |
|
|
|
else |
|
|
|
{ |
|
|
|
throw new BusinessException("8989", "当前状态不是【已扣减】状态,无法设置成【客户已收票】状态"); |
|
|
|
} |
|
|
|
break; |
|
|
|
} |
|
|
|
//var flag = await SetSettleState(p_entiy, p_State, false);
|
|
|
|
var count = appls.Select(p => p.State).Distinct().Count(); |
|
|
|
if (count > 1) |
|
|
|
{ |
|
|
|
throw new UserFriendlyException($"提交发票状态不一致"); |
|
|
|
} |
|
|
|
var nols = appls.Where(p => p.InvoiceState == InvoiceBillState.报废 || p.State == SettleBillState.客户已收票).ToList(); |
|
|
|
if (nols.Count > 0) |
|
|
|
{ |
|
|
|
var invs = nols.Select(p => p.InvbillNum); |
|
|
|
throw new UserFriendlyException($"选择发票{string.Join("，", invs)}已报废或者已收票不能进行操作"); |
|
|
|
} |
|
|
|
var state = p_State; |
|
|
|
switch (p_State) |
|
|
|
{ |
|
|
|
case SettleBillState.商务已审核: |
|
|
|
foreach (var inv in appls) |
|
|
|
{ |
|
|
|
if (inv.State == SettleBillState.财务已审核) |
|
|
|
{ |
|
|
|
|
|
|
|
inv.State = state; |
|
|
|
} |
|
|
|
else |
|
|
|
{ |
|
|
|
errors.Add(inv.InvbillNum); |
|
|
|
} |
|
|
|
} |
|
|
|
if (errors.Count > 0) |
|
|
|
{ |
|
|
|
throw new UserFriendlyException($"发票{string.Join(",", errors)}当前状态不是【财务已审核】,无法设置成【商务已审核】状态"); |
|
|
|
} |
|
|
|
break; |
|
|
|
case SettleBillState.已开票: |
|
|
|
|
|
|
|
//if (flag == true)
|
|
|
|
//{
|
|
|
|
// var invlist = await _repository.Where(p => p.InvGroupNum == p_entiy.InvGroupNum).ToListAsync();//选择审批时只能整组审批
|
|
|
|
// foreach (var itm in invlist)
|
|
|
|
// {
|
|
|
|
// itm.State = p_entiy.State;
|
|
|
|
// }
|
|
|
|
foreach (var inv in appls) |
|
|
|
{ |
|
|
|
if (inv.State == SettleBillState.商务已审核) |
|
|
|
{ |
|
|
|
|
|
|
|
inv.State = state; |
|
|
|
} |
|
|
|
else |
|
|
|
{ |
|
|
|
errors.Add(inv.InvbillNum); |
|
|
|
} |
|
|
|
} |
|
|
|
if (errors.Count > 0) |
|
|
|
{ |
|
|
|
throw new UserFriendlyException($"发票{string.Join(",", errors)}当前状态不是【商务已审核】,无法设置成【已开票】状态"); |
|
|
|
} |
|
|
|
break; |
|
|
|
case SettleBillState.客户已收票: |
|
|
|
foreach (var inv in appls) |
|
|
|
{ |
|
|
|
|
|
|
|
await _repository.BatchUpdateAsync(p_entiy); |
|
|
|
if (inv.State == SettleBillState.已扣减) |
|
|
|
{ |
|
|
|
|
|
|
|
inv.State = state; |
|
|
|
} |
|
|
|
else |
|
|
|
{ |
|
|
|
errors.Add(inv.InvbillNum); |
|
|
|
} |
|
|
|
} |
|
|
|
if (errors.Count > 0) |
|
|
|
{ |
|
|
|
throw new UserFriendlyException($"发票{string.Join(",", errors)}当前状态不是【已扣减】,无法设置成【客户已收票】状态"); |
|
|
|
} |
|
|
|
break; |
|
|
|
} |
|
|
|
|
|
|
|
await _repository.BatchUpdateAsync(appls); |
|
|
|
|
|
|
|
return true; |
|
|
|
//}
|
|
|
|
} |
|
|
|
else |
|
|
|
{ |
|
|
|
throw new UserFriendlyException($"选择发票不存在"); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -316,16 +384,12 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers |
|
|
|
{ |
|
|
|
throw new UserFriendlyException($"发票不属于一个发票分组"); |
|
|
|
} |
|
|
|
var lostlist = invList.Where(p => p.InvoiceState == InvoiceBillState.报废).ToList(); |
|
|
|
var lostlist = invList.Where(p => p.InvoiceState == InvoiceBillState.报废 || p.State ==SettleBillState.客户已收票).ToList(); |
|
|
|
if (lostlist.Count > 0) |
|
|
|
{ |
|
|
|
var invs=lostlist.Select(p => p.InvbillNum).ToList(); |
|
|
|
throw new UserFriendlyException($"发票{string.Join(",",invs)}"); |
|
|
|
throw new UserFriendlyException($"发票{string.Join(",",invs)}已经报废或客户已收票!"); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var inv = invList.FirstOrDefault(); |
|
|
|
if (inv.BusinessType == EnumBusinessType.JisBBAC) |
|
|
|
{ |
|
|
|
@ -350,8 +414,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers |
|
|
|
oldlist = pdoldlist.Select(p => p.BillNum).ToList();//已经存在扣减记录，的发票号
|
|
|
|
} |
|
|
|
newlist = p_invs.Where(p => !oldlist.Contains(p)).ToList();//不存在扣减记录的发票号
|
|
|
|
|
|
|
|
|
|
|
|
List<BBAC_CAN_SA_DETAIL> entityList = new List<BBAC_CAN_SA_DETAIL>();//结算明细
|
|
|
|
var namelist = invList.Select(p => p.InvbillNum).ToList(); |
|
|
|
if (oldlist.Count > 0) |
|
|
|
@ -381,7 +443,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers |
|
|
|
groupNum: itm.GroupNum, |
|
|
|
invGroupNum: itm.InvGroupNum, |
|
|
|
contactid: itm.Extend1,//生产号
|
|
|
|
invbillnum: itm.InvBillNum |
|
|
|
invbillnum: itm.InvBillNum, |
|
|
|
partcode:itm.PartCode |
|
|
|
|
|
|
|
)); |
|
|
|
} |
|
|
|
@ -413,16 +476,13 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers |
|
|
|
groupNum: itm.GroupNum, |
|
|
|
invGroupNum: itm.InvGroupNum, |
|
|
|
contactid: itm.Extend1,//生产号
|
|
|
|
invbillnum: itm.InvBillNum |
|
|
|
|
|
|
|
|
|
|
|
invbillnum: itm.InvBillNum, |
|
|
|
partcode:itm.PartCode |
|
|
|
)); |
|
|
|
} |
|
|
|
} |
|
|
|
entityList.AddRange(entityDetail); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
var bbacmainlist = new List<BBAC_PD>(); |
|
|
|
foreach (var itm in invList) |
|
|
|
{ |
|
|
|
@ -465,8 +525,12 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers |
|
|
|
} |
|
|
|
await _repository.DbContext.BulkInsertAsync(bbacmainlist); |
|
|
|
await _repository.DbContext.BulkInsertAsync(bbacDetail); |
|
|
|
foreach (var itm in invList) |
|
|
|
{ |
|
|
|
itm.State = SettleBillState.客户已收票; |
|
|
|
}; |
|
|
|
await _repository.DbContext.BulkUpdateAsync(invList); |
|
|
|
return true; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -523,7 +587,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers |
|
|
|
settleDate: itm.SettleDate, |
|
|
|
groupNum: itm.GroupNum, |
|
|
|
invGroupNum: itm.InvGroupNum, |
|
|
|
invbillnum: itm.InvBillNum |
|
|
|
invbillnum: itm.InvBillNum, |
|
|
|
partcode:itm.PartCode |
|
|
|
|
|
|
|
|
|
|
|
)); |
|
|
|
} |
|
|
|
@ -553,14 +619,14 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers |
|
|
|
settleDate: itm.SettleDate, |
|
|
|
groupNum: itm.GroupNum, |
|
|
|
invGroupNum: itm.InvGroupNum, |
|
|
|
invbillnum: itm.InvBillNum |
|
|
|
invbillnum: itm.InvBillNum, |
|
|
|
partcode: itm.PartCode |
|
|
|
|
|
|
|
)); |
|
|
|
} |
|
|
|
} |
|
|
|
entityList.AddRange(entityDetail); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
var bbacmainlist = new List<HBPO_PD>(); |
|
|
|
foreach (var itm in invList) |
|
|
|
{ |
|
|
|
@ -603,6 +669,12 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers |
|
|
|
} |
|
|
|
await _repository.DbContext.BulkInsertAsync(bbacmainlist); |
|
|
|
await _repository.DbContext.BulkInsertAsync(bbacDetail); |
|
|
|
foreach (var itm in invList) |
|
|
|
{ |
|
|
|
itm.State = SettleBillState.客户已收票; |
|
|
|
}; |
|
|
|
|
|
|
|
await _repository.DbContext.BulkUpdateAsync(invList); |
|
|
|
return true; |
|
|
|
} |
|
|
|
else |
|
|
|
@ -656,7 +728,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers |
|
|
|
settleDate: itm.SettleDate, |
|
|
|
groupNum: itm.GroupNum, |
|
|
|
invGroupNum: itm.InvGroupNum, |
|
|
|
invbillnum: itm.InvBillNum |
|
|
|
invbillnum: itm.InvBillNum, |
|
|
|
partcode:itm.PartCode |
|
|
|
|
|
|
|
|
|
|
|
)); |
|
|
|
} |
|
|
|
@ -686,7 +760,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers |
|
|
|
settleDate: itm.SettleDate, |
|
|
|
groupNum: itm.GroupNum, |
|
|
|
invGroupNum: itm.InvGroupNum, |
|
|
|
invbillnum: itm.InvBillNum |
|
|
|
invbillnum: itm.InvBillNum, |
|
|
|
partcode: itm.PartCode |
|
|
|
)); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -737,10 +812,17 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers |
|
|
|
} |
|
|
|
await _repository.DbContext.BulkInsertAsync(bbacmainlist); |
|
|
|
await _repository.DbContext.BulkInsertAsync(bbacDetail); |
|
|
|
|
|
|
|
foreach (var itm in invList) |
|
|
|
{ |
|
|
|
itm.State = SettleBillState.客户已收票; |
|
|
|
}; |
|
|
|
await _repository.DbContext.BulkUpdateAsync(invList); |
|
|
|
|
|
|
|
return true; |
|
|
|
|
|
|
|
} |
|
|
|
return false; |
|
|
|
|
|
|
|
} |
|
|
|
public virtual async Task<bool> Reject(INVOICE_GRP p_entity) |
|
|
|
{ |
|
|
|
@ -751,19 +833,34 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers |
|
|
|
return false; |
|
|
|
} |
|
|
|
/// <summary>
|
|
|
|
/// 退回
|
|
|
|
/// 同一退回
|
|
|
|
/// </summary>
|
|
|
|
/// <param name="billNum">发票分组号</param>
|
|
|
|
/// <returns></returns>
|
|
|
|
public virtual async Task<bool> Reject(string groupbillNum) |
|
|
|
{ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var ls = await _repository.Where(p => p.InvGroupNum == groupbillNum).ToListAsync(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (ls != null && ls.Count > 0) |
|
|
|
{ |
|
|
|
var count=ls.Select(p => p.State).Distinct().Count(); |
|
|
|
if (count > 1) |
|
|
|
{ |
|
|
|
throw new UserFriendlyException($"发票分组{groupbillNum}包含发票不是同一状态不能退回"); |
|
|
|
} |
|
|
|
var first = ls.FirstOrDefault(); |
|
|
|
if (first.State == SettleBillState.客户已收票 || first.State == SettleBillState.已扣减) |
|
|
|
{ |
|
|
|
throw new BusinessException("8989", $"发票分组{groupbillNum}客户已经是客户已收票或已扣减状态不能退回"); |
|
|
|
throw new UserFriendlyException( $"发票分组{groupbillNum}客户已经是客户已收票不能退回"); |
|
|
|
} |
|
|
|
foreach (var p_entity in ls) |
|
|
|
{ |
|
|
|
@ -1043,8 +1140,12 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers |
|
|
|
invGroupNum: p_InvGroupNum, |
|
|
|
state: SettleBillState.已开票, |
|
|
|
invoiceBillState: InvoiceBillState.正常, |
|
|
|
tax: 0, |
|
|
|
parent: p_parentInvBillNum |
|
|
|
tax: 0, |
|
|
|
parent: p_parentInvBillNum, |
|
|
|
preTaxDiff: 0, |
|
|
|
taxDiff: 0, |
|
|
|
clientCode: string.Empty, |
|
|
|
realAmt: 0 |
|
|
|
); |
|
|
|
invlist.Add(invbill); |
|
|
|
} |
|
|
|
@ -1191,7 +1292,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers |
|
|
|
itm.InvbillNum = key; |
|
|
|
salist.Add(itm); |
|
|
|
} |
|
|
|
if (!string.IsNullOrEmpty(p_parentInvBillNum)) |
|
|
|
if (!string.IsNullOrEmpty(p_parentInvBillNum))//发票作废开票
|
|
|
|
{ |
|
|
|
var query1 = from itm in dtos |
|
|
|
join itm1 in ls |
|
|
|
@ -1270,7 +1371,12 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers |
|
|
|
state: SettleBillState.已开票, |
|
|
|
invoiceBillState: InvoiceBillState.正常, |
|
|
|
tax: 0, |
|
|
|
parent: p_parentInvBillNum |
|
|
|
parent: p_parentInvBillNum, |
|
|
|
preTaxDiff:0, |
|
|
|
taxDiff:0, |
|
|
|
clientCode:string.Empty, |
|
|
|
realAmt:0 |
|
|
|
|
|
|
|
); |
|
|
|
invlist.Add(invbill); |
|
|
|
} |
|
|
|
@ -1480,7 +1586,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers |
|
|
|
state: SettleBillState.已开票, |
|
|
|
invoiceBillState: InvoiceBillState.正常, |
|
|
|
tax: 0, |
|
|
|
parent: string.Empty |
|
|
|
parent: string.Empty, |
|
|
|
preTaxDiff: 0, |
|
|
|
taxDiff: 0, |
|
|
|
clientCode: string.Empty, |
|
|
|
realAmt: 0 |
|
|
|
); |
|
|
|
invlist.Add(invbill); |
|
|
|
} |
|
|
|
|
