diff --git a/AMESCoreStudio.Web/Controllers/QRSController.cs b/AMESCoreStudio.Web/Controllers/QRSController.cs index 396816cb..e8912949 100644 --- a/AMESCoreStudio.Web/Controllers/QRSController.cs +++ b/AMESCoreStudio.Web/Controllers/QRSController.cs @@ -9231,7 +9231,7 @@ namespace AMESCoreStudio.Web.Controllers string rateDataList = ""; - rateDataList = rateDataList + ""; + rateDataList = rateDataList + "
類別周次通過筆數不良筆數通過率
"; //單板FPY //rateDataList = rateDataList + @""; @@ -9243,8 +9243,8 @@ namespace AMESCoreStudio.Web.Controllers #region 單板 - var wipStaiton01 = await _pcsApi.GetWipStation4QRS014GroupSByWeek(itemNO, dateStart, dateEnd, modelNO, werksNo, dateType); - if (wipStaiton01.DataTotal > 0) + var wipStation = await _pcsApi.GetWipStation4QRS014GroupSByWeek(itemNO, dateStart, dateEnd, modelNO, werksNo, dateType); + if (wipStation.DataTotal > 0) { DataTable dtRate = new DataTable(); dtRate.Columns.Add("WEEK_CODE"); @@ -9253,7 +9253,7 @@ namespace AMESCoreStudio.Web.Controllers dtRate.PrimaryKey = new DataColumn[] { dtRate.Columns[0] }; dtRate.AcceptChanges(); - foreach (var data in wipStaiton01.Data) + foreach (var data in wipStation.Data) { JObject j0 = JObject.Parse(data.ToString()); string weekCode = j0["weekCode"].ToString(); @@ -9333,8 +9333,8 @@ namespace AMESCoreStudio.Web.Controllers #region 系統 - wipStaiton01 = await _pcsApi.GetWipStation4QRS014GroupBByWeek(itemNO, dateStart, dateEnd, modelNO, werksNo, dateType); - if (wipStaiton01.DataTotal > 0) + wipStation = await _pcsApi.GetWipStation4QRS014GroupBByWeek(itemNO, dateStart, dateEnd, modelNO, werksNo, dateType); + if (wipStation.DataTotal > 0) { double sum_rate = 100.0; int sum_idx = 1; @@ -9345,7 +9345,7 @@ namespace AMESCoreStudio.Web.Controllers dtRate.PrimaryKey = new DataColumn[] { dtRate.Columns[0] }; dtRate.AcceptChanges(); - foreach (var data in wipStaiton01.Data) + foreach (var data in wipStation.Data) { JObject j0 = JObject.Parse(data.ToString()); string weekCode = j0["weekCode"].ToString(); @@ -9425,8 +9425,8 @@ namespace AMESCoreStudio.Web.Controllers #region 醫療 - wipStaiton01 = await _pcsApi.GetWipStation4QRS014GroupM(itemNO, dateStart, dateEnd, modelNO, werksNo, dateType); - if (wipStaiton01.DataTotal > 0) + wipStation = await _pcsApi.GetWipStation4QRS014GroupM(itemNO, dateStart, dateEnd, modelNO, werksNo, dateType); + if (wipStation.DataTotal > 0) { double sum_rate = 100.0; int sum_idx = 1; @@ -9437,7 +9437,7 @@ namespace AMESCoreStudio.Web.Controllers dtRate.PrimaryKey = new DataColumn[] { dtRate.Columns[0] }; dtRate.AcceptChanges(); - foreach (var data in wipStaiton01.Data) + foreach (var data in wipStation.Data) { JObject j0 = JObject.Parse(data.ToString()); string weekCode = j0["weekCode"].ToString(); diff --git a/AMESCoreStudio.Web/Views/QRS/QRS014.cshtml b/AMESCoreStudio.Web/Views/QRS/QRS014.cshtml index ab6fdf31..b7786827 100644 --- a/AMESCoreStudio.Web/Views/QRS/QRS014.cshtml +++ b/AMESCoreStudio.Web/Views/QRS/QRS014.cshtml @@ -85,8 +85,8 @@ -
類別週別通過筆數不良筆數通過率
" + DateTime.Now.Year.ToString() + "-單板" + "