业务状态问题

servo/src/main/java/com/galaxis/rcs/plan/PlanTaskSequence.java

@@ -5,11 +5,9 @@ import com.galaxis.rcs.common.entity.RcsTaskBiz;
 import com.galaxis.rcs.common.entity.RcsTaskPlan;
 import com.galaxis.rcs.common.enums.PlanTaskStatus;
 import com.galaxis.rcs.common.enums.PlanTaskType;
-import com.galaxis.rcs.ptr.ArmMessageType;
 import com.google.common.base.Splitter;
 import com.google.common.collect.Lists;
 import com.yvan.logisticsModel.LogisticsRuntime;
-import com.yvan.logisticsModel.PtrAgvDeviceTask;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.clever.core.BannerUtils;
@@ -157,9 +155,11 @@ public class PlanTaskSequence {
     public boolean isAllCompleted() {
         boolean isAllComplete = true;
         for (RcsTaskPlan task : taskList) {
-            if (!PlanTaskStatus.FINISHED.toString().equals(task.getPlanTaskStatus())) {
+            if (PlanTaskType.valueOf(task.getPlanType()) != PlanTaskType.FINISH) {
-                isAllComplete = false;
+                if (!PlanTaskStatus.FINISHED.toString().equals(task.getPlanTaskStatus())) {
-                break;
+                    isAllComplete = false;
+                    break;
+                }
             }
         }
         return isAllComplete;
@@ -178,9 +178,13 @@ public class PlanTaskSequence {
     public void savePlanTask(RcsTaskPlan planTask) {
         //TODO: 保存数据库
         var jw = new JsonWrapper(planTask);
+        jw.set("isAllCompleted", this.isAllCompleted());
+
         var list = Splitter.on("\n").splitToList(jw.toString());
         String[] ar = new String[list.size()];
         list.toArray(ar);
+
+
         // log.info("3-Received message: " + json);
         BannerUtils.printConfig(log, "保存业务任务 planTask", ar);
     }

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

@@ -15,7 +15,6 @@ import com.galaxis.rcs.ptr.sendEntity.RcsConfigMessage;
 import com.galaxis.rcs.ptr.sendEntity.RcsSRMessage;
 import com.galaxis.rcs.ptr.sendEntity.RcsSetLocationMessage;
 import com.google.common.collect.Queues;
-import com.yvan.logisticsMonitor.task.PlanTask;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.clever.core.json.JsonWrapper;