更新版本

.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

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>
             准时化出库主表

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" +

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();