From 8ed521a75d051a23c60c7e1365b9c92783fb2a4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com>
Date: Mon, 18 Sep 2023 14:41:59 +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/BBAC_BA_SERVICE.cs  | 2 +-
 .../SettleAccount.Domain/Entities/BQ/Managers/INV_MNG_EXT.cs  | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_BA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_BA_SERVICE.cs
index 512bc3c0..f11c3acb 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_BA_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_BA_SERVICE.cs
@@ -159,7 +159,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                 }
                 var dto1s = ObjectMapper.Map<List<BBAC_CAN_SA_DETAIL>, List<BBAC_CAN_SA_DETAIL_DTO>>(entitys);
                 var q = from d in dto1s
-                        join p in priceList on d.PartCode equals p.LU
+                        join p in priceList on d.LU equals p.LU
                         where d.SettleDate >= p.BeginTime && d.SettleDate <= p.EndTime && d.Site==p.ClientCode &&  p.IsCancel == false && p.ClientCode == inv.Site//客户零件号
                         select new TEMP_CAN_SA_DETAIL
                         {
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG_EXT.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG_EXT.cs
index 2fe7c81a..b4f02911 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG_EXT.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG_EXT.cs
@@ -482,7 +482,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
             {
                 var groupList = new List<INVOICE_MAP_GROUP>();
                 var notDetialList = new List<INVOICE_NOT_SETTLE>();
-              
                 var invlist = new List<INVOICE_GRP>();
                 var salist = new List<TDetail>();
                 var adjlist = new List<PUB_ADJ_DETAIL>();
@@ -490,7 +489,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                 {
                     var key = group.Key;//发票票号
                     var ls = group.Value;//发票明细
-                  
                         //更新结算记录更新
                         var query = from itm in dtos
                                     join itm1 in ls
@@ -509,14 +507,12 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                          on new {LU= itm.PartCode, itm.BeginDate, itm.EndDate } equals new { itm1.LU, itm1.BeginDate, itm1.EndDate }
                                      join itm2 in p_adjlist on new { itm.LU, itm.SettleDate } equals new { itm2.LU, itm2.SettleDate }
                                      select itm2;
-
                         foreach (var itm in query1)
                         {
                             itm.InvBillNum = key;
                             adjlist.Add(itm);
                         }
                     }
-
                     List<INVOICE_WAIT_DETAIL> _entityDetailList = new List<INVOICE_WAIT_DETAIL>();
                     foreach (var detail in ls)
                     {