From 9e271b147db81153ad037b62de8051df64dfa612 Mon Sep 17 00:00:00 2001
From: xs <xins@mesnac.com>
Date: Wed, 26 Mar 2025 17:24:13 +0800
Subject: [PATCH] =?UTF-8?q?1.3.1=20=E5=89=8D=E7=AB=AF=EF=BC=9A=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E8=AE=A1=E5=88=92=E7=94=B1=E9=80=89=E6=8B=A9=E7=89=A9?=
 =?UTF-8?q?=E6=96=99bom=E6=94=B9=E4=B8=BA=E9=80=89=E6=8B=A9=E7=89=A9?=
 =?UTF-8?q?=E6=96=99bom=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/planInfo/index.ts    |  26 ++
 src/views/mes/planInfo/index.vue | 455 ++++++++++++++++++-------------
 2 files changed, 288 insertions(+), 193 deletions(-)

diff --git a/src/api/mes/planInfo/index.ts b/src/api/mes/planInfo/index.ts
index bc70cac..a8b1059 100644
--- a/src/api/mes/planInfo/index.ts
+++ b/src/api/mes/planInfo/index.ts
@@ -1,6 +1,7 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import { PlanInfoVO, PlanInfoForm, PlanInfoQuery } from '@/api/mes/planInfo/types';
+import {MaterialBomQuery, MaterialBomVO} from "@/api/mes/materialBom/types";
 
 /**
  * 查询生产工单信息列表
@@ -134,3 +135,28 @@ export const queryMoritorList = (query?: PlanInfoQuery): AxiosPromise<PlanInfoVO
     params: query
   });
 };
+
+
+/**
+ * 查询生产bom下拉树结构
+ */
+export const materialBomTreeSelect = (query?: MaterialBomQuery): AxiosPromise<MaterialBomVO[]> => {
+  return request({
+    url: '/mes/planInfo/materialBomTreeSelect',
+    method: 'get',
+    params:query
+  });
+};
+
+
+/**
+ * 查询物料bom版本下拉树结构
+ */
+export const materialBomVersionSelect = (query?: MaterialBomQuery): AxiosPromise<MaterialBomVO[]> => {
+  return request({
+    url: '/mes/planInfo/materialBomVersionSelect',
+    method: 'get',
+    params:query
+  });
+};
+
diff --git a/src/views/mes/planInfo/index.vue b/src/views/mes/planInfo/index.vue
index 955b1ca..6575de9 100644
--- a/src/views/mes/planInfo/index.vue
+++ b/src/views/mes/planInfo/index.vue
@@ -10,11 +10,11 @@
             <!--            </el-form-item>-->
             <el-form-item label='计划编号' prop='planCode'>
               <el-input v-model='queryParams.planCode' placeholder='请输入计划编号' clearable
-                        @keyup.enter='handleQuery' />
+                        @keyup.enter='handleQuery'/>
             </el-form-item>
             <el-form-item label='物料名称' prop='materialName'>
               <el-input v-model='queryParams.materialName' placeholder='请输入物料名称' clearable
-                        @keyup.enter='handleQuery' />
+                        @keyup.enter='handleQuery'/>
             </el-form-item>
             <!--            <el-form-item label="物料BOM" prop="materialBomId">-->
             <!--              <el-input v-model="queryParams.materialBomId" placeholder="请输入物料BOM" clearable @keyup.enter="handleQuery" />-->
@@ -42,7 +42,7 @@
             <!--            </el-form-item>-->
             <el-form-item label='计划状态' prop='planStatus'>
               <el-select v-model='queryParams.planStatus' placeholder='请选择计划状态' clearable>
-                <el-option v-for='dict in mes_plan_status' :key='dict.value' :label='dict.label' :value='dict.value' />
+                <el-option v-for='dict in mes_plan_status' :key='dict.value' :label='dict.label' :value='dict.value'/>
               </el-select>
             </el-form-item>
             <!--            <el-form-item label="班次" prop="shiftId">-->
@@ -53,7 +53,7 @@
             <!--            </el-form-item>-->
             <el-form-item label='模号' prop='modelCode'>
               <el-select v-model='queryParams.modelCode' placeholder='请选择模号' clearable>
-                <el-option v-for='dict in mes_model_code' :key='dict.value' :label='dict.label' :value='dict.value' />
+                <el-option v-for='dict in mes_model_code' :key='dict.value' :label='dict.label' :value='dict.value'/>
               </el-select>
             </el-form-item>
             <el-form-item>
@@ -113,36 +113,36 @@
       </template>
 
       <el-table v-loading='loading' :data='planInfoList' @selection-change='handleSelectionChange'>
-        <el-table-column type='selection' width='55' align='center' />
-        <el-table-column label='主键标识' align='center' prop='planId' v-if='columns[0].visible' />
+        <el-table-column type='selection' width='55' align='center'/>
+        <el-table-column label='主键标识' align='center' prop='planId' v-if='columns[0].visible'/>
         <el-table-column label='生产订单ID' align='center' prop='productOrderId' v-if='columns[2].visible'
