diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/domain/ViewHandAllotStock.java b/ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/domain/ViewHandAllotStock.java
index 5061d37..7fe61a2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/domain/ViewHandAllotStock.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/domain/ViewHandAllotStock.java
@@ -164,6 +164,43 @@ public class ViewHandAllotStock extends BaseEntity
     @Excel(name = "货位名称")
     private String cargoSpaceName;
 
+    private String roadwayId;
+    private String thePlatoon;
+    private String theColumn;
+    private String theFloor;
+
+    public String getRoadwayId() {
+        return roadwayId;
+    }
+
+    public void setRoadwayId(String roadwayId) {
+        this.roadwayId = roadwayId;
+    }
+
+    public String getThePlatoon() {
+        return thePlatoon;
+    }
+
+    public void setThePlatoon(String thePlatoon) {
+        this.thePlatoon = thePlatoon;
+    }
+
+    public String getTheColumn() {
+        return theColumn;
+    }
+
+    public void setTheColumn(String theColumn) {
+        this.theColumn = theColumn;
+    }
+
+    public String getTheFloor() {
+        return theFloor;
+    }
+
+    public void setTheFloor(String theFloor) {
+        this.theFloor = theFloor;
+    }
+
     public void setStockId(String stockId)
     {
         this.stockId = stockId;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/service/impl/ViewHandAllotStockServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/service/impl/ViewHandAllotStockServiceImpl.java
index b866841..cd72049 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/service/impl/ViewHandAllotStockServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/service/impl/ViewHandAllotStockServiceImpl.java
@@ -62,11 +62,13 @@ public class ViewHandAllotStockServiceImpl implements IViewHandAllotStockService
             if (first.isPresent()){
                 //二联合普通人员
                 viewHandAllotStock.setWarehouseId("02");
+                viewHandAllotStock.setModel(Convert.toStr(SecurityUtils.getDeptId()));
             }
             Optional<SysRole> first1 = roles.stream().filter(x -> "role2".equals(x.getRoleKey())).findFirst();
             if (first1.isPresent()){
                 //三联合普通人员
                 viewHandAllotStock.setWarehouseId("01");
+                viewHandAllotStock.setModel(Convert.toStr(SecurityUtils.getDeptId()));
             }
             Optional<SysRole> first2 = roles.stream().filter(x -> "role3".equals(x.getRoleKey())).findFirst();
             if (first2.isPresent()){
@@ -78,7 +80,6 @@ public class ViewHandAllotStockServiceImpl implements IViewHandAllotStockService
                 //三联合管理员
                 viewHandAllotStock.setWarehouseId("01");
             }
-            viewHandAllotStock.setModel(Convert.toStr(SecurityUtils.getDeptId()));
         }
         return viewHandAllotStockMapper.selectViewHandAllotStockList(viewHandAllotStock);
     }
diff --git a/ruoyi-admin/src/main/resources/mapper/out/ViewHandAllotStockMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/ViewHandAllotStockMapper.xml
index 421858f..5ada1e4 100644
--- a/ruoyi-admin/src/main/resources/mapper/out/ViewHandAllotStockMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/out/ViewHandAllotStockMapper.xml
@@ -42,10 +42,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="spare7"    column="spare7"    />
         <result property="spare8"    column="spare8"    />
         <result property="cargoSpaceName"    column="cargo_space_name"    />
+        <result property="thePlatoon"    column="the_platoon"    />
+        <result property="theColumn"    column="the_column"    />
+        <result property="theFloor"    column="the_floor"    />
+        <result property="roadwayId"    column="roadway_id"    />
     </resultMap>
 
     <sql id="selectViewHandAllotStockVo">
-        select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_guid, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, spare1, spare2, spare3, spare4, spare5, spare6, product_id, product_name, voltage, power, phase, net_weight, gross_weight, distribution, model, order_id, spare7, spare8, cargo_space_name from view_hand_allot_stock vhat
+        select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_guid, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, spare1, spare2, spare3, spare4, spare5, spare6, product_id, product_name, voltage, power, phase, net_weight, gross_weight, distribution, model, order_id, spare7, spare8, cargo_space_name,roadway_id,
+               the_platoon,
+               the_column,
+               the_floor from view_hand_allot_stock vhat
     </sql>
 
     <select id="selectViewHandAllotStockList" parameterType="ViewHandAllotStock" resultMap="ViewHandAllotStockResult">
@@ -89,6 +96,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare7 != null  and spare7 != ''"> and spare7 = #{spare7}</if>
             <if test="spare8 != null  and spare8 != ''"> and spare8 = #{spare8}</if>
             <if test="cargoSpaceName != null  and cargoSpaceName != ''"> and cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
+            <if test="roadwayId != null  and roadwayId != ''"> and roadway_id = #{roadwayId}</if>
+            <if test="thePlatoon != null  and thePlatoon != ''"> and the_platoon = #{thePlatoon}</if>
+            <if test="theColumn != null  and theColumn != ''"> and the_column = #{theColumn}</if>
+            <if test="theFloor != null  and theFloor != ''"> and the_floor = #{theFloor}</if>
             <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
                 ${params.warehouseDataScope}
             </if>
diff --git a/ruoyi-ui/src/views/stock/pointOut.vue b/ruoyi-ui/src/views/stock/pointOut.vue
index 5cdafa4..3f56f31 100644
--- a/ruoyi-ui/src/views/stock/pointOut.vue
+++ b/ruoyi-ui/src/views/stock/pointOut.vue
@@ -9,6 +9,38 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="巷道" prop="roadwayId">
+        <el-input
+          v-model="queryParams.roadwayId"
+          placeholder="请输入巷道"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="排" prop="thePlatoon">
+        <el-input
+          v-model="queryParams.thePlatoon"
+          placeholder="请输入排"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="列" prop="theColumn">
+        <el-input
+          v-model="queryParams.theColumn"
+          placeholder="请输入列"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="层" prop="theFloor">
+        <el-input
+          v-model="queryParams.theFloor"
+          placeholder="请输入层"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="货位名称" prop="cargoSpaceName"><!-- 货位id -->
         <el-input
           v-model="queryParams.cargoSpaceName"
@@ -231,6 +263,10 @@ export default {
         spare3: null,
         spare4: null,
         spare5: null,
+        roadwayId: null,
+        thePlatoon: null,
+        theColumn: null,
+        theFloor: null,
         spare6: null
       },
       // 表单参数