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

rev:更新驱动点位地址

Browse Source
This commit is contained in:
tuqiang
2023-12-13 09:45:43 +08:00
parent 19ed527a0a
commit dacad71eac
4 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -187,32 +187,32 @@ public class ItemProtocol {
public static List<ItemDto> getReadableItemDtos() { public static List<ItemDto> getReadableItemDtos() {
ArrayList<ItemDto> list = new ArrayList<>(); ArrayList<ItemDto> list = new ArrayList<>();
list.add(new ItemDto(item_heartbeat, "心跳", "DB1.B0")); list.add(new ItemDto(item_heartbeat, "心跳", "DB100.W0"));
list.add(new ItemDto(item_mode, "工作模式", "DB1.B1")); list.add(new ItemDto(item_mode, "工作模式", "DB100.W2"));
list.add(new ItemDto(item_move, "光电信号", "DB1.B2")); list.add(new ItemDto(item_move, "光电信号", "DB100.W4"));
list.add(new ItemDto(item_action, "动作信号", "DB1.B3")); list.add(new ItemDto(item_action, "动作信号", "DB100.W6"));
list.add(new ItemDto(item_walk_y, "行走列", "DB1.B4")); list.add(new ItemDto(item_walk_y, "行走列", "DB100.W8"));
list.add(new ItemDto(item_error, "报警信号", "DB1.B5")); list.add(new ItemDto(item_error, "报警信号", "DB100.W10"));
list.add(new ItemDto(item_task, "任务号", "DB1.D6")); list.add(new ItemDto(item_task, "任务号", "DB100.D12"));
list.add(new ItemDto(item_x_position, "x坐标", "DB1.REAL10")); list.add(new ItemDto(item_x_position, "x坐标", "DB100.REAL16"));
list.add(new ItemDto(item_y_position, "y坐标", "DB1.REAL14")); list.add(new ItemDto(item_y_position, "y坐标", "DB100.REAL20"));
list.add(new ItemDto(item_inflatable_shaft_size, "气胀轴尺寸", "DB1.C1")); list.add(new ItemDto(item_inflatable_shaft_size, "气胀轴尺寸", "DB100.W24"));
return list; return list;
} }
public static List<ItemDto> getWriteableItemDtos() { public static List<ItemDto> getWriteableItemDtos() {
ArrayList<ItemDto> list = new ArrayList<>(); ArrayList<ItemDto> list = new ArrayList<>();
list.add(new ItemDto(item_to_command, "下发命令", "DB2.W0")); list.add(new ItemDto(item_to_command, "下发命令", "DB200.W0"));
list.add(new ItemDto(item_to_onset, "下发起始站", "DB2.W2")); list.add(new ItemDto(item_to_onset, "下发起始站", "DB200.W2"));
list.add(new ItemDto(item_to_target, "下发目标站", "DB2.W4")); list.add(new ItemDto(item_to_target, "下发目标站", "DB200.W4"));
list.add(new ItemDto(item_to_task, "下发任务号", "DB2.D1")); list.add(new ItemDto(item_to_task, "下发任务号", "DB200.D12"));
list.add(new ItemDto(item_to_putpoint, "反馈放货点", "DB2.D2")); list.add(new ItemDto(item_to_putpoint, "反馈放货点", "DB200.W6"));
list.add(new ItemDto(item_to_new_getpoint, "反馈新取货点", "DB2.D3")); list.add(new ItemDto(item_to_new_getpoint, "反馈新取货点", "DB200.W8"));
list.add(new ItemDto(item_to_two_putpoint, "反馈二次放货点", "DB2.D4")); list.add(new ItemDto(item_to_two_putpoint, "反馈二次放货点", "DB200.W10"));
list.add(new ItemDto(item_to_task_type, "下发任务类型", "DB2.D5")); list.add(new ItemDto(item_to_task_type, "下发任务类型", "DB200.W16"));
list.add(new ItemDto(item_inflatableShaftVersion, "气胀轴代数", "DB2.D6")); list.add(new ItemDto(item_inflatableShaftVersion, "气胀轴代数", "DB200.W18"));
list.add(new ItemDto(item_tube_num, "套管数量", "DB2.D7")); list.add(new ItemDto(item_tube_num, "套管数量", "DB200.W20"));
list.add(new ItemDto(item_is_wrapped, "是否套轴", "DB2.D8")); list.add(new ItemDto(item_is_wrapped, "是否套轴", "DB200.W22"));
return list; return list;
} }

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

@@ -75,11 +75,11 @@ public class ItemProtocol {
public static List<ItemDto> getReadableItemDtos() { public static List<ItemDto> getReadableItemDtos() {
ArrayList list = new ArrayList(); ArrayList list = new ArrayList();
list.add(new ItemDto(item_heartbeat, "心跳", "DB600.B0")); list.add(new ItemDto(item_heartbeat, "心跳", "DB104.W0"));
list.add(new ItemDto(item_mode, "工作状态", "DB600.B2")); list.add(new ItemDto(item_mode, "工作状态", "DB104.W2"));
list.add(new ItemDto(item_move, "光电开关信号", "DB600.B3")); list.add(new ItemDto(item_move, "光电开关信号", "DB104.W4"));
list.add(new ItemDto(item_error, "报警信号", "DB600.B5")); list.add(new ItemDto(item_error, "报警信号", "DB104.W6"));
list.add(new ItemDto(item_task1, "任务号1(行架任务号)", "DB600.D6")); list.add(new ItemDto(item_task1, "任务号1(行架任务号)", "DB104.D8"));
// list.add(new ItemDto(item_task2, "任务号2(纸管任务号)", "DB600.D10")); // list.add(new ItemDto(item_task2, "任务号2(纸管任务号)", "DB600.D10"));
return list; return list;
@@ -87,7 +87,7 @@ public class ItemProtocol {
public static List<ItemDto> getWriteableItemDtos() { public static List<ItemDto> getWriteableItemDtos() {
ArrayList list = new ArrayList(); ArrayList list = new ArrayList();
list.add(new ItemDto(item_to_command, "作业命令", "DB601.W2")); list.add(new ItemDto(item_to_command, "作业命令", "DB204.W0"));
return list; return list;
} }

20
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/plugging_unplugging_machine/PluggingUnpluggingMachineDeviceDriver.java
View File

@@ -141,16 +141,16 @@ public class PluggingUnpluggingMachineDeviceDriver extends AbstractOpcDeviceDriv
applyBushing(); applyBushing();
} }
break; break;
case 5: // case 5:
if ((task1 > 0) && !requireSucess) { // if ((task1 > 0) && !requireSucess) {
bushingSucess(); // bushingSucess();
} // }
break; // break;
case 6: // case 6:
if (task1 > 0 && !requireSucess) { // if (task1 > 0 && !requireSucess) {
pullingSucess(); // pullingSucess();
} // }
break; // break;
default: default:
break; break;

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

@@ -81,20 +81,20 @@ public class ItemProtocol {
public static List<ItemDto> getReadableItemDtos() { public static List<ItemDto> getReadableItemDtos() {
ArrayList list = new ArrayList(); ArrayList list = new ArrayList();
list.add(new ItemDto(item_heartbeat, "心跳", "DB102.W0")); list.add(new ItemDto(item_heartbeat, "心跳", "DB103.W0"));
list.add(new ItemDto(item_mode, "工作状态", "DB102.W2")); list.add(new ItemDto(item_mode, "工作状态", "DB103.W2"));
list.add(new ItemDto(item_move1, "光电开关信号1", "DB102.W4")); list.add(new ItemDto(item_move1, "光电开关信号1", "DB103.W4"));
list.add(new ItemDto(item_move1, "光电开关信号2", "DB102.W6")); list.add(new ItemDto(item_move1, "光电开关信号2", "DB103.W6"));
list.add(new ItemDto(item_qty1, "工位1重量", "DB102.REAL8")); list.add(new ItemDto(item_qty1, "工位1重量", "DB103.REAL8"));
list.add(new ItemDto(item_qty2, "工位2重量", "DB102.REAL12")); list.add(new ItemDto(item_qty2, "工位2重量", "DB103.REAL12"));
list.add(new ItemDto(item_error, "报警信号", "DB102.W16")); list.add(new ItemDto(item_error, "报警信号", "DB103.W16"));
list.add(new ItemDto(item_task, "任务号(行架任务号)", "DB102.D18")); list.add(new ItemDto(item_task, "任务号(行架任务号)", "DB103.D18"));
return list; return list;
} }
public static List<ItemDto> getWriteableItemDtos() { public static List<ItemDto> getWriteableItemDtos() {
ArrayList list = new ArrayList(); ArrayList list = new ArrayList();
list.add(new ItemDto(item_to_command, "作业命令", "DB202.W0")); list.add(new ItemDto(item_to_command, "作业命令", "DB203.W0"));
return list; return list;
} }
} }