-                         width='100' />
-        <el-table-column label='销售订单ID' align='center' prop='saleOrderId' v-if='columns[3].visible' />
-        <el-table-column label='销售订单编号' align='center' prop='saleorderCode' v-if='columns[4].visible' />
-        <el-table-column label='计划编号' align='center' prop='planCode' v-if='columns[5].visible' width='120' />
-        <el-table-column label='派工单号' align='center' prop='dispatchCode' v-if='columns[6].visible' />
-        <el-table-column label='物料名称' align='center' prop='materialName' v-if='columns[7].visible' width='160' />
-        <el-table-column label='物料BOM' align='center' prop='materialBomName' v-if='columns[8].visible' width='160' />
-        <el-table-column label='工序名称' align='center' prop='processName' v-if='columns[9].visible' />
-        <el-table-column label='顺序' align='center' prop='processOrder' v-if='columns[10].visible' />
+                         width='100'/>
+        <el-table-column label='销售订单ID' align='center' prop='saleOrderId' v-if='columns[3].visible'/>
+        <el-table-column label='销售订单编号' align='center' prop='saleorderCode' v-if='columns[4].visible'/>
+        <el-table-column label='计划编号' align='center' prop='planCode' v-if='columns[5].visible' width='120'/>
+        <el-table-column label='派工单号' align='center' prop='dispatchCode' v-if='columns[6].visible'/>
+        <el-table-column label='物料名称' align='center' prop='materialName' v-if='columns[7].visible' width='160'/>
+        <el-table-column label='BOM版本' align='center' prop='materialBomVersion' v-if='columns[8].visible' width='160'/>
+        <el-table-column label='工序名称' align='center' prop='processName' v-if='columns[9].visible'/>
+        <el-table-column label='顺序' align='center' prop='processOrder' v-if='columns[10].visible'/>
         <el-table-column label='上一工序ID' align='center' prop='lastProcessId' v-if='columns[11].visible'
-                         width='100' />
+                         width='100'/>
         <el-table-column label='最后工序标识' align='center' prop='finalProcessFlag' v-if='columns[12].visible'
                          width='110'>
           <template #default='scope'>
-            <dict-tag :options='active_flag' :value='scope.row.finalProcessFlag' />
+            <dict-tag :options='active_flag' :value='scope.row.finalProcessFlag'/>
           </template>
         </el-table-column>
         <el-table-column label='下达类型' align='center' prop='releaseType' v-if='columns[13].visible'>
           <template #default='scope'>
-            <dict-tag :options='mes_release_type' :value='scope.row.releaseType' />
+            <dict-tag :options='mes_release_type' :value='scope.row.releaseType'/>
           </template>
         </el-table-column>
