diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Reports/ReportRequestDto/ReportRequestDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Reports/ReportRequestDto/ReportRequestDto.cs index cc73e391..0fdd3de8 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Reports/ReportRequestDto/ReportRequestDto.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Reports/ReportRequestDto/ReportRequestDto.cs @@ -59,8 +59,8 @@ namespace Win.Sfs.SettleAccount.Reports.ReportRequestDto public string CustomerPartCode {set;get;} public string EstimateTypeDesc {set;get;} public string State {set;get;} - public DateTime Begin {set;get;} - public DateTime End { set; get; } + public string Begin {set;get;} + public string End { set; get; } } } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs index 78edb22a..c4b2dff7 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs @@ -141,8 +141,8 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices customConditionList.Add(new CustomCondition() { Name = "ProjectName", Value = "有条码看板结算核对" }); customConditionList.Add(new CustomCondition() { Name = "Kanban", Value = input.KanBan ?? string.Empty }); customConditionList.Add(new CustomCondition() { Name = "SapMaterialCode", Value = input.SapMaterialCode ?? string.Empty }); - customConditionList.Add(new CustomCondition() { Name = "BegingTime", Value = input.Begin.ToString() }); - customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = input.End.ToString() }); + customConditionList.Add(new CustomCondition() { Name = "BegingTime", Value = input.Begin ?? string.Empty }); + customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = input.End ?? string.Empty }); var _taskid = await _service.ExportEnqueueAsync("看板结算输出", ExportExtentsion.Excel,input.Version ,string.Empty,CurrentUser, typeof(SettleKBWithCodeExportService), customConditionList, (rs) => { @@ -165,8 +165,8 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices customConditionList.Add(new CustomCondition() { Name = "ProjectName", Value = "有条码看板结算核对" }); customConditionList.Add(new CustomCondition() { Name = "Kanban", Value = input.KanBan ?? string.Empty }); customConditionList.Add(new CustomCondition() { Name = "SapMaterialCode", Value = input.SapMaterialCode ?? string.Empty }); - customConditionList.Add(new CustomCondition() { Name = "BegingTime", Value = input.Begin.ToString() }); - customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = input.End.ToString() }); + customConditionList.Add(new CustomCondition() { Name = "BegingTime", Value = input.Begin ?? string.Empty }); + customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = input.End ?? string.Empty }); var _taskid = await _service.ExportEnqueueAsync("无条码看板结算输出", ExportExtentsion.Excel, input.Version,string.Empty, CurrentUser, typeof(SettleKBWithOutCodeExportService), customConditionList, (rs) => { diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleKBWithCodeDapperReportRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleKBWithCodeDapperReportRepository.cs index 1f2bd7e1..34572747 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleKBWithCodeDapperReportRepository.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleKBWithCodeDapperReportRepository.cs @@ -38,7 +38,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report { condition += string.Format(" and c.WMSActualGoodsDate>='{0}' ", begintime); } - if (!string.IsNullOrEmpty(endtime) && Convert.ToDateTime(begintime) != DateTime.MinValue) + if (!string.IsNullOrEmpty(endtime) && Convert.ToDateTime(endtime) != DateTime.MinValue) { condition += string.Format(" and c.WMSActualGoodsDate<='{0}' ", endtime); } @@ -237,8 +237,8 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report [ExporterHeader(DisplayName = "交货单号")] public string WMSDeliveryNote { set; get; } - [ExporterHeader(DisplayName = "实际发货日期", Format = "yyyy-MM-dd")] - public DateTime WMSActualGoodsDate { set; get; } + [ExporterHeader(DisplayName = "实际发货日期")] + public string WMSActualGoodsDate { set; get; } [ExporterHeader(DisplayName = "条码号")] public string Kanban { set; get; } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleKBWithCodeExportService.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleKBWithCodeExportService.cs index c01411b0..23bcc463 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleKBWithCodeExportService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleKBWithCodeExportService.cs @@ -92,23 +92,6 @@ namespace SettleAccount.Job.Services.Report } } - if (!string.IsNullOrEmpty(beginTime) && Convert.ToDateTime(beginTime) != DateTime.MinValue) - { - _list = _list.Where(p => DateTime.Parse(beginTime) <= p.WMSActualGoodsDate).ToList(); - } - if (!string.IsNullOrEmpty(endTime) && Convert.ToDateTime(beginTime) != DateTime.MinValue) - { - _list = _list.Where(p => DateTime.Parse(endTime) >= p.WMSActualGoodsDate).ToList(); - } - - //if (!string.IsNullOrEmpty(beginTime)) - //{ - // _list = _list.Where(p => DateTime.Parse(beginTime)<=p.ActualGoodsDate).ToList(); - //} - //if (!string.IsNullOrEmpty(endTime)) - //{ - // _list = _list.Where(p => DateTime.Parse(endTime) >= p.ActualGoodsDate).ToList(); - //} if (!string.IsNullOrEmpty(kanban)) {