From dacad71eac64bdcc26201c3cd23c4a2af2f30a92 Mon Sep 17 00:00:00 2001 From: tuqiang <437016993@qq.com> Date: Wed, 13 Dec 2023 09:45:43 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E6=9B=B4=E6=96=B0=E9=A9=B1=E5=8A=A8?= =?UTF-8?q?=E7=82=B9=E4=BD=8D=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../indoor_manipulator/ItemProtocol.java | 42 +++++++++---------- .../ItemProtocol.java | 12 +++--- ...PluggingUnpluggingMachineDeviceDriver.java | 20 ++++----- .../basedriver/rgv/ItemProtocol.java | 18 ++++---- 4 files changed, 46 insertions(+), 46 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/ItemProtocol.java index ed425f955..22d4941e9 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/ItemProtocol.java @@ -187,32 +187,32 @@ public class ItemProtocol { public static List getReadableItemDtos() { ArrayList list = new ArrayList<>(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB1.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB1.B1")); - list.add(new ItemDto(item_move, "光电信号", "DB1.B2")); - list.add(new ItemDto(item_action, "动作信号", "DB1.B3")); - list.add(new ItemDto(item_walk_y, "行走列", "DB1.B4")); - list.add(new ItemDto(item_error, "报警信号", "DB1.B5")); - list.add(new ItemDto(item_task, "任务号", "DB1.D6")); - list.add(new ItemDto(item_x_position, "x坐标", "DB1.REAL10")); - list.add(new ItemDto(item_y_position, "y坐标", "DB1.REAL14")); - list.add(new ItemDto(item_inflatable_shaft_size, "气胀轴尺寸", "DB1.C1")); + list.add(new ItemDto(item_heartbeat, "心跳", "DB100.W0")); + list.add(new ItemDto(item_mode, "工作模式", "DB100.W2")); + list.add(new ItemDto(item_move, "光电信号", "DB100.W4")); + list.add(new ItemDto(item_action, "动作信号", "DB100.W6")); + list.add(new ItemDto(item_walk_y, "行走列", "DB100.W8")); + list.add(new ItemDto(item_error, "报警信号", "DB100.W10")); + list.add(new ItemDto(item_task, "任务号", "DB100.D12")); + list.add(new ItemDto(item_x_position, "x坐标", "DB100.REAL16")); + list.add(new ItemDto(item_y_position, "y坐标", "DB100.REAL20")); + list.add(new ItemDto(item_inflatable_shaft_size, "气胀轴尺寸", "DB100.W24")); return list; } public static List getWriteableItemDtos() { ArrayList list = new ArrayList<>(); - list.add(new ItemDto(item_to_command, "下发命令", "DB2.W0")); - list.add(new ItemDto(item_to_onset, "下发起始站", "DB2.W2")); - list.add(new ItemDto(item_to_target, "下发目标站", "DB2.W4")); - list.add(new ItemDto(item_to_task, "下发任务号", "DB2.D1")); - list.add(new ItemDto(item_to_putpoint, "反馈放货点", "DB2.D2")); - list.add(new ItemDto(item_to_new_getpoint, "反馈新取货点", "DB2.D3")); - list.add(new ItemDto(item_to_two_putpoint, "反馈二次放货点", "DB2.D4")); - list.add(new ItemDto(item_to_task_type, "下发任务类型", "DB2.D5")); - list.add(new ItemDto(item_inflatableShaftVersion, "气胀轴代数", "DB2.D6")); - list.add(new ItemDto(item_tube_num, "套管数量", "DB2.D7")); - list.add(new ItemDto(item_is_wrapped, "是否套轴", "DB2.D8")); + list.add(new ItemDto(item_to_command, "下发命令", "DB200.W0")); + list.add(new ItemDto(item_to_onset, "下发起始站", "DB200.W2")); + list.add(new ItemDto(item_to_target, "下发目标站", "DB200.W4")); + list.add(new ItemDto(item_to_task, "下发任务号", "DB200.D12")); + list.add(new ItemDto(item_to_putpoint, "反馈放货点", "DB200.W6")); + list.add(new ItemDto(item_to_new_getpoint, "反馈新取货点", "DB200.W8")); + list.add(new ItemDto(item_to_two_putpoint, "反馈二次放货点", "DB200.W10")); + list.add(new ItemDto(item_to_task_type, "下发任务类型", "DB200.W16")); + list.add(new ItemDto(item_inflatableShaftVersion, "气胀轴代数", "DB200.W18")); + list.add(new ItemDto(item_tube_num, "套管数量", "DB200.W20")); + list.add(new ItemDto(item_is_wrapped, "是否套轴", "DB200.W22")); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/plugging_unplugging_machine/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/plugging_unplugging_machine/ItemProtocol.java index 33bf18fef..3e10ab4de 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/plugging_unplugging_machine/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/plugging_unplugging_machine/ItemProtocol.java @@ -75,11 +75,11 @@ public class ItemProtocol { public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - 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_error, "报警信号", "DB600.B5")); - list.add(new ItemDto(item_task1, "任务号1(行架任务号)", "DB600.D6")); + list.add(new ItemDto(item_heartbeat, "心跳", "DB104.W0")); + list.add(new ItemDto(item_mode, "工作状态", "DB104.W2")); + list.add(new ItemDto(item_move, "光电开关信号", "DB104.W4")); + list.add(new ItemDto(item_error, "报警信号", "DB104.W6")); + list.add(new ItemDto(item_task1, "任务号1(行架任务号)", "DB104.D8")); // list.add(new ItemDto(item_task2, "任务号2(纸管任务号)", "DB600.D10")); return list; @@ -87,7 +87,7 @@ public class ItemProtocol { public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "作业命令", "DB601.W2")); + list.add(new ItemDto(item_to_command, "作业命令", "DB204.W0")); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/plugging_unplugging_machine/PluggingUnpluggingMachineDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/plugging_unplugging_machine/PluggingUnpluggingMachineDeviceDriver.java index d3b955049..7427772ce 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/plugging_unplugging_machine/PluggingUnpluggingMachineDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/plugging_unplugging_machine/PluggingUnpluggingMachineDeviceDriver.java @@ -141,16 +141,16 @@ public class PluggingUnpluggingMachineDeviceDriver extends AbstractOpcDeviceDriv applyBushing(); } break; - case 5: - if ((task1 > 0) && !requireSucess) { - bushingSucess(); - } - break; - case 6: - if (task1 > 0 && !requireSucess) { - pullingSucess(); - } - break; +// case 5: +// if ((task1 > 0) && !requireSucess) { +// bushingSucess(); +// } +// break; +// case 6: +// if (task1 > 0 && !requireSucess) { +// pullingSucess(); +// } +// break; default: break; diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/rgv/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/rgv/ItemProtocol.java index 162912e33..fa75254ea 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/rgv/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/rgv/ItemProtocol.java @@ -81,20 +81,20 @@ public class ItemProtocol { public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB102.W0")); - list.add(new ItemDto(item_mode, "工作状态", "DB102.W2")); - list.add(new ItemDto(item_move1, "光电开关信号1", "DB102.W4")); - list.add(new ItemDto(item_move1, "光电开关信号2", "DB102.W6")); - list.add(new ItemDto(item_qty1, "工位1重量", "DB102.REAL8")); - list.add(new ItemDto(item_qty2, "工位2重量", "DB102.REAL12")); - list.add(new ItemDto(item_error, "报警信号", "DB102.W16")); - list.add(new ItemDto(item_task, "任务号(行架任务号)", "DB102.D18")); + list.add(new ItemDto(item_heartbeat, "心跳", "DB103.W0")); + list.add(new ItemDto(item_mode, "工作状态", "DB103.W2")); + list.add(new ItemDto(item_move1, "光电开关信号1", "DB103.W4")); + list.add(new ItemDto(item_move1, "光电开关信号2", "DB103.W6")); + list.add(new ItemDto(item_qty1, "工位1重量", "DB103.REAL8")); + list.add(new ItemDto(item_qty2, "工位2重量", "DB103.REAL12")); + list.add(new ItemDto(item_error, "报警信号", "DB103.W16")); + list.add(new ItemDto(item_task, "任务号(行架任务号)", "DB103.D18")); return list; } public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "作业命令", "DB202.W0")); + list.add(new ItemDto(item_to_command, "作业命令", "DB203.W0")); return list; } }