From 12bded91fba0ee5983610fdf96a4160ac6746953 Mon Sep 17 00:00:00 2001
From: zhouz <>
Date: Mon, 17 Jun 2024 11:04:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=AB=8B=E5=BA=93=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.xml  | 1 +
 .../src/main/java/org/nl/b_lms/sch/tasks/TwoInEmpTask.java    | 2 +-
 .../src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java     | 2 +-
 .../src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java      | 2 +-
 .../sch/tasks/slitter/service/impl/SlitterServiceImpl.java    | 4 ++--
 .../service/iostorInv/util/impl/LashManageServiceImpl.java    | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.xml
index 28a2463bd..5457c2ae2 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.xml
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.xml
@@ -23,6 +23,7 @@
             point.is_used = '1'
             AND point.is_delete = '0'
             AND point.region_code = 'BKZ01'
+            ORDER BY out_empty_seq
     </select>
 
     <select id="queryLikeOrderRow" resultType="com.alibaba.fastjson.JSONObject">
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInEmpTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInEmpTask.java
index 243962e76..5e891fa1f 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInEmpTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInEmpTask.java
@@ -155,7 +155,7 @@ public class TwoInEmpTask extends AbstractAcsTask {
             throw new BadRequestException("托盘号不能为空!");
         }
 
-        if (StrUtil.isBlank(form.getString("vehicle_type"))) {
+        if (StrUtil.isBlank(form.getString("containerType"))) {
             throw new BadRequestException("托盘类型不能为空!");
         }
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java
index 349b4efab..285d30ffe 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java
@@ -89,7 +89,7 @@ public class TwoLashTask extends AbstractAcsTask {
             interaction_json.put("length",dao.get(0).getBox_length());
             interaction_json.put("weight",dao.get(0).getBox_width());
             interaction_json.put("height",dao.get(0).getBox_high());
-            interaction_json.put("template","4");
+            interaction_json.put("template",dao.get(0).getLash_num());
             //第二次捆扎次数
             interaction_json.put("bindingTimes","3");
             interaction_json.put("isBinding", IOSEnum.IS_SEND.code("是"));
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java
index 0b8419274..62f100129 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java
@@ -170,7 +170,7 @@ public class TwoOutTask extends AbstractAcsTask {
                 JSONObject jsonParam = new JSONObject();
                 jsonParam.put("device_code",jsonTask.getString("point_code2"));
                 jsonParam.put("vehicle_code",jsonTask.getString("vehicle_code"));
-                jsonParam.put("vehicle_type",jsonTask.getString("vehicle_type"));
+                jsonParam.put("vehicle_type",jsonTask.getJSONObject("request_param").getString("containerType"));
 
                 LashManageServiceImpl bean1 = SpringContextHolder.getBean(LashManageServiceImpl.class);
                 bean1.createHeapTask(jsonParam);
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
index 6101f8361..f1e8f4e6a 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
@@ -400,9 +400,9 @@ public class SlitterServiceImpl implements SlitterService {
                     if (currentUpPlan != null && currentDownPlan != null) {
                         // 双轴任务 下双
                         taskParam.put("point_code1", device.getUp_point_code());
-                        taskParam.put("point_code2", emptyPoint.getTruss_point_code2());
+                        taskParam.put("point_code2", emptyPoint.getTruss_point_code1());
                         taskParam.put("point_code3", device.getDown_point_code());
-                        taskParam.put("point_code4", emptyPoint.getTruss_point_code1());
+                        taskParam.put("point_code4", emptyPoint.getTruss_point_code2());
                         taskParam.put("truss_type", "1");
                         taskParam.put("empty_site", "0");
                     } else {
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java
index 9a0a9d4a4..e9b6c7a76 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java
@@ -216,7 +216,7 @@ public class LashManageServiceImpl implements LashManageService {
         // 创建任务并下发
         JSONObject jsonTaskParam = new JSONObject();
         jsonTaskParam.put("task_type", "010720");
-        jsonTaskParam.put("containerType", whereJson.getString("vehicle_type"));
+        whereJson.put("containerType", whereJson.getString("vehicle_type"));
         jsonTaskParam.put("point_code1", whereJson.getString("device_code"));
         jsonTaskParam.put("point_code2", next_device_code);
         jsonTaskParam.put("vehicle_code", whereJson.getString("vehicle_code"));