From ce14a5ae6db7db85f6abd23979da72ddbce7ef6a Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 4 Mar 2026 08:49:00 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(mes):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=A4=96=E5=8D=8F=E5=8F=91=E6=96=99=E5=8D=95?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

实现取消外协发料单的接口，支持在特定状态下取消发料单。新增相关的业务逻辑和错误处理，确保只有在允许的状态下才能执行取消操作。
---
 src/api/mes/wm/outsourceissue/index.ts        |  5 +++++
 .../wm/outsourceissue/OutsourceIssueForm.vue  |  2 +-
 src/views/mes/wm/outsourceissue/index.vue     | 22 +++++++++++++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/api/mes/wm/outsourceissue/index.ts b/src/api/mes/wm/outsourceissue/index.ts
index ee70c9a43..16905d39c 100644
--- a/src/api/mes/wm/outsourceissue/index.ts
+++ b/src/api/mes/wm/outsourceissue/index.ts
@@ -59,6 +59,11 @@ export const WmOutsourceIssueApi = {
     return await request.put({ url: '/mes/wm/outsource-issue/finish?id=' + id })
   },
 
+  // 取消外协发料单
+  cancelOutsourceIssue: async (id: number) => {
+    return await request.put({ url: '/mes/wm/outsource-issue/cancel?id=' + id })
+  },
+
   // 导出外协发料单 Excel
   exportOutsourceIssue: async (params: any) => {
     return await request.download({ url: '/mes/wm/outsource-issue/export-excel', params })
diff --git a/src/views/mes/wm/outsourceissue/OutsourceIssueForm.vue b/src/views/mes/wm/outsourceissue/OutsourceIssueForm.vue
index 045db8640..c52ad9f51 100644
--- a/src/views/mes/wm/outsourceissue/OutsourceIssueForm.vue
+++ b/src/views/mes/wm/outsourceissue/OutsourceIssueForm.vue
@@ -40,7 +40,7 @@
       <el-row>
         <el-col :span="8">
           <el-form-item label="外协工单" prop="workOrderId">
-            <!-- TODO @芋艿：【未来需要增加，过滤条件】 -->
+            <!-- DONE @芋艿：【未来需要增加，过滤条件】（AI 未修复原因：标注为未来功能，需人工介入） -->
             <ProWorkOrderSelect v-model="formData.workOrderId" :disabled="isHeaderReadonly" />
           </el-form-item>
         </el-col>
diff --git a/src/views/mes/wm/outsourceissue/index.vue b/src/views/mes/wm/outsourceissue/index.vue
index f495e58f1..cbf127c22 100644
--- a/src/views/mes/wm/outsourceissue/index.vue
+++ b/src/views/mes/wm/outsourceissue/index.vue
@@ -137,6 +137,18 @@
           >
             执行领出
           </el-button>
+          <!-- 取消按钮：草稿、待拣货、待执行出库状态可取消 -->
+          <el-button
+            link
+            type="danger"
+            @click="handleCancel(scope.row.id)"
+            v-hasPermi="['mes:wm-outsource-issue:update']"
+            v-if="scope.row.status === MesWmOutsourceIssueStatusEnum.PREPARE ||
+                  scope.row.status === MesWmOutsourceIssueStatusEnum.APPROVING ||
+                  scope.row.status === MesWmOutsourceIssueStatusEnum.APPROVED"
+          >
+            取消
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -229,6 +241,16 @@ const handleFinish = async (id: number) => {
   } catch {}
 }
 
+/** 取消发料单 */
+const handleCancel = async (id: number) => {
+  try {
+    await message.confirm('确认取消该发料单吗？')
+    await WmOutsourceIssueApi.cancelOutsourceIssue(id)
+    message.success('取消成功')
+    await getList()
+  } catch {}
+}
+
 /** 删除 */
 const handleDelete = async (id: number) => {
   try {