diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Wms/WmsDetailReportDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Wms/WmsDetailReportDto.cs index 927f8724..4a983185 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Wms/WmsDetailReportDto.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Wms/WmsDetailReportDto.cs @@ -55,6 +55,9 @@ namespace Win.Sfs.SettleAccount.Entities.Wms.WmsSumOutput [Display(Name = "状态")] public int State { set; get; } + + [Display(Name = "过账日期")] + public DateTime AccountDate { set; get; } } 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 671bea8b..e6aa2676 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsUnInterface.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsUnInterface.cs @@ -63,7 +63,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS [HttpGet] [Route("Make")] [UnitOfWork(false)] - public async Task ReportMake(string version,DateTime accountDate) + public async Task ReportMake(string version) { var _ls= _dapper.GetWmsSumExtendList(version);//报表 @@ -106,7 +106,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS String.Empty, 0, version, - accountDate + DateTime.MaxValue )); } } @@ -167,9 +167,9 @@ namespace Win.Sfs.SettleAccount.Entities.WMS var _entity = entities.FirstOrDefault(); if (_entity != null) { - var _version = _entity.Version; - var _accountDate = _entity.AccountDate; - _erpDapper.InsertWmsSum(_ls, _version, _accountDate); + var _version = input.Version; + var _accountDate = input.AccountDate; + _erpDapper.InsertWmsSum(entities, _version, _accountDate); } } return true;