Skip to content

孙克 / RC1250-AssemblyLine

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

弹框错误修改

1 个父辈 07fb50b8
内嵌 并排
正在显示 1 个修改的文件 包含 119 行增加 和 112 行删除
source/AssemblyLineClient/FrmLineStore.cs
...@@ -530,145 +530,152 @@ namespace OnlineStore.AssemblyLine ...@@ -530,145 +530,152 @@ namespace OnlineStore.AssemblyLine
} }
private void timer1_Tick(object sender, EventArgs e) private void timer1_Tick(object sender, EventArgs e)
{ {
LogM(); try
if (!this.Visible)
{
return;
}
string canScanCode = "";
if (AgvClient.CurrCancelState)
{
aGVCancelStateToolStripMenuItem.Text = gouStr + " AGV cancelState";
}
else
{ {
aGVCancelStateToolStripMenuItem.Text = "AGV cancelState"; LogM();
} if (!this.Visible)
lblStatus.Text = lineBean.GetRunStr() + canScanCode; {
string time = LineManager.Line.alarmType.Equals(LineAlarmType.None) ? "" : LineManager.Line.LastAlarmTime.ToLongTimeString(); return;
string warnMsg = LineManager.Line.WarnMsg.Equals("") ? "" : time + LineManager.Line.WarnMsg + "\r\n"; }
string canScanCode = "";
if (AgvClient.CurrCancelState)
{
aGVCancelStateToolStripMenuItem.Text = gouStr + " AGV cancelState";
}
else
{
aGVCancelStateToolStripMenuItem.Text = "AGV cancelState";
}
lblStatus.Text = lineBean.GetRunStr() + canScanCode;
string time = LineManager.Line.alarmType.Equals(LineAlarmType.None) ? "" : LineManager.Line.LastAlarmTime.ToLongTimeString();
string warnMsg = LineManager.Line.WarnMsg.Equals("") ? "" : time + LineManager.Line.WarnMsg + "\r\n";
lblMoveInfo.Text = LineManager.Line.GetMoveStr(); lblMoveInfo.Text = LineManager.Line.GetMoveStr();
if (TrayManager.TrayErrorMsg.Equals("").Equals(false)) if (TrayManager.TrayErrorMsg.Equals("").Equals(false))
{ {
warnMsg += TrayManager.TrayErrorMsg + "\r\n"; warnMsg += TrayManager.TrayErrorMsg + "\r\n";
} }
foreach (EquipBase move in lineBean.AllEquipMap.Values) foreach (EquipBase move in lineBean.AllEquipMap.Values)
{
if (move.WarnMsg.Equals("").Equals(false))
{ {
if (move.alarmType.Equals(LineAlarmType.None).Equals(false)) if (move.WarnMsg.Equals("").Equals(false))
{ {
if (move.alarmType.Equals(LineAlarmType.None).Equals(false))
{
warnMsg += move.LastAlarmTime.ToLongTimeString() + " " + move.WarnMsg + "\r\n"; warnMsg += move.LastAlarmTime.ToLongTimeString() + " " + move.WarnMsg + "\r\n";
} }
else else
{ {
warnMsg += move.WarnMsg + "\r\n"; warnMsg += move.WarnMsg + "\r\n";
}
} }
} }
}
lblWarnMsg.Text = warnMsg; lblWarnMsg.Text = warnMsg;
if (!listView1.Visible) if (!listView1.Visible)
{
return;
}
int i = 0;
int item_debug_index = 1;
int item_alarm_index = 2;
int item_runStr_index = 3;
int item_cid_index = 4;
int item_SAlarmType_index = 6;
int item_LastMsgTime_index = 5;
int item_BoxStr_index = 7;
foreach (MoveEquip move in lineBean.MoveEquipMap.Values)
{
ListViewItem lvi = new ListViewItem();
lvi.Text = move.Name;
SetItemText(i, item_debug_index, move.Config.IsDebug.Equals(1) ? "✘" : "✔");
SetItemText(i, item_alarm_index, move.alarmType.ToString());
SetItemText(i, item_runStr_index, move.GetRunStr());
BoxInfo box = LineServer.GetBoxInfo(move.StoreID);
if (box != null)
{ {
SetItemText(i, item_cid_index, box.CId.ToString()); return;
string online = "✘"; }
if ((DateTime.Now - box.LastMsgTime).TotalSeconds < LineServer.ClientKeepSecond) int i = 0;
int item_debug_index = 1;
int item_alarm_index = 2;
int item_runStr_index = 3;
int item_cid_index = 4;
int item_SAlarmType_index = 6;
int item_LastMsgTime_index = 5;
int item_BoxStr_index = 7;
foreach (MoveEquip move in lineBean.MoveEquipMap.Values)
{
ListViewItem lvi = new ListViewItem();
lvi.Text = move.Name;
SetItemText(i, item_debug_index, move.Config.IsDebug.Equals(1) ? "✘" : "✔");
SetItemText(i, item_alarm_index, move.alarmType.ToString());
SetItemText(i, item_runStr_index, move.GetRunStr());
BoxInfo box = LineServer.GetBoxInfo(move.StoreID);
if (box != null)
{ {
online = "✔"; SetItemText(i, item_cid_index, box.CId.ToString());
string online = "✘";
if ((DateTime.Now - box.LastMsgTime).TotalSeconds < LineServer.ClientKeepSecond)
{
online = "✔";
}
SetItemText(i, item_LastMsgTime_index, online);
SetItemText(i, item_SAlarmType_index, box.SAlarmType.ToString());
SetItemText(i, item_BoxStr_index, box.ToShowStr());
} }
SetItemText(i, item_LastMsgTime_index, online); else
SetItemText(i, item_SAlarmType_index, box.SAlarmType.ToString()); {
SetItemText(i, item_BoxStr_index, box.ToShowStr()); SetItemText(i, item_cid_index, "");
SetItemText(i, item_LastMsgTime_index, "");
SetItemText(i, item_SAlarmType_index, "");
SetItemText(i, item_BoxStr_index, "");
}
SetItemColor(i, move.runStatus, move.alarmType);
i++;
} }
else i++;
foreach (FeedingEquip equip in lineBean.FeedingEquipMap.Values)
{ {
SetItemText(i, item_cid_index, ""); SetItemText(i, item_debug_index, equip.Config.IsDebug.Equals(1) ? "✘" : "✔");
SetItemText(i, item_LastMsgTime_index, ""); SetItemText(i, item_alarm_index, equip.alarmType.ToString());
SetItemText(i, item_SAlarmType_index, ""); SetItemText(i, item_runStr_index, equip.GetRunStr());
SetItemText(i, item_BoxStr_index, ""); SetItemColor(i, equip.runStatus, equip.alarmType);
i++;
} }
SetItemColor(i, move.runStatus, move.alarmType);
i++;
}
i++;
foreach (FeedingEquip equip in lineBean.FeedingEquipMap.Values)
{
SetItemText(i, item_debug_index, equip.Config.IsDebug.Equals(1) ? "✘" : "✔");
SetItemText(i, item_alarm_index, equip.alarmType.ToString());
SetItemText(i, item_runStr_index, equip.GetRunStr());
SetItemColor(i, equip.runStatus, equip.alarmType);
i++; i++;
} foreach (ProvidingEquip equip in lineBean.ProvidingEquipMap.Values)
i++; {
foreach (ProvidingEquip equip in lineBean.ProvidingEquipMap.Values) SetItemText(i, item_debug_index, equip.Config.IsDebug.Equals(1) ? "✘" : "✔");
{ SetItemText(i, item_alarm_index, equip.alarmType.ToString());
SetItemText(i, item_debug_index, equip.Config.IsDebug.Equals(1) ? "✘" : "✔"); SetItemText(i, item_runStr_index, equip.GetRunStr());
SetItemText(i, item_alarm_index, equip.alarmType.ToString()); SetItemColor(i, equip.runStatus, equip.alarmType);
SetItemText(i, item_runStr_index, equip.GetRunStr()); i++;
SetItemColor(i, equip.runStatus, equip.alarmType); }
i++;
}
i++;
foreach (DischargeLine equip in lineBean.DisLineMap.Values)
{
SetItemText(i, item_debug_index, equip.Config.IsDebug.Equals(1) ? "✘" : "✔");
SetItemText(i, item_alarm_index, equip.alarmType.ToString());
SetItemText(i, item_runStr_index, equip.GetRunStr());
SetItemColor(i, equip.runStatus, equip.alarmType);
i++; i++;
} foreach (DischargeLine equip in lineBean.DisLineMap.Values)
if (lineBean.runStatus > LineRunStatus.Wait)
{
if (启动AToolStripMenuItem.Enabled.Equals(true))
{ {
formLineStatus(true); SetItemText(i, item_debug_index, equip.Config.IsDebug.Equals(1) ? "✘" : "✔");
SetItemText(i, item_alarm_index, equip.alarmType.ToString());
SetItemText(i, item_runStr_index, equip.GetRunStr());
SetItemColor(i, equip.runStatus, equip.alarmType);
i++;
} }
if ((lineBean.runStatus.Equals(LineRunStatus.HomeMoving) || lineBean.runStatus.Equals(LineRunStatus.Reset)) if (lineBean.runStatus > LineRunStatus.Wait)
&& lineBean.alarmType.Equals(LineAlarmType.None))
{ {
SetMenuS(复位RToolStripMenuItem, false); if (启动AToolStripMenuItem.Enabled.Equals(true))
SetMenuS(启动AToolStripMenuItem, false); {
formLineStatus(true);
}
if ((lineBean.runStatus.Equals(LineRunStatus.HomeMoving) || lineBean.runStatus.Equals(LineRunStatus.Reset))
&& lineBean.alarmType.Equals(LineAlarmType.None))
{
SetMenuS(复位RToolStripMenuItem, false);
SetMenuS(启动AToolStripMenuItem, false);
}
else
{
SetMenuS(复位RToolStripMenuItem, true);
}
} }
else else
{ {
SetMenuS(复位RToolStripMenuItem, true); SetMenuS(启动AToolStripMenuItem, true);
SetMenuS(复位RToolStripMenuItem, false);
SetMenuS(停止TToolStripMenuItem, false);
} }
if (!chbAGV.Checked.Equals(AgvClient.CurrCancelState))
{
chbAGV.Checked = AgvClient.CurrCancelState;
}
numTrayNum_ValueChanged(null, null);
} }
else catch (Exception ex)
{
SetMenuS(启动AToolStripMenuItem, true);
SetMenuS(复位RToolStripMenuItem, false);
SetMenuS(停止TToolStripMenuItem, false);
}
if (!chbAGV.Checked.Equals(AgvClient.CurrCancelState))
{ {
chbAGV.Checked = AgvClient.CurrCancelState; LogUtil.error("timer1_Tick出错：" + ex.ToString());
} }
numTrayNum_ValueChanged(null, null);
} }
private void SetItemColor(int i, LineRunStatus runStatus, LineAlarmType alarmType) private void SetItemColor(int i, LineRunStatus runStatus, LineAlarmType alarmType)
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!