diff --git a/src/api/mes/baseStructureBom/index.ts b/src/api/mes/baseStructureBom/index.ts
new file mode 100644
index 0000000..a55ef76
--- /dev/null
+++ b/src/api/mes/baseStructureBom/index.ts
@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { BaseStructureBomVO, BaseStructureBomForm, BaseStructureBomQuery } from '@/api/mes/baseStructureBom/types';
+
+/**
+ * 查询结构BOM信息列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listBaseStructureBom = (query?: BaseStructureBomQuery): AxiosPromise<BaseStructureBomVO[]> => {
+  return request({
+    url: '/mes/baseStructureBom/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询结构BOM信息详细
+ * @param structureBomId
+ */
+export const getBaseStructureBom = (structureBomId: string | number): AxiosPromise<BaseStructureBomVO> => {
+  return request({
+    url: '/mes/baseStructureBom/' + structureBomId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增结构BOM信息
+ * @param data
+ */
+export const addBaseStructureBom = (data: BaseStructureBomForm) => {
+  return request({
+    url: '/mes/baseStructureBom',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改结构BOM信息
+ * @param data
+ */
+export const updateBaseStructureBom = (data: BaseStructureBomForm) => {
+  return request({
+    url: '/mes/baseStructureBom',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除结构BOM信息
+ * @param structureBomId
+ */
+export const delBaseStructureBom = (structureBomId: string | number | Array<string | number>) => {
+  return request({
+    url: '/mes/baseStructureBom/' + structureBomId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询结构BOM信息列表
+ * @param query
+ * @returns {*}
+ */
+export function getBaseStructureBomList (query) {
+    return request({
+        url: '/mes/baseStructureBom/getBaseStructureBomList',
+        method: 'get',
+        params: query
+    });
+};
diff --git a/src/api/mes/baseStructureBom/types.ts b/src/api/mes/baseStructureBom/types.ts
new file mode 100644
index 0000000..6a52171
--- /dev/null
+++ b/src/api/mes/baseStructureBom/types.ts
@@ -0,0 +1,210 @@
+export interface BaseStructureBomVO {
+  /**
+   * 主键标识
+   */
+  structureBomId: string | number;
+
+  /**
+   * 租户编号
+   */
+  tenantId: string | number;
+
+  /**
+   * 父级标识
+   */
+  parentId: string | number;
+
+  /**
+   * 物料类型ID
+   */
+  materialTypeId: string | number;
+
+  /**
+   * 物料类型名称
+   */
+  materialTypeName: string;
+
+  /**
+   * 结构BOM说明
+   */
+  structureBomDesc: string;
+
+  /**
+   * 结构BOM版本
+   */
+  structureBomVersion: string;
+
+  /**
+   * 祖级列表
+   */
+  ancestors: string;
+
+  /**
+   * 层级
+   */
+  level: number;
+
+  /**
+   * 顶级标识(1是 0否)
+   */
+  topFlag: number;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+  /**
+   * 创建部门
+   */
+  createDept: number;
+
+  /**
+   * 创建人
+   */
+  createBy: number;
+
+  /**
+   * 创建时间
+   */
+  createTime: string;
+
+  /**
+   * 更新人
+   */
+  updateBy: number;
+
+  /**
+   * 更新时间
+   */
+  updateTime: string;
+
+    /**
+     * 子对象
+     */
+    children: BaseStructureBomVO[];
+}
+
+export interface BaseStructureBomForm extends BaseEntity {
+  /**
+   * 主键标识
+   */
+  structureBomId?: string | number;
+
+  /**
+   * 父级标识
+   */
+  parentId?: string | number;
+
+  /**
+   * 物料类型ID
+   */
+  materialTypeId?: string | number;
+
+  /**
+   * 物料类型名称
+   */
+  materialTypeName?: string;
+
+  /**
+   * 结构BOM说明
+   */
+  structureBomDesc?: string;
+
+  /**
+   * 结构BOM版本
+   */
+  structureBomVersion?: string;
+
+  /**
+   * 祖级列表
+   */
+  ancestors?: string;
+
+  /**
+   * 层级
+   */
+  level?: number;
+
+  /**
+   * 顶级标识(1是 0否)
+   */
+  topFlag?: number;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+}
+
+export interface BaseStructureBomQuery {
+
+  /**
+   * 主键标识
+   */
+  structureBomId?: string | number;
+
+  /**
+   * 父级标识
+   */
+  parentId?: string | number;
+
+  /**
+   * 物料类型ID
+   */
+  materialTypeId?: string | number;
+
+  /**
+   * 物料类型名称
+   */
+  materialTypeName?: string;
+
+  /**
+   * 结构BOM说明
+   */
+  structureBomDesc?: string;
+
+  /**
+   * 结构BOM版本
+   */
+  structureBomVersion?: string;
+
+  /**
+   * 祖级列表
+   */
+  ancestors?: string;
+
+  /**
+   * 层级
+   */
+  level?: number;
+
+  /**
+   * 顶级标识(1是 0否)
+   */
+  topFlag?: number;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+
diff --git a/src/api/mes/prodBaseMachineInfo/index.ts b/src/api/mes/prodBaseMachineInfo/index.ts
new file mode 100644
index 0000000..24bee0c
--- /dev/null
+++ b/src/api/mes/prodBaseMachineInfo/index.ts
@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { ProdBaseMachineInfoVO, ProdBaseMachineInfoForm, ProdBaseMachineInfoQuery } from '@/api/mes/prodBaseMachineInfo/types';
+
+/**
+ * 查询机台信息列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listProdBaseMachineInfo = (query?: ProdBaseMachineInfoQuery): AxiosPromise<ProdBaseMachineInfoVO[]> => {
+  return request({
+    url: '/mes/prodBaseMachineInfo/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询机台信息详细
+ * @param machineId
+ */
+export const getProdBaseMachineInfo = (machineId: string | number): AxiosPromise<ProdBaseMachineInfoVO> => {
+  return request({
+    url: '/mes/prodBaseMachineInfo/' + machineId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增机台信息
+ * @param data
+ */
+export const addProdBaseMachineInfo = (data: ProdBaseMachineInfoForm) => {
+  return request({
+    url: '/mes/prodBaseMachineInfo',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改机台信息
+ * @param data
+ */
+export const updateProdBaseMachineInfo = (data: ProdBaseMachineInfoForm) => {
+  return request({
+    url: '/mes/prodBaseMachineInfo',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除机台信息
+ * @param machineId
+ */
+export const delProdBaseMachineInfo = (machineId: string | number | Array<string | number>) => {
+  return request({
+    url: '/mes/prodBaseMachineInfo/' + machineId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询机台信息列表
+ * @param query
+ * @returns {*}
+ */
+export function getProdBaseMachineInfoList (query) {
+    return request({
+        url: '/mes/prodBaseMachineInfo/getProdBaseMachineInfoList',
+        method: 'get',
+        params: query
+    });
+};
diff --git a/src/api/mes/prodBaseMachineInfo/types.ts b/src/api/mes/prodBaseMachineInfo/types.ts
new file mode 100644
index 0000000..0e9eee8
--- /dev/null
+++ b/src/api/mes/prodBaseMachineInfo/types.ts
@@ -0,0 +1,191 @@
+export interface ProdBaseMachineInfoVO {
+  /**
+   * 主键标识
+   */
+  machineId: string | number;
+
+  /**
+   * 租户编号
+   */
+  tenantId: string | number;
+
+  /**
+   * 机台编号
+   */
+  machineCode: string;
+
+  /**
+   * 机台名称
+   */
+  machineName: string;
+
+  /**
+   * 资产编号
+   */
+  assetNumber: string;
+
+  /**
+   * 机台位置
+   */
+  machineLocation: string;
+
+  /**
+   * 机台类型
+   */
+  machineType: string;
+
+  /**
+   * 机台规格
+   */
+  machineSpec: string;
+
+  /**
+   * 供应商
+   */
+  supplierId: string | number;
+
+  /**
+   * 机台状态(0停用 1启用 2报废)
+   */
+  machineStatus: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+  /**
+   * 创建部门
+   */
+  createDept: number;
+
+  /**
+   * 创建人
+   */
+  createBy: number;
+
+  /**
+   * 创建时间
+   */
+  createTime: string;
+
+  /**
+   * 更新人
+   */
+  updateBy: number;
+
+  /**
+   * 更新时间
+   */
+  updateTime: string;
+
+}
+
+export interface ProdBaseMachineInfoForm extends BaseEntity {
+  /**
+   * 主键标识
+   */
+  machineId?: string | number;
+
+  /**
+   * 机台编号
+   */
+  machineCode?: string;
+
+  /**
+   * 机台名称
+   */
+  machineName?: string;
+
+  /**
+   * 资产编号
+   */
+  assetNumber?: string;
+
+  /**
+   * 机台位置
+   */
+  machineLocation?: string;
+
+  /**
+   * 机台类型
+   */
+  machineType?: string;
+
+  /**
+   * 机台规格
+   */
+  machineSpec?: string;
+
+  /**
+   * 供应商
+   */
+  supplierId?: string | number;
+
+  /**
+   * 机台状态(0停用 1启用 2报废)
+   */
+  machineStatus?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+}
+
+export interface ProdBaseMachineInfoQuery extends PageQuery {
+
+  /**
+   * 主键标识
+   */
+  machineId?: string | number;
+
+  /**
+   * 机台编号
+   */
+  machineCode?: string;
+
+  /**
+   * 机台名称
+   */
+  machineName?: string;
+
+  /**
+   * 资产编号
+   */
+  assetNumber?: string;
+
+  /**
+   * 机台位置
+   */
+  machineLocation?: string;
+
+  /**
+   * 机台类型
+   */
+  machineType?: string;
+
+  /**
+   * 机台规格
+   */
+  machineSpec?: string;
+
+  /**
+   * 供应商
+   */
+  supplierId?: string | number;
+
+  /**
+   * 机台状态(0停用 1启用 2报废)
+   */
+  machineStatus?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+
diff --git a/src/views/mes/baseStructureBom/index.vue b/src/views/mes/baseStructureBom/index.vue
new file mode 100644
index 0000000..73bd219
--- /dev/null
+++ b/src/views/mes/baseStructureBom/index.vue
@@ -0,0 +1,401 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+<!--            <el-form-item label="主键标识" prop="structureBomId">
+              <el-input v-model="queryParams.structureBomId" placeholder="请输入主键标识" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="父级标识" prop="parentId">
+              <el-input v-model="queryParams.parentId" placeholder="请输入父级标识" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+<!--            <el-form-item label="物料类型ID" prop="materialTypeId">
+              <el-input v-model="queryParams.materialTypeId" placeholder="请输入物料类型ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+<!--            <el-form-item label="物料类型名称" prop="materialTypeName">
+              <el-input v-model="queryParams.materialTypeName" placeholder="请输入物料类型名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+<!--            <el-form-item label="结构BOM说明" prop="structureBomDesc">
+              <el-input v-model="queryParams.structureBomDesc" placeholder="请输入结构BOM说明" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="结构BOM版本" prop="structureBomVersion">
+              <el-input v-model="queryParams.structureBomVersion" placeholder="请输入结构BOM版本" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="祖级列表" prop="ancestors">
+              <el-input v-model="queryParams.ancestors" placeholder="请输入祖级列表" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="层级" prop="level">
+              <el-input v-model="queryParams.level" placeholder="请输入层级" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="顶级标识" prop="topFlag">
+              <el-select v-model="queryParams.topFlag" placeholder="请选择顶级标识(1是 0否)" clearable>
+                <el-option v-for="dict in top_flag" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>-->
+            <el-form-item label="激活标识" prop="activeFlag">
+              <el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable>
+                <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd()" v-hasPermi="['mes:baseStructureBom:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="info" plain icon="Sort" @click="handleToggleExpandAll">展开/折叠</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+      <el-table
+        ref="baseStructureBomTableRef"
+        v-loading="loading"
+        :data="baseStructureBomList"
+        row-key="structureBomId"
+        :default-expand-all="isExpandAll"
+        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+      >
+<!--        <el-table-column label="主键标识" align="center" prop="structureBomId" />
+        <el-table-column label="租户编号" prop="tenantId" />
+        <el-table-column label="父级标识" align="center" prop="parentId" />-->
+<!--        <el-table-column label="物料类型ID" align="center" prop="materialTypeId" />-->
+        <el-table-column label="物料类型名称" align="center" prop="materialTypeName" />
+        <el-table-column label="结构BOM说明" align="center" prop="structureBomDesc" />
+        <el-table-column label="结构BOM版本" align="center" prop="structureBomVersion" />
+<!--        <el-table-column label="祖级列表" align="center" prop="ancestors" />-->
+        <el-table-column label="层级" align="center" prop="level" />
+        <el-table-column label="顶级标识" align="center" prop="topFlag">
+          <template #default="scope">
+            <dict-tag :options="top_flag" :value="scope.row.topFlag"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="激活标识" align="center" prop="activeFlag">
+          <template #default="scope">
+            <dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="remark" />
+<!--        <el-table-column label="创建部门" align="center" prop="createDept" />
+        <el-table-column label="创建人" align="center" prop="createBy" />
+        <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="更新人" align="center" prop="updateBy" />
+        <el-table-column label="更新时间" align="center" prop="updateTime" width="180">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>-->
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['mes:baseStructureBom:edit']" />
+            </el-tooltip>
+            <el-tooltip content="新增" placement="top">
+              <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['mes:baseStructureBom:add']" />
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['mes:baseStructureBom:remove']" />
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+    <!-- 添加或修改结构BOM信息对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="baseStructureBomFormRef" :model="form" :rules="rules" label-width="120px">
+<!--        <el-form-item label="主键标识" prop="structureBomId">
+          <el-input v-model="form.structureBomId" placeholder="请输入主键标识" />
+        </el-form-item>-->
+        <el-form-item label="父级标识" prop="parentId">
+          <el-tree-select
+            v-model="form.parentId"
+            :data="baseStructureBomOptions"
+            :props="{ value: 'structureBomId', label: 'materialTypeName', children: 'children' }"
+            value-key="structureBomId"
+            placeholder="请选择父级标识"
+            check-strictly
+          />
+        </el-form-item>
+        <el-form-item label="物料类型ID" prop="materialTypeId">
+<!--          <el-input v-model="form.materialTypeId" placeholder="请输入物料类型ID" />-->
+          <el-tree-select
+            v-model="form.materialTypeId"
+            :data="baseMaterialTypeOptions"
+            :props="{ value: 'matrialTypeId', label: 'matrialTypeName', children: 'children' }"
+            value-key="materialTypeId"
+            placeholder="请选择物料类型"
+            check-strictly
+          />
+        </el-form-item>
+        <el-form-item label="物料类型名称" prop="materialTypeName">
+          <el-input v-model="form.materialTypeName" placeholder="请输入物料类型名称" />
+        </el-form-item>
+        <el-form-item label="结构BOM说明" prop="structureBomDesc">
+          <el-input v-model="form.structureBomDesc" placeholder="请输入结构BOM说明" />
+        </el-form-item>
+        <el-form-item label="结构BOM版本" prop="structureBomVersion">
+          <el-input v-model="form.structureBomVersion" placeholder="请输入结构BOM版本" />
+        </el-form-item>
+<!--        <el-form-item label="祖级列表" prop="ancestors">
+          <el-input v-model="form.ancestors" placeholder="请输入祖级列表" />
+        </el-form-item>-->
+        <el-form-item label="层级" prop="level">
+          <el-input v-model="form.level" placeholder="请输入层级" />
+        </el-form-item>
+        <el-form-item label="顶级标识" prop="topFlag">
+          <el-radio-group v-model="form.topFlag">
+            <el-radio
+              v-for="dict in top_flag"
+              :key="dict.value"
+              :value="parseInt(dict.value)"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="激活标识" prop="activeFlag">
+          <el-radio-group v-model="form.activeFlag">
+            <el-radio
+              v-for="dict in active_flag"
+              :key="dict.value"
+              :value="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="BaseStructureBom" lang="ts">
+import { listBaseStructureBom, getBaseStructureBom, delBaseStructureBom, addBaseStructureBom, updateBaseStructureBom } from "@/api/mes/baseStructureBom";
+import { BaseStructureBomVO, BaseStructureBomQuery, BaseStructureBomForm } from '@/api/mes/baseStructureBom/types';
+import { getBaseMaterialTypeList } from '@/api/mes/baseMaterialType';
+import { BaseMaterialTypeVO } from '@/api/mes/baseMaterialType/types';
+
+type BaseStructureBomOption = {
+  structureBomId: number;
+  materialTypeName: string;
+  children?: BaseStructureBomOption[];
+}
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;;
+
+const { top_flag, active_flag } = toRefs<any>(proxy?.useDict('top_flag', 'active_flag'));
+
+const baseStructureBomList = ref<BaseStructureBomVO[]>([]);
+const baseStructureBomOptions = ref<BaseStructureBomOption[]>([]);
+const buttonLoading = ref(false);
+const showSearch = ref(true);
+const isExpandAll = ref(true);
+const loading = ref(false);
+
+const queryFormRef = ref<ElFormInstance>();
+const baseStructureBomFormRef = ref<ElFormInstance>();
+const baseStructureBomTableRef = ref<ElTableInstance>()
+
+const dialog = reactive<DialogOption>({
+    visible: false,
+    title: ''
+});
+
+
+const initFormData: BaseStructureBomForm = {
+    structureBomId: undefined,
+    parentId: undefined,
+    materialTypeId: undefined,
+    materialTypeName: undefined,
+    structureBomDesc: undefined,
+    structureBomVersion: undefined,
+    ancestors: undefined,
+    level: undefined,
+    topFlag: undefined,
+    activeFlag: '1',
+    remark: undefined,
+}
+
+const data = reactive<PageData<BaseStructureBomForm, BaseStructureBomQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    structureBomId: undefined,
+    parentId: undefined,
+    materialTypeId: undefined,
+    materialTypeName: undefined,
+    structureBomDesc: undefined,
+    structureBomVersion: undefined,
+    ancestors: undefined,
+    level: undefined,
+    topFlag: undefined,
+    activeFlag: undefined,
+    params: {
+    }
+  },
+  rules: {
+    materialTypeId: [
+      { required: true, message: "物料类型ID不能为空", trigger: "blur" }
+    ],
+    materialTypeName: [
+      { required: true, message: "物料类型名称不能为空", trigger: "blur" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询结构BOM信息列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listBaseStructureBom(queryParams.value);
+  const data = proxy?.handleTree<BaseStructureBomVO>(res.data, "structureBomId", "parentId");
+  if (data) {
+    baseStructureBomList.value = data;
+    loading.value = false;
+  }
+}
+
+/** 查询结构BOM信息下拉树结构 */
+const getTreeselect = async () => {
+  const res = await listBaseStructureBom();
+  baseStructureBomOptions.value = [];
+  const data: BaseStructureBomOption = { structureBomId: 0, materialTypeName: '顶级节点', children: [] };
+  data.children = proxy?.handleTree<BaseStructureBomOption>(res.data, "structureBomId", "parentId");
+  baseStructureBomOptions.value.push(data);
+}
+
+// 取消按钮
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+// 表单重置
+const reset = () => {
+  form.value = {...initFormData}
+  baseStructureBomFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 新增按钮操作 */
+const handleAdd = (row?: BaseStructureBomVO) => {
+  reset();
+  getbaseMaterialTypeOptions();
+  getTreeselect();
+  if (row != null && row.structureBomId) {
+    form.value.parentId = row.structureBomId;
+  } else {
+    form.value.parentId = 0;
+  }
+  dialog.visible = true;
+  dialog.title = "添加结构BOM信息";
+}
+
+/** 展开/折叠操作 */
+const handleToggleExpandAll = () => {
+  isExpandAll.value = !isExpandAll.value;
+  toggleExpandAll(baseStructureBomList.value, isExpandAll.value)
+}
+
+/** 展开/折叠操作 */
+const toggleExpandAll = (data: BaseStructureBomVO[], status: boolean) => {
+  data.forEach((item) => {
+    baseStructureBomTableRef.value?.toggleRowExpansion(item, status)
+    if (item.children && item.children.length > 0) toggleExpandAll(item.children, status)
+  })
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row: BaseStructureBomVO) => {
+  reset();
+  getbaseMaterialTypeOptions();
+  await getTreeselect();
+  if (row != null) {
+    form.value.parentId = row.parentId;
+  }
+  const res = await getBaseStructureBom(row.structureBomId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改结构BOM信息";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  baseStructureBomFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.structureBomId) {
+        await updateBaseStructureBom(form.value).finally(() => buttonLoading.value = false);
+      } else {
+        await addBaseStructureBom(form.value).finally(() => buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row: BaseStructureBomVO) => {
+  await proxy?.$modal.confirm('是否确认删除结构BOM信息编号为"' + row.structureBomId + '"的数据项？');
+  loading.value = true;
+  await delBaseStructureBom(row.structureBomId).finally(() => loading.value = false);
+  await getList();
+  proxy?.$modal.msgSuccess("删除成功");
+}
+
+/*获取物料下拉框*/
+let baseMaterialTypeOptions = ref([]);
+const getbaseMaterialTypeOptions = async () => {
+  let rs = await getBaseMaterialTypeList(null);
+  const data = proxy?.handleTree<BaseMaterialTypeVO>(rs.data, "matrialTypeId", "parentId");
+  if (data) {
+    baseMaterialTypeOptions.value = data;
+  }
+}
+
+/*
+
+/!*点击id同时赋值name*!/
+const handleMaterialTypeIdChange = (data: BaseMaterialTypeVO) =>{
+  form.value.materialTypeName = data.matrialTypeName;
+  form.value.materialTypeId = data.matrialTypeId;
+}
+
+*/
+
+onMounted(() => {
+  getList();
+});
+</script>
diff --git a/src/views/mes/prodBaseMachineInfo/index.vue b/src/views/mes/prodBaseMachineInfo/index.vue
new file mode 100644
index 0000000..42f3133
--- /dev/null
+++ b/src/views/mes/prodBaseMachineInfo/index.vue
@@ -0,0 +1,337 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+<!--            <el-form-item label="主键标识" prop="machineId">
+              <el-input v-model="queryParams.machineId" placeholder="请输入主键标识" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+<!--            <el-form-item label="机台编号" prop="machineCode">
+              <el-input v-model="queryParams.machineCode" placeholder="请输入机台编号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+<!--            <el-form-item label="机台名称" prop="machineName">
+              <el-input v-model="queryParams.machineName" placeholder="请输入机台名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="资产编号" prop="assetNumber">
+              <el-input v-model="queryParams.assetNumber" placeholder="请输入资产编号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="机台位置" prop="machineLocation">
+              <el-input v-model="queryParams.machineLocation" placeholder="请输入机台位置" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="机台类型" prop="machineType">
+              <el-input v-model="queryParams.machineType" placeholder="请输入机台类型" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="机台规格" prop="machineSpec">
+              <el-input v-model="queryParams.machineSpec" placeholder="请输入机台规格" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="供应商" prop="supplierId">
+              <el-input v-model="queryParams.supplierId" placeholder="请输入供应商" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+            <el-form-item label="机台状态" prop="machineStatus">
+              <el-select v-model="queryParams.machineStatus" placeholder="请选择机台状态" clearable >
+                <el-option v-for="dict in machine_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['mes:prodBaseMachineInfo:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['mes:prodBaseMachineInfo:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['mes:prodBaseMachineInfo:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['mes:prodBaseMachineInfo:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="prodBaseMachineInfoList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="主键标识" align="center" prop="machineId" v-if="columns[0].visible"/>
+        <el-table-column label="租户编号" align="center" prop="tenantId" v-if="columns[1].visible"/>
+        <el-table-column label="机台编号" align="center" prop="machineCode" v-if="columns[2].visible"/>
+        <el-table-column label="机台名称" align="center" prop="machineName" v-if="columns[3].visible"/>
+        <el-table-column label="资产编号" align="center" prop="assetNumber" v-if="columns[4].visible"/>
+        <el-table-column label="机台位置" align="center" prop="machineLocation" v-if="columns[5].visible"/>
+        <el-table-column label="机台类型" align="center" prop="machineType" v-if="columns[6].visible"/>
+        <el-table-column label="机台规格" align="center" prop="machineSpec" v-if="columns[7].visible"/>
+        <el-table-column label="供应商" align="center" prop="supplierId" v-if="columns[8].visible"/>
+        <el-table-column label="机台状态" align="center" prop="machineStatus" v-if="columns[9].visible">
+          <template #default="scope">
+            <dict-tag :options="machine_status" :value="scope.row.machineStatus"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="remark" v-if="columns[10].visible"/>
+        <el-table-column label="创建部门" align="center" prop="createDept" v-if="columns[11].visible"/>
+        <el-table-column label="创建人" align="center" prop="createBy" v-if="columns[12].visible"/>
+        <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[13].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="更新人" align="center" prop="updateBy" v-if="columns[14].visible"/>
+        <el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[15].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['mes:prodBaseMachineInfo:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['mes:prodBaseMachineInfo:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改机台信息对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="prodBaseMachineInfoFormRef" :model="form" :rules="rules" label-width="80px">
+<!--        <el-form-item label="主键标识" prop="machineId">
+          <el-input v-model="form.machineId" placeholder="请输入主键标识" />
+        </el-form-item>-->
+        <el-form-item label="机台编号" prop="machineCode">
+          <el-input v-model="form.machineCode" placeholder="请输入机台编号" />
+        </el-form-item>
+        <el-form-item label="机台名称" prop="machineName">
+          <el-input v-model="form.machineName" placeholder="请输入机台名称" />
+        </el-form-item>
+        <el-form-item label="资产编号" prop="assetNumber">
+          <el-input v-model="form.assetNumber" placeholder="请输入资产编号" />
+        </el-form-item>
+        <el-form-item label="机台位置" prop="machineLocation">
+          <el-input v-model="form.machineLocation" placeholder="请输入机台位置" />
+        </el-form-item>
+        <el-form-item label="机台类型" prop="machineType">
+          <el-input v-model="form.machineType" placeholder="请输入机台类型" />
+        </el-form-item>
+        <el-form-item label="机台规格" prop="machineSpec">
+          <el-input v-model="form.machineSpec" placeholder="请输入机台规格" />
+        </el-form-item>
+        <el-form-item label="供应商" prop="supplierId">
+          <el-input v-model="form.supplierId" placeholder="请输入供应商" />
+        </el-form-item>
+        <el-form-item label="机台状态" prop="machineStatus">
+          <el-select v-model="form.machineStatus" placeholder="请选择机台状态">
+            <el-option
+              v-for="dict in machine_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="ProdBaseMachineInfo" lang="ts">
+import { listProdBaseMachineInfo, getProdBaseMachineInfo, delProdBaseMachineInfo, addProdBaseMachineInfo, updateProdBaseMachineInfo } from '@/api/mes/prodBaseMachineInfo';
+import { ProdBaseMachineInfoVO, ProdBaseMachineInfoQuery, ProdBaseMachineInfoForm } from '@/api/mes/prodBaseMachineInfo/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { machine_status } = toRefs<any>(proxy?.useDict('machine_status'));
+
+const prodBaseMachineInfoList = ref<ProdBaseMachineInfoVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const prodBaseMachineInfoFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+  { key: 0, label: `主键标识`, visible: false },
+  { key: 1, label: `租户编号`, visible: false },
+  { key: 2, label: `机台编号`, visible: true },
+  { key: 3, label: `机台名称`, visible: true },
+  { key: 4, label: `资产编号`, visible: true },
+  { key: 5, label: `机台位置`, visible: true },
+  { key: 6, label: `机台类型`, visible: true },
+  { key: 7, label: `机台规格`, visible: true },
+  { key: 8, label: `供应商`, visible: true },
+  { key: 9, label: `机台状态`, visible: true },
+  { key: 10, label: `备注`, visible: false },
+  { key: 11, label: `创建部门`, visible: false },
+  { key: 12, label: `创建人`, visible: false },
+  { key: 13, label: `创建时间`, visible: false },
+  { key: 14, label: `更新人`, visible: false },
+  { key: 15, label: `更新时间`, visible: false },
+]);
+
+const initFormData: ProdBaseMachineInfoForm = {
+  machineId: undefined,
+  machineCode: undefined,
+  machineName: undefined,
+  assetNumber: undefined,
+  machineLocation: undefined,
+  machineType: undefined,
+  machineSpec: undefined,
+  supplierId: undefined,
+  machineStatus: undefined,
+  remark: undefined,
+}
+const data = reactive<PageData<ProdBaseMachineInfoForm, ProdBaseMachineInfoQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    machineId: undefined,
+    machineCode: undefined,
+    machineName: undefined,
+    assetNumber: undefined,
+    machineLocation: undefined,
+    machineType: undefined,
+    machineSpec: undefined,
+    supplierId: undefined,
+    machineStatus: undefined,
+    params: {
+    }
+  },
+  rules: {
+    machineCode: [
+      { required: true, message: "机台编号不能为空", trigger: "blur" }
+    ],
+    machineName: [
+      { required: true, message: "机台名称不能为空", trigger: "blur" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询机台信息列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listProdBaseMachineInfo(queryParams.value);
+  prodBaseMachineInfoList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  prodBaseMachineInfoFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: ProdBaseMachineInfoVO[]) => {
+  ids.value = selection.map(item => item.machineId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加机台信息";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: ProdBaseMachineInfoVO) => {
+  reset();
+  const _machineId = row?.machineId || ids.value[0]
+  const res = await getProdBaseMachineInfo(_machineId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改机台信息";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  prodBaseMachineInfoFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.machineId) {
+        await updateProdBaseMachineInfo(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addProdBaseMachineInfo(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: ProdBaseMachineInfoVO) => {
+  const _machineIds = row?.machineId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除机台信息编号为"' + _machineIds + '"的数据项？').finally(() => loading.value = false);
+  await delProdBaseMachineInfo(_machineIds);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('mes/prodBaseMachineInfo/export', {
+    ...queryParams.value
+  }, `prodBaseMachineInfo_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+  getList();
+});
+</script>