root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix : rgv添加目标站字段

Browse Source
This commit is contained in:
ls
2024-09-23 17:02:13 +08:00
parent ef78240c77
commit 25fc73bfe0
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/rgv/ItemProtocol.java
View File

@@ -28,6 +28,9 @@ ItemProtocol {
//报警 //报警
public static String item_error = "error"; public static String item_error = "error";
//目标站
public static String item_target = "target";
@@ -60,6 +63,9 @@ ItemProtocol {
public int getError() { public int getError() {
return this.getOpcIntegerValue(item_error); return this.getOpcIntegerValue(item_error);
} }
public int getTarget() {
return this.getOpcIntegerValue(item_target);
}
public int getTask() { public int getTask() {
@@ -103,6 +109,7 @@ ItemProtocol {
list.add(new ItemDto(item_walk_y, "行走列", "DB1.B4")); list.add(new ItemDto(item_walk_y, "行走列", "DB1.B4"));
list.add(new ItemDto(item_error, "报警信号", "DB1.B5")); list.add(new ItemDto(item_error, "报警信号", "DB1.B5"));
list.add(new ItemDto(item_task, "任务号", "DB1.D6")); list.add(new ItemDto(item_task, "任务号", "DB1.D6"));
list.add(new ItemDto(item_target, "目标站", "DB1.76"));
return list; return list;
} }

6
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/rgv/OneRgvDeviceDriver.java
View File

@@ -87,6 +87,10 @@ public class OneRgvDeviceDriver extends AbstractOpcDeviceDriver implements Devic
//任务号 //任务号
int task = 0; int task = 0;
int last_task = 0; int last_task = 0;
//目标站
int target = 0;
int last_target = 0;
//气涨轴条码 //气涨轴条码
String barcode; String barcode;
String last_barcode; String last_barcode;
@@ -159,6 +163,7 @@ public class OneRgvDeviceDriver extends AbstractOpcDeviceDriver implements Devic
walk_y = this.itemProtocol.getWalk_y(); walk_y = this.itemProtocol.getWalk_y();
error = this.itemProtocol.getError(); error = this.itemProtocol.getError();
task = this.itemProtocol.getTask(); task = this.itemProtocol.getTask();
target = this.itemProtocol.getTarget();
heartbeat = this.itemProtocol.getHeartbeat(); heartbeat = this.itemProtocol.getHeartbeat();
@@ -206,6 +211,7 @@ public class OneRgvDeviceDriver extends AbstractOpcDeviceDriver implements Devic
last_task = task; last_task = task;
last_heartbeat = heartbeat; last_heartbeat = heartbeat;
last_barcode = barcode; last_barcode = barcode;
last_target = target;
} }