Browse Source

rev:与输送线调试

master
刘先源 2 days ago
parent
commit
05b0d53abe
  1. 16
      acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/AgvWaitUtil.java

16
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放货后离开。";

Loading…
Cancel
Save