Browse Source

更新版本

FoShanPG
Administrator 3 years ago
parent
commit
13e8449c13
  1. 1
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsUnInterface.cs
  2. 6
      src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WmsDetailReport.cs
  3. 8
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/WmsOutputSumDapperRepository.cs

1
src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsUnInterface.cs

@ -177,6 +177,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
[Route("Export")] [Route("Export")]
virtual public async Task<string> ExportAsync(WmsRequestDetailReportDto input) virtual public async Task<string> 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, var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue,
0, true); 0, true);
IExporter _excel = new ExcelExporter(); IExporter _excel = new ExcelExporter();

6
src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WmsDetailReport.cs

@ -86,10 +86,10 @@ namespace Win.Sfs.SettleAccount.Entities
public string MaterialDesc { set; get; } public string MaterialDesc { set; get; }
[Display(Name = "备注")] [Display(Name = "备注")]
public string Remark1 { set; get; } public string Remark1 { set; get; }
[Display(Name = "状态")]
public int State { set; get; } public int State { set; get; }
[Display(Name ="过账日期")]
public DateTime AccountDate { set; get; } public DateTime AccountDate { set; get; }
} }
public class WmsDetailDiffReport : FullAuditedAggregateRootBase<Guid> public class WmsDetailDiffReport : FullAuditedAggregateRootBase<Guid>
@ -160,7 +160,7 @@ namespace Win.Sfs.SettleAccount.Entities
public string MaterialDesc { set; get; } public string MaterialDesc { set; get; }
[Display(Name = "备注")] [Display(Name = "备注")]
public string Remark1 { set; get; } public string Remark1 { set; get; }
[Display(Name = "状态")]
public int State { set; get; } public int State { set; get; }
} }

8
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<WmsOutputSumReport2> GetWmsSumReportList(string version, string state) public virtual List<WmsOutputSumReport2> GetWmsSumReportList(string version, string state)
{ {
@ -871,10 +867,6 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
var _query = DbConnection.Query<WmsOutputSumReport2>(_sql, null, null, true, 1200, null); var _query = DbConnection.Query<WmsOutputSumReport2>(_sql, null, null, true, 1200, null);
return _query.ToList(); return _query.ToList();
} }

Loading…
Cancel
Save