diff --git a/AMESCoreStudio.Web/Controllers/QRSController.cs b/AMESCoreStudio.Web/Controllers/QRSController.cs
index aaa7c505..e23812e0 100644
--- a/AMESCoreStudio.Web/Controllers/QRSController.cs
+++ b/AMESCoreStudio.Web/Controllers/QRSController.cs
@@ -1086,7 +1086,7 @@ namespace AMESCoreStudio.Web.Controllers
 
             var ft_stations = await _basApi.GetStations4FTByConfig(param[0]);
 
-            IResultModel<dynamic> result = await _pcsApi.GetWipInfo4QRS014(param[0], param[1], param[2], param[3], param[4], param[5], param[6]);
+            IResultModel<dynamic> result = await _pcsApi.GetWipInfo4QRS014(param[0], param[1], param[2], param[3], param[4], param[5], param[6], param[7]);
 
             var query = new QRS014ViewModel();
 
@@ -1096,6 +1096,8 @@ namespace AMESCoreStudio.Web.Controllers
                 int wip_id = int.Parse(jo["wipID"].ToString());
 
                 double sum_rate = 100.0;
+                int sum_idx = 1;
+
                 for (int i = 0; i < ft_stations.Count; i++)
                 {
                     int station_id = ft_stations[i].StationID;
@@ -1125,17 +1127,25 @@ 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;
+                    }
                 }
 
                 query.SumYieldDatas.Add(new SumYieldData
                 {
                     WipID = int.Parse(jo["wipID"].ToString()),
                     WipNO = jo["wipNO"].ToString(),
-                    Yield = sum_rate
+                    Yield = sum_rate / sum_idx
                 });
             }
 
@@ -1144,7 +1154,7 @@ namespace AMESCoreStudio.Web.Controllers
 
 
         [HttpPost]
-        public async Task<JsonResult> GetYieldData4QRS014BSAsync(string id)
+        public async Task<JsonResult> GetYieldData4QRS014SAsync(string id)
         {
             string[] param = id.Split('_');
 
@@ -1154,8 +1164,9 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart01 = DateTime.Now.Year.ToString() + "-01-01";
             string dateEnd01 = DateTime.Now.Year.ToString() + "-02-01";
-            var wipStaiton01 = await _pcsApi.GetWipStation4QRS014GroupS(param[1], dateStart01, dateEnd01, param[5], param[6]);
+            var wipStaiton01 = await _pcsApi.GetWipStation4QRS014GroupS(param[1], dateStart01, dateEnd01, param[5], param[6], param[7]);
             double sum_rate01 = 100.0;
+            int sum_idx01 = 1;
             if (wipStaiton01.DataTotal > 0)
             {
                 DataTable dtRate = new DataTable();
@@ -1236,7 +1247,9 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate01 = sum_rate01 * (rate / 100.0);
+                            //sum_rate01 = sum_rate01 * (rate / 100.0);
+                            sum_idx01 = sum_idx01 + 1;
+                            sum_rate01 = sum_rate01 + rate;
                         }
                     }
                 }
@@ -1248,7 +1261,7 @@ namespace AMESCoreStudio.Web.Controllers
             query.FPYDatas.Add(new FPY4MonthGroup
             {
                 Month = DateTime.Now.Year.ToString() + "-01",
-                Yield = double.Parse(sum_rate01.ToString("0.00"))
+                Yield = double.Parse((sum_rate01 / sum_idx01).ToString("0.00"))
             });
 
             #endregion
@@ -1257,8 +1270,9 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart02 = DateTime.Now.Year.ToString() + "-02-01";
             string dateEnd02 = DateTime.Now.Year.ToString() + "-03-01";
-            var wipStaiton02 = await _pcsApi.GetWipStation4QRS014GroupS(param[1], dateStart02, dateEnd02, param[5], param[6]);
+            var wipStaiton02 = await _pcsApi.GetWipStation4QRS014GroupS(param[1], dateStart02, dateEnd02, param[5], param[6], param[7]);
             double sum_rate02 = 100.0;
+            int sum_idx02 = 1;
             if (wipStaiton02.DataTotal > 0)
             {
                 DataTable dtRate = new DataTable();
@@ -1339,7 +1353,9 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate02 = sum_rate02 * (rate / 100.0);
+                            //sum_rate02 = sum_rate02 * (rate / 100.0);
+                            sum_idx02 = sum_idx02 + 1;
+                            sum_rate02 = sum_rate02 + rate;
                         }
                     }
                 }
@@ -1351,7 +1367,7 @@ namespace AMESCoreStudio.Web.Controllers
             query.FPYDatas.Add(new FPY4MonthGroup
             {
                 Month = DateTime.Now.Year.ToString() + "-02",
-                Yield = double.Parse(sum_rate02.ToString("0.00"))
+                Yield = double.Parse((sum_rate02 / sum_idx02).ToString("0.00"))
             });
 
             #endregion
@@ -1360,8 +1376,9 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart03 = DateTime.Now.Year.ToString() + "-03-01";
             string dateEnd03 = DateTime.Now.Year.ToString() + "-04-01";
-            var wipStaiton03 = await _pcsApi.GetWipStation4QRS014GroupS(param[1], dateStart03, dateEnd03, param[5], param[6]);
+            var wipStaiton03 = await _pcsApi.GetWipStation4QRS014GroupS(param[1], dateStart03, dateEnd03, param[5], param[6], param[7]);
             double sum_rate03 = 100.0;
+            int sum_idx03 = 1;
             if (wipStaiton03.DataTotal > 0)
             {
                 DataTable dtRate = new DataTable();
@@ -1442,7 +1459,9 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate03 = sum_rate03 * (rate / 100.0);
+                            //sum_rate03 = sum_rate03 * (rate / 100.0);
+                            sum_idx03 = sum_idx03 + 1;
+                            sum_rate03 = sum_rate03 + rate;
                         }
                     }
                 }
@@ -1454,7 +1473,7 @@ namespace AMESCoreStudio.Web.Controllers
             query.FPYDatas.Add(new FPY4MonthGroup
             {
                 Month = DateTime.Now.Year.ToString() + "-03",
-                Yield = double.Parse(sum_rate03.ToString("0.00"))
+                Yield = double.Parse((sum_rate03 / sum_idx03).ToString("0.00"))
             });
 
             #endregion
@@ -1463,8 +1482,9 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart04 = DateTime.Now.Year.ToString() + "-04-01";
             string dateEnd04 = DateTime.Now.Year.ToString() + "-05-01";
-            var wipStaiton04 = await _pcsApi.GetWipStation4QRS014GroupS(param[1], dateStart04, dateEnd04, param[5], param[6]);
+            var wipStaiton04 = await _pcsApi.GetWipStation4QRS014GroupS(param[1], dateStart04, dateEnd04, param[5], param[6], param[7]);
             double sum_rate04 = 100.0;
+            int sum_idx04 = 1;
             if (wipStaiton04.DataTotal > 0)
             {
                 DataTable dtRate = new DataTable();
@@ -1545,7 +1565,9 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate04 = sum_rate04 * (rate / 100.0);
+                            //sum_rate04 = sum_rate04 * (rate / 100.0);
+                            sum_idx04 = sum_idx04 + 1;
+                            sum_rate04 = sum_rate04 + rate;
                         }
                     }
                 }
@@ -1557,7 +1579,7 @@ namespace AMESCoreStudio.Web.Controllers
             query.FPYDatas.Add(new FPY4MonthGroup
             {
                 Month = DateTime.Now.Year.ToString() + "-04",
-                Yield = double.Parse(sum_rate04.ToString("0.00"))
+                Yield = double.Parse((sum_rate04 / sum_idx04).ToString("0.00"))
             });
 
             #endregion
@@ -1566,8 +1588,9 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart05 = DateTime.Now.Year.ToString() + "-05-01";
             string dateEnd05 = DateTime.Now.Year.ToString() + "-06-01";
-            var wipStaiton05 = await _pcsApi.GetWipStation4QRS014GroupS(param[1], dateStart05, dateEnd05, param[5], param[6]);
+            var wipStaiton05 = await _pcsApi.GetWipStation4QRS014GroupS(param[1], dateStart05, dateEnd05, param[5], param[6], param[7]);
             double sum_rate05 = 100.0;
+            int sum_idx05 = 1;
             if (wipStaiton05.DataTotal > 0)
             {
                 DataTable dtRate = new DataTable();
@@ -1648,7 +1671,9 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate05 = sum_rate05 * (rate / 100.0);
+                            //sum_rate05 = sum_rate05 * (rate / 100.0);
+                            sum_idx05 = sum_idx05 + 1;
+                            sum_rate05 = sum_rate05 + rate;
                         }
                     }
                 }
@@ -1660,7 +1685,7 @@ namespace AMESCoreStudio.Web.Controllers
             query.FPYDatas.Add(new FPY4MonthGroup
             {
                 Month = DateTime.Now.Year.ToString() + "-05",
-                Yield = double.Parse(sum_rate05.ToString("0.00"))
+                Yield = double.Parse((sum_rate05 / sum_idx05).ToString("0.00"))
             });
 
             #endregion
@@ -1669,8 +1694,9 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart06 = DateTime.Now.Year.ToString() + "-06-01";
             string dateEnd06 = DateTime.Now.Year.ToString() + "-07-01";
-            var wipStaiton06 = await _pcsApi.GetWipStation4QRS014GroupS(param[1], dateStart06, dateEnd06, param[5], param[6]);
+            var wipStaiton06 = await _pcsApi.GetWipStation4QRS014GroupS(param[1], dateStart06, dateEnd06, param[5], param[6], param[7]);
             double sum_rate06 = 100.0;
+            int sum_idx06 = 1;
             if (wipStaiton06.DataTotal > 0)
             {
                 DataTable dtRate = new DataTable();
@@ -1751,7 +1777,9 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate06 = sum_rate06 * (rate / 100.0);
+                            //sum_rate06 = sum_rate06 * (rate / 100.0);
+                            sum_idx06 = sum_idx06 + 1;
+                            sum_rate06 = sum_rate06 + rate;
                         }
                     }
                 }
@@ -1763,7 +1791,7 @@ namespace AMESCoreStudio.Web.Controllers
             query.FPYDatas.Add(new FPY4MonthGroup
             {
                 Month = DateTime.Now.Year.ToString() + "-06",
-                Yield = double.Parse(sum_rate06.ToString("0.00"))
+                Yield = double.Parse((sum_rate06 / sum_idx06).ToString("0.00"))
             });
 
             #endregion
@@ -1772,8 +1800,9 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart07 = DateTime.Now.Year.ToString() + "-07-01";
             string dateEnd07 = DateTime.Now.Year.ToString() + "-08-01";
-            var wipStaiton07 = await _pcsApi.GetWipStation4QRS014GroupS(param[1], dateStart07, dateEnd07, param[5], param[6]);
+            var wipStaiton07 = await _pcsApi.GetWipStation4QRS014GroupS(param[1], dateStart07, dateEnd07, param[5], param[6], param[7]);
             double sum_rate07 = 100.0;
+            int sum_idx07 = 1;
             if (wipStaiton07.DataTotal > 0)
             {
                 DataTable dtRate = new DataTable();
@@ -1854,7 +1883,9 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate07 = sum_rate07 * (rate / 100.0);
+                            //sum_rate07 = sum_rate07 * (rate / 100.0);
+                            sum_idx07 = sum_idx07 + 1;
+                            sum_rate07 = sum_rate07 + rate;
                         }
                     }
                 }
@@ -1866,7 +1897,7 @@ namespace AMESCoreStudio.Web.Controllers
             query.FPYDatas.Add(new FPY4MonthGroup
             {
                 Month = DateTime.Now.Year.ToString() + "-07",
-                Yield = double.Parse(sum_rate07.ToString("0.00"))
+                Yield = double.Parse((sum_rate07 / sum_idx07).ToString("0.00"))
             });
 
             #endregion
@@ -1875,8 +1906,9 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart08 = DateTime.Now.Year.ToString() + "-08-01";
             string dateEnd08 = DateTime.Now.Year.ToString() + "-09-01";
-            var wipStaiton08 = await _pcsApi.GetWipStation4QRS014GroupS(param[1], dateStart08, dateEnd08, param[5], param[6]);
+            var wipStaiton08 = await _pcsApi.GetWipStation4QRS014GroupS(param[1], dateStart08, dateEnd08, param[5], param[6], param[7]);
             double sum_rate08 = 100.0;
+            int sum_idx08 = 1;
             if (wipStaiton08.DataTotal > 0)
             {
                 DataTable dtRate = new DataTable();
@@ -1957,7 +1989,9 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate08 = sum_rate08 * (rate / 100.0);
+                            //sum_rate08 = sum_rate08 * (rate / 100.0);
+                            sum_idx08 = sum_idx08 + 1;
+                            sum_rate08 = sum_rate08 + rate;
                         }
                     }
                 }
@@ -1969,7 +2003,7 @@ namespace AMESCoreStudio.Web.Controllers
             query.FPYDatas.Add(new FPY4MonthGroup
             {
                 Month = DateTime.Now.Year.ToString() + "-08",
-                Yield = double.Parse(sum_rate08.ToString("0.00"))
+                Yield = double.Parse((sum_rate08 / sum_idx08).ToString("0.00"))
             });
 
             #endregion
@@ -1978,8 +2012,9 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart09 = DateTime.Now.Year.ToString() + "-09-01";
             string dateEnd09 = DateTime.Now.Year.ToString() + "-10-01";
-            var wipStaiton09 = await _pcsApi.GetWipStation4QRS014GroupS(param[1], dateStart09, dateEnd09, param[5], param[6]);
+            var wipStaiton09 = await _pcsApi.GetWipStation4QRS014GroupS(param[1], dateStart09, dateEnd09, param[5], param[6], param[7]);
             double sum_rate09 = 100.0;
+            int sum_idx09 = 1;
             if (wipStaiton09.DataTotal > 0)
             {
                 DataTable dtRate = new DataTable();
@@ -2060,7 +2095,9 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate09 = sum_rate09 * (rate / 100.0);
+                            //sum_rate09 = sum_rate09 * (rate / 100.0);
+                            sum_idx09 = sum_idx09 + 1;
+                            sum_rate09 = sum_rate09 + rate;
                         }
                     }
                 }
@@ -2072,7 +2109,7 @@ namespace AMESCoreStudio.Web.Controllers
             query.FPYDatas.Add(new FPY4MonthGroup
             {
                 Month = DateTime.Now.Year.ToString() + "-09",
-                Yield = double.Parse(sum_rate09.ToString("0.00"))
+                Yield = double.Parse((sum_rate09 / sum_idx09).ToString("0.00"))
             });
 
             #endregion
@@ -2081,8 +2118,9 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart10 = DateTime.Now.Year.ToString() + "-10-01";
             string dateEnd10 = DateTime.Now.Year.ToString() + "-11-01";
-            var wipStaiton10 = await _pcsApi.GetWipStation4QRS014GroupS(param[1], dateStart10, dateEnd10, param[5], param[6]);
+            var wipStaiton10 = await _pcsApi.GetWipStation4QRS014GroupS(param[1], dateStart10, dateEnd10, param[5], param[6], param[7]);
             double sum_rate10 = 100.0;
+            int sum_idx10 = 1;
             if (wipStaiton10.DataTotal > 0)
             {
                 DataTable dtRate = new DataTable();
@@ -2163,7 +2201,9 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate10 = sum_rate10 * (rate / 100.0);
+                            //sum_rate10 = sum_rate10 * (rate / 100.0);
+                            sum_idx10 = sum_idx10 + 1;
+                            sum_rate10 = sum_rate10 + rate;
                         }
                     }
                 }
