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

rev 更新驱动

Browse Source
This commit is contained in:
周俊杰
2023-08-04 16:05:43 +08:00
parent 8e5ee1d791
commit 7374947972
8 changed files with 513 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/conveyor_press_station/ItemProtocol.java
View File

@@ -91,6 +91,13 @@ public class ItemProtocol {
return this.getOpcIntegerValue(item_to_task);
}
public int getToBarcode() {
return this.getOpcIntegerValue(item_to_barcode);
}
public int getToMixNum() {
return this.getOpcIntegerValue(item_to_mix_num);
}
//是否有货
public int hasGoods(int move) {
return move;
@@ -139,7 +146,7 @@ public class ItemProtocol {
list.add(new ItemDto(item_to_target, "目标站", "DB50.W2"));
list.add(new ItemDto(item_to_task, "任务号", "DB50.D4"));
list.add(new ItemDto(item_to_barcode, "条码", "DB50.W8"));
list.add(new ItemDto(item_to_mix_num, "碾次", "DB50.W10"));
list.add(new ItemDto(item_to_mix_num, "碾次", "DB50.STRING10.50"));
return list;
}

60
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_fold_disc_site/ItemProtocol.java
View File

@@ -24,6 +24,16 @@ public class ItemProtocol {
public static String item_to_command = "to_command";
public static String item_to_target = "to_target";
public static String item_to_task = "to_task";
public static String item_move = "move";
public static String item_action = "action";
public static String item_ioaction = "ioaction";
public static String item_error = "error";
public static String item_task = "task";
public static String item_weight = "weight";
public static String item_material = "material";
public static String item_barcode = "barcode";
public static String item_to_barcode = "to_barcode";
public static String item_to_mix_num = "to_mix_num";
Boolean isonline;
private LnshFoldDiscSiteDeviceDriver driver;
@@ -39,6 +49,37 @@ public class ItemProtocol {
public int getMode() {
return this.getOpcIntegerValue(item_mode);
}
public int getMove() {
return this.getOpcIntegerValue(item_move);
}
public int getAction() {
return this.getOpcIntegerValue(item_action);
}
public int getIoAction() {
return this.getOpcIntegerValue(item_ioaction);
}
public int getError() {
return this.getOpcIntegerValue(item_error);
}
public int getTask() {
return this.getOpcIntegerValue(item_task);
}
public int getWeight() {
return this.getOpcIntegerValue(item_weight);
}
public String getMaterial() {
return this.getOpcStringValue(item_material);
}
public int getBarcode() {
return this.getOpcIntegerValue(item_barcode);
}
public int getStatus() {
return this.getOpcIntegerValue(item_status);
@@ -111,15 +152,16 @@ public class ItemProtocol {
public static List<ItemDto> getReadableItemDtos() {
ArrayList list = new ArrayList();
list.add(new ItemDto(item_heartbeat, "心跳", "DB120.B0"));
list.add(new ItemDto(item_mode, "工作模式", "DB120.B1", Boolean.valueOf(true)));
list.add(new ItemDto(item_status, "设备状态", "DB120.B2"));
list.add(new ItemDto(item_open_time, "开机时间", "DB120.STRING4.50"));
list.add(new ItemDto(item_close_time, "关机时间", "DB120.D56"));
list.add(new ItemDto(item_standby_time, "待机时间", "DB120.D60"));
list.add(new ItemDto(item_production_time, "生产时间", "DB120.D64"));
list.add(new ItemDto(item_error_time, "故障时间", "DB120.D68"));
list.add(new ItemDto(item_container_qty, "托盘数", "DB120.D72"));
list.add(new ItemDto(item_heartbeat, "心跳", "DB51.B0"));
list.add(new ItemDto(item_mode, "工作模式", "DB51.B1", Boolean.valueOf(true)));
list.add(new ItemDto(item_move, "光电开关信号", "DB51.B2"));
list.add(new ItemDto(item_action, "取放信号", "DB51.B3"));
list.add(new ItemDto(item_ioaction, "进出信号", "DB51.B4"));
list.add(new ItemDto(item_error, "报警信号", "DB51.B5"));
list.add(new ItemDto(item_task, "任务号", "DB51.D6"));
list.add(new ItemDto(item_weight, "重量", "DB51.D10"));
list.add(new ItemDto(item_material, "物料", "DB51.STRING14.50"));
list.add(new ItemDto(item_barcode, "条码", "DB51.W66"));
return list;
}

16
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_fold_disc_site/LnshFoldDiscSiteDefination.java
View File

@@ -50,21 +50,7 @@ public class LnshFoldDiscSiteDefination implements OpcDeviceDriverDefination {
@Override
public List<ItemDto> getReadableItemDtos() {
return getReadableItemDtos2();
}
public static List<ItemDto> getReadableItemDtos2() {
ArrayList list = new ArrayList();
list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB120.B0"));
list.add(new ItemDto(ItemProtocol.item_mode, "工作模式", "DB120.B1", Boolean.valueOf(true)));
list.add(new ItemDto(ItemProtocol.item_status, "设备状态", "DB120.B2"));
list.add(new ItemDto(ItemProtocol.item_open_time, "开机时间", "DB120.STRING4.50"));
list.add(new ItemDto(ItemProtocol.item_close_time, "关机时间", "DB120.D56"));
list.add(new ItemDto(ItemProtocol.item_standby_time, "待机时间", "DB120.D60"));
list.add(new ItemDto(ItemProtocol.item_production_time, "生产时间", "DB120.D64"));
list.add(new ItemDto(ItemProtocol.item_error_time, "故障时间", "DB120.D68"));
list.add(new ItemDto(ItemProtocol.item_container_qty, "托盘数", "DB120.D72"));
return list;
return ItemProtocol.getReadableItemDtos();
}
@Override

75
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/ItemProtocol.java
View File

@@ -32,8 +32,8 @@ public class ItemProtocol {
public static String item_BshortSide = "BshortSide";
public static String item_Htrapezoidal = "Htrapezoidal";
public static String item_Wthickness = "Wthickness";
public static String item_grab_station = "grab_station";
public static String item_place_station = "place_station";
public static String item_to_feedback = "to_feedback";
public static String item_to_error = "to_error";
public static String item_to_material = "to_material";
@@ -48,6 +48,8 @@ public class ItemProtocol {
public static String item_to_on_vehicle_qty = "to_on_vehicle_qty";
public static String item_to_vehicle_type = "to_vehicle_type";
public static String item_to_tray_qty = "to_tray_qty";
private LnshPackagePalletManipulatorDeviceDriver driver;
@@ -59,10 +61,22 @@ public class ItemProtocol {
return this.getOpcIntegerValue(item_heartbeat);
}
public int getToTrayQty() {
return this.getOpcIntegerValue(item_to_tray_qty);
}
public int getMode() {
return this.getOpcIntegerValue(item_mode);
}
public int getGrabStation() {
return this.getOpcIntegerValue(item_grab_station);
}
public int getPlaceStation() {
return this.getOpcIntegerValue(item_place_station);
}
public int getStatus() {
return this.getOpcIntegerValue(item_status);
}
@@ -207,25 +221,25 @@ public class ItemProtocol {
public static List<ItemDto> getReadableItemDtos() {
ArrayList list = new ArrayList();
list.add(new ItemDto(item_heartbeat, "心跳", "DB1.B0"));
list.add(new ItemDto(item_mode, "工作模式", "DB1.B1", Boolean.valueOf(true)));
list.add(new ItemDto(item_status, "设备状态", "DB1.B2"));
list.add(new ItemDto(item_error, "故障代码", "DB1.B3"));
list.add(new ItemDto(item_putStation, "当前工位", "DB1.D4"));
list.add(new ItemDto(item_material, "物料", "DB1.STRING8.50"));
list.add(new ItemDto(item_qty, "拆/码垛数量", "DB1.D60"));
list.add(new ItemDto(item_order_qty, "工单总数量", "DB1.D64"));
list.add(new ItemDto(item_open_time, "开机时间", "DB1.STRING68.50"));
list.add(new ItemDto(item_standby_time, "待机时间", "DB1.D120"));
list.add(new ItemDto(item_production_time, "生产时间", "DB1.D124"));
list.add(new ItemDto(item_error_time, "故障时间", "DB1.D128"));
list.add(new ItemDto(item_order_No, "工单号", "DB1.STRING132.50"));
list.add(new ItemDto(item_product_code, "产品编号", "DB1.W184"));
list.add(new ItemDto(item_AlongSide, "A长边", "DB1.W186"));
list.add(new ItemDto(item_BshortSide, "B短边", "DB1.W188"));
list.add(new ItemDto(item_Htrapezoidal, "H梯形高", "DB1.W190"));
list.add(new ItemDto(item_Wthickness, "W厚度", "DB1.W192"));
list.add(new ItemDto(item_heartbeat, "心跳", "DB80.B0"));
list.add(new ItemDto(item_mode, "工作模式", "DB80.B1", Boolean.valueOf(true)));
list.add(new ItemDto(item_status, "设备状态", "DB80.B2"));
list.add(new ItemDto(item_error, "故障代码", "DB80.B3"));
list.add(new ItemDto(item_putStation, "当前码盘工位", "DB80.D4"));
list.add(new ItemDto(item_material, "当前物料", "DB80.STRING8.50"));
list.add(new ItemDto(item_qty, "拆/码垛数量", "DB80.D60"));
list.add(new ItemDto(item_open_time, "开机时间", "DB80.STRING64.50"));
list.add(new ItemDto(item_standby_time, "待机时间", "DB80.D116"));
list.add(new ItemDto(item_production_time, "生产时间", "DB80.D120"));
list.add(new ItemDto(item_error_time, "故障时间", "DB80.D124"));
list.add(new ItemDto(item_order_No, "工单号", "DB80.STRING128.50"));
list.add(new ItemDto(item_grab_station, "当前抓取工位", "DB80.B130"));
list.add(new ItemDto(item_place_station, "当前放置工位", "DB80.B132"));
// list.add(new ItemDto(item_product_code, "产品编号", "DB1.W184"));
// list.add(new ItemDto(item_AlongSide, "A长边", "DB1.W186"));
// list.add(new ItemDto(item_BshortSide, "B短边", "DB1.W188"));
// list.add(new ItemDto(item_Htrapezoidal, "H梯形高", "DB1.W190"));
// list.add(new ItemDto(item_Wthickness, "W厚度", "DB1.W192"));
return list;
}
@@ -233,16 +247,19 @@ public class ItemProtocol {
ArrayList list = new ArrayList();
list.add(new ItemDto(item_to_feedback, "机器人动作反馈", "DB2.B0"));
list.add(new ItemDto(item_to_error, "故障代码", "DB2.B1"));
list.add(new ItemDto(item_to_material, "物料", "DB2.STRING2.50"));
list.add(new ItemDto(item_to_order_No, "工单号", "DB2.STRING54.50"));
list.add(new ItemDto(item_to_order_qty, "工单数量", "DB2.D106"));
list.add(new ItemDto(item_to_product_code, "产品编号", "DB2.W110"));
list.add(new ItemDto(item_to_AlongSide, "A长边", "DB2.W112"));
list.add(new ItemDto(item_to_BshortSide, "B短边", "DB2.W114"));
list.add(new ItemDto(item_to_Htrapezoidal, "H梯形高", "DB2.W116"));
list.add(new ItemDto(item_to_Wthickness, "W厚度", "DB2.W118"));
list.add(new ItemDto(item_to_on_vehicle_qty, "托盘上数量", "DB2.W120"));
list.add(new ItemDto(item_to_tray_qty, "允许码垛数量", "DB100.W82"));
list.add(new ItemDto(item_to_vehicle_type, "托盘类型", "DB2.W122"));
list.add(new ItemDto(item_to_material, "下发物料编号", "DB2.STRING2.50"));
list.add(new ItemDto(item_to_order_No, "工单号", "DB2.STRING54.50"));
// list.add(new ItemDto(item_to_order_qty, "工单数量", "DB2.D106"));
// list.add(new ItemDto(item_to_product_code, "产品编号", "DB2.W110"));
// list.add(new ItemDto(item_to_AlongSide, "A长边", "DB2.W112"));
// list.add(new ItemDto(item_to_BshortSide, "B短边", "DB2.W114"));
// list.add(new ItemDto(item_to_Htrapezoidal, "H梯形高", "DB2.W116"));
// list.add(new ItemDto(item_to_Wthickness, "W厚度", "DB2.W118"));
return list;
}