1.修改报废作业REP006,增加判断重复转出，修改作业原因必填

2.修改转出作业REP007,增加判断重复转出，修改作业原因必填

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;
 
+            if (model.OPUserNo != "" && model.OPUserNo != null)
+            {
                 var op_user = await _sysApi.GetUserInfoByUserNo(model.OPUserNo);
                 if (op_user != null)
                 {
                     model.barcodeQngInfo.OperatorID = op_user.UserID;
                 }
+            }
 
+            if (model.IPQAUserNo != "" && model.IPQAUserNo != null)
+            {
                 var ipqa_user = await _sysApi.GetUserInfoByUserNo(model.IPQAUserNo);
                 if (ipqa_user != null)
                 {
                     model.barcodeQngInfo.IPQAID = ipqa_user.UserID;
                 }
+            }
 
+            if (model.PEUserNo != "" && model.PEUserNo != null)
+            {
                 var pe_user = await _sysApi.GetUserInfoByUserNo(model.PEUserNo);
                 if (pe_user != null)
                 {
                     model.barcodeQngInfo.PEID = pe_user.UserID;
                 }
+            }
 
+            if (model.ManagerUserNo != "" && model.ManagerUserNo != null)
+            {
                 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,10 +1477,14 @@ namespace AMESCoreStudio.Web.Controllers
                 var _msg = "保存成功！";
                 return RedirectToAction("Refresh", "Home", new { msg = _msg });
             }
-
+            else
+            {
+                ModelState.AddModelError("error", result.Msg);
                 return View("REP006C", model);
             }
 
+        }
+
         public IActionResult REP007()
         {
             return View();
@@ -1507,29 +1524,41 @@ namespace AMESCoreStudio.Web.Controllers
             model.barcodeQngInfo.StationID = model.barcodeInfo.StationID;
             model.barcodeQngInfo.UnitNo = model.barcodeInfo.GetWipInfo.UnitNO;
 
+            if (model.OPUserNo != "" && model.OPUserNo != null)
+            {
                 var op_user = await _sysApi.GetUserInfoByUserNo(model.OPUserNo);
                 if (op_user != null)
                 {
                     model.barcodeQngInfo.OperatorID = op_user.UserID;
                 }
+            }
 
+            if (model.IPQAUserNo != "" && model.IPQAUserNo != null)
+            {
                 var ipqa_user = await _sysApi.GetUserInfoByUserNo(model.IPQAUserNo);
                 if (ipqa_user != null)
                 {
                     model.barcodeQngInfo.IPQAID = ipqa_user.UserID;
                 }
+            }
 
+            if (model.PEUserNo != "" && model.PEUserNo != null)
+            {
                 var pe_user = await _sysApi.GetUserInfoByUserNo(model.PEUserNo);
                 if (pe_user != null)
                 {
                     model.barcodeQngInfo.PEID = pe_user.UserID;
                 }
+            }
 
+            if (model.ManagerUserNo != "" && model.ManagerUserNo != null)
+            {
                 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 = "C";
@@ -1541,9 +1570,12 @@ namespace AMESCoreStudio.Web.Controllers
                 var _msg = "保存成功！";
                 return RedirectToAction("Refresh", "Home", new { msg = _msg });
             }
-
+            else
+            {
+                ModelState.AddModelError("error", result.Msg);
                 return View("REP007C", model);
             }
+        }
 
         [ResponseCache(Duration = 0)]
         [HttpGet]

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;
 

AMESCoreStudio.WebApi/Models/AMES/BarcodeQngInfo.cs

@@ -88,6 +88,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// <summary>
         /// 作業原因
         /// </summary>
+        [Required]
         [DataMember]
         [Display(Name = "作業原因")]
         [Column("NG_REASON")]