|
|
@ -164,28 +164,28 @@ namespace Win.Sfs.SettleAccount.Bases |
|
|
|
var wquery = from itm in AMap |
|
|
|
join itm1 in invs on itm.InvbillNum equals itm1.InvbillNum |
|
|
|
join itm2 in materialList on itm.LU equals itm2.SettleMaterialCode into temp |
|
|
|
select from tm in temp.DefaultIfEmpty() |
|
|
|
select |
|
|
|
new INVOICE_WAIT_DETAIL_BBAC_DTO() |
|
|
|
{ |
|
|
|
|
|
|
|
PartDesc=tm==null?string.Empty:itm.PartDesc, |
|
|
|
InvDate = itm1.CreationTime, |
|
|
|
RealInvbillNum = string.IsNullOrEmpty(itm1.RealnvBillNum) ? string.Empty : itm1.RealnvBillNum, |
|
|
|
Version = itm.Version, |
|
|
|
InvbillNum = itm.InvbillNum, |
|
|
|
InvGroupNum = itm.InvGroupNum, |
|
|
|
LU = itm.LU, |
|
|
|
PartCode = itm.PartCode, |
|
|
|
PRICE = itm.PRICE, |
|
|
|
Qty = itm.Qty, |
|
|
|
Amt = itm.Amt, |
|
|
|
BussiessType = itm.BussiessType, |
|
|
|
Extend1 = itm.Extend1, |
|
|
|
BeginDate = itm.BeginDate, |
|
|
|
EndDate = itm.EndDate, |
|
|
|
}; |
|
|
|
entity.INVOICE_WAIT_DETAIL_BBAC = AMap; |
|
|
|
from tm in temp.DefaultIfEmpty() |
|
|
|
select |
|
|
|
new INVOICE_WAIT_DETAIL_BBAC_DTO() |
|
|
|
{ |
|
|
|
|
|
|
|
PartDesc = tm == null ? string.Empty : itm.PartDesc, |
|
|
|
InvDate = itm1.CreationTime, |
|
|
|
RealInvbillNum = string.IsNullOrEmpty(itm1.RealnvBillNum) ? string.Empty : itm1.RealnvBillNum, |
|
|
|
Version = itm.Version, |
|
|
|
InvbillNum = itm.InvbillNum, |
|
|
|
InvGroupNum = itm.InvGroupNum, |
|
|
|
LU = itm.LU, |
|
|
|
PartCode = itm.PartCode, |
|
|
|
PRICE = itm.PRICE, |
|
|
|
Qty = itm.Qty, |
|
|
|
Amt = itm.Amt, |
|
|
|
BussiessType = itm.BussiessType, |
|
|
|
Extend1 = itm.Extend1, |
|
|
|
BeginDate = itm.BeginDate, |
|
|
|
EndDate = itm.EndDate, |
|
|
|
}; |
|
|
|
entity.INVOICE_WAIT_DETAIL_BBAC = wquery.ToList(); |
|
|
|
} |
|
|
|
else if (invs.FirstOrDefault().BusinessType == EnumBusinessType.BeiJian) |
|
|
|
{ |
|
|
@ -195,7 +195,7 @@ namespace Win.Sfs.SettleAccount.Bases |
|
|
|
var wquery = from itm in BMap |
|
|
|
join itm1 in invs on itm.InvbillNum equals itm1.InvbillNum |
|
|
|
join itm2 in materialList on itm.LU equals itm2.SettleMaterialCode into temp |
|
|
|
select from tm in temp.DefaultIfEmpty() |
|
|
|
from tm in temp.DefaultIfEmpty() |
|
|
|
select |
|
|
|
new INVOICE_WAIT_DETAIL_BJ_DTO() |
|
|
|
{ |
|
|
@ -215,7 +215,7 @@ namespace Win.Sfs.SettleAccount.Bases |
|
|
|
BeginDate = itm.BeginDate, |
|
|
|
EndDate = itm.EndDate, |
|
|
|
}; |
|
|
|
entity.INVOICE_WAIT_DETAIL_BJ = BMap; |
|
|
|
entity.INVOICE_WAIT_DETAIL_BJ = wquery.ToList(); |
|
|
|
} |
|
|
|
else |
|
|
|
{ |
|
|
@ -224,7 +224,7 @@ namespace Win.Sfs.SettleAccount.Bases |
|
|
|
var wquery = from itm in wdtos |
|
|
|
join itm1 in invs on itm.InvbillNum equals itm1.InvbillNum |
|
|
|
join itm2 in materialList on itm.LU equals itm2.SettleMaterialCode into temp |
|
|
|
select from tm in temp.DefaultIfEmpty() |
|
|
|
from tm in temp.DefaultIfEmpty() |
|
|
|
select |
|
|
|
new INVOICE_WAIT_DETAIL_DTO() |
|
|
|
{ |
|
|
@ -550,7 +550,7 @@ namespace Win.Sfs.SettleAccount.Bases |
|
|
|
var inner = from d in dto1s |
|
|
|
join p in p_pricelist on d.LU equals p.LU |
|
|
|
where |
|
|
|
d.SettleDate >= p.BeginTime && d.SettleDate <= p.EndTime |
|
|
|
d.SettleDate >= p.BeginTime && d.SettleDate <= p.EndTime && d.Site==p.ClientCode && p.IsCancel==false |
|
|
|
select d; |
|
|
|
var left = from d in dto1s |
|
|
|
join p in inner on new { d.LU, d.PN } equals new { p.LU, p.PN } |
|
|
|