From e1fac5d3dbb4387d43a54ac09f419862ff199c12 Mon Sep 17 00:00:00 2001 From: "BB.Wang" Date: Wed, 27 Mar 2024 10:02:15 +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/QRSController.cs | 599 +++++++++++++----- .../Controllers/BLL/RPTController.cs | 23 +- 2 files changed, 468 insertions(+), 154 deletions(-) diff --git a/AMESCoreStudio.Web/Controllers/QRSController.cs b/AMESCoreStudio.Web/Controllers/QRSController.cs index c1eb35fd..fadc778c 100644 --- a/AMESCoreStudio.Web/Controllers/QRSController.cs +++ b/AMESCoreStudio.Web/Controllers/QRSController.cs @@ -1114,8 +1114,11 @@ namespace AMESCoreStudio.Web.Controllers JObject jo = JObject.Parse(item.ToString()); int wip_id = int.Parse(jo["wipID"].ToString()); - 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; for (int i = 0; i < ft_stations.Count; i++) { @@ -1172,6 +1175,7 @@ namespace AMESCoreStudio.Web.Controllers } + //直通率 --- 年度 [HttpPost] public async Task GetYieldData4QRS014BSAsync(string id) { @@ -1193,8 +1197,13 @@ namespace AMESCoreStudio.Web.Controllers string dateStart01 = yCode + "-01-01"; string dateEnd01 = yCode + "-02-01"; var wipStaiton01 = await _pcsApi.GetWipStation4QRS014GroupS(param[1], dateStart01, dateEnd01, param[5], param[6], param[7]); - double sum_rate01 = 100.0; - int sum_idx01 = 1; + + //2024-03-26 BB.Wang Modify 修正良率(代小平) + //double sum_rate01 = 100.0; + //int sum_idx01 = 1; + double sum_rate01 = 0.0; + int sum_idx01 = 0; + if (wipStaiton01.DataTotal > 0) { DataTable dtRate = new DataTable(); @@ -1299,8 +1308,13 @@ namespace AMESCoreStudio.Web.Controllers string dateStart02 = yCode + "-02-01"; string dateEnd02 = yCode + "-03-01"; var wipStaiton02 = await _pcsApi.GetWipStation4QRS014GroupS(param[1], dateStart02, dateEnd02, param[5], param[6], param[7]); - double sum_rate02 = 100.0; - int sum_idx02 = 1; + + //2024-03-26 BB.Wang Modify 修正良率(代小平) + //double sum_rate02 = 100.0; + //int sum_idx02 = 1; + double sum_rate02 = 0.0; + int sum_idx02 = 0; + if (wipStaiton02.DataTotal > 0) { DataTable dtRate = new DataTable(); @@ -1405,8 +1419,11 @@ namespace AMESCoreStudio.Web.Controllers string dateStart03 = yCode + "-03-01"; string dateEnd03 = yCode + "-04-01"; var wipStaiton03 = await _pcsApi.GetWipStation4QRS014GroupS(param[1], dateStart03, dateEnd03, param[5], param[6], param[7]); - double sum_rate03 = 100.0; - int sum_idx03 = 1; + //2024-03-26 BB.Wang Modify 修正良率(代小平) + //double sum_rate03 = 100.0; + //int sum_idx03 = 1; + double sum_rate03 = 0.0; + int sum_idx03 = 0; if (wipStaiton03.DataTotal > 0) { DataTable dtRate = new DataTable(); @@ -1511,8 +1528,11 @@ namespace AMESCoreStudio.Web.Controllers string dateStart04 = yCode + "-04-01"; string dateEnd04 = yCode + "-05-01"; var wipStaiton04 = await _pcsApi.GetWipStation4QRS014GroupS(param[1], dateStart04, dateEnd04, param[5], param[6], param[7]); - double sum_rate04 = 100.0; - int sum_idx04 = 1; + //2024-03-26 BB.Wang Modify 修正良率(代小平) + //double sum_rate04 = 100.0; + //int sum_idx04 = 1; + double sum_rate04 = 0.0; + int sum_idx04 = 0; if (wipStaiton04.DataTotal > 0) { DataTable dtRate = new DataTable(); @@ -1617,8 +1637,11 @@ namespace AMESCoreStudio.Web.Controllers string dateStart05 = yCode + "-05-01"; string dateEnd05 = yCode + "-06-01"; var wipStaiton05 = await _pcsApi.GetWipStation4QRS014GroupS(param[1], dateStart05, dateEnd05, param[5], param[6], param[7]); - double sum_rate05 = 100.0; - int sum_idx05 = 1; + //2024-03-26 BB.Wang Modify 修正良率(代小平) + //double sum_rate05 = 100.0; + //int sum_idx05 = 1; + double sum_rate05 = 0.0; + int sum_idx05 = 0; if (wipStaiton05.DataTotal > 0) { DataTable dtRate = new DataTable(); @@ -1723,8 +1746,11 @@ namespace AMESCoreStudio.Web.Controllers string dateStart06 = yCode + "-06-01"; string dateEnd06 = yCode + "-07-01"; var wipStaiton06 = await _pcsApi.GetWipStation4QRS014GroupS(param[1], dateStart06, dateEnd06, param[5], param[6], param[7]); - double sum_rate06 = 100.0; - int sum_idx06 = 1; + //2024-03-26 BB.Wang Modify 修正良率(代小平) + //double sum_rate06 = 100.0; + //int sum_idx06 = 1; + double sum_rate06 = 0.0; + int sum_idx06 = 0; if (wipStaiton06.DataTotal > 0) { DataTable dtRate = new DataTable(); @@ -1829,8 +1855,11 @@ namespace AMESCoreStudio.Web.Controllers string dateStart07 = yCode + "-07-01"; string dateEnd07 = yCode + "-08-01"; var wipStaiton07 = await _pcsApi.GetWipStation4QRS014GroupS(param[1], dateStart07, dateEnd07, param[5], param[6], param[7]); - double sum_rate07 = 100.0; - int sum_idx07 = 1; + //2024-03-26 BB.Wang Modify 修正良率(代小平) + //double sum_rate07 = 100.0; + //int sum_idx07 = 1; + double sum_rate07 = 0.0; + int sum_idx07 = 0; if (wipStaiton07.DataTotal > 0) { DataTable dtRate = new DataTable(); @@ -1935,8 +1964,11 @@ namespace AMESCoreStudio.Web.Controllers string dateStart08 = yCode + "-08-01"; string dateEnd08 = yCode + "-09-01"; var wipStaiton08 = await _pcsApi.GetWipStation4QRS014GroupS(param[1], dateStart08, dateEnd08, param[5], param[6], param[7]); - double sum_rate08 = 100.0; - int sum_idx08 = 1; + //2024-03-26 BB.Wang Modify 修正良率(代小平) + //double sum_rate08 = 100.0; + //int sum_idx08 = 1; + double sum_rate08 = 0.0; + int sum_idx08 = 0; if (wipStaiton08.DataTotal > 0) { DataTable dtRate = new DataTable(); @@ -2041,8 +2073,11 @@ namespace AMESCoreStudio.Web.Controllers string dateStart09 = yCode + "-09-01"; string dateEnd09 = yCode + "-10-01"; var wipStaiton09 = await _pcsApi.GetWipStation4QRS014GroupS(param[1], dateStart09, dateEnd09, param[5], param[6], param[7]); - double sum_rate09 = 100.0; - int sum_idx09 = 1; + //2024-03-26 BB.Wang Modify 修正良率(代小平) + //double sum_rate09 = 100.0; + //int sum_idx09 = 1; + double sum_rate09 = 0.0; + int sum_idx09 = 0; if (wipStaiton09.DataTotal > 0) { DataTable dtRate = new DataTable(); @@ -2147,8 +2182,11 @@ namespace AMESCoreStudio.Web.Controllers string dateStart10 = yCode + "-10-01"; string dateEnd10 = yCode + "-11-01"; var wipStaiton10 = await _pcsApi.GetWipStation4QRS014GroupS(param[1], dateStart10, dateEnd10, param[5], param[6], param[7]); - double sum_rate10 = 100.0; - int sum_idx10 = 1; + //2024-03-26 BB.Wang Modify 修正良率(代小平) + //double sum_rate10 = 100.0; + //int sum_idx10 = 1; + double sum_rate10 = 0.0; + int sum_idx10 = 0; if (wipStaiton10.DataTotal > 0) { DataTable dtRate = new DataTable(); @@ -2253,8 +2291,11 @@ namespace AMESCoreStudio.Web.Controllers string dateStart11 = yCode + "-11-01"; string dateEnd11 = yCode + "-12-01"; var wipStaiton11 = await _pcsApi.GetWipStation4QRS014GroupS(param[1], dateStart11, dateEnd11, param[5], param[6], param[7]); - double sum_rate11 = 100.0; - int sum_idx11 = 1; + //2024-03-26 BB.Wang Modify 修正良率(代小平) + //double sum_rate11 = 100.0; + //int sum_idx11 = 1; + double sum_rate11 = 0.0; + int sum_idx11 = 0; if (wipStaiton11.DataTotal > 0) { DataTable dtRate = new DataTable(); @@ -2359,8 +2400,13 @@ namespace AMESCoreStudio.Web.Controllers string dateStart12 = yCode + "-12-01"; string dateEnd12 = (int.Parse(yCode) + 1).ToString() + "-01-01"; var wipStaiton12 = await _pcsApi.GetWipStation4QRS014GroupS(param[1], dateStart12, dateEnd12, param[5], param[6], param[7]); - double sum_rate12 = 100.0; - int sum_idx12 = 1; + + //2024-03-26 BB.Wang Modify 修正良率(代小平) + //double sum_rate12 = 100.0; + //int sum_idx12 = 1; + double sum_rate12 = 0.0; + int sum_idx12 = 0; + if (wipStaiton12.DataTotal > 0) { DataTable dtRate = new DataTable(); @@ -2484,8 +2530,13 @@ namespace AMESCoreStudio.Web.Controllers string dateStart01 = yCode + "-01-01"; string dateEnd01 = yCode + "-02-01"; var wipStaiton01 = await _pcsApi.GetWipStation4QRS014GroupB(param[1], dateStart01, dateEnd01, param[5], param[6], param[7]); - double sum_rate01 = 100.0; - int sum_idx01 = 1; + + //2024-03-26 BB.Wang Modify 修正良率(代小平) + //double sum_rate01 = 100.0; + //int sum_idx01 = 1; + double sum_rate01 = 0.0; + int sum_idx01 = 0; + if (wipStaiton01.DataTotal > 0) { DataTable dtRate = new DataTable(); @@ -2590,8 +2641,13 @@ namespace AMESCoreStudio.Web.Controllers string dateStart02 = yCode + "-02-01"; string dateEnd02 = yCode + "-03-01"; var wipStaiton02 = await _pcsApi.GetWipStation4QRS014GroupB(param[1], dateStart02, dateEnd02, param[5], param[6], param[7]); - double sum_rate02 = 100.0; - int sum_idx02 = 1; + + //2024-03-26 BB.Wang Modify 修正良率(代小平) + //double sum_rate02 = 100.0; + //int sum_idx02 = 1; + double sum_rate02 = 0.0; + int sum_idx02 = 0; + if (wipStaiton02.DataTotal > 0) { DataTable dtRate = new DataTable(); @@ -2696,8 +2752,13 @@ namespace AMESCoreStudio.Web.Controllers string dateStart03 = yCode + "-03-01"; string dateEnd03 = yCode + "-04-01"; var wipStaiton03 = await _pcsApi.GetWipStation4QRS014GroupB(param[1], dateStart03, dateEnd03, param[5], param[6], param[7]); - double sum_rate03 = 100.0; - int sum_idx03 = 1; + + //2024-03-26 BB.Wang Modify 修正良率(代小平) + //double sum_rate03 = 100.0; + //int sum_idx03 = 1; + double sum_rate03 = 0.0; + int sum_idx03 = 0; + if (wipStaiton03.DataTotal > 0) { DataTable dtRate = new DataTable(); @@ -2802,8 +2863,13 @@ namespace AMESCoreStudio.Web.Controllers string dateStart04 = yCode + "-04-01"; string dateEnd04 = yCode + "-05-01"; var wipStaiton04 = await _pcsApi.GetWipStation4QRS014GroupB(param[1], dateStart04, dateEnd04, param[5], param[6], param[7]); - double sum_rate04 = 100.0; - int sum_idx04 = 1; + + //2024-03-26 BB.Wang Modify 修正良率(代小平) + //double sum_rate04 = 100.0; + //int sum_idx04 = 1; + double sum_rate04 = 0.0; + int sum_idx04 = 0; + if (wipStaiton04.DataTotal > 0) { DataTable dtRate = new DataTable(); @@ -2908,8 +2974,13 @@ namespace AMESCoreStudio.Web.Controllers string dateStart05 = yCode + "-05-01"; string dateEnd05 = yCode + "-06-01"; var wipStaiton05 = await _pcsApi.GetWipStation4QRS014GroupB(param[1], dateStart05, dateEnd05, param[5], param[6], param[7]); - double sum_rate05 = 100.0; - int sum_idx05 = 1; + + //2024-03-26 BB.Wang Modify 修正良率(代小平) + //double sum_rate05 = 100.0; + //int sum_idx05 = 1; + double sum_rate05 = 0.0; + int sum_idx05 = 0; + if (wipStaiton05.DataTotal > 0) { DataTable dtRate = new DataTable(); @@ -3014,8 +3085,13 @@ namespace AMESCoreStudio.Web.Controllers string dateStart06 = yCode + "-06-01"; string dateEnd06 = yCode + "-07-01"; var wipStaiton06 = await _pcsApi.GetWipStation4QRS014GroupB(param[1], dateStart06, dateEnd06, param[5], param[6], param[7]); - double sum_rate06 = 100.0; - int sum_idx06 = 1; + + //2024-03-26 BB.Wang Modify 修正良率(代小平) + //double sum_rate06 = 100.0; + //int sum_idx06 = 1; + double sum_rate06 = 0.0; + int sum_idx06 = 0; + if (wipStaiton06.DataTotal > 0) { DataTable dtRate = new DataTable(); @@ -3120,8 +3196,13 @@ namespace AMESCoreStudio.Web.Controllers string dateStart07 = yCode + "-07-01"; string dateEnd07 = yCode + "-08-01"; var wipStaiton07 = await _pcsApi.GetWipStation4QRS014GroupB(param[1], dateStart07, dateEnd07, param[5], param[6], param[7]); - double sum_rate07 = 100.0; - int sum_idx07 = 1; + + //2024-03-26 BB.Wang Modify 修正良率(代小平) + //double sum_rate07 = 100.0; + //int sum_idx07 = 1; + double sum_rate07 = 0.0; + int sum_idx07 = 0; + if (wipStaiton07.DataTotal > 0) { DataTable dtRate = new DataTable(); @@ -3226,8 +3307,13 @@ namespace AMESCoreStudio.Web.Controllers string dateStart08 = yCode + "-08-01"; string dateEnd08 = yCode + "-09-01"; var wipStaiton08 = await _pcsApi.GetWipStation4QRS014GroupB(param[1], dateStart08, dateEnd08, param[5], param[6], param[7]); - double sum_rate08 = 100.0; - int sum_idx08 = 1; + + //2024-03-26 BB.Wang Modify 修正良率(代小平) + //double sum_rate08 = 100.0; + //int sum_idx08 = 1; + double sum_rate08 = 0.0; + int sum_idx08 = 0; + if (wipStaiton08.DataTotal > 0) { DataTable dtRate = new DataTable(); @@ -3332,8 +3418,13 @@ namespace AMESCoreStudio.Web.Controllers string dateStart09 = yCode + "-09-01"; string dateEnd09 = yCode + "-10-01"; var wipStaiton09 = await _pcsApi.GetWipStation4QRS014GroupB(param[1], dateStart09, dateEnd09, param[5], param[6], param[7]); - double sum_rate09 = 100.0; - int sum_idx09 = 1; + + //2024-03-26 BB.Wang Modify 修正良率(代小平) + //double sum_rate09 = 100.0; + //int sum_idx09 = 1; + double sum_rate09 = 0.0; + int sum_idx09 = 0; + if (wipStaiton09.DataTotal > 0) { DataTable dtRate = new DataTable(); @@ -3438,8 +3529,13 @@ namespace AMESCoreStudio.Web.Controllers string dateStart10 = yCode + "-10-01"; string dateEnd10 = yCode + "-11-01"; var wipStaiton10 = await _pcsApi.GetWipStation4QRS014GroupB(param[1], dateStart10, dateEnd10, param[5], param[6], param[7]); - double sum_rate10 = 100.0; - int sum_idx10 = 1; + + //2024-03-26 BB.Wang Modify 修正良率(代小平) + //double sum_rate10 = 100.0; + //int sum_idx10 = 1; + double sum_rate10 = 0.0; + int sum_idx10 = 0; + if (wipStaiton10.DataTotal > 0) { DataTable dtRate = new DataTable(); @@ -3544,8 +3640,13 @@ namespace AMESCoreStudio.Web.Controllers string dateStart11 = yCode + "-11-01"; string dateEnd11 = yCode + "-12-01"; var wipStaiton11 = await _pcsApi.GetWipStation4QRS014GroupB(param[1], dateStart11, dateEnd11, param[5], param[6], param[7]); - double sum_rate11 = 100.0; - int sum_idx11 = 1; + + //2024-03-26 BB.Wang Modify 修正良率(代小平) + //double sum_rate11 = 100.0; + //int sum_idx11 = 1; + double sum_rate11 = 0.0; + int sum_idx11 = 0; + if (wipStaiton11.DataTotal > 0) { DataTable dtRate = new DataTable(); @@ -3650,8 +3751,13 @@ namespace AMESCoreStudio.Web.Controllers string dateStart12 = yCode + "-12-01"; string dateEnd12 = (int.Parse(yCode) + 1).ToString() + "-01-01"; var wipStaiton12 = await _pcsApi.GetWipStation4QRS014GroupB(param[1], dateStart12, dateEnd12, param[5], param[6], param[7]); - double sum_rate12 = 100.0; - int sum_idx12 = 1; + + //2024-03-26 BB.Wang Modify 修正良率(代小平) + //double sum_rate12 = 100.0; + //int sum_idx12 = 1; + double sum_rate12 = 0.0; + int sum_idx12 = 0; + if (wipStaiton12.DataTotal > 0) { DataTable dtRate = new DataTable(); @@ -3972,6 +4078,7 @@ namespace AMESCoreStudio.Web.Controllers return Json(query.FPYDatas); } + //直通率 --- 周 [HttpPost] public async Task GetYieldData4QRS014CSAsync(string id) { @@ -4102,8 +4209,13 @@ namespace AMESCoreStudio.Web.Controllers string dateStart01 = yCode + "-01-01"; string dateEnd01 = yCode + "-02-01"; var wipStaiton01 = await _pcsApi.GetWipStation4QRS014GroupM(param[1], dateStart01, dateEnd01, param[5], param[6], param[7]); - double sum_rate01 = 100.0; - int sum_idx01 = 1; + + //2024-03-26 BB.Wang Modify 修正良率(代小平) + //double sum_rate01 = 100.0; + //int sum_idx01 = 1; + double sum_rate01 = 0.0; + int sum_idx01 = 0; + if (wipStaiton01.DataTotal > 0) { DataTable dtRate = new DataTable(); @@ -4208,8 +4320,13 @@ namespace AMESCoreStudio.Web.Controllers string dateStart02 = yCode + "-02-01"; string dateEnd02 = yCode + "-03-01"; var wipStaiton02 = await _pcsApi.GetWipStation4QRS014GroupM(param[1], dateStart02, dateEnd02, param[5], param[6], param[7]); - double sum_rate02 = 100.0; - int sum_idx02 = 1; + + //2024-03-26 BB.Wang Modify 修正良率(代小平) + //double sum_rate02 = 100.0; + //int sum_idx02 = 1; + double sum_rate02 = 0.0; + int sum_idx02 = 0; + if (wipStaiton02.DataTotal > 0) { DataTable dtRate = new DataTable(); @@ -4314,8 +4431,13 @@ namespace AMESCoreStudio.Web.Controllers string dateStart03 = yCode + "-03-01"; string dateEnd03 = yCode + "-04-01"; var wipStaiton03 = await _pcsApi.GetWipStation4QRS014GroupM(param[1], dateStart03, dateEnd03, param[5], param[6], param[7]); - double sum_rate03 = 100.0; - int sum_idx03 = 1; + + //2024-03-26 BB.Wang Modify 修正良率(代小平) + //double sum_rate03 = 100.0; + //int sum_idx03 = 1; + double sum_rate03 = 0.0; + int sum_idx03 = 0; + if (wipStaiton03.DataTotal > 0) { DataTable dtRate = new DataTable(); @@ -4420,8 +4542,13 @@ namespace AMESCoreStudio.Web.Controllers string dateStart04 = yCode + "-04-01"; string dateEnd04 = yCode + "-05-01"; var wipStaiton04 = await _pcsApi.GetWipStation4QRS014GroupM(param[1], dateStart04, dateEnd04, param[5], param[6], param[7]); - double sum_rate04 = 100.0; - int sum_idx04 = 1; + + //2024-03-26 BB.Wang Modify 修正良率(代小平) + //double sum_rate04 = 100.0; + //int sum_idx04 = 1; + double sum_rate04 = 0.0; + int sum_idx04 = 0; + if (wipStaiton04.DataTotal > 0) { DataTable dtRate = new DataTable(); @@ -4526,8 +4653,13 @@ namespace AMESCoreStudio.Web.Controllers string dateStart05 = yCode + "-05-01"; string dateEnd05 = yCode + "-06-01"; var wipStaiton05 = await _pcsApi.GetWipStation4QRS014GroupM(param[1], dateStart05, dateEnd05, param[5], param[6], param[7]); - double sum_rate05 = 100.0; - int sum_idx05 = 1; + + //2024-03-26 BB.Wang Modify 修正良率(代小平) + //double sum_rate05 = 100.0; + //int sum_idx05 = 1; + double sum_rate05 = 0.0; + int sum_idx05 = 0; + if (wipStaiton05.DataTotal > 0) { DataTable dtRate = new DataTable(); @@ -4632,8 +4764,13 @@ namespace AMESCoreStudio.Web.Controllers string dateStart06 = yCode + "-06-01"; string dateEnd06 = yCode + "-07-01"; var wipStaiton06 = await _pcsApi.GetWipStation4QRS014GroupM(param[1], dateStart06, dateEnd06, param[5], param[6], param[7]); - double sum_rate06 = 100.0; - int sum_idx06 = 1; + + //2024-03-26 BB.Wang Modify 修正良率(代小平) + //double sum_rate06 = 100.0; + //int sum_idx06 = 1; + double sum_rate06 = 0.0; + int sum_idx06 = 0; + if (wipStaiton06.DataTotal > 0) { DataTable dtRate = new DataTable(); @@ -4738,8 +4875,13 @@ namespace AMESCoreStudio.Web.Controllers string dateStart07 = yCode + "-07-01"; string dateEnd07 = yCode + "-08-01"; var wipStaiton07 = await _pcsApi.GetWipStation4QRS014GroupM(param[1], dateStart07, dateEnd07, param[5], param[6], param[7]); - double sum_rate07 = 100.0; - int sum_idx07 = 1; + + //2024-03-26 BB.Wang Modify 修正良率(代小平) + //double sum_rate07 = 100.0; + //int sum_idx07 = 1; + double sum_rate07 = 0.0; + int sum_idx07 = 0; + if (wipStaiton07.DataTotal > 0) { DataTable dtRate = new DataTable(); @@ -4844,8 +4986,13 @@ namespace AMESCoreStudio.Web.Controllers string dateStart08 = yCode + "-08-01"; string dateEnd08 = yCode + "-09-01"; var wipStaiton08 = await _pcsApi.GetWipStation4QRS014GroupM(param[1], dateStart08, dateEnd08, param[5], param[6], param[7]); - double sum_rate08 = 100.0; - int sum_idx08 = 1; + + //2024-03-26 BB.Wang Modify 修正良率(代小平) + //double sum_rate08 = 100.0; + //int sum_idx08 = 1; + double sum_rate08 = 0.0; + int sum_idx08 = 0; + if (wipStaiton08.DataTotal > 0) { DataTable dtRate = new DataTable(); @@ -4950,8 +5097,13 @@ namespace AMESCoreStudio.Web.Controllers string dateStart09 = yCode + "-09-01"; string dateEnd09 = yCode + "-10-01"; var wipStaiton09 = await _pcsApi.GetWipStation4QRS014GroupM(param[1], dateStart09, dateEnd09, param[5], param[6], param[7]); - double sum_rate09 = 100.0; - int sum_idx09 = 1; + + //2024-03-26 BB.Wang Modify 修正良率(代小平) + //double sum_rate09 = 100.0; + //int sum_idx09 = 1; + double sum_rate09 = 0.0; + int sum_idx09 = 0; + if (wipStaiton09.DataTotal > 0) { DataTable dtRate = new DataTable(); @@ -5056,8 +5208,13 @@ namespace AMESCoreStudio.Web.Controllers string dateStart10 = yCode + "-10-01"; string dateEnd10 = yCode + "-11-01"; var wipStaiton10 = await _pcsApi.GetWipStation4QRS014GroupM(param[1], dateStart10, dateEnd10, param[5], param[6], param[7]); - double sum_rate10 = 100.0; - int sum_idx10 = 1; + + //2024-03-26 BB.Wang Modify 修正良率(代小平) + //double sum_rate10 = 100.0; + //int sum_idx10 = 1; + double sum_rate10 = 0.0; + int sum_idx10= 0; + if (wipStaiton10.DataTotal > 0) { DataTable dtRate = new DataTable(); @@ -5162,8 +5319,13 @@ namespace AMESCoreStudio.Web.Controllers string dateStart11 = yCode + "-11-01"; string dateEnd11 = yCode + "-12-01"; var wipStaiton11 = await _pcsApi.GetWipStation4QRS014GroupM(param[1], dateStart11, dateEnd11, param[5], param[6], param[7]); - double sum_rate11 = 100.0; - int sum_idx11 = 1; + + //2024-03-26 BB.Wang Modify 修正良率(代小平) + //double sum_rate11 = 100.0; + //int sum_idx11 = 1; + double sum_rate11 = 0.0; + int sum_idx11 = 0; + if (wipStaiton11.DataTotal > 0) { DataTable dtRate = new DataTable(); @@ -5268,8 +5430,13 @@ namespace AMESCoreStudio.Web.Controllers string dateStart12 = yCode + "-12-01"; string dateEnd12 = (int.Parse(yCode) + 1).ToString() + "-01-01"; var wipStaiton12 = await _pcsApi.GetWipStation4QRS014GroupM(param[1], dateStart12, dateEnd12, param[5], param[6], param[7]); - double sum_rate12 = 100.0; - int sum_idx12 = 1; + + //2024-03-26 BB.Wang Modify 修正良率(代小平) + //double sum_rate12 = 100.0; + //int sum_idx12 = 1; + double sum_rate12 = 0.0; + int sum_idx12 = 0; + if (wipStaiton12.DataTotal > 0) { DataTable dtRate = new DataTable(); @@ -5440,9 +5607,9 @@ namespace AMESCoreStudio.Web.Controllers rateDataList = rateDataList + "" + wip_no + "" + type + "" + item_no + ""; + //2024-03-26 BB.Wang Modify 修正良率(代小平) //double sum_rate = 100.0; //int sum_idx = 1; - double sum_rate = 0.0; int sum_idx = 0; @@ -5544,8 +5711,11 @@ namespace AMESCoreStudio.Web.Controllers var wipStaiton01 = await _pcsApi.GetWipStation4QRS014GroupS(itemNO, dateStart01, dateEnd01, modelNO, werksNo, dateType); if (wipStaiton01.DataTotal > 0) { - double sum_rate = 100.0; - int sum_idx = 1; + //2024-03-26 BB.Wang Modify 照著小平的寫法(QRS014A) + //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"); @@ -5647,8 +5817,11 @@ namespace AMESCoreStudio.Web.Controllers var wipStaiton02 = await _pcsApi.GetWipStation4QRS014GroupS(itemNO, dateStart02, dateEnd02, modelNO, werksNo, dateType); if (wipStaiton02.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"); @@ -5750,8 +5923,11 @@ namespace AMESCoreStudio.Web.Controllers var wipStaiton03 = await _pcsApi.GetWipStation4QRS014GroupS(itemNO, dateStart03, dateEnd03, modelNO, werksNo, dateType); if (wipStaiton03.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"); @@ -5853,8 +6029,11 @@ namespace AMESCoreStudio.Web.Controllers var wipStaiton04 = await _pcsApi.GetWipStation4QRS014GroupS(itemNO, dateStart04, dateEnd04, modelNO, werksNo, dateType); if (wipStaiton04.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"); @@ -5956,8 +6135,11 @@ namespace AMESCoreStudio.Web.Controllers var wipStaiton05 = await _pcsApi.GetWipStation4QRS014GroupS(itemNO, dateStart05, dateEnd05, modelNO, werksNo, dateType); if (wipStaiton05.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"); @@ -6059,8 +6241,12 @@ namespace AMESCoreStudio.Web.Controllers var wipStaiton06 = await _pcsApi.GetWipStation4QRS014GroupS(itemNO, dateStart06, dateEnd06, modelNO, werksNo, dateType); if (wipStaiton06.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"); dtRate.Columns.Add("OK_QTY"); @@ -6161,8 +6347,11 @@ namespace AMESCoreStudio.Web.Controllers var wipStaiton07 = await _pcsApi.GetWipStation4QRS014GroupS(itemNO, dateStart07, dateEnd07, modelNO, werksNo, dateType); if (wipStaiton07.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"); @@ -6264,8 +6453,12 @@ namespace AMESCoreStudio.Web.Controllers var wipStaiton08 = await _pcsApi.GetWipStation4QRS014GroupS(itemNO, dateStart08, dateEnd08, modelNO, werksNo, dateType); if (wipStaiton08.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"); dtRate.Columns.Add("OK_QTY"); @@ -6366,8 +6559,12 @@ namespace AMESCoreStudio.Web.Controllers var wipStaiton09 = await _pcsApi.GetWipStation4QRS014GroupS(itemNO, dateStart09, dateEnd09, modelNO, werksNo, dateType); if (wipStaiton09.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"); dtRate.Columns.Add("OK_QTY"); @@ -6468,8 +6665,12 @@ namespace AMESCoreStudio.Web.Controllers var wipStaiton10 = await _pcsApi.GetWipStation4QRS014GroupS(itemNO, dateStart10, dateEnd10, modelNO, werksNo, dateType); if (wipStaiton10.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"); dtRate.Columns.Add("OK_QTY"); @@ -6570,8 +6771,12 @@ namespace AMESCoreStudio.Web.Controllers var wipStaiton11 = await _pcsApi.GetWipStation4QRS014GroupS(itemNO, dateStart11, dateEnd11, modelNO, werksNo, dateType); if (wipStaiton11.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"); dtRate.Columns.Add("OK_QTY"); @@ -6672,8 +6877,12 @@ namespace AMESCoreStudio.Web.Controllers var wipStaiton12 = await _pcsApi.GetWipStation4QRS014GroupS(itemNO, dateStart12, dateEnd12, modelNO, werksNo, dateType); if (wipStaiton12.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"); dtRate.Columns.Add("OK_QTY"); @@ -6779,8 +6988,12 @@ namespace AMESCoreStudio.Web.Controllers wipStaiton01 = await _pcsApi.GetWipStation4QRS014GroupB(itemNO, dateStart01, dateEnd01, modelNO, werksNo, dateType); if (wipStaiton01.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"); dtRate.Columns.Add("OK_QTY"); @@ -6881,8 +7094,12 @@ namespace AMESCoreStudio.Web.Controllers wipStaiton02 = await _pcsApi.GetWipStation4QRS014GroupB(itemNO, dateStart02, dateEnd02, modelNO, werksNo, dateType); if (wipStaiton02.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"); dtRate.Columns.Add("OK_QTY"); @@ -6983,8 +7200,12 @@ namespace AMESCoreStudio.Web.Controllers wipStaiton03 = await _pcsApi.GetWipStation4QRS014GroupB(itemNO, dateStart03, dateEnd03, modelNO, werksNo, dateType); if (wipStaiton03.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"); dtRate.Columns.Add("OK_QTY"); @@ -7085,8 +7306,12 @@ namespace AMESCoreStudio.Web.Controllers wipStaiton04 = await _pcsApi.GetWipStation4QRS014GroupB(itemNO, dateStart04, dateEnd04, modelNO, werksNo, dateType); if (wipStaiton04.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"); dtRate.Columns.Add("OK_QTY"); @@ -7187,8 +7412,12 @@ namespace AMESCoreStudio.Web.Controllers wipStaiton05 = await _pcsApi.GetWipStation4QRS014GroupB(itemNO, dateStart05, dateEnd05, modelNO, werksNo, dateType); if (wipStaiton05.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"); dtRate.Columns.Add("OK_QTY"); @@ -7289,8 +7518,12 @@ namespace AMESCoreStudio.Web.Controllers wipStaiton06 = await _pcsApi.GetWipStation4QRS014GroupB(itemNO, dateStart06, dateEnd06, modelNO, werksNo, dateType); if (wipStaiton06.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"); dtRate.Columns.Add("OK_QTY"); @@ -7391,8 +7624,12 @@ namespace AMESCoreStudio.Web.Controllers wipStaiton07 = await _pcsApi.GetWipStation4QRS014GroupB(itemNO, dateStart07, dateEnd07, modelNO, werksNo, dateType); if (wipStaiton07.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"); dtRate.Columns.Add("OK_QTY"); @@ -7493,8 +7730,12 @@ namespace AMESCoreStudio.Web.Controllers wipStaiton08 = await _pcsApi.GetWipStation4QRS014GroupB(itemNO, dateStart08, dateEnd08, modelNO, werksNo, dateType); if (wipStaiton08.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"); dtRate.Columns.Add("OK_QTY"); @@ -7595,8 +7836,12 @@ namespace AMESCoreStudio.Web.Controllers wipStaiton09 = await _pcsApi.GetWipStation4QRS014GroupB(itemNO, dateStart09, dateEnd09, modelNO, werksNo, dateType); if (wipStaiton09.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"); dtRate.Columns.Add("OK_QTY"); @@ -7697,8 +7942,12 @@ namespace AMESCoreStudio.Web.Controllers wipStaiton10 = await _pcsApi.GetWipStation4QRS014GroupB(itemNO, dateStart10, dateEnd10, modelNO, werksNo, dateType); if (wipStaiton10.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"); dtRate.Columns.Add("OK_QTY"); @@ -7799,8 +8048,12 @@ namespace AMESCoreStudio.Web.Controllers wipStaiton11 = await _pcsApi.GetWipStation4QRS014GroupB(itemNO, dateStart11, dateEnd11, modelNO, werksNo, dateType); if (wipStaiton11.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"); dtRate.Columns.Add("OK_QTY"); @@ -7901,8 +8154,12 @@ namespace AMESCoreStudio.Web.Controllers wipStaiton12 = await _pcsApi.GetWipStation4QRS014GroupB(itemNO, dateStart12, dateEnd12, modelNO, werksNo, dateType); if (wipStaiton12.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"); dtRate.Columns.Add("OK_QTY"); @@ -8008,8 +8265,12 @@ namespace AMESCoreStudio.Web.Controllers wipStaiton01 = await _pcsApi.GetWipStation4QRS014GroupM(itemNO, dateStart01, dateEnd01, modelNO, werksNo, dateType); if (wipStaiton01.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"); dtRate.Columns.Add("OK_QTY"); @@ -8110,8 +8371,12 @@ namespace AMESCoreStudio.Web.Controllers wipStaiton02 = await _pcsApi.GetWipStation4QRS014GroupM(itemNO, dateStart02, dateEnd02, modelNO, werksNo, dateType); if (wipStaiton02.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"); dtRate.Columns.Add("OK_QTY"); @@ -8212,8 +8477,12 @@ namespace AMESCoreStudio.Web.Controllers wipStaiton03 = await _pcsApi.GetWipStation4QRS014GroupM(itemNO, dateStart03, dateEnd03, modelNO, werksNo, dateType); if (wipStaiton03.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"); dtRate.Columns.Add("OK_QTY"); @@ -8314,8 +8583,12 @@ namespace AMESCoreStudio.Web.Controllers wipStaiton04 = await _pcsApi.GetWipStation4QRS014GroupM(itemNO, dateStart04, dateEnd04, modelNO, werksNo, dateType); if (wipStaiton04.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"); dtRate.Columns.Add("OK_QTY"); @@ -8416,8 +8689,12 @@ namespace AMESCoreStudio.Web.Controllers wipStaiton05 = await _pcsApi.GetWipStation4QRS014GroupM(itemNO, dateStart05, dateEnd05, modelNO, werksNo, dateType); if (wipStaiton05.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"); dtRate.Columns.Add("OK_QTY"); @@ -8518,8 +8795,12 @@ namespace AMESCoreStudio.Web.Controllers wipStaiton06 = await _pcsApi.GetWipStation4QRS014GroupM(itemNO, dateStart06, dateEnd06, modelNO, werksNo, dateType); if (wipStaiton06.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"); dtRate.Columns.Add("OK_QTY"); @@ -8620,8 +8901,12 @@ namespace AMESCoreStudio.Web.Controllers wipStaiton07 = await _pcsApi.GetWipStation4QRS014GroupM(itemNO, dateStart07, dateEnd07, modelNO, werksNo, dateType); if (wipStaiton07.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"); dtRate.Columns.Add("OK_QTY"); @@ -8722,8 +9007,12 @@ namespace AMESCoreStudio.Web.Controllers wipStaiton08 = await _pcsApi.GetWipStation4QRS014GroupM(itemNO, dateStart08, dateEnd08, modelNO, werksNo, dateType); if (wipStaiton08.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"); dtRate.Columns.Add("OK_QTY"); @@ -8824,8 +9113,12 @@ namespace AMESCoreStudio.Web.Controllers wipStaiton09 = await _pcsApi.GetWipStation4QRS014GroupM(itemNO, dateStart09, dateEnd09, modelNO, werksNo, dateType); if (wipStaiton09.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"); dtRate.Columns.Add("OK_QTY"); @@ -8926,8 +9219,12 @@ namespace AMESCoreStudio.Web.Controllers wipStaiton10 = await _pcsApi.GetWipStation4QRS014GroupM(itemNO, dateStart10, dateEnd10, modelNO, werksNo, dateType); if (wipStaiton10.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"); dtRate.Columns.Add("OK_QTY"); @@ -9028,8 +9325,12 @@ namespace AMESCoreStudio.Web.Controllers wipStaiton11 = await _pcsApi.GetWipStation4QRS014GroupM(itemNO, dateStart11, dateEnd11, modelNO, werksNo, dateType); if (wipStaiton11.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"); dtRate.Columns.Add("OK_QTY"); @@ -9130,8 +9431,12 @@ namespace AMESCoreStudio.Web.Controllers wipStaiton12 = await _pcsApi.GetWipStation4QRS014GroupM(itemNO, dateStart12, dateEnd12, modelNO, werksNo, dateType); if (wipStaiton12.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"); dtRate.Columns.Add("OK_QTY"); diff --git a/AMESCoreStudio.WebApi/Controllers/BLL/RPTController.cs b/AMESCoreStudio.WebApi/Controllers/BLL/RPTController.cs index 6a8b8d20..f833c3d9 100644 --- a/AMESCoreStudio.WebApi/Controllers/BLL/RPTController.cs +++ b/AMESCoreStudio.WebApi/Controllers/BLL/RPTController.cs @@ -99,7 +99,9 @@ namespace AMESCoreStudio.WebApi.Controllers.BLL // 完工入庫數：GetFqcInhouseMasterMultiQuery var b = await new FqcInhouseMasterController(_context).GetFqcInhouseMasteMultiQuery("", "", "", "", date_str: sDate, date_end: eDate, ""); - result.finishedProducts = b.DataTotal; + //2024-03-26 BB.Wang Modify改為讀取數量(原為入庫單箱數) + //result.finishedProducts = b.DataTotal; + result.finishedProducts = b.Data.Sum(s => int.Parse(s.BoxQty)); //異常工時：GetExceptionWorktime4RPT001 var c = await new ExceptionWorktimesController(_context).GetExceptionWorktime4RPT001(sDate, eDate); @@ -128,11 +130,17 @@ namespace AMESCoreStudio.WebApi.Controllers.BLL //直通率：GetWipStation4QRS014GroupALL //2023-07-11 BB.Wang Modify 安勤 Jason反映只要查安勤產線即可 //var d = await new WipStationController(_context).GetWipStation4QRS014GroupALL(null, sDate, eDate, null, null, null); - var d = await new WipStationController(_context).GetWipStation4QRS014GroupALL(null, sDate, eDate, null, "YS00", null); + //2024-03-26 BB.Wang Modify 把直通率條件一致化 + //var d = await new WipStationController(_context).GetWipStation4QRS014GroupALL(null, sDate, eDate, null, "YS00", null); + var d = await new WipStationController(_context).GetWipStation4QRS014GroupALL(null, sDate, eDate, null, "YS00", "FqcDate"); if (d.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"); @@ -433,9 +441,10 @@ namespace AMESCoreStudio.WebApi.Controllers.BLL 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.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; - result.fqc = result.fqc > 100 ? 99 + Math.Round(crandom.NextDouble(), 2) : result.fqc < 99.5 ? 99 + Math.Round(crandom.NextDouble(), 2) : result.fqc; + //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; + //result.fqc = result.fqc > 100 ? 99 + Math.Round(crandom.NextDouble(), 2) : result.fqc < 99.5 ? 99 + Math.Round(crandom.NextDouble(), 2) : result.fqc; #endregion return result;