diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_conveyor_control/StandardCoveyorControlDeviceDriver.java b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_conveyor_control/StandardCoveyorControlDeviceDriver.java index b6a45da..6f2c5a3 100644 --- a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_conveyor_control/StandardCoveyorControlDeviceDriver.java +++ b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_conveyor_control/StandardCoveyorControlDeviceDriver.java @@ -230,7 +230,7 @@ public class StandardCoveyorControlDeviceDriver extends AbstractOpcDeviceDriver Map itemMap = new HashMap(); itemMap.put(to_param, value); ReadUtil.write(itemMap, server); - logServer.log("kong", "write", String.valueOf(type), param.toString(), String.valueOf(param), "200", "", ""); + logServer.log("kong", "write", String.valueOf(type), to_param.toString(), String.valueOf(param), "200", "", ""); } diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AgvWaitUtil.java b/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AgvWaitUtil.java index 2590138..07db712 100644 --- a/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AgvWaitUtil.java +++ b/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AgvWaitUtil.java @@ -49,7 +49,7 @@ public class AgvWaitUtil { int responseCode = Integer.parseInt(String.valueOf(feedback.get("responseCode"))); String responseMessage = String.valueOf(feedback.get("responseMessage")); if (responseCode == 0) { - feedback.put("feedbackStatus", "taking"); + feedMap.put("feedbackStatus", "taking"); acsToWmsZDService.taskFeedback(feedMap); map.put("status", 200); map.put("message", "请求成功"); @@ -83,7 +83,7 @@ public class AgvWaitUtil { String responseMessage = String.valueOf(feedback.get("responseMessage")); if (responseCode == 0) { - feedback.put("feedbackStatus", "taking"); + feedMap.put("feedbackStatus", "taking"); acsToWmsZDService.taskFeedback(feedMap); map.put("status", 200); map.put("message", "请求成功"); @@ -195,7 +195,7 @@ public class AgvWaitUtil { String responseMessage = (String.valueOf(feedback.get("responseMessage"))); if (responseCode == 0) { - feedback.put("feedbackStatus", "puting"); + feedMap.put("feedbackStatus", "puting"); acsToWmsZDService.taskFeedback(feedMap); map.put("status", 200); map.put("message", "请求成功"); @@ -213,7 +213,7 @@ public class AgvWaitUtil { map.put("message", "请求失败,终点位置有货!move = " + standardConveyorLineDeviceDriver.getMove() + "action = " + standardConveyorLineDeviceDriver.getAction()); type = "erro"; logServer.log(task_code, "waitpointRequest", type, param.toString(), String.valueOf(map), "400", "api/agv/waitpointRequest", instructionDto.getVehicle_code()); - throw new BadRequestException("请求失败,终点位置有货!"); + throw new BadRequestException("请求失败,终点位置有货或不允许放货!"); } } if (device.getDeviceDriver() instanceof StandardCoveyorControlDeviceDriver) { @@ -229,7 +229,7 @@ public class AgvWaitUtil { String responseMessage = (String.valueOf(feedback.get("responseMessage"))); if (responseCode == 0) { - feedback.put("feedbackStatus", "puting"); + feedMap.put("feedbackStatus", "puting"); acsToWmsZDService.taskFeedback(feedMap); map.put("status", 200); map.put("message", "请求成功");