diff --git a/src/api/mes/technologyInfo/types.ts b/src/api/mes/technologyInfo/types.ts
index 43598d9..3acdf24 100644
--- a/src/api/mes/technologyInfo/types.ts
+++ b/src/api/mes/technologyInfo/types.ts
@@ -45,7 +45,8 @@ export interface TechnologyInfoVO {
   remark: string;
 
   prodTechnologyStepInfoList?: [];
-
+  technologyName?: string;
+  materialName?: string;
 }
 
 export interface TechnologyInfoForm extends BaseEntity {
@@ -78,6 +79,8 @@ export interface TechnologyInfoForm extends BaseEntity {
    * 工艺版本
    */
   technologyVersion?: string;
+  technologyName?: string;
+  materialName?: string;
 
   /**
    * 硫化标准时间（秒）
@@ -147,6 +150,8 @@ export interface TechnologyInfoQuery extends PageQuery {
   params?: any;
 
   prodTechnologyStepInfoList?: [];
+  technologyName?: string;
+  materialName?: string;
 }
 
 
diff --git a/src/views/mes/prodInputScanInfo/index.vue b/src/views/mes/prodInputScanInfo/index.vue
index b8257f8..3d1472d 100644
--- a/src/views/mes/prodInputScanInfo/index.vue
+++ b/src/views/mes/prodInputScanInfo/index.vue
@@ -1,187 +1,217 @@
 <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" />
+  <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='工序' prop='processId'>
+              <el-select v-model='queryParams.processId' placeholder='请选择工序' clearable @keyup.enter='handleQuery'>
+                <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="processId">
-              <el-input v-model="queryParams.processId" placeholder="请输入工序ID" clearable @keyup.enter="handleQuery" />
+            <el-form-item label='机台' prop='machineId'>
+              <el-select v-model='queryParams.machineId' placeholder='请选择机台' clearable @keyup.enter='handleQuery'>
+                <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="machineId">
-              <el-input v-model="queryParams.machineId" placeholder="请输入机台ID" clearable @keyup.enter="handleQuery" />
-            </el-form-item>-->
-            <el-form-item label="投入条码" prop="inputBarcode">
-              <el-input v-model="queryParams.inputBarcode" placeholder="请输入投入条码" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="生产条码" prop="productionBarcode">
-              <el-input v-model="queryParams.productionBarcode" 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="物料" prop="materielId">
-              <el-input v-model="queryParams.materielId" placeholder="请输入物料ID" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="投料工位" prop="stationId">
-              <el-input v-model="queryParams.stationId" 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" label-width="100px">
-              <el-input v-model="queryParams.userName" placeholder="请输入记录人名称" clearable @keyup.enter="handleQuery" />
+
+            <el-form-item label='投入条码' prop='inputBarcode'>
+              <el-input v-model='queryParams.inputBarcode' placeholder='请输入投入条码' clearable
+                        @keyup.enter='handleQuery' />
             </el-form-item>
+            <!--            <el-form-item label="生产条码" prop="productionBarcode">-->
+            <!--              <el-input v-model="queryParams.productionBarcode" 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="物料" prop="materielId">
+                          <el-input v-model="queryParams.materielId" placeholder="请输入物料ID" clearable @keyup.enter="handleQuery" />
+                        </el-form-item>
+                        <el-form-item label="投料工位" prop="stationId">
+                          <el-input v-model="queryParams.stationId" 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' label-width='100px'>-->
+<!--              <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-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">
+    <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-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="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['mes:prodInputScanInfo:edit']"
-              >修改</el-button
-            >
+          <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="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['mes:prodInputScanInfo:remove']"
-              >删除</el-button
-            >
+          <el-col :span='1.5'>
+            <el-button type='warning' plain icon='Download' @click='handleExport'
+                       v-hasPermi="['mes:prodInputScanInfo:export']">导出
+            </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>
+          <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="工序" 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="inputBarcode" v-if="columns[4].visible"/>
-        <el-table-column label="生产条码" align="center" prop="productionBarcode" v-if="columns[5].visible"/>
-        <el-table-column label="生产工具" align="center" prop="toolId" v-if="columns[6].visible"/>
-        <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[7].visible"/>
-        <el-table-column label="投料工位" align="center" prop="stationName" v-if="columns[8].visible"/>
-        <el-table-column label="扫描结果" align="center" prop="scanResult" v-if="columns[9].visible"/>
-        <el-table-column label="投料时间" align="center" prop="feedingTime" width='180' v-if="columns[17].visible">
+      <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='工序' 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='inputBarcode' v-if='columns[4].visible' />
+        <el-table-column label='生产条码' align='center' prop='productionBarcode' v-if='columns[5].visible' />
+        <el-table-column label='生产工具' align='center' prop='toolId' v-if='columns[6].visible' />
+        <el-table-column label='物料名称' align='center' prop='materialName' v-if='columns[7].visible' />
+        <el-table-column label='投料工位' align='center' prop='stationName' v-if='columns[8].visible' />
+        <el-table-column label='扫描结果' align='center' prop='scanResult' v-if='columns[9].visible' />
+        <el-table-column label='投料时间' align='center' prop='feedingTime' width='180' v-if='columns[17].visible'>
           <template #default='scope'>
             <span>{{ parseTime(scope.row.feedingTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="记录时间" align="center" prop="createTime" width='180' v-if="columns[14].visible">
-        <template #default='scope'>
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-        </template>
+        <el-table-column label='记录时间' align='center' prop='createTime' width='180' v-if='columns[14].visible'>
+          <template #default='scope'>
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
         </el-table-column>
-        <el-table-column label="记录人名称" align="center" prop="userName" v-if="columns[10].visible"/>
-        <el-table-column label="备注" align="center" prop="remark" v-if="columns[11].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-column label='记录人名称' align='center' prop='userName' v-if='columns[10].visible' />
+        <el-table-column label='备注' align='center' prop='remark' v-if='columns[11].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" />
+      <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="80px">
-<!--        <el-form-item label="主键标识" prop="prodInputScanInfoId">
-          <el-input v-model="form.prodInputScanInfoId" placeholder="请输入主键标识" />
-        </el-form-item>-->
-        <el-form-item label="工序ID" 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-dialog :title='dialog.title' v-model='dialog.visible' width='500px' append-to-body>
+      <el-form ref='prodInputScanInfoFormRef' :model='form' :rules='rules' label-width='80px'>
+
+        <el-form-item label='工序ID' prop='processId'>
+          <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-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="inputBarcode">
-          <el-input v-model="form.inputBarcode" placeholder="请输入投入条码" />
+        <el-form-item label='投入条码' prop='inputBarcode'>
+          <el-input v-model='form.inputBarcode' placeholder='请输入投入条码' />
         </el-form-item>
-        <el-form-item label="生产条码" prop="productionBarcode">
-          <el-input v-model="form.productionBarcode" placeholder="请输入生产条码" />
+        <el-form-item label='生产条码' prop='productionBarcode'>
+          <el-input v-model='form.productionBarcode' placeholder='请输入生产条码' />
         </el-form-item>
-        <el-form-item label="生产工具" prop="toolId">
-          <el-input v-model="form.toolId" placeholder="请输入生产工具" />
+        <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-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="stationId">
-<!--          <el-input v-model="form.stationId" placeholder="请输入投料工位ID" />-->
-          <el-select v-model="form.stationId" placeholder="请选择投料工位">
-            <el-option v-for="item in stationOptions"
-                       :key="item.stationId"
-                       :label="item.stationName"
-                       :value="item.stationId"></el-option>
+        <el-form-item label='投料工位' prop='stationId'>
+          <!--          <el-input v-model="form.stationId" placeholder="请输入投料工位ID" />-->
+          <el-select v-model='form.stationId' placeholder='请选择投料工位'>
+            <el-option v-for='item in stationOptions'
+                       :key='item.stationId'
+                       :label='item.stationName'
+                       :value='item.stationId'></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="扫描结果" prop="scanResult">
-          <el-input v-model="form.scanResult" placeholder="请输入扫描结果" />
+        <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 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 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 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';
+<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";
-import {getStationInfoList} from "@/api/mes/baseStationInfo";
+import { getProcessInfoList } from '@/api/mes/baseProcessInfo';
+import { getProdBaseMachineInfoList } from '@/api/mes/prodBaseMachineInfo';
+import { getBaseMaterialInfoList } from '@/api/mes/baseMaterialInfo';
+import { getStationInfoList } from '@/api/mes/baseStationInfo';
 
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -205,24 +235,24 @@ const dialog = reactive<DialogOption>({
 
 // 列显隐信息
 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: true },
-        { key: 12, label: `创建部门`, visible: false },
-        { key: 13, label: `记录人`, visible: false },
-        { key: 14, label: `记录时间`, visible: true },
-        { key: 15, label: `更新人`, visible: false },
-        { key: 16, label: `更新时间`, visible: false },
-        { key: 17, label: `投料时间`, visible: true },
+  { 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: false },
+  { key: 6, label: `生产工具`, visible: false },
+  { 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: true },
+  { key: 15, label: `更新人`, visible: false },
+  { key: 16, label: `更新时间`, visible: false },
+  { key: 17, label: `投料时间`, visible: false }
 ]);
 
 const initFormData: ProdInputScanInfoForm = {
@@ -240,10 +270,10 @@ const initFormData: ProdInputScanInfoForm = {
   machineName: undefined,
   processName: undefined,
   materielName: undefined,
-  stationName: undefined,
-}
+  stationName: undefined
+};
 const data = reactive<PageData<ProdInputScanInfoForm, ProdInputScanInfoQuery>>({
-  form: {...initFormData},
+  form: { ...initFormData },
   queryParams: {
     pageNum: 1,
     pageSize: 10,
@@ -261,11 +291,9 @@ const data = reactive<PageData<ProdInputScanInfoForm, ProdInputScanInfoQuery>>({
     processName: undefined,
     materielName: undefined,
     stationName: undefined,
-    params: {
-    }
+    params: {}
   },
-  rules: {
-  }
+  rules: {}
 });
 
 const { queryParams, form, rules } = toRefs(data);
@@ -277,55 +305,55 @@ const getList = async () => {
   prodInputScanInfoList.value = res.rows;
   total.value = res.total;
   loading.value = false;
-}
+};
 
 /** 取消按钮 */
 const cancel = () => {
   reset();
   dialog.visible = false;
-}
+};
 
 /** 表单重置 */
 const reset = () => {
-  form.value = {...initFormData};
+  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 = "添加生产投入扫描信息";
-}
+  dialog.title = '添加生产投入扫描信息';
+};
 
 /** 修改按钮操作 */
 const handleUpdate = async (row?: ProdInputScanInfoVO) => {
   reset();
-  const _prodInputScanInfoId = row?.prodInputScanInfoId || ids.value[0]
+  const _prodInputScanInfoId = row?.prodInputScanInfoId || ids.value[0];
   const res = await getProdInputScanInfo(_prodInputScanInfoId);
   Object.assign(form.value, res.data);
   dialog.visible = true;
-  dialog.title = "修改生产投入扫描信息";
-}
+  dialog.title = '修改生产投入扫描信息';
+};
 
 /** 提交按钮 */
 const submitForm = () => {
@@ -333,67 +361,67 @@ const submitForm = () => {
     if (valid) {
       buttonLoading.value = true;
       if (form.value.prodInputScanInfoId) {
-        await updateProdInputScanInfo(form.value).finally(() =>  buttonLoading.value = false);
+        await updateProdInputScanInfo(form.value).finally(() => buttonLoading.value = false);
       } else {
-        await addProdInputScanInfo(form.value).finally(() =>  buttonLoading.value = false);
+        await addProdInputScanInfo(form.value).finally(() => buttonLoading.value = false);
       }
-      proxy?.$modal.msgSuccess("操作成功");
+      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("删除成功");
+  proxy?.$modal.msgSuccess('删除成功');
   await getList();
-}
+};
 
 /** 导出按钮操作 */
 const handleExport = () => {
   proxy?.download('mes/prodInputScanInfo/export', {
     ...queryParams.value
-  }, `prodInputScanInfo_${new Date().getTime()}.xlsx`)
-}
+  }, `prodInputScanInfo_${new Date().getTime()}.xlsx`);
+};
 
 //获取工序选项
