From 81c04bd90df65d543419fc52997d5310c33906b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=AB=E7=8C=ABguowen?=
 <9290821+guowen-the-cat@user.noreply.gitee.com>
Date: Fri, 27 Jun 2025 11:32:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E7=AE=A1=E7=90=86=EF=BC=8C?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=AE=A1=E7=90=86=EF=BC=8C=E7=9B=98=E7=82=B9?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E4=BB=93=E5=BA=93=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E6=A1=86=EF=BC=8C=E4=BB=93=E5=BA=93=E5=AD=97=E6=AE=B5=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=EF=BC=8C=E6=90=9C=E7=B4=A2=E6=A1=86lable=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/CheckDifferenceRecord.java         | 24 +++++++
 .../check/CheckDifferenceRecordMapper.xml     | 69 +++++++++++++++----
 ruoyi-ui/src/lang/en.js                       |  1 +
 ruoyi-ui/src/lang/zh.js                       |  1 +
 ruoyi-ui/src/views/check/create/index.vue     |  8 ++-
 ruoyi-ui/src/views/check/difference/index.vue | 37 ++++++++++
 ruoyi-ui/src/views/check/job/in/index.vue     | 29 ++++++--
 ruoyi-ui/src/views/check/job/out/index.vue    | 29 ++++++--
 ruoyi-ui/src/views/check/stockCheck/index.vue |  8 ++-
 ruoyi-ui/src/views/in/job/index.vue           | 32 +++++++--
 ruoyi-ui/src/views/in/receive/index.vue       |  7 ++
 ruoyi-ui/src/views/in/stockIn/index.vue       | 35 ++++++++++
 ruoyi-ui/src/views/out/outStockoutManage.vue  | 34 +++++++++
 13 files changed, 283 insertions(+), 31 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/difference/domain/CheckDifferenceRecord.java b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/domain/CheckDifferenceRecord.java
index 7080ee3..89a1f6d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/check/difference/domain/CheckDifferenceRecord.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/domain/CheckDifferenceRecord.java
@@ -69,6 +69,30 @@ public class CheckDifferenceRecord extends BaseEntity
     /** 审核状态 */
     @Excel(name = "审核状态")
     private String status;
