From 852582a7c6d560aa134eaf5e67f437820b7a43a6 Mon Sep 17 00:00:00 2001
From: songxiaopeng <1393756821@qq.com>
Date: Fri, 10 May 2024 17:47:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E8=AE=BF=E9=97=AE?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java | 2 +-
 .../org/nl/wms/sch/task_manage/task/tasks/cy/CYJKTask.java     | 2 +-
 .../org/nl/wms/sch/task_manage/task/tasks/cy/CYXLTask.java     | 3 +--
 .../org/nl/wms/sch/task_manage/task/tasks/fj/FJJKTask.java     | 2 +-
 .../org/nl/wms/sch/task_manage/task/tasks/fj/FJSLTask.java     | 2 +-
 5 files changed, 5 insertions(+), 6 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 1d3e86b..703edb4 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
@@ -257,6 +257,6 @@ public abstract class AbstractTask {
         this.feedbackTaskState(param, schBaseTask, result);
     }
 
-    public abstract void feedbackTaskState(JSONObject param, SchBaseTask schBaseTask, BaseResponse result);
+    protected abstract void feedbackTaskState(JSONObject param, SchBaseTask schBaseTask, BaseResponse result);
 
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/cy/CYJKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/cy/CYJKTask.java
index b86374c..87e57dd 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/cy/CYJKTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/cy/CYJKTask.java
@@ -208,7 +208,7 @@ public class CYJKTask extends AbstractTask {
     }
 
     @Override
-    public void feedbackTaskState(JSONObject param, SchBaseTask schBaseTask, BaseResponse result) {
+    protected void feedbackTaskState(JSONObject param, SchBaseTask schBaseTask, BaseResponse result) {
         // 反馈上位系统 反馈上位系统成功后，返回200给acs
         AgvStateParam agvStateParam = new AgvStateParam();
         agvStateParam.setTask_code(schBaseTask.getTask_code());
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/cy/CYXLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/cy/CYXLTask.java
index d651866..18855a6 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/cy/CYXLTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/cy/CYXLTask.java
@@ -184,8 +184,7 @@ public class CYXLTask extends AbstractTask {
     }
 
     @Override
-    @Transactional
-    public void feedbackTaskState(JSONObject param, SchBaseTask schBaseTask, BaseResponse result) {
+    protected void feedbackTaskState(JSONObject param, SchBaseTask schBaseTask, BaseResponse result) {
         // 反馈上位系统 反馈上位系统成功后，返回200给acs
         AgvStateParam agvStateParam = new AgvStateParam();
         agvStateParam.setTask_code(schBaseTask.getTask_code());
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJJKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJJKTask.java
index cd754ac..2568ab6 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJJKTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJJKTask.java
@@ -202,7 +202,7 @@ public class FJJKTask extends AbstractTask {
     }
 
     @Override
-    public void feedbackTaskState(JSONObject param, SchBaseTask schBaseTask, BaseResponse result) {
+    protected void feedbackTaskState(JSONObject param, SchBaseTask schBaseTask, BaseResponse result) {
         // 反馈上位系统 反馈上位系统成功后，返回200给acs
         AgvStateParam agvStateParam = new AgvStateParam();
         agvStateParam.setTask_code(schBaseTask.getTask_code());
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSLTask.java
index fb1933b..c51f5df 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSLTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSLTask.java
@@ -202,7 +202,7 @@ public class FJSLTask extends AbstractTask {
     }
 
     @Override
-    public void feedbackTaskState(JSONObject param, SchBaseTask schBaseTask, BaseResponse result) {
+    protected void feedbackTaskState(JSONObject param, SchBaseTask schBaseTask, BaseResponse result) {
         // 反馈上位系统 反馈上位系统成功后，返回200给acs
         AgvStateParam agvStateParam = new AgvStateParam();
         agvStateParam.setTask_code(schBaseTask.getTask_code());