diff --git a/AMESCoreStudio.Web/Controllers/FQCController.cs b/AMESCoreStudio.Web/Controllers/FQCController.cs
index 8b4ae22c..fea10ed0 100644
--- a/AMESCoreStudio.Web/Controllers/FQCController.cs
+++ b/AMESCoreStudio.Web/Controllers/FQCController.cs
@@ -934,8 +934,9 @@ namespace AMESCoreStudio.Web.Controllers
 
             if (result_detail.Success)
             {
-                var _msg = "新增成功！";
-                return RedirectToAction("WindowReload", "Home", new { msg = _msg });
+                ModelState.AddModelError("error", "新增成功！");
+                //return RedirectToAction("WindowReload", "Home", new { msg = _msg });
+                return View("FQC007C", model);
             }
             else
             {
diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs
index ec93ba78..ae72f63c 100644
--- a/AMESCoreStudio.Web/Controllers/PCSController.cs
+++ b/AMESCoreStudio.Web/Controllers/PCSController.cs
@@ -3493,7 +3493,8 @@ namespace AMESCoreStudio.Web.Controllers
                     string ct1 = "";
                     if (standardWorkTimes.Count > 0)
                     {
-                        ct1 = standardWorkTimes.Where(w => w.LineID == line_id).FirstOrDefault().CT.ToString();
+                        if (standardWorkTimes.Where(w => w.LineID == line_id).FirstOrDefault() != null)
+                            ct1 = standardWorkTimes.Where(w => w.LineID == line_id).FirstOrDefault().CT.ToString();
                     }
 
                     wipDataList = wipDataList + "<font color='#FF80FF'>" + unit_name + " - " + line_desc + "</font>" + " - " + "<font color='#0080FF'>" + wip_no + "</font>" + "<font color='#FFC90E'>" + "(" + item_no + ")" + "</font>" + " - " + "<font color='#0080FF'>" + plan_qty + " / " + input_qty + " / " + output_qty + "</font>" + " | " + "<font color='#0080FF'>" + "標準工時: " + "</font>" + ct1 + "<br/>";
@@ -3551,6 +3552,11 @@ namespace AMESCoreStudio.Web.Controllers
 
                             double rate = ((okQty * 1.0) / (okQty + ngQty)) * 100;
 
+                            if (okQty + ngQty == 0)
+                            {
+                                rate = 100;
+                            }
+
                             if (j == rule_sation.Count - 2)
                             {
                                 if (rate <= 90)
diff --git a/AMESCoreStudio.Web/Views/FQC/FQC007.cshtml b/AMESCoreStudio.Web/Views/FQC/FQC007.cshtml
index caa9d066..7472871e 100644
--- a/AMESCoreStudio.Web/Views/FQC/FQC007.cshtml
+++ b/AMESCoreStudio.Web/Views/FQC/FQC007.cshtml
@@ -222,10 +222,10 @@
                 </div>
                 <div class="layui-col-xs2">
                     <div class="layui-input-inline" style="width:80px;">
-                        <input class="layui-input" asp-for="Proved"  onchange="getUserName(this);" />
+                        <input class="layui-input" asp-for="Proved" onchange="getUserName(this);" />
                     </div>
                     <div class="layui-input-inline">
-                        <label class="layui-form-label" id="Proved_Name" style="text-align: left;" >@Model.Proved_Name</label>
+                        <label class="layui-form-label" id="Proved_Name" style="text-align: left;">@Model.Proved_Name</label>
                     </div>
                 </div>
             </div>
@@ -449,7 +449,10 @@
                     maxmin: false,
                     scrollbar: true,
                     moveOut:true,
-                    content: '/FQC/FQC007C?inhouseNo=@Model.h_InhouseNo&seq=@Model.h_SeqID'
+                    content: '/FQC/FQC007C?inhouseNo=@Model.h_InhouseNo&seq=@Model.h_SeqID',
+                    end: function () {
+                        window.location.reload();
+                    }
                 });
             });
             //hg.open('抽驗', '/FQC/FQC007C?inhouseNo=@Model.h_InhouseNo&seq=@Model.h_SeqID', 600, 600);
@@ -514,18 +517,33 @@
             var error = '@Html.ValidationMessage("error")';
             $("#CustomerMedical").attr("disabled", "disabled");
             $("#CustomerVIP").attr("disabled", "disabled");
-        if ($(error).text() != '') {
-            parent.hg.msg(error);
-                };
-                let InhouseNo = $("#hInhouseNo").val().trim();
+
+            if ($(error).text() != '') {
+                     parent.hg.msg(error);
+            };
+
+
+            let InhouseNo = $("#hInhouseNo").val().trim();
             let SeqID = $("#hSeqID").val().trim();
             let Result = '@Model.StatusName';
             if (InhouseNo.length != 0 && SeqID.length != 0 && Result == 'A') {
                 $("#click").show();
                 }
-
+            setupEnterToNext();
     });
 
+        function setupEnterToNext() {
+            // add keydown event for all inputs
+            $(':input').keydown(function (e) {
 
+                if (e.keyCode == 13 /*Enter*/) {
+
+                    // focus next input elements
+                    $(':input:visible:enabled:eq(' + ($(':input:visible:enabled').index(this) + 1) + ')').focus();
+                    e.preventDefault();
+                }
+
+            });
+        }
     </script>
 }
\ No newline at end of file
diff --git a/AMESCoreStudio.Web/Views/FQC/FQC007C.cshtml b/AMESCoreStudio.Web/Views/FQC/FQC007C.cshtml
index 70caa7bb..46a9e0e0 100644
--- a/AMESCoreStudio.Web/Views/FQC/FQC007C.cshtml
+++ b/AMESCoreStudio.Web/Views/FQC/FQC007C.cshtml
@@ -164,9 +164,19 @@
         $(document).ready(function () {
             var error = '@Html.ValidationMessage("error")';
             if ($(error).text() != '') {
-                parent.hg.msg(error);
+                
+                if ($(error).text() == '新增成功！') {
+                    add();
+                }
+                else
+                    parent.hg.msg(error);
             }
         });
+
+    function add() {
+                $("#BarcodeNo").val('');
+                $("#BarcodeNo").focus();
+        }
     </script>