diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java index 6ece9c1..5bb8266 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java @@ -184,7 +184,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic HttpResponse httpResponse = acsToWmsService.feedAgvTaskStatus(req); if (ObjectUtil.isNotEmpty(httpResponse) && httpResponse.getStatus() == 200) { JSONObject resp = JSONObject.parseObject(httpResponse.body()); - if (resp.getJSONObject("payload").getInteger("status") == 200) { + if (resp.getInteger("status") == 200) { +// if (resp.getJSONObject("payload").getInteger("status") == 200) { data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); log.info("指令号:{},acs请求wms取货申请成功,wms允许agv申请取货,已反馈agv允许取货", inst.getInstruction_code()); } else { @@ -249,7 +250,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic HttpResponse httpResponse = acsToWmsService.feedAgvTaskStatus(req); if (ObjectUtil.isNotEmpty(httpResponse) && httpResponse.getStatus() == 200) { JSONObject resp = JSONObject.parseObject(httpResponse.body()); - if (resp.getJSONObject("payload").getInteger("status") == 200) { + if (resp.getInteger("status") == 200) { +// if (resp.getJSONObject("payload").getInteger("status") == 200) { data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); log.info("指令号:{},acs反馈wms取货完成离开成功,wms允许agv取货完成离开,已反馈agv取货完成离开", inst.getInstruction_code()); } else { @@ -311,7 +313,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic HttpResponse httpResponse = acsToWmsService.feedAgvTaskStatus(req); if (ObjectUtil.isNotEmpty(httpResponse) && httpResponse.getStatus() == 200) { JSONObject resp = JSONObject.parseObject(httpResponse.body()); - if (resp.getJSONObject("payload").getInteger("status") == 200) { + if (resp.getInteger("status") == 200) { +// if (resp.getJSONObject("payload").getInteger("status") == 200) { data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); log.info("指令号:{},acs请求wms放货申请成功,wms允许agv申请放货,已反馈agv允许放货", inst.getInstruction_code()); } else { @@ -374,7 +377,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic HttpResponse httpResponse = acsToWmsService.feedAgvTaskStatus(req); if (ObjectUtil.isNotEmpty(httpResponse) && httpResponse.getStatus() == 200) { JSONObject resp = JSONObject.parseObject(httpResponse.body()); - if (resp.getJSONObject("payload").getInteger("status") == 200) { + if (resp.getInteger("status") == 200) { +// if (resp.getJSONObject("payload").getInteger("status") == 200) { data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); log.info("指令号:{},acs请求wms放货完成申请成功,wms允许agv放货完成,已反馈agv放货完成", inst.getInstruction_code()); } else { diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java index a9dbb5f..2da3a54 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java @@ -107,7 +107,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { String methods_url = addressDto.getMethods_url(); String url = wmsurl + methods_url; Map map = new HashMap<>(); - map.put("payload", JSON.toJSONString(data)); +// map.put("payload", JSON.toJSONString(data)); try { result = HttpRequest .post(url) @@ -566,7 +566,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { String url = wmsUrl + methods_url; HttpResponse result = null; Map map = new HashMap<>(); - map.put("payload", JSON.toJSONString(from)); +// map.put("payload", JSON.toJSONString(from)); try { result = HttpRequest.post(url) .header("Content-Type", "application/json;charset=UTF-8") diff --git a/acs/nladmin-ui/src/layout/components/Sidebar/Logo.vue b/acs/nladmin-ui/src/layout/components/Sidebar/Logo.vue index bc2a53d..572a941 100644 --- a/acs/nladmin-ui/src/layout/components/Sidebar/Logo.vue +++ b/acs/nladmin-ui/src/layout/components/Sidebar/Logo.vue @@ -2,11 +2,11 @@