修正異常警報問題

AMESCoreStudio.Web/Controllers/FQCController.cs

@@ -2776,13 +2776,13 @@ namespace AMESCoreStudio.Web.Controllers
                 }
 
                 // 檢查檔案副檔名
-                var allowedExtensions = new[] { ".png", ".jpg", ".bmp", ".gif", ".xlsx",".xls",".docx",".pdf",".pptx",".txt",".eml",".etc" };
+                var allowedExtensions = new[] { ".png", ".jpg", ".bmp", ".gif", ".xlsx",".xls",".docx",".pdf",".pptx",".txt",".eml",".etc", ".msg" };
                 var fileExtension = Path.GetExtension(formFile.FileName).ToLower();
 
                 if (!allowedExtensions.Contains(fileExtension))
                 {
                     string msg = "檔案格式錯誤，請確認\r\n";
-                    msg += "僅允許上傳 png、jpg、bmp、gif、xlsx、xls、docx、pdf、pptx、txt、eml、etc 格式的檔案！";
+                    msg += "僅允許上傳 png、jpg、bmp、gif、xlsx、xls、docx、pdf、pptx、txt、eml、etc、msg 格式的檔案！";
                     ModelState.AddModelError("error", msg);
                     ViewBag.CaseID = model.CaseID;
                     return View("FQC014R");
@@ -2888,7 +2888,7 @@ namespace AMESCoreStudio.Web.Controllers
             // await GetUserInfo("1004,1009");
 
             var result = await _fqcApi.GetNgInfoAlertMaster(id);
-            if (result.UpdateUserID != 0)
+            if (result.UpdateUserID != 0 && result.UpdateUserID != -1)
             {
                 var user_info = await _sysApi.GetUserInfo(result.UpdateUserID);
                 ViewBag.UpdateUserName = user_info[0].UserName;
@@ -2903,22 +2903,33 @@ namespace AMESCoreStudio.Web.Controllers
         {
             if (ModelState.IsValid)
             {
-                IResultModel result;
+                if (model.StatusNo == "F" & model.UpdateUserID == -1)
+                {
+                    var tt = Request.Cookies["UserID"];
+                    ViewBag.UserID = tt;
 
-                result = await _fqcApi.PutNgInfoAlertMaster(model.CaseID, JsonConvert.SerializeObject(model));
+                    ModelState.AddModelError("error", "請選擇QA人員");
 
-                if (result.Success)
-                {
-                    var _msg = "修改成功！";
-                    return RedirectToAction("Refresh", "Home", new { msg = _msg });
                 }
                 else
                 {
-                    var tt = Request.Cookies["UserID"];
-                    ViewBag.UserID = tt;
+                    IResultModel result;
 
-                    ModelState.AddModelError("error", result.Msg);
+                    result = await _fqcApi.PutNgInfoAlertMaster(model.CaseID, JsonConvert.SerializeObject(model));
 
+                    if (result.Success)
+                    {
+                        var _msg = "修改成功！";
+                        return RedirectToAction("Refresh", "Home", new { msg = _msg });
+                    }
+                    else
+                    {
+                        var tt = Request.Cookies["UserID"];
+                        ViewBag.UserID = tt;
+
+                        ModelState.AddModelError("error", result.Msg);
+
+                    }
                 }
             }
             return View("FQC014U", model);
@@ -2975,6 +2986,7 @@ namespace AMESCoreStudio.Web.Controllers
         {
             string[] DeptIDList = DeptIDs.Split(',');
             var UserItems = new List<SelectListItem>();
+            UserItems.Add(new SelectListItem("請選擇", "0"));
             // 顯示分割後的結果
             foreach (var item1 in DeptIDList)
             {

AMESCoreStudio.Web/Views/FQC/FQC014.cshtml

@@ -118,9 +118,24 @@
 
         //监听表单提交事件
         hg.form.onsubmit('querysubmit', function (data) {
-            hg.msghide("重新載入資料..");
-           // table && table.reload(data);
-            tt();
+            var dateStart = $("#dateStart").val();
+            var dateEnd = $("#dateEnd").val();
+
+            // Convert the date strings to Date objects for comparison
+            var startDate = new Date(dateStart);
+            var endDate = new Date(dateEnd);
+
+            // Check if dateStart is greater than dateEnd
+            if (startDate > endDate) {
+                alert("開始日期不可大於結束日期");
+                $("#dateStart").val('');  // Example of resetting the start date
+                $("#dateEnd").val('');    // Example of resetting the end date
+            }
+            else {
+                hg.msghide("重新載入資料..");
+                // table && table.reload(data);
+                tt();
+            }
         });
 
 
@@ -195,8 +210,6 @@
                 field: 'right',
                 width: 150,
                 title: '操作',
-                fixed: 'right',
-
                 templet: function (d) {
                     var btn = '<a class="layui-btn layui-bg-blue layui-btn-xs layui-icon layui-icon-form" lay-event="view">檢視</a>'
                     if (d.statusNo != "已結案") {
@@ -214,12 +227,12 @@
                 templet: '#statusNo1'
             },
             {
-                field: 'updateDate',
+                field: 'createDate',
               //  templet: '<div>{{ layui.util.toDateString(d.createDate, "yyyy/MM/dd") }}</div>',
-                title: '警報處理時間',
+                title: '警報開始時間',
                 width: 100,
                 sort: true,
-                templet: '#updateDate'
+                templet: '#createDate'
             }, {
                 field: 'finishDate',
                // templet: '<div>{{ layui.util.toDateString(d.finishDate, "yyyy/MM/dd") }}</div>',
@@ -405,13 +418,13 @@
         {{ d.userName }}
         {{#  } }}
     </script>
-    <script type="text/html" id="updateDate">
+    <script type="text/html" id="createDate">
         {{#  if(d.statusNo === '未處理' ){ }}
-        <span style="color: #FF0000">  {{ layui.util.toDateString(d.updateDate, "yyyy/MM/dd") }}</span>
+        <span style="color: #FF0000">  {{ layui.util.toDateString(d.createDate, "yyyy/MM/dd") }}</span>
         {{#  } else if(d.statusNo === '已結案'){ }}
-        <span style="color: #D3D3D3; ">  {{ layui.util.toDateString(d.updateDate, "yyyy/MM/dd") }}</span>
+        <span style="color: #D3D3D3; ">  {{ layui.util.toDateString(d.createDate, "yyyy/MM/dd") }}</span>
         {{#  } else { }}
-        {{ layui.util.toDateString(d.updateDate, "yyyy/MM/dd") }}
+        {{ layui.util.toDateString(d.createDate, "yyyy/MM/dd") }}
         {{#  } }}
     </script>
     <script type="text/html" id="finishDate">

AMESCoreStudio.WebApi/Controllers/AMES/NgInfoAlertMasterController.cs

@@ -210,7 +210,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             if (!string.IsNullOrWhiteSpace(errorCode))
             {
                
-                q = q.Where(w => w.ReasonNo == errorCode);
+                q = q.Where(w => w.ReasonNo.Contains(" "+errorCode+" "));
             }
             if (!string.IsNullOrWhiteSpace(statusNo) && statusNo != "ALL")
             {

AMESCoreStudio.WebApi/Models/AMES/NgInfoAlertMaster.cs

@@ -95,7 +95,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// 警報時間
         /// </summary>
         [DataMember]
-        [Display(Name = "警報時間")]
+        [Display(Name = "警報開始時間")]
         [Column("CREATE_DATE")]
         public DateTime CreateDate { get; set; }