From 20bdd0ad319d4aa3848ddf4fb0fc13a9ea8160c2 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 22 Mar 2026 16:31:59 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(mes):=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=AE=A1=E7=90=86=E9=80=BB=E8=BE=91=EF=BC=8C?=
 =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=E5=AD=97=E6=AE=B5=E5=B9=B6=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=BA=8B=E5=8A=A1=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

重构库存管理相关的请求和响应对象，更新字段名称以提高语义清晰度。新增库存事务流水记录，支持库存增减事件的追踪。此变更旨在提升库存管理的可维护性和可读性。
---
 src/api/mes/wm/materialStock/index.ts             | 13 ++++---------
 .../components/WmMaterialStockSelect.vue          |  4 ++--
 src/views/mes/wm/materialStock/index.vue          | 15 +++++++--------
 3 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/src/api/mes/wm/materialStock/index.ts b/src/api/mes/wm/materialStock/index.ts
index 3fee03da0..92ac49ab7 100644
--- a/src/api/mes/wm/materialStock/index.ts
+++ b/src/api/mes/wm/materialStock/index.ts
@@ -8,7 +8,6 @@ export interface WmMaterialStockVO {
   itemCode: string
   itemName: string
   specification: string
-  unitMeasureId: number
   unitMeasureName: string
   batchId: number
   batchCode: string
@@ -20,13 +19,9 @@ export interface WmMaterialStockVO {
   areaName: string
   vendorId: number
   vendorName: string
-  workOrderId: number
-  workOrderCode: string
-  quantityOnhand: number
-  recptDate: string
-  productionDate: string
-  expireDate: string
-  frozen: boolean
+  quantity: number
+  receiptTime: string
+  frozenFlag: boolean
   createTime: string
 }
 
@@ -43,7 +38,7 @@ export const WmMaterialStockApi = {
   },
 
   // 更新库存冻结状态
-  updateMaterialStockFrozen: async (data: { id: number; frozen: boolean }) => {
+  updateMaterialStockFrozen: async (data: { id: number; frozenFlag: boolean }) => {
     return await request.put({ url: '/mes/wm/material-stock/update-frozen', data })
   },
 
diff --git a/src/views/mes/wm/materialStock/components/WmMaterialStockSelect.vue b/src/views/mes/wm/materialStock/components/WmMaterialStockSelect.vue
index b3a2f93b2..d5e343b4b 100644
--- a/src/views/mes/wm/materialStock/components/WmMaterialStockSelect.vue
+++ b/src/views/mes/wm/materialStock/components/WmMaterialStockSelect.vue
@@ -38,7 +38,7 @@
       <el-table-column label="仓库" prop="warehouseName" width="150" />
       <el-table-column label="库区" prop="locationName" width="150" />
       <el-table-column label="库位" prop="areaName" width="150" />
-      <el-table-column label="可用数量" prop="quantityOnhand" width="120" />
+      <el-table-column label="可用数量" prop="quantity" width="120" />
       <el-table-column label="冻结数量" prop="quantityFrozen" width="120" />
     </el-table>
 
@@ -134,7 +134,7 @@ const handleConfirm = () => {
     locationName: selectedRow.value.locationName,
     areaId: selectedRow.value.areaId,
     areaName: selectedRow.value.areaName,
-    availableQuantity: selectedRow.value.quantityOnhand
+    availableQuantity: selectedRow.value.quantity
   })
   handleClose()
 }
diff --git a/src/views/mes/wm/materialStock/index.vue b/src/views/mes/wm/materialStock/index.vue
index c31ec2e1e..e13b5ed64 100644
--- a/src/views/mes/wm/materialStock/index.vue
+++ b/src/views/mes/wm/materialStock/index.vue
@@ -75,7 +75,7 @@
           <el-table-column label="产品物料编码" align="center" prop="itemCode" min-width="120" />
           <el-table-column label="产品物料名称" align="center" prop="itemName" min-width="140" />
           <el-table-column label="规格型号" align="center" prop="specification" min-width="120" />
-          <el-table-column label="在库数量" align="center" prop="quantityOnhand" min-width="100" />
+          <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 模块迁移后补充 -->
           <el-table-column label="仓库" align="center" prop="warehouseName" min-width="100" />
@@ -93,18 +93,17 @@
               <span v-else>-</span>
             </template>
           </el-table-column>
-          <el-table-column label="生产工单" align="center" prop="workOrderCode" min-width="120" />
           <el-table-column
             label="入库日期"
             align="center"
-            prop="recptDate"
+            prop="receiptTime"
             :formatter="dateFormatter2"
             width="180px"
           />
-          <el-table-column label="冻结" align="center" prop="frozen" min-width="80">
+          <el-table-column label="冻结" align="center" prop="frozenFlag" min-width="80">
             <template #default="scope">
               <el-switch
-                v-model="scope.row.frozen"
+                v-model="scope.row.frozenFlag"
                 :active-value="true"
                 :inactive-value="false"
                 v-hasPermi="['mes:wm-material-stock:update']"
@@ -197,13 +196,13 @@ const handleTypeNodeClick = (row: any) => {
 /** 处理冻结状态切换 */
 const handleFrozenChange = async (row: WmMaterialStockVO) => {
   try {
-    const text = row.frozen ? '冻结' : '解冻'
+    const text = row.frozenFlag ? '冻结' : '解冻'
     await message.confirm('确认要"' + text + '"该库存记录吗?')
-    await WmMaterialStockApi.updateMaterialStockFrozen({ id: row.id, frozen: row.frozen })
+    await WmMaterialStockApi.updateMaterialStockFrozen({ id: row.id, frozenFlag: row.frozenFlag })
     message.success(text + '成功')
   } catch {
     // 取消或失败时回滚
-    row.frozen = !row.frozen
+    row.frozenFlag = !row.frozenFlag
   }
 }