@@ -2175,7 +2215,7 @@ namespace AMESCoreStudio.Web.Controllers
             query.FPYDatas.Add(new FPY4MonthGroup
             {
                 Month = DateTime.Now.Year.ToString() + "-10",
-                Yield = double.Parse(sum_rate10.ToString("0.00"))
+                Yield = double.Parse((sum_rate10 / sum_idx10).ToString("0.00"))
             });
 
             #endregion
@@ -2184,8 +2224,9 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart11 = DateTime.Now.Year.ToString() + "-11-01";
             string dateEnd11 = DateTime.Now.Year.ToString() + "-12-01";
-            var wipStaiton11 = await _pcsApi.GetWipStation4QRS014GroupS(param[1], dateStart11, dateEnd11, param[5], param[6]);
+            var wipStaiton11 = await _pcsApi.GetWipStation4QRS014GroupS(param[1], dateStart11, dateEnd11, param[5], param[6], param[7]);
             double sum_rate11 = 100.0;
+            int sum_idx11 = 1;
             if (wipStaiton11.DataTotal > 0)
             {
                 DataTable dtRate = new DataTable();
@@ -2266,7 +2307,9 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate11 = sum_rate11 * (rate / 100.0);
+                            //sum_rate11 = sum_rate11 * (rate / 100.0);
+                            sum_idx11 = sum_idx11 + 1;
+                            sum_rate11 = sum_rate11 + rate;
                         }
                     }
                 }
@@ -2278,7 +2321,7 @@ namespace AMESCoreStudio.Web.Controllers
             query.FPYDatas.Add(new FPY4MonthGroup
             {
                 Month = DateTime.Now.Year.ToString() + "-11",
-                Yield = double.Parse(sum_rate11.ToString("0.00"))
+                Yield = double.Parse((sum_rate11 / sum_idx11).ToString("0.00"))
             });
 
             #endregion
@@ -2287,8 +2330,9 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart12 = DateTime.Now.Year.ToString() + "-12-01";
             string dateEnd12 = DateTime.Now.AddYears(1).Year.ToString() + "-01-01";
-            var wipStaiton12 = await _pcsApi.GetWipStation4QRS014GroupS(param[1], dateStart12, dateEnd12, param[5], param[6]);
+            var wipStaiton12 = await _pcsApi.GetWipStation4QRS014GroupS(param[1], dateStart12, dateEnd12, param[5], param[6], param[7]);
             double sum_rate12 = 100.0;
+            int sum_idx12 = 1;
             if (wipStaiton12.DataTotal > 0)
             {
                 DataTable dtRate = new DataTable();
@@ -2369,7 +2413,9 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate12 = sum_rate12 * (rate / 100.0);
+                            //sum_rate12 = sum_rate12 * (rate / 100.0);
+                            sum_idx12 = sum_idx12 + 1;
+                            sum_rate12 = sum_rate12 + rate;
                         }
                     }
                 }
@@ -2381,7 +2427,7 @@ namespace AMESCoreStudio.Web.Controllers
             query.FPYDatas.Add(new FPY4MonthGroup
             {
                 Month = DateTime.Now.Year.ToString() + "-12",
-                Yield = double.Parse(sum_rate12.ToString("0.00"))
+                Yield = double.Parse((sum_rate12 / sum_idx12).ToString("0.00"))
             });
 
             #endregion
@@ -2400,8 +2446,9 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart01 = DateTime.Now.Year.ToString() + "-01-01";
             string dateEnd01 = DateTime.Now.Year.ToString() + "-02-01";
-            var wipStaiton01 = await _pcsApi.GetWipStation4QRS014GroupB(param[1], dateStart01, dateEnd01, param[5], param[6]);
+            var wipStaiton01 = await _pcsApi.GetWipStation4QRS014GroupB(param[1], dateStart01, dateEnd01, param[5], param[6], param[7]);
             double sum_rate01 = 100.0;
+            int sum_idx01 = 1;
             if (wipStaiton01.DataTotal > 0)
             {
                 DataTable dtRate = new DataTable();
@@ -2482,7 +2529,9 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate01 = sum_rate01 * (rate / 100.0);
+                            //sum_rate01 = sum_rate01 * (rate / 100.0);
+                            sum_idx01 = sum_idx01 + 1;
+                            sum_rate01 = sum_rate01 + rate;
                         }
                     }
                 }
@@ -2494,7 +2543,7 @@ namespace AMESCoreStudio.Web.Controllers
             query.FPYDatas.Add(new FPY4MonthGroup
             {
                 Month = DateTime.Now.Year.ToString() + "-01",
-                Yield = double.Parse(sum_rate01.ToString("0.00"))
+                Yield = double.Parse((sum_rate01 / sum_idx01).ToString("0.00"))
             });
 
             #endregion
@@ -2503,8 +2552,9 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart02 = DateTime.Now.Year.ToString() + "-02-01";
             string dateEnd02 = DateTime.Now.Year.ToString() + "-03-01";
-            var wipStaiton02 = await _pcsApi.GetWipStation4QRS014GroupB(param[1], dateStart02, dateEnd02, param[5], param[6]);
+            var wipStaiton02 = await _pcsApi.GetWipStation4QRS014GroupB(param[1], dateStart02, dateEnd02, param[5], param[6], param[7]);
             double sum_rate02 = 100.0;
+            int sum_idx02 = 1;
             if (wipStaiton02.DataTotal > 0)
             {
                 DataTable dtRate = new DataTable();
@@ -2585,7 +2635,9 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate02 = sum_rate02 * (rate / 100.0);
+                            //sum_rate02 = sum_rate02 * (rate / 100.0);
+                            sum_idx02 = sum_idx02 + 1;
+                            sum_rate02 = sum_rate02 + rate;
                         }
                     }
                 }
@@ -2597,7 +2649,7 @@ namespace AMESCoreStudio.Web.Controllers
             query.FPYDatas.Add(new FPY4MonthGroup
             {
                 Month = DateTime.Now.Year.ToString() + "-02",
-                Yield = double.Parse(sum_rate02.ToString("0.00"))
+                Yield = double.Parse((sum_rate02 / sum_idx02).ToString("0.00"))
             });
 
             #endregion
@@ -2606,8 +2658,9 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart03 = DateTime.Now.Year.ToString() + "-03-01";
             string dateEnd03 = DateTime.Now.Year.ToString() + "-04-01";
-            var wipStaiton03 = await _pcsApi.GetWipStation4QRS014GroupB(param[1], dateStart03, dateEnd03, param[5], param[6]);
+            var wipStaiton03 = await _pcsApi.GetWipStation4QRS014GroupB(param[1], dateStart03, dateEnd03, param[5], param[6], param[7]);
             double sum_rate03 = 100.0;
+            int sum_idx03 = 1;
             if (wipStaiton03.DataTotal > 0)
             {
                 DataTable dtRate = new DataTable();
@@ -2688,7 +2741,9 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate03 = sum_rate03 * (rate / 100.0);
+                            //sum_rate03 = sum_rate03 * (rate / 100.0);
+                            sum_idx03 = sum_idx03 + 1;
+                            sum_rate03 = sum_rate03 + rate;
                         }
                     }
                 }
@@ -2700,7 +2755,7 @@ namespace AMESCoreStudio.Web.Controllers
             query.FPYDatas.Add(new FPY4MonthGroup
             {
                 Month = DateTime.Now.Year.ToString() + "-03",
-                Yield = double.Parse(sum_rate03.ToString("0.00"))
+                Yield = double.Parse((sum_rate03 / sum_idx03).ToString("0.00"))
             });
 
             #endregion
@@ -2709,8 +2764,9 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart04 = DateTime.Now.Year.ToString() + "-04-01";
             string dateEnd04 = DateTime.Now.Year.ToString() + "-05-01";
-            var wipStaiton04 = await _pcsApi.GetWipStation4QRS014GroupB(param[1], dateStart04, dateEnd04, param[5], param[6]);
+            var wipStaiton04 = await _pcsApi.GetWipStation4QRS014GroupB(param[1], dateStart04, dateEnd04, param[5], param[6], param[7]);
             double sum_rate04 = 100.0;
+            int sum_idx04 = 1;
             if (wipStaiton04.DataTotal > 0)
             {
                 DataTable dtRate = new DataTable();
@@ -2791,7 +2847,9 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate04 = sum_rate04 * (rate / 100.0);
+                            //sum_rate04 = sum_rate04 * (rate / 100.0);
+                            sum_idx04 = sum_idx04 + 1;
+                            sum_rate04 = sum_rate04 + rate;
                         }
                     }
                 }
@@ -2803,7 +2861,7 @@ namespace AMESCoreStudio.Web.Controllers
             query.FPYDatas.Add(new FPY4MonthGroup
             {
                 Month = DateTime.Now.Year.ToString() + "-04",
-                Yield = double.Parse(sum_rate04.ToString("0.00"))
+                Yield = double.Parse((sum_rate04 / sum_idx04).ToString("0.00"))
             });
 
             #endregion
@@ -2812,8 +2870,9 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart05 = DateTime.Now.Year.ToString() + "-05-01";
             string dateEnd05 = DateTime.Now.Year.ToString() + "-06-01";
-            var wipStaiton05 = await _pcsApi.GetWipStation4QRS014GroupB(param[1], dateStart05, dateEnd05, param[5], param[6]);
+            var wipStaiton05 = await _pcsApi.GetWipStation4QRS014GroupB(param[1], dateStart05, dateEnd05, param[5], param[6], param[7]);
             double sum_rate05 = 100.0;
+            int sum_idx05 = 1;
             if (wipStaiton05.DataTotal > 0)
             {
                 DataTable dtRate = new DataTable();
@@ -2894,7 +2953,9 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate05 = sum_rate05 * (rate / 100.0);
+                            //sum_rate05 = sum_rate05 * (rate / 100.0);
+                            sum_idx05 = sum_idx05 + 1;
+                            sum_rate05 = sum_rate05 + rate;
                         }
                     }
                 }
@@ -2906,7 +2967,7 @@ namespace AMESCoreStudio.Web.Controllers
             query.FPYDatas.Add(new FPY4MonthGroup
             {
                 Month = DateTime.Now.Year.ToString() + "-05",
-                Yield = double.Parse(sum_rate05.ToString("0.00"))
+                Yield = double.Parse((sum_rate05 / sum_idx05).ToString("0.00"))
             });
 
             #endregion
@@ -2915,8 +2976,9 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart06 = DateTime.Now.Year.ToString() + "-06-01";
             string dateEnd06 = DateTime.Now.Year.ToString() + "-07-01";
-            var wipStaiton06 = await _pcsApi.GetWipStation4QRS014GroupB(param[1], dateStart06, dateEnd06, param[5], param[6]);
+            var wipStaiton06 = await _pcsApi.GetWipStation4QRS014GroupB(param[1], dateStart06, dateEnd06, param[5], param[6], param[7]);
             double sum_rate06 = 100.0;
+            int sum_idx06 = 1;
             if (wipStaiton06.DataTotal > 0)
             {
                 DataTable dtRate = new DataTable();
@@ -2997,7 +3059,9 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate06 = sum_rate06 * (rate / 100.0);
+                            //sum_rate06 = sum_rate06 * (rate / 100.0);
+                            sum_idx06 = sum_idx06 + 1;
+                            sum_rate06 = sum_rate06 + rate;
                         }
                     }
                 }
@@ -3009,7 +3073,7 @@ namespace AMESCoreStudio.Web.Controllers
             query.FPYDatas.Add(new FPY4MonthGroup
             {
                 Month = DateTime.Now.Year.ToString() + "-06",
-                Yield = double.Parse(sum_rate06.ToString("0.00"))
+                Yield = double.Parse((sum_rate06 / sum_idx06).ToString("0.00"))
             });
 
             #endregion
@@ -3018,8 +3082,9 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart07 = DateTime.Now.Year.ToString() + "-07-01";
             string dateEnd07 = DateTime.Now.Year.ToString() + "-08-01";
-            var wipStaiton07 = await _pcsApi.GetWipStation4QRS014GroupB(param[1], dateStart07, dateEnd07, param[5], param[6]);
+            var wipStaiton07 = await _pcsApi.GetWipStation4QRS014GroupB(param[1], dateStart07, dateEnd07, param[5], param[6], param[7]);
             double sum_rate07 = 100.0;
+            int sum_idx07 = 1;
             if (wipStaiton07.DataTotal > 0)
             {
                 DataTable dtRate = new DataTable();
@@ -3100,7 +3165,9 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate07 = sum_rate07 * (rate / 100.0);
+                            //sum_rate07 = sum_rate07 * (rate / 100.0);
+                            sum_idx07 = sum_idx07 + 1;
+                            sum_rate07 = sum_rate07 + rate;
                         }
                     }
                 }
@@ -3112,7 +3179,7 @@ namespace AMESCoreStudio.Web.Controllers
             query.FPYDatas.Add(new FPY4MonthGroup
             {
                 Month = DateTime.Now.Year.ToString() + "-07",
-                Yield = double.Parse(sum_rate07.ToString("0.00"))
+                Yield = double.Parse((sum_rate07 / sum_idx07).ToString("0.00"))
             });
 
             #endregion
@@ -3121,8 +3188,9 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart08 = DateTime.Now.Year.ToString() + "-08-01";
             string dateEnd08 = DateTime.Now.Year.ToString() + "-09-01";
-            var wipStaiton08 = await _pcsApi.GetWipStation4QRS014GroupB(param[1], dateStart08, dateEnd08, param[5], param[6]);
+            var wipStaiton08 = await _pcsApi.GetWipStation4QRS014GroupB(param[1], dateStart08, dateEnd08, param[5], param[6], param[7]);
             double sum_rate08 = 100.0;
+            int sum_idx08 = 1;
             if (wipStaiton08.DataTotal > 0)
             {
                 DataTable dtRate = new DataTable();
@@ -3203,7 +3271,9 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate08 = sum_rate08 * (rate / 100.0);
+                            //sum_rate08 = sum_rate08 * (rate / 100.0);
+                            sum_idx08 = sum_idx08 + 1;
+                            sum_rate08 = sum_rate08 + rate;
                         }
                     }
                 }
@@ -3215,7 +3285,7 @@ namespace AMESCoreStudio.Web.Controllers
             query.FPYDatas.Add(new FPY4MonthGroup
             {
                 Month = DateTime.Now.Year.ToString() + "-08",
-                Yield = double.Parse(sum_rate08.ToString("0.00"))
+                Yield = double.Parse((sum_rate08 / sum_idx08).ToString("0.00"))
             });
 
             #endregion
@@ -3224,8 +3294,9 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart09 = DateTime.Now.Year.ToString() + "-09-01";
             string dateEnd09 = DateTime.Now.Year.ToString() + "-10-01";
-            var wipStaiton09 = await _pcsApi.GetWipStation4QRS014GroupB(param[1], dateStart09, dateEnd09, param[5], param[6]);
+            var wipStaiton09 = await _pcsApi.GetWipStation4QRS014GroupB(param[1], dateStart09, dateEnd09, param[5], param[6], param[7]);
             double sum_rate09 = 100.0;
+            int sum_idx09 = 1;
             if (wipStaiton09.DataTotal > 0)
             {
                 DataTable dtRate = new DataTable();
@@ -3306,7 +3377,9 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate09 = sum_rate09 * (rate / 100.0);
+                            //sum_rate09 = sum_rate09 * (rate / 100.0);
+                            sum_idx09 = sum_idx09 + 1;
+                            sum_rate09 = sum_rate09 + rate;
                         }
                     }
                 }
@@ -3318,7 +3391,7 @@ namespace AMESCoreStudio.Web.Controllers
             query.FPYDatas.Add(new FPY4MonthGroup
             {
                 Month = DateTime.Now.Year.ToString() + "-09",
-                Yield = double.Parse(sum_rate09.ToString("0.00"))
+                Yield = double.Parse((sum_rate09 / sum_idx09).ToString("0.00"))
             });
 
             #endregion
