diff --git a/AMESCoreStudio.Web/Controllers/REPController.cs b/AMESCoreStudio.Web/Controllers/REPController.cs
index ee4ed7a9..5b2ffcd8 100644
--- a/AMESCoreStudio.Web/Controllers/REPController.cs
+++ b/AMESCoreStudio.Web/Controllers/REPController.cs
@@ -1430,29 +1430,42 @@ namespace AMESCoreStudio.Web.Controllers
             model.barcodeQngInfo.StationID = model.barcodeInfo.StationID;
             model.barcodeQngInfo.UnitNo = model.barcodeInfo.GetWipInfo.UnitNO;
 
-            var op_user = await _sysApi.GetUserInfoByUserNo(model.OPUserNo);
-            if (op_user != null)
+            if (model.OPUserNo != "" && model.OPUserNo != null)
             {
-                model.barcodeQngInfo.OperatorID = op_user.UserID;
+                var op_user = await _sysApi.GetUserInfoByUserNo(model.OPUserNo);
+                if (op_user != null)
+                {
+                    model.barcodeQngInfo.OperatorID = op_user.UserID;
+                }
             }
 
-            var ipqa_user = await _sysApi.GetUserInfoByUserNo(model.IPQAUserNo);
-            if (ipqa_user != null)
+            if (model.IPQAUserNo != "" && model.IPQAUserNo != null)
             {
-                model.barcodeQngInfo.IPQAID = ipqa_user.UserID;
+                var ipqa_user = await _sysApi.GetUserInfoByUserNo(model.IPQAUserNo);
+                if (ipqa_user != null)
+                {
+                    model.barcodeQngInfo.IPQAID = ipqa_user.UserID;
+                }
             }
 
-            var pe_user = await _sysApi.GetUserInfoByUserNo(model.PEUserNo);
-            if (pe_user != null)
+            if (model.PEUserNo != "" && model.PEUserNo != null)
             {
-                model.barcodeQngInfo.PEID = pe_user.UserID;
+                var pe_user = await _sysApi.GetUserInfoByUserNo(model.PEUserNo);
+                if (pe_user != null)
+                {
+                    model.barcodeQngInfo.PEID = pe_user.UserID;
+                }
             }
 
-            var manager_user = await _sysApi.GetUserInfoByUserNo(model.ManagerUserNo);
-            if (manager_user != null)
+            if (model.ManagerUserNo != "" && model.ManagerUserNo != null)
             {
-                model.barcodeQngInfo.ManagerID = manager_user.UserID;
+                var manager_user = await _sysApi.GetUserInfoByUserNo(model.ManagerUserNo);
+                if (manager_user != null)
+                {
+                    model.barcodeQngInfo.ManagerID = manager_user.UserID;
+                }
             }
+
             model.barcodeQngInfo.CreateUserID = user_id;
             model.barcodeQngInfo.CreateDate = System.DateTime.Now;
             model.barcodeQngInfo.RuleStatus = "S";
@@ -1464,8 +1477,12 @@ namespace AMESCoreStudio.Web.Controllers
                 var _msg = "保存成功！";
                 return RedirectToAction("Refresh", "Home", new { msg = _msg });
             }
+            else
+            {
+                ModelState.AddModelError("error", result.Msg);
+                return View("REP006C", model);
+            }
 
-            return View("REP006C", model);
         }
 
         public IActionResult REP007()
@@ -1507,28 +1524,40 @@ namespace AMESCoreStudio.Web.Controllers
             model.barcodeQngInfo.StationID = model.barcodeInfo.StationID;
             model.barcodeQngInfo.UnitNo = model.barcodeInfo.GetWipInfo.UnitNO;
 
-            var op_user = await _sysApi.GetUserInfoByUserNo(model.OPUserNo);
-            if (op_user != null)
+            if (model.OPUserNo != "" && model.OPUserNo != null)
             {
-                model.barcodeQngInfo.OperatorID = op_user.UserID;
+                var op_user = await _sysApi.GetUserInfoByUserNo(model.OPUserNo);
+                if (op_user != null)
+                {
+                    model.barcodeQngInfo.OperatorID = op_user.UserID;
+                }
             }
 
