diff --git a/src/api/mes/technologyInfo/index.ts b/src/api/mes/technologyInfo/index.ts
index 51b9e3c..91b5d34 100644
--- a/src/api/mes/technologyInfo/index.ts
+++ b/src/api/mes/technologyInfo/index.ts
@@ -62,16 +62,23 @@ export const delTechnologyInfo = (technologyId: string | number | Array<string |
   });
 };
 
-
 /**
  * 下拉框查询工序工艺信息列表
  * @param query
  * @returns {*}
  */
-export function getProdTechnologyInfoList (query) {
-    return request({
-        url: '/mes/technologyInfo/getProdTechnologyInfoList',
-        method: 'get',
-        params: query
-    });
+export function getProdTechnologyInfoList(query) {
+  return request({
+    url: '/mes/technologyInfo/getProdTechnologyInfoList',
+    method: 'get',
+    params: query
+  });
+};
+
+export const copyTechnologyInfo = (data: TechnologyInfoForm) => {
+  return request({
+    url: '/mes/technologyInfo/copyTechnologyInfo',
+    method: 'post',
+    data: data
+  });
 };
diff --git a/src/api/mes/technologyInfo/types.ts b/src/api/mes/technologyInfo/types.ts
index 64bb13c..43598d9 100644
--- a/src/api/mes/technologyInfo/types.ts
+++ b/src/api/mes/technologyInfo/types.ts
@@ -44,6 +44,8 @@ export interface TechnologyInfoVO {
    */
   remark: string;
 
+  prodTechnologyStepInfoList?: [];
+
 }
 
 export interface TechnologyInfoForm extends BaseEntity {
@@ -139,10 +141,12 @@ export interface TechnologyInfoQuery extends PageQuery {
    */
   activeFlag?: string;
 
-    /**
-     * 日期范围参数
-     */
-    params?: any;
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+
+  prodTechnologyStepInfoList?: [];
 }
 
 
diff --git a/src/views/mes/planInfo/index.vue b/src/views/mes/planInfo/index.vue
index 1543906..7704228 100644
--- a/src/views/mes/planInfo/index.vue
+++ b/src/views/mes/planInfo/index.vue
@@ -189,7 +189,7 @@
         <el-table-column label='优先级' align='center' prop='priority' v-if='columns[27].visible' />
         <el-table-column label='班次' align='center' prop='shiftName' v-if='columns[28].visible' />
         <el-table-column label='班组' align='center' prop='teamName' v-if='columns[29].visible' />
-        <el-table-column label='模号' align='center' prop='modelCode' v-if='columns[30].visible'>
+        <el-table-column label='模号' align='center' prop='modelCode' v-if='workshopId == "4" '>
           <template #default='scope'>
             <dict-tag :options='mes_model_code' :value='scope.row.modelCode' />
           </template>
diff --git a/src/views/mes/prodInputScanInfo/index.vue b/src/views/mes/prodInputScanInfo/index.vue
index 3823997..b8257f8 100644
--- a/src/views/mes/prodInputScanInfo/index.vue
+++ b/src/views/mes/prodInputScanInfo/index.vue
@@ -74,21 +74,31 @@
         <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="materielName" v-if="columns[7].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="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>
+        <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>
+        <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" />
@@ -209,9 +219,10 @@ const columns = ref<FieldOption[]>([
         { key: 11, label: `备注`, visible: true },
         { key: 12, label: `创建部门`, visible: false },
         { key: 13, label: `记录人`, visible: false },
-        { key: 14, label: `记录时间`, visible: false },
+        { key: 14, label: `记录时间`, visible: true },
         { key: 15, label: `更新人`, visible: false },
         { key: 16, label: `更新时间`, visible: false },
+        { key: 17, label: `投料时间`, visible: true },
 ]);
 
 const initFormData: ProdInputScanInfoForm = {
diff --git a/src/views/mes/technologyInfo/formingIndex.vue b/src/views/mes/technologyInfo/formingIndex.vue
index 862f886..3f389db 100644
--- a/src/views/mes/technologyInfo/formingIndex.vue
+++ b/src/views/mes/technologyInfo/formingIndex.vue
@@ -1,215 +1,130 @@
 <template>
   <div>
-  <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='technologyVersion'>
-              <el-input v-model='queryParams.technologyVersion' placeholder='请输入工艺版本' clearable
-                        @keyup.enter='handleQuery' />
-            </el-form-item>
-            <el-form-item label='激活标识' prop='activeFlag'>
-              <el-select v-model='queryParams.activeFlag' placeholder='请选择激活标识' clearable>
-                <el-option v-for='dict in active_flag' :key='dict.value' :label='dict.label' :value='dict.value' />
-              </el-select>
-            </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:technologyInfo:add']">新增
-            </el-button>
-          </el-col>
-          <el-col :span='1.5'>
-            <el-button type='success' plain icon='Edit' :disabled='single' @click='handleUpdate()'
-                       v-hasPermi="['mes:technologyInfo:edit']">修改
-            </el-button>
-          </el-col>
-          <el-col :span='1.5'>
-            <el-button type='danger' plain icon='Delete' :disabled='multiple' @click='handleDelete()'
-                       v-hasPermi="['mes:technologyInfo:remove']">删除
-            </el-button>
-          </el-col>
-          <el-col :span='1.5'>
-            <el-button type='warning' plain icon='Download' @click='handleExport'
-                       v-hasPermi="['mes:technologyInfo: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='technologyInfoList' @selection-change='handleSelectionChange'>
-        <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='materialName' v-if='columns[3].visible' width='180' />
-        <el-table-column label='机台类型' align='center' prop='machineType' v-if='columns[4].visible'>
-          <template #default='scope'>
-            <dict-tag :options='mes_machine_type' :value='scope.row.machineType' />
-          </template>
-        </el-table-column>
-        <el-table-column label='工艺类型' align='center' prop='technologyType' v-if='columns[5].visible'>
-          <template #default='scope'>
-            <dict-tag :options='mes_technology_type' :value='scope.row.technologyType' />
-          </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'>
-          <template v-slot='scope'>
-            <span>{{ formatDayHourMinutes(scope.row.standardTime) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label='激活标识' align='center' prop='activeFlag' v-if='columns[8].visible'>
-          <template #default='scope'>
-            <dict-tag :options='active_flag' :value='scope.row.activeFlag' />
-          </template>
-        </el-table-column>
-        <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' @click='handleStepUpdate(scope.row)'
-                         v-hasPermi="['mes:technologyInfo:edit']">工艺参数
-              </el-button>
-            </el-tooltip>
-            <!--            <el-tooltip content='删除' placement='top'>-->
-            <!--              <el-button link type='primary' icon='Delete' @click='handleDelete(scope.row)'-->
-            <!--                         v-hasPermi="['mes:technologyInfo: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='technologyInfoFormRef' :model='form' :rules='rules' label-width='100px'>
-<!--        <el-form-item label='工序名称' prop='processId'>-->
-<!--          <el-select v-model='form.processId' placeholder='请选择所属工序'>-->
-<!--            <el-option-->
-<!--              v-for='item in processInfoList'-->
-<!--              :key='item.processId'-->
-<!--              :label='item.processName'-->
-<!--              :value='item.processId'-->
-<!--            />-->
-<!--          </el-select>-->
-<!--        </el-form-item>-->
-        <el-form-item label='物料名称' prop='materialId'>
-          <el-input v-model='form.materialName' placeholder='请点击检索物料' @click='handleMaterialAdd' readonly>
-            <template #append>
-              <el-icon class='el-input__icon'>
-                <search />
-              </el-icon>
-            </template>
-          </el-input>
-        </el-form-item>
-        <el-form-item label='机台类型' prop='machineType'>
-          <el-select v-model='form.machineType' placeholder='请选择机台类型'>
-            <el-option
-              v-for='dict in mes_machine_type'
-              :key='dict.value'
-              :label='dict.label'
-              :value='dict.value'
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label='工艺类型' prop='technologyType'>
-          <el-select v-model='form.technologyType' placeholder='请选择工艺类型'>
-            <el-option
-              v-for='dict in mes_technology_type'
-              :key='dict.value'
-              :label='dict.label'
-              :value='dict.value'
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <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='activeFlag'>
-          <el-radio-group v-model='form.activeFlag'>
-            <el-radio
-              v-for='dict in active_flag'
-              :key='dict.value'
-              :value='dict.value'
-            >{{ dict.label }}
-            </el-radio>
-          </el-radio-group>
-        </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 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='technologyVersion'>
+                <el-input v-model='queryParams.technologyVersion' placeholder='请输入工艺版本' clearable
+                          @keyup.enter='handleQuery' />
+              </el-form-item>
+              <el-form-item label='激活标识' prop='activeFlag'>
+                <el-select v-model='queryParams.activeFlag' placeholder='请选择激活标识' clearable>
+                  <el-option v-for='dict in active_flag' :key='dict.value' :label='dict.label' :value='dict.value' />
+                </el-select>
+              </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>
-      </template>
-    </el-dialog>
-  </div>
+      </transition>
 
-  <!-- 添加物料信息对话框 -->
-  <el-dialog title='选择物料信息' v-model='materialOpen' width='1200px' append-to-body>
-    <MaterialSelect @selection='handleSelection' ref='materialSelectRef' v-if='materialOpen'></MaterialSelect>
-    <div slot='footer' class='dialog-footer'>
-      <el-button type='primary' @click='submitMaterialForm'>确 定</el-button>
-      <el-button @click='materialOpen = false'>取 消</el-button>
-    </div>
-  </el-dialog>
+      <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:technologyInfo:add']">新增
+              </el-button>
+            </el-col>
+            <el-col :span='1.5'>
+              <el-button type='success' plain icon='Edit' :disabled='single' @click='handleUpdate()'
+                         v-hasPermi="['mes:technologyInfo:edit']">修改
+              </el-button>
+            </el-col>
+            <el-col :span='1.5'>
+              <el-button type='danger' plain icon='Delete' :disabled='multiple' @click='handleDelete()'
+                         v-hasPermi="['mes:technologyInfo:remove']">删除
+              </el-button>
+            </el-col>
+            <el-col :span='1.5'>
+              <el-button type='warning' plain icon='Download' @click='handleExport'
+                         v-hasPermi="['mes:technologyInfo:export']">导出
+              </el-button>
+            </el-col>
+            <right-toolbar v-model:showSearch='showSearch' :columns='columns' :search='true'
+                           @queryTable='getList'></right-toolbar>
+          </el-row>
+        </template>
 
-  <!-- 添加或修改成型工艺信息对话框 -->
-  <el-dialog :title='dialog.title' v-model='stepOpen' width='1100px' append-to-body>
-    <el-form ref='technologyInfoFormRef' :model='form' :rules='rules' label-width='100px'>
-      <el-row :gutter='10' class='mb8'>
-        <el-col :span='12'>
-          <el-form-item label='工序' prop='processId'>
-            <el-select v-model='form.processId' placeholder='请选择所属工序' disabled>
-              <el-option
-                v-for='item in processInfoList'
-                :key='item.processId'
-                :label='item.processName'
-                :value='item.processId'
-              />
-            </el-select>
+        <el-table v-loading='loading' :data='technologyInfoList' @selection-change='handleSelectionChange'>
+          <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='materialName' v-if='columns[3].visible' width='180' />
+          <el-table-column label='机台类型' align='center' prop='machineType' v-if='columns[4].visible'>
+            <template #default='scope'>
+              <dict-tag :options='mes_machine_type' :value='scope.row.machineType' />
+            </template>
+          </el-table-column>
+          <el-table-column label='工艺类型' align='center' prop='technologyType' v-if='columns[5].visible'>
+            <template #default='scope'>
+              <dict-tag :options='mes_technology_type' :value='scope.row.technologyType' />
+            </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'>
+            <template v-slot='scope'>
+              <span>{{ formatDayHourMinutes(scope.row.standardTime) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label='激活标识' align='center' prop='activeFlag' v-if='columns[8].visible'>
+            <template #default='scope'>
+              <dict-tag :options='active_flag' :value='scope.row.activeFlag' />
+            </template>
+          </el-table-column>
+          <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' @click='handleStepUpdate(scope.row)'
+                           v-hasPermi="['mes:technologyInfo:edit']">工艺参数
+                </el-button>
+              </el-tooltip>
+              <el-tooltip content='复制' placement='top'>
+                <el-button link type='primary' @click='handleCopy(scope.row)'
+                           v-hasPermi="['mes:technologyInfo:add']">复制
+                </el-button>
+              </el-tooltip>
+              <!--            <el-tooltip content='删除' placement='top'>-->
+              <!--              <el-button link type='primary' icon='Delete' @click='handleDelete(scope.row)'-->
+              <!--                         v-hasPermi="['mes:technologyInfo: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='technologyInfoFormRef' :model='form' :rules='rules' label-width='100px'>
+          <!--        <el-form-item label='工序名称' prop='processId'>-->
+          <!--          <el-select v-model='form.processId' placeholder='请选择所属工序'>-->
+          <!--            <el-option-->
+          <!--              v-for='item in processInfoList'-->
+          <!--              :key='item.processId'-->
+          <!--              :label='item.processName'-->
+          <!--              :value='item.processId'-->
+          <!--            />-->
+          <!--          </el-select>-->
+          <!--        </el-form-item>-->
+          <el-form-item label='物料名称' prop='materialId'>
+            <el-input v-model='form.materialName' placeholder='请点击检索物料' @click='handleMaterialAdd' readonly>
+              <template #append>
+                <el-icon class='el-input__icon'>
+                  <search />
+                </el-icon>
+              </template>
+            </el-input>
           </el-form-item>
-        </el-col>
-        <el-col :span='12'>
-          <el-form-item label='物料名称' prop='materialName'>
-            <el-input v-model='form.materialName' placeholder='请输入物料名称' disabled />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter='10' class='mb8'>
-        <el-col :span='12'>
           <el-form-item label='机台类型' prop='machineType'>
-            <el-select v-model='form.machineType' placeholder='请选择机台类型' disabled>
+            <el-select v-model='form.machineType' placeholder='请选择机台类型'>
               <el-option
                 v-for='dict in mes_machine_type'
                 :key='dict.value'
@@ -219,7 +134,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label='工艺类型' prop='technologyType'>
-            <el-select v-model='form.technologyType' placeholder='请选择工艺类型' disabled>
+            <el-select v-model='form.technologyType' placeholder='请选择工艺类型'>
               <el-option
                 v-for='dict in mes_technology_type'
                 :key='dict.value'
@@ -228,70 +143,193 @@
               ></el-option>
             </el-select>
           </el-form-item>
-        </el-col>
-        <el-col :span='12'>
           <el-form-item label='工艺版本' prop='technologyVersion'>
-            <el-input v-model='form.technologyVersion' placeholder='请输入工艺版本' disabled />
+            <el-input v-model='form.technologyVersion' placeholder='请输入工艺版本' />
           </el-form-item>
-        </el-col>
-      </el-row>
-      <el-divider content-position='center'>工艺参数信息</el-divider>
-      <el-row :gutter='10' class='mb8'>
-        <el-col :span='1.5'>
-          <el-button type='primary' plain icon='Plus' @click='handleAddStep'>添加</el-button>
-        </el-col>
-        <el-col :span='1.5'>
-          <el-button type='danger' icon='Delete' @click='handleDeleteProdLine'>删除</el-button>
-        </el-col>
-      </el-row>
-      <el-table :data='prodTechnologyStepInfoList' :row-class-name='rowProdBaseProcessProdlineIndex'
-                @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'>
-          <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'>
-          <template #default='scope'>
-            <el-input v-model='scope.row.stepName' placeholder='请输入参数名称' />
-          </template>
-        </el-table-column>
-<!--        <el-table-column align='center' label='参数时间' prop='stepTime'>-->
-<!--          <template #default='scope'>-->
-<!--            <el-input v-model='scope.row.stepTime' placeholder='请输入参数时间' />-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-        <el-table-column align='center' label='参数值' prop='stepParameter'>
-          <template #default='scope'>
-            <el-input v-model='scope.row.stepParameter' placeholder='请输入参数参数' />
-          </template>
-        </el-table-column>
-<!--        <el-table-column align='center' label='阀门状态' prop='valueState'>-->
-<!--          <template #default='scope'>-->
-<!--            <el-input v-model='scope.row.valueState' placeholder='请输入阀门状态' />-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-        <el-table-column align='center' label='激活标识' prop='activeFlag'>
-          <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"/>
-            </el-select>
-          </template>
-        </el-table-column>
+          <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
+                v-for='dict in active_flag'
+                :key='dict.value'
+                :value='dict.value'
+              >{{ dict.label }}
+              </el-radio>
+            </el-radio-group>
+          </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>
 
-      </el-table>
-
-    </el-form>
-    <template #footer>
-      <div class='dialog-footer'>
-        <el-button :loading='buttonLoading' type='primary' @click='submitForm'>确 定</el-button>
-        <el-button @click='cancelStep'>取 消</el-button>
+    <!-- 添加物料信息对话框 -->
+    <el-dialog title='选择物料信息' v-model='materialOpen' width='1200px' append-to-body>
+      <MaterialSelect @selection='handleSelection' ref='materialSelectRef' v-if='materialOpen'></MaterialSelect>
+      <div slot='footer' class='dialog-footer'>
+        <el-button type='primary' @click='submitMaterialForm'>确 定</el-button>
+        <el-button @click='materialOpen = false'>取 消</el-button>
       </div>
-    </template>
-  </el-dialog>
+    </el-dialog>
+
+    <!-- 添加或修改成型工艺信息对话框 -->
+    <el-dialog :title='dialog.title' v-model='stepOpen' width='1100px' append-to-body>
+      <el-form ref='technologyInfoFormRef' :model='form' :rules='rules' label-width='100px'>
+        <el-row :gutter='10' class='mb8'>
+          <el-col :span='12'>
+            <el-form-item label='工序' prop='processId'>
+              <el-select v-model='form.processId' placeholder='请选择所属工序' disabled>
+                <el-option
+                  v-for='item in processInfoList'
+                  :key='item.processId'
+                  :label='item.processName'
+                  :value='item.processId'
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span='12'>
+            <el-form-item label='物料名称' prop='materialName'>
+              <el-input v-model='form.materialName' placeholder='请输入物料名称' disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter='10' class='mb8'>
+          <el-col :span='12'>
+            <el-form-item label='机台类型' prop='machineType'>
+              <el-select v-model='form.machineType' placeholder='请选择机台类型' disabled>
+                <el-option
+                  v-for='dict in mes_machine_type'
+                  :key='dict.value'
+                  :label='dict.label'
+                  :value='dict.value'
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label='工艺类型' prop='technologyType'>
+              <el-select v-model='form.technologyType' placeholder='请选择工艺类型' disabled>
+                <el-option
+                  v-for='dict in mes_technology_type'
+                  :key='dict.value'
+                  :label='dict.label'
+                  :value='dict.value'
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span='12'>
+            <el-form-item label='工艺版本' prop='technologyVersion'>
+              <el-input v-model='form.technologyVersion' placeholder='请输入工艺版本' disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-divider content-position='center'>工艺参数信息</el-divider>
+        <el-row :gutter='10' class='mb8'>
+          <el-col :span='1.5'>
+            <el-button type='primary' plain icon='Plus' @click='handleAddStep'>添加</el-button>
+          </el-col>
+          <el-col :span='1.5'>
+            <el-button type='danger' icon='Delete' @click='handleDeleteProdLine'>删除</el-button>
+          </el-col>
+        </el-row>
+        <el-table :data='prodTechnologyStepInfoList' :row-class-name='rowProdBaseProcessProdlineIndex'
+                  @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' 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' width='260'>
+            <template #default='scope'>
+              <el-input v-model='scope.row.stepName' placeholder='请输入参数名称' />
+            </template>
+          </el-table-column>
+          <el-table-column align='center' label='频率（毫秒）' prop='stepTime' width='130'>
+            <template #default='scope'>
+              <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'  />
+            </template>
+          </el-table-column>
+          <el-table-column align='center' label='参数地址' prop='pointAddress' width='100'>
+            <template #default='scope'>
+              <el-input v-model='scope.row.pointAddress'  />
+            </template>
+          </el-table-column>
+          <el-table-column align='center' label='数据类型' prop='dataType' width='100'>
+            <template #default='scope'>
+              <el-select v-model='scope.row.dataType' placeholder='请选择数据类型'>
+                <el-option
+                  v-for='dict in machine_data_type'
+                  :key='dict.value'
+                  :label='dict.label'
+                  :value='dict.value'
+                ></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column align='center' label='操作类型' prop='operationType' width='100'>
+            <template #default='scope'>
+              <el-select v-model='scope.row.operationType' placeholder='请选择操作类型'>
+                <el-option
+                  v-for='dict in mes_operation_type'
+                  :key='dict.value'
+                  :label='dict.label'
+                  :value='parseInt(dict.value)'
+                ></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column align='center' label='阈值上限' prop='upperLimit' width='100'>
+            <template #default='scope'>
+              <el-input v-model='scope.row.upperLimit' />
+            </template>
+          </el-table-column>
+          <el-table-column align='center' label='阈值下限' prop='lowerLimit' width='100'>
+            <template #default='scope'>
+              <el-input v-model='scope.row.lowerLimit' />
+            </template>
+          </el-table-column>
+          <el-table-column align='center' label='激活标识' prop='activeFlag' width='100'>
+            <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' />
+              </el-select>
+            </template>
+          </el-table-column>
+        </el-table>
+
+      </el-form>
+      <template #footer>
+        <div class='dialog-footer'>
+          <el-button :loading='buttonLoading' type='primary' @click='submitForm'>确 定</el-button>
+          <el-button @click='cancelStep'>取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
 
   </div>
 </template>
@@ -302,7 +340,7 @@ import {
   getTechnologyInfo,
   delTechnologyInfo,
   addTechnologyInfo,
-  updateTechnologyInfo
+  updateTechnologyInfo, copyTechnologyInfo
 } from '@/api/mes/technologyInfo';
 import { TechnologyInfoVO, TechnologyInfoQuery, TechnologyInfoForm } from '@/api/mes/technologyInfo/types';
 import { getProcessInfoList } from '@/api/mes/baseProcessInfo';
@@ -313,8 +351,10 @@ const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const {
   mes_machine_type,
   active_flag,
+  machine_data_type,
+  mes_operation_type,
   mes_technology_type
-} = toRefs<any>(proxy?.useDict('mes_machine_type', 'active_flag', 'mes_technology_type'));
+} = toRefs<any>(proxy?.useDict('mes_machine_type', 'active_flag', 'machine_data_type', 'mes_operation_type', 'mes_technology_type'));
 
 const technologyInfoList = ref<TechnologyInfoVO[]>([]);
 const buttonLoading = ref(false);
@@ -342,6 +382,9 @@ const stepOpen = ref(false);
 const prodTechnologyStepInfoList = ref([]);
 const chekedProdLineList = ref([]);
 
+// 复制相关
+const isCopy = ref(false);
+
 /** 查询工位下拉树结构 */
 const getProcessInfoListSelect = async () => {
   let res = await getProcessInfoList(null);
@@ -422,6 +465,7 @@ const getList = async () => {
 const cancel = () => {
   reset();
   dialog.visible = false;
+  isCopy.value = false;
 };
 /** 表单重置 */
 const reset = () => {
@@ -471,6 +515,16 @@ const handleUpdate = async (row?: TechnologyInfoVO) => {
   dialog.title = '修改成型工艺信息';
 };
 
+const handleCopy = (row: TechnologyInfoVO) => {
+  reset();
+  // 深拷贝当前行数据
+  Object.assign(form.value, JSON.parse(JSON.stringify(row)));
+  // form.value.technologyId = undefined;
+  dialog.visible = true;
+  dialog.title = '复制成型工艺信息';
+  isCopy.value = true;
+};
+
 /** 工艺参数信息维护按钮操作 */
 const handleStepUpdate = async (row?: TechnologyInfoVO) => {
   reset();
@@ -482,7 +536,7 @@ const handleStepUpdate = async (row?: TechnologyInfoVO) => {
     index: index + 1 // 初始化 index
   }));
   stepOpen.value = true;
-  dialog.title = '工艺参数信息维护';
+  dialog.title = '成型工艺参数信息维护';
 };
 
 /** 提交按钮 */
@@ -491,7 +545,10 @@ const submitForm = () => {
     if (valid) {
       buttonLoading.value = true;
       convertToSeconds();
-      if (form.value.technologyId) {
+      if (isCopy.value) {
+        form.value.prodTechnologyStepInfoList = prodTechnologyStepInfoList;
+        await copyTechnologyInfo(form.value).finally(() => buttonLoading.value = false);
+      } else if (form.value.technologyId) {
         form.value.prodTechnologyStepInfoList = prodTechnologyStepInfoList;
         await updateTechnologyInfo(form.value).finally(() => buttonLoading.value = false);
       } else {
@@ -501,6 +558,7 @@ const submitForm = () => {
       dialog.visible = false;
       stepOpen.value = false;
       form.value.prodTechnologyStepInfoList = [];
+      isCopy.value = false;
       await getList();
     }
   });
diff --git a/src/views/mes/technologyInfo/index.vue b/src/views/mes/technologyInfo/index.vue
index 30a9eb3..34622bc 100644
--- a/src/views/mes/technologyInfo/index.vue
+++ b/src/views/mes/technologyInfo/index.vue
@@ -109,6 +109,11 @@
                          v-hasPermi="['mes:technologyInfo:edit']">工艺步序
               </el-button>
             </el-tooltip>
+            <el-tooltip content='复制' placement='top'>
+              <el-button link type='primary' @click='handleCopy(scope.row)'
+                         v-hasPermi="['mes:technologyInfo:add']">复制
+              </el-button>
+            </el-tooltip>
             <!--            <el-tooltip content='删除' placement='top'>-->
             <!--              <el-button link type='primary' icon='Delete' @click='handleDelete(scope.row)'-->
             <!--                         v-hasPermi="['mes:technologyInfo:remove']"></el-button>-->
@@ -326,7 +331,7 @@ import {
   getTechnologyInfo,
   delTechnologyInfo,
   addTechnologyInfo,
-  updateTechnologyInfo
+  updateTechnologyInfo, copyTechnologyInfo
 } from '@/api/mes/technologyInfo';
 import { TechnologyInfoVO, TechnologyInfoQuery, TechnologyInfoForm } from '@/api/mes/technologyInfo/types';
 import { getProcessInfoList } from '@/api/mes/baseProcessInfo';
@@ -363,6 +368,9 @@ const materialSelectRef = ref();
 
 const stepOpen = ref(false);
 
+// 复制相关
+const isCopy = ref(false);
+
 const prodTechnologyStepInfoList = ref([]);
 const chekedProdLineList = ref([]);
 
@@ -446,6 +454,7 @@ const getList = async () => {
 const cancel = () => {
   reset();
   dialog.visible = false;
+  isCopy.value = false;
 };
 /** 表单重置 */
 const reset = () => {
@@ -515,7 +524,10 @@ const submitForm = () => {
     if (valid) {
       buttonLoading.value = true;
       convertToSeconds();
-      if (form.value.technologyId) {
+      if (isCopy.value) {
+        form.value.prodTechnologyStepInfoList = prodTechnologyStepInfoList;
+        await copyTechnologyInfo(form.value).finally(() => buttonLoading.value = false);
+      } else if (form.value.technologyId) {
         form.value.prodTechnologyStepInfoList = prodTechnologyStepInfoList;
         await updateTechnologyInfo(form.value).finally(() => buttonLoading.value = false);
       } else {
@@ -525,6 +537,7 @@ const submitForm = () => {
       dialog.visible = false;
       stepOpen.value = false;
       form.value.prodTechnologyStepInfoList = [];
+      isCopy.value = false;
       await getList();
     }
   });
@@ -588,6 +601,15 @@ const handleAddStep = () => {
   });
 };
 
+const handleCopy = (row: TechnologyInfoVO) => {
+  reset();
+  // 深拷贝当前行数据
+  Object.assign(form.value, JSON.parse(JSON.stringify(row)));
+  // form.value.technologyId = undefined;
+  dialog.visible = true;
+  dialog.title = '复制成型工艺信息';
+  isCopy.value = true;
+};
 const rowProdBaseProcessProdlineIndex = ({ row, rowIndex }: { row: any; rowIndex: number }): string => {
   // 根据行数据和行索引返回一个类名字符串
   if (row.someCondition) {