Skip to content

孙克 / RC1250-AssemblyLine

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 7c04ee39 由 LN
选项

托盘禁用信息传给服务器

1 个父辈 68ebc882
内嵌 并排
正在显示 1 个修改的文件 包含 11 行增加 和 5 行删除
source/DeviceLibrary/assemblyLine/LineBean.cs
...@@ -1156,7 +1156,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1156,7 +1156,7 @@ namespace OnlineStore.DeviceLibrary
alarmList.Add(new AlarmMsg(equip.Name, "line." + equip.Name + "_" + equip.alarmType, equip.WarnMsg)); alarmList.Add(new AlarmMsg(equip.Name, "line." + equip.Name + "_" + equip.alarmType, equip.WarnMsg));
} }
else if (equip is FeedingEquip && equip.MoveInfo.MoveStep.Equals(LineMoveStep.FI_09_TrayLocation_Before)) else if (equip is FeedingEquip && equip.MoveInfo.MoveStep.Equals(LineMoveStep.FI_09_TrayLocation_Before))
{ {
alarmList.Add(new AlarmMsg(equip.Name, "line." + equip.Name + "_" + equip.alarmType, equip.WarnMsg)); alarmList.Add(new AlarmMsg(equip.Name, "line." + equip.Name + "_" + equip.alarmType, equip.WarnMsg));
} }
else if (equip is FeedingEquip && equip.MoveInfo.MoveStep.Equals(LineMoveStep.FO_09_TrayLocation_Before)) else if (equip is FeedingEquip && equip.MoveInfo.MoveStep.Equals(LineMoveStep.FO_09_TrayLocation_Before))
...@@ -1164,10 +1164,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -1164,10 +1164,10 @@ namespace OnlineStore.DeviceLibrary
alarmList.Add(new AlarmMsg(equip.Name, "line." + equip.Name + "_" + equip.alarmType, equip.WarnMsg)); alarmList.Add(new AlarmMsg(equip.Name, "line." + equip.Name + "_" + equip.alarmType, equip.WarnMsg));
} }
} }
//出料机构->皮带线放料，等待夹爪信号灭的报警也发给服务器 //出料机构->皮带线放料，等待夹爪信号灭的报警也发给服务器
else if (equip.alarmType.Equals(LineAlarmType.None) || equip.WarnMsg.Contains("获取库位号超时") || else if (equip.alarmType.Equals(LineAlarmType.None) || equip.WarnMsg.Contains("获取库位号超时") ||
equip.alarmType.Equals(LineAlarmType.IoSingleTimeOut)) equip.alarmType.Equals(LineAlarmType.IoSingleTimeOut))
{ {
continue; continue;
} }
...@@ -1175,6 +1175,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -1175,6 +1175,12 @@ namespace OnlineStore.DeviceLibrary
{ {
alarmList.Add(new AlarmMsg(equip.Name, "line." + equip.Name + "_" + equip.alarmType, equip.WarnMsg)); alarmList.Add(new AlarmMsg(equip.Name, "line." + equip.Name + "_" + equip.alarmType, equip.WarnMsg));
} }
List<TrayDisableInfo> list = TrayDisableManager.GetDisableList();
foreach (TrayDisableInfo t in list)
{
alarmList.Add(new AlarmMsg("托盘" + t.TrayCode + "禁用", "line.tray_" + t.TrayCode, t.DDescribe));
}
} }
SServerManager.updateDeviceAlarmMsg(alarmList); SServerManager.updateDeviceAlarmMsg(alarmList);
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!