删除软件发送心跳信号给备料区软件

AGVControl-ProductionLine/BLL/AgvServer.cs

@@ -236,6 +236,8 @@ namespace BLL
                     }
                     }
                     else
                     else
                     {
                     {
+                        if (!IsNeedKeepLive(clientNode.Name))
+                            continue;
                         if (clientNode.StateEquals(eNodeStatus.None))
                         if (clientNode.StateEquals(eNodeStatus.None))
                         {
                         {
                             byte[] buff = new byte[] { 0X00, 0X00 };
                             byte[] buff = new byte[] { 0X00, 0X00 };
@@ -278,6 +280,13 @@ namespace BLL
             }
             }
         }
         }
 
 
+        private bool IsNeedKeepLive(string name)
+        {
+            if (SettingString.C4FeederIn.Equals(name) || SettingString.C4FeederOut.Equals(name) || SettingString.D4FeederIn.Equals(name) ||
+                SettingString.A5.Equals(name) || SettingString.A6.Equals(name)|| SettingString.D4FeederOut.Equals(name))
+                return false;
+            return true;
+        }
         public bool CheckIP(string name, string ip)
         public bool CheckIP(string name, string ip)
         {
         {
             //IP合法
             //IP合法

AGVControl-ProductionLine/BLL/Control.cs

@@ -95,7 +95,7 @@ namespace AGVControl.BLL
                     }
                     }
                     if (Common.nodeInfo[j].Name.StartsWith(SettingString.D4_Name_Prefix) || Common.nodeInfo[j].Name.StartsWith(SettingString.C4_Name_Prefix))
                     if (Common.nodeInfo[j].Name.StartsWith(SettingString.D4_Name_Prefix) || Common.nodeInfo[j].Name.StartsWith(SettingString.C4_Name_Prefix))
                     {
                     {
-                        if (!Common.nodeInfo[j].Name.Equals(SettingString.C4FeederIn) && !Common.nodeInfo[j].Name.Equals(SettingString.D4FeederIn) && !Common.nodeInfo[j].Name.Equals(SettingString.D4FeederOut))//&& !Common.nodeInfo[j].Name.Equals(SettingString.C4FeederOut) &&
+                        if (Common.missionManager.GetUnlockCnt(Common.nodeInfo[j].Name) > 0)//!Common.nodeInfo[j].Name.Equals(SettingString.C4FeederIn) && !Common.nodeInfo[j].Name.Equals(SettingString.D4FeederIn) && !Common.nodeInfo[j].Name.Equals(SettingString.D4FeederOut)&& !Common.nodeInfo[j].Name.Equals(SettingString.C4FeederOut) &&
                         {
                         {
                             tmp = AGVManager.GetFirstRFID(Common.nodeInfo[j].Name);
                             tmp = AGVManager.GetFirstRFID(Common.nodeInfo[j].Name);
                             if (!tmp.Equals(Common.nodeInfo[j].RFID))
                             if (!tmp.Equals(Common.nodeInfo[j].RFID))

AGVControl-ProductionLine/BLL/UnlockMissionManager.cs

@@ -85,7 +85,7 @@ namespace AGVControl
         }
         }
         public bool DelMission(string nodeName, string rfid)
         public bool DelMission(string nodeName, string rfid)
         {
         {
-            bool rtn = NodeUnlockMissions[nodeName].Delete(rfid);
+            bool rtn = NodeUnlockMissions[nodeName].Delete(rfid,nodeName);
             if (rtn)
             if (rtn)
             {
             {
                 UnlockMissions[nodeName] = new UnlockInfo(nodeName, NodeUnlockMissions[nodeName].EmptyCnt, NodeUnlockMissions[nodeName].GetRfidWithTime());
                 UnlockMissions[nodeName] = new UnlockInfo(nodeName, NodeUnlockMissions[nodeName].EmptyCnt, NodeUnlockMissions[nodeName].GetRfidWithTime());

AGVControl-ProductionLine/bean/UnlockedShelf.cs

@@ -62,7 +62,7 @@ namespace AGVControl
         /// <summary>
         /// <summary>
         /// 删除一个解绑任务
         /// 删除一个解绑任务
         /// </summary>
         /// </summary>
-        public bool Delete(string rfid)
+        public bool Delete(string rfid,string nodeName="")
         {
         {
             if (EmptyCnt > 0)
             if (EmptyCnt > 0)
             {
             {
@@ -75,7 +75,7 @@ namespace AGVControl
                     {
                     {
                         Rfids.Clear();
                         Rfids.Clear();
                     }
                     }
-                    if (rfid.Equals(SettingString.C4FeederOut) || rfid.Equals(SettingString.D4FeederOut))
+                    if(nodeName.Equals(SettingString.C4FeederOut)|| nodeName.Equals(SettingString.D4FeederOut))
                         Rfids.Remove(rfid);
                         Rfids.Remove(rfid);
                     return true;
                     return true;
                 }
                 }