diff --git a/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs b/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs
index 76d3098..c07b458 100644
--- a/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs
@@ -360,7 +360,6 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                         return resultModel;
                     }
 
-
                     // 將InputItem清空
                     barCodeCheckDto.inputItems = new List<BarCodeCheckDto.inputItem>();
                 }
@@ -381,7 +380,6 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                     var BarCodeItems = _context.BarcodeItems.Where(w => w.BarcodeID == barCodeCheckDto.barcodeID && w.WipID == barCodeCheckDto.wipID);
                     var Stations = _context.Stationses.Where(w => w.UnitNo == station.Value.FirstOrDefault().UnitNo);
 
-
                     var BarCodeItemsQty = BarCodeItems.Where(w => Stations.Any(s => s.StationID == w.StationID)).Count();
 
                     // WipKp DB 設定綁定組件數量 + 製程判斷
@@ -664,7 +662,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                         {
                             BarcodeStationController barcodeStationController = new BarcodeStationController(_context);
                             var CheckBarcodeStation = barcodeStationController.GetBarcodeStationByBarCodeID(barCodeCheckDto.barcodeID);
-                            if (CheckBarcodeStation.Result.Value.Where(w => w.RuleStatus == "P").Count() == 1)
+                            if (CheckBarcodeStation.Result.Value.Where(w => w.RuleStatus == "P" && w.WipID == barCodeCheckDto.wipID
+                                                                                                && w.StationID == barCodeCheckDto.stationID).Count() == 1)
                             {
                                 if (CheckNowFirstStation(barCodeCheckDto.wipNo, barCodeCheckDto.unitNo, barCodeCheckDto.stationID) == "Y")
                                 {