debug

BLL/Job/MoveJob.cs

@@ -14,7 +14,7 @@ namespace BLL
         public MoveJob(string mission)
         public MoveJob(string mission)
         {
         {
             IsEnd = false;
             IsEnd = false;
-            this._mission = mission;
+            _mission = mission;
             moveStep = new JobStep<MoveStep>(MoveStep.Send);
             moveStep = new JobStep<MoveStep>(MoveStep.Send);
         }
         }
 
 
@@ -71,7 +71,7 @@ namespace BLL
                     rtn = Common.mir.Get_MissionState(_info.IP, _info.Authorization, _id, out state);
                     rtn = Common.mir.Get_MissionState(_info.IP, _info.Authorization, _id, out state);
                 if (rtn)
                 if (rtn)
                 {
                 {
-                    Common.log.Debug("MoveJob To:" + _info.Name + ", " + _mission + state.ToString());
+                    Common.log.Debug("MoveJob To:" + _info.Name + ", " + _mission + ", " + state.ToString());
                     if (state == MissionState.Done.ToString())
                     if (state == MissionState.Done.ToString())
                         moveStep.NextStep(MoveStep.End);
                         moveStep.NextStep(MoveStep.End);
                     else if (state == MissionState.Aborted.ToString())
                     else if (state == MissionState.Aborted.ToString())
@@ -106,7 +106,8 @@ namespace BLL
         {
         {
             Aborted,
             Aborted,
             Executing,
             Executing,
-            Done
+            Done,
+            Pending
         }
         }
     }
     }
 }
 }

BLL/Job/StandbyJob.cs

@@ -78,7 +78,7 @@ namespace BLL
             move = new MoveJob(mission);
             move = new MoveJob(mission);
             move.Execute(_info);
             move.Execute(_info);
             standbyStep.NextStep(StandbyStep.MoveStandby);
             standbyStep.NextStep(StandbyStep.MoveStandby);
-            standbyStep.Msg = _info.Name + "发送任务" + mission;
+            standbyStep.Msg = _info.Name + "，发送任务，" + mission;
         }
         }
 
 
         private void PassDoor()
         private void PassDoor()

BLL/SteelManage.cs

@@ -371,15 +371,15 @@ namespace BLL
 
 
         private static bool GetWash(AgvInfo info)
         private static bool GetWash(AgvInfo info)
         {
         {
-            int index = Common.agvLines.FindIndex(s => s.Workshop == info.Workshop);
-            if (index == -1) return false;
+            int lineIdx = Common.agvLines.FindIndex(s => s.Workshop == info.Workshop);
+            if (lineIdx == -1) return false;
 
 
             bool find = false;
             bool find = false;
             for (int i = 0; i < newSteelWork.Count; i++)
             for (int i = 0; i < newSteelWork.Count; i++)
             {
             {
                 if (newSteelWork[i].From == newSteelWork[i].Place)
                 if (newSteelWork[i].From == newSteelWork[i].Place)
                 {
                 {
-                    index = Array.FindIndex(Common.agvLines[index].Lines, s => s == oldSteelWork[i].Place);
+                    int index = Array.FindIndex(Common.agvLines[lineIdx].Lines, s => s == oldSteelWork[i].Place);
                     if (index > -1)
                     if (index > -1)
                     {
                     {
                         find = true;
                         find = true;
@@ -392,13 +392,13 @@ namespace BLL
 
 
         private static bool GetOldSteel(AgvInfo info)
         private static bool GetOldSteel(AgvInfo info)
         {
         {
-            int index = Common.agvLines.FindIndex(s => s.Workshop == info.Workshop);
-            if (index == -1) return false;
+            int lineIdx = Common.agvLines.FindIndex(s => s.Workshop == info.Workshop);
+            if (lineIdx == -1) return false;
 
 
             bool find = false;
             bool find = false;
             for (int i = 0; i < oldSteelWork.Count; i++)
             for (int i = 0; i < oldSteelWork.Count; i++)
             {
             {
-                index = Array.FindIndex(Common.agvLines[index].Lines, s => s == oldSteelWork[i].Place);
+                int index = Array.FindIndex(Common.agvLines[lineIdx].Lines, s => s == oldSteelWork[i].Place);
                 if (index > -1)
                 if (index > -1)
                 {
                 {
                     find = true;
                     find = true;
@@ -410,13 +410,13 @@ namespace BLL
 
 
         private static bool GetStorage(AgvInfo info)
         private static bool GetStorage(AgvInfo info)
         {
         {
-            int index = Common.agvLines.FindIndex(s => s.Workshop == info.Workshop);
-            if (index == -1) return false;
+            int lineIdx = Common.agvLines.FindIndex(s => s.Workshop == info.Workshop);
+            if (lineIdx == -1) return false;
 
 
             bool find = false;
             bool find = false;
             for (int i = 0; i < storageWork.Count; i++)
             for (int i = 0; i < storageWork.Count; i++)
             {
             {
-                index = Array.FindIndex(Common.agvLines[index].Lines, s => s == storageWork[i].Place);
+                int index = Array.FindIndex(Common.agvLines[lineIdx].Lines, s => s == storageWork[i].Place);
                 if (index > -1)
                 if (index > -1)
                 {
                 {
                     find = true;
                     find = true;