更改“不能搬运锁定的料架,到待机位等待”的条件

AGVControl/BLL/AGVManager.cs

@@ -27,7 +27,7 @@ namespace BLL
                 string json = response.Content;
                 string json = response.Content;
                 Common.log.OutInfo(agv.Name + " [URL:  " + url+"] [Return:  " + json+"]");
                 Common.log.OutInfo(agv.Name + " [URL:  " + url+"] [Return:  " + json+"]");
                 if (string.IsNullOrWhiteSpace(json)) return true;    //可以离开
                 if (string.IsNullOrWhiteSpace(json)) return true;    //可以离开
-
+                //{"code":0,"msg":"ok","data":{"taskCount":1,"rfid":"A14"}}不能搬运锁定的料架,到待机位等待
                 ShelfTaskCount serverResult = JsonHelper.DeserializeJsonToObject<ShelfTaskCount>(json);
                 ShelfTaskCount serverResult = JsonHelper.DeserializeJsonToObject<ShelfTaskCount>(json);
                 if (serverResult == null)
                 if (serverResult == null)
                 {
                 {
@@ -36,17 +36,17 @@ namespace BLL
                 }
                 }
                 if (serverResult.code != 0) return true;
                 if (serverResult.code != 0) return true;
 
 
-                if (serverResult.shelfTaskData.taskCount == 0) //该料架出库完成
+                if (serverResult.data.taskCount == 0) //该料架出库完成
                 {
                 {
-                    Common.log.OutInfo(agv.Name+" 料架【" + agv.RFID + "】 无剩余出库任务,serverResult.shelfTaskData.taskCount=" + serverResult.shelfTaskData.taskCount.ToString());
+                    Common.log.OutInfo(agv.Name+" 料架【" + agv.RFID + "】 无剩余出库任务,serverResult.shelfTaskData.taskCount=" + serverResult.data.taskCount.ToString());
                     return true;
                     return true;
                 }
                 }
                 else //该料架的出库任务未完成
                 else //该料架的出库任务未完成
                 {
                 {
                     //  foreach (ShelfLockData item in serverResult.data)
                     //  foreach (ShelfLockData item in serverResult.data)
                     //  {
                     //  {
-                    taskCount = serverResult.shelfTaskData.taskCount;
-                    Common.log.OutInfo(agv.Name + " [RFID=" + serverResult.shelfTaskData.rfid + "] [taskCount=" + serverResult.shelfTaskData.taskCount + "]");
+                    taskCount = serverResult.data.taskCount;
+                    Common.log.OutInfo(agv.Name + " [RFID=" + serverResult.data.rfid + "] [taskCount=" + serverResult.data.taskCount + "]");
                     // }
                     // }
                     return false;
                     return false;
                 }
                 }
@@ -224,7 +224,7 @@ namespace BLL
         /// </summary>
         /// </summary>
         public string msg { get; set; }
         public string msg { get; set; }
 
 
-        public ShelfTaskData shelfTaskData { get; set; }
+        public ShelfTaskData data { get; set; }
     }
     }
 
 
     public struct ShelfTaskData
     public struct ShelfTaskData

AGVControl/BLL/Control.cs

@@ -1349,7 +1349,7 @@ namespace BLL
                 {
                 {
                     foreach (string item in shelfLockedNodeNames)
                     foreach (string item in shelfLockedNodeNames)
                     {
                     {
-                         nodeIdx = Common.nodeInfo.FindIndex(s => s.Name == item && s.Action == ClientAction.NeedEnter && s.AgvName == "" && s.IsUse);
+                         nodeIdx = Common.nodeInfo.FindIndex(s => s.Name == item && s.Action == ClientAction.NeedEnter && (s.AgvName == "" || s.AgvName ==agv.Name) && s.IsUse);
                         if (nodeIdx > -1)
                         if (nodeIdx > -1)
                         {
                         {
                               agv.NextMission = "";
                               agv.NextMission = "";

AGVControl/obj/Debug/AGVControl.csproj.CoreCompileInputs.cache

-18891a7582992878581f828b26592ac4edd982f5
+d28746ad274064006208398e45987f6488ef4636

AGVControl/obj/Debug/AGVControl.csproj.FileListAbsolute.txt

@@ -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.csprojAssemblyReference.cache
 C:\ZDL\Gitee\AGVControl\AGVControl\obj\Debug\AGVControl.csprojAssemblyReference.cache
+C:\ZDL\Gitee\AGVControl\AGVControl\obj\Debug\AGVControl.csproj.CoreCompileInputs.cache