-        <el-table-column label='下达机台' align='center' prop='releaseName' v-if='columns[14].visible' />
-        <el-table-column label='单位生产时间(秒)' align='center' prop='productionTime' v-if='columns[15].visible' />
-        <el-table-column label='计划数量' align='center' prop='planAmount' v-if='columns[16].visible' />
-        <el-table-column label='派工数量' align='center' prop='dispatchAmount' v-if='columns[17].visible' />
-        <el-table-column label='完成数量' align='center' prop='completeAmount' v-if='columns[18].visible' />
+        <el-table-column label='下达机台' align='center' prop='releaseName' v-if='columns[14].visible'/>
+        <el-table-column label='单位生产时间(秒)' align='center' prop='productionTime' v-if='columns[15].visible'/>
+        <el-table-column label='计划数量' align='center' prop='planAmount' v-if='columns[16].visible'/>
+        <el-table-column label='派工数量' align='center' prop='dispatchAmount' v-if='columns[17].visible'/>
+        <el-table-column label='完成数量' align='center' prop='completeAmount' v-if='columns[18].visible'/>
         <el-table-column label='计划时间' align='center' prop='planBeginTime' width='180' v-if='columns[19].visible'>
           <template #default='scope'>
             <span>{{ parseTime(scope.row.planBeginTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@@ -164,31 +164,31 @@
             <span>{{ parseTime(scope.row.realEndTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label='附件信息' align='center' prop='attachId' v-if='columns[23].visible' />
+        <el-table-column label='附件信息' align='center' prop='attachId' v-if='columns[23].visible'/>
         <el-table-column label='计划状态' align='center' prop='planStatus' v-if='columns[24].visible'>
           <template #default='scope'>
-            <dict-tag :options='mes_plan_status' :value='scope.row.planStatus' />
+            <dict-tag :options='mes_plan_status' :value='scope.row.planStatus'/>
           </template>
         </el-table-column>
         <el-table-column label='导入类型' align='center' prop='importFlag' v-if='columns[25].visible'>
           <template #default='scope'>
-            <dict-tag :options='mes_import_flag' :value='scope.row.importFlag' />
+            <dict-tag :options='mes_import_flag' :value='scope.row.importFlag'/>
           </template>
         </el-table-column>
         <el-table-column label='完成标识' align='center' prop='finishFlag' v-if='columns[26].visible'>
           <template #default='scope'>
-            <dict-tag :options='mes_finish_flag' :value="scope.row.finishFlag ? scope.row.finishFlag.split(',') : []" />
+            <dict-tag :options='mes_finish_flag' :value="scope.row.finishFlag ? scope.row.finishFlag.split(',') : []"/>
           </template>
         </el-table-column>
-        <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='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'>
           <template #default='scope'>
-            <dict-tag :options='mes_model_code' :value='scope.row.modelCode' />
+            <dict-tag :options='mes_model_code' :value='scope.row.modelCode'/>
           </template>
         </el-table-column>
-        <el-table-column label='备注' align='center' prop='remark' v-if='columns[31].visible' />
+        <el-table-column label='备注' align='center' prop='remark' v-if='columns[31].visible'/>
         <!--        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
         <!--          <template #default="scope">-->
         <!--            <el-tooltip content="修改" placement="top">-->
@@ -202,7 +202,7 @@
       </el-table>
 
       <pagination v-show='total > 0' :total='total' v-model:page='queryParams.pageNum'
-                  v-model:limit='queryParams.pageSize' @pagination='getList' />
+                  v-model:limit='queryParams.pageSize' @pagination='getList'/>
     </el-card>
     <!-- 添加或修改生产工单信息对话框 -->
     <el-dialog :title='dialog.title' v-model='dialog.visible' width='500px' append-to-body>
@@ -226,20 +226,31 @@
           <el-input v-model='form.materialName' placeholder='请点击检索物料' @click='handleMaterialAdd' readonly>
             <template #append>
               <el-icon class='el-input__icon'>
-                <search />
+                <search/>
               </el-icon>
             </template>
           </el-input>
         </el-form-item>
-        <el-form-item label='物料BOM' prop='materialBoMName'>
-          <el-input v-model='form.materialBoMName' placeholder='请点击检索物料BOM' @click='handleMaterialBomAdd'
-                    readonly>
-            <template #append>
-              <el-icon class='el-input__icon'>
-                <search />
-              </el-icon>
-            </template>
-          </el-input>
+        <!--        <el-form-item label="归属部门" prop="deptId">-->
+        <!--          <el-tree-select-->
+        <!--            v-model="form.materialBomVersion"-->
+        <!--            :data="materialBomVersionOptions"-->
+        <!--            :props="{ value: 'id', label: 'label', children: 'children' }"-->
+        <!--            value-key="id"-->
+        <!--            placeholder="请选择归属部门"-->
+        <!--            check-strictly-->
+        <!--            @change="handleMaterialBomChange"-->
+        <!--          />-->
+        <!--        </el-form-item>-->
+        <el-form-item label='BOM版本' prop='materialBomVersion'>
+          <el-select v-model='form.materialBomVersion' placeholder='请选择BOM版本'>
+            <el-option
+              v-for='item in materialBomVersionOptions'
+              :key='`${item.bomVersionDesc} - ${item.bomVersionDesc}`'
+              :label='`${item.bomVersionDesc} - ${item.bomVersionDesc}`'
+              :value='item.materialBomVersion'
+            />
+          </el-select>
         </el-form-item>
         <el-form-item label='工序名称' prop='processId'>
           <el-select v-model='form.processId' placeholder='请选择工序'>
@@ -290,7 +301,7 @@
         <!--          <el-input v-model="form.productionTime" placeholder="请输入单位生产时间(秒)" />-->
         <!--        </el-form-item>-->
         <el-form-item label='计划数量' prop='planAmount'>
-          <el-input-number v-model='form.planAmount' placeholder='请输入计划数量' style='width: 200px;' />
+          <el-input-number v-model='form.planAmount' placeholder='请输入计划数量' style='width: 200px;'/>
         </el-form-item>
         <!--        <el-form-item label="派工数量" prop="dispatchAmount">-->
         <!--          <el-input-number v-model="form.dispatchAmount" placeholder="请输入派工数量" style="width: 200px;" />-->
@@ -315,7 +326,7 @@
         <!--          <el-input v-model="form.attachId" placeholder="请输入附件信息" />-->
         <!--        </el-form-item>-->
         <el-form-item label='优先级' prop='priority'>
-          <el-input-number v-model='form.priority' placeholder='请输入优先级' style='width: 200px;' />
+          <el-input-number v-model='form.priority' placeholder='请输入优先级' style='width: 200px;'/>
         </el-form-item>
         <el-form-item label='班次' prop='shiftId'>
           <el-radio-group v-model='form.shiftId'>
@@ -348,7 +359,7 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label='备注' prop='remark'>
-          <el-input v-model='form.remark' placeholder='请输入备注' />
+          <el-input v-model='form.remark' placeholder='请输入备注'/>
         </el-form-item>
       </el-form>
       <template #footer>
@@ -396,21 +407,23 @@
               <span style='font-weight:700; padding: 0 4px'>
                 机台编号
               </span>
-            <el-input v-model='machineQueryParams.machineCode' placeholder='请输入机台编号' clearable style='width: 120px;' />
+            <el-input v-model='machineQueryParams.machineCode' placeholder='请输入机台编号' clearable
+                      style='width: 120px;'/>
             <span style='font-weight:700; padding: 0 4px'>
                 机台名称
               </span>
-            <el-input v-model='machineQueryParams.machineName' placeholder='请输入机台名称' clearable style='width: 120px;' />
+            <el-input v-model='machineQueryParams.machineName' placeholder='请输入机台名称' clearable
+                      style='width: 120px;'/>
             <el-form-item>
               <el-button type='primary' icon='Search' @click='handleMachineQuery'>搜索</el-button>
             </el-form-item>
           </el-form>
           <el-table v-loading='loading' :data='prodBaseMachineInfoList'
                     @selection-change='handleSelectionMachineChange'>
-            <el-table-column type='selection' width='55' align='center' />
-            <el-table-column label='主键标识' align='center' prop='machineId' v-if='false' />
-            <el-table-column label='机台编号' align='center' prop='machineCode' />
-            <el-table-column label='机台名称' align='center' prop='machineName' />
+            <el-table-column type='selection' width='55' align='center'/>
+            <el-table-column label='主键标识' align='center' prop='machineId' v-if='false'/>
+            <el-table-column label='机台编号' align='center' prop='machineCode'/>
+            <el-table-column label='机台名称' align='center' prop='machineName'/>
           </el-table>
         </div>
         <el-container>
@@ -420,20 +433,20 @@
                 <el-input v-model='form.materialName' placeholder='请点击检索物料' @click='handleMaterialAdd' readonly>
                   <template #append>
                     <el-icon class='el-input__icon'>
-                      <search />
+                      <search/>
                     </el-icon>
                   </template>
                 </el-input>
               </el-form-item>
-              <el-form-item label='物料BOM' prop='materialBoMName'>
-                <el-input v-model='form.materialBoMName' placeholder='请点击检索物料BOM' @click='handleMaterialBomAdd'
-                          readonly>
-                  <template #append>
-                    <el-icon class='el-input__icon'>
-                      <search />
-                    </el-icon>
-                  </template>
-                </el-input>
+              <el-form-item label='BOM版本' prop='materialBomVersion'>
+                <el-select v-model='form.materialBomVersion' placeholder='请选择BOM版本'>
+                  <el-option
+                    v-for='item in materialBomVersionOptions'
+                    :key='item.materialBomVersion'
+                    :label='`${item.materialBomVersion} - ${item.bomVersionDesc}`'
+                    :value='item.materialBomVersion'
+                  />
+                </el-select>
               </el-form-item>
               <el-form-item label='工序名称' prop='processId'>
                 <el-select v-model='form.processId' placeholder='请先选择工序，再选择机台' @change="getMachine">
@@ -472,13 +485,13 @@
                 </el-select>
               </el-form-item>
               <el-form-item label='早班数量' prop='planAmount1'>
-                <el-input-number v-model='form.planAmount1' placeholder='请输入计划数量' style='width: 200px;' />
+                <el-input-number v-model='form.planAmount1' placeholder='请输入计划数量' style='width: 200px;'/>
               </el-form-item>
               <el-form-item label='中班数量' prop='planAmount2'>
-                <el-input-number v-model='form.planAmount2' placeholder='请输入计划数量' style='width: 200px;' />
+                <el-input-number v-model='form.planAmount2' placeholder='请输入计划数量' style='width: 200px;'/>
               </el-form-item>
               <el-form-item label='晚班数量' prop='planAmount3'>
-                <el-input-number v-model='form.planAmount3' placeholder='请输入计划数量' style='width: 200px;' />
+                <el-input-number v-model='form.planAmount3' placeholder='请输入计划数量' style='width: 200px;'/>
               </el-form-item>
 
             </el-form>
@@ -512,21 +525,23 @@
               <span style='font-weight:700; padding: 0 4px'>
                 机台编号
               </span>
-            <el-input v-model='machineQueryParams.machineCode' placeholder='请输入机台编号' clearable style='width: 120px;' />
+            <el-input v-model='machineQueryParams.machineCode' placeholder='请输入机台编号' clearable
+                      style='width: 120px;'/>
             <span style='font-weight:700; padding: 0 4px'>
                 机台名称
               </span>
-            <el-input v-model='machineQueryParams.machineName' placeholder='请输入机台名称' clearable style='width: 120px;' />
+            <el-input v-model='machineQueryParams.machineName' placeholder='请输入机台名称' clearable
+                      style='width: 120px;'/>
             <el-form-item>
               <el-button type='primary' icon='Search' @click='handleMachineQuery'>搜索</el-button>
             </el-form-item>
           </el-form>
           <el-table v-loading='loading' :data='prodBaseMachineInfoList'
                     @selection-change='handleSelectionMachineChange'>
-            <el-table-column type='selection' width='55' align='center' />
-            <el-table-column label='主键标识' align='center' prop='machineId' v-if='false' />
-            <el-table-column label='机台编号' align='center' prop='machineCode' />
-            <el-table-column label='机台名称' align='center' prop='machineName' />
+            <el-table-column type='selection' width='55' align='center'/>
+            <el-table-column label='主键标识' align='center' prop='machineId' v-if='false'/>
+            <el-table-column label='机台编号' align='center' prop='machineCode'/>
+            <el-table-column label='机台名称' align='center' prop='machineName'/>
           </el-table>
         </div>
         <el-container>
@@ -536,20 +551,20 @@
                 <el-input v-model='form.materialName' placeholder='请点击检索物料' @click='handleMaterialAdd' readonly>
                   <template #append>
                     <el-icon class='el-input__icon'>
-                      <search />
+                      <search/>
                     </el-icon>
                   </template>
                 </el-input>
               </el-form-item>
-              <el-form-item label='物料BOM' prop='materialBoMName'>
-                <el-input v-model='form.materialBoMName' placeholder='请点击检索物料BOM' @click='handleMaterialBomAdd'
-                          readonly>
-                  <template #append>
-                    <el-icon class='el-input__icon'>
-                      <search />
-                    </el-icon>
-                  </template>
-                </el-input>
+              <el-form-item label='BOM版本' prop='materialBomVersion'>
+                <el-select v-model='form.materialBomVersion' placeholder='请选择BOM版本'>
+                  <el-option
+                    v-for='item in materialBomVersionOptions'
+                    :key='item.materialBomVersion'
+                    :label='`${item.materialBomVersion} - ${item.bomVersionDesc}`'
+                    :value='item.materialBomVersion'
+                  />
+                </el-select>
               </el-form-item>
               <el-form-item label='计划时间' prop='planBeginTime'>
                 <el-date-picker clearable
@@ -578,13 +593,13 @@
                 </el-select>
               </el-form-item>
               <el-form-item label='早班数量' prop='planAmount1'>
-                <el-input-number v-model='form.planAmount1' placeholder='请输入计划数量' style='width: 200px;' />
+                <el-input-number v-model='form.planAmount1' placeholder='请输入计划数量' style='width: 200px;'/>
               </el-form-item>
               <el-form-item label='中班数量' prop='planAmount2'>
-                <el-input-number v-model='form.planAmount2' placeholder='请输入计划数量' style='width: 200px;' />
+                <el-input-number v-model='form.planAmount2' placeholder='请输入计划数量' style='width: 200px;'/>
               </el-form-item>
               <el-form-item label='晚班数量' prop='planAmount3'>
-                <el-input-number v-model='form.planAmount3' placeholder='请输入计划数量' style='width: 200px;' />
+                <el-input-number v-model='form.planAmount3' placeholder='请输入计划数量' style='width: 200px;'/>
               </el-form-item>
 
             </el-form>
@@ -618,21 +633,23 @@
               <span style='font-weight:700; padding: 0 4px'>
                 机台编号
               </span>
-            <el-input v-model='machineQueryParams.machineCode' placeholder='请输入机台编号' clearable style='width: 120px;' />
+            <el-input v-model='machineQueryParams.machineCode' placeholder='请输入机台编号' clearable
+                      style='width: 120px;'/>
             <span style='font-weight:700; padding: 0 4px'>
                 机台名称
               </span>
-            <el-input v-model='machineQueryParams.machineName' placeholder='请输入机台名称' clearable style='width: 120px;' />
+            <el-input v-model='machineQueryParams.machineName' placeholder='请输入机台名称' clearable
+                      style='width: 120px;'/>
             <el-form-item>
               <el-button type='primary' icon='Search' @click='handleMachineQuery'>搜索</el-button>
             </el-form-item>
           </el-form>
           <el-table v-loading='loading' :data='prodBaseMachineInfoList'
                     @selection-change='handleSelectionMachineChange'>
-            <el-table-column type='selection' width='55' align='center' />
-            <el-table-column label='主键标识' align='center' prop='machineId' v-if='false' />
-            <el-table-column label='机台编号' align='center' prop='machineCode' />
-            <el-table-column label='机台名称' align='center' prop='machineName' />
+            <el-table-column type='selection' width='55' align='center'/>
+            <el-table-column label='主键标识' align='center' prop='machineId' v-if='false'/>
+            <el-table-column label='机台编号' align='center' prop='machineCode'/>
+            <el-table-column label='机台名称' align='center' prop='machineName'/>
           </el-table>
         </div>
         <el-container>
@@ -669,7 +686,7 @@
                               readonly>
                       <template #append>
                         <el-icon class='el-input__icon'>
-                          <search />
+                          <search/>
                         </el-icon>
                       </template>
                     </el-input>
@@ -681,7 +698,7 @@
                               readonly>
                       <template #append>
                         <el-icon class='el-input__icon'>
-                          <search />
+                          <search/>
                         </el-icon>
                       </template>
                     </el-input>
@@ -690,53 +707,51 @@
               </el-row>
               <el-row :gutter='10' class='mb8'>
                 <el-col :span='12'>
-                  <el-form-item label='左模BOM' prop='materialBoMNameL'>
-                    <el-input v-model='form.materialBoMNameL' placeholder='请点击检索物料BOM'
-                              @click='handleMaterialBomAdd("L")'
-                              readonly>
-                      <template #append>
-                        <el-icon class='el-input__icon'>
-                          <search />
-                        </el-icon>
-                      </template>
-                    </el-input>
+                  <el-form-item label='BOM版本' prop='materialBomVersionL'>
+                    <el-select v-model='form.materialBomVersionL' placeholder='请选择BOM版本'>
+                      <el-option
+                        v-for='item in materialBomVersionLOptions'
+                        :key='item.materialBomVersion'
+                        :label='`${item.materialBomVersion} - ${item.bomVersionDesc}`'
+                        :value='item.materialBomVersion'
+                      />
+                    </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :span='12'>
-                  <el-form-item label='右模BOM' prop='materialBoMNameR'>
-                    <el-input v-model='form.materialBoMNameR' placeholder='请点击检索物料BOM'
-                              @click='handleMaterialBomAdd("R")'
-                              readonly>
-                      <template #append>
-                        <el-icon class='el-input__icon'>
-                          <search />
-                        </el-icon>
-                      </template>
-                    </el-input>
+                  <el-form-item label='BOM版本' prop='materialBomVersionR'>
+                    <el-select v-model='form.materialBomVersionR' placeholder='请选择BOM版本'>
+                      <el-option
+                        v-for='item in materialBomVersionROptions'
+                        :key='item.materialBomVersion'
+                        :label='`${item.materialBomVersion} - ${item.bomVersionDesc}`'
+                        :value='item.materialBomVersion'
+                      />
+                    </el-select>
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row :gutter='10' class='mb8'>
                 <el-col :span='12'>
                   <el-form-item label='左模早班数量' prop='planAmount1'>
-                    <el-input-number v-model='form.planAmount1' placeholder='请输入计划数量' style='width: 200px;' />
+                    <el-input-number v-model='form.planAmount1' placeholder='请输入计划数量' style='width: 200px;'/>
                   </el-form-item>
                   <el-form-item label='左模中班数量' prop='planAmount2'>
-                    <el-input-number v-model='form.planAmount2' placeholder='请输入计划数量' style='width: 200px;' />
+                    <el-input-number v-model='form.planAmount2' placeholder='请输入计划数量' style='width: 200px;'/>
                   </el-form-item>
                   <el-form-item label='左模晚班数量' prop='planAmount3'>
-                    <el-input-number v-model='form.planAmount3' placeholder='请输入计划数量' style='width: 200px;' />
+                    <el-input-number v-model='form.planAmount3' placeholder='请输入计划数量' style='width: 200px;'/>
                   </el-form-item>
                 </el-col>
                 <el-col :span='12'>
                   <el-form-item label='右模早班数量' prop='planAmount4'>
-                    <el-input-number v-model='form.planAmount4' placeholder='请输入计划数量' style='width: 200px;' />
+                    <el-input-number v-model='form.planAmount4' placeholder='请输入计划数量' style='width: 200px;'/>
                   </el-form-item>
                   <el-form-item label='右模中班数量' prop='planAmount5'>
-                    <el-input-number v-model='form.planAmount5' placeholder='请输入计划数量' style='width: 200px;' />
+                    <el-input-number v-model='form.planAmount5' placeholder='请输入计划数量' style='width: 200px;'/>
                   </el-form-item>
                   <el-form-item label='右模晚班数量' prop='planAmount6'>
-                    <el-input-number v-model='form.planAmount6' placeholder='请输入计划数量' style='width: 200px;' />
+                    <el-input-number v-model='form.planAmount6' placeholder='请输入计划数量' style='width: 200px;'/>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -792,19 +807,23 @@ import {
   delPlanInfo,
   addPlanInfo,
   updatePlanInfo,
-  orderAddProductPlanList, issuePlanInfo
+  orderAddProductPlanList, issuePlanInfo,
+  materialBomTreeSelect,
+  materialBomVersionSelect
 } from '@/api/mes/planInfo';
-import { PlanInfoVO, PlanInfoQuery, PlanInfoForm } from '@/api/mes/planInfo/types';
-import { getBaseShiftInfoList } from '@/api/mes/baseShiftInfo';
-import { getBaseClassTeamInfoList } from '@/api/mes/baseClassTeamInfo';
+import {PlanInfoVO, PlanInfoQuery, PlanInfoForm} from '@/api/mes/planInfo/types';
+import {getBaseShiftInfoList} from '@/api/mes/baseShiftInfo';
+import {getBaseClassTeamInfoList} from '@/api/mes/baseClassTeamInfo';
 import BomSelect from '@/views/mes/materialBom/addBom.vue';
 import MaterialSelect from '@/views/mes/baseMaterialInfo/addMaterial.vue';
-import { getProcessInfoList } from '@/api/mes/baseProcessInfo';
-import { getStationInfoList } from '@/api/mes/baseStationInfo';
-import { getProdBaseMachineInfoList } from '@/api/mes/prodBaseMachineInfo';
-import { ProdBaseMachineInfoVO } from '@/api/mes/prodBaseMachineInfo/types';
+import {getProcessInfoList} from '@/api/mes/baseProcessInfo';
+import {getStationInfoList} from '@/api/mes/baseStationInfo';
+import {getProdBaseMachineInfoList} from '@/api/mes/prodBaseMachineInfo';
+import {ProdBaseMachineInfoVO} from '@/api/mes/prodBaseMachineInfo/types';
+import {MaterialBomVO} from "@/api/mes/materialBom/types";
+import {optionselect} from "@/api/system/post";
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const {proxy} = getCurrentInstance() as ComponentInternalInstance;
 const {
   mes_import_flag,
   active_flag,
@@ -856,6 +875,12 @@ const materialOpen = ref(false);
 const materialSelectRef = ref();
 const materialIdForm = ref();
 
+const materialBomVersionOptions = ref<MaterialBomVO[]>([]);
+
+const materialBomVersionLOptions = ref<MaterialBomVO[]>([]);
+const materialBomVersionROptions = ref<MaterialBomVO[]>([]);
+
+
 const workshopId = ref();
 
 const prodBaseMachineInfoList = ref<ProdBaseMachineInfoVO[]>([]);
@@ -880,7 +905,7 @@ const getClassTeamSelect = async () => {
 
 /*获取半制品工序下拉框*/
 const getProcessSelect = async () => {
-  let res = await getProcessInfoList({ processType: 1 });
+  let res = await getProcessInfoList({processType: 1});
   processList.value = res.data.filter(item => item.processId !== 17 && item.processId !== 18);
 };
 
@@ -895,43 +920,43 @@ const getReleaseSelect = async () => {
 
 // 列显隐信息
 const columns = ref<FieldOption[]>([
-  { key: 0, label: `主键标识`, visible: false },
-  { key: 1, label: `租户编号`, visible: false },
-  { key: 2, label: `生产订单ID`, visible: false },
-  { key: 3, label: `销售订单ID`, visible: false },
-  { key: 4, label: `销售订单编号`, visible: false },
-  { key: 5, label: `计划编号`, visible: true },
-  { key: 6, label: `派工单号`, visible: false },
-  { key: 7, label: `物料名称`, visible: true },
-  { key: 8, label: `物料BOM`, visible: true },
-  { key: 9, label: `工序名称`, visible: true },
-  { key: 10, label: `顺序`, visible: false },
-  { key: 11, label: `上一工序ID`, visible: false },
-  { key: 12, label: `最后工序标识`, visible: false },
-  { key: 13, label: `下达类型`, visible: true },
-  { key: 14, label: `下达ID`, visible: true },
-  { key: 15, label: `单位生产时间(秒)`, visible: false },
-  { key: 16, label: `计划数量`, visible: true },
-  { key: 17, label: `派工数量`, visible: false },
-  { key: 18, label: `完成数量`, visible: true },
-  { key: 19, label: `计划时间`, visible: true },
-  { key: 20, label: `计划结束时间`, visible: false },
-  { key: 21, label: `实际开始时间`, visible: true },
-  { key: 22, label: `实际完成时间`, visible: true },
-  { key: 23, label: `附件信息`, visible: false },
-  { key: 24, label: `计划状态`, visible: true },
-  { key: 25, label: `导入类型`, visible: false },
-  { key: 26, label: `完成标识`, visible: true },
-  { key: 27, label: `优先级`, visible: true },
-  { key: 28, label: `班次`, visible: true },
-  { key: 29, label: `班组`, visible: true },
-  { key: 30, label: `模号`, visible: true },
-  { key: 31, label: `备注`, visible: false },
-  { key: 32, label: `创建部门`, visible: false },
-  { key: 33, label: `创建人`, visible: false },
-  { key: 34, label: `创建时间`, visible: false },
-  { key: 35, label: `更新人`, visible: false },
-  { key: 36, label: `更新时间`, visible: false }
+  {key: 0, label: `主键标识`, visible: false},
+  {key: 1, label: `租户编号`, visible: false},
+  {key: 2, label: `生产订单ID`, visible: false},
+  {key: 3, label: `销售订单ID`, visible: false},
+  {key: 4, label: `销售订单编号`, visible: false},
+  {key: 5, label: `计划编号`, visible: true},
+  {key: 6, label: `派工单号`, visible: false},
+  {key: 7, label: `物料名称`, visible: true},
+  {key: 8, label: `BOM版本`, visible: true},
+  {key: 9, label: `工序名称`, visible: true},
+  {key: 10, label: `顺序`, visible: false},
+  {key: 11, label: `上一工序ID`, visible: false},
+  {key: 12, label: `最后工序标识`, visible: false},
+  {key: 13, label: `下达类型`, visible: true},
+  {key: 14, label: `下达ID`, visible: true},
+  {key: 15, label: `单位生产时间(秒)`, visible: false},
+  {key: 16, label: `计划数量`, visible: true},
+  {key: 17, label: `派工数量`, visible: false},
+  {key: 18, label: `完成数量`, visible: true},
+  {key: 19, label: `计划时间`, visible: true},
+  {key: 20, label: `计划结束时间`, visible: false},
+  {key: 21, label: `实际开始时间`, visible: true},
+  {key: 22, label: `实际完成时间`, visible: true},
+  {key: 23, label: `附件信息`, visible: false},
+  {key: 24, label: `计划状态`, visible: true},
+  {key: 25, label: `导入类型`, visible: false},
+  {key: 26, label: `完成标识`, visible: true},
+  {key: 27, label: `优先级`, visible: true},
+  {key: 28, label: `班次`, visible: true},
+  {key: 29, label: `班组`, visible: true},
+  {key: 30, label: `模号`, visible: true},
+  {key: 31, label: `备注`, visible: false},
+  {key: 32, label: `创建部门`, visible: false},
+  {key: 33, label: `创建人`, visible: false},
+  {key: 34, label: `创建时间`, visible: false},
+  {key: 35, label: `更新人`, visible: false},
+  {key: 36, label: `更新时间`, visible: false}
 ]);
 
 const initFormData: PlanInfoForm = {
@@ -970,7 +995,7 @@ const initFormData: PlanInfoForm = {
   workshopId: undefined
 };
 const data = reactive<PageData<PlanInfoForm, PlanInfoQuery>>({
-  form: { ...initFormData },
+  form: {...initFormData},
   queryParams: {
     pageNum: 1,
     pageSize: 10,
@@ -1009,24 +1034,24 @@ const data = reactive<PageData<PlanInfoForm, PlanInfoQuery>>({
   },
   rules: {
     materialId: [
-      { required: true, message: '物料名称不能为空', trigger: 'blur' }
+      {required: true, message: '物料名称不能为空', trigger: 'blur'}
     ],
     processId: [
-      { required: true, message: '工序不能为空', trigger: 'blur' }
+      {required: true, message: '工序不能为空', trigger: 'blur'}
     ],
     releaseId: [
-      { required: true, message: '机台名称不能为空', trigger: 'blur' }
+      {required: true, message: '机台名称不能为空', trigger: 'blur'}
     ],
     materialName: [
-      { required: true, message: '物料BOM不能为空', trigger: 'blur' }
+      {required: true, message: '物料BOM不能为空', trigger: 'blur'}
     ],
     planAmount: [
-      { required: true, message: '计划数量不能为空', trigger: 'blur' }
+      {required: true, message: '计划数量不能为空', trigger: 'blur'}
     ]
   }
 });
 
-const { queryParams, form, rules } = toRefs(data);
+const {queryParams, form, rules} = toRefs(data);
 const machineNameTags = ref([]);
 
 const getWorkshopId = async () => {
@@ -1055,7 +1080,7 @@ const cancel = () => {
 
 /** 表单重置 */
 const reset = () => {
-  form.value = { ...initFormData };
+  form.value = {...initFormData};
   form.value.workshopId = workshopId.value;
   planInfoFormRef.value?.resetFields();
 };
@@ -1099,9 +1124,9 @@ const handleSfpBatchAdd = () => {
   sfpBatchDialog.visible = true;
   sfpBatchDialog.title = '添加半制品生产计划信息';
   machineQueryParams.value = {};
-/*  if (form.value.processId != null ){
-    getReleaseSelect();
-  }*/
+  /*  if (form.value.processId != null ){
+      getReleaseSelect();
+    }*/
 };
 
 /** 新增成型按钮操作 */
@@ -1175,58 +1200,56 @@ const batchesAddAssemblyData = () => {
   formData.workshopId = workshopId.value;//车间
   let list = [];
   if (formData.planAmount1 > 0) {
-    let data = { ...formData };
+    let data = {...formData};
     data.modelCode = formData.workshopId === '4' ? 'L' : null;
     data.materialId = formData.workshopId === '4' ? formData.materialIdL : formData.materialId;
-    data.materialBomId = formData.workshopId === '4' ? formData.materialBomIdL : formData.materialBomId;
+    data.materialBomVersion = formData.workshopId === '4' ? formData.materialBomVersionL : formData.materialBomVersion;
     data.shiftId = '1';
     data.planAmount = formData.planAmount1;
     list.push(data);
   }
   if (formData.planAmount2 > 0) {
-    let data = { ...formData };
+    let data = {...formData};
     data.modelCode = formData.workshopId === '4' ? 'L' : null;
     data.shiftId = '2';
     data.planAmount = formData.planAmount2;
     data.materialId = formData.workshopId === '4' ? formData.materialIdL : formData.materialId;
-    data.materialBomId = formData.workshopId === '4' ? formData.materialBomIdL : formData.materialBomId;
+    data.materialBomVersion = formData.workshopId === '4' ? formData.materialBomVersionL : formData.materialBomVersion;
     list.push(data);
   }
   if (formData.planAmount3 > 0) {
-    let data = { ...formData };
+    let data = {...formData};
     data.modelCode = formData.workshopId === '4' ? 'L' : null;
     data.shiftId = '3';
     data.planAmount = formData.planAmount3;
     data.materialId = formData.workshopId === '4' ? formData.materialIdL : formData.materialId;
-    data.materialBomId = formData.workshopId === '4' ? formData.materialBomIdL : formData.materialBomId;
+    data.materialBomVersion = formData.workshopId === '4' ? formData.materialBomVersionL : formData.materialBomVersion;
     list.push(data);
   }
   if (formData.planAmount4 > 0) {
-    let data = { ...formData };
+    let data = {...formData};
     data.modelCode = 'R';
     data.shiftId = '1';
     data.planAmount = formData.planAmount4;
     data.materialId = formData.workshopId === '4' ? formData.materialIdR : formData.materialId;
-    data.materialBomId = formData.workshopId === '4' ? formData.materialBomIdR : formData.materialBomId;
+    data.materialBomVersion = formData.workshopId === '4' ? formData.materialBomVersionR : formData.materialBomVersion;
     list.push(data);
   }
   if (formData.planAmount5 > 0) {
-    let data = { ...formData };
+    let data = {...formData};
     data.modelCode = 'R';
     data.shiftId = '2';
     data.planAmount = formData.planAmount5;
     data.materialId = formData.workshopId === '4' ? formData.materialIdR : formData.materialId;
-    data.materialBomId = formData.workshopId === '4' ? formData.materialBomIdR : formData.materialBomId;
-    list.push(data);
+    data.materialBomVersion = formData.workshopId === '4' ? formData.materialBomVersionR : formData.materialBomVersion;    list.push(data);
   }
   if (formData.planAmount6 > 0) {
-    let data = { ...formData };
+    let data = {...formData};
     data.modelCode = 'R';
     data.shiftId = '3';
     data.planAmount = formData.planAmount6;
     data.materialId = formData.workshopId === '4' ? formData.materialIdR : formData.materialId;
-    data.materialBomId = formData.workshopId === '4' ? formData.materialBomIdR : formData.materialBomId;
-    list.push(data);
+    data.materialBomVersion = formData.workshopId === '4' ? formData.materialBomVersionR : formData.materialBomVersion;    list.push(data);
   }
   return list;
 };
@@ -1269,12 +1292,15 @@ const submitMaterialForm = () => {
   if (modelCodeRef.value === 'L') {
     form.value.materialIdL = selectedRow.materialId;
     form.value.materialNameL = selectedRow.materialName;
+    getMaterialBomVersionSelect('L')
   } else if (modelCodeRef.value === 'R') {
     form.value.materialIdR = selectedRow.materialId;
     form.value.materialNameR = selectedRow.materialName;
+    getMaterialBomVersionSelect('R')
   } else {
     form.value.materialId = selectedRow.materialId;
     form.value.materialName = selectedRow.materialName;
+    getMaterialBomVersionSelect('')
   }
   materialIdForm.value = selectedRow.materialId;
   materialOpen.value = false;
@@ -1312,19 +1338,62 @@ function handleMachineQuery() {
   getReleaseSelect();
 }
 
-const getMachine  = async () => {
+const getMachine = async () => {
   console.log(form.value.processId)
-  if ( workshopId.value == 2 && form.value.processId != null  ){
+  if (workshopId.value == 2 && form.value.processId != null) {
     await getReleaseSelect();
   }
 };
 
+/** 查询物料bom版本下拉列表 */
+const getMaterialBomVersionSelect = async (type: string) => {
+
+  if (type === 'L') {//硫化计划左模物料
+    materialBomVersionLOptions.value = [];
+    if (form.value.materialIdL && form.value.materialIdL !== '') {
+      const query = {params:{parentId: form.value.materialIdL}};
+      const res = await materialBomVersionSelect(query);
+      materialBomVersionLOptions.value = res.data;
+    }
+
+  } else if (type === 'R') {//硫化计划右模物料
+    materialBomVersionROptions.value = [];
+    if (form.value.materialIdR && form.value.materialIdR !== '') {
+      const query = {params:{parentId: form.value.materialIdR}};
+      const res = await materialBomVersionSelect(query);
+      materialBomVersionROptions.value = res.data;
+    }
+  } else {//半制品计划或成型计划
+    materialBomVersionOptions.value = [];
+    if (form.value.materialId && form.value.materialId !== '') {
+      const query = {params:{parentId: form.value.materialId}};
+      const res = await materialBomVersionSelect(query);
+      materialBomVersionOptions.value = res.data;
+    }
+  }
+
+};
+
+
+/** 查询物料bom下拉树结构 */
+const getTreeSelect = async () => {
+  const res = await materialBomTreeSelect();
+  materialBomVersionOptions.value = res.data;
+};
+
+async function handleMaterialBomChange(value: number | string) {
+  const response = await optionselect(value);
+  postOptions.value = response.data;
+  form.value.postIds = [];
+}
+
+
 onMounted(() => {
   getWorkshopId();
   getShiftSelect();
   getClassTeamSelect();
   getProcessSelect();
-  if (form.value.processId != null ){
+  if (form.value.processId != null) {
     getReleaseSelect();
   }
   getList();