分盘线

AGVControl/BLL/AGVManager.cs

@@ -35,32 +35,10 @@ namespace BLL
                     return true;
                 }
                 if (serverResult.code != 0) return true;
-
+                agv.LeftTaskCnt = serverResult.data.taskCount;
                 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;
                 }
                 else //该料架的出库任务未完成

AGVControl/Common.cs

@@ -345,10 +345,6 @@ namespace AGVControl
         /// </summary>
         public bool StandbyTemp { set; get; }
 
-        /// <summary>
-        /// 是否清除任务缓存
-        /// </summary>
-        public bool IsClearRunInfo = false;
  
         public string CurTaskName { get; set; }
 

AGVControl/FrmMain.cs

@@ -168,14 +168,14 @@ namespace AGVControl
             {
                 if (Common.agvInfo[e.RowIndex].Mark.Length>1)
                 {
-                    if(MessageBox.Show(Common.agvInfo[e.RowIndex].Name + " 正在执行包装仓出库任务，确定清除当前任务？","警告",MessageBoxButtons.YesNo) == DialogResult.No)
+                    if(MessageBox.Show(Common.agvInfo[e.RowIndex].Name + " 正在执行出库任务，确定清除当前任务？","警告",MessageBoxButtons.YesNo) == DialogResult.No)
                     {
                         return;
                     }
                 }
                 Common.agvInfo[e.RowIndex].IsUse = false;
                 //清除小车缓存
-                Common.log.OutInfo(string.Format("手动清除缓存:{0}[CurTaskName={1}]", Common.agvInfo[e.RowIndex].ToRow(), Common.agvInfo[e.RowIndex].CurTaskName));
+                Common.log.OutInfo(string.Format("手动清除小车缓存:{0}[CurTaskName={1}]", Common.agvInfo[e.RowIndex].ToRow(), Common.agvInfo[e.RowIndex].CurTaskName));
                 string place = Common.agvInfo[e.RowIndex].Place;
                 Common.agvInfo[e.RowIndex].Mark = "";
                 Common.agvInfo[e.RowIndex].Place = "";
@@ -183,7 +183,6 @@ namespace AGVControl
                 Common.agvInfo[e.RowIndex].NextMission = "";
                 Common.agvInfo[e.RowIndex].LeftTaskCnt = 0;
                 Common.agvInfo[e.RowIndex].CurTaskName = "";
-                Common.agvInfo[e.RowIndex].IsClearRunInfo = true;
 
                 //清除节点缓存
                 int idx = Common.nodeInfo.FindIndex(s => s.Name == place);
@@ -214,7 +213,6 @@ namespace AGVControl
                 Common.mir.Add_Mission_Fleet(Common.agvInfo[e.RowIndex], Common.agvMission["Init"]);
                 Common.mir.State_Ready(Common.agvInfo[e.RowIndex]);
                 DgvAgv.Rows[e.RowIndex].SetValues(Common.agvInfo[e.RowIndex].ToRow());
-                Common.agvInfo[e.RowIndex].IsUse = true;
             }
         }
 
@@ -231,7 +229,7 @@ namespace AGVControl
             else if (e.ColumnIndex == 8)
             {
                 //清除节点缓存
-                Common.log.OutInfo(string.Format("手动清除缓存，{0} {1}", Common.nodeInfo[e.RowIndex].AgvName, Common.nodeInfo[e.RowIndex].Name));
+                Common.log.OutInfo(string.Format("手动清除节点缓存，{0} {1}", Common.nodeInfo[e.RowIndex].AgvName, Common.nodeInfo[e.RowIndex].Name));
                 string name = Common.nodeInfo[e.RowIndex].AgvName;
                 Common.nodeInfo[e.RowIndex].AgvName = "";
                 DgvNode.Rows[e.RowIndex].Cells[5].Value = "";
@@ -240,10 +238,13 @@ namespace AGVControl
                 int idx = Common.agvInfo.FindIndex(s => s.Name == name);
                 if (idx > -1)
                 {
-                    Common.agvInfo[idx].Mark = "";
-                    Common.agvInfo[idx].Place = "";
-                    Common.agvInfo[idx].RFID = "";
                     Common.agvInfo[idx].NextMission = "";
+                    Common.agvInfo[e.RowIndex].Mark = "";
+                    Common.agvInfo[e.RowIndex].Place = "";
+                    Common.agvInfo[e.RowIndex].RFID = "";
+                    Common.agvInfo[e.RowIndex].NextMission = "";
+                    Common.agvInfo[e.RowIndex].LeftTaskCnt = 0;
+                    Common.agvInfo[e.RowIndex].CurTaskName = "";
                     DgvAgv.Rows[idx].SetValues(Common.agvInfo[idx].ToRow());
                     //添加Init任务
                     Common.mir.Add_Mission_Fleet(Common.agvInfo[idx], Common.agvMission["Init"]);
@@ -262,16 +263,11 @@ namespace AGVControl
                 if (idx < 0) return;
                 if (Common.agvInfo[idx].IsCon)
                 {
-                    if(!Common.agvInfo[idx].IsClearRunInfo)
-                    {
-                        MessageBox.Show("请先清除当前小车的任务缓存！");
-                        return;
-                    }
+
                     bool rtn = Common.mir.Add_Mission(Common.agvInfo[idx], Common.agvMission[LstAgvPlace.Text]);
                     if (!rtn)
                         return;
                     Common.agvInfo[idx].Place = "";
-                    Common.agvInfo[idx].IsClearRunInfo = false;
                     Common.log.OutInfo("手动添加任务：  " + LstAgvPlace.Text);
                     Common.log.OutTextBox("手动添加任务：  " + LstAgvPlace.Text);
                     DgvAgv.Rows[idx].SetValues(Common.agvInfo[idx].ToRow());

AGVControl/Program.cs

@@ -106,6 +106,8 @@ namespace AGVControl
                 new ClientNode("A2", Convert.ToBoolean(Common.appConfig.AppSettings.Settings["A2"].Value)),
                 new ClientNode("A3", Convert.ToBoolean(Common.appConfig.AppSettings.Settings["A3"].Value)),
                 new ClientNode("A4", Convert.ToBoolean(Common.appConfig.AppSettings.Settings["A4"].Value)),
+                new ClientNode("A7", Convert.ToBoolean(Common.appConfig.AppSettings.Settings["A7"].Value)),
+                new ClientNode("A8", Convert.ToBoolean(Common.appConfig.AppSettings.Settings["A8"].Value)),
                 new ClientNode("B1", Convert.ToBoolean(Common.appConfig.AppSettings.Settings["B1"].Value)),
                 new ClientNode("B2", Convert.ToBoolean(Common.appConfig.AppSettings.Settings["B2"].Value)),
                 new ClientNode("B3", Convert.ToBoolean(Common.appConfig.AppSettings.Settings["B3"].Value)),

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