diff --git a/apps/web-antd/src/views/mes/dv/checkplan/components/select-dialog.vue b/apps/web-antd/src/views/mes/dv/checkplan/components/select-dialog.vue
new file mode 100644
index 000000000..2a25af0a6
--- /dev/null
+++ b/apps/web-antd/src/views/mes/dv/checkplan/components/select-dialog.vue
@@ -0,0 +1,215 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesDvCheckPlanApi } from '#/api/mes/dv/checkplan';
+
+import { nextTick, ref } from 'vue';
+
+import { Button, message, Modal } from 'ant-design-vue';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getCheckPlanPage } from '#/api/mes/dv/checkplan';
+
+import {
+  useCheckPlanSelectGridColumns,
+  useCheckPlanSelectGridFormSchema,
+} from '../data';
+
+defineOptions({ name: 'DvCheckPlanSelectDialog' });
+
+const emit = defineEmits<{
+  selected: [rows: MesDvCheckPlanApi.CheckPlan[]];
+}>();
+
+const open = ref(false); // 弹窗是否打开
+const multiple = ref(false); // 是否多选
+const fixedType = ref<number>(); // 固定计划类型筛选
+const fixedStatus = ref<number>(); // 固定状态筛选
+const selectedRows = ref<MesDvCheckPlanApi.CheckPlan[]>([]); // 已选方案列表
+const preSelectedIds = ref<number[]>([]); // 预选方案编号列表
+
+/** 获取当前表格数据 */
+function getTableRows() {
+  return gridApi.grid.getTableData().fullData as MesDvCheckPlanApi.CheckPlan[];
+}
+
+/** 获取多选记录，包含 VXE reserve 跨页记录 */
+function getMultipleSelectedRows() {
+  const selectedMap = new Map<number, MesDvCheckPlanApi.CheckPlan>();
+  const records = [
+    ...(gridApi.grid.getCheckboxReserveRecords?.() ?? []),
+    ...(gridApi.grid.getCheckboxRecords?.() ?? []),
+  ] as MesDvCheckPlanApi.CheckPlan[];
+  records.forEach((row) => {
+    const rowId = row.id;
+    if (rowId != null) {
+      selectedMap.set(rowId, row);
+    }
+  });
+  return [...selectedMap.values()];
+}
+
+/** 处理勾选变化 */
+function handleCheckboxSelectChange() {
+  selectedRows.value = getMultipleSelectedRows();
+}
+
+/** 处理单选变化 */
+function handleRadioChange(row: MesDvCheckPlanApi.CheckPlan) {
+  selectedRows.value = [row];
+}
+
+/** 多选模式下切换行勾选 */
+async function toggleMultipleRow(row: MesDvCheckPlanApi.CheckPlan) {
+  const selected = gridApi.grid.isCheckedByCheckboxRow(row);
+  await gridApi.grid.setCheckboxRow(row, !selected);
+  selectedRows.value = getMultipleSelectedRows();
+}
+
+/** 处理行双击 */
+async function handleCellDblclick({ row }: { row: MesDvCheckPlanApi.CheckPlan }) {
+  if (multiple.value) {
+    await toggleMultipleRow(row);
+    return;
+  }
+  selectedRows.value = [row];
+  await gridApi.grid.setRadioRow(row);
+  handleConfirm();
+}
+
+/** 回显预选方案 */
+async function applyPreSelection() {
+  if (preSelectedIds.value.length === 0) {
+    return;
+  }
+  const rows = getTableRows();
+  for (const row of rows) {
+    if (row.id == null || !preSelectedIds.value.includes(row.id)) {
+      continue;
+    }
+    if (multiple.value) {
+      await gridApi.grid.setCheckboxRow(row, true);
+    } else {
+      await gridApi.grid.setRadioRow(row);
+      selectedRows.value = [row];
+      return;
+    }
+  }
+  if (multiple.value) {
+    selectedRows.value = getMultipleSelectedRows();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useCheckPlanSelectGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useCheckPlanSelectGridColumns(false),
+    height: 520,
+    keepSource: true,
+    checkboxConfig: {
+      highlight: true,
+      range: true,
+      reserve: true,
+    },
+    radioConfig: {
+      highlight: true,
+      trigger: 'row',
+    },
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getCheckPlanPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+            status: fixedStatus.value,
+            type: fixedType.value,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesDvCheckPlanApi.CheckPlan>,
+  gridEvents: {
+    cellDblclick: handleCellDblclick,
+    checkboxAll: handleCheckboxSelectChange,
+    checkboxChange: handleCheckboxSelectChange,
+    radioChange: ({ row }: { row: MesDvCheckPlanApi.CheckPlan }) => {
+      handleRadioChange(row);
+    },
+  },
+});
+
+/** 重置查询和选择状态 */
+async function resetQueryState() {
+  selectedRows.value = [];
+  await gridApi.grid.clearCheckboxRow();
+  await gridApi.grid.clearCheckboxReserve();
+  await gridApi.grid.clearRadioRow();
+  await gridApi.formApi.resetForm();
+}
+
+/** 打开方案选择弹窗 */
+async function openModal(
+  selectedIds?: number[],
+  options?: { multiple?: boolean; status?: number; type?: number },
+) {
+  open.value = true;
+  multiple.value = options?.multiple ?? false;
+  fixedType.value = options?.type;
+  fixedStatus.value = options?.status;
+  preSelectedIds.value = selectedIds || [];
+  await nextTick();
+  gridApi.setGridOptions({
+    columns: useCheckPlanSelectGridColumns(multiple.value),
+  });
+  await resetQueryState();
+  await gridApi.query();
+  await nextTick();
+  await applyPreSelection();
+}
+
+/** 关闭方案选择弹窗 */
+async function closeModal() {
+  open.value = false;
+  await resetQueryState();
+}
+
+/** 确认选择方案 */
+function handleConfirm() {
+  const rows = multiple.value ? getMultipleSelectedRows() : selectedRows.value;
+  if (rows.length === 0) {
+    message.warning(multiple.value ? '请至少选择一条数据' : '请选择一条数据');
+    return;
+  }
+  emit('selected', multiple.value ? rows : [rows[0]!]);
+  open.value = false;
+}
+
+defineExpose({ open: openModal });
+</script>
+
+<template>
+  <Modal
+    v-model:open="open"
+    title="点检方案选择"
+    width="70%"
+    :destroy-on-close="true"
+    @ok="handleConfirm"
+    @cancel="closeModal"
+  >
+    <Grid table-title="点检方案列表" />
+    <template #footer>
+      <Button @click="closeModal"> 取消 </Button>
+      <Button type="primary" @click="handleConfirm"> 确定 </Button>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/dv/machinery/components/select-dialog.vue b/apps/web-antd/src/views/mes/dv/machinery/components/select-dialog.vue
new file mode 100644
index 000000000..86d0f34a2
--- /dev/null
+++ b/apps/web-antd/src/views/mes/dv/machinery/components/select-dialog.vue
@@ -0,0 +1,225 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesDvMachineryApi } from '#/api/mes/dv/machinery';
+import type { MesDvMachineryTypeApi } from '#/api/mes/dv/machinery/type';
+
+import { nextTick, ref } from 'vue';
+
+import { message, Modal } from 'ant-design-vue';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getMachineryPage } from '#/api/mes/dv/machinery';
+import { MachineryTypeTree } from '#/views/mes/dv/machinery/type/components';
+
+import {
+  useMachinerySelectGridColumns,
+  useMachinerySelectGridFormSchema,
+} from '../data';
+
+defineOptions({ name: 'DvMachinerySelectDialog' });
+
+const emit = defineEmits<{
+  selected: [rows: MesDvMachineryApi.Machinery[]];
+}>();
+
+const open = ref(false); // 弹窗是否打开
+const multiple = ref(false); // 是否多选
+const selectedRows = ref<MesDvMachineryApi.Machinery[]>([]); // 已选设备列表
+const selectedMachineryTypeId = ref<number>(); // 当前筛选设备类型编号
+const preSelectedIds = ref<number[]>([]); // 预选设备编号列表
+const typeTreeRef = ref<InstanceType<typeof MachineryTypeTree>>(); // 设备类型树
+
+/** 获取当前表格数据 */
+function getTableRows() {
+  return gridApi.grid.getTableData().fullData as MesDvMachineryApi.Machinery[];
+}
+
+/** 获取多选记录，包含 VXE reserve 跨页记录 */
+function getMultipleSelectedRows() {
+  const selectedMap = new Map<number, MesDvMachineryApi.Machinery>();
+  const records = [
+    ...(gridApi.grid.getCheckboxReserveRecords?.() ?? []),
+    ...(gridApi.grid.getCheckboxRecords?.() ?? []),
+  ] as MesDvMachineryApi.Machinery[];
+  records.forEach((row) => {
+    const rowId = row.id;
+    if (rowId != null) {
+      selectedMap.set(rowId, row);
+    }
+  });
+  return [...selectedMap.values()];
+}
+
+/** 处理勾选变化 */
+function handleCheckboxSelectChange() {
+  selectedRows.value = getMultipleSelectedRows();
+}
+
+/** 处理单选变化 */
+function handleRadioChange(row: MesDvMachineryApi.Machinery) {
+  selectedRows.value = [row];
+}
+
+/** 多选模式下切换行勾选 */
+async function toggleMultipleRow(row: MesDvMachineryApi.Machinery) {
+  const selected = gridApi.grid.isCheckedByCheckboxRow(row);
+  await gridApi.grid.setCheckboxRow(row, !selected);
+  selectedRows.value = getMultipleSelectedRows();
+}
+
+/** 处理行双击 */
+async function handleCellDblclick({ row }: { row: MesDvMachineryApi.Machinery }) {
+  if (multiple.value) {
+    await toggleMultipleRow(row);
+    return;
+  }
+  selectedRows.value = [row];
+  await gridApi.grid.setRadioRow(row);
+  handleConfirm();
+}
+
+/** 按设备类型筛选 */
+function handleTypeNodeClick(row: MesDvMachineryTypeApi.MachineryType | undefined) {
+  selectedMachineryTypeId.value = row?.id;
+  gridApi.query();
+}
+
+/** 回显预选设备 */
+async function applyPreSelection() {
+  if (preSelectedIds.value.length === 0) {
+    return;
+  }
+  const rows = getTableRows();
+  for (const row of rows) {
+    if (row.id == null || !preSelectedIds.value.includes(row.id)) {
+      continue;
+    }
+    if (multiple.value) {
+      await gridApi.grid.setCheckboxRow(row, true);
+    } else {
+      await gridApi.grid.setRadioRow(row);
+      selectedRows.value = [row];
+      return;
+    }
+  }
+  if (multiple.value) {
+    selectedRows.value = getMultipleSelectedRows();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useMachinerySelectGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useMachinerySelectGridColumns(false),
+    height: 520,
+    keepSource: true,
+    checkboxConfig: {
+      highlight: true,
+      range: true,
+      reserve: true,
+    },
+    radioConfig: {
+      highlight: true,
+      trigger: 'row',
+    },
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getMachineryPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+            machineryTypeId: selectedMachineryTypeId.value,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesDvMachineryApi.Machinery>,
+  gridEvents: {
+    cellDblclick: handleCellDblclick,
+    checkboxAll: handleCheckboxSelectChange,
+    checkboxChange: handleCheckboxSelectChange,
+    radioChange: ({ row }: { row: MesDvMachineryApi.Machinery }) => {
+      handleRadioChange(row);
+    },
+  },
+});
+
+/** 重置查询和选择状态 */
+async function resetQueryState() {
+  selectedMachineryTypeId.value = undefined;
+  selectedRows.value = [];
+  typeTreeRef.value?.reset();
+  await gridApi.grid.clearCheckboxRow();
+  await gridApi.grid.clearCheckboxReserve();
+  await gridApi.grid.clearRadioRow();
+  await gridApi.formApi.resetForm();
+}
+
+/** 打开设备选择弹窗 */
+async function openModal(
+  selectedIds?: number[],
+  options?: { multiple?: boolean },
+) {
+  open.value = true;
+  multiple.value = options?.multiple ?? false;
+  preSelectedIds.value = selectedIds || [];
+  await nextTick();
+  gridApi.setGridOptions({
+    columns: useMachinerySelectGridColumns(multiple.value),
+  });
+  await resetQueryState();
+  await gridApi.query();
+  await nextTick();
+  await applyPreSelection();
+}
+
+/** 关闭设备选择弹窗 */
+async function closeModal() {
+  open.value = false;
+  await resetQueryState();
+}
+
+/** 确认选择设备 */
+function handleConfirm() {
+  const rows = multiple.value ? getMultipleSelectedRows() : selectedRows.value;
+  if (rows.length === 0) {
+    message.warning(multiple.value ? '请至少选择一条数据' : '请选择一条数据');
+    return;
+  }
+  emit('selected', multiple.value ? rows : [rows[0]!]);
+  open.value = false;
+}
+
+defineExpose({ open: openModal });
+</script>
+
+<template>
+  <Modal
+    v-model:open="open"
+    title="设备选择"
+    width="80%"
+    :destroy-on-close="true"
+    @ok="handleConfirm"
+    @cancel="closeModal"
+  >
+    <div class="flex h-full w-full">
+      <div class="mr-4 h-full w-1/5">
+        <MachineryTypeTree ref="typeTreeRef" @node-click="handleTypeNodeClick" />
+      </div>
+      <div class="w-4/5">
+        <Grid table-title="设备列表" />
+      </div>
+    </div>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/tm/tool/components/select-dialog.vue b/apps/web-antd/src/views/mes/tm/tool/components/select-dialog.vue
new file mode 100644
index 000000000..77fb0bb0d
--- /dev/null
+++ b/apps/web-antd/src/views/mes/tm/tool/components/select-dialog.vue
@@ -0,0 +1,206 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesTmToolApi } from '#/api/mes/tm/tool';
+
+import { nextTick, ref } from 'vue';
+
+import { Button, message, Modal } from 'ant-design-vue';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getToolPage } from '#/api/mes/tm/tool';
+
+import { useToolSelectGridColumns, useToolSelectGridFormSchema } from '../data';
+
+defineOptions({ name: 'TmToolSelectDialog' });
+
+const emit = defineEmits<{
+  selected: [rows: MesTmToolApi.Tool[]];
+}>();
+
+const open = ref(false); // 弹窗是否打开
+const multiple = ref(false); // 是否多选
+const selectedRows = ref<MesTmToolApi.Tool[]>([]); // 已选工具列表
+const preSelectedIds = ref<number[]>([]); // 预选工具编号列表
+
+/** 获取当前表格数据 */
+function getTableRows() {
+  return gridApi.grid.getTableData().fullData as MesTmToolApi.Tool[];
+}
+
+/** 获取多选记录，包含 VXE reserve 跨页记录 */
+function getMultipleSelectedRows() {
+  const selectedMap = new Map<number, MesTmToolApi.Tool>();
+  const records = [
+    ...(gridApi.grid.getCheckboxReserveRecords?.() ?? []),
+    ...(gridApi.grid.getCheckboxRecords?.() ?? []),
+  ] as MesTmToolApi.Tool[];
+  records.forEach((row) => {
+    const rowId = row.id;
+    if (rowId != null) {
+      selectedMap.set(rowId, row);
+    }
+  });
+  return [...selectedMap.values()];
+}
+
+/** 处理勾选变化 */
+function handleCheckboxSelectChange() {
+  selectedRows.value = getMultipleSelectedRows();
+}
+
+/** 处理单选变化 */
+function handleRadioChange(row: MesTmToolApi.Tool) {
+  selectedRows.value = [row];
+}
+
+/** 多选模式下切换行勾选 */
+async function toggleMultipleRow(row: MesTmToolApi.Tool) {
+  const selected = gridApi.grid.isCheckedByCheckboxRow(row);
+  await gridApi.grid.setCheckboxRow(row, !selected);
+  selectedRows.value = getMultipleSelectedRows();
+}
+
+/** 处理行双击 */
+async function handleCellDblclick({ row }: { row: MesTmToolApi.Tool }) {
+  if (multiple.value) {
+    await toggleMultipleRow(row);
+    return;
+  }
+  selectedRows.value = [row];
+  await gridApi.grid.setRadioRow(row);
+  handleConfirm();
+}
+
+/** 回显预选工具 */
+async function applyPreSelection() {
+  if (preSelectedIds.value.length === 0) {
+    return;
+  }
+  const rows = getTableRows();
+  for (const row of rows) {
+    if (row.id == null || !preSelectedIds.value.includes(row.id)) {
+      continue;
+    }
+    if (multiple.value) {
+      await gridApi.grid.setCheckboxRow(row, true);
+    } else {
+      await gridApi.grid.setRadioRow(row);
+      selectedRows.value = [row];
+      return;
+    }
+  }
+  if (multiple.value) {
+    selectedRows.value = getMultipleSelectedRows();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useToolSelectGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useToolSelectGridColumns(false),
+    height: 520,
+    keepSource: true,
+    checkboxConfig: {
+      highlight: true,
+      range: true,
+      reserve: true,
+    },
+    radioConfig: {
+      highlight: true,
+      trigger: 'row',
+    },
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getToolPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesTmToolApi.Tool>,
+  gridEvents: {
+    cellDblclick: handleCellDblclick,
+    checkboxAll: handleCheckboxSelectChange,
+    checkboxChange: handleCheckboxSelectChange,
+    radioChange: ({ row }: { row: MesTmToolApi.Tool }) => {
+      handleRadioChange(row);
+    },
+  },
+});
+
+/** 重置查询和选择状态 */
+async function resetQueryState() {
+  selectedRows.value = [];
+  await gridApi.grid.clearCheckboxRow();
+  await gridApi.grid.clearCheckboxReserve();
+  await gridApi.grid.clearRadioRow();
+  await gridApi.formApi.resetForm();
+}
+
+/** 打开工具选择弹窗 */
+async function openModal(
+  selectedIds?: number[],
+  options?: { multiple?: boolean },
+) {
+  open.value = true;
+  multiple.value = options?.multiple ?? false;
+  preSelectedIds.value = selectedIds || [];
+  await nextTick();
+  gridApi.setGridOptions({
+    columns: useToolSelectGridColumns(multiple.value),
+  });
+  await resetQueryState();
+  await gridApi.query();
+  await nextTick();
+  await applyPreSelection();
+}
+
+/** 关闭工具选择弹窗 */
+async function closeModal() {
+  open.value = false;
+  await resetQueryState();
+}
+
+/** 确认选择工具 */
+function handleConfirm() {
+  const rows = multiple.value ? getMultipleSelectedRows() : selectedRows.value;
+  if (rows.length === 0) {
+    message.warning(multiple.value ? '请至少选择一条数据' : '请选择一条数据');
+    return;
+  }
+  emit('selected', multiple.value ? rows : [rows[0]!]);
+  open.value = false;
+}
+
+defineExpose({ open: openModal });
+</script>
+
+<template>
+  <Modal
+    v-model:open="open"
+    title="工具选择"
+    width="75%"
+    :destroy-on-close="true"
+    @ok="handleConfirm"
+    @cancel="closeModal"
+  >
+    <Grid table-title="工具列表" />
+    <template #footer>
+      <Button @click="closeModal"> 取消 </Button>
+      <Button type="primary" @click="handleConfirm"> 确定 </Button>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/dv/checkplan/components/select-dialog.vue b/apps/web-ele/src/views/mes/dv/checkplan/components/select-dialog.vue
new file mode 100644
index 000000000..f03b8d8ff
--- /dev/null
+++ b/apps/web-ele/src/views/mes/dv/checkplan/components/select-dialog.vue
@@ -0,0 +1,214 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesDvCheckPlanApi } from '#/api/mes/dv/checkplan';
+
+import { nextTick, ref } from 'vue';
+
+import { ElButton, ElDialog, ElMessage } from 'element-plus';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getCheckPlanPage } from '#/api/mes/dv/checkplan';
+
+import {
+  useCheckPlanSelectGridColumns,
+  useCheckPlanSelectGridFormSchema,
+} from '../data';
+
+defineOptions({ name: 'DvCheckPlanSelectDialog' });
+
+const emit = defineEmits<{
+  selected: [rows: MesDvCheckPlanApi.CheckPlan[]];
+}>();
+
+const open = ref(false); // 弹窗是否打开
+const multiple = ref(false); // 是否多选
+const fixedType = ref<number>(); // 固定计划类型筛选
+const fixedStatus = ref<number>(); // 固定状态筛选
+const selectedRows = ref<MesDvCheckPlanApi.CheckPlan[]>([]); // 已选方案列表
+const preSelectedIds = ref<number[]>([]); // 预选方案编号列表
+
+/** 获取当前表格数据 */
+function getTableRows() {
+  return gridApi.grid.getTableData().fullData as MesDvCheckPlanApi.CheckPlan[];
+}
+
+/** 获取多选记录，包含 VXE reserve 跨页记录 */
+function getMultipleSelectedRows() {
+  const selectedMap = new Map<number, MesDvCheckPlanApi.CheckPlan>();
+  const records = [
+    ...(gridApi.grid.getCheckboxReserveRecords?.() ?? []),
+    ...(gridApi.grid.getCheckboxRecords?.() ?? []),
+  ] as MesDvCheckPlanApi.CheckPlan[];
+  records.forEach((row) => {
+    const rowId = row.id;
+    if (rowId != null) {
+      selectedMap.set(rowId, row);
+    }
+  });
+  return [...selectedMap.values()];
+}
+
+/** 处理勾选变化 */
+function handleCheckboxSelectChange() {
+  selectedRows.value = getMultipleSelectedRows();
+}
+
+/** 处理单选变化 */
+function handleRadioChange(row: MesDvCheckPlanApi.CheckPlan) {
+  selectedRows.value = [row];
+}
+
+/** 多选模式下切换行勾选 */
+async function toggleMultipleRow(row: MesDvCheckPlanApi.CheckPlan) {
+  const selected = gridApi.grid.isCheckedByCheckboxRow(row);
+  await gridApi.grid.setCheckboxRow(row, !selected);
+  selectedRows.value = getMultipleSelectedRows();
+}
+
+/** 处理行双击 */
+async function handleCellDblclick({ row }: { row: MesDvCheckPlanApi.CheckPlan }) {
+  if (multiple.value) {
+    await toggleMultipleRow(row);
+    return;
+  }
+  selectedRows.value = [row];
+  await gridApi.grid.setRadioRow(row);
+  handleConfirm();
+}
+
+/** 回显预选方案 */
+async function applyPreSelection() {
+  if (preSelectedIds.value.length === 0) {
+    return;
+  }
+  const rows = getTableRows();
+  for (const row of rows) {
+    if (row.id == null || !preSelectedIds.value.includes(row.id)) {
+      continue;
+    }
+    if (multiple.value) {
+      await gridApi.grid.setCheckboxRow(row, true);
+    } else {
+      await gridApi.grid.setRadioRow(row);
+      selectedRows.value = [row];
+      return;
+    }
+  }
+  if (multiple.value) {
+    selectedRows.value = getMultipleSelectedRows();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useCheckPlanSelectGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useCheckPlanSelectGridColumns(false),
+    height: 520,
+    keepSource: true,
+    checkboxConfig: {
+      highlight: true,
+      range: true,
+      reserve: true,
+    },
+    radioConfig: {
+      highlight: true,
+      trigger: 'row',
+    },
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getCheckPlanPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+            status: fixedStatus.value,
+            type: fixedType.value,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesDvCheckPlanApi.CheckPlan>,
+  gridEvents: {
+    cellDblclick: handleCellDblclick,
+    checkboxAll: handleCheckboxSelectChange,
+    checkboxChange: handleCheckboxSelectChange,
+    radioChange: ({ row }: { row: MesDvCheckPlanApi.CheckPlan }) => {
+      handleRadioChange(row);
+    },
+  },
+});
+
+/** 重置查询和选择状态 */
+async function resetQueryState() {
+  selectedRows.value = [];
+  await gridApi.grid.clearCheckboxRow();
+  await gridApi.grid.clearCheckboxReserve();
+  await gridApi.grid.clearRadioRow();
+  await gridApi.formApi.resetForm();
+}
+
+/** 打开方案选择弹窗 */
+async function openModal(
+  selectedIds?: number[],
+  options?: { multiple?: boolean; status?: number; type?: number },
+) {
+  open.value = true;
+  multiple.value = options?.multiple ?? false;
+  fixedType.value = options?.type;
+  fixedStatus.value = options?.status;
+  preSelectedIds.value = selectedIds || [];
+  await nextTick();
+  gridApi.setGridOptions({
+    columns: useCheckPlanSelectGridColumns(multiple.value),
+  });
+  await resetQueryState();
+  await gridApi.query();
+  await nextTick();
+  await applyPreSelection();
+}
+
+/** 关闭方案选择弹窗 */
+async function closeModal() {
+  open.value = false;
+  await resetQueryState();
+}
+
+/** 确认选择方案 */
+function handleConfirm() {
+  const rows = multiple.value ? getMultipleSelectedRows() : selectedRows.value;
+  if (rows.length === 0) {
+    ElMessage.warning(multiple.value ? '请至少选择一条数据' : '请选择一条数据');
+    return;
+  }
+  emit('selected', multiple.value ? rows : [rows[0]!]);
+  open.value = false;
+}
+
+defineExpose({ open: openModal });
+</script>
+
+<template>
+  <ElDialog
+    v-model="open"
+    title="点检方案选择"
+    width="70%"
+    destroy-on-close
+    @close="closeModal"
+  >
+    <Grid table-title="点检方案列表" />
+    <template #footer>
+      <ElButton @click="closeModal">取消</ElButton>
+      <ElButton type="primary" @click="handleConfirm">确定</ElButton>
+    </template>
+  </ElDialog>
+</template>
diff --git a/apps/web-ele/src/views/mes/dv/machinery/components/select-dialog.vue b/apps/web-ele/src/views/mes/dv/machinery/components/select-dialog.vue
new file mode 100644
index 000000000..eb9f5f091
--- /dev/null
+++ b/apps/web-ele/src/views/mes/dv/machinery/components/select-dialog.vue
@@ -0,0 +1,228 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesDvMachineryApi } from '#/api/mes/dv/machinery';
+import type { MesDvMachineryTypeApi } from '#/api/mes/dv/machinery/type';
+
+import { nextTick, ref } from 'vue';
+
+import { ElButton, ElDialog, ElMessage } from 'element-plus';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getMachineryPage } from '#/api/mes/dv/machinery';
+import { MachineryTypeTree } from '#/views/mes/dv/machinery/type/components';
+
+import {
+  useMachinerySelectGridColumns,
+  useMachinerySelectGridFormSchema,
+} from '../data';
+
+defineOptions({ name: 'DvMachinerySelectDialog' });
+
+const emit = defineEmits<{
+  selected: [rows: MesDvMachineryApi.Machinery[]];
+}>();
+
+const open = ref(false); // 弹窗是否打开
+const multiple = ref(false); // 是否多选
+const selectedRows = ref<MesDvMachineryApi.Machinery[]>([]); // 已选设备列表
+const selectedMachineryTypeId = ref<number>(); // 当前筛选设备类型编号
+const preSelectedIds = ref<number[]>([]); // 预选设备编号列表
+const typeTreeRef = ref<InstanceType<typeof MachineryTypeTree>>(); // 设备类型树
+
+/** 获取当前表格数据 */
+function getTableRows() {
+  return gridApi.grid.getTableData().fullData as MesDvMachineryApi.Machinery[];
+}
+
+/** 获取多选记录，包含 VXE reserve 跨页记录 */
+function getMultipleSelectedRows() {
+  const selectedMap = new Map<number, MesDvMachineryApi.Machinery>();
+  const records = [
+    ...(gridApi.grid.getCheckboxReserveRecords?.() ?? []),
+    ...(gridApi.grid.getCheckboxRecords?.() ?? []),
+  ] as MesDvMachineryApi.Machinery[];
+  records.forEach((row) => {
+    const rowId = row.id;
+    if (rowId != null) {
+      selectedMap.set(rowId, row);
+    }
+  });
+  return [...selectedMap.values()];
+}
+
+/** 处理勾选变化 */
+function handleCheckboxSelectChange() {
+  selectedRows.value = getMultipleSelectedRows();
+}
+
+/** 处理单选变化 */
+function handleRadioChange(row: MesDvMachineryApi.Machinery) {
+  selectedRows.value = [row];
+}
+
+/** 多选模式下切换行勾选 */
+async function toggleMultipleRow(row: MesDvMachineryApi.Machinery) {
+  const selected = gridApi.grid.isCheckedByCheckboxRow(row);
+  await gridApi.grid.setCheckboxRow(row, !selected);
+  selectedRows.value = getMultipleSelectedRows();
+}
+
+/** 处理行双击 */
+async function handleCellDblclick({ row }: { row: MesDvMachineryApi.Machinery }) {
+  if (multiple.value) {
+    await toggleMultipleRow(row);
+    return;
+  }
+  selectedRows.value = [row];
+  await gridApi.grid.setRadioRow(row);
+  handleConfirm();
+}
+
+/** 按设备类型筛选 */
+function handleTypeNodeClick(row: MesDvMachineryTypeApi.MachineryType | undefined) {
+  selectedMachineryTypeId.value = row?.id;
+  gridApi.query();
+}
+
+/** 回显预选设备 */
+async function applyPreSelection() {
+  if (preSelectedIds.value.length === 0) {
+    return;
+  }
+  const rows = getTableRows();
+  for (const row of rows) {
+    if (row.id == null || !preSelectedIds.value.includes(row.id)) {
+      continue;
+    }
+    if (multiple.value) {
+      await gridApi.grid.setCheckboxRow(row, true);
+    } else {
+      await gridApi.grid.setRadioRow(row);
+      selectedRows.value = [row];
+      return;
+    }
+  }
+  if (multiple.value) {
+    selectedRows.value = getMultipleSelectedRows();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useMachinerySelectGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useMachinerySelectGridColumns(false),
+    height: 520,
+    keepSource: true,
+    checkboxConfig: {
+      highlight: true,
+      range: true,
+      reserve: true,
+    },
+    radioConfig: {
+      highlight: true,
+      trigger: 'row',
+    },
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getMachineryPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+            machineryTypeId: selectedMachineryTypeId.value,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesDvMachineryApi.Machinery>,
+  gridEvents: {
+    cellDblclick: handleCellDblclick,
+    checkboxAll: handleCheckboxSelectChange,
+    checkboxChange: handleCheckboxSelectChange,
+    radioChange: ({ row }: { row: MesDvMachineryApi.Machinery }) => {
+      handleRadioChange(row);
+    },
+  },
+});
+
+/** 重置查询和选择状态 */
+async function resetQueryState() {
+  selectedMachineryTypeId.value = undefined;
+  selectedRows.value = [];
+  typeTreeRef.value?.reset();
+  await gridApi.grid.clearCheckboxRow();
+  await gridApi.grid.clearCheckboxReserve();
+  await gridApi.grid.clearRadioRow();
+  await gridApi.formApi.resetForm();
+}
+
+/** 打开设备选择弹窗 */
+async function openModal(
+  selectedIds?: number[],
+  options?: { multiple?: boolean },
+) {
+  open.value = true;
+  multiple.value = options?.multiple ?? false;
+  preSelectedIds.value = selectedIds || [];
+  await nextTick();
+  gridApi.setGridOptions({
+    columns: useMachinerySelectGridColumns(multiple.value),
+  });
+  await resetQueryState();
+  await gridApi.query();
+  await nextTick();
+  await applyPreSelection();
+}
+
+/** 关闭设备选择弹窗 */
+async function closeModal() {
+  open.value = false;
+  await resetQueryState();
+}
+
+/** 确认选择设备 */
+function handleConfirm() {
+  const rows = multiple.value ? getMultipleSelectedRows() : selectedRows.value;
+  if (rows.length === 0) {
+    ElMessage.warning(multiple.value ? '请至少选择一条数据' : '请选择一条数据');
+    return;
+  }
+  emit('selected', multiple.value ? rows : [rows[0]!]);
+  open.value = false;
+}
+
+defineExpose({ open: openModal });
+</script>
+
+<template>
+  <ElDialog
+    v-model="open"
+    title="设备选择"
+    width="80%"
+    destroy-on-close
+    @close="closeModal"
+  >
+    <div class="flex h-full w-full">
+      <div class="mr-4 h-full w-1/5">
+        <MachineryTypeTree ref="typeTreeRef" @node-click="handleTypeNodeClick" />
+      </div>
+      <div class="w-4/5">
+        <Grid table-title="设备列表" />
+      </div>
+    </div>
+    <template #footer>
+      <ElButton @click="closeModal">取消</ElButton>
+      <ElButton type="primary" @click="handleConfirm">确定</ElButton>
+    </template>
+  </ElDialog>
+</template>
diff --git a/apps/web-ele/src/views/mes/tm/tool/components/select-dialog.vue b/apps/web-ele/src/views/mes/tm/tool/components/select-dialog.vue
new file mode 100644
index 000000000..aabd5cd73
--- /dev/null
+++ b/apps/web-ele/src/views/mes/tm/tool/components/select-dialog.vue
@@ -0,0 +1,205 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesTmToolApi } from '#/api/mes/tm/tool';
+
+import { nextTick, ref } from 'vue';
+
+import { ElButton, ElDialog, ElMessage } from 'element-plus';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getToolPage } from '#/api/mes/tm/tool';
+
+import { useToolSelectGridColumns, useToolSelectGridFormSchema } from '../data';
+
+defineOptions({ name: 'TmToolSelectDialog' });
+
+const emit = defineEmits<{
+  selected: [rows: MesTmToolApi.Tool[]];
+}>();
+
+const open = ref(false); // 弹窗是否打开
+const multiple = ref(false); // 是否多选
+const selectedRows = ref<MesTmToolApi.Tool[]>([]); // 已选工具列表
+const preSelectedIds = ref<number[]>([]); // 预选工具编号列表
+
+/** 获取当前表格数据 */
+function getTableRows() {
+  return gridApi.grid.getTableData().fullData as MesTmToolApi.Tool[];
+}
+
+/** 获取多选记录，包含 VXE reserve 跨页记录 */
+function getMultipleSelectedRows() {
+  const selectedMap = new Map<number, MesTmToolApi.Tool>();
+  const records = [
+    ...(gridApi.grid.getCheckboxReserveRecords?.() ?? []),
+    ...(gridApi.grid.getCheckboxRecords?.() ?? []),
+  ] as MesTmToolApi.Tool[];
+  records.forEach((row) => {
+    const rowId = row.id;
+    if (rowId != null) {
+      selectedMap.set(rowId, row);
+    }
+  });
+  return [...selectedMap.values()];
+}
+
+/** 处理勾选变化 */
+function handleCheckboxSelectChange() {
+  selectedRows.value = getMultipleSelectedRows();
+}
+
+/** 处理单选变化 */
+function handleRadioChange(row: MesTmToolApi.Tool) {
+  selectedRows.value = [row];
+}
+
+/** 多选模式下切换行勾选 */
+async function toggleMultipleRow(row: MesTmToolApi.Tool) {
+  const selected = gridApi.grid.isCheckedByCheckboxRow(row);
+  await gridApi.grid.setCheckboxRow(row, !selected);
+  selectedRows.value = getMultipleSelectedRows();
+}
+
+/** 处理行双击 */
+async function handleCellDblclick({ row }: { row: MesTmToolApi.Tool }) {
+  if (multiple.value) {
+    await toggleMultipleRow(row);
+    return;
+  }
+  selectedRows.value = [row];
+  await gridApi.grid.setRadioRow(row);
+  handleConfirm();
+}
+
+/** 回显预选工具 */
+async function applyPreSelection() {
+  if (preSelectedIds.value.length === 0) {
+    return;
+  }
+  const rows = getTableRows();
+  for (const row of rows) {
+    if (row.id == null || !preSelectedIds.value.includes(row.id)) {
+      continue;
+    }
+    if (multiple.value) {
+      await gridApi.grid.setCheckboxRow(row, true);
+    } else {
+      await gridApi.grid.setRadioRow(row);
+      selectedRows.value = [row];
+      return;
+    }
+  }
+  if (multiple.value) {
+    selectedRows.value = getMultipleSelectedRows();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useToolSelectGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useToolSelectGridColumns(false),
+    height: 520,
+    keepSource: true,
+    checkboxConfig: {
+      highlight: true,
+      range: true,
+      reserve: true,
+    },
+    radioConfig: {
+      highlight: true,
+      trigger: 'row',
+    },
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getToolPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesTmToolApi.Tool>,
+  gridEvents: {
+    cellDblclick: handleCellDblclick,
+    checkboxAll: handleCheckboxSelectChange,
+    checkboxChange: handleCheckboxSelectChange,
+    radioChange: ({ row }: { row: MesTmToolApi.Tool }) => {
+      handleRadioChange(row);
+    },
+  },
+});
+
+/** 重置查询和选择状态 */
+async function resetQueryState() {
+  selectedRows.value = [];
+  await gridApi.grid.clearCheckboxRow();
+  await gridApi.grid.clearCheckboxReserve();
+  await gridApi.grid.clearRadioRow();
+  await gridApi.formApi.resetForm();
+}
+
+/** 打开工具选择弹窗 */
+async function openModal(
+  selectedIds?: number[],
+  options?: { multiple?: boolean },
+) {
+  open.value = true;
+  multiple.value = options?.multiple ?? false;
+  preSelectedIds.value = selectedIds || [];
+  await nextTick();
+  gridApi.setGridOptions({
+    columns: useToolSelectGridColumns(multiple.value),
+  });
+  await resetQueryState();
+  await gridApi.query();
+  await nextTick();
+  await applyPreSelection();
+}
+
+/** 关闭工具选择弹窗 */
+async function closeModal() {
+  open.value = false;
+  await resetQueryState();
+}
+
+/** 确认选择工具 */
+function handleConfirm() {
+  const rows = multiple.value ? getMultipleSelectedRows() : selectedRows.value;
+  if (rows.length === 0) {
+    ElMessage.warning(multiple.value ? '请至少选择一条数据' : '请选择一条数据');
+    return;
+  }
+  emit('selected', multiple.value ? rows : [rows[0]!]);
+  open.value = false;
+}
+
+defineExpose({ open: openModal });
+</script>
+
+<template>
+  <ElDialog
+    v-model="open"
+    title="工具选择"
+    width="75%"
+    destroy-on-close
+    @close="closeModal"
+  >
+    <Grid table-title="工具列表" />
+    <template #footer>
+      <ElButton @click="closeModal">取消</ElButton>
+      <ElButton type="primary" @click="handleConfirm">确定</ElButton>
+    </template>
+  </ElDialog>
+</template>
diff --git a/packages/constants/src/biz-mes-enum.ts b/packages/constants/src/biz-mes-enum.ts
index 0e4703326..88bd2b3b0 100644
--- a/packages/constants/src/biz-mes-enum.ts
+++ b/packages/constants/src/biz-mes-enum.ts
@@ -165,6 +165,8 @@ export const MesAutoCodeRuleCode = {
   WM_OUTSOURCE_ISSUE_CODE: 'WM_OUTSOURCE_ISSUE_CODE',
   WM_OUTSOURCE_RECEIPT_CODE: 'WM_OUTSOURCE_RECEIPT_CODE',
   WM_PACKAGE_CODE: 'WM_PACKAGE_CODE',
+  WM_SN_CODE: 'WM_SN_CODE',
+  WM_BATCH_CODE: 'WM_BATCH_CODE',
   WM_STOCK_TAKING_CODE: 'WM_STOCK_TAKING_CODE',
   WM_STOCK_TAKING_PLAN_CODE: 'WM_STOCK_TAKING_PLAN_CODE',
   WM_WAREHOUSE_CODE: 'WM_WAREHOUSE_CODE',
@@ -276,6 +278,12 @@ export const MesProWorkRecordTypeEnum = {
   CLOCK_OUT: 2,
 } as const;
 
+/** MES 生产报工类型枚举 */
+export const MesProFeedbackTypeEnum = {
+  SELF: 1, // 自行报工
+  UNIFIED: 2, // 统一报工
+} as const;
+
 /** MES 杂项出库单状态枚举 */
 export const MesWmMiscIssueStatusEnum = {
   PREPARE: MesOrderStatusConstants.DRAFT,
@@ -396,6 +404,13 @@ export const MesWmProductReceiptStatusEnum = {
   CANCELED: MesOrderStatusConstants.CANCELLED,
 } as const;
 
+/** MES 生产入库单状态枚举 */
+export const MesWmProductProduceStatusEnum = {
+  PREPARE: MesOrderStatusConstants.DRAFT,
+  FINISHED: MesOrderStatusConstants.FINISHED,
+  CANCELED: MesOrderStatusConstants.CANCELLED,
+} as const;
+
 /** MES 销售出库单状态枚举 */
 export const MesWmProductSalesStatusEnum = {
   PREPARE: MesOrderStatusConstants.DRAFT,
@@ -407,6 +422,12 @@ export const MesWmProductSalesStatusEnum = {
   CANCELED: MesOrderStatusConstants.CANCELLED,
 } as const;
 
+/** MES 仓库常量 */
+export const MesWmWarehouseConstants = {
+  /** 虚拟线边仓编码关键字（对应后端 MesWmWarehouseDO.WIP_VIRTUAL_WAREHOUSE） */
+  WIP_VIRTUAL: 'WIP_VIRTUAL',
+} as const;
+
 /** MES 质检结果值类型枚举 */
 export const MesQcResultValueType = {
   FLOAT: 1,
@@ -465,6 +486,12 @@ export const MesAutoCodePartTypeEnum = {
   SERIAL: 4,
 } as const;
 
+/** MES 编码规则补齐方式枚举 */
+export const MesAutoCodePaddedMethodEnum = {
+  LEFT: 1, // 左补齐
+  RIGHT: 2, // 右补齐
+} as const;
+
 /** MES 条码格式枚举 */
 export enum BarcodeFormatEnum {
   QR_CODE = 1,