HY03修改还原。环形线启动增加验证。

source/DeviceLibrary/assemblyLine/HY/HY_C1Line.cs

@@ -404,10 +404,10 @@ namespace OnlineStore.DeviceLibrary
             if (MoveInfo.IsStep(LineMoveStep.HY02_FrontStopDown))
             if (MoveInfo.IsStep(LineMoveStep.HY02_FrontStopDown))
             { 
             { 
                 //如果此步骤持续还不到一秒，是信号闪烁，暂不处理
                 //如果此步骤持续还不到一秒，是信号闪烁，暂不处理
-                if (MoveInfo.StepSpan().TotalSeconds < 1)
-                {
-                    return;
-                }
+                //if (MoveInfo.StepSpan().TotalSeconds < 1)
+                //{
+                //    return;
+                //}
 
 
                if (IOValue(IO_Type.HY_TrayCheck).Equals(IO_VALUE.HIGH))
                if (IOValue(IO_Type.HY_TrayCheck).Equals(IO_VALUE.HIGH))
                 {
                 {
@@ -416,8 +416,8 @@ namespace OnlineStore.DeviceLibrary
                 if (IOValue(IO_Type.HY_FrontStopCheck).Equals(IO_VALUE.LOW))
                 if (IOValue(IO_Type.HY_FrontStopCheck).Equals(IO_VALUE.LOW))
                 {
                 {
                     //前检测信号灭，等待阻挡自动上升
                     //前检测信号灭，等待阻挡自动上升
-                    HY03_FrontStopUp(20000,false);
-
+                    //HY03_FrontStopUp(20000,false);
+                    HY03_FrontStopUp();
                 }
                 }
                 else
                 else
                 {
                 {

source/DeviceLibrary/assemblyLine/LineBean.cs

@@ -291,7 +291,7 @@ namespace OnlineStore.DeviceLibrary
             IoCheckTimer.Enabled = false; 
             IoCheckTimer.Enabled = false; 
             bool isNeedAllReset = false;
             bool isNeedAllReset = false;
 
 
-            if (isInSuddenDown || isNoAirCheck)
+            if (isInSuddenDown || isNoAirCheck||alarmType.Equals(LineAlarmType.SuddenStop)||alarmType.Equals(LineAlarmType.NoAirCheck))
             {
             {
                 //TrayManager.LineNeedEmptyTrayNum = 0;
                 //TrayManager.LineNeedEmptyTrayNum = 0;
                 isNeedAllReset = true;
                 isNeedAllReset = true;
@@ -345,7 +345,7 @@ namespace OnlineStore.DeviceLibrary
             //调试状态不再重置
             //调试状态不再重置
             if (!equip.IsDebug)
             if (!equip.IsDebug)
             {
             {
-                if (isNeedAllReset || TrayManager.ErrorDeviceId.Equals(equip.DeviceID) || (!NoAlarm()))
+                if (isNeedAllReset || TrayManager.ErrorDeviceId.Equals(equip.DeviceID) || (!NoAlarm())||(!equip.NoAlarm()) )
                 {
                 {
                     LogUtil.info(Name + "收到复位信号，" + equip.Name + " 需要复位");
                     LogUtil.info(Name + "收到复位信号，" + equip.Name + " 需要复位");
                     equip.Reset();
                     equip.Reset();
@@ -428,7 +428,7 @@ namespace OnlineStore.DeviceLibrary
 
 
             if (alarmType.Equals(LineAlarmType.SuddenStop) || alarmType.Equals(LineAlarmType.NoAirCheck))
             if (alarmType.Equals(LineAlarmType.SuddenStop) || alarmType.Equals(LineAlarmType.NoAirCheck))
             {
             {
-                LogUtil.error(WarnMsg);
+                LogUtil.error(WarnMsg+"：所有模块停止运行并报警："+alarmType);
                 MoveInfo.EndMove();
                 MoveInfo.EndMove();
                 WriteDrivetMotorRun(IO_VALUE.LOW);
                 WriteDrivetMotorRun(IO_VALUE.LOW);
                 T3C1_Stop();
                 T3C1_Stop();
@@ -713,7 +713,7 @@ namespace OnlineStore.DeviceLibrary
                 }
                 }
 
 
                 TimeSpan span = DateTime.Now - time;
                 TimeSpan span = DateTime.Now - time;
-                if (span.TotalMilliseconds > 1000)
+                if (span.TotalMilliseconds > 2000)
                 {
                 {
                     LogUtil.error(Name + "主定时器处理耗时：" + FormUtil.GetSpanStr(span));
                     LogUtil.error(Name + "主定时器处理耗时：" + FormUtil.GetSpanStr(span));
                 }
                 }