From d97e61912ea0ee3f40780f4fdf9e81ff7f45f569 Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Wed, 11 Jun 2025 16:55:45 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E7=83=98=E7=AE=B1=E6=B8=A9=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hongxiang_device/HongXiangConveyorDeviceDriver.java | 4 +++- .../two_conveyor/hongxiang_device/ItemProtocol.java | 2 +- .../plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/hongxiang_device/HongXiangConveyorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/hongxiang_device/HongXiangConveyorDeviceDriver.java index 3234ae286..370f155ac 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/hongxiang_device/HongXiangConveyorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/hongxiang_device/HongXiangConveyorDeviceDriver.java @@ -146,7 +146,9 @@ public class HongXiangConveyorDeviceDriver extends AbstractOpcDeviceDriver imple action = this.itemProtocol.getItem_action(); error = this.itemProtocol.getItem_error(); door = this.itemProtocol.getItem_door(); - temperature = this.itemProtocol.getItem_temperature(); + if (this.itemProtocol.getItem_temperature() != -1){ + temperature = this.itemProtocol.getItem_temperature(); + } countdown_house = this.itemProtocol.getItem_countdown_house(); countdown_min = this.itemProtocol.getItem_countdown_min(); countdown_sec = this.itemProtocol.getItem_countdown_sec(); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/hongxiang_device/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/hongxiang_device/ItemProtocol.java index f75e44103..9baa1ab6c 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/hongxiang_device/ItemProtocol.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/hongxiang_device/ItemProtocol.java @@ -139,7 +139,7 @@ public class ItemProtocol { setIsonline(true); return value; } - return 0; + return -1; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java index cdf1db538..7fe3c2654 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java @@ -489,6 +489,7 @@ public class PlugPullDeviceSiteDeviceDriver extends AbstractOpcDeviceDriver impl this.writing(map); requireSucess = false; message = "套管完成失败,重量为0"; + return; } }