伺服报警时需停止运动

source/DeviceLibrary/assemblyLine/EquipBase.cs

@@ -59,7 +59,8 @@ namespace OnlineStore.DeviceLibrary
                 isNoAirCheck = true;
                 isNoAirCheck = true;
             }
             }
             this.alarmType = alarmType;
             this.alarmType = alarmType;
-            if (alarmType.Equals(LineAlarmType.SuddenStop) || alarmType.Equals(LineAlarmType.NoAirCheck))
+            if (alarmType.Equals(LineAlarmType.SuddenStop) || alarmType.Equals(LineAlarmType.NoAirCheck)
+                ||alarmType.Equals(LineAlarmType.AxisAlarm)||alarmType.Equals(LineAlarm.AxisErrorStop))
             {
             {
                 StopMove(alarmType+"报警");
                 StopMove(alarmType+"报警");
             }
             }
@@ -668,7 +669,11 @@ namespace OnlineStore.DeviceLibrary
             if (levle.Equals(-1) && baseConfig.DType.Equals(DeviceType.MoveEquip))
             if (levle.Equals(-1) && baseConfig.DType.Equals(DeviceType.MoveEquip))
             {
             {
                 levle = 0;
                 levle = 0;
-            } 
+            }
+            if (baseConfig.DType.Equals(DeviceType.FeedingEquip))
+            {
+                levle = 1;
+            }
             if (levle.Equals(1))
             if (levle.Equals(1))
             {
             {
                 LogUtil.info(Name + "  " + posId + msg);
                 LogUtil.info(Name + "  " + posId + msg);