diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_NOT_SA_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_NOT_SA_DTO.cs index bd136af0..951bb0b2 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_NOT_SA_DTO.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_NOT_SA_DTO.cs @@ -63,7 +63,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos public string PartCode { get; set; } } - public class HBPO_NOT_SA_DETAIL_EXP_DTO + public class HBPO_NOT_SA_DETAIL_EXP_DTO : EntityDto { /// @@ -79,13 +79,17 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos /// ///业务类别 /// - //[ExporterHeader(DisplayName = "业务类别")] - //public string Category { get; set; } + [ExporterHeader(DisplayName = "业务类别")] + public string Category { get; set; } /// ///是否退货 /// //[ExporterHeader(DisplayName = "是否退货")] //public string IsReturn { get; set; } + //[ExporterHeader(DisplayName = "是否买单")] + //public string IsMaiDan { get; set; } + [ExporterHeader(DisplayName = "原始生产码")] + public string RealPN { get; set; } [ExporterHeader(DisplayName = "期间")] public int Version { get; set; } [ExporterHeader(DisplayName = "单价")] diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/NOT_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/NOT_SA_SERVICE.cs index 7b1ef41f..6c02623a 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/NOT_SA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/NOT_SA_SERVICE.cs @@ -122,6 +122,9 @@ namespace Win.Sfs.SettleAccount.Bases ).ConfigureAwait(false); return _fileName; } + + + /// /// 生成可计算单 /// diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_NOT_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_NOT_SA_SERVICE.cs index cd5e86a0..2d2e1b6a 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_NOT_SA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_NOT_SA_SERVICE.cs @@ -132,6 +132,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ + [HttpPost] public override async Task GenerateSettlementOrder(BBAC_NOT_SA_DETAIL_REQ_DTO input) { diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_NOT_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_NOT_SA_SERVICE.cs index bcda4f67..117db355 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_NOT_SA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_NOT_SA_SERVICE.cs @@ -1,9 +1,18 @@ using System; using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Reflection; using System.Threading.Tasks; +using Magicodes.ExporterAndImporter.Core; +using Magicodes.ExporterAndImporter.Csv; +using Magicodes.ExporterAndImporter.Excel; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using SettleAccount.Domain.BQ; +using Shouldly; +using Volo.Abp.Data; +using Volo.Abp.ObjectMapping; using Win.Abp.Snowflakes; using Win.Sfs.BaseData.ImportExcelCommon; using Win.Sfs.SettleAccount.Bases; @@ -41,6 +50,82 @@ namespace Win.Sfs.SettleAccount.Entities.BQ _hbpoNotMng = hbpoNotMng; } + [HttpPost] + //[Route("export")] + public override async Task ExportAsync(HBPO_NOT_SA_DETAIL_REQ_DTO input) + { + var ls = input.Filters.Where(p => p.Column == "businessType").ToList(); + if (ls.Count > 0) + { + var entiy = input.Filters.Where(p => p.Column == "businessType").FirstOrDefault(); + var value = entiy.Value; + + input.Filters.Remove(entiy); + } + + IExporter _csv = new CsvExporter(); + IExporter _excel = new ExcelExporter(); + var entities = await _detailRepository.GetListByFilterAsync(input.Filters, input.Sorting, int.MaxValue, 0, true).ConfigureAwait(false); + + var dtoDetails = ObjectMapper.Map, List>(entities); + + var inner = from d in entities + join p in dtoDetails on d.Id equals p.Id + + select + new HBPO_NOT_SA_DETAIL_EXP_DTO() + { + SettleBillNum = d.SettleBillNum, + Site = d.Site, + Category = d.BusinessType.ToString(), + RealPN = d.GetProperty("RealPN", ""), + InvGroupNum = p.InvGroupNum, + SettleDate = d.SettleDate, + LU = d.LU, + PN = d.PN, + Qty = d.Qty, + GroupNum = d.GroupNum, + KeyCode = d.KeyCode, + Price = p.Price, + }; + + //dtoDetails.ForEach(dtoDetail => + //{ + // var item= entities.FirstOrDefault(e => e.Id == dtoDetail.Id); + // dtoDetail.RealPN = item.GetProperty("RealPN", ""); + + //}); + + + var classDisplayName = typeof(HBPO_NOT_SA_DETAIL_EXP_DTO).GetCustomAttribute()?.Name ?? typeof(HBPO_NOT_SA_DETAIL_EXP_DTO).Name; + string _fileName = $"{classDisplayName}_{Guid.NewGuid().ToString()}.xlsx"; + byte[] result = null; + + //switch (input.FileType) + //{ + // case 0: + // result = await _csv.ExportAsByteArray(dtoDetails).ConfigureAwait(false); + // break; + // case 1: + // result = await _excel.ExportAsByteArray(dtoDetails).ConfigureAwait(false); + // break; + //} + + result = await _excel.ExportAsByteArray(inner.ToList()).ConfigureAwait(false); + result.ShouldNotBeNull(); + + //保存导出文件到服务器存成二进制 + await _excelImportService.SaveBlobAsync( + new SaveExcelImportInputDto + { + Name = _fileName, + Content = result + } + ).ConfigureAwait(false); + return _fileName; + } + + public override async Task GenerateSettlementOrder(HBPO_NOT_SA_DETAIL_REQ_DTO input) { var entitys = await _detailRepository.GetListByFilterAsync(input.Filters, input.Sorting, int.MaxValue, input.SkipCount).ConfigureAwait(false); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisBBACSaSeEdiCompareExportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisBBACSaSeEdiCompareExportService.cs index 3e1d66d6..a873e84c 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisBBACSaSeEdiCompareExportService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisBBACSaSeEdiCompareExportService.cs @@ -140,8 +140,23 @@ namespace SettleAccount.Job.Services.Report public List GetEdiSeSaCompareData(int version, DateTime seStartDateTime, DateTime seEndDateTime) { //结算 + //var saGroup = from sa in _settleAccountDbContext.Set() + // where sa.BusinessType == businessType && sa.Version == version + // group sa by new { sa.PN, sa.CustomerPartCodeNoSpace } into groupItem + // select new + // { + // groupItem.Key.PN, + // groupItem.Key.CustomerPartCodeNoSpace, + // Qty = groupItem.Sum(t => t.Qty), + // Version = groupItem.Max(t => t.Version), + // LU = groupItem.Max(t => t.LU), + // SettleDate = groupItem.Max(t => t.SettleDate), + // PartCode = groupItem.Max(t => t.PartCode), + // Site = groupItem.Max(t => t.Site), + // Price = groupItem.Max(t => t.Price), + // }; var saGroup = from sa in _settleAccountDbContext.Set() - where sa.BusinessType == businessType && sa.Version == version + where sa.BusinessType == businessType group sa by new { sa.PN, sa.CustomerPartCodeNoSpace } into groupItem select new { @@ -156,8 +171,23 @@ namespace SettleAccount.Job.Services.Report Price = groupItem.Max(t => t.Price), }; //发运 + //var seGroup = (from se in _settleAccountDbContext.Set() + // where se.BusinessType == businessType && se.BillTime >= seStartDateTime && se.BillTime <= seEndDateTime && se.State==0 && se.IsDeleted == false + // group se by new { se.PN, se.CustomerPartCodeNoSpace } into groupItem + // select new + // { + // groupItem.Key.PN, + // groupItem.Key.CustomerPartCodeNoSpace, + // Qty = groupItem.Sum(t => t.Qty), + // LU = groupItem.Max(t => t.LU), + // WmsBillNum = groupItem.Max(t => t.WmsBillNum), + // ShippingDate = groupItem.Max(t => t.ShippingDate), + // FactoryPartCode = groupItem.Max(t => t.FactoryPartCode), + // ToLoc = groupItem.Max(t => t.ToLoc), + // ErpToLoc = groupItem.Max(t => t.ErpToLoc) + // }).Where(t => t.Qty != 0M); var seGroup = (from se in _settleAccountDbContext.Set() - where se.BusinessType == businessType && se.BillTime >= seStartDateTime && se.BillTime <= seEndDateTime && se.State==0 && se.IsDeleted == false + where se.BusinessType == businessType && se.IsDeleted == false group se by new { se.PN, se.CustomerPartCodeNoSpace } into groupItem select new { @@ -172,8 +202,18 @@ namespace SettleAccount.Job.Services.Report ErpToLoc = groupItem.Max(t => t.ErpToLoc) }).Where(t => t.Qty != 0M); //Edi + //var ediGroup = from edi in _settleAccountDbContext.Set() + // where edi.IsDeleted == false && edi.IsHaveSeData == true && edi.State == 0 + // group edi by new { edi.PN, edi.CustomerPartCodeNoSpace } into groupItem + // select new + // { + // groupItem.Key.PN, + // groupItem.Key.CustomerPartCodeNoSpace, + // Qty = groupItem.Sum(t => t.Qty), + // LU = groupItem.Max(t => t.LU) + // }; var ediGroup = from edi in _settleAccountDbContext.Set() - where edi.IsDeleted == false && edi.IsHaveSeData == true && edi.State == 0 + where edi.IsDeleted == false && edi.IsHaveSeData == true group edi by new { edi.PN, edi.CustomerPartCodeNoSpace } into groupItem select new { diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisHBPOSaSeEdiCompareExportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisHBPOSaSeEdiCompareExportService.cs index 28be044e..3927b297 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisHBPOSaSeEdiCompareExportService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisHBPOSaSeEdiCompareExportService.cs @@ -135,8 +135,24 @@ namespace SettleAccount.Job.Services.Report public List GetSaSeEdiCompareData(int version, DateTime seStartDateTime, DateTime seEndDateTime) { //结算 + //var saGroup = from sa in _settleAccountDbContext.Set() + // where sa.BusinessType == businessType && sa.Version == version + // group sa by new { sa.PN, sa.CustomerPartCodeNoSpace } into groupItem + // select new + // { + // groupItem.Key.PN, + // groupItem.Key.CustomerPartCodeNoSpace, + // Qty = groupItem.Sum(t => t.Qty), + // Version = groupItem.Max(t => t.Version), + // LU = groupItem.Max(t => t.LU), + // SettleDate = groupItem.Max(t => t.SettleDate), + // PartCode = groupItem.Max(t => t.PartCode), + // Site = groupItem.Max(t => t.Site), + // Price = groupItem.Max(t => t.Price) + // }; + var saGroup = from sa in _settleAccountDbContext.Set() - where sa.BusinessType == businessType && sa.Version == version + where sa.BusinessType == businessType group sa by new { sa.PN, sa.CustomerPartCodeNoSpace } into groupItem select new { @@ -150,9 +166,26 @@ namespace SettleAccount.Job.Services.Report Site = groupItem.Max(t => t.Site), Price = groupItem.Max(t => t.Price) }; + //发运 + //var seGroup = (from se in _settleAccountDbContext.Set() + // where se.BusinessType == businessType && se.BillTime >= seStartDateTime && se.BillTime <= seEndDateTime && se.State == 0 && se.IsDeleted == false + // group se by new { se.PN, se.CustomerPartCodeNoSpace } into groupItem + // select new + // { + // groupItem.Key.PN, + // groupItem.Key.CustomerPartCodeNoSpace, + // Qty = groupItem.Sum(t => t.Qty), + // LU = groupItem.Max(t => t.LU), + // WmsBillNum = groupItem.Max(t => t.WmsBillNum), + // ShippingDate = groupItem.Max(t => t.ShippingDate), + // FactoryPartCode = groupItem.Max(t => t.FactoryPartCode), + // ToLoc = groupItem.Max(t => t.ToLoc), + // ErpToLoc = groupItem.Max(t => t.ErpToLoc) + // }).Where(t => t.Qty != 0M); + var seGroup = (from se in _settleAccountDbContext.Set() - where se.BusinessType == businessType && se.BillTime >= seStartDateTime && se.BillTime <= seEndDateTime && se.State == 0 && se.IsDeleted == false + where se.BusinessType == businessType && se.IsDeleted == false group se by new { se.PN, se.CustomerPartCodeNoSpace } into groupItem select new { @@ -166,9 +199,20 @@ namespace SettleAccount.Job.Services.Report ToLoc = groupItem.Max(t => t.ToLoc), ErpToLoc = groupItem.Max(t => t.ErpToLoc) }).Where(t => t.Qty != 0M); + //Edi + //var ediGroup = from edi in _settleAccountDbContext.Set() + // where edi.IsDeleted == false && edi.IsHaveSeData == true && edi.State == 0 + // group edi by new { edi.PN, edi.CustomerPartCodeNoSpace } into groupItem + // select new + // { + // groupItem.Key.PN, + // groupItem.Key.CustomerPartCodeNoSpace, + // Qty = groupItem.Sum(t => t.Qty), + // LU = groupItem.Max(t => t.LU) + // }; var ediGroup = from edi in _settleAccountDbContext.Set() - where edi.IsDeleted == false && edi.IsHaveSeData == true && edi.State == 0 + where edi.IsDeleted == false && edi.IsHaveSeData == true group edi by new { edi.PN, edi.CustomerPartCodeNoSpace } into groupItem select new { @@ -177,6 +221,7 @@ namespace SettleAccount.Job.Services.Report Qty = groupItem.Sum(t => t.Qty), LU = groupItem.Max(t => t.LU) }; + var seEdiGroup = from se in seGroup join edi in ediGroup on new { se.PN, se.CustomerPartCodeNoSpace } equals new { edi.PN, edi.CustomerPartCodeNoSpace } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SaSeEdiCompareExportBaseService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SaSeEdiCompareExportBaseService.cs index 9e1f301b..f6df0838 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SaSeEdiCompareExportBaseService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SaSeEdiCompareExportBaseService.cs @@ -259,6 +259,8 @@ namespace SettleAccount.Job.Services.Report SEQty = p.Sum(t => t.SEQty), EdiQty = p.Sum(t => t.EdiQty) }).ToList(); + //有结算无发运 + var haveSaNotHaveSeExport = saSeEdiCompareDetailExports.FindAll(t => new EnumSaSeEdiCompareCategory[] { EnumSaSeEdiCompareCategory.HaveSaNotHaveSeHaveEdi, EnumSaSeEdiCompareCategory.HaveSaNotHaveSeNotHaveEdi }.Contains(t.Category)); //有结算有发运 var haveSaHaveSeExports = saSeEdiCompareDetailExports.FindAll(t => new EnumSaSeEdiCompareCategory[] { EnumSaSeEdiCompareCategory.HaveSaHaveSeHaveEdi, EnumSaSeEdiCompareCategory.HaveSaHaveSeNotHaveEdi }.Contains(t.Category)); @@ -295,28 +297,35 @@ namespace SettleAccount.Job.Services.Report }).ToList(); var excelExporter = new ExcelExporter(); - //结算核对明细输出 - excelExporter.Append(saSeEdiCompareDetailExports.Take(detailMaxRowNumberOnASheet).ToList(), $"{businessTypeDisplayName}结算核对明细输出"); - for (var i = 1; i < saSeEdiCompareDetailExports.Count / detailMaxRowNumberOnASheet + ((saSeEdiCompareDetailExports.Count % detailMaxRowNumberOnASheet) > 0 ? 1 : 0); i++) + //有结算无发运 + excelExporter.Append(haveSaNotHaveSeExport.Take(detailMaxRowNumberOnASheet).ToList(), $"{businessTypeDisplayName}有结算无发运"); + for (var i = 1; i < haveSaNotHaveSeExport.Count / detailMaxRowNumberOnASheet + ((haveSaNotHaveSeExport.Count % detailMaxRowNumberOnASheet) > 0 ? 1 : 0); i++) { - var sheetDataItems = saSeEdiCompareDetailExports.Skip(i * detailMaxRowNumberOnASheet).Take(detailMaxRowNumberOnASheet).ToList(); - excelExporter.Append(sheetDataItems, $"{businessTypeDisplayName}结算核对明细输出-{i}"); + var sheetDataItems = haveSaNotHaveSeExport.Skip(i * detailMaxRowNumberOnASheet).Take(detailMaxRowNumberOnASheet).ToList(); + excelExporter.Append(sheetDataItems, $"{businessTypeDisplayName}有结算无发运-{i}"); } - //结算核对汇总输出 - excelExporter.Append(saSeEdiCompareSumExports.Take(sumMaxRowNumberOnASheet).ToList(), $"{businessTypeDisplayName}结算核对汇总输出"); - for (var i = 1; i < saSeEdiCompareSumExports.Count / sumMaxRowNumberOnASheet + ((saSeEdiCompareSumExports.Count % sumMaxRowNumberOnASheet) > 0 ? 1 : 0); i++) + //无结算有发运 + excelExporter.Append(notHaveSaHaveSeExports.Take(detailMaxRowNumberOnASheet).ToList(), $"{businessTypeDisplayName}无结算有发运"); + for (var i = 1; i < notHaveSaHaveSeExports.Count / detailMaxRowNumberOnASheet + ((notHaveSaHaveSeExports.Count % detailMaxRowNumberOnASheet) > 0 ? 1 : 0); i++) { - var sheetDataItems = saSeEdiCompareSumExports.Skip(i * sumMaxRowNumberOnASheet).Take(sumMaxRowNumberOnASheet).ToList(); ; - excelExporter.Append(sheetDataItems, $"{businessTypeDisplayName}结算核对汇总输出-{i}"); + var sheetDataItems = notHaveSaHaveSeExports.Skip(i * detailMaxRowNumberOnASheet).Take(detailMaxRowNumberOnASheet).ToList(); + excelExporter.Append(sheetDataItems, $"{businessTypeDisplayName}无结算有发运-{i}"); } + ////结算核对汇总输出 + //excelExporter.Append(saSeEdiCompareSumExports.Take(sumMaxRowNumberOnASheet).ToList(), $"{businessTypeDisplayName}结算核对汇总输出"); + //for (var i = 1; i < saSeEdiCompareSumExports.Count / sumMaxRowNumberOnASheet + ((saSeEdiCompareSumExports.Count % sumMaxRowNumberOnASheet) > 0 ? 1 : 0); i++) + //{ + // var sheetDataItems = saSeEdiCompareSumExports.Skip(i * sumMaxRowNumberOnASheet).Take(sumMaxRowNumberOnASheet).ToList(); ; + // excelExporter.Append(sheetDataItems, $"{businessTypeDisplayName}结算核对汇总输出-{i}"); + //} //有结算有发货明细输出 - excelExporter.Append(haveSaHaveSeExports.Take(detailMaxRowNumberOnASheet).ToList(), $"{businessTypeDisplayName}有结算有发货明细输出"); - for (var i = 1; i < haveSaHaveSeExports.Count / detailMaxRowNumberOnASheet + ((haveSaHaveSeExports.Count % detailMaxRowNumberOnASheet) > 0 ? 1 : 0); i++) - { - var sheetDataItems = haveSaHaveSeExports.Skip(i * detailMaxRowNumberOnASheet).Take(detailMaxRowNumberOnASheet).ToList(); - excelExporter.Append(sheetDataItems, $"{businessTypeDisplayName}有结算有发货明细输出-{i}"); - } + //excelExporter.Append(haveSaHaveSeExports.Take(detailMaxRowNumberOnASheet).ToList(), $"{businessTypeDisplayName}有结算有发货明细输出"); + //for (var i = 1; i < haveSaHaveSeExports.Count / detailMaxRowNumberOnASheet + ((haveSaHaveSeExports.Count % detailMaxRowNumberOnASheet) > 0 ? 1 : 0); i++) + //{ + // var sheetDataItems = haveSaHaveSeExports.Skip(i * detailMaxRowNumberOnASheet).Take(detailMaxRowNumberOnASheet).ToList(); + // excelExporter.Append(sheetDataItems, $"{businessTypeDisplayName}有结算有发货明细输出-{i}"); + //} //有结算有发货汇总输出 excelExporter.Append(haveSaHaveSeSumExports.Take(sumMaxRowNumberOnASheet).ToList(), $"{businessTypeDisplayName}有结算有发货汇总输出"); for (var i = 1; i < haveSaHaveSeSumExports.Count / sumMaxRowNumberOnASheet + ((haveSaHaveSeSumExports.Count % sumMaxRowNumberOnASheet) > 0 ? 1 : 0); i++) @@ -325,20 +334,20 @@ namespace SettleAccount.Job.Services.Report excelExporter.Append(sheetDataItems, $"{businessTypeDisplayName}有结算有发货汇总输出-{i}"); } - //有结算有发货明细输出 - excelExporter.Append(haveSaNotHaveSeExports.Take(detailMaxRowNumberOnASheet).ToList(), $"{businessTypeDisplayName}有结算无发货明细输出"); - for (var i = 1; i < haveSaNotHaveSeExports.Count / detailMaxRowNumberOnASheet + ((haveSaNotHaveSeExports.Count % detailMaxRowNumberOnASheet) > 0 ? 1 : 0); i++) - { - var sheetDataItems = haveSaNotHaveSeExports.Skip(i * detailMaxRowNumberOnASheet).Take(detailMaxRowNumberOnASheet).ToList(); - excelExporter.Append(sheetDataItems, $"{businessTypeDisplayName}有结算无发货明细输出-{i}"); - } - //有结算有发货汇总输出 - excelExporter.Append(haveSaNotHaveSeSumExports.Take(sumMaxRowNumberOnASheet).ToList(), $"{businessTypeDisplayName}有结算无发货汇总输出"); - for (var i = 1; i < haveSaNotHaveSeSumExports.Count / sumMaxRowNumberOnASheet + ((haveSaNotHaveSeSumExports.Count % sumMaxRowNumberOnASheet) > 0 ? 1 : 0); i++) - { - var sheetDataItems = haveSaNotHaveSeSumExports.Skip(i * sumMaxRowNumberOnASheet).Take(sumMaxRowNumberOnASheet).ToList(); - excelExporter.Append(sheetDataItems, $"{businessTypeDisplayName}有结算无发货汇总输出-{i}"); - } + ////有结算无发货明细输出 + //excelExporter.Append(haveSaNotHaveSeExports.Take(detailMaxRowNumberOnASheet).ToList(), $"{businessTypeDisplayName}有结算无发货明细输出"); + //for (var i = 1; i < haveSaNotHaveSeExports.Count / detailMaxRowNumberOnASheet + ((haveSaNotHaveSeExports.Count % detailMaxRowNumberOnASheet) > 0 ? 1 : 0); i++) + //{ + // var sheetDataItems = haveSaNotHaveSeExports.Skip(i * detailMaxRowNumberOnASheet).Take(detailMaxRowNumberOnASheet).ToList(); + // excelExporter.Append(sheetDataItems, $"{businessTypeDisplayName}有结算无发货明细输出-{i}"); + //} + ////有结算无发货汇总输出 + //excelExporter.Append(haveSaNotHaveSeSumExports.Take(sumMaxRowNumberOnASheet).ToList(), $"{businessTypeDisplayName}有结算无发货汇总输出"); + //for (var i = 1; i < haveSaNotHaveSeSumExports.Count / sumMaxRowNumberOnASheet + ((haveSaNotHaveSeSumExports.Count % sumMaxRowNumberOnASheet) > 0 ? 1 : 0); i++) + //{ + // var sheetDataItems = haveSaNotHaveSeSumExports.Skip(i * sumMaxRowNumberOnASheet).Take(sumMaxRowNumberOnASheet).ToList(); + // excelExporter.Append(sheetDataItems, $"{businessTypeDisplayName}有结算无发货汇总输出-{i}"); + //} return excelExporter; }