From e326f563d671346915bf15364590bccbedae8f5d Mon Sep 17 00:00:00 2001 From: Yiru Date: Fri, 25 Aug 2023 15:47:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E8=B2=A8=E5=BA=8F=E8=99=9F=E9=87=8D?= =?UTF-8?q?=E5=8F=96=E6=8E=92=E5=BA=8F=E4=BF=AE=E6=94=B9(=E9=A0=90?= =?UTF-8?q?=E8=A8=88=E9=96=8B=E5=B7=A5=E6=97=A5=E3=80=81=E5=BA=8F=E8=99=9F?= =?UTF-8?q?)=20=E5=AE=8C=E5=B7=A5=E5=85=A5=E5=BA=AB=E6=98=B6=E4=BA=A8?= =?UTF-8?q?=E5=9B=9E=E5=82=B3=E5=80=BC=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AMESCoreStudio.Web/Controllers/PCSController.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs index 7b9cdeb0..0654a907 100644 --- a/AMESCoreStudio.Web/Controllers/PCSController.cs +++ b/AMESCoreStudio.Web/Controllers/PCSController.cs @@ -7749,8 +7749,8 @@ namespace AMESCoreStudio.Web.Controllers else { // result_FQC = await _pcsApi.PutFqcInhouseMaster_EVER(JsonConvert.SerializeObject(fqcInhouseMaster)); - - await _pcsApi.PutFqcInhouseMasterForLocationNo_EVER(JsonConvert.SerializeObject(fqcInhouseMaster)); + + result_FQC = await _pcsApi.PutFqcInhouseMasterForLocationNo_EVER(JsonConvert.SerializeObject(fqcInhouseMaster)); } if (!result_FQC.Success) @@ -9118,7 +9118,7 @@ namespace AMESCoreStudio.Web.Controllers #endregion } - result.Data = result.Data.OrderBy(o => o.StartNo); + result.Data = result.Data.OrderBy(o => o.WipScheduleDate).ThenBy(o =>o.StartNo); return Json(new Table() { code = 0, msg = "", data = result.Data, count = result.DataTotal }); } }