批量轴复位修改

source/DeviceLibrary/manager/model/DeviceStep.cs

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

source/DeviceLibrary/storeBean/inputBean/BatchMoveBean.cs

@@ -183,6 +183,12 @@ namespace OnlineStore.DeviceLibrary
             else if (MoveInfo.IsStep(StepEnum.IBR02_LineRun))
             else if (MoveInfo.IsStep(StepEnum.IBR02_LineRun))
             {
             {
                 LineStop();
                 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.NextMoveStep(StepEnum.IBR04_BatchHome);
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000));
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000));
                 WorkLog("复位：批量轴开始回原点");
                 WorkLog("复位：批量轴开始回原点");