From c6708c68e71cf26d01fe43624714820422406ab5 Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Tue, 10 Dec 2024 17:21:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8A=A5=E5=B7=A5=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/MES/Product/ProReportworkController.cs | 4 ++-- DOAN.Service/MES/Product/ProReportworkService.cs | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) 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