From bb6038daf66e68ceedfcf4b50b671fbe62d047bd Mon Sep 17 00:00:00 2001 From: zhaoxinyu Date: Thu, 28 Dec 2023 11:10:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs | 3 +++ .../src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs | 2 ++ 2 files changed, 5 insertions(+) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs index a2a3fc96..5e332f59 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs +++ b/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 adjdtos = ObjectMapper.Map, List>(adjs);//调整数据DTO + + + var notquery = from itm in sdtos join itm1 in invs on itm.InvBillNum equals itm1.InvbillNum select diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs index 29d3e62b..c9439006 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs +++ b/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 material = relist.FirstOrDefault(p => p.SettleMaterialCode == itm.LU); + itm.RELU = material.ErpMaterialCode; itm.BusinessType = main.BusinessType; itm.Site = main.Site; } @@ -1127,6 +1128,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers foreach (var itm in query1) { itm.InvBillNum = key; + itm.InvGroupNum = dtos.FirstOrDefault().InvGroupNum; adjlist.Add(itm); } }