From 4dd63ae5a8baf33315550b09e9c1eb996f07b70f Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Tue, 11 Aug 2026 11:30:13 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E5=BC=82=E6=AD=A5=E4=B8=8B?=
 =?UTF-8?q?=E5=8F=91acs=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PdmWorkTaskServiceImpl.java  | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PdmWorkTaskServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PdmWorkTaskServiceImpl.java
index 32b23c79..dcf1423a 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PdmWorkTaskServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PdmWorkTaskServiceImpl.java
@@ -36,6 +36,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
 @Service
@@ -979,13 +980,18 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService {
         // 组织其他球磨参数
         JSONArray otherQMList = otherQM(material_id,device_jo.getString("device_code"));
         array.addAll(otherQMList);
-        Map<String, Object> result = wmsToAcsService.action(array);
-        String status = MapUtil.getStr(result, "status");
-        if (!StrUtil.equals(status, "200")) {
-            String message = MapUtil.getStr(result, "message");
-            throw new PdaRequestException("下发电气失败：" + message);
-        }
-
+//        Map<String, Object> result = wmsToAcsService.action(array);
+        // 改为异步调用
+        CompletableFuture<Map<String, Object>> future = CompletableFuture.supplyAsync(() -> {
+            return wmsToAcsService.action(array);
+        });
+        future.whenComplete((result, throwable) -> {
+            String status = MapUtil.getStr(result, "status");
+            if (!StrUtil.equals(status, "200")) {
+                String message = MapUtil.getStr(result, "message");
+                throw new PdaRequestException("下发电气失败：" + message);
+            }
+        });
         //插入任务作业记录表
         JSONObject work_jo = new JSONObject();
         work_jo.put("worktask_id", worktask_id);