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

Merge commit '1f9ea990ecd9811e2002ef491e2fc57ae1848490' into master_merge

Browse Source
This commit is contained in:
liuxy
2024-07-03 16:43:57 +08:00
parent b856cb00a8 1f9ea990ec
commit eaadc6b971
26 changed files with 488 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/ItemProtocol.java
View File

@@ -25,6 +25,12 @@ public class ItemProtocol {
public static String item_error = "error";
//任务号
public static String item_task = "task";
//货叉上叠盘数量
public static String item_s_quantity = "s_quantity";
//货叉下叠盘数量
public static String item_x_quantity = "x_quantity";
//叠盘总数量
public static String item_quantity = "quantity";
//下发命令
public static String item_to_command = "to_command";
@@ -74,6 +80,18 @@ public class ItemProtocol {
return this.getOpcIntegerValue(item_task);
}
public int getS_quantity() {
return this.getOpcIntegerValue(item_s_quantity);
}
public int getX_quantity() {
return this.getOpcIntegerValue(item_x_quantity);
}
public int getQuantity() {
return this.getOpcIntegerValue(item_quantity);
}
public int getTo_command() {
return this.getOpcIntegerValue(item_to_command);
}
@@ -142,6 +160,9 @@ public class ItemProtocol {
list.add(new ItemDto(item_carrier_direction, "托盘方向", "DB600.B4"));
list.add(new ItemDto(item_error, "报警信号", "DB600.B6"));
list.add(new ItemDto(item_task, "任务号", "DB600.D10"));
list.add(new ItemDto(item_s_quantity, "货叉上叠盘数量", "DB600.D12"));
list.add(new ItemDto(item_x_quantity, "货叉下叠盘数量", "DB600.D14"));
list.add(new ItemDto(item_quantity, "叠盘总数量", "DB600.D16"));
return list;
}