diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/belt_conveyor/BeltConveyorDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/belt_conveyor/BeltConveyorDeviceDriver.java index 1aecbbf..2abd9d8 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/belt_conveyor/BeltConveyorDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/belt_conveyor/BeltConveyorDeviceDriver.java @@ -190,36 +190,36 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements logServer.deviceExecuteLog(this.device_code, "", "", "信号container_direction:" + last_container_direction + "->" + container_direction); } if (container_type != last_container_type) { - logServer.deviceItemValue(this.device_code, "carrier_direction", String.valueOf(container_type)); + logServer.deviceItemValue(this.device_code, "container_type", String.valueOf(container_type)); logServer.deviceExecuteLog(this.device_code, "", "", "信号container_type:" + last_container_type + "->" + container_type); } if (container_no != last_container_no) { - logServer.deviceItemValue(this.device_code, "carrier_direction", String.valueOf(container_no)); + logServer.deviceItemValue(this.device_code, "container_no", String.valueOf(container_no)); logServer.deviceExecuteLog(this.device_code, "", "", "信号container_no:" + last_container_no + "->" + container_no); } if (action != last_action) { - logServer.deviceItemValue(this.device_code, "carrier_direction", String.valueOf(action)); + logServer.deviceItemValue(this.device_code, "action", String.valueOf(action)); logServer.deviceExecuteLog(this.device_code, "", "", "信号action:" + last_action + "->" + action); } if (to_command != last_to_command) { - logServer.deviceItemValue(this.device_code, "carrier_direction", String.valueOf(to_command)); + logServer.deviceItemValue(this.device_code, "to_command", String.valueOf(to_command)); logServer.deviceExecuteLog(this.device_code, "", "", "信号to_command:" + last_to_command + "->" + to_command); } if (to_target != last_to_target) { - logServer.deviceItemValue(this.device_code, "carrier_direction", String.valueOf(to_target)); + logServer.deviceItemValue(this.device_code, "to_target", String.valueOf(to_target)); logServer.deviceExecuteLog(this.device_code, "", "", "信号to_target:" + last_to_target + "->" + to_target); } if (to_task != last_to_task) { - logServer.deviceItemValue(this.device_code, "carrier_direction", String.valueOf(to_task)); + logServer.deviceItemValue(this.device_code, "to_task", String.valueOf(to_task)); logServer.deviceExecuteLog(this.device_code, "", "", "信号to_task:" + last_to_task + "->" + to_task); } if (to_container_no != last_to_container_no) { - logServer.deviceItemValue(this.device_code, "carrier_direction", String.valueOf(to_container_no)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号to_task:" + last_to_container_no + "->" + to_container_no); + logServer.deviceItemValue(this.device_code, "to_container_no", String.valueOf(to_container_no)); + logServer.deviceExecuteLog(this.device_code, "", "", "信号to_container_no:" + last_to_container_no + "->" + to_container_no); } if (to_container_type != last_to_container_type) { - logServer.deviceItemValue(this.device_code, "carrier_direction", String.valueOf(to_container_type)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号to_task:" + last_to_container_type + "->" + to_container_type); + logServer.deviceItemValue(this.device_code, "to_container_type", String.valueOf(to_container_type)); + logServer.deviceExecuteLog(this.device_code, "", "", "信号to_container_type:" + last_to_container_type + "->" + to_container_type); } if (error != last_error) { if (error != 0) { @@ -406,6 +406,7 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements map.put("to_container_no", "1"); this.writing(map); requireSucess = true; + led_message = getLedMessage(inst); return true; } else { //判断是否有相同起点的,任务状态就绪的任务 diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_stacker/StandardStackerDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_stacker/StandardStackerDeviceDriver.java index f27bd37..a5b50ce 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_stacker/StandardStackerDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_stacker/StandardStackerDeviceDriver.java @@ -442,14 +442,14 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme } } if (StrUtil.equals(nextDevice.getDevice_type(), DeviceType.storage.name())) { - map.put("to_z", inst.getTo_z()); - if (inst.getTo_x().length() > 1) { - String substring = inst.getTo_x().substring(1); - map.put("to_x", substring); + map.put("to_y", inst.getFrom_z()); + if (inst.getFrom_x().length() > 1) { + String substring = inst.getFrom_x().substring(1); + map.put("to_z", substring); } else { - map.put("to_x", inst.getTo_x()); + map.put("to_z", inst.getFrom_x()); } - map.put("to_y", inst.getTo_y()); + map.put("to_x", inst.getFrom_y()); } map.put("to_command", 2); requireSucess = true; @@ -555,7 +555,6 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme * * @param */ - public synchronized boolean applyTask() { Date date = new Date(); if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) {