diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/usable.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/usable.js index 4e11f88b..c64f387e 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/usable.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/usable.js @@ -21,6 +21,18 @@ const schema = { title: "发票分组号", type: "string", }, + isReturn: { + title: "是否退回单", + type: "string", + }, + invBillNum: { + title: "来源发票号", + type: "string", + }, + parentBillNum: { + title: "来源可结算单号", + type: "string", + }, }, }; diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/NopiDataToExcel.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/NopiDataToExcel.cs new file mode 100644 index 00000000..4bcb5073 --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/NopiDataToExcel.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Win.Sfs.SettleAccount.Entities.BQ +{ + public class NopiDataToExcel + { + + } +} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SeEdiCompareExportBaseService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SeEdiCompareExportBaseService.cs index f8bab835..99a27aa1 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SeEdiCompareExportBaseService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SeEdiCompareExportBaseService.cs @@ -1,11 +1,21 @@ using System; +using System.Collections.Concurrent; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; +using System.Diagnostics; +using System.IO.Compression; +using System.IO; using System.Linq; +using Magicodes.ExporterAndImporter.Core; +using System.Reflection; +using System.Threading.Tasks; +using System.Threading; using Magicodes.ExporterAndImporter.Core.Extension; using Magicodes.ExporterAndImporter.Excel; using Microsoft.AspNetCore.SignalR; using Microsoft.OpenApi.Extensions; +using NPOI.SS.UserModel; +using NPOI.XSSF.UserModel; using SettleAccount.Bases; using SettleAccount.Domain.BQ; using SettleAccount.Job.SignalR; @@ -196,6 +206,7 @@ namespace SettleAccount.Job.Services.Report notHaveEdiHaveSeList.AddRange(haveEdiHaveSeList); notHaveEdiHaveSeList.Reverse(); + //生成对比Excel文件 var excelExporter = new ExcelExporter(); // EDI数据和发货对比 excelExporter.Append(haveEdiNotHaveSeList.Take(maxRowNumberOnASheet).ToList(), $"{businessTypeDisplayName}EDI数据和发货对比"); @@ -231,5 +242,9 @@ namespace SettleAccount.Job.Services.Report return sequenceNumberDate; } #endregion + + #region 生成Excel公共方法 + + #endregion } }