root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：修复系统参数页面名称不显示问题

Browse Source
This commit is contained in:
tuqiang
2024-09-23 13:22:18 +08:00
parent dc57de39c5
commit ef78240c77
7 changed files with 49 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/trapped_manipulator/TrappedManipulatorManipulatorDeviceDriver.java
View File

@@ -365,6 +365,7 @@ public class TrappedManipulatorManipulatorDeviceDriver extends AbstractOpcDevice
logServer.deviceExecuteLog(device_code, "", "", "当前设备:" + device_code + ",下发指令:" logServer.deviceExecuteLog(device_code, "", "", "当前设备:" + device_code + ",下发指令:"
+ instructionReady.getInstruction_code() + ",指令起点:" + instructionReady.getStart_device_code() + instructionReady.getInstruction_code() + ",指令起点:" + instructionReady.getStart_device_code()
+ ",指令终点:" + instructionReady.getNext_device_code() + ",交互参数：" + interactionJsonDTO.toString() + ",指令执行失败:" + e.getMessage()); + ",指令终点:" + instructionReady.getNext_device_code() + ",交互参数：" + interactionJsonDTO.toString() + ",指令执行失败:" + e.getMessage());
return false;
} }
this.setRequireSucess(true); this.setRequireSucess(true);
return true; return true;

35
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
View File

