From a8063b1145fc4bb9d5b5b7f1e3853077ac7a62c2 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Win102022PTZDGH>
Date: Wed, 2 Mar 2022 19:57:57 +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

---
 .gitignore                                                 | 2 ++
 .../SettleAccount.Application.xml                          | 7 -------
 .../Report/WmsOutputSumDapperRepository.cs                 | 1 +
 .../Report/UnInvoiceSettledDetailDiffExportService.cs      | 4 +++-
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 04ba0ad0..2d5ef72f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,5 @@
 /.vs/Win.Sfs.SmartSettlementSystem.PG/v17/.suo
 /src/.vs/SettleAccount/v17/.suo
 /src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Logs/log-20220226.txt
+/src/.vs/SettleAccount/v17/.futdcache.v1
+/src/.vs/SettleAccount/v17/fileList.bin
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml
index 33b68568..7a621a0d 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml
@@ -3443,13 +3443,6 @@
              <param name="input"></param>
              <returns></returns>
         </member>
-        <member name="M:Win.Sfs.SettleAccount.Entities.WMS.WMSSharePart90AppService.ExportAsync(Win.Sfs.SettleAccount.Entities.Wms.WmsSharePartOutPutRequestDto)">
-            <summary>
-            出库单导出
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
         <member name="M:Win.Sfs.SettleAccount.Entities.WMS.WMSSharePart90AppService.GetListAsync(Win.Sfs.SettleAccount.Entities.Wms.WmsSharePartOutPutRequestDto)">
             <summary>
             准时化出库主表
diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/WmsOutputSumDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/WmsOutputSumDapperRepository.cs
index 9b9ceb94..4e80f850 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/WmsOutputSumDapperRepository.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/WmsOutputSumDapperRepository.cs
@@ -99,6 +99,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
         {
 
           var _sql=  "SELECT\n" +
+                 "   ROW_NUMBER()OVER(ORDER BY Type DESC) 行号 ,\n" +
  "	Client 客户,\n" +
  "	Type 出库类型,\n" +
  "	BillNum 结算单,\n" +
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnInvoiceSettledDetailDiffExportService.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnInvoiceSettledDetailDiffExportService.cs
index 9e31baf3..a4791e7b 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnInvoiceSettledDetailDiffExportService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnInvoiceSettledDetailDiffExportService.cs
@@ -281,9 +281,11 @@ namespace SettleAccount.Job.Services
                     itm.DiffPrice = itm.Price - itm.InvoicePrice;
                 }
 
-             
+                
                 _ls.AddRange(rangeList);
 
+                _ls=_ls.Where(p => p.ParentSapMaterialCode == p.SapMaterialCode).ToList();
+
                 if (!string.IsNullOrEmpty(materialGroup))
                 {
                     var _groupList = materialGroup.Split(new char[] { ',' }).Distinct().ToList();