diff --git a/DOAN.Admin.WebApi/Controllers/MES/product/ProWorkorderController.cs b/DOAN.Admin.WebApi/Controllers/MES/product/ProWorkorderController.cs index f60a6ca..ee70309 100644 --- a/DOAN.Admin.WebApi/Controllers/MES/product/ProWorkorderController.cs +++ b/DOAN.Admin.WebApi/Controllers/MES/product/ProWorkorderController.cs @@ -208,6 +208,10 @@ namespace DOAN.Admin.WebApi.Controllers [AllowAnonymous] public IActionResult WorkOrderExport([FromQuery] DateTime extportDate) { + if(extportDate==DateTime.MinValue) + { + return SUCCESS(null); + } var list = _ProWorkorderService.WorkOrderExport(extportDate, new PagerInfo(1, 10000)); var result = ExportExcelMini(list.Result, "workorder", "工单列表"); diff --git a/DOAN.Service/MES/product/ProWorkorderService.cs b/DOAN.Service/MES/product/ProWorkorderService.cs index 2cb178f..355861b 100644 --- a/DOAN.Service/MES/product/ProWorkorderService.cs +++ b/DOAN.Service/MES/product/ProWorkorderService.cs @@ -502,6 +502,7 @@ namespace DOAN.Service.MES.product /// public PagedInfo WorkOrderExport(DateTime exportTime, PagerInfo pager) { + exportTime = exportTime.Date; return Context.Queryable().Where(it => it.WorkorderDate == exportTime).ToPage(pager); }