Browse Source

更新版本

master
zhaoxinyu 11 months ago
parent
commit
bb6038daf6
  1. 3
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs
  2. 2
      code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs

3
code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs

@ -805,6 +805,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
var adjs = await _adjRepository.GetListByFilterAsync(input.Filters).ConfigureAwait(false);//调整数据 var adjs = await _adjRepository.GetListByFilterAsync(input.Filters).ConfigureAwait(false);//调整数据
var adjdtos = ObjectMapper.Map<List<PUB_ADJ_DETAIL>, List<PUB_ADJ_DETAIL_DTO>>(adjs);//调整数据DTO var adjdtos = ObjectMapper.Map<List<PUB_ADJ_DETAIL>, List<PUB_ADJ_DETAIL_DTO>>(adjs);//调整数据DTO
var notquery = from itm in sdtos var notquery = from itm in sdtos
join itm1 in invs on itm.InvBillNum equals itm1.InvbillNum join itm1 in invs on itm.InvBillNum equals itm1.InvbillNum
select select

2
code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs

@ -706,6 +706,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
} }
var relist = relationList.Where(p => p.BusinessType == itm.BusinessType).ToList(); var relist = relationList.Where(p => p.BusinessType == itm.BusinessType).ToList();
var material = relist.FirstOrDefault(p => p.SettleMaterialCode == itm.LU); var material = relist.FirstOrDefault(p => p.SettleMaterialCode == itm.LU);
itm.RELU = material.ErpMaterialCode;
itm.BusinessType = main.BusinessType; itm.BusinessType = main.BusinessType;
itm.Site = main.Site; itm.Site = main.Site;
} }
@ -1127,6 +1128,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
foreach (var itm in query1) foreach (var itm in query1)
{ {
itm.InvBillNum = key; itm.InvBillNum = key;
itm.InvGroupNum = dtos.FirstOrDefault().InvGroupNum;
adjlist.Add(itm); adjlist.Add(itm);
} }
} }

Loading…
Cancel
Save