From 2ff9e6615fab015ebbf00ab11c07b43316d3d769 Mon Sep 17 00:00:00 2001
From: "ZHOUZ\\Noble'lift" <1014987728@qq.com>
Date: Sun, 4 Jun 2023 10:28:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java
index ad8de3468..5b10a00dd 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java
@@ -43,12 +43,12 @@ public class CutConveyorTask extends AbstractAcsTask {
         for (int i = 0; i < arr.size(); i++) {
             JSONObject json = arr.getJSONObject(i);
 
-            /*String vehicle_code = "";
+            String vehicle_code = "";
             if (json.getString("task_type").equals("010507")) {
                 vehicle_code = json.getString("vehicle_code");
             } else {
                 vehicle_code = json.getString("vehicle_code2");
-            }*/
+            }
 
             AcsTaskDto dto = AcsTaskDto.builder()
                     .ext_task_id(json.getString("task_id"))
@@ -56,7 +56,7 @@ public class CutConveyorTask extends AbstractAcsTask {
                     .task_type(json.getString("acs_task_type"))
                     .start_device_code(json.getString("point_code1"))
                     .next_device_code(json.getString("point_code2"))
-                    .vehicle_code(json.getString("vehicle_code2"))
+                    .vehicle_code(vehicle_code)
                     .priority(json.getString("priority"))
                     .remark(json.getString("remark"))
                     .build();