From 050daf64d6678b8fdd5c28fe154a5c3ad62fa5ad Mon Sep 17 00:00:00 2001 From: yanps Date: Mon, 8 Jul 2024 16:58:39 +0800 Subject: [PATCH] =?UTF-8?q?opt:=20=E9=A1=B5=E9=9D=A2=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96,agv=E8=B4=A7=E4=BD=8D=E5=9C=B0=E5=9D=80=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DeviceServiceImpl.java | 1 + .../agv/xg_agv_car/XgAgvCarDeviceDriver.java | 19 +++++++++--------- .../PullHeadManipulatorDeviceDriver.java | 2 +- .../SlitTwoManipulatorDeviceDriver.java | 6 +++--- acs2/nladmin-ui/src/i18n/langs/task/en.js | 1 + acs2/nladmin-ui/src/i18n/langs/task/in.js | 1 + acs2/nladmin-ui/src/i18n/langs/task/zh.js | 1 + .../device/driver/standard_inspect_site.vue | 4 ++-- acs2/nladmin-ui/src/views/acs/task/index.vue | 20 ++++++++++++++++--- .../src/views/monitor/lucene/index.vue | 4 ++-- .../src/views/system/monitor/device/index.vue | 2 +- 11 files changed, 40 insertions(+), 21 deletions(-) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java index b0df8826d..8966cb1e9 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java @@ -893,6 +893,7 @@ public class DeviceServiceImpl extends CommonServiceImpl i celldto.setCreate_time(now); StorageCell entity = ConvertUtil.convert(celldto, StorageCell.class); storageCellMapper.insert(entity); + storageCells.add(celldto); } } 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 2a275b95a..71eb45a03 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 @@ -211,9 +211,9 @@ public class XgAgvCarDeviceDriver extends AbstractDeviceDriver implements Device @Override public JSONObject getDeviceStatusName() { Map map = new LinkedHashMap<>(); - try{ + try { getAgvStatus(); - }catch (Exception e){ + } catch (Exception e) { message = "获取机器人状态报错"; } String isError; @@ -231,18 +231,19 @@ public class XgAgvCarDeviceDriver extends AbstractDeviceDriver implements Device } map.put("errors", isError); map.put("upload_scene_status", upload_scene_status); - map.put("procBusiness", procBusiness ? "是": "否"); - // map.put("current_order", current_order); + map.put("procBusiness", procBusiness ? "是" : "否"); + map.put("current_order", current_order); map.put("connection_status", "1".equals(connection_status) ? "连接上" : "断连"); map.put("dispatchable", dispatchable ? "可接单" : "不可接单"); - map.put("dispatchable_status", dispatchable_status == 1?"设置可接单" : dispatchable_status == 2?"设置不可接单(小车占用资源)" : dispatchable_status == 3?"设置不可接单(小车不占用资源)" : "未知"); - map.put("current_map_invalid", current_map_invalid ? "机器人不在地图场景中": "机器人在地图场景中"); + map.put("dispatchable_status", dispatchable_status == 1 ? "设置可接单" : dispatchable_status == 2 ? "设置不可接单(小车占用资源)" : dispatchable_status == 3 ? "设置不可接单(小车不占用资源)" : "未知"); + map.put("current_map_invalid", current_map_invalid ? "机器人不在地图场景中" : "机器人在地图场景中"); map.put("disconnect", disconnect ? "机器人断连" : "机器人连接上"); - map.put("low_battery", low_battery ? "低电量": "正常"); - map.put("suspended", suspended ? "订单被暂停,需要人工手动恢复": "正常"); + map.put("low_battery", low_battery ? "低电量" : "正常"); + map.put("suspended", suspended ? "订单被暂停,需要人工手动恢复" : "正常"); map.put("message", message); map.put("unconfirmed_reloc", unconfirmed_reloc ? "未确认定位" : "正常"); - map.put("unlock", unlock == 0 ? "控制权在core手上" : unlock == 1 ? "控制权被其他人抢走" : unlock == 2 ?"控制权没有被抢占" : "未知"); + map.put("unlock", unlock == 0 ? "控制权在core手上" : unlock == 1 ? "控制权被其他人抢走" : unlock == 2 ? "控制权没有被抢占" : "未知"); + map.put("move_2","有货"); JSONObject jo = new JSONObject(map); return jo; } 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 20be7c2f3..efb3377df 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 @@ -729,7 +729,7 @@ public class PullHeadManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp map.put("feedMessage", feedMessage); map.put("driver_type", "siemens_conveyor"); map.put("is_click", true); - map.put("message", message); + map.put("message", LangProcess.msg(message)); map.put("notCreateTaskMessage", LangProcess.msg(notCreateTaskMessage)); map.put("notCreateInstMessage", LangProcess.msg(notCreateInstMessage)); map.put("error", ErrorUtil.getDictDetail("bqhj_error_type", String.valueOf(this.getError()))); 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 d98b4aa21..eccbc630d 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 @@ -190,16 +190,16 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl // } else if (mode == 0) { this.setIsonline(false); - message = "universal_off-line"; + message = LangProcess.msg("universal_off-line"); //有报警 } else if (error != 0) { this.setIserror(true); - message = "universal_message3"; + message = LangProcess.msg("universal_message3"); //无报警 } else { this.setIsonline(true); this.setIserror(false); - message = "universal_operation"; + message = LangProcess.msg("universal_operation"); switch (mode) { case 1: log.debug("设备运转模式:等待工作"); diff --git a/acs2/nladmin-ui/src/i18n/langs/task/en.js b/acs2/nladmin-ui/src/i18n/langs/task/en.js index bc571ce9f..12a4304b9 100644 --- a/acs2/nladmin-ui/src/i18n/langs/task/en.js +++ b/acs2/nladmin-ui/src/i18n/langs/task/en.js @@ -22,6 +22,7 @@ export default { 'Task': 'Task', 'start_or_end': 'Origin Or Destination', 'time': 'Time', + 'empty_shaft_position': 'Empty shaft position', 'extension_field': 'Extension Field' }, 'select': { diff --git a/acs2/nladmin-ui/src/i18n/langs/task/in.js b/acs2/nladmin-ui/src/i18n/langs/task/in.js index b1c10a540..3563c5868 100644 --- a/acs2/nladmin-ui/src/i18n/langs/task/in.js +++ b/acs2/nladmin-ui/src/i18n/langs/task/in.js @@ -22,6 +22,7 @@ export default { 'Task': 'Tugas', 'start_or_end': 'Asal Atau Tujuan', 'time': 'Waktu', + 'empty_shaft_position': 'Posisi poros kosong', 'extension_field': 'Bidang Perluasan' }, 'select': { diff --git a/acs2/nladmin-ui/src/i18n/langs/task/zh.js b/acs2/nladmin-ui/src/i18n/langs/task/zh.js index 063726046..6c734df0a 100644 --- a/acs2/nladmin-ui/src/i18n/langs/task/zh.js +++ b/acs2/nladmin-ui/src/i18n/langs/task/zh.js @@ -22,6 +22,7 @@ export default { 'Task': '任务', 'start_or_end': '起点或终点', 'time': '时间段', + 'empty_shaft_position': '空轴位', 'extension_field': '扩展字段' }, 'select': { diff --git a/acs2/nladmin-ui/src/views/acs/device/driver/standard_inspect_site.vue b/acs2/nladmin-ui/src/views/acs/device/driver/standard_inspect_site.vue index 1d53b3ab9..0a169b040 100644 --- a/acs2/nladmin-ui/src/views/acs/device/driver/standard_inspect_site.vue +++ b/acs2/nladmin-ui/src/views/acs/device/driver/standard_inspect_site.vue @@ -73,7 +73,7 @@ - + diff --git a/acs2/nladmin-ui/src/views/acs/task/index.vue b/acs2/nladmin-ui/src/views/acs/task/index.vue index aba366f09..d164db0ea 100644 --- a/acs2/nladmin-ui/src/views/acs/task/index.vue +++ b/acs2/nladmin-ui/src/views/acs/task/index.vue @@ -429,8 +429,21 @@ - - + + + +
@@ -615,7 +628,7 @@ import i18n from '@/i18n' export default { name: 'Task', components: { pagination, crudOperation, rrOperation }, - dicts: ['task_status', 'task_type', 'agv_system_type', 'storage_task_type', 'kezhuan'], + dicts: ['task_status', 'task_type', 'agv_system_type', 'storage_task_type', 'kezhuan', 'empty_shaft_position'], mixins: [presenter(), header(), crud()], cruds() { return CRUD({ title: i18n.t('task.txt_box.Task'), url: 'api/task', idField: 'task_id', sort: 'task_id,desc', @@ -677,6 +690,7 @@ export default { formDia: false, isDisabled: false, deviceList: [], + empty_shaft_position: [], materialList: [], statusList: [], routeList: [], diff --git a/acs2/nladmin-ui/src/views/monitor/lucene/index.vue b/acs2/nladmin-ui/src/views/monitor/lucene/index.vue index c9c20977d..30fad03c3 100644 --- a/acs2/nladmin-ui/src/views/monitor/lucene/index.vue +++ b/acs2/nladmin-ui/src/views/monitor/lucene/index.vue @@ -14,7 +14,7 @@ > - + @@ -53,7 +53,7 @@ export default { page: 0 }, query: { - createTime: [new Date(new Date().setTime(new Date().getTime() - 3600 * 1000)), new Date(new Date().setTime(new Date().getTime() + 3600 * 1000))], + createTime: [new Date(new Date().setTime(new Date().getTime() - 3600 * 1000)), new Date(new Date().setTime(new Date().getTime() + 3600 * 1000))] } }) }, 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 57f44517e..4508d4fee 100644 --- a/acs2/nladmin-ui/src/views/system/monitor/device/index.vue +++ b/acs2/nladmin-ui/src/views/system/monitor/device/index.vue @@ -641,7 +641,7 @@ export default { const obj = { name: i18n.t('monitor.click.AGV_power'), value: data[val] } this.arr.push(obj) } else if (val === 'move_2') { - const obj = { name: i18n.t('monitor.click.station_photoelectric_signal'), value: data[val] } + const obj = { name: i18n.t('monitor.click.post-station_photoelectric_signal'), value: data[val] } this.arr.push(obj) } else if (val === 'action_1') { const obj = { name: i18n.t('monitor.click.front_station_action_signal'), value: data[val] }