From 6b82cc796744a7f00083adff3d391e20075326e6 Mon Sep 17 00:00:00 2001
From: lishuai <1793460677@qq.com>
Date: Tue, 9 Jul 2024 13:28:08 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BC=82=E6=AD=A5=E5=BE=AA=E7=8E=AF?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ext/wms/service/impl/AcsToWmsServiceImpl.java    |  1 -
 .../nl/acs/task/service/impl/TaskServiceImpl.java    | 12 +++++++++++-
 .../src/main/resources/config/application.yml        |  4 ++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java
index 4b87df945..c08dd45af 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java
@@ -324,7 +324,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
 
 
     @Override
-    @Async
     public HttpResponse feedTaskStatus(JSONArray data) {
         //feedTaskStatus
         try {
diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
index 4572fb643..ae8024ecc 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
@@ -1639,7 +1639,17 @@ public class TaskServiceImpl extends CommonServiceImpl<TaskMapper, Task> impleme
             JSONArray ja = new JSONArray();
             ja.add(feed_jo);
             //TODO 有需要根据上位系统反馈的信息再做进一步处理
-            acstowmsService.feedTaskStatus(ja);
+
+            CompletableFuture.runAsync(() -> {
+                // 异步更新指令状态
+                try {
+                    acstowmsService.feedTaskStatus(ja);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            });
+
+
         }
     }
 
diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/config/application.yml b/acs2/nladmin-system/nlsso-server/src/main/resources/config/application.yml
index 69b748d57..b92ec5a2a 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/resources/config/application.yml
+++ b/acs2/nladmin-system/nlsso-server/src/main/resources/config/application.yml
@@ -6,8 +6,8 @@ spring:
   freemarker:
     check-template-location: false
   profiles:
-#    active: dev
-    active: prod
+    active: dev
+#    active: prod
   jackson:
     time-zone: GMT+8
   data: