From d45a2746b50a514844015f1d460a921e1c0f69c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com>
Date: Thu, 21 Sep 2023 11:30:56 +0800
Subject: [PATCH] [CI SKIP]

---
 .../Entities/BQ/BBAC_SE_EDI_Service.cs                |  2 ++
 .../Entities/BQ/INVOICE_SERVICE.cs                    | 11 ++---------
 .../Entities/BQ/Managers/INV_MNG.cs                   |  4 ++--
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SE_EDI_Service.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SE_EDI_Service.cs
index d82c71f6..8d4d2c67 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SE_EDI_Service.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SE_EDI_Service.cs
@@ -48,6 +48,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
         public async Task<string> ExportAsync(RequestDto input)
         {
             string fileName = $"BBAC的EDI数据_{Guid.NewGuid()}.xlsx";
+
+
             var entities = await _repository.GetListByFilterAsync(input.Filters, input.Sorting, int.MaxValue, 0, true).ConfigureAwait(false); ;
             var dtos = ObjectMapper.Map<List<BBAC_SE_EDI>, List<BBAC_SE_EDI_EXPORT_DTO>>(entities);
 
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 49eb2900..2f81cf39 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
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
@@ -264,8 +264,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                             };
                 entity.INVOICE_WAIT_DETAIL_BJ = bjquery.OrderBy(p=>p.LineCode).ToList();
 
-
-
             }
             else
             {
@@ -494,8 +492,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                 {
                     _excel.Append(unsettle, "未结零件汇总");
                 }
-
-
             }
             if (first.BusinessType == EnumBusinessType.MaiDanJianHBPO)
             {
@@ -515,16 +511,13 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                     _excel.Append(jitunsettle, "未结零件汇总");
                 }
             }
-
-
-
             //jis业务，发票分组对应关系，未结数据，调整数据
             if (first.BusinessType == EnumBusinessType.JisBBAC || first.BusinessType == EnumBusinessType.JisHBPO)
             {
                 foreach (var itm in entities)
                 {
                     var mgroup = m.Where(p => p.InvbillNum == itm.InvbillNum).ToList();
-                    var adjp = adj.Where(p => p.InvBillNum == itm.InvbillNum).ToList();
+                    var adjp =   adj.Where(p => p.InvBillNum == itm.InvbillNum).ToList();
                     var nolist = not.Where(p => p.InvBillNum == itm.InvbillNum).ToList();
                     var lsC = nolist.Where(p => p.Extend1 == "可结算")
                         .GroupBy(p => new
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 50ac373f..64cddd15 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
@@ -1840,12 +1840,12 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                             adjlist.Add(detail);
                         }
                     }
-                    var detailDtos = dtos.Where(p => ls.Contains(p.GroupNum)).GroupBy(p => new { p.InvGroupNum, p.PartCode, p.Price, p.BeginDate, p.EndDate, p.ContractDocID })
+                    var detailDtos = dtos.Where(p => ls.Contains(p.GroupNum)).GroupBy(p => new { p.InvGroupNum, p.PartCode, p.Price, p.BeginDate, p.EndDate, p.ContractDocID,p.LU })
                         .Select(itm => new
                         {
                             PartCode = itm.Key.PartCode,
                             InvGroupNum = itm.Key.InvGroupNum,
-                            LU = itm.Key.PartCode,
+                            LU = itm.Key.LU,
                             ContactDocID = itm.Key.ContractDocID,
                             Price = itm.Key.Price,
                             Amt = Math.Round(itm.Sum(k => k.Qty) * itm.Key.Price, 2),