From 97262bcafcce1eb62096275ee0089d92f6b5d8c5 Mon Sep 17 00:00:00 2001 From: Marvin Date: Fri, 18 Mar 2022 22:47:24 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E8=89=AF=E7=8E=87=E6=9F=A5?= =?UTF-8?q?=E8=A9=A2QRS010=201.1.=E5=A2=9E=E5=8A=A0=E8=89=AF=E7=8E=87?= =?UTF-8?q?=E5=9C=96=E8=A1=A8(=E6=9F=B1=E7=8B=80=E5=9C=96+=E6=8A=98?= =?UTF-8?q?=E7=B7=9A=E5=9C=96)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/QRSController.cs | 34 +++- AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs | 2 +- AMESCoreStudio.Web/Views/QRS/QRS010.cshtml | 13 +- AMESCoreStudio.Web/Views/QRS/QRS010A.cshtml | 172 ++++++++++++++++++ .../Controllers/AMES/NgRepairsController.cs | 16 +- .../Controllers/AMES/WipClassController.cs | 1 + 6 files changed, 218 insertions(+), 20 deletions(-) create mode 100644 AMESCoreStudio.Web/Views/QRS/QRS010A.cshtml diff --git a/AMESCoreStudio.Web/Controllers/QRSController.cs b/AMESCoreStudio.Web/Controllers/QRSController.cs index a126cc8b..e63be453 100644 --- a/AMESCoreStudio.Web/Controllers/QRSController.cs +++ b/AMESCoreStudio.Web/Controllers/QRSController.cs @@ -465,10 +465,40 @@ namespace AMESCoreStudio.Web.Controllers return View(); } - public async Task QRS010QueryAsync(string unitNo, string lineID, string stationID, string wipNO, string itemNO, string mfgTypeNo, string dateStart, string dateEnd, int page = 0, int limit = 10) + public async Task QRS010QueryAsync(string unitNo, string lineID, string stationID, string mfgTypeNo, string wipNO, string itemNO, string dateStart, string dateEnd, int page = 0, int limit = 10) { - var result = await _pcsApi.GetYieldData4QRS010(unitNo, lineID, stationID, wipNO, itemNO, mfgTypeNo, dateStart, dateEnd, page, limit); + var result = await _pcsApi.GetYieldData4QRS010(unitNo, lineID, stationID, mfgTypeNo, wipNO, itemNO, dateStart, dateEnd, page, limit); + + if (result.DataTotal > 0) + { + return Json(new Table() { code = 0, msg = "", data = result.Data, count = result.DataTotal }); + } + return Json(new Table() { count = 0, data = null }); + } + + public IActionResult QRS010A(string id) + { + ViewData["ParamList"] = id; + return View(); + } + + [HttpPost] + public async Task GetYieldData4QRS010Async(string id) + { + string[] param = id.Split('_'); + + var result = await _pcsApi.GetYieldData4QRS010(param[0], param[1], param[2], param[3], param[4], param[5], param[6], param[7], 0, 10); + + return Json(result.Data); + } + + public async Task GetYieldData4QRS010ListAsync(string id) + { + + string[] param = id.Split('_'); + + var result = await _pcsApi.GetYieldData4QRS010(param[0], param[1], param[2], param[3], param[4], param[5], param[6], param[7], 0, 10); if (result.DataTotal > 0) { diff --git a/AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs b/AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs index 62ef1e53..cd20f959 100644 --- a/AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs +++ b/AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs @@ -831,7 +831,7 @@ namespace AMESCoreStudio.Web /// /// [WebApiClient.Attributes.HttpGet("api/WipClass/GetYieldData4QRS010")] - ITask> GetYieldData4QRS010(string unitNo, string lineID, string stationID, string wipNo, string itemNo, string mfgTypeNo, string dateStart, string dateEnd, int page, int limit); + ITask> GetYieldData4QRS010(string unitNo, string lineID, string stationID, string mfgTypeNo, string wipNo, string itemNo, string dateStart, string dateEnd, int page, int limit); #endregion diff --git a/AMESCoreStudio.Web/Views/QRS/QRS010.cshtml b/AMESCoreStudio.Web/Views/QRS/QRS010.cshtml index 90f28a95..c65c80ca 100644 --- a/AMESCoreStudio.Web/Views/QRS/QRS010.cshtml +++ b/AMESCoreStudio.Web/Views/QRS/QRS010.cshtml @@ -230,18 +230,12 @@ , theme: 'grid' }); - form.on('select(productType)', function (data) + form.on('select(mfgtype)', function (data) { - $("#productTypeNo").val(data.value); + $("#mfgTypeNo").val(data.value); }); - form.on('select(testType)', function (data) { - $("#testTypeNo").val(data.value); - - }); - - form.on('select(unit)', function (data) { $("#unitNo").val(data.value); @@ -264,7 +258,8 @@ $('#btnChart1').click(function () { - var param = productTypeNo.value + '_' + testTypeNo.value + '_' + unitNo.value + '_' + lineID.value + '_' + stationID.value + '_' + wipNO.value + '_' + itemNO.value + '_' + dateStart.value + '_' + dateEnd.value; + var param = unitNo.value + '_' + lineID.value + '_' + stationID.value + '_' + mfgTypeNo.value + '_' + wipNO.value + '_' + itemNO.value + '_' + dateStart.value + '_' + dateEnd.value; + //alert(param); hg.open('良率統計圖表', '/QRS/QRS010A/' + param, 800, 600); }); diff --git a/AMESCoreStudio.Web/Views/QRS/QRS010A.cshtml b/AMESCoreStudio.Web/Views/QRS/QRS010A.cshtml new file mode 100644 index 00000000..5ddc1561 --- /dev/null +++ b/AMESCoreStudio.Web/Views/QRS/QRS010A.cshtml @@ -0,0 +1,172 @@ +@{ ViewData["Title"] = "QRS010A"; + Layout = "~/Views/Shared/_AMESLayout.cshtml"; } + + + + + + + +
+
+
+
+
+
+ +
+
+
+
+
+ +
+ +@section Scripts { + @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); + await Html.RenderPartialAsync("_FileinputScriptsPartial"); } + + + + +} + diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/NgRepairsController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/NgRepairsController.cs index 6afd0900..aaa3e262 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/NgRepairsController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/NgRepairsController.cs @@ -373,12 +373,12 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES { ErrorCode = x.Key.ReasonNo, ErrorQty = x.Count() - }).ToList(); + }); //紀錄筆數 result.DataTotal = g.Count(); - result.Data = g; + result.Data = await g.ToListAsync(); if (result == null) { @@ -504,12 +504,12 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES { RMACode = x.Key.RepairNo, RMAQty = x.Count() - }).ToList(); + }); //紀錄筆數 result.DataTotal = g.Count(); - result.Data = g; + result.Data = await g.ToListAsync(); if (result == null) { @@ -636,12 +636,12 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES { LocationNo = x.Key.LocationNo, LocationQty = x.Count() - }).ToList(); + }); //紀錄筆數 result.DataTotal = g.Count(); - result.Data = g; + result.Data = await g.ToListAsync(); if (result == null) { @@ -768,12 +768,12 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES { RRDesc = x.Key.RRDesc, RRDescQty = x.Count() - }).ToList(); + }); //紀錄筆數 result.DataTotal = g.Count(); - result.Data = g; + result.Data = await g.ToListAsync(); if (result == null) { diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WipClassController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WipClassController.cs index 10f89279..987cf7e9 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/WipClassController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/WipClassController.cs @@ -207,6 +207,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES q = q.Where(w => w.StationID == int.Parse(stationID)); } } + if (wipNo != null) { if (wipNo != "")