diff --git a/DOAN.Admin.WebApi/Controllers/MES/Product/ProReportworkController.cs b/DOAN.Admin.WebApi/Controllers/MES/Product/ProReportworkController.cs index 064a361..20b6acc 100644 --- a/DOAN.Admin.WebApi/Controllers/MES/Product/ProReportworkController.cs +++ b/DOAN.Admin.WebApi/Controllers/MES/Product/ProReportworkController.cs @@ -32,9 +32,9 @@ namespace DOAN.Admin.WebApi.Controllers /// /// /// - [HttpGet("list")] + [HttpPost("list")] [ActionPermissionFilter(Permission = "proreportwork:list")] - public IActionResult QueryProReportwork([FromQuery] ProReportworkQueryDto parm) + public IActionResult QueryProReportwork([FromBody] ProReportworkQueryDto parm) { parm.JobDate[0] = DOANConvertDate.ConvertLocalDate(parm.JobDate[0]); parm.JobDate[1] = DOANConvertDate.ConvertLocalDate(parm.JobDate[1]); diff --git a/DOAN.Service/MES/Product/ProReportworkService.cs b/DOAN.Service/MES/Product/ProReportworkService.cs index 025c2a4..9769aa6 100644 --- a/DOAN.Service/MES/Product/ProReportworkService.cs +++ b/DOAN.Service/MES/Product/ProReportworkService.cs @@ -25,6 +25,7 @@ public class ProReportworkService : BaseService, IProReportwork var query = Queryable() .Where(predicate.ToExpression()); var response = Context.Queryable(query).LeftJoin((q, w) => q.ProcessId == w.Id) + .OrderBy((q,w)=>new { q.Workorder ,w.Id}) .Select((q, w) => new ProReportworkDto { ProcessName = w.Name