From 9b2c62f920173360e6b3465511899bd2a2c3b186 Mon Sep 17 00:00:00 2001 From: tuqiang <437016993@qq.com> Date: Wed, 28 Aug 2024 09:49:02 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E8=A7=A3=E5=86=B3=E7=9B=91=E6=8E=A7?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=8A=A5=E9=94=99=E4=BB=A5=E5=8F=8A=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=A0=86=E5=8F=A0=E8=A1=8C=E6=9E=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=B8=8B=E5=8F=91=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../agv/xg_agv_car/XgAgvCarDeviceDriver.java | 16 ++-- .../BoxStorageOutConveyorDeviceDriver.java | 1 + ...pedManipulatorManipulatorDeviceDriver.java | 73 ++++++++++--------- .../device_driver/rgv/RgvDeviceDriver.java | 16 ++++ .../StandardStackerDeviceDriver.java | 1 - .../PlugPullDeviceSiteDeviceDriver.java | 34 +++++++++ .../PullHeadManipulatorDeviceDriver.java | 11 +++ .../PullTailManipulatorDeviceDriver.java | 16 ++++ .../SlitTwoManipulatorDeviceDriver.java | 11 +++ .../SubvolumeWeighingStationDriver.java | 2 +- .../impl/DeviceStageMonitorServiceImpl.java | 1 - .../src/main/resources/logback-spring.xml | 2 +- acs2/nladmin-ui/src/i18n/langs/monitor/en.js | 3 +- acs2/nladmin-ui/src/i18n/langs/monitor/in.js | 3 +- acs2/nladmin-ui/src/i18n/langs/monitor/zh.js | 3 +- .../src/views/system/monitor/device/index.vue | 3 + 16 files changed, 150 insertions(+), 46 deletions(-) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/xg_agv_car/XgAgvCarDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/xg_agv_car/XgAgvCarDeviceDriver.java index fd203e5f7..2d489ab62 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/xg_agv_car/XgAgvCarDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/xg_agv_car/XgAgvCarDeviceDriver.java @@ -210,17 +210,21 @@ public class XgAgvCarDeviceDriver extends AbstractDeviceDriver implements Device @Override public void execute() { - - } - - @Override - public JSONObject getDeviceStatusName() { - Map map = new LinkedHashMap<>(); try { getAgvStatus(); } catch (Exception e) { message = "获取机器人状态报错"; } + } + + @Override + public JSONObject getDeviceStatusName() { + Map map = new LinkedHashMap<>(); +// try { +// getAgvStatus(); +// } catch (Exception e) { +// message = "获取机器人状态报错"; +// } String isError; if (is_error) { isError = "出错,不执行任何运单"; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_storage_out_conveyor/BoxStorageOutConveyorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_storage_out_conveyor/BoxStorageOutConveyorDeviceDriver.java index e048467fc..f5d82e9cb 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_storage_out_conveyor/BoxStorageOutConveyorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_storage_out_conveyor/BoxStorageOutConveyorDeviceDriver.java @@ -656,6 +656,7 @@ public class BoxStorageOutConveyorDeviceDriver extends AbstractOpcDeviceDriver i map.put("isOnline", this.getIsonline()); map.put("isError", this.getIserror()); map.put("hand_barcode", hand_barcode); + map.put("material_barcode", this.material_barcode); map.put("barcode", this.getMove() == 0 ? null : checkInst() == null ? vehicle_code : checkInst().getVehicle_code()); map.put("is_click", true); map.put("error", ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(this.getError()))); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/trapped_manipulator/TrappedManipulatorManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/trapped_manipulator/TrappedManipulatorManipulatorDeviceDriver.java index 648997bb0..6ca95f045 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/trapped_manipulator/TrappedManipulatorManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/trapped_manipulator/TrappedManipulatorManipulatorDeviceDriver.java @@ -382,8 +382,46 @@ public class TrappedManipulatorManipulatorDeviceDriver extends AbstractOpcDevice } } if (CollUtil.isNotEmpty(taskDtosReady)) { - List taskDtoList = taskDtosReady.stream().sorted(Comparator.comparing(TaskDto::getCreate_time)).collect(Collectors.toList()); - taskDto = taskDtoList.get(0); + for (TaskDto dto : taskDtosReady) { + String start_device_code = dto.getStart_device_code(); + String next_device_code = dto.getNext_device_code(); + Device startDevice = deviceAppService.findDeviceByCode(start_device_code); + Device nextDevice = deviceAppService.findDeviceByCode(next_device_code); + BeltConveyorDeviceDriver beltConveyorDeviceDriverStart; + BeltConveyorDeviceDriver beltConveyorDeviceDriverEnd; + + if (startDevice.getDeviceDriver() instanceof BeltConveyorDeviceDriver) { + beltConveyorDeviceDriverStart = (BeltConveyorDeviceDriver) startDevice.getDeviceDriver(); + if (beltConveyorDeviceDriverStart.getMove() != 1) { + notCreateInstMessage = "universal_notCreateInstMessage2"; + continue; + } + } + if (nextDevice.getDeviceDriver() instanceof BeltConveyorDeviceDriver) { + beltConveyorDeviceDriverEnd = (BeltConveyorDeviceDriver) nextDevice.getDeviceDriver(); + if (beltConveyorDeviceDriverEnd.getMove() == 1 && beltConveyorDeviceDriverEnd.getMode() == 2) { + LuceneLogDto logDto = LuceneLogDto.builder() + .device_code(device_code) + .content("当前任务号：" + dto.getTask_code() + " " + next_device_code + "当前move值为：" + beltConveyorDeviceDriverEnd.getMove() + "，当前mode值为："+beltConveyorDeviceDriverEnd.getMode()) + .build(); + logDto.setLog_level(4); + luceneExecuteLogService.deviceExecuteLog(logDto); + taskDto = dto; + }else { + LuceneLogDto logDto = LuceneLogDto.builder() + .device_code(device_code) + .content("当前任务号：" + dto.getTask_code() + " " + next_device_code + "当前move值为：" + beltConveyorDeviceDriverEnd.getMove() + "，当前mode值为："+beltConveyorDeviceDriverEnd.getMode()) + .build(); + logDto.setLog_level(4); + luceneExecuteLogService.deviceExecuteLog(logDto); + notCreateInstMessage = "universal_notCreateInstMessage2"; + continue; + } + } + if (ObjectUtil.isNotEmpty(taskDto)){ + break; + } + } } if (ObjectUtil.isNotEmpty(taskDto)) { String interactionJson = taskDto.getInteraction_json(); @@ -404,37 +442,6 @@ public class TrappedManipulatorManipulatorDeviceDriver extends AbstractOpcDevice } - BeltConveyorDeviceDriver beltConveyorDeviceDriverStart; - BeltConveyorDeviceDriver beltConveyorDeviceDriverEnd; - - if (startDevice.getDeviceDriver() instanceof BeltConveyorDeviceDriver) { - beltConveyorDeviceDriverStart = (BeltConveyorDeviceDriver) startDevice.getDeviceDriver(); - if (beltConveyorDeviceDriverStart.getMove() != 1 && beltConveyorDeviceDriverStart.getMode() != 2) { - notCreateInstMessage = "universal_notCreateInstMessage2"; - return false; - } - } - if (nextDevice.getDeviceDriver() instanceof BeltConveyorDeviceDriver) { - beltConveyorDeviceDriverEnd = (BeltConveyorDeviceDriver) nextDevice.getDeviceDriver(); - if (beltConveyorDeviceDriverEnd.getMove() == 1 && beltConveyorDeviceDriverEnd.getMode() == 2) { - LuceneLogDto logDto = LuceneLogDto.builder() - .device_code(device_code) - .content("当前任务号：" + taskDto.getTask_code() + " " + next_device_code + "当前move值为：" + beltConveyorDeviceDriverEnd.getMove() + "，当前mode值为："+beltConveyorDeviceDriverEnd.getMode()) - .build(); - logDto.setLog_level(4); - luceneExecuteLogService.deviceExecuteLog(logDto); - }else { - LuceneLogDto logDto = LuceneLogDto.builder() - .device_code(device_code) - .content("当前任务号：" + taskDto.getTask_code() + " " + next_device_code + "当前move值为：" + beltConveyorDeviceDriverEnd.getMove() + "，当前mode值为："+beltConveyorDeviceDriverEnd.getMode()) - .build(); - logDto.setLog_level(4); - luceneExecuteLogService.deviceExecuteLog(logDto); - notCreateInstMessage = "universal_notCreateInstMessage2"; - return false; - } - } - String taskid = taskDto.getTask_id(); String taskcode = taskDto.getTask_code(); String start_point_code = taskDto.getStart_point_code(); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/rgv/RgvDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/rgv/RgvDeviceDriver.java index 2d80adf33..1abf1df82 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/rgv/RgvDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/rgv/RgvDeviceDriver.java @@ -147,6 +147,8 @@ public class RgvDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDr String notCreateInstMessage = ""; String feedMessage = ""; + String volume_code; + List getDeviceCodeList = null; @@ -180,6 +182,19 @@ public class RgvDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDr requireSucess = false; } + if (task > 0) { + inst = checkInst(); + if (null != inst) { + TaskDto dto = taskserver.findByCode(inst.getTask_code()); + String interaction_json = dto.getInteraction_json(); + if (StrUtil.isNotEmpty(interaction_json)) { + JSONObject jsonObject = JSONObject.parseObject(interaction_json); + //子卷号 + volume_code = jsonObject.getString("containers"); + } + } + } + } catch (Exception var17) { var17.printStackTrace(); @@ -394,6 +409,7 @@ public class RgvDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDr jo.put("notCreateInstMessage",notCreateInstMessage);*/ map.put("feedMessage", LangProcess.msg(feedMessage)); map.put("driver_type", "siemens_conveyor"); + map.put("volume_code", this.volume_code); map.put("is_click", true); JSONObject jo = new JSONObject(map); return jo; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java index 838f874cf..2df65050e 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java @@ -657,7 +657,6 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme try { updateEXcuteMessage(error.toString()); applyUpdatePointCode(StandarStirageErroEnum.VOIDANCE.getType()); - } catch (Exception e) { throw new RuntimeException(e); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java index 6159fe605..8f27441de 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java @@ -164,6 +164,8 @@ public class PlugPullDeviceSiteDeviceDriver extends AbstractOpcDeviceDriver impl String device_code; + String volume_code; + String message = null; private Date instruction_require_time = new Date(); private int instruction_require_time_out = 3000; @@ -211,6 +213,19 @@ public class PlugPullDeviceSiteDeviceDriver extends AbstractOpcDeviceDriver impl requireSucess = false; } + if (task > 0) { + inst = checkInst(); + if (null != inst) { + TaskDto dto = taskserver.findByCode(inst.getTask_code()); + String interaction_json = dto.getInteraction_json(); + if (StrUtil.isNotEmpty(interaction_json)) { + JSONObject jsonObject = JSONObject.parseObject(interaction_json); + //子卷号 + volume_code = jsonObject.getString("containers"); + } + } + } + if (mode == 0) { this.setIsonline(false); @@ -904,6 +919,8 @@ public class PlugPullDeviceSiteDeviceDriver extends AbstractOpcDeviceDriver impl jo.put("device_name", this.getDevice().getDevice_name()); jo.put("mode", mode); jo.put("move", move); +// jo.put("task", task); + jo.put("volume_code", this.volume_code); jo.put("action", action); jo.put("error", ErrorUtil.getDictDetail("cbj_error_type", String.valueOf(this.getError()))); jo.put("isOnline", this.getIsonline()); @@ -912,6 +929,23 @@ public class PlugPullDeviceSiteDeviceDriver extends AbstractOpcDeviceDriver impl return jo; } + public Instruction checkInst() { + if (ObjectUtil.isNotEmpty(this.inst)) { + if (this.task > 0) { + if (this.inst.getInstruction_code().equals(String.valueOf(this.task))) { + return this.inst; + } else { + inst = instructionService.findByCodeFromCache(String.valueOf(task)); + return inst; + } + } + } else { + inst = instructionService.findByCodeFromCache(String.valueOf(task)); + return inst; + } + return null; + } + @Override public void setDeviceStatus(JSONObject data) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java index 2daefc951..008f10ca0 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java @@ -151,6 +151,8 @@ public class PullHeadManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp String device_code; + String volume_code; + //当前指令 Instruction inst = null; @@ -199,6 +201,14 @@ public class PullHeadManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp // 更新指令状态 if (mode == 3 && task > 0) { + inst = checkInst(); + if (null != inst) { + TaskDto dto = taskserver.findByCode(inst.getTask_code()); + String interaction_json = dto.getInteraction_json(); + JSONObject jsonObject = JSONObject.parseObject(interaction_json); + //子卷号 + volume_code = jsonObject.getString("containers"); + } Date date = new Date(); if (date.getTime() - this.instruction_update_time.getTime() < (long) this.instruction_update_time_out) { log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_update_time_out); @@ -940,6 +950,7 @@ public class PullHeadManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp map.put("move", move); map.put("action", action); map.put("task", task); + map.put("volume_code", this.volume_code); map.put("walk_y", walkY); map.put("isOnline", this.getIsonline()); map.put("isError", this.getIserror()); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/PullTailManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/PullTailManipulatorDeviceDriver.java index a9ea13b24..bbfea0f06 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/PullTailManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/PullTailManipulatorDeviceDriver.java @@ -147,6 +147,8 @@ public class PullTailManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp String device_code; + String volume_code; + //当前指令 Instruction inst = null; @@ -191,6 +193,19 @@ public class PullTailManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp requireSucess = false; } + if (task > 0) { + inst = checkInst(); + if (null != inst) { + TaskDto dto = taskserver.findByCode(inst.getTask_code()); + String interaction_json = dto.getInteraction_json(); + if (StrUtil.isNotEmpty(interaction_json)) { + JSONObject jsonObject = JSONObject.parseObject(interaction_json); + //子卷号 + volume_code = jsonObject.getString("containers"); + } + } + } + // 更新指令状态 if (mode == 3 && task > 0) { Date date = new Date(); @@ -644,6 +659,7 @@ public class PullTailManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp map.put("mode", mode); map.put("move", move); map.put("action", action); + map.put("volume_code", this.volume_code); map.put("isOnline", this.getIsonline()); map.put("error", ErrorUtil.getDictDetail("bhhj_error_type", String.valueOf(this.getError()))); map.put("isError", this.getIserror()); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java index b4e4e9cbc..82b19c64f 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java @@ -126,6 +126,8 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl String device_code; + String volume_code; + //请求超时时间 private int instruction_require_time_out = 3000; @@ -173,6 +175,14 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl } if (mode == 3 && task > 0 && !requireSucess) { + inst = checkInst(); + if (null != inst) { + TaskDto dto = taskserver.findByCode(inst.getTask_code()); + String interaction_json = dto.getInteraction_json(); + JSONObject jsonObject = JSONObject.parseObject(interaction_json); + //子卷号 + volume_code = jsonObject.getString("containers"); + } update_instruction_status(); } @@ -847,6 +857,7 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl jo.put("walk_y", walk_y); jo.put("error", ErrorUtil.getDictDetail("fqhj_error_type", String.valueOf(this.getError()))); jo.put("task", this.getTask()); + jo.put("volume_code", this.volume_code); jo.put("isOnline", this.getIsonline()); jo.put("isError", this.getIserror()); jo.put("is_disable1", this.getIs_disable()); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/subvolume_weighing_station/SubvolumeWeighingStationDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/subvolume_weighing_station/SubvolumeWeighingStationDriver.java index 0dded8a7f..6546991b3 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/subvolume_weighing_station/SubvolumeWeighingStationDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/subvolume_weighing_station/SubvolumeWeighingStationDriver.java @@ -118,7 +118,7 @@ public class SubvolumeWeighingStationDriver extends AbstractOpcDeviceDriver impl } @Override - public JSONObject getDeviceStatusName() throws Exception { + public JSONObject getDeviceStatusName() { JSONObject jo = new JSONObject(); String mode = ""; String move = ""; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/monitor/service/impl/DeviceStageMonitorServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/monitor/service/impl/DeviceStageMonitorServiceImpl.java index da528175e..a9fc42a19 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/monitor/service/impl/DeviceStageMonitorServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/monitor/service/impl/DeviceStageMonitorServiceImpl.java @@ -55,7 +55,6 @@ public class DeviceStageMonitorServiceImpl implements DeviceStageMonitorService obj.put("id", js.getString("id")); arr.add(obj); } - return arr; } } diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml b/acs2/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml index 4fd18503a..e015c110d 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml +++ b/acs2/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml @@ -54,7 +54,7 @@ https://juejin.cn/post/6844903775631572999 - + 0 500 diff --git a/acs2/nladmin-ui/src/i18n/langs/monitor/en.js b/acs2/nladmin-ui/src/i18n/langs/monitor/en.js index ec42f33a7..ee7764767 100644 --- a/acs2/nladmin-ui/src/i18n/langs/monitor/en.js +++ b/acs2/nladmin-ui/src/i18n/langs/monitor/en.js @@ -141,7 +141,8 @@ export default { 'The_signal_is_successfully_marked': 'The signal is successfully marked', 'Complement_information': 'Complement information', 'agv_task_type': 'task type', - 'vehicle_code2': 'Box number' + 'vehicle_code2': 'Box number', + 'volume_code': 'Sub volume number' } } } diff --git a/acs2/nladmin-ui/src/i18n/langs/monitor/in.js b/acs2/nladmin-ui/src/i18n/langs/monitor/in.js index 5bee8e404..30fc0e49a 100644 --- a/acs2/nladmin-ui/src/i18n/langs/monitor/in.js +++ b/acs2/nladmin-ui/src/i18n/langs/monitor/in.js @@ -141,7 +141,8 @@ export default { 'The_signal_is_successfully_marked': 'Sinyal berhasil ditandai', 'Complement_information': 'Informasi pelengkap', 'agv_task_type': 'Jenis tugas', - 'vehicle_code2': 'Nomor kotak kayu' + 'vehicle_code2': 'Nomor kotak kayu', + 'volume_code': 'Nomor volume sub' } } } diff --git a/acs2/nladmin-ui/src/i18n/langs/monitor/zh.js b/acs2/nladmin-ui/src/i18n/langs/monitor/zh.js index de1e20282..8c2667e1c 100644 --- a/acs2/nladmin-ui/src/i18n/langs/monitor/zh.js +++ b/acs2/nladmin-ui/src/i18n/langs/monitor/zh.js @@ -141,7 +141,8 @@ export default { 'The_signal_is_successfully_marked': '信号成功标记', 'Complement_information': '补码信息', 'agv_task_type': '任务类型', - 'vehicle_code2': '木箱号' + 'vehicle_code2': '木箱号', + 'volume_code': '子卷号' } } } diff --git a/acs2/nladmin-ui/src/views/system/monitor/device/index.vue b/acs2/nladmin-ui/src/views/system/monitor/device/index.vue index fce530d81..68da16c06 100644 --- a/acs2/nladmin-ui/src/views/system/monitor/device/index.vue +++ b/acs2/nladmin-ui/src/views/system/monitor/device/index.vue @@ -808,6 +808,9 @@ export default { } else if (val === 'vehicle_code2') { const obj = { name: i18n.t('monitor.click.vehicle_code2'), value: data[val] } this.arr.push(obj) + } else if (val === 'volume_code') { + const obj = { name: i18n.t('monitor.click.volume_code'), value: data[val] } + this.arr.push(obj) } } }