From 9832fc925cf37c7e1460208d495a3e11fb2a8bde Mon Sep 17 00:00:00 2001
From: "USER-20220102CG\\noblelift" <546428999@qq.com>
Date: Thu, 22 Dec 2022 13:49:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java    | 2 +-
 .../nl/acs/task/service/impl/TaskFeedbackServiceImpl.java   | 3 +--
 .../java/org/nl/acs/task/service/impl/TaskServiceImpl.java  | 6 +++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
index 3c6856b..4c6e24b 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
@@ -123,7 +123,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
                 }
                 JSONObject jo = new JSONObject();
                 jo.put("task_code", task_code);
-                jo.put("task_id", ext_task_id);
+                jo.put("ext_task_id", ext_task_id);
                 jo.put("start_point_code", start_point_code);
                 jo.put("next_point_code", next_point_code);
                 jo.put("start_parent_code", start_point_code);
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskFeedbackServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskFeedbackServiceImpl.java
index dd4d38a..d526c6a 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskFeedbackServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskFeedbackServiceImpl.java
@@ -166,7 +166,7 @@ public class TaskFeedbackServiceImpl implements TaskFeedbackService {
         TaskFeedbackDto dto = this.findById(id);
         TaskDto entity = taskService.findById(dto.getTask_id());
         JSONObject feed_jo = new JSONObject();
-        feed_jo.put("task_id", entity.getTask_id());
+        feed_jo.put("ext_task_id", entity.getExt_task_id());
         feed_jo.put("task_code", entity.getTask_code());
         feed_jo.put("task_status", entity.getTask_status());
         JSONArray ja = new JSONArray();
@@ -180,7 +180,6 @@ public class TaskFeedbackServiceImpl implements TaskFeedbackService {
             e.printStackTrace();
         }
         int status = body.getStatus();
-        JSONObject jo =  (JSONObject) JSONObject.toJSON(body.body());
 
         dto.setTask_status(entity.getTask_status());
         if (status == 200) {
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
index 2976399..0caad2f 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
@@ -542,7 +542,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
         if (!StrUtil.startWith(dto.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) {
             TaskFeedbackDto feefbackdto = taskFeedbackService.findByCode(entity.getTask_code());
             JSONObject feed_jo = new JSONObject();
-            feed_jo.put("task_id", entity.getTask_id());
+            feed_jo.put("ext_task_id", entity.getExt_task_id());
             feed_jo.put("task_code", dto.getTask_code());
             feed_jo.put("task_status", dto.getTask_status());
             JSONArray ja = new JSONArray();
@@ -658,7 +658,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
         if (!StrUtil.startWith(entity.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) {
             TaskFeedbackDto feefbackdto = taskFeedbackService.findByCode(entity.getTask_code());
             JSONObject feed_jo = new JSONObject();
-            feed_jo.put("task_id", entity.getTask_id());
+            feed_jo.put("ext_task_id", entity.getExt_task_id());
             feed_jo.put("task_code", entity.getTask_code());
             feed_jo.put("task_status", entity.getTask_status());
             JSONArray ja = new JSONArray();
@@ -785,7 +785,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
         String hasWms = paramService.findByCode(AcsConfig.HASWMS).getValue();
         if (!StrUtil.startWith(entity.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) {
             JSONObject feed_jo = new JSONObject();
-            feed_jo.put("task_id", entity.getTask_id());
+            feed_jo.put("ext_task_id", entity.getExt_task_id());
             feed_jo.put("task_code", entity.getTask_code());
             feed_jo.put("task_status", entity.getTask_status());
             JSONArray ja = new JSONArray();