From 6560d294f8c81543e5e31a26a89a8bebac8421ad Mon Sep 17 00:00:00 2001 From: lishuai <1793460677@qq.com> Date: Tue, 19 Dec 2023 09:39:07 +0800 Subject: [PATCH] =?UTF-8?q?fix:tosize=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../indoor_manipulator/IndoorManipulatorDeviceDriver.java | 2 +- .../basedriver/indoor_manipulator/ItemProtocol.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/IndoorManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/IndoorManipulatorDeviceDriver.java index 2d7140ff1..0ac1e0fac 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/IndoorManipulatorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/IndoorManipulatorDeviceDriver.java @@ -476,7 +476,7 @@ public class IndoorManipulatorDeviceDriver extends AbstractOpcDeviceDriver imple String to_putpoint = device.getExtraValue().get("address").toString(); Map map = new LinkedHashMap<>(); map.put("inflatableShaftVersion", applyManipulatorActionResponse.getVersion()); -// map.put("to_size", applyManipulatorActionResponse.getSize()); + map.put("to_size", applyManipulatorActionResponse.getSize()); map.put("to_command", 3); map.put("to_putpoint", Integer.parseInt(to_putpoint)); this.writing(map); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/ItemProtocol.java index 22d4941e9..b9c2f3e12 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/ItemProtocol.java @@ -56,6 +56,8 @@ public class ItemProtocol { //是否套轴 public static String item_is_wrapped = "is_wrapped"; + public static String item_to_size = "to_size"; + private IndoorManipulatorDeviceDriver driver; @@ -213,6 +215,7 @@ public class ItemProtocol { list.add(new ItemDto(item_inflatableShaftVersion, "气胀轴代数", "DB200.W18")); list.add(new ItemDto(item_tube_num, "套管数量", "DB200.W20")); list.add(new ItemDto(item_is_wrapped, "是否套轴", "DB200.W22")); + list.add(new ItemDto(item_to_size, "尺寸", "DB200.W24")); return list; }