|
|
@ -2212,6 +2212,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers |
|
|
|
Qty = dto1.Qty, |
|
|
|
BeginDate = dto1.BeginDate, |
|
|
|
EndDate = dto1.EndDate, |
|
|
|
LineCode=dto1.LineCode, |
|
|
|
DeliveryNumber = inv1.GetProperty("DeliveryNumber", ""),//交货号
|
|
|
|
InvoiceNumber = inv1.GetProperty("InvoiceNumber", ""),//发票号
|
|
|
|
VendorCode = inv1.GetProperty("VendorCode", ""),//供应商代码
|
|
|
@ -2268,6 +2269,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers |
|
|
|
beginDate: detail.BeginDate, |
|
|
|
endDate: detail.EndDate, |
|
|
|
partcode: detail.PartCode); |
|
|
|
entity.LineCode = detail.LineCode; |
|
|
|
entity.SetProperty("DeliveryNumber", detail.DeliveryIndexNumber);//交货号
|
|
|
|
entity.SetProperty("VendorCode", detail.VendorCode);//供应商代码
|
|
|
|
entity.SetProperty("VendorName", detail.VendorName);//供应商名称
|
|
|
@ -2275,37 +2277,12 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers |
|
|
|
entity.SetProperty("DeliveryIndexNumber", "");//交付索引号
|
|
|
|
entity.SetProperty("PartName", "");//零件名称
|
|
|
|
|
|
|
|
_entityDetailList.Add( entity |
|
|
|
|
|
|
|
); |
|
|
|
_entityDetailList.Add(entity); |
|
|
|
} |
|
|
|
if (_entityDetailList.Count > 0) |
|
|
|
{ |
|
|
|
detailList.AddRange(_entityDetailList); |
|
|
|
} |
|
|
|
//var innotls = new List<INVOICE_NOT_SETTLE>();
|
|
|
|
//if (p_notlist != null && p_notlist.Count > 0)
|
|
|
|
//{
|
|
|
|
// var notls = p_notlist.GroupBy(p => new { p.GroupNum, p.LU }).Select(p => new { GroupNum = p.Key.GroupNum, LU = p.Key.LU, Qty = p.Sum(itm => itm.Qty) });
|
|
|
|
// foreach (var nitm in notls)
|
|
|
|
// {
|
|
|
|
// innotls.Add(new INVOICE_NOT_SETTLE(
|
|
|
|
// guid: GuidGenerator.Create(),
|
|
|
|
// version: p_version,
|
|
|
|
// invGroupNum: p_InvGroupNum,
|
|
|
|
// settleGroupNum: nitm.GroupNum,
|
|
|
|
// lU: string.Empty,
|
|
|
|
// lU1: nitm.LU,
|
|
|
|
// extend1: string.Empty,
|
|
|
|
// extend2: string.Empty,
|
|
|
|
// qty: nitm.Qty
|
|
|
|
// ));
|
|
|
|
// }
|
|
|
|
// if (innotls.Count > 0)
|
|
|
|
// {
|
|
|
|
// notDetialList.AddRange(innotls);
|
|
|
|
// }
|
|
|
|
//}
|
|
|
|
var invbill = new INVOICE_GRP |
|
|
|
(guid: GuidGenerator.Create(), |
|
|
|
realnvBillNum: string.Empty, |
|
|
|