Browse Source

更新版本

FoShanPG
Administrator 3 years ago
parent
commit
b560181278
  1. 19
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/ErpSumOutputDapperRepository.cs
  2. 6
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/WmsOutputSumDapperRepository.cs
  3. 4
      src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/WmsOutputSumExportService.cs

19
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<WMSDbContext>, ITransientDependency
{
public ErpSumOutputDapperRepository(IDbContextProvider<WMSDbContext> dbContextProvider) : base(dbContextProvider)
{
}
}
}

6
src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/WmsOutputSumDapperRepository.cs

@ -37,9 +37,6 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
[ExporterHeader(DisplayName = "WMS待出库金额")] [ExporterHeader(DisplayName = "WMS待出库金额")]
public string WMS待出库金额 { set; get; } public string WMS待出库金额 { set; get; }
[ExporterHeader(DisplayName = "物料组编码")] [ExporterHeader(DisplayName = "物料组编码")]
public string { set; get; } public string { set; get; }
[ExporterHeader(DisplayName = "物料组车型")] [ExporterHeader(DisplayName = "物料组车型")]
@ -48,7 +45,8 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
public string { set; get; } public string { set; get; }
[ExporterHeader(DisplayName = "备注")]
public string { set; get; }

4
src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/WmsOutputSumExportService.cs

@ -88,9 +88,9 @@ namespace SettleAccount.Job.Services.Report
var _first = exportName.FirstOrDefault(); var _first = exportName.FirstOrDefault();
ExcelExporter _exporter = new ExcelExporter();//导出Excel ExcelExporter _exporter = new ExcelExporter();//导出Excel
var result = _exporter.Append(_ls.ToList(), "未结明细表") var result = _exporter.Append(_lst.ToList(), "结算出库汇总表")
.SeparateBySheet() .SeparateBySheet()
.Append(_lst.ToList(), "结算出库汇总表") .Append(_ls.ToList(), "未结明细表")
.ExportAppendDataAsByteArray(); .ExportAppendDataAsByteArray();
result.ShouldNotBeNull(); result.ShouldNotBeNull();
_fileContainer.SaveAsync(_first, result.Result, true); _fileContainer.SaveAsync(_first, result.Result, true);

Loading…
Cancel
Save