BoXu.Zheng
/
BeiJinSettleAccount
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

更新版本

master
学 赵 1 year ago
parent
bbe76e56eb
commit
496587e50f
1 changed files with 26 additions and 28 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 54
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs

54
code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs
View File

@ -189,9 +189,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
else if (invs.FirstOrDefault().BusinessType == EnumBusinessType.BeiJian) else if (invs.FirstOrDefault().BusinessType == EnumBusinessType.BeiJian)
{ {
var B = await _wRepository.GetListByFilterAsync(input.Filters, input.Sorting, int.MaxValue, input.SkipCount).ConfigureAwait(false); var B = await _wRepository.GetListByFilterAsync(input.Filters, input.Sorting, int.MaxValue, input.SkipCount).ConfigureAwait(false);
B.OrderBy(p => p.LineCode); B.OrderBy(p => p.LineCode);
List<INVOICE_WAIT_DETAIL_BJ_DTO> BMap = new List<INVOICE_WAIT_DETAIL_BJ_DTO>(); List<INVOICE_WAIT_DETAIL_BJ_DTO> BMap = new List<INVOICE_WAIT_DETAIL_BJ_DTO>();
foreach (var itm in B) foreach (var itm in B)
{ {
@ -225,32 +223,32 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
//var BMap = ObjectMapper.Map<List<INVOICE_WAIT_DETAIL>, List<INVOICE_WAIT_DETAIL_BJ_DTO>>(B); //var BMap = ObjectMapper.Map<List<INVOICE_WAIT_DETAIL>, List<INVOICE_WAIT_DETAIL_BJ_DTO>>(B);
var bjquery = from itm in BMap var bjquery = from itm in BMap
join itm1 in invs on itm.InvbillNum equals itm1.InvbillNum join itm1 in invs on itm.InvbillNum equals itm1.InvbillNum
join itm2 in materialList on itm.LU equals itm2.SettleMaterialCode into temp join itm2 in materialList on itm.LU equals itm2.SettleMaterialCode into temp
from tm in temp.DefaultIfEmpty() from tm in temp.DefaultIfEmpty()
select select
new INVOICE_WAIT_DETAIL_BJ_DTO() new INVOICE_WAIT_DETAIL_BJ_DTO()
{ {
PartDesc = tm == null ? string.Empty : itm.PartDesc, PartDesc = tm == null ? string.Empty : itm.PartDesc,
InvDate = itm1.CreationTime, InvDate = itm1.CreationTime,
RealInvbillNum = string.IsNullOrEmpty(itm1.RealnvBillNum) ? string.Empty : itm1.RealnvBillNum, RealInvbillNum = string.IsNullOrEmpty(itm1.RealnvBillNum) ? string.Empty : itm1.RealnvBillNum,
//Version = itm.Version, //Version = itm.Version,
InvbillNum = itm.InvbillNum, InvbillNum = itm.InvbillNum,
InvGroupNum = itm.InvGroupNum, InvGroupNum = itm.InvGroupNum,
LU = itm.LU, LU = itm.LU,
PartCode = itm.PartCode, PartCode = itm.PartCode,
PRICE = itm.PRICE, PRICE = itm.PRICE,
Qty = itm.Qty, Qty = itm.Qty,
Amt = itm.Amt, Amt = itm.Amt,
DeliveryNumber = itm.DeliveryNumber , DeliveryNumber = itm.DeliveryNumber,
VendorCode = itm.VendorCode , VendorCode = itm.VendorCode,
VendorName = itm.VendorName , VendorName = itm.VendorName,
// PurchaseOrderNumber = itm.PurchaseOrderNumber, // PurchaseOrderNumber = itm.PurchaseOrderNumber,
DeliveryIndexNumber =itm.DeliveryIndexNumber , DeliveryIndexNumber = itm.DeliveryIndexNumber,
Extend1 = itm.Extend1, Extend1 = itm.Extend1,
BeginDate = itm.BeginDate, BeginDate = itm.BeginDate,
EndDate = itm.EndDate, EndDate = itm.EndDate,
}; };
entity.INVOICE_WAIT_DETAIL_BJ = bjquery.ToList(); entity.INVOICE_WAIT_DETAIL_BJ = bjquery.ToList();
} }
else else

Write Preview
Loading…
Cancel
Save