From 05b0d53abe790bfb53431ebc48707b68fd0dda96 Mon Sep 17 00:00:00 2001 From: liuxy Date: Mon, 25 Nov 2024 16:19:55 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E4=B8=8E=E8=BE=93=E9=80=81?= =?UTF-8?q?=E7=BA=BF=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/acs/agv/server/AgvWaitUtil.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/AgvWaitUtil.java b/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/AgvWaitUtil.java index cf24be9..5a2d41a 100644 --- a/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/AgvWaitUtil.java +++ b/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/AgvWaitUtil.java @@ -53,8 +53,10 @@ public class AgvWaitUtil { param.put("toCommand",XgAgvEnum.APPLY_GET.getCode()); param.put("deviceCode",deviceCode); + JSONObject data = new JSONObject(); + data.put("DATA", param); // 调用接口 - JSONObject result = conveyorService.applyPutAndGet(param); + JSONObject result = conveyorService.applyPutAndGet(data); if (result.getIntValue("action") == XgAgvEnum.SSX_ACTION_GET.getCode()) { String message = "允许AGV取货。"; @@ -95,8 +97,10 @@ public class AgvWaitUtil { param.put("toCommand",XgAgvEnum.APPLY_GET_SUCCESS.getCode()); param.put("deviceCode",deviceCode); + JSONObject data = new JSONObject(); + data.put("DATA", param); // 调用接口 - JSONObject result = conveyorService.applyPutAndGet(param); + JSONObject result = conveyorService.applyPutAndGet(data); if (result.getIntValue("action") == XgAgvEnum.SSX_ACTION_GET_MOVE.getCode()) { String message = "允许AGV取货后离开。"; @@ -137,8 +141,10 @@ public class AgvWaitUtil { param.put("toCommand",XgAgvEnum.APPLY_PUT.getCode()); param.put("deviceCode",deviceCode); + JSONObject data = new JSONObject(); + data.put("DATA", param); // 调用接口 - JSONObject result = conveyorService.applyPutAndGet(param); + JSONObject result = conveyorService.applyPutAndGet(data); if (result.getIntValue("action") == XgAgvEnum.SSX_ACTION_PUT.getCode()) { if (ObjectUtil.isNotEmpty(taskDto.getIs_vehicle()) && taskDto.getIs_vehicle().equals("1")) { @@ -185,8 +191,10 @@ public class AgvWaitUtil { param.put("toCommand",XgAgvEnum.APPLY_PUT_SUCCESS.getCode()); param.put("deviceCode",deviceCode); + JSONObject data = new JSONObject(); + data.put("DATA", param); // 调用接口 - JSONObject result = conveyorService.applyPutAndGet(param); + JSONObject result = conveyorService.applyPutAndGet(data); if (result.getIntValue("action") == XgAgvEnum.SSX_ACTION_PUT_MOVE.getCode()) { String message = "允许AGV放货后离开。";