From 85d0a3650c894c0a378c1fbae9b7aa6e7e0d99e0 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:38:15 +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

---
 .../Entities/BQ/PUB_BA_SERVICE.cs                 |  1 -
 .../Entities/BQ/Managers/INV_MNG_EXT.cs           | 15 ++++-----------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_BA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_BA_SERVICE.cs
index d9a9eeb9..821f7a9e 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_BA_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_BA_SERVICE.cs
@@ -561,7 +561,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                 }
                 var entitys = bbaclist;//合并库存调整单和就发票可结算明细数据
                 var gNumList = entitys.Select(p => p.GroupNum).Distinct().ToList();
-
                 var priceList = _priceRepository.ToList();//价格单
                                                           //var errorList = await CheckInvoiceGenerationRules(entitys, priceList, inv.BusinessType);
                                                           //if (errorList.Count() > 0)
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 7bab5814..2fe7c81a 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
@@ -312,7 +312,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                     var ls = itm.Value;//结算分组号列表
                     //反向查找结算数据
                     var invdetails = p_list.Where(p => ls.Contains(p.GroupNum)).ToList();
-                   
                     var detailDtos = dtos.Where(p => ls.Contains(p.GroupNum)).GroupBy(p => new { p.InvGroupNum, p.PartCode,p.LU, p.Price, p.BeginDate, p.EndDate, p.ContractDocID })
                         .Select(itm => new
                         {
@@ -329,8 +328,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                         .ToList();
                     decimal amt = detailDtos.Sum(k => k.Amt);//金额
                     decimal txtAmt = detailDtos.Sum(k => k.Amt) + Math.Round(detailList.Sum(k => k.Amt) * 0.13m, 2);//税后金额
-                    decimal realAmt = Math.Round(detailDtos.Sum(k => k.Amt) * 0.13m, 2);//税额
-                   
+                    decimal realAmt = Math.Round(detailDtos.Sum(k => k.Amt) * 0.13m, 2);//税额 
                     List<INVOICE_WAIT_DETAIL> _entityDetailList = new List<INVOICE_WAIT_DETAIL>();
                     foreach (var detail in detailDtos)
                     {
@@ -356,7 +354,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                     {
                         detailList.AddRange(_entityDetailList);
                     }
-                 
                     var invbill = new INVOICE_GRP
                       (guid: GuidGenerator.Create(),
                        realnvBillNum: string.Empty,
@@ -368,18 +365,16 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                        invGroupNum: p_InvGroupNum,
                        state: SettleBillState.已开票,
                        invoiceBillState: InvoiceBillState.正常,
-                        tax: 0,
-                        parent: string.Empty,
-                      preTaxDiff: 0,
+                       tax: 0,
+                       parent: string.Empty,
+                       preTaxDiff: 0,
                        taxDiff: 0,
                        clientCode: string.Empty,
                        realAmt: realAmt
                        );
                     invlist.Add(invbill);
                 }
-               
             }
-
             return detailList;
         }
         /// <summary>
@@ -784,9 +779,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                        );
                     invlist.Add(invbill);
                 }
-          
             }
-
             return detailList;
         }