From 87120380a222e1c83406f6818662544e3c9eccdd Mon Sep 17 00:00:00 2001 From: "USER-20220102CG\\noblelift" <546428999@qq.com> Date: Wed, 30 Aug 2023 15:36:22 +0800 Subject: [PATCH] REV --- .../standard_inspect/ItemProtocol.java | 12 +- .../agv/ndcone/AgvNdcOneDeviceDriver.java | 6 +- .../lnsh_Laminating_machine/ItemProtocol.java | 20 +- .../ItemProtocol.java | 57 ++-- .../ItemProtocol.java | 246 +++++++++--------- .../lnsh/lnsh_press/ItemProtocol.java | 70 ++--- .../lnsh/lnsh_press/LnshPressDefination.java | 20 +- acs/nladmin-ui/public/config.js | 4 +- 8 files changed, 209 insertions(+), 226 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/standard_inspect/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/standard_inspect/ItemProtocol.java index e8a79ee..2a53e45 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/standard_inspect/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/standard_inspect/ItemProtocol.java @@ -44,12 +44,12 @@ public class ItemProtocol { public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB100.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB100.B2", Boolean.valueOf(true))); - list.add(new ItemDto(item_move, "光电开关信号", "DB100.B3")); - list.add(new ItemDto(item_action, "动作信号", "DB100.B4")); - list.add(new ItemDto(item_error, "报警信号", "DB100.B5")); - list.add(new ItemDto(item_task, "任务号", "DB100.D6")); + list.add(new ItemDto(item_heartbeat, "心跳", "DB112.B0")); + list.add(new ItemDto(item_mode, "工作模式", "DB112.B2", Boolean.valueOf(true))); + list.add(new ItemDto(item_move, "光电开关信号", "DB112.B3")); + list.add(new ItemDto(item_action, "动作信号", "DB112.B4")); + list.add(new ItemDto(item_error, "报警信号", "DB112.B5")); + list.add(new ItemDto(item_task, "任务号", "DB112.D6")); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java index f5efc05..dae5f3d 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java @@ -454,7 +454,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) device.getDeviceDriver(); lnshPalletizingManipulatorSiteDeviceDriver.writing(2); if (lnshPalletizingManipulatorSiteDeviceDriver.getMode() != 0 - && lnshPalletizingManipulatorSiteDeviceDriver.getMove() != 0 + && lnshPalletizingManipulatorSiteDeviceDriver.getMove() == 0 && (lnshPalletizingManipulatorSiteDeviceDriver.getIo_action() == 3 || lnshPalletizingManipulatorSiteDeviceDriver.getIo_action() == 2) ) { inst.setExecute_status("5"); @@ -484,7 +484,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic lnshStationDeviceDriver = (LnshStationDeviceDriver) device.getDeviceDriver(); lnshStationDeviceDriver.writing(2); if (lnshStationDeviceDriver.getMode() != 0 - && lnshStationDeviceDriver.getMove() != 0 + && lnshStationDeviceDriver.getMove() == 0 && (lnshStationDeviceDriver.getIo_action() == 3 || lnshStationDeviceDriver.getIo_action() == 2) ) { inst.setExecute_status("5"); @@ -514,7 +514,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic conveyorPressStationDeviceDriver = (ConveyorPressStationDeviceDriver) device.getDeviceDriver(); conveyorPressStationDeviceDriver.writing(2); if (conveyorPressStationDeviceDriver.getMode() != 0 - && conveyorPressStationDeviceDriver.getMove() != 0 + && conveyorPressStationDeviceDriver.getMove() == 0 && (conveyorPressStationDeviceDriver.getIo_action() == 3 || conveyorPressStationDeviceDriver.getIo_action() == 2) ) { inst.setExecute_status("5"); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/ItemProtocol.java index 173ce96..a7eb617 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/ItemProtocol.java @@ -102,21 +102,21 @@ public class ItemProtocol { public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB100.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB100.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_move, "光电开关信号", "DB100.B2")); - list.add(new ItemDto(item_container_type, "托盘类型", "DB100.B3")); - list.add(new ItemDto(item_error, "报警信号", "DB100.B4")); - list.add(new ItemDto(item_task, "任务号", "DB100.D6")); + list.add(new ItemDto(item_heartbeat, "心跳", "DB112.B0")); + list.add(new ItemDto(item_mode, "工作模式", "DB112.B1", Boolean.valueOf(true))); + list.add(new ItemDto(item_move, "光电开关信号", "DB112.B2")); + list.add(new ItemDto(item_container_type, "托盘类型", "DB112.B3")); + list.add(new ItemDto(item_error, "报警信号", "DB112.B4")); + list.add(new ItemDto(item_task, "任务号", "DB112.D6")); return list; } public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "作业命令", "DB101.W0", Boolean.valueOf(true))); - list.add(new ItemDto(item_to_target, "目标站", "DB101.W2")); - list.add(new ItemDto(item_to_task, "任务号", "DB101.D4")); - list.add(new ItemDto(item_to_barcode, "条码", "DB101.W8")); + list.add(new ItemDto(item_to_command, "作业命令", "DB113.W0", Boolean.valueOf(true))); + list.add(new ItemDto(item_to_target, "目标站", "DB113.W2")); + list.add(new ItemDto(item_to_task, "任务号", "DB113.D4")); + list.add(new ItemDto(item_to_barcode, "条码", "DB113.W8")); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/ItemProtocol.java index d38e37b..9f5dddf 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/ItemProtocol.java @@ -196,40 +196,41 @@ public class ItemProtocol { public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB100.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB100.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_status, "设备状态", "DB100.B2")); - list.add(new ItemDto(item_error, "故障代码", "DB100.B3")); - list.add(new ItemDto(item_open_time, "开机时间", "DB100.STRING56.50")); - list.add(new ItemDto(item_standby_time, "待机时间", "DB100.D60")); - list.add(new ItemDto(item_production_time, "生产时间", "DB100.D64")); - list.add(new ItemDto(item_error_time, "故障时间", "DB100.D68")); - list.add(new ItemDto(item_get_station, "当前抓取工位", "DB100.D188")); - list.add(new ItemDto(item_put_station, "当前放置工位", "DB100.D189")); - list.add(new ItemDto(item_is_qualified, "是否合格", "DB100.D190")); - list.add(new ItemDto(item_laser_marking_code, "激光标刻码", "DB100.STRING192.50")); - list.add(new ItemDto(item_grinding_number, "碾次", "DB100.STRING244.50")); - list.add(new ItemDto(item_height1, "高度1", "DB100.D296")); - list.add(new ItemDto(item_height2, "高度2", "DB100.D300")); - list.add(new ItemDto(item_height3, "高度3", "DB100.D304")); - list.add(new ItemDto(item_height4, "高度4", "DB100.D308")); - list.add(new ItemDto(item_width1, "宽度1", "DB100.D312")); - list.add(new ItemDto(item_width2, "宽度2", "DB100.D316")); - list.add(new ItemDto(item_len, "长度", "DB100.D320")); - list.add(new ItemDto(item_volume, "体积", "DB100.D324")); - list.add(new ItemDto(item_flatness, "平面度", "DB100.D328")); - list.add(new ItemDto(item_unqualified_qty, "缺陷个数", "DB100.D332")); + list.add(new ItemDto(item_heartbeat, "心跳", "DB112.B0")); + list.add(new ItemDto(item_mode, "工作模式", "DB112.B1", Boolean.valueOf(true))); + list.add(new ItemDto(item_status, "设备状态", "DB112.B2")); + list.add(new ItemDto(item_status, "设备动作", "DB112.B3")); + list.add(new ItemDto(item_error, "故障代码", "DB112.B4")); + list.add(new ItemDto(item_open_time, "开机时间", "DB112.STRING6.50")); + list.add(new ItemDto(item_standby_time, "待机时间", "DB112.D58")); + list.add(new ItemDto(item_production_time, "生产时间", "DB112.D62")); + list.add(new ItemDto(item_error_time, "故障时间", "DB112.D66")); + list.add(new ItemDto(item_get_station, "当前抓取工位", "DB112.B70")); + list.add(new ItemDto(item_put_station, "当前放置工位", "DB112.B71")); + list.add(new ItemDto(item_is_qualified, "是否合格", "DB112.B72")); + list.add(new ItemDto(item_laser_marking_code, "激光标刻码", "DB112.STRING74.50")); + list.add(new ItemDto(item_grinding_number, "碾次", "DB112.STRING126.50")); + list.add(new ItemDto(item_height1, "高度1", "DB112.REAL178")); + list.add(new ItemDto(item_height2, "高度2", "DB112.REAL182")); + list.add(new ItemDto(item_height3, "高度3", "DB112.REAL186")); + list.add(new ItemDto(item_height4, "高度4", "DB112.REAL190")); + list.add(new ItemDto(item_width1, "宽度1", "DB112.REAL194")); + list.add(new ItemDto(item_width2, "宽度2", "DB112.REAL198")); + list.add(new ItemDto(item_len, "长度", "DB112.REAL202")); + list.add(new ItemDto(item_volume, "体积", "DB112.REAL206")); + list.add(new ItemDto(item_flatness, "平面度", "DB112.REAL210")); + list.add(new ItemDto(item_unqualified_qty, "缺陷个数", "DB112.REAL214")); return list; } public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "反馈", "DB101.W0", Boolean.TRUE)); - list.add(new ItemDto(item_to_error, "error", "DB101.W2")); - list.add(new ItemDto(item_to_order_No, "工单号", "DB101.STRING4.50")); - list.add(new ItemDto(item_to_weight, "生产重量", "DB101.D56")); - list.add(new ItemDto(item_to_material_code, "下发物料编号", "DB101.STRING60.50")); + list.add(new ItemDto(item_to_command, "反馈", "DB113.W0", Boolean.TRUE)); + list.add(new ItemDto(item_to_error, "error", "DB113.W2")); + list.add(new ItemDto(item_to_order_No, "工单号", "DB113.STRING4.50")); + list.add(new ItemDto(item_to_weight, "生产重量", "DB113.D56")); + list.add(new ItemDto(item_to_material_code, "下发物料编号", "DB113.STRING60.50")); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/ItemProtocol.java index c5299cb..cbb053c 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/ItemProtocol.java @@ -669,134 +669,134 @@ public class ItemProtocol { public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB100.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB100.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_move, "光电开关信号", "DB100.B2")); - list.add(new ItemDto(item_action, "取放信号", "DB100.B3")); - list.add(new ItemDto(item_ioaction, "进出信号", "DB100.B4")); - list.add(new ItemDto(item_error, "报警信号", "DB100.B5")); - list.add(new ItemDto(item_task, "任务号", "DB100.D6")); - list.add(new ItemDto(item_weight, "重量", "DB100.D10")); - list.add(new ItemDto(item_material, "物料", "DB100.STRING14.50")); - list.add(new ItemDto(item_barcode, "条码", "DB100.W66")); - list.add(new ItemDto(item_encoder_qty, "码盘位当前码盘数量", "DB100.W68")); - list.add(new ItemDto(item_unqualified_qty, "不合格数量", "DB100.W70")); - list.add(new ItemDto(item_product_code, "产品编号", "DB100.W72")); - list.add(new ItemDto(item_AlongSide, "A长边", "DB100.W74")); - list.add(new ItemDto(item_BshortSide, "B短边", "DB100.W76")); - list.add(new ItemDto(item_Htrapezoidal, "H梯形高", "DB100.W78")); - list.add(new ItemDto(item_Wthickness, "W厚度", "DB100.W80")); - list.add(new ItemDto(item_tray_qty, "当前垛盘数", "DB100.W82")); - list.add(new ItemDto(item_tray_high, "垛盘高度", "DB100.W84")); - list.add(new ItemDto(item_crib_category, "垛型类别", "DB100.W86")); - list.add(new ItemDto(item_palletX1_line, "码垛X1行", "DB100.W88")); - list.add(new ItemDto(item_palletY1_row, "码垛Y1列", "DB100.W90")); - list.add(new ItemDto(item_palletA1_angle, "码垛A1角度", "DB100.W92")); - list.add(new ItemDto(item_palletX2_line, "码垛X2行", "DB100.W94")); - list.add(new ItemDto(item_palletY2_row, "码垛Y2列", "DB100.W96")); - list.add(new ItemDto(item_palletA2_angle, "码垛A2角度", "DB100.W98")); - list.add(new ItemDto(item_palletX3_line, "码垛X3行", "DB100.W100")); - list.add(new ItemDto(item_palletY3_row, "码垛Y3列", "DB100.W102")); - list.add(new ItemDto(item_palletA3_angle, "码垛A3角度", "DB100.W104")); - list.add(new ItemDto(item_pressCribX1_line, "压垛X1行", "DB100.W106")); - list.add(new ItemDto(item_pressCribY1_row, "压垛Y1列", "DB100.W108")); - list.add(new ItemDto(item_pressCribA1_angle, "压垛A1角度", "DB100.W110")); - list.add(new ItemDto(item_pressCribX2_line, "压垛X2行", "DB100.W112")); - list.add(new ItemDto(item_pressCribY2_row, "压垛Y2列", "DB100.W114")); - list.add(new ItemDto(item_pressCribA2_angle, "压垛A2角度", "DB100.W116")); - list.add(new ItemDto(item_pressCribX3_line, "压垛X3行", "DB100.W118")); - list.add(new ItemDto(item_pressCribY3_row, "压垛Y3列", "DB100.W120")); - list.add(new ItemDto(item_pressCribA3_angle, "压垛A3角度", "DB100.W122")); - list.add(new ItemDto(item_Zoffset, "Z轴偏移", "DB100.W124")); - list.add(new ItemDto(item_pallet_layerQty, "码垛层数", "DB100.W126")); - list.add(new ItemDto(item_pressCrib_layerQty, "压垛层数", "DB100.W128")); - list.add(new ItemDto(item_codeLayerX1_interval, "码层X1间隔", "DB100.W130")); - list.add(new ItemDto(item_codeLayerY1_interval, "码层Y1间隔", "DB100.W132")); - list.add(new ItemDto(item_codeLayerX2_interval, "码层X2间隔", "DB100.W134")); - list.add(new ItemDto(item_codeLayerY2_interval, "码层Y2间隔", "DB100.W136")); - list.add(new ItemDto(item_codeLayerX3_interval, "码层X3间隔", "DB100.W138")); - list.add(new ItemDto(item_codeLayerY3_interval, "码层Y3间隔", "DB100.W140")); - list.add(new ItemDto(item_codeLayerX1_offset, "码层X1偏移", "DB100.W142")); - list.add(new ItemDto(item_codeLayerY1_offset, "码层Y1偏移", "DB100.W144")); - list.add(new ItemDto(item_codeLayerX2_offset, "码层X2偏移", "DB100.W146")); - list.add(new ItemDto(item_codeLayerY2_offset, "码层Y2偏移", "DB100.W148")); - list.add(new ItemDto(item_codeLayerX3_offset, "码层X3偏移", "DB100.W150")); - list.add(new ItemDto(item_codeLayerY3_offset, "码层Y3偏移", "DB100.W152")); - list.add(new ItemDto(item_pressLayerX1_interval, "压层X1间隔", "DB100.W154")); - list.add(new ItemDto(item_pressLayerY1_interval, "压层Y1间隔", "DB100.W156")); - list.add(new ItemDto(item_pressLayerX2_interval, "压层X2间隔", "DB100.W158")); - list.add(new ItemDto(item_pressLayerY2_interval, "压层Y2间隔", "DB100.W160")); - list.add(new ItemDto(item_pressLayerX3_interval, "压层X3间隔", "DB100.W162")); - list.add(new ItemDto(item_pressLayerY3_interval, "压层Y3间隔", "DB100.W164")); - list.add(new ItemDto(item_pressLayerX1_offset, "压层X1偏移", "DB100.W166")); - list.add(new ItemDto(item_pressLayerY1_offset, "压层Y1偏移", "DB100.W168")); - list.add(new ItemDto(item_pressLayerX2_offset, "压层X2偏移", "DB100.W170")); - list.add(new ItemDto(item_pressLayerY2_offset, "压层Y2偏移", "DB100.W172")); - list.add(new ItemDto(item_pressLayerX3_offset, "压层X3偏移", "DB100.W174")); - list.add(new ItemDto(item_pressLayerY3_offset, "压层Y3偏移", "DB100.W176")); - list.add(new ItemDto(item_tool_coordinate, "工具坐标", "DB100.W178")); + list.add(new ItemDto(item_heartbeat, "心跳", "DB112.B0")); + list.add(new ItemDto(item_mode, "工作模式", "DB112.B1", Boolean.valueOf(true))); + list.add(new ItemDto(item_move, "光电开关信号", "DB112.B2")); + list.add(new ItemDto(item_action, "取放信号", "DB112.B3")); + list.add(new ItemDto(item_ioaction, "进出信号", "DB112.B4")); + list.add(new ItemDto(item_error, "报警信号", "DB112.B5")); + list.add(new ItemDto(item_task, "任务号", "DB112.D6")); + list.add(new ItemDto(item_weight, "重量", "DB112.D10")); + list.add(new ItemDto(item_material, "物料", "DB112.STRING14.50")); + list.add(new ItemDto(item_barcode, "条码", "DB112.W66")); + list.add(new ItemDto(item_encoder_qty, "码盘位当前码盘数量", "DB112.W68")); + list.add(new ItemDto(item_unqualified_qty, "不合格数量", "DB112.W70")); + list.add(new ItemDto(item_product_code, "产品编号", "DB112.B72")); + list.add(new ItemDto(item_AlongSide, "A长边", "DB112.W74")); + list.add(new ItemDto(item_BshortSide, "B短边", "DB112.W76")); + list.add(new ItemDto(item_Htrapezoidal, "H梯形高", "DB112.W78")); + list.add(new ItemDto(item_Wthickness, "W厚度", "DB112.W80")); + list.add(new ItemDto(item_tray_qty, "当前垛盘数", "DB112.W82")); + list.add(new ItemDto(item_tray_high, "垛盘高度", "DB112.W84")); + list.add(new ItemDto(item_crib_category, "垛型类别", "DB112.W86")); + list.add(new ItemDto(item_palletX1_line, "码垛X1行", "DB112.W88")); + list.add(new ItemDto(item_palletY1_row, "码垛Y1列", "DB112.W90")); + list.add(new ItemDto(item_palletA1_angle, "码垛A1角度", "DB112.W92")); + list.add(new ItemDto(item_palletX2_line, "码垛X2行", "DB112.W94")); + list.add(new ItemDto(item_palletY2_row, "码垛Y2列", "DB112.W96")); + list.add(new ItemDto(item_palletA2_angle, "码垛A2角度", "DB112.W98")); + list.add(new ItemDto(item_palletX3_line, "码垛X3行", "DB112.W100")); + list.add(new ItemDto(item_palletY3_row, "码垛Y3列", "DB112.W102")); + list.add(new ItemDto(item_palletA3_angle, "码垛A3角度", "DB112.W104")); + list.add(new ItemDto(item_pressCribX1_line, "压垛X1行", "DB112.W106")); + list.add(new ItemDto(item_pressCribY1_row, "压垛Y1列", "DB112.W108")); + list.add(new ItemDto(item_pressCribA1_angle, "压垛A1角度", "DB112.W110")); + list.add(new ItemDto(item_pressCribX2_line, "压垛X2行", "DB112.W112")); + list.add(new ItemDto(item_pressCribY2_row, "压垛Y2列", "DB112.W114")); + list.add(new ItemDto(item_pressCribA2_angle, "压垛A2角度", "DB112.W116")); + list.add(new ItemDto(item_pressCribX3_line, "压垛X3行", "DB112.W118")); + list.add(new ItemDto(item_pressCribY3_row, "压垛Y3列", "DB112.W120")); + list.add(new ItemDto(item_pressCribA3_angle, "压垛A3角度", "DB112.W122")); + list.add(new ItemDto(item_Zoffset, "Z轴偏移", "DB112.W124")); + list.add(new ItemDto(item_pallet_layerQty, "码垛层数", "DB112.W126")); + list.add(new ItemDto(item_pressCrib_layerQty, "压垛层数", "DB112.W128")); + list.add(new ItemDto(item_codeLayerX1_interval, "码层X1间隔", "DB112.W130")); + list.add(new ItemDto(item_codeLayerY1_interval, "码层Y1间隔", "DB112.W132")); + list.add(new ItemDto(item_codeLayerX2_interval, "码层X2间隔", "DB112.W134")); + list.add(new ItemDto(item_codeLayerY2_interval, "码层Y2间隔", "DB112.W136")); + list.add(new ItemDto(item_codeLayerX3_interval, "码层X3间隔", "DB112.W138")); + list.add(new ItemDto(item_codeLayerY3_interval, "码层Y3间隔", "DB112.W140")); + list.add(new ItemDto(item_codeLayerX1_offset, "码层X1偏移", "DB112.W142")); + list.add(new ItemDto(item_codeLayerY1_offset, "码层Y1偏移", "DB112.W144")); + list.add(new ItemDto(item_codeLayerX2_offset, "码层X2偏移", "DB112.W146")); + list.add(new ItemDto(item_codeLayerY2_offset, "码层Y2偏移", "DB112.W148")); + list.add(new ItemDto(item_codeLayerX3_offset, "码层X3偏移", "DB112.W150")); + list.add(new ItemDto(item_codeLayerY3_offset, "码层Y3偏移", "DB112.W152")); + list.add(new ItemDto(item_pressLayerX1_interval, "压层X1间隔", "DB112.W154")); + list.add(new ItemDto(item_pressLayerY1_interval, "压层Y1间隔", "DB112.W156")); + list.add(new ItemDto(item_pressLayerX2_interval, "压层X2间隔", "DB112.W158")); + list.add(new ItemDto(item_pressLayerY2_interval, "压层Y2间隔", "DB112.W160")); + list.add(new ItemDto(item_pressLayerX3_interval, "压层X3间隔", "DB112.W162")); + list.add(new ItemDto(item_pressLayerY3_interval, "压层Y3间隔", "DB112.W164")); + list.add(new ItemDto(item_pressLayerX1_offset, "压层X1偏移", "DB112.W166")); + list.add(new ItemDto(item_pressLayerY1_offset, "压层Y1偏移", "DB112.W168")); + list.add(new ItemDto(item_pressLayerX2_offset, "压层X2偏移", "DB112.W170")); + list.add(new ItemDto(item_pressLayerY2_offset, "压层Y2偏移", "DB112.W172")); + list.add(new ItemDto(item_pressLayerX3_offset, "压层X3偏移", "DB112.W174")); + list.add(new ItemDto(item_pressLayerY3_offset, "压层Y3偏移", "DB112.W176")); + list.add(new ItemDto(item_tool_coordinate, "工具坐标", "DB112.W178")); return list; } public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "作业命令", "DB101.W0", Boolean.valueOf(true))); - list.add(new ItemDto(item_to_target, "目标站", "DB101.W2")); - list.add(new ItemDto(item_to_task, "任务号", "DB101.D4")); - list.add(new ItemDto(item_to_product_code, "产品编号", "DB101.W8")); - list.add(new ItemDto(item_to_AlongSide, "A长边", "DB101.W10")); - list.add(new ItemDto(item_to_BshortSide, "B短边", "DB101.W12")); - list.add(new ItemDto(item_to_Htrapezoidal, "H梯形高", "DB101.W14")); - list.add(new ItemDto(item_to_Wthickness, "W厚度", "DB101.W16")); - list.add(new ItemDto(item_to_tray_qty, "当前垛盘数", "DB101.W18")); - list.add(new ItemDto(item_to_tray_high, "垛盘高度", "DB101.W20")); - list.add(new ItemDto(item_to_crib_category, "垛型类别", "DB101.W22")); - list.add(new ItemDto(item_to_palletX1_line, "码垛X1行", "DB101.W24")); - list.add(new ItemDto(item_to_palletY1_row, "码垛Y1列", "DB101.W26")); - list.add(new ItemDto(item_to_palletA1_angle, "码垛A1角度", "DB101.W28")); - list.add(new ItemDto(item_to_palletX2_line, "码垛X2行", "DB101.W30")); - list.add(new ItemDto(item_to_palletY2_row, "码垛Y2列", "DB101.W32")); - list.add(new ItemDto(item_to_palletA2_angle, "码垛A2角度", "DB101.W34")); - list.add(new ItemDto(item_to_palletX3_line, "码垛X3行", "DB101.W36")); - list.add(new ItemDto(item_to_palletY3_row, "码垛Y3列", "DB101.W38")); - list.add(new ItemDto(item_to_palletA3_angle, "码垛A3角度", "DB101.W40")); - list.add(new ItemDto(item_to_pressCribX1_line, "压垛X1行", "DB101.W42")); - list.add(new ItemDto(item_to_pressCribY1_row, "压垛Y1列", "DB101.W44")); - list.add(new ItemDto(item_to_pressCribA1_angle, "压垛A1角度", "DB101.W46")); - list.add(new ItemDto(item_to_pressCribX2_line, "压垛X2行", "DB101.W48")); - list.add(new ItemDto(item_to_pressCribY2_row, "压垛Y2列", "DB101.W50")); - list.add(new ItemDto(item_to_pressCribA2_angle, "压垛A2角度", "DB101.W52")); - list.add(new ItemDto(item_to_pressCribX3_line, "压垛X3行", "DB101.W54")); - list.add(new ItemDto(item_to_pressCribY3_row, "压垛Y3列", "DB101.W56")); - list.add(new ItemDto(item_to_pressCribA3_angle, "压垛A3角度", "DB101.W58")); - list.add(new ItemDto(item_to_Zoffset, "Z轴偏移", "DB101.W60")); - list.add(new ItemDto(item_to_pallet_layerQty, "码垛层数", "DB101.W62")); - list.add(new ItemDto(item_to_pressCrib_layerQty, "压垛层数", "DB101.W64")); - list.add(new ItemDto(item_to_codeLayerX1_interval, "码层X1间隔", "DB101.W66")); - list.add(new ItemDto(item_to_codeLayerY1_interval, "码层Y1间隔", "DB101.W68")); - list.add(new ItemDto(item_to_codeLayerX2_interval, "码层X2间隔", "DB101.W70")); - list.add(new ItemDto(item_to_codeLayerY2_interval, "码层Y2间隔", "DB101.W72")); - list.add(new ItemDto(item_to_codeLayerX3_interval, "码层X3间隔", "DB101.W74")); - list.add(new ItemDto(item_to_codeLayerY3_interval, "码层Y3间隔", "DB101.W76")); - list.add(new ItemDto(item_to_codeLayerX1_offset, "码层X1偏移", "DB101.W78")); - list.add(new ItemDto(item_to_codeLayerY1_offset, "码层Y1偏移", "DB101.W80")); - list.add(new ItemDto(item_to_codeLayerX2_offset, "码层X2偏移", "DB101.W82")); - list.add(new ItemDto(item_to_codeLayerY2_offset, "码层Y2偏移", "DB101.W84")); - list.add(new ItemDto(item_to_codeLayerX3_offset, "码层X3偏移", "DB101.W86")); - list.add(new ItemDto(item_to_codeLayerY3_offset, "码层Y3偏移", "DB101.W88")); - list.add(new ItemDto(item_to_pressLayerX1_interval, "压层X1间隔", "DB101.W90")); - list.add(new ItemDto(item_to_pressLayerY1_interval, "压层Y1间隔", "DB101.W92")); - list.add(new ItemDto(item_to_pressLayerX2_interval, "压层X2间隔", "DB101.W94")); - list.add(new ItemDto(item_to_pressLayerY2_interval, "压层Y2间隔", "DB101.W96")); - list.add(new ItemDto(item_to_pressLayerX3_interval, "压层X3间隔", "DB101.W98")); - list.add(new ItemDto(item_to_pressLayerY3_interval, "压层Y3间隔", "DB101.W100")); - list.add(new ItemDto(item_to_pressLayerX1_offset, "压层X1偏移", "DB101.W102")); - list.add(new ItemDto(item_to_pressLayerY1_offset, "压层Y1偏移", "DB101.W104")); - list.add(new ItemDto(item_to_pressLayerX2_offset, "压层X2偏移", "DB101.W106")); - list.add(new ItemDto(item_to_pressLayerY2_offset, "压层Y2偏移", "DB101.W108")); - list.add(new ItemDto(item_to_pressLayerX3_offset, "压层X3偏移", "DB101.W110")); - list.add(new ItemDto(item_to_pressLayerY3_offset, "压层Y3偏移", "DB101.W112")); - list.add(new ItemDto(item_to_tool_coordinate, "工具坐标", "DB101.W114")); + list.add(new ItemDto(item_to_command, "作业命令", "DB113.W0", Boolean.valueOf(true))); + list.add(new ItemDto(item_to_target, "目标站", "DB113.W2")); + list.add(new ItemDto(item_to_task, "任务号", "DB113.D4")); + list.add(new ItemDto(item_to_product_code, "产品编号", "DB113.B8")); + list.add(new ItemDto(item_to_AlongSide, "A长边", "DB113.W10")); + list.add(new ItemDto(item_to_BshortSide, "B短边", "DB113.W12")); + list.add(new ItemDto(item_to_Htrapezoidal, "H梯形高", "DB113.W14")); + list.add(new ItemDto(item_to_Wthickness, "W厚度", "DB113.W16")); + list.add(new ItemDto(item_to_tray_qty, "当前垛盘数", "DB113.W18")); + list.add(new ItemDto(item_to_tray_high, "垛盘高度", "DB113.W20")); + list.add(new ItemDto(item_to_crib_category, "垛型类别", "DB113.W22")); + list.add(new ItemDto(item_to_palletX1_line, "码垛X1行", "DB113.W24")); + list.add(new ItemDto(item_to_palletY1_row, "码垛Y1列", "DB113.W26")); + list.add(new ItemDto(item_to_palletA1_angle, "码垛A1角度", "DB113.W28")); + list.add(new ItemDto(item_to_palletX2_line, "码垛X2行", "DB113.W30")); + list.add(new ItemDto(item_to_palletY2_row, "码垛Y2列", "DB113.W32")); + list.add(new ItemDto(item_to_palletA2_angle, "码垛A2角度", "DB113.W34")); + list.add(new ItemDto(item_to_palletX3_line, "码垛X3行", "DB113.W36")); + list.add(new ItemDto(item_to_palletY3_row, "码垛Y3列", "DB113.W38")); + list.add(new ItemDto(item_to_palletA3_angle, "码垛A3角度", "DB113.W40")); + list.add(new ItemDto(item_to_pressCribX1_line, "压垛X1行", "DB113.W42")); + list.add(new ItemDto(item_to_pressCribY1_row, "压垛Y1列", "DB113.W44")); + list.add(new ItemDto(item_to_pressCribA1_angle, "压垛A1角度", "DB113.W46")); + list.add(new ItemDto(item_to_pressCribX2_line, "压垛X2行", "DB113.W48")); + list.add(new ItemDto(item_to_pressCribY2_row, "压垛Y2列", "DB113.W50")); + list.add(new ItemDto(item_to_pressCribA2_angle, "压垛A2角度", "DB113.W52")); + list.add(new ItemDto(item_to_pressCribX3_line, "压垛X3行", "DB113.W54")); + list.add(new ItemDto(item_to_pressCribY3_row, "压垛Y3列", "DB113.W56")); + list.add(new ItemDto(item_to_pressCribA3_angle, "压垛A3角度", "DB113.W58")); + list.add(new ItemDto(item_to_Zoffset, "Z轴偏移", "DB113.W60")); + list.add(new ItemDto(item_to_pallet_layerQty, "码垛层数", "DB113.W62")); + list.add(new ItemDto(item_to_pressCrib_layerQty, "压垛层数", "DB113.W64")); + list.add(new ItemDto(item_to_codeLayerX1_interval, "码层X1间隔", "DB113.W66")); + list.add(new ItemDto(item_to_codeLayerY1_interval, "码层Y1间隔", "DB113.W68")); + list.add(new ItemDto(item_to_codeLayerX2_interval, "码层X2间隔", "DB113.W70")); + list.add(new ItemDto(item_to_codeLayerY2_interval, "码层Y2间隔", "DB113.W72")); + list.add(new ItemDto(item_to_codeLayerX3_interval, "码层X3间隔", "DB113.W74")); + list.add(new ItemDto(item_to_codeLayerY3_interval, "码层Y3间隔", "DB113.W76")); + list.add(new ItemDto(item_to_codeLayerX1_offset, "码层X1偏移", "DB113.W78")); + list.add(new ItemDto(item_to_codeLayerY1_offset, "码层Y1偏移", "DB113.W80")); + list.add(new ItemDto(item_to_codeLayerX2_offset, "码层X2偏移", "DB113.W82")); + list.add(new ItemDto(item_to_codeLayerY2_offset, "码层Y2偏移", "DB113.W84")); + list.add(new ItemDto(item_to_codeLayerX3_offset, "码层X3偏移", "DB113.W86")); + list.add(new ItemDto(item_to_codeLayerY3_offset, "码层Y3偏移", "DB113.W88")); + list.add(new ItemDto(item_to_pressLayerX1_interval, "压层X1间隔", "DB113.W90")); + list.add(new ItemDto(item_to_pressLayerY1_interval, "压层Y1间隔", "DB113.W92")); + list.add(new ItemDto(item_to_pressLayerX2_interval, "压层X2间隔", "DB113.W94")); + list.add(new ItemDto(item_to_pressLayerY2_interval, "压层Y2间隔", "DB113.W96")); + list.add(new ItemDto(item_to_pressLayerX3_interval, "压层X3间隔", "DB113.W98")); + list.add(new ItemDto(item_to_pressLayerY3_interval, "压层Y3间隔", "DB113.W100")); + list.add(new ItemDto(item_to_pressLayerX1_offset, "压层X1偏移", "DB113.W102")); + list.add(new ItemDto(item_to_pressLayerY1_offset, "压层Y1偏移", "DB113.W104")); + list.add(new ItemDto(item_to_pressLayerX2_offset, "压层X2偏移", "DB113.W106")); + list.add(new ItemDto(item_to_pressLayerY2_offset, "压层Y2偏移", "DB113.W108")); + list.add(new ItemDto(item_to_pressLayerX3_offset, "压层X3偏移", "DB113.W110")); + list.add(new ItemDto(item_to_pressLayerY3_offset, "压层Y3偏移", "DB113.W112")); + list.add(new ItemDto(item_to_tool_coordinate, "工具坐标", "DB113.W114")); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/ItemProtocol.java index 39d4207..738bc92 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/ItemProtocol.java @@ -207,46 +207,46 @@ public class ItemProtocol { public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB100.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB100.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_status, "设备状态", "DB100.B2")); - list.add(new ItemDto(item_error, "故障", "DB100.B3")); - list.add(new ItemDto(item_open_time, "开机时间", "DB100.STRING4.50")); - list.add(new ItemDto(item_standby_time, "待机时间", "DB100.D56")); - list.add(new ItemDto(item_production_time, "生产时间", "DB100.D60")); - list.add(new ItemDto(item_error_time, "故障时间", "DB100.D64")); - list.add(new ItemDto(item_material, "当前生产物料", "DB100.STRING68.50")); - list.add(new ItemDto(item_qty, "当前已生产数量", "DB100.D120")); - list.add(new ItemDto(item_weight, "当前已生产重量", "DB100.D124")); - list.add(new ItemDto(item_qualified, "当前已生产合格数", "DB100.D128")); - list.add(new ItemDto(item_unqualified, "当前已生产不合格数", "DB100.D132")); - list.add(new ItemDto(item_order_No, "工单号", "DB100.STRING136.50")); + list.add(new ItemDto(item_heartbeat, "心跳", "DB112.B0")); + list.add(new ItemDto(item_mode, "工作模式", "DB112.B1", Boolean.valueOf(true))); + list.add(new ItemDto(item_status, "设备状态", "DB112.B2")); + list.add(new ItemDto(item_error, "故障", "DB112.B3")); + list.add(new ItemDto(item_open_time, "开机时间", "DB112.STRING4.50")); + list.add(new ItemDto(item_standby_time, "待机时间", "DB112.D56")); + list.add(new ItemDto(item_production_time, "生产时间", "DB112.D60")); + list.add(new ItemDto(item_error_time, "故障时间", "DB112.D64")); + list.add(new ItemDto(item_material, "当前生产物料", "DB112.STRING68.50")); + list.add(new ItemDto(item_qty, "当前已生产数量", "DB112.D120")); + list.add(new ItemDto(item_weight, "当前已生产重量", "DB112.D124")); + list.add(new ItemDto(item_qualified, "当前已生产合格数", "DB112.D128")); + list.add(new ItemDto(item_unqualified, "当前已生产不合格数", "DB112.D132")); + list.add(new ItemDto(item_order_No, "工单号", "DB112.STRING136.50")); return list; } public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "反馈", "DB101.W0", Boolean.valueOf(true))); - list.add(new ItemDto(item_to_error, "error", "DB101.W2")); - list.add(new ItemDto(item_to_order_No, "工单号", "DB101.STRING4.50")); - list.add(new ItemDto(item_to_qty, "生产重量", "DB101.D56")); - list.add(new ItemDto(item_to_material_code, "下发物料编号", "DB101.STRING60.50")); - list.add(new ItemDto(item_to_brick_code, "砖型代号", "DB101.STRING112.50")); - list.add(new ItemDto(item_to_formula, "配方代号", "DB101.STRING164.50")); - list.add(new ItemDto(item_to_product_code, "产品编号", "DB101.W216")); - list.add(new ItemDto(item_to_AlongSide, "A长边", "DB101.W218")); - list.add(new ItemDto(item_to_BshortSide, "B短边", "DB101.W220")); - list.add(new ItemDto(item_to_Htrapezoidal, "H梯形高", "DB101.W222")); - list.add(new ItemDto(item_to_Wthickness, "W厚度", "DB101.W224")); - list.add(new ItemDto(item_to_size_error, "尺寸允许误差", "DB101.REAL228")); - list.add(new ItemDto(item_to_single_weight, "单重允许误差", "DB101.REAL232")); - list.add(new ItemDto(item_to_drawing_address, "图纸地址", "DB101.REAL236")); - list.add(new ItemDto(item_to_standard_weight, "标准重量", "DB101.REAL240")); - list.add(new ItemDto(item_to_detection_error, "检测误差值", "DB101.REAL244")); - list.add(new ItemDto(item_to_standard_size_height1, "标准尺寸高度1", "DB101.REAL248")); - list.add(new ItemDto(item_to_standard_size_height2, "标准尺寸高度2", "DB101.REAL252")); - list.add(new ItemDto(item_to_standard_size_height3, "标准尺寸高度3", "DB101.REAL256")); - list.add(new ItemDto(item_to_standard_size_height4, "标准尺寸高度4", "DB101.REAL260")); + list.add(new ItemDto(item_to_command, "反馈", "DB113.W0", Boolean.valueOf(true))); + list.add(new ItemDto(item_to_error, "error", "DB113.W2")); + list.add(new ItemDto(item_to_order_No, "工单号", "DB113.STRING4.50")); + list.add(new ItemDto(item_to_qty, "生产重量", "DB113.D56")); + list.add(new ItemDto(item_to_material_code, "下发物料编号", "DB113.STRING60.50")); + list.add(new ItemDto(item_to_brick_code, "砖型代号", "DB113.STRING112.50")); + list.add(new ItemDto(item_to_formula, "配方代号", "DB113.STRING164.50")); + list.add(new ItemDto(item_to_product_code, "产品编号", "DB113.W216")); + list.add(new ItemDto(item_to_AlongSide, "A长边", "DB113.W218")); + list.add(new ItemDto(item_to_BshortSide, "B短边", "DB113.W220")); + list.add(new ItemDto(item_to_Htrapezoidal, "H梯形高", "DB113.W222")); + list.add(new ItemDto(item_to_Wthickness, "W厚度", "DB113.W224")); + list.add(new ItemDto(item_to_size_error, "尺寸允许误差", "DB113.REAL228")); + list.add(new ItemDto(item_to_single_weight, "单重允许误差", "DB113.REAL232")); + list.add(new ItemDto(item_to_drawing_address, "图纸地址", "DB113.REAL236")); + list.add(new ItemDto(item_to_standard_weight, "标准重量", "DB113.REAL240")); + list.add(new ItemDto(item_to_detection_error, "检测误差值", "DB113.REAL244")); + list.add(new ItemDto(item_to_standard_size_height1, "标准尺寸高度1", "DB113.REAL248")); + list.add(new ItemDto(item_to_standard_size_height2, "标准尺寸高度2", "DB113.REAL252")); + list.add(new ItemDto(item_to_standard_size_height3, "标准尺寸高度3", "DB113.REAL256")); + list.add(new ItemDto(item_to_standard_size_height4, "标准尺寸高度4", "DB113.REAL260")); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/LnshPressDefination.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/LnshPressDefination.java index 58f77f5..cc4dc40 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/LnshPressDefination.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/LnshPressDefination.java @@ -52,27 +52,9 @@ public class LnshPressDefination implements OpcDeviceDriverDefination { @Override public List getReadableItemDtos() { - return getReadableItemDtos2(); + return ItemProtocol.getReadableItemDtos(); } - public static List getReadableItemDtos2() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB8.B0")); - list.add(new ItemDto(ItemProtocol.item_mode, "工作模式", "DB8.B1", Boolean.valueOf(true))); - list.add(new ItemDto(ItemProtocol.item_status, "设备状态", "DB8.B2")); - list.add(new ItemDto(ItemProtocol.item_error, "故障", "DB8.B3")); - list.add(new ItemDto(ItemProtocol.item_open_time, "开机时间", "DB8.STRING4.50")); - list.add(new ItemDto(ItemProtocol.item_standby_time, "待机时间", "DB8.D56")); - list.add(new ItemDto(ItemProtocol.item_production_time, "生产时间", "DB8.D60")); - list.add(new ItemDto(ItemProtocol.item_error_time, "故障时间", "DB8.D64")); - list.add(new ItemDto(ItemProtocol.item_material, "当前生产物料", "DB8.STRING68.50")); - list.add(new ItemDto(ItemProtocol.item_qty, "当前已生产数量", "DB8.D120")); - list.add(new ItemDto(ItemProtocol.item_weight, "当前已生产重量", "DB8.D124")); - list.add(new ItemDto(ItemProtocol.item_qualified, "当前已生产合格数", "DB8.D128")); - list.add(new ItemDto(ItemProtocol.item_unqualified, "当前已生产不合格数", "DB8.D132")); - list.add(new ItemDto(ItemProtocol.item_order_No, "工单号", "DB8.STRING136.50")); - return list; - } @Override public List getWriteableItemDtos() { diff --git a/acs/nladmin-ui/public/config.js b/acs/nladmin-ui/public/config.js index 9eea79c..56d6c09 100644 --- a/acs/nladmin-ui/public/config.js +++ b/acs/nladmin-ui/public/config.js @@ -1,9 +1,9 @@ window.g = { dev: { - VUE_APP_BASE_API: 'http://192.168.4.210:8010' + VUE_APP_BASE_API: 'http://127.0.0.1:8010' }, prod: { - VUE_APP_BASE_API: 'http://192.168.4.210:8010' + VUE_APP_BASE_API: 'http://10.93.41.198:8010' }