From e458d66bb6141f42245c3123fda69967db6147f5 Mon Sep 17 00:00:00 2001
From: "ZHOUZ\\Noble'lift" <1014987728@qq.com>
Date: Fri, 29 Dec 2023 16:03:16 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E6=90=AC=E8=BF=90=E6=B0=94=E8=83=80?=
 =?UTF-8?q?=E8=BD=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/nl/wms/sch/manage/AutoCallEmptyVehicle.java    | 6 +++++-
 .../src/main/java/org/nl/wms/sch/tasks/PaperTrussTask.java  | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCallEmptyVehicle.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCallEmptyVehicle.java
index dc6e1c2c4..afdfaa463 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCallEmptyVehicle.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCallEmptyVehicle.java
@@ -14,6 +14,7 @@ import org.nl.modules.wql.util.SpringContextHolder;
 import org.nl.wms.ext.acs.service.WmsToAcsService;
 import org.nl.wms.pda.mps.service.CasingService;
 import org.nl.wms.sch.tasks.CutConveyorTask;
+import org.nl.wms.sch.tasks.PaperTrussTask;
 import org.nl.wms.sch.tasks.PaperTubeTask;
 import org.nl.wms.sch.tasks.URLEnum;
 import org.springframework.stereotype.Component;
@@ -29,6 +30,8 @@ public class AutoCallEmptyVehicle {
 
     private final PaperTubeTask paperTubeTask;
 
+    private final PaperTrussTask paperTrussTask;
+
     private final WmsToAcsService wmsToAcsService;
 
     public void run() {
@@ -396,7 +399,8 @@ public class AutoCallEmptyVehicle {
         jo.put("vehicle_code", rows.getJSONObject(0).getString("pcsn"));
         jo.put("material_code", rows.getJSONObject(0).getString("pcsn"));
         jo.put("product_area", product_area);
-        paperTubeTask.createTask(jo);
+        jo.put("request_param", request_param);
+        paperTrussTask.createTask(jo);
 
         //更新对应气胀轴为套轴完成
         CasingService casingService = SpringContextHolder.getBean(CasingService.class);
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTrussTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTrussTask.java
index 218ee81a7..6416afeb2 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTrussTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTrussTask.java
@@ -63,6 +63,9 @@ public class PaperTrussTask extends AbstractAcsTask {
             if ("010605".equals(json.getString("task_type")) || "010603".equals(json.getString("task_type")) || "010604".equals(json.getString("task_type"))) {
                 dto.setVersion(json.getJSONObject("request_param").getString("have_generation"));
             }
+            if ("010606".equals(json.getString("task_type"))) {
+                dto.setVersion(json.getJSONObject("request_param").getString("need_generation"));
+            }
             resultList.add(dto);
         }
         return resultList;