From f729b25c988042d5c59b7517962414b19fd9a696 Mon Sep 17 00:00:00 2001 From: lishuai <1793460677@qq.com> Date: Thu, 8 Aug 2024 13:34:31 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=96=97=E5=B1=B1=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/service/impl/WmsToAcsServiceImpl.java | 60 +++++++---------- .../nl/system/service/menu/dao/SysMenu.java | 5 ++ .../nl/system/service/menu/dto/MenuDto.java | 4 ++ .../service/menu/impl/SysMenuServiceImpl.java | 2 + .../src/main/resources/config/application.yml | 2 +- acs2/nladmin-ui/src/i18n/langs/Korean.js | 2 +- .../src/i18n/langs/instruction/ko.js | 38 +++++++++++ acs2/nladmin-ui/src/i18n/langs/ko.js | 6 +- acs2/nladmin-ui/src/i18n/langs/menu/en.js | 1 + acs2/nladmin-ui/src/i18n/langs/menu/ko.js | 50 ++++++++++++++ acs2/nladmin-ui/src/i18n/langs/menu/zh.js | 1 + acs2/nladmin-ui/src/i18n/langs/role/ko.js | 23 +++++++ .../src/views/acs/instruction/index.vue | 67 +++---------------- .../src/views/system/menu/index.vue | 9 +++ 14 files changed, 174 insertions(+), 96 deletions(-) create mode 100644 acs2/nladmin-ui/src/i18n/langs/instruction/ko.js create mode 100644 acs2/nladmin-ui/src/i18n/langs/menu/ko.js create mode 100644 acs2/nladmin-ui/src/i18n/langs/role/ko.js diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index 11cbdf5..cd4e8f7 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -419,8 +419,8 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { @Override public Map updateTask(String whereJson) { - JSONArray datas = JSONArray.parseArray(whereJson); - log.info("WMS更新任务点位状态--------------:输入参数" + datas.toString()); + JSONObject jsonObject = JSON.parseObject(whereJson); + log.info("WMS更新任务点位状态--------------:输入参数" + jsonObject.toString()); LuceneLogDto logDto = LuceneLogDto.builder() .device_code("WMS更新任务点位状态") .content("WMS更新任务点位状态-----输入参数:" + whereJson) @@ -428,24 +428,14 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); JSONArray errArr = new JSONArray(); - if (datas.size() > 0) { - for (int i = 0; i < datas.size(); i++) { - JSONObject jsonObject = datas.getJSONObject(i); - String device_code = jsonObject.getString("device_code"); - //1-允许取放； - String option = jsonObject.getString("option"); - StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver; - Device device_k = deviceAppService.findDeviceByCode(device_code); - Device device_m = deviceAppService.findDeviceByCode(device_code); - if (device_k.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { - standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device_k.getDeviceDriver(); - standardOrdinarySiteDeviceDriver.setOption(Integer.parseInt(option)); - } - if (device_m.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { - standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device_m.getDeviceDriver(); - standardOrdinarySiteDeviceDriver.setOption(Integer.parseInt(option)); - } - } + String device_code = jsonObject.getString("device_code"); + //1-允许取放； + String option = jsonObject.getString("option"); + StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver; + Device device_k = deviceAppService.findDeviceByCode(device_code); + if (device_k.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { + standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device_k.getDeviceDriver(); + standardOrdinarySiteDeviceDriver.setOption(Integer.parseInt(option)); } JSONObject resultJson = new JSONObject(); if (ObjectUtil.isEmpty(errArr)) { @@ -458,6 +448,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { resultJson.put("errArr", errArr); } } + LuceneLogDto logDto1 = LuceneLogDto.builder() .device_code("WMS更新任务点位状态") .content("WMS更新任务点位状态-----返回参数:" + resultJson) @@ -508,7 +499,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { InflatableShaftLibraryDeviceDriver inflatableShaftLibraryDeviceDriver; HongXiangStationDeviceDriver hongXiangStationDeviceDriver; LampThreecolorDeviceDriver lampThreecolorDeviceDriver; - BeltConveyorDeviceDriver beltConveyorDeviceDriver ; + BeltConveyorDeviceDriver beltConveyorDeviceDriver; WasteFoilWeighingStationDriver wasteFoilWeighingStationDriver; FoldDiscSiteDeviceDriver foldDiscSiteDeviceDriver; if (device.getDeviceDriver() instanceof HongXiangStationDeviceDriver) { @@ -520,7 +511,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { lampThreecolorDeviceDriver.writing(code, value); } if (device.getDeviceDriver() instanceof BeltConveyorDeviceDriver) { - beltConveyorDeviceDriver=(BeltConveyorDeviceDriver) device.getDeviceDriver(); + beltConveyorDeviceDriver = (BeltConveyorDeviceDriver) device.getDeviceDriver(); beltConveyorDeviceDriver.writing(code, value); } if (device.getDeviceDriver() instanceof InflatableShaftLibraryDeviceDriver) { @@ -587,11 +578,11 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { wasteFoilWeighingStationDriver.writing("to_command", "6"); Thread.sleep(1000); //休眠1秒 while (wasteFoilWeighingStationDriver.getMode() == 6) { - jo.put("currentWeight", wasteFoilWeighingStationDriver.getWeight());//当前重量 - jo.put("lastWeight", wasteFoilWeighingStationDriver.getOld_weight());//上一次重量 - jo.put("weightGap", wasteFoilWeighingStationDriver.getGap_weight());//重量差 - break; - } + jo.put("currentWeight", wasteFoilWeighingStationDriver.getWeight());//当前重量 + jo.put("lastWeight", wasteFoilWeighingStationDriver.getOld_weight());//上一次重量 + jo.put("weightGap", wasteFoilWeighingStationDriver.getGap_weight());//重量差 + break; + } wasteFoilWeighingStationDriver.writing("to_command", "0"); } //称重确认信号 @@ -599,10 +590,10 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { wasteFoilWeighingStationDriver.writing("to_command", "7"); Thread.sleep(1000); //休眠1秒 while (wasteFoilWeighingStationDriver.getMode() == 7) { - jo.put("currentWeight", wasteFoilWeighingStationDriver.getWeight());//当前重量 - jo.put("lastWeight", wasteFoilWeighingStationDriver.getOld_weight());//上一次重量 - jo.put("weightGap", wasteFoilWeighingStationDriver.getGap_weight());//重量差 - break; + jo.put("currentWeight", wasteFoilWeighingStationDriver.getWeight());//当前重量 + jo.put("lastWeight", wasteFoilWeighingStationDriver.getOld_weight());//上一次重量 + jo.put("weightGap", wasteFoilWeighingStationDriver.getGap_weight());//重量差 + break; } wasteFoilWeighingStationDriver.writing("to_command", "0"); } @@ -649,11 +640,11 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { PaperTubePickSiteDeviceDriver paperTubePickSiteDeviceDriver; if (device.getDeviceDriver() instanceof PaperTubePickSiteDeviceDriver) { paperTubePickSiteDeviceDriver = (PaperTubePickSiteDeviceDriver) device.getDeviceDriver(); - if (ObjectUtil.isEmpty(to_material)){ + if (ObjectUtil.isEmpty(to_material)) { map.put("to_material", "0"); map.put("to_spec", "0"); map.put("to_qty", "0"); - }else { + } else { map.put("to_material", to_material); map.put("to_spec", to_spec); map.put("to_qty", to_qty); @@ -857,8 +848,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { jo.put("qty", foldDiscSiteDeviceDriver.getQty()); jo.put("container_type", foldDiscSiteDeviceDriver.getContainer_type()); jo.put("error", foldDiscSiteDeviceDriver.getError()); - } - else if (device.getDeviceDriver() instanceof InflatableShaftLibraryDeviceDriver) { + } else if (device.getDeviceDriver() instanceof InflatableShaftLibraryDeviceDriver) { inflatableShaftLibraryDeviceDriver = (InflatableShaftLibraryDeviceDriver) device.getDeviceDriver(); jo.put("device_code", parent_device_code); jo.put("move", inflatableShaftLibraryDeviceDriver.getMove()); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/SysMenu.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/SysMenu.java index dd3f3e2..597f84c 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/SysMenu.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/SysMenu.java @@ -73,6 +73,11 @@ public class SysMenu implements Serializable { */ private String in_title; + /** + * 菜单标题 + */ + private String ko_title; + /** * 组件名称 */ diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dto/MenuDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dto/MenuDto.java index 4a6c785..0681efd 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dto/MenuDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dto/MenuDto.java @@ -37,6 +37,7 @@ public class MenuDto extends BaseDTO implements Serializable { private String zh_title; private String en_title; private String in_title; + private String ko_title; private Integer menu_sort; @@ -104,6 +105,9 @@ public class MenuDto extends BaseDTO implements Serializable { if ("zh".equals(local)){ return zh_title; } + if ("ko".equals(local)){ + return ko_title; + } return title; } } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java index 95a2edb..53785e0 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java @@ -219,6 +219,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl sysDictMapper.delete(new QueryWrapper().eq("para1",menu.getMenu_id())); } menu.setTitle(resources.getTitle()); + menu.setKo_title(resources.getKo_title()); menu.setComponent(resources.getComponent()); menu.setPath(resources.getPath()); menu.setIcon(resources.getIcon()); @@ -366,6 +367,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl menuDto.setIn_title(entity.getIn_title()); menuDto.setEn_title(entity.getEn_title()); menuDto.setZh_title(entity.getZh_title()); + menuDto.setKo_title(entity.getKo_title()); menuDto.setMenu_sort(entity.getMenu_sort()); menuDto.setPath(entity.getPath()); menuDto.setComponent(entity.getComponent()); diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/config/application.yml b/acs2/nladmin-system/nlsso-server/src/main/resources/config/application.yml index 6eb5a1c..709369d 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/resources/config/application.yml +++ b/acs2/nladmin-system/nlsso-server/src/main/resources/config/application.yml @@ -6,7 +6,7 @@ spring: freemarker: check-template-location: false profiles: - active: dev + active: prod jackson: time-zone: GMT+8 data: diff --git a/acs2/nladmin-ui/src/i18n/langs/Korean.js b/acs2/nladmin-ui/src/i18n/langs/Korean.js index ebb0274..18406f3 100644 --- a/acs2/nladmin-ui/src/i18n/langs/Korean.js +++ b/acs2/nladmin-ui/src/i18n/langs/Korean.js @@ -2,7 +2,7 @@ import koLocale from 'element-ui/lib/locale/lang/ko' import ko from './ko' import menu from './menu/zh' import param from './param/zh' -import instruction from './instruction/zh' +import instruction from './instruction/ko' import task from './task/ko' import history from './history/zh' import device from './device/zh' diff --git a/acs2/nladmin-ui/src/i18n/langs/instruction/ko.js b/acs2/nladmin-ui/src/i18n/langs/instruction/ko.js new file mode 100644 index 0000000..424010b --- /dev/null +++ b/acs2/nladmin-ui/src/i18n/langs/instruction/ko.js @@ -0,0 +1,38 @@ +export default { + 'Inst': { + 'table': { + 'instruction_code': '명령 번호', + 'instruction_type': '명령 형식', + 'task_code': 'Task Code', + 'vehicle_code': 'Vehicle Code', + 'instruction_status': '명령 상태', + 'send_status': '발령 상태', + 'start_point_code': 'Start Device Code', + 'next_point_code': 'Next Device Code', + 'start_point_code2': 'Start Device Code 2', + 'next_point_code2': 'Next Device Code 2', + 'put_point_code': 'Put Point Code', + 'execute_device_code': '현재 실행 장치', + 'carno': 'Carno', + 'remark': 'Remark', + 'create_by': 'Created By', + 'create_time': 'Create Time', + 'update_by': 'Update By', + 'update_time': 'Update Time', + 'input_taskCode_or_instCode': '작업 번호나 명령 번호를 입력하십시오', + 'input_vehicleCode': 'Input VehicleCode', + 'material': 'Material Type', + 'task_status': '작업 상태', + 'input_startCode_or_nextCode': '시작점 혹은 끝점을 입력하다', + 'ready': 'Ready', + 'Execution': 'Execution', + 'Finish': '완료', + 'undelivered': 'Undelivered', + 'succeed': 'Succeed', + 'fail': 'Fail' + }, + 'rules': { + 'NotNull': 'Cannot Be Empty' + } + } +} diff --git a/acs2/nladmin-ui/src/i18n/langs/ko.js b/acs2/nladmin-ui/src/i18n/langs/ko.js index 4304d5c..e9c3ee6 100644 --- a/acs2/nladmin-ui/src/i18n/langs/ko.js +++ b/acs2/nladmin-ui/src/i18n/langs/ko.js @@ -45,9 +45,9 @@ export default { 'Reset': 'Reset', 'Confirm': 'Confirm', 'Cancel': 'Cancel', - 'Forced_cancellation': 'Forced_cancellation', - 'Initialize': 'Initialize', - 'Operate': 'Operate', + 'Forced_cancellation': '강제 취소', + 'Initialize': '초기화', + 'Operate': '조작', 'Refresh': 'Refresh', 'Closes': 'Close', 'Closes_l': 'Close Left', diff --git a/acs2/nladmin-ui/src/i18n/langs/menu/en.js b/acs2/nladmin-ui/src/i18n/langs/menu/en.js index cf3e4a7..48641a2 100644 --- a/acs2/nladmin-ui/src/i18n/langs/menu/en.js +++ b/acs2/nladmin-ui/src/i18n/langs/menu/en.js @@ -36,6 +36,7 @@ export default { 'zh_title': 'ZH-Title', 'en_title': 'EN-Title', 'id_title': 'ID-Title', + 'ko_title': 'KO-Title', 'router_path': 'Router Path', 'menu_sort': 'Menu Sort', 'component_name': 'Component Name', diff --git a/acs2/nladmin-ui/src/i18n/langs/menu/ko.js b/acs2/nladmin-ui/src/i18n/langs/menu/ko.js new file mode 100644 index 0000000..c54a949 --- /dev/null +++ b/acs2/nladmin-ui/src/i18n/langs/menu/ko.js @@ -0,0 +1,50 @@ +export default { + 'menu': { + 'title': 'Menu', + 'placeholder': { + 'fuzzy_search': 'Fuzzy Search', + 'owning_system': 'System', + 'choose_icon': 'Choose Icon', + 'component_tip': 'Match The Name Field Within The Component', + 'choose_superior_category': 'Choose Superior Category' + }, + 'table_title': { + 'menu_title': 'Title', + 'system': 'System', + 'icon': 'Icon', + 'sort': 'Sort', + 'permission_ident': 'Permission Mark', + 'path': 'Path', + 'outside_chain': 'Out Chain', + 'cache': 'Cache', + 'visible': 'Visible', + 'create_time': 'Create Time', + 'SystemParam': 'System Parameters' + }, + 'dialog': { + 'menu_type': 'Menu Type', + 'system': 'System', + 'catalogue': 'Catalogue', + 'menu': 'Menu', + 'button': 'Button', + 'button_name': 'Button Name', + 'menu_icon': 'Menu Icon', + 'menu_chain': 'Menu Chain', + 'menu_cache': 'Menu Cache', + 'menu_visible': 'Menu Visible', + 'default_title': 'Default Title', + 'zh_title': 'ZH-Title', + 'en_title': 'EN-Title', + 'id_title': 'ID-Title', + 'ko_title': '한국 제목', + 'router_path': 'Router Path', + 'menu_sort': 'Menu Sort', + 'component_name': 'Component Name', + 'component_path': 'Component Path', + 'superior_class': 'Superior Class' + }, + 'msg': { + 'delete_msg': 'Are You Sure To Delete It? If There Are Subordinate Nodes, They Will Be Deleted Together. This Operation Cannot Be Undone!' + } + } +} diff --git a/acs2/nladmin-ui/src/i18n/langs/menu/zh.js b/acs2/nladmin-ui/src/i18n/langs/menu/zh.js index 7a1c0ae..d444a06 100644 --- a/acs2/nladmin-ui/src/i18n/langs/menu/zh.js +++ b/acs2/nladmin-ui/src/i18n/langs/menu/zh.js @@ -36,6 +36,7 @@ export default { 'zh_title': '中文标题', 'en_title': '英文标题', 'id_title': '印尼标题', + 'ko_title': '韩国标题', 'router_path': '路由地址', 'menu_sort': '菜单排序', 'component_name': '组件名称', diff --git a/acs2/nladmin-ui/src/i18n/langs/role/ko.js b/acs2/nladmin-ui/src/i18n/langs/role/ko.js new file mode 100644 index 0000000..b1df0d7 --- /dev/null +++ b/acs2/nladmin-ui/src/i18n/langs/role/ko.js @@ -0,0 +1,23 @@ +export default { + 'role': { + 'table_title': { + 'taskCode_or_instCode': 'Task Number (Instruction Number)', + 'input_taskCode_or_instCode': '작업 번호나 명령 번호를 입력하십시오' + }, + 'table_value': { + 'roleList': 'List Of Roles', + 'Name': 'Name', + 'Description': 'Description', + 'CreateDate': 'CreateDate', + 'Operate': 'Operate', + 'Role': 'Role' + }, + 'other': { + 'Menu_assignments': 'Menu Assignments', + 'Save': 'Save' + }, + 'msg': { + 'delete_msg': 'Confirm That One Of The Selected Data Items Is Deleted?' + } + } +} diff --git a/acs2/nladmin-ui/src/views/acs/instruction/index.vue b/acs2/nladmin-ui/src/views/acs/instruction/index.vue index 6b37928..88f1196 100644 --- a/acs2/nladmin-ui/src/views/acs/instruction/index.vue +++ b/acs2/nladmin-ui/src/views/acs/instruction/index.vue @@ -21,31 +21,6 @@ @keyup.enter.native="crud.toQuery" /> - - - - - - - - - + - + - - - - - -
{{ $t('auto.common.Cancel') }} @@ -146,19 +115,9 @@ {{ dict.label.task_type[scope.row.instruction_type] }} - - - - - - + - - - - - + + - - - - - + + + + - {{ $t('user.other.More') }} + {{ $t('task.select.More') }} - {{ $t('auto.common.Cancel') }} + {{ $t('task.select.Cancel') }} {{ $t('auto.common.Forced_cancellation') }} diff --git a/acs2/nladmin-ui/src/views/system/menu/index.vue b/acs2/nladmin-ui/src/views/system/menu/index.vue index 4d51fc2..39fc949 100644 --- a/acs2/nladmin-ui/src/views/system/menu/index.vue +++ b/acs2/nladmin-ui/src/views/system/menu/index.vue @@ -123,6 +123,14 @@ :placeholder="$t('menu.dialog.id_title')" /> + + + + @@ -256,6 +264,7 @@ const defaultForm = { en_title: null, in_title: null, zh_title: null, + ko_title: null, menu_sort: 999, path: null, system_type: null,