diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsUnInterface.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsUnInterface.cs index ea912f49..86dabf54 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsUnInterface.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsUnInterface.cs @@ -177,6 +177,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS [Route("Export")] virtual public async Task ExportAsync(WmsRequestDetailReportDto input) { + input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version }); var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue, 0, true); IExporter _excel = new ExcelExporter(); diff --git a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WmsDetailReport.cs b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WmsDetailReport.cs index d4edeeac..87f12cf9 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WmsDetailReport.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WmsDetailReport.cs @@ -86,10 +86,10 @@ namespace Win.Sfs.SettleAccount.Entities public string MaterialDesc { set; get; } [Display(Name = "备注")] public string Remark1 { set; get; } - + [Display(Name = "状态")] public int State { set; get; } - + [Display(Name ="过账日期")] public DateTime AccountDate { set; get; } } public class WmsDetailDiffReport : FullAuditedAggregateRootBase @@ -160,7 +160,7 @@ namespace Win.Sfs.SettleAccount.Entities public string MaterialDesc { set; get; } [Display(Name = "备注")] public string Remark1 { set; get; } - + [Display(Name = "状态")] public int State { set; get; } } 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 2c8a5c01..c9955756 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 @@ -705,10 +705,6 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report - - - - public virtual List GetWmsSumReportList(string version, string state) { @@ -871,10 +867,6 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report var _query = DbConnection.Query(_sql, null, null, true, 1200, null); - - - - return _query.ToList(); }