diff --git a/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs b/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs
index 1f5d2718..debe99d5 100644
--- a/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs
@@ -234,7 +234,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                         {
 
                             var MaterialKps = (await materialKpController.GetMaterialKpByItemID(itemID)).ToList();
-                            MaterialKps = MaterialKps.Where(w => w.StationType == barCodeCheckDto.unitNo).OrderBy(o => o.KpSeq).ToList();
+                            MaterialKps = MaterialKps.OrderBy(o => o.KpSeq).ToList();
                             if (MaterialKps.Count == 0)
                             {
                                 resultModel.Msg = "工單號碼【" + barCodeCheckDto.wipNo + "】找不到相關Key Parts對應";
@@ -349,11 +349,17 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                                 CreateUserID = barCodeCheckDto.userID
                             });
                         }
+                        else
+                        {
+                            resultModel.Msg = $"內部條碼【{barCodeCheckDto.barcode}】找不到已綁定Kp序號【{KPs.oldInputData}】";
+                        }
                     }
 
                     if (!string.IsNullOrWhiteSpace(resultModel.Msg))
+                    {
+                        resultModel.Success = false;
                         return resultModel;
-
+                    }
                     // 將InputItem清空
                     barCodeCheckDto.inputItems = new List<BarCodeCheckDto.inputItem>();
                 }