From 621f154fccef17ef056eb0a90d9851afd7e3c063 Mon Sep 17 00:00:00 2001
From: liuhanqing <liuhanqing1@bonc.com.cn>
Date: Wed, 3 Dec 2025 11:32:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=89=AB=E7=A0=81=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ruoyi/api/domain/RequestEnter.java   |  2 ++
 .../com/ruoyi/api/service/impl/ToWmsServiceImpl.java   | 10 +++++++++-
 ruoyi-ui/.env.development                              |  2 +-
 ruoyi-ui/.env.production                               |  2 +-
 ruoyi-ui/.env.staging                                  |  2 +-
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/RequestEnter.java b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/RequestEnter.java
index 66c04ce..68bb274 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/RequestEnter.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/RequestEnter.java
@@ -17,4 +17,6 @@ public class RequestEnter {
     private String warehouseId;
 
     private String roadwayId;
+
+    private Integer height;
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java
index be09c84..5030410 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java
@@ -195,7 +195,10 @@ public class ToWmsServiceImpl implements IToWmsService {
         if (StrUtil.isEmpty(requestEnter.getTrayCode())) {
             return AjaxResult.error("托盘条码不能为空");
         }
-        log.info("扫码内容{}", requestEnter.getTrayCode());
+        if (requestEnter.getHeight()==0) {
+            return AjaxResult.error("未检测到入库高度");
+        }
+        log.info("扫码内容{}，入库高度{}", requestEnter.getTrayCode(), requestEnter.getHeight());
 
         MydoJob param = new MydoJob();
         param.setStatus("1");
@@ -210,6 +213,11 @@ public class ToWmsServiceImpl implements IToWmsService {
             BasCargoSpace basCargoSpaceParam = new BasCargoSpace();
             basCargoSpaceParam.setWarehouseId(mydoJob.getWarehouseId());
             basCargoSpaceParam.setRoadwayId(mydoJob.getRoadwayId());
+            if (requestEnter.getHeight()==1){
+                basCargoSpaceParam.setCargoHight("975");
+            }else {
+                basCargoSpaceParam.setCargoHight("1519");
+            }
             BasCargoSpace basCargoSpace = basCargoSpaceService.selectEmptyCargoSpaceByWarehouseId(basCargoSpaceParam);
             if (ObjUtil.isNull(basCargoSpace)){
                 return AjaxResult.error("没有空货位");
diff --git a/ruoyi-ui/.env.development b/ruoyi-ui/.env.development
index a8531ba..306719f 100644
--- a/ruoyi-ui/.env.development
+++ b/ruoyi-ui/.env.development
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = "ForTucky WMS system"
+VUE_APP_TITLE = "WMS system"
 
 # 开发环境配置
 ENV = 'development'
diff --git a/ruoyi-ui/.env.production b/ruoyi-ui/.env.production
index 8074604..37e296f 100644
--- a/ruoyi-ui/.env.production
+++ b/ruoyi-ui/.env.production
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = "ForTucky WMS system"
+VUE_APP_TITLE = "WMS system"
 
 # 生产环境配置
 ENV = 'production'
diff --git a/ruoyi-ui/.env.staging b/ruoyi-ui/.env.staging
index dbe8edd..5dc0bfc 100644
--- a/ruoyi-ui/.env.staging
+++ b/ruoyi-ui/.env.staging
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = "ForTucky WMS system"
+VUE_APP_TITLE = "WMS system"
 
 BABEL_ENV = production