Merge branch 'master' of https://e.coding.net/ccwin-in/PG/Win.sfs.SmartSettlementSystem.PG

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFKanbanAppService.cs

@@ -520,6 +520,42 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
             }
             return ApplicationConsts.SuccessStr;
         }
+        /// <summary>
+        /// 导出
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("Export")]
+        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
+        virtual public async Task<string> ExportAsync(WmsKanbanOutPutDetialRequestDto input)
+        {
+            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
+            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue,
+                 0, true);
+
+            IExporter _excel = new ExcelExporter();
+            byte[] result = null;
+
+            var _fileName = string.Format("出库单_{0}.xlsx", Guid.NewGuid().ToString());
+            result = await _excel.ExportAsByteArray(entities);
+
+
+            result.ShouldNotBeNull();
+
+            //保存导出文件到服务器存成二进制
+            await _excelImportService.SaveBlobAsync(
+                     new SaveExcelImportInputDto
+                     {
+                         Name = _fileName,
+                         Content = result
+                     }
+                 );
+            return _fileName;
+
+
+
+        }
 
 
     }

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs

@@ -527,6 +527,42 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
                 await _wmsVersionRepository.InsertAsync(_version, true);
             }
             return ApplicationConsts.SuccessStr;
+        }
+        /// <summary>
+        /// 导出
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("Export")]
+        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
+        virtual public async Task<string> ExportAsync(WmsKanbanOutPutDetialRequestDto input)
+        {
+            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
+            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue,
+                 0, true);
+
+            IExporter _excel = new ExcelExporter();
+            byte[] result = null;
+
+            var _fileName = string.Format("出库单_{0}.xlsx", Guid.NewGuid().ToString());
+            result = await _excel.ExportAsByteArray(entities);
+
+
+            result.ShouldNotBeNull();
+
+            //保存导出文件到服务器存成二进制
+            await _excelImportService.SaveBlobAsync(
+                     new SaveExcelImportInputDto
+                     {
+                         Name = _fileName,
+                         Content = result
+                     }
+                 );
+            return _fileName;
+
+
+
         }
     }
 

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs

@@ -518,6 +518,42 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
             }
             return ApplicationConsts.SuccessStr;
         }
+        /// <summary>
+        /// 导出
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("Export")]
+        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
+        virtual public async Task<string> ExportAsync(WmsKanbanOutPutDetialRequestDto input)
+        {
+            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
+            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue,
+                 0, true);
+
+            IExporter _excel = new ExcelExporter();
+            byte[] result = null;
+
+            var _fileName = string.Format("出库单_{0}.xlsx", Guid.NewGuid().ToString());
+            result = await _excel.ExportAsByteArray(entities);
+
+
+            result.ShouldNotBeNull();
+
+            //保存导出文件到服务器存成二进制
+            await _excelImportService.SaveBlobAsync(
+                     new SaveExcelImportInputDto
+                     {
+                         Name = _fileName,
+                         Content = result
+                     }
+                 );
+            return _fileName;
+
+
+
+        }
 
 
     }

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs

@@ -550,6 +550,45 @@ into temp1
             }
             return ApplicationConsts.SuccessStr;
         }
+
+        /// <summary>
+        /// 导出
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("Export")]
+        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
+        virtual public async Task<string> ExportAsync(WmsKanbanOutPutDetialRequestDto input)
+        {
+            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
+            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue,
+                 0, true);
+
+            IExporter _excel = new ExcelExporter();
+            byte[] result = null;
+
+            var _fileName = string.Format("出库单_{0}.xlsx", Guid.NewGuid().ToString());
+            result = await _excel.ExportAsByteArray(entities);
+
+
+            result.ShouldNotBeNull();
+
+            //保存导出文件到服务器存成二进制
+            await _excelImportService.SaveBlobAsync(
+                     new SaveExcelImportInputDto
+                     {
+                         Name = _fileName,
+                         Content = result
+                     }
+                 );
+            return _fileName;
+
+
+
+        }
+
+
     }
 
 }

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs

@@ -585,5 +585,43 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
         }
 
 
+        /// <summary>
+        /// 导出
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("Export")]
+        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
+        virtual public async Task<string> ExportAsync(WmsKanbanOutPutDetialRequestDto input)
+        {
+            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
+            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue,
+                 0, true);
+
+            IExporter _excel = new ExcelExporter();
+            byte[] result = null;
+
+            var _fileName = string.Format("出库单_{0}.xlsx", Guid.NewGuid().ToString());
+            result = await _excel.ExportAsByteArray(entities);
+
+
+            result.ShouldNotBeNull();
+
+            //保存导出文件到服务器存成二进制
+            await _excelImportService.SaveBlobAsync(
+                     new SaveExcelImportInputDto
+                     {
+                         Name = _fileName,
+                         Content = result
+                     }
+                 );
+            return _fileName;
+
+
+
+        }
+
+
     }
 }

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs

@@ -134,16 +134,10 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
         //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
         virtual public async Task<PagedResultDto<WmsKanbanOutPut>> GetListAsync( WmsKanbanOutPutRequestDto input)
         {
-
-
-
             //input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
             var entities = await _wmsVersionRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
                  input.SkipCount, true);
-
             var totalCount = await GetCountAsync(input);
-          
-
             return new PagedResultDto<WmsKanbanOutPut>(totalCount, entities);
         }
 
@@ -763,5 +757,55 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
         }
 
 
+        /// <summary>
+        /// 导出
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("Export")]
+        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
+        virtual public async Task<string> ExportAsync(WmsKanbanOutPutDetialRequestDto input)
+        {
+            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
+            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue,
+                 0, true);
+
+            IExporter _excel = new ExcelExporter();
+            byte[] result = null;
+           
+           var _fileName = string.Format("出库单_{0}.xlsx", Guid.NewGuid().ToString());
+                    result = await _excel.ExportAsByteArray(entities);
+           
+           
+            result.ShouldNotBeNull();
+
+            //保存导出文件到服务器存成二进制
+            await _excelImportService.SaveBlobAsync(
+                     new SaveExcelImportInputDto
+                     {
+                         Name = _fileName,
+                         Content = result
+                     }
+                 );
+            return _fileName;
+
+
+
+        }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     }
 }

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs

@@ -276,7 +276,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
                 itm.Version,
                 string.Empty,
                 string.Empty,
-                itm.InvoiceQty,
+                itm.InvoiceQty+itm.ClaimQty+itm.CP7ScrapQty,
                 tm1==null?0:tm1.Qty,
                 itm.InvoiceQty,
                 string.Empty,
@@ -425,7 +425,42 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
 
             return true;
         }
+        /// <summary>
+        /// 导出
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("Export")]
+        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
+        virtual public async Task<string> ExportAsync(WmsKanbanOutPutDetialRequestDto input)
+        {
+            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
+            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue,
+                 0, true);
 
+            IExporter _excel = new ExcelExporter();
+            byte[] result = null;
+
+            var _fileName = string.Format("出库单_{0}.xlsx", Guid.NewGuid().ToString());
+            result = await _excel.ExportAsByteArray(entities);
+
+
+            result.ShouldNotBeNull();
+
+            //保存导出文件到服务器存成二进制
+            await _excelImportService.SaveBlobAsync(
+                     new SaveExcelImportInputDto
+                     {
+                         Name = _fileName,
+                         Content = result
+                     }
+                 );
+            return _fileName;
+
+
+
+        }
 
 
 

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePart90AppService.cs

@@ -1,8 +1,11 @@
 using EFCore.BulkExtensions;
+using Magicodes.ExporterAndImporter.Core;
+using Magicodes.ExporterAndImporter.Excel;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Shouldly;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -597,7 +600,42 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
 
         }
 