@@ -3327,8 +3400,9 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart10 = DateTime.Now.Year.ToString() + "-10-01";
             string dateEnd10 = DateTime.Now.Year.ToString() + "-11-01";
-            var wipStaiton10 = await _pcsApi.GetWipStation4QRS014GroupB(param[1], dateStart10, dateEnd10, param[5], param[6]);
+            var wipStaiton10 = await _pcsApi.GetWipStation4QRS014GroupB(param[1], dateStart10, dateEnd10, param[5], param[6], param[7]);
             double sum_rate10 = 100.0;
+            int sum_idx10 = 1;
             if (wipStaiton10.DataTotal > 0)
             {
                 DataTable dtRate = new DataTable();
@@ -3409,7 +3483,9 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate10 = sum_rate10 * (rate / 100.0);
+                            //sum_rate10 = sum_rate10 * (rate / 100.0);
+                            sum_idx10 = sum_idx10 + 1;
+                            sum_rate10 = sum_rate10 + rate;
                         }
                     }
                 }
@@ -3421,7 +3497,7 @@ namespace AMESCoreStudio.Web.Controllers
             query.FPYDatas.Add(new FPY4MonthGroup
             {
                 Month = DateTime.Now.Year.ToString() + "-10",
-                Yield = double.Parse(sum_rate10.ToString("0.00"))
+                Yield = double.Parse((sum_rate10 / sum_idx10).ToString("0.00"))
             });
 
             #endregion
@@ -3430,8 +3506,9 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart11 = DateTime.Now.Year.ToString() + "-11-01";
             string dateEnd11 = DateTime.Now.Year.ToString() + "-12-01";
-            var wipStaiton11 = await _pcsApi.GetWipStation4QRS014GroupB(param[1], dateStart11, dateEnd11, param[5], param[6]);
+            var wipStaiton11 = await _pcsApi.GetWipStation4QRS014GroupB(param[1], dateStart11, dateEnd11, param[5], param[6], param[7]);
             double sum_rate11 = 100.0;
+            int sum_idx11 = 1;
             if (wipStaiton11.DataTotal > 0)
             {
                 DataTable dtRate = new DataTable();
@@ -3512,7 +3589,9 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate11 = sum_rate11 * (rate / 100.0);
+                            //sum_rate11 = sum_rate11 * (rate / 100.0);
+                            sum_idx11 = sum_idx11 + 1;
+                            sum_rate11 = sum_rate11 + rate;
                         }
                     }
                 }
@@ -3524,7 +3603,7 @@ namespace AMESCoreStudio.Web.Controllers
             query.FPYDatas.Add(new FPY4MonthGroup
             {
                 Month = DateTime.Now.Year.ToString() + "-11",
-                Yield = double.Parse(sum_rate11.ToString("0.00"))
+                Yield = double.Parse((sum_rate11 / sum_idx11).ToString("0.00"))
             });
 
             #endregion
@@ -3533,8 +3612,9 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart12 = DateTime.Now.Year.ToString() + "-12-01";
             string dateEnd12 = DateTime.Now.AddYears(1).Year.ToString() + "-01-01";
-            var wipStaiton12 = await _pcsApi.GetWipStation4QRS014GroupB(param[1], dateStart12, dateEnd12, param[5], param[6]);
+            var wipStaiton12 = await _pcsApi.GetWipStation4QRS014GroupB(param[1], dateStart12, dateEnd12, param[5], param[6], param[7]);
             double sum_rate12 = 100.0;
+            int sum_idx12 = 1;
             if (wipStaiton12.DataTotal > 0)
             {
                 DataTable dtRate = new DataTable();
@@ -3615,7 +3695,9 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate12 = sum_rate12 * (rate / 100.0);
+                            //sum_rate12 = sum_rate12 * (rate / 100.0);
+                            sum_idx12 = sum_idx12 + 1;
+                            sum_rate12 = sum_rate12 + rate;
                         }
                     }
                 }
@@ -3627,7 +3709,7 @@ namespace AMESCoreStudio.Web.Controllers
             query.FPYDatas.Add(new FPY4MonthGroup
             {
                 Month = DateTime.Now.Year.ToString() + "-12",
-                Yield = double.Parse(sum_rate12.ToString("0.00"))
+                Yield = double.Parse((sum_rate12 / sum_idx12).ToString("0.00"))
             });
 
             #endregion
@@ -3646,8 +3728,9 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart01 = DateTime.Now.Year.ToString() + "-01-01";
             string dateEnd01 = DateTime.Now.Year.ToString() + "-02-01";
-            var wipStaiton01 = await _pcsApi.GetWipStation4QRS014GroupM(param[1], dateStart01, dateEnd01, param[5], param[6]);
+            var wipStaiton01 = await _pcsApi.GetWipStation4QRS014GroupM(param[1], dateStart01, dateEnd01, param[5], param[6], param[7]);
             double sum_rate01 = 100.0;
+            int sum_idx01 = 1;
             if (wipStaiton01.DataTotal > 0)
             {
                 DataTable dtRate = new DataTable();
@@ -3728,7 +3811,9 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate01 = sum_rate01 * (rate / 100.0);
+                            //sum_rate01 = sum_rate01 * (rate / 100.0);
+                            sum_idx01 = sum_idx01 + 1;
+                            sum_rate01 = sum_rate01 + rate;
                         }
                     }
                 }
@@ -3740,7 +3825,7 @@ namespace AMESCoreStudio.Web.Controllers
             query.FPYDatas.Add(new FPY4MonthGroup
             {
                 Month = DateTime.Now.Year.ToString() + "-01",
-                Yield = double.Parse(sum_rate01.ToString("0.00"))
+                Yield = double.Parse((sum_rate01 / sum_idx01).ToString("0.00"))
             });
 
             #endregion
@@ -3749,8 +3834,9 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart02 = DateTime.Now.Year.ToString() + "-02-01";
             string dateEnd02 = DateTime.Now.Year.ToString() + "-03-01";
-            var wipStaiton02 = await _pcsApi.GetWipStation4QRS014GroupM(param[1], dateStart02, dateEnd02, param[5], param[6]);
+            var wipStaiton02 = await _pcsApi.GetWipStation4QRS014GroupM(param[1], dateStart02, dateEnd02, param[5], param[6], param[7]);
             double sum_rate02 = 100.0;
+            int sum_idx02 = 1;
             if (wipStaiton02.DataTotal > 0)
             {
                 DataTable dtRate = new DataTable();
@@ -3831,7 +3917,9 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate02 = sum_rate02 * (rate / 100.0);
+                            //sum_rate02 = sum_rate02 * (rate / 100.0);
+                            sum_idx02 = sum_idx02 + 1;
+                            sum_rate02 = sum_rate02 + rate;
                         }
                     }
                 }
@@ -3843,7 +3931,7 @@ namespace AMESCoreStudio.Web.Controllers
             query.FPYDatas.Add(new FPY4MonthGroup
             {
                 Month = DateTime.Now.Year.ToString() + "-02",
-                Yield = double.Parse(sum_rate02.ToString("0.00"))
+                Yield = double.Parse((sum_rate02 / sum_idx02).ToString("0.00"))
             });
 
             #endregion
@@ -3852,8 +3940,9 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart03 = DateTime.Now.Year.ToString() + "-03-01";
             string dateEnd03 = DateTime.Now.Year.ToString() + "-04-01";
-            var wipStaiton03 = await _pcsApi.GetWipStation4QRS014GroupM(param[1], dateStart03, dateEnd03, param[5], param[6]);
+            var wipStaiton03 = await _pcsApi.GetWipStation4QRS014GroupM(param[1], dateStart03, dateEnd03, param[5], param[6], param[7]);
             double sum_rate03 = 100.0;
+            int sum_idx03 = 1;
             if (wipStaiton03.DataTotal > 0)
             {
                 DataTable dtRate = new DataTable();
@@ -3934,7 +4023,9 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate03 = sum_rate03 * (rate / 100.0);
+                            //sum_rate03 = sum_rate03 * (rate / 100.0);
+                            sum_idx03 = sum_idx03 + 1;
+                            sum_rate03 = sum_rate03 + rate;
                         }
                     }
                 }
@@ -3946,7 +4037,7 @@ namespace AMESCoreStudio.Web.Controllers
             query.FPYDatas.Add(new FPY4MonthGroup
             {
                 Month = DateTime.Now.Year.ToString() + "-03",
-                Yield = double.Parse(sum_rate03.ToString("0.00"))
+                Yield = double.Parse((sum_rate03 / sum_idx03).ToString("0.00"))
             });
 
             #endregion
@@ -3955,8 +4046,9 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart04 = DateTime.Now.Year.ToString() + "-04-01";
             string dateEnd04 = DateTime.Now.Year.ToString() + "-05-01";
-            var wipStaiton04 = await _pcsApi.GetWipStation4QRS014GroupM(param[1], dateStart04, dateEnd04, param[5], param[6]);
+            var wipStaiton04 = await _pcsApi.GetWipStation4QRS014GroupM(param[1], dateStart04, dateEnd04, param[5], param[6], param[7]);
             double sum_rate04 = 100.0;
+            int sum_idx04 = 1;
             if (wipStaiton04.DataTotal > 0)
             {
                 DataTable dtRate = new DataTable();
@@ -4037,7 +4129,9 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate04 = sum_rate04 * (rate / 100.0);
+                            //sum_rate04 = sum_rate04 * (rate / 100.0);
+                            sum_idx04 = sum_idx04 + 1;
+                            sum_rate04 = sum_rate04 + rate;
                         }
                     }
                 }
@@ -4049,7 +4143,7 @@ namespace AMESCoreStudio.Web.Controllers
             query.FPYDatas.Add(new FPY4MonthGroup
             {
                 Month = DateTime.Now.Year.ToString() + "-04",
-                Yield = double.Parse(sum_rate04.ToString("0.00"))
+                Yield = double.Parse((sum_rate04 / sum_idx04).ToString("0.00"))
             });
 
             #endregion
@@ -4058,8 +4152,9 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart05 = DateTime.Now.Year.ToString() + "-05-01";
             string dateEnd05 = DateTime.Now.Year.ToString() + "-06-01";
-            var wipStaiton05 = await _pcsApi.GetWipStation4QRS014GroupM(param[1], dateStart05, dateEnd05, param[5], param[6]);
+            var wipStaiton05 = await _pcsApi.GetWipStation4QRS014GroupM(param[1], dateStart05, dateEnd05, param[5], param[6], param[7]);
             double sum_rate05 = 100.0;
+            int sum_idx05 = 1;
             if (wipStaiton05.DataTotal > 0)
             {
                 DataTable dtRate = new DataTable();
@@ -4140,7 +4235,9 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate05 = sum_rate05 * (rate / 100.0);
+                            //sum_rate05 = sum_rate05 * (rate / 100.0);
+                            sum_idx05 = sum_idx05 + 1;
+                            sum_rate05 = sum_rate05 + rate;
                         }
                     }
                 }
@@ -4152,7 +4249,7 @@ namespace AMESCoreStudio.Web.Controllers
             query.FPYDatas.Add(new FPY4MonthGroup
             {
                 Month = DateTime.Now.Year.ToString() + "-05",
-                Yield = double.Parse(sum_rate05.ToString("0.00"))
+                Yield = double.Parse((sum_rate05 / sum_idx05).ToString("0.00"))
             });
 
             #endregion
@@ -4161,8 +4258,9 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart06 = DateTime.Now.Year.ToString() + "-06-01";
             string dateEnd06 = DateTime.Now.Year.ToString() + "-07-01";
-            var wipStaiton06 = await _pcsApi.GetWipStation4QRS014GroupM(param[1], dateStart06, dateEnd06, param[5], param[6]);
+            var wipStaiton06 = await _pcsApi.GetWipStation4QRS014GroupM(param[1], dateStart06, dateEnd06, param[5], param[6], param[7]);
             double sum_rate06 = 100.0;
+            int sum_idx06 = 1;
             if (wipStaiton06.DataTotal > 0)
             {
                 DataTable dtRate = new DataTable();
@@ -4243,7 +4341,9 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate06 = sum_rate06 * (rate / 100.0);
+                            //sum_rate06 = sum_rate06 * (rate / 100.0);
+                            sum_idx06 = sum_idx06 + 1;
+                            sum_rate06 = sum_rate06 + rate;
                         }
                     }
                 }
@@ -4255,7 +4355,7 @@ namespace AMESCoreStudio.Web.Controllers
             query.FPYDatas.Add(new FPY4MonthGroup
             {
                 Month = DateTime.Now.Year.ToString() + "-06",
-                Yield = double.Parse(sum_rate06.ToString("0.00"))
+                Yield = double.Parse((sum_rate06 / sum_idx06).ToString("0.00"))
             });
 
             #endregion
@@ -4264,8 +4364,9 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart07 = DateTime.Now.Year.ToString() + "-07-01";
             string dateEnd07 = DateTime.Now.Year.ToString() + "-08-01";
-            var wipStaiton07 = await _pcsApi.GetWipStation4QRS014GroupM(param[1], dateStart07, dateEnd07, param[5], param[6]);
+            var wipStaiton07 = await _pcsApi.GetWipStation4QRS014GroupM(param[1], dateStart07, dateEnd07, param[5], param[6], param[7]);
             double sum_rate07 = 100.0;
+            int sum_idx07 = 1;
             if (wipStaiton07.DataTotal > 0)
             {
                 DataTable dtRate = new DataTable();
@@ -4346,7 +4447,9 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate07 = sum_rate07 * (rate / 100.0);
+                            //sum_rate07 = sum_rate07 * (rate / 100.0);
+                            sum_idx07 = sum_idx07 + 1;
+                            sum_rate07 = sum_rate07 + rate;
                         }
                     }
                 }
@@ -4358,7 +4461,7 @@ namespace AMESCoreStudio.Web.Controllers
             query.FPYDatas.Add(new FPY4MonthGroup
             {
                 Month = DateTime.Now.Year.ToString() + "-07",
-                Yield = double.Parse(sum_rate07.ToString("0.00"))
+                Yield = double.Parse((sum_rate07 / sum_idx07).ToString("0.00"))
             });
 
             #endregion
@@ -4367,8 +4470,9 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart08 = DateTime.Now.Year.ToString() + "-08-01";
             string dateEnd08 = DateTime.Now.Year.ToString() + "-09-01";
-            var wipStaiton08 = await _pcsApi.GetWipStation4QRS014GroupM(param[1], dateStart08, dateEnd08, param[5], param[6]);
+            var wipStaiton08 = await _pcsApi.GetWipStation4QRS014GroupM(param[1], dateStart08, dateEnd08, param[5], param[6], param[7]);
             double sum_rate08 = 100.0;
+            int sum_idx08 = 1;
             if (wipStaiton08.DataTotal > 0)
             {
                 DataTable dtRate = new DataTable();
@@ -4449,7 +4553,9 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate08 = sum_rate08 * (rate / 100.0);
+                            //sum_rate08 = sum_rate08 * (rate / 100.0);
+                            sum_idx08 = sum_idx08 + 1;
+                            sum_rate08 = sum_rate08 + rate;
                         }
                     }
                 }
@@ -4461,7 +4567,7 @@ namespace AMESCoreStudio.Web.Controllers
             query.FPYDatas.Add(new FPY4MonthGroup
             {
                 Month = DateTime.Now.Year.ToString() + "-08",
-                Yield = double.Parse(sum_rate08.ToString("0.00"))
+                Yield = double.Parse((sum_rate08 / sum_idx08).ToString("0.00"))
             });
 
             #endregion
@@ -4470,8 +4576,9 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart09 = DateTime.Now.Year.ToString() + "-09-01";
             string dateEnd09 = DateTime.Now.Year.ToString() + "-10-01";
