From 8fb99f4e9bfd7ff59bd5ac0d1c4aae4e73d29345 Mon Sep 17 00:00:00 2001 From: loujf Date: Thu, 1 Sep 2022 15:34:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../agv/server/impl/MagicAgvServiceImpl.java | 40 ++- .../lnsh_Laminating_machine/ItemProtocol.java | 6 +- .../LnshLaminatingMachineDefination.java | 2 +- .../LnshLaminatingMachineDeviceDriver.java | 46 ++- .../lnsh/lnsh_one_rgv/ItemProtocol.java | 34 +-- .../lnsh_one_rgv/LnshOneRGVDefination.java | 26 +- .../ItemProtocol.java | 10 +- ...nshPackagePalletManipulatorDefination.java | 8 +- .../ItemProtocol.java | 16 +- ...hPalletizingManipulatorSiteDefination.java | 10 +- .../lnsh/lnsh_rgv/ItemProtocol.java | 56 ++-- .../lnsh/lnsh_rgv/LnshRGVDefination.java | 40 +-- .../lnsh_split_manipulator/ItemProtocol.java | 276 +++++++++--------- .../LnshSplitManipulatorDefination.java | 150 +++++----- .../lnsh/lnsh_station/ItemProtocol.java | 8 +- .../lnsh_station/LnshStationDefination.java | 8 +- .../wms/service/impl/WmsToAcsServiceImpl.java | 3 +- .../quartz/task/QueryMagicAgvTaskStatus.java | 4 +- .../driver/lnsh/lnsh_Laminating_machine.vue | 6 +- .../lnsh_palletizing_manipulator_site.vue | 16 +- .../acs/device/driver/lnsh/lnsh_station.vue | 8 +- 21 files changed, 423 insertions(+), 350 deletions(-) diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java index 754637b..5081029 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java @@ -12,6 +12,7 @@ import org.nl.acs.agv.server.MagicAgvService; import org.nl.acs.agv.server.dto.AgvDto; import org.nl.acs.config.AcsConfig; import org.nl.acs.config.server.AcsConfigService; +import org.nl.acs.device_driver.lnsh.lnsh_Laminating_machine.LnshLaminatingMachineDeviceDriver; import org.nl.acs.device_driver.lnsh.lnsh_station.LnshStationDeviceDriver; import org.nl.acs.device_driver.special_ordinary_site.SpecialOrdinarySiteDeviceDriver; import org.nl.acs.device_driver.standard_autodoor.StandardAutodoorDeviceDriver; @@ -87,7 +88,6 @@ public class MagicAgvServiceImpl implements MagicAgvService { .timeout(20000)//超时，毫秒 .execute(); System.out.println("查询agv指令数据:" + result.body()); - return result; } else { return null; @@ -420,6 +420,7 @@ public class MagicAgvServiceImpl implements MagicAgvService { StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver; SpecialOrdinarySiteDeviceDriver specialOrdinarySiteDeviceDriver; LnshStationDeviceDriver lnshStationDeviceDriver; + LnshLaminatingMachineDeviceDriver lnshLaminatingMachineDeviceDriver; //请求进入 if ("onEntry".equals(type)) { @@ -440,7 +441,7 @@ public class MagicAgvServiceImpl implements MagicAgvService { } } } - //晟华工位模板 + //嘉耐工位模板 if (addressdevice.getDeviceDriver() instanceof LnshStationDeviceDriver) { lnshStationDeviceDriver = (LnshStationDeviceDriver) addressdevice.getDeviceDriver(); //请求取货 @@ -475,6 +476,41 @@ public class MagicAgvServiceImpl implements MagicAgvService { } } } + //嘉耐缓存货架 + if (addressdevice.getDeviceDriver() instanceof LnshLaminatingMachineDeviceDriver) { + lnshLaminatingMachineDeviceDriver = (LnshLaminatingMachineDeviceDriver) addressdevice.getDeviceDriver(); + //请求取货 + if ("Load".equals(action)) { + if (lnshLaminatingMachineDeviceDriver.getMode() == 2 && lnshLaminatingMachineDeviceDriver.getMove() > 0) { + inst.setExecute_status("1"); + lnshLaminatingMachineDeviceDriver.setFlag(1); + is_feedback = true; + } + //请求放货 + } else if ("Unload".equals(action)) { + if (lnshLaminatingMachineDeviceDriver.getMode() == 2 && lnshLaminatingMachineDeviceDriver.getMove() == 0) { + inst.setExecute_status("3"); + lnshLaminatingMachineDeviceDriver.setFlag(3); + is_feedback = true; + } + } else if ("NOP".equals(action)) { + //调用LMS接口 + if(StrUtil.isNotEmpty(lnshLaminatingMachineDeviceDriver.getBarcode())){ + JSONObject json = new JSONObject(); + json.put("device_code",address); + json.put("type","5"); + json.put("vehicle_code",lnshLaminatingMachineDeviceDriver.getBarcode()); + HttpResponse result = acsToWmsService.inKiln(json); + if (ObjectUtil.isNotEmpty(result)) { + JSONObject jsonObject = JSONObject.parseObject(result.body()); + if (result.getStatus() == 200 && StrUtil.equals(jsonObject.get("status").toString(),"200")) { + inst.setExecute_status("3"); + is_feedback = true; + } + } + } + } + } if (addressdevice.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) addressdevice.getDeviceDriver(); //请求取货 diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/ItemProtocol.java index 7d03c45..a4afc5f 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/ItemProtocol.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/ItemProtocol.java @@ -111,8 +111,8 @@ public class ItemProtocol { list.add(new ItemDto(item_move, "光电开关信号", "DB1.B2")); list.add(new ItemDto(item_container_type, "托盘类型", "DB1.B3")); list.add(new ItemDto(item_error, "报警信号", "DB1.B4")); - list.add(new ItemDto(item_task, "任务号", "DB1.D5")); - list.add(new ItemDto(item_barcode, "条码", "DB1.S9")); + list.add(new ItemDto(item_task, "任务号", "DB1.D6")); + list.add(new ItemDto(item_barcode, "条码", "DB1.STRING10.50")); return list; } @@ -121,7 +121,7 @@ public class ItemProtocol { list.add(new ItemDto(item_to_command, "作业命令", "DB2.W0", Boolean.valueOf(true))); list.add(new ItemDto(item_to_target, "目标站", "DB2.W2")); list.add(new ItemDto(item_to_task, "任务号", "DB2.D4")); - list.add(new ItemDto(item_to_barcode, "条码", "DB2.S8")); + list.add(new ItemDto(item_to_barcode, "条码", "DB2.STRING8.50")); return list; } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDefination.java index 1d82450..de128de 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDefination.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDefination.java @@ -64,7 +64,7 @@ public class LnshLaminatingMachineDefination implements OpcDeviceDriverDefinatio list.add(new ItemDto(ItemProtocol.item_container_type, "托盘类型", "DB1.B3")); list.add(new ItemDto(ItemProtocol.item_error, "报警信号", "DB1.B4")); list.add(new ItemDto(ItemProtocol.item_task, "任务号", "DB1.D5")); - list.add(new ItemDto(ItemProtocol.item_barcode, "条码", "DB1.S9")); + list.add(new ItemDto(ItemProtocol.item_barcode, "条码", "DB1.STRING9.50")); return list; } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDeviceDriver.java index 495f8a6..e4c3a37 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDeviceDriver.java @@ -195,12 +195,18 @@ public class LnshLaminatingMachineDeviceDriver extends AbstractOpcDeviceDriver i outKiln(); } break; -// case 6: -// //入货架扫码 -// if (!requireSucess && this.move != 0 && StrUtil.isNotEmpty(this.barcode)) { -// intoKiln(); -// } -// break; + case 6: + //入货架扫码 + if (!requireSucess && this.move != 0 && StrUtil.isNotEmpty(this.barcode)) { + intoKiln(); + } + break; + case 7: + //申请输送线RGV对接位入窑 + if (!requireSucess && this.move == 0) { + putStorage(); + } + break; } switch (flag) { @@ -261,6 +267,34 @@ public class LnshLaminatingMachineDeviceDriver extends AbstractOpcDeviceDriver i } } + /** + * 申请入库 + * + * @param + */ + public synchronized boolean putStorage() { + Date date = new Date(); + if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { + log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); + return false; + } else { + this.instruction_require_time = date; + JSONObject json = new JSONObject(); + json.put("device_code",this.device_code); + json.put("type","5"); + json.put("vehicle_code",barcode); + HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json); + if (ObjectUtil.isNotEmpty(result)) { + JSONObject jsonObject = JSONObject.parseObject(result.body()); + if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) { + this.writing(1); + this.setRequireSucess(true); + } + } + return true; + } + } + /** * 入货架扫码 * diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_one_rgv/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_one_rgv/ItemProtocol.java index afbcf08..e78c329 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_one_rgv/ItemProtocol.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_one_rgv/ItemProtocol.java @@ -136,28 +136,28 @@ 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_move_1, "前工位光电信号", "DB1.B3")); - list.add(new ItemDto(item_action_1, "前工位动作信号", "DB1.B4")); - list.add(new ItemDto(item_walk_y, "行走列", "DB1.B5")); - list.add(new ItemDto(item_error, "车体报警", "DB1.B6")); - list.add(new ItemDto(item_task1, "前工位任务号", "DB1.D8")); - list.add(new ItemDto(item_task_qty, "当前任务数量", "DB1.D12")); - list.add(new ItemDto(item_finishTask_qty, "完成任务数量", "DB1.D16")); - list.add(new ItemDto(item_batch, "批次", "DB1.D20")); - list.add(new ItemDto(item_qty, "数量", "DB1.D24")); - list.add(new ItemDto(item_specifications, "规格", "DB1.S28")); + list.add(new ItemDto(item_heartbeat, "心跳", "DB50.B0")); + list.add(new ItemDto(item_mode, "工作状态", "DB50.B1", Boolean.valueOf(true))); + list.add(new ItemDto(item_status, "设备状态", "DB50.B2")); + list.add(new ItemDto(item_move_1, "前工位光电信号", "DB50.B3")); + list.add(new ItemDto(item_action_1, "前工位动作信号", "DB50.B4")); + list.add(new ItemDto(item_walk_y, "行走列", "DB50.B5")); + list.add(new ItemDto(item_error, "车体报警", "DB50.B6")); + list.add(new ItemDto(item_task1, "前工位任务号", "DB50.D8")); + list.add(new ItemDto(item_task_qty, "当前任务数量", "DB50.D12")); + list.add(new ItemDto(item_finishTask_qty, "完成任务数量", "DB50.D16")); + list.add(new ItemDto(item_batch, "批次", "DB50.D20")); + list.add(new ItemDto(item_qty, "数量", "DB50.D24")); + list.add(new ItemDto(item_specifications, "规格", "DB50.STRING28.50")); return list; } public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command1, "前工位下发命令", "DB2.W0")); - list.add(new ItemDto(item_to_onset1, "下发起始站", "DB2.W2")); - list.add(new ItemDto(item_to_target1, "下发目标站", "DB2.W4")); - list.add(new ItemDto(item_to_task1, "下发任务号", "DB2.D6")); + list.add(new ItemDto(item_to_command1, "前工位下发命令", "DB51.W0")); + list.add(new ItemDto(item_to_onset1, "下发起始站", "DB51.W2")); + list.add(new ItemDto(item_to_target1, "下发目标站", "DB51.W4")); + list.add(new ItemDto(item_to_task1, "下发任务号", "DB51.D6")); return list; } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_one_rgv/LnshOneRGVDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_one_rgv/LnshOneRGVDefination.java index dda9711..9312312 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_one_rgv/LnshOneRGVDefination.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_one_rgv/LnshOneRGVDefination.java @@ -57,19 +57,19 @@ public class LnshOneRGVDefination implements OpcDeviceDriverDefination { public static List getReadableItemDtos2() { ArrayList list = new ArrayList(); - list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB1.B0")); - list.add(new ItemDto(ItemProtocol.item_mode, "工作状态", "DB1.B1", Boolean.valueOf(true))); - list.add(new ItemDto(ItemProtocol.item_status, "设备状态", "DB1.B2")); - list.add(new ItemDto(ItemProtocol.item_move_1, "前工位光电信号", "DB1.B3")); - list.add(new ItemDto(ItemProtocol.item_action_1, "前工位动作信号", "DB1.B4")); - list.add(new ItemDto(ItemProtocol.item_walk_y, "行走列", "DB1.B5")); - list.add(new ItemDto(ItemProtocol.item_error, "车体报警", "DB1.B6")); - list.add(new ItemDto(ItemProtocol.item_task1, "前工位任务号", "DB1.D8")); - list.add(new ItemDto(ItemProtocol.item_task_qty, "当前任务数量", "DB1.D12")); - list.add(new ItemDto(ItemProtocol.item_finishTask_qty, "完成任务数量", "DB1.D16")); - list.add(new ItemDto(ItemProtocol.item_batch, "批次", "DB1.D20")); - list.add(new ItemDto(ItemProtocol.item_qty, "数量", "DB1.D24")); - list.add(new ItemDto(ItemProtocol.item_specifications, "规格", "DB1.S28")); + list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB50.B0")); + list.add(new ItemDto(ItemProtocol.item_mode, "工作状态", "DB50.B1", Boolean.valueOf(true))); + list.add(new ItemDto(ItemProtocol.item_status, "设备状态", "DB50.B2")); + list.add(new ItemDto(ItemProtocol.item_move_1, "前工位光电信号", "DB50.B3")); + list.add(new ItemDto(ItemProtocol.item_action_1, "前工位动作信号", "DB50.B4")); + list.add(new ItemDto(ItemProtocol.item_walk_y, "行走列", "DB50.B5")); + list.add(new ItemDto(ItemProtocol.item_error, "车体报警", "DB50.B6")); + list.add(new ItemDto(ItemProtocol.item_task1, "前工位任务号", "DB50.D8")); + list.add(new ItemDto(ItemProtocol.item_task_qty, "当前任务数量", "DB50.D12")); + list.add(new ItemDto(ItemProtocol.item_finishTask_qty, "完成任务数量", "DB50.D16")); + list.add(new ItemDto(ItemProtocol.item_batch, "批次", "DB50.D20")); + list.add(new ItemDto(ItemProtocol.item_qty, "数量", "DB50.D24")); + list.add(new ItemDto(ItemProtocol.item_specifications, "规格", "DB50.STRING28.50")); return list; } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/ItemProtocol.java index 24bc340..4e0b8d4 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/ItemProtocol.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/ItemProtocol.java @@ -827,16 +827,16 @@ public class ItemProtocol { list.add(new ItemDto(item_error, "故障代码", "DB1.B3")); list.add(new ItemDto(item_onoff_status, "开关机状态", "DB1.B4")); list.add(new ItemDto(item_putStation, "当前码盘工位", "DB1.D6")); - list.add(new ItemDto(item_barcode, "当前码盘工位条码", "DB1.S10")); - list.add(new ItemDto(item_material, "码盘工位当前物料", "DB1.S266")); - list.add(new ItemDto(item_specifications, "规格", "DB1.S522")); + list.add(new ItemDto(item_barcode, "当前码盘工位条码", "DB1.STRING10.50")); + list.add(new ItemDto(item_material, "码盘工位当前物料", "DB1.STRING266.50")); + list.add(new ItemDto(item_specifications, "规格", "DB1.STRING522.50")); list.add(new ItemDto(item_batch, "批次", "DB1.D778")); list.add(new ItemDto(item_qty, "数量", "DB1.D782")); list.add(new ItemDto(item_open_time, "开机时间", "DB1.D786")); list.add(new ItemDto(item_standby_time, "待机时间", "DB1.D790")); list.add(new ItemDto(item_production_time, "生产时间", "DB1.D794")); list.add(new ItemDto(item_error_time, "故障时间", "DB1.D798")); - list.add(new ItemDto(item_order_No, "工单号", "DB1.S802")); + list.add(new ItemDto(item_order_No, "工单号", "DB1.STRING802.50")); list.add(new ItemDto(item_product_code, "产品编号", "DB1.W1058")); list.add(new ItemDto(item_AlongSide, "A长边", "DB1.W1060")); @@ -913,7 +913,7 @@ public class ItemProtocol { list.add(new ItemDto(item_to_allow_pallet_qty, "允许码垛数量", "DB2.W4")); list.add(new ItemDto(item_to_material_type, "托盘类型", "DB2.D6")); list.add(new ItemDto(item_to_material_code, "下发物料编号", "DB2.D10")); - list.add(new ItemDto(item_to_order_No, "工单号", "DB2.S14")); + list.add(new ItemDto(item_to_order_No, "工单号", "DB2.STRING14.50")); list.add(new ItemDto(item_to_product_code, "产品编号", "DB2.W270")); list.add(new ItemDto(item_to_AlongSide, "A长边", "DB2.W272")); diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDefination.java index 468cae3..c827671 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDefination.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDefination.java @@ -63,16 +63,16 @@ public class LnshPackagePalletManipulatorDefination implements OpcDeviceDriverDe list.add(new ItemDto(ItemProtocol.item_error, "故障代码", "DB1.B3")); list.add(new ItemDto(ItemProtocol.item_onoff_status, "开关机状态", "DB1.B4")); list.add(new ItemDto(ItemProtocol.item_putStation, "当前码盘工位", "DB1.D6")); - list.add(new ItemDto(ItemProtocol.item_barcode, "当前码盘工位条码", "DB1.S10")); - list.add(new ItemDto(ItemProtocol.item_material, "码盘工位当前物料", "DB1.S266")); - list.add(new ItemDto(ItemProtocol.item_specifications, "规格", "DB1.S522")); + list.add(new ItemDto(ItemProtocol.item_barcode, "当前码盘工位条码", "DB1.STRING10.50")); + list.add(new ItemDto(ItemProtocol.item_material, "码盘工位当前物料", "DB1.STRING266.50")); + list.add(new ItemDto(ItemProtocol.item_specifications, "规格", "DB1.STRING522.50")); list.add(new ItemDto(ItemProtocol.item_batch, "批次", "DB1.D778")); list.add(new ItemDto(ItemProtocol.item_qty, "数量", "DB1.D782")); list.add(new ItemDto(ItemProtocol.item_open_time, "开机时间", "DB1.D786")); list.add(new ItemDto(ItemProtocol.item_standby_time, "待机时间", "DB1.D790")); list.add(new ItemDto(ItemProtocol.item_production_time, "生产时间", "DB1.D794")); list.add(new ItemDto(ItemProtocol.item_error_time, "故障时间", "DB1.D798")); - list.add(new ItemDto(ItemProtocol.item_order_No, "工单号", "DB1.S802")); + list.add(new ItemDto(ItemProtocol.item_order_No, "工单号", "DB1.STRING802.50")); list.add(new ItemDto(ItemProtocol.item_product_code, "产品编号", "DB1.W1058")); list.add(new ItemDto(ItemProtocol.item_AlongSide, "A长边", "DB1.W1060")); diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/ItemProtocol.java index 11bf34f..91d8cb8 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/ItemProtocol.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/ItemProtocol.java @@ -221,18 +221,18 @@ public class ItemProtocol { list.add(new ItemDto(item_task, "任务号", "DB112.D6")); list.add(new ItemDto(item_weight, "重量", "DB112.D10")); list.add(new ItemDto(item_batch, "批次", "DB112.D14")); - list.add(new ItemDto(item_specifications, "规格", "DB112.S18")); - list.add(new ItemDto(item_material, "物料", "DB112.S274")); - list.add(new ItemDto(item_barcode, "条码", "DB112.S530")); + list.add(new ItemDto(item_specifications, "规格", "DB112.STRING18.50")); + list.add(new ItemDto(item_material, "物料", "DB112.STRING274.50")); + list.add(new ItemDto(item_barcode, "条码", "DB112.STRING530.50")); list.add(new ItemDto(item_AlongSide, "A长边", "DB112.W786")); list.add(new ItemDto(item_BshortSide, "B短边", "DB112.W788")); list.add(new ItemDto(item_Htrapezoidal, "H梯形高", "DB112.W790")); list.add(new ItemDto(item_Wthickness, "W厚度", "DB112.W792")); - list.add(new ItemDto(item_status, "设备状态", "DB112.B795")); + list.add(new ItemDto(item_status, "设备状态", "DB112.B794")); list.add(new ItemDto(item_unqualified_qty, "不合格数量", "DB112.D796")); list.add(new ItemDto(item_encoder_qty, "码盘位当前码盘数量", "DB112.D800")); list.add(new ItemDto(item_order_qty, "当前工单数量", "DB112.D804")); - list.add(new ItemDto(item_order_No, "工单号", "DB112.S808")); + list.add(new ItemDto(item_order_No, "工单号", "DB112.STRING808.50")); return list; } @@ -241,14 +241,14 @@ public class ItemProtocol { 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.S8")); - list.add(new ItemDto(item_to_error, "故障代码", "DB113.B265")); + list.add(new ItemDto(item_to_barcode, "条码", "DB113.STRING8.50")); + list.add(new ItemDto(item_to_error, "故障代码", "DB113.B264")); list.add(new ItemDto(item_to_allow_pallet_qty, "允许码垛数量", "DB113.W266")); list.add(new ItemDto(item_to_material_type, "托盘类型", "DB113.D268")); list.add(new ItemDto(item_to_material_code, "下发物料编号", "DB113.D272")); list.add(new ItemDto(item_to_order_qty, "下发工单数量", "DB113.D276")); list.add(new ItemDto(item_to_product_code, "产品编号", "DB113.D280")); - list.add(new ItemDto(item_to_order_No, "工单号", "DB113.S284")); + list.add(new ItemDto(item_to_order_No, "工单号", "DB113.STRING284.50")); return list; } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDefination.java index 7d74837..8024944 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDefination.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDefination.java @@ -66,18 +66,18 @@ public class LnshPalletizingManipulatorSiteDefination implements OpcDeviceDriver list.add(new ItemDto(ItemProtocol.item_task, "任务号", "DB112.D6")); list.add(new ItemDto(ItemProtocol.item_weight, "重量", "DB112.D10")); list.add(new ItemDto(ItemProtocol.item_batch, "批次", "DB112.D14")); - list.add(new ItemDto(ItemProtocol.item_specifications, "规格", "DB112.S18")); - list.add(new ItemDto(ItemProtocol.item_material, "物料", "DB112.S274")); - list.add(new ItemDto(ItemProtocol.item_barcode, "条码", "DB112.S530")); + list.add(new ItemDto(ItemProtocol.item_specifications, "规格", "DB112.STRING18.50")); + list.add(new ItemDto(ItemProtocol.item_material, "物料", "DB112.STRING274.50")); + list.add(new ItemDto(ItemProtocol.item_barcode, "条码", "DB112.STRING530.50")); list.add(new ItemDto(ItemProtocol.item_AlongSide, "A长边", "DB112.W786")); list.add(new ItemDto(ItemProtocol.item_BshortSide, "B短边", "DB112.W788")); list.add(new ItemDto(ItemProtocol.item_Htrapezoidal, "H梯形高", "DB112.W790")); list.add(new ItemDto(ItemProtocol.item_Wthickness, "W厚度", "DB112.W792")); - list.add(new ItemDto(ItemProtocol.item_status, "设备状态", "DB112.B795")); + list.add(new ItemDto(ItemProtocol.item_status, "设备状态", "DB112.B794")); list.add(new ItemDto(ItemProtocol.item_unqualified_qty, "不合格数量", "DB112.D796")); list.add(new ItemDto(ItemProtocol.item_encoder_qty, "码盘位当前码盘数量", "DB112.D800")); list.add(new ItemDto(ItemProtocol.item_order_qty, "当前工单数量", "DB112.D804")); - list.add(new ItemDto(ItemProtocol.item_order_No, "工单号", "DB112.S808")); + list.add(new ItemDto(ItemProtocol.item_order_No, "工单号", "DB112.STRING808.50")); return list; } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/ItemProtocol.java index edcbd57..9ef77ec 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/ItemProtocol.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/ItemProtocol.java @@ -191,39 +191,39 @@ 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_move_1, "前工位光电信号", "DB1.B3")); - list.add(new ItemDto(item_move_2, "后工位光电信号", "DB1.B4")); - list.add(new ItemDto(item_action_1, "前工位动作信号", "DB1.B5")); - list.add(new ItemDto(item_action_2, "后工位动作信号", "DB1.B6")); - list.add(new ItemDto(item_walk_y, "行走列", "DB1.B7")); - list.add(new ItemDto(item_error, "车体报警", "DB1.B8")); - list.add(new ItemDto(item_task1, "前工位任务号", "DB1.D10")); - list.add(new ItemDto(item_task2, "后工位任务号", "DB1.D14")); - list.add(new ItemDto(item_open_time, "开机时间", "DB1.D18")); - list.add(new ItemDto(item_standby_time, "待机时间", "DB1.D22")); - list.add(new ItemDto(item_production_time, "生产时间", "DB1.D26")); - list.add(new ItemDto(item_error_time, "故障时间", "DB1.D30")); - list.add(new ItemDto(item_task_qty, "当前任务数量", "DB1.D34")); - list.add(new ItemDto(item_finishTask_qty, "完成任务数量", "DB1.D38")); - list.add(new ItemDto(item_batch, "批次", "DB1.D42")); - list.add(new ItemDto(item_qty, "数量", "DB1.D46")); - list.add(new ItemDto(item_specifications, "规格", "DB1.S50")); + list.add(new ItemDto(item_heartbeat, "心跳", "DB50.B0")); + list.add(new ItemDto(item_mode, "工作状态", "DB50.B1", Boolean.valueOf(true))); + list.add(new ItemDto(item_status, "设备状态", "DB50.B2")); + list.add(new ItemDto(item_move_1, "前工位光电信号", "DB50.B3")); + list.add(new ItemDto(item_move_2, "后工位光电信号", "DB50.B4")); + list.add(new ItemDto(item_action_1, "前工位动作信号", "DB50.B5")); + list.add(new ItemDto(item_action_2, "后工位动作信号", "DB50.B6")); + list.add(new ItemDto(item_walk_y, "行走列", "DB50.B7")); + list.add(new ItemDto(item_error, "车体报警", "DB50.B8")); + list.add(new ItemDto(item_task1, "前工位任务号", "DB50.D10")); + list.add(new ItemDto(item_task2, "后工位任务号", "DB50.D14")); + list.add(new ItemDto(item_open_time, "开机时间", "DB50.D18")); + list.add(new ItemDto(item_standby_time, "待机时间", "DB50.D22")); + list.add(new ItemDto(item_production_time, "生产时间", "DB50.D26")); + list.add(new ItemDto(item_error_time, "故障时间", "DB50.D30")); + list.add(new ItemDto(item_task_qty, "当前任务数量", "DB50.D34")); + list.add(new ItemDto(item_finishTask_qty, "完成任务数量", "DB50.D38")); + list.add(new ItemDto(item_batch, "批次", "DB50.D42")); + list.add(new ItemDto(item_qty, "数量", "DB50.D46")); + list.add(new ItemDto(item_specifications, "规格", "DB50.STRING50.50")); return list; } public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command1, "前工位下发命令", "DB2.W0")); - list.add(new ItemDto(item_to_onset1, "下发起始站", "DB2.W2")); - list.add(new ItemDto(item_to_target1, "下发目标站", "DB2.W4")); - list.add(new ItemDto(item_to_task1, "下发任务号", "DB2.D6")); - list.add(new ItemDto(item_to_command2, "后工位下发命令", "DB2.W10")); - list.add(new ItemDto(item_to_onset2, "下发起始站", "DB2.W12")); - list.add(new ItemDto(item_to_target2, "下发目标站", "DB2.W14")); - list.add(new ItemDto(item_to_task2, "下发任务号2", "DB2.D16")); + list.add(new ItemDto(item_to_command1, "前工位下发命令", "DB51.W0")); + list.add(new ItemDto(item_to_onset1, "下发起始站", "DB51.W2")); + list.add(new ItemDto(item_to_target1, "下发目标站", "DB51.W4")); + list.add(new ItemDto(item_to_task1, "下发任务号", "DB51.D6")); + list.add(new ItemDto(item_to_command2, "后工位下发命令", "DB51.W10")); + list.add(new ItemDto(item_to_onset2, "下发起始站", "DB51.W12")); + list.add(new ItemDto(item_to_target2, "下发目标站", "DB51.W14")); + list.add(new ItemDto(item_to_task2, "下发任务号2", "DB51.D16")); return list; } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDefination.java index 880afc7..7b37357 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDefination.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDefination.java @@ -57,26 +57,26 @@ public class LnshRGVDefination implements OpcDeviceDriverDefination { public static List getReadableItemDtos2() { ArrayList list = new ArrayList(); - list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB1.B0")); - list.add(new ItemDto(ItemProtocol.item_mode, "工作状态", "DB1.B1", Boolean.valueOf(true))); - list.add(new ItemDto(ItemProtocol.item_status, "设备状态", "DB1.B2")); - list.add(new ItemDto(ItemProtocol.item_move_1, "前工位光电信号", "DB1.B3")); - list.add(new ItemDto(ItemProtocol.item_move_2, "后工位光电信号", "DB1.B4")); - list.add(new ItemDto(ItemProtocol.item_action_1, "前工位动作信号", "DB1.B5")); - list.add(new ItemDto(ItemProtocol.item_action_2, "后工位动作信号", "DB1.B6")); - list.add(new ItemDto(ItemProtocol.item_walk_y, "行走列", "DB1.B7")); - list.add(new ItemDto(ItemProtocol.item_error, "车体报警", "DB1.B8")); - list.add(new ItemDto(ItemProtocol.item_task1, "前工位任务号", "DB1.D10")); - list.add(new ItemDto(ItemProtocol.item_task2, "后工位任务号", "DB1.D14")); - list.add(new ItemDto(ItemProtocol.item_open_time, "开机时间", "DB1.D18")); - list.add(new ItemDto(ItemProtocol.item_standby_time, "待机时间", "DB1.D22")); - list.add(new ItemDto(ItemProtocol.item_production_time, "生产时间", "DB1.D26")); - list.add(new ItemDto(ItemProtocol.item_error_time, "故障时间", "DB1.D30")); - list.add(new ItemDto(ItemProtocol.item_task_qty, "当前任务数量", "DB1.D34")); - list.add(new ItemDto(ItemProtocol.item_finishTask_qty, "完成任务数量", "DB1.D38")); - list.add(new ItemDto(ItemProtocol.item_batch, "批次", "DB1.D42")); - list.add(new ItemDto(ItemProtocol.item_qty, "数量", "DB1.D46")); - list.add(new ItemDto(ItemProtocol.item_specifications, "规格", "DB1.S50")); + list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB50.B0")); + list.add(new ItemDto(ItemProtocol.item_mode, "工作状态", "DB50.B1", Boolean.valueOf(true))); + list.add(new ItemDto(ItemProtocol.item_status, "设备状态", "DB50.B2")); + list.add(new ItemDto(ItemProtocol.item_move_1, "前工位光电信号", "DB50.B3")); + list.add(new ItemDto(ItemProtocol.item_move_2, "后工位光电信号", "DB50.B4")); + list.add(new ItemDto(ItemProtocol.item_action_1, "前工位动作信号", "DB50.B5")); + list.add(new ItemDto(ItemProtocol.item_action_2, "后工位动作信号", "DB50.B6")); + list.add(new ItemDto(ItemProtocol.item_walk_y, "行走列", "DB50.B7")); + list.add(new ItemDto(ItemProtocol.item_error, "车体报警", "DB50.B8")); + list.add(new ItemDto(ItemProtocol.item_task1, "前工位任务号", "DB50.D10")); + list.add(new ItemDto(ItemProtocol.item_task2, "后工位任务号", "DB50.D14")); + list.add(new ItemDto(ItemProtocol.item_open_time, "开机时间", "DB50.D18")); + list.add(new ItemDto(ItemProtocol.item_standby_time, "待机时间", "DB50.D22")); + list.add(new ItemDto(ItemProtocol.item_production_time, "生产时间", "DB50.D26")); + list.add(new ItemDto(ItemProtocol.item_error_time, "故障时间", "DB50.D30")); + list.add(new ItemDto(ItemProtocol.item_task_qty, "当前任务数量", "DB50.D34")); + list.add(new ItemDto(ItemProtocol.item_finishTask_qty, "完成任务数量", "DB50.D38")); + list.add(new ItemDto(ItemProtocol.item_batch, "批次", "DB50.D42")); + list.add(new ItemDto(ItemProtocol.item_qty, "数量", "DB50.D46")); + list.add(new ItemDto(ItemProtocol.item_specifications, "规格", "DB50.STRING50.50")); return list; } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/ItemProtocol.java index 81990af..02b83f3 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/ItemProtocol.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/ItemProtocol.java @@ -755,151 +755,151 @@ public class ItemProtocol { public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB7.B0")); - list.add(new ItemDto(item_mode, "工作状态", "DB7.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_error, "故障", "DB7.B2")); - list.add(new ItemDto(item_onoff_status, "开关机状态", "DB7.B3")); - list.add(new ItemDto(item_getStation, "当前抓取工位", "DB7.D4")); - list.add(new ItemDto(item_barcode, "条码", "DB7.S8")); - list.add(new ItemDto(item_material, "物料", "DB7.S264")); - list.add(new ItemDto(item_qty, "数量", "DB7.D520")); - list.add(new ItemDto(item_open_time, "开机时间", "DB7.D524")); - list.add(new ItemDto(item_standby_time, "待机时间", "DB7.D528")); - list.add(new ItemDto(item_production_time, "生产时间", "DB7.D532")); - list.add(new ItemDto(item_error_time, "故障时间", "DB7.D536")); - list.add(new ItemDto(item_total_split, "累计拆垛数量", "DB7.D540")); - list.add(new ItemDto(item_batch, "批次", "DB7.D544")); - list.add(new ItemDto(item_specifications, "规格", "DB7.S548")); + list.add(new ItemDto(item_heartbeat, "心跳", "DB50.B0")); + list.add(new ItemDto(item_mode, "工作状态", "DB50.B1", Boolean.valueOf(true))); + list.add(new ItemDto(item_error, "故障", "DB50.B2")); + list.add(new ItemDto(item_onoff_status, "开关机状态", "DB50.B3")); + list.add(new ItemDto(item_getStation, "当前抓取工位", "DB50.D4")); + list.add(new ItemDto(item_barcode, "条码", "DB50.STRING8.50")); + list.add(new ItemDto(item_material, "物料", "DB50.STRING264.50")); + list.add(new ItemDto(item_qty, "数量", "DB50.D520")); + list.add(new ItemDto(item_open_time, "开机时间", "DB50.D524")); + list.add(new ItemDto(item_standby_time, "待机时间", "DB50.D528")); + list.add(new ItemDto(item_production_time, "生产时间", "DB50.D532")); + list.add(new ItemDto(item_error_time, "故障时间", "DB50.D536")); + list.add(new ItemDto(item_total_split, "累计拆垛数量", "DB50.D540")); + list.add(new ItemDto(item_batch, "批次", "DB50.D544")); + list.add(new ItemDto(item_specifications, "规格", "DB50.STRING548.50")); - list.add(new ItemDto(item_product_code, "产品编号", "DB7.W804")); - list.add(new ItemDto(item_AlongSide, "A长边", "DB7.W806")); - list.add(new ItemDto(item_BshortSide, "B短边", "DB7.W808")); - list.add(new ItemDto(item_Htrapezoidal, "H梯形高", "DB7.W810")); - list.add(new ItemDto(item_Wthickness, "W厚度", "DB7.W812")); - list.add(new ItemDto(item_tray_qty, "当前垛盘数", "DB7.W814")); - list.add(new ItemDto(item_tray_high, "垛盘高度", "DB7.W816")); - list.add(new ItemDto(item_crib_category, "垛型类别", "DB7.W818")); - list.add(new ItemDto(item_palletX1_line, "码垛X1行", "DB7.W820")); - list.add(new ItemDto(item_palletY1_row, "码垛Y1列", "DB7.W822")); - list.add(new ItemDto(item_palletA1_angle, "码垛A1角度", "DB7.W824")); - list.add(new ItemDto(item_palletX2_line, "码垛X2行", "DB7.W826")); - list.add(new ItemDto(item_palletY2_row, "码垛Y2列", "DB7.W828")); - list.add(new ItemDto(item_palletA2_angle, "码垛A2角度", "DB7.W830")); - list.add(new ItemDto(item_palletX3_line, "码垛X3行", "DB7.W832")); - list.add(new ItemDto(item_palletY3_row, "码垛Y3列", "DB7.W834")); - list.add(new ItemDto(item_palletA3_angle, "码垛A3角度", "DB7.W836")); - list.add(new ItemDto(item_pressCribX1_line, "压垛X1行", "DB7.W838")); - list.add(new ItemDto(item_pressCribY1_row, "压垛Y1列", "DB7.W840")); - list.add(new ItemDto(item_pressCribA1_angle, "压垛A1角度", "DB7.W842")); - list.add(new ItemDto(item_pressCribX2_line, "压垛X2行", "DB7.W844")); - list.add(new ItemDto(item_pressCribY2_row, "压垛Y2列", "DB7.W846")); - list.add(new ItemDto(item_pressCribA2_angle, "压垛A2角度", "DB7.W848")); - list.add(new ItemDto(item_pressCribX3_line, "压垛X3行", "DB7.W850")); - list.add(new ItemDto(item_pressCribY3_row, "压垛Y3列", "DB7.W852")); - list.add(new ItemDto(item_pressCribA3_angle, "压垛A3角度", "DB7.W854")); - list.add(new ItemDto(item_Zoffset, "Z轴偏移", "DB7.W856")); - list.add(new ItemDto(item_pallet_layerQty, "码垛层数", "DB7.W858")); - list.add(new ItemDto(item_pressCrib_layerQty, "压垛层数", "DB7.W860")); - list.add(new ItemDto(item_codeLayerX1_interval, "码层X1间隔", "DB7.W862")); - list.add(new ItemDto(item_codeLayerY1_interval, "码层Y1间隔", "DB7.W864")); - list.add(new ItemDto(item_codeLayerX2_interval, "码层X2间隔", "DB7.W866")); - list.add(new ItemDto(item_codeLayerY2_interval, "码层Y2间隔", "DB7.W868")); - list.add(new ItemDto(item_codeLayerX3_interval, "码层X3间隔", "DB7.W870")); - list.add(new ItemDto(item_codeLayerY3_interval, "码层Y3间隔", "DB7.W872")); - list.add(new ItemDto(item_codeLayerX1_offset, "码层X1偏移", "DB7.W874")); - list.add(new ItemDto(item_codeLayerY1_offset, "码层Y1偏移", "DB7.W876")); - list.add(new ItemDto(item_codeLayerX2_offset, "码层X2偏移", "DB7.W878")); - list.add(new ItemDto(item_codeLayerY2_offset, "码层Y2偏移", "DB7.W880")); - list.add(new ItemDto(item_codeLayerX3_offset, "码层X3偏移", "DB7.W882")); - list.add(new ItemDto(item_codeLayerY3_offset, "码层Y3偏移", "DB7.W884")); - list.add(new ItemDto(item_pressLayerX1_interval, "压层X1间隔", "DB7.W886")); - list.add(new ItemDto(item_pressLayerY1_interval, "压层Y1间隔", "DB7.W888")); - list.add(new ItemDto(item_pressLayerX2_interval, "压层X2间隔", "DB7.W890")); - list.add(new ItemDto(item_pressLayerY2_interval, "压层Y2间隔", "DB7.W892")); - list.add(new ItemDto(item_pressLayerX3_interval, "压层X3间隔", "DB7.W894")); - list.add(new ItemDto(item_pressLayerY3_interval, "压层Y3间隔", "DB7.W896")); - list.add(new ItemDto(item_pressLayerX1_offset, "压层X1偏移", "DB7.W898")); - list.add(new ItemDto(item_pressLayerY1_offset, "压层Y1偏移", "DB7.W900")); - list.add(new ItemDto(item_pressLayerX2_offset, "压层X2偏移", "DB7.W902")); - list.add(new ItemDto(item_pressLayerY2_offset, "压层Y2偏移", "DB7.W904")); - list.add(new ItemDto(item_pressLayerX3_offset, "压层X3偏移", "DB7.W906")); - list.add(new ItemDto(item_pressLayerY3_offset, "压层Y3偏移", "DB7.W908")); - list.add(new ItemDto(item_one_cribTotal, "1#垛总数", "DB7.W910")); - list.add(new ItemDto(item_two_cribTotal, "2#垛总数", "DB7.W912")); - list.add(new ItemDto(item_one_qty, "1#垛当前数", "DB7.W914")); - list.add(new ItemDto(item_two_qty, "2#垛当前数", "DB7.W916")); - list.add(new ItemDto(item_tool_coordinate, "工具坐标", "DB7.W918")); - list.add(new ItemDto(item_order_qty, "工单数量", "DB7.D920")); - list.add(new ItemDto(item_order_No, "工单号", "DB7.S924")); + list.add(new ItemDto(item_product_code, "产品编号", "DB50.W804")); + list.add(new ItemDto(item_AlongSide, "A长边", "DB50.W806")); + list.add(new ItemDto(item_BshortSide, "B短边", "DB50.W808")); + list.add(new ItemDto(item_Htrapezoidal, "H梯形高", "DB50.W810")); + list.add(new ItemDto(item_Wthickness, "W厚度", "DB50.W812")); + list.add(new ItemDto(item_tray_qty, "当前垛盘数", "DB50.W814")); + list.add(new ItemDto(item_tray_high, "垛盘高度", "DB50.W816")); + list.add(new ItemDto(item_crib_category, "垛型类别", "DB50.W818")); + list.add(new ItemDto(item_palletX1_line, "码垛X1行", "DB50.W820")); + list.add(new ItemDto(item_palletY1_row, "码垛Y1列", "DB50.W822")); + list.add(new ItemDto(item_palletA1_angle, "码垛A1角度", "DB50.W824")); + list.add(new ItemDto(item_palletX2_line, "码垛X2行", "DB50.W826")); + list.add(new ItemDto(item_palletY2_row, "码垛Y2列", "DB50.W828")); + list.add(new ItemDto(item_palletA2_angle, "码垛A2角度", "DB50.W830")); + list.add(new ItemDto(item_palletX3_line, "码垛X3行", "DB50.W832")); + list.add(new ItemDto(item_palletY3_row, "码垛Y3列", "DB50.W834")); + list.add(new ItemDto(item_palletA3_angle, "码垛A3角度", "DB50.W836")); + list.add(new ItemDto(item_pressCribX1_line, "压垛X1行", "DB50.W838")); + list.add(new ItemDto(item_pressCribY1_row, "压垛Y1列", "DB50.W840")); + list.add(new ItemDto(item_pressCribA1_angle, "压垛A1角度", "DB50.W842")); + list.add(new ItemDto(item_pressCribX2_line, "压垛X2行", "DB50.W844")); + list.add(new ItemDto(item_pressCribY2_row, "压垛Y2列", "DB50.W846")); + list.add(new ItemDto(item_pressCribA2_angle, "压垛A2角度", "DB50.W848")); + list.add(new ItemDto(item_pressCribX3_line, "压垛X3行", "DB50.W850")); + list.add(new ItemDto(item_pressCribY3_row, "压垛Y3列", "DB50.W852")); + list.add(new ItemDto(item_pressCribA3_angle, "压垛A3角度", "DB50.W854")); + list.add(new ItemDto(item_Zoffset, "Z轴偏移", "DB50.W856")); + list.add(new ItemDto(item_pallet_layerQty, "码垛层数", "DB50.W858")); + list.add(new ItemDto(item_pressCrib_layerQty, "压垛层数", "DB50.W860")); + list.add(new ItemDto(item_codeLayerX1_interval, "码层X1间隔", "DB50.W862")); + list.add(new ItemDto(item_codeLayerY1_interval, "码层Y1间隔", "DB50.W864")); + list.add(new ItemDto(item_codeLayerX2_interval, "码层X2间隔", "DB50.W866")); + list.add(new ItemDto(item_codeLayerY2_interval, "码层Y2间隔", "DB50.W868")); + list.add(new ItemDto(item_codeLayerX3_interval, "码层X3间隔", "DB50.W870")); + list.add(new ItemDto(item_codeLayerY3_interval, "码层Y3间隔", "DB50.W872")); + list.add(new ItemDto(item_codeLayerX1_offset, "码层X1偏移", "DB50.W874")); + list.add(new ItemDto(item_codeLayerY1_offset, "码层Y1偏移", "DB50.W876")); + list.add(new ItemDto(item_codeLayerX2_offset, "码层X2偏移", "DB50.W878")); + list.add(new ItemDto(item_codeLayerY2_offset, "码层Y2偏移", "DB50.W880")); + list.add(new ItemDto(item_codeLayerX3_offset, "码层X3偏移", "DB50.W882")); + list.add(new ItemDto(item_codeLayerY3_offset, "码层Y3偏移", "DB50.W884")); + list.add(new ItemDto(item_pressLayerX1_interval, "压层X1间隔", "DB50.W886")); + list.add(new ItemDto(item_pressLayerY1_interval, "压层Y1间隔", "DB50.W888")); + list.add(new ItemDto(item_pressLayerX2_interval, "压层X2间隔", "DB50.W890")); + list.add(new ItemDto(item_pressLayerY2_interval, "压层Y2间隔", "DB50.W892")); + list.add(new ItemDto(item_pressLayerX3_interval, "压层X3间隔", "DB50.W894")); + list.add(new ItemDto(item_pressLayerY3_interval, "压层Y3间隔", "DB50.W896")); + list.add(new ItemDto(item_pressLayerX1_offset, "压层X1偏移", "DB50.W898")); + list.add(new ItemDto(item_pressLayerY1_offset, "压层Y1偏移", "DB50.W900")); + list.add(new ItemDto(item_pressLayerX2_offset, "压层X2偏移", "DB50.W902")); + list.add(new ItemDto(item_pressLayerY2_offset, "压层Y2偏移", "DB50.W904")); + list.add(new ItemDto(item_pressLayerX3_offset, "压层X3偏移", "DB50.W906")); + list.add(new ItemDto(item_pressLayerY3_offset, "压层Y3偏移", "DB50.W908")); + list.add(new ItemDto(item_one_cribTotal, "1#垛总数", "DB50.W910")); + list.add(new ItemDto(item_two_cribTotal, "2#垛总数", "DB50.W912")); + list.add(new ItemDto(item_one_qty, "1#垛当前数", "DB50.W914")); + list.add(new ItemDto(item_two_qty, "2#垛当前数", "DB50.W916")); + list.add(new ItemDto(item_tool_coordinate, "工具坐标", "DB50.W918")); + list.add(new ItemDto(item_order_qty, "工单数量", "DB50.D920")); + list.add(new ItemDto(item_order_No, "工单号", "DB50.STRING924.50")); return list; } public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_feedback, "机器人动作反馈", "DB8.W0")); - list.add(new ItemDto(item_to_error, "故障代码", "DB8.W2")); - list.add(new ItemDto(item_to_material, "物料", "DB8.S4")); + list.add(new ItemDto(item_to_feedback, "机器人动作反馈", "DB51.W0")); + list.add(new ItemDto(item_to_error, "故障代码", "DB51.W2")); + list.add(new ItemDto(item_to_material, "物料", "DB51.STRING4.50")); - list.add(new ItemDto(item_to_product_code, "产品编号", "DB8.W260")); - list.add(new ItemDto(item_to_AlongSide, "A长边", "DB8.W262")); - list.add(new ItemDto(item_to_BshortSide, "B短边", "DB8.W264")); - list.add(new ItemDto(item_to_Htrapezoidal, "H梯形高", "DB8.W266")); - list.add(new ItemDto(item_to_Wthickness, "W厚度", "DB8.W268")); - list.add(new ItemDto(item_to_tray_qty, "当前垛盘数", "DB8.W270")); - list.add(new ItemDto(item_to_tray_high, "垛盘高度", "DB8.W272")); - list.add(new ItemDto(item_to_crib_category, "垛型类别", "DB8.W274")); - list.add(new ItemDto(item_to_palletX1_line, "码垛X1行", "DB8.W276")); - list.add(new ItemDto(item_to_palletY1_row, "码垛Y1列", "DB8.W278")); - list.add(new ItemDto(item_to_palletA1_angle, "码垛A1角度", "DB8.W280")); - list.add(new ItemDto(item_to_palletX2_line, "码垛X2行", "DB8.W282")); - list.add(new ItemDto(item_to_palletY2_row, "码垛Y2列", "DB8.W284")); - list.add(new ItemDto(item_to_palletA2_angle, "码垛A2角度", "DB8.W286")); - list.add(new ItemDto(item_to_palletX3_line, "码垛X3行", "DB8.W288")); - list.add(new ItemDto(item_to_palletY3_row, "码垛Y3列", "DB8.W290")); - list.add(new ItemDto(item_to_palletA3_angle, "码垛A3角度", "DB8.W292")); - list.add(new ItemDto(item_to_pressCribX1_line, "压垛X1行", "DB8.W294")); - list.add(new ItemDto(item_to_pressCribY1_row, "压垛Y1列", "DB8.W296")); - list.add(new ItemDto(item_to_pressCribA1_angle, "压垛A1角度", "DB8.W298")); - list.add(new ItemDto(item_to_pressCribX2_line, "压垛X2行", "DB8.W300")); - list.add(new ItemDto(item_to_pressCribY2_row, "压垛Y2列", "DB8.W302")); - list.add(new ItemDto(item_to_pressCribA2_angle, "压垛A2角度", "DB8.W304")); - list.add(new ItemDto(item_to_pressCribX3_line, "压垛X3行", "DB8.W306")); - list.add(new ItemDto(item_to_pressCribY3_row, "压垛Y3列", "DB8.W308")); - list.add(new ItemDto(item_to_pressCribA3_angle, "压垛A3角度", "DB8.W310")); - list.add(new ItemDto(item_to_Zoffset, "Z轴偏移", "DB8.W312")); - list.add(new ItemDto(item_to_pallet_layerQty, "码垛层数", "DB8.W314")); - list.add(new ItemDto(item_to_pressCrib_layerQty, "压垛层数", "DB8.W316")); - list.add(new ItemDto(item_to_codeLayerX1_interval, "码层X1间隔", "DB8.W318")); - list.add(new ItemDto(item_to_codeLayerY1_interval, "码层Y1间隔", "DB8.W320")); - list.add(new ItemDto(item_to_codeLayerX2_interval, "码层X2间隔", "DB8.W322")); - list.add(new ItemDto(item_to_codeLayerY2_interval, "码层Y2间隔", "DB8.W324")); - list.add(new ItemDto(item_to_codeLayerX3_interval, "码层X3间隔", "DB8.W326")); - list.add(new ItemDto(item_to_codeLayerY3_interval, "码层Y3间隔", "DB8.W328")); - list.add(new ItemDto(item_to_codeLayerX1_offset, "码层X1偏移", "DB8.W330")); - list.add(new ItemDto(item_to_codeLayerY1_offset, "码层Y1偏移", "DB8.W332")); - list.add(new ItemDto(item_to_codeLayerX2_offset, "码层X2偏移", "DB8.W334")); - list.add(new ItemDto(item_to_codeLayerY2_offset, "码层Y2偏移", "DB8.W336")); - list.add(new ItemDto(item_to_codeLayerX3_offset, "码层X3偏移", "DB8.W338")); - list.add(new ItemDto(item_to_codeLayerY3_offset, "码层Y3偏移", "DB8.W340")); - list.add(new ItemDto(item_to_pressLayerX1_interval, "压层X1间隔", "DB8.W342")); - list.add(new ItemDto(item_to_pressLayerY1_interval, "压层Y1间隔", "DB8.W344")); - list.add(new ItemDto(item_to_pressLayerX2_interval, "压层X2间隔", "DB8.W346")); - list.add(new ItemDto(item_to_pressLayerY2_interval, "压层Y2间隔", "DB8.W348")); - list.add(new ItemDto(item_to_pressLayerX3_interval, "压层X3间隔", "DB8.W350")); - list.add(new ItemDto(item_to_pressLayerY3_interval, "压层Y3间隔", "DB8.W352")); - list.add(new ItemDto(item_to_pressLayerX1_offset, "压层X1偏移", "DB8.W354")); - list.add(new ItemDto(item_to_pressLayerY1_offset, "压层Y1偏移", "DB8.W356")); - list.add(new ItemDto(item_to_pressLayerX2_offset, "压层X2偏移", "DB8.W358")); - list.add(new ItemDto(item_to_pressLayerY2_offset, "压层Y2偏移", "DB8.W360")); - list.add(new ItemDto(item_to_pressLayerX3_offset, "压层X3偏移", "DB8.W362")); - list.add(new ItemDto(item_to_pressLayerY3_offset, "压层Y3偏移", "DB8.W364")); - list.add(new ItemDto(item_to_one_cribTotal, "1#垛总数", "DB8.W366")); - list.add(new ItemDto(item_to_two_cribTotal, "2#垛总数", "DB8.W368")); - list.add(new ItemDto(item_to_one_qty, "1#垛当前数", "DB8.W370")); - list.add(new ItemDto(item_to_two_qty, "2#垛当前数", "DB8.W372")); - list.add(new ItemDto(item_to_tool_coordinate, "工具坐标", "DB8.W374")); - list.add(new ItemDto(item_to_order_qty, "工单数量", "DB8.D376")); - list.add(new ItemDto(item_to_order_No, "工单号", "DB8.S380")); + list.add(new ItemDto(item_to_product_code, "产品编号", "DB51.W260")); + list.add(new ItemDto(item_to_AlongSide, "A长边", "DB51.W262")); + list.add(new ItemDto(item_to_BshortSide, "B短边", "DB51.W264")); + list.add(new ItemDto(item_to_Htrapezoidal, "H梯形高", "DB51.W266")); + list.add(new ItemDto(item_to_Wthickness, "W厚度", "DB51.W268")); + list.add(new ItemDto(item_to_tray_qty, "当前垛盘数", "DB51.W270")); + list.add(new ItemDto(item_to_tray_high, "垛盘高度", "DB51.W272")); + list.add(new ItemDto(item_to_crib_category, "垛型类别", "DB51.W274")); + list.add(new ItemDto(item_to_palletX1_line, "码垛X1行", "DB51.W276")); + list.add(new ItemDto(item_to_palletY1_row, "码垛Y1列", "DB51.W278")); + list.add(new ItemDto(item_to_palletA1_angle, "码垛A1角度", "DB51.W280")); + list.add(new ItemDto(item_to_palletX2_line, "码垛X2行", "DB51.W282")); + list.add(new ItemDto(item_to_palletY2_row, "码垛Y2列", "DB51.W284")); + list.add(new ItemDto(item_to_palletA2_angle, "码垛A2角度", "DB51.W286")); + list.add(new ItemDto(item_to_palletX3_line, "码垛X3行", "DB51.W288")); + list.add(new ItemDto(item_to_palletY3_row, "码垛Y3列", "DB51.W290")); + list.add(new ItemDto(item_to_palletA3_angle, "码垛A3角度", "DB51.W292")); + list.add(new ItemDto(item_to_pressCribX1_line, "压垛X1行", "DB51.W294")); + list.add(new ItemDto(item_to_pressCribY1_row, "压垛Y1列", "DB51.W296")); + list.add(new ItemDto(item_to_pressCribA1_angle, "压垛A1角度", "DB51.W298")); + list.add(new ItemDto(item_to_pressCribX2_line, "压垛X2行", "DB51.W300")); + list.add(new ItemDto(item_to_pressCribY2_row, "压垛Y2列", "DB51.W302")); + list.add(new ItemDto(item_to_pressCribA2_angle, "压垛A2角度", "DB51.W304")); + list.add(new ItemDto(item_to_pressCribX3_line, "压垛X3行", "DB51.W306")); + list.add(new ItemDto(item_to_pressCribY3_row, "压垛Y3列", "DB51.W308")); + list.add(new ItemDto(item_to_pressCribA3_angle, "压垛A3角度", "DB51.W310")); + list.add(new ItemDto(item_to_Zoffset, "Z轴偏移", "DB51.W312")); + list.add(new ItemDto(item_to_pallet_layerQty, "码垛层数", "DB51.W314")); + list.add(new ItemDto(item_to_pressCrib_layerQty, "压垛层数", "DB51.W316")); + list.add(new ItemDto(item_to_codeLayerX1_interval, "码层X1间隔", "DB51.W318")); + list.add(new ItemDto(item_to_codeLayerY1_interval, "码层Y1间隔", "DB51.W320")); + list.add(new ItemDto(item_to_codeLayerX2_interval, "码层X2间隔", "DB51.W322")); + list.add(new ItemDto(item_to_codeLayerY2_interval, "码层Y2间隔", "DB51.W324")); + list.add(new ItemDto(item_to_codeLayerX3_interval, "码层X3间隔", "DB51.W326")); + list.add(new ItemDto(item_to_codeLayerY3_interval, "码层Y3间隔", "DB51.W328")); + list.add(new ItemDto(item_to_codeLayerX1_offset, "码层X1偏移", "DB51.W330")); + list.add(new ItemDto(item_to_codeLayerY1_offset, "码层Y1偏移", "DB51.W332")); + list.add(new ItemDto(item_to_codeLayerX2_offset, "码层X2偏移", "DB51.W334")); + list.add(new ItemDto(item_to_codeLayerY2_offset, "码层Y2偏移", "DB51.W336")); + list.add(new ItemDto(item_to_codeLayerX3_offset, "码层X3偏移", "DB51.W338")); + list.add(new ItemDto(item_to_codeLayerY3_offset, "码层Y3偏移", "DB51.W340")); + list.add(new ItemDto(item_to_pressLayerX1_interval, "压层X1间隔", "DB51.W342")); + list.add(new ItemDto(item_to_pressLayerY1_interval, "压层Y1间隔", "DB51.W344")); + list.add(new ItemDto(item_to_pressLayerX2_interval, "压层X2间隔", "DB51.W346")); + list.add(new ItemDto(item_to_pressLayerY2_interval, "压层Y2间隔", "DB51.W348")); + list.add(new ItemDto(item_to_pressLayerX3_interval, "压层X3间隔", "DB51.W350")); + list.add(new ItemDto(item_to_pressLayerY3_interval, "压层Y3间隔", "DB51.W352")); + list.add(new ItemDto(item_to_pressLayerX1_offset, "压层X1偏移", "DB51.W354")); + list.add(new ItemDto(item_to_pressLayerY1_offset, "压层Y1偏移", "DB51.W356")); + list.add(new ItemDto(item_to_pressLayerX2_offset, "压层X2偏移", "DB51.W358")); + list.add(new ItemDto(item_to_pressLayerY2_offset, "压层Y2偏移", "DB51.W360")); + list.add(new ItemDto(item_to_pressLayerX3_offset, "压层X3偏移", "DB51.W362")); + list.add(new ItemDto(item_to_pressLayerY3_offset, "压层Y3偏移", "DB51.W364")); + list.add(new ItemDto(item_to_one_cribTotal, "1#垛总数", "DB51.W366")); + list.add(new ItemDto(item_to_two_cribTotal, "2#垛总数", "DB51.W368")); + list.add(new ItemDto(item_to_one_qty, "1#垛当前数", "DB51.W370")); + list.add(new ItemDto(item_to_two_qty, "2#垛当前数", "DB51.W372")); + list.add(new ItemDto(item_to_tool_coordinate, "工具坐标", "DB51.W374")); + list.add(new ItemDto(item_to_order_qty, "工单数量", "DB51.D376")); + list.add(new ItemDto(item_to_order_No, "工单号", "DB51.STRING380.50")); return list; } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDefination.java index c2d191c..fe64eef 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDefination.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDefination.java @@ -57,82 +57,82 @@ public class LnshSplitManipulatorDefination implements OpcDeviceDriverDefination public static List getReadableItemDtos2() { ArrayList list = new ArrayList(); - list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB7.B0")); - list.add(new ItemDto(ItemProtocol.item_mode, "工作状态", "DB7.B1", Boolean.valueOf(true))); - list.add(new ItemDto(ItemProtocol.item_error, "故障", "DB7.B2")); - list.add(new ItemDto(ItemProtocol.item_onoff_status, "开关机状态", "DB7.B3")); - list.add(new ItemDto(ItemProtocol.item_getStation, "当前抓取工位", "DB7.D4")); - list.add(new ItemDto(ItemProtocol.item_barcode, "条码", "DB7.S8")); - list.add(new ItemDto(ItemProtocol.item_material, "物料", "DB7.S264")); - list.add(new ItemDto(ItemProtocol.item_qty, "数量", "DB7.D520")); - list.add(new ItemDto(ItemProtocol.item_open_time, "开机时间", "DB7.D524")); - list.add(new ItemDto(ItemProtocol.item_standby_time, "待机时间", "DB7.D528")); - list.add(new ItemDto(ItemProtocol.item_production_time, "生产时间", "DB7.D532")); - list.add(new ItemDto(ItemProtocol.item_error_time, "故障时间", "DB7.D536")); - list.add(new ItemDto(ItemProtocol.item_total_split, "累计拆垛数量", "DB7.D540")); - list.add(new ItemDto(ItemProtocol.item_batch, "批次", "DB7.D544")); - list.add(new ItemDto(ItemProtocol.item_specifications, "规格", "DB7.S548")); + list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB50.B0")); + list.add(new ItemDto(ItemProtocol.item_mode, "工作状态", "DB50.B1", Boolean.valueOf(true))); + list.add(new ItemDto(ItemProtocol.item_error, "故障", "DB50.B2")); + list.add(new ItemDto(ItemProtocol.item_onoff_status, "开关机状态", "DB50.B3")); + list.add(new ItemDto(ItemProtocol.item_getStation, "当前抓取工位", "DB50.D4")); + list.add(new ItemDto(ItemProtocol.item_barcode, "条码", "DB50.STRING8.50")); + list.add(new ItemDto(ItemProtocol.item_material, "物料", "DB50.STRING264.50")); + list.add(new ItemDto(ItemProtocol.item_qty, "数量", "DB50.D520")); + list.add(new ItemDto(ItemProtocol.item_open_time, "开机时间", "DB50.D524")); + list.add(new ItemDto(ItemProtocol.item_standby_time, "待机时间", "DB50.D528")); + list.add(new ItemDto(ItemProtocol.item_production_time, "生产时间", "DB50.D532")); + list.add(new ItemDto(ItemProtocol.item_error_time, "故障时间", "DB50.D536")); + list.add(new ItemDto(ItemProtocol.item_total_split, "累计拆垛数量", "DB50.D540")); + list.add(new ItemDto(ItemProtocol.item_batch, "批次", "DB50.D544")); + list.add(new ItemDto(ItemProtocol.item_specifications, "规格", "DB50.STRING548.50")); - list.add(new ItemDto(ItemProtocol.item_product_code, "产品编号", "DB7.W804")); - list.add(new ItemDto(ItemProtocol.item_AlongSide, "A长边", "DB7.W806")); - list.add(new ItemDto(ItemProtocol.item_BshortSide, "B短边", "DB7.W808")); - list.add(new ItemDto(ItemProtocol.item_Htrapezoidal, "H梯形高", "DB7.W810")); - list.add(new ItemDto(ItemProtocol.item_Wthickness, "W厚度", "DB7.W812")); - list.add(new ItemDto(ItemProtocol.item_tray_qty, "当前垛盘数", "DB7.W814")); - list.add(new ItemDto(ItemProtocol.item_tray_high, "垛盘高度", "DB7.W816")); - list.add(new ItemDto(ItemProtocol.item_crib_category, "垛型类别", "DB7.W818")); - list.add(new ItemDto(ItemProtocol.item_palletX1_line, "码垛X1行", "DB7.W820")); - list.add(new ItemDto(ItemProtocol.item_palletY1_row, "码垛Y1列", "DB7.W822")); - list.add(new ItemDto(ItemProtocol.item_palletA1_angle, "码垛A1角度", "DB7.W824")); - list.add(new ItemDto(ItemProtocol.item_palletX2_line, "码垛X2行", "DB7.W826")); - list.add(new ItemDto(ItemProtocol.item_palletY2_row, "码垛Y2列", "DB7.W828")); - list.add(new ItemDto(ItemProtocol.item_palletA2_angle, "码垛A2角度", "DB7.W830")); - list.add(new ItemDto(ItemProtocol.item_palletX3_line, "码垛X3行", "DB7.W832")); - list.add(new ItemDto(ItemProtocol.item_palletY3_row, "码垛Y3列", "DB7.W834")); - list.add(new ItemDto(ItemProtocol.item_palletA3_angle, "码垛A3角度", "DB7.W836")); - list.add(new ItemDto(ItemProtocol.item_pressCribX1_line, "压垛X1行", "DB7.W838")); - list.add(new ItemDto(ItemProtocol.item_pressCribY1_row, "压垛Y1列", "DB7.W840")); - list.add(new ItemDto(ItemProtocol.item_pressCribA1_angle, "压垛A1角度", "DB7.W842")); - list.add(new ItemDto(ItemProtocol.item_pressCribX2_line, "压垛X2行", "DB7.W844")); - list.add(new ItemDto(ItemProtocol.item_pressCribY2_row, "压垛Y2列", "DB7.W846")); - list.add(new ItemDto(ItemProtocol.item_pressCribA2_angle, "压垛A2角度", "DB7.W848")); - list.add(new ItemDto(ItemProtocol.item_pressCribX3_line, "压垛X3行", "DB7.W850")); - list.add(new ItemDto(ItemProtocol.item_pressCribY3_row, "压垛Y3列", "DB7.W852")); - list.add(new ItemDto(ItemProtocol.item_pressCribA3_angle, "压垛A3角度", "DB7.W854")); - list.add(new ItemDto(ItemProtocol.item_Zoffset, "Z轴偏移", "DB7.W856")); - list.add(new ItemDto(ItemProtocol.item_pallet_layerQty, "码垛层数", "DB7.W858")); - list.add(new ItemDto(ItemProtocol.item_pressCrib_layerQty, "压垛层数", "DB7.W860")); - list.add(new ItemDto(ItemProtocol.item_codeLayerX1_interval, "码层X1间隔", "DB7.W862")); - list.add(new ItemDto(ItemProtocol.item_codeLayerY1_interval, "码层Y1间隔", "DB7.W864")); - list.add(new ItemDto(ItemProtocol.item_codeLayerX2_interval, "码层X2间隔", "DB7.W866")); - list.add(new ItemDto(ItemProtocol.item_codeLayerY2_interval, "码层Y2间隔", "DB7.W868")); - list.add(new ItemDto(ItemProtocol.item_codeLayerX3_interval, "码层X3间隔", "DB7.W870")); - list.add(new ItemDto(ItemProtocol.item_codeLayerY3_interval, "码层Y3间隔", "DB7.W872")); - list.add(new ItemDto(ItemProtocol.item_codeLayerX1_offset, "码层X1偏移", "DB7.W874")); - list.add(new ItemDto(ItemProtocol.item_codeLayerY1_offset, "码层Y1偏移", "DB7.W876")); - list.add(new ItemDto(ItemProtocol.item_codeLayerX2_offset, "码层X2偏移", "DB7.W878")); - list.add(new ItemDto(ItemProtocol.item_codeLayerY2_offset, "码层Y2偏移", "DB7.W880")); - list.add(new ItemDto(ItemProtocol.item_codeLayerX3_offset, "码层X3偏移", "DB7.W882")); - list.add(new ItemDto(ItemProtocol.item_codeLayerY3_offset, "码层Y3偏移", "DB7.W884")); - list.add(new ItemDto(ItemProtocol.item_pressLayerX1_interval, "压层X1间隔", "DB7.W886")); - list.add(new ItemDto(ItemProtocol.item_pressLayerY1_interval, "压层Y1间隔", "DB7.W888")); - list.add(new ItemDto(ItemProtocol.item_pressLayerX2_interval, "压层X2间隔", "DB7.W890")); - list.add(new ItemDto(ItemProtocol.item_pressLayerY2_interval, "压层Y2间隔", "DB7.W892")); - list.add(new ItemDto(ItemProtocol.item_pressLayerX3_interval, "压层X3间隔", "DB7.W894")); - list.add(new ItemDto(ItemProtocol.item_pressLayerY3_interval, "压层Y3间隔", "DB7.W896")); - list.add(new ItemDto(ItemProtocol.item_pressLayerX1_offset, "压层X1偏移", "DB7.W898")); - list.add(new ItemDto(ItemProtocol.item_pressLayerY1_offset, "压层Y1偏移", "DB7.W900")); - list.add(new ItemDto(ItemProtocol.item_pressLayerX2_offset, "压层X2偏移", "DB7.W902")); - list.add(new ItemDto(ItemProtocol.item_pressLayerY2_offset, "压层Y2偏移", "DB7.W904")); - list.add(new ItemDto(ItemProtocol.item_pressLayerX3_offset, "压层X3偏移", "DB7.W906")); - list.add(new ItemDto(ItemProtocol.item_pressLayerY3_offset, "压层Y3偏移", "DB7.W908")); - list.add(new ItemDto(ItemProtocol.item_one_cribTotal, "1#垛总数", "DB7.W910")); - list.add(new ItemDto(ItemProtocol.item_two_cribTotal, "2#垛总数", "DB7.W912")); - list.add(new ItemDto(ItemProtocol.item_one_qty, "1#垛当前数", "DB7.W914")); - list.add(new ItemDto(ItemProtocol.item_two_qty, "2#垛当前数", "DB7.W916")); - list.add(new ItemDto(ItemProtocol.item_tool_coordinate, "工具坐标", "DB7.D918")); - list.add(new ItemDto(ItemProtocol.item_order_qty, "工单数量", "DB7.D920")); - list.add(new ItemDto(ItemProtocol.item_order_No, "工单号", "DB7.S924")); + list.add(new ItemDto(ItemProtocol.item_product_code, "产品编号", "DB50.W804")); + list.add(new ItemDto(ItemProtocol.item_AlongSide, "A长边", "DB50.W806")); + list.add(new ItemDto(ItemProtocol.item_BshortSide, "B短边", "DB50.W808")); + list.add(new ItemDto(ItemProtocol.item_Htrapezoidal, "H梯形高", "DB50.W810")); + list.add(new ItemDto(ItemProtocol.item_Wthickness, "W厚度", "DB50.W812")); + list.add(new ItemDto(ItemProtocol.item_tray_qty, "当前垛盘数", "DB50.W814")); + list.add(new ItemDto(ItemProtocol.item_tray_high, "垛盘高度", "DB50.W816")); + list.add(new ItemDto(ItemProtocol.item_crib_category, "垛型类别", "DB50.W818")); + list.add(new ItemDto(ItemProtocol.item_palletX1_line, "码垛X1行", "DB50.W820")); + list.add(new ItemDto(ItemProtocol.item_palletY1_row, "码垛Y1列", "DB50.W822")); + list.add(new ItemDto(ItemProtocol.item_palletA1_angle, "码垛A1角度", "DB50.W824")); + list.add(new ItemDto(ItemProtocol.item_palletX2_line, "码垛X2行", "DB50.W826")); + list.add(new ItemDto(ItemProtocol.item_palletY2_row, "码垛Y2列", "DB50.W828")); + list.add(new ItemDto(ItemProtocol.item_palletA2_angle, "码垛A2角度", "DB50.W830")); + list.add(new ItemDto(ItemProtocol.item_palletX3_line, "码垛X3行", "DB50.W832")); + list.add(new ItemDto(ItemProtocol.item_palletY3_row, "码垛Y3列", "DB50.W834")); + list.add(new ItemDto(ItemProtocol.item_palletA3_angle, "码垛A3角度", "DB50.W836")); + list.add(new ItemDto(ItemProtocol.item_pressCribX1_line, "压垛X1行", "DB50.W838")); + list.add(new ItemDto(ItemProtocol.item_pressCribY1_row, "压垛Y1列", "DB50.W840")); + list.add(new ItemDto(ItemProtocol.item_pressCribA1_angle, "压垛A1角度", "DB50.W842")); + list.add(new ItemDto(ItemProtocol.item_pressCribX2_line, "压垛X2行", "DB50.W844")); + list.add(new ItemDto(ItemProtocol.item_pressCribY2_row, "压垛Y2列", "DB50.W846")); + list.add(new ItemDto(ItemProtocol.item_pressCribA2_angle, "压垛A2角度", "DB50.W848")); + list.add(new ItemDto(ItemProtocol.item_pressCribX3_line, "压垛X3行", "DB50.W850")); + list.add(new ItemDto(ItemProtocol.item_pressCribY3_row, "压垛Y3列", "DB50.W852")); + list.add(new ItemDto(ItemProtocol.item_pressCribA3_angle, "压垛A3角度", "DB50.W854")); + list.add(new ItemDto(ItemProtocol.item_Zoffset, "Z轴偏移", "DB50.W856")); + list.add(new ItemDto(ItemProtocol.item_pallet_layerQty, "码垛层数", "DB50.W858")); + list.add(new ItemDto(ItemProtocol.item_pressCrib_layerQty, "压垛层数", "DB50.W860")); + list.add(new ItemDto(ItemProtocol.item_codeLayerX1_interval, "码层X1间隔", "DB50.W862")); + list.add(new ItemDto(ItemProtocol.item_codeLayerY1_interval, "码层Y1间隔", "DB50.W864")); + list.add(new ItemDto(ItemProtocol.item_codeLayerX2_interval, "码层X2间隔", "DB50.W866")); + list.add(new ItemDto(ItemProtocol.item_codeLayerY2_interval, "码层Y2间隔", "DB50.W868")); + list.add(new ItemDto(ItemProtocol.item_codeLayerX3_interval, "码层X3间隔", "DB50.W870")); + list.add(new ItemDto(ItemProtocol.item_codeLayerY3_interval, "码层Y3间隔", "DB50.W872")); + list.add(new ItemDto(ItemProtocol.item_codeLayerX1_offset, "码层X1偏移", "DB50.W874")); + list.add(new ItemDto(ItemProtocol.item_codeLayerY1_offset, "码层Y1偏移", "DB50.W876")); + list.add(new ItemDto(ItemProtocol.item_codeLayerX2_offset, "码层X2偏移", "DB50.W878")); + list.add(new ItemDto(ItemProtocol.item_codeLayerY2_offset, "码层Y2偏移", "DB50.W880")); + list.add(new ItemDto(ItemProtocol.item_codeLayerX3_offset, "码层X3偏移", "DB50.W882")); + list.add(new ItemDto(ItemProtocol.item_codeLayerY3_offset, "码层Y3偏移", "DB50.W884")); + list.add(new ItemDto(ItemProtocol.item_pressLayerX1_interval, "压层X1间隔", "DB50.W886")); + list.add(new ItemDto(ItemProtocol.item_pressLayerY1_interval, "压层Y1间隔", "DB50.W888")); + list.add(new ItemDto(ItemProtocol.item_pressLayerX2_interval, "压层X2间隔", "DB50.W890")); + list.add(new ItemDto(ItemProtocol.item_pressLayerY2_interval, "压层Y2间隔", "DB50.W892")); + list.add(new ItemDto(ItemProtocol.item_pressLayerX3_interval, "压层X3间隔", "DB50.W894")); + list.add(new ItemDto(ItemProtocol.item_pressLayerY3_interval, "压层Y3间隔", "DB50.W896")); + list.add(new ItemDto(ItemProtocol.item_pressLayerX1_offset, "压层X1偏移", "DB50.W898")); + list.add(new ItemDto(ItemProtocol.item_pressLayerY1_offset, "压层Y1偏移", "DB50.W900")); + list.add(new ItemDto(ItemProtocol.item_pressLayerX2_offset, "压层X2偏移", "DB50.W902")); + list.add(new ItemDto(ItemProtocol.item_pressLayerY2_offset, "压层Y2偏移", "DB50.W904")); + list.add(new ItemDto(ItemProtocol.item_pressLayerX3_offset, "压层X3偏移", "DB50.W906")); + list.add(new ItemDto(ItemProtocol.item_pressLayerY3_offset, "压层Y3偏移", "DB50.W908")); + list.add(new ItemDto(ItemProtocol.item_one_cribTotal, "1#垛总数", "DB50.W910")); + list.add(new ItemDto(ItemProtocol.item_two_cribTotal, "2#垛总数", "DB50.W912")); + list.add(new ItemDto(ItemProtocol.item_one_qty, "1#垛当前数", "DB50.W914")); + list.add(new ItemDto(ItemProtocol.item_two_qty, "2#垛当前数", "DB50.W916")); + list.add(new ItemDto(ItemProtocol.item_tool_coordinate, "工具坐标", "DB50.D918")); + list.add(new ItemDto(ItemProtocol.item_order_qty, "工单数量", "DB50.D920")); + list.add(new ItemDto(ItemProtocol.item_order_No, "工单号", "DB50.STRING924.50")); return list; } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/ItemProtocol.java index 044ad18..98b9c4b 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/ItemProtocol.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/ItemProtocol.java @@ -146,9 +146,9 @@ public class ItemProtocol { list.add(new ItemDto(item_task, "任务号", "DB4.D6")); list.add(new ItemDto(item_weight, "重量", "DB4.D10")); list.add(new ItemDto(item_batch, "批次", "DB4.D14")); - list.add(new ItemDto(item_specifications, "规格", "DB4.S18")); - list.add(new ItemDto(item_material, "物料", "DB4.S274")); - list.add(new ItemDto(item_barcode, "条码", "DB4.S530")); + list.add(new ItemDto(item_specifications, "规格", "DB4.STRING18.50")); + list.add(new ItemDto(item_material, "物料", "DB4.STRING274.50")); + list.add(new ItemDto(item_barcode, "条码", "DB4.STRING530.50")); list.add(new ItemDto(item_container_type, "托盘类型", "DB4.B786")); return list; } @@ -158,7 +158,7 @@ public class ItemProtocol { list.add(new ItemDto(item_to_command, "作业命令", "DB5.W0", Boolean.valueOf(true))); list.add(new ItemDto(item_to_target, "目标站", "DB5.W2")); list.add(new ItemDto(item_to_task, "任务号", "DB5.D4")); - list.add(new ItemDto(item_to_barcode, "条码", "DB5.S8")); + list.add(new ItemDto(item_to_barcode, "条码", "DB5.STRING8.50")); return list; } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDefination.java index f1bbc95..6be17be 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDefination.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDefination.java @@ -66,10 +66,10 @@ public class LnshStationDefination implements OpcDeviceDriverDefination { list.add(new ItemDto(ItemProtocol.item_task, "任务号", "DB4.D6")); list.add(new ItemDto(ItemProtocol.item_weight, "重量", "DB4.D10")); list.add(new ItemDto(ItemProtocol.item_batch, "批次", "DB4.D14")); - list.add(new ItemDto(ItemProtocol.item_specifications, "规格", "DB4.S18")); - list.add(new ItemDto(ItemProtocol.item_material, "物料", "DB4.S274")); - list.add(new ItemDto(ItemProtocol.item_barcode, "条码", "DB4.S530")); - list.add(new ItemDto(ItemProtocol.item_container_type, "托盘类型", "DB4.S786")); + list.add(new ItemDto(ItemProtocol.item_specifications, "规格", "DB4.STRING18.50")); + list.add(new ItemDto(ItemProtocol.item_material, "物料", "DB4.STRING274.50")); + list.add(new ItemDto(ItemProtocol.item_barcode, "条码", "DB4.STRING530.50")); + list.add(new ItemDto(ItemProtocol.item_container_type, "托盘类型", "DB4.B786")); return list; } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index c485b58..2c7bcdd 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -296,8 +296,9 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { throw new WDKException("物料编号不能为空！"); } lnshPalletizingManipulatorDeviceDriver.writing("to_order_No", producetask_code); - lnshPalletizingManipulatorDeviceDriver.writing("to_material_qty", qty); + lnshPalletizingManipulatorDeviceDriver.writing("to_order_qty", qty); lnshPalletizingManipulatorDeviceDriver.writing("to_material_code", material_code); + lnshPalletizingManipulatorDeviceDriver.writing(3); is_flag = true; } if (device.getDeviceDriver() instanceof LnshPackagePalletManipulatorDeviceDriver) { diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryMagicAgvTaskStatus.java b/acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryMagicAgvTaskStatus.java index e3de69a..28c99a3 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryMagicAgvTaskStatus.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryMagicAgvTaskStatus.java @@ -10,6 +10,7 @@ import lombok.extern.slf4j.Slf4j; import org.nl.acs.agv.server.MagicAgvService; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.util.List; @@ -21,8 +22,9 @@ import java.util.List; @Component @RequiredArgsConstructor public class QueryMagicAgvTaskStatus { - private final InstructionService instructionService; + private final InstructionService instructionService; + @Autowired MagicAgvService magicAgvService; diff --git a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_Laminating_machine.vue b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_Laminating_machine.vue index 15c2829..016892c 100644 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_Laminating_machine.vue +++ b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_Laminating_machine.vue @@ -373,10 +373,10 @@ export default { this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 3) } if (this.data1[val].code.indexOf('task') !== -1) { - this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 4) + this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 5) } if (this.data1[val].code.indexOf('barcode') !== -1) { - this.data1[val].db = beforeStr + '.' + 'S' + (parseInt(endNumber) + 5) + this.data1[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 9) + '.50' } } } @@ -403,7 +403,7 @@ export default { this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 4) } if (this.data2[val].code.indexOf('to_barcode') !== -1) { - this.data2[val].db = beforeStr + '.' + 'S' + (parseInt(endNumber) + 8) + this.data2[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 8) + '.50' } } } diff --git a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_palletizing_manipulator_site.vue b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_palletizing_manipulator_site.vue index 7a76204..b2cde71 100644 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_palletizing_manipulator_site.vue +++ b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_palletizing_manipulator_site.vue @@ -347,13 +347,13 @@ export default { this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 13) } if (this.data1[val].code.indexOf('specifications') !== -1) { - this.data1[val].db = beforeStr + '.' + 'S' + (parseInt(endNumber) + 17) + this.data1[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 17) + '.50' } if (this.data1[val].code.indexOf('material') !== -1) { - this.data1[val].db = beforeStr + '.' + 'S' + (parseInt(endNumber) + 273) + this.data1[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 273) + '.50' } if (this.data1[val].code.indexOf('barcode') !== -1) { - this.data1[val].db = beforeStr + '.' + 'S' + (parseInt(endNumber) + 529) + this.data1[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 529) + '.50' } if (this.data1[val].code.indexOf('AlongSide') !== -1) { this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 785) @@ -368,7 +368,7 @@ export default { this.data1[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 791) } if (this.data1[val].code.indexOf('status') !== -1) { - this.data1[val].db = beforeStr + '.' + 'B' + (parseInt(endNumber) + 794) + this.data1[val].db = beforeStr + '.' + 'B' + (parseInt(endNumber) + 795) } if (this.data1[val].code.indexOf('unqualified_qty') !== -1) { this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 795) @@ -380,7 +380,7 @@ export default { this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 803) } if (this.data1[val].code.indexOf('order_No') !== -1) { - this.data1[val].db = beforeStr + '.' + 'S' + (parseInt(endNumber) + 807) + this.data1[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 807) + '.50' } } } @@ -407,10 +407,10 @@ export default { this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 4) } if (this.data2[val].code.indexOf('to_barcode') !== -1) { - this.data2[val].db = beforeStr + '.' + 'S' + (parseInt(endNumber) + 8) + this.data2[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 8) + '.50' } if (this.data2[val].code.indexOf('to_error') !== -1) { - this.data2[val].db = beforeStr + '.' + 'B' + (parseInt(endNumber) + 265) + this.data2[val].db = beforeStr + '.' + 'B' + (parseInt(endNumber) + 264) } if (this.data2[val].code.indexOf('to_allow_pallet_qty') !== -1) { this.data2[val].db = beforeStr + '.' + 'W' + (parseInt(endNumber) + 266) @@ -428,7 +428,7 @@ export default { this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 280) } if (this.data2[val].code.indexOf('to_order_No') !== -1) { - this.data2[val].db = beforeStr + '.' + 'S' + (parseInt(endNumber) + 284) + this.data2[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 284) + '.50' } } } diff --git a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_station.vue b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_station.vue index f401102..ec82c0a 100644 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_station.vue +++ b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_station.vue @@ -350,13 +350,13 @@ export default { this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 13) } if (this.data1[val].code.indexOf('specifications') !== -1) { - this.data1[val].db = beforeStr + '.' + 'S' + (parseInt(endNumber) + 17) + this.data1[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 17) + '.50' } if (this.data1[val].code.indexOf('material') !== -1) { - this.data1[val].db = beforeStr + '.' + 'S' + (parseInt(endNumber) + 273) + this.data1[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 273) + '.50' } if (this.data1[val].code.indexOf('barcode') !== -1) { - this.data1[val].db = beforeStr + '.' + 'S' + (parseInt(endNumber) + 529) + this.data1[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 529) + '.50' } if (this.data1[val].code.indexOf('container_type') !== -1) { this.data1[val].db = beforeStr + '.' + 'B' + (parseInt(endNumber) + 785) @@ -386,7 +386,7 @@ export default { this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 4) } if (this.data2[val].code.indexOf('to_barcode') !== -1) { - this.data2[val].db = beforeStr + '.' + 'S' + (parseInt(endNumber) + 8) + this.data2[val].db = beforeStr + '.' + 'STRING' + (parseInt(endNumber) + 8) + '.50' } } }