From 373670a51d345797fd2f57efd2f21cc909ca33bc 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 10:03:14 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=92=8C=E9=A9=B1=E5=8A=A8?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../conveyor_press_station/ItemProtocol.java | 30 +++++----- .../lnsh/lnsh_mixing_mill/ItemProtocol.java | 35 ++++++----- .../ItemProtocol.java | 58 +++++++++---------- .../lnsh/lnsh_press/ItemProtocol.java | 48 +++++++-------- .../lnsh/lnsh_station/ItemProtocol.java | 26 ++++----- .../driver/lnsh/conveyor_press_station.vue | 8 ++- .../driver/lnsh/conveyor_ssx_barcode.vue | 6 +- .../device/driver/lnsh/lnsh_mixing_mill.vue | 4 +- .../acs/device/driver/lnsh/lnsh_station.vue | 2 +- 9 files changed, 111 insertions(+), 106 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/conveyor_press_station/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/conveyor_press_station/ItemProtocol.java index 99af25a..13414cc 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/conveyor_press_station/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/conveyor_press_station/ItemProtocol.java @@ -120,26 +120,26 @@ public class ItemProtocol { public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB8.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB8.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_move, "光电开关信号", "DB8.B2")); - list.add(new ItemDto(item_action, "取放信号", "DB8.B3")); - list.add(new ItemDto(item_ioaction, "进出信号", "DB8.B4")); - list.add(new ItemDto(item_error, "报警信号", "DB8.B5")); - list.add(new ItemDto(item_task, "任务号", "DB8.D6")); - list.add(new ItemDto(item_weight, "重量", "DB8.D10")); - list.add(new ItemDto(item_material, "物料", "DB8.STRING14.50")); - list.add(new ItemDto(item_barcode, "条码", "DB8.W66")); + 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_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, "作业命令", "DB9.W0", Boolean.valueOf(true))); - list.add(new ItemDto(item_to_target, "目标站", "DB9.W2")); - list.add(new ItemDto(item_to_task, "任务号", "DB9.D4")); - list.add(new ItemDto(item_to_barcode, "条码", "DB9.W8")); - list.add(new ItemDto(item_to_mix_num, "碾次", "DB9.W10")); + list.add(new ItemDto(item_to_command, "作业命令", "DB50.W0", Boolean.valueOf(true))); + list.add(new ItemDto(item_to_target, "目标站", "DB50.W2")); + list.add(new ItemDto(item_to_task, "任务号", "DB50.D4")); + list.add(new ItemDto(item_to_barcode, "条码", "DB50.W8")); + list.add(new ItemDto(item_to_mix_num, "碾次", "DB50.W10")); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/ItemProtocol.java index 5642abe..5a56ad2 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/ItemProtocol.java @@ -135,29 +135,28 @@ public class ItemProtocol { public static List getReadableItemDtos() { ArrayList list = new ArrayList<>(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB6.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB6.B1", Boolean.TRUE)); - list.add(new ItemDto(item_status, "设备状态", "DB6.B2")); - list.add(new ItemDto(item_error, "故障代码", "DB6.B3")); - list.add(new ItemDto(item_open_time, "开机时间", "DB6.STRING4.50")); - list.add(new ItemDto(item_standby_time, "待机时间", "DB6.D56")); - list.add(new ItemDto(item_production_time, "生产时间", "DB6.D60")); - list.add(new ItemDto(item_error_time, "故障时间", "DB6.D64")); - list.add(new ItemDto(item_weight, "当前生产重量", "DB6.D68")); - list.add(new ItemDto(item_order_No, "工单号", "DB6.STRING72.50")); - list.add(new ItemDto(item_mix_num, "碾次", "DB6.D124")); - list.add(new ItemDto(item_material, "当前生产物料", "DB6.STRING128.50")); - + list.add(new ItemDto(item_heartbeat, "心跳", "DB61.B0")); + list.add(new ItemDto(item_mode, "工作模式", "DB61.B1", Boolean.TRUE)); + list.add(new ItemDto(item_status, "设备状态", "DB61.B2")); + list.add(new ItemDto(item_error, "故障代码", "DB61.B3")); + list.add(new ItemDto(item_open_time, "开机时间", "DB61.STRING4.50")); + list.add(new ItemDto(item_standby_time, "待机时间", "DB61.D56")); + list.add(new ItemDto(item_production_time, "生产时间", "DB61.D60")); + list.add(new ItemDto(item_error_time, "故障时间", "DB61.D64")); + list.add(new ItemDto(item_weight, "当前生产重量", "DB61.D68")); + list.add(new ItemDto(item_order_No, "工单号", "DB61.STRING72.50")); + list.add(new ItemDto(item_mix_num, "碾次", "DB61.D124")); + list.add(new ItemDto(item_material, "当前生产物料", "DB61.STRING128.50")); return list; } public static List getWriteableItemDtos() { ArrayList list = new ArrayList<>(); - list.add(new ItemDto(item_to_command, "反馈", "DB7.W0", Boolean.TRUE)); - list.add(new ItemDto(item_to_error, "error", "DB7.W2")); - list.add(new ItemDto(item_to_order_No, "工单号", "DB7.STRING4.50")); - list.add(new ItemDto(item_to_weight, "生产重量", "DB7.D56")); - list.add(new ItemDto(item_to_material_code, "下发物料编号", "DB7.STRING60.50")); + list.add(new ItemDto(item_to_command, "反馈", "DB51.W0", Boolean.TRUE)); + list.add(new ItemDto(item_to_error, "error", "DB51.W2")); + list.add(new ItemDto(item_to_order_No, "工单号", "DB51.STRING4.50")); + list.add(new ItemDto(item_to_weight, "生产重量", "DB51.D56")); + list.add(new ItemDto(item_to_material_code, "下发物料编号", "DB51.STRING60.50")); 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 b65c09f..291ede8 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 @@ -184,41 +184,41 @@ 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", Boolean.valueOf(true))); - list.add(new ItemDto(item_status, "设备状态", "DB1.B2")); - list.add(new ItemDto(item_action, "动作", "DB1.B3")); - list.add(new ItemDto(item_error, "故障代码", "DB1.B4")); - list.add(new ItemDto(item_open_time, "开机时间", "DB1.STRING6.50")); - list.add(new ItemDto(item_standby_time, "待机时间", "DB1.D58")); - list.add(new ItemDto(item_production_time, "生产时间", "DB1.D62")); - list.add(new ItemDto(item_error_time, "故障时间", "DB1.D66")); - list.add(new ItemDto(item_get_station, "当前抓取工位", "DB1.D70")); - list.add(new ItemDto(item_put_station, "当前放置工位", "DB1.D71")); - list.add(new ItemDto(item_is_qualified, "是否合格", "DB1.D72")); - list.add(new ItemDto(item_laser_marking_code, "激光标刻码", "DB1.D74")); - list.add(new ItemDto(item_grinding_number, "碾次", "DB1.D126")); - list.add(new ItemDto(item_height1, "高度1", "DB1.D178")); - list.add(new ItemDto(item_height2, "高度2", "DB1.D182")); - list.add(new ItemDto(item_height3, "高度3", "DB1.D186")); - list.add(new ItemDto(item_height4, "高度4", "DB1.D190")); - list.add(new ItemDto(item_width1, "宽度1", "DB1.D194")); - list.add(new ItemDto(item_width2, "宽度2", "DB1.D198")); - list.add(new ItemDto(item_len, "长度", "DB1.D202")); - list.add(new ItemDto(item_volume, "体积", "DB1.D206")); - list.add(new ItemDto(item_flatness, "平面度", "DB1.D210")); - list.add(new ItemDto(item_unqualified_qty, "缺陷个数", "DB1.D214")); + 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_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")); return list; } public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "反馈", "DB7.W0", Boolean.TRUE)); - list.add(new ItemDto(item_to_error, "error", "DB7.W2")); - list.add(new ItemDto(item_to_order_No, "工单号", "DB7.STRING4.50")); - list.add(new ItemDto(item_to_weight, "生产重量", "DB7.D56")); - list.add(new ItemDto(item_to_material_code, "下发物料编号", "DB7.STRING60.50")); + 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")); 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 bb88a7d..a7451d4 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 @@ -172,35 +172,35 @@ public class ItemProtocol { public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB8.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB8.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_status, "设备状态", "DB8.B2")); - list.add(new ItemDto(item_error, "故障", "DB8.B3")); - list.add(new ItemDto(item_open_time, "开机时间", "DB8.STRING4.50")); - list.add(new ItemDto(item_standby_time, "待机时间", "DB8.D56")); - list.add(new ItemDto(item_production_time, "生产时间", "DB8.D60")); - list.add(new ItemDto(item_error_time, "故障时间", "DB8.D64")); - list.add(new ItemDto(item_material, "当前生产物料", "DB8.STRING68.50")); - list.add(new ItemDto(item_qty, "当前已生产数量", "DB8.D120")); - list.add(new ItemDto(item_weight, "当前已生产重量", "DB8.D124")); - list.add(new ItemDto(item_qualified, "当前已生产合格数", "DB8.D128")); - list.add(new ItemDto(item_unqualified, "当前已生产不合格数", "DB8.D132")); - list.add(new ItemDto(item_order_No, "工单号", "DB8.STRING136.50")); + 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")); return list; } public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "反馈", "DB9.W0", Boolean.valueOf(true))); - list.add(new ItemDto(item_to_error, "error", "DB9.W2")); - list.add(new ItemDto(item_to_order_No, "工单号", "DB9.STRING4.50")); - list.add(new ItemDto(item_to_qty, "生产重量", "DB9.D56")); - list.add(new ItemDto(item_to_material_code, "下发物料编号", "DB9.STRING60.50")); - list.add(new ItemDto(item_to_product_code, "产品编号", "DB4.W112")); - list.add(new ItemDto(item_to_AlongSide, "A长边", "DB4.W114")); - list.add(new ItemDto(item_to_BshortSide, "B短边", "DB4.W116")); - list.add(new ItemDto(item_to_Htrapezoidal, "H梯形高", "DB4.W118")); - list.add(new ItemDto(item_to_Wthickness, "W厚度", "DB4.W120")); + 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_product_code, "产品编号", "DB101.W112")); + list.add(new ItemDto(item_to_AlongSide, "A长边", "DB101.W114")); + list.add(new ItemDto(item_to_BshortSide, "B短边", "DB101.W116")); + list.add(new ItemDto(item_to_Htrapezoidal, "H梯形高", "DB101.W118")); + list.add(new ItemDto(item_to_Wthickness, "W厚度", "DB101.W120")); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/ItemProtocol.java index 3d247d2..21b743b 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/ItemProtocol.java @@ -118,24 +118,24 @@ public class ItemProtocol { public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB8.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB8.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_move, "光电开关信号", "DB8.B2")); - list.add(new ItemDto(item_action, "取放信号", "DB8.B3")); - list.add(new ItemDto(item_ioaction, "进出信号", "DB8.B4")); - list.add(new ItemDto(item_error, "报警信号", "DB8.B5")); - list.add(new ItemDto(item_task, "任务号", "DB8.D6")); - list.add(new ItemDto(item_weight, "重量", "DB8.D10")); - list.add(new ItemDto(item_material, "物料", "DB8.STRING14.50")); - list.add(new ItemDto(item_barcode, "条码", "DB8.W66")); + list.add(new ItemDto(item_heartbeat, "心跳", "DB81.B10")); + list.add(new ItemDto(item_mode, "工作模式", "DB81.B1", Boolean.valueOf(true))); + list.add(new ItemDto(item_move, "光电开关信号", "DB81.B2")); + list.add(new ItemDto(item_action, "取放信号", "DB81.B3")); + list.add(new ItemDto(item_ioaction, "进出信号", "DB81.B4")); + list.add(new ItemDto(item_error, "报警信号", "DB81.B5")); + list.add(new ItemDto(item_task, "任务号", "DB81.D6")); + list.add(new ItemDto(item_weight, "重量", "DB81.D10")); + list.add(new ItemDto(item_material, "物料", "DB81.STRING14.50")); + list.add(new ItemDto(item_barcode, "条码", "DB81.W66")); return list; } public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "作业命令", "DB9.W0", Boolean.valueOf(true))); - list.add(new ItemDto(item_to_target, "目标站", "DB9.W2")); - list.add(new ItemDto(item_to_task, "任务号", "DB9.D4")); + list.add(new ItemDto(item_to_command, "作业命令", "DB71.W0", Boolean.valueOf(true))); + list.add(new ItemDto(item_to_target, "目标站", "DB71.W2")); + list.add(new ItemDto(item_to_task, "任务号", "DB71.D4")); return list; } diff --git a/acs/nladmin-ui/src/views/acs/device/driver/lnsh/conveyor_press_station.vue b/acs/nladmin-ui/src/views/acs/device/driver/lnsh/conveyor_press_station.vue index 569d36c..15ec4fb 100644 --- a/acs/nladmin-ui/src/views/acs/device/driver/lnsh/conveyor_press_station.vue +++ b/acs/nladmin-ui/src/views/acs/device/driver/lnsh/conveyor_press_station.vue @@ -493,7 +493,7 @@ export default { this.data1[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 13) + '.50' } if (this.data1[val].code.indexOf('barcode') !== -1) { - this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 63) + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 65) } } } @@ -519,6 +519,12 @@ 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 + '.' + 'D' + (parseInt(endNumber) + 8) + } + if (this.data2[val].code.indexOf('to_mix_num') !== -1) { + this.data2[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 10) + } } } }, 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 ec56a12..d9cd588 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 @@ -481,10 +481,10 @@ export default { this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 3) } if (this.data1[val].code.indexOf('error') !== -1) { - this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 4) + this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 2) } if (this.data1[val].code.indexOf('task') !== -1) { - this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 5) + this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 3) } if (this.data1[val].code.indexOf('weight') !== -1) { this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 9) @@ -493,7 +493,7 @@ export default { this.data1[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 13) + '.50' } if (this.data1[val].code.indexOf('barcode') !== -1) { - this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 63) + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 7) } } } diff --git a/acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_mixing_mill.vue b/acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_mixing_mill.vue index 7a390a9..c55ec32 100644 --- a/acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_mixing_mill.vue +++ b/acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_mixing_mill.vue @@ -559,10 +559,10 @@ export default { this.data2[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 4) + '.50' } if (this.data2[val].code.indexOf('to_weight') !== -1) { - this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 54) + this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 56) } if (this.data2[val].code.indexOf('to_material_code') !== -1) { - this.data2[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 58) + '.50' + this.data2[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 60) + '.50' } } } diff --git a/acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_station.vue b/acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_station.vue index f5a6288..cbce1fd 100644 --- a/acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_station.vue +++ b/acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_station.vue @@ -493,7 +493,7 @@ export default { this.data1[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 13) + '.50' } if (this.data1[val].code.indexOf('barcode') !== -1) { - this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 63) + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 65) } } }