-            var wipStaiton09 = await _pcsApi.GetWipStation4QRS014GroupM(param[1], dateStart09, dateEnd09, param[5], param[6]);
+            var wipStaiton09 = await _pcsApi.GetWipStation4QRS014GroupM(param[1], dateStart09, dateEnd09, param[5], param[6], param[7]);
             double sum_rate09 = 100.0;
+            int sum_idx09 = 1;
             if (wipStaiton09.DataTotal > 0)
             {
                 DataTable dtRate = new DataTable();
@@ -4552,7 +4659,9 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate09 = sum_rate09 * (rate / 100.0);
+                            //sum_rate09 = sum_rate09 * (rate / 100.0);
+                            sum_idx09 = sum_idx09 + 1;
+                            sum_rate09 = sum_rate09 + rate;
                         }
                     }
                 }
@@ -4564,7 +4673,7 @@ namespace AMESCoreStudio.Web.Controllers
             query.FPYDatas.Add(new FPY4MonthGroup
             {
                 Month = DateTime.Now.Year.ToString() + "-09",
-                Yield = double.Parse(sum_rate09.ToString("0.00"))
+                Yield = double.Parse((sum_rate09 / sum_idx09).ToString("0.00"))
             });
 
             #endregion
@@ -4573,8 +4682,9 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart10 = DateTime.Now.Year.ToString() + "-10-01";
             string dateEnd10 = DateTime.Now.Year.ToString() + "-11-01";
-            var wipStaiton10 = await _pcsApi.GetWipStation4QRS014GroupM(param[1], dateStart10, dateEnd10, param[5], param[6]);
+            var wipStaiton10 = await _pcsApi.GetWipStation4QRS014GroupM(param[1], dateStart10, dateEnd10, param[5], param[6], param[7]);
             double sum_rate10 = 100.0;
+            int sum_idx10 = 1;
             if (wipStaiton10.DataTotal > 0)
             {
                 DataTable dtRate = new DataTable();
@@ -4655,7 +4765,9 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate10 = sum_rate10 * (rate / 100.0);
+                            //sum_rate10 = sum_rate10 * (rate / 100.0);
+                            sum_idx10 = sum_idx10 + 1;
+                            sum_rate10 = sum_rate10 + rate;
                         }
                     }
                 }
@@ -4667,7 +4779,7 @@ namespace AMESCoreStudio.Web.Controllers
             query.FPYDatas.Add(new FPY4MonthGroup
             {
                 Month = DateTime.Now.Year.ToString() + "-10",
-                Yield = double.Parse(sum_rate10.ToString("0.00"))
+                Yield = double.Parse((sum_rate10 / sum_idx10).ToString("0.00"))
             });
 
             #endregion
@@ -4676,8 +4788,9 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart11 = DateTime.Now.Year.ToString() + "-11-01";
             string dateEnd11 = DateTime.Now.Year.ToString() + "-12-01";
-            var wipStaiton11 = await _pcsApi.GetWipStation4QRS014GroupM(param[1], dateStart11, dateEnd11, param[5], param[6]);
+            var wipStaiton11 = await _pcsApi.GetWipStation4QRS014GroupM(param[1], dateStart11, dateEnd11, param[5], param[6], param[7]);
             double sum_rate11 = 100.0;
+            int sum_idx11 = 1;
             if (wipStaiton11.DataTotal > 0)
             {
                 DataTable dtRate = new DataTable();
@@ -4758,7 +4871,9 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate11 = sum_rate11 * (rate / 100.0);
+                            //sum_rate11 = sum_rate11 * (rate / 100.0);
+                            sum_idx11 = sum_idx11 + 1;
+                            sum_rate11 = sum_rate11 + rate;
                         }
                     }
                 }
@@ -4770,7 +4885,7 @@ namespace AMESCoreStudio.Web.Controllers
             query.FPYDatas.Add(new FPY4MonthGroup
             {
                 Month = DateTime.Now.Year.ToString() + "-11",
-                Yield = double.Parse(sum_rate11.ToString("0.00"))
+                Yield = double.Parse((sum_rate11 / sum_idx11).ToString("0.00"))
             });
 
             #endregion
@@ -4779,8 +4894,9 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart12 = DateTime.Now.Year.ToString() + "-12-01";
             string dateEnd12 = DateTime.Now.AddYears(1).Year.ToString() + "-01-01";
-            var wipStaiton12 = await _pcsApi.GetWipStation4QRS014GroupM(param[1], dateStart12, dateEnd12, param[5], param[6]);
+            var wipStaiton12 = await _pcsApi.GetWipStation4QRS014GroupM(param[1], dateStart12, dateEnd12, param[5], param[6], param[7]);
             double sum_rate12 = 100.0;
+            int sum_idx12 = 1;
             if (wipStaiton12.DataTotal > 0)
             {
                 DataTable dtRate = new DataTable();
@@ -4861,7 +4977,9 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate12 = sum_rate12 * (rate / 100.0);
+                            //sum_rate12 = sum_rate12 * (rate / 100.0);
+                            sum_idx12 = sum_idx12 + 1;
+                            sum_rate12 = sum_rate12 + rate;
                         }
                     }
                 }
@@ -4873,7 +4991,7 @@ namespace AMESCoreStudio.Web.Controllers
             query.FPYDatas.Add(new FPY4MonthGroup
             {
                 Month = DateTime.Now.Year.ToString() + "-12",
-                Yield = double.Parse(sum_rate12.ToString("0.00"))
+                Yield = double.Parse((sum_rate12 / sum_idx12).ToString("0.00"))
             });
 
             #endregion
@@ -4881,20 +4999,27 @@ namespace AMESCoreStudio.Web.Controllers
             return Json(query.FPYDatas);
         }
 
-        public async Task<IActionResult> QRS014AAsync(string unitNo, string werksNo, string itemNO, string wipNO, string dateStart, string dateEnd, string modelNO)
+        public async Task<IActionResult> QRS014AAsync(string unitNo, string werksNo, string itemNO, string wipNO, string dateStart, string dateEnd, string modelNO, string dateType)
         {
             if (werksNo == "*")
             {
                 werksNo = "";
             }
 
-            ViewData["ParamList"] = unitNo + "_" + itemNO + "_" + wipNO + "_" + dateStart + "_" + dateEnd + "_" + modelNO + "_" + werksNo;
+            ViewData["ParamList"] = unitNo + "_" + itemNO + "_" + wipNO + "_" + dateStart + "_" + dateEnd + "_" + modelNO + "_" + werksNo + "_" + dateType;
 
-            ViewData["Title"] = "查詢條件 - 製程代碼 : " + unitNo + "; 生產廠別 : " + werksNo + "; 工單號碼 : " + wipNO + "; 料號 : " + itemNO + "; 機種 : " + modelNO + "; 生產日期 : " + dateStart + " ~ " + dateEnd;
+            if (dateType == "WipDate" || dateType == null)
+            {
+                ViewData["Title"] = "查詢條件 - 製程代碼 : " + unitNo + "; 生產廠別 : " + werksNo + "; 工單號碼 : " + wipNO + "; 料號 : " + itemNO + "; 機種 : " + modelNO + "; 生產日期 : " + dateStart + " ~ " + dateEnd;
+            }
+            else
+            {
+                ViewData["Title"] = "查詢條件 - 製程代碼 : " + unitNo + "; 生產廠別 : " + werksNo + "; 工單號碼 : " + wipNO + "; 料號 : " + itemNO + "; 機種 : " + modelNO + "; 結案日期 : " + dateStart + " ~ " + dateEnd;
+            }
 
             var ft_stations = await _basApi.GetStations4FTByConfig(unitNo);
 
-            IResultModel<dynamic> result = await _pcsApi.GetWipInfo4QRS014(unitNo, itemNO, wipNO, dateStart, dateEnd, modelNO, werksNo);
+            IResultModel<dynamic> result = await _pcsApi.GetWipInfo4QRS014(unitNo, itemNO, wipNO, dateStart, dateEnd, modelNO, werksNo, dateType);
 
             string rateDataList = "<font size='3'>";
 
@@ -4943,6 +5068,8 @@ namespace AMESCoreStudio.Web.Controllers
                         rateDataList = rateDataList + "<tr><td>" + wip_no + "</td><td width='160'>" + type + "</td><td width='240'>" + item_no + "</td>";
                         double sum_rate = 100.0;
 
+                        int sum_idx = 1;
+
                         for (int i = 0; i < ft_stations.Count; i++)
                         {
                             int station_id = ft_stations[i].StationID;
@@ -4972,13 +5099,22 @@ 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 + "<td width='60'>" + inputQty + "</td><td width='60'>" + okQty + "</td><td width='60'>" + ngQty + "</td><td width='60'>" + rate.ToString("0.00") + "%</td>";
                         }
-                        rateDataList = rateDataList + "<td width='120'>" + sum_rate.ToString("0.00") + "%</td></tr>";
+                        rateDataList = rateDataList + "<td width='120'>" + (sum_rate / sum_idx).ToString("0.00") + "%</td></tr>";
                     }
                 }
 
@@ -4991,16 +5127,24 @@ namespace AMESCoreStudio.Web.Controllers
             return View();
         }
 
-        public async Task<IActionResult> QRS014BAsync(string unitNo, string werksNo, string itemNO, string wipNO, string dateStart, string dateEnd, string modelNO)
+        public async Task<IActionResult> QRS014BAsync(string unitNo, string werksNo, string itemNO, string wipNO, string dateStart, string dateEnd, string modelNO, string dateType)
         {
             if (werksNo == "*")
             {
                 werksNo = "";
             }
 
-            ViewData["ParamList"] = unitNo + "_" + itemNO + "_" + wipNO + "_" + dateStart + "_" + dateEnd + "_" + modelNO + "_" + werksNo;
+            ViewData["ParamList"] = unitNo + "_" + itemNO + "_" + wipNO + "_" + dateStart + "_" + dateEnd + "_" + modelNO + "_" + werksNo + "_" + dateType;
 
-            ViewData["Title"] = "查詢條件 - 製程代碼 : " + unitNo + "; 生產廠別 : " + werksNo + "; 工單號碼 : " + wipNO + "; 料號 : " + itemNO + "; 機種 : " + modelNO + "; 生產日期 : " + dateStart + " ~ " + dateEnd;
+            if (dateType == "WipDate" || dateType == null)
+            {
+                ViewData["Title"] = "查詢條件 - 製程代碼 : " + unitNo + "; 生產廠別 : " + werksNo + "; 工單號碼 : " + wipNO + "; 料號 : " + itemNO + "; 機種 : " + modelNO + "; 生產日期 : " + dateStart + " ~ " + dateEnd;
+            }
+            else
+            {
+                ViewData["Title"] = "查詢條件 - 製程代碼 : " + unitNo + "; 生產廠別 : " + werksNo + "; 工單號碼 : " + wipNO + "; 料號 : " + itemNO + "; 機種 : " + modelNO + "; 結案日期 : " + dateStart + " ~ " + dateEnd;
+            }
+            
 
             string rateDataList = "<font size='3'>";
 
@@ -5015,10 +5159,11 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart01 = DateTime.Now.Year.ToString() + "-01-01";
             string dateEnd01 = DateTime.Now.Year.ToString() + "-02-01";
-            var wipStaiton01 = await _pcsApi.GetWipStation4QRS014GroupS(itemNO, dateStart01, dateEnd01, modelNO, werksNo);
+            var wipStaiton01 = await _pcsApi.GetWipStation4QRS014GroupS(itemNO, dateStart01, dateEnd01, modelNO, werksNo, dateType);
             if (wipStaiton01.DataTotal > 0)
             {
                 double sum_rate = 100.0;
+                int sum_idx = 1;
 
                 DataTable dtRate = new DataTable();
                 dtRate.Columns.Add("STATION_ID");
@@ -5098,11 +5243,13 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate = sum_rate * (rate / 100.0);
+                            //sum_rate = sum_rate * (rate / 100.0);
+                            sum_idx = sum_idx + 1;
+                            sum_rate = sum_rate + rate;
                         }
                     }
                 }
-                rateDataList = rateDataList + "<td width='120'>" + sum_rate.ToString("0.00") + "</td>";
+                rateDataList = rateDataList + "<td width='120'>" + (sum_rate / sum_idx).ToString("0.00") + "</td>";
             }
             else
             {
@@ -5115,10 +5262,11 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart02 = DateTime.Now.Year.ToString() + "-02-01";
             string dateEnd02 = DateTime.Now.Year.ToString() + "-03-01";
-            var wipStaiton02 = await _pcsApi.GetWipStation4QRS014GroupS(itemNO, dateStart02, dateEnd02, modelNO, werksNo);
+            var wipStaiton02 = await _pcsApi.GetWipStation4QRS014GroupS(itemNO, dateStart02, dateEnd02, modelNO, werksNo, dateType);
             if (wipStaiton02.DataTotal > 0)
             {
                 double sum_rate = 100.0;
+                int sum_idx = 1;
 
                 DataTable dtRate = new DataTable();
                 dtRate.Columns.Add("STATION_ID");
@@ -5198,11 +5346,13 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate = sum_rate * (rate / 100.0);
+                            //sum_rate = sum_rate * (rate / 100.0);
+                            sum_idx = sum_idx + 1;
+                            sum_rate = sum_rate + rate;
                         }
                     }
                 }
-                rateDataList = rateDataList + "<td width='120'>" + sum_rate.ToString("0.00") + "</td>";
+                rateDataList = rateDataList + "<td width='120'>" + (sum_rate / sum_idx).ToString("0.00") + "</td>";
             }
             else
             {
@@ -5215,10 +5365,11 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart03 = DateTime.Now.Year.ToString() + "-03-01";
             string dateEnd03 = DateTime.Now.Year.ToString() + "-04-01";
-            var wipStaiton03 = await _pcsApi.GetWipStation4QRS014GroupS(itemNO, dateStart03, dateEnd03, modelNO, werksNo);
+            var wipStaiton03 = await _pcsApi.GetWipStation4QRS014GroupS(itemNO, dateStart03, dateEnd03, modelNO, werksNo, dateType);
             if (wipStaiton03.DataTotal > 0)
             {
                 double sum_rate = 100.0;
+                int sum_idx = 1;
 
                 DataTable dtRate = new DataTable();
                 dtRate.Columns.Add("STATION_ID");
@@ -5298,11 +5449,13 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate = sum_rate * (rate / 100.0);
+                            //sum_rate = sum_rate * (rate / 100.0);
+                            sum_idx = sum_idx + 1;
+                            sum_rate = sum_rate + rate;
                         }
                     }
                 }
-                rateDataList = rateDataList + "<td width='120'>" + sum_rate.ToString("0.00") + "</td>";
+                rateDataList = rateDataList + "<td width='120'>" + (sum_rate / sum_idx).ToString("0.00") + "</td>";
             }
             else
             {
@@ -5315,10 +5468,11 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart04 = DateTime.Now.Year.ToString() + "-04-01";
             string dateEnd04 = DateTime.Now.Year.ToString() + "-05-01";
-            var wipStaiton04 = await _pcsApi.GetWipStation4QRS014GroupS(itemNO, dateStart04, dateEnd04, modelNO, werksNo);
+            var wipStaiton04 = await _pcsApi.GetWipStation4QRS014GroupS(itemNO, dateStart04, dateEnd04, modelNO, werksNo, dateType);
             if (wipStaiton04.DataTotal > 0)
             {
                 double sum_rate = 100.0;
+                int sum_idx = 1;
 
                 DataTable dtRate = new DataTable();
                 dtRate.Columns.Add("STATION_ID");
@@ -5398,11 +5552,13 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate = sum_rate * (rate / 100.0);
+                            //sum_rate = sum_rate * (rate / 100.0);
+                            sum_idx = sum_idx + 1;
+                            sum_rate = sum_rate + rate;
                         }
                     }
                 }
