取出料盘修改

source/DeviceLibrary/acSingleStore/AutomaticBaiting.cs

@@ -717,8 +717,8 @@ namespace OnlineStore.DeviceLibrary
                     StoreMove.WaitList.Add(WaitResultInfo.WaitBatchAxisStop(Config.Batch_Axis, Config.BatchAxis_P2, IO_Type.OutCheck, IO_VALUE.LOW));
                     StoreMove.WaitList.Add(WaitResultInfo.WaitBatchAxisStop(Config.Batch_Axis, Config.BatchAxis_P2, IO_Type.OutCheck, IO_VALUE.LOW));
                     BatchAxisController.StartCheck(IO_Type.OutCheck, IO_VALUE.LOW);
                     BatchAxisController.StartCheck(IO_Type.OutCheck, IO_VALUE.LOW);
                     StoreManager.Config.Batch_Axis.TargetPosition = Config.BatchAxis_P2;
                     StoreManager.Config.Batch_Axis.TargetPosition = Config.BatchAxis_P2;
-                    int speed = Config.BatchAxis_SlowSpeed;
-                    ACServerManager.AbsMove(Config.Batch_Axis.DeviceName, Config.Batch_Axis.GetAxisValue(), Config.BatchAxis_OutMaxValue, speed);
+                    //int speed = Config.BatchAxis_SlowSpeed;
+                    ACServerManager.AbsMove(Config.Batch_Axis.DeviceName, Config.Batch_Axis.GetAxisValue(), Config.BatchAxis_OutMaxValue, Config.BatchAxis_P2_Speed);
                     //    ACAxisAbsMove(StoreManager.Config.Batch_Axis, StoreManager.Config.BatchAxis_P2, StoreManager.Config.BatchAxis_P2_Speed);
                     //    ACAxisAbsMove(StoreManager.Config.Batch_Axis, StoreManager.Config.BatchAxis_P2, StoreManager.Config.BatchAxis_P2_Speed);
                 }
                 }
             }else if (StoreMove.MoveStep.Equals(StoreMoveStep.AUTO_O01_BatchAxisDown))
             }else if (StoreMove.MoveStep.Equals(StoreMoveStep.AUTO_O01_BatchAxisDown))

source/DeviceLibrary/acSingleStore/AutomaticBaiting_Partial.cs

@@ -293,7 +293,7 @@ namespace OnlineStore.DeviceLibrary
                 bool MoveEnd = ACServerManager.GetBusyStatus(wait.AxisInfo.DeviceName, wait.AxisInfo.GetAxisValue()).Equals(0);
                 bool MoveEnd = ACServerManager.GetBusyStatus(wait.AxisInfo.DeviceName, wait.AxisInfo.GetAxisValue()).Equals(0);
                 int outCount = ACServerManager.GetActualtPosition(wait.AxisInfo.DeviceName, wait.AxisInfo.GetAxisValue());
                 int outCount = ACServerManager.GetActualtPosition(wait.AxisInfo.DeviceName, wait.AxisInfo.GetAxisValue());
                 int errorCount = Math.Abs(outCount - wait.TargetPosition);
                 int errorCount = Math.Abs(outCount - wait.TargetPosition);
-                if (MoveEnd && errorCount < wait.AxisInfo.CanErrorCountMax)
+                if (MoveEnd && (errorCount < wait.AxisInfo.CanErrorCountMax))
                 {
                 {
                     result = true;
                     result = true;
                 }
                 }