1

AGVControl-ProductionLine/BLL/Common.cs

@@ -856,13 +856,13 @@ namespace AGVControl
             {
             {
                 if (clientNode.Name.Equals(SettingString.C4FeederOut) || clientNode.Name.Equals(SettingString.D4FeederOut))
                 if (clientNode.Name.Equals(SettingString.C4FeederOut) || clientNode.Name.Equals(SettingString.D4FeederOut))
                 {
                 {
-                    warnMsg = string.Format("外侧料架[{0}]未解绑,已解绑料架:{1}", clientNode.RFID, string.Join(",", Common.missionManager.GetUnlockRfids(clientNode.Name).ToArray()));
+                    warnMsg = string.Format("线体[{0}]外侧料架[{1}]未解绑,已解绑料架:{2}", clientNode.AliceName,clientNode.RFID, string.Join(",", Common.missionManager.GetUnlockRfids(clientNode.Name).ToArray()));
                     Common.log.Debug(warnMsg);
                     Common.log.Debug(warnMsg);
                 }
                 }
                 else
                 else
                 {
                 {
                     string res = AGVManager.GetRFIDs(clientNode.Name);
                     string res = AGVManager.GetRFIDs(clientNode.Name);
-                    warnMsg = string.Format("外侧料架[{0}]未解绑,已解绑料架:{1}", clientNode.RFID, string.Join(",", Common.missionManager.GetUnlockRfids(clientNode.Name).ToArray()));
+                    warnMsg = string.Format("线体[{0}]外侧料架[{1}]未解绑,已解绑料架:{2}", clientNode.AliceName, clientNode.RFID, string.Join(",", Common.missionManager.GetUnlockRfids(clientNode.Name).ToArray()));
                     Common.log.Debug(warnMsg);
                     Common.log.Debug(warnMsg);
                 }
                 }
                 return false;
                 return false;

AGVControl-ProductionLine/BLL/Control.cs

@@ -95,7 +95,8 @@ 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.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) &&
+                        if (!Common.nodeInfo[j].Name.Equals(SettingString.C4FeederIn) && !Common.nodeInfo[j].Name.Equals(SettingString.C4FeederOut) &&
+                        Common.missionManager.GetUnlockCnt(Common.nodeInfo[j].Name) > 0)
                         {
                         {
                             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))
@@ -105,7 +106,7 @@ namespace AGVControl.BLL
                             }
                             }
 
 
                         }
                         }
-                        if (Common.nodeInfo[j].Name.Equals(SettingString.C4FeederOut) || Common.nodeInfo[j].Name.Equals(SettingString.D4FeederOut))
+                        if (Common.nodeInfo[j].Name.Equals(SettingString.D4FeederOut))
                         {
                         {
                             if (Common.missionManager.GetUnlockCnt(Common.nodeInfo[j].Name) > 0)
                             if (Common.missionManager.GetUnlockCnt(Common.nodeInfo[j].Name) > 0)
                             {
                             {