From ec14dd56449ba0dc80ff71c4837e6cd3e7f2e36d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com>
Date: Wed, 7 May 2025 17:11:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../appsettings.json                          |  2 +-
 .../Entities/BQ/Managers/INV_MNG.cs           | 64 ++++++++++---------
 2 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json
index 7f87d175..b8caa6a9 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json
@@ -5,7 +5,7 @@
   "ConnectionStrings": {
     "Default": "Server=dev.ccwin-in.com,13326;Database=BJABP;User ID=sa;Password=Microsoft@2022;Trusted_Connection=False;TrustServerCertificate=True",
     "SettleAccountService": "Server=dev.ccwin-in.com,13326;Database=BQ_SA;User ID=sa;Password=Microsoft@2022;Trusted_Connection=False;TrustServerCertificate=True;",
-   "ExChangeCenterService":"Server=dev.ccwin-in.com,13326;Database=BQ_SA;User ID=sa;Password=Microsoft@2022;Trusted_Connection=False;TrustServerCertificate=True;"
+   //"ExChangeCenterService":"Server=dev.ccwin-in.com,13326;Database=BQ_SA;User ID=sa;Password=Microsoft@2022;Trusted_Connection=False;TrustServerCertificate=True;"
     //"WMSBJBMPT": "Server=WIN-33SNP5V4K0L,1433;Database=WMS_BJBMPT_2;User ID=sa;Password=Microsoft@2022;Trusted_Connection=False;TrustServerCertificate=True;"
 
 
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 59523d72..e6b4ce92 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
@@ -1818,36 +1818,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                     {
                         notDetialList.AddRange(innotls);
                     }
-                    if (p_notlist != null && p_notlist.Count > 0)
-                    {
-                        var innotls1 = new List<INVOICE_NOT_SETTLE>();
-                        var groupnum = itm.Value;
-                        if (count == i)//最后一张发票追加
-                        {
-                            groupnum.AddRange(nolist);//追加完全不可结
-                        }
-                        var notls = p_notlist.GroupBy(p => new { p.GroupNum, p.LU })
-                            .Select(p => new { GroupNum = p.Key.GroupNum, LU = p.Key.LU, Qty = p.Sum(itm => itm.Qty), InvBillNum = itm.Key });
-                        foreach (var nitm in notls)
-                        {
-                            innotls1.Add(new INVOICE_NOT_SETTLE(
-                                guid: GuidGenerator.Create(),
-                                version: p_version,
-                                invGroupNum: p_InvGroupNum,
-                                settleGroupNum: nitm.GroupNum,
-                                lU: nitm.LU,
-                                lU1: nitm.LU,
-                                extend1: "不可结算",
-                                extend2: string.Empty,
-                                qty: nitm.Qty,
-                                p_invbillnum: itm.Key
-                                ));
-                        }
-                        if (innotls.Count > 0)
-                        {
-                            notDetialList.AddRange(innotls1);
-                        }
-                    }
+                    
                     var invbill = new INVOICE_GRP
                       (guid: GuidGenerator.Create(),
                        realnvBillNum: string.Empty,
@@ -1888,6 +1859,37 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                     invlist.Add(invbill);
                     i++;
                 }
+
+                if (p_notlist != null && p_notlist.Count > 0)
+                {
+                    var innotls1 = new List<INVOICE_NOT_SETTLE>();
+                  
+                    var notls = p_notlist.GroupBy(p => new { p.GroupNum, p.LU })
+                        .Select(p => new { GroupNum = p.Key.GroupNum, LU = p.Key.LU, Qty = p.Sum(itm => itm.Qty), InvBillNum = invlist.FirstOrDefault().InvbillNum });
+                    foreach (var nitm in notls)
+                    {
+                        innotls1.Add(new INVOICE_NOT_SETTLE(
+                            guid: GuidGenerator.Create(),
+                            version: p_version,
+                            invGroupNum: p_InvGroupNum,
+                            settleGroupNum: nitm.GroupNum,
+                            lU: nitm.LU,
+                            lU1: nitm.LU,
+                            extend1: "不可结算",
+                            extend2: string.Empty,
+                            qty: nitm.Qty,
+                            p_invbillnum: invlist.FirstOrDefault().InvbillNum
+                            ));
+                    }
+                    if (innotls1.Count > 0)
+                    {
+                        notDetialList.AddRange(innotls1);
+                    }
+                }
+
+
+
+
                 //using (var transaction = _repository.DbContext.Database.BeginTransaction())
                 //{
                 //    try
@@ -2156,7 +2158,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                                 p_invbillnum: itm.Key
                                 ));
                         }
-                        if (innotls.Count > 0)
+                        if (innotls1.Count > 0)
                         {
                             notDetialList.AddRange(innotls1);
                         }