From 2d331d1dec3ecd1086ee15ea8bbb5a66d833cf68 Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Thu, 6 Mar 2025 13:39:57 +0800
Subject: [PATCH] =?UTF-8?q?change(mes):=20=E4=BA=A7=E5=87=BA=E6=89=AB?=
 =?UTF-8?q?=E6=8F=8F=E4=BF=A1=E6=81=AF=E5=A2=9E=E5=8A=A0=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E3=80=81=E6=9C=BA=E5=8F=B0=E3=80=81=E5=B7=A5=E8=A3=85=E3=80=81?=
 =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 ProdOutputScanInfo 模型中添加物料、机台、工装、工序名称字段
- 更新前端表格显示，将 ID 列替换为对应的名称列
- 修改后端查询逻辑，加入连表查询以获取名称信息
---
 src/api/mes/prodOutputScanInfo/types.ts    | 52 ++++++++++++++++++++++
 src/views/mes/prodOutputScanInfo/index.vue | 16 +++++--
 2 files changed, 64 insertions(+), 4 deletions(-)

diff --git a/src/api/mes/prodOutputScanInfo/types.ts b/src/api/mes/prodOutputScanInfo/types.ts
index d75fd80..98f9b9e 100644
--- a/src/api/mes/prodOutputScanInfo/types.ts
+++ b/src/api/mes/prodOutputScanInfo/types.ts
@@ -44,6 +44,23 @@ export interface ProdOutputScanInfoVO {
    */
   remark: string;
 
+  /**
+   * 工序名称
+   */
+  processName: string;
+  /**
+   * 机台名称
+   */
+  machineName: string;
+  /**
+   * 工装名称
+   */
+  toolingName: string;
+  /**
+   * 物料名称
+   */
+  materielName: string;
+
 }
 
 export interface ProdOutputScanInfoForm extends BaseEntity {
@@ -92,6 +109,23 @@ export interface ProdOutputScanInfoForm extends BaseEntity {
    */
   remark?: string;
 
+  /**
+   * 工序名称
+   */
+  processName: string;
+  /**
+   * 机台名称
+   */
+  machineName: string;
+  /**
+   * 工装名称
+   */
+  toolingName: string;
+  /**
+   * 物料名称
+   */
+  materielName: string;
+
 }
 
 export interface ProdOutputScanInfoQuery extends PageQuery {
@@ -140,6 +174,24 @@ export interface ProdOutputScanInfoQuery extends PageQuery {
      * 日期范围参数
      */
     params?: any;
+
+  /**
+   * 工序名称
+   */
+  processName: string;
+  /**
+   * 机台名称
+   */
+  machineName: string;
+  /**
+   * 工装名称
+   */
+  toolingName: string;
+  /**
+   * 物料名称
+   */
+  materielName: string;
+
 }
 
 
diff --git a/src/views/mes/prodOutputScanInfo/index.vue b/src/views/mes/prodOutputScanInfo/index.vue
index 5990a37..a2b5586 100644
--- a/src/views/mes/prodOutputScanInfo/index.vue
+++ b/src/views/mes/prodOutputScanInfo/index.vue
@@ -59,11 +59,11 @@
       <el-table v-loading="loading" :data="prodOutputScanInfoList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="主键标识" align="center" prop="prodOutputScanInfoId" v-if="columns[0].visible"/>
-        <el-table-column label="工序ID" align="center" prop="processId" v-if="columns[2].visible"/>
-        <el-table-column label="机台ID" align="center" prop="machineId" v-if="columns[3].visible"/>
+        <el-table-column label="工序" align="center" prop="processName" v-if="columns[2].visible"/>
+        <el-table-column label="机台" align="center" prop="machineName" v-if="columns[3].visible"/>
         <el-table-column label="胎胚条码" align="center" prop="embryoBarcode" v-if="columns[4].visible"/>
-        <el-table-column label="工装ID" align="center" prop="toolingId" v-if="columns[5].visible"/>
-        <el-table-column label="物料ID" align="center" prop="materielId" v-if="columns[6].visible"/>
+        <el-table-column label="工装" align="center" prop="toolingName" v-if="columns[5].visible"/>
+        <el-table-column label="物料" align="center" prop="materielName" v-if="columns[6].visible"/>
         <el-table-column label="扫描结果" align="center" prop="scanResult" v-if="columns[7].visible"/>
         <el-table-column label="记录人名称" align="center" prop="userName" v-if="columns[8].visible"/>
         <el-table-column label="备注" align="center" prop="remark" v-if="columns[9].visible"/>
@@ -203,6 +203,10 @@ const initFormData: ProdOutputScanInfoForm = {
   scanResult: undefined,
   userName: undefined,
   remark: undefined,
+  processName: undefined,
+  machineName: undefined,
+  toolingName: undefined,
+  materielName: undefined
 }
 const data = reactive<PageData<ProdOutputScanInfoForm, ProdOutputScanInfoQuery>>({
   form: {...initFormData},
@@ -217,6 +221,10 @@ const data = reactive<PageData<ProdOutputScanInfoForm, ProdOutputScanInfoQuery>>
     materielId: undefined,
     scanResult: undefined,
     userName: undefined,
+    processName: undefined,
+    machineName: undefined,
+    toolingName: undefined,
+    materielName: undefined,
     params: {
     }
   },