From 8e5ee1d791d5fe0faafb8a14cceea14eee110d69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=A8=E4=BF=8A=E6=9D=B0?= <9463626+zhou-junjiezjj@user.noreply.gitee.com> Date: Thu, 3 Aug 2023 20:35:19 +0800 Subject: [PATCH] =?UTF-8?q?rev=20=E9=A9=B1=E5=8A=A8=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lnsh_Laminating_machine/ItemProtocol.java | 20 +- .../lnsh/lnsh_package_site/ItemProtocol.java | 51 ++-- .../LnshPackageSiteDefination.java | 18 +- .../ItemProtocol.java | 37 ++- .../ItemProtocol.java | 248 +++++++++--------- .../driver/lnsh/conveyor_ssx_barcode.vue | 3 + .../driver/lnsh/lnsh_Laminating_machine.vue | 2 +- 7 files changed, 201 insertions(+), 178 deletions(-) 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 ac22382..173ce96 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, "心跳", "DB32.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB32.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_move, "光电开关信号", "DB32.B2")); - list.add(new ItemDto(item_container_type, "托盘类型", "DB32.B3")); - list.add(new ItemDto(item_error, "报警信号", "DB32.B4")); - list.add(new ItemDto(item_task, "任务号", "DB32.D6")); + 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")); return list; } public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "作业命令", "DB.W0", Boolean.valueOf(true))); - list.add(new ItemDto(item_to_target, "目标站", "DB.W2")); - list.add(new ItemDto(item_to_task, "任务号", "DB.D4")); - list.add(new ItemDto(item_to_barcode, "条码", "DB.W8")); + 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")); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_site/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_site/ItemProtocol.java index f6b3944..8737a3a 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_site/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_site/ItemProtocol.java @@ -20,19 +20,28 @@ public class ItemProtocol { public static String item_error = "error"; public static String item_vehicle_code = "vehicle_code"; public static String item_vehicle_type = "vehicle_type"; - + public static String item_task = "task"; public static String item_to_command = "to_command"; public static String item_to_vehicle_code = "to_vehicle_code"; public static String item_to_vehicle_type = "to_vehicle_type"; public static String item_to_is_package = "to_is_package"; - + public static String item_to_is_weight = "to_is_weight"; + public static String item_material = "material"; + public static String item_barcode = "barcode"; + public static String item_to_target = "to_target"; + public static String item_to_task= "to_task"; Boolean isonline; - private LnshPackageSiteDeviceDriver driver; public ItemProtocol(LnshPackageSiteDeviceDriver driver) { this.driver = driver; } + public int getTo_target() { + return this.getOpcIntegerValue(item_to_target); + } + public int getTo_task() { + return this.getOpcIntegerValue(item_to_task); + } public int getHeartbeat() { return this.getOpcIntegerValue(item_heartbeat); @@ -42,6 +51,16 @@ public class ItemProtocol { return this.getOpcIntegerValue(item_mode); } + public int getBarcode() { + return this.getOpcIntegerValue(item_barcode); + } + + public int getMaterial() { return this.getOpcIntegerValue(item_material); } + + public int getTask() { return this.getOpcIntegerValue(item_task); } + + public int getWeight() { return this.getOpcIntegerValue(item_to_is_weight);} + public int getMove() { return this.getOpcIntegerValue(item_move); } @@ -108,23 +127,25 @@ public class ItemProtocol { public static List getReadableItemDtos() { ArrayList list = new ArrayList<>(); - list.add(new ItemDto(item_heartbeat, "心跳", "VB6510")); - list.add(new ItemDto(item_mode, "工作模式", "VB6511", Boolean.TRUE)); - list.add(new ItemDto(item_move, "光电开关信号", "VB6512")); - list.add(new ItemDto(item_action, "取放信号", "VB6513")); - list.add(new ItemDto(item_ioaction, "进出信号", "VB6514")); - list.add(new ItemDto(item_error, "报警信号", "VB6515")); - list.add(new ItemDto(item_vehicle_code, "载具编码", "VW6517")); - list.add(new ItemDto(item_vehicle_type, "载具类型", "VB6516")); + 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_to_is_weight, "重量", "DB51.D10")); + list.add(new ItemDto(item_material, "物料", "DB51.STRING14.50")); + list.add(new ItemDto(item_barcode, "条码", "DB51.W66")); return list; } public static List getWriteableItemDtos() { ArrayList list = new ArrayList<>(); - list.add(new ItemDto(item_to_command, "下发指令", "VW6810", Boolean.TRUE)); - list.add(new ItemDto(item_to_vehicle_code, "下发载具编码", "VW6812")); - list.add(new ItemDto(item_to_vehicle_type, "下发载具类型", "VB6814")); - list.add(new ItemDto(item_to_is_package, "下发是否包装", "VB6815")); + list.add(new ItemDto(item_to_command, "下发指令", "DB51.B0", Boolean.TRUE)); + list.add(new ItemDto(item_to_target, "下发目标站", "DB51.B2")); + list.add(new ItemDto(item_to_task, "下发任务号", "DB51.B4")); + list.add(new ItemDto(item_to_is_package, "下发是否包装", "DB51.B8")); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_site/LnshPackageSiteDefination.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_site/LnshPackageSiteDefination.java index c6795f9..478c720 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_site/LnshPackageSiteDefination.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_site/LnshPackageSiteDefination.java @@ -57,14 +57,16 @@ public class LnshPackageSiteDefination implements OpcDeviceDriverDefination { public static List getReadableItemDtos2() { ArrayList list = new ArrayList<>(); - list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "VB6510")); - list.add(new ItemDto(ItemProtocol.item_mode, "工作模式", "VB6511", Boolean.TRUE)); - list.add(new ItemDto(ItemProtocol.item_move, "光电开关信号", "VB6512")); - list.add(new ItemDto(ItemProtocol.item_action, "取放信号", "VB6513")); - list.add(new ItemDto(ItemProtocol.item_ioaction, "进出信号", "VB6514")); - list.add(new ItemDto(ItemProtocol.item_error, "报警信号", "VB6515")); - list.add(new ItemDto(ItemProtocol.item_vehicle_code, "载具编码", "VW6517")); - list.add(new ItemDto(ItemProtocol.item_vehicle_type, "载具类型", "VB6516")); + list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB51.B0")); + list.add(new ItemDto(ItemProtocol.item_mode, "工作模式", "DB51.B1", Boolean.TRUE)); + list.add(new ItemDto(ItemProtocol.item_move, "光电开关信号", "DB51.B2")); + list.add(new ItemDto(ItemProtocol.item_action, "取放信号", "DB51.B3")); + list.add(new ItemDto(ItemProtocol.item_ioaction, "进出信号", "DB51.B4")); + list.add(new ItemDto(ItemProtocol.item_error, "报警信号", "DB51.B5")); + list.add(new ItemDto(ItemProtocol.item_task, "任务号", "DB51.B6")); + list.add(new ItemDto(ItemProtocol.item_to_is_weight, "重量", "DB51.B10")); + list.add(new ItemDto(ItemProtocol.item_material, "物料", "DB51.STRING14.50")); + list.add(new ItemDto(ItemProtocol.item_barcode, "条码", "DB51.B66")); 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 291ede8..48abd96 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 @@ -187,38 +187,37 @@ public class ItemProtocol { 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.B4")); + 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.D192")); - list.add(new ItemDto(item_grinding_number, "碾次", "DB100.D126")); - list.add(new ItemDto(item_height1, "高度1", "DB100.D178")); - list.add(new ItemDto(item_height2, "高度2", "DB100.D182")); - list.add(new ItemDto(item_height3, "高度3", "DB100.D186")); - list.add(new ItemDto(item_height4, "高度4", "DB100.D190")); - list.add(new ItemDto(item_width1, "宽度1", "DB100.D194")); - list.add(new ItemDto(item_width2, "宽度2", "DB100.D198")); - list.add(new ItemDto(item_len, "长度", "DB100.D202")); - list.add(new ItemDto(item_volume, "体积", "DB100.D206")); - list.add(new ItemDto(item_flatness, "平面度", "DB100.D210")); - list.add(new ItemDto(item_unqualified_qty, "缺陷个数", "DB100.D214")); + 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")); return list; } public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "反馈", "DB103.W0", Boolean.TRUE)); - list.add(new ItemDto(item_to_error, "error", "DB103.W2")); - list.add(new ItemDto(item_to_order_No, "工单号", "DB103.STRING4.50")); - list.add(new ItemDto(item_to_weight, "生产重量", "DB103.D56")); - list.add(new ItemDto(item_to_material_code, "下发物料编号", "DB103.STRING60.50")); + 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")); 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 26160ac..22d6147 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 @@ -670,136 +670,134 @@ public class ItemProtocol { public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB3.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB3.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_move, "光电开关信号", "DB3.B2")); - list.add(new ItemDto(item_action, "取放信号", "DB3.B3")); - list.add(new ItemDto(item_ioaction, "进出信号", "DB3.B4")); - list.add(new ItemDto(item_error, "报警信号", "DB3.B5")); - list.add(new ItemDto(item_task, "任务号", "DB3.D6")); - list.add(new ItemDto(item_weight, "重量", "DB3.D10")); - list.add(new ItemDto(item_material, "物料", "DB3.STRING14.50")); - list.add(new ItemDto(item_barcode, "条码", "DB3.W66")); - list.add(new ItemDto(item_encoder_qty, "码盘位当前码盘数量", "DB3.W68")); - list.add(new ItemDto(item_unqualified_qty, "不合格数量", "DB3.W70")); - - list.add(new ItemDto(item_product_code, "产品编号", "DB3.W72")); - list.add(new ItemDto(item_AlongSide, "A长边", "DB3.W74")); - list.add(new ItemDto(item_BshortSide, "B短边", "DB3.W76")); - list.add(new ItemDto(item_Htrapezoidal, "H梯形高", "DB3.W78")); - list.add(new ItemDto(item_Wthickness, "W厚度", "DB3.W80")); - list.add(new ItemDto(item_tray_qty, "当前垛盘数", "DB3.W82")); - list.add(new ItemDto(item_tray_high, "垛盘高度", "DB3.W84")); - list.add(new ItemDto(item_crib_category, "垛型类别", "DB3.W86")); - list.add(new ItemDto(item_palletX1_line, "码垛X1行", "DB3.W88")); - list.add(new ItemDto(item_palletY1_row, "码垛Y1列", "DB3.W90")); - list.add(new ItemDto(item_palletA1_angle, "码垛A1角度", "DB3.W92")); - list.add(new ItemDto(item_palletX2_line, "码垛X2行", "DB3.W94")); - list.add(new ItemDto(item_palletY2_row, "码垛Y2列", "DB3.W96")); - list.add(new ItemDto(item_palletA2_angle, "码垛A2角度", "DB3.W98")); - list.add(new ItemDto(item_palletX3_line, "码垛X3行", "DB3.W100")); - list.add(new ItemDto(item_palletY3_row, "码垛Y3列", "DB3.W102")); - list.add(new ItemDto(item_palletA3_angle, "码垛A3角度", "DB3.W104")); - list.add(new ItemDto(item_pressCribX1_line, "压垛X1行", "DB3.W106")); - list.add(new ItemDto(item_pressCribY1_row, "压垛Y1列", "DB3.W108")); - list.add(new ItemDto(item_pressCribA1_angle, "压垛A1角度", "DB3.W110")); - list.add(new ItemDto(item_pressCribX2_line, "压垛X2行", "DB3.W112")); - list.add(new ItemDto(item_pressCribY2_row, "压垛Y2列", "DB3.W114")); - list.add(new ItemDto(item_pressCribA2_angle, "压垛A2角度", "DB3.W116")); - list.add(new ItemDto(item_pressCribX3_line, "压垛X3行", "DB3.W118")); - list.add(new ItemDto(item_pressCribY3_row, "压垛Y3列", "DB3.W120")); - list.add(new ItemDto(item_pressCribA3_angle, "压垛A3角度", "DB3.W122")); - list.add(new ItemDto(item_Zoffset, "Z轴偏移", "DB3.W124")); - list.add(new ItemDto(item_pallet_layerQty, "码垛层数", "DB3.W126")); - list.add(new ItemDto(item_pressCrib_layerQty, "压垛层数", "DB3.W128")); - list.add(new ItemDto(item_codeLayerX1_interval, "码层X1间隔", "DB3.W130")); - list.add(new ItemDto(item_codeLayerY1_interval, "码层Y1间隔", "DB3.W132")); - list.add(new ItemDto(item_codeLayerX2_interval, "码层X2间隔", "DB3.W134")); - list.add(new ItemDto(item_codeLayerY2_interval, "码层Y2间隔", "DB3.W136")); - list.add(new ItemDto(item_codeLayerX3_interval, "码层X3间隔", "DB3.W138")); - list.add(new ItemDto(item_codeLayerY3_interval, "码层Y3间隔", "DB3.W140")); - list.add(new ItemDto(item_codeLayerX1_offset, "码层X1偏移", "DB3.W142")); - list.add(new ItemDto(item_codeLayerY1_offset, "码层Y1偏移", "DB3.W144")); - list.add(new ItemDto(item_codeLayerX2_offset, "码层X2偏移", "DB3.W146")); - list.add(new ItemDto(item_codeLayerY2_offset, "码层Y2偏移", "DB3.W148")); - list.add(new ItemDto(item_codeLayerX3_offset, "码层X3偏移", "DB3.W150")); - list.add(new ItemDto(item_codeLayerY3_offset, "码层Y3偏移", "DB3.W152")); - list.add(new ItemDto(item_pressLayerX1_interval, "压层X1间隔", "DB3.W154")); - list.add(new ItemDto(item_pressLayerY1_interval, "压层Y1间隔", "DB3.W156")); - list.add(new ItemDto(item_pressLayerX2_interval, "压层X2间隔", "DB3.W158")); - list.add(new ItemDto(item_pressLayerY2_interval, "压层Y2间隔", "DB3.W160")); - list.add(new ItemDto(item_pressLayerX3_interval, "压层X3间隔", "DB3.W162")); - list.add(new ItemDto(item_pressLayerY3_interval, "压层Y3间隔", "DB3.W164")); - list.add(new ItemDto(item_pressLayerX1_offset, "压层X1偏移", "DB3.W166")); - list.add(new ItemDto(item_pressLayerY1_offset, "压层Y1偏移", "DB3.W168")); - list.add(new ItemDto(item_pressLayerX2_offset, "压层X2偏移", "DB3.W170")); - list.add(new ItemDto(item_pressLayerY2_offset, "压层Y2偏移", "DB3.W172")); - list.add(new ItemDto(item_pressLayerX3_offset, "压层X3偏移", "DB3.W174")); - list.add(new ItemDto(item_pressLayerY3_offset, "压层Y3偏移", "DB3.W176")); - list.add(new ItemDto(item_tool_coordinate, "工具坐标", "DB3.W178")); + 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")); return list; } public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "作业命令", "DB4.W0", Boolean.valueOf(true))); - list.add(new ItemDto(item_to_target, "目标站", "DB4.W2")); - list.add(new ItemDto(item_to_task, "任务号", "DB4.D4")); - - list.add(new ItemDto(item_to_product_code, "产品编号", "DB4.W8")); - list.add(new ItemDto(item_to_AlongSide, "A长边", "DB4.W10")); - list.add(new ItemDto(item_to_BshortSide, "B短边", "DB4.W12")); - list.add(new ItemDto(item_to_Htrapezoidal, "H梯形高", "DB4.W14")); - list.add(new ItemDto(item_to_Wthickness, "W厚度", "DB4.W16")); - list.add(new ItemDto(item_to_tray_qty, "当前垛盘数", "DB4.W18")); - list.add(new ItemDto(item_to_tray_high, "垛盘高度", "DB4.W20")); - list.add(new ItemDto(item_to_crib_category, "垛型类别", "DB4.W22")); - list.add(new ItemDto(item_to_palletX1_line, "码垛X1行", "DB4.W24")); - list.add(new ItemDto(item_to_palletY1_row, "码垛Y1列", "DB4.W26")); - list.add(new ItemDto(item_to_palletA1_angle, "码垛A1角度", "DB4.W28")); - list.add(new ItemDto(item_to_palletX2_line, "码垛X2行", "DB4.W30")); - list.add(new ItemDto(item_to_palletY2_row, "码垛Y2列", "DB4.W32")); - list.add(new ItemDto(item_to_palletA2_angle, "码垛A2角度", "DB4.W34")); - list.add(new ItemDto(item_to_palletX3_line, "码垛X3行", "DB4.W36")); - list.add(new ItemDto(item_to_palletY3_row, "码垛Y3列", "DB4.W38")); - list.add(new ItemDto(item_to_palletA3_angle, "码垛A3角度", "DB4.W40")); - list.add(new ItemDto(item_to_pressCribX1_line, "压垛X1行", "DB4.W42")); - list.add(new ItemDto(item_to_pressCribY1_row, "压垛Y1列", "DB4.W44")); - list.add(new ItemDto(item_to_pressCribA1_angle, "压垛A1角度", "DB4.W46")); - list.add(new ItemDto(item_to_pressCribX2_line, "压垛X2行", "DB4.W48")); - list.add(new ItemDto(item_to_pressCribY2_row, "压垛Y2列", "DB4.W50")); - list.add(new ItemDto(item_to_pressCribA2_angle, "压垛A2角度", "DB4.W52")); - list.add(new ItemDto(item_to_pressCribX3_line, "压垛X3行", "DB4.W54")); - list.add(new ItemDto(item_to_pressCribY3_row, "压垛Y3列", "DB4.W56")); - list.add(new ItemDto(item_to_pressCribA3_angle, "压垛A3角度", "DB4.W58")); - list.add(new ItemDto(item_to_Zoffset, "Z轴偏移", "DB4.W60")); - list.add(new ItemDto(item_to_pallet_layerQty, "码垛层数", "DB4.W62")); - list.add(new ItemDto(item_to_pressCrib_layerQty, "压垛层数", "DB4.W64")); - list.add(new ItemDto(item_to_codeLayerX1_interval, "码层X1间隔", "DB4.W66")); - list.add(new ItemDto(item_to_codeLayerY1_interval, "码层Y1间隔", "DB4.W68")); - list.add(new ItemDto(item_to_codeLayerX2_interval, "码层X2间隔", "DB4.W70")); - list.add(new ItemDto(item_to_codeLayerY2_interval, "码层Y2间隔", "DB4.W72")); - list.add(new ItemDto(item_to_codeLayerX3_interval, "码层X3间隔", "DB4.W74")); - list.add(new ItemDto(item_to_codeLayerY3_interval, "码层Y3间隔", "DB4.W76")); - list.add(new ItemDto(item_to_codeLayerX1_offset, "码层X1偏移", "DB4.W78")); - list.add(new ItemDto(item_to_codeLayerY1_offset, "码层Y1偏移", "DB4.W80")); - list.add(new ItemDto(item_to_codeLayerX2_offset, "码层X2偏移", "DB4.W82")); - list.add(new ItemDto(item_to_codeLayerY2_offset, "码层Y2偏移", "DB4.W84")); - list.add(new ItemDto(item_to_codeLayerX3_offset, "码层X3偏移", "DB4.W86")); - list.add(new ItemDto(item_to_codeLayerY3_offset, "码层Y3偏移", "DB4.W88")); - list.add(new ItemDto(item_to_pressLayerX1_interval, "压层X1间隔", "DB4.W90")); - list.add(new ItemDto(item_to_pressLayerY1_interval, "压层Y1间隔", "DB4.W92")); - list.add(new ItemDto(item_to_pressLayerX2_interval, "压层X2间隔", "DB4.W94")); - list.add(new ItemDto(item_to_pressLayerY2_interval, "压层Y2间隔", "DB4.W96")); - list.add(new ItemDto(item_to_pressLayerX3_interval, "压层X3间隔", "DB4.W98")); - list.add(new ItemDto(item_to_pressLayerY3_interval, "压层Y3间隔", "DB4.W100")); - list.add(new ItemDto(item_to_pressLayerX1_offset, "压层X1偏移", "DB4.W102")); - list.add(new ItemDto(item_to_pressLayerY1_offset, "压层Y1偏移", "DB4.W104")); - list.add(new ItemDto(item_to_pressLayerX2_offset, "压层X2偏移", "DB4.W106")); - list.add(new ItemDto(item_to_pressLayerY2_offset, "压层Y2偏移", "DB4.W108")); - list.add(new ItemDto(item_to_pressLayerX3_offset, "压层X3偏移", "DB4.W110")); - list.add(new ItemDto(item_to_pressLayerY3_offset, "压层Y3偏移", "DB4.W112")); - list.add(new ItemDto(item_to_tool_coordinate, "工具坐标", "DB4.W114")); + 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")); return list; } diff --git a/acs/nladmin-ui/src/views/acs/device/driver/lnsh/conveyor_ssx_barcode.vue b/acs/nladmin-ui/src/views/acs/device/driver/lnsh/conveyor_ssx_barcode.vue index d9cd588..2ed71c7 100644 --- a/acs/nladmin-ui/src/views/acs/device/driver/lnsh/conveyor_ssx_barcode.vue +++ b/acs/nladmin-ui/src/views/acs/device/driver/lnsh/conveyor_ssx_barcode.vue @@ -519,6 +519,9 @@ export default { if (this.data2[val].code.indexOf('to_task') !== -1) { this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 4) } + if (this.data2[val].code.indexOf('to_barcode') !== -1) { + this.data2[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 8) + } } } }, diff --git a/acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_Laminating_machine.vue b/acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_Laminating_machine.vue index ed25fa1..020d737 100644 --- a/acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_Laminating_machine.vue +++ b/acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_Laminating_machine.vue @@ -381,7 +381,7 @@ export default { this.data1[val].db = beforeStr + '.B4' } if (this.data1[val].code.indexOf('task') !== -1) { - this.data1[val].db = beforeStr + '.D5' + this.data1[val].db = beforeStr + '.D6' } } }