diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java index c5ac3a170..05d274990 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java @@ -168,9 +168,9 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme if(move == 0 && last_move == 1 ){ last_vehicle_code = vehicle_code; last_inst_message = inst_message; - } - if (move == 0 && last_move == 1 && "06".equals(this.device.getRegion())) { - this.requiresShipDeviceUpdate = false; + if ("true".equals(this.device.getExtraValue().get("ship_device_update"))) { + this.requiresShipDeviceUpdate = false; + } } logServer.deviceItemValue(this.device_code, "move", String.valueOf(move)); logServer.deviceExecuteLog(this.device_code, "", "", "信号move:" + last_move + "->" + move); diff --git a/acs/nladmin-ui/src/views/acs/device/driver/siemens_conveyor.vue b/acs/nladmin-ui/src/views/acs/device/driver/siemens_conveyor.vue index 0020634e4..7ecfb7dfb 100644 --- a/acs/nladmin-ui/src/views/acs/device/driver/siemens_conveyor.vue +++ b/acs/nladmin-ui/src/views/acs/device/driver/siemens_conveyor.vue @@ -136,6 +136,13 @@ + + + + + + + @@ -306,7 +313,8 @@ export default { manual_create_task: true, is_pickup: true, is_release: true, - link_device_code: [] + link_device_code: [], + ship_device_update: true }, rules: {} } @@ -459,7 +467,7 @@ export default { test_read1() { testRead(this.data1, this.opc_id).then(data => { this.data1 = data - console.log(this.data1 ) + console.log(this.data1) this.notify('操作成功!', 'success') }).catch(err => { console.log(err.response.data.message)