-            var ipqa_user = await _sysApi.GetUserInfoByUserNo(model.IPQAUserNo);
-            if (ipqa_user != null)
+            if (model.IPQAUserNo != "" && model.IPQAUserNo != null)
             {
-                model.barcodeQngInfo.IPQAID = ipqa_user.UserID;
+                var ipqa_user = await _sysApi.GetUserInfoByUserNo(model.IPQAUserNo);
+                if (ipqa_user != null)
+                {
+                    model.barcodeQngInfo.IPQAID = ipqa_user.UserID;
+                }
             }
 
-            var pe_user = await _sysApi.GetUserInfoByUserNo(model.PEUserNo);
-            if (pe_user != null)
+            if (model.PEUserNo != "" && model.PEUserNo != null)
             {
-                model.barcodeQngInfo.PEID = pe_user.UserID;
+                var pe_user = await _sysApi.GetUserInfoByUserNo(model.PEUserNo);
+                if (pe_user != null)
+                {
+                    model.barcodeQngInfo.PEID = pe_user.UserID;
+                }
             }
 
-            var manager_user = await _sysApi.GetUserInfoByUserNo(model.ManagerUserNo);
-            if (manager_user != null)
+            if (model.ManagerUserNo != "" && model.ManagerUserNo != null)
             {
-                model.barcodeQngInfo.ManagerID = manager_user.UserID;
+                var manager_user = await _sysApi.GetUserInfoByUserNo(model.ManagerUserNo);
+                if (manager_user != null)
+                {
+                    model.barcodeQngInfo.ManagerID = manager_user.UserID;
+                }
             }
             model.barcodeQngInfo.CreateUserID = user_id;
             model.barcodeQngInfo.CreateDate = System.DateTime.Now;
@@ -1541,8 +1570,11 @@ namespace AMESCoreStudio.Web.Controllers
                 var _msg = "保存成功！";
                 return RedirectToAction("Refresh", "Home", new { msg = _msg });
             }
-
-            return View("REP007C", model);
+            else
+            {
+                ModelState.AddModelError("error", result.Msg);
+                return View("REP007C", model);
+            }
         }
 
         [ResponseCache(Duration = 0)]
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeQngInfoesController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeQngInfoesController.cs
index fad80fd3..cbbb84bc 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeQngInfoesController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeQngInfoesController.cs
@@ -382,6 +382,26 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         {
             ResultModel<BarcodeQngInfo> result = new ResultModel<BarcodeQngInfo>();
 
+            IQueryable<BarcodeQngInfo> q = _context.BarcodeQngInfos;
+
+            q = q.Where(p => p.BarcodeID.Equals(barcodeQngInfo.BarcodeID) && p.RuleStatus.Equals(barcodeQngInfo.RuleStatus));
+
+            var qng_info = await q.ToListAsync();
+            if (qng_info.Count > 0)
+            {
+                result.Success = false;
+                if (barcodeQngInfo.RuleStatus == "C")
+                {
+                    result.Msg = "重複轉出";
+                }
+                else
+                {
+                    result.Msg = "重複報廢";
+                }
+                
+                return result;
+            }
+
             Helper helper = new Helper(_context);
             barcodeQngInfo.QngID = helper.GetIDKey("QNG_ID").Result;
 
diff --git a/AMESCoreStudio.WebApi/Models/AMES/BarcodeQngInfo.cs b/AMESCoreStudio.WebApi/Models/AMES/BarcodeQngInfo.cs
index 704181c2..bee0ef4e 100644
--- a/AMESCoreStudio.WebApi/Models/AMES/BarcodeQngInfo.cs
+++ b/AMESCoreStudio.WebApi/Models/AMES/BarcodeQngInfo.cs
@@ -88,6 +88,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// <summary>
         /// 作業原因
         /// </summary>
+        [Required]
         [DataMember]
         [Display(Name = "作業原因")]
         [Column("NG_REASON")]