From f6d6e88d87e806ac42b9cfb2ebed87ed2a1b8c0f Mon Sep 17 00:00:00 2001
From: Sai <Sai@hotmail.com>
Date: Sun, 13 Aug 2023 17:40:30 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E6=8E=A1=E8=B3=BC=E7=89=B9=E6=8E=A1?=
 =?UTF-8?q?=E5=96=AE=E9=A0=88=E9=A1=AF=E7=A4=BA=E6=96=BCFQC=E6=8A=BD?=
 =?UTF-8?q?=E9=A9=97=E5=85=A7=E9=A0=81=202.=20=E5=87=BA=E8=B2=A8=E6=AA=A2?=
 =?UTF-8?q?=E9=A9=97=E4=BD=9C=E6=A5=AD-FQC=E7=AE=A1=E7=90=86=E6=A8=A1?=
 =?UTF-8?q?=E7=B5=84-FQC=E6=8A=BD=E9=A9=97=E4=BD=9C=E6=A5=AD=5F=E8=BC=B8?=
 =?UTF-8?q?=E5=85=A5=E6=8A=BD=E9=A9=97=E5=BA=8F=E8=99=9F=E7=94=A8=E5=88=B7?=
 =?UTF-8?q?=E6=A7=8D=E5=88=B7=E5=85=A5=E5=87=BA=E8=B2=A8=E5=BA=8F=E8=99=9F?=
 =?UTF-8?q?=E6=99=82=EF=BC=8C=E6=B8=B8=E6=A8=99=E4=B8=8D=E6=9C=83=E7=B6=AD?=
 =?UTF-8?q?=E6=8C=81=E5=9C=A8=E5=90=8C=E4=B8=80=E6=AC=84=E4=BD=8D=E4=B8=8A?=
 =?UTF-8?q?=EF=BC=8C=E6=AF=8F=E5=88=B7=E4=B8=80=E7=AD=86=EF=BC=8C=E6=9C=83?=
 =?UTF-8?q?=E8=B7=B3=E6=8E=89=E8=87=B3=E5=8F=A6=E4=B8=80=E6=AC=84=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/FQCController.cs              |  9 +++++++-
 AMESCoreStudio.Web/Views/FQC/FQC007.cshtml    | 22 ++++++++++++-------
 AMESCoreStudio.Web/Views/FQC/FQC007C.cshtml   | 11 +++++-----
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/AMESCoreStudio.Web/Controllers/FQCController.cs b/AMESCoreStudio.Web/Controllers/FQCController.cs
index f283b2a5..03b0f57c 100644
--- a/AMESCoreStudio.Web/Controllers/FQCController.cs
+++ b/AMESCoreStudio.Web/Controllers/FQCController.cs
@@ -1068,6 +1068,10 @@ namespace AMESCoreStudio.Web.Controllers
         {
             await GetStatusTypeSelect();
             await GetNGGroupSelect();
+
+            // 回傳前端清空欄位
+            string InputType = string.Empty;
+
             if (string.IsNullOrWhiteSpace(model.BarcodeNo) &&
                 string.IsNullOrWhiteSpace(model.BoxNo) &&
                 string.IsNullOrWhiteSpace(model.ExtraBarcodeNo))
@@ -1081,14 +1085,17 @@ namespace AMESCoreStudio.Web.Controllers
             if (!string.IsNullOrWhiteSpace(model.BarcodeNo))
             {
                 result_BarCodeInfo = await _fqcApi.GetBarcodeInfoesByNo(model.BarcodeNo);
+                InputType = "BarcodeNo";
             }
             else if (!string.IsNullOrWhiteSpace(model.ExtraBarcodeNo))
             {
                 result_BarCodeInfo = await _fqcApi.GetBarcodeInfoesByExtraNo(model.ExtraBarcodeNo);
+                InputType = "ExtraBarcodeNo";
             }
             else if (!string.IsNullOrWhiteSpace(model.BoxNo))
             {
                 result_BarCodeInfo = await _fqcApi.GetBarcodeInfoesByBoxNo(model.BoxNo);
+                InputType = "BoxNo";
             }
 
             if (result_BarCodeInfo.Count == 0)
@@ -1223,7 +1230,7 @@ namespace AMESCoreStudio.Web.Controllers
             if (result_detail.Success)
             {
                 ModelState.AddModelError("error", "新增成功！");
-                //return RedirectToAction("WindowReload", "Home", new { msg = _msg });
+                ModelState.AddModelError("InputType", InputType);
                 return View("FQC007C", model);
             }
             else
diff --git a/AMESCoreStudio.Web/Views/FQC/FQC007.cshtml b/AMESCoreStudio.Web/Views/FQC/FQC007.cshtml
index 1bfe5e1e..7e5bb46e 100644
--- a/AMESCoreStudio.Web/Views/FQC/FQC007.cshtml
+++ b/AMESCoreStudio.Web/Views/FQC/FQC007.cshtml
@@ -127,8 +127,8 @@
                 <div class="layui-col-xs1">
                     <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.CustomerNo</label>
-                            </div>*@
+                    <label class="layui-form-label" style="text-align: left; width: 150px;">@Model.CustomerNo</label>
+                    </div>*@
                     </div>
                 </div>
                 <div class="layui-col-xs1">
@@ -151,12 +151,12 @@
                     <input style="width:200px;display:inline;" type="text" class="layui-input" asp-for="QuotDescription" />
                     <input type="hidden" asp-action="CritID" value="@Model.CritID" />
                     @*<a class="layui-btn layui-btn-sm layui-btn-normal" id="attachment" title="抽驗係數" lay-submit lay-filter="attachment" onclick="openQC()">
-                        <i class="layui-icon layui-icon-sm" style="font-size: 30px; color: #1E9FFF;">&#xe60a;</i>
-                        </a>*@
+                <i class="layui-icon layui-icon-sm" style="font-size: 30px; color: #1E9FFF;">&#xe60a;</i>
+                </a>*@
                     <a title="抽驗係數" lay-submit lay-filter="attachment" onclick="openQC()"><i class="layui-icon layui-icon-form" style="font-size: 30px; color: #ff0000;"></i></a>
                 </div>
                 @*    <div class="layui-col-xs1" style="text-align:left;" id="critIDDIV">
-                    </div>*@
+            </div>*@
                 <div class="layui-col-xs1 textP">
                     <label class="layui-form-label-col" style="text-align:right;">
                         本批完成量：
@@ -222,7 +222,7 @@
                 <div class="layui-col-xs1">
                     <label class="layui-form-label-col" style="text-align:right;">PLM_ECN：</label>
                 </div>
-                <div class="layui-col-xs3">
+                <div class="layui-col-xs2">
                     <input type="text" readonly style="display: initial;width:80%" class="layui-input" asp-for="PLMECN" />
                     <a onclick="GetPLM_ECN();" class="layui-btn layui-btn-sm layui-btn-normal" style="padding: 0 5px;" title="刷新PLM_ECN">
                         <i class="layui-icon layui-icon-sm">&#xe669;</i>
@@ -250,6 +250,12 @@
                         <label style="text-align: left; width: 100px;">@Model.StatusName</label>
                     </label>
                 </div>
+                <div class="layui-col-xs2  textF">
+                    <label class="layui-form-label-col" style="text-align:right;">
+                        特採單：
+                        <label style="text-align: left; width: 100px;">@Model.SpecialPo</label>
+                    </label>
+                </div>
             </div>
             <div class="layui-row">
                 <div class="layui-col-xs1">
@@ -276,8 +282,8 @@
                 </div>
                 <div class="layui-col-xs2">
                     @*   <div class="layui-input-inline" style="width:80px;">
-                        <input class="layui-input" type="text" asp-for="UpdateUser" onchange="getUserName(this);" />
-                        </div>*@
+                <input class="layui-input" type="text" asp-for="UpdateUser" onchange="getUserName(this);" />
+                </div>*@
                     <div class="layui-input-inline">
                         <label class="layui-form-label" id="UpdateUser_Name" style="text-align: left;">@Model.UpdateUser_Name</label>
                     </div>
diff --git a/AMESCoreStudio.Web/Views/FQC/FQC007C.cshtml b/AMESCoreStudio.Web/Views/FQC/FQC007C.cshtml
index e0af1284..f125a54a 100644
--- a/AMESCoreStudio.Web/Views/FQC/FQC007C.cshtml
+++ b/AMESCoreStudio.Web/Views/FQC/FQC007C.cshtml
@@ -184,18 +184,19 @@
 
             var error = '@Html.ValidationMessage("error")';
             if ($(error).text() != '') {
-
                 if ($(error).text() == '新增成功！') {
-                    add();
+                    var InputType = '@Html.ValidationMessage("InputType")';
+                    console.log($(InputType).text());
+                    add($(InputType).text());
                 }
                 else
                     parent.hg.msg(error);
             }
         });
 
-        function add() {
-            $("#BarcodeNo").val('');
-            $("#BarcodeNo").focus();
+        function add(InputType) {
+            $(`#${InputType}`).val('');
+            $(`#${InputType}`).focus();
         }
     </script>