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

lms新接口更新

Browse Source
This commit is contained in:
张江玮
2023-02-07 10:17:58 +08:00
parent a6b817d8ac
commit 89e8e6ed2c
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java
View File

@@ -168,9 +168,9 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
if(move == 0 && last_move == 1 ){ if(move == 0 && last_move == 1 ){
last_vehicle_code = vehicle_code; last_vehicle_code = vehicle_code;
last_inst_message = inst_message; last_inst_message = inst_message;
} if ("true".equals(this.device.getExtraValue().get("ship_device_update"))) {
if (move == 0 && last_move == 1 && "06".equals(this.device.getRegion())) { this.requiresShipDeviceUpdate = false;
this.requiresShipDeviceUpdate = false; }
} }
logServer.deviceItemValue(this.device_code, "move", String.valueOf(move)); logServer.deviceItemValue(this.device_code, "move", String.valueOf(move));
logServer.deviceExecuteLog(this.device_code, "", "", "信号move：" + last_move + "->" + move); logServer.deviceExecuteLog(this.device_code, "", "", "信号move：" + last_move + "->" + move);

12
acs/nladmin-ui/src/views/acs/device/driver/siemens_conveyor.vue
View File

@@ -136,6 +136,13 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row>
<el-col :span="8">
<el-form-item label="是否需要反馈光电" label-width="150px">
<el-switch v-model="form.ship_device_update" />
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
</el-card> </el-card>
@@ -306,7 +313,8 @@ export default {
manual_create_task: true, manual_create_task: true,
is_pickup: true, is_pickup: true,
is_release: true, is_release: true,
link_device_code: [] link_device_code: [],
ship_device_update: true
}, },
rules: {} rules: {}
} }
@@ -459,7 +467,7 @@ export default {
test_read1() { test_read1() {
testRead(this.data1, this.opc_id).then(data => { testRead(this.data1, this.opc_id).then(data => {
this.data1 = data this.data1 = data
console.log(this.data1 ) console.log(this.data1)
this.notify('操作成功!', 'success') this.notify('操作成功!', 'success')
}).catch(err => { }).catch(err => {
console.log(err.response.data.message) console.log(err.response.data.message)