From dc785a42ebed1d3c028a598c06c82f5c82a64793 Mon Sep 17 00:00:00 2001
From: zhouz <>
Date: Fri, 24 May 2024 13:50:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=B8=8B=E5=8F=91=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E7=BB=99=E9=AB=98=E5=BA=A6=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iostorInv/impl/StIvtIostorinvServiceImpl.java  |  3 ++-
 .../util/impl/InBoxManageServiceImpl.java          | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java
index 7eda6538e..ef16054e8 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java
@@ -285,6 +285,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
         JSONObject jsonAttr;
         // 是否自动分配货位
         Boolean checked = jsonObject.getBoolean("checked");
+        String height = "";
         if (ObjectUtil.isNotEmpty(checked) && checked) {
             // 自动分配: 根据仓库、库区匹配一个合适的仓位
             JSONObject attrParam = new JSONObject();
@@ -300,7 +301,6 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
             jsonObject.put("vehicle_type",boxDao.getVehicle_type());
             attrParam.put("vehicle_type", boxDao.getVehicle_type());
             //根据木箱高度，判断入库仓位的高度
-            String height = "";
             String heightLevel1 = iSysParamService.findByCode("height_level_1").getValue();
             String heightLevel2 = iSysParamService.findByCode("height_level_2").getValue();
             String box_high = boxDao.getBox_high();
@@ -395,6 +395,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
             jsonSend.put("vehicle_code2", jsonObject.getString("vehicle_code"));
             JSONObject param = new JSONObject();
             param.put("containerType", jsonObject.getString("vehicle_type"));
+            param.put("heightLevel", height);
             jsonSend.put("request_param", param.toString());
             String task_id1 = this.setPoint(jsonSend);
             // 下发任务
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java
index 20a69e065..42763c848 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java
@@ -347,6 +347,20 @@ public class InBoxManageServiceImpl implements InBoxManageService {
         param.put("height", boxDao.getBox_high());
         param.put("containerType", boxDao.getVehicle_type());
         param.put("barcode", whereJson.getString("box_no"));
+
+        //根据木箱高度，判断入库仓位的高度
+        String height = "";
+        String heightLevel1 = iSysParamService.findByCode("height_level_1").getValue();
+        String heightLevel2 = iSysParamService.findByCode("height_level_2").getValue();
+        String box_high = boxDao.getBox_high();
+        if (Integer.parseInt(box_high) <= Integer.parseInt(heightLevel1)) {
+            height = "1";
+        } else if (Integer.parseInt(box_high) > Integer.parseInt(heightLevel1) && Integer.parseInt(box_high) <= Integer.parseInt(heightLevel2)) {
+            height = "2";
+        } else {
+            height = "3";
+        }
+        param.put("heightLevel", height);
         taskParam.put("request_param", param.toString());
         TwoInBoxTrussTask taskBean = new TwoInBoxTrussTask();
         taskBean.createTask(taskParam);