门不打开建模版

source/DeviceLibrary/manager/model/DeviceStep.cs

@@ -883,7 +883,7 @@ namespace OnlineStore.DeviceLibrary
         /// </summary>
         /// </summary>
         II10_WaitAxisCheck,
         II10_WaitAxisCheck,
 
 
-
+        II11_0_InoutToP1,
         /// <summary>
         /// <summary>
         /// 入库料串取料：等待测高完成
         /// 入库料串取料：等待测高完成
         /// </summary>
         /// </summary>

source/DeviceLibrary/storeBean/inputBean/InputEquip_InStore.cs

@@ -251,6 +251,12 @@ namespace OnlineStore.DeviceLibrary
             {
             {
                 II10_WaitAxisCheck();
                 II10_WaitAxisCheck();
             }
             }
+            else if(MoveInfo.IsStep(StepEnum.II11_0_InoutToP1))
+            {
+                MoveInfo.NextMoveStep(StepEnum.II11_WaitHeight);
+                MoveLog($"入库{MoveInfo.SLog}:  取完料,进出轴回待机点P1 {Config.Inout_P1}");
+                InOutAxis.AbsMove(MoveInfo, Config.Inout_P1, Config.Inout_P1_Speed);
+            }
             else if (MoveInfo.IsStep(StepEnum.II11_WaitHeight))
             else if (MoveInfo.IsStep(StepEnum.II11_WaitHeight))
             {
             {
                 SetWarnMsg("");
                 SetWarnMsg("");
@@ -320,7 +326,7 @@ namespace OnlineStore.DeviceLibrary
                         }
                         }
                     }
                     }
                     MoveInfo.NextMoveStep(StepEnum.II12_Handle);
                     MoveInfo.NextMoveStep(StepEnum.II12_Handle);
-                    MoveLog($"入库{MoveInfo.SLog}:  取完料,进出轴回待机点P1 {Config.Inout_P1}");
+                    MoveLog($"入库{MoveInfo.SLog}:  宽度检查完成,进出轴回待机点P1 {Config.Inout_P1}");
                     InOutAxis.AbsMove(MoveInfo, Config.Inout_P1, Config.Inout_P1_Speed);
                     InOutAxis.AbsMove(MoveInfo, Config.Inout_P1, Config.Inout_P1_Speed);
                 }
                 }
                 else if (MoveInfo.IsTimeOut(60))
                 else if (MoveInfo.IsTimeOut(60))
@@ -858,7 +864,7 @@ namespace OnlineStore.DeviceLibrary
             {
             {
                 if (IOValue(IO_Type.ReelCheck_A).Equals(IO_VALUE.LOW))
                 if (IOValue(IO_Type.ReelCheck_A).Equals(IO_VALUE.LOW))
                 {
                 {
-                    MoveInfo.NextMoveStep(StepEnum.II11_WaitHeight);
+                    MoveInfo.NextMoveStep(StepEnum.II11_0_InoutToP1);
                     BatchMove_A.GetTrayOK();
                     BatchMove_A.GetTrayOK();
                 }
                 }
                 else
                 else
@@ -871,7 +877,7 @@ namespace OnlineStore.DeviceLibrary
             {
             {
                 if (IOValue(IO_Type.ReelCheck_B).Equals(IO_VALUE.LOW))
                 if (IOValue(IO_Type.ReelCheck_B).Equals(IO_VALUE.LOW))
                 {
                 {
-                    MoveInfo.NextMoveStep(StepEnum.II11_WaitHeight);
+                    MoveInfo.NextMoveStep(StepEnum.II11_0_InoutToP1);
                     BatchMove_B.GetTrayOK();
                     BatchMove_B.GetTrayOK();
                 }
                 }
                 else
                 else