Skip to content

顾剑亮 / AGVControl-Qisda-ProductionLine

转到一个项目
切换导航栏
切换导航栏固定状态
Commit a96695fc 由 张东亮
选项

确保一辆车回收料架

1 个父辈 35a0bc87
内嵌 并排
正在显示 7 个修改的文件 包含 3 行增加 和 3 行删除
AGVControl-ProductionLine/BLL/Common.cs
...@@ -608,7 +608,7 @@ namespace AGVControl ...@@ -608,7 +608,7 @@ namespace AGVControl
if (SettingString.C4_AGV_IPs.Contains(agv.IP)) if (SettingString.C4_AGV_IPs.Contains(agv.IP))
{ {
List<Agv_Info> agvs = Common.agvInfo.FindAll(s => SettingString.C4_AGV_IPs.Contains(s.IP) && (s.CurJob is EmptyShelfBackJob || s.CurJob is GoEmptyShelfLineJob)); List<Agv_Info> agvs = Common.agvInfo.FindAll(s => SettingString.C4_AGV_IPs.Contains(s.IP) && (s.CurJob is EmptyShelfBackJob || s.CurJob is GoEmptyShelfLineJob));
if (agvs != null && agvs.Count > 1) if (agvs != null && agvs.Count >= 1)
return false; return false;
string nearNodeName = CalculateNearNode(agv, SettingString.C4_Name_Prefix); string nearNodeName = CalculateNearNode(agv, SettingString.C4_Name_Prefix);
if (nearNodeName.Equals("")) if (nearNodeName.Equals(""))
...@@ -624,7 +624,7 @@ namespace AGVControl ...@@ -624,7 +624,7 @@ namespace AGVControl
if (!SettingString.C4_AGV_IPs.Contains(agv.IP)) if (!SettingString.C4_AGV_IPs.Contains(agv.IP))
{ {
List<Agv_Info> agvs = Common.agvInfo.FindAll(s => !SettingString.C4_AGV_IPs.Contains(s.IP) && (s.CurJob is EmptyShelfBackJob || s.CurJob is GoEmptyShelfLineJob)); List<Agv_Info> agvs = Common.agvInfo.FindAll(s => !SettingString.C4_AGV_IPs.Contains(s.IP) && (s.CurJob is EmptyShelfBackJob || s.CurJob is GoEmptyShelfLineJob));
if (agvs != null && agvs.Count > 1) if (agvs != null && agvs.Count >= 1)
return false; return false;
string nearNodeName = CalculateNearNode(agv, SettingString.D4_Name_Prefix); string nearNodeName = CalculateNearNode(agv, SettingString.D4_Name_Prefix);
if (nearNodeName.Equals("")) if (nearNodeName.Equals(""))
......
AGVControl-ProductionLine/BLL/MiR_API.cs
...@@ -647,7 +647,7 @@ namespace BLL ...@@ -647,7 +647,7 @@ namespace BLL
ping.Dispose(); ping.Dispose();
if (result.Status != System.Net.NetworkInformation.IPStatus.Success) if (result.Status != System.Net.NetworkInformation.IPStatus.Success)
{ {
Common.log.Info("Ping " + ip + " 请求没有响应"); Common.log.Debug("Ping " + ip + " 请求没有响应");
return false; return false;
} }
return true; return true;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!