1. 修改DISPLAY 下拉文字顏色

2. FQC007 修改品規

AMESCoreStudio.Web/Controllers/FQCController.cs

@@ -1246,7 +1246,7 @@ namespace AMESCoreStudio.Web.Controllers
             }
 
             // Fail數量 小於0 才要判斷抽樣數量 && 不等於免驗||無序號廠驗 
-            if (fqcItem.FailQty <= 0 && (fqcItem.InspectionStatus != "C" || fqcItem.InspectionStatus != "D"))
+            if (fqcItem.FailQty <= 0 && (fqcItem.InspectionStatus != "C" && fqcItem.InspectionStatus != "D"))
             {
                 // 抽驗數量 大於 本批次送驗量
                 if (fqcItem.QcQty > fqcItem.InhouseQty)
@@ -1305,13 +1305,14 @@ namespace AMESCoreStudio.Web.Controllers
             var fqcItem = FqcQuery.Data.FirstOrDefault();
 
             // 免驗||無序號廠驗排除
-            if (fqcItem.InspectionStatus != "C" || fqcItem.InspectionStatus != "D")
+            if (fqcItem.InspectionStatus != "C" && fqcItem.InspectionStatus != "D")
             {
                 // 判斷狀態選擇
                 if (fqcItem.FailQty >= fqcItem.ReQty)
                 {
                     if (model.QaResult == "P" && string.IsNullOrWhiteSpace(model.SpecialPo))
                     {
+                        //return Json(new { data = "請輸入特採單號", success = false });
                         ModelState.AddModelError("error", "請輸入特採單號");
                         return View("FQC007B", model);
                     }
@@ -1327,11 +1328,13 @@ namespace AMESCoreStudio.Web.Controllers
                         {
                             ModelState.AddModelError("error", "抽樣數量不足，不可判定允收");
                             return View("FQC007B", model);
+                            //return Json(new { data = "抽樣數量不足，不可判定允收", success = false });
                         }
                     }
                     //當抽驗數量 小於 抽樣數量就離開
                     else if (fqcItem.QcQty > fqcItem.PassQty + fqcItem.FailQty && model.QaResult == "P")
                     {
+                        //return Json(new { data = "抽樣數量不足，不可判定允收", success = false });
                         ModelState.AddModelError("error", "抽樣數量不足，不可判定允收");
                         return View("FQC007B", model);
                     }
@@ -1365,11 +1368,13 @@ namespace AMESCoreStudio.Web.Controllers
                 //FQC報表自動派送
                 await CheckFQCToMail(fqcInhouseMaster.ItemNo, model.QaResult, model.InhouseNo, model.SeqID);
 
+                //return Json(new { data = "新增成功！", success = true });
                 var _msg = "新增成功！";
                 return RedirectToAction("WindowReload", "Home", new { msg = _msg });
             }
             else
             {
+                //return Json(new { data = result.Msg, success = false });
                 ModelState.AddModelError("error", result.Msg);
             }
             

AMESCoreStudio.Web/Views/FQC/FQC007.cshtml

@@ -9,11 +9,13 @@
         font-weight: bold;
         color: #FF5722;
     }
+
     .textF {
         font-size: 14px;
         font-weight: bold;
         color: #009688;
     }
+
     .aa input {
         font-size: 14px;
         color: #0600f0;
@@ -90,12 +92,12 @@
                     </div>
                 </div>
                 <div class="layui-col-xs1">
-                    <label class="layui-form-label-col" style="text-align:right;">品名：</label>
+                    <label class="layui-form-label-col" style="text-align:right;">品規：</label>
                 </div>
                 <div class="layui-col-xs2">
                     <div class="layui-form-item">
                         <div class="layui-input-block" style="margin-left:auto;">
-                            <label class="layui-form-label" style="text-align: left; width: 150px;">@Model.ModelNo</label>
+                            <label class="layui-form-label" style="text-align: left; width: 150px;">@Model.Description</label>
                         </div>
                     </div>
                 </div>
@@ -538,6 +540,12 @@
         });
         //通过行tool檢視，lay-event="detail"
         function detail(obj) {
+            var data = $("#FQC007Form").serialize();
+            $.ajax({
+                url: "@Url.Action("FQC007AjaxJson", "FQC")",
+                type: "POST",
+                data: data,
+                success: function (result) {
                     let InhouseNo = $("#hInhouseNo").val().trim();
                     let SeqID = $("#hSeqID").val().trim();
                     layui.use('layer', function () {
@@ -556,6 +564,13 @@
                             }
                         });
                     });
+                },
+                error: function (result) {
+                    alert(`呼叫API失敗`);
+                }
+            });
+
+
             //hg.open('FQC細項資料', '/FQC/FQC007V?inhouseNo=' + InhouseNo + '&seqID=' + SeqID + '&boxNo=' + obj, '1000', '500');
         }
 

AMESCoreStudio.Web/Views/FQC/FQC007B.cshtml

@@ -2,7 +2,8 @@
 
 
 @{
-    Layout = "~/Views/Shared/_AMESLayout.cshtml"; }
+    Layout = "~/Views/Shared/_AMESLayout.cshtml";
+}
 
 <style>
     .control-label {
@@ -13,7 +14,7 @@
 <div class="layui-card">
 
 
-    <form enctype="multipart/form-data" method="post" asp-action="FQC007B" class="layui-form">
+    <form id="fqc007BForm" enctype="multipart/form-data" method="post" asp-action="FQC007B" class="layui-form">
         <div asp-validation-summary="ModelOnly" class="text-danger"></div>
         <input type="hidden" asp-for="InhouseNo" value="@Model.InhouseNo" />
         <input type="hidden" asp-for="SeqID" value="@Model.SeqID" />
@@ -108,8 +109,10 @@
     </form>
 </div>
 @section Scripts {
-    @{ await Html.RenderPartialAsync("_ValidationScriptsPartial");
-        await Html.RenderPartialAsync("_FileinputScriptsPartial"); }
+    @{
+        await Html.RenderPartialAsync("_ValidationScriptsPartial");
+        await Html.RenderPartialAsync("_FileinputScriptsPartial");
+    }
 
     <script type="text/javascript">
 
@@ -131,8 +134,6 @@
                 parent.hg.msg(error);
             }
             $("#Special").hide();
-
-
         });
     </script>
 

AMESCoreStudio.Web/wwwroot/lib/layui/css/layui.css

@@ -175,7 +175,7 @@ a {
 }
 
 .layui-disabled, .layui-disabled:hover {
-    color: #d2d2d2 !important;
+    color: #000000 !important;
     cursor: not-allowed !important
 }
 

AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs

@@ -268,7 +268,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                                        PLMECN = q2.PLM_ECN,
                                        ECN_Memo = q2.ECN_Memo,
                                        Note = q2.Note,
-                                       InspectionStatus = q2.InspectionStatus
+                                       InspectionStatus = q2.InspectionStatus,
+                                       Description = q4.Description
                                    };
 
             var query = await q.Distinct().ToListAsync();

AMESCoreStudio.WebApi/DTO/AMES/FqcDto.cs

@@ -73,12 +73,20 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
         public string ItemNo { get; set; }
 
         /// <summary>
-        /// 品名/機種
+        /// 機種
         /// </summary>
         [DataMember]
-        [Display(Name = "品名")]
+        [Display(Name = "機種")]
         public string ModelNo { get; set; }
 
+
+        /// <summary>
+        /// 品規
+        /// </summary>
+        [DataMember]
+        [Display(Name = "品規")]
+        public string Description { get; set; }
+
         /// <summary>
         /// 本批完成量
         /// </summary>