diff --git a/AMESCoreStudio.Web/Controllers/QRSController.cs b/AMESCoreStudio.Web/Controllers/QRSController.cs index fadc778c..6c7f6ba1 100644 --- a/AMESCoreStudio.Web/Controllers/QRSController.cs +++ b/AMESCoreStudio.Web/Controllers/QRSController.cs @@ -5608,10 +5608,11 @@ 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; + + 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++) { @@ -5642,18 +5643,20 @@ namespace AMESCoreStudio.Web.Controllers rate = (okQty * 1.0 / inputQty) * 100; } - /* + if (rate > 0) { sum_rate = sum_rate * (rate / 100.0); } - */ + + /* if (rate > 0) { sum_idx = sum_idx + 1; sum_rate = sum_rate + rate; } + */ rateDataList = rateDataList + "" + inputQty + "" + okQty + "" + ngQty + "" + rate.ToString("0.00") + "%"; } @@ -5712,10 +5715,10 @@ namespace AMESCoreStudio.Web.Controllers if (wipStaiton01.DataTotal > 0) { //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; + 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"); @@ -5795,9 +5798,9 @@ namespace AMESCoreStudio.Web.Controllers if (rate > 0) { - //sum_rate = sum_rate * (rate / 100.0); - sum_idx = sum_idx + 1; - sum_rate = sum_rate + rate; + sum_rate = sum_rate * (rate / 100.0); + //sum_idx = sum_idx + 1; + //sum_rate = sum_rate + rate; } } } @@ -5818,10 +5821,10 @@ namespace AMESCoreStudio.Web.Controllers if (wipStaiton02.DataTotal > 0) { //2024-03-26 BB.Wang Modify 修正良率(代小平) - //double sum_rate = 100.0; - //int sum_idx = 1; - double sum_rate = 0.0; - int sum_idx = 0; + 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"); @@ -5901,9 +5904,9 @@ namespace AMESCoreStudio.Web.Controllers if (rate > 0) { - //sum_rate = sum_rate * (rate / 100.0); - sum_idx = sum_idx + 1; - sum_rate = sum_rate + rate; + sum_rate = sum_rate * (rate / 100.0); + //sum_idx = sum_idx + 1; + //sum_rate = sum_rate + rate; } } } @@ -5924,10 +5927,10 @@ namespace AMESCoreStudio.Web.Controllers if (wipStaiton03.DataTotal > 0) { //2024-03-26 BB.Wang Modify 修正良率(代小平) - //double sum_rate = 100.0; - //int sum_idx = 1; - double sum_rate = 0.0; - int sum_idx = 0; + 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"); @@ -6007,9 +6010,9 @@ namespace AMESCoreStudio.Web.Controllers if (rate > 0) { - //sum_rate = sum_rate * (rate / 100.0); - sum_idx = sum_idx + 1; - sum_rate = sum_rate + rate; + sum_rate = sum_rate * (rate / 100.0); + //sum_idx = sum_idx + 1; + //sum_rate = sum_rate + rate; } } } @@ -6030,10 +6033,10 @@ namespace AMESCoreStudio.Web.Controllers if (wipStaiton04.DataTotal > 0) { //2024-03-26 BB.Wang Modify 修正良率(代小平) - //double sum_rate = 100.0; - //int sum_idx = 1; - double sum_rate = 0.0; - int sum_idx = 0; + 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"); @@ -6113,9 +6116,9 @@ namespace AMESCoreStudio.Web.Controllers if (rate > 0) { - //sum_rate = sum_rate * (rate / 100.0); - sum_idx = sum_idx + 1; - sum_rate = sum_rate + rate; + sum_rate = sum_rate * (rate / 100.0); + //sum_idx = sum_idx + 1; + //sum_rate = sum_rate + rate; } } } @@ -6136,10 +6139,10 @@ namespace AMESCoreStudio.Web.Controllers if (wipStaiton05.DataTotal > 0) { //2024-03-26 BB.Wang Modify 修正良率(代小平) - //double sum_rate = 100.0; - //int sum_idx = 1; - double sum_rate = 0.0; - int sum_idx = 0; + 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"); @@ -6219,9 +6222,9 @@ namespace AMESCoreStudio.Web.Controllers if (rate > 0) { - //sum_rate = sum_rate * (rate / 100.0); - sum_idx = sum_idx + 1; - sum_rate = sum_rate + rate; + sum_rate = sum_rate * (rate / 100.0); + //sum_idx = sum_idx + 1; + //sum_rate = sum_rate + rate; } } } @@ -6242,10 +6245,10 @@ namespace AMESCoreStudio.Web.Controllers if (wipStaiton06.DataTotal > 0) { //2024-03-26 BB.Wang Modify 修正良率(代小平) - //double sum_rate = 100.0; - //int sum_idx = 1; - double sum_rate = 0.0; - int sum_idx = 0; + 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"); @@ -6325,9 +6328,9 @@ namespace AMESCoreStudio.Web.Controllers if (rate > 0) { - //sum_rate = sum_rate * (rate / 100.0); - sum_idx = sum_idx + 1; - sum_rate = sum_rate + rate; + sum_rate = sum_rate * (rate / 100.0); + //sum_idx = sum_idx + 1; + //sum_rate = sum_rate + rate; } } } @@ -6348,10 +6351,10 @@ namespace AMESCoreStudio.Web.Controllers if (wipStaiton07.DataTotal > 0) { //2024-03-26 BB.Wang Modify 修正良率(代小平) - //double sum_rate = 100.0; - //int sum_idx = 1; - double sum_rate = 0.0; - int sum_idx = 0; + 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"); @@ -6431,9 +6434,9 @@ namespace AMESCoreStudio.Web.Controllers if (rate > 0) { - //sum_rate = sum_rate * (rate / 100.0); - sum_idx = sum_idx + 1; - sum_rate = sum_rate + rate; + sum_rate = sum_rate * (rate / 100.0); + //sum_idx = sum_idx + 1; + //sum_rate = sum_rate + rate; } } } @@ -6454,10 +6457,10 @@ namespace AMESCoreStudio.Web.Controllers if (wipStaiton08.DataTotal > 0) { //2024-03-26 BB.Wang Modify 修正良率(代小平) - //double sum_rate = 100.0; - //int sum_idx = 1; - double sum_rate = 0.0; - int sum_idx = 0; + 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"); @@ -6537,9 +6540,9 @@ namespace AMESCoreStudio.Web.Controllers if (rate > 0) { - //sum_rate = sum_rate * (rate / 100.0); - sum_idx = sum_idx + 1; - sum_rate = sum_rate + rate; + sum_rate = sum_rate * (rate / 100.0); + //sum_idx = sum_idx + 1; + //sum_rate = sum_rate + rate; } } } @@ -6560,10 +6563,10 @@ namespace AMESCoreStudio.Web.Controllers if (wipStaiton09.DataTotal > 0) { //2024-03-26 BB.Wang Modify 修正良率(代小平) - //double sum_rate = 100.0; - //int sum_idx = 1; - double sum_rate = 0.0; - int sum_idx = 0; + 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"); @@ -6643,9 +6646,9 @@ namespace AMESCoreStudio.Web.Controllers if (rate > 0) { - //sum_rate = sum_rate * (rate / 100.0); - sum_idx = sum_idx + 1; - sum_rate = sum_rate + rate; + sum_rate = sum_rate * (rate / 100.0); + //sum_idx = sum_idx + 1; + //sum_rate = sum_rate + rate; } } } @@ -6666,10 +6669,10 @@ namespace AMESCoreStudio.Web.Controllers if (wipStaiton10.DataTotal > 0) { //2024-03-26 BB.Wang Modify 修正良率(代小平) - //double sum_rate = 100.0; - //int sum_idx = 1; - double sum_rate = 0.0; - int sum_idx = 0; + 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"); @@ -6749,9 +6752,9 @@ namespace AMESCoreStudio.Web.Controllers if (rate > 0) { - //sum_rate = sum_rate * (rate / 100.0); - sum_idx = sum_idx + 1; - sum_rate = sum_rate + rate; + sum_rate = sum_rate * (rate / 100.0); + //sum_idx = sum_idx + 1; + //sum_rate = sum_rate + rate; } } } @@ -6772,10 +6775,10 @@ namespace AMESCoreStudio.Web.Controllers if (wipStaiton11.DataTotal > 0) { //2024-03-26 BB.Wang Modify 修正良率(代小平) - //double sum_rate = 100.0; - //int sum_idx = 1; - double sum_rate = 0.0; - int sum_idx = 0; + 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"); @@ -6855,9 +6858,9 @@ namespace AMESCoreStudio.Web.Controllers if (rate > 0) { - //sum_rate = sum_rate * (rate / 100.0); - sum_idx = sum_idx + 1; - sum_rate = sum_rate + rate; + sum_rate = sum_rate * (rate / 100.0); + //sum_idx = sum_idx + 1; + //sum_rate = sum_rate + rate; } } } @@ -6878,10 +6881,10 @@ namespace AMESCoreStudio.Web.Controllers if (wipStaiton12.DataTotal > 0) { //2024-03-26 BB.Wang Modify 修正良率(代小平) - //double sum_rate = 100.0; - //int sum_idx = 1; - double sum_rate = 0.0; - int sum_idx = 0; + 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"); @@ -6961,9 +6964,9 @@ namespace AMESCoreStudio.Web.Controllers if (rate > 0) { - //sum_rate = sum_rate * (rate / 100.0); - sum_idx = sum_idx + 1; - sum_rate = sum_rate + rate; + sum_rate = sum_rate * (rate / 100.0); + //sum_idx = sum_idx + 1; + //sum_rate = sum_rate + rate; } } } @@ -6989,10 +6992,10 @@ namespace AMESCoreStudio.Web.Controllers if (wipStaiton01.DataTotal > 0) { //2024-03-26 BB.Wang Modify 修正良率(代小平) - //double sum_rate = 100.0; - //int sum_idx = 1; - double sum_rate = 0.0; - int sum_idx = 0; + 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"); @@ -7072,9 +7075,9 @@ namespace AMESCoreStudio.Web.Controllers if (rate > 0) { - //sum_rate = sum_rate * (rate / 100.0); - sum_idx = sum_idx + 1; - sum_rate = sum_rate + rate; + sum_rate = sum_rate * (rate / 100.0); + //sum_idx = sum_idx + 1; + //sum_rate = sum_rate + rate; } } } @@ -7095,10 +7098,10 @@ namespace AMESCoreStudio.Web.Controllers if (wipStaiton02.DataTotal > 0) { //2024-03-26 BB.Wang Modify 修正良率(代小平) - //double sum_rate = 100.0; - //int sum_idx = 1; - double sum_rate = 0.0; - int sum_idx = 0; + 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"); @@ -7178,9 +7181,9 @@ namespace AMESCoreStudio.Web.Controllers if (rate > 0) { - //sum_rate = sum_rate * (rate / 100.0); - sum_idx = sum_idx + 1; - sum_rate = sum_rate + rate; + sum_rate = sum_rate * (rate / 100.0); + //sum_idx = sum_idx + 1; + //sum_rate = sum_rate + rate; } } } @@ -7201,10 +7204,10 @@ namespace AMESCoreStudio.Web.Controllers if (wipStaiton03.DataTotal > 0) { //2024-03-26 BB.Wang Modify 修正良率(代小平) - //double sum_rate = 100.0; - //int sum_idx = 1; - double sum_rate = 0.0; - int sum_idx = 0; + 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"); @@ -7284,9 +7287,9 @@ namespace AMESCoreStudio.Web.Controllers if (rate > 0) { - //sum_rate = sum_rate * (rate / 100.0); - sum_idx = sum_idx + 1; - sum_rate = sum_rate + rate; + sum_rate = sum_rate * (rate / 100.0); + //sum_idx = sum_idx + 1; + //sum_rate = sum_rate + rate; } } } @@ -7307,10 +7310,10 @@ namespace AMESCoreStudio.Web.Controllers if (wipStaiton04.DataTotal > 0) { //2024-03-26 BB.Wang Modify 修正良率(代小平) - //double sum_rate = 100.0; - //int sum_idx = 1; - double sum_rate = 0.0; - int sum_idx = 0; + 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"); @@ -7390,9 +7393,9 @@ namespace AMESCoreStudio.Web.Controllers if (rate > 0) { - //sum_rate = sum_rate * (rate / 100.0); - sum_idx = sum_idx + 1; - sum_rate = sum_rate + rate; + sum_rate = sum_rate * (rate / 100.0); + //sum_idx = sum_idx + 1; + //sum_rate = sum_rate + rate; } } } @@ -7413,10 +7416,10 @@ namespace AMESCoreStudio.Web.Controllers if (wipStaiton05.DataTotal > 0) { //2024-03-26 BB.Wang Modify 修正良率(代小平) - //double sum_rate = 100.0; - //int sum_idx = 1; - double sum_rate = 0.0; - int sum_idx = 0; + 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"); @@ -7496,9 +7499,9 @@ namespace AMESCoreStudio.Web.Controllers if (rate > 0) { - //sum_rate = sum_rate * (rate / 100.0); - sum_idx = sum_idx + 1; - sum_rate = sum_rate + rate; + sum_rate = sum_rate * (rate / 100.0); + //sum_idx = sum_idx + 1; + //sum_rate = sum_rate + rate; } } } @@ -7519,10 +7522,10 @@ namespace AMESCoreStudio.Web.Controllers if (wipStaiton06.DataTotal > 0) { //2024-03-26 BB.Wang Modify 修正良率(代小平) - //double sum_rate = 100.0; - //int sum_idx = 1; - double sum_rate = 0.0; - int sum_idx = 0; + 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"); @@ -7602,9 +7605,9 @@ namespace AMESCoreStudio.Web.Controllers if (rate > 0) { - //sum_rate = sum_rate * (rate / 100.0); - sum_idx = sum_idx + 1; - sum_rate = sum_rate + rate; + sum_rate = sum_rate * (rate / 100.0); + //sum_idx = sum_idx + 1; + //sum_rate = sum_rate + rate; } } } @@ -7625,10 +7628,10 @@ namespace AMESCoreStudio.Web.Controllers if (wipStaiton07.DataTotal > 0) { //2024-03-26 BB.Wang Modify 修正良率(代小平) - //double sum_rate = 100.0; - //int sum_idx = 1; - double sum_rate = 0.0; - int sum_idx = 0; + 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"); @@ -7708,9 +7711,9 @@ namespace AMESCoreStudio.Web.Controllers if (rate > 0) { - //sum_rate = sum_rate * (rate / 100.0); - sum_idx = sum_idx + 1; - sum_rate = sum_rate + rate; + sum_rate = sum_rate * (rate / 100.0); + //sum_idx = sum_idx + 1; + //sum_rate = sum_rate + rate; } } } @@ -7731,10 +7734,10 @@ namespace AMESCoreStudio.Web.Controllers if (wipStaiton08.DataTotal > 0) { //2024-03-26 BB.Wang Modify 修正良率(代小平) - //double sum_rate = 100.0; - //int sum_idx = 1; - double sum_rate = 0.0; - int sum_idx = 0; + 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"); @@ -7814,9 +7817,9 @@ namespace AMESCoreStudio.Web.Controllers if (rate > 0) { - //sum_rate = sum_rate * (rate / 100.0); - sum_idx = sum_idx + 1; - sum_rate = sum_rate + rate; + sum_rate = sum_rate * (rate / 100.0); + //sum_idx = sum_idx + 1; + //sum_rate = sum_rate + rate; } } } @@ -7837,10 +7840,10 @@ namespace AMESCoreStudio.Web.Controllers if (wipStaiton09.DataTotal > 0) { //2024-03-26 BB.Wang Modify 修正良率(代小平) - //double sum_rate = 100.0; - //int sum_idx = 1; - double sum_rate = 0.0; - int sum_idx = 0; + 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"); @@ -7920,9 +7923,9 @@ namespace AMESCoreStudio.Web.Controllers if (rate > 0) { - //sum_rate = sum_rate * (rate / 100.0); - sum_idx = sum_idx + 1; - sum_rate = sum_rate + rate; + sum_rate = sum_rate * (rate / 100.0); + //sum_idx = sum_idx + 1; + //um_rate = sum_rate + rate; } } } @@ -7943,10 +7946,10 @@ namespace AMESCoreStudio.Web.Controllers if (wipStaiton10.DataTotal > 0) { //2024-03-26 BB.Wang Modify 修正良率(代小平) - //double sum_rate = 100.0; - //int sum_idx = 1; - double sum_rate = 0.0; - int sum_idx = 0; + 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"); @@ -8026,9 +8029,9 @@ namespace AMESCoreStudio.Web.Controllers if (rate > 0) { - //sum_rate = sum_rate * (rate / 100.0); - sum_idx = sum_idx + 1; - sum_rate = sum_rate + rate; + sum_rate = sum_rate * (rate / 100.0); + //sum_idx = sum_idx + 1; + //sum_rate = sum_rate + rate; } } } @@ -8049,10 +8052,10 @@ namespace AMESCoreStudio.Web.Controllers if (wipStaiton11.DataTotal > 0) { //2024-03-26 BB.Wang Modify 修正良率(代小平) - //double sum_rate = 100.0; - //int sum_idx = 1; - double sum_rate = 0.0; - int sum_idx = 0; + 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"); @@ -8132,9 +8135,9 @@ namespace AMESCoreStudio.Web.Controllers if (rate > 0) { - //sum_rate = sum_rate * (rate / 100.0); - sum_idx = sum_idx + 1; - sum_rate = sum_rate + rate; + sum_rate = sum_rate * (rate / 100.0); + //sum_idx = sum_idx + 1; + //sum_rate = sum_rate + rate; } } } @@ -8155,10 +8158,10 @@ namespace AMESCoreStudio.Web.Controllers if (wipStaiton12.DataTotal > 0) { //2024-03-26 BB.Wang Modify 修正良率(代小平) - //double sum_rate = 100.0; - //int sum_idx = 1; - double sum_rate = 0.0; - int sum_idx = 0; + 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"); @@ -8238,9 +8241,9 @@ namespace AMESCoreStudio.Web.Controllers if (rate > 0) { - //sum_rate = sum_rate * (rate / 100.0); - sum_idx = sum_idx + 1; - sum_rate = sum_rate + rate; + sum_rate = sum_rate * (rate / 100.0); + //sum_idx = sum_idx + 1; + //sum_rate = sum_rate + rate; } } } @@ -8266,10 +8269,10 @@ namespace AMESCoreStudio.Web.Controllers if (wipStaiton01.DataTotal > 0) { //2024-03-26 BB.Wang Modify 修正良率(代小平) - //double sum_rate = 100.0; - //int sum_idx = 1; - double sum_rate = 0.0; - int sum_idx = 0; + 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"); @@ -8349,9 +8352,9 @@ namespace AMESCoreStudio.Web.Controllers if (rate > 0) { - //sum_rate = sum_rate * (rate / 100.0); - sum_idx = sum_idx + 1; - sum_rate = sum_rate + rate; + sum_rate = sum_rate * (rate / 100.0); + //sum_idx = sum_idx + 1; + //sum_rate = sum_rate + rate; } } } @@ -8372,10 +8375,10 @@ namespace AMESCoreStudio.Web.Controllers if (wipStaiton02.DataTotal > 0) { //2024-03-26 BB.Wang Modify 修正良率(代小平) - //double sum_rate = 100.0; - //int sum_idx = 1; - double sum_rate = 0.0; - int sum_idx = 0; + 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"); @@ -8455,9 +8458,9 @@ namespace AMESCoreStudio.Web.Controllers if (rate > 0) { - //sum_rate = sum_rate * (rate / 100.0); - sum_idx = sum_idx + 1; - sum_rate = sum_rate + rate; + sum_rate = sum_rate * (rate / 100.0); + //sum_idx = sum_idx + 1; + //sum_rate = sum_rate + rate; } } } @@ -8478,10 +8481,10 @@ namespace AMESCoreStudio.Web.Controllers if (wipStaiton03.DataTotal > 0) { //2024-03-26 BB.Wang Modify 修正良率(代小平) - //double sum_rate = 100.0; - //int sum_idx = 1; - double sum_rate = 0.0; - int sum_idx = 0; + 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"); @@ -8561,9 +8564,9 @@ namespace AMESCoreStudio.Web.Controllers if (rate > 0) { - //sum_rate = sum_rate * (rate / 100.0); - sum_idx = sum_idx + 1; - sum_rate = sum_rate + rate; + sum_rate = sum_rate * (rate / 100.0); + //sum_idx = sum_idx + 1; + //sum_rate = sum_rate + rate; } } } @@ -8584,10 +8587,10 @@ namespace AMESCoreStudio.Web.Controllers if (wipStaiton04.DataTotal > 0) { //2024-03-26 BB.Wang Modify 修正良率(代小平) - //double sum_rate = 100.0; - //int sum_idx = 1; - double sum_rate = 0.0; - int sum_idx = 0; + 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"); @@ -8667,9 +8670,9 @@ namespace AMESCoreStudio.Web.Controllers if (rate > 0) { - //sum_rate = sum_rate * (rate / 100.0); - sum_idx = sum_idx + 1; - sum_rate = sum_rate + rate; + sum_rate = sum_rate * (rate / 100.0); + //sum_idx = sum_idx + 1; + //sum_rate = sum_rate + rate; } } } @@ -8690,10 +8693,10 @@ namespace AMESCoreStudio.Web.Controllers if (wipStaiton05.DataTotal > 0) { //2024-03-26 BB.Wang Modify 修正良率(代小平) - //double sum_rate = 100.0; - //int sum_idx = 1; - double sum_rate = 0.0; - int sum_idx = 0; + 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"); @@ -8773,9 +8776,9 @@ namespace AMESCoreStudio.Web.Controllers if (rate > 0) { - //sum_rate = sum_rate * (rate / 100.0); - sum_idx = sum_idx + 1; - sum_rate = sum_rate + rate; + sum_rate = sum_rate * (rate / 100.0); + //sum_idx = sum_idx + 1; + //sum_rate = sum_rate + rate; } } } @@ -8796,10 +8799,10 @@ namespace AMESCoreStudio.Web.Controllers if (wipStaiton06.DataTotal > 0) { //2024-03-26 BB.Wang Modify 修正良率(代小平) - //double sum_rate = 100.0; - //int sum_idx = 1; - double sum_rate = 0.0; - int sum_idx = 0; + 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"); @@ -8879,9 +8882,9 @@ namespace AMESCoreStudio.Web.Controllers if (rate > 0) { - //sum_rate = sum_rate * (rate / 100.0); - sum_idx = sum_idx + 1; - sum_rate = sum_rate + rate; + sum_rate = sum_rate * (rate / 100.0); + //sum_idx = sum_idx + 1; + //sum_rate = sum_rate + rate; } } } @@ -8902,10 +8905,10 @@ namespace AMESCoreStudio.Web.Controllers if (wipStaiton07.DataTotal > 0) { //2024-03-26 BB.Wang Modify 修正良率(代小平) - //double sum_rate = 100.0; - //int sum_idx = 1; - double sum_rate = 0.0; - int sum_idx = 0; + 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"); @@ -8985,9 +8988,9 @@ namespace AMESCoreStudio.Web.Controllers if (rate > 0) { - //sum_rate = sum_rate * (rate / 100.0); - sum_idx = sum_idx + 1; - sum_rate = sum_rate + rate; + sum_rate = sum_rate * (rate / 100.0); + //sum_idx = sum_idx + 1; + //sum_rate = sum_rate + rate; } } } @@ -9008,10 +9011,10 @@ namespace AMESCoreStudio.Web.Controllers if (wipStaiton08.DataTotal > 0) { //2024-03-26 BB.Wang Modify 修正良率(代小平) - //double sum_rate = 100.0; - //int sum_idx = 1; - double sum_rate = 0.0; - int sum_idx = 0; + 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"); @@ -9091,9 +9094,9 @@ namespace AMESCoreStudio.Web.Controllers if (rate > 0) { - //sum_rate = sum_rate * (rate / 100.0); - sum_idx = sum_idx + 1; - sum_rate = sum_rate + rate; + sum_rate = sum_rate * (rate / 100.0); + //sum_idx = sum_idx + 1; + //sum_rate = sum_rate + rate; } } } @@ -9114,10 +9117,10 @@ namespace AMESCoreStudio.Web.Controllers if (wipStaiton09.DataTotal > 0) { //2024-03-26 BB.Wang Modify 修正良率(代小平) - //double sum_rate = 100.0; - //int sum_idx = 1; - double sum_rate = 0.0; - int sum_idx = 0; + 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"); @@ -9197,9 +9200,9 @@ namespace AMESCoreStudio.Web.Controllers if (rate > 0) { - //sum_rate = sum_rate * (rate / 100.0); - sum_idx = sum_idx + 1; - sum_rate = sum_rate + rate; + sum_rate = sum_rate * (rate / 100.0); + //sum_idx = sum_idx + 1; + ///sum_rate = sum_rate + rate; } } } @@ -9220,10 +9223,10 @@ namespace AMESCoreStudio.Web.Controllers if (wipStaiton10.DataTotal > 0) { //2024-03-26 BB.Wang Modify 修正良率(代小平) - //double sum_rate = 100.0; - //int sum_idx = 1; - double sum_rate = 0.0; - int sum_idx = 0; + 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"); @@ -9303,9 +9306,9 @@ namespace AMESCoreStudio.Web.Controllers if (rate > 0) { - //sum_rate = sum_rate * (rate / 100.0); - sum_idx = sum_idx + 1; - sum_rate = sum_rate + rate; + sum_rate = sum_rate * (rate / 100.0); + //sum_idx = sum_idx + 1; + //sum_rate = sum_rate + rate; } } } @@ -9326,10 +9329,10 @@ namespace AMESCoreStudio.Web.Controllers if (wipStaiton11.DataTotal > 0) { //2024-03-26 BB.Wang Modify 修正良率(代小平) - //double sum_rate = 100.0; - //int sum_idx = 1; - double sum_rate = 0.0; - int sum_idx = 0; + 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"); @@ -9409,9 +9412,9 @@ namespace AMESCoreStudio.Web.Controllers if (rate > 0) { - //sum_rate = sum_rate * (rate / 100.0); - sum_idx = sum_idx + 1; - sum_rate = sum_rate + rate; + sum_rate = sum_rate * (rate / 100.0); + //sum_idx = sum_idx + 1; + //sum_rate = sum_rate + rate; } } } @@ -9432,10 +9435,10 @@ namespace AMESCoreStudio.Web.Controllers if (wipStaiton12.DataTotal > 0) { //2024-03-26 BB.Wang Modify 修正良率(代小平) - //double sum_rate = 100.0; - //int sum_idx = 1; - double sum_rate = 0.0; - int sum_idx = 0; + 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"); @@ -9515,9 +9518,9 @@ namespace AMESCoreStudio.Web.Controllers if (rate > 0) { - //sum_rate = sum_rate * (rate / 100.0); - sum_idx = sum_idx + 1; - sum_rate = sum_rate + rate; + sum_rate = sum_rate * (rate / 100.0); + //sum_idx = sum_idx + 1; + //sum_rate = sum_rate + rate; } } } diff --git a/AMESCoreStudio.Web/Views/PCS/PCS037L.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS037L.cshtml index e6dfa5b2..d1b927db 100644 --- a/AMESCoreStudio.Web/Views/PCS/PCS037L.cshtml +++ b/AMESCoreStudio.Web/Views/PCS/PCS037L.cshtml @@ -14,14 +14,26 @@
- @ViewData["Tips"]        Rev.A2 -
- +
@Html.Raw(ViewData["Tips"])        Rev.A2
+
sdfsdfasdf
@section Scripts{ + -} \ No newline at end of file +} + diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs index 32aa6282..0250177d 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs @@ -710,6 +710,10 @@ and b.item_no = '{0}' and a.barcode_no = '{1}'", kp_no, barcode_no); { kp_sql = "select item_no as kp_no,count(item_no) kp_qty from jhames.barcode_item where barcode_id = " + barcode_id + " group by item_no"; } + else + { + kp_sql = "select item_no as kp_no,count(item_no) kp_qty from jhames.barcode_item where barcode_id = " + barcode_id + " group by item_no"; + } using (var cmd = conn.CreateCommand()) { diff --git a/AMESCoreStudio.WebApi/Controllers/BLL/RPTController.cs b/AMESCoreStudio.WebApi/Controllers/BLL/RPTController.cs index f833c3d9..831a83ba 100644 --- a/AMESCoreStudio.WebApi/Controllers/BLL/RPTController.cs +++ b/AMESCoreStudio.WebApi/Controllers/BLL/RPTController.cs @@ -98,7 +98,7 @@ namespace AMESCoreStudio.WebApi.Controllers.BLL result.openOrderWipQty = a.DataTotal; // 完工入庫數:GetFqcInhouseMasterMultiQuery - var b = await new FqcInhouseMasterController(_context).GetFqcInhouseMasteMultiQuery("", "", "", "", date_str: sDate, date_end: eDate, ""); + var b = await new FqcInhouseMasterController(_context).GetFqcInhouseMasteMultiQuery("", "", "", "", date_str: sDate, date_end: eDate, "Y"); //2024-03-26 BB.Wang Modify改為讀取數量(原為入庫單箱數) //result.finishedProducts = b.DataTotal; result.finishedProducts = b.Data.Sum(s => int.Parse(s.BoxQty)); @@ -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");