+        /// <summary>
+        /// 导出
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("Export")]
+        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
+        virtual public async Task<string> ExportAsync(WmsKanbanOutPutDetialRequestDto input)
+        {
+            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
+            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue,
+                 0, true);
+
+            IExporter _excel = new ExcelExporter();
+            byte[] result = null;
 
+            var _fileName = string.Format("出库单_{0}.xlsx", Guid.NewGuid().ToString());
+            result = await _excel.ExportAsByteArray(entities);
+
+
+            result.ShouldNotBeNull();
+
+            //保存导出文件到服务器存成二进制
+            await _excelImportService.SaveBlobAsync(
+                     new SaveExcelImportInputDto
+                     {
+                         Name = _fileName,
+                         Content = result
+                     }
+                 );
+            return _fileName;
+
+
+
+        }
 
 
 

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQCarAppService.cs

@@ -1,8 +1,11 @@
 using EFCore.BulkExtensions;
+using Magicodes.ExporterAndImporter.Core;
+using Magicodes.ExporterAndImporter.Excel;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Shouldly;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -484,6 +487,42 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
                 await _wmsVersionRepository.InsertAsync(_version, true);
             }
             return ApplicationConsts.SuccessStr;
+        }
+        /// <summary>
+        /// 导出
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("Export")]
+        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
+        virtual public async Task<string> ExportAsync(WmsKanbanOutPutDetialRequestDto input)
+        {
+            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
+            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue,
+                 0, true);
+
+            IExporter _excel = new ExcelExporter();
+            byte[] result = null;
+
+            var _fileName = string.Format("出库单_{0}.xlsx", Guid.NewGuid().ToString());
+            result = await _excel.ExportAsByteArray(entities);
+
+
+            result.ShouldNotBeNull();
+
+            //保存导出文件到服务器存成二进制
+            await _excelImportService.SaveBlobAsync(
+                     new SaveExcelImportInputDto
+                     {
+                         Name = _fileName,
+                         Content = result
+                     }
+                 );
+            return _fileName;
+
+
+
         }
     }
 }

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQKBOutputAppService.cs

@@ -407,7 +407,42 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         }
 
 
+        /// <summary>
+        /// 导出
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("Export")]
+        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
+        virtual public async Task<string> ExportAsync(WmsKanbanOutPutDetialRequestDto input)
+        {
+            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
+            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue,
+                 0, true);
+
+            IExporter _excel = new ExcelExporter();
+            byte[] result = null;
 
+            var _fileName = string.Format("出库单_{0}.xlsx", Guid.NewGuid().ToString());
+            result = await _excel.ExportAsByteArray(entities);
+
+
+            result.ShouldNotBeNull();
+
+            //保存导出文件到服务器存成二进制
+            await _excelImportService.SaveBlobAsync(
+                     new SaveExcelImportInputDto
+                     {
+                         Name = _fileName,
+                         Content = result
+                     }
+                 );
+            return _fileName;
+
+
+
+        }
 
 
         // 物料 物料组 物料描述 物料号 期间  单位 出库数量 结算数量 

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMKanbanAppService.cs

@@ -1,8 +1,11 @@
 using EFCore.BulkExtensions;
+using Magicodes.ExporterAndImporter.Core;
+using Magicodes.ExporterAndImporter.Excel;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Shouldly;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -435,6 +438,42 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
             return ApplicationConsts.SuccessStr;
         }
 
+        /// <summary>
+        /// 导出
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("Export")]
+        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
+        virtual public async Task<string> ExportAsync(WmsKanbanOutPutDetialRequestDto input)
+        {
+            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
+            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue,
+                 0, true);
+
+            IExporter _excel = new ExcelExporter();
+            byte[] result = null;
+
+            var _fileName = string.Format("出库单_{0}.xlsx", Guid.NewGuid().ToString());
+            result = await _excel.ExportAsByteArray(entities);
+
+
+            result.ShouldNotBeNull();
+
+            //保存导出文件到服务器存成二进制
+            await _excelImportService.SaveBlobAsync(
+                     new SaveExcelImportInputDto
+                     {
+                         Name = _fileName,
+                         Content = result
+                     }
+                 );
+            return _fileName;
+
+
+
+        }
 
     }
 }

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs

@@ -1,8 +1,11 @@
 using EFCore.BulkExtensions;
+using Magicodes.ExporterAndImporter.Core;
+using Magicodes.ExporterAndImporter.Excel;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Shouldly;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -532,5 +535,42 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
             }
             return ApplicationConsts.SuccessStr;
         }
+
+        /// <summary>
+        /// 导出
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("Export")]
+        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
+        virtual public async Task<string> ExportAsync(WmsKanbanOutPutDetialRequestDto input)
+        {
+            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
+            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue,
+                 0, true);
+
+            IExporter _excel = new ExcelExporter();
+            byte[] result = null;
+
+            var _fileName = string.Format("出库单_{0}.xlsx", Guid.NewGuid().ToString());
+            result = await _excel.ExportAsByteArray(entities);
+
+
+            result.ShouldNotBeNull();
+
+            //保存导出文件到服务器存成二进制
+            await _excelImportService.SaveBlobAsync(
+                     new SaveExcelImportInputDto
+                     {
+                         Name = _fileName,
+                         Content = result
+                     }
+                 );
+            return _fileName;
+
+
+
+        }
     }
 }

src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml

@@ -1843,6 +1843,13 @@
              <param name="version"></param>
              <returns></returns>
         </member>
+        <member name="M:Win.Sfs.SettleAccount.Entities.SettleAccounts.WmsHQFKanbanAppService.ExportAsync(Win.Sfs.SettleAccount.Entities.Wms.WmsKanbanOutPutDetialRequestDto)">
+            <summary>
+            导出
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
         <member name="T:Win.Sfs.SettleAccount.Entities.SettleAccounts.WMSHQFSharePartAppService">
             <summary>
             红旗F平台备件-出库
@@ -1925,6 +1932,13 @@
             <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
             <returns></returns>
         </member>
+        <member name="M:Win.Sfs.SettleAccount.Entities.SettleAccounts.WMSHQFSharePartAppService.ExportAsync(Win.Sfs.SettleAccount.Entities.Wms.WmsKanbanOutPutDetialRequestDto)">
+            <summary>
+            导出
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
         <member name="T:Win.Sfs.SettleAccount.Entities.SettleAccounts.WmsHQHKanbanAppService">
             <summary>
             红旗H平台准时化-出库
@@ -2000,6 +2014,13 @@
             <param name="p_list"></param>
             <returns></returns>
         </member>
+        <member name="M:Win.Sfs.SettleAccount.Entities.SettleAccounts.WmsHQHKanbanAppService.ExportAsync(Win.Sfs.SettleAccount.Entities.Wms.WmsKanbanOutPutDetialRequestDto)">
+            <summary>
+            导出
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
         <member name="T:Win.Sfs.SettleAccount.Entities.SettleAccounts.WmsHQHSharePartAppService">
             <summary>
             红旗M平台备件-出库
@@ -2082,6 +2103,13 @@
              <param name="version"></param>
              <returns></returns>
         </member>
+        <member name="M:Win.Sfs.SettleAccount.Entities.SettleAccounts.WmsHQHSharePartAppService.ExportAsync(Win.Sfs.SettleAccount.Entities.Wms.WmsKanbanOutPutDetialRequestDto)">
+            <summary>
+            导出
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
         <member name="T:Win.Sfs.SettleAccount.Entities.SettleAccounts.WMSJitAppService">
             <summary>
             wms出库
@@ -2171,6 +2199,13 @@
              <param name="version"></param>
              <returns></returns>
         </member>