@@ -556,7 +556,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
InflatableShaftLibraryDeviceDriver inflatableShaftLibraryDeviceDriver; InflatableShaftLibraryDeviceDriver inflatableShaftLibraryDeviceDriver;
HongXiangStationDeviceDriver hongXiangStationDeviceDriver; HongXiangStationDeviceDriver hongXiangStationDeviceDriver;
LampThreecolorDeviceDriver lampThreecolorDeviceDriver; LampThreecolorDeviceDriver lampThreecolorDeviceDriver;
BeltConveyorDeviceDriver beltConveyorDeviceDriver ; BeltConveyorDeviceDriver beltConveyorDeviceDriver;
WasteFoilWeighingStationDriver wasteFoilWeighingStationDriver; WasteFoilWeighingStationDriver wasteFoilWeighingStationDriver;
FoldDiscSiteDeviceDriver foldDiscSiteDeviceDriver; FoldDiscSiteDeviceDriver foldDiscSiteDeviceDriver;
TrappedManipulatorManipulatorDeviceDriver trappedManipulatorManipulatorDeviceDriver; TrappedManipulatorManipulatorDeviceDriver trappedManipulatorManipulatorDeviceDriver;
@@ -569,11 +569,11 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
lampThreecolorDeviceDriver.writing(code, value); lampThreecolorDeviceDriver.writing(code, value);
} }
if (device.getDeviceDriver() instanceof BeltConveyorDeviceDriver) { if (device.getDeviceDriver() instanceof BeltConveyorDeviceDriver) {
beltConveyorDeviceDriver=(BeltConveyorDeviceDriver) device.getDeviceDriver(); beltConveyorDeviceDriver = (BeltConveyorDeviceDriver) device.getDeviceDriver();
beltConveyorDeviceDriver.writing(code, value); beltConveyorDeviceDriver.writing(code, value);
Device mxddhj1 = deviceAppService.findDeviceByCode("MXDDHJ1"); Device mxddhj1 = deviceAppService.findDeviceByCode("MXDDHJ1");
trappedManipulatorManipulatorDeviceDriver= (TrappedManipulatorManipulatorDeviceDriver) mxddhj1.getDeviceDriver(); trappedManipulatorManipulatorDeviceDriver = (TrappedManipulatorManipulatorDeviceDriver) mxddhj1.getDeviceDriver();
if (StrUtil.equals(device_code,"CK2020")){ if (StrUtil.equals(device_code, "CK2020")) {
Map<String, Object> map1 = new HashMap<>(); Map<String, Object> map1 = new HashMap<>();
List list = new ArrayList(); List list = new ArrayList();
map1.put("code", "to_command"); map1.put("code", "to_command");
@@ -581,7 +581,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
list.add(map1); list.add(map1);
trappedManipulatorManipulatorDeviceDriver.writing(list); trappedManipulatorManipulatorDeviceDriver.writing(list);
} }
if (StrUtil.equals(device_code,"CK2022")){ if (StrUtil.equals(device_code, "CK2022")) {
Map<String, Object> map2 = new HashMap<>(); Map<String, Object> map2 = new HashMap<>();
List list = new ArrayList(); List list = new ArrayList();
map2.put("code", "to_command"); map2.put("code", "to_command");
@@ -654,11 +654,11 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
wasteFoilWeighingStationDriver.writing("to_command", "6"); wasteFoilWeighingStationDriver.writing("to_command", "6");
Thread.sleep(1000); //休眠1秒 Thread.sleep(1000); //休眠1秒
while (wasteFoilWeighingStationDriver.getMode() == 6) { while (wasteFoilWeighingStationDriver.getMode() == 6) {
jo.put("currentWeight", wasteFoilWeighingStationDriver.getWeight());//当前重量 jo.put("currentWeight", wasteFoilWeighingStationDriver.getWeight());//当前重量
jo.put("lastWeight", wasteFoilWeighingStationDriver.getOld_weight());//上一次重量 jo.put("lastWeight", wasteFoilWeighingStationDriver.getOld_weight());//上一次重量
jo.put("weightGap", wasteFoilWeighingStationDriver.getGap_weight());//重量差 jo.put("weightGap", wasteFoilWeighingStationDriver.getGap_weight());//重量差
break; break;
} }
wasteFoilWeighingStationDriver.writing("to_command", "0"); wasteFoilWeighingStationDriver.writing("to_command", "0");
} }
//称重确认信号 //称重确认信号
@@ -666,10 +666,10 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
wasteFoilWeighingStationDriver.writing("to_command", "7"); wasteFoilWeighingStationDriver.writing("to_command", "7");
Thread.sleep(1000); //休眠1秒 Thread.sleep(1000); //休眠1秒
while (wasteFoilWeighingStationDriver.getMode() == 7) { while (wasteFoilWeighingStationDriver.getMode() == 7) {
jo.put("currentWeight", wasteFoilWeighingStationDriver.getWeight());//当前重量 jo.put("currentWeight", wasteFoilWeighingStationDriver.getWeight());//当前重量
jo.put("lastWeight", wasteFoilWeighingStationDriver.getOld_weight());//上一次重量 jo.put("lastWeight", wasteFoilWeighingStationDriver.getOld_weight());//上一次重量
jo.put("weightGap", wasteFoilWeighingStationDriver.getGap_weight());//重量差 jo.put("weightGap", wasteFoilWeighingStationDriver.getGap_weight());//重量差
break; break;
} }
wasteFoilWeighingStationDriver.writing("to_command", "0"); wasteFoilWeighingStationDriver.writing("to_command", "0");
} }
@@ -716,11 +716,11 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
PaperTubePickSiteDeviceDriver paperTubePickSiteDeviceDriver; PaperTubePickSiteDeviceDriver paperTubePickSiteDeviceDriver;
if (device.getDeviceDriver() instanceof PaperTubePickSiteDeviceDriver) { if (device.getDeviceDriver() instanceof PaperTubePickSiteDeviceDriver) {
paperTubePickSiteDeviceDriver = (PaperTubePickSiteDeviceDriver) device.getDeviceDriver(); paperTubePickSiteDeviceDriver = (PaperTubePickSiteDeviceDriver) device.getDeviceDriver();
if (ObjectUtil.isEmpty(to_material)){ if (ObjectUtil.isEmpty(to_material)) {
map.put("to_material", "0"); map.put("to_material", "0");
map.put("to_spec", "0"); map.put("to_spec", "0");
map.put("to_qty", "0"); map.put("to_qty", "0");
}else { } else {
map.put("to_material", to_material); map.put("to_material", to_material);
map.put("to_spec", to_spec); map.put("to_spec", to_spec);
map.put("to_qty", to_qty); map.put("to_qty", to_qty);
@@ -924,8 +924,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
jo.put("qty", foldDiscSiteDeviceDriver.getQty()); jo.put("qty", foldDiscSiteDeviceDriver.getQty());
jo.put("container_type", foldDiscSiteDeviceDriver.getContainer_type()); jo.put("container_type", foldDiscSiteDeviceDriver.getContainer_type());
jo.put("error", foldDiscSiteDeviceDriver.getError()); jo.put("error", foldDiscSiteDeviceDriver.getError());
} } else if (device.getDeviceDriver() instanceof InflatableShaftLibraryDeviceDriver) {
else if (device.getDeviceDriver() instanceof InflatableShaftLibraryDeviceDriver) {
inflatableShaftLibraryDeviceDriver = (InflatableShaftLibraryDeviceDriver) device.getDeviceDriver(); inflatableShaftLibraryDeviceDriver = (InflatableShaftLibraryDeviceDriver) device.getDeviceDriver();
jo.put("device_code", parent_device_code); jo.put("device_code", parent_device_code);
jo.put("move", inflatableShaftLibraryDeviceDriver.getMove()); jo.put("move", inflatableShaftLibraryDeviceDriver.getMove());

2
acs2/nladmin-ui/src/components/Permission/permission.js
View File

@@ -1,7 +1,7 @@
import store from '@/store' import store from '@/store'
export default { export default {
inserted(el, binding, vnode) { inserted(el, binding) {
const { value } = binding const { value } = binding
const roles = store.getters && store.getters.roles const roles = store.getters && store.getters.roles
if (value && value instanceof Array && value.length > 0) { if (value && value instanceof Array && value.length > 0) {

3
acs2/nladmin-ui/src/i18n/langs/param/en.js
View File

@@ -3,6 +3,9 @@ export default {
'table': { 'table': {
'code': 'Code', 'code': 'Code',
'name': 'Name', 'name': 'Name',
'zh_name': '中文名称',
'en_name': '英文名称',
'in_name': '印尼名称',
'values': 'Value', 'values': 'Value',
'description': 'Remark' 'description': 'Remark'
}, },

3
acs2/nladmin-ui/src/i18n/langs/param/in.js
View File

@@ -3,6 +3,9 @@ export default {
'table': { 'table': {
'code': 'Kode', 'code': 'Kode',
'name': 'Nama', 'name': 'Nama',
'zh_name': '中文名称',
'en_name': '英文名称',
'in_name': '印尼名称',
'values': 'Nilai', 'values': 'Nilai',
'description': 'Catatan' 'description': 'Catatan'
}, },

3
acs2/nladmin-ui/src/i18n/langs/param/zh.js
View File

@@ -3,6 +3,9 @@ export default {
'table': { 'table': {
'code': '编码', 'code': '编码',
'name': '名称', 'name': '名称',
'zh_name': '中文名称',
'en_name': '英文名称',
'in_name': '印尼名称',
'values': '值', 'values': '值',
'description': '备注' 'description': '备注'
}, },

21
acs2/nladmin-ui/src/views/system/param/index.vue
View File

@@ -19,6 +19,15 @@
<el-form-item :label="$t('SysParam.table.name')" prop="name"> <el-form-item :label="$t('SysParam.table.name')" prop="name">
<el-input v-model="form.name" style="width: 370px;" /> <el-input v-model="form.name" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('SysParam.table.zh_name')" prop="zh_name">
<el-input v-model="form.zh_name" style="width: 370px;" />
</el-form-item>
<el-form-item :label="$t('SysParam.table.in_name')" prop="in_name">
<el-input v-model="form.en_name" style="width: 370px;" />
</el-form-item>
<el-form-item :label="$t('SysParam.table.en_name')" prop="en_name">
<el-input v-model="form.in_name" style="width: 370px;" />
</el-form-item>
<el-form-item :label="$t('SysParam.table.values')" prop="value"> <el-form-item :label="$t('SysParam.table.values')" prop="value">
<el-input v-model="form.value" style="width: 370px;" /> <el-input v-model="form.value" style="width: 370px;" />
</el-form-item> </el-form-item>
@@ -72,6 +81,9 @@ const defaultForm = {
id: null, id: null,
code: null, code: null,
name: null, name: null,
en_name: null,
zh_name: null,
in_name: null,
value: null, value: null,
remark: null, remark: null,
is_active: true is_active: true
@@ -109,6 +121,15 @@ export default {
name: [ name: [
{ required: true, message: this.$t('SysParam.rules.NotNull'), trigger: 'blur' } { 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: [ value: [
{ required: true, message: this.$t('SysParam.rules.NotNull'), trigger: 'blur' } { required: true, message: this.$t('SysParam.rules.NotNull'), trigger: 'blur' }
] ]