RIZO/zhuangpei-mesbackend
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/doan-tech/zhuangpei-mesbackend

Browse Source
This commit is contained in:
赵正易 2024-11-15 09:21:38 +08:00
commit 17e986e153
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DOAN.Admin.WebApi/Controllers/MES/mm/MmPreparantTaskController.cs
View File

@ -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);
}
}

2
DOAN.Service/MES/mm/IService/IMmPreparantTaskService.cs
View File

@ -39,6 +39,6 @@ namespace DOAN.Service.MES.mm.IService
List<MaterialPreparationLargeScreenDto> MaterialPreparationLargeScreen(DateTime toHandelDate);
PagedInfo<FormLineAndTaskAndTaskInfo> ExportPreparantTask(FormsWorkoderAndTaskQuery2 parm);
List<FormLineAndTaskAndTaskInfo> ExportPreparantTask(FormsWorkoderAndTaskQuery2 parm);
}
}

4
DOAN.Service/MES/mm/MmPreparantTaskService.cs
View File

@ -375,7 +375,7 @@ namespace DOAN.Service.MES.mm
}
public PagedInfo<FormLineAndTaskAndTaskInfo> ExportPreparantTask(FormsWorkoderAndTaskQuery2 parm)
public List<FormLineAndTaskAndTaskInfo> ExportPreparantTask(FormsWorkoderAndTaskQuery2 parm)
{
var predicte1 = Expressionable.Create<MmPreparationTaskLine>()
.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<FormLineAndTaskAndTaskInfo, FormLineAndTaskAndTaskInfo>(parm);
}).ToList();
}