-                rateDataList = rateDataList + "<td width='120'>" + sum_rate.ToString("0.00") + "</td>";
+                rateDataList = rateDataList + "<td width='120'>" + (sum_rate / sum_idx).ToString("0.00") + "</td>";
             }
             else
             {
@@ -5415,10 +5571,11 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart05 = DateTime.Now.Year.ToString() + "-05-01";
             string dateEnd05 = DateTime.Now.Year.ToString() + "-06-01";
-            var wipStaiton05 = await _pcsApi.GetWipStation4QRS014GroupS(itemNO, dateStart05, dateEnd05, modelNO, werksNo);
+            var wipStaiton05 = await _pcsApi.GetWipStation4QRS014GroupS(itemNO, dateStart05, dateEnd05, modelNO, werksNo, dateType);
             if (wipStaiton05.DataTotal > 0)
             {
                 double sum_rate = 100.0;
+                int sum_idx = 1;
 
                 DataTable dtRate = new DataTable();
                 dtRate.Columns.Add("STATION_ID");
@@ -5498,11 +5655,13 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate = sum_rate * (rate / 100.0);
+                            //sum_rate = sum_rate * (rate / 100.0);
+                            sum_idx = sum_idx + 1;
+                            sum_rate = sum_rate + rate;
                         }
                     }
                 }
-                rateDataList = rateDataList + "<td width='120'>" + sum_rate.ToString("0.00") + "</td>";
+                rateDataList = rateDataList + "<td width='120'>" + (sum_rate / sum_idx).ToString("0.00") + "</td>";
             }
             else
             {
@@ -5515,11 +5674,11 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart06 = DateTime.Now.Year.ToString() + "-06-01";
             string dateEnd06 = DateTime.Now.Year.ToString() + "-07-01";
-            var wipStaiton06 = await _pcsApi.GetWipStation4QRS014GroupS(itemNO, dateStart06, dateEnd06, modelNO, werksNo);
+            var wipStaiton06 = await _pcsApi.GetWipStation4QRS014GroupS(itemNO, dateStart06, dateEnd06, modelNO, werksNo, dateType);
             if (wipStaiton06.DataTotal > 0)
             {
                 double sum_rate = 100.0;
-
+                int sum_idx = 1;
                 DataTable dtRate = new DataTable();
                 dtRate.Columns.Add("STATION_ID");
                 dtRate.Columns.Add("OK_QTY");
@@ -5598,11 +5757,13 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate = sum_rate * (rate / 100.0);
+                            //sum_rate = sum_rate * (rate / 100.0);
+                            sum_idx = sum_idx + 1;
+                            sum_rate = sum_rate + rate;
                         }
                     }
                 }
-                rateDataList = rateDataList + "<td width='120'>" + sum_rate.ToString("0.00") + "</td>";
+                rateDataList = rateDataList + "<td width='120'>" + (sum_rate / sum_idx).ToString("0.00") + "</td>";
             }
             else
             {
@@ -5615,10 +5776,11 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart07 = DateTime.Now.Year.ToString() + "-07-01";
             string dateEnd07 = DateTime.Now.Year.ToString() + "-08-01";
-            var wipStaiton07 = await _pcsApi.GetWipStation4QRS014GroupS(itemNO, dateStart07, dateEnd07, modelNO, werksNo);
+            var wipStaiton07 = await _pcsApi.GetWipStation4QRS014GroupS(itemNO, dateStart07, dateEnd07, modelNO, werksNo, dateType);
             if (wipStaiton07.DataTotal > 0)
             {
                 double sum_rate = 100.0;
+                int sum_idx = 1;
 
                 DataTable dtRate = new DataTable();
                 dtRate.Columns.Add("STATION_ID");
@@ -5698,11 +5860,13 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate = sum_rate * (rate / 100.0);
+                            //sum_rate = sum_rate * (rate / 100.0);
+                            sum_idx = sum_idx + 1;
+                            sum_rate = sum_rate + rate;
                         }
                     }
                 }
-                rateDataList = rateDataList + "<td width='120'>" + sum_rate.ToString("0.00") + "</td>";
+                rateDataList = rateDataList + "<td width='120'>" + (sum_rate / sum_idx).ToString("0.00") + "</td>";
             }
             else
             {
@@ -5715,11 +5879,11 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart08 = DateTime.Now.Year.ToString() + "-08-01";
             string dateEnd08 = DateTime.Now.Year.ToString() + "-09-01";
-            var wipStaiton08 = await _pcsApi.GetWipStation4QRS014GroupS(itemNO, dateStart08, dateEnd08, modelNO, werksNo);
+            var wipStaiton08 = await _pcsApi.GetWipStation4QRS014GroupS(itemNO, dateStart08, dateEnd08, modelNO, werksNo, dateType);
             if (wipStaiton08.DataTotal > 0)
             {
                 double sum_rate = 100.0;
-
+                int sum_idx = 1;
                 DataTable dtRate = new DataTable();
                 dtRate.Columns.Add("STATION_ID");
                 dtRate.Columns.Add("OK_QTY");
@@ -5798,11 +5962,13 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate = sum_rate * (rate / 100.0);
+                            //sum_rate = sum_rate * (rate / 100.0);
+                            sum_idx = sum_idx + 1;
+                            sum_rate = sum_rate + rate;
                         }
                     }
                 }
-                rateDataList = rateDataList + "<td width='120'>" + sum_rate.ToString("0.00") + "</td>";
+                rateDataList = rateDataList + "<td width='120'>" + (sum_rate / sum_idx).ToString("0.00") + "</td>";
             }
             else
             {
@@ -5815,11 +5981,11 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart09 = DateTime.Now.Year.ToString() + "-09-01";
             string dateEnd09 = DateTime.Now.Year.ToString() + "-10-01";
-            var wipStaiton09 = await _pcsApi.GetWipStation4QRS014GroupS(itemNO, dateStart09, dateEnd09, modelNO, werksNo);
+            var wipStaiton09 = await _pcsApi.GetWipStation4QRS014GroupS(itemNO, dateStart09, dateEnd09, modelNO, werksNo, dateType);
             if (wipStaiton09.DataTotal > 0)
             {
                 double sum_rate = 100.0;
-
+                int sum_idx = 1;
                 DataTable dtRate = new DataTable();
                 dtRate.Columns.Add("STATION_ID");
                 dtRate.Columns.Add("OK_QTY");
@@ -5898,11 +6064,13 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate = sum_rate * (rate / 100.0);
+                            //sum_rate = sum_rate * (rate / 100.0);
+                            sum_idx = sum_idx + 1;
+                            sum_rate = sum_rate + rate;
                         }
                     }
                 }
-                rateDataList = rateDataList + "<td width='120'>" + sum_rate.ToString("0.00") + "</td>";
+                rateDataList = rateDataList + "<td width='120'>" + (sum_rate / sum_idx).ToString("0.00") + "</td>";
             }
             else
             {
@@ -5915,11 +6083,11 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart10 = DateTime.Now.Year.ToString() + "-10-01";
             string dateEnd10 = DateTime.Now.Year.ToString() + "-11-01";
-            var wipStaiton10 = await _pcsApi.GetWipStation4QRS014GroupS(itemNO, dateStart10, dateEnd10, modelNO, werksNo);
+            var wipStaiton10 = await _pcsApi.GetWipStation4QRS014GroupS(itemNO, dateStart10, dateEnd10, modelNO, werksNo, dateType);
             if (wipStaiton10.DataTotal > 0)
             {
                 double sum_rate = 100.0;
-
+                int sum_idx = 1;
                 DataTable dtRate = new DataTable();
                 dtRate.Columns.Add("STATION_ID");
                 dtRate.Columns.Add("OK_QTY");
@@ -5998,11 +6166,13 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate = sum_rate * (rate / 100.0);
+                            //sum_rate = sum_rate * (rate / 100.0);
+                            sum_idx = sum_idx + 1;
+                            sum_rate = sum_rate + rate;
                         }
                     }
                 }
-                rateDataList = rateDataList + "<td width='120'>" + sum_rate.ToString("0.00") + "</td>";
+                rateDataList = rateDataList + "<td width='120'>" + (sum_rate / sum_idx).ToString("0.00") + "</td>";
             }
             else
             {
@@ -6015,11 +6185,11 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart11 = DateTime.Now.Year.ToString() + "-11-01";
             string dateEnd11 = DateTime.Now.Year.ToString() + "-12-01";
-            var wipStaiton11 = await _pcsApi.GetWipStation4QRS014GroupS(itemNO, dateStart11, dateEnd11, modelNO, werksNo);
+            var wipStaiton11 = await _pcsApi.GetWipStation4QRS014GroupS(itemNO, dateStart11, dateEnd11, modelNO, werksNo, dateType);
             if (wipStaiton11.DataTotal > 0)
             {
                 double sum_rate = 100.0;
-
+                int sum_idx = 1;
                 DataTable dtRate = new DataTable();
                 dtRate.Columns.Add("STATION_ID");
                 dtRate.Columns.Add("OK_QTY");
@@ -6098,11 +6268,13 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate = sum_rate * (rate / 100.0);
+                            //sum_rate = sum_rate * (rate / 100.0);
+                            sum_idx = sum_idx + 1;
+                            sum_rate = sum_rate + rate;
                         }
                     }
                 }
-                rateDataList = rateDataList + "<td width='120'>" + sum_rate.ToString("0.00") + "</td>";
+                rateDataList = rateDataList + "<td width='120'>" + (sum_rate/sum_idx).ToString("0.00") + "</td>";
             }
             else
             {
@@ -6115,11 +6287,11 @@ namespace AMESCoreStudio.Web.Controllers
 
             string dateStart12 = DateTime.Now.Year.ToString() + "-12-01";
             string dateEnd12 = DateTime.Now.AddYears(1).Year.ToString() + "-01-01";
-            var wipStaiton12 = await _pcsApi.GetWipStation4QRS014GroupS(itemNO, dateStart12, dateEnd12, modelNO, werksNo);
+            var wipStaiton12 = await _pcsApi.GetWipStation4QRS014GroupS(itemNO, dateStart12, dateEnd12, modelNO, werksNo, dateType);
             if (wipStaiton12.DataTotal > 0)
             {
                 double sum_rate = 100.0;
-
+                int sum_idx = 1;
                 DataTable dtRate = new DataTable();
                 dtRate.Columns.Add("STATION_ID");
                 dtRate.Columns.Add("OK_QTY");
@@ -6198,11 +6370,13 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate = sum_rate * (rate / 100.0);
+                            //sum_rate = sum_rate * (rate / 100.0);
+                            sum_idx = sum_idx + 1;
+                            sum_rate = sum_rate + rate;
                         }
                     }
                 }
-                rateDataList = rateDataList + "<td width='120'>" + sum_rate.ToString("0.00") + "</td>";
+                rateDataList = rateDataList + "<td width='120'>" + (sum_rate/sum_idx).ToString("0.00") + "</td>";
             }
             else
             {
@@ -6220,11 +6394,11 @@ namespace AMESCoreStudio.Web.Controllers
 
             //string dateStart01 = DateTime.Now.Year.ToString() + "-01-01";
             //string dateEnd01 = DateTime.Now.Year.ToString() + "-02-01";
-            wipStaiton01 = await _pcsApi.GetWipStation4QRS014GroupB(itemNO, dateStart01, dateEnd01, modelNO, werksNo);
+            wipStaiton01 = await _pcsApi.GetWipStation4QRS014GroupB(itemNO, dateStart01, dateEnd01, modelNO, werksNo, dateType);
             if (wipStaiton01.DataTotal > 0)
             {
                 double sum_rate = 100.0;
-
+                int sum_idx = 1;
                 DataTable dtRate = new DataTable();
                 dtRate.Columns.Add("STATION_ID");
                 dtRate.Columns.Add("OK_QTY");
@@ -6303,11 +6477,13 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate = sum_rate * (rate / 100.0);
+                            //sum_rate = sum_rate * (rate / 100.0);
+                            sum_idx = sum_idx + 1;
+                            sum_rate = sum_rate + rate;
                         }
                     }
                 }
-                rateDataList = rateDataList + "<td width='120'>" + sum_rate.ToString("0.00") + "</td>";
+                rateDataList = rateDataList + "<td width='120'>" + (sum_rate/sum_idx).ToString("0.00") + "</td>";
             }
             else
             {
@@ -6320,11 +6496,11 @@ namespace AMESCoreStudio.Web.Controllers
 
             //string dateStart02 = DateTime.Now.Year.ToString() + "-02-01";
             //string dateEnd02 = DateTime.Now.Year.ToString() + "-03-01";
-            wipStaiton02 = await _pcsApi.GetWipStation4QRS014GroupB(itemNO, dateStart02, dateEnd02, modelNO, werksNo);
+            wipStaiton02 = await _pcsApi.GetWipStation4QRS014GroupB(itemNO, dateStart02, dateEnd02, modelNO, werksNo, dateType);
             if (wipStaiton02.DataTotal > 0)
             {
                 double sum_rate = 100.0;
-
+                int sum_idx = 1;
                 DataTable dtRate = new DataTable();
                 dtRate.Columns.Add("STATION_ID");
                 dtRate.Columns.Add("OK_QTY");
@@ -6403,11 +6579,13 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate = sum_rate * (rate / 100.0);
+                            //sum_rate = sum_rate * (rate / 100.0);
+                            sum_idx = sum_idx + 1;
+                            sum_rate = sum_rate + rate;
                         }
                     }
                 }
-                rateDataList = rateDataList + "<td width='120'>" + sum_rate.ToString("0.00") + "</td>";
+                rateDataList = rateDataList + "<td width='120'>" + (sum_rate/sum_idx).ToString("0.00") + "</td>";
             }
             else
             {
@@ -6420,11 +6598,11 @@ namespace AMESCoreStudio.Web.Controllers
 
             //string dateStart03 = DateTime.Now.Year.ToString() + "-03-01";
             //string dateEnd03 = DateTime.Now.Year.ToString() + "-04-01";
-            wipStaiton03 = await _pcsApi.GetWipStation4QRS014GroupB(itemNO, dateStart03, dateEnd03, modelNO, werksNo);
+            wipStaiton03 = await _pcsApi.GetWipStation4QRS014GroupB(itemNO, dateStart03, dateEnd03, modelNO, werksNo, dateType);
             if (wipStaiton03.DataTotal > 0)
             {
                 double sum_rate = 100.0;
-
+                int sum_idx = 1;
                 DataTable dtRate = new DataTable();
                 dtRate.Columns.Add("STATION_ID");
                 dtRate.Columns.Add("OK_QTY");
@@ -6503,11 +6681,13 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate = sum_rate * (rate / 100.0);
+                            //sum_rate = sum_rate * (rate / 100.0);
+                            sum_idx = sum_idx + 1;
+                            sum_rate = sum_rate + rate;
                         }
                     }
                 }
-                rateDataList = rateDataList + "<td width='120'>" + sum_rate.ToString("0.00") + "</td>";
+                rateDataList = rateDataList + "<td width='120'>" + (sum_rate/sum_idx).ToString("0.00") + "</td>";
             }
             else
             {
@@ -6520,11 +6700,11 @@ namespace AMESCoreStudio.Web.Controllers
 
             //string dateStart04 = DateTime.Now.Year.ToString() + "-04-01";
             //string dateEnd04 = DateTime.Now.Year.ToString() + "-05-01";
-            wipStaiton04 = await _pcsApi.GetWipStation4QRS014GroupB(itemNO, dateStart04, dateEnd04, modelNO, werksNo);
+            wipStaiton04 = await _pcsApi.GetWipStation4QRS014GroupB(itemNO, dateStart04, dateEnd04, modelNO, werksNo, dateType);
             if (wipStaiton04.DataTotal > 0)
             {
                 double sum_rate = 100.0;
-
+                int sum_idx = 1;
                 DataTable dtRate = new DataTable();
                 dtRate.Columns.Add("STATION_ID");
                 dtRate.Columns.Add("OK_QTY");
@@ -6603,11 +6783,13 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate = sum_rate * (rate / 100.0);
+                            //sum_rate = sum_rate * (rate / 100.0);
+                            sum_idx = sum_idx + 1;
+                            sum_rate = sum_rate + rate;
                         }
                     }
                 }
