From d95c8635987a5a2b3e07f8e0e2cf861e5db084c6 Mon Sep 17 00:00:00 2001
From: lishuai <1793460677@qq.com>
Date: Fri, 9 Aug 2024 13:57:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E9=AB=98=E5=BA=A6=E7=AD=89=E7=BA=A7?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ConveyorWithScannerWeightDeviceDriver.java                | 4 ++--
 .../one_conveyor/scanner_weight_conveyor/ItemProtocol.java    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java
index a02e69fa1..e59cd546c 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java
@@ -123,8 +123,8 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
     int to_container_type = 0;
     int last_to_container_type = 0;
 
-    int to_height_level = 0;
-    int last_to_height_level = 0;
+    String to_height_level = null;
+    String last_to_height_level = null;
 
     //托盘类型
     int container_type = 0;
diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ItemProtocol.java
index 44a44af4d..29fe2a967 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ItemProtocol.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ItemProtocol.java
@@ -152,8 +152,8 @@ public class ItemProtocol {
         return this.getOpcIntegerValue(item_to_container_type);
     }
 
-    public int getTo_height_level(){
-        return this.getOpcIntegerValue(item_to_height_level);
+    public String getTo_height_level(){
+        return this.getOpcStringValue(item_to_height_level);
     }
     Boolean isonline;