diff --git a/src/api/mes/prodInputScanInfo/index.ts b/src/api/mes/prodInputScanInfo/index.ts
new file mode 100644
index 0000000..3d02dbd
--- /dev/null
+++ b/src/api/mes/prodInputScanInfo/index.ts
@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { ProdInputScanInfoVO, ProdInputScanInfoForm, ProdInputScanInfoQuery } from '@/api/mes/prodInputScanInfo/types';
+
+/**
+ * 查询生产投入扫描信息列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listProdInputScanInfo = (query?: ProdInputScanInfoQuery): AxiosPromise<ProdInputScanInfoVO[]> => {
+  return request({
+    url: '/mes/prodInputScanInfo/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询生产投入扫描信息详细
+ * @param prodInputScanInfoId
+ */
+export const getProdInputScanInfo = (prodInputScanInfoId: string | number): AxiosPromise<ProdInputScanInfoVO> => {
+  return request({
+    url: '/mes/prodInputScanInfo/' + prodInputScanInfoId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增生产投入扫描信息
+ * @param data
+ */
+export const addProdInputScanInfo = (data: ProdInputScanInfoForm) => {
+  return request({
+    url: '/mes/prodInputScanInfo',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改生产投入扫描信息
+ * @param data
+ */
+export const updateProdInputScanInfo = (data: ProdInputScanInfoForm) => {
+  return request({
+    url: '/mes/prodInputScanInfo',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除生产投入扫描信息
+ * @param prodInputScanInfoId
+ */
+export const delProdInputScanInfo = (prodInputScanInfoId: string | number | Array<string | number>) => {
+  return request({
+    url: '/mes/prodInputScanInfo/' + prodInputScanInfoId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询生产投入扫描信息列表
+ * @param query
+ * @returns {*}
+ */
+export function getProdInputScanInfoList (query) {
+    return request({
+        url: '/mes/prodInputScanInfo/getProdInputScanInfoList',
+        method: 'get',
+        params: query
+    });
+};
diff --git a/src/api/mes/prodInputScanInfo/types.ts b/src/api/mes/prodInputScanInfo/types.ts
new file mode 100644
index 0000000..615fabc
--- /dev/null
+++ b/src/api/mes/prodInputScanInfo/types.ts
@@ -0,0 +1,161 @@
+export interface ProdInputScanInfoVO {
+  /**
+   * 主键标识
+   */
+  prodInputScanInfoId: string | number;
+
+  /**
+   * 工序ID
+   */
+  processId: string | number;
+
+  /**
+   * 机台ID
+   */
+  machineId: string | number;
+
+  /**
+   * 硫化条码
+   */
+  vulcanizedBarcode: string;
+
+  /**
+   * 胎胚条码
+   */
+  embryoBarcode: string;
+
+  /**
+   * 生产工具
+   */
+  toolId: string | number;
+
+  /**
+   * 物料ID
+   */
+  materielId: string | number;
+
+  /**
+   * 扫描结果
+   */
+  scanResult: string;
+
+  /**
+   * 记录人名称
+   */
+  userName: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+}
+
+export interface ProdInputScanInfoForm extends BaseEntity {
+  /**
+   * 主键标识
+   */
+  prodInputScanInfoId?: string | number;
+
+  /**
+   * 工序ID
+   */
+  processId?: string | number;
+
+  /**
+   * 机台ID
+   */
+  machineId?: string | number;
+
+  /**
+   * 硫化条码
+   */
+  vulcanizedBarcode?: string;
+
+  /**
+   * 胎胚条码
+   */
+  embryoBarcode?: string;
+
+  /**
+   * 生产工具
+   */
+  toolId?: string | number;
+
+  /**
+   * 物料ID
+   */
+  materielId?: string | number;
+
+  /**
+   * 扫描结果
+   */
+  scanResult?: string;
+
+  /**
+   * 记录人名称
+   */
+  userName?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+}
+
+export interface ProdInputScanInfoQuery extends PageQuery {
+
+  /**
+   * 主键标识
+   */
+  prodInputScanInfoId?: string | number;
+
+  /**
+   * 工序ID
+   */
+  processId?: string | number;
+
+  /**
+   * 机台ID
+   */
+  machineId?: string | number;
+
+  /**
+   * 硫化条码
+   */
+  vulcanizedBarcode?: string;
+
+  /**
+   * 胎胚条码
+   */
+  embryoBarcode?: string;
+
+  /**
+   * 生产工具
+   */
+  toolId?: string | number;
+
+  /**
+   * 物料ID
+   */
+  materielId?: string | number;
+
+  /**
+   * 扫描结果
+   */
+  scanResult?: string;
+
+  /**
+   * 记录人名称
+   */
+  userName?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+
diff --git a/src/api/mes/prodOutputScanInfo/index.ts b/src/api/mes/prodOutputScanInfo/index.ts
new file mode 100644
index 0000000..fb89169
--- /dev/null
+++ b/src/api/mes/prodOutputScanInfo/index.ts
@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { ProdOutputScanInfoVO, ProdOutputScanInfoForm, ProdOutputScanInfoQuery } from '@/api/mes/prodOutputScanInfo/types';
+
+/**
+ * 查询生产产出扫描信息列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listProdOutputScanInfo = (query?: ProdOutputScanInfoQuery): AxiosPromise<ProdOutputScanInfoVO[]> => {
+  return request({
+    url: '/mes/prodOutputScanInfo/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询生产产出扫描信息详细
+ * @param prodOutputScanInfoId
+ */
+export const getProdOutputScanInfo = (prodOutputScanInfoId: string | number): AxiosPromise<ProdOutputScanInfoVO> => {
+  return request({
+    url: '/mes/prodOutputScanInfo/' + prodOutputScanInfoId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增生产产出扫描信息
+ * @param data
+ */
+export const addProdOutputScanInfo = (data: ProdOutputScanInfoForm) => {
+  return request({
+    url: '/mes/prodOutputScanInfo',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改生产产出扫描信息
+ * @param data
+ */
+export const updateProdOutputScanInfo = (data: ProdOutputScanInfoForm) => {
+  return request({
+    url: '/mes/prodOutputScanInfo',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除生产产出扫描信息
+ * @param prodOutputScanInfoId
+ */
+export const delProdOutputScanInfo = (prodOutputScanInfoId: string | number | Array<string | number>) => {
+  return request({
+    url: '/mes/prodOutputScanInfo/' + prodOutputScanInfoId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询生产产出扫描信息列表
+ * @param query
+ * @returns {*}
+ */
+export function getProdOutputScanInfoList (query) {
+    return request({
+        url: '/mes/prodOutputScanInfo/getProdOutputScanInfoList',
+        method: 'get',
+        params: query
+    });
+};
diff --git a/src/api/mes/prodOutputScanInfo/types.ts b/src/api/mes/prodOutputScanInfo/types.ts
new file mode 100644
index 0000000..d75fd80
--- /dev/null
+++ b/src/api/mes/prodOutputScanInfo/types.ts
@@ -0,0 +1,146 @@
+export interface ProdOutputScanInfoVO {
+  /**
+   * 主键标识
+   */
+  prodOutputScanInfoId: string | number;
+
+  /**
+   * 工序ID
+   */
+  processId: string | number;
+
+  /**
+   * 机台ID
+   */
+  machineId: string | number;
+
+  /**
+   * 胎胚条码
+   */
+  embryoBarcode: string;
+
+  /**
+   * 工装ID
+   */
+  toolingId: string | number;
+
+  /**
+   * 物料ID
+   */
+  materielId: string | number;
+
+  /**
+   * 扫描结果
+   */
+  scanResult: string;
+
+  /**
+   * 记录人名称
+   */
+  userName: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+}
+
+export interface ProdOutputScanInfoForm extends BaseEntity {
+  /**
+   * 主键标识
+   */
+  prodOutputScanInfoId?: string | number;
+
+  /**
+   * 工序ID
+   */
+  processId?: string | number;
+
+  /**
+   * 机台ID
+   */
+  machineId?: string | number;
+
+  /**
+   * 胎胚条码
+   */
+  embryoBarcode?: string;
+
+  /**
+   * 工装ID
+   */
+  toolingId?: string | number;
+
+  /**
+   * 物料ID
+   */
+  materielId?: string | number;
+
+  /**
+   * 扫描结果
+   */
+  scanResult?: string;
+
+  /**
+   * 记录人名称
+   */
+  userName?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+}
+
+export interface ProdOutputScanInfoQuery extends PageQuery {
+
+  /**
+   * 主键标识
+   */
+  prodOutputScanInfoId?: string | number;
+
+  /**
+   * 工序ID
+   */
+  processId?: string | number;
+
+  /**
+   * 机台ID
+   */
+  machineId?: string | number;
+
+  /**
+   * 胎胚条码
+   */
+  embryoBarcode?: string;
+
+  /**
+   * 工装ID
+   */
+  toolingId?: string | number;
+
+  /**
+   * 物料ID
+   */
+  materielId?: string | number;
+
+  /**
+   * 扫描结果
+   */
+  scanResult?: string;
+
+  /**
+   * 记录人名称
+   */
+  userName?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+
diff --git a/src/api/mes/prodShiftChange/index.ts b/src/api/mes/prodShiftChange/index.ts
new file mode 100644
index 0000000..8498d4a
--- /dev/null
+++ b/src/api/mes/prodShiftChange/index.ts
@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { ProdShiftChangeVO, ProdShiftChangeForm, ProdShiftChangeQuery } from '@/api/mes/prodShiftChange/types';
+
+/**
+ * 查询交接班信息列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listProdShiftChange = (query?: ProdShiftChangeQuery): AxiosPromise<ProdShiftChangeVO[]> => {
+  return request({
+    url: '/mes/prodShiftChange/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询交接班信息详细
+ * @param shiftChangeId
+ */
+export const getProdShiftChange = (shiftChangeId: string | number): AxiosPromise<ProdShiftChangeVO> => {
+  return request({
+    url: '/mes/prodShiftChange/' + shiftChangeId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增交接班信息
+ * @param data
+ */
+export const addProdShiftChange = (data: ProdShiftChangeForm) => {
+  return request({
+    url: '/mes/prodShiftChange',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改交接班信息
+ * @param data
+ */
+export const updateProdShiftChange = (data: ProdShiftChangeForm) => {
+  return request({
+    url: '/mes/prodShiftChange',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除交接班信息
+ * @param shiftChangeId
+ */
+export const delProdShiftChange = (shiftChangeId: string | number | Array<string | number>) => {
+  return request({
+    url: '/mes/prodShiftChange/' + shiftChangeId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询交接班信息列表
+ * @param query
+ * @returns {*}
+ */
+export function getProdShiftChangeList (query) {
+    return request({
+        url: '/mes/prodShiftChange/getProdShiftChangeList',
+        method: 'get',
+        params: query
+    });
+};
diff --git a/src/api/mes/prodShiftChange/types.ts b/src/api/mes/prodShiftChange/types.ts
new file mode 100644
index 0000000..2db59dc
--- /dev/null
+++ b/src/api/mes/prodShiftChange/types.ts
@@ -0,0 +1,131 @@
+export interface ProdShiftChangeVO {
+  /**
+   * 主键标识
+   */
+  shiftChangeId: string | number;
+
+  /**
+   * 接班时间
+   */
+  shiftChangeTime: string;
+
+  /**
+   * 机台ID
+   */
+  machineId: string | number;
+
+  /**
+   * 班次ID
+   */
+  shiftId: string | number;
+
+  /**
+   * 班组ID
+   */
+  classTeamId: string | number;
+
+  /**
+   * 接班人ID
+   */
+  userId: string | number;
+
+  /**
+   * 接班人名称
+   */
+  userName: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+}
+
+export interface ProdShiftChangeForm extends BaseEntity {
+  /**
+   * 主键标识
+   */
+  shiftChangeId?: string | number;
+
+  /**
+   * 接班时间
+   */
+  shiftChangeTime?: string;
+
+  /**
+   * 机台ID
+   */
+  machineId?: string | number;
+
+  /**
+   * 班次ID
+   */
+  shiftId?: string | number;
+
+  /**
+   * 班组ID
+   */
+  classTeamId?: string | number;
+
+  /**
+   * 接班人ID
+   */
+  userId?: string | number;
+
+  /**
+   * 接班人名称
+   */
+  userName?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+}
+
+export interface ProdShiftChangeQuery extends PageQuery {
+
+  /**
+   * 主键标识
+   */
+  shiftChangeId?: string | number;
+
+  /**
+   * 接班时间
+   */
+  shiftChangeTime?: string;
+
+  /**
+   * 机台ID
+   */
+  machineId?: string | number;
+
+  /**
+   * 班次ID
+   */
+  shiftId?: string | number;
+
+  /**
+   * 班组ID
+   */
+  classTeamId?: string | number;
+
+  /**
+   * 接班人ID
+   */
+  userId?: string | number;
+
+  /**
+   * 接班人名称
+   */
+  userName?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+
diff --git a/src/views/mes/prodInputScanInfo/index.vue b/src/views/mes/prodInputScanInfo/index.vue
new file mode 100644
index 0000000..afdffba
--- /dev/null
+++ b/src/views/mes/prodInputScanInfo/index.vue
@@ -0,0 +1,354 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+            <!--            <el-form-item label="主键标识" prop="prodInputScanInfoId">
+              <el-input v-model="queryParams.prodInputScanInfoId" placeholder="请输入主键标识" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="工序ID" prop="processId">
+              <el-input v-model="queryParams.processId" placeholder="请输入工序ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="机台ID" prop="machineId">
+              <el-input v-model="queryParams.machineId" placeholder="请输入机台ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+            <el-form-item label="硫化条码" prop="vulcanizedBarcode">
+              <el-input v-model="queryParams.vulcanizedBarcode" placeholder="请输入硫化条码" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="胎胚条码" prop="embryoBarcode">
+              <el-input v-model="queryParams.embryoBarcode" placeholder="请输入胎胚条码" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <!--            <el-form-item label="生产工具" prop="toolId">
+              <el-input v-model="queryParams.toolId" placeholder="请输入生产工具" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="物料ID" prop="materielId">
+              <el-input v-model="queryParams.materielId" placeholder="请输入物料ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="扫描结果" prop="scanResult">
+              <el-input v-model="queryParams.scanResult" placeholder="请输入扫描结果" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="记录人名称" prop="userName">
+              <el-input v-model="queryParams.userName" placeholder="请输入记录人名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['mes:prodInputScanInfo:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['mes:prodInputScanInfo:edit']"
+              >修改</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['mes:prodInputScanInfo:remove']"
+              >删除</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['mes:prodInputScanInfo:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="prodInputScanInfoList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="主键标识" align="center" prop="prodInputScanInfoId" 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="vulcanizedBarcode" v-if="columns[4].visible" />
+        <el-table-column label="胎胚条码" align="center" prop="embryoBarcode" v-if="columns[5].visible" />
+        <el-table-column label="生产工具" align="center" prop="toolId" v-if="columns[6].visible" />
+        <el-table-column label="物料ID" align="center" prop="materielId" v-if="columns[7].visible" />
+        <el-table-column label="扫描结果" align="center" prop="scanResult" v-if="columns[8].visible" />
+        <el-table-column label="记录人名称" align="center" prop="userName" v-if="columns[9].visible" />
+        <el-table-column label="备注" align="center" prop="remark" v-if="columns[10].visible" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['mes:prodInputScanInfo:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['mes:prodInputScanInfo:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+
+    <!-- 添加或修改生产投入扫描信息对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="prodInputScanInfoFormRef" :model="form" :rules="rules" label-width="120px">
+        <!--        <el-form-item label="主键标识" prop="prodInputScanInfoId">
+          <el-input v-model="form.prodInputScanInfoId" placeholder="请输入主键标识" />
+        </el-form-item>-->
+        <el-form-item label="工序" prop="processId">
+<!--          <el-input v-model="form.processId" placeholder="请输入工序ID" />-->
+          <el-select v-model="form.processId" placeholder="请选择工序">
+            <el-option v-for="item in processOptions"
+                       :key="item.processId"
+                       :label="item.processName"
+                       :value="item.processId"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="机台" prop="machineId">
+<!--          <el-input v-model="form.machineId" placeholder="请输入机台ID" />-->
+          <el-select v-model="form.machineId" placeholder="请选择机台">
+            <el-option v-for="item in machineOptions"
+                       :key="item.machineId"
+                       :label="item.machineName"
+                       :value="item.machineId"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="硫化条码" prop="vulcanizedBarcode">
+          <el-input v-model="form.vulcanizedBarcode" placeholder="请输入硫化条码" />
+        </el-form-item>
+        <el-form-item label="胎胚条码" prop="embryoBarcode">
+          <el-input v-model="form.embryoBarcode" placeholder="请输入胎胚条码" />
+        </el-form-item>
+        <el-form-item label="生产工具" prop="toolId">
+          <el-input v-model="form.toolId" placeholder="请输入生产工具" />
+        </el-form-item>
+        <el-form-item label="物料" prop="materielId">
+<!--          <el-input v-model="form.materielId" placeholder="请输入物料ID" />-->
+          <el-select v-model="form.materielId" placeholder="请选择物料">
+            <el-option v-for="item in materialOptions"
+                       :key="item.materialId"
+                       :label="item.materialName"
+                       :value="item.materialId"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="扫描结果" prop="scanResult">
+          <el-input v-model="form.scanResult" placeholder="请输入扫描结果" />
+        </el-form-item>
+        <el-form-item label="记录人名称" prop="userName">
+          <el-input v-model="form.userName" placeholder="请输入记录人名称" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="ProdInputScanInfo" lang="ts">
+import { listProdInputScanInfo, getProdInputScanInfo, delProdInputScanInfo, addProdInputScanInfo, updateProdInputScanInfo } from '@/api/mes/prodInputScanInfo';
+import { ProdInputScanInfoVO, ProdInputScanInfoQuery, ProdInputScanInfoForm } from '@/api/mes/prodInputScanInfo/types';
+import { getProcessInfoList } from "@/api/mes/baseProcessInfo";
+import { getProdBaseMachineInfoList } from "@/api/mes/prodBaseMachineInfo";
+import { getBaseMaterialInfoList } from "@/api/mes/baseMaterialInfo";
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const prodInputScanInfoList = ref<ProdInputScanInfoVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const prodInputScanInfoFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+        { key: 0, label: `主键标识`, visible: false },
+        { key: 1, label: `租户编号`, visible: false },
+        { key: 2, label: `工序`, visible: true },
+        { key: 3, label: `机台`, visible: true },
+        { key: 4, label: `硫化条码`, visible: true },
+        { key: 5, label: `胎胚条码`, visible: true },
+        { key: 6, label: `生产工具`, visible: true },
+        { key: 7, label: `物料`, visible: true },
+        { key: 8, label: `扫描结果`, visible: true },
+        { key: 9, label: `记录人名称`, visible: true },
+        { key: 10, label: `备注`, visible: true },
+        { key: 11, label: `创建部门`, visible: false },
+        { key: 12, label: `记录人`, visible: false },
+        { key: 13, label: `记录时间`, visible: false },
+        { key: 14, label: `更新人`, visible: false },
+        { key: 15, label: `更新时间`, visible: false },
+]);
+
+const initFormData: ProdInputScanInfoForm = {
+  prodInputScanInfoId: undefined,
+  processId: undefined,
+  machineId: undefined,
+  vulcanizedBarcode: undefined,
+  embryoBarcode: undefined,
+  toolId: undefined,
+  materielId: undefined,
+  scanResult: undefined,
+  userName: undefined,
+  remark: undefined,
+}
+const data = reactive<PageData<ProdInputScanInfoForm, ProdInputScanInfoQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    prodInputScanInfoId: undefined,
+    processId: undefined,
+    machineId: undefined,
+    vulcanizedBarcode: undefined,
+    embryoBarcode: undefined,
+    toolId: undefined,
+    materielId: undefined,
+    scanResult: undefined,
+    userName: undefined,
+    params: {
+    }
+  },
+  rules: {
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询生产投入扫描信息列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listProdInputScanInfo(queryParams.value);
+  prodInputScanInfoList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  prodInputScanInfoFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: ProdInputScanInfoVO[]) => {
+  ids.value = selection.map(item => item.prodInputScanInfoId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加生产投入扫描信息";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: ProdInputScanInfoVO) => {
+  reset();
+  const _prodInputScanInfoId = row?.prodInputScanInfoId || ids.value[0]
+  const res = await getProdInputScanInfo(_prodInputScanInfoId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改生产投入扫描信息";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  prodInputScanInfoFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.prodInputScanInfoId) {
+        await updateProdInputScanInfo(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addProdInputScanInfo(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: ProdInputScanInfoVO) => {
+  const _prodInputScanInfoIds = row?.prodInputScanInfoId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除生产投入扫描信息编号为"' + _prodInputScanInfoIds + '"的数据项？').finally(() => loading.value = false);
+  await delProdInputScanInfo(_prodInputScanInfoIds);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('mes/prodInputScanInfo/export', {
+    ...queryParams.value
+  }, `prodInputScanInfo_${new Date().getTime()}.xlsx`)
+}
+
+//获取工序选项
+let processOptions = ref([])
+const getProcessSelect = async () => {
+  let res = await getProcessInfoList(null);
+  processOptions.value = res.data;
+}
+
+//获取机台选项
+let machineOptions = ref([])
+const getMachineSelect = async () => {
+  let res = await getProdBaseMachineInfoList(null);
+  machineOptions.value = res.data;
+}
+
+//获取物料选项
+let materialOptions = ref([])
+const getMaterialSelect = async () => {
+  let res = await getBaseMaterialInfoList(null);
+  materialOptions.value = res.data;
+}
+
+
+onMounted(() => {
+  getProcessSelect();
+    getMachineSelect();
+    getMaterialSelect();
+  getList();
+});
+</script>
diff --git a/src/views/mes/prodOutputScanInfo/index.vue b/src/views/mes/prodOutputScanInfo/index.vue
new file mode 100644
index 0000000..5990a37
--- /dev/null
+++ b/src/views/mes/prodOutputScanInfo/index.vue
@@ -0,0 +1,355 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+<!--            <el-form-item label="主键标识" prop="prodOutputScanInfoId">
+              <el-input v-model="queryParams.prodOutputScanInfoId" placeholder="请输入主键标识" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="工序ID" prop="processId">
+              <el-input v-model="queryParams.processId" placeholder="请输入工序ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="机台ID" prop="machineId">
+              <el-input v-model="queryParams.machineId" placeholder="请输入机台ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+            <el-form-item label="胎胚条码" prop="embryoBarcode">
+              <el-input v-model="queryParams.embryoBarcode" placeholder="请输入胎胚条码" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+<!--            <el-form-item label="工装ID" prop="toolingId">
+              <el-input v-model="queryParams.toolingId" placeholder="请输入工装ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="物料ID" prop="materielId">
+              <el-input v-model="queryParams.materielId" placeholder="请输入物料ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="扫描结果" prop="scanResult">
+              <el-input v-model="queryParams.scanResult" placeholder="请输入扫描结果" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+            <el-form-item label="记录人名称" prop="userName">
+              <el-input v-model="queryParams.userName" placeholder="请输入记录人名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['mes:prodOutputScanInfo:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['mes:prodOutputScanInfo:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['mes:prodOutputScanInfo:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['mes:prodOutputScanInfo:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <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="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="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"/>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['mes:prodOutputScanInfo:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['mes:prodOutputScanInfo:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+
+    <!-- 添加或修改生产产出扫描信息对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="prodOutputScanInfoFormRef" :model="form" :rules="rules" label-width="120px">
+<!--        <el-form-item label="主键标识" prop="prodOutputScanInfoId">
+          <el-input v-model="form.prodOutputScanInfoId" placeholder="请输入主键标识" />
+        </el-form-item>-->
+        <el-form-item label="工序" prop="processId">
+<!--          <el-input v-model="form.processId" placeholder="请输入工序ID" />-->
+          <el-select v-model="form.processId" placeholder="请选择工序">
+            <el-option v-for="item in processOptions"
+                       :key="item.processId"
+                       :label="item.processName"
+                       :value="item.processId"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="机台" prop="machineId">
+<!--          <el-input v-model="form.machineId" placeholder="请输入机台ID" />-->
+          <el-select v-model="form.machineId" placeholder="请选择机台">
+            <el-option v-for="item in machineOptions"
+                       :key="item.machineId"
+                       :label="item.machineName"
+                       :value="item.machineId"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="胎胚条码" prop="embryoBarcode">
+          <el-input v-model="form.embryoBarcode" placeholder="请输入胎胚条码" />
+        </el-form-item>
+        <el-form-item label="工装" prop="toolingId">
+<!--          <el-input v-model="form.toolingId" placeholder="请输入工装ID" />-->
+          <el-select v-model="form.toolingId" placeholder="请选择工装">
+            <el-option v-for="item in toolingOptions"
+                       :key="item.toolingId"
+                       :label="item.toolingName"
+                       :value="item.toolingId"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="物料" prop="materielId">
+<!--          <el-input v-model="form.materielId" placeholder="请输入物料ID" />-->
+          <el-select v-model="form.materielId" placeholder="请选择物料">
+            <el-option v-for="item in materialOptions"
+                       :key="item.materialId"
+                       :label="item.materialName"
+                       :value="item.materialId"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="扫描结果" prop="scanResult">
+          <el-input v-model="form.scanResult" placeholder="请输入扫描结果" />
+        </el-form-item>
+        <el-form-item label="记录人名称" prop="userName">
+          <el-input v-model="form.userName" placeholder="请输入记录人名称" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="ProdOutputScanInfo" lang="ts">
+import { listProdOutputScanInfo, getProdOutputScanInfo, delProdOutputScanInfo, addProdOutputScanInfo, updateProdOutputScanInfo } from '@/api/mes/prodOutputScanInfo';
+import { ProdOutputScanInfoVO, ProdOutputScanInfoQuery, ProdOutputScanInfoForm } from '@/api/mes/prodOutputScanInfo/types';
+import {getBaseMaterialInfoList} from "@/api/mes/baseMaterialInfo";
+import {getProcessInfoList} from "@/api/mes/baseProcessInfo";
+import {getProdBaseMachineInfoList} from "@/api/mes/prodBaseMachineInfo";
+import {getBaseToolingInfoList} from "@/api/mes/baseToolingInfo";
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const prodOutputScanInfoList = ref<ProdOutputScanInfoVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const prodOutputScanInfoFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+        { key: 0, label: `主键标识`, visible: false },
+        { key: 1, label: `租户编号`, visible: false },
+        { key: 2, label: `工序`, visible: true },
+        { key: 3, label: `机台`, visible: true },
+        { key: 4, label: `胎胚条码`, visible: true },
+        { key: 5, label: `工装`, visible: true },
+        { key: 6, label: `物料`, visible: true },
+        { key: 7, label: `扫描结果`, visible: true },
+        { key: 8, label: `记录人名称`, visible: true },
+        { key: 9, label: `备注`, visible: true },
+        { key: 10, label: `创建部门`, visible: false },
+        { key: 11, label: `记录人`, visible: false },
+        { key: 12, label: `记录时间`, visible: false },
+        { key: 13, label: `更新人`, visible: false },
+        { key: 14, label: `更新时间`, visible: false },
+]);
+
+const initFormData: ProdOutputScanInfoForm = {
+  prodOutputScanInfoId: undefined,
+  processId: undefined,
+  machineId: undefined,
+  embryoBarcode: undefined,
+  toolingId: undefined,
+  materielId: undefined,
+  scanResult: undefined,
+  userName: undefined,
+  remark: undefined,
+}
+const data = reactive<PageData<ProdOutputScanInfoForm, ProdOutputScanInfoQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    prodOutputScanInfoId: undefined,
+    processId: undefined,
+    machineId: undefined,
+    embryoBarcode: undefined,
+    toolingId: undefined,
+    materielId: undefined,
+    scanResult: undefined,
+    userName: undefined,
+    params: {
+    }
+  },
+  rules: {
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询生产产出扫描信息列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listProdOutputScanInfo(queryParams.value);
+  prodOutputScanInfoList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  prodOutputScanInfoFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: ProdOutputScanInfoVO[]) => {
+  ids.value = selection.map(item => item.prodOutputScanInfoId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加生产产出扫描信息";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: ProdOutputScanInfoVO) => {
+  reset();
+  const _prodOutputScanInfoId = row?.prodOutputScanInfoId || ids.value[0]
+  const res = await getProdOutputScanInfo(_prodOutputScanInfoId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改生产产出扫描信息";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  prodOutputScanInfoFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.prodOutputScanInfoId) {
+        await updateProdOutputScanInfo(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addProdOutputScanInfo(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: ProdOutputScanInfoVO) => {
+  const _prodOutputScanInfoIds = row?.prodOutputScanInfoId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除生产产出扫描信息编号为"' + _prodOutputScanInfoIds + '"的数据项？').finally(() => loading.value = false);
+  await delProdOutputScanInfo(_prodOutputScanInfoIds);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('mes/prodOutputScanInfo/export', {
+    ...queryParams.value
+  }, `prodOutputScanInfo_${new Date().getTime()}.xlsx`)
+}
+
+//获取机台选项
+let machineOptions = ref([]);
+const getMachineSelect = async () => {
+  let res = await getProdBaseMachineInfoList(null);
+  machineOptions.value = res.data;
+}
+
+//获取工序选项
+let processOptions = ref([]);
+const getProcessSelect = async () => {
+  let res = await getProcessInfoList(null);
+  processOptions.value = res.data;
+}
+
+//获取物料选项
+let materialOptions = ref([]);
+const getMaterialSelect = async () => {
+  let res = await getBaseMaterialInfoList(null);
+  materialOptions.value = res.data;
+}
+
+//获取工装选项
+let toolingOptions = ref([]);
+const getToolingSelect = async () => {
+  let res = await getBaseToolingInfoList(null);
+  toolingOptions.value = res.data;
+}
+
+
+onMounted(() => {
+  getMachineSelect();
+    getProcessSelect();
+    getMaterialSelect();
+    getToolingSelect();
+  getList();
+});
+</script>
diff --git a/src/views/mes/prodShiftChange/index.vue b/src/views/mes/prodShiftChange/index.vue
new file mode 100644
index 0000000..ecea036
--- /dev/null
+++ b/src/views/mes/prodShiftChange/index.vue
@@ -0,0 +1,366 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+<!--            <el-form-item label="主键标识" prop="shiftChangeId">
+              <el-input v-model="queryParams.shiftChangeId" placeholder="请输入主键标识" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+            <el-form-item label="接班时间" prop="shiftChangeTime">
+              <el-date-picker clearable
+                v-model="queryParams.shiftChangeTime"
+                type="date"
+                value-format="YYYY-MM-DD"
+                placeholder="请选择接班时间"
+              />
+            </el-form-item>
+<!--            <el-form-item label="机台ID" prop="machineId">
+              <el-input v-model="queryParams.machineId" placeholder="请输入机台ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="班次ID" prop="shiftId">
+              <el-input v-model="queryParams.shiftId" placeholder="请输入班次ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="班组ID" prop="classTeamId">
+              <el-input v-model="queryParams.classTeamId" placeholder="请输入班组ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="接班人ID" prop="userId">
+              <el-input v-model="queryParams.userId" placeholder="请输入接班人ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="接班人名称" prop="userName">
+              <el-input v-model="queryParams.userName" placeholder="请输入接班人名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['mes:prodShiftChange:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['mes:prodShiftChange:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['mes:prodShiftChange:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['mes:prodShiftChange:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="prodShiftChangeList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="主键标识" align="center" prop="shiftChangeId" v-if="columns[0].visible"/>
+        <el-table-column label="接班时间" align="center" prop="shiftChangeTime" width="180" v-if="columns[2].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.shiftChangeTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="机台" align="center" prop="machineId" v-if="columns[3].visible"/>
+        <el-table-column label="班次" align="center" prop="shiftId" v-if="columns[4].visible"/>
+        <el-table-column label="班组" align="center" prop="classTeamId" v-if="columns[5].visible"/>
+<!--        <el-table-column label="接班人" align="center" prop="userId" v-if="columns[6].visible"/>-->
+        <el-table-column label="接班人名称" align="center" prop="userName" v-if="columns[6].visible"/>
+        <el-table-column label="备注" align="center" prop="remark" v-if="columns[7].visible"/>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['mes:prodShiftChange:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['mes:prodShiftChange:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+
+    <!-- 添加或修改交接班信息对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="prodShiftChangeFormRef" :model="form" :rules="rules" label-width="80px">
+<!--        <el-form-item label="主键标识" prop="shiftChangeId">
+          <el-input v-model="form.shiftChangeId" placeholder="请输入主键标识" />
+        </el-form-item>-->
+        <el-form-item label="接班时间" prop="shiftChangeTime">
+          <el-date-picker clearable
+            v-model="form.shiftChangeTime"
+            type="datetime"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            placeholder="请选择接班时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="机台" prop="machineId">
+<!--          <el-input v-model="form.machineId" placeholder="请输入机台ID" />-->
+          <el-select v-model="form.machineId" placeholder="请选择机台">
+            <el-option v-for="item in machineOptions"
+                       :key="item.machineId"
+                       :label="item.machineName"
+                       :value="item.machineId"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="班次" prop="shiftId">
+<!--          <el-input v-model="form.shiftId" placeholder="请输入班次ID" />-->
+          <el-select v-model="form.shiftId" placeholder="请选择班次">
+            <el-option v-for="item in shiftOptions"
+                       :key="item.shiftId"
+                       :label="item.shiftName"
+                       :value="item.shiftId"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="班组" prop="classTeamId">
+<!--          <el-input v-model="form.classTeamId" placeholder="请输入班组ID" />-->
+          <el-select v-model="form.classTeamId" placeholder="请选择班组">
+            <el-option v-for="item in classTeamOptions"
+                       :key="item.classTeamId"
+                       :label="item.className"
+                       :value="item.classTeamId"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="接班人" prop="userId">
+<!--          <el-input v-model="form.userId" placeholder="请输入接班人ID" />-->
+          <el-select v-model="form.userId" placeholder="请选择接班人" @change="handleUserChange">
+            <el-option v-for="item in userOptions"
+                       :key="item.userId"
+                       :label="item.userName"
+                       :value="item.userId"></el-option>
+          </el-select>
+        </el-form-item>
+<!--        <el-form-item label="接班人名称" prop="userName">
+          <el-input v-model="form.userName" placeholder="请输入接班人名称" />
+        </el-form-item>-->
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="ProdShiftChange" lang="ts">
+import { listProdShiftChange, getProdShiftChange, delProdShiftChange, addProdShiftChange, updateProdShiftChange } from '@/api/mes/prodShiftChange';
+import { ProdShiftChangeVO, ProdShiftChangeQuery, ProdShiftChangeForm } from '@/api/mes/prodShiftChange/types';
+import {getProdBaseMachineInfoList} from "@/api/mes/prodBaseMachineInfo";
+import {getBaseShiftInfoList} from "@/api/mes/baseShiftInfo";
+import {getBaseClassTeamInfoList} from "@/api/mes/baseClassTeamInfo";
+import {getUserList} from "@/api/system/user";
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const prodShiftChangeList = ref<ProdShiftChangeVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const prodShiftChangeFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+        { key: 0, label: `主键标识`, visible: false },
+        { key: 1, label: `租户编号`, visible: false },
+        { key: 2, label: `接班时间`, visible: true },
+        { key: 3, label: `机台ID`, visible: true },
+        { key: 4, label: `班次ID`, visible: true },
+        { key: 5, label: `班组ID`, visible: true },
+/*        { key: 6, label: `接班人ID`, visible: true },*/
+        { key: 6, label: `接班人名称`, visible: true },
+        { key: 7, label: `备注`, visible: true },
+/*        { key: 8, label: `创建部门`, visible: false },
+        { key: 9, label: `创建人`, visible: false },
+        { key: 10, label: `记录时间`, visible: false },
+        { key: 11, label: `更新人`, visible: false },
+        { key: 12, label: `更新时间`, visible: false },*/
+]);
+
+const initFormData: ProdShiftChangeForm = {
+  shiftChangeId: undefined,
+  shiftChangeTime: undefined,
+  machineId: undefined,
+  shiftId: undefined,
+  classTeamId: undefined,
+  userId: undefined,
+  userName: undefined,
+  remark: undefined,
+}
+const data = reactive<PageData<ProdShiftChangeForm, ProdShiftChangeQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    shiftChangeId: undefined,
+    shiftChangeTime: undefined,
+    machineId: undefined,
+    shiftId: undefined,
+    classTeamId: undefined,
+    userId: undefined,
+    userName: undefined,
+    params: {
+    }
+  },
+  rules: {
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询交接班信息列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listProdShiftChange(queryParams.value);
+  prodShiftChangeList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  prodShiftChangeFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: ProdShiftChangeVO[]) => {
+  ids.value = selection.map(item => item.shiftChangeId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加交接班信息";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: ProdShiftChangeVO) => {
+  reset();
+  const _shiftChangeId = row?.shiftChangeId || ids.value[0]
+  const res = await getProdShiftChange(_shiftChangeId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改交接班信息";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  prodShiftChangeFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.shiftChangeId) {
+        await updateProdShiftChange(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addProdShiftChange(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: ProdShiftChangeVO) => {
+  const _shiftChangeIds = row?.shiftChangeId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除交接班信息编号为"' + _shiftChangeIds + '"的数据项？').finally(() => loading.value = false);
+  await delProdShiftChange(_shiftChangeIds);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('mes/prodShiftChange/export', {
+    ...queryParams.value
+  }, `prodShiftChange_${new Date().getTime()}.xlsx`)
+}
+
+//获取机台选项
+let machineOptions = ref([])
+const getMachineSelect = async () => {
+  let res = await getProdBaseMachineInfoList(null);
+  machineOptions.value = res.data;
+}
+
+//获取班次选项
+let shiftOptions = ref([])
+const getShiftSelect = async () => {
+  let res = await getBaseShiftInfoList(null);
+  shiftOptions.value = res.data;
+}
+
+//获取班组选项
+let classTeamOptions = ref([])
+const getClassTeamSelect = async () => {
+  let res = await getBaseClassTeamInfoList(null);
+  classTeamOptions.value = res.data;
+}
+
+//获取用户选项
+let userOptions = ref([])
+const getUserSelect = async () => {
+  let res = await getUserList(null);
+  userOptions.value = res.data;
+}
+
+/** 用户选择变化时更新用户名 */
+const handleUserChange = (userId: string | number) => {
+  const selectedUser = userOptions.value.find(user => user.userId === userId);
+  if (selectedUser) {
+    form.value.userName = selectedUser.userName;
+  }
+}
+
+onMounted(() => {
+  getMachineSelect();
+  getShiftSelect();
+  getClassTeamSelect();
+  getUserSelect();
+  getList();
+});
+</script>