mark在无剩余任务时删除

AGVControl/BLL/AGVManager.cs

@@ -38,6 +38,28 @@ namespace BLL
 
 
                 if (serverResult.data.taskCount == 0) //该料架出库完成
                 if (serverResult.data.taskCount == 0) //该料架出库完成
                 {
                 {
+                    //清除mark
+                    List<string> markLst = new List<string>();
+                    foreach (var mark in Common.control.Marks)
+                    {
+                        int count = 0;
+                        foreach (var node in Common.nodeInfo)
+                        {
+                            if (mark.Equals(node.Mark))
+                                count++;
+                        }
+                        if (count == 0)//mark存在标记，但节点任务没有，删除该mark
+                        {
+                            markLst.Add(mark);
+                        }
+                    }
+                    if (markLst.Count != 0)
+                    {
+                        for (int i = 0; i < markLst.Count; i++)
+                        {
+                            Common.control.Marks.Remove(markLst[i]);
+                        }
+                    }
                     Common.log.OutInfo(agv.Name+" 料架【" + agv.RFID + "】 无剩余出库任务,serverResult.shelfTaskData.taskCount=" + serverResult.data.taskCount.ToString());
                     Common.log.OutInfo(agv.Name+" 料架【" + agv.RFID + "】 无剩余出库任务,serverResult.shelfTaskData.taskCount=" + serverResult.data.taskCount.ToString());
                     return true;
                     return true;
                 }
                 }

AGVControl/FrmMain.cs

@@ -57,29 +57,7 @@ namespace AGVControl
         private void Server_NodeChanged(int nodeIndex)
         private void Server_NodeChanged(int nodeIndex)
         {
         {
             Invoke(new Action(() => 
             Invoke(new Action(() => 
-            {
-                List<string> markLst = new List<string>();
-                foreach (var mark in Common.control.Marks)
-                {
-                    int count = 0;
-                    foreach (var node in Common.nodeInfo)
-                    {
-                        if (mark.Equals(node.Mark))
-                            count++;
-                    }
-                    if(count ==0)//mark存在标记，但节点任务没有，删除该mark
-                    {
-                        markLst.Add(mark);
-                    }
-                }
-                if(markLst.Count!=0)
-                {
-                    for (int i = 0; i < markLst.Count; i++)
-                    {
-                        Common.control.Marks.Remove(markLst[i]);
-                    }
-                }
-                
+            {              
                 DgvNode.Rows[nodeIndex].SetValues(Common.nodeInfo[nodeIndex].ToRow()); 
                 DgvNode.Rows[nodeIndex].SetValues(Common.nodeInfo[nodeIndex].ToRow()); 
             }));
             }));
         }
         }

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

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