看板显示异常更改

AGVControl-ProductionLine/BLL/Control.cs

@@ -69,8 +69,6 @@ namespace BLL
             bool rtn;
             bool rtn;
             if (AgvStateInProcess) return;
             if (AgvStateInProcess) return;
             AgvStateInProcess = true;
             AgvStateInProcess = true;
-            //上报异常
-            bool isAlarm = false;
             List<AlarmMsg> msglist = new List<AlarmMsg>();
             List<AlarmMsg> msglist = new List<AlarmMsg>();
             for (int j = 0; j < Common.nodeInfo.Count; j++)
             for (int j = 0; j < Common.nodeInfo.Count; j++)
             {
             {
@@ -79,9 +77,14 @@ namespace BLL
                     msglist.Add(new AlarmMsg(Common.nodeInfo[j].AliceName, "lineAgv." + Common.nodeInfo[j].Name + ".OffLine", "离线"));
                     msglist.Add(new AlarmMsg(Common.nodeInfo[j].AliceName, "lineAgv." + Common.nodeInfo[j].Name + ".OffLine", "离线"));
                 }
                 }
             }
             }
+            BLL.AGVManager.updateDeviceAlarmMsg(msglist);
 
 
             for (int i = 0; i < Common.agvInfo.Count; i++)
             for (int i = 0; i < Common.agvInfo.Count; i++)
             {
             {
+                //上报异常
+                bool isAlarm = false;
+                if (msglist.Count > 0)
+                    msglist.Clear();
                 try
                 try
                 {
                 {
                     if (!CheckOnline(i)) continue;
                     if (!CheckOnline(i)) continue;
@@ -92,8 +95,7 @@ namespace BLL
                     rtn = Common.mir.Get_State(Common.agvInfo[i], out eAGVState stateID, out string stateText, out int battery, out string mission_text, out Agv_Info.clsPosition position);
                     rtn = Common.mir.Get_State(Common.agvInfo[i], out eAGVState stateID, out string stateText, out int battery, out string mission_text, out Agv_Info.clsPosition position);
                     Thread.Sleep(50);
                     Thread.Sleep(50);
                     if (rtn) change = Common.agvInfo[i].SetState(stateID, stateStr, battery, mission_text, position);
                     if (rtn) change = Common.agvInfo[i].SetState(stateID, stateStr, battery, mission_text, position);
-                    else
-                        continue;
+
                     //更新状态stateID.Equals(eAGVState.Executing)
                     //更新状态stateID.Equals(eAGVState.Executing)
                     if (change)
                     if (change)
                     {
                     {
@@ -101,11 +103,6 @@ namespace BLL
                     }
                     }
                     Common.log.Debug("获取AGV状态");     
                     Common.log.Debug("获取AGV状态");     
 
 
-                    //获取地点任务状态
-                    //Thread.Sleep(50);
-                    //rtn = Common.mir.Get_Register(Common.agvInfo[i], REG_STATUS, out int regValue);
-                    //if (rtn) Common.agvInfo[i].GetPlace(regValue);
-
                     Thread.Sleep(50);
                     Thread.Sleep(50);
                     rtn = Common.mir.Get_IO_Status(Common.agvInfo[i], out bool[] input, out bool[] output);
                     rtn = Common.mir.Get_IO_Status(Common.agvInfo[i], out bool[] input, out bool[] output);
                     Common.log.Debug("获取IO状态");
                     Common.log.Debug("获取IO状态");
@@ -142,13 +139,13 @@ namespace BLL
                             Common.log.Error(Common.agvInfo[i].Name + "上报小车运行步骤失败" + ex.Message + ex.StackTrace);
                             Common.log.Error(Common.agvInfo[i].Name + "上报小车运行步骤失败" + ex.Message + ex.StackTrace);
                         }
                         }
                     }
                     }
+                    BLL.AGVManager.updateDeviceAlarmMsg(msglist);
                 }
                 }
                 catch (Exception ex)
                 catch (Exception ex)
                 {
                 {
                     Common.log.Error("AgvStateTimer_" + Common.agvInfo[i].Name + ex.Message + ex.StackTrace);
                     Common.log.Error("AgvStateTimer_" + Common.agvInfo[i].Name + ex.Message + ex.StackTrace);
                 }
                 }
             }
             }
-            BLL.AGVManager.updateDeviceAlarmMsg(msglist);
 
 
 
 
             AgvStateInProcess = false;
             AgvStateInProcess = false;

AGVControl-ProductionLine/obj/Debug/AGVControl-ProductionLine.csproj.CoreCompileInputs.cache

-ce147cdc7d5f84ac5eea7abfb5866dce563042b6
+9684cf330348d5d70b323e6ae0e5e155759ea6d4

AGVControl-ProductionLine/obj/Debug/AGVControl-ProductionLine.csproj.FileListAbsolute.txt

@@ -54,3 +54,19 @@ D:\OneDrive - 上海挚锦科技有限公司\SMD\AGVControl-Qisda-ProductionLine
 D:\OneDrive - 上海挚锦科技有限公司\SMD\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\bin\Debug\Newtonsoft.Json.dll
 D:\OneDrive - 上海挚锦科技有限公司\SMD\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\bin\Debug\Newtonsoft.Json.dll
 D:\OneDrive - 上海挚锦科技有限公司\SMD\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\bin\Debug\AsaPL.AgvClient.pdb
 D:\OneDrive - 上海挚锦科技有限公司\SMD\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\bin\Debug\AsaPL.AgvClient.pdb
 D:\OneDrive - 上海挚锦科技有限公司\SMD\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.csprojAssemblyReference.cache
 D:\OneDrive - 上海挚锦科技有限公司\SMD\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.csprojAssemblyReference.cache
+E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\bin\Debug\AGVControl-ProductionLine.exe.config
+E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\bin\Debug\AGVControl-ProductionLine.exe
+E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\bin\Debug\AGVControl-ProductionLine.pdb
+E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\bin\Debug\AsaPL.AgvClient.dll
+E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\bin\Debug\log4net.dll
+E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\bin\Debug\Newtonsoft.Json.dll
+E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\bin\Debug\RestSharp.dll
+E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\bin\Debug\AsaPL.AgvClient.pdb
+E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\bin\Debug\RestSharp.xml
+E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl.FrmMain.resources
+E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl.Properties.Resources.resources
+E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.csproj.GenerateResource.cache
+E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.csproj.CoreCompileInputs.cache
+E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.csproj.CopyComplete
+E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.exe
+E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.pdb