diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs
index a09c6aeb..ec93ba78 100644
--- a/AMESCoreStudio.Web/Controllers/PCSController.cs
+++ b/AMESCoreStudio.Web/Controllers/PCSController.cs
@@ -3784,7 +3784,10 @@ namespace AMESCoreStudio.Web.Controllers
             if (!string.IsNullOrWhiteSpace(model.ExtraBarCodeNo))
             {
                 result_barcodeinfo = _fqcApi.GetBarcodeInfoesByExtraNo(model.ExtraBarCodeNo).InvokeAsync().Result.FirstOrDefault();
-                model.BarCodeNo = result_barcodeinfo.BarcodeNo;
+                if (result_barcodeinfo != null)
+                {
+                    model.BarCodeNo = result_barcodeinfo.BarcodeNo;
+                }
             }
 
             result_barcodeinfo = _pcsApi.GetBarcodeInfoesByNo(model.BarCodeNo).InvokeAsync().Result.FirstOrDefault();
@@ -4158,6 +4161,11 @@ namespace AMESCoreStudio.Web.Controllers
                 }
 
                 var q1 = await _pcsApi.GetBarcodeInfoesByWipNo(model.WipNo);
+                if (q1.Count() == 0)
+                {
+                    ModelState.AddModelError("error", "工單號碼【" + model.WipNo + "】，尚未投入");
+                    return View(model);
+                }
 
                 foreach (var item in q1)
                 {