From 855e3e1fcc131016c99c116cd4bcadbf17a8dbfd Mon Sep 17 00:00:00 2001 From: Marvin Date: Wed, 29 Mar 2023 10:10:49 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7=E6=96=99?= =?UTF-8?q?=E5=8F=B7=E6=B5=81=E7=A8=8B=E7=BB=B4=E6=8A=A4BAS012=201.1.?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=92=E5=BA=8F=201.2.=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AMESCoreStudio.Web/Controllers/BASController.cs | 8 +++++--- AMESCoreStudio.Web/HttpApis/IBAS.cs | 2 +- AMESCoreStudio.Web/Views/BAS/BAS012.cshtml | 2 +- .../Controllers/BAS/MaterialFlowsController.cs | 11 ++++++++++- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/AMESCoreStudio.Web/Controllers/BASController.cs b/AMESCoreStudio.Web/Controllers/BASController.cs index 90955be0..dcd3abb6 100644 --- a/AMESCoreStudio.Web/Controllers/BASController.cs +++ b/AMESCoreStudio.Web/Controllers/BASController.cs @@ -2082,7 +2082,7 @@ namespace AMESCoreStudio.Web.Controllers } - public async Task GetMaterialFlowsByQueryAsync(string itemno, string unitNo) + public async Task 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 }); diff --git a/AMESCoreStudio.Web/HttpApis/IBAS.cs b/AMESCoreStudio.Web/HttpApis/IBAS.cs index a33f03f5..c5254788 100644 --- a/AMESCoreStudio.Web/HttpApis/IBAS.cs +++ b/AMESCoreStudio.Web/HttpApis/IBAS.cs @@ -694,7 +694,7 @@ namespace AMESCoreStudio.Web /// /// [WebApiClient.Attributes.HttpGet("api/MaterialFlows/Query/{itemno}/{unitNo}")] - ITask> GetMaterialFlowsByQuery(string itemno, string unitNo); + ITask> GetMaterialFlowsByQuery(string itemno, string unitNo, int page = 0, int limit = 10); /// /// 根據ID獲取指定料號流程資料 diff --git a/AMESCoreStudio.Web/Views/BAS/BAS012.cshtml b/AMESCoreStudio.Web/Views/BAS/BAS012.cshtml index fe0fc258..6fef949c 100644 --- a/AMESCoreStudio.Web/Views/BAS/BAS012.cshtml +++ b/AMESCoreStudio.Web/Views/BAS/BAS012.cshtml @@ -56,7 +56,7 @@ sort: true }, { - field: 'materialItem', + field: 'itemNo', title: '料號', sort: true, templet: function (d) { diff --git a/AMESCoreStudio.WebApi/Controllers/BAS/MaterialFlowsController.cs b/AMESCoreStudio.WebApi/Controllers/BAS/MaterialFlowsController.cs index b266e102..12236e41 100644 --- a/AMESCoreStudio.WebApi/Controllers/BAS/MaterialFlowsController.cs +++ b/AMESCoreStudio.WebApi/Controllers/BAS/MaterialFlowsController.cs @@ -63,7 +63,7 @@ namespace AMESCoreStudio.WebApi.Controllers.BAS /// 站別 /// [HttpGet("Query/{itemno}/{unitNo}")] - public async Task>> GetMaterialFlowsByQuery(string itemno, string unitNo) + public async Task>> GetMaterialFlowsByQuery(string itemno, string unitNo, int page = 0, int limit = 10) { IQueryable 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)