-let processOptions = ref([])
+let processOptions = ref([]);
 const getProcessSelect = async () => {
   let res = await getProcessInfoList(null);
   processOptions.value = res.data;
-}
+};
 
 //获取机台选项
-let machineOptions = ref([])
+let machineOptions = ref([]);
 const getMachineSelect = async () => {
   let res = await getProdBaseMachineInfoList(null);
   machineOptions.value = res.data;
-}
+};
 
 //获取物料选项
-let materialOptions = ref([])
+let materialOptions = ref([]);
 const getMaterialSelect = async () => {
   let res = await getBaseMaterialInfoList(null);
   materialOptions.value = res.data;
-}
+};
 
 //获取工位选项
-let stationOptions = ref([])
+let stationOptions = ref([]);
 const getStationSelect = async () => {
   let res = await getStationInfoList(null);
   stationOptions.value = res.data;
-}
+};
 
 
 onMounted(() => {
   getProcessSelect();
-    getMachineSelect();
-    getMaterialSelect();
-    getStationSelect();
+  getMachineSelect();
+  getMaterialSelect();
+  getStationSelect();
   getList();
 });
 </script>
diff --git a/src/views/mes/technologyInfo/formingIndex.vue b/src/views/mes/technologyInfo/formingIndex.vue
index 3f389db..8a5b799 100644
--- a/src/views/mes/technologyInfo/formingIndex.vue
+++ b/src/views/mes/technologyInfo/formingIndex.vue
@@ -55,6 +55,7 @@
           <el-table-column type='selection' width='55' align='center' />
           <el-table-column label='主键标识' align='center' prop='technologyId' v-if='columns[0].visible' />
           <el-table-column label='工序名称' align='center' prop='processName' v-if='columns[2].visible' />
