|
@ -454,19 +454,16 @@ namespace Win.Sfs.SettleAccount.Entities.BQ |
|
|
ls.Add(invnot); |
|
|
ls.Add(invnot); |
|
|
} |
|
|
} |
|
|
var entity= nolist.FirstOrDefault(); |
|
|
var entity= nolist.FirstOrDefault(); |
|
|
var disList = lsC.Select(p => p.SettleGroupNum).Distinct().ToList(); |
|
|
var disList = mgroup.Select(p => p.SettleGroupNum).Distinct().ToList(); |
|
|
|
|
|
|
|
|
for (int i = 0; i < disList.Count; i++) |
|
|
|
|
|
{ |
|
|
|
|
|
ls[i].SettleGroupNum = disList[i]; |
|
|
|
|
|
} |
|
|
|
|
|
for (int i = 0; i < lineC; i++) |
|
|
for (int i = 0; i < lineC; i++) |
|
|
{ |
|
|
{ |
|
|
ls[i].RealInvBillNum = entity.RealInvBillNum; |
|
|
ls[i].RealInvBillNum = entity.RealInvBillNum; |
|
|
ls[i].InvDate = entity.InvDate; |
|
|
ls[i].InvDate = entity.InvDate; |
|
|
ls[i].InvBillNum = entity.InvBillNum; |
|
|
ls[i].InvBillNum = entity.InvBillNum; |
|
|
ls[i].InvGroupNum = entity.InvGroupNum; |
|
|
ls[i].InvGroupNum = entity.InvGroupNum; |
|
|
ls[i].SettleGroupNum = entity.SettleGroupNum; |
|
|
// ls[i].SettleGroupNum = entity.SettleGroupNum;
|
|
|
ls[i].SettleLU = lsC[i].LU; |
|
|
ls[i].SettleLU = lsC[i].LU; |
|
|
ls[i].SettleQty = lsC[i].Qty == null ? string.Empty : lsC[i].Qty.ToString(); |
|
|
ls[i].SettleQty = lsC[i].Qty == null ? string.Empty : lsC[i].Qty.ToString(); |
|
|
} |
|
|
} |
|
@ -476,11 +473,17 @@ namespace Win.Sfs.SettleAccount.Entities.BQ |
|
|
ls[i].InvDate = entity.InvDate; |
|
|
ls[i].InvDate = entity.InvDate; |
|
|
ls[i].InvBillNum = entity.InvBillNum; |
|
|
ls[i].InvBillNum = entity.InvBillNum; |
|
|
ls[i].InvGroupNum = entity.InvGroupNum; |
|
|
ls[i].InvGroupNum = entity.InvGroupNum; |
|
|
ls[i].SettleGroupNum = entity.SettleGroupNum; |
|
|
// ls[i].SettleGroupNum = entity.SettleGroupNum;
|
|
|
ls[i].NotSettleLU = lsN[i].LU; |
|
|
ls[i].NotSettleLU = lsN[i].LU; |
|
|
ls[i].Qty = lsN[i].Qty == null ? string.Empty : lsN[i].Qty.ToString(); |
|
|
ls[i].Qty = lsN[i].Qty == null ? string.Empty : lsN[i].Qty.ToString(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
for (int i = 0; i < disList.Count; i++) |
|
|
|
|
|
{ |
|
|
|
|
|
ls[i].SettleGroupNum = disList[i]; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//if (lineC > lineN)//可结大于不可结行数时
|
|
|
//if (lineC > lineN)//可结大于不可结行数时
|
|
|