From 0b3a8e1b20ce607a36de9e12c21e87ebb679ce87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= Date: Sat, 11 May 2024 09:36:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=EF=BC=8C=E4=B8=8A=E6=96=99de?= =?UTF-8?q?bug=E6=B5=8B=E8=AF=95=E6=94=B9=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZR.Service/mes/mm/MaterialInputService.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ZR.Service/mes/mm/MaterialInputService.cs b/ZR.Service/mes/mm/MaterialInputService.cs index 4d5b3488..d6555a2a 100644 --- a/ZR.Service/mes/mm/MaterialInputService.cs +++ b/ZR.Service/mes/mm/MaterialInputService.cs @@ -96,7 +96,8 @@ namespace ZR.Service.mes.mm .Where(it => it.Year == year) .Where(it => it.Week == week) .Where(it => it.Date == dayOfWeekNumber) - .Where(it => it.Remark3 == "是" || it.Remark1 == "调试").ToList(); + .Where(it => it.Remark3 == "是" || it.Remark1 == "调试") + .ToList(); // .ToPageList(query.pageNum??1, query.pageSize??10, ref total); foreach (ProWorkorder_v2 workorder in WorkorderList) @@ -132,7 +133,11 @@ namespace ZR.Service.mes.mm } WorkorderList.RemoveAll(num => num.PreviousNumber <= 0); total= WorkorderList.Count; - var returndata= WorkorderList.Skip(query.pageNum ?? 1).Take(query.pageSize ?? 10).ToList(); + var returndata= WorkorderList + .OrderBy(it => it.ClientWorkorder) + .Skip(query.pageNum ?? 1) + .Take(query.pageSize ?? 10) + .ToList(); return (returndata, total); }