root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev：异步下发acs参数

Browse Source
This commit is contained in:
liuxy
2026-08-11 11:30:13 +08:00
parent 02e6467970
commit 4dd63ae5a8
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PdmWorkTaskServiceImpl.java
View File

@@ -36,6 +36,7 @@ import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@Service @Service
@@ -979,13 +980,18 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService {
// 组织其他球磨参数 // 组织其他球磨参数
JSONArray otherQMList = otherQM(material_id,device_jo.getString("device_code")); JSONArray otherQMList = otherQM(material_id,device_jo.getString("device_code"));
array.addAll(otherQMList); array.addAll(otherQMList);
Map<String, Object> result = wmsToAcsService.action(array); // 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"); String status = MapUtil.getStr(result, "status");
if (!StrUtil.equals(status, "200")) { if (!StrUtil.equals(status, "200")) {
String message = MapUtil.getStr(result, "message"); String message = MapUtil.getStr(result, "message");
throw new PdaRequestException("下发电气失败：" + message); throw new PdaRequestException("下发电气失败：" + message);
} }
});
//插入任务作业记录表 //插入任务作业记录表
JSONObject work_jo = new JSONObject(); JSONObject work_jo = new JSONObject();
work_jo.put("worktask_id", worktask_id); work_jo.put("worktask_id", worktask_id);