diff --git a/src/api/ems/record/recordDnbInstant.js b/src/api/ems/record/recordDnbInstant.js
new file mode 100644
index 0000000..bd9abe3
--- /dev/null
+++ b/src/api/ems/record/recordDnbInstant.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询电实时数据列表
+export function listRecordDnbInstant(query) {
+  return request({
+    url: '/ems/record/recordDnbInstant/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询电实时数据详细
+export function getRecordDnbInstant(objId) {
+  return request({
+    url: '/ems/record/recordDnbInstant/' + objId,
+    method: 'get'
+  })
+}
+
+// 新增电实时数据
+export function addRecordDnbInstant(data) {
+  return request({
+    url: '/ems/record/recordDnbInstant',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改电实时数据
+export function updateRecordDnbInstant(data) {
+  return request({
+    url: '/ems/record/recordDnbInstant',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除电实时数据
+export function delRecordDnbInstant(objId) {
+  return request({
+    url: '/ems/record/recordDnbInstant/' + objId,
+    method: 'delete'
+  })
+}
diff --git a/src/api/mes/prod/prodBomInfo.js b/src/api/mes/prod/prodBomInfo.js
new file mode 100644
index 0000000..cec3309
--- /dev/null
+++ b/src/api/mes/prod/prodBomInfo.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询生产BOM列表
+export function listProdBomInfo(query) {
+  return request({
+    url: '/mes/prod/prodBomInfo/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询生产BOM详细
+export function getProdBomInfo(objId) {
+  return request({
+    url: '/mes/prod/prodBomInfo/' + objId,
+    method: 'get'
+  })
+}
+
+// 新增生产BOM
+export function addProdBomInfo(data) {
+  return request({
+    url: '/mes/prod/prodBomInfo',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改生产BOM
+export function updateProdBomInfo(data) {
+  return request({
+    url: '/mes/prod/prodBomInfo',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除生产BOM
+export function delProdBomInfo(objId) {
+  return request({
+    url: '/mes/prod/prodBomInfo/' + objId,
+    method: 'delete'
+  })
+}
+
+// 查询订单BOM下拉框列表
+export function findOrderBomList(query) {
+  return request({
+    url: '/mes/prod/prodBomInfo/findOrderBomList',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/router/index.js b/src/router/index.js
index b3445af..4043ff6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -75,6 +75,20 @@ export const constantRoutes = [
       }
     ]
   },
+  {
+    path: "/production/bom-info",
+    component: Layout,
+    hidden: true,
+    permissions: ["mes/prod:prodBomInfo:list"],
+    children: [
+      {
+        path: "index/:materialCode(\\d+)",
+        component: () => import("@/views/mes/prod/prodBomInfo/childIndex"),
+        name: "childBom",
+        meta: {title: "查看生产BOM信息", activeMenu: "/prod/prodBomInfo"},
+      },
+    ],
+  },
   // {
   //   path: '/nestRoutes',
   //   meta: {
diff --git a/src/views/ems/record/recordDnbInstant/index.vue b/src/views/ems/record/recordDnbInstant/index.vue
new file mode 100644
index 0000000..601436a
--- /dev/null
+++ b/src/views/ems/record/recordDnbInstant/index.vue
@@ -0,0 +1,496 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="计量设备编号" prop="monitorId">
+        <el-input
+          v-model="queryParams.monitorId"
+          placeholder="请输入计量设备编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="采集时间" prop="collectTime">
+        <el-date-picker clearable
+                        v-model="queryParams.collectTime"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="请选择采集时间"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="A项电压" prop="vA">
+        <el-input
+          v-model="queryParams.vA"
+          placeholder="请输入A项电压"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="B项电压" prop="vB">
+        <el-input
+          v-model="queryParams.vB"
+          placeholder="请输入B项电压"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="C项电压" prop="vC">
+        <el-input
+          v-model="queryParams.vC"
+          placeholder="请输入C项电压"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="A项电流" prop="iA">
+        <el-input
+          v-model="queryParams.iA"
+          placeholder="请输入A项电流"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="B项电流" prop="iB">
+        <el-input
+          v-model="queryParams.iB"
+          placeholder="请输入B项电流"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="C项电流" prop="iC">
+        <el-input
+          v-model="queryParams.iC"
+          placeholder="请输入C项电流"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="记录时间" prop="recordTime">
+        <el-date-picker clearable
+                        v-model="queryParams.recordTime"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="请选择记录时间"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="功率因数" prop="glys">
+        <el-input
+          v-model="queryParams.glys"
+          placeholder="请输入功率因数"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="正向有功" prop="zxyg">
+        <el-input
+          v-model="queryParams.zxyg"
+          placeholder="请输入正向有功"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="有功功率" prop="activePower">
+        <el-input
+          v-model="queryParams.activePower"
+          placeholder="请输入有功功率"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="无功功率" prop="reactivePower">
+        <el-input
+          v-model="queryParams.reactivePower"
+          placeholder="请输入无功功率"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="采集方式" prop="collectType">
+        <el-select v-model="queryParams.collectType" placeholder="请选择采集方式" clearable>
+          <el-option
+            v-for="dict in dict.type.collect_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['ems/record:recordDnbInstant:add']"
+        >新增
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['ems/record:recordDnbInstant:edit']"
+        >修改
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['ems/record:recordDnbInstant:remove']"
+        >删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['ems/record:recordDnbInstant:export']"
+        >导出
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="recordDnbInstantList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="编号" align="center" prop="objId" v-if="columns[0].visible"/>
+      <el-table-column label="计量设备编号" align="center" prop="monitorId" v-if="columns[1].visible"/>
+      <el-table-column label="采集时间" align="center" prop="collectTime" width="180" v-if="columns[2].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.collectTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="A项电压" align="center" prop="vA" v-if="columns[3].visible"/>
+      <el-table-column label="B项电压" align="center" prop="vB" v-if="columns[4].visible"/>
+      <el-table-column label="C项电压" align="center" prop="vC" v-if="columns[5].visible"/>
+      <el-table-column label="A项电流" align="center" prop="iA" v-if="columns[6].visible"/>
+      <el-table-column label="B项电流" align="center" prop="iB" v-if="columns[7].visible"/>
+      <el-table-column label="C项电流" align="center" prop="iC" v-if="columns[8].visible"/>
+      <el-table-column label="记录时间" align="center" prop="recordTime" width="180" v-if="columns[9].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.recordTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="功率因数" align="center" prop="glys" v-if="columns[10].visible"/>
+      <el-table-column label="正向有功" align="center" prop="zxyg" v-if="columns[11].visible"/>
+      <el-table-column label="有功功率" align="center" prop="activePower" v-if="columns[12].visible"/>
+      <el-table-column label="无功功率" align="center" prop="reactivePower" v-if="columns[13].visible"/>
+      <el-table-column label="采集方式" align="center" prop="collectType" v-if="columns[14].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.collect_type" :value="scope.row.collectType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['ems/record:recordDnbInstant:edit']"
+          >修改
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['ems/record:recordDnbInstant:remove']"
+          >删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改电实时数据对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="计量设备编号" prop="monitorId">
+          <el-input v-model="form.monitorId" placeholder="请输入计量设备编号"/>
+        </el-form-item>
+        <el-form-item label="采集时间" prop="collectTime">
+          <el-date-picker clearable
+                          v-model="form.collectTime"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择采集时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="A项电压" prop="vA">
+          <el-input v-model="form.vA" placeholder="请输入A项电压"/>
+        </el-form-item>
+        <el-form-item label="B项电压" prop="vB">
+          <el-input v-model="form.vB" placeholder="请输入B项电压"/>
+        </el-form-item>
+        <el-form-item label="C项电压" prop="vC">
+          <el-input v-model="form.vC" placeholder="请输入C项电压"/>
+        </el-form-item>
+        <el-form-item label="A项电流" prop="iA">
+          <el-input v-model="form.iA" placeholder="请输入A项电流"/>
+        </el-form-item>
+        <el-form-item label="B项电流" prop="iB">
+          <el-input v-model="form.iB" placeholder="请输入B项电流"/>
+        </el-form-item>
+        <el-form-item label="C项电流" prop="iC">
+          <el-input v-model="form.iC" placeholder="请输入C项电流"/>
+        </el-form-item>
+        <el-form-item label="记录时间" prop="recordTime">
+          <el-date-picker clearable
+                          v-model="form.recordTime"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择记录时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="功率因数" prop="glys">
+          <el-input v-model="form.glys" placeholder="请输入功率因数"/>
+        </el-form-item>
+        <el-form-item label="正向有功" prop="zxyg">
+          <el-input v-model="form.zxyg" placeholder="请输入正向有功"/>
+        </el-form-item>
+        <el-form-item label="有功功率" prop="activePower">
+          <el-input v-model="form.activePower" placeholder="请输入有功功率"/>
+        </el-form-item>
+        <el-form-item label="无功功率" prop="reactivePower">
+          <el-input v-model="form.reactivePower" placeholder="请输入无功功率"/>
+        </el-form-item>
+        <el-form-item label="采集方式" prop="collectType">
+          <el-radio-group v-model="form.collectType">
+            <el-radio
+              v-for="dict in dict.type.collect_type"
+              :key="dict.value"
+              :label="parseInt(dict.value)"
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listRecordDnbInstant,
+  getRecordDnbInstant,
+  delRecordDnbInstant,
+  addRecordDnbInstant,
+  updateRecordDnbInstant
+} from '@/api/ems/record/recordDnbInstant'
+
+export default {
+  name: 'RecordDnbInstant',
+  dicts: ['collect_type'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 电实时数据表格数据
+      recordDnbInstantList: [],
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        monitorId: null,
+        collectTime: null,
+        vA: null,
+        vB: null,
+        vC: null,
+        iA: null,
+        iB: null,
+        iC: null,
+        recordTime: null,
+        glys: null,
+        zxyg: null,
+        activePower: null,
+        reactivePower: null,
+        collectType: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        objId: [
+          { required: true, message: '编号不能为空', trigger: 'blur' }
+        ]
+      },
+      columns: [
+        { key: 0, label: `编号`, visible: false },
+        { key: 1, label: `计量设备编号`, visible: true },
+        { key: 2, label: `采集时间`, visible: true },
+        { key: 3, label: `A项电压`, visible: true },
+        { key: 4, label: `B项电压`, visible: true },
+        { key: 5, label: `C项电压`, visible: true },
+        { key: 6, label: `A项电流`, visible: true },
+        { key: 7, label: `B项电流`, visible: true },
+        { key: 8, label: `C项电流`, visible: true },
+        { key: 9, label: `记录时间`, visible: true },
+        { key: 10, label: `功率因数`, visible: true },
+        { key: 11, label: `正向有功`, visible: true },
+        { key: 12, label: `有功功率`, visible: false },
+        { key: 13, label: `无功功率`, visible: false },
+        { key: 14, label: `采集方式`, visible: true }
+      ]
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    /** 查询电实时数据列表 */
+    getList() {
+      this.loading = true
+      listRecordDnbInstant(this.queryParams).then(response => {
+        this.recordDnbInstantList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        objId: null,
+        monitorId: null,
+        collectTime: null,
+        vA: null,
+        vB: null,
+        vC: null,
+        iA: null,
+        iB: null,
+        iC: null,
+        recordTime: null,
+        glys: null,
+        zxyg: null,
+        activePower: null,
+        reactivePower: null,
+        collectType: null
+      }
+      this.resetForm('form')
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm('queryForm')
+      this.handleQuery()
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.objId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = '添加电实时数据'
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset()
+      const objId = row.objId || this.ids
+      getRecordDnbInstant(objId).then(response => {
+        this.form = response.data
+        this.open = true
+        this.title = '修改电实时数据'
+      })
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          if (this.form.objId != null) {
+            updateRecordDnbInstant(this.form).then(response => {
+              this.$modal.msgSuccess('修改成功')
+              this.open = false
+              this.getList()
+            })
+          } else {
+            addRecordDnbInstant(this.form).then(response => {
+              this.$modal.msgSuccess('新增成功')
+              this.open = false
+              this.getList()
+            })
+          }
+        }
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const objIds = row.objId || this.ids
+      this.$modal.confirm('是否确认删除电实时数据编号为"' + objIds + '"的数据项？').then(function() {
+        return delRecordDnbInstant(objIds)
+      }).then(() => {
+        this.getList()
+        this.$modal.msgSuccess('删除成功')
+      }).catch(() => {
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('ems/record/recordDnbInstant/export', {
+        ...this.queryParams
+      }, `recordDnbInstant_${new Date().getTime()}.xlsx`)
+    }
+  }
+}
+</script>
diff --git a/src/views/mes/base/baseMaterialInfo/index.vue b/src/views/mes/base/baseMaterialInfo/index.vue
index 2478a43..a36b35b 100644
--- a/src/views/mes/base/baseMaterialInfo/index.vue
+++ b/src/views/mes/base/baseMaterialInfo/index.vue
@@ -25,10 +25,10 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-<!--      <el-form-item label="所属工位" prop="productLineCode">-->
+<!--      <el-form-item label="生产工位" prop="productLineCode">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.productLineCode"-->
-<!--          placeholder="请输入所属工位"-->
+<!--          placeholder="请输入生产工位"-->
 <!--          clearable-->
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
@@ -93,15 +93,23 @@
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
       <el-table-column label="物料编码" align="center" prop="materialCode" v-if="columns[1].visible"/>
-      <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[2].visible"/>
+      <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[2].visible" width="180"/>
       <el-table-column label="物料大类" align="center" prop="materialCategories" v-if="columns[3].visible"/>
-      <el-table-column label="物料小类" align="center" prop="materialSubclass" v-if="columns[4].visible"/>
+      <el-table-column label="物料小类" align="center" prop="materialSubclass" v-if="columns[4].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.material_subclass" :value="scope.row.materialSubclass"/>
+        </template>
+      </el-table-column>
       <el-table-column label="SAP物料类型" align="center" prop="materialType" v-if="columns[5].visible"/>
-      <el-table-column label="计量单位" align="center" prop="materialUnit" v-if="columns[6].visible"/>
+      <el-table-column label="计量单位" align="center" prop="materialUnit" v-if="columns[6].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.material_unit" :value="scope.row.materialUnit"/>
+        </template>
+      </el-table-column>
       <el-table-column label="单位工资(元)" align="center" prop="unitPrice" v-if="columns[7].visible"/>
       <el-table-column label="物料型号" align="center" prop="materialSpecifications" v-if="columns[8].visible"/>
       <el-table-column label="工厂编号" align="center" prop="factoryCode" v-if="columns[9].visible"/>
-      <el-table-column label="所属工位" align="center" prop="productLineCode" v-if="columns[10].visible"/>
+      <el-table-column label="生产工位" align="center" prop="productLineName" v-if="columns[10].visible"/>
       <el-table-column label="是否标识" align="center" prop="isFlag" v-if="columns[11].visible">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
@@ -153,6 +161,19 @@
         <el-form-item label="物料名称" prop="materialName">
           <el-input v-model="form.materialName" placeholder="请输入物料名称"/>
         </el-form-item>
+        <el-form-item label="物料型号" prop="materialSpecifications">
+          <el-input v-model="form.materialSpecifications" placeholder="请输入物料型号"/>
+        </el-form-item>
+        <el-form-item label="生产工位" prop="productLineCode">
+          <el-select v-model="form.productLineCode" placeholder="请选择生产工位">
+            <el-option
+              v-for="item in productLineList"
+              :key="item.productLineCode"
+              :label="item.productLineName"
+              :value="item.productLineCode"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item label="物料小类" prop="materialSubclass">
           <el-radio-group v-model="form.materialSubclass">
             <el-radio
@@ -164,19 +185,20 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="计量单位" prop="materialUnit">
-          <el-input v-model="form.materialUnit" placeholder="请输入计量单位"/>
+          <el-radio-group v-model="form.materialUnit">
+            <el-radio
+              v-for="dict in dict.type.material_unit"
+              :key="dict.value"
+              :label="dict.value"
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
         </el-form-item>
         <el-form-item label="单位工资(元)" prop="unitPrice">
           <el-input-number v-model="form.unitPrice" placeholder="请输入单位工资(元)"/>
         </el-form-item>
-        <el-form-item label="物料型号" prop="materialSpecifications">
-          <el-input v-model="form.materialSpecifications" placeholder="请输入物料型号"/>
-        </el-form-item>
 <!--        <el-form-item label="工厂编号" prop="factoryCode">-->
 <!--          <el-input v-model="form.factoryCode" placeholder="请输入工厂编号"/>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="所属工位" prop="productLineCode">-->
-<!--          <el-input v-model="form.productLineCode" placeholder="请输入所属工位"/>-->
 <!--        </el-form-item>-->
         <el-form-item label="是否标识" prop="isFlag">
           <el-radio-group v-model="form.isFlag">
@@ -220,10 +242,11 @@ import {
   addBaseMaterialInfo,
   updateBaseMaterialInfo
 } from '@/api/mes/base/baseMaterialInfo'
+import { getBaseProductLineList } from '@/api/mes/base/baseProductLine'
 
 export default {
   name: 'BaseMaterialInfo',
-  dicts: ['material_subclass', 'is_flag'],
+  dicts: ['material_subclass', 'is_flag', 'material_unit'],
   data() {
     return {
       // 遮罩层
@@ -284,8 +307,8 @@ export default {
         { key: 6, label: `计量单位`, visible: true },
         { key: 7, label: `单位工资(元)`, visible: true },
         { key: 8, label: `物料型号`, visible: true },
-        { key: 9, label: `工厂编号`, visible: true },
-        { key: 10, label: `所属工位`, visible: true },
+        { key: 9, label: `工厂编号`, visible: false },
+        { key: 10, label: `生产工位`, visible: true },
         { key: 11, label: `是否标识`, visible: true },
         { key: 12, label: `创建人`, visible: false },
         { key: 13, label: `创建时间`, visible: false },
@@ -294,10 +317,15 @@ export default {
         { key: 16, label: `增量日期`, visible: true },
         { key: 17, label: `商品编码`, visible: false },
         { key: 18, label: `商品名称`, visible: false }
-      ]
+      ],
+      // 产线选项
+      productLineList: []
     }
   },
   created() {
+    getBaseProductLineList({ productLineType: 2 }).then(response => {
+      this.productLineList = response.data
+    })
     this.getList()
   },
   methods: {
@@ -324,7 +352,7 @@ export default {
         materialCategories: null,
         materialSubclass: '1',
         materialType: null,
-        materialUnit: null,
+        materialUnit: '1',
         unitPrice: null,
         materialSpecifications: null,
         factoryCode: null,
diff --git a/src/views/mes/prod/prodBomInfo/addBom.vue b/src/views/mes/prod/prodBomInfo/addBom.vue
new file mode 100644
index 0000000..315c5f5
--- /dev/null
+++ b/src/views/mes/prod/prodBomInfo/addBom.vue
@@ -0,0 +1,318 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="物料编码" prop="materialCode">
+        <el-input
+          v-model="queryParams.materialCode"
+          placeholder="请输入物料编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="物料名称" prop="materialName">
+        <el-input
+          v-model="queryParams.materialName"
+          placeholder="请输入物料名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!--      <el-form-item label="工厂编号" prop="factoryCode">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.factoryCode"-->
+      <!--          placeholder="请输入工厂编号"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="生产工位" prop="productLineCode">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.productLineCode"-->
+      <!--          placeholder="请输入生产工位"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+<!--    <el-row :gutter="10" class="mb8">-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['mes/base:baseMaterialInfo:add']"-->
+<!--        >新增-->
+<!--        </el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          plain-->
+<!--          icon="el-icon-edit"-->
+<!--          size="mini"-->
+<!--          :disabled="single"-->
+<!--          @click="handleUpdate"-->
+<!--          v-hasPermi="['mes/base:baseMaterialInfo:edit']"-->
+<!--        >修改-->
+<!--        </el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="el-icon-delete"-->
+<!--          size="mini"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['mes/base:baseMaterialInfo:remove']"-->
+<!--        >删除-->
+<!--        </el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['mes/base:baseMaterialInfo:export']"-->
+<!--        >导出-->
+<!--        </el-button>-->
+<!--      </el-col>-->
+<!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>-->
+<!--    </el-row>-->
+
+    <el-table v-loading="loading" :data="baseMaterialInfoList" @selection-change="handleSelectionChange"
+              @row-click="handleRowClick"
+              highlight-current-row
+    >
+<!--      <el-table-column type="selection" width="55" align="center"/>-->
+      <el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
+      <el-table-column label="物料编码" align="center" prop="materialCode" v-if="columns[1].visible" width="100"/>
+      <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[2].visible" width="180"/>
+      <el-table-column label="物料大类" align="center" prop="materialCategories" v-if="columns[3].visible"/>
+      <el-table-column label="物料小类" align="center" prop="materialSubclass" v-if="columns[4].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.material_subclass" :value="scope.row.materialSubclass"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="SAP物料类型" align="center" prop="materialType" v-if="columns[5].visible"/>
+      <el-table-column label="计量单位" align="center" prop="materialUnit" v-if="columns[6].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.material_unit" :value="scope.row.materialUnit"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="单位工资(元)" align="center" prop="unitPrice" v-if="columns[7].visible" width="100"/>
+      <el-table-column label="生产工位" align="center" prop="productLineName" v-if="columns[10].visible"/>
+      <el-table-column label="物料型号" align="center" prop="materialSpecifications" v-if="columns[8].visible"/>
+      <el-table-column label="工厂编号" align="center" prop="factoryCode" v-if="columns[9].visible"/>
+      <el-table-column label="是否标识" align="center" prop="isFlag" v-if="columns[11].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="增量日期" align="center" prop="incrementDate" width="180" v-if="columns[16].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.incrementDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="商品编码" align="center" prop="productCode" v-if="columns[17].visible"/>
+      <el-table-column label="商品名称" align="center" prop="productName" v-if="columns[18].visible"/>
+<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-edit"-->
+<!--            @click="handleUpdate(scope.row)"-->
+<!--            v-hasPermi="['mes/base:baseMaterialInfo:edit']"-->
+<!--          >修改-->
+<!--          </el-button>-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--            v-hasPermi="['mes/base:baseMaterialInfo:remove']"-->
+<!--          >删除-->
+<!--          </el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+
+  </div>
+</template>
+
+<script>
+import {
+  listBaseMaterialInfo,
+  getBaseMaterialInfo,
+  delBaseMaterialInfo,
+  addBaseMaterialInfo,
+  updateBaseMaterialInfo
+} from '@/api/mes/base/baseMaterialInfo'
+import { getBaseProductLineList } from '@/api/mes/base/baseProductLine'
+
+export default {
+  name: 'BaseMaterialInfo',
+  dicts: ['material_subclass', 'is_flag', 'material_unit'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 物料信息表格数据
+      baseMaterialInfoList: [],
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        materialCode: null,
+        materialName: null,
+        materialCategories: null,
+        materialSubclass: null,
+        materialType: null,
+        materialUnit: null,
+        unitPrice: null,
+        materialSpecifications: null,
+        factoryCode: null,
+        productLineCode: null,
+        isFlag: null,
+        incrementDate: null,
+        productCode: null,
+        productName: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        objId: [
+          { required: true, message: '主键标识不能为空', trigger: 'blur' }
+        ],
+        materialCode: [
+          { required: true, message: '物料编码不能为空', trigger: 'blur' }
+        ]
+      },
+      columns: [
+        { key: 0, label: `主键标识`, visible: false },
+        { key: 1, label: `物料编码`, visible: true },
+        { key: 2, label: `物料名称`, visible: true },
+        { key: 3, label: `物料大类`, visible: false },
+        { key: 4, label: `物料小类`, visible: true },
+        { key: 5, label: `SAP物料类型`, visible: false },
+        { key: 6, label: `计量单位`, visible: true },
+        { key: 7, label: `单位工资(元)`, visible: true },
+        { key: 8, label: `物料型号`, visible: true },
+        { key: 9, label: `工厂编号`, visible: false },
+        { key: 10, label: `生产工位`, visible: true },
+        { key: 11, label: `是否标识`, visible: true },
+        { key: 12, label: `创建人`, visible: false },
+        { key: 13, label: `创建时间`, visible: false },
+        { key: 14, label: `更新人`, visible: false },
+        { key: 15, label: `更新时间`, visible: false },
+        { key: 16, label: `增量日期`, visible: true },
+        { key: 17, label: `商品编码`, visible: false },
+        { key: 18, label: `商品名称`, visible: false }
+      ],
+      // 产线选项
+      productLineList: []
+    }
+  },
+  created() {
+    getBaseProductLineList({ productLineType: 2 }).then(response => {
+      this.productLineList = response.data
+    })
+    this.getList()
+  },
+  methods: {
+    /** 查询物料信息列表 */
+    getList() {
+      this.loading = true
+      listBaseMaterialInfo(this.queryParams).then(response => {
+        this.baseMaterialInfoList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    handleRowClick(row) {
+      this.selectedRow = row
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        objId: null,
+        materialCode: null,
+        materialName: null,
+        materialCategories: null,
+        materialSubclass: '1',
+        materialType: null,
+        materialUnit: '1',
+        unitPrice: null,
+        materialSpecifications: null,
+        factoryCode: null,
+        productLineCode: null,
+        isFlag: '0',
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        incrementDate: null,
+        productCode: null,
+        productName: null
+      }
+      this.resetForm('form')
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm('queryForm')
+      this.handleQuery()
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.objId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+
+  }
+}
+</script>
diff --git a/src/views/mes/prod/prodBomInfo/childIndex.vue b/src/views/mes/prod/prodBomInfo/childIndex.vue
new file mode 100644
index 0000000..101ec70
--- /dev/null
+++ b/src/views/mes/prod/prodBomInfo/childIndex.vue
@@ -0,0 +1,383 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="物料编码" prop="materialCode">
+        <el-input
+          v-model="queryParams.materialCode"
+          placeholder="请输入物料编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="物料名称" prop="materialName">
+        <el-input
+          v-model="queryParams.materialName"
+          placeholder="请输入物料名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['base:orderBomInfo:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-sort"
+          size="mini"
+          @click="toggleExpandAll"
+        >展开/折叠</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-close"
+          size="mini"
+          @click="handleClose"
+        >关闭</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-if="refreshTable"
+      v-loading="loading"
+      :data="orderBomInfoList"
+      row-key="materialCode"
+      :default-expand-all="isExpandAll"
+      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+    >
+      <!--      <el-table-column label="BOM编号" prop="bomCode" />-->
+      <el-table-column label="物料编码" align="center" prop="materialCode" />
+      <el-table-column label="物料名称" align="center" prop="materialName" />
+      <el-table-column label="物料类别" align="center" prop="materialType">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.material_type" :value="scope.row.materialType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="标准数量" align="center" prop="standardAmount" />
+      <el-table-column label="父级编号" align="center" prop="parentId" />
+      <el-table-column label="工厂编号" align="center" prop="factoryCode" />
+<!--      <el-table-column label="排序" align="center" prop="sort" />-->
+<!--      <el-table-column label="销售凭证" align="center" prop="vbeln" />-->
+<!--      <el-table-column label="销售单据项目" align="center" prop="vbpos" />-->
+      <!--      <el-table-column label="启用标识" align="center" prop="isFlag">-->
+      <!--        <template slot-scope="scope">-->
+      <!--          <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
+      <!--      <el-table-column label="创建人" align="center" prop="createdBy" />-->
+      <!--      <el-table-column label="创建时间" align="center" prop="createdTime" width="180">-->
+      <!--        <template slot-scope="scope">-->
+      <!--          <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d}') }}</span>-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
+      <!--      <el-table-column label="更新人" align="center" prop="updatedBy" />-->
+      <!--      <el-table-column label="更新时间" align="center" prop="updatedTime" width="180">-->
+      <!--        <template slot-scope="scope">-->
+      <!--          <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d}') }}</span>-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['base:orderBomInfo:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-plus"
+            @click="handleAdd(scope.row)"
+            v-hasPermi="['base:orderBomInfo:add']"
+          >新增</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['base:orderBomInfo:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 添加或修改订单BOM对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="父级编号" prop="parentId">
+          <treeselect v-model="form.parentId" :options="orderBomInfoOptions" :normalizer="normalizer" placeholder="请选择父级编号" />
+        </el-form-item>
+        <el-form-item label="BOM编号" prop="bomCode">
+          <el-input v-model="form.bomCode" placeholder="请输入BOM编号" />
+        </el-form-item>
+        <el-form-item label="物料编码" prop="materialCode">
+          <el-input v-model="form.materialCode" placeholder="请输入物料编码" />
+        </el-form-item>
+        <el-form-item label="物料名称" prop="materialName">
+          <el-input v-model="form.materialName" placeholder="请输入物料名称" />
+        </el-form-item>
+        <el-form-item label="物料类别" prop="materialType">
+          <el-select v-model="form.materialType" placeholder="请选择物料类别">
+            <el-option
+              v-for="dict in dict.type.material_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="标准数量" prop="standardAmount">
+          <el-input v-model="form.standardAmount" placeholder="请输入标准数量" />
+        </el-form-item>
+        <el-form-item label="工厂编号" prop="factoryCode">
+          <el-input v-model="form.factoryCode" placeholder="请输入工厂编号" />
+        </el-form-item>
+        <el-form-item label="排序" prop="sort">
+          <el-input v-model="form.sort" placeholder="请输入排序" />
+        </el-form-item>
+        <el-form-item label="销售凭证" prop="vbeln">
+          <el-input v-model="form.vbeln" placeholder="请输入销售凭证" />
+        </el-form-item>
+        <el-form-item label="销售单据项目" prop="vbpos">
+          <el-input v-model="form.vbpos" placeholder="请输入销售单据项目" />
+        </el-form-item>
+        <!--        <el-form-item label="启用标识" prop="isFlag">-->
+        <!--          <el-radio-group v-model="form.isFlag">-->
+        <!--            <el-radio-->
+        <!--              v-for="dict in dict.type.is_flag"-->
+        <!--              :key="dict.value"-->
+        <!--              :label="parseInt(dict.value)"-->
+        <!--            >{{dict.label}}</el-radio>-->
+        <!--          </el-radio-group>-->
+        <!--        </el-form-item>-->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  getProdBomInfo,
+  delProdBomInfo,
+  addProdBomInfo,
+  updateProdBomInfo,
+  findOrderBomList
+} from '@/api/mes/prod/prodBomInfo'
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "OrderBomInfo",
+  dicts: ['material_type', 'is_flag'],
+  components: {
+    Treeselect
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 订单BOM表格数据
+      orderBomInfoList: [],
+      // 订单BOM树选项
+      orderBomInfoOptions: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 是否展开，默认全部展开
+      isExpandAll: true,
+      // 重新渲染表格状态
+      refreshTable: true,
+      // 查询参数
+      queryParams: {
+        bomCode: null,
+        materialCode: null,
+        materialName: null,
+        materialType: null,
+        standardAmount: null,
+        parentId: null,
+        isFlag: null,
+        createdBy: null,
+        createdTime: null,
+        updatedBy: null,
+        updatedTime: null,
+        factoryCode: null,
+        sort: null,
+        vbeln: null,
+        vbpos: null,
+        ancestors: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.queryParams.ancestors = this.$route.params && this.$route.params.materialCode;
+    console.log( this.queryParams.ancestors)
+    this.getList();
+  },
+  methods: {
+    /** 查询订单BOM列表 */
+    getList() {
+      this.loading = true;
+      findOrderBomList(this.queryParams).then(response => {
+        this.orderBomInfoList = this.handleTree(response.data, "materialCode", "parentId");
+        this.loading = false;
+      });
+    },
+    /** 转换订单BOM数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.materialCode,
+        label: node.materialName,
+        children: node.children
+      };
+    },
+    /** 查询订单BOM下拉树结构 */
+    getTreeselect() {
+      findOrderBomList().then(response => {
+        this.orderBomInfoOptions = [];
+        const data = { materialCode: 0, materialName: '顶级节点', children: [] };
+        data.children = this.handleTree(response.data, "materialCode", "parentId");
+        this.orderBomInfoOptions.push(data);
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        objId: null,
+        bomCode: null,
+        materialCode: null,
+        materialName: null,
+        materialType: null,
+        standardAmount: null,
+        parentId: null,
+        isFlag: 0,
+        createdBy: null,
+        createdTime: null,
+        updatedBy: null,
+        updatedTime: null,
+        factoryCode: null,
+        sort: null,
+        vbeln: null,
+        vbpos: null,
+        ancestors: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd(row) {
+      this.reset();
+      this.getTreeselect();
+      if (row != null && row.materialCode) {
+        this.form.parentId = row.materialCode;
+      } else {
+        this.form.parentId = 0;
+      }
+      this.open = true;
+      this.title = "添加订单BOM";
+    },
+    /** 返回按钮操作 */
+    handleClose() {
+      const obj = { path: "/base/orderBomInfo" };
+      this.$tab.closeOpenPage(obj);
+    },
+    /** 展开/折叠操作 */
+    toggleExpandAll() {
+      this.refreshTable = false;
+      this.isExpandAll = !this.isExpandAll;
+      this.$nextTick(() => {
+        this.refreshTable = true;
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      this.getTreeselect();
+      if (row != null) {
+        this.form.parentId = row.parentId;
+      }
+      getProdBomInfo(row.objId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改订单BOM";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.objId != null) {
+            updateProdBomInfo(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addProdBomInfo(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      this.$modal.confirm('是否确认删除订单BOM编号为"' + row.objId + '"的数据项？').then(function() {
+        return delProdBomInfo(row.objId);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/src/views/mes/prod/prodBomInfo/index.vue b/src/views/mes/prod/prodBomInfo/index.vue
new file mode 100644
index 0000000..2159254
--- /dev/null
+++ b/src/views/mes/prod/prodBomInfo/index.vue
@@ -0,0 +1,448 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="成品物料编号" prop="materialCode">
+        <el-input
+          v-model="queryParams.materialCode"
+          placeholder="请输入成品物料编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="成品物料名称" prop="materialName">
+        <el-input
+          v-model="queryParams.materialName"
+          placeholder="请输入成品物料名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+<!--      <el-form-item label="是否可生产" prop="isPlanToStation">-->
+<!--        <el-select v-model="queryParams.isPlanToStation" placeholder="请选择是否可生产" clearable>-->
+<!--          <el-option-->
+<!--            v-for="dict in dict.type.is_release"-->
+<!--            :key="dict.value"-->
+<!--            :label="dict.label"-->
+<!--            :value="dict.value"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['mes/prod:prodBomInfo:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['mes/prod:prodBomInfo:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['mes/prod:prodBomInfo:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['mes/prod:prodBomInfo:export']"
+        >导出</el-button>
+      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="AutomaticSynchronizationBOM"-->
+<!--        >自动同步生产BOM</el-button>-->
+<!--      </el-col>-->
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="prodBomInfoList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
+      <el-table-column label="BOM编号" align="center" prop="bomCode" v-if="columns[1].visible"/>
+      <el-table-column label="成品物料编号" align="center" prop="materialCode" v-if="columns[2].visible">
+        <template slot-scope="scope">
+          <router-link :to="'/production/bom-info/index/' + scope.row.materialCode" class="link-type">
+            <span>{{ scope.row.materialCode }}</span>
+          </router-link>
+        </template>
+      </el-table-column>
+      <el-table-column label="成品物料名称" align="center" prop="materialName" v-if="columns[3].visible"/>
+      <el-table-column label="物料小类" align="center" prop="materialType" v-if="columns[4].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.material_subclass" :value="scope.row.materialType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="标准数量" align="center" prop="standardAmount" v-if="columns[5].visible"/>
+      <!--      <el-table-column label="父物料编号" align="center" prop="parentId" v-if="columns[6].visible"/>-->
+      <el-table-column label="工厂名称" align="center" prop="plantName" v-if="columns[7].visible"/>
+      <!--      <el-table-column label="产线/工位" align="center" prop="productLineCode" v-if="columns[8].visible"/>-->
+      <!--      <el-table-column label="工单编号" align="center" prop="orderCode" v-if="columns[14].visible"/>-->
+      <el-table-column label="是否可生产" align="center" prop="isPlanToStation" v-if="columns[9].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.is_release" :value="scope.row.isPlanToStation"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建人" align="center" prop="createBy" v-if="columns[10].visible"/>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[11].visible">
+        <template slot-scope="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" v-if="columns[12].visible"/>
+      <el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[13].visible">
+        <template slot-scope="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 slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['mes/prod:prodBomInfo:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['mes/prod:prodBomInfo:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改生产BOM对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="成品物料编号" prop="materialCode">
+          <el-input v-model="form.materialCode" placeholder="请输入成品物料编号" disabled/>
+        </el-form-item>
+        <el-form-item label="成品物料名称" prop="materialName">
+          <el-input v-model="form.materialName" placeholder="请输入物料名称" >
+            <el-button slot="append" icon="el-icon-search"  @click="handleMaterialAdd"></el-button>
+          </el-input>
+        </el-form-item>
+<!--        <el-form-item label="所属工厂">-->
+<!--          <el-select v-model="form.plantCode" placeholder="请选择所属工厂">-->
+<!--            <el-option-->
+<!--              v-for="item in factoryList"-->
+<!--              :key="item.factoryCode"-->
+<!--              :label="item.factoryName"-->
+<!--              :value="item.factoryCode"-->
+<!--            ></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="物料小类" prop="materialType">-->
+<!--          <el-select v-model="form.materialType" placeholder="请选择物料小类">-->
+<!--            <el-option-->
+<!--              v-for="dict in dict.type.material_subclass"-->
+<!--              :key="dict.value"-->
+<!--              :label="dict.label"-->
+<!--              :value="dict.value"-->
+<!--            ></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+        <!--        <el-form-item label="标准数量" prop="standardAmount">-->
+        <!--          <el-input v-model="form.standardAmount" placeholder="请输入标准数量" />-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="父物料编号" prop="parentId">-->
+        <!--          <el-input v-model="form.parentId" placeholder="请输入父物料编号" />-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="产线/工位" prop="productLineCode">-->
+        <!--          <el-input v-model="form.productLineCode" placeholder="请输入产线/工位" />-->
+        <!--        </el-form-item>-->
+        <el-form-item label="启用标识" prop="isFlag">
+          <el-radio-group v-model="form.isFlag">
+            <el-radio
+              v-for="dict in dict.type.is_flag"
+              :key="dict.value"
+              :label="parseInt(dict.value)"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 添加物料信息对话框 -->
+    <el-dialog title="添加成品BOM明细" :visible.sync="materialOpen"  width="900px" append-to-body>
+      <add-bom @selection="handleSelection" ref="materialRef"></add-bom>
+      <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>
+import {
+  listProdBomInfo,
+  getProdBomInfo,
+  delProdBomInfo,
+  addProdBomInfo,
+  updateProdBomInfo
+} from '@/api/mes/prod/prodBomInfo'
+import {getBaseFactoryList} from "@//api/mes/base/baseFactory";
+import addBom from '@//views/mes/prod/prodBomInfo/addBom.vue';
+
+export default {
+  name: 'ProdBomInfo',
+  dicts: ['is_flag'],
+  components: {
+    'add-bom': addBom
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 生产BOM表格数据
+      prodBomInfoList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 是否显示物料弹出层
+      materialOpen: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        bomCode: null,
+        materialCode: null,
+        materialName: null,
+        materialType: '1',
+        standardAmount: null,
+        parentId: null,
+        plantCode: null,
+        productLineCode: null,
+        isPlanToStation: null,
+        isFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        orderCode: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      },
+      columns: [
+        { key: 0, label: `主键标识`, visible: false },
+        { key: 1, label: `BOM编号`, visible: false },
+        { key: 2, label: `成品物料编号`, visible: true },
+        { key: 3, label: `成品物料名称`, visible: true },
+        { key: 4, label: `物料小类`, visible: true },
+        { key: 5, label: `标准数量`, visible: true },
+        { key: 6, label: `父物料编号`, visible: true },
+        { key: 7, label: `工厂编号`, visible: true },
+        { key: 8, label: `产线/工位`, visible: true },
+        { key: 9, label: `是否可生产`, visible: true },
+        { key: 10, label: `创建人`, visible: false },
+        { key: 11, label: `创建时间`, visible: true },
+        { key: 12, label: `更新人`, visible: false },
+        { key: 13, label: `更新时间`, visible: false },
+        { key: 14, label: `工单编号`, visible: true },
+      ],
+      // 工厂选项
+      factoryList: []
+    };
+  },
+  create() {
+    this.getList();
+    getBaseFactoryList().then(response => {
+      this.factoryList = response.data;
+    });
+  },
+  methods: {
+    /** 查询生产BOM列表 */
+    getList() {
+      this.loading = true;
+      listProdBomInfo(this.queryParams).then(response => {
+        this.prodBomInfoList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        objId: null,
+        bomCode: null,
+        materialCode: null,
+        materialName: null,
+        materialType: 1,
+        standardAmount: 1,
+        parentId: null,
+        plantCode: null,
+        productLineCode: null,
+        isPlanToStation: null,
+        isFlag: 0,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        orderCode: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    handleSelection(selection) {
+      this.ids = selection.map(item => item.objId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.objId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加生产BOM";
+    },
+    /** 新增按钮操作 */
+    handleMaterialAdd() {
+      this.materialOpen = true;
+      // this.title = "添加订单BOM";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const objId = row.objId || this.ids
+      getProdBomInfo(objId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改生产BOM";
+      });
+    },
+    /** 提交物料信息按钮 */
+    submitMaterialForm() {
+      let selectedRow = this.$refs.materialRef.selectedRow;
+      // this.form.bomCode = selectedRow.bomCode;
+      this.form.materialCode = selectedRow.materialCode;
+      this.form.materialName = selectedRow.materialName;
+      this.form.factoryCode = selectedRow.factoryCode;
+      this.materialOpen = false;
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.objId != null) {
+            updateProdBomInfo(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addProdBomInfo(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    // AutomaticSynchronizationBOM(){
+    //   addAutomaticSynchronizationBOM(this.form).then(response => {
+    //     this.$modal.msgSuccess('同步成功')
+    //     this.getList()
+    //   })
+    // },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const objIds = row.objId || this.ids;
+      this.$modal.confirm('是否确认删除生产BOM编号为"' + objIds + '"的数据项？').then(function() {
+        return delProdBomInfo(objIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('mes/prod/prodBomInfo/export', {
+        ...this.queryParams
+      }, `prodBomInfo_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>