From 88e27599edfb6aeac5f644cfa8c846cfe9d789ba Mon Sep 17 00:00:00 2001
From: Yiru <yiru@aten.com.tw>
Date: Fri, 21 Feb 2025 20:13:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9FQC014UV=E6=AC=84=E4=BD=8D?=
 =?UTF-8?q?=E5=90=8D=E7=A8=B1=20=E4=BF=AE=E6=AD=A3FQC014=E8=BC=B8=E5=85=A5?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=A2=9D=E4=BB=B6=E7=84=A1=E4=BD=9C=E7=94=A8?=
 =?UTF-8?q?=20=E4=BF=AE=E6=94=B9FQC014UV=20=E9=81=B8=E5=AE=8C=E7=B5=90?=
 =?UTF-8?q?=E6=99=82=E9=9C=80=E8=A6=81=E5=88=A4=E6=96=B7QA=E4=BA=BA?=
 =?UTF-8?q?=E5=93=A1=E6=98=AF=E5=90=A6=E5=B7=B2=E8=BC=B8=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AMESCoreStudio.Web/Controllers/FQCController.cs | 4 ++--
 AMESCoreStudio.Web/Views/FQC/FQC014.cshtml      | 4 ++--
 AMESCoreStudio.Web/Views/FQC/FQC014U.cshtml     | 4 ++--
 AMESCoreStudio.Web/Views/FQC/FQC014UV.cshtml    | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/AMESCoreStudio.Web/Controllers/FQCController.cs b/AMESCoreStudio.Web/Controllers/FQCController.cs
index cd138c77..a9628727 100644
--- a/AMESCoreStudio.Web/Controllers/FQCController.cs
+++ b/AMESCoreStudio.Web/Controllers/FQCController.cs
@@ -2929,13 +2929,13 @@ namespace AMESCoreStudio.Web.Controllers
         {
             if (ModelState.IsValid)
             {
-                if (model.StatusNo == "F" & model.UpdateUserID == -1)
+                if (model.StatusNo == "F" && (model.UpdateUserID == -1 || model.UpdateUserID == 0))
                 {
                     var tt = Request.Cookies["UserID"];
                     ViewBag.UserID = tt;
 
                     ModelState.AddModelError("error", "請選擇QA人員");
-
+                    await GetUserInfo("1004,1009");
                 }
                 else
                 {
diff --git a/AMESCoreStudio.Web/Views/FQC/FQC014.cshtml b/AMESCoreStudio.Web/Views/FQC/FQC014.cshtml
index cc00c1dd..41cfaf88 100644
--- a/AMESCoreStudio.Web/Views/FQC/FQC014.cshtml
+++ b/AMESCoreStudio.Web/Views/FQC/FQC014.cshtml
@@ -301,7 +301,7 @@
             var statusNo = $("#statusNo").val();
             var dateStart = $("#dateStart").val();
             var dateEnd = $("#dateEnd").val();
-            var table = hg.table.datatable('test', '異常不良警示資料維護', '/FQC/GetNGINFOAlertMasterByQuery?caseID=' + caseID + "&itemNoF=" + itemNoF + "&modelName=" + modelName + "&wipNoF=" + wipNoF + "&errorCode=" + errorCode + "&statusNo=" + statusNo + "&dateStart=&dateEnd=", {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
+            var table = hg.table.datatable('test', '異常不良警示資料維護', '/FQC/GetNGINFOAlertMasterByQuery?caseID=' + caseID + "&itemNoF=" + itemNoF + "&modelName=" + modelName + "&wipNoF=" + wipNoF + "&errorCode=" + errorCode + "&statusNo=" + statusNo + "&dateStart=" + dateStart + "&dateEnd="+dateEnd, {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
 
         };
         
@@ -313,7 +313,7 @@
         var statusNo = $("#statusNo").val();
         var dateStart = $("#dateStart").val();
         var dateEnd = $("#dateEnd").val();
-        var table = hg.table.datatable('test', '異常不良警示資料維護', '/FQC/GetNGINFOAlertMasterByQuery?caseID=' + caseID + "&itemNoF=" + itemNoF + "&modelName=" + modelName + "&wipNoF=" + wipNoF + "&errorCode=" + errorCode + "&statusNo=" + statusNo + "&dateStart=&dateEnd=", {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
+        var table = hg.table.datatable('test', '異常不良警示資料維護', '/FQC/GetNGINFOAlertMasterByQuery?caseID=' + caseID + "&itemNoF=" + itemNoF + "&modelName=" + modelName + "&wipNoF=" + wipNoF + "&errorCode=" + errorCode + "&statusNo=" + statusNo + "&dateStart=" + dateStart + "&dateEnd=" + dateEnd , {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
 
 
 
diff --git a/AMESCoreStudio.Web/Views/FQC/FQC014U.cshtml b/AMESCoreStudio.Web/Views/FQC/FQC014U.cshtml
index 8f8764e5..592be6cf 100644
--- a/AMESCoreStudio.Web/Views/FQC/FQC014U.cshtml
+++ b/AMESCoreStudio.Web/Views/FQC/FQC014U.cshtml
@@ -187,7 +187,7 @@
         {
             field: 'createDate',
             width: 100,
-            title: '警報異常時間',
+            title: '警報開始時間',
             templet: '<div>{{ layui.util.toDateString(d.createDate, "yyyy/MM/dd") }}</div>',
             sort: true
         },
@@ -212,7 +212,7 @@
         {
             field: 'repairDesc',
             width: 100,
-            title: '維修原因',
+            title: '維修描述',
             sort: true
         },
         {
diff --git a/AMESCoreStudio.Web/Views/FQC/FQC014UV.cshtml b/AMESCoreStudio.Web/Views/FQC/FQC014UV.cshtml
index 03700162..3d426422 100644
--- a/AMESCoreStudio.Web/Views/FQC/FQC014UV.cshtml
+++ b/AMESCoreStudio.Web/Views/FQC/FQC014UV.cshtml
@@ -172,7 +172,7 @@
         {
             field: 'createDate',
             width: 100,
-            title: '警報異常時間',
+            title: '警報開始時間',
             templet: '<div>{{ layui.util.toDateString(d.createDate, "yyyy/MM/dd") }}</div>',
             sort: true
         },
@@ -197,7 +197,7 @@
         {
             field: 'repairDesc',
             width: 100,
-            title: '維修原因',
+            title: '維修描述',
             sort: true
         },
         {