添加C14，15

AGVControl-ProductionLine/BLL/AGVManager.cs

@@ -349,6 +349,7 @@ namespace AGVControl
             string msg = "";
             try
             {
+                Common.log.Debug(msgList.ToArray());
                 Dictionary<string, string> paramMap = new Dictionary<string, string>();
                 string msgListStr = JsonHelper.SerializeObject(msgList);
                 paramMap.Add("deviceAlarmList", msgListStr);
@@ -699,6 +700,10 @@ namespace AGVControl
             this.msgValue = value;
             this.type = type;
         }
+        public override string ToString()
+        {
+            return string.Format("{0},{1},{2},{3}",name,msgKey,msgValue,type); ;
+        }
     }
     public class RfidData
     {

AGVControl-ProductionLine/BLL/Common.cs

@@ -70,7 +70,7 @@ namespace AGVControl
         public const string IP_4D_Light = "IP_4D_Light";
         public const string IP_4C_Light = "IP_4C_Light";
 
-        public const string Lines_In_Air_Door = "C8,C9,C10";
+        public const string Lines_In_Air_Door = "C8,C9,C10,C14,C15";
     }
 
 

AGVControl-ProductionLine/BLL/Control.cs

@@ -98,7 +98,7 @@ namespace AGVControl.BLL
                     if (!Common.UpdateStationState(Common.nodeInfo[j]))
                     {
                         isAlarm = true;
-                        msglist.Add(new AlarmMsg(Common.nodeInfo[j].AliceName, "lineAgv." + Common.nodeInfo[j].Name + ".Msg", Common.nodeInfo[j].WarnMsg));
+                        msglist.Add(new AlarmMsg(Common.nodeInfo[j].AliceName, "lineAgv." + Common.nodeInfo[j].Name + ".WarnMsg", Common.nodeInfo[j].WarnMsg));
                     }
                     if (!isAlarm && !Common.nodeInfo[j].Online)
                     {
@@ -188,6 +188,7 @@ namespace AGVControl.BLL
                 {
                     if (!Common.agvInfo[i].IsCon)
                     {
+                        isAlarm = true;
                         msglist.Add(new AlarmMsg(Common.agvInfo[i].Name, "lineAgv." + Common.agvInfo[i].Name + ".Msg", "离线"));
                     }
                     if (!isAlarm && (Common.agvInfo[i].StateID.Equals(eAGVState.Error) || Common.agvInfo[i].StateID.Equals(eAGVState.EmergencyStop) || Common.agvInfo[i].StateID.Equals(eAGVState.Pause)))
@@ -205,22 +206,22 @@ namespace AGVControl.BLL
                     if (!isAlarm)
                     {
                         if (!Common.agvInfo[i].Msg.Equals(""))
-                            msglist.Add(new AlarmMsg(Common.agvInfo[i].Name, "lineAgv." + Common.agvInfo[i].Name + ".Msg", Common.agvInfo[i].Msg, 1));
+                            msglist.Add(new AlarmMsg(Common.agvInfo[i].Name, "lineAgv." + Common.agvInfo[i].Name + ".Msg", Common.agvInfo[i].Msg,1));
                         else
                         {
                             if ((Common.agvInfo[i].Place.Contains(SettingString.AutoCharge) || Common.agvInfo[i].Place.Contains(SettingString.Standby)))
                             {
-                                msglist.Add(new AlarmMsg(Common.agvInfo[i].Name, "lineAgv." + Common.agvInfo[i].Name + ".Place", Common.agvInfo[i].Place, 1));
+                                msglist.Add(new AlarmMsg(Common.agvInfo[i].Name, "lineAgv." + Common.agvInfo[i].Name + ".Place", Common.agvInfo[i].Place,1));
                             }
                         }
 
                     }
+                    AGVManager.updateDeviceAlarmMsg(msglist);
                 }
                 catch (Exception ex)
                 {
                     Common.log.Error(Common.agvInfo[i].Name + "上报小车状态失败" + ex.Message + ex.StackTrace);
                 }
-                AGVManager.updateDeviceAlarmMsg(msglist);
             }
             AgvStateUpdateProcess = false;
         }

AGVControl-ProductionLine/FrmMain.cs

@@ -265,7 +265,11 @@ namespace AGVControl
                 }
                 else
                 {
-
+                    if(Common.agvInfo[e.RowIndex].IsExistShelf)
+                    {
+                        MessageBox.Show("小车上有料架，不允许开自动模式");
+                        return;
+                    }
                     //清除4c临时待机位的占用
                     if (Common.agvInfo[e.RowIndex].Name.Equals(Common.StandbyStation.C4_Station1))
                     {

AGVControl-ProductionLine/bin/Debug/logs/AgvServer.log

+[2020-12-25 15:20:52,821][1][AgvServer:46]INFO  =====程序开始=====

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

@@ -54,6 +54,7 @@ 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\AsaPL.AgvClient.pdb
 D:\OneDrive - 上海挚锦科技有限公司\SMD\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.csprojAssemblyReference.cache
+C:\myproject\Gitee\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
@@ -70,5 +71,4 @@ E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLi
 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
-C:\myproject\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.csprojAssemblyReference.cache
 E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.csprojAssemblyReference.cache