1

source/DeviceLibrary/acSingleStore/AutomaticBaiting.cs

@@ -255,7 +255,7 @@ namespace OnlineStore.DeviceLibrary
             if (IsNeedStartInout)
             if (IsNeedStartInout)
             {
             {
                 StoreMove.NextMoveStep(StoreMoveStep.AUTO_R03_AutoAxisHome);
                 StoreMove.NextMoveStep(StoreMoveStep.AUTO_R03_AutoAxisHome);
-                int speed = StoreManager.Config.BatchAxis_SlowSpeed * 2;
+                int speed = StoreManager.Config.BatchAxis_TargetSpeed ;
                 LogUtil.info(Name + "复位中：检测是否有料盘，批量轴匀速上升【" + speed + "】");
                 LogUtil.info(Name + "复位中：检测是否有料盘，批量轴匀速上升【" + speed + "】");
                 ACAxisSpeedMove(StoreManager.Config.Batch_Axis, speed, IO_Type.TrayCheck_LoadMaterial);
                 ACAxisSpeedMove(StoreManager.Config.Batch_Axis, speed, IO_Type.TrayCheck_LoadMaterial);
             }
             }

source/DeviceLibrary/acSingleStore/AutomaticBaiting_Partial.cs

@@ -290,7 +290,7 @@ namespace OnlineStore.DeviceLibrary
             else
             else
             {
             {
                 TimeSpan span = DateTime.Now - AxisResetMoveTime;
                 TimeSpan span = DateTime.Now - AxisResetMoveTime;
-                if (AutoBaitingStatus.Equals(StoreRunStatus.Busy) && span.TotalSeconds > 3)
+                if ((AutoBaitingStatus.Equals(StoreRunStatus.Busy)||AutoBaitingStatus.Equals(StoreRunStatus.Reset)) && span.TotalSeconds > 3)
                 //if (AutoBaitingStatus.Equals(StoreRunStatus.Busy) && StoreMove.CanWhileCount > 0)
                 //if (AutoBaitingStatus.Equals(StoreRunStatus.Busy) && StoreMove.CanWhileCount > 0)
                 {
                 {
                     AxisResetMoveTime = DateTime.Now;
                     AxisResetMoveTime = DateTime.Now;