Skip to content

顾剑亮 / AGVControl-Qisda-ProductionLine

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

4CFeeder自动线开启

1 个父辈 bdd7ce75
全部展开
内嵌 并排
正在显示 11 个修改的文件 包含 26 行增加 和 18 行删除
AGVControl-ProductionLine/FrmMain.cs
...@@ -26,7 +26,7 @@ namespace AGVControl ...@@ -26,7 +26,7 @@ namespace AGVControl
{ {
InitializeComponent(); InitializeComponent();
showTimer = new System.Timers.Timer(); showTimer = new System.Timers.Timer();
showTimer.Interval = 1000; showTimer.Interval = 5000;
//showTimer.Enabled = true; //showTimer.Enabled = true;
//showTimer.AutoReset = true; //showTimer.AutoReset = true;
showTimer.Elapsed += ShowTimer_Elapsed; showTimer.Elapsed += ShowTimer_Elapsed;
...@@ -101,6 +101,10 @@ namespace AGVControl ...@@ -101,6 +101,10 @@ namespace AGVControl
System.GC.Collect(); System.GC.Collect();
} }
/// <summary>
/// 小车状态刷新
/// </summary>
/// <param name="agvIndex"></param>
private void Control_AgvChanged(int agvIndex) private void Control_AgvChanged(int agvIndex)
{ {
Invoke(new Action(() => { DgvAgv.Rows[agvIndex].DefaultCellStyle.ForeColor = Common.agvInfo[agvIndex].StateID.Equals(eAGVState.Error) ? Color.Red : Color.Black; })); Invoke(new Action(() => { DgvAgv.Rows[agvIndex].DefaultCellStyle.ForeColor = Common.agvInfo[agvIndex].StateID.Equals(eAGVState.Error) ? Color.Red : Color.Black; }));
...@@ -204,6 +208,7 @@ namespace AGVControl ...@@ -204,6 +208,7 @@ namespace AGVControl
private void DgvAgv_CellClick(object sender, DataGridViewCellEventArgs e) private void DgvAgv_CellClick(object sender, DataGridViewCellEventArgs e)
{ {
DgvAgv.Refresh();
if (e.RowIndex == -1) return; if (e.RowIndex == -1) return;
if (e.ColumnIndex == 10) //调用 if (e.ColumnIndex == 10) //调用
...@@ -368,9 +373,11 @@ namespace AGVControl ...@@ -368,9 +373,11 @@ namespace AGVControl
try try
{ {
agvRunInfo[i].Text = Common.agvInfo[i].RunInfo(); agvRunInfo[i].Text = Common.agvInfo[i].RunInfo();
Application.DoEvents();
} }
catch (Exception ex) catch (Exception ex)
{ {
Common.log.Error("显示"+ Common.agvInfo[i].Name+"运行信息异常");
} }
} }
......
AGVControl-ProductionLine/bean/job/GoEmptyShelfLineJob.cs
...@@ -192,14 +192,14 @@ namespace AGVControl ...@@ -192,14 +192,14 @@ namespace AGVControl
CurTaskState = Common.GetTakJobState(CurTaskID); CurTaskState = Common.GetTakJobState(CurTaskID);
if (Common.CheckTaskFinished(agv, EmptyShelfPlace, CurTaskState)) if (Common.CheckTaskFinished(agv, EmptyShelfPlace, CurTaskState))
{ {
if (EmptyShelfPlace.Equals(SettingString.C4FeederOut)) //if (EmptyShelfPlace.Equals(SettingString.C4FeederOut))
{ //{
runInfo = "AGV到达 " + EmptyShelfPlace; // runInfo = "AGV到达 " + EmptyShelfPlace;
msg += runInfo; // msg += runInfo;
TakeEmptyStep.Msg = msg; // TakeEmptyStep.Msg = msg;
return new EnterLeaveShelfJob(EmptyShelfPlace, eEnterLeaveType.Enter); // return new EnterLeaveShelfJob(EmptyShelfPlace, eEnterLeaveType.Enter);
} //}
else //else
{ {
TakeEmptyStep.ToNextStep(TAKE_EMPTY_STEP.WAIT_LINE_RESPONSE); TakeEmptyStep.ToNextStep(TAKE_EMPTY_STEP.WAIT_LINE_RESPONSE);
runInfo= "AGV到达 " + EmptyShelfPlace + " 向产线发送出料架请求[ReadyLeave]"; runInfo= "AGV到达 " + EmptyShelfPlace + " 向产线发送出料架请求[ReadyLeave]";
......
AGVControl-ProductionLine/bean/job/SendFullShelfToLineJob.cs
...@@ -135,13 +135,13 @@ namespace AGVControl ...@@ -135,13 +135,13 @@ namespace AGVControl
CurTaskState = Common.GetTakJobState(CurTaskID); CurTaskState = Common.GetTakJobState(CurTaskID);
if (Common.CheckTaskFinished(agv, FullShelfPlace, CurTaskState)) if (Common.CheckTaskFinished(agv, FullShelfPlace, CurTaskState))
{ {
if (FullShelfPlace.Equals(SettingString.C4FeederIn)) //if (FullShelfPlace.Equals(SettingString.C4FeederIn))
{ //{
runInfo = "AGV到达 " + FullShelfPlace + "完成"; // runInfo = "AGV到达 " + FullShelfPlace + "完成";
msg += runInfo; // msg += runInfo;
SendFullShelfStep.Msg = msg; // SendFullShelfStep.Msg = msg;
return new EnterLeaveShelfJob(FullShelfPlace, eEnterLeaveType.Leave); // return new EnterLeaveShelfJob(FullShelfPlace, eEnterLeaveType.Leave);
} //}
if (IsIgnoreBigShelf) if (IsIgnoreBigShelf)
{ {
SendFullShelfStep.ToNextStep(SEND_FULL_SHELF_STEP.WAIT_LINE_RESPONSE); SendFullShelfStep.ToNextStep(SEND_FULL_SHELF_STEP.WAIT_LINE_RESPONSE);
...@@ -152,7 +152,7 @@ namespace AGVControl ...@@ -152,7 +152,7 @@ namespace AGVControl
} }
else else
{ {
if (RFID.StartsWith("C") && !agv.Place.Equals(SettingString.D4FeederIn)) if (RFID.StartsWith("C") && !agv.Place.Equals(SettingString.D4FeederIn) && !agv.Place.Equals(SettingString.C4FeederIn))
{ {
SendFullShelfStep.ToNextStep(SEND_FULL_SHELF_STEP.WAIT_BIG_SHELF_UNLOCK); SendFullShelfStep.ToNextStep(SEND_FULL_SHELF_STEP.WAIT_BIG_SHELF_UNLOCK);
runInfo = "AGV到达 " + FullShelfPlace + "，并等待大料架[" + RFID + "]解绑"; runInfo = "AGV到达 " + FullShelfPlace + "，并等待大料架[" + RFID + "]解绑";
......
AGVControl-ProductionLine/obj/Debug/AGVControl-ProductionLine.csproj.FileListAbsolute.txt
...@@ -70,3 +70,4 @@ E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLi ...@@ -70,3 +70,4 @@ E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLi
E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.csproj.CopyComplete E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.csproj.CopyComplete
E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.exe E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.exe
E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.pdb E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.pdb
E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.csprojAssemblyReference.cache
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!