diff --git a/src/api/mes/ordermonthplan/index.ts b/src/api/mes/ordermonthplan/index.ts
new file mode 100644
index 000000000..3c86a1a5c
--- /dev/null
+++ b/src/api/mes/ordermonthplan/index.ts
@@ -0,0 +1,60 @@
+import request from '@/config/axios'
+
+export interface MesOrderMonthMainVO {
+  deleteTime: Date
+  id: number
+  status: string
+  concurrencyStamp: number
+  remark: string
+  deleter: string
+  siteId: number
+  sourceType: string
+  planMasterCode: string
+  planSubCode: string
+  planType: string
+  checker: string
+  checkDate: string
+  factoryCode: string
+  factoryName: string
+}
+
+// 查询订单计划月主列表
+export const getMesOrderMonthMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/plan/mes-order-month-main/senior', data })
+  } else {
+    return await request.get({ url: `/plan/mes-order-month-main/page`, params })
+  }
+}
+
+// 查询订单计划月主详情
+export const getMesOrderMonthMain = async (id: number) => {
+  return await request.get({ url: `/plan/mes-order-month-main/get?id=` + id })
+}
+
+// 新增订单计划月主
+export const createMesOrderMonthMain = async (data: MesOrderMonthMainVO) => {
+  return await request.post({ url: `/plan/mes-order-month-main/create`, data })
+}
+
+// 修改订单计划月主
+export const updateMesOrderMonthMain = async (data: MesOrderMonthMainVO) => {
+  return await request.put({ url: `/plan/mes-order-month-main/update`, data })
+}
+
+// 删除订单计划月主
+export const deleteMesOrderMonthMain = async (id: number) => {
+  return await request.delete({ url: `/plan/mes-order-month-main/delete?id=` + id })
+}
+
+// 导出订单计划月主 Excel
+export const exportMesOrderMonthMain = async (params) => {
+  return await request.download({ url: `/plan/mes-order-month-main/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/plan/mes-order-month-main/get-import-template' })
+}
diff --git a/src/views/mes/ordermonthplan/index.vue b/src/views/mes/ordermonthplan/index.vue
new file mode 100644
index 000000000..31e9bca22
--- /dev/null
+++ b/src/views/mes/ordermonthplan/index.vue
@@ -0,0 +1,244 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="MesOrderMonthMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="MesOrderMonthMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="MesOrderMonthMainRules"
+    :formAllSchemas="MesOrderMonthMain.allSchemas"
+    :apiUpdate="MesOrderMonthMainApi.updateMesOrderMonthMain"
+    :apiCreate="MesOrderMonthMainApi.createMesOrderMonthMain"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="MesOrderMonthMain.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/plan/mes-order-month-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { MesOrderMonthMain,MesOrderMonthMainRules } from './mesOrderMonthMain.data'
+import * as MesOrderMonthMainApi from '@/api/mes/ordermonthplan'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'MesOrderMonthMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(MesOrderMonthMain.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: MesOrderMonthMainApi.getMesOrderMonthMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:mesOrderMonthMain:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:mesOrderMonthMain:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:mesOrderMonthMain:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:mesOrderMonthMain:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:mesOrderMonthMain:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =MesOrderMonthMain.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  });
+  if(isHave){
+    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      message.error('失效时间要大于生效时间')
+      return;
+    }
+  }
+  if(data.activeTime==0)data.activeTime = null;
+  if(data.expireTime==0)data.expireTime = null;
+  if (formType === 'create') {
+    await MesOrderMonthMainApi.createMesOrderMonthMain(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await MesOrderMonthMainApi.updateMesOrderMonthMain(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicMesOrderMonthMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await MesOrderMonthMainApi.deleteMesOrderMonthMain(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await MesOrderMonthMainApi.exportMesOrderMonthMain(tableObject.params)
+    download.excel(data, '订单计划月主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '订单计划月主导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await MesOrderMonthMainApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts b/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts
new file mode 100644
index 000000000..b30b0fc88
--- /dev/null
+++ b/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts
@@ -0,0 +1,86 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const MesOrderMonthMainRules = reactive({
+})
+
+export const MesOrderMonthMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isTable: false
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '创建者用户名',
+    field: 'creator',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: '主计划编码',
+    field: 'planMasterCode',
+    sort: 'custom',
+    isSearch: true
+  },
+  {
+    label: '计划辅助编码',
+    field: 'planSubCode',
+    sort: 'custom',
+    isSearch: true
+  },
+  {
+    label: '计划类型',
+    field: 'planType',
+    sort: 'custom',
+    isSearch: true,
+                form: {
+                  component: 'SelectV2'
+                }
+  },
+  {
+    label: '审核人',
+    field: 'checker',
+    sort: 'custom',
+    isSearch: true
+  },
+  {
+    label: '工厂编码',
+    field: 'factoryCode',
+    sort: 'custom',
+    isSearch: true
+  },
+  {
+    label: '工厂名称',
+    field: 'factoryName',
+    sort: 'custom',
+    isSearch: true
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/mes/workstation/mesOrderMonthMain.data.ts b/src/views/mes/workstation/mesOrderMonthMain.data.ts
new file mode 100644
index 000000000..d766ae00a
--- /dev/null
+++ b/src/views/mes/workstation/mesOrderMonthMain.data.ts
@@ -0,0 +1,83 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const MesOrderMonthMainRules = reactive({
+})
+
+export const MesOrderMonthMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isTable: false
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '创建者用户名',
+    field: 'creator',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: '主计划编码',
+    field: 'planMasterCode',
+    sort: 'custom',
+    isTable: false,
+    isSearch: true
+  },
+  {
+    label: '计划辅助编码',
+    field: 'planSubCode',
+    sort: 'custom',
+    isTable: false,
+    isSearch: true
+  },
+  {
+    label: '计划类型',
+    field: 'planType',
+    sort: 'custom',
+    isSearch: true,
+                form: {
+                  component: 'SelectV2'
+                }
+  },
+  {
+    label: '工厂编码',
+    field: 'factoryCode',
+    sort: 'custom',
+    isTable: false
+  },
+  {
+    label: '工厂名称',
+    field: 'factoryName',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/mes/workstation/workstation.data.ts b/src/views/mes/workstation/workstation.data.ts
index e5ac54c59..013f12c8d 100644
--- a/src/views/mes/workstation/workstation.data.ts
+++ b/src/views/mes/workstation/workstation.data.ts
@@ -228,7 +228,7 @@ export const popList = useCrudSchemas(reactive<CrudSchema[]>([
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '仓库信息', // 查询弹窗标题
         searchAllSchemas: Team.allSchemas, // 查询弹窗所需类
-        searchPage: WorkstationApi.getTeamPage, // 查询弹窗所需分页方法
+        searchPage: WorkstationApi.checkTeamPageList, // 查询弹窗所需分页方法
         searchCondition: [{
           key: 'available',
           value: 'TRUE',