+        <member name="M:Win.Sfs.SettleAccount.Entities.SettleAccounts.WMSJitAppService.ExportAsync(Win.Sfs.SettleAccount.Entities.Wms.WmsKanbanOutPutDetialRequestDto)">
+            <summary>
+            导出
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
         <member name="T:Win.Sfs.SettleAccount.Entities.SettleAccounts.WMSKanbanAppService">
             <summary>
             大众看板-出库
@@ -2246,6 +2281,13 @@
              <param name="input"></param>
              <returns></returns>
         </member>
+        <member name="M:Win.Sfs.SettleAccount.Entities.SettleAccounts.WMSKanbanAppService.ExportAsync(Win.Sfs.SettleAccount.Entities.Wms.WmsKanbanOutPutDetialRequestDto)">
+            <summary>
+            导出
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
         <member name="T:Win.Sfs.SettleAccount.Entities.SettleAccounts.WMSSharePartAppService">
             <summary>
             wms出库
@@ -2329,6 +2371,13 @@
             <param name="p_list"></param>
             <returns></returns>
         </member>
+        <member name="M:Win.Sfs.SettleAccount.Entities.SettleAccounts.WMSSharePartAppService.ExportAsync(Win.Sfs.SettleAccount.Entities.Wms.WmsKanbanOutPutDetialRequestDto)">
+            <summary>
+            导出
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
         <member name="T:Win.Sfs.SettleAccount.Entities.SettlementPakAndSparePart.SettlementPakAndSparePartsAppService">
             <summary>
             结算包与散件对应关系服务
@@ -2963,6 +3012,13 @@
              <param name="version"></param>
              <returns></returns>
         </member>
+        <member name="M:Win.Sfs.SettleAccount.Entities.WMS.WmsHQCarAppService.ExportAsync(Win.Sfs.SettleAccount.Entities.Wms.WmsKanbanOutPutDetialRequestDto)">
+            <summary>
+            导出
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
         <member name="F:Win.Sfs.SettleAccount.Entities.WMS.WmsHQKBOutputAppService._wmsRepository">
             <summary>
             大众看板-出库
@@ -3038,6 +3094,13 @@
             <param name="p_list"></param>
             <returns></returns>
         </member>
+        <member name="M:Win.Sfs.SettleAccount.Entities.WMS.WmsHQKBOutputAppService.ExportAsync(Win.Sfs.SettleAccount.Entities.Wms.WmsKanbanOutPutDetialRequestDto)">
+            <summary>
+            导出
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
         <member name="T:Win.Sfs.SettleAccount.Entities.WMS.WmsHQMKanbanAppService">
             <summary>
             wms出库-M平台
@@ -3113,6 +3176,13 @@
             <param name="p_list"></param>
             <returns></returns>
         </member>
+        <member name="M:Win.Sfs.SettleAccount.Entities.WMS.WmsHQMKanbanAppService.ExportAsync(Win.Sfs.SettleAccount.Entities.Wms.WmsKanbanOutPutDetialRequestDto)">
+            <summary>
+            导出
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
         <member name="T:Win.Sfs.SettleAccount.Entities.WMS.WmsHQMSharePartAppService">
             <summary>
             红旗H平台备件-出库
@@ -3195,6 +3265,13 @@
              <param name="input"></param>
              <returns></returns>
         </member>
+        <member name="M:Win.Sfs.SettleAccount.Entities.WMS.WmsHQMSharePartAppService.ExportAsync(Win.Sfs.SettleAccount.Entities.Wms.WmsKanbanOutPutDetialRequestDto)">
+            <summary>
+            导出
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
         <member name="F:Win.Sfs.SettleAccount.Entities.WMS.WMSKanbanExtendAppService._wmsRepository">
             <summary>
             大众看板-出库
@@ -3270,6 +3347,13 @@
             <param name="p_list"></param>
             <returns></returns>
         </member>
