From c91792343b3cbbb0e8ff38859614355356cf6188 Mon Sep 17 00:00:00 2001 From: Marvin Date: Mon, 10 Mar 2025 17:48:09 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E8=89=AF=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AMESCoreStudio.Web/Views/QRS/QRS010.cshtml | 1 + .../Controllers/AMES/WipClassController.cs | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/AMESCoreStudio.Web/Views/QRS/QRS010.cshtml b/AMESCoreStudio.Web/Views/QRS/QRS010.cshtml index f4699be..4ae29b7 100644 --- a/AMESCoreStudio.Web/Views/QRS/QRS010.cshtml +++ b/AMESCoreStudio.Web/Views/QRS/QRS010.cshtml @@ -244,6 +244,7 @@ $.ajax({ url: '@Url.Action("QRS010Query", "QRS")', dataType: 'json', + data: { "unitNo": $("#unit").val(),"lineID": $("#line").val(),"stationID": $("#station").val(),"mfgTypeNo": $("#mfgtype").val(),"wipNO": $("#wipNO").val(),"itemNO": $("#itemNO").val(),"dateStart": $("#dateStart").val(),"dateEnd": $("#dateEnd").val(),"custType": $("#custType").val() }, success(res) { var data = res.data; data = excel.filterExportData(data, [ diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WipClassController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WipClassController.cs index c25e4ff..91d9ade 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/WipClassController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/WipClassController.cs @@ -254,7 +254,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES q = q.OrderBy(w => w.WipID + w.StationID); - var g = q.GroupBy(x => new { x.WipID, x.WipNO, x.PlanQTY, x.StationID, x.StationName,x.TestType, x.RuleStatus, x.ItemNO, x.LineDesc, x.ModelNO }).Select(y => new + var g = q.GroupBy(x => new { x.WipID, x.WipNO, x.PlanQTY, x.StationID, x.StationName, x.TestType, x.RuleStatus, x.ItemNO, x.LineDesc, x.ModelNO }).Select(y => new { WipID = y.Key.WipID, WipNO = y.Key.WipNO, @@ -268,7 +268,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES ModelNO = y.Key.ModelNO, FirstCnt = y.Sum(x => x.FirstCnt), PassCnt = y.Sum(x => x.PassCnt), - Yield = (y.Sum(x => x.FirstCnt) / y.Sum(x => x.PassCnt) * 100) + Yield = y.Sum(x => x.PassCnt) != 0 ? (y.Sum(x => x.FirstCnt) / y.Sum(x => x.PassCnt) * 100) : 0 }); var g1 = g.GroupBy(x => new { x.WipID, x.WipNO, x.PlanQTY, x.StationID, x.StationName, x.TestType, x.ItemNO, x.LineDesc, x.ModelNO }).Select(y => new @@ -284,7 +284,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES ModelNO = y.Key.ModelNO, FirstCnt = 0, PassCnt = y.Sum(x => x.FirstCnt), - Yield = (y.Sum(x => x.FirstCnt) / y.Sum(x => x.PassCnt) * 100) + Yield = y.Sum(x => x.PassCnt) != 0 ? (y.Sum(x => x.FirstCnt) / y.Sum(x => x.PassCnt) * 100) : 0 }); //紀錄筆數