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 13414cc..a97ec75 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 @@ -91,6 +91,13 @@ public class ItemProtocol { return this.getOpcIntegerValue(item_to_task); } + public int getToBarcode() { + return this.getOpcIntegerValue(item_to_barcode); + } + + public int getToMixNum() { + return this.getOpcIntegerValue(item_to_mix_num); + } //是否有货 public int hasGoods(int move) { return move; @@ -139,7 +146,7 @@ public class ItemProtocol { 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")); + list.add(new ItemDto(item_to_mix_num, "碾次", "DB50.STRING10.50")); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_fold_disc_site/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_fold_disc_site/ItemProtocol.java index b08e5a4..4a755c0 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_fold_disc_site/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_fold_disc_site/ItemProtocol.java @@ -24,6 +24,16 @@ public class ItemProtocol { public static String item_to_command = "to_command"; public static String item_to_target = "to_target"; public static String item_to_task = "to_task"; + public static String item_move = "move"; + public static String item_action = "action"; + public static String item_ioaction = "ioaction"; + public static String item_error = "error"; + public static String item_task = "task"; + public static String item_weight = "weight"; + public static String item_material = "material"; + public static String item_barcode = "barcode"; + public static String item_to_barcode = "to_barcode"; + public static String item_to_mix_num = "to_mix_num"; Boolean isonline; private LnshFoldDiscSiteDeviceDriver driver; @@ -39,6 +49,37 @@ public class ItemProtocol { public int getMode() { return this.getOpcIntegerValue(item_mode); } + public int getMove() { + return this.getOpcIntegerValue(item_move); + } + + public int getAction() { + return this.getOpcIntegerValue(item_action); + } + + public int getIoAction() { + return this.getOpcIntegerValue(item_ioaction); + } + + public int getError() { + return this.getOpcIntegerValue(item_error); + } + + public int getTask() { + return this.getOpcIntegerValue(item_task); + } + + public int getWeight() { + return this.getOpcIntegerValue(item_weight); + } + + public String getMaterial() { + return this.getOpcStringValue(item_material); + } + + public int getBarcode() { + return this.getOpcIntegerValue(item_barcode); + } public int getStatus() { return this.getOpcIntegerValue(item_status); @@ -111,15 +152,16 @@ public class ItemProtocol { public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB120.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB120.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_status, "设备状态", "DB120.B2")); - list.add(new ItemDto(item_open_time, "开机时间", "DB120.STRING4.50")); - list.add(new ItemDto(item_close_time, "关机时间", "DB120.D56")); - list.add(new ItemDto(item_standby_time, "待机时间", "DB120.D60")); - list.add(new ItemDto(item_production_time, "生产时间", "DB120.D64")); - list.add(new ItemDto(item_error_time, "故障时间", "DB120.D68")); - list.add(new ItemDto(item_container_qty, "托盘数", "DB120.D72")); + 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; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_fold_disc_site/LnshFoldDiscSiteDefination.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_fold_disc_site/LnshFoldDiscSiteDefination.java index 96721ce..fed43de 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_fold_disc_site/LnshFoldDiscSiteDefination.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_fold_disc_site/LnshFoldDiscSiteDefination.java @@ -50,21 +50,7 @@ public class LnshFoldDiscSiteDefination implements OpcDeviceDriverDefination { @Override public List getReadableItemDtos() { - return getReadableItemDtos2(); - } - - public static List getReadableItemDtos2() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB120.B0")); - list.add(new ItemDto(ItemProtocol.item_mode, "工作模式", "DB120.B1", Boolean.valueOf(true))); - list.add(new ItemDto(ItemProtocol.item_status, "设备状态", "DB120.B2")); - list.add(new ItemDto(ItemProtocol.item_open_time, "开机时间", "DB120.STRING4.50")); - list.add(new ItemDto(ItemProtocol.item_close_time, "关机时间", "DB120.D56")); - list.add(new ItemDto(ItemProtocol.item_standby_time, "待机时间", "DB120.D60")); - list.add(new ItemDto(ItemProtocol.item_production_time, "生产时间", "DB120.D64")); - list.add(new ItemDto(ItemProtocol.item_error_time, "故障时间", "DB120.D68")); - list.add(new ItemDto(ItemProtocol.item_container_qty, "托盘数", "DB120.D72")); - return list; + return ItemProtocol.getReadableItemDtos(); } @Override diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/ItemProtocol.java index a5a4344..7f56303 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/ItemProtocol.java @@ -32,8 +32,8 @@ public class ItemProtocol { public static String item_BshortSide = "BshortSide"; public static String item_Htrapezoidal = "Htrapezoidal"; public static String item_Wthickness = "Wthickness"; - - + public static String item_grab_station = "grab_station"; + public static String item_place_station = "place_station"; public static String item_to_feedback = "to_feedback"; public static String item_to_error = "to_error"; public static String item_to_material = "to_material"; @@ -48,6 +48,8 @@ public class ItemProtocol { public static String item_to_on_vehicle_qty = "to_on_vehicle_qty"; public static String item_to_vehicle_type = "to_vehicle_type"; + public static String item_to_tray_qty = "to_tray_qty"; + private LnshPackagePalletManipulatorDeviceDriver driver; @@ -59,10 +61,22 @@ public class ItemProtocol { return this.getOpcIntegerValue(item_heartbeat); } + public int getToTrayQty() { + return this.getOpcIntegerValue(item_to_tray_qty); + } + public int getMode() { return this.getOpcIntegerValue(item_mode); } + public int getGrabStation() { + return this.getOpcIntegerValue(item_grab_station); + } + + public int getPlaceStation() { + return this.getOpcIntegerValue(item_place_station); + } + public int getStatus() { return this.getOpcIntegerValue(item_status); } @@ -207,25 +221,25 @@ 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_error, "故障代码", "DB1.B3")); - list.add(new ItemDto(item_putStation, "当前工位", "DB1.D4")); - list.add(new ItemDto(item_material, "物料", "DB1.STRING8.50")); - list.add(new ItemDto(item_qty, "拆/码垛数量", "DB1.D60")); - list.add(new ItemDto(item_order_qty, "工单总数量", "DB1.D64")); - list.add(new ItemDto(item_open_time, "开机时间", "DB1.STRING68.50")); - list.add(new ItemDto(item_standby_time, "待机时间", "DB1.D120")); - list.add(new ItemDto(item_production_time, "生产时间", "DB1.D124")); - list.add(new ItemDto(item_error_time, "故障时间", "DB1.D128")); - list.add(new ItemDto(item_order_No, "工单号", "DB1.STRING132.50")); - - list.add(new ItemDto(item_product_code, "产品编号", "DB1.W184")); - list.add(new ItemDto(item_AlongSide, "A长边", "DB1.W186")); - list.add(new ItemDto(item_BshortSide, "B短边", "DB1.W188")); - list.add(new ItemDto(item_Htrapezoidal, "H梯形高", "DB1.W190")); - list.add(new ItemDto(item_Wthickness, "W厚度", "DB1.W192")); + list.add(new ItemDto(item_heartbeat, "心跳", "DB80.B0")); + list.add(new ItemDto(item_mode, "工作模式", "DB80.B1", Boolean.valueOf(true))); + list.add(new ItemDto(item_status, "设备状态", "DB80.B2")); + list.add(new ItemDto(item_error, "故障代码", "DB80.B3")); + list.add(new ItemDto(item_putStation, "当前码盘工位", "DB80.D4")); + list.add(new ItemDto(item_material, "当前物料", "DB80.STRING8.50")); + list.add(new ItemDto(item_qty, "拆/码垛数量", "DB80.D60")); + list.add(new ItemDto(item_open_time, "开机时间", "DB80.STRING64.50")); + list.add(new ItemDto(item_standby_time, "待机时间", "DB80.D116")); + list.add(new ItemDto(item_production_time, "生产时间", "DB80.D120")); + list.add(new ItemDto(item_error_time, "故障时间", "DB80.D124")); + list.add(new ItemDto(item_order_No, "工单号", "DB80.STRING128.50")); + list.add(new ItemDto(item_grab_station, "当前抓取工位", "DB80.B130")); + list.add(new ItemDto(item_place_station, "当前放置工位", "DB80.B132")); +// list.add(new ItemDto(item_product_code, "产品编号", "DB1.W184")); +// list.add(new ItemDto(item_AlongSide, "A长边", "DB1.W186")); +// list.add(new ItemDto(item_BshortSide, "B短边", "DB1.W188")); +// list.add(new ItemDto(item_Htrapezoidal, "H梯形高", "DB1.W190")); +// list.add(new ItemDto(item_Wthickness, "W厚度", "DB1.W192")); return list; } @@ -233,16 +247,19 @@ public class ItemProtocol { ArrayList list = new ArrayList(); list.add(new ItemDto(item_to_feedback, "机器人动作反馈", "DB2.B0")); list.add(new ItemDto(item_to_error, "故障代码", "DB2.B1")); - list.add(new ItemDto(item_to_material, "物料", "DB2.STRING2.50")); - list.add(new ItemDto(item_to_order_No, "工单号", "DB2.STRING54.50")); - list.add(new ItemDto(item_to_order_qty, "工单数量", "DB2.D106")); - list.add(new ItemDto(item_to_product_code, "产品编号", "DB2.W110")); - list.add(new ItemDto(item_to_AlongSide, "A长边", "DB2.W112")); - list.add(new ItemDto(item_to_BshortSide, "B短边", "DB2.W114")); - list.add(new ItemDto(item_to_Htrapezoidal, "H梯形高", "DB2.W116")); - list.add(new ItemDto(item_to_Wthickness, "W厚度", "DB2.W118")); list.add(new ItemDto(item_to_on_vehicle_qty, "托盘上数量", "DB2.W120")); + list.add(new ItemDto(item_to_tray_qty, "允许码垛数量", "DB100.W82")); list.add(new ItemDto(item_to_vehicle_type, "托盘类型", "DB2.W122")); + list.add(new ItemDto(item_to_material, "下发物料编号", "DB2.STRING2.50")); + list.add(new ItemDto(item_to_order_No, "工单号", "DB2.STRING54.50")); +// list.add(new ItemDto(item_to_order_qty, "工单数量", "DB2.D106")); +// list.add(new ItemDto(item_to_product_code, "产品编号", "DB2.W110")); +// list.add(new ItemDto(item_to_AlongSide, "A长边", "DB2.W112")); +// list.add(new ItemDto(item_to_BshortSide, "B短边", "DB2.W114")); +// list.add(new ItemDto(item_to_Htrapezoidal, "H梯形高", "DB2.W116")); +// list.add(new ItemDto(item_to_Wthickness, "W厚度", "DB2.W118")); + + 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 15ec4fb..c4699f8 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 @@ -523,7 +523,7 @@ export default { 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) + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 65) } } } diff --git a/acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_fold_disc_site.vue b/acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_fold_disc_site.vue index 4713e12..8a5fe31 100644 --- a/acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_fold_disc_site.vue +++ b/acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_fold_disc_site.vue @@ -378,17 +378,35 @@ export default { if (isNaN(parseInt(endNumber))) { return } - // for (const val in this.data1) { - // if (this.data1[val].code.indexOf('move') !== -1) { - // this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 1) - // } - // if (this.data1[val].code.indexOf('error') !== -1) { - // this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 5) - // } - // if (this.data1[val].code.indexOf('task') !== -1) { - // this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 7) - // } - // } + for (const val in this.data1) { + if (this.data1[val].code.indexOf('heartbeat') !== -1) { + this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) - 1) + } + if (this.data1[val].code.indexOf('move') !== -1) { + this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 1) + } + if (this.data1[val].code.indexOf('action') !== -1) { + this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 2) + } + if (this.data1[val].code.indexOf('ioaction') !== -1) { + 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) + } + if (this.data1[val].code.indexOf('task') !== -1) { + this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 5) + } + if (this.data1[val].code.indexOf('weight') !== -1) { + this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 9) + } + if (this.data1[val].code.indexOf('material') !== -1) { + 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) + 65) + } + } } }, finishWriteEdit(data) { @@ -405,14 +423,14 @@ export default { if (isNaN(parseInt(endNumber))) { return } - // for (const val in this.data2) { - // if (this.data2[val].code.indexOf('to_target') !== -1) { - // this.data2[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 2) - // } - // if (this.data2[val].code.indexOf('to_task') !== -1) { - // this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 6) - // } - // } + for (const val in this.data2) { + if (this.data2[val].code.indexOf('to_target') !== -1) { + this.data2[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 2) + } + if (this.data2[val].code.indexOf('to_task') !== -1) { + this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 6) + } + } } }, changeOpc(val) { diff --git a/acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_package_site.vue b/acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_package_site.vue index 0479746..895ba8d 100644 --- a/acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_package_site.vue +++ b/acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_package_site.vue @@ -358,7 +358,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 + '.W64' + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 65) } } } @@ -384,7 +384,7 @@ 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_isPackage') !== -1) { + if (this.data2[val].code.indexOf('to_is_package') !== -1) { this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 8) } } diff --git a/acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_palletizing_manipulator_site.vue b/acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_palletizing_manipulator_site.vue index 0cda84d..3867326 100644 --- a/acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_palletizing_manipulator_site.vue +++ b/acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_palletizing_manipulator_site.vue @@ -495,17 +495,203 @@ export default { if (isNaN(parseInt(endNumber))) { return } - // for (const val in this.data1) { - // if (this.data1[val].code.indexOf('move') !== -1) { - // this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 1) - // } - // if (this.data1[val].code.indexOf('error') !== -1) { - // this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 5) - // } - // if (this.data1[val].code.indexOf('task') !== -1) { - // this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 7) - // } - // } + for (const val in this.data1) { + if (this.data1[val].code.indexOf('move') !== -1) { + this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 1) + } + if (this.data1[val].code.indexOf('heartbeat') !== -1) { + this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) - 1) + } + if (this.data1[val].code.indexOf('action') !== -1) { + this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 2) + } + if (this.data1[val].code.indexOf('ioaction') !== -1) { + 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) + } + if (this.data1[val].code.indexOf('task') !== -1) { + this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 5) + } + if (this.data1[val].code.indexOf('weight') !== -1) { + this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 9) + } + if (this.data1[val].code.indexOf('material') !== -1) { + 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) + 65) + } + if (this.data1[val].code.indexOf('encoder_qty') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 67) + } + if (this.data1[val].code.indexOf('unqualified_qty') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 69) + } + if (this.data1[val].code.indexOf('product_code') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 71) + } + if (this.data1[val].code.indexOf('AlongSide') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 73) + } + if (this.data1[val].code.indexOf('BshortSide') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 75) + } + if (this.data1[val].code.indexOf('Htrapezoidal') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 77) + } + if (this.data1[val].code.indexOf('Wthickness') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 79) + } + if (this.data1[val].code.indexOf('tray_qty') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 81) + } + if (this.data1[val].code.indexOf('tray_high') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 83) + } + if (this.data1[val].code.indexOf('crib_category') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 85) + } + if (this.data1[val].code.indexOf('palletX1_line') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 87) + } + if (this.data1[val].code.indexOf('palletY1_row') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 89) + } + if (this.data1[val].code.indexOf('palletA1_angle') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 91) + } + if (this.data1[val].code.indexOf('palletX2_line') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 93) + } + if (this.data1[val].code.indexOf('palletY2_row') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 95) + } + if (this.data1[val].code.indexOf('palletA2_angle') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 97) + } + if (this.data1[val].code.indexOf('palletX3_line') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 99) + } + if (this.data1[val].code.indexOf('palletY3_row') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 101) + } + if (this.data1[val].code.indexOf('palletA3_angle') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 103) + } + if (this.data1[val].code.indexOf('pressCribX1_line') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 105) + } + if (this.data1[val].code.indexOf('pressCribY1_row') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 107) + } + if (this.data1[val].code.indexOf('pressCribA1_angle') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 109) + } + if (this.data1[val].code.indexOf('pressCribX2_line') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 111) + } + if (this.data1[val].code.indexOf('pressCribY2_row') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 113) + } + if (this.data1[val].code.indexOf('pressCribA2_angle') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 115) + } + if (this.data1[val].code.indexOf('pressCribX3_line') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 117) + } + if (this.data1[val].code.indexOf('pressCribY3_row') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 119) + } + if (this.data1[val].code.indexOf('pressCribA3_angle') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 121) + } + if (this.data1[val].code.indexOf('Zoffset') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 123) + } + if (this.data1[val].code.indexOf('pallet_layerQty') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 125) + } + if (this.data1[val].code.indexOf('pressCrib_layerQty') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 127) + } + if (this.data1[val].code.indexOf('codeLayerX1_interval') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 129) + } + if (this.data1[val].code.indexOf('codeLayerY1_interval') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 131) + } + if (this.data1[val].code.indexOf('codeLayerX2_interval') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 133) + } + if (this.data1[val].code.indexOf('codeLayerY2_interval') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 135) + } + if (this.data1[val].code.indexOf('codeLayerX3_interval') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 137) + } + if (this.data1[val].code.indexOf('codeLayerY3_interval') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 139) + } + if (this.data1[val].code.indexOf('codeLayerX1_offset') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 141) + } + if (this.data1[val].code.indexOf('codeLayerY1_offset') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 143) + } + if (this.data1[val].code.indexOf('codeLayerX2_offset') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 145) + } + if (this.data1[val].code.indexOf('codeLayerY2_offset') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 147) + } + if (this.data1[val].code.indexOf('codeLayerX3_offset') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 149) + } + if (this.data1[val].code.indexOf('codeLayerY3_offset') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 151) + } + if (this.data1[val].code.indexOf('pressLayerX1_interval') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 153) + } + if (this.data1[val].code.indexOf('pressLayerY1_interval') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 155) + } + if (this.data1[val].code.indexOf('pressLayerX2_interval') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 157) + } + if (this.data1[val].code.indexOf('pressLayerY2_interval') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 159) + } + if (this.data1[val].code.indexOf('pressLayerX3_interval') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 161) + } + if (this.data1[val].code.indexOf('pressLayerY3_interval') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 163) + } + if (this.data1[val].code.indexOf('pressLayerX1_offset') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 165) + } + if (this.data1[val].code.indexOf('pressLayerY1_offset') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 167) + } + if (this.data1[val].code.indexOf('pressLayerX2_offset') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 169) + } + if (this.data1[val].code.indexOf('pressLayerX3_offset') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 171) + } + if (this.data1[val].code.indexOf('pressLayerX3_offset') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 173) + } + if (this.data1[val].code.indexOf('pressLayerY3_offset') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 175) + } + if (this.data1[val].code.indexOf('tool_coordinate') !== -1) { + this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 177) + } + } } }, finishWriteEdit(data) { @@ -522,14 +708,176 @@ export default { if (isNaN(parseInt(endNumber))) { return } - // for (const val in this.data2) { - // if (this.data2[val].code.indexOf('to_target') !== -1) { - // this.data2[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 2) - // } - // if (this.data2[val].code.indexOf('to_task') !== -1) { - // this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 6) - // } - // } + for (const val in this.data2) { + if (this.data2[val].code.indexOf('to_target') !== -1) { + this.data2[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber)) + } + if (this.data2[val].code.indexOf('to_target') !== -1) { + this.data2[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 2) + } + 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_product_code') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 8) + } + if (this.data2[val].code.indexOf('to_AlongSide') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 10) + } + if (this.data2[val].code.indexOf('to_BshortSide') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 12) + } + if (this.data2[val].code.indexOf('to_Htrapezoidal') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 14) + } + if (this.data2[val].code.indexOf('to_Wthickness') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 16) + } + if (this.data2[val].code.indexOf('to_tray_qty') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 18) + } + if (this.data2[val].code.indexOf('to_tray_high') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) +20) + } + if (this.data2[val].code.indexOf('to_crib_category') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 22) + } + if (this.data2[val].code.indexOf('to_palletX1_line') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 24) + } + if (this.data2[val].code.indexOf('to_palletY1_row') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 26) + } + if (this.data2[val].code.indexOf('to_palletA1_angle') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 28) + } + if (this.data2[val].code.indexOf('to_palletX2_line') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 30) + } + if (this.data2[val].code.indexOf('to_palletY2_row') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 32) + } + if (this.data2[val].code.indexOf('to_palletA2_angle') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 34) + } + if (this.data2[val].code.indexOf('to_palletX3_line') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 36) + } + if (this.data2[val].code.indexOf('to_palletY3_row') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 38) + } + if (this.data2[val].code.indexOf('to_palletA3_angle') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 40) + } + if (this.data2[val].code.indexOf('to_pressCribX1_line') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 42) + } + if (this.data2[val].code.indexOf('to_pressCribY1_row') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 44) + } + if (this.data2[val].code.indexOf('to_pressCribA1_angle') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 46) + } + if (this.data2[val].code.indexOf('to_pressCribX2_line') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 48) + } + if (this.data2[val].code.indexOf('to_pressCribY2_row') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 50) + } + if (this.data2[val].code.indexOf('to_pressCribA2_angle') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 52) + } + if (this.data2[val].code.indexOf('to_pressCribX3_line') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 54) + } + if (this.data2[val].code.indexOf('to_pressCribY3_row') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 56) + } + if (this.data2[val].code.indexOf('to_pressCribA3_angle') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 60) + } + if (this.data2[val].code.indexOf('to_pallet_layerQty') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 62) + } + if (this.data2[val].code.indexOf('to_pressCrib_layerQty') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 64) + } + if (this.data2[val].code.indexOf('to_codeLayerX1_interval') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 66) + } + if (this.data2[val].code.indexOf('to_codeLayerY1_interval') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 68) + } + if (this.data2[val].code.indexOf('to_codeLayerX2_interval') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 70) + } + if (this.data2[val].code.indexOf('to_codeLayerY2_interval') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 72) + } + if (this.data2[val].code.indexOf('to_codeLayerX3_interval') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 74) + } + if (this.data2[val].code.indexOf('to_codeLayerY3_interval') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 76) + } + if (this.data2[val].code.indexOf('to_codeLayerX1_offset') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 78) + } + if (this.data2[val].code.indexOf('to_codeLayerY1_offset') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 80) + } + if (this.data2[val].code.indexOf('to_codeLayerX2_offset') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 82) + } + if (this.data2[val].code.indexOf('to_codeLayerY2_offset') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 84) + } + if (this.data2[val].code.indexOf('to_codeLayerX3_offset') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 86) + } + if (this.data2[val].code.indexOf('to_codeLayerY3_offset') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 88) + } + if (this.data2[val].code.indexOf('to_pressLayerX1_interval') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 90) + } + if (this.data2[val].code.indexOf('to_pressLayerY1_interval') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 92) + } + if (this.data2[val].code.indexOf('to_pressLayerX2_interval') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 94) + } + if (this.data2[val].code.indexOf('to_pressLayerY2_interval') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 96) + } + if (this.data2[val].code.indexOf('to_pressLayerX3_interval') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 98) + } + if (this.data2[val].code.indexOf('to_pressLayerY3_interval') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 100) + } + if (this.data2[val].code.indexOf('to_pressLayerX1_offset') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 102) + } + if (this.data2[val].code.indexOf('to_pressLayerY1_offset') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 104) + } + if (this.data2[val].code.indexOf('to_pressLayerX2_offset') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 106) + } + if (this.data2[val].code.indexOf('to_pressLayerY2_offset') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 108) + } + if (this.data2[val].code.indexOf('to_pressLayerX3_offset') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 110) + } + if (this.data2[val].code.indexOf('to_pressLayerY3_offset') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 112) + } + if (this.data2[val].code.indexOf('to_tool_coordinate') !== -1) { + this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 114) + } + } } }, changeOpc(val) {