+    /** 仓库ID */
+    @Excel(name = "仓库ID")
+    private String warehouseId;
+
+    /** 仓库名称 */
+    @Excel(name = "仓库名称")
+    private String warehouseName;
+
+
+    public String getWarehouseId() {
+        return warehouseId;
+    }
+
+    public void setWarehouseId(String warehouseId) {
+        this.warehouseId = warehouseId;
+    }
+
+    public String getWarehouseName() {
+        return warehouseName;
+    }
+
+    public void setWarehouseName(String warehouseName) {
+        this.warehouseName = warehouseName;
+    }
 
     public String getStatus() {
         return status;
diff --git a/ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordMapper.xml
index 38d7bb1..e1f58bf 100644
--- a/ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordMapper.xml
@@ -20,30 +20,66 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
         <result property="productGuid"    column="product_guid"    />
         <result property="status"    column="status"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="warehouseName"    column="warehouse_name"    />
     </resultMap>
 
     <sql id="selectCheckDifferenceRecordVo">
-        select check_guid, check_stock_detail_id, stock_id, tray_code, cargo_space_id, product_id, lot_no, supplier, customer, old_quantity, new_quantity, record_type, create_time, product_guid ,status from check_difference_record
+        select r.check_guid, r.check_stock_detail_id, r.stock_id, r.tray_code, r.cargo_space_id, 
+               r.product_id, r.lot_no, r.supplier, r.customer, r.old_quantity, r.new_quantity, 
+               r.record_type, r.create_time, r.product_guid, r.status, r.warehouse_id,
+               w.warehouse_name
+        from check_difference_record r
+        left join bas_warehouse w on r.warehouse_id = w.warehouse_id
     </sql>
 
     <select id="selectCheckDifferenceRecordList" parameterType="CheckDifferenceRecord" resultMap="CheckDifferenceRecordResult">
         <include refid="selectCheckDifferenceRecordVo"/>
         <where>
-            <if test="checkStockDetailId != null  and checkStockDetailId != ''"> and check_stock_detail_id = #{checkStockDetailId}</if>
-            <if test="stockId != null  and stockId != ''"> and stock_id = #{stockId}</if>
-            <if test="trayCode != null  and trayCode != ''"> and tray_code = #{trayCode}</if>
-            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and cargo_space_id = #{cargoSpaceId}</if>
-            <if test="productId != null  and productId != ''"> and product_id = #{productId}</if>
-            <if test="lotNo != null  and lotNo != ''"> and lot_no = #{lotNo}</if>
-            <if test="supplier != null  and supplier != ''"> and supplier = #{supplier}</if>
-            <if test="customer != null  and customer != ''"> and customer = #{customer}</if>
-            <if test="oldQuantity != null  and oldQuantity != ''"> and old_quantity = #{oldQuantity}</if>
-            <if test="newQuantity != null  and newQuantity != ''"> and new_quantity = #{newQuantity}</if>
-            <if test="recordType != null "> and record_type = #{recordType}</if>
-            <if test="productGuid != null  and productGuid != ''"> and product_guid = #{productGuid}</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="checkStockDetailId != null  and checkStockDetailId != ''">
+                and r.check_stock_detail_id = #{checkStockDetailId}
+            </if>
+            <if test="stockId != null  and stockId != ''">
+                and r.stock_id = #{stockId}
+            </if>
+            <if test="trayCode != null  and trayCode != ''">
+                and r.tray_code = #{trayCode}
+            </if>
+            <if test="cargoSpaceId != null  and cargoSpaceId != ''">
+                and r.cargo_space_id = #{cargoSpaceId}
+            </if>
+            <if test="productId != null  and productId != ''">
+                and r.product_id = #{productId}
+            </if>
+            <if test="lotNo != null  and lotNo != ''">
+                and r.lot_no = #{lotNo}
+            </if>
+            <if test="supplier != null  and supplier != ''">
+                and r.supplier = #{supplier}
+            </if>
+            <if test="customer != null  and customer != ''">
+                and r.customer = #{customer}
+            </if>
+            <if test="oldQuantity != null  and oldQuantity != ''">
+                and r.old_quantity = #{oldQuantity}
+            </if>
+            <if test="newQuantity != null  and newQuantity != ''">
+                and r.new_quantity = #{newQuantity}
+            </if>
+            <if test="recordType != null ">
+                and r.record_type = #{recordType}
+            </if>
+            <if test="productGuid != null  and productGuid != ''">
+                and r.product_guid = #{productGuid}
+            </if>
+            <if test="status != null  and status != ''">
+                and r.status = #{status}
+            </if>
+            <if test="warehouseId != null  and warehouseId != ''">
+                and r.warehouse_id = #{warehouseId}
+            </if>
         </where>
-             order by create_time desc
+        order by r.create_time desc
     </select>
 
     <select id="selectCheckDifferenceRecordByCheckGuid" parameterType="String" resultMap="CheckDifferenceRecordResult">
@@ -69,6 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="productGuid != null">product_guid,</if>
             <if test="status != null">status,</if>
+            <if test="warehouseId != null">warehouse_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="checkGuid != null">#{checkGuid},</if>
@@ -86,6 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="productGuid != null">#{productGuid},</if>
             <if test="status != null">#{status},</if>
+            <if test="warehouseId != null">#{warehouseId},</if>
          </trim>
     </insert>
 
@@ -106,6 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="productGuid != null">product_guid = #{productGuid},</if>
             <if test="status != null">status = #{status},</if>
+            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
         </trim>
         where check_guid = #{checkGuid}
     </update>
diff --git a/ruoyi-ui/src/lang/en.js b/ruoyi-ui/src/lang/en.js
index ad9d117..b766c02 100644
--- a/ruoyi-ui/src/lang/en.js
+++ b/ruoyi-ui/src/lang/en.js
@@ -586,6 +586,7 @@ export default {
   // ****************盘点差异管理*****************
   checkDifference: {
     unaudited:'unaudited',
+    warehouseId:'warehouse',
     audited:'audited',
     inputStatus:'Please Select Status',
     status:'status',
diff --git a/ruoyi-ui/src/lang/zh.js b/ruoyi-ui/src/lang/zh.js
index 67ae536..df74ed3 100644
--- a/ruoyi-ui/src/lang/zh.js
+++ b/ruoyi-ui/src/lang/zh.js
@@ -562,6 +562,7 @@ export default {
   },
   // ****************盘点差异管理*****************
   checkDifference: {
+    warehouseId:'仓库',
     unaudited:'未审核',
     audited:'已审核',
     inputStatus:'请选择审核状态',
diff --git a/ruoyi-ui/src/views/check/create/index.vue b/ruoyi-ui/src/views/check/create/index.vue
index ffbf28e..98fd5f3 100644
--- a/ruoyi-ui/src/views/check/create/index.vue
+++ b/ruoyi-ui/src/views/check/create/index.vue
@@ -488,4 +488,10 @@
     }
   };
   </script>
-
+<style scoped>
+.el-form-item >>> .el-form-item__label {
+  white-space: nowrap;
+  width: auto;
+  min-width: fit-content;
+}
+</style>
diff --git a/ruoyi-ui/src/views/check/difference/index.vue b/ruoyi-ui/src/views/check/difference/index.vue
index 44295e1..5e799de 100644
--- a/ruoyi-ui/src/views/check/difference/index.vue
+++ b/ruoyi-ui/src/views/check/difference/index.vue
@@ -81,6 +81,21 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>-->
+      <el-form-item :label="$t('inReceiveStockin.warehouseId')" prop="warehouseId"><!--仓库-->
+        <el-select
+          v-model="queryParams.warehouseId"
+          :placeholder="$t('inReceiveStockin.selectWarehouseId')"
+          clearable
+          @change="handleQuery"
+        >
+          <el-option
+            v-for="item in warehouseOptions"
+            :key="item.warehouseId"
+            :label="item.warehouseName"
+            :value="item.warehouseId"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item :label="$t('checkDifference.status')" prop="status"> <!-- 审核状态 -->
         <el-select v-model="queryParams.status" :placeholder="$t('checkDifference.inputStatus')" clearable>
           <el-option :label="$t('checkDifference.unaudited')" value="0" /> <!-- 未审核 -->
@@ -131,11 +146,14 @@
       <el-table-column :label="$t('checkDifference.newQuantity')" align="center" prop="newQuantity" /> <!-- 新值 -->
       <el-table-column :label="$t('checkDifference.recordType')" align="center" prop="recordType" /> <!-- 操作方式 -->
       <el-table-column :label="$t('checkDifference.createTime')" align="center" prop="createTime" /> <!-- 创建时间 -->
+      <el-table-column :label="$t('checkDifference.warehouseId')" align="center" prop="warehouseName" /> <!-- 创建时间 -->
       <el-table-column :label="$t('checkDifference.status')" align="center" prop="status"> <!-- 审核状态 -->
         <template slot-scope="scope">
           <dict-tag :options="[{ label: $t('checkDifference.unaudited'), value: '0', raw: { listClass: 'info' } }, { label: $t('checkDifference.audited'), value: '1', raw: { listClass: 'success' } }]" :value="scope.row.status"/>
         </template>
       </el-table-column>
+
+
 <!--      <el-table-column :label="$t('checkDifference.productGuid')" align="center" prop="productGuid" /> &lt;!&ndash; 物料guid &ndash;&gt;-->
 <!--      <el-table-column :label="$t('checkDifference.operation')" align="center" class-name="small-padding fixed-width"> &lt;!&ndash; 操作 &ndash;&gt;
         <template slot-scope="scope">
@@ -214,6 +232,7 @@
 import { listDifference, getDifference, delDifference, addDifference, updateDifference, auditDifference } from "@/api/check/difference"
 import { listDifferenceRecordFinish } from "@/api/check/DifferenceRecordFinish"
 import DictTag from "@/components/DictTag"
+import {listWarehouse} from "@/api/bas/warehouse";
 
 export default {
   name: "Difference",
@@ -222,6 +241,7 @@ export default {
   },
   data() {
     return {
+      warehouseOptions:[],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -267,8 +287,18 @@ export default {
   },
   created() {
     this.getList()
+    this.getWarehouseList()
   },
   methods: {
+    /** 获取仓库列表 */
+    getWarehouseList() {
+      listWarehouse().then(response => {
+        this.warehouseOptions = response.rows;
+        if (this.warehouseOptions.length > 0) {
+          this.handleQuery();
+        }
+      });
+    },
     /** 查询盘点差异列表 */
     getList() {
       this.loading = true
@@ -395,3 +425,10 @@ export default {
   }
 }
 </script>
+<style scoped>
+.el-form-item >>> .el-form-item__label {
+  white-space: nowrap;
+  width: auto;
+  min-width: fit-content;
+}
+</style>
diff --git a/ruoyi-ui/src/views/check/job/in/index.vue b/ruoyi-ui/src/views/check/job/in/index.vue
index 942e588..8a8559d 100644
--- a/ruoyi-ui/src/views/check/job/in/index.vue
+++ b/ruoyi-ui/src/views/check/job/in/index.vue
@@ -185,13 +185,20 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>-->
-      <el-form-item :label="$t('checkJobIn.warehouse')" prop="warehouseId"> <!--仓库-->
-        <el-input
+      <el-form-item :label="$t('inReceiveStockin.warehouseId')" prop="warehouseId"><!--仓库-->
+        <el-select
           v-model="queryParams.warehouseId"
-          :placeholder="$t('checkJobIn.inputWarehouseId')"
+          :placeholder="$t('inReceiveStockin.selectWarehouseId')"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
+          @change="handleQuery"
+        >
+          <el-option
+            v-for="item in warehouseOptions"
+            :key="item.warehouseId"
+            :label="item.warehouseName"
+            :value="item.warehouseId"
+          />
+        </el-select>
       </el-form-item>
 <!--      <el-form-item label="重分标记" prop="faultFlag">
         <el-input
@@ -346,12 +353,14 @@ import {
   manualCompleted
 } from "@/api/job/inmydoJob"
 import { listMydoJobDetail } from "@/api/job/mydoJobDetail"
+import {listWarehouse} from "@/api/bas/warehouse";
 
 export default {
   name: "MydoJob",
   dicts: ['execution_phase_type', 'check_in_job_type', 'on_line_type', 'mydo_job_status'],
   data() {
     return {
+      warehouseOptions:[],
       // 遮罩层
       loading: true,
       detailLoading:false,
@@ -433,8 +442,18 @@ export default {
   created() {
     // 获取字典数据后，设置默认值
     this.getList()
+    this.getWarehouseList()
   },
   methods: {
+    /** 获取仓库列表 */
+    getWarehouseList() {
+      listWarehouse().then(response => {
+        this.warehouseOptions = response.rows;
+        if (this.warehouseOptions.length > 0) {
+          this.handleQuery();
+        }
+      });
+    },
     /** 查询任务表列表 */
     getList() {
       this.loading = true
diff --git a/ruoyi-ui/src/views/check/job/out/index.vue b/ruoyi-ui/src/views/check/job/out/index.vue
index a9973cb..6322f1f 100644
--- a/ruoyi-ui/src/views/check/job/out/index.vue
+++ b/ruoyi-ui/src/views/check/job/out/index.vue
@@ -185,13 +185,20 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>-->
-      <el-form-item :label="$t('checkJobOut.warehouse')" prop="warehouseId"> <!-- 仓库 -->
-        <el-input
+      <el-form-item :label="$t('inReceiveStockin.warehouseId')" prop="warehouseId"><!--仓库-->
+        <el-select
           v-model="queryParams.warehouseId"
-          :placeholder="$t('checkJobOut.inputWarehouseId')"
+          :placeholder="$t('inReceiveStockin.selectWarehouseId')"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
+          @change="handleQuery"
+        >
+          <el-option
+            v-for="item in warehouseOptions"
+            :key="item.warehouseId"
+            :label="item.warehouseName"
+            :value="item.warehouseId"
+          />
+        </el-select>
       </el-form-item>
 <!--      <el-form-item label="重分标记" prop="faultFlag">
         <el-input
@@ -348,12 +355,14 @@
 <script>
 import { listMydoJobOut } from "@/api/job/OutmydoJob"
 import { listMydoJobDetail } from "@/api/job/mydoJobDetail"
+import {listWarehouse} from "@/api/bas/warehouse";
 
 export default {
   name: "MydoJob",
   dicts: ['execution_phase_type', 'check_out_job_type', 'on_line_type', 'mydo_job_status'],
   data() {
     return {
+      warehouseOptions:[],
       // 遮罩层
       loading: true,
       detailLoading:false,
@@ -434,8 +443,18 @@ export default {
   created() {
     // 获取字典数据后，设置默认值
     this.getList()
+    this.getWarehouseList()
   },
   methods: {
+    /** 获取仓库列表 */
+    getWarehouseList() {
+      listWarehouse().then(response => {
+        this.warehouseOptions = response.rows;
+        if (this.warehouseOptions.length > 0) {
+          this.handleQuery();
+        }
+      });
+    },
     /** 查询任务表列表 */
     getList() {
       this.loading = true
diff --git a/ruoyi-ui/src/views/check/stockCheck/index.vue b/ruoyi-ui/src/views/check/stockCheck/index.vue
index 2fede53..f988e20 100644
--- a/ruoyi-ui/src/views/check/stockCheck/index.vue
+++ b/ruoyi-ui/src/views/check/stockCheck/index.vue
@@ -537,4 +537,10 @@ export default {
   }
 }
 </script>
-
+<style scoped>
+.el-form-item >>> .el-form-item__label {
+  white-space: nowrap;
+  width: auto;
+  min-width: fit-content;
+}
+</style>
diff --git a/ruoyi-ui/src/views/in/job/index.vue b/ruoyi-ui/src/views/in/job/index.vue
index 62ccc88..6e89da5 100644
--- a/ruoyi-ui/src/views/in/job/index.vue
+++ b/ruoyi-ui/src/views/in/job/index.vue
@@ -185,13 +185,20 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>-->
-      <el-form-item :label="$t('inReceiveStockin.warehouseId')" prop="warehouseId">
-        <el-input
+      <el-form-item :label="$t('inReceiveStockin.warehouseId')" prop="warehouseId"><!--仓库-->
+        <el-select
           v-model="queryParams.warehouseId"
           :placeholder="$t('inReceiveStockin.selectWarehouseId')"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
+          @change="handleQuery"
+        >
+          <el-option
+            v-for="item in warehouseOptions"
+            :key="item.warehouseId"
+            :label="item.warehouseName"
+            :value="item.warehouseId"
+          />
+        </el-select>
       </el-form-item>
 <!--      <el-form-item label="重分标记" prop="faultFlag">
         <el-input
@@ -350,6 +357,7 @@
 <script>
 import { listMydoJob,manualInvalidation,manualCompleted, getMydoJob, delMydoJob, addMydoJob, updateMydoJob } from "@/api/job/inmydoJob"
 import { listMydoJobDetail } from "@/api/job/mydoJobDetail"
+import {listWarehouse} from "@/api/bas/warehouse";
 
 export default {
   name: "MydoJob",
@@ -359,6 +367,7 @@ export default {
       // 遮罩层
       loading: true,
       detailLoading:false,
+      warehouseOptions:[],
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -436,8 +445,18 @@ export default {
   created() {
     // 获取字典数据后，设置默认值
     this.getList()
+    this.getWarehouseList()
   },
   methods: {
+    /** 获取仓库列表 */
+    getWarehouseList() {
+      listWarehouse().then(response => {
+        this.warehouseOptions = response.rows;
+        if (this.warehouseOptions.length > 0) {
+          this.handleQuery();
+        }
+      });
+    },
     /** 查询任务表列表 */
     getList() {
       this.loading = true
@@ -581,4 +600,9 @@ export default {
 .el-table >>> .current-row {
   background-color: #f0f9eb;
 }
+.el-form-item >>> .el-form-item__label {
+  white-space: nowrap;
+  width: auto;
+  min-width: fit-content;
+}
 </style>
diff --git a/ruoyi-ui/src/views/in/receive/index.vue b/ruoyi-ui/src/views/in/receive/index.vue
index 1067c15..a8f5165 100644
--- a/ruoyi-ui/src/views/in/receive/index.vue
+++ b/ruoyi-ui/src/views/in/receive/index.vue
@@ -669,3 +669,10 @@ export default {
   }
 }
 </script>
+<style scoped>
+.el-form-item >>> .el-form-item__label {
+  white-space: nowrap;
+  width: auto;
+  min-width: fit-content;
+}
+</style>
diff --git a/ruoyi-ui/src/views/in/stockIn/index.vue b/ruoyi-ui/src/views/in/stockIn/index.vue
index c9129c2..2f9b6e2 100644
--- a/ruoyi-ui/src/views/in/stockIn/index.vue
+++ b/ruoyi-ui/src/views/in/stockIn/index.vue
@@ -53,6 +53,21 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>-->
+      <el-form-item :label="$t('inReceiveStockin.warehouseId')" prop="warehouseId"><!--仓库-->
+        <el-select
+          v-model="queryParams.warehouseId"
+          :placeholder="$t('inReceiveStockin.selectWarehouseId')"
+          clearable
+          @change="handleQuery"
+        >
+          <el-option
+            v-for="item in warehouseOptions"
+            :key="item.warehouseId"
+            :label="item.warehouseName"
+            :value="item.warehouseId"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item :label="$t('inReceiveStockin.supplierNo')" prop="supplierNo"><!--供应商编码-->
         <el-input
           v-model="queryParams.supplierNo"
@@ -324,6 +339,7 @@ import {
 } from "@/api/in/stockIn"
 import {listStockInDetail, barcodePrinting} from "@/api/in/stockInDetail"
 import {getLodop} from "@/plugins/LodopFuncs.js"
+import {listWarehouse} from "@/api/bas/warehouse";
 
 
 export default {
@@ -334,6 +350,7 @@ export default {
       // 遮罩层
       loading: true,
       detailLoading: true,
+      warehouseOptions:[],
       // 选中数组
       ids: [],
       detailIds: [],
@@ -408,8 +425,18 @@ export default {
   },
   created() {
     this.getList()
+    this.getWarehouseList()
   },
   methods: {
+    /** 获取仓库列表 */
+    getWarehouseList() {
+      listWarehouse().then(response => {
+        this.warehouseOptions = response.rows;
+        if (this.warehouseOptions.length > 0) {
+          this.handleQuery();
+        }
+      });
+    },
     /** 查询入库单据列表 */
     getList() {
       this.loading = true
@@ -659,3 +686,11 @@ export default {
   }
 }
 </script>
+
+<style scoped>
+.el-form-item >>> .el-form-item__label {
+  white-space: nowrap;
+  width: auto;
+  min-width: fit-content;
+}
+</style>
diff --git a/ruoyi-ui/src/views/out/outStockoutManage.vue b/ruoyi-ui/src/views/out/outStockoutManage.vue
index fe3804d..8d8e307 100644
--- a/ruoyi-ui/src/views/out/outStockoutManage.vue
+++ b/ruoyi-ui/src/views/out/outStockoutManage.vue
@@ -70,6 +70,21 @@
           :placeholder="$t('outStockoutManage.selectFinishDate')">
         </el-date-picker>
       </el-form-item>
+      <el-form-item :label="$t('inReceiveStockin.warehouseId')" prop="warehouseId"><!--仓库-->
+        <el-select
+          v-model="queryParams.warehouseId"
+          :placeholder="$t('inReceiveStockin.selectWarehouseId')"
+          clearable
+          @change="handleQuery"
+        >
+          <el-option
+            v-for="item in warehouseOptions"
+            :key="item.warehouseId"
+            :label="item.warehouseName"
+            :value="item.warehouseId"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{$t('outStockoutManage.search')}}</el-button> <!-- 搜索 -->
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('outStockoutManage.reset')}}</el-button> <!-- 重置 -->
@@ -191,6 +206,7 @@
 <script>
 import { listOutStockout,autoAllot } from "@/api/out/outStockout"
 import { getOutStockoutDetail,updateOutStockStatus } from "@/api/out/outStockout"
+import {listWarehouse} from "@/api/bas/warehouse";
 
 export default {
   name: "OutStockWithDetail",
@@ -200,6 +216,7 @@ export default {
       // 遮罩层
       loading: true,
       detailLoading: false,
+      warehouseOptions:[],
       // 显示搜索条件
       showSearch: true,
       // 总条数
@@ -237,8 +254,18 @@ export default {
   },
   created() {
     this.getList()
+    this.getWarehouseList()
   },
   methods: {
+    /** 获取仓库列表 */
+    getWarehouseList() {
+      listWarehouse().then(response => {
+        this.warehouseOptions = response.rows;
+        if (this.warehouseOptions.length > 0) {
+          this.handleQuery();
+        }
+      });
+    },
     /** 查询主表数据 */
     getList() {
       this.loading = true
@@ -349,3 +376,10 @@ export default {
   }
 }
 </script>
+<style scoped>
+.el-form-item >>> .el-form-item__label {
+  white-space: nowrap;
+  width: auto;
+  min-width: fit-content;
+}
+</style>