From ff27c33786b129380fb6fe77428958988ceed0fe Mon Sep 17 00:00:00 2001
From: "USER-20220102CG\\noblelift" <546428999@qq.com>
Date: Wed, 17 Apr 2024 15:28:32 +0800
Subject: [PATCH] =?UTF-8?q?rev=20=E6=9B=B4=E6=96=B0=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../conveyor/siemens_conveyor_ckk/ItemProtocol.java         | 2 +-
 .../return_good_manipulator/InteractionJsonDTO.java         | 2 +-
 .../ReturnGoodManipulatorDeviceDriver.java                  | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_ckk/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_ckk/ItemProtocol.java
index a51764935..885a0eb21 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_ckk/ItemProtocol.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_ckk/ItemProtocol.java
@@ -64,7 +64,7 @@ public class ItemProtocol {
     /**
      *木箱宽度
      */
-    public static String item_to_weight = "to_weight";
+    public static String item_to_weight = "to_width";
     /**
      *木箱高度
      */
diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/return_good_manipulator/InteractionJsonDTO.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/return_good_manipulator/InteractionJsonDTO.java
index d5a90e47a..4cac17f62 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/return_good_manipulator/InteractionJsonDTO.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/return_good_manipulator/InteractionJsonDTO.java
@@ -12,7 +12,7 @@ public class InteractionJsonDTO {
     /**
      *木箱宽度
      */
-    private String weight;
+    private String width;
     /**
      *木箱高度
      */
diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/return_good_manipulator/ReturnGoodManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/return_good_manipulator/ReturnGoodManipulatorDeviceDriver.java
index db07f2b1c..6bededfe4 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/return_good_manipulator/ReturnGoodManipulatorDeviceDriver.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/return_good_manipulator/ReturnGoodManipulatorDeviceDriver.java
@@ -454,9 +454,9 @@ public class ReturnGoodManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
         map4.put("value",  task);
         list.add(map4);
         if (ObjectUtil.isNotEmpty(interactionJsonDTO)) {
-            if (ObjectUtil.isNotEmpty(interactionJsonDTO.getWeight())) {
-                map5.put("code", "to_weight");
-                map5.put("value", interactionJsonDTO.getWeight());
+            if (ObjectUtil.isNotEmpty(interactionJsonDTO.getWidth())) {
+                map5.put("code", "to_width");
+                map5.put("value", interactionJsonDTO.getWidth());
                 list.add(map5);
             }
             if (ObjectUtil.isNotEmpty(interactionJsonDTO.getLength())) {