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 b5b7fc2..3c2353c 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
@@ -247,7 +247,7 @@ public class ToWmsServiceImpl implements IToWmsService {
         if ("2".equals(requestEnter.getFloor())){
             AjaxResult workshopInboundOrder = toErpService.createWorkshopInboundOrder(basProduct,erpBill);
             if (!workshopInboundOrder.isSuccess()){
-                throw new RuntimeException("创建工单失败");
+                throw new RuntimeException("创建工单失败,人工处理");
             }
         }
 
@@ -494,6 +494,11 @@ public class ToWmsServiceImpl implements IToWmsService {
             }
         }
 
+        int size1 = Convert.toInt(basProduct.getSpare38());
+        if (size1 > 1080){
+            return AjaxResult.error("货物超高");
+        }
+
         //超大托盘不处理 直接返回
         if (size == 5) {
             return new AjaxResult(3, "超大托盘");
diff --git a/ruoyi-ui/src/views/out/addOutStockout.vue b/ruoyi-ui/src/views/out/addOutStockout.vue
index 5036b0a..6d6eb45 100644
--- a/ruoyi-ui/src/views/out/addOutStockout.vue
+++ b/ruoyi-ui/src/views/out/addOutStockout.vue
@@ -95,7 +95,7 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-<!--        <el-form-item label="规格" prop="spare1">
+       <el-form-item label="规格" prop="spare1">
           <el-input v-model="queryParams.spare1" placeholder="请输入规格"
                     clearable
                     @keyup.enter.native="handleQuery"/>
@@ -114,7 +114,7 @@
           <el-input v-model="queryParams.spare6" placeholder="请输入序列号"
                     clearable
                     @keyup.enter.native="handleQuery"/>
-        </el-form-item>-->
+        </el-form-item>
         <el-form-item label="订单号" prop="orderId">
           <el-input v-model="queryParams.orderId" placeholder="请输入订单号"
                     clearable
diff --git a/ruoyi-ui/src/views/stock/management/index.vue b/ruoyi-ui/src/views/stock/management/index.vue
index 3fcbc33..7de19b2 100644
--- a/ruoyi-ui/src/views/stock/management/index.vue
+++ b/ruoyi-ui/src/views/stock/management/index.vue
@@ -78,7 +78,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="型号" prop="spare3"><!-- 品名 -->
+      <el-form-item label="型号" prop="spare3"><!-- 型号 -->
         <el-input
           v-model="queryParams.spare3"
           placeholder="请输入型号"
@@ -86,7 +86,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="规格" prop="spare1"><!-- 品名 -->
+      <el-form-item label="规格" prop="spare1"><!-- 规格 -->
         <el-input
           v-model="queryParams.spare1"
           placeholder="请输入规格"
diff --git a/ruoyi-ui/src/views/stock/pointOut.vue b/ruoyi-ui/src/views/stock/pointOut.vue
index 74e216e..c69d52c 100644
--- a/ruoyi-ui/src/views/stock/pointOut.vue
+++ b/ruoyi-ui/src/views/stock/pointOut.vue
@@ -25,14 +25,22 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="批次" prop="lotNo">&lt;!&ndash; 库存id &ndash;&gt;-->
-<!--        <el-input-->
-<!--          v-model="queryParams.lotNo"-->
-<!--          placeholder="请输入批次"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
+      <el-form-item label="品名" prop="productName"><!-- 库存id -->
+        <el-input
+          v-model="queryParams.productName"
+          placeholder="请输入品名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="规格" prop="spare1"><!-- 库存id -->
+        <el-input
+          v-model="queryParams.spare1"
+          placeholder="请输入规格"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="巷道" prop="roadwayId"><!-- 货位id -->
         <el-input
           v-model="queryParams.roadwayId"