1

source/DeviceLibrary/storeBean/XLRStoreBean.cs

@@ -165,7 +165,7 @@ namespace OnlineStore.DeviceLibrary
                 LogUtil.error(Name + "收到复位信号，已经在复位或原点返回中，且当前无报警，不处理复位");
                 LogUtil.error(Name + "收到复位信号，已经在复位或原点返回中，且当前无报警，不处理复位");
                 return false;
                 return false;
             }
             }
-
+            Alarm(AlarmType.None);
             //停止运动
             //停止运动
             MoveInfo.EndMove();
             MoveInfo.EndMove();
 
 

source/DeviceLibrary/storeBean/boxBean/BoxEquip_InExecute_Partial.cs

@@ -181,6 +181,7 @@ namespace OnlineStore.DeviceLibrary
                         SetWarnMsg($"入库 {MoveInfo.SLog}：AB入口料盘无入库信息, 任务取消");
                         SetWarnMsg($"入库 {MoveInfo.SLog}：AB入口料盘无入库信息, 任务取消");
                         LogInfo($"入库 {MoveInfo.SLog}：AB入口料盘因无入库信息，结束入库");
                         LogInfo($"入库 {MoveInfo.SLog}：AB入口料盘因无入库信息，结束入库");
                         SetBoxStatus(DeviceStatus.StoreOnline, RunStatus.Runing);
                         SetBoxStatus(DeviceStatus.StoreOnline, RunStatus.Runing);
+                        Alarm(AlarmType.None);
                         MoveInfo.EndMove();
                         MoveInfo.EndMove();
                     }
                     }
                     else
                     else

source/DeviceLibrary/storeBean/boxBean/BoxEquip_OutExecute_Partial.cs

@@ -126,6 +126,7 @@ namespace OnlineStore.DeviceLibrary
                     MoveInfo.EndMove();
                     MoveInfo.EndMove();
                     //停止记录  
                     //停止记录  
                     StopRecord();
                     StopRecord();
+                    Alarm(AlarmType.None);
                     AutoInout.InOutEndProcess(this, MoveType.OutStore);
                     AutoInout.InOutEndProcess(this, MoveType.OutStore);
                     break;
                     break;
             }
             }

source/DeviceLibrary/storeBean/inputBean/BatchMoveBean_Partial.cs

@@ -80,6 +80,7 @@ namespace OnlineStore.DeviceLibrary
             {
             {
                 LineStop();
                 LineStop();
                 MoveInfo.EndMove();
                 MoveInfo.EndMove();
+                Alarm(AlarmType.None);
                 LogUtil.debug($"{Name} 处理11");
                 LogUtil.debug($"{Name} 处理11");
             }
             }
             return true;
             return true;
@@ -175,6 +176,7 @@ namespace OnlineStore.DeviceLibrary
                 else
                 else
                 {
                 {
                     LineStop();
                     LineStop();
+                    Alarm(AlarmType.None);
                     MoveInfo.EndMove();
                     MoveInfo.EndMove();
                     LogUtil.info(" 未检测到料串，入料结束");
                     LogUtil.info(" 未检测到料串，入料结束");
                 }
                 }
@@ -189,6 +191,7 @@ namespace OnlineStore.DeviceLibrary
                 {
                 {
                     LineStop();
                     LineStop();
                     MoveInfo.EndMove();
                     MoveInfo.EndMove();
+                    Alarm(AlarmType.None);
                     LogUtil.info(" 未检测到料串，入料结束");
                     LogUtil.info(" 未检测到料串，入料结束");
                 }
                 }
             }
             }

source/DeviceLibrary/storeBean/inputBean/InputEquip.cs

@@ -109,6 +109,7 @@ namespace OnlineStore.DeviceLibrary
                 CloseAllAxis();
                 CloseAllAxis();
                 return false;
                 return false;
             }
             }
+            Alarm(AlarmType.None);
             SetAllTimer(false);
             SetAllTimer(false);
             MoveInfo.EndMove();
             MoveInfo.EndMove();
             InstoreNgMsg = "";
             InstoreNgMsg = "";
@@ -152,6 +153,7 @@ namespace OnlineStore.DeviceLibrary
 
 
         void InoutEndEvent()
         void InoutEndEvent()
         {
         {
+            Alarm(AlarmType.None);
             inoutCnt++;
             inoutCnt++;
             if (inoutCnt > resetCnt && BatchMove_A.MoveInfo.ShelfNoTray && BatchMove_B.MoveInfo.ShelfNoTray)
             if (inoutCnt > resetCnt && BatchMove_A.MoveInfo.ShelfNoTray && BatchMove_B.MoveInfo.ShelfNoTray)
             {
             {
@@ -172,6 +174,7 @@ namespace OnlineStore.DeviceLibrary
                 SetAllTimer(true);
                 SetAllTimer(true);
                 return false;
                 return false;
             }
             }
+            Alarm(AlarmType.None);
             LogInfo("Reset  开始重置  ");
             LogInfo("Reset  开始重置  ");
             runStatus = RunStatus.Reset;
             runStatus = RunStatus.Reset;
             MoveInfo.NewMove(MoveType.Reset, new InOutParam());
             MoveInfo.NewMove(MoveType.Reset, new InOutParam());

source/DeviceLibrary/storeBean/inputBean/InputEquip_InStore.cs

@@ -851,7 +851,7 @@ namespace OnlineStore.DeviceLibrary
         public override bool StartOutstore(InOutParam param)
         public override bool StartOutstore(InOutParam param)
         {
         {
             if (!NoAlarm())
             if (!NoAlarm())
-            {
+            {               
                 LogError("报警中，无法开始出库：" + param.PosInfo.ToStr());
                 LogError("报警中，无法开始出库：" + param.PosInfo.ToStr());
                 return false;
                 return false;
             }
             }
@@ -1291,6 +1291,7 @@ namespace OnlineStore.DeviceLibrary
                     MoveLog($" 出料->NG箱放料结束");
                     MoveLog($" 出料->NG箱放料结束");
                     MoveInfo.EndMove();
                     MoveInfo.EndMove();
                     runStatus = RunStatus.Runing;
                     runStatus = RunStatus.Runing;
+                    InoutEndEvent();
                 }
                 }
                 else
                 else
                 {
                 {