From dfb31d0307e59121eacc722422d5bac4827b2ea9 Mon Sep 17 00:00:00 2001 From: psh Date: Wed, 3 Jan 2024 09:04:31 +0800 Subject: [PATCH] fix --- .../basedriver/standard_autodoor/ItemProtocol.java | 4 ++++ .../standard_autodoor/StandardAutodoorDeviceDriver.java | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/ItemProtocol.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/ItemProtocol.java index c45a251..1881c36 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/ItemProtocol.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/ItemProtocol.java @@ -39,6 +39,10 @@ public class ItemProtocol { return this.getOpcIntegerValue(item_error); } + public int getState() { + return this.getOpcIntegerValue(item_state); + } + public int getToCommand() { return this.getOpcIntegerValue(item_to_command); } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDeviceDriver.java index f0cf696..bcda436 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDeviceDriver.java @@ -107,6 +107,7 @@ public class StandardAutodoorDeviceDriver extends AbstractOpcDeviceDriver implem mode = this.itemProtocol.getMode(); action = this.itemProtocol.getAction(); error = this.itemProtocol.getError(); + state = this.itemProtocol.getState(); if (mode != last_mode) { } if (action != last_action) { @@ -117,7 +118,7 @@ public class StandardAutodoorDeviceDriver extends AbstractOpcDeviceDriver implem //固化室状态变更后通知lms更新固化室状态 FeedBackTaskStatusRequest request = new FeedBackTaskStatusRequest(); request.setState(String.valueOf(state)); - request.setDevice_code(this.devicecode); + request.setDevice_code(this.getDeviceCode()); request.setType("1"); acsToWmsService.notify(request); }