From d00bec3f25a2f5695775e1aef97566aca1345049 Mon Sep 17 00:00:00 2001
From: psh <psh>
Date: Thu, 11 Jul 2024 18:04:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8D=95=E7=8B=AC=E5=8F=8D?=
 =?UTF-8?q?=E9=A6=88=EF=BC=8C=E5=88=97=E8=A1=A8=E6=9B=B4=E6=96=B0=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E4=BC=9A=E5=AF=BC=E8=87=B4=E6=95=B4=E4=BD=93=E9=83=BD?=
 =?UTF-8?q?=E4=B8=80=E7=9B=B4=E4=B8=8B=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nl/wms/sch/task_manage/AbstractTask.java  | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java
index 8809096..e5e43c5 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java
@@ -72,11 +72,11 @@ public abstract class AbstractTask {
      * @author ldjun
      * @created 2020年6月12日 下午5:52:28
      */
-    protected JSONObject renotifyAcs(SchBaseTask task) {
+    protected void renotifyAcs(SchBaseTask task) {
         Assert.notNull(task);
         List<SchBaseTask> taskList = new ArrayList<>();
         taskList.add(task);
-        return this.renotifyAcs(taskList);
+        this.renotifyAcs(taskList);
     }
 
     /**
@@ -85,12 +85,12 @@ public abstract class AbstractTask {
      * @author ldjun
      * @created 2020年6月12日 下午5:52:28
      */
-    protected JSONObject renotifyAcs(List<SchBaseTask> taskList) {
+    protected void renotifyAcs(List<SchBaseTask> taskList) {
         //1、获取任务
         //2、根据任务配置补全任务
         //3、下发
-        List<AcsTaskDto> list = new ArrayList<>();
         for (SchBaseTask task : taskList) {
+            List<AcsTaskDto> list = new ArrayList<>();
             AcsTaskDto taskDto = new AcsTaskDto();
             taskDto.setTask_id(task.getTask_id());
             taskDto.setTask_code(task.getTask_code());
@@ -98,9 +98,9 @@ public abstract class AbstractTask {
             taskDto.setRoute_plan_code("normal");
             taskDto.setStart_device_code(task.getPoint_code1());
             //如果存在等待点，任务下发目标点给等待点
-            if(ObjectUtil.isEmpty(task.getPoint_code2())){
+            if (ObjectUtil.isEmpty(task.getPoint_code2())) {
                 taskDto.setNext_device_code(task.getNext_wait_point());
-            }else {
+            } else {
                 taskDto.setNext_device_code(task.getPoint_code2());
             }
 //            taskDto.setStart_wait_code(task.getStart_wait_point());
@@ -108,15 +108,14 @@ public abstract class AbstractTask {
             taskDto.setVehicle_code(task.getVehicle_code());
             this.setTask(task.getConfig_code(), taskDto);
             list.add(taskDto);
-        }
-        JSONObject result=AcsUtil.notifyAcs("api/wms/task", list);
-        if (HttpStatus.OK.value()==result.getInteger("status")) {
-            for (SchBaseTask schBaseTask : taskList) {
-                schBaseTask.setTask_status(TaskStatus.ISSUED.getCode());
-                taskService.update(schBaseTask);
+            JSONObject result = AcsUtil.notifyAcs("api/wms/task", list);
+            if (HttpStatus.OK.value() == result.getInteger("status")) {
+                for (SchBaseTask schBaseTask : taskList) {
+                    schBaseTask.setTask_status(TaskStatus.ISSUED.getCode());
+                    taskService.update(schBaseTask);
+                }
             }
         }
-        return result;
     }
 
     private AcsTaskDto setTask(String config_code, AcsTaskDto taskDto) {