From 8b63fa3ae0441cb0ace0ba91025e4aff61143525 Mon Sep 17 00:00:00 2001
From: "USER-20220102CG\\noblelift" <546428999@qq.com>
Date: Sat, 16 Dec 2023 10:19:18 +0800
Subject: [PATCH] =?UTF-8?q?rev=20=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../paper_tube_device2/PaperTubeConveyor2DeviceDriver.java  | 6 +++---
 .../java/org/nl/acs/ext/wms/data/CreateTaskRequest.java     | 2 +-
 .../nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device2/PaperTubeConveyor2DeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device2/PaperTubeConveyor2DeviceDriver.java
index 38cfd313b..0f4b806b5 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device2/PaperTubeConveyor2DeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device2/PaperTubeConveyor2DeviceDriver.java
@@ -668,9 +668,9 @@ public class PaperTubeConveyor2DeviceDriver extends AbstractOpcDeviceDriver impl
         map.put("to_material" + status, paper.getMaterial_code());
         map.put("to_out_qty" + status, paper.getQty());
         map.put("to_seq" + status, status);
-//        Device nextdevice = deviceAppservice.findDeviceByCode(paper.getDevice_code());
-//        String next_addr = nextdevice.getExtraValue().get("address").toString();
-        map.put("to_position" + status, paper.getDevice_code());
+        Device nextdevice = deviceAppservice.findDeviceByCode(paper.getDevice_code());
+        String next_addr = nextdevice.getExtraValue().get("address").toString();
+        map.put("to_position" + status, next_addr);
     }
 
 
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/CreateTaskRequest.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/CreateTaskRequest.java
index 9d559cfb8..0548b1659 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/CreateTaskRequest.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/CreateTaskRequest.java
@@ -144,6 +144,6 @@ public class CreateTaskRequest extends BaseRequest  {
      */
     private String bushing_num;
 
-    private String paper_array;
+    private JSONArray paper_array;
 
 }
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
index fc5d61d29..847e36aa7 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
@@ -720,7 +720,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
             for (int i = 0; i < datas.size(); i++) {
                 String data = datas.get(i).toString();
                 CreateTaskRequest request = JsonUtl.format(data, CreateTaskRequest.class);
-                String paper_array = request.getPaper_array();
+                JSONArray paper_array = request.getPaper_array();
                 String ext_task_id = request.getExt_task_id();
                 String task_code = request.getTask_code();
                 String start_device_code = request.getStart_device_code();