+          <el-table-column label='工艺名称' align='center' prop='technologyName' v-if='columns[15].visible' />
           <el-table-column label='物料名称' align='center' prop='materialName' v-if='columns[3].visible' width='180' />
           <el-table-column label='机台类型' align='center' prop='machineType' v-if='columns[4].visible'>
             <template #default='scope'>
@@ -67,7 +68,7 @@
             </template>
           </el-table-column>
           <el-table-column label='工艺版本' align='center' prop='technologyVersion' v-if='columns[6].visible' />
-          <el-table-column label='硫化标准时间' align='center' prop='standardTime' v-if='columns[7].visible'>
+          <el-table-column label='成型标准时间' align='center' prop='standardTime' v-if='columns[7].visible'>
             <template v-slot='scope'>
               <span>{{ formatDayHourMinutes(scope.row.standardTime) }}</span>
             </template>
@@ -114,6 +115,9 @@
           <!--            />-->
           <!--          </el-select>-->
           <!--        </el-form-item>-->
+          <el-form-item label='工艺名称' prop='technologyName'>
+            <el-input v-model='form.technologyName' placeholder='请输入工艺名称' />
+          </el-form-item>
           <el-form-item label='物料名称' prop='materialId'>
             <el-input v-model='form.materialName' placeholder='请点击检索物料' @click='handleMaterialAdd' readonly>
               <template #append>
