From fa1a3a4e6887ec9deb847a308e9fd3abb8c1b08a Mon Sep 17 00:00:00 2001
From: tuqiang <437016993@qq.com>
Date: Tue, 7 Nov 2023 12:37:07 +0800
Subject: [PATCH] fix

---
 .../IndoorManipulatorDeviceDriver.java        | 34 ++++++++++++++++---
 .../org/nl/acs/task/service/dto/TaskDto.java  | 26 ++++++++++++++
 2 files changed, 55 insertions(+), 5 deletions(-)

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 a94e8d44e..9693e066f 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
@@ -728,8 +728,20 @@ public class IndoorManipulatorDeviceDriver extends AbstractOpcDeviceDriver imple
                     logServer.deviceExecuteLog(device_code, "", "", "当前设备:" + device_code + ",下发指令:"
                             + instruction.getInstruction_code() + ",指令起点:" + instruction.getStart_device_code()
                             + ",指令终点:" + instruction.getNext_device_code());
+                    String is_bushing = taskDto.getIs_bushing();
+                    String version = taskDto.getVersion();
+                    String bushing_num = taskDto.getBushing_num();
+
                     Map<String, Object> map = new LinkedHashMap<>();
                     map.put("to_command", "1");
+                    if (action==2) {
+                        map.put("inflatableShaftVersion", version);
+                        map.put("tube_num", bushing_num);
+                        map.put("is_wrapped", is_bushing);
+                    }
+                    if (action==1||action==5){
+                        map.put("to_task_type", String.valueOf(action));
+                    }
                     map.put("to_onset", start_addr);
                     map.put("to_task", instruction.getInstruction_code());
                     map.put("to_target", next_addr);
@@ -824,11 +836,23 @@ public class IndoorManipulatorDeviceDriver extends AbstractOpcDeviceDriver imple
                 logServer.deviceExecuteLog(device_code, "", "", "当前设备:" + device_code + ",下发指令:"
                         + instdto.getInstruction_code() + ",指令起点:" + instdto.getStart_device_code()
                         + ",指令终点:" + instdto.getNext_device_code());
-                this.writing("to_command", "1");
-                this.writing("to_onset", start_addr);
-                this.writing("to_target", next_addr);
-                this.writing("to_task", instdto.getInstruction_code());
-                this.writing("to_task_type", "1");
+                String is_bushing = task.getIs_bushing();
+                String version = task.getVersion();
+                String bushing_num = task.getBushing_num();
+                Map<String, Object> map = new LinkedHashMap<>();
+                map.put("to_command", "1");
+                if (action==2) {
+                    map.put("inflatableShaftVersion", version);
+                    map.put("tube_num", bushing_num);
+                    map.put("is_wrapped", is_bushing);
+                }
+                if (action==1||action==5){
+                    map.put("to_task_type", String.valueOf(action));
+                }
+                map.put("to_onset", start_addr);
+                map.put("to_task", instdto.getInstruction_code());
+                map.put("to_target", next_addr);
+                this.writing(map);
                 this.setRequireSucess(true);
                 notCreateInstMessage = "";
                 notCreateTaskMessage = "";
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/dto/TaskDto.java b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/dto/TaskDto.java
index 7c5875db1..f770f33b3 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/dto/TaskDto.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/dto/TaskDto.java
@@ -307,6 +307,32 @@ public class TaskDto implements Serializable {
      */
     private String next_height = "0";
 
+    /**
+     * 行架任务类型
+     */
+    private String truss_type;
+
+
+    /**
+     * 气胀轴代数
+     */
+    private String version;
+
+    /**
+     * 是否套管
+     */
+    private String is_bushing;
+
+    /**
+     * 套管数量
+     */
+    private String bushing_num;
+
+
+
+    //array  device_code\material_code\qty
+    private String paper_array;
+
 
     @Override
     public String toString(){