-                rateDataList = rateDataList + "<td width='120'>" + sum_rate.ToString("0.00") + "</td>";
+                rateDataList = rateDataList + "<td width='120'>" + (sum_rate/sum_idx).ToString("0.00") + "</td>";
             }
             else
             {
@@ -6620,11 +6802,11 @@ namespace AMESCoreStudio.Web.Controllers
 
             //string dateStart05 = DateTime.Now.Year.ToString() + "-05-01";
             //string dateEnd05 = DateTime.Now.Year.ToString() + "-06-01";
-            wipStaiton05 = await _pcsApi.GetWipStation4QRS014GroupB(itemNO, dateStart05, dateEnd05, modelNO, werksNo);
+            wipStaiton05 = await _pcsApi.GetWipStation4QRS014GroupB(itemNO, dateStart05, dateEnd05, modelNO, werksNo, dateType);
             if (wipStaiton05.DataTotal > 0)
             {
                 double sum_rate = 100.0;
-
+                int sum_idx = 1;
                 DataTable dtRate = new DataTable();
                 dtRate.Columns.Add("STATION_ID");
                 dtRate.Columns.Add("OK_QTY");
@@ -6703,11 +6885,13 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate = sum_rate * (rate / 100.0);
+                            //sum_rate = sum_rate * (rate / 100.0);
+                            sum_idx = sum_idx + 1;
+                            sum_rate = sum_rate + rate;
                         }
                     }
                 }
-                rateDataList = rateDataList + "<td width='120'>" + sum_rate.ToString("0.00") + "</td>";
+                rateDataList = rateDataList + "<td width='120'>" + (sum_rate/sum_idx).ToString("0.00") + "</td>";
             }
             else
             {
@@ -6720,11 +6904,11 @@ namespace AMESCoreStudio.Web.Controllers
 
             //string dateStart06 = DateTime.Now.Year.ToString() + "-06-01";
             //string dateEnd06 = DateTime.Now.Year.ToString() + "-07-01";
-            wipStaiton06 = await _pcsApi.GetWipStation4QRS014GroupB(itemNO, dateStart06, dateEnd06, modelNO, werksNo);
+            wipStaiton06 = await _pcsApi.GetWipStation4QRS014GroupB(itemNO, dateStart06, dateEnd06, modelNO, werksNo, dateType);
             if (wipStaiton06.DataTotal > 0)
             {
                 double sum_rate = 100.0;
-
+                int sum_idx = 1;
                 DataTable dtRate = new DataTable();
                 dtRate.Columns.Add("STATION_ID");
                 dtRate.Columns.Add("OK_QTY");
@@ -6803,11 +6987,13 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate = sum_rate * (rate / 100.0);
+                            //sum_rate = sum_rate * (rate / 100.0);
+                            sum_idx = sum_idx + 1;
+                            sum_rate = sum_rate + rate;
                         }
                     }
                 }
-                rateDataList = rateDataList + "<td width='120'>" + sum_rate.ToString("0.00") + "</td>";
+                rateDataList = rateDataList + "<td width='120'>" + (sum_rate / sum_idx).ToString("0.00") + "</td>";
             }
             else
             {
@@ -6820,11 +7006,11 @@ namespace AMESCoreStudio.Web.Controllers
 
             //string dateStart07 = DateTime.Now.Year.ToString() + "-07-01";
             //string dateEnd07 = DateTime.Now.Year.ToString() + "-08-01";
-            wipStaiton07 = await _pcsApi.GetWipStation4QRS014GroupB(itemNO, dateStart07, dateEnd07, modelNO, werksNo);
+            wipStaiton07 = await _pcsApi.GetWipStation4QRS014GroupB(itemNO, dateStart07, dateEnd07, modelNO, werksNo, dateType);
             if (wipStaiton07.DataTotal > 0)
             {
                 double sum_rate = 100.0;
-
+                int sum_idx = 1;
                 DataTable dtRate = new DataTable();
                 dtRate.Columns.Add("STATION_ID");
                 dtRate.Columns.Add("OK_QTY");
@@ -6903,11 +7089,13 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate = sum_rate * (rate / 100.0);
+                            //sum_rate = sum_rate * (rate / 100.0);
+                            sum_idx = sum_idx + 1;
+                            sum_rate = sum_rate + rate;
                         }
                     }
                 }
-                rateDataList = rateDataList + "<td width='120'>" + sum_rate.ToString("0.00") + "</td>";
+                rateDataList = rateDataList + "<td width='120'>" + (sum_rate/sum_idx).ToString("0.00") + "</td>";
             }
             else
             {
@@ -6920,11 +7108,11 @@ namespace AMESCoreStudio.Web.Controllers
 
             //string dateStart08 = DateTime.Now.Year.ToString() + "-08-01";
             //string dateEnd08 = DateTime.Now.Year.ToString() + "-09-01";
-            wipStaiton08 = await _pcsApi.GetWipStation4QRS014GroupB(itemNO, dateStart08, dateEnd08, modelNO, werksNo);
+            wipStaiton08 = await _pcsApi.GetWipStation4QRS014GroupB(itemNO, dateStart08, dateEnd08, modelNO, werksNo, dateType);
             if (wipStaiton08.DataTotal > 0)
             {
                 double sum_rate = 100.0;
-
+                int sum_idx = 1;
                 DataTable dtRate = new DataTable();
                 dtRate.Columns.Add("STATION_ID");
                 dtRate.Columns.Add("OK_QTY");
@@ -7003,11 +7191,13 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate = sum_rate * (rate / 100.0);
+                            //sum_rate = sum_rate * (rate / 100.0);
+                            sum_idx = sum_idx + 1;
+                            sum_rate = sum_rate + rate;
                         }
                     }
                 }
-                rateDataList = rateDataList + "<td width='120'>" + sum_rate.ToString("0.00") + "</td>";
+                rateDataList = rateDataList + "<td width='120'>" + (sum_rate/sum_idx).ToString("0.00") + "</td>";
             }
             else
             {
@@ -7020,11 +7210,11 @@ namespace AMESCoreStudio.Web.Controllers
 
             //string dateStart09 = DateTime.Now.Year.ToString() + "-09-01";
             //string dateEnd09 = DateTime.Now.Year.ToString() + "-10-01";
-            wipStaiton09 = await _pcsApi.GetWipStation4QRS014GroupB(itemNO, dateStart09, dateEnd09, modelNO, werksNo);
+            wipStaiton09 = await _pcsApi.GetWipStation4QRS014GroupB(itemNO, dateStart09, dateEnd09, modelNO, werksNo, dateType);
             if (wipStaiton09.DataTotal > 0)
             {
                 double sum_rate = 100.0;
-
+                int sum_idx = 1;
                 DataTable dtRate = new DataTable();
                 dtRate.Columns.Add("STATION_ID");
                 dtRate.Columns.Add("OK_QTY");
@@ -7103,11 +7293,13 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate = sum_rate * (rate / 100.0);
+                            //sum_rate = sum_rate * (rate / 100.0);
+                            sum_idx = sum_idx + 1;
+                            sum_rate = sum_rate + rate;
                         }
                     }
                 }
-                rateDataList = rateDataList + "<td width='120'>" + sum_rate.ToString("0.00") + "</td>";
+                rateDataList = rateDataList + "<td width='120'>" + (sum_rate/sum_idx).ToString("0.00") + "</td>";
             }
             else
             {
@@ -7120,11 +7312,11 @@ namespace AMESCoreStudio.Web.Controllers
 
             //string dateStart10 = DateTime.Now.Year.ToString() + "-10-01";
             //string dateEnd10 = DateTime.Now.Year.ToString() + "-11-01";
-            wipStaiton10 = await _pcsApi.GetWipStation4QRS014GroupB(itemNO, dateStart10, dateEnd10, modelNO, werksNo);
+            wipStaiton10 = await _pcsApi.GetWipStation4QRS014GroupB(itemNO, dateStart10, dateEnd10, modelNO, werksNo, dateType);
             if (wipStaiton10.DataTotal > 0)
             {
                 double sum_rate = 100.0;
-
+                int sum_idx = 1;
                 DataTable dtRate = new DataTable();
                 dtRate.Columns.Add("STATION_ID");
                 dtRate.Columns.Add("OK_QTY");
@@ -7203,11 +7395,13 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate = sum_rate * (rate / 100.0);
+                            //sum_rate = sum_rate * (rate / 100.0);
+                            sum_idx = sum_idx + 1;
+                            sum_rate = sum_rate + rate;
                         }
                     }
                 }
-                rateDataList = rateDataList + "<td width='120'>" + sum_rate.ToString("0.00") + "</td>";
+                rateDataList = rateDataList + "<td width='120'>" + (sum_rate/sum_idx).ToString("0.00") + "</td>";
             }
             else
             {
@@ -7220,11 +7414,11 @@ namespace AMESCoreStudio.Web.Controllers
 
             //string dateStart11 = DateTime.Now.Year.ToString() + "-11-01";
             //string dateEnd11 = DateTime.Now.Year.ToString() + "-12-01";
-            wipStaiton11 = await _pcsApi.GetWipStation4QRS014GroupB(itemNO, dateStart11, dateEnd11, modelNO, werksNo);
+            wipStaiton11 = await _pcsApi.GetWipStation4QRS014GroupB(itemNO, dateStart11, dateEnd11, modelNO, werksNo, dateType);
             if (wipStaiton11.DataTotal > 0)
             {
                 double sum_rate = 100.0;
-
+                int sum_idx = 1;
                 DataTable dtRate = new DataTable();
                 dtRate.Columns.Add("STATION_ID");
                 dtRate.Columns.Add("OK_QTY");
@@ -7303,11 +7497,13 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate = sum_rate * (rate / 100.0);
+                            //sum_rate = sum_rate * (rate / 100.0);
+                            sum_idx = sum_idx + 1;
+                            sum_rate = sum_rate + rate;
                         }
                     }
                 }
-                rateDataList = rateDataList + "<td width='120'>" + sum_rate.ToString("0.00") + "</td>";
+                rateDataList = rateDataList + "<td width='120'>" + (sum_rate/sum_idx).ToString("0.00") + "</td>";
             }
             else
             {
@@ -7320,11 +7516,11 @@ namespace AMESCoreStudio.Web.Controllers
 
             //string dateStart12 = DateTime.Now.Year.ToString() + "-12-01";
             //string dateEnd12 = DateTime.Now.AddYears(1).Year.ToString() + "-01-01";
-            wipStaiton12 = await _pcsApi.GetWipStation4QRS014GroupB(itemNO, dateStart12, dateEnd12, modelNO, werksNo);
+            wipStaiton12 = await _pcsApi.GetWipStation4QRS014GroupB(itemNO, dateStart12, dateEnd12, modelNO, werksNo, dateType);
             if (wipStaiton12.DataTotal > 0)
             {
                 double sum_rate = 100.0;
-
+                int sum_idx = 1;
                 DataTable dtRate = new DataTable();
                 dtRate.Columns.Add("STATION_ID");
                 dtRate.Columns.Add("OK_QTY");
@@ -7403,11 +7599,13 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate = sum_rate * (rate / 100.0);
+                            //sum_rate = sum_rate * (rate / 100.0);
+                            sum_idx = sum_idx + 1;
+                            sum_rate = sum_rate + rate;
                         }
                     }
                 }
-                rateDataList = rateDataList + "<td width='120'>" + sum_rate.ToString("0.00") + "</td>";
+                rateDataList = rateDataList + "<td width='120'>" + (sum_rate/sum_idx).ToString("0.00") + "</td>";
             }
             else
             {
@@ -7425,11 +7623,11 @@ namespace AMESCoreStudio.Web.Controllers
 
             //string dateStart01 = DateTime.Now.Year.ToString() + "-01-01";
             //string dateEnd01 = DateTime.Now.Year.ToString() + "-02-01";
-            wipStaiton01 = await _pcsApi.GetWipStation4QRS014GroupM(itemNO, dateStart01, dateEnd01, modelNO, werksNo);
+            wipStaiton01 = await _pcsApi.GetWipStation4QRS014GroupM(itemNO, dateStart01, dateEnd01, modelNO, werksNo, dateType);
             if (wipStaiton01.DataTotal > 0)
             {
                 double sum_rate = 100.0;
-
+                int sum_idx = 1;
                 DataTable dtRate = new DataTable();
                 dtRate.Columns.Add("STATION_ID");
                 dtRate.Columns.Add("OK_QTY");
@@ -7508,11 +7706,13 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate = sum_rate * (rate / 100.0);
+                            //sum_rate = sum_rate * (rate / 100.0);
+                            sum_idx = sum_idx + 1;
+                            sum_rate = sum_rate + rate;
                         }
                     }
                 }
-                rateDataList = rateDataList + "<td width='120'>" + sum_rate.ToString("0.00") + "</td>";
+                rateDataList = rateDataList + "<td width='120'>" + (sum_rate / sum_idx).ToString("0.00") + "</td>";
             }
             else
             {
@@ -7525,11 +7725,11 @@ namespace AMESCoreStudio.Web.Controllers
 
             //string dateStart02 = DateTime.Now.Year.ToString() + "-02-01";
             //string dateEnd02 = DateTime.Now.Year.ToString() + "-03-01";
-            wipStaiton02 = await _pcsApi.GetWipStation4QRS014GroupM(itemNO, dateStart02, dateEnd02, modelNO, werksNo);
+            wipStaiton02 = await _pcsApi.GetWipStation4QRS014GroupM(itemNO, dateStart02, dateEnd02, modelNO, werksNo, dateType);
             if (wipStaiton02.DataTotal > 0)
             {
                 double sum_rate = 100.0;
-
+                int sum_idx = 1;
                 DataTable dtRate = new DataTable();
                 dtRate.Columns.Add("STATION_ID");
                 dtRate.Columns.Add("OK_QTY");
@@ -7608,11 +7808,13 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate = sum_rate * (rate / 100.0);
+                            //sum_rate = sum_rate * (rate / 100.0);
+                            sum_idx = sum_idx + 1;
+                            sum_rate = sum_rate + rate;
                         }
                     }
                 }
-                rateDataList = rateDataList + "<td width='120'>" + sum_rate.ToString("0.00") + "</td>";
+                rateDataList = rateDataList + "<td width='120'>" + (sum_rate/sum_idx).ToString("0.00") + "</td>";
             }
             else
             {
@@ -7625,11 +7827,11 @@ namespace AMESCoreStudio.Web.Controllers
 
             //string dateStart03 = DateTime.Now.Year.ToString() + "-03-01";
             //string dateEnd03 = DateTime.Now.Year.ToString() + "-04-01";
-            wipStaiton03 = await _pcsApi.GetWipStation4QRS014GroupM(itemNO, dateStart03, dateEnd03, modelNO, werksNo);
+            wipStaiton03 = await _pcsApi.GetWipStation4QRS014GroupM(itemNO, dateStart03, dateEnd03, modelNO, werksNo, dateType);
             if (wipStaiton03.DataTotal > 0)
             {
                 double sum_rate = 100.0;
-
+                int sum_idx = 1;
                 DataTable dtRate = new DataTable();
                 dtRate.Columns.Add("STATION_ID");
                 dtRate.Columns.Add("OK_QTY");
@@ -7708,11 +7910,13 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate = sum_rate * (rate / 100.0);
+                            //sum_rate = sum_rate * (rate / 100.0);
+                            sum_idx = sum_idx + 1;
+                            sum_rate = sum_rate + rate;
                         }
                     }
                 }
