Merge remote-tracking branch 'origin/master'

# Conflicts:
#	servo/src/main/java/com/yvan/logisticsModel/PtrAgvItem.java

servo/src/main/java/com/yvan/logisticsModel/PtrAgvItem.java

@@ -275,11 +275,13 @@ public abstract class PtrAgvItem extends ExecutorItem {
                 }
             }
 
-            if (finishTargetIndex > 0) {
+        boolean needCompute = false;
-                needCompute = true;
+
-                // 标记前面的任务都完成了
+        if (finishTargetIndex >= 0) {
-                for (int i = 0; i < finishTargetIndex; i++) {
+            needCompute = true;
-                    PtrAgvDeviceTask task = runningDeviceTaskList.get(i);
+            // 标记前面的任务都完成了
+            for (int i = 0; i <= finishTargetIndex; i++) {
+                PtrAgvDeviceTask task = runningDeviceTaskList.get(i);
 
                     task.taskStatus = 4; // 标记为完成
                     task.taskGroupStatus = 4; // 标记为任务组完成