1.修改生产料号流程维护BAS012

1.1.修改排序
1.2.修改分页

AMESCoreStudio.Web/Controllers/BASController.cs

@@ -2082,7 +2082,7 @@ namespace AMESCoreStudio.Web.Controllers
         }
 
 
-        public async Task<IActionResult> GetMaterialFlowsByQueryAsync(string itemno, string unitNo)
+        public async Task<IActionResult> GetMaterialFlowsByQueryAsync(string itemno, string unitNo, int page = 0, int limit = 10)
         {
             if(string.IsNullOrEmpty(itemno)  && string.IsNullOrEmpty(unitNo))
                 return Json(new Table() { count = 0, data = null });
@@ -2091,11 +2091,13 @@ namespace AMESCoreStudio.Web.Controllers
             if (string.IsNullOrEmpty(unitNo) )
                 unitNo = "*";
 
-            var result = await _basApi.GetMaterialFlowsByQuery(itemno, unitNo);
+            var result = await _basApi.GetMaterialFlowsByQuery(itemno, unitNo, page, limit);
+
+            var result_total = await _basApi.GetMaterialFlowsByQuery(itemno, unitNo, 0, limit);
 
             if (result.Count > 0)
             {
-                return Json(new Table() { code = 0, msg = "", data = result, count = result.Count });
+                return Json(new Table() { code = 0, msg = "", data = result, count = result_total.Count });
             }
 
             return Json(new Table() { count = 0, data = null });

AMESCoreStudio.Web/HttpApis/IBAS.cs

@@ -694,7 +694,7 @@ namespace AMESCoreStudio.Web
         /// </summary>
         /// <returns></returns>
         [WebApiClient.Attributes.HttpGet("api/MaterialFlows/Query/{itemno}/{unitNo}")]
-        ITask<List<MaterialFlow>> GetMaterialFlowsByQuery(string itemno, string unitNo);
+        ITask<List<MaterialFlow>> GetMaterialFlowsByQuery(string itemno, string unitNo, int page = 0, int limit = 10);
 
         /// <summary>
         /// 根據ID獲取指定料號流程資料

AMESCoreStudio.Web/Views/BAS/BAS012.cshtml

@@ -56,7 +56,7 @@
                 sort: true
             },
             {
-                field: 'materialItem',
+                field: 'itemNo',
                 title: '料號',
                 sort: true,
                 templet: function (d) {

AMESCoreStudio.WebApi/Controllers/BAS/MaterialFlowsController.cs

@@ -63,7 +63,7 @@ namespace AMESCoreStudio.WebApi.Controllers.BAS
         /// <param name="unitNo">站別</param>
         /// <returns></returns>
         [HttpGet("Query/{itemno}/{unitNo}")]
-        public async Task<ActionResult<IEnumerable<MaterialFlow>>> GetMaterialFlowsByQuery(string itemno, string unitNo)
+        public async Task<ActionResult<IEnumerable<MaterialFlow>>> GetMaterialFlowsByQuery(string itemno, string unitNo, int page = 0, int limit = 10)
         {
             IQueryable<MaterialFlow> q = _context.MaterialFlows;
 
@@ -73,6 +73,15 @@ namespace AMESCoreStudio.WebApi.Controllers.BAS
             if (unitNo != "*")
                 q = q.Where(w => w.UnitNo == unitNo);
 
+            if (page > 0)
+            {
+                q = q.OrderBy(p => p.MaterialItem.ItemNo).Skip((page - 1) * limit).Take(limit);
+            }
+            else
+            {
+                q = q.OrderBy(p => p.MaterialItem.ItemNo);
+            }
+
             var materialFlows = await q.ToListAsync();
 
             foreach (var data in materialFlows)