From 14ea98dacb22b639d8decf96e68f43964a05def8 Mon Sep 17 00:00:00 2001 From: "BB.Wang" Date: Thu, 28 Mar 2024 08:43:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AA=BF=E6=95=B4=E7=9B=B4=E9=80=9A=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/BLL/RPTController.cs | 48 +++++++++++++------ 1 file changed, 33 insertions(+), 15 deletions(-) diff --git a/AMESCoreStudio.WebApi/Controllers/BLL/RPTController.cs b/AMESCoreStudio.WebApi/Controllers/BLL/RPTController.cs index f833c3d9..e7c6f0f2 100644 --- a/AMESCoreStudio.WebApi/Controllers/BLL/RPTController.cs +++ b/AMESCoreStudio.WebApi/Controllers/BLL/RPTController.cs @@ -437,10 +437,10 @@ namespace AMESCoreStudio.WebApi.Controllers.BLL //2024-01-08 BB.Wang Add 調整顯示數據，給客戶看 #region 顯示數據調整 - Random crandom = new Random(); + //Random crandom = new Random(); - result.productiveForces = result.productiveForces > 99 ? 98 + Math.Round(crandom.NextDouble(), 2) : result.productiveForces < 96 ? 96 + Math.Round(crandom.NextDouble(), 2) : result.productiveForces; - result.productivity = result.productivity > 95 ? 94 + Math.Round(crandom.NextDouble(), 2) : result.productivity < 93 ? 93 + Math.Round(crandom.NextDouble(), 2) : result.productivity; + //result.productiveForces = result.productiveForces > 99 ? 98 + Math.Round(crandom.NextDouble(), 2) : result.productiveForces < 96 ? 96 + Math.Round(crandom.NextDouble(), 2) : result.productiveForces; + //result.productivity = result.productivity > 95 ? 94 + Math.Round(crandom.NextDouble(), 2) : result.productivity < 93 ? 93 + Math.Round(crandom.NextDouble(), 2) : result.productivity; //2024-03-26 BB.Wang 安勤要求取消美化(原為安勤要求) //result.ipqc = result.ipqc > 100 ? 99 + Math.Round(crandom.NextDouble(), 2) : result.ipqc < 97 ? 97 + Math.Round(crandom.NextDouble(), 2) : result.ipqc; //result.test = result.test > 99.8 ? 99 + Math.Round(crandom.NextDouble(), 2) : result.test < 99.5 ? 99 + Math.Round(crandom.NextDouble(), 2) : result.test; @@ -1266,8 +1266,11 @@ namespace AMESCoreStudio.WebApi.Controllers.BLL var f_FPYBoard_LEI = await new WipStationController(_context).GetWipStation4QRS014GroupS(null, sDate, sEnd_Date, null, "YS00", "FqcDate"); if (f_FPYBoard_LEI.DataTotal > 0) { - double sum_rate = 100.0; - int sum_idx = 1; + //2024-03-26 BB.Wang Modify 修正良率(代小平) + //double sum_rate = 100.0; + //int sum_idx = 1; + double sum_rate = 0.0; + int sum_idx = 0; DataTable dtRate = new DataTable(); dtRate.Columns.Add("STATION_ID"); @@ -1373,8 +1376,11 @@ namespace AMESCoreStudio.WebApi.Controllers.BLL var f_FPYSystem_LEI = await new WipStationController(_context).GetWipStation4QRS014GroupB(null, sDate, sEnd_Date, null, "YS00", "FqcDate"); if (f_FPYSystem_LEI.DataTotal > 0) { - double sum_rate = 100.0; - int sum_idx = 1; + //2024-03-26 BB.Wang Modify 修正良率(代小平) + //double sum_rate = 100.0; + //int sum_idx = 1; + double sum_rate = 0.0; + int sum_idx = 0; DataTable dtRate = new DataTable(); dtRate.Columns.Add("STATION_ID"); @@ -1480,8 +1486,11 @@ namespace AMESCoreStudio.WebApi.Controllers.BLL var f_FPYMedical_LEI = await new WipStationController(_context).GetWipStation4QRS014GroupM(null, sDate, sEnd_Date, null, "YS00", "FqcDate"); if (f_FPYMedical_LEI.DataTotal > 0) { - double sum_rate = 100.0; - int sum_idx = 1; + //2024-03-26 BB.Wang Modify 修正良率(代小平) + //double sum_rate = 100.0; + //int sum_idx = 1; + double sum_rate = 0.0; + int sum_idx = 0; DataTable dtRate = new DataTable(); dtRate.Columns.Add("STATION_ID"); @@ -1587,8 +1596,11 @@ namespace AMESCoreStudio.WebApi.Controllers.BLL var f_FPYBoard = await new WipStationController(_context).GetWipStation4QRS014GroupS(null, sDate, sEnd_Date, null, werksNo, "FqcDate"); if (f_FPYBoard.DataTotal > 0) { - double sum_rate = 100.0; - int sum_idx = 1; + //2024-03-26 BB.Wang Modify 修正良率(代小平) + //double sum_rate = 100.0; + //int sum_idx = 1; + double sum_rate = 0.0; + int sum_idx = 0; DataTable dtRate = new DataTable(); dtRate.Columns.Add("STATION_ID"); @@ -1694,8 +1706,11 @@ namespace AMESCoreStudio.WebApi.Controllers.BLL var f_FPYSystem = await new WipStationController(_context).GetWipStation4QRS014GroupB(null, sDate, sEnd_Date, null, werksNo, "FqcDate"); if (f_FPYSystem.DataTotal > 0) { - double sum_rate = 100.0; - int sum_idx = 1; + //2024-03-26 BB.Wang Modify 修正良率(代小平) + //double sum_rate = 100.0; + //int sum_idx = 1; + double sum_rate = 0.0; + int sum_idx = 0; DataTable dtRate = new DataTable(); dtRate.Columns.Add("STATION_ID"); @@ -1801,8 +1816,11 @@ namespace AMESCoreStudio.WebApi.Controllers.BLL var f_FPYMedical = await new WipStationController(_context).GetWipStation4QRS014GroupM(null, sDate, sEnd_Date, null, werksNo, "FqcDate"); if (f_FPYMedical.DataTotal > 0) { - double sum_rate = 100.0; - int sum_idx = 1; + //2024-03-26 BB.Wang Modify 修正良率(代小平) + //double sum_rate = 100.0; + //int sum_idx = 1; + double sum_rate = 0.0; + int sum_idx = 0; DataTable dtRate = new DataTable(); dtRate.Columns.Add("STATION_ID");