From d042d93253a1eaaf49de14d61332b3ea5998c7c0 Mon Sep 17 00:00:00 2001 From: yiru Date: Wed, 2 Jul 2025 14:39:51 +0800 Subject: [PATCH] =?UTF-8?q?WHS022~WHS024=20=E5=A2=9E=E5=8A=A0=E5=88=86?= =?UTF-8?q?=E9=A0=81=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/WHSController.cs | 20 +++++++++---------- AMESCoreStudio.Web/HttpApis/AMES/IWHS.cs | 4 ++-- AMESCoreStudio.Web/Views/WHS/WHS022.cshtml | 2 +- AMESCoreStudio.Web/Views/WHS/WHS023.cshtml | 2 +- AMESCoreStudio.Web/Views/WHS/WHS024.cshtml | 2 +- AMESCoreStudio.Web/Views/WHS/WHS024C.cshtml | 2 +- AMESCoreStudio.Web/Views/WHS/WHS024U.cshtml | 2 +- .../AMES/WorkingLinesController.cs | 17 +++++++++++----- .../AMES/WorkingStationsController.cs | 16 +++++++++++---- 9 files changed, 41 insertions(+), 26 deletions(-) diff --git a/AMESCoreStudio.Web/Controllers/WHSController.cs b/AMESCoreStudio.Web/Controllers/WHSController.cs index a03ee4a..69a920e 100644 --- a/AMESCoreStudio.Web/Controllers/WHSController.cs +++ b/AMESCoreStudio.Web/Controllers/WHSController.cs @@ -3437,13 +3437,13 @@ namespace AMESCoreStudio.Web.Controllers [ResponseCache(Duration = 0)] [HttpGet] - public async Task GetWorkingStationsAsync(int id) + public async Task GetWorkingStationsAsync(int id, int page = 0, int limit = 10) { - var result = await _whsApi.GetWorkingStationsbyMultiUnit(id); + var result = await _whsApi.GetWorkingStationsbyMultiUnit(id, page, limit ); - if (result.Count > 0) + if (result.DataTotal > 0) { - return Json(new Table() { code = 0, msg = "", data = result, count = result.Count }); + return Json(new Table() { code = 0, msg = "", data = result.Data, count = result.DataTotal }); } return Json(new Table() { count = 0, data = null }); @@ -3452,13 +3452,13 @@ namespace AMESCoreStudio.Web.Controllers [ResponseCache(Duration = 0)] [HttpGet] - public async Task GetWorkingLinesAsync(int id) + public async Task GetWorkingLinesAsync(int id, int page = 0, int limit = 10) { // var result = await _whsApi.GetWorkingLinesbyUnit(id); - var result = await _whsApi.GetWorkingLinesbyMultiUnit(id); - if (result.Count > 0) + var result = await _whsApi.GetWorkingLinesbyMultiUnit(id, page, limit); + if (result.DataTotal > 0) { - return Json(new Table() { code = 0, msg = "", data = result, count = result.Count }); + return Json(new Table() { code = 0, msg = "", data = result.Data, count = result.DataTotal }); } return Json(new Table() { count = 0, data = null }); @@ -3630,9 +3630,9 @@ namespace AMESCoreStudio.Web.Controllers { // var result = await _whsApi.GetWorkingLinesbyUnit(id); var result = await _whsApi.GetWorkingLinesbyMultiUnit(id); - if (result.Count> 0) + if (result.DataTotal > 0) { - return Json(new Table() { code = 0, msg = "", data = result, count = result.Count }); + return Json(new Table() { code = 0, msg = "", data = result.Data, count = result.DataTotal }); } return Json(new Table() { count = 0, data = null }); diff --git a/AMESCoreStudio.Web/HttpApis/AMES/IWHS.cs b/AMESCoreStudio.Web/HttpApis/AMES/IWHS.cs index 62aa4e3..fe7ab1c 100644 --- a/AMESCoreStudio.Web/HttpApis/AMES/IWHS.cs +++ b/AMESCoreStudio.Web/HttpApis/AMES/IWHS.cs @@ -780,7 +780,7 @@ namespace AMESCoreStudio.Web /// /// [WebApiClient.Attributes.HttpGet("api/WorkingLines/MultiUnit/{id}")] - ITask> GetWorkingLinesbyMultiUnit(int id); + ITask> GetWorkingLinesbyMultiUnit(int id, int page = 0, int limit = 10); #endregion @@ -836,7 +836,7 @@ namespace AMESCoreStudio.Web /// /// [WebApiClient.Attributes.HttpGet("api/WorkingStations/MultiUnit/{id}")] - ITask> GetWorkingStationsbyMultiUnit(int id); + ITask> GetWorkingStationsbyMultiUnit(int id,int page = 0, int limit = 10); diff --git a/AMESCoreStudio.Web/Views/WHS/WHS022.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS022.cshtml index 3e7c46e..b9ddfd4 100644 --- a/AMESCoreStudio.Web/Views/WHS/WHS022.cshtml +++ b/AMESCoreStudio.Web/Views/WHS/WHS022.cshtml @@ -113,7 +113,7 @@ }); function tt() { table = hg.table.datatable('test', '報工生產單位維護', '/WHS/GetWorkingUnits' - , {}, tableCols, toolbar, false, 'full-100', ['filter', 'print', 'exports']); + , {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']); } diff --git a/AMESCoreStudio.Web/Views/WHS/WHS023.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS023.cshtml index 96a8dec..ecac8fd 100644 --- a/AMESCoreStudio.Web/Views/WHS/WHS023.cshtml +++ b/AMESCoreStudio.Web/Views/WHS/WHS023.cshtml @@ -135,7 +135,7 @@ function tt() { var unit = $("#unitNo").val(); table = hg.table.datatable('test', '報工線別維護', '/WHS/GetworkingLines?id=' + unit - , {}, tableCols, toolbar, false, 'full-100', ['filter', 'print', 'exports']); + , {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']); } diff --git a/AMESCoreStudio.Web/Views/WHS/WHS024.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS024.cshtml index 1880f3c..6211b9f 100644 --- a/AMESCoreStudio.Web/Views/WHS/WHS024.cshtml +++ b/AMESCoreStudio.Web/Views/WHS/WHS024.cshtml @@ -143,7 +143,7 @@ function tt() { var unit = $("#unitNo").val(); table = hg.table.datatable('test', '報工工作站別維護', '/WHS/GetWorkingStations?id=' + unit - , {}, tableCols, toolbar, false, 'full-100', ['filter', 'print', 'exports']); + , {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']); } // var table = hg.table.datatable('test', '報工工作站別維護', '/WHS/GetWorkingStations', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']); diff --git a/AMESCoreStudio.Web/Views/WHS/WHS024C.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS024C.cshtml index a5b8d8a..c862df3 100644 --- a/AMESCoreStudio.Web/Views/WHS/WHS024C.cshtml +++ b/AMESCoreStudio.Web/Views/WHS/WHS024C.cshtml @@ -29,7 +29,7 @@
- + diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WorkingLinesController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WorkingLinesController.cs index 6b65e26..0cbb9ec 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/WorkingLinesController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/WorkingLinesController.cs @@ -143,9 +143,9 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES /// 報工生產單位 /// [HttpGet("MultiUnit/{id}")] - public async Task>> GetWorkingLinesMulti(int id) + public async Task> GetWorkingLinesMulti(int id,int page = 0, int limit = 10) { - // IQueryable q = _context.WorkingLines; + var q = from q1 in _context.WorkingLines join q2 in _context.WorkingUnits on q1.WorkingUnitID equals q2.WorkingUnitID @@ -168,12 +168,19 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES } var WorkingLine = await q.ToListAsync(); - if (WorkingLine == null) + ResultModel result = new ResultModel(); + + // 紀錄筆數 + result.DataTotal = q.Count(); + + // Table 頁數 + if (page > 0) { - return NotFound(); + q = q.Skip((page - 1) * limit).Take(limit); } + result.Data = await q.ToListAsync(); + return result; - return WorkingLine; } diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WorkingStationsController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WorkingStationsController.cs index 96c5a0d..2e7b754 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/WorkingStationsController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/WorkingStationsController.cs @@ -150,7 +150,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES /// 報工生產單位 /// [HttpGet("MultiUnit/{id}")] - public async Task>> GetWorkingStationsMulti(int id) + public async Task> GetWorkingStationsMulti(int id, int page = 0, int limit = 10) { // IQueryable q = _context.WorkingLines; @@ -177,12 +177,20 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES } var WorkingLine = await q.ToListAsync(); - if (WorkingLine == null) + + ResultModel result = new ResultModel(); + + // 紀錄筆數 + result.DataTotal = q.Count(); + + // Table 頁數 + if (page > 0) { - return NotFound(); + q = q.Skip((page - 1) * limit).Take(limit); } + result.Data = await q.ToListAsync(); + return result; - return WorkingLine; }