@@ -146,17 +150,17 @@
           <el-form-item label='工艺版本' prop='technologyVersion'>
             <el-input v-model='form.technologyVersion' placeholder='请输入工艺版本' />
           </el-form-item>
-          <el-form-item label='硫化标准时间' prop='standardTime'>
-            <el-input-number v-model='form.productionTimeDays' placeholder='请输入天数' :min='0' :max='10000'
-                             :controls='false' :style="{ width: '50px' }" />
-            <span>&nbsp;天&nbsp;</span>
-            <el-input-number v-model='form.productionTimeHours' placeholder='请输入小时' :min='0' :max='23'
-                             :controls='false' :style="{ width: '50px' }" />
-            <span>&nbsp;小时&nbsp;</span>
-            <el-input-number v-model='form.productionTimeMinutes' placeholder='请输入分钟' :min='0' :max='59'
-                             :controls='false' :style="{ width: '50px' }" />
-            <span>&nbsp;分钟&nbsp;</span>
-          </el-form-item>
+          <!--          <el-form-item label='成型标准时间' prop='standardTime'>-->
+          <!--            <el-input-number v-model='form.productionTimeDays' placeholder='请输入天数' :min='0' :max='10000'-->
+          <!--                             :controls='false' :style="{ width: '50px' }" />-->
+          <!--            <span>&nbsp;天&nbsp;</span>-->
+          <!--            <el-input-number v-model='form.productionTimeHours' placeholder='请输入小时' :min='0' :max='23'-->
+          <!--                             :controls='false' :style="{ width: '50px' }" />-->
+          <!--            <span>&nbsp;小时&nbsp;</span>-->
+          <!--            <el-input-number v-model='form.productionTimeMinutes' placeholder='请输入分钟' :min='0' :max='59'-->
+          <!--                             :controls='false' :style="{ width: '50px' }" />-->
+          <!--            <span>&nbsp;分钟&nbsp;</span>-->
+          <!--          </el-form-item>-->
           <el-form-item label='激活标识' prop='activeFlag'>
             <el-radio-group v-model='form.activeFlag'>
               <el-radio
