同时只留一个出库料串。轴报警时停止运动

source/DeviceLibrary/storeBean/EquipBase.cs

@@ -59,7 +59,8 @@ namespace OnlineStore.DeviceLibrary
                 isNoAirpressure_Check = true;
                 isNoAirpressure_Check = true;
             }
             }
             this.alarmType = alarmType;
             this.alarmType = alarmType;
-            if (alarmType.Equals(AlarmType.SuddenStop) || alarmType.Equals(AlarmType.NoAirpressure_Check) || alarmType.Equals(AlarmType.AxisAlarm))
+            if (alarmType.Equals(AlarmType.SuddenStop) || alarmType.Equals(AlarmType.NoAirpressure_Check) ||
+                alarmType.Equals(AlarmType.AxisAlarm)||alarmType.Equals(AlarmType.AxisMoveError))
             {
             {
                 StopMove();
                 StopMove();
             }
             }

source/DeviceLibrary/storeBean/inputBean/BatchMoveBean.cs

@@ -13,7 +13,7 @@ namespace OnlineStore.DeviceLibrary
 {
 {
     public partial class BatchMoveBean
     public partial class BatchMoveBean
     {
     {
-        public bool ShelfAutoOut = true;
+        public bool ShelfAutoOut = false;
         public bool ShelfNeedLeave = false;
         public bool ShelfNeedLeave = false;
         public string Name = "料口";
         public string Name = "料口";
         public AxisBean BatchAxis = null;
         public AxisBean BatchAxis = null;
@@ -535,6 +535,14 @@ namespace OnlineStore.DeviceLibrary
             return false;
             return false;
         }
         }
 
 
+        internal bool ShelfIsOut()
+        {
+            if (MoveInfo.MoveType.Equals(MoveType.OutStore) && MoveInfo.MoveStep < StepEnum.IS21_BatchToP1)
+            {
+                return true;
+            }
+            return false;
+        }
 
 
 
 
         public string GetMoveStr()
         public string GetMoveStr()

source/DeviceLibrary/storeBean/inputBean/BatchMoveBean_Partial.cs

@@ -388,12 +388,12 @@ namespace OnlineStore.DeviceLibrary
             {
             {
                 needLeave = false;
                 needLeave = false;
             }
             }
-            else  if (ShelfType.Equals(1) && Robot.BatchMove_B.ShelfReadyOut())
+            else  if (ShelfType.Equals(1) && Robot.BatchMove_B.ShelfIsOut())
             {
             {
                 needLeave = true;
                 needLeave = true;
             }
             }
             //如果已经有一个出库料串，这个直接离开
             //如果已经有一个出库料串，这个直接离开
-            else if (ShelfType.Equals(2) && Robot.BatchMove_A.ShelfReadyOut())
+            else if (ShelfType.Equals(2) && Robot.BatchMove_A.ShelfIsOut())
             {
             {
                 needLeave = true;
                 needLeave = true;
             }
             }