diff --git a/DOAN.Admin.WebApi/Controllers/MES/mm/MmPreparantTaskController.cs b/DOAN.Admin.WebApi/Controllers/MES/mm/MmPreparantTaskController.cs index f3eba4c..98192c1 100644 --- a/DOAN.Admin.WebApi/Controllers/MES/mm/MmPreparantTaskController.cs +++ b/DOAN.Admin.WebApi/Controllers/MES/mm/MmPreparantTaskController.cs @@ -170,7 +170,7 @@ namespace DOAN.WebApi.Controllers.MES.mm var list = preparantTaskService.ExportPreparantTask(parm); - var result = ExportExcelMini(list.Result, "PreparantTask", "备料任务列表"); + var result = ExportExcelMini(list, "PreparantTask", "备料任务列表"); return ExportExcel(result.Item2, result.Item1); } } diff --git a/DOAN.Service/MES/mm/IService/IMmPreparantTaskService.cs b/DOAN.Service/MES/mm/IService/IMmPreparantTaskService.cs index 2b42efb..22e316d 100644 --- a/DOAN.Service/MES/mm/IService/IMmPreparantTaskService.cs +++ b/DOAN.Service/MES/mm/IService/IMmPreparantTaskService.cs @@ -39,6 +39,6 @@ namespace DOAN.Service.MES.mm.IService List MaterialPreparationLargeScreen(DateTime toHandelDate); - PagedInfo ExportPreparantTask(FormsWorkoderAndTaskQuery2 parm); + List ExportPreparantTask(FormsWorkoderAndTaskQuery2 parm); } } diff --git a/DOAN.Service/MES/mm/MmPreparantTaskService.cs b/DOAN.Service/MES/mm/MmPreparantTaskService.cs index e986618..d4e31cb 100644 --- a/DOAN.Service/MES/mm/MmPreparantTaskService.cs +++ b/DOAN.Service/MES/mm/MmPreparantTaskService.cs @@ -375,7 +375,7 @@ namespace DOAN.Service.MES.mm } - public PagedInfo ExportPreparantTask(FormsWorkoderAndTaskQuery2 parm) + public List ExportPreparantTask(FormsWorkoderAndTaskQuery2 parm) { var predicte1 = Expressionable.Create() .AndIF(parm.searchDate != null && parm.searchDate.Length >= 2 && parm.searchDate[0] > DateTime.MinValue, it => it.TaskDate >= parm.searchDate[0].ToLocalTime().Date) @@ -408,7 +408,7 @@ namespace DOAN.Service.MES.mm UpdatedBy = i.UpdatedBy, UpdatedTime = i.UpdatedTime, - }).ToPage(parm); + }).ToList(); }