Skip to content

顾剑亮 / AGVControl-Qisda-ProductionLine

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

20220905

1 个父辈 9785c8d3
内嵌 并排
正在显示 31 个修改的文件 包含 31 行增加 和 11 行删除
AGVControl-ProductionLine/BLL/Common.cs
...@@ -845,6 +845,7 @@ namespace AGVControl ...@@ -845,6 +845,7 @@ namespace AGVControl
{ {
Common.log.Error("A6的出料信息不正确，请检查：" + FullShelfDestInfo.ShowInfo("ERROR")); Common.log.Error("A6的出料信息不正确，请检查：" + FullShelfDestInfo.ShowInfo("ERROR"));
} }
AGVManager.A6_Target = "";
} }
} }
return false; return false;
...@@ -891,7 +892,7 @@ namespace AGVControl ...@@ -891,7 +892,7 @@ namespace AGVControl
public static bool CheckStationState(ClientNode clientNode, out string rfid) public static bool CheckStationState(ClientNode clientNode, out string rfid)
{ {
rfid = ""; rfid = "";
if(IgnoreLightLines.Contains(clientNode.Name)&&Common.missionManager.GetUnlockCnt(clientNode.Name)>0) if (IgnoreLightLines.Contains(clientNode.Name) && Common.missionManager.GetUnlockCnt(clientNode.Name) > 0)
{ {
rfid = Common.missionManager.GetUnlockRfids(clientNode.Name)[0]; rfid = Common.missionManager.GetUnlockRfids(clientNode.Name)[0];
warnMsg = ""; warnMsg = "";
...@@ -924,7 +925,7 @@ namespace AGVControl ...@@ -924,7 +925,7 @@ namespace AGVControl
/// <returns>true:表示正常</returns> /// <returns>true:表示正常</returns>
public static bool UpdateStationState(ClientNode clientNode) public static bool UpdateStationState(ClientNode clientNode)
{ {
if(IgnoreLightLines.Contains(clientNode.Name)) if (IgnoreLightLines.Contains(clientNode.Name))
{ {
clientNode.WarnMsg = ""; clientNode.WarnMsg = "";
return true; return true;
...@@ -1258,11 +1259,11 @@ namespace AGVControl ...@@ -1258,11 +1259,11 @@ namespace AGVControl
item.ClearOccupied(agvname); item.ClearOccupied(agvname);
} }
} }
public static void SetNodeOccupied(string nodename,string agvname) public static void SetNodeOccupied(string nodename, string agvname)
{ {
ClearNodeBuff(agvname); ClearNodeBuff(agvname);
ClientNode clientNode = nodeInfo.Find(s => s.Name.Equals(nodename)); ClientNode clientNode = nodeInfo.Find(s => s.Name.Equals(nodename));
if(clientNode!=null) if (clientNode != null)
{ {
clientNode.SetOccupy(agvname); clientNode.SetOccupy(agvname);
} }
......
AGVControl-ProductionLine/BLL/MiR_API.cs
...@@ -474,13 +474,14 @@ namespace BLL ...@@ -474,13 +474,14 @@ namespace BLL
{ {
try try
{ {
int tryTimes = 5; int tryTimes = 15;
while (tryTimes > 0) while (tryTimes > 0)
{ {
string url = "http://" + info.IP + "/api/v2.0.0/mission_queue"; string url = "http://" + info.IP + "/api/v2.0.0/mission_queue";
System.Net.HttpStatusCode res = HttpDel(url, info.IP, info.Authorization); System.Net.HttpStatusCode res = HttpDel(url, info.IP, info.Authorization);
if (res.Equals(System.Net.HttpStatusCode.NoContent)) if (res.Equals(System.Net.HttpStatusCode.NoContent)&& info.StateID.Equals(eAGVState.Ready))
break; break;
tryTimes--;
} }
} }
......
AGVControl-ProductionLine/bean/job/EmptyAGVBackJob.cs
...@@ -56,7 +56,7 @@ namespace AGVControl ...@@ -56,7 +56,7 @@ namespace AGVControl
CurTaskState = Common.GetTakJobState(CurTaskID); CurTaskState = Common.GetTakJobState(CurTaskID);
if (curJobStep.IsStep(EMPTY_AGV_BACK_STEP.NONE)) if (curJobStep.IsStep(EMPTY_AGV_BACK_STEP.NONE))
{ {
if (Common.FindEmptyShelfNode(agv, out string nodeName, true)) if (Common.FindEmptyShelfNode(agv, out string nodeName, false))
{ {
int i = Common.agvInfo.FindIndex(s => s.CurJob is GoEmptyShelfLineJob && ((GoEmptyShelfLineJob)s.CurJob).EmptyShelfPlace.Equals(nodeName)); int i = Common.agvInfo.FindIndex(s => s.CurJob is GoEmptyShelfLineJob && ((GoEmptyShelfLineJob)s.CurJob).EmptyShelfPlace.Equals(nodeName));
if (i == -1) if (i == -1)
...@@ -192,7 +192,7 @@ namespace AGVControl ...@@ -192,7 +192,7 @@ namespace AGVControl
else else
{ {
curJobStep.RecordRunLog(agv, JobName, runInfo, SettingString.Standby); curJobStep.RecordRunLog(agv, JobName, runInfo, SettingString.Standby);
if (Common.FindEmptyShelfNode(agv, out string nodeName, true)) if (Common.FindEmptyShelfNode(agv, out string nodeName, false))
{ {
int i = Common.agvInfo.FindIndex(s => s.CurJob is GoEmptyShelfLineJob && ((GoEmptyShelfLineJob)s.CurJob).EmptyShelfPlace.Equals(nodeName)); int i = Common.agvInfo.FindIndex(s => s.CurJob is GoEmptyShelfLineJob && ((GoEmptyShelfLineJob)s.CurJob).EmptyShelfPlace.Equals(nodeName));
if (i == -1) if (i == -1)
...@@ -241,7 +241,7 @@ namespace AGVControl ...@@ -241,7 +241,7 @@ namespace AGVControl
{ {
Common.ClearNodeBuff(agv.Name); Common.ClearNodeBuff(agv.Name);
curJobStep.RecordRunLog(agv, JobName, runInfo, SettingString.DoorCToD); curJobStep.RecordRunLog(agv, JobName, runInfo, SettingString.DoorCToD);
if (Common.FindEmptyShelfNode(agv, out string nodeName, true)) if (Common.FindEmptyShelfNode(agv, out string nodeName, false))
{ {
int i = Common.agvInfo.FindIndex(s => s.CurJob is GoEmptyShelfLineJob && ((GoEmptyShelfLineJob)s.CurJob).EmptyShelfPlace.Equals(nodeName)); int i = Common.agvInfo.FindIndex(s => s.CurJob is GoEmptyShelfLineJob && ((GoEmptyShelfLineJob)s.CurJob).EmptyShelfPlace.Equals(nodeName));
if (i == -1) if (i == -1)
......
AGVControl-ProductionLine/bin/ProCopyClient.exe.config
...@@ -4,6 +4,6 @@ ...@@ -4,6 +4,6 @@
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
</startup> </startup>
<appSettings> <appSettings>
<add key="ProName" value="4F-AGV-LINE-提示信息优化" /> <add key="ProName" value="4F-AGV-LINE-送满料回来不回收非工单产线空料架" />
</appSettings> </appSettings>
</configuration> </configuration>
\ No newline at end of file \ No newline at end of file
AGVControl-ProductionLine/obj/Debug/AGVControl-ProductionLine.csproj.CoreCompileInputs.cache
c1dcc8c90bc02014bb2dcb74bc1a4ab9d348762e 0e69843fc662e7f0186e1500acb349b4dad390a6
AGVControl-ProductionLine/obj/Debug/AGVControl-ProductionLine.csproj.FileListAbsolute.txt
...@@ -73,3 +73,21 @@ E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLi ...@@ -73,3 +73,21 @@ E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLi
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.csproj.AssemblyReference.cache E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.csproj.AssemblyReference.cache
E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.csproj.SuggestedBindingRedirects.cache E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.csproj.SuggestedBindingRedirects.cache
E:\Neotel\Projects\Gitee\Qisda\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\bin\Debug\AGVControl-ProductionLine.exe.config
E:\Neotel\Projects\Gitee\Qisda\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\bin\Debug\AGVControl-ProductionLine.exe
E:\Neotel\Projects\Gitee\Qisda\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\bin\Debug\AGVControl-ProductionLine.pdb
E:\Neotel\Projects\Gitee\Qisda\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\bin\Debug\AsaPL.AgvClient.dll
E:\Neotel\Projects\Gitee\Qisda\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\bin\Debug\log4net.dll
E:\Neotel\Projects\Gitee\Qisda\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\bin\Debug\Newtonsoft.Json.dll
E:\Neotel\Projects\Gitee\Qisda\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\bin\Debug\RestSharp.dll
E:\Neotel\Projects\Gitee\Qisda\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\bin\Debug\AsaPL.AgvClient.pdb
E:\Neotel\Projects\Gitee\Qisda\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\bin\Debug\RestSharp.xml
E:\Neotel\Projects\Gitee\Qisda\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.csproj.AssemblyReference.cache
E:\Neotel\Projects\Gitee\Qisda\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.csproj.SuggestedBindingRedirects.cache
E:\Neotel\Projects\Gitee\Qisda\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl.FrmMain.resources
E:\Neotel\Projects\Gitee\Qisda\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl.Properties.Resources.resources
E:\Neotel\Projects\Gitee\Qisda\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.csproj.GenerateResource.cache
E:\Neotel\Projects\Gitee\Qisda\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.csproj.CoreCompileInputs.cache
E:\Neotel\Projects\Gitee\Qisda\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.csproj.CopyComplete
E:\Neotel\Projects\Gitee\Qisda\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.exe
E:\Neotel\Projects\Gitee\Qisda\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.pdb
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!