From ef78240c776ec90b30ebe4112605ed21c8d6c907 Mon Sep 17 00:00:00 2001 From: tuqiang <437016993@qq.com> Date: Mon, 23 Sep 2024 13:22:18 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E5=8F=82=E6=95=B0=E9=A1=B5=E9=9D=A2=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...pedManipulatorManipulatorDeviceDriver.java | 1 + .../wms/service/impl/WmsToAcsServiceImpl.java | 35 +++++++++---------- .../src/components/Permission/permission.js | 2 +- acs2/nladmin-ui/src/i18n/langs/param/en.js | 3 ++ acs2/nladmin-ui/src/i18n/langs/param/in.js | 3 ++ acs2/nladmin-ui/src/i18n/langs/param/zh.js | 3 ++ .../src/views/system/param/index.vue | 21 +++++++++++ 7 files changed, 49 insertions(+), 19 deletions(-) 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 6ca95f045..0a1c2df4e 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 @@ -365,6 +365,7 @@ public class TrappedManipulatorManipulatorDeviceDriver extends AbstractOpcDevice logServer.deviceExecuteLog(device_code, "", "", "当前设备:" + device_code + ",下发指令:" + instructionReady.getInstruction_code() + ",指令起点:" + instructionReady.getStart_device_code() + ",指令终点:" + instructionReady.getNext_device_code() + ",交互参数：" + interactionJsonDTO.toString() + ",指令执行失败:" + e.getMessage()); + return false; } this.setRequireSucess(true); return true; 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 9d483a30f..048051930 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 @@ -556,7 +556,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { InflatableShaftLibraryDeviceDriver inflatableShaftLibraryDeviceDriver; HongXiangStationDeviceDriver hongXiangStationDeviceDriver; LampThreecolorDeviceDriver lampThreecolorDeviceDriver; - BeltConveyorDeviceDriver beltConveyorDeviceDriver ; + BeltConveyorDeviceDriver beltConveyorDeviceDriver; WasteFoilWeighingStationDriver wasteFoilWeighingStationDriver; FoldDiscSiteDeviceDriver foldDiscSiteDeviceDriver; TrappedManipulatorManipulatorDeviceDriver trappedManipulatorManipulatorDeviceDriver; @@ -569,11 +569,11 @@ 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); Device mxddhj1 = deviceAppService.findDeviceByCode("MXDDHJ1"); - trappedManipulatorManipulatorDeviceDriver= (TrappedManipulatorManipulatorDeviceDriver) mxddhj1.getDeviceDriver(); - if (StrUtil.equals(device_code,"CK2020")){ + trappedManipulatorManipulatorDeviceDriver = (TrappedManipulatorManipulatorDeviceDriver) mxddhj1.getDeviceDriver(); + if (StrUtil.equals(device_code, "CK2020")) { Map map1 = new HashMap<>(); List list = new ArrayList(); map1.put("code", "to_command"); @@ -581,7 +581,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { list.add(map1); trappedManipulatorManipulatorDeviceDriver.writing(list); } - if (StrUtil.equals(device_code,"CK2022")){ + if (StrUtil.equals(device_code, "CK2022")) { Map map2 = new HashMap<>(); List list = new ArrayList(); map2.put("code", "to_command"); @@ -654,11 +654,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"); } //称重确认信号 @@ -666,10 +666,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"); } @@ -716,11 +716,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); @@ -924,8 +924,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-ui/src/components/Permission/permission.js b/acs2/nladmin-ui/src/components/Permission/permission.js index ce66d1150..01244eb80 100644 --- a/acs2/nladmin-ui/src/components/Permission/permission.js +++ b/acs2/nladmin-ui/src/components/Permission/permission.js @@ -1,7 +1,7 @@ import store from '@/store' export default { - inserted(el, binding, vnode) { + inserted(el, binding) { const { value } = binding const roles = store.getters && store.getters.roles if (value && value instanceof Array && value.length > 0) { diff --git a/acs2/nladmin-ui/src/i18n/langs/param/en.js b/acs2/nladmin-ui/src/i18n/langs/param/en.js index b44538187..34f9158bb 100644 --- a/acs2/nladmin-ui/src/i18n/langs/param/en.js +++ b/acs2/nladmin-ui/src/i18n/langs/param/en.js @@ -3,6 +3,9 @@ export default { 'table': { 'code': 'Code', 'name': 'Name', + 'zh_name': '中文名称', + 'en_name': '英文名称', + 'in_name': '印尼名称', 'values': 'Value', 'description': 'Remark' }, diff --git a/acs2/nladmin-ui/src/i18n/langs/param/in.js b/acs2/nladmin-ui/src/i18n/langs/param/in.js index c5fd27df4..ae9d3c357 100644 --- a/acs2/nladmin-ui/src/i18n/langs/param/in.js +++ b/acs2/nladmin-ui/src/i18n/langs/param/in.js @@ -3,6 +3,9 @@ export default { 'table': { 'code': 'Kode', 'name': 'Nama', + 'zh_name': '中文名称', + 'en_name': '英文名称', + 'in_name': '印尼名称', 'values': 'Nilai', 'description': 'Catatan' }, diff --git a/acs2/nladmin-ui/src/i18n/langs/param/zh.js b/acs2/nladmin-ui/src/i18n/langs/param/zh.js index 1b045b6b2..f1f6b5fc3 100644 --- a/acs2/nladmin-ui/src/i18n/langs/param/zh.js +++ b/acs2/nladmin-ui/src/i18n/langs/param/zh.js @@ -3,6 +3,9 @@ export default { 'table': { 'code': '编码', 'name': '名称', + 'zh_name': '中文名称', + 'en_name': '英文名称', + 'in_name': '印尼名称', 'values': '值', 'description': '备注' }, diff --git a/acs2/nladmin-ui/src/views/system/param/index.vue b/acs2/nladmin-ui/src/views/system/param/index.vue index fb183fe4d..9cc2f083e 100644 --- a/acs2/nladmin-ui/src/views/system/param/index.vue +++ b/acs2/nladmin-ui/src/views/system/param/index.vue @@ -19,6 +19,15 @@ + + + + + + + + + @@ -72,6 +81,9 @@ const defaultForm = { id: null, code: null, name: null, + en_name: null, + zh_name: null, + in_name: null, value: null, remark: null, is_active: true @@ -109,6 +121,15 @@ export default { name: [ { required: true, message: this.$t('SysParam.rules.NotNull'), trigger: 'blur' } ], + zh_name: [ + { required: true, message: this.$t('SysParam.rules.NotNull'), trigger: 'blur' } + ], + en_name: [ + { required: true, message: this.$t('SysParam.rules.NotNull'), trigger: 'blur' } + ], + in_name: [ + { required: true, message: this.$t('SysParam.rules.NotNull'), trigger: 'blur' } + ], value: [ { required: true, message: this.$t('SysParam.rules.NotNull'), trigger: 'blur' } ]