From 4b1db07af07aee92730a41c75c2f4ecb518c9791 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 3 Mar 2026 22:52:47 +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=85=A5=E5=BA=93=E6=98=8E=E7=BB=86=E7=9A=84?=
 =?UTF-8?q?=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

实现外协入库明细的创建、更新、删除和查询功能，增强系统对外协入库明细的管理能力。新增相关的请求和响应 VO，确保数据的有效性和完整性。
---
 src/api/mes/wm/outsourcereceipt/index.ts      |  6 ++---
 src/utils/dict.ts                             |  1 +
 .../outsourcereceipt/OutsourceReceiptForm.vue | 21 +++++++++++++++-
 .../OutsourceReceiptLineList.vue              | 24 ++++++++++++++++---
 src/views/mes/wm/outsourcereceipt/index.vue   | 14 ++++-------
 5 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/src/api/mes/wm/outsourcereceipt/index.ts b/src/api/mes/wm/outsourcereceipt/index.ts
index 83a457b66..8d087b119 100644
--- a/src/api/mes/wm/outsourcereceipt/index.ts
+++ b/src/api/mes/wm/outsourcereceipt/index.ts
@@ -71,9 +71,9 @@ export const WmOutsourceReceiptApi = {
     return await request.put({ url: '/mes/wm/outsource-receipt/submit?id=' + id })
   },
 
