产线返回的料架直接回缓存线

DeviceLibrary/bean/job/EmptyShelfBackJob.cs

@@ -61,21 +61,22 @@ namespace DeviceLibrary
             if (jobStep.IsStep(EMPTY_SHELF_BACK_STEP.NONE))
             if (jobStep.IsStep(EMPTY_SHELF_BACK_STEP.NONE))
             {
             {
 
 
-                if (AGVManager.CheckBoxNeedShelfState(agv, out string nodeName))
-                {
-                    EmptyShelfTargetPlace = nodeName;
-                    jobStep.ToNextStep(EMPTY_SHELF_BACK_STEP.WAIT_AGV_REACH_Target);
-                    runInfo = "从线体 [" + EmptyShelfPlace + "]送往" + EmptyShelfTargetPlace;
-                    msg += string.Format("[{0}] {1}", jobStep.CurStep(), runInfo);
-                    jobStep.Msg = msg;
-                    if (!EmptyShelfTargetPlace.Equals(""))
-                    {
-                        MissionSys.AssignMission(agv, EmptyShelfTargetPlace);
-                        UpdateJobTaskInfo(agv);
-                    }
+                //if (AGVManager.CheckBoxNeedShelfState(agv, out string nodeName))
+                //{
+                //    EmptyShelfTargetPlace = nodeName;
+                //    jobStep.ToNextStep(EMPTY_SHELF_BACK_STEP.WAIT_AGV_REACH_Target);
+                //    runInfo = "从线体 [" + EmptyShelfPlace + "]送往" + EmptyShelfTargetPlace;
+                //    msg += string.Format("[{0}] {1}", jobStep.CurStep(), runInfo);
+                //    jobStep.Msg = msg;
+                //    if (!EmptyShelfTargetPlace.Equals(""))
+                //    {
+                //        MissionSys.AssignMission(agv, EmptyShelfTargetPlace);
+                //        UpdateJobTaskInfo(agv);
+                //    }
 
 
-                }
-                else if (AGVManager.CheckShelfStorageInState(agv))
+                //}
+                //else 
+                if (AGVManager.CheckShelfStorageInState(agv))
                 {
                 {
                     jobStep.ToNextStep(EMPTY_SHELF_BACK_STEP.WAIT_AGV_REACH_Target);
                     jobStep.ToNextStep(EMPTY_SHELF_BACK_STEP.WAIT_AGV_REACH_Target);
                     EmptyShelfTargetPlace = SettingString.A2;
                     EmptyShelfTargetPlace = SettingString.A2;

SO827-AGV/FrmMain.cs

@@ -66,10 +66,10 @@ namespace AGVControl
         {
         {
             Invoke(new Action(() =>
             Invoke(new Action(() =>
             {
             {
-                for (int i = 0; i < AGVManager.nodeInfo.Count; i++)
+                //for (int i = 0; i < AGVManager.nodeInfo.Count; i++)
                 {
                 {
-                    DgvNode.Rows[i].DefaultCellStyle.ForeColor = AGVManager.nodeInfo[i].Online && AGVManager.nodeInfo[i].IsUse ? Color.Black : Color.Red;
-                    DgvNode.Rows[i].SetValues(AGVManager.nodeInfo[i].ToRow());
+                    DgvNode.Rows[nodeIndex].DefaultCellStyle.ForeColor = AGVManager.nodeInfo[nodeIndex].Online && AGVManager.nodeInfo[nodeIndex].IsUse ? Color.Black : Color.Red;
+                    DgvNode.Rows[nodeIndex].SetValues(AGVManager.nodeInfo[nodeIndex].ToRow());
                 }
                 }
 
 
             }));
             }));