agv节点状态不符

AGVDispatch/AGVDispatch.csproj

@@ -122,11 +122,11 @@
     <Content Include="icon.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\AGV-Com\Agv\Agv.csproj">
+    <ProjectReference Include="..\AGV-Com\Agv\Agv.csproj">
       <Project>{a2ef9efc-51c5-4bf6-965f-3a06beadd632}</Project>
       <Name>Agv</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\AGV-Com\Server\Server.csproj">
+    <ProjectReference Include="..\AGV-Com\Server\Server.csproj">
       <Project>{f539cef2-cbd5-4abf-afd2-56c848ded0c0}</Project>
       <Name>Server</Name>
     </ProjectReference>

DeviceLibrary/DeviceLibrary.csproj

@@ -76,11 +76,11 @@
     <Compile Include="Standby.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\AGV-Com\Agv\Agv.csproj">
+    <ProjectReference Include="..\AGV-Com\Agv\Agv.csproj">
       <Project>{a2ef9efc-51c5-4bf6-965f-3a06beadd632}</Project>
       <Name>Agv</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\AGV-Com\Server\Server.csproj">
+    <ProjectReference Include="..\AGV-Com\Server\Server.csproj">
       <Project>{f539cef2-cbd5-4abf-afd2-56c848ded0c0}</Project>
       <Name>Server</Name>
     </ProjectReference>

DeviceLibrary/bean/Agv_Info.cs

@@ -141,7 +141,7 @@ namespace DeviceLibrary
         /// 当前任务名称
         /// </summary>
         public string CurTaskName { get; set; }
-
+    public long TimeStamp { get; set; }
         /// <summary>
         /// 当前任务的GUID
         /// </summary>
@@ -385,6 +385,7 @@ namespace DeviceLibrary
         /// <returns></returns>
         private void CheckStandTimeOut(AgvPosition position)
         {
+            if (position == null) return;
             if (IsUse && CurJob != null && !(CurJob is ChargeJob) &&
                 (!CurTaskName.Contains(SettingString.Standby)))//!CurTaskName.Contains(SettingString.AutoCharge) ||
             {
@@ -454,7 +455,7 @@ namespace DeviceLibrary
         public bool AssignTask(string taskName)
         {
             bool rtn=false;
-            if(this.isCon)
+            if(!this.isCon)
             {
                 StateKanban.SetCurTask(Context.showNameMissionName[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
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AGV_UI", "AGV_UI\AGV_UI.csproj", "{C6D2FC09-46F7-4EC5-A877-15EA06342E4F}"
 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
-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
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution