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 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 result = wmsToAcsService.action(array); + // 改为异步调用 + CompletableFuture> 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);