批量轴复位修改

source/DeviceLibrary/manager/model/DeviceStep.cs

@@ -818,9 +818,9 @@ namespace OnlineStore.DeviceLibrary
         /// </summary>
         IBR02_LineRun,
         /// <summary>
-        /// 入料模块复位：料串信号一致，阻挡气缸上升
+        /// 入料模块复位：批量轴直接走到待机点P1
         /// </summary>
-        IBR03_StopUp,
+        IBR03_BatchToP1,
         /// <summary>
         /// 入料模块复位：批量轴原点返回
         /// </summary>

source/DeviceLibrary/storeBean/inputBean/BatchMoveBean.cs

@@ -174,15 +174,21 @@ namespace OnlineStore.DeviceLibrary
                 //}
                 //else
                 //{
-                    MoveInfo.NextMoveStep(StepEnum.IBR02_LineRun);
-                    WorkLog("复位：链条正转3秒");
-                    LineRun(MoveInfo);
-                    MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(3000));
+                MoveInfo.NextMoveStep(StepEnum.IBR02_LineRun);
+                WorkLog("复位：链条正转3秒");
+                LineRun(MoveInfo);
+                MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(3000));
                 //}
             }
             else if (MoveInfo.IsStep(StepEnum.IBR02_LineRun))
             {
                 LineStop();
+                MoveInfo.NextMoveStep(StepEnum.IBR03_BatchToP1);
+                WorkLog("复位：批量轴走到待机点");
+                BatchAxis.AbsMove(MoveInfo, Config.BatchAxisP1, Robot.Config.BatchAxis_P1Speed);
+            }
+            else if (MoveInfo.IsStep(StepEnum.IBR03_BatchToP1))
+            {
                 MoveInfo.NextMoveStep(StepEnum.IBR04_BatchHome);
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000));
                 WorkLog("复位：批量轴开始回原点");