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

rev：下发agv终止任务

Browse Source
This commit is contained in:
liuxy
2025-03-25 08:47:50 +08:00
parent f19a306e2e
commit 5b08b2c5a4
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java
View File

@@ -1096,7 +1096,7 @@ public class XianGongAgvServiceImpl implements XianGongAgvService {
@Override @Override
public <T> UnifiedResponse<T> stopTask(JSONObject requestParam) { public <T> UnifiedResponse<T> stopTask(JSONObject requestParam) {
String path = "/stop-task"; String path = "/terminate";
return xgHttpUtil.sendPostRequest(path, requestParam); return xgHttpUtil.sendPostRequest(path, requestParam);
} }

6
acs2/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
View File

@@ -329,8 +329,8 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
if (instDto.getSend_status().equals("1")) { if (instDto.getSend_status().equals("1")) {
// 调用XG接口通知删除 // 调用XG接口通知删除
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
json.put("releaseSite",1); json.put("disableVehicle",false);
json.put("taskRecordId",instDto.getInstruction_code()); json.put("id",instDto.getInstruction_code());
xianGongAgvService.stopTask(json); xianGongAgvService.stopTask(json);
} }
} catch (Exception e) { } catch (Exception e) {
@@ -418,7 +418,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
UnifiedResponse<JSONObject> resp = agvService.queryXZAgvInstStatusByCode(dto.getInstruction_code(), JSONObject.class); UnifiedResponse<JSONObject> resp = agvService.queryXZAgvInstStatusByCode(dto.getInstruction_code(), JSONObject.class);
// 状态 // 状态
String state = resp.getData().getString("state"); String state = resp.getData().getString("state");
if ("RUNNING".equals(state) || "TOBEDISPATCHED".equals(state) || "WAITING".equals(state)) { if ("RUNNING".equals(state) || "WAITING".equals(state)) {
TaskStatus = "执行中"; TaskStatus = "执行中";
} }
// 车号 // 车号