Skip to content

张东亮 / SO775-AGV

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

agv节点状态不符

1 个父辈 8a337f3a
内嵌 并排
正在显示 4 个修改的文件 包含 9 行增加 和 8 行删除
AGVDispatch/AGVDispatch.csproj
...@@ -122,11 +122,11 @@ ...@@ -122,11 +122,11 @@
<Content Include="icon.ico" /> <Content Include="icon.ico" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\AGV-Com\Agv\Agv.csproj"> <ProjectReference Include="..\AGV-Com\Agv\Agv.csproj">
<Project>{a2ef9efc-51c5-4bf6-965f-3a06beadd632}</Project> <Project>{a2ef9efc-51c5-4bf6-965f-3a06beadd632}</Project>
<Name>Agv</Name> <Name>Agv</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\AGV-Com\Server\Server.csproj"> <ProjectReference Include="..\AGV-Com\Server\Server.csproj">
<Project>{f539cef2-cbd5-4abf-afd2-56c848ded0c0}</Project> <Project>{f539cef2-cbd5-4abf-afd2-56c848ded0c0}</Project>
<Name>Server</Name> <Name>Server</Name>
</ProjectReference> </ProjectReference>
......
DeviceLibrary/DeviceLibrary.csproj
...@@ -76,11 +76,11 @@ ...@@ -76,11 +76,11 @@
<Compile Include="Standby.cs" /> <Compile Include="Standby.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\AGV-Com\Agv\Agv.csproj"> <ProjectReference Include="..\AGV-Com\Agv\Agv.csproj">
<Project>{a2ef9efc-51c5-4bf6-965f-3a06beadd632}</Project> <Project>{a2ef9efc-51c5-4bf6-965f-3a06beadd632}</Project>
<Name>Agv</Name> <Name>Agv</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\AGV-Com\Server\Server.csproj"> <ProjectReference Include="..\AGV-Com\Server\Server.csproj">
<Project>{f539cef2-cbd5-4abf-afd2-56c848ded0c0}</Project> <Project>{f539cef2-cbd5-4abf-afd2-56c848ded0c0}</Project>
<Name>Server</Name> <Name>Server</Name>
</ProjectReference> </ProjectReference>
......
DeviceLibrary/bean/Agv_Info.cs
...@@ -141,7 +141,7 @@ namespace DeviceLibrary ...@@ -141,7 +141,7 @@ namespace DeviceLibrary
/// 当前任务名称 /// 当前任务名称
/// </summary> /// </summary>
public string CurTaskName { get; set; } public string CurTaskName { get; set; }
public long TimeStamp { get; set; }
/// <summary> /// <summary>
/// 当前任务的GUID /// 当前任务的GUID
/// </summary> /// </summary>
...@@ -385,6 +385,7 @@ namespace DeviceLibrary ...@@ -385,6 +385,7 @@ namespace DeviceLibrary
/// <returns></returns> /// <returns></returns>
private void CheckStandTimeOut(AgvPosition position) private void CheckStandTimeOut(AgvPosition position)
{ {
if (position == null) return;
if (IsUse && CurJob != null && !(CurJob is ChargeJob) && if (IsUse && CurJob != null && !(CurJob is ChargeJob) &&
(!CurTaskName.Contains(SettingString.Standby)))//!CurTaskName.Contains(SettingString.AutoCharge) || (!CurTaskName.Contains(SettingString.Standby)))//!CurTaskName.Contains(SettingString.AutoCharge) ||
{ {
...@@ -454,7 +455,7 @@ namespace DeviceLibrary ...@@ -454,7 +455,7 @@ namespace DeviceLibrary
public bool AssignTask(string taskName) public bool AssignTask(string taskName)
{ {
bool rtn=false; bool rtn=false;
if(this.isCon) if(!this.isCon)
{ {
StateKanban.SetCurTask(Context.showNameMissionName[taskName]); StateKanban.SetCurTask(Context.showNameMissionName[taskName]);
LogUtil.info(string.Format("{0} 因离线分配{1}任务失败", Name, taskName)); LogUtil.info(string.Format("{0} 因离线分配{1}任务失败", Name, taskName));
......
SO775-AGV.sln
...@@ -11,9 +11,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "Common\Common.csp ...@@ -11,9 +11,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "Common\Common.csp
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AGV_UI", "AGV_UI\AGV_UI.csproj", "{C6D2FC09-46F7-4EC5-A877-15EA06342E4F}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AGV_UI", "AGV_UI\AGV_UI.csproj", "{C6D2FC09-46F7-4EC5-A877-15EA06342E4F}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Agv", "..\AGV-Com\Agv\Agv.csproj", "{A2EF9EFC-51C5-4BF6-965F-3A06BEADD632}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Agv", "AGV-Com\Agv\Agv.csproj", "{A2EF9EFC-51C5-4BF6-965F-3A06BEADD632}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server", "..\AGV-Com\Server\Server.csproj", "{F539CEF2-CBD5-4ABF-AFD2-56C848DED0C0}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server", "AGV-Com\Server\Server.csproj", "{F539CEF2-CBD5-4ABF-AFD2-56C848DED0C0}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!