Skip to content

顾剑亮 / AGVControl-Qisda-ProductionLine

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

变更随机充电桩为3，6

1 个父辈 3db9fcb6
内嵌 并排
正在显示 8 个修改的文件 包含 31 行增加 和 31 行删除
AGVControl-ProductionLine/BLL/Common.cs
...@@ -34,7 +34,7 @@ namespace AGVControl ...@@ -34,7 +34,7 @@ namespace AGVControl
public const string RandomCharge_IP1 = "10.85.199.80"; public const string RandomCharge_IP1 = "10.85.199.80";
public const string RandomCharge_IP2 = "10.85.199.81"; public const string RandomCharge_IP2 = "10.85.199.81";
public const string RandomCharge_IP3 = "10.85.199.71"; public const string RandomCharge_IP3 = "10.85.199.71";
public const string RandomCharge_IP4 = "10.85.199.72"; public const string RandomCharge_IP4 = "10.85.199.74";
public const string FileName_AGV = "AgvName.csv"; public const string FileName_AGV = "AgvName.csv";
public const string FileName_AgvMission = "AgvMission.csv"; public const string FileName_AgvMission = "AgvMission.csv";
public const string FileName_AgvProductionLine = "AgvProductionLine.csv"; public const string FileName_AgvProductionLine = "AgvProductionLine.csv";
...@@ -964,46 +964,46 @@ namespace AGVControl ...@@ -964,46 +964,46 @@ namespace AGVControl
#endregion #endregion
#region 指定充电位置 #region 指定充电位置
if (agv.IP == "10.85.199.73")//1767, if (agv.IP == "10.85.199.72")//1764
{ {
rtn = Common.mir.Add_Mission_Fleet(agv, Common.agvMission["AutoCharge5"], isRemovePreMission); rtn = Common.mir.Add_Mission_Fleet(agv, Common.agvMission["AutoCharge4"], isRemovePreMission);
if (rtn) if (rtn)
{ {
//agv.TaskSend = "AutoCharge5"; //agv.TaskSend = "AutoCharge5";
agv.Place = SettingString.AutoCharge; agv.Place = SettingString.AutoCharge;
Common.chargeStatus.charge5 = agv.Name; Common.chargeStatus.charge4 = agv.Name;
Common.chargeStatus.chargeInterval = DateTime.Now.Ticks; Common.chargeStatus.chargeInterval = DateTime.Now.Ticks;
log = string.Format("{0} AutoCharge5", agv.Name); log = string.Format("{0} AutoCharge4", agv.Name);
agv.Msg = log; agv.Msg = log;
Common.LogInfo(log); Common.LogInfo(log);
Common.mir.State_Ready(agv); Common.mir.State_Ready(agv);
} }
else else
{ {
log = string.Format("{0} AutoCharge5 失败", agv.Name); log = string.Format("{0} AutoCharge4 失败", agv.Name);
//防止上一个任务已执行但返回失败时，删除任务 //防止上一个任务已执行但返回失败时，删除任务
//Common.mir.Del_Mission(agv); //Common.mir.Del_Mission(agv);
Common.LogInfo(log); Common.LogInfo(log);
} }
return rtn; return rtn;
} }
else if (agv.IP == "10.85.199.74")//1768 else if (agv.IP == "10.85.199.73")//1767
{ {
rtn = Common.mir.Add_Mission_Fleet(agv, Common.agvMission["AutoCharge6"], isRemovePreMission); rtn = Common.mir.Add_Mission_Fleet(agv, Common.agvMission["AutoCharge5"], isRemovePreMission);
if (rtn) if (rtn)
{ {
//agv.TaskSend = "AutoCharge6"; //agv.TaskSend = "AutoCharge6";
agv.Place = SettingString.AutoCharge; agv.Place = SettingString.AutoCharge;
Common.chargeStatus.charge6 = agv.Name; Common.chargeStatus.charge5 = agv.Name;
Common.chargeStatus.chargeInterval = DateTime.Now.Ticks; Common.chargeStatus.chargeInterval = DateTime.Now.Ticks;
log = string.Format("{0} AutoCharge6", agv.Name); log = string.Format("{0} AutoCharge5", agv.Name);
agv.Msg = log; agv.Msg = log;
Common.LogInfo(log); Common.LogInfo(log);
Common.mir.State_Ready(agv); Common.mir.State_Ready(agv);
} }
else else
{ {
log = string.Format("{0} AutoCharge6 失败", agv.Name); log = string.Format("{0} AutoCharge5 失败", agv.Name);
//防止上一个任务已执行但返回失败时，删除任务 //防止上一个任务已执行但返回失败时，删除任务
//Common.mir.Del_Mission(agv); //Common.mir.Del_Mission(agv);
Common.LogInfo(log); Common.LogInfo(log);
...@@ -1033,23 +1033,23 @@ namespace AGVControl ...@@ -1033,23 +1033,23 @@ namespace AGVControl
} }
return rtn; return rtn;
} }
else if (Common.chargeStatus.charge4 == "")//1764 agv.IP == "10.85.199.72" else if (Common.chargeStatus.charge6 == "")//1764 agv.IP == "10.85.199.72"
{ {
rtn = Common.mir.Add_Mission_Fleet(agv, Common.agvMission["AutoCharge4"], isRemovePreMission); rtn = Common.mir.Add_Mission_Fleet(agv, Common.agvMission["AutoCharge6"], isRemovePreMission);
if (rtn) if (rtn)
{ {
//agv.TaskSend = "AutoCharge4"; //agv.TaskSend = "AutoCharge4";
agv.Place = SettingString.AutoCharge; agv.Place = SettingString.AutoCharge;
Common.chargeStatus.charge4 = agv.Name; Common.chargeStatus.charge6 = agv.Name;
Common.chargeStatus.chargeInterval = DateTime.Now.Ticks; Common.chargeStatus.chargeInterval = DateTime.Now.Ticks;
log = string.Format("{0} AutoCharge4", agv.Name); log = string.Format("{0} AutoCharge6", agv.Name);
agv.Msg = log; agv.Msg = log;
Common.LogInfo(log); Common.LogInfo(log);
Common.mir.State_Ready(agv); Common.mir.State_Ready(agv);
} }
else else
{ {
log = string.Format("{0} AutoCharge4 失败", agv.Name); log = string.Format("{0} AutoCharge6 失败", agv.Name);
//防止上一个任务已执行但返回失败时，删除任务 //防止上一个任务已执行但返回失败时，删除任务
//Common.mir.Del_Mission(agv); //Common.mir.Del_Mission(agv);
Common.LogInfo(log); Common.LogInfo(log);
......
AGVControl-ProductionLine/FrmMain.cs
...@@ -214,9 +214,9 @@ namespace AGVControl ...@@ -214,9 +214,9 @@ namespace AGVControl
{ {
Common.chargeStatus.charge3 = ""; Common.chargeStatus.charge3 = "";
} }
if (Common.chargeStatus.charge4.Equals(Common.agvInfo[e.RowIndex].Name)) if (Common.chargeStatus.charge6.Equals(Common.agvInfo[e.RowIndex].Name))
{ {
Common.chargeStatus.charge4 = ""; Common.chargeStatus.charge6 = "";
} }
Common.agvInfo[e.RowIndex].IsUse = false; Common.agvInfo[e.RowIndex].IsUse = false;
//Common.agvInfo[e.RowIndex].CurJob = null; //Common.agvInfo[e.RowIndex].CurJob = null;
...@@ -386,7 +386,7 @@ namespace AGVControl ...@@ -386,7 +386,7 @@ namespace AGVControl
if (!AGVManager.A6_Target.Equals("")) if (!AGVManager.A6_Target.Equals(""))
lblDestInfo.Text = AGVManager.A6_Target; lblDestInfo.Text = AGVManager.A6_Target;
lblCharge3.Text = "充电桩3:" + Common.chargeStatus.charge3; lblCharge3.Text = "充电桩3:" + Common.chargeStatus.charge3;
lblCharge4.Text = "充电桩4:" + Common.chargeStatus.charge4; lblCharge4.Text = "充电桩6:" + Common.chargeStatus.charge6;
lblStandy1.Text = "4C待机位1:" + Common.StandbyStation.C4_Station1; lblStandy1.Text = "4C待机位1:" + Common.StandbyStation.C4_Station1;
lblStandy2.Text = "4C待机位2:" + Common.StandbyStation.C4_Station2; lblStandy2.Text = "4C待机位2:" + Common.StandbyStation.C4_Station2;
})); }));
......
AGVControl-ProductionLine/bean/job/ChargeJob.cs
...@@ -185,9 +185,9 @@ namespace AGVControl ...@@ -185,9 +185,9 @@ namespace AGVControl
{ {
Common.chargeStatus.charge3 = ""; Common.chargeStatus.charge3 = "";
} }
if (Common.chargeStatus.charge4.Equals(agv.Name)) if (Common.chargeStatus.charge6.Equals(agv.Name))
{ {
Common.chargeStatus.charge4 = ""; Common.chargeStatus.charge6 = "";
} }
Common.MoveToNode(agv, SettingString.Standby); Common.MoveToNode(agv, SettingString.Standby);
UpdateJobTaskInfo(agv.CurTaskName, agv.CurTaskID); UpdateJobTaskInfo(agv.CurTaskName, agv.CurTaskID);
...@@ -201,9 +201,9 @@ namespace AGVControl ...@@ -201,9 +201,9 @@ namespace AGVControl
{ {
Common.chargeStatus.charge3 = ""; Common.chargeStatus.charge3 = "";
} }
if (Common.chargeStatus.charge4.Equals(agv.Name)) if (Common.chargeStatus.charge6.Equals(agv.Name))
{ {
Common.chargeStatus.charge4 = ""; Common.chargeStatus.charge6 = "";
} }
runInfo = "充电过程检测到任务，电量[" + agv.Battery + "%]大于最小电量[" + Common.chargeStatus.chargeMin + "%],中断充电执行任务"; runInfo = "充电过程检测到任务，电量[" + agv.Battery + "%]大于最小电量[" + Common.chargeStatus.chargeMin + "%],中断充电执行任务";
msg += runInfo; msg += runInfo;
...@@ -234,9 +234,9 @@ namespace AGVControl ...@@ -234,9 +234,9 @@ namespace AGVControl
{ {
Common.chargeStatus.charge3 = ""; Common.chargeStatus.charge3 = "";
} }
if (Common.chargeStatus.charge4.Equals(agv.Name)) if (Common.chargeStatus.charge6.Equals(agv.Name))
{ {
Common.chargeStatus.charge4 = ""; Common.chargeStatus.charge6 = "";
} }
return job; return job;
} }
...@@ -250,9 +250,9 @@ namespace AGVControl ...@@ -250,9 +250,9 @@ namespace AGVControl
{ {
Common.chargeStatus.charge3 = ""; Common.chargeStatus.charge3 = "";
} }
if (Common.chargeStatus.charge4.Equals(agv.Name)) if (Common.chargeStatus.charge6.Equals(agv.Name))
{ {
Common.chargeStatus.charge4 = ""; Common.chargeStatus.charge6 = "";
} }
} }
} }
...@@ -283,9 +283,9 @@ namespace AGVControl ...@@ -283,9 +283,9 @@ namespace AGVControl
{ {
Common.chargeStatus.charge3 = ""; Common.chargeStatus.charge3 = "";
} }
if (Common.chargeStatus.charge4.Equals(agv.Name)) if (Common.chargeStatus.charge6.Equals(agv.Name))
{ {
Common.chargeStatus.charge4 = ""; Common.chargeStatus.charge6 = "";
} }
return job; return job;
} }
...@@ -299,9 +299,9 @@ namespace AGVControl ...@@ -299,9 +299,9 @@ namespace AGVControl
{ {
Common.chargeStatus.charge3 = ""; Common.chargeStatus.charge3 = "";
} }
if (Common.chargeStatus.charge4.Equals(agv.Name)) if (Common.chargeStatus.charge6.Equals(agv.Name))
{ {
Common.chargeStatus.charge4 = ""; Common.chargeStatus.charge6 = "";
} }
} }
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!