状态判断bug

Service/Execute/Step/CarPrepareState.cs

@@ -114,21 +114,21 @@ public class CarPrepareState : IState
             () => machine.VehiclesInPlaceFlag, () =>
             {
                 var result = TBoxApi.GetCarInfo(machine.RfidReadModel.VelVin);
-                bool keyStatus = false;
-                bool breakStatus = false;
-                bool nStatus = false;
-                TboxCarInfoModel tboxCarInfoModel = result.Result;
-                if (StaticStationInfo.TboxStateFlameout ||
-                    StaticStationInfo.TboxStateBreak ||
-                    StaticStationInfo.TboxStateN)
+                int succCount = 0;
+                List<bool> succL = new List<bool>()
                 {
+                    StaticStationInfo.TboxStateFlameout, StaticStationInfo.TboxStateBreak, StaticStationInfo.TboxStateN
+                };
+                var successCount = succL.Where(i => i).Count();
+                TboxCarInfoModel tboxCarInfoModel = result.Result;
+
                 var status = tboxCarInfoModel?.CarStatus;
 
                 if (StaticStationInfo.TboxStateFlameout)
                 {
                     if (status?.Keys == 0)
                     {
-                            keyStatus = true;
+                        succCount++;
                     }
                 }
 
@@ -136,7 +136,7 @@ public class CarPrepareState : IState
                 {
                     if (status?.Break == 1)
                     {
-                            breakStatus = true;
+                        succCount++;
                     }
                 }
 
@@ -144,18 +144,12 @@ public class CarPrepareState : IState
                 {
                     if (status?.Gear == 0)
                     {
-                            nStatus = true;
-                        }
+                        succCount++;
                     }
                 }
-                else
-                {
-                    keyStatus = true;
-                    breakStatus = true;
-                    nStatus = true;
-                }
 
-                if (keyStatus && breakStatus && nStatus)
+
+                if (succCount == successCount)
                 {
                     machine.VehiclesInPlaceFlag = true;
                     //写入口等 ：红灯
@@ -376,7 +370,7 @@ public class CarPrepareState : IState
                 SwapOrderBatteryInfo orderBatteryInfo = null;
                 if (swapAmtOrder != null)
                 {
-                    orderBatteryInfo = _CommonMgr.SelectPackArm(swapAmtOrder,machine);
+                    orderBatteryInfo = _CommonMgr.SelectPackArm(swapAmtOrder, machine);
                 }
                 else
                 {

Service/Execute/Step/DoSwappingState.cs

@@ -416,20 +416,20 @@ public class DoSwappingState : IState
                 var result = TBoxApi.GetCarInfo(machine.RfidReadModel.VelVin);
                 TboxCarInfoModel tboxCarInfoModel = result.Result;
 
-                bool keyStatus = false;
-                bool breakStatus = false;
-                bool nStatus = false;
-                if (StaticStationInfo.TboxStateFlameout ||
-                    StaticStationInfo.TboxStateBreak ||
-                    StaticStationInfo.TboxStateN)
+                int succCount = 0;
+                List<bool> succL = new List<bool>()
                 {
+                    StaticStationInfo.TboxStateFlameout, StaticStationInfo.TboxStateBreak, StaticStationInfo.TboxStateN
+                };
+                var successCount = succL.Where(i => i).Count();
+
                 var status = tboxCarInfoModel?.CarStatus;
 
                 if (StaticStationInfo.TboxStateFlameout)
                 {
                     if (status?.Keys == 0)
                     {
-                            keyStatus = true;
+                        succCount++;
                     }
                 }
 
@@ -437,7 +437,7 @@ public class DoSwappingState : IState
                 {
                     if (status?.Break == 1)
                     {
-                            breakStatus = true;
+                        succCount++;
                     }
                 }
 
@@ -445,19 +445,11 @@ public class DoSwappingState : IState
                 {
                     if (status?.Gear == 0)
                     {
-                            nStatus = true;
+                        succCount++;
                     }
                 }
-                }
-                else
-                {
-                    keyStatus = true;
-                    breakStatus = true;
-                    nStatus = true;
-                }
-                
                 
-                if (keyStatus && breakStatus && nStatus)
+                if (succCount==successCount)
                 {
                     machine.VehiclesInPlace2Flag = true;
                 }