WHS022~WHS024 增加分頁功能

AMESCoreStudio.Web/Controllers/WHSController.cs

@@ -3437,13 +3437,13 @@ namespace AMESCoreStudio.Web.Controllers
 
         [ResponseCache(Duration = 0)]
         [HttpGet]
-        public async Task<IActionResult> GetWorkingStationsAsync(int id)
+        public async Task<IActionResult> 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<IActionResult> GetWorkingLinesAsync(int id)
+        public async Task<IActionResult> GetWorkingLinesAsync(int id, int page = 0, int limit = 10)
         {
             //  var result = await _whsApi.GetWorkingLinesbyUnit(id);
-            var result = await _whsApi.GetWorkingLinesbyMultiUnit(id);
+            var result = await _whsApi.GetWorkingLinesbyMultiUnit(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 });
@@ -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 });

AMESCoreStudio.Web/HttpApis/AMES/IWHS.cs

@@ -780,7 +780,7 @@ namespace AMESCoreStudio.Web
         /// </summary>
         /// <returns></returns>
         [WebApiClient.Attributes.HttpGet("api/WorkingLines/MultiUnit/{id}")]
-        ITask<List<dynamic>> GetWorkingLinesbyMultiUnit(int id);
+        ITask<ResultModel<dynamic>> GetWorkingLinesbyMultiUnit(int id, int page = 0, int limit = 10);
 
 
         #endregion
@@ -836,7 +836,7 @@ namespace AMESCoreStudio.Web
         /// </summary>
         /// <returns></returns>
         [WebApiClient.Attributes.HttpGet("api/WorkingStations/MultiUnit/{id}")]
-        ITask<List<dynamic>> GetWorkingStationsbyMultiUnit(int id);
+        ITask<ResultModel<dynamic>> GetWorkingStationsbyMultiUnit(int id,int page = 0, int limit = 10);
 
 
 

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']);
         }
 
     </script>

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']);
         }
 
     </script>

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']);
     </script>

AMESCoreStudio.Web/Views/WHS/WHS024C.cshtml

@@ -29,7 +29,7 @@
             <div class="form-group form-inline my-sm-1">
                 <label asp-for="TypeNo" class="control-label col-sm-3"></label>
                 <select asp-for="TypeNo" class="custom-select col-sm-9">
-				    <option value="N/A">N/A</option>
+				    <option value="">N/A</option>
                     <option value="0010">0010</option>
                     <option value="0020">0020</option>
                     <option value="0030">0030</option>

AMESCoreStudio.Web/Views/WHS/WHS024U.cshtml

@@ -33,7 +33,7 @@
             <div class="form-group form-inline my-sm-1">
                 <label asp-for="TypeNo" class="control-label col-sm-3"></label>
                 <select asp-for="TypeNo" class="custom-select col-sm-9">
-				    <option value="N/A">N/A</option>
+				    <option value="">N/A</option>
                     <option value="0010">0010</option>
                     <option value="0020">0020</option>
                     <option value="0030">0030</option>

AMESCoreStudio.WebApi/Controllers/AMES/WorkingLinesController.cs

@@ -143,9 +143,9 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         /// <param name="id">報工生產單位</param>
         /// <returns></returns>
         [HttpGet("MultiUnit/{id}")]
-        public async Task<ActionResult<IEnumerable<dynamic>>> GetWorkingLinesMulti(int id)
+        public async Task<ResultModel<dynamic>> GetWorkingLinesMulti(int id,int page = 0, int limit = 10)
         {
-           // IQueryable<WorkingLine> 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<dynamic> result = new ResultModel<dynamic>();
+
+            // 紀錄筆數
+            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;
         }
 
 

AMESCoreStudio.WebApi/Controllers/AMES/WorkingStationsController.cs

@@ -150,7 +150,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         /// <param name="id">報工生產單位</param>
         /// <returns></returns>
         [HttpGet("MultiUnit/{id}")]
-        public async Task<ActionResult<IEnumerable<dynamic>>> GetWorkingStationsMulti(int id)
+        public async Task<ResultModel<dynamic>> GetWorkingStationsMulti(int id, int page = 0, int limit = 10)
         {
             // IQueryable<WorkingLine> q = _context.WorkingLines;
 
@@ -177,12 +177,20 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             }
             var WorkingLine = await q.ToListAsync();
 
-            if (WorkingLine == null)
+
+            ResultModel<dynamic> result = new ResultModel<dynamic>();
+
+            // 紀錄筆數
+            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;
         }