+        <member name="M:Win.Sfs.SettleAccount.Entities.WMS.WMSKanbanExtendAppService.ExportAsync(Win.Sfs.SettleAccount.Entities.Wms.WmsKanbanOutPutDetialRequestDto)">
+            <summary>
+            导出
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
         <member name="M:Win.Sfs.SettleAccount.Entities.WMS.WMSSharePart90AppService.#ctor(Win.Sfs.SettleAccount.ISettleAccountBranchEfCoreRepository{Win.Sfs.SettleAccount.Entities.WMS.WmsSharePart90OutPutDetial,System.Guid},Win.Sfs.SettleAccount.ISettleAccountBranchEfCoreRepository{Win.Sfs.SettleAccount.Entities.TaskJob,System.Guid},Win.Sfs.SettleAccount.ISettleAccountBranchEfCoreRepository{Win.Sfs.SettleAccount.Entities.WMS.WmsSharePart90OutPut,System.Guid},Win.Sfs.SettleAccount.Repository.WMSEfCoreRepository{Win.Sfs.SettleAccount.Entities.WMS.WmsSharePart90OutPutDetial},Win.Sfs.SettleAccount.Repository.WMSEfCoreRepository{WY.NewJit.Extends.PaiGe.WMS.TB_BILL},Win.Sfs.BaseData.ImportExcelCommon.IExcelImportAppService,Volo.Abp.Caching.IDistributedCache{Win.Sfs.SettleAccount.Entities.WMS.WmsSharePart90OutPutDetial},Win.Abp.Snowflakes.ISnowflakeIdGenerator,Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report.WmsDapperRepository,Win.Sfs.SettleAccount.CommonManagers.ICommonManager)">
             <summary>
             
@@ -3360,6 +3444,13 @@
              <param name="p_list"></param>
              <returns></returns>
         </member>
+        <member name="M:Win.Sfs.SettleAccount.Entities.WMS.WMSSharePart90AppService.ExportAsync(Win.Sfs.SettleAccount.Entities.Wms.WmsKanbanOutPutDetialRequestDto)">
+            <summary>
+            导出
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
         <member name="T:Win.Sfs.SettleAccount.FISes.FISAppService">
             <summary>
             区域相关应用服务

src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs

@@ -287,31 +287,42 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
 
         }
         //  交货单号 实际发货日期  KENN号 底盘号 物料号 物料描述    客户物料 组件组物料   组件组物料描述 物料组(车型)     定价 金额  结算平台未结数量 大众R3未结数量    差异金额 差异数量    漏结标识 漏结期间    说明
+
+        [ExporterHeader(DisplayName = "组件组物料", IsIgnore = true)]
+
         [ImporterHeader(Name = "组件组物料",IsIgnore =true)]
         public string ParentMaterialCode { set; get; }
+        [ExporterHeader(DisplayName = "交货单号")]
         [ImporterHeader(Name = "交货单号")]
         public string WmsBillNum { set; get; }
+        [ExporterHeader(DisplayName = "条码号")]
         [ImporterHeader(Name = "条码号")]
         //KENN号
         public string Kanban { set; get; }
-       
+        [ExporterHeader(DisplayName = "物料号")]
         [ImporterHeader(Name = "物料号")]
         //物料号
         public string MaterialCode { set; get; }
+        [ExporterHeader(DisplayName = "物料描述")]
         [ImporterHeader(Name = "物料描述")]
         //物料描述
         public string MaterialDesc { set; get; }
+        [ExporterHeader(DisplayName = "物料组(车型)")]
         [ImporterHeader(Name = "物料组(车型)")]
         //物料组(车型)  
         public string MaterialGroup { set; get; }
+        [ExporterHeader(DisplayName = "出库库位")]
         [ImporterHeader(Name = "出库库位",IsIgnore =true)]
         //出库库位
         public string OutPut { set; get; }