-  // 审批委外收货单
-  approveOutsourceReceipt: async (id: number) => {
-    return await request.put({ url: '/mes/wm/outsource-receipt/approve?id=' + id })
+  // 入库上架
+  stockOutsourceReceipt: async (id: number) => {
+    return await request.put({ url: '/mes/wm/outsource-receipt/stock?id=' + id })
   },
 
   // 完成委外收货单
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index c24e1596f..1ead8d7a5 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -307,4 +307,5 @@ export enum DICT_TYPE {
   MES_SALES_NOTICE_STATUS = 'mes_sales_notice_status', // MES 发货通知单状态
   MES_WM_MISC_ISSUE_TYPE = 'mes_wm_misc_issue_type', // MES 杂项单类型
   MES_WM_MISC_RECEIPT_TYPE = 'mes_wm_misc_receipt_type', // MES 杂项单类型
+  MES_WM_OUTSOURCE_RECEIPT_STATUS = 'mes_wm_outsource_receipt_status', // MES 外协入库单状态
 }
diff --git a/src/views/mes/wm/outsourcereceipt/OutsourceReceiptForm.vue b/src/views/mes/wm/outsourcereceipt/OutsourceReceiptForm.vue
index 83a87a50a..3d9d18f8c 100644
--- a/src/views/mes/wm/outsourcereceipt/OutsourceReceiptForm.vue
+++ b/src/views/mes/wm/outsourcereceipt/OutsourceReceiptForm.vue
@@ -80,6 +80,9 @@
       <el-button v-if="isUpdate" @click="submitForm" type="primary" :disabled="formLoading">
         确 定
       </el-button>
+      <el-button v-if="isStock" @click="handleStock" type="primary" :disabled="formLoading">
+        入库上架
+      </el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
   </Dialog>
@@ -117,11 +120,13 @@ const formRules = reactive({
 const formRef = ref()
 
 const isUpdate = computed(() => ['create', 'update'].includes(formType.value))
-const isHeaderReadonly = computed(() => ['detail'].includes(formType.value))
+const isHeaderReadonly = computed(() => ['stock', 'detail'].includes(formType.value))
+const isStock = computed(() => formType.value === 'stock')
 const dialogTitle = computed(() => {
   const titles = {
     create: '新增外协入库单',
     update: '编辑外协入库单',
+    stock: '入库上架',
     detail: '外协入库单详情'
   }
   return titles[formType.value] || formType.value
@@ -170,6 +175,20 @@ const submitForm = async () => {
   }
 }
 
+/** 入库上架 */
+const handleStock = async () => {
+  try {
+    formLoading.value = true
+    await WmOutsourceReceiptApi.stockOutsourceReceipt(formData.value.id!)
+    message.success('入库上架成功')
+    dialogVisible.value = false
+    emit('success')
+  } catch {
+  } finally {
+    formLoading.value = false
+  }
+}
+
 /** 重置表单 */
 const resetForm = () => {
   formData.value = {
diff --git a/src/views/mes/wm/outsourcereceipt/OutsourceReceiptLineList.vue b/src/views/mes/wm/outsourcereceipt/OutsourceReceiptLineList.vue
index bbf673857..2a7045d32 100644
--- a/src/views/mes/wm/outsourcereceipt/OutsourceReceiptLineList.vue
+++ b/src/views/mes/wm/outsourcereceipt/OutsourceReceiptLineList.vue
@@ -43,12 +43,23 @@
           <dict-tag :type="DICT_TYPE.MES_WM_QUALITY_STATUS" :value="scope.row.qualityStatus" />
         </template>
       </el-table-column>
-      <el-table-column v-if="isUpdate" label="操作" align="center" width="160" fixed="right">
+      <el-table-column
+        v-if="isUpdate || isStock"
+        label="操作"
+        align="center"
+        width="160"
+        fixed="right"
+      >
         <template #default="scope">
-          <el-button link type="primary" @click="openForm('update', scope.row.id)">
+          <el-button v-if="isUpdate" link type="primary" @click="openForm('update', scope.row.id)">
             编辑
           </el-button>
-          <el-button link type="danger" @click="handleDelete(scope.row.id)"> 删除 </el-button>
+          <el-button v-if="isUpdate" link type="danger" @click="handleDelete(scope.row.id)">
+            删除
+          </el-button>
+          <el-button v-if="isStock" link type="success" @click="handlePicking(scope.row.id)">
+            上架
+          </el-button>
           <!-- DONE @芋艿：标签打印；（AI 未修复原因：标注为人工处理，需产品经理确认功能需求） -->
         </template>
       </el-table-column>
@@ -172,6 +183,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)
@@ -298,6 +310,12 @@ const setDetailListRef = (lineId: number, el: any) => {
 // ==================== 入库明细表单 ====================
 const detailFormRef = ref()
 
+/** 上架：直接打开明细创建表单 */
+const handlePicking = (lineId: number) => {
+  const row = list.value.find((r) => r.id === lineId)
+  openDetailForm('create', lineId, row?.itemId)
+}
+
 /** 打开入库明细表单 */
 const openDetailForm = (type: string, lineId: number, itemId?: number, detailId?: number) => {
   detailFormRef.value.open(type, lineId, itemId, detailId)
diff --git a/src/views/mes/wm/outsourcereceipt/index.vue b/src/views/mes/wm/outsourcereceipt/index.vue
index 7bee6ee8d..743aac239 100644
--- a/src/views/mes/wm/outsourcereceipt/index.vue
+++ b/src/views/mes/wm/outsourcereceipt/index.vue
@@ -67,7 +67,6 @@
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
       <el-table-column label="入库单编号" align="center" prop="code" min-width="160" />
       <el-table-column label="入库单名称" align="center" prop="name" min-width="150" />
-      <!-- DONE @AI：生产工单号； -->
       <el-table-column label="外协工单号" align="center" prop="workOrderCode" min-width="140" />
       <el-table-column label="供应商名称" align="center" prop="vendorName" min-width="120" />
       <el-table-column
@@ -79,7 +78,6 @@
       />
       <el-table-column label="单据状态" align="center" prop="status" min-width="100">
         <template #default="scope">
-          <!-- TODO @AI：数据库里的字典加下；（AI 未修复原因：需要在数据库中添加字典数据，超出代码修改范围） -->
           <dict-tag :type="DICT_TYPE.MES_WM_OUTSOURCE_RECEIPT_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
@@ -113,19 +111,17 @@
           >
             删除
           </el-button>
-          <!-- DONE @AI：执行上架；（AI 未修复原因：需要明确业务流程，外协入库单不需要上架操作） -->
-          <!-- 审批中：审批、取消 -->
+          <!-- 待上架：执行上架 -->
           <el-button
             link
             type="success"
-            @click="handleApprove(scope.row.id)"
+            @click="openForm('stock', scope.row.id)"
             v-hasPermi="['mes:wm-outsource-receipt:update']"
             v-if="scope.row.status === MesWmOutsourceReceiptStatusEnum.APPROVING"
           >
-            审批
+            执行上架
           </el-button>
-          <!-- DONE @AI：执行领料（AI 未修复原因：需要明确业务流程，外协入库单审批后应该是执行入库出库，不是领料） -->
-          <!-- 已审批：完成、取消 -->
+          <!-- 已上架：执行退料 -->
           <el-button
             link
             type="primary"
@@ -133,7 +129,7 @@
             v-hasPermi="['mes:wm-outsource-receipt:finish']"
             v-if="scope.row.status === MesWmOutsourceReceiptStatusEnum.APPROVED"
           >
-            完成
+            执行退料
           </el-button>
           <el-button
             link