diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/rgv/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/rgv/ItemProtocol.java index 7454c597c..4f7f7ca2c 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/rgv/ItemProtocol.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/rgv/ItemProtocol.java @@ -28,6 +28,9 @@ ItemProtocol { //报警 public static String item_error = "error"; + //目标站 + public static String item_target = "target"; + @@ -60,6 +63,9 @@ ItemProtocol { public int getError() { return this.getOpcIntegerValue(item_error); } + public int getTarget() { + return this.getOpcIntegerValue(item_target); + } public int getTask() { @@ -103,6 +109,7 @@ ItemProtocol { list.add(new ItemDto(item_walk_y, "行走列", "DB1.B4")); list.add(new ItemDto(item_error, "报警信号", "DB1.B5")); list.add(new ItemDto(item_task, "任务号", "DB1.D6")); + list.add(new ItemDto(item_target, "目标站", "DB1.76")); return list; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/rgv/OneRgvDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/rgv/OneRgvDeviceDriver.java index 51552946e..e0ab4f603 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/rgv/OneRgvDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/rgv/OneRgvDeviceDriver.java @@ -87,6 +87,10 @@ public class OneRgvDeviceDriver extends AbstractOpcDeviceDriver implements Devic //任务号 int task = 0; int last_task = 0; + + //目标站 + int target = 0; + int last_target = 0; //气涨轴条码 String barcode; String last_barcode; @@ -159,6 +163,7 @@ public class OneRgvDeviceDriver extends AbstractOpcDeviceDriver implements Devic walk_y = this.itemProtocol.getWalk_y(); error = this.itemProtocol.getError(); task = this.itemProtocol.getTask(); + target = this.itemProtocol.getTarget(); heartbeat = this.itemProtocol.getHeartbeat(); @@ -206,6 +211,7 @@ public class OneRgvDeviceDriver extends AbstractOpcDeviceDriver implements Devic last_task = task; last_heartbeat = heartbeat; last_barcode = barcode; + last_target = target; }