diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_plcscanner/StandardCoveyorControlWithPlcScannerDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_plcscanner/StandardCoveyorControlWithPlcScannerDeviceDriver.java index 8b49dab99..e459f504b 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_plcscanner/StandardCoveyorControlWithPlcScannerDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_plcscanner/StandardCoveyorControlWithPlcScannerDeviceDriver.java @@ -864,6 +864,18 @@ public class StandardCoveyorControlWithPlcScannerDeviceDriver extends AbstractOp move = "有托盘有货"; jo.put("hasGoods", true); } + String requireSucess = "0"; + if (this.requireSucess) { + requireSucess = "1"; + } + String applySucess = "0"; + if (this.applySucess) { + applySucess = "1"; + } + jo.put("requireSucess", requireSucess); + jo.put("applySucess", applySucess); + jo.put("driver_type", "standard_conveyor_control_with_scanner"); + jo.put("is_click", true); jo.put("device_name", this.getDevice().getDevice_name()); jo.put("mode", mode); jo.put("move", move); @@ -877,7 +889,12 @@ public class StandardCoveyorControlWithPlcScannerDeviceDriver extends AbstractOp @Override public void setDeviceStatus(JSONObject data) { - + String requestSucess = data.getString("requireSucess"); + if (StrUtil.equals(requestSucess, "0")) { + this.requireSucess = false; + } else if (StrUtil.equals(requestSucess, "1")) { + this.requireSucess = true; + } } diff --git a/acs/nladmin-ui/src/views/system/monitor/device/index.vue b/acs/nladmin-ui/src/views/system/monitor/device/index.vue index eb4800a46..d3d1d0b59 100644 --- a/acs/nladmin-ui/src/views/system/monitor/device/index.vue +++ b/acs/nladmin-ui/src/views/system/monitor/device/index.vue @@ -103,6 +103,12 @@ + + + + + +