From b5601812789498066a176dbb3d6ee1eef7935861 Mon Sep 17 00:00:00 2001 From: Administrator Date: Thu, 3 Mar 2022 11:09:07 +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 --- .../Report/ErpSumOutputDapperRepository.cs | 19 +++++++++++++++++++ .../Report/WmsOutputSumDapperRepository.cs | 6 ++---- .../Report/WmsOutputSumExportService.cs | 4 ++-- 3 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/ErpSumOutputDapperRepository.cs diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/ErpSumOutputDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/ErpSumOutputDapperRepository.cs new file mode 100644 index 00000000..8255fd9c --- /dev/null +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/ErpSumOutputDapperRepository.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Volo.Abp.DependencyInjection; +using Volo.Abp.Domain.Repositories.Dapper; +using Volo.Abp.EntityFrameworkCore; + +namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report +{ + public class ErpSumOutputDapperRepository: DapperRepository, ITransientDependency + { + public ErpSumOutputDapperRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) + { + + } + } +} 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 4e80f850..79e9ddd1 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 @@ -37,18 +37,16 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report [ExporterHeader(DisplayName = "WMS待出库金额")] public string WMS待出库金额 { set; get; } - - - [ExporterHeader(DisplayName = "物料组编码")] public string 物料组编码 { set; get; } [ExporterHeader(DisplayName = "物料组车型")] public string 物料组车型 { set; get; } [ExporterHeader(DisplayName = "物料描述")] public string 物料描述 { set; get; } - + [ExporterHeader(DisplayName = "备注")] + public string 备注 { set; get; } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/WmsOutputSumExportService.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/WmsOutputSumExportService.cs index 819444e8..c9edbeda 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/WmsOutputSumExportService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/WmsOutputSumExportService.cs @@ -88,9 +88,9 @@ namespace SettleAccount.Job.Services.Report var _first = exportName.FirstOrDefault(); ExcelExporter _exporter = new ExcelExporter();//导出Excel - var result = _exporter.Append(_ls.ToList(), "未结明细表") + var result = _exporter.Append(_lst.ToList(), "结算出库汇总表") .SeparateBySheet() - .Append(_lst.ToList(), "结算出库汇总表") + .Append(_ls.ToList(), "未结明细表") .ExportAppendDataAsByteArray(); result.ShouldNotBeNull(); _fileContainer.SaveAsync(_first, result.Result, true);