feat(mes): 更新反馈和入库相关接口及状态管理

将多个接口的执行方法重命名为完成方法,增强语义清晰度。更新相关的权限控制和状态枚举,确保系统逻辑一致性。
pull/871/MERGE
YunaiV 2026-03-02 19:25:37 +08:00
parent 4d66a7072c
commit fa38b554ea
12 changed files with 32 additions and 32 deletions

View File

@ -80,8 +80,8 @@ export const ProFeedbackApi = {
return await request.put({ url: `/mes/pro/feedback/reject?id=` + id })
},
// 执行报工
executeFeedback: async (id: number) => {
return await request.put({ url: `/mes/pro/feedback/execute?id=` + id })
finishFeedback: async (id: number) => {
return await request.put({ url: `/mes/pro/feedback/finish?id=` + id })
},
// 取消报工
cancelFeedback: async (id: number) => {

View File

@ -62,8 +62,8 @@ export const WmItemReceiptApi = {
},
// 执行入库
executeItemReceipt: async (id: number) => {
return await request.put({ url: '/mes/wm/item-receipt/execute?id=' + id })
finishItemReceipt: async (id: number) => {
return await request.put({ url: '/mes/wm/item-receipt/finish?id=' + id })
},
// 取消采购入库单

View File

@ -56,8 +56,8 @@ export const WmProductReceiptApi = {
},
// 执行入库
executeProductReceipt: async (id: number) => {
return await request.put({ url: '/mes/wm/product-receipt/execute?id=' + id })
finishProductReceipt: async (id: number) => {
return await request.put({ url: '/mes/wm/product-receipt/finish?id=' + id })
},
// 取消产品入库单

View File

@ -64,8 +64,8 @@ export const WmProductSalesApi = {
},
// 执行出库
executeProductSales: async (id: number) => {
return await request.put({ url: '/mes/wm/product-sales/execute?id=' + id })
finishProductSales: async (id: number) => {
return await request.put({ url: '/mes/wm/product-sales/finish?id=' + id })
},
// 取消销售出库单

View File

@ -49,8 +49,8 @@ export const WmReturnSalesApi = {
},
// 执行退货
executeReturnSales: async (id: number) => {
return await request.put({ url: '/mes/wm/return-sales/execute?id=' + id })
finishReturnSales: async (id: number) => {
return await request.put({ url: '/mes/wm/return-sales/finish?id=' + id })
},
// 执行上架

View File

@ -169,8 +169,8 @@
<el-button
link
type="success"
@click="handleExecute(scope.row.id)"
v-hasPermi="['mes:pro-feedback:update']"
@click="handleFinish(scope.row.id)"
v-hasPermi="['mes:pro-feedback:finish']"
>
执行
</el-button>
@ -293,10 +293,10 @@ const handleReject = async (id: number) => {
} catch {}
}
const handleExecute = async (id: number) => {
const handleFinish = async (id: number) => {
try {
await message.confirm('确认要执行该报工单吗?')
await ProFeedbackApi.executeFeedback(id)
await ProFeedbackApi.finishFeedback(id)
message.success('报工单已执行')
await getList()
} catch {}

View File

@ -124,8 +124,8 @@
<el-button
link
type="primary"
@click="handleExecute(scope.row.id)"
v-hasPermi="['mes:wm-item-receipt:execute']"
@click="handleFinish(scope.row.id)"
v-hasPermi="['mes:wm-item-receipt:finish']"
v-if="scope.row.status === MesWmItemReceiptStatusEnum.APPROVED"
>
执行入库
@ -226,10 +226,10 @@ const handleSubmit = async (id: number) => {
}
/** 执行入库 */
const handleExecute = async (id: number) => {
const handleFinish = async (id: number) => {
try {
await message.confirm('确认执行入库?执行后将更新库存台账。')
await WmItemReceiptApi.executeItemReceipt(id)
await WmItemReceiptApi.finishItemReceipt(id)
message.success('入库成功')
await getList()
} catch {}

View File

@ -146,7 +146,7 @@
link
type="success"
@click="handleFinish(scope.row.id)"
v-hasPermi="['mes:wm-production-issue:execute']"
v-hasPermi="['mes:wm-production-issue:finish']"
v-if="scope.row.status === MesWmProductionIssueStatusEnum.APPROVED"
>
完成

View File

@ -120,8 +120,8 @@
<el-button
link
type="primary"
@click="handleExecute(scope.row.id)"
v-hasPermi="['mes:wm-product-receipt:execute']"
@click="handleFinish(scope.row.id)"
v-hasPermi="['mes:wm-product-receipt:finish']"
v-if="scope.row.status === MesWmProductReceiptStatusEnum.APPROVED"
>
执行入库
@ -225,10 +225,10 @@ const handleSubmit = async (id: number) => {
}
/** 执行入库 */
const handleExecute = async (id: number) => {
const handleFinish = async (id: number) => {
try {
await message.confirm('确认执行入库?执行后将更新库存台账。')
await WmProductReceiptApi.executeProductReceipt(id)
await WmProductReceiptApi.finishProductReceipt(id)
message.success('入库成功')
await getList()
} catch {}

View File

@ -160,8 +160,8 @@
<el-button
link
type="primary"
@click="handleExecute(scope.row.id)"
v-hasPermi="['mes:wm-product-sales:execute']"
@click="handleFinish(scope.row.id)"
v-hasPermi="['mes:wm-product-sales:finish']"
v-if="scope.row.status === MesWmProductSalesStatusEnum.APPROVED"
>
执行出库
@ -266,10 +266,10 @@ const handleSubmit = async (id: number) => {
}
/** 执行出库 */
const handleExecute = async (id: number) => {
const handleFinish = async (id: number) => {
try {
await message.confirm('确认执行出库?执行后将扣减库存。')
await WmProductSalesApi.executeProductSales(id)
await WmProductSalesApi.finishProductSales(id)
message.success('出库成功')
await getList()
} catch {}

View File

@ -141,7 +141,7 @@
link
type="success"
@click="handleFinish(scope.row.id)"
v-hasPermi="['mes:wm-return-issue:execute']"
v-hasPermi="['mes:wm-return-issue:finish']"
v-if="scope.row.status === MesWmReturnIssueStatusEnum.APPROVED"
>
执行退料

View File

@ -121,8 +121,8 @@
<el-button
link
type="primary"
@click="handleExecute(scope.row.id)"
v-hasPermi="['mes:wm-return-sales:execute']"
@click="handleFinish(scope.row.id)"
v-hasPermi="['mes:wm-return-sales:finish']"
v-if="scope.row.status === MesWmReturnSalesStatusEnum.APPROVING"
>
执行退货
@ -234,10 +234,10 @@ const handleSubmit = async (id: number) => {
}
/** 执行退货 */
const handleExecute = async (id: number) => {
const handleFinish = async (id: number) => {
try {
await message.confirm('确认执行退货?')
await WmReturnSalesApi.executeReturnSales(id)
await WmReturnSalesApi.finishReturnSales(id)
message.success('执行成功')
await getList()
} catch {}