diff --git a/src/api/mes/pro/feedback/index.ts b/src/api/mes/pro/feedback/index.ts index 460cc7ab2..3235b8e29 100644 --- a/src/api/mes/pro/feedback/index.ts +++ b/src/api/mes/pro/feedback/index.ts @@ -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) => { diff --git a/src/api/mes/wm/itemreceipt/index.ts b/src/api/mes/wm/itemreceipt/index.ts index 5430d3a2f..06a7afb01 100644 --- a/src/api/mes/wm/itemreceipt/index.ts +++ b/src/api/mes/wm/itemreceipt/index.ts @@ -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 }) }, // 取消采购入库单 diff --git a/src/api/mes/wm/productreceipt/index.ts b/src/api/mes/wm/productreceipt/index.ts index 69fee59b2..a91d9c21b 100644 --- a/src/api/mes/wm/productreceipt/index.ts +++ b/src/api/mes/wm/productreceipt/index.ts @@ -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 }) }, // 取消产品入库单 diff --git a/src/api/mes/wm/productsales/index.ts b/src/api/mes/wm/productsales/index.ts index 7391506fb..e5a1c2054 100644 --- a/src/api/mes/wm/productsales/index.ts +++ b/src/api/mes/wm/productsales/index.ts @@ -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 }) }, // 取消销售出库单 diff --git a/src/api/mes/wm/returnsales/index.ts b/src/api/mes/wm/returnsales/index.ts index b8cd881f0..500b9b755 100644 --- a/src/api/mes/wm/returnsales/index.ts +++ b/src/api/mes/wm/returnsales/index.ts @@ -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 }) }, // 执行上架 diff --git a/src/views/mes/pro/feedback/index.vue b/src/views/mes/pro/feedback/index.vue index 4d4758a34..44f860aae 100644 --- a/src/views/mes/pro/feedback/index.vue +++ b/src/views/mes/pro/feedback/index.vue @@ -169,8 +169,8 @@ 执行 @@ -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 {} diff --git a/src/views/mes/wm/itemreceipt/index.vue b/src/views/mes/wm/itemreceipt/index.vue index e0ce049f0..5008cb6b8 100644 --- a/src/views/mes/wm/itemreceipt/index.vue +++ b/src/views/mes/wm/itemreceipt/index.vue @@ -124,8 +124,8 @@ 执行入库 @@ -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 {} diff --git a/src/views/mes/wm/productionissue/index.vue b/src/views/mes/wm/productionissue/index.vue index 210907c3c..bea6e3b39 100644 --- a/src/views/mes/wm/productionissue/index.vue +++ b/src/views/mes/wm/productionissue/index.vue @@ -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" > 完成 diff --git a/src/views/mes/wm/productreceipt/index.vue b/src/views/mes/wm/productreceipt/index.vue index 6422e9fd3..e6f8a27c3 100644 --- a/src/views/mes/wm/productreceipt/index.vue +++ b/src/views/mes/wm/productreceipt/index.vue @@ -120,8 +120,8 @@ 执行入库 @@ -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 {} diff --git a/src/views/mes/wm/productsales/index.vue b/src/views/mes/wm/productsales/index.vue index 47754ea3b..cf1748073 100644 --- a/src/views/mes/wm/productsales/index.vue +++ b/src/views/mes/wm/productsales/index.vue @@ -160,8 +160,8 @@ 执行出库 @@ -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 {} diff --git a/src/views/mes/wm/returnissue/index.vue b/src/views/mes/wm/returnissue/index.vue index 4c923b46a..2a8f7915c 100644 --- a/src/views/mes/wm/returnissue/index.vue +++ b/src/views/mes/wm/returnissue/index.vue @@ -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" > 执行退料 diff --git a/src/views/mes/wm/returnsales/index.vue b/src/views/mes/wm/returnsales/index.vue index c86614128..6a614130f 100644 --- a/src/views/mes/wm/returnsales/index.vue +++ b/src/views/mes/wm/returnsales/index.vue @@ -121,8 +121,8 @@ 执行退货 @@ -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 {}