-                rateDataList = rateDataList + "<td width='120'>" + sum_rate.ToString("0.00") + "</td>";
+                rateDataList = rateDataList + "<td width='120'>" + (sum_rate/sum_idx).ToString("0.00") + "</td>";
             }
             else
             {
@@ -7725,11 +7929,11 @@ namespace AMESCoreStudio.Web.Controllers
 
             //string dateStart04 = DateTime.Now.Year.ToString() + "-04-01";
             //string dateEnd04 = DateTime.Now.Year.ToString() + "-05-01";
-            wipStaiton04 = await _pcsApi.GetWipStation4QRS014GroupM(itemNO, dateStart04, dateEnd04, modelNO, werksNo);
+            wipStaiton04 = await _pcsApi.GetWipStation4QRS014GroupM(itemNO, dateStart04, dateEnd04, modelNO, werksNo, dateType);
             if (wipStaiton04.DataTotal > 0)
             {
                 double sum_rate = 100.0;
-
+                int sum_idx = 1;
                 DataTable dtRate = new DataTable();
                 dtRate.Columns.Add("STATION_ID");
                 dtRate.Columns.Add("OK_QTY");
@@ -7808,11 +8012,13 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate = sum_rate * (rate / 100.0);
+                            //sum_rate = sum_rate * (rate / 100.0);
+                            sum_idx = sum_idx + 1;
+                            sum_rate = sum_rate + rate;
                         }
                     }
                 }
-                rateDataList = rateDataList + "<td width='120'>" + sum_rate.ToString("0.00") + "</td>";
+                rateDataList = rateDataList + "<td width='120'>" + (sum_rate/sum_idx).ToString("0.00") + "</td>";
             }
             else
             {
@@ -7825,11 +8031,11 @@ namespace AMESCoreStudio.Web.Controllers
 
             //string dateStart05 = DateTime.Now.Year.ToString() + "-05-01";
             //string dateEnd05 = DateTime.Now.Year.ToString() + "-06-01";
-            wipStaiton05 = await _pcsApi.GetWipStation4QRS014GroupM(itemNO, dateStart05, dateEnd05, modelNO, werksNo);
+            wipStaiton05 = await _pcsApi.GetWipStation4QRS014GroupM(itemNO, dateStart05, dateEnd05, modelNO, werksNo, dateType);
             if (wipStaiton05.DataTotal > 0)
             {
                 double sum_rate = 100.0;
-
+                int sum_idx = 1;
                 DataTable dtRate = new DataTable();
                 dtRate.Columns.Add("STATION_ID");
                 dtRate.Columns.Add("OK_QTY");
@@ -7908,11 +8114,13 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate = sum_rate * (rate / 100.0);
+                            //sum_rate = sum_rate * (rate / 100.0);
+                            sum_idx = sum_idx + 1;
+                            sum_rate = sum_rate + rate;
                         }
                     }
                 }
-                rateDataList = rateDataList + "<td width='120'>" + sum_rate.ToString("0.00") + "</td>";
+                rateDataList = rateDataList + "<td width='120'>" + (sum_rate/sum_idx).ToString("0.00") + "</td>";
             }
             else
             {
@@ -7925,11 +8133,11 @@ namespace AMESCoreStudio.Web.Controllers
 
             //string dateStart06 = DateTime.Now.Year.ToString() + "-06-01";
             //string dateEnd06 = DateTime.Now.Year.ToString() + "-07-01";
-            wipStaiton06 = await _pcsApi.GetWipStation4QRS014GroupM(itemNO, dateStart06, dateEnd06, modelNO, werksNo);
+            wipStaiton06 = await _pcsApi.GetWipStation4QRS014GroupM(itemNO, dateStart06, dateEnd06, modelNO, werksNo, dateType);
             if (wipStaiton06.DataTotal > 0)
             {
                 double sum_rate = 100.0;
-
+                int sum_idx = 1;
                 DataTable dtRate = new DataTable();
                 dtRate.Columns.Add("STATION_ID");
                 dtRate.Columns.Add("OK_QTY");
@@ -8008,11 +8216,13 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate = sum_rate * (rate / 100.0);
+                            //sum_rate = sum_rate * (rate / 100.0);
+                            sum_idx = sum_idx + 1;
+                            sum_rate = sum_rate + rate;
                         }
                     }
                 }
-                rateDataList = rateDataList + "<td width='120'>" + sum_rate.ToString("0.00") + "</td>";
+                rateDataList = rateDataList + "<td width='120'>" + (sum_rate/sum_idx).ToString("0.00") + "</td>";
             }
             else
             {
@@ -8025,11 +8235,11 @@ namespace AMESCoreStudio.Web.Controllers
 
             //string dateStart07 = DateTime.Now.Year.ToString() + "-07-01";
             //string dateEnd07 = DateTime.Now.Year.ToString() + "-08-01";
-            wipStaiton07 = await _pcsApi.GetWipStation4QRS014GroupM(itemNO, dateStart07, dateEnd07, modelNO, werksNo);
+            wipStaiton07 = await _pcsApi.GetWipStation4QRS014GroupM(itemNO, dateStart07, dateEnd07, modelNO, werksNo, dateType);
             if (wipStaiton07.DataTotal > 0)
             {
                 double sum_rate = 100.0;
-
+                int sum_idx = 1;
                 DataTable dtRate = new DataTable();
                 dtRate.Columns.Add("STATION_ID");
                 dtRate.Columns.Add("OK_QTY");
@@ -8108,11 +8318,13 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate = sum_rate * (rate / 100.0);
+                            //sum_rate = sum_rate * (rate / 100.0);
+                            sum_idx = sum_idx + 1;
+                            sum_rate = sum_rate + rate;
                         }
                     }
                 }
-                rateDataList = rateDataList + "<td width='120'>" + sum_rate.ToString("0.00") + "</td>";
+                rateDataList = rateDataList + "<td width='120'>" + (sum_rate / sum_idx).ToString("0.00") + "</td>";
             }
             else
             {
@@ -8125,11 +8337,11 @@ namespace AMESCoreStudio.Web.Controllers
 
             //string dateStart08 = DateTime.Now.Year.ToString() + "-08-01";
             //string dateEnd08 = DateTime.Now.Year.ToString() + "-09-01";
-            wipStaiton08 = await _pcsApi.GetWipStation4QRS014GroupM(itemNO, dateStart08, dateEnd08, modelNO, werksNo);
+            wipStaiton08 = await _pcsApi.GetWipStation4QRS014GroupM(itemNO, dateStart08, dateEnd08, modelNO, werksNo, dateType);
             if (wipStaiton08.DataTotal > 0)
             {
                 double sum_rate = 100.0;
-
+                int sum_idx = 1;
                 DataTable dtRate = new DataTable();
                 dtRate.Columns.Add("STATION_ID");
                 dtRate.Columns.Add("OK_QTY");
@@ -8208,11 +8420,13 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate = sum_rate * (rate / 100.0);
+                            //sum_rate = sum_rate * (rate / 100.0);
+                            sum_idx = sum_idx + 1;
+                            sum_rate = sum_rate + rate;
                         }
                     }
                 }
-                rateDataList = rateDataList + "<td width='120'>" + sum_rate.ToString("0.00") + "</td>";
+                rateDataList = rateDataList + "<td width='120'>" + (sum_rate/sum_idx).ToString("0.00") + "</td>";
             }
             else
             {
@@ -8225,11 +8439,11 @@ namespace AMESCoreStudio.Web.Controllers
 
             //string dateStart09 = DateTime.Now.Year.ToString() + "-09-01";
             //string dateEnd09 = DateTime.Now.Year.ToString() + "-10-01";
-            wipStaiton09 = await _pcsApi.GetWipStation4QRS014GroupM(itemNO, dateStart09, dateEnd09, modelNO, werksNo);
+            wipStaiton09 = await _pcsApi.GetWipStation4QRS014GroupM(itemNO, dateStart09, dateEnd09, modelNO, werksNo, dateType);
             if (wipStaiton09.DataTotal > 0)
             {
                 double sum_rate = 100.0;
-
+                int sum_idx = 1;
                 DataTable dtRate = new DataTable();
                 dtRate.Columns.Add("STATION_ID");
                 dtRate.Columns.Add("OK_QTY");
@@ -8308,11 +8522,13 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate = sum_rate * (rate / 100.0);
+                            //sum_rate = sum_rate * (rate / 100.0);
+                            sum_idx = sum_idx + 1;
+                            sum_rate = sum_rate + rate;
                         }
                     }
                 }
-                rateDataList = rateDataList + "<td width='120'>" + sum_rate.ToString("0.00") + "</td>";
+                rateDataList = rateDataList + "<td width='120'>" + (sum_rate/sum_idx).ToString("0.00") + "</td>";
             }
             else
             {
@@ -8325,11 +8541,11 @@ namespace AMESCoreStudio.Web.Controllers
 
             //string dateStart10 = DateTime.Now.Year.ToString() + "-10-01";
             //string dateEnd10 = DateTime.Now.Year.ToString() + "-11-01";
-            wipStaiton10 = await _pcsApi.GetWipStation4QRS014GroupM(itemNO, dateStart10, dateEnd10, modelNO, werksNo);
+            wipStaiton10 = await _pcsApi.GetWipStation4QRS014GroupM(itemNO, dateStart10, dateEnd10, modelNO, werksNo, dateType);
             if (wipStaiton10.DataTotal > 0)
             {
                 double sum_rate = 100.0;
-
+                int sum_idx = 1;
                 DataTable dtRate = new DataTable();
                 dtRate.Columns.Add("STATION_ID");
                 dtRate.Columns.Add("OK_QTY");
@@ -8408,11 +8624,13 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate = sum_rate * (rate / 100.0);
+                            //sum_rate = sum_rate * (rate / 100.0);
+                            sum_idx = sum_idx + 1;
+                            sum_rate = sum_rate + rate;
                         }
                     }
                 }
-                rateDataList = rateDataList + "<td width='120'>" + sum_rate.ToString("0.00") + "</td>";
+                rateDataList = rateDataList + "<td width='120'>" + (sum_rate / sum_idx).ToString("0.00") + "</td>";
             }
             else
             {
@@ -8425,11 +8643,11 @@ namespace AMESCoreStudio.Web.Controllers
 
             //string dateStart11 = DateTime.Now.Year.ToString() + "-11-01";
             //string dateEnd11 = DateTime.Now.Year.ToString() + "-12-01";
-            wipStaiton11 = await _pcsApi.GetWipStation4QRS014GroupM(itemNO, dateStart11, dateEnd11, modelNO, werksNo);
+            wipStaiton11 = await _pcsApi.GetWipStation4QRS014GroupM(itemNO, dateStart11, dateEnd11, modelNO, werksNo, dateType);
             if (wipStaiton11.DataTotal > 0)
             {
                 double sum_rate = 100.0;
-
+                int sum_idx = 1;
                 DataTable dtRate = new DataTable();
                 dtRate.Columns.Add("STATION_ID");
                 dtRate.Columns.Add("OK_QTY");
@@ -8508,11 +8726,13 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate = sum_rate * (rate / 100.0);
+                            //sum_rate = sum_rate * (rate / 100.0);
+                            sum_idx = sum_idx + 1;
+                            sum_rate = sum_rate + rate;
                         }
                     }
                 }
-                rateDataList = rateDataList + "<td width='120'>" + sum_rate.ToString("0.00") + "</td>";
+                rateDataList = rateDataList + "<td width='120'>" + (sum_rate / sum_idx).ToString("0.00") + "</td>";
             }
             else
             {
@@ -8525,11 +8745,11 @@ namespace AMESCoreStudio.Web.Controllers
 
             //string dateStart12 = DateTime.Now.Year.ToString() + "-12-01";
             //string dateEnd12 = DateTime.Now.AddYears(1).Year.ToString() + "-01-01";
-            wipStaiton12 = await _pcsApi.GetWipStation4QRS014GroupM(itemNO, dateStart12, dateEnd12, modelNO, werksNo);
+            wipStaiton12 = await _pcsApi.GetWipStation4QRS014GroupM(itemNO, dateStart12, dateEnd12, modelNO, werksNo, dateType);
             if (wipStaiton12.DataTotal > 0)
             {
                 double sum_rate = 100.0;
-
+                int sum_idx = 1;
                 DataTable dtRate = new DataTable();
                 dtRate.Columns.Add("STATION_ID");
                 dtRate.Columns.Add("OK_QTY");
@@ -8608,11 +8828,13 @@ namespace AMESCoreStudio.Web.Controllers
 
                         if (rate > 0)
                         {
-                            sum_rate = sum_rate * (rate / 100.0);
+                            //sum_rate = sum_rate * (rate / 100.0);
+                            sum_idx = sum_idx + 1;
+                            sum_rate = sum_rate + rate;
                         }
                     }
                 }
-                rateDataList = rateDataList + "<td width='120'>" + sum_rate.ToString("0.00") + "</td>";
+                rateDataList = rateDataList + "<td width='120'>" + (sum_rate / sum_idx).ToString("0.00") + "</td>";
             }
             else
             {
diff --git a/AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs b/AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs
index cdddbca6..79416ef4 100644
--- a/AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs
+++ b/AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs
@@ -1020,21 +1020,21 @@ namespace AMESCoreStudio.Web
         /// </summary>
         /// <returns></returns>
         [WebApiClient.Attributes.HttpGet("api/WipStation/GetWipStation4QRS014GroupS")]
-        ITask<ResultModel<dynamic>> GetWipStation4QRS014GroupS(string itemNo, string dateStart, string dateEnd, string modelNo, string werksNo);
+        ITask<ResultModel<dynamic>> GetWipStation4QRS014GroupS(string itemNo, string dateStart, string dateEnd, string modelNo, string werksNo, string dateType);
 
         /// <summary>
         /// 查詢系統工單站别资料4QRS014
         /// </summary>
         /// <returns></returns>
         [WebApiClient.Attributes.HttpGet("api/WipStation/GetWipStation4QRS014GroupB")]
-        ITask<ResultModel<dynamic>> GetWipStation4QRS014GroupB(string itemNo, string dateStart, string dateEnd, string modelNo, string werksNo);
+        ITask<ResultModel<dynamic>> GetWipStation4QRS014GroupB(string itemNo, string dateStart, string dateEnd, string modelNo, string werksNo, string dateType);
 
         /// <summary>
         /// 查詢醫療工單站别资料4QRS014
         /// </summary>
         /// <returns></returns>
         [WebApiClient.Attributes.HttpGet("api/WipStation/GetWipStation4QRS014GroupM")]
-        ITask<ResultModel<dynamic>> GetWipStation4QRS014GroupM(string itemNo, string dateStart, string dateEnd, string modelNo, string werksNo);
+        ITask<ResultModel<dynamic>> GetWipStation4QRS014GroupM(string itemNo, string dateStart, string dateEnd, string modelNo, string werksNo, string dateType);
         /// <summary>
         /// 查詢工單站別在製條碼資料
         /// </summary>
@@ -1102,7 +1102,7 @@ namespace AMESCoreStudio.Web
         /// </summary>
         /// <returns></returns>
         [WebApiClient.Attributes.HttpGet("api/WipInfos/GetWipInfo4QRS014")]
-        ITask<ResultModel<dynamic>> GetWipInfo4QRS014(string unitNo, string itemNO, string wipNO, string dateStart, string dateEnd, string modelNO, string werksNo);
+        ITask<ResultModel<dynamic>> GetWipInfo4QRS014(string unitNo, string itemNO, string wipNO, string dateStart, string dateEnd, string modelNO, string werksNo, string dateType);
 
         #endregion
 
diff --git a/AMESCoreStudio.Web/Views/QRS/QRS014.cshtml b/AMESCoreStudio.Web/Views/QRS/QRS014.cshtml
index be6e9ecc..0ae8b73e 100644
--- a/AMESCoreStudio.Web/Views/QRS/QRS014.cshtml
+++ b/AMESCoreStudio.Web/Views/QRS/QRS014.cshtml
@@ -63,14 +63,18 @@
                 </div>
                 <div class="layui-col-sm6">
                     <div class="layui-inline">
-                        <label class="layui-form-label">生產日期:</label>
-                        <div class="layui-input-inline" style="width:160px">
+                        <label class="layui-form-label">日期:</label>
+                        <div class="layui-input-inline" style="width: 160px">
                             <input id="dateStart" name="dateStart" autocomplete="off" class="layui-input" readonly="">
                         </div>
                         <div class="layui-form-mid">～</div>
-                        <div class="layui-input-inline" style="width:160px">
+                        <div class="layui-input-inline" style="width: 160px">
                             <input id="dateEnd" name="dateEnd" autocomplete="off" class="layui-input" readonly="">
                         </div>
+                        <div class="layui-input-inline" style="width: 200px">
+                            <input type="radio" name="dateType" lay-filter="dateType" value="WipDate" title="生產" checked="checked">
+                            <input type="radio" name="dateType" lay-filter="dateType" value="FqcDate" title="結案">
+                        </div>
                     </div>
                 </div>
                 <div class="layui-col-sm3">
@@ -91,6 +95,7 @@
     @{ await Html.RenderPartialAsync("_ValidationScriptsPartial");
         await Html.RenderPartialAsync("_FileinputScriptsPartial"); }
     <script type="text/javascript">
+        var date_type = "";
         layui.use(['form', 'layer', 'laydate'], function () {
             var form = layui.form;
             laydate = layui.laydate;
@@ -107,6 +112,11 @@
                 , format: 'yyyy/MM/dd'
                 , theme: 'grid'
             });
+
+            //此处即为 radio 的监听事件
+            form.on('radio(dateType)', function (data) {
+                date_type = data.value;
+            });
         });
 
         function result_a() {
@@ -118,7 +128,7 @@
             var dateEnd = $("#dateEnd").val();
             var modelNO = $("#modelNO").val();
 
-            var query = "?unitNo=" + unitNo + "&werksNo=" + werksNo + "&itemNO=" + itemNO + "&wipNO=" + wipNO + "&dateStart=" + dateStart + "&dateEnd=" + dateEnd + "&modelNO=" + modelNO;
+            var query = "?unitNo=" + unitNo + "&werksNo=" + werksNo + "&itemNO=" + itemNO + "&wipNO=" + wipNO + "&dateStart=" + dateStart + "&dateEnd=" + dateEnd + "&modelNO=" + modelNO + "&dateType=" + date_type;
             hg.open('直通率', '/QRS/QRS014A' + query, '', '', true);
 
         };
