From 23799e7f21d02e490f89a6a4fa1380053fc5e4ce Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 4 Apr 2026 20:22:47 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(mes):=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E7=94=9F=E4=BA=A7=E6=B5=81=E8=BD=AC=E5=8D=A1?=
 =?UTF-8?q?=E4=B8=BA=E5=AE=8C=E6=88=90=E7=94=9F=E4=BA=A7=E6=B5=81=E8=BD=AC?=
 =?UTF-8?q?=E5=8D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/pro/card/index.ts       |  6 +++---
 src/utils/dict.ts                   |  1 +
 src/views/mes/pro/card/CardForm.vue | 32 ++++++++++++++---------------
 src/views/mes/pro/card/index.vue    |  6 +++---
 src/views/mes/utils/constants.ts    |  4 +++-
 5 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/src/api/mes/pro/card/index.ts b/src/api/mes/pro/card/index.ts
index 625675b0e..e948347bf 100644
--- a/src/api/mes/pro/card/index.ts
+++ b/src/api/mes/pro/card/index.ts
@@ -55,9 +55,9 @@ export const ProCardApi = {
     return await request.put({ url: `/mes/pro/card/submit?id=` + id })
   },
 
-  // 执行生产流转卡
-  executeCard: async (id: number) => {
-    return await request.put({ url: `/mes/pro/card/execute?id=` + id })
+  // 完成生产流转卡
+  finishCard: async (id: number) => {
+    return await request.put({ url: `/mes/pro/card/finish?id=` + id })
   },
 
   // 取消生产流转卡
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index d6465dbb6..3866d3585 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -268,6 +268,7 @@ export enum DICT_TYPE {
   MES_INDICATOR_TYPE = 'mes_indicator_type', // MES 检测项类型
   MES_QC_RESULT_TYPE = 'mes_qc_result_type', // MES 质检结果值类型
   MES_DEFECT_LEVEL = 'mes_defect_level', // MES 缺陷等级
+  MES_DEFECT_TYPE = 'mes_defect_type', // MES 缺陷检测项类型
   MES_PRO_WORK_ORDER_STATUS = 'mes_pro_work_order_status', // MES 生产工单状态
   MES_PRO_WORK_ORDER_SOURCE_TYPE = 'mes_pro_work_order_source_type', // MES 工单来源类型
   MES_PRO_WORK_ORDER_TYPE = 'mes_pro_work_order_type', // MES 工单类型
diff --git a/src/views/mes/pro/card/CardForm.vue b/src/views/mes/pro/card/CardForm.vue
index aa9fee438..1e2270087 100644
--- a/src/views/mes/pro/card/CardForm.vue
+++ b/src/views/mes/pro/card/CardForm.vue
@@ -86,8 +86,8 @@
       >
         提 交
       </el-button>
-      <el-button v-if="isExecute" @click="handleExecute" type="success" :disabled="formLoading">
-        执 行
+      <el-button v-if="isFinish" @click="handleFinish" type="success" :disabled="formLoading">
+        完 成
       </el-button>
       <el-button @click="dialogVisible = false">关 闭</el-button>
     </template>
@@ -96,11 +96,11 @@
 
 <script setup lang="ts">
 import { ProCardApi, ProCardVO } from '@/api/mes/pro/card'
-import { generateRandomStr } from '@/utils'
+import { AutoCodeRecordApi } from '@/api/mes/md/autocode/record'
 import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue'
 import ProWorkOrderSelect from '@/views/mes/pro/workorder/components/ProWorkOrderSelect.vue'
 import CardProcessList from './CardProcessList.vue'
-import { MesProCardStatusEnum } from '@/views/mes/utils/constants'
+import { MesProCardStatusEnum, MesAutoCodeRuleCode } from '@/views/mes/utils/constants'
 
 defineOptions({ name: 'CardForm' })
 const emit = defineEmits(['success'])
@@ -108,16 +108,16 @@ const emit = defineEmits(['success'])
 const message = useMessage() // 消息弹窗
 const dialogVisible = ref(false) // 弹窗的是否展示
 const formLoading = ref(false) // 表单的加载中
-const formType = ref<string>('create') // 表单的类型：create / update / execute / detail
+const formType = ref<string>('create') // 表单的类型：create / update / finish / detail
 const isEditable = computed(() => ['create', 'update'].includes(formType.value)) // 是否为编辑模式
-const isExecute = computed(() => formType.value === 'execute') // 是否为执行模式
-const isDetail = computed(() => ['detail', 'execute'].includes(formType.value)) // 是否为详情模式（表单只读）
-const isHeaderReadonly = computed(() => ['execute', 'detail'].includes(formType.value)) // 头部是否只读
+const isFinish = computed(() => formType.value === 'finish') // 是否为完成模式
+const isDetail = computed(() => ['detail', 'finish'].includes(formType.value)) // 是否为详情模式（表单只读）
+const isHeaderReadonly = computed(() => ['finish', 'detail'].includes(formType.value)) // 头部是否只读
 const dialogTitle = computed(() => {
   const titles: Record<string, string> = {
     create: '新增流转卡',
     update: '编辑流转卡',
-    execute: '执行流转卡',
+    finish: '完成流转卡',
     detail: '流转卡详情'
   }
   return titles[formType.value] || formType.value
@@ -142,8 +142,8 @@ const formRef = ref() // 表单 Ref
 const originalFormData = ref<string>('') // 原始表单数据快照，用于脏检查
 
 /** 生成流转卡编码 */
-const generateCode = () => {
-  formData.value.code = 'CARD' + generateRandomStr(10)
+const generateCode = async () => {
+  formData.value.code = await AutoCodeRecordApi.generateAutoCode(MesAutoCodeRuleCode.PRO_CARD_CODE)
 }
 
 /** 打开弹窗 */
@@ -211,13 +211,13 @@ const handleSubmit = async () => {
   }
 }
 
-/** 执行流转卡 */
-const handleExecute = async () => {
+/** 完成流转卡 */
+const handleFinish = async () => {
   try {
-    await message.confirm('确认执行该流转卡？')
+    await message.confirm('确认完成该流转卡？')
     formLoading.value = true
-    await ProCardApi.executeCard(formData.value.id!)
-    message.success('执行成功')
+    await ProCardApi.finishCard(formData.value.id!)
+    message.success('完成成功')
     dialogVisible.value = false
     emit('success')
   } catch {
diff --git a/src/views/mes/pro/card/index.vue b/src/views/mes/pro/card/index.vue
index 2a3377f56..529412116 100644
--- a/src/views/mes/pro/card/index.vue
+++ b/src/views/mes/pro/card/index.vue
@@ -109,11 +109,11 @@
           <el-button
             link
             type="success"
-            @click="openForm('execute', scope.row.id)"
-            v-hasPermi="['mes:pro-card:update']"
+            @click="openForm('finish', scope.row.id)"
+            v-hasPermi="['mes:pro-card:finish']"
             v-if="scope.row.status === MesProCardStatusEnum.CONFIRMED"
           >
-            执行
+            完成
           </el-button>
           <el-button
             link
diff --git a/src/views/mes/utils/constants.ts b/src/views/mes/utils/constants.ts
index acb74040e..2df65f0ed 100644
--- a/src/views/mes/utils/constants.ts
+++ b/src/views/mes/utils/constants.ts
@@ -465,7 +465,9 @@ export const MesAutoCodeRuleCode = {
   PRO_PROCESS_CODE: 'PRO_PROCESS_CODE', // 工序编码
   PRO_ROUTE_CODE: 'PRO_ROUTE_CODE', // 工艺路线编码
   PRO_FEEDBACK_CODE: 'PRO_FEEDBACK_CODE', // 生产报工单编码
-  PRO_WORK_ORDER_CODE: 'PRO_WORK_ORDER_CODE' // 生产工单编码
+  PRO_WORK_ORDER_CODE: 'PRO_WORK_ORDER_CODE', // 生产工单编码
+  QC_DEFECT_CODE: 'QC_DEFECT_CODE', // 缺陷类型编码
+  PRO_CARD_CODE: 'PRO_CARD_CODE' // 流转卡编码
 } as const
 
 /** 获取物料/产品标识的标签 */