Browse Source

rev 驱动配置

master
周俊杰 1 year ago
parent
commit
87b87a84e8
  1. 7
      acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java
  2. 2
      acs/nladmin-system/src/main/java/org/nl/acs/device_driver/RequestMethodEnum.java
  3. 2
      acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDeviceDriver.java
  4. 2
      acs/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_emptypallet_site/StandardEmptyPalletSiteDeviceDriver.java
  5. 21
      acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_palletizing_manipulator.vue
  6. 13
      acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_station.vue

7
acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java

@ -1222,10 +1222,17 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
if ("true".equalsIgnoreCase(json.getString("extra_value")) ||
"false".equalsIgnoreCase(json.getString("extra_value"))) {
extraObj.put(json.getString("extra_code"), json.getBoolean("extra_value"));
} else {
boolean endsWith = json.getString("extra_value").endsWith("]");
boolean startsWith = json.getString("extra_value").startsWith("[");
if (endsWith && startsWith){
JSONArray extraValue = JSONArray.parseArray(json.getString("extra_value"));
extraObj.put(json.getString("extra_code"), extraValue);
} else {
extraObj.put(json.getString("extra_code"), json.get("extra_value"));
}
}
}
extraObj.put("address", dto.getAddress());
result.put("form", extraObj);

2
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/RequestMethodEnum.java

@ -42,7 +42,7 @@ public enum RequestMethodEnum {
feedback_device_status(16, "feedback_device_status", "反馈设备状态","1"),
apply_feedback_weight(16, "apply_feedback_weight", "反馈压机残留重量","0");
apply_feedback_weight(16, "apply_feedback_weight", "反馈压机残留重量","1");
//驱动索引

2
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDeviceDriver.java

@ -674,7 +674,7 @@ public class LnshPalletizingManipulatorDeviceDriver extends AbstractOpcDeviceDri
request.setRequest_medthod_name(RequestMethodEnum.getName(Thread.currentThread().getStackTrace()[1].getMethodName()));
List<String> getDeviceCodeList = this.getExtraDeviceCodes("get_station");
List<String> putDeviceCodeList = this.getExtraDeviceCodes("put_station");
request.setGet_station(getDeviceCodeList.get(get_station));
request.setGet_station(getDeviceCodeList.get(0));
request.setPut_station(putDeviceCodeList.get(put_station));
request.setLaser_marking_code(laser_marking_code);
request.setGrinding_number(grinding_number);

2
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_emptypallet_site/StandardEmptyPalletSiteDeviceDriver.java

@ -186,7 +186,7 @@ public class StandardEmptyPalletSiteDeviceDriver extends AbstractOpcDeviceDriver
if (number == max_emptypalletnum && !requireSucess && move > 0) {
//判断逻辑
//需要检查关联的另一设备也满足数量后才能入库
Object[] linkobj = (Object[]) this.getDevice().getExtraValue().get("link_device_code");
Object[] linkobj = (Object[]) this.getDevice().getExtraValue().get("device_code");
for (int i = 0; i < linkobj.length; i++) {
String linkDevice = linkobj[i].toString();
Device device = appService.findDeviceByCode(linkDevice);

21
acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_palletizing_manipulator.vue

@ -219,7 +219,7 @@
<el-table :data="modeform.tableData" border fit highlight-current-row style="width: 100%;" class="tb-edit">
<el-table-column label="mode" prop="模式" width="180">
<template scope="scope">
<el-input-number value="3" :min="3" v-model="scope.row.mode" size="mini" />
<el-input-number v-model="scope.row.mode" value="3" :min="3" size="mini" />
<span v-show="scope.row.edit">{{ scope.row.mode }}</span>
</template>
</el-table-column>
@ -389,7 +389,6 @@ export default {
configLoading: false,
dataOpcservers: [],
dataOpcPlcs: [],
deviceList: [],
data1: [],
data2: [],
requestMethodList: [],
@ -453,11 +452,14 @@ export default {
link_three_lamp: '',
manual_create_task: true,
is_pickup: true,
is_release: true,
link_device_code: [],
link_three_lamp: []
is_release: true
// link_device_code: [],
// link_three_lamp: [],
// link_get_station: [],
// link_put_station: []
},
rules: {}
rules: {},
deviceList: {}
}
},
created() {
@ -505,13 +507,6 @@ export default {
})
},
methods: {
insertdtl() {
this.modeform.tableData.push({mode: '', request: '' })
},
deleteRow(index, rows) {
debugger
rows.splice(index, 1)
},
finishReadEdit(data) {
// code,mode
if (data.code.indexOf('mode') !== -1) {

13
acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_station.vue

@ -179,7 +179,7 @@
<el-table :data="modeform.tableData" border fit highlight-current-row style="width: 100%;" class="tb-edit">
<el-table-column label="mode" prop="模式" width="180">
<template scope="scope">
<el-input-number value="3" :min="3" v-model="scope.row.mode" size="mini" />
<el-input-number v-model="scope.row.mode" value="3" :min="3" size="mini" />
<span v-show="scope.row.edit">{{ scope.row.mode }}</span>
</template>
</el-table-column>
@ -216,7 +216,6 @@
</div>
</el-card>
<el-card class="box-card" shadow="never">
<div slot="header" class="clearfix">
<span class="role-span">PLC读取字段</span>
@ -409,7 +408,8 @@ export default {
is_pickup: true,
is_release: true
},
rules: {}
rules: {},
deviceList: {}
}
},
created() {
@ -464,13 +464,6 @@ export default {
})
},
methods: {
insertdtl() {
this.modeform.tableData.push({mode: '', request: '' })
},
deleteRow(index, rows) {
debugger
rows.splice(index, 1)
},
finishReadEdit(data) {
// code,mode
if (data.code.indexOf('mode') !== -1) {

Loading…
Cancel
Save