@@ -132,7 +142,7 @@
             var dateEnd = $("#dateEnd").val();
             var modelNO = $("#modelNO").val();
 
-            var query = "?unitNo=" + unitNo + "&werksNo=" + werksNo + "&itemNO=" + itemNO + "&wipNO=" + wipNO + "&dateStart=" + dateStart + "&dateEnd=" + dateEnd + "&modelNO=" + modelNO;
+            var query = "?unitNo=" + unitNo + "&werksNo=" + werksNo + "&itemNO=" + itemNO + "&wipNO=" + wipNO + "&dateStart=" + dateStart + "&dateEnd=" + dateEnd + "&modelNO=" + modelNO + "&dateType=" + date_type;
             hg.open('直通率', '/QRS/QRS014B' + query, '', '', true);
 
         };
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
index c736cb98..46aa1c8e 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
@@ -1513,13 +1513,15 @@ FROM [SFIS].[dbo].[ZPDKeyPart]  B WHERE B.[IsActive] = 1  AND B.[ProductSN] = (S
         /// <returns></returns>
         [Route("[action]")]
         [HttpGet]
-        public async Task<ResultModel<dynamic>> GetWipInfo4QRS014(string unitNo, string itemNO, string wipNO, string dateStart, string dateEnd, string modelNO, string werksNo)
+        public async Task<ResultModel<dynamic>> GetWipInfo4QRS014(string unitNo, string itemNO, string wipNO, string dateStart, string dateEnd, string modelNO, string werksNo, string dateType)
         {
             ResultModel<dynamic> result = new ResultModel<dynamic>();
             var q = from q1 in _context.WipInfos
                     join q2 in _context.WipAtts on q1.WipNO equals q2.WipNO
                     join q3 in _context.LineInfoes on q1.LineID equals q3.LineID
                     join q4 in _context.FactoryUnits on q1.UnitNO equals q4.UnitNo
+                    join q5 in _context.FqcResultMasters.GroupBy(x => new { x.WipNo }).Select(x => new { WipNo = x.Key.WipNo, FqcDate = x.Max(o => o.EndTime) }) on q2.WipNO equals q5.WipNo into fqc_data
+                    from x in fqc_data.DefaultIfEmpty()
                     select new
                     {
                         q1.WipID,
@@ -1536,7 +1538,8 @@ FROM [SFIS].[dbo].[ZPDKeyPart]  B WHERE B.[IsActive] = 1  AND B.[ProductSN] = (S
                         q2.ItemNO,
                         q2.ModelNO,
                         q3.LineDesc,
-                        q4.UnitName
+                        q4.UnitName,
+                        FqcDate = (x.FqcDate == null ? DateTime.Now : x.FqcDate)
                     };
 
             q = q.Where(w => w.CompleteQTY > 0);
@@ -1561,9 +1564,19 @@ FROM [SFIS].[dbo].[ZPDKeyPart]  B WHERE B.[IsActive] = 1  AND B.[ProductSN] = (S
             {
                 q = q.Where(w => w.WipNO == wipNO);
             }
-            if (dateStart != null && dateStart != "" && dateEnd != null && dateEnd != "")
+            if (dateType == "WipDate")
+            {
+                if (dateStart != null && dateStart != "" && dateEnd != null && dateEnd != "")
+                {
+                    q = q.Where(w => w.WipScheduleDate >= DateTime.Parse(dateStart) && w.WipScheduleDate <= DateTime.Parse(dateEnd).AddDays(1));
+                }
+            }
+            else
             {
-                q = q.Where(w => w.WipScheduleDate >= DateTime.Parse(dateStart) && w.WipScheduleDate <= DateTime.Parse(dateEnd).AddDays(1));
+                if (dateStart != null && dateStart != "" && dateEnd != null && dateEnd != "")
+                {
+                    q = q.Where(w => w.FqcDate >= DateTime.Parse(dateStart) && w.FqcDate <= DateTime.Parse(dateEnd).AddDays(1));
+                }
             }
 
             //紀錄筆數
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WipStationController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WipStationController.cs
index 871e39d3..97d5356f 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/WipStationController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/WipStationController.cs
@@ -271,9 +271,10 @@ FROM JHAMES.WIP_STATION";
         /// <param name="dateEnd">結束日期</param>
         /// <param name="modelNo">機種</param>
         /// <param name="werksNo">生產廠別</param>
+        /// <param name="dateType">日期類別</param>
         /// <returns></returns>
         [HttpGet("GetWipStation4QRS014GroupS")]
-        public async Task<ResultModel<dynamic>> GetWipStation4QRS014GroupS(string itemNo, string dateStart, string dateEnd, string modelNo, string werksNo)
+        public async Task<ResultModel<dynamic>> GetWipStation4QRS014GroupS(string itemNo, string dateStart, string dateEnd, string modelNo, string werksNo, string dateType)
         {
             string fpyStation = _config["FPYStation"].ToString();
             string[] fpy_station = fpyStation.Split(',');
@@ -283,6 +284,8 @@ FROM JHAMES.WIP_STATION";
                     join q2 in _context.WipInfos on q1.WipID equals q2.WipID
                     join q3 in _context.WipAtts on q2.WipNO equals q3.WipNO
                     join q4 in _context.Stationses on q1.StationID equals q4.StationID
+                    join q5 in _context.FqcResultMasters.GroupBy(x => new { x.WipNo }).Select(x => new { WipNo = x.Key.WipNo, FqcDate = x.Max(o => o.EndTime) }) on q2.WipNO equals q5.WipNo into fqc_data
+                    from x in fqc_data.DefaultIfEmpty()
                     select new
                     {
                         q1.WipID,
@@ -295,7 +298,8 @@ FROM JHAMES.WIP_STATION";
                         q4.StationName,
                         q1.RuleStatus,
                         q1.FirstCnt,
-                        q2.WipScheduleDate
+                        q2.WipScheduleDate,
+                        FqcDate = (x.FqcDate == null ? DateTime.Now : x.FqcDate)
                     };
 
             q = q.Where(w => w.CustomerMedical == "N" && w.UnitNO == "S");
@@ -320,11 +324,24 @@ FROM JHAMES.WIP_STATION";
             }
 
 
-            if (dateStart != null && dateEnd != null)
+            if (dateType == "WipDate" || dateType == null)
             {
-                if (dateStart != "" && dateEnd != "")
+                if (dateStart != null && dateEnd != null)
                 {
-                    q = q.Where(w => w.WipScheduleDate >= DateTime.Parse(dateStart) && w.WipScheduleDate <= DateTime.Parse(dateEnd));
+                    if (dateStart != "" && dateEnd != "")
+                    {
+                        q = q.Where(w => w.WipScheduleDate >= DateTime.Parse(dateStart) && w.WipScheduleDate <= DateTime.Parse(dateEnd));
+                    }
+                }
+            }
+            else
+            {
+                if (dateStart != null && dateEnd != null)
+                {
+                    if (dateStart != "" && dateEnd != "")
+                    {
+                        q = q.Where(w => w.FqcDate >= DateTime.Parse(dateStart) && w.FqcDate <= DateTime.Parse(dateEnd));
+                    }
                 }
             }
 
@@ -350,9 +367,10 @@ FROM JHAMES.WIP_STATION";
         /// <param name="dateEnd">結束日期</param>
         /// <param name="modelNo">機種</param>
         /// <param name="werksNo">生產廠別</param>
+        /// <param name="dateType">日期類別</param>
         /// <returns></returns>
         [HttpGet("GetWipStation4QRS014GroupB")]
-        public async Task<ResultModel<dynamic>> GetWipStation4QRS014GroupB(string itemNo, string dateStart, string dateEnd, string modelNo, string werksNo)
+        public async Task<ResultModel<dynamic>> GetWipStation4QRS014GroupB(string itemNo, string dateStart, string dateEnd, string modelNo, string werksNo, string dateType)
         {
             string fpyStation = _config["FPYStation"].ToString();
             string[] fpy_station = fpyStation.Split(',');
@@ -363,6 +381,8 @@ FROM JHAMES.WIP_STATION";
                     join q2 in _context.WipInfos on q1.WipID equals q2.WipID
                     join q3 in _context.WipAtts on q2.WipNO equals q3.WipNO
                     join q4 in _context.Stationses on q1.StationID equals q4.StationID
+                    join q5 in _context.FqcResultMasters.GroupBy(x => new { x.WipNo }).Select(x => new { WipNo = x.Key.WipNo, FqcDate = x.Max(o => o.EndTime) }) on q2.WipNO equals q5.WipNo into fqc_data
+                    from x in fqc_data.DefaultIfEmpty()
                     select new
                     {
                         q1.WipID,
@@ -375,7 +395,8 @@ FROM JHAMES.WIP_STATION";
                         q4.StationName,
                         q1.RuleStatus,
                         q1.FirstCnt,
-                        q2.WipScheduleDate
+                        q2.WipScheduleDate,
+                        FqcDate = (x.FqcDate == null ? DateTime.Now : x.FqcDate)
                     };
 
             q = q.Where(w => w.CustomerMedical == "N" && w.UnitNO == "B");
@@ -399,15 +420,26 @@ FROM JHAMES.WIP_STATION";
                     q = q.Where(w => w.WerksNO == werksNo);
             }
 
-
-            if (dateStart != null && dateEnd != null)
+            if (dateType == "WipDate" || dateType == null)
             {
-                if (dateStart != "" && dateEnd != "")
+                if (dateStart != null && dateEnd != null)
                 {
-                    q = q.Where(w => w.WipScheduleDate >= DateTime.Parse(dateStart) && w.WipScheduleDate <= DateTime.Parse(dateEnd));
+                    if (dateStart != "" && dateEnd != "")
+                    {
+                        q = q.Where(w => w.WipScheduleDate >= DateTime.Parse(dateStart) && w.WipScheduleDate <= DateTime.Parse(dateEnd));
+                    }
+                }
+            }
+            else
+            {
+                if (dateStart != null && dateEnd != null)
+                {
+                    if (dateStart != "" && dateEnd != "")
+                    {
+                        q = q.Where(w => w.FqcDate >= DateTime.Parse(dateStart) && w.FqcDate <= DateTime.Parse(dateEnd));
+                    }
                 }
             }
-
             var g = q.GroupBy(x => new { x.StationID, x.RuleStatus }).Select(x => new
             {
                 StationID = x.Key.StationID,
@@ -430,9 +462,10 @@ FROM JHAMES.WIP_STATION";
         /// <param name="dateEnd">結束日期</param>
         /// <param name="modelNo">機種</param>
         /// <param name="werksNo">生產廠別</param>
+        /// <param name="dateType">日期類別</param>
         /// <returns></returns>
         [HttpGet("GetWipStation4QRS014GroupM")]
-        public async Task<ResultModel<dynamic>> GetWipStation4QRS014GroupM(string itemNo, string dateStart, string dateEnd, string modelNo, string werksNo)
+        public async Task<ResultModel<dynamic>> GetWipStation4QRS014GroupM(string itemNo, string dateStart, string dateEnd, string modelNo, string werksNo, string dateType)
         {
             string fpyStation = _config["FPYStation"].ToString();
             string[] fpy_station = fpyStation.Split(',');
@@ -443,6 +476,8 @@ FROM JHAMES.WIP_STATION";
                     join q2 in _context.WipInfos on q1.WipID equals q2.WipID
                     join q3 in _context.WipAtts on q2.WipNO equals q3.WipNO
                     join q4 in _context.Stationses on q1.StationID equals q4.StationID
+                    join q5 in _context.FqcResultMasters.GroupBy(x => new { x.WipNo }).Select(x => new { WipNo = x.Key.WipNo, FqcDate = x.Max(o => o.EndTime) }) on q2.WipNO equals q5.WipNo into fqc_data
+                    from x in fqc_data.DefaultIfEmpty()
                     select new
                     {
                         q1.WipID,
@@ -455,7 +490,8 @@ FROM JHAMES.WIP_STATION";
                         q4.StationName,
                         q1.RuleStatus,
                         q1.FirstCnt,
-                        q2.WipScheduleDate
+                        q2.WipScheduleDate,
+                        FqcDate = (x.FqcDate == null ? DateTime.Now : x.FqcDate)
                     };
 
             q = q.Where(w => w.CustomerMedical == "Y");
@@ -480,11 +516,24 @@ FROM JHAMES.WIP_STATION";
             }
 
 
-            if (dateStart != null && dateEnd != null)
+            if (dateType == "WipDate" || dateType == null)
             {
-                if (dateStart != "" && dateEnd != "")
+                if (dateStart != null && dateEnd != null)
                 {
-                    q = q.Where(w => w.WipScheduleDate >= DateTime.Parse(dateStart) && w.WipScheduleDate <= DateTime.Parse(dateEnd));
+                    if (dateStart != "" && dateEnd != "")
+                    {
+                        q = q.Where(w => w.WipScheduleDate >= DateTime.Parse(dateStart) && w.WipScheduleDate <= DateTime.Parse(dateEnd));
+                    }
+                }
+            }
+            else
+            {
+                if (dateStart != null && dateEnd != null)
+                {
+                    if (dateStart != "" && dateEnd != "")
+                    {
+                        q = q.Where(w => w.FqcDate >= DateTime.Parse(dateStart) && w.FqcDate <= DateTime.Parse(dateEnd));
+                    }
                 }
             }