diff --git a/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs b/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs
index c07b458..76cda49 100644
--- a/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs
@@ -657,15 +657,16 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                             Msg += "NgInfo_Error：" + result_NgInfo.Msg + "<br/>";
                         }
 
-                        // 判斷是否為第一站且PASS
+                        // 過站為PASS狀態
                         if (barCodeCheckDto.ruleStatus == "P")
                         {
-                            BarcodeStationController barcodeStationController = new BarcodeStationController(_context);
-                            var CheckBarcodeStation = barcodeStationController.GetBarcodeStationByBarCodeID(barCodeCheckDto.barcodeID);
-                            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")
                             {
-                                if (CheckNowFirstStation(barCodeCheckDto.wipNo, barCodeCheckDto.unitNo, barCodeCheckDto.stationID) == "Y")
+                                BarcodeStationController barcodeStationController = new BarcodeStationController(_context);
+                                var CheckBarcodeStation = barcodeStationController.GetBarcodeStationByBarCodeID(barCodeCheckDto.barcodeID);
+                                if (CheckBarcodeStation.Result.Value.Where(w => w.RuleStatus == "P" && w.WipID == barCodeCheckDto.wipID
+                                                                                && w.StationID == barCodeCheckDto.stationID).Count() == 1)
                                 {
                                     WipInfosController wipInfosController = new WipInfosController(_context);
                                     var result_wipInfos = await wipInfosController.PutWipinfoByCompleteQTY(barCodeCheckDto.wipID);