+        [ExporterHeader(DisplayName = "入库库位")]
         [ImporterHeader(Name = "入库库位", IsIgnore = true)]
         //入库库位
         public string InPut { set; get; }
+        [ExporterHeader(DisplayName = "状态")]
         [ImporterHeader(Name = "状态",IsIgnore =true)]
         public int State { get; set; }
+        [ExporterHeader(DisplayName = "客户物料")]
         [ImporterHeader(Name = "客户物料")]
         /// <summary>
         /// 扩展字段1
@@ -320,6 +331,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         /// <summary>
         /// 扩展字段2
         /// </summary>
+        [ExporterHeader(DisplayName = "订单日期")]
         [ImporterHeader(Name = "订单日期")]
         public string Extend2 { set; get; }
         /// <summary>
@@ -327,17 +339,20 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         /// </summary>
         [ImporterHeader(Name = "版本号", IsIgnore = true)]
         public string Version { set; get; }
+        [ExporterHeader(DisplayName = "结算数量")]
         [ImporterHeader(Name = "结算数量")]
         public decimal Qty { set; get; }
-
+        [ExporterHeader(DisplayName = "单据")]
         [ImporterHeader(Name = "单据", IsIgnore = true)]
         public string BillNum { set; get; }
-
+        [ExporterHeader(DisplayName = "任务", IsIgnore = true)]
         [ImporterHeader(Name = "任务", IsIgnore = true)]
         public Guid TaskId { set; get; }
+        [ExporterHeader(DisplayName = "开票单价")]
         [ImporterHeader(Name = "开票单价")]
 
         public decimal Price { set; get; }
+        [ExporterHeader(DisplayName = "开票金额")]
         [ImporterHeader(Name = "开票金额")]
         public decimal Amt { set; get; }
 

src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/KanbanUnSettledDapperRepository.cs

@@ -44,10 +44,10 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
         public decimal SocketQty { get; set; }
         //[ExporterHeader(DisplayName = "数量差")]
         //public decimal DiffQty { get; set; }
-        //[ExporterHeader(DisplayName = "CP7报废")]
+        [ExporterHeader(DisplayName = "CP7报废")]
-        //public decimal CP7ScrapQty { get; set; }
+        public decimal CP7ScrapQty { get; set; }
-        //[ExporterHeader(DisplayName = "索赔/退货")]
+        [ExporterHeader(DisplayName = "索赔/退货")]
-        //public decimal ClaimQty { get; set; }
+        public decimal ClaimQty { get; set; }
         [ExporterHeader(DisplayName = "定价")]
         public decimal SalePrice { get; set; }
         [ExporterHeader(DisplayName = "价格差异")]
@@ -213,6 +213,10 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
              "	temp1.SapMaterialGroup,\n" +
              "	temp1.InvoicePrice - ISNULL( temp2.Price, 0 ) AS DiffPrice,\n" +
              "	temp2.Price AS SalePrice \n" +
+
+             ", temp1.ClaimQty \n"+
+		     ",temp1.CP7ScrapQty \n"+
+
              "   FROM\n" +
              "	(\n" +
              "	SELECT\n" +
@@ -223,7 +227,15 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
              "		b.InvoicePrice,\n" +
              "		g.MaterialCode AS SapMaterialCode,\n" +
              "		g.MaterialDesc,\n" +
-             "		g.EstimateTypeDesc AS SapMaterialGroup \n" +
+             "		g.EstimateTypeDesc AS SapMaterialGroup, \n" +
+
+             " CASE  WHEN e.Type = 'CP7报废' THEN \n"+
+             "          isnull(e.Qty, 0) ELSE 0  \n"+
+             "      END AS CP7ScrapQty, \n"+
+             "	CASE WHEN e.Type = '索赔' THEN \n"+
+             "         isnull(e.Qty, 0) ELSE 0 \n"+
+             "      END AS ClaimQty  \n"+
+
              "	FROM\n" +
              "		(\n" +
              "		SELECT\n" +