From 46d900026790ebd6633846eac3d632e812f11c0c Mon Sep 17 00:00:00 2001
From: Marvin <marvinhong@163.com>
Date: Mon, 31 Jul 2023 10:46:32 +0800
Subject: [PATCH] =?UTF-8?q?1,=E4=BF=AE=E6=94=B9=E9=80=B1=E5=88=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/QRSController.cs              | 20 +++++++++----------
 AMESCoreStudio.Web/Views/QRS/QRS014.cshtml    |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

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 = "<font size='3'>";
 
-            rateDataList = rateDataList + "<table border='1' width='100%'><tr><td width='80' style='text-align:center'>類別</td><td width='80' style='text-align:center'>周次</td><td style='text-align:center'>通過筆數</td><td width='200' style='text-align:center'>不良筆數</td><td width='160' style='text-align:center'>通過率</td></tr>";
+            rateDataList = rateDataList + "<table border='1' width='100%'><tr><td width='80' style='text-align:center'>類別</td><td width='80' style='text-align:center'>週別</td><td style='text-align:center'>通過筆數</td><td width='200' style='text-align:center'>不良筆數</td><td width='160' style='text-align:center'>通過率</td></tr>";
 
             //單板FPY
             //rateDataList = rateDataList + @"<tr><td>" + DateTime.Now.Year.ToString() + "-單板" + "</td>";
@@ -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 @@
                         <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit onclick="result_b()" lay-filter="querysubmit" title="月匯總">
                             <i class="layui-icon layui-icon-sm">&#xe615;月匯總</i>
                         </button>
-                        <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit onclick="result_c()" lay-filter="querysubmit" title="周匯總">
-                            <i class="layui-icon layui-icon-sm">&#xe615;周匯總</i>
+                        <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit onclick="result_c()" lay-filter="querysubmit" title="週匯總">
+                            <i class="layui-icon layui-icon-sm">&#xe615;週匯總</i>
                         </button>
                     </div>
                 </div>