From 5b08b2c5a41d8ded1ccc6c87116ebdc43cac851b Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 25 Mar 2025 08:47:50 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E4=B8=8B=E5=8F=91agv=E7=BB=88?= =?UTF-8?q?=E6=AD=A2=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java | 2 +- .../nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java b/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java index bfa99f8..64afd3b 100644 --- a/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java +++ b/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java @@ -1096,7 +1096,7 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { @Override public UnifiedResponse stopTask(JSONObject requestParam) { - String path = "/stop-task"; + String path = "/terminate"; return xgHttpUtil.sendPostRequest(path, requestParam); } diff --git a/acs2/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs2/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index f4b62f1..980856f 100644 --- a/acs2/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs2/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -329,8 +329,8 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { if (instDto.getSend_status().equals("1")) { // 调用XG接口通知删除 JSONObject json = new JSONObject(); - json.put("releaseSite",1); - json.put("taskRecordId",instDto.getInstruction_code()); + json.put("disableVehicle",false); + json.put("id",instDto.getInstruction_code()); xianGongAgvService.stopTask(json); } } catch (Exception e) { @@ -418,7 +418,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { UnifiedResponse resp = agvService.queryXZAgvInstStatusByCode(dto.getInstruction_code(), JSONObject.class); // 状态 String state = resp.getData().getString("state"); - if ("RUNNING".equals(state) || "TOBEDISPATCHED".equals(state) || "WAITING".equals(state)) { + if ("RUNNING".equals(state) || "WAITING".equals(state)) { TaskStatus = "执行中"; } // 车号