@@ -255,7 +259,6 @@
           <el-table-column label='序号' width='50' align='center' prop='index' />
           <el-table-column align='center' label='参数编号' prop='stepCode' width='130'>
             <template #default='scope'>
-              <!--            <el-input v-model='scope.row.stepCode' :disabled='true' placeholder='请输入参数编号' />-->
               <el-input v-model='scope.row.stepCode' placeholder='请输入参数编号' />
             </template>
           </el-table-column>
@@ -266,17 +269,17 @@
           </el-table-column>
           <el-table-column align='center' label='频率（毫秒）' prop='stepTime' width='130'>
             <template #default='scope'>
-              <el-input v-model='scope.row.stepTime'  />
+              <el-input v-model='scope.row.stepTime' />
             </template>
           </el-table-column>
           <el-table-column align='center' label='参数值' prop='stepParameter' width='100'>
             <template #default='scope'>
-              <el-input v-model='scope.row.stepParameter'  />
+              <el-input v-model='scope.row.stepParameter' />
             </template>
           </el-table-column>
           <el-table-column align='center' label='参数地址' prop='pointAddress' width='100'>
             <template #default='scope'>
-              <el-input v-model='scope.row.pointAddress'  />
+              <el-input v-model='scope.row.pointAddress' />
             </template>
           </el-table-column>
           <el-table-column align='center' label='数据类型' prop='dataType' width='100'>
