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

rev：与输送线调试

Browse Source
This commit is contained in:
liuxy
2024-11-25 16:19:55 +08:00
parent ee7aa70d76
commit 05b0d53abe
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/AgvWaitUtil.java
View File

@@ -53,8 +53,10 @@ public class AgvWaitUtil {
param.put("toCommand",XgAgvEnum.APPLY_GET.getCode()); param.put("toCommand",XgAgvEnum.APPLY_GET.getCode());
param.put("deviceCode",deviceCode); 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()) { if (result.getIntValue("action") == XgAgvEnum.SSX_ACTION_GET.getCode()) {
String message = "允许AGV取货。"; String message = "允许AGV取货。";
@@ -95,8 +97,10 @@ public class AgvWaitUtil {
param.put("toCommand",XgAgvEnum.APPLY_GET_SUCCESS.getCode()); param.put("toCommand",XgAgvEnum.APPLY_GET_SUCCESS.getCode());
param.put("deviceCode",deviceCode); 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()) { if (result.getIntValue("action") == XgAgvEnum.SSX_ACTION_GET_MOVE.getCode()) {
String message = "允许AGV取货后离开。"; String message = "允许AGV取货后离开。";
@@ -137,8 +141,10 @@ public class AgvWaitUtil {
param.put("toCommand",XgAgvEnum.APPLY_PUT.getCode()); param.put("toCommand",XgAgvEnum.APPLY_PUT.getCode());
param.put("deviceCode",deviceCode); 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 (result.getIntValue("action") == XgAgvEnum.SSX_ACTION_PUT.getCode()) {
if (ObjectUtil.isNotEmpty(taskDto.getIs_vehicle()) && taskDto.getIs_vehicle().equals("1")) { 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("toCommand",XgAgvEnum.APPLY_PUT_SUCCESS.getCode());
param.put("deviceCode",deviceCode); 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()) { if (result.getIntValue("action") == XgAgvEnum.SSX_ACTION_PUT_MOVE.getCode()) {
String message = "允许AGV放货后离开。"; String message = "允许AGV放货后离开。";