From 53bfa9be572f15483c810c56e007cf76da05dea2 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 29 Mar 2026 09:17:37 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(mes):=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=EF=BC=8C=E4=BC=98=E5=8C=96=E4=BB=93=E5=BA=93=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/WmMaterialStockSelect.vue      | 35 +++++++------------
 src/views/mes/wm/materialStock/index.vue      |  3 +-
 2 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/src/views/mes/wm/materialStock/components/WmMaterialStockSelect.vue b/src/views/mes/wm/materialStock/components/WmMaterialStockSelect.vue
index d5e343b4b..d934df7ca 100644
--- a/src/views/mes/wm/materialStock/components/WmMaterialStockSelect.vue
+++ b/src/views/mes/wm/materialStock/components/WmMaterialStockSelect.vue
@@ -11,13 +11,7 @@
         />
       </el-form-item>
       <el-form-item label="仓库">
-        <el-input
-          v-model="queryParams.warehouseName"
-          placeholder="请输入仓库名称"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-200px"
-        />
+        <WmWarehouseSelect v-model="queryParams.warehouseId" class="!w-200px" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="handleQuery">
@@ -39,7 +33,13 @@
       <el-table-column label="库区" prop="locationName" width="150" />
       <el-table-column label="库位" prop="areaName" width="150" />
       <el-table-column label="可用数量" prop="quantity" width="120" />
-      <el-table-column label="冻结数量" prop="quantityFrozen" width="120" />
+      <el-table-column label="是否冻结" prop="frozen" width="100">
+        <template #default="scope">
+          <el-tag :type="scope.row.frozen ? 'danger' : 'success'">
+            {{ scope.row.frozen ? '是' : '否' }}
+          </el-tag>
+        </template>
+      </el-table-column>
     </el-table>
 
     <Pagination
@@ -59,6 +59,7 @@
 <script setup lang="ts">
 import { ref, reactive } from 'vue'
 import { WmMaterialStockApi } from '@/api/mes/wm/materialstock'
+import WmWarehouseSelect from '@/views/mes/wm/warehouse/components/WmWarehouseSelect.vue'
 
 defineOptions({ name: 'WmMaterialStockSelect' })
 
@@ -76,7 +77,7 @@ const queryParams = reactive({
   pageSize: 10,
   itemId: undefined,
   batchCode: undefined,
-  warehouseName: undefined
+  warehouseId: undefined
 })
 
 const open = (itemId?: number) => {
@@ -110,7 +111,7 @@ const handleQuery = () => {
 
 const resetQuery = () => {
   queryParams.batchCode = undefined
-  queryParams.warehouseName = undefined
+  queryParams.warehouseId = undefined
   queryParams.itemId = currentItemId.value
   handleQuery()
 }
@@ -123,19 +124,7 @@ const handleConfirm = () => {
   if (!selectedRow.value) {
     return
   }
-  // TODO @芋艿：暂时不用提供 warehouseName、locationName、areaName 这种；
-  emit('select', {
-    materialStockId: selectedRow.value.id,
-    batchId: selectedRow.value.batchId,
-    batchCode: selectedRow.value.batchCode,
-    warehouseId: selectedRow.value.warehouseId,
-    warehouseName: selectedRow.value.warehouseName,
-    locationId: selectedRow.value.locationId,
-    locationName: selectedRow.value.locationName,
-    areaId: selectedRow.value.areaId,
-    areaName: selectedRow.value.areaName,
-    availableQuantity: selectedRow.value.quantity
-  })
+  emit('select', selectedRow.value)
   handleClose()
 }
 
diff --git a/src/views/mes/wm/materialStock/index.vue b/src/views/mes/wm/materialStock/index.vue
index 352c73c19..46710b305 100644
--- a/src/views/mes/wm/materialStock/index.vue
+++ b/src/views/mes/wm/materialStock/index.vue
@@ -77,7 +77,8 @@
           <el-table-column label="规格型号" align="center" prop="specification" min-width="120" />
           <el-table-column label="在库数量" align="center" prop="quantity" min-width="100" />
           <el-table-column label="单位" align="center" prop="unitMeasureName" min-width="80" />
-          <!-- TODO @芋艿：批次号，待 mes_wm_batch 模块迁移后补充 -->
+          <!-- TODO @AI：对齐 ktg，这里应该有个【批次详情】 -->
+          <el-table-column label="批次号" align="center" prop="batchCode" min-width="140" />
           <el-table-column label="仓库" align="center" prop="warehouseName" min-width="100" />
           <el-table-column label="库区" align="center" prop="locationName" min-width="100" />
           <el-table-column label="库位" align="center" prop="areaName" min-width="100">