@@ -400,14 +403,15 @@ const columns = ref<FieldOption[]>([
   { key: 4, label: `机台类型`, visible: true },
   { key: 5, label: `工艺类型`, visible: true },
   { key: 6, label: `工艺版本`, visible: true },
-  { key: 7, label: `硫化标准时间`, visible: true },
+  { key: 7, label: `成型标准时间`, visible: false },
   { 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 }
+  { key: 14, label: `更新时间`, visible: false },
+  { key: 15, label: `工艺名称`, visible: true }
 ]);
 
 const initFormData: TechnologyInfoForm = {
diff --git a/src/views/mes/technologyInfo/index.vue b/src/views/mes/technologyInfo/index.vue
index 34622bc..90f037d 100644
--- a/src/views/mes/technologyInfo/index.vue
+++ b/src/views/mes/technologyInfo/index.vue
@@ -79,6 +79,7 @@
         <el-table-column type='selection' width='55' align='center' />
         <el-table-column label='主键标识' align='center' prop='technologyId' v-if='columns[0].visible' />
         <el-table-column label='工序名称' align='center' prop='processName' v-if='columns[2].visible' />
+        <el-table-column label='工艺名称' align='center' prop='technologyName' v-if='columns[15].visible' />
         <el-table-column label='物料名称' align='center' prop='materialName' v-if='columns[3].visible' width='180' />
         <el-table-column label='机台类型' align='center' prop='machineType' v-if='columns[4].visible'>
           <template #default='scope'>
@@ -138,6 +139,9 @@
 <!--            />-->
 <!--          </el-select>-->
 <!--        </el-form-item>-->
+        <el-form-item label='工艺名称' prop='technologyName'>
+          <el-input v-model='form.technologyName' placeholder='请输入工艺名称' />
+        </el-form-item>
         <el-form-item label='物料名称' prop='materialId'>
           <el-input v-model='form.materialName' placeholder='请点击检索物料' @click='handleMaterialAdd' readonly>
             <template #append>
@@ -170,6 +174,7 @@
         <el-form-item label='工艺版本' prop='technologyVersion'>
           <el-input v-model='form.technologyVersion' placeholder='请输入工艺版本' />
         </el-form-item>
+
         <el-form-item label='硫化标准时间' prop='standardTime'>
           <el-input-number v-model='form.productionTimeDays' placeholder='请输入天数' :min='0' :max='10000'
                            :controls='false' :style="{ width: '50px' }" />
@@ -277,33 +282,39 @@
                 @selection-change='handleProdLineSelectionChange'>
         <el-table-column type='selection' width='50' align='center' />
         <el-table-column label='序号' width='50' align='center' prop='index' />
-        <el-table-column align='center' label='步序编号' prop='stepCode'>
+        <el-table-column align='center' label='步序编号' prop='stepCode' width='130'>
           <template #default='scope'>
-<!--            <el-input v-model='scope.row.stepCode' :disabled='true' placeholder='请输入步序编号' />-->
             <el-input v-model='scope.row.stepCode' placeholder='请输入步序编号' />
           </template>
         </el-table-column>
-        <el-table-column align='center' label='步序名称' prop='stepName'>
+        <el-table-column align='center' label='步序名称' prop='stepName' width='130'>
           <template #default='scope'>
             <el-input v-model='scope.row.stepName' placeholder='请输入步序名称' />
           </template>
         </el-table-column>
-        <el-table-column align='center' label='步序时间' prop='stepTime'>
+        <el-table-column align='center' label='步序时间' prop='stepTime' width='130'>
           <template #default='scope'>
             <el-input v-model='scope.row.stepTime' placeholder='请输入步序时间' />
           </template>
         </el-table-column>
-        <el-table-column align='center' label='步序参数' prop='stepParameter'>
+        <el-table-column align='center' label='步序参数' prop='stepParameter' width='130'>
           <template #default='scope'>
             <el-input v-model='scope.row.stepParameter' placeholder='请输入步序参数' />
           </template>
         </el-table-column>
-        <el-table-column align='center' label='阀门状态' prop='valueState'>
+        <el-table-column align='center' label='参数地址' prop='pointAddress' width='130'>
           <template #default='scope'>
-            <el-input v-model='scope.row.valueState' placeholder='请输入阀门状态' />
+            <el-input v-model='scope.row.pointAddress' />
           </template>
         </el-table-column>
-        <el-table-column align='center' label='激活标识' prop='activeFlag'>
+        <el-table-column align='center' label='阀门状态' prop='valueState' width='130'>
+          <template #default='scope'>
+            <el-select v-model='scope.row.valueState' placeholder='请选择阀门状态' >
+              <el-option v-for="dict in mes_value_state" :key="dict.value" :label="dict.label" :value="dict.value"/>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column align='center' label='激活标识' prop='activeFlag' width='130'>
           <template #default='scope'>
             <el-select v-model='scope.row.activeFlag' placeholder='请输入激活标识' >
               <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value"/>
@@ -342,8 +353,9 @@ const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const {
   mes_machine_type,
   active_flag,
-  mes_technology_type
-} = toRefs<any>(proxy?.useDict('mes_machine_type', 'active_flag', 'mes_technology_type'));
+  mes_technology_type,
+  mes_value_state
+} = toRefs<any>(proxy?.useDict('mes_machine_type', 'active_flag', 'mes_technology_type', 'mes_value_state'));
 
 const technologyInfoList = ref<TechnologyInfoVO[]>([]);
 const buttonLoading = ref(false);
@@ -396,7 +408,8 @@ const columns = ref<FieldOption[]>([
   { key: 11, label: `创建人`, visible: false },
   { key: 12, label: `创建时间`, visible: false },
   { key: 13, label: `更新人`, visible: false },
-  { key: 14, label: `更新时间`, visible: false }
+  { key: 14, label: `更新时间`, visible: false },
+  { key: 15, label: `工艺名称`, visible: true },
 ]);
 
 const initFormData: TechnologyInfoForm = {
@@ -607,7 +620,7 @@ const handleCopy = (row: TechnologyInfoVO) => {
   Object.assign(form.value, JSON.parse(JSON.stringify(row)));
   // form.value.technologyId = undefined;
   dialog.visible = true;
-  dialog.title = '复制成型工艺信息';
+  dialog.title = '复制硫化工艺信息';
   isCopy.value = true;
 };
 const rowProdBaseProcessProdlineIndex = ({ row, rowIndex }: { row: any; rowIndex: number }): string => {