diff --git a/src/api/mes/planInfo/index.ts b/src/api/mes/planInfo/index.ts
index a8b1059..2d51ab0 100644
--- a/src/api/mes/planInfo/index.ts
+++ b/src/api/mes/planInfo/index.ts
@@ -93,6 +93,14 @@ export function getDispatchCode() {
     method: 'get'
   })
 }
+
+// 获取工单编号（使用编码规则生成）
+export function getPlanCode() {
+  return request({
+    url: '/mes/planInfo/getPlanCode',
+    method: 'get'
+  })
+}
 // 查询生产派工列表
 export function selectProductPlans(query) {
   return request({
diff --git a/src/views/mes/baseMaterialInfo/addMaterial.vue b/src/views/mes/baseMaterialInfo/addMaterial.vue
index 02f61bb..1e4a773 100644
--- a/src/views/mes/baseMaterialInfo/addMaterial.vue
+++ b/src/views/mes/baseMaterialInfo/addMaterial.vue
@@ -36,7 +36,6 @@
       <el-table v-loading="loading"
                 :data="baseMaterialInfoList"
                 ref="tableRef"
-                @selection-change="handleSelectionChange"
                 @row-click="handleRowClick"
                 highlight-current-row
       >
@@ -48,11 +47,7 @@
         <el-table-column label="旧物料编码" align="center" prop="oldMaterialCode" v-if="columns[2].visible" width="100"/>
         <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[3].visible" width="150"/>
         <el-table-column label="物料类型ID" align="center" prop="materialTypeId" v-if="columns[4].visible"/>
-        <el-table-column label="物料大类" align="center" prop="materialCategories" v-if="columns[5].visible">
-          <template #default="scope">
-            <dict-tag :options="mes_material_categories" :value="scope.row.materialCategories"/>
-          </template>
-        </el-table-column>
+        <el-table-column label="物料大类" align="center" prop="materialCategoryName" v-if="columns[5].visible"/>
         <el-table-column label="物料类型" align="center" prop="matrialTypeName" v-if="columns[6].visible"/>
         <el-table-column label="批次标识" align="center" prop="batchFlag" v-if="columns[7].visible">
           <template #default="scope">
@@ -178,9 +173,9 @@ import {BaseMaterialTypeVO} from "@/api/mes/baseMaterialType/types";
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { apply_flag, inner_tube_flag,
-  mes_material_categories, always_flag, mes_accessories_flag,
+  always_flag, mes_accessories_flag,
   auto_outstock_flag, mes_batch_flag, active_flag, sale_type, deleted_flag, tire_markings,
-  material_classfication, mes_low_value_consumable_flag } = toRefs<any>(proxy?.useDict('apply_flag', 'inner_tube_flag', 'mes_material_categories', 'always_flag', 'mes_accessories_flag', 'auto_outstock_flag', 'mes_batch_flag', 'active_flag', 'sale_type', 'deleted_flag', 'tire_markings', 'material_classfication', 'mes_low_value_consumable_flag'));
+  material_classfication, mes_low_value_consumable_flag } = toRefs<any>(proxy?.useDict('apply_flag', 'inner_tube_flag', 'always_flag', 'mes_accessories_flag', 'auto_outstock_flag', 'mes_batch_flag', 'active_flag', 'sale_type', 'deleted_flag', 'tire_markings', 'material_classfication', 'mes_low_value_consumable_flag'));
 
 const baseMaterialInfoList = ref<BaseMaterialInfoVO[]>([]);
 const buttonLoading = ref(false);
@@ -269,7 +264,8 @@ const initFormData: BaseMaterialInfoForm = {
   oldMaterialCode: undefined,
   materialName: undefined,
   materialTypeId: undefined,
-  materialCategories: undefined,
+  materialCategoryId: undefined,
+  materialCategoryName: '',
   materialSubclass: undefined,
   batchFlag: undefined,
   batchAmount: undefined,
@@ -323,7 +319,8 @@ const data = reactive<PageData<BaseMaterialInfoForm, BaseMaterialInfoQuery>>({
     oldMaterialCode: undefined,
     materialName: undefined,
     materialTypeId: undefined,
-    materialCategories: undefined,
+    materialCategoryId: undefined,
+    materialCategoryName: '',
     materialSubclass: undefined,
     batchFlag: undefined,
     batchAmount: undefined,
@@ -383,10 +380,11 @@ const data = reactive<PageData<BaseMaterialInfoForm, BaseMaterialInfoQuery>>({
 const { queryParams, form, rules } = toRefs(data);
 
 const props = defineProps({
-  materialTypeId: Object
+  materialTypeId: [String, Number, Object],
+  materialCategoryId: String // 新增接收物料大类参数
 });
 
-const { materialTypeId } = toRefs(props);
+const { materialTypeId, materialCategoryId } = toRefs(props);
 
 
 /** 下拉框查询工厂信息列表 */
@@ -400,6 +398,11 @@ const getFactorySelect = async () => {
 const getList = async () => {
   loading.value = true;
 
+  // 如果传入了物料大类，则设置查询参数
+  if (materialCategoryId.value) {
+    queryParams.value.materialCategoryId = materialCategoryId.value;
+  }
+
   proxy?.addDateRange(queryParams.value, dateRangeApproveDate.value, 'ApproveDate');
   const res = await listBaseMaterialInfo(queryParams.value);
   baseMaterialInfoList.value = res.rows;
@@ -496,7 +499,10 @@ const handleRowClick = (row) =>{
 defineExpose({tableRef})
 onMounted(() => {
   if(materialTypeId.value){
-    queryParams.value.materialTypeId = materialTypeId.value;
+    queryParams.value.materialTypeId = typeof materialTypeId.value === 'object' ? undefined : materialTypeId.value;
+  }
+  if(materialCategoryId.value){
+    queryParams.value.materialCategoryId = materialCategoryId.value;
   }
   getFactorySelect();
   getList();
diff --git a/src/views/mes/materialBom/JJIndex.vue b/src/views/mes/materialBom/JJIndex.vue
new file mode 100644
index 0000000..0ca850a
--- /dev/null
+++ b/src/views/mes/materialBom/JJIndex.vue
@@ -0,0 +1,436 @@
+<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='materialName'>
+              <el-input v-model='queryParams.materialName' placeholder='请输入物料名称' clearable @keyup.enter='handleQuery' />
+            </el-form-item>
+            <!--            <el-form-item label='顶级标识' prop='topFlag'>-->
+            <!--              <el-input v-model='queryParams.topFlag' placeholder='请输入顶级标识' clearable-->
+            <!--                        @keyup.enter='handleQuery' />-->
+            <!--            </el-form-item>-->
+            <!--            <el-form-item label='校验类型' prop='checkType'>-->
+            <!--              <el-select v-model='queryParams.checkType' placeholder='请选择校验类型' clearable>-->
+            <!--                <el-option v-for='dict in mes_check_type' :key='dict.value' :label='dict.label' :value='dict.value' />-->
+            <!--              </el-select>-->
+            <!--            </el-form-item>-->
+            <!--            <el-form-item label='激活标识' prop='activeFlag'>-->
+            <!--              <el-input v-model='queryParams.activeFlag' 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:materialBom:add']">新增
+            </el-button>
+          </el-col>
+          <el-col :span='1.5'>
+            <el-button type='info' plain icon='Sort' @click='handleToggleExpandAll'>展开/折叠</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch='showSearch' @queryTable='getList'></right-toolbar>
+        </el-row>
+      </template>
+      <el-table
+        ref='materialBomTableRef'
+        v-loading='loading'
+        :data='materialBomList'
+        row-key='materialName'
+        :default-expand-all='isExpandAll'
+        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+      >
+        <!--        <el-table-column label='主键标识' align='center' prop='materialBomId' />-->
+        <!--        <el-table-column label='父级标识' align='center' prop='parentId' />-->
+        <!--        <el-table-column label='物料ID' align='center' prop='materialId' />-->
+        <el-table-column label='物料名称' align='left' prop='materialName' width='300'/>
+        <el-table-column label='bom说明' align='center' prop='materialBomDesc' />
+        <el-table-column label='bom版本' align='center' prop='materialBomVersion' />
+        <!--        <el-table-column label='祖级列表' align='center' prop='ancestors' />-->
+        <el-table-column label='标准数量' align='center' prop='standardAmount' />
+        <el-table-column label='顶级标识' align='center' prop='topFlag'>
+          <template #default='scope'>
+            <dict-tag :options='active_flag' :value='scope.row.topFlag' />
+          </template>
+        </el-table-column>
+        <el-table-column label='校验类型' align='center' prop='checkType'>
+          <template #default='scope'>
+            <dict-tag :options='mes_check_type' :value='scope.row.checkType' />
+          </template>
+        </el-table-column>
+        <!--        <el-table-column label='项目ID' align='center' prop='projectId' />-->
+        <!--        <el-table-column label='装配时长(秒)' align='center' prop='assembleTime' />-->
+        <el-table-column label='物料分类' align='center' prop='materialClassfication'>
+          <template #default='scope'>
+            <dict-tag :options='material_classfication' :value='scope.row.materialClassfication' />
+          </template>
+        </el-table-column>
+        <!--        <el-table-column label='附件信息' align='center' prop='attachId' />-->
+<!--        <el-table-column label='激活标识' align='center' prop='activeFlag'>-->
+<!--          <template #default='scope'>-->
+<!--            <dict-tag :options='active_flag' :value='scope.row.activeFlag' />-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+        <el-table-column label='备注' align='center' prop='remark' />
+        <!--        <el-table-column label='创建部门' align='center' prop='createDept' />-->
+        <!--        <el-table-column label='创建人' align='center' prop='createBy' />-->
+        <!--        <el-table-column label='创建时间' align='center' prop='createTime' width='180'>-->
+        <!--          <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='updateBy' />-->
+        <!--        <el-table-column label='更新时间' align='center' prop='updateTime' width='180'>-->
+        <!--          <template #default='scope'>-->
+        <!--            <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <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:materialBom:edit']" />
+            </el-tooltip>
+            <el-tooltip content='新增' placement='top'>
+              <el-button link type='primary' icon='Plus' @click='handleAdd(scope.row)'
+                         v-hasPermi="['mes:materialBom:add']" />
+            </el-tooltip>
+            <el-tooltip content='删除' placement='top'>
+              <el-button link type='primary' icon='Delete' @click='handleDelete(scope.row)'
+                         v-hasPermi="['mes:materialBom:remove']" />
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+    <!-- 添加或修改物料BOM信息对话框 -->
+    <el-dialog :title='dialog.title' v-model='dialog.visible' width='500px' append-to-body>
+      <el-form ref='materialBomFormRef' :model='form' :rules='rules' label-width='80px'>
+        <el-form-item label='父级标识' prop='parentId'>
+          <el-tree-select
+            v-model='form.parentId'
+            :data='materialBomOptions'
+            :props="{ value: 'materialBomId', label: 'materialName', children: 'children' }"
+            value-key='materialBomId'
+            placeholder='请选择父级标识'
+            check-strictly
+          />
+        </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='bom说明' prop='materialBomDesc'>
+          <el-input v-model='form.materialBomDesc' placeholder='请输入bom说明' />
+        </el-form-item>
+        <el-form-item label='bom版本' prop='materialBomVersion'>
+          <el-input v-model='form.materialBomVersion' placeholder='请输入bom版本' />
+        </el-form-item>
+        <!--        <el-form-item label='祖级列表' prop='ancestors'>-->
+        <!--          <el-input v-model='form.ancestors' placeholder='请输入祖级列表' />-->
+        <!--        </el-form-item>-->
+        <el-form-item label='标准数量' prop='standardAmount'>
+          <el-input-number v-model='form.standardAmount' placeholder='请输入标准数量' style="width: 200px;" />
+        </el-form-item>
+        <!--        <el-form-item label='顶级标识' prop='topFlag'>-->
+        <!--          <el-input v-model='form.topFlag' placeholder='请输入顶级标识' />-->
+        <!--        </el-form-item>-->
+        <el-form-item label='校验类型' prop='checkType'>
+          <el-radio-group v-model='form.checkType'>
+            <el-radio
+              v-for='dict in mes_check_type'
+              :key='dict.value'
+              :value='dict.value'
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <!--        <el-form-item label='项目ID' prop='projectId'>-->
+        <!--          <el-input v-model='form.projectId' placeholder='请输入项目ID' />-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label='装配时长(秒)' prop='assembleTime'>-->
+        <!--          <el-input v-model='form.assembleTime' placeholder='请输入装配时长(秒)' />-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label='物料分类' prop='materialClassfication'>-->
+        <!--          <el-radio-group v-model='form.materialClassfication'>-->
+        <!--            <el-radio-->
+        <!--              v-for='dict in material_classfication'-->
+        <!--              :key='dict.value'-->
+        <!--              :value='dict.value'-->
+        <!--            >{{ dict.label }}-->
+        <!--            </el-radio>-->
+        <!--          </el-radio-group>-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label='附件信息' prop='attachId'>-->
+        <!--          <el-input v-model='form.attachId' placeholder='请输入附件信息' />-->
+        <!--        </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>
+
+    <!-- 添加物料信息对话框 -->
+    <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>
+
+  </div>
+</template>
+
+<script setup name='MaterialBom' lang='ts'>
+import {
+  listMaterialBom,
+  getMaterialBom,
+  delMaterialBom,
+  addMaterialBom,
+  updateMaterialBom
+} from '@/api/mes/materialBom';
+import { MaterialBomVO, MaterialBomQuery, MaterialBomForm } from '@/api/mes/materialBom/types';
+import MaterialSelect from '@/views/mes/baseMaterialInfo/addMaterial.vue';
+
+type MaterialBomOption = {
+  materialBomId: number;
+  materialName: string;
+  children?: MaterialBomOption[];
+}
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+;
+
+const { mes_check_type, material_classfication, active_flag } = toRefs<any>(proxy?.useDict('mes_check_type', 'material_classfication', 'active_flag'));
+
+const materialBomList = ref([]);
+const materialBomOptions = ref<MaterialBomOption[]>([]);
+const buttonLoading = ref(false);
+const showSearch = ref(true);
+const isExpandAll = ref(true);
+const loading = ref(false);
+
+const queryFormRef = ref<ElFormInstance>();
+const materialBomFormRef = ref<ElFormInstance>();
+const materialBomTableRef = ref<ElTableInstance>();
+const materialOpen = ref(false);
+const materialSelectRef = ref();
+
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+
+const initFormData: MaterialBomForm = {
+  materialBomId: undefined,
+  parentId: undefined,
+  materialId: undefined,
+  materialName: undefined,
+  materialBomDesc: undefined,
+  materialBomVersion: undefined,
+  ancestors: undefined,
+  standardAmount: 1,
+  topFlag: undefined,
+  checkType: '1',
+  projectId: undefined,
+  assembleTime: undefined,
+  materialClassfication: undefined,
+  attachId: undefined,
+  activeFlag: '0',
+  remark: undefined
+};
+
+const data = reactive<PageData<MaterialBomForm, MaterialBomQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    materialBomId: undefined,
+    parentId: undefined,
+    materialId: undefined,
+    materialName: undefined,
+    materialBomDesc: undefined,
+    materialBomVersion: undefined,
+    ancestors: undefined,
+    standardAmount: undefined,
+    topFlag: undefined,
+    checkType: undefined,
+    projectId: undefined,
+    assembleTime: undefined,
+    materialClassfication: undefined,
+    attachId: undefined,
+    activeFlag: undefined,
+    params: {}
+  },
+  rules: {
+    materialBomId: [
+      { required: true, message: '主键标识不能为空', trigger: 'blur' }
+    ],
+    parentId: [
+      { required: true, message: '父级标识不能为空', trigger: 'blur' }
+    ],
+    materialName: [
+      { required: true, message: '物料名称不能为空', trigger: 'blur' }
+    ]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询物料BOM信息列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listMaterialBom(queryParams.value);
+  const data = proxy?.handleTree<MaterialBomVO>(res.data, 'materialBomId', 'parentId');
+
+  if (data) {
+    materialBomList.value = data;
+    loading.value = false;
+  }
+};
+
+/** 查询物料BOM信息下拉树结构 */
+const getTreeselect = async () => {
+  const res = await listMaterialBom();
+  materialBomOptions.value = [];
+  const data: MaterialBomOption = { materialBomId: 0, materialName: '顶级节点', children: [] };
+  data.children = proxy?.handleTree<MaterialBomOption>(res.data, 'materialBomId', 'parentId');
+  materialBomOptions.value.push(data);
+};
+
+// 取消按钮
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+// 表单重置
+const reset = () => {
+  form.value = { ...initFormData };
+  materialBomFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 新增按钮操作 */
+const handleAdd = (row?: MaterialBomVO) => {
+  reset();
+  getTreeselect();
+  if (row != null && row.materialBomId) {
+    form.value.parentId = row.materialBomId;
+  } else {
+    form.value.parentId = 0;
+  }
+  dialog.visible = true;
+  dialog.title = '添加物料BOM信息';
+};
+
+/** 展开/折叠操作 */
+const handleToggleExpandAll = () => {
+  isExpandAll.value = !isExpandAll.value;
+  toggleExpandAll(materialBomList.value, isExpandAll.value);
+};
+
+/** 展开/折叠操作 */
+const toggleExpandAll = (data: MaterialBomVO[], status: boolean) => {
+  data.forEach((item) => {
+    materialBomTableRef.value?.toggleRowExpansion(item, status);
+    if (item.children && item.children.length > 0) toggleExpandAll(item.children, status);
+  });
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row: MaterialBomVO) => {
+  reset();
+  await getTreeselect();
+  if (row != null) {
+    form.value.parentId = row.parentId;
+  }
+  const res = await getMaterialBom(row.materialBomId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = '修改物料BOM信息';
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  materialBomFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.materialBomId) {
+        await updateMaterialBom(form.value).finally(() => buttonLoading.value = false);
+      } else {
+        await addMaterialBom(form.value).finally(() => buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess('操作成功');
+      dialog.visible = false;
+      getList();
+    }
+  });
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row: MaterialBomVO) => {
+  await proxy?.$modal.confirm('是否确认删除物料BOM信息编号为"' + row.materialBomId + '"的数据项？');
+  loading.value = true;
+  await delMaterialBom(row.materialBomId).finally(() => loading.value = false);
+  await getList();
+  proxy?.$modal.msgSuccess('删除成功');
+};
+
+/** 新增按钮操作 */
+const handleMaterialAdd = () => {
+  materialOpen.value = true;
+}
+
+/** 提交物料BOM信息按钮 */
+const submitMaterialForm = () => {
+  let selectedRow = materialSelectRef.value.tableRef.store.states.currentRow.value;
+  form.value.materialId = selectedRow.materialId
+  form.value.materialName = selectedRow.materialName
+  materialOpen.value = false;
+}
+
+onMounted(() => {
+  getList();
+});
+</script>
diff --git a/src/views/mes/orderInfo/editProductPlan.vue b/src/views/mes/orderInfo/editProductPlan.vue
index 929d2f7..71d8fab 100644
--- a/src/views/mes/orderInfo/editProductPlan.vue
+++ b/src/views/mes/orderInfo/editProductPlan.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
     <el-card>
-      <el-form :ref="form" :model="formData" :rules="rules" label-width="120px" :key="formData.productOrderId">
-        <el-divider content-position="left"><span style="font-weight: bold; font-size: larger;">工单信息</span></el-divider>
+      <el-form :model="formData" :rules="rules" label-width="120px" :key="formData.productOrderId">
+        <el-divider content-position="left"><span style="font-weight: bold; font-size: larger;">订单信息</span></el-divider>
         <el-row :gutter="10">
           <el-col :span="12">
             <el-form-item label="任务编号：">
@@ -51,45 +51,32 @@
         </el-row>
 
         <el-table
-          :ref="mesProductPlan"
           :data="mesProductPlanList"
           :row-class-name="rowMesProductPlanIndex"
           @selection-change="handleMesProductPlanSelectionChange"
-          :tree-props="{children: 'children'}"
           style="width: 100%;margin-bottom: 20px;"
           row-key="id"
           border
-          default-expand-all
         >
-          <el-table-column label="序号" type="index" align="center"></el-table-column>
-          <el-table-column
-            width="80"
-            label="删除"
-            type=""
-          >
-            <template #default="scope">
-              <el-button type="danger" icon="el-icon-delete" @click="handleDeleteMesProductPlan(scope)"
-                         v-if="scope.row.firstFlag != null && scope.row.firstFlag === '1'
-                         && formData.orderStatus!==ORDER_STATUS.FINISHED && formData.orderStatus!==ORDER_STATUS.RECALLED && formData.orderStatus!==ORDER_STATUS.DELETED">
-              </el-button>
-            </template>
-          </el-table-column>
-          <el-table-column
-            width="50"
-          ></el-table-column>
+          <el-table-column label="序号" type="index" align="center" width="60"></el-table-column>
           <el-table-column
             align="center"
             label="派工单号"
             prop="dispatchCode"
-            width="230"
+            width="180"
           >
             <template #default="scope">
-              <template v-if="!scope.row.children && !scope.row.firstFlag">
-                <!-- 子行不显示任何内容 -->
-              </template>
-              <template v-else>
-                <el-input v-model="scope.row.dispatchCode" disabled></el-input>
-              </template>
+              <el-input v-model="scope.row.dispatchCode" disabled size="small"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            label="工单编号"
+            prop="planCode"
+            width="180"
+          >
+            <template #default="scope">
+              <el-input v-model="scope.row.planCode" disabled size="small"></el-input>
             </template>
           </el-table-column>
           <el-table-column
@@ -99,26 +86,17 @@
             width="140"
           >
             <template #default="scope">
-              <template v-if="!scope.row.children && !scope.row.firstFlag">
-                <!-- 子行不显示任何内容 -->
-              </template>
-              <template v-else>
-                <el-input v-model="scope.row.processName" disabled></el-input>
-              </template>
+              <el-input v-model="scope.row.processName" disabled size="small"></el-input>
             </template>
           </el-table-column>
           <el-table-column
             align="center"
             label="步骤"
             prop="processOrder"
+            width="80"
           >
             <template #default="scope">
-              <template v-if="!scope.row.children && !scope.row.firstFlag">
-                <!-- 子行不显示任何内容 -->
-              </template>
-              <template v-else>
-                <el-input v-model="scope.row.processOrder" disabled></el-input>
-              </template>
+              <el-input v-model="scope.row.processOrder" disabled size="small"></el-input>
             </template>
           </el-table-column>
 
@@ -126,32 +104,25 @@
             align="center"
             label="派工数量"
             prop="dispatchAmount"
-            width="140"
+            width="160"
           >
             <template #default="scope">
-              <template v-if="!scope.row.children && !scope.row.firstFlag">
-                <!-- 子行不显示任何内容 -->
+              <template v-if="scope.row.newFlag === '1'">
+                <el-input-number
+                  v-model="scope.row.dispatchAmount"
+                  :min="0"
+                  :max="getMaxDispatchAmount(scope.row.dispatchCode)"
+                  :controls="true"
+                  :precision="0"
+                  style="width: 120px"
+                  :disabled="formData.orderStatus === ORDER_STATUS.FINISHED ||
+                           formData.orderStatus === ORDER_STATUS.RECALLED ||
+                           formData.orderStatus === ORDER_STATUS.DELETED"
+                  @change="handleDispatchAmountChange(scope.row)"
+                />
               </template>
               <template v-else>
-                <!-- 只有第一个新增行显示输入框 -->
-                <template v-if="scope.row.firstFlag === '1' && scope.row.newFlag === '1' && scope.row.addFlag === '1'">
-                  <el-input-number
-                    v-model="scope.row.dispatchAmount"
-                    :min="0"
-                    :controls="true"
-                    :precision="0"
-                    style="width: 120px"
-                    @change="handleDispatchAmountChange(scope.row)"
-                  />
-                </template>
-                <!-- 其他新增行不显示 -->
-                <template v-else-if="scope.row.newFlag === '1'">
-                  <!-- 不显示任何内容 -->
-                </template>
-                <!-- 非新增行显示数值 -->
-                <template v-else>
-                  <span>{{ scope.row.dispatchAmount || scope.row.releaseAmount || 0 }}</span>
-                </template>
+                <span>{{ scope.row.dispatchAmount || scope.row.releaseAmount || 0 }}</span>
               </template>
             </template>
           </el-table-column>
@@ -160,17 +131,23 @@
             align="center"
             label="工位"
             prop="releaseId"
-            width="140"
+            width="180"
           >
             <template #default="scope">
               <el-select
                 v-model="scope.row.releaseId"
-                placeholder="请选择"
-                v-if="scope.row.children == null || scope.row.children === undefined"
-                :disabled="scope.row.planId != null && scope.row.planId !== undefined && scope.row.planId !== ''"
+                placeholder="请选择工位"
+                size="small"
+                style="width: 100%"
+                :disabled="(scope.row.planId != null && scope.row.planId !== undefined && scope.row.planId !== '') ||
+                         scope.row.planStatus === PLAN_STATUS.FINISHED ||
+                         formData.orderStatus === ORDER_STATUS.FINISHED ||
+                         formData.orderStatus === ORDER_STATUS.RECALLED ||
+                         formData.orderStatus === ORDER_STATUS.DELETED"
+                clearable
               >
                 <el-option
-                  v-for="item in processStations[scope.row.processId]"
+                  v-for="item in (processStations[scope.row.processId] || [])"
                   :key="item.stationId"
                   :label="item.stationName"
                   :value="item.stationId"
@@ -179,43 +156,38 @@
               </el-select>
             </template>
           </el-table-column>
-          <el-table-column
-            align="center"
-            label="派工标准工时(小时)"
-            prop="productionTime"
-            width="180"
-          >
-            <template #default="scope">
-              <el-input-number
-                style="width:150px;"
-                :min="0"
-                v-model="scope.row.productionTime"
-                :disabled="scope.row.processType === PROCESS_TYPE.MANUAL &&
-                           scope.row.children != null &&
-                           scope.row.children !== undefined ||
-                           scope.row.planStatus === PLAN_STATUS.FINISHED ||
-                           formData.orderStatus === ORDER_STATUS.FINISHED ||
-                           formData.orderStatus === ORDER_STATUS.RECALLED ||
-                           formData.orderStatus === ORDER_STATUS.DELETED"
-                @change="handleProductionTimeChange(scope.row)"
-              >
-              </el-input-number>
-            </template>
-          </el-table-column>
+<!--          <el-table-column-->
+<!--            align="center"-->
+<!--            label="派工标准工时(小时)"-->
+<!--            prop="productionTime"-->
+<!--            width="180"-->
+<!--          >-->
+<!--            <template #default="scope">-->
+<!--              <el-input-number-->
+<!--                style="width:150px;"-->
+<!--                :min="0"-->
+<!--                v-model="scope.row.productionTime"-->
+<!--                :disabled="scope.row.planStatus === PLAN_STATUS.FINISHED ||-->
+<!--                           formData.orderStatus === ORDER_STATUS.FINISHED ||-->
+<!--                           formData.orderStatus === ORDER_STATUS.RECALLED ||-->
+<!--                           formData.orderStatus === ORDER_STATUS.DELETED"-->
+<!--                @change="handleProductionTimeChange(scope.row)"-->
+<!--              >-->
+<!--              </el-input-number>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
           <el-table-column
             align="center"
             label="计划开始时间"
             prop="planBeginTime"
-            width="230"
+            width="200"
           >
             <template #default="scope">
               <el-date-picker
                 v-model="scope.row.planBeginTime"
-                style="width:200px;"
-                :disabled="scope.row.processType === PROCESS_TYPE.MANUAL &&
-                           scope.row.children != null &&
-                           scope.row.children !== undefined ||
-                           scope.row.planStatus === PLAN_STATUS.FINISHED ||
+                style="width:100%;"
+                size="small"
+                :disabled="scope.row.planStatus === PLAN_STATUS.FINISHED ||
                            formData.orderStatus === ORDER_STATUS.FINISHED ||
                            formData.orderStatus === ORDER_STATUS.RECALLED ||
                            formData.orderStatus === ORDER_STATUS.DELETED"
@@ -232,16 +204,14 @@
             align="center"
             label="计划结束时间"
             prop="planEndTime"
-            width="230"
+            width="200"
           >
             <template #default="scope">
               <el-date-picker
                 v-model="scope.row.planEndTime"
-                style="width:200px;"
-                :disabled="scope.row.processType === PROCESS_TYPE.MANUAL &&
-                           scope.row.children != null &&
-                           scope.row.children !== undefined ||
-                           scope.row.planStatus === PLAN_STATUS.FINISHED ||
+                style="width:100%;"
+                size="small"
+                :disabled="scope.row.planStatus === PLAN_STATUS.FINISHED ||
                            formData.orderStatus === ORDER_STATUS.FINISHED ||
                            formData.orderStatus === ORDER_STATUS.RECALLED ||
                            formData.orderStatus === ORDER_STATUS.DELETED"
@@ -265,28 +235,24 @@
             </template>
           </el-table-column>
           <el-table-column
-            align="center"
-            class-name="small-padding fixed-width"
+            width="80"
             label="操作"
-            width="100"
+            align="center"
           >
             <template #default="scope">
               <el-button
+                type="danger"
                 icon="el-icon-delete"
                 size="small"
-                type="danger"
-                @click="handleDeleteDispatchUser(scope.row)"
-                v-if="scope.row.children == null"
-                :disabled="scope.row.planStatus !== PLAN_STATUS.TO_DISPATCH &&
-                           scope.row.planStatus !== PLAN_STATUS.DISPATCHED ||
-                           formData.orderStatus === ORDER_STATUS.FINISHED ||
-                           formData.orderStatus === ORDER_STATUS.RECALLED ||
-                           formData.orderStatus === ORDER_STATUS.DELETED"
-              >
-                删除
+                @click="handleDeleteMesProductPlan(scope)"
+                v-if="scope.row.newFlag === '1' &&
+                      formData.orderStatus!==ORDER_STATUS.FINISHED &&
+                      formData.orderStatus!==ORDER_STATUS.RECALLED &&
+                      formData.orderStatus!==ORDER_STATUS.DELETED">
               </el-button>
             </template>
           </el-table-column>
+
         </el-table>
       </el-form>
 
@@ -312,16 +278,14 @@ import { reactive, onMounted, ref } from 'vue'
 import { useRouter, useRoute } from 'vue-router'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getOrderInfo } from '@/api/mes/orderInfo'
-import { getBaseRouteProcesses, getDispatchCode, selectProductPlans, orderAddProductPlanList } from '@/api/mes/planInfo'
-import { getProdBaseProcessUserList } from '@/api/mes/prodBaseProcessUser'
+import { getBaseRouteProcesses, getDispatchCode, getPlanCode, selectProductPlans, orderAddProductPlanList } from '@/api/mes/planInfo'
 import { getStationInfoList } from '@/api/mes/baseStationInfo'
-import { getProdLineList } from '@/api/mes/baseProdLineInfo'
-import { getBaseRouteList } from '@/api/mes/baseRoute'
-import { getProcessInfoList } from '@/api/mes/baseProcessInfo'
-import { PlanInfoVO, PlanInfoQuery, PlanInfoForm } from '@/api/mes/planInfo/types';
 
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const router = useRouter()
-const route = useRoute()
+const route = useRoute();
+
 
 const ORDER_STATUS = {
   FINISHED: '2',   // 已完成
@@ -351,12 +315,9 @@ const orderStatusTextMap = {
   '9': '已删除'
 }
 
-const deepClone = (obj) => {
-  return JSON.parse(JSON.stringify(obj))
-}
 
 const formData = ref({
-  orderStatus: '', 
+  orderStatus: '',
   dispatchId: '',
   planBeginTime: '',
   planEndTime: '',
@@ -368,7 +329,15 @@ const formData = ref({
   saleOrderId: '',
   saleorderCode: '',
   productionTime: '',
-})
+  orderCode: '',
+  materialCode: '',
+  materialName: '',
+  dispatchName: '',
+  planAmount: 0,
+  dispatchAmount: 0,
+  completeAmount: 0,
+  routeId: '',
+} as any)
 
 const mesProductPlanList = ref([])
 const processStations = ref([])
@@ -381,12 +350,11 @@ const rules = ref({
   materialCode: [
     { required: true, message: '请输入成品编码', trigger: 'blur' }
   ],
-
   planAmount: [
     { required: true, message: '请输入计划数量', trigger: 'blur' },
-    { type: 'number', message: '计划数量必须为数字' }
+    { type: 'number' as const, message: '计划数量必须为数字' }
   ]
-})
+} as any)
 
 const getOrderStatusText = (status) => {
   return orderStatusTextMap[status] || `未知状态(${status})`
@@ -399,33 +367,33 @@ const fetchOrderInfo = async (productOrderId) => {
     // console.log('Order info response', response)
 
     if (response.code === 200 && response.data) {
+      const data = response.data as any
       Object.assign(formData.value, {
-        orderCode: response.data.orderCode,
-        materialCode: response.data.materialCode,
-        planBeginTime: response.data.planBeginTime,
-        planEndTime: response.data.planEndTime,
-        planAmount: Number(response.data.planAmount || 0),
-        dispatchAmount: Number(response.data.dispatchAmount || 0),
-        completeAmount: Number(response.data.completeAmount || 0),
-        dispatchName: response.data.dispatchName,
-        materialName: response.data.materialName,
-        orderStatus: response.data.orderStatus,
-        productOrderId: response.data.productOrderId,
-        materialId: response.data.materialId,
-        materialBomId: response.data.materialBomId,
-        saleOrderId: response.data.saleOrderId || '',
-        saleorderCode: response.data.saleorderCode || '',
-        dispatchId: response.data.dispatchId || response.data.routeId,
-        productionTime: response.data.productionTime,
+        orderCode: data.orderCode,
+        materialCode: data.materialCode || '',
+        planBeginTime: data.planBeginTime,
+        planEndTime: data.planEndTime,
+        planAmount: Number(data.planAmount || 0),
+        dispatchAmount: Number(data.dispatchAmount || 0),
+        completeAmount: Number(data.completeAmount || 0),
+        dispatchName: data.dispatchName || '',
+        materialName: data.materialName || '',
+        orderStatus: data.orderStatus,
+        productOrderId: data.productOrderId,
+        materialId: data.materialId,
+        materialBomId: data.materialBomId,
+        saleOrderId: data.saleOrderId || '',
+        saleorderCode: data.saleorderCode || '',
+        dispatchId: data.dispatchId || data.routeId || '',
+        productionTime: data.productionTime || '',
       })
-      // console.log('Form after update', JSON.stringify(formData.value, null, 2))
       await getProcessJoin(productOrderId)
     } else {
       ElMessage.error('获取工单信息失败：数据为空')
     }
-  } catch (error) {
+  } catch (error: any) {
     console.error('Failed to fetch order info', error)
-    ElMessage.error('获取工单信息失败：' + error.message)
+    ElMessage.error('获取工单信息失败：' + (error?.message || '未知错误'))
   }
 }
 
@@ -436,7 +404,7 @@ const getProcessJoin = async (productOrderId) => {
       throw new Error('获取工位信息失败')
     }
 
-     processStations.value = {}
+     processStations.value = {} as any
 
     stationResponse.data.forEach(station => {
       if (!processStations.value[station.processId]) {
@@ -454,97 +422,55 @@ const getProcessJoin = async (productOrderId) => {
 
     await groupProductPlans(productPlansResponse.data)
 
-    // console.log('Process stations', processStations.value)
-    // console.log('Product plans', mesProductPlanList.value)
-  } catch (error) {
+  } catch (error: any) {
     console.error('Failed to fetch process info', error)
-    ElMessage.error('获取工序信息失败：' + error.message)
+    ElMessage.error('获取工序信息失败：' + (error?.message || '未知错误'))
   }
 }
 
 const groupProductPlans = async (productPlans) => {
-  const groupedProductPlans = {}
-  let id = 1
-  let firstDispatch = {}
+  mesProductPlanList.value = []
 
   productPlans.forEach(productPlan => {
     // 确保派工数量有值
     productPlan.dispatchAmount = productPlan.dispatchAmount || productPlan.releaseAmount || 0
 
-    const key = `${productPlan.dispatchCode}-${productPlan.processId}`
-    if (!groupedProductPlans[key]) {
-      groupedProductPlans[key] = []
+    // 如果后端返回的是秒，需要转换为小时显示
+    if (productPlan.productionTime) {
+      productPlan.productionTime = parseFloat((productPlan.productionTime / 3600).toFixed(1));
+      productPlan.processProductionTime = productPlan.productionTime * 3600;
     }
-    groupedProductPlans[key].push(productPlan)
+
+    const planRow: any = {
+      id: productPlan.planId || `temp_${Date.now()}_${Math.random()}`,
+      planId: productPlan.planId,
+      dispatchCode: productPlan.dispatchCode,
+      planCode: productPlan.planCode,
+      dispatchAmount: productPlan.dispatchAmount,
+      processId: productPlan.processId,
+      processName: productPlan.processName,
+      processType: productPlan.processType,
+      processOrder: productPlan.processOrder,
+      lastProcessId: productPlan.lastProcessId,
+      finalProcessFlag: productPlan.finalProcessFlag,
+      productionTime: productPlan.productionTime || 0,
+      processProductionTime: productPlan.processProductionTime || 0,
+      planBeginTime: productPlan.planBeginTime || formData.value.planBeginTime || '',
+      planEndTime: productPlan.planEndTime || formData.value.planEndTime || '',
+      planStatus: productPlan.planStatus,
+      materialId: productPlan.materialId || formData.value.materialId,
+      materialBomId: productPlan.materialBomId || formData.value.materialBomId,
+      productOrderId: productPlan.productOrderId || formData.value.productOrderId,
+      saleOrderId: productPlan.saleOrderId || formData.value.saleOrderId || null,
+      saleorderCode: productPlan.saleorderCode || formData.value.saleorderCode || '',
+      releaseId: productPlan.releaseId || null,
+      attachId: productPlan.attachId || null,
+      newFlag: '0', // 已保存的数据
+      oldRowFlag: true
+    }
+
+    mesProductPlanList.value.push(planRow)
   })
-
-  for (let dispatchCodeProcessId in groupedProductPlans) {
-    let productPlansByDispatch = groupedProductPlans[dispatchCodeProcessId]
-
-    let obj = {}
-
-    let dispatchCode = dispatchCodeProcessId.split('-')[0]
-    if (!firstDispatch[dispatchCode]) {
-      firstDispatch[dispatchCode] = 1
-      obj.firstFlag = 1
-    }
-
-    obj.id = id++
-    obj.addFlag = 0
-    let i = 0
-    let processType
-    productPlansByDispatch.forEach(groupedProductPlan => {
-      if (groupedProductPlan.planStatus !== PLAN_STATUS.FINISHED) {
-        obj.addFlag = 1
-      }
-
-      processType = groupedProductPlan.processType
-      groupedProductPlan.id = id++
-
-      // 如果后端返回的是秒，需要转换为小时显示
-      if (groupedProductPlan.productionTime) {
-        groupedProductPlan.productionTime = parseFloat((groupedProductPlan.productionTime / 3600).toFixed(1));
-        groupedProductPlan.processProductionTime = groupedProductPlan.productionTime * 3600;
-      }
-
-      obj.attachId = groupedProductPlan.attachId
-      obj.productionTime = groupedProductPlan.productionTime
-      obj.processProductionTime = groupedProductPlan.processProductionTime
-
-      if (i === 0) {
-        obj.dispatchCode = groupedProductPlan.dispatchCode
-        obj.planCode = groupedProductPlan.planCode
-        obj.dispatchAmount = groupedProductPlan.dispatchAmount
-        obj.processId = groupedProductPlan.processId
-        obj.processName = groupedProductPlan.processName
-        obj.lastProcessId = groupedProductPlan.lastProcessId
-        obj.processType = groupedProductPlan.processType
-        obj.processOrder = groupedProductPlan.processOrder
-        obj.finalProcessFlag = groupedProductPlan.finalProcessFlag
-        obj.attachId = groupedProductPlan.attachId
-        obj.planBeginTime = formData.value.planBeginTime
-        obj.planEndTime = formData.value.planEndTime
-        obj.planStatus = groupedProductPlan.planStatus
-        obj.materialId = formData.value.materialId
-        obj.materialBomId = formData.value.materialBomId
-        obj.productOrderId = formData.value.productOrderId
-        obj.saleOrderId = formData.value.saleOrderId
-        obj.saleorderCode = formData.value.saleorderCode
-        obj.productionTime = formData.value.productionTime
-        obj.oldRowFlag = true
-        i++
-      }
-    })
-
-    if (processType === PROCESS_TYPE.MANUAL) {
-      obj.children = productPlansByDispatch
-      mesProductPlanList.value.push(obj)
-    } else {
-      mesProductPlanList.value.push(obj)
-    }
-  }
-
-  // console.log('Grouped plans:', mesProductPlanList.value)
 }
 
 const loading = ref(false);
@@ -560,130 +486,177 @@ const submitForm = async () => {
   try {
     loading.value = true;
     const dataList = mesProductPlanList.value;
-    const toUpdatedProductPlans: PlanInfoForm[] = [];
-    let currentDispatchAmount = 0;
+    const toUpdatedProductPlans: any[] = [];
 
     // 只处理新增的数据（newFlag === '1'的数据）
-    const newPlans = dataList.filter(plan => plan.newFlag === '1');
+    const newPlans = dataList.filter((plan: any) => plan.newFlag === '1');
 
     if (newPlans.length === 0) {
       ElMessage.info('无新增派工数据需要提交');
       return;
     }
 
-    for (let productPlan of newPlans) {
-      // 如果是手动工序且有子行，则从子行获取数据
-      if (productPlan.processType === PROCESS_TYPE.MANUAL && productPlan.children?.length > 0) {
-        // 获取第一个子行的数据
-        const childPlan = productPlan.children[0];
+    // 按dispatchCode分组，校验每个组的派工数量
+    const groupMap = new Map<string, any[]>()
+    newPlans.forEach((plan: any) => {
+      const dispatchCode = plan.dispatchCode
+      if (!groupMap.has(dispatchCode)) {
+        groupMap.set(dispatchCode, [])
+      }
+      groupMap.get(dispatchCode)!.push(plan)
+    })
 
+    // 校验相同processName的工序派工数量之和不能大于计划数量
+    const processNameMap = new Map<string, number>()
+    newPlans.forEach((plan: any) => {
+      const processName = plan.processName || ''
+      const dispatchAmount = Number(plan.dispatchAmount || 0)
+      const currentSum = processNameMap.get(processName) || 0
+      processNameMap.set(processName, currentSum + dispatchAmount)
+    })
 
-
-        if (childPlan.planBeginTime > childPlan.planEndTime) {
-          ElMessage.error(`工序 ${productPlan.processName} 的计划开始时间不能大于结束时间`);
-          return;
-        }
-
-        currentDispatchAmount += Number(productPlan.dispatchAmount || 0);
-
-        const stationData = productPlan.children.map(child => ({
-          releaseId: Number(child.releaseId),
-          processId: child.processId || productPlan.processId
-        })).filter(item => item.releaseId);
-
-        if (productPlan.children.length !== stationData.length) {
-          ElMessage.error('请为所有工序选择工位');
-          return;
-        }
-
-        // 构建提交数据前再次确认时间值
-        const planBeginTime = childPlan.planBeginTime?.trim() || '';
-        const planEndTime = childPlan.planEndTime?.trim() || '';
-
-
-        const planData: PlanInfoForm = {
-          dispatchCode: productPlan.dispatchCode,
-          dispatchAmount: Number(productPlan.dispatchAmount),
-          processId: Number(productPlan.processId),
-          productionTime: productPlan.processProductionTime ||
-            Math.round(Number(productPlan.productionTime || 0) * 3600),
-          // 使用子行的时间数据
-          planBeginTime: planBeginTime || null,
-          planEndTime: planEndTime || null,
-          planStatus: PLAN_STATUS.TO_DISPATCH,
-          materialId: Number(formData.value.materialId),
-          materialBomId: Number(formData.value.materialBomId),
-          productOrderId: Number(formData.value.productOrderId),
-          saleOrderId: formData.value.saleOrderId ? Number(formData.value.saleOrderId) : undefined,
-          saleorderCode: formData.value.saleorderCode,
-          releaseId: stationData.map(item => item.releaseId).join(','),
-          planCode: productPlan.planCode,
-          processOrder: Number(productPlan.processOrder),
-          lastProcessId: Number(productPlan.lastProcessId),
-          finalProcessFlag: productPlan.finalProcessFlag,
-          attachId: productPlan.attachId,
-          releaseType: '3',
-          planAmount: Number(formData.value.planAmount),
-        };
-
-        toUpdatedProductPlans.push(planData);
-      } else {
-        // 自动工序直接使用当前行的时间数据
-        if (!productPlan.planBeginTime || !productPlan.planEndTime) {
-          ElMessage.error(`工序 ${productPlan.processName} 的计划开始时间和结束时间不能为空`);
-          return;
-        }
-
-        // ... 处理自动工序的其他逻辑 ...
+    const planAmount = Number(formData.value.planAmount || 0)
+    for (const [processName, totalAmount] of processNameMap.entries()) {
+      if (totalAmount > planAmount) {
+        ElMessage.error(`工序 ${processName} 的派工数量之和 ${totalAmount} 超过计划数量 ${planAmount}`)
+        loading.value = false
+        return
       }
     }
 
-    if (currentDispatchAmount === 0) {
-      ElMessage.error('派工数量必须大于0');
-      return;
+    // 处理每个工序的数据
+    for (const productPlan of newPlans) {
+      // 验证工序基本信息
+      if (!productPlan.processId) {
+        ElMessage.error(`工序信息不完整`)
+        loading.value = false
+        return
+      }
+
+      // 获取该工序的派工数量（单个工序的数量）
+      let dispatchAmount = Number(productPlan.dispatchAmount || 0)
+
+
+
+      // 验证时间
+      if (!productPlan.planBeginTime || !productPlan.planEndTime) {
+        ElMessage.error(`工序 ${productPlan.processName || productPlan.processId} 的计划开始时间和结束时间不能为空`)
+        loading.value = false
+        return
+      }
+
+      const planBeginTime = String(productPlan.planBeginTime).trim()
+      const planEndTime = String(productPlan.planEndTime).trim()
+
+      if (!planBeginTime || !planEndTime) {
+        ElMessage.error(`工序 ${productPlan.processName || productPlan.processId} 的计划时间不能为空`)
+        loading.value = false
+        return
+      }
+
+      if (planBeginTime >= planEndTime) {
+        ElMessage.error(`工序 ${productPlan.processName || productPlan.processId} 的计划开始时间必须小于结束时间`)
+        loading.value = false
+        return
+      }
+
+      // 验证工位选择（每个工序都需要选择工位）
+      if (!productPlan.releaseId) {
+        ElMessage.error(`工序 ${productPlan.processName || productPlan.processId} 必须选择工位`)
+        loading.value = false
+        return
+      }
+
+      // 计算生产时间（秒）
+      const productionTimeSeconds = productPlan.processProductionTime
+        ? Number(productPlan.processProductionTime)
+        : (productPlan.productionTime
+            ? Math.round(Number(productPlan.productionTime) * 3600)
+            : 0)
+
+      // 构建提交数据（每个工序使用自己的派工数量）
+      const planData: any = {
+        dispatchCode: String(productPlan.dispatchCode),
+        dispatchAmount: dispatchAmount, // 每个工序使用自己的派工数量
+        processId: Number(productPlan.processId),
+        productionTime: productionTimeSeconds,
+        planBeginTime: planBeginTime,
+        planEndTime: planEndTime,
+        planStatus: PLAN_STATUS.TO_DISPATCH,
+        materialId: Number(formData.value.materialId),
+        materialBomId: Number(formData.value.materialBomId),
+        productOrderId: Number(formData.value.productOrderId),
+        saleOrderId: formData.value.saleOrderId ? Number(formData.value.saleOrderId) : null,
+        saleorderCode: formData.value.saleorderCode || '',
+        releaseId: String(productPlan.releaseId), // 每个工序对应一个工位
+        planCode: productPlan.planCode || '',
+        processOrder: Number(productPlan.processOrder || 0),
+        lastProcessId: productPlan.lastProcessId ? Number(productPlan.lastProcessId) : null,
+        finalProcessFlag: productPlan.finalProcessFlag || '0',
+        attachId: productPlan.attachId || null,
+        releaseType: '3', // 工位类型
+        planAmount: Number(dispatchAmount || 0),
+      }
+
+      // 移除undefined字段，确保数据干净
+      Object.keys(planData).forEach(key => {
+        if (planData[key] === undefined) {
+          delete planData[key]
+        }
+      })
+
+      toUpdatedProductPlans.push(planData)
     }
 
-    const totalDispatchAmount = Number(formData.value.dispatchAmount || 0) + currentDispatchAmount;
-    if (totalDispatchAmount > formData.value.planAmount) {
-      ElMessage.error('派工数量之和需小于等于该生产任务计划数量！');
-      return;
-    }
+    // 计算所有新增工序的派工数量总和（用于订单级别的dispatchAmount）
+    // 总的派工数量 = 每个工序的派工数量之和
+    const totalDispatchAmount = toUpdatedProductPlans.reduce((sum, plan: any) => sum + Number(plan.dispatchAmount || 0), 0)
 
+    // 构建提交数据
     const submitData = {
       productOrderId: Number(formData.value.productOrderId),
-      dispatchAmount: currentDispatchAmount,
+      dispatchAmount: totalDispatchAmount,
       mesProductPlanList: toUpdatedProductPlans,
-      toDeletedPlanIds: toDeletedPlanIds.value || []
+      toDeletedPlanIds: toDeletedPlanIds.value && toDeletedPlanIds.value.length > 0 ? toDeletedPlanIds.value : []
     };
 
+    console.log('提交数据:', JSON.stringify(submitData, null, 2))
+
     const res = await orderAddProductPlanList(submitData);
+
     if (res.code === 200) {
       ElMessage.success('提交成功');
-      await fetchOrderInfo(formData.value.productOrderId);
+      // await fetchOrderInfo(formData.value.productOrderId);
       close();
     } else {
-      throw new Error(res.msg || '提交失败');
+      throw new Error((res as any).msg || '提交失败');
     }
-  } catch (error) {
+  } catch (error: any) {
     console.error('提交异常', error);
-    ElMessage.error(error.message || '提交失败，请重试');
+    const errorMessage = error?.response?.data?.msg || error?.message || '提交失败，请重试';
+    ElMessage.error(errorMessage);
   } finally {
     loading.value = false;
   }
 }
 
-const rowMesProductPlanIndex = ({row, rowIndex}) => {
+const rowMesProductPlanIndex = ({row, rowIndex}: any): string => {
   row.index = rowIndex + 1
+  return ''
 }
 
+const checkedMesProductPlanList = ref([])
+const single = ref(true)
+
 const handleMesProductPlanSelectionChange = (selection) => {
-  checkedMesProductPlanList = selection
-  single = selection.length !== 1
+  checkedMesProductPlanList.value = selection
+  single.value = selection.length !== 1
 }
 
 const close = () => {
   mesProductPlanList.value = []
-  router.back()
+  proxy.$tab.closePage(route);
+  router.go(-1);
 }
 
 let id = 1
@@ -694,6 +667,11 @@ const handleAddMesProductPlan = async () => {
     return
   }
 
+  if (!formData.value?.materialId || !formData.value?.materialBomId) {
+    ElMessage.error('未获取到物料信息，请先完善生产订单信息')
+    return
+  }
+
   try {
     // 获取派工单号
     const { msg: dispatchCode } = await getDispatchCode()
@@ -711,58 +689,52 @@ const handleAddMesProductPlan = async () => {
       return
     }
 
-    processes.forEach((process, index) => {
-      const isFirstProcess = index === 0
-      const basePlan = {
-        id: ++id,
-        dispatchCode,
+    // 为每个工序创建一行，每个工序都需要选择工位，每个工序生成不同的工单编号
+    for (const process of processes) {
+      // 为每个工序生成不同的工单编号
+      const planCodeRes = await getPlanCode()
+      // 兼容不同的返回格式：data 或 msg
+      const planCode = planCodeRes.data || planCodeRes.msg || ''
+
+      if (!planCode) {
+        throw new Error('获取工单编号失败')
+      }
+
+      const basePlan: any = {
+        id: `new_${Date.now()}_${++id}`,
+        dispatchCode, // 同一批次使用相同的派工单号
+        planCode, // 每个工序使用不同的工单编号
         processId: process.processId,
         processName: process.processName,
         processType: process.processType,
         processOrder: process.processOrder,
+        lastProcessId: process.lastProcessId || null,
         finalProcessFlag: process.finalProcessFlag,
         productionTime: 0,
         processProductionTime: 0,
-        planBeginTime: '',
-        planEndTime: '',
-        planStatus: '1',
-        materialId: formData.saleType === '2' ? formData.produceMaterialId : formData.materialId,
-        materialBomId: formData.materialBomId,
-        productOrderId: formData.productOrderId,
-        saleOrderId: formData.saleOrderId,
-        saleorderCode: formData.saleorderCode,
+        planBeginTime: formData.value.planBeginTime || '',
+        planEndTime: formData.value.planEndTime || '',
+        planStatus: PLAN_STATUS.TO_DISPATCH,
+        materialId: formData.value.materialId,
+        materialBomId: formData.value.materialBomId,
+        productOrderId: formData.value.productOrderId,
+        saleOrderId: formData.value.saleOrderId || null,
+        saleorderCode: formData.value.saleorderCode || '',
         newFlag: '1',
-        dispatchAmount: 0,
-        firstFlag: isFirstProcess ? '1' : '0',
+        dispatchAmount: Number(formData.value.planAmount || 0), // 初始派工数量设为计划数量
         oldRowFlag: false,
-        addFlag: isFirstProcess ? '1' : '0'
-      }
-
-      // 添加工位选择行
-      if (process.processType !== '3') { // 不是自动工序时添加工位选择行
-        basePlan.children = [{
-          id: ++id,
-          dispatchCode,
-          processId: process.processId,
-          materialBomId: formData.materialBomId,
-          planStatus: '1',
-          productionTime: 0,
-          processProductionTime: 0,
-          userId: null,
-          dispatchAmount: 0,
-          oldRowFlag: false,
-          newFlag: '1'
-        }]
-      } else {
-        basePlan.children = []
+        releaseId: null, // 每个工序都需要选择工位
+        attachId: null,
+        planId: null
       }
 
       mesProductPlanList.value.push(basePlan)
-    })
+    }
 
-  } catch (error) {
+    ElMessage.success('新增派工计划成功，请填写派工数量和时间信息')
+  } catch (error: any) {
     console.error('新增派工计划失败:', error)
-    ElMessage.error(error.message || '新增派工计划失败')
+    ElMessage.error(error?.message || '新增派工计划失败')
   }
 }
 
@@ -775,23 +747,6 @@ const updateMaxId = (list) => {
   })
 }
 
-const isPositiveInteger = (value) => {
-  return /^[0-9]d$/.test(value)
-}
-
-const handleDeleteDispatchUser = (row) => {
-  mesProductPlanList.value.forEach(mesProductPlan => {
-    mesProductPlan.children = mesProductPlan.children.filter(item => item.id !== row.id)
-  })
-  if (row.planId != null && row.planId !== '') {
-    toDeletedPlanIds.value.push(row.planId)
-  }
-}
-
-// const isOptionDisabled = (attachId) => {
-//   return materialBomAttachIdList.value.includes(attachId)
-// }
-
 const handleDeleteMesProductPlan = (scope) => {
   const dispatchCode = scope.row.dispatchCode
 
@@ -816,7 +771,8 @@ const handleDeleteMesProductPlan = (scope) => {
     }
 
     if (scope.row.newFlag != null && scope.row.newFlag === '1') {
-      mesProductPlanList.value = mesProductPlanList.value.filter(item =>
+      // 删除同一派工单号的所有新增工序
+      mesProductPlanList.value = mesProductPlanList.value.filter((item: any) =>
         scope.row.dispatchCode !== item.dispatchCode
       )
       ElMessage.success('删除成功')
@@ -826,7 +782,7 @@ const handleDeleteMesProductPlan = (scope) => {
     let dispatchSum = 0
 
     try {
-      const plansToDelete = mesProductPlanList.value.filter(item =>
+      const plansToDelete = mesProductPlanList.value.filter((item: any) =>
         scope.row.dispatchCode === item.dispatchCode
       )
 
@@ -838,38 +794,18 @@ const handleDeleteMesProductPlan = (scope) => {
         dispatchSum = item.dispatchAmount
       }
 
-/*      deleteProductPlansByDispatchCode({
-        productOrderId: formData.value.productOrderId,
-        dispatchCode: dispatchCode,
-        dispatchAmount: dispatchSum
-      }).then(() => {
-        mesProductPlanList.value = mesProductPlanList.value.filter(item =>
-          dispatchCode !== item.dispatchCode
-        )
-        formData.value.dispatchAmount = formData.value.dispatchAmount - dispatchSum
-        ElMessage.success('删除成功')
-      })*/
-    } catch (error) {
-      ElMessage.error(error.message)
-    }
+
+      } catch (error: any) {
+        ElMessage.error(error?.message || '删除失败')
+      }
   }).catch(() => {
     // 用户取消删除，不做处理
   })
 }
 
-const handleStationChange = (value, scope) => {
-  const parentPlan = mesProductPlanList.value.find(
-    plan => plan.dispatchCode === scope.row.dispatchCode
-  );
-  if (parentPlan) {
-    parentPlan.releaseId = value;
-  }
-}
 
 // 处理标准工时变化的函数
 const handleProductionTimeChange = (row) => {
-  // console.log('工时变化前:', row.productionTime);
-
   // 保存用户输入的小时数
   row.productionTime = Number(row.productionTime || 0);
   // 转换为秒
@@ -884,14 +820,47 @@ const handleProductionTimeChange = (row) => {
     parentRow.productionTime = row.productionTime;
     parentRow.processProductionTime = row.processProductionTime;
   }
-
-  // console.log('工时变化后:', {
-  //   小时: row.productionTime,
-  //   秒: row.processProductionTime,
-  //   行数据: row
-  // });
 }
 
+// 获取同一组（相同dispatchCode）的最大派工数量
+// 最大数量 = 订单计划数量 - 已派工数量 - 其他新增组的派工数量
+const getMaxDispatchAmount = (dispatchCode: string) => {
+  const planAmount = Number(formData.value.planAmount || 0)
+  const currentDispatchAmount = Number(formData.value.dispatchAmount || 0)
+
+  // 计算其他新增组的派工数量总和
+  let otherGroupsAmount = 0
+  mesProductPlanList.value.forEach((plan: any) => {
+    if (plan.newFlag === '1' && plan.dispatchCode !== dispatchCode) {
+      // 获取该组第一个工序的派工数量（因为同一组内数量一致）
+      const groupFirstPlan = mesProductPlanList.value.find((p: any) =>
+        p.newFlag === '1' && p.dispatchCode === plan.dispatchCode
+      )
+      if (groupFirstPlan) {
+        otherGroupsAmount += Number(groupFirstPlan.dispatchAmount || 0)
+      }
+    }
+  })
+
+  // 最大可派工数量 = 计划数量 - 已派工数量 - 其他新增组的派工数量
+  const maxAmount = planAmount - currentDispatchAmount - otherGroupsAmount
+  return Math.max(0, maxAmount)
+}
+
+// 处理派工数量变化，确保同一组内所有工序的派工数量保持一致
+const handleDispatchAmountChange = (changedRow: any) => {
+  const dispatchCode = changedRow.dispatchCode
+  const newAmount = Number(changedRow.dispatchAmount || 0)
+
+  // 找到同一组内的所有新增工序，同步派工数量
+  mesProductPlanList.value.forEach((plan: any) => {
+    if (plan.newFlag === '1' && plan.dispatchCode === dispatchCode && plan.id !== changedRow.id) {
+      plan.dispatchAmount = newAmount
+    }
+  })
+}
+
+
 onMounted(async () => {
   // console.log('Component mounted, route', route)
   const productOrderId = route.params.productOrderId || route.query.productOrderId
diff --git a/src/views/mes/orderInfo/index.vue b/src/views/mes/orderInfo/index.vue
index 65a8b93..4835970 100644
--- a/src/views/mes/orderInfo/index.vue
+++ b/src/views/mes/orderInfo/index.vue
@@ -80,32 +80,44 @@
 
       <el-table v-loading='loading' :data='orderInfoList' @selection-change='handleSelectionChange'>
         <el-table-column type='selection' width='55' align='center' />
-        <el-table-column label='主键标识' align='center' prop='productOrderId' v-if='columns[0].visible' />
-        <el-table-column label='订单编号' align='center' prop='orderCode' v-if='columns[2].visible' />
-        <el-table-column label='销售订单ID' align='center' prop='saleOrderId' v-if='columns[3].visible' />
-        <el-table-column label='项目编号' align='center' prop='projectNo' v-if='columns[4].visible' />
-        <el-table-column label='订单类型' align='center' prop='orderType' v-if='columns[5].visible'>
+        <el-table-column label='主键标识' align='center' prop='productOrderId' v-if='columns[0].visible' width='100' />
+        <el-table-column label='订单编号' align='center' prop='orderCode' v-if='columns[2].visible' width='150' show-overflow-tooltip />
+        <el-table-column label='销售订单ID' align='center' prop='saleOrderId' v-if='columns[3].visible' width='120' />
+        <el-table-column label='项目编号' align='center' prop='projectNo' v-if='columns[4].visible' width='120' show-overflow-tooltip />
+        <el-table-column label='订单类型' align='center' prop='orderType' v-if='columns[5].visible' width='100'>
           <template #default='scope'>
             <dict-tag :options='mes_order_type' :value='scope.row.orderType' />
           </template>
         </el-table-column>
-        <el-table-column label='成品名称' align='center' prop='materialName' v-if='columns[6].visible' width='160' />
-        <el-table-column label='物料BOM' align='center' prop='materialBomId' v-if='columns[7].visible' width='100' />
-        <el-table-column label='派工类型' align='center' prop='dispatchType' v-if='columns[8].visible'>
+        <el-table-column label='成品名称' align='center' prop='materialName' v-if='columns[6].visible' width='180' show-overflow-tooltip />
+        <el-table-column label='物料BOM' align='center' prop='materialBomId' v-if='columns[7].visible' width='200' show-overflow-tooltip>
+          <template #default='scope'>
+            <span v-if='scope.row.materialName && scope.row.materialBomVersion'>
+              {{ scope.row.materialName + '_' + scope.row.materialBomVersion }}
+            </span>
+            <span v-else-if='scope.row.materialName'>
+              {{ scope.row.materialName }}
+            </span>
+            <span v-else>
+              {{ scope.row.materialBomId || '-' }}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column label='派工类型' align='center' prop='dispatchType' v-if='columns[8].visible' width='100'>
           <template #default='scope'>
             <dict-tag :options='mes_dispatch_type' :value='scope.row.dispatchType' />
           </template>
         </el-table-column>
-        <el-table-column :label='dispatchTypeName' align='center' prop='dispatchName' v-if='columns[9].visible' />
-        <el-table-column label='销售数量' align='center' prop='saleAmount' v-if='columns[10].visible' />
+        <el-table-column :label='dispatchTypeName' align='center' prop='dispatchName' v-if='columns[9].visible' width='150' show-overflow-tooltip />
+        <el-table-column label='销售数量' align='center' prop='saleAmount' v-if='columns[10].visible' width='100' />
         <el-table-column label='计划交货日期' align='center' prop='planDeliveryDate' width='180' v-if='columns[11].visible'>
           <template #default='scope'>
             <span>{{ parseTime(scope.row.planDeliveryDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label='计划数量' align='center' prop='planAmount' v-if='columns[12].visible' />
-        <el-table-column label='已派工数量' align='center' prop='dispatchAmount' v-if='columns[13].visible' />
-        <el-table-column label='完成数量' align='center' prop='completeAmount' v-if='columns[14].visible' />
+        <el-table-column label='计划数量' align='center' prop='planAmount' v-if='columns[12].visible' width='100' />
+        <el-table-column label='已派工数量' align='center' prop='dispatchAmount' v-if='columns[13].visible' width='110' />
+        <el-table-column label='完成数量' align='center' prop='completeAmount' v-if='columns[14].visible' width='100' />
         <el-table-column label='发布时间' align='center' prop='releaseTime' width='180' v-if='columns[15].visible'>
           <template #default='scope'>
             <span>{{ parseTime(scope.row.releaseTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@@ -131,32 +143,32 @@
             <span>{{ parseTime(scope.row.realEndTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label='订单状态' align='center' prop='orderStatus' v-if='columns[20].visible'>
+        <el-table-column label='订单状态' align='center' prop='orderStatus' v-if='columns[20].visible' width='100'>
           <template #default='scope'>
             <dict-tag :options='mes_order_status' :value='scope.row.orderStatus' />
           </template>
         </el-table-column>
-        <el-table-column label='库存锁定标识' align='center' prop='stockLockFlag' v-if='columns[21].visible'>
+        <el-table-column label='库存锁定标识' align='center' prop='stockLockFlag' v-if='columns[21].visible' width='120'>
           <template #default='scope'>
             <dict-tag :options='mes_stock_lock_flag' :value='scope.row.stockLockFlag' />
           </template>
         </el-table-column>
-        <el-table-column label='前置生产订单ID' align='center' prop='preOrderId' v-if='columns[22].visible' />
-        <el-table-column label='前置订单编号' align='center' prop='preOrderCode' v-if='columns[23].visible' />
-        <el-table-column label='完成标识' align='center' prop='finishFlag' v-if='columns[24].visible'>
+        <el-table-column label='前置生产订单ID' align='center' prop='preOrderId' v-if='columns[22].visible' width='140' />
+        <el-table-column label='前置订单编号' align='center' prop='preOrderCode' v-if='columns[23].visible' width='130' show-overflow-tooltip />
+        <el-table-column label='完成标识' align='center' prop='finishFlag' v-if='columns[24].visible' width='100'>
           <template #default='scope'>
             <dict-tag :options='mes_finish_flag' :value='scope.row.finishFlag' />
           </template>
         </el-table-column>
-        <el-table-column label='下达工单' align='center' prop='releaseFlag' v-if='columns[25].visible' width='80'>
+        <el-table-column label='下达工单' align='center' prop='releaseFlag' v-if='columns[25].visible' width='100'>
           <template #default='scope'>
             <dict-tag :options='mes_release_flag' :value='scope.row.releaseFlag' />
           </template>
         </el-table-column>
-        <el-table-column label='订单版本' align='center' prop='orderVersion' v-if='columns[26].visible' />
-        <el-table-column label='工厂ID' align='center' prop='factoryId' v-if='columns[27].visible' />
-        <el-table-column label='备注' align='center' prop='remark' v-if='columns[28].visible' />
-        <el-table-column label='操作' align='center' class-name="small-padding fixed-width"  fixed="right">
+        <el-table-column label='订单版本' align='center' prop='orderVersion' v-if='columns[26].visible' width='100' />
+        <el-table-column label='工厂ID' align='center' prop='factoryId' v-if='columns[27].visible' width='100' />
+        <el-table-column label='备注' align='center' prop='remark' v-if='columns[28].visible' width='150' show-overflow-tooltip />
+        <el-table-column label='操作' align='center' class-name="small-padding fixed-width" width='120' fixed="right">
           <template #default='scope'>
             <el-button
               size="small"
@@ -204,10 +216,21 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label='成品名称' prop='materialId'>
-          <el-input v-model='form.materialId' placeholder='请输入成品名称' />
+          <el-input v-model='materialName' placeholder='请选择成品物料' readonly>
+            <template #append>
+              <el-button icon='Search' @click='handleMaterialAdd'>选择</el-button>
+            </template>
+          </el-input>
         </el-form-item>
         <el-form-item label='物料BOM' prop='materialBomId'>
-          <el-input v-model='form.materialBomId' placeholder='请输入物料BOM' />
+          <el-select v-model='form.materialBomId' placeholder='请选择物料BOM' :disabled='!form.materialId' clearable>
+            <el-option
+              v-for='item in materialBomList'
+              :key='item.materialBomId'
+              :label='item.materialName +"_" +item.materialBomVersion'
+              :value='item.materialBomId'
+            />
+          </el-select>
         </el-form-item>
         <el-form-item label='派工类型' prop='dispatchType'>
           <el-radio-group v-model='form.dispatchType' :disabled="true">
@@ -283,6 +306,19 @@
         </div>
       </template>
     </el-dialog>
+
+    <!-- 添加物料信息对话框 -->
+    <el-dialog title='选择物料信息' v-model='materialOpen' width='1200px' append-to-body>
+      <MaterialSelect @selection='handleSelection' ref='materialSelectRef'
+                      :materialCategoryId="'20009'"
+                      v-if='materialOpen'></MaterialSelect>
+      <template #footer>
+        <div class='dialog-footer'>
+          <el-button type='primary' @click='submitMaterialForm'>确 定</el-button>
+          <el-button @click='materialOpen = false'>取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
@@ -292,6 +328,8 @@ import { OrderInfoVO, OrderInfoQuery, OrderInfoForm } from '@/api/mes/orderInfo/
 import { getProcessInfoList } from '@/api/mes/baseProcessInfo';
 import { getBaseRouteList } from '@/api/mes/baseRoute';
 import { getProdLineList } from '@/api/mes/baseProdLineInfo';
+import { getParentMaterialBom, listMaterialBom } from '@/api/mes/materialBom';
+import MaterialSelect from '@/views/mes/baseMaterialInfo/addMaterial.vue';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const {
@@ -317,6 +355,12 @@ const orderInfoFormRef = ref<ElFormInstance>();
 /** 下拉框查询派工类型信息列表 */
 const dispatchTypeList = ref([])
 const dispatchTypeName = ref("");
+/** 物料选择相关 */
+const materialOpen = ref(false);
+const materialSelectRef = ref();
+const materialName = ref(''); // 用于显示物料名称
+/** BOM下拉框列表 */
+const materialBomList = ref([]);
 
 const dialog = reactive<DialogOption>({
   visible: false,
@@ -329,7 +373,7 @@ const columns = ref<FieldOption[]>([
   { key: 1, label: `租户编号`, visible: false },
   { key: 2, label: `订单编号`, visible: true },
   { key: 3, label: `销售订单ID`, visible: false },
-  { key: 4, label: `项目编号`, visible: true },
+  { key: 4, label: `项目编号`, visible: false },
   { key: 5, label: `订单类型`, visible: true },
   { key: 6, label: `成品名称`, visible: true },
   { key: 7, label: `物料BOM`, visible: true },
@@ -338,7 +382,7 @@ const columns = ref<FieldOption[]>([
   { key: 10, label: `销售数量`, visible: false },
   { key: 11, label: `计划交货日期`, visible: true },
   { key: 12, label: `计划数量`, visible: true },
-  { key: 13, label: `已派工数量`, visible: false },
+  { key: 13, label: `已派工数量`, visible: true },
   { key: 14, label: `完成数量`, visible: true },
   { key: 15, label: `发布时间`, visible: false },
   { key: 16, label: `计划开始时间`, visible: true },
@@ -452,6 +496,8 @@ const cancel = () => {
 /** 表单重置 */
 const reset = () => {
   form.value = { ...initFormData };
+  materialName.value = '';
+  materialBomList.value = [];
   orderInfoFormRef.value?.resetFields();
 };
 
@@ -487,6 +533,14 @@ const handleUpdate = async (row?: OrderInfoVO) => {
   const _productOrderId = row?.productOrderId || ids.value[0];
   const res = await getOrderInfo(_productOrderId);
   Object.assign(form.value, res.data);
+  // 如果有物料名称，设置显示值
+  if ((res.data as any).materialName) {
+    materialName.value = (res.data as any).materialName;
+  }
+  // 如果有物料ID，加载对应的BOM列表
+  if (form.value.materialId) {
+    await loadMaterialBomList(form.value.materialId);
+  }
   dialog.visible = true;
   dialog.title = '修改生产订单信息';
 };
@@ -557,11 +611,65 @@ const dispatchTypeFunction = async () => {
 };
 
 const handleDispatch = (row) => {
-  const productOrderId = row.productOrderId || this.ids[0];
+  const productOrderId = row.productOrderId || ids.value[0];
   const orderCode = row.orderCode;
   const params = {queryParams: queryParams};
   // this.$tab.closeOpenPage(router.currentRoute);
   proxy?.$tab.openPage( '/mes/product-plan/index/' + productOrderId,"任务[" + orderCode + "]生产派工", params);
 };
 
+/** 打开物料选择弹窗 */
+const handleMaterialAdd = () => {
+  materialOpen.value = true;
+};
+
+/** 物料选择事件处理 */
+const handleSelection = () => {
+  // 选择事件由组件内部处理，这里可以添加额外逻辑
+};
+
+/** 提交物料信息按钮 */
+const submitMaterialForm = () => {
+  const selectedRow = materialSelectRef.value?.tableRef?.store?.states?.currentRow?.value;
+  if (selectedRow) {
+    form.value.materialId = selectedRow.materialId;
+    materialName.value = selectedRow.materialName;
+    materialOpen.value = false;
+    // 当选择物料后，加载对应的BOM列表
+    loadMaterialBomList(selectedRow.materialId);
+  } else {
+    proxy?.$modal.msgWarning('请先选择物料！');
+  }
+};
+
+/** 加载物料BOM列表 */
+const loadMaterialBomList = async (materialId: string | number) => {
+  if (!materialId) {
+    materialBomList.value = [];
+    form.value.materialBomId = undefined;
+    return;
+  }
+  try {
+    const res = await listMaterialBom({
+      materialId: materialId,
+      parentId: 0
+    });
+    // 筛选parentId等于0的BOM
+    materialBomList.value = (res.data || []).filter(item => item.parentId === 0 || item.parentId === '0');
+  } catch (error) {
+    console.error('加载BOM列表失败:', error);
+    materialBomList.value = [];
+  }
+};
+
+// 监听物料ID变化，当物料ID变化时重新加载BOM列表
+watch(() => form.value.materialId, (newVal) => {
+  if (newVal) {
+    loadMaterialBomList(newVal);
+  } else {
+    materialBomList.value = [];
+    form.value.materialBomId = undefined;
+  }
+});
+
 </script>