Skip to content

顾剑亮 / Camera

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

分盘线初版

1 个父辈 a48bf027
全部展开
内嵌 并排
正在显示 13 个修改的文件 包含 42 行增加 和 27 行删除
AGVControl/BLL/Control.cs
...@@ -1098,10 +1098,10 @@ namespace BLL ...@@ -1098,10 +1098,10 @@ namespace BLL
rtn = C8Enter(agv); break; rtn = C8Enter(agv); break;
case "D2": case "D2":
rtn = D2Enter(agv); break; rtn = D2Enter(agv); break;
default: //default:
agv.Mark = ""; // agv.Mark = "";
agv.Place = ""; // agv.Place = "";
break; // break;
} }
AgvChanged?.Invoke(agvIdx); AgvChanged?.Invoke(agvIdx);
...@@ -1160,8 +1160,8 @@ namespace BLL ...@@ -1160,8 +1160,8 @@ namespace BLL
case "D1": case "D1":
rtn = D1Leave(agv); break; rtn = D1Leave(agv); break;
default: default:
agv.Mark = ""; //agv.Mark = "";
agv.Place = ""; //agv.Place = "";
Common.log.OutInfo("ERROR:" + agv.Place); Common.log.OutInfo("ERROR:" + agv.Place);
break; break;
} }
...@@ -2774,7 +2774,17 @@ namespace BLL ...@@ -2774,7 +2774,17 @@ namespace BLL
if (!BAreaLeaveCheck) if (!BAreaLeaveCheck)
{ {
string log = agv.Name + " A4 FindNeedEnterWithMark [Mark=" + agv.Mark + "]"; //在A4出料架后，B区域暂时找不到出库料仓,先回待机位，如果mark消失，则将料架送回
nodeIdx = Common.nodeInfo.FindIndex(s => s.Mark == agv.Mark && s.AgvName == "" && s.IsUse);
if(nodeIdx==-1)
{
nodeIdx = Common.nodeInfo.FindIndex(s => s.Mark == agv.Mark);
if(nodeIdx==-1)//当前mark任务已结束
{
}
}
string log = agv.Name + " A4 FindBNeedEnterWithMark [Mark=" + agv.Mark + "]";
Common.log.OutInfo(log); Common.log.OutInfo(log);
return true; return true;
} }
......
AGVControl/Common.cs
...@@ -380,22 +380,24 @@ namespace AGVControl ...@@ -380,22 +380,24 @@ namespace AGVControl
public string[] ToRow() public string[] ToRow()
{ {
//AGV名称,IP,AGV状态,任务状态,地点,后续任务,在线,电量,调用,清除缓存 //AGV名称,IP,AGV状态,任务状态,地点,后续任务,在线,电量,调用,清除缓存
string[] s = new string[10]; List<string> vs = new List<string>();
s[0] = Name; vs.Add(Name);
s[1] = IP; vs.Add(IP);
if (IsCon) if (IsCon)
{ {
s[2] = StateText; vs.Add(StateText);
s[3] = string.Format("{0}({1})", MissionStatus.ToString(), (int)MissionStatus); vs.Add(string.Format("{0}({1})", MissionStatus.ToString(), (int)MissionStatus));
s[4] = Place; vs.Add(Mark);
s[5] = NextMission; vs.Add(RFID);
vs.Add(Place);
vs.Add(NextMission);
} }
s[6] = IsCon.ToString(); vs.Add(IsCon.ToString());
s[7] = Battery + "%"; vs.Add(Battery + "%");
s[8] = IsUse.ToString(); vs.Add(IsUse.ToString());
s[9] = "Clear"; vs.Add("Clear");
return s; return vs.ToArray();
} }
......
AGVControl/FrmMain.cs
...@@ -143,14 +143,14 @@ namespace AGVControl ...@@ -143,14 +143,14 @@ namespace AGVControl
private void DgvAgv_CellClick(object sender, DataGridViewCellEventArgs e) private void DgvAgv_CellClick(object sender, DataGridViewCellEventArgs e)
{ {
if (e.RowIndex == -1) return; if (e.RowIndex == -1) return;
if (e.ColumnIndex == 8) if (e.ColumnIndex == 10)
{ {
Common.agvInfo[e.RowIndex].IsUse = !Common.agvInfo[e.RowIndex].IsUse; Common.agvInfo[e.RowIndex].IsUse = !Common.agvInfo[e.RowIndex].IsUse;
DgvAgv.Rows[e.RowIndex].Cells[e.ColumnIndex].Value = Common.agvInfo[e.RowIndex].IsUse.ToString(); DgvAgv.Rows[e.RowIndex].Cells[e.ColumnIndex].Value = Common.agvInfo[e.RowIndex].IsUse.ToString();
Common.appConfig.AppSettings.Settings[Common.agvInfo[e.RowIndex].Name].Value = Common.agvInfo[e.RowIndex].IsUse.ToString(); Common.appConfig.AppSettings.Settings[Common.agvInfo[e.RowIndex].Name].Value = Common.agvInfo[e.RowIndex].IsUse.ToString();
Common.appConfig.Save(); Common.appConfig.Save();
} }
else if (e.ColumnIndex == 9) else if (e.ColumnIndex == 11)
{ {
//清除小车缓存 //清除小车缓存
Common.log.OutInfo(string.Format("手动清除缓存，{0} {1}", Common.agvInfo[e.RowIndex].Name, Common.agvInfo[e.RowIndex].Place)); Common.log.OutInfo(string.Format("手动清除缓存，{0} {1}", Common.agvInfo[e.RowIndex].Name, Common.agvInfo[e.RowIndex].Place));
...@@ -160,7 +160,6 @@ namespace AGVControl ...@@ -160,7 +160,6 @@ namespace AGVControl
Common.agvInfo[e.RowIndex].RFID = ""; Common.agvInfo[e.RowIndex].RFID = "";
Common.agvInfo[e.RowIndex].NextMission = ""; Common.agvInfo[e.RowIndex].NextMission = "";
Common.agvInfo[e.RowIndex].IsClearRunInfo = true; Common.agvInfo[e.RowIndex].IsClearRunInfo = true;
DgvAgv.Rows[e.RowIndex].SetValues(Common.agvInfo[e.RowIndex].ToRow());
//清除节点缓存 //清除节点缓存
int idx = Common.nodeInfo.FindIndex(s => s.Name == place); int idx = Common.nodeInfo.FindIndex(s => s.Name == place);
...@@ -173,6 +172,7 @@ namespace AGVControl ...@@ -173,6 +172,7 @@ namespace AGVControl
//添加Init任务 //添加Init任务
Common.mir.Add_Mission_Fleet(Common.agvInfo[e.RowIndex], Common.agvMission["Init"]); Common.mir.Add_Mission_Fleet(Common.agvInfo[e.RowIndex], Common.agvMission["Init"]);
Common.mir.State_Ready(Common.agvInfo[e.RowIndex]); Common.mir.State_Ready(Common.agvInfo[e.RowIndex]);
DgvAgv.Rows[e.RowIndex].SetValues(Common.agvInfo[e.RowIndex].ToRow());
} }
} }
...@@ -225,16 +225,12 @@ namespace AGVControl ...@@ -225,16 +225,12 @@ namespace AGVControl
MessageBox.Show("请先清除当前小车的任务缓存！"); MessageBox.Show("请先清除当前小车的任务缓存！");
return; return;
} }
bool rtn = Common.mir.Add_Mission_Fleet(Common.agvInfo[idx], Common.agvMission[LstAgvPlace.Text]); bool rtn = Common.mir.Add_Mission(Common.agvInfo[idx], Common.agvMission[LstAgvPlace.Text]);
if (!rtn) if (!rtn)
return; return;
Common.agvInfo[idx].Place = ""; Common.agvInfo[idx].Place = "";
Common.agvInfo[idx].IsClearRunInfo = false; Common.agvInfo[idx].IsClearRunInfo = false;
Common.log.OutInfo("手动添加任务： " + LstAgvPlace.Text); Common.log.OutInfo("手动添加任务： " + LstAgvPlace.Text);
//if (LstAgvPlace.Text.StartsWith("Move") && LstAgvPlace.Text.Length ==6)
//{
// Common.agvInfo[idx].Place = LstAgvPlace.Text.Substring(4);
//}
} }
} }
......
AGVControl/FrmMain.resx
...@@ -129,6 +129,12 @@ ...@@ -129,6 +129,12 @@
<metadata name="Column14.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="Column14.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="Column22.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column23.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column18.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="Column18.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
......
AGVControl/obj/Debug/AGVControl.csproj.FileListAbsolute.txt
...@@ -91,3 +91,4 @@ C:\ZDL\Gitee\AGVControl\AGVControl\obj\Debug\AGVControl.csproj.CopyComplete ...@@ -91,3 +91,4 @@ C:\ZDL\Gitee\AGVControl\AGVControl\obj\Debug\AGVControl.csproj.CopyComplete
C:\ZDL\Gitee\AGVControl\AGVControl\obj\Debug\AGVControl.exe C:\ZDL\Gitee\AGVControl\AGVControl\obj\Debug\AGVControl.exe
C:\ZDL\Gitee\AGVControl\AGVControl\obj\Debug\AGVControl.pdb C:\ZDL\Gitee\AGVControl\AGVControl\obj\Debug\AGVControl.pdb
C:\ZDL\Gitee\AGVControl\AGVControl\obj\Debug\AGVControl.csproj.CoreCompileInputs.cache C:\ZDL\Gitee\AGVControl\AGVControl\obj\Debug\AGVControl.csproj.CoreCompileInputs.cache
C:\ZDL\Gitee\AGVControl\AGVControl\obj\Debug\AGVControl.csprojAssemblyReference.cache
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!