From 2e87bf55b55e379e8c6bde0008f5b02fbbca6f3f Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 4 Mar 2026 09:59:33 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(mes):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=A4=96=E5=8D=8F=E5=8F=91=E6=96=99=E5=8D=95=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=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 ++++
 .../OutsourceIssueDetailList.vue              | 10 ++++---
 .../wm/outsourceissue/OutsourceIssueForm.vue  |  6 ++++-
 .../outsourceissue/OutsourceIssueLineList.vue | 26 ++++++++++---------
 4 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/src/api/mes/wm/outsourceissue/index.ts b/src/api/mes/wm/outsourceissue/index.ts
index 16905d39c..5d1f83bb9 100644
--- a/src/api/mes/wm/outsourceissue/index.ts
+++ b/src/api/mes/wm/outsourceissue/index.ts
@@ -64,6 +64,11 @@ export const WmOutsourceIssueApi = {
     return await request.put({ url: '/mes/wm/outsource-issue/cancel?id=' + id })
   },
 
+  // 校验外协发料单数量
+  checkOutsourceIssueQuantity: async (id: number) => {
+    return await request.get({ url: '/mes/wm/outsource-issue/check-quantity?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/OutsourceIssueDetailList.vue b/src/views/mes/wm/outsourceissue/OutsourceIssueDetailList.vue
index 255b0be0f..371f4af7a 100644
--- a/src/views/mes/wm/outsourceissue/OutsourceIssueDetailList.vue
+++ b/src/views/mes/wm/outsourceissue/OutsourceIssueDetailList.vue
@@ -7,7 +7,13 @@
       <el-table-column label="库区名称" align="center" prop="locationName" min-width="100" />
       <el-table-column label="库位名称" align="center" prop="areaName" min-width="100" />
       <el-table-column label="数量" align="center" prop="quantity" width="100" />
-      <el-table-column v-if="isUpdate" label="操作" align="center" width="120" fixed="right">
+      <el-table-column
+        v-if="props.formType === 'stock'"
+        label="操作"
+        align="center"
+        width="120"
+        fixed="right"
+      >
         <template #default="scope">
           <el-button link type="primary" @click="emit('edit-detail', scope.row.id)">
             编辑
@@ -39,8 +45,6 @@ const emit = defineEmits(['edit-detail'])
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
-const isUpdate = computed(() => ['create', 'update'].includes(props.formType)) // 是否为编辑模式
-
 const loading = ref(false) // 列表的加载中
 const list = ref<WmOutsourceIssueDetailVO[]>([]) // 明细列表
 
diff --git a/src/views/mes/wm/outsourceissue/OutsourceIssueForm.vue b/src/views/mes/wm/outsourceissue/OutsourceIssueForm.vue
index c52ad9f51..96d61b541 100644
--- a/src/views/mes/wm/outsourceissue/OutsourceIssueForm.vue
+++ b/src/views/mes/wm/outsourceissue/OutsourceIssueForm.vue
@@ -166,8 +166,12 @@ const submitForm = async () => {
 /** 执行拣货 */
 const handleStock = async () => {
   try {
-    await message.confirm('确认执行拣货吗？执行后将进入待执行出库状态。')
     formLoading.value = true
+    // 校验发料数量与拣货数量是否一致
+    const quantityMatch = await WmOutsourceIssueApi.checkOutsourceIssueQuantity(formData.value.id!)
+    if (!quantityMatch) {
+      await message.confirm('发料数量与拣货数量不一致，确认执行拣货？')
+    }
     await WmOutsourceIssueApi.stockOutsourceIssue(formData.value.id!)
     message.success('拣货成功')
     dialogVisible.value = false
diff --git a/src/views/mes/wm/outsourceissue/OutsourceIssueLineList.vue b/src/views/mes/wm/outsourceissue/OutsourceIssueLineList.vue
index f524ecef3..1bd7dd146 100644
--- a/src/views/mes/wm/outsourceissue/OutsourceIssueLineList.vue
+++ b/src/views/mes/wm/outsourceissue/OutsourceIssueLineList.vue
@@ -34,7 +34,13 @@
       <el-table-column label="单位" align="center" prop="unitMeasureName" width="80" />
       <el-table-column label="领料数量" align="center" prop="quantity" width="100" />
       <el-table-column label="批次号" align="center" prop="batchCode" min-width="120" />
-      <el-table-column v-if="isUpdate" label="操作" align="center" width="200" fixed="right">
+      <el-table-column
+        v-if="isUpdate || isStock"
+        label="操作"
+        align="center"
+        width="160"
+        fixed="right"
+      >
         <template #default="scope">
           <el-button v-if="isUpdate" link type="primary" @click="openForm('update', scope.row.id)">
             编辑
@@ -42,14 +48,8 @@
           <el-button v-if="isUpdate" link type="danger" @click="handleDelete(scope.row.id)">
             删除
           </el-button>
-          <!-- DONE @芋艿：这里是不是上架？（AI 未修复原因：需产品经理确认业务逻辑，建议人工确认） -->
-          <el-button
-            v-if="isUpdate"
-            link
-            type="success"
-            @click="handleAddDetail(scope.row.id, scope.row.itemId)"
-          >
-            添加明细
+          <el-button v-if="isStock" link type="success" @click="handlePicking(scope.row.id)">
+            拣货
           </el-button>
         </template>
       </el-table-column>
@@ -133,6 +133,7 @@ const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
 const isUpdate = computed(() => ['create', 'update'].includes(props.formType)) // 是否为编辑模式
+const isStock = computed(() => props.formType === 'stock') // 是否为拣货模式
 
 // ==================== 列表 ====================
 const loading = ref(false) // 列表的加载中
@@ -250,9 +251,10 @@ const setDetailListRef = (lineId: number, el: any) => {
 // ==================== 发料明细表单（LineList 层级持有） ====================
 const detailFormRef = ref()
 
-/** 添加明细：直接打开明细创建表单 */
-const handleAddDetail = (lineId: number, itemId?: number) => {
-  openDetailForm('create', lineId, itemId)
+/** 拣货：直接打开明细创建表单 */
+const handlePicking = (lineId: number) => {
+  const row = list.value.find((r) => r.id === lineId)
+  openDetailForm('create', lineId, row?.itemId)
 }
 
 /** 打开发料明细表单 */