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

fix:产线接驳台、拆封盖对接位驱动

Browse Source
This commit is contained in:
zhengxuming
2025-08-27 14:39:35 +08:00
parent 95819b550d
commit 2a83b23108
4 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/zz_driver/production_line_docking_station/ItemProtocol.java
View File

@@ -98,18 +98,18 @@ ItemProtocol {
public static List<ItemDto> getReadableItemDtos() {
ArrayList<ItemDto> list = new ArrayList<>();
list.add(new ItemDto(item_heartbeat, "心跳", "DB1.B0"));
list.add(new ItemDto(item_mode, "工作模式", "DB1.B2"));
list.add(new ItemDto(item_move, "光电信号", "DB1.B3"));
list.add(new ItemDto(item_action, "取放信号", "DB1.B4"));
list.add(new ItemDto(item_error, "报警信号", "DB1.B5"));
list.add(new ItemDto(item_heartbeat, "心跳", "DB600.B0"));
list.add(new ItemDto(item_mode, "工作模式", "DB600.B2"));
list.add(new ItemDto(item_move, "光电信号", "DB600.B3"));
list.add(new ItemDto(item_action, "取放信号", "DB600.B4"));
list.add(new ItemDto(item_error, "报警信号", "DB600.B5"));
return list;
}
public static List<ItemDto> getWriteableItemDtos() {
ArrayList<ItemDto> list = new ArrayList<>();
list.add(new ItemDto(item_to_command, "下发命令", "DB2.W0"));
list.add(new ItemDto(item_to_error, "下发故障代码", "DB2.W2"));
list.add(new ItemDto(item_to_command, "下发命令", "DB601.W0"));
list.add(new ItemDto(item_to_error, "下发故障代码", "DB601.W2"));
return list;
}
}

2
acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/zz_driver/production_line_docking_station/ProductionLineDockingStationDeviceDriver.java
View File

@@ -238,8 +238,6 @@ public class ProductionLineDockingStationDeviceDriver extends AbstractOpcDeviceD
jo.put("move", move);
jo.put("action", action);
jo.put("isOnline", true);
// jo.put("error", ErrorUtil.getDictDetail("gxhj_error_type", String.valueOf(this.getError())));
// jo.put("isError", this.getIserror());
return jo;
}

14
acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/zz_driver/remove_seal_cover_position/ItemProtocol.java
View File

@@ -97,18 +97,18 @@ ItemProtocol {
public static List<ItemDto> getReadableItemDtos() {
ArrayList<ItemDto> list = new ArrayList<>();
list.add(new ItemDto(item_heartbeat, "心跳", "DB1.B0"));
list.add(new ItemDto(item_mode, "工作模式", "DB1.B2"));
list.add(new ItemDto(item_action, "取放信号", "DB1.B4"));
list.add(new ItemDto(item_error, "报警信号", "DB1.B5"));
list.add(new ItemDto(item_task, "任务号", "DB1.B6"));
list.add(new ItemDto(item_heartbeat, "心跳", "DB600.B0"));
list.add(new ItemDto(item_mode, "工作模式", "DB600.B2"));
list.add(new ItemDto(item_action, "取放信号", "DB600.B4"));
list.add(new ItemDto(item_error, "报警信号", "DB600.B5"));
list.add(new ItemDto(item_task, "任务号", "DB600.D6"));
return list;
}
public static List<ItemDto> getWriteableItemDtos() {
ArrayList<ItemDto> list = new ArrayList<>();
list.add(new ItemDto(item_to_command, "下发命令", "DB2.W2"));
list.add(new ItemDto(item_to_task, "下发故障代码", "DB2.W8"));
list.add(new ItemDto(item_to_command, "下发命令", "DB601.W2"));
list.add(new ItemDto(item_to_task, "下发故障代码", "DB601.D8"));
return list;
}
}

2
acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/zz_driver/remove_seal_cover_position/RemoveSealCoverPositionDriver.java
View File

@@ -231,8 +231,6 @@ public class RemoveSealCoverPositionDriver extends AbstractOpcDeviceDriver imple
jo.put("task", task);
jo.put("action", action);
jo.put("isOnline", true);
// jo.put("error", ErrorUtil.getDictDetail("gxhj_error_type", String.valueOf(this.getError())));
// jo.put("isError", this.getIserror());
return jo;
}