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 @@
-
+
@@ -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 @@
-
+
@@ -93,18 +93,17 @@
-
-
-
+
{
/** 处理冻结状态切换 */
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
}
}