From 177cf37c1f7c3efb6b732aa6b9566c42a26072a7 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 28 May 2026 21:59:11 +0800
Subject: [PATCH 01/52] =?UTF-8?q?feat(mes/qc):=20=E8=BF=81=E7=A7=BB?=
 =?UTF-8?q?=E7=BC=BA=E9=99=B7=E7=B1=BB=E5=9E=8B=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/views/mes/qc/defect/data.ts | 190 ++++++++++++++++++
 .../src/views/mes/qc/defect/index.vue         | 147 ++++++++++++++
 .../src/views/mes/qc/defect/modules/form.vue  |  86 ++++++++
 apps/web-ele/src/views/mes/qc/defect/data.ts  | 189 +++++++++++++++++
 .../web-ele/src/views/mes/qc/defect/index.vue | 147 ++++++++++++++
 .../src/views/mes/qc/defect/modules/form.vue  |  86 ++++++++
 6 files changed, 845 insertions(+)
 create mode 100644 apps/web-antd/src/views/mes/qc/defect/data.ts
 create mode 100644 apps/web-antd/src/views/mes/qc/defect/index.vue
 create mode 100644 apps/web-antd/src/views/mes/qc/defect/modules/form.vue
 create mode 100644 apps/web-ele/src/views/mes/qc/defect/data.ts
 create mode 100644 apps/web-ele/src/views/mes/qc/defect/index.vue
 create mode 100644 apps/web-ele/src/views/mes/qc/defect/modules/form.vue

diff --git a/apps/web-antd/src/views/mes/qc/defect/data.ts b/apps/web-antd/src/views/mes/qc/defect/data.ts
new file mode 100644
index 000000000..e9f717ce4
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/defect/data.ts
@@ -0,0 +1,190 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcDefectApi } from '#/api/mes/qc/defect';
+
+import { h } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { Button } from 'ant-design-vue';
+
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
+
+/** 新增/修改的表单 */
+export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '缺陷编码',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入缺陷编码',
+      },
+      rules: 'required',
+      suffix: () =>
+        h(
+          Button,
+          {
+            type: 'default',
+            onClick: async () => {
+              try {
+                const code = await generateAutoCode(
+                  MesAutoCodeRuleCode.QC_DEFECT_CODE,
+                );
+                await formApi?.setFieldValue('code', code);
+              } catch (error) {
+                console.error(error);
+              }
+            },
+          },
+          { default: () => '自动生成' },
+        ),
+    },
+    {
+      fieldName: 'name',
+      label: '缺陷描述',
+      component: 'Textarea',
+      componentProps: {
+        placeholder: '请输入缺陷描述',
+        rows: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'type',
+      label: '检测项类型',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_INDICATOR_TYPE, 'number'),
+        placeholder: '请选择检测项类型',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'level',
+      label: '缺陷等级',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_DEFECT_LEVEL, 'number'),
+        placeholder: '请选择缺陷等级',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '缺陷编码',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入缺陷编码',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '缺陷描述',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入缺陷描述',
+      },
+    },
+    {
+      fieldName: 'type',
+      label: '检测项类型',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_INDICATOR_TYPE, 'number'),
+        placeholder: '请选择检测项类型',
+      },
+    },
+    {
+      fieldName: 'level',
+      label: '缺陷等级',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_DEFECT_LEVEL, 'number'),
+        placeholder: '请选择缺陷等级',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesQcDefectApi.Defect>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '缺陷编码',
+      width: 140,
+    },
+    {
+      field: 'name',
+      title: '缺陷描述',
+      minWidth: 200,
+    },
+    {
+      field: 'type',
+      title: '检测项类型',
+      width: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_INDICATOR_TYPE },
+      },
+    },
+    {
+      field: 'level',
+      title: '缺陷等级',
+      width: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_DEFECT_LEVEL },
+      },
+    },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 160,
+    },
+    {
+      field: 'createTime',
+      title: '创建时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      title: '操作',
+      width: 160,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/qc/defect/index.vue b/apps/web-antd/src/views/mes/qc/defect/index.vue
new file mode 100644
index 000000000..62b17721a
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/defect/index.vue
@@ -0,0 +1,147 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcDefectApi } from '#/api/mes/qc/defect';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { deleteDefect, exportDefect, getDefectPage } from '#/api/mes/qc/defect';
+import { $t } from '#/locales';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建缺陷类型 */
+function handleCreate() {
+  formModalApi.setData(null).open();
+}
+
+/** 编辑缺陷类型 */
+function handleEdit(row: MesQcDefectApi.Defect) {
+  formModalApi.setData(row).open();
+}
+
+/** 删除缺陷类型 */
+async function handleDelete(row: MesQcDefectApi.Defect) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.name]),
+    duration: 0,
+  });
+  try {
+    await deleteDefect(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.name]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportDefect(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '缺陷类型.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getDefectPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesQcDefectApi.Defect>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【质量】检测项设置、常见缺陷"
+        url="https://doc.iocoder.cn/mes/qc/base/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="缺陷类型列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['缺陷类型']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:qc-defect:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:qc-defect:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:qc-defect:update'],
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:qc-defect:delete'],
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.name]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/mes/qc/defect/modules/form.vue b/apps/web-antd/src/views/mes/qc/defect/modules/form.vue
new file mode 100644
index 000000000..a3dc3badf
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/defect/modules/form.vue
@@ -0,0 +1,86 @@
+<script lang="ts" setup>
+import type { MesQcDefectApi } from '#/api/mes/qc/defect';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import { createDefect, getDefect, updateDefect } from '#/api/mes/qc/defect';
+import { $t } from '#/locales';
+
+import { useFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesQcDefectApi.Defect>();
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['缺陷类型'])
+    : $t('ui.actionTitle.create', ['缺陷类型']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-2',
+    labelWidth: 120,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+});
+
+/** 表单 schema 需要 formApi 引用（生成编码按钮），所以通过 setState 设置 schema */
+formApi.setState({ schema: useFormSchema(formApi) });
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data = (await formApi.getValues()) as MesQcDefectApi.Defect;
+    try {
+      await (formData.value?.id ? updateDefect(data) : createDefect(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    await formApi.resetForm();
+    // 加载数据
+    const data = modalApi.getData<MesQcDefectApi.Defect>();
+    if (!data || !data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getDefect(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-2/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/qc/defect/data.ts b/apps/web-ele/src/views/mes/qc/defect/data.ts
new file mode 100644
index 000000000..622753830
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/defect/data.ts
@@ -0,0 +1,189 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcDefectApi } from '#/api/mes/qc/defect';
+
+import { h } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { ElButton } from 'element-plus';
+
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
+
+/** 新增/修改的表单 */
+export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '缺陷编码',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入缺陷编码',
+      },
+      rules: 'required',
+      suffix: () =>
+        h(
+          ElButton,
+          {
+            onClick: async () => {
+              try {
+                const code = await generateAutoCode(
+                  MesAutoCodeRuleCode.QC_DEFECT_CODE,
+                );
+                await formApi?.setFieldValue('code', code);
+              } catch (error) {
+                console.error(error);
+              }
+            },
+          },
+          { default: () => '自动生成' },
+        ),
+    },
+    {
+      fieldName: 'name',
+      label: '缺陷描述',
+      component: 'Textarea',
+      componentProps: {
+        placeholder: '请输入缺陷描述',
+        rows: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'type',
+      label: '检测项类型',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_INDICATOR_TYPE, 'number'),
+        placeholder: '请选择检测项类型',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'level',
+      label: '缺陷等级',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_DEFECT_LEVEL, 'number'),
+        placeholder: '请选择缺陷等级',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '缺陷编码',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入缺陷编码',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '缺陷描述',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入缺陷描述',
+      },
+    },
+    {
+      fieldName: 'type',
+      label: '检测项类型',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_INDICATOR_TYPE, 'number'),
+        placeholder: '请选择检测项类型',
+      },
+    },
+    {
+      fieldName: 'level',
+      label: '缺陷等级',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_DEFECT_LEVEL, 'number'),
+        placeholder: '请选择缺陷等级',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesQcDefectApi.Defect>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '缺陷编码',
+      width: 140,
+    },
+    {
+      field: 'name',
+      title: '缺陷描述',
+      minWidth: 200,
+    },
+    {
+      field: 'type',
+      title: '检测项类型',
+      width: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_INDICATOR_TYPE },
+      },
+    },
+    {
+      field: 'level',
+      title: '缺陷等级',
+      width: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_DEFECT_LEVEL },
+      },
+    },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 160,
+    },
+    {
+      field: 'createTime',
+      title: '创建时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      title: '操作',
+      width: 160,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/qc/defect/index.vue b/apps/web-ele/src/views/mes/qc/defect/index.vue
new file mode 100644
index 000000000..c3897549d
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/defect/index.vue
@@ -0,0 +1,147 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcDefectApi } from '#/api/mes/qc/defect';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { deleteDefect, exportDefect, getDefectPage } from '#/api/mes/qc/defect';
+import { $t } from '#/locales';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建缺陷类型 */
+function handleCreate() {
+  formModalApi.setData(null).open();
+}
+
+/** 编辑缺陷类型 */
+function handleEdit(row: MesQcDefectApi.Defect) {
+  formModalApi.setData(row).open();
+}
+
+/** 删除缺陷类型 */
+async function handleDelete(row: MesQcDefectApi.Defect) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.name]),
+  });
+  try {
+    await deleteDefect(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.name]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportDefect(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '缺陷类型.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getDefectPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesQcDefectApi.Defect>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【质量】检测项设置、常见缺陷"
+        url="https://doc.iocoder.cn/mes/qc/base/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="缺陷类型列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['缺陷类型']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:qc-defect:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:qc-defect:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:qc-defect:update'],
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:qc-defect:delete'],
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.name]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-ele/src/views/mes/qc/defect/modules/form.vue b/apps/web-ele/src/views/mes/qc/defect/modules/form.vue
new file mode 100644
index 000000000..0b0ce0cd6
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/defect/modules/form.vue
@@ -0,0 +1,86 @@
+<script lang="ts" setup>
+import type { MesQcDefectApi } from '#/api/mes/qc/defect';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import { createDefect, getDefect, updateDefect } from '#/api/mes/qc/defect';
+import { $t } from '#/locales';
+
+import { useFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesQcDefectApi.Defect>();
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['缺陷类型'])
+    : $t('ui.actionTitle.create', ['缺陷类型']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-2',
+    labelWidth: 120,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+});
+
+/** 表单 schema 需要 formApi 引用（生成编码按钮），所以通过 setState 设置 schema */
+formApi.setState({ schema: useFormSchema(formApi) });
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data = (await formApi.getValues()) as MesQcDefectApi.Defect;
+    try {
+      await (formData.value?.id ? updateDefect(data) : createDefect(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    await formApi.resetForm();
+    // 加载数据
+    const data = modalApi.getData<MesQcDefectApi.Defect>();
+    if (!data || !data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getDefect(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-2/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>

From 0ec301cfb3b2c43c96bca6cf0e64bb24b508484e Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 28 May 2026 23:22:44 +0800
Subject: [PATCH 02/52] =?UTF-8?q?refactor:=20=E7=BB=9F=E4=B8=80=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E5=BC=B9=E7=AA=97=E8=B0=83=E7=94=A8=E5=B9=B6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=BC=80=E5=8F=91=E4=BB=A3=E7=90=86=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/ai/image/manager/index.vue      | 29 +++++++-------
 .../src/views/ai/knowledge/document/index.vue | 29 +++++++-------
 .../src/views/ai/knowledge/segment/index.vue  | 25 ++++++------
 .../src/views/ai/music/manager/index.vue      | 29 +++++++-------
 .../crm/business/components/detail-list.vue   | 36 ++++++++----------
 .../crm/contact/components/detail-list.vue    | 36 ++++++++----------
 .../src/views/crm/permission/modules/list.vue | 38 +++++++++----------
 .../src/views/erp/finance/account/index.vue   | 29 +++++++-------
 .../src/views/erp/stock/warehouse/index.vue   | 29 +++++++-------
 .../src/views/mall/product/comment/index.vue  | 31 +++++++--------
 .../mall/promotion/coupon/template/index.vue  | 25 ++++++------
 .../mall/promotion/seckill/config/index.vue   | 29 +++++++-------
 .../views/mall/trade/brokerage/user/index.vue | 33 ++++++++--------
 .../src/views/pay/app/index.vue               | 31 +++++++--------
 .../src/views/system/user/index.vue           | 25 ++++++------
 .../web-naive/src/views/system/user/index.vue | 25 ++++++------
 .../src/views/system/user/index.vue           | 25 ++++++------
 17 files changed, 225 insertions(+), 279 deletions(-)

diff --git a/apps/web-antdv-next/src/views/ai/image/manager/index.vue b/apps/web-antdv-next/src/views/ai/image/manager/index.vue
index 189d2bfcb..66bb21196 100644
--- a/apps/web-antdv-next/src/views/ai/image/manager/index.vue
+++ b/apps/web-antdv-next/src/views/ai/image/manager/index.vue
@@ -38,24 +38,21 @@ async function handleUpdatePublicStatusChange(
   row: AiImageApi.Image,
 ): Promise<boolean | undefined> {
   const text = newStatus ? '公开' : '私有';
-  return new Promise((resolve, reject) => {
-    confirm({
+  try {
+    await confirm({
       content: `确认要将该图片切换为【${text}】吗？`,
-    })
-      .then(async () => {
-        // 更新图片状态
-        await updateImage({
-          id: row.id,
-          publicStatus: newStatus,
-        });
-        // 提示并返回成功
-        message.success($t('ui.actionMessage.operationSuccess'));
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
+    });
+  } catch {
+    return false;
+  }
+  // 更新图片状态
+  await updateImage({
+    id: row.id,
+    publicStatus: newStatus,
   });
+  // 提示并返回成功
+  message.success($t('ui.actionMessage.operationSuccess'));
+  return true;
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-antdv-next/src/views/ai/knowledge/document/index.vue b/apps/web-antdv-next/src/views/ai/knowledge/document/index.vue
index 798f0404c..2c2d49cc5 100644
--- a/apps/web-antdv-next/src/views/ai/knowledge/document/index.vue
+++ b/apps/web-antdv-next/src/views/ai/knowledge/document/index.vue
@@ -76,24 +76,21 @@ async function handleStatusChange(
   newStatus: number,
   row: AiKnowledgeDocumentApi.KnowledgeDocument,
 ): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    confirm({
+  try {
+    await confirm({
       content: `你要将${row.name}的状态切换为【${getDictLabel(DICT_TYPE.COMMON_STATUS, newStatus)}】吗？`,
-    })
-      .then(async () => {
-        // 更新文档状态
-        await updateKnowledgeDocumentStatus({
-          id: row.id,
-          status: newStatus,
-        });
-        // 提示并返回成功
-        message.success($t('ui.actionMessage.operationSuccess'));
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
+    });
+  } catch {
+    return false;
+  }
+  // 更新文档状态
+  await updateKnowledgeDocumentStatus({
+    id: row.id,
+    status: newStatus,
   });
+  // 提示并返回成功
+  message.success($t('ui.actionMessage.operationSuccess'));
+  return true;
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-antdv-next/src/views/ai/knowledge/segment/index.vue b/apps/web-antdv-next/src/views/ai/knowledge/segment/index.vue
index 0ac3c4f75..836878c9f 100644
--- a/apps/web-antdv-next/src/views/ai/knowledge/segment/index.vue
+++ b/apps/web-antdv-next/src/views/ai/knowledge/segment/index.vue
@@ -64,21 +64,18 @@ async function handleStatusChange(
   newStatus: number,
   row: AiKnowledgeSegmentApi.KnowledgeSegment,
 ): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    confirm({
+  try {
+    await confirm({
       content: `你要将片段 ${row.id} 的状态切换为【${getDictLabel(DICT_TYPE.COMMON_STATUS, newStatus)}】吗？`,
-    })
-      .then(async () => {
-        // 更新片段状态
-        await updateKnowledgeSegmentStatus(row.id!, newStatus);
-        // 提示并返回成功
-        message.success($t('ui.actionMessage.operationSuccess'));
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
-  });
+    });
+  } catch {
+    return false;
+  }
+  // 更新片段状态
+  await updateKnowledgeSegmentStatus(row.id!, newStatus);
+  // 提示并返回成功
+  message.success($t('ui.actionMessage.operationSuccess'));
+  return true;
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-antdv-next/src/views/ai/music/manager/index.vue b/apps/web-antdv-next/src/views/ai/music/manager/index.vue
index 784dfff2d..f29075cd6 100644
--- a/apps/web-antdv-next/src/views/ai/music/manager/index.vue
+++ b/apps/web-antdv-next/src/views/ai/music/manager/index.vue
@@ -38,24 +38,21 @@ async function handleUpdatePublicStatusChange(
   row: AiMusicApi.Music,
 ): Promise<boolean | undefined> {
   const text = newStatus ? '公开' : '私有';
-  return new Promise((resolve, reject) => {
-    confirm({
+  try {
+    await confirm({
       content: `确认要将该音乐切换为【${text}】吗？`,
-    })
-      .then(async () => {
-        // 更新音乐状态
-        await updateMusic({
-          id: row.id,
-          publicStatus: newStatus,
-        });
-        // 提示并返回成功
-        message.success($t('ui.actionMessage.operationSuccess'));
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
+    });
+  } catch {
+    return false;
+  }
+  // 更新音乐状态
+  await updateMusic({
+    id: row.id,
+    publicStatus: newStatus,
   });
+  // 提示并返回成功
+  message.success($t('ui.actionMessage.operationSuccess'));
+  return true;
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-antdv-next/src/views/crm/business/components/detail-list.vue b/apps/web-antdv-next/src/views/crm/business/components/detail-list.vue
index 66cefb628..d2f21c211 100644
--- a/apps/web-antdv-next/src/views/crm/business/components/detail-list.vue
+++ b/apps/web-antdv-next/src/views/crm/business/components/detail-list.vue
@@ -74,28 +74,24 @@ async function handleDeleteContactBusinessList() {
     message.error('请先选择商机后操作！');
     return;
   }
-  return new Promise((resolve, reject) => {
-    confirm({
+  try {
+    await confirm({
       content: `确定要将${checkedRows.value.map((item) => item.name).join(',')}解除关联吗？`,
-    })
-      .then(async () => {
-        const res = await deleteContactBusinessList({
-          contactId: props.bizId,
-          businessIds: checkedRows.value.map((item) => item.id),
-        });
-        if (res) {
-          // 提示并返回成功
-          message.success($t('ui.actionMessage.operationSuccess'));
-          handleRefresh();
-          resolve(true);
-        } else {
-          reject(new Error($t('ui.actionMessage.operationFailed')));
-        }
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
+    });
+  } catch {
+    return false;
+  }
+  const res = await deleteContactBusinessList({
+    contactId: props.bizId,
+    businessIds: checkedRows.value.map((item) => item.id),
   });
+  if (!res) {
+    throw new Error($t('ui.actionMessage.operationFailed'));
+  }
+  // 提示并返回成功
+  message.success($t('ui.actionMessage.operationSuccess'));
+  handleRefresh();
+  return true;
 }
 
 /** 查看商机详情 */
diff --git a/apps/web-antdv-next/src/views/crm/contact/components/detail-list.vue b/apps/web-antdv-next/src/views/crm/contact/components/detail-list.vue
index 0b026d358..3948a4282 100644
--- a/apps/web-antdv-next/src/views/crm/contact/components/detail-list.vue
+++ b/apps/web-antdv-next/src/views/crm/contact/components/detail-list.vue
@@ -71,28 +71,24 @@ async function handleDeleteContactBusinessList() {
     message.error('请先选择联系人后操作！');
     return;
   }
-  return new Promise((resolve, reject) => {
-    confirm({
+  try {
+    await confirm({
       content: `确定要将${checkedRows.value.map((item) => item.name).join(',')}解除关联吗？`,
-    })
-      .then(async () => {
-        const res = await deleteBusinessContactList({
-          businessId: props.bizId,
-          contactIds: checkedRows.value.map((item) => item.id),
-        });
-        if (res) {
-          // 提示并返回成功
-          message.success($t('ui.actionMessage.operationSuccess'));
-          handleRefresh();
-          resolve(true);
-        } else {
-          reject(new Error($t('ui.actionMessage.operationFailed')));
-        }
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
+    });
+  } catch {
+    return false;
+  }
+  const res = await deleteBusinessContactList({
+    businessId: props.bizId,
+    contactIds: checkedRows.value.map((item) => item.id),
   });
+  if (!res) {
+    throw new Error($t('ui.actionMessage.operationFailed'));
+  }
+  // 提示并返回成功
+  message.success($t('ui.actionMessage.operationSuccess'));
+  handleRefresh();
+  return true;
 }
 
 /** 创建商机联系人关联 */
diff --git a/apps/web-antdv-next/src/views/crm/permission/modules/list.vue b/apps/web-antdv-next/src/views/crm/permission/modules/list.vue
index ddb2674d0..8fb577ca2 100644
--- a/apps/web-antdv-next/src/views/crm/permission/modules/list.vue
+++ b/apps/web-antdv-next/src/views/crm/permission/modules/list.vue
@@ -94,32 +94,28 @@ function handleEdit() {
 }
 
 /** 删除团队成员 */
-function handleDelete() {
+async function handleDelete() {
   if (checkedRows.value.length === 0) {
     message.error('请先选择团队成员后操作！');
     return;
   }
-  return new Promise((resolve, reject) => {
-    confirm({
+  try {
+    await confirm({
       content: `你要将${checkedRows.value.map((item) => item.nickname).join(',')}移出团队吗？`,
-    })
-      .then(async () => {
-        const res = await deletePermissionBatch(
-          checkedRows.value.map((item) => item.id!),
-        );
-        if (res) {
-          // 提示并返回成功
-          message.success($t('ui.actionMessage.operationSuccess'));
-          handleRefresh();
-          resolve(true);
-        } else {
-          reject(new Error('移出失败'));
-        }
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
-  });
+    });
+  } catch {
+    return false;
+  }
+  const res = await deletePermissionBatch(
+    checkedRows.value.map((item) => item.id!),
+  );
+  if (!res) {
+    throw new Error('移出失败');
+  }
+  // 提示并返回成功
+  message.success($t('ui.actionMessage.operationSuccess'));
+  handleRefresh();
+  return true;
 }
 
 /** 退出团队 */
diff --git a/apps/web-antdv-next/src/views/erp/finance/account/index.vue b/apps/web-antdv-next/src/views/erp/finance/account/index.vue
index 77784b167..0337b512b 100644
--- a/apps/web-antdv-next/src/views/erp/finance/account/index.vue
+++ b/apps/web-antdv-next/src/views/erp/finance/account/index.vue
@@ -65,23 +65,20 @@ async function handleDefaultStatusChange(
   newStatus: boolean,
   row: ErpAccountApi.Account,
 ): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    const text = newStatus ? '设置' : '取消';
-    confirm({
+  const text = newStatus ? '设置' : '取消';
+  try {
+    await confirm({
       content: `确认要${text}"${row.name}"默认吗?`,
-    })
-      .then(async () => {
-        // 更新默认状态
-        await updateAccountDefaultStatus(row.id!, newStatus);
-        // 提示并返回成功
-        message.success(`${text}默认成功`);
-        handleRefresh();
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
-  });
+    });
+  } catch {
+    return false;
+  }
+  // 更新默认状态
+  await updateAccountDefaultStatus(row.id!, newStatus);
+  // 提示并返回成功
+  message.success(`${text}默认成功`);
+  handleRefresh();
+  return true;
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-antdv-next/src/views/erp/stock/warehouse/index.vue b/apps/web-antdv-next/src/views/erp/stock/warehouse/index.vue
index 195127981..9dec3ce96 100644
--- a/apps/web-antdv-next/src/views/erp/stock/warehouse/index.vue
+++ b/apps/web-antdv-next/src/views/erp/stock/warehouse/index.vue
@@ -63,23 +63,20 @@ async function handleDefaultStatusChange(
   newStatus: boolean,
   row: ErpWarehouseApi.Warehouse,
 ): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    const text = newStatus ? '设置' : '取消';
-    confirm({
+  const text = newStatus ? '设置' : '取消';
+  try {
+    await confirm({
       content: `确认要${text}"${row.name}"默认吗?`,
-    })
-      .then(async () => {
-        // 更新默认状态
-        await updateWarehouseDefaultStatus(row.id!, newStatus);
-        // 提示并返回成功
-        message.success(`${text}默认成功`);
-        handleRefresh();
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
-  });
+    });
+  } catch {
+    return false;
+  }
+  // 更新默认状态
+  await updateWarehouseDefaultStatus(row.id!, newStatus);
+  // 提示并返回成功
+  message.success(`${text}默认成功`);
+  handleRefresh();
+  return true;
 }
 
 const [FormModal, formModalApi] = useVbenModal({
diff --git a/apps/web-antdv-next/src/views/mall/product/comment/index.vue b/apps/web-antdv-next/src/views/mall/product/comment/index.vue
index 72f18e1aa..2baa7e484 100644
--- a/apps/web-antdv-next/src/views/mall/product/comment/index.vue
+++ b/apps/web-antdv-next/src/views/mall/product/comment/index.vue
@@ -63,25 +63,22 @@ async function handleStatusChange(
   newStatus: boolean,
   row: MallCommentApi.Comment,
 ): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    const text = newStatus ? '展示' : '隐藏';
-    confirm({
+  const text = newStatus ? '展示' : '隐藏';
+  try {
+    await confirm({
       content: `确认要${text}该评论吗？`,
-    })
-      .then(async () => {
-        // 更新状态
-        await updateCommentVisible({
-          id: row.id!,
-          visible: newStatus,
-        });
-        // 提示并返回成功
-        message.success(`${text}成功`);
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
+    });
+  } catch {
+    return false;
+  }
+  // 更新状态
+  await updateCommentVisible({
+    id: row.id!,
+    visible: newStatus,
   });
+  // 提示并返回成功
+  message.success(`${text}成功`);
+  return true;
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-antdv-next/src/views/mall/promotion/coupon/template/index.vue b/apps/web-antdv-next/src/views/mall/promotion/coupon/template/index.vue
index 1b08b40f1..9cf786b9f 100644
--- a/apps/web-antdv-next/src/views/mall/promotion/coupon/template/index.vue
+++ b/apps/web-antdv-next/src/views/mall/promotion/coupon/template/index.vue
@@ -60,21 +60,18 @@ async function handleStatusChange(
   newStatus: number,
   row: MallCouponTemplateApi.CouponTemplate,
 ): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    confirm({
+  try {
+    await confirm({
       content: `你要将${row.name}的状态切换为【${newStatus === CommonStatusEnum.ENABLE ? '启用' : '停用'}】吗？`,
-    })
-      .then(async () => {
-        // 更新优惠券模板状态
-        await updateCouponTemplateStatus(row.id!, newStatus);
-        // 提示并返回成功
-        message.success($t('ui.actionMessage.operationSuccess'));
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
-  });
+    });
+  } catch {
+    return false;
+  }
+  // 更新优惠券模板状态
+  await updateCouponTemplateStatus(row.id!, newStatus);
+  // 提示并返回成功
+  message.success($t('ui.actionMessage.operationSuccess'));
+  return true;
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-antdv-next/src/views/mall/promotion/seckill/config/index.vue b/apps/web-antdv-next/src/views/mall/promotion/seckill/config/index.vue
index 2740484e9..038abe3d1 100644
--- a/apps/web-antdv-next/src/views/mall/promotion/seckill/config/index.vue
+++ b/apps/web-antdv-next/src/views/mall/promotion/seckill/config/index.vue
@@ -59,23 +59,20 @@ async function handleStatusChange(
   newStatus: number,
   row: MallSeckillConfigApi.SeckillConfig,
 ): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    // 二次确认
-    const text = row.status === 0 ? '启用' : '停用';
-    confirm({
+  // 二次确认
+  const text = row.status === 0 ? '启用' : '停用';
+  try {
+    await confirm({
       content: `确认要${text + row.name}吗?`,
-    })
-      .then(async () => {
-        // 更新状态
-        await updateSeckillConfigStatus(row.id, newStatus);
-        // 提示并返回成功
-        message.success(`${text}成功`);
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
-  });
+    });
+  } catch {
+    return false;
+  }
+  // 更新状态
+  await updateSeckillConfigStatus(row.id, newStatus);
+  // 提示并返回成功
+  message.success(`${text}成功`);
+  return true;
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-antdv-next/src/views/mall/trade/brokerage/user/index.vue b/apps/web-antdv-next/src/views/mall/trade/brokerage/user/index.vue
index 297669bc1..2db85c26c 100644
--- a/apps/web-antdv-next/src/views/mall/trade/brokerage/user/index.vue
+++ b/apps/web-antdv-next/src/views/mall/trade/brokerage/user/index.vue
@@ -87,26 +87,23 @@ async function handleBrokerageEnabledChange(
   newEnabled: boolean,
   row: MallBrokerageUserApi.BrokerageUser,
 ): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    const text = newEnabled ? '开通' : '关闭';
-    confirm({
+  const text = newEnabled ? '开通' : '关闭';
+  try {
+    await confirm({
       content: `你要将${row.nickname}的推广资格切换为【${text}】吗？`,
-    })
-      .then(async () => {
-        // 更新推广资格
-        await updateBrokerageEnabled({
-          id: row.id!,
-          enabled: newEnabled,
-        });
-        // 提示并返回成功
-        message.success($t('ui.actionMessage.operationSuccess'));
-        handleRefresh();
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
+    });
+  } catch {
+    return false;
+  }
+  // 更新推广资格
+  await updateBrokerageEnabled({
+    id: row.id!,
+    enabled: newEnabled,
   });
+  // 提示并返回成功
+  message.success($t('ui.actionMessage.operationSuccess'));
+  handleRefresh();
+  return true;
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-antdv-next/src/views/pay/app/index.vue b/apps/web-antdv-next/src/views/pay/app/index.vue
index 3be8e5b28..415079f6e 100644
--- a/apps/web-antdv-next/src/views/pay/app/index.vue
+++ b/apps/web-antdv-next/src/views/pay/app/index.vue
@@ -65,25 +65,22 @@ async function handleStatusChange(
   newStatus: number,
   row: PayAppApi.App,
 ): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    const text = newStatus === CommonStatusEnum.ENABLE ? '启用' : '停用';
-    confirm({
+  const text = newStatus === CommonStatusEnum.ENABLE ? '启用' : '停用';
+  try {
+    await confirm({
       content: `确认要${text + row.name}应用吗?`,
-    })
-      .then(async () => {
-        // 更新状态
-        await updateAppStatus({
-          id: row.id!,
-          status: newStatus,
-        });
-        // 提示并返回成功
-        message.success(`${text}成功`);
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
+    });
+  } catch {
+    return false;
+  }
+  // 更新状态
+  await updateAppStatus({
+    id: row.id!,
+    status: newStatus,
   });
+  // 提示并返回成功
+  message.success(`${text}成功`);
+  return true;
 }
 
 /** 生成渠道配置按钮 */
diff --git a/apps/web-antdv-next/src/views/system/user/index.vue b/apps/web-antdv-next/src/views/system/user/index.vue
index 3d20f2104..b8191bbcf 100644
--- a/apps/web-antdv-next/src/views/system/user/index.vue
+++ b/apps/web-antdv-next/src/views/system/user/index.vue
@@ -138,21 +138,18 @@ async function handleStatusChange(
   newStatus: number,
   row: SystemUserApi.User,
 ): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    confirm({
+  try {
+    await confirm({
       content: `你要将${row.username}的状态切换为【${getDictLabel(DICT_TYPE.COMMON_STATUS, newStatus)}】吗？`,
-    })
-      .then(async () => {
-        // 更新用户状态
-        await updateUserStatus(row.id!, newStatus);
-        // 提示并返回成功
-        message.success($t('ui.actionMessage.operationSuccess'));
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
-  });
+    });
+  } catch {
+    return false;
+  }
+  // 更新用户状态
+  await updateUserStatus(row.id!, newStatus);
+  // 提示并返回成功
+  message.success($t('ui.actionMessage.operationSuccess'));
+  return true;
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-naive/src/views/system/user/index.vue b/apps/web-naive/src/views/system/user/index.vue
index 29c5a28a0..b92293197 100644
--- a/apps/web-naive/src/views/system/user/index.vue
+++ b/apps/web-naive/src/views/system/user/index.vue
@@ -138,21 +138,18 @@ async function handleStatusChange(
   newStatus: number,
   row: SystemUserApi.User,
 ): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    confirm({
+  try {
+    await confirm({
       content: `你要将${row.username}的状态切换为【${getDictLabel(DICT_TYPE.COMMON_STATUS, newStatus)}】吗？`,
-    })
-      .then(async () => {
-        // 更新用户状态
-        await updateUserStatus(row.id!, newStatus);
-        // 提示并返回成功
-        message.success($t('ui.actionMessage.operationSuccess'));
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
-  });
+    });
+  } catch {
+    return false;
+  }
+  // 更新用户状态
+  await updateUserStatus(row.id!, newStatus);
+  // 提示并返回成功
+  message.success($t('ui.actionMessage.operationSuccess'));
+  return true;
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-tdesign/src/views/system/user/index.vue b/apps/web-tdesign/src/views/system/user/index.vue
index c8d8645be..fd881c31e 100644
--- a/apps/web-tdesign/src/views/system/user/index.vue
+++ b/apps/web-tdesign/src/views/system/user/index.vue
@@ -139,21 +139,18 @@ async function handleStatusChange(
   newStatus: number,
   row: SystemUserApi.User,
 ): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    confirm({
+  try {
+    await confirm({
       content: `你要将${row.username}的状态切换为【${getDictLabel(DICT_TYPE.COMMON_STATUS, newStatus)}】吗？`,
-    })
-      .then(async () => {
-        // 更新用户状态
-        await updateUserStatus(row.id!, newStatus);
-        // 提示并返回成功
-        message.success($t('ui.actionMessage.operationSuccess'));
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
-  });
+    });
+  } catch {
+    return false;
+  }
+  // 更新用户状态
+  await updateUserStatus(row.id!, newStatus);
+  // 提示并返回成功
+  message.success($t('ui.actionMessage.operationSuccess'));
+  return true;
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({

From 16d6ab072242cddcd6288a60765baa20d3fb2ba0 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 29 May 2026 00:38:14 +0800
Subject: [PATCH 03/52] =?UTF-8?q?feat(mes/qc):=20=E8=BF=81=E7=A7=BB?=
 =?UTF-8?q?=E8=B4=A8=E6=A3=80=E6=8C=87=E6=A0=87=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/qc/indicator/components/index.ts      |   2 +
 .../components/qc-indicator-select-dialog.vue | 201 +++++++++++
 .../components/qc-indicator-select.vue        | 134 ++++++++
 .../src/views/mes/qc/indicator/data.ts        | 315 ++++++++++++++++++
 .../src/views/mes/qc/indicator/index.vue      | 151 +++++++++
 .../views/mes/qc/indicator/modules/form.vue   |  92 +++++
 .../mes/qc/indicator/components/index.ts      |   2 +
 .../components/qc-indicator-select-dialog.vue | 200 +++++++++++
 .../components/qc-indicator-select.vue        | 132 ++++++++
 .../src/views/mes/qc/indicator/data.ts        | 314 +++++++++++++++++
 .../src/views/mes/qc/indicator/index.vue      | 151 +++++++++
 .../views/mes/qc/indicator/modules/form.vue   |  92 +++++
 12 files changed, 1786 insertions(+)
 create mode 100644 apps/web-antd/src/views/mes/qc/indicator/components/index.ts
 create mode 100644 apps/web-antd/src/views/mes/qc/indicator/components/qc-indicator-select-dialog.vue
 create mode 100644 apps/web-antd/src/views/mes/qc/indicator/components/qc-indicator-select.vue
 create mode 100644 apps/web-antd/src/views/mes/qc/indicator/data.ts
 create mode 100644 apps/web-antd/src/views/mes/qc/indicator/index.vue
 create mode 100644 apps/web-antd/src/views/mes/qc/indicator/modules/form.vue
 create mode 100644 apps/web-ele/src/views/mes/qc/indicator/components/index.ts
 create mode 100644 apps/web-ele/src/views/mes/qc/indicator/components/qc-indicator-select-dialog.vue
 create mode 100644 apps/web-ele/src/views/mes/qc/indicator/components/qc-indicator-select.vue
 create mode 100644 apps/web-ele/src/views/mes/qc/indicator/data.ts
 create mode 100644 apps/web-ele/src/views/mes/qc/indicator/index.vue
 create mode 100644 apps/web-ele/src/views/mes/qc/indicator/modules/form.vue

diff --git a/apps/web-antd/src/views/mes/qc/indicator/components/index.ts b/apps/web-antd/src/views/mes/qc/indicator/components/index.ts
new file mode 100644
index 000000000..5958cc7c5
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/indicator/components/index.ts
@@ -0,0 +1,2 @@
+export { default as QcIndicatorSelectDialog } from './qc-indicator-select-dialog.vue';
+export { default as QcIndicatorSelect } from './qc-indicator-select.vue';
diff --git a/apps/web-antd/src/views/mes/qc/indicator/components/qc-indicator-select-dialog.vue b/apps/web-antd/src/views/mes/qc/indicator/components/qc-indicator-select-dialog.vue
new file mode 100644
index 000000000..ecc671b3f
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/indicator/components/qc-indicator-select-dialog.vue
@@ -0,0 +1,201 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcIndicatorApi } from '#/api/mes/qc/indicator';
+
+import { nextTick, ref } from 'vue';
+
+import { Button, message, Modal } from 'ant-design-vue';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getIndicatorPage } from '#/api/mes/qc/indicator';
+
+import { useSelectGridColumns, useSelectGridFormSchema } from '../data';
+
+const emit = defineEmits<{
+  selected: [rows: MesQcIndicatorApi.Indicator[]];
+}>();
+
+const open = ref(false); // 弹窗是否打开
+const multiple = ref(true); // 是否多选
+const selectedRows = ref<MesQcIndicatorApi.Indicator[]>([]); // 已选指标列表
+const preSelectedIds = ref<number[]>([]); // 预选指标编号列表
+
+/** 获取多选记录，包含 VXE reserve 跨页记录 */
+function getMultipleSelectedRows() {
+  const selectedMap = new Map<number, MesQcIndicatorApi.Indicator>();
+  const records = [
+    ...(gridApi.grid.getCheckboxReserveRecords?.() ?? []),
+    ...(gridApi.grid.getCheckboxRecords?.() ?? []),
+  ] as MesQcIndicatorApi.Indicator[];
+  records.forEach((row) => {
+    if (row.id != null) {
+      selectedMap.set(row.id, row);
+    }
+  });
+  return [...selectedMap.values()];
+}
+
+/** 处理勾选变化 */
+function handleCheckboxSelectChange() {
+  selectedRows.value = getMultipleSelectedRows();
+}
+
+/** 处理单选变化 */
+function handleRadioChange(row: MesQcIndicatorApi.Indicator) {
+  selectedRows.value = [row];
+}
+
+/** 多选模式下切换行勾选 */
+async function toggleMultipleRow(row: MesQcIndicatorApi.Indicator) {
+  const selected = gridApi.grid.isCheckedByCheckboxRow(row);
+  await gridApi.grid.setCheckboxRow(row, !selected);
+  selectedRows.value = getMultipleSelectedRows();
+}
+
+/** 处理行双击 */
+async function handleCellDblclick({
+  row,
+}: {
+  row: MesQcIndicatorApi.Indicator;
+}) {
+  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 = gridApi.grid.getData() as MesQcIndicatorApi.Indicator[];
+  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: useSelectGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useSelectGridColumns(true),
+    height: 520,
+    keepSource: true,
+    checkboxConfig: {
+      highlight: true,
+      range: true,
+      reserve: true,
+    },
+    radioConfig: {
+      highlight: true,
+      trigger: 'row',
+    },
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getIndicatorPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesQcIndicatorApi.Indicator>,
+  gridEvents: {
+    cellDblclick: handleCellDblclick,
+    checkboxAll: handleCheckboxSelectChange,
+    checkboxChange: handleCheckboxSelectChange,
+    radioChange: ({ row }: { row: MesQcIndicatorApi.Indicator }) => {
+      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 ?? true;
+  preSelectedIds.value = selectedIds || [];
+  await nextTick();
+  gridApi.setGridOptions({
+    columns: useSelectGridColumns(multiple.value),
+  });
+  await resetQueryState();
+  await gridApi.query();
+  await nextTick();
+  await applyPreSelection();
+}
+
+/** 关闭弹窗 */
+function closeModal() {
+  open.value = false;
+}
+
+/** 确认选择 */
+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"
+    :destroy-on-close="true"
+    title="质检指标选择"
+    width="70%"
+    @cancel="closeModal"
+    @ok="handleConfirm"
+  >
+    <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/qc/indicator/components/qc-indicator-select.vue b/apps/web-antd/src/views/mes/qc/indicator/components/qc-indicator-select.vue
new file mode 100644
index 000000000..7857d06f2
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/indicator/components/qc-indicator-select.vue
@@ -0,0 +1,134 @@
+<script lang="ts" setup>
+import type { MesQcIndicatorApi } from '#/api/mes/qc/indicator';
+
+import { computed, ref, useAttrs, watch } from 'vue';
+
+import { IconifyIcon } from '@vben/icons';
+
+import { Input, Tooltip } from 'ant-design-vue';
+
+import { getIndicator } from '#/api/mes/qc/indicator';
+
+import QcIndicatorSelectDialog from './qc-indicator-select-dialog.vue';
+
+defineOptions({ name: 'QcIndicatorSelect', inheritAttrs: false });
+
+const props = withDefaults(
+  defineProps<{
+    allowClear?: boolean;
+    disabled?: boolean;
+    modelValue?: number;
+    placeholder?: string;
+  }>(),
+  {
+    allowClear: true,
+    disabled: false,
+    modelValue: undefined,
+    placeholder: '请选择质检指标',
+  },
+);
+
+const emit = defineEmits<{
+  change: [item: MesQcIndicatorApi.Indicator | undefined];
+  'update:modelValue': [value: number | undefined];
+}>();
+
+const attrs = useAttrs(); // 透传属性
+const dialogRef = ref<InstanceType<typeof QcIndicatorSelectDialog>>(); // 质检指标选择弹窗
+const hovering = ref(false); // 是否悬停
+const selectedItem = ref<MesQcIndicatorApi.Indicator>(); // 当前选中指标
+
+const displayLabel = computed(() => selectedItem.value?.name ?? ''); // 选择器展示名称
+const showClear = computed(() => // 是否显示清空图标
+  props.allowClear &&
+  !props.disabled &&
+  hovering.value &&
+  props.modelValue != null,
+);
+
+/** 根据 ID 单条查询指标信息（用于编辑回显） */
+async function resolveItemById(id: number | undefined) {
+  if (id == null) {
+    selectedItem.value = undefined;
+    return;
+  }
+  if (selectedItem.value?.id === id) {
+    return;
+  }
+  try {
+    selectedItem.value = await getIndicator(id);
+  } catch (error) {
+    console.error('[QcIndicatorSelect] resolveItemById failed:', error);
+  }
+}
+
+watch(() => props.modelValue, resolveItemById, { immediate: true });
+
+/** 清空已选指标 */
+function clearSelected() {
+  selectedItem.value = undefined;
+  emit('update:modelValue', undefined);
+  emit('change', undefined);
+}
+
+/** 打开质检指标选择弹窗 */
+function handleClick(event: MouseEvent) {
+  if (props.disabled) {
+    return;
+  }
+  const target = event.target as HTMLElement;
+  if (showClear.value && target.closest('.ant-input-suffix')) {
+    event.stopPropagation();
+    clearSelected();
+    return;
+  }
+  const selectedIds = props.modelValue == null ? [] : [props.modelValue];
+  dialogRef.value?.open(selectedIds, { multiple: false });
+}
+
+/** 弹窗选中回调 */
+function handleSelected(rows: MesQcIndicatorApi.Indicator[]) {
+  const item = rows[0];
+  if (!item) {
+    return;
+  }
+  selectedItem.value = item;
+  emit('update:modelValue', item.id);
+  emit('change', item);
+}
+</script>
+
+<template>
+  <div
+    v-bind="attrs"
+    class="w-full"
+    :class="disabled ? 'cursor-not-allowed' : 'cursor-pointer'"
+    @click="handleClick"
+    @mouseenter="hovering = true"
+    @mouseleave="hovering = false"
+  >
+    <Tooltip :mouse-enter-delay="0.5" :open="selectedItem ? undefined : false">
+      <template #title>
+        <div v-if="selectedItem" class="leading-6">
+          <div>编码：{{ selectedItem.code || '-' }}</div>
+          <div>名称：{{ selectedItem.name || '-' }}</div>
+          <div>检测工具：{{ selectedItem.tool || '-' }}</div>
+        </div>
+      </template>
+      <Input
+        :disabled="disabled"
+        :placeholder="placeholder"
+        :value="displayLabel"
+        readonly
+      >
+        <template #suffix>
+          <IconifyIcon
+            class="size-4"
+            :icon="showClear ? 'lucide:circle-x' : 'lucide:search'"
+          />
+        </template>
+      </Input>
+    </Tooltip>
+  </div>
+  <QcIndicatorSelectDialog ref="dialogRef" @selected="handleSelected" />
+</template>
diff --git a/apps/web-antd/src/views/mes/qc/indicator/data.ts b/apps/web-antd/src/views/mes/qc/indicator/data.ts
new file mode 100644
index 000000000..2a2c600bb
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/indicator/data.ts
@@ -0,0 +1,315 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcIndicatorApi } from '#/api/mes/qc/indicator';
+
+import { h } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { Button } from 'ant-design-vue';
+
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getSimpleDictTypeList } from '#/api/system/dict/type';
+import {
+  MesAutoCodeRuleCode,
+  MesQcResultValueType,
+} from '#/views/mes/utils/constants';
+
+/** 新增/修改的表单 */
+export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '检测项编码',
+      component: 'Input',
+      componentProps: {
+        maxlength: 64,
+        placeholder: '请输入检测项编码',
+      },
+      rules: 'required',
+      suffix: () =>
+        h(
+          Button,
+          {
+            type: 'default',
+            onClick: async () => {
+              try {
+                const code = await generateAutoCode(
+                  MesAutoCodeRuleCode.QC_INDICATOR_CODE,
+                );
+                await formApi?.setFieldValue('code', code);
+              } catch (error) {
+                console.error(error);
+              }
+            },
+          },
+          { default: () => '自动生成' },
+        ),
+    },
+    {
+      fieldName: 'name',
+      label: '检测项名称',
+      component: 'Input',
+      componentProps: {
+        maxlength: 100,
+        placeholder: '请输入检测项名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'type',
+      label: '检测项类型',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_INDICATOR_TYPE, 'number'),
+        placeholder: '请选择检测项类型',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'tool',
+      label: '检测工具',
+      component: 'Input',
+      componentProps: {
+        maxlength: 100,
+        placeholder: '请输入检测工具',
+      },
+    },
+    {
+      fieldName: 'resultType',
+      label: '结果值类型',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        // 结果值类型变化时清空结果值属性
+        onChange: () =>
+          formApi?.setFieldValue('resultSpecification', undefined),
+        options: getDictOptions(DICT_TYPE.MES_QC_RESULT_TYPE, 'number'),
+        placeholder: '请选择结果值类型',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'resultSpecification',
+      label: '文件类型',
+      component: 'RadioGroup',
+      componentProps: {
+        options: [
+          { label: '图片/照片', value: 'IMG' },
+          { label: '文件', value: 'FILE' },
+        ],
+      },
+      dependencies: {
+        triggerFields: ['resultType'],
+        show: (values) => values.resultType === MesQcResultValueType.FILE,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'resultSpecification',
+      label: '字典类型',
+      component: 'ApiSelect',
+      componentProps: {
+        allowClear: true,
+        api: getSimpleDictTypeList,
+        filterOption: (input: string, option: any) =>
+          (option.label as string).toLowerCase().includes(input.toLowerCase()),
+        labelField: 'name',
+        placeholder: '请选择字典类型',
+        showSearch: true,
+        valueField: 'type',
+      },
+      dependencies: {
+        triggerFields: ['resultType'],
+        show: (values) => values.resultType === MesQcResultValueType.DICT,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      componentProps: {
+        maxlength: 250,
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '检测项编码',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入检测项编码',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '检测项名称',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入检测项名称',
+      },
+    },
+    {
+      fieldName: 'type',
+      label: '检测项类型',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_INDICATOR_TYPE, 'number'),
+        placeholder: '请选择检测项类型',
+      },
+    },
+    {
+      fieldName: 'resultType',
+      label: '结果值类型',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_QC_RESULT_TYPE, 'number'),
+        placeholder: '请选择结果值类型',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesQcIndicatorApi.Indicator>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '检测项编码',
+      width: 140,
+    },
+    {
+      field: 'name',
+      title: '检测项名称',
+      minWidth: 160,
+    },
+    {
+      field: 'type',
+      title: '检测项类型',
+      width: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_INDICATOR_TYPE },
+      },
+    },
+    {
+      field: 'tool',
+      title: '检测工具',
+      width: 140,
+    },
+    {
+      field: 'resultType',
+      title: '结果值类型',
+      width: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_QC_RESULT_TYPE },
+      },
+    },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 160,
+    },
+    {
+      field: 'createTime',
+      title: '创建时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      title: '操作',
+      width: 160,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 选择弹窗的搜索表单 */
+export function useSelectGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'name',
+      label: '检测项名称',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入检测项名称',
+      },
+    },
+    {
+      fieldName: 'type',
+      label: '检测项类型',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_INDICATOR_TYPE, 'number'),
+        placeholder: '请选择检测项类型',
+      },
+    },
+  ];
+}
+
+/** 选择弹窗的字段 */
+export function useSelectGridColumns(
+  multiple = true,
+): VxeTableGridOptions<MesQcIndicatorApi.Indicator>['columns'] {
+  return [
+    {
+      type: multiple ? 'checkbox' : 'radio',
+      width: 50,
+    },
+    {
+      field: 'code',
+      title: '检测项编码',
+      width: 140,
+    },
+    {
+      field: 'name',
+      title: '检测项名称',
+      minWidth: 160,
+    },
+    {
+      field: 'type',
+      title: '检测项类型',
+      width: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_INDICATOR_TYPE },
+      },
+    },
+    {
+      field: 'tool',
+      title: '检测工具',
+      width: 120,
+    },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 140,
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/qc/indicator/index.vue b/apps/web-antd/src/views/mes/qc/indicator/index.vue
new file mode 100644
index 000000000..166ec5cb3
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/indicator/index.vue
@@ -0,0 +1,151 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcIndicatorApi } from '#/api/mes/qc/indicator';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteIndicator,
+  exportIndicator,
+  getIndicatorPage,
+} from '#/api/mes/qc/indicator';
+import { $t } from '#/locales';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建质检指标 */
+function handleCreate() {
+  formModalApi.setData(null).open();
+}
+
+/** 编辑质检指标 */
+function handleEdit(row: MesQcIndicatorApi.Indicator) {
+  formModalApi.setData(row).open();
+}
+
+/** 删除质检指标 */
+async function handleDelete(row: MesQcIndicatorApi.Indicator) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.name]),
+    duration: 0,
+  });
+  try {
+    await deleteIndicator(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.name]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportIndicator(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '质检指标.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getIndicatorPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesQcIndicatorApi.Indicator>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【质量】检测项设置、常见缺陷"
+        url="https://doc.iocoder.cn/mes/qc/base/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="质检指标列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['质检指标']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:qc-indicator:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:qc-indicator:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:qc-indicator:update'],
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:qc-indicator:delete'],
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.name]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/mes/qc/indicator/modules/form.vue b/apps/web-antd/src/views/mes/qc/indicator/modules/form.vue
new file mode 100644
index 000000000..7b40dbfd1
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/indicator/modules/form.vue
@@ -0,0 +1,92 @@
+<script lang="ts" setup>
+import type { MesQcIndicatorApi } from '#/api/mes/qc/indicator';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createIndicator,
+  getIndicator,
+  updateIndicator,
+} from '#/api/mes/qc/indicator';
+import { $t } from '#/locales';
+
+import { useFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesQcIndicatorApi.Indicator>();
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['质检指标'])
+    : $t('ui.actionTitle.create', ['质检指标']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-2',
+    labelWidth: 120,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+});
+
+/** 表单 schema 需要 formApi 引用（生成编码、跨字段联动），所以通过 setState 设置 schema */
+formApi.setState({ schema: useFormSchema(formApi) });
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data = (await formApi.getValues()) as MesQcIndicatorApi.Indicator;
+    try {
+      await (formData.value?.id
+        ? updateIndicator(data)
+        : createIndicator(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    await formApi.resetForm();
+    // 加载数据
+    const data = modalApi.getData<MesQcIndicatorApi.Indicator>();
+    if (!data || !data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getIndicator(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-2/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/qc/indicator/components/index.ts b/apps/web-ele/src/views/mes/qc/indicator/components/index.ts
new file mode 100644
index 000000000..5958cc7c5
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/indicator/components/index.ts
@@ -0,0 +1,2 @@
+export { default as QcIndicatorSelectDialog } from './qc-indicator-select-dialog.vue';
+export { default as QcIndicatorSelect } from './qc-indicator-select.vue';
diff --git a/apps/web-ele/src/views/mes/qc/indicator/components/qc-indicator-select-dialog.vue b/apps/web-ele/src/views/mes/qc/indicator/components/qc-indicator-select-dialog.vue
new file mode 100644
index 000000000..29697e932
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/indicator/components/qc-indicator-select-dialog.vue
@@ -0,0 +1,200 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcIndicatorApi } from '#/api/mes/qc/indicator';
+
+import { nextTick, ref } from 'vue';
+
+import { ElButton, ElDialog, ElMessage } from 'element-plus';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getIndicatorPage } from '#/api/mes/qc/indicator';
+
+import { useSelectGridColumns, useSelectGridFormSchema } from '../data';
+
+const emit = defineEmits<{
+  selected: [rows: MesQcIndicatorApi.Indicator[]];
+}>();
+
+const open = ref(false); // 弹窗是否打开
+const multiple = ref(true); // 是否多选
+const selectedRows = ref<MesQcIndicatorApi.Indicator[]>([]); // 已选指标列表
+const preSelectedIds = ref<number[]>([]); // 预选指标编号列表
+
+/** 获取多选记录，包含 VXE reserve 跨页记录 */
+function getMultipleSelectedRows() {
+  const selectedMap = new Map<number, MesQcIndicatorApi.Indicator>();
+  const records = [
+    ...(gridApi.grid.getCheckboxReserveRecords?.() ?? []),
+    ...(gridApi.grid.getCheckboxRecords?.() ?? []),
+  ] as MesQcIndicatorApi.Indicator[];
+  records.forEach((row) => {
+    if (row.id != null) {
+      selectedMap.set(row.id, row);
+    }
+  });
+  return [...selectedMap.values()];
+}
+
+/** 处理勾选变化 */
+function handleCheckboxSelectChange() {
+  selectedRows.value = getMultipleSelectedRows();
+}
+
+/** 处理单选变化 */
+function handleRadioChange(row: MesQcIndicatorApi.Indicator) {
+  selectedRows.value = [row];
+}
+
+/** 多选模式下切换行勾选 */
+async function toggleMultipleRow(row: MesQcIndicatorApi.Indicator) {
+  const selected = gridApi.grid.isCheckedByCheckboxRow(row);
+  await gridApi.grid.setCheckboxRow(row, !selected);
+  selectedRows.value = getMultipleSelectedRows();
+}
+
+/** 处理行双击 */
+async function handleCellDblclick({
+  row,
+}: {
+  row: MesQcIndicatorApi.Indicator;
+}) {
+  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 = gridApi.grid.getData() as MesQcIndicatorApi.Indicator[];
+  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: useSelectGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useSelectGridColumns(true),
+    height: 520,
+    keepSource: true,
+    checkboxConfig: {
+      highlight: true,
+      range: true,
+      reserve: true,
+    },
+    radioConfig: {
+      highlight: true,
+      trigger: 'row',
+    },
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getIndicatorPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesQcIndicatorApi.Indicator>,
+  gridEvents: {
+    cellDblclick: handleCellDblclick,
+    checkboxAll: handleCheckboxSelectChange,
+    checkboxChange: handleCheckboxSelectChange,
+    radioChange: ({ row }: { row: MesQcIndicatorApi.Indicator }) => {
+      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 ?? true;
+  preSelectedIds.value = selectedIds || [];
+  await nextTick();
+  gridApi.setGridOptions({
+    columns: useSelectGridColumns(multiple.value),
+  });
+  await resetQueryState();
+  await gridApi.query();
+  await nextTick();
+  await applyPreSelection();
+}
+
+/** 关闭弹窗 */
+function closeModal() {
+  open.value = false;
+}
+
+/** 确认选择 */
+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"
+    destroy-on-close
+    title="质检指标选择"
+    width="70%"
+    @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/qc/indicator/components/qc-indicator-select.vue b/apps/web-ele/src/views/mes/qc/indicator/components/qc-indicator-select.vue
new file mode 100644
index 000000000..450621c23
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/indicator/components/qc-indicator-select.vue
@@ -0,0 +1,132 @@
+<script lang="ts" setup>
+import type { MesQcIndicatorApi } from '#/api/mes/qc/indicator';
+
+import { computed, ref, useAttrs, watch } from 'vue';
+
+import { CircleX, Search } from '@vben/icons';
+
+import { ElInput, ElTooltip } from 'element-plus';
+
+import { getIndicator } from '#/api/mes/qc/indicator';
+
+import QcIndicatorSelectDialog from './qc-indicator-select-dialog.vue';
+
+defineOptions({ name: 'QcIndicatorSelect', inheritAttrs: false });
+
+const props = withDefaults(
+  defineProps<{
+    clearable?: boolean;
+    disabled?: boolean;
+    modelValue?: number;
+    placeholder?: string;
+  }>(),
+  {
+    clearable: true,
+    disabled: false,
+    modelValue: undefined,
+    placeholder: '请选择质检指标',
+  },
+);
+
+const emit = defineEmits<{
+  change: [item: MesQcIndicatorApi.Indicator | undefined];
+  'update:modelValue': [value: number | undefined];
+}>();
+
+const attrs = useAttrs(); // 透传属性
+const dialogRef = ref<InstanceType<typeof QcIndicatorSelectDialog>>(); // 质检指标选择弹窗
+const hovering = ref(false); // 是否悬停
+const selectedItem = ref<MesQcIndicatorApi.Indicator>(); // 当前选中指标
+
+const displayLabel = computed(() => selectedItem.value?.name ?? ''); // 选择器展示名称
+const showClear = computed(() => // 是否显示清空图标
+  props.clearable &&
+  !props.disabled &&
+  hovering.value &&
+  props.modelValue != null,
+);
+
+/** 根据 ID 单条查询指标信息（用于编辑回显） */
+async function resolveItemById(id: number | undefined) {
+  if (id == null) {
+    selectedItem.value = undefined;
+    return;
+  }
+  if (selectedItem.value?.id === id) {
+    return;
+  }
+  try {
+    selectedItem.value = await getIndicator(id);
+  } catch (error) {
+    console.error('[QcIndicatorSelect] resolveItemById failed:', error);
+  }
+}
+
+watch(() => props.modelValue, resolveItemById, { immediate: true });
+
+/** 清空已选指标 */
+function clearSelected() {
+  selectedItem.value = undefined;
+  emit('update:modelValue', undefined);
+  emit('change', undefined);
+}
+
+/** 打开质检指标选择弹窗 */
+function handleClick(event: MouseEvent) {
+  if (props.disabled) {
+    return;
+  }
+  const target = event.target as HTMLElement;
+  if (showClear.value && target.closest('.el-input__suffix')) {
+    event.stopPropagation();
+    clearSelected();
+    return;
+  }
+  const selectedIds = props.modelValue == null ? [] : [props.modelValue];
+  dialogRef.value?.open(selectedIds, { multiple: false });
+}
+
+/** 弹窗选中回调 */
+function handleSelected(rows: MesQcIndicatorApi.Indicator[]) {
+  const item = rows[0];
+  if (!item) {
+    return;
+  }
+  selectedItem.value = item;
+  emit('update:modelValue', item.id);
+  emit('change', item);
+}
+</script>
+
+<template>
+  <div
+    v-bind="attrs"
+    class="w-full"
+    :class="disabled ? 'cursor-not-allowed' : 'cursor-pointer'"
+    @click="handleClick"
+    @mouseenter="hovering = true"
+    @mouseleave="hovering = false"
+  >
+    <ElTooltip :disabled="!selectedItem" placement="top" :show-after="500">
+      <template #content>
+        <div v-if="selectedItem" class="leading-6">
+          <div>编码：{{ selectedItem.code || '-' }}</div>
+          <div>名称：{{ selectedItem.name || '-' }}</div>
+          <div>检测工具：{{ selectedItem.tool || '-' }}</div>
+        </div>
+      </template>
+      <ElInput
+        :disabled="disabled"
+        :model-value="displayLabel"
+        :placeholder="placeholder"
+        readonly
+      >
+        <template #suffix>
+          <CircleX v-if="showClear" class="size-4" />
+          <Search v-else class="size-4" />
+        </template>
+      </ElInput>
+    </ElTooltip>
+  </div>
+  <QcIndicatorSelectDialog ref="dialogRef" @selected="handleSelected" />
+</template>
diff --git a/apps/web-ele/src/views/mes/qc/indicator/data.ts b/apps/web-ele/src/views/mes/qc/indicator/data.ts
new file mode 100644
index 000000000..d227958c9
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/indicator/data.ts
@@ -0,0 +1,314 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcIndicatorApi } from '#/api/mes/qc/indicator';
+
+import { h } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { ElButton } from 'element-plus';
+
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getSimpleDictTypeList } from '#/api/system/dict/type';
+import {
+  MesAutoCodeRuleCode,
+  MesQcResultValueType,
+} from '#/views/mes/utils/constants';
+
+/** 新增/修改的表单 */
+export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '检测项编码',
+      component: 'Input',
+      componentProps: {
+        maxlength: 64,
+        placeholder: '请输入检测项编码',
+      },
+      rules: 'required',
+      suffix: () =>
+        h(
+          ElButton,
+          {
+            onClick: async () => {
+              try {
+                const code = await generateAutoCode(
+                  MesAutoCodeRuleCode.QC_INDICATOR_CODE,
+                );
+                await formApi?.setFieldValue('code', code);
+              } catch (error) {
+                console.error(error);
+              }
+            },
+          },
+          { default: () => '自动生成' },
+        ),
+    },
+    {
+      fieldName: 'name',
+      label: '检测项名称',
+      component: 'Input',
+      componentProps: {
+        maxlength: 100,
+        placeholder: '请输入检测项名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'type',
+      label: '检测项类型',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_INDICATOR_TYPE, 'number'),
+        placeholder: '请选择检测项类型',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'tool',
+      label: '检测工具',
+      component: 'Input',
+      componentProps: {
+        maxlength: 100,
+        placeholder: '请输入检测工具',
+      },
+    },
+    {
+      fieldName: 'resultType',
+      label: '结果值类型',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        // 结果值类型变化时清空结果值属性
+        onChange: () =>
+          formApi?.setFieldValue('resultSpecification', undefined),
+        options: getDictOptions(DICT_TYPE.MES_QC_RESULT_TYPE, 'number'),
+        placeholder: '请选择结果值类型',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'resultSpecification',
+      label: '文件类型',
+      component: 'RadioGroup',
+      componentProps: {
+        options: [
+          { label: '图片/照片', value: 'IMG' },
+          { label: '文件', value: 'FILE' },
+        ],
+      },
+      dependencies: {
+        triggerFields: ['resultType'],
+        show: (values) => values.resultType === MesQcResultValueType.FILE,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'resultSpecification',
+      label: '字典类型',
+      component: 'ApiSelect',
+      componentProps: {
+        api: getSimpleDictTypeList,
+        clearable: true,
+        filterMethod: (input: string, option: any) =>
+          (option.label as string).toLowerCase().includes(input.toLowerCase()),
+        filterable: true,
+        labelField: 'name',
+        placeholder: '请选择字典类型',
+        valueField: 'type',
+      },
+      dependencies: {
+        triggerFields: ['resultType'],
+        show: (values) => values.resultType === MesQcResultValueType.DICT,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      componentProps: {
+        maxlength: 250,
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '检测项编码',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入检测项编码',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '检测项名称',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入检测项名称',
+      },
+    },
+    {
+      fieldName: 'type',
+      label: '检测项类型',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_INDICATOR_TYPE, 'number'),
+        placeholder: '请选择检测项类型',
+      },
+    },
+    {
+      fieldName: 'resultType',
+      label: '结果值类型',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_QC_RESULT_TYPE, 'number'),
+        placeholder: '请选择结果值类型',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesQcIndicatorApi.Indicator>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '检测项编码',
+      width: 140,
+    },
+    {
+      field: 'name',
+      title: '检测项名称',
+      minWidth: 160,
+    },
+    {
+      field: 'type',
+      title: '检测项类型',
+      width: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_INDICATOR_TYPE },
+      },
+    },
+    {
+      field: 'tool',
+      title: '检测工具',
+      width: 140,
+    },
+    {
+      field: 'resultType',
+      title: '结果值类型',
+      width: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_QC_RESULT_TYPE },
+      },
+    },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 160,
+    },
+    {
+      field: 'createTime',
+      title: '创建时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      title: '操作',
+      width: 160,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 选择弹窗的搜索表单 */
+export function useSelectGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'name',
+      label: '检测项名称',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入检测项名称',
+      },
+    },
+    {
+      fieldName: 'type',
+      label: '检测项类型',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_INDICATOR_TYPE, 'number'),
+        placeholder: '请选择检测项类型',
+      },
+    },
+  ];
+}
+
+/** 选择弹窗的字段 */
+export function useSelectGridColumns(
+  multiple = true,
+): VxeTableGridOptions<MesQcIndicatorApi.Indicator>['columns'] {
+  return [
+    {
+      type: multiple ? 'checkbox' : 'radio',
+      width: 50,
+    },
+    {
+      field: 'code',
+      title: '检测项编码',
+      width: 140,
+    },
+    {
+      field: 'name',
+      title: '检测项名称',
+      minWidth: 160,
+    },
+    {
+      field: 'type',
+      title: '检测项类型',
+      width: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_INDICATOR_TYPE },
+      },
+    },
+    {
+      field: 'tool',
+      title: '检测工具',
+      width: 120,
+    },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 140,
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/qc/indicator/index.vue b/apps/web-ele/src/views/mes/qc/indicator/index.vue
new file mode 100644
index 000000000..206b0f062
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/indicator/index.vue
@@ -0,0 +1,151 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcIndicatorApi } from '#/api/mes/qc/indicator';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteIndicator,
+  exportIndicator,
+  getIndicatorPage,
+} from '#/api/mes/qc/indicator';
+import { $t } from '#/locales';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建质检指标 */
+function handleCreate() {
+  formModalApi.setData(null).open();
+}
+
+/** 编辑质检指标 */
+function handleEdit(row: MesQcIndicatorApi.Indicator) {
+  formModalApi.setData(row).open();
+}
+
+/** 删除质检指标 */
+async function handleDelete(row: MesQcIndicatorApi.Indicator) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.name]),
+  });
+  try {
+    await deleteIndicator(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.name]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportIndicator(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '质检指标.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getIndicatorPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesQcIndicatorApi.Indicator>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【质量】检测项设置、常见缺陷"
+        url="https://doc.iocoder.cn/mes/qc/base/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="质检指标列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['质检指标']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:qc-indicator:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:qc-indicator:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:qc-indicator:update'],
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:qc-indicator:delete'],
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.name]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-ele/src/views/mes/qc/indicator/modules/form.vue b/apps/web-ele/src/views/mes/qc/indicator/modules/form.vue
new file mode 100644
index 000000000..72ed12284
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/indicator/modules/form.vue
@@ -0,0 +1,92 @@
+<script lang="ts" setup>
+import type { MesQcIndicatorApi } from '#/api/mes/qc/indicator';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createIndicator,
+  getIndicator,
+  updateIndicator,
+} from '#/api/mes/qc/indicator';
+import { $t } from '#/locales';
+
+import { useFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesQcIndicatorApi.Indicator>();
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['质检指标'])
+    : $t('ui.actionTitle.create', ['质检指标']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-2',
+    labelWidth: 120,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+});
+
+/** 表单 schema 需要 formApi 引用（生成编码、跨字段联动），所以通过 setState 设置 schema */
+formApi.setState({ schema: useFormSchema(formApi) });
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data = (await formApi.getValues()) as MesQcIndicatorApi.Indicator;
+    try {
+      await (formData.value?.id
+        ? updateIndicator(data)
+        : createIndicator(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    await formApi.resetForm();
+    // 加载数据
+    const data = modalApi.getData<MesQcIndicatorApi.Indicator>();
+    if (!data || !data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getIndicator(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-2/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>

From ec5b607171d25585475edcfbd6f1854ec79d3794 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 29 May 2026 08:36:16 +0800
Subject: [PATCH 04/52] =?UTF-8?q?feat(mes/qc):=20=E8=BF=81=E7=A7=BB?=
 =?UTF-8?q?=E8=B4=A8=E6=A3=80=E6=96=B9=E6=A1=88=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/mes/qc/template/data.ts         | 507 +++++++++++++++++
 .../src/views/mes/qc/template/index.vue       | 172 ++++++
 .../views/mes/qc/template/modules/form.vue    | 127 +++++
 .../qc/template/modules/indicator-form.vue    |  97 ++++
 .../qc/template/modules/indicator-list.vue    | 137 +++++
 .../mes/qc/template/modules/item-form.vue     |  96 ++++
 .../mes/qc/template/modules/item-list.vue     | 131 +++++
 .../web-ele/src/views/mes/qc/template/data.ts | 514 ++++++++++++++++++
 .../src/views/mes/qc/template/index.vue       | 172 ++++++
 .../views/mes/qc/template/modules/form.vue    | 127 +++++
 .../qc/template/modules/indicator-form.vue    |  97 ++++
 .../qc/template/modules/indicator-list.vue    | 137 +++++
 .../mes/qc/template/modules/item-form.vue     |  97 ++++
 .../mes/qc/template/modules/item-list.vue     | 131 +++++
 14 files changed, 2542 insertions(+)
 create mode 100644 apps/web-antd/src/views/mes/qc/template/data.ts
 create mode 100644 apps/web-antd/src/views/mes/qc/template/index.vue
 create mode 100644 apps/web-antd/src/views/mes/qc/template/modules/form.vue
 create mode 100644 apps/web-antd/src/views/mes/qc/template/modules/indicator-form.vue
 create mode 100644 apps/web-antd/src/views/mes/qc/template/modules/indicator-list.vue
 create mode 100644 apps/web-antd/src/views/mes/qc/template/modules/item-form.vue
 create mode 100644 apps/web-antd/src/views/mes/qc/template/modules/item-list.vue
 create mode 100644 apps/web-ele/src/views/mes/qc/template/data.ts
 create mode 100644 apps/web-ele/src/views/mes/qc/template/index.vue
 create mode 100644 apps/web-ele/src/views/mes/qc/template/modules/form.vue
 create mode 100644 apps/web-ele/src/views/mes/qc/template/modules/indicator-form.vue
 create mode 100644 apps/web-ele/src/views/mes/qc/template/modules/indicator-list.vue
 create mode 100644 apps/web-ele/src/views/mes/qc/template/modules/item-form.vue
 create mode 100644 apps/web-ele/src/views/mes/qc/template/modules/item-list.vue

diff --git a/apps/web-antd/src/views/mes/qc/template/data.ts b/apps/web-antd/src/views/mes/qc/template/data.ts
new file mode 100644
index 000000000..ce5268ac7
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/template/data.ts
@@ -0,0 +1,507 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcTemplateApi } from '#/api/mes/qc/template';
+import type { MesQcTemplateIndicatorApi } from '#/api/mes/qc/template/indicator';
+import type { MesQcTemplateItemApi } from '#/api/mes/qc/template/item';
+
+import { h, markRaw } from 'vue';
+
+import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { Button } from 'ant-design-vue';
+
+import { z } from '#/adapter/form';
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import MdUnitMeasureSelect from '#/views/mes/md/unitmeasure/components/md-unit-measure-select.vue';
+import QcIndicatorSelect from '#/views/mes/qc/indicator/components/qc-indicator-select.vue';
+import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
+/** 新增/修改的表单 */
+export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '方案编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入方案编号',
+      },
+      rules: 'required',
+      suffix: () =>
+        h(
+          Button,
+          {
+            type: 'default',
+            onClick: async () => {
+              try {
+                const code = await generateAutoCode(
+                  MesAutoCodeRuleCode.QC_TEMPLATE_CODE,
+                );
+                await formApi?.setFieldValue('code', code);
+              } catch (error) {
+                console.error(error);
+              }
+            },
+          },
+          { default: () => '自动生成' },
+        ),
+    },
+    {
+      fieldName: 'name',
+      label: '方案名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入方案名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'status',
+      label: '状态',
+      component: 'Select',
+      componentProps: {
+        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+        placeholder: '请选择状态',
+      },
+      rules: z.number().default(CommonStatusEnum.ENABLE),
+    },
+    {
+      fieldName: 'types',
+      label: '检测种类',
+      component: 'Select',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        allowClear: true,
+        mode: 'multiple',
+        options: getDictOptions(DICT_TYPE.MES_QC_TYPE, 'number'),
+        placeholder: '请选择检测种类',
+      },
+      rules: z.array(z.number()).min(1, '检测种类不能为空'),
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '方案编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入方案编号',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '方案名称',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入方案名称',
+      },
+    },
+    {
+      fieldName: 'type',
+      label: '检测种类',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_QC_TYPE, 'number'),
+        placeholder: '请选择检测种类',
+      },
+    },
+    {
+      fieldName: 'status',
+      label: '状态',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+        placeholder: '请选择状态',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesQcTemplateApi.Template>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '方案编号',
+      width: 150,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '方案名称',
+      minWidth: 180,
+    },
+    {
+      field: 'types',
+      title: '检测种类',
+      minWidth: 200,
+      slots: { default: 'types' },
+    },
+    {
+      field: 'status',
+      title: '状态',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.COMMON_STATUS },
+      },
+    },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 160,
+    },
+    {
+      field: 'createTime',
+      title: '创建时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      title: '操作',
+      width: 160,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 检测指标项子表的字段 */
+export function useIndicatorGridColumns(): VxeTableGridOptions<MesQcTemplateIndicatorApi.TemplateIndicator>['columns'] {
+  return [
+    {
+      field: 'indicatorCode',
+      title: '检测项编码',
+      width: 140,
+    },
+    {
+      field: 'indicatorName',
+      title: '检测项名称',
+      minWidth: 150,
+    },
+    {
+      field: 'indicatorType',
+      title: '检测项类型',
+      width: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_INDICATOR_TYPE },
+      },
+    },
+    {
+      field: 'indicatorTool',
+      title: '检测工具',
+      width: 120,
+    },
+    {
+      field: 'checkMethod',
+      title: '检测方法',
+      minWidth: 180,
+    },
+    {
+      field: 'standardValue',
+      title: '标准值',
+      width: 100,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'thresholdMax',
+      title: '误差上限',
+      width: 100,
+    },
+    {
+      field: 'thresholdMin',
+      title: '误差下限',
+      width: 100,
+    },
+    {
+      title: '操作',
+      width: 130,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 检测指标项子表的表单 */
+export function useIndicatorFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'indicatorId',
+      label: '质检指标',
+      component: markRaw(QcIndicatorSelect),
+      componentProps: {
+        placeholder: '请选择质检指标',
+      },
+      formItemClass: 'col-span-2',
+      rules: 'required',
+    },
+    {
+      fieldName: 'standardValue',
+      label: '标准值',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        precision: 4,
+        placeholder: '请输入标准值',
+      },
+    },
+    {
+      fieldName: 'unitMeasureId',
+      label: '计量单位',
+      component: markRaw(MdUnitMeasureSelect),
+      componentProps: {
+        placeholder: '请选择计量单位',
+      },
+    },
+    {
+      fieldName: 'thresholdMax',
+      label: '误差上限',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        precision: 4,
+        placeholder: '请输入',
+      },
+    },
+    {
+      fieldName: 'thresholdMin',
+      label: '误差下限',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        precision: 4,
+        placeholder: '请输入',
+      },
+    },
+    {
+      fieldName: 'checkMethod',
+      label: '检测方法',
+      component: 'Textarea',
+      formItemClass: 'col-span-2',
+      componentProps: {
+        placeholder: '请输入检测方法',
+        rows: 3,
+      },
+    },
+    {
+      fieldName: 'docUrl',
+      label: '说明图URL',
+      component: 'Input',
+      formItemClass: 'col-span-2',
+      componentProps: {
+        placeholder: '请输入说明图URL',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-2',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 2,
+      },
+    },
+  ];
+}
+
+/** 产品关联子表的字段 */
+export function useItemGridColumns(): VxeTableGridOptions<MesQcTemplateItemApi.TemplateItem>['columns'] {
+  return [
+    {
+      field: 'itemCode',
+      title: '物料编码',
+      width: 130,
+    },
+    {
+      field: 'itemName',
+      title: '物料名称',
+      minWidth: 150,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 130,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '计量单位',
+      width: 100,
+    },
+    {
+      field: 'quantityCheck',
+      title: '最低检测数',
+      width: 110,
+    },
+    {
+      field: 'quantityUnqualified',
+      title: '最大不合格数',
+      width: 120,
+      formatter: ({ cellValue }) =>
+        cellValue === 0 ? '不启用' : (cellValue ?? ''),
+    },
+    {
+      field: 'criticalRate',
+      title: '最大致命缺陷率(%)',
+      width: 150,
+    },
+    {
+      field: 'majorRate',
+      title: '最大严重缺陷率(%)',
+      width: 150,
+    },
+    {
+      field: 'minorRate',
+      title: '最大轻微缺陷率(%)',
+      width: 150,
+    },
+    {
+      title: '操作',
+      width: 130,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 产品关联子表的表单 */
+export function useItemFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'itemId',
+      label: '产品物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择产品物料',
+      },
+      formItemClass: 'col-span-3',
+      rules: 'required',
+    },
+    {
+      fieldName: 'quantityCheck',
+      label: '最低检测数',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 1,
+        placeholder: '请输入最低检测数',
+      },
+      rules: z.number().default(1),
+    },
+    {
+      fieldName: 'quantityUnqualified',
+      label: '最大不合格数',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '0表示不启用',
+      },
+      rules: z.number().default(0),
+      help: '超出最大不合格数后整批判定不合格，0表示不启用',
+    },
+    {
+      fieldName: 'criticalRate',
+      label: '致命缺陷率(%)',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        max: 100,
+        precision: 2,
+        placeholder: '0表示不允许',
+      },
+      rules: z.number().default(0),
+      help: '缺陷比例超出后整批判定不合格，0表示不允许出现',
+    },
+    {
+      fieldName: 'majorRate',
+      label: '严重缺陷率(%)',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        max: 100,
+        precision: 2,
+        placeholder: '0表示不允许',
+      },
+      rules: z.number().default(0),
+      help: '缺陷比例超出后整批判定不合格，0表示不允许出现',
+    },
+    {
+      fieldName: 'minorRate',
+      label: '轻微缺陷率(%)',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        max: 100,
+        precision: 2,
+      },
+      rules: z.number().default(100),
+      help: '缺陷比例超出后整批判定不合格',
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 2,
+      },
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/qc/template/index.vue b/apps/web-antd/src/views/mes/qc/template/index.vue
new file mode 100644
index 000000000..e02d8d616
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/template/index.vue
@@ -0,0 +1,172 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcTemplateApi } from '#/api/mes/qc/template';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { DICT_TYPE } from '@vben/constants';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { Button, message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteTemplate,
+  exportTemplate,
+  getTemplatePage,
+} from '#/api/mes/qc/template';
+import { DictTag } from '#/components/dict-tag';
+import { $t } from '#/locales';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建质检方案 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看质检方案 */
+function handleDetail(row: MesQcTemplateApi.Template) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑质检方案 */
+function handleEdit(row: MesQcTemplateApi.Template) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 删除质检方案 */
+async function handleDelete(row: MesQcTemplateApi.Template) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.name]),
+    duration: 0,
+  });
+  try {
+    await deleteTemplate(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.name]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportTemplate(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '质检方案.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getTemplatePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesQcTemplateApi.Template>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【质量】质检方案"
+        url="https://doc.iocoder.cn/mes/qc/template/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="质检方案列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['质检方案']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:qc-template:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:qc-template:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <Button type="link" @click="handleDetail(row)">
+          {{ row.code }}
+        </Button>
+      </template>
+      <template #types="{ row }">
+        <DictTag
+          v-for="(type, index) in row.types"
+          :key="index"
+          :type="DICT_TYPE.MES_QC_TYPE"
+          :value="type"
+          class="mr-1"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:qc-template:update'],
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:qc-template:delete'],
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.name]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/mes/qc/template/modules/form.vue b/apps/web-antd/src/views/mes/qc/template/modules/form.vue
new file mode 100644
index 000000000..701d0f3fe
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/template/modules/form.vue
@@ -0,0 +1,127 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesQcTemplateApi } from '#/api/mes/qc/template';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message, Tabs } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createTemplate,
+  getTemplate,
+  updateTemplate,
+} from '#/api/mes/qc/template';
+import { $t } from '#/locales';
+
+import { useFormSchema } from '../data';
+import IndicatorList from './indicator-list.vue';
+import ItemList from './item-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create'); // 弹窗形态：新增/编辑/详情
+const subTabsName = ref('indicator'); // 当前激活的子表 tab
+const formData = ref<MesQcTemplateApi.Template>();
+
+const getTitle = computed(() => {
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['质检方案']);
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['质检方案'])
+    : $t('ui.actionTitle.create', ['质检方案']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 100,
+  },
+  wrapperClass: 'grid-cols-3',
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+});
+
+/** 表单 schema 需要 formApi 引用（生成编码按钮），所以通过 setState 设置 schema */
+formApi.setState({ schema: useFormSchema(formApi) });
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (formType.value === 'detail') {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data = (await formApi.getValues()) as MesQcTemplateApi.Template;
+    try {
+      await (formData.value?.id ? updateTemplate(data) : createTemplate(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    await formApi.resetForm();
+    subTabsName.value = 'indicator';
+    // 加载数据
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
+    if (!data?.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getTemplate(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-4/5">
+    <Form class="mx-4" />
+    <Tabs
+      v-if="formType !== 'create' && formData?.id"
+      v-model:active-key="subTabsName"
+      class="mx-4 mt-4"
+    >
+      <Tabs.TabPane key="indicator" tab="检测指标项">
+        <IndicatorList
+          :readonly="formType === 'detail'"
+          :template-id="formData.id"
+        />
+      </Tabs.TabPane>
+      <Tabs.TabPane key="item" tab="产品关联">
+        <ItemList
+          :readonly="formType === 'detail'"
+          :template-id="formData.id"
+        />
+      </Tabs.TabPane>
+    </Tabs>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/qc/template/modules/indicator-form.vue b/apps/web-antd/src/views/mes/qc/template/modules/indicator-form.vue
new file mode 100644
index 000000000..cfbd1a238
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/template/modules/indicator-form.vue
@@ -0,0 +1,97 @@
+<script lang="ts" setup>
+import type { MesQcTemplateIndicatorApi } from '#/api/mes/qc/template/indicator';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createTemplateIndicator,
+  getTemplateIndicator,
+  updateTemplateIndicator,
+} from '#/api/mes/qc/template/indicator';
+import { $t } from '#/locales';
+
+import { useIndicatorFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesQcTemplateIndicatorApi.TemplateIndicator>();
+const templateId = ref<number>(); // 当前所属质检方案编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['指标项'])
+    : $t('ui.actionTitle.create', ['指标项']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  wrapperClass: 'grid-cols-2',
+  layout: 'horizontal',
+  schema: useIndicatorFormSchema(),
+  showDefaultActions: false,
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesQcTemplateIndicatorApi.TemplateIndicator;
+    data.templateId = templateId.value;
+    try {
+      await (formData.value?.id
+        ? updateTemplateIndicator(data)
+        : createTemplateIndicator(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    await formApi.resetForm();
+    // 加载数据
+    const data = modalApi.getData<
+      MesQcTemplateIndicatorApi.TemplateIndicator & { templateId: number }
+    >();
+    templateId.value = data.templateId;
+    if (!data?.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getTemplateIndicator(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/qc/template/modules/indicator-list.vue b/apps/web-antd/src/views/mes/qc/template/modules/indicator-list.vue
new file mode 100644
index 000000000..f559ba7f2
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/template/modules/indicator-list.vue
@@ -0,0 +1,137 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcTemplateIndicatorApi } from '#/api/mes/qc/template/indicator';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteTemplateIndicator,
+  getTemplateIndicatorPage,
+} from '#/api/mes/qc/template/indicator';
+import { $t } from '#/locales';
+
+import { useIndicatorGridColumns } from '../data';
+import IndicatorForm from './indicator-form.vue';
+
+const props = defineProps<{
+  readonly?: boolean;
+  templateId: number;
+}>();
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: IndicatorForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建指标项 */
+function handleCreate() {
+  formModalApi.setData({ templateId: props.templateId }).open();
+}
+
+/** 编辑指标项 */
+function handleEdit(row: MesQcTemplateIndicatorApi.TemplateIndicator) {
+  formModalApi.setData({ ...row, templateId: props.templateId }).open();
+}
+
+/** 删除指标项 */
+async function handleDelete(
+  row: MesQcTemplateIndicatorApi.TemplateIndicator,
+) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.indicatorName]),
+    duration: 0,
+  });
+  try {
+    await deleteTemplateIndicator(row.id!);
+    message.success(
+      $t('ui.actionMessage.deleteSuccess', [row.indicatorName]),
+    );
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useIndicatorGridColumns(),
+    height: 360,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          return await getTemplateIndicatorPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            templateId: props.templateId,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesQcTemplateIndicatorApi.TemplateIndicator>,
+});
+</script>
+
+<template>
+  <div>
+    <FormModal @success="handleRefresh" />
+    <Grid table-title="检测指标项">
+      <template v-if="!readonly" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '新增指标项',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:qc-template:create'],
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:qc-template:update'],
+              ifShow: !readonly,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:qc-template:update'],
+              ifShow: !readonly,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [
+                  row.indicatorName,
+                ]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-antd/src/views/mes/qc/template/modules/item-form.vue b/apps/web-antd/src/views/mes/qc/template/modules/item-form.vue
new file mode 100644
index 000000000..72262de2c
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/template/modules/item-form.vue
@@ -0,0 +1,96 @@
+<script lang="ts" setup>
+import type { MesQcTemplateItemApi } from '#/api/mes/qc/template/item';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createTemplateItem,
+  getTemplateItem,
+  updateTemplateItem,
+} from '#/api/mes/qc/template/item';
+import { $t } from '#/locales';
+
+import { useItemFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesQcTemplateItemApi.TemplateItem>();
+const templateId = ref<number>(); // 当前所属质检方案编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['产品关联'])
+    : $t('ui.actionTitle.create', ['产品关联']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 130,
+  },
+  wrapperClass: 'grid-cols-3',
+  layout: 'horizontal',
+  schema: useItemFormSchema(),
+  showDefaultActions: false,
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data = (await formApi.getValues()) as MesQcTemplateItemApi.TemplateItem;
+    data.templateId = templateId.value;
+    try {
+      await (formData.value?.id
+        ? updateTemplateItem(data)
+        : createTemplateItem(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    await formApi.resetForm();
+    // 加载数据
+    const data = modalApi.getData<
+      MesQcTemplateItemApi.TemplateItem & { templateId: number }
+    >();
+    templateId.value = data.templateId;
+    if (!data?.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getTemplateItem(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/qc/template/modules/item-list.vue b/apps/web-antd/src/views/mes/qc/template/modules/item-list.vue
new file mode 100644
index 000000000..df41f35e0
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/template/modules/item-list.vue
@@ -0,0 +1,131 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcTemplateItemApi } from '#/api/mes/qc/template/item';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteTemplateItem,
+  getTemplateItemPage,
+} from '#/api/mes/qc/template/item';
+import { $t } from '#/locales';
+
+import { useItemGridColumns } from '../data';
+import ItemForm from './item-form.vue';
+
+const props = defineProps<{
+  readonly?: boolean;
+  templateId: number;
+}>();
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: ItemForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建产品关联 */
+function handleCreate() {
+  formModalApi.setData({ templateId: props.templateId }).open();
+}
+
+/** 编辑产品关联 */
+function handleEdit(row: MesQcTemplateItemApi.TemplateItem) {
+  formModalApi.setData({ ...row, templateId: props.templateId }).open();
+}
+
+/** 删除产品关联 */
+async function handleDelete(row: MesQcTemplateItemApi.TemplateItem) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.itemName]),
+    duration: 0,
+  });
+  try {
+    await deleteTemplateItem(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.itemName]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useItemGridColumns(),
+    height: 360,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          return await getTemplateItemPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            templateId: props.templateId,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesQcTemplateItemApi.TemplateItem>,
+});
+</script>
+
+<template>
+  <div>
+    <FormModal @success="handleRefresh" />
+    <Grid table-title="产品关联">
+      <template v-if="!readonly" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '新增产品关联',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:qc-template:create'],
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:qc-template:update'],
+              ifShow: !readonly,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:qc-template:update'],
+              ifShow: !readonly,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.itemName]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-ele/src/views/mes/qc/template/data.ts b/apps/web-ele/src/views/mes/qc/template/data.ts
new file mode 100644
index 000000000..490231ac2
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/template/data.ts
@@ -0,0 +1,514 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcTemplateApi } from '#/api/mes/qc/template';
+import type { MesQcTemplateIndicatorApi } from '#/api/mes/qc/template/indicator';
+import type { MesQcTemplateItemApi } from '#/api/mes/qc/template/item';
+
+import { h, markRaw } from 'vue';
+
+import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { ElButton } from 'element-plus';
+
+import { z } from '#/adapter/form';
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import MdUnitMeasureSelect from '#/views/mes/md/unitmeasure/components/md-unit-measure-select.vue';
+import QcIndicatorSelect from '#/views/mes/qc/indicator/components/qc-indicator-select.vue';
+import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
+/** 新增/修改的表单 */
+export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '方案编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入方案编号',
+      },
+      rules: 'required',
+      suffix: () =>
+        h(
+          ElButton,
+          {
+            onClick: async () => {
+              try {
+                const code = await generateAutoCode(
+                  MesAutoCodeRuleCode.QC_TEMPLATE_CODE,
+                );
+                await formApi?.setFieldValue('code', code);
+              } catch (error) {
+                console.error(error);
+              }
+            },
+          },
+          { default: () => '自动生成' },
+        ),
+    },
+    {
+      fieldName: 'name',
+      label: '方案名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入方案名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'status',
+      label: '状态',
+      component: 'Select',
+      componentProps: {
+        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+        placeholder: '请选择状态',
+      },
+      rules: z.number().default(CommonStatusEnum.ENABLE),
+    },
+    {
+      fieldName: 'types',
+      label: '检测种类',
+      component: 'Select',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        clearable: true,
+        multiple: true,
+        options: getDictOptions(DICT_TYPE.MES_QC_TYPE, 'number'),
+        placeholder: '请选择检测种类',
+      },
+      rules: z.array(z.number()).min(1, '检测种类不能为空'),
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '方案编号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入方案编号',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '方案名称',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入方案名称',
+      },
+    },
+    {
+      fieldName: 'type',
+      label: '检测种类',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_QC_TYPE, 'number'),
+        placeholder: '请选择检测种类',
+      },
+    },
+    {
+      fieldName: 'status',
+      label: '状态',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+        placeholder: '请选择状态',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesQcTemplateApi.Template>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '方案编号',
+      width: 150,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '方案名称',
+      minWidth: 180,
+    },
+    {
+      field: 'types',
+      title: '检测种类',
+      minWidth: 200,
+      slots: { default: 'types' },
+    },
+    {
+      field: 'status',
+      title: '状态',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.COMMON_STATUS },
+      },
+    },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 160,
+    },
+    {
+      field: 'createTime',
+      title: '创建时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      title: '操作',
+      width: 160,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 检测指标项子表的字段 */
+export function useIndicatorGridColumns(): VxeTableGridOptions<MesQcTemplateIndicatorApi.TemplateIndicator>['columns'] {
+  return [
+    {
+      field: 'indicatorCode',
+      title: '检测项编码',
+      width: 140,
+    },
+    {
+      field: 'indicatorName',
+      title: '检测项名称',
+      minWidth: 150,
+    },
+    {
+      field: 'indicatorType',
+      title: '检测项类型',
+      width: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_INDICATOR_TYPE },
+      },
+    },
+    {
+      field: 'indicatorTool',
+      title: '检测工具',
+      width: 120,
+    },
+    {
+      field: 'checkMethod',
+      title: '检测方法',
+      minWidth: 180,
+    },
+    {
+      field: 'standardValue',
+      title: '标准值',
+      width: 100,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'thresholdMax',
+      title: '误差上限',
+      width: 100,
+    },
+    {
+      field: 'thresholdMin',
+      title: '误差下限',
+      width: 100,
+    },
+    {
+      title: '操作',
+      width: 130,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 检测指标项子表的表单 */
+export function useIndicatorFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'indicatorId',
+      label: '质检指标',
+      component: markRaw(QcIndicatorSelect),
+      componentProps: {
+        placeholder: '请选择质检指标',
+      },
+      formItemClass: 'col-span-2',
+      rules: 'required',
+    },
+    {
+      fieldName: 'standardValue',
+      label: '标准值',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        placeholder: '请输入标准值',
+        precision: 4,
+      },
+    },
+    {
+      fieldName: 'unitMeasureId',
+      label: '计量单位',
+      component: markRaw(MdUnitMeasureSelect),
+      componentProps: {
+        placeholder: '请选择计量单位',
+      },
+    },
+    {
+      fieldName: 'thresholdMax',
+      label: '误差上限',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        placeholder: '请输入',
+        precision: 4,
+      },
+    },
+    {
+      fieldName: 'thresholdMin',
+      label: '误差下限',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        placeholder: '请输入',
+        precision: 4,
+      },
+    },
+    {
+      fieldName: 'checkMethod',
+      label: '检测方法',
+      component: 'Textarea',
+      formItemClass: 'col-span-2',
+      componentProps: {
+        placeholder: '请输入检测方法',
+        rows: 3,
+      },
+    },
+    {
+      fieldName: 'docUrl',
+      label: '说明图URL',
+      component: 'Input',
+      formItemClass: 'col-span-2',
+      componentProps: {
+        placeholder: '请输入说明图URL',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-2',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 2,
+      },
+    },
+  ];
+}
+
+/** 产品关联子表的字段 */
+export function useItemGridColumns(): VxeTableGridOptions<MesQcTemplateItemApi.TemplateItem>['columns'] {
+  return [
+    {
+      field: 'itemCode',
+      title: '物料编码',
+      width: 130,
+    },
+    {
+      field: 'itemName',
+      title: '物料名称',
+      minWidth: 150,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 130,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '计量单位',
+      width: 100,
+    },
+    {
+      field: 'quantityCheck',
+      title: '最低检测数',
+      width: 110,
+    },
+    {
+      field: 'quantityUnqualified',
+      title: '最大不合格数',
+      width: 120,
+      formatter: ({ cellValue }) =>
+        cellValue === 0 ? '不启用' : (cellValue ?? ''),
+    },
+    {
+      field: 'criticalRate',
+      title: '最大致命缺陷率(%)',
+      width: 150,
+    },
+    {
+      field: 'majorRate',
+      title: '最大严重缺陷率(%)',
+      width: 150,
+    },
+    {
+      field: 'minorRate',
+      title: '最大轻微缺陷率(%)',
+      width: 150,
+    },
+    {
+      title: '操作',
+      width: 130,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 产品关联子表的表单 */
+export function useItemFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'itemId',
+      label: '产品物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择产品物料',
+      },
+      formItemClass: 'col-span-3',
+      rules: 'required',
+    },
+    {
+      fieldName: 'quantityCheck',
+      label: '最低检测数',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 1,
+        placeholder: '请输入最低检测数',
+      },
+      rules: z.number().default(1),
+    },
+    {
+      fieldName: 'quantityUnqualified',
+      label: '最大不合格数',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '0表示不启用',
+      },
+      rules: z.number().default(0),
+      help: '超出最大不合格数后整批判定不合格，0表示不启用',
+    },
+    {
+      fieldName: 'criticalRate',
+      label: '致命缺陷率(%)',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        max: 100,
+        min: 0,
+        placeholder: '0表示不允许',
+        precision: 2,
+      },
+      rules: z.number().default(0),
+      help: '缺陷比例超出后整批判定不合格，0表示不允许出现',
+    },
+    {
+      fieldName: 'majorRate',
+      label: '严重缺陷率(%)',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        max: 100,
+        min: 0,
+        placeholder: '0表示不允许',
+        precision: 2,
+      },
+      rules: z.number().default(0),
+      help: '缺陷比例超出后整批判定不合格，0表示不允许出现',
+    },
+    {
+      fieldName: 'minorRate',
+      label: '轻微缺陷率(%)',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        max: 100,
+        min: 0,
+        precision: 2,
+      },
+      rules: z.number().default(100),
+      help: '缺陷比例超出后整批判定不合格',
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 2,
+      },
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/qc/template/index.vue b/apps/web-ele/src/views/mes/qc/template/index.vue
new file mode 100644
index 000000000..46088eae1
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/template/index.vue
@@ -0,0 +1,172 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcTemplateApi } from '#/api/mes/qc/template';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { DICT_TYPE } from '@vben/constants';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { ElButton, ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteTemplate,
+  exportTemplate,
+  getTemplatePage,
+} from '#/api/mes/qc/template';
+import { DictTag } from '#/components/dict-tag';
+import { $t } from '#/locales';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建质检方案 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看质检方案 */
+function handleDetail(row: MesQcTemplateApi.Template) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑质检方案 */
+function handleEdit(row: MesQcTemplateApi.Template) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 删除质检方案 */
+async function handleDelete(row: MesQcTemplateApi.Template) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.name]),
+  });
+  try {
+    await deleteTemplate(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.name]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportTemplate(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '质检方案.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getTemplatePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesQcTemplateApi.Template>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【质量】质检方案"
+        url="https://doc.iocoder.cn/mes/qc/template/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="质检方案列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['质检方案']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:qc-template:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:qc-template:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <ElButton link type="primary" @click="handleDetail(row)">
+          {{ row.code }}
+        </ElButton>
+      </template>
+      <template #types="{ row }">
+        <DictTag
+          v-for="(type, index) in row.types"
+          :key="index"
+          :type="DICT_TYPE.MES_QC_TYPE"
+          :value="type"
+          class="mr-1"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:qc-template:update'],
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:qc-template:delete'],
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.name]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-ele/src/views/mes/qc/template/modules/form.vue b/apps/web-ele/src/views/mes/qc/template/modules/form.vue
new file mode 100644
index 000000000..bfedadfc5
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/template/modules/form.vue
@@ -0,0 +1,127 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesQcTemplateApi } from '#/api/mes/qc/template';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage, ElTabPane, ElTabs } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createTemplate,
+  getTemplate,
+  updateTemplate,
+} from '#/api/mes/qc/template';
+import { $t } from '#/locales';
+
+import { useFormSchema } from '../data';
+import IndicatorList from './indicator-list.vue';
+import ItemList from './item-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create'); // 弹窗形态：新增/编辑/详情
+const subTabsName = ref('indicator'); // 当前激活的子表 tab
+const formData = ref<MesQcTemplateApi.Template>();
+
+const getTitle = computed(() => {
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['质检方案']);
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['质检方案'])
+    : $t('ui.actionTitle.create', ['质检方案']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 100,
+  },
+  wrapperClass: 'grid-cols-3',
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+});
+
+/** 表单 schema 需要 formApi 引用（生成编码按钮），所以通过 setState 设置 schema */
+formApi.setState({ schema: useFormSchema(formApi) });
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (formType.value === 'detail') {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data = (await formApi.getValues()) as MesQcTemplateApi.Template;
+    try {
+      await (formData.value?.id ? updateTemplate(data) : createTemplate(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    await formApi.resetForm();
+    subTabsName.value = 'indicator';
+    // 加载数据
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
+    if (!data?.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getTemplate(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-4/5">
+    <Form class="mx-4" />
+    <ElTabs
+      v-if="formType !== 'create' && formData?.id"
+      v-model="subTabsName"
+      class="mx-4 mt-4"
+    >
+      <ElTabPane label="检测指标项" name="indicator">
+        <IndicatorList
+          :readonly="formType === 'detail'"
+          :template-id="formData.id"
+        />
+      </ElTabPane>
+      <ElTabPane label="产品关联" name="item">
+        <ItemList
+          :readonly="formType === 'detail'"
+          :template-id="formData.id"
+        />
+      </ElTabPane>
+    </ElTabs>
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/qc/template/modules/indicator-form.vue b/apps/web-ele/src/views/mes/qc/template/modules/indicator-form.vue
new file mode 100644
index 000000000..073ff2ca7
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/template/modules/indicator-form.vue
@@ -0,0 +1,97 @@
+<script lang="ts" setup>
+import type { MesQcTemplateIndicatorApi } from '#/api/mes/qc/template/indicator';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createTemplateIndicator,
+  getTemplateIndicator,
+  updateTemplateIndicator,
+} from '#/api/mes/qc/template/indicator';
+import { $t } from '#/locales';
+
+import { useIndicatorFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesQcTemplateIndicatorApi.TemplateIndicator>();
+const templateId = ref<number>(); // 当前所属质检方案编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['指标项'])
+    : $t('ui.actionTitle.create', ['指标项']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  wrapperClass: 'grid-cols-2',
+  layout: 'horizontal',
+  schema: useIndicatorFormSchema(),
+  showDefaultActions: false,
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesQcTemplateIndicatorApi.TemplateIndicator;
+    data.templateId = templateId.value;
+    try {
+      await (formData.value?.id
+        ? updateTemplateIndicator(data)
+        : createTemplateIndicator(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    await formApi.resetForm();
+    // 加载数据
+    const data = modalApi.getData<
+      MesQcTemplateIndicatorApi.TemplateIndicator & { templateId: number }
+    >();
+    templateId.value = data.templateId;
+    if (!data?.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getTemplateIndicator(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/qc/template/modules/indicator-list.vue b/apps/web-ele/src/views/mes/qc/template/modules/indicator-list.vue
new file mode 100644
index 000000000..f85632c96
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/template/modules/indicator-list.vue
@@ -0,0 +1,137 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcTemplateIndicatorApi } from '#/api/mes/qc/template/indicator';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteTemplateIndicator,
+  getTemplateIndicatorPage,
+} from '#/api/mes/qc/template/indicator';
+import { $t } from '#/locales';
+
+import { useIndicatorGridColumns } from '../data';
+import IndicatorForm from './indicator-form.vue';
+
+const props = defineProps<{
+  readonly?: boolean;
+  templateId: number;
+}>();
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: IndicatorForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建指标项 */
+function handleCreate() {
+  formModalApi.setData({ templateId: props.templateId }).open();
+}
+
+/** 编辑指标项 */
+function handleEdit(row: MesQcTemplateIndicatorApi.TemplateIndicator) {
+  formModalApi.setData({ ...row, templateId: props.templateId }).open();
+}
+
+/** 删除指标项 */
+async function handleDelete(
+  row: MesQcTemplateIndicatorApi.TemplateIndicator,
+) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.indicatorName]),
+  });
+  try {
+    await deleteTemplateIndicator(row.id!);
+    ElMessage.success(
+      $t('ui.actionMessage.deleteSuccess', [row.indicatorName]),
+    );
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useIndicatorGridColumns(),
+    height: 360,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          return await getTemplateIndicatorPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            templateId: props.templateId,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesQcTemplateIndicatorApi.TemplateIndicator>,
+});
+</script>
+
+<template>
+  <div>
+    <FormModal @success="handleRefresh" />
+    <Grid table-title="检测指标项">
+      <template v-if="!readonly" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '新增指标项',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:qc-template:create'],
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:qc-template:update'],
+              ifShow: !readonly,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:qc-template:update'],
+              ifShow: !readonly,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [
+                  row.indicatorName,
+                ]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-ele/src/views/mes/qc/template/modules/item-form.vue b/apps/web-ele/src/views/mes/qc/template/modules/item-form.vue
new file mode 100644
index 000000000..12df446f9
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/template/modules/item-form.vue
@@ -0,0 +1,97 @@
+<script lang="ts" setup>
+import type { MesQcTemplateItemApi } from '#/api/mes/qc/template/item';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createTemplateItem,
+  getTemplateItem,
+  updateTemplateItem,
+} from '#/api/mes/qc/template/item';
+import { $t } from '#/locales';
+
+import { useItemFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesQcTemplateItemApi.TemplateItem>();
+const templateId = ref<number>(); // 当前所属质检方案编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['产品关联'])
+    : $t('ui.actionTitle.create', ['产品关联']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 130,
+  },
+  wrapperClass: 'grid-cols-3',
+  layout: 'horizontal',
+  schema: useItemFormSchema(),
+  showDefaultActions: false,
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesQcTemplateItemApi.TemplateItem;
+    data.templateId = templateId.value;
+    try {
+      await (formData.value?.id
+        ? updateTemplateItem(data)
+        : createTemplateItem(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    await formApi.resetForm();
+    // 加载数据
+    const data = modalApi.getData<
+      MesQcTemplateItemApi.TemplateItem & { templateId: number }
+    >();
+    templateId.value = data.templateId;
+    if (!data?.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getTemplateItem(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/qc/template/modules/item-list.vue b/apps/web-ele/src/views/mes/qc/template/modules/item-list.vue
new file mode 100644
index 000000000..76eed37e3
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/template/modules/item-list.vue
@@ -0,0 +1,131 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcTemplateItemApi } from '#/api/mes/qc/template/item';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteTemplateItem,
+  getTemplateItemPage,
+} from '#/api/mes/qc/template/item';
+import { $t } from '#/locales';
+
+import { useItemGridColumns } from '../data';
+import ItemForm from './item-form.vue';
+
+const props = defineProps<{
+  readonly?: boolean;
+  templateId: number;
+}>();
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: ItemForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建产品关联 */
+function handleCreate() {
+  formModalApi.setData({ templateId: props.templateId }).open();
+}
+
+/** 编辑产品关联 */
+function handleEdit(row: MesQcTemplateItemApi.TemplateItem) {
+  formModalApi.setData({ ...row, templateId: props.templateId }).open();
+}
+
+/** 删除产品关联 */
+async function handleDelete(row: MesQcTemplateItemApi.TemplateItem) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.itemName]),
+  });
+  try {
+    await deleteTemplateItem(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.itemName]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useItemGridColumns(),
+    height: 360,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          return await getTemplateItemPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            templateId: props.templateId,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesQcTemplateItemApi.TemplateItem>,
+});
+</script>
+
+<template>
+  <div>
+    <FormModal @success="handleRefresh" />
+    <Grid table-title="产品关联">
+      <template v-if="!readonly" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '新增产品关联',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:qc-template:create'],
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:qc-template:update'],
+              ifShow: !readonly,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:qc-template:update'],
+              ifShow: !readonly,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.itemName]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>

From 2d1325f11a8abb154d00ef8c9ecc5740ee67df5c Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 29 May 2026 09:59:13 +0800
Subject: [PATCH 05/52] =?UTF-8?q?feat(mes/wm):=20=E8=BF=81=E7=A7=BB?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=9F=BA=E7=A1=80=E5=88=B0=20vben5=20antd/el?=
 =?UTF-8?q?e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/mes/qc/defectrecord/index.ts      |  42 +++
 .../src/api/mes/qc/indicatorresult/index.ts   |  73 ++++
 apps/web-antd/src/api/mes/qc/iqc/index.ts     |  80 ++++
 .../web-antd/src/api/mes/qc/iqc/line/index.ts |  41 ++
 .../web-antd/src/router/routes/modules/mes.ts |  46 +++
 .../src/views/mes/wm/warehouse/area/data.ts   | 339 +++++++++++++++++
 .../src/views/mes/wm/warehouse/area/index.vue | 219 +++++++++++
 .../mes/wm/warehouse/area/modules/form.vue    | 149 ++++++++
 .../mes/wm/warehouse/components/index.ts      |   3 +
 .../components/wm-warehouse-area-select.vue   | 114 ++++++
 .../wm-warehouse-location-select.vue          | 113 ++++++
 .../components/wm-warehouse-select.vue        | 110 ++++++
 .../src/views/mes/wm/warehouse/data.ts        | 226 +++++++++++
 .../src/views/mes/wm/warehouse/index.vue      | 183 +++++++++
 .../views/mes/wm/warehouse/location/data.ts   | 198 ++++++++++
 .../views/mes/wm/warehouse/location/index.vue | 226 +++++++++++
 .../wm/warehouse/location/modules/form.vue    | 180 +++++++++
 .../views/mes/wm/warehouse/modules/form.vue   | 122 ++++++
 .../src/api/mes/qc/defectrecord/index.ts      |  42 +++
 .../src/api/mes/qc/indicatorresult/index.ts   |  73 ++++
 apps/web-ele/src/api/mes/qc/iqc/index.ts      |  80 ++++
 apps/web-ele/src/api/mes/qc/iqc/line/index.ts |  41 ++
 apps/web-ele/src/router/routes/modules/mes.ts |  46 +++
 .../src/views/mes/wm/warehouse/area/data.ts   | 352 ++++++++++++++++++
 .../src/views/mes/wm/warehouse/area/index.vue | 221 +++++++++++
 .../mes/wm/warehouse/area/modules/form.vue    | 149 ++++++++
 .../mes/wm/warehouse/components/index.ts      |   3 +
 .../components/wm-warehouse-area-select.vue   | 121 ++++++
 .../wm-warehouse-location-select.vue          | 120 ++++++
 .../components/wm-warehouse-select.vue        | 118 ++++++
 .../src/views/mes/wm/warehouse/data.ts        | 227 +++++++++++
 .../src/views/mes/wm/warehouse/index.vue      | 185 +++++++++
 .../views/mes/wm/warehouse/location/data.ts   | 202 ++++++++++
 .../views/mes/wm/warehouse/location/index.vue | 229 ++++++++++++
 .../wm/warehouse/location/modules/form.vue    | 192 ++++++++++
 .../views/mes/wm/warehouse/modules/form.vue   | 124 ++++++
 36 files changed, 4989 insertions(+)
 create mode 100644 apps/web-antd/src/api/mes/qc/defectrecord/index.ts
 create mode 100644 apps/web-antd/src/api/mes/qc/indicatorresult/index.ts
 create mode 100644 apps/web-antd/src/api/mes/qc/iqc/index.ts
 create mode 100644 apps/web-antd/src/api/mes/qc/iqc/line/index.ts
 create mode 100644 apps/web-antd/src/router/routes/modules/mes.ts
 create mode 100644 apps/web-antd/src/views/mes/wm/warehouse/area/data.ts
 create mode 100644 apps/web-antd/src/views/mes/wm/warehouse/area/index.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/warehouse/area/modules/form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/warehouse/components/index.ts
 create mode 100644 apps/web-antd/src/views/mes/wm/warehouse/components/wm-warehouse-area-select.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/warehouse/components/wm-warehouse-location-select.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/warehouse/components/wm-warehouse-select.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/warehouse/data.ts
 create mode 100644 apps/web-antd/src/views/mes/wm/warehouse/index.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/warehouse/location/data.ts
 create mode 100644 apps/web-antd/src/views/mes/wm/warehouse/location/index.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/warehouse/location/modules/form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/warehouse/modules/form.vue
 create mode 100644 apps/web-ele/src/api/mes/qc/defectrecord/index.ts
 create mode 100644 apps/web-ele/src/api/mes/qc/indicatorresult/index.ts
 create mode 100644 apps/web-ele/src/api/mes/qc/iqc/index.ts
 create mode 100644 apps/web-ele/src/api/mes/qc/iqc/line/index.ts
 create mode 100644 apps/web-ele/src/router/routes/modules/mes.ts
 create mode 100644 apps/web-ele/src/views/mes/wm/warehouse/area/data.ts
 create mode 100644 apps/web-ele/src/views/mes/wm/warehouse/area/index.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/warehouse/area/modules/form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/warehouse/components/index.ts
 create mode 100644 apps/web-ele/src/views/mes/wm/warehouse/components/wm-warehouse-area-select.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/warehouse/components/wm-warehouse-location-select.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/warehouse/components/wm-warehouse-select.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/warehouse/data.ts
 create mode 100644 apps/web-ele/src/views/mes/wm/warehouse/index.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/warehouse/location/data.ts
 create mode 100644 apps/web-ele/src/views/mes/wm/warehouse/location/index.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/warehouse/location/modules/form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/warehouse/modules/form.vue

diff --git a/apps/web-antd/src/api/mes/qc/defectrecord/index.ts b/apps/web-antd/src/api/mes/qc/defectrecord/index.ts
new file mode 100644
index 000000000..0d5182b15
--- /dev/null
+++ b/apps/web-antd/src/api/mes/qc/defectrecord/index.ts
@@ -0,0 +1,42 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesQcDefectRecordApi {
+  /** MES 质检缺陷记录 */
+  export interface DefectRecord {
+    id?: number; // 编号
+    qcType?: number; // 检验类型
+    qcId?: number; // 检验单 ID
+    lineId?: number; // 检验行 ID
+    name?: string; // 缺陷描述
+    level?: number; // 缺陷等级
+    quantity?: number; // 缺陷数量
+    remark?: string; // 备注
+  }
+}
+
+/** 查询质检缺陷记录分页 */
+export function getDefectRecordPage(
+  params: PageParam & { lineId?: number; qcId?: number; qcType?: number; },
+) {
+  return requestClient.get<PageResult<MesQcDefectRecordApi.DefectRecord>>(
+    '/mes/qc/defect-record/page',
+    { params },
+  );
+}
+
+/** 新增质检缺陷记录 */
+export function createDefectRecord(data: MesQcDefectRecordApi.DefectRecord) {
+  return requestClient.post('/mes/qc/defect-record/create', data);
+}
+
+/** 修改质检缺陷记录 */
+export function updateDefectRecord(data: MesQcDefectRecordApi.DefectRecord) {
+  return requestClient.put('/mes/qc/defect-record/update', data);
+}
+
+/** 删除质检缺陷记录 */
+export function deleteDefectRecord(id: number) {
+  return requestClient.delete(`/mes/qc/defect-record/delete?id=${id}`);
+}
diff --git a/apps/web-antd/src/api/mes/qc/indicatorresult/index.ts b/apps/web-antd/src/api/mes/qc/indicatorresult/index.ts
new file mode 100644
index 000000000..dfa8a7f93
--- /dev/null
+++ b/apps/web-antd/src/api/mes/qc/indicatorresult/index.ts
@@ -0,0 +1,73 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesQcIndicatorResultApi {
+  /** MES 检验结果明细 */
+  export interface IndicatorResultDetail {
+    id?: number; // 编号
+    resultId?: number; // 关联检验结果 ID
+    indicatorId?: number; // 检测指标 ID
+    value?: string; // 检测值（统一存为字符串）
+    valueNumber?: number; // UI 数值绑定（提交前转字符串）
+    remark?: string; // 备注
+    // 关联查询字段（来自 indicator）
+    indicatorName?: string; // 检测指标名称
+    valueType?: number; // 质检值类型
+    valueSpecification?: string; // 值属性
+  }
+
+  /** MES 检验结果 */
+  export interface IndicatorResult {
+    id?: number; // 编号
+    code?: string; // 样品编号
+    qcId?: number; // 关联质检单 ID
+    qcType?: number; // 质检类型
+    itemId?: number; // 产品物料 ID
+    sn?: string; // 物资 SN
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+    items?: IndicatorResultDetail[]; // 检验结果明细列表
+  }
+}
+
+/** 查询检验结果分页 */
+export function getIndicatorResultPage(
+  params: PageParam & { qcId?: number; qcType?: number },
+) {
+  return requestClient.get<PageResult<MesQcIndicatorResultApi.IndicatorResult>>(
+    '/mes/qc/indicator-result/page',
+    { params },
+  );
+}
+
+/** 查询检验结果明细（含检测项模板）：编辑传 id，新增不传 */
+export function getIndicatorResultDetail(
+  qcId: number,
+  qcType: number,
+  id?: number,
+) {
+  return requestClient.get<MesQcIndicatorResultApi.IndicatorResult>(
+    '/mes/qc/indicator-result/get-detail',
+    { params: { id, qcId, qcType } },
+  );
+}
+
+/** 新增检验结果 */
+export function createIndicatorResult(
+  data: MesQcIndicatorResultApi.IndicatorResult,
+) {
+  return requestClient.post('/mes/qc/indicator-result/create', data);
+}
+
+/** 修改检验结果 */
+export function updateIndicatorResult(
+  data: MesQcIndicatorResultApi.IndicatorResult,
+) {
+  return requestClient.put('/mes/qc/indicator-result/update', data);
+}
+
+/** 删除检验结果 */
+export function deleteIndicatorResult(id: number) {
+  return requestClient.delete(`/mes/qc/indicator-result/delete?id=${id}`);
+}
diff --git a/apps/web-antd/src/api/mes/qc/iqc/index.ts b/apps/web-antd/src/api/mes/qc/iqc/index.ts
new file mode 100644
index 000000000..cdb04cb6a
--- /dev/null
+++ b/apps/web-antd/src/api/mes/qc/iqc/index.ts
@@ -0,0 +1,80 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesQcIqcApi {
+  /** MES 来料检验单 */
+  export interface Iqc {
+    id?: number; // 编号
+    code?: string; // 检验单编号
+    name?: string; // 检验单名称
+    templateId?: number; // 检验模板 ID
+    sourceDocType?: number; // 来源单据类型
+    sourceDocId?: number; // 来源单据 ID
+    sourceLineId?: number; // 来源单据行 ID
+    sourceDocCode?: string; // 来源单据编号（关联查询）
+    vendorId?: number; // 供应商 ID
+    vendorNickname?: string; // 供应商简称（关联查询）
+    vendorBatch?: string; // 供应商批次号
+    itemId?: number; // 产品物料 ID
+    itemCode?: string; // 产品物料编码（关联查询）
+    itemName?: string; // 产品物料名称（关联查询）
+    itemSpecification?: string; // 规格型号（关联查询）
+    unitName?: string; // 单位名称（关联查询）
+    receivedQuantity?: number; // 本次接收数量
+    checkQuantity?: number; // 本次检测数量
+    qualifiedQuantity?: number; // 合格品数量
+    unqualifiedQuantity?: number; // 不合格品数量
+    criticalRate?: number; // 致命缺陷率（%）
+    majorRate?: number; // 严重缺陷率（%）
+    minorRate?: number; // 轻微缺陷率（%）
+    criticalQuantity?: number; // 致命缺陷数量
+    majorQuantity?: number; // 严重缺陷数量
+    minorQuantity?: number; // 轻微缺陷数量
+    checkResult?: number; // 检测结果
+    receiveDate?: number; // 来料日期
+    inspectDate?: number; // 检测日期
+    inspector?: string; // 检测人员（昵称）
+    inspectorUserId?: number; // 检测人员 ID
+    inspectorNickname?: string; // 检测人员昵称（关联查询）
+    status?: number; // 状态
+    remark?: string; // 备注
+  }
+}
+
+/** 查询来料检验单分页 */
+export function getIqcPage(params: PageParam) {
+  return requestClient.get<PageResult<MesQcIqcApi.Iqc>>('/mes/qc/iqc/page', {
+    params,
+  });
+}
+
+/** 查询来料检验单详情 */
+export function getIqc(id: number) {
+  return requestClient.get<MesQcIqcApi.Iqc>(`/mes/qc/iqc/get?id=${id}`);
+}
+
+/** 新增来料检验单 */
+export function createIqc(data: MesQcIqcApi.Iqc) {
+  return requestClient.post('/mes/qc/iqc/create', data);
+}
+
+/** 修改来料检验单 */
+export function updateIqc(data: MesQcIqcApi.Iqc) {
+  return requestClient.put('/mes/qc/iqc/update', data);
+}
+
+/** 完成来料检验单 */
+export function finishIqc(id: number) {
+  return requestClient.put(`/mes/qc/iqc/finish?id=${id}`);
+}
+
+/** 删除来料检验单 */
+export function deleteIqc(id: number) {
+  return requestClient.delete(`/mes/qc/iqc/delete?id=${id}`);
+}
+
+/** 导出来料检验单 */
+export function exportIqc(params: any) {
+  return requestClient.download('/mes/qc/iqc/export-excel', { params });
+}
diff --git a/apps/web-antd/src/api/mes/qc/iqc/line/index.ts b/apps/web-antd/src/api/mes/qc/iqc/line/index.ts
new file mode 100644
index 000000000..dc37aa99b
--- /dev/null
+++ b/apps/web-antd/src/api/mes/qc/iqc/line/index.ts
@@ -0,0 +1,41 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesQcIqcLineApi {
+  /** MES 来料检验单行 */
+  export interface IqcLine {
+    id?: number; // 编号
+    iqcId?: number; // 来料检验单 ID
+    indicatorId?: number; // 检测指标 ID
+    indicatorCode?: string; // 检测指标编码（关联查询）
+    indicatorName?: string; // 检测指标名称（关联查询）
+    indicatorType?: number; // 检测指标类型（关联查询）
+    tool?: string; // 检测工具
+    checkMethod?: string; // 检测方法
+    standardValue?: number; // 标准值
+    unitMeasureId?: number; // 计量单位 ID
+    unitMeasureName?: string; // 计量单位名称（关联查询）
+    maxThreshold?: number; // 误差上限
+    minThreshold?: number; // 误差下限
+    criticalQuantity?: number; // 致命缺陷数量
+    majorQuantity?: number; // 严重缺陷数量
+    minorQuantity?: number; // 轻微缺陷数量
+    remark?: string; // 备注
+  }
+}
+
+/** 查询来料检验单行分页 */
+export function getIqcLinePage(params: PageParam & { iqcId?: number }) {
+  return requestClient.get<PageResult<MesQcIqcLineApi.IqcLine>>(
+    '/mes/qc/iqc/line/page',
+    { params },
+  );
+}
+
+/** 查询来料检验单行详情 */
+export function getIqcLine(id: number) {
+  return requestClient.get<MesQcIqcLineApi.IqcLine>(
+    `/mes/qc/iqc/line/get?id=${id}`,
+  );
+}
diff --git a/apps/web-antd/src/router/routes/modules/mes.ts b/apps/web-antd/src/router/routes/modules/mes.ts
new file mode 100644
index 000000000..05af60e29
--- /dev/null
+++ b/apps/web-antd/src/router/routes/modules/mes.ts
@@ -0,0 +1,46 @@
+import type { RouteRecordRaw } from 'vue-router';
+
+const routes: RouteRecordRaw[] = [
+  {
+    path: '/mes',
+    name: 'MesCenter',
+    meta: {
+      title: 'MES 制造执行',
+      icon: 'lucide:factory',
+      keepAlive: true,
+      hideInMenu: true,
+    },
+    children: [
+      {
+        path: 'wm/warehouse/location',
+        name: 'MesWmLocation',
+        meta: {
+          title: '库区设置',
+          activePath: '/mes/wm/warehouse',
+        },
+        component: () =>
+          import('#/views/mes/wm/warehouse/location/index.vue'),
+      },
+      {
+        path: 'wm/warehouse/area',
+        name: 'MesWmArea',
+        meta: {
+          title: '库位设置',
+          activePath: '/mes/wm/warehouse',
+        },
+        component: () => import('#/views/mes/wm/warehouse/area/index.vue'),
+      },
+      {
+        path: 'wm/barcode/config',
+        name: 'MesWmBarcodeConfig',
+        meta: {
+          title: '条码配置',
+          activePath: '/mes/wm/barcode',
+        },
+        component: () => import('#/views/mes/wm/barcode/config/index.vue'),
+      },
+    ],
+  },
+];
+
+export default routes;
diff --git a/apps/web-antd/src/views/mes/wm/warehouse/area/data.ts b/apps/web-antd/src/views/mes/wm/warehouse/area/data.ts
new file mode 100644
index 000000000..b18fb4981
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/warehouse/area/data.ts
@@ -0,0 +1,339 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmWarehouseAreaApi } from '#/api/mes/wm/warehouse/area';
+
+import { h } from 'vue';
+
+import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { Button } from 'ant-design-vue';
+
+import { z } from '#/adapter/form';
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getWarehouseSimpleList } from '#/api/mes/wm/warehouse';
+import { getWarehouseLocationSimpleList } from '#/api/mes/wm/warehouse/location';
+import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
+/** 新增/修改的表单 */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: { triggerFields: [''], show: () => false },
+    },
+    {
+      fieldName: 'warehouseId',
+      label: '所属仓库',
+      component: 'ApiSelect',
+      componentProps: {
+        allowClear: true,
+        api: getWarehouseSimpleList,
+        labelField: 'name',
+        valueField: 'id',
+        placeholder: '请选择仓库',
+        // 仓库变更时清空所属库区
+        onChange: () => formApi?.setFieldValue('locationId', undefined),
+      },
+    },
+    {
+      fieldName: 'locationId',
+      label: '所属库区',
+      component: 'ApiSelect',
+      dependencies: {
+        triggerFields: ['warehouseId'],
+        componentProps: (values) => ({
+          allowClear: true,
+          api: () =>
+            getWarehouseLocationSimpleList(values.warehouseId as number),
+          // 改变 warehouseId 时强制刷新选项
+          params: { warehouseId: values.warehouseId },
+          disabled: !values.warehouseId,
+          labelField: 'name',
+          valueField: 'id',
+          placeholder: '请选择库区',
+        }),
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'code',
+      label: '库位编码',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入库位编码',
+      },
+      rules: 'required',
+      suffix:
+        formType === 'detail'
+          ? undefined
+          : () =>
+              h(
+                Button,
+                {
+                  type: 'default',
+                  onClick: async () => {
+                    try {
+                      const code = await generateAutoCode(
+                        MesAutoCodeRuleCode.WM_AREA_CODE,
+                      );
+                      await formApi?.setFieldValue('code', code);
+                    } catch (error) {
+                      console.error(error);
+                    }
+                  },
+                },
+                { default: () => '自动生成' },
+              ),
+    },
+    {
+      fieldName: 'name',
+      label: '库位名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入库位名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'area',
+      label: '面积（㎡）',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        precision: 2,
+        placeholder: '请输入面积',
+      },
+    },
+    {
+      fieldName: 'maxLoad',
+      label: '最大载重',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        precision: 2,
+        placeholder: '请输入最大载重',
+      },
+    },
+    {
+      fieldName: 'positionX',
+      label: '位置 X',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入位置 X',
+      },
+    },
+    {
+      fieldName: 'positionY',
+      label: '位置 Y',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入位置 Y',
+      },
+    },
+    {
+      fieldName: 'positionZ',
+      label: '位置 Z',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入位置 Z',
+      },
+    },
+    {
+      fieldName: 'status',
+      label: '状态',
+      component: 'Select',
+      componentProps: {
+        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+        placeholder: '请选择',
+      },
+      rules: z.number().default(CommonStatusEnum.ENABLE),
+    },
+    {
+      fieldName: 'frozen',
+      label: '是否冻结',
+      component: 'Switch',
+      componentProps: {
+        checkedChildren: '是',
+        unCheckedChildren: '否',
+      },
+      rules: z.boolean().default(false),
+    },
+    {
+      fieldName: 'allowItemMixing',
+      label: '允许物料混放',
+      component: 'Switch',
+      componentProps: {
+        checkedChildren: '是',
+        unCheckedChildren: '否',
+      },
+      rules: z.boolean().default(true),
+    },
+    {
+      fieldName: 'allowBatchMixing',
+      label: '允许批次混放',
+      component: 'Switch',
+      componentProps: {
+        checkedChildren: '是',
+        unCheckedChildren: '否',
+      },
+      rules: z.boolean().default(true),
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '库位编码',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入库位编码',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '库位名称',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入库位名称',
+      },
+    },
+    {
+      fieldName: 'positionX',
+      label: '位置 X',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入位置 X',
+      },
+    },
+    {
+      fieldName: 'positionY',
+      label: '位置 Y',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入位置 Y',
+      },
+    },
+    {
+      fieldName: 'positionZ',
+      label: '位置 Z',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入位置 Z',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesWmWarehouseAreaApi.WarehouseArea>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '库位编码',
+      minWidth: 140,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '库位名称',
+      minWidth: 160,
+    },
+    {
+      field: 'area',
+      title: '面积（㎡）',
+      width: 100,
+    },
+    {
+      field: 'maxLoad',
+      title: '最大载重',
+      width: 100,
+    },
+    {
+      field: 'positionX',
+      title: '位置 X',
+      width: 80,
+    },
+    {
+      field: 'positionY',
+      title: '位置 Y',
+      width: 80,
+    },
+    {
+      field: 'positionZ',
+      title: '位置 Z',
+      width: 80,
+    },
+    {
+      field: 'status',
+      title: '状态',
+      width: 90,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.COMMON_STATUS },
+      },
+    },
+    {
+      field: 'frozen',
+      title: '冻结',
+      width: 90,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+      },
+    },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 180,
+    },
+    {
+      field: 'createTime',
+      title: '创建时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      title: '操作',
+      width: 200,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/wm/warehouse/area/index.vue b/apps/web-antd/src/views/mes/wm/warehouse/area/index.vue
new file mode 100644
index 000000000..f30a2211c
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/warehouse/area/index.vue
@@ -0,0 +1,219 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmWarehouseAreaApi } from '#/api/mes/wm/warehouse/area';
+
+import { ref } from 'vue';
+import { useRoute } from 'vue-router';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+
+import { Alert, Button, message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteWarehouseArea,
+  getWarehouseAreaPage,
+} from '#/api/mes/wm/warehouse/area';
+import { getWarehouseLocation } from '#/api/mes/wm/warehouse/location';
+import { $t } from '#/locales';
+import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
+
+import { BarcodeDetail } from '../../barcode/components';
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const route = useRoute();
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>();
+
+/** 当前库区上下文（同步从 URL 解析，确保首次查询带得上 locationId） */
+const currentLocation = ref<{
+  id: number;
+  name: string;
+  warehouseId: number;
+  warehouseName: string;
+}>(
+  (() => {
+    const id = Number(route.query.locationId);
+    return Number.isInteger(id) && id > 0
+      ? { id, name: '', warehouseId: 0, warehouseName: '' }
+      : { id: 0, name: '', warehouseId: 0, warehouseName: '' };
+  })(),
+);
+
+/** 异步加载库区/仓库名称（不阻塞列表查询） */
+async function loadLocationName() {
+  if (!currentLocation.value.id) {
+    return;
+  }
+  try {
+    const location = await getWarehouseLocation(currentLocation.value.id);
+    currentLocation.value.name = location.name || '';
+    currentLocation.value.warehouseId = location.warehouseId || 0;
+    currentLocation.value.warehouseName = location.warehouseName || '';
+  } catch {
+    // 忽略上级名称加载异常，不影响列表查询
+  }
+}
+loadLocationName();
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建库位 */
+function handleCreate() {
+  formModalApi
+    .setData({
+      formType: 'create',
+      locationId: currentLocation.value.id || undefined,
+      warehouseId: currentLocation.value.warehouseId || undefined,
+    })
+    .open();
+}
+
+/** 查看库位详情 */
+function handleDetail(row: MesWmWarehouseAreaApi.WarehouseArea) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑库位 */
+function handleEdit(row: MesWmWarehouseAreaApi.WarehouseArea) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 删除库位 */
+async function handleDelete(row: MesWmWarehouseAreaApi.WarehouseArea) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.name]),
+    duration: 0,
+  });
+  try {
+    await deleteWarehouseArea(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.name]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 查看库位条码 */
+function handleBarcode(row: MesWmWarehouseAreaApi.WarehouseArea) {
+  barcodeDetailRef.value?.openByBusiness(
+    row.id!,
+    BarcodeBizTypeEnum.AREA,
+    row.code,
+    row.name,
+  );
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getWarehouseAreaPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            locationId: currentLocation.value.id || undefined,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmWarehouseAreaApi.WarehouseArea>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】仓库与库区库位、条码赋码、SN码"
+        url="https://doc.iocoder.cn/mes/wm/warehouse-setup/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+    <BarcodeDetail ref="barcodeDetailRef" />
+
+    <Alert
+      v-if="currentLocation.id"
+      class="mb-3"
+      :message="`当前仓库/库区：${currentLocation.warehouseName || `#${currentLocation.warehouseId || '-'}`} / ${currentLocation.name || `#${currentLocation.id}`}`"
+      show-icon
+      type="info"
+    />
+
+    <Grid table-title="库位列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['库位']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-warehouse:create'],
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <Button type="link" @click="handleDetail(row)">
+          {{ row.code }}
+        </Button>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:wm-warehouse:update'],
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm-warehouse:delete'],
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.name]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '条码',
+              type: 'link',
+              auth: ['mes:wm-warehouse:query'],
+              onClick: handleBarcode.bind(null, row),
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/warehouse/area/modules/form.vue b/apps/web-antd/src/views/mes/wm/warehouse/area/modules/form.vue
new file mode 100644
index 000000000..19dc5a60d
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/warehouse/area/modules/form.vue
@@ -0,0 +1,149 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesWmWarehouseAreaApi } from '#/api/mes/wm/warehouse/area';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { Button, message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createWarehouseArea,
+  getWarehouseArea,
+  updateWarehouseArea,
+} from '#/api/mes/wm/warehouse/area';
+import { getWarehouseLocation } from '#/api/mes/wm/warehouse/location';
+import { $t } from '#/locales';
+import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
+import { BarcodeDetail } from '#/views/mes/wm/barcode/components';
+
+import { useFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesWmWarehouseAreaApi.WarehouseArea>();
+const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>();
+
+const getTitle = computed(() => {
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['库位']);
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['库位'])
+    : $t('ui.actionTitle.create', ['库位']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 120,
+  },
+  wrapperClass: 'grid-cols-3',
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+});
+
+/** 查看条码 */
+function handleBarcode() {
+  if (!formData.value?.id) {
+    return;
+  }
+  barcodeDetailRef.value?.openByBusiness(
+    formData.value.id,
+    BarcodeBizTypeEnum.AREA,
+    formData.value.code,
+    formData.value.name,
+  );
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (formType.value === 'detail') {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmWarehouseAreaApi.WarehouseArea;
+    try {
+      await (formData.value?.id
+        ? updateWarehouseArea(data)
+        : createWarehouseArea(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{
+      formType: FormType;
+      id?: number;
+      locationId?: number;
+      warehouseId?: number;
+    }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getWarehouseArea(data.id);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+      return;
+    }
+    // 新增态：根据父级上下文带入仓库/库区
+    let warehouseId = data?.warehouseId;
+    if (data?.locationId) {
+      if (!warehouseId) {
+        try {
+          const location = await getWarehouseLocation(data.locationId);
+          warehouseId = location.warehouseId;
+        } catch {
+          // 忽略
+        }
+      }
+      await formApi.setValues({
+        warehouseId,
+        locationId: data.locationId,
+      });
+    } else if (warehouseId) {
+      await formApi.setFieldValue('warehouseId', warehouseId);
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+    <template v-if="formType === 'detail' && formData?.id" #prepend-footer>
+      <Button @click="handleBarcode"> 查看条码 </Button>
+    </template>
+    <BarcodeDetail ref="barcodeDetailRef" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/warehouse/components/index.ts b/apps/web-antd/src/views/mes/wm/warehouse/components/index.ts
new file mode 100644
index 000000000..d2981238b
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/warehouse/components/index.ts
@@ -0,0 +1,3 @@
+export { default as WmWarehouseAreaSelect } from './wm-warehouse-area-select.vue';
+export { default as WmWarehouseLocationSelect } from './wm-warehouse-location-select.vue';
+export { default as WmWarehouseSelect } from './wm-warehouse-select.vue';
diff --git a/apps/web-antd/src/views/mes/wm/warehouse/components/wm-warehouse-area-select.vue b/apps/web-antd/src/views/mes/wm/warehouse/components/wm-warehouse-area-select.vue
new file mode 100644
index 000000000..1c482856a
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/warehouse/components/wm-warehouse-area-select.vue
@@ -0,0 +1,114 @@
+<script lang="ts" setup>
+import type { MesWmWarehouseAreaApi } from '#/api/mes/wm/warehouse/area';
+
+import { computed, ref, useAttrs, watch, watchEffect } from 'vue';
+
+import { Select, SelectOption, Tag, Tooltip } from 'ant-design-vue';
+
+import { getWarehouseAreaSimpleList } from '#/api/mes/wm/warehouse/area';
+
+defineOptions({ name: 'WmWarehouseAreaSelect', inheritAttrs: false });
+
+const props = withDefaults(
+  defineProps<{
+    allowClear?: boolean;
+    disabled?: boolean;
+    locationId?: number;
+    modelValue?: number;
+    placeholder?: string;
+  }>(),
+  {
+    allowClear: true,
+    disabled: false,
+    locationId: undefined,
+    modelValue: undefined,
+    placeholder: '请选择库位',
+  },
+);
+
+const emit = defineEmits<{
+  change: [item: MesWmWarehouseAreaApi.WarehouseArea | undefined];
+  'update:modelValue': [value: number | undefined];
+}>();
+
+const attrs = useAttrs();
+const allList = ref<MesWmWarehouseAreaApi.WarehouseArea[]>([]);
+const selectedItem = ref<MesWmWarehouseAreaApi.WarehouseArea>();
+
+const selectValue = computed({
+  get: () => props.modelValue,
+  set: (val) => emit('update:modelValue', val),
+});
+
+/** 选中变化 */
+function handleChange(val: any) {
+  const item = allList.value.find((o) => o.id === val);
+  selectedItem.value = item;
+  emit('change', item);
+}
+
+/** 前端过滤（name + code） */
+function filterOption(input: string, option: any) {
+  const item = allList.value.find((o) => o.id === option.value);
+  if (!item) {
+    return false;
+  }
+  const keyword = input.toLowerCase();
+  return (
+    !!item.name?.toLowerCase().includes(keyword) ||
+    !!item.code?.toLowerCase().includes(keyword)
+  );
+}
+
+watch(
+  () => props.modelValue,
+  (val) => {
+    if (val == null) {
+      selectedItem.value = undefined;
+      return;
+    }
+    if (selectedItem.value?.id !== val && allList.value.length > 0) {
+      selectedItem.value = allList.value.find((o) => o.id === val);
+    }
+  },
+);
+
+/** 库区变更或初始化时重新加载库位列表 */
+watchEffect(async () => {
+  allList.value = await getWarehouseAreaSimpleList(props.locationId);
+  if (props.modelValue != null) {
+    selectedItem.value = allList.value.find((o) => o.id === props.modelValue);
+  }
+});
+</script>
+
+<template>
+  <Tooltip :mouse-enter-delay="0.5" :open="selectedItem ? undefined : false">
+    <template #title>
+      <div v-if="selectedItem" class="leading-6">
+        <div>编码：{{ selectedItem.code || '-' }}</div>
+        <div>名称：{{ selectedItem.name || '-' }}</div>
+        <div>所属仓库：{{ selectedItem.warehouseName || '-' }}</div>
+        <div>所属库区：{{ selectedItem.locationName || '-' }}</div>
+      </div>
+    </template>
+    <Select
+      v-bind="attrs"
+      v-model:value="selectValue"
+      :allow-clear="allowClear"
+      class="!w-full"
+      :disabled="disabled"
+      :filter-option="filterOption"
+      :placeholder="placeholder"
+      show-search
+      @change="handleChange"
+    >
+      <SelectOption v-for="item in allList" :key="item.id" :value="item.id">
+        <div class="flex items-center gap-2">
+          <span>{{ item.name }}</span>
+          <Tag v-if="item.code" color="blue">编号: {{ item.code }}</Tag>
+        </div>
+      </SelectOption>
+    </Select>
+  </Tooltip>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/warehouse/components/wm-warehouse-location-select.vue b/apps/web-antd/src/views/mes/wm/warehouse/components/wm-warehouse-location-select.vue
new file mode 100644
index 000000000..1852823eb
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/warehouse/components/wm-warehouse-location-select.vue
@@ -0,0 +1,113 @@
+<script lang="ts" setup>
+import type { MesWmWarehouseLocationApi } from '#/api/mes/wm/warehouse/location';
+
+import { computed, ref, useAttrs, watch, watchEffect } from 'vue';
+
+import { Select, SelectOption, Tag, Tooltip } from 'ant-design-vue';
+
+import { getWarehouseLocationSimpleList } from '#/api/mes/wm/warehouse/location';
+
+defineOptions({ name: 'WmWarehouseLocationSelect', inheritAttrs: false });
+
+const props = withDefaults(
+  defineProps<{
+    allowClear?: boolean;
+    disabled?: boolean;
+    modelValue?: number;
+    placeholder?: string;
+    warehouseId?: number;
+  }>(),
+  {
+    allowClear: true,
+    disabled: false,
+    modelValue: undefined,
+    placeholder: '请选择库区',
+    warehouseId: undefined,
+  },
+);
+
+const emit = defineEmits<{
+  change: [item: MesWmWarehouseLocationApi.WarehouseLocation | undefined];
+  'update:modelValue': [value: number | undefined];
+}>();
+
+const attrs = useAttrs();
+const allList = ref<MesWmWarehouseLocationApi.WarehouseLocation[]>([]);
+const selectedItem = ref<MesWmWarehouseLocationApi.WarehouseLocation>();
+
+const selectValue = computed({
+  get: () => props.modelValue,
+  set: (val) => emit('update:modelValue', val),
+});
+
+/** 选中变化 */
+function handleChange(val: any) {
+  const item = allList.value.find((o) => o.id === val);
+  selectedItem.value = item;
+  emit('change', item);
+}
+
+/** 前端过滤（name + code） */
+function filterOption(input: string, option: any) {
+  const item = allList.value.find((o) => o.id === option.value);
+  if (!item) {
+    return false;
+  }
+  const keyword = input.toLowerCase();
+  return (
+    !!item.name?.toLowerCase().includes(keyword) ||
+    !!item.code?.toLowerCase().includes(keyword)
+  );
+}
+
+watch(
+  () => props.modelValue,
+  (val) => {
+    if (val == null) {
+      selectedItem.value = undefined;
+      return;
+    }
+    if (selectedItem.value?.id !== val && allList.value.length > 0) {
+      selectedItem.value = allList.value.find((o) => o.id === val);
+    }
+  },
+);
+
+/** 仓库变更或初始化时重新加载库区列表 */
+watchEffect(async () => {
+  allList.value = await getWarehouseLocationSimpleList(props.warehouseId);
+  if (props.modelValue != null) {
+    selectedItem.value = allList.value.find((o) => o.id === props.modelValue);
+  }
+});
+</script>
+
+<template>
+  <Tooltip :mouse-enter-delay="0.5" :open="selectedItem ? undefined : false">
+    <template #title>
+      <div v-if="selectedItem" class="leading-6">
+        <div>编码：{{ selectedItem.code || '-' }}</div>
+        <div>名称：{{ selectedItem.name || '-' }}</div>
+        <div>所属仓库：{{ selectedItem.warehouseName || '-' }}</div>
+      </div>
+    </template>
+    <Select
+      v-bind="attrs"
+      v-model:value="selectValue"
+      :allow-clear="allowClear"
+      class="!w-full"
+      :disabled="disabled"
+      :filter-option="filterOption"
+      :placeholder="placeholder"
+      show-search
+      @change="handleChange"
+    >
+      <SelectOption v-for="item in allList" :key="item.id" :value="item.id">
+        <div class="flex items-center gap-2">
+          <span>{{ item.name }}</span>
+          <Tag v-if="item.code" color="blue">编号: {{ item.code }}</Tag>
+        </div>
+      </SelectOption>
+    </Select>
+  </Tooltip>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/warehouse/components/wm-warehouse-select.vue b/apps/web-antd/src/views/mes/wm/warehouse/components/wm-warehouse-select.vue
new file mode 100644
index 000000000..e680c7978
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/warehouse/components/wm-warehouse-select.vue
@@ -0,0 +1,110 @@
+<script lang="ts" setup>
+import type { MesWmWarehouseApi } from '#/api/mes/wm/warehouse';
+
+import { computed, onMounted, ref, useAttrs, watch } from 'vue';
+
+import { Select, SelectOption, Tag, Tooltip } from 'ant-design-vue';
+
+import { getWarehouseSimpleList } from '#/api/mes/wm/warehouse';
+
+defineOptions({ name: 'WmWarehouseSelect', inheritAttrs: false });
+
+const props = withDefaults(
+  defineProps<{
+    allowClear?: boolean;
+    disabled?: boolean;
+    modelValue?: number;
+    placeholder?: string;
+  }>(),
+  {
+    allowClear: true,
+    disabled: false,
+    modelValue: undefined,
+    placeholder: '请选择仓库',
+  },
+);
+
+const emit = defineEmits<{
+  change: [item: MesWmWarehouseApi.Warehouse | undefined];
+  'update:modelValue': [value: number | undefined];
+}>();
+
+const attrs = useAttrs();
+const allList = ref<MesWmWarehouseApi.Warehouse[]>([]);
+const selectedItem = ref<MesWmWarehouseApi.Warehouse>();
+
+const selectValue = computed({
+  get: () => props.modelValue,
+  set: (val) => emit('update:modelValue', val),
+});
+
+/** 选中变化 */
+function handleChange(val: any) {
+  const item = allList.value.find((o) => o.id === val);
+  selectedItem.value = item;
+  emit('change', item);
+}
+
+/** 前端过滤（name + code） */
+function filterOption(input: string, option: any) {
+  const item = allList.value.find((o) => o.id === option.value);
+  if (!item) {
+    return false;
+  }
+  const keyword = input.toLowerCase();
+  return (
+    !!item.name?.toLowerCase().includes(keyword) ||
+    !!item.code?.toLowerCase().includes(keyword)
+  );
+}
+
+watch(
+  () => props.modelValue,
+  (val) => {
+    if (val == null) {
+      selectedItem.value = undefined;
+      return;
+    }
+    if (selectedItem.value?.id !== val && allList.value.length > 0) {
+      selectedItem.value = allList.value.find((o) => o.id === val);
+    }
+  },
+);
+
+onMounted(async () => {
+  allList.value = await getWarehouseSimpleList();
+  if (props.modelValue != null) {
+    selectedItem.value = allList.value.find((o) => o.id === props.modelValue);
+  }
+});
+</script>
+
+<template>
+  <Tooltip :mouse-enter-delay="0.5" :open="selectedItem ? undefined : false">
+    <template #title>
+      <div v-if="selectedItem" class="leading-6">
+        <div>编码：{{ selectedItem.code || '-' }}</div>
+        <div>名称：{{ selectedItem.name || '-' }}</div>
+        <div>地址：{{ selectedItem.address || '-' }}</div>
+      </div>
+    </template>
+    <Select
+      v-bind="attrs"
+      v-model:value="selectValue"
+      :allow-clear="allowClear"
+      class="!w-full"
+      :disabled="disabled"
+      :filter-option="filterOption"
+      :placeholder="placeholder"
+      show-search
+      @change="handleChange"
+    >
+      <SelectOption v-for="item in allList" :key="item.id" :value="item.id">
+        <div class="flex items-center gap-2">
+          <span>{{ item.name }}</span>
+          <Tag v-if="item.code" color="blue">编号: {{ item.code }}</Tag>
+        </div>
+      </SelectOption>
+    </Select>
+  </Tooltip>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/warehouse/data.ts b/apps/web-antd/src/views/mes/wm/warehouse/data.ts
new file mode 100644
index 000000000..045e21177
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/warehouse/data.ts
@@ -0,0 +1,226 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmWarehouseApi } from '#/api/mes/wm/warehouse';
+import type { SystemUserApi } from '#/api/system/user';
+
+import { h } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+
+import { Button } from 'ant-design-vue';
+
+import { z } from '#/adapter/form';
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getSimpleUserList } from '#/api/system/user';
+import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
+/** 关联数据 */
+let userList: SystemUserApi.User[] = [];
+getSimpleUserList().then((data) => (userList = data));
+
+/** 新增/修改的表单 */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '仓库编码',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入仓库编码',
+      },
+      rules: 'required',
+      suffix:
+        formType === 'detail'
+          ? undefined
+          : () =>
+              h(
+                Button,
+                {
+                  type: 'default',
+                  onClick: async () => {
+                    try {
+                      const code = await generateAutoCode(
+                        MesAutoCodeRuleCode.WM_WAREHOUSE_CODE,
+                      );
+                      await formApi?.setFieldValue('code', code);
+                    } catch (error) {
+                      console.error(error);
+                    }
+                  },
+                },
+                { default: () => '自动生成' },
+              ),
+    },
+    {
+      fieldName: 'name',
+      label: '仓库名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入仓库名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'chargeUserId',
+      label: '负责人',
+      component: 'ApiSelect',
+      componentProps: {
+        allowClear: true,
+        api: getSimpleUserList,
+        labelField: 'nickname',
+        valueField: 'id',
+        placeholder: '请选择负责人',
+      },
+    },
+    {
+      fieldName: 'address',
+      label: '仓库地址',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入仓库地址',
+      },
+    },
+    {
+      fieldName: 'area',
+      label: '面积（㎡）',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        precision: 2,
+        placeholder: '请输入面积',
+      },
+    },
+    {
+      fieldName: 'frozen',
+      label: '是否冻结',
+      component: 'Switch',
+      componentProps: {
+        checkedChildren: '是',
+        unCheckedChildren: '否',
+      },
+      rules: z.boolean().default(false),
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '仓库编码',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入仓库编码',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '仓库名称',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入仓库名称',
+      },
+    },
+    {
+      fieldName: 'frozen',
+      label: '是否冻结',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: [
+          { label: '是', value: true },
+          { label: '否', value: false },
+        ],
+        placeholder: '请选择',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesWmWarehouseApi.Warehouse>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '仓库编码',
+      minWidth: 140,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '仓库名称',
+      minWidth: 160,
+    },
+    {
+      field: 'address',
+      title: '仓库地址',
+      minWidth: 180,
+    },
+    {
+      field: 'area',
+      title: '面积（㎡）',
+      width: 110,
+    },
+    {
+      field: 'chargeUserId',
+      title: '负责人',
+      width: 120,
+      formatter: ({ cellValue }) =>
+        userList.find((user) => user.id === cellValue)?.nickname ?? '',
+    },
+    {
+      field: 'frozen',
+      title: '冻结',
+      width: 90,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+      },
+    },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 180,
+    },
+    {
+      field: 'createTime',
+      title: '创建时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      title: '操作',
+      width: 220,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/wm/warehouse/index.vue b/apps/web-antd/src/views/mes/wm/warehouse/index.vue
new file mode 100644
index 000000000..b96de2554
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/warehouse/index.vue
@@ -0,0 +1,183 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmWarehouseApi } from '#/api/mes/wm/warehouse';
+
+import { ref } from 'vue';
+import { useRouter } from 'vue-router';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+
+import { Button, message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { deleteWarehouse, getWarehousePage } from '#/api/mes/wm/warehouse';
+import { $t } from '#/locales';
+import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
+
+import { BarcodeDetail } from '../barcode/components';
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const router = useRouter();
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>();
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建仓库 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看仓库详情 */
+function handleDetail(row: MesWmWarehouseApi.Warehouse) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑仓库 */
+function handleEdit(row: MesWmWarehouseApi.Warehouse) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 删除仓库 */
+async function handleDelete(row: MesWmWarehouseApi.Warehouse) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.name]),
+    duration: 0,
+  });
+  try {
+    await deleteWarehouse(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.name]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 跳转库区列表 */
+function handleOpenLocation(row: MesWmWarehouseApi.Warehouse) {
+  router.push({
+    name: 'MesWmLocation',
+    query: { warehouseId: String(row.id) },
+  });
+}
+
+/** 查看仓库条码 */
+function handleBarcode(row: MesWmWarehouseApi.Warehouse) {
+  barcodeDetailRef.value?.openByBusiness(
+    row.id!,
+    BarcodeBizTypeEnum.WAREHOUSE,
+    row.code,
+    row.name,
+  );
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getWarehousePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmWarehouseApi.Warehouse>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】仓库与库区库位、条码赋码、SN码"
+        url="https://doc.iocoder.cn/mes/wm/warehouse-setup/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+    <BarcodeDetail ref="barcodeDetailRef" />
+
+    <Grid table-title="仓库列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['仓库']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-warehouse:create'],
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <Button type="link" @click="handleDetail(row)">
+          {{ row.code }}
+        </Button>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: '库区',
+              type: 'link',
+              auth: ['mes:wm-warehouse:query'],
+              onClick: handleOpenLocation.bind(null, row),
+            },
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:wm-warehouse:update'],
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm-warehouse:delete'],
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.name]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '条码',
+              type: 'link',
+              auth: ['mes:wm-warehouse:query'],
+              onClick: handleBarcode.bind(null, row),
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/warehouse/location/data.ts b/apps/web-antd/src/views/mes/wm/warehouse/location/data.ts
new file mode 100644
index 000000000..c75c0639c
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/warehouse/location/data.ts
@@ -0,0 +1,198 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmWarehouseApi } from '#/api/mes/wm/warehouse';
+import type { MesWmWarehouseLocationApi } from '#/api/mes/wm/warehouse/location';
+
+import { h } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+
+import { Button } from 'ant-design-vue';
+
+import { z } from '#/adapter/form';
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getWarehouseSimpleList } from '#/api/mes/wm/warehouse';
+import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
+/** 关联数据 */
+let warehouseList: MesWmWarehouseApi.Warehouse[] = [];
+getWarehouseSimpleList().then((data) => (warehouseList = data));
+
+/** 新增/修改的表单 */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: { triggerFields: [''], show: () => false },
+    },
+    {
+      fieldName: 'code',
+      label: '库区编码',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入库区编码',
+      },
+      rules: 'required',
+      suffix:
+        formType === 'detail'
+          ? undefined
+          : () =>
+              h(
+                Button,
+                {
+                  type: 'default',
+                  onClick: async () => {
+                    try {
+                      const code = await generateAutoCode(
+                        MesAutoCodeRuleCode.WM_LOCATION_CODE,
+                      );
+                      await formApi?.setFieldValue('code', code);
+                    } catch (error) {
+                      console.error(error);
+                    }
+                  },
+                },
+                { default: () => '自动生成' },
+              ),
+    },
+    {
+      fieldName: 'name',
+      label: '库区名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入库区名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'warehouseId',
+      label: '所属仓库',
+      component: 'ApiSelect',
+      componentProps: {
+        allowClear: true,
+        api: getWarehouseSimpleList,
+        labelField: 'name',
+        valueField: 'id',
+        placeholder: '请选择仓库',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'area',
+      label: '面积（㎡）',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        precision: 2,
+        placeholder: '请输入面积',
+      },
+    },
+    {
+      fieldName: 'frozen',
+      label: '是否冻结',
+      component: 'Switch',
+      componentProps: {
+        checkedChildren: '是',
+        unCheckedChildren: '否',
+      },
+      rules: z.boolean().default(false),
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '库区编码',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入库区编码',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '库区名称',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入库区名称',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesWmWarehouseLocationApi.WarehouseLocation>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '库区编码',
+      minWidth: 140,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '库区名称',
+      minWidth: 160,
+    },
+    {
+      field: 'warehouseId',
+      title: '所属仓库',
+      minWidth: 140,
+      formatter: ({ cellValue }) =>
+        warehouseList.find((w) => w.id === cellValue)?.name ?? '',
+    },
+    {
+      field: 'area',
+      title: '面积（㎡）',
+      width: 110,
+    },
+    {
+      field: 'frozen',
+      title: '冻结',
+      width: 90,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+      },
+    },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 180,
+    },
+    {
+      field: 'createTime',
+      title: '创建时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      title: '操作',
+      width: 240,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/wm/warehouse/location/index.vue b/apps/web-antd/src/views/mes/wm/warehouse/location/index.vue
new file mode 100644
index 000000000..971284258
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/warehouse/location/index.vue
@@ -0,0 +1,226 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmWarehouseLocationApi } from '#/api/mes/wm/warehouse/location';
+
+import { ref } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+
+import { Alert, Button, message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getWarehouse } from '#/api/mes/wm/warehouse';
+import {
+  deleteWarehouseLocation,
+  getWarehouseLocationPage,
+} from '#/api/mes/wm/warehouse/location';
+import { $t } from '#/locales';
+import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
+
+import { BarcodeDetail } from '../../barcode/components';
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const route = useRoute();
+const router = useRouter();
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>();
+
+/** 当前仓库上下文（同步从 URL 解析，确保首次查询带得上 warehouseId） */
+const currentWarehouse = ref<{ id: number; name: string }>(
+  (() => {
+    const id = Number(route.query.warehouseId);
+    return Number.isInteger(id) && id > 0
+      ? { id, name: '' }
+      : { id: 0, name: '' };
+  })(),
+);
+
+/** 异步加载仓库名称（不阻塞列表查询） */
+async function loadWarehouseName() {
+  if (!currentWarehouse.value.id) {
+    return;
+  }
+  try {
+    const warehouse = await getWarehouse(currentWarehouse.value.id);
+    currentWarehouse.value.name = warehouse.name || '';
+  } catch {
+    // 忽略上级名称加载异常，不影响列表查询
+  }
+}
+loadWarehouseName();
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建库区 */
+function handleCreate() {
+  formModalApi
+    .setData({
+      formType: 'create',
+      warehouseId: currentWarehouse.value.id || undefined,
+    })
+    .open();
+}
+
+/** 查看库区详情 */
+function handleDetail(row: MesWmWarehouseLocationApi.WarehouseLocation) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑库区 */
+function handleEdit(row: MesWmWarehouseLocationApi.WarehouseLocation) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 删除库区 */
+async function handleDelete(row: MesWmWarehouseLocationApi.WarehouseLocation) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.name]),
+    duration: 0,
+  });
+  try {
+    await deleteWarehouseLocation(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.name]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 跳转库位列表 */
+function handleOpenArea(row: MesWmWarehouseLocationApi.WarehouseLocation) {
+  router.push({
+    name: 'MesWmArea',
+    query: { locationId: String(row.id) },
+  });
+}
+
+/** 查看库区条码 */
+function handleBarcode(row: MesWmWarehouseLocationApi.WarehouseLocation) {
+  barcodeDetailRef.value?.openByBusiness(
+    row.id!,
+    BarcodeBizTypeEnum.LOCATION,
+    row.code,
+    row.name,
+  );
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getWarehouseLocationPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            warehouseId: currentWarehouse.value.id || undefined,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmWarehouseLocationApi.WarehouseLocation>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】仓库与库区库位、条码赋码、SN码"
+        url="https://doc.iocoder.cn/mes/wm/warehouse-setup/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+    <BarcodeDetail ref="barcodeDetailRef" />
+
+    <Alert
+      v-if="currentWarehouse.id"
+      class="mb-3"
+      :message="`当前仓库：${currentWarehouse.name || `#${currentWarehouse.id}`}`"
+      show-icon
+      type="info"
+    />
+
+    <Grid table-title="库区列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['库区']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-warehouse:create'],
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <Button type="link" @click="handleDetail(row)">
+          {{ row.code }}
+        </Button>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: '库位',
+              type: 'link',
+              auth: ['mes:wm-warehouse:query'],
+              onClick: handleOpenArea.bind(null, row),
+            },
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:wm-warehouse:update'],
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm-warehouse:delete'],
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.name]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '条码',
+              type: 'link',
+              auth: ['mes:wm-warehouse:query'],
+              onClick: handleBarcode.bind(null, row),
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/warehouse/location/modules/form.vue b/apps/web-antd/src/views/mes/wm/warehouse/location/modules/form.vue
new file mode 100644
index 000000000..4d1daec3c
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/warehouse/location/modules/form.vue
@@ -0,0 +1,180 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesWmWarehouseLocationApi } from '#/api/mes/wm/warehouse/location';
+
+import { computed, ref } from 'vue';
+
+import { confirm, useVbenModal } from '@vben/common-ui';
+
+import { Button, message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createWarehouseLocation,
+  getWarehouseLocation,
+  updateAreaByLocationId,
+  updateWarehouseLocation,
+} from '#/api/mes/wm/warehouse/location';
+import { $t } from '#/locales';
+import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
+import { BarcodeDetail } from '#/views/mes/wm/barcode/components';
+
+import { useFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesWmWarehouseLocationApi.WarehouseLocation>();
+const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>();
+
+const getTitle = computed(() => {
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['库区']);
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['库区'])
+    : $t('ui.actionTitle.create', ['库区']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  wrapperClass: 'grid-cols-3',
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+});
+
+/** 查看条码 */
+function handleBarcode() {
+  if (!formData.value?.id) {
+    return;
+  }
+  barcodeDetailRef.value?.openByBusiness(
+    formData.value.id,
+    BarcodeBizTypeEnum.LOCATION,
+    formData.value.code,
+    formData.value.name,
+  );
+}
+
+/** 批量设置库位混放规则 */
+async function setMixingRule(type: 'batch' | 'item', allow: boolean) {
+  if (!formData.value?.id) {
+    return;
+  }
+  const text = type === 'item' ? '产品混放' : '批次混放';
+  try {
+    await confirm(`确认要重置库区下所有库位的${text}规则吗？`);
+  } catch {
+    return;
+  }
+  await updateAreaByLocationId(
+    formData.value.id,
+    type === 'item' ? allow : undefined,
+    type === 'batch' ? allow : undefined,
+  );
+  message.success('设置成功');
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (formType.value === 'detail') {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmWarehouseLocationApi.WarehouseLocation;
+    try {
+      await (formData.value?.id
+        ? updateWarehouseLocation(data)
+        : createWarehouseLocation(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{
+      formType: FormType;
+      id?: number;
+      warehouseId?: number;
+    }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getWarehouseLocation(data.id);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+      return;
+    }
+    if (data?.warehouseId) {
+      await formApi.setFieldValue('warehouseId', data.warehouseId);
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+    <div
+      v-if="formType === 'update' && formData?.id"
+      class="mx-4 mt-2 border-t pt-4"
+    >
+      <div class="mb-2 font-medium">库位混放规则（批量设置）</div>
+      <div class="flex flex-wrap items-center gap-3">
+        <span class="w-20">产品混放</span>
+        <Button size="small" type="primary" @click="setMixingRule('item', true)">
+          允许
+        </Button>
+        <Button size="small" danger @click="setMixingRule('item', false)">
+          不允许
+        </Button>
+      </div>
+      <div class="mt-2 flex flex-wrap items-center gap-3">
+        <span class="w-20">批次混放</span>
+        <Button
+          size="small"
+          type="primary"
+          @click="setMixingRule('batch', true)"
+        >
+          允许
+        </Button>
+        <Button size="small" danger @click="setMixingRule('batch', false)">
+          不允许
+        </Button>
+      </div>
+    </div>
+    <template v-if="formType === 'detail' && formData?.id" #prepend-footer>
+      <Button @click="handleBarcode"> 查看条码 </Button>
+    </template>
+    <BarcodeDetail ref="barcodeDetailRef" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/warehouse/modules/form.vue b/apps/web-antd/src/views/mes/wm/warehouse/modules/form.vue
new file mode 100644
index 000000000..9de8bc39e
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/warehouse/modules/form.vue
@@ -0,0 +1,122 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesWmWarehouseApi } from '#/api/mes/wm/warehouse';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { Button, message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createWarehouse,
+  getWarehouse,
+  updateWarehouse,
+} from '#/api/mes/wm/warehouse';
+import { $t } from '#/locales';
+import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
+import { BarcodeDetail } from '#/views/mes/wm/barcode/components';
+
+import { useFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesWmWarehouseApi.Warehouse>();
+const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>();
+
+const getTitle = computed(() => {
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['仓库']);
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['仓库'])
+    : $t('ui.actionTitle.create', ['仓库']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  wrapperClass: 'grid-cols-3',
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+});
+
+/** 查看条码 */
+function handleBarcode() {
+  if (!formData.value?.id) {
+    return;
+  }
+  barcodeDetailRef.value?.openByBusiness(
+    formData.value.id,
+    BarcodeBizTypeEnum.WAREHOUSE,
+    formData.value.code,
+    formData.value.name,
+  );
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (formType.value === 'detail') {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data = (await formApi.getValues()) as MesWmWarehouseApi.Warehouse;
+    try {
+      await (formData.value?.id ? updateWarehouse(data) : createWarehouse(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
+    if (!data?.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getWarehouse(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+    <template v-if="formType === 'detail' && formData?.id" #prepend-footer>
+      <Button @click="handleBarcode"> 查看条码 </Button>
+    </template>
+    <BarcodeDetail ref="barcodeDetailRef" />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/api/mes/qc/defectrecord/index.ts b/apps/web-ele/src/api/mes/qc/defectrecord/index.ts
new file mode 100644
index 000000000..0d5182b15
--- /dev/null
+++ b/apps/web-ele/src/api/mes/qc/defectrecord/index.ts
@@ -0,0 +1,42 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesQcDefectRecordApi {
+  /** MES 质检缺陷记录 */
+  export interface DefectRecord {
+    id?: number; // 编号
+    qcType?: number; // 检验类型
+    qcId?: number; // 检验单 ID
+    lineId?: number; // 检验行 ID
+    name?: string; // 缺陷描述
+    level?: number; // 缺陷等级
+    quantity?: number; // 缺陷数量
+    remark?: string; // 备注
+  }
+}
+
+/** 查询质检缺陷记录分页 */
+export function getDefectRecordPage(
+  params: PageParam & { lineId?: number; qcId?: number; qcType?: number; },
+) {
+  return requestClient.get<PageResult<MesQcDefectRecordApi.DefectRecord>>(
+    '/mes/qc/defect-record/page',
+    { params },
+  );
+}
+
+/** 新增质检缺陷记录 */
+export function createDefectRecord(data: MesQcDefectRecordApi.DefectRecord) {
+  return requestClient.post('/mes/qc/defect-record/create', data);
+}
+
+/** 修改质检缺陷记录 */
+export function updateDefectRecord(data: MesQcDefectRecordApi.DefectRecord) {
+  return requestClient.put('/mes/qc/defect-record/update', data);
+}
+
+/** 删除质检缺陷记录 */
+export function deleteDefectRecord(id: number) {
+  return requestClient.delete(`/mes/qc/defect-record/delete?id=${id}`);
+}
diff --git a/apps/web-ele/src/api/mes/qc/indicatorresult/index.ts b/apps/web-ele/src/api/mes/qc/indicatorresult/index.ts
new file mode 100644
index 000000000..dfa8a7f93
--- /dev/null
+++ b/apps/web-ele/src/api/mes/qc/indicatorresult/index.ts
@@ -0,0 +1,73 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesQcIndicatorResultApi {
+  /** MES 检验结果明细 */
+  export interface IndicatorResultDetail {
+    id?: number; // 编号
+    resultId?: number; // 关联检验结果 ID
+    indicatorId?: number; // 检测指标 ID
+    value?: string; // 检测值（统一存为字符串）
+    valueNumber?: number; // UI 数值绑定（提交前转字符串）
+    remark?: string; // 备注
+    // 关联查询字段（来自 indicator）
+    indicatorName?: string; // 检测指标名称
+    valueType?: number; // 质检值类型
+    valueSpecification?: string; // 值属性
+  }
+
+  /** MES 检验结果 */
+  export interface IndicatorResult {
+    id?: number; // 编号
+    code?: string; // 样品编号
+    qcId?: number; // 关联质检单 ID
+    qcType?: number; // 质检类型
+    itemId?: number; // 产品物料 ID
+    sn?: string; // 物资 SN
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+    items?: IndicatorResultDetail[]; // 检验结果明细列表
+  }
+}
+
+/** 查询检验结果分页 */
+export function getIndicatorResultPage(
+  params: PageParam & { qcId?: number; qcType?: number },
+) {
+  return requestClient.get<PageResult<MesQcIndicatorResultApi.IndicatorResult>>(
+    '/mes/qc/indicator-result/page',
+    { params },
+  );
+}
+
+/** 查询检验结果明细（含检测项模板）：编辑传 id，新增不传 */
+export function getIndicatorResultDetail(
+  qcId: number,
+  qcType: number,
+  id?: number,
+) {
+  return requestClient.get<MesQcIndicatorResultApi.IndicatorResult>(
+    '/mes/qc/indicator-result/get-detail',
+    { params: { id, qcId, qcType } },
+  );
+}
+
+/** 新增检验结果 */
+export function createIndicatorResult(
+  data: MesQcIndicatorResultApi.IndicatorResult,
+) {
+  return requestClient.post('/mes/qc/indicator-result/create', data);
+}
+
+/** 修改检验结果 */
+export function updateIndicatorResult(
+  data: MesQcIndicatorResultApi.IndicatorResult,
+) {
+  return requestClient.put('/mes/qc/indicator-result/update', data);
+}
+
+/** 删除检验结果 */
+export function deleteIndicatorResult(id: number) {
+  return requestClient.delete(`/mes/qc/indicator-result/delete?id=${id}`);
+}
diff --git a/apps/web-ele/src/api/mes/qc/iqc/index.ts b/apps/web-ele/src/api/mes/qc/iqc/index.ts
new file mode 100644
index 000000000..cdb04cb6a
--- /dev/null
+++ b/apps/web-ele/src/api/mes/qc/iqc/index.ts
@@ -0,0 +1,80 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesQcIqcApi {
+  /** MES 来料检验单 */
+  export interface Iqc {
+    id?: number; // 编号
+    code?: string; // 检验单编号
+    name?: string; // 检验单名称
+    templateId?: number; // 检验模板 ID
+    sourceDocType?: number; // 来源单据类型
+    sourceDocId?: number; // 来源单据 ID
+    sourceLineId?: number; // 来源单据行 ID
+    sourceDocCode?: string; // 来源单据编号（关联查询）
+    vendorId?: number; // 供应商 ID
+    vendorNickname?: string; // 供应商简称（关联查询）
+    vendorBatch?: string; // 供应商批次号
+    itemId?: number; // 产品物料 ID
+    itemCode?: string; // 产品物料编码（关联查询）
+    itemName?: string; // 产品物料名称（关联查询）
+    itemSpecification?: string; // 规格型号（关联查询）
+    unitName?: string; // 单位名称（关联查询）
+    receivedQuantity?: number; // 本次接收数量
+    checkQuantity?: number; // 本次检测数量
+    qualifiedQuantity?: number; // 合格品数量
+    unqualifiedQuantity?: number; // 不合格品数量
+    criticalRate?: number; // 致命缺陷率（%）
+    majorRate?: number; // 严重缺陷率（%）
+    minorRate?: number; // 轻微缺陷率（%）
+    criticalQuantity?: number; // 致命缺陷数量
+    majorQuantity?: number; // 严重缺陷数量
+    minorQuantity?: number; // 轻微缺陷数量
+    checkResult?: number; // 检测结果
+    receiveDate?: number; // 来料日期
+    inspectDate?: number; // 检测日期
+    inspector?: string; // 检测人员（昵称）
+    inspectorUserId?: number; // 检测人员 ID
+    inspectorNickname?: string; // 检测人员昵称（关联查询）
+    status?: number; // 状态
+    remark?: string; // 备注
+  }
+}
+
+/** 查询来料检验单分页 */
+export function getIqcPage(params: PageParam) {
+  return requestClient.get<PageResult<MesQcIqcApi.Iqc>>('/mes/qc/iqc/page', {
+    params,
+  });
+}
+
+/** 查询来料检验单详情 */
+export function getIqc(id: number) {
+  return requestClient.get<MesQcIqcApi.Iqc>(`/mes/qc/iqc/get?id=${id}`);
+}
+
+/** 新增来料检验单 */
+export function createIqc(data: MesQcIqcApi.Iqc) {
+  return requestClient.post('/mes/qc/iqc/create', data);
+}
+
+/** 修改来料检验单 */
+export function updateIqc(data: MesQcIqcApi.Iqc) {
+  return requestClient.put('/mes/qc/iqc/update', data);
+}
+
+/** 完成来料检验单 */
+export function finishIqc(id: number) {
+  return requestClient.put(`/mes/qc/iqc/finish?id=${id}`);
+}
+
+/** 删除来料检验单 */
+export function deleteIqc(id: number) {
+  return requestClient.delete(`/mes/qc/iqc/delete?id=${id}`);
+}
+
+/** 导出来料检验单 */
+export function exportIqc(params: any) {
+  return requestClient.download('/mes/qc/iqc/export-excel', { params });
+}
diff --git a/apps/web-ele/src/api/mes/qc/iqc/line/index.ts b/apps/web-ele/src/api/mes/qc/iqc/line/index.ts
new file mode 100644
index 000000000..dc37aa99b
--- /dev/null
+++ b/apps/web-ele/src/api/mes/qc/iqc/line/index.ts
@@ -0,0 +1,41 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesQcIqcLineApi {
+  /** MES 来料检验单行 */
+  export interface IqcLine {
+    id?: number; // 编号
+    iqcId?: number; // 来料检验单 ID
+    indicatorId?: number; // 检测指标 ID
+    indicatorCode?: string; // 检测指标编码（关联查询）
+    indicatorName?: string; // 检测指标名称（关联查询）
+    indicatorType?: number; // 检测指标类型（关联查询）
+    tool?: string; // 检测工具
+    checkMethod?: string; // 检测方法
+    standardValue?: number; // 标准值
+    unitMeasureId?: number; // 计量单位 ID
+    unitMeasureName?: string; // 计量单位名称（关联查询）
+    maxThreshold?: number; // 误差上限
+    minThreshold?: number; // 误差下限
+    criticalQuantity?: number; // 致命缺陷数量
+    majorQuantity?: number; // 严重缺陷数量
+    minorQuantity?: number; // 轻微缺陷数量
+    remark?: string; // 备注
+  }
+}
+
+/** 查询来料检验单行分页 */
+export function getIqcLinePage(params: PageParam & { iqcId?: number }) {
+  return requestClient.get<PageResult<MesQcIqcLineApi.IqcLine>>(
+    '/mes/qc/iqc/line/page',
+    { params },
+  );
+}
+
+/** 查询来料检验单行详情 */
+export function getIqcLine(id: number) {
+  return requestClient.get<MesQcIqcLineApi.IqcLine>(
+    `/mes/qc/iqc/line/get?id=${id}`,
+  );
+}
diff --git a/apps/web-ele/src/router/routes/modules/mes.ts b/apps/web-ele/src/router/routes/modules/mes.ts
new file mode 100644
index 000000000..05af60e29
--- /dev/null
+++ b/apps/web-ele/src/router/routes/modules/mes.ts
@@ -0,0 +1,46 @@
+import type { RouteRecordRaw } from 'vue-router';
+
+const routes: RouteRecordRaw[] = [
+  {
+    path: '/mes',
+    name: 'MesCenter',
+    meta: {
+      title: 'MES 制造执行',
+      icon: 'lucide:factory',
+      keepAlive: true,
+      hideInMenu: true,
+    },
+    children: [
+      {
+        path: 'wm/warehouse/location',
+        name: 'MesWmLocation',
+        meta: {
+          title: '库区设置',
+          activePath: '/mes/wm/warehouse',
+        },
+        component: () =>
+          import('#/views/mes/wm/warehouse/location/index.vue'),
+      },
+      {
+        path: 'wm/warehouse/area',
+        name: 'MesWmArea',
+        meta: {
+          title: '库位设置',
+          activePath: '/mes/wm/warehouse',
+        },
+        component: () => import('#/views/mes/wm/warehouse/area/index.vue'),
+      },
+      {
+        path: 'wm/barcode/config',
+        name: 'MesWmBarcodeConfig',
+        meta: {
+          title: '条码配置',
+          activePath: '/mes/wm/barcode',
+        },
+        component: () => import('#/views/mes/wm/barcode/config/index.vue'),
+      },
+    ],
+  },
+];
+
+export default routes;
diff --git a/apps/web-ele/src/views/mes/wm/warehouse/area/data.ts b/apps/web-ele/src/views/mes/wm/warehouse/area/data.ts
new file mode 100644
index 000000000..c6c676806
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/warehouse/area/data.ts
@@ -0,0 +1,352 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmWarehouseAreaApi } from '#/api/mes/wm/warehouse/area';
+
+import { h } from 'vue';
+
+import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { ElButton } from 'element-plus';
+
+import { z } from '#/adapter/form';
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getWarehouseSimpleList } from '#/api/mes/wm/warehouse';
+import { getWarehouseLocationSimpleList } from '#/api/mes/wm/warehouse/location';
+import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
+/** 新增/修改的表单 */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'warehouseId',
+      label: '所属仓库',
+      component: 'ApiSelect',
+      componentProps: {
+        api: getWarehouseSimpleList,
+        clearable: true,
+        labelField: 'name',
+        // 仓库变更时清空所属库区
+        onChange: () => formApi?.setFieldValue('locationId', undefined),
+        placeholder: '请选择仓库',
+        valueField: 'id',
+      },
+    },
+    {
+      fieldName: 'locationId',
+      label: '所属库区',
+      component: 'ApiSelect',
+      dependencies: {
+        triggerFields: ['warehouseId'],
+        componentProps: (values) => ({
+          api: () =>
+            getWarehouseLocationSimpleList(values.warehouseId as number),
+          clearable: true,
+          disabled: !values.warehouseId,
+          labelField: 'name',
+          // 改变 warehouseId 时强制刷新选项
+          params: { warehouseId: values.warehouseId },
+          placeholder: '请选择库区',
+          valueField: 'id',
+        }),
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'code',
+      label: '库位编码',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入库位编码',
+      },
+      rules: 'required',
+      suffix:
+        formType === 'detail'
+          ? undefined
+          : () =>
+              h(
+                ElButton,
+                {
+                  onClick: async () => {
+                    try {
+                      const code = await generateAutoCode(
+                        MesAutoCodeRuleCode.WM_AREA_CODE,
+                      );
+                      await formApi?.setFieldValue('code', code);
+                    } catch (error) {
+                      console.error(error);
+                    }
+                  },
+                },
+                { default: () => '自动生成' },
+              ),
+    },
+    {
+      fieldName: 'name',
+      label: '库位名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入库位名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'area',
+      label: '面积（㎡）',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入面积',
+        precision: 2,
+      },
+    },
+    {
+      fieldName: 'maxLoad',
+      label: '最大载重',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入最大载重',
+        precision: 2,
+      },
+    },
+    {
+      fieldName: 'positionX',
+      label: '位置 X',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入位置 X',
+      },
+    },
+    {
+      fieldName: 'positionY',
+      label: '位置 Y',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入位置 Y',
+      },
+    },
+    {
+      fieldName: 'positionZ',
+      label: '位置 Z',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入位置 Z',
+      },
+    },
+    {
+      fieldName: 'status',
+      label: '状态',
+      component: 'Select',
+      componentProps: {
+        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+        placeholder: '请选择',
+      },
+      rules: z.number().default(CommonStatusEnum.ENABLE),
+    },
+    {
+      fieldName: 'frozen',
+      label: '是否冻结',
+      component: 'Switch',
+      componentProps: {
+        activeText: '是',
+        inactiveText: '否',
+        inlinePrompt: true,
+      },
+      rules: z.boolean().default(false),
+    },
+    {
+      fieldName: 'allowItemMixing',
+      label: '允许物料混放',
+      component: 'Switch',
+      componentProps: {
+        activeText: '是',
+        inactiveText: '否',
+        inlinePrompt: true,
+      },
+      rules: z.boolean().default(true),
+    },
+    {
+      fieldName: 'allowBatchMixing',
+      label: '允许批次混放',
+      component: 'Switch',
+      componentProps: {
+        activeText: '是',
+        inactiveText: '否',
+        inlinePrompt: true,
+      },
+      rules: z.boolean().default(true),
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '库位编码',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入库位编码',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '库位名称',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入库位名称',
+      },
+    },
+    {
+      fieldName: 'positionX',
+      label: '位置 X',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入位置 X',
+      },
+    },
+    {
+      fieldName: 'positionY',
+      label: '位置 Y',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入位置 Y',
+      },
+    },
+    {
+      fieldName: 'positionZ',
+      label: '位置 Z',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入位置 Z',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesWmWarehouseAreaApi.WarehouseArea>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '库位编码',
+      minWidth: 140,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '库位名称',
+      minWidth: 160,
+    },
+    {
+      field: 'area',
+      title: '面积（㎡）',
+      width: 100,
+    },
+    {
+      field: 'maxLoad',
+      title: '最大载重',
+      width: 100,
+    },
+    {
+      field: 'positionX',
+      title: '位置 X',
+      width: 80,
+    },
+    {
+      field: 'positionY',
+      title: '位置 Y',
+      width: 80,
+    },
+    {
+      field: 'positionZ',
+      title: '位置 Z',
+      width: 80,
+    },
+    {
+      field: 'status',
+      title: '状态',
+      width: 90,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.COMMON_STATUS },
+      },
+    },
+    {
+      field: 'frozen',
+      title: '冻结',
+      width: 90,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+      },
+    },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 180,
+    },
+    {
+      field: 'createTime',
+      title: '创建时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      title: '操作',
+      width: 200,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/wm/warehouse/area/index.vue b/apps/web-ele/src/views/mes/wm/warehouse/area/index.vue
new file mode 100644
index 000000000..b0f4a441c
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/warehouse/area/index.vue
@@ -0,0 +1,221 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmWarehouseAreaApi } from '#/api/mes/wm/warehouse/area';
+
+import { ref } from 'vue';
+import { useRoute } from 'vue-router';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+
+import { ElAlert, ElButton, ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteWarehouseArea,
+  getWarehouseAreaPage,
+} from '#/api/mes/wm/warehouse/area';
+import { getWarehouseLocation } from '#/api/mes/wm/warehouse/location';
+import { $t } from '#/locales';
+import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
+
+import { BarcodeDetail } from '../../barcode/components';
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const route = useRoute();
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>();
+
+/** 当前库区上下文（同步从 URL 解析，确保首次查询带得上 locationId） */
+const currentLocation = ref<{
+  id: number;
+  name: string;
+  warehouseId: number;
+  warehouseName: string;
+}>(
+  (() => {
+    const id = Number(route.query.locationId);
+    return Number.isInteger(id) && id > 0
+      ? { id, name: '', warehouseId: 0, warehouseName: '' }
+      : { id: 0, name: '', warehouseId: 0, warehouseName: '' };
+  })(),
+);
+
+/** 异步加载库区/仓库名称（不阻塞列表查询） */
+async function loadLocationName() {
+  if (!currentLocation.value.id) {
+    return;
+  }
+  try {
+    const location = await getWarehouseLocation(currentLocation.value.id);
+    currentLocation.value.name = location.name || '';
+    currentLocation.value.warehouseId = location.warehouseId || 0;
+    currentLocation.value.warehouseName = location.warehouseName || '';
+  } catch {
+    // 忽略上级名称加载异常，不影响列表查询
+  }
+}
+loadLocationName();
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建库位 */
+function handleCreate() {
+  formModalApi
+    .setData({
+      formType: 'create',
+      locationId: currentLocation.value.id || undefined,
+      warehouseId: currentLocation.value.warehouseId || undefined,
+    })
+    .open();
+}
+
+/** 查看库位详情 */
+function handleDetail(row: MesWmWarehouseAreaApi.WarehouseArea) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑库位 */
+function handleEdit(row: MesWmWarehouseAreaApi.WarehouseArea) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 删除库位 */
+async function handleDelete(row: MesWmWarehouseAreaApi.WarehouseArea) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.name]),
+  });
+  try {
+    await deleteWarehouseArea(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.name]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+/** 查看库位条码 */
+function handleBarcode(row: MesWmWarehouseAreaApi.WarehouseArea) {
+  barcodeDetailRef.value?.openByBusiness(
+    row.id!,
+    BarcodeBizTypeEnum.AREA,
+    row.code,
+    row.name,
+  );
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getWarehouseAreaPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            locationId: currentLocation.value.id || undefined,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmWarehouseAreaApi.WarehouseArea>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】仓库与库区库位、条码赋码、SN码"
+        url="https://doc.iocoder.cn/mes/wm/warehouse-setup/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+    <BarcodeDetail ref="barcodeDetailRef" />
+
+    <ElAlert
+      v-if="currentLocation.id"
+      class="mb-3"
+      :closable="false"
+      show-icon
+      :title="`当前仓库/库区：${currentLocation.warehouseName || `#${currentLocation.warehouseId || '-'}`} / ${currentLocation.name || `#${currentLocation.id}`}`"
+      type="info"
+    />
+
+    <Grid table-title="库位列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['库位']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-warehouse:create'],
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <ElButton link type="primary" @click="handleDetail(row)">
+          {{ row.code }}
+        </ElButton>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:wm-warehouse:update'],
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm-warehouse:delete'],
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.name]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '条码',
+              type: 'primary',
+              link: true,
+              auth: ['mes:wm-warehouse:query'],
+              onClick: handleBarcode.bind(null, row),
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/warehouse/area/modules/form.vue b/apps/web-ele/src/views/mes/wm/warehouse/area/modules/form.vue
new file mode 100644
index 000000000..1d31e18bb
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/warehouse/area/modules/form.vue
@@ -0,0 +1,149 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesWmWarehouseAreaApi } from '#/api/mes/wm/warehouse/area';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElButton, ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createWarehouseArea,
+  getWarehouseArea,
+  updateWarehouseArea,
+} from '#/api/mes/wm/warehouse/area';
+import { getWarehouseLocation } from '#/api/mes/wm/warehouse/location';
+import { $t } from '#/locales';
+import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
+import { BarcodeDetail } from '#/views/mes/wm/barcode/components';
+
+import { useFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesWmWarehouseAreaApi.WarehouseArea>();
+const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>();
+
+const getTitle = computed(() => {
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['库位']);
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['库位'])
+    : $t('ui.actionTitle.create', ['库位']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 120,
+  },
+  wrapperClass: 'grid-cols-3',
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+});
+
+/** 查看条码 */
+function handleBarcode() {
+  if (!formData.value?.id) {
+    return;
+  }
+  barcodeDetailRef.value?.openByBusiness(
+    formData.value.id,
+    BarcodeBizTypeEnum.AREA,
+    formData.value.code,
+    formData.value.name,
+  );
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (formType.value === 'detail') {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmWarehouseAreaApi.WarehouseArea;
+    try {
+      await (formData.value?.id
+        ? updateWarehouseArea(data)
+        : createWarehouseArea(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{
+      formType: FormType;
+      id?: number;
+      locationId?: number;
+      warehouseId?: number;
+    }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getWarehouseArea(data.id);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+      return;
+    }
+    // 新增态：根据父级上下文带入仓库/库区
+    let warehouseId = data?.warehouseId;
+    if (data?.locationId) {
+      if (!warehouseId) {
+        try {
+          const location = await getWarehouseLocation(data.locationId);
+          warehouseId = location.warehouseId;
+        } catch {
+          // 忽略
+        }
+      }
+      await formApi.setValues({
+        warehouseId,
+        locationId: data.locationId,
+      });
+    } else if (warehouseId) {
+      await formApi.setFieldValue('warehouseId', warehouseId);
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+    <template v-if="formType === 'detail' && formData?.id" #prepend-footer>
+      <ElButton @click="handleBarcode"> 查看条码 </ElButton>
+    </template>
+    <BarcodeDetail ref="barcodeDetailRef" />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/warehouse/components/index.ts b/apps/web-ele/src/views/mes/wm/warehouse/components/index.ts
new file mode 100644
index 000000000..d2981238b
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/warehouse/components/index.ts
@@ -0,0 +1,3 @@
+export { default as WmWarehouseAreaSelect } from './wm-warehouse-area-select.vue';
+export { default as WmWarehouseLocationSelect } from './wm-warehouse-location-select.vue';
+export { default as WmWarehouseSelect } from './wm-warehouse-select.vue';
diff --git a/apps/web-ele/src/views/mes/wm/warehouse/components/wm-warehouse-area-select.vue b/apps/web-ele/src/views/mes/wm/warehouse/components/wm-warehouse-area-select.vue
new file mode 100644
index 000000000..ba3c1a467
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/warehouse/components/wm-warehouse-area-select.vue
@@ -0,0 +1,121 @@
+<script lang="ts" setup>
+import type { MesWmWarehouseAreaApi } from '#/api/mes/wm/warehouse/area';
+
+import { computed, ref, useAttrs, watch, watchEffect } from 'vue';
+
+import { ElOption, ElSelect, ElTag, ElTooltip } from 'element-plus';
+
+import { getWarehouseAreaSimpleList } from '#/api/mes/wm/warehouse/area';
+
+defineOptions({ name: 'WmWarehouseAreaSelect', inheritAttrs: false });
+
+const props = withDefaults(
+  defineProps<{
+    clearable?: boolean;
+    disabled?: boolean;
+    locationId?: number;
+    modelValue?: number;
+    placeholder?: string;
+  }>(),
+  {
+    clearable: true,
+    disabled: false,
+    locationId: undefined,
+    modelValue: undefined,
+    placeholder: '请选择库位',
+  },
+);
+
+const emit = defineEmits<{
+  change: [item: MesWmWarehouseAreaApi.WarehouseArea | undefined];
+  'update:modelValue': [value: number | undefined];
+}>();
+
+const attrs = useAttrs();
+const allList = ref<MesWmWarehouseAreaApi.WarehouseArea[]>([]);
+const filteredList = ref<MesWmWarehouseAreaApi.WarehouseArea[]>([]);
+const selectedItem = ref<MesWmWarehouseAreaApi.WarehouseArea>(); // 当前选中的库位对象
+
+const selectValue = computed({
+  get: () => props.modelValue,
+  set: (val) => emit('update:modelValue', val),
+});
+
+/** 选中变化 */
+function handleChange(val: any) {
+  const item = allList.value.find((o) => o.id === val);
+  selectedItem.value = item;
+  emit('change', item);
+}
+
+/** 前端过滤（name + code） */
+function filterMethod(query: string) {
+  const keyword = query.toLowerCase();
+  filteredList.value = query
+    ? allList.value.filter(
+        (item) =>
+          !!item.name?.toLowerCase().includes(keyword) ||
+          !!item.code?.toLowerCase().includes(keyword),
+      )
+    : allList.value;
+}
+
+watch(
+  () => props.modelValue,
+  (val) => {
+    if (val == null) {
+      selectedItem.value = undefined;
+      return;
+    }
+    if (selectedItem.value?.id !== val && allList.value.length > 0) {
+      selectedItem.value = allList.value.find((o) => o.id === val);
+    }
+  },
+);
+
+watchEffect(async () => {
+  allList.value = await getWarehouseAreaSimpleList(props.locationId);
+  filteredList.value = allList.value;
+  if (props.modelValue != null) {
+    selectedItem.value = allList.value.find((o) => o.id === props.modelValue);
+  }
+});
+</script>
+
+<template>
+  <ElTooltip :disabled="!selectedItem" placement="top" :show-after="500">
+    <template #content>
+      <div v-if="selectedItem" class="leading-6">
+        <div>编码：{{ selectedItem.code || '-' }}</div>
+        <div>名称：{{ selectedItem.name || '-' }}</div>
+        <div>所属仓库：{{ selectedItem.warehouseName || '-' }}</div>
+        <div>所属库区：{{ selectedItem.locationName || '-' }}</div>
+      </div>
+    </template>
+    <ElSelect
+      v-bind="attrs"
+      v-model="selectValue"
+      class="!w-full"
+      :clearable="clearable"
+      :disabled="disabled"
+      filterable
+      :filter-method="filterMethod"
+      :placeholder="placeholder"
+      @change="handleChange"
+    >
+      <ElOption
+        v-for="item in filteredList"
+        :key="item.id"
+        :label="item.name"
+        :value="item.id!"
+      >
+        <div class="flex items-center gap-2">
+          <span>{{ item.name }}</span>
+          <ElTag v-if="item.code" size="small" type="info">
+            编号: {{ item.code }}
+          </ElTag>
+        </div>
+      </ElOption>
+    </ElSelect>
+  </ElTooltip>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/warehouse/components/wm-warehouse-location-select.vue b/apps/web-ele/src/views/mes/wm/warehouse/components/wm-warehouse-location-select.vue
new file mode 100644
index 000000000..e9dca087e
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/warehouse/components/wm-warehouse-location-select.vue
@@ -0,0 +1,120 @@
+<script lang="ts" setup>
+import type { MesWmWarehouseLocationApi } from '#/api/mes/wm/warehouse/location';
+
+import { computed, ref, useAttrs, watch, watchEffect } from 'vue';
+
+import { ElOption, ElSelect, ElTag, ElTooltip } from 'element-plus';
+
+import { getWarehouseLocationSimpleList } from '#/api/mes/wm/warehouse/location';
+
+defineOptions({ name: 'WmWarehouseLocationSelect', inheritAttrs: false });
+
+const props = withDefaults(
+  defineProps<{
+    clearable?: boolean;
+    disabled?: boolean;
+    modelValue?: number;
+    placeholder?: string;
+    warehouseId?: number;
+  }>(),
+  {
+    clearable: true,
+    disabled: false,
+    modelValue: undefined,
+    placeholder: '请选择库区',
+    warehouseId: undefined,
+  },
+);
+
+const emit = defineEmits<{
+  change: [item: MesWmWarehouseLocationApi.WarehouseLocation | undefined];
+  'update:modelValue': [value: number | undefined];
+}>();
+
+const attrs = useAttrs();
+const allList = ref<MesWmWarehouseLocationApi.WarehouseLocation[]>([]);
+const filteredList = ref<MesWmWarehouseLocationApi.WarehouseLocation[]>([]);
+const selectedItem = ref<MesWmWarehouseLocationApi.WarehouseLocation>(); // 当前选中的库区对象
+
+const selectValue = computed({
+  get: () => props.modelValue,
+  set: (val) => emit('update:modelValue', val),
+});
+
+/** 选中变化 */
+function handleChange(val: any) {
+  const item = allList.value.find((o) => o.id === val);
+  selectedItem.value = item;
+  emit('change', item);
+}
+
+/** 前端过滤（name + code） */
+function filterMethod(query: string) {
+  const keyword = query.toLowerCase();
+  filteredList.value = query
+    ? allList.value.filter(
+        (item) =>
+          !!item.name?.toLowerCase().includes(keyword) ||
+          !!item.code?.toLowerCase().includes(keyword),
+      )
+    : allList.value;
+}
+
+watch(
+  () => props.modelValue,
+  (val) => {
+    if (val == null) {
+      selectedItem.value = undefined;
+      return;
+    }
+    if (selectedItem.value?.id !== val && allList.value.length > 0) {
+      selectedItem.value = allList.value.find((o) => o.id === val);
+    }
+  },
+);
+
+watchEffect(async () => {
+  allList.value = await getWarehouseLocationSimpleList(props.warehouseId);
+  filteredList.value = allList.value;
+  if (props.modelValue != null) {
+    selectedItem.value = allList.value.find((o) => o.id === props.modelValue);
+  }
+});
+</script>
+
+<template>
+  <ElTooltip :disabled="!selectedItem" placement="top" :show-after="500">
+    <template #content>
+      <div v-if="selectedItem" class="leading-6">
+        <div>编码：{{ selectedItem.code || '-' }}</div>
+        <div>名称：{{ selectedItem.name || '-' }}</div>
+        <div>所属仓库：{{ selectedItem.warehouseName || '-' }}</div>
+      </div>
+    </template>
+    <ElSelect
+      v-bind="attrs"
+      v-model="selectValue"
+      class="!w-full"
+      :clearable="clearable"
+      :disabled="disabled"
+      filterable
+      :filter-method="filterMethod"
+      :placeholder="placeholder"
+      @change="handleChange"
+    >
+      <ElOption
+        v-for="item in filteredList"
+        :key="item.id"
+        :label="item.name"
+        :value="item.id!"
+      >
+        <div class="flex items-center gap-2">
+          <span>{{ item.name }}</span>
+          <ElTag v-if="item.code" size="small" type="info">
+            编号: {{ item.code }}
+          </ElTag>
+        </div>
+      </ElOption>
+    </ElSelect>
+  </ElTooltip>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/warehouse/components/wm-warehouse-select.vue b/apps/web-ele/src/views/mes/wm/warehouse/components/wm-warehouse-select.vue
new file mode 100644
index 000000000..edeb295ec
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/warehouse/components/wm-warehouse-select.vue
@@ -0,0 +1,118 @@
+<script lang="ts" setup>
+import type { MesWmWarehouseApi } from '#/api/mes/wm/warehouse';
+
+import { computed, onMounted, ref, useAttrs, watch } from 'vue';
+
+import { ElOption, ElSelect, ElTag, ElTooltip } from 'element-plus';
+
+import { getWarehouseSimpleList } from '#/api/mes/wm/warehouse';
+
+defineOptions({ name: 'WmWarehouseSelect', inheritAttrs: false });
+
+const props = withDefaults(
+  defineProps<{
+    clearable?: boolean;
+    disabled?: boolean;
+    modelValue?: number;
+    placeholder?: string;
+  }>(),
+  {
+    clearable: true,
+    disabled: false,
+    modelValue: undefined,
+    placeholder: '请选择仓库',
+  },
+);
+
+const emit = defineEmits<{
+  change: [item: MesWmWarehouseApi.Warehouse | undefined];
+  'update:modelValue': [value: number | undefined];
+}>();
+
+const attrs = useAttrs();
+const allList = ref<MesWmWarehouseApi.Warehouse[]>([]);
+const filteredList = ref<MesWmWarehouseApi.Warehouse[]>([]);
+const selectedItem = ref<MesWmWarehouseApi.Warehouse>(); // 当前选中的仓库对象
+
+const selectValue = computed({
+  get: () => props.modelValue,
+  set: (val) => emit('update:modelValue', val),
+});
+
+/** 选中变化 */
+function handleChange(val: any) {
+  const item = allList.value.find((o) => o.id === val);
+  selectedItem.value = item;
+  emit('change', item);
+}
+
+/** 前端过滤（name + code） */
+function filterMethod(query: string) {
+  const keyword = query.toLowerCase();
+  filteredList.value = query
+    ? allList.value.filter(
+        (item) =>
+          !!item.name?.toLowerCase().includes(keyword) ||
+          !!item.code?.toLowerCase().includes(keyword),
+      )
+    : allList.value;
+}
+
+watch(
+  () => props.modelValue,
+  (val) => {
+    if (val == null) {
+      selectedItem.value = undefined;
+      return;
+    }
+    if (selectedItem.value?.id !== val && allList.value.length > 0) {
+      selectedItem.value = allList.value.find((o) => o.id === val);
+    }
+  },
+);
+
+onMounted(async () => {
+  allList.value = await getWarehouseSimpleList();
+  filteredList.value = allList.value;
+  if (props.modelValue != null) {
+    selectedItem.value = allList.value.find((o) => o.id === props.modelValue);
+  }
+});
+</script>
+
+<template>
+  <ElTooltip :disabled="!selectedItem" placement="top" :show-after="500">
+    <template #content>
+      <div v-if="selectedItem" class="leading-6">
+        <div>编码：{{ selectedItem.code || '-' }}</div>
+        <div>名称：{{ selectedItem.name || '-' }}</div>
+        <div>地址：{{ selectedItem.address || '-' }}</div>
+      </div>
+    </template>
+    <ElSelect
+      v-bind="attrs"
+      v-model="selectValue"
+      class="!w-full"
+      :clearable="clearable"
+      :disabled="disabled"
+      filterable
+      :filter-method="filterMethod"
+      :placeholder="placeholder"
+      @change="handleChange"
+    >
+      <ElOption
+        v-for="item in filteredList"
+        :key="item.id"
+        :label="item.name"
+        :value="item.id!"
+      >
+        <div class="flex items-center gap-2">
+          <span>{{ item.name }}</span>
+          <ElTag v-if="item.code" size="small" type="info">
+            编号: {{ item.code }}
+          </ElTag>
+        </div>
+      </ElOption>
+    </ElSelect>
+  </ElTooltip>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/warehouse/data.ts b/apps/web-ele/src/views/mes/wm/warehouse/data.ts
new file mode 100644
index 000000000..fafda94e7
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/warehouse/data.ts
@@ -0,0 +1,227 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmWarehouseApi } from '#/api/mes/wm/warehouse';
+import type { SystemUserApi } from '#/api/system/user';
+
+import { h } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+
+import { ElButton } from 'element-plus';
+
+import { z } from '#/adapter/form';
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getSimpleUserList } from '#/api/system/user';
+import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
+/** 关联数据 */
+let userList: SystemUserApi.User[] = [];
+getSimpleUserList().then((data) => (userList = data));
+
+/** 新增/修改的表单 */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '仓库编码',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入仓库编码',
+      },
+      rules: 'required',
+      suffix:
+        formType === 'detail'
+          ? undefined
+          : () =>
+              h(
+                ElButton,
+                {
+                  onClick: async () => {
+                    try {
+                      const code = await generateAutoCode(
+                        MesAutoCodeRuleCode.WM_WAREHOUSE_CODE,
+                      );
+                      await formApi?.setFieldValue('code', code);
+                    } catch (error) {
+                      console.error(error);
+                    }
+                  },
+                },
+                { default: () => '自动生成' },
+              ),
+    },
+    {
+      fieldName: 'name',
+      label: '仓库名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入仓库名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'chargeUserId',
+      label: '负责人',
+      component: 'ApiSelect',
+      componentProps: {
+        api: getSimpleUserList,
+        clearable: true,
+        labelField: 'nickname',
+        placeholder: '请选择负责人',
+        valueField: 'id',
+      },
+    },
+    {
+      fieldName: 'address',
+      label: '仓库地址',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入仓库地址',
+      },
+    },
+    {
+      fieldName: 'area',
+      label: '面积（㎡）',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入面积',
+        precision: 2,
+      },
+    },
+    {
+      fieldName: 'frozen',
+      label: '是否冻结',
+      component: 'Switch',
+      componentProps: {
+        activeText: '是',
+        inactiveText: '否',
+        inlinePrompt: true,
+      },
+      rules: z.boolean().default(false),
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '仓库编码',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入仓库编码',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '仓库名称',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入仓库名称',
+      },
+    },
+    {
+      fieldName: 'frozen',
+      label: '是否冻结',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: [
+          { label: '是', value: true },
+          { label: '否', value: false },
+        ],
+        placeholder: '请选择',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesWmWarehouseApi.Warehouse>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '仓库编码',
+      minWidth: 140,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '仓库名称',
+      minWidth: 160,
+    },
+    {
+      field: 'address',
+      title: '仓库地址',
+      minWidth: 180,
+    },
+    {
+      field: 'area',
+      title: '面积（㎡）',
+      width: 110,
+    },
+    {
+      field: 'chargeUserId',
+      title: '负责人',
+      width: 120,
+      formatter: ({ cellValue }) =>
+        userList.find((user) => user.id === cellValue)?.nickname ?? '',
+    },
+    {
+      field: 'frozen',
+      title: '冻结',
+      width: 90,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+      },
+    },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 180,
+    },
+    {
+      field: 'createTime',
+      title: '创建时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      title: '操作',
+      width: 240,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/wm/warehouse/index.vue b/apps/web-ele/src/views/mes/wm/warehouse/index.vue
new file mode 100644
index 000000000..92a9e4059
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/warehouse/index.vue
@@ -0,0 +1,185 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmWarehouseApi } from '#/api/mes/wm/warehouse';
+
+import { ref } from 'vue';
+import { useRouter } from 'vue-router';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+
+import { ElButton, ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { deleteWarehouse, getWarehousePage } from '#/api/mes/wm/warehouse';
+import { $t } from '#/locales';
+import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
+
+import { BarcodeDetail } from '../barcode/components';
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const router = useRouter();
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>();
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建仓库 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看仓库详情 */
+function handleDetail(row: MesWmWarehouseApi.Warehouse) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑仓库 */
+function handleEdit(row: MesWmWarehouseApi.Warehouse) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 删除仓库 */
+async function handleDelete(row: MesWmWarehouseApi.Warehouse) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.name]),
+  });
+  try {
+    await deleteWarehouse(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.name]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+/** 跳转库区列表 */
+function handleOpenLocation(row: MesWmWarehouseApi.Warehouse) {
+  router.push({
+    name: 'MesWmLocation',
+    query: { warehouseId: String(row.id) },
+  });
+}
+
+/** 查看仓库条码 */
+function handleBarcode(row: MesWmWarehouseApi.Warehouse) {
+  barcodeDetailRef.value?.openByBusiness(
+    row.id!,
+    BarcodeBizTypeEnum.WAREHOUSE,
+    row.code,
+    row.name,
+  );
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getWarehousePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmWarehouseApi.Warehouse>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】仓库与库区库位、条码赋码、SN码"
+        url="https://doc.iocoder.cn/mes/wm/warehouse-setup/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+    <BarcodeDetail ref="barcodeDetailRef" />
+
+    <Grid table-title="仓库列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['仓库']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-warehouse:create'],
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <ElButton link type="primary" @click="handleDetail(row)">
+          {{ row.code }}
+        </ElButton>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: '库区',
+              type: 'primary',
+              link: true,
+              auth: ['mes:wm-warehouse:query'],
+              onClick: handleOpenLocation.bind(null, row),
+            },
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:wm-warehouse:update'],
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm-warehouse:delete'],
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.name]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '条码',
+              type: 'primary',
+              link: true,
+              auth: ['mes:wm-warehouse:query'],
+              onClick: handleBarcode.bind(null, row),
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/warehouse/location/data.ts b/apps/web-ele/src/views/mes/wm/warehouse/location/data.ts
new file mode 100644
index 000000000..c3d00a1a3
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/warehouse/location/data.ts
@@ -0,0 +1,202 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmWarehouseApi } from '#/api/mes/wm/warehouse';
+import type { MesWmWarehouseLocationApi } from '#/api/mes/wm/warehouse/location';
+
+import { h } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+
+import { ElButton } from 'element-plus';
+
+import { z } from '#/adapter/form';
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getWarehouseSimpleList } from '#/api/mes/wm/warehouse';
+import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
+/** 关联数据 */
+let warehouseList: MesWmWarehouseApi.Warehouse[] = [];
+getWarehouseSimpleList().then((data) => (warehouseList = data));
+
+/** 新增/修改的表单 */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '库区编码',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入库区编码',
+      },
+      rules: 'required',
+      suffix:
+        formType === 'detail'
+          ? undefined
+          : () =>
+              h(
+                ElButton,
+                {
+                  onClick: async () => {
+                    try {
+                      const code = await generateAutoCode(
+                        MesAutoCodeRuleCode.WM_LOCATION_CODE,
+                      );
+                      await formApi?.setFieldValue('code', code);
+                    } catch (error) {
+                      console.error(error);
+                    }
+                  },
+                },
+                { default: () => '自动生成' },
+              ),
+    },
+    {
+      fieldName: 'name',
+      label: '库区名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入库区名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'warehouseId',
+      label: '所属仓库',
+      component: 'ApiSelect',
+      componentProps: {
+        api: getWarehouseSimpleList,
+        clearable: true,
+        labelField: 'name',
+        placeholder: '请选择仓库',
+        valueField: 'id',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'area',
+      label: '面积（㎡）',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入面积',
+        precision: 2,
+      },
+    },
+    {
+      fieldName: 'frozen',
+      label: '是否冻结',
+      component: 'Switch',
+      componentProps: {
+        activeText: '是',
+        inactiveText: '否',
+        inlinePrompt: true,
+      },
+      rules: z.boolean().default(false),
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '库区编码',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入库区编码',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '库区名称',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入库区名称',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesWmWarehouseLocationApi.WarehouseLocation>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '库区编码',
+      minWidth: 140,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '库区名称',
+      minWidth: 160,
+    },
+    {
+      field: 'warehouseId',
+      title: '所属仓库',
+      minWidth: 140,
+      formatter: ({ cellValue }) =>
+        warehouseList.find((w) => w.id === cellValue)?.name ?? '',
+    },
+    {
+      field: 'area',
+      title: '面积（㎡）',
+      width: 110,
+    },
+    {
+      field: 'frozen',
+      title: '冻结',
+      width: 90,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+      },
+    },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 180,
+    },
+    {
+      field: 'createTime',
+      title: '创建时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      title: '操作',
+      width: 240,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/wm/warehouse/location/index.vue b/apps/web-ele/src/views/mes/wm/warehouse/location/index.vue
new file mode 100644
index 000000000..87bad456e
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/warehouse/location/index.vue
@@ -0,0 +1,229 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmWarehouseLocationApi } from '#/api/mes/wm/warehouse/location';
+
+import { ref } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+
+import { ElAlert, ElButton, ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getWarehouse } from '#/api/mes/wm/warehouse';
+import {
+  deleteWarehouseLocation,
+  getWarehouseLocationPage,
+} from '#/api/mes/wm/warehouse/location';
+import { $t } from '#/locales';
+import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
+
+import { BarcodeDetail } from '../../barcode/components';
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const route = useRoute();
+const router = useRouter();
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>();
+
+/** 当前仓库上下文（同步从 URL 解析，确保首次查询带得上 warehouseId） */
+const currentWarehouse = ref<{ id: number; name: string }>(
+  (() => {
+    const id = Number(route.query.warehouseId);
+    return Number.isInteger(id) && id > 0
+      ? { id, name: '' }
+      : { id: 0, name: '' };
+  })(),
+);
+
+/** 异步加载仓库名称（不阻塞列表查询） */
+async function loadWarehouseName() {
+  if (!currentWarehouse.value.id) {
+    return;
+  }
+  try {
+    const warehouse = await getWarehouse(currentWarehouse.value.id);
+    currentWarehouse.value.name = warehouse.name || '';
+  } catch {
+    // 忽略上级名称加载异常，不影响列表查询
+  }
+}
+loadWarehouseName();
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建库区 */
+function handleCreate() {
+  formModalApi
+    .setData({
+      formType: 'create',
+      warehouseId: currentWarehouse.value.id || undefined,
+    })
+    .open();
+}
+
+/** 查看库区详情 */
+function handleDetail(row: MesWmWarehouseLocationApi.WarehouseLocation) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑库区 */
+function handleEdit(row: MesWmWarehouseLocationApi.WarehouseLocation) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 删除库区 */
+async function handleDelete(row: MesWmWarehouseLocationApi.WarehouseLocation) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.name]),
+  });
+  try {
+    await deleteWarehouseLocation(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.name]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+/** 跳转库位列表 */
+function handleOpenArea(row: MesWmWarehouseLocationApi.WarehouseLocation) {
+  router.push({
+    name: 'MesWmArea',
+    query: { locationId: String(row.id) },
+  });
+}
+
+/** 查看库区条码 */
+function handleBarcode(row: MesWmWarehouseLocationApi.WarehouseLocation) {
+  barcodeDetailRef.value?.openByBusiness(
+    row.id!,
+    BarcodeBizTypeEnum.LOCATION,
+    row.code,
+    row.name,
+  );
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getWarehouseLocationPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            warehouseId: currentWarehouse.value.id || undefined,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmWarehouseLocationApi.WarehouseLocation>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】仓库与库区库位、条码赋码、SN码"
+        url="https://doc.iocoder.cn/mes/wm/warehouse-setup/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+    <BarcodeDetail ref="barcodeDetailRef" />
+
+    <ElAlert
+      v-if="currentWarehouse.id"
+      class="mb-3"
+      :closable="false"
+      show-icon
+      :title="`当前仓库：${currentWarehouse.name || `#${currentWarehouse.id}`}`"
+      type="info"
+    />
+
+    <Grid table-title="库区列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['库区']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-warehouse:create'],
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <ElButton link type="primary" @click="handleDetail(row)">
+          {{ row.code }}
+        </ElButton>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: '库位',
+              type: 'primary',
+              link: true,
+              auth: ['mes:wm-warehouse:query'],
+              onClick: handleOpenArea.bind(null, row),
+            },
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:wm-warehouse:update'],
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm-warehouse:delete'],
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.name]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '条码',
+              type: 'primary',
+              link: true,
+              auth: ['mes:wm-warehouse:query'],
+              onClick: handleBarcode.bind(null, row),
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/warehouse/location/modules/form.vue b/apps/web-ele/src/views/mes/wm/warehouse/location/modules/form.vue
new file mode 100644
index 000000000..59ca8eb28
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/warehouse/location/modules/form.vue
@@ -0,0 +1,192 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesWmWarehouseLocationApi } from '#/api/mes/wm/warehouse/location';
+
+import { computed, ref } from 'vue';
+
+import { confirm, useVbenModal } from '@vben/common-ui';
+
+import { ElButton, ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createWarehouseLocation,
+  getWarehouseLocation,
+  updateAreaByLocationId,
+  updateWarehouseLocation,
+} from '#/api/mes/wm/warehouse/location';
+import { $t } from '#/locales';
+import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
+import { BarcodeDetail } from '#/views/mes/wm/barcode/components';
+
+import { useFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesWmWarehouseLocationApi.WarehouseLocation>();
+const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>();
+
+const getTitle = computed(() => {
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['库区']);
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['库区'])
+    : $t('ui.actionTitle.create', ['库区']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+/** 查看条码 */
+function handleBarcode() {
+  if (!formData.value?.id) {
+    return;
+  }
+  barcodeDetailRef.value?.openByBusiness(
+    formData.value.id,
+    BarcodeBizTypeEnum.LOCATION,
+    formData.value.code,
+    formData.value.name,
+  );
+}
+
+/** 批量设置库位混放规则 */
+async function setMixingRule(type: 'batch' | 'item', allow: boolean) {
+  if (!formData.value?.id) {
+    return;
+  }
+  const text = type === 'item' ? '产品混放' : '批次混放';
+  try {
+    await confirm(`确认要重置库区下所有库位的${text}规则吗？`);
+  } catch {
+    return;
+  }
+  await updateAreaByLocationId(
+    formData.value.id,
+    type === 'item' ? allow : undefined,
+    type === 'batch' ? allow : undefined,
+  );
+  ElMessage.success('设置成功');
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (formType.value === 'detail') {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmWarehouseLocationApi.WarehouseLocation;
+    try {
+      await (formData.value?.id
+        ? updateWarehouseLocation(data)
+        : createWarehouseLocation(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{
+      formType: FormType;
+      id?: number;
+      warehouseId?: number;
+    }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getWarehouseLocation(data.id);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+      return;
+    }
+    if (data?.warehouseId) {
+      await formApi.setFieldValue('warehouseId', data.warehouseId);
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+    <div
+      v-if="formType === 'update' && formData?.id"
+      class="mx-4 mt-2 border-t pt-4"
+    >
+      <div class="mb-2 font-medium">库位混放规则（批量设置）</div>
+      <div class="flex flex-wrap items-center gap-3">
+        <span class="w-20">产品混放</span>
+        <ElButton
+          size="small"
+          type="primary"
+          @click="setMixingRule('item', true)"
+        >
+          允许
+        </ElButton>
+        <ElButton
+          size="small"
+          type="danger"
+          @click="setMixingRule('item', false)"
+        >
+          不允许
+        </ElButton>
+      </div>
+      <div class="mt-2 flex flex-wrap items-center gap-3">
+        <span class="w-20">批次混放</span>
+        <ElButton
+          size="small"
+          type="primary"
+          @click="setMixingRule('batch', true)"
+        >
+          允许
+        </ElButton>
+        <ElButton
+          size="small"
+          type="danger"
+          @click="setMixingRule('batch', false)"
+        >
+          不允许
+        </ElButton>
+      </div>
+    </div>
+    <template v-if="formType === 'detail' && formData?.id" #prepend-footer>
+      <ElButton @click="handleBarcode"> 查看条码 </ElButton>
+    </template>
+    <BarcodeDetail ref="barcodeDetailRef" />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/warehouse/modules/form.vue b/apps/web-ele/src/views/mes/wm/warehouse/modules/form.vue
new file mode 100644
index 000000000..c944e9498
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/warehouse/modules/form.vue
@@ -0,0 +1,124 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesWmWarehouseApi } from '#/api/mes/wm/warehouse';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElButton, ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createWarehouse,
+  getWarehouse,
+  updateWarehouse,
+} from '#/api/mes/wm/warehouse';
+import { $t } from '#/locales';
+import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
+import { BarcodeDetail } from '#/views/mes/wm/barcode/components';
+
+import { useFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesWmWarehouseApi.Warehouse>();
+const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>();
+
+const getTitle = computed(() => {
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['仓库']);
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['仓库'])
+    : $t('ui.actionTitle.create', ['仓库']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+/** 查看条码 */
+function handleBarcode() {
+  if (!formData.value?.id) {
+    return;
+  }
+  barcodeDetailRef.value?.openByBusiness(
+    formData.value.id,
+    BarcodeBizTypeEnum.WAREHOUSE,
+    formData.value.code,
+    formData.value.name,
+  );
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (formType.value === 'detail') {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data = (await formApi.getValues()) as MesWmWarehouseApi.Warehouse;
+    try {
+      await (formData.value?.id
+        ? updateWarehouse(data)
+        : createWarehouse(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
+    if (!data?.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getWarehouse(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+    <template v-if="formType === 'detail' && formData?.id" #prepend-footer>
+      <ElButton @click="handleBarcode"> 查看条码 </ElButton>
+    </template>
+    <BarcodeDetail ref="barcodeDetailRef" />
+  </Modal>
+</template>

From d3233c4bb41873390379b8ee9bcee264ff66d7db Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 29 May 2026 11:40:28 +0800
Subject: [PATCH 06/52] =?UTF-8?q?refactor:=20=E7=BB=9F=E4=B8=80=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=20schema=20=E6=8C=82=E8=BD=BD=E4=B8=8E=20resetForm=20?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../crm/permission/modules/transfer-form.vue  |  1 -
 .../src/views/iot/product/product/data.ts     |  4 +-
 .../iot/product/product/modules/form.vue      |  6 +--
 .../views/iot/rule/data/rule/modules/form.vue |  1 -
 .../modules/product-property-add-form.vue     |  1 -
 .../discountActivity/modules/form.vue         |  8 ++--
 .../views/mes/cal/holiday/modules/form.vue    |  1 -
 .../src/views/mes/cal/plan/modules/form.vue   |  5 +--
 .../src/views/mes/cal/team/modules/form.vue   |  5 +--
 .../views/mes/dv/checkplan/modules/form.vue   |  5 +--
 .../views/mes/dv/checkrecord/modules/form.vue |  1 -
 .../views/mes/dv/machinery/modules/form.vue   |  4 --
 .../mes/dv/machinery/type/modules/form.vue    |  5 +--
 .../mes/dv/maintenrecord/modules/form.vue     |  1 -
 .../src/views/mes/dv/repair/modules/form.vue  |  5 +--
 .../src/views/mes/dv/subject/modules/form.vue |  5 +--
 .../views/mes/md/autocode/modules/form.vue    |  1 -
 .../mes/md/autocode/modules/part-form.vue     |  1 -
 .../src/views/mes/md/client/modules/form.vue  |  5 +--
 .../src/views/mes/md/item/modules/form.vue    |  5 +--
 .../views/mes/md/item/type/modules/form.vue   |  5 +--
 .../views/mes/md/unitmeasure/modules/form.vue |  1 -
 .../src/views/mes/md/vendor/modules/form.vue  |  5 +--
 .../views/mes/md/workstation/modules/form.vue |  5 +--
 .../md/workstation/workshop/modules/form.vue  |  5 +--
 .../mes/pro/andon/record/modules/form.vue     |  4 --
 .../views/mes/pro/feedback/modules/form.vue   |  4 --
 .../mes/pro/process/modules/content-form.vue  |  1 -
 .../views/mes/pro/process/modules/form.vue    |  5 +--
 .../views/mes/pro/route/modules/bom-form.vue  |  1 -
 .../src/views/mes/pro/route/modules/form.vue  |  5 +--
 .../mes/pro/route/modules/process-form.vue    |  1 -
 .../mes/pro/route/modules/product-form.vue    |  1 -
 .../src/views/mes/qc/defect/modules/form.vue  |  5 +--
 .../views/mes/qc/indicator/modules/form.vue   |  5 +--
 .../views/mes/qc/template/modules/form.vue    |  5 +--
 .../qc/template/modules/indicator-form.vue    |  1 -
 .../mes/qc/template/modules/item-form.vue     |  1 -
 .../src/views/mes/tm/tool/modules/form.vue    |  5 +--
 .../views/mes/tm/tool/type/modules/form.vue   |  5 +--
 .../web-antd/src/views/mes/utils/constants.ts | 43 +++++++++++++++++++
 .../src/views/wms/md/item/brand/data.ts       |  4 +-
 .../views/wms/md/item/brand/modules/form.vue  |  5 +--
 .../src/views/wms/md/item/category/data.ts    |  4 +-
 .../wms/md/item/category/modules/form.vue     |  5 +--
 apps/web-antd/src/views/wms/md/item/data.ts   |  4 +-
 .../src/views/wms/md/item/modules/form.vue    |  5 +--
 .../src/views/wms/md/merchant/data.ts         |  4 +-
 .../views/wms/md/merchant/modules/form.vue    |  5 +--
 .../src/views/wms/md/warehouse/data.ts        |  4 +-
 .../views/wms/md/warehouse/modules/form.vue   |  4 +-
 .../views/wms/order/check/modules/form.vue    |  1 -
 .../views/wms/order/movement/modules/form.vue |  1 -
 .../views/wms/order/receipt/modules/form.vue  |  1 -
 .../views/wms/order/shipment/modules/form.vue |  1 -
 .../crm/permission/modules/transfer-form.vue  |  1 -
 .../src/views/iot/product/product/data.ts     |  4 +-
 .../iot/product/product/modules/form.vue      |  6 +--
 .../views/iot/rule/data/rule/modules/form.vue |  1 -
 .../modules/product-property-add-form.vue     |  1 -
 .../discountActivity/modules/form.vue         |  8 ++--
 .../views/mes/cal/holiday/modules/form.vue    |  1 -
 .../src/views/mes/cal/plan/modules/form.vue   |  5 +--
 .../src/views/mes/cal/team/modules/form.vue   |  5 +--
 .../views/mes/dv/checkplan/modules/form.vue   |  5 +--
 .../views/mes/dv/checkrecord/modules/form.vue |  1 -
 .../views/mes/dv/machinery/modules/form.vue   |  4 --
 .../mes/dv/machinery/type/modules/form.vue    |  5 +--
 .../mes/dv/maintenrecord/modules/form.vue     |  1 -
 .../src/views/mes/dv/repair/modules/form.vue  |  5 +--
 .../src/views/mes/dv/subject/modules/form.vue |  5 +--
 .../views/mes/md/autocode/modules/form.vue    |  1 -
 .../mes/md/autocode/modules/part-form.vue     |  1 -
 .../src/views/mes/md/client/modules/form.vue  |  5 +--
 .../src/views/mes/md/item/modules/form.vue    |  5 +--
 .../views/mes/md/item/type/modules/form.vue   |  5 +--
 .../views/mes/md/unitmeasure/modules/form.vue |  1 -
 .../src/views/mes/md/vendor/modules/form.vue  |  5 +--
 .../views/mes/md/workstation/modules/form.vue |  5 +--
 .../md/workstation/workshop/modules/form.vue  |  5 +--
 .../mes/pro/andon/record/modules/form.vue     |  4 --
 .../views/mes/pro/feedback/modules/form.vue   |  4 --
 .../mes/pro/process/modules/content-form.vue  |  1 -
 .../views/mes/pro/process/modules/form.vue    |  5 +--
 .../views/mes/pro/route/modules/bom-form.vue  |  1 -
 .../src/views/mes/pro/route/modules/form.vue  |  5 +--
 .../mes/pro/route/modules/process-form.vue    |  1 -
 .../mes/pro/route/modules/product-form.vue    |  1 -
 .../src/views/mes/qc/defect/modules/form.vue  |  5 +--
 .../views/mes/qc/indicator/modules/form.vue   |  5 +--
 .../views/mes/qc/template/modules/form.vue    |  5 +--
 .../qc/template/modules/indicator-form.vue    |  1 -
 .../mes/qc/template/modules/item-form.vue     |  1 -
 .../src/views/mes/tm/tool/modules/form.vue    |  5 +--
 .../views/mes/tm/tool/type/modules/form.vue   |  5 +--
 apps/web-ele/src/views/mes/utils/constants.ts | 43 +++++++++++++++++++
 .../src/views/wms/md/item/brand/data.ts       |  4 +-
 .../views/wms/md/item/brand/modules/form.vue  |  5 +--
 .../src/views/wms/md/item/category/data.ts    |  4 +-
 .../wms/md/item/category/modules/form.vue     |  5 +--
 apps/web-ele/src/views/wms/md/item/data.ts    |  4 +-
 .../src/views/wms/md/item/modules/form.vue    |  5 +--
 .../web-ele/src/views/wms/md/merchant/data.ts |  4 +-
 .../views/wms/md/merchant/modules/form.vue    |  5 +--
 .../src/views/wms/md/warehouse/data.ts        |  4 +-
 .../views/wms/md/warehouse/modules/form.vue   |  4 +-
 .../views/wms/order/check/modules/form.vue    |  1 -
 .../views/wms/order/movement/modules/form.vue |  1 -
 .../views/wms/order/receipt/modules/form.vue  |  1 -
 .../views/wms/order/shipment/modules/form.vue |  1 -
 packages/constants/src/dict-enum.ts           |  2 +
 111 files changed, 172 insertions(+), 292 deletions(-)

diff --git a/apps/web-antd/src/views/crm/permission/modules/transfer-form.vue b/apps/web-antd/src/views/crm/permission/modules/transfer-form.vue
index 21883543f..96b046147 100644
--- a/apps/web-antd/src/views/crm/permission/modules/transfer-form.vue
+++ b/apps/web-antd/src/views/crm/permission/modules/transfer-form.vue
@@ -100,7 +100,6 @@ const [Modal, modalApi] = useVbenModal({
   },
   async onOpenChange(isOpen: boolean) {
     if (!isOpen) {
-      await formApi.resetForm();
       return;
     }
     // 加载数据
diff --git a/apps/web-antd/src/views/iot/product/product/data.ts b/apps/web-antd/src/views/iot/product/product/data.ts
index 3abe66307..a61b5cc9e 100644
--- a/apps/web-antd/src/views/iot/product/product/data.ts
+++ b/apps/web-antd/src/views/iot/product/product/data.ts
@@ -1,4 +1,4 @@
-import type { VbenFormSchema } from '#/adapter/form';
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { IotProductApi } from '#/api/iot/product/product';
 
@@ -14,7 +14,7 @@ import { getSimpleProductCategoryList } from '#/api/iot/product/category';
 
 /** 基础表单字段（不含图标、图片、描述） */
 export function useBasicFormSchema(
-  formApi?: any,
+  formApi?: VbenFormApi,
   generateProductKey?: () => string,
 ): VbenFormSchema[] {
   return [
diff --git a/apps/web-antd/src/views/iot/product/product/modules/form.vue b/apps/web-antd/src/views/iot/product/product/modules/form.vue
index eb5caddad..a22c0a834 100644
--- a/apps/web-antd/src/views/iot/product/product/modules/form.vue
+++ b/apps/web-antd/src/views/iot/product/product/modules/form.vue
@@ -60,9 +60,6 @@ const [AdvancedForm, advancedFormApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 基础表单需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useBasicFormSchema(formApi, generateProductKey) });
-
 /** 获取高级表单的值（如果表单未挂载，则从 formData 中获取） */
 async function getAdvancedFormValues() {
   if (advancedFormApi.isMounted) {
@@ -106,6 +103,9 @@ const [Modal, modalApi] = useVbenModal({
       activeKey.value = [];
       return;
     }
+    formApi.setState({
+      schema: useBasicFormSchema(formApi, generateProductKey),
+    });
     // 加载数据
     const data = modalApi.getData<IotProductApi.Product>();
     if (!data || !data.id) {
diff --git a/apps/web-antd/src/views/iot/rule/data/rule/modules/form.vue b/apps/web-antd/src/views/iot/rule/data/rule/modules/form.vue
index 3faafe325..59851ad90 100644
--- a/apps/web-antd/src/views/iot/rule/data/rule/modules/form.vue
+++ b/apps/web-antd/src/views/iot/rule/data/rule/modules/form.vue
@@ -69,7 +69,6 @@ const [Modal, modalApi] = useVbenModal({
   async onOpenChange(isOpen: boolean) {
     if (!isOpen) {
       formData.value = undefined;
-      await formApi.resetForm();
       sourceConfigRef.value?.setData([]);
       return;
     }
diff --git a/apps/web-antd/src/views/mall/product/spu/form/modules/product-property-add-form.vue b/apps/web-antd/src/views/mall/product/spu/form/modules/product-property-add-form.vue
index f34a8d194..1ec33b733 100644
--- a/apps/web-antd/src/views/mall/product/spu/form/modules/product-property-add-form.vue
+++ b/apps/web-antd/src/views/mall/product/spu/form/modules/product-property-add-form.vue
@@ -134,7 +134,6 @@ const [Modal, modalApi] = useVbenModal({
     if (!isOpen) {
       return;
     }
-    await formApi.resetForm();
   },
 });
 </script>
diff --git a/apps/web-antd/src/views/mall/promotion/discountActivity/modules/form.vue b/apps/web-antd/src/views/mall/promotion/discountActivity/modules/form.vue
index a0eff3e1d..0f159017a 100644
--- a/apps/web-antd/src/views/mall/promotion/discountActivity/modules/form.vue
+++ b/apps/web-antd/src/views/mall/promotion/discountActivity/modules/form.vue
@@ -7,7 +7,7 @@ import type {
   SpuProperty,
 } from '#/views/mall/product/spu/components';
 
-import { computed, nextTick, ref } from 'vue';
+import { computed, ref } from 'vue';
 
 import { useVbenForm, useVbenModal } from '@vben/common-ui';
 import { PromotionDiscountTypeEnum } from '@vben/constants';
@@ -213,13 +213,11 @@ function handleSkuDiscountPercentChange(row: SkuExtension) {
 }
 
 /** 重置表单 */
-async function resetForm() {
+function resetForm() {
   spuList.value = [];
   spuPropertyList.value = [];
   spuIdList.value = [];
   formData.value = {};
-  await nextTick();
-  await formApi.resetForm();
 }
 
 // ================= 弹窗相关 =================
@@ -264,7 +262,7 @@ const [Modal, modalApi] = useVbenModal({
   },
   async onOpenChange(isOpen: boolean) {
     if (!isOpen) {
-      await resetForm();
+      resetForm();
       return;
     }
     // 加载数据
diff --git a/apps/web-antd/src/views/mes/cal/holiday/modules/form.vue b/apps/web-antd/src/views/mes/cal/holiday/modules/form.vue
index 166514c50..aac5a48d6 100644
--- a/apps/web-antd/src/views/mes/cal/holiday/modules/form.vue
+++ b/apps/web-antd/src/views/mes/cal/holiday/modules/form.vue
@@ -50,7 +50,6 @@ const [Modal, modalApi] = useVbenModal({
     if (!isOpen) {
       return;
     }
-    await formApi.resetForm();
     const data = modalApi.getData<{ day: string }>();
     if (!data?.day) {
       return;
diff --git a/apps/web-antd/src/views/mes/cal/plan/modules/form.vue b/apps/web-antd/src/views/mes/cal/plan/modules/form.vue
index bbfdac011..c76ed81e6 100644
--- a/apps/web-antd/src/views/mes/cal/plan/modules/form.vue
+++ b/apps/web-antd/src/views/mes/cal/plan/modules/form.vue
@@ -49,9 +49,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 /** 确认排班计划 */
 async function handleConfirmPlan() {
   const { valid } = await formApi.validate();
@@ -106,7 +103,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     subTabsName.value = 'shift';
     // 加载数据
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
diff --git a/apps/web-antd/src/views/mes/cal/team/modules/form.vue b/apps/web-antd/src/views/mes/cal/team/modules/form.vue
index 4f4128b48..388db173d 100644
--- a/apps/web-antd/src/views/mes/cal/team/modules/form.vue
+++ b/apps/web-antd/src/views/mes/cal/team/modules/form.vue
@@ -45,9 +45,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     if (isDetail.value) {
@@ -82,7 +79,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     subTabsName.value = 'member';
     // 加载数据
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
diff --git a/apps/web-antd/src/views/mes/dv/checkplan/modules/form.vue b/apps/web-antd/src/views/mes/dv/checkplan/modules/form.vue
index 3277e9f77..650003ed6 100644
--- a/apps/web-antd/src/views/mes/dv/checkplan/modules/form.vue
+++ b/apps/web-antd/src/views/mes/dv/checkplan/modules/form.vue
@@ -44,9 +44,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     if (isDetail.value) {
@@ -81,7 +78,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     subTabsName.value = 'machinery';
     // 加载数据
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
diff --git a/apps/web-antd/src/views/mes/dv/checkrecord/modules/form.vue b/apps/web-antd/src/views/mes/dv/checkrecord/modules/form.vue
index 95c7aa8de..0f85d632f 100644
--- a/apps/web-antd/src/views/mes/dv/checkrecord/modules/form.vue
+++ b/apps/web-antd/src/views/mes/dv/checkrecord/modules/form.vue
@@ -103,7 +103,6 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
     // 加载数据
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
     formType.value = data.formType;
diff --git a/apps/web-antd/src/views/mes/dv/machinery/modules/form.vue b/apps/web-antd/src/views/mes/dv/machinery/modules/form.vue
index b148583a8..9599dc74a 100644
--- a/apps/web-antd/src/views/mes/dv/machinery/modules/form.vue
+++ b/apps/web-antd/src/views/mes/dv/machinery/modules/form.vue
@@ -47,9 +47,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formType.value, formApi) });
-
 /** 查看设备条码 */
 function handleBarcode() {
   if (!formData.value?.id) {
@@ -91,7 +88,6 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
     subTabsName.value = 'check';
     // 加载数据
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
diff --git a/apps/web-antd/src/views/mes/dv/machinery/type/modules/form.vue b/apps/web-antd/src/views/mes/dv/machinery/type/modules/form.vue
index bf17aed85..4a0269d17 100644
--- a/apps/web-antd/src/views/mes/dv/machinery/type/modules/form.vue
+++ b/apps/web-antd/src/views/mes/dv/machinery/type/modules/form.vue
@@ -38,9 +38,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     const { valid } = await formApi.validate();
@@ -67,7 +64,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     // 加载数据
     const data = modalApi.getData<MesDvMachineryTypeApi.MachineryType>();
     if (!data || !data.id) {
diff --git a/apps/web-antd/src/views/mes/dv/maintenrecord/modules/form.vue b/apps/web-antd/src/views/mes/dv/maintenrecord/modules/form.vue
index 837f1ef62..0827b1cef 100644
--- a/apps/web-antd/src/views/mes/dv/maintenrecord/modules/form.vue
+++ b/apps/web-antd/src/views/mes/dv/maintenrecord/modules/form.vue
@@ -110,7 +110,6 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
     // 加载数据
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
     formType.value = data.formType;
diff --git a/apps/web-antd/src/views/mes/dv/repair/modules/form.vue b/apps/web-antd/src/views/mes/dv/repair/modules/form.vue
index ded9ae757..d9863755b 100644
--- a/apps/web-antd/src/views/mes/dv/repair/modules/form.vue
+++ b/apps/web-antd/src/views/mes/dv/repair/modules/form.vue
@@ -57,9 +57,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 /** 提交维修工单 */
 async function handleSubmit() {
   const { valid } = await formApi.validate();
@@ -164,7 +161,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     // 加载数据
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
     formType.value = data.formType;
diff --git a/apps/web-antd/src/views/mes/dv/subject/modules/form.vue b/apps/web-antd/src/views/mes/dv/subject/modules/form.vue
index ebda266c9..a1f953a78 100644
--- a/apps/web-antd/src/views/mes/dv/subject/modules/form.vue
+++ b/apps/web-antd/src/views/mes/dv/subject/modules/form.vue
@@ -39,9 +39,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     if (isDetail.value) {
@@ -69,7 +66,7 @@ const [Modal, modalApi] = useVbenModal({
     if (!isOpen) {
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     // 加载数据
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
     formType.value = data.formType;
diff --git a/apps/web-antd/src/views/mes/md/autocode/modules/form.vue b/apps/web-antd/src/views/mes/md/autocode/modules/form.vue
index 04290bf51..75e6f9550 100644
--- a/apps/web-antd/src/views/mes/md/autocode/modules/form.vue
+++ b/apps/web-antd/src/views/mes/md/autocode/modules/form.vue
@@ -76,7 +76,6 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
     // 加载数据
     const data = modalApi.getData<MesMdAutoCodeRuleApi.AutoCodeRule>();
     if (!data?.id) {
diff --git a/apps/web-antd/src/views/mes/md/autocode/modules/part-form.vue b/apps/web-antd/src/views/mes/md/autocode/modules/part-form.vue
index 205a2125b..d1ba56e4e 100644
--- a/apps/web-antd/src/views/mes/md/autocode/modules/part-form.vue
+++ b/apps/web-antd/src/views/mes/md/autocode/modules/part-form.vue
@@ -86,7 +86,6 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
     // 加载数据
     const data = modalApi.getData<{
       id?: number;
diff --git a/apps/web-antd/src/views/mes/md/client/modules/form.vue b/apps/web-antd/src/views/mes/md/client/modules/form.vue
index 49e3a4eff..7b78ec05b 100644
--- a/apps/web-antd/src/views/mes/md/client/modules/form.vue
+++ b/apps/web-antd/src/views/mes/md/client/modules/form.vue
@@ -44,9 +44,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     if (isDetail.value) {
@@ -75,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     subTabsName.value = 'productSalesLine';
     // 加载数据
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
diff --git a/apps/web-antd/src/views/mes/md/item/modules/form.vue b/apps/web-antd/src/views/mes/md/item/modules/form.vue
index 15ff74a2b..9008507c5 100644
--- a/apps/web-antd/src/views/mes/md/item/modules/form.vue
+++ b/apps/web-antd/src/views/mes/md/item/modules/form.vue
@@ -52,9 +52,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 /** 查看物料条码 */
 function handleBarcode() {
   if (!formData.value?.id) {
@@ -103,7 +100,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     subTabsName.value = 'bom';
     // 加载数据
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
diff --git a/apps/web-antd/src/views/mes/md/item/type/modules/form.vue b/apps/web-antd/src/views/mes/md/item/type/modules/form.vue
index 9d59b4646..3b91a56ec 100644
--- a/apps/web-antd/src/views/mes/md/item/type/modules/form.vue
+++ b/apps/web-antd/src/views/mes/md/item/type/modules/form.vue
@@ -38,9 +38,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     const { valid } = await formApi.validate();
@@ -65,7 +62,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     // 加载数据
     const data = modalApi.getData<MesMdItemTypeApi.ItemType>();
     if (!data || !data.id) {
diff --git a/apps/web-antd/src/views/mes/md/unitmeasure/modules/form.vue b/apps/web-antd/src/views/mes/md/unitmeasure/modules/form.vue
index cfd906fc8..3f4e0af35 100644
--- a/apps/web-antd/src/views/mes/md/unitmeasure/modules/form.vue
+++ b/apps/web-antd/src/views/mes/md/unitmeasure/modules/form.vue
@@ -68,7 +68,6 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
     // 加载数据
     const data = modalApi.getData<MesMdUnitMeasureApi.UnitMeasure>();
     if (!data || !data.id) {
diff --git a/apps/web-antd/src/views/mes/md/vendor/modules/form.vue b/apps/web-antd/src/views/mes/md/vendor/modules/form.vue
index f12e7c206..a55a2cab9 100644
--- a/apps/web-antd/src/views/mes/md/vendor/modules/form.vue
+++ b/apps/web-antd/src/views/mes/md/vendor/modules/form.vue
@@ -46,9 +46,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     if (isDetail.value) {
@@ -77,7 +74,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     subTabsName.value = 'itemReceiptLine';
     // 加载数据
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
diff --git a/apps/web-antd/src/views/mes/md/workstation/modules/form.vue b/apps/web-antd/src/views/mes/md/workstation/modules/form.vue
index aa3f269bf..204cb5214 100644
--- a/apps/web-antd/src/views/mes/md/workstation/modules/form.vue
+++ b/apps/web-antd/src/views/mes/md/workstation/modules/form.vue
@@ -52,9 +52,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 /** 查看工作站条码 */
 function handleBarcode() {
   if (!formData.value?.id) {
@@ -102,7 +99,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     subTabsName.value = 'machine';
     // 加载数据
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
diff --git a/apps/web-antd/src/views/mes/md/workstation/workshop/modules/form.vue b/apps/web-antd/src/views/mes/md/workstation/workshop/modules/form.vue
index 1b708029b..372006587 100644
--- a/apps/web-antd/src/views/mes/md/workstation/workshop/modules/form.vue
+++ b/apps/web-antd/src/views/mes/md/workstation/workshop/modules/form.vue
@@ -48,9 +48,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 /** 查看车间条码 */
 function handleBarcode() {
   if (!formData.value?.id) {
@@ -92,7 +89,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     // 加载数据
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
     formType.value = data.formType;
diff --git a/apps/web-antd/src/views/mes/pro/andon/record/modules/form.vue b/apps/web-antd/src/views/mes/pro/andon/record/modules/form.vue
index 1b7272681..e233b77f1 100644
--- a/apps/web-antd/src/views/mes/pro/andon/record/modules/form.vue
+++ b/apps/web-antd/src/views/mes/pro/andon/record/modules/form.vue
@@ -49,9 +49,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formType.value, formApi) });
-
 /** 处置：保存（保持 ACTIVE 状态） */
 async function handleSave() {
   modalApi.lock();
@@ -136,7 +133,6 @@ const [Modal, modalApi] = useVbenModal({
     formType.value = data.formType;
     formApi.setState({ schema: useFormSchema(formType.value, formApi) });
     modalApi.setState({ showConfirmButton: formType.value === 'create' });
-    await formApi.resetForm();
     if (formType.value === 'create') {
       // 新增时，发起人默认为当前用户
       await formApi.setValues({ userId: userStore.userInfo?.id });
diff --git a/apps/web-antd/src/views/mes/pro/feedback/modules/form.vue b/apps/web-antd/src/views/mes/pro/feedback/modules/form.vue
index d0c8a84ce..40e22c3e8 100644
--- a/apps/web-antd/src/views/mes/pro/feedback/modules/form.vue
+++ b/apps/web-antd/src/views/mes/pro/feedback/modules/form.vue
@@ -82,9 +82,6 @@ const [Form, formApi] = useVbenForm({
   wrapperClass: 'grid-cols-3',
 });
 
-/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formType.value, formApi) });
-
 /** 提交前对齐数量：根据 checkFlag 决定 uncheck/合格/不良归零策略 */
 function alignQuantity(data: MesProFeedbackApi.Feedback) {
   if (data.checkFlag) {
@@ -239,7 +236,6 @@ const [Modal, modalApi] = useVbenModal({
       showConfirmButton:
         formType.value !== 'detail' && formType.value !== 'approve',
     });
-    await formApi.resetForm();
     if (!data?.id) {
       // 新增：默认报工人和报工时间，并自动生成报工单号
       const code = await generateAutoCode(
diff --git a/apps/web-antd/src/views/mes/pro/process/modules/content-form.vue b/apps/web-antd/src/views/mes/pro/process/modules/content-form.vue
index eb4270b25..ff0c33ac2 100644
--- a/apps/web-antd/src/views/mes/pro/process/modules/content-form.vue
+++ b/apps/web-antd/src/views/mes/pro/process/modules/content-form.vue
@@ -65,7 +65,6 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
     // 加载数据
     const data = modalApi.getData<{
       id?: number;
diff --git a/apps/web-antd/src/views/mes/pro/process/modules/form.vue b/apps/web-antd/src/views/mes/pro/process/modules/form.vue
index a3d910c8d..540c0bea6 100644
--- a/apps/web-antd/src/views/mes/pro/process/modules/form.vue
+++ b/apps/web-antd/src/views/mes/pro/process/modules/form.vue
@@ -48,9 +48,6 @@ const [Form, formApi] = useVbenForm({
   wrapperClass: 'grid-cols-3',
 });
 
-/** 表单 schema 需要 formApi 引用（生成编码按钮），所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     if (isDetail.value) {
@@ -79,7 +76,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     // 加载数据
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
     formType.value = data.formType;
diff --git a/apps/web-antd/src/views/mes/pro/route/modules/bom-form.vue b/apps/web-antd/src/views/mes/pro/route/modules/bom-form.vue
index 8e2f4c243..e03a816bd 100644
--- a/apps/web-antd/src/views/mes/pro/route/modules/bom-form.vue
+++ b/apps/web-antd/src/views/mes/pro/route/modules/bom-form.vue
@@ -78,7 +78,6 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
     // 加载数据
     const data = modalApi.getData<{
       id?: number;
diff --git a/apps/web-antd/src/views/mes/pro/route/modules/form.vue b/apps/web-antd/src/views/mes/pro/route/modules/form.vue
index f381fe8d2..9defcdcf5 100644
--- a/apps/web-antd/src/views/mes/pro/route/modules/form.vue
+++ b/apps/web-antd/src/views/mes/pro/route/modules/form.vue
@@ -44,9 +44,6 @@ const [Form, formApi] = useVbenForm({
   wrapperClass: 'grid-cols-2',
 });
 
-/** 表单 schema 需要 formApi 引用（生成编码按钮），所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     if (isDetail.value) {
@@ -82,7 +79,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     subTab.value = 'process';
     // 加载数据
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
diff --git a/apps/web-antd/src/views/mes/pro/route/modules/process-form.vue b/apps/web-antd/src/views/mes/pro/route/modules/process-form.vue
index d4f7681fa..b742c6388 100644
--- a/apps/web-antd/src/views/mes/pro/route/modules/process-form.vue
+++ b/apps/web-antd/src/views/mes/pro/route/modules/process-form.vue
@@ -81,7 +81,6 @@ const [Modal, modalApi] = useVbenModal({
       // 工序下拉依赖远程数据，schema 在弹窗打开时再生成
       const schema = await loadSchema();
       formApi.setState({ schema });
-      await formApi.resetForm();
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-antd/src/views/mes/pro/route/modules/product-form.vue b/apps/web-antd/src/views/mes/pro/route/modules/product-form.vue
index 47ce4ba12..a3b0e5d25 100644
--- a/apps/web-antd/src/views/mes/pro/route/modules/product-form.vue
+++ b/apps/web-antd/src/views/mes/pro/route/modules/product-form.vue
@@ -83,7 +83,6 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
     // 加载数据
     const data = modalApi.getData<{
       id?: number;
diff --git a/apps/web-antd/src/views/mes/qc/defect/modules/form.vue b/apps/web-antd/src/views/mes/qc/defect/modules/form.vue
index a3dc3badf..a0076a4e8 100644
--- a/apps/web-antd/src/views/mes/qc/defect/modules/form.vue
+++ b/apps/web-antd/src/views/mes/qc/defect/modules/form.vue
@@ -34,9 +34,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用（生成编码按钮），所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     const { valid } = await formApi.validate();
@@ -61,7 +58,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     // 加载数据
     const data = modalApi.getData<MesQcDefectApi.Defect>();
     if (!data || !data.id) {
diff --git a/apps/web-antd/src/views/mes/qc/indicator/modules/form.vue b/apps/web-antd/src/views/mes/qc/indicator/modules/form.vue
index 7b40dbfd1..d9a8ee39c 100644
--- a/apps/web-antd/src/views/mes/qc/indicator/modules/form.vue
+++ b/apps/web-antd/src/views/mes/qc/indicator/modules/form.vue
@@ -38,9 +38,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用（生成编码、跨字段联动），所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     const { valid } = await formApi.validate();
@@ -67,7 +64,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     // 加载数据
     const data = modalApi.getData<MesQcIndicatorApi.Indicator>();
     if (!data || !data.id) {
diff --git a/apps/web-antd/src/views/mes/qc/template/modules/form.vue b/apps/web-antd/src/views/mes/qc/template/modules/form.vue
index 701d0f3fe..4966a298c 100644
--- a/apps/web-antd/src/views/mes/qc/template/modules/form.vue
+++ b/apps/web-antd/src/views/mes/qc/template/modules/form.vue
@@ -49,9 +49,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用（生成编码按钮），所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     if (formType.value === 'detail') {
@@ -80,7 +77,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     subTabsName.value = 'indicator';
     // 加载数据
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
diff --git a/apps/web-antd/src/views/mes/qc/template/modules/indicator-form.vue b/apps/web-antd/src/views/mes/qc/template/modules/indicator-form.vue
index cfbd1a238..59ac8cf69 100644
--- a/apps/web-antd/src/views/mes/qc/template/modules/indicator-form.vue
+++ b/apps/web-antd/src/views/mes/qc/template/modules/indicator-form.vue
@@ -69,7 +69,6 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
     // 加载数据
     const data = modalApi.getData<
       MesQcTemplateIndicatorApi.TemplateIndicator & { templateId: number }
diff --git a/apps/web-antd/src/views/mes/qc/template/modules/item-form.vue b/apps/web-antd/src/views/mes/qc/template/modules/item-form.vue
index 72262de2c..f417263b2 100644
--- a/apps/web-antd/src/views/mes/qc/template/modules/item-form.vue
+++ b/apps/web-antd/src/views/mes/qc/template/modules/item-form.vue
@@ -68,7 +68,6 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
     // 加载数据
     const data = modalApi.getData<
       MesQcTemplateItemApi.TemplateItem & { templateId: number }
diff --git a/apps/web-antd/src/views/mes/tm/tool/modules/form.vue b/apps/web-antd/src/views/mes/tm/tool/modules/form.vue
index f964457e0..03f88e467 100644
--- a/apps/web-antd/src/views/mes/tm/tool/modules/form.vue
+++ b/apps/web-antd/src/views/mes/tm/tool/modules/form.vue
@@ -46,9 +46,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 /** 查看工具条码 */
 function handleBarcode() {
   if (!formData.value?.id) {
@@ -90,7 +87,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     // 加载数据
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
     formType.value = data.formType;
diff --git a/apps/web-antd/src/views/mes/tm/tool/type/modules/form.vue b/apps/web-antd/src/views/mes/tm/tool/type/modules/form.vue
index 9b8ce574b..172563cda 100644
--- a/apps/web-antd/src/views/mes/tm/tool/type/modules/form.vue
+++ b/apps/web-antd/src/views/mes/tm/tool/type/modules/form.vue
@@ -43,9 +43,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     if (isDetail.value) {
@@ -74,7 +71,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     // 加载数据
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
     formType.value = data.formType;
diff --git a/apps/web-antd/src/views/mes/utils/constants.ts b/apps/web-antd/src/views/mes/utils/constants.ts
index 15993c32a..d931e83d1 100644
--- a/apps/web-antd/src/views/mes/utils/constants.ts
+++ b/apps/web-antd/src/views/mes/utils/constants.ts
@@ -141,6 +141,8 @@ export const MesAutoCodeRuleCode = {
   PRO_WORK_ORDER_CODE: 'PRO_WORK_ORDER_CODE',
   QC_DEFECT_CODE: 'QC_DEFECT_CODE',
   QC_INDICATOR_CODE: 'QC_INDICATOR_CODE',
+  QC_INDICATOR_RESULT_CODE: 'QC_INDICATOR_RESULT_CODE',
+  QC_IQC_CODE: 'QC_IQC_CODE',
   QC_TEMPLATE_CODE: 'QC_TEMPLATE_CODE',
   TM_TOOL_TYPE_CODE: 'TM_TOOL_TYPE_CODE',
   TM_TOOL_CODE: 'TM_TOOL_CODE',
@@ -215,6 +217,47 @@ export const MesQcResultValueType = {
   FILE: 5,
 } as const;
 
+/** MES 业务类型常量 */
+export const MesBizTypeEnum = {
+  // WM 仓库模块 [100, 200)
+  WM_ARRIVAL_NOTICE: 100, // 到货通知单
+  WM_RETURN_ISSUE: 116, // 生产退料
+  WM_PRODUCT_SALES: 118, // 销售出库
+  WM_RETURN_SALES: 119, // 销售退货入库
+  WM_OUTSOURCE_RECPT: 121, // 外协入库
+
+  // PRO 生产模块 [300, 400)
+  PRO_FEEDBACK: 304, // 生产报工
+} as const;
+
+/** MES 质检来源单据类型枚举 */
+export const MesQcSourceDocTypeEnum = {
+  // IQC
+  ARRIVAL_NOTICE: MesBizTypeEnum.WM_ARRIVAL_NOTICE,
+  OUTSOURCE_RECPT: MesBizTypeEnum.WM_OUTSOURCE_RECPT,
+  // IPQC
+  PRO_FEEDBACK: MesBizTypeEnum.PRO_FEEDBACK,
+  // OQC
+  PRODUCT_SALES: MesBizTypeEnum.WM_PRODUCT_SALES,
+  // RQC
+  RETURN_ISSUE: MesBizTypeEnum.WM_RETURN_ISSUE,
+  RETURN_SALES: MesBizTypeEnum.WM_RETURN_SALES,
+} as const;
+
+/** MES 质检类型枚举 */
+export const MesQcTypeEnum = {
+  IQC: 1, // 来料检验
+  IPQC: 2, // 过程检验
+  OQC: 3, // 出货检验
+  RQC: 4, // 退货检验
+} as const;
+
+/** MES 质检单状态枚举 */
+export const MesQcStatusEnum = {
+  DRAFT: MesOrderStatusConstants.DRAFT,
+  FINISHED: MesOrderStatusConstants.FINISHED,
+} as const;
+
 /** MES 编码规则分段类型枚举 */
 export const MesAutoCodePartTypeEnum = {
   INPUT: 1,
diff --git a/apps/web-antd/src/views/wms/md/item/brand/data.ts b/apps/web-antd/src/views/wms/md/item/brand/data.ts
index 5865a1215..55feec3fe 100644
--- a/apps/web-antd/src/views/wms/md/item/brand/data.ts
+++ b/apps/web-antd/src/views/wms/md/item/brand/data.ts
@@ -1,4 +1,4 @@
-import type { VbenFormSchema } from '#/adapter/form';
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
 import { h } from 'vue';
@@ -9,7 +9,7 @@ import { z } from '#/adapter/form';
 import { generateWmsCode } from '#/views/wms/utils/constants';
 
 /** 新增/修改商品品牌的表单 */
-export function useFormSchema(formApi?: any): VbenFormSchema[] {
+export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
   return [
     {
       component: 'Input',
diff --git a/apps/web-antd/src/views/wms/md/item/brand/modules/form.vue b/apps/web-antd/src/views/wms/md/item/brand/modules/form.vue
index 8b69b50be..9f20b8b34 100644
--- a/apps/web-antd/src/views/wms/md/item/brand/modules/form.vue
+++ b/apps/web-antd/src/views/wms/md/item/brand/modules/form.vue
@@ -39,9 +39,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     const { valid } = await formApi.validate();
@@ -66,7 +63,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     const data = modalApi.getData<WmsItemBrandApi.ItemBrand>();
     if (!data || !data.id) {
       return;
diff --git a/apps/web-antd/src/views/wms/md/item/category/data.ts b/apps/web-antd/src/views/wms/md/item/category/data.ts
index 12169a006..30e3823a7 100644
--- a/apps/web-antd/src/views/wms/md/item/category/data.ts
+++ b/apps/web-antd/src/views/wms/md/item/category/data.ts
@@ -1,4 +1,4 @@
-import type { VbenFormSchema } from '#/adapter/form';
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { WmsItemCategoryApi } from '#/api/wms/md/item/category';
 
@@ -15,7 +15,7 @@ import { getItemCategorySimpleList } from '#/api/wms/md/item/category';
 import { generateWmsCode } from '#/views/wms/utils/constants';
 
 /** 新增/修改商品分类的表单 */
-export function useFormSchema(formApi?: any): VbenFormSchema[] {
+export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
diff --git a/apps/web-antd/src/views/wms/md/item/category/modules/form.vue b/apps/web-antd/src/views/wms/md/item/category/modules/form.vue
index 584dc0d95..b4b26853d 100644
--- a/apps/web-antd/src/views/wms/md/item/category/modules/form.vue
+++ b/apps/web-antd/src/views/wms/md/item/category/modules/form.vue
@@ -41,9 +41,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     const { valid } = await formApi.validate();
@@ -70,7 +67,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     const data = modalApi.getData<WmsItemCategoryApi.ItemCategory>();
     if (!data || !data.id) {
       formData.value = data;
diff --git a/apps/web-antd/src/views/wms/md/item/data.ts b/apps/web-antd/src/views/wms/md/item/data.ts
index 9b4a4e555..47482e5ac 100644
--- a/apps/web-antd/src/views/wms/md/item/data.ts
+++ b/apps/web-antd/src/views/wms/md/item/data.ts
@@ -1,4 +1,4 @@
-import type { VbenFormSchema } from '#/adapter/form';
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
 import { h, markRaw } from 'vue';
@@ -13,7 +13,7 @@ import { WmsItemBrandSelect } from './brand/components';
 import { WmsItemCategorySelect } from './category/components';
 
 /** 新增/修改商品的表单 */
-export function useFormSchema(formApi?: any): VbenFormSchema[] {
+export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
   return [
     {
       component: 'Input',
diff --git a/apps/web-antd/src/views/wms/md/item/modules/form.vue b/apps/web-antd/src/views/wms/md/item/modules/form.vue
index ccc707efd..482eca9a8 100644
--- a/apps/web-antd/src/views/wms/md/item/modules/form.vue
+++ b/apps/web-antd/src/views/wms/md/item/modules/form.vue
@@ -38,9 +38,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 async function resetSkuForm(item?: WmsItemApi.Item) {
   await nextTick();
   await skuFormRef.value?.setRows(item?.skus);
@@ -77,7 +74,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     await resetSkuForm();
     // 加载数据
     const data = modalApi.getData<WmsItemApi.Item>();
diff --git a/apps/web-antd/src/views/wms/md/merchant/data.ts b/apps/web-antd/src/views/wms/md/merchant/data.ts
index 5f76f7387..bbc16d574 100644
--- a/apps/web-antd/src/views/wms/md/merchant/data.ts
+++ b/apps/web-antd/src/views/wms/md/merchant/data.ts
@@ -1,4 +1,4 @@
-import type { VbenFormSchema } from '#/adapter/form';
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
 import { h } from 'vue';
@@ -12,7 +12,7 @@ import { z } from '#/adapter/form';
 import { generateWmsCode } from '#/views/wms/utils/constants';
 
 /** 新增/修改往来企业的表单 */
-export function useFormSchema(formApi?: any): VbenFormSchema[] {
+export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
   return [
     {
       component: 'Input',
diff --git a/apps/web-antd/src/views/wms/md/merchant/modules/form.vue b/apps/web-antd/src/views/wms/md/merchant/modules/form.vue
index 35871a5ac..4a1329efb 100644
--- a/apps/web-antd/src/views/wms/md/merchant/modules/form.vue
+++ b/apps/web-antd/src/views/wms/md/merchant/modules/form.vue
@@ -40,9 +40,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     const { valid } = await formApi.validate();
@@ -67,7 +64,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     const data = modalApi.getData<WmsMerchantApi.Merchant>();
     if (!data || !data.id) {
       return;
diff --git a/apps/web-antd/src/views/wms/md/warehouse/data.ts b/apps/web-antd/src/views/wms/md/warehouse/data.ts
index e64ccecd3..7b1813a09 100644
--- a/apps/web-antd/src/views/wms/md/warehouse/data.ts
+++ b/apps/web-antd/src/views/wms/md/warehouse/data.ts
@@ -1,4 +1,4 @@
-import type { VbenFormSchema } from '#/adapter/form';
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
 import { h } from 'vue';
@@ -9,7 +9,7 @@ import { z } from '#/adapter/form';
 import { generateWmsCode } from '#/views/wms/utils/constants';
 
 /** 新增/修改仓库的表单 */
-export function useFormSchema(formApi?: any): VbenFormSchema[] {
+export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
   return [
     {
       component: 'Input',
diff --git a/apps/web-antd/src/views/wms/md/warehouse/modules/form.vue b/apps/web-antd/src/views/wms/md/warehouse/modules/form.vue
index 95d3e7eaa..9d16aa0fd 100644
--- a/apps/web-antd/src/views/wms/md/warehouse/modules/form.vue
+++ b/apps/web-antd/src/views/wms/md/warehouse/modules/form.vue
@@ -40,9 +40,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     const { valid } = await formApi.validate();
@@ -69,6 +66,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
+    formApi.setState({ schema: useFormSchema(formApi) });
     const data = modalApi.getData<WmsWarehouseApi.Warehouse>();
     if (!data || !data.id) {
       await formApi.setValues({ sort: 0 });
diff --git a/apps/web-antd/src/views/wms/order/check/modules/form.vue b/apps/web-antd/src/views/wms/order/check/modules/form.vue
index 59e87dac9..6094ec1b2 100644
--- a/apps/web-antd/src/views/wms/order/check/modules/form.vue
+++ b/apps/web-antd/src/views/wms/order/check/modules/form.vue
@@ -535,7 +535,6 @@ const [Modal, modalApi] = useVbenModal({
       setDetails([]);
       return;
     }
-    await formApi.resetForm();
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
     formType.value = data.formType;
     if (data?.id) {
diff --git a/apps/web-antd/src/views/wms/order/movement/modules/form.vue b/apps/web-antd/src/views/wms/order/movement/modules/form.vue
index f1d2a7d30..1e0bf8f5d 100644
--- a/apps/web-antd/src/views/wms/order/movement/modules/form.vue
+++ b/apps/web-antd/src/views/wms/order/movement/modules/form.vue
@@ -373,7 +373,6 @@ const [Modal, modalApi] = useVbenModal({
       setDetails([]);
       return;
     }
-    await formApi.resetForm();
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
     formType.value = data.formType;
     if (data?.id) {
diff --git a/apps/web-antd/src/views/wms/order/receipt/modules/form.vue b/apps/web-antd/src/views/wms/order/receipt/modules/form.vue
index 2b7acf71c..fd47e02ce 100644
--- a/apps/web-antd/src/views/wms/order/receipt/modules/form.vue
+++ b/apps/web-antd/src/views/wms/order/receipt/modules/form.vue
@@ -317,7 +317,6 @@ const [Modal, modalApi] = useVbenModal({
       setDetails([]);
       return;
     }
-    await formApi.resetForm();
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
     formType.value = data.formType;
     if (data?.id) {
diff --git a/apps/web-antd/src/views/wms/order/shipment/modules/form.vue b/apps/web-antd/src/views/wms/order/shipment/modules/form.vue
index eb077a1c7..4928298ee 100644
--- a/apps/web-antd/src/views/wms/order/shipment/modules/form.vue
+++ b/apps/web-antd/src/views/wms/order/shipment/modules/form.vue
@@ -360,7 +360,6 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     initializing.value = true;
-    await formApi.resetForm();
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
     formType.value = data.formType;
     if (data?.id) {
diff --git a/apps/web-ele/src/views/crm/permission/modules/transfer-form.vue b/apps/web-ele/src/views/crm/permission/modules/transfer-form.vue
index 594777048..6f5b39621 100644
--- a/apps/web-ele/src/views/crm/permission/modules/transfer-form.vue
+++ b/apps/web-ele/src/views/crm/permission/modules/transfer-form.vue
@@ -100,7 +100,6 @@ const [Modal, modalApi] = useVbenModal({
   },
   async onOpenChange(isOpen: boolean) {
     if (!isOpen) {
-      await formApi.resetForm();
       return;
     }
     // 加载数据
diff --git a/apps/web-ele/src/views/iot/product/product/data.ts b/apps/web-ele/src/views/iot/product/product/data.ts
index f108be5f8..6e5926077 100644
--- a/apps/web-ele/src/views/iot/product/product/data.ts
+++ b/apps/web-ele/src/views/iot/product/product/data.ts
@@ -1,4 +1,4 @@
-import type { VbenFormSchema } from '#/adapter/form';
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { IotProductApi } from '#/api/iot/product/product';
 
@@ -14,7 +14,7 @@ import { getSimpleProductCategoryList } from '#/api/iot/product/category';
 
 /** 基础表单字段（不含图标、图片、描述） */
 export function useBasicFormSchema(
-  formApi?: any,
+  formApi?: VbenFormApi,
   generateProductKey?: () => string,
 ): VbenFormSchema[] {
   return [
diff --git a/apps/web-ele/src/views/iot/product/product/modules/form.vue b/apps/web-ele/src/views/iot/product/product/modules/form.vue
index 58c9186a5..ad6a790b3 100644
--- a/apps/web-ele/src/views/iot/product/product/modules/form.vue
+++ b/apps/web-ele/src/views/iot/product/product/modules/form.vue
@@ -60,9 +60,6 @@ const [AdvancedForm, advancedFormApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 基础表单需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useBasicFormSchema(formApi, generateProductKey) });
-
 /** 获取高级表单的值（如果表单未挂载，则从 formData 中获取） */
 async function getAdvancedFormValues() {
   if (advancedFormApi.isMounted) {
@@ -106,6 +103,9 @@ const [Modal, modalApi] = useVbenModal({
       activeKey.value = [];
       return;
     }
+    formApi.setState({
+      schema: useBasicFormSchema(formApi, generateProductKey),
+    });
     // 加载数据
     const data = modalApi.getData<IotProductApi.Product>();
     if (!data || !data.id) {
diff --git a/apps/web-ele/src/views/iot/rule/data/rule/modules/form.vue b/apps/web-ele/src/views/iot/rule/data/rule/modules/form.vue
index 7f4adf27e..393f17d09 100644
--- a/apps/web-ele/src/views/iot/rule/data/rule/modules/form.vue
+++ b/apps/web-ele/src/views/iot/rule/data/rule/modules/form.vue
@@ -69,7 +69,6 @@ const [Modal, modalApi] = useVbenModal({
   async onOpenChange(isOpen: boolean) {
     if (!isOpen) {
       formData.value = undefined;
-      await formApi.resetForm();
       sourceConfigRef.value?.setData([]);
       return;
     }
diff --git a/apps/web-ele/src/views/mall/product/spu/form/modules/product-property-add-form.vue b/apps/web-ele/src/views/mall/product/spu/form/modules/product-property-add-form.vue
index 789ecd139..6516e30ea 100644
--- a/apps/web-ele/src/views/mall/product/spu/form/modules/product-property-add-form.vue
+++ b/apps/web-ele/src/views/mall/product/spu/form/modules/product-property-add-form.vue
@@ -134,7 +134,6 @@ const [Modal, modalApi] = useVbenModal({
     if (!isOpen) {
       return;
     }
-    await formApi.resetForm();
   },
 });
 </script>
diff --git a/apps/web-ele/src/views/mall/promotion/discountActivity/modules/form.vue b/apps/web-ele/src/views/mall/promotion/discountActivity/modules/form.vue
index 3dd8c1867..b529caee1 100644
--- a/apps/web-ele/src/views/mall/promotion/discountActivity/modules/form.vue
+++ b/apps/web-ele/src/views/mall/promotion/discountActivity/modules/form.vue
@@ -7,7 +7,7 @@ import type {
   SpuProperty,
 } from '#/views/mall/product/spu/components';
 
-import { computed, nextTick, ref } from 'vue';
+import { computed, ref } from 'vue';
 
 import { useVbenForm, useVbenModal } from '@vben/common-ui';
 import { PromotionDiscountTypeEnum } from '@vben/constants';
@@ -213,13 +213,11 @@ function handleSkuDiscountPercentChange(row: SkuExtension) {
 }
 
 /** 重置表单 */
-async function resetForm() {
+function resetForm() {
   spuList.value = [];
   spuPropertyList.value = [];
   spuIdList.value = [];
   formData.value = {};
-  await nextTick();
-  await formApi.resetForm();
 }
 
 // ================= 弹窗相关 =================
@@ -264,7 +262,7 @@ const [Modal, modalApi] = useVbenModal({
   },
   async onOpenChange(isOpen: boolean) {
     if (!isOpen) {
-      await resetForm();
+      resetForm();
       return;
     }
     // 加载数据
diff --git a/apps/web-ele/src/views/mes/cal/holiday/modules/form.vue b/apps/web-ele/src/views/mes/cal/holiday/modules/form.vue
index b7d155991..38c8c74b9 100644
--- a/apps/web-ele/src/views/mes/cal/holiday/modules/form.vue
+++ b/apps/web-ele/src/views/mes/cal/holiday/modules/form.vue
@@ -50,7 +50,6 @@ const [Modal, modalApi] = useVbenModal({
     if (!isOpen) {
       return;
     }
-    await formApi.resetForm();
     const data = modalApi.getData<{ day: string }>();
     if (!data?.day) {
       return;
diff --git a/apps/web-ele/src/views/mes/cal/plan/modules/form.vue b/apps/web-ele/src/views/mes/cal/plan/modules/form.vue
index 4300f3edf..433658c5b 100644
--- a/apps/web-ele/src/views/mes/cal/plan/modules/form.vue
+++ b/apps/web-ele/src/views/mes/cal/plan/modules/form.vue
@@ -50,9 +50,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 /** 确认排班计划 */
 async function handleConfirmPlan() {
   const { valid } = await formApi.validate();
@@ -107,7 +104,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     subTabsName.value = 'shift';
     // 加载数据
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
diff --git a/apps/web-ele/src/views/mes/cal/team/modules/form.vue b/apps/web-ele/src/views/mes/cal/team/modules/form.vue
index 17a70a355..959de5dc0 100644
--- a/apps/web-ele/src/views/mes/cal/team/modules/form.vue
+++ b/apps/web-ele/src/views/mes/cal/team/modules/form.vue
@@ -45,9 +45,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     if (isDetail.value) {
@@ -82,7 +79,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     subTabsName.value = 'member';
     // 加载数据
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
diff --git a/apps/web-ele/src/views/mes/dv/checkplan/modules/form.vue b/apps/web-ele/src/views/mes/dv/checkplan/modules/form.vue
index edda2c7b8..179675c36 100644
--- a/apps/web-ele/src/views/mes/dv/checkplan/modules/form.vue
+++ b/apps/web-ele/src/views/mes/dv/checkplan/modules/form.vue
@@ -44,9 +44,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     if (isDetail.value) {
@@ -81,7 +78,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     subTabsName.value = 'machinery';
     // 加载数据
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
diff --git a/apps/web-ele/src/views/mes/dv/checkrecord/modules/form.vue b/apps/web-ele/src/views/mes/dv/checkrecord/modules/form.vue
index c355deebc..67d2874a8 100644
--- a/apps/web-ele/src/views/mes/dv/checkrecord/modules/form.vue
+++ b/apps/web-ele/src/views/mes/dv/checkrecord/modules/form.vue
@@ -103,7 +103,6 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
     // 加载数据
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
     formType.value = data.formType;
diff --git a/apps/web-ele/src/views/mes/dv/machinery/modules/form.vue b/apps/web-ele/src/views/mes/dv/machinery/modules/form.vue
index 524946e24..e8727173a 100644
--- a/apps/web-ele/src/views/mes/dv/machinery/modules/form.vue
+++ b/apps/web-ele/src/views/mes/dv/machinery/modules/form.vue
@@ -47,9 +47,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formType.value, formApi) });
-
 /** 查看设备条码 */
 function handleBarcode() {
   if (!formData.value?.id) {
@@ -91,7 +88,6 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
     subTabsName.value = 'check';
     // 加载数据
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
diff --git a/apps/web-ele/src/views/mes/dv/machinery/type/modules/form.vue b/apps/web-ele/src/views/mes/dv/machinery/type/modules/form.vue
index 5a3aae39c..d7357471e 100644
--- a/apps/web-ele/src/views/mes/dv/machinery/type/modules/form.vue
+++ b/apps/web-ele/src/views/mes/dv/machinery/type/modules/form.vue
@@ -38,9 +38,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     const { valid } = await formApi.validate();
@@ -67,7 +64,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     // 加载数据
     const data = modalApi.getData<MesDvMachineryTypeApi.MachineryType>();
     if (!data || !data.id) {
diff --git a/apps/web-ele/src/views/mes/dv/maintenrecord/modules/form.vue b/apps/web-ele/src/views/mes/dv/maintenrecord/modules/form.vue
index 02158e5cd..5211903a8 100644
--- a/apps/web-ele/src/views/mes/dv/maintenrecord/modules/form.vue
+++ b/apps/web-ele/src/views/mes/dv/maintenrecord/modules/form.vue
@@ -110,7 +110,6 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
     // 加载数据
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
     formType.value = data.formType;
diff --git a/apps/web-ele/src/views/mes/dv/repair/modules/form.vue b/apps/web-ele/src/views/mes/dv/repair/modules/form.vue
index fcff4d0ea..695138673 100644
--- a/apps/web-ele/src/views/mes/dv/repair/modules/form.vue
+++ b/apps/web-ele/src/views/mes/dv/repair/modules/form.vue
@@ -57,9 +57,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 /** 提交维修工单 */
 async function handleSubmit() {
   const { valid } = await formApi.validate();
@@ -164,7 +161,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     // 加载数据
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
     formType.value = data.formType;
diff --git a/apps/web-ele/src/views/mes/dv/subject/modules/form.vue b/apps/web-ele/src/views/mes/dv/subject/modules/form.vue
index abdb412be..82e0bc189 100644
--- a/apps/web-ele/src/views/mes/dv/subject/modules/form.vue
+++ b/apps/web-ele/src/views/mes/dv/subject/modules/form.vue
@@ -39,9 +39,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     if (isDetail.value) {
@@ -69,7 +66,7 @@ const [Modal, modalApi] = useVbenModal({
     if (!isOpen) {
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     // 加载数据
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
     formType.value = data.formType;
diff --git a/apps/web-ele/src/views/mes/md/autocode/modules/form.vue b/apps/web-ele/src/views/mes/md/autocode/modules/form.vue
index a87d7b7ec..50b0261db 100644
--- a/apps/web-ele/src/views/mes/md/autocode/modules/form.vue
+++ b/apps/web-ele/src/views/mes/md/autocode/modules/form.vue
@@ -76,7 +76,6 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
     // 加载数据
     const data = modalApi.getData<MesMdAutoCodeRuleApi.AutoCodeRule>();
     if (!data?.id) {
diff --git a/apps/web-ele/src/views/mes/md/autocode/modules/part-form.vue b/apps/web-ele/src/views/mes/md/autocode/modules/part-form.vue
index ee839560a..efc1e95a1 100644
--- a/apps/web-ele/src/views/mes/md/autocode/modules/part-form.vue
+++ b/apps/web-ele/src/views/mes/md/autocode/modules/part-form.vue
@@ -86,7 +86,6 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
     // 加载数据
     const data = modalApi.getData<{
       id?: number;
diff --git a/apps/web-ele/src/views/mes/md/client/modules/form.vue b/apps/web-ele/src/views/mes/md/client/modules/form.vue
index 3d22f5f4e..1b66c01c5 100644
--- a/apps/web-ele/src/views/mes/md/client/modules/form.vue
+++ b/apps/web-ele/src/views/mes/md/client/modules/form.vue
@@ -44,9 +44,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     if (isDetail.value) {
@@ -75,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     subTabsName.value = 'productSalesLine';
     // 加载数据
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
diff --git a/apps/web-ele/src/views/mes/md/item/modules/form.vue b/apps/web-ele/src/views/mes/md/item/modules/form.vue
index 913e02eec..101113e24 100644
--- a/apps/web-ele/src/views/mes/md/item/modules/form.vue
+++ b/apps/web-ele/src/views/mes/md/item/modules/form.vue
@@ -52,9 +52,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 /** 查看物料条码 */
 function handleBarcode() {
   if (!formData.value?.id) {
@@ -103,7 +100,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     subTabsName.value = 'bom';
     // 加载数据
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
diff --git a/apps/web-ele/src/views/mes/md/item/type/modules/form.vue b/apps/web-ele/src/views/mes/md/item/type/modules/form.vue
index 580690139..7c6f7328d 100644
--- a/apps/web-ele/src/views/mes/md/item/type/modules/form.vue
+++ b/apps/web-ele/src/views/mes/md/item/type/modules/form.vue
@@ -38,9 +38,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     const { valid } = await formApi.validate();
@@ -65,7 +62,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     // 加载数据
     const data = modalApi.getData<MesMdItemTypeApi.ItemType>();
     if (!data || !data.id) {
diff --git a/apps/web-ele/src/views/mes/md/unitmeasure/modules/form.vue b/apps/web-ele/src/views/mes/md/unitmeasure/modules/form.vue
index dc5eb9cdf..1167c4195 100644
--- a/apps/web-ele/src/views/mes/md/unitmeasure/modules/form.vue
+++ b/apps/web-ele/src/views/mes/md/unitmeasure/modules/form.vue
@@ -68,7 +68,6 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
     // 加载数据
     const data = modalApi.getData<MesMdUnitMeasureApi.UnitMeasure>();
     if (!data || !data.id) {
diff --git a/apps/web-ele/src/views/mes/md/vendor/modules/form.vue b/apps/web-ele/src/views/mes/md/vendor/modules/form.vue
index 433e7f8dc..66c020901 100644
--- a/apps/web-ele/src/views/mes/md/vendor/modules/form.vue
+++ b/apps/web-ele/src/views/mes/md/vendor/modules/form.vue
@@ -46,9 +46,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     if (isDetail.value) {
@@ -77,7 +74,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     subTabsName.value = 'itemReceiptLine';
     // 加载数据
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
diff --git a/apps/web-ele/src/views/mes/md/workstation/modules/form.vue b/apps/web-ele/src/views/mes/md/workstation/modules/form.vue
index b9d2e87ae..0e24bae46 100644
--- a/apps/web-ele/src/views/mes/md/workstation/modules/form.vue
+++ b/apps/web-ele/src/views/mes/md/workstation/modules/form.vue
@@ -52,9 +52,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 /** 查看工作站条码 */
 function handleBarcode() {
   if (!formData.value?.id) {
@@ -102,7 +99,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     subTabsName.value = 'machine';
     // 加载数据
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
diff --git a/apps/web-ele/src/views/mes/md/workstation/workshop/modules/form.vue b/apps/web-ele/src/views/mes/md/workstation/workshop/modules/form.vue
index 191bbbd94..3f8fe45cd 100644
--- a/apps/web-ele/src/views/mes/md/workstation/workshop/modules/form.vue
+++ b/apps/web-ele/src/views/mes/md/workstation/workshop/modules/form.vue
@@ -48,9 +48,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 /** 查看车间条码 */
 function handleBarcode() {
   if (!formData.value?.id) {
@@ -92,7 +89,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     // 加载数据
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
     formType.value = data.formType;
diff --git a/apps/web-ele/src/views/mes/pro/andon/record/modules/form.vue b/apps/web-ele/src/views/mes/pro/andon/record/modules/form.vue
index 83261cd22..7963930d5 100644
--- a/apps/web-ele/src/views/mes/pro/andon/record/modules/form.vue
+++ b/apps/web-ele/src/views/mes/pro/andon/record/modules/form.vue
@@ -49,9 +49,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formType.value, formApi) });
-
 /** 处置：保存（保持 ACTIVE 状态） */
 async function handleSave() {
   modalApi.lock();
@@ -136,7 +133,6 @@ const [Modal, modalApi] = useVbenModal({
     formType.value = data.formType;
     formApi.setState({ schema: useFormSchema(formType.value, formApi) });
     modalApi.setState({ showConfirmButton: formType.value === 'create' });
-    await formApi.resetForm();
     if (formType.value === 'create') {
       // 新增时，发起人默认为当前用户
       await formApi.setValues({ userId: userStore.userInfo?.id });
diff --git a/apps/web-ele/src/views/mes/pro/feedback/modules/form.vue b/apps/web-ele/src/views/mes/pro/feedback/modules/form.vue
index 91896b74c..879223439 100644
--- a/apps/web-ele/src/views/mes/pro/feedback/modules/form.vue
+++ b/apps/web-ele/src/views/mes/pro/feedback/modules/form.vue
@@ -88,9 +88,6 @@ const [Form, formApi] = useVbenForm({
   wrapperClass: 'grid-cols-3',
 });
 
-/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formType.value, formApi) });
-
 /** 提交前对齐数量：根据 checkFlag 决定 uncheck/合格/不良归零策略 */
 function alignQuantity(data: MesProFeedbackApi.Feedback) {
   if (data.checkFlag) {
@@ -247,7 +244,6 @@ const [Modal, modalApi] = useVbenModal({
       showConfirmButton:
         formType.value !== 'detail' && formType.value !== 'approve',
     });
-    await formApi.resetForm();
     if (!data?.id) {
       // 新增：默认报工人和报工时间，并自动生成报工单号
       const code = await generateAutoCode(
diff --git a/apps/web-ele/src/views/mes/pro/process/modules/content-form.vue b/apps/web-ele/src/views/mes/pro/process/modules/content-form.vue
index 46544dccd..62675bdb2 100644
--- a/apps/web-ele/src/views/mes/pro/process/modules/content-form.vue
+++ b/apps/web-ele/src/views/mes/pro/process/modules/content-form.vue
@@ -65,7 +65,6 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
     // 加载数据
     const data = modalApi.getData<{
       id?: number;
diff --git a/apps/web-ele/src/views/mes/pro/process/modules/form.vue b/apps/web-ele/src/views/mes/pro/process/modules/form.vue
index 4afb9aa04..451f6d6a8 100644
--- a/apps/web-ele/src/views/mes/pro/process/modules/form.vue
+++ b/apps/web-ele/src/views/mes/pro/process/modules/form.vue
@@ -48,9 +48,6 @@ const [Form, formApi] = useVbenForm({
   wrapperClass: 'grid-cols-3',
 });
 
-/** 表单 schema 需要 formApi 引用（生成编码按钮），所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     if (isDetail.value) {
@@ -79,7 +76,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     // 加载数据
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
     formType.value = data.formType;
diff --git a/apps/web-ele/src/views/mes/pro/route/modules/bom-form.vue b/apps/web-ele/src/views/mes/pro/route/modules/bom-form.vue
index e348b31b4..5feeb51f3 100644
--- a/apps/web-ele/src/views/mes/pro/route/modules/bom-form.vue
+++ b/apps/web-ele/src/views/mes/pro/route/modules/bom-form.vue
@@ -78,7 +78,6 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
     // 加载数据
     const data = modalApi.getData<{
       id?: number;
diff --git a/apps/web-ele/src/views/mes/pro/route/modules/form.vue b/apps/web-ele/src/views/mes/pro/route/modules/form.vue
index ce15b7657..105b7aee7 100644
--- a/apps/web-ele/src/views/mes/pro/route/modules/form.vue
+++ b/apps/web-ele/src/views/mes/pro/route/modules/form.vue
@@ -44,9 +44,6 @@ const [Form, formApi] = useVbenForm({
   wrapperClass: 'grid-cols-2',
 });
 
-/** 表单 schema 需要 formApi 引用（生成编码按钮），所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     if (isDetail.value) {
@@ -82,7 +79,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     subTab.value = 'process';
     // 加载数据
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
diff --git a/apps/web-ele/src/views/mes/pro/route/modules/process-form.vue b/apps/web-ele/src/views/mes/pro/route/modules/process-form.vue
index eb5fe30a0..af5e2938f 100644
--- a/apps/web-ele/src/views/mes/pro/route/modules/process-form.vue
+++ b/apps/web-ele/src/views/mes/pro/route/modules/process-form.vue
@@ -81,7 +81,6 @@ const [Modal, modalApi] = useVbenModal({
       // 工序下拉依赖远程数据，schema 在弹窗打开时再生成
       const schema = await loadSchema();
       formApi.setState({ schema });
-      await formApi.resetForm();
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-ele/src/views/mes/pro/route/modules/product-form.vue b/apps/web-ele/src/views/mes/pro/route/modules/product-form.vue
index f07c1a532..626506762 100644
--- a/apps/web-ele/src/views/mes/pro/route/modules/product-form.vue
+++ b/apps/web-ele/src/views/mes/pro/route/modules/product-form.vue
@@ -83,7 +83,6 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
     // 加载数据
     const data = modalApi.getData<{
       id?: number;
diff --git a/apps/web-ele/src/views/mes/qc/defect/modules/form.vue b/apps/web-ele/src/views/mes/qc/defect/modules/form.vue
index 0b0ce0cd6..7041c3d9e 100644
--- a/apps/web-ele/src/views/mes/qc/defect/modules/form.vue
+++ b/apps/web-ele/src/views/mes/qc/defect/modules/form.vue
@@ -34,9 +34,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用（生成编码按钮），所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     const { valid } = await formApi.validate();
@@ -61,7 +58,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     // 加载数据
     const data = modalApi.getData<MesQcDefectApi.Defect>();
     if (!data || !data.id) {
diff --git a/apps/web-ele/src/views/mes/qc/indicator/modules/form.vue b/apps/web-ele/src/views/mes/qc/indicator/modules/form.vue
index 72ed12284..98444ed27 100644
--- a/apps/web-ele/src/views/mes/qc/indicator/modules/form.vue
+++ b/apps/web-ele/src/views/mes/qc/indicator/modules/form.vue
@@ -38,9 +38,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用（生成编码、跨字段联动），所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     const { valid } = await formApi.validate();
@@ -67,7 +64,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     // 加载数据
     const data = modalApi.getData<MesQcIndicatorApi.Indicator>();
     if (!data || !data.id) {
diff --git a/apps/web-ele/src/views/mes/qc/template/modules/form.vue b/apps/web-ele/src/views/mes/qc/template/modules/form.vue
index bfedadfc5..53672d7fa 100644
--- a/apps/web-ele/src/views/mes/qc/template/modules/form.vue
+++ b/apps/web-ele/src/views/mes/qc/template/modules/form.vue
@@ -49,9 +49,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用（生成编码按钮），所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     if (formType.value === 'detail') {
@@ -80,7 +77,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     subTabsName.value = 'indicator';
     // 加载数据
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
diff --git a/apps/web-ele/src/views/mes/qc/template/modules/indicator-form.vue b/apps/web-ele/src/views/mes/qc/template/modules/indicator-form.vue
index 073ff2ca7..31581cd0a 100644
--- a/apps/web-ele/src/views/mes/qc/template/modules/indicator-form.vue
+++ b/apps/web-ele/src/views/mes/qc/template/modules/indicator-form.vue
@@ -69,7 +69,6 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
     // 加载数据
     const data = modalApi.getData<
       MesQcTemplateIndicatorApi.TemplateIndicator & { templateId: number }
diff --git a/apps/web-ele/src/views/mes/qc/template/modules/item-form.vue b/apps/web-ele/src/views/mes/qc/template/modules/item-form.vue
index 12df446f9..9a5f25a5e 100644
--- a/apps/web-ele/src/views/mes/qc/template/modules/item-form.vue
+++ b/apps/web-ele/src/views/mes/qc/template/modules/item-form.vue
@@ -69,7 +69,6 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
     // 加载数据
     const data = modalApi.getData<
       MesQcTemplateItemApi.TemplateItem & { templateId: number }
diff --git a/apps/web-ele/src/views/mes/tm/tool/modules/form.vue b/apps/web-ele/src/views/mes/tm/tool/modules/form.vue
index 8ab516ab1..ccb2b405e 100644
--- a/apps/web-ele/src/views/mes/tm/tool/modules/form.vue
+++ b/apps/web-ele/src/views/mes/tm/tool/modules/form.vue
@@ -46,9 +46,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 /** 查看工具条码 */
 function handleBarcode() {
   if (!formData.value?.id) {
@@ -90,7 +87,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     // 加载数据
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
     formType.value = data.formType;
diff --git a/apps/web-ele/src/views/mes/tm/tool/type/modules/form.vue b/apps/web-ele/src/views/mes/tm/tool/type/modules/form.vue
index e9a3cc46f..99a3d1730 100644
--- a/apps/web-ele/src/views/mes/tm/tool/type/modules/form.vue
+++ b/apps/web-ele/src/views/mes/tm/tool/type/modules/form.vue
@@ -43,9 +43,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     if (isDetail.value) {
@@ -74,7 +71,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     // 加载数据
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
     formType.value = data.formType;
diff --git a/apps/web-ele/src/views/mes/utils/constants.ts b/apps/web-ele/src/views/mes/utils/constants.ts
index 15993c32a..d931e83d1 100644
--- a/apps/web-ele/src/views/mes/utils/constants.ts
+++ b/apps/web-ele/src/views/mes/utils/constants.ts
@@ -141,6 +141,8 @@ export const MesAutoCodeRuleCode = {
   PRO_WORK_ORDER_CODE: 'PRO_WORK_ORDER_CODE',
   QC_DEFECT_CODE: 'QC_DEFECT_CODE',
   QC_INDICATOR_CODE: 'QC_INDICATOR_CODE',
+  QC_INDICATOR_RESULT_CODE: 'QC_INDICATOR_RESULT_CODE',
+  QC_IQC_CODE: 'QC_IQC_CODE',
   QC_TEMPLATE_CODE: 'QC_TEMPLATE_CODE',
   TM_TOOL_TYPE_CODE: 'TM_TOOL_TYPE_CODE',
   TM_TOOL_CODE: 'TM_TOOL_CODE',
@@ -215,6 +217,47 @@ export const MesQcResultValueType = {
   FILE: 5,
 } as const;
 
+/** MES 业务类型常量 */
+export const MesBizTypeEnum = {
+  // WM 仓库模块 [100, 200)
+  WM_ARRIVAL_NOTICE: 100, // 到货通知单
+  WM_RETURN_ISSUE: 116, // 生产退料
+  WM_PRODUCT_SALES: 118, // 销售出库
+  WM_RETURN_SALES: 119, // 销售退货入库
+  WM_OUTSOURCE_RECPT: 121, // 外协入库
+
+  // PRO 生产模块 [300, 400)
+  PRO_FEEDBACK: 304, // 生产报工
+} as const;
+
+/** MES 质检来源单据类型枚举 */
+export const MesQcSourceDocTypeEnum = {
+  // IQC
+  ARRIVAL_NOTICE: MesBizTypeEnum.WM_ARRIVAL_NOTICE,
+  OUTSOURCE_RECPT: MesBizTypeEnum.WM_OUTSOURCE_RECPT,
+  // IPQC
+  PRO_FEEDBACK: MesBizTypeEnum.PRO_FEEDBACK,
+  // OQC
+  PRODUCT_SALES: MesBizTypeEnum.WM_PRODUCT_SALES,
+  // RQC
+  RETURN_ISSUE: MesBizTypeEnum.WM_RETURN_ISSUE,
+  RETURN_SALES: MesBizTypeEnum.WM_RETURN_SALES,
+} as const;
+
+/** MES 质检类型枚举 */
+export const MesQcTypeEnum = {
+  IQC: 1, // 来料检验
+  IPQC: 2, // 过程检验
+  OQC: 3, // 出货检验
+  RQC: 4, // 退货检验
+} as const;
+
+/** MES 质检单状态枚举 */
+export const MesQcStatusEnum = {
+  DRAFT: MesOrderStatusConstants.DRAFT,
+  FINISHED: MesOrderStatusConstants.FINISHED,
+} as const;
+
 /** MES 编码规则分段类型枚举 */
 export const MesAutoCodePartTypeEnum = {
   INPUT: 1,
diff --git a/apps/web-ele/src/views/wms/md/item/brand/data.ts b/apps/web-ele/src/views/wms/md/item/brand/data.ts
index cebea33e7..692c23138 100644
--- a/apps/web-ele/src/views/wms/md/item/brand/data.ts
+++ b/apps/web-ele/src/views/wms/md/item/brand/data.ts
@@ -1,4 +1,4 @@
-import type { VbenFormSchema } from '#/adapter/form';
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
 import { h } from 'vue';
@@ -9,7 +9,7 @@ import { z } from '#/adapter/form';
 import { generateWmsCode } from '#/views/wms/utils/constants';
 
 /** 新增/修改商品品牌的表单 */
-export function useFormSchema(formApi?: any): VbenFormSchema[] {
+export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
   return [
     {
       component: 'Input',
diff --git a/apps/web-ele/src/views/wms/md/item/brand/modules/form.vue b/apps/web-ele/src/views/wms/md/item/brand/modules/form.vue
index 2630f0493..193796eae 100644
--- a/apps/web-ele/src/views/wms/md/item/brand/modules/form.vue
+++ b/apps/web-ele/src/views/wms/md/item/brand/modules/form.vue
@@ -39,9 +39,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     const { valid } = await formApi.validate();
@@ -66,7 +63,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     const data = modalApi.getData<WmsItemBrandApi.ItemBrand>();
     if (!data || !data.id) {
       return;
diff --git a/apps/web-ele/src/views/wms/md/item/category/data.ts b/apps/web-ele/src/views/wms/md/item/category/data.ts
index e6e536434..be1da0778 100644
--- a/apps/web-ele/src/views/wms/md/item/category/data.ts
+++ b/apps/web-ele/src/views/wms/md/item/category/data.ts
@@ -1,4 +1,4 @@
-import type { VbenFormSchema } from '#/adapter/form';
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { WmsItemCategoryApi } from '#/api/wms/md/item/category';
 
@@ -15,7 +15,7 @@ import { getItemCategorySimpleList } from '#/api/wms/md/item/category';
 import { generateWmsCode } from '#/views/wms/utils/constants';
 
 /** 新增/修改商品分类的表单 */
-export function useFormSchema(formApi?: any): VbenFormSchema[] {
+export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
diff --git a/apps/web-ele/src/views/wms/md/item/category/modules/form.vue b/apps/web-ele/src/views/wms/md/item/category/modules/form.vue
index ec7b39937..369398247 100644
--- a/apps/web-ele/src/views/wms/md/item/category/modules/form.vue
+++ b/apps/web-ele/src/views/wms/md/item/category/modules/form.vue
@@ -41,9 +41,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     const { valid } = await formApi.validate();
@@ -70,7 +67,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     const data = modalApi.getData<WmsItemCategoryApi.ItemCategory>();
     if (!data || !data.id) {
       formData.value = data;
diff --git a/apps/web-ele/src/views/wms/md/item/data.ts b/apps/web-ele/src/views/wms/md/item/data.ts
index 0e0fb4042..e8463a57a 100644
--- a/apps/web-ele/src/views/wms/md/item/data.ts
+++ b/apps/web-ele/src/views/wms/md/item/data.ts
@@ -1,4 +1,4 @@
-import type { VbenFormSchema } from '#/adapter/form';
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
 import { h, markRaw } from 'vue';
@@ -13,7 +13,7 @@ import { WmsItemBrandSelect } from './brand/components';
 import { WmsItemCategorySelect } from './category/components';
 
 /** 新增/修改商品的表单 */
-export function useFormSchema(formApi?: any): VbenFormSchema[] {
+export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
   return [
     {
       component: 'Input',
diff --git a/apps/web-ele/src/views/wms/md/item/modules/form.vue b/apps/web-ele/src/views/wms/md/item/modules/form.vue
index 87ec84ba6..67f42d878 100644
--- a/apps/web-ele/src/views/wms/md/item/modules/form.vue
+++ b/apps/web-ele/src/views/wms/md/item/modules/form.vue
@@ -38,9 +38,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 async function resetSkuForm(item?: WmsItemApi.Item) {
   await nextTick();
   await skuFormRef.value?.setRows(item?.skus);
@@ -77,7 +74,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     await resetSkuForm();
     // 加载数据
     const data = modalApi.getData<WmsItemApi.Item>();
diff --git a/apps/web-ele/src/views/wms/md/merchant/data.ts b/apps/web-ele/src/views/wms/md/merchant/data.ts
index 95903f7b1..189c6870b 100644
--- a/apps/web-ele/src/views/wms/md/merchant/data.ts
+++ b/apps/web-ele/src/views/wms/md/merchant/data.ts
@@ -1,4 +1,4 @@
-import type { VbenFormSchema } from '#/adapter/form';
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
 import { h } from 'vue';
@@ -12,7 +12,7 @@ import { z } from '#/adapter/form';
 import { generateWmsCode } from '#/views/wms/utils/constants';
 
 /** 新增/修改往来企业的表单 */
-export function useFormSchema(formApi?: any): VbenFormSchema[] {
+export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
   return [
     {
       component: 'Input',
diff --git a/apps/web-ele/src/views/wms/md/merchant/modules/form.vue b/apps/web-ele/src/views/wms/md/merchant/modules/form.vue
index 2e4e2807f..bdefaa2c8 100644
--- a/apps/web-ele/src/views/wms/md/merchant/modules/form.vue
+++ b/apps/web-ele/src/views/wms/md/merchant/modules/form.vue
@@ -40,9 +40,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     const { valid } = await formApi.validate();
@@ -67,7 +64,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    formApi.setState({ schema: useFormSchema(formApi) });
     const data = modalApi.getData<WmsMerchantApi.Merchant>();
     if (!data || !data.id) {
       return;
diff --git a/apps/web-ele/src/views/wms/md/warehouse/data.ts b/apps/web-ele/src/views/wms/md/warehouse/data.ts
index 42cca9655..0803bf321 100644
--- a/apps/web-ele/src/views/wms/md/warehouse/data.ts
+++ b/apps/web-ele/src/views/wms/md/warehouse/data.ts
@@ -1,4 +1,4 @@
-import type { VbenFormSchema } from '#/adapter/form';
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
 import { h } from 'vue';
@@ -9,7 +9,7 @@ import { z } from '#/adapter/form';
 import { generateWmsCode } from '#/views/wms/utils/constants';
 
 /** 新增/修改仓库的表单 */
-export function useFormSchema(formApi?: any): VbenFormSchema[] {
+export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
   return [
     {
       component: 'Input',
diff --git a/apps/web-ele/src/views/wms/md/warehouse/modules/form.vue b/apps/web-ele/src/views/wms/md/warehouse/modules/form.vue
index 93709fe89..985092a7f 100644
--- a/apps/web-ele/src/views/wms/md/warehouse/modules/form.vue
+++ b/apps/web-ele/src/views/wms/md/warehouse/modules/form.vue
@@ -40,9 +40,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi) });
-
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     const { valid } = await formApi.validate();
@@ -69,6 +66,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
+    formApi.setState({ schema: useFormSchema(formApi) });
     const data = modalApi.getData<WmsWarehouseApi.Warehouse>();
     if (!data || !data.id) {
       await formApi.setValues({ sort: 0 });
diff --git a/apps/web-ele/src/views/wms/order/check/modules/form.vue b/apps/web-ele/src/views/wms/order/check/modules/form.vue
index b7dfb9c21..fb259a46d 100644
--- a/apps/web-ele/src/views/wms/order/check/modules/form.vue
+++ b/apps/web-ele/src/views/wms/order/check/modules/form.vue
@@ -535,7 +535,6 @@ const [Modal, modalApi] = useVbenModal({
       setDetails([]);
       return;
     }
-    await formApi.resetForm();
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
     formType.value = data.formType;
     if (data?.id) {
diff --git a/apps/web-ele/src/views/wms/order/movement/modules/form.vue b/apps/web-ele/src/views/wms/order/movement/modules/form.vue
index 596e61d7e..148277c07 100644
--- a/apps/web-ele/src/views/wms/order/movement/modules/form.vue
+++ b/apps/web-ele/src/views/wms/order/movement/modules/form.vue
@@ -373,7 +373,6 @@ const [Modal, modalApi] = useVbenModal({
       setDetails([]);
       return;
     }
-    await formApi.resetForm();
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
     formType.value = data.formType;
     if (data?.id) {
diff --git a/apps/web-ele/src/views/wms/order/receipt/modules/form.vue b/apps/web-ele/src/views/wms/order/receipt/modules/form.vue
index 0597d0230..72fdb7369 100644
--- a/apps/web-ele/src/views/wms/order/receipt/modules/form.vue
+++ b/apps/web-ele/src/views/wms/order/receipt/modules/form.vue
@@ -317,7 +317,6 @@ const [Modal, modalApi] = useVbenModal({
       setDetails([]);
       return;
     }
-    await formApi.resetForm();
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
     formType.value = data.formType;
     if (data?.id) {
diff --git a/apps/web-ele/src/views/wms/order/shipment/modules/form.vue b/apps/web-ele/src/views/wms/order/shipment/modules/form.vue
index 12c0e7ef1..19fa19fa1 100644
--- a/apps/web-ele/src/views/wms/order/shipment/modules/form.vue
+++ b/apps/web-ele/src/views/wms/order/shipment/modules/form.vue
@@ -360,7 +360,6 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     initializing.value = true;
-    await formApi.resetForm();
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
     formType.value = data.formType;
     if (data?.id) {
diff --git a/packages/constants/src/dict-enum.ts b/packages/constants/src/dict-enum.ts
index 19cba23c0..43ab651a8 100644
--- a/packages/constants/src/dict-enum.ts
+++ b/packages/constants/src/dict-enum.ts
@@ -216,6 +216,8 @@ const MES_DICT = {
   MES_INDICATOR_TYPE: 'mes_indicator_type', // MES 检测项类型
   MES_QC_RESULT_TYPE: 'mes_qc_result_type', // MES 质检结果值类型
   MES_QC_TYPE: 'mes_qc_type', // MES 质检方案类型
+  MES_QC_CHECK_RESULT: 'mes_qc_check_result', // MES 检测结果
+  MES_QC_SOURCE_DOC_TYPE: 'mes_qc_source_doc_type', // MES 来源单据类型
   MES_DEFECT_LEVEL: 'mes_defect_level', // MES 缺陷等级
   MES_WM_BARCODE_BIZ_TYPE: 'mes_wm_barcode_biz_type', // MES 条码业务类型
   MES_WM_BARCODE_FORMAT: 'mes_wm_barcode_format', // MES 条码格式

From abc8789fe3601b690c464f4c193c88841d9ddb2e Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 29 May 2026 15:54:58 +0800
Subject: [PATCH 07/52] =?UTF-8?q?`feat(mes-qc):=20=E8=BF=81=E7=A7=BB=20ant?=
 =?UTF-8?q?d=20=E6=9D=A5=E6=96=99=E6=A3=80=E9=AA=8C=E5=8F=8A=E6=A3=80?=
 =?UTF-8?q?=E6=B5=8B=E7=BB=93=E6=9E=9C=E3=80=81=E7=BC=BA=E9=99=B7=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E7=BB=84=E4=BB=B6`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/defect-record-inline-form.vue  | 165 ++++++
 .../components/defect-record-inline-list.vue  | 215 ++++++++
 .../mes/qc/defectrecord/components/index.ts   |   2 +
 .../qc/indicatorresult/components/index.ts    |   2 +
 .../components/qc-indicator-result-form.vue   | 270 ++++++++++
 .../components/qc-indicator-result-list.vue   | 156 ++++++
 apps/web-antd/src/views/mes/qc/iqc/data.ts    | 508 ++++++++++++++++++
 apps/web-antd/src/views/mes/qc/iqc/index.vue  | 167 ++++++
 .../src/views/mes/qc/iqc/modules/form.vue     | 244 +++++++++
 .../views/mes/qc/iqc/modules/line-list.vue    |  97 ++++
 10 files changed, 1826 insertions(+)
 create mode 100644 apps/web-antd/src/views/mes/qc/defectrecord/components/defect-record-inline-form.vue
 create mode 100644 apps/web-antd/src/views/mes/qc/defectrecord/components/defect-record-inline-list.vue
 create mode 100644 apps/web-antd/src/views/mes/qc/defectrecord/components/index.ts
 create mode 100644 apps/web-antd/src/views/mes/qc/indicatorresult/components/index.ts
 create mode 100644 apps/web-antd/src/views/mes/qc/indicatorresult/components/qc-indicator-result-form.vue
 create mode 100644 apps/web-antd/src/views/mes/qc/indicatorresult/components/qc-indicator-result-list.vue
 create mode 100644 apps/web-antd/src/views/mes/qc/iqc/data.ts
 create mode 100644 apps/web-antd/src/views/mes/qc/iqc/index.vue
 create mode 100644 apps/web-antd/src/views/mes/qc/iqc/modules/form.vue
 create mode 100644 apps/web-antd/src/views/mes/qc/iqc/modules/line-list.vue

diff --git a/apps/web-antd/src/views/mes/qc/defectrecord/components/defect-record-inline-form.vue b/apps/web-antd/src/views/mes/qc/defectrecord/components/defect-record-inline-form.vue
new file mode 100644
index 000000000..874b078e0
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/defectrecord/components/defect-record-inline-form.vue
@@ -0,0 +1,165 @@
+<script lang="ts" setup>
+import type { MesQcDefectRecordApi } from '#/api/mes/qc/defectrecord';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createDefectRecord,
+  getDefectRecord,
+  updateDefectRecord,
+} from '#/api/mes/qc/defectrecord';
+import { $t } from '#/locales';
+
+interface OpenData {
+  formType: 'create' | 'update';
+  id?: number;
+  lineId: number;
+  qcId: number;
+  qcType: number;
+}
+
+defineOptions({ name: 'DefectRecordInlineForm' });
+
+const emit = defineEmits(['success']);
+// TODO @AI：这里，别的模块，一般是要枚举 create、update 么？
+const formType = ref<'create' | 'update'>('create');
+const formData = ref<MesQcDefectRecordApi.DefectRecord>();
+
+const getTitle = computed(() =>
+  formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['缺陷记录'])
+    : $t('ui.actionTitle.create', ['缺陷记录']),
+);
+
+// TODO @AI：搞个 data.ts？
+// TODO @AI：代码风格，貌似不够一致；
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 90,
+  },
+  layout: 'horizontal',
+  schema: [
+    {
+      fieldName: 'name',
+      label: '缺陷描述',
+      component: 'Textarea',
+      formItemClass: 'col-span-2',
+      componentProps: {
+        placeholder: '请输入缺陷描述',
+        rows: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'level',
+      label: '缺陷等级',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_DEFECT_LEVEL, 'number'),
+        placeholder: '请选择缺陷等级',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'quantity',
+      label: '缺陷数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 1,
+        placeholder: '请输入缺陷数量',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Input',
+      formItemClass: 'col-span-2',
+      componentProps: {
+        placeholder: '请输入备注',
+      },
+    },
+  ],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-2',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (!formData.value) {
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      const values =
+        (await formApi.getValues()) as MesQcDefectRecordApi.DefectRecord;
+      const payload: MesQcDefectRecordApi.DefectRecord = {
+        ...values,
+        lineId: formData.value.lineId,
+        qcId: formData.value.qcId,
+        qcType: formData.value.qcType,
+      };
+      if (formType.value === 'update') {
+        await updateDefectRecord({ ...payload, id: formData.value.id });
+        message.success($t('common.updateSuccess'));
+      } else {
+        await createDefectRecord(payload);
+        message.success($t('common.createSuccess'));
+      }
+      await modalApi.close();
+      emit('success');
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    const data = modalApi.getData<OpenData>();
+    formType.value = data.formType;
+    if (data.id) {
+      // 编辑：根据 id 加载明细
+      modalApi.lock();
+      try {
+        formData.value = await getDefectRecord(data.id);
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    } else {
+      // 新增：保留来自父级的上下文，并默认数量为 1
+      formData.value = {
+        lineId: data.lineId,
+        qcId: data.qcId,
+        qcType: data.qcType,
+      };
+      await formApi.setValues({ quantity: 1 });
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-2/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/qc/defectrecord/components/defect-record-inline-list.vue b/apps/web-antd/src/views/mes/qc/defectrecord/components/defect-record-inline-list.vue
new file mode 100644
index 000000000..7e740bdc8
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/defectrecord/components/defect-record-inline-list.vue
@@ -0,0 +1,215 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcDefectRecordApi } from '#/api/mes/qc/defectrecord';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+import { DICT_TYPE } from '@vben/constants';
+
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteDefectRecord,
+  getDefectRecordPage,
+} from '#/api/mes/qc/defectrecord';
+import { $t } from '#/locales';
+
+import DefectRecordInlineForm from './defect-record-inline-form.vue';
+
+defineOptions({ name: 'DefectRecordInlineList' });
+
+const emit = defineEmits(['success']);
+
+// TODO @AI：改成 QcData？？？
+interface OpenData {
+  formType?: string;
+  lineId: number;
+  qcId: number;
+  qcType: number;
+}
+
+const qcData = ref<OpenData>();
+const isReadonly = computed(() => qcData.value?.formType === 'detail');
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+  emit('success');
+}
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: DefectRecordInlineForm,
+  destroyOnClose: true,
+});
+
+/** 新增缺陷 */
+function handleCreate() {
+  if (!qcData.value) {
+    return;
+  }
+  formModalApi
+    .setData({
+      formType: 'create',
+      lineId: qcData.value.lineId,
+      qcId: qcData.value.qcId,
+      qcType: qcData.value.qcType,
+    })
+    .open();
+}
+
+/** 编辑缺陷 */
+function handleEdit(row: MesQcDefectRecordApi.DefectRecord) {
+  if (!qcData.value) {
+    return;
+  }
+  formModalApi
+    .setData({
+      formType: 'update',
+      id: row.id,
+      lineId: qcData.value.lineId,
+      qcId: qcData.value.qcId,
+      qcType: qcData.value.qcType,
+    })
+    .open();
+}
+
+/** 删除缺陷 */
+async function handleDelete(row: MesQcDefectRecordApi.DefectRecord) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.name]),
+    duration: 0,
+  });
+  try {
+    await deleteDefectRecord(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.name]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+// TODO @AI：搞个 data.ts？
+// TODO @AI：代码风格，貌似不够一致；
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: [
+      {
+        field: 'name',
+        title: '缺陷描述',
+        minWidth: 200,
+      },
+      {
+        field: 'level',
+        title: '缺陷等级',
+        width: 120,
+        cellRender: {
+          name: 'CellDict',
+          props: { type: DICT_TYPE.MES_DEFECT_LEVEL },
+        },
+      },
+      {
+        field: 'quantity',
+        title: '缺陷数量',
+        width: 100,
+      },
+      {
+        field: 'remark',
+        title: '备注',
+        minWidth: 150,
+      },
+      {
+        title: '操作',
+        width: 130,
+        fixed: 'right',
+        slots: { default: 'actions' },
+      },
+    ],
+    height: 320,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!qcData.value) {
+            return { list: [], total: 0 };
+          }
+          return await getDefectRecordPage({
+            lineId: qcData.value.lineId,
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            qcId: qcData.value.qcId,
+            qcType: qcData.value.qcType,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      isHover: true,
+      keyField: 'id',
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesQcDefectRecordApi.DefectRecord>,
+});
+
+const [Modal, modalApi] = useVbenModal({
+  showCancelButton: false,
+  showConfirmButton: false,
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      qcData.value = undefined;
+      return;
+    }
+    qcData.value = modalApi.getData<OpenData>();
+    await gridApi.query();
+  },
+});
+</script>
+
+<template>
+  <Modal title="缺陷记录" class="w-3/5">
+    <FormModal @success="handleRefresh" />
+    <Grid class="mx-4">
+      <template v-if="!isReadonly" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              auth: ['mes:qc-defect:create'],
+              icon: ACTION_ICON.ADD,
+              label: '新增缺陷',
+              onClick: handleCreate,
+              type: 'primary',
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              auth: ['mes:qc-defect:update'],
+              icon: ACTION_ICON.EDIT,
+              ifShow: !isReadonly,
+              label: $t('common.edit'),
+              onClick: handleEdit.bind(null, row),
+              type: 'link',
+            },
+            {
+              auth: ['mes:qc-defect:delete'],
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              ifShow: !isReadonly,
+              label: $t('common.delete'),
+              popConfirm: {
+                confirm: handleDelete.bind(null, row),
+                title: $t('ui.actionMessage.deleteConfirm', [row.name]),
+              },
+              type: 'link',
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/qc/defectrecord/components/index.ts b/apps/web-antd/src/views/mes/qc/defectrecord/components/index.ts
new file mode 100644
index 000000000..6a2bd142a
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/defectrecord/components/index.ts
@@ -0,0 +1,2 @@
+export { default as DefectRecordInlineForm } from './defect-record-inline-form.vue';
+export { default as DefectRecordInlineList } from './defect-record-inline-list.vue';
diff --git a/apps/web-antd/src/views/mes/qc/indicatorresult/components/index.ts b/apps/web-antd/src/views/mes/qc/indicatorresult/components/index.ts
new file mode 100644
index 000000000..590fb8b8e
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/indicatorresult/components/index.ts
@@ -0,0 +1,2 @@
+export { default as QcIndicatorResultForm } from './qc-indicator-result-form.vue';
+export { default as QcIndicatorResultList } from './qc-indicator-result-list.vue';
diff --git a/apps/web-antd/src/views/mes/qc/indicatorresult/components/qc-indicator-result-form.vue b/apps/web-antd/src/views/mes/qc/indicatorresult/components/qc-indicator-result-form.vue
new file mode 100644
index 000000000..96dc91d2c
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/indicatorresult/components/qc-indicator-result-form.vue
@@ -0,0 +1,270 @@
+<script lang="ts" setup>
+import type { MesQcIndicatorResultApi } from '#/api/mes/qc/indicatorresult';
+
+import { computed, h, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import {
+  Form as AForm,
+  Button,
+  Divider,
+  Input,
+  InputNumber,
+  message,
+  Select,
+  Textarea,
+} from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import {
+  createIndicatorResult,
+  getIndicatorResultDetail,
+  updateIndicatorResult,
+} from '#/api/mes/qc/indicatorresult';
+import { $t } from '#/locales';
+import {
+  MesAutoCodeRuleCode,
+  MesQcResultValueType,
+} from '#/views/mes/utils/constants';
+
+interface OpenData {
+  formType: 'create' | 'update';
+  id?: number;
+  qcId: number;
+  qcType: number;
+}
+
+const emit = defineEmits(['success']);
+const formType = ref<'create' | 'update'>('create');
+const items = ref<MesQcIndicatorResultApi.IndicatorResultDetail[]>([]);
+const ctxData = ref<OpenData>();
+
+const getTitle = computed(() =>
+  formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['检验结果'])
+    : $t('ui.actionTitle.create', ['检验结果']),
+);
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 100,
+  },
+  wrapperClass: 'grid-cols-2',
+  layout: 'horizontal',
+  // TODO @AI：搞个 data.ts？
+// TODO @AI：代码风格，貌似不够一致；
+  schema: [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '样品编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入样品编号',
+      },
+      rules: 'required',
+      suffix: () =>
+        h(
+          Button,
+          {
+            type: 'default',
+            onClick: async () => {
+              try {
+                const code = await generateAutoCode(
+                  MesAutoCodeRuleCode.QC_INDICATOR_RESULT_CODE,
+                );
+                await formApi.setFieldValue('code', code);
+              } catch (error) {
+                console.error(error);
+              }
+            },
+          },
+          { default: () => '生成' },
+        ),
+    },
+    {
+      fieldName: 'sn',
+      label: '物资 SN',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入物资 SN',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-2',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 2,
+      },
+    },
+  ],
+  showDefaultActions: false,
+});
+
+/** 解析字典选项字符串：value=label;value=label */
+function parseValueOptions(spec?: string) {
+  if (!spec) {
+    return [];
+  }
+  return spec
+    .split(';')
+    .map((part) => part.trim())
+    .filter(Boolean)
+    .map((part) => {
+      const [value, label] = part.split('=');
+      return { value: value ?? '', label: label ?? value ?? '' };
+    });
+}
+
+// TODO @AI：注释风格的统一；
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (!ctxData.value) {
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      const head = (await formApi.getValues()) as MesQcIndicatorResultApi.IndicatorResult;
+      const submitItems = items.value.map((item) => {
+        const submit: MesQcIndicatorResultApi.IndicatorResultDetail = {
+          id: item.id,
+          indicatorId: item.indicatorId,
+          remark: item.remark,
+        };
+        if (
+          item.valueType === MesQcResultValueType.FLOAT ||
+          item.valueType === MesQcResultValueType.INTEGER
+        ) {
+          submit.value =
+            item.valueNumber == null ? undefined : String(item.valueNumber);
+        } else {
+          submit.value = item.value;
+        }
+        return submit;
+      });
+      const payload: MesQcIndicatorResultApi.IndicatorResult = {
+        ...head,
+        qcId: ctxData.value.qcId,
+        qcType: ctxData.value.qcType,
+        items: submitItems,
+      };
+      if (formType.value === 'update') {
+        await updateIndicatorResult(payload);
+        message.success($t('common.updateSuccess'));
+      } else {
+        await createIndicatorResult(payload);
+        message.success($t('common.createSuccess'));
+      }
+      await modalApi.close();
+      emit('success');
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      ctxData.value = undefined;
+      items.value = [];
+      return;
+    }
+    const data = modalApi.getData<OpenData>();
+    ctxData.value = data;
+    formType.value = data.formType;
+    modalApi.lock();
+    try {
+      const detail = await getIndicatorResultDetail(
+        data.qcId,
+        data.qcType,
+        data.id,
+      );
+      // 回填数值字段（用于 InputNumber 绑定）
+      items.value = (detail.items ?? []).map((item) => ({
+        ...item,
+        valueNumber:
+          (item.valueType === MesQcResultValueType.FLOAT ||
+            item.valueType === MesQcResultValueType.INTEGER) &&
+          item.value != null
+            ? Number(item.value)
+            : undefined,
+      }));
+      await formApi.setValues({
+        id: detail.id,
+        code: detail.code,
+        sn: detail.sn,
+        remark: detail.remark,
+      });
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <div class="px-4">
+      <Form />
+      <Divider>检测值</Divider>
+      <!-- TODO @AI：这里，可以改成更大化使用 schema 方式么？ -->
+      <AForm :label-col="{ span: 6 }" :wrapper-col="{ span: 18 }">
+        <div
+          v-for="(item, index) in items"
+          :key="item.indicatorId ?? index"
+          class="mb-2"
+        >
+          <AForm.Item :label="`检测项${index + 1}：${item.indicatorName ?? ''}`">
+            <InputNumber
+              v-if="
+                item.valueType === MesQcResultValueType.FLOAT ||
+                item.valueType === MesQcResultValueType.INTEGER
+              "
+              v-model:value="item.valueNumber"
+              :precision="item.valueType === MesQcResultValueType.FLOAT ? 4 : 0"
+              class="!w-full"
+              placeholder="请输入"
+            />
+            <Textarea
+              v-else-if="item.valueType === MesQcResultValueType.TEXT"
+              v-model:value="item.value"
+              :rows="2"
+              placeholder="请输入检测值"
+            />
+            <Select
+              v-else-if="item.valueType === MesQcResultValueType.DICT"
+              v-model:value="item.value"
+              allow-clear
+              :options="parseValueOptions(item.valueSpecification)"
+              placeholder="请选择"
+            />
+            <Input
+              v-else-if="item.valueType === MesQcResultValueType.FILE"
+              v-model:value="item.value"
+              placeholder="请输入文件地址"
+            />
+            <Input v-else v-model:value="item.value" placeholder="请输入" />
+          </AForm.Item>
+        </div>
+      </AForm>
+    </div>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/qc/indicatorresult/components/qc-indicator-result-list.vue b/apps/web-antd/src/views/mes/qc/indicatorresult/components/qc-indicator-result-list.vue
new file mode 100644
index 000000000..950cfc465
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/indicatorresult/components/qc-indicator-result-list.vue
@@ -0,0 +1,156 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcIndicatorResultApi } from '#/api/mes/qc/indicatorresult';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteIndicatorResult,
+  getIndicatorResultPage,
+} from '#/api/mes/qc/indicatorresult';
+import { $t } from '#/locales';
+
+import QcIndicatorResultForm from './qc-indicator-result-form.vue';
+
+const props = defineProps<{
+  qcId: number;
+  qcType: number;
+  readonly?: boolean;
+}>();
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: QcIndicatorResultForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 新增检测结果 */
+function handleCreate() {
+  formModalApi
+    .setData({
+      formType: 'create',
+      qcId: props.qcId,
+      qcType: props.qcType,
+    })
+    .open();
+}
+
+/** 编辑检测结果 */
+function handleEdit(row: MesQcIndicatorResultApi.IndicatorResult) {
+  formModalApi
+    .setData({
+      formType: 'update',
+      id: row.id,
+      qcId: props.qcId,
+      qcType: props.qcType,
+    })
+    .open();
+}
+
+/** 删除检测结果 */
+async function handleDelete(row: MesQcIndicatorResultApi.IndicatorResult) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.code]),
+    duration: 0,
+  });
+  try {
+    await deleteIndicatorResult(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+// TODO @AI：搞个 data.ts？
+// TODO @AI：代码风格，貌似不够一致；
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: [
+      { field: 'code', title: '样品编号', width: 200 },
+      { field: 'sn', title: '物资SN', minWidth: 200 },
+      { field: 'remark', title: '备注', minWidth: 200 },
+      {
+        title: '操作',
+        width: 150,
+        fixed: 'right',
+        slots: { default: 'actions' },
+      },
+    ],
+    height: 360,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.qcId) {
+            return { list: [], total: 0 };
+          }
+          return await getIndicatorResultPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            qcId: props.qcId,
+            qcType: props.qcType,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesQcIndicatorResultApi.IndicatorResult>,
+});
+</script>
+
+<template>
+  <div>
+    <FormModal @success="handleRefresh" />
+    <Grid table-title="检测结果">
+      <template v-if="!readonly" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '新增',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              ifShow: !readonly,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              ifShow: !readonly,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-antd/src/views/mes/qc/iqc/data.ts b/apps/web-antd/src/views/mes/qc/iqc/data.ts
new file mode 100644
index 000000000..9919a2a83
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/iqc/data.ts
@@ -0,0 +1,508 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcIqcApi } from '#/api/mes/qc/iqc';
+import type { MesQcIqcLineApi } from '#/api/mes/qc/iqc/line';
+
+import { h, markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { Button } from 'ant-design-vue';
+
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getSimpleUserList } from '#/api/system/user';
+import { getRangePickerDefaultProps } from '#/utils';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
+import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
+/** 新增/修改的表单 */
+export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'sourceDocId',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'sourceLineId',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'status',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '检验单编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入检验单编号',
+      },
+      rules: 'required',
+      suffix: () =>
+        h(
+          Button,
+          {
+            type: 'default',
+            onClick: async () => {
+              try {
+                const code = await generateAutoCode(
+                  MesAutoCodeRuleCode.QC_IQC_CODE,
+                );
+                await formApi?.setFieldValue('code', code);
+              } catch (error) {
+                console.error(error);
+              }
+            },
+          },
+          { default: () => '生成' },
+        ),
+    },
+    {
+      fieldName: 'name',
+      label: '检验单名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入检验单名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'sourceDocType',
+      label: '来源单据类型',
+      component: 'Select',
+      componentProps: {
+        disabled: true,
+        options: getDictOptions(DICT_TYPE.MES_QC_SOURCE_DOC_TYPE, 'number'),
+        placeholder: '来源单据类型',
+      },
+      dependencies: {
+        triggerFields: ['sourceDocType'],
+        show: (values) => !!values.sourceDocType,
+      },
+    },
+    {
+      fieldName: 'sourceDocCode',
+      label: '来源单据编号',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+        placeholder: '来源单据编号',
+      },
+      dependencies: {
+        triggerFields: ['sourceDocType', 'sourceDocId'],
+        show: (values) => !!values.sourceDocType && !!values.sourceDocId,
+      },
+    },
+    {
+      fieldName: 'itemId',
+      label: '产品物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择产品物料',
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['id', 'sourceDocId'],
+        componentProps: (values) => ({
+          disabled: !!values.id || !!values.sourceDocId,
+          placeholder: '请选择产品物料',
+        }),
+      },
+    },
+    {
+      fieldName: 'vendorId',
+      label: '供应商',
+      component: markRaw(MdVendorSelect),
+      componentProps: {
+        placeholder: '请选择供应商',
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['sourceDocId'],
+        componentProps: (values) => ({
+          disabled: !!values.sourceDocId,
+          placeholder: '请选择供应商',
+        }),
+      },
+    },
+    {
+      fieldName: 'vendorBatch',
+      label: '供应商批次号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入供应商批次号',
+      },
+    },
+    {
+      fieldName: 'receivedQuantity',
+      label: '本次接收数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        precision: 2,
+        placeholder: '请输入本次接收数量',
+      },
+      rules: 'required',
+      dependencies: {
+        triggerFields: ['sourceDocId'],
+        componentProps: (values) => ({
+          class: '!w-full',
+          disabled: !!values.sourceDocId,
+          min: 0,
+          precision: 2,
+          placeholder: '请输入本次接收数量',
+        }),
+      },
+    },
+    {
+      fieldName: 'qualifiedQuantity',
+      label: '合格品数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入合格品数量',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'unqualifiedQuantity',
+      label: '不合格品数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入不合格品数量',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'receiveDate',
+      label: '来料日期',
+      component: 'DatePicker',
+      componentProps: {
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择来料日期',
+        valueFormat: 'x',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'inspectorUserId',
+      label: '检测人员',
+      component: 'ApiSelect',
+      componentProps: {
+        allowClear: true,
+        api: getSimpleUserList,
+        labelField: 'nickname',
+        placeholder: '请选择检测人员',
+        valueField: 'id',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'inspectDate',
+      label: '检测日期',
+      component: 'DatePicker',
+      componentProps: {
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择检测日期',
+        valueFormat: 'x',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'checkResult',
+      label: '检测结果',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_QC_CHECK_RESULT, 'number'),
+        placeholder: '请选择检测结果',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '检验单编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入检验单编号',
+      },
+    },
+    {
+      fieldName: 'vendorId',
+      label: '供应商',
+      component: markRaw(MdVendorSelect),
+      componentProps: {
+        placeholder: '请选择供应商',
+      },
+    },
+    {
+      fieldName: 'vendorBatch',
+      label: '供应商批次',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入供应商批次号',
+      },
+    },
+    {
+      fieldName: 'itemId',
+      label: '产品物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择产品物料',
+      },
+    },
+    {
+      fieldName: 'checkResult',
+      label: '检测结果',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_QC_CHECK_RESULT, 'number'),
+        placeholder: '请选择检测结果',
+      },
+    },
+    {
+      fieldName: 'receiveDate',
+      label: '来料日期',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+      },
+    },
+    {
+      fieldName: 'inspectDate',
+      label: '检测日期',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+      },
+    },
+    {
+      fieldName: 'inspectorUserId',
+      label: '检测人员',
+      component: 'ApiSelect',
+      componentProps: {
+        allowClear: true,
+        api: getSimpleUserList,
+        labelField: 'nickname',
+        placeholder: '请选择检测人员',
+        valueField: 'id',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesQcIqcApi.Iqc>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '来料检验单编号',
+      width: 160,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '来料检验单名称',
+      minWidth: 180,
+    },
+    {
+      field: 'vendorNickname',
+      title: '供应商简称',
+      width: 120,
+    },
+    {
+      field: 'vendorBatch',
+      title: '供应商批次号',
+      width: 130,
+    },
+    {
+      field: 'itemCode',
+      title: '产品物料编码',
+      width: 130,
+    },
+    {
+      field: 'itemName',
+      title: '产品物料名称',
+      minWidth: 150,
+    },
+    {
+      field: 'receivedQuantity',
+      title: '接收数量',
+      width: 100,
+    },
+    {
+      field: 'checkQuantity',
+      title: '检测数量',
+      width: 100,
+    },
+    {
+      field: 'unqualifiedQuantity',
+      title: '不合格数',
+      width: 100,
+    },
+    {
+      field: 'checkResult',
+      title: '检测结果',
+      width: 110,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_QC_CHECK_RESULT },
+      },
+    },
+    {
+      field: 'receiveDate',
+      title: '来料日期',
+      width: 120,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'inspectDate',
+      title: '检测日期',
+      width: 120,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'inspectorNickname',
+      title: '检测人员',
+      width: 100,
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_ORDER_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 180,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 来料检验行子表的字段 */
+export function useLineGridColumns(): VxeTableGridOptions<MesQcIqcLineApi.IqcLine>['columns'] {
+  return [
+    {
+      field: 'indicatorName',
+      title: '检测项名称',
+      width: 150,
+    },
+    {
+      field: 'indicatorType',
+      title: '检测项类型',
+      width: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_INDICATOR_TYPE },
+      },
+    },
+    {
+      field: 'tool',
+      title: '检测工具',
+      width: 120,
+    },
+    {
+      field: 'checkMethod',
+      title: '检测要求',
+      minWidth: 180,
+    },
+    {
+      field: 'standardValue',
+      title: '标准值',
+      width: 100,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'maxThreshold',
+      title: '误差上限',
+      width: 100,
+    },
+    {
+      field: 'minThreshold',
+      title: '误差下限',
+      width: 100,
+    },
+    {
+      field: 'criticalQuantity',
+      title: '致命缺陷数',
+      width: 110,
+    },
+    {
+      field: 'majorQuantity',
+      title: '严重缺陷数',
+      width: 110,
+    },
+    {
+      field: 'minorQuantity',
+      title: '轻微缺陷数',
+      width: 110,
+    },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 150,
+    },
+    {
+      title: '操作',
+      width: 110,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/qc/iqc/index.vue b/apps/web-antd/src/views/mes/qc/iqc/index.vue
new file mode 100644
index 000000000..d3be3989f
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/iqc/index.vue
@@ -0,0 +1,167 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcIqcApi } from '#/api/mes/qc/iqc';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { Button, message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { deleteIqc, exportIqc, getIqcPage } from '#/api/mes/qc/iqc';
+import { $t } from '#/locales';
+import { MesQcStatusEnum } from '#/views/mes/utils/constants';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建来料检验单 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看来料检验单 */
+function handleDetail(row: MesQcIqcApi.Iqc) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑来料检验单 */
+function handleEdit(row: MesQcIqcApi.Iqc) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 删除来料检验单 */
+async function handleDelete(row: MesQcIqcApi.Iqc) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.code]),
+    duration: 0,
+  });
+  try {
+    await deleteIqc(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportIqc(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '来料检验单.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getIqcPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesQcIqcApi.Iqc>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【质量】来料检验（IQC）"
+        url="https://doc.iocoder.cn/mes/qc/iqc/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="来料检验单列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['来料检验单']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:qc-iqc:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:qc-iqc:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <Button type="link" @click="handleDetail(row)">
+          {{ row.code }}
+        </Button>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:qc-iqc:update'],
+              ifShow: row.status === MesQcStatusEnum.DRAFT,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:qc-iqc:delete'],
+              ifShow: row.status === MesQcStatusEnum.DRAFT,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: $t('common.detail'),
+              type: 'link',
+              icon: ACTION_ICON.VIEW,
+              auth: ['mes:qc-iqc:query'],
+              onClick: handleDetail.bind(null, row),
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/mes/qc/iqc/modules/form.vue b/apps/web-antd/src/views/mes/qc/iqc/modules/form.vue
new file mode 100644
index 000000000..02c729261
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/iqc/modules/form.vue
@@ -0,0 +1,244 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesQcIqcApi } from '#/api/mes/qc/iqc';
+
+import { computed, ref } from 'vue';
+
+import { confirm, useVbenModal } from '@vben/common-ui';
+
+import {
+  Button,
+  Descriptions,
+  message,
+  Tabs,
+} from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createIqc,
+  finishIqc,
+  getIqc,
+  updateIqc,
+} from '#/api/mes/qc/iqc';
+import { $t } from '#/locales';
+import { MesQcStatusEnum, MesQcTypeEnum } from '#/views/mes/utils/constants';
+
+import { QcIndicatorResultList } from '../../indicatorresult/components';
+import { useFormSchema } from '../data';
+import LineList from './line-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesQcIqcApi.Iqc>();
+const subTabsName = ref('line');
+const originalSnapshot = ref(''); // 表单原始数据快照，用于 finish 时跳过未变更的保存请求
+const isDetail = computed(() => formType.value === 'detail');
+const canFinish = computed(
+  () =>
+    formType.value === 'update' &&
+    formData.value?.status === MesQcStatusEnum.DRAFT,
+);
+const getTitle = computed(() => {
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['来料检验单']);
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['来料检验单'])
+    : $t('ui.actionTitle.create', ['来料检验单']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  wrapperClass: 'grid-cols-3',
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+});
+
+// TODO @AI：这个不应该是表头吧？不够通用；应该是 handleRefresh 更合理把。
+/** 重新加载主表头数据（用于子表变更后刷新缺陷统计） */
+async function reloadHead() {
+  if (!formData.value?.id) {
+    return;
+  }
+  try {
+    formData.value = await getIqc(formData.value.id);
+  } catch (error) {
+    console.error('[IqcForm] reload head failed:', error);
+  }
+}
+
+/** 提交表单 */
+async function handleSubmit(): Promise<boolean> {
+  const { valid } = await formApi.validate();
+  if (!valid) {
+    return false;
+  }
+  const data = (await formApi.getValues()) as MesQcIqcApi.Iqc;
+  if (formData.value?.id) {
+    await updateIqc({ ...data, id: formData.value.id });
+    formData.value = { ...formData.value, ...data };
+  } else {
+    const id = await createIqc(data);
+    formData.value = {
+      ...data,
+      id: id as unknown as number,
+      status: MesQcStatusEnum.DRAFT,
+    };
+    await formApi.setFieldValue('id', formData.value.id);
+    await formApi.setFieldValue('status', formData.value.status);
+    formType.value = 'update';
+  }
+  // 刷新快照（已带上 id / status），下次 finish 用于判断是否需要再保存
+  originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  return true;
+}
+
+/** 完成检验单：表单有修改时先保存，再调用完成接口 */
+async function handleFinish() {
+  const id = formData.value?.id;
+  if (!id) {
+    return;
+  }
+  const { valid } = await formApi.validate();
+  if (!valid) {
+    return;
+  }
+  await confirm({
+    content: '是否完成来料检验单编制？【完成后将不能更改】',
+  });
+  modalApi.lock();
+  try {
+    const current = JSON.stringify(await formApi.getValues());
+    if (current !== originalSnapshot.value) {
+      const data = (await formApi.getValues()) as MesQcIqcApi.Iqc;
+      await updateIqc({ ...data, id });
+      formData.value = { ...formData.value, ...data };
+      originalSnapshot.value = current;
+    }
+    await finishIqc(id);
+    message.success('完成成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (isDetail.value) {
+      await modalApi.close();
+      return;
+    }
+    modalApi.lock();
+    try {
+      const ok = await handleSubmit();
+      if (!ok) {
+        return;
+      }
+      message.success($t('ui.actionMessage.operationSuccess'));
+      await modalApi.close();
+      emit('success');
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      originalSnapshot.value = '';
+      return;
+    }
+    formApi.setState({ schema: useFormSchema(formApi) });
+    subTabsName.value = 'line';
+    // 加载数据
+    const data = modalApi.getData<{
+      formType: FormType;
+      id?: number;
+      prefill?: MesQcIqcApi.Iqc;
+    }>();
+    formType.value = data.formType;
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getIqc(data.id);
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    } else if (data?.prefill) {
+      // 预填模式：来自待检任务
+      formData.value = { ...data.prefill };
+      await formApi.setValues(data.prefill);
+    }
+    // 记录初始快照，后续 finish 用于判断是否需要再保存
+    originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-4/5">
+    <Form class="mx-4" />
+    <!-- 缺陷统计（只读） -->
+    <div v-if="formData?.id" class="mx-4 mt-4">
+      <Descriptions title="缺陷情况" :column="3" bordered size="small">
+        <Descriptions.Item label="致命缺陷数">
+          {{ formData.criticalQuantity ?? 0 }}
+        </Descriptions.Item>
+        <Descriptions.Item label="严重缺陷数">
+          {{ formData.majorQuantity ?? 0 }}
+        </Descriptions.Item>
+        <Descriptions.Item label="轻微缺陷数">
+          {{ formData.minorQuantity ?? 0 }}
+        </Descriptions.Item>
+        <Descriptions.Item label="致命缺陷率">
+          {{ formData.criticalRate ?? 0 }}%
+        </Descriptions.Item>
+        <Descriptions.Item label="严重缺陷率">
+          {{ formData.majorRate ?? 0 }}%
+        </Descriptions.Item>
+        <Descriptions.Item label="轻微缺陷率">
+          {{ formData.minorRate ?? 0 }}%
+        </Descriptions.Item>
+      </Descriptions>
+    </div>
+    <Tabs
+      v-if="formData?.id"
+      v-model:active-key="subTabsName"
+      class="mx-4 mt-4"
+    >
+      <Tabs.TabPane key="line" tab="检验项">
+        <LineList
+          :form-type="formType"
+          :iqc-id="formData.id"
+          @refresh="reloadHead"
+        />
+      </Tabs.TabPane>
+      <Tabs.TabPane key="result" tab="检测结果">
+        <QcIndicatorResultList
+          :qc-id="formData.id"
+          :qc-type="MesQcTypeEnum.IQC"
+          :readonly="isDetail"
+        />
+      </Tabs.TabPane>
+    </Tabs>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <Button v-if="canFinish" type="primary" @click="handleFinish">
+          完成
+        </Button>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/qc/iqc/modules/line-list.vue b/apps/web-antd/src/views/mes/qc/iqc/modules/line-list.vue
new file mode 100644
index 000000000..13accbf88
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/iqc/modules/line-list.vue
@@ -0,0 +1,97 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcIqcLineApi } from '#/api/mes/qc/iqc/line';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getIqcLinePage } from '#/api/mes/qc/iqc/line';
+import { MesQcTypeEnum } from '#/views/mes/utils/constants';
+
+import { DefectRecordInlineList } from '../../defectrecord/components';
+import { useLineGridColumns } from '../data';
+
+const props = defineProps<{
+  formType?: string;
+  iqcId: number;
+}>();
+
+const emit = defineEmits<{ refresh: [] }>();
+
+const [DefectModal, defectModalApi] = useVbenModal({
+  connectedComponent: DefectRecordInlineList,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 缺陷记录变更后，刷新本表格并通知父组件刷新主表统计 */
+function handleDefectChanged() {
+  handleRefresh();
+  emit('refresh');
+}
+
+/** 打开缺陷记录弹窗 */
+function handleOpenDefect(row: MesQcIqcLineApi.IqcLine) {
+  defectModalApi
+    .setData({
+      formType: props.formType,
+      lineId: row.id,
+      qcId: props.iqcId,
+      qcType: MesQcTypeEnum.IQC,
+    })
+    .open();
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useLineGridColumns(),
+    height: 360,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.iqcId) {
+            return { list: [], total: 0 };
+          }
+          return await getIqcLinePage({
+            iqcId: props.iqcId,
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesQcIqcLineApi.IqcLine>,
+});
+</script>
+
+<template>
+  <div>
+    <DefectModal @success="handleDefectChanged" />
+    <Grid table-title="检验项">
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: '缺陷列表',
+              type: 'link',
+              icon: ACTION_ICON.VIEW,
+              onClick: handleOpenDefect.bind(null, row),
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>

From cea628b1a1e60e8b54c2cd4d895d888df51ec343 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 29 May 2026 16:27:15 +0800
Subject: [PATCH 08/52] =?UTF-8?q?feat(mes-qc):=20=E8=BF=81=E7=A7=BB=20antd?=
 =?UTF-8?q?=20=E6=9D=A5=E6=96=99=E6=A3=80=E9=AA=8C=E5=8F=8A=E6=A3=80?=
 =?UTF-8?q?=E6=B5=8B=E7=BB=93=E6=9E=9C=E3=80=81=E7=BC=BA=E9=99=B7=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E7=BB=84=E4=BB=B6=EF=BC=88=E4=BB=A3=E7=A0=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/mes/qc/defectrecord/index.ts      |   7 +
 .../mes/qc/defectrecord/components/data.ts    |  93 +++++++++++
 .../components/defect-record-inline-form.vue  | 101 ++++--------
 .../components/defect-record-inline-list.vue  |  72 +++------
 .../mes/qc/indicatorresult/components/data.ts |  89 +++++++++++
 .../components/qc-indicator-result-form.vue   | 148 ++++++------------
 .../components/qc-indicator-result-list.vue   |  17 +-
 .../src/views/mes/qc/iqc/modules/form.vue     |  13 +-
 .../src/api/mes/qc/defectrecord/index.ts      |   7 +
 9 files changed, 302 insertions(+), 245 deletions(-)
 create mode 100644 apps/web-antd/src/views/mes/qc/defectrecord/components/data.ts
 create mode 100644 apps/web-antd/src/views/mes/qc/indicatorresult/components/data.ts

diff --git a/apps/web-antd/src/api/mes/qc/defectrecord/index.ts b/apps/web-antd/src/api/mes/qc/defectrecord/index.ts
index 0d5182b15..a434a29b6 100644
--- a/apps/web-antd/src/api/mes/qc/defectrecord/index.ts
+++ b/apps/web-antd/src/api/mes/qc/defectrecord/index.ts
@@ -16,6 +16,13 @@ export namespace MesQcDefectRecordApi {
   }
 }
 
+/** 查询质检缺陷记录 */
+export function getDefectRecord(id: number) {
+  return requestClient.get<MesQcDefectRecordApi.DefectRecord>(
+    `/mes/qc/defect-record/get?id=${id}`,
+  );
+}
+
 /** 查询质检缺陷记录分页 */
 export function getDefectRecordPage(
   params: PageParam & { lineId?: number; qcId?: number; qcType?: number; },
diff --git a/apps/web-antd/src/views/mes/qc/defectrecord/components/data.ts b/apps/web-antd/src/views/mes/qc/defectrecord/components/data.ts
new file mode 100644
index 000000000..4047517e0
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/defectrecord/components/data.ts
@@ -0,0 +1,93 @@
+import type { VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcDefectRecordApi } from '#/api/mes/qc/defectrecord';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+/** 表单类型 */
+export type FormType = 'create' | 'update';
+
+/** 新增/修改缺陷记录的表单 */
+export function useDefectRecordInlineFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'name',
+      label: '缺陷描述',
+      component: 'Textarea',
+      formItemClass: 'col-span-2',
+      componentProps: {
+        placeholder: '请输入缺陷描述',
+        rows: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'level',
+      label: '缺陷等级',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_DEFECT_LEVEL, 'number'),
+        placeholder: '请选择缺陷等级',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'quantity',
+      label: '缺陷数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 1,
+        placeholder: '请输入缺陷数量',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Input',
+      formItemClass: 'col-span-2',
+      componentProps: {
+        placeholder: '请输入备注',
+      },
+    },
+  ];
+}
+
+/** 缺陷记录列表的字段 */
+export function useDefectRecordInlineGridColumns(): VxeTableGridOptions<MesQcDefectRecordApi.DefectRecord>['columns'] {
+  return [
+    {
+      field: 'name',
+      title: '缺陷描述',
+      minWidth: 200,
+    },
+    {
+      field: 'level',
+      title: '缺陷等级',
+      width: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_DEFECT_LEVEL },
+      },
+    },
+    {
+      field: 'quantity',
+      title: '缺陷数量',
+      width: 100,
+    },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 150,
+    },
+    {
+      title: '操作',
+      width: 130,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/qc/defectrecord/components/defect-record-inline-form.vue b/apps/web-antd/src/views/mes/qc/defectrecord/components/defect-record-inline-form.vue
index 874b078e0..e74c34ccf 100644
--- a/apps/web-antd/src/views/mes/qc/defectrecord/components/defect-record-inline-form.vue
+++ b/apps/web-antd/src/views/mes/qc/defectrecord/components/defect-record-inline-form.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup>
+import type { FormType } from './data';
+
 import type { MesQcDefectRecordApi } from '#/api/mes/qc/defectrecord';
 
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
-import { DICT_TYPE } from '@vben/constants';
-import { getDictOptions } from '@vben/hooks';
 
 import { message } from 'ant-design-vue';
 
@@ -17,8 +17,10 @@ import {
 } from '#/api/mes/qc/defectrecord';
 import { $t } from '#/locales';
 
-interface OpenData {
-  formType: 'create' | 'update';
+import { useDefectRecordInlineFormSchema } from './data';
+
+interface CtxData {
+  formType: FormType;
   id?: number;
   lineId: number;
   qcId: number;
@@ -28,8 +30,7 @@ interface OpenData {
 defineOptions({ name: 'DefectRecordInlineForm' });
 
 const emit = defineEmits(['success']);
-// TODO @AI：这里，别的模块，一般是要枚举 create、update 么？
-const formType = ref<'create' | 'update'>('create');
+const formType = ref<FormType>('create');
 const formData = ref<MesQcDefectRecordApi.DefectRecord>();
 
 const getTitle = computed(() =>
@@ -38,8 +39,6 @@ const getTitle = computed(() =>
     : $t('ui.actionTitle.create', ['缺陷记录']),
 );
 
-// TODO @AI：搞个 data.ts？
-// TODO @AI：代码风格，貌似不够一致；
 const [Form, formApi] = useVbenForm({
   commonConfig: {
     componentProps: {
@@ -49,50 +48,7 @@ const [Form, formApi] = useVbenForm({
     labelWidth: 90,
   },
   layout: 'horizontal',
-  schema: [
-    {
-      fieldName: 'name',
-      label: '缺陷描述',
-      component: 'Textarea',
-      formItemClass: 'col-span-2',
-      componentProps: {
-        placeholder: '请输入缺陷描述',
-        rows: 2,
-      },
-      rules: 'required',
-    },
-    {
-      fieldName: 'level',
-      label: '缺陷等级',
-      component: 'Select',
-      componentProps: {
-        allowClear: true,
-        options: getDictOptions(DICT_TYPE.MES_DEFECT_LEVEL, 'number'),
-        placeholder: '请选择缺陷等级',
-      },
-      rules: 'selectRequired',
-    },
-    {
-      fieldName: 'quantity',
-      label: '缺陷数量',
-      component: 'InputNumber',
-      componentProps: {
-        class: '!w-full',
-        min: 1,
-        placeholder: '请输入缺陷数量',
-      },
-      rules: 'required',
-    },
-    {
-      fieldName: 'remark',
-      label: '备注',
-      component: 'Input',
-      formItemClass: 'col-span-2',
-      componentProps: {
-        placeholder: '请输入备注',
-      },
-    },
-  ],
+  schema: useDefectRecordInlineFormSchema(),
   showDefaultActions: false,
   wrapperClass: 'grid-cols-2',
 });
@@ -107,15 +63,16 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     modalApi.lock();
+    // 提交表单
+    const values =
+      (await formApi.getValues()) as MesQcDefectRecordApi.DefectRecord;
+    const payload: MesQcDefectRecordApi.DefectRecord = {
+      ...values,
+      lineId: formData.value.lineId,
+      qcId: formData.value.qcId,
+      qcType: formData.value.qcType,
+    };
     try {
-      const values =
-        (await formApi.getValues()) as MesQcDefectRecordApi.DefectRecord;
-      const payload: MesQcDefectRecordApi.DefectRecord = {
-        ...values,
-        lineId: formData.value.lineId,
-        qcId: formData.value.qcId,
-        qcType: formData.value.qcType,
-      };
       if (formType.value === 'update') {
         await updateDefectRecord({ ...payload, id: formData.value.id });
         message.success($t('common.updateSuccess'));
@@ -123,6 +80,7 @@ const [Modal, modalApi] = useVbenModal({
         await createDefectRecord(payload);
         message.success($t('common.createSuccess'));
       }
+      // 关闭并提示
       await modalApi.close();
       emit('success');
     } finally {
@@ -134,18 +92,10 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    const data = modalApi.getData<OpenData>();
+    // 加载数据
+    const data = modalApi.getData<CtxData>();
     formType.value = data.formType;
-    if (data.id) {
-      // 编辑：根据 id 加载明细
-      modalApi.lock();
-      try {
-        formData.value = await getDefectRecord(data.id);
-        await formApi.setValues(formData.value);
-      } finally {
-        modalApi.unlock();
-      }
-    } else {
+    if (!data.id) {
       // 新增：保留来自父级的上下文，并默认数量为 1
       formData.value = {
         lineId: data.lineId,
@@ -153,6 +103,15 @@ const [Modal, modalApi] = useVbenModal({
         qcType: data.qcType,
       };
       await formApi.setValues({ quantity: 1 });
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getDefectRecord(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
     }
   },
 });
diff --git a/apps/web-antd/src/views/mes/qc/defectrecord/components/defect-record-inline-list.vue b/apps/web-antd/src/views/mes/qc/defectrecord/components/defect-record-inline-list.vue
index 7e740bdc8..95f338f09 100644
--- a/apps/web-antd/src/views/mes/qc/defectrecord/components/defect-record-inline-list.vue
+++ b/apps/web-antd/src/views/mes/qc/defectrecord/components/defect-record-inline-list.vue
@@ -5,7 +5,6 @@ import type { MesQcDefectRecordApi } from '#/api/mes/qc/defectrecord';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
-import { DICT_TYPE } from '@vben/constants';
 
 import { message } from 'ant-design-vue';
 
@@ -16,22 +15,22 @@ import {
 } from '#/api/mes/qc/defectrecord';
 import { $t } from '#/locales';
 
+import { useDefectRecordInlineGridColumns } from './data';
 import DefectRecordInlineForm from './defect-record-inline-form.vue';
 
 defineOptions({ name: 'DefectRecordInlineList' });
 
 const emit = defineEmits(['success']);
 
-// TODO @AI：改成 QcData？？？
-interface OpenData {
+interface CtxData {
   formType?: string;
   lineId: number;
   qcId: number;
   qcType: number;
 }
 
-const qcData = ref<OpenData>();
-const isReadonly = computed(() => qcData.value?.formType === 'detail');
+const ctxData = ref<CtxData>();
+const isReadonly = computed(() => ctxData.value?.formType === 'detail');
 
 /** 刷新表格 */
 function handleRefresh() {
@@ -46,31 +45,31 @@ const [FormModal, formModalApi] = useVbenModal({
 
 /** 新增缺陷 */
 function handleCreate() {
-  if (!qcData.value) {
+  if (!ctxData.value) {
     return;
   }
   formModalApi
     .setData({
       formType: 'create',
-      lineId: qcData.value.lineId,
-      qcId: qcData.value.qcId,
-      qcType: qcData.value.qcType,
+      lineId: ctxData.value.lineId,
+      qcId: ctxData.value.qcId,
+      qcType: ctxData.value.qcType,
     })
     .open();
 }
 
 /** 编辑缺陷 */
 function handleEdit(row: MesQcDefectRecordApi.DefectRecord) {
-  if (!qcData.value) {
+  if (!ctxData.value) {
     return;
   }
   formModalApi
     .setData({
       formType: 'update',
       id: row.id,
-      lineId: qcData.value.lineId,
-      qcId: qcData.value.qcId,
-      qcType: qcData.value.qcType,
+      lineId: ctxData.value.lineId,
+      qcId: ctxData.value.qcId,
+      qcType: ctxData.value.qcType,
     })
     .open();
 }
@@ -90,55 +89,22 @@ async function handleDelete(row: MesQcDefectRecordApi.DefectRecord) {
   }
 }
 
-// TODO @AI：搞个 data.ts？
-// TODO @AI：代码风格，貌似不够一致；
 const [Grid, gridApi] = useVbenVxeGrid({
   gridOptions: {
-    columns: [
-      {
-        field: 'name',
-        title: '缺陷描述',
-        minWidth: 200,
-      },
-      {
-        field: 'level',
-        title: '缺陷等级',
-        width: 120,
-        cellRender: {
-          name: 'CellDict',
-          props: { type: DICT_TYPE.MES_DEFECT_LEVEL },
-        },
-      },
-      {
-        field: 'quantity',
-        title: '缺陷数量',
-        width: 100,
-      },
-      {
-        field: 'remark',
-        title: '备注',
-        minWidth: 150,
-      },
-      {
-        title: '操作',
-        width: 130,
-        fixed: 'right',
-        slots: { default: 'actions' },
-      },
-    ],
+    columns: useDefectRecordInlineGridColumns(),
     height: 320,
     proxyConfig: {
       ajax: {
         query: async ({ page }) => {
-          if (!qcData.value) {
+          if (!ctxData.value) {
             return { list: [], total: 0 };
           }
           return await getDefectRecordPage({
-            lineId: qcData.value.lineId,
+            lineId: ctxData.value.lineId,
             pageNo: page.currentPage,
             pageSize: page.pageSize,
-            qcId: qcData.value.qcId,
-            qcType: qcData.value.qcType,
+            qcId: ctxData.value.qcId,
+            qcType: ctxData.value.qcType,
           });
         },
       },
@@ -158,10 +124,10 @@ const [Modal, modalApi] = useVbenModal({
   showConfirmButton: false,
   async onOpenChange(isOpen: boolean) {
     if (!isOpen) {
-      qcData.value = undefined;
+      ctxData.value = undefined;
       return;
     }
-    qcData.value = modalApi.getData<OpenData>();
+    ctxData.value = modalApi.getData<CtxData>();
     await gridApi.query();
   },
 });
diff --git a/apps/web-antd/src/views/mes/qc/indicatorresult/components/data.ts b/apps/web-antd/src/views/mes/qc/indicatorresult/components/data.ts
new file mode 100644
index 000000000..79340b115
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/indicatorresult/components/data.ts
@@ -0,0 +1,89 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcIndicatorResultApi } from '#/api/mes/qc/indicatorresult';
+
+import { h } from 'vue';
+
+import { Button } from 'ant-design-vue';
+
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
+
+/** 表单类型 */
+export type FormType = 'create' | 'update';
+
+/** 新增/修改检测结果的表单 */
+export function useQcIndicatorResultFormSchema(
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '样品编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入样品编号',
+      },
+      rules: 'required',
+      suffix: () =>
+        h(
+          Button,
+          {
+            type: 'default',
+            onClick: async () => {
+              try {
+                const code = await generateAutoCode(
+                  MesAutoCodeRuleCode.QC_INDICATOR_RESULT_CODE,
+                );
+                await formApi?.setFieldValue('code', code);
+              } catch (error) {
+                console.error(error);
+              }
+            },
+          },
+          { default: () => '生成' },
+        ),
+    },
+    {
+      fieldName: 'sn',
+      label: '物资 SN',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入物资 SN',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-2',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 2,
+      },
+    },
+  ];
+}
+
+/** 检测结果列表的字段 */
+export function useQcIndicatorResultGridColumns(): VxeTableGridOptions<MesQcIndicatorResultApi.IndicatorResult>['columns'] {
+  return [
+    { field: 'code', title: '样品编号', width: 200 },
+    { field: 'sn', title: '物资SN', minWidth: 200 },
+    { field: 'remark', title: '备注', minWidth: 200 },
+    {
+      title: '操作',
+      width: 150,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/qc/indicatorresult/components/qc-indicator-result-form.vue b/apps/web-antd/src/views/mes/qc/indicatorresult/components/qc-indicator-result-form.vue
index 96dc91d2c..e33a59a8d 100644
--- a/apps/web-antd/src/views/mes/qc/indicatorresult/components/qc-indicator-result-form.vue
+++ b/apps/web-antd/src/views/mes/qc/indicatorresult/components/qc-indicator-result-form.vue
@@ -1,13 +1,14 @@
 <script lang="ts" setup>
+import type { FormType } from './data';
+
 import type { MesQcIndicatorResultApi } from '#/api/mes/qc/indicatorresult';
 
-import { computed, h, ref } from 'vue';
+import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
 
 import {
   Form as AForm,
-  Button,
   Divider,
   Input,
   InputNumber,
@@ -17,29 +18,29 @@ import {
 } from 'ant-design-vue';
 
 import { useVbenForm } from '#/adapter/form';
-import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import {
   createIndicatorResult,
   getIndicatorResultDetail,
   updateIndicatorResult,
 } from '#/api/mes/qc/indicatorresult';
 import { $t } from '#/locales';
-import {
-  MesAutoCodeRuleCode,
-  MesQcResultValueType,
-} from '#/views/mes/utils/constants';
+import { MesQcResultValueType } from '#/views/mes/utils/constants';
 
-interface OpenData {
-  formType: 'create' | 'update';
+import { useQcIndicatorResultFormSchema } from './data';
+
+interface CtxData {
+  formType: FormType;
   id?: number;
   qcId: number;
   qcType: number;
 }
 
+defineOptions({ name: 'QcIndicatorResultForm' });
+
 const emit = defineEmits(['success']);
-const formType = ref<'create' | 'update'>('create');
+const formType = ref<FormType>('create');
 const items = ref<MesQcIndicatorResultApi.IndicatorResultDetail[]>([]);
-const ctxData = ref<OpenData>();
+const ctxData = ref<CtxData>();
 
 const getTitle = computed(() =>
   formType.value === 'update'
@@ -55,66 +56,10 @@ const [Form, formApi] = useVbenForm({
     formItemClass: 'col-span-1',
     labelWidth: 100,
   },
-  wrapperClass: 'grid-cols-2',
   layout: 'horizontal',
-  // TODO @AI：搞个 data.ts？
-// TODO @AI：代码风格，貌似不够一致；
-  schema: [
-    {
-      fieldName: 'id',
-      component: 'Input',
-      dependencies: {
-        triggerFields: [''],
-        show: () => false,
-      },
-    },
-    {
-      fieldName: 'code',
-      label: '样品编号',
-      component: 'Input',
-      componentProps: {
-        placeholder: '请输入样品编号',
-      },
-      rules: 'required',
-      suffix: () =>
-        h(
-          Button,
-          {
-            type: 'default',
-            onClick: async () => {
-              try {
-                const code = await generateAutoCode(
-                  MesAutoCodeRuleCode.QC_INDICATOR_RESULT_CODE,
-                );
-                await formApi.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
-            },
-          },
-          { default: () => '生成' },
-        ),
-    },
-    {
-      fieldName: 'sn',
-      label: '物资 SN',
-      component: 'Input',
-      componentProps: {
-        placeholder: '请输入物资 SN',
-      },
-    },
-    {
-      fieldName: 'remark',
-      label: '备注',
-      component: 'Textarea',
-      formItemClass: 'col-span-2',
-      componentProps: {
-        placeholder: '请输入备注',
-        rows: 2,
-      },
-    },
-  ],
+  schema: [],
   showDefaultActions: false,
+  wrapperClass: 'grid-cols-2',
 });
 
 /** 解析字典选项字符串：value=label;value=label */
@@ -132,7 +77,6 @@ function parseValueOptions(spec?: string) {
     });
 }
 
-// TODO @AI：注释风格的统一；
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     if (!ctxData.value) {
@@ -143,31 +87,33 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     modalApi.lock();
-    try {
-      const head = (await formApi.getValues()) as MesQcIndicatorResultApi.IndicatorResult;
-      const submitItems = items.value.map((item) => {
-        const submit: MesQcIndicatorResultApi.IndicatorResultDetail = {
-          id: item.id,
-          indicatorId: item.indicatorId,
-          remark: item.remark,
-        };
-        if (
-          item.valueType === MesQcResultValueType.FLOAT ||
-          item.valueType === MesQcResultValueType.INTEGER
-        ) {
-          submit.value =
-            item.valueNumber == null ? undefined : String(item.valueNumber);
-        } else {
-          submit.value = item.value;
-        }
-        return submit;
-      });
-      const payload: MesQcIndicatorResultApi.IndicatorResult = {
-        ...head,
-        qcId: ctxData.value.qcId,
-        qcType: ctxData.value.qcType,
-        items: submitItems,
+    // 提交表单
+    const head =
+      (await formApi.getValues()) as MesQcIndicatorResultApi.IndicatorResult;
+    const submitItems = items.value.map((item) => {
+      const submit: MesQcIndicatorResultApi.IndicatorResultDetail = {
+        id: item.id,
+        indicatorId: item.indicatorId,
+        remark: item.remark,
       };
+      if (
+        item.valueType === MesQcResultValueType.FLOAT ||
+        item.valueType === MesQcResultValueType.INTEGER
+      ) {
+        submit.value =
+          item.valueNumber == null ? undefined : String(item.valueNumber);
+      } else {
+        submit.value = item.value;
+      }
+      return submit;
+    });
+    const payload: MesQcIndicatorResultApi.IndicatorResult = {
+      ...head,
+      items: submitItems,
+      qcId: ctxData.value.qcId,
+      qcType: ctxData.value.qcType,
+    };
+    try {
       if (formType.value === 'update') {
         await updateIndicatorResult(payload);
         message.success($t('common.updateSuccess'));
@@ -175,6 +121,7 @@ const [Modal, modalApi] = useVbenModal({
         await createIndicatorResult(payload);
         message.success($t('common.createSuccess'));
       }
+      // 关闭并提示
       await modalApi.close();
       emit('success');
     } finally {
@@ -187,7 +134,9 @@ const [Modal, modalApi] = useVbenModal({
       items.value = [];
       return;
     }
-    const data = modalApi.getData<OpenData>();
+    formApi.setState({ schema: useQcIndicatorResultFormSchema(formApi) });
+    // 加载数据
+    const data = modalApi.getData<CtxData>();
     ctxData.value = data;
     formType.value = data.formType;
     modalApi.lock();
@@ -207,11 +156,12 @@ const [Modal, modalApi] = useVbenModal({
             ? Number(item.value)
             : undefined,
       }));
+      // 设置到 values
       await formApi.setValues({
         id: detail.id,
         code: detail.code,
-        sn: detail.sn,
         remark: detail.remark,
+        sn: detail.sn,
       });
     } finally {
       modalApi.unlock();
@@ -225,14 +175,16 @@ const [Modal, modalApi] = useVbenModal({
     <div class="px-4">
       <Form />
       <Divider>检测值</Divider>
-      <!-- TODO @AI：这里，可以改成更大化使用 schema 方式么？ -->
+      <!-- 检测值控件由每行 valueType 驱动，逐行渲染：FLOAT/INTEGER 走 InputNumber，DICT 走 Select 并按 valueSpecification 解析选项 -->
       <AForm :label-col="{ span: 6 }" :wrapper-col="{ span: 18 }">
         <div
           v-for="(item, index) in items"
           :key="item.indicatorId ?? index"
           class="mb-2"
         >
-          <AForm.Item :label="`检测项${index + 1}：${item.indicatorName ?? ''}`">
+          <AForm.Item
+            :label="`检测项${index + 1}：${item.indicatorName ?? ''}`"
+          >
             <InputNumber
               v-if="
                 item.valueType === MesQcResultValueType.FLOAT ||
diff --git a/apps/web-antd/src/views/mes/qc/indicatorresult/components/qc-indicator-result-list.vue b/apps/web-antd/src/views/mes/qc/indicatorresult/components/qc-indicator-result-list.vue
index 950cfc465..856668d10 100644
--- a/apps/web-antd/src/views/mes/qc/indicatorresult/components/qc-indicator-result-list.vue
+++ b/apps/web-antd/src/views/mes/qc/indicatorresult/components/qc-indicator-result-list.vue
@@ -13,6 +13,7 @@ import {
 } from '#/api/mes/qc/indicatorresult';
 import { $t } from '#/locales';
 
+import { useQcIndicatorResultGridColumns } from './data';
 import QcIndicatorResultForm from './qc-indicator-result-form.vue';
 
 const props = defineProps<{
@@ -69,21 +70,9 @@ async function handleDelete(row: MesQcIndicatorResultApi.IndicatorResult) {
   }
 }
 
-// TODO @AI：搞个 data.ts？
-// TODO @AI：代码风格，貌似不够一致；
 const [Grid, gridApi] = useVbenVxeGrid({
   gridOptions: {
-    columns: [
-      { field: 'code', title: '样品编号', width: 200 },
-      { field: 'sn', title: '物资SN', minWidth: 200 },
-      { field: 'remark', title: '备注', minWidth: 200 },
-      {
-        title: '操作',
-        width: 150,
-        fixed: 'right',
-        slots: { default: 'actions' },
-      },
-    ],
+    columns: useQcIndicatorResultGridColumns(),
     height: 360,
     proxyConfig: {
       ajax: {
@@ -101,8 +90,8 @@ const [Grid, gridApi] = useVbenVxeGrid({
       },
     },
     rowConfig: {
-      keyField: 'id',
       isHover: true,
+      keyField: 'id',
     },
     toolbarConfig: {
       refresh: true,
diff --git a/apps/web-antd/src/views/mes/qc/iqc/modules/form.vue b/apps/web-antd/src/views/mes/qc/iqc/modules/form.vue
index 02c729261..c02426f04 100644
--- a/apps/web-antd/src/views/mes/qc/iqc/modules/form.vue
+++ b/apps/web-antd/src/views/mes/qc/iqc/modules/form.vue
@@ -62,17 +62,12 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-// TODO @AI：这个不应该是表头吧？不够通用；应该是 handleRefresh 更合理把。
-/** 重新加载主表头数据（用于子表变更后刷新缺陷统计） */
-async function reloadHead() {
+/** 子表变更后刷新主表头数据（缺陷统计等） */
+async function handleRefresh() {
   if (!formData.value?.id) {
     return;
   }
-  try {
-    formData.value = await getIqc(formData.value.id);
-  } catch (error) {
-    console.error('[IqcForm] reload head failed:', error);
-  }
+  formData.value = await getIqc(formData.value.id);
 }
 
 /** 提交表单 */
@@ -222,7 +217,7 @@ const [Modal, modalApi] = useVbenModal({
         <LineList
           :form-type="formType"
           :iqc-id="formData.id"
-          @refresh="reloadHead"
+          @refresh="handleRefresh"
         />
       </Tabs.TabPane>
       <Tabs.TabPane key="result" tab="检测结果">
diff --git a/apps/web-ele/src/api/mes/qc/defectrecord/index.ts b/apps/web-ele/src/api/mes/qc/defectrecord/index.ts
index 0d5182b15..a434a29b6 100644
--- a/apps/web-ele/src/api/mes/qc/defectrecord/index.ts
+++ b/apps/web-ele/src/api/mes/qc/defectrecord/index.ts
@@ -16,6 +16,13 @@ export namespace MesQcDefectRecordApi {
   }
 }
 
+/** 查询质检缺陷记录 */
+export function getDefectRecord(id: number) {
+  return requestClient.get<MesQcDefectRecordApi.DefectRecord>(
+    `/mes/qc/defect-record/get?id=${id}`,
+  );
+}
+
 /** 查询质检缺陷记录分页 */
 export function getDefectRecordPage(
   params: PageParam & { lineId?: number; qcId?: number; qcType?: number; },

From fe71f18d217b5fd172995fdbecdded37f1466974 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 29 May 2026 16:52:03 +0800
Subject: [PATCH 09/52] =?UTF-8?q?feat(mes-qc):=20=E8=BF=81=E7=A7=BB=20ele?=
 =?UTF-8?q?=20=E6=9D=A5=E6=96=99=E6=A3=80=E9=AA=8C=E5=8F=8A=E6=A3=80?=
 =?UTF-8?q?=E6=B5=8B=E7=BB=93=E6=9E=9C=E3=80=81=E7=BC=BA=E9=99=B7=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/qc-indicator-result-form.vue   |  19 +-
 .../mes/qc/defectrecord/components/data.ts    |  94 ++++
 .../components/defect-record-inline-form.vue  | 124 +++++
 .../components/defect-record-inline-list.vue  | 181 ++++++
 .../mes/qc/defectrecord/components/index.ts   |   2 +
 .../mes/qc/indicatorresult/components/data.ts |  88 +++
 .../qc/indicatorresult/components/index.ts    |   2 +
 .../components/qc-indicator-result-form.vue   | 225 ++++++++
 .../components/qc-indicator-result-list.vue   | 145 +++++
 apps/web-ele/src/views/mes/qc/iqc/data.ts     | 515 ++++++++++++++++++
 apps/web-ele/src/views/mes/qc/iqc/index.vue   | 168 ++++++
 .../src/views/mes/qc/iqc/modules/form.vue     | 237 ++++++++
 .../views/mes/qc/iqc/modules/line-list.vue    |  98 ++++
 13 files changed, 1884 insertions(+), 14 deletions(-)
 create mode 100644 apps/web-ele/src/views/mes/qc/defectrecord/components/data.ts
 create mode 100644 apps/web-ele/src/views/mes/qc/defectrecord/components/defect-record-inline-form.vue
 create mode 100644 apps/web-ele/src/views/mes/qc/defectrecord/components/defect-record-inline-list.vue
 create mode 100644 apps/web-ele/src/views/mes/qc/defectrecord/components/index.ts
 create mode 100644 apps/web-ele/src/views/mes/qc/indicatorresult/components/data.ts
 create mode 100644 apps/web-ele/src/views/mes/qc/indicatorresult/components/index.ts
 create mode 100644 apps/web-ele/src/views/mes/qc/indicatorresult/components/qc-indicator-result-form.vue
 create mode 100644 apps/web-ele/src/views/mes/qc/indicatorresult/components/qc-indicator-result-list.vue
 create mode 100644 apps/web-ele/src/views/mes/qc/iqc/data.ts
 create mode 100644 apps/web-ele/src/views/mes/qc/iqc/index.vue
 create mode 100644 apps/web-ele/src/views/mes/qc/iqc/modules/form.vue
 create mode 100644 apps/web-ele/src/views/mes/qc/iqc/modules/line-list.vue

diff --git a/apps/web-antd/src/views/mes/qc/indicatorresult/components/qc-indicator-result-form.vue b/apps/web-antd/src/views/mes/qc/indicatorresult/components/qc-indicator-result-form.vue
index e33a59a8d..d7d7c9f27 100644
--- a/apps/web-antd/src/views/mes/qc/indicatorresult/components/qc-indicator-result-form.vue
+++ b/apps/web-antd/src/views/mes/qc/indicatorresult/components/qc-indicator-result-form.vue
@@ -6,6 +6,7 @@ import type { MesQcIndicatorResultApi } from '#/api/mes/qc/indicatorresult';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { getDictOptions } from '@vben/hooks';
 
 import {
   Form as AForm,
@@ -62,19 +63,9 @@ const [Form, formApi] = useVbenForm({
   wrapperClass: 'grid-cols-2',
 });
 
-/** 解析字典选项字符串：value=label;value=label */
-function parseValueOptions(spec?: string) {
-  if (!spec) {
-    return [];
-  }
-  return spec
-    .split(';')
-    .map((part) => part.trim())
-    .filter(Boolean)
-    .map((part) => {
-      const [value, label] = part.split('=');
-      return { value: value ?? '', label: label ?? value ?? '' };
-    });
+/** 获取字典选项（valueSpecification 为系统字典类型名） */
+function getValueOptions(dictType?: string) {
+  return dictType ? getDictOptions(dictType, 'string') : [];
 }
 
 const [Modal, modalApi] = useVbenModal({
@@ -205,7 +196,7 @@ const [Modal, modalApi] = useVbenModal({
               v-else-if="item.valueType === MesQcResultValueType.DICT"
               v-model:value="item.value"
               allow-clear
-              :options="parseValueOptions(item.valueSpecification)"
+              :options="getValueOptions(item.valueSpecification)"
               placeholder="请选择"
             />
             <Input
diff --git a/apps/web-ele/src/views/mes/qc/defectrecord/components/data.ts b/apps/web-ele/src/views/mes/qc/defectrecord/components/data.ts
new file mode 100644
index 000000000..c5127b48b
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/defectrecord/components/data.ts
@@ -0,0 +1,94 @@
+import type { VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcDefectRecordApi } from '#/api/mes/qc/defectrecord';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+/** 表单类型 */
+export type FormType = 'create' | 'update';
+
+/** 新增/修改缺陷记录的表单 */
+export function useDefectRecordInlineFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'name',
+      label: '缺陷描述',
+      component: 'Textarea',
+      formItemClass: 'col-span-2',
+      componentProps: {
+        placeholder: '请输入缺陷描述',
+        rows: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'level',
+      label: '缺陷等级',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_DEFECT_LEVEL, 'number'),
+        placeholder: '请选择缺陷等级',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'quantity',
+      label: '缺陷数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 1,
+        placeholder: '请输入缺陷数量',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Input',
+      formItemClass: 'col-span-2',
+      componentProps: {
+        placeholder: '请输入备注',
+      },
+    },
+  ];
+}
+
+/** 缺陷记录列表的字段 */
+export function useDefectRecordInlineGridColumns(): VxeTableGridOptions<MesQcDefectRecordApi.DefectRecord>['columns'] {
+  return [
+    {
+      field: 'name',
+      title: '缺陷描述',
+      minWidth: 200,
+    },
+    {
+      field: 'level',
+      title: '缺陷等级',
+      width: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_DEFECT_LEVEL },
+      },
+    },
+    {
+      field: 'quantity',
+      title: '缺陷数量',
+      width: 100,
+    },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 150,
+    },
+    {
+      title: '操作',
+      width: 130,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/qc/defectrecord/components/defect-record-inline-form.vue b/apps/web-ele/src/views/mes/qc/defectrecord/components/defect-record-inline-form.vue
new file mode 100644
index 000000000..b7645b1d7
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/defectrecord/components/defect-record-inline-form.vue
@@ -0,0 +1,124 @@
+<script lang="ts" setup>
+import type { FormType } from './data';
+
+import type { MesQcDefectRecordApi } from '#/api/mes/qc/defectrecord';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createDefectRecord,
+  getDefectRecord,
+  updateDefectRecord,
+} from '#/api/mes/qc/defectrecord';
+import { $t } from '#/locales';
+
+import { useDefectRecordInlineFormSchema } from './data';
+
+interface CtxData {
+  formType: FormType;
+  id?: number;
+  lineId: number;
+  qcId: number;
+  qcType: number;
+}
+
+defineOptions({ name: 'DefectRecordInlineForm' });
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesQcDefectRecordApi.DefectRecord>();
+
+const getTitle = computed(() =>
+  formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['缺陷记录'])
+    : $t('ui.actionTitle.create', ['缺陷记录']),
+);
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 90,
+  },
+  layout: 'horizontal',
+  schema: useDefectRecordInlineFormSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-2',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (!formData.value) {
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const values =
+      (await formApi.getValues()) as MesQcDefectRecordApi.DefectRecord;
+    const payload: MesQcDefectRecordApi.DefectRecord = {
+      ...values,
+      lineId: formData.value.lineId,
+      qcId: formData.value.qcId,
+      qcType: formData.value.qcType,
+    };
+    try {
+      if (formType.value === 'update') {
+        await updateDefectRecord({ ...payload, id: formData.value.id });
+        ElMessage.success($t('common.updateSuccess'));
+      } else {
+        await createDefectRecord(payload);
+        ElMessage.success($t('common.createSuccess'));
+      }
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<CtxData>();
+    formType.value = data.formType;
+    if (!data.id) {
+      // 新增：保留来自父级的上下文，并默认数量为 1
+      formData.value = {
+        lineId: data.lineId,
+        qcId: data.qcId,
+        qcType: data.qcType,
+      };
+      await formApi.setValues({ quantity: 1 });
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getDefectRecord(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-2/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/qc/defectrecord/components/defect-record-inline-list.vue b/apps/web-ele/src/views/mes/qc/defectrecord/components/defect-record-inline-list.vue
new file mode 100644
index 000000000..80b049926
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/defectrecord/components/defect-record-inline-list.vue
@@ -0,0 +1,181 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcDefectRecordApi } from '#/api/mes/qc/defectrecord';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteDefectRecord,
+  getDefectRecordPage,
+} from '#/api/mes/qc/defectrecord';
+import { $t } from '#/locales';
+
+import { useDefectRecordInlineGridColumns } from './data';
+import DefectRecordInlineForm from './defect-record-inline-form.vue';
+
+defineOptions({ name: 'DefectRecordInlineList' });
+
+const emit = defineEmits(['success']);
+
+interface CtxData {
+  formType?: string;
+  lineId: number;
+  qcId: number;
+  qcType: number;
+}
+
+const ctxData = ref<CtxData>();
+const isReadonly = computed(() => ctxData.value?.formType === 'detail');
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+  emit('success');
+}
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: DefectRecordInlineForm,
+  destroyOnClose: true,
+});
+
+/** 新增缺陷 */
+function handleCreate() {
+  if (!ctxData.value) {
+    return;
+  }
+  formModalApi
+    .setData({
+      formType: 'create',
+      lineId: ctxData.value.lineId,
+      qcId: ctxData.value.qcId,
+      qcType: ctxData.value.qcType,
+    })
+    .open();
+}
+
+/** 编辑缺陷 */
+function handleEdit(row: MesQcDefectRecordApi.DefectRecord) {
+  if (!ctxData.value) {
+    return;
+  }
+  formModalApi
+    .setData({
+      formType: 'update',
+      id: row.id,
+      lineId: ctxData.value.lineId,
+      qcId: ctxData.value.qcId,
+      qcType: ctxData.value.qcType,
+    })
+    .open();
+}
+
+/** 删除缺陷 */
+async function handleDelete(row: MesQcDefectRecordApi.DefectRecord) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.name]),
+  });
+  try {
+    await deleteDefectRecord(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.name]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useDefectRecordInlineGridColumns(),
+    height: 320,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!ctxData.value) {
+            return { list: [], total: 0 };
+          }
+          return await getDefectRecordPage({
+            lineId: ctxData.value.lineId,
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            qcId: ctxData.value.qcId,
+            qcType: ctxData.value.qcType,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      isHover: true,
+      keyField: 'id',
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesQcDefectRecordApi.DefectRecord>,
+});
+
+const [Modal, modalApi] = useVbenModal({
+  showCancelButton: false,
+  showConfirmButton: false,
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      ctxData.value = undefined;
+      return;
+    }
+    ctxData.value = modalApi.getData<CtxData>();
+    await gridApi.query();
+  },
+});
+</script>
+
+<template>
+  <Modal title="缺陷记录" class="w-3/5">
+    <FormModal @success="handleRefresh" />
+    <Grid class="mx-4">
+      <template v-if="!isReadonly" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              auth: ['mes:qc-defect:create'],
+              icon: ACTION_ICON.ADD,
+              label: '新增缺陷',
+              onClick: handleCreate,
+              type: 'primary',
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              auth: ['mes:qc-defect:update'],
+              icon: ACTION_ICON.EDIT,
+              ifShow: !isReadonly,
+              label: $t('common.edit'),
+              link: true,
+              onClick: handleEdit.bind(null, row),
+              type: 'primary',
+            },
+            {
+              auth: ['mes:qc-defect:delete'],
+              icon: ACTION_ICON.DELETE,
+              ifShow: !isReadonly,
+              label: $t('common.delete'),
+              link: true,
+              popConfirm: {
+                confirm: handleDelete.bind(null, row),
+                title: $t('ui.actionMessage.deleteConfirm', [row.name]),
+              },
+              type: 'danger',
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/qc/defectrecord/components/index.ts b/apps/web-ele/src/views/mes/qc/defectrecord/components/index.ts
new file mode 100644
index 000000000..6a2bd142a
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/defectrecord/components/index.ts
@@ -0,0 +1,2 @@
+export { default as DefectRecordInlineForm } from './defect-record-inline-form.vue';
+export { default as DefectRecordInlineList } from './defect-record-inline-list.vue';
diff --git a/apps/web-ele/src/views/mes/qc/indicatorresult/components/data.ts b/apps/web-ele/src/views/mes/qc/indicatorresult/components/data.ts
new file mode 100644
index 000000000..c1be4b795
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/indicatorresult/components/data.ts
@@ -0,0 +1,88 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcIndicatorResultApi } from '#/api/mes/qc/indicatorresult';
+
+import { h } from 'vue';
+
+import { ElButton } from 'element-plus';
+
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
+
+/** 表单类型 */
+export type FormType = 'create' | 'update';
+
+/** 新增/修改检测结果的表单 */
+export function useQcIndicatorResultFormSchema(
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '样品编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入样品编号',
+      },
+      rules: 'required',
+      suffix: () =>
+        h(
+          ElButton,
+          {
+            onClick: async () => {
+              try {
+                const code = await generateAutoCode(
+                  MesAutoCodeRuleCode.QC_INDICATOR_RESULT_CODE,
+                );
+                await formApi?.setFieldValue('code', code);
+              } catch (error) {
+                console.error(error);
+              }
+            },
+          },
+          { default: () => '生成' },
+        ),
+    },
+    {
+      fieldName: 'sn',
+      label: '物资 SN',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入物资 SN',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-2',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 2,
+      },
+    },
+  ];
+}
+
+/** 检测结果列表的字段 */
+export function useQcIndicatorResultGridColumns(): VxeTableGridOptions<MesQcIndicatorResultApi.IndicatorResult>['columns'] {
+  return [
+    { field: 'code', title: '样品编号', width: 200 },
+    { field: 'sn', title: '物资SN', minWidth: 200 },
+    { field: 'remark', title: '备注', minWidth: 200 },
+    {
+      title: '操作',
+      width: 150,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/qc/indicatorresult/components/index.ts b/apps/web-ele/src/views/mes/qc/indicatorresult/components/index.ts
new file mode 100644
index 000000000..590fb8b8e
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/indicatorresult/components/index.ts
@@ -0,0 +1,2 @@
+export { default as QcIndicatorResultForm } from './qc-indicator-result-form.vue';
+export { default as QcIndicatorResultList } from './qc-indicator-result-list.vue';
diff --git a/apps/web-ele/src/views/mes/qc/indicatorresult/components/qc-indicator-result-form.vue b/apps/web-ele/src/views/mes/qc/indicatorresult/components/qc-indicator-result-form.vue
new file mode 100644
index 000000000..398fac75a
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/indicatorresult/components/qc-indicator-result-form.vue
@@ -0,0 +1,225 @@
+<script lang="ts" setup>
+import type { FormType } from './data';
+
+import type { MesQcIndicatorResultApi } from '#/api/mes/qc/indicatorresult';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+import { getDictOptions } from '@vben/hooks';
+
+import {
+  ElDivider,
+  ElForm,
+  ElFormItem,
+  ElInput,
+  ElInputNumber,
+  ElMessage,
+  ElOption,
+  ElSelect,
+} from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createIndicatorResult,
+  getIndicatorResultDetail,
+  updateIndicatorResult,
+} from '#/api/mes/qc/indicatorresult';
+import { $t } from '#/locales';
+import { MesQcResultValueType } from '#/views/mes/utils/constants';
+
+import { useQcIndicatorResultFormSchema } from './data';
+
+interface CtxData {
+  formType: FormType;
+  id?: number;
+  qcId: number;
+  qcType: number;
+}
+
+defineOptions({ name: 'QcIndicatorResultForm' });
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const items = ref<MesQcIndicatorResultApi.IndicatorResultDetail[]>([]);
+const ctxData = ref<CtxData>();
+
+const getTitle = computed(() =>
+  formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['检验结果'])
+    : $t('ui.actionTitle.create', ['检验结果']),
+);
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 100,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-2',
+});
+
+/** 获取字典选项（valueSpecification 为系统字典类型名） */
+function getValueOptions(dictType?: string) {
+  return dictType ? getDictOptions(dictType, 'string') : [];
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (!ctxData.value) {
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const head =
+      (await formApi.getValues()) as MesQcIndicatorResultApi.IndicatorResult;
+    const submitItems = items.value.map((item) => {
+      const submit: MesQcIndicatorResultApi.IndicatorResultDetail = {
+        id: item.id,
+        indicatorId: item.indicatorId,
+        remark: item.remark,
+      };
+      if (
+        item.valueType === MesQcResultValueType.FLOAT ||
+        item.valueType === MesQcResultValueType.INTEGER
+      ) {
+        submit.value =
+          item.valueNumber == null ? undefined : String(item.valueNumber);
+      } else {
+        submit.value = item.value;
+      }
+      return submit;
+    });
+    const payload: MesQcIndicatorResultApi.IndicatorResult = {
+      ...head,
+      items: submitItems,
+      qcId: ctxData.value.qcId,
+      qcType: ctxData.value.qcType,
+    };
+    try {
+      if (formType.value === 'update') {
+        await updateIndicatorResult(payload);
+        ElMessage.success($t('common.updateSuccess'));
+      } else {
+        await createIndicatorResult(payload);
+        ElMessage.success($t('common.createSuccess'));
+      }
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      ctxData.value = undefined;
+      items.value = [];
+      return;
+    }
+    formApi.setState({ schema: useQcIndicatorResultFormSchema(formApi) });
+    // 加载数据
+    const data = modalApi.getData<CtxData>();
+    ctxData.value = data;
+    formType.value = data.formType;
+    modalApi.lock();
+    try {
+      const detail = await getIndicatorResultDetail(
+        data.qcId,
+        data.qcType,
+        data.id,
+      );
+      // 回填数值字段（用于 InputNumber 绑定）
+      items.value = (detail.items ?? []).map((item) => ({
+        ...item,
+        valueNumber:
+          (item.valueType === MesQcResultValueType.FLOAT ||
+            item.valueType === MesQcResultValueType.INTEGER) &&
+          item.value != null
+            ? Number(item.value)
+            : undefined,
+      }));
+      // 设置到 values
+      await formApi.setValues({
+        id: detail.id,
+        code: detail.code,
+        remark: detail.remark,
+        sn: detail.sn,
+      });
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <div class="px-4">
+      <Form />
+      <ElDivider>检测值</ElDivider>
+      <!-- 检测值控件由每行 valueType 驱动，逐行渲染：FLOAT/INTEGER 走 ElInputNumber，DICT 走 ElSelect 并按 valueSpecification 解析选项 -->
+      <ElForm label-width="120px">
+        <div
+          v-for="(item, index) in items"
+          :key="item.indicatorId ?? index"
+          class="mb-2"
+        >
+          <ElFormItem
+            :label="`检测项${index + 1}：${item.indicatorName ?? ''}`"
+          >
+            <ElInputNumber
+              v-if="
+                item.valueType === MesQcResultValueType.FLOAT ||
+                item.valueType === MesQcResultValueType.INTEGER
+              "
+              v-model="item.valueNumber"
+              class="!w-full"
+              controls-position="right"
+              :precision="
+                item.valueType === MesQcResultValueType.FLOAT ? 4 : 0
+              "
+              placeholder="请输入"
+            />
+            <ElInput
+              v-else-if="item.valueType === MesQcResultValueType.TEXT"
+              v-model="item.value"
+              :rows="2"
+              type="textarea"
+              placeholder="请输入检测值"
+            />
+            <ElSelect
+              v-else-if="item.valueType === MesQcResultValueType.DICT"
+              v-model="item.value"
+              clearable
+              class="!w-full"
+              placeholder="请选择"
+            >
+              <ElOption
+                v-for="opt in getValueOptions(item.valueSpecification)"
+                :key="opt.value"
+                :label="opt.label"
+                :value="opt.value"
+              />
+            </ElSelect>
+            <ElInput
+              v-else-if="item.valueType === MesQcResultValueType.FILE"
+              v-model="item.value"
+              placeholder="请输入文件地址"
+            />
+            <ElInput v-else v-model="item.value" placeholder="请输入" />
+          </ElFormItem>
+        </div>
+      </ElForm>
+    </div>
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/qc/indicatorresult/components/qc-indicator-result-list.vue b/apps/web-ele/src/views/mes/qc/indicatorresult/components/qc-indicator-result-list.vue
new file mode 100644
index 000000000..bc9f555fc
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/indicatorresult/components/qc-indicator-result-list.vue
@@ -0,0 +1,145 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcIndicatorResultApi } from '#/api/mes/qc/indicatorresult';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteIndicatorResult,
+  getIndicatorResultPage,
+} from '#/api/mes/qc/indicatorresult';
+import { $t } from '#/locales';
+
+import { useQcIndicatorResultGridColumns } from './data';
+import QcIndicatorResultForm from './qc-indicator-result-form.vue';
+
+const props = defineProps<{
+  qcId: number;
+  qcType: number;
+  readonly?: boolean;
+}>();
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: QcIndicatorResultForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 新增检测结果 */
+function handleCreate() {
+  formModalApi
+    .setData({
+      formType: 'create',
+      qcId: props.qcId,
+      qcType: props.qcType,
+    })
+    .open();
+}
+
+/** 编辑检测结果 */
+function handleEdit(row: MesQcIndicatorResultApi.IndicatorResult) {
+  formModalApi
+    .setData({
+      formType: 'update',
+      id: row.id,
+      qcId: props.qcId,
+      qcType: props.qcType,
+    })
+    .open();
+}
+
+/** 删除检测结果 */
+async function handleDelete(row: MesQcIndicatorResultApi.IndicatorResult) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.code]),
+  });
+  try {
+    await deleteIndicatorResult(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useQcIndicatorResultGridColumns(),
+    height: 360,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.qcId) {
+            return { list: [], total: 0 };
+          }
+          return await getIndicatorResultPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            qcId: props.qcId,
+            qcType: props.qcType,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesQcIndicatorResultApi.IndicatorResult>,
+});
+</script>
+
+<template>
+  <div>
+    <FormModal @success="handleRefresh" />
+    <Grid table-title="检测结果">
+      <template v-if="!readonly" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '新增',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              ifShow: !readonly,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              ifShow: !readonly,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-ele/src/views/mes/qc/iqc/data.ts b/apps/web-ele/src/views/mes/qc/iqc/data.ts
new file mode 100644
index 000000000..804ef7df4
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/iqc/data.ts
@@ -0,0 +1,515 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcIqcApi } from '#/api/mes/qc/iqc';
+import type { MesQcIqcLineApi } from '#/api/mes/qc/iqc/line';
+
+import { h, markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { ElButton } from 'element-plus';
+
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getSimpleUserList } from '#/api/system/user';
+import { getRangePickerDefaultProps } from '#/utils';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
+import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
+/** 新增/修改的表单 */
+export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'sourceDocId',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'sourceLineId',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'status',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '检验单编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入检验单编号',
+      },
+      rules: 'required',
+      suffix: () =>
+        h(
+          ElButton,
+          {
+            onClick: async () => {
+              try {
+                const code = await generateAutoCode(
+                  MesAutoCodeRuleCode.QC_IQC_CODE,
+                );
+                await formApi?.setFieldValue('code', code);
+              } catch (error) {
+                console.error(error);
+              }
+            },
+          },
+          { default: () => '生成' },
+        ),
+    },
+    {
+      fieldName: 'name',
+      label: '检验单名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入检验单名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'sourceDocType',
+      label: '来源单据类型',
+      component: 'Select',
+      componentProps: {
+        disabled: true,
+        options: getDictOptions(DICT_TYPE.MES_QC_SOURCE_DOC_TYPE, 'number'),
+        placeholder: '来源单据类型',
+      },
+      dependencies: {
+        triggerFields: ['sourceDocType'],
+        show: (values) => !!values.sourceDocType,
+      },
+    },
+    {
+      fieldName: 'sourceDocCode',
+      label: '来源单据编号',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+        placeholder: '来源单据编号',
+      },
+      dependencies: {
+        triggerFields: ['sourceDocType', 'sourceDocId'],
+        show: (values) => !!values.sourceDocType && !!values.sourceDocId,
+      },
+    },
+    {
+      fieldName: 'itemId',
+      label: '产品物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择产品物料',
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['id', 'sourceDocId'],
+        componentProps: (values) => ({
+          disabled: !!values.id || !!values.sourceDocId,
+          placeholder: '请选择产品物料',
+        }),
+      },
+    },
+    {
+      fieldName: 'vendorId',
+      label: '供应商',
+      component: markRaw(MdVendorSelect),
+      componentProps: {
+        placeholder: '请选择供应商',
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['sourceDocId'],
+        componentProps: (values) => ({
+          disabled: !!values.sourceDocId,
+          placeholder: '请选择供应商',
+        }),
+      },
+    },
+    {
+      fieldName: 'vendorBatch',
+      label: '供应商批次号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入供应商批次号',
+      },
+    },
+    {
+      fieldName: 'receivedQuantity',
+      label: '本次接收数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入本次接收数量',
+        precision: 2,
+      },
+      rules: 'required',
+      dependencies: {
+        triggerFields: ['sourceDocId'],
+        componentProps: (values) => ({
+          class: '!w-full',
+          controlsPosition: 'right',
+          disabled: !!values.sourceDocId,
+          min: 0,
+          placeholder: '请输入本次接收数量',
+          precision: 2,
+        }),
+      },
+    },
+    {
+      fieldName: 'qualifiedQuantity',
+      label: '合格品数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入合格品数量',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'unqualifiedQuantity',
+      label: '不合格品数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入不合格品数量',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'receiveDate',
+      label: '来料日期',
+      component: 'DatePicker',
+      componentProps: {
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择来料日期',
+        type: 'date',
+        valueFormat: 'x',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'inspectorUserId',
+      label: '检测人员',
+      component: 'ApiSelect',
+      componentProps: {
+        api: getSimpleUserList,
+        clearable: true,
+        labelField: 'nickname',
+        placeholder: '请选择检测人员',
+        valueField: 'id',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'inspectDate',
+      label: '检测日期',
+      component: 'DatePicker',
+      componentProps: {
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择检测日期',
+        type: 'date',
+        valueFormat: 'x',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'checkResult',
+      label: '检测结果',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_QC_CHECK_RESULT, 'number'),
+        placeholder: '请选择检测结果',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '检验单编号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入检验单编号',
+      },
+    },
+    {
+      fieldName: 'vendorId',
+      label: '供应商',
+      component: markRaw(MdVendorSelect),
+      componentProps: {
+        placeholder: '请选择供应商',
+      },
+    },
+    {
+      fieldName: 'vendorBatch',
+      label: '供应商批次',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入供应商批次号',
+      },
+    },
+    {
+      fieldName: 'itemId',
+      label: '产品物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择产品物料',
+      },
+    },
+    {
+      fieldName: 'checkResult',
+      label: '检测结果',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_QC_CHECK_RESULT, 'number'),
+        placeholder: '请选择检测结果',
+      },
+    },
+    {
+      fieldName: 'receiveDate',
+      label: '来料日期',
+      component: 'DatePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+        type: 'daterange',
+      },
+    },
+    {
+      fieldName: 'inspectDate',
+      label: '检测日期',
+      component: 'DatePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+        type: 'daterange',
+      },
+    },
+    {
+      fieldName: 'inspectorUserId',
+      label: '检测人员',
+      component: 'ApiSelect',
+      componentProps: {
+        api: getSimpleUserList,
+        clearable: true,
+        labelField: 'nickname',
+        placeholder: '请选择检测人员',
+        valueField: 'id',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesQcIqcApi.Iqc>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '来料检验单编号',
+      width: 160,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '来料检验单名称',
+      minWidth: 180,
+    },
+    {
+      field: 'vendorNickname',
+      title: '供应商简称',
+      width: 120,
+    },
+    {
+      field: 'vendorBatch',
+      title: '供应商批次号',
+      width: 130,
+    },
+    {
+      field: 'itemCode',
+      title: '产品物料编码',
+      width: 130,
+    },
+    {
+      field: 'itemName',
+      title: '产品物料名称',
+      minWidth: 150,
+    },
+    {
+      field: 'receivedQuantity',
+      title: '接收数量',
+      width: 100,
+    },
+    {
+      field: 'checkQuantity',
+      title: '检测数量',
+      width: 100,
+    },
+    {
+      field: 'unqualifiedQuantity',
+      title: '不合格数',
+      width: 100,
+    },
+    {
+      field: 'checkResult',
+      title: '检测结果',
+      width: 110,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_QC_CHECK_RESULT },
+      },
+    },
+    {
+      field: 'receiveDate',
+      title: '来料日期',
+      width: 120,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'inspectDate',
+      title: '检测日期',
+      width: 120,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'inspectorNickname',
+      title: '检测人员',
+      width: 100,
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_ORDER_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 180,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 来料检验行子表的字段 */
+export function useLineGridColumns(): VxeTableGridOptions<MesQcIqcLineApi.IqcLine>['columns'] {
+  return [
+    {
+      field: 'indicatorName',
+      title: '检测项名称',
+      width: 150,
+    },
+    {
+      field: 'indicatorType',
+      title: '检测项类型',
+      width: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_INDICATOR_TYPE },
+      },
+    },
+    {
+      field: 'tool',
+      title: '检测工具',
+      width: 120,
+    },
+    {
+      field: 'checkMethod',
+      title: '检测要求',
+      minWidth: 180,
+    },
+    {
+      field: 'standardValue',
+      title: '标准值',
+      width: 100,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'maxThreshold',
+      title: '误差上限',
+      width: 100,
+    },
+    {
+      field: 'minThreshold',
+      title: '误差下限',
+      width: 100,
+    },
+    {
+      field: 'criticalQuantity',
+      title: '致命缺陷数',
+      width: 110,
+    },
+    {
+      field: 'majorQuantity',
+      title: '严重缺陷数',
+      width: 110,
+    },
+    {
+      field: 'minorQuantity',
+      title: '轻微缺陷数',
+      width: 110,
+    },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 150,
+    },
+    {
+      title: '操作',
+      width: 110,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/qc/iqc/index.vue b/apps/web-ele/src/views/mes/qc/iqc/index.vue
new file mode 100644
index 000000000..eadb60428
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/iqc/index.vue
@@ -0,0 +1,168 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcIqcApi } from '#/api/mes/qc/iqc';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { ElButton, ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { deleteIqc, exportIqc, getIqcPage } from '#/api/mes/qc/iqc';
+import { $t } from '#/locales';
+import { MesQcStatusEnum } from '#/views/mes/utils/constants';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建来料检验单 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看来料检验单 */
+function handleDetail(row: MesQcIqcApi.Iqc) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑来料检验单 */
+function handleEdit(row: MesQcIqcApi.Iqc) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 删除来料检验单 */
+async function handleDelete(row: MesQcIqcApi.Iqc) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.code]),
+  });
+  try {
+    await deleteIqc(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportIqc(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '来料检验单.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getIqcPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesQcIqcApi.Iqc>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【质量】来料检验（IQC）"
+        url="https://doc.iocoder.cn/mes/qc/iqc/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="来料检验单列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['来料检验单']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:qc-iqc:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:qc-iqc:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <ElButton link type="primary" @click="handleDetail(row)">
+          {{ row.code }}
+        </ElButton>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:qc-iqc:update'],
+              ifShow: row.status === MesQcStatusEnum.DRAFT,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:qc-iqc:delete'],
+              ifShow: row.status === MesQcStatusEnum.DRAFT,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: $t('common.detail'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.VIEW,
+              auth: ['mes:qc-iqc:query'],
+              onClick: handleDetail.bind(null, row),
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-ele/src/views/mes/qc/iqc/modules/form.vue b/apps/web-ele/src/views/mes/qc/iqc/modules/form.vue
new file mode 100644
index 000000000..74817b7d6
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/iqc/modules/form.vue
@@ -0,0 +1,237 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesQcIqcApi } from '#/api/mes/qc/iqc';
+
+import { computed, ref } from 'vue';
+
+import { confirm, useVbenModal } from '@vben/common-ui';
+
+import {
+  ElButton,
+  ElDescriptions,
+  ElDescriptionsItem,
+  ElMessage,
+  ElTabPane,
+  ElTabs,
+} from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createIqc,
+  finishIqc,
+  getIqc,
+  updateIqc,
+} from '#/api/mes/qc/iqc';
+import { $t } from '#/locales';
+import { MesQcStatusEnum, MesQcTypeEnum } from '#/views/mes/utils/constants';
+
+import { QcIndicatorResultList } from '../../indicatorresult/components';
+import { useFormSchema } from '../data';
+import LineList from './line-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesQcIqcApi.Iqc>();
+const subTabsName = ref('line');
+const originalSnapshot = ref(''); // 表单原始数据快照，用于 finish 时跳过未变更的保存请求
+const isDetail = computed(() => formType.value === 'detail');
+const canFinish = computed(
+  () =>
+    formType.value === 'update' &&
+    formData.value?.status === MesQcStatusEnum.DRAFT,
+);
+const getTitle = computed(() => {
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['来料检验单']);
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['来料检验单'])
+    : $t('ui.actionTitle.create', ['来料检验单']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  wrapperClass: 'grid-cols-3',
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+});
+
+/** 子表变更后刷新主表头数据（缺陷统计等） */
+async function handleRefresh() {
+  if (!formData.value?.id) {
+    return;
+  }
+  formData.value = await getIqc(formData.value.id);
+}
+
+/** 提交表单 */
+async function handleSubmit(): Promise<boolean> {
+  const { valid } = await formApi.validate();
+  if (!valid) {
+    return false;
+  }
+  const data = (await formApi.getValues()) as MesQcIqcApi.Iqc;
+  if (formData.value?.id) {
+    await updateIqc({ ...data, id: formData.value.id });
+    formData.value = { ...formData.value, ...data };
+  } else {
+    const id = await createIqc(data);
+    formData.value = {
+      ...data,
+      id: id as unknown as number,
+      status: MesQcStatusEnum.DRAFT,
+    };
+    await formApi.setFieldValue('id', formData.value.id);
+    await formApi.setFieldValue('status', formData.value.status);
+    formType.value = 'update';
+  }
+  // 刷新快照（已带上 id / status），下次 finish 用于判断是否需要再保存
+  originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  return true;
+}
+
+/** 完成检验单：表单有修改时先保存，再调用完成接口 */
+async function handleFinish() {
+  const id = formData.value?.id;
+  if (!id) {
+    return;
+  }
+  const { valid } = await formApi.validate();
+  if (!valid) {
+    return;
+  }
+  await confirm({
+    content: '是否完成来料检验单编制？【完成后将不能更改】',
+  });
+  modalApi.lock();
+  try {
+    const current = JSON.stringify(await formApi.getValues());
+    if (current !== originalSnapshot.value) {
+      const data = (await formApi.getValues()) as MesQcIqcApi.Iqc;
+      await updateIqc({ ...data, id });
+      formData.value = { ...formData.value, ...data };
+      originalSnapshot.value = current;
+    }
+    await finishIqc(id);
+    ElMessage.success('完成成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (isDetail.value) {
+      await modalApi.close();
+      return;
+    }
+    modalApi.lock();
+    try {
+      const ok = await handleSubmit();
+      if (!ok) {
+        return;
+      }
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+      await modalApi.close();
+      emit('success');
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      originalSnapshot.value = '';
+      return;
+    }
+    formApi.setState({ schema: useFormSchema(formApi) });
+    subTabsName.value = 'line';
+    // 加载数据
+    const data = modalApi.getData<{
+      formType: FormType;
+      id?: number;
+      prefill?: MesQcIqcApi.Iqc;
+    }>();
+    formType.value = data.formType;
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getIqc(data.id);
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    } else if (data?.prefill) {
+      // 预填模式：来自待检任务
+      formData.value = { ...data.prefill };
+      await formApi.setValues(data.prefill);
+    }
+    // 记录初始快照，后续 finish 用于判断是否需要再保存
+    originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-4/5">
+    <Form class="mx-4" />
+    <!-- 缺陷统计（只读） -->
+    <div v-if="formData?.id" class="mx-4 mt-4">
+      <ElDescriptions title="缺陷情况" :column="3" border size="small">
+        <ElDescriptionsItem label="致命缺陷数">
+          {{ formData.criticalQuantity ?? 0 }}
+        </ElDescriptionsItem>
+        <ElDescriptionsItem label="严重缺陷数">
+          {{ formData.majorQuantity ?? 0 }}
+        </ElDescriptionsItem>
+        <ElDescriptionsItem label="轻微缺陷数">
+          {{ formData.minorQuantity ?? 0 }}
+        </ElDescriptionsItem>
+        <ElDescriptionsItem label="致命缺陷率">
+          {{ formData.criticalRate ?? 0 }}%
+        </ElDescriptionsItem>
+        <ElDescriptionsItem label="严重缺陷率">
+          {{ formData.majorRate ?? 0 }}%
+        </ElDescriptionsItem>
+        <ElDescriptionsItem label="轻微缺陷率">
+          {{ formData.minorRate ?? 0 }}%
+        </ElDescriptionsItem>
+      </ElDescriptions>
+    </div>
+    <ElTabs v-if="formData?.id" v-model="subTabsName" class="mx-4 mt-4">
+      <ElTabPane label="检验项" name="line">
+        <LineList
+          :form-type="formType"
+          :iqc-id="formData.id"
+          @refresh="handleRefresh"
+        />
+      </ElTabPane>
+      <ElTabPane label="检测结果" name="result">
+        <QcIndicatorResultList
+          :qc-id="formData.id"
+          :qc-type="MesQcTypeEnum.IQC"
+          :readonly="isDetail"
+        />
+      </ElTabPane>
+    </ElTabs>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <ElButton v-if="canFinish" type="primary" @click="handleFinish">
+          完成
+        </ElButton>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/qc/iqc/modules/line-list.vue b/apps/web-ele/src/views/mes/qc/iqc/modules/line-list.vue
new file mode 100644
index 000000000..eadf2d1cc
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/iqc/modules/line-list.vue
@@ -0,0 +1,98 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcIqcLineApi } from '#/api/mes/qc/iqc/line';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getIqcLinePage } from '#/api/mes/qc/iqc/line';
+import { MesQcTypeEnum } from '#/views/mes/utils/constants';
+
+import { DefectRecordInlineList } from '../../defectrecord/components';
+import { useLineGridColumns } from '../data';
+
+const props = defineProps<{
+  formType?: string;
+  iqcId: number;
+}>();
+
+const emit = defineEmits<{ refresh: [] }>();
+
+const [DefectModal, defectModalApi] = useVbenModal({
+  connectedComponent: DefectRecordInlineList,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 缺陷记录变更后，刷新本表格并通知父组件刷新主表统计 */
+function handleDefectChanged() {
+  handleRefresh();
+  emit('refresh');
+}
+
+/** 打开缺陷记录弹窗 */
+function handleOpenDefect(row: MesQcIqcLineApi.IqcLine) {
+  defectModalApi
+    .setData({
+      formType: props.formType,
+      lineId: row.id,
+      qcId: props.iqcId,
+      qcType: MesQcTypeEnum.IQC,
+    })
+    .open();
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useLineGridColumns(),
+    height: 360,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.iqcId) {
+            return { list: [], total: 0 };
+          }
+          return await getIqcLinePage({
+            iqcId: props.iqcId,
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesQcIqcLineApi.IqcLine>,
+});
+</script>
+
+<template>
+  <div>
+    <DefectModal @success="handleDefectChanged" />
+    <Grid table-title="检验项">
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: '缺陷列表',
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.VIEW,
+              onClick: handleOpenDefect.bind(null, row),
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>

From 76260e67f30f94a733ae575b8c7dcdef78dde56d Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 29 May 2026 19:01:15 +0800
Subject: [PATCH 10/52] =?UTF-8?q?feat(mes):=20=E8=BF=81=E7=A7=BB=E4=B8=80?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=20api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/api/mes/qc/ipqc/index.ts    | 87 +++++++++++++++++++
 .../src/api/mes/qc/ipqc/line/index.ts         | 42 +++++++++
 apps/web-antd/src/api/mes/qc/oqc/index.ts     | 81 +++++++++++++++++
 .../web-antd/src/api/mes/qc/oqc/line/index.ts | 41 +++++++++
 apps/web-antd/src/api/mes/qc/rqc/index.ts     | 77 ++++++++++++++++
 .../web-antd/src/api/mes/qc/rqc/line/index.ts | 41 +++++++++
 .../components/qc-indicator-result-form.vue   |  7 +-
 .../web-antd/src/views/mes/utils/constants.ts |  3 +
 apps/web-ele/src/api/mes/qc/ipqc/index.ts     | 87 +++++++++++++++++++
 .../web-ele/src/api/mes/qc/ipqc/line/index.ts | 42 +++++++++
 apps/web-ele/src/api/mes/qc/oqc/index.ts      | 81 +++++++++++++++++
 apps/web-ele/src/api/mes/qc/oqc/line/index.ts | 41 +++++++++
 apps/web-ele/src/api/mes/qc/rqc/index.ts      | 77 ++++++++++++++++
 apps/web-ele/src/api/mes/qc/rqc/line/index.ts | 41 +++++++++
 .../components/qc-indicator-result-form.vue   |  7 +-
 apps/web-ele/src/views/mes/utils/constants.ts |  3 +
 packages/constants/src/dict-enum.ts           |  2 +
 17 files changed, 758 insertions(+), 2 deletions(-)
 create mode 100644 apps/web-antd/src/api/mes/qc/ipqc/index.ts
 create mode 100644 apps/web-antd/src/api/mes/qc/ipqc/line/index.ts
 create mode 100644 apps/web-antd/src/api/mes/qc/oqc/index.ts
 create mode 100644 apps/web-antd/src/api/mes/qc/oqc/line/index.ts
 create mode 100644 apps/web-antd/src/api/mes/qc/rqc/index.ts
 create mode 100644 apps/web-antd/src/api/mes/qc/rqc/line/index.ts
 create mode 100644 apps/web-ele/src/api/mes/qc/ipqc/index.ts
 create mode 100644 apps/web-ele/src/api/mes/qc/ipqc/line/index.ts
 create mode 100644 apps/web-ele/src/api/mes/qc/oqc/index.ts
 create mode 100644 apps/web-ele/src/api/mes/qc/oqc/line/index.ts
 create mode 100644 apps/web-ele/src/api/mes/qc/rqc/index.ts
 create mode 100644 apps/web-ele/src/api/mes/qc/rqc/line/index.ts

diff --git a/apps/web-antd/src/api/mes/qc/ipqc/index.ts b/apps/web-antd/src/api/mes/qc/ipqc/index.ts
new file mode 100644
index 000000000..9c885bedb
--- /dev/null
+++ b/apps/web-antd/src/api/mes/qc/ipqc/index.ts
@@ -0,0 +1,87 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesQcIpqcApi {
+  /** MES 过程检验单 */
+  export interface Ipqc {
+    id?: number; // 编号
+    code?: string; // 检验单编号
+    name?: string; // 检验单名称
+    type?: number; // IPQC 检验类型
+    templateId?: number; // 检验模板 ID
+    sourceDocType?: number; // 来源单据类型
+    sourceDocId?: number; // 来源单据 ID
+    sourceLineId?: number; // 来源单据行 ID
+    sourceDocCode?: string; // 来源单据编号（关联查询）
+    workOrderId?: number; // 生产工单 ID
+    workOrderCode?: string; // 工单编号（关联查询）
+    workOrderName?: string; // 工单名称（关联查询）
+    taskId?: number; // 生产任务 ID
+    workstationId?: number; // 工位 ID
+    workstationName?: string; // 工位名称（关联查询）
+    processId?: number; // 工序 ID
+    processName?: string; // 工序名称（关联查询）
+    itemId?: number; // 产品物料 ID
+    itemCode?: string; // 产品物料编码（关联查询）
+    itemName?: string; // 产品物料名称（关联查询）
+    itemSpecification?: string; // 规格型号（关联查询）
+    unitName?: string; // 单位名称（关联查询）
+    checkQuantity?: number; // 检测数量
+    qualifiedQuantity?: number; // 合格品数量
+    unqualifiedQuantity?: number; // 不合格品数量
+    laborScrapQuantity?: number; // 工废数量
+    materialScrapQuantity?: number; // 料废数量
+    otherScrapQuantity?: number; // 其他废品数量
+    criticalRate?: number; // 致命缺陷率（%）
+    majorRate?: number; // 严重缺陷率（%）
+    minorRate?: number; // 轻微缺陷率（%）
+    criticalQuantity?: number; // 致命缺陷数量
+    majorQuantity?: number; // 严重缺陷数量
+    minorQuantity?: number; // 轻微缺陷数量
+    checkResult?: number; // 检测结果
+    inspectDate?: number; // 检测日期
+    inspectorUserId?: number; // 检测人员用户 ID
+    inspectorNickname?: string; // 检测人员昵称（关联查询）
+    status?: number; // 状态
+    remark?: string; // 备注
+  }
+}
+
+/** 查询过程检验单分页 */
+export function getIpqcPage(params: PageParam) {
+  return requestClient.get<PageResult<MesQcIpqcApi.Ipqc>>(
+    '/mes/qc/ipqc/page',
+    { params },
+  );
+}
+
+/** 查询过程检验单详情 */
+export function getIpqc(id: number) {
+  return requestClient.get<MesQcIpqcApi.Ipqc>(`/mes/qc/ipqc/get?id=${id}`);
+}
+
+/** 新增过程检验单 */
+export function createIpqc(data: MesQcIpqcApi.Ipqc) {
+  return requestClient.post('/mes/qc/ipqc/create', data);
+}
+
+/** 修改过程检验单 */
+export function updateIpqc(data: MesQcIpqcApi.Ipqc) {
+  return requestClient.put('/mes/qc/ipqc/update', data);
+}
+
+/** 完成过程检验单 */
+export function finishIpqc(id: number) {
+  return requestClient.put(`/mes/qc/ipqc/finish?id=${id}`);
+}
+
+/** 删除过程检验单 */
+export function deleteIpqc(id: number) {
+  return requestClient.delete(`/mes/qc/ipqc/delete?id=${id}`);
+}
+
+/** 导出过程检验单 */
+export function exportIpqc(params: any) {
+  return requestClient.download('/mes/qc/ipqc/export-excel', { params });
+}
diff --git a/apps/web-antd/src/api/mes/qc/ipqc/line/index.ts b/apps/web-antd/src/api/mes/qc/ipqc/line/index.ts
new file mode 100644
index 000000000..4f114c845
--- /dev/null
+++ b/apps/web-antd/src/api/mes/qc/ipqc/line/index.ts
@@ -0,0 +1,42 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesQcIpqcLineApi {
+  /** MES 过程检验单行 */
+  export interface IpqcLine {
+    id?: number; // 编号
+    ipqcId?: number; // 过程检验单 ID
+    indicatorId?: number; // 检测指标 ID
+    indicatorCode?: string; // 检测指标编码（关联查询）
+    indicatorName?: string; // 检测指标名称（关联查询）
+    indicatorType?: number; // 检测指标类型（关联查询）
+    toolId?: number; // 检测工具 ID
+    toolName?: string; // 检测工具名称（关联查询）
+    checkMethod?: string; // 检测方法
+    standardValue?: number; // 标准值
+    unitMeasureId?: number; // 计量单位 ID
+    unitMeasureName?: string; // 计量单位名称（关联查询）
+    maxThreshold?: number; // 误差上限
+    minThreshold?: number; // 误差下限
+    criticalQuantity?: number; // 致命缺陷数量
+    majorQuantity?: number; // 严重缺陷数量
+    minorQuantity?: number; // 轻微缺陷数量
+    remark?: string; // 备注
+  }
+}
+
+/** 查询过程检验单行分页 */
+export function getIpqcLinePage(params: PageParam & { ipqcId?: number }) {
+  return requestClient.get<PageResult<MesQcIpqcLineApi.IpqcLine>>(
+    '/mes/qc/ipqc/line/page',
+    { params },
+  );
+}
+
+/** 查询过程检验单行详情 */
+export function getIpqcLine(id: number) {
+  return requestClient.get<MesQcIpqcLineApi.IpqcLine>(
+    `/mes/qc/ipqc/line/get?id=${id}`,
+  );
+}
diff --git a/apps/web-antd/src/api/mes/qc/oqc/index.ts b/apps/web-antd/src/api/mes/qc/oqc/index.ts
new file mode 100644
index 000000000..793f6db43
--- /dev/null
+++ b/apps/web-antd/src/api/mes/qc/oqc/index.ts
@@ -0,0 +1,81 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesQcOqcApi {
+  /** MES 出货检验单 */
+  export interface Oqc {
+    id?: number; // 编号
+    code?: string; // 检验单编号
+    name?: string; // 检验单名称
+    templateId?: number; // 检验模板 ID
+    sourceDocType?: number; // 来源单据类型
+    sourceDocId?: number; // 来源单据 ID
+    sourceLineId?: number; // 来源单据行 ID
+    sourceDocCode?: string; // 来源单据编号（关联查询）
+    clientId?: number; // 客户 ID
+    clientNickname?: string; // 客户简称（关联查询）
+    batchCode?: string; // 批次号
+    itemId?: number; // 产品物料 ID
+    itemCode?: string; // 产品物料编码（关联查询）
+    itemName?: string; // 产品物料名称（关联查询）
+    itemSpecification?: string; // 规格型号（关联查询）
+    unitName?: string; // 单位名称（关联查询）
+    minCheckQuantity?: number; // 最低检测数
+    maxUnqualifiedQuantity?: number; // 最大不合格数
+    outQuantity?: number; // 本次出货数量
+    checkQuantity?: number; // 本次检测数量
+    qualifiedQuantity?: number; // 合格品数量
+    unqualifiedQuantity?: number; // 不合格品数量
+    criticalRate?: number; // 致命缺陷率（%）
+    majorRate?: number; // 严重缺陷率（%）
+    minorRate?: number; // 轻微缺陷率（%）
+    criticalQuantity?: number; // 致命缺陷数量
+    majorQuantity?: number; // 严重缺陷数量
+    minorQuantity?: number; // 轻微缺陷数量
+    checkResult?: number; // 检测结果
+    outDate?: number; // 出货日期
+    inspectDate?: number; // 检测日期
+    inspectorUserId?: number; // 检测人员用户 ID
+    inspectorNickname?: string; // 检测人员昵称（关联查询）
+    status?: number; // 状态
+    remark?: string; // 备注
+  }
+}
+
+/** 查询出货检验单分页 */
+export function getOqcPage(params: PageParam) {
+  return requestClient.get<PageResult<MesQcOqcApi.Oqc>>('/mes/qc/oqc/page', {
+    params,
+  });
+}
+
+/** 查询出货检验单详情 */
+export function getOqc(id: number) {
+  return requestClient.get<MesQcOqcApi.Oqc>(`/mes/qc/oqc/get?id=${id}`);
+}
+
+/** 新增出货检验单 */
+export function createOqc(data: MesQcOqcApi.Oqc) {
+  return requestClient.post('/mes/qc/oqc/create', data);
+}
+
+/** 修改出货检验单 */
+export function updateOqc(data: MesQcOqcApi.Oqc) {
+  return requestClient.put('/mes/qc/oqc/update', data);
+}
+
+/** 完成出货检验单 */
+export function finishOqc(id: number) {
+  return requestClient.put(`/mes/qc/oqc/finish?id=${id}`);
+}
+
+/** 删除出货检验单 */
+export function deleteOqc(id: number) {
+  return requestClient.delete(`/mes/qc/oqc/delete?id=${id}`);
+}
+
+/** 导出出货检验单 */
+export function exportOqc(params: any) {
+  return requestClient.download('/mes/qc/oqc/export-excel', { params });
+}
diff --git a/apps/web-antd/src/api/mes/qc/oqc/line/index.ts b/apps/web-antd/src/api/mes/qc/oqc/line/index.ts
new file mode 100644
index 000000000..aa7deb59a
--- /dev/null
+++ b/apps/web-antd/src/api/mes/qc/oqc/line/index.ts
@@ -0,0 +1,41 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesQcOqcLineApi {
+  /** MES 出货检验单行 */
+  export interface OqcLine {
+    id?: number; // 编号
+    oqcId?: number; // 出货检验单 ID
+    indicatorId?: number; // 检测指标 ID
+    indicatorCode?: string; // 检测指标编码（关联查询）
+    indicatorName?: string; // 检测指标名称（关联查询）
+    indicatorType?: number; // 检测指标类型（关联查询）
+    tool?: string; // 检测工具
+    checkMethod?: string; // 检测方法
+    standardValue?: number; // 标准值
+    unitMeasureId?: number; // 计量单位 ID
+    unitMeasureName?: string; // 计量单位名称（关联查询）
+    maxThreshold?: number; // 误差上限
+    minThreshold?: number; // 误差下限
+    criticalQuantity?: number; // 致命缺陷数量
+    majorQuantity?: number; // 严重缺陷数量
+    minorQuantity?: number; // 轻微缺陷数量
+    remark?: string; // 备注
+  }
+}
+
+/** 查询出货检验单行分页 */
+export function getOqcLinePage(params: PageParam & { oqcId?: number }) {
+  return requestClient.get<PageResult<MesQcOqcLineApi.OqcLine>>(
+    '/mes/qc/oqc/line/page',
+    { params },
+  );
+}
+
+/** 查询出货检验单行详情 */
+export function getOqcLine(id: number) {
+  return requestClient.get<MesQcOqcLineApi.OqcLine>(
+    `/mes/qc/oqc/line/get?id=${id}`,
+  );
+}
diff --git a/apps/web-antd/src/api/mes/qc/rqc/index.ts b/apps/web-antd/src/api/mes/qc/rqc/index.ts
new file mode 100644
index 000000000..60b54da15
--- /dev/null
+++ b/apps/web-antd/src/api/mes/qc/rqc/index.ts
@@ -0,0 +1,77 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesQcRqcApi {
+  /** MES 退货检验单 */
+  export interface Rqc {
+    id?: number; // 编号
+    code?: string; // 检验单编号
+    name?: string; // 检验单名称
+    templateId?: number; // 检验模板 ID
+    sourceDocType?: number; // 来源单据类型
+    sourceDocId?: number; // 来源单据 ID
+    sourceLineId?: number; // 来源单据行 ID
+    sourceDocCode?: string; // 来源单据编号（关联查询）
+    type?: number; // 检验类型
+    itemId?: number; // 产品物料 ID
+    itemCode?: string; // 产品物料编码（关联查询）
+    itemName?: string; // 产品物料名称（关联查询）
+    itemSpecification?: string; // 规格型号（关联查询）
+    unitName?: string; // 单位名称（关联查询）
+    batchCode?: string; // 批次号
+    checkQuantity?: number; // 检测数量
+    qualifiedQuantity?: number; // 合格品数量
+    unqualifiedQuantity?: number; // 不合格数量
+    checkResult?: number; // 检测结果
+    inspectDate?: number; // 检测日期
+    inspectorUserId?: number; // 检测人员用户 ID
+    inspectorNickname?: string; // 检测人员昵称（关联查询）
+    status?: number; // 状态
+    remark?: string; // 备注
+    // 缺陷统计
+    criticalRate?: number; // 致命缺陷率（%）
+    majorRate?: number; // 严重缺陷率（%）
+    minorRate?: number; // 轻微缺陷率（%）
+    criticalQuantity?: number; // 致命缺陷数量
+    majorQuantity?: number; // 严重缺陷数量
+    minorQuantity?: number; // 轻微缺陷数量
+  }
+}
+
+/** 查询退货检验单分页 */
+export function getRqcPage(params: PageParam) {
+  return requestClient.get<PageResult<MesQcRqcApi.Rqc>>('/mes/qc/rqc/page', {
+    params,
+  });
+}
+
+/** 查询退货检验单详情 */
+export function getRqc(id: number) {
+  return requestClient.get<MesQcRqcApi.Rqc>(`/mes/qc/rqc/get?id=${id}`);
+}
+
+/** 新增退货检验单 */
+export function createRqc(data: MesQcRqcApi.Rqc) {
+  return requestClient.post<number>('/mes/qc/rqc/create', data);
+}
+
+/** 修改退货检验单 */
+export function updateRqc(data: MesQcRqcApi.Rqc) {
+  return requestClient.put('/mes/qc/rqc/update', data);
+}
+
+/** 完成退货检验单 */
+export function finishRqc(id: number) {
+  return requestClient.put(`/mes/qc/rqc/finish?id=${id}`);
+}
+
+/** 删除退货检验单 */
+export function deleteRqc(id: number) {
+  return requestClient.delete(`/mes/qc/rqc/delete?id=${id}`);
+}
+
+/** 导出退货检验单 */
+export function exportRqc(params: any) {
+  return requestClient.download('/mes/qc/rqc/export-excel', { params });
+}
diff --git a/apps/web-antd/src/api/mes/qc/rqc/line/index.ts b/apps/web-antd/src/api/mes/qc/rqc/line/index.ts
new file mode 100644
index 000000000..abb44a758
--- /dev/null
+++ b/apps/web-antd/src/api/mes/qc/rqc/line/index.ts
@@ -0,0 +1,41 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesQcRqcLineApi {
+  /** MES 退货检验单行 */
+  export interface RqcLine {
+    id?: number; // 编号
+    rqcId?: number; // 退货检验单 ID
+    indicatorId?: number; // 检测指标 ID
+    indicatorCode?: string; // 检测指标编码（关联查询）
+    indicatorName?: string; // 检测指标名称（关联查询）
+    indicatorType?: number; // 检测指标类型（关联查询）
+    tool?: string; // 检测工具
+    checkMethod?: string; // 检测方法
+    standardValue?: number; // 标准值
+    unitMeasureId?: number; // 计量单位 ID
+    unitMeasureName?: string; // 计量单位名称（关联查询）
+    maxThreshold?: number; // 误差上限
+    minThreshold?: number; // 误差下限
+    criticalQuantity?: number; // 致命缺陷数量
+    majorQuantity?: number; // 严重缺陷数量
+    minorQuantity?: number; // 轻微缺陷数量
+    remark?: string; // 备注
+  }
+}
+
+/** 查询退货检验单行分页 */
+export function getRqcLinePage(params: PageParam & { rqcId?: number }) {
+  return requestClient.get<PageResult<MesQcRqcLineApi.RqcLine>>(
+    '/mes/qc/rqc/line/page',
+    { params },
+  );
+}
+
+/** 查询退货检验单行详情 */
+export function getRqcLine(id: number) {
+  return requestClient.get<MesQcRqcLineApi.RqcLine>(
+    `/mes/qc/rqc/line/get?id=${id}`,
+  );
+}
diff --git a/apps/web-antd/src/views/mes/qc/indicatorresult/components/qc-indicator-result-form.vue b/apps/web-antd/src/views/mes/qc/indicatorresult/components/qc-indicator-result-form.vue
index d7d7c9f27..4a95486d6 100644
--- a/apps/web-antd/src/views/mes/qc/indicatorresult/components/qc-indicator-result-form.vue
+++ b/apps/web-antd/src/views/mes/qc/indicatorresult/components/qc-indicator-result-form.vue
@@ -65,7 +65,12 @@ const [Form, formApi] = useVbenForm({
 
 /** 获取字典选项（valueSpecification 为系统字典类型名） */
 function getValueOptions(dictType?: string) {
-  return dictType ? getDictOptions(dictType, 'string') : [];
+  return dictType
+    ? getDictOptions(dictType, 'string').map(({ label, value }) => ({
+        label,
+        value: String(value),
+      }))
+    : [];
 }
 
 const [Modal, modalApi] = useVbenModal({
diff --git a/apps/web-antd/src/views/mes/utils/constants.ts b/apps/web-antd/src/views/mes/utils/constants.ts
index d931e83d1..30427941b 100644
--- a/apps/web-antd/src/views/mes/utils/constants.ts
+++ b/apps/web-antd/src/views/mes/utils/constants.ts
@@ -143,6 +143,9 @@ export const MesAutoCodeRuleCode = {
   QC_INDICATOR_CODE: 'QC_INDICATOR_CODE',
   QC_INDICATOR_RESULT_CODE: 'QC_INDICATOR_RESULT_CODE',
   QC_IQC_CODE: 'QC_IQC_CODE',
+  QC_IPQC_CODE: 'QC_IPQC_CODE',
+  QC_OQC_CODE: 'QC_OQC_CODE',
+  QC_RQC_CODE: 'QC_RQC_CODE',
   QC_TEMPLATE_CODE: 'QC_TEMPLATE_CODE',
   TM_TOOL_TYPE_CODE: 'TM_TOOL_TYPE_CODE',
   TM_TOOL_CODE: 'TM_TOOL_CODE',
diff --git a/apps/web-ele/src/api/mes/qc/ipqc/index.ts b/apps/web-ele/src/api/mes/qc/ipqc/index.ts
new file mode 100644
index 000000000..9c885bedb
--- /dev/null
+++ b/apps/web-ele/src/api/mes/qc/ipqc/index.ts
@@ -0,0 +1,87 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesQcIpqcApi {
+  /** MES 过程检验单 */
+  export interface Ipqc {
+    id?: number; // 编号
+    code?: string; // 检验单编号
+    name?: string; // 检验单名称
+    type?: number; // IPQC 检验类型
+    templateId?: number; // 检验模板 ID
+    sourceDocType?: number; // 来源单据类型
+    sourceDocId?: number; // 来源单据 ID
+    sourceLineId?: number; // 来源单据行 ID
+    sourceDocCode?: string; // 来源单据编号（关联查询）
+    workOrderId?: number; // 生产工单 ID
+    workOrderCode?: string; // 工单编号（关联查询）
+    workOrderName?: string; // 工单名称（关联查询）
+    taskId?: number; // 生产任务 ID
+    workstationId?: number; // 工位 ID
+    workstationName?: string; // 工位名称（关联查询）
+    processId?: number; // 工序 ID
+    processName?: string; // 工序名称（关联查询）
+    itemId?: number; // 产品物料 ID
+    itemCode?: string; // 产品物料编码（关联查询）
+    itemName?: string; // 产品物料名称（关联查询）
+    itemSpecification?: string; // 规格型号（关联查询）
+    unitName?: string; // 单位名称（关联查询）
+    checkQuantity?: number; // 检测数量
+    qualifiedQuantity?: number; // 合格品数量
+    unqualifiedQuantity?: number; // 不合格品数量
+    laborScrapQuantity?: number; // 工废数量
+    materialScrapQuantity?: number; // 料废数量
+    otherScrapQuantity?: number; // 其他废品数量
+    criticalRate?: number; // 致命缺陷率（%）
+    majorRate?: number; // 严重缺陷率（%）
+    minorRate?: number; // 轻微缺陷率（%）
+    criticalQuantity?: number; // 致命缺陷数量
+    majorQuantity?: number; // 严重缺陷数量
+    minorQuantity?: number; // 轻微缺陷数量
+    checkResult?: number; // 检测结果
+    inspectDate?: number; // 检测日期
+    inspectorUserId?: number; // 检测人员用户 ID
+    inspectorNickname?: string; // 检测人员昵称（关联查询）
+    status?: number; // 状态
+    remark?: string; // 备注
+  }
+}
+
+/** 查询过程检验单分页 */
+export function getIpqcPage(params: PageParam) {
+  return requestClient.get<PageResult<MesQcIpqcApi.Ipqc>>(
+    '/mes/qc/ipqc/page',
+    { params },
+  );
+}
+
+/** 查询过程检验单详情 */
+export function getIpqc(id: number) {
+  return requestClient.get<MesQcIpqcApi.Ipqc>(`/mes/qc/ipqc/get?id=${id}`);
+}
+
+/** 新增过程检验单 */
+export function createIpqc(data: MesQcIpqcApi.Ipqc) {
+  return requestClient.post('/mes/qc/ipqc/create', data);
+}
+
+/** 修改过程检验单 */
+export function updateIpqc(data: MesQcIpqcApi.Ipqc) {
+  return requestClient.put('/mes/qc/ipqc/update', data);
+}
+
+/** 完成过程检验单 */
+export function finishIpqc(id: number) {
+  return requestClient.put(`/mes/qc/ipqc/finish?id=${id}`);
+}
+
+/** 删除过程检验单 */
+export function deleteIpqc(id: number) {
+  return requestClient.delete(`/mes/qc/ipqc/delete?id=${id}`);
+}
+
+/** 导出过程检验单 */
+export function exportIpqc(params: any) {
+  return requestClient.download('/mes/qc/ipqc/export-excel', { params });
+}
diff --git a/apps/web-ele/src/api/mes/qc/ipqc/line/index.ts b/apps/web-ele/src/api/mes/qc/ipqc/line/index.ts
new file mode 100644
index 000000000..4f114c845
--- /dev/null
+++ b/apps/web-ele/src/api/mes/qc/ipqc/line/index.ts
@@ -0,0 +1,42 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesQcIpqcLineApi {
+  /** MES 过程检验单行 */
+  export interface IpqcLine {
+    id?: number; // 编号
+    ipqcId?: number; // 过程检验单 ID
+    indicatorId?: number; // 检测指标 ID
+    indicatorCode?: string; // 检测指标编码（关联查询）
+    indicatorName?: string; // 检测指标名称（关联查询）
+    indicatorType?: number; // 检测指标类型（关联查询）
+    toolId?: number; // 检测工具 ID
+    toolName?: string; // 检测工具名称（关联查询）
+    checkMethod?: string; // 检测方法
+    standardValue?: number; // 标准值
+    unitMeasureId?: number; // 计量单位 ID
+    unitMeasureName?: string; // 计量单位名称（关联查询）
+    maxThreshold?: number; // 误差上限
+    minThreshold?: number; // 误差下限
+    criticalQuantity?: number; // 致命缺陷数量
+    majorQuantity?: number; // 严重缺陷数量
+    minorQuantity?: number; // 轻微缺陷数量
+    remark?: string; // 备注
+  }
+}
+
+/** 查询过程检验单行分页 */
+export function getIpqcLinePage(params: PageParam & { ipqcId?: number }) {
+  return requestClient.get<PageResult<MesQcIpqcLineApi.IpqcLine>>(
+    '/mes/qc/ipqc/line/page',
+    { params },
+  );
+}
+
+/** 查询过程检验单行详情 */
+export function getIpqcLine(id: number) {
+  return requestClient.get<MesQcIpqcLineApi.IpqcLine>(
+    `/mes/qc/ipqc/line/get?id=${id}`,
+  );
+}
diff --git a/apps/web-ele/src/api/mes/qc/oqc/index.ts b/apps/web-ele/src/api/mes/qc/oqc/index.ts
new file mode 100644
index 000000000..793f6db43
--- /dev/null
+++ b/apps/web-ele/src/api/mes/qc/oqc/index.ts
@@ -0,0 +1,81 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesQcOqcApi {
+  /** MES 出货检验单 */
+  export interface Oqc {
+    id?: number; // 编号
+    code?: string; // 检验单编号
+    name?: string; // 检验单名称
+    templateId?: number; // 检验模板 ID
+    sourceDocType?: number; // 来源单据类型
+    sourceDocId?: number; // 来源单据 ID
+    sourceLineId?: number; // 来源单据行 ID
+    sourceDocCode?: string; // 来源单据编号（关联查询）
+    clientId?: number; // 客户 ID
+    clientNickname?: string; // 客户简称（关联查询）
+    batchCode?: string; // 批次号
+    itemId?: number; // 产品物料 ID
+    itemCode?: string; // 产品物料编码（关联查询）
+    itemName?: string; // 产品物料名称（关联查询）
+    itemSpecification?: string; // 规格型号（关联查询）
+    unitName?: string; // 单位名称（关联查询）
+    minCheckQuantity?: number; // 最低检测数
+    maxUnqualifiedQuantity?: number; // 最大不合格数
+    outQuantity?: number; // 本次出货数量
+    checkQuantity?: number; // 本次检测数量
+    qualifiedQuantity?: number; // 合格品数量
+    unqualifiedQuantity?: number; // 不合格品数量
+    criticalRate?: number; // 致命缺陷率（%）
+    majorRate?: number; // 严重缺陷率（%）
+    minorRate?: number; // 轻微缺陷率（%）
+    criticalQuantity?: number; // 致命缺陷数量
+    majorQuantity?: number; // 严重缺陷数量
+    minorQuantity?: number; // 轻微缺陷数量
+    checkResult?: number; // 检测结果
+    outDate?: number; // 出货日期
+    inspectDate?: number; // 检测日期
+    inspectorUserId?: number; // 检测人员用户 ID
+    inspectorNickname?: string; // 检测人员昵称（关联查询）
+    status?: number; // 状态
+    remark?: string; // 备注
+  }
+}
+
+/** 查询出货检验单分页 */
+export function getOqcPage(params: PageParam) {
+  return requestClient.get<PageResult<MesQcOqcApi.Oqc>>('/mes/qc/oqc/page', {
+    params,
+  });
+}
+
+/** 查询出货检验单详情 */
+export function getOqc(id: number) {
+  return requestClient.get<MesQcOqcApi.Oqc>(`/mes/qc/oqc/get?id=${id}`);
+}
+
+/** 新增出货检验单 */
+export function createOqc(data: MesQcOqcApi.Oqc) {
+  return requestClient.post('/mes/qc/oqc/create', data);
+}
+
+/** 修改出货检验单 */
+export function updateOqc(data: MesQcOqcApi.Oqc) {
+  return requestClient.put('/mes/qc/oqc/update', data);
+}
+
+/** 完成出货检验单 */
+export function finishOqc(id: number) {
+  return requestClient.put(`/mes/qc/oqc/finish?id=${id}`);
+}
+
+/** 删除出货检验单 */
+export function deleteOqc(id: number) {
+  return requestClient.delete(`/mes/qc/oqc/delete?id=${id}`);
+}
+
+/** 导出出货检验单 */
+export function exportOqc(params: any) {
+  return requestClient.download('/mes/qc/oqc/export-excel', { params });
+}
diff --git a/apps/web-ele/src/api/mes/qc/oqc/line/index.ts b/apps/web-ele/src/api/mes/qc/oqc/line/index.ts
new file mode 100644
index 000000000..aa7deb59a
--- /dev/null
+++ b/apps/web-ele/src/api/mes/qc/oqc/line/index.ts
@@ -0,0 +1,41 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesQcOqcLineApi {
+  /** MES 出货检验单行 */
+  export interface OqcLine {
+    id?: number; // 编号
+    oqcId?: number; // 出货检验单 ID
+    indicatorId?: number; // 检测指标 ID
+    indicatorCode?: string; // 检测指标编码（关联查询）
+    indicatorName?: string; // 检测指标名称（关联查询）
+    indicatorType?: number; // 检测指标类型（关联查询）
+    tool?: string; // 检测工具
+    checkMethod?: string; // 检测方法
+    standardValue?: number; // 标准值
+    unitMeasureId?: number; // 计量单位 ID
+    unitMeasureName?: string; // 计量单位名称（关联查询）
+    maxThreshold?: number; // 误差上限
+    minThreshold?: number; // 误差下限
+    criticalQuantity?: number; // 致命缺陷数量
+    majorQuantity?: number; // 严重缺陷数量
+    minorQuantity?: number; // 轻微缺陷数量
+    remark?: string; // 备注
+  }
+}
+
+/** 查询出货检验单行分页 */
+export function getOqcLinePage(params: PageParam & { oqcId?: number }) {
+  return requestClient.get<PageResult<MesQcOqcLineApi.OqcLine>>(
+    '/mes/qc/oqc/line/page',
+    { params },
+  );
+}
+
+/** 查询出货检验单行详情 */
+export function getOqcLine(id: number) {
+  return requestClient.get<MesQcOqcLineApi.OqcLine>(
+    `/mes/qc/oqc/line/get?id=${id}`,
+  );
+}
diff --git a/apps/web-ele/src/api/mes/qc/rqc/index.ts b/apps/web-ele/src/api/mes/qc/rqc/index.ts
new file mode 100644
index 000000000..60b54da15
--- /dev/null
+++ b/apps/web-ele/src/api/mes/qc/rqc/index.ts
@@ -0,0 +1,77 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesQcRqcApi {
+  /** MES 退货检验单 */
+  export interface Rqc {
+    id?: number; // 编号
+    code?: string; // 检验单编号
+    name?: string; // 检验单名称
+    templateId?: number; // 检验模板 ID
+    sourceDocType?: number; // 来源单据类型
+    sourceDocId?: number; // 来源单据 ID
+    sourceLineId?: number; // 来源单据行 ID
+    sourceDocCode?: string; // 来源单据编号（关联查询）
+    type?: number; // 检验类型
+    itemId?: number; // 产品物料 ID
+    itemCode?: string; // 产品物料编码（关联查询）
+    itemName?: string; // 产品物料名称（关联查询）
+    itemSpecification?: string; // 规格型号（关联查询）
+    unitName?: string; // 单位名称（关联查询）
+    batchCode?: string; // 批次号
+    checkQuantity?: number; // 检测数量
+    qualifiedQuantity?: number; // 合格品数量
+    unqualifiedQuantity?: number; // 不合格数量
+    checkResult?: number; // 检测结果
+    inspectDate?: number; // 检测日期
+    inspectorUserId?: number; // 检测人员用户 ID
+    inspectorNickname?: string; // 检测人员昵称（关联查询）
+    status?: number; // 状态
+    remark?: string; // 备注
+    // 缺陷统计
+    criticalRate?: number; // 致命缺陷率（%）
+    majorRate?: number; // 严重缺陷率（%）
+    minorRate?: number; // 轻微缺陷率（%）
+    criticalQuantity?: number; // 致命缺陷数量
+    majorQuantity?: number; // 严重缺陷数量
+    minorQuantity?: number; // 轻微缺陷数量
+  }
+}
+
+/** 查询退货检验单分页 */
+export function getRqcPage(params: PageParam) {
+  return requestClient.get<PageResult<MesQcRqcApi.Rqc>>('/mes/qc/rqc/page', {
+    params,
+  });
+}
+
+/** 查询退货检验单详情 */
+export function getRqc(id: number) {
+  return requestClient.get<MesQcRqcApi.Rqc>(`/mes/qc/rqc/get?id=${id}`);
+}
+
+/** 新增退货检验单 */
+export function createRqc(data: MesQcRqcApi.Rqc) {
+  return requestClient.post<number>('/mes/qc/rqc/create', data);
+}
+
+/** 修改退货检验单 */
+export function updateRqc(data: MesQcRqcApi.Rqc) {
+  return requestClient.put('/mes/qc/rqc/update', data);
+}
+
+/** 完成退货检验单 */
+export function finishRqc(id: number) {
+  return requestClient.put(`/mes/qc/rqc/finish?id=${id}`);
+}
+
+/** 删除退货检验单 */
+export function deleteRqc(id: number) {
+  return requestClient.delete(`/mes/qc/rqc/delete?id=${id}`);
+}
+
+/** 导出退货检验单 */
+export function exportRqc(params: any) {
+  return requestClient.download('/mes/qc/rqc/export-excel', { params });
+}
diff --git a/apps/web-ele/src/api/mes/qc/rqc/line/index.ts b/apps/web-ele/src/api/mes/qc/rqc/line/index.ts
new file mode 100644
index 000000000..abb44a758
--- /dev/null
+++ b/apps/web-ele/src/api/mes/qc/rqc/line/index.ts
@@ -0,0 +1,41 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesQcRqcLineApi {
+  /** MES 退货检验单行 */
+  export interface RqcLine {
+    id?: number; // 编号
+    rqcId?: number; // 退货检验单 ID
+    indicatorId?: number; // 检测指标 ID
+    indicatorCode?: string; // 检测指标编码（关联查询）
+    indicatorName?: string; // 检测指标名称（关联查询）
+    indicatorType?: number; // 检测指标类型（关联查询）
+    tool?: string; // 检测工具
+    checkMethod?: string; // 检测方法
+    standardValue?: number; // 标准值
+    unitMeasureId?: number; // 计量单位 ID
+    unitMeasureName?: string; // 计量单位名称（关联查询）
+    maxThreshold?: number; // 误差上限
+    minThreshold?: number; // 误差下限
+    criticalQuantity?: number; // 致命缺陷数量
+    majorQuantity?: number; // 严重缺陷数量
+    minorQuantity?: number; // 轻微缺陷数量
+    remark?: string; // 备注
+  }
+}
+
+/** 查询退货检验单行分页 */
+export function getRqcLinePage(params: PageParam & { rqcId?: number }) {
+  return requestClient.get<PageResult<MesQcRqcLineApi.RqcLine>>(
+    '/mes/qc/rqc/line/page',
+    { params },
+  );
+}
+
+/** 查询退货检验单行详情 */
+export function getRqcLine(id: number) {
+  return requestClient.get<MesQcRqcLineApi.RqcLine>(
+    `/mes/qc/rqc/line/get?id=${id}`,
+  );
+}
diff --git a/apps/web-ele/src/views/mes/qc/indicatorresult/components/qc-indicator-result-form.vue b/apps/web-ele/src/views/mes/qc/indicatorresult/components/qc-indicator-result-form.vue
index 398fac75a..a7cc9dfba 100644
--- a/apps/web-ele/src/views/mes/qc/indicatorresult/components/qc-indicator-result-form.vue
+++ b/apps/web-ele/src/views/mes/qc/indicatorresult/components/qc-indicator-result-form.vue
@@ -66,7 +66,12 @@ const [Form, formApi] = useVbenForm({
 
 /** 获取字典选项（valueSpecification 为系统字典类型名） */
 function getValueOptions(dictType?: string) {
-  return dictType ? getDictOptions(dictType, 'string') : [];
+  return dictType
+    ? getDictOptions(dictType, 'string').map(({ label, value }) => ({
+        label,
+        value: String(value),
+      }))
+    : [];
 }
 
 const [Modal, modalApi] = useVbenModal({
diff --git a/apps/web-ele/src/views/mes/utils/constants.ts b/apps/web-ele/src/views/mes/utils/constants.ts
index d931e83d1..30427941b 100644
--- a/apps/web-ele/src/views/mes/utils/constants.ts
+++ b/apps/web-ele/src/views/mes/utils/constants.ts
@@ -143,6 +143,9 @@ export const MesAutoCodeRuleCode = {
   QC_INDICATOR_CODE: 'QC_INDICATOR_CODE',
   QC_INDICATOR_RESULT_CODE: 'QC_INDICATOR_RESULT_CODE',
   QC_IQC_CODE: 'QC_IQC_CODE',
+  QC_IPQC_CODE: 'QC_IPQC_CODE',
+  QC_OQC_CODE: 'QC_OQC_CODE',
+  QC_RQC_CODE: 'QC_RQC_CODE',
   QC_TEMPLATE_CODE: 'QC_TEMPLATE_CODE',
   TM_TOOL_TYPE_CODE: 'TM_TOOL_TYPE_CODE',
   TM_TOOL_CODE: 'TM_TOOL_CODE',
diff --git a/packages/constants/src/dict-enum.ts b/packages/constants/src/dict-enum.ts
index 43ab651a8..197c21e6c 100644
--- a/packages/constants/src/dict-enum.ts
+++ b/packages/constants/src/dict-enum.ts
@@ -218,6 +218,8 @@ const MES_DICT = {
   MES_QC_TYPE: 'mes_qc_type', // MES 质检方案类型
   MES_QC_CHECK_RESULT: 'mes_qc_check_result', // MES 检测结果
   MES_QC_SOURCE_DOC_TYPE: 'mes_qc_source_doc_type', // MES 来源单据类型
+  MES_IPQC_TYPE: 'mes_ipqc_type', // MES IPQC 检验类型
+  MES_RQC_TYPE: 'mes_rqc_type', // MES 退货检验类型
   MES_DEFECT_LEVEL: 'mes_defect_level', // MES 缺陷等级
   MES_WM_BARCODE_BIZ_TYPE: 'mes_wm_barcode_biz_type', // MES 条码业务类型
   MES_WM_BARCODE_FORMAT: 'mes_wm_barcode_format', // MES 条码格式

From d245eca60d85bff481900a321eb9d3c5faf95f84 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 29 May 2026 19:09:19 +0800
Subject: [PATCH 11/52] =?UTF-8?q?feat(mes):=20=E8=BF=81=E7=A7=BB=20ipqc?=
 =?UTF-8?q?=E3=80=81oqc=E3=80=81rqc=20=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/views/mes/qc/ipqc/data.ts   | 566 +++++++++++++++++
 apps/web-antd/src/views/mes/qc/ipqc/index.vue | 167 +++++
 .../views/mes/qc/ipqc/modules/line-list.vue   |  97 +++
 apps/web-antd/src/views/mes/qc/oqc/data.ts    | 518 ++++++++++++++++
 apps/web-antd/src/views/mes/qc/oqc/index.vue  | 167 +++++
 .../src/views/mes/qc/oqc/modules/form.vue     | 231 +++++++
 .../views/mes/qc/oqc/modules/line-list.vue    |  97 +++
 apps/web-antd/src/views/mes/qc/rqc/data.ts    | 495 +++++++++++++++
 apps/web-antd/src/views/mes/qc/rqc/index.vue  | 167 +++++
 .../src/views/mes/qc/rqc/modules/form.vue     | 232 +++++++
 .../views/mes/qc/rqc/modules/line-list.vue    |  97 +++
 apps/web-ele/src/views/mes/qc/ipqc/data.ts    | 573 ++++++++++++++++++
 apps/web-ele/src/views/mes/qc/ipqc/index.vue  | 168 +++++
 .../src/views/mes/qc/ipqc/modules/form.vue    | 233 +++++++
 .../views/mes/qc/ipqc/modules/line-list.vue   |  98 +++
 apps/web-ele/src/views/mes/qc/oqc/data.ts     | 524 ++++++++++++++++
 apps/web-ele/src/views/mes/qc/oqc/index.vue   | 168 +++++
 .../src/views/mes/qc/oqc/modules/form.vue     | 233 +++++++
 .../views/mes/qc/oqc/modules/line-list.vue    |  98 +++
 apps/web-ele/src/views/mes/qc/rqc/data.ts     | 498 +++++++++++++++
 apps/web-ele/src/views/mes/qc/rqc/index.vue   | 168 +++++
 .../src/views/mes/qc/rqc/modules/form.vue     | 233 +++++++
 .../views/mes/qc/rqc/modules/line-list.vue    |  98 +++
 23 files changed, 5926 insertions(+)
 create mode 100644 apps/web-antd/src/views/mes/qc/ipqc/data.ts
 create mode 100644 apps/web-antd/src/views/mes/qc/ipqc/index.vue
 create mode 100644 apps/web-antd/src/views/mes/qc/ipqc/modules/line-list.vue
 create mode 100644 apps/web-antd/src/views/mes/qc/oqc/data.ts
 create mode 100644 apps/web-antd/src/views/mes/qc/oqc/index.vue
 create mode 100644 apps/web-antd/src/views/mes/qc/oqc/modules/form.vue
 create mode 100644 apps/web-antd/src/views/mes/qc/oqc/modules/line-list.vue
 create mode 100644 apps/web-antd/src/views/mes/qc/rqc/data.ts
 create mode 100644 apps/web-antd/src/views/mes/qc/rqc/index.vue
 create mode 100644 apps/web-antd/src/views/mes/qc/rqc/modules/form.vue
 create mode 100644 apps/web-antd/src/views/mes/qc/rqc/modules/line-list.vue
 create mode 100644 apps/web-ele/src/views/mes/qc/ipqc/data.ts
 create mode 100644 apps/web-ele/src/views/mes/qc/ipqc/index.vue
 create mode 100644 apps/web-ele/src/views/mes/qc/ipqc/modules/form.vue
 create mode 100644 apps/web-ele/src/views/mes/qc/ipqc/modules/line-list.vue
 create mode 100644 apps/web-ele/src/views/mes/qc/oqc/data.ts
 create mode 100644 apps/web-ele/src/views/mes/qc/oqc/index.vue
 create mode 100644 apps/web-ele/src/views/mes/qc/oqc/modules/form.vue
 create mode 100644 apps/web-ele/src/views/mes/qc/oqc/modules/line-list.vue
 create mode 100644 apps/web-ele/src/views/mes/qc/rqc/data.ts
 create mode 100644 apps/web-ele/src/views/mes/qc/rqc/index.vue
 create mode 100644 apps/web-ele/src/views/mes/qc/rqc/modules/form.vue
 create mode 100644 apps/web-ele/src/views/mes/qc/rqc/modules/line-list.vue

diff --git a/apps/web-antd/src/views/mes/qc/ipqc/data.ts b/apps/web-antd/src/views/mes/qc/ipqc/data.ts
new file mode 100644
index 000000000..73c19bc51
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/ipqc/data.ts
@@ -0,0 +1,566 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcIpqcApi } from '#/api/mes/qc/ipqc';
+import type { MesQcIpqcLineApi } from '#/api/mes/qc/ipqc/line';
+
+import { h, markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { Button } from 'ant-design-vue';
+
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getSimpleUserList } from '#/api/system/user';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import MdWorkstationSelect from '#/views/mes/md/workstation/components/md-workstation-select.vue';
+import ProTaskSelect from '#/views/mes/pro/task/components/pro-task-select.vue';
+import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
+import {
+  MesAutoCodeRuleCode,
+  MesProTaskStatusEnum,
+  MesProWorkOrderStatusEnum,
+} from '#/views/mes/utils/constants';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
+/** 把不合格品数量同步为工废 + 料废 + 其他废品之和 */
+function syncUnqualified(formApi?: VbenFormApi) {
+  if (!formApi) {
+    return;
+  }
+  void (async () => {
+    const values = await formApi.getValues();
+    const next =
+      Number(values.laborScrapQuantity || 0) +
+      Number(values.materialScrapQuantity || 0) +
+      Number(values.otherScrapQuantity || 0);
+    await formApi.setFieldValue('unqualifiedQuantity', next);
+  })();
+}
+
+/** 新增/修改的表单 */
+export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'sourceDocId',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'sourceLineId',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'status',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '检验单编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入检验单编号',
+      },
+      rules: 'required',
+      suffix: () =>
+        h(
+          Button,
+          {
+            type: 'default',
+            onClick: async () => {
+              try {
+                const code = await generateAutoCode(
+                  MesAutoCodeRuleCode.QC_IPQC_CODE,
+                );
+                await formApi?.setFieldValue('code', code);
+              } catch (error) {
+                console.error(error);
+              }
+            },
+          },
+          { default: () => '生成' },
+        ),
+    },
+    {
+      fieldName: 'name',
+      label: '检验单名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入检验单名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'type',
+      label: '检验类型',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_IPQC_TYPE, 'number'),
+        placeholder: '请选择检验类型',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'sourceDocType',
+      label: '来源单据类型',
+      component: 'Select',
+      componentProps: {
+        disabled: true,
+        options: getDictOptions(DICT_TYPE.MES_QC_SOURCE_DOC_TYPE, 'number'),
+        placeholder: '来源单据类型',
+      },
+      dependencies: {
+        triggerFields: ['sourceDocType'],
+        show: (values) => !!values.sourceDocType,
+      },
+    },
+    {
+      fieldName: 'sourceDocCode',
+      label: '来源单据编号',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+        placeholder: '来源单据编号',
+      },
+      dependencies: {
+        triggerFields: ['sourceDocType', 'sourceDocId'],
+        show: (values) => !!values.sourceDocType && !!values.sourceDocId,
+      },
+    },
+    {
+      fieldName: 'workOrderId',
+      label: '生产工单',
+      component: markRaw(ProWorkOrderSelect),
+      componentProps: {
+        placeholder: '请选择生产工单',
+        status: MesProWorkOrderStatusEnum.CONFIRMED,
+        // 工单变更时清空生产任务
+        onChange: () => formApi?.setFieldValue('taskId', undefined),
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['sourceDocId'],
+        componentProps: (values) => ({
+          disabled: !!values.sourceDocId,
+          placeholder: '请选择生产工单',
+          status: MesProWorkOrderStatusEnum.CONFIRMED,
+          onChange: () => formApi?.setFieldValue('taskId', undefined),
+        }),
+      },
+    },
+    {
+      fieldName: 'workstationId',
+      label: '工位',
+      component: markRaw(MdWorkstationSelect),
+      componentProps: {
+        placeholder: '请选择工位',
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['sourceDocId'],
+        componentProps: (values) => ({
+          disabled: !!values.sourceDocId,
+          placeholder: '请选择工位',
+        }),
+      },
+    },
+    {
+      fieldName: 'taskId',
+      label: '生产任务',
+      component: markRaw(ProTaskSelect),
+      componentProps: {
+        placeholder: '请选择生产任务',
+        statuses: [MesProTaskStatusEnum.PREPARE],
+      },
+      dependencies: {
+        triggerFields: ['sourceDocId', 'workOrderId', 'workstationId'],
+        componentProps: (values) => ({
+          disabled: !!values.sourceDocId || !values.workOrderId,
+          placeholder: '请选择生产任务',
+          statuses: [MesProTaskStatusEnum.PREPARE],
+          workOrderId: values.workOrderId,
+          workstationId: values.workstationId,
+        }),
+      },
+    },
+    {
+      fieldName: 'checkQuantity',
+      label: '检测数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入检测数量',
+        precision: 2,
+      },
+      rules: 'required',
+      dependencies: {
+        triggerFields: ['sourceDocId'],
+        componentProps: (values) => ({
+          class: '!w-full',
+          disabled: !!values.sourceDocId,
+          min: 0,
+          placeholder: '请输入检测数量',
+          precision: 2,
+        }),
+      },
+    },
+    {
+      fieldName: 'qualifiedQuantity',
+      label: '合格品数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入合格品数量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'unqualifiedQuantity',
+      label: '不合格品数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入不合格品数量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'laborScrapQuantity',
+      label: '工废数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入工废数量',
+        precision: 2,
+        onChange: () => syncUnqualified(formApi),
+      },
+      rules: 'required',
+      dependencies: {
+        triggerFields: ['unqualifiedQuantity'],
+        show: (values) =>
+          values.unqualifiedQuantity != null && values.unqualifiedQuantity > 0,
+      },
+    },
+    {
+      fieldName: 'materialScrapQuantity',
+      label: '料废数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入料废数量',
+        precision: 2,
+        onChange: () => syncUnqualified(formApi),
+      },
+      rules: 'required',
+      dependencies: {
+        triggerFields: ['unqualifiedQuantity'],
+        show: (values) =>
+          values.unqualifiedQuantity != null && values.unqualifiedQuantity > 0,
+      },
+    },
+    {
+      fieldName: 'otherScrapQuantity',
+      label: '其他废品数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入其他废品数量',
+        precision: 2,
+        onChange: () => syncUnqualified(formApi),
+      },
+      rules: 'required',
+      dependencies: {
+        triggerFields: ['unqualifiedQuantity'],
+        show: (values) =>
+          values.unqualifiedQuantity != null && values.unqualifiedQuantity > 0,
+      },
+    },
+    {
+      fieldName: 'inspectorUserId',
+      label: '检测人员',
+      component: 'ApiSelect',
+      componentProps: {
+        allowClear: true,
+        api: getSimpleUserList,
+        labelField: 'nickname',
+        placeholder: '请选择检测人员',
+        valueField: 'id',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'inspectDate',
+      label: '检测日期',
+      component: 'DatePicker',
+      componentProps: {
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择检测日期',
+        valueFormat: 'x',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'checkResult',
+      label: '检测结果',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_QC_CHECK_RESULT, 'number'),
+        placeholder: '请选择检测结果',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '检验单编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入检验单编号',
+      },
+    },
+    {
+      fieldName: 'type',
+      label: '检验类型',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_IPQC_TYPE, 'number'),
+        placeholder: '请选择检验类型',
+      },
+    },
+    {
+      fieldName: 'workOrderId',
+      label: '生产工单',
+      component: markRaw(ProWorkOrderSelect),
+      componentProps: {
+        placeholder: '请选择生产工单',
+      },
+    },
+    {
+      fieldName: 'itemId',
+      label: '产品物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择产品物料',
+      },
+    },
+    {
+      fieldName: 'checkResult',
+      label: '检测结果',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_QC_CHECK_RESULT, 'number'),
+        placeholder: '请选择检测结果',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesQcIpqcApi.Ipqc>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '检验单编号',
+      width: 160,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '检验单名称',
+      minWidth: 180,
+    },
+    {
+      field: 'type',
+      title: '检验类型',
+      width: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_IPQC_TYPE },
+      },
+    },
+    {
+      field: 'workOrderCode',
+      title: '生产工单编号',
+      width: 140,
+    },
+    {
+      field: 'itemCode',
+      title: '产品物料编码',
+      width: 130,
+    },
+    {
+      field: 'itemName',
+      title: '产品物料名称',
+      minWidth: 150,
+    },
+    {
+      field: 'itemSpecification',
+      title: '规格型号',
+      width: 130,
+    },
+    {
+      field: 'unitName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'checkQuantity',
+      title: '检测数量',
+      width: 100,
+    },
+    {
+      field: 'checkResult',
+      title: '检测结果',
+      width: 110,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_QC_CHECK_RESULT },
+      },
+    },
+    {
+      field: 'inspectDate',
+      title: '检测日期',
+      width: 120,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'inspectorNickname',
+      title: '检测人员',
+      width: 100,
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_ORDER_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 180,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 过程检验单行子表的字段 */
+export function useLineGridColumns(): VxeTableGridOptions<MesQcIpqcLineApi.IpqcLine>['columns'] {
+  return [
+    {
+      field: 'indicatorName',
+      title: '检测项名称',
+      minWidth: 150,
+    },
+    {
+      field: 'indicatorType',
+      title: '检测项类型',
+      width: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_INDICATOR_TYPE },
+      },
+    },
+    {
+      field: 'toolName',
+      title: '检测工具',
+      width: 120,
+    },
+    {
+      field: 'checkMethod',
+      title: '检测方法',
+      minWidth: 180,
+    },
+    {
+      field: 'standardValue',
+      title: '标准值',
+      width: 100,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'maxThreshold',
+      title: '误差上限',
+      width: 100,
+    },
+    {
+      field: 'minThreshold',
+      title: '误差下限',
+      width: 100,
+    },
+    {
+      field: 'criticalQuantity',
+      title: '致命缺陷数',
+      width: 110,
+    },
+    {
+      field: 'majorQuantity',
+      title: '严重缺陷数',
+      width: 110,
+    },
+    {
+      field: 'minorQuantity',
+      title: '轻微缺陷数',
+      width: 110,
+    },
+    {
+      title: '操作',
+      width: 110,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/qc/ipqc/index.vue b/apps/web-antd/src/views/mes/qc/ipqc/index.vue
new file mode 100644
index 000000000..1bdb9c826
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/ipqc/index.vue
@@ -0,0 +1,167 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcIpqcApi } from '#/api/mes/qc/ipqc';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { Button, message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { deleteIpqc, exportIpqc, getIpqcPage } from '#/api/mes/qc/ipqc';
+import { $t } from '#/locales';
+import { MesQcStatusEnum } from '#/views/mes/utils/constants';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建过程检验单 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看过程检验单 */
+function handleDetail(row: MesQcIpqcApi.Ipqc) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑过程检验单 */
+function handleEdit(row: MesQcIpqcApi.Ipqc) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 删除过程检验单 */
+async function handleDelete(row: MesQcIpqcApi.Ipqc) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.code]),
+    duration: 0,
+  });
+  try {
+    await deleteIpqc(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportIpqc(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '过程检验单.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getIpqcPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesQcIpqcApi.Ipqc>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【质量】过程检验（IPQC）"
+        url="https://doc.iocoder.cn/mes/qc/ipqc/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="过程检验单列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['过程检验单']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:qc-ipqc:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:qc-ipqc:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <Button type="link" @click="handleDetail(row)">
+          {{ row.code }}
+        </Button>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:qc-ipqc:update'],
+              ifShow: row.status === MesQcStatusEnum.DRAFT,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:qc-ipqc:delete'],
+              ifShow: row.status === MesQcStatusEnum.DRAFT,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: $t('common.detail'),
+              type: 'link',
+              icon: ACTION_ICON.VIEW,
+              auth: ['mes:qc-ipqc:query'],
+              onClick: handleDetail.bind(null, row),
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/mes/qc/ipqc/modules/line-list.vue b/apps/web-antd/src/views/mes/qc/ipqc/modules/line-list.vue
new file mode 100644
index 000000000..e6aaea4bb
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/ipqc/modules/line-list.vue
@@ -0,0 +1,97 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcIpqcLineApi } from '#/api/mes/qc/ipqc/line';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getIpqcLinePage } from '#/api/mes/qc/ipqc/line';
+import { MesQcTypeEnum } from '#/views/mes/utils/constants';
+
+import { DefectRecordInlineList } from '../../defectrecord/components';
+import { useLineGridColumns } from '../data';
+
+const props = defineProps<{
+  formType?: string;
+  ipqcId: number;
+}>();
+
+const emit = defineEmits<{ refresh: [] }>();
+
+const [DefectModal, defectModalApi] = useVbenModal({
+  connectedComponent: DefectRecordInlineList,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 缺陷记录变更后，刷新本表格并通知父组件刷新主表统计 */
+function handleDefectChanged() {
+  handleRefresh();
+  emit('refresh');
+}
+
+/** 打开缺陷记录弹窗 */
+function handleOpenDefect(row: MesQcIpqcLineApi.IpqcLine) {
+  defectModalApi
+    .setData({
+      formType: props.formType,
+      lineId: row.id,
+      qcId: props.ipqcId,
+      qcType: MesQcTypeEnum.IPQC,
+    })
+    .open();
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useLineGridColumns(),
+    height: 360,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.ipqcId) {
+            return { list: [], total: 0 };
+          }
+          return await getIpqcLinePage({
+            ipqcId: props.ipqcId,
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesQcIpqcLineApi.IpqcLine>,
+});
+</script>
+
+<template>
+  <div>
+    <DefectModal @success="handleDefectChanged" />
+    <Grid table-title="检验项">
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: '缺陷列表',
+              type: 'link',
+              icon: ACTION_ICON.VIEW,
+              onClick: handleOpenDefect.bind(null, row),
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-antd/src/views/mes/qc/oqc/data.ts b/apps/web-antd/src/views/mes/qc/oqc/data.ts
new file mode 100644
index 000000000..2c70c0a7f
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/oqc/data.ts
@@ -0,0 +1,518 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcOqcApi } from '#/api/mes/qc/oqc';
+import type { MesQcOqcLineApi } from '#/api/mes/qc/oqc/line';
+
+import { h, markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { Button } from 'ant-design-vue';
+
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getSimpleUserList } from '#/api/system/user';
+import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
+/** 新增/修改的表单 */
+export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'sourceDocId',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'sourceLineId',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'status',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '检验单编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入检验单编号',
+      },
+      rules: 'required',
+      suffix: () =>
+        h(
+          Button,
+          {
+            type: 'default',
+            onClick: async () => {
+              try {
+                const code = await generateAutoCode(
+                  MesAutoCodeRuleCode.QC_OQC_CODE,
+                );
+                await formApi?.setFieldValue('code', code);
+              } catch (error) {
+                console.error(error);
+              }
+            },
+          },
+          { default: () => '生成' },
+        ),
+    },
+    {
+      fieldName: 'name',
+      label: '检验单名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入检验单名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'sourceDocType',
+      label: '来源单据类型',
+      component: 'Select',
+      componentProps: {
+        disabled: true,
+        options: getDictOptions(DICT_TYPE.MES_QC_SOURCE_DOC_TYPE, 'number'),
+        placeholder: '来源单据类型',
+      },
+      dependencies: {
+        triggerFields: ['sourceDocType'],
+        show: (values) => !!values.sourceDocType,
+      },
+    },
+    {
+      fieldName: 'sourceDocCode',
+      label: '来源单据编号',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+        placeholder: '来源单据编号',
+      },
+      dependencies: {
+        triggerFields: ['sourceDocType', 'sourceDocId'],
+        show: (values) => !!values.sourceDocType && !!values.sourceDocId,
+      },
+    },
+    {
+      fieldName: 'itemId',
+      label: '产品物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择产品物料',
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['sourceDocId'],
+        componentProps: (values) => ({
+          disabled: !!values.sourceDocId,
+          placeholder: '请选择产品物料',
+        }),
+      },
+    },
+    {
+      fieldName: 'clientId',
+      label: '客户',
+      component: markRaw(MdClientSelect),
+      componentProps: {
+        placeholder: '请选择客户',
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['sourceDocId'],
+        componentProps: (values) => ({
+          disabled: !!values.sourceDocId,
+          placeholder: '请选择客户',
+        }),
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入批次号',
+      },
+    },
+    {
+      fieldName: 'outQuantity',
+      label: '发货数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入发货数量',
+        precision: 2,
+        // 新建态下，发货数量变化时把 checkQuantity 也填上同值
+        onChange: async (value: null | number | undefined) => {
+          if (value == null || !formApi) return;
+          const values = await formApi.getValues();
+          if (!values.id && values.checkQuantity == null) {
+            await formApi.setFieldValue('checkQuantity', value);
+          }
+        },
+      },
+      rules: 'required',
+      dependencies: {
+        triggerFields: ['sourceDocId'],
+        componentProps: (values) => ({
+          class: '!w-full',
+          disabled: !!values.sourceDocId,
+          min: 0,
+          placeholder: '请输入发货数量',
+          precision: 2,
+          onChange: async (value: null | number | undefined) => {
+            if (value == null || !formApi) return;
+            const current = await formApi.getValues();
+            if (!current.id && current.checkQuantity == null) {
+              await formApi.setFieldValue('checkQuantity', value);
+            }
+          },
+        }),
+      },
+    },
+    {
+      fieldName: 'checkQuantity',
+      label: '检测数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入检测数量',
+        // 新建态下，检测数量变化时把 outQuantity 也填上同值
+        onChange: async (value: null | number | undefined) => {
+          if (value == null || !formApi) return;
+          const values = await formApi.getValues();
+          if (!values.id && values.outQuantity == null) {
+            await formApi.setFieldValue('outQuantity', value);
+          }
+        },
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'qualifiedQuantity',
+      label: '合格品数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入合格品数量',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'unqualifiedQuantity',
+      label: '不合格品数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入不合格品数量',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'inspectorUserId',
+      label: '检测人员',
+      component: 'ApiSelect',
+      componentProps: {
+        allowClear: true,
+        api: getSimpleUserList,
+        labelField: 'nickname',
+        placeholder: '请选择检测人员',
+        valueField: 'id',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'outDate',
+      label: '出货日期',
+      component: 'DatePicker',
+      componentProps: {
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择出货日期',
+        valueFormat: 'x',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'inspectDate',
+      label: '检测日期',
+      component: 'DatePicker',
+      componentProps: {
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择检测日期',
+        valueFormat: 'x',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'checkResult',
+      label: '检测结果',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_QC_CHECK_RESULT, 'number'),
+        placeholder: '请选择检测结果',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '检验单编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入检验单编号',
+      },
+    },
+    {
+      fieldName: 'clientId',
+      label: '客户',
+      component: markRaw(MdClientSelect),
+      componentProps: {
+        placeholder: '请选择客户',
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入批次号',
+      },
+    },
+    {
+      fieldName: 'itemId',
+      label: '产品物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择产品物料',
+      },
+    },
+    {
+      fieldName: 'checkResult',
+      label: '检测结果',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_QC_CHECK_RESULT, 'number'),
+        placeholder: '请选择检测结果',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesQcOqcApi.Oqc>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '检验单编号',
+      width: 160,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '检验单名称',
+      minWidth: 180,
+    },
+    {
+      field: 'clientNickname',
+      title: '客户名称',
+      width: 120,
+    },
+    {
+      field: 'batchCode',
+      title: '批次号',
+      width: 130,
+    },
+    {
+      field: 'itemCode',
+      title: '产品物料编码',
+      width: 130,
+    },
+    {
+      field: 'itemName',
+      title: '产品物料名称',
+      minWidth: 150,
+    },
+    {
+      field: 'itemSpecification',
+      title: '规格型号',
+      minWidth: 150,
+    },
+    {
+      field: 'unitName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'outQuantity',
+      title: '发货数量',
+      width: 100,
+    },
+    {
+      field: 'checkQuantity',
+      title: '检测数量',
+      width: 100,
+    },
+    {
+      field: 'unqualifiedQuantity',
+      title: '不合格数',
+      width: 100,
+    },
+    {
+      field: 'checkResult',
+      title: '检测结果',
+      width: 110,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_QC_CHECK_RESULT },
+      },
+    },
+    {
+      field: 'outDate',
+      title: '出货日期',
+      width: 120,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'inspectDate',
+      title: '检测日期',
+      width: 120,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'inspectorNickname',
+      title: '检测人员',
+      width: 100,
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_ORDER_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 220,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 出货检验单行子表的字段 */
+export function useLineGridColumns(): VxeTableGridOptions<MesQcOqcLineApi.OqcLine>['columns'] {
+  return [
+    {
+      field: 'indicatorName',
+      title: '检测项名称',
+      minWidth: 150,
+    },
+    {
+      field: 'indicatorType',
+      title: '检测项类型',
+      width: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_INDICATOR_TYPE },
+      },
+    },
+    {
+      field: 'tool',
+      title: '检测工具',
+      width: 120,
+    },
+    {
+      field: 'checkMethod',
+      title: '检测方法',
+      minWidth: 180,
+    },
+    {
+      field: 'standardValue',
+      title: '标准值',
+      width: 100,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'maxThreshold',
+      title: '误差上限',
+      width: 100,
+    },
+    {
+      field: 'minThreshold',
+      title: '误差下限',
+      width: 100,
+    },
+    {
+      field: 'criticalQuantity',
+      title: '致命缺陷数',
+      width: 110,
+    },
+    {
+      field: 'majorQuantity',
+      title: '严重缺陷数',
+      width: 110,
+    },
+    {
+      field: 'minorQuantity',
+      title: '轻微缺陷数',
+      width: 110,
+    },
+    {
+      title: '操作',
+      width: 110,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/qc/oqc/index.vue b/apps/web-antd/src/views/mes/qc/oqc/index.vue
new file mode 100644
index 000000000..bda817e71
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/oqc/index.vue
@@ -0,0 +1,167 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcOqcApi } from '#/api/mes/qc/oqc';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { Button, message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { deleteOqc, exportOqc, getOqcPage } from '#/api/mes/qc/oqc';
+import { $t } from '#/locales';
+import { MesQcStatusEnum } from '#/views/mes/utils/constants';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建出货检验单 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看出货检验单 */
+function handleDetail(row: MesQcOqcApi.Oqc) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑出货检验单 */
+function handleEdit(row: MesQcOqcApi.Oqc) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 删除出货检验单 */
+async function handleDelete(row: MesQcOqcApi.Oqc) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.code]),
+    duration: 0,
+  });
+  try {
+    await deleteOqc(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportOqc(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '出货检验单.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getOqcPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesQcOqcApi.Oqc>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【质量】出货检验（OQC）"
+        url="https://doc.iocoder.cn/mes/qc/oqc/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="出货检验单列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['出货检验单']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:qc-oqc:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:qc-oqc:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <Button type="link" @click="handleDetail(row)">
+          {{ row.code }}
+        </Button>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:qc-oqc:update'],
+              ifShow: row.status === MesQcStatusEnum.DRAFT,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:qc-oqc:delete'],
+              ifShow: row.status === MesQcStatusEnum.DRAFT,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: $t('common.detail'),
+              type: 'link',
+              icon: ACTION_ICON.VIEW,
+              auth: ['mes:qc-oqc:query'],
+              onClick: handleDetail.bind(null, row),
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/mes/qc/oqc/modules/form.vue b/apps/web-antd/src/views/mes/qc/oqc/modules/form.vue
new file mode 100644
index 000000000..f6e737cce
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/oqc/modules/form.vue
@@ -0,0 +1,231 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesQcOqcApi } from '#/api/mes/qc/oqc';
+
+import { computed, ref } from 'vue';
+
+import { confirm, useVbenModal } from '@vben/common-ui';
+
+import { Button, Descriptions, message, Tabs } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createOqc,
+  finishOqc,
+  getOqc,
+  updateOqc,
+} from '#/api/mes/qc/oqc';
+import { $t } from '#/locales';
+import { MesQcStatusEnum, MesQcTypeEnum } from '#/views/mes/utils/constants';
+
+import { QcIndicatorResultList } from '../../indicatorresult/components';
+import { useFormSchema } from '../data';
+import LineList from './line-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesQcOqcApi.Oqc>();
+const subTabsName = ref('line');
+const originalSnapshot = ref('');
+const isDetail = computed(() => formType.value === 'detail');
+const canFinish = computed(
+  () =>
+    formType.value === 'update' &&
+    formData.value?.status === MesQcStatusEnum.DRAFT,
+);
+const getTitle = computed(() => {
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['出货检验单']);
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['出货检验单'])
+    : $t('ui.actionTitle.create', ['出货检验单']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  wrapperClass: 'grid-cols-3',
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+});
+
+/** 子表变更后刷新主表头数据（缺陷统计等） */
+async function handleRefresh() {
+  if (!formData.value?.id) {
+    return;
+  }
+  formData.value = await getOqc(formData.value.id);
+}
+
+/** 提交表单 */
+async function handleSubmit(): Promise<boolean> {
+  const { valid } = await formApi.validate();
+  if (!valid) {
+    return false;
+  }
+  const data = (await formApi.getValues()) as MesQcOqcApi.Oqc;
+  if (formData.value?.id) {
+    await updateOqc({ ...data, id: formData.value.id });
+    formData.value = { ...formData.value, ...data };
+  } else {
+    const id = await createOqc(data);
+    formData.value = {
+      ...data,
+      id: id as unknown as number,
+      status: MesQcStatusEnum.DRAFT,
+    };
+    await formApi.setFieldValue('id', formData.value.id);
+    await formApi.setFieldValue('status', formData.value.status);
+    formType.value = 'update';
+  }
+  originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  return true;
+}
+
+/** 完成检验单：表单有修改时先保存，再调用完成接口 */
+async function handleFinish() {
+  const id = formData.value?.id;
+  if (!id) {
+    return;
+  }
+  const { valid } = await formApi.validate();
+  if (!valid) {
+    return;
+  }
+  await confirm({
+    content: '是否完成出货检验单编制？【完成后将不能更改】',
+  });
+  modalApi.lock();
+  try {
+    const current = JSON.stringify(await formApi.getValues());
+    if (current !== originalSnapshot.value) {
+      const data = (await formApi.getValues()) as MesQcOqcApi.Oqc;
+      await updateOqc({ ...data, id });
+      formData.value = { ...formData.value, ...data };
+      originalSnapshot.value = current;
+    }
+    await finishOqc(id);
+    message.success('完成成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+// TODO @AI：方法内注释；
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (isDetail.value) {
+      await modalApi.close();
+      return;
+    }
+    modalApi.lock();
+    try {
+      const ok = await handleSubmit();
+      if (!ok) {
+        return;
+      }
+      message.success($t('ui.actionMessage.operationSuccess'));
+      await modalApi.close();
+      emit('success');
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      originalSnapshot.value = '';
+      return;
+    }
+    formApi.setState({ schema: useFormSchema(formApi) });
+    subTabsName.value = 'line';
+    const data = modalApi.getData<{
+      formType: FormType;
+      id?: number;
+      prefill?: MesQcOqcApi.Oqc;
+    }>();
+    formType.value = data.formType;
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getOqc(data.id);
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    } else if (data?.prefill) {
+      formData.value = { ...data.prefill };
+      await formApi.setValues(data.prefill);
+    }
+    originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-4/5">
+    <Form class="mx-4" />
+    <!-- 缺陷统计（只读） -->
+    <div v-if="formData?.id" class="mx-4 mt-4">
+      <Descriptions title="缺陷情况" :column="3" bordered size="small">
+        <Descriptions.Item label="致命缺陷数">
+          {{ formData.criticalQuantity ?? 0 }}
+        </Descriptions.Item>
+        <Descriptions.Item label="严重缺陷数">
+          {{ formData.majorQuantity ?? 0 }}
+        </Descriptions.Item>
+        <Descriptions.Item label="轻微缺陷数">
+          {{ formData.minorQuantity ?? 0 }}
+        </Descriptions.Item>
+        <Descriptions.Item label="致命缺陷率">
+          {{ formData.criticalRate ?? 0 }}%
+        </Descriptions.Item>
+        <Descriptions.Item label="严重缺陷率">
+          {{ formData.majorRate ?? 0 }}%
+        </Descriptions.Item>
+        <Descriptions.Item label="轻微缺陷率">
+          {{ formData.minorRate ?? 0 }}%
+        </Descriptions.Item>
+      </Descriptions>
+    </div>
+    <Tabs
+      v-if="formData?.id"
+      v-model:active-key="subTabsName"
+      class="mx-4 mt-4"
+    >
+      <Tabs.TabPane key="line" tab="检验项">
+        <LineList
+          :form-type="formType"
+          :oqc-id="formData.id"
+          @refresh="handleRefresh"
+        />
+      </Tabs.TabPane>
+      <Tabs.TabPane key="result" tab="检测结果">
+        <QcIndicatorResultList
+          :qc-id="formData.id"
+          :qc-type="MesQcTypeEnum.OQC"
+          :readonly="isDetail"
+        />
+      </Tabs.TabPane>
+    </Tabs>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <Button v-if="canFinish" type="primary" @click="handleFinish">
+          完成
+        </Button>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/qc/oqc/modules/line-list.vue b/apps/web-antd/src/views/mes/qc/oqc/modules/line-list.vue
new file mode 100644
index 000000000..b0f15b132
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/oqc/modules/line-list.vue
@@ -0,0 +1,97 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcOqcLineApi } from '#/api/mes/qc/oqc/line';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getOqcLinePage } from '#/api/mes/qc/oqc/line';
+import { MesQcTypeEnum } from '#/views/mes/utils/constants';
+
+import { DefectRecordInlineList } from '../../defectrecord/components';
+import { useLineGridColumns } from '../data';
+
+const props = defineProps<{
+  formType?: string;
+  oqcId: number;
+}>();
+
+const emit = defineEmits<{ refresh: [] }>();
+
+const [DefectModal, defectModalApi] = useVbenModal({
+  connectedComponent: DefectRecordInlineList,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 缺陷记录变更后，刷新本表格并通知父组件刷新主表统计 */
+function handleDefectChanged() {
+  handleRefresh();
+  emit('refresh');
+}
+
+/** 打开缺陷记录弹窗 */
+function handleOpenDefect(row: MesQcOqcLineApi.OqcLine) {
+  defectModalApi
+    .setData({
+      formType: props.formType,
+      lineId: row.id,
+      qcId: props.oqcId,
+      qcType: MesQcTypeEnum.OQC,
+    })
+    .open();
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useLineGridColumns(),
+    height: 360,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.oqcId) {
+            return { list: [], total: 0 };
+          }
+          return await getOqcLinePage({
+            oqcId: props.oqcId,
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesQcOqcLineApi.OqcLine>,
+});
+</script>
+
+<template>
+  <div>
+    <DefectModal @success="handleDefectChanged" />
+    <Grid table-title="检验项">
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: '缺陷列表',
+              type: 'link',
+              icon: ACTION_ICON.VIEW,
+              onClick: handleOpenDefect.bind(null, row),
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-antd/src/views/mes/qc/rqc/data.ts b/apps/web-antd/src/views/mes/qc/rqc/data.ts
new file mode 100644
index 000000000..c08aa23f8
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/rqc/data.ts
@@ -0,0 +1,495 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcRqcApi } from '#/api/mes/qc/rqc';
+import type { MesQcRqcLineApi } from '#/api/mes/qc/rqc/line';
+
+import { h, markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { Button } from 'ant-design-vue';
+
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getSimpleUserList } from '#/api/system/user';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import {
+  MesAutoCodeRuleCode,
+  MesQcSourceDocTypeEnum,
+} from '#/views/mes/utils/constants';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
+/** 列表搜索专用：来源单据类型字典只允许 RQC 用到的两种 */
+function getRqcSourceDocTypeOptions() {
+  const allowed = new Set<number>([
+    MesQcSourceDocTypeEnum.RETURN_ISSUE,
+    MesQcSourceDocTypeEnum.RETURN_SALES,
+  ]);
+  return getDictOptions(DICT_TYPE.MES_QC_SOURCE_DOC_TYPE, 'number').filter(
+    (item) => allowed.has(Number(item.value)),
+  );
+}
+
+/** 新增/修改的表单 */
+export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'sourceDocId',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'sourceLineId',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'status',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '检验单编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入检验单编号',
+      },
+      rules: 'required',
+      suffix: () =>
+        h(
+          Button,
+          {
+            type: 'default',
+            onClick: async () => {
+              try {
+                const code = await generateAutoCode(
+                  MesAutoCodeRuleCode.QC_RQC_CODE,
+                );
+                await formApi?.setFieldValue('code', code);
+              } catch (error) {
+                console.error(error);
+              }
+            },
+          },
+          { default: () => '生成' },
+        ),
+    },
+    {
+      fieldName: 'name',
+      label: '检验单名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入检验单名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'sourceDocType',
+      label: '来源单据类型',
+      component: 'Select',
+      componentProps: {
+        disabled: true,
+        options: getDictOptions(DICT_TYPE.MES_QC_SOURCE_DOC_TYPE, 'number'),
+        placeholder: '来源单据类型',
+      },
+      dependencies: {
+        triggerFields: ['sourceDocType'],
+        show: (values) => !!values.sourceDocType,
+      },
+    },
+    {
+      fieldName: 'sourceDocCode',
+      label: '来源单据编号',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+        placeholder: '来源单据编号',
+      },
+      dependencies: {
+        triggerFields: ['sourceDocType', 'sourceDocId'],
+        show: (values) => !!values.sourceDocType && !!values.sourceDocId,
+      },
+    },
+    {
+      fieldName: 'type',
+      label: '检验类型',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_RQC_TYPE, 'number'),
+        placeholder: '请选择检验类型',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'itemId',
+      label: '产品物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择产品物料',
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['sourceDocId'],
+        componentProps: (values) => ({
+          disabled: !!values.sourceDocId,
+          placeholder: '请选择产品物料',
+        }),
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入批次号',
+      },
+    },
+    {
+      fieldName: 'checkQuantity',
+      label: '检测数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入',
+        precision: 2,
+      },
+      rules: 'required',
+      dependencies: {
+        triggerFields: ['sourceDocId'],
+        componentProps: (values) => ({
+          class: '!w-full',
+          disabled: !!values.sourceDocId,
+          min: 0,
+          placeholder: '请输入',
+          precision: 2,
+        }),
+      },
+    },
+    {
+      fieldName: 'qualifiedQuantity',
+      label: '合格品数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'unqualifiedQuantity',
+      label: '不合格品数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'inspectDate',
+      label: '检测日期',
+      component: 'DatePicker',
+      componentProps: {
+        format: 'YYYY-MM-DD HH:mm:ss',
+        placeholder: '请选择检测日期',
+        showTime: true,
+        valueFormat: 'x',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'inspectorUserId',
+      label: '检测人员',
+      component: 'ApiSelect',
+      componentProps: {
+        allowClear: true,
+        api: getSimpleUserList,
+        labelField: 'nickname',
+        placeholder: '请选择检测人员',
+        valueField: 'id',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'checkResult',
+      label: '检测结果',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_QC_CHECK_RESULT, 'number'),
+        placeholder: '请选择检测结果',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '检验单编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入检验单编号',
+      },
+    },
+    {
+      fieldName: 'sourceDocType',
+      label: '来源单据类型',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getRqcSourceDocTypeOptions(),
+        placeholder: '请选择来源单据类型',
+      },
+    },
+    {
+      fieldName: 'sourceDocCode',
+      label: '来源单据编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入来源单据编号',
+      },
+    },
+    {
+      fieldName: 'itemId',
+      label: '产品物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择产品物料',
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入批次号',
+      },
+    },
+    {
+      fieldName: 'checkResult',
+      label: '检测结果',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_QC_CHECK_RESULT, 'number'),
+        placeholder: '请选择检测结果',
+      },
+    },
+    {
+      fieldName: 'inspectorUserId',
+      label: '检测人员',
+      component: 'ApiSelect',
+      componentProps: {
+        allowClear: true,
+        api: getSimpleUserList,
+        labelField: 'nickname',
+        placeholder: '请选择检测人员',
+        valueField: 'id',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesQcRqcApi.Rqc>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '检验单编号',
+      width: 160,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '检验单名称',
+      minWidth: 180,
+    },
+    {
+      field: 'sourceDocType',
+      title: '来源单据类型',
+      width: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_QC_SOURCE_DOC_TYPE },
+      },
+    },
+    {
+      field: 'sourceDocCode',
+      title: '来源单据编码',
+      width: 160,
+    },
+    {
+      field: 'itemCode',
+      title: '产品物料编码',
+      width: 130,
+    },
+    {
+      field: 'itemName',
+      title: '产品物料名称',
+      minWidth: 150,
+    },
+    {
+      field: 'itemSpecification',
+      title: '规格型号',
+      width: 130,
+    },
+    {
+      field: 'unitName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'batchCode',
+      title: '批次号',
+      width: 130,
+    },
+    {
+      field: 'checkResult',
+      title: '检测结果',
+      width: 110,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_QC_CHECK_RESULT },
+      },
+    },
+    {
+      field: 'inspectDate',
+      title: '检测日期',
+      width: 160,
+      formatter: 'formatDateTime',
+    },
+    {
+      field: 'inspectorNickname',
+      title: '检测人员',
+      width: 100,
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_ORDER_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 180,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 退货检验单行子表的字段 */
+export function useLineGridColumns(): VxeTableGridOptions<MesQcRqcLineApi.RqcLine>['columns'] {
+  return [
+    {
+      field: 'indicatorName',
+      title: '检测项名称',
+      minWidth: 150,
+    },
+    {
+      field: 'indicatorType',
+      title: '检测项类型',
+      width: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_INDICATOR_TYPE },
+      },
+    },
+    {
+      field: 'tool',
+      title: '检测工具',
+      width: 120,
+    },
+    {
+      field: 'checkMethod',
+      title: '检测方法',
+      minWidth: 180,
+    },
+    {
+      field: 'standardValue',
+      title: '标准值',
+      width: 100,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'maxThreshold',
+      title: '误差上限',
+      width: 100,
+    },
+    {
+      field: 'minThreshold',
+      title: '误差下限',
+      width: 100,
+    },
+    {
+      field: 'criticalQuantity',
+      title: '致命缺陷数',
+      width: 110,
+    },
+    {
+      field: 'majorQuantity',
+      title: '严重缺陷数',
+      width: 110,
+    },
+    {
+      field: 'minorQuantity',
+      title: '轻微缺陷数',
+      width: 110,
+    },
+    {
+      title: '操作',
+      width: 110,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/qc/rqc/index.vue b/apps/web-antd/src/views/mes/qc/rqc/index.vue
new file mode 100644
index 000000000..f37370a86
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/rqc/index.vue
@@ -0,0 +1,167 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcRqcApi } from '#/api/mes/qc/rqc';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { Button, message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { deleteRqc, exportRqc, getRqcPage } from '#/api/mes/qc/rqc';
+import { $t } from '#/locales';
+import { MesQcStatusEnum } from '#/views/mes/utils/constants';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建退货检验单 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看退货检验单 */
+function handleDetail(row: MesQcRqcApi.Rqc) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑退货检验单 */
+function handleEdit(row: MesQcRqcApi.Rqc) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 删除退货检验单 */
+async function handleDelete(row: MesQcRqcApi.Rqc) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.code]),
+    duration: 0,
+  });
+  try {
+    await deleteRqc(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportRqc(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '退货检验单.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getRqcPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesQcRqcApi.Rqc>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【质量】退货检验（RQC）"
+        url="https://doc.iocoder.cn/mes/qc/rqc/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="退货检验单列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['退货检验单']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:qc-rqc:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:qc-rqc:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <Button type="link" @click="handleDetail(row)">
+          {{ row.code }}
+        </Button>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:qc-rqc:update'],
+              ifShow: row.status === MesQcStatusEnum.DRAFT,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:qc-rqc:delete'],
+              ifShow: row.status === MesQcStatusEnum.DRAFT,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: $t('common.detail'),
+              type: 'link',
+              icon: ACTION_ICON.VIEW,
+              auth: ['mes:qc-rqc:query'],
+              onClick: handleDetail.bind(null, row),
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/mes/qc/rqc/modules/form.vue b/apps/web-antd/src/views/mes/qc/rqc/modules/form.vue
new file mode 100644
index 000000000..2d8efce96
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/rqc/modules/form.vue
@@ -0,0 +1,232 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesQcRqcApi } from '#/api/mes/qc/rqc';
+
+import { computed, ref } from 'vue';
+
+import { confirm, useVbenModal } from '@vben/common-ui';
+
+import { Button, Descriptions, message, Tabs } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createRqc,
+  finishRqc,
+  getRqc,
+  updateRqc,
+} from '#/api/mes/qc/rqc';
+import { $t } from '#/locales';
+import { MesQcStatusEnum, MesQcTypeEnum } from '#/views/mes/utils/constants';
+
+import { QcIndicatorResultList } from '../../indicatorresult/components';
+import { useFormSchema } from '../data';
+import LineList from './line-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesQcRqcApi.Rqc>();
+const subTabsName = ref('line');
+const originalSnapshot = ref('');
+const isDetail = computed(() => formType.value === 'detail');
+const canFinish = computed(
+  () =>
+    formType.value === 'update' &&
+    formData.value?.status === MesQcStatusEnum.DRAFT,
+);
+const getTitle = computed(() => {
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['退货检验单']);
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['退货检验单'])
+    : $t('ui.actionTitle.create', ['退货检验单']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  wrapperClass: 'grid-cols-3',
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+});
+
+/** 子表变更后刷新主表头数据（缺陷统计等） */
+async function handleRefresh() {
+  if (!formData.value?.id) {
+    return;
+  }
+  formData.value = await getRqc(formData.value.id);
+}
+
+/** 提交表单 */
+async function handleSubmit(): Promise<boolean> {
+  const { valid } = await formApi.validate();
+  if (!valid) {
+    return false;
+  }
+  const data = (await formApi.getValues()) as MesQcRqcApi.Rqc;
+  if (formData.value?.id) {
+    await updateRqc({ ...data, id: formData.value.id });
+    formData.value = { ...formData.value, ...data };
+  } else {
+    const id = await createRqc(data);
+    formData.value = {
+      ...data,
+      id: id as unknown as number,
+      status: MesQcStatusEnum.DRAFT,
+    };
+    await formApi.setFieldValue('id', formData.value.id);
+    await formApi.setFieldValue('status', formData.value.status);
+    formType.value = 'update';
+  }
+  originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  return true;
+}
+
+/** 完成检验单：表单有修改时先保存，再调用完成接口 */
+async function handleFinish() {
+  const id = formData.value?.id;
+  if (!id) {
+    return;
+  }
+  const { valid } = await formApi.validate();
+  if (!valid) {
+    return;
+  }
+  // TODO @AI：这种类型，可以简化成 await confirm('')；如果可以，写到 style vue 里；然后把相关的类似情况，都一次性改掉；
+  await confirm({
+    content: '是否完成退货检验单编制？【完成后将不能更改】',
+  });
+  modalApi.lock();
+  try {
+    const current = JSON.stringify(await formApi.getValues());
+    if (current !== originalSnapshot.value) {
+      const data = (await formApi.getValues()) as MesQcRqcApi.Rqc;
+      await updateRqc({ ...data, id });
+      formData.value = { ...formData.value, ...data };
+      originalSnapshot.value = current;
+    }
+    await finishRqc(id);
+    message.success('完成成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+// TODO @AI：方法内注释；
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (isDetail.value) {
+      await modalApi.close();
+      return;
+    }
+    modalApi.lock();
+    try {
+      const ok = await handleSubmit();
+      if (!ok) {
+        return;
+      }
+      message.success($t('ui.actionMessage.operationSuccess'));
+      await modalApi.close();
+      emit('success');
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      originalSnapshot.value = '';
+      return;
+    }
+    formApi.setState({ schema: useFormSchema(formApi) });
+    subTabsName.value = 'line';
+    const data = modalApi.getData<{
+      formType: FormType;
+      id?: number;
+      prefill?: MesQcRqcApi.Rqc;
+    }>();
+    formType.value = data.formType;
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getRqc(data.id);
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    } else if (data?.prefill) {
+      formData.value = { ...data.prefill };
+      await formApi.setValues(data.prefill);
+    }
+    originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-4/5">
+    <Form class="mx-4" />
+    <!-- 缺陷统计（只读） -->
+    <div v-if="formData?.id" class="mx-4 mt-4">
+      <Descriptions title="缺陷情况" :column="3" bordered size="small">
+        <Descriptions.Item label="致命缺陷数">
+          {{ formData.criticalQuantity ?? 0 }}
+        </Descriptions.Item>
+        <Descriptions.Item label="严重缺陷数">
+          {{ formData.majorQuantity ?? 0 }}
+        </Descriptions.Item>
+        <Descriptions.Item label="轻微缺陷数">
+          {{ formData.minorQuantity ?? 0 }}
+        </Descriptions.Item>
+        <Descriptions.Item label="致命缺陷率">
+          {{ formData.criticalRate ?? 0 }}%
+        </Descriptions.Item>
+        <Descriptions.Item label="严重缺陷率">
+          {{ formData.majorRate ?? 0 }}%
+        </Descriptions.Item>
+        <Descriptions.Item label="轻微缺陷率">
+          {{ formData.minorRate ?? 0 }}%
+        </Descriptions.Item>
+      </Descriptions>
+    </div>
+    <Tabs
+      v-if="formData?.id"
+      v-model:active-key="subTabsName"
+      class="mx-4 mt-4"
+    >
+      <Tabs.TabPane key="line" tab="检验项">
+        <LineList
+          :form-type="formType"
+          :rqc-id="formData.id"
+          @refresh="handleRefresh"
+        />
+      </Tabs.TabPane>
+      <Tabs.TabPane key="result" tab="检测结果">
+        <QcIndicatorResultList
+          :qc-id="formData.id"
+          :qc-type="MesQcTypeEnum.RQC"
+          :readonly="isDetail"
+        />
+      </Tabs.TabPane>
+    </Tabs>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <Button v-if="canFinish" type="primary" @click="handleFinish">
+          完成
+        </Button>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/qc/rqc/modules/line-list.vue b/apps/web-antd/src/views/mes/qc/rqc/modules/line-list.vue
new file mode 100644
index 000000000..8c50238fa
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/rqc/modules/line-list.vue
@@ -0,0 +1,97 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcRqcLineApi } from '#/api/mes/qc/rqc/line';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getRqcLinePage } from '#/api/mes/qc/rqc/line';
+import { MesQcTypeEnum } from '#/views/mes/utils/constants';
+
+import { DefectRecordInlineList } from '../../defectrecord/components';
+import { useLineGridColumns } from '../data';
+
+const props = defineProps<{
+  formType?: string;
+  rqcId: number;
+}>();
+
+const emit = defineEmits<{ refresh: [] }>();
+
+const [DefectModal, defectModalApi] = useVbenModal({
+  connectedComponent: DefectRecordInlineList,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 缺陷记录变更后，刷新本表格并通知父组件刷新主表统计 */
+function handleDefectChanged() {
+  handleRefresh();
+  emit('refresh');
+}
+
+/** 打开缺陷记录弹窗 */
+function handleOpenDefect(row: MesQcRqcLineApi.RqcLine) {
+  defectModalApi
+    .setData({
+      formType: props.formType,
+      lineId: row.id,
+      qcId: props.rqcId,
+      qcType: MesQcTypeEnum.RQC,
+    })
+    .open();
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useLineGridColumns(),
+    height: 360,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.rqcId) {
+            return { list: [], total: 0 };
+          }
+          return await getRqcLinePage({
+            rqcId: props.rqcId,
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesQcRqcLineApi.RqcLine>,
+});
+</script>
+
+<template>
+  <div>
+    <DefectModal @success="handleDefectChanged" />
+    <Grid table-title="检验项">
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: '缺陷列表',
+              type: 'link',
+              icon: ACTION_ICON.VIEW,
+              onClick: handleOpenDefect.bind(null, row),
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-ele/src/views/mes/qc/ipqc/data.ts b/apps/web-ele/src/views/mes/qc/ipqc/data.ts
new file mode 100644
index 000000000..2ecd804ba
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/ipqc/data.ts
@@ -0,0 +1,573 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcIpqcApi } from '#/api/mes/qc/ipqc';
+import type { MesQcIpqcLineApi } from '#/api/mes/qc/ipqc/line';
+
+import { h, markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { ElButton } from 'element-plus';
+
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getSimpleUserList } from '#/api/system/user';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import MdWorkstationSelect from '#/views/mes/md/workstation/components/md-workstation-select.vue';
+import ProTaskSelect from '#/views/mes/pro/task/components/pro-task-select.vue';
+import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
+import {
+  MesAutoCodeRuleCode,
+  MesProTaskStatusEnum,
+  MesProWorkOrderStatusEnum,
+} from '#/views/mes/utils/constants';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
+/** 把不合格品数量同步为工废 + 料废 + 其他废品之和 */
+function syncUnqualified(formApi?: VbenFormApi) {
+  if (!formApi) {
+    return;
+  }
+  void (async () => {
+    const values = await formApi.getValues();
+    const next =
+      Number(values.laborScrapQuantity || 0) +
+      Number(values.materialScrapQuantity || 0) +
+      Number(values.otherScrapQuantity || 0);
+    await formApi.setFieldValue('unqualifiedQuantity', next);
+  })();
+}
+
+/** 新增/修改的表单 */
+export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'sourceDocId',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'sourceLineId',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'status',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '检验单编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入检验单编号',
+      },
+      rules: 'required',
+      suffix: () =>
+        h(
+          ElButton,
+          {
+            onClick: async () => {
+              try {
+                const code = await generateAutoCode(
+                  MesAutoCodeRuleCode.QC_IPQC_CODE,
+                );
+                await formApi?.setFieldValue('code', code);
+              } catch (error) {
+                console.error(error);
+              }
+            },
+          },
+          { default: () => '生成' },
+        ),
+    },
+    {
+      fieldName: 'name',
+      label: '检验单名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入检验单名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'type',
+      label: '检验类型',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_IPQC_TYPE, 'number'),
+        placeholder: '请选择检验类型',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'sourceDocType',
+      label: '来源单据类型',
+      component: 'Select',
+      componentProps: {
+        disabled: true,
+        options: getDictOptions(DICT_TYPE.MES_QC_SOURCE_DOC_TYPE, 'number'),
+        placeholder: '来源单据类型',
+      },
+      dependencies: {
+        triggerFields: ['sourceDocType'],
+        show: (values) => !!values.sourceDocType,
+      },
+    },
+    {
+      fieldName: 'sourceDocCode',
+      label: '来源单据编号',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+        placeholder: '来源单据编号',
+      },
+      dependencies: {
+        triggerFields: ['sourceDocType', 'sourceDocId'],
+        show: (values) => !!values.sourceDocType && !!values.sourceDocId,
+      },
+    },
+    {
+      fieldName: 'workOrderId',
+      label: '生产工单',
+      component: markRaw(ProWorkOrderSelect),
+      componentProps: {
+        placeholder: '请选择生产工单',
+        status: MesProWorkOrderStatusEnum.CONFIRMED,
+        // 工单变更时清空生产任务
+        onChange: () => formApi?.setFieldValue('taskId', undefined),
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['sourceDocId'],
+        componentProps: (values) => ({
+          disabled: !!values.sourceDocId,
+          placeholder: '请选择生产工单',
+          status: MesProWorkOrderStatusEnum.CONFIRMED,
+          onChange: () => formApi?.setFieldValue('taskId', undefined),
+        }),
+      },
+    },
+    {
+      fieldName: 'workstationId',
+      label: '工位',
+      component: markRaw(MdWorkstationSelect),
+      componentProps: {
+        placeholder: '请选择工位',
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['sourceDocId'],
+        componentProps: (values) => ({
+          disabled: !!values.sourceDocId,
+          placeholder: '请选择工位',
+        }),
+      },
+    },
+    {
+      fieldName: 'taskId',
+      label: '生产任务',
+      component: markRaw(ProTaskSelect),
+      componentProps: {
+        placeholder: '请选择生产任务',
+        statuses: [MesProTaskStatusEnum.PREPARE],
+      },
+      dependencies: {
+        triggerFields: ['sourceDocId', 'workOrderId', 'workstationId'],
+        componentProps: (values) => ({
+          disabled: !!values.sourceDocId || !values.workOrderId,
+          placeholder: '请选择生产任务',
+          statuses: [MesProTaskStatusEnum.PREPARE],
+          workOrderId: values.workOrderId,
+          workstationId: values.workstationId,
+        }),
+      },
+    },
+    {
+      fieldName: 'checkQuantity',
+      label: '检测数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入检测数量',
+        precision: 2,
+      },
+      rules: 'required',
+      dependencies: {
+        triggerFields: ['sourceDocId'],
+        componentProps: (values) => ({
+          class: '!w-full',
+          controlsPosition: 'right',
+          disabled: !!values.sourceDocId,
+          min: 0,
+          placeholder: '请输入检测数量',
+          precision: 2,
+        }),
+      },
+    },
+    {
+      fieldName: 'qualifiedQuantity',
+      label: '合格品数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入合格品数量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'unqualifiedQuantity',
+      label: '不合格品数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入不合格品数量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'laborScrapQuantity',
+      label: '工废数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入工废数量',
+        precision: 2,
+        onChange: () => syncUnqualified(formApi),
+      },
+      rules: 'required',
+      dependencies: {
+        triggerFields: ['unqualifiedQuantity'],
+        show: (values) =>
+          values.unqualifiedQuantity != null && values.unqualifiedQuantity > 0,
+      },
+    },
+    {
+      fieldName: 'materialScrapQuantity',
+      label: '料废数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入料废数量',
+        precision: 2,
+        onChange: () => syncUnqualified(formApi),
+      },
+      rules: 'required',
+      dependencies: {
+        triggerFields: ['unqualifiedQuantity'],
+        show: (values) =>
+          values.unqualifiedQuantity != null && values.unqualifiedQuantity > 0,
+      },
+    },
+    {
+      fieldName: 'otherScrapQuantity',
+      label: '其他废品数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入其他废品数量',
+        precision: 2,
+        onChange: () => syncUnqualified(formApi),
+      },
+      rules: 'required',
+      dependencies: {
+        triggerFields: ['unqualifiedQuantity'],
+        show: (values) =>
+          values.unqualifiedQuantity != null && values.unqualifiedQuantity > 0,
+      },
+    },
+    {
+      fieldName: 'inspectorUserId',
+      label: '检测人员',
+      component: 'ApiSelect',
+      componentProps: {
+        api: getSimpleUserList,
+        clearable: true,
+        labelField: 'nickname',
+        placeholder: '请选择检测人员',
+        valueField: 'id',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'inspectDate',
+      label: '检测日期',
+      component: 'DatePicker',
+      componentProps: {
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择检测日期',
+        type: 'date',
+        valueFormat: 'x',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'checkResult',
+      label: '检测结果',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_QC_CHECK_RESULT, 'number'),
+        placeholder: '请选择检测结果',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '检验单编号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入检验单编号',
+      },
+    },
+    {
+      fieldName: 'type',
+      label: '检验类型',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_IPQC_TYPE, 'number'),
+        placeholder: '请选择检验类型',
+      },
+    },
+    {
+      fieldName: 'workOrderId',
+      label: '生产工单',
+      component: markRaw(ProWorkOrderSelect),
+      componentProps: {
+        placeholder: '请选择生产工单',
+      },
+    },
+    {
+      fieldName: 'itemId',
+      label: '产品物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择产品物料',
+      },
+    },
+    {
+      fieldName: 'checkResult',
+      label: '检测结果',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_QC_CHECK_RESULT, 'number'),
+        placeholder: '请选择检测结果',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesQcIpqcApi.Ipqc>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '检验单编号',
+      width: 160,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '检验单名称',
+      minWidth: 180,
+    },
+    {
+      field: 'type',
+      title: '检验类型',
+      width: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_IPQC_TYPE },
+      },
+    },
+    {
+      field: 'workOrderCode',
+      title: '生产工单编号',
+      width: 140,
+    },
+    {
+      field: 'itemCode',
+      title: '产品物料编码',
+      width: 130,
+    },
+    {
+      field: 'itemName',
+      title: '产品物料名称',
+      minWidth: 150,
+    },
+    {
+      field: 'itemSpecification',
+      title: '规格型号',
+      width: 130,
+    },
+    {
+      field: 'unitName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'checkQuantity',
+      title: '检测数量',
+      width: 100,
+    },
+    {
+      field: 'checkResult',
+      title: '检测结果',
+      width: 110,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_QC_CHECK_RESULT },
+      },
+    },
+    {
+      field: 'inspectDate',
+      title: '检测日期',
+      width: 120,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'inspectorNickname',
+      title: '检测人员',
+      width: 100,
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_ORDER_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 180,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 过程检验单行子表的字段 */
+export function useLineGridColumns(): VxeTableGridOptions<MesQcIpqcLineApi.IpqcLine>['columns'] {
+  return [
+    {
+      field: 'indicatorName',
+      title: '检测项名称',
+      minWidth: 150,
+    },
+    {
+      field: 'indicatorType',
+      title: '检测项类型',
+      width: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_INDICATOR_TYPE },
+      },
+    },
+    {
+      field: 'toolName',
+      title: '检测工具',
+      width: 120,
+    },
+    {
+      field: 'checkMethod',
+      title: '检测方法',
+      minWidth: 180,
+    },
+    {
+      field: 'standardValue',
+      title: '标准值',
+      width: 100,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'maxThreshold',
+      title: '误差上限',
+      width: 100,
+    },
+    {
+      field: 'minThreshold',
+      title: '误差下限',
+      width: 100,
+    },
+    {
+      field: 'criticalQuantity',
+      title: '致命缺陷数',
+      width: 110,
+    },
+    {
+      field: 'majorQuantity',
+      title: '严重缺陷数',
+      width: 110,
+    },
+    {
+      field: 'minorQuantity',
+      title: '轻微缺陷数',
+      width: 110,
+    },
+    {
+      title: '操作',
+      width: 110,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/qc/ipqc/index.vue b/apps/web-ele/src/views/mes/qc/ipqc/index.vue
new file mode 100644
index 000000000..5cf39a502
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/ipqc/index.vue
@@ -0,0 +1,168 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcIpqcApi } from '#/api/mes/qc/ipqc';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { ElButton, ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { deleteIpqc, exportIpqc, getIpqcPage } from '#/api/mes/qc/ipqc';
+import { $t } from '#/locales';
+import { MesQcStatusEnum } from '#/views/mes/utils/constants';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建过程检验单 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看过程检验单 */
+function handleDetail(row: MesQcIpqcApi.Ipqc) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑过程检验单 */
+function handleEdit(row: MesQcIpqcApi.Ipqc) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 删除过程检验单 */
+async function handleDelete(row: MesQcIpqcApi.Ipqc) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.code]),
+  });
+  try {
+    await deleteIpqc(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportIpqc(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '过程检验单.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getIpqcPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesQcIpqcApi.Ipqc>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【质量】过程检验（IPQC）"
+        url="https://doc.iocoder.cn/mes/qc/ipqc/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="过程检验单列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['过程检验单']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:qc-ipqc:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:qc-ipqc:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <ElButton link type="primary" @click="handleDetail(row)">
+          {{ row.code }}
+        </ElButton>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:qc-ipqc:update'],
+              ifShow: row.status === MesQcStatusEnum.DRAFT,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:qc-ipqc:delete'],
+              ifShow: row.status === MesQcStatusEnum.DRAFT,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: $t('common.detail'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.VIEW,
+              auth: ['mes:qc-ipqc:query'],
+              onClick: handleDetail.bind(null, row),
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-ele/src/views/mes/qc/ipqc/modules/form.vue b/apps/web-ele/src/views/mes/qc/ipqc/modules/form.vue
new file mode 100644
index 000000000..9180f1662
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/ipqc/modules/form.vue
@@ -0,0 +1,233 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesQcIpqcApi } from '#/api/mes/qc/ipqc';
+
+import { computed, ref } from 'vue';
+
+import { confirm, useVbenModal } from '@vben/common-ui';
+
+import {
+  ElButton,
+  ElDescriptions,
+  ElDescriptionsItem,
+  ElMessage,
+  ElTabPane,
+  ElTabs,
+} from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createIpqc,
+  finishIpqc,
+  getIpqc,
+  updateIpqc,
+} from '#/api/mes/qc/ipqc';
+import { $t } from '#/locales';
+import { MesQcStatusEnum, MesQcTypeEnum } from '#/views/mes/utils/constants';
+
+import { QcIndicatorResultList } from '../../indicatorresult/components';
+import { useFormSchema } from '../data';
+import LineList from './line-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesQcIpqcApi.Ipqc>();
+const subTabsName = ref('line');
+const originalSnapshot = ref('');
+const isDetail = computed(() => formType.value === 'detail');
+const canFinish = computed(
+  () =>
+    formType.value === 'update' &&
+    formData.value?.status === MesQcStatusEnum.DRAFT,
+);
+const getTitle = computed(() => {
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['过程检验单']);
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['过程检验单'])
+    : $t('ui.actionTitle.create', ['过程检验单']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  wrapperClass: 'grid-cols-3',
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+});
+
+/** 子表变更后刷新主表头数据（缺陷统计等） */
+async function handleRefresh() {
+  if (!formData.value?.id) {
+    return;
+  }
+  formData.value = await getIpqc(formData.value.id);
+}
+
+/** 提交表单 */
+async function handleSubmit(): Promise<boolean> {
+  const { valid } = await formApi.validate();
+  if (!valid) {
+    return false;
+  }
+  const data = (await formApi.getValues()) as MesQcIpqcApi.Ipqc;
+  if (formData.value?.id) {
+    await updateIpqc({ ...data, id: formData.value.id });
+    formData.value = { ...formData.value, ...data };
+  } else {
+    const id = await createIpqc(data);
+    formData.value = {
+      ...data,
+      id: id as unknown as number,
+      status: MesQcStatusEnum.DRAFT,
+    };
+    await formApi.setFieldValue('id', formData.value.id);
+    await formApi.setFieldValue('status', formData.value.status);
+    formType.value = 'update';
+  }
+  originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  return true;
+}
+
+/** 完成检验单：表单有修改时先保存，再调用完成接口 */
+async function handleFinish() {
+  const id = formData.value?.id;
+  if (!id) {
+    return;
+  }
+  const { valid } = await formApi.validate();
+  if (!valid) {
+    return;
+  }
+  await confirm({
+    content: '是否完成过程检验单编制？【完成后将不能更改】',
+  });
+  modalApi.lock();
+  try {
+    const current = JSON.stringify(await formApi.getValues());
+    if (current !== originalSnapshot.value) {
+      const data = (await formApi.getValues()) as MesQcIpqcApi.Ipqc;
+      await updateIpqc({ ...data, id });
+      formData.value = { ...formData.value, ...data };
+      originalSnapshot.value = current;
+    }
+    await finishIpqc(id);
+    ElMessage.success('完成成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (isDetail.value) {
+      await modalApi.close();
+      return;
+    }
+    modalApi.lock();
+    try {
+      const ok = await handleSubmit();
+      if (!ok) {
+        return;
+      }
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+      await modalApi.close();
+      emit('success');
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      originalSnapshot.value = '';
+      return;
+    }
+    formApi.setState({ schema: useFormSchema(formApi) });
+    subTabsName.value = 'line';
+    const data = modalApi.getData<{
+      formType: FormType;
+      id?: number;
+      prefill?: MesQcIpqcApi.Ipqc;
+    }>();
+    formType.value = data.formType;
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getIpqc(data.id);
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    } else if (data?.prefill) {
+      formData.value = { ...data.prefill };
+      await formApi.setValues(data.prefill);
+    }
+    originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-4/5">
+    <Form class="mx-4" />
+    <!-- 缺陷统计（只读） -->
+    <div v-if="formData?.id" class="mx-4 mt-4">
+      <ElDescriptions title="缺陷情况" :column="3" border size="small">
+        <ElDescriptionsItem label="致命缺陷数">
+          {{ formData.criticalQuantity ?? 0 }}
+        </ElDescriptionsItem>
+        <ElDescriptionsItem label="严重缺陷数">
+          {{ formData.majorQuantity ?? 0 }}
+        </ElDescriptionsItem>
+        <ElDescriptionsItem label="轻微缺陷数">
+          {{ formData.minorQuantity ?? 0 }}
+        </ElDescriptionsItem>
+        <ElDescriptionsItem label="致命缺陷率">
+          {{ formData.criticalRate ?? 0 }}%
+        </ElDescriptionsItem>
+        <ElDescriptionsItem label="严重缺陷率">
+          {{ formData.majorRate ?? 0 }}%
+        </ElDescriptionsItem>
+        <ElDescriptionsItem label="轻微缺陷率">
+          {{ formData.minorRate ?? 0 }}%
+        </ElDescriptionsItem>
+      </ElDescriptions>
+    </div>
+    <ElTabs v-if="formData?.id" v-model="subTabsName" class="mx-4 mt-4">
+      <ElTabPane label="检验项" name="line">
+        <LineList
+          :form-type="formType"
+          :ipqc-id="formData.id"
+          @refresh="handleRefresh"
+        />
+      </ElTabPane>
+      <ElTabPane label="检测结果" name="result">
+        <QcIndicatorResultList
+          :qc-id="formData.id"
+          :qc-type="MesQcTypeEnum.IPQC"
+          :readonly="isDetail"
+        />
+      </ElTabPane>
+    </ElTabs>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <ElButton v-if="canFinish" type="primary" @click="handleFinish">
+          完成
+        </ElButton>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/qc/ipqc/modules/line-list.vue b/apps/web-ele/src/views/mes/qc/ipqc/modules/line-list.vue
new file mode 100644
index 000000000..cfb8dc99d
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/ipqc/modules/line-list.vue
@@ -0,0 +1,98 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcIpqcLineApi } from '#/api/mes/qc/ipqc/line';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getIpqcLinePage } from '#/api/mes/qc/ipqc/line';
+import { MesQcTypeEnum } from '#/views/mes/utils/constants';
+
+import { DefectRecordInlineList } from '../../defectrecord/components';
+import { useLineGridColumns } from '../data';
+
+const props = defineProps<{
+  formType?: string;
+  ipqcId: number;
+}>();
+
+const emit = defineEmits<{ refresh: [] }>();
+
+const [DefectModal, defectModalApi] = useVbenModal({
+  connectedComponent: DefectRecordInlineList,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 缺陷记录变更后，刷新本表格并通知父组件刷新主表统计 */
+function handleDefectChanged() {
+  handleRefresh();
+  emit('refresh');
+}
+
+/** 打开缺陷记录弹窗 */
+function handleOpenDefect(row: MesQcIpqcLineApi.IpqcLine) {
+  defectModalApi
+    .setData({
+      formType: props.formType,
+      lineId: row.id,
+      qcId: props.ipqcId,
+      qcType: MesQcTypeEnum.IPQC,
+    })
+    .open();
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useLineGridColumns(),
+    height: 360,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.ipqcId) {
+            return { list: [], total: 0 };
+          }
+          return await getIpqcLinePage({
+            ipqcId: props.ipqcId,
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesQcIpqcLineApi.IpqcLine>,
+});
+</script>
+
+<template>
+  <div>
+    <DefectModal @success="handleDefectChanged" />
+    <Grid table-title="检验项">
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: '缺陷列表',
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.VIEW,
+              onClick: handleOpenDefect.bind(null, row),
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-ele/src/views/mes/qc/oqc/data.ts b/apps/web-ele/src/views/mes/qc/oqc/data.ts
new file mode 100644
index 000000000..b5027d32b
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/oqc/data.ts
@@ -0,0 +1,524 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcOqcApi } from '#/api/mes/qc/oqc';
+import type { MesQcOqcLineApi } from '#/api/mes/qc/oqc/line';
+
+import { h, markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { ElButton } from 'element-plus';
+
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getSimpleUserList } from '#/api/system/user';
+import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
+/** 新增/修改的表单 */
+export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'sourceDocId',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'sourceLineId',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'status',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '检验单编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入检验单编号',
+      },
+      rules: 'required',
+      suffix: () =>
+        h(
+          ElButton,
+          {
+            onClick: async () => {
+              try {
+                const code = await generateAutoCode(
+                  MesAutoCodeRuleCode.QC_OQC_CODE,
+                );
+                await formApi?.setFieldValue('code', code);
+              } catch (error) {
+                console.error(error);
+              }
+            },
+          },
+          { default: () => '生成' },
+        ),
+    },
+    {
+      fieldName: 'name',
+      label: '检验单名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入检验单名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'sourceDocType',
+      label: '来源单据类型',
+      component: 'Select',
+      componentProps: {
+        disabled: true,
+        options: getDictOptions(DICT_TYPE.MES_QC_SOURCE_DOC_TYPE, 'number'),
+        placeholder: '来源单据类型',
+      },
+      dependencies: {
+        triggerFields: ['sourceDocType'],
+        show: (values) => !!values.sourceDocType,
+      },
+    },
+    {
+      fieldName: 'sourceDocCode',
+      label: '来源单据编号',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+        placeholder: '来源单据编号',
+      },
+      dependencies: {
+        triggerFields: ['sourceDocType', 'sourceDocId'],
+        show: (values) => !!values.sourceDocType && !!values.sourceDocId,
+      },
+    },
+    {
+      fieldName: 'itemId',
+      label: '产品物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择产品物料',
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['sourceDocId'],
+        componentProps: (values) => ({
+          disabled: !!values.sourceDocId,
+          placeholder: '请选择产品物料',
+        }),
+      },
+    },
+    {
+      fieldName: 'clientId',
+      label: '客户',
+      component: markRaw(MdClientSelect),
+      componentProps: {
+        placeholder: '请选择客户',
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['sourceDocId'],
+        componentProps: (values) => ({
+          disabled: !!values.sourceDocId,
+          placeholder: '请选择客户',
+        }),
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入批次号',
+      },
+    },
+    {
+      fieldName: 'outQuantity',
+      label: '发货数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入发货数量',
+        precision: 2,
+        // 新建态下，发货数量变化时把 checkQuantity 也填上同值
+        onChange: async (value: null | number | undefined) => {
+          if (value == null || !formApi) return;
+          const values = await formApi.getValues();
+          if (!values.id && values.checkQuantity == null) {
+            await formApi.setFieldValue('checkQuantity', value);
+          }
+        },
+      },
+      rules: 'required',
+      dependencies: {
+        triggerFields: ['sourceDocId'],
+        componentProps: (values) => ({
+          class: '!w-full',
+          controlsPosition: 'right',
+          disabled: !!values.sourceDocId,
+          min: 0,
+          placeholder: '请输入发货数量',
+          precision: 2,
+          onChange: async (value: null | number | undefined) => {
+            if (value == null || !formApi) return;
+            const current = await formApi.getValues();
+            if (!current.id && current.checkQuantity == null) {
+              await formApi.setFieldValue('checkQuantity', value);
+            }
+          },
+        }),
+      },
+    },
+    {
+      fieldName: 'checkQuantity',
+      label: '检测数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入检测数量',
+        // 新建态下，检测数量变化时把 outQuantity 也填上同值
+        onChange: async (value: null | number | undefined) => {
+          if (value == null || !formApi) return;
+          const values = await formApi.getValues();
+          if (!values.id && values.outQuantity == null) {
+            await formApi.setFieldValue('outQuantity', value);
+          }
+        },
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'qualifiedQuantity',
+      label: '合格品数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入合格品数量',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'unqualifiedQuantity',
+      label: '不合格品数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入不合格品数量',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'inspectorUserId',
+      label: '检测人员',
+      component: 'ApiSelect',
+      componentProps: {
+        api: getSimpleUserList,
+        clearable: true,
+        labelField: 'nickname',
+        placeholder: '请选择检测人员',
+        valueField: 'id',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'outDate',
+      label: '出货日期',
+      component: 'DatePicker',
+      componentProps: {
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择出货日期',
+        type: 'date',
+        valueFormat: 'x',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'inspectDate',
+      label: '检测日期',
+      component: 'DatePicker',
+      componentProps: {
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择检测日期',
+        type: 'date',
+        valueFormat: 'x',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'checkResult',
+      label: '检测结果',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_QC_CHECK_RESULT, 'number'),
+        placeholder: '请选择检测结果',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '检验单编号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入检验单编号',
+      },
+    },
+    {
+      fieldName: 'clientId',
+      label: '客户',
+      component: markRaw(MdClientSelect),
+      componentProps: {
+        placeholder: '请选择客户',
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入批次号',
+      },
+    },
+    {
+      fieldName: 'itemId',
+      label: '产品物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择产品物料',
+      },
+    },
+    {
+      fieldName: 'checkResult',
+      label: '检测结果',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_QC_CHECK_RESULT, 'number'),
+        placeholder: '请选择检测结果',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesQcOqcApi.Oqc>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '检验单编号',
+      width: 160,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '检验单名称',
+      minWidth: 180,
+    },
+    {
+      field: 'clientNickname',
+      title: '客户名称',
+      width: 120,
+    },
+    {
+      field: 'batchCode',
+      title: '批次号',
+      width: 130,
+    },
+    {
+      field: 'itemCode',
+      title: '产品物料编码',
+      width: 130,
+    },
+    {
+      field: 'itemName',
+      title: '产品物料名称',
+      minWidth: 150,
+    },
+    {
+      field: 'itemSpecification',
+      title: '规格型号',
+      minWidth: 150,
+    },
+    {
+      field: 'unitName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'outQuantity',
+      title: '发货数量',
+      width: 100,
+    },
+    {
+      field: 'checkQuantity',
+      title: '检测数量',
+      width: 100,
+    },
+    {
+      field: 'unqualifiedQuantity',
+      title: '不合格数',
+      width: 100,
+    },
+    {
+      field: 'checkResult',
+      title: '检测结果',
+      width: 110,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_QC_CHECK_RESULT },
+      },
+    },
+    {
+      field: 'outDate',
+      title: '出货日期',
+      width: 120,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'inspectDate',
+      title: '检测日期',
+      width: 120,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'inspectorNickname',
+      title: '检测人员',
+      width: 100,
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_ORDER_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 220,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 出货检验单行子表的字段 */
+export function useLineGridColumns(): VxeTableGridOptions<MesQcOqcLineApi.OqcLine>['columns'] {
+  return [
+    {
+      field: 'indicatorName',
+      title: '检测项名称',
+      minWidth: 150,
+    },
+    {
+      field: 'indicatorType',
+      title: '检测项类型',
+      width: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_INDICATOR_TYPE },
+      },
+    },
+    {
+      field: 'tool',
+      title: '检测工具',
+      width: 120,
+    },
+    {
+      field: 'checkMethod',
+      title: '检测方法',
+      minWidth: 180,
+    },
+    {
+      field: 'standardValue',
+      title: '标准值',
+      width: 100,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'maxThreshold',
+      title: '误差上限',
+      width: 100,
+    },
+    {
+      field: 'minThreshold',
+      title: '误差下限',
+      width: 100,
+    },
+    {
+      field: 'criticalQuantity',
+      title: '致命缺陷数',
+      width: 110,
+    },
+    {
+      field: 'majorQuantity',
+      title: '严重缺陷数',
+      width: 110,
+    },
+    {
+      field: 'minorQuantity',
+      title: '轻微缺陷数',
+      width: 110,
+    },
+    {
+      title: '操作',
+      width: 110,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/qc/oqc/index.vue b/apps/web-ele/src/views/mes/qc/oqc/index.vue
new file mode 100644
index 000000000..f736d25c1
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/oqc/index.vue
@@ -0,0 +1,168 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcOqcApi } from '#/api/mes/qc/oqc';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { ElButton, ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { deleteOqc, exportOqc, getOqcPage } from '#/api/mes/qc/oqc';
+import { $t } from '#/locales';
+import { MesQcStatusEnum } from '#/views/mes/utils/constants';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建出货检验单 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看出货检验单 */
+function handleDetail(row: MesQcOqcApi.Oqc) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑出货检验单 */
+function handleEdit(row: MesQcOqcApi.Oqc) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 删除出货检验单 */
+async function handleDelete(row: MesQcOqcApi.Oqc) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.code]),
+  });
+  try {
+    await deleteOqc(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportOqc(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '出货检验单.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getOqcPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesQcOqcApi.Oqc>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【质量】出货检验（OQC）"
+        url="https://doc.iocoder.cn/mes/qc/oqc/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="出货检验单列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['出货检验单']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:qc-oqc:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:qc-oqc:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <ElButton link type="primary" @click="handleDetail(row)">
+          {{ row.code }}
+        </ElButton>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:qc-oqc:update'],
+              ifShow: row.status === MesQcStatusEnum.DRAFT,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:qc-oqc:delete'],
+              ifShow: row.status === MesQcStatusEnum.DRAFT,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: $t('common.detail'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.VIEW,
+              auth: ['mes:qc-oqc:query'],
+              onClick: handleDetail.bind(null, row),
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-ele/src/views/mes/qc/oqc/modules/form.vue b/apps/web-ele/src/views/mes/qc/oqc/modules/form.vue
new file mode 100644
index 000000000..88d95e6ab
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/oqc/modules/form.vue
@@ -0,0 +1,233 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesQcOqcApi } from '#/api/mes/qc/oqc';
+
+import { computed, ref } from 'vue';
+
+import { confirm, useVbenModal } from '@vben/common-ui';
+
+import {
+  ElButton,
+  ElDescriptions,
+  ElDescriptionsItem,
+  ElMessage,
+  ElTabPane,
+  ElTabs,
+} from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createOqc,
+  finishOqc,
+  getOqc,
+  updateOqc,
+} from '#/api/mes/qc/oqc';
+import { $t } from '#/locales';
+import { MesQcStatusEnum, MesQcTypeEnum } from '#/views/mes/utils/constants';
+
+import { QcIndicatorResultList } from '../../indicatorresult/components';
+import { useFormSchema } from '../data';
+import LineList from './line-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesQcOqcApi.Oqc>();
+const subTabsName = ref('line');
+const originalSnapshot = ref('');
+const isDetail = computed(() => formType.value === 'detail');
+const canFinish = computed(
+  () =>
+    formType.value === 'update' &&
+    formData.value?.status === MesQcStatusEnum.DRAFT,
+);
+const getTitle = computed(() => {
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['出货检验单']);
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['出货检验单'])
+    : $t('ui.actionTitle.create', ['出货检验单']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  wrapperClass: 'grid-cols-3',
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+});
+
+/** 子表变更后刷新主表头数据（缺陷统计等） */
+async function handleRefresh() {
+  if (!formData.value?.id) {
+    return;
+  }
+  formData.value = await getOqc(formData.value.id);
+}
+
+/** 提交表单 */
+async function handleSubmit(): Promise<boolean> {
+  const { valid } = await formApi.validate();
+  if (!valid) {
+    return false;
+  }
+  const data = (await formApi.getValues()) as MesQcOqcApi.Oqc;
+  if (formData.value?.id) {
+    await updateOqc({ ...data, id: formData.value.id });
+    formData.value = { ...formData.value, ...data };
+  } else {
+    const id = await createOqc(data);
+    formData.value = {
+      ...data,
+      id: id as unknown as number,
+      status: MesQcStatusEnum.DRAFT,
+    };
+    await formApi.setFieldValue('id', formData.value.id);
+    await formApi.setFieldValue('status', formData.value.status);
+    formType.value = 'update';
+  }
+  originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  return true;
+}
+
+/** 完成检验单：表单有修改时先保存，再调用完成接口 */
+async function handleFinish() {
+  const id = formData.value?.id;
+  if (!id) {
+    return;
+  }
+  const { valid } = await formApi.validate();
+  if (!valid) {
+    return;
+  }
+  await confirm({
+    content: '是否完成出货检验单编制？【完成后将不能更改】',
+  });
+  modalApi.lock();
+  try {
+    const current = JSON.stringify(await formApi.getValues());
+    if (current !== originalSnapshot.value) {
+      const data = (await formApi.getValues()) as MesQcOqcApi.Oqc;
+      await updateOqc({ ...data, id });
+      formData.value = { ...formData.value, ...data };
+      originalSnapshot.value = current;
+    }
+    await finishOqc(id);
+    ElMessage.success('完成成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (isDetail.value) {
+      await modalApi.close();
+      return;
+    }
+    modalApi.lock();
+    try {
+      const ok = await handleSubmit();
+      if (!ok) {
+        return;
+      }
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+      await modalApi.close();
+      emit('success');
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      originalSnapshot.value = '';
+      return;
+    }
+    formApi.setState({ schema: useFormSchema(formApi) });
+    subTabsName.value = 'line';
+    const data = modalApi.getData<{
+      formType: FormType;
+      id?: number;
+      prefill?: MesQcOqcApi.Oqc;
+    }>();
+    formType.value = data.formType;
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getOqc(data.id);
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    } else if (data?.prefill) {
+      formData.value = { ...data.prefill };
+      await formApi.setValues(data.prefill);
+    }
+    originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-4/5">
+    <Form class="mx-4" />
+    <!-- 缺陷统计（只读） -->
+    <div v-if="formData?.id" class="mx-4 mt-4">
+      <ElDescriptions title="缺陷情况" :column="3" border size="small">
+        <ElDescriptionsItem label="致命缺陷数">
+          {{ formData.criticalQuantity ?? 0 }}
+        </ElDescriptionsItem>
+        <ElDescriptionsItem label="严重缺陷数">
+          {{ formData.majorQuantity ?? 0 }}
+        </ElDescriptionsItem>
+        <ElDescriptionsItem label="轻微缺陷数">
+          {{ formData.minorQuantity ?? 0 }}
+        </ElDescriptionsItem>
+        <ElDescriptionsItem label="致命缺陷率">
+          {{ formData.criticalRate ?? 0 }}%
+        </ElDescriptionsItem>
+        <ElDescriptionsItem label="严重缺陷率">
+          {{ formData.majorRate ?? 0 }}%
+        </ElDescriptionsItem>
+        <ElDescriptionsItem label="轻微缺陷率">
+          {{ formData.minorRate ?? 0 }}%
+        </ElDescriptionsItem>
+      </ElDescriptions>
+    </div>
+    <ElTabs v-if="formData?.id" v-model="subTabsName" class="mx-4 mt-4">
+      <ElTabPane label="检验项" name="line">
+        <LineList
+          :form-type="formType"
+          :oqc-id="formData.id"
+          @refresh="handleRefresh"
+        />
+      </ElTabPane>
+      <ElTabPane label="检测结果" name="result">
+        <QcIndicatorResultList
+          :qc-id="formData.id"
+          :qc-type="MesQcTypeEnum.OQC"
+          :readonly="isDetail"
+        />
+      </ElTabPane>
+    </ElTabs>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <ElButton v-if="canFinish" type="primary" @click="handleFinish">
+          完成
+        </ElButton>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/qc/oqc/modules/line-list.vue b/apps/web-ele/src/views/mes/qc/oqc/modules/line-list.vue
new file mode 100644
index 000000000..18af3731c
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/oqc/modules/line-list.vue
@@ -0,0 +1,98 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcOqcLineApi } from '#/api/mes/qc/oqc/line';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getOqcLinePage } from '#/api/mes/qc/oqc/line';
+import { MesQcTypeEnum } from '#/views/mes/utils/constants';
+
+import { DefectRecordInlineList } from '../../defectrecord/components';
+import { useLineGridColumns } from '../data';
+
+const props = defineProps<{
+  formType?: string;
+  oqcId: number;
+}>();
+
+const emit = defineEmits<{ refresh: [] }>();
+
+const [DefectModal, defectModalApi] = useVbenModal({
+  connectedComponent: DefectRecordInlineList,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 缺陷记录变更后，刷新本表格并通知父组件刷新主表统计 */
+function handleDefectChanged() {
+  handleRefresh();
+  emit('refresh');
+}
+
+/** 打开缺陷记录弹窗 */
+function handleOpenDefect(row: MesQcOqcLineApi.OqcLine) {
+  defectModalApi
+    .setData({
+      formType: props.formType,
+      lineId: row.id,
+      qcId: props.oqcId,
+      qcType: MesQcTypeEnum.OQC,
+    })
+    .open();
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useLineGridColumns(),
+    height: 360,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.oqcId) {
+            return { list: [], total: 0 };
+          }
+          return await getOqcLinePage({
+            oqcId: props.oqcId,
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesQcOqcLineApi.OqcLine>,
+});
+</script>
+
+<template>
+  <div>
+    <DefectModal @success="handleDefectChanged" />
+    <Grid table-title="检验项">
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: '缺陷列表',
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.VIEW,
+              onClick: handleOpenDefect.bind(null, row),
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-ele/src/views/mes/qc/rqc/data.ts b/apps/web-ele/src/views/mes/qc/rqc/data.ts
new file mode 100644
index 000000000..1486090ec
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/rqc/data.ts
@@ -0,0 +1,498 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcRqcApi } from '#/api/mes/qc/rqc';
+import type { MesQcRqcLineApi } from '#/api/mes/qc/rqc/line';
+
+import { h, markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { ElButton } from 'element-plus';
+
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getSimpleUserList } from '#/api/system/user';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import {
+  MesAutoCodeRuleCode,
+  MesQcSourceDocTypeEnum,
+} from '#/views/mes/utils/constants';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
+/** 列表搜索专用：来源单据类型字典只允许 RQC 用到的两种 */
+function getRqcSourceDocTypeOptions() {
+  const allowed = new Set<number>([
+    MesQcSourceDocTypeEnum.RETURN_ISSUE,
+    MesQcSourceDocTypeEnum.RETURN_SALES,
+  ]);
+  return getDictOptions(DICT_TYPE.MES_QC_SOURCE_DOC_TYPE, 'number').filter(
+    (item) => allowed.has(Number(item.value)),
+  );
+}
+
+/** 新增/修改的表单 */
+export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'sourceDocId',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'sourceLineId',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'status',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '检验单编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入检验单编号',
+      },
+      rules: 'required',
+      suffix: () =>
+        h(
+          ElButton,
+          {
+            onClick: async () => {
+              try {
+                const code = await generateAutoCode(
+                  MesAutoCodeRuleCode.QC_RQC_CODE,
+                );
+                await formApi?.setFieldValue('code', code);
+              } catch (error) {
+                console.error(error);
+              }
+            },
+          },
+          { default: () => '生成' },
+        ),
+    },
+    {
+      fieldName: 'name',
+      label: '检验单名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入检验单名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'sourceDocType',
+      label: '来源单据类型',
+      component: 'Select',
+      componentProps: {
+        disabled: true,
+        options: getDictOptions(DICT_TYPE.MES_QC_SOURCE_DOC_TYPE, 'number'),
+        placeholder: '来源单据类型',
+      },
+      dependencies: {
+        triggerFields: ['sourceDocType'],
+        show: (values) => !!values.sourceDocType,
+      },
+    },
+    {
+      fieldName: 'sourceDocCode',
+      label: '来源单据编号',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+        placeholder: '来源单据编号',
+      },
+      dependencies: {
+        triggerFields: ['sourceDocType', 'sourceDocId'],
+        show: (values) => !!values.sourceDocType && !!values.sourceDocId,
+      },
+    },
+    {
+      fieldName: 'type',
+      label: '检验类型',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_RQC_TYPE, 'number'),
+        placeholder: '请选择检验类型',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'itemId',
+      label: '产品物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择产品物料',
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['sourceDocId'],
+        componentProps: (values) => ({
+          disabled: !!values.sourceDocId,
+          placeholder: '请选择产品物料',
+        }),
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入批次号',
+      },
+    },
+    {
+      fieldName: 'checkQuantity',
+      label: '检测数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入',
+        precision: 2,
+      },
+      rules: 'required',
+      dependencies: {
+        triggerFields: ['sourceDocId'],
+        componentProps: (values) => ({
+          class: '!w-full',
+          controlsPosition: 'right',
+          disabled: !!values.sourceDocId,
+          min: 0,
+          placeholder: '请输入',
+          precision: 2,
+        }),
+      },
+    },
+    {
+      fieldName: 'qualifiedQuantity',
+      label: '合格品数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'unqualifiedQuantity',
+      label: '不合格品数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'inspectDate',
+      label: '检测日期',
+      component: 'DatePicker',
+      componentProps: {
+        format: 'YYYY-MM-DD HH:mm:ss',
+        placeholder: '请选择检测日期',
+        type: 'datetime',
+        valueFormat: 'x',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'inspectorUserId',
+      label: '检测人员',
+      component: 'ApiSelect',
+      componentProps: {
+        api: getSimpleUserList,
+        clearable: true,
+        labelField: 'nickname',
+        placeholder: '请选择检测人员',
+        valueField: 'id',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'checkResult',
+      label: '检测结果',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_QC_CHECK_RESULT, 'number'),
+        placeholder: '请选择检测结果',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '检验单编号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入检验单编号',
+      },
+    },
+    {
+      fieldName: 'sourceDocType',
+      label: '来源单据类型',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getRqcSourceDocTypeOptions(),
+        placeholder: '请选择来源单据类型',
+      },
+    },
+    {
+      fieldName: 'sourceDocCode',
+      label: '来源单据编号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入来源单据编号',
+      },
+    },
+    {
+      fieldName: 'itemId',
+      label: '产品物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择产品物料',
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入批次号',
+      },
+    },
+    {
+      fieldName: 'checkResult',
+      label: '检测结果',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_QC_CHECK_RESULT, 'number'),
+        placeholder: '请选择检测结果',
+      },
+    },
+    {
+      fieldName: 'inspectorUserId',
+      label: '检测人员',
+      component: 'ApiSelect',
+      componentProps: {
+        api: getSimpleUserList,
+        clearable: true,
+        labelField: 'nickname',
+        placeholder: '请选择检测人员',
+        valueField: 'id',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesQcRqcApi.Rqc>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '检验单编号',
+      width: 160,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '检验单名称',
+      minWidth: 180,
+    },
+    {
+      field: 'sourceDocType',
+      title: '来源单据类型',
+      width: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_QC_SOURCE_DOC_TYPE },
+      },
+    },
+    {
+      field: 'sourceDocCode',
+      title: '来源单据编码',
+      width: 160,
+    },
+    {
+      field: 'itemCode',
+      title: '产品物料编码',
+      width: 130,
+    },
+    {
+      field: 'itemName',
+      title: '产品物料名称',
+      minWidth: 150,
+    },
+    {
+      field: 'itemSpecification',
+      title: '规格型号',
+      width: 130,
+    },
+    {
+      field: 'unitName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'batchCode',
+      title: '批次号',
+      width: 130,
+    },
+    {
+      field: 'checkResult',
+      title: '检测结果',
+      width: 110,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_QC_CHECK_RESULT },
+      },
+    },
+    {
+      field: 'inspectDate',
+      title: '检测日期',
+      width: 160,
+      formatter: 'formatDateTime',
+    },
+    {
+      field: 'inspectorNickname',
+      title: '检测人员',
+      width: 100,
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_ORDER_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 180,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 退货检验单行子表的字段 */
+export function useLineGridColumns(): VxeTableGridOptions<MesQcRqcLineApi.RqcLine>['columns'] {
+  return [
+    {
+      field: 'indicatorName',
+      title: '检测项名称',
+      minWidth: 150,
+    },
+    {
+      field: 'indicatorType',
+      title: '检测项类型',
+      width: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_INDICATOR_TYPE },
+      },
+    },
+    {
+      field: 'tool',
+      title: '检测工具',
+      width: 120,
+    },
+    {
+      field: 'checkMethod',
+      title: '检测方法',
+      minWidth: 180,
+    },
+    {
+      field: 'standardValue',
+      title: '标准值',
+      width: 100,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'maxThreshold',
+      title: '误差上限',
+      width: 100,
+    },
+    {
+      field: 'minThreshold',
+      title: '误差下限',
+      width: 100,
+    },
+    {
+      field: 'criticalQuantity',
+      title: '致命缺陷数',
+      width: 110,
+    },
+    {
+      field: 'majorQuantity',
+      title: '严重缺陷数',
+      width: 110,
+    },
+    {
+      field: 'minorQuantity',
+      title: '轻微缺陷数',
+      width: 110,
+    },
+    {
+      title: '操作',
+      width: 110,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/qc/rqc/index.vue b/apps/web-ele/src/views/mes/qc/rqc/index.vue
new file mode 100644
index 000000000..7621abb5c
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/rqc/index.vue
@@ -0,0 +1,168 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcRqcApi } from '#/api/mes/qc/rqc';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { ElButton, ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { deleteRqc, exportRqc, getRqcPage } from '#/api/mes/qc/rqc';
+import { $t } from '#/locales';
+import { MesQcStatusEnum } from '#/views/mes/utils/constants';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建退货检验单 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看退货检验单 */
+function handleDetail(row: MesQcRqcApi.Rqc) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑退货检验单 */
+function handleEdit(row: MesQcRqcApi.Rqc) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 删除退货检验单 */
+async function handleDelete(row: MesQcRqcApi.Rqc) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.code]),
+  });
+  try {
+    await deleteRqc(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportRqc(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '退货检验单.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getRqcPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesQcRqcApi.Rqc>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【质量】退货检验（RQC）"
+        url="https://doc.iocoder.cn/mes/qc/rqc/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="退货检验单列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['退货检验单']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:qc-rqc:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:qc-rqc:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <ElButton link type="primary" @click="handleDetail(row)">
+          {{ row.code }}
+        </ElButton>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:qc-rqc:update'],
+              ifShow: row.status === MesQcStatusEnum.DRAFT,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:qc-rqc:delete'],
+              ifShow: row.status === MesQcStatusEnum.DRAFT,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: $t('common.detail'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.VIEW,
+              auth: ['mes:qc-rqc:query'],
+              onClick: handleDetail.bind(null, row),
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-ele/src/views/mes/qc/rqc/modules/form.vue b/apps/web-ele/src/views/mes/qc/rqc/modules/form.vue
new file mode 100644
index 000000000..bb2e7d6a2
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/rqc/modules/form.vue
@@ -0,0 +1,233 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesQcRqcApi } from '#/api/mes/qc/rqc';
+
+import { computed, ref } from 'vue';
+
+import { confirm, useVbenModal } from '@vben/common-ui';
+
+import {
+  ElButton,
+  ElDescriptions,
+  ElDescriptionsItem,
+  ElMessage,
+  ElTabPane,
+  ElTabs,
+} from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createRqc,
+  finishRqc,
+  getRqc,
+  updateRqc,
+} from '#/api/mes/qc/rqc';
+import { $t } from '#/locales';
+import { MesQcStatusEnum, MesQcTypeEnum } from '#/views/mes/utils/constants';
+
+import { QcIndicatorResultList } from '../../indicatorresult/components';
+import { useFormSchema } from '../data';
+import LineList from './line-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesQcRqcApi.Rqc>();
+const subTabsName = ref('line');
+const originalSnapshot = ref('');
+const isDetail = computed(() => formType.value === 'detail');
+const canFinish = computed(
+  () =>
+    formType.value === 'update' &&
+    formData.value?.status === MesQcStatusEnum.DRAFT,
+);
+const getTitle = computed(() => {
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['退货检验单']);
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['退货检验单'])
+    : $t('ui.actionTitle.create', ['退货检验单']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  wrapperClass: 'grid-cols-3',
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+});
+
+/** 子表变更后刷新主表头数据（缺陷统计等） */
+async function handleRefresh() {
+  if (!formData.value?.id) {
+    return;
+  }
+  formData.value = await getRqc(formData.value.id);
+}
+
+/** 提交表单 */
+async function handleSubmit(): Promise<boolean> {
+  const { valid } = await formApi.validate();
+  if (!valid) {
+    return false;
+  }
+  const data = (await formApi.getValues()) as MesQcRqcApi.Rqc;
+  if (formData.value?.id) {
+    await updateRqc({ ...data, id: formData.value.id });
+    formData.value = { ...formData.value, ...data };
+  } else {
+    const id = await createRqc(data);
+    formData.value = {
+      ...data,
+      id: id as unknown as number,
+      status: MesQcStatusEnum.DRAFT,
+    };
+    await formApi.setFieldValue('id', formData.value.id);
+    await formApi.setFieldValue('status', formData.value.status);
+    formType.value = 'update';
+  }
+  originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  return true;
+}
+
+/** 完成检验单：表单有修改时先保存，再调用完成接口 */
+async function handleFinish() {
+  const id = formData.value?.id;
+  if (!id) {
+    return;
+  }
+  const { valid } = await formApi.validate();
+  if (!valid) {
+    return;
+  }
+  await confirm({
+    content: '是否完成退货检验单编制？【完成后将不能更改】',
+  });
+  modalApi.lock();
+  try {
+    const current = JSON.stringify(await formApi.getValues());
+    if (current !== originalSnapshot.value) {
+      const data = (await formApi.getValues()) as MesQcRqcApi.Rqc;
+      await updateRqc({ ...data, id });
+      formData.value = { ...formData.value, ...data };
+      originalSnapshot.value = current;
+    }
+    await finishRqc(id);
+    ElMessage.success('完成成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (isDetail.value) {
+      await modalApi.close();
+      return;
+    }
+    modalApi.lock();
+    try {
+      const ok = await handleSubmit();
+      if (!ok) {
+        return;
+      }
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+      await modalApi.close();
+      emit('success');
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      originalSnapshot.value = '';
+      return;
+    }
+    formApi.setState({ schema: useFormSchema(formApi) });
+    subTabsName.value = 'line';
+    const data = modalApi.getData<{
+      formType: FormType;
+      id?: number;
+      prefill?: MesQcRqcApi.Rqc;
+    }>();
+    formType.value = data.formType;
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getRqc(data.id);
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    } else if (data?.prefill) {
+      formData.value = { ...data.prefill };
+      await formApi.setValues(data.prefill);
+    }
+    originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-4/5">
+    <Form class="mx-4" />
+    <!-- 缺陷统计（只读） -->
+    <div v-if="formData?.id" class="mx-4 mt-4">
+      <ElDescriptions title="缺陷情况" :column="3" border size="small">
+        <ElDescriptionsItem label="致命缺陷数">
+          {{ formData.criticalQuantity ?? 0 }}
+        </ElDescriptionsItem>
+        <ElDescriptionsItem label="严重缺陷数">
+          {{ formData.majorQuantity ?? 0 }}
+        </ElDescriptionsItem>
+        <ElDescriptionsItem label="轻微缺陷数">
+          {{ formData.minorQuantity ?? 0 }}
+        </ElDescriptionsItem>
+        <ElDescriptionsItem label="致命缺陷率">
+          {{ formData.criticalRate ?? 0 }}%
+        </ElDescriptionsItem>
+        <ElDescriptionsItem label="严重缺陷率">
+          {{ formData.majorRate ?? 0 }}%
+        </ElDescriptionsItem>
+        <ElDescriptionsItem label="轻微缺陷率">
+          {{ formData.minorRate ?? 0 }}%
+        </ElDescriptionsItem>
+      </ElDescriptions>
+    </div>
+    <ElTabs v-if="formData?.id" v-model="subTabsName" class="mx-4 mt-4">
+      <ElTabPane label="检验项" name="line">
+        <LineList
+          :form-type="formType"
+          :rqc-id="formData.id"
+          @refresh="handleRefresh"
+        />
+      </ElTabPane>
+      <ElTabPane label="检测结果" name="result">
+        <QcIndicatorResultList
+          :qc-id="formData.id"
+          :qc-type="MesQcTypeEnum.RQC"
+          :readonly="isDetail"
+        />
+      </ElTabPane>
+    </ElTabs>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <ElButton v-if="canFinish" type="primary" @click="handleFinish">
+          完成
+        </ElButton>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/qc/rqc/modules/line-list.vue b/apps/web-ele/src/views/mes/qc/rqc/modules/line-list.vue
new file mode 100644
index 000000000..751137b85
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/rqc/modules/line-list.vue
@@ -0,0 +1,98 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcRqcLineApi } from '#/api/mes/qc/rqc/line';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getRqcLinePage } from '#/api/mes/qc/rqc/line';
+import { MesQcTypeEnum } from '#/views/mes/utils/constants';
+
+import { DefectRecordInlineList } from '../../defectrecord/components';
+import { useLineGridColumns } from '../data';
+
+const props = defineProps<{
+  formType?: string;
+  rqcId: number;
+}>();
+
+const emit = defineEmits<{ refresh: [] }>();
+
+const [DefectModal, defectModalApi] = useVbenModal({
+  connectedComponent: DefectRecordInlineList,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 缺陷记录变更后，刷新本表格并通知父组件刷新主表统计 */
+function handleDefectChanged() {
+  handleRefresh();
+  emit('refresh');
+}
+
+/** 打开缺陷记录弹窗 */
+function handleOpenDefect(row: MesQcRqcLineApi.RqcLine) {
+  defectModalApi
+    .setData({
+      formType: props.formType,
+      lineId: row.id,
+      qcId: props.rqcId,
+      qcType: MesQcTypeEnum.RQC,
+    })
+    .open();
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useLineGridColumns(),
+    height: 360,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.rqcId) {
+            return { list: [], total: 0 };
+          }
+          return await getRqcLinePage({
+            rqcId: props.rqcId,
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesQcRqcLineApi.RqcLine>,
+});
+</script>
+
+<template>
+  <div>
+    <DefectModal @success="handleDefectChanged" />
+    <Grid table-title="检验项">
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: '缺陷列表',
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.VIEW,
+              onClick: handleOpenDefect.bind(null, row),
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>

From f27942c8f916cd3354b3ed59ed75669544ae4df0 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 29 May 2026 19:24:52 +0800
Subject: [PATCH 12/52] =?UTF-8?q?feat(mes):=20=E8=BF=81=E7=A7=BB=20barcode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/mes/wm/barcode/config/data.ts   |  98 +++
 .../src/views/mes/wm/barcode/config/index.vue | 156 +++++
 .../mes/wm/barcode/config/modules/form.vue    |  89 +++
 .../web-antd/src/views/mes/wm/barcode/data.ts | 599 ++++++++++++++++++
 .../src/views/mes/wm/barcode/index.vue        | 245 +++++++
 .../src/views/mes/wm/barcode/modules/form.vue | 123 ++++
 .../src/views/mes/wm/barcode/config/data.ts   | 101 +++
 .../src/views/mes/wm/barcode/config/index.vue | 160 +++++
 .../mes/wm/barcode/config/modules/form.vue    |  89 +++
 apps/web-ele/src/views/mes/wm/barcode/data.ts | 599 ++++++++++++++++++
 .../src/views/mes/wm/barcode/index.vue        | 242 +++++++
 .../src/views/mes/wm/barcode/modules/form.vue | 123 ++++
 12 files changed, 2624 insertions(+)
 create mode 100644 apps/web-antd/src/views/mes/wm/barcode/config/data.ts
 create mode 100644 apps/web-antd/src/views/mes/wm/barcode/config/index.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/barcode/config/modules/form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/barcode/data.ts
 create mode 100644 apps/web-antd/src/views/mes/wm/barcode/index.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/barcode/modules/form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/barcode/config/data.ts
 create mode 100644 apps/web-ele/src/views/mes/wm/barcode/config/index.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/barcode/config/modules/form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/barcode/data.ts
 create mode 100644 apps/web-ele/src/views/mes/wm/barcode/index.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/barcode/modules/form.vue

diff --git a/apps/web-antd/src/views/mes/wm/barcode/config/data.ts b/apps/web-antd/src/views/mes/wm/barcode/config/data.ts
new file mode 100644
index 000000000..dc715da79
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/barcode/config/data.ts
@@ -0,0 +1,98 @@
+import type { VbenFormSchema } from '#/adapter/form';
+
+import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { z } from '#/adapter/form';
+
+// TODO @AI：这里的代码风格不对；
+/** 表单 */
+export function useFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: { triggerFields: [''], show: () => false },
+    },
+    {
+      fieldName: 'format',
+      label: '条码格式',
+      component: 'Select',
+      componentProps: {
+        options: getDictOptions(DICT_TYPE.MES_WM_BARCODE_FORMAT, 'number'),
+        placeholder: '请选择条码格式',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'bizType',
+      label: '业务类型',
+      component: 'Select',
+      componentProps: {
+        options: getDictOptions(DICT_TYPE.MES_WM_BARCODE_BIZ_TYPE, 'number'),
+        placeholder: '请选择业务类型',
+      },
+      dependencies: {
+        triggerFields: ['id'],
+        componentProps: (values) => ({
+          // 编辑时业务类型不允许变更 TODO @AI：这种简单的注释，可以考虑放到 disabled 后面；写到 style 里；
+          disabled: !!values.id,
+        }),
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'contentFormat',
+      label: '内容格式模板',
+      component: 'Input',
+      componentProps: {
+        placeholder: '支持{BUSINESSCODE}占位符，如：WH-{BUSINESSCODE}',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'contentExample',
+      label: '内容样例',
+      component: 'Input',
+      componentProps: {
+        placeholder: '如：WH-WH001',
+      },
+    },
+    {
+      fieldName: 'autoGenerateFlag',
+      label: '自动生成',
+      component: 'Switch',
+      componentProps: {
+        checkedChildren: '是',
+        unCheckedChildren: '否',
+      },
+      rules: z.boolean().default(true),
+    },
+    {
+      fieldName: 'defaultTemplate',
+      label: '默认打印模板',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入打印模板',
+      },
+    },
+    {
+      fieldName: 'status',
+      label: '状态',
+      component: 'RadioGroup',
+      componentProps: {
+        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+      },
+      rules: z.number().default(CommonStatusEnum.ENABLE),
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 2,
+      },
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/wm/barcode/config/index.vue b/apps/web-antd/src/views/mes/wm/barcode/config/index.vue
new file mode 100644
index 000000000..bf71f29c9
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/barcode/config/index.vue
@@ -0,0 +1,156 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmBarcodeConfigApi } from '#/api/mes/wm/barcode/config';
+
+import { confirm, DocAlert, Page, useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteBarcodeConfig,
+  getBarcodeConfigPage,
+  updateBarcodeConfig,
+} from '#/api/mes/wm/barcode/config';
+import { $t } from '#/locales';
+
+import { useConfigGridColumns, useConfigGridFormSchema } from '../data';
+import ConfigForm from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: ConfigForm,
+  destroyOnClose: true,
+});
+
+/** 自动生成开关变更 */
+async function handleAutoGenerateChange(
+  row: MesWmBarcodeConfigApi.BarcodeConfig,
+): Promise<boolean> {
+  const text = row.autoGenerateFlag ? '启用' : '停用';
+  try {
+    await confirm(`确认要${text}自动生成吗？`);
+  } catch {
+    return false;
+  }
+  await updateBarcodeConfig(row);
+  message.success(`${text}成功`);
+  return true;
+}
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建条码配置 */
+function handleCreate() {
+  formModalApi.setData(null).open();
+}
+
+/** 编辑条码配置 */
+function handleEdit(row: MesWmBarcodeConfigApi.BarcodeConfig) {
+  formModalApi.setData(row).open();
+}
+
+/** 删除条码配置 */
+async function handleDelete(row: MesWmBarcodeConfigApi.BarcodeConfig) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.contentFormat || `#${row.id}`]),
+    duration: 0,
+  });
+  try {
+    await deleteBarcodeConfig(row.id!);
+    message.success(
+      $t('ui.actionMessage.deleteSuccess', [row.contentFormat || `#${row.id}`]),
+    );
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useConfigGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useConfigGridColumns(handleAutoGenerateChange),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getBarcodeConfigPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmBarcodeConfigApi.BarcodeConfig>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】仓库与库区库位、条码赋码、SN码"
+        url="https://doc.iocoder.cn/mes/wm/warehouse-setup/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="条码配置列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['条码配置']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-barcode-config:create'],
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:wm-barcode-config:update'],
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm-barcode-config:delete'],
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [
+                  row.contentFormat || `#${row.id}`,
+                ]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/barcode/config/modules/form.vue b/apps/web-antd/src/views/mes/wm/barcode/config/modules/form.vue
new file mode 100644
index 000000000..fc1ff9725
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/barcode/config/modules/form.vue
@@ -0,0 +1,89 @@
+<script lang="ts" setup>
+import type { MesWmBarcodeConfigApi } from '#/api/mes/wm/barcode/config';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createBarcodeConfig,
+  getBarcodeConfig,
+  updateBarcodeConfig,
+} from '#/api/mes/wm/barcode/config';
+import { $t } from '#/locales';
+
+import { useFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesWmBarcodeConfigApi.BarcodeConfig>();
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['条码配置'])
+    : $t('ui.actionTitle.create', ['条码配置']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-2',
+    labelWidth: 130,
+  },
+  layout: 'horizontal',
+  schema: useFormSchema(),
+  showDefaultActions: false,
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmBarcodeConfigApi.BarcodeConfig;
+    try {
+      await (formData.value?.id
+        ? updateBarcodeConfig(data)
+        : createBarcodeConfig(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<MesWmBarcodeConfigApi.BarcodeConfig>();
+    if (!data || !data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getBarcodeConfig(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-2/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/barcode/data.ts b/apps/web-antd/src/views/mes/wm/barcode/data.ts
new file mode 100644
index 000000000..6e20264cc
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/barcode/data.ts
@@ -0,0 +1,599 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmBarcodeApi } from '#/api/mes/wm/barcode';
+import type { MesWmBarcodeConfigApi } from '#/api/mes/wm/barcode/config';
+
+import { markRaw } from 'vue';
+
+import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { z } from '#/adapter/form';
+import { generateBarcodeContent } from '#/api/mes/wm/barcode';
+import DvMachinerySelect from '#/views/mes/dv/machinery/components/dv-machinery-select.vue';
+import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
+import MdWorkshopSelect from '#/views/mes/md/workstation/components/md-workshop-select.vue';
+import MdWorkstationSelect from '#/views/mes/md/workstation/components/md-workstation-select.vue';
+import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
+import TmToolSelect from '#/views/mes/tm/tool/components/tm-tool-select.vue';
+import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
+
+import WmMaterialStockSelect from './../materialstock/components/wm-material-stock-select.vue';
+import {
+  WmWarehouseAreaSelect,
+  WmWarehouseLocationSelect,
+  WmWarehouseSelect,
+} from './../warehouse/components';
+
+/** 业务对象选中后回填业务编码、业务名称、条码内容 */
+async function applyBizSelected(formApi: VbenFormApi, item: any) {
+  const values = await formApi.getValues();
+  const bizType = values.bizType as number | undefined;
+  if (!item) {
+    await formApi.setValues({
+      bizCode: undefined,
+      bizName: undefined,
+      content: undefined,
+    });
+    return;
+  }
+  let bizCode: string | undefined;
+  let bizName: string | undefined;
+  if (bizType === BarcodeBizTypeEnum.STOCK) {
+    bizCode = item.itemCode;
+    bizName = item.itemName;
+  } else {
+    bizCode = item.code || item.username;
+    bizName = item.name || item.nickname;
+  }
+  let content: string | undefined;
+  if (bizType && bizCode) {
+    try {
+      content = await generateBarcodeContent(bizType, bizCode);
+    } catch (error) {
+      console.error('生成条码内容失败:', error);
+    }
+  }
+  await formApi.setValues({ bizCode, bizName, content });
+}
+
+/** 新增/修改条码的表单 */
+export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  // TODO @AI：是不是可以去掉 onBizChange，直接搞个 handleBizTypeChange 函数？
+  const onBizChange = (item: any) => {
+    if (formApi) {
+      void applyBizSelected(formApi, item);
+    }
+  };
+
+  return [
+    {
+      fieldName: 'bizType',
+      label: '业务类型',
+      component: 'Select',
+      componentProps: {
+        options: getDictOptions(DICT_TYPE.MES_WM_BARCODE_BIZ_TYPE, 'number'),
+        placeholder: '请选择业务类型',
+        // 业务类型变更时清空业务字段
+        onChange: () =>
+          formApi?.setValues({
+            bizId: undefined,
+            bizCode: undefined,
+            bizName: undefined,
+            content: undefined,
+            locationWarehouseId: undefined,
+            areaWarehouseId: undefined,
+            areaLocationId: undefined,
+          }),
+      },
+      rules: 'required',
+    },
+    // ==================== 业务对象选择器（按 bizType 切换） ====================
+    {
+      fieldName: 'bizId',
+      label: '仓库',
+      component: markRaw(WmWarehouseSelect),
+      componentProps: {
+        onChange: onBizChange,
+      },
+      dependencies: {
+        triggerFields: ['bizType'],
+        show: (values) => values.bizType === BarcodeBizTypeEnum.WAREHOUSE,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'locationWarehouseId',
+      label: '库区·仓库',
+      component: markRaw(WmWarehouseSelect),
+      componentProps: {
+        placeholder: '请选择仓库',
+        onChange: () =>
+          formApi?.setValues({
+            bizId: undefined,
+            bizCode: undefined,
+            bizName: undefined,
+            content: undefined,
+          }),
+      },
+      dependencies: {
+        triggerFields: ['bizType'],
+        show: (values) => values.bizType === BarcodeBizTypeEnum.LOCATION,
+      },
+    },
+    {
+      fieldName: 'bizId',
+      label: '库区',
+      component: markRaw(WmWarehouseLocationSelect),
+      dependencies: {
+        triggerFields: ['bizType', 'locationWarehouseId'],
+        show: (values) => values.bizType === BarcodeBizTypeEnum.LOCATION,
+        componentProps: (values) => ({
+          placeholder: '请选择库区',
+          warehouseId: values.locationWarehouseId,
+          onChange: onBizChange,
+        }),
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'areaWarehouseId',
+      label: '库位·仓库',
+      component: markRaw(WmWarehouseSelect),
+      componentProps: {
+        placeholder: '请选择仓库',
+        onChange: () =>
+          formApi?.setValues({
+            areaLocationId: undefined,
+            bizId: undefined,
+            bizCode: undefined,
+            bizName: undefined,
+            content: undefined,
+          }),
+      },
+      dependencies: {
+        triggerFields: ['bizType'],
+        show: (values) => values.bizType === BarcodeBizTypeEnum.AREA,
+      },
+    },
+    {
+      fieldName: 'areaLocationId',
+      label: '库位·库区',
+      component: markRaw(WmWarehouseLocationSelect),
+      dependencies: {
+        triggerFields: ['bizType', 'areaWarehouseId'],
+        show: (values) => values.bizType === BarcodeBizTypeEnum.AREA,
+        componentProps: (values) => ({
+          placeholder: '请选择库区',
+          warehouseId: values.areaWarehouseId,
+          onChange: () =>
+            formApi?.setValues({
+              bizId: undefined,
+              bizCode: undefined,
+              bizName: undefined,
+              content: undefined,
+            }),
+        }),
+      },
+    },
+    {
+      fieldName: 'bizId',
+      label: '库位',
+      component: markRaw(WmWarehouseAreaSelect),
+      dependencies: {
+        triggerFields: ['bizType', 'areaLocationId'],
+        show: (values) => values.bizType === BarcodeBizTypeEnum.AREA,
+        componentProps: (values) => ({
+          placeholder: '请选择库位',
+          locationId: values.areaLocationId,
+          onChange: onBizChange,
+        }),
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'bizId',
+      label: '工单',
+      component: markRaw(ProWorkOrderSelect),
+      componentProps: {
+        onChange: onBizChange,
+      },
+      dependencies: {
+        triggerFields: ['bizType'],
+        show: (values) => values.bizType === BarcodeBizTypeEnum.WORKORDER,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'bizId',
+      label: '设备',
+      component: markRaw(DvMachinerySelect),
+      componentProps: {
+        onChange: onBizChange,
+      },
+      dependencies: {
+        triggerFields: ['bizType'],
+        show: (values) => values.bizType === BarcodeBizTypeEnum.MACHINERY,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'bizId',
+      label: '产品物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        onChange: onBizChange,
+      },
+      dependencies: {
+        triggerFields: ['bizType'],
+        show: (values) => values.bizType === BarcodeBizTypeEnum.ITEM,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'bizId',
+      label: '供应商',
+      component: markRaw(MdVendorSelect),
+      componentProps: {
+        onChange: onBizChange,
+      },
+      dependencies: {
+        triggerFields: ['bizType'],
+        show: (values) => values.bizType === BarcodeBizTypeEnum.VENDOR,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'bizId',
+      label: '工作站',
+      component: markRaw(MdWorkstationSelect),
+      componentProps: {
+        onChange: onBizChange,
+      },
+      dependencies: {
+        triggerFields: ['bizType'],
+        show: (values) => values.bizType === BarcodeBizTypeEnum.WORKSTATION,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'bizId',
+      label: '车间',
+      component: markRaw(MdWorkshopSelect),
+      componentProps: {
+        onChange: onBizChange,
+      },
+      dependencies: {
+        triggerFields: ['bizType'],
+        show: (values) => values.bizType === BarcodeBizTypeEnum.WORKSHOP,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'bizId',
+      label: '客户',
+      component: markRaw(MdClientSelect),
+      componentProps: {
+        onChange: onBizChange,
+      },
+      dependencies: {
+        triggerFields: ['bizType'],
+        show: (values) => values.bizType === BarcodeBizTypeEnum.CLIENT,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'bizId',
+      label: '工具',
+      component: markRaw(TmToolSelect),
+      componentProps: {
+        onChange: onBizChange,
+      },
+      dependencies: {
+        triggerFields: ['bizType'],
+        show: (values) => values.bizType === BarcodeBizTypeEnum.TOOL,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'bizId',
+      label: '库存',
+      component: markRaw(WmMaterialStockSelect),
+      componentProps: {
+        onChange: onBizChange,
+      },
+      dependencies: {
+        triggerFields: ['bizType'],
+        show: (values) => values.bizType === BarcodeBizTypeEnum.STOCK,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'bizId',
+      label: '业务编号',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 1,
+        placeholder: '请输入业务编号',
+      },
+      dependencies: {
+        triggerFields: ['bizType'],
+        show: (values) =>
+          values.bizType !== undefined &&
+          ![
+            BarcodeBizTypeEnum.AREA,
+            BarcodeBizTypeEnum.CLIENT,
+            BarcodeBizTypeEnum.ITEM,
+            BarcodeBizTypeEnum.LOCATION,
+            BarcodeBizTypeEnum.MACHINERY,
+            BarcodeBizTypeEnum.STOCK,
+            BarcodeBizTypeEnum.TOOL,
+            BarcodeBizTypeEnum.VENDOR,
+            BarcodeBizTypeEnum.WAREHOUSE,
+            BarcodeBizTypeEnum.WORKORDER,
+            BarcodeBizTypeEnum.WORKSHOP,
+            BarcodeBizTypeEnum.WORKSTATION,
+          ].includes(values.bizType),
+      },
+    },
+    {
+      fieldName: 'bizCode',
+      label: '业务编码',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+        placeholder: '自动填充',
+      },
+    },
+    {
+      fieldName: 'bizName',
+      label: '业务名称',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+        placeholder: '自动填充',
+      },
+    },
+    {
+      fieldName: 'content',
+      label: '条码内容',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入条码内容或自动生成',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'status',
+      label: '状态',
+      component: 'RadioGroup',
+      componentProps: {
+        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+      },
+      rules: z.number().default(CommonStatusEnum.ENABLE),
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 2,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'bizType',
+      label: '业务类型',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_WM_BARCODE_BIZ_TYPE, 'number'),
+        placeholder: '请选择业务类型',
+      },
+    },
+    {
+      fieldName: 'bizCode',
+      label: '业务编码',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入业务编码',
+      },
+    },
+    {
+      fieldName: 'bizName',
+      label: '业务名称',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入业务名称',
+      },
+    },
+    {
+      fieldName: 'content',
+      label: '条码内容',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入条码内容',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesWmBarcodeApi.Barcode>['columns'] {
+  return [
+    {
+      type: 'checkbox',
+      width: 50,
+    },
+    {
+      field: 'content',
+      title: '条码',
+      width: 180,
+      slots: { default: 'barcode' },
+    },
+    {
+      field: 'format',
+      title: '条码格式',
+      width: 110,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_BARCODE_FORMAT },
+      },
+    },
+    {
+      field: 'bizType',
+      title: '业务类型',
+      width: 110,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_BARCODE_BIZ_TYPE },
+      },
+    },
+    {
+      field: 'content',
+      title: '条码内容',
+      minWidth: 160,
+    },
+    {
+      field: 'bizCode',
+      title: '业务编码',
+      width: 130,
+    },
+    {
+      field: 'bizName',
+      title: '业务名称',
+      minWidth: 140,
+    },
+    {
+      field: 'status',
+      title: '状态',
+      width: 90,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.COMMON_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 200,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 配置列表的搜索表单 */
+export function useConfigGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'format',
+      label: '条码格式',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_WM_BARCODE_FORMAT, 'number'),
+        placeholder: '请选择条码格式',
+      },
+    },
+    {
+      fieldName: 'bizType',
+      label: '业务类型',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_WM_BARCODE_BIZ_TYPE, 'number'),
+        placeholder: '请选择业务类型',
+      },
+    },
+  ];
+}
+
+/** 配置列表的字段 */
+export function useConfigGridColumns(
+  onAutoGenerateChange: (
+    row: MesWmBarcodeConfigApi.BarcodeConfig,
+  ) => Promise<boolean>,
+): VxeTableGridOptions<MesWmBarcodeConfigApi.BarcodeConfig>['columns'] {
+  return [
+    {
+      field: 'id',
+      title: '编号',
+      width: 100,
+    },
+    {
+      field: 'format',
+      title: '条码格式',
+      width: 110,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_BARCODE_FORMAT },
+      },
+    },
+    {
+      field: 'bizType',
+      title: '业务类型',
+      width: 110,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_BARCODE_BIZ_TYPE },
+      },
+    },
+    {
+      field: 'contentFormat',
+      title: '内容格式',
+      minWidth: 160,
+    },
+    {
+      field: 'contentExample',
+      title: '内容样例',
+      minWidth: 160,
+    },
+    {
+      field: 'defaultTemplate',
+      title: '默认打印模板',
+      minWidth: 140,
+    },
+    {
+      field: 'autoGenerateFlag',
+      title: '自动生成',
+      width: 100,
+      cellRender: {
+        name: 'CellSwitch',
+        attrs: { beforeChange: onAutoGenerateChange },
+      },
+    },
+    {
+      field: 'status',
+      title: '状态',
+      width: 90,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.COMMON_STATUS },
+      },
+    },
+    {
+      field: 'createTime',
+      title: '创建时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      title: '操作',
+      width: 160,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/wm/barcode/index.vue b/apps/web-antd/src/views/mes/wm/barcode/index.vue
new file mode 100644
index 000000000..0e64bb09f
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/barcode/index.vue
@@ -0,0 +1,245 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmBarcodeApi } from '#/api/mes/wm/barcode';
+
+import { ref } from 'vue';
+import { useRouter } from 'vue-router';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteBarcode,
+  exportBarcode,
+  getBarcodePage,
+} from '#/api/mes/wm/barcode';
+import { $t } from '#/locales';
+
+import { Barcode, BarcodeDetail } from './components';
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const router = useRouter();
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>();
+
+// TODO @AI：这里的 checkedIds，是不是拿到 handleRowCheckboxChange 代码块里？更简洁一点？
+// TODO @AI：这里的代码风格，要和 system user index 保持一致，批量选择；
+/** 已选条码 ID */
+const checkedIds = ref<number[]>([]);
+
+/** 处理勾选变化 */
+function handleRowCheckboxChange({
+  records,
+}: {
+  records: MesWmBarcodeApi.Barcode[];
+}) {
+  checkedIds.value = records.map((row) => row.id!).filter(Boolean);
+}
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建条码 */
+function handleCreate() {
+  formModalApi.setData(null).open();
+}
+
+/** 编辑条码 */
+function handleEdit(row: MesWmBarcodeApi.Barcode) {
+  formModalApi.setData(row).open();
+}
+
+/** 删除条码 */
+async function handleDelete(row: MesWmBarcodeApi.Barcode) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.bizName || row.bizCode || '']),
+    duration: 0,
+  });
+  try {
+    await deleteBarcode(row.id!);
+    message.success(
+      $t('ui.actionMessage.deleteSuccess', [row.bizName || row.bizCode || '']),
+    );
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 批量删除条码 */
+async function handleDeleteBatch() {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [`${checkedIds.value.length} 条`]),
+    duration: 0,
+  });
+  try {
+    await Promise.all(checkedIds.value.map((id) => deleteBarcode(id)));
+    message.success($t('ui.actionMessage.deleteSuccess', ['']));
+    checkedIds.value = [];
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 查看条码 */
+function handleView(row: MesWmBarcodeApi.Barcode) {
+  barcodeDetailRef.value?.open(row);
+}
+
+/** 跳转条码配置 */
+function handleConfig() {
+  router.push({ name: 'MesWmBarcodeConfig' });
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportBarcode(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '条码清单.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getBarcodePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+      height: 80,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmBarcodeApi.Barcode>,
+  gridEvents: {
+    checkboxAll: handleRowCheckboxChange,
+    checkboxChange: handleRowCheckboxChange,
+  },
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】仓库与库区库位、条码赋码、SN码"
+        url="https://doc.iocoder.cn/mes/wm/warehouse-setup/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+    <BarcodeDetail ref="barcodeDetailRef" />
+
+    <Grid table-title="条码列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['条码']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-barcode:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.deleteBatch'),
+              type: 'primary',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm-barcode:delete'],
+              disabled: checkedIds.length === 0,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [
+                  `${checkedIds.length} 条`,
+                ]),
+                confirm: handleDeleteBatch,
+              },
+            },
+            {
+              label: '条码设置',
+              type: 'primary',
+              auth: ['mes:wm-barcode-config:query'],
+              onClick: handleConfig,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:wm-barcode:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #barcode="{ row }">
+        <div v-if="row.content" class="flex justify-center">
+          <Barcode
+            :content="row.content"
+            :format="row.format"
+            :height="60"
+            :width="140"
+          />
+        </div>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.detail'),
+              type: 'link',
+              auth: ['mes:wm-barcode:query'],
+              onClick: handleView.bind(null, row),
+            },
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:wm-barcode:update'],
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm-barcode:delete'],
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [
+                  row.bizName || row.bizCode || '',
+                ]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/barcode/modules/form.vue b/apps/web-antd/src/views/mes/wm/barcode/modules/form.vue
new file mode 100644
index 000000000..fdb634d92
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/barcode/modules/form.vue
@@ -0,0 +1,123 @@
+<script lang="ts" setup>
+import type { MesWmBarcodeApi } from '#/api/mes/wm/barcode';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+import { CommonStatusEnum } from '@vben/constants';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createBarcode,
+  getBarcode,
+  updateBarcode,
+} from '#/api/mes/wm/barcode';
+import { getWarehouseArea } from '#/api/mes/wm/warehouse/area';
+import { getWarehouseLocation } from '#/api/mes/wm/warehouse/location';
+import { $t } from '#/locales';
+import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
+
+import { useFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+
+const formData = ref<MesWmBarcodeApi.Barcode>();
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['条码'])
+    : $t('ui.actionTitle.create', ['条码']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-2',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+});
+
+/** 加载级联选择器的数据（编辑时回填上级仓库/库区） */
+async function loadCascadeData(data: MesWmBarcodeApi.Barcode) {
+  if (!data.bizType || !data.bizId) {
+    return;
+  }
+  try {
+    if (data.bizType === BarcodeBizTypeEnum.LOCATION) {
+      const location = await getWarehouseLocation(data.bizId);
+      if (location?.warehouseId) {
+        await formApi.setFieldValue(
+          'locationWarehouseId',
+          location.warehouseId,
+        );
+      }
+    } else if (data.bizType === BarcodeBizTypeEnum.AREA) {
+      const area = await getWarehouseArea(data.bizId);
+      await formApi.setValues({
+        areaWarehouseId: area?.warehouseId,
+        areaLocationId: area?.locationId,
+      });
+    }
+  } catch (error) {
+    console.error('加载级联数据失败:', error);
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data = (await formApi.getValues()) as MesWmBarcodeApi.Barcode;
+    try {
+      await (formData.value?.id
+        ? updateBarcode({ ...data, id: formData.value.id })
+        : createBarcode(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    formApi.setState({ schema: useFormSchema(formApi) });
+    await formApi.setValues({ status: CommonStatusEnum.ENABLE });
+    // 加载数据
+    const data = modalApi.getData<MesWmBarcodeApi.Barcode>();
+    if (!data || !data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getBarcode(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+      await loadCascadeData(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-1/2">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/barcode/config/data.ts b/apps/web-ele/src/views/mes/wm/barcode/config/data.ts
new file mode 100644
index 000000000..a4db5ed2b
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/barcode/config/data.ts
@@ -0,0 +1,101 @@
+import type { VbenFormSchema } from '#/adapter/form';
+
+import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { z } from '#/adapter/form';
+
+/** 表单 */
+export function useFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'format',
+      label: '条码格式',
+      component: 'Select',
+      componentProps: {
+        options: getDictOptions(DICT_TYPE.MES_WM_BARCODE_FORMAT, 'number'),
+        placeholder: '请选择条码格式',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'bizType',
+      label: '业务类型',
+      component: 'Select',
+      componentProps: {
+        options: getDictOptions(DICT_TYPE.MES_WM_BARCODE_BIZ_TYPE, 'number'),
+        placeholder: '请选择业务类型',
+      },
+      dependencies: {
+        triggerFields: ['id'],
+        componentProps: (values) => ({
+          // 编辑时业务类型不允许变更
+          disabled: !!values.id,
+        }),
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'contentFormat',
+      label: '内容格式模板',
+      component: 'Input',
+      componentProps: {
+        placeholder: '支持{BUSINESSCODE}占位符，如：WH-{BUSINESSCODE}',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'contentExample',
+      label: '内容样例',
+      component: 'Input',
+      componentProps: {
+        placeholder: '如：WH-WH001',
+      },
+    },
+    {
+      fieldName: 'autoGenerateFlag',
+      label: '自动生成',
+      component: 'Switch',
+      componentProps: {
+        activeText: '是',
+        inactiveText: '否',
+        inlinePrompt: true,
+      },
+      rules: z.boolean().default(true),
+    },
+    {
+      fieldName: 'defaultTemplate',
+      label: '默认打印模板',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入打印模板',
+      },
+    },
+    {
+      fieldName: 'status',
+      label: '状态',
+      component: 'RadioGroup',
+      componentProps: {
+        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+      },
+      rules: z.number().default(CommonStatusEnum.ENABLE),
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 2,
+      },
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/wm/barcode/config/index.vue b/apps/web-ele/src/views/mes/wm/barcode/config/index.vue
new file mode 100644
index 000000000..57b87a676
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/barcode/config/index.vue
@@ -0,0 +1,160 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmBarcodeConfigApi } from '#/api/mes/wm/barcode/config';
+
+import { confirm, DocAlert, Page, useVbenModal } from '@vben/common-ui';
+
+import { ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteBarcodeConfig,
+  getBarcodeConfigPage,
+  updateBarcodeConfig,
+} from '#/api/mes/wm/barcode/config';
+import { $t } from '#/locales';
+
+import { useConfigGridColumns, useConfigGridFormSchema } from '../data';
+import ConfigForm from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: ConfigForm,
+  destroyOnClose: true,
+});
+
+/** 自动生成开关变更 */
+async function handleAutoGenerateChange(
+  row: MesWmBarcodeConfigApi.BarcodeConfig,
+): Promise<boolean> {
+  const text = row.autoGenerateFlag ? '启用' : '停用';
+  try {
+    await confirm(`确认要${text}自动生成吗？`);
+  } catch {
+    return false;
+  }
+  await updateBarcodeConfig(row);
+  ElMessage.success(`${text}成功`);
+  return true;
+}
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建条码配置 */
+function handleCreate() {
+  formModalApi.setData(null).open();
+}
+
+/** 编辑条码配置 */
+function handleEdit(row: MesWmBarcodeConfigApi.BarcodeConfig) {
+  formModalApi.setData(row).open();
+}
+
+/** 删除条码配置 */
+async function handleDelete(row: MesWmBarcodeConfigApi.BarcodeConfig) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [
+      row.contentFormat || `#${row.id}`,
+    ]),
+  });
+  try {
+    await deleteBarcodeConfig(row.id!);
+    ElMessage.success(
+      $t('ui.actionMessage.deleteSuccess', [
+        row.contentFormat || `#${row.id}`,
+      ]),
+    );
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useConfigGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useConfigGridColumns(handleAutoGenerateChange),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getBarcodeConfigPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmBarcodeConfigApi.BarcodeConfig>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】仓库与库区库位、条码赋码、SN码"
+        url="https://doc.iocoder.cn/mes/wm/warehouse-setup/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="条码配置列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['条码配置']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-barcode-config:create'],
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:wm-barcode-config:update'],
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm-barcode-config:delete'],
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [
+                  row.contentFormat || `#${row.id}`,
+                ]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/barcode/config/modules/form.vue b/apps/web-ele/src/views/mes/wm/barcode/config/modules/form.vue
new file mode 100644
index 000000000..092080a7e
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/barcode/config/modules/form.vue
@@ -0,0 +1,89 @@
+<script lang="ts" setup>
+import type { MesWmBarcodeConfigApi } from '#/api/mes/wm/barcode/config';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createBarcodeConfig,
+  getBarcodeConfig,
+  updateBarcodeConfig,
+} from '#/api/mes/wm/barcode/config';
+import { $t } from '#/locales';
+
+import { useFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesWmBarcodeConfigApi.BarcodeConfig>();
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['条码配置'])
+    : $t('ui.actionTitle.create', ['条码配置']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-2',
+    labelWidth: 130,
+  },
+  layout: 'horizontal',
+  schema: useFormSchema(),
+  showDefaultActions: false,
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmBarcodeConfigApi.BarcodeConfig;
+    try {
+      await (formData.value?.id
+        ? updateBarcodeConfig(data)
+        : createBarcodeConfig(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<MesWmBarcodeConfigApi.BarcodeConfig>();
+    if (!data || !data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getBarcodeConfig(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-2/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/barcode/data.ts b/apps/web-ele/src/views/mes/wm/barcode/data.ts
new file mode 100644
index 000000000..6a97762f7
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/barcode/data.ts
@@ -0,0 +1,599 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmBarcodeApi } from '#/api/mes/wm/barcode';
+import type { MesWmBarcodeConfigApi } from '#/api/mes/wm/barcode/config';
+
+import { markRaw } from 'vue';
+
+import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { z } from '#/adapter/form';
+import { generateBarcodeContent } from '#/api/mes/wm/barcode';
+import DvMachinerySelect from '#/views/mes/dv/machinery/components/dv-machinery-select.vue';
+import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
+import MdWorkshopSelect from '#/views/mes/md/workstation/components/md-workshop-select.vue';
+import MdWorkstationSelect from '#/views/mes/md/workstation/components/md-workstation-select.vue';
+import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
+import TmToolSelect from '#/views/mes/tm/tool/components/tm-tool-select.vue';
+import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
+
+import WmMaterialStockSelect from './../materialstock/components/wm-material-stock-select.vue';
+import {
+  WmWarehouseAreaSelect,
+  WmWarehouseLocationSelect,
+  WmWarehouseSelect,
+} from './../warehouse/components';
+
+/** 业务对象选中后回填业务编码、业务名称、条码内容 */
+async function applyBizSelected(formApi: VbenFormApi, item: any) {
+  const values = await formApi.getValues();
+  const bizType = values.bizType as number | undefined;
+  if (!item) {
+    await formApi.setValues({
+      bizCode: undefined,
+      bizName: undefined,
+      content: undefined,
+    });
+    return;
+  }
+  let bizCode: string | undefined;
+  let bizName: string | undefined;
+  if (bizType === BarcodeBizTypeEnum.STOCK) {
+    bizCode = item.itemCode;
+    bizName = item.itemName;
+  } else {
+    bizCode = item.code || item.username;
+    bizName = item.name || item.nickname;
+  }
+  let content: string | undefined;
+  if (bizType && bizCode) {
+    try {
+      content = await generateBarcodeContent(bizType, bizCode);
+    } catch (error) {
+      console.error('生成条码内容失败:', error);
+    }
+  }
+  await formApi.setValues({ bizCode, bizName, content });
+}
+
+/** 新增/修改条码的表单 */
+export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  const onBizChange = (item: any) => {
+    if (formApi) {
+      void applyBizSelected(formApi, item);
+    }
+  };
+
+  return [
+    {
+      fieldName: 'bizType',
+      label: '业务类型',
+      component: 'Select',
+      componentProps: {
+        // 业务类型变更时清空业务字段
+        onChange: () =>
+          formApi?.setValues({
+            bizId: undefined,
+            bizCode: undefined,
+            bizName: undefined,
+            content: undefined,
+            locationWarehouseId: undefined,
+            areaWarehouseId: undefined,
+            areaLocationId: undefined,
+          }),
+        options: getDictOptions(DICT_TYPE.MES_WM_BARCODE_BIZ_TYPE, 'number'),
+        placeholder: '请选择业务类型',
+      },
+      rules: 'required',
+    },
+    // ==================== 业务对象选择器（按 bizType 切换） ====================
+    {
+      fieldName: 'bizId',
+      label: '仓库',
+      component: markRaw(WmWarehouseSelect),
+      componentProps: {
+        onChange: onBizChange,
+      },
+      dependencies: {
+        triggerFields: ['bizType'],
+        show: (values) => values.bizType === BarcodeBizTypeEnum.WAREHOUSE,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'locationWarehouseId',
+      label: '库区·仓库',
+      component: markRaw(WmWarehouseSelect),
+      componentProps: {
+        onChange: () =>
+          formApi?.setValues({
+            bizId: undefined,
+            bizCode: undefined,
+            bizName: undefined,
+            content: undefined,
+          }),
+        placeholder: '请选择仓库',
+      },
+      dependencies: {
+        triggerFields: ['bizType'],
+        show: (values) => values.bizType === BarcodeBizTypeEnum.LOCATION,
+      },
+    },
+    {
+      fieldName: 'bizId',
+      label: '库区',
+      component: markRaw(WmWarehouseLocationSelect),
+      dependencies: {
+        triggerFields: ['bizType', 'locationWarehouseId'],
+        show: (values) => values.bizType === BarcodeBizTypeEnum.LOCATION,
+        componentProps: (values) => ({
+          onChange: onBizChange,
+          placeholder: '请选择库区',
+          warehouseId: values.locationWarehouseId,
+        }),
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'areaWarehouseId',
+      label: '库位·仓库',
+      component: markRaw(WmWarehouseSelect),
+      componentProps: {
+        onChange: () =>
+          formApi?.setValues({
+            areaLocationId: undefined,
+            bizId: undefined,
+            bizCode: undefined,
+            bizName: undefined,
+            content: undefined,
+          }),
+        placeholder: '请选择仓库',
+      },
+      dependencies: {
+        triggerFields: ['bizType'],
+        show: (values) => values.bizType === BarcodeBizTypeEnum.AREA,
+      },
+    },
+    {
+      fieldName: 'areaLocationId',
+      label: '库位·库区',
+      component: markRaw(WmWarehouseLocationSelect),
+      dependencies: {
+        triggerFields: ['bizType', 'areaWarehouseId'],
+        show: (values) => values.bizType === BarcodeBizTypeEnum.AREA,
+        componentProps: (values) => ({
+          onChange: () =>
+            formApi?.setValues({
+              bizId: undefined,
+              bizCode: undefined,
+              bizName: undefined,
+              content: undefined,
+            }),
+          placeholder: '请选择库区',
+          warehouseId: values.areaWarehouseId,
+        }),
+      },
+    },
+    {
+      fieldName: 'bizId',
+      label: '库位',
+      component: markRaw(WmWarehouseAreaSelect),
+      dependencies: {
+        triggerFields: ['bizType', 'areaLocationId'],
+        show: (values) => values.bizType === BarcodeBizTypeEnum.AREA,
+        componentProps: (values) => ({
+          locationId: values.areaLocationId,
+          onChange: onBizChange,
+          placeholder: '请选择库位',
+        }),
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'bizId',
+      label: '工单',
+      component: markRaw(ProWorkOrderSelect),
+      componentProps: {
+        onChange: onBizChange,
+      },
+      dependencies: {
+        triggerFields: ['bizType'],
+        show: (values) => values.bizType === BarcodeBizTypeEnum.WORKORDER,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'bizId',
+      label: '设备',
+      component: markRaw(DvMachinerySelect),
+      componentProps: {
+        onChange: onBizChange,
+      },
+      dependencies: {
+        triggerFields: ['bizType'],
+        show: (values) => values.bizType === BarcodeBizTypeEnum.MACHINERY,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'bizId',
+      label: '产品物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        onChange: onBizChange,
+      },
+      dependencies: {
+        triggerFields: ['bizType'],
+        show: (values) => values.bizType === BarcodeBizTypeEnum.ITEM,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'bizId',
+      label: '供应商',
+      component: markRaw(MdVendorSelect),
+      componentProps: {
+        onChange: onBizChange,
+      },
+      dependencies: {
+        triggerFields: ['bizType'],
+        show: (values) => values.bizType === BarcodeBizTypeEnum.VENDOR,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'bizId',
+      label: '工作站',
+      component: markRaw(MdWorkstationSelect),
+      componentProps: {
+        onChange: onBizChange,
+      },
+      dependencies: {
+        triggerFields: ['bizType'],
+        show: (values) => values.bizType === BarcodeBizTypeEnum.WORKSTATION,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'bizId',
+      label: '车间',
+      component: markRaw(MdWorkshopSelect),
+      componentProps: {
+        onChange: onBizChange,
+      },
+      dependencies: {
+        triggerFields: ['bizType'],
+        show: (values) => values.bizType === BarcodeBizTypeEnum.WORKSHOP,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'bizId',
+      label: '客户',
+      component: markRaw(MdClientSelect),
+      componentProps: {
+        onChange: onBizChange,
+      },
+      dependencies: {
+        triggerFields: ['bizType'],
+        show: (values) => values.bizType === BarcodeBizTypeEnum.CLIENT,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'bizId',
+      label: '工具',
+      component: markRaw(TmToolSelect),
+      componentProps: {
+        onChange: onBizChange,
+      },
+      dependencies: {
+        triggerFields: ['bizType'],
+        show: (values) => values.bizType === BarcodeBizTypeEnum.TOOL,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'bizId',
+      label: '库存',
+      component: markRaw(WmMaterialStockSelect),
+      componentProps: {
+        onChange: onBizChange,
+      },
+      dependencies: {
+        triggerFields: ['bizType'],
+        show: (values) => values.bizType === BarcodeBizTypeEnum.STOCK,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'bizId',
+      label: '业务编号',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 1,
+        placeholder: '请输入业务编号',
+      },
+      dependencies: {
+        triggerFields: ['bizType'],
+        show: (values) =>
+          values.bizType !== undefined &&
+          ![
+            BarcodeBizTypeEnum.AREA,
+            BarcodeBizTypeEnum.CLIENT,
+            BarcodeBizTypeEnum.ITEM,
+            BarcodeBizTypeEnum.LOCATION,
+            BarcodeBizTypeEnum.MACHINERY,
+            BarcodeBizTypeEnum.STOCK,
+            BarcodeBizTypeEnum.TOOL,
+            BarcodeBizTypeEnum.VENDOR,
+            BarcodeBizTypeEnum.WAREHOUSE,
+            BarcodeBizTypeEnum.WORKORDER,
+            BarcodeBizTypeEnum.WORKSHOP,
+            BarcodeBizTypeEnum.WORKSTATION,
+          ].includes(values.bizType),
+      },
+    },
+    {
+      fieldName: 'bizCode',
+      label: '业务编码',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+        placeholder: '自动填充',
+      },
+    },
+    {
+      fieldName: 'bizName',
+      label: '业务名称',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+        placeholder: '自动填充',
+      },
+    },
+    {
+      fieldName: 'content',
+      label: '条码内容',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入条码内容或自动生成',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'status',
+      label: '状态',
+      component: 'RadioGroup',
+      componentProps: {
+        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+      },
+      rules: z.number().default(CommonStatusEnum.ENABLE),
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 2,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'bizType',
+      label: '业务类型',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_WM_BARCODE_BIZ_TYPE, 'number'),
+        placeholder: '请选择业务类型',
+      },
+    },
+    {
+      fieldName: 'bizCode',
+      label: '业务编码',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入业务编码',
+      },
+    },
+    {
+      fieldName: 'bizName',
+      label: '业务名称',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入业务名称',
+      },
+    },
+    {
+      fieldName: 'content',
+      label: '条码内容',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入条码内容',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesWmBarcodeApi.Barcode>['columns'] {
+  return [
+    {
+      type: 'checkbox',
+      width: 50,
+    },
+    {
+      field: 'content',
+      title: '条码',
+      width: 180,
+      slots: { default: 'barcode' },
+    },
+    {
+      field: 'format',
+      title: '条码格式',
+      width: 110,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_BARCODE_FORMAT },
+      },
+    },
+    {
+      field: 'bizType',
+      title: '业务类型',
+      width: 110,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_BARCODE_BIZ_TYPE },
+      },
+    },
+    {
+      field: 'content',
+      title: '条码内容',
+      minWidth: 160,
+    },
+    {
+      field: 'bizCode',
+      title: '业务编码',
+      width: 130,
+    },
+    {
+      field: 'bizName',
+      title: '业务名称',
+      minWidth: 140,
+    },
+    {
+      field: 'status',
+      title: '状态',
+      width: 90,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.COMMON_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 200,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 配置列表的搜索表单 */
+export function useConfigGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'format',
+      label: '条码格式',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_WM_BARCODE_FORMAT, 'number'),
+        placeholder: '请选择条码格式',
+      },
+    },
+    {
+      fieldName: 'bizType',
+      label: '业务类型',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_WM_BARCODE_BIZ_TYPE, 'number'),
+        placeholder: '请选择业务类型',
+      },
+    },
+  ];
+}
+
+/** 配置列表的字段 */
+export function useConfigGridColumns(
+  onAutoGenerateChange: (
+    row: MesWmBarcodeConfigApi.BarcodeConfig,
+  ) => Promise<boolean>,
+): VxeTableGridOptions<MesWmBarcodeConfigApi.BarcodeConfig>['columns'] {
+  return [
+    {
+      field: 'id',
+      title: '编号',
+      width: 100,
+    },
+    {
+      field: 'format',
+      title: '条码格式',
+      width: 110,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_BARCODE_FORMAT },
+      },
+    },
+    {
+      field: 'bizType',
+      title: '业务类型',
+      width: 110,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_BARCODE_BIZ_TYPE },
+      },
+    },
+    {
+      field: 'contentFormat',
+      title: '内容格式',
+      minWidth: 160,
+    },
+    {
+      field: 'contentExample',
+      title: '内容样例',
+      minWidth: 160,
+    },
+    {
+      field: 'defaultTemplate',
+      title: '默认打印模板',
+      minWidth: 140,
+    },
+    {
+      field: 'autoGenerateFlag',
+      title: '自动生成',
+      width: 100,
+      cellRender: {
+        name: 'CellSwitch',
+        attrs: { beforeChange: onAutoGenerateChange },
+      },
+    },
+    {
+      field: 'status',
+      title: '状态',
+      width: 90,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.COMMON_STATUS },
+      },
+    },
+    {
+      field: 'createTime',
+      title: '创建时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      title: '操作',
+      width: 160,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/wm/barcode/index.vue b/apps/web-ele/src/views/mes/wm/barcode/index.vue
new file mode 100644
index 000000000..95e42d800
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/barcode/index.vue
@@ -0,0 +1,242 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmBarcodeApi } from '#/api/mes/wm/barcode';
+
+import { ref } from 'vue';
+import { useRouter } from 'vue-router';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteBarcode,
+  exportBarcode,
+  getBarcodePage,
+} from '#/api/mes/wm/barcode';
+import { $t } from '#/locales';
+
+import { Barcode, BarcodeDetail } from './components';
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const router = useRouter();
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>();
+
+/** 已选条码 ID */
+const checkedIds = ref<number[]>([]);
+
+/** 处理勾选变化 */
+function handleRowCheckboxChange({
+  records,
+}: {
+  records: MesWmBarcodeApi.Barcode[];
+}) {
+  checkedIds.value = records.map((row) => row.id!).filter(Boolean);
+}
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建条码 */
+function handleCreate() {
+  formModalApi.setData(null).open();
+}
+
+/** 编辑条码 */
+function handleEdit(row: MesWmBarcodeApi.Barcode) {
+  formModalApi.setData(row).open();
+}
+
+/** 删除条码 */
+async function handleDelete(row: MesWmBarcodeApi.Barcode) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.bizName || row.bizCode || '']),
+  });
+  try {
+    await deleteBarcode(row.id!);
+    ElMessage.success(
+      $t('ui.actionMessage.deleteSuccess', [row.bizName || row.bizCode || '']),
+    );
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+/** 批量删除条码 */
+async function handleDeleteBatch() {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [`${checkedIds.value.length} 条`]),
+  });
+  try {
+    await Promise.all(checkedIds.value.map((id) => deleteBarcode(id)));
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', ['']));
+    checkedIds.value = [];
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+/** 查看条码 */
+function handleView(row: MesWmBarcodeApi.Barcode) {
+  barcodeDetailRef.value?.open(row);
+}
+
+/** 跳转条码配置 */
+function handleConfig() {
+  router.push({ name: 'MesWmBarcodeConfig' });
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportBarcode(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '条码清单.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getBarcodePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+      height: 80,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmBarcodeApi.Barcode>,
+  gridEvents: {
+    checkboxAll: handleRowCheckboxChange,
+    checkboxChange: handleRowCheckboxChange,
+  },
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】仓库与库区库位、条码赋码、SN码"
+        url="https://doc.iocoder.cn/mes/wm/warehouse-setup/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+    <BarcodeDetail ref="barcodeDetailRef" />
+
+    <Grid table-title="条码列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['条码']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-barcode:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.deleteBatch'),
+              type: 'danger',
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm-barcode:delete'],
+              disabled: checkedIds.length === 0,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [
+                  `${checkedIds.length} 条`,
+                ]),
+                confirm: handleDeleteBatch,
+              },
+            },
+            {
+              label: '条码设置',
+              type: 'primary',
+              auth: ['mes:wm-barcode-config:query'],
+              onClick: handleConfig,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:wm-barcode:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #barcode="{ row }">
+        <div v-if="row.content" class="flex justify-center">
+          <Barcode
+            :content="row.content"
+            :format="row.format"
+            :height="60"
+            :width="140"
+          />
+        </div>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.detail'),
+              type: 'primary',
+              link: true,
+              auth: ['mes:wm-barcode:query'],
+              onClick: handleView.bind(null, row),
+            },
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:wm-barcode:update'],
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm-barcode:delete'],
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [
+                  row.bizName || row.bizCode || '',
+                ]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/barcode/modules/form.vue b/apps/web-ele/src/views/mes/wm/barcode/modules/form.vue
new file mode 100644
index 000000000..417398449
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/barcode/modules/form.vue
@@ -0,0 +1,123 @@
+<script lang="ts" setup>
+import type { MesWmBarcodeApi } from '#/api/mes/wm/barcode';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+import { CommonStatusEnum } from '@vben/constants';
+
+import { ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createBarcode,
+  getBarcode,
+  updateBarcode,
+} from '#/api/mes/wm/barcode';
+import { getWarehouseArea } from '#/api/mes/wm/warehouse/area';
+import { getWarehouseLocation } from '#/api/mes/wm/warehouse/location';
+import { $t } from '#/locales';
+import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
+
+import { useFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+
+const formData = ref<MesWmBarcodeApi.Barcode>();
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['条码'])
+    : $t('ui.actionTitle.create', ['条码']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-2',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+});
+
+/** 加载级联选择器的数据（编辑时回填上级仓库/库区） */
+async function loadCascadeData(data: MesWmBarcodeApi.Barcode) {
+  if (!data.bizType || !data.bizId) {
+    return;
+  }
+  try {
+    if (data.bizType === BarcodeBizTypeEnum.LOCATION) {
+      const location = await getWarehouseLocation(data.bizId);
+      if (location?.warehouseId) {
+        await formApi.setFieldValue(
+          'locationWarehouseId',
+          location.warehouseId,
+        );
+      }
+    } else if (data.bizType === BarcodeBizTypeEnum.AREA) {
+      const area = await getWarehouseArea(data.bizId);
+      await formApi.setValues({
+        areaWarehouseId: area?.warehouseId,
+        areaLocationId: area?.locationId,
+      });
+    }
+  } catch (error) {
+    console.error('加载级联数据失败:', error);
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data = (await formApi.getValues()) as MesWmBarcodeApi.Barcode;
+    try {
+      await (formData.value?.id
+        ? updateBarcode({ ...data, id: formData.value.id })
+        : createBarcode(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    formApi.setState({ schema: useFormSchema(formApi) });
+    await formApi.setValues({ status: CommonStatusEnum.ENABLE });
+    // 加载数据
+    const data = modalApi.getData<MesWmBarcodeApi.Barcode>();
+    if (!data || !data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getBarcode(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+      await loadCascadeData(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-1/2">
+    <Form class="mx-4" />
+  </Modal>
+</template>

From 8192bb477725497e1e6b0cbbfa455ab6e64b89f4 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 29 May 2026 19:26:04 +0800
Subject: [PATCH 13/52] =?UTF-8?q?feat(mes):=20=E8=BF=81=E7=A7=BB=20materia?=
 =?UTF-8?q?lstock?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/wm/materialstock/components/index.ts  |   2 +
 .../wm-material-stock-select-dialog.vue       | 270 +++++++++++++++++
 .../components/wm-material-stock-select.vue   | 160 ++++++++++
 .../src/views/mes/wm/materialstock/data.ts    | 276 +++++++++++++++++
 .../src/views/mes/wm/materialstock/index.vue  | 156 ++++++++++
 .../mes/wm/materialstock/components/index.ts  |   2 +
 .../wm-material-stock-select-dialog.vue       | 279 ++++++++++++++++++
 .../components/wm-material-stock-select.vue   | 158 ++++++++++
 .../src/views/mes/wm/materialstock/data.ts    | 276 +++++++++++++++++
 .../src/views/mes/wm/materialstock/index.vue  | 156 ++++++++++
 10 files changed, 1735 insertions(+)
 create mode 100644 apps/web-antd/src/views/mes/wm/materialstock/components/index.ts
 create mode 100644 apps/web-antd/src/views/mes/wm/materialstock/components/wm-material-stock-select-dialog.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/materialstock/components/wm-material-stock-select.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/materialstock/data.ts
 create mode 100644 apps/web-antd/src/views/mes/wm/materialstock/index.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/materialstock/components/index.ts
 create mode 100644 apps/web-ele/src/views/mes/wm/materialstock/components/wm-material-stock-select-dialog.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/materialstock/components/wm-material-stock-select.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/materialstock/data.ts
 create mode 100644 apps/web-ele/src/views/mes/wm/materialstock/index.vue

diff --git a/apps/web-antd/src/views/mes/wm/materialstock/components/index.ts b/apps/web-antd/src/views/mes/wm/materialstock/components/index.ts
new file mode 100644
index 000000000..8e0321711
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/materialstock/components/index.ts
@@ -0,0 +1,2 @@
+export { default as WmMaterialStockSelectDialog } from './wm-material-stock-select-dialog.vue';
+export { default as WmMaterialStockSelect } from './wm-material-stock-select.vue';
diff --git a/apps/web-antd/src/views/mes/wm/materialstock/components/wm-material-stock-select-dialog.vue b/apps/web-antd/src/views/mes/wm/materialstock/components/wm-material-stock-select-dialog.vue
new file mode 100644
index 000000000..837983a1d
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/materialstock/components/wm-material-stock-select-dialog.vue
@@ -0,0 +1,270 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmMaterialStockApi } from '#/api/mes/wm/materialstock';
+
+import { computed, nextTick, ref } from 'vue';
+
+import { Alert, message, Modal } from 'ant-design-vue';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getMaterialStockPage } from '#/api/mes/wm/materialstock';
+import MdItemTypeTree from '#/views/mes/md/item/type/components/md-item-type-tree.vue';
+
+import { useSelectGridColumns, useSelectGridFormSchema } from '../data';
+
+/** 虚拟仓过滤模式：'exclude' 排除虚拟仓（默认），'only' 只看虚拟仓，'all' 不过滤 */
+type VirtualFilter = 'all' | 'exclude' | 'only';
+
+const props = withDefaults(
+  defineProps<{
+    batchId?: number;
+    itemId?: number;
+    virtualFilter?: VirtualFilter;
+    warehouseId?: number;
+  }>(),
+  {
+    batchId: undefined,
+    itemId: undefined,
+    virtualFilter: 'exclude',
+    warehouseId: undefined,
+  },
+);
+
+const emit = defineEmits<{
+  selected: [rows: MesWmMaterialStockApi.MaterialStock[]];
+}>();
+
+const open = ref(false);
+const multiple = ref(true);
+const syncingSingleSelection = ref(false);
+const selectedRows = ref<MesWmMaterialStockApi.MaterialStock[]>([]);
+const preSelectedIds = ref<number[]>([]);
+const searchItemTypeId = ref<number>();
+
+/** 当前 props 是否带预过滤 */
+const showAlert = computed(
+  () =>
+    props.batchId != null ||
+    props.warehouseId != null ||
+    props.virtualFilter === 'only',
+);
+
+/** 预过滤提示文字 */
+const alertTitle = computed(() => {
+  const parts: string[] = [];
+  if (props.batchId != null) {
+    parts.push('批次');
+  }
+  if (props.warehouseId != null) {
+    parts.push('仓库');
+  }
+  if (props.virtualFilter === 'only') {
+    parts.push('只看虚拟仓');
+  }
+  return `已按${parts.join('/')}预过滤`;
+});
+
+/** 单选模式同步 VXE 勾选状态 */
+async function syncSingleSelection(row?: MesWmMaterialStockApi.MaterialStock) {
+  syncingSingleSelection.value = true;
+  await nextTick();
+  await gridApi.grid.clearCheckboxRow();
+  if (row) {
+    await gridApi.grid.setCheckboxRow(row, true);
+  }
+  await nextTick();
+  syncingSingleSelection.value = false;
+}
+
+/** 处理勾选变化 */
+async function handleCheckboxChange({
+  checked,
+  records,
+  row,
+}: {
+  checked: boolean;
+  records: MesWmMaterialStockApi.MaterialStock[];
+  row?: MesWmMaterialStockApi.MaterialStock;
+}) {
+  if (syncingSingleSelection.value) {
+    return;
+  }
+  if (!multiple.value) {
+    const selected = checked && row ? [row] : [];
+    selectedRows.value = selected;
+    await syncSingleSelection(selected[0]);
+    return;
+  }
+  selectedRows.value = records;
+}
+
+/** 处理全选变化 */
+function handleCheckboxAll({
+  records,
+}: {
+  records: MesWmMaterialStockApi.MaterialStock[];
+}) {
+  if (syncingSingleSelection.value) {
+    return;
+  }
+  selectedRows.value = records;
+}
+
+/** 双击行：单选直接确认；多选切换勾选 */
+async function handleRowDblclick({
+  row,
+}: {
+  row: MesWmMaterialStockApi.MaterialStock;
+}) {
+  if (multiple.value) {
+    const checked = !gridApi.grid.isCheckedByCheckboxRow(row);
+    await gridApi.grid.setCheckboxRow(row, checked);
+    handleCheckboxChange({
+      checked,
+      records: gridApi.grid.getCheckboxRecords() as MesWmMaterialStockApi.MaterialStock[],
+      row,
+    });
+    return;
+  }
+  selectedRows.value = [row];
+  await syncSingleSelection(row);
+  handleConfirm();
+}
+
+/** 回显预选 */
+function applyPreSelection() {
+  if (preSelectedIds.value.length === 0) {
+    return;
+  }
+  const rows = gridApi.grid.getData() as MesWmMaterialStockApi.MaterialStock[];
+  for (const row of rows) {
+    if (row.id && preSelectedIds.value.includes(row.id)) {
+      gridApi.grid.setCheckboxRow(row, true);
+      if (!multiple.value) {
+        selectedRows.value = [row];
+      }
+    }
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useSelectGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useSelectGridColumns(),
+    height: 480,
+    keepSource: true,
+    checkboxConfig: { highlight: true, range: true, reserve: true },
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getMaterialStockPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+            batchId: props.batchId,
+            // 默认查未冻结
+            frozen: false,
+            itemTypeId: searchItemTypeId.value,
+            itemId: formValues.itemId ?? props.itemId,
+            warehouseId: formValues.warehouseId ?? props.warehouseId,
+            virtualFilter:
+              props.virtualFilter === 'all' ? undefined : props.virtualFilter,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmMaterialStockApi.MaterialStock>,
+  gridEvents: {
+    cellDblclick: handleRowDblclick,
+    checkboxAll: handleCheckboxAll,
+    checkboxChange: handleCheckboxChange,
+  },
+});
+
+/** 物料分类树节点点击 */
+function handleTypeNodeClick(row: undefined | { id?: number }) {
+  searchItemTypeId.value = row?.id;
+  gridApi.query();
+}
+
+/** 重置查询和选择状态 */
+async function resetQueryState() {
+  selectedRows.value = [];
+  searchItemTypeId.value = undefined;
+  await gridApi.grid.clearCheckboxRow();
+  await gridApi.formApi.resetForm();
+}
+
+/** 打开弹窗 */
+async function openModal(
+  selectedIds?: number[],
+  options?: { multiple?: boolean },
+) {
+  open.value = true;
+  multiple.value = options?.multiple ?? true;
+  preSelectedIds.value = selectedIds || [];
+  await nextTick();
+  await resetQueryState();
+  await gridApi.query();
+  await nextTick();
+  applyPreSelection();
+}
+
+/** 关闭弹窗 */
+async function closeModal() {
+  open.value = false;
+  await resetQueryState();
+}
+
+/** 确认选择 */
+function handleConfirm() {
+  if (selectedRows.value.length === 0) {
+    message.warning(multiple.value ? '请至少选择一条数据' : '请选择一条数据');
+    return;
+  }
+  emit(
+    'selected',
+    multiple.value ? selectedRows.value : [selectedRows.value[0]!],
+  );
+  open.value = false;
+}
+
+defineExpose({ open: openModal });
+</script>
+
+<template>
+  <Modal
+    v-model:open="open"
+    :destroy-on-close="true"
+    title="库存物资选择"
+    width="80%"
+    @cancel="closeModal"
+    @ok="handleConfirm"
+  >
+    <Alert
+      v-if="showAlert"
+      class="mb-3"
+      :message="alertTitle"
+      show-icon
+      type="info"
+    />
+    <div class="flex gap-3">
+      <div class="bg-card w-1/6 rounded p-2">
+        <MdItemTypeTree @node-click="handleTypeNodeClick" />
+      </div>
+      <div class="w-5/6">
+        <Grid table-title="库存列表" />
+      </div>
+    </div>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/materialstock/components/wm-material-stock-select.vue b/apps/web-antd/src/views/mes/wm/materialstock/components/wm-material-stock-select.vue
new file mode 100644
index 000000000..e8dd366c7
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/materialstock/components/wm-material-stock-select.vue
@@ -0,0 +1,160 @@
+<script lang="ts" setup>
+import type { MesWmMaterialStockApi } from '#/api/mes/wm/materialstock';
+
+import { computed, ref, useAttrs, watch } from 'vue';
+
+import { IconifyIcon } from '@vben/icons';
+
+import { Input, Tooltip } from 'ant-design-vue';
+
+import { getMaterialStock } from '#/api/mes/wm/materialstock';
+
+import WmMaterialStockSelectDialog from './wm-material-stock-select-dialog.vue';
+
+defineOptions({ name: 'WmMaterialStockSelect', inheritAttrs: false });
+
+const props = withDefaults(
+  defineProps<{
+    allowClear?: boolean;
+    batchId?: number;
+    disabled?: boolean;
+    itemId?: number;
+    modelValue?: number;
+    placeholder?: string;
+    virtualFilter?: 'all' | 'exclude' | 'only';
+    warehouseId?: number;
+  }>(),
+  {
+    allowClear: true,
+    batchId: undefined,
+    disabled: false,
+    itemId: undefined,
+    modelValue: undefined,
+    placeholder: '请选择库存',
+    virtualFilter: 'exclude',
+    warehouseId: undefined,
+  },
+);
+
+const emit = defineEmits<{
+  change: [item: MesWmMaterialStockApi.MaterialStock | undefined];
+  'update:modelValue': [value: number | undefined];
+}>();
+
+const attrs = useAttrs();
+const dialogRef = ref<InstanceType<typeof WmMaterialStockSelectDialog>>();
+const hovering = ref(false);
+const selectedItem = ref<MesWmMaterialStockApi.MaterialStock>();
+
+const displayLabel = computed(() => {
+  const item = selectedItem.value;
+  if (!item) {
+    return '';
+  }
+  return `${item.warehouseName || '-'} / ${item.batchCode || '-'} / 数量:${item.quantity}`;
+});
+
+const showClear = computed(
+  () =>
+    props.allowClear &&
+    !props.disabled &&
+    hovering.value &&
+    props.modelValue != null,
+);
+
+/** 根据 ID 单条查询库存信息（用于编辑回显） */
+async function resolveItemById(id: number | undefined) {
+  if (id == null) {
+    selectedItem.value = undefined;
+    return;
+  }
+  if (selectedItem.value?.id === id) {
+    return;
+  }
+  try {
+    selectedItem.value = await getMaterialStock(id);
+  } catch (error) {
+    console.error('[WmMaterialStockSelect] resolveItemById failed:', error);
+  }
+}
+
+watch(() => props.modelValue, resolveItemById, { immediate: true });
+
+/** 清空已选库存 */
+function clearSelected() {
+  selectedItem.value = undefined;
+  emit('update:modelValue', undefined);
+  emit('change', undefined);
+}
+
+/** 打开库存选择弹窗 */
+function handleClick(event: MouseEvent) {
+  if (props.disabled) {
+    return;
+  }
+  const target = event.target as HTMLElement;
+  if (showClear.value && target.closest('.ant-input-suffix')) {
+    event.stopPropagation();
+    clearSelected();
+    return;
+  }
+  const selectedIds = props.modelValue == null ? [] : [props.modelValue];
+  dialogRef.value?.open(selectedIds, { multiple: false });
+}
+
+/** 弹窗选中回调 */
+function handleSelected(rows: MesWmMaterialStockApi.MaterialStock[]) {
+  const item = rows[0];
+  if (!item) {
+    return;
+  }
+  selectedItem.value = item;
+  emit('update:modelValue', item.id);
+  emit('change', item);
+}
+</script>
+
+<template>
+  <div
+    v-bind="attrs"
+    class="w-full"
+    :class="disabled ? 'cursor-not-allowed' : 'cursor-pointer'"
+    @click="handleClick"
+    @mouseenter="hovering = true"
+    @mouseleave="hovering = false"
+  >
+    <Tooltip :mouse-enter-delay="0.5" :open="selectedItem ? undefined : false">
+      <template #title>
+        <div v-if="selectedItem" class="leading-6">
+          <div>物料：{{ selectedItem.itemName || '-' }}</div>
+          <div>批次：{{ selectedItem.batchCode || '-' }}</div>
+          <div>数量：{{ selectedItem.quantity ?? '-' }}</div>
+          <div>仓库：{{ selectedItem.warehouseName || '-' }}</div>
+          <div>库区：{{ selectedItem.locationName || '-' }}</div>
+          <div>库位：{{ selectedItem.areaName || '-' }}</div>
+        </div>
+      </template>
+      <Input
+        :disabled="disabled"
+        :placeholder="placeholder"
+        :value="displayLabel"
+        readonly
+      >
+        <template #suffix>
+          <IconifyIcon
+            class="size-4"
+            :icon="showClear ? 'lucide:circle-x' : 'lucide:search'"
+          />
+        </template>
+      </Input>
+    </Tooltip>
+  </div>
+  <WmMaterialStockSelectDialog
+    ref="dialogRef"
+    :batch-id="batchId"
+    :item-id="itemId"
+    :virtual-filter="virtualFilter"
+    :warehouse-id="warehouseId"
+    @selected="handleSelected"
+  />
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/materialstock/data.ts b/apps/web-antd/src/views/mes/wm/materialstock/data.ts
new file mode 100644
index 000000000..0500129ec
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/materialstock/data.ts
@@ -0,0 +1,276 @@
+import type { VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmMaterialStockApi } from '#/api/mes/wm/materialstock';
+
+import { markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
+
+import {
+  WmWarehouseAreaSelect,
+  WmWarehouseLocationSelect,
+  WmWarehouseSelect,
+} from '../warehouse/components';
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择物料',
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入批次号',
+      },
+    },
+    {
+      fieldName: 'warehouseId',
+      label: '仓库',
+      component: markRaw(WmWarehouseSelect),
+      componentProps: {
+        placeholder: '请选择仓库',
+      },
+    },
+    {
+      fieldName: 'locationId',
+      label: '库区',
+      component: markRaw(WmWarehouseLocationSelect),
+      dependencies: {
+        triggerFields: ['warehouseId'],
+        componentProps: (values) => ({
+          warehouseId: values.warehouseId,
+          placeholder: '请选择库区',
+        }),
+      },
+    },
+    {
+      fieldName: 'frozen',
+      label: '是否冻结',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: [
+          { label: '是', value: true },
+          { label: '否', value: false },
+        ],
+        placeholder: '请选择',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(
+  onFrozenChange: (row: MesWmMaterialStockApi.MaterialStock) => void,
+): VxeTableGridOptions<MesWmMaterialStockApi.MaterialStock>['columns'] {
+  return [
+    {
+      field: 'itemCode',
+      title: '产品物料编码',
+      minWidth: 120,
+    },
+    {
+      field: 'itemName',
+      title: '产品物料名称',
+      minWidth: 140,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'quantity',
+      title: '在库数量',
+      width: 100,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'batchCode',
+      title: '批次号',
+      minWidth: 140,
+      slots: { default: 'batchCode' },
+    },
+    {
+      field: 'warehouseName',
+      title: '仓库',
+      minWidth: 100,
+    },
+    {
+      field: 'locationName',
+      title: '库区',
+      minWidth: 100,
+    },
+    {
+      field: 'areaName',
+      title: '库位',
+      minWidth: 100,
+      slots: { default: 'areaName' },
+    },
+    {
+      field: 'receiptTime',
+      title: '入库日期',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      field: 'frozen',
+      title: '冻结',
+      width: 90,
+      cellRender: {
+        name: 'CellSwitch',
+        attrs: { beforeChange: onFrozenChange },
+        props: { checkedValue: true, unCheckedValue: false },
+      },
+    },
+  ];
+}
+
+/** 选择弹窗的搜索表单 */
+export function useSelectGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择物料',
+      },
+    },
+    {
+      fieldName: 'vendorId',
+      label: '供应商',
+      component: markRaw(MdVendorSelect),
+      componentProps: {
+        placeholder: '请选择供应商',
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入批次号',
+      },
+    },
+    {
+      fieldName: 'warehouseId',
+      label: '仓库',
+      component: markRaw(WmWarehouseSelect),
+      componentProps: {
+        placeholder: '请选择仓库',
+      },
+    },
+    {
+      fieldName: 'locationId',
+      label: '库区',
+      component: markRaw(WmWarehouseLocationSelect),
+      dependencies: {
+        triggerFields: ['warehouseId'],
+        componentProps: (values) => ({
+          warehouseId: values.warehouseId,
+          placeholder: '请选择库区',
+        }),
+      },
+    },
+    {
+      fieldName: 'areaId',
+      label: '库位',
+      component: markRaw(WmWarehouseAreaSelect),
+      dependencies: {
+        triggerFields: ['locationId'],
+        componentProps: (values) => ({
+          locationId: values.locationId,
+          placeholder: '请选择库位',
+        }),
+      },
+    },
+  ];
+}
+
+/** 选择弹窗的字段 */
+export function useSelectGridColumns(): VxeTableGridOptions<MesWmMaterialStockApi.MaterialStock>['columns'] {
+  return [
+    {
+      type: 'checkbox',
+      width: 50,
+    },
+    {
+      field: 'itemCode',
+      title: '产品物料编码',
+      minWidth: 120,
+    },
+    {
+      field: 'itemName',
+      title: '产品物料名称',
+      minWidth: 140,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'batchCode',
+      title: '入库批次号',
+      minWidth: 120,
+    },
+    {
+      field: 'warehouseName',
+      title: '仓库',
+      minWidth: 100,
+    },
+    {
+      field: 'locationName',
+      title: '库区',
+      minWidth: 100,
+    },
+    {
+      field: 'areaName',
+      title: '库位',
+      minWidth: 100,
+    },
+    {
+      field: 'quantity',
+      title: '在库数量',
+      width: 100,
+    },
+    {
+      field: 'receiptTime',
+      title: '入库日期',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      field: 'frozen',
+      title: '冻结',
+      width: 80,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+      },
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/wm/materialstock/index.vue b/apps/web-antd/src/views/mes/wm/materialstock/index.vue
new file mode 100644
index 000000000..ad87860a1
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/materialstock/index.vue
@@ -0,0 +1,156 @@
+<script lang="ts" setup>
+// TODO @AI：注释风格；另外，也对齐下 system user index.vue；（整个文件）
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmMaterialStockApi } from '#/api/mes/wm/materialstock';
+
+import { ref } from 'vue';
+
+import { confirm, DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { Button, message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  exportMaterialStock,
+  getMaterialStockPage,
+  updateMaterialStockFrozen,
+} from '#/api/mes/wm/materialstock';
+import { $t } from '#/locales';
+import MdItemTypeTree from '#/views/mes/md/item/type/components/md-item-type-tree.vue';
+import AreaForm from '#/views/mes/wm/warehouse/area/modules/form.vue';
+
+import { useGridColumns, useGridFormSchema } from './data';
+
+const [AreaModal, areaModalApi] = useVbenModal({
+  connectedComponent: AreaForm,
+  destroyOnClose: true,
+});
+
+/** 处理冻结状态切换 */
+async function handleFrozenChange(row: MesWmMaterialStockApi.MaterialStock) {
+  const text = row.frozen ? '冻结' : '解冻';
+  try {
+    await confirm(`确认要"${text}"该库存记录吗？`);
+  } catch {
+    return false;
+  }
+  await updateMaterialStockFrozen({
+    id: row.id!,
+    frozen: row.frozen!,
+  });
+  message.success(`${text}成功`);
+  return true;
+}
+
+/** 已选物料分类 */
+const searchItemTypeId = ref<number>();
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(handleFrozenChange),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getMaterialStockPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            itemTypeId: searchItemTypeId.value,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmMaterialStockApi.MaterialStock>,
+});
+
+/** 物料分类树节点点击 */
+function handleTypeNodeClick(row: undefined | { id?: number }) {
+  searchItemTypeId.value = row?.id;
+  gridApi.query();
+}
+
+/** 打开库位详情弹窗 */
+function handleOpenAreaDetail(row: MesWmMaterialStockApi.MaterialStock) {
+  if (!row.areaId) {
+    return;
+  }
+  areaModalApi.setData({ formType: 'detail', id: row.areaId }).open();
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportMaterialStock({
+    ...(await gridApi.formApi.getValues()),
+    itemTypeId: searchItemTypeId.value,
+  });
+  downloadFileFromBlobPart({ fileName: '库存台账.xls', source: data });
+}
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】批次管理、库存现有量、库存事务"
+        url="https://doc.iocoder.cn/mes/wm/stock/"
+      />
+    </template>
+
+    <AreaModal />
+
+    <div class="flex h-full gap-3">
+      <div class="bg-card w-1/6 rounded p-3">
+        <MdItemTypeTree @node-click="handleTypeNodeClick" />
+      </div>
+      <div class="w-5/6">
+        <Grid table-title="库存台账列表">
+          <template #toolbar-tools>
+            <TableAction
+              :actions="[
+                {
+                  label: $t('ui.actionTitle.export'),
+                  type: 'primary',
+                  icon: ACTION_ICON.DOWNLOAD,
+                  auth: ['mes:wm-material-stock:export'],
+                  onClick: handleExport,
+                },
+              ]"
+            />
+          </template>
+          <template #batchCode="{ row }">
+            <span v-if="row.batchId" :title="row.batchCode">
+              {{ row.batchCode }}
+            </span>
+            <span v-else>-</span>
+          </template>
+          <template #areaName="{ row }">
+            <Button
+              v-if="row.areaId"
+              :title="row.areaName"
+              size="small"
+              type="link"
+              @click="handleOpenAreaDetail(row)"
+            >
+              {{ row.areaName }}
+            </Button>
+            <span v-else>-</span>
+          </template>
+        </Grid>
+      </div>
+    </div>
+  </Page>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/materialstock/components/index.ts b/apps/web-ele/src/views/mes/wm/materialstock/components/index.ts
new file mode 100644
index 000000000..8e0321711
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/materialstock/components/index.ts
@@ -0,0 +1,2 @@
+export { default as WmMaterialStockSelectDialog } from './wm-material-stock-select-dialog.vue';
+export { default as WmMaterialStockSelect } from './wm-material-stock-select.vue';
diff --git a/apps/web-ele/src/views/mes/wm/materialstock/components/wm-material-stock-select-dialog.vue b/apps/web-ele/src/views/mes/wm/materialstock/components/wm-material-stock-select-dialog.vue
new file mode 100644
index 000000000..2d5c5740b
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/materialstock/components/wm-material-stock-select-dialog.vue
@@ -0,0 +1,279 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmMaterialStockApi } from '#/api/mes/wm/materialstock';
+
+import { computed, nextTick, ref } from 'vue';
+
+import { ElAlert, ElButton, ElDialog, ElMessage } from 'element-plus';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getMaterialStockPage } from '#/api/mes/wm/materialstock';
+import MdItemTypeTree from '#/views/mes/md/item/type/components/md-item-type-tree.vue';
+
+import { useSelectGridColumns, useSelectGridFormSchema } from '../data';
+
+/** 虚拟仓过滤模式：'exclude' 排除虚拟仓（默认），'only' 只看虚拟仓，'all' 不过滤 */
+type VirtualFilter = 'all' | 'exclude' | 'only';
+
+const props = withDefaults(
+  defineProps<{
+    batchId?: number;
+    itemId?: number;
+    virtualFilter?: VirtualFilter;
+    warehouseId?: number;
+  }>(),
+  {
+    batchId: undefined,
+    itemId: undefined,
+    virtualFilter: 'exclude',
+    warehouseId: undefined,
+  },
+);
+
+const emit = defineEmits<{
+  selected: [rows: MesWmMaterialStockApi.MaterialStock[]];
+}>();
+
+const open = ref(false);
+const multiple = ref(true);
+const syncingSingleSelection = ref(false);
+const selectedRows = ref<MesWmMaterialStockApi.MaterialStock[]>([]);
+const preSelectedIds = ref<number[]>([]);
+const searchItemTypeId = ref<number>();
+
+/** 当前 props 是否带预过滤 */
+const showAlert = computed(
+  () =>
+    props.batchId != null ||
+    props.warehouseId != null ||
+    props.virtualFilter === 'only',
+);
+
+/** 预过滤提示文字 */
+const alertTitle = computed(() => {
+  const parts: string[] = [];
+  if (props.batchId != null) {
+    parts.push('批次');
+  }
+  if (props.warehouseId != null) {
+    parts.push('仓库');
+  }
+  if (props.virtualFilter === 'only') {
+    parts.push('只看虚拟仓');
+  }
+  return `已按${parts.join('/')}预过滤`;
+});
+
+/** 单选模式同步 VXE 勾选状态 */
+async function syncSingleSelection(row?: MesWmMaterialStockApi.MaterialStock) {
+  syncingSingleSelection.value = true;
+  await nextTick();
+  await gridApi.grid.clearCheckboxRow();
+  if (row) {
+    await gridApi.grid.setCheckboxRow(row, true);
+  }
+  await nextTick();
+  syncingSingleSelection.value = false;
+}
+
+/** 处理勾选变化 */
+async function handleCheckboxChange({
+  checked,
+  records,
+  row,
+}: {
+  checked: boolean;
+  records: MesWmMaterialStockApi.MaterialStock[];
+  row?: MesWmMaterialStockApi.MaterialStock;
+}) {
+  if (syncingSingleSelection.value) {
+    return;
+  }
+  if (!multiple.value) {
+    const selected = checked && row ? [row] : [];
+    selectedRows.value = selected;
+    await syncSingleSelection(selected[0]);
+    return;
+  }
+  selectedRows.value = records;
+}
+
+/** 处理全选变化 */
+function handleCheckboxAll({
+  records,
+}: {
+  records: MesWmMaterialStockApi.MaterialStock[];
+}) {
+  if (syncingSingleSelection.value) {
+    return;
+  }
+  selectedRows.value = records;
+}
+
+/** 双击行：单选直接确认；多选切换勾选 */
+async function handleRowDblclick({
+  row,
+}: {
+  row: MesWmMaterialStockApi.MaterialStock;
+}) {
+  if (multiple.value) {
+    const checked = !gridApi.grid.isCheckedByCheckboxRow(row);
+    await gridApi.grid.setCheckboxRow(row, checked);
+    handleCheckboxChange({
+      checked,
+      records:
+        gridApi.grid.getCheckboxRecords() as MesWmMaterialStockApi.MaterialStock[],
+      row,
+    });
+    return;
+  }
+  selectedRows.value = [row];
+  await syncSingleSelection(row);
+  handleConfirm();
+}
+
+/** 回显预选 */
+function applyPreSelection() {
+  if (preSelectedIds.value.length === 0) {
+    return;
+  }
+  const rows = gridApi.grid.getData() as MesWmMaterialStockApi.MaterialStock[];
+  for (const row of rows) {
+    if (row.id && preSelectedIds.value.includes(row.id)) {
+      gridApi.grid.setCheckboxRow(row, true);
+      if (!multiple.value) {
+        selectedRows.value = [row];
+      }
+    }
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useSelectGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useSelectGridColumns(),
+    height: 480,
+    keepSource: true,
+    checkboxConfig: {
+      highlight: true,
+      range: true,
+      reserve: true,
+    },
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getMaterialStockPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+            batchId: props.batchId,
+            // 默认查未冻结
+            frozen: false,
+            itemTypeId: searchItemTypeId.value,
+            itemId: formValues.itemId ?? props.itemId,
+            warehouseId: formValues.warehouseId ?? props.warehouseId,
+            virtualFilter:
+              props.virtualFilter === 'all' ? undefined : props.virtualFilter,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmMaterialStockApi.MaterialStock>,
+  gridEvents: {
+    cellDblclick: handleRowDblclick,
+    checkboxAll: handleCheckboxAll,
+    checkboxChange: handleCheckboxChange,
+  },
+});
+
+/** 物料分类树节点点击 */
+function handleTypeNodeClick(row: undefined | { id?: number }) {
+  searchItemTypeId.value = row?.id;
+  gridApi.query();
+}
+
+/** 重置查询和选择状态 */
+async function resetQueryState() {
+  selectedRows.value = [];
+  searchItemTypeId.value = undefined;
+  await gridApi.grid.clearCheckboxRow();
+  await gridApi.formApi.resetForm();
+}
+
+/** 打开弹窗 */
+async function openModal(
+  selectedIds?: number[],
+  options?: { multiple?: boolean },
+) {
+  open.value = true;
+  multiple.value = options?.multiple ?? true;
+  preSelectedIds.value = selectedIds || [];
+  await nextTick();
+  await resetQueryState();
+  await gridApi.query();
+  await nextTick();
+  applyPreSelection();
+}
+
+/** 关闭弹窗 */
+async function closeModal() {
+  open.value = false;
+  await resetQueryState();
+}
+
+/** 确认选择 */
+function handleConfirm() {
+  if (selectedRows.value.length === 0) {
+    ElMessage.warning(multiple.value ? '请至少选择一条数据' : '请选择一条数据');
+    return;
+  }
+  emit(
+    'selected',
+    multiple.value ? selectedRows.value : [selectedRows.value[0]!],
+  );
+  open.value = false;
+}
+
+defineExpose({ open: openModal });
+</script>
+
+<template>
+  <ElDialog
+    v-model="open"
+    destroy-on-close
+    title="库存物资选择"
+    width="80%"
+    @close="closeModal"
+  >
+    <ElAlert
+      v-if="showAlert"
+      class="mb-3"
+      :closable="false"
+      show-icon
+      :title="alertTitle"
+      type="info"
+    />
+    <div class="flex gap-3">
+      <div class="bg-card w-1/6 rounded p-2">
+        <MdItemTypeTree @node-click="handleTypeNodeClick" />
+      </div>
+      <div class="w-5/6">
+        <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/wm/materialstock/components/wm-material-stock-select.vue b/apps/web-ele/src/views/mes/wm/materialstock/components/wm-material-stock-select.vue
new file mode 100644
index 000000000..79a409243
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/materialstock/components/wm-material-stock-select.vue
@@ -0,0 +1,158 @@
+<script lang="ts" setup>
+import type { MesWmMaterialStockApi } from '#/api/mes/wm/materialstock';
+
+import { computed, ref, useAttrs, watch } from 'vue';
+
+import { CircleX, Search } from '@vben/icons';
+
+import { ElInput, ElTooltip } from 'element-plus';
+
+import { getMaterialStock } from '#/api/mes/wm/materialstock';
+
+import WmMaterialStockSelectDialog from './wm-material-stock-select-dialog.vue';
+
+defineOptions({ name: 'WmMaterialStockSelect', inheritAttrs: false });
+
+const props = withDefaults(
+  defineProps<{
+    batchId?: number;
+    clearable?: boolean;
+    disabled?: boolean;
+    itemId?: number;
+    modelValue?: number;
+    placeholder?: string;
+    virtualFilter?: 'all' | 'exclude' | 'only';
+    warehouseId?: number;
+  }>(),
+  {
+    batchId: undefined,
+    clearable: true,
+    disabled: false,
+    itemId: undefined,
+    modelValue: undefined,
+    placeholder: '请选择库存',
+    virtualFilter: 'exclude',
+    warehouseId: undefined,
+  },
+);
+
+const emit = defineEmits<{
+  change: [item: MesWmMaterialStockApi.MaterialStock | undefined];
+  'update:modelValue': [value: number | undefined];
+}>();
+
+const attrs = useAttrs();
+const dialogRef = ref<InstanceType<typeof WmMaterialStockSelectDialog>>();
+const hovering = ref(false);
+const selectedItem = ref<MesWmMaterialStockApi.MaterialStock>();
+
+const displayLabel = computed(() => {
+  const item = selectedItem.value;
+  if (!item) {
+    return '';
+  }
+  return `${item.warehouseName || '-'} / ${item.batchCode || '-'} / 数量:${item.quantity}`;
+});
+
+const showClear = computed(
+  () =>
+    props.clearable &&
+    !props.disabled &&
+    hovering.value &&
+    props.modelValue != null,
+);
+
+/** 根据 ID 单条查询库存信息（用于编辑回显） */
+async function resolveItemById(id: number | undefined) {
+  if (id == null) {
+    selectedItem.value = undefined;
+    return;
+  }
+  if (selectedItem.value?.id === id) {
+    return;
+  }
+  try {
+    selectedItem.value = await getMaterialStock(id);
+  } catch (error) {
+    console.error('[WmMaterialStockSelect] resolveItemById failed:', error);
+  }
+}
+
+watch(() => props.modelValue, resolveItemById, { immediate: true });
+
+/** 清空已选库存 */
+function clearSelected() {
+  selectedItem.value = undefined;
+  emit('update:modelValue', undefined);
+  emit('change', undefined);
+}
+
+/** 打开库存选择弹窗 */
+function handleClick(event: MouseEvent) {
+  if (props.disabled) {
+    return;
+  }
+  const target = event.target as HTMLElement;
+  if (showClear.value && target.closest('.el-input__suffix')) {
+    event.stopPropagation();
+    clearSelected();
+    return;
+  }
+  const selectedIds = props.modelValue == null ? [] : [props.modelValue];
+  dialogRef.value?.open(selectedIds, { multiple: false });
+}
+
+/** 弹窗选中回调 */
+function handleSelected(rows: MesWmMaterialStockApi.MaterialStock[]) {
+  const item = rows[0];
+  if (!item) {
+    return;
+  }
+  selectedItem.value = item;
+  emit('update:modelValue', item.id);
+  emit('change', item);
+}
+</script>
+
+<template>
+  <div
+    v-bind="attrs"
+    class="w-full"
+    :class="disabled ? 'cursor-not-allowed' : 'cursor-pointer'"
+    @click="handleClick"
+    @mouseenter="hovering = true"
+    @mouseleave="hovering = false"
+  >
+    <ElTooltip :disabled="!selectedItem" placement="top" :show-after="500">
+      <template #content>
+        <div v-if="selectedItem" class="leading-6">
+          <div>物料：{{ selectedItem.itemName || '-' }}</div>
+          <div>批次：{{ selectedItem.batchCode || '-' }}</div>
+          <div>数量：{{ selectedItem.quantity ?? '-' }}</div>
+          <div>仓库：{{ selectedItem.warehouseName || '-' }}</div>
+          <div>库区：{{ selectedItem.locationName || '-' }}</div>
+          <div>库位：{{ selectedItem.areaName || '-' }}</div>
+        </div>
+      </template>
+      <ElInput
+        :disabled="disabled"
+        :model-value="displayLabel"
+        :placeholder="placeholder"
+        readonly
+      >
+        <template #suffix>
+          <CircleX v-if="showClear" class="size-4" />
+          <Search v-else class="size-4" />
+        </template>
+      </ElInput>
+    </ElTooltip>
+  </div>
+  <WmMaterialStockSelectDialog
+    ref="dialogRef"
+    :batch-id="batchId"
+    :item-id="itemId"
+    :virtual-filter="virtualFilter"
+    :warehouse-id="warehouseId"
+    @selected="handleSelected"
+  />
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/materialstock/data.ts b/apps/web-ele/src/views/mes/wm/materialstock/data.ts
new file mode 100644
index 000000000..bb67f3e69
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/materialstock/data.ts
@@ -0,0 +1,276 @@
+import type { VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmMaterialStockApi } from '#/api/mes/wm/materialstock';
+
+import { markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
+
+import {
+  WmWarehouseAreaSelect,
+  WmWarehouseLocationSelect,
+  WmWarehouseSelect,
+} from '../warehouse/components';
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择物料',
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入批次号',
+      },
+    },
+    {
+      fieldName: 'warehouseId',
+      label: '仓库',
+      component: markRaw(WmWarehouseSelect),
+      componentProps: {
+        placeholder: '请选择仓库',
+      },
+    },
+    {
+      fieldName: 'locationId',
+      label: '库区',
+      component: markRaw(WmWarehouseLocationSelect),
+      dependencies: {
+        triggerFields: ['warehouseId'],
+        componentProps: (values) => ({
+          placeholder: '请选择库区',
+          warehouseId: values.warehouseId,
+        }),
+      },
+    },
+    {
+      fieldName: 'frozen',
+      label: '是否冻结',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: [
+          { label: '是', value: true },
+          { label: '否', value: false },
+        ],
+        placeholder: '请选择',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(
+  onFrozenChange: (row: MesWmMaterialStockApi.MaterialStock) => void,
+): VxeTableGridOptions<MesWmMaterialStockApi.MaterialStock>['columns'] {
+  return [
+    {
+      field: 'itemCode',
+      title: '产品物料编码',
+      minWidth: 120,
+    },
+    {
+      field: 'itemName',
+      title: '产品物料名称',
+      minWidth: 140,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'quantity',
+      title: '在库数量',
+      width: 100,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'batchCode',
+      title: '批次号',
+      minWidth: 140,
+      slots: { default: 'batchCode' },
+    },
+    {
+      field: 'warehouseName',
+      title: '仓库',
+      minWidth: 100,
+    },
+    {
+      field: 'locationName',
+      title: '库区',
+      minWidth: 100,
+    },
+    {
+      field: 'areaName',
+      title: '库位',
+      minWidth: 100,
+      slots: { default: 'areaName' },
+    },
+    {
+      field: 'receiptTime',
+      title: '入库日期',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      field: 'frozen',
+      title: '冻结',
+      width: 90,
+      cellRender: {
+        name: 'CellSwitch',
+        attrs: { beforeChange: onFrozenChange },
+        props: { activeValue: true, inactiveValue: false },
+      },
+    },
+  ];
+}
+
+/** 选择弹窗的搜索表单 */
+export function useSelectGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择物料',
+      },
+    },
+    {
+      fieldName: 'vendorId',
+      label: '供应商',
+      component: markRaw(MdVendorSelect),
+      componentProps: {
+        placeholder: '请选择供应商',
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入批次号',
+      },
+    },
+    {
+      fieldName: 'warehouseId',
+      label: '仓库',
+      component: markRaw(WmWarehouseSelect),
+      componentProps: {
+        placeholder: '请选择仓库',
+      },
+    },
+    {
+      fieldName: 'locationId',
+      label: '库区',
+      component: markRaw(WmWarehouseLocationSelect),
+      dependencies: {
+        triggerFields: ['warehouseId'],
+        componentProps: (values) => ({
+          placeholder: '请选择库区',
+          warehouseId: values.warehouseId,
+        }),
+      },
+    },
+    {
+      fieldName: 'areaId',
+      label: '库位',
+      component: markRaw(WmWarehouseAreaSelect),
+      dependencies: {
+        triggerFields: ['locationId'],
+        componentProps: (values) => ({
+          locationId: values.locationId,
+          placeholder: '请选择库位',
+        }),
+      },
+    },
+  ];
+}
+
+/** 选择弹窗的字段 */
+export function useSelectGridColumns(): VxeTableGridOptions<MesWmMaterialStockApi.MaterialStock>['columns'] {
+  return [
+    {
+      type: 'checkbox',
+      width: 50,
+    },
+    {
+      field: 'itemCode',
+      title: '产品物料编码',
+      minWidth: 120,
+    },
+    {
+      field: 'itemName',
+      title: '产品物料名称',
+      minWidth: 140,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'batchCode',
+      title: '入库批次号',
+      minWidth: 120,
+    },
+    {
+      field: 'warehouseName',
+      title: '仓库',
+      minWidth: 100,
+    },
+    {
+      field: 'locationName',
+      title: '库区',
+      minWidth: 100,
+    },
+    {
+      field: 'areaName',
+      title: '库位',
+      minWidth: 100,
+    },
+    {
+      field: 'quantity',
+      title: '在库数量',
+      width: 100,
+    },
+    {
+      field: 'receiptTime',
+      title: '入库日期',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      field: 'frozen',
+      title: '冻结',
+      width: 80,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+      },
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/wm/materialstock/index.vue b/apps/web-ele/src/views/mes/wm/materialstock/index.vue
new file mode 100644
index 000000000..d68af1a33
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/materialstock/index.vue
@@ -0,0 +1,156 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmMaterialStockApi } from '#/api/mes/wm/materialstock';
+
+import { ref } from 'vue';
+
+import { confirm, DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { ElButton, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  exportMaterialStock,
+  getMaterialStockPage,
+  updateMaterialStockFrozen,
+} from '#/api/mes/wm/materialstock';
+import { $t } from '#/locales';
+import MdItemTypeTree from '#/views/mes/md/item/type/components/md-item-type-tree.vue';
+import AreaForm from '#/views/mes/wm/warehouse/area/modules/form.vue';
+
+import { useGridColumns, useGridFormSchema } from './data';
+
+const [AreaModal, areaModalApi] = useVbenModal({
+  connectedComponent: AreaForm,
+  destroyOnClose: true,
+});
+
+/** 处理冻结状态切换 */
+async function handleFrozenChange(row: MesWmMaterialStockApi.MaterialStock) {
+  const text = row.frozen ? '冻结' : '解冻';
+  try {
+    await confirm(`确认要"${text}"该库存记录吗？`);
+  } catch {
+    return false;
+  }
+  await updateMaterialStockFrozen({
+    id: row.id!,
+    frozen: row.frozen!,
+  });
+  ElMessage.success(`${text}成功`);
+  return true;
+}
+
+/** 已选物料分类 */
+const searchItemTypeId = ref<number>();
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(handleFrozenChange),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getMaterialStockPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            itemTypeId: searchItemTypeId.value,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmMaterialStockApi.MaterialStock>,
+});
+
+/** 物料分类树节点点击 */
+function handleTypeNodeClick(row: undefined | { id?: number }) {
+  searchItemTypeId.value = row?.id;
+  gridApi.query();
+}
+
+/** 打开库位详情弹窗 */
+function handleOpenAreaDetail(row: MesWmMaterialStockApi.MaterialStock) {
+  if (!row.areaId) {
+    return;
+  }
+  areaModalApi.setData({ formType: 'detail', id: row.areaId }).open();
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportMaterialStock({
+    ...(await gridApi.formApi.getValues()),
+    itemTypeId: searchItemTypeId.value,
+  });
+  downloadFileFromBlobPart({ fileName: '库存台账.xls', source: data });
+}
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】批次管理、库存现有量、库存事务"
+        url="https://doc.iocoder.cn/mes/wm/stock/"
+      />
+    </template>
+
+    <AreaModal />
+
+    <div class="flex h-full gap-3">
+      <div class="bg-card w-1/6 rounded p-3">
+        <MdItemTypeTree @node-click="handleTypeNodeClick" />
+      </div>
+      <div class="w-5/6">
+        <Grid table-title="库存台账列表">
+          <template #toolbar-tools>
+            <TableAction
+              :actions="[
+                {
+                  label: $t('ui.actionTitle.export'),
+                  type: 'primary',
+                  icon: ACTION_ICON.DOWNLOAD,
+                  auth: ['mes:wm-material-stock:export'],
+                  onClick: handleExport,
+                },
+              ]"
+            />
+          </template>
+          <template #batchCode="{ row }">
+            <span v-if="row.batchId" :title="row.batchCode">
+              {{ row.batchCode }}
+            </span>
+            <span v-else>-</span>
+          </template>
+          <template #areaName="{ row }">
+            <ElButton
+              v-if="row.areaId"
+              link
+              size="small"
+              :title="row.areaName"
+              type="primary"
+              @click="handleOpenAreaDetail(row)"
+            >
+              {{ row.areaName }}
+            </ElButton>
+            <span v-else>-</span>
+          </template>
+        </Grid>
+      </div>
+    </div>
+  </Page>
+</template>

From 8028d8b6ef4f93f6158b16fb14333ce42c6d1f55 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 29 May 2026 19:31:13 +0800
Subject: [PATCH 14/52] =?UTF-8?q?feat(mes):=20=E8=BF=81=E7=A7=BB=20batchtr?=
 =?UTF-8?q?ace?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/api/mes/wm/batch/index.ts   |  67 +++++++
 .../src/views/mes/qc/batchtrace/data.ts       | 169 ++++++++++++++++++
 .../src/views/mes/qc/batchtrace/index.vue     |  81 +++++++++
 .../qc/batchtrace/modules/trace-detail.vue    |  89 +++++++++
 .../mes/qc/batchtrace/modules/trace-list.vue  |  66 +++++++
 5 files changed, 472 insertions(+)
 create mode 100644 apps/web-antd/src/api/mes/wm/batch/index.ts
 create mode 100644 apps/web-antd/src/views/mes/qc/batchtrace/data.ts
 create mode 100644 apps/web-antd/src/views/mes/qc/batchtrace/index.vue
 create mode 100644 apps/web-antd/src/views/mes/qc/batchtrace/modules/trace-detail.vue
 create mode 100644 apps/web-antd/src/views/mes/qc/batchtrace/modules/trace-list.vue

diff --git a/apps/web-antd/src/api/mes/wm/batch/index.ts b/apps/web-antd/src/api/mes/wm/batch/index.ts
new file mode 100644
index 000000000..02ca877eb
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/batch/index.ts
@@ -0,0 +1,67 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmBatchApi {
+  /** MES 批次 */
+  export interface Batch {
+    id?: number; // 批次 ID
+    code?: string; // 批次编码
+    itemId?: number; // 物料 ID
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    itemSpecification?: string; // 规格型号
+    unitName?: string; // 单位名称
+    produceDate?: Date; // 生产日期
+    expireDate?: Date; // 有效期
+    receiptDate?: Date; // 入库日期
+    vendorId?: number; // 供应商 ID
+    vendorCode?: string; // 供应商编码
+    vendorName?: string; // 供应商名称
+    clientId?: number; // 客户 ID
+    clientCode?: string; // 客户编码
+    clientName?: string; // 客户名称
+    purchaseOrderCode?: string; // 采购订单编号
+    salesOrderCode?: string; // 销售订单编号
+    workOrderId?: number; // 生产工单 ID
+    workOrderCode?: string; // 生产工单编号
+    taskId?: number; // 生产任务 ID
+    taskCode?: string; // 生产任务编号
+    workstationId?: number; // 工作站 ID
+    workstationCode?: string; // 工作站编码
+    toolId?: number; // 工具 ID
+    toolCode?: string; // 工具编号
+    moldId?: number; // 模具 ID
+    lotNumber?: string; // 生产批号
+    qualityStatus?: number; // 质量状态
+    remark?: string; // 备注
+  }
+}
+
+/** 查询批次详情 */
+export function getBatch(id: number) {
+  return requestClient.get<MesWmBatchApi.Batch>(`/mes/wm/batch/get?id=${id}`);
+}
+
+/** 查询批次分页 */
+export function getBatchPage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmBatchApi.Batch>>(
+    '/mes/wm/batch/page',
+    { params },
+  );
+}
+
+/** 批次向前追溯 */
+export function getForwardBatchList(code: string) {
+  return requestClient.get<MesWmBatchApi.Batch[]>('/mes/wm/batch/forward-list', {
+    params: { code },
+  });
+}
+
+/** 批次向后追溯 */
+export function getBackwardBatchList(code: string) {
+  return requestClient.get<MesWmBatchApi.Batch[]>(
+    '/mes/wm/batch/backward-list',
+    { params: { code } },
+  );
+}
diff --git a/apps/web-antd/src/views/mes/qc/batchtrace/data.ts b/apps/web-antd/src/views/mes/qc/batchtrace/data.ts
new file mode 100644
index 000000000..6e7f8c042
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/batchtrace/data.ts
@@ -0,0 +1,169 @@
+import type { VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmBatchApi } from '#/api/mes/wm/batch';
+
+import { markRaw } from 'vue';
+
+import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入批次号',
+      },
+    },
+    {
+      fieldName: 'itemId',
+      label: '产品物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择产品物料',
+      },
+    },
+    {
+      fieldName: 'vendorId',
+      label: '供应商',
+      component: markRaw(MdVendorSelect),
+      componentProps: {
+        placeholder: '请选择供应商',
+      },
+    },
+    {
+      fieldName: 'clientId',
+      label: '客户',
+      component: markRaw(MdClientSelect),
+      componentProps: {
+        placeholder: '请选择客户',
+      },
+    },
+    {
+      fieldName: 'salesOrderCode',
+      label: '销售订单编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入销售订单编号',
+      },
+    },
+    {
+      fieldName: 'purchaseOrderCode',
+      label: '采购订单编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入采购订单编号',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesWmBatchApi.Batch>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '批次编号',
+      minWidth: 160,
+    },
+    {
+      field: 'itemCode',
+      title: '产品物料编码',
+      minWidth: 140,
+    },
+    {
+      field: 'itemName',
+      title: '产品物料名称',
+      minWidth: 160,
+    },
+    {
+      field: 'itemSpecification',
+      title: '规格型号',
+      minWidth: 140,
+    },
+    {
+      field: 'unitName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'vendorCode',
+      title: '供应商编码',
+      minWidth: 140,
+    },
+    {
+      field: 'vendorName',
+      title: '供应商名称',
+      minWidth: 160,
+    },
+    {
+      field: 'clientCode',
+      title: '客户编码',
+      minWidth: 140,
+    },
+    {
+      field: 'clientName',
+      title: '客户名称',
+      minWidth: 160,
+    },
+    {
+      field: 'salesOrderCode',
+      title: '销售订单编号',
+      minWidth: 160,
+    },
+    {
+      field: 'purchaseOrderCode',
+      title: '采购订单编号',
+      minWidth: 160,
+    },
+    {
+      title: '操作',
+      width: 110,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 追溯明细列表的字段 */
+export function useTraceGridColumns(): VxeTableGridOptions<MesWmBatchApi.Batch>['columns'] {
+  return [
+    {
+      field: 'workOrderCode',
+      title: '生产工单号',
+      width: 160,
+    },
+    {
+      field: 'code',
+      title: '批次编号',
+      minWidth: 160,
+    },
+    {
+      field: 'itemCode',
+      title: '产品物料编码',
+      minWidth: 140,
+    },
+    {
+      field: 'itemName',
+      title: '产品物料名称',
+      minWidth: 160,
+    },
+    {
+      field: 'itemSpecification',
+      title: '规格型号',
+      minWidth: 140,
+    },
+    {
+      field: 'unitName',
+      title: '单位',
+      width: 80,
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/qc/batchtrace/index.vue b/apps/web-antd/src/views/mes/qc/batchtrace/index.vue
new file mode 100644
index 000000000..2a88c3b6d
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/batchtrace/index.vue
@@ -0,0 +1,81 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmBatchApi } from '#/api/mes/wm/batch';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getBatchPage } from '#/api/mes/wm/batch';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import TraceDetail from './modules/trace-detail.vue';
+
+const [DetailModal, detailModalApi] = useVbenModal({
+  connectedComponent: TraceDetail,
+  destroyOnClose: true,
+});
+
+/** 打开批次追溯详情 */
+function handleTrace(row: MesWmBatchApi.Batch) {
+  detailModalApi.setData(row).open();
+}
+
+const [Grid] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getBatchPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmBatchApi.Batch>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】批次管理、库存现有量、库存事务"
+        url="https://doc.iocoder.cn/mes/wm/stock/"
+      />
+    </template>
+
+    <DetailModal />
+
+    <Grid table-title="批次追溯列表">
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: '批次追溯',
+              type: 'link',
+              icon: ACTION_ICON.VIEW,
+              auth: ['mes:wm-batch:query'],
+              onClick: handleTrace.bind(null, row),
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/mes/qc/batchtrace/modules/trace-detail.vue b/apps/web-antd/src/views/mes/qc/batchtrace/modules/trace-detail.vue
new file mode 100644
index 000000000..241a2bc61
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/batchtrace/modules/trace-detail.vue
@@ -0,0 +1,89 @@
+<script lang="ts" setup>
+// TODO @AI：是不是可以使用 description 组件？
+import type { MesWmBatchApi } from '#/api/mes/wm/batch';
+
+import { ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { Descriptions, Tabs } from 'ant-design-vue';
+
+import TraceList from './trace-list.vue';
+
+const detailData = ref<MesWmBatchApi.Batch>(); // 当前批次详情
+const subTabsName = ref<'backward' | 'forward'>('forward'); // 当前激活的追溯方向
+
+const [Modal, modalApi] = useVbenModal({
+  showCancelButton: false,
+  showConfirmButton: false,
+  onOpenChange(isOpen) {
+    if (!isOpen) {
+      detailData.value = undefined;
+      return;
+    }
+    detailData.value = modalApi.getData<MesWmBatchApi.Batch>();
+    subTabsName.value = 'forward';
+  },
+});
+</script>
+
+<template>
+  <Modal title="批次追溯" class="w-4/5">
+    <div class="mx-4 mt-2">
+      <Descriptions :column="3" bordered size="small">
+        <Descriptions.Item label="批次编号">
+          {{ detailData?.code || '-' }}
+        </Descriptions.Item>
+        <Descriptions.Item label="物资编码">
+          {{ detailData?.itemCode || '-' }}
+        </Descriptions.Item>
+        <Descriptions.Item label="物资名称">
+          {{ detailData?.itemName || '-' }}
+        </Descriptions.Item>
+        <Descriptions.Item label="规格型号" :span="3">
+          {{ detailData?.itemSpecification || '-' }}
+        </Descriptions.Item>
+        <Descriptions.Item label="采购订单编号">
+          {{ detailData?.purchaseOrderCode || '-' }}
+        </Descriptions.Item>
+        <Descriptions.Item label="供应商编码">
+          {{ detailData?.vendorCode || '-' }}
+        </Descriptions.Item>
+        <Descriptions.Item label="供应商名称">
+          {{ detailData?.vendorName || '-' }}
+        </Descriptions.Item>
+        <Descriptions.Item label="销售订单编号">
+          {{ detailData?.salesOrderCode || '-' }}
+        </Descriptions.Item>
+        <Descriptions.Item label="客户编码">
+          {{ detailData?.clientCode || '-' }}
+        </Descriptions.Item>
+        <Descriptions.Item label="客户名称">
+          {{ detailData?.clientName || '-' }}
+        </Descriptions.Item>
+        <Descriptions.Item label="生产批号">
+          {{ detailData?.lotNumber || '-' }}
+        </Descriptions.Item>
+        <Descriptions.Item label="生产工单">
+          {{ detailData?.workOrderCode || '-' }}
+        </Descriptions.Item>
+        <Descriptions.Item label="工作站编码">
+          {{ detailData?.workstationCode || '-' }}
+        </Descriptions.Item>
+      </Descriptions>
+    </div>
+    <Tabs
+      v-if="detailData?.code"
+      v-model:active-key="subTabsName"
+      class="mx-4 mt-4"
+      type="card"
+    >
+      <Tabs.TabPane key="forward" tab="向前追溯">
+        <TraceList :batch-code="detailData.code" direction="forward" />
+      </Tabs.TabPane>
+      <Tabs.TabPane key="backward" tab="向后追溯">
+        <TraceList :batch-code="detailData.code" direction="backward" />
+      </Tabs.TabPane>
+    </Tabs>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/qc/batchtrace/modules/trace-list.vue b/apps/web-antd/src/views/mes/qc/batchtrace/modules/trace-list.vue
new file mode 100644
index 000000000..d961f1707
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/batchtrace/modules/trace-list.vue
@@ -0,0 +1,66 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmBatchApi } from '#/api/mes/wm/batch';
+
+import { ref, watch } from 'vue';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  getBackwardBatchList,
+  getForwardBatchList,
+} from '#/api/mes/wm/batch';
+
+import { useTraceGridColumns } from '../data';
+
+const props = defineProps<{
+  batchCode?: string;
+  direction: 'backward' | 'forward'; // 追溯方向：forward=向前，backward=向后
+}>();
+
+const list = ref<MesWmBatchApi.Batch[]>([]); // 追溯结果列表
+
+// TODO @AI：代码风格；
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useTraceGridColumns(),
+    data: list.value,
+    minHeight: 240,
+    pagerConfig: { enabled: false },
+    rowConfig: { isHover: true, keyField: 'id' },
+    showOverflow: true,
+    toolbarConfig: { enabled: false },
+  } as VxeTableGridOptions<MesWmBatchApi.Batch>,
+});
+
+/** 加载追溯列表 */
+// TODO @AI：是不是可以在 useVbenVxeGrid 里面实现加载？
+async function getList() {
+  if (!props.batchCode) {
+    list.value = [];
+    gridApi.setGridOptions({ data: list.value });
+    return;
+  }
+  gridApi.setLoading(true);
+  try {
+    list.value =
+      props.direction === 'forward'
+        ? await getForwardBatchList(props.batchCode)
+        : await getBackwardBatchList(props.batchCode);
+    gridApi.setGridOptions({ data: list.value });
+  } finally {
+    gridApi.setLoading(false);
+  }
+}
+
+watch(
+  () => props.batchCode,
+  () => {
+    getList();
+  },
+  { immediate: true },
+);
+</script>
+
+<template>
+  <Grid class="w-full" />
+</template>

From eeff84b63fb9dc1368f7676e372c50956ac8fcb3 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 29 May 2026 19:32:43 +0800
Subject: [PATCH 15/52] =?UTF-8?q?feat(mes):=20=E4=BC=98=E5=8C=96=20confirm?=
 =?UTF-8?q?=20=E7=9A=84=E4=BB=A3=E7=A0=81=E9=A3=8E=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/_core/profile/modules/user-social.vue  |  4 +---
 .../src/views/ai/image/manager/index.vue         |  4 +---
 .../src/views/ai/knowledge/document/index.vue    |  4 +---
 .../src/views/ai/knowledge/segment/index.vue     |  4 +---
 .../src/views/ai/music/manager/index.vue         |  4 +---
 .../crm/business/components/detail-list.vue      |  4 +---
 .../web-antd/src/views/crm/clue/detail/index.vue |  4 +---
 .../views/crm/contact/components/detail-list.vue |  4 +---
 .../src/views/crm/customer/detail/index.vue      | 16 ++++------------
 .../src/views/crm/permission/modules/list.vue    |  4 +---
 .../src/views/erp/finance/account/index.vue      |  4 +---
 .../src/views/erp/stock/warehouse/index.vue      |  4 +---
 .../src/views/infra/apiErrorLog/index.vue        |  4 +---
 .../device/detail/modules/modbus-config.vue      |  2 +-
 .../device/device/detail/modules/sub-device.vue  |  6 ++----
 .../src/views/mall/product/comment/index.vue     |  4 +---
 .../src/views/mall/product/spu/index.vue         |  8 ++------
 .../mall/promotion/coupon/template/index.vue     |  4 +---
 .../promotion/kefu/modules/conversation-list.vue |  4 +---
 .../mall/promotion/seckill/config/index.vue      |  4 +---
 .../statistics/product/modules/summary-card.vue  |  4 +---
 .../mall/statistics/trade/modules/trend-card.vue |  4 +---
 .../views/mall/trade/brokerage/user/index.vue    |  4 +---
 .../src/views/mes/qc/iqc/modules/form.vue        | 12 +++++++++---
 .../src/views/mes/qc/oqc/modules/form.vue        | 15 +++++++++++----
 .../src/views/mes/qc/rqc/modules/form.vue        | 16 +++++++++++-----
 apps/web-antd/src/views/pay/app/index.vue        |  4 +---
 apps/web-antd/src/views/system/user/index.vue    |  4 +---
 .../views/_core/profile/modules/user-social.vue  |  4 +---
 .../web-ele/src/views/ai/image/manager/index.vue |  4 +---
 .../src/views/ai/knowledge/document/index.vue    |  4 +---
 .../src/views/ai/knowledge/segment/index.vue     |  4 +---
 .../web-ele/src/views/ai/music/manager/index.vue |  4 +---
 .../crm/business/components/detail-list.vue      |  4 +---
 apps/web-ele/src/views/crm/clue/detail/index.vue |  4 +---
 .../views/crm/contact/components/detail-list.vue |  4 +---
 .../src/views/crm/customer/detail/index.vue      | 16 ++++------------
 .../src/views/crm/permission/modules/list.vue    |  4 +---
 .../src/views/erp/finance/account/index.vue      |  4 +---
 .../src/views/erp/stock/warehouse/index.vue      |  4 +---
 .../src/views/infra/apiErrorLog/index.vue        |  4 +---
 .../device/detail/modules/modbus-config.vue      |  2 +-
 .../device/device/detail/modules/sub-device.vue  |  6 ++----
 .../src/views/mall/product/comment/index.vue     |  4 +---
 .../web-ele/src/views/mall/product/spu/index.vue |  8 ++------
 .../mall/promotion/coupon/template/index.vue     |  4 +---
 .../promotion/kefu/modules/conversation-list.vue |  4 +---
 .../mall/promotion/seckill/config/index.vue      |  4 +---
 .../statistics/product/modules/summary-card.vue  |  4 +---
 .../mall/statistics/trade/modules/trend-card.vue |  4 +---
 .../views/mall/trade/brokerage/user/index.vue    |  4 +---
 .../src/views/mes/qc/ipqc/modules/form.vue       | 14 +++++++++++---
 .../src/views/mes/qc/iqc/modules/form.vue        | 12 +++++++++---
 .../src/views/mes/qc/oqc/modules/form.vue        | 14 +++++++++++---
 .../src/views/mes/qc/rqc/modules/form.vue        | 14 +++++++++++---
 apps/web-ele/src/views/pay/app/index.vue         |  4 +---
 apps/web-ele/src/views/system/user/index.vue     |  4 +---
 57 files changed, 133 insertions(+), 196 deletions(-)

diff --git a/apps/web-antd/src/views/_core/profile/modules/user-social.vue b/apps/web-antd/src/views/_core/profile/modules/user-social.vue
index ddb806567..d0925bac7 100644
--- a/apps/web-antd/src/views/_core/profile/modules/user-social.vue
+++ b/apps/web-antd/src/views/_core/profile/modules/user-social.vue
@@ -105,9 +105,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
 
 /** 解绑账号 */
 function onUnbind(row: SystemSocialUserApi.SocialUser) {
-  confirm({
-    content: `确定解绑[${getDictLabel(DICT_TYPE.SYSTEM_SOCIAL_TYPE, row.type)}]平台的[${row.openid}]账号吗？`,
-  }).then(async () => {
+  confirm(`确定解绑[${getDictLabel(DICT_TYPE.SYSTEM_SOCIAL_TYPE, row.type)}]平台的[${row.openid}]账号吗？`).then(async () => {
     await socialUnbind({ type: row.type, openid: row.openid });
     // 提示成功
     message.success($t('ui.actionMessage.operationSuccess'));
diff --git a/apps/web-antd/src/views/ai/image/manager/index.vue b/apps/web-antd/src/views/ai/image/manager/index.vue
index 04d048e80..08e602a68 100644
--- a/apps/web-antd/src/views/ai/image/manager/index.vue
+++ b/apps/web-antd/src/views/ai/image/manager/index.vue
@@ -39,9 +39,7 @@ async function handleUpdatePublicStatusChange(
 ): Promise<boolean | undefined> {
   const text = newStatus ? '公开' : '私有';
   try {
-    await confirm({
-      content: `确认要将该图片切换为【${text}】吗？`,
-    });
+    await confirm(`确认要将该图片切换为【${text}】吗？`);
   } catch {
     return false;
   }
diff --git a/apps/web-antd/src/views/ai/knowledge/document/index.vue b/apps/web-antd/src/views/ai/knowledge/document/index.vue
index 5d21febd3..21db8989a 100644
--- a/apps/web-antd/src/views/ai/knowledge/document/index.vue
+++ b/apps/web-antd/src/views/ai/knowledge/document/index.vue
@@ -77,9 +77,7 @@ async function handleStatusChange(
   row: AiKnowledgeDocumentApi.KnowledgeDocument,
 ): Promise<boolean | undefined> {
   try {
-    await confirm({
-      content: `你要将${row.name}的状态切换为【${getDictLabel(DICT_TYPE.COMMON_STATUS, newStatus)}】吗？`,
-    });
+    await confirm(`你要将${row.name}的状态切换为【${getDictLabel(DICT_TYPE.COMMON_STATUS, newStatus)}】吗？`);
   } catch {
     return false;
   }
diff --git a/apps/web-antd/src/views/ai/knowledge/segment/index.vue b/apps/web-antd/src/views/ai/knowledge/segment/index.vue
index 2f9955e64..519c96eaa 100644
--- a/apps/web-antd/src/views/ai/knowledge/segment/index.vue
+++ b/apps/web-antd/src/views/ai/knowledge/segment/index.vue
@@ -65,9 +65,7 @@ async function handleStatusChange(
   row: AiKnowledgeSegmentApi.KnowledgeSegment,
 ): Promise<boolean | undefined> {
   try {
-    await confirm({
-      content: `你要将片段 ${row.id} 的状态切换为【${getDictLabel(DICT_TYPE.COMMON_STATUS, newStatus)}】吗？`,
-    });
+    await confirm(`你要将片段 ${row.id} 的状态切换为【${getDictLabel(DICT_TYPE.COMMON_STATUS, newStatus)}】吗？`);
   } catch {
     return false;
   }
diff --git a/apps/web-antd/src/views/ai/music/manager/index.vue b/apps/web-antd/src/views/ai/music/manager/index.vue
index 6d03547cd..26735dece 100644
--- a/apps/web-antd/src/views/ai/music/manager/index.vue
+++ b/apps/web-antd/src/views/ai/music/manager/index.vue
@@ -39,9 +39,7 @@ async function handleUpdatePublicStatusChange(
 ): Promise<boolean | undefined> {
   const text = newStatus ? '公开' : '私有';
   try {
-    await confirm({
-      content: `确认要将该音乐切换为【${text}】吗？`,
-    });
+    await confirm(`确认要将该音乐切换为【${text}】吗？`);
   } catch {
     return false;
   }
diff --git a/apps/web-antd/src/views/crm/business/components/detail-list.vue b/apps/web-antd/src/views/crm/business/components/detail-list.vue
index 87f36d459..ce2691713 100644
--- a/apps/web-antd/src/views/crm/business/components/detail-list.vue
+++ b/apps/web-antd/src/views/crm/business/components/detail-list.vue
@@ -75,9 +75,7 @@ async function handleDeleteContactBusinessList() {
     return;
   }
   try {
-    await confirm({
-      content: `确定要将${checkedRows.value.map((item) => item.name).join(',')}解除关联吗？`,
-    });
+    await confirm(`确定要将${checkedRows.value.map((item) => item.name).join(',')}解除关联吗？`);
   } catch {
     return false;
   }
diff --git a/apps/web-antd/src/views/crm/clue/detail/index.vue b/apps/web-antd/src/views/crm/clue/detail/index.vue
index 98117c0e4..1b20c46b0 100644
--- a/apps/web-antd/src/views/crm/clue/detail/index.vue
+++ b/apps/web-antd/src/views/crm/clue/detail/index.vue
@@ -84,9 +84,7 @@ function handleTransfer() {
 /** 转化为客户 */
 async function handleTransform(): Promise<boolean | undefined> {
   try {
-    await confirm({
-      content: '确定将该线索转化为客户吗？',
-    });
+    await confirm('确定将该线索转化为客户吗？');
   } catch {
     return false;
   }
diff --git a/apps/web-antd/src/views/crm/contact/components/detail-list.vue b/apps/web-antd/src/views/crm/contact/components/detail-list.vue
index 7e408cf3a..d777749f7 100644
--- a/apps/web-antd/src/views/crm/contact/components/detail-list.vue
+++ b/apps/web-antd/src/views/crm/contact/components/detail-list.vue
@@ -72,9 +72,7 @@ async function handleDeleteContactBusinessList() {
     return;
   }
   try {
-    await confirm({
-      content: `确定要将${checkedRows.value.map((item) => item.name).join(',')}解除关联吗？`,
-    });
+    await confirm(`确定要将${checkedRows.value.map((item) => item.name).join(',')}解除关联吗？`);
   } catch {
     return false;
   }
diff --git a/apps/web-antd/src/views/crm/customer/detail/index.vue b/apps/web-antd/src/views/crm/customer/detail/index.vue
index 8faf13e93..8d4a917e5 100644
--- a/apps/web-antd/src/views/crm/customer/detail/index.vue
+++ b/apps/web-antd/src/views/crm/customer/detail/index.vue
@@ -102,9 +102,7 @@ function handleTransfer() {
 /** 锁定客户 */
 async function handleLock(lockStatus: boolean): Promise<boolean | undefined> {
   try {
-    await confirm({
-      content: `确定锁定客户【${customer.value.name}】吗？`,
-    });
+    await confirm(`确定锁定客户【${customer.value.name}】吗？`);
   } catch {
     return false;
   }
@@ -118,9 +116,7 @@ async function handleLock(lockStatus: boolean): Promise<boolean | undefined> {
 /** 领取客户 */
 async function handleReceive(): Promise<boolean | undefined> {
   try {
-    await confirm({
-      content: `确定领取客户【${customer.value.name}】吗？`,
-    });
+    await confirm(`确定领取客户【${customer.value.name}】吗？`);
   } catch {
     return false;
   }
@@ -139,9 +135,7 @@ function handleDistributeForm() {
 /** 客户放入公海 */
 async function handlePutPool(): Promise<boolean | undefined> {
   try {
-    await confirm({
-      content: `确定将客户【${customer.value.name}】放入公海吗？`,
-    });
+    await confirm(`确定将客户【${customer.value.name}】放入公海吗？`);
   } catch {
     return false;
   }
@@ -156,9 +150,7 @@ async function handlePutPool(): Promise<boolean | undefined> {
 async function handleUpdateDealStatus(): Promise<boolean | undefined> {
   const dealStatus = !customer.value.dealStatus;
   try {
-    await confirm({
-      content: `确定更新成交状态为【${dealStatus ? '已成交' : '未成交'}】吗？`,
-    });
+    await confirm(`确定更新成交状态为【${dealStatus ? '已成交' : '未成交'}】吗？`);
   } catch {
     return false;
   }
diff --git a/apps/web-antd/src/views/crm/permission/modules/list.vue b/apps/web-antd/src/views/crm/permission/modules/list.vue
index 2a2789ff9..3cd76ee36 100644
--- a/apps/web-antd/src/views/crm/permission/modules/list.vue
+++ b/apps/web-antd/src/views/crm/permission/modules/list.vue
@@ -100,9 +100,7 @@ async function handleDelete() {
     return;
   }
   try {
-    await confirm({
-      content: `你要将${checkedRows.value.map((item) => item.nickname).join(',')}移出团队吗？`,
-    });
+    await confirm(`你要将${checkedRows.value.map((item) => item.nickname).join(',')}移出团队吗？`);
   } catch {
     return false;
   }
diff --git a/apps/web-antd/src/views/erp/finance/account/index.vue b/apps/web-antd/src/views/erp/finance/account/index.vue
index 2a91dbe9a..4c74b625e 100644
--- a/apps/web-antd/src/views/erp/finance/account/index.vue
+++ b/apps/web-antd/src/views/erp/finance/account/index.vue
@@ -67,9 +67,7 @@ async function handleDefaultStatusChange(
 ): Promise<boolean | undefined> {
   const text = newStatus ? '设置' : '取消';
   try {
-    await confirm({
-      content: `确认要${text}"${row.name}"默认吗?`,
-    });
+    await confirm(`确认要${text}"${row.name}"默认吗?`);
   } catch {
     return false;
   }
diff --git a/apps/web-antd/src/views/erp/stock/warehouse/index.vue b/apps/web-antd/src/views/erp/stock/warehouse/index.vue
index 560918fb5..2ef04503e 100644
--- a/apps/web-antd/src/views/erp/stock/warehouse/index.vue
+++ b/apps/web-antd/src/views/erp/stock/warehouse/index.vue
@@ -65,9 +65,7 @@ async function handleDefaultStatusChange(
 ): Promise<boolean | undefined> {
   const text = newStatus ? '设置' : '取消';
   try {
-    await confirm({
-      content: `确认要${text}"${row.name}"默认吗?`,
-    });
+    await confirm(`确认要${text}"${row.name}"默认吗?`);
   } catch {
     return false;
   }
diff --git a/apps/web-antd/src/views/infra/apiErrorLog/index.vue b/apps/web-antd/src/views/infra/apiErrorLog/index.vue
index c84d0d44e..304395b36 100644
--- a/apps/web-antd/src/views/infra/apiErrorLog/index.vue
+++ b/apps/web-antd/src/views/infra/apiErrorLog/index.vue
@@ -42,9 +42,7 @@ function handleDetail(row: InfraApiErrorLogApi.ApiErrorLog) {
 
 /** 处理已处理 / 已忽略的操作 */
 async function handleProcess(id: number, processStatus: number) {
-  await confirm({
-    content: `确认标记为${InfraApiErrorLogProcessStatusEnum.DONE ? '已处理' : '已忽略'}?`,
-  });
+  await confirm(`确认标记为${InfraApiErrorLogProcessStatusEnum.DONE ? '已处理' : '已忽略'}?`);
   const hideLoading = message.loading({
     content: '正在处理中...',
     duration: 0,
diff --git a/apps/web-antd/src/views/iot/device/device/detail/modules/modbus-config.vue b/apps/web-antd/src/views/iot/device/device/detail/modules/modbus-config.vue
index ce4d907d8..e992978b0 100644
--- a/apps/web-antd/src/views/iot/device/device/detail/modules/modbus-config.vue
+++ b/apps/web-antd/src/views/iot/device/device/detail/modules/modbus-config.vue
@@ -285,7 +285,7 @@ function handleEditPoint(row: IotDeviceModbusPointApi.ModbusPoint) {
 
 /** 删除点位 */
 async function handleDeletePoint(row: IotDeviceModbusPointApi.ModbusPoint) {
-  await confirm({ content: `确定要删除点位【${row.name}】吗？` });
+  await confirm(`确定要删除点位【${row.name}】吗？`);
   await deleteModbusPoint(row.id!);
   message.success('删除成功');
   await gridApi.query();
diff --git a/apps/web-antd/src/views/iot/device/device/detail/modules/sub-device.vue b/apps/web-antd/src/views/iot/device/device/detail/modules/sub-device.vue
index 8515630fa..a52097527 100644
--- a/apps/web-antd/src/views/iot/device/device/detail/modules/sub-device.vue
+++ b/apps/web-antd/src/views/iot/device/device/detail/modules/sub-device.vue
@@ -126,7 +126,7 @@ function handleRowCheckboxChange({
 
 /** 解绑单个设备 */
 async function handleUnbind(row: IotDeviceApi.Device) {
-  await confirm({ content: `确定要解绑子设备【${row.deviceName}】吗？` });
+  await confirm(`确定要解绑子设备【${row.deviceName}】吗？`);
   const hideLoading = message.loading({
     content: `正在解绑【${row.deviceName}】...`,
     duration: 0,
@@ -142,9 +142,7 @@ async function handleUnbind(row: IotDeviceApi.Device) {
 
 /** 批量解绑 */
 async function handleUnbindBatch() {
-  await confirm({
-    content: `确定要解绑选中的 ${checkedIds.value.length} 个子设备吗？`,
-  });
+  await confirm(`确定要解绑选中的 ${checkedIds.value.length} 个子设备吗？`);
   const hideLoading = message.loading({
     content: '正在批量解绑...',
     duration: 0,
diff --git a/apps/web-antd/src/views/mall/product/comment/index.vue b/apps/web-antd/src/views/mall/product/comment/index.vue
index e10ae6326..d02d980ad 100644
--- a/apps/web-antd/src/views/mall/product/comment/index.vue
+++ b/apps/web-antd/src/views/mall/product/comment/index.vue
@@ -65,9 +65,7 @@ async function handleStatusChange(
 ): Promise<boolean | undefined> {
   const text = newStatus ? '展示' : '隐藏';
   try {
-    await confirm({
-      content: `确认要${text}该评论吗？`,
-    });
+    await confirm(`确认要${text}该评论吗？`);
   } catch {
     return false;
   }
diff --git a/apps/web-antd/src/views/mall/product/spu/index.vue b/apps/web-antd/src/views/mall/product/spu/index.vue
index 205bc8174..2be71cae1 100644
--- a/apps/web-antd/src/views/mall/product/spu/index.vue
+++ b/apps/web-antd/src/views/mall/product/spu/index.vue
@@ -110,9 +110,7 @@ async function handleStatusChange(
   // 二次确认
   const text = newStatus ? '上架' : '下架';
   try {
-    await confirm({
-      content: `确认要${text + row.name}吗?`,
-    });
+    await confirm(`确认要${text + row.name}吗?`);
   } catch {
     return false;
   }
@@ -132,9 +130,7 @@ async function handleStatus02Change(row: MallSpuApi.Spu, newStatus: number) {
     newStatus === ProductSpuStatusEnum.RECYCLE.status
       ? '加入到回收站'
       : '恢复到仓库';
-  await confirm({
-    content: `确认要"${row.name}"${text}吗？`,
-  });
+  await confirm(`确认要"${row.name}"${text}吗？`);
   const hideLoading = message.loading({
     content: `正在${text}中...`,
     duration: 0,
diff --git a/apps/web-antd/src/views/mall/promotion/coupon/template/index.vue b/apps/web-antd/src/views/mall/promotion/coupon/template/index.vue
index b6a01d3c7..1d009535c 100644
--- a/apps/web-antd/src/views/mall/promotion/coupon/template/index.vue
+++ b/apps/web-antd/src/views/mall/promotion/coupon/template/index.vue
@@ -61,9 +61,7 @@ async function handleStatusChange(
   row: MallCouponTemplateApi.CouponTemplate,
 ): Promise<boolean | undefined> {
   try {
-    await confirm({
-      content: `你要将${row.name}的状态切换为【${newStatus === CommonStatusEnum.ENABLE ? '启用' : '停用'}】吗？`,
-    });
+    await confirm(`你要将${row.name}的状态切换为【${newStatus === CommonStatusEnum.ENABLE ? '启用' : '停用'}】吗？`);
   } catch {
     return false;
   }
diff --git a/apps/web-antd/src/views/mall/promotion/kefu/modules/conversation-list.vue b/apps/web-antd/src/views/mall/promotion/kefu/modules/conversation-list.vue
index 174d845a3..b8460957b 100644
--- a/apps/web-antd/src/views/mall/promotion/kefu/modules/conversation-list.vue
+++ b/apps/web-antd/src/views/mall/promotion/kefu/modules/conversation-list.vue
@@ -125,9 +125,7 @@ async function updateConversationPinnedFn(pinned: boolean) {
 /** 删除会话 */
 async function deleteConversationFn() {
   // 1. 删除会话
-  confirm({
-    content: '您确定要删除该会话吗？',
-  }).then(async () => {
+  confirm('您确定要删除该会话吗？').then(async () => {
     await deleteConversation(rightClickConversation.value.id);
     // 2. 关闭右键菜单，更新会话列表
     closeRightMenu();
diff --git a/apps/web-antd/src/views/mall/promotion/seckill/config/index.vue b/apps/web-antd/src/views/mall/promotion/seckill/config/index.vue
index 61dbd8319..dc3738f8e 100644
--- a/apps/web-antd/src/views/mall/promotion/seckill/config/index.vue
+++ b/apps/web-antd/src/views/mall/promotion/seckill/config/index.vue
@@ -62,9 +62,7 @@ async function handleStatusChange(
   // 二次确认
   const text = row.status === 0 ? '启用' : '停用';
   try {
-    await confirm({
-      content: `确认要${text + row.name}吗?`,
-    });
+    await confirm(`确认要${text + row.name}吗?`);
   } catch {
     return false;
   }
diff --git a/apps/web-antd/src/views/mall/statistics/product/modules/summary-card.vue b/apps/web-antd/src/views/mall/statistics/product/modules/summary-card.vue
index b38b4517a..d0aa5aae6 100644
--- a/apps/web-antd/src/views/mall/statistics/product/modules/summary-card.vue
+++ b/apps/web-antd/src/views/mall/statistics/product/modules/summary-card.vue
@@ -104,9 +104,7 @@ async function loadProductStatisticsList() {
 async function handleExport() {
   try {
     // 导出的二次确认
-    await confirm({
-      content: '确认导出商品状况数据吗？',
-    });
+    await confirm('确认导出商品状况数据吗？');
     // 发起导出
     exportLoading.value = true;
     const data = await exportProductStatisticsExcel({
diff --git a/apps/web-antd/src/views/mall/statistics/trade/modules/trend-card.vue b/apps/web-antd/src/views/mall/statistics/trade/modules/trend-card.vue
index 3d300dfca..d93103565 100644
--- a/apps/web-antd/src/views/mall/statistics/trade/modules/trend-card.vue
+++ b/apps/web-antd/src/views/mall/statistics/trade/modules/trend-card.vue
@@ -107,9 +107,7 @@ async function loadTradeStatisticsList() {
 async function handleExport() {
   try {
     // 导出的二次确认
-    await confirm({
-      content: '确认导出交易状况数据吗？',
-    });
+    await confirm('确认导出交易状况数据吗？');
     // 发起导出
     exportLoading.value = true;
     const data = await exportTradeStatisticsExcel({
diff --git a/apps/web-antd/src/views/mall/trade/brokerage/user/index.vue b/apps/web-antd/src/views/mall/trade/brokerage/user/index.vue
index 26682725d..ddd69bf90 100644
--- a/apps/web-antd/src/views/mall/trade/brokerage/user/index.vue
+++ b/apps/web-antd/src/views/mall/trade/brokerage/user/index.vue
@@ -89,9 +89,7 @@ async function handleBrokerageEnabledChange(
 ): Promise<boolean | undefined> {
   const text = newEnabled ? '开通' : '关闭';
   try {
-    await confirm({
-      content: `你要将${row.nickname}的推广资格切换为【${text}】吗？`,
-    });
+    await confirm(`你要将${row.nickname}的推广资格切换为【${text}】吗？`);
   } catch {
     return false;
   }
diff --git a/apps/web-antd/src/views/mes/qc/iqc/modules/form.vue b/apps/web-antd/src/views/mes/qc/iqc/modules/form.vue
index c02426f04..ad3f767d9 100644
--- a/apps/web-antd/src/views/mes/qc/iqc/modules/form.vue
+++ b/apps/web-antd/src/views/mes/qc/iqc/modules/form.vue
@@ -106,9 +106,11 @@ async function handleFinish() {
   if (!valid) {
     return;
   }
-  await confirm({
-    content: '是否完成来料检验单编制？【完成后将不能更改】',
-  });
+  try {
+    await confirm('是否完成来料检验单编制？【完成后将不能更改】');
+  } catch {
+    return;
+  }
   modalApi.lock();
   try {
     const current = JSON.stringify(await formApi.getValues());
@@ -135,10 +137,12 @@ const [Modal, modalApi] = useVbenModal({
     }
     modalApi.lock();
     try {
+      // 提交表单
       const ok = await handleSubmit();
       if (!ok) {
         return;
       }
+      // 关闭并提示
       message.success($t('ui.actionMessage.operationSuccess'));
       await modalApi.close();
       emit('success');
@@ -167,6 +171,7 @@ const [Modal, modalApi] = useVbenModal({
       modalApi.lock();
       try {
         formData.value = await getIqc(data.id);
+        // 设置到 values
         await formApi.setValues(formData.value);
       } finally {
         modalApi.unlock();
@@ -174,6 +179,7 @@ const [Modal, modalApi] = useVbenModal({
     } else if (data?.prefill) {
       // 预填模式：来自待检任务
       formData.value = { ...data.prefill };
+      // 设置到 values
       await formApi.setValues(data.prefill);
     }
     // 记录初始快照，后续 finish 用于判断是否需要再保存
diff --git a/apps/web-antd/src/views/mes/qc/oqc/modules/form.vue b/apps/web-antd/src/views/mes/qc/oqc/modules/form.vue
index f6e737cce..f9f4efc58 100644
--- a/apps/web-antd/src/views/mes/qc/oqc/modules/form.vue
+++ b/apps/web-antd/src/views/mes/qc/oqc/modules/form.vue
@@ -100,9 +100,11 @@ async function handleFinish() {
   if (!valid) {
     return;
   }
-  await confirm({
-    content: '是否完成出货检验单编制？【完成后将不能更改】',
-  });
+  try {
+    await confirm('是否完成出货检验单编制？【完成后将不能更改】');
+  } catch {
+    return;
+  }
   modalApi.lock();
   try {
     const current = JSON.stringify(await formApi.getValues());
@@ -121,7 +123,6 @@ async function handleFinish() {
   }
 }
 
-// TODO @AI：方法内注释；
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     if (isDetail.value) {
@@ -130,10 +131,12 @@ const [Modal, modalApi] = useVbenModal({
     }
     modalApi.lock();
     try {
+      // 提交表单
       const ok = await handleSubmit();
       if (!ok) {
         return;
       }
+      // 关闭并提示
       message.success($t('ui.actionMessage.operationSuccess'));
       await modalApi.close();
       emit('success');
@@ -149,6 +152,7 @@ const [Modal, modalApi] = useVbenModal({
     }
     formApi.setState({ schema: useFormSchema(formApi) });
     subTabsName.value = 'line';
+    // 加载数据
     const data = modalApi.getData<{
       formType: FormType;
       id?: number;
@@ -161,12 +165,15 @@ const [Modal, modalApi] = useVbenModal({
       modalApi.lock();
       try {
         formData.value = await getOqc(data.id);
+        // 设置到 values
         await formApi.setValues(formData.value);
       } finally {
         modalApi.unlock();
       }
     } else if (data?.prefill) {
+      // 预填模式：来自待检任务
       formData.value = { ...data.prefill };
+      // 设置到 values
       await formApi.setValues(data.prefill);
     }
     originalSnapshot.value = JSON.stringify(await formApi.getValues());
diff --git a/apps/web-antd/src/views/mes/qc/rqc/modules/form.vue b/apps/web-antd/src/views/mes/qc/rqc/modules/form.vue
index 2d8efce96..40e27ce12 100644
--- a/apps/web-antd/src/views/mes/qc/rqc/modules/form.vue
+++ b/apps/web-antd/src/views/mes/qc/rqc/modules/form.vue
@@ -100,10 +100,11 @@ async function handleFinish() {
   if (!valid) {
     return;
   }
-  // TODO @AI：这种类型，可以简化成 await confirm('')；如果可以，写到 style vue 里；然后把相关的类似情况，都一次性改掉；
-  await confirm({
-    content: '是否完成退货检验单编制？【完成后将不能更改】',
-  });
+  try {
+    await confirm('是否完成退货检验单编制？【完成后将不能更改】');
+  } catch {
+    return;
+  }
   modalApi.lock();
   try {
     const current = JSON.stringify(await formApi.getValues());
@@ -122,7 +123,6 @@ async function handleFinish() {
   }
 }
 
-// TODO @AI：方法内注释；
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     if (isDetail.value) {
@@ -131,10 +131,12 @@ const [Modal, modalApi] = useVbenModal({
     }
     modalApi.lock();
     try {
+      // 提交表单
       const ok = await handleSubmit();
       if (!ok) {
         return;
       }
+      // 关闭并提示
       message.success($t('ui.actionMessage.operationSuccess'));
       await modalApi.close();
       emit('success');
@@ -150,6 +152,7 @@ const [Modal, modalApi] = useVbenModal({
     }
     formApi.setState({ schema: useFormSchema(formApi) });
     subTabsName.value = 'line';
+    // 加载数据
     const data = modalApi.getData<{
       formType: FormType;
       id?: number;
@@ -162,12 +165,15 @@ const [Modal, modalApi] = useVbenModal({
       modalApi.lock();
       try {
         formData.value = await getRqc(data.id);
+        // 设置到 values
         await formApi.setValues(formData.value);
       } finally {
         modalApi.unlock();
       }
     } else if (data?.prefill) {
+      // 预填模式：来自待检任务
       formData.value = { ...data.prefill };
+      // 设置到 values
       await formApi.setValues(data.prefill);
     }
     originalSnapshot.value = JSON.stringify(await formApi.getValues());
diff --git a/apps/web-antd/src/views/pay/app/index.vue b/apps/web-antd/src/views/pay/app/index.vue
index 92fbc6f64..8ae30bc53 100644
--- a/apps/web-antd/src/views/pay/app/index.vue
+++ b/apps/web-antd/src/views/pay/app/index.vue
@@ -67,9 +67,7 @@ async function handleStatusChange(
 ): Promise<boolean | undefined> {
   const text = newStatus === CommonStatusEnum.ENABLE ? '启用' : '停用';
   try {
-    await confirm({
-      content: `确认要${text + row.name}应用吗?`,
-    });
+    await confirm(`确认要${text + row.name}应用吗?`);
   } catch {
     return false;
   }
diff --git a/apps/web-antd/src/views/system/user/index.vue b/apps/web-antd/src/views/system/user/index.vue
index 0da0f2d0d..0f00777aa 100644
--- a/apps/web-antd/src/views/system/user/index.vue
+++ b/apps/web-antd/src/views/system/user/index.vue
@@ -139,9 +139,7 @@ async function handleStatusChange(
   row: SystemUserApi.User,
 ): Promise<boolean | undefined> {
   try {
-    await confirm({
-      content: `你要将${row.username}的状态切换为【${getDictLabel(DICT_TYPE.COMMON_STATUS, newStatus)}】吗？`,
-    });
+    await confirm(`你要将${row.username}的状态切换为【${getDictLabel(DICT_TYPE.COMMON_STATUS, newStatus)}】吗？`);
   } catch {
     return false;
   }
diff --git a/apps/web-ele/src/views/_core/profile/modules/user-social.vue b/apps/web-ele/src/views/_core/profile/modules/user-social.vue
index ada4186d8..e3555b81b 100644
--- a/apps/web-ele/src/views/_core/profile/modules/user-social.vue
+++ b/apps/web-ele/src/views/_core/profile/modules/user-social.vue
@@ -105,9 +105,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
 
 /** 解绑账号 */
 function onUnbind(row: SystemSocialUserApi.SocialUser) {
-  confirm({
-    content: `确定解绑[${getDictLabel(DICT_TYPE.SYSTEM_SOCIAL_TYPE, row.type)}]平台的[${row.openid}]账号吗？`,
-  }).then(async () => {
+  confirm(`确定解绑[${getDictLabel(DICT_TYPE.SYSTEM_SOCIAL_TYPE, row.type)}]平台的[${row.openid}]账号吗？`).then(async () => {
     await socialUnbind({ type: row.type, openid: row.openid });
     // 提示成功
     ElMessage.success($t('ui.actionMessage.operationSuccess'));
diff --git a/apps/web-ele/src/views/ai/image/manager/index.vue b/apps/web-ele/src/views/ai/image/manager/index.vue
index 6544bc146..d2936d416 100644
--- a/apps/web-ele/src/views/ai/image/manager/index.vue
+++ b/apps/web-ele/src/views/ai/image/manager/index.vue
@@ -38,9 +38,7 @@ async function handleUpdatePublicStatusChange(
 ): Promise<boolean | undefined> {
   const text = newStatus ? '公开' : '私有';
   try {
-    await confirm({
-      content: `确认要将该图片切换为【${text}】吗？`,
-    });
+    await confirm(`确认要将该图片切换为【${text}】吗？`);
   } catch {
     return false;
   }
diff --git a/apps/web-ele/src/views/ai/knowledge/document/index.vue b/apps/web-ele/src/views/ai/knowledge/document/index.vue
index 2e8ca97c4..1354763fc 100644
--- a/apps/web-ele/src/views/ai/knowledge/document/index.vue
+++ b/apps/web-ele/src/views/ai/knowledge/document/index.vue
@@ -76,9 +76,7 @@ async function handleStatusChange(
   row: AiKnowledgeDocumentApi.KnowledgeDocument,
 ): Promise<boolean | undefined> {
   try {
-    await confirm({
-      content: `你要将${row.name}的状态切换为【${getDictLabel(DICT_TYPE.COMMON_STATUS, newStatus)}】吗？`,
-    });
+    await confirm(`你要将${row.name}的状态切换为【${getDictLabel(DICT_TYPE.COMMON_STATUS, newStatus)}】吗？`);
   } catch {
     return false;
   }
diff --git a/apps/web-ele/src/views/ai/knowledge/segment/index.vue b/apps/web-ele/src/views/ai/knowledge/segment/index.vue
index b74f75542..528c6b66e 100644
--- a/apps/web-ele/src/views/ai/knowledge/segment/index.vue
+++ b/apps/web-ele/src/views/ai/knowledge/segment/index.vue
@@ -64,9 +64,7 @@ async function handleStatusChange(
   row: AiKnowledgeSegmentApi.KnowledgeSegment,
 ): Promise<boolean | undefined> {
   try {
-    await confirm({
-      content: `你要将片段 ${row.id} 的状态切换为【${getDictLabel(DICT_TYPE.COMMON_STATUS, newStatus)}】吗？`,
-    });
+    await confirm(`你要将片段 ${row.id} 的状态切换为【${getDictLabel(DICT_TYPE.COMMON_STATUS, newStatus)}】吗？`);
   } catch {
     return false;
   }
diff --git a/apps/web-ele/src/views/ai/music/manager/index.vue b/apps/web-ele/src/views/ai/music/manager/index.vue
index d4d966d40..719681e4d 100644
--- a/apps/web-ele/src/views/ai/music/manager/index.vue
+++ b/apps/web-ele/src/views/ai/music/manager/index.vue
@@ -38,9 +38,7 @@ async function handleUpdatePublicStatusChange(
 ): Promise<boolean | undefined> {
   const text = newStatus ? '公开' : '私有';
   try {
-    await confirm({
-      content: `确认要将该音乐切换为【${text}】吗？`,
-    });
+    await confirm(`确认要将该音乐切换为【${text}】吗？`);
   } catch {
     return false;
   }
diff --git a/apps/web-ele/src/views/crm/business/components/detail-list.vue b/apps/web-ele/src/views/crm/business/components/detail-list.vue
index c89172b11..6b2af7f38 100644
--- a/apps/web-ele/src/views/crm/business/components/detail-list.vue
+++ b/apps/web-ele/src/views/crm/business/components/detail-list.vue
@@ -75,9 +75,7 @@ async function handleDeleteContactBusinessList() {
     return;
   }
   try {
-    await confirm({
-      content: `确定要将${checkedRows.value.map((item) => item.name).join(',')}解除关联吗？`,
-    });
+    await confirm(`确定要将${checkedRows.value.map((item) => item.name).join(',')}解除关联吗？`);
   } catch {
     return false;
   }
diff --git a/apps/web-ele/src/views/crm/clue/detail/index.vue b/apps/web-ele/src/views/crm/clue/detail/index.vue
index 0d95f5edb..d723deacd 100644
--- a/apps/web-ele/src/views/crm/clue/detail/index.vue
+++ b/apps/web-ele/src/views/crm/clue/detail/index.vue
@@ -85,9 +85,7 @@ function handleTransfer() {
 /** 转化为客户 */
 async function handleTransform(): Promise<boolean | undefined> {
   try {
-    await confirm({
-      content: '确定将该线索转化为客户吗？',
-    });
+    await confirm('确定将该线索转化为客户吗？');
   } catch {
     return false;
   }
diff --git a/apps/web-ele/src/views/crm/contact/components/detail-list.vue b/apps/web-ele/src/views/crm/contact/components/detail-list.vue
index 71f65066d..f3a5c1b92 100644
--- a/apps/web-ele/src/views/crm/contact/components/detail-list.vue
+++ b/apps/web-ele/src/views/crm/contact/components/detail-list.vue
@@ -72,9 +72,7 @@ async function handleDeleteContactBusinessList() {
     return;
   }
   try {
-    await confirm({
-      content: `确定要将${checkedRows.value.map((item) => item.name).join(',')}解除关联吗？`,
-    });
+    await confirm(`确定要将${checkedRows.value.map((item) => item.name).join(',')}解除关联吗？`);
   } catch {
     return false;
   }
diff --git a/apps/web-ele/src/views/crm/customer/detail/index.vue b/apps/web-ele/src/views/crm/customer/detail/index.vue
index 594a7c9a0..9b0d05d96 100644
--- a/apps/web-ele/src/views/crm/customer/detail/index.vue
+++ b/apps/web-ele/src/views/crm/customer/detail/index.vue
@@ -103,9 +103,7 @@ function handleTransfer() {
 /** 锁定客户 */
 async function handleLock(lockStatus: boolean): Promise<boolean | undefined> {
   try {
-    await confirm({
-      content: `确定锁定客户【${customer.value.name}】吗？`,
-    });
+    await confirm(`确定锁定客户【${customer.value.name}】吗？`);
   } catch {
     return false;
   }
@@ -119,9 +117,7 @@ async function handleLock(lockStatus: boolean): Promise<boolean | undefined> {
 /** 领取客户 */
 async function handleReceive(): Promise<boolean | undefined> {
   try {
-    await confirm({
-      content: `确定领取客户【${customer.value.name}】吗？`,
-    });
+    await confirm(`确定领取客户【${customer.value.name}】吗？`);
   } catch {
     return false;
   }
@@ -140,9 +136,7 @@ function handleDistributeForm() {
 /** 客户放入公海 */
 async function handlePutPool(): Promise<boolean | undefined> {
   try {
-    await confirm({
-      content: `确定将客户【${customer.value.name}】放入公海吗？`,
-    });
+    await confirm(`确定将客户【${customer.value.name}】放入公海吗？`);
   } catch {
     return false;
   }
@@ -157,9 +151,7 @@ async function handlePutPool(): Promise<boolean | undefined> {
 async function handleUpdateDealStatus(): Promise<boolean | undefined> {
   const dealStatus = !customer.value.dealStatus;
   try {
-    await confirm({
-      content: `确定更新成交状态为【${dealStatus ? '已成交' : '未成交'}】吗？`,
-    });
+    await confirm(`确定更新成交状态为【${dealStatus ? '已成交' : '未成交'}】吗？`);
   } catch {
     return false;
   }
diff --git a/apps/web-ele/src/views/crm/permission/modules/list.vue b/apps/web-ele/src/views/crm/permission/modules/list.vue
index 21eec5726..8235e1975 100644
--- a/apps/web-ele/src/views/crm/permission/modules/list.vue
+++ b/apps/web-ele/src/views/crm/permission/modules/list.vue
@@ -100,9 +100,7 @@ async function handleDelete() {
     return;
   }
   try {
-    await confirm({
-      content: `你要将${checkedRows.value.map((item) => item.nickname).join(',')}移出团队吗？`,
-    });
+    await confirm(`你要将${checkedRows.value.map((item) => item.nickname).join(',')}移出团队吗？`);
   } catch {
     return false;
   }
diff --git a/apps/web-ele/src/views/erp/finance/account/index.vue b/apps/web-ele/src/views/erp/finance/account/index.vue
index 47c1e45a2..73da766da 100644
--- a/apps/web-ele/src/views/erp/finance/account/index.vue
+++ b/apps/web-ele/src/views/erp/finance/account/index.vue
@@ -66,9 +66,7 @@ async function handleDefaultStatusChange(
 ): Promise<boolean | undefined> {
   const text = newStatus ? '设置' : '取消';
   try {
-    await confirm({
-      content: `确认要${text}"${row.name}"默认吗?`,
-    });
+    await confirm(`确认要${text}"${row.name}"默认吗?`);
   } catch {
     return false;
   }
diff --git a/apps/web-ele/src/views/erp/stock/warehouse/index.vue b/apps/web-ele/src/views/erp/stock/warehouse/index.vue
index 5373fc1f2..965beaa0c 100644
--- a/apps/web-ele/src/views/erp/stock/warehouse/index.vue
+++ b/apps/web-ele/src/views/erp/stock/warehouse/index.vue
@@ -64,9 +64,7 @@ async function handleDefaultStatusChange(
 ): Promise<boolean | undefined> {
   const text = newStatus ? '设置' : '取消';
   try {
-    await confirm({
-      content: `确认要${text}"${row.name}"默认吗?`,
-    });
+    await confirm(`确认要${text}"${row.name}"默认吗?`);
   } catch {
     return false;
   }
diff --git a/apps/web-ele/src/views/infra/apiErrorLog/index.vue b/apps/web-ele/src/views/infra/apiErrorLog/index.vue
index 964217c5d..de0b677f8 100644
--- a/apps/web-ele/src/views/infra/apiErrorLog/index.vue
+++ b/apps/web-ele/src/views/infra/apiErrorLog/index.vue
@@ -42,9 +42,7 @@ function handleDetail(row: InfraApiErrorLogApi.ApiErrorLog) {
 
 /** 处理已处理 / 已忽略的操作 */
 async function handleProcess(id: number, processStatus: number) {
-  await confirm({
-    content: `确认标记为${InfraApiErrorLogProcessStatusEnum.DONE ? '已处理' : '已忽略'}?`,
-  });
+  await confirm(`确认标记为${InfraApiErrorLogProcessStatusEnum.DONE ? '已处理' : '已忽略'}?`);
   const loadingInstance = ElLoading.service({
     text: '正在处理中...',
   });
diff --git a/apps/web-ele/src/views/iot/device/device/detail/modules/modbus-config.vue b/apps/web-ele/src/views/iot/device/device/detail/modules/modbus-config.vue
index 64699dbbe..22709fe0c 100644
--- a/apps/web-ele/src/views/iot/device/device/detail/modules/modbus-config.vue
+++ b/apps/web-ele/src/views/iot/device/device/detail/modules/modbus-config.vue
@@ -285,7 +285,7 @@ function handleEditPoint(row: IotDeviceModbusPointApi.ModbusPoint) {
 
 /** 删除点位 */
 async function handleDeletePoint(row: IotDeviceModbusPointApi.ModbusPoint) {
-  await confirm({ content: `确定要删除点位【${row.name}】吗？` });
+  await confirm(`确定要删除点位【${row.name}】吗？`);
   await deleteModbusPoint(row.id!);
   ElMessage.success('删除成功');
   await gridApi.query();
diff --git a/apps/web-ele/src/views/iot/device/device/detail/modules/sub-device.vue b/apps/web-ele/src/views/iot/device/device/detail/modules/sub-device.vue
index 8a5c32479..918440410 100644
--- a/apps/web-ele/src/views/iot/device/device/detail/modules/sub-device.vue
+++ b/apps/web-ele/src/views/iot/device/device/detail/modules/sub-device.vue
@@ -126,7 +126,7 @@ function handleRowCheckboxChange({
 
 /** 解绑单个设备 */
 async function handleUnbind(row: IotDeviceApi.Device) {
-  await confirm({ content: `确定要解绑子设备【${row.deviceName}】吗？` });
+  await confirm(`确定要解绑子设备【${row.deviceName}】吗？`);
   const loadingInstance = ElLoading.service({
     text: `正在解绑【${row.deviceName}】...`,
   });
@@ -141,9 +141,7 @@ async function handleUnbind(row: IotDeviceApi.Device) {
 
 /** 批量解绑 */
 async function handleUnbindBatch() {
-  await confirm({
-    content: `确定要解绑选中的 ${checkedIds.value.length} 个子设备吗？`,
-  });
+  await confirm(`确定要解绑选中的 ${checkedIds.value.length} 个子设备吗？`);
   const loadingInstance = ElLoading.service({
     text: '正在批量解绑...',
   });
diff --git a/apps/web-ele/src/views/mall/product/comment/index.vue b/apps/web-ele/src/views/mall/product/comment/index.vue
index ea8baced0..b8b261ca9 100644
--- a/apps/web-ele/src/views/mall/product/comment/index.vue
+++ b/apps/web-ele/src/views/mall/product/comment/index.vue
@@ -64,9 +64,7 @@ async function handleStatusChange(
 ): Promise<boolean | undefined> {
   const text = newStatus ? '展示' : '隐藏';
   try {
-    await confirm({
-      content: `确认要${text}该评论吗？`,
-    });
+    await confirm(`确认要${text}该评论吗？`);
   } catch {
     return false;
   }
diff --git a/apps/web-ele/src/views/mall/product/spu/index.vue b/apps/web-ele/src/views/mall/product/spu/index.vue
index 9d436759c..d9fe81cbf 100644
--- a/apps/web-ele/src/views/mall/product/spu/index.vue
+++ b/apps/web-ele/src/views/mall/product/spu/index.vue
@@ -109,9 +109,7 @@ async function handleStatusChange(
   // 二次确认
   const text = newStatus ? '上架' : '下架';
   try {
-    await confirm({
-      content: `确认要${text + row.name}吗?`,
-    });
+    await confirm(`确认要${text + row.name}吗?`);
   } catch {
     return false;
   }
@@ -131,9 +129,7 @@ async function handleStatus02Change(row: MallSpuApi.Spu, newStatus: number) {
     newStatus === ProductSpuStatusEnum.RECYCLE.status
       ? '加入到回收站'
       : '恢复到仓库';
-  await confirm({
-    content: `确认要"${row.name}"${text}吗？`,
-  });
+  await confirm(`确认要"${row.name}"${text}吗？`);
   const loadingInstance = ElLoading.service({
     text: `正在${text}中...`,
   });
diff --git a/apps/web-ele/src/views/mall/promotion/coupon/template/index.vue b/apps/web-ele/src/views/mall/promotion/coupon/template/index.vue
index dcda02261..90719c484 100644
--- a/apps/web-ele/src/views/mall/promotion/coupon/template/index.vue
+++ b/apps/web-ele/src/views/mall/promotion/coupon/template/index.vue
@@ -60,9 +60,7 @@ async function handleStatusChange(
   row: MallCouponTemplateApi.CouponTemplate,
 ): Promise<boolean | undefined> {
   try {
-    await confirm({
-      content: `你要将${row.name}的状态切换为【${newStatus === CommonStatusEnum.ENABLE ? '启用' : '停用'}】吗？`,
-    });
+    await confirm(`你要将${row.name}的状态切换为【${newStatus === CommonStatusEnum.ENABLE ? '启用' : '停用'}】吗？`);
   } catch {
     return false;
   }
diff --git a/apps/web-ele/src/views/mall/promotion/kefu/modules/conversation-list.vue b/apps/web-ele/src/views/mall/promotion/kefu/modules/conversation-list.vue
index 9f22f84b6..ca38ca6bf 100644
--- a/apps/web-ele/src/views/mall/promotion/kefu/modules/conversation-list.vue
+++ b/apps/web-ele/src/views/mall/promotion/kefu/modules/conversation-list.vue
@@ -125,9 +125,7 @@ async function updateConversationPinnedFn(pinned: boolean) {
 /** 删除会话 */
 async function deleteConversationFn() {
   // 1. 删除会话
-  confirm({
-    content: '您确定要删除该会话吗？',
-  }).then(async () => {
+  confirm('您确定要删除该会话吗？').then(async () => {
     await deleteConversation(rightClickConversation.value.id);
     // 2. 关闭右键菜单，更新会话列表
     closeRightMenu();
diff --git a/apps/web-ele/src/views/mall/promotion/seckill/config/index.vue b/apps/web-ele/src/views/mall/promotion/seckill/config/index.vue
index 068bf5209..4dc206dd7 100644
--- a/apps/web-ele/src/views/mall/promotion/seckill/config/index.vue
+++ b/apps/web-ele/src/views/mall/promotion/seckill/config/index.vue
@@ -59,9 +59,7 @@ async function handleStatusChange(
   // 二次确认
   const text = row.status === 0 ? '启用' : '停用';
   try {
-    await confirm({
-      content: `确认要${text + row.name}吗?`,
-    });
+    await confirm(`确认要${text + row.name}吗?`);
   } catch {
     return false;
   }
diff --git a/apps/web-ele/src/views/mall/statistics/product/modules/summary-card.vue b/apps/web-ele/src/views/mall/statistics/product/modules/summary-card.vue
index 5d6b9bffe..18584cca4 100644
--- a/apps/web-ele/src/views/mall/statistics/product/modules/summary-card.vue
+++ b/apps/web-ele/src/views/mall/statistics/product/modules/summary-card.vue
@@ -104,9 +104,7 @@ async function loadProductStatisticsList() {
 async function handleExport() {
   try {
     // 导出的二次确认
-    await confirm({
-      content: '确认导出商品状况数据吗？',
-    });
+    await confirm('确认导出商品状况数据吗？');
     // 发起导出
     exportLoading.value = true;
     const data = await exportProductStatisticsExcel({
diff --git a/apps/web-ele/src/views/mall/statistics/trade/modules/trend-card.vue b/apps/web-ele/src/views/mall/statistics/trade/modules/trend-card.vue
index 8dd3f2759..40f928430 100644
--- a/apps/web-ele/src/views/mall/statistics/trade/modules/trend-card.vue
+++ b/apps/web-ele/src/views/mall/statistics/trade/modules/trend-card.vue
@@ -107,9 +107,7 @@ async function loadTradeStatisticsList() {
 async function handleExport() {
   try {
     // 导出的二次确认
-    await confirm({
-      content: '确认导出交易状况数据吗？',
-    });
+    await confirm('确认导出交易状况数据吗？');
     // 发起导出
     exportLoading.value = true;
     const data = await exportTradeStatisticsExcel({
diff --git a/apps/web-ele/src/views/mall/trade/brokerage/user/index.vue b/apps/web-ele/src/views/mall/trade/brokerage/user/index.vue
index a8ad43da0..1a90b9302 100644
--- a/apps/web-ele/src/views/mall/trade/brokerage/user/index.vue
+++ b/apps/web-ele/src/views/mall/trade/brokerage/user/index.vue
@@ -88,9 +88,7 @@ async function handleBrokerageEnabledChange(
 ): Promise<boolean | undefined> {
   const text = newEnabled ? '开通' : '关闭';
   try {
-    await confirm({
-      content: `你要将${row.nickname}的推广资格切换为【${text}】吗？`,
-    });
+    await confirm(`你要将${row.nickname}的推广资格切换为【${text}】吗？`);
   } catch {
     return false;
   }
diff --git a/apps/web-ele/src/views/mes/qc/ipqc/modules/form.vue b/apps/web-ele/src/views/mes/qc/ipqc/modules/form.vue
index 9180f1662..7cfcafc38 100644
--- a/apps/web-ele/src/views/mes/qc/ipqc/modules/form.vue
+++ b/apps/web-ele/src/views/mes/qc/ipqc/modules/form.vue
@@ -107,9 +107,11 @@ async function handleFinish() {
   if (!valid) {
     return;
   }
-  await confirm({
-    content: '是否完成过程检验单编制？【完成后将不能更改】',
-  });
+  try {
+    await confirm('是否完成过程检验单编制？【完成后将不能更改】');
+  } catch {
+    return;
+  }
   modalApi.lock();
   try {
     const current = JSON.stringify(await formApi.getValues());
@@ -136,10 +138,12 @@ const [Modal, modalApi] = useVbenModal({
     }
     modalApi.lock();
     try {
+      // 提交表单
       const ok = await handleSubmit();
       if (!ok) {
         return;
       }
+      // 关闭并提示
       ElMessage.success($t('ui.actionMessage.operationSuccess'));
       await modalApi.close();
       emit('success');
@@ -155,6 +159,7 @@ const [Modal, modalApi] = useVbenModal({
     }
     formApi.setState({ schema: useFormSchema(formApi) });
     subTabsName.value = 'line';
+    // 加载数据
     const data = modalApi.getData<{
       formType: FormType;
       id?: number;
@@ -167,12 +172,15 @@ const [Modal, modalApi] = useVbenModal({
       modalApi.lock();
       try {
         formData.value = await getIpqc(data.id);
+        // 设置到 values
         await formApi.setValues(formData.value);
       } finally {
         modalApi.unlock();
       }
     } else if (data?.prefill) {
+      // 预填模式：来自待检任务
       formData.value = { ...data.prefill };
+      // 设置到 values
       await formApi.setValues(data.prefill);
     }
     originalSnapshot.value = JSON.stringify(await formApi.getValues());
diff --git a/apps/web-ele/src/views/mes/qc/iqc/modules/form.vue b/apps/web-ele/src/views/mes/qc/iqc/modules/form.vue
index 74817b7d6..fdb4dcd8c 100644
--- a/apps/web-ele/src/views/mes/qc/iqc/modules/form.vue
+++ b/apps/web-ele/src/views/mes/qc/iqc/modules/form.vue
@@ -108,9 +108,11 @@ async function handleFinish() {
   if (!valid) {
     return;
   }
-  await confirm({
-    content: '是否完成来料检验单编制？【完成后将不能更改】',
-  });
+  try {
+    await confirm('是否完成来料检验单编制？【完成后将不能更改】');
+  } catch {
+    return;
+  }
   modalApi.lock();
   try {
     const current = JSON.stringify(await formApi.getValues());
@@ -137,10 +139,12 @@ const [Modal, modalApi] = useVbenModal({
     }
     modalApi.lock();
     try {
+      // 提交表单
       const ok = await handleSubmit();
       if (!ok) {
         return;
       }
+      // 关闭并提示
       ElMessage.success($t('ui.actionMessage.operationSuccess'));
       await modalApi.close();
       emit('success');
@@ -169,6 +173,7 @@ const [Modal, modalApi] = useVbenModal({
       modalApi.lock();
       try {
         formData.value = await getIqc(data.id);
+        // 设置到 values
         await formApi.setValues(formData.value);
       } finally {
         modalApi.unlock();
@@ -176,6 +181,7 @@ const [Modal, modalApi] = useVbenModal({
     } else if (data?.prefill) {
       // 预填模式：来自待检任务
       formData.value = { ...data.prefill };
+      // 设置到 values
       await formApi.setValues(data.prefill);
     }
     // 记录初始快照，后续 finish 用于判断是否需要再保存
diff --git a/apps/web-ele/src/views/mes/qc/oqc/modules/form.vue b/apps/web-ele/src/views/mes/qc/oqc/modules/form.vue
index 88d95e6ab..c7067df71 100644
--- a/apps/web-ele/src/views/mes/qc/oqc/modules/form.vue
+++ b/apps/web-ele/src/views/mes/qc/oqc/modules/form.vue
@@ -107,9 +107,11 @@ async function handleFinish() {
   if (!valid) {
     return;
   }
-  await confirm({
-    content: '是否完成出货检验单编制？【完成后将不能更改】',
-  });
+  try {
+    await confirm('是否完成出货检验单编制？【完成后将不能更改】');
+  } catch {
+    return;
+  }
   modalApi.lock();
   try {
     const current = JSON.stringify(await formApi.getValues());
@@ -136,10 +138,12 @@ const [Modal, modalApi] = useVbenModal({
     }
     modalApi.lock();
     try {
+      // 提交表单
       const ok = await handleSubmit();
       if (!ok) {
         return;
       }
+      // 关闭并提示
       ElMessage.success($t('ui.actionMessage.operationSuccess'));
       await modalApi.close();
       emit('success');
@@ -155,6 +159,7 @@ const [Modal, modalApi] = useVbenModal({
     }
     formApi.setState({ schema: useFormSchema(formApi) });
     subTabsName.value = 'line';
+    // 加载数据
     const data = modalApi.getData<{
       formType: FormType;
       id?: number;
@@ -167,12 +172,15 @@ const [Modal, modalApi] = useVbenModal({
       modalApi.lock();
       try {
         formData.value = await getOqc(data.id);
+        // 设置到 values
         await formApi.setValues(formData.value);
       } finally {
         modalApi.unlock();
       }
     } else if (data?.prefill) {
+      // 预填模式：来自待检任务
       formData.value = { ...data.prefill };
+      // 设置到 values
       await formApi.setValues(data.prefill);
     }
     originalSnapshot.value = JSON.stringify(await formApi.getValues());
diff --git a/apps/web-ele/src/views/mes/qc/rqc/modules/form.vue b/apps/web-ele/src/views/mes/qc/rqc/modules/form.vue
index bb2e7d6a2..6ff22a90d 100644
--- a/apps/web-ele/src/views/mes/qc/rqc/modules/form.vue
+++ b/apps/web-ele/src/views/mes/qc/rqc/modules/form.vue
@@ -107,9 +107,11 @@ async function handleFinish() {
   if (!valid) {
     return;
   }
-  await confirm({
-    content: '是否完成退货检验单编制？【完成后将不能更改】',
-  });
+  try {
+    await confirm('是否完成退货检验单编制？【完成后将不能更改】');
+  } catch {
+    return;
+  }
   modalApi.lock();
   try {
     const current = JSON.stringify(await formApi.getValues());
@@ -136,10 +138,12 @@ const [Modal, modalApi] = useVbenModal({
     }
     modalApi.lock();
     try {
+      // 提交表单
       const ok = await handleSubmit();
       if (!ok) {
         return;
       }
+      // 关闭并提示
       ElMessage.success($t('ui.actionMessage.operationSuccess'));
       await modalApi.close();
       emit('success');
@@ -155,6 +159,7 @@ const [Modal, modalApi] = useVbenModal({
     }
     formApi.setState({ schema: useFormSchema(formApi) });
     subTabsName.value = 'line';
+    // 加载数据
     const data = modalApi.getData<{
       formType: FormType;
       id?: number;
@@ -167,12 +172,15 @@ const [Modal, modalApi] = useVbenModal({
       modalApi.lock();
       try {
         formData.value = await getRqc(data.id);
+        // 设置到 values
         await formApi.setValues(formData.value);
       } finally {
         modalApi.unlock();
       }
     } else if (data?.prefill) {
+      // 预填模式：来自待检任务
       formData.value = { ...data.prefill };
+      // 设置到 values
       await formApi.setValues(data.prefill);
     }
     originalSnapshot.value = JSON.stringify(await formApi.getValues());
diff --git a/apps/web-ele/src/views/pay/app/index.vue b/apps/web-ele/src/views/pay/app/index.vue
index c538e16bd..2f291e463 100644
--- a/apps/web-ele/src/views/pay/app/index.vue
+++ b/apps/web-ele/src/views/pay/app/index.vue
@@ -66,9 +66,7 @@ async function handleStatusChange(
 ): Promise<boolean | undefined> {
   const text = newStatus === CommonStatusEnum.ENABLE ? '启用' : '停用';
   try {
-    await confirm({
-      content: `确认要${text + row.name}应用吗?`,
-    });
+    await confirm(`确认要${text + row.name}应用吗?`);
   } catch {
     return false;
   }
diff --git a/apps/web-ele/src/views/system/user/index.vue b/apps/web-ele/src/views/system/user/index.vue
index 2c0ebcbb6..cc22c1a6f 100644
--- a/apps/web-ele/src/views/system/user/index.vue
+++ b/apps/web-ele/src/views/system/user/index.vue
@@ -137,9 +137,7 @@ async function handleStatusChange(
   row: SystemUserApi.User,
 ): Promise<boolean | undefined> {
   try {
-    await confirm({
-      content: `你要将${row.username}的状态切换为【${getDictLabel(DICT_TYPE.COMMON_STATUS, newStatus)}】吗？`,
-    });
+    await confirm(`你要将${row.username}的状态切换为【${getDictLabel(DICT_TYPE.COMMON_STATUS, newStatus)}】吗？`);
   } catch {
     return false;
   }

From f79dffcf2ea0f7f7277fc1b18e3e4e2c114ea8b1 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 29 May 2026 21:10:18 +0800
Subject: [PATCH 16/52] =?UTF-8?q?feat(mes):=20=E8=BF=81=E7=A7=BB=20ipqc?=
 =?UTF-8?q?=E3=80=81oqc=E3=80=81rqc=20=E5=8A=9F=E8=83=BD=EF=BC=88=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/defect-record-inline-list.vue  |   5 +-
 .../src/views/mes/qc/ipqc/modules/form.vue    | 239 ++++++++++++++++++
 .../views/mes/qc/ipqc/modules/line-list.vue   |   4 +-
 .../views/mes/qc/iqc/modules/line-list.vue    |   4 +-
 .../src/views/mes/qc/oqc/modules/form.vue     |   2 +-
 .../views/mes/qc/oqc/modules/line-list.vue    |   4 +-
 .../src/views/mes/qc/rqc/modules/form.vue     |   2 +-
 .../views/mes/qc/rqc/modules/line-list.vue    |   4 +-
 .../components/defect-record-inline-list.vue  |   5 +-
 .../src/views/mes/qc/ipqc/modules/form.vue    |   2 +-
 .../views/mes/qc/ipqc/modules/line-list.vue   |   4 +-
 .../views/mes/qc/iqc/modules/line-list.vue    |   4 +-
 .../src/views/mes/qc/oqc/modules/form.vue     |   2 +-
 .../views/mes/qc/oqc/modules/line-list.vue    |   4 +-
 .../src/views/mes/qc/rqc/modules/form.vue     |   2 +-
 .../views/mes/qc/rqc/modules/line-list.vue    |   4 +-
 16 files changed, 268 insertions(+), 23 deletions(-)
 create mode 100644 apps/web-antd/src/views/mes/qc/ipqc/modules/form.vue

diff --git a/apps/web-antd/src/views/mes/qc/defectrecord/components/defect-record-inline-list.vue b/apps/web-antd/src/views/mes/qc/defectrecord/components/defect-record-inline-list.vue
index 95f338f09..834880e03 100644
--- a/apps/web-antd/src/views/mes/qc/defectrecord/components/defect-record-inline-list.vue
+++ b/apps/web-antd/src/views/mes/qc/defectrecord/components/defect-record-inline-list.vue
@@ -22,8 +22,11 @@ defineOptions({ name: 'DefectRecordInlineList' });
 
 const emit = defineEmits(['success']);
 
+/** 表单类型：父级检验单的模式（detail 时弹窗只读） */
+type FormType = 'create' | 'detail' | 'update';
+
 interface CtxData {
-  formType?: string;
+  formType?: FormType;
   lineId: number;
   qcId: number;
   qcType: number;
diff --git a/apps/web-antd/src/views/mes/qc/ipqc/modules/form.vue b/apps/web-antd/src/views/mes/qc/ipqc/modules/form.vue
new file mode 100644
index 000000000..64b1d698a
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/ipqc/modules/form.vue
@@ -0,0 +1,239 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesQcIpqcApi } from '#/api/mes/qc/ipqc';
+
+import { computed, ref } from 'vue';
+
+import { confirm, useVbenModal } from '@vben/common-ui';
+
+import { Button, Descriptions, message, Tabs } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createIpqc,
+  finishIpqc,
+  getIpqc,
+  updateIpqc,
+} from '#/api/mes/qc/ipqc';
+import { $t } from '#/locales';
+import { MesQcStatusEnum, MesQcTypeEnum } from '#/views/mes/utils/constants';
+
+import { QcIndicatorResultList } from '../../indicatorresult/components';
+import { useFormSchema } from '../data';
+import LineList from './line-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesQcIpqcApi.Ipqc>();
+const subTabsName = ref('line');
+const originalSnapshot = ref(''); // 表单原始数据快照，用于 finish 时跳过未变更的保存请求
+const isDetail = computed(() => formType.value === 'detail');
+const canFinish = computed(
+  () =>
+    formType.value === 'update' &&
+    formData.value?.status === MesQcStatusEnum.DRAFT,
+);
+const getTitle = computed(() => {
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['过程检验单']);
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['过程检验单'])
+    : $t('ui.actionTitle.create', ['过程检验单']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  wrapperClass: 'grid-cols-3',
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+});
+
+/** 子表变更后刷新主表头数据（缺陷统计等） */
+async function handleRefresh() {
+  if (!formData.value?.id) {
+    return;
+  }
+  formData.value = await getIpqc(formData.value.id);
+}
+
+/** 提交表单 */
+async function handleSubmit(): Promise<boolean> {
+  const { valid } = await formApi.validate();
+  if (!valid) {
+    return false;
+  }
+  const data = (await formApi.getValues()) as MesQcIpqcApi.Ipqc;
+  if (formData.value?.id) {
+    await updateIpqc({ ...data, id: formData.value.id });
+    formData.value = { ...formData.value, ...data };
+  } else {
+    const id = await createIpqc(data);
+    formData.value = {
+      ...data,
+      id: id as unknown as number,
+      status: MesQcStatusEnum.DRAFT,
+    };
+    await formApi.setFieldValue('id', formData.value.id);
+    await formApi.setFieldValue('status', formData.value.status);
+    formType.value = 'update';
+  }
+  // 刷新快照（已带上 id / status），下次 finish 用于判断是否需要再保存
+  originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  return true;
+}
+
+/** 完成检验单：表单有修改时先保存，再调用完成接口 */
+async function handleFinish() {
+  const id = formData.value?.id;
+  if (!id) {
+    return;
+  }
+  const { valid } = await formApi.validate();
+  if (!valid) {
+    return;
+  }
+  try {
+    await confirm('是否完成过程检验单编制？【完成后将不能更改】');
+  } catch {
+    return;
+  }
+  modalApi.lock();
+  try {
+    const current = JSON.stringify(await formApi.getValues());
+    if (current !== originalSnapshot.value) {
+      const data = (await formApi.getValues()) as MesQcIpqcApi.Ipqc;
+      await updateIpqc({ ...data, id });
+      formData.value = { ...formData.value, ...data };
+      originalSnapshot.value = current;
+    }
+    await finishIpqc(id);
+    message.success('完成成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (isDetail.value) {
+      await modalApi.close();
+      return;
+    }
+    modalApi.lock();
+    try {
+      // 提交表单
+      const ok = await handleSubmit();
+      if (!ok) {
+        return;
+      }
+      // 关闭并提示
+      message.success($t('ui.actionMessage.operationSuccess'));
+      await modalApi.close();
+      emit('success');
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      originalSnapshot.value = '';
+      return;
+    }
+    formApi.setState({ schema: useFormSchema(formApi) });
+    subTabsName.value = 'line';
+    // 加载数据
+    const data = modalApi.getData<{
+      formType: FormType;
+      id?: number;
+      prefill?: MesQcIpqcApi.Ipqc;
+    }>();
+    formType.value = data.formType;
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getIpqc(data.id);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    } else if (data?.prefill) {
+      // 预填模式：来自待检任务
+      formData.value = { ...data.prefill };
+      // 设置到 values
+      await formApi.setValues(data.prefill);
+    }
+    originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-4/5">
+    <Form class="mx-4" />
+    <!-- 缺陷统计（只读） -->
+    <div v-if="formData?.id" class="mx-4 mt-4">
+      <Descriptions title="缺陷情况" :column="3" bordered size="small">
+        <Descriptions.Item label="致命缺陷数">
+          {{ formData.criticalQuantity ?? 0 }}
+        </Descriptions.Item>
+        <Descriptions.Item label="严重缺陷数">
+          {{ formData.majorQuantity ?? 0 }}
+        </Descriptions.Item>
+        <Descriptions.Item label="轻微缺陷数">
+          {{ formData.minorQuantity ?? 0 }}
+        </Descriptions.Item>
+        <Descriptions.Item label="致命缺陷率">
+          {{ formData.criticalRate ?? 0 }}%
+        </Descriptions.Item>
+        <Descriptions.Item label="严重缺陷率">
+          {{ formData.majorRate ?? 0 }}%
+        </Descriptions.Item>
+        <Descriptions.Item label="轻微缺陷率">
+          {{ formData.minorRate ?? 0 }}%
+        </Descriptions.Item>
+      </Descriptions>
+    </div>
+    <Tabs
+      v-if="formData?.id"
+      v-model:active-key="subTabsName"
+      class="mx-4 mt-4"
+    >
+      <Tabs.TabPane key="line" tab="检验项">
+        <LineList
+          :form-type="formType"
+          :ipqc-id="formData.id"
+          @refresh="handleRefresh"
+        />
+      </Tabs.TabPane>
+      <Tabs.TabPane key="result" tab="检测结果">
+        <QcIndicatorResultList
+          :qc-id="formData.id"
+          :qc-type="MesQcTypeEnum.IPQC"
+          :readonly="isDetail"
+        />
+      </Tabs.TabPane>
+    </Tabs>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <Button v-if="canFinish" type="primary" @click="handleFinish">
+          完成
+        </Button>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/qc/ipqc/modules/line-list.vue b/apps/web-antd/src/views/mes/qc/ipqc/modules/line-list.vue
index e6aaea4bb..87aebb48a 100644
--- a/apps/web-antd/src/views/mes/qc/ipqc/modules/line-list.vue
+++ b/apps/web-antd/src/views/mes/qc/ipqc/modules/line-list.vue
@@ -9,10 +9,10 @@ import { getIpqcLinePage } from '#/api/mes/qc/ipqc/line';
 import { MesQcTypeEnum } from '#/views/mes/utils/constants';
 
 import { DefectRecordInlineList } from '../../defectrecord/components';
-import { useLineGridColumns } from '../data';
+import { type FormType, useLineGridColumns } from '../data';
 
 const props = defineProps<{
-  formType?: string;
+  formType?: FormType;
   ipqcId: number;
 }>();
 
diff --git a/apps/web-antd/src/views/mes/qc/iqc/modules/line-list.vue b/apps/web-antd/src/views/mes/qc/iqc/modules/line-list.vue
index 13accbf88..825b07059 100644
--- a/apps/web-antd/src/views/mes/qc/iqc/modules/line-list.vue
+++ b/apps/web-antd/src/views/mes/qc/iqc/modules/line-list.vue
@@ -9,10 +9,10 @@ import { getIqcLinePage } from '#/api/mes/qc/iqc/line';
 import { MesQcTypeEnum } from '#/views/mes/utils/constants';
 
 import { DefectRecordInlineList } from '../../defectrecord/components';
-import { useLineGridColumns } from '../data';
+import { type FormType, useLineGridColumns } from '../data';
 
 const props = defineProps<{
-  formType?: string;
+  formType?: FormType;
   iqcId: number;
 }>();
 
diff --git a/apps/web-antd/src/views/mes/qc/oqc/modules/form.vue b/apps/web-antd/src/views/mes/qc/oqc/modules/form.vue
index f9f4efc58..0d9d98e7f 100644
--- a/apps/web-antd/src/views/mes/qc/oqc/modules/form.vue
+++ b/apps/web-antd/src/views/mes/qc/oqc/modules/form.vue
@@ -27,7 +27,7 @@ const emit = defineEmits(['success']);
 const formType = ref<FormType>('create');
 const formData = ref<MesQcOqcApi.Oqc>();
 const subTabsName = ref('line');
-const originalSnapshot = ref('');
+const originalSnapshot = ref(''); // 表单原始数据快照，用于 finish 时跳过未变更的保存请求
 const isDetail = computed(() => formType.value === 'detail');
 const canFinish = computed(
   () =>
diff --git a/apps/web-antd/src/views/mes/qc/oqc/modules/line-list.vue b/apps/web-antd/src/views/mes/qc/oqc/modules/line-list.vue
index b0f15b132..5bcde58cf 100644
--- a/apps/web-antd/src/views/mes/qc/oqc/modules/line-list.vue
+++ b/apps/web-antd/src/views/mes/qc/oqc/modules/line-list.vue
@@ -9,10 +9,10 @@ import { getOqcLinePage } from '#/api/mes/qc/oqc/line';
 import { MesQcTypeEnum } from '#/views/mes/utils/constants';
 
 import { DefectRecordInlineList } from '../../defectrecord/components';
-import { useLineGridColumns } from '../data';
+import { type FormType, useLineGridColumns } from '../data';
 
 const props = defineProps<{
-  formType?: string;
+  formType?: FormType;
   oqcId: number;
 }>();
 
diff --git a/apps/web-antd/src/views/mes/qc/rqc/modules/form.vue b/apps/web-antd/src/views/mes/qc/rqc/modules/form.vue
index 40e27ce12..3876ceda2 100644
--- a/apps/web-antd/src/views/mes/qc/rqc/modules/form.vue
+++ b/apps/web-antd/src/views/mes/qc/rqc/modules/form.vue
@@ -27,7 +27,7 @@ const emit = defineEmits(['success']);
 const formType = ref<FormType>('create');
 const formData = ref<MesQcRqcApi.Rqc>();
 const subTabsName = ref('line');
-const originalSnapshot = ref('');
+const originalSnapshot = ref(''); // 表单原始数据快照，用于 finish 时跳过未变更的保存请求
 const isDetail = computed(() => formType.value === 'detail');
 const canFinish = computed(
   () =>
diff --git a/apps/web-antd/src/views/mes/qc/rqc/modules/line-list.vue b/apps/web-antd/src/views/mes/qc/rqc/modules/line-list.vue
index 8c50238fa..f542d2fa2 100644
--- a/apps/web-antd/src/views/mes/qc/rqc/modules/line-list.vue
+++ b/apps/web-antd/src/views/mes/qc/rqc/modules/line-list.vue
@@ -9,10 +9,10 @@ import { getRqcLinePage } from '#/api/mes/qc/rqc/line';
 import { MesQcTypeEnum } from '#/views/mes/utils/constants';
 
 import { DefectRecordInlineList } from '../../defectrecord/components';
-import { useLineGridColumns } from '../data';
+import { type FormType, useLineGridColumns } from '../data';
 
 const props = defineProps<{
-  formType?: string;
+  formType?: FormType;
   rqcId: number;
 }>();
 
diff --git a/apps/web-ele/src/views/mes/qc/defectrecord/components/defect-record-inline-list.vue b/apps/web-ele/src/views/mes/qc/defectrecord/components/defect-record-inline-list.vue
index 80b049926..77cc64d73 100644
--- a/apps/web-ele/src/views/mes/qc/defectrecord/components/defect-record-inline-list.vue
+++ b/apps/web-ele/src/views/mes/qc/defectrecord/components/defect-record-inline-list.vue
@@ -22,8 +22,11 @@ defineOptions({ name: 'DefectRecordInlineList' });
 
 const emit = defineEmits(['success']);
 
+/** 表单类型：父级检验单的模式（detail 时弹窗只读） */
+type FormType = 'create' | 'detail' | 'update';
+
 interface CtxData {
-  formType?: string;
+  formType?: FormType;
   lineId: number;
   qcId: number;
   qcType: number;
diff --git a/apps/web-ele/src/views/mes/qc/ipqc/modules/form.vue b/apps/web-ele/src/views/mes/qc/ipqc/modules/form.vue
index 7cfcafc38..aff33a0ab 100644
--- a/apps/web-ele/src/views/mes/qc/ipqc/modules/form.vue
+++ b/apps/web-ele/src/views/mes/qc/ipqc/modules/form.vue
@@ -34,7 +34,7 @@ const emit = defineEmits(['success']);
 const formType = ref<FormType>('create');
 const formData = ref<MesQcIpqcApi.Ipqc>();
 const subTabsName = ref('line');
-const originalSnapshot = ref('');
+const originalSnapshot = ref(''); // 表单原始数据快照，用于 finish 时跳过未变更的保存请求
 const isDetail = computed(() => formType.value === 'detail');
 const canFinish = computed(
   () =>
diff --git a/apps/web-ele/src/views/mes/qc/ipqc/modules/line-list.vue b/apps/web-ele/src/views/mes/qc/ipqc/modules/line-list.vue
index cfb8dc99d..1008e517b 100644
--- a/apps/web-ele/src/views/mes/qc/ipqc/modules/line-list.vue
+++ b/apps/web-ele/src/views/mes/qc/ipqc/modules/line-list.vue
@@ -9,10 +9,10 @@ import { getIpqcLinePage } from '#/api/mes/qc/ipqc/line';
 import { MesQcTypeEnum } from '#/views/mes/utils/constants';
 
 import { DefectRecordInlineList } from '../../defectrecord/components';
-import { useLineGridColumns } from '../data';
+import { type FormType, useLineGridColumns } from '../data';
 
 const props = defineProps<{
-  formType?: string;
+  formType?: FormType;
   ipqcId: number;
 }>();
 
diff --git a/apps/web-ele/src/views/mes/qc/iqc/modules/line-list.vue b/apps/web-ele/src/views/mes/qc/iqc/modules/line-list.vue
index eadf2d1cc..fb1d7bcbc 100644
--- a/apps/web-ele/src/views/mes/qc/iqc/modules/line-list.vue
+++ b/apps/web-ele/src/views/mes/qc/iqc/modules/line-list.vue
@@ -9,10 +9,10 @@ import { getIqcLinePage } from '#/api/mes/qc/iqc/line';
 import { MesQcTypeEnum } from '#/views/mes/utils/constants';
 
 import { DefectRecordInlineList } from '../../defectrecord/components';
-import { useLineGridColumns } from '../data';
+import { type FormType, useLineGridColumns } from '../data';
 
 const props = defineProps<{
-  formType?: string;
+  formType?: FormType;
   iqcId: number;
 }>();
 
diff --git a/apps/web-ele/src/views/mes/qc/oqc/modules/form.vue b/apps/web-ele/src/views/mes/qc/oqc/modules/form.vue
index c7067df71..831308c22 100644
--- a/apps/web-ele/src/views/mes/qc/oqc/modules/form.vue
+++ b/apps/web-ele/src/views/mes/qc/oqc/modules/form.vue
@@ -34,7 +34,7 @@ const emit = defineEmits(['success']);
 const formType = ref<FormType>('create');
 const formData = ref<MesQcOqcApi.Oqc>();
 const subTabsName = ref('line');
-const originalSnapshot = ref('');
+const originalSnapshot = ref(''); // 表单原始数据快照，用于 finish 时跳过未变更的保存请求
 const isDetail = computed(() => formType.value === 'detail');
 const canFinish = computed(
   () =>
diff --git a/apps/web-ele/src/views/mes/qc/oqc/modules/line-list.vue b/apps/web-ele/src/views/mes/qc/oqc/modules/line-list.vue
index 18af3731c..602ba913d 100644
--- a/apps/web-ele/src/views/mes/qc/oqc/modules/line-list.vue
+++ b/apps/web-ele/src/views/mes/qc/oqc/modules/line-list.vue
@@ -9,10 +9,10 @@ import { getOqcLinePage } from '#/api/mes/qc/oqc/line';
 import { MesQcTypeEnum } from '#/views/mes/utils/constants';
 
 import { DefectRecordInlineList } from '../../defectrecord/components';
-import { useLineGridColumns } from '../data';
+import { type FormType, useLineGridColumns } from '../data';
 
 const props = defineProps<{
-  formType?: string;
+  formType?: FormType;
   oqcId: number;
 }>();
 
diff --git a/apps/web-ele/src/views/mes/qc/rqc/modules/form.vue b/apps/web-ele/src/views/mes/qc/rqc/modules/form.vue
index 6ff22a90d..90bb852ec 100644
--- a/apps/web-ele/src/views/mes/qc/rqc/modules/form.vue
+++ b/apps/web-ele/src/views/mes/qc/rqc/modules/form.vue
@@ -34,7 +34,7 @@ const emit = defineEmits(['success']);
 const formType = ref<FormType>('create');
 const formData = ref<MesQcRqcApi.Rqc>();
 const subTabsName = ref('line');
-const originalSnapshot = ref('');
+const originalSnapshot = ref(''); // 表单原始数据快照，用于 finish 时跳过未变更的保存请求
 const isDetail = computed(() => formType.value === 'detail');
 const canFinish = computed(
   () =>
diff --git a/apps/web-ele/src/views/mes/qc/rqc/modules/line-list.vue b/apps/web-ele/src/views/mes/qc/rqc/modules/line-list.vue
index 751137b85..3ca1ab744 100644
--- a/apps/web-ele/src/views/mes/qc/rqc/modules/line-list.vue
+++ b/apps/web-ele/src/views/mes/qc/rqc/modules/line-list.vue
@@ -9,10 +9,10 @@ import { getRqcLinePage } from '#/api/mes/qc/rqc/line';
 import { MesQcTypeEnum } from '#/views/mes/utils/constants';
 
 import { DefectRecordInlineList } from '../../defectrecord/components';
-import { useLineGridColumns } from '../data';
+import { type FormType, useLineGridColumns } from '../data';
 
 const props = defineProps<{
-  formType?: string;
+  formType?: FormType;
   rqcId: number;
 }>();
 

From b4e7573d10caa5ec238f27562b490e52573e50fa Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 29 May 2026 21:22:14 +0800
Subject: [PATCH 17/52] =?UTF-8?q?feat(mes):=20=E4=BC=98=E5=8C=96=20generat?=
 =?UTF-8?q?eAutoCode=20=E7=9A=84=E8=B0=83=E7=94=A8=EF=BC=8C=E5=87=8F?=
 =?UTF-8?q?=E5=B0=91=20try=20catch?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/views/mes/cal/plan/data.ts   |  8 ++------
 apps/web-antd/src/views/mes/cal/team/data.ts   |  8 ++------
 .../src/views/mes/dv/checkplan/data.ts         |  8 ++------
 .../src/views/mes/dv/machinery/data.ts         |  8 ++------
 .../src/views/mes/dv/machinery/type/data.ts    |  8 ++------
 apps/web-antd/src/views/mes/dv/repair/data.ts  |  8 ++------
 apps/web-antd/src/views/mes/dv/subject/data.ts |  8 ++------
 apps/web-antd/src/views/mes/md/client/data.ts  | 12 ++++--------
 apps/web-antd/src/views/mes/md/item/data.ts    | 12 ++++--------
 .../src/views/mes/md/item/type/data.ts         | 12 ++++--------
 apps/web-antd/src/views/mes/md/vendor/data.ts  | 12 ++++--------
 .../src/views/mes/md/workstation/data.ts       | 12 ++++--------
 .../views/mes/md/workstation/workshop/data.ts  | 12 ++++--------
 .../web-antd/src/views/mes/pro/process/data.ts | 12 ++++--------
 apps/web-antd/src/views/mes/pro/route/data.ts  | 12 ++++--------
 .../mes/qc/batchtrace/modules/trace-detail.vue | 12 +++++++-----
 .../mes/qc/batchtrace/modules/trace-list.vue   | 14 ++++----------
 apps/web-antd/src/views/mes/qc/defect/data.ts  | 12 ++++--------
 .../src/views/mes/qc/indicator/data.ts         | 12 ++++--------
 .../mes/qc/indicatorresult/components/data.ts  | 12 ++++--------
 apps/web-antd/src/views/mes/qc/ipqc/data.ts    | 18 +++++++++---------
 .../src/views/mes/qc/ipqc/modules/form.vue     |  2 +-
 apps/web-antd/src/views/mes/qc/iqc/data.ts     | 18 +++++++++---------
 .../src/views/mes/qc/iqc/modules/form.vue      |  2 +-
 apps/web-antd/src/views/mes/qc/oqc/data.ts     | 18 +++++++++---------
 .../src/views/mes/qc/oqc/modules/form.vue      |  2 +-
 apps/web-antd/src/views/mes/qc/rqc/data.ts     | 18 +++++++++---------
 .../src/views/mes/qc/rqc/modules/form.vue      |  2 +-
 .../web-antd/src/views/mes/qc/template/data.ts | 12 ++++--------
 .../src/views/mes/wm/warehouse/area/data.ts    | 12 ++++--------
 .../src/views/mes/wm/warehouse/data.ts         | 12 ++++--------
 .../views/mes/wm/warehouse/location/data.ts    | 12 ++++--------
 apps/web-ele/src/views/mes/cal/plan/data.ts    |  8 ++------
 apps/web-ele/src/views/mes/cal/team/data.ts    |  8 ++------
 .../web-ele/src/views/mes/dv/checkplan/data.ts |  8 ++------
 .../web-ele/src/views/mes/dv/machinery/data.ts |  8 ++------
 .../src/views/mes/dv/machinery/type/data.ts    |  8 ++------
 apps/web-ele/src/views/mes/dv/repair/data.ts   |  8 ++------
 apps/web-ele/src/views/mes/dv/subject/data.ts  |  8 ++------
 apps/web-ele/src/views/mes/md/client/data.ts   | 12 ++++--------
 apps/web-ele/src/views/mes/md/item/data.ts     | 12 ++++--------
 .../web-ele/src/views/mes/md/item/type/data.ts | 12 ++++--------
 apps/web-ele/src/views/mes/md/vendor/data.ts   | 12 ++++--------
 .../src/views/mes/md/workstation/data.ts       | 12 ++++--------
 .../views/mes/md/workstation/workshop/data.ts  | 12 ++++--------
 apps/web-ele/src/views/mes/pro/process/data.ts | 12 ++++--------
 apps/web-ele/src/views/mes/pro/route/data.ts   | 12 ++++--------
 apps/web-ele/src/views/mes/qc/defect/data.ts   | 12 ++++--------
 .../web-ele/src/views/mes/qc/indicator/data.ts | 12 ++++--------
 .../mes/qc/indicatorresult/components/data.ts  | 12 ++++--------
 apps/web-ele/src/views/mes/qc/ipqc/data.ts     | 18 +++++++++---------
 .../src/views/mes/qc/ipqc/modules/form.vue     |  2 +-
 apps/web-ele/src/views/mes/qc/iqc/data.ts      | 18 +++++++++---------
 .../src/views/mes/qc/iqc/modules/form.vue      |  2 +-
 apps/web-ele/src/views/mes/qc/oqc/data.ts      | 18 +++++++++---------
 .../src/views/mes/qc/oqc/modules/form.vue      |  2 +-
 apps/web-ele/src/views/mes/qc/rqc/data.ts      | 18 +++++++++---------
 .../src/views/mes/qc/rqc/modules/form.vue      |  2 +-
 apps/web-ele/src/views/mes/qc/template/data.ts | 12 ++++--------
 .../src/views/mes/wm/warehouse/area/data.ts    | 12 ++++--------
 .../web-ele/src/views/mes/wm/warehouse/data.ts | 12 ++++--------
 .../views/mes/wm/warehouse/location/data.ts    | 12 ++++--------
 62 files changed, 239 insertions(+), 419 deletions(-)

diff --git a/apps/web-antd/src/views/mes/cal/plan/data.ts b/apps/web-antd/src/views/mes/cal/plan/data.ts
index e1c001147..d325202f1 100644
--- a/apps/web-antd/src/views/mes/cal/plan/data.ts
+++ b/apps/web-antd/src/views/mes/cal/plan/data.ts
@@ -55,12 +55,8 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
           {
             type: 'default',
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(MesAutoCodeRuleCode.CAL_PLAN_CODE);
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(MesAutoCodeRuleCode.CAL_PLAN_CODE);
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '生成' },
diff --git a/apps/web-antd/src/views/mes/cal/team/data.ts b/apps/web-antd/src/views/mes/cal/team/data.ts
index 17df1d06a..a44bba18d 100644
--- a/apps/web-antd/src/views/mes/cal/team/data.ts
+++ b/apps/web-antd/src/views/mes/cal/team/data.ts
@@ -42,12 +42,8 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
           {
             type: 'default',
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(MesAutoCodeRuleCode.CAL_TEAM_CODE);
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(MesAutoCodeRuleCode.CAL_TEAM_CODE);
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '生成' },
diff --git a/apps/web-antd/src/views/mes/dv/checkplan/data.ts b/apps/web-antd/src/views/mes/dv/checkplan/data.ts
index 6c2b9ad0b..4f6409181 100644
--- a/apps/web-antd/src/views/mes/dv/checkplan/data.ts
+++ b/apps/web-antd/src/views/mes/dv/checkplan/data.ts
@@ -55,12 +55,8 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
           {
             type: 'default',
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(MesAutoCodeRuleCode.DV_CHECK_PLAN_CODE);
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(MesAutoCodeRuleCode.DV_CHECK_PLAN_CODE);
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '生成' },
diff --git a/apps/web-antd/src/views/mes/dv/machinery/data.ts b/apps/web-antd/src/views/mes/dv/machinery/data.ts
index 27cfbe5dc..6a1f64063 100644
--- a/apps/web-antd/src/views/mes/dv/machinery/data.ts
+++ b/apps/web-antd/src/views/mes/dv/machinery/data.ts
@@ -48,12 +48,8 @@ export function useFormSchema(formType: FormType, formApi?: VbenFormApi): VbenFo
           {
             type: 'default',
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(MesAutoCodeRuleCode.DV_MACHINERY_CODE);
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(MesAutoCodeRuleCode.DV_MACHINERY_CODE);
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '生成' },
diff --git a/apps/web-antd/src/views/mes/dv/machinery/type/data.ts b/apps/web-antd/src/views/mes/dv/machinery/type/data.ts
index c7342e875..2e3120f3a 100644
--- a/apps/web-antd/src/views/mes/dv/machinery/type/data.ts
+++ b/apps/web-antd/src/views/mes/dv/machinery/type/data.ts
@@ -59,12 +59,8 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
           {
             type: 'default',
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(MesAutoCodeRuleCode.DV_MACHINERY_TYPE_CODE);
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(MesAutoCodeRuleCode.DV_MACHINERY_TYPE_CODE);
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '生成' },
diff --git a/apps/web-antd/src/views/mes/dv/repair/data.ts b/apps/web-antd/src/views/mes/dv/repair/data.ts
index 4bc44e428..76674cf38 100644
--- a/apps/web-antd/src/views/mes/dv/repair/data.ts
+++ b/apps/web-antd/src/views/mes/dv/repair/data.ts
@@ -55,12 +55,8 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
           {
             type: 'default',
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(MesAutoCodeRuleCode.DV_REPAIR_CODE);
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(MesAutoCodeRuleCode.DV_REPAIR_CODE);
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '生成' },
diff --git a/apps/web-antd/src/views/mes/dv/subject/data.ts b/apps/web-antd/src/views/mes/dv/subject/data.ts
index c89cb9c23..cbc88abd8 100644
--- a/apps/web-antd/src/views/mes/dv/subject/data.ts
+++ b/apps/web-antd/src/views/mes/dv/subject/data.ts
@@ -41,12 +41,8 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
           {
             type: 'default',
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(MesAutoCodeRuleCode.DV_SUBJECT_CODE);
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(MesAutoCodeRuleCode.DV_SUBJECT_CODE);
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '生成' },
diff --git a/apps/web-antd/src/views/mes/md/client/data.ts b/apps/web-antd/src/views/mes/md/client/data.ts
index 9263b82d9..301973cc5 100644
--- a/apps/web-antd/src/views/mes/md/client/data.ts
+++ b/apps/web-antd/src/views/mes/md/client/data.ts
@@ -47,14 +47,10 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
           {
             type: 'default',
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(
-                  MesAutoCodeRuleCode.MD_CLIENT_CODE,
-                );
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(
+                MesAutoCodeRuleCode.MD_CLIENT_CODE,
+              );
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '自动生成' },
diff --git a/apps/web-antd/src/views/mes/md/item/data.ts b/apps/web-antd/src/views/mes/md/item/data.ts
index 175af9b57..2da12e5a1 100644
--- a/apps/web-antd/src/views/mes/md/item/data.ts
+++ b/apps/web-antd/src/views/mes/md/item/data.ts
@@ -45,14 +45,10 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
           {
             type: 'default',
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(
-                  MesAutoCodeRuleCode.MD_ITEM_CODE,
-                );
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(
+                MesAutoCodeRuleCode.MD_ITEM_CODE,
+              );
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '生成' },
diff --git a/apps/web-antd/src/views/mes/md/item/type/data.ts b/apps/web-antd/src/views/mes/md/item/type/data.ts
index 12b29f67c..7f61f4f03 100644
--- a/apps/web-antd/src/views/mes/md/item/type/data.ts
+++ b/apps/web-antd/src/views/mes/md/item/type/data.ts
@@ -69,14 +69,10 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
           {
             type: 'default',
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(
-                  MesAutoCodeRuleCode.MD_ITEM_TYPE_CODE,
-                );
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(
+                MesAutoCodeRuleCode.MD_ITEM_TYPE_CODE,
+              );
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '自动生成' },
diff --git a/apps/web-antd/src/views/mes/md/vendor/data.ts b/apps/web-antd/src/views/mes/md/vendor/data.ts
index d40db4eac..24f692030 100644
--- a/apps/web-antd/src/views/mes/md/vendor/data.ts
+++ b/apps/web-antd/src/views/mes/md/vendor/data.ts
@@ -47,14 +47,10 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
           {
             type: 'default',
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(
-                  MesAutoCodeRuleCode.MD_VENDOR_CODE,
-                );
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(
+                MesAutoCodeRuleCode.MD_VENDOR_CODE,
+              );
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '自动生成' },
diff --git a/apps/web-antd/src/views/mes/md/workstation/data.ts b/apps/web-antd/src/views/mes/md/workstation/data.ts
index d49185821..7ddf1d272 100644
--- a/apps/web-antd/src/views/mes/md/workstation/data.ts
+++ b/apps/web-antd/src/views/mes/md/workstation/data.ts
@@ -53,14 +53,10 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
           {
             type: 'default',
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(
-                  MesAutoCodeRuleCode.MD_WORKSTATION_CODE,
-                );
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(
+                MesAutoCodeRuleCode.MD_WORKSTATION_CODE,
+              );
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '生成' },
diff --git a/apps/web-antd/src/views/mes/md/workstation/workshop/data.ts b/apps/web-antd/src/views/mes/md/workstation/workshop/data.ts
index e7d804266..82bd678d3 100644
--- a/apps/web-antd/src/views/mes/md/workstation/workshop/data.ts
+++ b/apps/web-antd/src/views/mes/md/workstation/workshop/data.ts
@@ -48,14 +48,10 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
           {
             type: 'default',
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(
-                  MesAutoCodeRuleCode.MD_WORKSHOP_CODE,
-                );
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(
+                MesAutoCodeRuleCode.MD_WORKSHOP_CODE,
+              );
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '生成' },
diff --git a/apps/web-antd/src/views/mes/pro/process/data.ts b/apps/web-antd/src/views/mes/pro/process/data.ts
index e64f78986..59c56bb98 100644
--- a/apps/web-antd/src/views/mes/pro/process/data.ts
+++ b/apps/web-antd/src/views/mes/pro/process/data.ts
@@ -43,14 +43,10 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
           {
             type: 'default',
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(
-                  MesAutoCodeRuleCode.PRO_PROCESS_CODE,
-                );
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(
+                MesAutoCodeRuleCode.PRO_PROCESS_CODE,
+              );
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '生成' },
diff --git a/apps/web-antd/src/views/mes/pro/route/data.ts b/apps/web-antd/src/views/mes/pro/route/data.ts
index c73686165..7ba9f1083 100644
--- a/apps/web-antd/src/views/mes/pro/route/data.ts
+++ b/apps/web-antd/src/views/mes/pro/route/data.ts
@@ -48,14 +48,10 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
           {
             type: 'default',
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(
-                  MesAutoCodeRuleCode.PRO_ROUTE_CODE,
-                );
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(
+                MesAutoCodeRuleCode.PRO_ROUTE_CODE,
+              );
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '生成' },
diff --git a/apps/web-antd/src/views/mes/qc/batchtrace/modules/trace-detail.vue b/apps/web-antd/src/views/mes/qc/batchtrace/modules/trace-detail.vue
index 241a2bc61..5782e28ff 100644
--- a/apps/web-antd/src/views/mes/qc/batchtrace/modules/trace-detail.vue
+++ b/apps/web-antd/src/views/mes/qc/batchtrace/modules/trace-detail.vue
@@ -1,5 +1,4 @@
 <script lang="ts" setup>
-// TODO @AI：是不是可以使用 description 组件？
 import type { MesWmBatchApi } from '#/api/mes/wm/batch';
 
 import { ref } from 'vue';
@@ -14,8 +13,6 @@ const detailData = ref<MesWmBatchApi.Batch>(); // 当前批次详情
 const subTabsName = ref<'backward' | 'forward'>('forward'); // 当前激活的追溯方向
 
 const [Modal, modalApi] = useVbenModal({
-  showCancelButton: false,
-  showConfirmButton: false,
   onOpenChange(isOpen) {
     if (!isOpen) {
       detailData.value = undefined;
@@ -28,7 +25,12 @@ const [Modal, modalApi] = useVbenModal({
 </script>
 
 <template>
-  <Modal title="批次追溯" class="w-4/5">
+  <Modal
+    title="批次追溯"
+    class="w-4/5"
+    :show-cancel-button="false"
+    :show-confirm-button="false"
+  >
     <div class="mx-4 mt-2">
       <Descriptions :column="3" bordered size="small">
         <Descriptions.Item label="批次编号">
@@ -75,7 +77,7 @@ const [Modal, modalApi] = useVbenModal({
     <Tabs
       v-if="detailData?.code"
       v-model:active-key="subTabsName"
-      class="mx-4 mt-4"
+      class="mx-4! mt-4!"
       type="card"
     >
       <Tabs.TabPane key="forward" tab="向前追溯">
diff --git a/apps/web-antd/src/views/mes/qc/batchtrace/modules/trace-list.vue b/apps/web-antd/src/views/mes/qc/batchtrace/modules/trace-list.vue
index d961f1707..0c63921c8 100644
--- a/apps/web-antd/src/views/mes/qc/batchtrace/modules/trace-list.vue
+++ b/apps/web-antd/src/views/mes/qc/batchtrace/modules/trace-list.vue
@@ -2,7 +2,7 @@
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesWmBatchApi } from '#/api/mes/wm/batch';
 
-import { ref, watch } from 'vue';
+import { watch } from 'vue';
 
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import {
@@ -17,13 +17,9 @@ const props = defineProps<{
   direction: 'backward' | 'forward'; // 追溯方向：forward=向前，backward=向后
 }>();
 
-const list = ref<MesWmBatchApi.Batch[]>([]); // 追溯结果列表
-
-// TODO @AI：代码风格；
 const [Grid, gridApi] = useVbenVxeGrid({
   gridOptions: {
     columns: useTraceGridColumns(),
-    data: list.value,
     minHeight: 240,
     pagerConfig: { enabled: false },
     rowConfig: { isHover: true, keyField: 'id' },
@@ -33,20 +29,18 @@ const [Grid, gridApi] = useVbenVxeGrid({
 });
 
 /** 加载追溯列表 */
-// TODO @AI：是不是可以在 useVbenVxeGrid 里面实现加载？
 async function getList() {
   if (!props.batchCode) {
-    list.value = [];
-    gridApi.setGridOptions({ data: list.value });
+    await gridApi.grid?.loadData([]);
     return;
   }
   gridApi.setLoading(true);
   try {
-    list.value =
+    const list =
       props.direction === 'forward'
         ? await getForwardBatchList(props.batchCode)
         : await getBackwardBatchList(props.batchCode);
-    gridApi.setGridOptions({ data: list.value });
+    await gridApi.grid?.loadData(list);
   } finally {
     gridApi.setLoading(false);
   }
diff --git a/apps/web-antd/src/views/mes/qc/defect/data.ts b/apps/web-antd/src/views/mes/qc/defect/data.ts
index e9f717ce4..ed72e1cfb 100644
--- a/apps/web-antd/src/views/mes/qc/defect/data.ts
+++ b/apps/web-antd/src/views/mes/qc/defect/data.ts
@@ -37,14 +37,10 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
           {
             type: 'default',
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(
-                  MesAutoCodeRuleCode.QC_DEFECT_CODE,
-                );
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(
+                MesAutoCodeRuleCode.QC_DEFECT_CODE,
+              );
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '自动生成' },
diff --git a/apps/web-antd/src/views/mes/qc/indicator/data.ts b/apps/web-antd/src/views/mes/qc/indicator/data.ts
index 2a2c600bb..df350a4e5 100644
--- a/apps/web-antd/src/views/mes/qc/indicator/data.ts
+++ b/apps/web-antd/src/views/mes/qc/indicator/data.ts
@@ -42,14 +42,10 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
           {
             type: 'default',
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(
-                  MesAutoCodeRuleCode.QC_INDICATOR_CODE,
-                );
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(
+                MesAutoCodeRuleCode.QC_INDICATOR_CODE,
+              );
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '自动生成' },
diff --git a/apps/web-antd/src/views/mes/qc/indicatorresult/components/data.ts b/apps/web-antd/src/views/mes/qc/indicatorresult/components/data.ts
index 79340b115..38557a984 100644
--- a/apps/web-antd/src/views/mes/qc/indicatorresult/components/data.ts
+++ b/apps/web-antd/src/views/mes/qc/indicatorresult/components/data.ts
@@ -39,14 +39,10 @@ export function useQcIndicatorResultFormSchema(
           {
             type: 'default',
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(
-                  MesAutoCodeRuleCode.QC_INDICATOR_RESULT_CODE,
-                );
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(
+                MesAutoCodeRuleCode.QC_INDICATOR_RESULT_CODE,
+              );
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '生成' },
diff --git a/apps/web-antd/src/views/mes/qc/ipqc/data.ts b/apps/web-antd/src/views/mes/qc/ipqc/data.ts
index 73c19bc51..da7215475 100644
--- a/apps/web-antd/src/views/mes/qc/ipqc/data.ts
+++ b/apps/web-antd/src/views/mes/qc/ipqc/data.ts
@@ -41,7 +41,10 @@ function syncUnqualified(formApi?: VbenFormApi) {
 }
 
 /** 新增/修改的表单 */
-export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
@@ -87,16 +90,13 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
         h(
           Button,
           {
+            disabled: formType === 'detail',
             type: 'default',
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(
-                  MesAutoCodeRuleCode.QC_IPQC_CODE,
-                );
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(
+                MesAutoCodeRuleCode.QC_IPQC_CODE,
+              );
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '生成' },
diff --git a/apps/web-antd/src/views/mes/qc/ipqc/modules/form.vue b/apps/web-antd/src/views/mes/qc/ipqc/modules/form.vue
index 64b1d698a..87062e316 100644
--- a/apps/web-antd/src/views/mes/qc/ipqc/modules/form.vue
+++ b/apps/web-antd/src/views/mes/qc/ipqc/modules/form.vue
@@ -151,7 +151,6 @@ const [Modal, modalApi] = useVbenModal({
       originalSnapshot.value = '';
       return;
     }
-    formApi.setState({ schema: useFormSchema(formApi) });
     subTabsName.value = 'line';
     // 加载数据
     const data = modalApi.getData<{
@@ -160,6 +159,7 @@ const [Modal, modalApi] = useVbenModal({
       prefill?: MesQcIpqcApi.Ipqc;
     }>();
     formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
     formApi.setDisabled(formType.value === 'detail');
     modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
     if (data?.id) {
diff --git a/apps/web-antd/src/views/mes/qc/iqc/data.ts b/apps/web-antd/src/views/mes/qc/iqc/data.ts
index 9919a2a83..226ad962a 100644
--- a/apps/web-antd/src/views/mes/qc/iqc/data.ts
+++ b/apps/web-antd/src/views/mes/qc/iqc/data.ts
@@ -21,7 +21,10 @@ import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 export type FormType = 'create' | 'detail' | 'update';
 
 /** 新增/修改的表单 */
-export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
@@ -67,16 +70,13 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
         h(
           Button,
           {
+            disabled: formType === 'detail',
             type: 'default',
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(
-                  MesAutoCodeRuleCode.QC_IQC_CODE,
-                );
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(
+                MesAutoCodeRuleCode.QC_IQC_CODE,
+              );
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '生成' },
diff --git a/apps/web-antd/src/views/mes/qc/iqc/modules/form.vue b/apps/web-antd/src/views/mes/qc/iqc/modules/form.vue
index ad3f767d9..fec8d932f 100644
--- a/apps/web-antd/src/views/mes/qc/iqc/modules/form.vue
+++ b/apps/web-antd/src/views/mes/qc/iqc/modules/form.vue
@@ -156,7 +156,6 @@ const [Modal, modalApi] = useVbenModal({
       originalSnapshot.value = '';
       return;
     }
-    formApi.setState({ schema: useFormSchema(formApi) });
     subTabsName.value = 'line';
     // 加载数据
     const data = modalApi.getData<{
@@ -165,6 +164,7 @@ const [Modal, modalApi] = useVbenModal({
       prefill?: MesQcIqcApi.Iqc;
     }>();
     formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
     formApi.setDisabled(formType.value === 'detail');
     modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
     if (data?.id) {
diff --git a/apps/web-antd/src/views/mes/qc/oqc/data.ts b/apps/web-antd/src/views/mes/qc/oqc/data.ts
index 2c70c0a7f..41b79218d 100644
--- a/apps/web-antd/src/views/mes/qc/oqc/data.ts
+++ b/apps/web-antd/src/views/mes/qc/oqc/data.ts
@@ -20,7 +20,10 @@ import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 export type FormType = 'create' | 'detail' | 'update';
 
 /** 新增/修改的表单 */
-export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
@@ -66,16 +69,13 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
         h(
           Button,
           {
+            disabled: formType === 'detail',
             type: 'default',
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(
-                  MesAutoCodeRuleCode.QC_OQC_CODE,
-                );
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(
+                MesAutoCodeRuleCode.QC_OQC_CODE,
+              );
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '生成' },
diff --git a/apps/web-antd/src/views/mes/qc/oqc/modules/form.vue b/apps/web-antd/src/views/mes/qc/oqc/modules/form.vue
index 0d9d98e7f..05e6b749a 100644
--- a/apps/web-antd/src/views/mes/qc/oqc/modules/form.vue
+++ b/apps/web-antd/src/views/mes/qc/oqc/modules/form.vue
@@ -150,7 +150,6 @@ const [Modal, modalApi] = useVbenModal({
       originalSnapshot.value = '';
       return;
     }
-    formApi.setState({ schema: useFormSchema(formApi) });
     subTabsName.value = 'line';
     // 加载数据
     const data = modalApi.getData<{
@@ -159,6 +158,7 @@ const [Modal, modalApi] = useVbenModal({
       prefill?: MesQcOqcApi.Oqc;
     }>();
     formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
     formApi.setDisabled(formType.value === 'detail');
     modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
     if (data?.id) {
diff --git a/apps/web-antd/src/views/mes/qc/rqc/data.ts b/apps/web-antd/src/views/mes/qc/rqc/data.ts
index c08aa23f8..ee765a373 100644
--- a/apps/web-antd/src/views/mes/qc/rqc/data.ts
+++ b/apps/web-antd/src/views/mes/qc/rqc/data.ts
@@ -33,7 +33,10 @@ function getRqcSourceDocTypeOptions() {
 }
 
 /** 新增/修改的表单 */
-export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
@@ -79,16 +82,13 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
         h(
           Button,
           {
+            disabled: formType === 'detail',
             type: 'default',
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(
-                  MesAutoCodeRuleCode.QC_RQC_CODE,
-                );
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(
+                MesAutoCodeRuleCode.QC_RQC_CODE,
+              );
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '生成' },
diff --git a/apps/web-antd/src/views/mes/qc/rqc/modules/form.vue b/apps/web-antd/src/views/mes/qc/rqc/modules/form.vue
index 3876ceda2..db30062cf 100644
--- a/apps/web-antd/src/views/mes/qc/rqc/modules/form.vue
+++ b/apps/web-antd/src/views/mes/qc/rqc/modules/form.vue
@@ -150,7 +150,6 @@ const [Modal, modalApi] = useVbenModal({
       originalSnapshot.value = '';
       return;
     }
-    formApi.setState({ schema: useFormSchema(formApi) });
     subTabsName.value = 'line';
     // 加载数据
     const data = modalApi.getData<{
@@ -159,6 +158,7 @@ const [Modal, modalApi] = useVbenModal({
       prefill?: MesQcRqcApi.Rqc;
     }>();
     formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
     formApi.setDisabled(formType.value === 'detail');
     modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
     if (data?.id) {
diff --git a/apps/web-antd/src/views/mes/qc/template/data.ts b/apps/web-antd/src/views/mes/qc/template/data.ts
index ce5268ac7..69aff5072 100644
--- a/apps/web-antd/src/views/mes/qc/template/data.ts
+++ b/apps/web-antd/src/views/mes/qc/template/data.ts
@@ -46,14 +46,10 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
           {
             type: 'default',
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(
-                  MesAutoCodeRuleCode.QC_TEMPLATE_CODE,
-                );
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(
+                MesAutoCodeRuleCode.QC_TEMPLATE_CODE,
+              );
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '自动生成' },
diff --git a/apps/web-antd/src/views/mes/wm/warehouse/area/data.ts b/apps/web-antd/src/views/mes/wm/warehouse/area/data.ts
index b18fb4981..60c70f580 100644
--- a/apps/web-antd/src/views/mes/wm/warehouse/area/data.ts
+++ b/apps/web-antd/src/views/mes/wm/warehouse/area/data.ts
@@ -80,14 +80,10 @@ export function useFormSchema(
                 {
                   type: 'default',
                   onClick: async () => {
-                    try {
-                      const code = await generateAutoCode(
-                        MesAutoCodeRuleCode.WM_AREA_CODE,
-                      );
-                      await formApi?.setFieldValue('code', code);
-                    } catch (error) {
-                      console.error(error);
-                    }
+                    const code = await generateAutoCode(
+                      MesAutoCodeRuleCode.WM_AREA_CODE,
+                    );
+                    await formApi?.setFieldValue('code', code);
                   },
                 },
                 { default: () => '自动生成' },
diff --git a/apps/web-antd/src/views/mes/wm/warehouse/data.ts b/apps/web-antd/src/views/mes/wm/warehouse/data.ts
index 045e21177..2adc6f512 100644
--- a/apps/web-antd/src/views/mes/wm/warehouse/data.ts
+++ b/apps/web-antd/src/views/mes/wm/warehouse/data.ts
@@ -52,14 +52,10 @@ export function useFormSchema(
                 {
                   type: 'default',
                   onClick: async () => {
-                    try {
-                      const code = await generateAutoCode(
-                        MesAutoCodeRuleCode.WM_WAREHOUSE_CODE,
-                      );
-                      await formApi?.setFieldValue('code', code);
-                    } catch (error) {
-                      console.error(error);
-                    }
+                    const code = await generateAutoCode(
+                      MesAutoCodeRuleCode.WM_WAREHOUSE_CODE,
+                    );
+                    await formApi?.setFieldValue('code', code);
                   },
                 },
                 { default: () => '自动生成' },
diff --git a/apps/web-antd/src/views/mes/wm/warehouse/location/data.ts b/apps/web-antd/src/views/mes/wm/warehouse/location/data.ts
index c75c0639c..360102a58 100644
--- a/apps/web-antd/src/views/mes/wm/warehouse/location/data.ts
+++ b/apps/web-antd/src/views/mes/wm/warehouse/location/data.ts
@@ -49,14 +49,10 @@ export function useFormSchema(
                 {
                   type: 'default',
                   onClick: async () => {
-                    try {
-                      const code = await generateAutoCode(
-                        MesAutoCodeRuleCode.WM_LOCATION_CODE,
-                      );
-                      await formApi?.setFieldValue('code', code);
-                    } catch (error) {
-                      console.error(error);
-                    }
+                    const code = await generateAutoCode(
+                      MesAutoCodeRuleCode.WM_LOCATION_CODE,
+                    );
+                    await formApi?.setFieldValue('code', code);
                   },
                 },
                 { default: () => '自动生成' },
diff --git a/apps/web-ele/src/views/mes/cal/plan/data.ts b/apps/web-ele/src/views/mes/cal/plan/data.ts
index 66548df50..97bdb57de 100644
--- a/apps/web-ele/src/views/mes/cal/plan/data.ts
+++ b/apps/web-ele/src/views/mes/cal/plan/data.ts
@@ -55,12 +55,8 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
           {
             type: 'default',
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(MesAutoCodeRuleCode.CAL_PLAN_CODE);
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(MesAutoCodeRuleCode.CAL_PLAN_CODE);
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '生成' },
diff --git a/apps/web-ele/src/views/mes/cal/team/data.ts b/apps/web-ele/src/views/mes/cal/team/data.ts
index 4d78d82d2..6f5544162 100644
--- a/apps/web-ele/src/views/mes/cal/team/data.ts
+++ b/apps/web-ele/src/views/mes/cal/team/data.ts
@@ -42,12 +42,8 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
           {
             type: 'default',
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(MesAutoCodeRuleCode.CAL_TEAM_CODE);
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(MesAutoCodeRuleCode.CAL_TEAM_CODE);
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '生成' },
diff --git a/apps/web-ele/src/views/mes/dv/checkplan/data.ts b/apps/web-ele/src/views/mes/dv/checkplan/data.ts
index 9b34cc8d4..9094bd4d8 100644
--- a/apps/web-ele/src/views/mes/dv/checkplan/data.ts
+++ b/apps/web-ele/src/views/mes/dv/checkplan/data.ts
@@ -55,12 +55,8 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
           {
             type: 'default',
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(MesAutoCodeRuleCode.DV_CHECK_PLAN_CODE);
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(MesAutoCodeRuleCode.DV_CHECK_PLAN_CODE);
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '生成' },
diff --git a/apps/web-ele/src/views/mes/dv/machinery/data.ts b/apps/web-ele/src/views/mes/dv/machinery/data.ts
index 735b30eca..be9568d44 100644
--- a/apps/web-ele/src/views/mes/dv/machinery/data.ts
+++ b/apps/web-ele/src/views/mes/dv/machinery/data.ts
@@ -48,12 +48,8 @@ export function useFormSchema(formType: FormType, formApi?: VbenFormApi): VbenFo
           {
             type: 'default',
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(MesAutoCodeRuleCode.DV_MACHINERY_CODE);
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(MesAutoCodeRuleCode.DV_MACHINERY_CODE);
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '生成' },
diff --git a/apps/web-ele/src/views/mes/dv/machinery/type/data.ts b/apps/web-ele/src/views/mes/dv/machinery/type/data.ts
index b63b684a3..bc7b2e3f5 100644
--- a/apps/web-ele/src/views/mes/dv/machinery/type/data.ts
+++ b/apps/web-ele/src/views/mes/dv/machinery/type/data.ts
@@ -58,12 +58,8 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
           {
             type: 'default',
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(MesAutoCodeRuleCode.DV_MACHINERY_TYPE_CODE);
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(MesAutoCodeRuleCode.DV_MACHINERY_TYPE_CODE);
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '生成' },
diff --git a/apps/web-ele/src/views/mes/dv/repair/data.ts b/apps/web-ele/src/views/mes/dv/repair/data.ts
index ce5db65da..f43cf83ec 100644
--- a/apps/web-ele/src/views/mes/dv/repair/data.ts
+++ b/apps/web-ele/src/views/mes/dv/repair/data.ts
@@ -55,12 +55,8 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
           {
             type: 'default',
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(MesAutoCodeRuleCode.DV_REPAIR_CODE);
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(MesAutoCodeRuleCode.DV_REPAIR_CODE);
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '生成' },
diff --git a/apps/web-ele/src/views/mes/dv/subject/data.ts b/apps/web-ele/src/views/mes/dv/subject/data.ts
index 6d28f541d..4df64c1ed 100644
--- a/apps/web-ele/src/views/mes/dv/subject/data.ts
+++ b/apps/web-ele/src/views/mes/dv/subject/data.ts
@@ -41,12 +41,8 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
           {
             type: 'default',
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(MesAutoCodeRuleCode.DV_SUBJECT_CODE);
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(MesAutoCodeRuleCode.DV_SUBJECT_CODE);
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '生成' },
diff --git a/apps/web-ele/src/views/mes/md/client/data.ts b/apps/web-ele/src/views/mes/md/client/data.ts
index 882c54ce8..2c8945d32 100644
--- a/apps/web-ele/src/views/mes/md/client/data.ts
+++ b/apps/web-ele/src/views/mes/md/client/data.ts
@@ -46,14 +46,10 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
           ElButton,
           {
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(
-                  MesAutoCodeRuleCode.MD_CLIENT_CODE,
-                );
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(
+                MesAutoCodeRuleCode.MD_CLIENT_CODE,
+              );
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '自动生成' },
diff --git a/apps/web-ele/src/views/mes/md/item/data.ts b/apps/web-ele/src/views/mes/md/item/data.ts
index 1b2dd41af..b1143013b 100644
--- a/apps/web-ele/src/views/mes/md/item/data.ts
+++ b/apps/web-ele/src/views/mes/md/item/data.ts
@@ -45,14 +45,10 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
           {
             type: 'default',
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(
-                  MesAutoCodeRuleCode.MD_ITEM_CODE,
-                );
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(
+                MesAutoCodeRuleCode.MD_ITEM_CODE,
+              );
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '生成' },
diff --git a/apps/web-ele/src/views/mes/md/item/type/data.ts b/apps/web-ele/src/views/mes/md/item/type/data.ts
index 56b51cedc..7faad1956 100644
--- a/apps/web-ele/src/views/mes/md/item/type/data.ts
+++ b/apps/web-ele/src/views/mes/md/item/type/data.ts
@@ -69,14 +69,10 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
           {
             type: 'default',
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(
-                  MesAutoCodeRuleCode.MD_ITEM_TYPE_CODE,
-                );
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(
+                MesAutoCodeRuleCode.MD_ITEM_TYPE_CODE,
+              );
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '自动生成' },
diff --git a/apps/web-ele/src/views/mes/md/vendor/data.ts b/apps/web-ele/src/views/mes/md/vendor/data.ts
index 8e9a3aea3..c612e8abf 100644
--- a/apps/web-ele/src/views/mes/md/vendor/data.ts
+++ b/apps/web-ele/src/views/mes/md/vendor/data.ts
@@ -46,14 +46,10 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
           ElButton,
           {
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(
-                  MesAutoCodeRuleCode.MD_VENDOR_CODE,
-                );
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(
+                MesAutoCodeRuleCode.MD_VENDOR_CODE,
+              );
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '自动生成' },
diff --git a/apps/web-ele/src/views/mes/md/workstation/data.ts b/apps/web-ele/src/views/mes/md/workstation/data.ts
index c559d6e17..51ba029ec 100644
--- a/apps/web-ele/src/views/mes/md/workstation/data.ts
+++ b/apps/web-ele/src/views/mes/md/workstation/data.ts
@@ -52,14 +52,10 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
           ElButton,
           {
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(
-                  MesAutoCodeRuleCode.MD_WORKSTATION_CODE,
-                );
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(
+                MesAutoCodeRuleCode.MD_WORKSTATION_CODE,
+              );
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '生成' },
diff --git a/apps/web-ele/src/views/mes/md/workstation/workshop/data.ts b/apps/web-ele/src/views/mes/md/workstation/workshop/data.ts
index be3d6f09f..9835ba25f 100644
--- a/apps/web-ele/src/views/mes/md/workstation/workshop/data.ts
+++ b/apps/web-ele/src/views/mes/md/workstation/workshop/data.ts
@@ -47,14 +47,10 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
           ElButton,
           {
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(
-                  MesAutoCodeRuleCode.MD_WORKSHOP_CODE,
-                );
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(
+                MesAutoCodeRuleCode.MD_WORKSHOP_CODE,
+              );
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '生成' },
diff --git a/apps/web-ele/src/views/mes/pro/process/data.ts b/apps/web-ele/src/views/mes/pro/process/data.ts
index 1fc136c30..d58db63a5 100644
--- a/apps/web-ele/src/views/mes/pro/process/data.ts
+++ b/apps/web-ele/src/views/mes/pro/process/data.ts
@@ -43,14 +43,10 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
           {
             type: 'default',
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(
-                  MesAutoCodeRuleCode.PRO_PROCESS_CODE,
-                );
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(
+                MesAutoCodeRuleCode.PRO_PROCESS_CODE,
+              );
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '生成' },
diff --git a/apps/web-ele/src/views/mes/pro/route/data.ts b/apps/web-ele/src/views/mes/pro/route/data.ts
index 5b4a56612..bb1c8ab3d 100644
--- a/apps/web-ele/src/views/mes/pro/route/data.ts
+++ b/apps/web-ele/src/views/mes/pro/route/data.ts
@@ -48,14 +48,10 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
           {
             type: 'default',
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(
-                  MesAutoCodeRuleCode.PRO_ROUTE_CODE,
-                );
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(
+                MesAutoCodeRuleCode.PRO_ROUTE_CODE,
+              );
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '生成' },
diff --git a/apps/web-ele/src/views/mes/qc/defect/data.ts b/apps/web-ele/src/views/mes/qc/defect/data.ts
index 622753830..848e0b0ee 100644
--- a/apps/web-ele/src/views/mes/qc/defect/data.ts
+++ b/apps/web-ele/src/views/mes/qc/defect/data.ts
@@ -36,14 +36,10 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
           ElButton,
           {
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(
-                  MesAutoCodeRuleCode.QC_DEFECT_CODE,
-                );
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(
+                MesAutoCodeRuleCode.QC_DEFECT_CODE,
+              );
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '自动生成' },
diff --git a/apps/web-ele/src/views/mes/qc/indicator/data.ts b/apps/web-ele/src/views/mes/qc/indicator/data.ts
index d227958c9..48819cef0 100644
--- a/apps/web-ele/src/views/mes/qc/indicator/data.ts
+++ b/apps/web-ele/src/views/mes/qc/indicator/data.ts
@@ -41,14 +41,10 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
           ElButton,
           {
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(
-                  MesAutoCodeRuleCode.QC_INDICATOR_CODE,
-                );
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(
+                MesAutoCodeRuleCode.QC_INDICATOR_CODE,
+              );
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '自动生成' },
diff --git a/apps/web-ele/src/views/mes/qc/indicatorresult/components/data.ts b/apps/web-ele/src/views/mes/qc/indicatorresult/components/data.ts
index c1be4b795..7a6779885 100644
--- a/apps/web-ele/src/views/mes/qc/indicatorresult/components/data.ts
+++ b/apps/web-ele/src/views/mes/qc/indicatorresult/components/data.ts
@@ -38,14 +38,10 @@ export function useQcIndicatorResultFormSchema(
           ElButton,
           {
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(
-                  MesAutoCodeRuleCode.QC_INDICATOR_RESULT_CODE,
-                );
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(
+                MesAutoCodeRuleCode.QC_INDICATOR_RESULT_CODE,
+              );
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '生成' },
diff --git a/apps/web-ele/src/views/mes/qc/ipqc/data.ts b/apps/web-ele/src/views/mes/qc/ipqc/data.ts
index 2ecd804ba..4f8f3b7e5 100644
--- a/apps/web-ele/src/views/mes/qc/ipqc/data.ts
+++ b/apps/web-ele/src/views/mes/qc/ipqc/data.ts
@@ -41,7 +41,10 @@ function syncUnqualified(formApi?: VbenFormApi) {
 }
 
 /** 新增/修改的表单 */
-export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
@@ -87,15 +90,12 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
         h(
           ElButton,
           {
+            disabled: formType === 'detail',
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(
-                  MesAutoCodeRuleCode.QC_IPQC_CODE,
-                );
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(
+                MesAutoCodeRuleCode.QC_IPQC_CODE,
+              );
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '生成' },
diff --git a/apps/web-ele/src/views/mes/qc/ipqc/modules/form.vue b/apps/web-ele/src/views/mes/qc/ipqc/modules/form.vue
index aff33a0ab..0bb0f75ca 100644
--- a/apps/web-ele/src/views/mes/qc/ipqc/modules/form.vue
+++ b/apps/web-ele/src/views/mes/qc/ipqc/modules/form.vue
@@ -157,7 +157,6 @@ const [Modal, modalApi] = useVbenModal({
       originalSnapshot.value = '';
       return;
     }
-    formApi.setState({ schema: useFormSchema(formApi) });
     subTabsName.value = 'line';
     // 加载数据
     const data = modalApi.getData<{
@@ -166,6 +165,7 @@ const [Modal, modalApi] = useVbenModal({
       prefill?: MesQcIpqcApi.Ipqc;
     }>();
     formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
     formApi.setDisabled(formType.value === 'detail');
     modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
     if (data?.id) {
diff --git a/apps/web-ele/src/views/mes/qc/iqc/data.ts b/apps/web-ele/src/views/mes/qc/iqc/data.ts
index 804ef7df4..c95250a6e 100644
--- a/apps/web-ele/src/views/mes/qc/iqc/data.ts
+++ b/apps/web-ele/src/views/mes/qc/iqc/data.ts
@@ -21,7 +21,10 @@ import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 export type FormType = 'create' | 'detail' | 'update';
 
 /** 新增/修改的表单 */
-export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
@@ -67,15 +70,12 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
         h(
           ElButton,
           {
+            disabled: formType === 'detail',
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(
-                  MesAutoCodeRuleCode.QC_IQC_CODE,
-                );
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(
+                MesAutoCodeRuleCode.QC_IQC_CODE,
+              );
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '生成' },
diff --git a/apps/web-ele/src/views/mes/qc/iqc/modules/form.vue b/apps/web-ele/src/views/mes/qc/iqc/modules/form.vue
index fdb4dcd8c..246a26cc7 100644
--- a/apps/web-ele/src/views/mes/qc/iqc/modules/form.vue
+++ b/apps/web-ele/src/views/mes/qc/iqc/modules/form.vue
@@ -158,7 +158,6 @@ const [Modal, modalApi] = useVbenModal({
       originalSnapshot.value = '';
       return;
     }
-    formApi.setState({ schema: useFormSchema(formApi) });
     subTabsName.value = 'line';
     // 加载数据
     const data = modalApi.getData<{
@@ -167,6 +166,7 @@ const [Modal, modalApi] = useVbenModal({
       prefill?: MesQcIqcApi.Iqc;
     }>();
     formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
     formApi.setDisabled(formType.value === 'detail');
     modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
     if (data?.id) {
diff --git a/apps/web-ele/src/views/mes/qc/oqc/data.ts b/apps/web-ele/src/views/mes/qc/oqc/data.ts
index b5027d32b..25654bfbc 100644
--- a/apps/web-ele/src/views/mes/qc/oqc/data.ts
+++ b/apps/web-ele/src/views/mes/qc/oqc/data.ts
@@ -20,7 +20,10 @@ import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 export type FormType = 'create' | 'detail' | 'update';
 
 /** 新增/修改的表单 */
-export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
@@ -66,15 +69,12 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
         h(
           ElButton,
           {
+            disabled: formType === 'detail',
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(
-                  MesAutoCodeRuleCode.QC_OQC_CODE,
-                );
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(
+                MesAutoCodeRuleCode.QC_OQC_CODE,
+              );
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '生成' },
diff --git a/apps/web-ele/src/views/mes/qc/oqc/modules/form.vue b/apps/web-ele/src/views/mes/qc/oqc/modules/form.vue
index 831308c22..b61273f7d 100644
--- a/apps/web-ele/src/views/mes/qc/oqc/modules/form.vue
+++ b/apps/web-ele/src/views/mes/qc/oqc/modules/form.vue
@@ -157,7 +157,6 @@ const [Modal, modalApi] = useVbenModal({
       originalSnapshot.value = '';
       return;
     }
-    formApi.setState({ schema: useFormSchema(formApi) });
     subTabsName.value = 'line';
     // 加载数据
     const data = modalApi.getData<{
@@ -166,6 +165,7 @@ const [Modal, modalApi] = useVbenModal({
       prefill?: MesQcOqcApi.Oqc;
     }>();
     formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
     formApi.setDisabled(formType.value === 'detail');
     modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
     if (data?.id) {
diff --git a/apps/web-ele/src/views/mes/qc/rqc/data.ts b/apps/web-ele/src/views/mes/qc/rqc/data.ts
index 1486090ec..7a7c6177e 100644
--- a/apps/web-ele/src/views/mes/qc/rqc/data.ts
+++ b/apps/web-ele/src/views/mes/qc/rqc/data.ts
@@ -33,7 +33,10 @@ function getRqcSourceDocTypeOptions() {
 }
 
 /** 新增/修改的表单 */
-export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
@@ -79,15 +82,12 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
         h(
           ElButton,
           {
+            disabled: formType === 'detail',
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(
-                  MesAutoCodeRuleCode.QC_RQC_CODE,
-                );
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(
+                MesAutoCodeRuleCode.QC_RQC_CODE,
+              );
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '生成' },
diff --git a/apps/web-ele/src/views/mes/qc/rqc/modules/form.vue b/apps/web-ele/src/views/mes/qc/rqc/modules/form.vue
index 90bb852ec..84f383020 100644
--- a/apps/web-ele/src/views/mes/qc/rqc/modules/form.vue
+++ b/apps/web-ele/src/views/mes/qc/rqc/modules/form.vue
@@ -157,7 +157,6 @@ const [Modal, modalApi] = useVbenModal({
       originalSnapshot.value = '';
       return;
     }
-    formApi.setState({ schema: useFormSchema(formApi) });
     subTabsName.value = 'line';
     // 加载数据
     const data = modalApi.getData<{
@@ -166,6 +165,7 @@ const [Modal, modalApi] = useVbenModal({
       prefill?: MesQcRqcApi.Rqc;
     }>();
     formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
     formApi.setDisabled(formType.value === 'detail');
     modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
     if (data?.id) {
diff --git a/apps/web-ele/src/views/mes/qc/template/data.ts b/apps/web-ele/src/views/mes/qc/template/data.ts
index 490231ac2..91b66d858 100644
--- a/apps/web-ele/src/views/mes/qc/template/data.ts
+++ b/apps/web-ele/src/views/mes/qc/template/data.ts
@@ -45,14 +45,10 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
           ElButton,
           {
             onClick: async () => {
-              try {
-                const code = await generateAutoCode(
-                  MesAutoCodeRuleCode.QC_TEMPLATE_CODE,
-                );
-                await formApi?.setFieldValue('code', code);
-              } catch (error) {
-                console.error(error);
-              }
+              const code = await generateAutoCode(
+                MesAutoCodeRuleCode.QC_TEMPLATE_CODE,
+              );
+              await formApi?.setFieldValue('code', code);
             },
           },
           { default: () => '自动生成' },
diff --git a/apps/web-ele/src/views/mes/wm/warehouse/area/data.ts b/apps/web-ele/src/views/mes/wm/warehouse/area/data.ts
index c6c676806..d787774c3 100644
--- a/apps/web-ele/src/views/mes/wm/warehouse/area/data.ts
+++ b/apps/web-ele/src/views/mes/wm/warehouse/area/data.ts
@@ -82,14 +82,10 @@ export function useFormSchema(
                 ElButton,
                 {
                   onClick: async () => {
-                    try {
-                      const code = await generateAutoCode(
-                        MesAutoCodeRuleCode.WM_AREA_CODE,
-                      );
-                      await formApi?.setFieldValue('code', code);
-                    } catch (error) {
-                      console.error(error);
-                    }
+                    const code = await generateAutoCode(
+                      MesAutoCodeRuleCode.WM_AREA_CODE,
+                    );
+                    await formApi?.setFieldValue('code', code);
                   },
                 },
                 { default: () => '自动生成' },
diff --git a/apps/web-ele/src/views/mes/wm/warehouse/data.ts b/apps/web-ele/src/views/mes/wm/warehouse/data.ts
index fafda94e7..5516a3ce4 100644
--- a/apps/web-ele/src/views/mes/wm/warehouse/data.ts
+++ b/apps/web-ele/src/views/mes/wm/warehouse/data.ts
@@ -51,14 +51,10 @@ export function useFormSchema(
                 ElButton,
                 {
                   onClick: async () => {
-                    try {
-                      const code = await generateAutoCode(
-                        MesAutoCodeRuleCode.WM_WAREHOUSE_CODE,
-                      );
-                      await formApi?.setFieldValue('code', code);
-                    } catch (error) {
-                      console.error(error);
-                    }
+                    const code = await generateAutoCode(
+                      MesAutoCodeRuleCode.WM_WAREHOUSE_CODE,
+                    );
+                    await formApi?.setFieldValue('code', code);
                   },
                 },
                 { default: () => '自动生成' },
diff --git a/apps/web-ele/src/views/mes/wm/warehouse/location/data.ts b/apps/web-ele/src/views/mes/wm/warehouse/location/data.ts
index c3d00a1a3..dbba0d318 100644
--- a/apps/web-ele/src/views/mes/wm/warehouse/location/data.ts
+++ b/apps/web-ele/src/views/mes/wm/warehouse/location/data.ts
@@ -51,14 +51,10 @@ export function useFormSchema(
                 ElButton,
                 {
                   onClick: async () => {
-                    try {
-                      const code = await generateAutoCode(
-                        MesAutoCodeRuleCode.WM_LOCATION_CODE,
-                      );
-                      await formApi?.setFieldValue('code', code);
-                    } catch (error) {
-                      console.error(error);
-                    }
+                    const code = await generateAutoCode(
+                      MesAutoCodeRuleCode.WM_LOCATION_CODE,
+                    );
+                    await formApi?.setFieldValue('code', code);
                   },
                 },
                 { default: () => '自动生成' },

From 76e9df6e8e3bd3b659b8d091d941496720b57c25 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 29 May 2026 22:08:51 +0800
Subject: [PATCH 18/52] =?UTF-8?q?feat(mes/qc):=20=E8=BF=81=E7=A7=BB?=
 =?UTF-8?q?=E5=BE=85=E6=A3=80=E4=BB=BB=E5=8A=A1=EF=BC=88pendinginspect?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

迁移待检任务列表页到 antd 和 ele。新增分页查询 API，列表展示
来源单据类型、检验类型、物料、数量、供应商/工单/客户等字段。
---
 .../src/api/mes/qc/pendinginspect/index.ts    |  41 ++++
 .../src/views/mes/qc/pendinginspect/data.ts   | 103 +++++++++
 .../src/views/mes/qc/pendinginspect/index.vue | 193 +++++++++++++++++
 .../src/api/mes/qc/pendinginspect/index.ts    |  41 ++++
 .../src/views/mes/qc/pendinginspect/data.ts   | 103 +++++++++
 .../src/views/mes/qc/pendinginspect/index.vue | 197 ++++++++++++++++++
 6 files changed, 678 insertions(+)
 create mode 100644 apps/web-antd/src/api/mes/qc/pendinginspect/index.ts
 create mode 100644 apps/web-antd/src/views/mes/qc/pendinginspect/data.ts
 create mode 100644 apps/web-antd/src/views/mes/qc/pendinginspect/index.vue
 create mode 100644 apps/web-ele/src/api/mes/qc/pendinginspect/index.ts
 create mode 100644 apps/web-ele/src/views/mes/qc/pendinginspect/data.ts
 create mode 100644 apps/web-ele/src/views/mes/qc/pendinginspect/index.vue

diff --git a/apps/web-antd/src/api/mes/qc/pendinginspect/index.ts b/apps/web-antd/src/api/mes/qc/pendinginspect/index.ts
new file mode 100644
index 000000000..dceda8213
--- /dev/null
+++ b/apps/web-antd/src/api/mes/qc/pendinginspect/index.ts
@@ -0,0 +1,41 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesQcPendingInspectApi {
+  /** MES 待检任务 */
+  export interface PendingInspect {
+    sourceDocType?: number; // 来源单据类型（MesBizTypeConstants）
+    sourceDocId?: number; // 来源单据 ID
+    sourceLineId?: number; // 来源单据行 ID
+    sourceDocCode?: string; // 来源单据编号
+    qcType?: number; // 检验类型（MesQcTypeEnum）
+    itemId?: number; // 物料 ID
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    specification?: string; // 规格型号
+    unitName?: string; // 单位名称
+    quantity?: number; // 待检数量
+    // 供应商（IQC 场景）
+    vendorId?: number; // 供应商 ID
+    vendorName?: string; // 供应商名称
+    // 工单/工作站/任务（IPQC/RQC 场景）
+    workOrderId?: number; // 生产工单 ID
+    workstationId?: number; // 工作站 ID
+    workstationName?: string; // 工作站名称
+    taskId?: number; // 生产任务 ID
+    taskCode?: string; // 生产任务编码
+    // 客户（OQC/RQC 场景）
+    clientId?: number; // 客户 ID
+    clientName?: string; // 客户名称
+    recordTime?: number; // 记录时间（epoch ms）
+  }
+}
+
+/** 查询待检任务分页 */
+export function getPendingInspectPage(params: PageParam) {
+  return requestClient.get<PageResult<MesQcPendingInspectApi.PendingInspect>>(
+    '/mes/qc/pending-inspect/page',
+    { params },
+  );
+}
diff --git a/apps/web-antd/src/views/mes/qc/pendinginspect/data.ts b/apps/web-antd/src/views/mes/qc/pendinginspect/data.ts
new file mode 100644
index 000000000..f303b65a5
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/pendinginspect/data.ts
@@ -0,0 +1,103 @@
+import type { VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcPendingInspectApi } from '#/api/mes/qc/pendinginspect';
+
+import { markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'sourceDocCode',
+      label: '来源单据编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入来源单据编号',
+      },
+    },
+    {
+      fieldName: 'itemId',
+      label: '产品物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择产品物料',
+      },
+    },
+    {
+      fieldName: 'qcType',
+      label: '检验类型',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_QC_TYPE, 'number'),
+        placeholder: '请选择检验类型',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesQcPendingInspectApi.PendingInspect>['columns'] {
+  return [
+    {
+      field: 'sourceDocType',
+      title: '来源单据类型',
+      width: 130,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_QC_SOURCE_DOC_TYPE },
+      },
+    },
+    {
+      field: 'sourceDocCode',
+      title: '来源单据编号',
+      width: 160,
+    },
+    {
+      field: 'qcType',
+      title: '检验类型',
+      minWidth: 150,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_QC_TYPE },
+      },
+    },
+    {
+      field: 'itemCode',
+      title: '物料编码',
+      minWidth: 130,
+    },
+    {
+      field: 'itemName',
+      title: '物料名称',
+      minWidth: 150,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      width: 130,
+    },
+    {
+      field: 'quantity',
+      title: '待检数量',
+      width: 100,
+    },
+    {
+      field: 'unitName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      title: '操作',
+      width: 130,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/qc/pendinginspect/index.vue b/apps/web-antd/src/views/mes/qc/pendinginspect/index.vue
new file mode 100644
index 000000000..bbcfc727d
--- /dev/null
+++ b/apps/web-antd/src/views/mes/qc/pendinginspect/index.vue
@@ -0,0 +1,193 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcIpqcApi } from '#/api/mes/qc/ipqc';
+import type { MesQcIqcApi } from '#/api/mes/qc/iqc';
+import type { MesQcOqcApi } from '#/api/mes/qc/oqc';
+import type { MesQcPendingInspectApi } from '#/api/mes/qc/pendinginspect';
+import type { MesQcRqcApi } from '#/api/mes/qc/rqc';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getPendingInspectPage } from '#/api/mes/qc/pendinginspect';
+import { MesQcTypeEnum } from '#/views/mes/utils/constants';
+
+import IpqcForm from '../ipqc/modules/form.vue';
+import IqcForm from '../iqc/modules/form.vue';
+import OqcForm from '../oqc/modules/form.vue';
+import RqcForm from '../rqc/modules/form.vue';
+import { useGridColumns, useGridFormSchema } from './data';
+
+const [IqcFormModal, iqcFormModalApi] = useVbenModal({
+  connectedComponent: IqcForm,
+  destroyOnClose: true,
+});
+const [IpqcFormModal, ipqcFormModalApi] = useVbenModal({
+  connectedComponent: IpqcForm,
+  destroyOnClose: true,
+});
+const [OqcFormModal, oqcFormModalApi] = useVbenModal({
+  connectedComponent: OqcForm,
+  destroyOnClose: true,
+});
+const [RqcFormModal, rqcFormModalApi] = useVbenModal({
+  connectedComponent: RqcForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建来料检验单（IQC） */
+function handleCreateIqc(row: MesQcPendingInspectApi.PendingInspect) {
+  const prefill: MesQcIqcApi.Iqc = {
+    itemId: row.itemId,
+    name: `${row.sourceDocCode} 来料检验单`,
+    receivedQuantity: row.quantity,
+    receiveDate: row.recordTime,
+    sourceDocCode: row.sourceDocCode,
+    sourceDocId: row.sourceDocId,
+    sourceDocType: row.sourceDocType,
+    sourceLineId: row.sourceLineId,
+    vendorId: row.vendorId,
+  };
+  iqcFormModalApi.setData({ formType: 'create', prefill }).open();
+}
+
+/** 创建过程检验单（IPQC） */
+function handleCreateIpqc(row: MesQcPendingInspectApi.PendingInspect) {
+  const prefill: MesQcIpqcApi.Ipqc = {
+    checkQuantity: row.quantity,
+    inspectDate: row.recordTime,
+    itemId: row.itemId,
+    name: `${row.sourceDocCode} 过程检验单`,
+    sourceDocCode: row.sourceDocCode,
+    sourceDocId: row.sourceDocId,
+    sourceDocType: row.sourceDocType,
+    sourceLineId: row.sourceLineId,
+    taskId: row.taskId,
+    workOrderId: row.workOrderId,
+    workstationId: row.workstationId,
+  };
+  ipqcFormModalApi.setData({ formType: 'create', prefill }).open();
+}
+
+/** 创建出货检验单（OQC） */
+function handleCreateOqc(row: MesQcPendingInspectApi.PendingInspect) {
+  const prefill: MesQcOqcApi.Oqc = {
+    clientId: row.clientId,
+    itemId: row.itemId,
+    name: `${row.sourceDocCode} 出货检验单`,
+    outDate: row.recordTime,
+    outQuantity: row.quantity,
+    sourceDocCode: row.sourceDocCode,
+    sourceDocId: row.sourceDocId,
+    sourceDocType: row.sourceDocType,
+    sourceLineId: row.sourceLineId,
+  };
+  oqcFormModalApi.setData({ formType: 'create', prefill }).open();
+}
+
+/** 创建退货检验单（RQC） */
+function handleCreateRqc(row: MesQcPendingInspectApi.PendingInspect) {
+  const prefill: MesQcRqcApi.Rqc = {
+    checkQuantity: row.quantity,
+    inspectDate: row.recordTime,
+    itemId: row.itemId,
+    name: `${row.sourceDocCode} 退料检验单`,
+    sourceDocCode: row.sourceDocCode,
+    sourceDocId: row.sourceDocId,
+    sourceDocType: row.sourceDocType,
+    sourceLineId: row.sourceLineId,
+  };
+  rqcFormModalApi.setData({ formType: 'create', prefill }).open();
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getPendingInspectPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesQcPendingInspectApi.PendingInspect>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【质量】待检任务、检验结果、缺陷记录"
+        url="https://doc.iocoder.cn/mes/qc/pending-inspect/"
+      />
+    </template>
+
+    <IqcFormModal @success="handleRefresh" />
+    <IpqcFormModal @success="handleRefresh" />
+    <OqcFormModal @success="handleRefresh" />
+    <RqcFormModal @success="handleRefresh" />
+
+    <Grid table-title="待检任务列表">
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: '来料检验',
+              type: 'link',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:qc-iqc:create'],
+              ifShow: row.qcType === MesQcTypeEnum.IQC,
+              onClick: handleCreateIqc.bind(null, row),
+            },
+            {
+              label: '过程检验',
+              type: 'link',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:qc-ipqc:create'],
+              ifShow: row.qcType === MesQcTypeEnum.IPQC,
+              onClick: handleCreateIpqc.bind(null, row),
+            },
+            {
+              label: '出货检验',
+              type: 'link',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:qc-oqc:create'],
+              ifShow: row.qcType === MesQcTypeEnum.OQC,
+              onClick: handleCreateOqc.bind(null, row),
+            },
+            {
+              label: '退料检验',
+              type: 'link',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:qc-rqc:create'],
+              ifShow: row.qcType === MesQcTypeEnum.RQC,
+              onClick: handleCreateRqc.bind(null, row),
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-ele/src/api/mes/qc/pendinginspect/index.ts b/apps/web-ele/src/api/mes/qc/pendinginspect/index.ts
new file mode 100644
index 000000000..dceda8213
--- /dev/null
+++ b/apps/web-ele/src/api/mes/qc/pendinginspect/index.ts
@@ -0,0 +1,41 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesQcPendingInspectApi {
+  /** MES 待检任务 */
+  export interface PendingInspect {
+    sourceDocType?: number; // 来源单据类型（MesBizTypeConstants）
+    sourceDocId?: number; // 来源单据 ID
+    sourceLineId?: number; // 来源单据行 ID
+    sourceDocCode?: string; // 来源单据编号
+    qcType?: number; // 检验类型（MesQcTypeEnum）
+    itemId?: number; // 物料 ID
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    specification?: string; // 规格型号
+    unitName?: string; // 单位名称
+    quantity?: number; // 待检数量
+    // 供应商（IQC 场景）
+    vendorId?: number; // 供应商 ID
+    vendorName?: string; // 供应商名称
+    // 工单/工作站/任务（IPQC/RQC 场景）
+    workOrderId?: number; // 生产工单 ID
+    workstationId?: number; // 工作站 ID
+    workstationName?: string; // 工作站名称
+    taskId?: number; // 生产任务 ID
+    taskCode?: string; // 生产任务编码
+    // 客户（OQC/RQC 场景）
+    clientId?: number; // 客户 ID
+    clientName?: string; // 客户名称
+    recordTime?: number; // 记录时间（epoch ms）
+  }
+}
+
+/** 查询待检任务分页 */
+export function getPendingInspectPage(params: PageParam) {
+  return requestClient.get<PageResult<MesQcPendingInspectApi.PendingInspect>>(
+    '/mes/qc/pending-inspect/page',
+    { params },
+  );
+}
diff --git a/apps/web-ele/src/views/mes/qc/pendinginspect/data.ts b/apps/web-ele/src/views/mes/qc/pendinginspect/data.ts
new file mode 100644
index 000000000..758f1a23f
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/pendinginspect/data.ts
@@ -0,0 +1,103 @@
+import type { VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcPendingInspectApi } from '#/api/mes/qc/pendinginspect';
+
+import { markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'sourceDocCode',
+      label: '来源单据编号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入来源单据编号',
+      },
+    },
+    {
+      fieldName: 'itemId',
+      label: '产品物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择产品物料',
+      },
+    },
+    {
+      fieldName: 'qcType',
+      label: '检验类型',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_QC_TYPE, 'number'),
+        placeholder: '请选择检验类型',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesQcPendingInspectApi.PendingInspect>['columns'] {
+  return [
+    {
+      field: 'sourceDocType',
+      title: '来源单据类型',
+      width: 130,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_QC_SOURCE_DOC_TYPE },
+      },
+    },
+    {
+      field: 'sourceDocCode',
+      title: '来源单据编号',
+      width: 160,
+    },
+    {
+      field: 'qcType',
+      title: '检验类型',
+      minWidth: 150,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_QC_TYPE },
+      },
+    },
+    {
+      field: 'itemCode',
+      title: '物料编码',
+      minWidth: 130,
+    },
+    {
+      field: 'itemName',
+      title: '物料名称',
+      minWidth: 150,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      width: 130,
+    },
+    {
+      field: 'quantity',
+      title: '待检数量',
+      width: 100,
+    },
+    {
+      field: 'unitName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      title: '操作',
+      width: 130,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/qc/pendinginspect/index.vue b/apps/web-ele/src/views/mes/qc/pendinginspect/index.vue
new file mode 100644
index 000000000..8363fd201
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/pendinginspect/index.vue
@@ -0,0 +1,197 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesQcIpqcApi } from '#/api/mes/qc/ipqc';
+import type { MesQcIqcApi } from '#/api/mes/qc/iqc';
+import type { MesQcOqcApi } from '#/api/mes/qc/oqc';
+import type { MesQcPendingInspectApi } from '#/api/mes/qc/pendinginspect';
+import type { MesQcRqcApi } from '#/api/mes/qc/rqc';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getPendingInspectPage } from '#/api/mes/qc/pendinginspect';
+import { MesQcTypeEnum } from '#/views/mes/utils/constants';
+
+import IpqcForm from '../ipqc/modules/form.vue';
+import IqcForm from '../iqc/modules/form.vue';
+import OqcForm from '../oqc/modules/form.vue';
+import RqcForm from '../rqc/modules/form.vue';
+import { useGridColumns, useGridFormSchema } from './data';
+
+const [IqcFormModal, iqcFormModalApi] = useVbenModal({
+  connectedComponent: IqcForm,
+  destroyOnClose: true,
+});
+const [IpqcFormModal, ipqcFormModalApi] = useVbenModal({
+  connectedComponent: IpqcForm,
+  destroyOnClose: true,
+});
+const [OqcFormModal, oqcFormModalApi] = useVbenModal({
+  connectedComponent: OqcForm,
+  destroyOnClose: true,
+});
+const [RqcFormModal, rqcFormModalApi] = useVbenModal({
+  connectedComponent: RqcForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建来料检验单（IQC） */
+function handleCreateIqc(row: MesQcPendingInspectApi.PendingInspect) {
+  const prefill: MesQcIqcApi.Iqc = {
+    itemId: row.itemId,
+    name: `${row.sourceDocCode} 来料检验单`,
+    receivedQuantity: row.quantity,
+    receiveDate: row.recordTime,
+    sourceDocCode: row.sourceDocCode,
+    sourceDocId: row.sourceDocId,
+    sourceDocType: row.sourceDocType,
+    sourceLineId: row.sourceLineId,
+    vendorId: row.vendorId,
+  };
+  iqcFormModalApi.setData({ formType: 'create', prefill }).open();
+}
+
+/** 创建过程检验单（IPQC） */
+function handleCreateIpqc(row: MesQcPendingInspectApi.PendingInspect) {
+  const prefill: MesQcIpqcApi.Ipqc = {
+    checkQuantity: row.quantity,
+    inspectDate: row.recordTime,
+    itemId: row.itemId,
+    name: `${row.sourceDocCode} 过程检验单`,
+    sourceDocCode: row.sourceDocCode,
+    sourceDocId: row.sourceDocId,
+    sourceDocType: row.sourceDocType,
+    sourceLineId: row.sourceLineId,
+    taskId: row.taskId,
+    workOrderId: row.workOrderId,
+    workstationId: row.workstationId,
+  };
+  ipqcFormModalApi.setData({ formType: 'create', prefill }).open();
+}
+
+/** 创建出货检验单（OQC） */
+function handleCreateOqc(row: MesQcPendingInspectApi.PendingInspect) {
+  const prefill: MesQcOqcApi.Oqc = {
+    clientId: row.clientId,
+    itemId: row.itemId,
+    name: `${row.sourceDocCode} 出货检验单`,
+    outDate: row.recordTime,
+    outQuantity: row.quantity,
+    sourceDocCode: row.sourceDocCode,
+    sourceDocId: row.sourceDocId,
+    sourceDocType: row.sourceDocType,
+    sourceLineId: row.sourceLineId,
+  };
+  oqcFormModalApi.setData({ formType: 'create', prefill }).open();
+}
+
+/** 创建退货检验单（RQC） */
+function handleCreateRqc(row: MesQcPendingInspectApi.PendingInspect) {
+  const prefill: MesQcRqcApi.Rqc = {
+    checkQuantity: row.quantity,
+    inspectDate: row.recordTime,
+    itemId: row.itemId,
+    name: `${row.sourceDocCode} 退料检验单`,
+    sourceDocCode: row.sourceDocCode,
+    sourceDocId: row.sourceDocId,
+    sourceDocType: row.sourceDocType,
+    sourceLineId: row.sourceLineId,
+  };
+  rqcFormModalApi.setData({ formType: 'create', prefill }).open();
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getPendingInspectPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesQcPendingInspectApi.PendingInspect>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【质量】待检任务、检验结果、缺陷记录"
+        url="https://doc.iocoder.cn/mes/qc/pending-inspect/"
+      />
+    </template>
+
+    <IqcFormModal @success="handleRefresh" />
+    <IpqcFormModal @success="handleRefresh" />
+    <OqcFormModal @success="handleRefresh" />
+    <RqcFormModal @success="handleRefresh" />
+
+    <Grid table-title="待检任务列表">
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: '来料检验',
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:qc-iqc:create'],
+              ifShow: row.qcType === MesQcTypeEnum.IQC,
+              onClick: handleCreateIqc.bind(null, row),
+            },
+            {
+              label: '过程检验',
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:qc-ipqc:create'],
+              ifShow: row.qcType === MesQcTypeEnum.IPQC,
+              onClick: handleCreateIpqc.bind(null, row),
+            },
+            {
+              label: '出货检验',
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:qc-oqc:create'],
+              ifShow: row.qcType === MesQcTypeEnum.OQC,
+              onClick: handleCreateOqc.bind(null, row),
+            },
+            {
+              label: '退料检验',
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:qc-rqc:create'],
+              ifShow: row.qcType === MesQcTypeEnum.RQC,
+              onClick: handleCreateRqc.bind(null, row),
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>

From b2ccdf80b26e91752a4c86bf752d17468df75df4 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 29 May 2026 22:09:12 +0800
Subject: [PATCH 19/52] =?UTF-8?q?feat(mes/qc):=20=E8=BF=81=E7=A7=BB?=
 =?UTF-8?q?=E6=89=B9=E6=AC=A1=E8=BF=BD=E6=BA=AF=EF=BC=88batchtrace?=
 =?UTF-8?q?=EF=BC=89ele=20=E7=AB=AF=20+=20antd=20=E6=94=B9=E7=94=A8=20Vben?=
 =?UTF-8?q?=20Description?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- ele: 新增 mes/wm/batch API、batchtrace 主页和向前/向后追溯子组件，
  与 antd 端实现保持一致
- antd: trace-detail 改用 useDescription({ schema }) 模式，schema
  抽到 data.ts 的 useDetailSchema()；trace-list 的 pagerConfig /
  rowConfig / toolbarConfig 单行展开为多行
---
 .../src/views/mes/qc/batchtrace/data.ts       |  60 +++++
 .../qc/batchtrace/modules/trace-detail.vue    |  57 +----
 .../mes/qc/batchtrace/modules/trace-list.vue  |  13 +-
 apps/web-ele/src/api/mes/wm/batch/index.ts    |  67 +++++
 .../src/views/mes/qc/batchtrace/data.ts       | 229 ++++++++++++++++++
 .../src/views/mes/qc/batchtrace/index.vue     |  82 +++++++
 .../qc/batchtrace/modules/trace-detail.vue    |  58 +++++
 .../mes/qc/batchtrace/modules/trace-list.vue  |  67 +++++
 8 files changed, 585 insertions(+), 48 deletions(-)
 create mode 100644 apps/web-ele/src/api/mes/wm/batch/index.ts
 create mode 100644 apps/web-ele/src/views/mes/qc/batchtrace/data.ts
 create mode 100644 apps/web-ele/src/views/mes/qc/batchtrace/index.vue
 create mode 100644 apps/web-ele/src/views/mes/qc/batchtrace/modules/trace-detail.vue
 create mode 100644 apps/web-ele/src/views/mes/qc/batchtrace/modules/trace-list.vue

diff --git a/apps/web-antd/src/views/mes/qc/batchtrace/data.ts b/apps/web-antd/src/views/mes/qc/batchtrace/data.ts
index 6e7f8c042..1b215487a 100644
--- a/apps/web-antd/src/views/mes/qc/batchtrace/data.ts
+++ b/apps/web-antd/src/views/mes/qc/batchtrace/data.ts
@@ -1,6 +1,7 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesWmBatchApi } from '#/api/mes/wm/batch';
+import type { DescriptionItemSchema } from '#/components/description';
 
 import { markRaw } from 'vue';
 
@@ -167,3 +168,62 @@ export function useTraceGridColumns(): VxeTableGridOptions<MesWmBatchApi.Batch>[
     },
   ];
 }
+
+/** 批次追溯详情的描述字段 */
+export function useDetailSchema(): DescriptionItemSchema[] {
+  return [
+    {
+      field: 'code',
+      label: '批次编号',
+    },
+    {
+      field: 'itemCode',
+      label: '物资编码',
+    },
+    {
+      field: 'itemName',
+      label: '物资名称',
+    },
+    {
+      field: 'itemSpecification',
+      label: '规格型号',
+      span: 3,
+    },
+    {
+      field: 'purchaseOrderCode',
+      label: '采购订单编号',
+    },
+    {
+      field: 'vendorCode',
+      label: '供应商编码',
+    },
+    {
+      field: 'vendorName',
+      label: '供应商名称',
+    },
+    {
+      field: 'salesOrderCode',
+      label: '销售订单编号',
+    },
+    {
+      field: 'clientCode',
+      label: '客户编码',
+    },
+    {
+      field: 'clientName',
+      label: '客户名称',
+    },
+    {
+      field: 'lotNumber',
+      label: '生产批号',
+    },
+    {
+      field: 'workOrderCode',
+      label: '生产工单',
+    },
+    {
+      field: 'workstationCode',
+      label: '工作站编码',
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/qc/batchtrace/modules/trace-detail.vue b/apps/web-antd/src/views/mes/qc/batchtrace/modules/trace-detail.vue
index 5782e28ff..7fcba7e0b 100644
--- a/apps/web-antd/src/views/mes/qc/batchtrace/modules/trace-detail.vue
+++ b/apps/web-antd/src/views/mes/qc/batchtrace/modules/trace-detail.vue
@@ -5,13 +5,22 @@ import { ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
 
-import { Descriptions, Tabs } from 'ant-design-vue';
+import { Tabs } from 'ant-design-vue';
 
+import { useDescription } from '#/components/description';
+
+import { useDetailSchema } from '../data';
 import TraceList from './trace-list.vue';
 
 const detailData = ref<MesWmBatchApi.Batch>(); // 当前批次详情
 const subTabsName = ref<'backward' | 'forward'>('forward'); // 当前激活的追溯方向
 
+const [Descriptions] = useDescription({
+  bordered: true,
+  column: 3,
+  schema: useDetailSchema(),
+});
+
 const [Modal, modalApi] = useVbenModal({
   onOpenChange(isOpen) {
     if (!isOpen) {
@@ -31,53 +40,11 @@ const [Modal, modalApi] = useVbenModal({
     :show-cancel-button="false"
     :show-confirm-button="false"
   >
-    <div class="mx-4 mt-2">
-      <Descriptions :column="3" bordered size="small">
-        <Descriptions.Item label="批次编号">
-          {{ detailData?.code || '-' }}
-        </Descriptions.Item>
-        <Descriptions.Item label="物资编码">
-          {{ detailData?.itemCode || '-' }}
-        </Descriptions.Item>
-        <Descriptions.Item label="物资名称">
-          {{ detailData?.itemName || '-' }}
-        </Descriptions.Item>
-        <Descriptions.Item label="规格型号" :span="3">
-          {{ detailData?.itemSpecification || '-' }}
-        </Descriptions.Item>
-        <Descriptions.Item label="采购订单编号">
-          {{ detailData?.purchaseOrderCode || '-' }}
-        </Descriptions.Item>
-        <Descriptions.Item label="供应商编码">
-          {{ detailData?.vendorCode || '-' }}
-        </Descriptions.Item>
-        <Descriptions.Item label="供应商名称">
-          {{ detailData?.vendorName || '-' }}
-        </Descriptions.Item>
-        <Descriptions.Item label="销售订单编号">
-          {{ detailData?.salesOrderCode || '-' }}
-        </Descriptions.Item>
-        <Descriptions.Item label="客户编码">
-          {{ detailData?.clientCode || '-' }}
-        </Descriptions.Item>
-        <Descriptions.Item label="客户名称">
-          {{ detailData?.clientName || '-' }}
-        </Descriptions.Item>
-        <Descriptions.Item label="生产批号">
-          {{ detailData?.lotNumber || '-' }}
-        </Descriptions.Item>
-        <Descriptions.Item label="生产工单">
-          {{ detailData?.workOrderCode || '-' }}
-        </Descriptions.Item>
-        <Descriptions.Item label="工作站编码">
-          {{ detailData?.workstationCode || '-' }}
-        </Descriptions.Item>
-      </Descriptions>
-    </div>
+    <Descriptions class="mx-4 mt-2" :data="detailData" />
     <Tabs
       v-if="detailData?.code"
       v-model:active-key="subTabsName"
-      class="mx-4! mt-4!"
+      class="mx-4 mt-4"
       type="card"
     >
       <Tabs.TabPane key="forward" tab="向前追溯">
diff --git a/apps/web-antd/src/views/mes/qc/batchtrace/modules/trace-list.vue b/apps/web-antd/src/views/mes/qc/batchtrace/modules/trace-list.vue
index 0c63921c8..ea23377d1 100644
--- a/apps/web-antd/src/views/mes/qc/batchtrace/modules/trace-list.vue
+++ b/apps/web-antd/src/views/mes/qc/batchtrace/modules/trace-list.vue
@@ -21,10 +21,17 @@ const [Grid, gridApi] = useVbenVxeGrid({
   gridOptions: {
     columns: useTraceGridColumns(),
     minHeight: 240,
-    pagerConfig: { enabled: false },
-    rowConfig: { isHover: true, keyField: 'id' },
+    pagerConfig: {
+      enabled: false,
+    },
+    rowConfig: {
+      isHover: true,
+      keyField: 'id',
+    },
     showOverflow: true,
-    toolbarConfig: { enabled: false },
+    toolbarConfig: {
+      enabled: false,
+    },
   } as VxeTableGridOptions<MesWmBatchApi.Batch>,
 });
 
diff --git a/apps/web-ele/src/api/mes/wm/batch/index.ts b/apps/web-ele/src/api/mes/wm/batch/index.ts
new file mode 100644
index 000000000..02ca877eb
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/batch/index.ts
@@ -0,0 +1,67 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmBatchApi {
+  /** MES 批次 */
+  export interface Batch {
+    id?: number; // 批次 ID
+    code?: string; // 批次编码
+    itemId?: number; // 物料 ID
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    itemSpecification?: string; // 规格型号
+    unitName?: string; // 单位名称
+    produceDate?: Date; // 生产日期
+    expireDate?: Date; // 有效期
+    receiptDate?: Date; // 入库日期
+    vendorId?: number; // 供应商 ID
+    vendorCode?: string; // 供应商编码
+    vendorName?: string; // 供应商名称
+    clientId?: number; // 客户 ID
+    clientCode?: string; // 客户编码
+    clientName?: string; // 客户名称
+    purchaseOrderCode?: string; // 采购订单编号
+    salesOrderCode?: string; // 销售订单编号
+    workOrderId?: number; // 生产工单 ID
+    workOrderCode?: string; // 生产工单编号
+    taskId?: number; // 生产任务 ID
+    taskCode?: string; // 生产任务编号
+    workstationId?: number; // 工作站 ID
+    workstationCode?: string; // 工作站编码
+    toolId?: number; // 工具 ID
+    toolCode?: string; // 工具编号
+    moldId?: number; // 模具 ID
+    lotNumber?: string; // 生产批号
+    qualityStatus?: number; // 质量状态
+    remark?: string; // 备注
+  }
+}
+
+/** 查询批次详情 */
+export function getBatch(id: number) {
+  return requestClient.get<MesWmBatchApi.Batch>(`/mes/wm/batch/get?id=${id}`);
+}
+
+/** 查询批次分页 */
+export function getBatchPage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmBatchApi.Batch>>(
+    '/mes/wm/batch/page',
+    { params },
+  );
+}
+
+/** 批次向前追溯 */
+export function getForwardBatchList(code: string) {
+  return requestClient.get<MesWmBatchApi.Batch[]>('/mes/wm/batch/forward-list', {
+    params: { code },
+  });
+}
+
+/** 批次向后追溯 */
+export function getBackwardBatchList(code: string) {
+  return requestClient.get<MesWmBatchApi.Batch[]>(
+    '/mes/wm/batch/backward-list',
+    { params: { code } },
+  );
+}
diff --git a/apps/web-ele/src/views/mes/qc/batchtrace/data.ts b/apps/web-ele/src/views/mes/qc/batchtrace/data.ts
new file mode 100644
index 000000000..807d64e68
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/batchtrace/data.ts
@@ -0,0 +1,229 @@
+import type { VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmBatchApi } from '#/api/mes/wm/batch';
+import type { DescriptionItemSchema } from '#/components/description';
+
+import { markRaw } from 'vue';
+
+import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入批次号',
+      },
+    },
+    {
+      fieldName: 'itemId',
+      label: '产品物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择产品物料',
+      },
+    },
+    {
+      fieldName: 'vendorId',
+      label: '供应商',
+      component: markRaw(MdVendorSelect),
+      componentProps: {
+        placeholder: '请选择供应商',
+      },
+    },
+    {
+      fieldName: 'clientId',
+      label: '客户',
+      component: markRaw(MdClientSelect),
+      componentProps: {
+        placeholder: '请选择客户',
+      },
+    },
+    {
+      fieldName: 'salesOrderCode',
+      label: '销售订单编号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入销售订单编号',
+      },
+    },
+    {
+      fieldName: 'purchaseOrderCode',
+      label: '采购订单编号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入采购订单编号',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesWmBatchApi.Batch>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '批次编号',
+      minWidth: 160,
+    },
+    {
+      field: 'itemCode',
+      title: '产品物料编码',
+      minWidth: 140,
+    },
+    {
+      field: 'itemName',
+      title: '产品物料名称',
+      minWidth: 160,
+    },
+    {
+      field: 'itemSpecification',
+      title: '规格型号',
+      minWidth: 140,
+    },
+    {
+      field: 'unitName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'vendorCode',
+      title: '供应商编码',
+      minWidth: 140,
+    },
+    {
+      field: 'vendorName',
+      title: '供应商名称',
+      minWidth: 160,
+    },
+    {
+      field: 'clientCode',
+      title: '客户编码',
+      minWidth: 140,
+    },
+    {
+      field: 'clientName',
+      title: '客户名称',
+      minWidth: 160,
+    },
+    {
+      field: 'salesOrderCode',
+      title: '销售订单编号',
+      minWidth: 160,
+    },
+    {
+      field: 'purchaseOrderCode',
+      title: '采购订单编号',
+      minWidth: 160,
+    },
+    {
+      title: '操作',
+      width: 110,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 追溯明细列表的字段 */
+export function useTraceGridColumns(): VxeTableGridOptions<MesWmBatchApi.Batch>['columns'] {
+  return [
+    {
+      field: 'workOrderCode',
+      title: '生产工单号',
+      width: 160,
+    },
+    {
+      field: 'code',
+      title: '批次编号',
+      minWidth: 160,
+    },
+    {
+      field: 'itemCode',
+      title: '产品物料编码',
+      minWidth: 140,
+    },
+    {
+      field: 'itemName',
+      title: '产品物料名称',
+      minWidth: 160,
+    },
+    {
+      field: 'itemSpecification',
+      title: '规格型号',
+      minWidth: 140,
+    },
+    {
+      field: 'unitName',
+      title: '单位',
+      width: 80,
+    },
+  ];
+}
+
+/** 批次追溯详情的描述字段 */
+export function useDetailSchema(): DescriptionItemSchema[] {
+  return [
+    {
+      field: 'code',
+      label: '批次编号',
+    },
+    {
+      field: 'itemCode',
+      label: '物资编码',
+    },
+    {
+      field: 'itemName',
+      label: '物资名称',
+    },
+    {
+      field: 'itemSpecification',
+      label: '规格型号',
+      span: 3,
+    },
+    {
+      field: 'purchaseOrderCode',
+      label: '采购订单编号',
+    },
+    {
+      field: 'vendorCode',
+      label: '供应商编码',
+    },
+    {
+      field: 'vendorName',
+      label: '供应商名称',
+    },
+    {
+      field: 'salesOrderCode',
+      label: '销售订单编号',
+    },
+    {
+      field: 'clientCode',
+      label: '客户编码',
+    },
+    {
+      field: 'clientName',
+      label: '客户名称',
+    },
+    {
+      field: 'lotNumber',
+      label: '生产批号',
+    },
+    {
+      field: 'workOrderCode',
+      label: '生产工单',
+    },
+    {
+      field: 'workstationCode',
+      label: '工作站编码',
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/qc/batchtrace/index.vue b/apps/web-ele/src/views/mes/qc/batchtrace/index.vue
new file mode 100644
index 000000000..2a21db9ed
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/batchtrace/index.vue
@@ -0,0 +1,82 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmBatchApi } from '#/api/mes/wm/batch';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getBatchPage } from '#/api/mes/wm/batch';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import TraceDetail from './modules/trace-detail.vue';
+
+const [DetailModal, detailModalApi] = useVbenModal({
+  connectedComponent: TraceDetail,
+  destroyOnClose: true,
+});
+
+/** 打开批次追溯详情 */
+function handleTrace(row: MesWmBatchApi.Batch) {
+  detailModalApi.setData(row).open();
+}
+
+const [Grid] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getBatchPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmBatchApi.Batch>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】批次管理、库存现有量、库存事务"
+        url="https://doc.iocoder.cn/mes/wm/stock/"
+      />
+    </template>
+
+    <DetailModal />
+
+    <Grid table-title="批次追溯列表">
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: '批次追溯',
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.VIEW,
+              auth: ['mes:wm-batch:query'],
+              onClick: handleTrace.bind(null, row),
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-ele/src/views/mes/qc/batchtrace/modules/trace-detail.vue b/apps/web-ele/src/views/mes/qc/batchtrace/modules/trace-detail.vue
new file mode 100644
index 000000000..68894cee2
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/batchtrace/modules/trace-detail.vue
@@ -0,0 +1,58 @@
+<script lang="ts" setup>
+import type { MesWmBatchApi } from '#/api/mes/wm/batch';
+
+import { ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElTabPane, ElTabs } from 'element-plus';
+
+import { useDescription } from '#/components/description';
+
+import { useDetailSchema } from '../data';
+import TraceList from './trace-list.vue';
+
+const detailData = ref<MesWmBatchApi.Batch>(); // 当前批次详情
+const subTabsName = ref<'backward' | 'forward'>('forward'); // 当前激活的追溯方向
+
+const [Descriptions] = useDescription({
+  border: true,
+  column: 3,
+  schema: useDetailSchema(),
+});
+
+const [Modal, modalApi] = useVbenModal({
+  onOpenChange(isOpen) {
+    if (!isOpen) {
+      detailData.value = undefined;
+      return;
+    }
+    detailData.value = modalApi.getData<MesWmBatchApi.Batch>();
+    subTabsName.value = 'forward';
+  },
+});
+</script>
+
+<template>
+  <Modal
+    title="批次追溯"
+    class="w-4/5"
+    :show-cancel-button="false"
+    :show-confirm-button="false"
+  >
+    <Descriptions class="mx-4 mt-2" :data="detailData" />
+    <ElTabs
+      v-if="detailData?.code"
+      v-model="subTabsName"
+      class="mx-4 mt-4"
+      type="card"
+    >
+      <ElTabPane label="向前追溯" name="forward">
+        <TraceList :batch-code="detailData.code" direction="forward" />
+      </ElTabPane>
+      <ElTabPane label="向后追溯" name="backward">
+        <TraceList :batch-code="detailData.code" direction="backward" />
+      </ElTabPane>
+    </ElTabs>
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/qc/batchtrace/modules/trace-list.vue b/apps/web-ele/src/views/mes/qc/batchtrace/modules/trace-list.vue
new file mode 100644
index 000000000..ea23377d1
--- /dev/null
+++ b/apps/web-ele/src/views/mes/qc/batchtrace/modules/trace-list.vue
@@ -0,0 +1,67 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmBatchApi } from '#/api/mes/wm/batch';
+
+import { watch } from 'vue';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  getBackwardBatchList,
+  getForwardBatchList,
+} from '#/api/mes/wm/batch';
+
+import { useTraceGridColumns } from '../data';
+
+const props = defineProps<{
+  batchCode?: string;
+  direction: 'backward' | 'forward'; // 追溯方向：forward=向前，backward=向后
+}>();
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useTraceGridColumns(),
+    minHeight: 240,
+    pagerConfig: {
+      enabled: false,
+    },
+    rowConfig: {
+      isHover: true,
+      keyField: 'id',
+    },
+    showOverflow: true,
+    toolbarConfig: {
+      enabled: false,
+    },
+  } as VxeTableGridOptions<MesWmBatchApi.Batch>,
+});
+
+/** 加载追溯列表 */
+async function getList() {
+  if (!props.batchCode) {
+    await gridApi.grid?.loadData([]);
+    return;
+  }
+  gridApi.setLoading(true);
+  try {
+    const list =
+      props.direction === 'forward'
+        ? await getForwardBatchList(props.batchCode)
+        : await getBackwardBatchList(props.batchCode);
+    await gridApi.grid?.loadData(list);
+  } finally {
+    gridApi.setLoading(false);
+  }
+}
+
+watch(
+  () => props.batchCode,
+  () => {
+    getList();
+  },
+  { immediate: true },
+);
+</script>
+
+<template>
+  <Grid class="w-full" />
+</template>

From a8d60580be4fb5fc2898a0e6b3d850fde3f6f3a2 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 29 May 2026 22:13:57 +0800
Subject: [PATCH 20/52] =?UTF-8?q?refactor(mes/wm/barcode):=20=E6=B8=85?=
 =?UTF-8?q?=E7=90=86=20TODO=20@AI=E3=80=81=E7=AE=80=E5=8C=96=20onBizChange?=
 =?UTF-8?q?=E3=80=81=E5=AF=B9=E9=BD=90=E5=8B=BE=E9=80=89=E5=86=99=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 删除 data.ts / config/data.ts / index.vue 里残留的 TODO @AI 注释
- applyBizSelected 改名 syncBizDetail（对齐 mes/qc/ipqc 的 syncUnqualified），
  函数内置 formApi 空判断，去掉中间变量 onBizChange，14 处 onChange 直接调用
- config/data.ts 的 dependencies 单行展开为多行
- index.vue 勾选写法对齐 system/user：records.map((item) => item.id!)
---
 .../src/views/mes/wm/barcode/config/data.ts   |  9 ++-
 .../web-antd/src/views/mes/wm/barcode/data.ts | 39 +++++-----
 .../src/views/mes/wm/barcode/index.vue        |  8 +-
 .../src/views/mes/wm/materialstock/index.vue  | 74 ++++++++++---------
 apps/web-ele/src/views/mes/wm/barcode/data.ts | 38 +++++-----
 .../src/views/mes/wm/barcode/index.vue        |  2 +-
 6 files changed, 87 insertions(+), 83 deletions(-)

diff --git a/apps/web-antd/src/views/mes/wm/barcode/config/data.ts b/apps/web-antd/src/views/mes/wm/barcode/config/data.ts
index dc715da79..5174336bd 100644
--- a/apps/web-antd/src/views/mes/wm/barcode/config/data.ts
+++ b/apps/web-antd/src/views/mes/wm/barcode/config/data.ts
@@ -5,14 +5,16 @@ import { getDictOptions } from '@vben/hooks';
 
 import { z } from '#/adapter/form';
 
-// TODO @AI：这里的代码风格不对；
 /** 表单 */
 export function useFormSchema(): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
       component: 'Input',
-      dependencies: { triggerFields: [''], show: () => false },
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
     },
     {
       fieldName: 'format',
@@ -35,8 +37,7 @@ export function useFormSchema(): VbenFormSchema[] {
       dependencies: {
         triggerFields: ['id'],
         componentProps: (values) => ({
-          // 编辑时业务类型不允许变更 TODO @AI：这种简单的注释，可以考虑放到 disabled 后面；写到 style 里；
-          disabled: !!values.id,
+          disabled: !!values.id, // 编辑时业务类型不允许变更
         }),
       },
       rules: 'required',
diff --git a/apps/web-antd/src/views/mes/wm/barcode/data.ts b/apps/web-antd/src/views/mes/wm/barcode/data.ts
index 6e20264cc..1d0f41c1d 100644
--- a/apps/web-antd/src/views/mes/wm/barcode/data.ts
+++ b/apps/web-antd/src/views/mes/wm/barcode/data.ts
@@ -28,7 +28,13 @@ import {
 } from './../warehouse/components';
 
 /** 业务对象选中后回填业务编码、业务名称、条码内容 */
-async function applyBizSelected(formApi: VbenFormApi, item: any) {
+async function syncBizDetail(
+  formApi: undefined | VbenFormApi,
+  item: any,
+) {
+  if (!formApi) {
+    return;
+  }
   const values = await formApi.getValues();
   const bizType = values.bizType as number | undefined;
   if (!item) {
@@ -61,13 +67,6 @@ async function applyBizSelected(formApi: VbenFormApi, item: any) {
 
 /** 新增/修改条码的表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
-  // TODO @AI：是不是可以去掉 onBizChange，直接搞个 handleBizTypeChange 函数？
-  const onBizChange = (item: any) => {
-    if (formApi) {
-      void applyBizSelected(formApi, item);
-    }
-  };
-
   return [
     {
       fieldName: 'bizType',
@@ -96,7 +95,7 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
       label: '仓库',
       component: markRaw(WmWarehouseSelect),
       componentProps: {
-        onChange: onBizChange,
+        onChange: (item: any) => syncBizDetail(formApi, item),
       },
       dependencies: {
         triggerFields: ['bizType'],
@@ -133,7 +132,7 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
         componentProps: (values) => ({
           placeholder: '请选择库区',
           warehouseId: values.locationWarehouseId,
-          onChange: onBizChange,
+          onChange: (item: any) => syncBizDetail(formApi, item),
         }),
       },
       rules: 'required',
@@ -188,7 +187,7 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
         componentProps: (values) => ({
           placeholder: '请选择库位',
           locationId: values.areaLocationId,
-          onChange: onBizChange,
+          onChange: (item: any) => syncBizDetail(formApi, item),
         }),
       },
       rules: 'required',
@@ -198,7 +197,7 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
       label: '工单',
       component: markRaw(ProWorkOrderSelect),
       componentProps: {
-        onChange: onBizChange,
+        onChange: (item: any) => syncBizDetail(formApi, item),
       },
       dependencies: {
         triggerFields: ['bizType'],
@@ -211,7 +210,7 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
       label: '设备',
       component: markRaw(DvMachinerySelect),
       componentProps: {
-        onChange: onBizChange,
+        onChange: (item: any) => syncBizDetail(formApi, item),
       },
       dependencies: {
         triggerFields: ['bizType'],
@@ -224,7 +223,7 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
       label: '产品物料',
       component: markRaw(MdItemSelect),
       componentProps: {
-        onChange: onBizChange,
+        onChange: (item: any) => syncBizDetail(formApi, item),
       },
       dependencies: {
         triggerFields: ['bizType'],
@@ -237,7 +236,7 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
       label: '供应商',
       component: markRaw(MdVendorSelect),
       componentProps: {
-        onChange: onBizChange,
+        onChange: (item: any) => syncBizDetail(formApi, item),
       },
       dependencies: {
         triggerFields: ['bizType'],
@@ -250,7 +249,7 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
       label: '工作站',
       component: markRaw(MdWorkstationSelect),
       componentProps: {
-        onChange: onBizChange,
+        onChange: (item: any) => syncBizDetail(formApi, item),
       },
       dependencies: {
         triggerFields: ['bizType'],
@@ -263,7 +262,7 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
       label: '车间',
       component: markRaw(MdWorkshopSelect),
       componentProps: {
-        onChange: onBizChange,
+        onChange: (item: any) => syncBizDetail(formApi, item),
       },
       dependencies: {
         triggerFields: ['bizType'],
@@ -276,7 +275,7 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
       label: '客户',
       component: markRaw(MdClientSelect),
       componentProps: {
-        onChange: onBizChange,
+        onChange: (item: any) => syncBizDetail(formApi, item),
       },
       dependencies: {
         triggerFields: ['bizType'],
@@ -289,7 +288,7 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
       label: '工具',
       component: markRaw(TmToolSelect),
       componentProps: {
-        onChange: onBizChange,
+        onChange: (item: any) => syncBizDetail(formApi, item),
       },
       dependencies: {
         triggerFields: ['bizType'],
@@ -302,7 +301,7 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
       label: '库存',
       component: markRaw(WmMaterialStockSelect),
       componentProps: {
-        onChange: onBizChange,
+        onChange: (item: any) => syncBizDetail(formApi, item),
       },
       dependencies: {
         triggerFields: ['bizType'],
diff --git a/apps/web-antd/src/views/mes/wm/barcode/index.vue b/apps/web-antd/src/views/mes/wm/barcode/index.vue
index 0e64bb09f..1e1b9d34d 100644
--- a/apps/web-antd/src/views/mes/wm/barcode/index.vue
+++ b/apps/web-antd/src/views/mes/wm/barcode/index.vue
@@ -31,18 +31,14 @@ const [FormModal, formModalApi] = useVbenModal({
 
 const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>();
 
-// TODO @AI：这里的 checkedIds，是不是拿到 handleRowCheckboxChange 代码块里？更简洁一点？
-// TODO @AI：这里的代码风格，要和 system user index 保持一致，批量选择；
-/** 已选条码 ID */
-const checkedIds = ref<number[]>([]);
-
 /** 处理勾选变化 */
+const checkedIds = ref<number[]>([]);
 function handleRowCheckboxChange({
   records,
 }: {
   records: MesWmBarcodeApi.Barcode[];
 }) {
-  checkedIds.value = records.map((row) => row.id!).filter(Boolean);
+  checkedIds.value = records.map((item) => item.id!);
 }
 
 /** 刷新表格 */
diff --git a/apps/web-antd/src/views/mes/wm/materialstock/index.vue b/apps/web-antd/src/views/mes/wm/materialstock/index.vue
index ad87860a1..d24ecaf3e 100644
--- a/apps/web-antd/src/views/mes/wm/materialstock/index.vue
+++ b/apps/web-antd/src/views/mes/wm/materialstock/index.vue
@@ -1,5 +1,4 @@
 <script lang="ts" setup>
-// TODO @AI：注释风格；另外，也对齐下 system user index.vue；（整个文件）
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesWmMaterialStockApi } from '#/api/mes/wm/materialstock';
 
@@ -8,7 +7,7 @@ import { ref } from 'vue';
 import { confirm, DocAlert, Page, useVbenModal } from '@vben/common-ui';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
-import { Button, message } from 'ant-design-vue';
+import { Button, Card, message } from 'ant-design-vue';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import {
@@ -27,25 +26,55 @@ const [AreaModal, areaModalApi] = useVbenModal({
   destroyOnClose: true,
 });
 
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportMaterialStock({
+    ...(await gridApi.formApi.getValues()),
+    itemTypeId: searchItemTypeId.value,
+  });
+  downloadFileFromBlobPart({ fileName: '库存台账.xls', source: data });
+}
+
+/** 选择物料分类 */
+const searchItemTypeId = ref<number | undefined>(undefined);
+function handleTypeNodeClick(row: undefined | { id?: number }) {
+  searchItemTypeId.value = row?.id;
+  handleRefresh();
+}
+
+/** 打开库位详情弹窗 */
+function handleOpenAreaDetail(row: MesWmMaterialStockApi.MaterialStock) {
+  if (!row.areaId) {
+    return;
+  }
+  areaModalApi.setData({ formType: 'detail', id: row.areaId }).open();
+}
+
 /** 处理冻结状态切换 */
-async function handleFrozenChange(row: MesWmMaterialStockApi.MaterialStock) {
+async function handleFrozenChange(
+  row: MesWmMaterialStockApi.MaterialStock,
+): Promise<boolean | undefined> {
   const text = row.frozen ? '冻结' : '解冻';
   try {
     await confirm(`确认要"${text}"该库存记录吗？`);
   } catch {
     return false;
   }
+  // 更新冻结状态
   await updateMaterialStockFrozen({
     id: row.id!,
     frozen: row.frozen!,
   });
+  // 提示并返回成功
   message.success(`${text}成功`);
   return true;
 }
 
-/** 已选物料分类 */
-const searchItemTypeId = ref<number>();
-
 const [Grid, gridApi] = useVbenVxeGrid({
   formOptions: {
     schema: useGridFormSchema(),
@@ -60,8 +89,8 @@ const [Grid, gridApi] = useVbenVxeGrid({
           return await getMaterialStockPage({
             pageNo: page.currentPage,
             pageSize: page.pageSize,
-            itemTypeId: searchItemTypeId.value,
             ...formValues,
+            itemTypeId: searchItemTypeId.value,
           });
         },
       },
@@ -76,29 +105,6 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
   } as VxeTableGridOptions<MesWmMaterialStockApi.MaterialStock>,
 });
-
-/** 物料分类树节点点击 */
-function handleTypeNodeClick(row: undefined | { id?: number }) {
-  searchItemTypeId.value = row?.id;
-  gridApi.query();
-}
-
-/** 打开库位详情弹窗 */
-function handleOpenAreaDetail(row: MesWmMaterialStockApi.MaterialStock) {
-  if (!row.areaId) {
-    return;
-  }
-  areaModalApi.setData({ formType: 'detail', id: row.areaId }).open();
-}
-
-/** 导出表格 */
-async function handleExport() {
-  const data = await exportMaterialStock({
-    ...(await gridApi.formApi.getValues()),
-    itemTypeId: searchItemTypeId.value,
-  });
-  downloadFileFromBlobPart({ fileName: '库存台账.xls', source: data });
-}
 </script>
 
 <template>
@@ -112,10 +118,12 @@ async function handleExport() {
 
     <AreaModal />
 
-    <div class="flex h-full gap-3">
-      <div class="bg-card w-1/6 rounded p-3">
+    <div class="flex h-full w-full">
+      <!-- 左侧物料分类树 -->
+      <Card class="mr-4 h-full w-1/6">
         <MdItemTypeTree @node-click="handleTypeNodeClick" />
-      </div>
+      </Card>
+      <!-- 右侧库存台账列表 -->
       <div class="w-5/6">
         <Grid table-title="库存台账列表">
           <template #toolbar-tools>
diff --git a/apps/web-ele/src/views/mes/wm/barcode/data.ts b/apps/web-ele/src/views/mes/wm/barcode/data.ts
index 6a97762f7..17671020f 100644
--- a/apps/web-ele/src/views/mes/wm/barcode/data.ts
+++ b/apps/web-ele/src/views/mes/wm/barcode/data.ts
@@ -28,7 +28,13 @@ import {
 } from './../warehouse/components';
 
 /** 业务对象选中后回填业务编码、业务名称、条码内容 */
-async function applyBizSelected(formApi: VbenFormApi, item: any) {
+async function syncBizDetail(
+  formApi: undefined | VbenFormApi,
+  item: any,
+) {
+  if (!formApi) {
+    return;
+  }
   const values = await formApi.getValues();
   const bizType = values.bizType as number | undefined;
   if (!item) {
@@ -61,12 +67,6 @@ async function applyBizSelected(formApi: VbenFormApi, item: any) {
 
 /** 新增/修改条码的表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
-  const onBizChange = (item: any) => {
-    if (formApi) {
-      void applyBizSelected(formApi, item);
-    }
-  };
-
   return [
     {
       fieldName: 'bizType',
@@ -95,7 +95,7 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
       label: '仓库',
       component: markRaw(WmWarehouseSelect),
       componentProps: {
-        onChange: onBizChange,
+        onChange: (item: any) => syncBizDetail(formApi, item),
       },
       dependencies: {
         triggerFields: ['bizType'],
@@ -130,7 +130,7 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
         triggerFields: ['bizType', 'locationWarehouseId'],
         show: (values) => values.bizType === BarcodeBizTypeEnum.LOCATION,
         componentProps: (values) => ({
-          onChange: onBizChange,
+          onChange: (item: any) => syncBizDetail(formApi, item),
           placeholder: '请选择库区',
           warehouseId: values.locationWarehouseId,
         }),
@@ -186,7 +186,7 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
         show: (values) => values.bizType === BarcodeBizTypeEnum.AREA,
         componentProps: (values) => ({
           locationId: values.areaLocationId,
-          onChange: onBizChange,
+          onChange: (item: any) => syncBizDetail(formApi, item),
           placeholder: '请选择库位',
         }),
       },
@@ -197,7 +197,7 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
       label: '工单',
       component: markRaw(ProWorkOrderSelect),
       componentProps: {
-        onChange: onBizChange,
+        onChange: (item: any) => syncBizDetail(formApi, item),
       },
       dependencies: {
         triggerFields: ['bizType'],
@@ -210,7 +210,7 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
       label: '设备',
       component: markRaw(DvMachinerySelect),
       componentProps: {
-        onChange: onBizChange,
+        onChange: (item: any) => syncBizDetail(formApi, item),
       },
       dependencies: {
         triggerFields: ['bizType'],
@@ -223,7 +223,7 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
       label: '产品物料',
       component: markRaw(MdItemSelect),
       componentProps: {
-        onChange: onBizChange,
+        onChange: (item: any) => syncBizDetail(formApi, item),
       },
       dependencies: {
         triggerFields: ['bizType'],
@@ -236,7 +236,7 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
       label: '供应商',
       component: markRaw(MdVendorSelect),
       componentProps: {
-        onChange: onBizChange,
+        onChange: (item: any) => syncBizDetail(formApi, item),
       },
       dependencies: {
         triggerFields: ['bizType'],
@@ -249,7 +249,7 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
       label: '工作站',
       component: markRaw(MdWorkstationSelect),
       componentProps: {
-        onChange: onBizChange,
+        onChange: (item: any) => syncBizDetail(formApi, item),
       },
       dependencies: {
         triggerFields: ['bizType'],
@@ -262,7 +262,7 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
       label: '车间',
       component: markRaw(MdWorkshopSelect),
       componentProps: {
-        onChange: onBizChange,
+        onChange: (item: any) => syncBizDetail(formApi, item),
       },
       dependencies: {
         triggerFields: ['bizType'],
@@ -275,7 +275,7 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
       label: '客户',
       component: markRaw(MdClientSelect),
       componentProps: {
-        onChange: onBizChange,
+        onChange: (item: any) => syncBizDetail(formApi, item),
       },
       dependencies: {
         triggerFields: ['bizType'],
@@ -288,7 +288,7 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
       label: '工具',
       component: markRaw(TmToolSelect),
       componentProps: {
-        onChange: onBizChange,
+        onChange: (item: any) => syncBizDetail(formApi, item),
       },
       dependencies: {
         triggerFields: ['bizType'],
@@ -301,7 +301,7 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
       label: '库存',
       component: markRaw(WmMaterialStockSelect),
       componentProps: {
-        onChange: onBizChange,
+        onChange: (item: any) => syncBizDetail(formApi, item),
       },
       dependencies: {
         triggerFields: ['bizType'],
diff --git a/apps/web-ele/src/views/mes/wm/barcode/index.vue b/apps/web-ele/src/views/mes/wm/barcode/index.vue
index 95e42d800..0803d1b85 100644
--- a/apps/web-ele/src/views/mes/wm/barcode/index.vue
+++ b/apps/web-ele/src/views/mes/wm/barcode/index.vue
@@ -40,7 +40,7 @@ function handleRowCheckboxChange({
 }: {
   records: MesWmBarcodeApi.Barcode[];
 }) {
-  checkedIds.value = records.map((row) => row.id!).filter(Boolean);
+  checkedIds.value = records.map((item) => item.id!);
 }
 
 /** 刷新表格 */

From e91d30e899695d882a8149b7c58119714cd7055f Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 29 May 2026 22:24:28 +0800
Subject: [PATCH 21/52] =?UTF-8?q?refactor(mes/wm/barcode):=20=E5=AF=B9?=
 =?UTF-8?q?=E9=BD=90=20antd/ele=20componentProps=20=E5=AD=97=E6=AF=8D?=
 =?UTF-8?q?=E5=BA=8F=E4=B8=8E=E6=B3=A8=E9=87=8A=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

审查 wm_barcode 时补齐：
- antd data.ts 的 componentProps 键统一为字母序（onChange 提到 options/
  placeholder 之前），与 ele 端保持一致
- antd index.vue 修正 checkedIds 的 JSDoc 错位（拆出「已选条码 ID」与
  「处理勾选变化」两段注释）
- ele config/data.ts 的「编辑时业务类型不允许变更」改为行尾注释，对齐 antd
---
 apps/web-antd/src/views/mes/wm/barcode/data.ts   | 16 ++++++++--------
 apps/web-antd/src/views/mes/wm/barcode/index.vue |  4 +++-
 .../src/views/mes/wm/barcode/config/data.ts      |  3 +--
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/apps/web-antd/src/views/mes/wm/barcode/data.ts b/apps/web-antd/src/views/mes/wm/barcode/data.ts
index 1d0f41c1d..abf2f5b29 100644
--- a/apps/web-antd/src/views/mes/wm/barcode/data.ts
+++ b/apps/web-antd/src/views/mes/wm/barcode/data.ts
@@ -73,8 +73,6 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
       label: '业务类型',
       component: 'Select',
       componentProps: {
-        options: getDictOptions(DICT_TYPE.MES_WM_BARCODE_BIZ_TYPE, 'number'),
-        placeholder: '请选择业务类型',
         // 业务类型变更时清空业务字段
         onChange: () =>
           formApi?.setValues({
@@ -86,6 +84,8 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
             areaWarehouseId: undefined,
             areaLocationId: undefined,
           }),
+        options: getDictOptions(DICT_TYPE.MES_WM_BARCODE_BIZ_TYPE, 'number'),
+        placeholder: '请选择业务类型',
       },
       rules: 'required',
     },
@@ -108,7 +108,6 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
       label: '库区·仓库',
       component: markRaw(WmWarehouseSelect),
       componentProps: {
-        placeholder: '请选择仓库',
         onChange: () =>
           formApi?.setValues({
             bizId: undefined,
@@ -116,6 +115,7 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
             bizName: undefined,
             content: undefined,
           }),
+        placeholder: '请选择仓库',
       },
       dependencies: {
         triggerFields: ['bizType'],
@@ -130,9 +130,9 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
         triggerFields: ['bizType', 'locationWarehouseId'],
         show: (values) => values.bizType === BarcodeBizTypeEnum.LOCATION,
         componentProps: (values) => ({
+          onChange: (item: any) => syncBizDetail(formApi, item),
           placeholder: '请选择库区',
           warehouseId: values.locationWarehouseId,
-          onChange: (item: any) => syncBizDetail(formApi, item),
         }),
       },
       rules: 'required',
@@ -142,7 +142,6 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
       label: '库位·仓库',
       component: markRaw(WmWarehouseSelect),
       componentProps: {
-        placeholder: '请选择仓库',
         onChange: () =>
           formApi?.setValues({
             areaLocationId: undefined,
@@ -151,6 +150,7 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
             bizName: undefined,
             content: undefined,
           }),
+        placeholder: '请选择仓库',
       },
       dependencies: {
         triggerFields: ['bizType'],
@@ -165,8 +165,6 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
         triggerFields: ['bizType', 'areaWarehouseId'],
         show: (values) => values.bizType === BarcodeBizTypeEnum.AREA,
         componentProps: (values) => ({
-          placeholder: '请选择库区',
-          warehouseId: values.areaWarehouseId,
           onChange: () =>
             formApi?.setValues({
               bizId: undefined,
@@ -174,6 +172,8 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
               bizName: undefined,
               content: undefined,
             }),
+          placeholder: '请选择库区',
+          warehouseId: values.areaWarehouseId,
         }),
       },
     },
@@ -185,9 +185,9 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
         triggerFields: ['bizType', 'areaLocationId'],
         show: (values) => values.bizType === BarcodeBizTypeEnum.AREA,
         componentProps: (values) => ({
-          placeholder: '请选择库位',
           locationId: values.areaLocationId,
           onChange: (item: any) => syncBizDetail(formApi, item),
+          placeholder: '请选择库位',
         }),
       },
       rules: 'required',
diff --git a/apps/web-antd/src/views/mes/wm/barcode/index.vue b/apps/web-antd/src/views/mes/wm/barcode/index.vue
index 1e1b9d34d..6beaa286e 100644
--- a/apps/web-antd/src/views/mes/wm/barcode/index.vue
+++ b/apps/web-antd/src/views/mes/wm/barcode/index.vue
@@ -31,8 +31,10 @@ const [FormModal, formModalApi] = useVbenModal({
 
 const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>();
 
-/** 处理勾选变化 */
+/** 已选条码 ID */
 const checkedIds = ref<number[]>([]);
+
+/** 处理勾选变化 */
 function handleRowCheckboxChange({
   records,
 }: {
diff --git a/apps/web-ele/src/views/mes/wm/barcode/config/data.ts b/apps/web-ele/src/views/mes/wm/barcode/config/data.ts
index a4db5ed2b..e506a96d4 100644
--- a/apps/web-ele/src/views/mes/wm/barcode/config/data.ts
+++ b/apps/web-ele/src/views/mes/wm/barcode/config/data.ts
@@ -37,8 +37,7 @@ export function useFormSchema(): VbenFormSchema[] {
       dependencies: {
         triggerFields: ['id'],
         componentProps: (values) => ({
-          // 编辑时业务类型不允许变更
-          disabled: !!values.id,
+          disabled: !!values.id, // 编辑时业务类型不允许变更
         }),
       },
       rules: 'required',

From 974527ed317598aac4312da6b56047faa6d301eb Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 29 May 2026 22:25:45 +0800
Subject: [PATCH 22/52] =?UTF-8?q?chore:=20gitignore=20=E5=BF=BD=E7=95=A5?=
 =?UTF-8?q?=20.playwright-cli=20=E6=9C=AC=E5=9C=B0=E5=BD=95=E5=88=B6?=
 =?UTF-8?q?=E4=BA=A7=E7=89=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 20fba96c3..dd97ac638 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,3 +60,6 @@ vite.config.ts.*
 skills-lock.json
 .atomcode
 datalog
+
+# Playwright CLI 录制产物（本地调试，不入库）
+.playwright-cli

From 05cf59b4bc610ac72ee69e820976fb89c73d0050 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 29 May 2026 22:34:47 +0800
Subject: [PATCH 23/52] refactor(index.vue): remove unused checkedIds and
 related comments

---
 apps/web-antd/src/views/mes/wm/barcode/index.vue | 3 ---
 apps/web-ele/src/views/mes/wm/barcode/index.vue  | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/apps/web-antd/src/views/mes/wm/barcode/index.vue b/apps/web-antd/src/views/mes/wm/barcode/index.vue
index 6beaa286e..8e32b78db 100644
--- a/apps/web-antd/src/views/mes/wm/barcode/index.vue
+++ b/apps/web-antd/src/views/mes/wm/barcode/index.vue
@@ -31,10 +31,7 @@ const [FormModal, formModalApi] = useVbenModal({
 
 const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>();
 
-/** 已选条码 ID */
 const checkedIds = ref<number[]>([]);
-
-/** 处理勾选变化 */
 function handleRowCheckboxChange({
   records,
 }: {
diff --git a/apps/web-ele/src/views/mes/wm/barcode/index.vue b/apps/web-ele/src/views/mes/wm/barcode/index.vue
index 0803d1b85..cc55df99c 100644
--- a/apps/web-ele/src/views/mes/wm/barcode/index.vue
+++ b/apps/web-ele/src/views/mes/wm/barcode/index.vue
@@ -31,10 +31,7 @@ const [FormModal, formModalApi] = useVbenModal({
 
 const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>();
 
-/** 已选条码 ID */
 const checkedIds = ref<number[]>([]);
-
-/** 处理勾选变化 */
 function handleRowCheckboxChange({
   records,
 }: {

From 93024d0061b1e4e6b0b9fb74a236c9c9550ce859 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 29 May 2026 23:05:02 +0800
Subject: [PATCH 24/52] =?UTF-8?q?feat(mes):=20=E6=B7=BB=E5=8A=A0=E6=9D=82?=
 =?UTF-8?q?=E9=A1=B9=E5=87=BA=E5=BA=93=E5=8D=95=E5=8F=8A=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E5=8D=95=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E5=92=8C=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=9E=9A=E4=B8=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/mes/wm/miscissue/index.ts         | 70 ++++++++++++++++
 .../src/api/mes/wm/miscissue/line/index.ts    | 70 ++++++++++++++++
 .../src/api/mes/wm/miscreceipt/index.ts       | 70 ++++++++++++++++
 .../src/api/mes/wm/miscreceipt/line/index.ts  | 57 +++++++++++++
 .../web-antd/src/api/mes/wm/packages/index.ts | 83 +++++++++++++++++++
 .../src/api/mes/wm/packages/line/index.ts     | 54 ++++++++++++
 .../web-antd/src/views/mes/utils/constants.ts | 25 ++++++
 .../web-ele/src/api/mes/wm/miscissue/index.ts | 70 ++++++++++++++++
 .../src/api/mes/wm/miscissue/line/index.ts    | 70 ++++++++++++++++
 .../src/api/mes/wm/miscreceipt/index.ts       | 70 ++++++++++++++++
 .../src/api/mes/wm/miscreceipt/line/index.ts  | 57 +++++++++++++
 apps/web-ele/src/api/mes/wm/packages/index.ts | 83 +++++++++++++++++++
 .../src/api/mes/wm/packages/line/index.ts     | 54 ++++++++++++
 apps/web-ele/src/views/mes/utils/constants.ts | 25 ++++++
 packages/constants/src/dict-enum.ts           |  5 ++
 15 files changed, 863 insertions(+)
 create mode 100644 apps/web-antd/src/api/mes/wm/miscissue/index.ts
 create mode 100644 apps/web-antd/src/api/mes/wm/miscissue/line/index.ts
 create mode 100644 apps/web-antd/src/api/mes/wm/miscreceipt/index.ts
 create mode 100644 apps/web-antd/src/api/mes/wm/miscreceipt/line/index.ts
 create mode 100644 apps/web-antd/src/api/mes/wm/packages/index.ts
 create mode 100644 apps/web-antd/src/api/mes/wm/packages/line/index.ts
 create mode 100644 apps/web-ele/src/api/mes/wm/miscissue/index.ts
 create mode 100644 apps/web-ele/src/api/mes/wm/miscissue/line/index.ts
 create mode 100644 apps/web-ele/src/api/mes/wm/miscreceipt/index.ts
 create mode 100644 apps/web-ele/src/api/mes/wm/miscreceipt/line/index.ts
 create mode 100644 apps/web-ele/src/api/mes/wm/packages/index.ts
 create mode 100644 apps/web-ele/src/api/mes/wm/packages/line/index.ts

diff --git a/apps/web-antd/src/api/mes/wm/miscissue/index.ts b/apps/web-antd/src/api/mes/wm/miscissue/index.ts
new file mode 100644
index 000000000..7ce7ede46
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/miscissue/index.ts
@@ -0,0 +1,70 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmMiscIssueApi {
+  /** MES 杂项出库单 */
+  export interface MiscIssue {
+    id?: number; // 编号
+    code?: string; // 出库单编号
+    name?: string; // 出库单名称
+    type?: string; // 业务类型
+    sourceDocType?: string; // 来源单据类型
+    sourceDocId?: number; // 来源单据编号
+    sourceDocCode?: string; // 来源单据编码
+    issueDate?: number; // 出库日期
+    status?: number; // 单据状态
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询杂项出库单分页 */
+export function getMiscIssuePage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmMiscIssueApi.MiscIssue>>(
+    '/mes/wm/misc-issue/page',
+    { params },
+  );
+}
+
+/** 查询杂项出库单详情 */
+export function getMiscIssue(id: number) {
+  return requestClient.get<MesWmMiscIssueApi.MiscIssue>(
+    `/mes/wm/misc-issue/get?id=${id}`,
+  );
+}
+
+/** 新增杂项出库单 */
+export function createMiscIssue(data: MesWmMiscIssueApi.MiscIssue) {
+  return requestClient.post<number>('/mes/wm/misc-issue/create', data);
+}
+
+/** 修改杂项出库单 */
+export function updateMiscIssue(data: MesWmMiscIssueApi.MiscIssue) {
+  return requestClient.put('/mes/wm/misc-issue/update', data);
+}
+
+/** 删除杂项出库单 */
+export function deleteMiscIssue(id: number) {
+  return requestClient.delete(`/mes/wm/misc-issue/delete?id=${id}`);
+}
+
+/** 提交杂项出库单 */
+export function submitMiscIssue(id: number) {
+  return requestClient.put(`/mes/wm/misc-issue/submit?id=${id}`);
+}
+
+/** 执行出库 */
+export function finishMiscIssue(id: number) {
+  return requestClient.put(`/mes/wm/misc-issue/finish?id=${id}`);
+}
+
+/** 取消杂项出库单 */
+export function cancelMiscIssue(id: number) {
+  return requestClient.put(`/mes/wm/misc-issue/cancel?id=${id}`);
+}
+
+/** 导出杂项出库单 */
+export function exportMiscIssue(params: any) {
+  return requestClient.download('/mes/wm/misc-issue/export-excel', { params });
+}
diff --git a/apps/web-antd/src/api/mes/wm/miscissue/line/index.ts b/apps/web-antd/src/api/mes/wm/miscissue/line/index.ts
new file mode 100644
index 000000000..56f4d8950
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/miscissue/line/index.ts
@@ -0,0 +1,70 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmMiscIssueLineApi {
+  /** MES 杂项出库单行 */
+  export interface MiscIssueLine {
+    id?: number; // 编号
+    issueId?: number; // 出库单编号
+    sourceDocLineId?: number; // 来源单据行编号
+    materialStockId?: number; // 库存编号
+    itemId?: number; // 物料编号
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    specification?: string; // 规格型号
+    unitMeasure?: string; // 计量单位
+    unitMeasureName?: string; // 计量单位名称
+    quantity?: number; // 出库数量
+    batchId?: number; // 批次编号
+    batchCode?: string; // 批次号
+    warehouseId?: number; // 仓库编号
+    warehouseCode?: string; // 仓库编码
+    warehouseName?: string; // 仓库名称
+    locationId?: number; // 库区编号
+    locationCode?: string; // 库区编码
+    locationName?: string; // 库区名称
+    areaId?: number; // 库位编号
+    areaCode?: string; // 库位编码
+    areaName?: string; // 库位名称
+    remark?: string; // 备注
+    quantityMax?: number; // 可出库最大数量（前端用于限制出库数量，取自库存在库数量）
+  }
+}
+
+/** 查询杂项出库单行分页 */
+export function getMiscIssueLinePage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmMiscIssueLineApi.MiscIssueLine>>(
+    '/mes/wm/misc-issue-line/page',
+    { params },
+  );
+}
+
+/** 查询杂项出库单行列表 */
+export function getMiscIssueLineListByIssueId(issueId: number) {
+  return requestClient.get<MesWmMiscIssueLineApi.MiscIssueLine[]>(
+    `/mes/wm/misc-issue-line/list-by-issue-id?issueId=${issueId}`,
+  );
+}
+
+/** 查询杂项出库单行详情 */
+export function getMiscIssueLine(id: number) {
+  return requestClient.get<MesWmMiscIssueLineApi.MiscIssueLine>(
+    `/mes/wm/misc-issue-line/get?id=${id}`,
+  );
+}
+
+/** 新增杂项出库单行 */
+export function createMiscIssueLine(data: MesWmMiscIssueLineApi.MiscIssueLine) {
+  return requestClient.post('/mes/wm/misc-issue-line/create', data);
+}
+
+/** 修改杂项出库单行 */
+export function updateMiscIssueLine(data: MesWmMiscIssueLineApi.MiscIssueLine) {
+  return requestClient.put('/mes/wm/misc-issue-line/update', data);
+}
+
+/** 删除杂项出库单行 */
+export function deleteMiscIssueLine(id: number) {
+  return requestClient.delete(`/mes/wm/misc-issue-line/delete?id=${id}`);
+}
diff --git a/apps/web-antd/src/api/mes/wm/miscreceipt/index.ts b/apps/web-antd/src/api/mes/wm/miscreceipt/index.ts
new file mode 100644
index 000000000..112cb4aac
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/miscreceipt/index.ts
@@ -0,0 +1,70 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmMiscReceiptApi {
+  /** MES 杂项入库单 */
+  export interface MiscReceipt {
+    id?: number; // 编号
+    code?: string; // 入库单编号
+    name?: string; // 入库单名称
+    type?: number; // 杂项类型
+    sourceDocType?: string; // 来源单据类型
+    sourceDocId?: number; // 来源单据编号
+    sourceDocCode?: string; // 来源单据编码
+    receiptDate?: number; // 入库日期
+    status?: number; // 单据状态
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询杂项入库单分页 */
+export function getMiscReceiptPage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmMiscReceiptApi.MiscReceipt>>(
+    '/mes/wm/misc-receipt/page',
+    { params },
+  );
+}
+
+/** 查询杂项入库单详情 */
+export function getMiscReceipt(id: number) {
+  return requestClient.get<MesWmMiscReceiptApi.MiscReceipt>(
+    `/mes/wm/misc-receipt/get?id=${id}`,
+  );
+}
+
+/** 新增杂项入库单 */
+export function createMiscReceipt(data: MesWmMiscReceiptApi.MiscReceipt) {
+  return requestClient.post<number>('/mes/wm/misc-receipt/create', data);
+}
+
+/** 修改杂项入库单 */
+export function updateMiscReceipt(data: MesWmMiscReceiptApi.MiscReceipt) {
+  return requestClient.put('/mes/wm/misc-receipt/update', data);
+}
+
+/** 删除杂项入库单 */
+export function deleteMiscReceipt(id: number) {
+  return requestClient.delete(`/mes/wm/misc-receipt/delete?id=${id}`);
+}
+
+/** 提交杂项入库单 */
+export function submitMiscReceipt(id: number) {
+  return requestClient.put(`/mes/wm/misc-receipt/submit?id=${id}`);
+}
+
+/** 执行入库 */
+export function finishMiscReceipt(id: number) {
+  return requestClient.put(`/mes/wm/misc-receipt/finish?id=${id}`);
+}
+
+/** 取消杂项入库单 */
+export function cancelMiscReceipt(id: number) {
+  return requestClient.put(`/mes/wm/misc-receipt/cancel?id=${id}`);
+}
+
+/** 导出杂项入库单 */
+export function exportMiscReceipt(params: any) {
+  return requestClient.download('/mes/wm/misc-receipt/export-excel', { params });
+}
diff --git a/apps/web-antd/src/api/mes/wm/miscreceipt/line/index.ts b/apps/web-antd/src/api/mes/wm/miscreceipt/line/index.ts
new file mode 100644
index 000000000..4ff66e549
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/miscreceipt/line/index.ts
@@ -0,0 +1,57 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesWmMiscReceiptLineApi {
+  /** MES 杂项入库单行 */
+  export interface MiscReceiptLine {
+    id?: number; // 编号
+    receiptId?: number; // 入库单编号
+    itemId?: number; // 物料编号
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    specification?: string; // 规格型号
+    unitMeasureName?: string; // 计量单位名称
+    quantity?: number; // 入库数量
+    batchCode?: string; // 批次号
+    warehouseId?: number; // 仓库编号
+    warehouseName?: string; // 仓库名称
+    locationId?: number; // 库区编号
+    locationName?: string; // 库区名称
+    areaId?: number; // 库位编号
+    areaName?: string; // 库位名称
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询杂项入库单行列表 */
+export function getMiscReceiptLineListByReceiptId(receiptId: number) {
+  return requestClient.get<MesWmMiscReceiptLineApi.MiscReceiptLine[]>(
+    `/mes/wm/misc-receipt-line/list-by-receipt-id?receiptId=${receiptId}`,
+  );
+}
+
+/** 查询杂项入库单行详情 */
+export function getMiscReceiptLine(id: number) {
+  return requestClient.get<MesWmMiscReceiptLineApi.MiscReceiptLine>(
+    `/mes/wm/misc-receipt-line/get?id=${id}`,
+  );
+}
+
+/** 新增杂项入库单行 */
+export function createMiscReceiptLine(
+  data: MesWmMiscReceiptLineApi.MiscReceiptLine,
+) {
+  return requestClient.post('/mes/wm/misc-receipt-line/create', data);
+}
+
+/** 修改杂项入库单行 */
+export function updateMiscReceiptLine(
+  data: MesWmMiscReceiptLineApi.MiscReceiptLine,
+) {
+  return requestClient.put('/mes/wm/misc-receipt-line/update', data);
+}
+
+/** 删除杂项入库单行 */
+export function deleteMiscReceiptLine(id: number) {
+  return requestClient.delete(`/mes/wm/misc-receipt-line/delete?id=${id}`);
+}
diff --git a/apps/web-antd/src/api/mes/wm/packages/index.ts b/apps/web-antd/src/api/mes/wm/packages/index.ts
new file mode 100644
index 000000000..cdbe51cf0
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/packages/index.ts
@@ -0,0 +1,83 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmPackageApi {
+  /** 装箱单 */
+  export interface Package {
+    id?: number; // 装箱单编号
+    code?: string; // 装箱单编码
+    parentId?: number; // 父箱编号
+    packageDate?: number; // 装箱日期
+    salesOrderCode?: string; // 销售订单编号
+    invoiceCode?: string; // 发票编号
+    clientId?: number; // 客户编号
+    clientCode?: string; // 客户编码
+    clientName?: string; // 客户名称
+    clientNickname?: string; // 客户简称
+    length?: number; // 箱长度
+    width?: number; // 箱宽度
+    height?: number; // 箱高度
+    sizeUnitId?: number; // 尺寸单位编号
+    sizeUnitName?: string; // 尺寸单位名称
+    netWeight?: number; // 净重
+    grossWeight?: number; // 毛重
+    weightUnitId?: number; // 重量单位编号
+    weightUnitName?: string; // 重量单位名称
+    inspectorUserId?: number; // 检查员用户编号
+    inspectorName?: string; // 检查员名称
+    status?: number; // 单据状态
+    remark?: string; // 备注
+    createTime?: string; // 创建时间
+    children?: Package[]; // 子箱列表
+  }
+}
+
+/** 查询装箱单分页 */
+export function getPackagePage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmPackageApi.Package>>(
+    '/mes/wm/package/page',
+    { params },
+  );
+}
+
+/** 查询装箱单详情 */
+export function getPackage(id: number) {
+  return requestClient.get<MesWmPackageApi.Package>(
+    `/mes/wm/package/get?id=${id}`,
+  );
+}
+
+/** 新增装箱单 */
+export function createPackage(data: MesWmPackageApi.Package) {
+  return requestClient.post<number>('/mes/wm/package/create', data);
+}
+
+/** 修改装箱单 */
+export function updatePackage(data: MesWmPackageApi.Package) {
+  return requestClient.put('/mes/wm/package/update', data);
+}
+
+/** 删除装箱单 */
+export function deletePackage(id: number) {
+  return requestClient.delete(`/mes/wm/package/delete?id=${id}`);
+}
+
+/** 完成装箱单 */
+export function finishPackage(id: number) {
+  return requestClient.put(`/mes/wm/package/finish?id=${id}`);
+}
+
+/** 添加子箱 */
+export function addChildPackage(parentId: number, childId: number) {
+  return requestClient.put('/mes/wm/package/add-child-package', null, {
+    params: { childId, parentId },
+  });
+}
+
+/** 移除子箱 */
+export function removeChildPackage(childId: number) {
+  return requestClient.put(
+    `/mes/wm/package/remove-child-package?childId=${childId}`,
+  );
+}
diff --git a/apps/web-antd/src/api/mes/wm/packages/line/index.ts b/apps/web-antd/src/api/mes/wm/packages/line/index.ts
new file mode 100644
index 000000000..0f8e77b4e
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/packages/line/index.ts
@@ -0,0 +1,54 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmPackageLineApi {
+  /** 装箱明细 */
+  export interface PackageLine {
+    id?: number; // 装箱明细编号
+    packageId?: number; // 装箱单编号
+    materialStockId?: number; // 库存编号
+    itemId?: number; // 产品物料编号
+    itemCode?: string; // 产品物料编码
+    itemName?: string; // 产品物料名称
+    specification?: string; // 规格型号
+    unitMeasureName?: string; // 计量单位名称
+    quantity?: number; // 装箱数量
+    workOrderId?: number; // 生产工单编号
+    workOrderCode?: string; // 生产工单编号
+    batchCode?: string; // 批次号
+    expireDate?: number; // 有效期
+    remark?: string; // 备注
+    createTime?: string; // 创建时间
+  }
+}
+
+/** 查询装箱明细分页 */
+export function getPackageLinePage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmPackageLineApi.PackageLine>>(
+    '/mes/wm/package-line/page',
+    { params },
+  );
+}
+
+/** 查询装箱明细详情 */
+export function getPackageLine(id: number) {
+  return requestClient.get<MesWmPackageLineApi.PackageLine>(
+    `/mes/wm/package-line/get?id=${id}`,
+  );
+}
+
+/** 新增装箱明细 */
+export function createPackageLine(data: MesWmPackageLineApi.PackageLine) {
+  return requestClient.post('/mes/wm/package-line/create', data);
+}
+
+/** 修改装箱明细 */
+export function updatePackageLine(data: MesWmPackageLineApi.PackageLine) {
+  return requestClient.put('/mes/wm/package-line/update', data);
+}
+
+/** 删除装箱明细 */
+export function deletePackageLine(id: number) {
+  return requestClient.delete(`/mes/wm/package-line/delete?id=${id}`);
+}
diff --git a/apps/web-antd/src/views/mes/utils/constants.ts b/apps/web-antd/src/views/mes/utils/constants.ts
index 30427941b..224f9cc09 100644
--- a/apps/web-antd/src/views/mes/utils/constants.ts
+++ b/apps/web-antd/src/views/mes/utils/constants.ts
@@ -151,9 +151,18 @@ export const MesAutoCodeRuleCode = {
   TM_TOOL_CODE: 'TM_TOOL_CODE',
   WM_AREA_CODE: 'WM_AREA_CODE',
   WM_LOCATION_CODE: 'WM_LOCATION_CODE',
+  WM_MISC_ISSUE_CODE: 'WM_MISC_ISSUE_CODE',
+  WM_MISC_RECEIPT_CODE: 'WM_MISC_RECEIPT_CODE',
+  WM_PACKAGE_CODE: 'WM_PACKAGE_CODE',
   WM_WAREHOUSE_CODE: 'WM_WAREHOUSE_CODE',
 } as const;
 
+/** MES 装箱单状态枚举 */
+export const MesWmPackageStatusEnum = {
+  PREPARE: MesOrderStatusConstants.DRAFT,
+  FINISHED: MesOrderStatusConstants.FINISHED,
+} as const;
+
 /** MES 生产工单状态枚举 */
 export const MesProWorkOrderStatusEnum = {
   PREPARE: MesOrderStatusConstants.DRAFT,
@@ -211,6 +220,22 @@ export const MesProWorkRecordTypeEnum = {
   CLOCK_OUT: 2,
 } as const;
 
+/** MES 杂项出库单状态枚举 */
+export const MesWmMiscIssueStatusEnum = {
+  PREPARE: MesOrderStatusConstants.DRAFT,
+  APPROVED: MesOrderStatusConstants.APPROVED,
+  FINISHED: MesOrderStatusConstants.FINISHED,
+  CANCELED: MesOrderStatusConstants.CANCELLED,
+} as const;
+
+/** MES 杂项入库单状态枚举 */
+export const MesWmMiscReceiptStatusEnum = {
+  PREPARE: MesOrderStatusConstants.DRAFT,
+  APPROVED: MesOrderStatusConstants.APPROVED,
+  FINISHED: MesOrderStatusConstants.FINISHED,
+  CANCELED: MesOrderStatusConstants.CANCELLED,
+} as const;
+
 /** MES 质检结果值类型枚举 */
 export const MesQcResultValueType = {
   FLOAT: 1,
diff --git a/apps/web-ele/src/api/mes/wm/miscissue/index.ts b/apps/web-ele/src/api/mes/wm/miscissue/index.ts
new file mode 100644
index 000000000..7ce7ede46
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/miscissue/index.ts
@@ -0,0 +1,70 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmMiscIssueApi {
+  /** MES 杂项出库单 */
+  export interface MiscIssue {
+    id?: number; // 编号
+    code?: string; // 出库单编号
+    name?: string; // 出库单名称
+    type?: string; // 业务类型
+    sourceDocType?: string; // 来源单据类型
+    sourceDocId?: number; // 来源单据编号
+    sourceDocCode?: string; // 来源单据编码
+    issueDate?: number; // 出库日期
+    status?: number; // 单据状态
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询杂项出库单分页 */
+export function getMiscIssuePage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmMiscIssueApi.MiscIssue>>(
+    '/mes/wm/misc-issue/page',
+    { params },
+  );
+}
+
+/** 查询杂项出库单详情 */
+export function getMiscIssue(id: number) {
+  return requestClient.get<MesWmMiscIssueApi.MiscIssue>(
+    `/mes/wm/misc-issue/get?id=${id}`,
+  );
+}
+
+/** 新增杂项出库单 */
+export function createMiscIssue(data: MesWmMiscIssueApi.MiscIssue) {
+  return requestClient.post<number>('/mes/wm/misc-issue/create', data);
+}
+
+/** 修改杂项出库单 */
+export function updateMiscIssue(data: MesWmMiscIssueApi.MiscIssue) {
+  return requestClient.put('/mes/wm/misc-issue/update', data);
+}
+
+/** 删除杂项出库单 */
+export function deleteMiscIssue(id: number) {
+  return requestClient.delete(`/mes/wm/misc-issue/delete?id=${id}`);
+}
+
+/** 提交杂项出库单 */
+export function submitMiscIssue(id: number) {
+  return requestClient.put(`/mes/wm/misc-issue/submit?id=${id}`);
+}
+
+/** 执行出库 */
+export function finishMiscIssue(id: number) {
+  return requestClient.put(`/mes/wm/misc-issue/finish?id=${id}`);
+}
+
+/** 取消杂项出库单 */
+export function cancelMiscIssue(id: number) {
+  return requestClient.put(`/mes/wm/misc-issue/cancel?id=${id}`);
+}
+
+/** 导出杂项出库单 */
+export function exportMiscIssue(params: any) {
+  return requestClient.download('/mes/wm/misc-issue/export-excel', { params });
+}
diff --git a/apps/web-ele/src/api/mes/wm/miscissue/line/index.ts b/apps/web-ele/src/api/mes/wm/miscissue/line/index.ts
new file mode 100644
index 000000000..56f4d8950
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/miscissue/line/index.ts
@@ -0,0 +1,70 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmMiscIssueLineApi {
+  /** MES 杂项出库单行 */
+  export interface MiscIssueLine {
+    id?: number; // 编号
+    issueId?: number; // 出库单编号
+    sourceDocLineId?: number; // 来源单据行编号
+    materialStockId?: number; // 库存编号
+    itemId?: number; // 物料编号
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    specification?: string; // 规格型号
+    unitMeasure?: string; // 计量单位
+    unitMeasureName?: string; // 计量单位名称
+    quantity?: number; // 出库数量
+    batchId?: number; // 批次编号
+    batchCode?: string; // 批次号
+    warehouseId?: number; // 仓库编号
+    warehouseCode?: string; // 仓库编码
+    warehouseName?: string; // 仓库名称
+    locationId?: number; // 库区编号
+    locationCode?: string; // 库区编码
+    locationName?: string; // 库区名称
+    areaId?: number; // 库位编号
+    areaCode?: string; // 库位编码
+    areaName?: string; // 库位名称
+    remark?: string; // 备注
+    quantityMax?: number; // 可出库最大数量（前端用于限制出库数量，取自库存在库数量）
+  }
+}
+
+/** 查询杂项出库单行分页 */
+export function getMiscIssueLinePage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmMiscIssueLineApi.MiscIssueLine>>(
+    '/mes/wm/misc-issue-line/page',
+    { params },
+  );
+}
+
+/** 查询杂项出库单行列表 */
+export function getMiscIssueLineListByIssueId(issueId: number) {
+  return requestClient.get<MesWmMiscIssueLineApi.MiscIssueLine[]>(
+    `/mes/wm/misc-issue-line/list-by-issue-id?issueId=${issueId}`,
+  );
+}
+
+/** 查询杂项出库单行详情 */
+export function getMiscIssueLine(id: number) {
+  return requestClient.get<MesWmMiscIssueLineApi.MiscIssueLine>(
+    `/mes/wm/misc-issue-line/get?id=${id}`,
+  );
+}
+
+/** 新增杂项出库单行 */
+export function createMiscIssueLine(data: MesWmMiscIssueLineApi.MiscIssueLine) {
+  return requestClient.post('/mes/wm/misc-issue-line/create', data);
+}
+
+/** 修改杂项出库单行 */
+export function updateMiscIssueLine(data: MesWmMiscIssueLineApi.MiscIssueLine) {
+  return requestClient.put('/mes/wm/misc-issue-line/update', data);
+}
+
+/** 删除杂项出库单行 */
+export function deleteMiscIssueLine(id: number) {
+  return requestClient.delete(`/mes/wm/misc-issue-line/delete?id=${id}`);
+}
diff --git a/apps/web-ele/src/api/mes/wm/miscreceipt/index.ts b/apps/web-ele/src/api/mes/wm/miscreceipt/index.ts
new file mode 100644
index 000000000..112cb4aac
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/miscreceipt/index.ts
@@ -0,0 +1,70 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmMiscReceiptApi {
+  /** MES 杂项入库单 */
+  export interface MiscReceipt {
+    id?: number; // 编号
+    code?: string; // 入库单编号
+    name?: string; // 入库单名称
+    type?: number; // 杂项类型
+    sourceDocType?: string; // 来源单据类型
+    sourceDocId?: number; // 来源单据编号
+    sourceDocCode?: string; // 来源单据编码
+    receiptDate?: number; // 入库日期
+    status?: number; // 单据状态
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询杂项入库单分页 */
+export function getMiscReceiptPage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmMiscReceiptApi.MiscReceipt>>(
+    '/mes/wm/misc-receipt/page',
+    { params },
+  );
+}
+
+/** 查询杂项入库单详情 */
+export function getMiscReceipt(id: number) {
+  return requestClient.get<MesWmMiscReceiptApi.MiscReceipt>(
+    `/mes/wm/misc-receipt/get?id=${id}`,
+  );
+}
+
+/** 新增杂项入库单 */
+export function createMiscReceipt(data: MesWmMiscReceiptApi.MiscReceipt) {
+  return requestClient.post<number>('/mes/wm/misc-receipt/create', data);
+}
+
+/** 修改杂项入库单 */
+export function updateMiscReceipt(data: MesWmMiscReceiptApi.MiscReceipt) {
+  return requestClient.put('/mes/wm/misc-receipt/update', data);
+}
+
+/** 删除杂项入库单 */
+export function deleteMiscReceipt(id: number) {
+  return requestClient.delete(`/mes/wm/misc-receipt/delete?id=${id}`);
+}
+
+/** 提交杂项入库单 */
+export function submitMiscReceipt(id: number) {
+  return requestClient.put(`/mes/wm/misc-receipt/submit?id=${id}`);
+}
+
+/** 执行入库 */
+export function finishMiscReceipt(id: number) {
+  return requestClient.put(`/mes/wm/misc-receipt/finish?id=${id}`);
+}
+
+/** 取消杂项入库单 */
+export function cancelMiscReceipt(id: number) {
+  return requestClient.put(`/mes/wm/misc-receipt/cancel?id=${id}`);
+}
+
+/** 导出杂项入库单 */
+export function exportMiscReceipt(params: any) {
+  return requestClient.download('/mes/wm/misc-receipt/export-excel', { params });
+}
diff --git a/apps/web-ele/src/api/mes/wm/miscreceipt/line/index.ts b/apps/web-ele/src/api/mes/wm/miscreceipt/line/index.ts
new file mode 100644
index 000000000..4ff66e549
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/miscreceipt/line/index.ts
@@ -0,0 +1,57 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesWmMiscReceiptLineApi {
+  /** MES 杂项入库单行 */
+  export interface MiscReceiptLine {
+    id?: number; // 编号
+    receiptId?: number; // 入库单编号
+    itemId?: number; // 物料编号
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    specification?: string; // 规格型号
+    unitMeasureName?: string; // 计量单位名称
+    quantity?: number; // 入库数量
+    batchCode?: string; // 批次号
+    warehouseId?: number; // 仓库编号
+    warehouseName?: string; // 仓库名称
+    locationId?: number; // 库区编号
+    locationName?: string; // 库区名称
+    areaId?: number; // 库位编号
+    areaName?: string; // 库位名称
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询杂项入库单行列表 */
+export function getMiscReceiptLineListByReceiptId(receiptId: number) {
+  return requestClient.get<MesWmMiscReceiptLineApi.MiscReceiptLine[]>(
+    `/mes/wm/misc-receipt-line/list-by-receipt-id?receiptId=${receiptId}`,
+  );
+}
+
+/** 查询杂项入库单行详情 */
+export function getMiscReceiptLine(id: number) {
+  return requestClient.get<MesWmMiscReceiptLineApi.MiscReceiptLine>(
+    `/mes/wm/misc-receipt-line/get?id=${id}`,
+  );
+}
+
+/** 新增杂项入库单行 */
+export function createMiscReceiptLine(
+  data: MesWmMiscReceiptLineApi.MiscReceiptLine,
+) {
+  return requestClient.post('/mes/wm/misc-receipt-line/create', data);
+}
+
+/** 修改杂项入库单行 */
+export function updateMiscReceiptLine(
+  data: MesWmMiscReceiptLineApi.MiscReceiptLine,
+) {
+  return requestClient.put('/mes/wm/misc-receipt-line/update', data);
+}
+
+/** 删除杂项入库单行 */
+export function deleteMiscReceiptLine(id: number) {
+  return requestClient.delete(`/mes/wm/misc-receipt-line/delete?id=${id}`);
+}
diff --git a/apps/web-ele/src/api/mes/wm/packages/index.ts b/apps/web-ele/src/api/mes/wm/packages/index.ts
new file mode 100644
index 000000000..cdbe51cf0
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/packages/index.ts
@@ -0,0 +1,83 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmPackageApi {
+  /** 装箱单 */
+  export interface Package {
+    id?: number; // 装箱单编号
+    code?: string; // 装箱单编码
+    parentId?: number; // 父箱编号
+    packageDate?: number; // 装箱日期
+    salesOrderCode?: string; // 销售订单编号
+    invoiceCode?: string; // 发票编号
+    clientId?: number; // 客户编号
+    clientCode?: string; // 客户编码
+    clientName?: string; // 客户名称
+    clientNickname?: string; // 客户简称
+    length?: number; // 箱长度
+    width?: number; // 箱宽度
+    height?: number; // 箱高度
+    sizeUnitId?: number; // 尺寸单位编号
+    sizeUnitName?: string; // 尺寸单位名称
+    netWeight?: number; // 净重
+    grossWeight?: number; // 毛重
+    weightUnitId?: number; // 重量单位编号
+    weightUnitName?: string; // 重量单位名称
+    inspectorUserId?: number; // 检查员用户编号
+    inspectorName?: string; // 检查员名称
+    status?: number; // 单据状态
+    remark?: string; // 备注
+    createTime?: string; // 创建时间
+    children?: Package[]; // 子箱列表
+  }
+}
+
+/** 查询装箱单分页 */
+export function getPackagePage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmPackageApi.Package>>(
+    '/mes/wm/package/page',
+    { params },
+  );
+}
+
+/** 查询装箱单详情 */
+export function getPackage(id: number) {
+  return requestClient.get<MesWmPackageApi.Package>(
+    `/mes/wm/package/get?id=${id}`,
+  );
+}
+
+/** 新增装箱单 */
+export function createPackage(data: MesWmPackageApi.Package) {
+  return requestClient.post<number>('/mes/wm/package/create', data);
+}
+
+/** 修改装箱单 */
+export function updatePackage(data: MesWmPackageApi.Package) {
+  return requestClient.put('/mes/wm/package/update', data);
+}
+
+/** 删除装箱单 */
+export function deletePackage(id: number) {
+  return requestClient.delete(`/mes/wm/package/delete?id=${id}`);
+}
+
+/** 完成装箱单 */
+export function finishPackage(id: number) {
+  return requestClient.put(`/mes/wm/package/finish?id=${id}`);
+}
+
+/** 添加子箱 */
+export function addChildPackage(parentId: number, childId: number) {
+  return requestClient.put('/mes/wm/package/add-child-package', null, {
+    params: { childId, parentId },
+  });
+}
+
+/** 移除子箱 */
+export function removeChildPackage(childId: number) {
+  return requestClient.put(
+    `/mes/wm/package/remove-child-package?childId=${childId}`,
+  );
+}
diff --git a/apps/web-ele/src/api/mes/wm/packages/line/index.ts b/apps/web-ele/src/api/mes/wm/packages/line/index.ts
new file mode 100644
index 000000000..0f8e77b4e
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/packages/line/index.ts
@@ -0,0 +1,54 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmPackageLineApi {
+  /** 装箱明细 */
+  export interface PackageLine {
+    id?: number; // 装箱明细编号
+    packageId?: number; // 装箱单编号
+    materialStockId?: number; // 库存编号
+    itemId?: number; // 产品物料编号
+    itemCode?: string; // 产品物料编码
+    itemName?: string; // 产品物料名称
+    specification?: string; // 规格型号
+    unitMeasureName?: string; // 计量单位名称
+    quantity?: number; // 装箱数量
+    workOrderId?: number; // 生产工单编号
+    workOrderCode?: string; // 生产工单编号
+    batchCode?: string; // 批次号
+    expireDate?: number; // 有效期
+    remark?: string; // 备注
+    createTime?: string; // 创建时间
+  }
+}
+
+/** 查询装箱明细分页 */
+export function getPackageLinePage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmPackageLineApi.PackageLine>>(
+    '/mes/wm/package-line/page',
+    { params },
+  );
+}
+
+/** 查询装箱明细详情 */
+export function getPackageLine(id: number) {
+  return requestClient.get<MesWmPackageLineApi.PackageLine>(
+    `/mes/wm/package-line/get?id=${id}`,
+  );
+}
+
+/** 新增装箱明细 */
+export function createPackageLine(data: MesWmPackageLineApi.PackageLine) {
+  return requestClient.post('/mes/wm/package-line/create', data);
+}
+
+/** 修改装箱明细 */
+export function updatePackageLine(data: MesWmPackageLineApi.PackageLine) {
+  return requestClient.put('/mes/wm/package-line/update', data);
+}
+
+/** 删除装箱明细 */
+export function deletePackageLine(id: number) {
+  return requestClient.delete(`/mes/wm/package-line/delete?id=${id}`);
+}
diff --git a/apps/web-ele/src/views/mes/utils/constants.ts b/apps/web-ele/src/views/mes/utils/constants.ts
index 30427941b..224f9cc09 100644
--- a/apps/web-ele/src/views/mes/utils/constants.ts
+++ b/apps/web-ele/src/views/mes/utils/constants.ts
@@ -151,9 +151,18 @@ export const MesAutoCodeRuleCode = {
   TM_TOOL_CODE: 'TM_TOOL_CODE',
   WM_AREA_CODE: 'WM_AREA_CODE',
   WM_LOCATION_CODE: 'WM_LOCATION_CODE',
+  WM_MISC_ISSUE_CODE: 'WM_MISC_ISSUE_CODE',
+  WM_MISC_RECEIPT_CODE: 'WM_MISC_RECEIPT_CODE',
+  WM_PACKAGE_CODE: 'WM_PACKAGE_CODE',
   WM_WAREHOUSE_CODE: 'WM_WAREHOUSE_CODE',
 } as const;
 
+/** MES 装箱单状态枚举 */
+export const MesWmPackageStatusEnum = {
+  PREPARE: MesOrderStatusConstants.DRAFT,
+  FINISHED: MesOrderStatusConstants.FINISHED,
+} as const;
+
 /** MES 生产工单状态枚举 */
 export const MesProWorkOrderStatusEnum = {
   PREPARE: MesOrderStatusConstants.DRAFT,
@@ -211,6 +220,22 @@ export const MesProWorkRecordTypeEnum = {
   CLOCK_OUT: 2,
 } as const;
 
+/** MES 杂项出库单状态枚举 */
+export const MesWmMiscIssueStatusEnum = {
+  PREPARE: MesOrderStatusConstants.DRAFT,
+  APPROVED: MesOrderStatusConstants.APPROVED,
+  FINISHED: MesOrderStatusConstants.FINISHED,
+  CANCELED: MesOrderStatusConstants.CANCELLED,
+} as const;
+
+/** MES 杂项入库单状态枚举 */
+export const MesWmMiscReceiptStatusEnum = {
+  PREPARE: MesOrderStatusConstants.DRAFT,
+  APPROVED: MesOrderStatusConstants.APPROVED,
+  FINISHED: MesOrderStatusConstants.FINISHED,
+  CANCELED: MesOrderStatusConstants.CANCELLED,
+} as const;
+
 /** MES 质检结果值类型枚举 */
 export const MesQcResultValueType = {
   FLOAT: 1,
diff --git a/packages/constants/src/dict-enum.ts b/packages/constants/src/dict-enum.ts
index 197c21e6c..995a6e069 100644
--- a/packages/constants/src/dict-enum.ts
+++ b/packages/constants/src/dict-enum.ts
@@ -223,8 +223,13 @@ const MES_DICT = {
   MES_DEFECT_LEVEL: 'mes_defect_level', // MES 缺陷等级
   MES_WM_BARCODE_BIZ_TYPE: 'mes_wm_barcode_biz_type', // MES 条码业务类型
   MES_WM_BARCODE_FORMAT: 'mes_wm_barcode_format', // MES 条码格式
+  MES_WM_PACKAGE_STATUS: 'mes_wm_package_status', // MES 装箱单状态
   MES_WM_PRODUCT_SALES_STATUS: 'mes_wm_product_sales_status', // MES 销售出库单状态
   MES_WM_QUALITY_STATUS: 'mes_wm_quality_status', // MES 质量状态
+  MES_WM_MISC_ISSUE_TYPE: 'mes_wm_misc_issue_type', // MES 杂项出库类型
+  MES_WM_MISC_ISSUE_STATUS: 'mes_wm_misc_issue_status', // MES 杂项出库单状态
+  MES_WM_MISC_RECEIPT_TYPE: 'mes_wm_misc_receipt_type', // MES 杂项入库类型
+  MES_WM_MISC_RECEIPT_STATUS: 'mes_wm_misc_receipt_status', // MES 杂项入库单状态
 } as const;
 
 /** ========== WMS - 仓储管理模块 ========== */

From 2a7051cceb1e4962c4aedfa84f151961890a956a Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 29 May 2026 23:31:40 +0800
Subject: [PATCH 25/52] =?UTF-8?q?feat(mes):=20=E6=9B=B4=E6=96=B0=E6=9D=A1?=
 =?UTF-8?q?=E7=A0=81=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E5=8F=8A=E6=8F=8F=E8=BF=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/mes/wm/miscissue/index.ts         |  2 +-
 .../wm/barcode/components/barcode-detail.vue  | 57 +++---------
 .../src/views/mes/wm/barcode/config/data.ts   | 16 +++-
 .../web-antd/src/views/mes/wm/barcode/data.ts | 88 +++++++++++++++++--
 .../src/views/mes/wm/barcode/modules/form.vue | 27 +++---
 5 files changed, 119 insertions(+), 71 deletions(-)

diff --git a/apps/web-antd/src/api/mes/wm/miscissue/index.ts b/apps/web-antd/src/api/mes/wm/miscissue/index.ts
index 7ce7ede46..1a54df4f4 100644
--- a/apps/web-antd/src/api/mes/wm/miscissue/index.ts
+++ b/apps/web-antd/src/api/mes/wm/miscissue/index.ts
@@ -8,7 +8,7 @@ export namespace MesWmMiscIssueApi {
     id?: number; // 编号
     code?: string; // 出库单编号
     name?: string; // 出库单名称
-    type?: string; // 业务类型
+    type?: number; // 业务类型
     sourceDocType?: string; // 来源单据类型
     sourceDocId?: number; // 来源单据编号
     sourceDocCode?: string; // 来源单据编码
diff --git a/apps/web-antd/src/views/mes/wm/barcode/components/barcode-detail.vue b/apps/web-antd/src/views/mes/wm/barcode/components/barcode-detail.vue
index 14abad386..fec947d66 100644
--- a/apps/web-antd/src/views/mes/wm/barcode/components/barcode-detail.vue
+++ b/apps/web-antd/src/views/mes/wm/barcode/components/barcode-detail.vue
@@ -5,20 +5,12 @@ import type { MesWmBarcodeApi } from '#/api/mes/wm/barcode';
 
 import { ref } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
-
-import {
-  Button,
-  Descriptions,
-  Empty,
-  message,
-  Modal,
-  Tooltip,
-} from 'ant-design-vue';
+import { Button, Empty, message, Modal, Tooltip } from 'ant-design-vue';
 
 import { createBarcode, getBarcodeByBusiness } from '#/api/mes/wm/barcode';
-import { DictTag } from '#/components/dict-tag';
+import { useDescription } from '#/components/description';
 
+import { useBarcodeDetailSchema } from '../data';
 import MesWmBarcode from './barcode.vue';
 
 defineOptions({ name: 'MesWmBarcodeDetail' });
@@ -27,6 +19,13 @@ const open = ref(false);
 const barcodeRef = ref<InstanceType<typeof Barcode>>();
 const barcodeData = ref<Partial<MesWmBarcodeApi.Barcode>>({});
 
+const [Descriptions] = useDescription({
+  bordered: true,
+  column: 1,
+  schema: useBarcodeDetailSchema(),
+  useCard: false,
+});
+
 function openModal(row: Partial<MesWmBarcodeApi.Barcode>) {
   open.value = true;
   barcodeData.value = { ...row };
@@ -146,22 +145,8 @@ async function handleGenerate() {
         </div>
         <Empty v-else description="暂无条码数据" />
       </div>
-      <Descriptions :column="1" bordered>
-        <Descriptions.Item label="条码格式">
-          <DictTag
-            v-if="barcodeData.format"
-            :type="DICT_TYPE.MES_WM_BARCODE_FORMAT"
-            :value="barcodeData.format"
-          />
-        </Descriptions.Item>
-        <Descriptions.Item label="业务类型">
-          <DictTag
-            v-if="barcodeData.bizType"
-            :type="DICT_TYPE.MES_WM_BARCODE_BIZ_TYPE"
-            :value="barcodeData.bizType"
-          />
-        </Descriptions.Item>
-        <Descriptions.Item label="条码内容">
+      <Descriptions :data="barcodeData">
+        <template #content>
           <Tooltip :title="barcodeData.content">
             <span
               class="inline-block max-w-75 overflow-hidden text-ellipsis whitespace-nowrap"
@@ -169,23 +154,7 @@ async function handleGenerate() {
               {{ barcodeData.content }}
             </span>
           </Tooltip>
-        </Descriptions.Item>
-        <Descriptions.Item label="业务编码">
-          {{ barcodeData.bizCode || '-' }}
-        </Descriptions.Item>
-        <Descriptions.Item label="业务名称">
-          {{ barcodeData.bizName || '-' }}
-        </Descriptions.Item>
-        <Descriptions.Item label="状态">
-          <DictTag
-            v-if="barcodeData.status !== undefined"
-            :type="DICT_TYPE.COMMON_STATUS"
-            :value="barcodeData.status"
-          />
-        </Descriptions.Item>
-        <Descriptions.Item label="创建时间">
-          {{ barcodeData.createTime || '-' }}
-        </Descriptions.Item>
+        </template>
       </Descriptions>
     </div>
     <template #footer>
diff --git a/apps/web-antd/src/views/mes/wm/barcode/config/data.ts b/apps/web-antd/src/views/mes/wm/barcode/config/data.ts
index 5174336bd..b49476e10 100644
--- a/apps/web-antd/src/views/mes/wm/barcode/config/data.ts
+++ b/apps/web-antd/src/views/mes/wm/barcode/config/data.ts
@@ -1,8 +1,12 @@
 import type { VbenFormSchema } from '#/adapter/form';
 
+import { h } from 'vue';
+
 import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
+import { Button, message } from 'ant-design-vue';
+
 import { z } from '#/adapter/form';
 
 /** 表单 */
@@ -74,8 +78,18 @@ export function useFormSchema(): VbenFormSchema[] {
       label: '默认打印模板',
       component: 'Input',
       componentProps: {
-        placeholder: '请输入打印模板',
+        placeholder: '请选择打印模板',
+        readonly: true,
       },
+      // TODO @芋艿：后续对接 UReport 报表选择器，实现打印模板选择功能
+      suffix: () =>
+        h(
+          Button,
+          {
+            onClick: () => message.warning('打印模板选择功能暂未实现，敬请期待'),
+          },
+          { default: () => '设置' },
+        ),
     },
     {
       fieldName: 'status',
diff --git a/apps/web-antd/src/views/mes/wm/barcode/data.ts b/apps/web-antd/src/views/mes/wm/barcode/data.ts
index abf2f5b29..2d1671e23 100644
--- a/apps/web-antd/src/views/mes/wm/barcode/data.ts
+++ b/apps/web-antd/src/views/mes/wm/barcode/data.ts
@@ -2,14 +2,17 @@ import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesWmBarcodeApi } from '#/api/mes/wm/barcode';
 import type { MesWmBarcodeConfigApi } from '#/api/mes/wm/barcode/config';
+import type { DescriptionItemSchema } from '#/components/description';
 
-import { markRaw } from 'vue';
+import { h, markRaw } from 'vue';
 
 import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
+import { formatDateTime } from '@vben/utils';
 
 import { z } from '#/adapter/form';
 import { generateBarcodeContent } from '#/api/mes/wm/barcode';
+import { DictTag } from '#/components/dict-tag';
 import DvMachinerySelect from '#/views/mes/dv/machinery/components/dv-machinery-select.vue';
 import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
 import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
@@ -21,6 +24,7 @@ import TmToolSelect from '#/views/mes/tm/tool/components/tm-tool-select.vue';
 import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
 
 import WmMaterialStockSelect from './../materialstock/components/wm-material-stock-select.vue';
+import { WmPackageSelect } from './../packages/components';
 import {
   WmWarehouseAreaSelect,
   WmWarehouseLocationSelect,
@@ -50,19 +54,20 @@ async function syncBizDetail(
   if (bizType === BarcodeBizTypeEnum.STOCK) {
     bizCode = item.itemCode;
     bizName = item.itemName;
+  } else if (bizType === BarcodeBizTypeEnum.PACKAGE) {
+    bizCode = item.code;
+    bizName = item.clientName || item.code;
   } else {
     bizCode = item.code || item.username;
     bizName = item.name || item.nickname;
   }
-  let content: string | undefined;
+  // 先回填业务编码、名称并清空旧条码内容
+  await formApi.setValues({ bizCode, bizName, content: undefined });
+  // 再根据业务类型 + 业务编码生成条码内容
   if (bizType && bizCode) {
-    try {
-      content = await generateBarcodeContent(bizType, bizCode);
-    } catch (error) {
-      console.error('生成条码内容失败:', error);
-    }
+    const content = await generateBarcodeContent(bizType, bizCode);
+    await formApi.setFieldValue('content', content);
   }
-  await formApi.setValues({ bizCode, bizName, content });
 }
 
 /** 新增/修改条码的表单 */
@@ -309,6 +314,20 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
       },
       rules: 'required',
     },
+    {
+      fieldName: 'bizId',
+      label: '装箱单',
+      component: markRaw(WmPackageSelect),
+      componentProps: {
+        childableOnly: true,
+        onChange: (item: any) => syncBizDetail(formApi, item),
+      },
+      dependencies: {
+        triggerFields: ['bizType'],
+        show: (values) => values.bizType === BarcodeBizTypeEnum.PACKAGE,
+      },
+      rules: 'required',
+    },
     {
       fieldName: 'bizId',
       label: '业务编号',
@@ -328,6 +347,7 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
             BarcodeBizTypeEnum.ITEM,
             BarcodeBizTypeEnum.LOCATION,
             BarcodeBizTypeEnum.MACHINERY,
+            BarcodeBizTypeEnum.PACKAGE,
             BarcodeBizTypeEnum.STOCK,
             BarcodeBizTypeEnum.TOOL,
             BarcodeBizTypeEnum.VENDOR,
@@ -346,6 +366,7 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
         disabled: true,
         placeholder: '自动填充',
       },
+      rules: 'required',
     },
     {
       fieldName: 'bizName',
@@ -355,6 +376,7 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
         disabled: true,
         placeholder: '自动填充',
       },
+      rules: 'required',
     },
     {
       fieldName: 'content',
@@ -596,3 +618,53 @@ export function useConfigGridColumns(
     },
   ];
 }
+
+/** 条码详情的描述字段 */
+export function useBarcodeDetailSchema(): DescriptionItemSchema[] {
+  return [
+    {
+      field: 'format',
+      label: '条码格式',
+      render: (value) =>
+        value == null
+          ? '-'
+          : h(DictTag, { type: DICT_TYPE.MES_WM_BARCODE_FORMAT, value }),
+    },
+    {
+      field: 'bizType',
+      label: '业务类型',
+      render: (value) =>
+        value == null
+          ? '-'
+          : h(DictTag, { type: DICT_TYPE.MES_WM_BARCODE_BIZ_TYPE, value }),
+    },
+    {
+      field: 'content',
+      label: '条码内容',
+      slot: 'content',
+    },
+    {
+      field: 'bizCode',
+      label: '业务编码',
+      render: (value) => value || '-',
+    },
+    {
+      field: 'bizName',
+      label: '业务名称',
+      render: (value) => value || '-',
+    },
+    {
+      field: 'status',
+      label: '状态',
+      render: (value) =>
+        value == null
+          ? '-'
+          : h(DictTag, { type: DICT_TYPE.COMMON_STATUS, value }),
+    },
+    {
+      field: 'createTime',
+      label: '创建时间',
+      render: (value) => formatDateTime(value) || '-',
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/wm/barcode/modules/form.vue b/apps/web-antd/src/views/mes/wm/barcode/modules/form.vue
index fdb634d92..08d218f4d 100644
--- a/apps/web-antd/src/views/mes/wm/barcode/modules/form.vue
+++ b/apps/web-antd/src/views/mes/wm/barcode/modules/form.vue
@@ -49,24 +49,17 @@ async function loadCascadeData(data: MesWmBarcodeApi.Barcode) {
   if (!data.bizType || !data.bizId) {
     return;
   }
-  try {
-    if (data.bizType === BarcodeBizTypeEnum.LOCATION) {
-      const location = await getWarehouseLocation(data.bizId);
-      if (location?.warehouseId) {
-        await formApi.setFieldValue(
-          'locationWarehouseId',
-          location.warehouseId,
-        );
-      }
-    } else if (data.bizType === BarcodeBizTypeEnum.AREA) {
-      const area = await getWarehouseArea(data.bizId);
-      await formApi.setValues({
-        areaWarehouseId: area?.warehouseId,
-        areaLocationId: area?.locationId,
-      });
+  if (data.bizType === BarcodeBizTypeEnum.LOCATION) {
+    const location = await getWarehouseLocation(data.bizId);
+    if (location?.warehouseId) {
+      await formApi.setFieldValue('locationWarehouseId', location.warehouseId);
     }
-  } catch (error) {
-    console.error('加载级联数据失败:', error);
+  } else if (data.bizType === BarcodeBizTypeEnum.AREA) {
+    const area = await getWarehouseArea(data.bizId);
+    await formApi.setValues({
+      areaWarehouseId: area?.warehouseId,
+      areaLocationId: area?.locationId,
+    });
   }
 }
 

From e09db73f73e9ed0c3a3d996bcd4474f5c94a1fc2 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 29 May 2026 23:31:51 +0800
Subject: [PATCH 26/52] =?UTF-8?q?feat(mes):=20=E6=9B=B4=E6=96=B0=E6=9D=A1?=
 =?UTF-8?q?=E7=A0=81=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E5=8F=8A=E6=8F=8F=E8=BF=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wm/barcode/components/barcode-detail.vue  | 51 +++--------
 .../src/views/mes/wm/barcode/config/data.ts   | 17 +++-
 apps/web-ele/src/views/mes/wm/barcode/data.ts | 88 +++++++++++++++++--
 .../src/views/mes/wm/barcode/modules/form.vue | 27 +++---
 4 files changed, 118 insertions(+), 65 deletions(-)

diff --git a/apps/web-ele/src/views/mes/wm/barcode/components/barcode-detail.vue b/apps/web-ele/src/views/mes/wm/barcode/components/barcode-detail.vue
index a42cc5558..e08c81c73 100644
--- a/apps/web-ele/src/views/mes/wm/barcode/components/barcode-detail.vue
+++ b/apps/web-ele/src/views/mes/wm/barcode/components/barcode-detail.vue
@@ -5,12 +5,8 @@ import type { MesWmBarcodeApi } from '#/api/mes/wm/barcode';
 
 import { ref } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
-
 import {
   ElButton,
-  ElDescriptions,
-  ElDescriptionsItem,
   ElDialog,
   ElEmpty,
   ElMessage,
@@ -18,8 +14,9 @@ import {
 } from 'element-plus';
 
 import { createBarcode, getBarcodeByBusiness } from '#/api/mes/wm/barcode';
-import { DictTag } from '#/components/dict-tag';
+import { useDescription } from '#/components/description';
 
+import { useBarcodeDetailSchema } from '../data';
 import MesWmBarcode from './barcode.vue';
 
 defineOptions({ name: 'MesWmBarcodeDetail' });
@@ -28,6 +25,12 @@ const open = ref(false);
 const barcodeRef = ref<InstanceType<typeof Barcode>>();
 const barcodeData = ref<Partial<MesWmBarcodeApi.Barcode>>({});
 
+const [Descriptions] = useDescription({
+  border: true,
+  column: 1,
+  schema: useBarcodeDetailSchema(),
+});
+
 function openModal(row: Partial<MesWmBarcodeApi.Barcode>) {
   open.value = true;
   barcodeData.value = { ...row };
@@ -147,22 +150,8 @@ async function handleGenerate() {
         </div>
         <ElEmpty v-else description="暂无条码数据" />
       </div>
-      <ElDescriptions :column="1" border>
-        <ElDescriptionsItem label="条码格式">
-          <DictTag
-            v-if="barcodeData.format"
-            :type="DICT_TYPE.MES_WM_BARCODE_FORMAT"
-            :value="barcodeData.format"
-          />
-        </ElDescriptionsItem>
-        <ElDescriptionsItem label="业务类型">
-          <DictTag
-            v-if="barcodeData.bizType"
-            :type="DICT_TYPE.MES_WM_BARCODE_BIZ_TYPE"
-            :value="barcodeData.bizType"
-          />
-        </ElDescriptionsItem>
-        <ElDescriptionsItem label="条码内容">
+      <Descriptions :data="barcodeData">
+        <template #content>
           <ElTooltip :content="barcodeData.content" placement="top">
             <span
               class="inline-block max-w-75 overflow-hidden text-ellipsis whitespace-nowrap"
@@ -170,24 +159,8 @@ async function handleGenerate() {
               {{ barcodeData.content }}
             </span>
           </ElTooltip>
-        </ElDescriptionsItem>
-        <ElDescriptionsItem label="业务编码">
-          {{ barcodeData.bizCode || '-' }}
-        </ElDescriptionsItem>
-        <ElDescriptionsItem label="业务名称">
-          {{ barcodeData.bizName || '-' }}
-        </ElDescriptionsItem>
-        <ElDescriptionsItem label="状态">
-          <DictTag
-            v-if="barcodeData.status !== undefined"
-            :type="DICT_TYPE.COMMON_STATUS"
-            :value="barcodeData.status"
-          />
-        </ElDescriptionsItem>
-        <ElDescriptionsItem label="创建时间">
-          {{ barcodeData.createTime || '-' }}
-        </ElDescriptionsItem>
-      </ElDescriptions>
+        </template>
+      </Descriptions>
     </div>
     <template #footer>
       <ElButton v-if="!barcodeData.content" @click="handleGenerate">
diff --git a/apps/web-ele/src/views/mes/wm/barcode/config/data.ts b/apps/web-ele/src/views/mes/wm/barcode/config/data.ts
index e506a96d4..d85047b70 100644
--- a/apps/web-ele/src/views/mes/wm/barcode/config/data.ts
+++ b/apps/web-ele/src/views/mes/wm/barcode/config/data.ts
@@ -1,8 +1,12 @@
 import type { VbenFormSchema } from '#/adapter/form';
 
+import { h } from 'vue';
+
 import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
+import { ElButton, ElMessage } from 'element-plus';
+
 import { z } from '#/adapter/form';
 
 /** 表单 */
@@ -75,8 +79,19 @@ export function useFormSchema(): VbenFormSchema[] {
       label: '默认打印模板',
       component: 'Input',
       componentProps: {
-        placeholder: '请输入打印模板',
+        placeholder: '请选择打印模板',
+        readonly: true,
       },
+      // TODO @芋艿：后续对接 UReport 报表选择器，实现打印模板选择功能
+      suffix: () =>
+        h(
+          ElButton,
+          {
+            onClick: () =>
+              ElMessage.warning('打印模板选择功能暂未实现，敬请期待'),
+          },
+          { default: () => '设置' },
+        ),
     },
     {
       fieldName: 'status',
diff --git a/apps/web-ele/src/views/mes/wm/barcode/data.ts b/apps/web-ele/src/views/mes/wm/barcode/data.ts
index 17671020f..d67c07a61 100644
--- a/apps/web-ele/src/views/mes/wm/barcode/data.ts
+++ b/apps/web-ele/src/views/mes/wm/barcode/data.ts
@@ -2,14 +2,17 @@ import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesWmBarcodeApi } from '#/api/mes/wm/barcode';
 import type { MesWmBarcodeConfigApi } from '#/api/mes/wm/barcode/config';
+import type { DescriptionItemSchema } from '#/components/description';
 
-import { markRaw } from 'vue';
+import { h, markRaw } from 'vue';
 
 import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
+import { formatDateTime } from '@vben/utils';
 
 import { z } from '#/adapter/form';
 import { generateBarcodeContent } from '#/api/mes/wm/barcode';
+import { DictTag } from '#/components/dict-tag';
 import DvMachinerySelect from '#/views/mes/dv/machinery/components/dv-machinery-select.vue';
 import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
 import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
@@ -21,6 +24,7 @@ import TmToolSelect from '#/views/mes/tm/tool/components/tm-tool-select.vue';
 import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
 
 import WmMaterialStockSelect from './../materialstock/components/wm-material-stock-select.vue';
+import { WmPackageSelect } from './../packages/components';
 import {
   WmWarehouseAreaSelect,
   WmWarehouseLocationSelect,
@@ -50,19 +54,20 @@ async function syncBizDetail(
   if (bizType === BarcodeBizTypeEnum.STOCK) {
     bizCode = item.itemCode;
     bizName = item.itemName;
+  } else if (bizType === BarcodeBizTypeEnum.PACKAGE) {
+    bizCode = item.code;
+    bizName = item.clientName || item.code;
   } else {
     bizCode = item.code || item.username;
     bizName = item.name || item.nickname;
   }
-  let content: string | undefined;
+  // 先回填业务编码、名称并清空旧条码内容
+  await formApi.setValues({ bizCode, bizName, content: undefined });
+  // 再根据业务类型 + 业务编码生成条码内容
   if (bizType && bizCode) {
-    try {
-      content = await generateBarcodeContent(bizType, bizCode);
-    } catch (error) {
-      console.error('生成条码内容失败:', error);
-    }
+    const content = await generateBarcodeContent(bizType, bizCode);
+    await formApi.setFieldValue('content', content);
   }
-  await formApi.setValues({ bizCode, bizName, content });
 }
 
 /** 新增/修改条码的表单 */
@@ -309,6 +314,20 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
       },
       rules: 'required',
     },
+    {
+      fieldName: 'bizId',
+      label: '装箱单',
+      component: markRaw(WmPackageSelect),
+      componentProps: {
+        childableOnly: true,
+        onChange: (item: any) => syncBizDetail(formApi, item),
+      },
+      dependencies: {
+        triggerFields: ['bizType'],
+        show: (values) => values.bizType === BarcodeBizTypeEnum.PACKAGE,
+      },
+      rules: 'required',
+    },
     {
       fieldName: 'bizId',
       label: '业务编号',
@@ -329,6 +348,7 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
             BarcodeBizTypeEnum.ITEM,
             BarcodeBizTypeEnum.LOCATION,
             BarcodeBizTypeEnum.MACHINERY,
+            BarcodeBizTypeEnum.PACKAGE,
             BarcodeBizTypeEnum.STOCK,
             BarcodeBizTypeEnum.TOOL,
             BarcodeBizTypeEnum.VENDOR,
@@ -347,6 +367,7 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
         disabled: true,
         placeholder: '自动填充',
       },
+      rules: 'required',
     },
     {
       fieldName: 'bizName',
@@ -356,6 +377,7 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
         disabled: true,
         placeholder: '自动填充',
       },
+      rules: 'required',
     },
     {
       fieldName: 'content',
@@ -597,3 +619,53 @@ export function useConfigGridColumns(
     },
   ];
 }
+
+/** 条码详情的描述字段 */
+export function useBarcodeDetailSchema(): DescriptionItemSchema[] {
+  return [
+    {
+      field: 'format',
+      label: '条码格式',
+      render: (value) =>
+        value == null
+          ? '-'
+          : h(DictTag, { type: DICT_TYPE.MES_WM_BARCODE_FORMAT, value }),
+    },
+    {
+      field: 'bizType',
+      label: '业务类型',
+      render: (value) =>
+        value == null
+          ? '-'
+          : h(DictTag, { type: DICT_TYPE.MES_WM_BARCODE_BIZ_TYPE, value }),
+    },
+    {
+      field: 'content',
+      label: '条码内容',
+      slot: 'content',
+    },
+    {
+      field: 'bizCode',
+      label: '业务编码',
+      render: (value) => value || '-',
+    },
+    {
+      field: 'bizName',
+      label: '业务名称',
+      render: (value) => value || '-',
+    },
+    {
+      field: 'status',
+      label: '状态',
+      render: (value) =>
+        value == null
+          ? '-'
+          : h(DictTag, { type: DICT_TYPE.COMMON_STATUS, value }),
+    },
+    {
+      field: 'createTime',
+      label: '创建时间',
+      render: (value) => formatDateTime(value) || '-',
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/wm/barcode/modules/form.vue b/apps/web-ele/src/views/mes/wm/barcode/modules/form.vue
index 417398449..ad56c6a3f 100644
--- a/apps/web-ele/src/views/mes/wm/barcode/modules/form.vue
+++ b/apps/web-ele/src/views/mes/wm/barcode/modules/form.vue
@@ -49,24 +49,17 @@ async function loadCascadeData(data: MesWmBarcodeApi.Barcode) {
   if (!data.bizType || !data.bizId) {
     return;
   }
-  try {
-    if (data.bizType === BarcodeBizTypeEnum.LOCATION) {
-      const location = await getWarehouseLocation(data.bizId);
-      if (location?.warehouseId) {
-        await formApi.setFieldValue(
-          'locationWarehouseId',
-          location.warehouseId,
-        );
-      }
-    } else if (data.bizType === BarcodeBizTypeEnum.AREA) {
-      const area = await getWarehouseArea(data.bizId);
-      await formApi.setValues({
-        areaWarehouseId: area?.warehouseId,
-        areaLocationId: area?.locationId,
-      });
+  if (data.bizType === BarcodeBizTypeEnum.LOCATION) {
+    const location = await getWarehouseLocation(data.bizId);
+    if (location?.warehouseId) {
+      await formApi.setFieldValue('locationWarehouseId', location.warehouseId);
     }
-  } catch (error) {
-    console.error('加载级联数据失败:', error);
+  } else if (data.bizType === BarcodeBizTypeEnum.AREA) {
+    const area = await getWarehouseArea(data.bizId);
+    await formApi.setValues({
+      areaWarehouseId: area?.warehouseId,
+      areaLocationId: area?.locationId,
+    });
   }
 }
 

From 25bbe79cb2b500ba99dc92c1040ec1e035991a40 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 29 May 2026 23:37:05 +0800
Subject: [PATCH 27/52] =?UTF-8?q?feat(mes):=20=E8=BF=81=E7=A7=BB=EF=BC=88w?=
 =?UTF-8?q?m-misc=EF=BC=89=E7=9B=B8=E5=85=B3=E8=BF=81=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/mes/wm/miscissue/data.ts        | 453 +++++++++++++++++
 .../src/views/mes/wm/miscissue/index.vue      | 195 ++++++++
 .../views/mes/wm/miscissue/modules/form.vue   | 194 ++++++++
 .../mes/wm/miscissue/modules/line-form.vue    |  97 ++++
 .../mes/wm/miscissue/modules/line-list.vue    | 137 ++++++
 .../src/views/mes/wm/miscreceipt/data.ts      | 423 ++++++++++++++++
 .../src/views/mes/wm/miscreceipt/index.vue    | 195 ++++++++
 .../views/mes/wm/miscreceipt/modules/form.vue | 194 ++++++++
 .../mes/wm/miscreceipt/modules/line-form.vue  |  98 ++++
 .../mes/wm/miscreceipt/modules/line-list.vue  | 137 ++++++
 .../web-ele/src/api/mes/wm/miscissue/index.ts |   2 +-
 .../src/views/mes/wm/miscissue/data.ts        | 455 ++++++++++++++++++
 .../src/views/mes/wm/miscissue/index.vue      | 196 ++++++++
 .../views/mes/wm/miscissue/modules/form.vue   | 200 ++++++++
 .../mes/wm/miscissue/modules/line-form.vue    |  97 ++++
 .../mes/wm/miscissue/modules/line-list.vue    | 137 ++++++
 .../src/views/mes/wm/miscreceipt/data.ts      | 424 ++++++++++++++++
 .../src/views/mes/wm/miscreceipt/index.vue    | 196 ++++++++
 .../views/mes/wm/miscreceipt/modules/form.vue | 200 ++++++++
 .../mes/wm/miscreceipt/modules/line-form.vue  |  98 ++++
 .../mes/wm/miscreceipt/modules/line-list.vue  | 137 ++++++
 21 files changed, 4264 insertions(+), 1 deletion(-)
 create mode 100644 apps/web-antd/src/views/mes/wm/miscissue/data.ts
 create mode 100644 apps/web-antd/src/views/mes/wm/miscissue/index.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/miscissue/modules/form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/miscissue/modules/line-form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/miscissue/modules/line-list.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/miscreceipt/data.ts
 create mode 100644 apps/web-antd/src/views/mes/wm/miscreceipt/index.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/miscreceipt/modules/form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/miscreceipt/modules/line-form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/miscreceipt/modules/line-list.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/miscissue/data.ts
 create mode 100644 apps/web-ele/src/views/mes/wm/miscissue/index.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/miscissue/modules/form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/miscissue/modules/line-form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/miscissue/modules/line-list.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/miscreceipt/data.ts
 create mode 100644 apps/web-ele/src/views/mes/wm/miscreceipt/index.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/miscreceipt/modules/form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/miscreceipt/modules/line-form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/miscreceipt/modules/line-list.vue

diff --git a/apps/web-antd/src/views/mes/wm/miscissue/data.ts b/apps/web-antd/src/views/mes/wm/miscissue/data.ts
new file mode 100644
index 000000000..04272d2ca
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/miscissue/data.ts
@@ -0,0 +1,453 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmMaterialStockApi } from '#/api/mes/wm/materialstock';
+import type { MesWmMiscIssueApi } from '#/api/mes/wm/miscissue';
+import type { MesWmMiscIssueLineApi } from '#/api/mes/wm/miscissue/line';
+
+import { h, markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { Button } from 'ant-design-vue';
+
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getRangePickerDefaultProps } from '#/utils';
+import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
+import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
+import {
+  WmWarehouseAreaSelect,
+  WmWarehouseLocationSelect,
+  WmWarehouseSelect,
+} from '#/views/mes/wm/warehouse/components';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'finish' | 'update';
+
+/** 表单头部是否只读（详情、执行出库态） */
+function isHeaderReadonly(formType: FormType): boolean {
+  return formType === 'detail' || formType === 'finish';
+}
+
+/** 新增/修改的表单 */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'status',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '出库单编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入出库单编号',
+      },
+      rules: 'required',
+      suffix: isHeaderReadonly(formType)
+        ? undefined
+        : () =>
+            h(
+              Button,
+              {
+                type: 'default',
+                onClick: async () => {
+                  const code = await generateAutoCode(
+                    MesAutoCodeRuleCode.WM_MISC_ISSUE_CODE,
+                  );
+                  await formApi?.setFieldValue('code', code);
+                },
+              },
+              { default: () => '生成' },
+            ),
+    },
+    {
+      fieldName: 'name',
+      label: '出库单名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入出库单名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'type',
+      label: '业务类型',
+      component: 'Select',
+      componentProps: {
+        options: getDictOptions(DICT_TYPE.MES_WM_MISC_ISSUE_TYPE, 'number'),
+        placeholder: '请选择业务类型',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'issueDate',
+      label: '出库日期',
+      component: 'DatePicker',
+      componentProps: {
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择出库日期',
+        valueFormat: 'x',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'sourceDocType',
+      label: '来源单据类型',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入来源单据类型',
+      },
+    },
+    {
+      fieldName: 'sourceDocCode',
+      label: '来源单据编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入来源单据编号',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '出库单编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入出库单编号',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '出库单名称',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入出库单名称',
+      },
+    },
+    {
+      fieldName: 'type',
+      label: '业务类型',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_WM_MISC_ISSUE_TYPE, 'number'),
+        placeholder: '请选择业务类型',
+      },
+    },
+    {
+      fieldName: 'sourceDocType',
+      label: '来源单据类型',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入来源单据类型',
+      },
+    },
+    {
+      fieldName: 'sourceDocCode',
+      label: '来源单据编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入来源单据编号',
+      },
+    },
+    {
+      fieldName: 'issueDate',
+      label: '出库日期',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+        allowClear: true,
+      },
+    },
+    {
+      fieldName: 'status',
+      label: '单据状态',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_WM_MISC_ISSUE_STATUS, 'number'),
+        placeholder: '请选择单据状态',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesWmMiscIssueApi.MiscIssue>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '出库单编号',
+      minWidth: 160,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '出库单名称',
+      minWidth: 150,
+    },
+    {
+      field: 'type',
+      title: '业务类型',
+      minWidth: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_MISC_ISSUE_TYPE },
+      },
+    },
+    {
+      field: 'sourceDocType',
+      title: '来源单据类型',
+      minWidth: 120,
+    },
+    {
+      field: 'sourceDocCode',
+      title: '来源单据编号',
+      minWidth: 150,
+    },
+    {
+      field: 'issueDate',
+      title: '出库日期',
+      width: 180,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      minWidth: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_MISC_ISSUE_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 240,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 出库单行子表的字段 */
+export function useLineGridColumns(
+  editable = true,
+): VxeTableGridOptions<MesWmMiscIssueLineApi.MiscIssueLine>['columns'] {
+  return [
+    {
+      field: 'itemCode',
+      title: '物料编码',
+      minWidth: 120,
+    },
+    {
+      field: 'itemName',
+      title: '物料名称',
+      minWidth: 140,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'quantity',
+      title: '出库数量',
+      width: 100,
+    },
+    {
+      field: 'batchCode',
+      title: '批次编码',
+      minWidth: 120,
+    },
+    {
+      field: 'warehouseName',
+      title: '仓库',
+      minWidth: 120,
+    },
+    {
+      field: 'locationName',
+      title: '库区',
+      minWidth: 120,
+    },
+    {
+      field: 'areaName',
+      title: '库位',
+      minWidth: 120,
+    },
+    ...(editable
+      ? [
+          {
+            title: '操作',
+            width: 120,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 出库单行新增/修改的表单 */
+export function useLineFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'itemId',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'quantityMax',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'materialStockId',
+      label: '库存物资',
+      component: markRaw(WmMaterialStockSelect),
+      componentProps: {
+        // 选择库存物资后，自动回填物料、批次号、仓库位置和最大可出库数量
+        onChange: async (stock?: MesWmMaterialStockApi.MaterialStock) => {
+          await formApi?.setValues({
+            areaId: stock?.areaId,
+            batchCode: stock?.batchCode,
+            itemId: stock?.itemId,
+            locationId: stock?.locationId,
+            quantityMax: stock?.quantity,
+            warehouseId: stock?.warehouseId,
+          });
+        },
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['itemId'],
+        componentProps: (values) => ({
+          itemId: values.itemId,
+        }),
+      },
+    },
+    {
+      fieldName: 'quantity',
+      label: '出库数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0.01,
+        placeholder: '请输入出库数量',
+        precision: 2,
+      },
+      rules: 'required',
+      dependencies: {
+        triggerFields: ['quantityMax'],
+        componentProps: (values) => ({
+          class: '!w-full',
+          max: values.quantityMax,
+          min: 0.01,
+          placeholder: '请输入出库数量',
+          precision: 2,
+        }),
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+        placeholder: '批次号',
+      },
+    },
+    {
+      fieldName: 'warehouseId',
+      label: '仓库',
+      component: markRaw(WmWarehouseSelect),
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'locationId',
+      label: '库区',
+      component: markRaw(WmWarehouseLocationSelect),
+      componentProps: {
+        disabled: true,
+      },
+      dependencies: {
+        triggerFields: ['warehouseId'],
+        componentProps: (values) => ({
+          disabled: true,
+          warehouseId: values.warehouseId,
+        }),
+      },
+    },
+    {
+      fieldName: 'areaId',
+      label: '库位',
+      component: markRaw(WmWarehouseAreaSelect),
+      componentProps: {
+        disabled: true,
+      },
+      dependencies: {
+        triggerFields: ['locationId'],
+        componentProps: (values) => ({
+          disabled: true,
+          locationId: values.locationId,
+        }),
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/wm/miscissue/index.vue b/apps/web-antd/src/views/mes/wm/miscissue/index.vue
new file mode 100644
index 000000000..f7ed9e698
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/miscissue/index.vue
@@ -0,0 +1,195 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmMiscIssueApi } from '#/api/mes/wm/miscissue';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { Button, message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  cancelMiscIssue,
+  deleteMiscIssue,
+  exportMiscIssue,
+  getMiscIssuePage,
+} from '#/api/mes/wm/miscissue';
+import { $t } from '#/locales';
+import { MesWmMiscIssueStatusEnum } from '#/views/mes/utils/constants';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建杂项出库单 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看杂项出库单 */
+function handleDetail(row: MesWmMiscIssueApi.MiscIssue) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑杂项出库单 */
+function handleEdit(row: MesWmMiscIssueApi.MiscIssue) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 执行出库 */
+function handleFinish(row: MesWmMiscIssueApi.MiscIssue) {
+  formModalApi.setData({ formType: 'finish', id: row.id }).open();
+}
+
+/** 删除杂项出库单 */
+async function handleDelete(row: MesWmMiscIssueApi.MiscIssue) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.code]),
+    duration: 0,
+  });
+  try {
+    await deleteMiscIssue(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 取消杂项出库单 */
+async function handleCancel(row: MesWmMiscIssueApi.MiscIssue) {
+  await cancelMiscIssue(row.id!);
+  message.success('取消成功');
+  handleRefresh();
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportMiscIssue(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '杂项出库单.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getMiscIssuePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmMiscIssueApi.MiscIssue>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】其他入库、其他出库"
+        url="https://doc.iocoder.cn/mes/wm/misc/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="杂项出库单列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['杂项出库单']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-misc-issue:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:wm-misc-issue:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <Button type="link" @click="handleDetail(row)">
+          {{ row.code }}
+        </Button>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:wm-misc-issue:update'],
+              ifShow: row.status === MesWmMiscIssueStatusEnum.PREPARE,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm-misc-issue:delete'],
+              ifShow: row.status === MesWmMiscIssueStatusEnum.PREPARE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '执行出库',
+              type: 'link',
+              auth: ['mes:wm-misc-issue:finish'],
+              ifShow: row.status === MesWmMiscIssueStatusEnum.APPROVED,
+              onClick: handleFinish.bind(null, row),
+            },
+            {
+              label: '取消',
+              type: 'link',
+              danger: true,
+              auth: ['mes:wm-misc-issue:update'],
+              ifShow: row.status === MesWmMiscIssueStatusEnum.APPROVED,
+              popConfirm: {
+                title: '确认取消该杂项出库单？取消后不可恢复。',
+                confirm: handleCancel.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/miscissue/modules/form.vue b/apps/web-antd/src/views/mes/wm/miscissue/modules/form.vue
new file mode 100644
index 000000000..01393d2a4
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/miscissue/modules/form.vue
@@ -0,0 +1,194 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesWmMiscIssueApi } from '#/api/mes/wm/miscissue';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { Button, Divider, message, Popconfirm } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createMiscIssue,
+  finishMiscIssue,
+  getMiscIssue,
+  submitMiscIssue,
+  updateMiscIssue,
+} from '#/api/mes/wm/miscissue';
+import { $t } from '#/locales';
+import { MesWmMiscIssueStatusEnum } from '#/views/mes/utils/constants';
+
+import { useFormSchema } from '../data';
+import LineList from './line-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesWmMiscIssueApi.MiscIssue>();
+const originalSnapshot = ref(''); // 表单原始数据快照，用于提交时跳过未变更的保存请求
+const isEditable = computed(() => // 是否为编辑模式（可保存）
+  ['create', 'update'].includes(formType.value),
+);
+const isFinish = computed(() => formType.value === 'finish'); // 是否为执行出库模式
+const canSubmit = computed(() => // 是否可提交
+  formType.value === 'update' &&
+  formData.value?.status === MesWmMiscIssueStatusEnum.PREPARE,
+);
+const getTitle = computed(() => {
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['杂项出库单']);
+  }
+  if (formType.value === 'finish') {
+    return '执行出库';
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['杂项出库单'])
+    : $t('ui.actionTitle.create', ['杂项出库单']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+/** 提交出库单：表单有修改时先保存，再调用提交接口 */
+async function handleSubmit() {
+  const { valid } = await formApi.validate();
+  if (!valid || !formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    const current = JSON.stringify(await formApi.getValues());
+    if (current !== originalSnapshot.value) {
+      const data = (await formApi.getValues()) as MesWmMiscIssueApi.MiscIssue;
+      await updateMiscIssue({ ...formData.value, ...data });
+      originalSnapshot.value = current;
+    }
+    await submitMiscIssue(formData.value.id);
+    message.success('提交成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 执行出库 */
+async function handleFinish() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await finishMiscIssue(formData.value.id);
+    message.success('出库成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (!isEditable.value) {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data = (await formApi.getValues()) as MesWmMiscIssueApi.MiscIssue;
+    try {
+      if (formData.value?.id) {
+        await updateMiscIssue({ ...formData.value, ...data });
+        formData.value = { ...formData.value, ...data };
+      } else {
+        const id = await createMiscIssue(data);
+        formData.value = {
+          ...data,
+          id,
+          status: MesWmMiscIssueStatusEnum.PREPARE,
+        };
+        await formApi.setFieldValue('id', id);
+        await formApi.setFieldValue('status', formData.value.status);
+        formType.value = 'update';
+      }
+      originalSnapshot.value = JSON.stringify(await formApi.getValues());
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      originalSnapshot.value = '';
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    formApi.setDisabled(formType.value === 'detail' || formType.value === 'finish');
+    modalApi.setState({ showConfirmButton: isEditable.value });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getMiscIssue(data.id);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    }
+    originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+    <!-- 非新建模式展示物料信息 -->
+    <template v-if="formData?.id">
+      <Divider>物料信息</Divider>
+      <div class="mx-4">
+        <LineList :form-type="formType" :issue-id="formData.id" />
+      </div>
+    </template>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <Popconfirm
+          v-if="canSubmit"
+          title="确认提交该杂项出库单？【提交后将不能修改】"
+          @confirm="handleSubmit"
+        >
+          <Button type="primary">提交</Button>
+        </Popconfirm>
+        <Popconfirm
+          v-if="isFinish"
+          title="确认执行出库？执行后将更新库存台账。"
+          @confirm="handleFinish"
+        >
+          <Button type="primary">执行出库</Button>
+        </Popconfirm>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/miscissue/modules/line-form.vue b/apps/web-antd/src/views/mes/wm/miscissue/modules/line-form.vue
new file mode 100644
index 000000000..39f6fe223
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/miscissue/modules/line-form.vue
@@ -0,0 +1,97 @@
+<script lang="ts" setup>
+import type { MesWmMiscIssueLineApi } from '#/api/mes/wm/miscissue/line';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createMiscIssueLine,
+  getMiscIssueLine,
+  updateMiscIssueLine,
+} from '#/api/mes/wm/miscissue/line';
+import { $t } from '#/locales';
+
+import { useLineFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesWmMiscIssueLineApi.MiscIssueLine>();
+const issueId = ref<number>(); // 所属出库单编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['物料出库单行'])
+    : $t('ui.actionTitle.create', ['物料出库单行']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 90,
+  },
+  layout: 'horizontal',
+  schema: useLineFormSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data = (await formApi.getValues()) as MesWmMiscIssueLineApi.MiscIssueLine;
+    data.issueId = issueId.value;
+    try {
+      await (formData.value?.id
+        ? updateMiscIssueLine({ ...data, id: formData.value.id })
+        : createMiscIssueLine(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    formApi.setState({ schema: useLineFormSchema(formApi) });
+    // 加载数据
+    const data = modalApi.getData<{
+      id?: number;
+      issueId: number;
+    }>();
+    issueId.value = data.issueId;
+    if (!data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getMiscIssueLine(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/miscissue/modules/line-list.vue b/apps/web-antd/src/views/mes/wm/miscissue/modules/line-list.vue
new file mode 100644
index 000000000..ad0041983
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/miscissue/modules/line-list.vue
@@ -0,0 +1,137 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmMiscIssueLineApi } from '#/api/mes/wm/miscissue/line';
+
+import { computed } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteMiscIssueLine,
+  getMiscIssueLinePage,
+} from '#/api/mes/wm/miscissue/line';
+import { $t } from '#/locales';
+
+import { type FormType, useLineGridColumns } from '../data';
+import LineForm from './line-form.vue';
+
+const props = defineProps<{
+  formType: FormType;
+  issueId: number;
+}>();
+
+const isEditable = computed(() => // 是否可编辑明细行
+  ['create', 'update'].includes(props.formType),
+);
+
+const [LineFormModal, lineFormModalApi] = useVbenModal({
+  connectedComponent: LineForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 添加物料 */
+function handleCreate() {
+  lineFormModalApi.setData({ issueId: props.issueId }).open();
+}
+
+/** 编辑物料 */
+function handleEdit(row: MesWmMiscIssueLineApi.MiscIssueLine) {
+  lineFormModalApi.setData({ id: row.id, issueId: props.issueId }).open();
+}
+
+/** 删除物料 */
+async function handleDelete(row: MesWmMiscIssueLineApi.MiscIssueLine) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.itemName]),
+    duration: 0,
+  });
+  try {
+    await deleteMiscIssueLine(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.itemName]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useLineGridColumns(isEditable.value),
+    height: 360,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.issueId) {
+            return { list: [], total: 0 };
+          }
+          return await getMiscIssueLinePage({
+            issueId: props.issueId,
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesWmMiscIssueLineApi.MiscIssueLine>,
+});
+</script>
+
+<template>
+  <div>
+    <LineFormModal @success="handleRefresh" />
+    <Grid table-title="物料信息">
+      <template v-if="isEditable" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '添加物料',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              ifShow: isEditable,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              ifShow: isEditable,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.itemName]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/miscreceipt/data.ts b/apps/web-antd/src/views/mes/wm/miscreceipt/data.ts
new file mode 100644
index 000000000..8b192fc0f
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/miscreceipt/data.ts
@@ -0,0 +1,423 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmMiscReceiptApi } from '#/api/mes/wm/miscreceipt';
+import type { MesWmMiscReceiptLineApi } from '#/api/mes/wm/miscreceipt/line';
+
+import { h, markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { Button } from 'ant-design-vue';
+
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getRangePickerDefaultProps } from '#/utils';
+import { MdItemSelect } from '#/views/mes/md/item/components';
+import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
+import {
+  WmWarehouseAreaSelect,
+  WmWarehouseLocationSelect,
+  WmWarehouseSelect,
+} from '#/views/mes/wm/warehouse/components';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'finish' | 'update';
+
+/** 表单头部是否只读（详情、执行入库态） */
+function isHeaderReadonly(formType: FormType): boolean {
+  return formType === 'detail' || formType === 'finish';
+}
+
+/** 新增/修改的表单 */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'status',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '入库单编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入入库单编号',
+      },
+      rules: 'required',
+      suffix: isHeaderReadonly(formType)
+        ? undefined
+        : () =>
+            h(
+              Button,
+              {
+                type: 'default',
+                onClick: async () => {
+                  const code = await generateAutoCode(
+                    MesAutoCodeRuleCode.WM_MISC_RECEIPT_CODE,
+                  );
+                  await formApi?.setFieldValue('code', code);
+                },
+              },
+              { default: () => '生成' },
+            ),
+    },
+    {
+      fieldName: 'name',
+      label: '入库单名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入入库单名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'type',
+      label: '杂项类型',
+      component: 'Select',
+      componentProps: {
+        options: getDictOptions(DICT_TYPE.MES_WM_MISC_RECEIPT_TYPE, 'number'),
+        placeholder: '请选择杂项类型',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'sourceDocType',
+      label: '来源单据类型',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入来源单据类型',
+      },
+    },
+    {
+      fieldName: 'sourceDocCode',
+      label: '来源单据编码',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入来源单据编码',
+      },
+    },
+    {
+      fieldName: 'receiptDate',
+      label: '入库日期',
+      component: 'DatePicker',
+      componentProps: {
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择入库日期',
+        valueFormat: 'x',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '入库单编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入入库单编号',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '入库单名称',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入入库单名称',
+      },
+    },
+    {
+      fieldName: 'type',
+      label: '杂项类型',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_WM_MISC_RECEIPT_TYPE, 'number'),
+        placeholder: '请选择杂项类型',
+      },
+    },
+    {
+      fieldName: 'sourceDocType',
+      label: '来源单据类型',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入来源单据类型',
+      },
+    },
+    {
+      fieldName: 'sourceDocCode',
+      label: '来源单据编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入来源单据编号',
+      },
+    },
+    {
+      fieldName: 'receiptDate',
+      label: '入库日期',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+        allowClear: true,
+      },
+    },
+    {
+      fieldName: 'status',
+      label: '单据状态',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_WM_MISC_RECEIPT_STATUS, 'number'),
+        placeholder: '请选择单据状态',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesWmMiscReceiptApi.MiscReceipt>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '入库单编号',
+      minWidth: 160,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '入库单名称',
+      minWidth: 150,
+    },
+    {
+      field: 'type',
+      title: '杂项类型',
+      minWidth: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_MISC_RECEIPT_TYPE },
+      },
+    },
+    {
+      field: 'sourceDocType',
+      title: '来源单据类型',
+      minWidth: 120,
+    },
+    {
+      field: 'sourceDocCode',
+      title: '来源单据编号',
+      minWidth: 150,
+    },
+    {
+      field: 'receiptDate',
+      title: '入库日期',
+      width: 180,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      minWidth: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_MISC_RECEIPT_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 240,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 入库单行子表的字段 */
+export function useLineGridColumns(
+  editable = true,
+): VxeTableGridOptions<MesWmMiscReceiptLineApi.MiscReceiptLine>['columns'] {
+  return [
+    {
+      field: 'itemCode',
+      title: '物料编码',
+      minWidth: 120,
+    },
+    {
+      field: 'itemName',
+      title: '物料名称',
+      minWidth: 140,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'quantity',
+      title: '入库数量',
+      width: 100,
+    },
+    {
+      field: 'batchCode',
+      title: '批次号',
+      minWidth: 120,
+    },
+    {
+      field: 'warehouseName',
+      title: '仓库',
+      minWidth: 100,
+    },
+    {
+      field: 'locationName',
+      title: '库区',
+      minWidth: 100,
+    },
+    {
+      field: 'areaName',
+      title: '库位',
+      minWidth: 100,
+    },
+    ...(editable
+      ? [
+          {
+            title: '操作',
+            width: 160,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 入库单行新增/修改的表单 */
+export function useLineFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择物料',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'quantity',
+      label: '入库数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0.01,
+        placeholder: '请输入入库数量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入批次号',
+      },
+    },
+    {
+      fieldName: 'warehouseId',
+      label: '仓库',
+      component: markRaw(WmWarehouseSelect),
+      componentProps: {
+        // 切换仓库后清空库区和库位
+        onChange: async () => {
+          await formApi?.setValues({
+            areaId: undefined,
+            locationId: undefined,
+          });
+        },
+        placeholder: '请选择仓库',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'locationId',
+      label: '库区',
+      component: markRaw(WmWarehouseLocationSelect),
+      componentProps: {
+        placeholder: '请选择库区',
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['warehouseId'],
+        componentProps: (values) => ({
+          // 切换库区后清空库位
+          onChange: async () => {
+            await formApi?.setFieldValue('areaId', undefined);
+          },
+          placeholder: '请选择库区',
+          warehouseId: values.warehouseId,
+        }),
+      },
+    },
+    {
+      fieldName: 'areaId',
+      label: '库位',
+      component: markRaw(WmWarehouseAreaSelect),
+      componentProps: {
+        placeholder: '请选择库位',
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['locationId'],
+        componentProps: (values) => ({
+          locationId: values.locationId,
+          placeholder: '请选择库位',
+        }),
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/wm/miscreceipt/index.vue b/apps/web-antd/src/views/mes/wm/miscreceipt/index.vue
new file mode 100644
index 000000000..39c2b8439
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/miscreceipt/index.vue
@@ -0,0 +1,195 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmMiscReceiptApi } from '#/api/mes/wm/miscreceipt';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { Button, message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  cancelMiscReceipt,
+  deleteMiscReceipt,
+  exportMiscReceipt,
+  getMiscReceiptPage,
+} from '#/api/mes/wm/miscreceipt';
+import { $t } from '#/locales';
+import { MesWmMiscReceiptStatusEnum } from '#/views/mes/utils/constants';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建杂项入库单 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看杂项入库单 */
+function handleDetail(row: MesWmMiscReceiptApi.MiscReceipt) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑杂项入库单 */
+function handleEdit(row: MesWmMiscReceiptApi.MiscReceipt) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 执行入库 */
+function handleFinish(row: MesWmMiscReceiptApi.MiscReceipt) {
+  formModalApi.setData({ formType: 'finish', id: row.id }).open();
+}
+
+/** 删除杂项入库单 */
+async function handleDelete(row: MesWmMiscReceiptApi.MiscReceipt) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.code]),
+    duration: 0,
+  });
+  try {
+    await deleteMiscReceipt(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 取消杂项入库单 */
+async function handleCancel(row: MesWmMiscReceiptApi.MiscReceipt) {
+  await cancelMiscReceipt(row.id!);
+  message.success('取消成功');
+  handleRefresh();
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportMiscReceipt(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '杂项入库单.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getMiscReceiptPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmMiscReceiptApi.MiscReceipt>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】其他入库、其他出库"
+        url="https://doc.iocoder.cn/mes/wm/misc/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="杂项入库单列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['杂项入库单']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm:misc-receipt:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:wm:misc-receipt:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <Button type="link" @click="handleDetail(row)">
+          {{ row.code }}
+        </Button>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:wm:misc-receipt:update'],
+              ifShow: row.status === MesWmMiscReceiptStatusEnum.PREPARE,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm:misc-receipt:delete'],
+              ifShow: row.status === MesWmMiscReceiptStatusEnum.PREPARE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '执行入库',
+              type: 'link',
+              auth: ['mes:wm:misc-receipt:finish'],
+              ifShow: row.status === MesWmMiscReceiptStatusEnum.APPROVED,
+              onClick: handleFinish.bind(null, row),
+            },
+            {
+              label: '取消',
+              type: 'link',
+              danger: true,
+              auth: ['mes:wm:misc-receipt:cancel'],
+              ifShow: row.status === MesWmMiscReceiptStatusEnum.APPROVED,
+              popConfirm: {
+                title: '确认取消该杂项入库单吗？',
+                confirm: handleCancel.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/miscreceipt/modules/form.vue b/apps/web-antd/src/views/mes/wm/miscreceipt/modules/form.vue
new file mode 100644
index 000000000..267ad0fcd
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/miscreceipt/modules/form.vue
@@ -0,0 +1,194 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesWmMiscReceiptApi } from '#/api/mes/wm/miscreceipt';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { Button, Divider, message, Popconfirm } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createMiscReceipt,
+  finishMiscReceipt,
+  getMiscReceipt,
+  submitMiscReceipt,
+  updateMiscReceipt,
+} from '#/api/mes/wm/miscreceipt';
+import { $t } from '#/locales';
+import { MesWmMiscReceiptStatusEnum } from '#/views/mes/utils/constants';
+
+import { useFormSchema } from '../data';
+import LineList from './line-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesWmMiscReceiptApi.MiscReceipt>();
+const originalSnapshot = ref(''); // 表单原始数据快照，用于提交时跳过未变更的保存请求
+const isEditable = computed(() => // 是否为编辑模式（可保存）
+  ['create', 'update'].includes(formType.value),
+);
+const isFinish = computed(() => formType.value === 'finish'); // 是否为执行入库模式
+const canSubmit = computed(() => // 是否可提交
+  formType.value === 'update' &&
+  formData.value?.status === MesWmMiscReceiptStatusEnum.PREPARE,
+);
+const getTitle = computed(() => {
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['杂项入库单']);
+  }
+  if (formType.value === 'finish') {
+    return '执行入库';
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['杂项入库单'])
+    : $t('ui.actionTitle.create', ['杂项入库单']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+/** 提交入库单：表单有修改时先保存，再调用提交接口 */
+async function handleSubmit() {
+  const { valid } = await formApi.validate();
+  if (!valid || !formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    const current = JSON.stringify(await formApi.getValues());
+    if (current !== originalSnapshot.value) {
+      const data = (await formApi.getValues()) as MesWmMiscReceiptApi.MiscReceipt;
+      await updateMiscReceipt({ ...formData.value, ...data });
+      originalSnapshot.value = current;
+    }
+    await submitMiscReceipt(formData.value.id);
+    message.success('提交成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 执行入库 */
+async function handleFinish() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await finishMiscReceipt(formData.value.id);
+    message.success('入库成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (!isEditable.value) {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data = (await formApi.getValues()) as MesWmMiscReceiptApi.MiscReceipt;
+    try {
+      if (formData.value?.id) {
+        await updateMiscReceipt({ ...formData.value, ...data });
+        formData.value = { ...formData.value, ...data };
+      } else {
+        const id = await createMiscReceipt(data);
+        formData.value = {
+          ...data,
+          id,
+          status: MesWmMiscReceiptStatusEnum.PREPARE,
+        };
+        await formApi.setFieldValue('id', id);
+        await formApi.setFieldValue('status', formData.value.status);
+        formType.value = 'update';
+      }
+      originalSnapshot.value = JSON.stringify(await formApi.getValues());
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      originalSnapshot.value = '';
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    formApi.setDisabled(formType.value === 'detail' || formType.value === 'finish');
+    modalApi.setState({ showConfirmButton: isEditable.value });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getMiscReceipt(data.id);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    }
+    originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+    <!-- 非新建模式展示物料信息 -->
+    <template v-if="formData?.id">
+      <Divider>物料信息</Divider>
+      <div class="mx-4">
+        <LineList :form-type="formType" :receipt-id="formData.id" />
+      </div>
+    </template>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <Popconfirm
+          v-if="canSubmit"
+          title="确认提交该杂项入库单？【提交后将不能修改】"
+          @confirm="handleSubmit"
+        >
+          <Button type="primary">提交</Button>
+        </Popconfirm>
+        <Popconfirm
+          v-if="isFinish"
+          title="确认执行入库？执行后将更新库存台账。"
+          @confirm="handleFinish"
+        >
+          <Button type="primary">执行入库</Button>
+        </Popconfirm>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/miscreceipt/modules/line-form.vue b/apps/web-antd/src/views/mes/wm/miscreceipt/modules/line-form.vue
new file mode 100644
index 000000000..d660ba3dc
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/miscreceipt/modules/line-form.vue
@@ -0,0 +1,98 @@
+<script lang="ts" setup>
+import type { MesWmMiscReceiptLineApi } from '#/api/mes/wm/miscreceipt/line';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createMiscReceiptLine,
+  getMiscReceiptLine,
+  updateMiscReceiptLine,
+} from '#/api/mes/wm/miscreceipt/line';
+import { $t } from '#/locales';
+
+import { useLineFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesWmMiscReceiptLineApi.MiscReceiptLine>();
+const receiptId = ref<number>(); // 所属入库单编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['物料'])
+    : $t('ui.actionTitle.create', ['物料']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 90,
+  },
+  layout: 'horizontal',
+  schema: useLineFormSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmMiscReceiptLineApi.MiscReceiptLine;
+    data.receiptId = receiptId.value;
+    try {
+      await (formData.value?.id
+        ? updateMiscReceiptLine({ ...data, id: formData.value.id })
+        : createMiscReceiptLine(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    formApi.setState({ schema: useLineFormSchema(formApi) });
+    // 加载数据
+    const data = modalApi.getData<{
+      id?: number;
+      receiptId: number;
+    }>();
+    receiptId.value = data.receiptId;
+    if (!data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getMiscReceiptLine(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/miscreceipt/modules/line-list.vue b/apps/web-antd/src/views/mes/wm/miscreceipt/modules/line-list.vue
new file mode 100644
index 000000000..a04bc667b
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/miscreceipt/modules/line-list.vue
@@ -0,0 +1,137 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmMiscReceiptLineApi } from '#/api/mes/wm/miscreceipt/line';
+
+import { computed } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteMiscReceiptLine,
+  getMiscReceiptLineListByReceiptId,
+} from '#/api/mes/wm/miscreceipt/line';
+import { $t } from '#/locales';
+
+import { type FormType, useLineGridColumns } from '../data';
+import LineForm from './line-form.vue';
+
+const props = defineProps<{
+  formType: FormType;
+  receiptId: number;
+}>();
+
+const isEditable = computed(() => // 是否可编辑明细行
+  ['create', 'update'].includes(props.formType),
+);
+
+const [LineFormModal, lineFormModalApi] = useVbenModal({
+  connectedComponent: LineForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 添加物料 */
+function handleCreate() {
+  lineFormModalApi.setData({ receiptId: props.receiptId }).open();
+}
+
+/** 编辑物料 */
+function handleEdit(row: MesWmMiscReceiptLineApi.MiscReceiptLine) {
+  lineFormModalApi.setData({ id: row.id, receiptId: props.receiptId }).open();
+}
+
+/** 删除物料 */
+async function handleDelete(row: MesWmMiscReceiptLineApi.MiscReceiptLine) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.itemName]),
+    duration: 0,
+  });
+  try {
+    await deleteMiscReceiptLine(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.itemName]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useLineGridColumns(isEditable.value),
+    height: 360,
+    keepSource: true,
+    pagerConfig: {
+      enabled: false,
+    },
+    proxyConfig: {
+      ajax: {
+        query: async () => {
+          if (!props.receiptId) {
+            return { list: [], total: 0 };
+          }
+          const list = await getMiscReceiptLineListByReceiptId(props.receiptId);
+          return { list, total: list.length };
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesWmMiscReceiptLineApi.MiscReceiptLine>,
+});
+</script>
+
+<template>
+  <div>
+    <LineFormModal @success="handleRefresh" />
+    <Grid table-title="物料信息">
+      <template v-if="isEditable" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '添加物料',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              ifShow: isEditable,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              ifShow: isEditable,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.itemName]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-ele/src/api/mes/wm/miscissue/index.ts b/apps/web-ele/src/api/mes/wm/miscissue/index.ts
index 7ce7ede46..1a54df4f4 100644
--- a/apps/web-ele/src/api/mes/wm/miscissue/index.ts
+++ b/apps/web-ele/src/api/mes/wm/miscissue/index.ts
@@ -8,7 +8,7 @@ export namespace MesWmMiscIssueApi {
     id?: number; // 编号
     code?: string; // 出库单编号
     name?: string; // 出库单名称
-    type?: string; // 业务类型
+    type?: number; // 业务类型
     sourceDocType?: string; // 来源单据类型
     sourceDocId?: number; // 来源单据编号
     sourceDocCode?: string; // 来源单据编码
diff --git a/apps/web-ele/src/views/mes/wm/miscissue/data.ts b/apps/web-ele/src/views/mes/wm/miscissue/data.ts
new file mode 100644
index 000000000..9ff928496
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/miscissue/data.ts
@@ -0,0 +1,455 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmMaterialStockApi } from '#/api/mes/wm/materialstock';
+import type { MesWmMiscIssueApi } from '#/api/mes/wm/miscissue';
+import type { MesWmMiscIssueLineApi } from '#/api/mes/wm/miscissue/line';
+
+import { h, markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { ElButton } from 'element-plus';
+
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getRangePickerDefaultProps } from '#/utils';
+import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
+import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
+import {
+  WmWarehouseAreaSelect,
+  WmWarehouseLocationSelect,
+  WmWarehouseSelect,
+} from '#/views/mes/wm/warehouse/components';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'finish' | 'update';
+
+/** 表单头部是否只读（详情、执行出库态） */
+function isHeaderReadonly(formType: FormType): boolean {
+  return formType === 'detail' || formType === 'finish';
+}
+
+/** 新增/修改的表单 */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'status',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '出库单编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入出库单编号',
+      },
+      rules: 'required',
+      suffix: isHeaderReadonly(formType)
+        ? undefined
+        : () =>
+            h(
+              ElButton,
+              {
+                onClick: async () => {
+                  const code = await generateAutoCode(
+                    MesAutoCodeRuleCode.WM_MISC_ISSUE_CODE,
+                  );
+                  await formApi?.setFieldValue('code', code);
+                },
+              },
+              { default: () => '生成' },
+            ),
+    },
+    {
+      fieldName: 'name',
+      label: '出库单名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入出库单名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'type',
+      label: '业务类型',
+      component: 'Select',
+      componentProps: {
+        options: getDictOptions(DICT_TYPE.MES_WM_MISC_ISSUE_TYPE, 'number'),
+        placeholder: '请选择业务类型',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'issueDate',
+      label: '出库日期',
+      component: 'DatePicker',
+      componentProps: {
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择出库日期',
+        type: 'date',
+        valueFormat: 'x',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'sourceDocType',
+      label: '来源单据类型',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入来源单据类型',
+      },
+    },
+    {
+      fieldName: 'sourceDocCode',
+      label: '来源单据编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入来源单据编号',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '出库单编号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入出库单编号',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '出库单名称',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入出库单名称',
+      },
+    },
+    {
+      fieldName: 'type',
+      label: '业务类型',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_WM_MISC_ISSUE_TYPE, 'number'),
+        placeholder: '请选择业务类型',
+      },
+    },
+    {
+      fieldName: 'sourceDocType',
+      label: '来源单据类型',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入来源单据类型',
+      },
+    },
+    {
+      fieldName: 'sourceDocCode',
+      label: '来源单据编号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入来源单据编号',
+      },
+    },
+    {
+      fieldName: 'issueDate',
+      label: '出库日期',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+        clearable: true,
+      },
+    },
+    {
+      fieldName: 'status',
+      label: '单据状态',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_WM_MISC_ISSUE_STATUS, 'number'),
+        placeholder: '请选择单据状态',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesWmMiscIssueApi.MiscIssue>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '出库单编号',
+      minWidth: 160,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '出库单名称',
+      minWidth: 150,
+    },
+    {
+      field: 'type',
+      title: '业务类型',
+      minWidth: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_MISC_ISSUE_TYPE },
+      },
+    },
+    {
+      field: 'sourceDocType',
+      title: '来源单据类型',
+      minWidth: 120,
+    },
+    {
+      field: 'sourceDocCode',
+      title: '来源单据编号',
+      minWidth: 150,
+    },
+    {
+      field: 'issueDate',
+      title: '出库日期',
+      width: 180,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      minWidth: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_MISC_ISSUE_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 240,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 出库单行子表的字段 */
+export function useLineGridColumns(
+  editable = true,
+): VxeTableGridOptions<MesWmMiscIssueLineApi.MiscIssueLine>['columns'] {
+  return [
+    {
+      field: 'itemCode',
+      title: '物料编码',
+      minWidth: 120,
+    },
+    {
+      field: 'itemName',
+      title: '物料名称',
+      minWidth: 140,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'quantity',
+      title: '出库数量',
+      width: 100,
+    },
+    {
+      field: 'batchCode',
+      title: '批次编码',
+      minWidth: 120,
+    },
+    {
+      field: 'warehouseName',
+      title: '仓库',
+      minWidth: 120,
+    },
+    {
+      field: 'locationName',
+      title: '库区',
+      minWidth: 120,
+    },
+    {
+      field: 'areaName',
+      title: '库位',
+      minWidth: 120,
+    },
+    ...(editable
+      ? [
+          {
+            title: '操作',
+            width: 120,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 出库单行新增/修改的表单 */
+export function useLineFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'itemId',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'quantityMax',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'materialStockId',
+      label: '库存物资',
+      component: markRaw(WmMaterialStockSelect),
+      componentProps: {
+        // 选择库存物资后，自动回填物料、批次号、仓库位置和最大可出库数量
+        onChange: async (stock?: MesWmMaterialStockApi.MaterialStock) => {
+          await formApi?.setValues({
+            areaId: stock?.areaId,
+            batchCode: stock?.batchCode,
+            itemId: stock?.itemId,
+            locationId: stock?.locationId,
+            quantityMax: stock?.quantity,
+            warehouseId: stock?.warehouseId,
+          });
+        },
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['itemId'],
+        componentProps: (values) => ({
+          itemId: values.itemId,
+        }),
+      },
+    },
+    {
+      fieldName: 'quantity',
+      label: '出库数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0.01,
+        placeholder: '请输入出库数量',
+        precision: 2,
+      },
+      rules: 'required',
+      dependencies: {
+        triggerFields: ['quantityMax'],
+        componentProps: (values) => ({
+          class: '!w-full',
+          controlsPosition: 'right',
+          max: values.quantityMax,
+          min: 0.01,
+          placeholder: '请输入出库数量',
+          precision: 2,
+        }),
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+        placeholder: '批次号',
+      },
+    },
+    {
+      fieldName: 'warehouseId',
+      label: '仓库',
+      component: markRaw(WmWarehouseSelect),
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'locationId',
+      label: '库区',
+      component: markRaw(WmWarehouseLocationSelect),
+      componentProps: {
+        disabled: true,
+      },
+      dependencies: {
+        triggerFields: ['warehouseId'],
+        componentProps: (values) => ({
+          disabled: true,
+          warehouseId: values.warehouseId,
+        }),
+      },
+    },
+    {
+      fieldName: 'areaId',
+      label: '库位',
+      component: markRaw(WmWarehouseAreaSelect),
+      componentProps: {
+        disabled: true,
+      },
+      dependencies: {
+        triggerFields: ['locationId'],
+        componentProps: (values) => ({
+          disabled: true,
+          locationId: values.locationId,
+        }),
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/wm/miscissue/index.vue b/apps/web-ele/src/views/mes/wm/miscissue/index.vue
new file mode 100644
index 000000000..516565b77
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/miscissue/index.vue
@@ -0,0 +1,196 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmMiscIssueApi } from '#/api/mes/wm/miscissue';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { ElButton, ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  cancelMiscIssue,
+  deleteMiscIssue,
+  exportMiscIssue,
+  getMiscIssuePage,
+} from '#/api/mes/wm/miscissue';
+import { $t } from '#/locales';
+import { MesWmMiscIssueStatusEnum } from '#/views/mes/utils/constants';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建杂项出库单 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看杂项出库单 */
+function handleDetail(row: MesWmMiscIssueApi.MiscIssue) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑杂项出库单 */
+function handleEdit(row: MesWmMiscIssueApi.MiscIssue) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 执行出库 */
+function handleFinish(row: MesWmMiscIssueApi.MiscIssue) {
+  formModalApi.setData({ formType: 'finish', id: row.id }).open();
+}
+
+/** 删除杂项出库单 */
+async function handleDelete(row: MesWmMiscIssueApi.MiscIssue) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.code]),
+  });
+  try {
+    await deleteMiscIssue(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+/** 取消杂项出库单 */
+async function handleCancel(row: MesWmMiscIssueApi.MiscIssue) {
+  await cancelMiscIssue(row.id!);
+  ElMessage.success('取消成功');
+  handleRefresh();
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportMiscIssue(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '杂项出库单.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getMiscIssuePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmMiscIssueApi.MiscIssue>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】其他入库、其他出库"
+        url="https://doc.iocoder.cn/mes/wm/misc/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="杂项出库单列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['杂项出库单']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-misc-issue:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:wm-misc-issue:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <ElButton link type="primary" @click="handleDetail(row)">
+          {{ row.code }}
+        </ElButton>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:wm-misc-issue:update'],
+              ifShow: row.status === MesWmMiscIssueStatusEnum.PREPARE,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm-misc-issue:delete'],
+              ifShow: row.status === MesWmMiscIssueStatusEnum.PREPARE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '执行出库',
+              type: 'primary',
+              link: true,
+              auth: ['mes:wm-misc-issue:finish'],
+              ifShow: row.status === MesWmMiscIssueStatusEnum.APPROVED,
+              onClick: handleFinish.bind(null, row),
+            },
+            {
+              label: '取消',
+              type: 'danger',
+              link: true,
+              auth: ['mes:wm-misc-issue:update'],
+              ifShow: row.status === MesWmMiscIssueStatusEnum.APPROVED,
+              popConfirm: {
+                title: '确认取消该杂项出库单？取消后不可恢复。',
+                confirm: handleCancel.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/miscissue/modules/form.vue b/apps/web-ele/src/views/mes/wm/miscissue/modules/form.vue
new file mode 100644
index 000000000..ead78d938
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/miscissue/modules/form.vue
@@ -0,0 +1,200 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesWmMiscIssueApi } from '#/api/mes/wm/miscissue';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElButton, ElDivider, ElMessage, ElPopconfirm } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createMiscIssue,
+  finishMiscIssue,
+  getMiscIssue,
+  submitMiscIssue,
+  updateMiscIssue,
+} from '#/api/mes/wm/miscissue';
+import { $t } from '#/locales';
+import { MesWmMiscIssueStatusEnum } from '#/views/mes/utils/constants';
+
+import { useFormSchema } from '../data';
+import LineList from './line-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesWmMiscIssueApi.MiscIssue>();
+const originalSnapshot = ref(''); // 表单原始数据快照，用于提交时跳过未变更的保存请求
+const isEditable = computed(() => // 是否为编辑模式（可保存）
+  ['create', 'update'].includes(formType.value),
+);
+const isFinish = computed(() => formType.value === 'finish'); // 是否为执行出库模式
+const canSubmit = computed(() => // 是否可提交
+  formType.value === 'update' &&
+  formData.value?.status === MesWmMiscIssueStatusEnum.PREPARE,
+);
+const getTitle = computed(() => {
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['杂项出库单']);
+  }
+  if (formType.value === 'finish') {
+    return '执行出库';
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['杂项出库单'])
+    : $t('ui.actionTitle.create', ['杂项出库单']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+/** 提交出库单：表单有修改时先保存，再调用提交接口 */
+async function handleSubmit() {
+  const { valid } = await formApi.validate();
+  if (!valid || !formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    const current = JSON.stringify(await formApi.getValues());
+    if (current !== originalSnapshot.value) {
+      const data = (await formApi.getValues()) as MesWmMiscIssueApi.MiscIssue;
+      await updateMiscIssue({ ...formData.value, ...data });
+      originalSnapshot.value = current;
+    }
+    await submitMiscIssue(formData.value.id);
+    ElMessage.success('提交成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 执行出库 */
+async function handleFinish() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await finishMiscIssue(formData.value.id);
+    ElMessage.success('出库成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (!isEditable.value) {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data = (await formApi.getValues()) as MesWmMiscIssueApi.MiscIssue;
+    try {
+      if (formData.value?.id) {
+        await updateMiscIssue({ ...formData.value, ...data });
+        formData.value = { ...formData.value, ...data };
+      } else {
+        const id = await createMiscIssue(data);
+        formData.value = {
+          ...data,
+          id,
+          status: MesWmMiscIssueStatusEnum.PREPARE,
+        };
+        await formApi.setFieldValue('id', id);
+        await formApi.setFieldValue('status', formData.value.status);
+        formType.value = 'update';
+      }
+      originalSnapshot.value = JSON.stringify(await formApi.getValues());
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      originalSnapshot.value = '';
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    formApi.setDisabled(formType.value === 'detail' || formType.value === 'finish');
+    modalApi.setState({ showConfirmButton: isEditable.value });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getMiscIssue(data.id);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    }
+    originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+    <!-- 非新建模式展示物料信息 -->
+    <template v-if="formData?.id">
+      <ElDivider>物料信息</ElDivider>
+      <div class="mx-4">
+        <LineList :form-type="formType" :issue-id="formData.id" />
+      </div>
+    </template>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <ElPopconfirm
+          v-if="canSubmit"
+          title="确认提交该杂项出库单？【提交后将不能修改】"
+          width="260"
+          @confirm="handleSubmit"
+        >
+          <template #reference>
+            <ElButton type="primary">提交</ElButton>
+          </template>
+        </ElPopconfirm>
+        <ElPopconfirm
+          v-if="isFinish"
+          title="确认执行出库？执行后将更新库存台账。"
+          width="260"
+          @confirm="handleFinish"
+        >
+          <template #reference>
+            <ElButton type="primary">执行出库</ElButton>
+          </template>
+        </ElPopconfirm>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/miscissue/modules/line-form.vue b/apps/web-ele/src/views/mes/wm/miscissue/modules/line-form.vue
new file mode 100644
index 000000000..b16ffd786
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/miscissue/modules/line-form.vue
@@ -0,0 +1,97 @@
+<script lang="ts" setup>
+import type { MesWmMiscIssueLineApi } from '#/api/mes/wm/miscissue/line';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createMiscIssueLine,
+  getMiscIssueLine,
+  updateMiscIssueLine,
+} from '#/api/mes/wm/miscissue/line';
+import { $t } from '#/locales';
+
+import { useLineFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesWmMiscIssueLineApi.MiscIssueLine>();
+const issueId = ref<number>(); // 所属出库单编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['物料出库单行'])
+    : $t('ui.actionTitle.create', ['物料出库单行']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 90,
+  },
+  layout: 'horizontal',
+  schema: useLineFormSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data = (await formApi.getValues()) as MesWmMiscIssueLineApi.MiscIssueLine;
+    data.issueId = issueId.value;
+    try {
+      await (formData.value?.id
+        ? updateMiscIssueLine({ ...data, id: formData.value.id })
+        : createMiscIssueLine(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    formApi.setState({ schema: useLineFormSchema(formApi) });
+    // 加载数据
+    const data = modalApi.getData<{
+      id?: number;
+      issueId: number;
+    }>();
+    issueId.value = data.issueId;
+    if (!data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getMiscIssueLine(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/miscissue/modules/line-list.vue b/apps/web-ele/src/views/mes/wm/miscissue/modules/line-list.vue
new file mode 100644
index 000000000..8b03d16ea
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/miscissue/modules/line-list.vue
@@ -0,0 +1,137 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmMiscIssueLineApi } from '#/api/mes/wm/miscissue/line';
+
+import { computed } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteMiscIssueLine,
+  getMiscIssueLinePage,
+} from '#/api/mes/wm/miscissue/line';
+import { $t } from '#/locales';
+
+import { type FormType, useLineGridColumns } from '../data';
+import LineForm from './line-form.vue';
+
+const props = defineProps<{
+  formType: FormType;
+  issueId: number;
+}>();
+
+const isEditable = computed(() => // 是否可编辑明细行
+  ['create', 'update'].includes(props.formType),
+);
+
+const [LineFormModal, lineFormModalApi] = useVbenModal({
+  connectedComponent: LineForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 添加物料 */
+function handleCreate() {
+  lineFormModalApi.setData({ issueId: props.issueId }).open();
+}
+
+/** 编辑物料 */
+function handleEdit(row: MesWmMiscIssueLineApi.MiscIssueLine) {
+  lineFormModalApi.setData({ id: row.id, issueId: props.issueId }).open();
+}
+
+/** 删除物料 */
+async function handleDelete(row: MesWmMiscIssueLineApi.MiscIssueLine) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.itemName]),
+  });
+  try {
+    await deleteMiscIssueLine(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.itemName]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useLineGridColumns(isEditable.value),
+    height: 360,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.issueId) {
+            return { list: [], total: 0 };
+          }
+          return await getMiscIssueLinePage({
+            issueId: props.issueId,
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesWmMiscIssueLineApi.MiscIssueLine>,
+});
+</script>
+
+<template>
+  <div>
+    <LineFormModal @success="handleRefresh" />
+    <Grid table-title="物料信息">
+      <template v-if="isEditable" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '添加物料',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              ifShow: isEditable,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              ifShow: isEditable,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.itemName]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/miscreceipt/data.ts b/apps/web-ele/src/views/mes/wm/miscreceipt/data.ts
new file mode 100644
index 000000000..2e308be2d
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/miscreceipt/data.ts
@@ -0,0 +1,424 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmMiscReceiptApi } from '#/api/mes/wm/miscreceipt';
+import type { MesWmMiscReceiptLineApi } from '#/api/mes/wm/miscreceipt/line';
+
+import { h, markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { ElButton } from 'element-plus';
+
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getRangePickerDefaultProps } from '#/utils';
+import { MdItemSelect } from '#/views/mes/md/item/components';
+import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
+import {
+  WmWarehouseAreaSelect,
+  WmWarehouseLocationSelect,
+  WmWarehouseSelect,
+} from '#/views/mes/wm/warehouse/components';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'finish' | 'update';
+
+/** 表单头部是否只读（详情、执行入库态） */
+function isHeaderReadonly(formType: FormType): boolean {
+  return formType === 'detail' || formType === 'finish';
+}
+
+/** 新增/修改的表单 */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'status',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '入库单编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入入库单编号',
+      },
+      rules: 'required',
+      suffix: isHeaderReadonly(formType)
+        ? undefined
+        : () =>
+            h(
+              ElButton,
+              {
+                onClick: async () => {
+                  const code = await generateAutoCode(
+                    MesAutoCodeRuleCode.WM_MISC_RECEIPT_CODE,
+                  );
+                  await formApi?.setFieldValue('code', code);
+                },
+              },
+              { default: () => '生成' },
+            ),
+    },
+    {
+      fieldName: 'name',
+      label: '入库单名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入入库单名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'type',
+      label: '杂项类型',
+      component: 'Select',
+      componentProps: {
+        options: getDictOptions(DICT_TYPE.MES_WM_MISC_RECEIPT_TYPE, 'number'),
+        placeholder: '请选择杂项类型',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'sourceDocType',
+      label: '来源单据类型',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入来源单据类型',
+      },
+    },
+    {
+      fieldName: 'sourceDocCode',
+      label: '来源单据编码',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入来源单据编码',
+      },
+    },
+    {
+      fieldName: 'receiptDate',
+      label: '入库日期',
+      component: 'DatePicker',
+      componentProps: {
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择入库日期',
+        type: 'date',
+        valueFormat: 'x',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '入库单编号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入入库单编号',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '入库单名称',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入入库单名称',
+      },
+    },
+    {
+      fieldName: 'type',
+      label: '杂项类型',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_WM_MISC_RECEIPT_TYPE, 'number'),
+        placeholder: '请选择杂项类型',
+      },
+    },
+    {
+      fieldName: 'sourceDocType',
+      label: '来源单据类型',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入来源单据类型',
+      },
+    },
+    {
+      fieldName: 'sourceDocCode',
+      label: '来源单据编号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入来源单据编号',
+      },
+    },
+    {
+      fieldName: 'receiptDate',
+      label: '入库日期',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+        clearable: true,
+      },
+    },
+    {
+      fieldName: 'status',
+      label: '单据状态',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_WM_MISC_RECEIPT_STATUS, 'number'),
+        placeholder: '请选择单据状态',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesWmMiscReceiptApi.MiscReceipt>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '入库单编号',
+      minWidth: 160,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '入库单名称',
+      minWidth: 150,
+    },
+    {
+      field: 'type',
+      title: '杂项类型',
+      minWidth: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_MISC_RECEIPT_TYPE },
+      },
+    },
+    {
+      field: 'sourceDocType',
+      title: '来源单据类型',
+      minWidth: 120,
+    },
+    {
+      field: 'sourceDocCode',
+      title: '来源单据编号',
+      minWidth: 150,
+    },
+    {
+      field: 'receiptDate',
+      title: '入库日期',
+      width: 180,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      minWidth: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_MISC_RECEIPT_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 240,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 入库单行子表的字段 */
+export function useLineGridColumns(
+  editable = true,
+): VxeTableGridOptions<MesWmMiscReceiptLineApi.MiscReceiptLine>['columns'] {
+  return [
+    {
+      field: 'itemCode',
+      title: '物料编码',
+      minWidth: 120,
+    },
+    {
+      field: 'itemName',
+      title: '物料名称',
+      minWidth: 140,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'quantity',
+      title: '入库数量',
+      width: 100,
+    },
+    {
+      field: 'batchCode',
+      title: '批次号',
+      minWidth: 120,
+    },
+    {
+      field: 'warehouseName',
+      title: '仓库',
+      minWidth: 100,
+    },
+    {
+      field: 'locationName',
+      title: '库区',
+      minWidth: 100,
+    },
+    {
+      field: 'areaName',
+      title: '库位',
+      minWidth: 100,
+    },
+    ...(editable
+      ? [
+          {
+            title: '操作',
+            width: 160,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 入库单行新增/修改的表单 */
+export function useLineFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择物料',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'quantity',
+      label: '入库数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0.01,
+        placeholder: '请输入入库数量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入批次号',
+      },
+    },
+    {
+      fieldName: 'warehouseId',
+      label: '仓库',
+      component: markRaw(WmWarehouseSelect),
+      componentProps: {
+        // 切换仓库后清空库区和库位
+        onChange: async () => {
+          await formApi?.setValues({
+            areaId: undefined,
+            locationId: undefined,
+          });
+        },
+        placeholder: '请选择仓库',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'locationId',
+      label: '库区',
+      component: markRaw(WmWarehouseLocationSelect),
+      componentProps: {
+        placeholder: '请选择库区',
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['warehouseId'],
+        componentProps: (values) => ({
+          // 切换库区后清空库位
+          onChange: async () => {
+            await formApi?.setFieldValue('areaId', undefined);
+          },
+          placeholder: '请选择库区',
+          warehouseId: values.warehouseId,
+        }),
+      },
+    },
+    {
+      fieldName: 'areaId',
+      label: '库位',
+      component: markRaw(WmWarehouseAreaSelect),
+      componentProps: {
+        placeholder: '请选择库位',
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['locationId'],
+        componentProps: (values) => ({
+          locationId: values.locationId,
+          placeholder: '请选择库位',
+        }),
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/wm/miscreceipt/index.vue b/apps/web-ele/src/views/mes/wm/miscreceipt/index.vue
new file mode 100644
index 000000000..4b0711511
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/miscreceipt/index.vue
@@ -0,0 +1,196 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmMiscReceiptApi } from '#/api/mes/wm/miscreceipt';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { ElButton, ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  cancelMiscReceipt,
+  deleteMiscReceipt,
+  exportMiscReceipt,
+  getMiscReceiptPage,
+} from '#/api/mes/wm/miscreceipt';
+import { $t } from '#/locales';
+import { MesWmMiscReceiptStatusEnum } from '#/views/mes/utils/constants';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建杂项入库单 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看杂项入库单 */
+function handleDetail(row: MesWmMiscReceiptApi.MiscReceipt) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑杂项入库单 */
+function handleEdit(row: MesWmMiscReceiptApi.MiscReceipt) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 执行入库 */
+function handleFinish(row: MesWmMiscReceiptApi.MiscReceipt) {
+  formModalApi.setData({ formType: 'finish', id: row.id }).open();
+}
+
+/** 删除杂项入库单 */
+async function handleDelete(row: MesWmMiscReceiptApi.MiscReceipt) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.code]),
+  });
+  try {
+    await deleteMiscReceipt(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+/** 取消杂项入库单 */
+async function handleCancel(row: MesWmMiscReceiptApi.MiscReceipt) {
+  await cancelMiscReceipt(row.id!);
+  ElMessage.success('取消成功');
+  handleRefresh();
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportMiscReceipt(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '杂项入库单.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getMiscReceiptPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmMiscReceiptApi.MiscReceipt>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】其他入库、其他出库"
+        url="https://doc.iocoder.cn/mes/wm/misc/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="杂项入库单列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['杂项入库单']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm:misc-receipt:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:wm:misc-receipt:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <ElButton link type="primary" @click="handleDetail(row)">
+          {{ row.code }}
+        </ElButton>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:wm:misc-receipt:update'],
+              ifShow: row.status === MesWmMiscReceiptStatusEnum.PREPARE,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm:misc-receipt:delete'],
+              ifShow: row.status === MesWmMiscReceiptStatusEnum.PREPARE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '执行入库',
+              type: 'primary',
+              link: true,
+              auth: ['mes:wm:misc-receipt:finish'],
+              ifShow: row.status === MesWmMiscReceiptStatusEnum.APPROVED,
+              onClick: handleFinish.bind(null, row),
+            },
+            {
+              label: '取消',
+              type: 'danger',
+              link: true,
+              auth: ['mes:wm:misc-receipt:cancel'],
+              ifShow: row.status === MesWmMiscReceiptStatusEnum.APPROVED,
+              popConfirm: {
+                title: '确认取消该杂项入库单吗？',
+                confirm: handleCancel.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/miscreceipt/modules/form.vue b/apps/web-ele/src/views/mes/wm/miscreceipt/modules/form.vue
new file mode 100644
index 000000000..32710862f
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/miscreceipt/modules/form.vue
@@ -0,0 +1,200 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesWmMiscReceiptApi } from '#/api/mes/wm/miscreceipt';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElButton, ElDivider, ElMessage, ElPopconfirm } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createMiscReceipt,
+  finishMiscReceipt,
+  getMiscReceipt,
+  submitMiscReceipt,
+  updateMiscReceipt,
+} from '#/api/mes/wm/miscreceipt';
+import { $t } from '#/locales';
+import { MesWmMiscReceiptStatusEnum } from '#/views/mes/utils/constants';
+
+import { useFormSchema } from '../data';
+import LineList from './line-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesWmMiscReceiptApi.MiscReceipt>();
+const originalSnapshot = ref(''); // 表单原始数据快照，用于提交时跳过未变更的保存请求
+const isEditable = computed(() => // 是否为编辑模式（可保存）
+  ['create', 'update'].includes(formType.value),
+);
+const isFinish = computed(() => formType.value === 'finish'); // 是否为执行入库模式
+const canSubmit = computed(() => // 是否可提交
+  formType.value === 'update' &&
+  formData.value?.status === MesWmMiscReceiptStatusEnum.PREPARE,
+);
+const getTitle = computed(() => {
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['杂项入库单']);
+  }
+  if (formType.value === 'finish') {
+    return '执行入库';
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['杂项入库单'])
+    : $t('ui.actionTitle.create', ['杂项入库单']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+/** 提交入库单：表单有修改时先保存，再调用提交接口 */
+async function handleSubmit() {
+  const { valid } = await formApi.validate();
+  if (!valid || !formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    const current = JSON.stringify(await formApi.getValues());
+    if (current !== originalSnapshot.value) {
+      const data = (await formApi.getValues()) as MesWmMiscReceiptApi.MiscReceipt;
+      await updateMiscReceipt({ ...formData.value, ...data });
+      originalSnapshot.value = current;
+    }
+    await submitMiscReceipt(formData.value.id);
+    ElMessage.success('提交成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 执行入库 */
+async function handleFinish() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await finishMiscReceipt(formData.value.id);
+    ElMessage.success('入库成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (!isEditable.value) {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data = (await formApi.getValues()) as MesWmMiscReceiptApi.MiscReceipt;
+    try {
+      if (formData.value?.id) {
+        await updateMiscReceipt({ ...formData.value, ...data });
+        formData.value = { ...formData.value, ...data };
+      } else {
+        const id = await createMiscReceipt(data);
+        formData.value = {
+          ...data,
+          id,
+          status: MesWmMiscReceiptStatusEnum.PREPARE,
+        };
+        await formApi.setFieldValue('id', id);
+        await formApi.setFieldValue('status', formData.value.status);
+        formType.value = 'update';
+      }
+      originalSnapshot.value = JSON.stringify(await formApi.getValues());
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      originalSnapshot.value = '';
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    formApi.setDisabled(formType.value === 'detail' || formType.value === 'finish');
+    modalApi.setState({ showConfirmButton: isEditable.value });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getMiscReceipt(data.id);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    }
+    originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+    <!-- 非新建模式展示物料信息 -->
+    <template v-if="formData?.id">
+      <ElDivider>物料信息</ElDivider>
+      <div class="mx-4">
+        <LineList :form-type="formType" :receipt-id="formData.id" />
+      </div>
+    </template>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <ElPopconfirm
+          v-if="canSubmit"
+          title="确认提交该杂项入库单？【提交后将不能修改】"
+          width="260"
+          @confirm="handleSubmit"
+        >
+          <template #reference>
+            <ElButton type="primary">提交</ElButton>
+          </template>
+        </ElPopconfirm>
+        <ElPopconfirm
+          v-if="isFinish"
+          title="确认执行入库？执行后将更新库存台账。"
+          width="260"
+          @confirm="handleFinish"
+        >
+          <template #reference>
+            <ElButton type="primary">执行入库</ElButton>
+          </template>
+        </ElPopconfirm>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/miscreceipt/modules/line-form.vue b/apps/web-ele/src/views/mes/wm/miscreceipt/modules/line-form.vue
new file mode 100644
index 000000000..f3b21427d
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/miscreceipt/modules/line-form.vue
@@ -0,0 +1,98 @@
+<script lang="ts" setup>
+import type { MesWmMiscReceiptLineApi } from '#/api/mes/wm/miscreceipt/line';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createMiscReceiptLine,
+  getMiscReceiptLine,
+  updateMiscReceiptLine,
+} from '#/api/mes/wm/miscreceipt/line';
+import { $t } from '#/locales';
+
+import { useLineFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesWmMiscReceiptLineApi.MiscReceiptLine>();
+const receiptId = ref<number>(); // 所属入库单编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['物料'])
+    : $t('ui.actionTitle.create', ['物料']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 90,
+  },
+  layout: 'horizontal',
+  schema: useLineFormSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmMiscReceiptLineApi.MiscReceiptLine;
+    data.receiptId = receiptId.value;
+    try {
+      await (formData.value?.id
+        ? updateMiscReceiptLine({ ...data, id: formData.value.id })
+        : createMiscReceiptLine(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    formApi.setState({ schema: useLineFormSchema(formApi) });
+    // 加载数据
+    const data = modalApi.getData<{
+      id?: number;
+      receiptId: number;
+    }>();
+    receiptId.value = data.receiptId;
+    if (!data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getMiscReceiptLine(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/miscreceipt/modules/line-list.vue b/apps/web-ele/src/views/mes/wm/miscreceipt/modules/line-list.vue
new file mode 100644
index 000000000..e80698072
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/miscreceipt/modules/line-list.vue
@@ -0,0 +1,137 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmMiscReceiptLineApi } from '#/api/mes/wm/miscreceipt/line';
+
+import { computed } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteMiscReceiptLine,
+  getMiscReceiptLineListByReceiptId,
+} from '#/api/mes/wm/miscreceipt/line';
+import { $t } from '#/locales';
+
+import { type FormType, useLineGridColumns } from '../data';
+import LineForm from './line-form.vue';
+
+const props = defineProps<{
+  formType: FormType;
+  receiptId: number;
+}>();
+
+const isEditable = computed(() => // 是否可编辑明细行
+  ['create', 'update'].includes(props.formType),
+);
+
+const [LineFormModal, lineFormModalApi] = useVbenModal({
+  connectedComponent: LineForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 添加物料 */
+function handleCreate() {
+  lineFormModalApi.setData({ receiptId: props.receiptId }).open();
+}
+
+/** 编辑物料 */
+function handleEdit(row: MesWmMiscReceiptLineApi.MiscReceiptLine) {
+  lineFormModalApi.setData({ id: row.id, receiptId: props.receiptId }).open();
+}
+
+/** 删除物料 */
+async function handleDelete(row: MesWmMiscReceiptLineApi.MiscReceiptLine) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.itemName]),
+  });
+  try {
+    await deleteMiscReceiptLine(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.itemName]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useLineGridColumns(isEditable.value),
+    height: 360,
+    keepSource: true,
+    pagerConfig: {
+      enabled: false,
+    },
+    proxyConfig: {
+      ajax: {
+        query: async () => {
+          if (!props.receiptId) {
+            return { list: [], total: 0 };
+          }
+          const list = await getMiscReceiptLineListByReceiptId(props.receiptId);
+          return { list, total: list.length };
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesWmMiscReceiptLineApi.MiscReceiptLine>,
+});
+</script>
+
+<template>
+  <div>
+    <LineFormModal @success="handleRefresh" />
+    <Grid table-title="物料信息">
+      <template v-if="isEditable" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '添加物料',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              ifShow: isEditable,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              ifShow: isEditable,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.itemName]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>

From f1523e417b56beca6617a829439a5e014b8f2c51 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 29 May 2026 23:39:32 +0800
Subject: [PATCH 28/52] =?UTF-8?q?feat(mes):=20=E8=BF=81=E7=A7=BB=EF=BC=88w?=
 =?UTF-8?q?m-packages=EF=BC=89=E7=9B=B8=E5=85=B3=E8=BF=81=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/mes/wm/packages/components/index.ts |   2 +
 .../components/wm-package-select-dialog.vue   | 228 +++++++
 .../packages/components/wm-package-select.vue | 145 ++++
 .../src/views/mes/wm/packages/data.ts         | 639 +++++++++++++++++
 .../src/views/mes/wm/packages/index.vue       | 172 +++++
 .../views/mes/wm/packages/modules/form.vue    | 194 ++++++
 .../mes/wm/packages/modules/line-form.vue     |  92 +++
 .../wm/packages/modules/package-line-list.vue | 132 ++++
 .../wm/packages/modules/sub-package-list.vue  | 126 ++++
 .../views/mes/wm/packages/components/index.ts |   2 +
 .../components/wm-package-select-dialog.vue   | 232 +++++++
 .../packages/components/wm-package-select.vue | 143 ++++
 .../web-ele/src/views/mes/wm/packages/data.ts | 646 ++++++++++++++++++
 .../src/views/mes/wm/packages/index.vue       | 172 +++++
 .../views/mes/wm/packages/modules/form.vue    | 189 +++++
 .../mes/wm/packages/modules/line-form.vue     |  93 +++
 .../wm/packages/modules/package-line-list.vue | 132 ++++
 .../wm/packages/modules/sub-package-list.vue  | 126 ++++
 18 files changed, 3465 insertions(+)
 create mode 100644 apps/web-antd/src/views/mes/wm/packages/components/index.ts
 create mode 100644 apps/web-antd/src/views/mes/wm/packages/components/wm-package-select-dialog.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/packages/components/wm-package-select.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/packages/data.ts
 create mode 100644 apps/web-antd/src/views/mes/wm/packages/index.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/packages/modules/form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/packages/modules/line-form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/packages/modules/package-line-list.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/packages/modules/sub-package-list.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/packages/components/index.ts
 create mode 100644 apps/web-ele/src/views/mes/wm/packages/components/wm-package-select-dialog.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/packages/components/wm-package-select.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/packages/data.ts
 create mode 100644 apps/web-ele/src/views/mes/wm/packages/index.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/packages/modules/form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/packages/modules/line-form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/packages/modules/package-line-list.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/packages/modules/sub-package-list.vue

diff --git a/apps/web-antd/src/views/mes/wm/packages/components/index.ts b/apps/web-antd/src/views/mes/wm/packages/components/index.ts
new file mode 100644
index 000000000..18bbc399e
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/packages/components/index.ts
@@ -0,0 +1,2 @@
+export { default as WmPackageSelectDialog } from './wm-package-select-dialog.vue';
+export { default as WmPackageSelect } from './wm-package-select.vue';
diff --git a/apps/web-antd/src/views/mes/wm/packages/components/wm-package-select-dialog.vue b/apps/web-antd/src/views/mes/wm/packages/components/wm-package-select-dialog.vue
new file mode 100644
index 000000000..23a821409
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/packages/components/wm-package-select-dialog.vue
@@ -0,0 +1,228 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmPackageApi } from '#/api/mes/wm/packages';
+
+import { nextTick, ref } from 'vue';
+
+import { Alert, message, Modal } from 'ant-design-vue';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getPackagePage } from '#/api/mes/wm/packages';
+import { MesWmPackageStatusEnum } from '#/views/mes/utils/constants';
+
+import { useSelectGridColumns, useSelectGridFormSchema } from '../data';
+
+const props = withDefaults(
+  defineProps<{
+    childableOnly?: boolean; // 只展示可作为子箱的装箱单（无父箱 + 已完成状态）
+    excludeId?: number; // 排除的编号（避免选择自己作为父箱）
+  }>(),
+  {
+    childableOnly: false,
+    excludeId: undefined,
+  },
+);
+
+const emit = defineEmits<{
+  selected: [rows: MesWmPackageApi.Package[]];
+}>();
+
+const open = ref(false); // 弹窗是否打开
+const multiple = ref(true); // 是否多选
+const syncingSingleSelection = ref(false); // 单选模式同步勾选标记
+const selectedRows = ref<MesWmPackageApi.Package[]>([]); // 已选装箱单
+const preSelectedIds = ref<number[]>([]); // 预选装箱单编号
+
+/** 单选模式同步 VXE 勾选状态 */
+async function syncSingleSelection(row?: MesWmPackageApi.Package) {
+  syncingSingleSelection.value = true;
+  await nextTick();
+  await gridApi.grid.clearCheckboxRow();
+  if (row) {
+    await gridApi.grid.setCheckboxRow(row, true);
+  }
+  await nextTick();
+  syncingSingleSelection.value = false;
+}
+
+/** 处理勾选变化 */
+async function handleCheckboxChange({
+  checked,
+  records,
+  row,
+}: {
+  checked: boolean;
+  records: MesWmPackageApi.Package[];
+  row?: MesWmPackageApi.Package;
+}) {
+  if (syncingSingleSelection.value) {
+    return;
+  }
+  if (!multiple.value) {
+    const selected = checked && row ? [row] : [];
+    selectedRows.value = selected;
+    await syncSingleSelection(selected[0]);
+    return;
+  }
+  selectedRows.value = records;
+}
+
+/** 处理全选变化 */
+function handleCheckboxAll({
+  records,
+}: {
+  records: MesWmPackageApi.Package[];
+}) {
+  if (syncingSingleSelection.value) {
+    return;
+  }
+  selectedRows.value = records;
+}
+
+/** 双击行：单选直接确认；多选切换勾选 */
+async function handleRowDblclick({ row }: { row: MesWmPackageApi.Package }) {
+  if (multiple.value) {
+    const checked = !gridApi.grid.isCheckedByCheckboxRow(row);
+    await gridApi.grid.setCheckboxRow(row, checked);
+    handleCheckboxChange({
+      checked,
+      records:
+        gridApi.grid.getCheckboxRecords() as MesWmPackageApi.Package[],
+      row,
+    });
+    return;
+  }
+  selectedRows.value = [row];
+  await syncSingleSelection(row);
+  handleConfirm();
+}
+
+/** 回显预选 */
+function applyPreSelection() {
+  if (preSelectedIds.value.length === 0) {
+    return;
+  }
+  const rows = gridApi.grid.getData() as MesWmPackageApi.Package[];
+  for (const row of rows) {
+    if (row.id && preSelectedIds.value.includes(row.id)) {
+      gridApi.grid.setCheckboxRow(row, true);
+      if (!multiple.value) {
+        selectedRows.value = [row];
+      }
+    }
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useSelectGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useSelectGridColumns(),
+    height: 480,
+    keepSource: true,
+    checkboxConfig: {
+      highlight: true,
+      range: true,
+      reserve: true,
+    },
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          const data = await getPackagePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+            // childableOnly 模式：固定过滤无父箱 + 已完成状态
+            parentId: props.childableOnly ? 0 : undefined,
+            status: props.childableOnly
+              ? MesWmPackageStatusEnum.FINISHED
+              : undefined,
+          });
+          // 排除指定编号，避免选择自己作为父箱
+          const list = props.excludeId
+            ? (data.list || []).filter((item) => item.id !== props.excludeId)
+            : data.list || [];
+          return { list, total: data.total };
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmPackageApi.Package>,
+  gridEvents: {
+    cellDblclick: handleRowDblclick,
+    checkboxAll: handleCheckboxAll,
+    checkboxChange: handleCheckboxChange,
+  },
+});
+
+/** 重置查询和选择状态 */
+async function resetQueryState() {
+  selectedRows.value = [];
+  await gridApi.grid.clearCheckboxRow();
+  await gridApi.formApi.resetForm();
+}
+
+/** 打开弹窗 */
+async function openModal(
+  selectedIds?: number[],
+  options?: { multiple?: boolean },
+) {
+  open.value = true;
+  multiple.value = options?.multiple ?? true;
+  preSelectedIds.value = selectedIds || [];
+  await nextTick();
+  await resetQueryState();
+  await gridApi.query();
+  await nextTick();
+  applyPreSelection();
+}
+
+/** 关闭弹窗 */
+async function closeModal() {
+  open.value = false;
+  await resetQueryState();
+}
+
+/** 确认选择 */
+function handleConfirm() {
+  if (selectedRows.value.length === 0) {
+    message.warning(multiple.value ? '请至少选择一条数据' : '请选择一条数据');
+    return;
+  }
+  emit(
+    'selected',
+    multiple.value ? selectedRows.value : [selectedRows.value[0]!],
+  );
+  open.value = false;
+}
+
+defineExpose({ open: openModal });
+</script>
+
+<template>
+  <Modal
+    v-model:open="open"
+    :destroy-on-close="true"
+    title="装箱单选择"
+    width="80%"
+    @cancel="closeModal"
+    @ok="handleConfirm"
+  >
+    <Alert
+      v-if="childableOnly"
+      class="mb-3"
+      message="仅展示可作为子箱的装箱单（无父箱 + 已完成）"
+      show-icon
+      type="info"
+    />
+    <Grid table-title="装箱单列表" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/packages/components/wm-package-select.vue b/apps/web-antd/src/views/mes/wm/packages/components/wm-package-select.vue
new file mode 100644
index 000000000..3055aceab
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/packages/components/wm-package-select.vue
@@ -0,0 +1,145 @@
+<script lang="ts" setup>
+import type { MesWmPackageApi } from '#/api/mes/wm/packages';
+
+import { computed, ref, useAttrs, watch } from 'vue';
+
+import { IconifyIcon } from '@vben/icons';
+
+import { Input, Tooltip } from 'ant-design-vue';
+
+import { getPackage } from '#/api/mes/wm/packages';
+
+import WmPackageSelectDialog from './wm-package-select-dialog.vue';
+
+defineOptions({ name: 'WmPackageSelect', inheritAttrs: false });
+
+const props = withDefaults(
+  defineProps<{
+    allowClear?: boolean;
+    childableOnly?: boolean; // 只展示可作为子箱的装箱单（无父箱 + 已完成状态）
+    disabled?: boolean;
+    excludeId?: number; // 排除的编号（避免选择自己作为父箱）
+    modelValue?: number;
+    placeholder?: string;
+  }>(),
+  {
+    allowClear: true,
+    childableOnly: false,
+    disabled: false,
+    excludeId: undefined,
+    modelValue: undefined,
+    placeholder: '请选择装箱单',
+  },
+);
+
+const emit = defineEmits<{
+  change: [item: MesWmPackageApi.Package | undefined];
+  'update:modelValue': [value: number | undefined];
+}>();
+
+const attrs = useAttrs();
+const dialogRef = ref<InstanceType<typeof WmPackageSelectDialog>>();
+const hovering = ref(false);
+const selectedItem = ref<MesWmPackageApi.Package>();
+
+const displayLabel = computed(() => selectedItem.value?.code ?? '');
+
+const showClear = computed(
+  () =>
+    props.allowClear &&
+    !props.disabled &&
+    hovering.value &&
+    props.modelValue != null,
+);
+
+/** 根据编号单条查询装箱单信息（用于编辑回显） */
+async function resolveItemById(id: number | undefined) {
+  if (id == null) {
+    selectedItem.value = undefined;
+    return;
+  }
+  if (selectedItem.value?.id === id) {
+    return;
+  }
+  try {
+    selectedItem.value = await getPackage(id);
+  } catch (error) {
+    console.error('[WmPackageSelect] resolveItemById failed:', error);
+  }
+}
+
+watch(() => props.modelValue, resolveItemById, { immediate: true });
+
+/** 清空已选装箱单 */
+function clearSelected() {
+  selectedItem.value = undefined;
+  emit('update:modelValue', undefined);
+  emit('change', undefined);
+}
+
+/** 打开装箱单选择弹窗 */
+function handleClick(event: MouseEvent) {
+  if (props.disabled) {
+    return;
+  }
+  const target = event.target as HTMLElement;
+  if (showClear.value && target.closest('.ant-input-suffix')) {
+    event.stopPropagation();
+    clearSelected();
+    return;
+  }
+  const selectedIds = props.modelValue == null ? [] : [props.modelValue];
+  dialogRef.value?.open(selectedIds, { multiple: false });
+}
+
+/** 弹窗选中回调 */
+function handleSelected(rows: MesWmPackageApi.Package[]) {
+  const item = rows[0];
+  if (!item) {
+    return;
+  }
+  selectedItem.value = item;
+  emit('update:modelValue', item.id);
+  emit('change', item);
+}
+</script>
+
+<template>
+  <div
+    v-bind="attrs"
+    class="w-full"
+    :class="disabled ? 'cursor-not-allowed' : 'cursor-pointer'"
+    @click="handleClick"
+    @mouseenter="hovering = true"
+    @mouseleave="hovering = false"
+  >
+    <Tooltip :mouse-enter-delay="0.5" :open="selectedItem ? undefined : false">
+      <template #title>
+        <div v-if="selectedItem" class="leading-6">
+          <div>编号：{{ selectedItem.code || '-' }}</div>
+          <div>客户：{{ selectedItem.clientName || '-' }}</div>
+          <div>销售订单：{{ selectedItem.salesOrderCode || '-' }}</div>
+        </div>
+      </template>
+      <Input
+        :disabled="disabled"
+        :placeholder="placeholder"
+        :value="displayLabel"
+        readonly
+      >
+        <template #suffix>
+          <IconifyIcon
+            class="size-4"
+            :icon="showClear ? 'lucide:circle-x' : 'lucide:search'"
+          />
+        </template>
+      </Input>
+    </Tooltip>
+  </div>
+  <WmPackageSelectDialog
+    ref="dialogRef"
+    :childable-only="childableOnly"
+    :exclude-id="excludeId"
+    @selected="handleSelected"
+  />
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/packages/data.ts b/apps/web-antd/src/views/mes/wm/packages/data.ts
new file mode 100644
index 000000000..4470de2fe
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/packages/data.ts
@@ -0,0 +1,639 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmPackageApi } from '#/api/mes/wm/packages';
+import type { MesWmPackageLineApi } from '#/api/mes/wm/packages/line';
+
+import { h, markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+
+import { Button } from 'ant-design-vue';
+
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getSimpleUserList } from '#/api/system/user';
+import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import { MdUnitMeasureSelect } from '#/views/mes/md/unitmeasure/components';
+import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
+import {
+  MesAutoCodeRuleCode,
+  MesProWorkOrderStatusEnum,
+} from '#/views/mes/utils/constants';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
+/** 新增/修改的表单 */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'status',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '装箱单编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入装箱单编号',
+      },
+      rules: 'required',
+      suffix:
+        formType === 'detail'
+          ? undefined
+          : () =>
+              h(
+                Button,
+                {
+                  type: 'default',
+                  onClick: async () => {
+                    const code = await generateAutoCode(
+                      MesAutoCodeRuleCode.WM_PACKAGE_CODE,
+                    );
+                    await formApi?.setFieldValue('code', code);
+                  },
+                },
+                { default: () => '生成' },
+              ),
+    },
+    {
+      fieldName: 'packageDate',
+      label: '装箱日期',
+      component: 'DatePicker',
+      componentProps: {
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择装箱日期',
+        valueFormat: 'x',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'inspectorUserId',
+      label: '检查员',
+      component: 'ApiSelect',
+      componentProps: {
+        allowClear: true,
+        api: getSimpleUserList,
+        labelField: 'nickname',
+        placeholder: '请选择检查员',
+        valueField: 'id',
+      },
+    },
+    {
+      fieldName: 'salesOrderCode',
+      label: '销售订单编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入销售订单编号',
+      },
+    },
+    {
+      fieldName: 'invoiceCode',
+      label: '发票编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入发票编号',
+      },
+    },
+    {
+      fieldName: 'clientId',
+      label: '客户',
+      component: markRaw(MdClientSelect),
+      componentProps: {
+        placeholder: '请选择客户',
+      },
+    },
+    {
+      fieldName: 'sizeUnitId',
+      label: '尺寸单位',
+      component: markRaw(MdUnitMeasureSelect),
+      componentProps: {
+        placeholder: '请选择尺寸单位',
+      },
+    },
+    {
+      fieldName: 'length',
+      label: '箱长度',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入箱长度',
+        precision: 2,
+      },
+    },
+    {
+      fieldName: 'width',
+      label: '箱宽度',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入箱宽度',
+        precision: 2,
+      },
+    },
+    {
+      fieldName: 'height',
+      label: '箱高度',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入箱高度',
+        precision: 2,
+      },
+    },
+    {
+      fieldName: 'weightUnitId',
+      label: '重量单位',
+      component: markRaw(MdUnitMeasureSelect),
+      componentProps: {
+        placeholder: '请选择重量单位',
+      },
+    },
+    {
+      fieldName: 'netWeight',
+      label: '净重',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入净重',
+        precision: 2,
+      },
+    },
+    {
+      fieldName: 'grossWeight',
+      label: '毛重',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入毛重',
+        precision: 2,
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '装箱单编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入装箱单编号',
+      },
+    },
+    {
+      fieldName: 'salesOrderCode',
+      label: '销售订单编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入销售订单编号',
+      },
+    },
+    {
+      fieldName: 'clientId',
+      label: '客户',
+      component: markRaw(MdClientSelect),
+      componentProps: {
+        placeholder: '请选择客户',
+      },
+    },
+    {
+      fieldName: 'inspectorUserId',
+      label: '检查员',
+      component: 'ApiSelect',
+      componentProps: {
+        allowClear: true,
+        api: getSimpleUserList,
+        labelField: 'nickname',
+        placeholder: '请选择检查员',
+        valueField: 'id',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesWmPackageApi.Package>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '装箱单编号',
+      minWidth: 250,
+      fixed: 'left',
+      treeNode: true,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'packageDate',
+      title: '装箱日期',
+      width: 120,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'salesOrderCode',
+      title: '销售订单编号',
+      minWidth: 140,
+    },
+    {
+      field: 'invoiceCode',
+      title: '发票编号',
+      minWidth: 120,
+    },
+    {
+      field: 'clientCode',
+      title: '客户编码',
+      minWidth: 100,
+    },
+    {
+      field: 'clientName',
+      title: '客户名称',
+      minWidth: 120,
+    },
+    {
+      field: 'length',
+      title: '箱长度',
+      width: 80,
+    },
+    {
+      field: 'width',
+      title: '箱宽度',
+      width: 80,
+    },
+    {
+      field: 'height',
+      title: '箱高度',
+      width: 80,
+    },
+    {
+      field: 'sizeUnitName',
+      title: '尺寸单位',
+      width: 90,
+    },
+    {
+      field: 'netWeight',
+      title: '净重',
+      width: 80,
+    },
+    {
+      field: 'grossWeight',
+      title: '毛重',
+      width: 80,
+    },
+    {
+      field: 'weightUnitName',
+      title: '重量单位',
+      width: 90,
+    },
+    {
+      field: 'inspectorName',
+      title: '检查员',
+      minWidth: 100,
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      minWidth: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_PACKAGE_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 160,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 子箱列表的字段 */
+export function useSubPackageGridColumns(): VxeTableGridOptions<MesWmPackageApi.Package>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '装箱单编号',
+      minWidth: 160,
+      fixed: 'left',
+    },
+    {
+      field: 'packageDate',
+      title: '装箱日期',
+      width: 120,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'salesOrderCode',
+      title: '销售订单编号',
+      minWidth: 140,
+    },
+    {
+      field: 'invoiceCode',
+      title: '发票编号',
+      minWidth: 120,
+    },
+    {
+      field: 'clientCode',
+      title: '客户编码',
+      minWidth: 100,
+    },
+    {
+      field: 'clientName',
+      title: '客户名称',
+      minWidth: 120,
+    },
+    {
+      field: 'netWeight',
+      title: '净重',
+      width: 80,
+    },
+    {
+      field: 'grossWeight',
+      title: '毛重',
+      width: 80,
+    },
+    {
+      field: 'weightUnitName',
+      title: '重量单位',
+      width: 90,
+    },
+    {
+      field: 'inspectorName',
+      title: '检查员',
+      minWidth: 100,
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      minWidth: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_PACKAGE_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 100,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 装箱明细的表单 */
+export function useLineFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'workOrderId',
+      label: '生产工单',
+      component: markRaw(ProWorkOrderSelect),
+      componentProps: {
+        placeholder: '请选择生产工单',
+        status: MesProWorkOrderStatusEnum.CONFIRMED,
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'itemId',
+      label: '产品物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择产品物料',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'quantity',
+      label: '装箱数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0.01,
+        placeholder: '请输入装箱数量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'expireDate',
+      label: '有效期',
+      component: 'DatePicker',
+      componentProps: {
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择有效期',
+        valueFormat: 'x',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-2',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 装箱明细列表的字段 */
+export function useLineGridColumns(): VxeTableGridOptions<MesWmPackageLineApi.PackageLine>['columns'] {
+  return [
+    {
+      field: 'itemCode',
+      title: '产品物料编码',
+      minWidth: 120,
+    },
+    {
+      field: 'itemName',
+      title: '产品物料名称',
+      minWidth: 140,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'quantity',
+      title: '装箱数量',
+      width: 100,
+    },
+    {
+      field: 'workOrderCode',
+      title: '生产工单编号',
+      minWidth: 140,
+    },
+    {
+      field: 'batchCode',
+      title: '批次号',
+      minWidth: 120,
+    },
+    {
+      field: 'expireDate',
+      title: '有效期',
+      width: 120,
+      formatter: 'formatDate',
+    },
+    {
+      title: '操作',
+      width: 120,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 选择弹窗的搜索表单 */
+export function useSelectGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '装箱单编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入装箱单编号',
+      },
+    },
+    {
+      fieldName: 'salesOrderCode',
+      label: '销售订单编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入销售订单编号',
+      },
+    },
+    {
+      fieldName: 'clientId',
+      label: '客户',
+      component: markRaw(MdClientSelect),
+      componentProps: {
+        placeholder: '请选择客户',
+      },
+    },
+    {
+      fieldName: 'inspectorUserId',
+      label: '检查员',
+      component: 'ApiSelect',
+      componentProps: {
+        allowClear: true,
+        api: getSimpleUserList,
+        labelField: 'nickname',
+        placeholder: '请选择检查员',
+        valueField: 'id',
+      },
+    },
+  ];
+}
+
+/** 选择弹窗的字段 */
+export function useSelectGridColumns(): VxeTableGridOptions<MesWmPackageApi.Package>['columns'] {
+  return [
+    {
+      type: 'checkbox',
+      width: 50,
+    },
+    {
+      field: 'code',
+      title: '装箱单编号',
+      minWidth: 160,
+    },
+    {
+      field: 'packageDate',
+      title: '装箱日期',
+      width: 120,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'salesOrderCode',
+      title: '销售订单编号',
+      minWidth: 140,
+    },
+    {
+      field: 'invoiceCode',
+      title: '发票编号',
+      minWidth: 120,
+    },
+    {
+      field: 'clientCode',
+      title: '客户编码',
+      minWidth: 100,
+    },
+    {
+      field: 'clientName',
+      title: '客户名称',
+      minWidth: 120,
+    },
+    {
+      field: 'netWeight',
+      title: '净重',
+      width: 80,
+    },
+    {
+      field: 'grossWeight',
+      title: '毛重',
+      width: 80,
+    },
+    {
+      field: 'weightUnitName',
+      title: '重量单位',
+      width: 90,
+    },
+    {
+      field: 'inspectorName',
+      title: '检查员',
+      minWidth: 100,
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      minWidth: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_PACKAGE_STATUS },
+      },
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/wm/packages/index.vue b/apps/web-antd/src/views/mes/wm/packages/index.vue
new file mode 100644
index 000000000..1216ff763
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/packages/index.vue
@@ -0,0 +1,172 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmPackageApi } from '#/api/mes/wm/packages';
+
+import { ref } from 'vue';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+
+import { Button, message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { deletePackage, getPackagePage } from '#/api/mes/wm/packages';
+import { $t } from '#/locales';
+import { MesWmPackageStatusEnum } from '#/views/mes/utils/constants';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+const isExpanded = ref(true); // 树形表格是否展开
+
+/** 切换树形展开/收缩状态 */
+function handleExpand() {
+  isExpanded.value = !isExpanded.value;
+  gridApi.grid.setAllTreeExpand(isExpanded.value);
+}
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建装箱单 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看装箱单 */
+function handleDetail(row: MesWmPackageApi.Package) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑装箱单 */
+function handleEdit(row: MesWmPackageApi.Package) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 删除装箱单 */
+async function handleDelete(row: MesWmPackageApi.Package) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.code]),
+    duration: 0,
+  });
+  try {
+    await deletePackage(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    pagerConfig: {
+      enabled: false,
+    },
+    proxyConfig: {
+      ajax: {
+        query: async (_, formValues) => {
+          const data = await getPackagePage({
+            pageNo: 1,
+            pageSize: 100,
+            ...formValues,
+          });
+          return { list: data.list || [] };
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+    treeConfig: {
+      parentField: 'parentId',
+      rowField: 'id',
+      transform: true,
+      expandAll: true,
+      reserve: true,
+    },
+  } as VxeTableGridOptions<MesWmPackageApi.Package>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】调拨单、装箱管理"
+        url="https://doc.iocoder.cn/mes/wm/transfer/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="装箱单列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['装箱单']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-package:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: isExpanded ? '收缩' : '展开',
+              type: 'primary',
+              onClick: handleExpand,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <Button type="link" @click="handleDetail(row)">
+          {{ row.code }}
+        </Button>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:wm-package:update'],
+              ifShow: row.status === MesWmPackageStatusEnum.PREPARE,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm-package:delete'],
+              ifShow: row.status === MesWmPackageStatusEnum.PREPARE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/packages/modules/form.vue b/apps/web-antd/src/views/mes/wm/packages/modules/form.vue
new file mode 100644
index 000000000..b3a4d1b90
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/packages/modules/form.vue
@@ -0,0 +1,194 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesWmPackageApi } from '#/api/mes/wm/packages';
+
+import { computed, ref } from 'vue';
+
+import { confirm, useVbenModal } from '@vben/common-ui';
+
+import { Button, message, Tabs } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createPackage,
+  finishPackage,
+  getPackage,
+  updatePackage,
+} from '#/api/mes/wm/packages';
+import { $t } from '#/locales';
+import { MesWmPackageStatusEnum } from '#/views/mes/utils/constants';
+
+import { useFormSchema } from '../data';
+import PackageLineList from './package-line-list.vue';
+import SubPackageList from './sub-package-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesWmPackageApi.Package>();
+const subTabsName = ref('subPackage'); // 子表当前 tab
+const originalSnapshot = ref(''); // 表单原始数据快照，用于 finish 时跳过未变更的保存请求
+
+const isEditable = computed(() =>
+  ['create', 'update'].includes(formType.value),
+);
+// TODO @AI：这种 ( 可以不折行么？
+const canFinish = computed(
+  () =>
+    formType.value === 'update' &&
+    formData.value?.status === MesWmPackageStatusEnum.PREPARE,
+);
+const getTitle = computed(() => {
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['装箱单']);
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['装箱单'])
+    : $t('ui.actionTitle.create', ['装箱单']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+/** 提交表单（create/update），新增成功后切换为编辑态以继续维护子表 */
+async function handleSubmit(): Promise<boolean> {
+  const { valid } = await formApi.validate();
+  if (!valid) {
+    return false;
+  }
+  const data = (await formApi.getValues()) as MesWmPackageApi.Package;
+  if (formData.value?.id) {
+    await updatePackage({ ...data, id: formData.value.id });
+    formData.value = { ...formData.value, ...data };
+  } else {
+    const id = await createPackage(data);
+    formData.value = {
+      ...data,
+      id,
+      status: MesWmPackageStatusEnum.PREPARE,
+    };
+    await formApi.setFieldValue('id', id);
+    await formApi.setFieldValue('status', MesWmPackageStatusEnum.PREPARE);
+    formType.value = 'update';
+  }
+  // 刷新快照，下次 finish 用于判断是否需要再保存
+  originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  return true;
+}
+
+/** 完成装箱单：编辑态有修改时先保存，再调用完成接口 */
+async function handleFinish() {
+  const id = formData.value?.id;
+  if (!id) {
+    return;
+  }
+  try {
+    await confirm('确认完成该装箱单？完成后将不可编辑。');
+  } catch {
+    return;
+  }
+  const { valid } = await formApi.validate();
+  if (!valid) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    const current = JSON.stringify(await formApi.getValues());
+    if (current !== originalSnapshot.value) {
+      const data = (await formApi.getValues()) as MesWmPackageApi.Package;
+      await updatePackage({ ...data, id });
+      originalSnapshot.value = current;
+    }
+    await finishPackage(id);
+    message.success('完成成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (formType.value === 'detail') {
+      await modalApi.close();
+      return;
+    }
+    modalApi.lock();
+    try {
+      // 提交表单
+      const ok = await handleSubmit();
+      if (!ok) {
+        return;
+      }
+      // 关闭并提示
+      message.success($t('ui.actionMessage.operationSuccess'));
+      emit('success');
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      originalSnapshot.value = '';
+      return;
+    }
+    subTabsName.value = 'subPackage';
+    // 加载数据
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getPackage(data.id);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    }
+    // 记录初始快照，后续 finish 用于判断是否需要再保存
+    originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-4/5">
+    <Form class="mx-4" />
+    <Tabs
+      v-if="formData?.id"
+      v-model:active-key="subTabsName"
+      class="mx-4 mt-4"
+    >
+      <Tabs.TabPane key="subPackage" tab="子箱">
+        <SubPackageList :editable="isEditable" :package-id="formData.id" />
+      </Tabs.TabPane>
+      <Tabs.TabPane key="packageLine" tab="装箱清单">
+        <PackageLineList :editable="isEditable" :package-id="formData.id" />
+      </Tabs.TabPane>
+    </Tabs>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <Button v-if="canFinish" type="primary" @click="handleFinish">
+          完成
+        </Button>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/packages/modules/line-form.vue b/apps/web-antd/src/views/mes/wm/packages/modules/line-form.vue
new file mode 100644
index 000000000..3b00e7f08
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/packages/modules/line-form.vue
@@ -0,0 +1,92 @@
+<script lang="ts" setup>
+import type { MesWmPackageLineApi } from '#/api/mes/wm/packages/line';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createPackageLine,
+  getPackageLine,
+  updatePackageLine,
+} from '#/api/mes/wm/packages/line';
+import { $t } from '#/locales';
+
+import { useLineFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesWmPackageLineApi.PackageLine>();
+const packageId = ref<number>(); // TODO @AI：尾注释；
+const getTitle = computed(() =>
+  formData.value?.id
+    ? $t('ui.actionTitle.edit', ['装箱明细'])
+    : $t('ui.actionTitle.create', ['装箱明细']),
+);
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 100,
+  },
+  layout: 'horizontal',
+  schema: useLineFormSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-2',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data = (await formApi.getValues()) as MesWmPackageLineApi.PackageLine;
+    data.packageId = packageId.value;
+    try {
+      await (formData.value?.id
+        ? updatePackageLine({ ...data, id: formData.value.id })
+        : createPackageLine(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ id?: number; packageId: number }>();
+    packageId.value = data.packageId;
+    if (!data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getPackageLine(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-2/5">
+    <Form />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/packages/modules/package-line-list.vue b/apps/web-antd/src/views/mes/wm/packages/modules/package-line-list.vue
new file mode 100644
index 000000000..14be50523
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/packages/modules/package-line-list.vue
@@ -0,0 +1,132 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmPackageLineApi } from '#/api/mes/wm/packages/line';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deletePackageLine,
+  getPackageLinePage,
+} from '#/api/mes/wm/packages/line';
+import { $t } from '#/locales';
+
+import { useLineGridColumns } from '../data';
+import LineForm from './line-form.vue';
+
+const props = defineProps<{
+  editable: boolean; // 是否可编辑（草稿态）
+  packageId: number; // 所属装箱单编号
+}>();
+
+const [LineFormModal, lineFormModalApi] = useVbenModal({
+  connectedComponent: LineForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 添加装箱明细 */
+function handleCreate() {
+  lineFormModalApi.setData({ packageId: props.packageId }).open();
+}
+
+/** 编辑装箱明细 */
+function handleEdit(row: MesWmPackageLineApi.PackageLine) {
+  lineFormModalApi.setData({ id: row.id, packageId: props.packageId }).open();
+}
+
+/** 删除装箱明细 */
+async function handleDelete(row: MesWmPackageLineApi.PackageLine) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.itemName]),
+    duration: 0,
+  });
+  try {
+    await deletePackageLine(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.itemName]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useLineGridColumns(),
+    height: 360,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.packageId) {
+            return { list: [], total: 0 };
+          }
+          return await getPackageLinePage({
+            packageId: props.packageId,
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesWmPackageLineApi.PackageLine>,
+});
+</script>
+
+<template>
+  <div>
+    <LineFormModal @success="handleRefresh" />
+    <Grid table-title="装箱清单">
+      <template #toolbar-tools>
+        <TableAction
+          v-if="editable"
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['装箱明细']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              ifShow: editable,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              ifShow: editable,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.itemName]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/packages/modules/sub-package-list.vue b/apps/web-antd/src/views/mes/wm/packages/modules/sub-package-list.vue
new file mode 100644
index 000000000..b5183ce4c
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/packages/modules/sub-package-list.vue
@@ -0,0 +1,126 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmPackageApi } from '#/api/mes/wm/packages';
+
+import { ref } from 'vue';
+
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  addChildPackage,
+  getPackagePage,
+  removeChildPackage,
+} from '#/api/mes/wm/packages';
+import { $t } from '#/locales';
+
+import WmPackageSelectDialog from '../components/wm-package-select-dialog.vue';
+import { useSubPackageGridColumns } from '../data';
+
+const props = defineProps<{
+  editable: boolean; // 是否可编辑（草稿态）
+  packageId: number; // 父箱编号
+}>();
+
+const dialogRef = ref<InstanceType<typeof WmPackageSelectDialog>>();
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 打开装箱单选择弹窗添加子箱 */
+function handleAddChild() {
+  dialogRef.value?.open([], { multiple: false });
+}
+
+/** 选中回调：将选中的装箱单添加为子箱 */
+async function handleSelected(rows: MesWmPackageApi.Package[]) {
+  const child = rows[0];
+  if (!child?.id) {
+    return;
+  }
+  await addChildPackage(props.packageId, child.id);
+  message.success($t('ui.actionMessage.operationSuccess'));
+  handleRefresh();
+}
+
+/** 移除子箱：将子箱的父箱编号清空 */
+async function handleRemoveChild(row: MesWmPackageApi.Package) {
+  await removeChildPackage(row.id!);
+  message.success('移除成功');
+  handleRefresh();
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useSubPackageGridColumns(),
+    height: 360,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.packageId) {
+            return { list: [], total: 0 };
+          }
+          return await getPackagePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            parentId: props.packageId,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesWmPackageApi.Package>,
+});
+</script>
+
+<template>
+  <div>
+    <WmPackageSelectDialog
+      ref="dialogRef"
+      childable-only
+      :exclude-id="packageId"
+      @selected="handleSelected"
+    />
+    <Grid table-title="子箱列表">
+      <template #toolbar-tools>
+        <TableAction
+          v-if="editable"
+          :actions="[
+            {
+              label: '添加子箱',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              onClick: handleAddChild,
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: '移除',
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              ifShow: editable,
+              popConfirm: {
+                title: '确认将该装箱单从子箱列表中移除？',
+                confirm: handleRemoveChild.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/packages/components/index.ts b/apps/web-ele/src/views/mes/wm/packages/components/index.ts
new file mode 100644
index 000000000..18bbc399e
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/packages/components/index.ts
@@ -0,0 +1,2 @@
+export { default as WmPackageSelectDialog } from './wm-package-select-dialog.vue';
+export { default as WmPackageSelect } from './wm-package-select.vue';
diff --git a/apps/web-ele/src/views/mes/wm/packages/components/wm-package-select-dialog.vue b/apps/web-ele/src/views/mes/wm/packages/components/wm-package-select-dialog.vue
new file mode 100644
index 000000000..3aab57f0b
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/packages/components/wm-package-select-dialog.vue
@@ -0,0 +1,232 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmPackageApi } from '#/api/mes/wm/packages';
+
+import { nextTick, ref } from 'vue';
+
+import { ElAlert, ElButton, ElDialog, ElMessage } from 'element-plus';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getPackagePage } from '#/api/mes/wm/packages';
+import { MesWmPackageStatusEnum } from '#/views/mes/utils/constants';
+
+import { useSelectGridColumns, useSelectGridFormSchema } from '../data';
+
+const props = withDefaults(
+  defineProps<{
+    childableOnly?: boolean; // 只展示可作为子箱的装箱单（无父箱 + 已完成状态）
+    excludeId?: number; // 排除的编号（避免选择自己作为父箱）
+  }>(),
+  {
+    childableOnly: false,
+    excludeId: undefined,
+  },
+);
+
+const emit = defineEmits<{
+  selected: [rows: MesWmPackageApi.Package[]];
+}>();
+
+const open = ref(false); // 弹窗是否打开
+const multiple = ref(true); // 是否多选
+const syncingSingleSelection = ref(false); // 单选模式同步勾选标记
+const selectedRows = ref<MesWmPackageApi.Package[]>([]); // 已选装箱单
+const preSelectedIds = ref<number[]>([]); // 预选装箱单编号
+
+/** 单选模式同步 VXE 勾选状态 */
+async function syncSingleSelection(row?: MesWmPackageApi.Package) {
+  syncingSingleSelection.value = true;
+  await nextTick();
+  await gridApi.grid.clearCheckboxRow();
+  if (row) {
+    await gridApi.grid.setCheckboxRow(row, true);
+  }
+  await nextTick();
+  syncingSingleSelection.value = false;
+}
+
+/** 处理勾选变化 */
+async function handleCheckboxChange({
+  checked,
+  records,
+  row,
+}: {
+  checked: boolean;
+  records: MesWmPackageApi.Package[];
+  row?: MesWmPackageApi.Package;
+}) {
+  if (syncingSingleSelection.value) {
+    return;
+  }
+  if (!multiple.value) {
+    const selected = checked && row ? [row] : [];
+    selectedRows.value = selected;
+    await syncSingleSelection(selected[0]);
+    return;
+  }
+  selectedRows.value = records;
+}
+
+/** 处理全选变化 */
+function handleCheckboxAll({
+  records,
+}: {
+  records: MesWmPackageApi.Package[];
+}) {
+  if (syncingSingleSelection.value) {
+    return;
+  }
+  selectedRows.value = records;
+}
+
+/** 双击行：单选直接确认；多选切换勾选 */
+async function handleRowDblclick({ row }: { row: MesWmPackageApi.Package }) {
+  if (multiple.value) {
+    const checked = !gridApi.grid.isCheckedByCheckboxRow(row);
+    await gridApi.grid.setCheckboxRow(row, checked);
+    handleCheckboxChange({
+      checked,
+      records:
+        gridApi.grid.getCheckboxRecords() as MesWmPackageApi.Package[],
+      row,
+    });
+    return;
+  }
+  selectedRows.value = [row];
+  await syncSingleSelection(row);
+  handleConfirm();
+}
+
+/** 回显预选 */
+function applyPreSelection() {
+  if (preSelectedIds.value.length === 0) {
+    return;
+  }
+  const rows = gridApi.grid.getData() as MesWmPackageApi.Package[];
+  for (const row of rows) {
+    if (row.id && preSelectedIds.value.includes(row.id)) {
+      gridApi.grid.setCheckboxRow(row, true);
+      if (!multiple.value) {
+        selectedRows.value = [row];
+      }
+    }
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useSelectGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useSelectGridColumns(),
+    height: 480,
+    keepSource: true,
+    checkboxConfig: {
+      highlight: true,
+      range: true,
+      reserve: true,
+    },
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          const data = await getPackagePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+            // childableOnly 模式：固定过滤无父箱 + 已完成状态
+            parentId: props.childableOnly ? 0 : undefined,
+            status: props.childableOnly
+              ? MesWmPackageStatusEnum.FINISHED
+              : undefined,
+          });
+          // 排除指定编号，避免选择自己作为父箱
+          const list = props.excludeId
+            ? (data.list || []).filter((item) => item.id !== props.excludeId)
+            : data.list || [];
+          return { list, total: data.total };
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmPackageApi.Package>,
+  gridEvents: {
+    cellDblclick: handleRowDblclick,
+    checkboxAll: handleCheckboxAll,
+    checkboxChange: handleCheckboxChange,
+  },
+});
+
+/** 重置查询和选择状态 */
+async function resetQueryState() {
+  selectedRows.value = [];
+  await gridApi.grid.clearCheckboxRow();
+  await gridApi.formApi.resetForm();
+}
+
+/** 打开弹窗 */
+async function openModal(
+  selectedIds?: number[],
+  options?: { multiple?: boolean },
+) {
+  open.value = true;
+  multiple.value = options?.multiple ?? true;
+  preSelectedIds.value = selectedIds || [];
+  await nextTick();
+  await resetQueryState();
+  await gridApi.query();
+  await nextTick();
+  applyPreSelection();
+}
+
+/** 关闭弹窗 */
+async function closeModal() {
+  open.value = false;
+  await resetQueryState();
+}
+
+/** 确认选择 */
+function handleConfirm() {
+  if (selectedRows.value.length === 0) {
+    ElMessage.warning(multiple.value ? '请至少选择一条数据' : '请选择一条数据');
+    return;
+  }
+  emit(
+    'selected',
+    multiple.value ? selectedRows.value : [selectedRows.value[0]!],
+  );
+  open.value = false;
+}
+
+defineExpose({ open: openModal });
+</script>
+
+<template>
+  <ElDialog
+    v-model="open"
+    destroy-on-close
+    title="装箱单选择"
+    width="80%"
+    @close="closeModal"
+  >
+    <ElAlert
+      v-if="childableOnly"
+      class="mb-3"
+      :closable="false"
+      show-icon
+      title="仅展示可作为子箱的装箱单（无父箱 + 已完成）"
+      type="info"
+    />
+    <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/wm/packages/components/wm-package-select.vue b/apps/web-ele/src/views/mes/wm/packages/components/wm-package-select.vue
new file mode 100644
index 000000000..f732877ce
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/packages/components/wm-package-select.vue
@@ -0,0 +1,143 @@
+<script lang="ts" setup>
+import type { MesWmPackageApi } from '#/api/mes/wm/packages';
+
+import { computed, ref, useAttrs, watch } from 'vue';
+
+import { CircleX, Search } from '@vben/icons';
+
+import { ElInput, ElTooltip } from 'element-plus';
+
+import { getPackage } from '#/api/mes/wm/packages';
+
+import WmPackageSelectDialog from './wm-package-select-dialog.vue';
+
+defineOptions({ name: 'WmPackageSelect', inheritAttrs: false });
+
+const props = withDefaults(
+  defineProps<{
+    childableOnly?: boolean; // 只展示可作为子箱的装箱单（无父箱 + 已完成状态）
+    clearable?: boolean;
+    disabled?: boolean;
+    excludeId?: number; // 排除的编号（避免选择自己作为父箱）
+    modelValue?: number;
+    placeholder?: string;
+  }>(),
+  {
+    childableOnly: false,
+    clearable: true,
+    disabled: false,
+    excludeId: undefined,
+    modelValue: undefined,
+    placeholder: '请选择装箱单',
+  },
+);
+
+const emit = defineEmits<{
+  change: [item: MesWmPackageApi.Package | undefined];
+  'update:modelValue': [value: number | undefined];
+}>();
+
+const attrs = useAttrs();
+const dialogRef = ref<InstanceType<typeof WmPackageSelectDialog>>();
+const hovering = ref(false);
+const selectedItem = ref<MesWmPackageApi.Package>();
+
+const displayLabel = computed(() => selectedItem.value?.code ?? '');
+
+const showClear = computed(
+  () =>
+    props.clearable &&
+    !props.disabled &&
+    hovering.value &&
+    props.modelValue != null,
+);
+
+/** 根据编号单条查询装箱单信息（用于编辑回显） */
+async function resolveItemById(id: number | undefined) {
+  if (id == null) {
+    selectedItem.value = undefined;
+    return;
+  }
+  if (selectedItem.value?.id === id) {
+    return;
+  }
+  try {
+    selectedItem.value = await getPackage(id);
+  } catch (error) {
+    console.error('[WmPackageSelect] resolveItemById failed:', error);
+  }
+}
+
+watch(() => props.modelValue, resolveItemById, { immediate: true });
+
+/** 清空已选装箱单 */
+function clearSelected() {
+  selectedItem.value = undefined;
+  emit('update:modelValue', undefined);
+  emit('change', undefined);
+}
+
+/** 打开装箱单选择弹窗 */
+function handleClick(event: MouseEvent) {
+  if (props.disabled) {
+    return;
+  }
+  const target = event.target as HTMLElement;
+  if (showClear.value && target.closest('.el-input__suffix')) {
+    event.stopPropagation();
+    clearSelected();
+    return;
+  }
+  const selectedIds = props.modelValue == null ? [] : [props.modelValue];
+  dialogRef.value?.open(selectedIds, { multiple: false });
+}
+
+/** 弹窗选中回调 */
+function handleSelected(rows: MesWmPackageApi.Package[]) {
+  const item = rows[0];
+  if (!item) {
+    return;
+  }
+  selectedItem.value = item;
+  emit('update:modelValue', item.id);
+  emit('change', item);
+}
+</script>
+
+<template>
+  <div
+    v-bind="attrs"
+    class="w-full"
+    :class="disabled ? 'cursor-not-allowed' : 'cursor-pointer'"
+    @click="handleClick"
+    @mouseenter="hovering = true"
+    @mouseleave="hovering = false"
+  >
+    <ElTooltip :disabled="!selectedItem" placement="top" :show-after="500">
+      <template #content>
+        <div v-if="selectedItem" class="leading-6">
+          <div>编号：{{ selectedItem.code || '-' }}</div>
+          <div>客户：{{ selectedItem.clientName || '-' }}</div>
+          <div>销售订单：{{ selectedItem.salesOrderCode || '-' }}</div>
+        </div>
+      </template>
+      <ElInput
+        :disabled="disabled"
+        :model-value="displayLabel"
+        :placeholder="placeholder"
+        readonly
+      >
+        <template #suffix>
+          <CircleX v-if="showClear" class="size-4" />
+          <Search v-else class="size-4" />
+        </template>
+      </ElInput>
+    </ElTooltip>
+  </div>
+  <WmPackageSelectDialog
+    ref="dialogRef"
+    :childable-only="childableOnly"
+    :exclude-id="excludeId"
+    @selected="handleSelected"
+  />
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/packages/data.ts b/apps/web-ele/src/views/mes/wm/packages/data.ts
new file mode 100644
index 000000000..30372310d
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/packages/data.ts
@@ -0,0 +1,646 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmPackageApi } from '#/api/mes/wm/packages';
+import type { MesWmPackageLineApi } from '#/api/mes/wm/packages/line';
+
+import { h, markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+
+import { ElButton } from 'element-plus';
+
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getSimpleUserList } from '#/api/system/user';
+import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import { MdUnitMeasureSelect } from '#/views/mes/md/unitmeasure/components';
+import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
+import {
+  MesAutoCodeRuleCode,
+  MesProWorkOrderStatusEnum,
+} from '#/views/mes/utils/constants';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
+/** 新增/修改的表单 */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'status',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '装箱单编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入装箱单编号',
+      },
+      rules: 'required',
+      suffix:
+        formType === 'detail'
+          ? undefined
+          : () =>
+              h(
+                ElButton,
+                {
+                  onClick: async () => {
+                    const code = await generateAutoCode(
+                      MesAutoCodeRuleCode.WM_PACKAGE_CODE,
+                    );
+                    await formApi?.setFieldValue('code', code);
+                  },
+                },
+                { default: () => '生成' },
+              ),
+    },
+    {
+      fieldName: 'packageDate',
+      label: '装箱日期',
+      component: 'DatePicker',
+      componentProps: {
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择装箱日期',
+        type: 'date',
+        valueFormat: 'x',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'inspectorUserId',
+      label: '检查员',
+      component: 'ApiSelect',
+      componentProps: {
+        api: getSimpleUserList,
+        clearable: true,
+        labelField: 'nickname',
+        placeholder: '请选择检查员',
+        valueField: 'id',
+      },
+    },
+    {
+      fieldName: 'salesOrderCode',
+      label: '销售订单编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入销售订单编号',
+      },
+    },
+    {
+      fieldName: 'invoiceCode',
+      label: '发票编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入发票编号',
+      },
+    },
+    {
+      fieldName: 'clientId',
+      label: '客户',
+      component: markRaw(MdClientSelect),
+      componentProps: {
+        placeholder: '请选择客户',
+      },
+    },
+    {
+      fieldName: 'sizeUnitId',
+      label: '尺寸单位',
+      component: markRaw(MdUnitMeasureSelect),
+      componentProps: {
+        placeholder: '请选择尺寸单位',
+      },
+    },
+    {
+      fieldName: 'length',
+      label: '箱长度',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入箱长度',
+        precision: 2,
+      },
+    },
+    {
+      fieldName: 'width',
+      label: '箱宽度',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入箱宽度',
+        precision: 2,
+      },
+    },
+    {
+      fieldName: 'height',
+      label: '箱高度',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入箱高度',
+        precision: 2,
+      },
+    },
+    {
+      fieldName: 'weightUnitId',
+      label: '重量单位',
+      component: markRaw(MdUnitMeasureSelect),
+      componentProps: {
+        placeholder: '请选择重量单位',
+      },
+    },
+    {
+      fieldName: 'netWeight',
+      label: '净重',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入净重',
+        precision: 2,
+      },
+    },
+    {
+      fieldName: 'grossWeight',
+      label: '毛重',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入毛重',
+        precision: 2,
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '装箱单编号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入装箱单编号',
+      },
+    },
+    {
+      fieldName: 'salesOrderCode',
+      label: '销售订单编号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入销售订单编号',
+      },
+    },
+    {
+      fieldName: 'clientId',
+      label: '客户',
+      component: markRaw(MdClientSelect),
+      componentProps: {
+        placeholder: '请选择客户',
+      },
+    },
+    {
+      fieldName: 'inspectorUserId',
+      label: '检查员',
+      component: 'ApiSelect',
+      componentProps: {
+        api: getSimpleUserList,
+        clearable: true,
+        labelField: 'nickname',
+        placeholder: '请选择检查员',
+        valueField: 'id',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesWmPackageApi.Package>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '装箱单编号',
+      minWidth: 250,
+      fixed: 'left',
+      treeNode: true,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'packageDate',
+      title: '装箱日期',
+      width: 120,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'salesOrderCode',
+      title: '销售订单编号',
+      minWidth: 140,
+    },
+    {
+      field: 'invoiceCode',
+      title: '发票编号',
+      minWidth: 120,
+    },
+    {
+      field: 'clientCode',
+      title: '客户编码',
+      minWidth: 100,
+    },
+    {
+      field: 'clientName',
+      title: '客户名称',
+      minWidth: 120,
+    },
+    {
+      field: 'length',
+      title: '箱长度',
+      width: 80,
+    },
+    {
+      field: 'width',
+      title: '箱宽度',
+      width: 80,
+    },
+    {
+      field: 'height',
+      title: '箱高度',
+      width: 80,
+    },
+    {
+      field: 'sizeUnitName',
+      title: '尺寸单位',
+      width: 90,
+    },
+    {
+      field: 'netWeight',
+      title: '净重',
+      width: 80,
+    },
+    {
+      field: 'grossWeight',
+      title: '毛重',
+      width: 80,
+    },
+    {
+      field: 'weightUnitName',
+      title: '重量单位',
+      width: 90,
+    },
+    {
+      field: 'inspectorName',
+      title: '检查员',
+      minWidth: 100,
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      minWidth: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_PACKAGE_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 160,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 子箱列表的字段 */
+export function useSubPackageGridColumns(): VxeTableGridOptions<MesWmPackageApi.Package>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '装箱单编号',
+      minWidth: 160,
+      fixed: 'left',
+    },
+    {
+      field: 'packageDate',
+      title: '装箱日期',
+      width: 120,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'salesOrderCode',
+      title: '销售订单编号',
+      minWidth: 140,
+    },
+    {
+      field: 'invoiceCode',
+      title: '发票编号',
+      minWidth: 120,
+    },
+    {
+      field: 'clientCode',
+      title: '客户编码',
+      minWidth: 100,
+    },
+    {
+      field: 'clientName',
+      title: '客户名称',
+      minWidth: 120,
+    },
+    {
+      field: 'netWeight',
+      title: '净重',
+      width: 80,
+    },
+    {
+      field: 'grossWeight',
+      title: '毛重',
+      width: 80,
+    },
+    {
+      field: 'weightUnitName',
+      title: '重量单位',
+      width: 90,
+    },
+    {
+      field: 'inspectorName',
+      title: '检查员',
+      minWidth: 100,
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      minWidth: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_PACKAGE_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 100,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 装箱明细的表单 */
+export function useLineFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'workOrderId',
+      label: '生产工单',
+      component: markRaw(ProWorkOrderSelect),
+      componentProps: {
+        placeholder: '请选择生产工单',
+        status: MesProWorkOrderStatusEnum.CONFIRMED,
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'itemId',
+      label: '产品物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择产品物料',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'quantity',
+      label: '装箱数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0.01,
+        placeholder: '请输入装箱数量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'expireDate',
+      label: '有效期',
+      component: 'DatePicker',
+      componentProps: {
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择有效期',
+        type: 'date',
+        valueFormat: 'x',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-2',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 装箱明细列表的字段 */
+export function useLineGridColumns(): VxeTableGridOptions<MesWmPackageLineApi.PackageLine>['columns'] {
+  return [
+    {
+      field: 'itemCode',
+      title: '产品物料编码',
+      minWidth: 120,
+    },
+    {
+      field: 'itemName',
+      title: '产品物料名称',
+      minWidth: 140,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'quantity',
+      title: '装箱数量',
+      width: 100,
+    },
+    {
+      field: 'workOrderCode',
+      title: '生产工单编号',
+      minWidth: 140,
+    },
+    {
+      field: 'batchCode',
+      title: '批次号',
+      minWidth: 120,
+    },
+    {
+      field: 'expireDate',
+      title: '有效期',
+      width: 120,
+      formatter: 'formatDate',
+    },
+    {
+      title: '操作',
+      width: 120,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 选择弹窗的搜索表单 */
+export function useSelectGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '装箱单编号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入装箱单编号',
+      },
+    },
+    {
+      fieldName: 'salesOrderCode',
+      label: '销售订单编号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入销售订单编号',
+      },
+    },
+    {
+      fieldName: 'clientId',
+      label: '客户',
+      component: markRaw(MdClientSelect),
+      componentProps: {
+        placeholder: '请选择客户',
+      },
+    },
+    {
+      fieldName: 'inspectorUserId',
+      label: '检查员',
+      component: 'ApiSelect',
+      componentProps: {
+        api: getSimpleUserList,
+        clearable: true,
+        labelField: 'nickname',
+        placeholder: '请选择检查员',
+        valueField: 'id',
+      },
+    },
+  ];
+}
+
+/** 选择弹窗的字段 */
+export function useSelectGridColumns(): VxeTableGridOptions<MesWmPackageApi.Package>['columns'] {
+  return [
+    {
+      type: 'checkbox',
+      width: 50,
+    },
+    {
+      field: 'code',
+      title: '装箱单编号',
+      minWidth: 160,
+    },
+    {
+      field: 'packageDate',
+      title: '装箱日期',
+      width: 120,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'salesOrderCode',
+      title: '销售订单编号',
+      minWidth: 140,
+    },
+    {
+      field: 'invoiceCode',
+      title: '发票编号',
+      minWidth: 120,
+    },
+    {
+      field: 'clientCode',
+      title: '客户编码',
+      minWidth: 100,
+    },
+    {
+      field: 'clientName',
+      title: '客户名称',
+      minWidth: 120,
+    },
+    {
+      field: 'netWeight',
+      title: '净重',
+      width: 80,
+    },
+    {
+      field: 'grossWeight',
+      title: '毛重',
+      width: 80,
+    },
+    {
+      field: 'weightUnitName',
+      title: '重量单位',
+      width: 90,
+    },
+    {
+      field: 'inspectorName',
+      title: '检查员',
+      minWidth: 100,
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      minWidth: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_PACKAGE_STATUS },
+      },
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/wm/packages/index.vue b/apps/web-ele/src/views/mes/wm/packages/index.vue
new file mode 100644
index 000000000..2a4808790
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/packages/index.vue
@@ -0,0 +1,172 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmPackageApi } from '#/api/mes/wm/packages';
+
+import { ref } from 'vue';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+
+import { ElButton, ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { deletePackage, getPackagePage } from '#/api/mes/wm/packages';
+import { $t } from '#/locales';
+import { MesWmPackageStatusEnum } from '#/views/mes/utils/constants';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+const isExpanded = ref(true); // 树形表格是否展开
+
+/** 切换树形展开/收缩状态 */
+function handleExpand() {
+  isExpanded.value = !isExpanded.value;
+  gridApi.grid.setAllTreeExpand(isExpanded.value);
+}
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建装箱单 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看装箱单 */
+function handleDetail(row: MesWmPackageApi.Package) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑装箱单 */
+function handleEdit(row: MesWmPackageApi.Package) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 删除装箱单 */
+async function handleDelete(row: MesWmPackageApi.Package) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.code]),
+  });
+  try {
+    await deletePackage(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    pagerConfig: {
+      enabled: false,
+    },
+    proxyConfig: {
+      ajax: {
+        query: async (_, formValues) => {
+          const data = await getPackagePage({
+            pageNo: 1,
+            pageSize: 100,
+            ...formValues,
+          });
+          return { list: data.list || [] };
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+    treeConfig: {
+      parentField: 'parentId',
+      rowField: 'id',
+      transform: true,
+      expandAll: true,
+      reserve: true,
+    },
+  } as VxeTableGridOptions<MesWmPackageApi.Package>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】调拨单、装箱管理"
+        url="https://doc.iocoder.cn/mes/wm/transfer/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="装箱单列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['装箱单']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-package:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: isExpanded ? '收缩' : '展开',
+              type: 'primary',
+              onClick: handleExpand,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <ElButton link type="primary" @click="handleDetail(row)">
+          {{ row.code }}
+        </ElButton>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:wm-package:update'],
+              ifShow: row.status === MesWmPackageStatusEnum.PREPARE,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm-package:delete'],
+              ifShow: row.status === MesWmPackageStatusEnum.PREPARE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/packages/modules/form.vue b/apps/web-ele/src/views/mes/wm/packages/modules/form.vue
new file mode 100644
index 000000000..18453128c
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/packages/modules/form.vue
@@ -0,0 +1,189 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesWmPackageApi } from '#/api/mes/wm/packages';
+
+import { computed, ref } from 'vue';
+
+import { confirm, useVbenModal } from '@vben/common-ui';
+
+import { ElButton, ElMessage, ElTabPane, ElTabs } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createPackage,
+  finishPackage,
+  getPackage,
+  updatePackage,
+} from '#/api/mes/wm/packages';
+import { $t } from '#/locales';
+import { MesWmPackageStatusEnum } from '#/views/mes/utils/constants';
+
+import { useFormSchema } from '../data';
+import PackageLineList from './package-line-list.vue';
+import SubPackageList from './sub-package-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesWmPackageApi.Package>();
+const subTabsName = ref('subPackage'); // 子表当前 tab
+const originalSnapshot = ref(''); // 表单原始数据快照，用于 finish 时跳过未变更的保存请求
+
+const isEditable = computed(() =>
+  ['create', 'update'].includes(formType.value),
+);
+const canFinish = computed(
+  () =>
+    formType.value === 'update' &&
+    formData.value?.status === MesWmPackageStatusEnum.PREPARE,
+);
+const getTitle = computed(() => {
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['装箱单']);
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['装箱单'])
+    : $t('ui.actionTitle.create', ['装箱单']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+/** 提交表单（create/update），新增成功后切换为编辑态以继续维护子表 */
+async function handleSubmit(): Promise<boolean> {
+  const { valid } = await formApi.validate();
+  if (!valid) {
+    return false;
+  }
+  const data = (await formApi.getValues()) as MesWmPackageApi.Package;
+  if (formData.value?.id) {
+    await updatePackage({ ...data, id: formData.value.id });
+    formData.value = { ...formData.value, ...data };
+  } else {
+    const id = await createPackage(data);
+    formData.value = {
+      ...data,
+      id,
+      status: MesWmPackageStatusEnum.PREPARE,
+    };
+    await formApi.setFieldValue('id', id);
+    await formApi.setFieldValue('status', MesWmPackageStatusEnum.PREPARE);
+    formType.value = 'update';
+  }
+  // 刷新快照，下次 finish 用于判断是否需要再保存
+  originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  return true;
+}
+
+/** 完成装箱单：编辑态有修改时先保存，再调用完成接口 */
+async function handleFinish() {
+  const id = formData.value?.id;
+  if (!id) {
+    return;
+  }
+  try {
+    await confirm('确认完成该装箱单？完成后将不可编辑。');
+  } catch {
+    return;
+  }
+  const { valid } = await formApi.validate();
+  if (!valid) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    const current = JSON.stringify(await formApi.getValues());
+    if (current !== originalSnapshot.value) {
+      const data = (await formApi.getValues()) as MesWmPackageApi.Package;
+      await updatePackage({ ...data, id });
+      originalSnapshot.value = current;
+    }
+    await finishPackage(id);
+    ElMessage.success('完成成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (formType.value === 'detail') {
+      await modalApi.close();
+      return;
+    }
+    modalApi.lock();
+    try {
+      // 提交表单
+      const ok = await handleSubmit();
+      if (!ok) {
+        return;
+      }
+      // 关闭并提示
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+      emit('success');
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      originalSnapshot.value = '';
+      return;
+    }
+    subTabsName.value = 'subPackage';
+    // 加载数据
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getPackage(data.id);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    }
+    // 记录初始快照，后续 finish 用于判断是否需要再保存
+    originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-4/5">
+    <Form class="mx-4" />
+    <ElTabs v-if="formData?.id" v-model="subTabsName" class="mx-4 mt-4">
+      <ElTabPane label="子箱" name="subPackage">
+        <SubPackageList :editable="isEditable" :package-id="formData.id" />
+      </ElTabPane>
+      <ElTabPane label="装箱清单" name="packageLine">
+        <PackageLineList :editable="isEditable" :package-id="formData.id" />
+      </ElTabPane>
+    </ElTabs>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <ElButton v-if="canFinish" type="primary" @click="handleFinish">
+          完成
+        </ElButton>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/packages/modules/line-form.vue b/apps/web-ele/src/views/mes/wm/packages/modules/line-form.vue
new file mode 100644
index 000000000..da9950e77
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/packages/modules/line-form.vue
@@ -0,0 +1,93 @@
+<script lang="ts" setup>
+import type { MesWmPackageLineApi } from '#/api/mes/wm/packages/line';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createPackageLine,
+  getPackageLine,
+  updatePackageLine,
+} from '#/api/mes/wm/packages/line';
+import { $t } from '#/locales';
+
+import { useLineFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesWmPackageLineApi.PackageLine>();
+const packageId = ref<number>();
+
+const getTitle = computed(() =>
+  formData.value?.id
+    ? $t('ui.actionTitle.edit', ['装箱明细'])
+    : $t('ui.actionTitle.create', ['装箱明细']),
+);
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 100,
+  },
+  layout: 'horizontal',
+  schema: useLineFormSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-2',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data = (await formApi.getValues()) as MesWmPackageLineApi.PackageLine;
+    data.packageId = packageId.value;
+    try {
+      await (formData.value?.id
+        ? updatePackageLine({ ...data, id: formData.value.id })
+        : createPackageLine(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ id?: number; packageId: number }>();
+    packageId.value = data.packageId;
+    if (!data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getPackageLine(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-2/5">
+    <Form />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/packages/modules/package-line-list.vue b/apps/web-ele/src/views/mes/wm/packages/modules/package-line-list.vue
new file mode 100644
index 000000000..45711d17e
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/packages/modules/package-line-list.vue
@@ -0,0 +1,132 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmPackageLineApi } from '#/api/mes/wm/packages/line';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deletePackageLine,
+  getPackageLinePage,
+} from '#/api/mes/wm/packages/line';
+import { $t } from '#/locales';
+
+import { useLineGridColumns } from '../data';
+import LineForm from './line-form.vue';
+
+const props = defineProps<{
+  editable: boolean; // 是否可编辑（草稿态）
+  packageId: number; // 所属装箱单编号
+}>();
+
+const [LineFormModal, lineFormModalApi] = useVbenModal({
+  connectedComponent: LineForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 添加装箱明细 */
+function handleCreate() {
+  lineFormModalApi.setData({ packageId: props.packageId }).open();
+}
+
+/** 编辑装箱明细 */
+function handleEdit(row: MesWmPackageLineApi.PackageLine) {
+  lineFormModalApi.setData({ id: row.id, packageId: props.packageId }).open();
+}
+
+/** 删除装箱明细 */
+async function handleDelete(row: MesWmPackageLineApi.PackageLine) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.itemName]),
+  });
+  try {
+    await deletePackageLine(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.itemName]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useLineGridColumns(),
+    height: 360,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.packageId) {
+            return { list: [], total: 0 };
+          }
+          return await getPackageLinePage({
+            packageId: props.packageId,
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesWmPackageLineApi.PackageLine>,
+});
+</script>
+
+<template>
+  <div>
+    <LineFormModal @success="handleRefresh" />
+    <Grid table-title="装箱清单">
+      <template #toolbar-tools>
+        <TableAction
+          v-if="editable"
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['装箱明细']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              ifShow: editable,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              ifShow: editable,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.itemName]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/packages/modules/sub-package-list.vue b/apps/web-ele/src/views/mes/wm/packages/modules/sub-package-list.vue
new file mode 100644
index 000000000..8180fa3fe
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/packages/modules/sub-package-list.vue
@@ -0,0 +1,126 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmPackageApi } from '#/api/mes/wm/packages';
+
+import { ref } from 'vue';
+
+import { ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  addChildPackage,
+  getPackagePage,
+  removeChildPackage,
+} from '#/api/mes/wm/packages';
+import { $t } from '#/locales';
+
+import WmPackageSelectDialog from '../components/wm-package-select-dialog.vue';
+import { useSubPackageGridColumns } from '../data';
+
+const props = defineProps<{
+  editable: boolean; // 是否可编辑（草稿态）
+  packageId: number; // 父箱编号
+}>();
+
+const dialogRef = ref<InstanceType<typeof WmPackageSelectDialog>>();
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 打开装箱单选择弹窗添加子箱 */
+function handleAddChild() {
+  dialogRef.value?.open([], { multiple: false });
+}
+
+/** 选中回调：将选中的装箱单添加为子箱 */
+async function handleSelected(rows: MesWmPackageApi.Package[]) {
+  const child = rows[0];
+  if (!child?.id) {
+    return;
+  }
+  await addChildPackage(props.packageId, child.id);
+  ElMessage.success($t('ui.actionMessage.operationSuccess'));
+  handleRefresh();
+}
+
+/** 移除子箱：将子箱的父箱编号清空 */
+async function handleRemoveChild(row: MesWmPackageApi.Package) {
+  await removeChildPackage(row.id!);
+  ElMessage.success('移除成功');
+  handleRefresh();
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useSubPackageGridColumns(),
+    height: 360,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.packageId) {
+            return { list: [], total: 0 };
+          }
+          return await getPackagePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            parentId: props.packageId,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesWmPackageApi.Package>,
+});
+</script>
+
+<template>
+  <div>
+    <WmPackageSelectDialog
+      ref="dialogRef"
+      childable-only
+      :exclude-id="packageId"
+      @selected="handleSelected"
+    />
+    <Grid table-title="子箱列表">
+      <template #toolbar-tools>
+        <TableAction
+          v-if="editable"
+          :actions="[
+            {
+              label: '添加子箱',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              onClick: handleAddChild,
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: '移除',
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              ifShow: editable,
+              popConfirm: {
+                title: '确认将该装箱单从子箱列表中移除？',
+                confirm: handleRemoveChild.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>

From 7ee42b988821c6ba9a2afc97af3fc6f6d9ed6ffd Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 29 May 2026 23:50:48 +0800
Subject: [PATCH 29/52] =?UTF-8?q?feat(mes):=20=E8=BF=81=E7=A7=BB=EF=BC=88w?=
 =?UTF-8?q?m-packages=EF=BC=89=E7=9B=B8=E5=85=B3=E8=BF=81=E7=A7=BB?=
 =?UTF-8?q?=EF=BC=88=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/api/mes/pro/card/index.ts   |  44 ++++++
 apps/web-antd/src/api/mes/wm/batch/index.ts   |  22 ++-
 .../web-antd/src/views/mes/utils/constants.ts |  27 ++++
 .../components/wm-package-select-dialog.vue   | 142 +++++++++---------
 .../src/views/mes/wm/packages/data.ts         |   6 +-
 .../src/views/mes/wm/packages/index.vue       |  12 +-
 .../views/mes/wm/packages/modules/form.vue    |   1 -
 .../mes/wm/packages/modules/line-form.vue     |   2 +-
 apps/web-ele/src/api/mes/pro/card/index.ts    |  44 ++++++
 apps/web-ele/src/api/mes/wm/batch/index.ts    |  22 ++-
 .../components/wm-package-select-dialog.vue   | 136 ++++++++---------
 .../web-ele/src/views/mes/wm/packages/data.ts |   6 +-
 .../src/views/mes/wm/packages/index.vue       |  12 +-
 packages/constants/src/dict-enum.ts           |   2 +
 14 files changed, 311 insertions(+), 167 deletions(-)
 create mode 100644 apps/web-antd/src/api/mes/pro/card/index.ts
 create mode 100644 apps/web-ele/src/api/mes/pro/card/index.ts

diff --git a/apps/web-antd/src/api/mes/pro/card/index.ts b/apps/web-antd/src/api/mes/pro/card/index.ts
new file mode 100644
index 000000000..06c6cb04f
--- /dev/null
+++ b/apps/web-antd/src/api/mes/pro/card/index.ts
@@ -0,0 +1,44 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesProCardApi {
+  /** MES 生产流转卡 */
+  export interface Card {
+    id?: number; // 编号
+    code?: string; // 流转卡编码
+    workOrderId?: number; // 生产工单编号
+    workOrderCode?: string; // 工单编码
+    workOrderName?: string; // 工单名称
+    batchCode?: string; // 批次号
+    itemId?: number; // 产品物料编号
+    itemCode?: string; // 产品编码
+    itemName?: string; // 产品名称
+    specification?: string; // 规格型号
+    unitMeasureName?: string; // 单位名称
+    transferedQuantity?: number; // 流转数量
+    status?: number; // 状态
+    remark?: string; // 备注
+  }
+
+  /** MES 生产流转卡分页查询参数 */
+  export interface PageParams extends PageParam {
+    code?: string;
+    workOrderId?: number;
+    itemId?: number;
+    batchCode?: string;
+  }
+}
+
+/** 查询生产流转卡分页 */
+export function getCardPage(params: MesProCardApi.PageParams) {
+  return requestClient.get<PageResult<MesProCardApi.Card>>(
+    '/mes/pro/card/page',
+    { params },
+  );
+}
+
+/** 查询生产流转卡详情 */
+export function getCard(id: number) {
+  return requestClient.get<MesProCardApi.Card>(`/mes/pro/card/get?id=${id}`);
+}
diff --git a/apps/web-antd/src/api/mes/wm/batch/index.ts b/apps/web-antd/src/api/mes/wm/batch/index.ts
index 02ca877eb..7ce0a76f9 100644
--- a/apps/web-antd/src/api/mes/wm/batch/index.ts
+++ b/apps/web-antd/src/api/mes/wm/batch/index.ts
@@ -36,6 +36,26 @@ export namespace MesWmBatchApi {
     qualityStatus?: number; // 质量状态
     remark?: string; // 备注
   }
+
+  /** MES 批次分页查询参数 */
+  export interface PageParams extends PageParam {
+    code?: string;
+    itemId?: number;
+    vendorId?: number;
+    clientId?: number;
+    workOrderId?: number;
+    taskId?: number;
+    workstationId?: number;
+    toolId?: number;
+    moldId?: number;
+    salesOrderCode?: string;
+    purchaseOrderCode?: string;
+    lotNumber?: string;
+    qualityStatus?: number;
+    produceDate?: string[];
+    expireDate?: string[];
+    receiptDate?: string[];
+  }
 }
 
 /** 查询批次详情 */
@@ -44,7 +64,7 @@ export function getBatch(id: number) {
 }
 
 /** 查询批次分页 */
-export function getBatchPage(params: PageParam) {
+export function getBatchPage(params: MesWmBatchApi.PageParams) {
   return requestClient.get<PageResult<MesWmBatchApi.Batch>>(
     '/mes/wm/batch/page',
     { params },
diff --git a/apps/web-antd/src/views/mes/utils/constants.ts b/apps/web-antd/src/views/mes/utils/constants.ts
index 224f9cc09..5c1360124 100644
--- a/apps/web-antd/src/views/mes/utils/constants.ts
+++ b/apps/web-antd/src/views/mes/utils/constants.ts
@@ -153,6 +153,8 @@ export const MesAutoCodeRuleCode = {
   WM_LOCATION_CODE: 'WM_LOCATION_CODE',
   WM_MISC_ISSUE_CODE: 'WM_MISC_ISSUE_CODE',
   WM_MISC_RECEIPT_CODE: 'WM_MISC_RECEIPT_CODE',
+  WM_OUTSOURCE_ISSUE_CODE: 'WM_OUTSOURCE_ISSUE_CODE',
+  WM_OUTSOURCE_RECEIPT_CODE: 'WM_OUTSOURCE_RECEIPT_CODE',
   WM_PACKAGE_CODE: 'WM_PACKAGE_CODE',
   WM_WAREHOUSE_CODE: 'WM_WAREHOUSE_CODE',
 } as const;
@@ -173,6 +175,13 @@ export const MesProWorkOrderStatusEnum = {
   CANCELLED: MesOrderStatusConstants.CANCELLED,
 } as const;
 
+/** MES 工单类型枚举 */
+export const MesProWorkOrderTypeEnum = {
+  SELF: 1, // 自行生产
+  OUTSOURCE: 2, // 代工
+  PURCHASE: 3, // 采购
+} as const;
+
 /** MES 生产任务状态枚举 */
 export const MesProTaskStatusEnum = {
   PREPARE: MesOrderStatusConstants.DRAFT,
@@ -236,6 +245,24 @@ export const MesWmMiscReceiptStatusEnum = {
   CANCELED: MesOrderStatusConstants.CANCELLED,
 } as const;
 
+/** MES 外协发料单状态枚举 */
+export const MesWmOutsourceIssueStatusEnum = {
+  PREPARE: MesOrderStatusConstants.DRAFT,
+  APPROVING: MesOrderStatusConstants.APPROVING,
+  APPROVED: MesOrderStatusConstants.APPROVED,
+  FINISHED: MesOrderStatusConstants.FINISHED,
+  CANCELLED: MesOrderStatusConstants.CANCELLED,
+} as const;
+
+/** MES 外协入库单状态枚举 */
+export const MesWmOutsourceReceiptStatusEnum = {
+  PREPARE: MesOrderStatusConstants.DRAFT,
+  APPROVING: MesOrderStatusConstants.APPROVING,
+  APPROVED: MesOrderStatusConstants.APPROVED,
+  FINISHED: MesOrderStatusConstants.FINISHED,
+  CANCELED: MesOrderStatusConstants.CANCELLED,
+} as const;
+
 /** MES 质检结果值类型枚举 */
 export const MesQcResultValueType = {
   FLOAT: 1,
diff --git a/apps/web-antd/src/views/mes/wm/packages/components/wm-package-select-dialog.vue b/apps/web-antd/src/views/mes/wm/packages/components/wm-package-select-dialog.vue
index 23a821409..77c72c573 100644
--- a/apps/web-antd/src/views/mes/wm/packages/components/wm-package-select-dialog.vue
+++ b/apps/web-antd/src/views/mes/wm/packages/components/wm-package-select-dialog.vue
@@ -4,7 +4,7 @@ import type { MesWmPackageApi } from '#/api/mes/wm/packages';
 
 import { nextTick, ref } from 'vue';
 
-import { Alert, message, Modal } from 'ant-design-vue';
+import { Alert, Button, message, Modal } from 'ant-design-vue';
 
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getPackagePage } from '#/api/mes/wm/packages';
@@ -29,87 +29,72 @@ const emit = defineEmits<{
 
 const open = ref(false); // 弹窗是否打开
 const multiple = ref(true); // 是否多选
-const syncingSingleSelection = ref(false); // 单选模式同步勾选标记
 const selectedRows = ref<MesWmPackageApi.Package[]>([]); // 已选装箱单
 const preSelectedIds = ref<number[]>([]); // 预选装箱单编号
 
-/** 单选模式同步 VXE 勾选状态 */
-async function syncSingleSelection(row?: MesWmPackageApi.Package) {
-  syncingSingleSelection.value = true;
-  await nextTick();
-  await gridApi.grid.clearCheckboxRow();
-  if (row) {
-    await gridApi.grid.setCheckboxRow(row, true);
-  }
-  await nextTick();
-  syncingSingleSelection.value = false;
+/** 获取多选记录，包含 VXE reserve 跨页记录 */
+function getMultipleSelectedRows() {
+  const selectedMap = new Map<number, MesWmPackageApi.Package>();
+  const records = [
+    ...(gridApi.grid.getCheckboxReserveRecords?.() ?? []),
+    ...(gridApi.grid.getCheckboxRecords?.() ?? []),
+  ] as MesWmPackageApi.Package[];
+  records.forEach((row) => {
+    if (row.id != null) {
+      selectedMap.set(row.id, row);
+    }
+  });
+  return [...selectedMap.values()];
 }
 
 /** 处理勾选变化 */
-async function handleCheckboxChange({
-  checked,
-  records,
-  row,
-}: {
-  checked: boolean;
-  records: MesWmPackageApi.Package[];
-  row?: MesWmPackageApi.Package;
-}) {
-  if (syncingSingleSelection.value) {
-    return;
-  }
-  if (!multiple.value) {
-    const selected = checked && row ? [row] : [];
-    selectedRows.value = selected;
-    await syncSingleSelection(selected[0]);
-    return;
-  }
-  selectedRows.value = records;
+function handleCheckboxSelectChange() {
+  selectedRows.value = getMultipleSelectedRows();
 }
 
-/** 处理全选变化 */
-function handleCheckboxAll({
-  records,
-}: {
-  records: MesWmPackageApi.Package[];
-}) {
-  if (syncingSingleSelection.value) {
-    return;
-  }
-  selectedRows.value = records;
+/** 处理单选变化 */
+function handleRadioChange(row: MesWmPackageApi.Package) {
+  selectedRows.value = [row];
 }
 
-/** 双击行：单选直接确认；多选切换勾选 */
-async function handleRowDblclick({ row }: { row: MesWmPackageApi.Package }) {
+/** 多选模式下切换行勾选 */
+async function toggleMultipleRow(row: MesWmPackageApi.Package) {
+  const selected = gridApi.grid.isCheckedByCheckboxRow(row);
+  await gridApi.grid.setCheckboxRow(row, !selected);
+  selectedRows.value = getMultipleSelectedRows();
+}
+
+/** 处理行双击：单选直接确认；多选切换勾选 */
+async function handleCellDblclick({ row }: { row: MesWmPackageApi.Package }) {
   if (multiple.value) {
-    const checked = !gridApi.grid.isCheckedByCheckboxRow(row);
-    await gridApi.grid.setCheckboxRow(row, checked);
-    handleCheckboxChange({
-      checked,
-      records:
-        gridApi.grid.getCheckboxRecords() as MesWmPackageApi.Package[],
-      row,
-    });
+    await toggleMultipleRow(row);
     return;
   }
   selectedRows.value = [row];
-  await syncSingleSelection(row);
+  await gridApi.grid.setRadioRow(row);
   handleConfirm();
 }
 
-/** 回显预选 */
-function applyPreSelection() {
+/** 回显预选装箱单 */
+async function applyPreSelection() {
   if (preSelectedIds.value.length === 0) {
     return;
   }
   const rows = gridApi.grid.getData() as MesWmPackageApi.Package[];
   for (const row of rows) {
-    if (row.id && preSelectedIds.value.includes(row.id)) {
-      gridApi.grid.setCheckboxRow(row, true);
-      if (!multiple.value) {
-        selectedRows.value = [row];
-      }
+    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();
   }
 }
 
@@ -118,7 +103,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     schema: useSelectGridFormSchema(),
   },
   gridOptions: {
-    columns: useSelectGridColumns(),
+    columns: useSelectGridColumns(true),
     height: 480,
     keepSource: true,
     checkboxConfig: {
@@ -126,6 +111,10 @@ const [Grid, gridApi] = useVbenVxeGrid({
       range: true,
       reserve: true,
     },
+    radioConfig: {
+      highlight: true,
+      trigger: 'row',
+    },
     proxyConfig: {
       ajax: {
         query: async ({ page }, formValues) => {
@@ -157,9 +146,12 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
   } as VxeTableGridOptions<MesWmPackageApi.Package>,
   gridEvents: {
-    cellDblclick: handleRowDblclick,
-    checkboxAll: handleCheckboxAll,
-    checkboxChange: handleCheckboxChange,
+    cellDblclick: handleCellDblclick,
+    checkboxAll: handleCheckboxSelectChange,
+    checkboxChange: handleCheckboxSelectChange,
+    radioChange: ({ row }: { row: MesWmPackageApi.Package }) => {
+      handleRadioChange(row);
+    },
   },
 });
 
@@ -167,10 +159,12 @@ const [Grid, gridApi] = useVbenVxeGrid({
 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 },
@@ -179,28 +173,28 @@ async function openModal(
   multiple.value = options?.multiple ?? true;
   preSelectedIds.value = selectedIds || [];
   await nextTick();
+  gridApi.setGridOptions({
+    columns: useSelectGridColumns(multiple.value),
+  });
   await resetQueryState();
   await gridApi.query();
   await nextTick();
-  applyPreSelection();
+  await applyPreSelection();
 }
 
 /** 关闭弹窗 */
-async function closeModal() {
+function closeModal() {
   open.value = false;
-  await resetQueryState();
 }
 
 /** 确认选择 */
 function handleConfirm() {
-  if (selectedRows.value.length === 0) {
+  const rows = multiple.value ? getMultipleSelectedRows() : selectedRows.value;
+  if (rows.length === 0) {
     message.warning(multiple.value ? '请至少选择一条数据' : '请选择一条数据');
     return;
   }
-  emit(
-    'selected',
-    multiple.value ? selectedRows.value : [selectedRows.value[0]!],
-  );
+  emit('selected', multiple.value ? rows : [rows[0]!]);
   open.value = false;
 }
 
@@ -224,5 +218,9 @@ defineExpose({ open: openModal });
       type="info"
     />
     <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/wm/packages/data.ts b/apps/web-antd/src/views/mes/wm/packages/data.ts
index 4470de2fe..ffa941e4d 100644
--- a/apps/web-antd/src/views/mes/wm/packages/data.ts
+++ b/apps/web-antd/src/views/mes/wm/packages/data.ts
@@ -569,10 +569,12 @@ export function useSelectGridFormSchema(): VbenFormSchema[] {
 }
 
 /** 选择弹窗的字段 */
-export function useSelectGridColumns(): VxeTableGridOptions<MesWmPackageApi.Package>['columns'] {
+export function useSelectGridColumns(
+  multiple = true,
+): VxeTableGridOptions<MesWmPackageApi.Package>['columns'] {
   return [
     {
-      type: 'checkbox',
+      type: multiple ? 'checkbox' : 'radio',
       width: 50,
     },
     {
diff --git a/apps/web-antd/src/views/mes/wm/packages/index.vue b/apps/web-antd/src/views/mes/wm/packages/index.vue
index 1216ff763..78f3d0c8d 100644
--- a/apps/web-antd/src/views/mes/wm/packages/index.vue
+++ b/apps/web-antd/src/views/mes/wm/packages/index.vue
@@ -72,18 +72,14 @@ const [Grid, gridApi] = useVbenVxeGrid({
     columns: useGridColumns(),
     height: 'auto',
     keepSource: true,
-    pagerConfig: {
-      enabled: false,
-    },
     proxyConfig: {
       ajax: {
-        query: async (_, formValues) => {
-          const data = await getPackagePage({
-            pageNo: 1,
-            pageSize: 100,
+        query: async ({ page }, formValues) => {
+          return await getPackagePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
             ...formValues,
           });
-          return { list: data.list || [] };
         },
       },
     },
diff --git a/apps/web-antd/src/views/mes/wm/packages/modules/form.vue b/apps/web-antd/src/views/mes/wm/packages/modules/form.vue
index b3a4d1b90..ab7854ade 100644
--- a/apps/web-antd/src/views/mes/wm/packages/modules/form.vue
+++ b/apps/web-antd/src/views/mes/wm/packages/modules/form.vue
@@ -32,7 +32,6 @@ const originalSnapshot = ref(''); // 表单原始数据快照，用于 finish 
 const isEditable = computed(() =>
   ['create', 'update'].includes(formType.value),
 );
-// TODO @AI：这种 ( 可以不折行么？
 const canFinish = computed(
   () =>
     formType.value === 'update' &&
diff --git a/apps/web-antd/src/views/mes/wm/packages/modules/line-form.vue b/apps/web-antd/src/views/mes/wm/packages/modules/line-form.vue
index 3b00e7f08..93539ff2d 100644
--- a/apps/web-antd/src/views/mes/wm/packages/modules/line-form.vue
+++ b/apps/web-antd/src/views/mes/wm/packages/modules/line-form.vue
@@ -19,7 +19,7 @@ import { useLineFormSchema } from '../data';
 
 const emit = defineEmits(['success']);
 const formData = ref<MesWmPackageLineApi.PackageLine>();
-const packageId = ref<number>(); // TODO @AI：尾注释；
+const packageId = ref<number>(); // 所属装箱单编号
 const getTitle = computed(() =>
   formData.value?.id
     ? $t('ui.actionTitle.edit', ['装箱明细'])
diff --git a/apps/web-ele/src/api/mes/pro/card/index.ts b/apps/web-ele/src/api/mes/pro/card/index.ts
new file mode 100644
index 000000000..06c6cb04f
--- /dev/null
+++ b/apps/web-ele/src/api/mes/pro/card/index.ts
@@ -0,0 +1,44 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesProCardApi {
+  /** MES 生产流转卡 */
+  export interface Card {
+    id?: number; // 编号
+    code?: string; // 流转卡编码
+    workOrderId?: number; // 生产工单编号
+    workOrderCode?: string; // 工单编码
+    workOrderName?: string; // 工单名称
+    batchCode?: string; // 批次号
+    itemId?: number; // 产品物料编号
+    itemCode?: string; // 产品编码
+    itemName?: string; // 产品名称
+    specification?: string; // 规格型号
+    unitMeasureName?: string; // 单位名称
+    transferedQuantity?: number; // 流转数量
+    status?: number; // 状态
+    remark?: string; // 备注
+  }
+
+  /** MES 生产流转卡分页查询参数 */
+  export interface PageParams extends PageParam {
+    code?: string;
+    workOrderId?: number;
+    itemId?: number;
+    batchCode?: string;
+  }
+}
+
+/** 查询生产流转卡分页 */
+export function getCardPage(params: MesProCardApi.PageParams) {
+  return requestClient.get<PageResult<MesProCardApi.Card>>(
+    '/mes/pro/card/page',
+    { params },
+  );
+}
+
+/** 查询生产流转卡详情 */
+export function getCard(id: number) {
+  return requestClient.get<MesProCardApi.Card>(`/mes/pro/card/get?id=${id}`);
+}
diff --git a/apps/web-ele/src/api/mes/wm/batch/index.ts b/apps/web-ele/src/api/mes/wm/batch/index.ts
index 02ca877eb..7ce0a76f9 100644
--- a/apps/web-ele/src/api/mes/wm/batch/index.ts
+++ b/apps/web-ele/src/api/mes/wm/batch/index.ts
@@ -36,6 +36,26 @@ export namespace MesWmBatchApi {
     qualityStatus?: number; // 质量状态
     remark?: string; // 备注
   }
+
+  /** MES 批次分页查询参数 */
+  export interface PageParams extends PageParam {
+    code?: string;
+    itemId?: number;
+    vendorId?: number;
+    clientId?: number;
+    workOrderId?: number;
+    taskId?: number;
+    workstationId?: number;
+    toolId?: number;
+    moldId?: number;
+    salesOrderCode?: string;
+    purchaseOrderCode?: string;
+    lotNumber?: string;
+    qualityStatus?: number;
+    produceDate?: string[];
+    expireDate?: string[];
+    receiptDate?: string[];
+  }
 }
 
 /** 查询批次详情 */
@@ -44,7 +64,7 @@ export function getBatch(id: number) {
 }
 
 /** 查询批次分页 */
-export function getBatchPage(params: PageParam) {
+export function getBatchPage(params: MesWmBatchApi.PageParams) {
   return requestClient.get<PageResult<MesWmBatchApi.Batch>>(
     '/mes/wm/batch/page',
     { params },
diff --git a/apps/web-ele/src/views/mes/wm/packages/components/wm-package-select-dialog.vue b/apps/web-ele/src/views/mes/wm/packages/components/wm-package-select-dialog.vue
index 3aab57f0b..6a933eaf8 100644
--- a/apps/web-ele/src/views/mes/wm/packages/components/wm-package-select-dialog.vue
+++ b/apps/web-ele/src/views/mes/wm/packages/components/wm-package-select-dialog.vue
@@ -29,87 +29,72 @@ const emit = defineEmits<{
 
 const open = ref(false); // 弹窗是否打开
 const multiple = ref(true); // 是否多选
-const syncingSingleSelection = ref(false); // 单选模式同步勾选标记
 const selectedRows = ref<MesWmPackageApi.Package[]>([]); // 已选装箱单
 const preSelectedIds = ref<number[]>([]); // 预选装箱单编号
 
-/** 单选模式同步 VXE 勾选状态 */
-async function syncSingleSelection(row?: MesWmPackageApi.Package) {
-  syncingSingleSelection.value = true;
-  await nextTick();
-  await gridApi.grid.clearCheckboxRow();
-  if (row) {
-    await gridApi.grid.setCheckboxRow(row, true);
-  }
-  await nextTick();
-  syncingSingleSelection.value = false;
+/** 获取多选记录，包含 VXE reserve 跨页记录 */
+function getMultipleSelectedRows() {
+  const selectedMap = new Map<number, MesWmPackageApi.Package>();
+  const records = [
+    ...(gridApi.grid.getCheckboxReserveRecords?.() ?? []),
+    ...(gridApi.grid.getCheckboxRecords?.() ?? []),
+  ] as MesWmPackageApi.Package[];
+  records.forEach((row) => {
+    if (row.id != null) {
+      selectedMap.set(row.id, row);
+    }
+  });
+  return [...selectedMap.values()];
 }
 
 /** 处理勾选变化 */
-async function handleCheckboxChange({
-  checked,
-  records,
-  row,
-}: {
-  checked: boolean;
-  records: MesWmPackageApi.Package[];
-  row?: MesWmPackageApi.Package;
-}) {
-  if (syncingSingleSelection.value) {
-    return;
-  }
-  if (!multiple.value) {
-    const selected = checked && row ? [row] : [];
-    selectedRows.value = selected;
-    await syncSingleSelection(selected[0]);
-    return;
-  }
-  selectedRows.value = records;
+function handleCheckboxSelectChange() {
+  selectedRows.value = getMultipleSelectedRows();
 }
 
-/** 处理全选变化 */
-function handleCheckboxAll({
-  records,
-}: {
-  records: MesWmPackageApi.Package[];
-}) {
-  if (syncingSingleSelection.value) {
-    return;
-  }
-  selectedRows.value = records;
+/** 处理单选变化 */
+function handleRadioChange(row: MesWmPackageApi.Package) {
+  selectedRows.value = [row];
 }
 
-/** 双击行：单选直接确认；多选切换勾选 */
-async function handleRowDblclick({ row }: { row: MesWmPackageApi.Package }) {
+/** 多选模式下切换行勾选 */
+async function toggleMultipleRow(row: MesWmPackageApi.Package) {
+  const selected = gridApi.grid.isCheckedByCheckboxRow(row);
+  await gridApi.grid.setCheckboxRow(row, !selected);
+  selectedRows.value = getMultipleSelectedRows();
+}
+
+/** 处理行双击：单选直接确认；多选切换勾选 */
+async function handleCellDblclick({ row }: { row: MesWmPackageApi.Package }) {
   if (multiple.value) {
-    const checked = !gridApi.grid.isCheckedByCheckboxRow(row);
-    await gridApi.grid.setCheckboxRow(row, checked);
-    handleCheckboxChange({
-      checked,
-      records:
-        gridApi.grid.getCheckboxRecords() as MesWmPackageApi.Package[],
-      row,
-    });
+    await toggleMultipleRow(row);
     return;
   }
   selectedRows.value = [row];
-  await syncSingleSelection(row);
+  await gridApi.grid.setRadioRow(row);
   handleConfirm();
 }
 
-/** 回显预选 */
-function applyPreSelection() {
+/** 回显预选装箱单 */
+async function applyPreSelection() {
   if (preSelectedIds.value.length === 0) {
     return;
   }
   const rows = gridApi.grid.getData() as MesWmPackageApi.Package[];
   for (const row of rows) {
-    if (row.id && preSelectedIds.value.includes(row.id)) {
-      gridApi.grid.setCheckboxRow(row, true);
-      if (!multiple.value) {
-        selectedRows.value = [row];
-      }
+    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();
   }
 }
 
@@ -118,7 +103,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     schema: useSelectGridFormSchema(),
   },
   gridOptions: {
-    columns: useSelectGridColumns(),
+    columns: useSelectGridColumns(true),
     height: 480,
     keepSource: true,
     checkboxConfig: {
@@ -126,6 +111,10 @@ const [Grid, gridApi] = useVbenVxeGrid({
       range: true,
       reserve: true,
     },
+    radioConfig: {
+      highlight: true,
+      trigger: 'row',
+    },
     proxyConfig: {
       ajax: {
         query: async ({ page }, formValues) => {
@@ -157,9 +146,12 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
   } as VxeTableGridOptions<MesWmPackageApi.Package>,
   gridEvents: {
-    cellDblclick: handleRowDblclick,
-    checkboxAll: handleCheckboxAll,
-    checkboxChange: handleCheckboxChange,
+    cellDblclick: handleCellDblclick,
+    checkboxAll: handleCheckboxSelectChange,
+    checkboxChange: handleCheckboxSelectChange,
+    radioChange: ({ row }: { row: MesWmPackageApi.Package }) => {
+      handleRadioChange(row);
+    },
   },
 });
 
@@ -167,10 +159,12 @@ const [Grid, gridApi] = useVbenVxeGrid({
 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 },
@@ -179,28 +173,28 @@ async function openModal(
   multiple.value = options?.multiple ?? true;
   preSelectedIds.value = selectedIds || [];
   await nextTick();
+  gridApi.setGridOptions({
+    columns: useSelectGridColumns(multiple.value),
+  });
   await resetQueryState();
   await gridApi.query();
   await nextTick();
-  applyPreSelection();
+  await applyPreSelection();
 }
 
 /** 关闭弹窗 */
-async function closeModal() {
+function closeModal() {
   open.value = false;
-  await resetQueryState();
 }
 
 /** 确认选择 */
 function handleConfirm() {
-  if (selectedRows.value.length === 0) {
+  const rows = multiple.value ? getMultipleSelectedRows() : selectedRows.value;
+  if (rows.length === 0) {
     ElMessage.warning(multiple.value ? '请至少选择一条数据' : '请选择一条数据');
     return;
   }
-  emit(
-    'selected',
-    multiple.value ? selectedRows.value : [selectedRows.value[0]!],
-  );
+  emit('selected', multiple.value ? rows : [rows[0]!]);
   open.value = false;
 }
 
diff --git a/apps/web-ele/src/views/mes/wm/packages/data.ts b/apps/web-ele/src/views/mes/wm/packages/data.ts
index 30372310d..b05fddef8 100644
--- a/apps/web-ele/src/views/mes/wm/packages/data.ts
+++ b/apps/web-ele/src/views/mes/wm/packages/data.ts
@@ -576,10 +576,12 @@ export function useSelectGridFormSchema(): VbenFormSchema[] {
 }
 
 /** 选择弹窗的字段 */
-export function useSelectGridColumns(): VxeTableGridOptions<MesWmPackageApi.Package>['columns'] {
+export function useSelectGridColumns(
+  multiple = true,
+): VxeTableGridOptions<MesWmPackageApi.Package>['columns'] {
   return [
     {
-      type: 'checkbox',
+      type: multiple ? 'checkbox' : 'radio',
       width: 50,
     },
     {
diff --git a/apps/web-ele/src/views/mes/wm/packages/index.vue b/apps/web-ele/src/views/mes/wm/packages/index.vue
index 2a4808790..109774c91 100644
--- a/apps/web-ele/src/views/mes/wm/packages/index.vue
+++ b/apps/web-ele/src/views/mes/wm/packages/index.vue
@@ -71,18 +71,14 @@ const [Grid, gridApi] = useVbenVxeGrid({
     columns: useGridColumns(),
     height: 'auto',
     keepSource: true,
-    pagerConfig: {
-      enabled: false,
-    },
     proxyConfig: {
       ajax: {
-        query: async (_, formValues) => {
-          const data = await getPackagePage({
-            pageNo: 1,
-            pageSize: 100,
+        query: async ({ page }, formValues) => {
+          return await getPackagePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
             ...formValues,
           });
-          return { list: data.list || [] };
         },
       },
     },
diff --git a/packages/constants/src/dict-enum.ts b/packages/constants/src/dict-enum.ts
index 995a6e069..70a30b7ba 100644
--- a/packages/constants/src/dict-enum.ts
+++ b/packages/constants/src/dict-enum.ts
@@ -230,6 +230,8 @@ const MES_DICT = {
   MES_WM_MISC_ISSUE_STATUS: 'mes_wm_misc_issue_status', // MES 杂项出库单状态
   MES_WM_MISC_RECEIPT_TYPE: 'mes_wm_misc_receipt_type', // MES 杂项入库类型
   MES_WM_MISC_RECEIPT_STATUS: 'mes_wm_misc_receipt_status', // MES 杂项入库单状态
+  MES_WM_OUTSOURCE_ISSUE_STATUS: 'mes_wm_outsource_issue_status', // MES 外协发料单状态
+  MES_WM_OUTSOURCE_RECEIPT_STATUS: 'mes_wm_outsource_receipt_status', // MES 外协入库单状态
 } as const;
 
 /** ========== WMS - 仓储管理模块 ========== */

From 6b6d45132f5a63c702ba22833f0357113bf74061 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 30 May 2026 00:51:38 +0800
Subject: [PATCH 30/52] =?UTF-8?q?feat(mes):=20=E5=AE=8C=E5=96=84=E6=9D=A1?=
 =?UTF-8?q?=E7=A0=81=E7=AE=A1=E7=90=86=E8=BF=81=E7=A7=BB=E5=B9=B6=E8=A1=A5?=
 =?UTF-8?q?=E9=BD=90=E4=B8=9A=E5=8A=A1=E9=80=89=E6=8B=A9=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/mes/pro/workorder/index.ts        |   2 +
 .../src/api/mes/wm/itemreceipt/index.ts       |  54 +-
 .../src/api/mes/wm/itemreceipt/line/index.ts  |  39 +-
 .../api/mes/wm/outsourceissue/detail/index.ts |  60 +++
 .../src/api/mes/wm/outsourceissue/index.ts    |  90 ++++
 .../api/mes/wm/outsourceissue/line/index.ts   |  55 ++
 .../mes/wm/outsourcereceipt/detail/index.ts   |  61 +++
 .../src/api/mes/wm/outsourcereceipt/index.ts  |  81 +++
 .../api/mes/wm/outsourcereceipt/line/index.ts |  58 +++
 .../src/api/mes/wm/productsales/index.ts      |  77 ++-
 .../src/api/mes/wm/productsales/line/index.ts |  32 ++
 .../views/mes/pro/card/components/index.ts    |   2 +
 .../components/pro-card-select-dialog.vue     | 198 +++++++
 .../pro/card/components/pro-card-select.vue   | 133 +++++
 apps/web-antd/src/views/mes/pro/card/data.ts  | 100 ++++
 .../web-antd/src/views/mes/utils/constants.ts | 124 +++++
 .../web-antd/src/views/mes/wm/barcode/data.ts |  79 ++-
 .../views/mes/wm/batch/components/index.ts    |   2 +
 .../components/wm-batch-select-dialog.vue     | 248 +++++++++
 .../wm/batch/components/wm-batch-select.vue   | 147 ++++++
 apps/web-antd/src/views/mes/wm/batch/data.ts  | 234 +++++++++
 .../src/views/mes/wm/outsourceissue/data.ts   | 488 ++++++++++++++++++
 .../src/views/system/dept/components/index.ts |   1 +
 .../components/tree-select.vue}               |  37 +-
 .../src/views/system/user/components/index.ts |   2 +
 .../system/user/components/select-dialog.vue  | 305 +++++++++++
 .../views/system/user/components/select.vue   | 134 +++++
 apps/web-antd/src/views/system/user/index.vue |   8 +-
 .../src/api/mes/pro/workorder/index.ts        |   2 +
 .../api/mes/wm/outsourceissue/detail/index.ts |  60 +++
 .../src/api/mes/wm/outsourceissue/index.ts    |  90 ++++
 .../api/mes/wm/outsourceissue/line/index.ts   |  55 ++
 .../mes/wm/outsourcereceipt/detail/index.ts   |  61 +++
 .../src/api/mes/wm/outsourcereceipt/index.ts  |  81 +++
 .../api/mes/wm/outsourcereceipt/line/index.ts |  58 +++
 .../views/mes/pro/card/components/index.ts    |   2 +
 .../components/pro-card-select-dialog.vue     | 191 +++++++
 .../pro/card/components/pro-card-select.vue   | 131 +++++
 apps/web-ele/src/views/mes/pro/card/data.ts   | 100 ++++
 apps/web-ele/src/views/mes/utils/constants.ts | 151 ++++++
 apps/web-ele/src/views/mes/wm/barcode/data.ts |  79 ++-
 .../views/mes/wm/batch/components/index.ts    |   2 +
 .../components/wm-batch-select-dialog.vue     | 241 +++++++++
 .../wm/batch/components/wm-batch-select.vue   | 145 ++++++
 .../src/views/system/dept/components/index.ts |   1 +
 .../system/dept/components/select-modal.vue   |  29 +-
 .../components/tree-select.vue}               |  50 +-
 .../src/views/system/user/components/index.ts |   2 +
 .../system/user/components/select-dialog.vue  | 298 +++++++++++
 .../system/user/components/select-modal.vue   |  24 +-
 .../views/system/user/components/select.vue   | 132 +++++
 apps/web-ele/src/views/system/user/index.vue  |   8 +-
 packages/constants/src/dict-enum.ts           |  13 +
 53 files changed, 4768 insertions(+), 89 deletions(-)
 create mode 100644 apps/web-antd/src/api/mes/wm/outsourceissue/detail/index.ts
 create mode 100644 apps/web-antd/src/api/mes/wm/outsourceissue/index.ts
 create mode 100644 apps/web-antd/src/api/mes/wm/outsourceissue/line/index.ts
 create mode 100644 apps/web-antd/src/api/mes/wm/outsourcereceipt/detail/index.ts
 create mode 100644 apps/web-antd/src/api/mes/wm/outsourcereceipt/index.ts
 create mode 100644 apps/web-antd/src/api/mes/wm/outsourcereceipt/line/index.ts
 create mode 100644 apps/web-antd/src/views/mes/pro/card/components/index.ts
 create mode 100644 apps/web-antd/src/views/mes/pro/card/components/pro-card-select-dialog.vue
 create mode 100644 apps/web-antd/src/views/mes/pro/card/components/pro-card-select.vue
 create mode 100644 apps/web-antd/src/views/mes/pro/card/data.ts
 create mode 100644 apps/web-antd/src/views/mes/wm/batch/components/index.ts
 create mode 100644 apps/web-antd/src/views/mes/wm/batch/components/wm-batch-select-dialog.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/batch/components/wm-batch-select.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/batch/data.ts
 create mode 100644 apps/web-antd/src/views/mes/wm/outsourceissue/data.ts
 rename apps/web-antd/src/views/system/{user/modules/dept-tree.vue => dept/components/tree-select.vue} (75%)
 create mode 100644 apps/web-antd/src/views/system/user/components/select-dialog.vue
 create mode 100644 apps/web-antd/src/views/system/user/components/select.vue
 create mode 100644 apps/web-ele/src/api/mes/wm/outsourceissue/detail/index.ts
 create mode 100644 apps/web-ele/src/api/mes/wm/outsourceissue/index.ts
 create mode 100644 apps/web-ele/src/api/mes/wm/outsourceissue/line/index.ts
 create mode 100644 apps/web-ele/src/api/mes/wm/outsourcereceipt/detail/index.ts
 create mode 100644 apps/web-ele/src/api/mes/wm/outsourcereceipt/index.ts
 create mode 100644 apps/web-ele/src/api/mes/wm/outsourcereceipt/line/index.ts
 create mode 100644 apps/web-ele/src/views/mes/pro/card/components/index.ts
 create mode 100644 apps/web-ele/src/views/mes/pro/card/components/pro-card-select-dialog.vue
 create mode 100644 apps/web-ele/src/views/mes/pro/card/components/pro-card-select.vue
 create mode 100644 apps/web-ele/src/views/mes/pro/card/data.ts
 create mode 100644 apps/web-ele/src/views/mes/wm/batch/components/index.ts
 create mode 100644 apps/web-ele/src/views/mes/wm/batch/components/wm-batch-select-dialog.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/batch/components/wm-batch-select.vue
 rename apps/web-ele/src/views/system/{user/modules/dept-tree.vue => dept/components/tree-select.vue} (66%)
 create mode 100644 apps/web-ele/src/views/system/user/components/select-dialog.vue
 create mode 100644 apps/web-ele/src/views/system/user/components/select.vue

diff --git a/apps/web-antd/src/api/mes/pro/workorder/index.ts b/apps/web-antd/src/api/mes/pro/workorder/index.ts
index fcc22b79e..24de7d057 100644
--- a/apps/web-antd/src/api/mes/pro/workorder/index.ts
+++ b/apps/web-antd/src/api/mes/pro/workorder/index.ts
@@ -21,6 +21,8 @@ export namespace MesProWorkOrderApi {
     routeName?: string;
     clientId?: number;
     clientName?: string;
+    vendorId?: number; // 供应商编号
+    vendorName?: string; // 供应商名称
     planStartTime?: number | string;
     planEndTime?: number | string;
     actualStartTime?: number | string;
diff --git a/apps/web-antd/src/api/mes/wm/itemreceipt/index.ts b/apps/web-antd/src/api/mes/wm/itemreceipt/index.ts
index d7086de99..c1a77cd98 100644
--- a/apps/web-antd/src/api/mes/wm/itemreceipt/index.ts
+++ b/apps/web-antd/src/api/mes/wm/itemreceipt/index.ts
@@ -1,3 +1,5 @@
+import type { PageParam, PageResult } from '@vben/request';
+
 import { requestClient } from '#/api/request';
 
 export namespace MesWmItemReceiptApi {
@@ -19,16 +21,66 @@ export namespace MesWmItemReceiptApi {
     locationName?: string; // 库区名称
     areaId?: number; // 库位编号
     areaName?: string; // 库位名称
-    receiptDate?: Date | number | string; // 入库日期
+    receiptDate?: number; // 入库日期
     status?: number; // 状态
     remark?: string; // 备注
     createTime?: Date; // 创建时间
   }
 }
 
+/** 查询采购入库单分页 */
+export function getItemReceiptPage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmItemReceiptApi.ItemReceipt>>(
+    '/mes/wm/item-receipt/page',
+    { params },
+  );
+}
+
 /** 查询采购入库单详情 */
 export function getItemReceipt(id: number) {
   return requestClient.get<MesWmItemReceiptApi.ItemReceipt>(
     `/mes/wm/item-receipt/get?id=${id}`,
   );
 }
+
+/** 新增采购入库单 */
+export function createItemReceipt(data: MesWmItemReceiptApi.ItemReceipt) {
+  return requestClient.post<number>('/mes/wm/item-receipt/create', data);
+}
+
+/** 修改采购入库单 */
+export function updateItemReceipt(data: MesWmItemReceiptApi.ItemReceipt) {
+  return requestClient.put('/mes/wm/item-receipt/update', data);
+}
+
+/** 删除采购入库单 */
+export function deleteItemReceipt(id: number) {
+  return requestClient.delete(`/mes/wm/item-receipt/delete?id=${id}`);
+}
+
+/** 提交采购入库单 */
+export function submitItemReceipt(id: number) {
+  return requestClient.put(`/mes/wm/item-receipt/submit?id=${id}`);
+}
+
+/** 执行上架 */
+export function stockItemReceipt(id: number) {
+  return requestClient.put(`/mes/wm/item-receipt/stock?id=${id}`);
+}
+
+/** 执行入库 */
+export function finishItemReceipt(id: number) {
+  return requestClient.put(`/mes/wm/item-receipt/finish?id=${id}`);
+}
+
+/** 取消采购入库单 */
+export function cancelItemReceipt(id: number) {
+  return requestClient.put(`/mes/wm/item-receipt/cancel?id=${id}`);
+}
+
+/** 导出采购入库单 */
+export function exportItemReceipt(params: any) {
+  return requestClient.download('/mes/wm/item-receipt/export-excel', {
+    params,
+  });
+}
diff --git a/apps/web-antd/src/api/mes/wm/itemreceipt/line/index.ts b/apps/web-antd/src/api/mes/wm/itemreceipt/line/index.ts
index 55562e84c..8ce7236c1 100644
--- a/apps/web-antd/src/api/mes/wm/itemreceipt/line/index.ts
+++ b/apps/web-antd/src/api/mes/wm/itemreceipt/line/index.ts
@@ -3,11 +3,12 @@ import type { PageParam, PageResult } from '@vben/request';
 import { requestClient } from '#/api/request';
 
 export namespace MesWmItemReceiptLineApi {
-  /** MES 物料接收单行 */
+  /** MES 采购入库单行 */
   export interface ItemReceiptLine {
     id?: number; // 行编号
     receiptId?: number; // 入库单编号
     receiptCode?: string; // 入库单编码
+    arrivalNoticeLineId?: number; // 到货通知单行编号
     purchaseOrderCode?: string; // 采购订单号
     itemId?: number; // 物料编号
     itemCode?: string; // 物料编码
@@ -15,14 +16,48 @@ export namespace MesWmItemReceiptLineApi {
     specification?: string; // 规格型号
     unitMeasureName?: string; // 单位
     receivedQuantity?: number; // 入库数量
+    batchId?: number; // 批次编号
     batchCode?: string; // 批次号
+    productionDate?: number; // 生产日期
+    expireDate?: number; // 有效期
+    lotNumber?: string; // 生产批号
+    iqcCheckFlag?: boolean; // 是否检验
+    iqcId?: number; // 来料检验单编号
+    iqcCode?: string; // 来料检验单编码
+    remark?: string; // 备注
   }
 }
 
-/** 查询物料接收单行分页 */
+/** 查询采购入库单行分页 */
 export function getItemReceiptLinePage(params: PageParam) {
   return requestClient.get<PageResult<MesWmItemReceiptLineApi.ItemReceiptLine>>(
     '/mes/wm/item-receipt-line/page',
     { params },
   );
 }
+
+/** 查询采购入库单行详情 */
+export function getItemReceiptLine(id: number) {
+  return requestClient.get<MesWmItemReceiptLineApi.ItemReceiptLine>(
+    `/mes/wm/item-receipt-line/get?id=${id}`,
+  );
+}
+
+/** 新增采购入库单行 */
+export function createItemReceiptLine(
+  data: MesWmItemReceiptLineApi.ItemReceiptLine,
+) {
+  return requestClient.post<number>('/mes/wm/item-receipt-line/create', data);
+}
+
+/** 修改采购入库单行 */
+export function updateItemReceiptLine(
+  data: MesWmItemReceiptLineApi.ItemReceiptLine,
+) {
+  return requestClient.put('/mes/wm/item-receipt-line/update', data);
+}
+
+/** 删除采购入库单行 */
+export function deleteItemReceiptLine(id: number) {
+  return requestClient.delete(`/mes/wm/item-receipt-line/delete?id=${id}`);
+}
diff --git a/apps/web-antd/src/api/mes/wm/outsourceissue/detail/index.ts b/apps/web-antd/src/api/mes/wm/outsourceissue/detail/index.ts
new file mode 100644
index 000000000..15b50b6a6
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/outsourceissue/detail/index.ts
@@ -0,0 +1,60 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesWmOutsourceIssueDetailApi {
+  /** MES 外协发料单明细 */
+  export interface OutsourceIssueDetail {
+    id?: number; // 明细编号
+    lineId?: number; // 行编号
+    issueId?: number; // 发料单编号
+    itemId?: number; // 物料编号
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    specification?: string; // 规格型号
+    unitMeasureName?: string; // 计量单位名称
+    quantity?: number; // 数量
+    materialStockId?: number; // 库存编号
+    batchId?: number; // 批次编号
+    batchCode?: string; // 批次编码
+    warehouseId?: number; // 仓库编号
+    warehouseName?: string; // 仓库名称
+    locationId?: number; // 库区编号
+    locationName?: string; // 库区名称
+    areaId?: number; // 库位编号
+    areaName?: string; // 库位名称
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询外协发料单明细列表 */
+export function getOutsourceIssueDetailListByLineId(lineId: number) {
+  return requestClient.get<
+    MesWmOutsourceIssueDetailApi.OutsourceIssueDetail[]
+  >('/mes/wm/outsource-issue-detail/list-by-line', { params: { lineId } });
+}
+
+/** 查询外协发料单明细详情 */
+export function getOutsourceIssueDetail(id: number) {
+  return requestClient.get<MesWmOutsourceIssueDetailApi.OutsourceIssueDetail>(
+    `/mes/wm/outsource-issue-detail/get?id=${id}`,
+  );
+}
+
+/** 新增外协发料单明细 */
+export function createOutsourceIssueDetail(
+  data: MesWmOutsourceIssueDetailApi.OutsourceIssueDetail,
+) {
+  return requestClient.post('/mes/wm/outsource-issue-detail/create', data);
+}
+
+/** 修改外协发料单明细 */
+export function updateOutsourceIssueDetail(
+  data: MesWmOutsourceIssueDetailApi.OutsourceIssueDetail,
+) {
+  return requestClient.put('/mes/wm/outsource-issue-detail/update', data);
+}
+
+/** 删除外协发料单明细 */
+export function deleteOutsourceIssueDetail(id: number) {
+  return requestClient.delete(`/mes/wm/outsource-issue-detail/delete?id=${id}`);
+}
diff --git a/apps/web-antd/src/api/mes/wm/outsourceissue/index.ts b/apps/web-antd/src/api/mes/wm/outsourceissue/index.ts
new file mode 100644
index 000000000..8b3b94b75
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/outsourceissue/index.ts
@@ -0,0 +1,90 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmOutsourceIssueApi {
+  /** MES 外协发料单 */
+  export interface OutsourceIssue {
+    id?: number; // 发料单编号
+    code?: string; // 发料单编号
+    name?: string; // 发料单名称
+    vendorId?: number; // 供应商编号
+    vendorCode?: string; // 供应商编码
+    vendorName?: string; // 供应商名称
+    workOrderId?: number; // 生产工单编号
+    workOrderCode?: string; // 生产工单编码
+    workOrderName?: string; // 生产工单名称
+    issueDate?: number; // 发料日期
+    status?: number; // 单据状态
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询外协发料单分页 */
+export function getOutsourceIssuePage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmOutsourceIssueApi.OutsourceIssue>>(
+    '/mes/wm/outsource-issue/page',
+    { params },
+  );
+}
+
+/** 查询外协发料单详情 */
+export function getOutsourceIssue(id: number) {
+  return requestClient.get<MesWmOutsourceIssueApi.OutsourceIssue>(
+    `/mes/wm/outsource-issue/get?id=${id}`,
+  );
+}
+
+/** 新增外协发料单 */
+export function createOutsourceIssue(
+  data: MesWmOutsourceIssueApi.OutsourceIssue,
+) {
+  return requestClient.post<number>('/mes/wm/outsource-issue/create', data);
+}
+
+/** 修改外协发料单 */
+export function updateOutsourceIssue(
+  data: MesWmOutsourceIssueApi.OutsourceIssue,
+) {
+  return requestClient.put('/mes/wm/outsource-issue/update', data);
+}
+
+/** 删除外协发料单 */
+export function deleteOutsourceIssue(id: number) {
+  return requestClient.delete(`/mes/wm/outsource-issue/delete?id=${id}`);
+}
+
+/** 提交外协发料单 */
+export function submitOutsourceIssue(id: number) {
+  return requestClient.put(`/mes/wm/outsource-issue/submit?id=${id}`);
+}
+
+/** 执行拣货 */
+export function stockOutsourceIssue(id: number) {
+  return requestClient.put(`/mes/wm/outsource-issue/stock?id=${id}`);
+}
+
+/** 执行领出 */
+export function finishOutsourceIssue(id: number) {
+  return requestClient.put(`/mes/wm/outsource-issue/finish?id=${id}`);
+}
+
+/** 取消外协发料单 */
+export function cancelOutsourceIssue(id: number) {
+  return requestClient.put(`/mes/wm/outsource-issue/cancel?id=${id}`);
+}
+
+/** 校验外协发料单拣货数量是否与发料数量一致 */
+export function checkOutsourceIssueQuantity(id: number) {
+  return requestClient.get<boolean>(
+    `/mes/wm/outsource-issue/check-quantity?id=${id}`,
+  );
+}
+
+/** 导出外协发料单 */
+export function exportOutsourceIssue(params: any) {
+  return requestClient.download('/mes/wm/outsource-issue/export-excel', {
+    params,
+  });
+}
diff --git a/apps/web-antd/src/api/mes/wm/outsourceissue/line/index.ts b/apps/web-antd/src/api/mes/wm/outsourceissue/line/index.ts
new file mode 100644
index 000000000..68fae8f95
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/outsourceissue/line/index.ts
@@ -0,0 +1,55 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmOutsourceIssueLineApi {
+  /** MES 外协发料单行 */
+  export interface OutsourceIssueLine {
+    id?: number; // 行编号
+    issueId?: number; // 发料单编号
+    itemId?: number; // 物料编号
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    specification?: string; // 规格型号
+    unitMeasureName?: string; // 计量单位名称
+    quantity?: number; // 发料数量
+    materialStockId?: number; // 库存编号
+    batchId?: number; // 批次编号
+    batchCode?: string; // 批次编码
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询外协发料单行分页 */
+export function getOutsourceIssueLinePage(params: PageParam) {
+  return requestClient.get<
+    PageResult<MesWmOutsourceIssueLineApi.OutsourceIssueLine>
+  >('/mes/wm/outsource-issue-line/page', { params });
+}
+
+/** 查询外协发料单行详情 */
+export function getOutsourceIssueLine(id: number) {
+  return requestClient.get<MesWmOutsourceIssueLineApi.OutsourceIssueLine>(
+    `/mes/wm/outsource-issue-line/get?id=${id}`,
+  );
+}
+
+/** 新增外协发料单行 */
+export function createOutsourceIssueLine(
+  data: MesWmOutsourceIssueLineApi.OutsourceIssueLine,
+) {
+  return requestClient.post('/mes/wm/outsource-issue-line/create', data);
+}
+
+/** 修改外协发料单行 */
+export function updateOutsourceIssueLine(
+  data: MesWmOutsourceIssueLineApi.OutsourceIssueLine,
+) {
+  return requestClient.put('/mes/wm/outsource-issue-line/update', data);
+}
+
+/** 删除外协发料单行 */
+export function deleteOutsourceIssueLine(id: number) {
+  return requestClient.delete(`/mes/wm/outsource-issue-line/delete?id=${id}`);
+}
diff --git a/apps/web-antd/src/api/mes/wm/outsourcereceipt/detail/index.ts b/apps/web-antd/src/api/mes/wm/outsourcereceipt/detail/index.ts
new file mode 100644
index 000000000..645fa7ad3
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/outsourcereceipt/detail/index.ts
@@ -0,0 +1,61 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesWmOutsourceReceiptDetailApi {
+  /** MES 外协入库单明细 */
+  export interface OutsourceReceiptDetail {
+    id?: number; // 明细编号
+    lineId?: number; // 行编号
+    receiptId?: number; // 入库单编号
+    itemId?: number; // 物料编号
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    specification?: string; // 规格型号
+    unitMeasureName?: string; // 计量单位名称
+    quantity?: number; // 上架数量
+    batchId?: number; // 批次编号
+    batchCode?: string; // 批次编码
+    warehouseId?: number; // 仓库编号
+    warehouseName?: string; // 仓库名称
+    locationId?: number; // 库区编号
+    locationName?: string; // 库区名称
+    areaId?: number; // 库位编号
+    areaName?: string; // 库位名称
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询外协入库单明细列表 */
+export function getOutsourceReceiptDetailListByLineId(lineId: number) {
+  return requestClient.get<
+    MesWmOutsourceReceiptDetailApi.OutsourceReceiptDetail[]
+  >('/mes/wm/outsource-receipt-detail/list-by-line', { params: { lineId } });
+}
+
+/** 查询外协入库单明细详情 */
+export function getOutsourceReceiptDetail(id: number) {
+  return requestClient.get<MesWmOutsourceReceiptDetailApi.OutsourceReceiptDetail>(
+    `/mes/wm/outsource-receipt-detail/get?id=${id}`,
+  );
+}
+
+/** 新增外协入库单明细 */
+export function createOutsourceReceiptDetail(
+  data: MesWmOutsourceReceiptDetailApi.OutsourceReceiptDetail,
+) {
+  return requestClient.post('/mes/wm/outsource-receipt-detail/create', data);
+}
+
+/** 修改外协入库单明细 */
+export function updateOutsourceReceiptDetail(
+  data: MesWmOutsourceReceiptDetailApi.OutsourceReceiptDetail,
+) {
+  return requestClient.put('/mes/wm/outsource-receipt-detail/update', data);
+}
+
+/** 删除外协入库单明细 */
+export function deleteOutsourceReceiptDetail(id: number) {
+  return requestClient.delete(
+    `/mes/wm/outsource-receipt-detail/delete?id=${id}`,
+  );
+}
diff --git a/apps/web-antd/src/api/mes/wm/outsourcereceipt/index.ts b/apps/web-antd/src/api/mes/wm/outsourcereceipt/index.ts
new file mode 100644
index 000000000..730b2f8b9
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/outsourcereceipt/index.ts
@@ -0,0 +1,81 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmOutsourceReceiptApi {
+  /** MES 外协入库单 */
+  export interface OutsourceReceipt {
+    id?: number; // 入库单编号
+    code?: string; // 入库单编码
+    name?: string; // 入库单名称
+    workOrderId?: number; // 外协工单编号
+    workOrderCode?: string; // 外协工单编码
+    vendorId?: number; // 供应商编号
+    vendorName?: string; // 供应商名称
+    receiptDate?: number; // 入库日期
+    status?: number; // 单据状态
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询外协入库单分页 */
+export function getOutsourceReceiptPage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmOutsourceReceiptApi.OutsourceReceipt>>(
+    '/mes/wm/outsource-receipt/page',
+    { params },
+  );
+}
+
+/** 查询外协入库单详情 */
+export function getOutsourceReceipt(id: number) {
+  return requestClient.get<MesWmOutsourceReceiptApi.OutsourceReceipt>(
+    `/mes/wm/outsource-receipt/get?id=${id}`,
+  );
+}
+
+/** 新增外协入库单 */
+export function createOutsourceReceipt(
+  data: MesWmOutsourceReceiptApi.OutsourceReceipt,
+) {
+  return requestClient.post<number>('/mes/wm/outsource-receipt/create', data);
+}
+
+/** 修改外协入库单 */
+export function updateOutsourceReceipt(
+  data: MesWmOutsourceReceiptApi.OutsourceReceipt,
+) {
+  return requestClient.put('/mes/wm/outsource-receipt/update', data);
+}
+
+/** 删除外协入库单 */
+export function deleteOutsourceReceipt(id: number) {
+  return requestClient.delete(`/mes/wm/outsource-receipt/delete?id=${id}`);
+}
+
+/** 提交外协入库单 */
+export function submitOutsourceReceipt(id: number) {
+  return requestClient.put(`/mes/wm/outsource-receipt/submit?id=${id}`);
+}
+
+/** 执行上架 */
+export function stockOutsourceReceipt(id: number) {
+  return requestClient.put(`/mes/wm/outsource-receipt/stock?id=${id}`);
+}
+
+/** 完成入库 */
+export function finishOutsourceReceipt(id: number) {
+  return requestClient.put(`/mes/wm/outsource-receipt/finish?id=${id}`);
+}
+
+/** 取消外协入库单 */
+export function cancelOutsourceReceipt(id: number) {
+  return requestClient.put(`/mes/wm/outsource-receipt/cancel?id=${id}`);
+}
+
+/** 导出外协入库单 */
+export function exportOutsourceReceipt(params: any) {
+  return requestClient.download('/mes/wm/outsource-receipt/export-excel', {
+    params,
+  });
+}
diff --git a/apps/web-antd/src/api/mes/wm/outsourcereceipt/line/index.ts b/apps/web-antd/src/api/mes/wm/outsourcereceipt/line/index.ts
new file mode 100644
index 000000000..fd5c0ce46
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/outsourcereceipt/line/index.ts
@@ -0,0 +1,58 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmOutsourceReceiptLineApi {
+  /** MES 外协入库单行 */
+  export interface OutsourceReceiptLine {
+    id?: number; // 行编号
+    receiptId?: number; // 入库单编号
+    itemId?: number; // 物料编号
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    specification?: string; // 规格型号
+    unitMeasureName?: string; // 计量单位名称
+    quantity?: number; // 入库数量
+    batchId?: number; // 批次编号
+    batchCode?: string; // 批次编码
+    productionDate?: number; // 生产日期
+    expireDate?: number; // 有效期
+    lotNumber?: string; // 生产批号
+    iqcCheckFlag?: boolean; // 是否需要质检
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询外协入库单行分页 */
+export function getOutsourceReceiptLinePage(params: PageParam) {
+  return requestClient.get<
+    PageResult<MesWmOutsourceReceiptLineApi.OutsourceReceiptLine>
+  >('/mes/wm/outsource-receipt-line/page', { params });
+}
+
+/** 查询外协入库单行详情 */
+export function getOutsourceReceiptLine(id: number) {
+  return requestClient.get<MesWmOutsourceReceiptLineApi.OutsourceReceiptLine>(
+    `/mes/wm/outsource-receipt-line/get?id=${id}`,
+  );
+}
+
+/** 新增外协入库单行 */
+export function createOutsourceReceiptLine(
+  data: MesWmOutsourceReceiptLineApi.OutsourceReceiptLine,
+) {
+  return requestClient.post('/mes/wm/outsource-receipt-line/create', data);
+}
+
+/** 修改外协入库单行 */
+export function updateOutsourceReceiptLine(
+  data: MesWmOutsourceReceiptLineApi.OutsourceReceiptLine,
+) {
+  return requestClient.put('/mes/wm/outsource-receipt-line/update', data);
+}
+
+/** 删除外协入库单行 */
+export function deleteOutsourceReceiptLine(id: number) {
+  return requestClient.delete(`/mes/wm/outsource-receipt-line/delete?id=${id}`);
+}
diff --git a/apps/web-antd/src/api/mes/wm/productsales/index.ts b/apps/web-antd/src/api/mes/wm/productsales/index.ts
index aa00d4556..b0fddcfe4 100644
--- a/apps/web-antd/src/api/mes/wm/productsales/index.ts
+++ b/apps/web-antd/src/api/mes/wm/productsales/index.ts
@@ -5,12 +5,24 @@ import { requestClient } from '#/api/request';
 export namespace MesWmProductSalesApi {
   /** MES 销售出库单 */
   export interface ProductSales {
-    id?: number; // 销售出库单编号
+    id?: number; // 出库单编号
     code?: string; // 出库单编号
     name?: string; // 出库单名称
+    noticeId?: number; // 发货通知单编号
+    noticeCode?: string; // 发货通知单编码
+    clientId?: number; // 客户编号
+    clientCode?: string; // 客户编码
+    clientName?: string; // 客户名称
     salesOrderCode?: string; // 销售订单编号
-    salesDate?: Date; // 出库日期
+    salesDate?: number; // 出库日期
+    contactName?: string; // 收货人
+    contactTelephone?: string; // 联系方式
+    contactAddress?: string; // 收货地址
+    carrier?: string; // 承运商
+    shippingNumber?: string; // 运输单号
     status?: number; // 单据状态
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
   }
 }
 
@@ -21,3 +33,64 @@ export function getProductSalesPage(params: PageParam) {
     { params },
   );
 }
+
+/** 查询销售出库单详情 */
+export function getProductSales(id: number) {
+  return requestClient.get<MesWmProductSalesApi.ProductSales>(
+    `/mes/wm/product-sales/get?id=${id}`,
+  );
+}
+
+/** 新增销售出库单 */
+export function createProductSales(data: MesWmProductSalesApi.ProductSales) {
+  return requestClient.post<number>('/mes/wm/product-sales/create', data);
+}
+
+/** 修改销售出库单 */
+export function updateProductSales(data: MesWmProductSalesApi.ProductSales) {
+  return requestClient.put('/mes/wm/product-sales/update', data);
+}
+
+/** 删除销售出库单 */
+export function deleteProductSales(id: number) {
+  return requestClient.delete(`/mes/wm/product-sales/delete?id=${id}`);
+}
+
+/** 提交销售出库单 */
+export function submitProductSales(id: number) {
+  return requestClient.put(`/mes/wm/product-sales/submit?id=${id}`);
+}
+
+/** 执行拣货 */
+export function stockProductSales(id: number) {
+  return requestClient.put(`/mes/wm/product-sales/stock?id=${id}`);
+}
+
+/** 填写运单 */
+export function shippingProductSales(data: MesWmProductSalesApi.ProductSales) {
+  return requestClient.put('/mes/wm/product-sales/shipping', data);
+}
+
+/** 执行出库 */
+export function finishProductSales(id: number) {
+  return requestClient.put(`/mes/wm/product-sales/finish?id=${id}`);
+}
+
+/** 取消销售出库单 */
+export function cancelProductSales(id: number) {
+  return requestClient.put(`/mes/wm/product-sales/cancel?id=${id}`);
+}
+
+/** 校验销售出库单拣货数量是否与出库数量一致 */
+export function checkProductSalesQuantity(id: number) {
+  return requestClient.get<boolean>(
+    `/mes/wm/product-sales/check-quantity?id=${id}`,
+  );
+}
+
+/** 导出销售出库单 */
+export function exportProductSales(params: any) {
+  return requestClient.download('/mes/wm/product-sales/export-excel', {
+    params,
+  });
+}
diff --git a/apps/web-antd/src/api/mes/wm/productsales/line/index.ts b/apps/web-antd/src/api/mes/wm/productsales/line/index.ts
index b66ef6ba7..f1d4ff57b 100644
--- a/apps/web-antd/src/api/mes/wm/productsales/line/index.ts
+++ b/apps/web-antd/src/api/mes/wm/productsales/line/index.ts
@@ -6,13 +6,19 @@ export namespace MesWmProductSalesLineApi {
   /** MES 销售出库单行 */
   export interface ProductSalesLine {
     id?: number; // 行编号
+    salesId?: number; // 出库单编号
+    noticeLineId?: number; // 发货通知单行编号
     itemId?: number; // 物料编号
     itemCode?: string; // 物料编码
     itemName?: string; // 物料名称
     specification?: string; // 规格型号
     unitMeasureName?: string; // 单位
     quantity?: number; // 出库数量
+    pickedQuantity?: number; // 已拣货数量
+    batchId?: number; // 批次编号
     batchCode?: string; // 批次号
+    oqcCheckFlag?: boolean; // 是否检验
+    remark?: string; // 备注
   }
 }
 
@@ -22,3 +28,29 @@ export function getProductSalesLinePage(params: PageParam) {
     PageResult<MesWmProductSalesLineApi.ProductSalesLine>
   >('/mes/wm/product-sales-line/page', { params });
 }
+
+/** 查询销售出库单行详情 */
+export function getProductSalesLine(id: number) {
+  return requestClient.get<MesWmProductSalesLineApi.ProductSalesLine>(
+    `/mes/wm/product-sales-line/get?id=${id}`,
+  );
+}
+
+/** 新增销售出库单行 */
+export function createProductSalesLine(
+  data: MesWmProductSalesLineApi.ProductSalesLine,
+) {
+  return requestClient.post<number>('/mes/wm/product-sales-line/create', data);
+}
+
+/** 修改销售出库单行 */
+export function updateProductSalesLine(
+  data: MesWmProductSalesLineApi.ProductSalesLine,
+) {
+  return requestClient.put('/mes/wm/product-sales-line/update', data);
+}
+
+/** 删除销售出库单行 */
+export function deleteProductSalesLine(id: number) {
+  return requestClient.delete(`/mes/wm/product-sales-line/delete?id=${id}`);
+}
diff --git a/apps/web-antd/src/views/mes/pro/card/components/index.ts b/apps/web-antd/src/views/mes/pro/card/components/index.ts
new file mode 100644
index 000000000..8092d6cb7
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/card/components/index.ts
@@ -0,0 +1,2 @@
+export { default as ProCardSelectDialog } from './pro-card-select-dialog.vue';
+export { default as ProCardSelect } from './pro-card-select.vue';
diff --git a/apps/web-antd/src/views/mes/pro/card/components/pro-card-select-dialog.vue b/apps/web-antd/src/views/mes/pro/card/components/pro-card-select-dialog.vue
new file mode 100644
index 000000000..d6836f2dd
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/card/components/pro-card-select-dialog.vue
@@ -0,0 +1,198 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProCardApi } from '#/api/mes/pro/card';
+
+import { nextTick, ref } from 'vue';
+
+import { Button, message, Modal } from 'ant-design-vue';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getCardPage } from '#/api/mes/pro/card';
+
+import { useCardSelectGridColumns, useCardSelectGridFormSchema } from '../data';
+
+const emit = defineEmits<{
+  selected: [rows: MesProCardApi.Card[]];
+}>();
+
+const open = ref(false); // 弹窗是否打开
+const multiple = ref(false); // 是否多选；默认按单选选择器使用
+const selectedRows = ref<MesProCardApi.Card[]>([]); // 已选流转卡列表
+const preSelectedIds = ref<number[]>([]); // 预选流转卡编号列表
+
+/** 获取多选记录，包含 VXE reserve 跨页记录 */
+function getMultipleSelectedRows() {
+  const selectedMap = new Map<number, MesProCardApi.Card>();
+  const records = [
+    ...(gridApi.grid.getCheckboxReserveRecords?.() ?? []),
+    ...(gridApi.grid.getCheckboxRecords?.() ?? []),
+  ] as MesProCardApi.Card[];
+  records.forEach((row) => {
+    const rowId = row.id;
+    if (rowId !== undefined) {
+      selectedMap.set(rowId, row);
+    }
+  });
+  return [...selectedMap.values()];
+}
+
+/** 处理多选勾选变化 */
+function handleCheckboxSelectChange() {
+  selectedRows.value = getMultipleSelectedRows();
+}
+
+/** 处理单选切换 */
+function handleRadioChange(row: MesProCardApi.Card) {
+  selectedRows.value = [row];
+}
+
+/** 多选模式下切换行勾选 */
+async function toggleMultipleRow(row: MesProCardApi.Card) {
+  const selected = gridApi.grid.isCheckedByCheckboxRow(row);
+  await gridApi.grid.setCheckboxRow(row, !selected);
+  selectedRows.value = getMultipleSelectedRows();
+}
+
+/** 处理行双击：单选直接确认，多选切换勾选 */
+async function handleCellDblclick({ row }: { row: MesProCardApi.Card }) {
+  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 = gridApi.grid.getData() as MesProCardApi.Card[];
+  for (const row of rows) {
+    if (row.id === undefined || !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: useCardSelectGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useCardSelectGridColumns(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 getCardPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesProCardApi.Card>,
+  gridEvents: {
+    cellDblclick: handleCellDblclick,
+    checkboxAll: handleCheckboxSelectChange,
+    checkboxChange: handleCheckboxSelectChange,
+    radioChange: ({ row }: { row: MesProCardApi.Card }) => {
+      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: useCardSelectGridColumns(multiple.value),
+  });
+  await resetQueryState();
+  await gridApi.query();
+  await nextTick();
+  await applyPreSelection();
+}
+
+/** 关闭流转卡选择弹窗 */
+function closeModal() {
+  open.value = false;
+}
+
+/** 确认选择流转卡 */
+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/pro/card/components/pro-card-select.vue b/apps/web-antd/src/views/mes/pro/card/components/pro-card-select.vue
new file mode 100644
index 000000000..46c5a8804
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/card/components/pro-card-select.vue
@@ -0,0 +1,133 @@
+<script lang="ts" setup>
+import type { MesProCardApi } from '#/api/mes/pro/card';
+
+import { computed, ref, useAttrs, watch } from 'vue';
+
+import { IconifyIcon } from '@vben/icons';
+
+import { Input, Tooltip } from 'ant-design-vue';
+
+import { getCard } from '#/api/mes/pro/card';
+
+import ProCardSelectDialog from './pro-card-select-dialog.vue';
+
+defineOptions({ name: 'ProCardSelect', inheritAttrs: false });
+
+const props = withDefaults(
+  defineProps<{
+    allowClear?: boolean;
+    disabled?: boolean;
+    modelValue?: number;
+    placeholder?: string;
+  }>(),
+  {
+    allowClear: true,
+    disabled: false,
+    modelValue: undefined,
+    placeholder: '请选择流转卡',
+  },
+);
+
+const emit = defineEmits<{
+  change: [item: MesProCardApi.Card | undefined];
+  'update:modelValue': [value: number | undefined];
+}>();
+
+const attrs = useAttrs();
+const dialogRef = ref<InstanceType<typeof ProCardSelectDialog>>();
+const hovering = ref(false);
+const selectedItem = ref<MesProCardApi.Card>();
+
+const displayLabel = computed(() => selectedItem.value?.code ?? '');
+
+const showClear = computed(
+  () =>
+    props.allowClear &&
+    !props.disabled &&
+    hovering.value &&
+    props.modelValue != null,
+);
+
+/** 根据编号单条查询流转卡信息（用于编辑回显） */
+async function resolveItemById(id: number | undefined) {
+  if (id == null) {
+    selectedItem.value = undefined;
+    return;
+  }
+  if (selectedItem.value?.id === id) {
+    return;
+  }
+  selectedItem.value = await getCard(id);
+}
+
+watch(() => props.modelValue, resolveItemById, { immediate: true });
+
+/** 清空已选流转卡 */
+function clearSelected() {
+  selectedItem.value = undefined;
+  emit('update:modelValue', undefined);
+  emit('change', undefined);
+}
+
+/** 打开流转卡选择弹窗 */
+function handleClick(event: MouseEvent) {
+  if (props.disabled) {
+    return;
+  }
+  const target = event.target as HTMLElement;
+  if (showClear.value && target.closest('.ant-input-suffix')) {
+    event.stopPropagation();
+    clearSelected();
+    return;
+  }
+  const selectedIds = props.modelValue == null ? [] : [props.modelValue];
+  dialogRef.value?.open(selectedIds, { multiple: false });
+}
+
+/** 弹窗选中回调 */
+function handleSelected(rows: MesProCardApi.Card[]) {
+  const item = rows[0];
+  if (!item) {
+    return;
+  }
+  selectedItem.value = item;
+  emit('update:modelValue', item.id);
+  emit('change', item);
+}
+</script>
+
+<template>
+  <div
+    v-bind="attrs"
+    class="w-full"
+    :class="disabled ? 'cursor-not-allowed' : 'cursor-pointer'"
+    @click="handleClick"
+    @mouseenter="hovering = true"
+    @mouseleave="hovering = false"
+  >
+    <Tooltip :mouse-enter-delay="0.5" :open="selectedItem ? undefined : false">
+      <template #title>
+        <div v-if="selectedItem" class="leading-6">
+          <div>编号：{{ selectedItem.code || '-' }}</div>
+          <div>工单：{{ selectedItem.workOrderCode || '-' }}</div>
+          <div>批次：{{ selectedItem.batchCode || '-' }}</div>
+          <div>产品：{{ selectedItem.itemName || '-' }}</div>
+        </div>
+      </template>
+      <Input
+        :disabled="disabled"
+        :placeholder="placeholder"
+        :value="displayLabel"
+        readonly
+      >
+        <template #suffix>
+          <IconifyIcon
+            class="size-4"
+            :icon="showClear ? 'lucide:circle-x' : 'lucide:search'"
+          />
+        </template>
+      </Input>
+    </Tooltip>
+  </div>
+  <ProCardSelectDialog ref="dialogRef" @selected="handleSelected" />
+</template>
diff --git a/apps/web-antd/src/views/mes/pro/card/data.ts b/apps/web-antd/src/views/mes/pro/card/data.ts
new file mode 100644
index 000000000..e4e0d6f9a
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/card/data.ts
@@ -0,0 +1,100 @@
+import type { VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProCardApi } from '#/api/mes/pro/card';
+
+import { markRaw } from 'vue';
+
+import { MdItemSelect } from '#/views/mes/md/item/components';
+import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
+
+/** 流转卡选择弹窗的搜索表单 */
+export function useCardSelectGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '流转卡编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入流转卡编号',
+      },
+    },
+    {
+      fieldName: 'workOrderId',
+      label: '生产工单',
+      component: markRaw(ProWorkOrderSelect),
+      componentProps: {
+        placeholder: '请选择生产工单',
+      },
+    },
+    {
+      fieldName: 'itemId',
+      label: '产品物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择产品物料',
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入批次号',
+      },
+    },
+  ];
+}
+
+/** 流转卡选择弹窗的字段 */
+export function useCardSelectGridColumns(
+  multiple = false,
+): VxeTableGridOptions<MesProCardApi.Card>['columns'] {
+  return [
+    {
+      type: multiple ? 'checkbox' : 'radio',
+      width: 50,
+    },
+    {
+      field: 'code',
+      title: '流转卡编号',
+      width: 160,
+    },
+    {
+      field: 'workOrderCode',
+      title: '生产工单编号',
+      width: 160,
+    },
+    {
+      field: 'itemCode',
+      title: '产品物料编码',
+      width: 140,
+    },
+    {
+      field: 'batchCode',
+      title: '批次号',
+      width: 120,
+    },
+    {
+      field: 'itemName',
+      title: '产品物料名称',
+      minWidth: 150,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      width: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'transferedQuantity',
+      title: '流转数量',
+      width: 100,
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/utils/constants.ts b/apps/web-antd/src/views/mes/utils/constants.ts
index 5c1360124..19315fc41 100644
--- a/apps/web-antd/src/views/mes/utils/constants.ts
+++ b/apps/web-antd/src/views/mes/utils/constants.ts
@@ -151,11 +151,22 @@ export const MesAutoCodeRuleCode = {
   TM_TOOL_CODE: 'TM_TOOL_CODE',
   WM_AREA_CODE: 'WM_AREA_CODE',
   WM_LOCATION_CODE: 'WM_LOCATION_CODE',
+  WM_ARRIVAL_NOTICE_CODE: 'WM_ARRIVAL_NOTICE_CODE',
+  WM_ITEM_RECEIPT_CODE: 'WM_ITEM_RECEIPT_CODE',
+  WM_RETURN_VENDOR_CODE: 'WM_RETURN_VENDOR_CODE',
+  WM_SALES_NOTICE_CODE: 'WM_SALES_NOTICE_CODE',
+  WM_RETURN_SALES_CODE: 'WM_RETURN_SALES_CODE',
+  WM_RETURN_ISSUE_CODE: 'WM_RETURN_ISSUE_CODE',
+  WM_PRODUCT_ISSUE_CODE: 'WM_PRODUCT_ISSUE_CODE',
+  WM_PRODUCT_SALES_CODE: 'WM_PRODUCT_SALES_CODE',
+  PRODUCTRECPT_CODE: 'PRODUCTRECPT_CODE',
   WM_MISC_ISSUE_CODE: 'WM_MISC_ISSUE_CODE',
   WM_MISC_RECEIPT_CODE: 'WM_MISC_RECEIPT_CODE',
   WM_OUTSOURCE_ISSUE_CODE: 'WM_OUTSOURCE_ISSUE_CODE',
   WM_OUTSOURCE_RECEIPT_CODE: 'WM_OUTSOURCE_RECEIPT_CODE',
   WM_PACKAGE_CODE: 'WM_PACKAGE_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',
 } as const;
 
@@ -165,6 +176,38 @@ export const MesWmPackageStatusEnum = {
   FINISHED: MesOrderStatusConstants.FINISHED,
 } as const;
 
+/** MES 盘点类型枚举 */
+export const MesWmStockTakingTypeEnum = {
+  STATIC: 1,
+  DYNAMIC: 2,
+} as const;
+
+/** MES 盘点任务状态枚举 */
+export const MesWmStockTakingTaskStatusEnum = {
+  PREPARE: MesOrderStatusConstants.DRAFT,
+  APPROVING: MesOrderStatusConstants.APPROVING,
+  FINISHED: MesOrderStatusConstants.FINISHED,
+  CANCELED: MesOrderStatusConstants.CANCELLED,
+} as const;
+
+/** MES 盘点任务行状态枚举 */
+export const MesWmStockTakingTaskLineStatusEnum = {
+  UNCOUNTED: 0,
+  NORMAL: 1,
+  GAIN: 2,
+  LOSS: 3,
+} as const;
+
+/** MES 盘点方案参数类型枚举 */
+export const MesWmStockTakingParamTypeEnum = {
+  WAREHOUSE: 102,
+  LOCATION: 103,
+  AREA: 104,
+  BATCH: 107,
+  ITEM: 600,
+  QUALITY_STATUS: 900,
+} as const;
+
 /** MES 生产工单状态枚举 */
 export const MesProWorkOrderStatusEnum = {
   PREPARE: MesOrderStatusConstants.DRAFT,
@@ -263,6 +306,87 @@ export const MesWmOutsourceReceiptStatusEnum = {
   CANCELED: MesOrderStatusConstants.CANCELLED,
 } as const;
 
+/** MES 到货通知单状态枚举 */
+export const MesWmArrivalNoticeStatusEnum = {
+  PREPARE: MesOrderStatusConstants.DRAFT,
+  PENDING_QC: MesOrderStatusConstants.APPROVING,
+  PENDING_RECEIPT: MesOrderStatusConstants.APPROVED,
+  FINISHED: MesOrderStatusConstants.FINISHED,
+} as const;
+
+/** MES 采购入库单状态枚举 */
+export const MesWmItemReceiptStatusEnum = {
+  PREPARE: MesOrderStatusConstants.DRAFT,
+  APPROVING: MesOrderStatusConstants.APPROVING,
+  APPROVED: MesOrderStatusConstants.APPROVED,
+  FINISHED: MesOrderStatusConstants.FINISHED,
+  CANCELED: MesOrderStatusConstants.CANCELLED,
+} as const;
+
+/** MES 供应商退货单状态枚举 */
+export const MesWmReturnVendorStatusEnum = {
+  PREPARE: MesOrderStatusConstants.DRAFT,
+  APPROVING: MesOrderStatusConstants.APPROVING,
+  APPROVED: MesOrderStatusConstants.APPROVED,
+  FINISHED: MesOrderStatusConstants.FINISHED,
+  CANCELED: MesOrderStatusConstants.CANCELLED,
+} as const;
+
+/** MES 发货通知单状态枚举 */
+export const MesWmSalesNoticeStatusEnum = {
+  PREPARE: MesOrderStatusConstants.DRAFT,
+  APPROVED: MesOrderStatusConstants.APPROVED,
+} as const;
+
+/** MES 销售退货单状态枚举 */
+export const MesWmReturnSalesStatusEnum = {
+  PREPARE: MesOrderStatusConstants.DRAFT,
+  CONFIRMED: MesOrderStatusConstants.CONFIRMED,
+  APPROVING: MesOrderStatusConstants.APPROVING,
+  APPROVED: MesOrderStatusConstants.APPROVED,
+  FINISHED: MesOrderStatusConstants.FINISHED,
+  CANCELED: MesOrderStatusConstants.CANCELLED,
+} as const;
+
+/** MES 生产退料单状态枚举 */
+export const MesWmReturnIssueStatusEnum = {
+  PREPARE: MesOrderStatusConstants.DRAFT,
+  CONFIRMED: MesOrderStatusConstants.CONFIRMED,
+  APPROVING: MesOrderStatusConstants.APPROVING,
+  APPROVED: MesOrderStatusConstants.APPROVED,
+  FINISHED: MesOrderStatusConstants.FINISHED,
+  CANCELED: MesOrderStatusConstants.CANCELLED,
+} as const;
+
+/** MES 领料出库单状态枚举 */
+export const MesWmProductIssueStatusEnum = {
+  PREPARE: MesOrderStatusConstants.DRAFT,
+  APPROVING: MesOrderStatusConstants.APPROVING,
+  APPROVED: MesOrderStatusConstants.APPROVED,
+  FINISHED: MesOrderStatusConstants.FINISHED,
+  CANCELED: MesOrderStatusConstants.CANCELLED,
+} as const;
+
+/** MES 产品入库单状态枚举 */
+export const MesWmProductReceiptStatusEnum = {
+  PREPARE: MesOrderStatusConstants.DRAFT,
+  APPROVING: MesOrderStatusConstants.APPROVING,
+  APPROVED: MesOrderStatusConstants.APPROVED,
+  FINISHED: MesOrderStatusConstants.FINISHED,
+  CANCELED: MesOrderStatusConstants.CANCELLED,
+} as const;
+
+/** MES 销售出库单状态枚举 */
+export const MesWmProductSalesStatusEnum = {
+  PREPARE: MesOrderStatusConstants.DRAFT,
+  CONFIRMED: MesOrderStatusConstants.CONFIRMED,
+  APPROVING: MesOrderStatusConstants.APPROVING,
+  SHIPPING: 10, // 待填写运单
+  APPROVED: MesOrderStatusConstants.APPROVED,
+  FINISHED: MesOrderStatusConstants.FINISHED,
+  CANCELED: MesOrderStatusConstants.CANCELLED,
+} as const;
+
 /** MES 质检结果值类型枚举 */
 export const MesQcResultValueType = {
   FLOAT: 1,
diff --git a/apps/web-antd/src/views/mes/wm/barcode/data.ts b/apps/web-antd/src/views/mes/wm/barcode/data.ts
index 2d1671e23..3c57d300b 100644
--- a/apps/web-antd/src/views/mes/wm/barcode/data.ts
+++ b/apps/web-antd/src/views/mes/wm/barcode/data.ts
@@ -19,9 +19,12 @@ import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
 import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
 import MdWorkshopSelect from '#/views/mes/md/workstation/components/md-workshop-select.vue';
 import MdWorkstationSelect from '#/views/mes/md/workstation/components/md-workstation-select.vue';
+import { ProCardSelect } from '#/views/mes/pro/card/components';
 import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
 import TmToolSelect from '#/views/mes/tm/tool/components/tm-tool-select.vue';
 import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
+import { WmBatchSelect } from '#/views/mes/wm/batch/components';
+import { UserSelect } from '#/views/system/user/components';
 
 import WmMaterialStockSelect from './../materialstock/components/wm-material-stock-select.vue';
 import { WmPackageSelect } from './../packages/components';
@@ -51,15 +54,31 @@ async function syncBizDetail(
   }
   let bizCode: string | undefined;
   let bizName: string | undefined;
-  if (bizType === BarcodeBizTypeEnum.STOCK) {
-    bizCode = item.itemCode;
-    bizName = item.itemName;
-  } else if (bizType === BarcodeBizTypeEnum.PACKAGE) {
-    bizCode = item.code;
-    bizName = item.clientName || item.code;
-  } else {
-    bizCode = item.code || item.username;
-    bizName = item.name || item.nickname;
+  switch (bizType) {
+    case BarcodeBizTypeEnum.BATCH: {
+      bizCode = item.code;
+      bizName = item.itemName || item.code;
+      break;
+    }
+    case BarcodeBizTypeEnum.PACKAGE: {
+      bizCode = item.code;
+      bizName = item.clientName || item.code;
+      break;
+    }
+    case BarcodeBizTypeEnum.PROCARD: {
+      bizCode = item.code;
+      bizName = item.workOrderName || item.code;
+      break;
+    }
+    case BarcodeBizTypeEnum.STOCK: {
+      bizCode = item.itemCode;
+      bizName = item.itemName;
+      break;
+    }
+    default: {
+      bizCode = item.code || item.username;
+      bizName = item.name || item.nickname;
+    }
   }
   // 先回填业务编码、名称并清空旧条码内容
   await formApi.setValues({ bizCode, bizName, content: undefined });
@@ -328,6 +347,45 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
       },
       rules: 'required',
     },
+    {
+      fieldName: 'bizId',
+      label: '批次',
+      component: markRaw(WmBatchSelect),
+      componentProps: {
+        onChange: (item: any) => syncBizDetail(formApi, item),
+      },
+      dependencies: {
+        triggerFields: ['bizType'],
+        show: (values) => values.bizType === BarcodeBizTypeEnum.BATCH,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'bizId',
+      label: '流转卡',
+      component: markRaw(ProCardSelect),
+      componentProps: {
+        onChange: (item: any) => syncBizDetail(formApi, item),
+      },
+      dependencies: {
+        triggerFields: ['bizType'],
+        show: (values) => values.bizType === BarcodeBizTypeEnum.PROCARD,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'bizId',
+      label: '人员',
+      component: markRaw(UserSelect),
+      componentProps: {
+        onChange: (item: any) => syncBizDetail(formApi, item),
+      },
+      dependencies: {
+        triggerFields: ['bizType'],
+        show: (values) => values.bizType === BarcodeBizTypeEnum.USER,
+      },
+      rules: 'required',
+    },
     {
       fieldName: 'bizId',
       label: '业务编号',
@@ -343,13 +401,16 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
           values.bizType !== undefined &&
           ![
             BarcodeBizTypeEnum.AREA,
+            BarcodeBizTypeEnum.BATCH,
             BarcodeBizTypeEnum.CLIENT,
             BarcodeBizTypeEnum.ITEM,
             BarcodeBizTypeEnum.LOCATION,
             BarcodeBizTypeEnum.MACHINERY,
             BarcodeBizTypeEnum.PACKAGE,
+            BarcodeBizTypeEnum.PROCARD,
             BarcodeBizTypeEnum.STOCK,
             BarcodeBizTypeEnum.TOOL,
+            BarcodeBizTypeEnum.USER,
             BarcodeBizTypeEnum.VENDOR,
             BarcodeBizTypeEnum.WAREHOUSE,
             BarcodeBizTypeEnum.WORKORDER,
diff --git a/apps/web-antd/src/views/mes/wm/batch/components/index.ts b/apps/web-antd/src/views/mes/wm/batch/components/index.ts
new file mode 100644
index 000000000..6d4a5d756
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/batch/components/index.ts
@@ -0,0 +1,2 @@
+export { default as WmBatchSelectDialog } from './wm-batch-select-dialog.vue';
+export { default as WmBatchSelect } from './wm-batch-select.vue';
diff --git a/apps/web-antd/src/views/mes/wm/batch/components/wm-batch-select-dialog.vue b/apps/web-antd/src/views/mes/wm/batch/components/wm-batch-select-dialog.vue
new file mode 100644
index 000000000..9d19931ab
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/batch/components/wm-batch-select-dialog.vue
@@ -0,0 +1,248 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmBatchApi } from '#/api/mes/wm/batch';
+
+import { computed, nextTick, ref } from 'vue';
+
+import { Alert, Button, message, Modal } from 'ant-design-vue';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getBatchPage } from '#/api/mes/wm/batch';
+
+import { useBatchSelectGridColumns, useBatchSelectGridFormSchema } from '../data';
+
+const emit = defineEmits<{
+  selected: [rows: MesWmBatchApi.Batch[]];
+}>();
+
+const open = ref(false); // 弹窗是否打开
+const multiple = ref(false); // 是否多选；默认按单选选择器使用
+const selectedRows = ref<MesWmBatchApi.Batch[]>([]); // 已选批次列表
+const preSelectedIds = ref<number[]>([]); // 预选批次编号列表
+const externalItemId = ref<number>(); // 外部传入的默认物料过滤
+const externalClientId = ref<number>(); // 外部传入的默认客户过滤
+const externalVendorId = ref<number>(); // 外部传入的默认供应商过滤
+const externalSalesOrderCode = ref<string>(); // 外部传入的默认销售订单过滤
+
+const filterTip = computed(() => {
+  const parts: string[] = [];
+  if (externalClientId.value != null) {
+    parts.push('客户');
+  }
+  if (externalVendorId.value != null) {
+    parts.push('供应商');
+  }
+  if (externalSalesOrderCode.value != null) {
+    parts.push('销售订单');
+  }
+  return parts.length > 0 ? `已按${parts.join('/')}预过滤` : '';
+});
+
+/** 获取多选记录，包含 VXE reserve 跨页记录 */
+function getMultipleSelectedRows() {
+  const selectedMap = new Map<number, MesWmBatchApi.Batch>();
+  const records = [
+    ...(gridApi.grid.getCheckboxReserveRecords?.() ?? []),
+    ...(gridApi.grid.getCheckboxRecords?.() ?? []),
+  ] as MesWmBatchApi.Batch[];
+  records.forEach((row) => {
+    const rowId = row.id;
+    if (rowId !== undefined) {
+      selectedMap.set(rowId, row);
+    }
+  });
+  return [...selectedMap.values()];
+}
+
+/** 处理多选勾选变化 */
+function handleCheckboxSelectChange() {
+  selectedRows.value = getMultipleSelectedRows();
+}
+
+/** 处理单选切换 */
+function handleRadioChange(row: MesWmBatchApi.Batch) {
+  selectedRows.value = [row];
+}
+
+/** 多选模式下切换行勾选 */
+async function toggleMultipleRow(row: MesWmBatchApi.Batch) {
+  const selected = gridApi.grid.isCheckedByCheckboxRow(row);
+  await gridApi.grid.setCheckboxRow(row, !selected);
+  selectedRows.value = getMultipleSelectedRows();
+}
+
+/** 处理行双击：单选直接确认，多选切换勾选 */
+async function handleCellDblclick({ row }: { row: MesWmBatchApi.Batch }) {
+  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 = gridApi.grid.getData() as MesWmBatchApi.Batch[];
+  for (const row of rows) {
+    if (row.id === undefined || !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: useBatchSelectGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useBatchSelectGridColumns(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 getBatchPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmBatchApi.Batch>,
+  gridEvents: {
+    cellDblclick: handleCellDblclick,
+    checkboxAll: handleCheckboxSelectChange,
+    checkboxChange: handleCheckboxSelectChange,
+    radioChange: ({ row }: { row: MesWmBatchApi.Batch }) => {
+      handleRadioChange(row);
+    },
+  },
+});
+
+/** 重置查询和选择状态，保留外部传入的默认过滤 */
+async function resetQueryState() {
+  selectedRows.value = [];
+  await gridApi.grid.clearCheckboxRow();
+  await gridApi.grid.clearCheckboxReserve();
+  await gridApi.grid.clearRadioRow();
+  await gridApi.formApi.resetForm();
+  if (externalItemId.value) {
+    await gridApi.formApi.setFieldValue('itemId', externalItemId.value);
+  }
+  if (externalClientId.value) {
+    await gridApi.formApi.setFieldValue('clientId', externalClientId.value);
+  }
+  if (externalVendorId.value) {
+    await gridApi.formApi.setFieldValue('vendorId', externalVendorId.value);
+  }
+  if (externalSalesOrderCode.value) {
+    await gridApi.formApi.setFieldValue(
+      'salesOrderCode',
+      externalSalesOrderCode.value,
+    );
+  }
+}
+
+/** 打开批次选择弹窗 */
+async function openModal(
+  selectedIds?: number[],
+  options?: {
+    clientId?: number;
+    itemId?: number;
+    multiple?: boolean;
+    salesOrderCode?: string;
+    vendorId?: number;
+  },
+) {
+  open.value = true;
+  multiple.value = options?.multiple ?? false;
+  preSelectedIds.value = selectedIds || [];
+  externalItemId.value = options?.itemId;
+  externalClientId.value = options?.clientId;
+  externalVendorId.value = options?.vendorId;
+  externalSalesOrderCode.value = options?.salesOrderCode;
+  await nextTick();
+  gridApi.setGridOptions({
+    columns: useBatchSelectGridColumns(multiple.value),
+  });
+  await resetQueryState();
+  await gridApi.query();
+  await nextTick();
+  await applyPreSelection();
+}
+
+/** 关闭批次选择弹窗 */
+function closeModal() {
+  open.value = false;
+}
+
+/** 确认选择批次 */
+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"
+  >
+    <Alert
+      v-if="filterTip"
+      :message="filterTip"
+      type="info"
+      show-icon
+      class="!mb-3"
+    />
+    <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/wm/batch/components/wm-batch-select.vue b/apps/web-antd/src/views/mes/wm/batch/components/wm-batch-select.vue
new file mode 100644
index 000000000..7464a6639
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/batch/components/wm-batch-select.vue
@@ -0,0 +1,147 @@
+<script lang="ts" setup>
+import type { MesWmBatchApi } from '#/api/mes/wm/batch';
+
+import { computed, ref, useAttrs, watch } from 'vue';
+
+import { IconifyIcon } from '@vben/icons';
+
+import { Input, Tooltip } from 'ant-design-vue';
+
+import { getBatch } from '#/api/mes/wm/batch';
+
+import WmBatchSelectDialog from './wm-batch-select-dialog.vue';
+
+defineOptions({ name: 'WmBatchSelect', inheritAttrs: false });
+
+const props = withDefaults(
+  defineProps<{
+    allowClear?: boolean;
+    clientId?: number; // 默认过滤的客户 ID
+    disabled?: boolean;
+    itemId?: number; // 默认过滤的物料 ID
+    modelValue?: number;
+    placeholder?: string;
+    salesOrderCode?: string; // 默认过滤的销售订单编号
+    vendorId?: number; // 默认过滤的供应商 ID
+  }>(),
+  {
+    allowClear: true,
+    clientId: undefined,
+    disabled: false,
+    itemId: undefined,
+    modelValue: undefined,
+    placeholder: '请选择批次',
+    salesOrderCode: undefined,
+    vendorId: undefined,
+  },
+);
+
+const emit = defineEmits<{
+  change: [item: MesWmBatchApi.Batch | undefined];
+  'update:modelValue': [value: number | undefined];
+}>();
+
+const attrs = useAttrs();
+const dialogRef = ref<InstanceType<typeof WmBatchSelectDialog>>();
+const hovering = ref(false);
+const selectedItem = ref<MesWmBatchApi.Batch>();
+
+const displayLabel = computed(() => selectedItem.value?.code ?? '');
+
+const showClear = computed(
+  () =>
+    props.allowClear &&
+    !props.disabled &&
+    hovering.value &&
+    props.modelValue != null,
+);
+
+/** 根据编号单条查询批次信息（用于编辑回显） */
+async function resolveItemById(id: number | undefined) {
+  if (id == null) {
+    selectedItem.value = undefined;
+    return;
+  }
+  if (selectedItem.value?.id === id) {
+    return;
+  }
+  selectedItem.value = await getBatch(id);
+}
+
+watch(() => props.modelValue, resolveItemById, { immediate: true });
+
+/** 清空已选批次 */
+function clearSelected() {
+  selectedItem.value = undefined;
+  emit('update:modelValue', undefined);
+  emit('change', undefined);
+}
+
+/** 打开批次选择弹窗 */
+function handleClick(event: MouseEvent) {
+  if (props.disabled) {
+    return;
+  }
+  const target = event.target as HTMLElement;
+  if (showClear.value && target.closest('.ant-input-suffix')) {
+    event.stopPropagation();
+    clearSelected();
+    return;
+  }
+  const selectedIds = props.modelValue == null ? [] : [props.modelValue];
+  dialogRef.value?.open(selectedIds, {
+    clientId: props.clientId,
+    itemId: props.itemId,
+    multiple: false,
+    salesOrderCode: props.salesOrderCode,
+    vendorId: props.vendorId,
+  });
+}
+
+/** 弹窗选中回调 */
+function handleSelected(rows: MesWmBatchApi.Batch[]) {
+  const item = rows[0];
+  if (!item) {
+    return;
+  }
+  selectedItem.value = item;
+  emit('update:modelValue', item.id);
+  emit('change', item);
+}
+</script>
+
+<template>
+  <div
+    v-bind="attrs"
+    class="w-full"
+    :class="disabled ? 'cursor-not-allowed' : 'cursor-pointer'"
+    @click="handleClick"
+    @mouseenter="hovering = true"
+    @mouseleave="hovering = false"
+  >
+    <Tooltip :mouse-enter-delay="0.5" :open="selectedItem ? undefined : false">
+      <template #title>
+        <div v-if="selectedItem" class="leading-6">
+          <div>批次编号：{{ selectedItem.code || '-' }}</div>
+          <div>物料编码：{{ selectedItem.itemCode || '-' }}</div>
+          <div>物料名称：{{ selectedItem.itemName || '-' }}</div>
+          <div>生产批号：{{ selectedItem.lotNumber || '-' }}</div>
+        </div>
+      </template>
+      <Input
+        :disabled="disabled"
+        :placeholder="placeholder"
+        :value="displayLabel"
+        readonly
+      >
+        <template #suffix>
+          <IconifyIcon
+            class="size-4"
+            :icon="showClear ? 'lucide:circle-x' : 'lucide:search'"
+          />
+        </template>
+      </Input>
+    </Tooltip>
+  </div>
+  <WmBatchSelectDialog ref="dialogRef" @selected="handleSelected" />
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/batch/data.ts b/apps/web-antd/src/views/mes/wm/batch/data.ts
new file mode 100644
index 000000000..74b0e3776
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/batch/data.ts
@@ -0,0 +1,234 @@
+import type { VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmBatchApi } from '#/api/mes/wm/batch';
+
+import { markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
+import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
+import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
+import { TmToolSelect } from '#/views/mes/tm/tool/components';
+
+/** 批次选择弹窗的搜索表单 */
+export function useBatchSelectGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '批次编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入批次编号',
+      },
+    },
+    {
+      fieldName: 'itemId',
+      label: '产品物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择产品物料',
+      },
+    },
+    {
+      fieldName: 'vendorId',
+      label: '供应商',
+      component: markRaw(MdVendorSelect),
+      componentProps: {
+        placeholder: '请选择供应商',
+      },
+    },
+    {
+      fieldName: 'clientId',
+      label: '客户',
+      component: markRaw(MdClientSelect),
+      componentProps: {
+        placeholder: '请选择客户',
+      },
+    },
+    {
+      fieldName: 'workOrderId',
+      label: '生产工单',
+      component: markRaw(ProWorkOrderSelect),
+      componentProps: {
+        placeholder: '请选择生产工单',
+      },
+    },
+    {
+      fieldName: 'workstationId',
+      label: '工作站',
+      component: markRaw(MdWorkstationSelect),
+      componentProps: {
+        placeholder: '请选择工作站',
+      },
+    },
+    {
+      fieldName: 'toolId',
+      label: '工具',
+      component: markRaw(TmToolSelect),
+      componentProps: {
+        placeholder: '请选择工具',
+      },
+    },
+    {
+      fieldName: 'salesOrderCode',
+      label: '销售订单编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入销售订单编号',
+      },
+    },
+    {
+      fieldName: 'purchaseOrderCode',
+      label: '采购订单编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入采购订单编号',
+      },
+    },
+    {
+      fieldName: 'lotNumber',
+      label: '生产批号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入生产批号',
+      },
+    },
+    {
+      fieldName: 'qualityStatus',
+      label: '质量状态',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_WM_QUALITY_STATUS, 'number'),
+        placeholder: '请选择质量状态',
+      },
+    },
+  ];
+}
+
+/** 批次选择弹窗的字段 */
+export function useBatchSelectGridColumns(
+  multiple = false,
+): VxeTableGridOptions<MesWmBatchApi.Batch>['columns'] {
+  return [
+    {
+      type: multiple ? 'checkbox' : 'radio',
+      width: 50,
+    },
+    {
+      field: 'code',
+      title: '批次编号',
+      width: 150,
+    },
+    {
+      field: 'itemCode',
+      title: '物料编码',
+      width: 150,
+    },
+    {
+      field: 'itemName',
+      title: '物料名称',
+      minWidth: 140,
+    },
+    {
+      field: 'itemSpecification',
+      title: '规格型号',
+      width: 120,
+    },
+    {
+      field: 'unitName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'vendorCode',
+      title: '供应商编码',
+      width: 120,
+    },
+    {
+      field: 'vendorName',
+      title: '供应商名称',
+      width: 120,
+    },
+    {
+      field: 'clientCode',
+      title: '客户编码',
+      width: 110,
+    },
+    {
+      field: 'clientName',
+      title: '客户名称',
+      width: 110,
+    },
+    {
+      field: 'salesOrderCode',
+      title: '销售订单编号',
+      width: 140,
+    },
+    {
+      field: 'purchaseOrderCode',
+      title: '采购订单编号',
+      width: 140,
+    },
+    {
+      field: 'workOrderCode',
+      title: '工单编码',
+      width: 140,
+    },
+    {
+      field: 'workstationCode',
+      title: '工作站编码',
+      width: 120,
+    },
+    {
+      field: 'taskCode',
+      title: '生产任务编号',
+      width: 140,
+    },
+    {
+      field: 'toolCode',
+      title: '工具编号',
+      width: 120,
+    },
+    {
+      field: 'lotNumber',
+      title: '生产批号',
+      width: 120,
+    },
+    {
+      field: 'qualityStatus',
+      title: '质量状态',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_QUALITY_STATUS },
+      },
+    },
+    {
+      field: 'produceDate',
+      title: '生产日期',
+      width: 120,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'expireDate',
+      title: '有效期',
+      width: 120,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'receiptDate',
+      title: '入库日期',
+      width: 120,
+      formatter: 'formatDate',
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/wm/outsourceissue/data.ts b/apps/web-antd/src/views/mes/wm/outsourceissue/data.ts
new file mode 100644
index 000000000..70da52788
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/outsourceissue/data.ts
@@ -0,0 +1,488 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProWorkOrderApi } from '#/api/mes/pro/workorder';
+import type { MesWmMaterialStockApi } from '#/api/mes/wm/materialstock';
+import type { MesWmOutsourceIssueApi } from '#/api/mes/wm/outsourceissue';
+import type { MesWmOutsourceIssueDetailApi } from '#/api/mes/wm/outsourceissue/detail';
+import type { MesWmOutsourceIssueLineApi } from '#/api/mes/wm/outsourceissue/line';
+
+import { h, markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+
+import { Button } from 'ant-design-vue';
+
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getRangePickerDefaultProps } from '#/utils';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
+import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
+import {
+  MesAutoCodeRuleCode,
+  MesProWorkOrderStatusEnum,
+  MesProWorkOrderTypeEnum,
+} from '#/views/mes/utils/constants';
+import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
+import {
+  WmWarehouseAreaSelect,
+  WmWarehouseLocationSelect,
+  WmWarehouseSelect,
+} from '#/views/mes/wm/warehouse/components';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'finish' | 'stock' | 'update';
+
+/** 表单头部是否只读（拣货、详情、领出态） */
+function isHeaderReadonly(formType: FormType): boolean {
+  return (
+    formType === 'detail' || formType === 'finish' || formType === 'stock'
+  );
+}
+
+/** 新增/修改的表单 */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'status',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '发料单编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入发料单编号',
+      },
+      rules: 'required',
+      suffix: isHeaderReadonly(formType)
+        ? undefined
+        : () =>
+            h(
+              Button,
+              {
+                type: 'default',
+                onClick: async () => {
+                  const code = await generateAutoCode(
+                    MesAutoCodeRuleCode.WM_OUTSOURCE_ISSUE_CODE,
+                  );
+                  await formApi?.setFieldValue('code', code);
+                },
+              },
+              { default: () => '生成' },
+            ),
+    },
+    {
+      fieldName: 'name',
+      label: '发料单名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入发料单名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'issueDate',
+      label: '发料日期',
+      component: 'DatePicker',
+      componentProps: {
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择发料日期',
+        valueFormat: 'x',
+      },
+    },
+    {
+      fieldName: 'workOrderId',
+      label: '外协工单',
+      component: markRaw(ProWorkOrderSelect),
+      componentProps: {
+        // 选择外协工单后，自动回填供应商
+        onChange: async (workOrder?: MesProWorkOrderApi.WorkOrder) => {
+          await formApi?.setFieldValue('vendorId', workOrder?.vendorId);
+        },
+        status: MesProWorkOrderStatusEnum.CONFIRMED,
+        type: MesProWorkOrderTypeEnum.OUTSOURCE,
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'vendorId',
+      label: '供应商',
+      component: markRaw(MdVendorSelect),
+      componentProps: {
+        placeholder: '请选择供应商',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '发料单编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入发料单编号',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '发料单名称',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入发料单名称',
+      },
+    },
+    {
+      fieldName: 'vendorId',
+      label: '供应商',
+      component: markRaw(MdVendorSelect),
+      componentProps: {
+        placeholder: '请选择供应商',
+      },
+    },
+    {
+      fieldName: 'issueDate',
+      label: '发料日期',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+        allowClear: true,
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesWmOutsourceIssueApi.OutsourceIssue>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '发料单编号',
+      minWidth: 160,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '发料单名称',
+      minWidth: 150,
+    },
+    {
+      field: 'workOrderCode',
+      title: '生产工单号',
+      minWidth: 140,
+    },
+    {
+      field: 'vendorName',
+      title: '供应商名称',
+      minWidth: 120,
+    },
+    {
+      field: 'issueDate',
+      title: '发料日期',
+      width: 180,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      minWidth: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_OUTSOURCE_ISSUE_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 240,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 发料单行子表的字段 */
+export function useLineGridColumns(
+  editable: boolean,
+  stockable: boolean,
+): VxeTableGridOptions<MesWmOutsourceIssueLineApi.OutsourceIssueLine>['columns'] {
+  return [
+    {
+      type: 'expand',
+      width: 48,
+      slots: { content: 'detail' },
+    },
+    {
+      field: 'itemCode',
+      title: '物料编码',
+      minWidth: 120,
+    },
+    {
+      field: 'itemName',
+      title: '物料名称',
+      minWidth: 140,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'quantity',
+      title: '领料数量',
+      width: 100,
+    },
+    {
+      field: 'batchCode',
+      title: '批次号',
+      minWidth: 120,
+    },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 150,
+    },
+    ...(editable || stockable
+      ? [
+          {
+            title: '操作',
+            width: 160,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 发料单行新增/修改的表单 */
+export function useLineFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择物料',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'quantity',
+      label: '发料数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入发料数量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入批次号',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 发料明细子表的字段 */
+export function useDetailGridColumns(
+  stockable: boolean,
+): VxeTableGridOptions<MesWmOutsourceIssueDetailApi.OutsourceIssueDetail>['columns'] {
+  return [
+    {
+      field: 'warehouseName',
+      title: '仓库名称',
+      minWidth: 100,
+    },
+    {
+      field: 'locationName',
+      title: '库区名称',
+      minWidth: 100,
+    },
+    {
+      field: 'areaName',
+      title: '库位名称',
+      minWidth: 100,
+    },
+    {
+      field: 'quantity',
+      title: '数量',
+      width: 100,
+    },
+    ...(stockable
+      ? [
+          {
+            title: '操作',
+            width: 120,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 发料明细新增/修改的表单 */
+export function useDetailFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'quantityMax',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'materialStockId',
+      label: '库存记录',
+      component: markRaw(WmMaterialStockSelect),
+      componentProps: {
+        // 选择库存记录后，自动回填仓库/库区/库位/批次/数量
+        onChange: async (stock?: MesWmMaterialStockApi.MaterialStock) => {
+          await formApi?.setValues({
+            areaId: stock?.areaId,
+            batchCode: stock?.batchCode,
+            batchId: stock?.batchId,
+            locationId: stock?.locationId,
+            quantity: stock?.quantity,
+            quantityMax: stock?.quantity,
+            warehouseId: stock?.warehouseId,
+          });
+        },
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['itemId'],
+        componentProps: (values) => ({
+          itemId: values.itemId,
+        }),
+      },
+    },
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'quantity',
+      label: '数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入数量',
+        precision: 2,
+      },
+      rules: 'required',
+      dependencies: {
+        triggerFields: ['quantityMax'],
+        componentProps: (values) => ({
+          class: '!w-full',
+          max: values.quantityMax,
+          min: 0,
+          placeholder: '请输入数量',
+          precision: 2,
+        }),
+      },
+    },
+    {
+      fieldName: 'warehouseId',
+      label: '发料仓库',
+      component: markRaw(WmWarehouseSelect),
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'locationId',
+      label: '库区',
+      component: markRaw(WmWarehouseLocationSelect),
+      componentProps: {
+        disabled: true,
+      },
+      dependencies: {
+        triggerFields: ['warehouseId'],
+        componentProps: (values) => ({
+          disabled: true,
+          warehouseId: values.warehouseId,
+        }),
+      },
+    },
+    {
+      fieldName: 'areaId',
+      label: '库位',
+      component: markRaw(WmWarehouseAreaSelect),
+      componentProps: {
+        disabled: true,
+      },
+      dependencies: {
+        triggerFields: ['locationId'],
+        componentProps: (values) => ({
+          disabled: true,
+          locationId: values.locationId,
+        }),
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+      },
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/system/dept/components/index.ts b/apps/web-antd/src/views/system/dept/components/index.ts
index 04d2b6145..5bd391a52 100644
--- a/apps/web-antd/src/views/system/dept/components/index.ts
+++ b/apps/web-antd/src/views/system/dept/components/index.ts
@@ -1 +1,2 @@
 export { default as DeptSelectModal } from './select-modal.vue';
+export { default as DeptTreeSelect } from './tree-select.vue';
diff --git a/apps/web-antd/src/views/system/user/modules/dept-tree.vue b/apps/web-antd/src/views/system/dept/components/tree-select.vue
similarity index 75%
rename from apps/web-antd/src/views/system/user/modules/dept-tree.vue
rename to apps/web-antd/src/views/system/dept/components/tree-select.vue
index d1b7fb0ec..423316014 100644
--- a/apps/web-antd/src/views/system/user/modules/dept-tree.vue
+++ b/apps/web-antd/src/views/system/dept/components/tree-select.vue
@@ -10,10 +10,16 @@ import { Input, Spin, Tree } from 'ant-design-vue';
 
 import { getSimpleDeptList } from '#/api/system/dept';
 
-const emit = defineEmits(['select']);
+defineOptions({ name: 'DeptTreeSelect' });
+
+const emit = defineEmits<{
+  select: [dept?: SystemDeptApi.Dept];
+}>();
+
 const deptList = ref<SystemDeptApi.Dept[]>([]); // 部门列表
 const deptTree = ref<any[]>([]); // 部门树
 const expandedKeys = ref<number[]>([]); // 展开的节点
+const selectedKeys = ref<number[]>([]); // 选中的节点
 const loading = ref(false); // 加载状态
 const searchValue = ref(''); // 搜索值
 
@@ -31,11 +37,21 @@ function handleSearch(e: any) {
   expandedKeys.value = deptTree.value.map((node) => node.id!);
 }
 
-/** 选中部门 */
+/** 选中部门：点击已选中的节点时取消选中 */
 function handleSelect(_selectedKeys: any[], info: any) {
-  emit('select', info.node.dataRef);
+  emit('select', info.selected ? info.node.dataRef : undefined);
 }
 
+/** 重置选中状态（供外部重置按钮调用） */
+function reset() {
+  searchValue.value = '';
+  selectedKeys.value = [];
+  deptTree.value = handleTree(deptList.value);
+  emit('select', undefined);
+}
+
+defineExpose({ reset });
+
 /** 初始化 */
 onMounted(async () => {
   try {
@@ -43,8 +59,6 @@ onMounted(async () => {
     const data = await getSimpleDeptList();
     deptList.value = data;
     deptTree.value = handleTree(data);
-  } catch (error) {
-    console.error('获取部门数据失败', error);
   } finally {
     loading.value = false;
   }
@@ -54,24 +68,25 @@ onMounted(async () => {
 <template>
   <div>
     <Input
-      placeholder="搜索部门"
-      allow-clear
       v-model:value="searchValue"
-      @change="handleSearch"
+      allow-clear
       class="w-full"
+      placeholder="搜索部门"
+      @change="handleSearch"
     >
       <template #prefix>
-        <IconifyIcon icon="lucide:search" class="size-4" />
+        <IconifyIcon class="size-4" icon="lucide:search" />
       </template>
     </Input>
     <Spin :spinning="loading" wrapper-class-name="w-full">
       <Tree
-        @select="handleSelect"
         v-if="deptTree.length > 0"
+        v-model:selected-keys="selectedKeys"
         class="pt-2"
-        :tree-data="deptTree"
         :default-expand-all="true"
         :field-names="{ title: 'name', key: 'id', children: 'children' }"
+        :tree-data="deptTree"
+        @select="handleSelect"
       />
       <div v-else-if="!loading" class="py-4 text-center text-gray-500">
         暂无数据
diff --git a/apps/web-antd/src/views/system/user/components/index.ts b/apps/web-antd/src/views/system/user/components/index.ts
index 9f00ad117..fb54c1665 100644
--- a/apps/web-antd/src/views/system/user/components/index.ts
+++ b/apps/web-antd/src/views/system/user/components/index.ts
@@ -1 +1,3 @@
+export { default as UserSelectDialog } from './select-dialog.vue';
 export { default as UserSelectModal } from './select-modal.vue';
+export { default as UserSelect } from './select.vue';
diff --git a/apps/web-antd/src/views/system/user/components/select-dialog.vue b/apps/web-antd/src/views/system/user/components/select-dialog.vue
new file mode 100644
index 000000000..0f09f6c9d
--- /dev/null
+++ b/apps/web-antd/src/views/system/user/components/select-dialog.vue
@@ -0,0 +1,305 @@
+<script lang="ts" setup>
+import type { VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { SystemDeptApi } from '#/api/system/dept';
+import type { SystemUserApi } from '#/api/system/user';
+
+import { nextTick, ref } from 'vue';
+
+import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { Button, Col, message, Modal, Row } from 'ant-design-vue';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getUserPage } from '#/api/system/user';
+import { DeptTreeSelect } from '#/views/system/dept/components';
+
+const emit = defineEmits<{
+  selected: [rows: SystemUserApi.User[]];
+}>();
+
+const open = ref(false); // 弹窗是否打开
+const multiple = ref(false); // 是否多选；默认按单选选择器使用
+const selectedRows = ref<SystemUserApi.User[]>([]); // 已选用户列表
+const preSelectedIds = ref<number[]>([]); // 预选用户编号列表
+const deptId = ref<number>(); // 当前部门过滤
+const deptTreeRef = ref<InstanceType<typeof DeptTreeSelect>>(); // 部门树
+
+/** 用户选择弹窗的搜索表单 */
+function useUserSelectGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'username',
+      label: '用户名称',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入用户名称',
+      },
+    },
+    {
+      fieldName: 'nickname',
+      label: '用户昵称',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入用户昵称',
+      },
+    },
+    {
+      fieldName: 'mobile',
+      label: '手机号码',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入手机号码',
+      },
+    },
+    {
+      fieldName: 'status',
+      label: '状态',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+        placeholder: '请选择状态',
+      },
+    },
+  ];
+}
+
+/** 用户选择弹窗的字段 */
+function useUserSelectGridColumns(
+  isMultiple = false,
+): VxeTableGridOptions<SystemUserApi.User>['columns'] {
+  return [
+    {
+      type: isMultiple ? 'checkbox' : 'radio',
+      width: 50,
+    },
+    {
+      field: 'id',
+      title: '用户编号',
+      width: 120,
+    },
+    {
+      field: 'username',
+      title: '用户名称',
+      width: 150,
+    },
+    {
+      field: 'nickname',
+      title: '用户昵称',
+      minWidth: 150,
+    },
+    {
+      field: 'mobile',
+      title: '手机号码',
+      width: 130,
+    },
+    {
+      field: 'status',
+      title: '状态',
+      width: 90,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.COMMON_STATUS },
+      },
+    },
+  ];
+}
+
+/** 获取多选记录，包含 VXE reserve 跨页记录 */
+function getMultipleSelectedRows() {
+  const selectedMap = new Map<number, SystemUserApi.User>();
+  const records = [
+    ...(gridApi.grid.getCheckboxReserveRecords?.() ?? []),
+    ...(gridApi.grid.getCheckboxRecords?.() ?? []),
+  ] as SystemUserApi.User[];
+  records.forEach((row) => {
+    const rowId = row.id;
+    if (rowId !== undefined) {
+      selectedMap.set(rowId, row);
+    }
+  });
+  return [...selectedMap.values()];
+}
+
+/** 处理多选勾选变化 */
+function handleCheckboxSelectChange() {
+  selectedRows.value = getMultipleSelectedRows();
+}
+
+/** 处理单选切换 */
+function handleRadioChange(row: SystemUserApi.User) {
+  selectedRows.value = [row];
+}
+
+/** 多选模式下切换行勾选 */
+async function toggleMultipleRow(row: SystemUserApi.User) {
+  const selected = gridApi.grid.isCheckedByCheckboxRow(row);
+  await gridApi.grid.setCheckboxRow(row, !selected);
+  selectedRows.value = getMultipleSelectedRows();
+}
+
+/** 处理行双击：单选直接确认，多选切换勾选 */
+async function handleCellDblclick({ row }: { row: SystemUserApi.User }) {
+  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 = gridApi.grid.getData() as SystemUserApi.User[];
+  for (const row of rows) {
+    if (row.id === undefined || !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: useUserSelectGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useUserSelectGridColumns(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 getUserPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            deptId: deptId.value,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<SystemUserApi.User>,
+  gridEvents: {
+    cellDblclick: handleCellDblclick,
+    checkboxAll: handleCheckboxSelectChange,
+    checkboxChange: handleCheckboxSelectChange,
+    radioChange: ({ row }: { row: SystemUserApi.User }) => {
+      handleRadioChange(row);
+    },
+  },
+});
+
+/** 部门树节点点击 */
+function handleDeptNodeClick(dept?: SystemDeptApi.Dept) {
+  deptId.value = dept?.id;
+  gridApi.query();
+}
+
+/** 重置查询和选择状态 */
+async function resetQueryState() {
+  selectedRows.value = [];
+  deptId.value = undefined;
+  await gridApi.grid.clearCheckboxRow();
+  await gridApi.grid.clearCheckboxReserve();
+  await gridApi.grid.clearRadioRow();
+  await gridApi.formApi.resetForm();
+  deptTreeRef.value?.reset();
+}
+
+/** 打开用户选择弹窗 */
+async function openModal(
+  selectedIds?: number[],
+  options?: { multiple?: boolean },
+) {
+  open.value = true;
+  multiple.value = options?.multiple ?? false;
+  preSelectedIds.value = selectedIds || [];
+  await nextTick();
+  gridApi.setGridOptions({
+    columns: useUserSelectGridColumns(multiple.value),
+  });
+  await resetQueryState();
+  await gridApi.formApi.setFieldValue('status', CommonStatusEnum.ENABLE);
+  await gridApi.query();
+  await nextTick();
+  await applyPreSelection();
+}
+
+/** 关闭用户选择弹窗 */
+function closeModal() {
+  open.value = false;
+}
+
+/** 确认选择用户 */
+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"
+  >
+    <Row :gutter="12">
+      <Col :span="5">
+        <DeptTreeSelect ref="deptTreeRef" @select="handleDeptNodeClick" />
+      </Col>
+      <Col :span="19">
+        <Grid table-title="用户列表" />
+      </Col>
+    </Row>
+    <template #footer>
+      <Button @click="closeModal">取消</Button>
+      <Button type="primary" @click="handleConfirm">确定</Button>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/system/user/components/select.vue b/apps/web-antd/src/views/system/user/components/select.vue
new file mode 100644
index 000000000..23f9d8bdf
--- /dev/null
+++ b/apps/web-antd/src/views/system/user/components/select.vue
@@ -0,0 +1,134 @@
+<script lang="ts" setup>
+import type { SystemUserApi } from '#/api/system/user';
+
+import { computed, ref, useAttrs, watch } from 'vue';
+
+import { IconifyIcon } from '@vben/icons';
+
+import { Input, Tooltip } from 'ant-design-vue';
+
+import { getUser } from '#/api/system/user';
+
+import UserSelectDialog from './select-dialog.vue';
+
+defineOptions({ name: 'UserSelect', inheritAttrs: false });
+
+const props = withDefaults(
+  defineProps<{
+    allowClear?: boolean;
+    disabled?: boolean;
+    modelValue?: number;
+    placeholder?: string;
+  }>(),
+  {
+    allowClear: true,
+    disabled: false,
+    modelValue: undefined,
+    placeholder: '请选择用户',
+  },
+);
+
+const emit = defineEmits<{
+  change: [item: SystemUserApi.User | undefined];
+  'update:modelValue': [value: number | undefined];
+}>();
+
+const attrs = useAttrs();
+const dialogRef = ref<InstanceType<typeof UserSelectDialog>>();
+const hovering = ref(false);
+const selectedItem = ref<SystemUserApi.User>();
+
+const displayLabel = computed(
+  () => selectedItem.value?.nickname ?? selectedItem.value?.username ?? '',
+);
+
+const showClear = computed(
+  () =>
+    props.allowClear &&
+    !props.disabled &&
+    hovering.value &&
+    props.modelValue != null,
+);
+
+/** 根据编号单条查询用户信息（用于编辑回显） */
+async function resolveItemById(id: number | undefined) {
+  if (id == null) {
+    selectedItem.value = undefined;
+    return;
+  }
+  if (selectedItem.value?.id === id) {
+    return;
+  }
+  selectedItem.value = await getUser(id);
+}
+
+watch(() => props.modelValue, resolveItemById, { immediate: true });
+
+/** 清空已选用户 */
+function clearSelected() {
+  selectedItem.value = undefined;
+  emit('update:modelValue', undefined);
+  emit('change', undefined);
+}
+
+/** 打开用户选择弹窗 */
+function handleClick(event: MouseEvent) {
+  if (props.disabled) {
+    return;
+  }
+  const target = event.target as HTMLElement;
+  if (showClear.value && target.closest('.ant-input-suffix')) {
+    event.stopPropagation();
+    clearSelected();
+    return;
+  }
+  const selectedIds = props.modelValue == null ? [] : [props.modelValue];
+  dialogRef.value?.open(selectedIds, { multiple: false });
+}
+
+/** 弹窗选中回调 */
+function handleSelected(rows: SystemUserApi.User[]) {
+  const item = rows[0];
+  if (!item) {
+    return;
+  }
+  selectedItem.value = item;
+  emit('update:modelValue', item.id);
+  emit('change', item);
+}
+</script>
+
+<template>
+  <div
+    v-bind="attrs"
+    class="w-full"
+    :class="disabled ? 'cursor-not-allowed' : 'cursor-pointer'"
+    @click="handleClick"
+    @mouseenter="hovering = true"
+    @mouseleave="hovering = false"
+  >
+    <Tooltip :mouse-enter-delay="0.5" :open="selectedItem ? undefined : false">
+      <template #title>
+        <div v-if="selectedItem" class="leading-6">
+          <div>用户名称：{{ selectedItem.username || '-' }}</div>
+          <div>用户昵称：{{ selectedItem.nickname || '-' }}</div>
+          <div>手机号码：{{ selectedItem.mobile || '-' }}</div>
+        </div>
+      </template>
+      <Input
+        :disabled="disabled"
+        :placeholder="placeholder"
+        :value="displayLabel"
+        readonly
+      >
+        <template #suffix>
+          <IconifyIcon
+            class="size-4"
+            :icon="showClear ? 'lucide:circle-x' : 'lucide:search'"
+          />
+        </template>
+      </Input>
+    </Tooltip>
+  </div>
+  <UserSelectDialog ref="dialogRef" @selected="handleSelected" />
+</template>
diff --git a/apps/web-antd/src/views/system/user/index.vue b/apps/web-antd/src/views/system/user/index.vue
index 0f00777aa..e97b0716a 100644
--- a/apps/web-antd/src/views/system/user/index.vue
+++ b/apps/web-antd/src/views/system/user/index.vue
@@ -21,10 +21,10 @@ import {
   updateUserStatus,
 } from '#/api/system/user';
 import { $t } from '#/locales';
+import { DeptTreeSelect } from '#/views/system/dept/components';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import AssignRoleForm from './modules/assign-role-form.vue';
-import DeptTree from './modules/dept-tree.vue';
 import Form from './modules/form.vue';
 import ImportForm from './modules/import-form.vue';
 import ResetPasswordForm from './modules/reset-password-form.vue';
@@ -62,8 +62,8 @@ async function handleExport() {
 
 /** 选择部门 */
 const searchDeptId = ref<number | undefined>(undefined);
-async function handleDeptSelect(dept: SystemDeptApi.Dept) {
-  searchDeptId.value = dept.id;
+async function handleDeptSelect(dept?: SystemDeptApi.Dept) {
+  searchDeptId.value = dept?.id;
   handleRefresh();
 }
 
@@ -205,7 +205,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     <div class="flex h-full w-full">
       <!-- 左侧部门树 -->
       <Card class="mr-4 h-full w-1/6">
-        <DeptTree @select="handleDeptSelect" />
+        <DeptTreeSelect @select="handleDeptSelect" />
       </Card>
       <!-- 右侧用户列表 -->
       <div class="w-5/6">
diff --git a/apps/web-ele/src/api/mes/pro/workorder/index.ts b/apps/web-ele/src/api/mes/pro/workorder/index.ts
index fcc22b79e..24de7d057 100644
--- a/apps/web-ele/src/api/mes/pro/workorder/index.ts
+++ b/apps/web-ele/src/api/mes/pro/workorder/index.ts
@@ -21,6 +21,8 @@ export namespace MesProWorkOrderApi {
     routeName?: string;
     clientId?: number;
     clientName?: string;
+    vendorId?: number; // 供应商编号
+    vendorName?: string; // 供应商名称
     planStartTime?: number | string;
     planEndTime?: number | string;
     actualStartTime?: number | string;
diff --git a/apps/web-ele/src/api/mes/wm/outsourceissue/detail/index.ts b/apps/web-ele/src/api/mes/wm/outsourceissue/detail/index.ts
new file mode 100644
index 000000000..15b50b6a6
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/outsourceissue/detail/index.ts
@@ -0,0 +1,60 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesWmOutsourceIssueDetailApi {
+  /** MES 外协发料单明细 */
+  export interface OutsourceIssueDetail {
+    id?: number; // 明细编号
+    lineId?: number; // 行编号
+    issueId?: number; // 发料单编号
+    itemId?: number; // 物料编号
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    specification?: string; // 规格型号
+    unitMeasureName?: string; // 计量单位名称
+    quantity?: number; // 数量
+    materialStockId?: number; // 库存编号
+    batchId?: number; // 批次编号
+    batchCode?: string; // 批次编码
+    warehouseId?: number; // 仓库编号
+    warehouseName?: string; // 仓库名称
+    locationId?: number; // 库区编号
+    locationName?: string; // 库区名称
+    areaId?: number; // 库位编号
+    areaName?: string; // 库位名称
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询外协发料单明细列表 */
+export function getOutsourceIssueDetailListByLineId(lineId: number) {
+  return requestClient.get<
+    MesWmOutsourceIssueDetailApi.OutsourceIssueDetail[]
+  >('/mes/wm/outsource-issue-detail/list-by-line', { params: { lineId } });
+}
+
+/** 查询外协发料单明细详情 */
+export function getOutsourceIssueDetail(id: number) {
+  return requestClient.get<MesWmOutsourceIssueDetailApi.OutsourceIssueDetail>(
+    `/mes/wm/outsource-issue-detail/get?id=${id}`,
+  );
+}
+
+/** 新增外协发料单明细 */
+export function createOutsourceIssueDetail(
+  data: MesWmOutsourceIssueDetailApi.OutsourceIssueDetail,
+) {
+  return requestClient.post('/mes/wm/outsource-issue-detail/create', data);
+}
+
+/** 修改外协发料单明细 */
+export function updateOutsourceIssueDetail(
+  data: MesWmOutsourceIssueDetailApi.OutsourceIssueDetail,
+) {
+  return requestClient.put('/mes/wm/outsource-issue-detail/update', data);
+}
+
+/** 删除外协发料单明细 */
+export function deleteOutsourceIssueDetail(id: number) {
+  return requestClient.delete(`/mes/wm/outsource-issue-detail/delete?id=${id}`);
+}
diff --git a/apps/web-ele/src/api/mes/wm/outsourceissue/index.ts b/apps/web-ele/src/api/mes/wm/outsourceissue/index.ts
new file mode 100644
index 000000000..8b3b94b75
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/outsourceissue/index.ts
@@ -0,0 +1,90 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmOutsourceIssueApi {
+  /** MES 外协发料单 */
+  export interface OutsourceIssue {
+    id?: number; // 发料单编号
+    code?: string; // 发料单编号
+    name?: string; // 发料单名称
+    vendorId?: number; // 供应商编号
+    vendorCode?: string; // 供应商编码
+    vendorName?: string; // 供应商名称
+    workOrderId?: number; // 生产工单编号
+    workOrderCode?: string; // 生产工单编码
+    workOrderName?: string; // 生产工单名称
+    issueDate?: number; // 发料日期
+    status?: number; // 单据状态
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询外协发料单分页 */
+export function getOutsourceIssuePage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmOutsourceIssueApi.OutsourceIssue>>(
+    '/mes/wm/outsource-issue/page',
+    { params },
+  );
+}
+
+/** 查询外协发料单详情 */
+export function getOutsourceIssue(id: number) {
+  return requestClient.get<MesWmOutsourceIssueApi.OutsourceIssue>(
+    `/mes/wm/outsource-issue/get?id=${id}`,
+  );
+}
+
+/** 新增外协发料单 */
+export function createOutsourceIssue(
+  data: MesWmOutsourceIssueApi.OutsourceIssue,
+) {
+  return requestClient.post<number>('/mes/wm/outsource-issue/create', data);
+}
+
+/** 修改外协发料单 */
+export function updateOutsourceIssue(
+  data: MesWmOutsourceIssueApi.OutsourceIssue,
+) {
+  return requestClient.put('/mes/wm/outsource-issue/update', data);
+}
+
+/** 删除外协发料单 */
+export function deleteOutsourceIssue(id: number) {
+  return requestClient.delete(`/mes/wm/outsource-issue/delete?id=${id}`);
+}
+
+/** 提交外协发料单 */
+export function submitOutsourceIssue(id: number) {
+  return requestClient.put(`/mes/wm/outsource-issue/submit?id=${id}`);
+}
+
+/** 执行拣货 */
+export function stockOutsourceIssue(id: number) {
+  return requestClient.put(`/mes/wm/outsource-issue/stock?id=${id}`);
+}
+
+/** 执行领出 */
+export function finishOutsourceIssue(id: number) {
+  return requestClient.put(`/mes/wm/outsource-issue/finish?id=${id}`);
+}
+
+/** 取消外协发料单 */
+export function cancelOutsourceIssue(id: number) {
+  return requestClient.put(`/mes/wm/outsource-issue/cancel?id=${id}`);
+}
+
+/** 校验外协发料单拣货数量是否与发料数量一致 */
+export function checkOutsourceIssueQuantity(id: number) {
+  return requestClient.get<boolean>(
+    `/mes/wm/outsource-issue/check-quantity?id=${id}`,
+  );
+}
+
+/** 导出外协发料单 */
+export function exportOutsourceIssue(params: any) {
+  return requestClient.download('/mes/wm/outsource-issue/export-excel', {
+    params,
+  });
+}
diff --git a/apps/web-ele/src/api/mes/wm/outsourceissue/line/index.ts b/apps/web-ele/src/api/mes/wm/outsourceissue/line/index.ts
new file mode 100644
index 000000000..68fae8f95
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/outsourceissue/line/index.ts
@@ -0,0 +1,55 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmOutsourceIssueLineApi {
+  /** MES 外协发料单行 */
+  export interface OutsourceIssueLine {
+    id?: number; // 行编号
+    issueId?: number; // 发料单编号
+    itemId?: number; // 物料编号
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    specification?: string; // 规格型号
+    unitMeasureName?: string; // 计量单位名称
+    quantity?: number; // 发料数量
+    materialStockId?: number; // 库存编号
+    batchId?: number; // 批次编号
+    batchCode?: string; // 批次编码
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询外协发料单行分页 */
+export function getOutsourceIssueLinePage(params: PageParam) {
+  return requestClient.get<
+    PageResult<MesWmOutsourceIssueLineApi.OutsourceIssueLine>
+  >('/mes/wm/outsource-issue-line/page', { params });
+}
+
+/** 查询外协发料单行详情 */
+export function getOutsourceIssueLine(id: number) {
+  return requestClient.get<MesWmOutsourceIssueLineApi.OutsourceIssueLine>(
+    `/mes/wm/outsource-issue-line/get?id=${id}`,
+  );
+}
+
+/** 新增外协发料单行 */
+export function createOutsourceIssueLine(
+  data: MesWmOutsourceIssueLineApi.OutsourceIssueLine,
+) {
+  return requestClient.post('/mes/wm/outsource-issue-line/create', data);
+}
+
+/** 修改外协发料单行 */
+export function updateOutsourceIssueLine(
+  data: MesWmOutsourceIssueLineApi.OutsourceIssueLine,
+) {
+  return requestClient.put('/mes/wm/outsource-issue-line/update', data);
+}
+
+/** 删除外协发料单行 */
+export function deleteOutsourceIssueLine(id: number) {
+  return requestClient.delete(`/mes/wm/outsource-issue-line/delete?id=${id}`);
+}
diff --git a/apps/web-ele/src/api/mes/wm/outsourcereceipt/detail/index.ts b/apps/web-ele/src/api/mes/wm/outsourcereceipt/detail/index.ts
new file mode 100644
index 000000000..645fa7ad3
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/outsourcereceipt/detail/index.ts
@@ -0,0 +1,61 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesWmOutsourceReceiptDetailApi {
+  /** MES 外协入库单明细 */
+  export interface OutsourceReceiptDetail {
+    id?: number; // 明细编号
+    lineId?: number; // 行编号
+    receiptId?: number; // 入库单编号
+    itemId?: number; // 物料编号
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    specification?: string; // 规格型号
+    unitMeasureName?: string; // 计量单位名称
+    quantity?: number; // 上架数量
+    batchId?: number; // 批次编号
+    batchCode?: string; // 批次编码
+    warehouseId?: number; // 仓库编号
+    warehouseName?: string; // 仓库名称
+    locationId?: number; // 库区编号
+    locationName?: string; // 库区名称
+    areaId?: number; // 库位编号
+    areaName?: string; // 库位名称
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询外协入库单明细列表 */
+export function getOutsourceReceiptDetailListByLineId(lineId: number) {
+  return requestClient.get<
+    MesWmOutsourceReceiptDetailApi.OutsourceReceiptDetail[]
+  >('/mes/wm/outsource-receipt-detail/list-by-line', { params: { lineId } });
+}
+
+/** 查询外协入库单明细详情 */
+export function getOutsourceReceiptDetail(id: number) {
+  return requestClient.get<MesWmOutsourceReceiptDetailApi.OutsourceReceiptDetail>(
+    `/mes/wm/outsource-receipt-detail/get?id=${id}`,
+  );
+}
+
+/** 新增外协入库单明细 */
+export function createOutsourceReceiptDetail(
+  data: MesWmOutsourceReceiptDetailApi.OutsourceReceiptDetail,
+) {
+  return requestClient.post('/mes/wm/outsource-receipt-detail/create', data);
+}
+
+/** 修改外协入库单明细 */
+export function updateOutsourceReceiptDetail(
+  data: MesWmOutsourceReceiptDetailApi.OutsourceReceiptDetail,
+) {
+  return requestClient.put('/mes/wm/outsource-receipt-detail/update', data);
+}
+
+/** 删除外协入库单明细 */
+export function deleteOutsourceReceiptDetail(id: number) {
+  return requestClient.delete(
+    `/mes/wm/outsource-receipt-detail/delete?id=${id}`,
+  );
+}
diff --git a/apps/web-ele/src/api/mes/wm/outsourcereceipt/index.ts b/apps/web-ele/src/api/mes/wm/outsourcereceipt/index.ts
new file mode 100644
index 000000000..730b2f8b9
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/outsourcereceipt/index.ts
@@ -0,0 +1,81 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmOutsourceReceiptApi {
+  /** MES 外协入库单 */
+  export interface OutsourceReceipt {
+    id?: number; // 入库单编号
+    code?: string; // 入库单编码
+    name?: string; // 入库单名称
+    workOrderId?: number; // 外协工单编号
+    workOrderCode?: string; // 外协工单编码
+    vendorId?: number; // 供应商编号
+    vendorName?: string; // 供应商名称
+    receiptDate?: number; // 入库日期
+    status?: number; // 单据状态
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询外协入库单分页 */
+export function getOutsourceReceiptPage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmOutsourceReceiptApi.OutsourceReceipt>>(
+    '/mes/wm/outsource-receipt/page',
+    { params },
+  );
+}
+
+/** 查询外协入库单详情 */
+export function getOutsourceReceipt(id: number) {
+  return requestClient.get<MesWmOutsourceReceiptApi.OutsourceReceipt>(
+    `/mes/wm/outsource-receipt/get?id=${id}`,
+  );
+}
+
+/** 新增外协入库单 */
+export function createOutsourceReceipt(
+  data: MesWmOutsourceReceiptApi.OutsourceReceipt,
+) {
+  return requestClient.post<number>('/mes/wm/outsource-receipt/create', data);
+}
+
+/** 修改外协入库单 */
+export function updateOutsourceReceipt(
+  data: MesWmOutsourceReceiptApi.OutsourceReceipt,
+) {
+  return requestClient.put('/mes/wm/outsource-receipt/update', data);
+}
+
+/** 删除外协入库单 */
+export function deleteOutsourceReceipt(id: number) {
+  return requestClient.delete(`/mes/wm/outsource-receipt/delete?id=${id}`);
+}
+
+/** 提交外协入库单 */
+export function submitOutsourceReceipt(id: number) {
+  return requestClient.put(`/mes/wm/outsource-receipt/submit?id=${id}`);
+}
+
+/** 执行上架 */
+export function stockOutsourceReceipt(id: number) {
+  return requestClient.put(`/mes/wm/outsource-receipt/stock?id=${id}`);
+}
+
+/** 完成入库 */
+export function finishOutsourceReceipt(id: number) {
+  return requestClient.put(`/mes/wm/outsource-receipt/finish?id=${id}`);
+}
+
+/** 取消外协入库单 */
+export function cancelOutsourceReceipt(id: number) {
+  return requestClient.put(`/mes/wm/outsource-receipt/cancel?id=${id}`);
+}
+
+/** 导出外协入库单 */
+export function exportOutsourceReceipt(params: any) {
+  return requestClient.download('/mes/wm/outsource-receipt/export-excel', {
+    params,
+  });
+}
diff --git a/apps/web-ele/src/api/mes/wm/outsourcereceipt/line/index.ts b/apps/web-ele/src/api/mes/wm/outsourcereceipt/line/index.ts
new file mode 100644
index 000000000..fd5c0ce46
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/outsourcereceipt/line/index.ts
@@ -0,0 +1,58 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmOutsourceReceiptLineApi {
+  /** MES 外协入库单行 */
+  export interface OutsourceReceiptLine {
+    id?: number; // 行编号
+    receiptId?: number; // 入库单编号
+    itemId?: number; // 物料编号
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    specification?: string; // 规格型号
+    unitMeasureName?: string; // 计量单位名称
+    quantity?: number; // 入库数量
+    batchId?: number; // 批次编号
+    batchCode?: string; // 批次编码
+    productionDate?: number; // 生产日期
+    expireDate?: number; // 有效期
+    lotNumber?: string; // 生产批号
+    iqcCheckFlag?: boolean; // 是否需要质检
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询外协入库单行分页 */
+export function getOutsourceReceiptLinePage(params: PageParam) {
+  return requestClient.get<
+    PageResult<MesWmOutsourceReceiptLineApi.OutsourceReceiptLine>
+  >('/mes/wm/outsource-receipt-line/page', { params });
+}
+
+/** 查询外协入库单行详情 */
+export function getOutsourceReceiptLine(id: number) {
+  return requestClient.get<MesWmOutsourceReceiptLineApi.OutsourceReceiptLine>(
+    `/mes/wm/outsource-receipt-line/get?id=${id}`,
+  );
+}
+
+/** 新增外协入库单行 */
+export function createOutsourceReceiptLine(
+  data: MesWmOutsourceReceiptLineApi.OutsourceReceiptLine,
+) {
+  return requestClient.post('/mes/wm/outsource-receipt-line/create', data);
+}
+
+/** 修改外协入库单行 */
+export function updateOutsourceReceiptLine(
+  data: MesWmOutsourceReceiptLineApi.OutsourceReceiptLine,
+) {
+  return requestClient.put('/mes/wm/outsource-receipt-line/update', data);
+}
+
+/** 删除外协入库单行 */
+export function deleteOutsourceReceiptLine(id: number) {
+  return requestClient.delete(`/mes/wm/outsource-receipt-line/delete?id=${id}`);
+}
diff --git a/apps/web-ele/src/views/mes/pro/card/components/index.ts b/apps/web-ele/src/views/mes/pro/card/components/index.ts
new file mode 100644
index 000000000..8092d6cb7
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/card/components/index.ts
@@ -0,0 +1,2 @@
+export { default as ProCardSelectDialog } from './pro-card-select-dialog.vue';
+export { default as ProCardSelect } from './pro-card-select.vue';
diff --git a/apps/web-ele/src/views/mes/pro/card/components/pro-card-select-dialog.vue b/apps/web-ele/src/views/mes/pro/card/components/pro-card-select-dialog.vue
new file mode 100644
index 000000000..b4d295578
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/card/components/pro-card-select-dialog.vue
@@ -0,0 +1,191 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProCardApi } from '#/api/mes/pro/card';
+
+import { nextTick, ref } from 'vue';
+
+import { ElButton, ElDialog, ElMessage } from 'element-plus';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getCardPage } from '#/api/mes/pro/card';
+
+import { useCardSelectGridColumns, useCardSelectGridFormSchema } from '../data';
+
+const emit = defineEmits<{
+  selected: [rows: MesProCardApi.Card[]];
+}>();
+
+const open = ref(false); // 弹窗是否打开
+const multiple = ref(false); // 是否多选；默认按单选选择器使用
+const selectedRows = ref<MesProCardApi.Card[]>([]); // 已选流转卡列表
+const preSelectedIds = ref<number[]>([]); // 预选流转卡编号列表
+
+/** 获取多选记录，包含 VXE reserve 跨页记录 */
+function getMultipleSelectedRows() {
+  const selectedMap = new Map<number, MesProCardApi.Card>();
+  const records = [
+    ...(gridApi.grid.getCheckboxReserveRecords?.() ?? []),
+    ...(gridApi.grid.getCheckboxRecords?.() ?? []),
+  ] as MesProCardApi.Card[];
+  records.forEach((row) => {
+    const rowId = row.id;
+    if (rowId !== undefined) {
+      selectedMap.set(rowId, row);
+    }
+  });
+  return [...selectedMap.values()];
+}
+
+/** 处理多选勾选变化 */
+function handleCheckboxSelectChange() {
+  selectedRows.value = getMultipleSelectedRows();
+}
+
+/** 处理单选切换 */
+function handleRadioChange(row: MesProCardApi.Card) {
+  selectedRows.value = [row];
+}
+
+/** 多选模式下切换行勾选 */
+async function toggleMultipleRow(row: MesProCardApi.Card) {
+  const selected = gridApi.grid.isCheckedByCheckboxRow(row);
+  await gridApi.grid.setCheckboxRow(row, !selected);
+  selectedRows.value = getMultipleSelectedRows();
+}
+
+/** 处理行双击：单选直接确认，多选切换勾选 */
+async function handleCellDblclick({ row }: { row: MesProCardApi.Card }) {
+  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 = gridApi.grid.getData() as MesProCardApi.Card[];
+  for (const row of rows) {
+    if (row.id === undefined || !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: useCardSelectGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useCardSelectGridColumns(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 getCardPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesProCardApi.Card>,
+  gridEvents: {
+    cellDblclick: handleCellDblclick,
+    checkboxAll: handleCheckboxSelectChange,
+    checkboxChange: handleCheckboxSelectChange,
+    radioChange: ({ row }: { row: MesProCardApi.Card }) => {
+      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: useCardSelectGridColumns(multiple.value),
+  });
+  await resetQueryState();
+  await gridApi.query();
+  await nextTick();
+  await applyPreSelection();
+}
+
+/** 关闭流转卡选择弹窗 */
+function closeModal() {
+  open.value = false;
+}
+
+/** 确认选择流转卡 */
+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%">
+    <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/pro/card/components/pro-card-select.vue b/apps/web-ele/src/views/mes/pro/card/components/pro-card-select.vue
new file mode 100644
index 000000000..e06a2d1eb
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/card/components/pro-card-select.vue
@@ -0,0 +1,131 @@
+<script lang="ts" setup>
+import type { MesProCardApi } from '#/api/mes/pro/card';
+
+import { computed, ref, useAttrs, watch } from 'vue';
+
+import { CircleX, Search } from '@vben/icons';
+
+import { ElInput, ElTooltip } from 'element-plus';
+
+import { getCard } from '#/api/mes/pro/card';
+
+import ProCardSelectDialog from './pro-card-select-dialog.vue';
+
+defineOptions({ name: 'ProCardSelect', inheritAttrs: false });
+
+const props = withDefaults(
+  defineProps<{
+    clearable?: boolean;
+    disabled?: boolean;
+    modelValue?: number;
+    placeholder?: string;
+  }>(),
+  {
+    clearable: true,
+    disabled: false,
+    modelValue: undefined,
+    placeholder: '请选择流转卡',
+  },
+);
+
+const emit = defineEmits<{
+  change: [item: MesProCardApi.Card | undefined];
+  'update:modelValue': [value: number | undefined];
+}>();
+
+const attrs = useAttrs();
+const dialogRef = ref<InstanceType<typeof ProCardSelectDialog>>();
+const hovering = ref(false);
+const selectedItem = ref<MesProCardApi.Card>();
+
+const displayLabel = computed(() => selectedItem.value?.code ?? '');
+
+const showClear = computed(
+  () =>
+    props.clearable &&
+    !props.disabled &&
+    hovering.value &&
+    props.modelValue != null,
+);
+
+/** 根据编号单条查询流转卡信息（用于编辑回显） */
+async function resolveItemById(id: number | undefined) {
+  if (id == null) {
+    selectedItem.value = undefined;
+    return;
+  }
+  if (selectedItem.value?.id === id) {
+    return;
+  }
+  selectedItem.value = await getCard(id);
+}
+
+watch(() => props.modelValue, resolveItemById, { immediate: true });
+
+/** 清空已选流转卡 */
+function clearSelected() {
+  selectedItem.value = undefined;
+  emit('update:modelValue', undefined);
+  emit('change', undefined);
+}
+
+/** 打开流转卡选择弹窗 */
+function handleClick(event: MouseEvent) {
+  if (props.disabled) {
+    return;
+  }
+  const target = event.target as HTMLElement;
+  if (showClear.value && target.closest('.el-input__suffix')) {
+    event.stopPropagation();
+    clearSelected();
+    return;
+  }
+  const selectedIds = props.modelValue == null ? [] : [props.modelValue];
+  dialogRef.value?.open(selectedIds, { multiple: false });
+}
+
+/** 弹窗选中回调 */
+function handleSelected(rows: MesProCardApi.Card[]) {
+  const item = rows[0];
+  if (!item) {
+    return;
+  }
+  selectedItem.value = item;
+  emit('update:modelValue', item.id);
+  emit('change', item);
+}
+</script>
+
+<template>
+  <div
+    v-bind="attrs"
+    class="w-full"
+    :class="disabled ? 'cursor-not-allowed' : 'cursor-pointer'"
+    @click="handleClick"
+    @mouseenter="hovering = true"
+    @mouseleave="hovering = false"
+  >
+    <ElTooltip :disabled="!selectedItem" placement="top" :show-after="500">
+      <template #content>
+        <div v-if="selectedItem" class="leading-6">
+          <div>编号：{{ selectedItem.code || '-' }}</div>
+          <div>工单：{{ selectedItem.workOrderCode || '-' }}</div>
+          <div>批次：{{ selectedItem.batchCode || '-' }}</div>
+          <div>产品：{{ selectedItem.itemName || '-' }}</div>
+        </div>
+      </template>
+      <ElInput
+        :disabled="disabled"
+        :model-value="displayLabel"
+        :placeholder="placeholder"
+        readonly
+      >
+        <template #suffix>
+          <CircleX v-if="showClear" class="size-4" />
+          <Search v-else class="size-4" />
+        </template>
+      </ElInput>
+    </ElTooltip>
+  </div>
+  <ProCardSelectDialog ref="dialogRef" @selected="handleSelected" />
+</template>
diff --git a/apps/web-ele/src/views/mes/pro/card/data.ts b/apps/web-ele/src/views/mes/pro/card/data.ts
new file mode 100644
index 000000000..eefd623fa
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/card/data.ts
@@ -0,0 +1,100 @@
+import type { VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProCardApi } from '#/api/mes/pro/card';
+
+import { markRaw } from 'vue';
+
+import { MdItemSelect } from '#/views/mes/md/item/components';
+import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
+
+/** 流转卡选择弹窗的搜索表单 */
+export function useCardSelectGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '流转卡编号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入流转卡编号',
+      },
+    },
+    {
+      fieldName: 'workOrderId',
+      label: '生产工单',
+      component: markRaw(ProWorkOrderSelect),
+      componentProps: {
+        placeholder: '请选择生产工单',
+      },
+    },
+    {
+      fieldName: 'itemId',
+      label: '产品物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择产品物料',
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入批次号',
+      },
+    },
+  ];
+}
+
+/** 流转卡选择弹窗的字段 */
+export function useCardSelectGridColumns(
+  multiple = false,
+): VxeTableGridOptions<MesProCardApi.Card>['columns'] {
+  return [
+    {
+      type: multiple ? 'checkbox' : 'radio',
+      width: 50,
+    },
+    {
+      field: 'code',
+      title: '流转卡编号',
+      width: 160,
+    },
+    {
+      field: 'workOrderCode',
+      title: '生产工单编号',
+      width: 160,
+    },
+    {
+      field: 'itemCode',
+      title: '产品物料编码',
+      width: 140,
+    },
+    {
+      field: 'batchCode',
+      title: '批次号',
+      width: 120,
+    },
+    {
+      field: 'itemName',
+      title: '产品物料名称',
+      minWidth: 150,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      width: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'transferedQuantity',
+      title: '流转数量',
+      width: 100,
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/utils/constants.ts b/apps/web-ele/src/views/mes/utils/constants.ts
index 224f9cc09..19315fc41 100644
--- a/apps/web-ele/src/views/mes/utils/constants.ts
+++ b/apps/web-ele/src/views/mes/utils/constants.ts
@@ -151,9 +151,22 @@ export const MesAutoCodeRuleCode = {
   TM_TOOL_CODE: 'TM_TOOL_CODE',
   WM_AREA_CODE: 'WM_AREA_CODE',
   WM_LOCATION_CODE: 'WM_LOCATION_CODE',
+  WM_ARRIVAL_NOTICE_CODE: 'WM_ARRIVAL_NOTICE_CODE',
+  WM_ITEM_RECEIPT_CODE: 'WM_ITEM_RECEIPT_CODE',
+  WM_RETURN_VENDOR_CODE: 'WM_RETURN_VENDOR_CODE',
+  WM_SALES_NOTICE_CODE: 'WM_SALES_NOTICE_CODE',
+  WM_RETURN_SALES_CODE: 'WM_RETURN_SALES_CODE',
+  WM_RETURN_ISSUE_CODE: 'WM_RETURN_ISSUE_CODE',
+  WM_PRODUCT_ISSUE_CODE: 'WM_PRODUCT_ISSUE_CODE',
+  WM_PRODUCT_SALES_CODE: 'WM_PRODUCT_SALES_CODE',
+  PRODUCTRECPT_CODE: 'PRODUCTRECPT_CODE',
   WM_MISC_ISSUE_CODE: 'WM_MISC_ISSUE_CODE',
   WM_MISC_RECEIPT_CODE: 'WM_MISC_RECEIPT_CODE',
+  WM_OUTSOURCE_ISSUE_CODE: 'WM_OUTSOURCE_ISSUE_CODE',
+  WM_OUTSOURCE_RECEIPT_CODE: 'WM_OUTSOURCE_RECEIPT_CODE',
   WM_PACKAGE_CODE: 'WM_PACKAGE_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',
 } as const;
 
@@ -163,6 +176,38 @@ export const MesWmPackageStatusEnum = {
   FINISHED: MesOrderStatusConstants.FINISHED,
 } as const;
 
+/** MES 盘点类型枚举 */
+export const MesWmStockTakingTypeEnum = {
+  STATIC: 1,
+  DYNAMIC: 2,
+} as const;
+
+/** MES 盘点任务状态枚举 */
+export const MesWmStockTakingTaskStatusEnum = {
+  PREPARE: MesOrderStatusConstants.DRAFT,
+  APPROVING: MesOrderStatusConstants.APPROVING,
+  FINISHED: MesOrderStatusConstants.FINISHED,
+  CANCELED: MesOrderStatusConstants.CANCELLED,
+} as const;
+
+/** MES 盘点任务行状态枚举 */
+export const MesWmStockTakingTaskLineStatusEnum = {
+  UNCOUNTED: 0,
+  NORMAL: 1,
+  GAIN: 2,
+  LOSS: 3,
+} as const;
+
+/** MES 盘点方案参数类型枚举 */
+export const MesWmStockTakingParamTypeEnum = {
+  WAREHOUSE: 102,
+  LOCATION: 103,
+  AREA: 104,
+  BATCH: 107,
+  ITEM: 600,
+  QUALITY_STATUS: 900,
+} as const;
+
 /** MES 生产工单状态枚举 */
 export const MesProWorkOrderStatusEnum = {
   PREPARE: MesOrderStatusConstants.DRAFT,
@@ -173,6 +218,13 @@ export const MesProWorkOrderStatusEnum = {
   CANCELLED: MesOrderStatusConstants.CANCELLED,
 } as const;
 
+/** MES 工单类型枚举 */
+export const MesProWorkOrderTypeEnum = {
+  SELF: 1, // 自行生产
+  OUTSOURCE: 2, // 代工
+  PURCHASE: 3, // 采购
+} as const;
+
 /** MES 生产任务状态枚举 */
 export const MesProTaskStatusEnum = {
   PREPARE: MesOrderStatusConstants.DRAFT,
@@ -236,6 +288,105 @@ export const MesWmMiscReceiptStatusEnum = {
   CANCELED: MesOrderStatusConstants.CANCELLED,
 } as const;
 
+/** MES 外协发料单状态枚举 */
+export const MesWmOutsourceIssueStatusEnum = {
+  PREPARE: MesOrderStatusConstants.DRAFT,
+  APPROVING: MesOrderStatusConstants.APPROVING,
+  APPROVED: MesOrderStatusConstants.APPROVED,
+  FINISHED: MesOrderStatusConstants.FINISHED,
+  CANCELLED: MesOrderStatusConstants.CANCELLED,
+} as const;
+
+/** MES 外协入库单状态枚举 */
+export const MesWmOutsourceReceiptStatusEnum = {
+  PREPARE: MesOrderStatusConstants.DRAFT,
+  APPROVING: MesOrderStatusConstants.APPROVING,
+  APPROVED: MesOrderStatusConstants.APPROVED,
+  FINISHED: MesOrderStatusConstants.FINISHED,
+  CANCELED: MesOrderStatusConstants.CANCELLED,
+} as const;
+
+/** MES 到货通知单状态枚举 */
+export const MesWmArrivalNoticeStatusEnum = {
+  PREPARE: MesOrderStatusConstants.DRAFT,
+  PENDING_QC: MesOrderStatusConstants.APPROVING,
+  PENDING_RECEIPT: MesOrderStatusConstants.APPROVED,
+  FINISHED: MesOrderStatusConstants.FINISHED,
+} as const;
+
+/** MES 采购入库单状态枚举 */
+export const MesWmItemReceiptStatusEnum = {
+  PREPARE: MesOrderStatusConstants.DRAFT,
+  APPROVING: MesOrderStatusConstants.APPROVING,
+  APPROVED: MesOrderStatusConstants.APPROVED,
+  FINISHED: MesOrderStatusConstants.FINISHED,
+  CANCELED: MesOrderStatusConstants.CANCELLED,
+} as const;
+
+/** MES 供应商退货单状态枚举 */
+export const MesWmReturnVendorStatusEnum = {
+  PREPARE: MesOrderStatusConstants.DRAFT,
+  APPROVING: MesOrderStatusConstants.APPROVING,
+  APPROVED: MesOrderStatusConstants.APPROVED,
+  FINISHED: MesOrderStatusConstants.FINISHED,
+  CANCELED: MesOrderStatusConstants.CANCELLED,
+} as const;
+
+/** MES 发货通知单状态枚举 */
+export const MesWmSalesNoticeStatusEnum = {
+  PREPARE: MesOrderStatusConstants.DRAFT,
+  APPROVED: MesOrderStatusConstants.APPROVED,
+} as const;
+
+/** MES 销售退货单状态枚举 */
+export const MesWmReturnSalesStatusEnum = {
+  PREPARE: MesOrderStatusConstants.DRAFT,
+  CONFIRMED: MesOrderStatusConstants.CONFIRMED,
+  APPROVING: MesOrderStatusConstants.APPROVING,
+  APPROVED: MesOrderStatusConstants.APPROVED,
+  FINISHED: MesOrderStatusConstants.FINISHED,
+  CANCELED: MesOrderStatusConstants.CANCELLED,
+} as const;
+
+/** MES 生产退料单状态枚举 */
+export const MesWmReturnIssueStatusEnum = {
+  PREPARE: MesOrderStatusConstants.DRAFT,
+  CONFIRMED: MesOrderStatusConstants.CONFIRMED,
+  APPROVING: MesOrderStatusConstants.APPROVING,
+  APPROVED: MesOrderStatusConstants.APPROVED,
+  FINISHED: MesOrderStatusConstants.FINISHED,
+  CANCELED: MesOrderStatusConstants.CANCELLED,
+} as const;
+
+/** MES 领料出库单状态枚举 */
+export const MesWmProductIssueStatusEnum = {
+  PREPARE: MesOrderStatusConstants.DRAFT,
+  APPROVING: MesOrderStatusConstants.APPROVING,
+  APPROVED: MesOrderStatusConstants.APPROVED,
+  FINISHED: MesOrderStatusConstants.FINISHED,
+  CANCELED: MesOrderStatusConstants.CANCELLED,
+} as const;
+
+/** MES 产品入库单状态枚举 */
+export const MesWmProductReceiptStatusEnum = {
+  PREPARE: MesOrderStatusConstants.DRAFT,
+  APPROVING: MesOrderStatusConstants.APPROVING,
+  APPROVED: MesOrderStatusConstants.APPROVED,
+  FINISHED: MesOrderStatusConstants.FINISHED,
+  CANCELED: MesOrderStatusConstants.CANCELLED,
+} as const;
+
+/** MES 销售出库单状态枚举 */
+export const MesWmProductSalesStatusEnum = {
+  PREPARE: MesOrderStatusConstants.DRAFT,
+  CONFIRMED: MesOrderStatusConstants.CONFIRMED,
+  APPROVING: MesOrderStatusConstants.APPROVING,
+  SHIPPING: 10, // 待填写运单
+  APPROVED: MesOrderStatusConstants.APPROVED,
+  FINISHED: MesOrderStatusConstants.FINISHED,
+  CANCELED: MesOrderStatusConstants.CANCELLED,
+} as const;
+
 /** MES 质检结果值类型枚举 */
 export const MesQcResultValueType = {
   FLOAT: 1,
diff --git a/apps/web-ele/src/views/mes/wm/barcode/data.ts b/apps/web-ele/src/views/mes/wm/barcode/data.ts
index d67c07a61..15362beed 100644
--- a/apps/web-ele/src/views/mes/wm/barcode/data.ts
+++ b/apps/web-ele/src/views/mes/wm/barcode/data.ts
@@ -19,9 +19,12 @@ import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
 import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
 import MdWorkshopSelect from '#/views/mes/md/workstation/components/md-workshop-select.vue';
 import MdWorkstationSelect from '#/views/mes/md/workstation/components/md-workstation-select.vue';
+import { ProCardSelect } from '#/views/mes/pro/card/components';
 import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
 import TmToolSelect from '#/views/mes/tm/tool/components/tm-tool-select.vue';
 import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
+import { WmBatchSelect } from '#/views/mes/wm/batch/components';
+import { UserSelect } from '#/views/system/user/components';
 
 import WmMaterialStockSelect from './../materialstock/components/wm-material-stock-select.vue';
 import { WmPackageSelect } from './../packages/components';
@@ -51,15 +54,31 @@ async function syncBizDetail(
   }
   let bizCode: string | undefined;
   let bizName: string | undefined;
-  if (bizType === BarcodeBizTypeEnum.STOCK) {
-    bizCode = item.itemCode;
-    bizName = item.itemName;
-  } else if (bizType === BarcodeBizTypeEnum.PACKAGE) {
-    bizCode = item.code;
-    bizName = item.clientName || item.code;
-  } else {
-    bizCode = item.code || item.username;
-    bizName = item.name || item.nickname;
+  switch (bizType) {
+    case BarcodeBizTypeEnum.BATCH: {
+      bizCode = item.code;
+      bizName = item.itemName || item.code;
+      break;
+    }
+    case BarcodeBizTypeEnum.PACKAGE: {
+      bizCode = item.code;
+      bizName = item.clientName || item.code;
+      break;
+    }
+    case BarcodeBizTypeEnum.PROCARD: {
+      bizCode = item.code;
+      bizName = item.workOrderName || item.code;
+      break;
+    }
+    case BarcodeBizTypeEnum.STOCK: {
+      bizCode = item.itemCode;
+      bizName = item.itemName;
+      break;
+    }
+    default: {
+      bizCode = item.code || item.username;
+      bizName = item.name || item.nickname;
+    }
   }
   // 先回填业务编码、名称并清空旧条码内容
   await formApi.setValues({ bizCode, bizName, content: undefined });
@@ -328,6 +347,45 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
       },
       rules: 'required',
     },
+    {
+      fieldName: 'bizId',
+      label: '批次',
+      component: markRaw(WmBatchSelect),
+      componentProps: {
+        onChange: (item: any) => syncBizDetail(formApi, item),
+      },
+      dependencies: {
+        triggerFields: ['bizType'],
+        show: (values) => values.bizType === BarcodeBizTypeEnum.BATCH,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'bizId',
+      label: '流转卡',
+      component: markRaw(ProCardSelect),
+      componentProps: {
+        onChange: (item: any) => syncBizDetail(formApi, item),
+      },
+      dependencies: {
+        triggerFields: ['bizType'],
+        show: (values) => values.bizType === BarcodeBizTypeEnum.PROCARD,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'bizId',
+      label: '人员',
+      component: markRaw(UserSelect),
+      componentProps: {
+        onChange: (item: any) => syncBizDetail(formApi, item),
+      },
+      dependencies: {
+        triggerFields: ['bizType'],
+        show: (values) => values.bizType === BarcodeBizTypeEnum.USER,
+      },
+      rules: 'required',
+    },
     {
       fieldName: 'bizId',
       label: '业务编号',
@@ -344,13 +402,16 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
           values.bizType !== undefined &&
           ![
             BarcodeBizTypeEnum.AREA,
+            BarcodeBizTypeEnum.BATCH,
             BarcodeBizTypeEnum.CLIENT,
             BarcodeBizTypeEnum.ITEM,
             BarcodeBizTypeEnum.LOCATION,
             BarcodeBizTypeEnum.MACHINERY,
             BarcodeBizTypeEnum.PACKAGE,
+            BarcodeBizTypeEnum.PROCARD,
             BarcodeBizTypeEnum.STOCK,
             BarcodeBizTypeEnum.TOOL,
+            BarcodeBizTypeEnum.USER,
             BarcodeBizTypeEnum.VENDOR,
             BarcodeBizTypeEnum.WAREHOUSE,
             BarcodeBizTypeEnum.WORKORDER,
diff --git a/apps/web-ele/src/views/mes/wm/batch/components/index.ts b/apps/web-ele/src/views/mes/wm/batch/components/index.ts
new file mode 100644
index 000000000..6d4a5d756
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/batch/components/index.ts
@@ -0,0 +1,2 @@
+export { default as WmBatchSelectDialog } from './wm-batch-select-dialog.vue';
+export { default as WmBatchSelect } from './wm-batch-select.vue';
diff --git a/apps/web-ele/src/views/mes/wm/batch/components/wm-batch-select-dialog.vue b/apps/web-ele/src/views/mes/wm/batch/components/wm-batch-select-dialog.vue
new file mode 100644
index 000000000..ca55b63f4
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/batch/components/wm-batch-select-dialog.vue
@@ -0,0 +1,241 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmBatchApi } from '#/api/mes/wm/batch';
+
+import { computed, nextTick, ref } from 'vue';
+
+import { ElAlert, ElButton, ElDialog, ElMessage } from 'element-plus';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getBatchPage } from '#/api/mes/wm/batch';
+
+import { useBatchSelectGridColumns, useBatchSelectGridFormSchema } from '../data';
+
+const emit = defineEmits<{
+  selected: [rows: MesWmBatchApi.Batch[]];
+}>();
+
+const open = ref(false); // 弹窗是否打开
+const multiple = ref(false); // 是否多选；默认按单选选择器使用
+const selectedRows = ref<MesWmBatchApi.Batch[]>([]); // 已选批次列表
+const preSelectedIds = ref<number[]>([]); // 预选批次编号列表
+const externalItemId = ref<number>(); // 外部传入的默认物料过滤
+const externalClientId = ref<number>(); // 外部传入的默认客户过滤
+const externalVendorId = ref<number>(); // 外部传入的默认供应商过滤
+const externalSalesOrderCode = ref<string>(); // 外部传入的默认销售订单过滤
+
+const filterTip = computed(() => {
+  const parts: string[] = [];
+  if (externalClientId.value != null) {
+    parts.push('客户');
+  }
+  if (externalVendorId.value != null) {
+    parts.push('供应商');
+  }
+  if (externalSalesOrderCode.value != null) {
+    parts.push('销售订单');
+  }
+  return parts.length > 0 ? `已按${parts.join('/')}预过滤` : '';
+});
+
+/** 获取多选记录，包含 VXE reserve 跨页记录 */
+function getMultipleSelectedRows() {
+  const selectedMap = new Map<number, MesWmBatchApi.Batch>();
+  const records = [
+    ...(gridApi.grid.getCheckboxReserveRecords?.() ?? []),
+    ...(gridApi.grid.getCheckboxRecords?.() ?? []),
+  ] as MesWmBatchApi.Batch[];
+  records.forEach((row) => {
+    const rowId = row.id;
+    if (rowId !== undefined) {
+      selectedMap.set(rowId, row);
+    }
+  });
+  return [...selectedMap.values()];
+}
+
+/** 处理多选勾选变化 */
+function handleCheckboxSelectChange() {
+  selectedRows.value = getMultipleSelectedRows();
+}
+
+/** 处理单选切换 */
+function handleRadioChange(row: MesWmBatchApi.Batch) {
+  selectedRows.value = [row];
+}
+
+/** 多选模式下切换行勾选 */
+async function toggleMultipleRow(row: MesWmBatchApi.Batch) {
+  const selected = gridApi.grid.isCheckedByCheckboxRow(row);
+  await gridApi.grid.setCheckboxRow(row, !selected);
+  selectedRows.value = getMultipleSelectedRows();
+}
+
+/** 处理行双击：单选直接确认，多选切换勾选 */
+async function handleCellDblclick({ row }: { row: MesWmBatchApi.Batch }) {
+  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 = gridApi.grid.getData() as MesWmBatchApi.Batch[];
+  for (const row of rows) {
+    if (row.id === undefined || !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: useBatchSelectGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useBatchSelectGridColumns(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 getBatchPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmBatchApi.Batch>,
+  gridEvents: {
+    cellDblclick: handleCellDblclick,
+    checkboxAll: handleCheckboxSelectChange,
+    checkboxChange: handleCheckboxSelectChange,
+    radioChange: ({ row }: { row: MesWmBatchApi.Batch }) => {
+      handleRadioChange(row);
+    },
+  },
+});
+
+/** 重置查询和选择状态，保留外部传入的默认过滤 */
+async function resetQueryState() {
+  selectedRows.value = [];
+  await gridApi.grid.clearCheckboxRow();
+  await gridApi.grid.clearCheckboxReserve();
+  await gridApi.grid.clearRadioRow();
+  await gridApi.formApi.resetForm();
+  if (externalItemId.value) {
+    await gridApi.formApi.setFieldValue('itemId', externalItemId.value);
+  }
+  if (externalClientId.value) {
+    await gridApi.formApi.setFieldValue('clientId', externalClientId.value);
+  }
+  if (externalVendorId.value) {
+    await gridApi.formApi.setFieldValue('vendorId', externalVendorId.value);
+  }
+  if (externalSalesOrderCode.value) {
+    await gridApi.formApi.setFieldValue(
+      'salesOrderCode',
+      externalSalesOrderCode.value,
+    );
+  }
+}
+
+/** 打开批次选择弹窗 */
+async function openModal(
+  selectedIds?: number[],
+  options?: {
+    clientId?: number;
+    itemId?: number;
+    multiple?: boolean;
+    salesOrderCode?: string;
+    vendorId?: number;
+  },
+) {
+  open.value = true;
+  multiple.value = options?.multiple ?? false;
+  preSelectedIds.value = selectedIds || [];
+  externalItemId.value = options?.itemId;
+  externalClientId.value = options?.clientId;
+  externalVendorId.value = options?.vendorId;
+  externalSalesOrderCode.value = options?.salesOrderCode;
+  await nextTick();
+  gridApi.setGridOptions({
+    columns: useBatchSelectGridColumns(multiple.value),
+  });
+  await resetQueryState();
+  await gridApi.query();
+  await nextTick();
+  await applyPreSelection();
+}
+
+/** 关闭批次选择弹窗 */
+function closeModal() {
+  open.value = false;
+}
+
+/** 确认选择批次 */
+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%">
+    <ElAlert
+      v-if="filterTip"
+      :closable="false"
+      class="!mb-3"
+      :title="filterTip"
+      type="info"
+    />
+    <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/wm/batch/components/wm-batch-select.vue b/apps/web-ele/src/views/mes/wm/batch/components/wm-batch-select.vue
new file mode 100644
index 000000000..10fc23af4
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/batch/components/wm-batch-select.vue
@@ -0,0 +1,145 @@
+<script lang="ts" setup>
+import type { MesWmBatchApi } from '#/api/mes/wm/batch';
+
+import { computed, ref, useAttrs, watch } from 'vue';
+
+import { CircleX, Search } from '@vben/icons';
+
+import { ElInput, ElTooltip } from 'element-plus';
+
+import { getBatch } from '#/api/mes/wm/batch';
+
+import WmBatchSelectDialog from './wm-batch-select-dialog.vue';
+
+defineOptions({ name: 'WmBatchSelect', inheritAttrs: false });
+
+const props = withDefaults(
+  defineProps<{
+    clearable?: boolean;
+    clientId?: number; // 默认过滤的客户 ID
+    disabled?: boolean;
+    itemId?: number; // 默认过滤的物料 ID
+    modelValue?: number;
+    placeholder?: string;
+    salesOrderCode?: string; // 默认过滤的销售订单编号
+    vendorId?: number; // 默认过滤的供应商 ID
+  }>(),
+  {
+    clearable: true,
+    clientId: undefined,
+    disabled: false,
+    itemId: undefined,
+    modelValue: undefined,
+    placeholder: '请选择批次',
+    salesOrderCode: undefined,
+    vendorId: undefined,
+  },
+);
+
+const emit = defineEmits<{
+  change: [item: MesWmBatchApi.Batch | undefined];
+  'update:modelValue': [value: number | undefined];
+}>();
+
+const attrs = useAttrs();
+const dialogRef = ref<InstanceType<typeof WmBatchSelectDialog>>();
+const hovering = ref(false);
+const selectedItem = ref<MesWmBatchApi.Batch>();
+
+const displayLabel = computed(() => selectedItem.value?.code ?? '');
+
+const showClear = computed(
+  () =>
+    props.clearable &&
+    !props.disabled &&
+    hovering.value &&
+    props.modelValue != null,
+);
+
+/** 根据编号单条查询批次信息（用于编辑回显） */
+async function resolveItemById(id: number | undefined) {
+  if (id == null) {
+    selectedItem.value = undefined;
+    return;
+  }
+  if (selectedItem.value?.id === id) {
+    return;
+  }
+  selectedItem.value = await getBatch(id);
+}
+
+watch(() => props.modelValue, resolveItemById, { immediate: true });
+
+/** 清空已选批次 */
+function clearSelected() {
+  selectedItem.value = undefined;
+  emit('update:modelValue', undefined);
+  emit('change', undefined);
+}
+
+/** 打开批次选择弹窗 */
+function handleClick(event: MouseEvent) {
+  if (props.disabled) {
+    return;
+  }
+  const target = event.target as HTMLElement;
+  if (showClear.value && target.closest('.el-input__suffix')) {
+    event.stopPropagation();
+    clearSelected();
+    return;
+  }
+  const selectedIds = props.modelValue == null ? [] : [props.modelValue];
+  dialogRef.value?.open(selectedIds, {
+    clientId: props.clientId,
+    itemId: props.itemId,
+    multiple: false,
+    salesOrderCode: props.salesOrderCode,
+    vendorId: props.vendorId,
+  });
+}
+
+/** 弹窗选中回调 */
+function handleSelected(rows: MesWmBatchApi.Batch[]) {
+  const item = rows[0];
+  if (!item) {
+    return;
+  }
+  selectedItem.value = item;
+  emit('update:modelValue', item.id);
+  emit('change', item);
+}
+</script>
+
+<template>
+  <div
+    v-bind="attrs"
+    class="w-full"
+    :class="disabled ? 'cursor-not-allowed' : 'cursor-pointer'"
+    @click="handleClick"
+    @mouseenter="hovering = true"
+    @mouseleave="hovering = false"
+  >
+    <ElTooltip :disabled="!selectedItem" placement="top" :show-after="500">
+      <template #content>
+        <div v-if="selectedItem" class="leading-6">
+          <div>批次编号：{{ selectedItem.code || '-' }}</div>
+          <div>物料编码：{{ selectedItem.itemCode || '-' }}</div>
+          <div>物料名称：{{ selectedItem.itemName || '-' }}</div>
+          <div>生产批号：{{ selectedItem.lotNumber || '-' }}</div>
+        </div>
+      </template>
+      <ElInput
+        :disabled="disabled"
+        :model-value="displayLabel"
+        :placeholder="placeholder"
+        readonly
+      >
+        <template #suffix>
+          <CircleX v-if="showClear" class="size-4" />
+          <Search v-else class="size-4" />
+        </template>
+      </ElInput>
+    </ElTooltip>
+  </div>
+  <WmBatchSelectDialog ref="dialogRef" @selected="handleSelected" />
+</template>
diff --git a/apps/web-ele/src/views/system/dept/components/index.ts b/apps/web-ele/src/views/system/dept/components/index.ts
index 04d2b6145..5bd391a52 100644
--- a/apps/web-ele/src/views/system/dept/components/index.ts
+++ b/apps/web-ele/src/views/system/dept/components/index.ts
@@ -1 +1,2 @@
 export { default as DeptSelectModal } from './select-modal.vue';
+export { default as DeptTreeSelect } from './tree-select.vue';
diff --git a/apps/web-ele/src/views/system/dept/components/select-modal.vue b/apps/web-ele/src/views/system/dept/components/select-modal.vue
index 81e73782c..bcb91098b 100644
--- a/apps/web-ele/src/views/system/dept/components/select-modal.vue
+++ b/apps/web-ele/src/views/system/dept/components/select-modal.vue
@@ -1,5 +1,4 @@
 <script lang="ts" setup>
-// TODO @jason：看看这个有没办法，整体代码的文件顺序，注释风格等，和 /Users/yunai/Java/yudao-ui-admin-vben-v5/apps/web-antd/src/views/system/dept/components/select-modal.vue 一致。原因是：好维护~
 import type { SystemDeptApi } from '#/api/system/dept';
 
 import { nextTick, ref } from 'vue';
@@ -15,16 +14,11 @@ defineOptions({ name: 'DeptSelectModal' });
 
 const props = withDefaults(
   defineProps<{
-    // 取消按钮文本
-    cancelText?: string;
-    // checkable 状态下节点选择完全受控
-    checkStrictly?: boolean;
-    // 确认按钮文本
-    confirmText?: string;
-    // 是否支持多选
-    multiple?: boolean;
-    // 标题
-    title?: string;
+    cancelText?: string; // 取消按钮文本
+    checkStrictly?: boolean; // checkable 状态下节点选择完全受控
+    confirmText?: string; // 确认按钮文本
+    multiple?: boolean; // 是否支持多选
+    title?: string; // 标题
   }>(),
   {
     cancelText: '取消',
@@ -39,16 +33,11 @@ const emit = defineEmits<{
   confirm: [deptList: SystemDeptApi.Dept[]];
 }>();
 
-// 部门树形结构
-const deptTree = ref<any[]>([]);
-// 选中的部门 ID 列表
-const selectedDeptIds = ref<number[]>([]);
-// 部门数据
-const deptData = ref<SystemDeptApi.Dept[]>([]);
-// Tree 组件引用
-const treeRef = ref();
+const deptTree = ref<any[]>([]); // 部门树形结构
+const selectedDeptIds = ref<number[]>([]); // 选中的部门 ID 列表
+const deptData = ref<SystemDeptApi.Dept[]>([]); // 部门数据
+const treeRef = ref(); // Tree 组件引用
 
-// 对话框配置
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     // 获取选中的部门ID
diff --git a/apps/web-ele/src/views/system/user/modules/dept-tree.vue b/apps/web-ele/src/views/system/dept/components/tree-select.vue
similarity index 66%
rename from apps/web-ele/src/views/system/user/modules/dept-tree.vue
rename to apps/web-ele/src/views/system/dept/components/tree-select.vue
index 9c4d5a8bf..015f207b7 100644
--- a/apps/web-ele/src/views/system/user/modules/dept-tree.vue
+++ b/apps/web-ele/src/views/system/dept/components/tree-select.vue
@@ -10,12 +10,18 @@ import { ElInput, ElTree } from 'element-plus';
 
 import { getSimpleDeptList } from '#/api/system/dept';
 
-const emit = defineEmits(['select']);
+defineOptions({ name: 'DeptTreeSelect' });
+
+const emit = defineEmits<{
+  select: [dept?: SystemDeptApi.Dept];
+}>();
+
 const deptList = ref<SystemDeptApi.Dept[]>([]); // 部门列表
 const deptTree = ref<any[]>([]); // 部门树
-const expandedKeys = ref<number[]>([]); // 展开的节点
 const loading = ref(false); // 加载状态
 const searchValue = ref(''); // 搜索值
+const treeRef = ref<InstanceType<typeof ElTree>>(); // 树 Ref
+let currentNodeId: number | undefined; // 当前选中的节点 ID
 
 /** 处理搜索逻辑 */
 function handleSearch(value: string) {
@@ -26,15 +32,31 @@ function handleSearch(value: string) {
       )
     : deptList.value;
   deptTree.value = handleTree(filteredList);
-  // 展开所有节点
-  expandedKeys.value = deptTree.value.map((node) => node.id!);
 }
 
-/** 选中部门 */
-function handleSelect(data: any) {
+/** 选中部门：点击已选中的节点时取消选中 */
+function handleSelect(data: SystemDeptApi.Dept) {
+  if (currentNodeId === data.id) {
+    currentNodeId = undefined;
+    treeRef.value?.setCurrentKey(undefined);
+    emit('select', undefined);
+    return;
+  }
+  currentNodeId = data.id;
   emit('select', data);
 }
 
+/** 重置选中状态（供外部重置按钮调用） */
+function reset() {
+  searchValue.value = '';
+  currentNodeId = undefined;
+  treeRef.value?.setCurrentKey(undefined);
+  deptTree.value = handleTree(deptList.value);
+  emit('select', undefined);
+}
+
+defineExpose({ reset });
+
 /** 初始化 */
 onMounted(async () => {
   try {
@@ -42,8 +64,6 @@ onMounted(async () => {
     const data = await getSimpleDeptList();
     deptList.value = data;
     deptTree.value = handleTree(data);
-  } catch (error) {
-    console.error('获取部门数据失败', error);
   } finally {
     loading.value = false;
   }
@@ -53,11 +73,11 @@ onMounted(async () => {
 <template>
   <div>
     <ElInput
-      placeholder="搜索部门"
-      clearable
       v-model="searchValue"
-      @input="handleSearch"
       class="w-full"
+      clearable
+      placeholder="搜索部门"
+      @input="handleSearch"
     >
       <template #prefix>
         <Search class="size-4" />
@@ -65,13 +85,15 @@ onMounted(async () => {
     </ElInput>
     <div v-loading="loading">
       <ElTree
-        class="pt-2"
         v-if="deptTree.length > 0"
+        ref="treeRef"
+        class="pt-2"
         :data="deptTree"
+        default-expand-all
+        highlight-current
+        node-key="id"
         :props="{ label: 'name', children: 'children' }"
         @node-click="handleSelect"
-        default-expand-all
-        node-key="id"
       />
       <div v-else-if="!loading" class="py-4 text-center text-gray-500">
         暂无数据
diff --git a/apps/web-ele/src/views/system/user/components/index.ts b/apps/web-ele/src/views/system/user/components/index.ts
index 9f00ad117..fb54c1665 100644
--- a/apps/web-ele/src/views/system/user/components/index.ts
+++ b/apps/web-ele/src/views/system/user/components/index.ts
@@ -1 +1,3 @@
+export { default as UserSelectDialog } from './select-dialog.vue';
 export { default as UserSelectModal } from './select-modal.vue';
+export { default as UserSelect } from './select.vue';
diff --git a/apps/web-ele/src/views/system/user/components/select-dialog.vue b/apps/web-ele/src/views/system/user/components/select-dialog.vue
new file mode 100644
index 000000000..7b1b507f5
--- /dev/null
+++ b/apps/web-ele/src/views/system/user/components/select-dialog.vue
@@ -0,0 +1,298 @@
+<script lang="ts" setup>
+import type { VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { SystemDeptApi } from '#/api/system/dept';
+import type { SystemUserApi } from '#/api/system/user';
+
+import { nextTick, ref } from 'vue';
+
+import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { ElButton, ElCol, ElDialog, ElMessage, ElRow } from 'element-plus';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getUserPage } from '#/api/system/user';
+import { DeptTreeSelect } from '#/views/system/dept/components';
+
+const emit = defineEmits<{
+  selected: [rows: SystemUserApi.User[]];
+}>();
+
+const open = ref(false); // 弹窗是否打开
+const multiple = ref(false); // 是否多选；默认按单选选择器使用
+const selectedRows = ref<SystemUserApi.User[]>([]); // 已选用户列表
+const preSelectedIds = ref<number[]>([]); // 预选用户编号列表
+const deptId = ref<number>(); // 当前部门过滤
+const deptTreeRef = ref<InstanceType<typeof DeptTreeSelect>>(); // 部门树
+
+/** 用户选择弹窗的搜索表单 */
+function useUserSelectGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'username',
+      label: '用户名称',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入用户名称',
+      },
+    },
+    {
+      fieldName: 'nickname',
+      label: '用户昵称',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入用户昵称',
+      },
+    },
+    {
+      fieldName: 'mobile',
+      label: '手机号码',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入手机号码',
+      },
+    },
+    {
+      fieldName: 'status',
+      label: '状态',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+        placeholder: '请选择状态',
+      },
+    },
+  ];
+}
+
+/** 用户选择弹窗的字段 */
+function useUserSelectGridColumns(
+  isMultiple = false,
+): VxeTableGridOptions<SystemUserApi.User>['columns'] {
+  return [
+    {
+      type: isMultiple ? 'checkbox' : 'radio',
+      width: 50,
+    },
+    {
+      field: 'id',
+      title: '用户编号',
+      width: 120,
+    },
+    {
+      field: 'username',
+      title: '用户名称',
+      width: 150,
+    },
+    {
+      field: 'nickname',
+      title: '用户昵称',
+      minWidth: 150,
+    },
+    {
+      field: 'mobile',
+      title: '手机号码',
+      width: 130,
+    },
+    {
+      field: 'status',
+      title: '状态',
+      width: 90,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.COMMON_STATUS },
+      },
+    },
+  ];
+}
+
+/** 获取多选记录，包含 VXE reserve 跨页记录 */
+function getMultipleSelectedRows() {
+  const selectedMap = new Map<number, SystemUserApi.User>();
+  const records = [
+    ...(gridApi.grid.getCheckboxReserveRecords?.() ?? []),
+    ...(gridApi.grid.getCheckboxRecords?.() ?? []),
+  ] as SystemUserApi.User[];
+  records.forEach((row) => {
+    const rowId = row.id;
+    if (rowId !== undefined) {
+      selectedMap.set(rowId, row);
+    }
+  });
+  return [...selectedMap.values()];
+}
+
+/** 处理多选勾选变化 */
+function handleCheckboxSelectChange() {
+  selectedRows.value = getMultipleSelectedRows();
+}
+
+/** 处理单选切换 */
+function handleRadioChange(row: SystemUserApi.User) {
+  selectedRows.value = [row];
+}
+
+/** 多选模式下切换行勾选 */
+async function toggleMultipleRow(row: SystemUserApi.User) {
+  const selected = gridApi.grid.isCheckedByCheckboxRow(row);
+  await gridApi.grid.setCheckboxRow(row, !selected);
+  selectedRows.value = getMultipleSelectedRows();
+}
+
+/** 处理行双击：单选直接确认，多选切换勾选 */
+async function handleCellDblclick({ row }: { row: SystemUserApi.User }) {
+  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 = gridApi.grid.getData() as SystemUserApi.User[];
+  for (const row of rows) {
+    if (row.id === undefined || !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: useUserSelectGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useUserSelectGridColumns(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 getUserPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            deptId: deptId.value,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<SystemUserApi.User>,
+  gridEvents: {
+    cellDblclick: handleCellDblclick,
+    checkboxAll: handleCheckboxSelectChange,
+    checkboxChange: handleCheckboxSelectChange,
+    radioChange: ({ row }: { row: SystemUserApi.User }) => {
+      handleRadioChange(row);
+    },
+  },
+});
+
+/** 部门树节点点击 */
+function handleDeptNodeClick(dept?: SystemDeptApi.Dept) {
+  deptId.value = dept?.id;
+  gridApi.query();
+}
+
+/** 重置查询和选择状态 */
+async function resetQueryState() {
+  selectedRows.value = [];
+  deptId.value = undefined;
+  await gridApi.grid.clearCheckboxRow();
+  await gridApi.grid.clearCheckboxReserve();
+  await gridApi.grid.clearRadioRow();
+  await gridApi.formApi.resetForm();
+  deptTreeRef.value?.reset();
+}
+
+/** 打开用户选择弹窗 */
+async function openModal(
+  selectedIds?: number[],
+  options?: { multiple?: boolean },
+) {
+  open.value = true;
+  multiple.value = options?.multiple ?? false;
+  preSelectedIds.value = selectedIds || [];
+  await nextTick();
+  gridApi.setGridOptions({
+    columns: useUserSelectGridColumns(multiple.value),
+  });
+  await resetQueryState();
+  await gridApi.formApi.setFieldValue('status', CommonStatusEnum.ENABLE);
+  await gridApi.query();
+  await nextTick();
+  await applyPreSelection();
+}
+
+/** 关闭用户选择弹窗 */
+function closeModal() {
+  open.value = false;
+}
+
+/** 确认选择用户 */
+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%">
+    <ElRow :gutter="12">
+      <ElCol :span="5">
+        <DeptTreeSelect ref="deptTreeRef" @select="handleDeptNodeClick" />
+      </ElCol>
+      <ElCol :span="19">
+        <Grid table-title="用户列表" />
+      </ElCol>
+    </ElRow>
+    <template #footer>
+      <ElButton @click="closeModal">取消</ElButton>
+      <ElButton type="primary" @click="handleConfirm">确定</ElButton>
+    </template>
+  </ElDialog>
+</template>
diff --git a/apps/web-ele/src/views/system/user/components/select-modal.vue b/apps/web-ele/src/views/system/user/components/select-modal.vue
index 266edca41..3937a4453 100644
--- a/apps/web-ele/src/views/system/user/components/select-modal.vue
+++ b/apps/web-ele/src/views/system/user/components/select-modal.vue
@@ -1,5 +1,4 @@
 <script lang="ts" setup>
-// TODO @jason：看看这个有没办法，整体代码的文件顺序，注释风格等，和 /Users/yunai/Java/yudao-ui-admin-vben-v5/apps/web-antd/src/views/system/user/components/select-modal.vue 一致。原因是：好维护~
 import type { SystemDeptApi } from '#/api/system/dept';
 import type { SystemUserApi } from '#/api/system/user';
 
@@ -22,7 +21,7 @@ import {
 import { getSimpleDeptList } from '#/api/system/dept';
 import { getUserPage } from '#/api/system/user';
 
-// 部门树节点接口
+/** 部门树节点接口 */
 interface DeptTreeNode {
   id: string;
   label: string;
@@ -67,7 +66,6 @@ const deptSearchKeys = ref('');
 const userList = ref<SystemUserApi.User[]>([]); // 存储所有已知用户
 const selectedUserIds = ref<number[]>([]);
 
-// 弹窗配置
 const [Modal, modalApi] = useVbenModal({
   onCancel: handleCancel,
   onClosed: handleClosed,
@@ -143,7 +141,7 @@ const rightListState = ref({
   },
 });
 
-// 计算属性：Transfer 数据源
+/** 计算属性：Transfer 数据源 */
 const transferDataSource = computed(() => {
   // 使用 Map 来去重，确保每个用户只出现一次
   const userMap = new Map<number, any>();
@@ -170,7 +168,7 @@ const transferDataSource = computed(() => {
   }));
 });
 
-// 过滤部门树数据
+/** 过滤部门树数据 */
 const filteredDeptTree = computed(() => {
   if (!deptSearchKeys.value) return deptTree.value;
 
@@ -210,7 +208,7 @@ const filteredDeptTree = computed(() => {
   return deptTree.value.map((node: any) => filterNode(node)).filter(Boolean);
 });
 
-// 加载用户数据
+/** 加载用户数据 */
 async function loadUserData(pageNo: number, pageSize: number) {
   try {
     const { list, total } = await getUserPage({
@@ -237,7 +235,7 @@ async function loadUserData(pageNo: number, pageSize: number) {
   }
 }
 
-// 更新右侧列表数据
+/** 更新右侧列表数据 */
 function updateRightListData() {
   // 使用 Set 来去重选中的用户ID
   const uniqueSelectedIds = new Set(selectedUserIds.value);
@@ -269,18 +267,18 @@ function updateRightListData() {
   rightListState.value.dataSource = filteredUsers.slice(startIndex, endIndex);
 }
 
-// 处理左侧分页变化
+/** 处理左侧分页变化 */
 async function handleLeftPaginationChange(page: number) {
   await loadUserData(page, leftListState.value.pagination.pageSize);
 }
 
-// 处理右侧分页变化
+/** 处理右侧分页变化 */
 function handleRightPaginationChange(page: number) {
   rightListState.value.pagination.current = page;
   updateRightListData();
 }
 
-// 处理用户选择变化
+/** 处理用户选择变化 */
 function handleUserChange(
   value: (number | string)[],
   _direction: string,
@@ -292,7 +290,7 @@ function handleUserChange(
   updateRightListData();
 }
 
-// 重置数据
+/** 重置数据 */
 function resetData() {
   userList.value = [];
   selectedUserIds.value = [];
@@ -324,7 +322,7 @@ function resetData() {
   };
 }
 
-// 处理部门搜索
+/** 处理部门搜索 */
 function handleDeptSearch(value: string) {
   deptSearchKeys.value = value;
 
@@ -347,7 +345,7 @@ function handleDeptSearch(value: string) {
   }
 }
 
-// 处理部门选择
+/** 处理部门选择 */
 async function handleDeptSelect(node: any) {
   // 更新选中的部门ID
   const newDeptId = node.id ? Number(node.id) : undefined;
diff --git a/apps/web-ele/src/views/system/user/components/select.vue b/apps/web-ele/src/views/system/user/components/select.vue
new file mode 100644
index 000000000..89cb5ef09
--- /dev/null
+++ b/apps/web-ele/src/views/system/user/components/select.vue
@@ -0,0 +1,132 @@
+<script lang="ts" setup>
+import type { SystemUserApi } from '#/api/system/user';
+
+import { computed, ref, useAttrs, watch } from 'vue';
+
+import { CircleX, Search } from '@vben/icons';
+
+import { ElInput, ElTooltip } from 'element-plus';
+
+import { getUser } from '#/api/system/user';
+
+import UserSelectDialog from './select-dialog.vue';
+
+defineOptions({ name: 'UserSelect', inheritAttrs: false });
+
+const props = withDefaults(
+  defineProps<{
+    clearable?: boolean;
+    disabled?: boolean;
+    modelValue?: number;
+    placeholder?: string;
+  }>(),
+  {
+    clearable: true,
+    disabled: false,
+    modelValue: undefined,
+    placeholder: '请选择用户',
+  },
+);
+
+const emit = defineEmits<{
+  change: [item: SystemUserApi.User | undefined];
+  'update:modelValue': [value: number | undefined];
+}>();
+
+const attrs = useAttrs();
+const dialogRef = ref<InstanceType<typeof UserSelectDialog>>();
+const hovering = ref(false);
+const selectedItem = ref<SystemUserApi.User>();
+
+const displayLabel = computed(
+  () => selectedItem.value?.nickname ?? selectedItem.value?.username ?? '',
+);
+
+const showClear = computed(
+  () =>
+    props.clearable &&
+    !props.disabled &&
+    hovering.value &&
+    props.modelValue != null,
+);
+
+/** 根据编号单条查询用户信息（用于编辑回显） */
+async function resolveItemById(id: number | undefined) {
+  if (id == null) {
+    selectedItem.value = undefined;
+    return;
+  }
+  if (selectedItem.value?.id === id) {
+    return;
+  }
+  selectedItem.value = await getUser(id);
+}
+
+watch(() => props.modelValue, resolveItemById, { immediate: true });
+
+/** 清空已选用户 */
+function clearSelected() {
+  selectedItem.value = undefined;
+  emit('update:modelValue', undefined);
+  emit('change', undefined);
+}
+
+/** 打开用户选择弹窗 */
+function handleClick(event: MouseEvent) {
+  if (props.disabled) {
+    return;
+  }
+  const target = event.target as HTMLElement;
+  if (showClear.value && target.closest('.el-input__suffix')) {
+    event.stopPropagation();
+    clearSelected();
+    return;
+  }
+  const selectedIds = props.modelValue == null ? [] : [props.modelValue];
+  dialogRef.value?.open(selectedIds, { multiple: false });
+}
+
+/** 弹窗选中回调 */
+function handleSelected(rows: SystemUserApi.User[]) {
+  const item = rows[0];
+  if (!item) {
+    return;
+  }
+  selectedItem.value = item;
+  emit('update:modelValue', item.id);
+  emit('change', item);
+}
+</script>
+
+<template>
+  <div
+    v-bind="attrs"
+    class="w-full"
+    :class="disabled ? 'cursor-not-allowed' : 'cursor-pointer'"
+    @click="handleClick"
+    @mouseenter="hovering = true"
+    @mouseleave="hovering = false"
+  >
+    <ElTooltip :disabled="!selectedItem" placement="top" :show-after="500">
+      <template #content>
+        <div v-if="selectedItem" class="leading-6">
+          <div>用户名称：{{ selectedItem.username || '-' }}</div>
+          <div>用户昵称：{{ selectedItem.nickname || '-' }}</div>
+          <div>手机号码：{{ selectedItem.mobile || '-' }}</div>
+        </div>
+      </template>
+      <ElInput
+        :disabled="disabled"
+        :model-value="displayLabel"
+        :placeholder="placeholder"
+        readonly
+      >
+        <template #suffix>
+          <CircleX v-if="showClear" class="size-4" />
+          <Search v-else class="size-4" />
+        </template>
+      </ElInput>
+    </ElTooltip>
+  </div>
+  <UserSelectDialog ref="dialogRef" @selected="handleSelected" />
+</template>
diff --git a/apps/web-ele/src/views/system/user/index.vue b/apps/web-ele/src/views/system/user/index.vue
index cc22c1a6f..a35f6face 100644
--- a/apps/web-ele/src/views/system/user/index.vue
+++ b/apps/web-ele/src/views/system/user/index.vue
@@ -21,10 +21,10 @@ import {
   updateUserStatus,
 } from '#/api/system/user';
 import { $t } from '#/locales';
+import { DeptTreeSelect } from '#/views/system/dept/components';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import AssignRoleForm from './modules/assign-role-form.vue';
-import DeptTree from './modules/dept-tree.vue';
 import Form from './modules/form.vue';
 import ImportForm from './modules/import-form.vue';
 import ResetPasswordForm from './modules/reset-password-form.vue';
@@ -62,8 +62,8 @@ async function handleExport() {
 
 /** 选择部门 */
 const searchDeptId = ref<number | undefined>(undefined);
-async function handleDeptSelect(dept: SystemDeptApi.Dept) {
-  searchDeptId.value = dept.id;
+async function handleDeptSelect(dept?: SystemDeptApi.Dept) {
+  searchDeptId.value = dept?.id;
   handleRefresh();
 }
 
@@ -203,7 +203,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     <div class="flex h-full w-full">
       <!-- 左侧部门树 -->
       <ElCard class="mr-4 h-full w-1/6">
-        <DeptTree @select="handleDeptSelect" />
+        <DeptTreeSelect @select="handleDeptSelect" />
       </ElCard>
       <!-- 右侧用户列表 -->
       <div class="w-5/6">
diff --git a/packages/constants/src/dict-enum.ts b/packages/constants/src/dict-enum.ts
index 70a30b7ba..7110f267d 100644
--- a/packages/constants/src/dict-enum.ts
+++ b/packages/constants/src/dict-enum.ts
@@ -232,6 +232,19 @@ const MES_DICT = {
   MES_WM_MISC_RECEIPT_STATUS: 'mes_wm_misc_receipt_status', // MES 杂项入库单状态
   MES_WM_OUTSOURCE_ISSUE_STATUS: 'mes_wm_outsource_issue_status', // MES 外协发料单状态
   MES_WM_OUTSOURCE_RECEIPT_STATUS: 'mes_wm_outsource_receipt_status', // MES 外协入库单状态
+  MES_WM_ARRIVAL_NOTICE_STATUS: 'mes_wm_arrival_notice_status', // MES 到货通知单状态
+  MES_WM_ITEM_RECEIPT_STATUS: 'mes_wm_item_receipt_status', // MES 采购入库单状态
+  MES_WM_RETURN_VENDOR_STATUS: 'mes_wm_return_vendor_status', // MES 供应商退货单状态
+  MES_WM_SALES_NOTICE_STATUS: 'mes_wm_sales_notice_status', // MES 发货通知单状态
+  MES_WM_RETURN_SALES_STATUS: 'mes_wm_return_sales_status', // MES 销售退货单状态
+  MES_WM_RETURN_ISSUE_STATUS: 'mes_wm_return_issue_status', // MES 生产退料单状态
+  MES_WM_RETURN_ISSUE_TYPE: 'mes_wm_return_issue_type', // MES 退料类型
+  MES_WM_PRODUCT_ISSUE_STATUS: 'mes_wm_product_issue_status', // MES 领料出库单状态
+  MES_WM_PRODUCT_RECEIPT_STATUS: 'mes_wm_product_receipt_status', // MES 产品入库单状态
+  MES_WM_STOCK_TAKING_TYPE: 'mes_wm_stock_taking_type', // MES 盘点类型
+  MES_WM_STOCK_TAKING_TASK_STATUS: 'mes_wm_stock_taking_task_status', // MES 盘点任务状态
+  MES_WM_STOCK_TAKING_LINE_STATUS: 'mes_wm_stock_taking_task_line_status', // MES 盘点任务行状态
+  MES_WM_STOCK_TAKING_PLAN_PARAM_TYPE: 'mes_wm_stock_taking_plan_param_type', // MES 盘点方案参数类型
 } as const;
 
 /** ========== WMS - 仓储管理模块 ========== */

From 4b38533c6ec30904f2dd525a1b2340042c89bd9d Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 30 May 2026 00:57:13 +0800
Subject: [PATCH 31/52] =?UTF-8?q?feat(mes):=20=E6=B7=BB=E5=8A=A0=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E5=85=A5=E5=BA=93=E5=8D=95=E5=8F=8A=E8=A1=8C=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=8E=A5=E5=8F=A3=E5=92=8C=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/mes/wm/arrivalnotice/index.ts     | 68 ++++++++++++++
 .../api/mes/wm/arrivalnotice/line/index.ts    | 58 ++++++++++++
 .../api/mes/wm/itemreceipt/detail/index.ts    | 58 ++++++++++++
 .../api/mes/wm/productissue/detail/index.ts   | 56 ++++++++++++
 .../src/api/mes/wm/productissue/index.ts      | 87 ++++++++++++++++++
 .../src/api/mes/wm/productissue/line/index.ts | 53 +++++++++++
 .../api/mes/wm/productreceipt/detail/index.ts | 58 ++++++++++++
 .../src/api/mes/wm/productreceipt/index.ts    | 91 +++++++++++++++++++
 .../api/mes/wm/productreceipt/line/index.ts   | 57 ++++++++++++
 .../api/mes/wm/productsales/detail/index.ts   | 58 ++++++++++++
 .../api/mes/wm/returnissue/detail/index.ts    | 56 ++++++++++++
 .../src/api/mes/wm/returnissue/index.ts       | 78 ++++++++++++++++
 .../src/api/mes/wm/returnissue/line/index.ts  | 58 ++++++++++++
 .../api/mes/wm/returnsales/detail/index.ts    | 55 +++++++++++
 .../src/api/mes/wm/returnsales/index.ts       | 78 ++++++++++++++++
 .../src/api/mes/wm/returnsales/line/index.ts  | 57 ++++++++++++
 .../api/mes/wm/returnvendor/detail/index.ts   | 56 ++++++++++++
 .../src/api/mes/wm/returnvendor/index.ts      | 88 ++++++++++++++++++
 .../src/api/mes/wm/returnvendor/line/index.ts | 54 +++++++++++
 .../src/api/mes/wm/salesnotice/index.ts       | 65 +++++++++++++
 .../src/api/mes/wm/salesnotice/line/index.ts  | 55 +++++++++++
 .../src/api/mes/wm/stocktaking/plan/index.ts  | 68 ++++++++++++++
 .../mes/wm/stocktaking/plan/param/index.ts    | 49 ++++++++++
 .../src/api/mes/wm/stocktaking/task/index.ts  | 86 ++++++++++++++++++
 .../api/mes/wm/stocktaking/task/line/index.ts | 72 +++++++++++++++
 .../mes/wm/stocktaking/task/result/index.ts   | 64 +++++++++++++
 .../packages/components/wm-package-select.vue |  6 +-
 .../src/api/mes/wm/itemreceipt/index.ts       | 54 ++++++++++-
 .../src/api/mes/wm/itemreceipt/line/index.ts  | 39 +++++++-
 .../src/api/mes/wm/productsales/index.ts      | 77 +++++++++++++++-
 .../src/api/mes/wm/productsales/line/index.ts | 32 +++++++
 .../packages/components/wm-package-select.vue |  6 +-
 .../system/user/components/select-modal.vue   |  8 +-
 33 files changed, 1886 insertions(+), 19 deletions(-)
 create mode 100644 apps/web-antd/src/api/mes/wm/arrivalnotice/index.ts
 create mode 100644 apps/web-antd/src/api/mes/wm/arrivalnotice/line/index.ts
 create mode 100644 apps/web-antd/src/api/mes/wm/itemreceipt/detail/index.ts
 create mode 100644 apps/web-antd/src/api/mes/wm/productissue/detail/index.ts
 create mode 100644 apps/web-antd/src/api/mes/wm/productissue/index.ts
 create mode 100644 apps/web-antd/src/api/mes/wm/productissue/line/index.ts
 create mode 100644 apps/web-antd/src/api/mes/wm/productreceipt/detail/index.ts
 create mode 100644 apps/web-antd/src/api/mes/wm/productreceipt/index.ts
 create mode 100644 apps/web-antd/src/api/mes/wm/productreceipt/line/index.ts
 create mode 100644 apps/web-antd/src/api/mes/wm/productsales/detail/index.ts
 create mode 100644 apps/web-antd/src/api/mes/wm/returnissue/detail/index.ts
 create mode 100644 apps/web-antd/src/api/mes/wm/returnissue/index.ts
 create mode 100644 apps/web-antd/src/api/mes/wm/returnissue/line/index.ts
 create mode 100644 apps/web-antd/src/api/mes/wm/returnsales/detail/index.ts
 create mode 100644 apps/web-antd/src/api/mes/wm/returnsales/index.ts
 create mode 100644 apps/web-antd/src/api/mes/wm/returnsales/line/index.ts
 create mode 100644 apps/web-antd/src/api/mes/wm/returnvendor/detail/index.ts
 create mode 100644 apps/web-antd/src/api/mes/wm/returnvendor/index.ts
 create mode 100644 apps/web-antd/src/api/mes/wm/returnvendor/line/index.ts
 create mode 100644 apps/web-antd/src/api/mes/wm/salesnotice/index.ts
 create mode 100644 apps/web-antd/src/api/mes/wm/salesnotice/line/index.ts
 create mode 100644 apps/web-antd/src/api/mes/wm/stocktaking/plan/index.ts
 create mode 100644 apps/web-antd/src/api/mes/wm/stocktaking/plan/param/index.ts
 create mode 100644 apps/web-antd/src/api/mes/wm/stocktaking/task/index.ts
 create mode 100644 apps/web-antd/src/api/mes/wm/stocktaking/task/line/index.ts
 create mode 100644 apps/web-antd/src/api/mes/wm/stocktaking/task/result/index.ts

diff --git a/apps/web-antd/src/api/mes/wm/arrivalnotice/index.ts b/apps/web-antd/src/api/mes/wm/arrivalnotice/index.ts
new file mode 100644
index 000000000..73e8eb849
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/arrivalnotice/index.ts
@@ -0,0 +1,68 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmArrivalNoticeApi {
+  /** MES 到货通知单 */
+  export interface ArrivalNotice {
+    id?: number; // 通知单编号
+    code?: string; // 通知单编号
+    name?: string; // 通知单名称
+    purchaseOrderCode?: string; // 采购订单编号
+    vendorId?: number; // 供应商编号
+    vendorCode?: string; // 供应商编码
+    vendorName?: string; // 供应商名称
+    arrivalDate?: number; // 到货日期
+    contactName?: string; // 联系人
+    contactTelephone?: string; // 联系方式
+    status?: number; // 单据状态
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询到货通知单分页 */
+export function getArrivalNoticePage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmArrivalNoticeApi.ArrivalNotice>>(
+    '/mes/wm/arrival-notice/page',
+    { params },
+  );
+}
+
+/** 查询到货通知单详情 */
+export function getArrivalNotice(id: number) {
+  return requestClient.get<MesWmArrivalNoticeApi.ArrivalNotice>(
+    `/mes/wm/arrival-notice/get?id=${id}`,
+  );
+}
+
+/** 新增到货通知单 */
+export function createArrivalNotice(
+  data: MesWmArrivalNoticeApi.ArrivalNotice,
+) {
+  return requestClient.post<number>('/mes/wm/arrival-notice/create', data);
+}
+
+/** 修改到货通知单 */
+export function updateArrivalNotice(
+  data: MesWmArrivalNoticeApi.ArrivalNotice,
+) {
+  return requestClient.put('/mes/wm/arrival-notice/update', data);
+}
+
+/** 删除到货通知单 */
+export function deleteArrivalNotice(id: number) {
+  return requestClient.delete(`/mes/wm/arrival-notice/delete?id=${id}`);
+}
+
+/** 提交到货通知单 */
+export function submitArrivalNotice(id: number) {
+  return requestClient.put(`/mes/wm/arrival-notice/submit?id=${id}`);
+}
+
+/** 导出到货通知单 */
+export function exportArrivalNotice(params: any) {
+  return requestClient.download('/mes/wm/arrival-notice/export-excel', {
+    params,
+  });
+}
diff --git a/apps/web-antd/src/api/mes/wm/arrivalnotice/line/index.ts b/apps/web-antd/src/api/mes/wm/arrivalnotice/line/index.ts
new file mode 100644
index 000000000..b763b2ad5
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/arrivalnotice/line/index.ts
@@ -0,0 +1,58 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmArrivalNoticeLineApi {
+  /** MES 到货通知单行 */
+  export interface ArrivalNoticeLine {
+    id?: number; // 行编号
+    noticeId?: number; // 到货通知单编号
+    itemId?: number; // 物料编号
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    specification?: string; // 规格型号
+    unitMeasureName?: string; // 单位
+    arrivalQuantity?: number; // 到货数量
+    qualifiedQuantity?: number; // 合格数量
+    iqcCheckFlag?: boolean; // 是否检验
+    iqcId?: number; // 来料检验单编号
+    iqcCode?: string; // 来料检验单编码
+    remark?: string; // 备注
+  }
+}
+
+/** 查询到货通知单行分页 */
+export function getArrivalNoticeLinePage(params: PageParam) {
+  return requestClient.get<
+    PageResult<MesWmArrivalNoticeLineApi.ArrivalNoticeLine>
+  >('/mes/wm/arrival-notice-line/page', { params });
+}
+
+/** 查询到货通知单行详情 */
+export function getArrivalNoticeLine(id: number) {
+  return requestClient.get<MesWmArrivalNoticeLineApi.ArrivalNoticeLine>(
+    `/mes/wm/arrival-notice-line/get?id=${id}`,
+  );
+}
+
+/** 新增到货通知单行 */
+export function createArrivalNoticeLine(
+  data: MesWmArrivalNoticeLineApi.ArrivalNoticeLine,
+) {
+  return requestClient.post<number>(
+    '/mes/wm/arrival-notice-line/create',
+    data,
+  );
+}
+
+/** 修改到货通知单行 */
+export function updateArrivalNoticeLine(
+  data: MesWmArrivalNoticeLineApi.ArrivalNoticeLine,
+) {
+  return requestClient.put('/mes/wm/arrival-notice-line/update', data);
+}
+
+/** 删除到货通知单行 */
+export function deleteArrivalNoticeLine(id: number) {
+  return requestClient.delete(`/mes/wm/arrival-notice-line/delete?id=${id}`);
+}
diff --git a/apps/web-antd/src/api/mes/wm/itemreceipt/detail/index.ts b/apps/web-antd/src/api/mes/wm/itemreceipt/detail/index.ts
new file mode 100644
index 000000000..b147288ed
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/itemreceipt/detail/index.ts
@@ -0,0 +1,58 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesWmItemReceiptDetailApi {
+  /** MES 采购入库明细 */
+  export interface ItemReceiptDetail {
+    id?: number; // 明细编号
+    lineId?: number; // 入库单行编号
+    receiptId?: number; // 入库单编号
+    itemId?: number; // 物料编号
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    specification?: string; // 规格型号
+    unitMeasureName?: string; // 单位
+    quantity?: number; // 数量
+    batchId?: number; // 批次编号
+    warehouseId?: number; // 仓库编号
+    warehouseName?: string; // 仓库名称
+    locationId?: number; // 库区编号
+    locationName?: string; // 库区名称
+    areaId?: number; // 库位编号
+    areaName?: string; // 库位名称
+    remark?: string; // 备注
+  }
+}
+
+/** 查询采购入库明细列表（按行编号） */
+export function getItemReceiptDetailListByLineId(lineId: number) {
+  return requestClient.get<MesWmItemReceiptDetailApi.ItemReceiptDetail[]>(
+    '/mes/wm/item-receipt-detail/list-by-line',
+    { params: { lineId } },
+  );
+}
+
+/** 查询采购入库明细详情 */
+export function getItemReceiptDetail(id: number) {
+  return requestClient.get<MesWmItemReceiptDetailApi.ItemReceiptDetail>(
+    `/mes/wm/item-receipt-detail/get?id=${id}`,
+  );
+}
+
+/** 新增采购入库明细 */
+export function createItemReceiptDetail(
+  data: MesWmItemReceiptDetailApi.ItemReceiptDetail,
+) {
+  return requestClient.post<number>('/mes/wm/item-receipt-detail/create', data);
+}
+
+/** 修改采购入库明细 */
+export function updateItemReceiptDetail(
+  data: MesWmItemReceiptDetailApi.ItemReceiptDetail,
+) {
+  return requestClient.put('/mes/wm/item-receipt-detail/update', data);
+}
+
+/** 删除采购入库明细 */
+export function deleteItemReceiptDetail(id: number) {
+  return requestClient.delete(`/mes/wm/item-receipt-detail/delete?id=${id}`);
+}
diff --git a/apps/web-antd/src/api/mes/wm/productissue/detail/index.ts b/apps/web-antd/src/api/mes/wm/productissue/detail/index.ts
new file mode 100644
index 000000000..96def9c44
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/productissue/detail/index.ts
@@ -0,0 +1,56 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesWmProductIssueDetailApi {
+  /** MES 领料出库明细 */
+  export interface ProductIssueDetail {
+    id?: number; // 明细编号
+    issueId?: number; // 领料单编号
+    lineId?: number; // 领料单行编号
+    materialStockId?: number; // 库存记录编号
+    itemId?: number; // 物料编号
+    quantity?: number; // 数量
+    batchId?: number; // 批次编号
+    batchCode?: string; // 批次号
+    warehouseId?: number; // 仓库编号
+    warehouseName?: string; // 仓库名称
+    locationId?: number; // 库区编号
+    locationName?: string; // 库区名称
+    areaId?: number; // 库位编号
+    areaName?: string; // 库位名称
+    remark?: string; // 备注
+  }
+}
+
+/** 查询领料出库明细列表（按行编号） */
+export function getProductIssueDetailListByLineId(lineId: number) {
+  return requestClient.get<MesWmProductIssueDetailApi.ProductIssueDetail[]>(
+    '/mes/wm/product-issue-detail/list-by-line',
+    { params: { lineId } },
+  );
+}
+
+/** 查询领料出库明细详情 */
+export function getProductIssueDetail(id: number) {
+  return requestClient.get<MesWmProductIssueDetailApi.ProductIssueDetail>(
+    `/mes/wm/product-issue-detail/get?id=${id}`,
+  );
+}
+
+/** 新增领料出库明细 */
+export function createProductIssueDetail(
+  data: MesWmProductIssueDetailApi.ProductIssueDetail,
+) {
+  return requestClient.post<number>('/mes/wm/product-issue-detail/create', data);
+}
+
+/** 修改领料出库明细 */
+export function updateProductIssueDetail(
+  data: MesWmProductIssueDetailApi.ProductIssueDetail,
+) {
+  return requestClient.put('/mes/wm/product-issue-detail/update', data);
+}
+
+/** 删除领料出库明细 */
+export function deleteProductIssueDetail(id: number) {
+  return requestClient.delete(`/mes/wm/product-issue-detail/delete?id=${id}`);
+}
diff --git a/apps/web-antd/src/api/mes/wm/productissue/index.ts b/apps/web-antd/src/api/mes/wm/productissue/index.ts
new file mode 100644
index 000000000..78e792289
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/productissue/index.ts
@@ -0,0 +1,87 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmProductIssueApi {
+  /** MES 领料出库单 */
+  export interface ProductIssue {
+    id?: number; // 领料单编号
+    code?: string; // 领料单编号
+    name?: string; // 领料单名称
+    workstationId?: number; // 工作站编号
+    workstationCode?: string; // 工作站编码
+    workstationName?: string; // 工作站名称
+    workOrderId?: number; // 生产工单编号
+    workOrderCode?: string; // 生产工单编码
+    clientCode?: string; // 客户编码
+    clientName?: string; // 客户名称
+    requiredTime?: number; // 需求时间
+    status?: number; // 单据状态
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询领料出库单分页 */
+export function getProductIssuePage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmProductIssueApi.ProductIssue>>(
+    '/mes/wm/product-issue/page',
+    { params },
+  );
+}
+
+/** 查询领料出库单详情 */
+export function getProductIssue(id: number) {
+  return requestClient.get<MesWmProductIssueApi.ProductIssue>(
+    `/mes/wm/product-issue/get?id=${id}`,
+  );
+}
+
+/** 新增领料出库单 */
+export function createProductIssue(data: MesWmProductIssueApi.ProductIssue) {
+  return requestClient.post<number>('/mes/wm/product-issue/create', data);
+}
+
+/** 修改领料出库单 */
+export function updateProductIssue(data: MesWmProductIssueApi.ProductIssue) {
+  return requestClient.put('/mes/wm/product-issue/update', data);
+}
+
+/** 删除领料出库单 */
+export function deleteProductIssue(id: number) {
+  return requestClient.delete(`/mes/wm/product-issue/delete?id=${id}`);
+}
+
+/** 提交领料出库单 */
+export function submitProductIssue(id: number) {
+  return requestClient.put(`/mes/wm/product-issue/submit?id=${id}`);
+}
+
+/** 执行拣货 */
+export function stockProductIssue(id: number) {
+  return requestClient.put(`/mes/wm/product-issue/stock?id=${id}`);
+}
+
+/** 完成领料出库单 */
+export function finishProductIssue(id: number) {
+  return requestClient.put(`/mes/wm/product-issue/finish?id=${id}`);
+}
+
+/** 取消领料出库单 */
+export function cancelProductIssue(id: number) {
+  return requestClient.put(`/mes/wm/product-issue/cancel?id=${id}`);
+}
+
+/** 校验领料出库单拣货数量是否与领料数量一致 */
+export function checkProductIssueQuantity(id: number) {
+  return requestClient.get<boolean>(
+    `/mes/wm/product-issue/check-quantity?id=${id}`,
+  );
+}
+
+/** 导出领料出库单 */
+export function exportProductIssue(params: any) {
+  return requestClient.download('/mes/wm/product-issue/export-excel', {
+    params,
+  });
+}
diff --git a/apps/web-antd/src/api/mes/wm/productissue/line/index.ts b/apps/web-antd/src/api/mes/wm/productissue/line/index.ts
new file mode 100644
index 000000000..65ae7a187
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/productissue/line/index.ts
@@ -0,0 +1,53 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmProductIssueLineApi {
+  /** MES 领料出库单行 */
+  export interface ProductIssueLine {
+    id?: number; // 行编号
+    issueId?: number; // 领料单编号
+    itemId?: number; // 物料编号
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    specification?: string; // 规格型号
+    unitMeasureName?: string; // 单位
+    quantity?: number; // 领料数量
+    batchId?: number; // 批次编号
+    remark?: string; // 备注
+  }
+}
+
+/** 查询领料出库单行分页 */
+export function getProductIssueLinePage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmProductIssueLineApi.ProductIssueLine>>(
+    '/mes/wm/product-issue-line/page',
+    { params },
+  );
+}
+
+/** 查询领料出库单行详情 */
+export function getProductIssueLine(id: number) {
+  return requestClient.get<MesWmProductIssueLineApi.ProductIssueLine>(
+    `/mes/wm/product-issue-line/get?id=${id}`,
+  );
+}
+
+/** 新增领料出库单行 */
+export function createProductIssueLine(
+  data: MesWmProductIssueLineApi.ProductIssueLine,
+) {
+  return requestClient.post<number>('/mes/wm/product-issue-line/create', data);
+}
+
+/** 修改领料出库单行 */
+export function updateProductIssueLine(
+  data: MesWmProductIssueLineApi.ProductIssueLine,
+) {
+  return requestClient.put('/mes/wm/product-issue-line/update', data);
+}
+
+/** 删除领料出库单行 */
+export function deleteProductIssueLine(id: number) {
+  return requestClient.delete(`/mes/wm/product-issue-line/delete?id=${id}`);
+}
diff --git a/apps/web-antd/src/api/mes/wm/productreceipt/detail/index.ts b/apps/web-antd/src/api/mes/wm/productreceipt/detail/index.ts
new file mode 100644
index 000000000..8e371a4d9
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/productreceipt/detail/index.ts
@@ -0,0 +1,58 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesWmProductReceiptDetailApi {
+  /** MES 产品入库明细 */
+  export interface ProductReceiptDetail {
+    id?: number; // 明细编号
+    lineId?: number; // 入库单行编号
+    receiptId?: number; // 入库单编号
+    itemId?: number; // 物料编号
+    itemCode?: string; // 物料编码
+    quantity?: number; // 数量
+    batchId?: number; // 批次编号
+    warehouseId?: number; // 仓库编号
+    warehouseName?: string; // 仓库名称
+    locationId?: number; // 库区编号
+    locationName?: string; // 库区名称
+    areaId?: number; // 库位编号
+    areaName?: string; // 库位名称
+    remark?: string; // 备注
+  }
+}
+
+/** 查询产品入库明细列表（按行编号） */
+export function getProductReceiptDetailListByLineId(lineId: number) {
+  return requestClient.get<MesWmProductReceiptDetailApi.ProductReceiptDetail[]>(
+    '/mes/wm/product-receipt-detail/list-by-line',
+    { params: { lineId } },
+  );
+}
+
+/** 查询产品入库明细详情 */
+export function getProductReceiptDetail(id: number) {
+  return requestClient.get<MesWmProductReceiptDetailApi.ProductReceiptDetail>(
+    `/mes/wm/product-receipt-detail/get?id=${id}`,
+  );
+}
+
+/** 新增产品入库明细 */
+export function createProductReceiptDetail(
+  data: MesWmProductReceiptDetailApi.ProductReceiptDetail,
+) {
+  return requestClient.post<number>(
+    '/mes/wm/product-receipt-detail/create',
+    data,
+  );
+}
+
+/** 修改产品入库明细 */
+export function updateProductReceiptDetail(
+  data: MesWmProductReceiptDetailApi.ProductReceiptDetail,
+) {
+  return requestClient.put('/mes/wm/product-receipt-detail/update', data);
+}
+
+/** 删除产品入库明细 */
+export function deleteProductReceiptDetail(id: number) {
+  return requestClient.delete(`/mes/wm/product-receipt-detail/delete?id=${id}`);
+}
diff --git a/apps/web-antd/src/api/mes/wm/productreceipt/index.ts b/apps/web-antd/src/api/mes/wm/productreceipt/index.ts
new file mode 100644
index 000000000..73e30a178
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/productreceipt/index.ts
@@ -0,0 +1,91 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmProductReceiptApi {
+  /** MES 产品入库单 */
+  export interface ProductReceipt {
+    id?: number; // 入库单编号
+    code?: string; // 入库单编码
+    name?: string; // 入库单名称
+    workOrderId?: number; // 生产工单编号
+    workOrderCode?: string; // 生产工单编码
+    itemId?: number; // 产品物料编号
+    itemCode?: string; // 产品物料编码
+    itemName?: string; // 产品物料名称
+    specification?: string; // 规格型号
+    unitMeasureName?: string; // 单位
+    receiptDate?: number; // 入库日期
+    status?: number; // 单据状态
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询产品入库单分页 */
+export function getProductReceiptPage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmProductReceiptApi.ProductReceipt>>(
+    '/mes/wm/product-receipt/page',
+    { params },
+  );
+}
+
+/** 查询产品入库单详情 */
+export function getProductReceipt(id: number) {
+  return requestClient.get<MesWmProductReceiptApi.ProductReceipt>(
+    `/mes/wm/product-receipt/get?id=${id}`,
+  );
+}
+
+/** 新增产品入库单 */
+export function createProductReceipt(
+  data: MesWmProductReceiptApi.ProductReceipt,
+) {
+  return requestClient.post<number>('/mes/wm/product-receipt/create', data);
+}
+
+/** 修改产品入库单 */
+export function updateProductReceipt(
+  data: MesWmProductReceiptApi.ProductReceipt,
+) {
+  return requestClient.put('/mes/wm/product-receipt/update', data);
+}
+
+/** 删除产品入库单 */
+export function deleteProductReceipt(id: number) {
+  return requestClient.delete(`/mes/wm/product-receipt/delete?id=${id}`);
+}
+
+/** 提交产品入库单 */
+export function submitProductReceipt(id: number) {
+  return requestClient.put(`/mes/wm/product-receipt/submit?id=${id}`);
+}
+
+/** 执行上架 */
+export function stockProductReceipt(id: number) {
+  return requestClient.put(`/mes/wm/product-receipt/stock?id=${id}`);
+}
+
+/** 执行入库 */
+export function finishProductReceipt(id: number) {
+  return requestClient.put(`/mes/wm/product-receipt/finish?id=${id}`);
+}
+
+/** 取消产品入库单 */
+export function cancelProductReceipt(id: number) {
+  return requestClient.put(`/mes/wm/product-receipt/cancel?id=${id}`);
+}
+
+/** 校验产品入库单明细数量是否与行收货数量一致 */
+export function checkProductReceiptQuantity(id: number) {
+  return requestClient.get<boolean>(
+    `/mes/wm/product-receipt/check-quantity?id=${id}`,
+  );
+}
+
+/** 导出产品入库单 */
+export function exportProductReceipt(params: any) {
+  return requestClient.download('/mes/wm/product-receipt/export-excel', {
+    params,
+  });
+}
diff --git a/apps/web-antd/src/api/mes/wm/productreceipt/line/index.ts b/apps/web-antd/src/api/mes/wm/productreceipt/line/index.ts
new file mode 100644
index 000000000..04e113b3b
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/productreceipt/line/index.ts
@@ -0,0 +1,57 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmProductReceiptLineApi {
+  /** MES 产品入库单行 */
+  export interface ProductReceiptLine {
+    id?: number; // 行编号
+    receiptId?: number; // 入库单编号
+    itemId?: number; // 物料编号
+    materialStockId?: number; // 库存记录编号
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    specification?: string; // 规格型号
+    unitMeasureName?: string; // 单位
+    quantity?: number; // 入库数量
+    batchId?: number; // 批次编号
+    batchCode?: string; // 批次号
+    remark?: string; // 备注
+  }
+}
+
+/** 查询产品入库单行分页 */
+export function getProductReceiptLinePage(params: PageParam) {
+  return requestClient.get<
+    PageResult<MesWmProductReceiptLineApi.ProductReceiptLine>
+  >('/mes/wm/product-receipt-line/page', { params });
+}
+
+/** 查询产品入库单行详情 */
+export function getProductReceiptLine(id: number) {
+  return requestClient.get<MesWmProductReceiptLineApi.ProductReceiptLine>(
+    `/mes/wm/product-receipt-line/get?id=${id}`,
+  );
+}
+
+/** 新增产品入库单行 */
+export function createProductReceiptLine(
+  data: MesWmProductReceiptLineApi.ProductReceiptLine,
+) {
+  return requestClient.post<number>(
+    '/mes/wm/product-receipt-line/create',
+    data,
+  );
+}
+
+/** 修改产品入库单行 */
+export function updateProductReceiptLine(
+  data: MesWmProductReceiptLineApi.ProductReceiptLine,
+) {
+  return requestClient.put('/mes/wm/product-receipt-line/update', data);
+}
+
+/** 删除产品入库单行 */
+export function deleteProductReceiptLine(id: number) {
+  return requestClient.delete(`/mes/wm/product-receipt-line/delete?id=${id}`);
+}
diff --git a/apps/web-antd/src/api/mes/wm/productsales/detail/index.ts b/apps/web-antd/src/api/mes/wm/productsales/detail/index.ts
new file mode 100644
index 000000000..34aa22d5b
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/productsales/detail/index.ts
@@ -0,0 +1,58 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesWmProductSalesDetailApi {
+  /** MES 销售出库明细 */
+  export interface ProductSalesDetail {
+    id?: number; // 明细编号
+    lineId?: number; // 出库单行编号
+    salesId?: number; // 出库单编号
+    itemId?: number; // 物料编号
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    quantity?: number; // 数量
+    materialStockId?: number; // 库存记录编号
+    batchId?: number; // 批次编号
+    batchCode?: string; // 批次号
+    warehouseId?: number; // 仓库编号
+    warehouseName?: string; // 仓库名称
+    locationId?: number; // 库区编号
+    locationName?: string; // 库区名称
+    areaId?: number; // 库位编号
+    areaName?: string; // 库位名称
+    remark?: string; // 备注
+  }
+}
+
+/** 查询销售出库明细列表（按行编号） */
+export function getProductSalesDetailListByLineId(lineId: number) {
+  return requestClient.get<MesWmProductSalesDetailApi.ProductSalesDetail[]>(
+    '/mes/wm/product-sales-detail/list-by-line',
+    { params: { lineId } },
+  );
+}
+
+/** 查询销售出库明细详情 */
+export function getProductSalesDetail(id: number) {
+  return requestClient.get<MesWmProductSalesDetailApi.ProductSalesDetail>(
+    `/mes/wm/product-sales-detail/get?id=${id}`,
+  );
+}
+
+/** 新增销售出库明细 */
+export function createProductSalesDetail(
+  data: MesWmProductSalesDetailApi.ProductSalesDetail,
+) {
+  return requestClient.post<number>('/mes/wm/product-sales-detail/create', data);
+}
+
+/** 修改销售出库明细 */
+export function updateProductSalesDetail(
+  data: MesWmProductSalesDetailApi.ProductSalesDetail,
+) {
+  return requestClient.put('/mes/wm/product-sales-detail/update', data);
+}
+
+/** 删除销售出库明细 */
+export function deleteProductSalesDetail(id: number) {
+  return requestClient.delete(`/mes/wm/product-sales-detail/delete?id=${id}`);
+}
diff --git a/apps/web-antd/src/api/mes/wm/returnissue/detail/index.ts b/apps/web-antd/src/api/mes/wm/returnissue/detail/index.ts
new file mode 100644
index 000000000..7c878bb15
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/returnissue/detail/index.ts
@@ -0,0 +1,56 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesWmReturnIssueDetailApi {
+  /** MES 生产退料明细 */
+  export interface ReturnIssueDetail {
+    id?: number; // 明细编号
+    issueId?: number; // 退料单编号
+    lineId?: number; // 退料单行编号
+    materialStockId?: number; // 库存记录编号
+    itemId?: number; // 物料编号
+    quantity?: number; // 数量
+    batchId?: number; // 批次编号
+    batchCode?: string; // 批次号
+    warehouseId?: number; // 仓库编号
+    warehouseName?: string; // 仓库名称
+    locationId?: number; // 库区编号
+    locationName?: string; // 库区名称
+    areaId?: number; // 库位编号
+    areaName?: string; // 库位名称
+    remark?: string; // 备注
+  }
+}
+
+/** 查询生产退料明细列表（按行编号） */
+export function getReturnIssueDetailListByLineId(lineId: number) {
+  return requestClient.get<MesWmReturnIssueDetailApi.ReturnIssueDetail[]>(
+    '/mes/wm/return-issue-detail/list-by-line',
+    { params: { lineId } },
+  );
+}
+
+/** 查询生产退料明细详情 */
+export function getReturnIssueDetail(id: number) {
+  return requestClient.get<MesWmReturnIssueDetailApi.ReturnIssueDetail>(
+    `/mes/wm/return-issue-detail/get?id=${id}`,
+  );
+}
+
+/** 新增生产退料明细 */
+export function createReturnIssueDetail(
+  data: MesWmReturnIssueDetailApi.ReturnIssueDetail,
+) {
+  return requestClient.post<number>('/mes/wm/return-issue-detail/create', data);
+}
+
+/** 修改生产退料明细 */
+export function updateReturnIssueDetail(
+  data: MesWmReturnIssueDetailApi.ReturnIssueDetail,
+) {
+  return requestClient.put('/mes/wm/return-issue-detail/update', data);
+}
+
+/** 删除生产退料明细 */
+export function deleteReturnIssueDetail(id: number) {
+  return requestClient.delete(`/mes/wm/return-issue-detail/delete?id=${id}`);
+}
diff --git a/apps/web-antd/src/api/mes/wm/returnissue/index.ts b/apps/web-antd/src/api/mes/wm/returnissue/index.ts
new file mode 100644
index 000000000..c2a10b099
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/returnissue/index.ts
@@ -0,0 +1,78 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmReturnIssueApi {
+  /** MES 生产退料单 */
+  export interface ReturnIssue {
+    id?: number; // 退料单编号
+    code?: string; // 退料单编号
+    name?: string; // 退料单名称
+    workstationId?: number; // 工作站编号
+    workstationName?: string; // 工作站名称
+    workOrderId?: number; // 生产工单编号
+    workOrderCode?: string; // 生产工单编码
+    type?: number; // 退料类型
+    returnDate?: number; // 退料日期
+    status?: number; // 单据状态
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询生产退料单分页 */
+export function getReturnIssuePage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmReturnIssueApi.ReturnIssue>>(
+    '/mes/wm/return-issue/page',
+    { params },
+  );
+}
+
+/** 查询生产退料单详情 */
+export function getReturnIssue(id: number) {
+  return requestClient.get<MesWmReturnIssueApi.ReturnIssue>(
+    `/mes/wm/return-issue/get?id=${id}`,
+  );
+}
+
+/** 新增生产退料单 */
+export function createReturnIssue(data: MesWmReturnIssueApi.ReturnIssue) {
+  return requestClient.post<number>('/mes/wm/return-issue/create', data);
+}
+
+/** 修改生产退料单 */
+export function updateReturnIssue(data: MesWmReturnIssueApi.ReturnIssue) {
+  return requestClient.put('/mes/wm/return-issue/update', data);
+}
+
+/** 删除生产退料单 */
+export function deleteReturnIssue(id: number) {
+  return requestClient.delete(`/mes/wm/return-issue/delete?id=${id}`);
+}
+
+/** 提交生产退料单 */
+export function submitReturnIssue(id: number) {
+  return requestClient.put(`/mes/wm/return-issue/submit?id=${id}`);
+}
+
+/** 入库上架 */
+export function stockReturnIssue(id: number) {
+  return requestClient.put(`/mes/wm/return-issue/stock?id=${id}`);
+}
+
+/** 完成生产退料单 */
+export function finishReturnIssue(id: number) {
+  return requestClient.put(`/mes/wm/return-issue/finish?id=${id}`);
+}
+
+/** 取消生产退料单 */
+export function cancelReturnIssue(id: number) {
+  return requestClient.put(`/mes/wm/return-issue/cancel?id=${id}`);
+}
+
+/** 导出生产退料单 */
+export function exportReturnIssue(params: any) {
+  return requestClient.download('/mes/wm/return-issue/export-excel', {
+    params,
+  });
+}
diff --git a/apps/web-antd/src/api/mes/wm/returnissue/line/index.ts b/apps/web-antd/src/api/mes/wm/returnissue/line/index.ts
new file mode 100644
index 000000000..05bef0792
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/returnissue/line/index.ts
@@ -0,0 +1,58 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmReturnIssueLineApi {
+  /** MES 生产退料单行 */
+  export interface ReturnIssueLine {
+    id?: number; // 行编号
+    issueId?: number; // 退料单编号
+    itemId?: number; // 物料编号
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    specification?: string; // 规格型号
+    unitMeasureName?: string; // 单位
+    materialStockId?: number; // 库存记录编号
+    quantity?: number; // 退料数量
+    batchId?: number; // 批次编号
+    batchCode?: string; // 批次号
+    rqcCheckFlag?: boolean; // 是否检测
+    qualityStatus?: number; // 质量状态
+    rqcId?: number; // 退货检验单编号
+    remark?: string; // 备注
+  }
+}
+
+/** 查询生产退料单行分页 */
+export function getReturnIssueLinePage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmReturnIssueLineApi.ReturnIssueLine>>(
+    '/mes/wm/return-issue-line/page',
+    { params },
+  );
+}
+
+/** 查询生产退料单行详情 */
+export function getReturnIssueLine(id: number) {
+  return requestClient.get<MesWmReturnIssueLineApi.ReturnIssueLine>(
+    `/mes/wm/return-issue-line/get?id=${id}`,
+  );
+}
+
+/** 新增生产退料单行 */
+export function createReturnIssueLine(
+  data: MesWmReturnIssueLineApi.ReturnIssueLine,
+) {
+  return requestClient.post<number>('/mes/wm/return-issue-line/create', data);
+}
+
+/** 修改生产退料单行 */
+export function updateReturnIssueLine(
+  data: MesWmReturnIssueLineApi.ReturnIssueLine,
+) {
+  return requestClient.put('/mes/wm/return-issue-line/update', data);
+}
+
+/** 删除生产退料单行 */
+export function deleteReturnIssueLine(id: number) {
+  return requestClient.delete(`/mes/wm/return-issue-line/delete?id=${id}`);
+}
diff --git a/apps/web-antd/src/api/mes/wm/returnsales/detail/index.ts b/apps/web-antd/src/api/mes/wm/returnsales/detail/index.ts
new file mode 100644
index 000000000..dfba83fa7
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/returnsales/detail/index.ts
@@ -0,0 +1,55 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesWmReturnSalesDetailApi {
+  /** MES 销售退货明细 */
+  export interface ReturnSalesDetail {
+    id?: number; // 明细编号
+    returnId?: number; // 退货单编号
+    lineId?: number; // 退货单行编号
+    itemId?: number; // 物料编号
+    quantity?: number; // 数量
+    batchId?: number; // 批次编号
+    batchCode?: string; // 批次号
+    warehouseId?: number; // 仓库编号
+    warehouseName?: string; // 仓库名称
+    locationId?: number; // 库区编号
+    locationName?: string; // 库区名称
+    areaId?: number; // 库位编号
+    areaName?: string; // 库位名称
+    remark?: string; // 备注
+  }
+}
+
+/** 查询销售退货明细列表（按行编号） */
+export function getReturnSalesDetailListByLineId(lineId: number) {
+  return requestClient.get<MesWmReturnSalesDetailApi.ReturnSalesDetail[]>(
+    '/mes/wm/return-sales-detail/list-by-line',
+    { params: { lineId } },
+  );
+}
+
+/** 查询销售退货明细详情 */
+export function getReturnSalesDetail(id: number) {
+  return requestClient.get<MesWmReturnSalesDetailApi.ReturnSalesDetail>(
+    `/mes/wm/return-sales-detail/get?id=${id}`,
+  );
+}
+
+/** 新增销售退货明细 */
+export function createReturnSalesDetail(
+  data: MesWmReturnSalesDetailApi.ReturnSalesDetail,
+) {
+  return requestClient.post<number>('/mes/wm/return-sales-detail/create', data);
+}
+
+/** 修改销售退货明细 */
+export function updateReturnSalesDetail(
+  data: MesWmReturnSalesDetailApi.ReturnSalesDetail,
+) {
+  return requestClient.put('/mes/wm/return-sales-detail/update', data);
+}
+
+/** 删除销售退货明细 */
+export function deleteReturnSalesDetail(id: number) {
+  return requestClient.delete(`/mes/wm/return-sales-detail/delete?id=${id}`);
+}
diff --git a/apps/web-antd/src/api/mes/wm/returnsales/index.ts b/apps/web-antd/src/api/mes/wm/returnsales/index.ts
new file mode 100644
index 000000000..8ad32ce0e
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/returnsales/index.ts
@@ -0,0 +1,78 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmReturnSalesApi {
+  /** MES 销售退货单 */
+  export interface ReturnSales {
+    id?: number; // 退货单编号
+    code?: string; // 退货单编号
+    name?: string; // 退货单名称
+    salesOrderCode?: string; // 销售订单号
+    clientId?: number; // 客户编号
+    clientCode?: string; // 客户编码
+    clientName?: string; // 客户名称
+    returnDate?: number; // 退货日期
+    returnReason?: string; // 退货原因
+    status?: number; // 单据状态
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询销售退货单分页 */
+export function getReturnSalesPage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmReturnSalesApi.ReturnSales>>(
+    '/mes/wm/return-sales/page',
+    { params },
+  );
+}
+
+/** 查询销售退货单详情 */
+export function getReturnSales(id: number) {
+  return requestClient.get<MesWmReturnSalesApi.ReturnSales>(
+    `/mes/wm/return-sales/get?id=${id}`,
+  );
+}
+
+/** 新增销售退货单 */
+export function createReturnSales(data: MesWmReturnSalesApi.ReturnSales) {
+  return requestClient.post<number>('/mes/wm/return-sales/create', data);
+}
+
+/** 修改销售退货单 */
+export function updateReturnSales(data: MesWmReturnSalesApi.ReturnSales) {
+  return requestClient.put('/mes/wm/return-sales/update', data);
+}
+
+/** 删除销售退货单 */
+export function deleteReturnSales(id: number) {
+  return requestClient.delete(`/mes/wm/return-sales/delete?id=${id}`);
+}
+
+/** 提交销售退货单 */
+export function submitReturnSales(id: number) {
+  return requestClient.put(`/mes/wm/return-sales/submit?id=${id}`);
+}
+
+/** 执行退货 */
+export function finishReturnSales(id: number) {
+  return requestClient.put(`/mes/wm/return-sales/finish?id=${id}`);
+}
+
+/** 执行上架 */
+export function stockReturnSales(id: number) {
+  return requestClient.put(`/mes/wm/return-sales/stock?id=${id}`);
+}
+
+/** 取消销售退货单 */
+export function cancelReturnSales(id: number) {
+  return requestClient.put(`/mes/wm/return-sales/cancel?id=${id}`);
+}
+
+/** 导出销售退货单 */
+export function exportReturnSales(params: any) {
+  return requestClient.download('/mes/wm/return-sales/export-excel', {
+    params,
+  });
+}
diff --git a/apps/web-antd/src/api/mes/wm/returnsales/line/index.ts b/apps/web-antd/src/api/mes/wm/returnsales/line/index.ts
new file mode 100644
index 000000000..f08ce776b
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/returnsales/line/index.ts
@@ -0,0 +1,57 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmReturnSalesLineApi {
+  /** MES 销售退货单行 */
+  export interface ReturnSalesLine {
+    id?: number; // 行编号
+    returnId?: number; // 退货单编号
+    itemId?: number; // 物料编号
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    specification?: string; // 规格型号
+    unitMeasureName?: string; // 单位
+    quantity?: number; // 退货数量
+    batchId?: number; // 批次编号
+    batchCode?: string; // 批次号
+    rqcCheckFlag?: boolean; // 是否需要质检
+    rqcId?: number; // 退货检验单编号
+    qualityStatus?: number; // 质量状态
+    remark?: string; // 备注
+  }
+}
+
+/** 查询销售退货单行分页 */
+export function getReturnSalesLinePage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmReturnSalesLineApi.ReturnSalesLine>>(
+    '/mes/wm/return-sales-line/page',
+    { params },
+  );
+}
+
+/** 查询销售退货单行详情 */
+export function getReturnSalesLine(id: number) {
+  return requestClient.get<MesWmReturnSalesLineApi.ReturnSalesLine>(
+    `/mes/wm/return-sales-line/get?id=${id}`,
+  );
+}
+
+/** 新增销售退货单行 */
+export function createReturnSalesLine(
+  data: MesWmReturnSalesLineApi.ReturnSalesLine,
+) {
+  return requestClient.post<number>('/mes/wm/return-sales-line/create', data);
+}
+
+/** 修改销售退货单行 */
+export function updateReturnSalesLine(
+  data: MesWmReturnSalesLineApi.ReturnSalesLine,
+) {
+  return requestClient.put('/mes/wm/return-sales-line/update', data);
+}
+
+/** 删除销售退货单行 */
+export function deleteReturnSalesLine(id: number) {
+  return requestClient.delete(`/mes/wm/return-sales-line/delete?id=${id}`);
+}
diff --git a/apps/web-antd/src/api/mes/wm/returnvendor/detail/index.ts b/apps/web-antd/src/api/mes/wm/returnvendor/detail/index.ts
new file mode 100644
index 000000000..92bb049f1
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/returnvendor/detail/index.ts
@@ -0,0 +1,56 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesWmReturnVendorDetailApi {
+  /** MES 供应商退货明细 */
+  export interface ReturnVendorDetail {
+    id?: number; // 明细编号
+    returnId?: number; // 退货单编号
+    lineId?: number; // 退货单行编号
+    materialStockId?: number; // 库存记录编号
+    itemId?: number; // 物料编号
+    quantity?: number; // 数量
+    batchId?: number; // 批次编号
+    batchCode?: string; // 批次号
+    warehouseId?: number; // 仓库编号
+    warehouseName?: string; // 仓库名称
+    locationId?: number; // 库区编号
+    locationName?: string; // 库区名称
+    areaId?: number; // 库位编号
+    areaName?: string; // 库位名称
+    remark?: string; // 备注
+  }
+}
+
+/** 查询供应商退货明细列表（按行编号） */
+export function getReturnVendorDetailListByLineId(lineId: number) {
+  return requestClient.get<MesWmReturnVendorDetailApi.ReturnVendorDetail[]>(
+    '/mes/wm/return-vendor-detail/list-by-line',
+    { params: { lineId } },
+  );
+}
+
+/** 查询供应商退货明细详情 */
+export function getReturnVendorDetail(id: number) {
+  return requestClient.get<MesWmReturnVendorDetailApi.ReturnVendorDetail>(
+    `/mes/wm/return-vendor-detail/get?id=${id}`,
+  );
+}
+
+/** 新增供应商退货明细 */
+export function createReturnVendorDetail(
+  data: MesWmReturnVendorDetailApi.ReturnVendorDetail,
+) {
+  return requestClient.post<number>('/mes/wm/return-vendor-detail/create', data);
+}
+
+/** 修改供应商退货明细 */
+export function updateReturnVendorDetail(
+  data: MesWmReturnVendorDetailApi.ReturnVendorDetail,
+) {
+  return requestClient.put('/mes/wm/return-vendor-detail/update', data);
+}
+
+/** 删除供应商退货明细 */
+export function deleteReturnVendorDetail(id: number) {
+  return requestClient.delete(`/mes/wm/return-vendor-detail/delete?id=${id}`);
+}
diff --git a/apps/web-antd/src/api/mes/wm/returnvendor/index.ts b/apps/web-antd/src/api/mes/wm/returnvendor/index.ts
new file mode 100644
index 000000000..fdb5bbe6d
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/returnvendor/index.ts
@@ -0,0 +1,88 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmReturnVendorApi {
+  /** MES 供应商退货单 */
+  export interface ReturnVendor {
+    id?: number; // 退货单编号
+    code?: string; // 退货单编号
+    name?: string; // 退货单名称
+    purchaseOrderCode?: string; // 采购订单号
+    vendorId?: number; // 供应商编号
+    vendorCode?: string; // 供应商编码
+    vendorName?: string; // 供应商名称
+    vendorNickname?: string; // 供应商简称
+    returnDate?: number; // 退货日期
+    returnReason?: string; // 退货原因
+    transportCode?: string; // 运单号
+    transportTelephone?: string; // 联系电话
+    status?: number; // 单据状态
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询供应商退货单分页 */
+export function getReturnVendorPage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmReturnVendorApi.ReturnVendor>>(
+    '/mes/wm/return-vendor/page',
+    { params },
+  );
+}
+
+/** 查询供应商退货单详情 */
+export function getReturnVendor(id: number) {
+  return requestClient.get<MesWmReturnVendorApi.ReturnVendor>(
+    `/mes/wm/return-vendor/get?id=${id}`,
+  );
+}
+
+/** 新增供应商退货单 */
+export function createReturnVendor(data: MesWmReturnVendorApi.ReturnVendor) {
+  return requestClient.post<number>('/mes/wm/return-vendor/create', data);
+}
+
+/** 修改供应商退货单 */
+export function updateReturnVendor(data: MesWmReturnVendorApi.ReturnVendor) {
+  return requestClient.put('/mes/wm/return-vendor/update', data);
+}
+
+/** 删除供应商退货单 */
+export function deleteReturnVendor(id: number) {
+  return requestClient.delete(`/mes/wm/return-vendor/delete?id=${id}`);
+}
+
+/** 提交供应商退货单 */
+export function submitReturnVendor(id: number) {
+  return requestClient.put(`/mes/wm/return-vendor/submit?id=${id}`);
+}
+
+/** 执行拣货 */
+export function stockReturnVendor(id: number) {
+  return requestClient.put(`/mes/wm/return-vendor/stock?id=${id}`);
+}
+
+/** 完成供应商退货单 */
+export function finishReturnVendor(id: number) {
+  return requestClient.put(`/mes/wm/return-vendor/finish?id=${id}`);
+}
+
+/** 取消供应商退货单 */
+export function cancelReturnVendor(id: number) {
+  return requestClient.put(`/mes/wm/return-vendor/cancel?id=${id}`);
+}
+
+/** 校验供应商退货单拣货数量是否与退货数量一致 */
+export function checkReturnVendorQuantity(id: number) {
+  return requestClient.get<boolean>(
+    `/mes/wm/return-vendor/check-quantity?id=${id}`,
+  );
+}
+
+/** 导出供应商退货单 */
+export function exportReturnVendor(params: any) {
+  return requestClient.download('/mes/wm/return-vendor/export-excel', {
+    params,
+  });
+}
diff --git a/apps/web-antd/src/api/mes/wm/returnvendor/line/index.ts b/apps/web-antd/src/api/mes/wm/returnvendor/line/index.ts
new file mode 100644
index 000000000..c2ff06c62
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/returnvendor/line/index.ts
@@ -0,0 +1,54 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmReturnVendorLineApi {
+  /** MES 供应商退货单行 */
+  export interface ReturnVendorLine {
+    id?: number; // 行编号
+    returnId?: number; // 退货单编号
+    itemId?: number; // 物料编号
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    specification?: string; // 规格型号
+    unitMeasureName?: string; // 单位
+    quantity?: number; // 退货数量
+    batchId?: number; // 批次编号
+    batchCode?: string; // 批次号
+    remark?: string; // 备注
+  }
+}
+
+/** 查询供应商退货单行分页 */
+export function getReturnVendorLinePage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmReturnVendorLineApi.ReturnVendorLine>>(
+    '/mes/wm/return-vendor-line/page',
+    { params },
+  );
+}
+
+/** 查询供应商退货单行详情 */
+export function getReturnVendorLine(id: number) {
+  return requestClient.get<MesWmReturnVendorLineApi.ReturnVendorLine>(
+    `/mes/wm/return-vendor-line/get?id=${id}`,
+  );
+}
+
+/** 新增供应商退货单行 */
+export function createReturnVendorLine(
+  data: MesWmReturnVendorLineApi.ReturnVendorLine,
+) {
+  return requestClient.post<number>('/mes/wm/return-vendor-line/create', data);
+}
+
+/** 修改供应商退货单行 */
+export function updateReturnVendorLine(
+  data: MesWmReturnVendorLineApi.ReturnVendorLine,
+) {
+  return requestClient.put('/mes/wm/return-vendor-line/update', data);
+}
+
+/** 删除供应商退货单行 */
+export function deleteReturnVendorLine(id: number) {
+  return requestClient.delete(`/mes/wm/return-vendor-line/delete?id=${id}`);
+}
diff --git a/apps/web-antd/src/api/mes/wm/salesnotice/index.ts b/apps/web-antd/src/api/mes/wm/salesnotice/index.ts
new file mode 100644
index 000000000..c053f69c7
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/salesnotice/index.ts
@@ -0,0 +1,65 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmSalesNoticeApi {
+  /** MES 发货通知单 */
+  export interface SalesNotice {
+    id?: number; // 通知单编号
+    code?: string; // 通知单编号
+    name?: string; // 通知单名称
+    salesOrderCode?: string; // 销售订单编号
+    clientId?: number; // 客户编号
+    clientCode?: string; // 客户编码
+    clientName?: string; // 客户名称
+    salesDate?: number; // 发货日期
+    recipientName?: string; // 收货人
+    recipientTelephone?: string; // 联系方式
+    recipientAddress?: string; // 收货地址
+    status?: number; // 单据状态
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询发货通知单分页 */
+export function getSalesNoticePage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmSalesNoticeApi.SalesNotice>>(
+    '/mes/wm/sales-notice/page',
+    { params },
+  );
+}
+
+/** 查询发货通知单详情 */
+export function getSalesNotice(id: number) {
+  return requestClient.get<MesWmSalesNoticeApi.SalesNotice>(
+    `/mes/wm/sales-notice/get?id=${id}`,
+  );
+}
+
+/** 新增发货通知单 */
+export function createSalesNotice(data: MesWmSalesNoticeApi.SalesNotice) {
+  return requestClient.post<number>('/mes/wm/sales-notice/create', data);
+}
+
+/** 修改发货通知单 */
+export function updateSalesNotice(data: MesWmSalesNoticeApi.SalesNotice) {
+  return requestClient.put('/mes/wm/sales-notice/update', data);
+}
+
+/** 删除发货通知单 */
+export function deleteSalesNotice(id: number) {
+  return requestClient.delete(`/mes/wm/sales-notice/delete?id=${id}`);
+}
+
+/** 提交发货通知单 */
+export function submitSalesNotice(id: number) {
+  return requestClient.put(`/mes/wm/sales-notice/submit?id=${id}`);
+}
+
+/** 导出发货通知单 */
+export function exportSalesNotice(params: any) {
+  return requestClient.download('/mes/wm/sales-notice/export-excel', {
+    params,
+  });
+}
diff --git a/apps/web-antd/src/api/mes/wm/salesnotice/line/index.ts b/apps/web-antd/src/api/mes/wm/salesnotice/line/index.ts
new file mode 100644
index 000000000..948d1bc63
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/salesnotice/line/index.ts
@@ -0,0 +1,55 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmSalesNoticeLineApi {
+  /** MES 发货通知单行 */
+  export interface SalesNoticeLine {
+    id?: number; // 行编号
+    noticeId?: number; // 发货通知单编号
+    itemId?: number; // 物料编号
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    specification?: string; // 规格型号
+    unitMeasureName?: string; // 单位
+    batchId?: number; // 批次编号
+    batchCode?: string; // 批次号
+    quantity?: number; // 发货数量
+    oqcCheckFlag?: boolean; // 是否检验
+    remark?: string; // 备注
+  }
+}
+
+/** 查询发货通知单行分页 */
+export function getSalesNoticeLinePage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmSalesNoticeLineApi.SalesNoticeLine>>(
+    '/mes/wm/sales-notice-line/page',
+    { params },
+  );
+}
+
+/** 查询发货通知单行详情 */
+export function getSalesNoticeLine(id: number) {
+  return requestClient.get<MesWmSalesNoticeLineApi.SalesNoticeLine>(
+    `/mes/wm/sales-notice-line/get?id=${id}`,
+  );
+}
+
+/** 新增发货通知单行 */
+export function createSalesNoticeLine(
+  data: MesWmSalesNoticeLineApi.SalesNoticeLine,
+) {
+  return requestClient.post<number>('/mes/wm/sales-notice-line/create', data);
+}
+
+/** 修改发货通知单行 */
+export function updateSalesNoticeLine(
+  data: MesWmSalesNoticeLineApi.SalesNoticeLine,
+) {
+  return requestClient.put('/mes/wm/sales-notice-line/update', data);
+}
+
+/** 删除发货通知单行 */
+export function deleteSalesNoticeLine(id: number) {
+  return requestClient.delete(`/mes/wm/sales-notice-line/delete?id=${id}`);
+}
diff --git a/apps/web-antd/src/api/mes/wm/stocktaking/plan/index.ts b/apps/web-antd/src/api/mes/wm/stocktaking/plan/index.ts
new file mode 100644
index 000000000..c6f29f092
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/stocktaking/plan/index.ts
@@ -0,0 +1,68 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmStockTakingPlanApi {
+  /** 盘点方案 */
+  export interface StockTakingPlan {
+    id?: number; // 方案编号
+    code?: string; // 方案编码
+    name?: string; // 方案名称
+    type?: number; // 盘点类型
+    startTime?: number; // 开始时间
+    endTime?: number; // 结束时间
+    blindFlag?: boolean; // 是否盲盘
+    frozen?: boolean; // 是否冻结库存
+    status?: number; // 状态
+    remark?: string; // 备注
+    createTime?: string; // 创建时间
+  }
+}
+
+/** 查询盘点方案分页 */
+export function getStockTakingPlanPage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmStockTakingPlanApi.StockTakingPlan>>(
+    '/mes/wm/stocktaking-plan/page',
+    { params },
+  );
+}
+
+/** 查询盘点方案详情 */
+export function getStockTakingPlan(id: number) {
+  return requestClient.get<MesWmStockTakingPlanApi.StockTakingPlan>(
+    `/mes/wm/stocktaking-plan/get?id=${id}`,
+  );
+}
+
+/** 新增盘点方案 */
+export function createStockTakingPlan(
+  data: MesWmStockTakingPlanApi.StockTakingPlan,
+) {
+  return requestClient.post<number>('/mes/wm/stocktaking-plan/create', data);
+}
+
+/** 修改盘点方案 */
+export function updateStockTakingPlan(
+  data: MesWmStockTakingPlanApi.StockTakingPlan,
+) {
+  return requestClient.put('/mes/wm/stocktaking-plan/update', data);
+}
+
+/** 修改盘点方案状态 */
+export function updateStockTakingPlanStatus(id: number, status: number) {
+  return requestClient.put('/mes/wm/stocktaking-plan/update-status', null, {
+    params: { id, status },
+  });
+}
+
+/** 删除盘点方案 */
+export function deleteStockTakingPlan(id: number) {
+  return requestClient.delete(`/mes/wm/stocktaking-plan/delete?id=${id}`);
+}
+
+/** 导出盘点方案 */
+export function exportStockTakingPlan(params: any) {
+  return requestClient.download('/mes/wm/stocktaking-plan/export-excel', {
+    params,
+  });
+}
diff --git a/apps/web-antd/src/api/mes/wm/stocktaking/plan/param/index.ts b/apps/web-antd/src/api/mes/wm/stocktaking/plan/param/index.ts
new file mode 100644
index 000000000..b6eb6e09e
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/stocktaking/plan/param/index.ts
@@ -0,0 +1,49 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmStockTakingPlanParamApi {
+  /** 盘点方案条件 */
+  export interface StockTakingPlanParam {
+    id?: number; // 条件编号
+    planId?: number; // 方案编号
+    type?: number; // 条件类型
+    valueId?: number; // 条件值编号
+    valueCode?: string; // 条件值编码
+    valueName?: string; // 条件值名称
+    remark?: string; // 备注
+  }
+}
+
+/** 查询盘点方案条件分页 */
+export function getStockTakingPlanParamPage(params: PageParam) {
+  return requestClient.get<
+    PageResult<MesWmStockTakingPlanParamApi.StockTakingPlanParam>
+  >('/mes/wm/stocktaking-plan-param/page', { params });
+}
+
+/** 查询盘点方案条件详情 */
+export function getStockTakingPlanParam(id: number) {
+  return requestClient.get<MesWmStockTakingPlanParamApi.StockTakingPlanParam>(
+    `/mes/wm/stocktaking-plan-param/get?id=${id}`,
+  );
+}
+
+/** 新增盘点方案条件 */
+export function createStockTakingPlanParam(
+  data: MesWmStockTakingPlanParamApi.StockTakingPlanParam,
+) {
+  return requestClient.post('/mes/wm/stocktaking-plan-param/create', data);
+}
+
+/** 修改盘点方案条件 */
+export function updateStockTakingPlanParam(
+  data: MesWmStockTakingPlanParamApi.StockTakingPlanParam,
+) {
+  return requestClient.put('/mes/wm/stocktaking-plan-param/update', data);
+}
+
+/** 删除盘点方案条件 */
+export function deleteStockTakingPlanParam(id: number) {
+  return requestClient.delete(`/mes/wm/stocktaking-plan-param/delete?id=${id}`);
+}
diff --git a/apps/web-antd/src/api/mes/wm/stocktaking/task/index.ts b/apps/web-antd/src/api/mes/wm/stocktaking/task/index.ts
new file mode 100644
index 000000000..77622f351
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/stocktaking/task/index.ts
@@ -0,0 +1,86 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmStockTakingTaskApi {
+  /** 盘点任务 */
+  export interface StockTakingTask {
+    id?: number; // 任务编号
+    code?: string; // 任务编码
+    name?: string; // 任务名称
+    takingDate?: string; // 盘点日期
+    type?: number; // 盘点类型
+    userId?: number; // 盘点人用户编号
+    userNickname?: string; // 盘点人名称
+    planId?: number; // 盘点方案编号
+    planCode?: string; // 盘点方案编码
+    planName?: string; // 盘点方案名称
+    blindFlag?: boolean; // 是否盲盘
+    frozen?: boolean; // 是否冻结库存
+    startTime?: number; // 开始时间
+    endTime?: number; // 结束时间
+    status?: number; // 单据状态
+    remark?: string; // 备注
+    createTime?: string; // 创建时间
+  }
+}
+
+/** 查询盘点任务分页 */
+export function getStockTakingPage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmStockTakingTaskApi.StockTakingTask>>(
+    '/mes/wm/stocktaking-task/page',
+    { params },
+  );
+}
+
+/** 查询盘点任务详情 */
+export function getStockTaking(id: number) {
+  return requestClient.get<MesWmStockTakingTaskApi.StockTakingTask>(
+    `/mes/wm/stocktaking-task/get?id=${id}`,
+  );
+}
+
+/** 新增盘点任务 */
+export function createStockTaking(
+  data: MesWmStockTakingTaskApi.StockTakingTask,
+) {
+  return requestClient.post<number>('/mes/wm/stocktaking-task/create', data);
+}
+
+/** 修改盘点任务 */
+export function updateStockTaking(
+  data: MesWmStockTakingTaskApi.StockTakingTask,
+) {
+  return requestClient.put('/mes/wm/stocktaking-task/update', data);
+}
+
+/** 删除盘点任务 */
+export function deleteStockTaking(id: number) {
+  return requestClient.delete(`/mes/wm/stocktaking-task/delete?id=${id}`);
+}
+
+/** 提交盘点任务 */
+export function submitStockTaking(id: number) {
+  return requestClient.put('/mes/wm/stocktaking-task/submit', null, {
+    params: { id },
+  });
+}
+
+/** 取消盘点任务 */
+export function cancelStockTaking(id: number) {
+  return requestClient.put('/mes/wm/stocktaking-task/cancel', null, {
+    params: { id },
+  });
+}
+
+/** 执行盘点任务 */
+export function finishStockTaking(id: number) {
+  return requestClient.put('/mes/wm/stocktaking-task/finish', { id });
+}
+
+/** 导出盘点任务 */
+export function exportStockTaking(params: any) {
+  return requestClient.download('/mes/wm/stocktaking-task/export-excel', {
+    params,
+  });
+}
diff --git a/apps/web-antd/src/api/mes/wm/stocktaking/task/line/index.ts b/apps/web-antd/src/api/mes/wm/stocktaking/task/line/index.ts
new file mode 100644
index 000000000..804483ec7
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/stocktaking/task/line/index.ts
@@ -0,0 +1,72 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmStockTakingTaskLineApi {
+  /** 盘点任务行 */
+  export interface StockTakingTaskLine {
+    id?: number; // 盘点行编号
+    taskId?: number; // 任务编号
+    materialStockId?: number; // 库存编号
+    itemId?: number; // 物料编号
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    specification?: string; // 规格型号
+    unitMeasureName?: string; // 计量单位名称
+    batchId?: number; // 批次编号
+    batchCode?: string; // 批次号
+    quantity?: number; // 在库数量
+    takingQuantity?: number; // 盘点数量
+    differenceQuantity?: number; // 差异数量
+    warehouseId?: number; // 仓库编号
+    warehouseName?: string; // 仓库名称
+    locationId?: number; // 库区编号
+    locationName?: string; // 库区名称
+    areaId?: number; // 库位编号
+    areaName?: string; // 库位名称
+    status?: number; // 状态
+    remark?: string; // 备注
+  }
+}
+
+/** 查询盘点任务行分页 */
+export function getStockTakingTaskLinePage(params: PageParam) {
+  return requestClient.get<
+    PageResult<MesWmStockTakingTaskLineApi.StockTakingTaskLine>
+  >('/mes/wm/stocktaking-task-line/page', { params });
+}
+
+/** 查询盘点任务行精简列表 */
+export function getStockTakingTaskLineSimpleList(taskId: number) {
+  return requestClient.get<MesWmStockTakingTaskLineApi.StockTakingTaskLine[]>(
+    '/mes/wm/stocktaking-task-line/simple-list',
+    { params: { taskId } },
+  );
+}
+
+/** 查询盘点任务行详情 */
+export function getStockTakingTaskLine(id: number) {
+  return requestClient.get<MesWmStockTakingTaskLineApi.StockTakingTaskLine>(
+    '/mes/wm/stocktaking-task-line/get',
+    { params: { id } },
+  );
+}
+
+/** 新增盘点任务行 */
+export function createStockTakingTaskLine(
+  data: MesWmStockTakingTaskLineApi.StockTakingTaskLine,
+) {
+  return requestClient.post('/mes/wm/stocktaking-task-line/create', data);
+}
+
+/** 修改盘点任务行 */
+export function updateStockTakingTaskLine(
+  data: MesWmStockTakingTaskLineApi.StockTakingTaskLine,
+) {
+  return requestClient.put('/mes/wm/stocktaking-task-line/update', data);
+}
+
+/** 删除盘点任务行 */
+export function deleteStockTakingTaskLine(id: number) {
+  return requestClient.delete(`/mes/wm/stocktaking-task-line/delete?id=${id}`);
+}
diff --git a/apps/web-antd/src/api/mes/wm/stocktaking/task/result/index.ts b/apps/web-antd/src/api/mes/wm/stocktaking/task/result/index.ts
new file mode 100644
index 000000000..acd9a5f64
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/stocktaking/task/result/index.ts
@@ -0,0 +1,64 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmStockTakingResultApi {
+  /** 盘点结果 */
+  export interface StockTakingResult {
+    id?: number; // 结果编号
+    taskId?: number; // 任务编号
+    lineId?: number; // 盘点行编号
+    materialStockId?: number; // 库存编号
+    itemId?: number; // 物料编号
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    specification?: string; // 规格型号
+    unitMeasureName?: string; // 计量单位名称
+    batchId?: number; // 批次编号
+    batchCode?: string; // 批次号
+    warehouseId?: number; // 仓库编号
+    warehouseName?: string; // 仓库名称
+    locationId?: number; // 库区编号
+    locationName?: string; // 库区名称
+    areaId?: number; // 库位编号
+    areaName?: string; // 库位名称
+    quantity?: number; // 在库数量
+    takingQuantity?: number; // 盘点数量
+    remark?: string; // 备注
+    createTime?: string; // 创建时间
+  }
+}
+
+/** 查询盘点结果分页 */
+export function getStockTakingResultPage(params: PageParam) {
+  return requestClient.get<
+    PageResult<MesWmStockTakingResultApi.StockTakingResult>
+  >('/mes/wm/stocktaking-task-result/page', { params });
+}
+
+/** 查询盘点结果详情 */
+export function getStockTakingResult(id: number) {
+  return requestClient.get<MesWmStockTakingResultApi.StockTakingResult>(
+    '/mes/wm/stocktaking-task-result/get',
+    { params: { id } },
+  );
+}
+
+/** 新增盘点结果 */
+export function createStockTakingResult(
+  data: MesWmStockTakingResultApi.StockTakingResult,
+) {
+  return requestClient.post('/mes/wm/stocktaking-task-result/create', data);
+}
+
+/** 修改盘点结果 */
+export function updateStockTakingResult(
+  data: MesWmStockTakingResultApi.StockTakingResult,
+) {
+  return requestClient.put('/mes/wm/stocktaking-task-result/update', data);
+}
+
+/** 删除盘点结果 */
+export function deleteStockTakingResult(id: number) {
+  return requestClient.delete(`/mes/wm/stocktaking-task-result/delete?id=${id}`);
+}
diff --git a/apps/web-antd/src/views/mes/wm/packages/components/wm-package-select.vue b/apps/web-antd/src/views/mes/wm/packages/components/wm-package-select.vue
index 3055aceab..93c311e34 100644
--- a/apps/web-antd/src/views/mes/wm/packages/components/wm-package-select.vue
+++ b/apps/web-antd/src/views/mes/wm/packages/components/wm-package-select.vue
@@ -61,11 +61,7 @@ async function resolveItemById(id: number | undefined) {
   if (selectedItem.value?.id === id) {
     return;
   }
-  try {
-    selectedItem.value = await getPackage(id);
-  } catch (error) {
-    console.error('[WmPackageSelect] resolveItemById failed:', error);
-  }
+  selectedItem.value = await getPackage(id);
 }
 
 watch(() => props.modelValue, resolveItemById, { immediate: true });
diff --git a/apps/web-ele/src/api/mes/wm/itemreceipt/index.ts b/apps/web-ele/src/api/mes/wm/itemreceipt/index.ts
index d7086de99..c1a77cd98 100644
--- a/apps/web-ele/src/api/mes/wm/itemreceipt/index.ts
+++ b/apps/web-ele/src/api/mes/wm/itemreceipt/index.ts
@@ -1,3 +1,5 @@
+import type { PageParam, PageResult } from '@vben/request';
+
 import { requestClient } from '#/api/request';
 
 export namespace MesWmItemReceiptApi {
@@ -19,16 +21,66 @@ export namespace MesWmItemReceiptApi {
     locationName?: string; // 库区名称
     areaId?: number; // 库位编号
     areaName?: string; // 库位名称
-    receiptDate?: Date | number | string; // 入库日期
+    receiptDate?: number; // 入库日期
     status?: number; // 状态
     remark?: string; // 备注
     createTime?: Date; // 创建时间
   }
 }
 
+/** 查询采购入库单分页 */
+export function getItemReceiptPage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmItemReceiptApi.ItemReceipt>>(
+    '/mes/wm/item-receipt/page',
+    { params },
+  );
+}
+
 /** 查询采购入库单详情 */
 export function getItemReceipt(id: number) {
   return requestClient.get<MesWmItemReceiptApi.ItemReceipt>(
     `/mes/wm/item-receipt/get?id=${id}`,
   );
 }
+
+/** 新增采购入库单 */
+export function createItemReceipt(data: MesWmItemReceiptApi.ItemReceipt) {
+  return requestClient.post<number>('/mes/wm/item-receipt/create', data);
+}
+
+/** 修改采购入库单 */
+export function updateItemReceipt(data: MesWmItemReceiptApi.ItemReceipt) {
+  return requestClient.put('/mes/wm/item-receipt/update', data);
+}
+
+/** 删除采购入库单 */
+export function deleteItemReceipt(id: number) {
+  return requestClient.delete(`/mes/wm/item-receipt/delete?id=${id}`);
+}
+
+/** 提交采购入库单 */
+export function submitItemReceipt(id: number) {
+  return requestClient.put(`/mes/wm/item-receipt/submit?id=${id}`);
+}
+
+/** 执行上架 */
+export function stockItemReceipt(id: number) {
+  return requestClient.put(`/mes/wm/item-receipt/stock?id=${id}`);
+}
+
+/** 执行入库 */
+export function finishItemReceipt(id: number) {
+  return requestClient.put(`/mes/wm/item-receipt/finish?id=${id}`);
+}
+
+/** 取消采购入库单 */
+export function cancelItemReceipt(id: number) {
+  return requestClient.put(`/mes/wm/item-receipt/cancel?id=${id}`);
+}
+
+/** 导出采购入库单 */
+export function exportItemReceipt(params: any) {
+  return requestClient.download('/mes/wm/item-receipt/export-excel', {
+    params,
+  });
+}
diff --git a/apps/web-ele/src/api/mes/wm/itemreceipt/line/index.ts b/apps/web-ele/src/api/mes/wm/itemreceipt/line/index.ts
index 55562e84c..8ce7236c1 100644
--- a/apps/web-ele/src/api/mes/wm/itemreceipt/line/index.ts
+++ b/apps/web-ele/src/api/mes/wm/itemreceipt/line/index.ts
@@ -3,11 +3,12 @@ import type { PageParam, PageResult } from '@vben/request';
 import { requestClient } from '#/api/request';
 
 export namespace MesWmItemReceiptLineApi {
-  /** MES 物料接收单行 */
+  /** MES 采购入库单行 */
   export interface ItemReceiptLine {
     id?: number; // 行编号
     receiptId?: number; // 入库单编号
     receiptCode?: string; // 入库单编码
+    arrivalNoticeLineId?: number; // 到货通知单行编号
     purchaseOrderCode?: string; // 采购订单号
     itemId?: number; // 物料编号
     itemCode?: string; // 物料编码
@@ -15,14 +16,48 @@ export namespace MesWmItemReceiptLineApi {
     specification?: string; // 规格型号
     unitMeasureName?: string; // 单位
     receivedQuantity?: number; // 入库数量
+    batchId?: number; // 批次编号
     batchCode?: string; // 批次号
+    productionDate?: number; // 生产日期
+    expireDate?: number; // 有效期
+    lotNumber?: string; // 生产批号
+    iqcCheckFlag?: boolean; // 是否检验
+    iqcId?: number; // 来料检验单编号
+    iqcCode?: string; // 来料检验单编码
+    remark?: string; // 备注
   }
 }
 
-/** 查询物料接收单行分页 */
+/** 查询采购入库单行分页 */
 export function getItemReceiptLinePage(params: PageParam) {
   return requestClient.get<PageResult<MesWmItemReceiptLineApi.ItemReceiptLine>>(
     '/mes/wm/item-receipt-line/page',
     { params },
   );
 }
+
+/** 查询采购入库单行详情 */
+export function getItemReceiptLine(id: number) {
+  return requestClient.get<MesWmItemReceiptLineApi.ItemReceiptLine>(
+    `/mes/wm/item-receipt-line/get?id=${id}`,
+  );
+}
+
+/** 新增采购入库单行 */
+export function createItemReceiptLine(
+  data: MesWmItemReceiptLineApi.ItemReceiptLine,
+) {
+  return requestClient.post<number>('/mes/wm/item-receipt-line/create', data);
+}
+
+/** 修改采购入库单行 */
+export function updateItemReceiptLine(
+  data: MesWmItemReceiptLineApi.ItemReceiptLine,
+) {
+  return requestClient.put('/mes/wm/item-receipt-line/update', data);
+}
+
+/** 删除采购入库单行 */
+export function deleteItemReceiptLine(id: number) {
+  return requestClient.delete(`/mes/wm/item-receipt-line/delete?id=${id}`);
+}
diff --git a/apps/web-ele/src/api/mes/wm/productsales/index.ts b/apps/web-ele/src/api/mes/wm/productsales/index.ts
index aa00d4556..b0fddcfe4 100644
--- a/apps/web-ele/src/api/mes/wm/productsales/index.ts
+++ b/apps/web-ele/src/api/mes/wm/productsales/index.ts
@@ -5,12 +5,24 @@ import { requestClient } from '#/api/request';
 export namespace MesWmProductSalesApi {
   /** MES 销售出库单 */
   export interface ProductSales {
-    id?: number; // 销售出库单编号
+    id?: number; // 出库单编号
     code?: string; // 出库单编号
     name?: string; // 出库单名称
+    noticeId?: number; // 发货通知单编号
+    noticeCode?: string; // 发货通知单编码
+    clientId?: number; // 客户编号
+    clientCode?: string; // 客户编码
+    clientName?: string; // 客户名称
     salesOrderCode?: string; // 销售订单编号
-    salesDate?: Date; // 出库日期
+    salesDate?: number; // 出库日期
+    contactName?: string; // 收货人
+    contactTelephone?: string; // 联系方式
+    contactAddress?: string; // 收货地址
+    carrier?: string; // 承运商
+    shippingNumber?: string; // 运输单号
     status?: number; // 单据状态
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
   }
 }
 
@@ -21,3 +33,64 @@ export function getProductSalesPage(params: PageParam) {
     { params },
   );
 }
+
+/** 查询销售出库单详情 */
+export function getProductSales(id: number) {
+  return requestClient.get<MesWmProductSalesApi.ProductSales>(
+    `/mes/wm/product-sales/get?id=${id}`,
+  );
+}
+
+/** 新增销售出库单 */
+export function createProductSales(data: MesWmProductSalesApi.ProductSales) {
+  return requestClient.post<number>('/mes/wm/product-sales/create', data);
+}
+
+/** 修改销售出库单 */
+export function updateProductSales(data: MesWmProductSalesApi.ProductSales) {
+  return requestClient.put('/mes/wm/product-sales/update', data);
+}
+
+/** 删除销售出库单 */
+export function deleteProductSales(id: number) {
+  return requestClient.delete(`/mes/wm/product-sales/delete?id=${id}`);
+}
+
+/** 提交销售出库单 */
+export function submitProductSales(id: number) {
+  return requestClient.put(`/mes/wm/product-sales/submit?id=${id}`);
+}
+
+/** 执行拣货 */
+export function stockProductSales(id: number) {
+  return requestClient.put(`/mes/wm/product-sales/stock?id=${id}`);
+}
+
+/** 填写运单 */
+export function shippingProductSales(data: MesWmProductSalesApi.ProductSales) {
+  return requestClient.put('/mes/wm/product-sales/shipping', data);
+}
+
+/** 执行出库 */
+export function finishProductSales(id: number) {
+  return requestClient.put(`/mes/wm/product-sales/finish?id=${id}`);
+}
+
+/** 取消销售出库单 */
+export function cancelProductSales(id: number) {
+  return requestClient.put(`/mes/wm/product-sales/cancel?id=${id}`);
+}
+
+/** 校验销售出库单拣货数量是否与出库数量一致 */
+export function checkProductSalesQuantity(id: number) {
+  return requestClient.get<boolean>(
+    `/mes/wm/product-sales/check-quantity?id=${id}`,
+  );
+}
+
+/** 导出销售出库单 */
+export function exportProductSales(params: any) {
+  return requestClient.download('/mes/wm/product-sales/export-excel', {
+    params,
+  });
+}
diff --git a/apps/web-ele/src/api/mes/wm/productsales/line/index.ts b/apps/web-ele/src/api/mes/wm/productsales/line/index.ts
index b66ef6ba7..f1d4ff57b 100644
--- a/apps/web-ele/src/api/mes/wm/productsales/line/index.ts
+++ b/apps/web-ele/src/api/mes/wm/productsales/line/index.ts
@@ -6,13 +6,19 @@ export namespace MesWmProductSalesLineApi {
   /** MES 销售出库单行 */
   export interface ProductSalesLine {
     id?: number; // 行编号
+    salesId?: number; // 出库单编号
+    noticeLineId?: number; // 发货通知单行编号
     itemId?: number; // 物料编号
     itemCode?: string; // 物料编码
     itemName?: string; // 物料名称
     specification?: string; // 规格型号
     unitMeasureName?: string; // 单位
     quantity?: number; // 出库数量
+    pickedQuantity?: number; // 已拣货数量
+    batchId?: number; // 批次编号
     batchCode?: string; // 批次号
+    oqcCheckFlag?: boolean; // 是否检验
+    remark?: string; // 备注
   }
 }
 
@@ -22,3 +28,29 @@ export function getProductSalesLinePage(params: PageParam) {
     PageResult<MesWmProductSalesLineApi.ProductSalesLine>
   >('/mes/wm/product-sales-line/page', { params });
 }
+
+/** 查询销售出库单行详情 */
+export function getProductSalesLine(id: number) {
+  return requestClient.get<MesWmProductSalesLineApi.ProductSalesLine>(
+    `/mes/wm/product-sales-line/get?id=${id}`,
+  );
+}
+
+/** 新增销售出库单行 */
+export function createProductSalesLine(
+  data: MesWmProductSalesLineApi.ProductSalesLine,
+) {
+  return requestClient.post<number>('/mes/wm/product-sales-line/create', data);
+}
+
+/** 修改销售出库单行 */
+export function updateProductSalesLine(
+  data: MesWmProductSalesLineApi.ProductSalesLine,
+) {
+  return requestClient.put('/mes/wm/product-sales-line/update', data);
+}
+
+/** 删除销售出库单行 */
+export function deleteProductSalesLine(id: number) {
+  return requestClient.delete(`/mes/wm/product-sales-line/delete?id=${id}`);
+}
diff --git a/apps/web-ele/src/views/mes/wm/packages/components/wm-package-select.vue b/apps/web-ele/src/views/mes/wm/packages/components/wm-package-select.vue
index f732877ce..a533c7b1a 100644
--- a/apps/web-ele/src/views/mes/wm/packages/components/wm-package-select.vue
+++ b/apps/web-ele/src/views/mes/wm/packages/components/wm-package-select.vue
@@ -61,11 +61,7 @@ async function resolveItemById(id: number | undefined) {
   if (selectedItem.value?.id === id) {
     return;
   }
-  try {
-    selectedItem.value = await getPackage(id);
-  } catch (error) {
-    console.error('[WmPackageSelect] resolveItemById failed:', error);
-  }
+  selectedItem.value = await getPackage(id);
 }
 
 watch(() => props.modelValue, resolveItemById, { immediate: true });
diff --git a/apps/web-ele/src/views/system/user/components/select-modal.vue b/apps/web-ele/src/views/system/user/components/select-modal.vue
index 3937a4453..e2315f0a8 100644
--- a/apps/web-ele/src/views/system/user/components/select-modal.vue
+++ b/apps/web-ele/src/views/system/user/components/select-modal.vue
@@ -358,7 +358,7 @@ async function handleDeptSelect(node: any) {
   await loadUserData(1, pageSize);
 }
 
-// 确认选择
+/** 确认选择 */
 function handleConfirm() {
   if (selectedUserIds.value.length === 0) {
     ElMessage.warning('请选择用户');
@@ -371,7 +371,7 @@ function handleConfirm() {
   modalApi.close();
 }
 
-// 取消选择
+/** 取消选择 */
 function handleCancel() {
   emit('cancel');
   modalApi.close();
@@ -381,13 +381,13 @@ function handleCancel() {
   }, 300);
 }
 
-// 关闭弹窗
+/** 关闭弹窗 */
 function handleClosed() {
   emit('closed');
   resetData();
 }
 
-// 递归处理部门树节点
+/** 递归处理部门树节点 */
 function processDeptNode(node: any): DeptTreeNode {
   return {
     id: String(node.id),

From 990d0a78fb30dcff39d429c473c800fdbe3564a9 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 30 May 2026 09:04:41 +0800
Subject: [PATCH 32/52] =?UTF-8?q?feat(mes):=20=E6=8F=90=E4=BA=A4=20wm=20ou?=
 =?UTF-8?q?tsource=20=E7=9B=B8=E5=85=B3=E7=9A=84=E8=BF=81=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/mes/wm/outsourceissue/index.vue | 209 +++++++
 .../wm/outsourceissue/modules/detail-form.vue | 104 ++++
 .../wm/outsourceissue/modules/detail-list.vue | 103 ++++
 .../mes/wm/outsourceissue/modules/form.vue    | 240 ++++++++
 .../wm/outsourceissue/modules/line-form.vue   |  97 ++++
 .../wm/outsourceissue/modules/line-list.vue   | 223 +++++++
 .../src/views/mes/wm/outsourcereceipt/data.ts | 542 +++++++++++++++++
 .../views/mes/wm/outsourcereceipt/index.vue   | 209 +++++++
 .../outsourcereceipt/modules/detail-form.vue  | 103 ++++
 .../outsourcereceipt/modules/detail-list.vue  | 123 ++++
 .../mes/wm/outsourcereceipt/modules/form.vue  | 230 ++++++++
 .../wm/outsourcereceipt/modules/line-form.vue |  99 ++++
 .../wm/outsourcereceipt/modules/line-list.vue | 233 ++++++++
 apps/web-ele/src/api/mes/pro/card/index.ts    |  35 ++
 apps/web-ele/src/api/mes/pro/task/index.ts    |  27 +
 .../src/api/mes/pro/workorder/index.ts        |  84 ++-
 apps/web-ele/src/views/mes/utils/constants.ts |   6 +
 .../src/views/mes/wm/outsourceissue/data.ts   | 491 ++++++++++++++++
 .../src/views/mes/wm/outsourceissue/index.vue | 211 +++++++
 .../wm/outsourceissue/modules/detail-form.vue | 104 ++++
 .../wm/outsourceissue/modules/detail-list.vue | 103 ++++
 .../mes/wm/outsourceissue/modules/form.vue    | 247 ++++++++
 .../wm/outsourceissue/modules/line-form.vue   |  97 ++++
 .../wm/outsourceissue/modules/line-list.vue   | 223 +++++++
 .../src/views/mes/wm/outsourcereceipt/data.ts | 546 ++++++++++++++++++
 .../views/mes/wm/outsourcereceipt/index.vue   | 211 +++++++
 .../outsourcereceipt/modules/detail-form.vue  | 104 ++++
 .../outsourcereceipt/modules/detail-list.vue  | 122 ++++
 .../mes/wm/outsourcereceipt/modules/form.vue  | 238 ++++++++
 .../wm/outsourcereceipt/modules/line-form.vue |  98 ++++
 .../wm/outsourcereceipt/modules/line-list.vue | 234 ++++++++
 31 files changed, 5677 insertions(+), 19 deletions(-)
 create mode 100644 apps/web-antd/src/views/mes/wm/outsourceissue/index.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/outsourceissue/modules/detail-form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/outsourceissue/modules/detail-list.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/outsourceissue/modules/form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/outsourceissue/modules/line-form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/outsourceissue/modules/line-list.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/outsourcereceipt/data.ts
 create mode 100644 apps/web-antd/src/views/mes/wm/outsourcereceipt/index.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/detail-form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/detail-list.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/line-form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/line-list.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/outsourceissue/data.ts
 create mode 100644 apps/web-ele/src/views/mes/wm/outsourceissue/index.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/outsourceissue/modules/detail-form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/outsourceissue/modules/detail-list.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/outsourceissue/modules/form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/outsourceissue/modules/line-form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/outsourceissue/modules/line-list.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/outsourcereceipt/data.ts
 create mode 100644 apps/web-ele/src/views/mes/wm/outsourcereceipt/index.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/outsourcereceipt/modules/detail-form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/outsourcereceipt/modules/detail-list.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/outsourcereceipt/modules/form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/outsourcereceipt/modules/line-form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/outsourcereceipt/modules/line-list.vue

diff --git a/apps/web-antd/src/views/mes/wm/outsourceissue/index.vue b/apps/web-antd/src/views/mes/wm/outsourceissue/index.vue
new file mode 100644
index 000000000..4e80842d9
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/outsourceissue/index.vue
@@ -0,0 +1,209 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmOutsourceIssueApi } from '#/api/mes/wm/outsourceissue';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { Button, message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  cancelOutsourceIssue,
+  deleteOutsourceIssue,
+  exportOutsourceIssue,
+  getOutsourceIssuePage,
+} from '#/api/mes/wm/outsourceissue';
+import { $t } from '#/locales';
+import { MesWmOutsourceIssueStatusEnum } from '#/views/mes/utils/constants';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建外协发料单 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看外协发料单 */
+function handleDetail(row: MesWmOutsourceIssueApi.OutsourceIssue) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑外协发料单 */
+function handleEdit(row: MesWmOutsourceIssueApi.OutsourceIssue) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 执行拣货 */
+function handleStock(row: MesWmOutsourceIssueApi.OutsourceIssue) {
+  formModalApi.setData({ formType: 'stock', id: row.id }).open();
+}
+
+/** 执行领出 */
+function handleFinish(row: MesWmOutsourceIssueApi.OutsourceIssue) {
+  formModalApi.setData({ formType: 'finish', id: row.id }).open();
+}
+
+/** 删除外协发料单 */
+async function handleDelete(row: MesWmOutsourceIssueApi.OutsourceIssue) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.code]),
+    duration: 0,
+  });
+  try {
+    await deleteOutsourceIssue(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 取消外协发料单 */
+async function handleCancel(row: MesWmOutsourceIssueApi.OutsourceIssue) {
+  await cancelOutsourceIssue(row.id!);
+  message.success('取消成功');
+  handleRefresh();
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportOutsourceIssue(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '外协发料单.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getOutsourceIssuePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmOutsourceIssueApi.OutsourceIssue>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】外协发料、外协入库"
+        url="https://doc.iocoder.cn/mes/wm/outsource/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="外协发料单列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['外协发料单']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-outsource-issue:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:wm-outsource-issue:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <Button type="link" @click="handleDetail(row)">
+          {{ row.code }}
+        </Button>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:wm-outsource-issue:update'],
+              ifShow: row.status === MesWmOutsourceIssueStatusEnum.PREPARE,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm-outsource-issue:delete'],
+              ifShow: row.status === MesWmOutsourceIssueStatusEnum.PREPARE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '执行拣货',
+              type: 'link',
+              auth: ['mes:wm-outsource-issue:update'],
+              ifShow: row.status === MesWmOutsourceIssueStatusEnum.APPROVING,
+              onClick: handleStock.bind(null, row),
+            },
+            {
+              label: '执行领出',
+              type: 'link',
+              auth: ['mes:wm-outsource-issue:finish'],
+              ifShow: row.status === MesWmOutsourceIssueStatusEnum.APPROVED,
+              onClick: handleFinish.bind(null, row),
+            },
+            {
+              label: '取消',
+              type: 'link',
+              danger: true,
+              auth: ['mes:wm-outsource-issue:update'],
+              ifShow:
+                row.status === MesWmOutsourceIssueStatusEnum.APPROVING ||
+                row.status === MesWmOutsourceIssueStatusEnum.APPROVED,
+              popConfirm: {
+                title: '确认取消该外协发料单？取消后不可恢复。',
+                confirm: handleCancel.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/outsourceissue/modules/detail-form.vue b/apps/web-antd/src/views/mes/wm/outsourceissue/modules/detail-form.vue
new file mode 100644
index 000000000..16504ff2c
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/outsourceissue/modules/detail-form.vue
@@ -0,0 +1,104 @@
+<script lang="ts" setup>
+import type { MesWmOutsourceIssueDetailApi } from '#/api/mes/wm/outsourceissue/detail';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createOutsourceIssueDetail,
+  getOutsourceIssueDetail,
+  updateOutsourceIssueDetail,
+} from '#/api/mes/wm/outsourceissue/detail';
+import { $t } from '#/locales';
+
+import { useDetailFormSchema } from '../data';
+
+const emit = defineEmits<{ success: [lineId: number] }>();
+const formData = ref<MesWmOutsourceIssueDetailApi.OutsourceIssueDetail>();
+const issueId = ref<number>(); // 所属发料单编号
+const lineId = ref<number>(); // 所属发料单行编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['发料明细'])
+    : $t('ui.actionTitle.create', ['发料明细']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 90,
+  },
+  layout: 'horizontal',
+  schema: useDetailFormSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmOutsourceIssueDetailApi.OutsourceIssueDetail;
+    data.issueId = issueId.value;
+    data.lineId = lineId.value;
+    try {
+      await (formData.value?.id
+        ? updateOutsourceIssueDetail({ ...data, id: formData.value.id })
+        : createOutsourceIssueDetail(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success', lineId.value!);
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    formApi.setState({ schema: useDetailFormSchema(formApi) });
+    // 加载数据
+    const data = modalApi.getData<{
+      detailId?: number;
+      issueId: number;
+      itemId?: number;
+      lineId: number;
+    }>();
+    issueId.value = data.issueId;
+    lineId.value = data.lineId;
+    if (data.detailId) {
+      modalApi.lock();
+      try {
+        formData.value = await getOutsourceIssueDetail(data.detailId);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    } else if (data.itemId) {
+      await formApi.setFieldValue('itemId', data.itemId);
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/outsourceissue/modules/detail-list.vue b/apps/web-antd/src/views/mes/wm/outsourceissue/modules/detail-list.vue
new file mode 100644
index 000000000..69633aa49
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/outsourceissue/modules/detail-list.vue
@@ -0,0 +1,103 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmOutsourceIssueDetailApi } from '#/api/mes/wm/outsourceissue/detail';
+
+import { computed, watch } from 'vue';
+
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { deleteOutsourceIssueDetail } from '#/api/mes/wm/outsourceissue/detail';
+import { $t } from '#/locales';
+
+import { type FormType, useDetailGridColumns } from '../data';
+
+const props = defineProps<{
+  details: MesWmOutsourceIssueDetailApi.OutsourceIssueDetail[];
+  formType: FormType;
+}>();
+
+const emit = defineEmits<{
+  edit: [detailId: number];
+  refresh: [];
+}>();
+
+const isStock = computed(() => props.formType === 'stock'); // 是否为拣货模式
+
+/** 编辑发料明细 */
+function handleEdit(row: MesWmOutsourceIssueDetailApi.OutsourceIssueDetail) {
+  emit('edit', row.id!);
+}
+
+/** 删除发料明细 */
+async function handleDelete(
+  row: MesWmOutsourceIssueDetailApi.OutsourceIssueDetail,
+) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.warehouseName]),
+    duration: 0,
+  });
+  try {
+    await deleteOutsourceIssueDetail(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.warehouseName]));
+    emit('refresh');
+  } finally {
+    hideLoading();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    border: true,
+    columns: useDetailGridColumns(isStock.value),
+    data: props.details,
+    pagerConfig: {
+      enabled: false,
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    size: 'small',
+    toolbarConfig: {
+      enabled: false,
+    },
+  } as VxeTableGridOptions<MesWmOutsourceIssueDetailApi.OutsourceIssueDetail>,
+});
+
+watch(
+  () => props.details,
+  (details) => gridApi.setGridOptions({ data: details }),
+);
+</script>
+
+<template>
+  <div class="px-4 py-2">
+    <Grid>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [
+                  row.warehouseName,
+                ]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/outsourceissue/modules/form.vue b/apps/web-antd/src/views/mes/wm/outsourceissue/modules/form.vue
new file mode 100644
index 000000000..160e932af
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/outsourceissue/modules/form.vue
@@ -0,0 +1,240 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesWmOutsourceIssueApi } from '#/api/mes/wm/outsourceissue';
+
+import { computed, ref } from 'vue';
+
+import { confirm, useVbenModal } from '@vben/common-ui';
+
+import { Button, Divider, message, Popconfirm } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  checkOutsourceIssueQuantity,
+  createOutsourceIssue,
+  finishOutsourceIssue,
+  getOutsourceIssue,
+  stockOutsourceIssue,
+  submitOutsourceIssue,
+  updateOutsourceIssue,
+} from '#/api/mes/wm/outsourceissue';
+import { $t } from '#/locales';
+import { MesWmOutsourceIssueStatusEnum } from '#/views/mes/utils/constants';
+
+import { useFormSchema } from '../data';
+import LineList from './line-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesWmOutsourceIssueApi.OutsourceIssue>();
+const originalSnapshot = ref(''); // 表单原始数据快照，用于提交时跳过未变更的保存请求
+const isEditable = computed(() => // 是否为编辑模式（可保存）
+  ['create', 'update'].includes(formType.value),
+);
+const isStock = computed(() => formType.value === 'stock'); // 是否为拣货模式
+const isFinish = computed(() => formType.value === 'finish'); // 是否为执行领出模式
+const canSubmit = computed(() => // 是否可提交
+  formType.value === 'update' &&
+  formData.value?.status === MesWmOutsourceIssueStatusEnum.PREPARE,
+);
+// TODO @AI：标题的代码风格；
+const getTitle = computed(() => {
+  switch (formType.value) {
+    case 'detail': {
+      return $t('ui.actionTitle.view', ['外协发料单']);
+    }
+    case 'finish': {
+      return '执行领出';
+    }
+    case 'stock': {
+      return '执行拣货';
+    }
+    case 'update': {
+      return $t('ui.actionTitle.edit', ['外协发料单']);
+    }
+    default: {
+      return $t('ui.actionTitle.create', ['外协发料单']);
+    }
+  }
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+/** 提交发料单：表单有修改时先保存，再调用提交接口 */
+async function handleSubmit() {
+  const { valid } = await formApi.validate();
+  if (!valid || !formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    const current = JSON.stringify(await formApi.getValues());
+    if (current !== originalSnapshot.value) {
+      const data =
+        (await formApi.getValues()) as MesWmOutsourceIssueApi.OutsourceIssue;
+      await updateOutsourceIssue({ ...formData.value, ...data });
+      originalSnapshot.value = current;
+    }
+    await submitOutsourceIssue(formData.value.id);
+    message.success('提交成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 执行拣货：拣货数量与发料数量不一致时二次确认 */
+async function handleStock() {
+  if (!formData.value?.id) {
+    return;
+  }
+  const quantityMatch = await checkOutsourceIssueQuantity(formData.value.id);
+  if (!quantityMatch) {
+    try {
+      await confirm('发料数量与拣货数量不一致，确认执行拣货？');
+    } catch {
+      return;
+    }
+  }
+  modalApi.lock();
+  try {
+    await stockOutsourceIssue(formData.value.id);
+    message.success('拣货成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 执行领出 */
+async function handleFinish() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await finishOutsourceIssue(formData.value.id);
+    message.success('领出成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  // TODO @AI：方法注释，缺少“// 关闭并提示”；看看其他 form.vue 或者 xxx-form.vue 有没类似的情况；
+  async onConfirm() {
+    if (!isEditable.value) {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmOutsourceIssueApi.OutsourceIssue;
+    try {
+      if (formData.value?.id) {
+        await updateOutsourceIssue({ ...formData.value, ...data });
+        formData.value = { ...formData.value, ...data };
+      } else {
+        const id = await createOutsourceIssue(data);
+        formData.value = {
+          ...data,
+          id,
+          status: MesWmOutsourceIssueStatusEnum.PREPARE,
+        };
+        await formApi.setFieldValue('id', id);
+        await formApi.setFieldValue('status', formData.value.status);
+        formType.value = 'update';
+      }
+      originalSnapshot.value = JSON.stringify(await formApi.getValues());
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      originalSnapshot.value = '';
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    formApi.setDisabled(!isEditable.value);
+    modalApi.setState({ showConfirmButton: isEditable.value });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getOutsourceIssue(data.id);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    }
+    originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+    <!-- 非新建模式展示物料信息 -->
+    <template v-if="formData?.id">
+      <Divider>物料信息</Divider>
+      <div class="mx-4">
+        <LineList :form-type="formType" :issue-id="formData.id" />
+      </div>
+    </template>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <Popconfirm
+          v-if="canSubmit"
+          title="确认提交该外协发料单？【提交后将不能修改】"
+          @confirm="handleSubmit"
+        >
+          <Button type="primary">提交</Button>
+        </Popconfirm>
+        <Popconfirm
+          v-if="isStock"
+          title="确认执行拣货？"
+          @confirm="handleStock"
+        >
+          <Button type="primary">执行拣货</Button>
+        </Popconfirm>
+        <Popconfirm
+          v-if="isFinish"
+          title="确认执行领出？执行后将扣减库存，且无法撤销。"
+          @confirm="handleFinish"
+        >
+          <Button type="primary">执行领出</Button>
+        </Popconfirm>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/outsourceissue/modules/line-form.vue b/apps/web-antd/src/views/mes/wm/outsourceissue/modules/line-form.vue
new file mode 100644
index 000000000..b0f8f6da0
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/outsourceissue/modules/line-form.vue
@@ -0,0 +1,97 @@
+<script lang="ts" setup>
+import type { MesWmOutsourceIssueLineApi } from '#/api/mes/wm/outsourceissue/line';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createOutsourceIssueLine,
+  getOutsourceIssueLine,
+  updateOutsourceIssueLine,
+} from '#/api/mes/wm/outsourceissue/line';
+import { $t } from '#/locales';
+
+import { useLineFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesWmOutsourceIssueLineApi.OutsourceIssueLine>();
+const issueId = ref<number>(); // 所属发料单编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['物料发料单行'])
+    : $t('ui.actionTitle.create', ['物料发料单行']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 90,
+  },
+  layout: 'horizontal',
+  schema: useLineFormSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmOutsourceIssueLineApi.OutsourceIssueLine;
+    data.issueId = issueId.value;
+    try {
+      await (formData.value?.id
+        ? updateOutsourceIssueLine({ ...data, id: formData.value.id })
+        : createOutsourceIssueLine(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{
+      id?: number;
+      issueId: number;
+    }>();
+    issueId.value = data.issueId;
+    if (!data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getOutsourceIssueLine(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/outsourceissue/modules/line-list.vue b/apps/web-antd/src/views/mes/wm/outsourceissue/modules/line-list.vue
new file mode 100644
index 000000000..30548696d
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/outsourceissue/modules/line-list.vue
@@ -0,0 +1,223 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmOutsourceIssueDetailApi } from '#/api/mes/wm/outsourceissue/detail';
+import type { MesWmOutsourceIssueLineApi } from '#/api/mes/wm/outsourceissue/line';
+
+import { computed, reactive } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getOutsourceIssueDetailListByLineId } from '#/api/mes/wm/outsourceissue/detail';
+import {
+  deleteOutsourceIssueLine,
+  getOutsourceIssueLinePage,
+} from '#/api/mes/wm/outsourceissue/line';
+import { $t } from '#/locales';
+
+import { type FormType, useLineGridColumns } from '../data';
+import DetailForm from './detail-form.vue';
+import DetailList from './detail-list.vue';
+import LineForm from './line-form.vue';
+
+const props = defineProps<{
+  formType: FormType;
+  issueId: number;
+}>();
+
+// TODO @AI：// 是否可编辑明细行 拿到 “computed(() =>”；
+const isEditable = computed(() =>
+  ['create', 'update'].includes(props.formType),
+); // 是否可编辑明细行
+const isStock = computed(() => props.formType === 'stock'); // 是否为拣货模式
+const detailMap = reactive<
+  Record<number, MesWmOutsourceIssueDetailApi.OutsourceIssueDetail[]>
+>({}); // 已展开行的发料明细缓存
+
+const [LineFormModal, lineFormModalApi] = useVbenModal({
+  connectedComponent: LineForm,
+  destroyOnClose: true,
+});
+
+const [DetailFormModal, detailFormModalApi] = useVbenModal({
+  connectedComponent: DetailForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  for (const id of Object.keys(detailMap)) {
+    delete detailMap[Number(id)];
+  }
+  gridApi.query();
+}
+
+/** 添加物料 */
+function handleCreate() {
+  lineFormModalApi.setData({ issueId: props.issueId }).open();
+}
+
+/** 编辑物料 */
+function handleEdit(row: MesWmOutsourceIssueLineApi.OutsourceIssueLine) {
+  lineFormModalApi.setData({ id: row.id, issueId: props.issueId }).open();
+}
+
+/** 删除物料 */
+async function handleDelete(
+  row: MesWmOutsourceIssueLineApi.OutsourceIssueLine,
+) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.itemName]),
+    duration: 0,
+  });
+  try {
+    await deleteOutsourceIssueLine(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.itemName]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 拣货：直接打开明细创建表单 */
+function handlePicking(row: MesWmOutsourceIssueLineApi.OutsourceIssueLine) {
+  openDetailForm(row.id!, row.itemId);
+}
+
+/** 打开发料明细表单 */
+function openDetailForm(lineId: number, itemId?: number, detailId?: number) {
+  detailFormModalApi
+    .setData({ detailId, issueId: props.issueId, itemId, lineId })
+    .open();
+}
+
+/** 获取已展开行的发料明细 */
+function getExpandedDetails(row: MesWmOutsourceIssueLineApi.OutsourceIssueLine) {
+  return detailMap[row.id!] || [];
+}
+
+/** 加载指定行的发料明细 */
+async function loadLineDetails(lineId: number) {
+  detailMap[lineId] = await getOutsourceIssueDetailListByLineId(lineId);
+}
+
+/** 展开行时懒加载发料明细 */
+async function handleExpandChange(
+  row: MesWmOutsourceIssueLineApi.OutsourceIssueLine,
+  expanded: boolean,
+) {
+  if (!expanded) {
+    return;
+  }
+  await loadLineDetails(row.id!);
+}
+
+/** 明细表单提交成功后，刷新对应行已展开的明细 */
+async function handleDetailSuccess(lineId: number) {
+  await loadLineDetails(lineId);
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useLineGridColumns(isEditable.value, isStock.value),
+    expandConfig: {
+      padding: true,
+    },
+    height: 400,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.issueId) {
+            return { list: [], total: 0 };
+          }
+          return await getOutsourceIssueLinePage({
+            issueId: props.issueId,
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesWmOutsourceIssueLineApi.OutsourceIssueLine>,
+  gridEvents: {
+    toggleRowExpand: ({
+      expanded,
+      row,
+    }: {
+      expanded: boolean;
+      row: MesWmOutsourceIssueLineApi.OutsourceIssueLine;
+    }) => {
+      handleExpandChange(row, expanded);
+    },
+  },
+});
+</script>
+
+<template>
+  <div>
+    <LineFormModal @success="handleRefresh" />
+    <DetailFormModal @success="handleDetailSuccess" />
+    <Grid table-title="物料信息">
+      <template v-if="isEditable" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '添加物料',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #detail="{ row }">
+        <DetailList
+          :details="getExpandedDetails(row)"
+          :form-type="formType"
+          @edit="(detailId) => openDetailForm(row.id!, row.itemId, detailId)"
+          @refresh="loadLineDetails(row.id!)"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              ifShow: isEditable,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              ifShow: isEditable,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.itemName]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '拣货',
+              type: 'link',
+              ifShow: isStock,
+              onClick: handlePicking.bind(null, row),
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/outsourcereceipt/data.ts b/apps/web-antd/src/views/mes/wm/outsourcereceipt/data.ts
new file mode 100644
index 000000000..a4b96f1db
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/outsourcereceipt/data.ts
@@ -0,0 +1,542 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProWorkOrderApi } from '#/api/mes/pro/workorder';
+import type { MesWmOutsourceReceiptApi } from '#/api/mes/wm/outsourcereceipt';
+import type { MesWmOutsourceReceiptDetailApi } from '#/api/mes/wm/outsourcereceipt/detail';
+import type { MesWmOutsourceReceiptLineApi } from '#/api/mes/wm/outsourcereceipt/line';
+
+import { h, markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { Button } from 'ant-design-vue';
+
+import { z } from '#/adapter/form';
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getRangePickerDefaultProps } from '#/utils';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
+import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
+import {
+  MesAutoCodeRuleCode,
+  MesProWorkOrderStatusEnum,
+  MesProWorkOrderTypeEnum,
+} from '#/views/mes/utils/constants';
+import {
+  WmWarehouseAreaSelect,
+  WmWarehouseLocationSelect,
+  WmWarehouseSelect,
+} from '#/views/mes/wm/warehouse/components';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'finish' | 'stock' | 'update';
+
+/** 表单头部是否只读（上架、详情、完成态） */
+function isHeaderReadonly(formType: FormType): boolean {
+  return (
+    formType === 'detail' || formType === 'finish' || formType === 'stock'
+  );
+}
+
+/** 新增/修改的表单 */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'status',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '入库单编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入入库单编号',
+      },
+      rules: 'required',
+      suffix: isHeaderReadonly(formType)
+        ? undefined
+        : () =>
+            h(
+              Button,
+              {
+                type: 'default',
+                onClick: async () => {
+                  const code = await generateAutoCode(
+                    MesAutoCodeRuleCode.WM_OUTSOURCE_RECEIPT_CODE,
+                  );
+                  await formApi?.setFieldValue('code', code);
+                },
+              },
+              { default: () => '生成' },
+            ),
+    },
+    {
+      fieldName: 'name',
+      label: '入库单名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入入库单名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'workOrderId',
+      label: '外协工单',
+      component: markRaw(ProWorkOrderSelect),
+      componentProps: {
+        // 选择外协工单后，自动回填供应商
+        onChange: async (workOrder?: MesProWorkOrderApi.WorkOrder) => {
+          await formApi?.setFieldValue('vendorId', workOrder?.vendorId);
+        },
+        status: MesProWorkOrderStatusEnum.CONFIRMED,
+        type: MesProWorkOrderTypeEnum.OUTSOURCE,
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'vendorId',
+      label: '供应商',
+      component: markRaw(MdVendorSelect),
+      componentProps: {
+        placeholder: '请选择供应商',
+      },
+    },
+    {
+      fieldName: 'receiptDate',
+      label: '入库日期',
+      component: 'DatePicker',
+      componentProps: {
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择入库日期',
+        valueFormat: 'x',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '入库单编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入入库单编号',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '入库单名称',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入入库单名称',
+      },
+    },
+    {
+      fieldName: 'workOrderCode',
+      label: '外协工单号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入外协工单号',
+      },
+    },
+    {
+      fieldName: 'vendorId',
+      label: '供应商',
+      component: markRaw(MdVendorSelect),
+      componentProps: {
+        placeholder: '请选择供应商',
+      },
+    },
+    {
+      fieldName: 'status',
+      label: '状态',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(
+          DICT_TYPE.MES_WM_OUTSOURCE_RECEIPT_STATUS,
+          'number',
+        ),
+        placeholder: '请选择单据状态',
+      },
+    },
+    {
+      fieldName: 'receiptDate',
+      label: '入库日期',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+        allowClear: true,
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesWmOutsourceReceiptApi.OutsourceReceipt>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '入库单编号',
+      minWidth: 160,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '入库单名称',
+      minWidth: 150,
+    },
+    {
+      field: 'workOrderCode',
+      title: '外协工单号',
+      minWidth: 140,
+    },
+    {
+      field: 'vendorName',
+      title: '供应商名称',
+      minWidth: 120,
+    },
+    {
+      field: 'receiptDate',
+      title: '入库日期',
+      width: 180,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      minWidth: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_OUTSOURCE_RECEIPT_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 240,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 入库单行子表的字段 */
+export function useLineGridColumns(
+  editable: boolean,
+  stockable: boolean,
+): VxeTableGridOptions<MesWmOutsourceReceiptLineApi.OutsourceReceiptLine>['columns'] {
+  return [
+    {
+      type: 'expand',
+      width: 48,
+      slots: { content: 'detail' },
+    },
+    {
+      field: 'itemCode',
+      title: '物料编码',
+      minWidth: 120,
+    },
+    {
+      field: 'itemName',
+      title: '物料名称',
+      minWidth: 140,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'quantity',
+      title: '入库数量',
+      width: 100,
+    },
+    {
+      field: 'batchCode',
+      title: '批次号',
+      minWidth: 120,
+    },
+    {
+      field: 'iqcCheckFlag',
+      title: '是否检验',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+      },
+    },
+    {
+      field: 'qualityStatus',
+      title: '质量状态',
+      minWidth: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_QUALITY_STATUS },
+      },
+    },
+    ...(editable || stockable
+      ? [
+          {
+            title: '操作',
+            width: 180,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 入库单行新增/修改的表单 */
+export function useLineFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择物料',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'quantity',
+      label: '入库数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入入库数量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+        placeholder: '系统自动生成',
+      },
+    },
+    {
+      fieldName: 'productionDate',
+      label: '生产日期',
+      component: 'DatePicker',
+      componentProps: {
+        class: '!w-full',
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择生产日期',
+        valueFormat: 'x',
+      },
+    },
+    {
+      fieldName: 'expireDate',
+      label: '有效期',
+      component: 'DatePicker',
+      componentProps: {
+        class: '!w-full',
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择有效期',
+        valueFormat: 'x',
+      },
+    },
+    {
+      fieldName: 'lotNumber',
+      label: '批号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入批号',
+      },
+    },
+    {
+      fieldName: 'iqcCheckFlag',
+      label: '是否质检',
+      component: 'Switch',
+      rules: z.boolean().default(false),
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 入库明细子表的字段 */
+export function useDetailGridColumns(
+  editable: boolean,
+): VxeTableGridOptions<MesWmOutsourceReceiptDetailApi.OutsourceReceiptDetail>['columns'] {
+  return [
+    {
+      field: 'warehouseName',
+      title: '仓库名称',
+      minWidth: 100,
+    },
+    {
+      field: 'locationName',
+      title: '库区名称',
+      minWidth: 100,
+    },
+    {
+      field: 'areaName',
+      title: '库位名称',
+      minWidth: 100,
+    },
+    {
+      field: 'quantity',
+      title: '数量',
+      width: 100,
+    },
+    ...(editable
+      ? [
+          {
+            title: '操作',
+            width: 120,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 入库明细新增/修改的表单 */
+export function useDetailFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入批次号',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'warehouseId',
+      label: '入库仓库',
+      component: markRaw(WmWarehouseSelect),
+      componentProps: {
+        // 切换仓库后清空库区和库位
+        onChange: async () => {
+          await formApi?.setValues({
+            areaId: undefined,
+            locationId: undefined,
+          });
+        },
+        placeholder: '请选择仓库',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'locationId',
+      label: '库区',
+      component: markRaw(WmWarehouseLocationSelect),
+      componentProps: {
+        placeholder: '请选择库区',
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['warehouseId'],
+        componentProps: (values) => ({
+          // 切换库区后清空库位
+          onChange: async () => {
+            await formApi?.setFieldValue('areaId', undefined);
+          },
+          placeholder: '请选择库区',
+          warehouseId: values.warehouseId,
+        }),
+      },
+    },
+    {
+      fieldName: 'areaId',
+      label: '库位',
+      component: markRaw(WmWarehouseAreaSelect),
+      componentProps: {
+        placeholder: '请选择库位',
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['locationId'],
+        componentProps: (values) => ({
+          locationId: values.locationId,
+          placeholder: '请选择库位',
+        }),
+      },
+    },
+    {
+      fieldName: 'quantity',
+      label: '数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入数量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-2',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/wm/outsourcereceipt/index.vue b/apps/web-antd/src/views/mes/wm/outsourcereceipt/index.vue
new file mode 100644
index 000000000..ae1def5f0
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/outsourcereceipt/index.vue
@@ -0,0 +1,209 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmOutsourceReceiptApi } from '#/api/mes/wm/outsourcereceipt';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { Button, message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  cancelOutsourceReceipt,
+  deleteOutsourceReceipt,
+  exportOutsourceReceipt,
+  getOutsourceReceiptPage,
+} from '#/api/mes/wm/outsourcereceipt';
+import { $t } from '#/locales';
+import { MesWmOutsourceReceiptStatusEnum } from '#/views/mes/utils/constants';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建外协入库单 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看外协入库单 */
+function handleDetail(row: MesWmOutsourceReceiptApi.OutsourceReceipt) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑外协入库单 */
+function handleEdit(row: MesWmOutsourceReceiptApi.OutsourceReceipt) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 执行上架 */
+function handleStock(row: MesWmOutsourceReceiptApi.OutsourceReceipt) {
+  formModalApi.setData({ formType: 'stock', id: row.id }).open();
+}
+
+/** 完成入库 */
+function handleFinish(row: MesWmOutsourceReceiptApi.OutsourceReceipt) {
+  formModalApi.setData({ formType: 'finish', id: row.id }).open();
+}
+
+/** 删除外协入库单 */
+async function handleDelete(row: MesWmOutsourceReceiptApi.OutsourceReceipt) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.code]),
+    duration: 0,
+  });
+  try {
+    await deleteOutsourceReceipt(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 取消外协入库单 */
+async function handleCancel(row: MesWmOutsourceReceiptApi.OutsourceReceipt) {
+  await cancelOutsourceReceipt(row.id!);
+  message.success('取消成功');
+  handleRefresh();
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportOutsourceReceipt(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '外协入库单.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getOutsourceReceiptPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmOutsourceReceiptApi.OutsourceReceipt>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】外协发料、外协入库"
+        url="https://doc.iocoder.cn/mes/wm/outsource/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="外协入库单列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['外协入库单']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-outsource-receipt:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:wm-outsource-receipt:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <Button type="link" @click="handleDetail(row)">
+          {{ row.code }}
+        </Button>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:wm-outsource-receipt:update'],
+              ifShow: row.status === MesWmOutsourceReceiptStatusEnum.PREPARE,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm-outsource-receipt:delete'],
+              ifShow: row.status === MesWmOutsourceReceiptStatusEnum.PREPARE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '执行上架',
+              type: 'link',
+              auth: ['mes:wm-outsource-receipt:update'],
+              ifShow: row.status === MesWmOutsourceReceiptStatusEnum.APPROVING,
+              onClick: handleStock.bind(null, row),
+            },
+            {
+              label: '完成入库',
+              type: 'link',
+              auth: ['mes:wm-outsource-receipt:finish'],
+              ifShow: row.status === MesWmOutsourceReceiptStatusEnum.APPROVED,
+              onClick: handleFinish.bind(null, row),
+            },
+            {
+              label: '取消',
+              type: 'link',
+              danger: true,
+              auth: ['mes:wm-outsource-receipt:update'],
+              ifShow:
+                row.status === MesWmOutsourceReceiptStatusEnum.APPROVING ||
+                row.status === MesWmOutsourceReceiptStatusEnum.APPROVED,
+              popConfirm: {
+                title: '确认取消该外协入库单？取消后不可恢复。',
+                confirm: handleCancel.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/detail-form.vue b/apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/detail-form.vue
new file mode 100644
index 000000000..750185705
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/detail-form.vue
@@ -0,0 +1,103 @@
+<script lang="ts" setup>
+import type { MesWmOutsourceReceiptDetailApi } from '#/api/mes/wm/outsourcereceipt/detail';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createOutsourceReceiptDetail,
+  getOutsourceReceiptDetail,
+  updateOutsourceReceiptDetail,
+} from '#/api/mes/wm/outsourcereceipt/detail';
+import { $t } from '#/locales';
+
+import { useDetailFormSchema } from '../data';
+
+const emit = defineEmits<{ success: [lineId: number] }>();
+const formData = ref<MesWmOutsourceReceiptDetailApi.OutsourceReceiptDetail>();
+const receiptId = ref<number>(); // 所属入库单编号
+const lineId = ref<number>(); // 所属入库单行编号
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['收货明细'])
+    : $t('ui.actionTitle.create', ['收货明细']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 90,
+  },
+  layout: 'horizontal',
+  schema: useDetailFormSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-2',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmOutsourceReceiptDetailApi.OutsourceReceiptDetail;
+    data.receiptId = receiptId.value;
+    data.lineId = lineId.value;
+    try {
+      await (formData.value?.id
+        ? updateOutsourceReceiptDetail({ ...data, id: formData.value.id })
+        : createOutsourceReceiptDetail(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success', lineId.value!);
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    formApi.setState({ schema: useDetailFormSchema(formApi) });
+    // 加载数据
+    const data = modalApi.getData<{
+      detailId?: number;
+      itemId?: number;
+      lineId: number;
+      receiptId: number;
+    }>();
+    receiptId.value = data.receiptId;
+    lineId.value = data.lineId;
+    if (data.detailId) {
+      modalApi.lock();
+      try {
+        formData.value = await getOutsourceReceiptDetail(data.detailId);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    } else if (data.itemId) {
+      await formApi.setFieldValue('itemId', data.itemId);
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-1/2">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/detail-list.vue b/apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/detail-list.vue
new file mode 100644
index 000000000..8fc1718d9
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/detail-list.vue
@@ -0,0 +1,123 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmOutsourceReceiptDetailApi } from '#/api/mes/wm/outsourcereceipt/detail';
+
+import { computed, watch } from 'vue';
+
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { deleteOutsourceReceiptDetail } from '#/api/mes/wm/outsourcereceipt/detail';
+import { $t } from '#/locales';
+
+import { type FormType, useDetailGridColumns } from '../data';
+
+const props = defineProps<{
+  details: MesWmOutsourceReceiptDetailApi.OutsourceReceiptDetail[];
+  formType: FormType;
+}>();
+
+const emit = defineEmits<{
+  edit: [detailId?: number];
+  refresh: [];
+}>();
+
+// TODO @AI：放到  “// 是否可维护收货明细（编辑或上架态）” 到 computed( 后面
+const isEditable = computed(
+  () => ['create', 'stock', 'update'].includes(props.formType),
+); // 是否可维护收货明细（编辑或上架态）
+
+/** 添加收货明细 */
+function handleCreate() {
+  emit('edit', undefined);
+}
+
+/** 编辑收货明细 */
+function handleEdit(row: MesWmOutsourceReceiptDetailApi.OutsourceReceiptDetail) {
+  emit('edit', row.id!);
+}
+
+/** 删除收货明细 */
+async function handleDelete(
+  row: MesWmOutsourceReceiptDetailApi.OutsourceReceiptDetail,
+) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.warehouseName]),
+    duration: 0,
+  });
+  try {
+    await deleteOutsourceReceiptDetail(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.warehouseName]));
+    emit('refresh');
+  } finally {
+    hideLoading();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    border: true,
+    columns: useDetailGridColumns(isEditable.value),
+    data: props.details,
+    pagerConfig: {
+      enabled: false,
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    size: 'small',
+    toolbarConfig: {
+      enabled: false,
+    },
+  } as VxeTableGridOptions<MesWmOutsourceReceiptDetailApi.OutsourceReceiptDetail>,
+});
+
+watch(
+  () => props.details,
+  (details) => gridApi.setGridOptions({ data: details }),
+);
+</script>
+
+<template>
+  <div class="px-4 py-2">
+    <TableAction
+      v-if="isEditable"
+      class="mb-2"
+      :actions="[
+        {
+          label: '添加明细',
+          type: 'primary',
+          icon: ACTION_ICON.ADD,
+          onClick: handleCreate,
+        },
+      ]"
+    />
+    <Grid>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [
+                  row.warehouseName,
+                ]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/form.vue b/apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/form.vue
new file mode 100644
index 000000000..76879cb67
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/form.vue
@@ -0,0 +1,230 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesWmOutsourceReceiptApi } from '#/api/mes/wm/outsourcereceipt';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { Button, Divider, message, Popconfirm } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createOutsourceReceipt,
+  finishOutsourceReceipt,
+  getOutsourceReceipt,
+  stockOutsourceReceipt,
+  submitOutsourceReceipt,
+  updateOutsourceReceipt,
+} from '#/api/mes/wm/outsourcereceipt';
+import { $t } from '#/locales';
+import { MesWmOutsourceReceiptStatusEnum } from '#/views/mes/utils/constants';
+
+import { useFormSchema } from '../data';
+import LineList from './line-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesWmOutsourceReceiptApi.OutsourceReceipt>();
+const originalSnapshot = ref(''); // 表单原始数据快照，用于提交时跳过未变更的保存请求
+const isEditable = computed(() => // 是否为编辑模式（可保存）
+  ['create', 'update'].includes(formType.value),
+);
+const isStock = computed(() => formType.value === 'stock'); // 是否为上架模式
+const isFinish = computed(() => formType.value === 'finish'); // 是否为完成入库模式
+const canSubmit = computed(() => // 是否可提交
+  formType.value === 'update' &&
+  formData.value?.status === MesWmOutsourceReceiptStatusEnum.PREPARE,
+);
+// TODO @AI：方法的代码风格；
+const getTitle = computed(() => {
+  switch (formType.value) {
+    case 'detail': {
+      return $t('ui.actionTitle.view', ['外协入库单']);
+    }
+    case 'finish': {
+      return '完成入库';
+    }
+    case 'stock': {
+      return '执行上架';
+    }
+    case 'update': {
+      return $t('ui.actionTitle.edit', ['外协入库单']);
+    }
+    default: {
+      return $t('ui.actionTitle.create', ['外协入库单']);
+    }
+  }
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+/** 提交入库单：表单有修改时先保存，再调用提交接口 */
+async function handleSubmit() {
+  const { valid } = await formApi.validate();
+  if (!valid || !formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    const current = JSON.stringify(await formApi.getValues());
+    if (current !== originalSnapshot.value) {
+      const data =
+        (await formApi.getValues()) as MesWmOutsourceReceiptApi.OutsourceReceipt;
+      await updateOutsourceReceipt({ ...formData.value, ...data });
+      originalSnapshot.value = current;
+    }
+    await submitOutsourceReceipt(formData.value.id);
+    message.success('提交成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 执行上架 */
+async function handleStock() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await stockOutsourceReceipt(formData.value.id);
+    message.success('上架成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 完成入库 */
+async function handleFinish() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await finishOutsourceReceipt(formData.value.id);
+    message.success('入库成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (!isEditable.value) {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmOutsourceReceiptApi.OutsourceReceipt;
+    try {
+      if (formData.value?.id) {
+        await updateOutsourceReceipt({ ...formData.value, ...data });
+        formData.value = { ...formData.value, ...data };
+      } else {
+        const id = await createOutsourceReceipt(data);
+        formData.value = {
+          ...data,
+          id,
+          status: MesWmOutsourceReceiptStatusEnum.PREPARE,
+        };
+        await formApi.setFieldValue('id', id);
+        await formApi.setFieldValue('status', formData.value.status);
+        formType.value = 'update';
+      }
+      originalSnapshot.value = JSON.stringify(await formApi.getValues());
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      originalSnapshot.value = '';
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    formApi.setDisabled(!isEditable.value);
+    modalApi.setState({ showConfirmButton: isEditable.value });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getOutsourceReceipt(data.id);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    }
+    originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+    <!-- 非新建模式展示物料信息 -->
+    <template v-if="formData?.id">
+      <Divider>物料信息</Divider>
+      <div class="mx-4">
+        <LineList :form-type="formType" :receipt-id="formData.id" />
+      </div>
+    </template>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <Popconfirm
+          v-if="canSubmit"
+          title="确认提交该外协入库单？【提交后将不能修改】"
+          @confirm="handleSubmit"
+        >
+          <Button type="primary">提交</Button>
+        </Popconfirm>
+        <Popconfirm
+          v-if="isStock"
+          title="确认执行上架？"
+          @confirm="handleStock"
+        >
+          <Button type="primary">执行上架</Button>
+        </Popconfirm>
+        <Popconfirm
+          v-if="isFinish"
+          title="确认完成入库？完成后将更新库存台账。"
+          @confirm="handleFinish"
+        >
+          <Button type="primary">完成入库</Button>
+        </Popconfirm>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/line-form.vue b/apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/line-form.vue
new file mode 100644
index 000000000..e2b9d6541
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/line-form.vue
@@ -0,0 +1,99 @@
+<script lang="ts" setup>
+import type { MesWmOutsourceReceiptLineApi } from '#/api/mes/wm/outsourcereceipt/line';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createOutsourceReceiptLine,
+  getOutsourceReceiptLine,
+  updateOutsourceReceiptLine,
+} from '#/api/mes/wm/outsourcereceipt/line';
+import { $t } from '#/locales';
+
+import { useLineFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesWmOutsourceReceiptLineApi.OutsourceReceiptLine>();
+const receiptId = ref<number>(); // 所属入库单编号
+
+// TODO @AI：如果 getTitle 方法的前面，也是 const 变量，不用空行？是不是更符合项目规范？如果是，写到 style vue 文件里；
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['外协入库单行'])
+    : $t('ui.actionTitle.create', ['外协入库单行']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 90,
+  },
+  layout: 'horizontal',
+  schema: useLineFormSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单（批次号由后端自动生成，不提交）
+    const data =
+      (await formApi.getValues()) as MesWmOutsourceReceiptLineApi.OutsourceReceiptLine;
+    data.receiptId = receiptId.value;
+    delete data.batchCode;
+    try {
+      await (formData.value?.id
+        ? updateOutsourceReceiptLine({ ...data, id: formData.value.id })
+        : createOutsourceReceiptLine(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{
+      id?: number;
+      receiptId: number;
+    }>();
+    receiptId.value = data.receiptId;
+    if (!data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getOutsourceReceiptLine(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/line-list.vue b/apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/line-list.vue
new file mode 100644
index 000000000..23e00bf2e
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/line-list.vue
@@ -0,0 +1,233 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmOutsourceReceiptDetailApi } from '#/api/mes/wm/outsourcereceipt/detail';
+import type { MesWmOutsourceReceiptLineApi } from '#/api/mes/wm/outsourcereceipt/line';
+
+import { computed, reactive } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getOutsourceReceiptDetailListByLineId } from '#/api/mes/wm/outsourcereceipt/detail';
+import {
+  deleteOutsourceReceiptLine,
+  getOutsourceReceiptLinePage,
+} from '#/api/mes/wm/outsourcereceipt/line';
+import { $t } from '#/locales';
+import { PrinterLabel } from '#/views/mes/wm/barcode/components';
+
+import { type FormType, useLineGridColumns } from '../data';
+import DetailForm from './detail-form.vue';
+import DetailList from './detail-list.vue';
+import LineForm from './line-form.vue';
+
+const props = defineProps<{
+  formType: FormType;
+  receiptId: number;
+}>();
+
+const isEditable = computed(() =>
+  ['create', 'update'].includes(props.formType),
+); // 是否可编辑明细行
+const isStock = computed(() => props.formType === 'stock'); // 是否为上架模式
+const detailMap = reactive<
+  Record<number, MesWmOutsourceReceiptDetailApi.OutsourceReceiptDetail[]>
+>({}); // 已展开行的收货明细缓存
+
+const [LineFormModal, lineFormModalApi] = useVbenModal({
+  connectedComponent: LineForm,
+  destroyOnClose: true,
+});
+
+const [DetailFormModal, detailFormModalApi] = useVbenModal({
+  connectedComponent: DetailForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  for (const id of Object.keys(detailMap)) {
+    delete detailMap[Number(id)];
+  }
+  gridApi.query();
+}
+
+/** 添加物料 */
+function handleCreate() {
+  lineFormModalApi.setData({ receiptId: props.receiptId }).open();
+}
+
+/** 编辑物料 */
+function handleEdit(row: MesWmOutsourceReceiptLineApi.OutsourceReceiptLine) {
+  lineFormModalApi.setData({ id: row.id, receiptId: props.receiptId }).open();
+}
+
+/** 删除物料 */
+async function handleDelete(
+  row: MesWmOutsourceReceiptLineApi.OutsourceReceiptLine,
+) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.itemName]),
+    duration: 0,
+  });
+  try {
+    await deleteOutsourceReceiptLine(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.itemName]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 上架：直接打开明细创建表单 */
+function handlePicking(row: MesWmOutsourceReceiptLineApi.OutsourceReceiptLine) {
+  openDetailForm(row.id!, row.itemId);
+}
+
+/** 打开收货明细表单 */
+function openDetailForm(lineId: number, itemId?: number, detailId?: number) {
+  detailFormModalApi
+    .setData({ detailId, itemId, lineId, receiptId: props.receiptId })
+    .open();
+}
+
+/** 获取已展开行的收货明细 */
+function getExpandedDetails(
+  row: MesWmOutsourceReceiptLineApi.OutsourceReceiptLine,
+) {
+  return detailMap[row.id!] || [];
+}
+
+/** 加载指定行的收货明细 */
+async function loadLineDetails(lineId: number) {
+  detailMap[lineId] = await getOutsourceReceiptDetailListByLineId(lineId);
+}
+
+/** 展开行时懒加载收货明细 */
+async function handleExpandChange(
+  row: MesWmOutsourceReceiptLineApi.OutsourceReceiptLine,
+  expanded: boolean,
+) {
+  if (!expanded) {
+    return;
+  }
+  await loadLineDetails(row.id!);
+}
+
+/** 明细表单提交成功后，刷新对应行已展开的明细 */
+async function handleDetailSuccess(lineId: number) {
+  await loadLineDetails(lineId);
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useLineGridColumns(isEditable.value, isStock.value),
+    expandConfig: {
+      padding: true,
+    },
+    height: 400,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.receiptId) {
+            return { list: [], total: 0 };
+          }
+          return await getOutsourceReceiptLinePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            receiptId: props.receiptId,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesWmOutsourceReceiptLineApi.OutsourceReceiptLine>,
+  gridEvents: {
+    toggleRowExpand: ({
+      expanded,
+      row,
+    }: {
+      expanded: boolean;
+      row: MesWmOutsourceReceiptLineApi.OutsourceReceiptLine;
+    }) => {
+      handleExpandChange(row, expanded);
+    },
+  },
+});
+</script>
+
+<template>
+  <div>
+    <LineFormModal @success="handleRefresh" />
+    <DetailFormModal @success="handleDetailSuccess" />
+    <Grid table-title="物料信息">
+      <template v-if="isEditable" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '添加物料',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #detail="{ row }">
+        <DetailList
+          :details="getExpandedDetails(row)"
+          :form-type="formType"
+          @edit="(detailId) => openDetailForm(row.id!, row.itemId, detailId)"
+          @refresh="loadLineDetails(row.id!)"
+        />
+      </template>
+      <template #actions="{ row }">
+        <div class="flex items-center justify-center">
+          <TableAction
+            :actions="[
+              {
+                label: $t('common.edit'),
+                type: 'link',
+                icon: ACTION_ICON.EDIT,
+                ifShow: isEditable,
+                onClick: handleEdit.bind(null, row),
+              },
+              {
+                label: $t('common.delete'),
+                type: 'link',
+                danger: true,
+                icon: ACTION_ICON.DELETE,
+                ifShow: isEditable,
+                popConfirm: {
+                  title: $t('ui.actionMessage.deleteConfirm', [row.itemName]),
+                  confirm: handleDelete.bind(null, row),
+                },
+              },
+              {
+                label: '上架',
+                type: 'link',
+                ifShow: isStock,
+                onClick: handlePicking.bind(null, row),
+              },
+            ]"
+          />
+          <PrinterLabel
+            v-if="isStock"
+            :biz-code="row.batchCode"
+            :biz-id="row.batchId"
+            biz-type="BATCH"
+          />
+        </div>
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-ele/src/api/mes/pro/card/index.ts b/apps/web-ele/src/api/mes/pro/card/index.ts
index 06c6cb04f..a9d123cc3 100644
--- a/apps/web-ele/src/api/mes/pro/card/index.ts
+++ b/apps/web-ele/src/api/mes/pro/card/index.ts
@@ -42,3 +42,38 @@ export function getCardPage(params: MesProCardApi.PageParams) {
 export function getCard(id: number) {
   return requestClient.get<MesProCardApi.Card>(`/mes/pro/card/get?id=${id}`);
 }
+
+/** 新增生产流转卡 */
+export function createCard(data: MesProCardApi.Card) {
+  return requestClient.post<number>('/mes/pro/card/create', data);
+}
+
+/** 修改生产流转卡 */
+export function updateCard(data: MesProCardApi.Card) {
+  return requestClient.put('/mes/pro/card/update', data);
+}
+
+/** 删除生产流转卡 */
+export function deleteCard(id: number) {
+  return requestClient.delete(`/mes/pro/card/delete?id=${id}`);
+}
+
+/** 导出生产流转卡 */
+export function exportCard(params: any) {
+  return requestClient.download('/mes/pro/card/export-excel', { params });
+}
+
+/** 提交生产流转卡 */
+export function submitCard(id: number) {
+  return requestClient.put(`/mes/pro/card/submit?id=${id}`);
+}
+
+/** 完成生产流转卡 */
+export function finishCard(id: number) {
+  return requestClient.put(`/mes/pro/card/finish?id=${id}`);
+}
+
+/** 取消生产流转卡 */
+export function cancelCard(id: number) {
+  return requestClient.put(`/mes/pro/card/cancel?id=${id}`);
+}
diff --git a/apps/web-ele/src/api/mes/pro/task/index.ts b/apps/web-ele/src/api/mes/pro/task/index.ts
index d7bfd2f5e..5e160c840 100644
--- a/apps/web-ele/src/api/mes/pro/task/index.ts
+++ b/apps/web-ele/src/api/mes/pro/task/index.ts
@@ -48,6 +48,8 @@ export namespace MesProTaskApi {
     name?: string;
     workOrderId?: number;
     workstationId?: number;
+    routeId?: number;
+    processId?: number;
     itemId?: number;
     statuses?: number[];
     status?: number;
@@ -66,3 +68,28 @@ export function getTaskPage(params: MesProTaskApi.PageParams) {
 export function getTask(id: number) {
   return requestClient.get<MesProTaskApi.Task>(`/mes/pro/task/get?id=${id}`);
 }
+
+/** 新增生产任务 */
+export function createTask(data: MesProTaskApi.Task) {
+  return requestClient.post('/mes/pro/task/create', data);
+}
+
+/** 修改生产任务 */
+export function updateTask(data: MesProTaskApi.Task) {
+  return requestClient.put('/mes/pro/task/update', data);
+}
+
+/** 删除生产任务 */
+export function deleteTask(id: number) {
+  return requestClient.delete(`/mes/pro/task/delete?id=${id}`);
+}
+
+/** 导出生产任务 */
+export function exportTask(params: any) {
+  return requestClient.download('/mes/pro/task/export-excel', { params });
+}
+
+/** 查询甘特图任务列表（非分页） */
+export function getGanttTaskList(params: any) {
+  return requestClient.get<any[]>('/mes/pro/task/gantt-list', { params });
+}
diff --git a/apps/web-ele/src/api/mes/pro/workorder/index.ts b/apps/web-ele/src/api/mes/pro/workorder/index.ts
index 24de7d057..c4c0a152a 100644
--- a/apps/web-ele/src/api/mes/pro/workorder/index.ts
+++ b/apps/web-ele/src/api/mes/pro/workorder/index.ts
@@ -5,37 +5,48 @@ import { requestClient } from '#/api/request';
 export namespace MesProWorkOrderApi {
   /** MES 生产工单 */
   export interface WorkOrder {
-    id?: number;
+    id?: number; // 编号
     code?: string; // 工单编码
     name?: string; // 工单名称
     type?: number; // 工单类型
-    status?: number; // 工单状态
-    sourceType?: number;
-    productId?: number; // 产品物料编号
-    productCode?: string;
-    productName?: string;
-    productSpecification?: string;
-    quantity?: number;
-    unitName?: string;
-    routeId?: number;
-    routeName?: string;
-    clientId?: number;
-    clientName?: string;
+    orderSourceType?: number; // 来源类型
+    orderSourceCode?: string; // 来源单据编号
+    productId?: number; // 产品编号
+    productName?: string; // 产品名称
+    productCode?: string; // 产品编码
+    productSpecification?: string; // 规格型号
+    unitMeasureName?: string; // 单位名称
+    quantity?: number; // 生产数量
+    quantityProduced?: number; // 已生产数量
+    quantityChanged?: number; // 调整数量
+    quantityScheduled?: number; // 已排产数量
+    clientId?: number; // 客户编号
+    clientCode?: string; // 客户编码
+    clientName?: string; // 客户名称
     vendorId?: number; // 供应商编号
     vendorName?: string; // 供应商名称
-    planStartTime?: number | string;
-    planEndTime?: number | string;
-    actualStartTime?: number | string;
-    actualEndTime?: number | string;
-    remark?: string;
-    createTime?: number | string;
+    vendorCode?: string; // 供应商编码
+    batchCode?: string; // 批次号
+    requestDate?: number; // 需求日期
+    parentId?: number; // 父工单编号
+    parentCode?: string; // 父工单编码
+    finishDate?: number; // 完成时间
+    cancelDate?: number; // 取消时间
+    status?: number; // 工单状态
+    remark?: string; // 备注
+    createTime?: number; // 创建时间
   }
 
+  /** MES 生产工单分页查询参数 */
   export interface PageParams extends PageParam {
     code?: string;
     name?: string;
+    orderSourceCode?: string;
+    productId?: number;
+    clientId?: number;
     status?: number;
     type?: number;
+    requestDate?: number[];
   }
 }
 
@@ -53,3 +64,38 @@ export function getWorkOrder(id: number) {
     `/mes/pro/work-order/get?id=${id}`,
   );
 }
+
+/** 新增生产工单 */
+export function createWorkOrder(data: MesProWorkOrderApi.WorkOrder) {
+  return requestClient.post<number>('/mes/pro/work-order/create', data);
+}
+
+/** 修改生产工单 */
+export function updateWorkOrder(data: MesProWorkOrderApi.WorkOrder) {
+  return requestClient.put('/mes/pro/work-order/update', data);
+}
+
+/** 删除生产工单 */
+export function deleteWorkOrder(id: number) {
+  return requestClient.delete(`/mes/pro/work-order/delete?id=${id}`);
+}
+
+/** 导出生产工单 */
+export function exportWorkOrder(params: any) {
+  return requestClient.download('/mes/pro/work-order/export-excel', { params });
+}
+
+/** 完成工单 */
+export function finishWorkOrder(id: number) {
+  return requestClient.put(`/mes/pro/work-order/finish?id=${id}`);
+}
+
+/** 取消工单 */
+export function cancelWorkOrder(id: number) {
+  return requestClient.put(`/mes/pro/work-order/cancel?id=${id}`);
+}
+
+/** 确认工单 */
+export function confirmWorkOrder(id: number) {
+  return requestClient.put(`/mes/pro/work-order/confirm?id=${id}`);
+}
diff --git a/apps/web-ele/src/views/mes/utils/constants.ts b/apps/web-ele/src/views/mes/utils/constants.ts
index 19315fc41..08b97af14 100644
--- a/apps/web-ele/src/views/mes/utils/constants.ts
+++ b/apps/web-ele/src/views/mes/utils/constants.ts
@@ -225,6 +225,12 @@ export const MesProWorkOrderTypeEnum = {
   PURCHASE: 3, // 采购
 } as const;
 
+/** MES 工单来源类型枚举 */
+export const MesProWorkOrderSourceTypeEnum = {
+  ORDER: 1, // 客户订单
+  STORE: 2, // 库存备货
+} as const;
+
 /** MES 生产任务状态枚举 */
 export const MesProTaskStatusEnum = {
   PREPARE: MesOrderStatusConstants.DRAFT,
diff --git a/apps/web-ele/src/views/mes/wm/outsourceissue/data.ts b/apps/web-ele/src/views/mes/wm/outsourceissue/data.ts
new file mode 100644
index 000000000..67abe167e
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/outsourceissue/data.ts
@@ -0,0 +1,491 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProWorkOrderApi } from '#/api/mes/pro/workorder';
+import type { MesWmMaterialStockApi } from '#/api/mes/wm/materialstock';
+import type { MesWmOutsourceIssueApi } from '#/api/mes/wm/outsourceissue';
+import type { MesWmOutsourceIssueDetailApi } from '#/api/mes/wm/outsourceissue/detail';
+import type { MesWmOutsourceIssueLineApi } from '#/api/mes/wm/outsourceissue/line';
+
+import { h, markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+
+import { ElButton } from 'element-plus';
+
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getRangePickerDefaultProps } from '#/utils';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
+import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
+import {
+  MesAutoCodeRuleCode,
+  MesProWorkOrderStatusEnum,
+  MesProWorkOrderTypeEnum,
+} from '#/views/mes/utils/constants';
+import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
+import {
+  WmWarehouseAreaSelect,
+  WmWarehouseLocationSelect,
+  WmWarehouseSelect,
+} from '#/views/mes/wm/warehouse/components';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'finish' | 'stock' | 'update';
+
+/** 表单头部是否只读（拣货、详情、领出态） */
+function isHeaderReadonly(formType: FormType): boolean {
+  return (
+    formType === 'detail' || formType === 'finish' || formType === 'stock'
+  );
+}
+
+/** 新增/修改的表单 */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'status',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '发料单编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入发料单编号',
+      },
+      rules: 'required',
+      suffix: isHeaderReadonly(formType)
+        ? undefined
+        : () =>
+            h(
+              ElButton,
+              {
+                onClick: async () => {
+                  const code = await generateAutoCode(
+                    MesAutoCodeRuleCode.WM_OUTSOURCE_ISSUE_CODE,
+                  );
+                  await formApi?.setFieldValue('code', code);
+                },
+              },
+              { default: () => '生成' },
+            ),
+    },
+    {
+      fieldName: 'name',
+      label: '发料单名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入发料单名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'issueDate',
+      label: '发料日期',
+      component: 'DatePicker',
+      componentProps: {
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择发料日期',
+        type: 'date',
+        valueFormat: 'x',
+      },
+    },
+    {
+      fieldName: 'workOrderId',
+      label: '外协工单',
+      component: markRaw(ProWorkOrderSelect),
+      componentProps: {
+        // 选择外协工单后，自动回填供应商
+        onChange: async (workOrder?: MesProWorkOrderApi.WorkOrder) => {
+          await formApi?.setFieldValue('vendorId', workOrder?.vendorId);
+        },
+        status: MesProWorkOrderStatusEnum.CONFIRMED,
+        type: MesProWorkOrderTypeEnum.OUTSOURCE,
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'vendorId',
+      label: '供应商',
+      component: markRaw(MdVendorSelect),
+      componentProps: {
+        placeholder: '请选择供应商',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '发料单编号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入发料单编号',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '发料单名称',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入发料单名称',
+      },
+    },
+    {
+      fieldName: 'vendorId',
+      label: '供应商',
+      component: markRaw(MdVendorSelect),
+      componentProps: {
+        placeholder: '请选择供应商',
+      },
+    },
+    {
+      fieldName: 'issueDate',
+      label: '发料日期',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+        clearable: true,
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesWmOutsourceIssueApi.OutsourceIssue>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '发料单编号',
+      minWidth: 160,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '发料单名称',
+      minWidth: 150,
+    },
+    {
+      field: 'workOrderCode',
+      title: '生产工单号',
+      minWidth: 140,
+    },
+    {
+      field: 'vendorName',
+      title: '供应商名称',
+      minWidth: 120,
+    },
+    {
+      field: 'issueDate',
+      title: '发料日期',
+      width: 180,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      minWidth: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_OUTSOURCE_ISSUE_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 240,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 发料单行子表的字段 */
+export function useLineGridColumns(
+  editable: boolean,
+  stockable: boolean,
+): VxeTableGridOptions<MesWmOutsourceIssueLineApi.OutsourceIssueLine>['columns'] {
+  return [
+    {
+      type: 'expand',
+      width: 48,
+      slots: { content: 'detail' },
+    },
+    {
+      field: 'itemCode',
+      title: '物料编码',
+      minWidth: 120,
+    },
+    {
+      field: 'itemName',
+      title: '物料名称',
+      minWidth: 140,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'quantity',
+      title: '领料数量',
+      width: 100,
+    },
+    {
+      field: 'batchCode',
+      title: '批次号',
+      minWidth: 120,
+    },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 150,
+    },
+    ...(editable || stockable
+      ? [
+          {
+            title: '操作',
+            width: 160,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 发料单行新增/修改的表单 */
+export function useLineFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择物料',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'quantity',
+      label: '发料数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入发料数量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入批次号',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 发料明细子表的字段 */
+export function useDetailGridColumns(
+  stockable: boolean,
+): VxeTableGridOptions<MesWmOutsourceIssueDetailApi.OutsourceIssueDetail>['columns'] {
+  return [
+    {
+      field: 'warehouseName',
+      title: '仓库名称',
+      minWidth: 100,
+    },
+    {
+      field: 'locationName',
+      title: '库区名称',
+      minWidth: 100,
+    },
+    {
+      field: 'areaName',
+      title: '库位名称',
+      minWidth: 100,
+    },
+    {
+      field: 'quantity',
+      title: '数量',
+      width: 100,
+    },
+    ...(stockable
+      ? [
+          {
+            title: '操作',
+            width: 120,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 发料明细新增/修改的表单 */
+export function useDetailFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'quantityMax',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'materialStockId',
+      label: '库存记录',
+      component: markRaw(WmMaterialStockSelect),
+      componentProps: {
+        // 选择库存记录后，自动回填仓库/库区/库位/批次/数量
+        onChange: async (stock?: MesWmMaterialStockApi.MaterialStock) => {
+          await formApi?.setValues({
+            areaId: stock?.areaId,
+            batchCode: stock?.batchCode,
+            batchId: stock?.batchId,
+            locationId: stock?.locationId,
+            quantity: stock?.quantity,
+            quantityMax: stock?.quantity,
+            warehouseId: stock?.warehouseId,
+          });
+        },
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['itemId'],
+        componentProps: (values) => ({
+          itemId: values.itemId,
+        }),
+      },
+    },
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'quantity',
+      label: '数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入数量',
+        precision: 2,
+      },
+      rules: 'required',
+      dependencies: {
+        triggerFields: ['quantityMax'],
+        componentProps: (values) => ({
+          class: '!w-full',
+          controlsPosition: 'right',
+          max: values.quantityMax,
+          min: 0,
+          placeholder: '请输入数量',
+          precision: 2,
+        }),
+      },
+    },
+    {
+      fieldName: 'warehouseId',
+      label: '发料仓库',
+      component: markRaw(WmWarehouseSelect),
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'locationId',
+      label: '库区',
+      component: markRaw(WmWarehouseLocationSelect),
+      componentProps: {
+        disabled: true,
+      },
+      dependencies: {
+        triggerFields: ['warehouseId'],
+        componentProps: (values) => ({
+          disabled: true,
+          warehouseId: values.warehouseId,
+        }),
+      },
+    },
+    {
+      fieldName: 'areaId',
+      label: '库位',
+      component: markRaw(WmWarehouseAreaSelect),
+      componentProps: {
+        disabled: true,
+      },
+      dependencies: {
+        triggerFields: ['locationId'],
+        componentProps: (values) => ({
+          disabled: true,
+          locationId: values.locationId,
+        }),
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+      },
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/wm/outsourceissue/index.vue b/apps/web-ele/src/views/mes/wm/outsourceissue/index.vue
new file mode 100644
index 000000000..c241d9808
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/outsourceissue/index.vue
@@ -0,0 +1,211 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmOutsourceIssueApi } from '#/api/mes/wm/outsourceissue';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { ElButton, ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  cancelOutsourceIssue,
+  deleteOutsourceIssue,
+  exportOutsourceIssue,
+  getOutsourceIssuePage,
+} from '#/api/mes/wm/outsourceissue';
+import { $t } from '#/locales';
+import { MesWmOutsourceIssueStatusEnum } from '#/views/mes/utils/constants';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建外协发料单 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看外协发料单 */
+function handleDetail(row: MesWmOutsourceIssueApi.OutsourceIssue) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑外协发料单 */
+function handleEdit(row: MesWmOutsourceIssueApi.OutsourceIssue) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 执行拣货 */
+function handleStock(row: MesWmOutsourceIssueApi.OutsourceIssue) {
+  formModalApi.setData({ formType: 'stock', id: row.id }).open();
+}
+
+/** 执行领出 */
+function handleFinish(row: MesWmOutsourceIssueApi.OutsourceIssue) {
+  formModalApi.setData({ formType: 'finish', id: row.id }).open();
+}
+
+/** 删除外协发料单 */
+async function handleDelete(row: MesWmOutsourceIssueApi.OutsourceIssue) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.code]),
+  });
+  try {
+    await deleteOutsourceIssue(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+/** 取消外协发料单 */
+async function handleCancel(row: MesWmOutsourceIssueApi.OutsourceIssue) {
+  await cancelOutsourceIssue(row.id!);
+  ElMessage.success('取消成功');
+  handleRefresh();
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportOutsourceIssue(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '外协发料单.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getOutsourceIssuePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmOutsourceIssueApi.OutsourceIssue>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】外协发料、外协入库"
+        url="https://doc.iocoder.cn/mes/wm/outsource/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="外协发料单列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['外协发料单']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-outsource-issue:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:wm-outsource-issue:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <ElButton link type="primary" @click="handleDetail(row)">
+          {{ row.code }}
+        </ElButton>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:wm-outsource-issue:update'],
+              ifShow: row.status === MesWmOutsourceIssueStatusEnum.PREPARE,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm-outsource-issue:delete'],
+              ifShow: row.status === MesWmOutsourceIssueStatusEnum.PREPARE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '执行拣货',
+              type: 'primary',
+              link: true,
+              auth: ['mes:wm-outsource-issue:update'],
+              ifShow: row.status === MesWmOutsourceIssueStatusEnum.APPROVING,
+              onClick: handleStock.bind(null, row),
+            },
+            {
+              label: '执行领出',
+              type: 'primary',
+              link: true,
+              auth: ['mes:wm-outsource-issue:finish'],
+              ifShow: row.status === MesWmOutsourceIssueStatusEnum.APPROVED,
+              onClick: handleFinish.bind(null, row),
+            },
+            {
+              label: '取消',
+              type: 'danger',
+              link: true,
+              auth: ['mes:wm-outsource-issue:update'],
+              ifShow:
+                row.status === MesWmOutsourceIssueStatusEnum.APPROVING ||
+                row.status === MesWmOutsourceIssueStatusEnum.APPROVED,
+              popConfirm: {
+                title: '确认取消该外协发料单？取消后不可恢复。',
+                confirm: handleCancel.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/outsourceissue/modules/detail-form.vue b/apps/web-ele/src/views/mes/wm/outsourceissue/modules/detail-form.vue
new file mode 100644
index 000000000..803fb3c7a
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/outsourceissue/modules/detail-form.vue
@@ -0,0 +1,104 @@
+<script lang="ts" setup>
+import type { MesWmOutsourceIssueDetailApi } from '#/api/mes/wm/outsourceissue/detail';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createOutsourceIssueDetail,
+  getOutsourceIssueDetail,
+  updateOutsourceIssueDetail,
+} from '#/api/mes/wm/outsourceissue/detail';
+import { $t } from '#/locales';
+
+import { useDetailFormSchema } from '../data';
+
+const emit = defineEmits<{ success: [lineId: number] }>();
+const formData = ref<MesWmOutsourceIssueDetailApi.OutsourceIssueDetail>();
+const issueId = ref<number>(); // 所属发料单编号
+const lineId = ref<number>(); // 所属发料单行编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['发料明细'])
+    : $t('ui.actionTitle.create', ['发料明细']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 90,
+  },
+  layout: 'horizontal',
+  schema: useDetailFormSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmOutsourceIssueDetailApi.OutsourceIssueDetail;
+    data.issueId = issueId.value;
+    data.lineId = lineId.value;
+    try {
+      await (formData.value?.id
+        ? updateOutsourceIssueDetail({ ...data, id: formData.value.id })
+        : createOutsourceIssueDetail(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success', lineId.value!);
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    formApi.setState({ schema: useDetailFormSchema(formApi) });
+    // 加载数据
+    const data = modalApi.getData<{
+      detailId?: number;
+      issueId: number;
+      itemId?: number;
+      lineId: number;
+    }>();
+    issueId.value = data.issueId;
+    lineId.value = data.lineId;
+    if (data.detailId) {
+      modalApi.lock();
+      try {
+        formData.value = await getOutsourceIssueDetail(data.detailId);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    } else if (data.itemId) {
+      await formApi.setFieldValue('itemId', data.itemId);
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/outsourceissue/modules/detail-list.vue b/apps/web-ele/src/views/mes/wm/outsourceissue/modules/detail-list.vue
new file mode 100644
index 000000000..f574b338f
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/outsourceissue/modules/detail-list.vue
@@ -0,0 +1,103 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmOutsourceIssueDetailApi } from '#/api/mes/wm/outsourceissue/detail';
+
+import { computed, watch } from 'vue';
+
+import { ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { deleteOutsourceIssueDetail } from '#/api/mes/wm/outsourceissue/detail';
+import { $t } from '#/locales';
+
+import { type FormType, useDetailGridColumns } from '../data';
+
+const props = defineProps<{
+  details: MesWmOutsourceIssueDetailApi.OutsourceIssueDetail[];
+  formType: FormType;
+}>();
+
+const emit = defineEmits<{
+  edit: [detailId: number];
+  refresh: [];
+}>();
+
+const isStock = computed(() => props.formType === 'stock'); // 是否为拣货模式
+
+/** 编辑发料明细 */
+function handleEdit(row: MesWmOutsourceIssueDetailApi.OutsourceIssueDetail) {
+  emit('edit', row.id!);
+}
+
+/** 删除发料明细 */
+async function handleDelete(
+  row: MesWmOutsourceIssueDetailApi.OutsourceIssueDetail,
+) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.warehouseName]),
+  });
+  try {
+    await deleteOutsourceIssueDetail(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.warehouseName]));
+    emit('refresh');
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    border: true,
+    columns: useDetailGridColumns(isStock.value),
+    data: props.details,
+    pagerConfig: {
+      enabled: false,
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    size: 'small',
+    toolbarConfig: {
+      enabled: false,
+    },
+  } as VxeTableGridOptions<MesWmOutsourceIssueDetailApi.OutsourceIssueDetail>,
+});
+
+watch(
+  () => props.details,
+  (details) => gridApi.setGridOptions({ data: details }),
+);
+</script>
+
+<template>
+  <div class="px-4 py-2">
+    <Grid>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [
+                  row.warehouseName,
+                ]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/outsourceissue/modules/form.vue b/apps/web-ele/src/views/mes/wm/outsourceissue/modules/form.vue
new file mode 100644
index 000000000..708935fa0
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/outsourceissue/modules/form.vue
@@ -0,0 +1,247 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesWmOutsourceIssueApi } from '#/api/mes/wm/outsourceissue';
+
+import { computed, ref } from 'vue';
+
+import { confirm, useVbenModal } from '@vben/common-ui';
+
+import { ElButton, ElDivider, ElMessage, ElPopconfirm } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  checkOutsourceIssueQuantity,
+  createOutsourceIssue,
+  finishOutsourceIssue,
+  getOutsourceIssue,
+  stockOutsourceIssue,
+  submitOutsourceIssue,
+  updateOutsourceIssue,
+} from '#/api/mes/wm/outsourceissue';
+import { $t } from '#/locales';
+import { MesWmOutsourceIssueStatusEnum } from '#/views/mes/utils/constants';
+
+import { useFormSchema } from '../data';
+import LineList from './line-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesWmOutsourceIssueApi.OutsourceIssue>();
+const originalSnapshot = ref(''); // 表单原始数据快照，用于提交时跳过未变更的保存请求
+const isEditable = computed(() => // 是否为编辑模式（可保存）
+  ['create', 'update'].includes(formType.value),
+);
+const isStock = computed(() => formType.value === 'stock'); // 是否为拣货模式
+const isFinish = computed(() => formType.value === 'finish'); // 是否为执行领出模式
+const canSubmit = computed(() => // 是否可提交
+  formType.value === 'update' &&
+  formData.value?.status === MesWmOutsourceIssueStatusEnum.PREPARE,
+);
+const getTitle = computed(() => {
+  switch (formType.value) {
+    case 'detail': {
+      return $t('ui.actionTitle.view', ['外协发料单']);
+    }
+    case 'finish': {
+      return '执行领出';
+    }
+    case 'stock': {
+      return '执行拣货';
+    }
+    case 'update': {
+      return $t('ui.actionTitle.edit', ['外协发料单']);
+    }
+    default: {
+      return $t('ui.actionTitle.create', ['外协发料单']);
+    }
+  }
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+/** 提交发料单：表单有修改时先保存，再调用提交接口 */
+async function handleSubmit() {
+  const { valid } = await formApi.validate();
+  if (!valid || !formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    const current = JSON.stringify(await formApi.getValues());
+    if (current !== originalSnapshot.value) {
+      const data =
+        (await formApi.getValues()) as MesWmOutsourceIssueApi.OutsourceIssue;
+      await updateOutsourceIssue({ ...formData.value, ...data });
+      originalSnapshot.value = current;
+    }
+    await submitOutsourceIssue(formData.value.id);
+    ElMessage.success('提交成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 执行拣货：拣货数量与发料数量不一致时二次确认 */
+async function handleStock() {
+  if (!formData.value?.id) {
+    return;
+  }
+  const quantityMatch = await checkOutsourceIssueQuantity(formData.value.id);
+  if (!quantityMatch) {
+    try {
+      await confirm('发料数量与拣货数量不一致，确认执行拣货？');
+    } catch {
+      return;
+    }
+  }
+  modalApi.lock();
+  try {
+    await stockOutsourceIssue(formData.value.id);
+    ElMessage.success('拣货成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 执行领出 */
+async function handleFinish() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await finishOutsourceIssue(formData.value.id);
+    ElMessage.success('领出成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (!isEditable.value) {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmOutsourceIssueApi.OutsourceIssue;
+    try {
+      if (formData.value?.id) {
+        await updateOutsourceIssue({ ...formData.value, ...data });
+        formData.value = { ...formData.value, ...data };
+      } else {
+        const id = await createOutsourceIssue(data);
+        formData.value = {
+          ...data,
+          id,
+          status: MesWmOutsourceIssueStatusEnum.PREPARE,
+        };
+        await formApi.setFieldValue('id', id);
+        await formApi.setFieldValue('status', formData.value.status);
+        formType.value = 'update';
+      }
+      originalSnapshot.value = JSON.stringify(await formApi.getValues());
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      originalSnapshot.value = '';
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    formApi.setDisabled(!isEditable.value);
+    modalApi.setState({ showConfirmButton: isEditable.value });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getOutsourceIssue(data.id);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    }
+    originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+    <!-- 非新建模式展示物料信息 -->
+    <template v-if="formData?.id">
+      <ElDivider>物料信息</ElDivider>
+      <div class="mx-4">
+        <LineList :form-type="formType" :issue-id="formData.id" />
+      </div>
+    </template>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <ElPopconfirm
+          v-if="canSubmit"
+          title="确认提交该外协发料单？【提交后将不能修改】"
+          width="260"
+          @confirm="handleSubmit"
+        >
+          <template #reference>
+            <ElButton type="primary">提交</ElButton>
+          </template>
+        </ElPopconfirm>
+        <ElPopconfirm
+          v-if="isStock"
+          title="确认执行拣货？"
+          width="220"
+          @confirm="handleStock"
+        >
+          <template #reference>
+            <ElButton type="primary">执行拣货</ElButton>
+          </template>
+        </ElPopconfirm>
+        <ElPopconfirm
+          v-if="isFinish"
+          title="确认执行领出？执行后将扣减库存，且无法撤销。"
+          width="300"
+          @confirm="handleFinish"
+        >
+          <template #reference>
+            <ElButton type="primary">执行领出</ElButton>
+          </template>
+        </ElPopconfirm>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/outsourceissue/modules/line-form.vue b/apps/web-ele/src/views/mes/wm/outsourceissue/modules/line-form.vue
new file mode 100644
index 000000000..d692a5883
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/outsourceissue/modules/line-form.vue
@@ -0,0 +1,97 @@
+<script lang="ts" setup>
+import type { MesWmOutsourceIssueLineApi } from '#/api/mes/wm/outsourceissue/line';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createOutsourceIssueLine,
+  getOutsourceIssueLine,
+  updateOutsourceIssueLine,
+} from '#/api/mes/wm/outsourceissue/line';
+import { $t } from '#/locales';
+
+import { useLineFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesWmOutsourceIssueLineApi.OutsourceIssueLine>();
+const issueId = ref<number>(); // 所属发料单编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['物料发料单行'])
+    : $t('ui.actionTitle.create', ['物料发料单行']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 90,
+  },
+  layout: 'horizontal',
+  schema: useLineFormSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmOutsourceIssueLineApi.OutsourceIssueLine;
+    data.issueId = issueId.value;
+    try {
+      await (formData.value?.id
+        ? updateOutsourceIssueLine({ ...data, id: formData.value.id })
+        : createOutsourceIssueLine(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{
+      id?: number;
+      issueId: number;
+    }>();
+    issueId.value = data.issueId;
+    if (!data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getOutsourceIssueLine(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/outsourceissue/modules/line-list.vue b/apps/web-ele/src/views/mes/wm/outsourceissue/modules/line-list.vue
new file mode 100644
index 000000000..a8ba2b4f3
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/outsourceissue/modules/line-list.vue
@@ -0,0 +1,223 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmOutsourceIssueDetailApi } from '#/api/mes/wm/outsourceissue/detail';
+import type { MesWmOutsourceIssueLineApi } from '#/api/mes/wm/outsourceissue/line';
+
+import { computed, reactive } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getOutsourceIssueDetailListByLineId } from '#/api/mes/wm/outsourceissue/detail';
+import {
+  deleteOutsourceIssueLine,
+  getOutsourceIssueLinePage,
+} from '#/api/mes/wm/outsourceissue/line';
+import { $t } from '#/locales';
+
+import { type FormType, useLineGridColumns } from '../data';
+import DetailForm from './detail-form.vue';
+import DetailList from './detail-list.vue';
+import LineForm from './line-form.vue';
+
+const props = defineProps<{
+  formType: FormType;
+  issueId: number;
+}>();
+
+const isEditable = computed(() =>
+  ['create', 'update'].includes(props.formType),
+); // 是否可编辑明细行
+const isStock = computed(() => props.formType === 'stock'); // 是否为拣货模式
+const detailMap = reactive<
+  Record<number, MesWmOutsourceIssueDetailApi.OutsourceIssueDetail[]>
+>({}); // 已展开行的发料明细缓存
+
+const [LineFormModal, lineFormModalApi] = useVbenModal({
+  connectedComponent: LineForm,
+  destroyOnClose: true,
+});
+
+const [DetailFormModal, detailFormModalApi] = useVbenModal({
+  connectedComponent: DetailForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  for (const id of Object.keys(detailMap)) {
+    delete detailMap[Number(id)];
+  }
+  gridApi.query();
+}
+
+/** 添加物料 */
+function handleCreate() {
+  lineFormModalApi.setData({ issueId: props.issueId }).open();
+}
+
+/** 编辑物料 */
+function handleEdit(row: MesWmOutsourceIssueLineApi.OutsourceIssueLine) {
+  lineFormModalApi.setData({ id: row.id, issueId: props.issueId }).open();
+}
+
+/** 删除物料 */
+async function handleDelete(
+  row: MesWmOutsourceIssueLineApi.OutsourceIssueLine,
+) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.itemName]),
+  });
+  try {
+    await deleteOutsourceIssueLine(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.itemName]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+/** 拣货：直接打开明细创建表单 */
+function handlePicking(row: MesWmOutsourceIssueLineApi.OutsourceIssueLine) {
+  openDetailForm(row.id!, row.itemId);
+}
+
+/** 打开发料明细表单 */
+function openDetailForm(lineId: number, itemId?: number, detailId?: number) {
+  detailFormModalApi
+    .setData({ detailId, issueId: props.issueId, itemId, lineId })
+    .open();
+}
+
+/** 获取已展开行的发料明细 */
+function getExpandedDetails(row: MesWmOutsourceIssueLineApi.OutsourceIssueLine) {
+  return detailMap[row.id!] || [];
+}
+
+/** 加载指定行的发料明细 */
+async function loadLineDetails(lineId: number) {
+  detailMap[lineId] = await getOutsourceIssueDetailListByLineId(lineId);
+}
+
+/** 展开行时懒加载发料明细 */
+async function handleExpandChange(
+  row: MesWmOutsourceIssueLineApi.OutsourceIssueLine,
+  expanded: boolean,
+) {
+  if (!expanded) {
+    return;
+  }
+  await loadLineDetails(row.id!);
+}
+
+/** 明细表单提交成功后，刷新对应行已展开的明细 */
+async function handleDetailSuccess(lineId: number) {
+  await loadLineDetails(lineId);
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useLineGridColumns(isEditable.value, isStock.value),
+    expandConfig: {
+      padding: true,
+    },
+    height: 400,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.issueId) {
+            return { list: [], total: 0 };
+          }
+          return await getOutsourceIssueLinePage({
+            issueId: props.issueId,
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesWmOutsourceIssueLineApi.OutsourceIssueLine>,
+  gridEvents: {
+    toggleRowExpand: ({
+      expanded,
+      row,
+    }: {
+      expanded: boolean;
+      row: MesWmOutsourceIssueLineApi.OutsourceIssueLine;
+    }) => {
+      handleExpandChange(row, expanded);
+    },
+  },
+});
+</script>
+
+<template>
+  <div>
+    <LineFormModal @success="handleRefresh" />
+    <DetailFormModal @success="handleDetailSuccess" />
+    <Grid table-title="物料信息">
+      <template v-if="isEditable" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '添加物料',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #detail="{ row }">
+        <DetailList
+          :details="getExpandedDetails(row)"
+          :form-type="formType"
+          @edit="(detailId) => openDetailForm(row.id!, row.itemId, detailId)"
+          @refresh="loadLineDetails(row.id!)"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              ifShow: isEditable,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              ifShow: isEditable,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.itemName]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '拣货',
+              type: 'primary',
+              link: true,
+              ifShow: isStock,
+              onClick: handlePicking.bind(null, row),
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/outsourcereceipt/data.ts b/apps/web-ele/src/views/mes/wm/outsourcereceipt/data.ts
new file mode 100644
index 000000000..c908feff8
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/outsourcereceipt/data.ts
@@ -0,0 +1,546 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProWorkOrderApi } from '#/api/mes/pro/workorder';
+import type { MesWmOutsourceReceiptApi } from '#/api/mes/wm/outsourcereceipt';
+import type { MesWmOutsourceReceiptDetailApi } from '#/api/mes/wm/outsourcereceipt/detail';
+import type { MesWmOutsourceReceiptLineApi } from '#/api/mes/wm/outsourcereceipt/line';
+
+import { h, markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { ElButton } from 'element-plus';
+
+import { z } from '#/adapter/form';
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getRangePickerDefaultProps } from '#/utils';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
+import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
+import {
+  MesAutoCodeRuleCode,
+  MesProWorkOrderStatusEnum,
+  MesProWorkOrderTypeEnum,
+} from '#/views/mes/utils/constants';
+import {
+  WmWarehouseAreaSelect,
+  WmWarehouseLocationSelect,
+  WmWarehouseSelect,
+} from '#/views/mes/wm/warehouse/components';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'finish' | 'stock' | 'update';
+
+/** 表单头部是否只读（上架、详情、完成态） */
+function isHeaderReadonly(formType: FormType): boolean {
+  return (
+    formType === 'detail' || formType === 'finish' || formType === 'stock'
+  );
+}
+
+/** 新增/修改的表单 */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'status',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '入库单编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入入库单编号',
+      },
+      rules: 'required',
+      suffix: isHeaderReadonly(formType)
+        ? undefined
+        : () =>
+            h(
+              ElButton,
+              {
+                onClick: async () => {
+                  const code = await generateAutoCode(
+                    MesAutoCodeRuleCode.WM_OUTSOURCE_RECEIPT_CODE,
+                  );
+                  await formApi?.setFieldValue('code', code);
+                },
+              },
+              { default: () => '生成' },
+            ),
+    },
+    {
+      fieldName: 'name',
+      label: '入库单名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入入库单名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'workOrderId',
+      label: '外协工单',
+      component: markRaw(ProWorkOrderSelect),
+      componentProps: {
+        // 选择外协工单后，自动回填供应商
+        onChange: async (workOrder?: MesProWorkOrderApi.WorkOrder) => {
+          await formApi?.setFieldValue('vendorId', workOrder?.vendorId);
+        },
+        status: MesProWorkOrderStatusEnum.CONFIRMED,
+        type: MesProWorkOrderTypeEnum.OUTSOURCE,
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'vendorId',
+      label: '供应商',
+      component: markRaw(MdVendorSelect),
+      componentProps: {
+        placeholder: '请选择供应商',
+      },
+    },
+    {
+      fieldName: 'receiptDate',
+      label: '入库日期',
+      component: 'DatePicker',
+      componentProps: {
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择入库日期',
+        type: 'date',
+        valueFormat: 'x',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '入库单编号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入入库单编号',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '入库单名称',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入入库单名称',
+      },
+    },
+    {
+      fieldName: 'workOrderCode',
+      label: '外协工单号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入外协工单号',
+      },
+    },
+    {
+      fieldName: 'vendorId',
+      label: '供应商',
+      component: markRaw(MdVendorSelect),
+      componentProps: {
+        placeholder: '请选择供应商',
+      },
+    },
+    {
+      fieldName: 'status',
+      label: '状态',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(
+          DICT_TYPE.MES_WM_OUTSOURCE_RECEIPT_STATUS,
+          'number',
+        ),
+        placeholder: '请选择单据状态',
+      },
+    },
+    {
+      fieldName: 'receiptDate',
+      label: '入库日期',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+        clearable: true,
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesWmOutsourceReceiptApi.OutsourceReceipt>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '入库单编号',
+      minWidth: 160,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '入库单名称',
+      minWidth: 150,
+    },
+    {
+      field: 'workOrderCode',
+      title: '外协工单号',
+      minWidth: 140,
+    },
+    {
+      field: 'vendorName',
+      title: '供应商名称',
+      minWidth: 120,
+    },
+    {
+      field: 'receiptDate',
+      title: '入库日期',
+      width: 180,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      minWidth: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_OUTSOURCE_RECEIPT_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 240,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 入库单行子表的字段 */
+export function useLineGridColumns(
+  editable: boolean,
+  stockable: boolean,
+): VxeTableGridOptions<MesWmOutsourceReceiptLineApi.OutsourceReceiptLine>['columns'] {
+  return [
+    {
+      type: 'expand',
+      width: 48,
+      slots: { content: 'detail' },
+    },
+    {
+      field: 'itemCode',
+      title: '物料编码',
+      minWidth: 120,
+    },
+    {
+      field: 'itemName',
+      title: '物料名称',
+      minWidth: 140,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'quantity',
+      title: '入库数量',
+      width: 100,
+    },
+    {
+      field: 'batchCode',
+      title: '批次号',
+      minWidth: 120,
+    },
+    {
+      field: 'iqcCheckFlag',
+      title: '是否检验',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+      },
+    },
+    {
+      field: 'qualityStatus',
+      title: '质量状态',
+      minWidth: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_QUALITY_STATUS },
+      },
+    },
+    ...(editable || stockable
+      ? [
+          {
+            title: '操作',
+            width: 180,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 入库单行新增/修改的表单 */
+export function useLineFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择物料',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'quantity',
+      label: '入库数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入入库数量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+        placeholder: '系统自动生成',
+      },
+    },
+    {
+      fieldName: 'productionDate',
+      label: '生产日期',
+      component: 'DatePicker',
+      componentProps: {
+        class: '!w-full',
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择生产日期',
+        type: 'date',
+        valueFormat: 'x',
+      },
+    },
+    {
+      fieldName: 'expireDate',
+      label: '有效期',
+      component: 'DatePicker',
+      componentProps: {
+        class: '!w-full',
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择有效期',
+        type: 'date',
+        valueFormat: 'x',
+      },
+    },
+    {
+      fieldName: 'lotNumber',
+      label: '批号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入批号',
+      },
+    },
+    {
+      fieldName: 'iqcCheckFlag',
+      label: '是否质检',
+      component: 'Switch',
+      rules: z.boolean().default(false),
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 入库明细子表的字段 */
+export function useDetailGridColumns(
+  editable: boolean,
+): VxeTableGridOptions<MesWmOutsourceReceiptDetailApi.OutsourceReceiptDetail>['columns'] {
+  return [
+    {
+      field: 'warehouseName',
+      title: '仓库名称',
+      minWidth: 100,
+    },
+    {
+      field: 'locationName',
+      title: '库区名称',
+      minWidth: 100,
+    },
+    {
+      field: 'areaName',
+      title: '库位名称',
+      minWidth: 100,
+    },
+    {
+      field: 'quantity',
+      title: '数量',
+      width: 100,
+    },
+    ...(editable
+      ? [
+          {
+            title: '操作',
+            width: 120,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 入库明细新增/修改的表单 */
+export function useDetailFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入批次号',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'warehouseId',
+      label: '入库仓库',
+      component: markRaw(WmWarehouseSelect),
+      componentProps: {
+        // 切换仓库后清空库区和库位
+        onChange: async () => {
+          await formApi?.setValues({
+            areaId: undefined,
+            locationId: undefined,
+          });
+        },
+        placeholder: '请选择仓库',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'locationId',
+      label: '库区',
+      component: markRaw(WmWarehouseLocationSelect),
+      componentProps: {
+        placeholder: '请选择库区',
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['warehouseId'],
+        componentProps: (values) => ({
+          // 切换库区后清空库位
+          onChange: async () => {
+            await formApi?.setFieldValue('areaId', undefined);
+          },
+          placeholder: '请选择库区',
+          warehouseId: values.warehouseId,
+        }),
+      },
+    },
+    {
+      fieldName: 'areaId',
+      label: '库位',
+      component: markRaw(WmWarehouseAreaSelect),
+      componentProps: {
+        placeholder: '请选择库位',
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['locationId'],
+        componentProps: (values) => ({
+          locationId: values.locationId,
+          placeholder: '请选择库位',
+        }),
+      },
+    },
+    {
+      fieldName: 'quantity',
+      label: '数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入数量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-2',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/wm/outsourcereceipt/index.vue b/apps/web-ele/src/views/mes/wm/outsourcereceipt/index.vue
new file mode 100644
index 000000000..ce3808463
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/outsourcereceipt/index.vue
@@ -0,0 +1,211 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmOutsourceReceiptApi } from '#/api/mes/wm/outsourcereceipt';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { ElButton, ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  cancelOutsourceReceipt,
+  deleteOutsourceReceipt,
+  exportOutsourceReceipt,
+  getOutsourceReceiptPage,
+} from '#/api/mes/wm/outsourcereceipt';
+import { $t } from '#/locales';
+import { MesWmOutsourceReceiptStatusEnum } from '#/views/mes/utils/constants';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建外协入库单 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看外协入库单 */
+function handleDetail(row: MesWmOutsourceReceiptApi.OutsourceReceipt) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑外协入库单 */
+function handleEdit(row: MesWmOutsourceReceiptApi.OutsourceReceipt) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 执行上架 */
+function handleStock(row: MesWmOutsourceReceiptApi.OutsourceReceipt) {
+  formModalApi.setData({ formType: 'stock', id: row.id }).open();
+}
+
+/** 完成入库 */
+function handleFinish(row: MesWmOutsourceReceiptApi.OutsourceReceipt) {
+  formModalApi.setData({ formType: 'finish', id: row.id }).open();
+}
+
+/** 删除外协入库单 */
+async function handleDelete(row: MesWmOutsourceReceiptApi.OutsourceReceipt) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.code]),
+  });
+  try {
+    await deleteOutsourceReceipt(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+/** 取消外协入库单 */
+async function handleCancel(row: MesWmOutsourceReceiptApi.OutsourceReceipt) {
+  await cancelOutsourceReceipt(row.id!);
+  ElMessage.success('取消成功');
+  handleRefresh();
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportOutsourceReceipt(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '外协入库单.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getOutsourceReceiptPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmOutsourceReceiptApi.OutsourceReceipt>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】外协发料、外协入库"
+        url="https://doc.iocoder.cn/mes/wm/outsource/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="外协入库单列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['外协入库单']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-outsource-receipt:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:wm-outsource-receipt:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <ElButton link type="primary" @click="handleDetail(row)">
+          {{ row.code }}
+        </ElButton>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:wm-outsource-receipt:update'],
+              ifShow: row.status === MesWmOutsourceReceiptStatusEnum.PREPARE,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm-outsource-receipt:delete'],
+              ifShow: row.status === MesWmOutsourceReceiptStatusEnum.PREPARE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '执行上架',
+              type: 'primary',
+              link: true,
+              auth: ['mes:wm-outsource-receipt:update'],
+              ifShow: row.status === MesWmOutsourceReceiptStatusEnum.APPROVING,
+              onClick: handleStock.bind(null, row),
+            },
+            {
+              label: '完成入库',
+              type: 'primary',
+              link: true,
+              auth: ['mes:wm-outsource-receipt:finish'],
+              ifShow: row.status === MesWmOutsourceReceiptStatusEnum.APPROVED,
+              onClick: handleFinish.bind(null, row),
+            },
+            {
+              label: '取消',
+              type: 'danger',
+              link: true,
+              auth: ['mes:wm-outsource-receipt:update'],
+              ifShow:
+                row.status === MesWmOutsourceReceiptStatusEnum.APPROVING ||
+                row.status === MesWmOutsourceReceiptStatusEnum.APPROVED,
+              popConfirm: {
+                title: '确认取消该外协入库单？取消后不可恢复。',
+                confirm: handleCancel.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/outsourcereceipt/modules/detail-form.vue b/apps/web-ele/src/views/mes/wm/outsourcereceipt/modules/detail-form.vue
new file mode 100644
index 000000000..c0b3b3572
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/outsourcereceipt/modules/detail-form.vue
@@ -0,0 +1,104 @@
+<script lang="ts" setup>
+import type { MesWmOutsourceReceiptDetailApi } from '#/api/mes/wm/outsourcereceipt/detail';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createOutsourceReceiptDetail,
+  getOutsourceReceiptDetail,
+  updateOutsourceReceiptDetail,
+} from '#/api/mes/wm/outsourcereceipt/detail';
+import { $t } from '#/locales';
+
+import { useDetailFormSchema } from '../data';
+
+const emit = defineEmits<{ success: [lineId: number] }>();
+const formData = ref<MesWmOutsourceReceiptDetailApi.OutsourceReceiptDetail>();
+const receiptId = ref<number>(); // 所属入库单编号
+const lineId = ref<number>(); // 所属入库单行编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['收货明细'])
+    : $t('ui.actionTitle.create', ['收货明细']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 90,
+  },
+  layout: 'horizontal',
+  schema: useDetailFormSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-2',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmOutsourceReceiptDetailApi.OutsourceReceiptDetail;
+    data.receiptId = receiptId.value;
+    data.lineId = lineId.value;
+    try {
+      await (formData.value?.id
+        ? updateOutsourceReceiptDetail({ ...data, id: formData.value.id })
+        : createOutsourceReceiptDetail(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success', lineId.value!);
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    formApi.setState({ schema: useDetailFormSchema(formApi) });
+    // 加载数据
+    const data = modalApi.getData<{
+      detailId?: number;
+      itemId?: number;
+      lineId: number;
+      receiptId: number;
+    }>();
+    receiptId.value = data.receiptId;
+    lineId.value = data.lineId;
+    if (data.detailId) {
+      modalApi.lock();
+      try {
+        formData.value = await getOutsourceReceiptDetail(data.detailId);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    } else if (data.itemId) {
+      await formApi.setFieldValue('itemId', data.itemId);
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-1/2">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/outsourcereceipt/modules/detail-list.vue b/apps/web-ele/src/views/mes/wm/outsourcereceipt/modules/detail-list.vue
new file mode 100644
index 000000000..cabac9479
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/outsourcereceipt/modules/detail-list.vue
@@ -0,0 +1,122 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmOutsourceReceiptDetailApi } from '#/api/mes/wm/outsourcereceipt/detail';
+
+import { computed, watch } from 'vue';
+
+import { ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { deleteOutsourceReceiptDetail } from '#/api/mes/wm/outsourcereceipt/detail';
+import { $t } from '#/locales';
+
+import { type FormType, useDetailGridColumns } from '../data';
+
+const props = defineProps<{
+  details: MesWmOutsourceReceiptDetailApi.OutsourceReceiptDetail[];
+  formType: FormType;
+}>();
+
+const emit = defineEmits<{
+  edit: [detailId?: number];
+  refresh: [];
+}>();
+
+const isEditable = computed(
+  () => ['create', 'stock', 'update'].includes(props.formType),
+); // 是否可维护收货明细（编辑或上架态）
+
+/** 添加收货明细 */
+function handleCreate() {
+  emit('edit', undefined);
+}
+
+/** 编辑收货明细 */
+function handleEdit(row: MesWmOutsourceReceiptDetailApi.OutsourceReceiptDetail) {
+  emit('edit', row.id!);
+}
+
+/** 删除收货明细 */
+async function handleDelete(
+  row: MesWmOutsourceReceiptDetailApi.OutsourceReceiptDetail,
+) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.warehouseName]),
+  });
+  try {
+    await deleteOutsourceReceiptDetail(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.warehouseName]));
+    emit('refresh');
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    border: true,
+    columns: useDetailGridColumns(isEditable.value),
+    data: props.details,
+    pagerConfig: {
+      enabled: false,
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    size: 'small',
+    toolbarConfig: {
+      enabled: false,
+    },
+  } as VxeTableGridOptions<MesWmOutsourceReceiptDetailApi.OutsourceReceiptDetail>,
+});
+
+watch(
+  () => props.details,
+  (details) => gridApi.setGridOptions({ data: details }),
+);
+</script>
+
+<template>
+  <div class="px-4 py-2">
+    <TableAction
+      v-if="isEditable"
+      class="mb-2"
+      :actions="[
+        {
+          label: '添加明细',
+          type: 'primary',
+          icon: ACTION_ICON.ADD,
+          onClick: handleCreate,
+        },
+      ]"
+    />
+    <Grid>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [
+                  row.warehouseName,
+                ]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/outsourcereceipt/modules/form.vue b/apps/web-ele/src/views/mes/wm/outsourcereceipt/modules/form.vue
new file mode 100644
index 000000000..52678831f
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/outsourcereceipt/modules/form.vue
@@ -0,0 +1,238 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesWmOutsourceReceiptApi } from '#/api/mes/wm/outsourcereceipt';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElButton, ElDivider, ElMessage, ElPopconfirm } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createOutsourceReceipt,
+  finishOutsourceReceipt,
+  getOutsourceReceipt,
+  stockOutsourceReceipt,
+  submitOutsourceReceipt,
+  updateOutsourceReceipt,
+} from '#/api/mes/wm/outsourcereceipt';
+import { $t } from '#/locales';
+import { MesWmOutsourceReceiptStatusEnum } from '#/views/mes/utils/constants';
+
+import { useFormSchema } from '../data';
+import LineList from './line-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesWmOutsourceReceiptApi.OutsourceReceipt>();
+const originalSnapshot = ref(''); // 表单原始数据快照，用于提交时跳过未变更的保存请求
+const isEditable = computed(() => // 是否为编辑模式（可保存）
+  ['create', 'update'].includes(formType.value),
+);
+const isStock = computed(() => formType.value === 'stock'); // 是否为上架模式
+const isFinish = computed(() => formType.value === 'finish'); // 是否为完成入库模式
+const canSubmit = computed(() => // 是否可提交
+  formType.value === 'update' &&
+  formData.value?.status === MesWmOutsourceReceiptStatusEnum.PREPARE,
+);
+const getTitle = computed(() => {
+  switch (formType.value) {
+    case 'detail': {
+      return $t('ui.actionTitle.view', ['外协入库单']);
+    }
+    case 'finish': {
+      return '完成入库';
+    }
+    case 'stock': {
+      return '执行上架';
+    }
+    case 'update': {
+      return $t('ui.actionTitle.edit', ['外协入库单']);
+    }
+    default: {
+      return $t('ui.actionTitle.create', ['外协入库单']);
+    }
+  }
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+/** 提交入库单：表单有修改时先保存，再调用提交接口 */
+async function handleSubmit() {
+  const { valid } = await formApi.validate();
+  if (!valid || !formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    const current = JSON.stringify(await formApi.getValues());
+    if (current !== originalSnapshot.value) {
+      const data =
+        (await formApi.getValues()) as MesWmOutsourceReceiptApi.OutsourceReceipt;
+      await updateOutsourceReceipt({ ...formData.value, ...data });
+      originalSnapshot.value = current;
+    }
+    await submitOutsourceReceipt(formData.value.id);
+    ElMessage.success('提交成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 执行上架 */
+async function handleStock() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await stockOutsourceReceipt(formData.value.id);
+    ElMessage.success('上架成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 完成入库 */
+async function handleFinish() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await finishOutsourceReceipt(formData.value.id);
+    ElMessage.success('入库成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (!isEditable.value) {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmOutsourceReceiptApi.OutsourceReceipt;
+    try {
+      if (formData.value?.id) {
+        await updateOutsourceReceipt({ ...formData.value, ...data });
+        formData.value = { ...formData.value, ...data };
+      } else {
+        const id = await createOutsourceReceipt(data);
+        formData.value = {
+          ...data,
+          id,
+          status: MesWmOutsourceReceiptStatusEnum.PREPARE,
+        };
+        await formApi.setFieldValue('id', id);
+        await formApi.setFieldValue('status', formData.value.status);
+        formType.value = 'update';
+      }
+      originalSnapshot.value = JSON.stringify(await formApi.getValues());
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      originalSnapshot.value = '';
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    formApi.setDisabled(!isEditable.value);
+    modalApi.setState({ showConfirmButton: isEditable.value });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getOutsourceReceipt(data.id);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    }
+    originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+    <!-- 非新建模式展示物料信息 -->
+    <template v-if="formData?.id">
+      <ElDivider>物料信息</ElDivider>
+      <div class="mx-4">
+        <LineList :form-type="formType" :receipt-id="formData.id" />
+      </div>
+    </template>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <ElPopconfirm
+          v-if="canSubmit"
+          title="确认提交该外协入库单？【提交后将不能修改】"
+          width="260"
+          @confirm="handleSubmit"
+        >
+          <template #reference>
+            <ElButton type="primary">提交</ElButton>
+          </template>
+        </ElPopconfirm>
+        <ElPopconfirm
+          v-if="isStock"
+          title="确认执行上架？"
+          width="220"
+          @confirm="handleStock"
+        >
+          <template #reference>
+            <ElButton type="primary">执行上架</ElButton>
+          </template>
+        </ElPopconfirm>
+        <ElPopconfirm
+          v-if="isFinish"
+          title="确认完成入库？完成后将更新库存台账。"
+          width="300"
+          @confirm="handleFinish"
+        >
+          <template #reference>
+            <ElButton type="primary">完成入库</ElButton>
+          </template>
+        </ElPopconfirm>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/outsourcereceipt/modules/line-form.vue b/apps/web-ele/src/views/mes/wm/outsourcereceipt/modules/line-form.vue
new file mode 100644
index 000000000..a080867d2
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/outsourcereceipt/modules/line-form.vue
@@ -0,0 +1,98 @@
+<script lang="ts" setup>
+import type { MesWmOutsourceReceiptLineApi } from '#/api/mes/wm/outsourcereceipt/line';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createOutsourceReceiptLine,
+  getOutsourceReceiptLine,
+  updateOutsourceReceiptLine,
+} from '#/api/mes/wm/outsourcereceipt/line';
+import { $t } from '#/locales';
+
+import { useLineFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesWmOutsourceReceiptLineApi.OutsourceReceiptLine>();
+const receiptId = ref<number>(); // 所属入库单编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['外协入库单行'])
+    : $t('ui.actionTitle.create', ['外协入库单行']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 90,
+  },
+  layout: 'horizontal',
+  schema: useLineFormSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单（批次号由后端自动生成，不提交）
+    const data =
+      (await formApi.getValues()) as MesWmOutsourceReceiptLineApi.OutsourceReceiptLine;
+    data.receiptId = receiptId.value;
+    delete data.batchCode;
+    try {
+      await (formData.value?.id
+        ? updateOutsourceReceiptLine({ ...data, id: formData.value.id })
+        : createOutsourceReceiptLine(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{
+      id?: number;
+      receiptId: number;
+    }>();
+    receiptId.value = data.receiptId;
+    if (!data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getOutsourceReceiptLine(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/outsourcereceipt/modules/line-list.vue b/apps/web-ele/src/views/mes/wm/outsourcereceipt/modules/line-list.vue
new file mode 100644
index 000000000..362c06a38
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/outsourcereceipt/modules/line-list.vue
@@ -0,0 +1,234 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmOutsourceReceiptDetailApi } from '#/api/mes/wm/outsourcereceipt/detail';
+import type { MesWmOutsourceReceiptLineApi } from '#/api/mes/wm/outsourcereceipt/line';
+
+import { computed, reactive } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getOutsourceReceiptDetailListByLineId } from '#/api/mes/wm/outsourcereceipt/detail';
+import {
+  deleteOutsourceReceiptLine,
+  getOutsourceReceiptLinePage,
+} from '#/api/mes/wm/outsourcereceipt/line';
+import { $t } from '#/locales';
+import { PrinterLabel } from '#/views/mes/wm/barcode/components';
+
+import { type FormType, useLineGridColumns } from '../data';
+import DetailForm from './detail-form.vue';
+import DetailList from './detail-list.vue';
+import LineForm from './line-form.vue';
+
+const props = defineProps<{
+  formType: FormType;
+  receiptId: number;
+}>();
+
+const isEditable = computed(() =>
+  ['create', 'update'].includes(props.formType),
+); // 是否可编辑明细行
+const isStock = computed(() => props.formType === 'stock'); // 是否为上架模式
+const detailMap = reactive<
+  Record<number, MesWmOutsourceReceiptDetailApi.OutsourceReceiptDetail[]>
+>({}); // 已展开行的收货明细缓存
+
+const [LineFormModal, lineFormModalApi] = useVbenModal({
+  connectedComponent: LineForm,
+  destroyOnClose: true,
+});
+
+const [DetailFormModal, detailFormModalApi] = useVbenModal({
+  connectedComponent: DetailForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  for (const id of Object.keys(detailMap)) {
+    delete detailMap[Number(id)];
+  }
+  gridApi.query();
+}
+
+/** 添加物料 */
+function handleCreate() {
+  lineFormModalApi.setData({ receiptId: props.receiptId }).open();
+}
+
+/** 编辑物料 */
+function handleEdit(row: MesWmOutsourceReceiptLineApi.OutsourceReceiptLine) {
+  lineFormModalApi.setData({ id: row.id, receiptId: props.receiptId }).open();
+}
+
+/** 删除物料 */
+async function handleDelete(
+  row: MesWmOutsourceReceiptLineApi.OutsourceReceiptLine,
+) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.itemName]),
+  });
+  try {
+    await deleteOutsourceReceiptLine(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.itemName]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+/** 上架：直接打开明细创建表单 */
+function handlePicking(row: MesWmOutsourceReceiptLineApi.OutsourceReceiptLine) {
+  openDetailForm(row.id!, row.itemId);
+}
+
+/** 打开收货明细表单 */
+function openDetailForm(lineId: number, itemId?: number, detailId?: number) {
+  detailFormModalApi
+    .setData({ detailId, itemId, lineId, receiptId: props.receiptId })
+    .open();
+}
+
+/** 获取已展开行的收货明细 */
+function getExpandedDetails(
+  row: MesWmOutsourceReceiptLineApi.OutsourceReceiptLine,
+) {
+  return detailMap[row.id!] || [];
+}
+
+/** 加载指定行的收货明细 */
+async function loadLineDetails(lineId: number) {
+  detailMap[lineId] = await getOutsourceReceiptDetailListByLineId(lineId);
+}
+
+/** 展开行时懒加载收货明细 */
+async function handleExpandChange(
+  row: MesWmOutsourceReceiptLineApi.OutsourceReceiptLine,
+  expanded: boolean,
+) {
+  if (!expanded) {
+    return;
+  }
+  await loadLineDetails(row.id!);
+}
+
+/** 明细表单提交成功后，刷新对应行已展开的明细 */
+async function handleDetailSuccess(lineId: number) {
+  await loadLineDetails(lineId);
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useLineGridColumns(isEditable.value, isStock.value),
+    expandConfig: {
+      padding: true,
+    },
+    height: 400,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.receiptId) {
+            return { list: [], total: 0 };
+          }
+          return await getOutsourceReceiptLinePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            receiptId: props.receiptId,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesWmOutsourceReceiptLineApi.OutsourceReceiptLine>,
+  gridEvents: {
+    toggleRowExpand: ({
+      expanded,
+      row,
+    }: {
+      expanded: boolean;
+      row: MesWmOutsourceReceiptLineApi.OutsourceReceiptLine;
+    }) => {
+      handleExpandChange(row, expanded);
+    },
+  },
+});
+</script>
+
+<template>
+  <div>
+    <LineFormModal @success="handleRefresh" />
+    <DetailFormModal @success="handleDetailSuccess" />
+    <Grid table-title="物料信息">
+      <template v-if="isEditable" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '添加物料',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #detail="{ row }">
+        <DetailList
+          :details="getExpandedDetails(row)"
+          :form-type="formType"
+          @edit="(detailId) => openDetailForm(row.id!, row.itemId, detailId)"
+          @refresh="loadLineDetails(row.id!)"
+        />
+      </template>
+      <template #actions="{ row }">
+        <div class="flex items-center justify-center">
+          <TableAction
+            :actions="[
+              {
+                label: $t('common.edit'),
+                type: 'primary',
+                link: true,
+                icon: ACTION_ICON.EDIT,
+                ifShow: isEditable,
+                onClick: handleEdit.bind(null, row),
+              },
+              {
+                label: $t('common.delete'),
+                type: 'danger',
+                link: true,
+                icon: ACTION_ICON.DELETE,
+                ifShow: isEditable,
+                popConfirm: {
+                  title: $t('ui.actionMessage.deleteConfirm', [row.itemName]),
+                  confirm: handleDelete.bind(null, row),
+                },
+              },
+              {
+                label: '上架',
+                type: 'primary',
+                link: true,
+                ifShow: isStock,
+                onClick: handlePicking.bind(null, row),
+              },
+            ]"
+          />
+          <PrinterLabel
+            v-if="isStock"
+            :biz-code="row.batchCode"
+            :biz-id="row.batchId"
+            biz-type="BATCH"
+          />
+        </div>
+      </template>
+    </Grid>
+  </div>
+</template>

From b6d1154b8f3cf5a0b078ae5311dca184b85c3ec9 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 30 May 2026 09:15:06 +0800
Subject: [PATCH 33/52] =?UTF-8?q?feat(mes):=20=E6=8F=90=E4=BA=A4=20wm=20st?=
 =?UTF-8?q?ocktaking=20=E7=9B=B8=E5=85=B3=E7=9A=84=E8=BF=81=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/package.json                    |   1 +
 .../wm/stocktaking/plan/components/index.ts   |   2 +
 .../stock-taking-plan-select-dialog.vue       | 210 +++++++
 .../components/stock-taking-plan-select.vue   | 137 ++++
 .../src/views/mes/wm/stocktaking/plan/data.ts | 387 ++++++++++++
 .../views/mes/wm/stocktaking/plan/index.vue   | 184 ++++++
 .../mes/wm/stocktaking/plan/modules/form.vue  | 126 ++++
 .../stocktaking/plan/modules/param-form.vue   | 267 ++++++++
 .../src/views/mes/wm/stocktaking/task/data.ts | 582 +++++++++++++++++
 .../views/mes/wm/stocktaking/task/index.vue   | 209 +++++++
 .../mes/wm/stocktaking/task/modules/form.vue  | 233 +++++++
 .../wm/stocktaking/task/modules/line-list.vue | 147 +++++
 .../stocktaking/task/modules/result-form.vue  | 106 ++++
 .../stocktaking/task/modules/result-list.vue  | 140 +++++
 apps/web-ele/package.json                     |   1 +
 .../src/api/mes/pro/card/process/index.ts     |  62 ++
 .../src/api/mes/pro/workorder/bom/index.ts    |  62 ++
 .../src/api/mes/wm/arrivalnotice/index.ts     |  68 ++
 .../api/mes/wm/arrivalnotice/line/index.ts    |  58 ++
 .../api/mes/wm/itemreceipt/detail/index.ts    |  58 ++
 .../api/mes/wm/productissue/detail/index.ts   |  56 ++
 .../src/api/mes/wm/productissue/index.ts      |  87 +++
 .../src/api/mes/wm/productissue/line/index.ts |  53 ++
 .../api/mes/wm/productreceipt/detail/index.ts |  58 ++
 .../src/api/mes/wm/productreceipt/index.ts    |  91 +++
 .../api/mes/wm/productreceipt/line/index.ts   |  57 ++
 .../api/mes/wm/productsales/detail/index.ts   |  58 ++
 .../api/mes/wm/returnissue/detail/index.ts    |  56 ++
 .../src/api/mes/wm/returnissue/index.ts       |  78 +++
 .../src/api/mes/wm/returnissue/line/index.ts  |  58 ++
 .../api/mes/wm/returnsales/detail/index.ts    |  55 ++
 .../src/api/mes/wm/returnsales/index.ts       |  78 +++
 .../src/api/mes/wm/returnsales/line/index.ts  |  57 ++
 .../api/mes/wm/returnvendor/detail/index.ts   |  56 ++
 .../src/api/mes/wm/returnvendor/index.ts      |  88 +++
 .../src/api/mes/wm/returnvendor/line/index.ts |  54 ++
 .../src/api/mes/wm/salesnotice/index.ts       |  65 ++
 .../src/api/mes/wm/salesnotice/line/index.ts  |  55 ++
 .../src/api/mes/wm/stocktaking/plan/index.ts  |  68 ++
 .../mes/wm/stocktaking/plan/param/index.ts    |  49 ++
 .../src/api/mes/wm/stocktaking/task/index.ts  |  86 +++
 .../api/mes/wm/stocktaking/task/line/index.ts |  72 +++
 .../mes/wm/stocktaking/task/result/index.ts   |  64 ++
 .../wm/stocktaking/plan/components/index.ts   |   2 +
 .../stock-taking-plan-select-dialog.vue       | 213 +++++++
 .../components/stock-taking-plan-select.vue   | 135 ++++
 .../src/views/mes/wm/stocktaking/plan/data.ts | 388 ++++++++++++
 .../views/mes/wm/stocktaking/plan/index.vue   | 184 ++++++
 .../mes/wm/stocktaking/plan/modules/form.vue  | 126 ++++
 .../stocktaking/plan/modules/param-form.vue   | 288 +++++++++
 .../stocktaking/plan/modules/param-list.vue   | 131 ++++
 .../src/views/mes/wm/stocktaking/task/data.ts | 584 ++++++++++++++++++
 .../views/mes/wm/stocktaking/task/index.vue   | 211 +++++++
 .../mes/wm/stocktaking/task/modules/form.vue  | 237 +++++++
 .../wm/stocktaking/task/modules/line-list.vue | 147 +++++
 .../stocktaking/task/modules/result-form.vue  | 107 ++++
 .../stocktaking/task/modules/result-list.vue  | 140 +++++
 pnpm-workspace.yaml                           |   1 +
 58 files changed, 7433 insertions(+)
 create mode 100644 apps/web-antd/src/views/mes/wm/stocktaking/plan/components/index.ts
 create mode 100644 apps/web-antd/src/views/mes/wm/stocktaking/plan/components/stock-taking-plan-select-dialog.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/stocktaking/plan/components/stock-taking-plan-select.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/stocktaking/plan/data.ts
 create mode 100644 apps/web-antd/src/views/mes/wm/stocktaking/plan/index.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/stocktaking/plan/modules/form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/stocktaking/plan/modules/param-form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/stocktaking/task/data.ts
 create mode 100644 apps/web-antd/src/views/mes/wm/stocktaking/task/index.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/stocktaking/task/modules/form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/stocktaking/task/modules/line-list.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/stocktaking/task/modules/result-form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/stocktaking/task/modules/result-list.vue
 create mode 100644 apps/web-ele/src/api/mes/pro/card/process/index.ts
 create mode 100644 apps/web-ele/src/api/mes/pro/workorder/bom/index.ts
 create mode 100644 apps/web-ele/src/api/mes/wm/arrivalnotice/index.ts
 create mode 100644 apps/web-ele/src/api/mes/wm/arrivalnotice/line/index.ts
 create mode 100644 apps/web-ele/src/api/mes/wm/itemreceipt/detail/index.ts
 create mode 100644 apps/web-ele/src/api/mes/wm/productissue/detail/index.ts
 create mode 100644 apps/web-ele/src/api/mes/wm/productissue/index.ts
 create mode 100644 apps/web-ele/src/api/mes/wm/productissue/line/index.ts
 create mode 100644 apps/web-ele/src/api/mes/wm/productreceipt/detail/index.ts
 create mode 100644 apps/web-ele/src/api/mes/wm/productreceipt/index.ts
 create mode 100644 apps/web-ele/src/api/mes/wm/productreceipt/line/index.ts
 create mode 100644 apps/web-ele/src/api/mes/wm/productsales/detail/index.ts
 create mode 100644 apps/web-ele/src/api/mes/wm/returnissue/detail/index.ts
 create mode 100644 apps/web-ele/src/api/mes/wm/returnissue/index.ts
 create mode 100644 apps/web-ele/src/api/mes/wm/returnissue/line/index.ts
 create mode 100644 apps/web-ele/src/api/mes/wm/returnsales/detail/index.ts
 create mode 100644 apps/web-ele/src/api/mes/wm/returnsales/index.ts
 create mode 100644 apps/web-ele/src/api/mes/wm/returnsales/line/index.ts
 create mode 100644 apps/web-ele/src/api/mes/wm/returnvendor/detail/index.ts
 create mode 100644 apps/web-ele/src/api/mes/wm/returnvendor/index.ts
 create mode 100644 apps/web-ele/src/api/mes/wm/returnvendor/line/index.ts
 create mode 100644 apps/web-ele/src/api/mes/wm/salesnotice/index.ts
 create mode 100644 apps/web-ele/src/api/mes/wm/salesnotice/line/index.ts
 create mode 100644 apps/web-ele/src/api/mes/wm/stocktaking/plan/index.ts
 create mode 100644 apps/web-ele/src/api/mes/wm/stocktaking/plan/param/index.ts
 create mode 100644 apps/web-ele/src/api/mes/wm/stocktaking/task/index.ts
 create mode 100644 apps/web-ele/src/api/mes/wm/stocktaking/task/line/index.ts
 create mode 100644 apps/web-ele/src/api/mes/wm/stocktaking/task/result/index.ts
 create mode 100644 apps/web-ele/src/views/mes/wm/stocktaking/plan/components/index.ts
 create mode 100644 apps/web-ele/src/views/mes/wm/stocktaking/plan/components/stock-taking-plan-select-dialog.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/stocktaking/plan/components/stock-taking-plan-select.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/stocktaking/plan/data.ts
 create mode 100644 apps/web-ele/src/views/mes/wm/stocktaking/plan/index.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/stocktaking/plan/modules/form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/stocktaking/plan/modules/param-form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/stocktaking/plan/modules/param-list.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/stocktaking/task/data.ts
 create mode 100644 apps/web-ele/src/views/mes/wm/stocktaking/task/index.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/stocktaking/task/modules/form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/stocktaking/task/modules/line-list.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/stocktaking/task/modules/result-form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/stocktaking/task/modules/result-list.vue

diff --git a/apps/web-antd/package.json b/apps/web-antd/package.json
index a3ae11913..93a6f0e28 100644
--- a/apps/web-antd/package.json
+++ b/apps/web-antd/package.json
@@ -54,6 +54,7 @@
     "camunda-bpmn-moddle": "catalog:",
     "cropperjs": "catalog:",
     "dayjs": "catalog:",
+    "dhtmlx-gantt": "catalog:",
     "diagram-js": "catalog:",
     "fast-xml-parser": "catalog:",
     "highlight.js": "catalog:",
diff --git a/apps/web-antd/src/views/mes/wm/stocktaking/plan/components/index.ts b/apps/web-antd/src/views/mes/wm/stocktaking/plan/components/index.ts
new file mode 100644
index 000000000..d6289b11d
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/stocktaking/plan/components/index.ts
@@ -0,0 +1,2 @@
+export { default as StockTakingPlanSelectDialog } from './stock-taking-plan-select-dialog.vue';
+export { default as StockTakingPlanSelect } from './stock-taking-plan-select.vue';
diff --git a/apps/web-antd/src/views/mes/wm/stocktaking/plan/components/stock-taking-plan-select-dialog.vue b/apps/web-antd/src/views/mes/wm/stocktaking/plan/components/stock-taking-plan-select-dialog.vue
new file mode 100644
index 000000000..f46313f17
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/stocktaking/plan/components/stock-taking-plan-select-dialog.vue
@@ -0,0 +1,210 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmStockTakingPlanApi } from '#/api/mes/wm/stocktaking/plan';
+
+import { nextTick, ref } from 'vue';
+
+import { CommonStatusEnum } from '@vben/constants';
+
+import { message, Modal } from 'ant-design-vue';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getStockTakingPlanPage } from '#/api/mes/wm/stocktaking/plan';
+
+import { useSelectGridColumns, useSelectGridFormSchema } from '../data';
+
+const emit = defineEmits<{
+  selected: [rows: MesWmStockTakingPlanApi.StockTakingPlan[]];
+}>();
+
+const open = ref(false); // 弹窗是否打开
+const multiple = ref(true); // 是否多选
+const selectedRows = ref<MesWmStockTakingPlanApi.StockTakingPlan[]>([]); // 已选盘点方案
+const preSelectedIds = ref<number[]>([]); // 预选盘点方案编号
+
+/** 获取多选记录，包含 VXE reserve 跨页记录 */
+function getMultipleSelectedRows() {
+  const selectedMap = new Map<
+    number,
+    MesWmStockTakingPlanApi.StockTakingPlan
+  >();
+  const records = [
+    ...(gridApi.grid.getCheckboxReserveRecords?.() ?? []),
+    ...(gridApi.grid.getCheckboxRecords?.() ?? []),
+  ] as MesWmStockTakingPlanApi.StockTakingPlan[];
+  records.forEach((row) => {
+    if (row.id != null) {
+      selectedMap.set(row.id, row);
+    }
+  });
+  return [...selectedMap.values()];
+}
+
+/** 处理勾选变化 */
+function handleCheckboxSelectChange() {
+  selectedRows.value = getMultipleSelectedRows();
+}
+
+/** 处理单选变化 */
+function handleRadioChange(row: MesWmStockTakingPlanApi.StockTakingPlan) {
+  selectedRows.value = [row];
+}
+
+/** 多选模式下切换行勾选 */
+async function toggleMultipleRow(
+  row: MesWmStockTakingPlanApi.StockTakingPlan,
+) {
+  const selected = gridApi.grid.isCheckedByCheckboxRow(row);
+  await gridApi.grid.setCheckboxRow(row, !selected);
+  selectedRows.value = getMultipleSelectedRows();
+}
+
+/** 处理行双击：单选直接确认；多选切换勾选 */
+async function handleCellDblclick({
+  row,
+}: {
+  row: MesWmStockTakingPlanApi.StockTakingPlan;
+}) {
+  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 = gridApi.grid.getData() as MesWmStockTakingPlanApi.StockTakingPlan[];
+  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: useSelectGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useSelectGridColumns(true),
+    height: 480,
+    keepSource: true,
+    checkboxConfig: {
+      highlight: true,
+      range: true,
+      reserve: true,
+    },
+    radioConfig: {
+      highlight: true,
+      trigger: 'row',
+    },
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getStockTakingPlanPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+            // 选择器只展示启用状态的方案
+            status: CommonStatusEnum.ENABLE,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmStockTakingPlanApi.StockTakingPlan>,
+  gridEvents: {
+    cellDblclick: handleCellDblclick,
+    checkboxAll: handleCheckboxSelectChange,
+    checkboxChange: handleCheckboxSelectChange,
+    radioChange: ({
+      row,
+    }: {
+      row: MesWmStockTakingPlanApi.StockTakingPlan;
+    }) => {
+      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 ?? true;
+  preSelectedIds.value = selectedIds || [];
+  await nextTick();
+  gridApi.setGridOptions({
+    columns: useSelectGridColumns(multiple.value),
+  });
+  await resetQueryState();
+  await gridApi.query();
+  await nextTick();
+  await applyPreSelection();
+}
+
+/** 关闭弹窗 */
+function closeModal() {
+  open.value = false;
+}
+
+/** 确认选择 */
+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"
+    :destroy-on-close="true"
+    title="盘点方案选择"
+    width="70%"
+    @cancel="closeModal"
+    @ok="handleConfirm"
+  >
+    <Grid table-title="盘点方案列表" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/stocktaking/plan/components/stock-taking-plan-select.vue b/apps/web-antd/src/views/mes/wm/stocktaking/plan/components/stock-taking-plan-select.vue
new file mode 100644
index 000000000..82cf2f4ee
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/stocktaking/plan/components/stock-taking-plan-select.vue
@@ -0,0 +1,137 @@
+<script lang="ts" setup>
+import type { MesWmStockTakingPlanApi } from '#/api/mes/wm/stocktaking/plan';
+
+import { computed, ref, useAttrs, watch } from 'vue';
+
+import { IconifyIcon } from '@vben/icons';
+
+import { Input, Tooltip } from 'ant-design-vue';
+
+import { getStockTakingPlan } from '#/api/mes/wm/stocktaking/plan';
+
+import StockTakingPlanSelectDialog from './stock-taking-plan-select-dialog.vue';
+
+defineOptions({ name: 'StockTakingPlanSelect', inheritAttrs: false });
+
+const props = withDefaults(
+  defineProps<{
+    allowClear?: boolean;
+    disabled?: boolean;
+    modelValue?: number;
+    placeholder?: string;
+  }>(),
+  {
+    allowClear: true,
+    disabled: false,
+    modelValue: undefined,
+    placeholder: '请选择盘点方案',
+  },
+);
+
+const emit = defineEmits<{
+  change: [item: MesWmStockTakingPlanApi.StockTakingPlan | undefined];
+  'update:modelValue': [value: number | undefined];
+}>();
+
+const attrs = useAttrs();
+const dialogRef = ref<InstanceType<typeof StockTakingPlanSelectDialog>>();
+const hovering = ref(false);
+const selectedItem = ref<MesWmStockTakingPlanApi.StockTakingPlan>();
+
+const displayLabel = computed(() => selectedItem.value?.name ?? '');
+
+const showClear = computed(
+  () =>
+    props.allowClear &&
+    !props.disabled &&
+    hovering.value &&
+    props.modelValue != null,
+);
+
+/** 根据编号单条查询盘点方案信息（用于编辑回显） */
+async function resolveItemById(id: number | undefined) {
+  if (id == null) {
+    selectedItem.value = undefined;
+    return;
+  }
+  if (selectedItem.value?.id === id) {
+    return;
+  }
+  try {
+    selectedItem.value = await getStockTakingPlan(id);
+  } catch (error) {
+    console.error('[StockTakingPlanSelect] resolveItemById failed:', error);
+  }
+}
+
+watch(() => props.modelValue, resolveItemById, { immediate: true });
+
+/** 清空已选盘点方案 */
+function clearSelected() {
+  selectedItem.value = undefined;
+  emit('update:modelValue', undefined);
+  emit('change', undefined);
+}
+
+/** 打开盘点方案选择弹窗 */
+function handleClick(event: MouseEvent) {
+  if (props.disabled) {
+    return;
+  }
+  const target = event.target as HTMLElement;
+  if (showClear.value && target.closest('.ant-input-suffix')) {
+    event.stopPropagation();
+    clearSelected();
+    return;
+  }
+  const selectedIds = props.modelValue == null ? [] : [props.modelValue];
+  dialogRef.value?.open(selectedIds, { multiple: false });
+}
+
+/** 弹窗选中回调 */
+function handleSelected(rows: MesWmStockTakingPlanApi.StockTakingPlan[]) {
+  const item = rows[0];
+  if (!item) {
+    return;
+  }
+  selectedItem.value = item;
+  emit('update:modelValue', item.id);
+  emit('change', item);
+}
+</script>
+
+<template>
+  <div
+    v-bind="attrs"
+    class="w-full"
+    :class="disabled ? 'cursor-not-allowed' : 'cursor-pointer'"
+    @click="handleClick"
+    @mouseenter="hovering = true"
+    @mouseleave="hovering = false"
+  >
+    <Tooltip :mouse-enter-delay="0.5" :open="selectedItem ? undefined : false">
+      <template #title>
+        <div v-if="selectedItem" class="leading-6">
+          <div>编码：{{ selectedItem.code || '-' }}</div>
+          <div>名称：{{ selectedItem.name || '-' }}</div>
+          <div>是否盲盘：{{ selectedItem.blindFlag ? '是' : '否' }}</div>
+          <div>是否冻结库存：{{ selectedItem.frozen ? '是' : '否' }}</div>
+        </div>
+      </template>
+      <Input
+        :disabled="disabled"
+        :placeholder="placeholder"
+        :value="displayLabel"
+        readonly
+      >
+        <template #suffix>
+          <IconifyIcon
+            class="size-4"
+            :icon="showClear ? 'lucide:circle-x' : 'lucide:search'"
+          />
+        </template>
+      </Input>
+    </Tooltip>
+  </div>
+  <StockTakingPlanSelectDialog ref="dialogRef" @selected="handleSelected" />
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/stocktaking/plan/data.ts b/apps/web-antd/src/views/mes/wm/stocktaking/plan/data.ts
new file mode 100644
index 000000000..883fbff90
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/stocktaking/plan/data.ts
@@ -0,0 +1,387 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmStockTakingPlanApi } from '#/api/mes/wm/stocktaking/plan';
+import type { MesWmStockTakingPlanParamApi } from '#/api/mes/wm/stocktaking/plan/param';
+
+import { h } from 'vue';
+
+import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { Button } from 'ant-design-vue';
+
+import { z } from '#/adapter/form';
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import {
+  MesAutoCodeRuleCode,
+  MesWmStockTakingTypeEnum,
+} from '#/views/mes/utils/constants';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
+/** 新增/修改的表单 */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '方案编码',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入方案编码',
+      },
+      rules: 'required',
+      suffix:
+        formType === 'detail'
+          ? undefined
+          : () =>
+              h(
+                Button,
+                {
+                  type: 'default',
+                  onClick: async () => {
+                    const code = await generateAutoCode(
+                      MesAutoCodeRuleCode.WM_STOCK_TAKING_PLAN_CODE,
+                    );
+                    await formApi?.setFieldValue('code', code);
+                  },
+                },
+                { default: () => '生成' },
+              ),
+    },
+    {
+      fieldName: 'name',
+      label: '方案名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入方案名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'type',
+      label: '盘点类型',
+      component: 'Select',
+      componentProps: {
+        options: getDictOptions(DICT_TYPE.MES_WM_STOCK_TAKING_TYPE, 'number'),
+        placeholder: '请选择盘点类型',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'startTime',
+      label: '开始时间',
+      component: 'DatePicker',
+      componentProps: {
+        placeholder: '请选择开始时间',
+        showTime: true,
+        valueFormat: 'x',
+      },
+      dependencies: {
+        triggerFields: ['type'],
+        show: (values) => values.type === MesWmStockTakingTypeEnum.DYNAMIC,
+      },
+    },
+    {
+      fieldName: 'endTime',
+      label: '结束时间',
+      component: 'DatePicker',
+      componentProps: {
+        placeholder: '请选择结束时间',
+        showTime: true,
+        valueFormat: 'x',
+      },
+      dependencies: {
+        triggerFields: ['type'],
+        show: (values) => values.type === MesWmStockTakingTypeEnum.DYNAMIC,
+      },
+    },
+    {
+      fieldName: 'blindFlag',
+      label: '是否盲盘',
+      component: 'Switch',
+      componentProps: {
+        checkedChildren: '是',
+        unCheckedChildren: '否',
+      },
+      rules: z.boolean().default(false),
+    },
+    {
+      fieldName: 'frozen',
+      label: '冻结库存',
+      component: 'Switch',
+      componentProps: {
+        checkedChildren: '是',
+        unCheckedChildren: '否',
+      },
+      rules: z.boolean().default(false),
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '方案编码',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入方案编码',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '方案名称',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入方案名称',
+      },
+    },
+    {
+      fieldName: 'type',
+      label: '盘点类型',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_WM_STOCK_TAKING_TYPE, 'number'),
+        placeholder: '请选择盘点类型',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(
+  onStatusChange?: (
+    newStatus: number,
+    row: MesWmStockTakingPlanApi.StockTakingPlan,
+  ) => Promise<boolean | undefined>,
+): VxeTableGridOptions<MesWmStockTakingPlanApi.StockTakingPlan>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '方案编码',
+      minWidth: 160,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '方案名称',
+      minWidth: 160,
+    },
+    {
+      field: 'type',
+      title: '盘点类型',
+      minWidth: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_STOCK_TAKING_TYPE },
+      },
+    },
+    {
+      field: 'startTime',
+      title: '开始时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      field: 'endTime',
+      title: '结束时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      field: 'blindFlag',
+      title: '是否盲盘',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+      },
+    },
+    {
+      field: 'frozen',
+      title: '是否冻结库存',
+      width: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+      },
+    },
+    {
+      field: 'status',
+      title: '状态',
+      width: 120,
+      cellRender: {
+        attrs: { beforeChange: onStatusChange },
+        name: 'CellSwitch',
+        props: {
+          checkedValue: CommonStatusEnum.ENABLE,
+          unCheckedValue: CommonStatusEnum.DISABLE,
+        },
+      },
+    },
+    {
+      title: '操作',
+      width: 160,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 盘点方案条件列表的字段 */
+export function useParamGridColumns(
+  editable = true,
+): VxeTableGridOptions<MesWmStockTakingPlanParamApi.StockTakingPlanParam>['columns'] {
+  return [
+    {
+      field: 'type',
+      title: '条件类型',
+      minWidth: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_STOCK_TAKING_PLAN_PARAM_TYPE },
+      },
+    },
+    {
+      field: 'valueCode',
+      title: '条件值编码',
+      minWidth: 140,
+    },
+    {
+      field: 'valueName',
+      title: '条件值名称',
+      minWidth: 160,
+    },
+    ...(editable
+      ? [
+          {
+            title: '操作',
+            width: 120,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 选择弹窗的搜索表单 */
+export function useSelectGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '方案编码',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入方案编码',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '方案名称',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入方案名称',
+      },
+    },
+    {
+      fieldName: 'type',
+      label: '盘点类型',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_WM_STOCK_TAKING_TYPE, 'number'),
+        placeholder: '请选择盘点类型',
+      },
+    },
+  ];
+}
+
+/** 选择弹窗的字段 */
+export function useSelectGridColumns(
+  multiple = true,
+): VxeTableGridOptions<MesWmStockTakingPlanApi.StockTakingPlan>['columns'] {
+  return [
+    {
+      type: multiple ? 'checkbox' : 'radio',
+      width: 50,
+    },
+    {
+      field: 'code',
+      title: '方案编码',
+      width: 200,
+    },
+    {
+      field: 'name',
+      title: '方案名称',
+      minWidth: 150,
+    },
+    {
+      field: 'type',
+      title: '盘点类型',
+      width: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_STOCK_TAKING_TYPE },
+      },
+    },
+    {
+      field: 'startTime',
+      title: '开始时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      field: 'endTime',
+      title: '结束时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      field: 'blindFlag',
+      title: '是否盲盘',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+      },
+    },
+    {
+      field: 'frozen',
+      title: '是否冻结库存',
+      width: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+      },
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/wm/stocktaking/plan/index.vue b/apps/web-antd/src/views/mes/wm/stocktaking/plan/index.vue
new file mode 100644
index 000000000..54b0cf182
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/stocktaking/plan/index.vue
@@ -0,0 +1,184 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmStockTakingPlanApi } from '#/api/mes/wm/stocktaking/plan';
+
+import { confirm, DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { CommonStatusEnum } from '@vben/constants';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { Button, message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteStockTakingPlan,
+  exportStockTakingPlan,
+  getStockTakingPlanPage,
+  updateStockTakingPlanStatus,
+} from '#/api/mes/wm/stocktaking/plan';
+import { $t } from '#/locales';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建盘点方案 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看盘点方案 */
+function handleDetail(row: MesWmStockTakingPlanApi.StockTakingPlan) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑盘点方案 */
+function handleEdit(row: MesWmStockTakingPlanApi.StockTakingPlan) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 更新盘点方案状态 */
+async function handleStatusChange(
+  newStatus: number,
+  row: MesWmStockTakingPlanApi.StockTakingPlan,
+): Promise<boolean | undefined> {
+  try {
+    await confirm(
+      `确认要${newStatus === CommonStatusEnum.ENABLE ? '启用' : '停用'}"${row.name}"盘点方案吗？`,
+    );
+  } catch {
+    return false;
+  }
+  await updateStockTakingPlanStatus(row.id!, newStatus);
+  message.success($t('ui.actionMessage.operationSuccess'));
+  return true;
+}
+
+/** 删除盘点方案 */
+async function handleDelete(row: MesWmStockTakingPlanApi.StockTakingPlan) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.name]),
+    duration: 0,
+  });
+  try {
+    await deleteStockTakingPlan(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.name]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportStockTakingPlan(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '盘点方案.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(handleStatusChange),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getStockTakingPlanPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmStockTakingPlanApi.StockTakingPlan>,
+});
+
+const StatusEnum = CommonStatusEnum;
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】库存盘点"
+        url="https://doc.iocoder.cn/mes/wm/stocktaking/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="盘点方案列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['盘点方案']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-stock-taking-plan:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:wm-stock-taking-plan:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <Button type="link" @click="handleDetail(row)">
+          {{ row.code }}
+        </Button>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:wm-stock-taking-plan:update'],
+              disabled: row.status !== StatusEnum.DISABLE,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm-stock-taking-plan:delete'],
+              disabled: row.status !== StatusEnum.DISABLE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.name]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/stocktaking/plan/modules/form.vue b/apps/web-antd/src/views/mes/wm/stocktaking/plan/modules/form.vue
new file mode 100644
index 000000000..f0e7827f8
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/stocktaking/plan/modules/form.vue
@@ -0,0 +1,126 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesWmStockTakingPlanApi } from '#/api/mes/wm/stocktaking/plan';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { Divider, message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createStockTakingPlan,
+  getStockTakingPlan,
+  updateStockTakingPlan,
+} from '#/api/mes/wm/stocktaking/plan';
+import { $t } from '#/locales';
+
+import { useFormSchema } from '../data';
+import ParamList from './param-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesWmStockTakingPlanApi.StockTakingPlan>();
+const isDetail = computed(() => formType.value === 'detail');
+const showParam = computed(
+  () =>
+    (formType.value === 'detail' || formType.value === 'update') &&
+    !!formData.value?.id,
+);
+const getTitle = computed(() => {
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['盘点方案']);
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['盘点方案'])
+    : $t('ui.actionTitle.create', ['盘点方案']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (isDetail.value) {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmStockTakingPlanApi.StockTakingPlan;
+    try {
+      if (formData.value?.id) {
+        await updateStockTakingPlan({ ...data, id: formData.value.id });
+        // 关闭并提示
+        await modalApi.close();
+        emit('success');
+        message.success($t('ui.actionMessage.operationSuccess'));
+      } else {
+        // 新增成功后切换为编辑态，继续维护盘点参数
+        const id = await createStockTakingPlan(data);
+        formData.value = { ...data, id };
+        await formApi.setFieldValue('id', id);
+        formType.value = 'update';
+        emit('success');
+        message.success($t('ui.actionMessage.operationSuccess'));
+      }
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
+    if (!data?.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getStockTakingPlan(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+    <!-- 编辑或详情时展示盘点参数 -->
+    <template v-if="showParam">
+      <Divider>盘点参数</Divider>
+      <div class="mx-4">
+        <ParamList :disabled="isDetail" :plan-id="formData!.id!" />
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/stocktaking/plan/modules/param-form.vue b/apps/web-antd/src/views/mes/wm/stocktaking/plan/modules/param-form.vue
new file mode 100644
index 000000000..49128ca83
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/stocktaking/plan/modules/param-form.vue
@@ -0,0 +1,267 @@
+<script lang="ts" setup>
+import type { MesWmStockTakingPlanParamApi } from '#/api/mes/wm/stocktaking/plan/param';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { Form, message, Select, Textarea } from 'ant-design-vue';
+
+import {
+  createStockTakingPlanParam,
+  getStockTakingPlanParam,
+  updateStockTakingPlanParam,
+} from '#/api/mes/wm/stocktaking/plan/param';
+import { getWarehouseArea } from '#/api/mes/wm/warehouse/area';
+import { getWarehouseLocation } from '#/api/mes/wm/warehouse/location';
+import { $t } from '#/locales';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import { MesWmStockTakingParamTypeEnum } from '#/views/mes/utils/constants';
+import { WmBatchSelect } from '#/views/mes/wm/batch/components';
+import {
+  WmWarehouseAreaSelect,
+  WmWarehouseLocationSelect,
+  WmWarehouseSelect,
+} from '#/views/mes/wm/warehouse/components';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesWmStockTakingPlanParamApi.StockTakingPlanParam>({});
+const planId = ref<number>(); // TODO @AI：这里是不是要尾注释
+const locationWarehouseId = ref<number>(); // 库区选择器临时数据：选仓库后传给库区选择器
+const areaWarehouseId = ref<number>(); // 库位选择器临时数据：选仓库后传给库区选择器
+const areaLocationId = ref<number>(); // 库位选择器临时数据：选库区后传给库位选择器
+
+// TODO @AI：按照项目的风格，不要 mapping；直接界面那处理掉；简化逻辑；
+const paramTypeOptions = getDictOptions(
+  DICT_TYPE.MES_WM_STOCK_TAKING_PLAN_PARAM_TYPE,
+  'number',
+).map(({ label, value }) => ({ label, value: Number(value) }));
+const qualityStatusOptions = getDictOptions(
+  DICT_TYPE.MES_WM_QUALITY_STATUS,
+  'string',
+).map(({ label, value }) => ({ label, value: String(value) }));
+
+// TODO @AI：如果 title 和前面的 const 也是变量，不用空行；
+const getTitle = computed(() =>
+  formData.value?.id
+    ? $t('ui.actionTitle.edit', ['盘点条件'])
+    : $t('ui.actionTitle.create', ['盘点条件']),
+);
+
+/** 条件类型变化：清空已选条件值和级联临时数据 */
+function handleTypeChange() {
+  formData.value.valueId = undefined;
+  formData.value.valueCode = '';
+  formData.value.valueName = '';
+  locationWarehouseId.value = undefined;
+  areaWarehouseId.value = undefined;
+  areaLocationId.value = undefined;
+}
+
+/** 通用选择器变化：回填条件值编码、名称 */
+function handleSelectorChange(item?: any) {
+  formData.value.valueId = item?.id;
+  formData.value.valueCode = item?.code || '';
+  formData.value.valueName = item?.name || item?.nickname || '';
+}
+
+/** 批次选择器变化 */
+function handleBatchChange(batch?: any) {
+  formData.value.valueId = batch?.id;
+  formData.value.valueCode = batch?.code || '';
+  formData.value.valueName = batch?.code || '';
+}
+
+/** 质量状态选择器变化：无实体编号，仅记录字典编码和文案 */
+function handleQualityStatusChange(value: any) {
+  const selected = qualityStatusOptions.find((item) => item.value === value);
+  formData.value.valueId = undefined;
+  formData.value.valueCode = value;
+  formData.value.valueName = selected?.label || '';
+}
+
+/** 库区仓库选择回调：清空库区 */
+function handleLocationWarehouseChange() {
+  formData.value.valueId = undefined;
+  formData.value.valueCode = '';
+  formData.value.valueName = '';
+}
+
+/** 库位仓库选择回调：清空库区和库位 */
+function handleAreaWarehouseChange() {
+  areaLocationId.value = undefined;
+  formData.value.valueId = undefined;
+  formData.value.valueCode = '';
+  formData.value.valueName = '';
+}
+
+/** 库位库区选择回调：清空库位 */
+function handleAreaLocationChange() {
+  formData.value.valueId = undefined;
+  formData.value.valueCode = '';
+  formData.value.valueName = '';
+}
+
+/** 编辑时回填级联选择器的上级数据（库区所属仓库、库位所属仓库/库区） */
+async function loadCascadeData() {
+  if (!formData.value.type || !formData.value.valueId) {
+    return;
+  }
+  const valueId = formData.value.valueId;
+  if (formData.value.type === MesWmStockTakingParamTypeEnum.LOCATION) {
+    const location = await getWarehouseLocation(valueId);
+    locationWarehouseId.value = location?.warehouseId;
+  } else if (formData.value.type === MesWmStockTakingParamTypeEnum.AREA) {
+    const area = await getWarehouseArea(valueId);
+    areaWarehouseId.value = area?.warehouseId;
+    areaLocationId.value = area?.locationId;
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (!formData.value.type) {
+      message.warning('请选择条件类型');
+      return;
+    }
+    // 质量状态校验 valueCode，其余类型校验 valueId
+    const valid =
+      formData.value.type === MesWmStockTakingParamTypeEnum.QUALITY_STATUS
+        ? !!formData.value.valueCode
+        : formData.value.valueId != null;
+    if (!valid) {
+      message.warning('请选择条件值');
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data = {
+      ...formData.value,
+      planId: planId.value,
+    } as MesWmStockTakingPlanParamApi.StockTakingPlanParam;
+    try {
+      await (formData.value.id
+        ? updateStockTakingPlanParam(data)
+        : createStockTakingPlanParam(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = {};
+      locationWarehouseId.value = undefined;
+      areaWarehouseId.value = undefined;
+      areaLocationId.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ id?: number; planId: number }>();
+    planId.value = data.planId;
+    if (!data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getStockTakingPlanParam(data.id);
+      await loadCascadeData();
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+
+const ParamTypeEnum = MesWmStockTakingParamTypeEnum;
+
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" :label-col="{ span: 4 }">
+      <!-- TODO @AI：可以更加 form schema 么？？？更好的 antd 和 ele 的复用； -->
+      <Form.Item label="条件类型" required>
+        <Select
+          v-model:value="formData.type"
+          :options="paramTypeOptions"
+          placeholder="请选择条件类型"
+          @change="handleTypeChange"
+        />
+      </Form.Item>
+      <Form.Item v-if="formData.type" label="条件值" required>
+        <WmWarehouseSelect
+          v-if="formData.type === ParamTypeEnum.WAREHOUSE"
+          v-model="formData.valueId"
+          @change="handleSelectorChange"
+        />
+        <div
+          v-else-if="formData.type === ParamTypeEnum.LOCATION"
+          class="space-y-2"
+        >
+          <WmWarehouseSelect
+            v-model="locationWarehouseId"
+            placeholder="请选择仓库"
+            @change="handleLocationWarehouseChange"
+          />
+          <WmWarehouseLocationSelect
+            v-if="locationWarehouseId"
+            v-model="formData.valueId"
+            placeholder="请选择库区"
+            :warehouse-id="locationWarehouseId"
+            @change="handleSelectorChange"
+          />
+        </div>
+        <div v-else-if="formData.type === ParamTypeEnum.AREA" class="space-y-2">
+          <WmWarehouseSelect
+            v-model="areaWarehouseId"
+            placeholder="请选择仓库"
+            @change="handleAreaWarehouseChange"
+          />
+          <WmWarehouseLocationSelect
+            v-if="areaWarehouseId"
+            v-model="areaLocationId"
+            placeholder="请选择库区"
+            :warehouse-id="areaWarehouseId"
+            @change="handleAreaLocationChange"
+          />
+          <WmWarehouseAreaSelect
+            v-if="areaLocationId"
+            v-model="formData.valueId"
+            :location-id="areaLocationId"
+            placeholder="请选择库位"
+            @change="handleSelectorChange"
+          />
+        </div>
+        <MdItemSelect
+          v-else-if="formData.type === ParamTypeEnum.ITEM"
+          v-model="formData.valueId"
+          @change="handleSelectorChange"
+        />
+        <WmBatchSelect
+          v-else-if="formData.type === ParamTypeEnum.BATCH"
+          v-model="formData.valueId"
+          @change="handleBatchChange"
+        />
+        <Select
+          v-else-if="formData.type === ParamTypeEnum.QUALITY_STATUS"
+          v-model:value="formData.valueCode"
+          :options="qualityStatusOptions"
+          placeholder="请选择质量状态"
+          @change="handleQualityStatusChange"
+        />
+      </Form.Item>
+      <Form.Item label="备注">
+        <Textarea
+          v-model:value="formData.remark"
+          placeholder="请输入备注"
+          :rows="3"
+        />
+      </Form.Item>
+    </Form>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/stocktaking/task/data.ts b/apps/web-antd/src/views/mes/wm/stocktaking/task/data.ts
new file mode 100644
index 000000000..cb118ef7c
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/stocktaking/task/data.ts
@@ -0,0 +1,582 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmStockTakingPlanApi } from '#/api/mes/wm/stocktaking/plan';
+import type { MesWmStockTakingTaskApi } from '#/api/mes/wm/stocktaking/task';
+import type { MesWmStockTakingTaskLineApi } from '#/api/mes/wm/stocktaking/task/line';
+import type { MesWmStockTakingResultApi } from '#/api/mes/wm/stocktaking/task/result';
+
+import { h, markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { Button } from 'ant-design-vue';
+
+import { z } from '#/adapter/form';
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getSimpleUserList } from '#/api/system/user';
+import { getRangePickerDefaultProps } from '#/utils';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import {
+  MesAutoCodeRuleCode,
+  MesWmStockTakingTypeEnum,
+} from '#/views/mes/utils/constants';
+import { StockTakingPlanSelect } from '#/views/mes/wm/stocktaking/plan/components';
+import {
+  WmWarehouseAreaSelect,
+  WmWarehouseLocationSelect,
+  WmWarehouseSelect,
+} from '#/views/mes/wm/warehouse/components';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'execute' | 'submit' | 'update';
+
+/** 表单头部是否只读（提交、执行盘点、详情态） */
+function isHeaderReadonly(formType: FormType): boolean {
+  return (
+    formType === 'detail' ||
+    formType === 'execute' ||
+    formType === 'submit'
+  );
+}
+
+/** 新增/修改的表单 */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  const headerReadonly = isHeaderReadonly(formType);
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'status',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '任务编码',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入任务编码',
+      },
+      rules: 'required',
+      suffix: headerReadonly
+        ? undefined
+        : () =>
+            h(
+              Button,
+              {
+                type: 'default',
+                onClick: async () => {
+                  const code = await generateAutoCode(
+                    MesAutoCodeRuleCode.WM_STOCK_TAKING_CODE,
+                  );
+                  await formApi?.setFieldValue('code', code);
+                },
+              },
+              { default: () => '生成' },
+            ),
+    },
+    {
+      fieldName: 'name',
+      label: '任务名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入任务名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'planId',
+      label: '盘点方案',
+      component: markRaw(StockTakingPlanSelect),
+      componentProps: {
+        // 选择盘点方案后，自动带出名称、类型、起止时间和盲盘/冻结配置
+        onChange: async (plan?: MesWmStockTakingPlanApi.StockTakingPlan) => {
+          if (!plan) {
+            return;
+          }
+          await formApi?.setValues({
+            blindFlag: !!plan.blindFlag,
+            endTime: plan.endTime,
+            frozen: !!plan.frozen,
+            name: plan.name,
+            startTime: plan.startTime,
+            type: plan.type,
+          });
+        },
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'type',
+      label: '盘点类型',
+      component: 'Select',
+      componentProps: {
+        options: getDictOptions(DICT_TYPE.MES_WM_STOCK_TAKING_TYPE, 'number'),
+        placeholder: '请选择盘点类型',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'startTime',
+      label: '开始时间',
+      component: 'DatePicker',
+      componentProps: {
+        placeholder: '请选择开始时间',
+        showTime: true,
+        valueFormat: 'x',
+      },
+      dependencies: {
+        triggerFields: ['type'],
+        show: (values) => values.type === MesWmStockTakingTypeEnum.DYNAMIC,
+      },
+    },
+    {
+      fieldName: 'endTime',
+      label: '结束时间',
+      component: 'DatePicker',
+      componentProps: {
+        placeholder: '请选择结束时间',
+        showTime: true,
+        valueFormat: 'x',
+      },
+      dependencies: {
+        triggerFields: ['type'],
+        show: (values) => values.type === MesWmStockTakingTypeEnum.DYNAMIC,
+      },
+    },
+    {
+      fieldName: 'takingDate',
+      label: '盘点日期',
+      component: 'DatePicker',
+      componentProps: {
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择盘点日期',
+        valueFormat: 'YYYY-MM-DD',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'blindFlag',
+      label: '是否盲盘',
+      component: 'Switch',
+      componentProps: {
+        checkedChildren: '是',
+        unCheckedChildren: '否',
+      },
+      rules: z.boolean().default(false),
+    },
+    {
+      fieldName: 'frozen',
+      label: '是否冻结库存',
+      component: 'Switch',
+      componentProps: {
+        checkedChildren: '是',
+        unCheckedChildren: '否',
+      },
+      rules: z.boolean().default(false),
+    },
+    {
+      fieldName: 'userId',
+      label: '盘点人',
+      component: 'ApiSelect',
+      componentProps: {
+        allowClear: true,
+        api: getSimpleUserList,
+        labelField: 'nickname',
+        placeholder: '请选择盘点人',
+        valueField: 'id',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'type',
+      label: '盘点类型',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_WM_STOCK_TAKING_TYPE, 'number'),
+        placeholder: '请选择盘点类型',
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '任务编码',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入任务编码',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '任务名称',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入任务名称',
+      },
+    },
+    {
+      fieldName: 'takingDate',
+      label: '盘点日期',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+        allowClear: true,
+      },
+    },
+    {
+      fieldName: 'status',
+      label: '单据状态',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(
+          DICT_TYPE.MES_WM_STOCK_TAKING_TASK_STATUS,
+          'number',
+        ),
+        placeholder: '请选择单据状态',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesWmStockTakingTaskApi.StockTakingTask>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '任务编码',
+      minWidth: 160,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '任务名称',
+      minWidth: 160,
+    },
+    {
+      field: 'type',
+      title: '盘点类型',
+      minWidth: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_STOCK_TAKING_TYPE },
+      },
+    },
+    {
+      field: 'planName',
+      title: '盘点方案',
+      minWidth: 180,
+    },
+    {
+      field: 'takingDate',
+      title: '盘点日期',
+      minWidth: 180,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'userNickname',
+      title: '盘点人',
+      minWidth: 120,
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      minWidth: 110,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_STOCK_TAKING_TASK_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 280,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 盘点任务行列表的字段 */
+export function useLineGridColumns(
+  editable = true,
+): VxeTableGridOptions<MesWmStockTakingTaskLineApi.StockTakingTaskLine>['columns'] {
+  return [
+    {
+      field: 'itemCode',
+      title: '物料编码',
+      minWidth: 140,
+    },
+    {
+      field: 'itemName',
+      title: '物料名称',
+      minWidth: 160,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 90,
+    },
+    {
+      field: 'batchCode',
+      title: '批次号',
+      minWidth: 120,
+    },
+    {
+      field: 'quantity',
+      title: '在库数量',
+      width: 120,
+    },
+    {
+      field: 'warehouseName',
+      title: '仓库',
+      minWidth: 120,
+    },
+    {
+      field: 'locationName',
+      title: '库区',
+      minWidth: 120,
+    },
+    {
+      field: 'areaName',
+      title: '库位',
+      minWidth: 120,
+    },
+    {
+      field: 'status',
+      title: '状态',
+      minWidth: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_STOCK_TAKING_LINE_STATUS },
+      },
+    },
+    ...(editable
+      ? [
+          {
+            title: '操作',
+            width: 80,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 盘点结果列表的字段 */
+export function useResultGridColumns(
+  editable = true,
+): VxeTableGridOptions<MesWmStockTakingResultApi.StockTakingResult>['columns'] {
+  return [
+    {
+      field: 'itemCode',
+      title: '产品物料编码',
+      minWidth: 140,
+    },
+    {
+      field: 'itemName',
+      title: '产品物料名称',
+      minWidth: 160,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位名称',
+      width: 90,
+    },
+    {
+      field: 'warehouseName',
+      title: '仓库',
+      minWidth: 120,
+    },
+    {
+      field: 'locationName',
+      title: '库区',
+      minWidth: 120,
+    },
+    {
+      field: 'areaName',
+      title: '库位',
+      minWidth: 120,
+    },
+    {
+      field: 'quantity',
+      title: '数量',
+      minWidth: 120,
+    },
+    {
+      field: 'takingQuantity',
+      title: '盘点数量',
+      minWidth: 120,
+    },
+    ...(editable
+      ? [
+          {
+            title: '操作',
+            width: 160,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 盘点结果新增/修改的表单 */
+export function useResultFormSchema(
+  formApi?: VbenFormApi,
+  taskLines: MesWmStockTakingTaskLineApi.StockTakingTaskLine[] = [],
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'lineId',
+      label: '盘点清单',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        // 选择盘点清单后，自动带出物料、批次和仓储位置信息
+        onChange: async (lineId?: number) => {
+          const line = taskLines.find((item) => item.id === lineId);
+          await formApi?.setValues({
+            areaId: line?.areaId,
+            batchCode: line?.batchCode,
+            itemId: line?.itemId,
+            locationId: line?.locationId,
+            materialStockId: line?.materialStockId,
+            warehouseId: line?.warehouseId,
+          });
+        },
+        options: taskLines.map((line) => ({
+          label: `${line.itemCode} - ${line.itemName} (${line.warehouseName}${
+            line.locationName ? ` / ${line.locationName}` : ''
+          }${line.areaName ? ` / ${line.areaName}` : ''})`,
+          value: line.id,
+        })),
+        placeholder: '请选择盘点清单（可选）',
+      },
+      formItemClass: 'col-span-3',
+    },
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择物料',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次编码',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入批次编码',
+      },
+    },
+    {
+      fieldName: 'takingQuantity',
+      label: '盘点数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        placeholder: '请输入盘点数量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'warehouseId',
+      label: '仓库',
+      component: markRaw(WmWarehouseSelect),
+      componentProps: {
+        // 仓库变化时清空库区和库位
+        onChange: () =>
+          formApi?.setValues({
+            areaId: undefined,
+            locationId: undefined,
+          }),
+        placeholder: '请选择仓库',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'locationId',
+      label: '库区',
+      component: markRaw(WmWarehouseLocationSelect),
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['warehouseId'],
+        show: (values) => !!values.warehouseId,
+        componentProps: (values) => ({
+          onChange: () => formApi?.setFieldValue('areaId', undefined),
+          placeholder: '请选择库区',
+          warehouseId: values.warehouseId,
+        }),
+      },
+    },
+    {
+      fieldName: 'areaId',
+      label: '库位',
+      component: markRaw(WmWarehouseAreaSelect),
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['locationId'],
+        show: (values) => !!values.locationId,
+        componentProps: (values) => ({
+          locationId: values.locationId,
+          placeholder: '请选择库位',
+        }),
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/wm/stocktaking/task/index.vue b/apps/web-antd/src/views/mes/wm/stocktaking/task/index.vue
new file mode 100644
index 000000000..974357c65
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/stocktaking/task/index.vue
@@ -0,0 +1,209 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmStockTakingTaskApi } from '#/api/mes/wm/stocktaking/task';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { Button, message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  cancelStockTaking,
+  deleteStockTaking,
+  exportStockTaking,
+  getStockTakingPage,
+} from '#/api/mes/wm/stocktaking/task';
+import { $t } from '#/locales';
+import { MesWmStockTakingTaskStatusEnum } from '#/views/mes/utils/constants';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建盘点任务 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看盘点任务 */
+function handleDetail(row: MesWmStockTakingTaskApi.StockTakingTask) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑盘点任务 */
+function handleEdit(row: MesWmStockTakingTaskApi.StockTakingTask) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 提交盘点任务 */
+function handleSubmit(row: MesWmStockTakingTaskApi.StockTakingTask) {
+  formModalApi.setData({ formType: 'submit', id: row.id }).open();
+}
+
+/** 执行盘点 */
+function handleExecute(row: MesWmStockTakingTaskApi.StockTakingTask) {
+  formModalApi.setData({ formType: 'execute', id: row.id }).open();
+}
+
+/** 取消盘点任务 */
+async function handleCancel(row: MesWmStockTakingTaskApi.StockTakingTask) {
+  await cancelStockTaking(row.id!);
+  message.success('取消成功');
+  handleRefresh();
+}
+
+/** 删除盘点任务 */
+async function handleDelete(row: MesWmStockTakingTaskApi.StockTakingTask) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.code]),
+    duration: 0,
+  });
+  try {
+    await deleteStockTaking(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportStockTaking(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '盘点任务.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getStockTakingPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmStockTakingTaskApi.StockTakingTask>,
+});
+
+const StatusEnum = MesWmStockTakingTaskStatusEnum;
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】库存盘点"
+        url="https://doc.iocoder.cn/mes/wm/stocktaking/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="盘点任务列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['盘点任务']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-stock-taking-task:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:wm-stock-taking-task:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <Button type="link" @click="handleDetail(row)">
+          {{ row.code }}
+        </Button>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:wm-stock-taking-task:update'],
+              ifShow: row.status === StatusEnum.PREPARE,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: '提交',
+              type: 'link',
+              auth: ['mes:wm-stock-taking-task:update'],
+              ifShow: row.status === StatusEnum.PREPARE,
+              onClick: handleSubmit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm-stock-taking-task:delete'],
+              ifShow: row.status === StatusEnum.PREPARE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '执行盘点',
+              type: 'link',
+              auth: ['mes:wm-stock-taking-task:update'],
+              ifShow: row.status === StatusEnum.APPROVING,
+              onClick: handleExecute.bind(null, row),
+            },
+            {
+              label: '取消',
+              type: 'link',
+              danger: true,
+              auth: ['mes:wm-stock-taking-task:update'],
+              ifShow: row.status === StatusEnum.APPROVING,
+              popConfirm: {
+                title: '确认取消该盘点任务？取消后不可恢复。',
+                confirm: handleCancel.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/stocktaking/task/modules/form.vue b/apps/web-antd/src/views/mes/wm/stocktaking/task/modules/form.vue
new file mode 100644
index 000000000..fbb42b708
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/stocktaking/task/modules/form.vue
@@ -0,0 +1,233 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesWmStockTakingTaskApi } from '#/api/mes/wm/stocktaking/task';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+import { useUserStore } from '@vben/stores';
+
+import { Button, message, Popconfirm, Tabs } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createStockTaking,
+  finishStockTaking,
+  getStockTaking,
+  submitStockTaking,
+  updateStockTaking,
+} from '#/api/mes/wm/stocktaking/task';
+import { $t } from '#/locales';
+import { MesWmStockTakingTaskStatusEnum } from '#/views/mes/utils/constants';
+
+import { useFormSchema } from '../data';
+import LineList from './line-list.vue';
+import ResultList from './result-list.vue';
+
+const emit = defineEmits(['success']);
+const userStore = useUserStore();
+const formType = ref<FormType>('create');
+const formData = ref<MesWmStockTakingTaskApi.StockTakingTask>();
+const subTabsName = ref('lines'); // 子表当前 tab
+const originalSnapshot = ref(''); // 表单原始数据快照，用于提交时跳过未变更的保存请求
+
+const isEditable = computed(() =>
+  ['create', 'update'].includes(formType.value),
+);
+const isExecute = computed(() => formType.value === 'execute'); // 是否执行盘点模式
+const isSubmit = computed(() => formType.value === 'submit'); // 是否提交模式
+const canSubmit = computed(
+  () =>
+    formType.value === 'update' &&
+    formData.value?.status === MesWmStockTakingTaskStatusEnum.PREPARE,
+);
+const showLineTab = computed(() => !formData.value?.blindFlag); // 盲盘不展示盘点清单
+const showResultTab = computed(
+  () =>
+    isExecute.value ||
+    (!!formData.value?.status &&
+      formData.value.status !== MesWmStockTakingTaskStatusEnum.PREPARE),
+);
+// TODO @AI：这里的代码风格，标题的代码风格；
+const getTitle = computed(() => {
+  switch (formType.value) {
+    case 'detail': {
+      return $t('ui.actionTitle.view', ['盘点任务']);
+    }
+    case 'execute': {
+      return '执行盘点';
+    }
+    case 'submit': {
+      return '提交盘点任务';
+    }
+    case 'update': {
+      return $t('ui.actionTitle.edit', ['盘点任务']);
+    }
+    default: {
+      return $t('ui.actionTitle.create', ['盘点任务']);
+    }
+  }
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+/** 提交盘点任务：表单有修改时先保存，再调用提交接口 */
+async function handleSubmit() {
+  const { valid } = await formApi.validate();
+  if (!valid || !formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    const current = JSON.stringify(await formApi.getValues());
+    if (current !== originalSnapshot.value) {
+      const data =
+        (await formApi.getValues()) as MesWmStockTakingTaskApi.StockTakingTask;
+      await updateStockTaking({ ...formData.value, ...data });
+      originalSnapshot.value = current;
+    }
+    await submitStockTaking(formData.value.id);
+    message.success('提交成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 执行盘点 */
+async function handleExecute() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await finishStockTaking(formData.value.id);
+    message.success('执行盘点成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  // TODO @AI：注释风格，代码的；
+  async onConfirm() {
+    if (!isEditable.value) {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmStockTakingTaskApi.StockTakingTask;
+    try {
+      if (formData.value?.id) {
+        await updateStockTaking({ ...formData.value, ...data });
+        formData.value = { ...formData.value, ...data };
+      } else {
+        const id = await createStockTaking(data);
+        formData.value = {
+          ...data,
+          id,
+          status: MesWmStockTakingTaskStatusEnum.PREPARE,
+        };
+        await formApi.setFieldValue('id', id);
+        await formApi.setFieldValue('status', formData.value.status);
+        formType.value = 'update';
+      }
+      originalSnapshot.value = JSON.stringify(await formApi.getValues());
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      originalSnapshot.value = '';
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    subTabsName.value = data.formType === 'execute' ? 'results' : 'lines';
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    formApi.setDisabled(!isEditable.value);
+    modalApi.setState({ showConfirmButton: isEditable.value });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getStockTaking(data.id);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    } else {
+      // 新建时默认盘点人为当前登录用户
+      await formApi.setFieldValue('userId', userStore.userInfo?.id);
+    }
+    originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-4/5">
+    <Form class="mx-4" />
+    <Tabs
+      v-if="formData?.id"
+      v-model:active-key="subTabsName"
+      class="mx-4 mt-4"
+      type="card"
+    >
+      <Tabs.TabPane v-if="showLineTab" key="lines" tab="盘点清单">
+        <LineList :form-type="formType" :task-id="formData.id" />
+      </Tabs.TabPane>
+      <Tabs.TabPane v-if="showResultTab" key="results" tab="盘点结果">
+        <ResultList
+          :form-type="isExecute ? 'execute' : 'detail'"
+          :task-id="formData.id"
+        />
+      </Tabs.TabPane>
+    </Tabs>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <Popconfirm
+          v-if="canSubmit || isSubmit"
+          title="确认提交该盘点任务？【提交后将不能修改】"
+          @confirm="handleSubmit"
+        >
+          <Button type="primary">提交</Button>
+        </Popconfirm>
+        <Popconfirm
+          v-if="isExecute"
+          title="确认执行盘点操作？"
+          @confirm="handleExecute"
+        >
+          <Button type="primary">执行盘点</Button>
+        </Popconfirm>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/stocktaking/task/modules/line-list.vue b/apps/web-antd/src/views/mes/wm/stocktaking/task/modules/line-list.vue
new file mode 100644
index 000000000..464105830
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/stocktaking/task/modules/line-list.vue
@@ -0,0 +1,147 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmMaterialStockApi } from '#/api/mes/wm/materialstock';
+import type { MesWmStockTakingTaskLineApi } from '#/api/mes/wm/stocktaking/task/line';
+
+import { computed, ref } from 'vue';
+
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  createStockTakingTaskLine,
+  deleteStockTakingTaskLine,
+  getStockTakingTaskLinePage,
+} from '#/api/mes/wm/stocktaking/task/line';
+import { $t } from '#/locales';
+import { WmMaterialStockSelectDialog } from '#/views/mes/wm/materialstock/components';
+
+import { type FormType, useLineGridColumns } from '../data';
+
+const props = defineProps<{
+  formType: FormType;
+  taskId: number;
+}>();
+
+const isEditable = computed(() => props.formType === 'update'); // 仅编辑态可维护盘点清单
+const dialogRef = ref<InstanceType<typeof WmMaterialStockSelectDialog>>();
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 打开库存选择弹窗批量添加物料 */
+function handleAdd() {
+  dialogRef.value?.open([], { multiple: true });
+}
+
+/** 库存选择确认回调：将选中的库存记录批量创建为盘点行 */
+async function handleStockSelected(rows: MesWmMaterialStockApi.MaterialStock[]) {
+  if (rows.length === 0) {
+    return;
+  }
+  for (const stock of rows) {
+    await createStockTakingTaskLine({
+      areaId: stock.areaId,
+      batchId: stock.batchId,
+      itemId: stock.itemId,
+      locationId: stock.locationId,
+      materialStockId: stock.id,
+      quantity: stock.quantity,
+      taskId: props.taskId,
+      warehouseId: stock.warehouseId,
+    });
+  }
+  message.success(`成功添加 ${rows.length} 条盘点行`);
+  handleRefresh();
+}
+
+/** 删除盘点行 */
+async function handleDelete(
+  row: MesWmStockTakingTaskLineApi.StockTakingTaskLine,
+) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.itemName]),
+    duration: 0,
+  });
+  try {
+    await deleteStockTakingTaskLine(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.itemName]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useLineGridColumns(isEditable.value),
+    height: 360,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.taskId) {
+            return { list: [], total: 0 };
+          }
+          return await getStockTakingTaskLinePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            taskId: props.taskId,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesWmStockTakingTaskLineApi.StockTakingTaskLine>,
+});
+
+defineExpose({ refresh: handleRefresh });
+</script>
+
+<template>
+  <div>
+    <WmMaterialStockSelectDialog
+      ref="dialogRef"
+      @selected="handleStockSelected"
+    />
+    <Grid table-title="盘点清单">
+      <template v-if="isEditable" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '添加物料',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-stock-taking-task:update'],
+              onClick: handleAdd,
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.itemName]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/stocktaking/task/modules/result-form.vue b/apps/web-antd/src/views/mes/wm/stocktaking/task/modules/result-form.vue
new file mode 100644
index 000000000..57163739b
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/stocktaking/task/modules/result-form.vue
@@ -0,0 +1,106 @@
+<script lang="ts" setup>
+import type { MesWmStockTakingResultApi } from '#/api/mes/wm/stocktaking/task/result';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import { getStockTakingTaskLineSimpleList } from '#/api/mes/wm/stocktaking/task/line';
+import {
+  createStockTakingResult,
+  getStockTakingResult,
+  updateStockTakingResult,
+} from '#/api/mes/wm/stocktaking/task/result';
+import { $t } from '#/locales';
+
+import { useResultFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesWmStockTakingResultApi.StockTakingResult>();
+const taskId = ref<number>(); // TODO @AI：尾注释；
+const isExecute = ref(false); // 是否执行盘点模式（可选择盘点清单回填）
+const getTitle = computed(() =>
+  formData.value?.id
+    ? $t('ui.actionTitle.edit', ['盘点结果'])
+    : $t('ui.actionTitle.create', ['盘点结果']),
+);
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 100,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmStockTakingResultApi.StockTakingResult;
+    data.taskId = taskId.value;
+    try {
+      await (formData.value?.id
+        ? updateStockTakingResult({ ...data, id: formData.value.id })
+        : createStockTakingResult(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{
+      execute?: boolean;
+      id?: number;
+      taskId: number;
+    }>();
+    taskId.value = data.taskId;
+    isExecute.value = !!data.execute;
+    // 执行盘点模式：加载盘点清单作为可选项，供选择后回填
+    const taskLines =
+      isExecute.value && !data.id
+        ? await getStockTakingTaskLineSimpleList(data.taskId)
+        : [];
+    formApi.setState({ schema: useResultFormSchema(formApi, taskLines) });
+    if (!data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getStockTakingResult(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/stocktaking/task/modules/result-list.vue b/apps/web-antd/src/views/mes/wm/stocktaking/task/modules/result-list.vue
new file mode 100644
index 000000000..cc244fa17
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/stocktaking/task/modules/result-list.vue
@@ -0,0 +1,140 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmStockTakingResultApi } from '#/api/mes/wm/stocktaking/task/result';
+
+import { computed } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteStockTakingResult,
+  getStockTakingResultPage,
+} from '#/api/mes/wm/stocktaking/task/result';
+import { $t } from '#/locales';
+
+import { useResultGridColumns } from '../data';
+import ResultForm from './result-form.vue';
+
+const props = defineProps<{
+  formType: 'detail' | 'execute';
+  taskId: number;
+}>();
+
+const isExecute = computed(() => props.formType === 'execute'); // 执行盘点态可维护盘点结果
+
+const [ResultFormModal, resultFormModalApi] = useVbenModal({
+  connectedComponent: ResultForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 新增盘点结果 */
+function handleCreate() {
+  resultFormModalApi
+    .setData({ execute: true, taskId: props.taskId })
+    .open();
+}
+
+/** 编辑盘点结果 */
+function handleEdit(row: MesWmStockTakingResultApi.StockTakingResult) {
+  resultFormModalApi.setData({ id: row.id, taskId: props.taskId }).open();
+}
+
+/** 删除盘点结果 */
+async function handleDelete(
+  row: MesWmStockTakingResultApi.StockTakingResult,
+) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.itemName]),
+    duration: 0,
+  });
+  try {
+    await deleteStockTakingResult(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.itemName]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useResultGridColumns(isExecute.value),
+    height: 360,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.taskId) {
+            return { list: [], total: 0 };
+          }
+          return await getStockTakingResultPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            taskId: props.taskId,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesWmStockTakingResultApi.StockTakingResult>,
+});
+
+defineExpose({ refresh: handleRefresh });
+</script>
+
+<template>
+  <div>
+    <ResultFormModal @success="handleRefresh" />
+    <Grid table-title="盘点结果">
+      <template v-if="isExecute" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.create'),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-stock-taking-task:update'],
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.itemName]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-ele/package.json b/apps/web-ele/package.json
index 93e86be9e..451a3dbbb 100644
--- a/apps/web-ele/package.json
+++ b/apps/web-ele/package.json
@@ -53,6 +53,7 @@
     "camunda-bpmn-moddle": "catalog:",
     "cropperjs": "catalog:",
     "dayjs": "catalog:",
+    "dhtmlx-gantt": "catalog:",
     "diagram-js": "catalog:",
     "element-plus": "catalog:",
     "fast-xml-parser": "catalog:",
diff --git a/apps/web-ele/src/api/mes/pro/card/process/index.ts b/apps/web-ele/src/api/mes/pro/card/process/index.ts
new file mode 100644
index 000000000..a6f372fe2
--- /dev/null
+++ b/apps/web-ele/src/api/mes/pro/card/process/index.ts
@@ -0,0 +1,62 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesProCardProcessApi {
+  /** MES 流转卡工序记录 */
+  export interface CardProcess {
+    id?: number; // 编号
+    cardId?: number; // 流转卡编号
+    sort?: number; // 序号
+    processId?: number; // 工序编号
+    processCode?: string; // 工序编码
+    processName?: string; // 工序名称
+    inputTime?: number; // 进入工序时间
+    outputTime?: number; // 出工序时间
+    inputQuantity?: number; // 投入数量
+    outputQuantity?: number; // 产出数量
+    unqualifiedQuantity?: number; // 不合格品数量
+    workstationId?: number; // 工位编号
+    workstationCode?: string; // 工位编码
+    workstationName?: string; // 工位名称
+    userId?: number; // 操作人编号
+    nickname?: string; // 操作人名称
+    ipqcId?: number; // 过程检验单编号
+    remark?: string; // 备注
+  }
+
+  /** MES 流转卡工序记录分页查询参数 */
+  export interface PageParams extends PageParam {
+    cardId?: number;
+  }
+}
+
+/** 查询流转卡工序记录分页 */
+export function getCardProcessPage(params: MesProCardProcessApi.PageParams) {
+  return requestClient.get<PageResult<MesProCardProcessApi.CardProcess>>(
+    '/mes/pro/card-process/page',
+    { params },
+  );
+}
+
+/** 查询流转卡工序记录详情 */
+export function getCardProcess(id: number) {
+  return requestClient.get<MesProCardProcessApi.CardProcess>(
+    `/mes/pro/card-process/get?id=${id}`,
+  );
+}
+
+/** 新增流转卡工序记录 */
+export function createCardProcess(data: MesProCardProcessApi.CardProcess) {
+  return requestClient.post('/mes/pro/card-process/create', data);
+}
+
+/** 修改流转卡工序记录 */
+export function updateCardProcess(data: MesProCardProcessApi.CardProcess) {
+  return requestClient.put('/mes/pro/card-process/update', data);
+}
+
+/** 删除流转卡工序记录 */
+export function deleteCardProcess(id: number) {
+  return requestClient.delete(`/mes/pro/card-process/delete?id=${id}`);
+}
diff --git a/apps/web-ele/src/api/mes/pro/workorder/bom/index.ts b/apps/web-ele/src/api/mes/pro/workorder/bom/index.ts
new file mode 100644
index 000000000..f04ef761c
--- /dev/null
+++ b/apps/web-ele/src/api/mes/pro/workorder/bom/index.ts
@@ -0,0 +1,62 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesProWorkOrderBomApi {
+  /** MES 生产工单 BOM */
+  export interface WorkOrderBom {
+    id?: number; // 编号
+    workOrderId?: number; // 生产工单编号
+    itemId?: number; // BOM 物料编号
+    itemName?: string; // 物料名称
+    itemCode?: string; // 物料编码
+    itemSpecification?: string; // 规格型号
+    unitMeasureId?: number; // 单位编号
+    unitMeasureName?: string; // 单位名称
+    quantity?: number; // 预计使用量
+    remark?: string; // 备注
+    itemOrProduct?: string; // 物料产品标识
+  }
+
+  /** MES 生产工单 BOM 分页查询参数 */
+  export interface PageParams extends PageParam {
+    workOrderId?: number;
+  }
+}
+
+/** 查询工单 BOM 分页 */
+export function getWorkOrderBomPage(params: MesProWorkOrderBomApi.PageParams) {
+  return requestClient.get<PageResult<MesProWorkOrderBomApi.WorkOrderBom>>(
+    '/mes/pro/work-order-bom/page',
+    { params },
+  );
+}
+
+/** 查询工单 BOM 详情 */
+export function getWorkOrderBom(id: number) {
+  return requestClient.get<MesProWorkOrderBomApi.WorkOrderBom>(
+    `/mes/pro/work-order-bom/get?id=${id}`,
+  );
+}
+
+/** 新增工单 BOM */
+export function createWorkOrderBom(data: MesProWorkOrderBomApi.WorkOrderBom) {
+  return requestClient.post('/mes/pro/work-order-bom/create', data);
+}
+
+/** 修改工单 BOM */
+export function updateWorkOrderBom(data: MesProWorkOrderBomApi.WorkOrderBom) {
+  return requestClient.put('/mes/pro/work-order-bom/update', data);
+}
+
+/** 删除工单 BOM */
+export function deleteWorkOrderBom(id: number) {
+  return requestClient.delete(`/mes/pro/work-order-bom/delete?id=${id}`);
+}
+
+/** 查询工单物料需求列表 */
+export function getWorkOrderBomItemListByWorkOrderId(workOrderId: number) {
+  return requestClient.get<MesProWorkOrderBomApi.WorkOrderBom[]>(
+    `/mes/pro/work-order-bom/item-list-by-work-order-id?workOrderId=${workOrderId}`,
+  );
+}
diff --git a/apps/web-ele/src/api/mes/wm/arrivalnotice/index.ts b/apps/web-ele/src/api/mes/wm/arrivalnotice/index.ts
new file mode 100644
index 000000000..73e8eb849
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/arrivalnotice/index.ts
@@ -0,0 +1,68 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmArrivalNoticeApi {
+  /** MES 到货通知单 */
+  export interface ArrivalNotice {
+    id?: number; // 通知单编号
+    code?: string; // 通知单编号
+    name?: string; // 通知单名称
+    purchaseOrderCode?: string; // 采购订单编号
+    vendorId?: number; // 供应商编号
+    vendorCode?: string; // 供应商编码
+    vendorName?: string; // 供应商名称
+    arrivalDate?: number; // 到货日期
+    contactName?: string; // 联系人
+    contactTelephone?: string; // 联系方式
+    status?: number; // 单据状态
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询到货通知单分页 */
+export function getArrivalNoticePage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmArrivalNoticeApi.ArrivalNotice>>(
+    '/mes/wm/arrival-notice/page',
+    { params },
+  );
+}
+
+/** 查询到货通知单详情 */
+export function getArrivalNotice(id: number) {
+  return requestClient.get<MesWmArrivalNoticeApi.ArrivalNotice>(
+    `/mes/wm/arrival-notice/get?id=${id}`,
+  );
+}
+
+/** 新增到货通知单 */
+export function createArrivalNotice(
+  data: MesWmArrivalNoticeApi.ArrivalNotice,
+) {
+  return requestClient.post<number>('/mes/wm/arrival-notice/create', data);
+}
+
+/** 修改到货通知单 */
+export function updateArrivalNotice(
+  data: MesWmArrivalNoticeApi.ArrivalNotice,
+) {
+  return requestClient.put('/mes/wm/arrival-notice/update', data);
+}
+
+/** 删除到货通知单 */
+export function deleteArrivalNotice(id: number) {
+  return requestClient.delete(`/mes/wm/arrival-notice/delete?id=${id}`);
+}
+
+/** 提交到货通知单 */
+export function submitArrivalNotice(id: number) {
+  return requestClient.put(`/mes/wm/arrival-notice/submit?id=${id}`);
+}
+
+/** 导出到货通知单 */
+export function exportArrivalNotice(params: any) {
+  return requestClient.download('/mes/wm/arrival-notice/export-excel', {
+    params,
+  });
+}
diff --git a/apps/web-ele/src/api/mes/wm/arrivalnotice/line/index.ts b/apps/web-ele/src/api/mes/wm/arrivalnotice/line/index.ts
new file mode 100644
index 000000000..b763b2ad5
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/arrivalnotice/line/index.ts
@@ -0,0 +1,58 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmArrivalNoticeLineApi {
+  /** MES 到货通知单行 */
+  export interface ArrivalNoticeLine {
+    id?: number; // 行编号
+    noticeId?: number; // 到货通知单编号
+    itemId?: number; // 物料编号
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    specification?: string; // 规格型号
+    unitMeasureName?: string; // 单位
+    arrivalQuantity?: number; // 到货数量
+    qualifiedQuantity?: number; // 合格数量
+    iqcCheckFlag?: boolean; // 是否检验
+    iqcId?: number; // 来料检验单编号
+    iqcCode?: string; // 来料检验单编码
+    remark?: string; // 备注
+  }
+}
+
+/** 查询到货通知单行分页 */
+export function getArrivalNoticeLinePage(params: PageParam) {
+  return requestClient.get<
+    PageResult<MesWmArrivalNoticeLineApi.ArrivalNoticeLine>
+  >('/mes/wm/arrival-notice-line/page', { params });
+}
+
+/** 查询到货通知单行详情 */
+export function getArrivalNoticeLine(id: number) {
+  return requestClient.get<MesWmArrivalNoticeLineApi.ArrivalNoticeLine>(
+    `/mes/wm/arrival-notice-line/get?id=${id}`,
+  );
+}
+
+/** 新增到货通知单行 */
+export function createArrivalNoticeLine(
+  data: MesWmArrivalNoticeLineApi.ArrivalNoticeLine,
+) {
+  return requestClient.post<number>(
+    '/mes/wm/arrival-notice-line/create',
+    data,
+  );
+}
+
+/** 修改到货通知单行 */
+export function updateArrivalNoticeLine(
+  data: MesWmArrivalNoticeLineApi.ArrivalNoticeLine,
+) {
+  return requestClient.put('/mes/wm/arrival-notice-line/update', data);
+}
+
+/** 删除到货通知单行 */
+export function deleteArrivalNoticeLine(id: number) {
+  return requestClient.delete(`/mes/wm/arrival-notice-line/delete?id=${id}`);
+}
diff --git a/apps/web-ele/src/api/mes/wm/itemreceipt/detail/index.ts b/apps/web-ele/src/api/mes/wm/itemreceipt/detail/index.ts
new file mode 100644
index 000000000..b147288ed
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/itemreceipt/detail/index.ts
@@ -0,0 +1,58 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesWmItemReceiptDetailApi {
+  /** MES 采购入库明细 */
+  export interface ItemReceiptDetail {
+    id?: number; // 明细编号
+    lineId?: number; // 入库单行编号
+    receiptId?: number; // 入库单编号
+    itemId?: number; // 物料编号
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    specification?: string; // 规格型号
+    unitMeasureName?: string; // 单位
+    quantity?: number; // 数量
+    batchId?: number; // 批次编号
+    warehouseId?: number; // 仓库编号
+    warehouseName?: string; // 仓库名称
+    locationId?: number; // 库区编号
+    locationName?: string; // 库区名称
+    areaId?: number; // 库位编号
+    areaName?: string; // 库位名称
+    remark?: string; // 备注
+  }
+}
+
+/** 查询采购入库明细列表（按行编号） */
+export function getItemReceiptDetailListByLineId(lineId: number) {
+  return requestClient.get<MesWmItemReceiptDetailApi.ItemReceiptDetail[]>(
+    '/mes/wm/item-receipt-detail/list-by-line',
+    { params: { lineId } },
+  );
+}
+
+/** 查询采购入库明细详情 */
+export function getItemReceiptDetail(id: number) {
+  return requestClient.get<MesWmItemReceiptDetailApi.ItemReceiptDetail>(
+    `/mes/wm/item-receipt-detail/get?id=${id}`,
+  );
+}
+
+/** 新增采购入库明细 */
+export function createItemReceiptDetail(
+  data: MesWmItemReceiptDetailApi.ItemReceiptDetail,
+) {
+  return requestClient.post<number>('/mes/wm/item-receipt-detail/create', data);
+}
+
+/** 修改采购入库明细 */
+export function updateItemReceiptDetail(
+  data: MesWmItemReceiptDetailApi.ItemReceiptDetail,
+) {
+  return requestClient.put('/mes/wm/item-receipt-detail/update', data);
+}
+
+/** 删除采购入库明细 */
+export function deleteItemReceiptDetail(id: number) {
+  return requestClient.delete(`/mes/wm/item-receipt-detail/delete?id=${id}`);
+}
diff --git a/apps/web-ele/src/api/mes/wm/productissue/detail/index.ts b/apps/web-ele/src/api/mes/wm/productissue/detail/index.ts
new file mode 100644
index 000000000..96def9c44
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/productissue/detail/index.ts
@@ -0,0 +1,56 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesWmProductIssueDetailApi {
+  /** MES 领料出库明细 */
+  export interface ProductIssueDetail {
+    id?: number; // 明细编号
+    issueId?: number; // 领料单编号
+    lineId?: number; // 领料单行编号
+    materialStockId?: number; // 库存记录编号
+    itemId?: number; // 物料编号
+    quantity?: number; // 数量
+    batchId?: number; // 批次编号
+    batchCode?: string; // 批次号
+    warehouseId?: number; // 仓库编号
+    warehouseName?: string; // 仓库名称
+    locationId?: number; // 库区编号
+    locationName?: string; // 库区名称
+    areaId?: number; // 库位编号
+    areaName?: string; // 库位名称
+    remark?: string; // 备注
+  }
+}
+
+/** 查询领料出库明细列表（按行编号） */
+export function getProductIssueDetailListByLineId(lineId: number) {
+  return requestClient.get<MesWmProductIssueDetailApi.ProductIssueDetail[]>(
+    '/mes/wm/product-issue-detail/list-by-line',
+    { params: { lineId } },
+  );
+}
+
+/** 查询领料出库明细详情 */
+export function getProductIssueDetail(id: number) {
+  return requestClient.get<MesWmProductIssueDetailApi.ProductIssueDetail>(
+    `/mes/wm/product-issue-detail/get?id=${id}`,
+  );
+}
+
+/** 新增领料出库明细 */
+export function createProductIssueDetail(
+  data: MesWmProductIssueDetailApi.ProductIssueDetail,
+) {
+  return requestClient.post<number>('/mes/wm/product-issue-detail/create', data);
+}
+
+/** 修改领料出库明细 */
+export function updateProductIssueDetail(
+  data: MesWmProductIssueDetailApi.ProductIssueDetail,
+) {
+  return requestClient.put('/mes/wm/product-issue-detail/update', data);
+}
+
+/** 删除领料出库明细 */
+export function deleteProductIssueDetail(id: number) {
+  return requestClient.delete(`/mes/wm/product-issue-detail/delete?id=${id}`);
+}
diff --git a/apps/web-ele/src/api/mes/wm/productissue/index.ts b/apps/web-ele/src/api/mes/wm/productissue/index.ts
new file mode 100644
index 000000000..78e792289
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/productissue/index.ts
@@ -0,0 +1,87 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmProductIssueApi {
+  /** MES 领料出库单 */
+  export interface ProductIssue {
+    id?: number; // 领料单编号
+    code?: string; // 领料单编号
+    name?: string; // 领料单名称
+    workstationId?: number; // 工作站编号
+    workstationCode?: string; // 工作站编码
+    workstationName?: string; // 工作站名称
+    workOrderId?: number; // 生产工单编号
+    workOrderCode?: string; // 生产工单编码
+    clientCode?: string; // 客户编码
+    clientName?: string; // 客户名称
+    requiredTime?: number; // 需求时间
+    status?: number; // 单据状态
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询领料出库单分页 */
+export function getProductIssuePage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmProductIssueApi.ProductIssue>>(
+    '/mes/wm/product-issue/page',
+    { params },
+  );
+}
+
+/** 查询领料出库单详情 */
+export function getProductIssue(id: number) {
+  return requestClient.get<MesWmProductIssueApi.ProductIssue>(
+    `/mes/wm/product-issue/get?id=${id}`,
+  );
+}
+
+/** 新增领料出库单 */
+export function createProductIssue(data: MesWmProductIssueApi.ProductIssue) {
+  return requestClient.post<number>('/mes/wm/product-issue/create', data);
+}
+
+/** 修改领料出库单 */
+export function updateProductIssue(data: MesWmProductIssueApi.ProductIssue) {
+  return requestClient.put('/mes/wm/product-issue/update', data);
+}
+
+/** 删除领料出库单 */
+export function deleteProductIssue(id: number) {
+  return requestClient.delete(`/mes/wm/product-issue/delete?id=${id}`);
+}
+
+/** 提交领料出库单 */
+export function submitProductIssue(id: number) {
+  return requestClient.put(`/mes/wm/product-issue/submit?id=${id}`);
+}
+
+/** 执行拣货 */
+export function stockProductIssue(id: number) {
+  return requestClient.put(`/mes/wm/product-issue/stock?id=${id}`);
+}
+
+/** 完成领料出库单 */
+export function finishProductIssue(id: number) {
+  return requestClient.put(`/mes/wm/product-issue/finish?id=${id}`);
+}
+
+/** 取消领料出库单 */
+export function cancelProductIssue(id: number) {
+  return requestClient.put(`/mes/wm/product-issue/cancel?id=${id}`);
+}
+
+/** 校验领料出库单拣货数量是否与领料数量一致 */
+export function checkProductIssueQuantity(id: number) {
+  return requestClient.get<boolean>(
+    `/mes/wm/product-issue/check-quantity?id=${id}`,
+  );
+}
+
+/** 导出领料出库单 */
+export function exportProductIssue(params: any) {
+  return requestClient.download('/mes/wm/product-issue/export-excel', {
+    params,
+  });
+}
diff --git a/apps/web-ele/src/api/mes/wm/productissue/line/index.ts b/apps/web-ele/src/api/mes/wm/productissue/line/index.ts
new file mode 100644
index 000000000..65ae7a187
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/productissue/line/index.ts
@@ -0,0 +1,53 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmProductIssueLineApi {
+  /** MES 领料出库单行 */
+  export interface ProductIssueLine {
+    id?: number; // 行编号
+    issueId?: number; // 领料单编号
+    itemId?: number; // 物料编号
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    specification?: string; // 规格型号
+    unitMeasureName?: string; // 单位
+    quantity?: number; // 领料数量
+    batchId?: number; // 批次编号
+    remark?: string; // 备注
+  }
+}
+
+/** 查询领料出库单行分页 */
+export function getProductIssueLinePage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmProductIssueLineApi.ProductIssueLine>>(
+    '/mes/wm/product-issue-line/page',
+    { params },
+  );
+}
+
+/** 查询领料出库单行详情 */
+export function getProductIssueLine(id: number) {
+  return requestClient.get<MesWmProductIssueLineApi.ProductIssueLine>(
+    `/mes/wm/product-issue-line/get?id=${id}`,
+  );
+}
+
+/** 新增领料出库单行 */
+export function createProductIssueLine(
+  data: MesWmProductIssueLineApi.ProductIssueLine,
+) {
+  return requestClient.post<number>('/mes/wm/product-issue-line/create', data);
+}
+
+/** 修改领料出库单行 */
+export function updateProductIssueLine(
+  data: MesWmProductIssueLineApi.ProductIssueLine,
+) {
+  return requestClient.put('/mes/wm/product-issue-line/update', data);
+}
+
+/** 删除领料出库单行 */
+export function deleteProductIssueLine(id: number) {
+  return requestClient.delete(`/mes/wm/product-issue-line/delete?id=${id}`);
+}
diff --git a/apps/web-ele/src/api/mes/wm/productreceipt/detail/index.ts b/apps/web-ele/src/api/mes/wm/productreceipt/detail/index.ts
new file mode 100644
index 000000000..8e371a4d9
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/productreceipt/detail/index.ts
@@ -0,0 +1,58 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesWmProductReceiptDetailApi {
+  /** MES 产品入库明细 */
+  export interface ProductReceiptDetail {
+    id?: number; // 明细编号
+    lineId?: number; // 入库单行编号
+    receiptId?: number; // 入库单编号
+    itemId?: number; // 物料编号
+    itemCode?: string; // 物料编码
+    quantity?: number; // 数量
+    batchId?: number; // 批次编号
+    warehouseId?: number; // 仓库编号
+    warehouseName?: string; // 仓库名称
+    locationId?: number; // 库区编号
+    locationName?: string; // 库区名称
+    areaId?: number; // 库位编号
+    areaName?: string; // 库位名称
+    remark?: string; // 备注
+  }
+}
+
+/** 查询产品入库明细列表（按行编号） */
+export function getProductReceiptDetailListByLineId(lineId: number) {
+  return requestClient.get<MesWmProductReceiptDetailApi.ProductReceiptDetail[]>(
+    '/mes/wm/product-receipt-detail/list-by-line',
+    { params: { lineId } },
+  );
+}
+
+/** 查询产品入库明细详情 */
+export function getProductReceiptDetail(id: number) {
+  return requestClient.get<MesWmProductReceiptDetailApi.ProductReceiptDetail>(
+    `/mes/wm/product-receipt-detail/get?id=${id}`,
+  );
+}
+
+/** 新增产品入库明细 */
+export function createProductReceiptDetail(
+  data: MesWmProductReceiptDetailApi.ProductReceiptDetail,
+) {
+  return requestClient.post<number>(
+    '/mes/wm/product-receipt-detail/create',
+    data,
+  );
+}
+
+/** 修改产品入库明细 */
+export function updateProductReceiptDetail(
+  data: MesWmProductReceiptDetailApi.ProductReceiptDetail,
+) {
+  return requestClient.put('/mes/wm/product-receipt-detail/update', data);
+}
+
+/** 删除产品入库明细 */
+export function deleteProductReceiptDetail(id: number) {
+  return requestClient.delete(`/mes/wm/product-receipt-detail/delete?id=${id}`);
+}
diff --git a/apps/web-ele/src/api/mes/wm/productreceipt/index.ts b/apps/web-ele/src/api/mes/wm/productreceipt/index.ts
new file mode 100644
index 000000000..73e30a178
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/productreceipt/index.ts
@@ -0,0 +1,91 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmProductReceiptApi {
+  /** MES 产品入库单 */
+  export interface ProductReceipt {
+    id?: number; // 入库单编号
+    code?: string; // 入库单编码
+    name?: string; // 入库单名称
+    workOrderId?: number; // 生产工单编号
+    workOrderCode?: string; // 生产工单编码
+    itemId?: number; // 产品物料编号
+    itemCode?: string; // 产品物料编码
+    itemName?: string; // 产品物料名称
+    specification?: string; // 规格型号
+    unitMeasureName?: string; // 单位
+    receiptDate?: number; // 入库日期
+    status?: number; // 单据状态
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询产品入库单分页 */
+export function getProductReceiptPage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmProductReceiptApi.ProductReceipt>>(
+    '/mes/wm/product-receipt/page',
+    { params },
+  );
+}
+
+/** 查询产品入库单详情 */
+export function getProductReceipt(id: number) {
+  return requestClient.get<MesWmProductReceiptApi.ProductReceipt>(
+    `/mes/wm/product-receipt/get?id=${id}`,
+  );
+}
+
+/** 新增产品入库单 */
+export function createProductReceipt(
+  data: MesWmProductReceiptApi.ProductReceipt,
+) {
+  return requestClient.post<number>('/mes/wm/product-receipt/create', data);
+}
+
+/** 修改产品入库单 */
+export function updateProductReceipt(
+  data: MesWmProductReceiptApi.ProductReceipt,
+) {
+  return requestClient.put('/mes/wm/product-receipt/update', data);
+}
+
+/** 删除产品入库单 */
+export function deleteProductReceipt(id: number) {
+  return requestClient.delete(`/mes/wm/product-receipt/delete?id=${id}`);
+}
+
+/** 提交产品入库单 */
+export function submitProductReceipt(id: number) {
+  return requestClient.put(`/mes/wm/product-receipt/submit?id=${id}`);
+}
+
+/** 执行上架 */
+export function stockProductReceipt(id: number) {
+  return requestClient.put(`/mes/wm/product-receipt/stock?id=${id}`);
+}
+
+/** 执行入库 */
+export function finishProductReceipt(id: number) {
+  return requestClient.put(`/mes/wm/product-receipt/finish?id=${id}`);
+}
+
+/** 取消产品入库单 */
+export function cancelProductReceipt(id: number) {
+  return requestClient.put(`/mes/wm/product-receipt/cancel?id=${id}`);
+}
+
+/** 校验产品入库单明细数量是否与行收货数量一致 */
+export function checkProductReceiptQuantity(id: number) {
+  return requestClient.get<boolean>(
+    `/mes/wm/product-receipt/check-quantity?id=${id}`,
+  );
+}
+
+/** 导出产品入库单 */
+export function exportProductReceipt(params: any) {
+  return requestClient.download('/mes/wm/product-receipt/export-excel', {
+    params,
+  });
+}
diff --git a/apps/web-ele/src/api/mes/wm/productreceipt/line/index.ts b/apps/web-ele/src/api/mes/wm/productreceipt/line/index.ts
new file mode 100644
index 000000000..04e113b3b
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/productreceipt/line/index.ts
@@ -0,0 +1,57 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmProductReceiptLineApi {
+  /** MES 产品入库单行 */
+  export interface ProductReceiptLine {
+    id?: number; // 行编号
+    receiptId?: number; // 入库单编号
+    itemId?: number; // 物料编号
+    materialStockId?: number; // 库存记录编号
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    specification?: string; // 规格型号
+    unitMeasureName?: string; // 单位
+    quantity?: number; // 入库数量
+    batchId?: number; // 批次编号
+    batchCode?: string; // 批次号
+    remark?: string; // 备注
+  }
+}
+
+/** 查询产品入库单行分页 */
+export function getProductReceiptLinePage(params: PageParam) {
+  return requestClient.get<
+    PageResult<MesWmProductReceiptLineApi.ProductReceiptLine>
+  >('/mes/wm/product-receipt-line/page', { params });
+}
+
+/** 查询产品入库单行详情 */
+export function getProductReceiptLine(id: number) {
+  return requestClient.get<MesWmProductReceiptLineApi.ProductReceiptLine>(
+    `/mes/wm/product-receipt-line/get?id=${id}`,
+  );
+}
+
+/** 新增产品入库单行 */
+export function createProductReceiptLine(
+  data: MesWmProductReceiptLineApi.ProductReceiptLine,
+) {
+  return requestClient.post<number>(
+    '/mes/wm/product-receipt-line/create',
+    data,
+  );
+}
+
+/** 修改产品入库单行 */
+export function updateProductReceiptLine(
+  data: MesWmProductReceiptLineApi.ProductReceiptLine,
+) {
+  return requestClient.put('/mes/wm/product-receipt-line/update', data);
+}
+
+/** 删除产品入库单行 */
+export function deleteProductReceiptLine(id: number) {
+  return requestClient.delete(`/mes/wm/product-receipt-line/delete?id=${id}`);
+}
diff --git a/apps/web-ele/src/api/mes/wm/productsales/detail/index.ts b/apps/web-ele/src/api/mes/wm/productsales/detail/index.ts
new file mode 100644
index 000000000..34aa22d5b
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/productsales/detail/index.ts
@@ -0,0 +1,58 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesWmProductSalesDetailApi {
+  /** MES 销售出库明细 */
+  export interface ProductSalesDetail {
+    id?: number; // 明细编号
+    lineId?: number; // 出库单行编号
+    salesId?: number; // 出库单编号
+    itemId?: number; // 物料编号
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    quantity?: number; // 数量
+    materialStockId?: number; // 库存记录编号
+    batchId?: number; // 批次编号
+    batchCode?: string; // 批次号
+    warehouseId?: number; // 仓库编号
+    warehouseName?: string; // 仓库名称
+    locationId?: number; // 库区编号
+    locationName?: string; // 库区名称
+    areaId?: number; // 库位编号
+    areaName?: string; // 库位名称
+    remark?: string; // 备注
+  }
+}
+
+/** 查询销售出库明细列表（按行编号） */
+export function getProductSalesDetailListByLineId(lineId: number) {
+  return requestClient.get<MesWmProductSalesDetailApi.ProductSalesDetail[]>(
+    '/mes/wm/product-sales-detail/list-by-line',
+    { params: { lineId } },
+  );
+}
+
+/** 查询销售出库明细详情 */
+export function getProductSalesDetail(id: number) {
+  return requestClient.get<MesWmProductSalesDetailApi.ProductSalesDetail>(
+    `/mes/wm/product-sales-detail/get?id=${id}`,
+  );
+}
+
+/** 新增销售出库明细 */
+export function createProductSalesDetail(
+  data: MesWmProductSalesDetailApi.ProductSalesDetail,
+) {
+  return requestClient.post<number>('/mes/wm/product-sales-detail/create', data);
+}
+
+/** 修改销售出库明细 */
+export function updateProductSalesDetail(
+  data: MesWmProductSalesDetailApi.ProductSalesDetail,
+) {
+  return requestClient.put('/mes/wm/product-sales-detail/update', data);
+}
+
+/** 删除销售出库明细 */
+export function deleteProductSalesDetail(id: number) {
+  return requestClient.delete(`/mes/wm/product-sales-detail/delete?id=${id}`);
+}
diff --git a/apps/web-ele/src/api/mes/wm/returnissue/detail/index.ts b/apps/web-ele/src/api/mes/wm/returnissue/detail/index.ts
new file mode 100644
index 000000000..7c878bb15
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/returnissue/detail/index.ts
@@ -0,0 +1,56 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesWmReturnIssueDetailApi {
+  /** MES 生产退料明细 */
+  export interface ReturnIssueDetail {
+    id?: number; // 明细编号
+    issueId?: number; // 退料单编号
+    lineId?: number; // 退料单行编号
+    materialStockId?: number; // 库存记录编号
+    itemId?: number; // 物料编号
+    quantity?: number; // 数量
+    batchId?: number; // 批次编号
+    batchCode?: string; // 批次号
+    warehouseId?: number; // 仓库编号
+    warehouseName?: string; // 仓库名称
+    locationId?: number; // 库区编号
+    locationName?: string; // 库区名称
+    areaId?: number; // 库位编号
+    areaName?: string; // 库位名称
+    remark?: string; // 备注
+  }
+}
+
+/** 查询生产退料明细列表（按行编号） */
+export function getReturnIssueDetailListByLineId(lineId: number) {
+  return requestClient.get<MesWmReturnIssueDetailApi.ReturnIssueDetail[]>(
+    '/mes/wm/return-issue-detail/list-by-line',
+    { params: { lineId } },
+  );
+}
+
+/** 查询生产退料明细详情 */
+export function getReturnIssueDetail(id: number) {
+  return requestClient.get<MesWmReturnIssueDetailApi.ReturnIssueDetail>(
+    `/mes/wm/return-issue-detail/get?id=${id}`,
+  );
+}
+
+/** 新增生产退料明细 */
+export function createReturnIssueDetail(
+  data: MesWmReturnIssueDetailApi.ReturnIssueDetail,
+) {
+  return requestClient.post<number>('/mes/wm/return-issue-detail/create', data);
+}
+
+/** 修改生产退料明细 */
+export function updateReturnIssueDetail(
+  data: MesWmReturnIssueDetailApi.ReturnIssueDetail,
+) {
+  return requestClient.put('/mes/wm/return-issue-detail/update', data);
+}
+
+/** 删除生产退料明细 */
+export function deleteReturnIssueDetail(id: number) {
+  return requestClient.delete(`/mes/wm/return-issue-detail/delete?id=${id}`);
+}
diff --git a/apps/web-ele/src/api/mes/wm/returnissue/index.ts b/apps/web-ele/src/api/mes/wm/returnissue/index.ts
new file mode 100644
index 000000000..c2a10b099
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/returnissue/index.ts
@@ -0,0 +1,78 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmReturnIssueApi {
+  /** MES 生产退料单 */
+  export interface ReturnIssue {
+    id?: number; // 退料单编号
+    code?: string; // 退料单编号
+    name?: string; // 退料单名称
+    workstationId?: number; // 工作站编号
+    workstationName?: string; // 工作站名称
+    workOrderId?: number; // 生产工单编号
+    workOrderCode?: string; // 生产工单编码
+    type?: number; // 退料类型
+    returnDate?: number; // 退料日期
+    status?: number; // 单据状态
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询生产退料单分页 */
+export function getReturnIssuePage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmReturnIssueApi.ReturnIssue>>(
+    '/mes/wm/return-issue/page',
+    { params },
+  );
+}
+
+/** 查询生产退料单详情 */
+export function getReturnIssue(id: number) {
+  return requestClient.get<MesWmReturnIssueApi.ReturnIssue>(
+    `/mes/wm/return-issue/get?id=${id}`,
+  );
+}
+
+/** 新增生产退料单 */
+export function createReturnIssue(data: MesWmReturnIssueApi.ReturnIssue) {
+  return requestClient.post<number>('/mes/wm/return-issue/create', data);
+}
+
+/** 修改生产退料单 */
+export function updateReturnIssue(data: MesWmReturnIssueApi.ReturnIssue) {
+  return requestClient.put('/mes/wm/return-issue/update', data);
+}
+
+/** 删除生产退料单 */
+export function deleteReturnIssue(id: number) {
+  return requestClient.delete(`/mes/wm/return-issue/delete?id=${id}`);
+}
+
+/** 提交生产退料单 */
+export function submitReturnIssue(id: number) {
+  return requestClient.put(`/mes/wm/return-issue/submit?id=${id}`);
+}
+
+/** 入库上架 */
+export function stockReturnIssue(id: number) {
+  return requestClient.put(`/mes/wm/return-issue/stock?id=${id}`);
+}
+
+/** 完成生产退料单 */
+export function finishReturnIssue(id: number) {
+  return requestClient.put(`/mes/wm/return-issue/finish?id=${id}`);
+}
+
+/** 取消生产退料单 */
+export function cancelReturnIssue(id: number) {
+  return requestClient.put(`/mes/wm/return-issue/cancel?id=${id}`);
+}
+
+/** 导出生产退料单 */
+export function exportReturnIssue(params: any) {
+  return requestClient.download('/mes/wm/return-issue/export-excel', {
+    params,
+  });
+}
diff --git a/apps/web-ele/src/api/mes/wm/returnissue/line/index.ts b/apps/web-ele/src/api/mes/wm/returnissue/line/index.ts
new file mode 100644
index 000000000..05bef0792
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/returnissue/line/index.ts
@@ -0,0 +1,58 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmReturnIssueLineApi {
+  /** MES 生产退料单行 */
+  export interface ReturnIssueLine {
+    id?: number; // 行编号
+    issueId?: number; // 退料单编号
+    itemId?: number; // 物料编号
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    specification?: string; // 规格型号
+    unitMeasureName?: string; // 单位
+    materialStockId?: number; // 库存记录编号
+    quantity?: number; // 退料数量
+    batchId?: number; // 批次编号
+    batchCode?: string; // 批次号
+    rqcCheckFlag?: boolean; // 是否检测
+    qualityStatus?: number; // 质量状态
+    rqcId?: number; // 退货检验单编号
+    remark?: string; // 备注
+  }
+}
+
+/** 查询生产退料单行分页 */
+export function getReturnIssueLinePage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmReturnIssueLineApi.ReturnIssueLine>>(
+    '/mes/wm/return-issue-line/page',
+    { params },
+  );
+}
+
+/** 查询生产退料单行详情 */
+export function getReturnIssueLine(id: number) {
+  return requestClient.get<MesWmReturnIssueLineApi.ReturnIssueLine>(
+    `/mes/wm/return-issue-line/get?id=${id}`,
+  );
+}
+
+/** 新增生产退料单行 */
+export function createReturnIssueLine(
+  data: MesWmReturnIssueLineApi.ReturnIssueLine,
+) {
+  return requestClient.post<number>('/mes/wm/return-issue-line/create', data);
+}
+
+/** 修改生产退料单行 */
+export function updateReturnIssueLine(
+  data: MesWmReturnIssueLineApi.ReturnIssueLine,
+) {
+  return requestClient.put('/mes/wm/return-issue-line/update', data);
+}
+
+/** 删除生产退料单行 */
+export function deleteReturnIssueLine(id: number) {
+  return requestClient.delete(`/mes/wm/return-issue-line/delete?id=${id}`);
+}
diff --git a/apps/web-ele/src/api/mes/wm/returnsales/detail/index.ts b/apps/web-ele/src/api/mes/wm/returnsales/detail/index.ts
new file mode 100644
index 000000000..dfba83fa7
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/returnsales/detail/index.ts
@@ -0,0 +1,55 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesWmReturnSalesDetailApi {
+  /** MES 销售退货明细 */
+  export interface ReturnSalesDetail {
+    id?: number; // 明细编号
+    returnId?: number; // 退货单编号
+    lineId?: number; // 退货单行编号
+    itemId?: number; // 物料编号
+    quantity?: number; // 数量
+    batchId?: number; // 批次编号
+    batchCode?: string; // 批次号
+    warehouseId?: number; // 仓库编号
+    warehouseName?: string; // 仓库名称
+    locationId?: number; // 库区编号
+    locationName?: string; // 库区名称
+    areaId?: number; // 库位编号
+    areaName?: string; // 库位名称
+    remark?: string; // 备注
+  }
+}
+
+/** 查询销售退货明细列表（按行编号） */
+export function getReturnSalesDetailListByLineId(lineId: number) {
+  return requestClient.get<MesWmReturnSalesDetailApi.ReturnSalesDetail[]>(
+    '/mes/wm/return-sales-detail/list-by-line',
+    { params: { lineId } },
+  );
+}
+
+/** 查询销售退货明细详情 */
+export function getReturnSalesDetail(id: number) {
+  return requestClient.get<MesWmReturnSalesDetailApi.ReturnSalesDetail>(
+    `/mes/wm/return-sales-detail/get?id=${id}`,
+  );
+}
+
+/** 新增销售退货明细 */
+export function createReturnSalesDetail(
+  data: MesWmReturnSalesDetailApi.ReturnSalesDetail,
+) {
+  return requestClient.post<number>('/mes/wm/return-sales-detail/create', data);
+}
+
+/** 修改销售退货明细 */
+export function updateReturnSalesDetail(
+  data: MesWmReturnSalesDetailApi.ReturnSalesDetail,
+) {
+  return requestClient.put('/mes/wm/return-sales-detail/update', data);
+}
+
+/** 删除销售退货明细 */
+export function deleteReturnSalesDetail(id: number) {
+  return requestClient.delete(`/mes/wm/return-sales-detail/delete?id=${id}`);
+}
diff --git a/apps/web-ele/src/api/mes/wm/returnsales/index.ts b/apps/web-ele/src/api/mes/wm/returnsales/index.ts
new file mode 100644
index 000000000..8ad32ce0e
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/returnsales/index.ts
@@ -0,0 +1,78 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmReturnSalesApi {
+  /** MES 销售退货单 */
+  export interface ReturnSales {
+    id?: number; // 退货单编号
+    code?: string; // 退货单编号
+    name?: string; // 退货单名称
+    salesOrderCode?: string; // 销售订单号
+    clientId?: number; // 客户编号
+    clientCode?: string; // 客户编码
+    clientName?: string; // 客户名称
+    returnDate?: number; // 退货日期
+    returnReason?: string; // 退货原因
+    status?: number; // 单据状态
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询销售退货单分页 */
+export function getReturnSalesPage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmReturnSalesApi.ReturnSales>>(
+    '/mes/wm/return-sales/page',
+    { params },
+  );
+}
+
+/** 查询销售退货单详情 */
+export function getReturnSales(id: number) {
+  return requestClient.get<MesWmReturnSalesApi.ReturnSales>(
+    `/mes/wm/return-sales/get?id=${id}`,
+  );
+}
+
+/** 新增销售退货单 */
+export function createReturnSales(data: MesWmReturnSalesApi.ReturnSales) {
+  return requestClient.post<number>('/mes/wm/return-sales/create', data);
+}
+
+/** 修改销售退货单 */
+export function updateReturnSales(data: MesWmReturnSalesApi.ReturnSales) {
+  return requestClient.put('/mes/wm/return-sales/update', data);
+}
+
+/** 删除销售退货单 */
+export function deleteReturnSales(id: number) {
+  return requestClient.delete(`/mes/wm/return-sales/delete?id=${id}`);
+}
+
+/** 提交销售退货单 */
+export function submitReturnSales(id: number) {
+  return requestClient.put(`/mes/wm/return-sales/submit?id=${id}`);
+}
+
+/** 执行退货 */
+export function finishReturnSales(id: number) {
+  return requestClient.put(`/mes/wm/return-sales/finish?id=${id}`);
+}
+
+/** 执行上架 */
+export function stockReturnSales(id: number) {
+  return requestClient.put(`/mes/wm/return-sales/stock?id=${id}`);
+}
+
+/** 取消销售退货单 */
+export function cancelReturnSales(id: number) {
+  return requestClient.put(`/mes/wm/return-sales/cancel?id=${id}`);
+}
+
+/** 导出销售退货单 */
+export function exportReturnSales(params: any) {
+  return requestClient.download('/mes/wm/return-sales/export-excel', {
+    params,
+  });
+}
diff --git a/apps/web-ele/src/api/mes/wm/returnsales/line/index.ts b/apps/web-ele/src/api/mes/wm/returnsales/line/index.ts
new file mode 100644
index 000000000..f08ce776b
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/returnsales/line/index.ts
@@ -0,0 +1,57 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmReturnSalesLineApi {
+  /** MES 销售退货单行 */
+  export interface ReturnSalesLine {
+    id?: number; // 行编号
+    returnId?: number; // 退货单编号
+    itemId?: number; // 物料编号
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    specification?: string; // 规格型号
+    unitMeasureName?: string; // 单位
+    quantity?: number; // 退货数量
+    batchId?: number; // 批次编号
+    batchCode?: string; // 批次号
+    rqcCheckFlag?: boolean; // 是否需要质检
+    rqcId?: number; // 退货检验单编号
+    qualityStatus?: number; // 质量状态
+    remark?: string; // 备注
+  }
+}
+
+/** 查询销售退货单行分页 */
+export function getReturnSalesLinePage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmReturnSalesLineApi.ReturnSalesLine>>(
+    '/mes/wm/return-sales-line/page',
+    { params },
+  );
+}
+
+/** 查询销售退货单行详情 */
+export function getReturnSalesLine(id: number) {
+  return requestClient.get<MesWmReturnSalesLineApi.ReturnSalesLine>(
+    `/mes/wm/return-sales-line/get?id=${id}`,
+  );
+}
+
+/** 新增销售退货单行 */
+export function createReturnSalesLine(
+  data: MesWmReturnSalesLineApi.ReturnSalesLine,
+) {
+  return requestClient.post<number>('/mes/wm/return-sales-line/create', data);
+}
+
+/** 修改销售退货单行 */
+export function updateReturnSalesLine(
+  data: MesWmReturnSalesLineApi.ReturnSalesLine,
+) {
+  return requestClient.put('/mes/wm/return-sales-line/update', data);
+}
+
+/** 删除销售退货单行 */
+export function deleteReturnSalesLine(id: number) {
+  return requestClient.delete(`/mes/wm/return-sales-line/delete?id=${id}`);
+}
diff --git a/apps/web-ele/src/api/mes/wm/returnvendor/detail/index.ts b/apps/web-ele/src/api/mes/wm/returnvendor/detail/index.ts
new file mode 100644
index 000000000..92bb049f1
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/returnvendor/detail/index.ts
@@ -0,0 +1,56 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesWmReturnVendorDetailApi {
+  /** MES 供应商退货明细 */
+  export interface ReturnVendorDetail {
+    id?: number; // 明细编号
+    returnId?: number; // 退货单编号
+    lineId?: number; // 退货单行编号
+    materialStockId?: number; // 库存记录编号
+    itemId?: number; // 物料编号
+    quantity?: number; // 数量
+    batchId?: number; // 批次编号
+    batchCode?: string; // 批次号
+    warehouseId?: number; // 仓库编号
+    warehouseName?: string; // 仓库名称
+    locationId?: number; // 库区编号
+    locationName?: string; // 库区名称
+    areaId?: number; // 库位编号
+    areaName?: string; // 库位名称
+    remark?: string; // 备注
+  }
+}
+
+/** 查询供应商退货明细列表（按行编号） */
+export function getReturnVendorDetailListByLineId(lineId: number) {
+  return requestClient.get<MesWmReturnVendorDetailApi.ReturnVendorDetail[]>(
+    '/mes/wm/return-vendor-detail/list-by-line',
+    { params: { lineId } },
+  );
+}
+
+/** 查询供应商退货明细详情 */
+export function getReturnVendorDetail(id: number) {
+  return requestClient.get<MesWmReturnVendorDetailApi.ReturnVendorDetail>(
+    `/mes/wm/return-vendor-detail/get?id=${id}`,
+  );
+}
+
+/** 新增供应商退货明细 */
+export function createReturnVendorDetail(
+  data: MesWmReturnVendorDetailApi.ReturnVendorDetail,
+) {
+  return requestClient.post<number>('/mes/wm/return-vendor-detail/create', data);
+}
+
+/** 修改供应商退货明细 */
+export function updateReturnVendorDetail(
+  data: MesWmReturnVendorDetailApi.ReturnVendorDetail,
+) {
+  return requestClient.put('/mes/wm/return-vendor-detail/update', data);
+}
+
+/** 删除供应商退货明细 */
+export function deleteReturnVendorDetail(id: number) {
+  return requestClient.delete(`/mes/wm/return-vendor-detail/delete?id=${id}`);
+}
diff --git a/apps/web-ele/src/api/mes/wm/returnvendor/index.ts b/apps/web-ele/src/api/mes/wm/returnvendor/index.ts
new file mode 100644
index 000000000..fdb5bbe6d
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/returnvendor/index.ts
@@ -0,0 +1,88 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmReturnVendorApi {
+  /** MES 供应商退货单 */
+  export interface ReturnVendor {
+    id?: number; // 退货单编号
+    code?: string; // 退货单编号
+    name?: string; // 退货单名称
+    purchaseOrderCode?: string; // 采购订单号
+    vendorId?: number; // 供应商编号
+    vendorCode?: string; // 供应商编码
+    vendorName?: string; // 供应商名称
+    vendorNickname?: string; // 供应商简称
+    returnDate?: number; // 退货日期
+    returnReason?: string; // 退货原因
+    transportCode?: string; // 运单号
+    transportTelephone?: string; // 联系电话
+    status?: number; // 单据状态
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询供应商退货单分页 */
+export function getReturnVendorPage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmReturnVendorApi.ReturnVendor>>(
+    '/mes/wm/return-vendor/page',
+    { params },
+  );
+}
+
+/** 查询供应商退货单详情 */
+export function getReturnVendor(id: number) {
+  return requestClient.get<MesWmReturnVendorApi.ReturnVendor>(
+    `/mes/wm/return-vendor/get?id=${id}`,
+  );
+}
+
+/** 新增供应商退货单 */
+export function createReturnVendor(data: MesWmReturnVendorApi.ReturnVendor) {
+  return requestClient.post<number>('/mes/wm/return-vendor/create', data);
+}
+
+/** 修改供应商退货单 */
+export function updateReturnVendor(data: MesWmReturnVendorApi.ReturnVendor) {
+  return requestClient.put('/mes/wm/return-vendor/update', data);
+}
+
+/** 删除供应商退货单 */
+export function deleteReturnVendor(id: number) {
+  return requestClient.delete(`/mes/wm/return-vendor/delete?id=${id}`);
+}
+
+/** 提交供应商退货单 */
+export function submitReturnVendor(id: number) {
+  return requestClient.put(`/mes/wm/return-vendor/submit?id=${id}`);
+}
+
+/** 执行拣货 */
+export function stockReturnVendor(id: number) {
+  return requestClient.put(`/mes/wm/return-vendor/stock?id=${id}`);
+}
+
+/** 完成供应商退货单 */
+export function finishReturnVendor(id: number) {
+  return requestClient.put(`/mes/wm/return-vendor/finish?id=${id}`);
+}
+
+/** 取消供应商退货单 */
+export function cancelReturnVendor(id: number) {
+  return requestClient.put(`/mes/wm/return-vendor/cancel?id=${id}`);
+}
+
+/** 校验供应商退货单拣货数量是否与退货数量一致 */
+export function checkReturnVendorQuantity(id: number) {
+  return requestClient.get<boolean>(
+    `/mes/wm/return-vendor/check-quantity?id=${id}`,
+  );
+}
+
+/** 导出供应商退货单 */
+export function exportReturnVendor(params: any) {
+  return requestClient.download('/mes/wm/return-vendor/export-excel', {
+    params,
+  });
+}
diff --git a/apps/web-ele/src/api/mes/wm/returnvendor/line/index.ts b/apps/web-ele/src/api/mes/wm/returnvendor/line/index.ts
new file mode 100644
index 000000000..c2ff06c62
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/returnvendor/line/index.ts
@@ -0,0 +1,54 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmReturnVendorLineApi {
+  /** MES 供应商退货单行 */
+  export interface ReturnVendorLine {
+    id?: number; // 行编号
+    returnId?: number; // 退货单编号
+    itemId?: number; // 物料编号
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    specification?: string; // 规格型号
+    unitMeasureName?: string; // 单位
+    quantity?: number; // 退货数量
+    batchId?: number; // 批次编号
+    batchCode?: string; // 批次号
+    remark?: string; // 备注
+  }
+}
+
+/** 查询供应商退货单行分页 */
+export function getReturnVendorLinePage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmReturnVendorLineApi.ReturnVendorLine>>(
+    '/mes/wm/return-vendor-line/page',
+    { params },
+  );
+}
+
+/** 查询供应商退货单行详情 */
+export function getReturnVendorLine(id: number) {
+  return requestClient.get<MesWmReturnVendorLineApi.ReturnVendorLine>(
+    `/mes/wm/return-vendor-line/get?id=${id}`,
+  );
+}
+
+/** 新增供应商退货单行 */
+export function createReturnVendorLine(
+  data: MesWmReturnVendorLineApi.ReturnVendorLine,
+) {
+  return requestClient.post<number>('/mes/wm/return-vendor-line/create', data);
+}
+
+/** 修改供应商退货单行 */
+export function updateReturnVendorLine(
+  data: MesWmReturnVendorLineApi.ReturnVendorLine,
+) {
+  return requestClient.put('/mes/wm/return-vendor-line/update', data);
+}
+
+/** 删除供应商退货单行 */
+export function deleteReturnVendorLine(id: number) {
+  return requestClient.delete(`/mes/wm/return-vendor-line/delete?id=${id}`);
+}
diff --git a/apps/web-ele/src/api/mes/wm/salesnotice/index.ts b/apps/web-ele/src/api/mes/wm/salesnotice/index.ts
new file mode 100644
index 000000000..c053f69c7
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/salesnotice/index.ts
@@ -0,0 +1,65 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmSalesNoticeApi {
+  /** MES 发货通知单 */
+  export interface SalesNotice {
+    id?: number; // 通知单编号
+    code?: string; // 通知单编号
+    name?: string; // 通知单名称
+    salesOrderCode?: string; // 销售订单编号
+    clientId?: number; // 客户编号
+    clientCode?: string; // 客户编码
+    clientName?: string; // 客户名称
+    salesDate?: number; // 发货日期
+    recipientName?: string; // 收货人
+    recipientTelephone?: string; // 联系方式
+    recipientAddress?: string; // 收货地址
+    status?: number; // 单据状态
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询发货通知单分页 */
+export function getSalesNoticePage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmSalesNoticeApi.SalesNotice>>(
+    '/mes/wm/sales-notice/page',
+    { params },
+  );
+}
+
+/** 查询发货通知单详情 */
+export function getSalesNotice(id: number) {
+  return requestClient.get<MesWmSalesNoticeApi.SalesNotice>(
+    `/mes/wm/sales-notice/get?id=${id}`,
+  );
+}
+
+/** 新增发货通知单 */
+export function createSalesNotice(data: MesWmSalesNoticeApi.SalesNotice) {
+  return requestClient.post<number>('/mes/wm/sales-notice/create', data);
+}
+
+/** 修改发货通知单 */
+export function updateSalesNotice(data: MesWmSalesNoticeApi.SalesNotice) {
+  return requestClient.put('/mes/wm/sales-notice/update', data);
+}
+
+/** 删除发货通知单 */
+export function deleteSalesNotice(id: number) {
+  return requestClient.delete(`/mes/wm/sales-notice/delete?id=${id}`);
+}
+
+/** 提交发货通知单 */
+export function submitSalesNotice(id: number) {
+  return requestClient.put(`/mes/wm/sales-notice/submit?id=${id}`);
+}
+
+/** 导出发货通知单 */
+export function exportSalesNotice(params: any) {
+  return requestClient.download('/mes/wm/sales-notice/export-excel', {
+    params,
+  });
+}
diff --git a/apps/web-ele/src/api/mes/wm/salesnotice/line/index.ts b/apps/web-ele/src/api/mes/wm/salesnotice/line/index.ts
new file mode 100644
index 000000000..948d1bc63
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/salesnotice/line/index.ts
@@ -0,0 +1,55 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmSalesNoticeLineApi {
+  /** MES 发货通知单行 */
+  export interface SalesNoticeLine {
+    id?: number; // 行编号
+    noticeId?: number; // 发货通知单编号
+    itemId?: number; // 物料编号
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    specification?: string; // 规格型号
+    unitMeasureName?: string; // 单位
+    batchId?: number; // 批次编号
+    batchCode?: string; // 批次号
+    quantity?: number; // 发货数量
+    oqcCheckFlag?: boolean; // 是否检验
+    remark?: string; // 备注
+  }
+}
+
+/** 查询发货通知单行分页 */
+export function getSalesNoticeLinePage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmSalesNoticeLineApi.SalesNoticeLine>>(
+    '/mes/wm/sales-notice-line/page',
+    { params },
+  );
+}
+
+/** 查询发货通知单行详情 */
+export function getSalesNoticeLine(id: number) {
+  return requestClient.get<MesWmSalesNoticeLineApi.SalesNoticeLine>(
+    `/mes/wm/sales-notice-line/get?id=${id}`,
+  );
+}
+
+/** 新增发货通知单行 */
+export function createSalesNoticeLine(
+  data: MesWmSalesNoticeLineApi.SalesNoticeLine,
+) {
+  return requestClient.post<number>('/mes/wm/sales-notice-line/create', data);
+}
+
+/** 修改发货通知单行 */
+export function updateSalesNoticeLine(
+  data: MesWmSalesNoticeLineApi.SalesNoticeLine,
+) {
+  return requestClient.put('/mes/wm/sales-notice-line/update', data);
+}
+
+/** 删除发货通知单行 */
+export function deleteSalesNoticeLine(id: number) {
+  return requestClient.delete(`/mes/wm/sales-notice-line/delete?id=${id}`);
+}
diff --git a/apps/web-ele/src/api/mes/wm/stocktaking/plan/index.ts b/apps/web-ele/src/api/mes/wm/stocktaking/plan/index.ts
new file mode 100644
index 000000000..c6f29f092
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/stocktaking/plan/index.ts
@@ -0,0 +1,68 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmStockTakingPlanApi {
+  /** 盘点方案 */
+  export interface StockTakingPlan {
+    id?: number; // 方案编号
+    code?: string; // 方案编码
+    name?: string; // 方案名称
+    type?: number; // 盘点类型
+    startTime?: number; // 开始时间
+    endTime?: number; // 结束时间
+    blindFlag?: boolean; // 是否盲盘
+    frozen?: boolean; // 是否冻结库存
+    status?: number; // 状态
+    remark?: string; // 备注
+    createTime?: string; // 创建时间
+  }
+}
+
+/** 查询盘点方案分页 */
+export function getStockTakingPlanPage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmStockTakingPlanApi.StockTakingPlan>>(
+    '/mes/wm/stocktaking-plan/page',
+    { params },
+  );
+}
+
+/** 查询盘点方案详情 */
+export function getStockTakingPlan(id: number) {
+  return requestClient.get<MesWmStockTakingPlanApi.StockTakingPlan>(
+    `/mes/wm/stocktaking-plan/get?id=${id}`,
+  );
+}
+
+/** 新增盘点方案 */
+export function createStockTakingPlan(
+  data: MesWmStockTakingPlanApi.StockTakingPlan,
+) {
+  return requestClient.post<number>('/mes/wm/stocktaking-plan/create', data);
+}
+
+/** 修改盘点方案 */
+export function updateStockTakingPlan(
+  data: MesWmStockTakingPlanApi.StockTakingPlan,
+) {
+  return requestClient.put('/mes/wm/stocktaking-plan/update', data);
+}
+
+/** 修改盘点方案状态 */
+export function updateStockTakingPlanStatus(id: number, status: number) {
+  return requestClient.put('/mes/wm/stocktaking-plan/update-status', null, {
+    params: { id, status },
+  });
+}
+
+/** 删除盘点方案 */
+export function deleteStockTakingPlan(id: number) {
+  return requestClient.delete(`/mes/wm/stocktaking-plan/delete?id=${id}`);
+}
+
+/** 导出盘点方案 */
+export function exportStockTakingPlan(params: any) {
+  return requestClient.download('/mes/wm/stocktaking-plan/export-excel', {
+    params,
+  });
+}
diff --git a/apps/web-ele/src/api/mes/wm/stocktaking/plan/param/index.ts b/apps/web-ele/src/api/mes/wm/stocktaking/plan/param/index.ts
new file mode 100644
index 000000000..b6eb6e09e
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/stocktaking/plan/param/index.ts
@@ -0,0 +1,49 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmStockTakingPlanParamApi {
+  /** 盘点方案条件 */
+  export interface StockTakingPlanParam {
+    id?: number; // 条件编号
+    planId?: number; // 方案编号
+    type?: number; // 条件类型
+    valueId?: number; // 条件值编号
+    valueCode?: string; // 条件值编码
+    valueName?: string; // 条件值名称
+    remark?: string; // 备注
+  }
+}
+
+/** 查询盘点方案条件分页 */
+export function getStockTakingPlanParamPage(params: PageParam) {
+  return requestClient.get<
+    PageResult<MesWmStockTakingPlanParamApi.StockTakingPlanParam>
+  >('/mes/wm/stocktaking-plan-param/page', { params });
+}
+
+/** 查询盘点方案条件详情 */
+export function getStockTakingPlanParam(id: number) {
+  return requestClient.get<MesWmStockTakingPlanParamApi.StockTakingPlanParam>(
+    `/mes/wm/stocktaking-plan-param/get?id=${id}`,
+  );
+}
+
+/** 新增盘点方案条件 */
+export function createStockTakingPlanParam(
+  data: MesWmStockTakingPlanParamApi.StockTakingPlanParam,
+) {
+  return requestClient.post('/mes/wm/stocktaking-plan-param/create', data);
+}
+
+/** 修改盘点方案条件 */
+export function updateStockTakingPlanParam(
+  data: MesWmStockTakingPlanParamApi.StockTakingPlanParam,
+) {
+  return requestClient.put('/mes/wm/stocktaking-plan-param/update', data);
+}
+
+/** 删除盘点方案条件 */
+export function deleteStockTakingPlanParam(id: number) {
+  return requestClient.delete(`/mes/wm/stocktaking-plan-param/delete?id=${id}`);
+}
diff --git a/apps/web-ele/src/api/mes/wm/stocktaking/task/index.ts b/apps/web-ele/src/api/mes/wm/stocktaking/task/index.ts
new file mode 100644
index 000000000..77622f351
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/stocktaking/task/index.ts
@@ -0,0 +1,86 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmStockTakingTaskApi {
+  /** 盘点任务 */
+  export interface StockTakingTask {
+    id?: number; // 任务编号
+    code?: string; // 任务编码
+    name?: string; // 任务名称
+    takingDate?: string; // 盘点日期
+    type?: number; // 盘点类型
+    userId?: number; // 盘点人用户编号
+    userNickname?: string; // 盘点人名称
+    planId?: number; // 盘点方案编号
+    planCode?: string; // 盘点方案编码
+    planName?: string; // 盘点方案名称
+    blindFlag?: boolean; // 是否盲盘
+    frozen?: boolean; // 是否冻结库存
+    startTime?: number; // 开始时间
+    endTime?: number; // 结束时间
+    status?: number; // 单据状态
+    remark?: string; // 备注
+    createTime?: string; // 创建时间
+  }
+}
+
+/** 查询盘点任务分页 */
+export function getStockTakingPage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmStockTakingTaskApi.StockTakingTask>>(
+    '/mes/wm/stocktaking-task/page',
+    { params },
+  );
+}
+
+/** 查询盘点任务详情 */
+export function getStockTaking(id: number) {
+  return requestClient.get<MesWmStockTakingTaskApi.StockTakingTask>(
+    `/mes/wm/stocktaking-task/get?id=${id}`,
+  );
+}
+
+/** 新增盘点任务 */
+export function createStockTaking(
+  data: MesWmStockTakingTaskApi.StockTakingTask,
+) {
+  return requestClient.post<number>('/mes/wm/stocktaking-task/create', data);
+}
+
+/** 修改盘点任务 */
+export function updateStockTaking(
+  data: MesWmStockTakingTaskApi.StockTakingTask,
+) {
+  return requestClient.put('/mes/wm/stocktaking-task/update', data);
+}
+
+/** 删除盘点任务 */
+export function deleteStockTaking(id: number) {
+  return requestClient.delete(`/mes/wm/stocktaking-task/delete?id=${id}`);
+}
+
+/** 提交盘点任务 */
+export function submitStockTaking(id: number) {
+  return requestClient.put('/mes/wm/stocktaking-task/submit', null, {
+    params: { id },
+  });
+}
+
+/** 取消盘点任务 */
+export function cancelStockTaking(id: number) {
+  return requestClient.put('/mes/wm/stocktaking-task/cancel', null, {
+    params: { id },
+  });
+}
+
+/** 执行盘点任务 */
+export function finishStockTaking(id: number) {
+  return requestClient.put('/mes/wm/stocktaking-task/finish', { id });
+}
+
+/** 导出盘点任务 */
+export function exportStockTaking(params: any) {
+  return requestClient.download('/mes/wm/stocktaking-task/export-excel', {
+    params,
+  });
+}
diff --git a/apps/web-ele/src/api/mes/wm/stocktaking/task/line/index.ts b/apps/web-ele/src/api/mes/wm/stocktaking/task/line/index.ts
new file mode 100644
index 000000000..804483ec7
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/stocktaking/task/line/index.ts
@@ -0,0 +1,72 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmStockTakingTaskLineApi {
+  /** 盘点任务行 */
+  export interface StockTakingTaskLine {
+    id?: number; // 盘点行编号
+    taskId?: number; // 任务编号
+    materialStockId?: number; // 库存编号
+    itemId?: number; // 物料编号
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    specification?: string; // 规格型号
+    unitMeasureName?: string; // 计量单位名称
+    batchId?: number; // 批次编号
+    batchCode?: string; // 批次号
+    quantity?: number; // 在库数量
+    takingQuantity?: number; // 盘点数量
+    differenceQuantity?: number; // 差异数量
+    warehouseId?: number; // 仓库编号
+    warehouseName?: string; // 仓库名称
+    locationId?: number; // 库区编号
+    locationName?: string; // 库区名称
+    areaId?: number; // 库位编号
+    areaName?: string; // 库位名称
+    status?: number; // 状态
+    remark?: string; // 备注
+  }
+}
+
+/** 查询盘点任务行分页 */
+export function getStockTakingTaskLinePage(params: PageParam) {
+  return requestClient.get<
+    PageResult<MesWmStockTakingTaskLineApi.StockTakingTaskLine>
+  >('/mes/wm/stocktaking-task-line/page', { params });
+}
+
+/** 查询盘点任务行精简列表 */
+export function getStockTakingTaskLineSimpleList(taskId: number) {
+  return requestClient.get<MesWmStockTakingTaskLineApi.StockTakingTaskLine[]>(
+    '/mes/wm/stocktaking-task-line/simple-list',
+    { params: { taskId } },
+  );
+}
+
+/** 查询盘点任务行详情 */
+export function getStockTakingTaskLine(id: number) {
+  return requestClient.get<MesWmStockTakingTaskLineApi.StockTakingTaskLine>(
+    '/mes/wm/stocktaking-task-line/get',
+    { params: { id } },
+  );
+}
+
+/** 新增盘点任务行 */
+export function createStockTakingTaskLine(
+  data: MesWmStockTakingTaskLineApi.StockTakingTaskLine,
+) {
+  return requestClient.post('/mes/wm/stocktaking-task-line/create', data);
+}
+
+/** 修改盘点任务行 */
+export function updateStockTakingTaskLine(
+  data: MesWmStockTakingTaskLineApi.StockTakingTaskLine,
+) {
+  return requestClient.put('/mes/wm/stocktaking-task-line/update', data);
+}
+
+/** 删除盘点任务行 */
+export function deleteStockTakingTaskLine(id: number) {
+  return requestClient.delete(`/mes/wm/stocktaking-task-line/delete?id=${id}`);
+}
diff --git a/apps/web-ele/src/api/mes/wm/stocktaking/task/result/index.ts b/apps/web-ele/src/api/mes/wm/stocktaking/task/result/index.ts
new file mode 100644
index 000000000..acd9a5f64
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/stocktaking/task/result/index.ts
@@ -0,0 +1,64 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmStockTakingResultApi {
+  /** 盘点结果 */
+  export interface StockTakingResult {
+    id?: number; // 结果编号
+    taskId?: number; // 任务编号
+    lineId?: number; // 盘点行编号
+    materialStockId?: number; // 库存编号
+    itemId?: number; // 物料编号
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    specification?: string; // 规格型号
+    unitMeasureName?: string; // 计量单位名称
+    batchId?: number; // 批次编号
+    batchCode?: string; // 批次号
+    warehouseId?: number; // 仓库编号
+    warehouseName?: string; // 仓库名称
+    locationId?: number; // 库区编号
+    locationName?: string; // 库区名称
+    areaId?: number; // 库位编号
+    areaName?: string; // 库位名称
+    quantity?: number; // 在库数量
+    takingQuantity?: number; // 盘点数量
+    remark?: string; // 备注
+    createTime?: string; // 创建时间
+  }
+}
+
+/** 查询盘点结果分页 */
+export function getStockTakingResultPage(params: PageParam) {
+  return requestClient.get<
+    PageResult<MesWmStockTakingResultApi.StockTakingResult>
+  >('/mes/wm/stocktaking-task-result/page', { params });
+}
+
+/** 查询盘点结果详情 */
+export function getStockTakingResult(id: number) {
+  return requestClient.get<MesWmStockTakingResultApi.StockTakingResult>(
+    '/mes/wm/stocktaking-task-result/get',
+    { params: { id } },
+  );
+}
+
+/** 新增盘点结果 */
+export function createStockTakingResult(
+  data: MesWmStockTakingResultApi.StockTakingResult,
+) {
+  return requestClient.post('/mes/wm/stocktaking-task-result/create', data);
+}
+
+/** 修改盘点结果 */
+export function updateStockTakingResult(
+  data: MesWmStockTakingResultApi.StockTakingResult,
+) {
+  return requestClient.put('/mes/wm/stocktaking-task-result/update', data);
+}
+
+/** 删除盘点结果 */
+export function deleteStockTakingResult(id: number) {
+  return requestClient.delete(`/mes/wm/stocktaking-task-result/delete?id=${id}`);
+}
diff --git a/apps/web-ele/src/views/mes/wm/stocktaking/plan/components/index.ts b/apps/web-ele/src/views/mes/wm/stocktaking/plan/components/index.ts
new file mode 100644
index 000000000..d6289b11d
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/stocktaking/plan/components/index.ts
@@ -0,0 +1,2 @@
+export { default as StockTakingPlanSelectDialog } from './stock-taking-plan-select-dialog.vue';
+export { default as StockTakingPlanSelect } from './stock-taking-plan-select.vue';
diff --git a/apps/web-ele/src/views/mes/wm/stocktaking/plan/components/stock-taking-plan-select-dialog.vue b/apps/web-ele/src/views/mes/wm/stocktaking/plan/components/stock-taking-plan-select-dialog.vue
new file mode 100644
index 000000000..0103e71ce
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/stocktaking/plan/components/stock-taking-plan-select-dialog.vue
@@ -0,0 +1,213 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmStockTakingPlanApi } from '#/api/mes/wm/stocktaking/plan';
+
+import { nextTick, ref } from 'vue';
+
+import { CommonStatusEnum } from '@vben/constants';
+
+import { ElButton, ElDialog, ElMessage } from 'element-plus';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getStockTakingPlanPage } from '#/api/mes/wm/stocktaking/plan';
+
+import { useSelectGridColumns, useSelectGridFormSchema } from '../data';
+
+const emit = defineEmits<{
+  selected: [rows: MesWmStockTakingPlanApi.StockTakingPlan[]];
+}>();
+
+const open = ref(false); // 弹窗是否打开
+const multiple = ref(true); // 是否多选
+const selectedRows = ref<MesWmStockTakingPlanApi.StockTakingPlan[]>([]); // 已选盘点方案
+const preSelectedIds = ref<number[]>([]); // 预选盘点方案编号
+
+/** 获取多选记录，包含 VXE reserve 跨页记录 */
+function getMultipleSelectedRows() {
+  const selectedMap = new Map<
+    number,
+    MesWmStockTakingPlanApi.StockTakingPlan
+  >();
+  const records = [
+    ...(gridApi.grid.getCheckboxReserveRecords?.() ?? []),
+    ...(gridApi.grid.getCheckboxRecords?.() ?? []),
+  ] as MesWmStockTakingPlanApi.StockTakingPlan[];
+  records.forEach((row) => {
+    if (row.id != null) {
+      selectedMap.set(row.id, row);
+    }
+  });
+  return [...selectedMap.values()];
+}
+
+/** 处理勾选变化 */
+function handleCheckboxSelectChange() {
+  selectedRows.value = getMultipleSelectedRows();
+}
+
+/** 处理单选变化 */
+function handleRadioChange(row: MesWmStockTakingPlanApi.StockTakingPlan) {
+  selectedRows.value = [row];
+}
+
+/** 多选模式下切换行勾选 */
+async function toggleMultipleRow(
+  row: MesWmStockTakingPlanApi.StockTakingPlan,
+) {
+  const selected = gridApi.grid.isCheckedByCheckboxRow(row);
+  await gridApi.grid.setCheckboxRow(row, !selected);
+  selectedRows.value = getMultipleSelectedRows();
+}
+
+/** 处理行双击：单选直接确认；多选切换勾选 */
+async function handleCellDblclick({
+  row,
+}: {
+  row: MesWmStockTakingPlanApi.StockTakingPlan;
+}) {
+  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 = gridApi.grid.getData() as MesWmStockTakingPlanApi.StockTakingPlan[];
+  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: useSelectGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useSelectGridColumns(true),
+    height: 480,
+    keepSource: true,
+    checkboxConfig: {
+      highlight: true,
+      range: true,
+      reserve: true,
+    },
+    radioConfig: {
+      highlight: true,
+      trigger: 'row',
+    },
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getStockTakingPlanPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+            // 选择器只展示启用状态的方案
+            status: CommonStatusEnum.ENABLE,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmStockTakingPlanApi.StockTakingPlan>,
+  gridEvents: {
+    cellDblclick: handleCellDblclick,
+    checkboxAll: handleCheckboxSelectChange,
+    checkboxChange: handleCheckboxSelectChange,
+    radioChange: ({
+      row,
+    }: {
+      row: MesWmStockTakingPlanApi.StockTakingPlan;
+    }) => {
+      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 ?? true;
+  preSelectedIds.value = selectedIds || [];
+  await nextTick();
+  gridApi.setGridOptions({
+    columns: useSelectGridColumns(multiple.value),
+  });
+  await resetQueryState();
+  await gridApi.query();
+  await nextTick();
+  await applyPreSelection();
+}
+
+/** 关闭弹窗 */
+function closeModal() {
+  open.value = false;
+}
+
+/** 确认选择 */
+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"
+    destroy-on-close
+    title="盘点方案选择"
+    width="70%"
+    @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/wm/stocktaking/plan/components/stock-taking-plan-select.vue b/apps/web-ele/src/views/mes/wm/stocktaking/plan/components/stock-taking-plan-select.vue
new file mode 100644
index 000000000..7b116c992
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/stocktaking/plan/components/stock-taking-plan-select.vue
@@ -0,0 +1,135 @@
+<script lang="ts" setup>
+import type { MesWmStockTakingPlanApi } from '#/api/mes/wm/stocktaking/plan';
+
+import { computed, ref, useAttrs, watch } from 'vue';
+
+import { CircleX, Search } from '@vben/icons';
+
+import { ElInput, ElTooltip } from 'element-plus';
+
+import { getStockTakingPlan } from '#/api/mes/wm/stocktaking/plan';
+
+import StockTakingPlanSelectDialog from './stock-taking-plan-select-dialog.vue';
+
+defineOptions({ name: 'StockTakingPlanSelect', inheritAttrs: false });
+
+const props = withDefaults(
+  defineProps<{
+    clearable?: boolean;
+    disabled?: boolean;
+    modelValue?: number;
+    placeholder?: string;
+  }>(),
+  {
+    clearable: true,
+    disabled: false,
+    modelValue: undefined,
+    placeholder: '请选择盘点方案',
+  },
+);
+
+const emit = defineEmits<{
+  change: [item: MesWmStockTakingPlanApi.StockTakingPlan | undefined];
+  'update:modelValue': [value: number | undefined];
+}>();
+
+const attrs = useAttrs();
+const dialogRef = ref<InstanceType<typeof StockTakingPlanSelectDialog>>();
+const hovering = ref(false);
+const selectedItem = ref<MesWmStockTakingPlanApi.StockTakingPlan>();
+
+const displayLabel = computed(() => selectedItem.value?.name ?? '');
+
+const showClear = computed(
+  () =>
+    props.clearable &&
+    !props.disabled &&
+    hovering.value &&
+    props.modelValue != null,
+);
+
+/** 根据编号单条查询盘点方案信息（用于编辑回显） */
+async function resolveItemById(id: number | undefined) {
+  if (id == null) {
+    selectedItem.value = undefined;
+    return;
+  }
+  if (selectedItem.value?.id === id) {
+    return;
+  }
+  try {
+    selectedItem.value = await getStockTakingPlan(id);
+  } catch (error) {
+    console.error('[StockTakingPlanSelect] resolveItemById failed:', error);
+  }
+}
+
+watch(() => props.modelValue, resolveItemById, { immediate: true });
+
+/** 清空已选盘点方案 */
+function clearSelected() {
+  selectedItem.value = undefined;
+  emit('update:modelValue', undefined);
+  emit('change', undefined);
+}
+
+/** 打开盘点方案选择弹窗 */
+function handleClick(event: MouseEvent) {
+  if (props.disabled) {
+    return;
+  }
+  const target = event.target as HTMLElement;
+  if (showClear.value && target.closest('.el-input__suffix')) {
+    event.stopPropagation();
+    clearSelected();
+    return;
+  }
+  const selectedIds = props.modelValue == null ? [] : [props.modelValue];
+  dialogRef.value?.open(selectedIds, { multiple: false });
+}
+
+/** 弹窗选中回调 */
+function handleSelected(rows: MesWmStockTakingPlanApi.StockTakingPlan[]) {
+  const item = rows[0];
+  if (!item) {
+    return;
+  }
+  selectedItem.value = item;
+  emit('update:modelValue', item.id);
+  emit('change', item);
+}
+</script>
+
+<template>
+  <div
+    v-bind="attrs"
+    class="w-full"
+    :class="disabled ? 'cursor-not-allowed' : 'cursor-pointer'"
+    @click="handleClick"
+    @mouseenter="hovering = true"
+    @mouseleave="hovering = false"
+  >
+    <ElTooltip :disabled="!selectedItem" placement="top" :show-after="500">
+      <template #content>
+        <div v-if="selectedItem" class="leading-6">
+          <div>编码：{{ selectedItem.code || '-' }}</div>
+          <div>名称：{{ selectedItem.name || '-' }}</div>
+          <div>是否盲盘：{{ selectedItem.blindFlag ? '是' : '否' }}</div>
+          <div>是否冻结库存：{{ selectedItem.frozen ? '是' : '否' }}</div>
+        </div>
+      </template>
+      <ElInput
+        :disabled="disabled"
+        :model-value="displayLabel"
+        :placeholder="placeholder"
+        readonly
+      >
+        <template #suffix>
+          <CircleX v-if="showClear" class="size-4" />
+          <Search v-else class="size-4" />
+        </template>
+      </ElInput>
+    </ElTooltip>
+  </div>
+  <StockTakingPlanSelectDialog ref="dialogRef" @selected="handleSelected" />
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/stocktaking/plan/data.ts b/apps/web-ele/src/views/mes/wm/stocktaking/plan/data.ts
new file mode 100644
index 000000000..ba61b68cc
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/stocktaking/plan/data.ts
@@ -0,0 +1,388 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmStockTakingPlanApi } from '#/api/mes/wm/stocktaking/plan';
+import type { MesWmStockTakingPlanParamApi } from '#/api/mes/wm/stocktaking/plan/param';
+
+import { h } from 'vue';
+
+import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { ElButton } from 'element-plus';
+
+import { z } from '#/adapter/form';
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import {
+  MesAutoCodeRuleCode,
+  MesWmStockTakingTypeEnum,
+} from '#/views/mes/utils/constants';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
+/** 新增/修改的表单 */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '方案编码',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入方案编码',
+      },
+      rules: 'required',
+      suffix:
+        formType === 'detail'
+          ? undefined
+          : () =>
+              h(
+                ElButton,
+                {
+                  onClick: async () => {
+                    const code = await generateAutoCode(
+                      MesAutoCodeRuleCode.WM_STOCK_TAKING_PLAN_CODE,
+                    );
+                    await formApi?.setFieldValue('code', code);
+                  },
+                },
+                { default: () => '生成' },
+              ),
+    },
+    {
+      fieldName: 'name',
+      label: '方案名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入方案名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'type',
+      label: '盘点类型',
+      component: 'Select',
+      componentProps: {
+        options: getDictOptions(DICT_TYPE.MES_WM_STOCK_TAKING_TYPE, 'number'),
+        placeholder: '请选择盘点类型',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'startTime',
+      label: '开始时间',
+      component: 'DatePicker',
+      componentProps: {
+        placeholder: '请选择开始时间',
+        type: 'datetime',
+        valueFormat: 'x',
+      },
+      dependencies: {
+        triggerFields: ['type'],
+        show: (values) => values.type === MesWmStockTakingTypeEnum.DYNAMIC,
+      },
+    },
+    {
+      fieldName: 'endTime',
+      label: '结束时间',
+      component: 'DatePicker',
+      componentProps: {
+        placeholder: '请选择结束时间',
+        type: 'datetime',
+        valueFormat: 'x',
+      },
+      dependencies: {
+        triggerFields: ['type'],
+        show: (values) => values.type === MesWmStockTakingTypeEnum.DYNAMIC,
+      },
+    },
+    {
+      fieldName: 'blindFlag',
+      label: '是否盲盘',
+      component: 'Switch',
+      componentProps: {
+        activeText: '是',
+        inactiveText: '否',
+        inlinePrompt: true,
+      },
+      rules: z.boolean().default(false),
+    },
+    {
+      fieldName: 'frozen',
+      label: '冻结库存',
+      component: 'Switch',
+      componentProps: {
+        activeText: '是',
+        inactiveText: '否',
+        inlinePrompt: true,
+      },
+      rules: z.boolean().default(false),
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '方案编码',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入方案编码',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '方案名称',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入方案名称',
+      },
+    },
+    {
+      fieldName: 'type',
+      label: '盘点类型',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_WM_STOCK_TAKING_TYPE, 'number'),
+        placeholder: '请选择盘点类型',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(
+  onStatusChange?: (
+    newStatus: number,
+    row: MesWmStockTakingPlanApi.StockTakingPlan,
+  ) => Promise<boolean | undefined>,
+): VxeTableGridOptions<MesWmStockTakingPlanApi.StockTakingPlan>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '方案编码',
+      minWidth: 160,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '方案名称',
+      minWidth: 160,
+    },
+    {
+      field: 'type',
+      title: '盘点类型',
+      minWidth: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_STOCK_TAKING_TYPE },
+      },
+    },
+    {
+      field: 'startTime',
+      title: '开始时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      field: 'endTime',
+      title: '结束时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      field: 'blindFlag',
+      title: '是否盲盘',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+      },
+    },
+    {
+      field: 'frozen',
+      title: '是否冻结库存',
+      width: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+      },
+    },
+    {
+      field: 'status',
+      title: '状态',
+      width: 120,
+      cellRender: {
+        attrs: { beforeChange: onStatusChange },
+        name: 'CellSwitch',
+        props: {
+          activeValue: CommonStatusEnum.ENABLE,
+          inactiveValue: CommonStatusEnum.DISABLE,
+        },
+      },
+    },
+    {
+      title: '操作',
+      width: 160,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 盘点方案条件列表的字段 */
+export function useParamGridColumns(
+  editable = true,
+): VxeTableGridOptions<MesWmStockTakingPlanParamApi.StockTakingPlanParam>['columns'] {
+  return [
+    {
+      field: 'type',
+      title: '条件类型',
+      minWidth: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_STOCK_TAKING_PLAN_PARAM_TYPE },
+      },
+    },
+    {
+      field: 'valueCode',
+      title: '条件值编码',
+      minWidth: 140,
+    },
+    {
+      field: 'valueName',
+      title: '条件值名称',
+      minWidth: 160,
+    },
+    ...(editable
+      ? [
+          {
+            title: '操作',
+            width: 120,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 选择弹窗的搜索表单 */
+export function useSelectGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '方案编码',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入方案编码',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '方案名称',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入方案名称',
+      },
+    },
+    {
+      fieldName: 'type',
+      label: '盘点类型',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_WM_STOCK_TAKING_TYPE, 'number'),
+        placeholder: '请选择盘点类型',
+      },
+    },
+  ];
+}
+
+/** 选择弹窗的字段 */
+export function useSelectGridColumns(
+  multiple = true,
+): VxeTableGridOptions<MesWmStockTakingPlanApi.StockTakingPlan>['columns'] {
+  return [
+    {
+      type: multiple ? 'checkbox' : 'radio',
+      width: 50,
+    },
+    {
+      field: 'code',
+      title: '方案编码',
+      width: 200,
+    },
+    {
+      field: 'name',
+      title: '方案名称',
+      minWidth: 150,
+    },
+    {
+      field: 'type',
+      title: '盘点类型',
+      width: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_STOCK_TAKING_TYPE },
+      },
+    },
+    {
+      field: 'startTime',
+      title: '开始时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      field: 'endTime',
+      title: '结束时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      field: 'blindFlag',
+      title: '是否盲盘',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+      },
+    },
+    {
+      field: 'frozen',
+      title: '是否冻结库存',
+      width: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+      },
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/wm/stocktaking/plan/index.vue b/apps/web-ele/src/views/mes/wm/stocktaking/plan/index.vue
new file mode 100644
index 000000000..f4726d835
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/stocktaking/plan/index.vue
@@ -0,0 +1,184 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmStockTakingPlanApi } from '#/api/mes/wm/stocktaking/plan';
+
+import { confirm, DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { CommonStatusEnum } from '@vben/constants';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { ElButton, ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteStockTakingPlan,
+  exportStockTakingPlan,
+  getStockTakingPlanPage,
+  updateStockTakingPlanStatus,
+} from '#/api/mes/wm/stocktaking/plan';
+import { $t } from '#/locales';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建盘点方案 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看盘点方案 */
+function handleDetail(row: MesWmStockTakingPlanApi.StockTakingPlan) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑盘点方案 */
+function handleEdit(row: MesWmStockTakingPlanApi.StockTakingPlan) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 更新盘点方案状态 */
+async function handleStatusChange(
+  newStatus: number,
+  row: MesWmStockTakingPlanApi.StockTakingPlan,
+): Promise<boolean | undefined> {
+  try {
+    await confirm(
+      `确认要${newStatus === CommonStatusEnum.ENABLE ? '启用' : '停用'}"${row.name}"盘点方案吗？`,
+    );
+  } catch {
+    return false;
+  }
+  await updateStockTakingPlanStatus(row.id!, newStatus);
+  ElMessage.success($t('ui.actionMessage.operationSuccess'));
+  return true;
+}
+
+/** 删除盘点方案 */
+async function handleDelete(row: MesWmStockTakingPlanApi.StockTakingPlan) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.name]),
+  });
+  try {
+    await deleteStockTakingPlan(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.name]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportStockTakingPlan(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '盘点方案.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(handleStatusChange),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getStockTakingPlanPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmStockTakingPlanApi.StockTakingPlan>,
+});
+
+const StatusEnum = CommonStatusEnum;
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】库存盘点"
+        url="https://doc.iocoder.cn/mes/wm/stocktaking/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="盘点方案列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['盘点方案']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-stock-taking-plan:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:wm-stock-taking-plan:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <ElButton link type="primary" @click="handleDetail(row)">
+          {{ row.code }}
+        </ElButton>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:wm-stock-taking-plan:update'],
+              disabled: row.status !== StatusEnum.DISABLE,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm-stock-taking-plan:delete'],
+              disabled: row.status !== StatusEnum.DISABLE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.name]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/stocktaking/plan/modules/form.vue b/apps/web-ele/src/views/mes/wm/stocktaking/plan/modules/form.vue
new file mode 100644
index 000000000..35b10f582
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/stocktaking/plan/modules/form.vue
@@ -0,0 +1,126 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesWmStockTakingPlanApi } from '#/api/mes/wm/stocktaking/plan';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElDivider, ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createStockTakingPlan,
+  getStockTakingPlan,
+  updateStockTakingPlan,
+} from '#/api/mes/wm/stocktaking/plan';
+import { $t } from '#/locales';
+
+import { useFormSchema } from '../data';
+import ParamList from './param-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesWmStockTakingPlanApi.StockTakingPlan>();
+const isDetail = computed(() => formType.value === 'detail');
+const showParam = computed(
+  () =>
+    (formType.value === 'detail' || formType.value === 'update') &&
+    !!formData.value?.id,
+);
+const getTitle = computed(() => {
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['盘点方案']);
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['盘点方案'])
+    : $t('ui.actionTitle.create', ['盘点方案']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (isDetail.value) {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmStockTakingPlanApi.StockTakingPlan;
+    try {
+      if (formData.value?.id) {
+        await updateStockTakingPlan({ ...data, id: formData.value.id });
+        // 关闭并提示
+        await modalApi.close();
+        emit('success');
+        ElMessage.success($t('ui.actionMessage.operationSuccess'));
+      } else {
+        // 新增成功后切换为编辑态，继续维护盘点参数
+        const id = await createStockTakingPlan(data);
+        formData.value = { ...data, id };
+        await formApi.setFieldValue('id', id);
+        formType.value = 'update';
+        emit('success');
+        ElMessage.success($t('ui.actionMessage.operationSuccess'));
+      }
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
+    if (!data?.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getStockTakingPlan(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+    <!-- 编辑或详情时展示盘点参数 -->
+    <template v-if="showParam">
+      <ElDivider>盘点参数</ElDivider>
+      <div class="mx-4">
+        <ParamList :disabled="isDetail" :plan-id="formData!.id!" />
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/stocktaking/plan/modules/param-form.vue b/apps/web-ele/src/views/mes/wm/stocktaking/plan/modules/param-form.vue
new file mode 100644
index 000000000..57a6c9549
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/stocktaking/plan/modules/param-form.vue
@@ -0,0 +1,288 @@
+<script lang="ts" setup>
+import type { MesWmStockTakingPlanParamApi } from '#/api/mes/wm/stocktaking/plan/param';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import {
+  ElForm,
+  ElFormItem,
+  ElInput,
+  ElMessage,
+  ElOption,
+  ElSelect,
+} from 'element-plus';
+
+import {
+  createStockTakingPlanParam,
+  getStockTakingPlanParam,
+  updateStockTakingPlanParam,
+} from '#/api/mes/wm/stocktaking/plan/param';
+import { getWarehouseArea } from '#/api/mes/wm/warehouse/area';
+import { getWarehouseLocation } from '#/api/mes/wm/warehouse/location';
+import { $t } from '#/locales';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import { MesWmStockTakingParamTypeEnum } from '#/views/mes/utils/constants';
+import { WmBatchSelect } from '#/views/mes/wm/batch/components';
+import {
+  WmWarehouseAreaSelect,
+  WmWarehouseLocationSelect,
+  WmWarehouseSelect,
+} from '#/views/mes/wm/warehouse/components';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesWmStockTakingPlanParamApi.StockTakingPlanParam>({});
+const planId = ref<number>();
+const locationWarehouseId = ref<number>(); // 库区选择器临时数据：选仓库后传给库区选择器
+const areaWarehouseId = ref<number>(); // 库位选择器临时数据：选仓库后传给库区选择器
+const areaLocationId = ref<number>(); // 库位选择器临时数据：选库区后传给库位选择器
+
+const paramTypeOptions = getDictOptions(
+  DICT_TYPE.MES_WM_STOCK_TAKING_PLAN_PARAM_TYPE,
+  'number',
+).map(({ label, value }) => ({ label, value: Number(value) }));
+const qualityStatusOptions = getDictOptions(
+  DICT_TYPE.MES_WM_QUALITY_STATUS,
+  'string',
+).map(({ label, value }) => ({ label, value: String(value) }));
+
+const getTitle = computed(() =>
+  formData.value?.id
+    ? $t('ui.actionTitle.edit', ['盘点条件'])
+    : $t('ui.actionTitle.create', ['盘点条件']),
+);
+
+/** 条件类型变化：清空已选条件值和级联临时数据 */
+function handleTypeChange() {
+  formData.value.valueId = undefined;
+  formData.value.valueCode = '';
+  formData.value.valueName = '';
+  locationWarehouseId.value = undefined;
+  areaWarehouseId.value = undefined;
+  areaLocationId.value = undefined;
+}
+
+/** 通用选择器变化：回填条件值编码、名称 */
+function handleSelectorChange(item?: any) {
+  formData.value.valueId = item?.id;
+  formData.value.valueCode = item?.code || '';
+  formData.value.valueName = item?.name || item?.nickname || '';
+}
+
+/** 批次选择器变化 */
+function handleBatchChange(batch?: any) {
+  formData.value.valueId = batch?.id;
+  formData.value.valueCode = batch?.code || '';
+  formData.value.valueName = batch?.code || '';
+}
+
+/** 质量状态选择器变化：无实体编号，仅记录字典编码和文案 */
+function handleQualityStatusChange(value: any) {
+  const selected = qualityStatusOptions.find((item) => item.value === value);
+  formData.value.valueId = undefined;
+  formData.value.valueCode = value;
+  formData.value.valueName = selected?.label || '';
+}
+
+/** 库区仓库选择回调：清空库区 */
+function handleLocationWarehouseChange() {
+  formData.value.valueId = undefined;
+  formData.value.valueCode = '';
+  formData.value.valueName = '';
+}
+
+/** 库位仓库选择回调：清空库区和库位 */
+function handleAreaWarehouseChange() {
+  areaLocationId.value = undefined;
+  formData.value.valueId = undefined;
+  formData.value.valueCode = '';
+  formData.value.valueName = '';
+}
+
+/** 库位库区选择回调：清空库位 */
+function handleAreaLocationChange() {
+  formData.value.valueId = undefined;
+  formData.value.valueCode = '';
+  formData.value.valueName = '';
+}
+
+/** 编辑时回填级联选择器的上级数据（库区所属仓库、库位所属仓库/库区） */
+async function loadCascadeData() {
+  if (!formData.value.type || !formData.value.valueId) {
+    return;
+  }
+  const valueId = formData.value.valueId;
+  if (formData.value.type === MesWmStockTakingParamTypeEnum.LOCATION) {
+    const location = await getWarehouseLocation(valueId);
+    locationWarehouseId.value = location?.warehouseId;
+  } else if (formData.value.type === MesWmStockTakingParamTypeEnum.AREA) {
+    const area = await getWarehouseArea(valueId);
+    areaWarehouseId.value = area?.warehouseId;
+    areaLocationId.value = area?.locationId;
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (!formData.value.type) {
+      ElMessage.warning('请选择条件类型');
+      return;
+    }
+    // 质量状态校验 valueCode，其余类型校验 valueId
+    const valid =
+      formData.value.type === MesWmStockTakingParamTypeEnum.QUALITY_STATUS
+        ? !!formData.value.valueCode
+        : formData.value.valueId != null;
+    if (!valid) {
+      ElMessage.warning('请选择条件值');
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data = {
+      ...formData.value,
+      planId: planId.value,
+    } as MesWmStockTakingPlanParamApi.StockTakingPlanParam;
+    try {
+      await (formData.value.id
+        ? updateStockTakingPlanParam(data)
+        : createStockTakingPlanParam(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = {};
+      locationWarehouseId.value = undefined;
+      areaWarehouseId.value = undefined;
+      areaLocationId.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ id?: number; planId: number }>();
+    planId.value = data.planId;
+    if (!data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getStockTakingPlanParam(data.id);
+      await loadCascadeData();
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+
+const ParamTypeEnum = MesWmStockTakingParamTypeEnum;
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <ElForm class="mx-4" label-width="100px">
+      <ElFormItem label="条件类型" required>
+        <ElSelect
+          v-model="formData.type"
+          class="!w-full"
+          placeholder="请选择条件类型"
+          @change="handleTypeChange"
+        >
+          <ElOption
+            v-for="dict in paramTypeOptions"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </ElSelect>
+      </ElFormItem>
+      <ElFormItem v-if="formData.type" label="条件值" required>
+        <WmWarehouseSelect
+          v-if="formData.type === ParamTypeEnum.WAREHOUSE"
+          v-model="formData.valueId"
+          @change="handleSelectorChange"
+        />
+        <div
+          v-else-if="formData.type === ParamTypeEnum.LOCATION"
+          class="w-full space-y-2"
+        >
+          <WmWarehouseSelect
+            v-model="locationWarehouseId"
+            placeholder="请选择仓库"
+            @change="handleLocationWarehouseChange"
+          />
+          <WmWarehouseLocationSelect
+            v-if="locationWarehouseId"
+            v-model="formData.valueId"
+            placeholder="请选择库区"
+            :warehouse-id="locationWarehouseId"
+            @change="handleSelectorChange"
+          />
+        </div>
+        <div
+          v-else-if="formData.type === ParamTypeEnum.AREA"
+          class="w-full space-y-2"
+        >
+          <WmWarehouseSelect
+            v-model="areaWarehouseId"
+            placeholder="请选择仓库"
+            @change="handleAreaWarehouseChange"
+          />
+          <WmWarehouseLocationSelect
+            v-if="areaWarehouseId"
+            v-model="areaLocationId"
+            placeholder="请选择库区"
+            :warehouse-id="areaWarehouseId"
+            @change="handleAreaLocationChange"
+          />
+          <WmWarehouseAreaSelect
+            v-if="areaLocationId"
+            v-model="formData.valueId"
+            :location-id="areaLocationId"
+            placeholder="请选择库位"
+            @change="handleSelectorChange"
+          />
+        </div>
+        <MdItemSelect
+          v-else-if="formData.type === ParamTypeEnum.ITEM"
+          v-model="formData.valueId"
+          @change="handleSelectorChange"
+        />
+        <WmBatchSelect
+          v-else-if="formData.type === ParamTypeEnum.BATCH"
+          v-model="formData.valueId"
+          @change="handleBatchChange"
+        />
+        <ElSelect
+          v-else-if="formData.type === ParamTypeEnum.QUALITY_STATUS"
+          v-model="formData.valueCode"
+          class="!w-full"
+          placeholder="请选择质量状态"
+          @change="handleQualityStatusChange"
+        >
+          <ElOption
+            v-for="dict in qualityStatusOptions"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </ElSelect>
+      </ElFormItem>
+      <ElFormItem label="备注">
+        <ElInput
+          v-model="formData.remark"
+          placeholder="请输入备注"
+          :rows="3"
+          type="textarea"
+        />
+      </ElFormItem>
+    </ElForm>
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/stocktaking/plan/modules/param-list.vue b/apps/web-ele/src/views/mes/wm/stocktaking/plan/modules/param-list.vue
new file mode 100644
index 000000000..51354c2e0
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/stocktaking/plan/modules/param-list.vue
@@ -0,0 +1,131 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmStockTakingPlanParamApi } from '#/api/mes/wm/stocktaking/plan/param';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteStockTakingPlanParam,
+  getStockTakingPlanParamPage,
+} from '#/api/mes/wm/stocktaking/plan/param';
+import { $t } from '#/locales';
+
+import { useParamGridColumns } from '../data';
+import ParamForm from './param-form.vue';
+
+const props = defineProps<{
+  disabled: boolean; // 是否只读（详情态）
+  planId: number; // 所属方案编号
+}>();
+
+const [ParamFormModal, paramFormModalApi] = useVbenModal({
+  connectedComponent: ParamForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 添加条件 */
+function handleCreate() {
+  paramFormModalApi.setData({ planId: props.planId }).open();
+}
+
+/** 编辑条件 */
+function handleEdit(row: MesWmStockTakingPlanParamApi.StockTakingPlanParam) {
+  paramFormModalApi.setData({ id: row.id, planId: props.planId }).open();
+}
+
+/** 删除条件 */
+async function handleDelete(
+  row: MesWmStockTakingPlanParamApi.StockTakingPlanParam,
+) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.valueName]),
+  });
+  try {
+    await deleteStockTakingPlanParam(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.valueName]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useParamGridColumns(!props.disabled),
+    height: 320,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.planId) {
+            return { list: [], total: 0 };
+          }
+          return await getStockTakingPlanParamPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            planId: props.planId,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesWmStockTakingPlanParamApi.StockTakingPlanParam>,
+});
+</script>
+
+<template>
+  <div>
+    <ParamFormModal @success="handleRefresh" />
+    <Grid table-title="盘点参数">
+      <template v-if="!disabled" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '添加条件',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.valueName]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/stocktaking/task/data.ts b/apps/web-ele/src/views/mes/wm/stocktaking/task/data.ts
new file mode 100644
index 000000000..86b025d5a
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/stocktaking/task/data.ts
@@ -0,0 +1,584 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmStockTakingPlanApi } from '#/api/mes/wm/stocktaking/plan';
+import type { MesWmStockTakingTaskApi } from '#/api/mes/wm/stocktaking/task';
+import type { MesWmStockTakingTaskLineApi } from '#/api/mes/wm/stocktaking/task/line';
+import type { MesWmStockTakingResultApi } from '#/api/mes/wm/stocktaking/task/result';
+
+import { h, markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { ElButton } from 'element-plus';
+
+import { z } from '#/adapter/form';
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getSimpleUserList } from '#/api/system/user';
+import { getRangePickerDefaultProps } from '#/utils';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import {
+  MesAutoCodeRuleCode,
+  MesWmStockTakingTypeEnum,
+} from '#/views/mes/utils/constants';
+import { StockTakingPlanSelect } from '#/views/mes/wm/stocktaking/plan/components';
+import {
+  WmWarehouseAreaSelect,
+  WmWarehouseLocationSelect,
+  WmWarehouseSelect,
+} from '#/views/mes/wm/warehouse/components';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'execute' | 'submit' | 'update';
+
+/** 表单头部是否只读（提交、执行盘点、详情态） */
+function isHeaderReadonly(formType: FormType): boolean {
+  return (
+    formType === 'detail' ||
+    formType === 'execute' ||
+    formType === 'submit'
+  );
+}
+
+/** 新增/修改的表单 */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  const headerReadonly = isHeaderReadonly(formType);
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'status',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '任务编码',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入任务编码',
+      },
+      rules: 'required',
+      suffix: headerReadonly
+        ? undefined
+        : () =>
+            h(
+              ElButton,
+              {
+                onClick: async () => {
+                  const code = await generateAutoCode(
+                    MesAutoCodeRuleCode.WM_STOCK_TAKING_CODE,
+                  );
+                  await formApi?.setFieldValue('code', code);
+                },
+              },
+              { default: () => '生成' },
+            ),
+    },
+    {
+      fieldName: 'name',
+      label: '任务名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入任务名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'planId',
+      label: '盘点方案',
+      component: markRaw(StockTakingPlanSelect),
+      componentProps: {
+        // 选择盘点方案后，自动带出名称、类型、起止时间和盲盘/冻结配置
+        onChange: async (plan?: MesWmStockTakingPlanApi.StockTakingPlan) => {
+          if (!plan) {
+            return;
+          }
+          await formApi?.setValues({
+            blindFlag: !!plan.blindFlag,
+            endTime: plan.endTime,
+            frozen: !!plan.frozen,
+            name: plan.name,
+            startTime: plan.startTime,
+            type: plan.type,
+          });
+        },
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'type',
+      label: '盘点类型',
+      component: 'Select',
+      componentProps: {
+        options: getDictOptions(DICT_TYPE.MES_WM_STOCK_TAKING_TYPE, 'number'),
+        placeholder: '请选择盘点类型',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'startTime',
+      label: '开始时间',
+      component: 'DatePicker',
+      componentProps: {
+        placeholder: '请选择开始时间',
+        type: 'datetime',
+        valueFormat: 'x',
+      },
+      dependencies: {
+        triggerFields: ['type'],
+        show: (values) => values.type === MesWmStockTakingTypeEnum.DYNAMIC,
+      },
+    },
+    {
+      fieldName: 'endTime',
+      label: '结束时间',
+      component: 'DatePicker',
+      componentProps: {
+        placeholder: '请选择结束时间',
+        type: 'datetime',
+        valueFormat: 'x',
+      },
+      dependencies: {
+        triggerFields: ['type'],
+        show: (values) => values.type === MesWmStockTakingTypeEnum.DYNAMIC,
+      },
+    },
+    {
+      fieldName: 'takingDate',
+      label: '盘点日期',
+      component: 'DatePicker',
+      componentProps: {
+        placeholder: '请选择盘点日期',
+        type: 'date',
+        valueFormat: 'YYYY-MM-DD',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'blindFlag',
+      label: '是否盲盘',
+      component: 'Switch',
+      componentProps: {
+        activeText: '是',
+        inactiveText: '否',
+        inlinePrompt: true,
+      },
+      rules: z.boolean().default(false),
+    },
+    {
+      fieldName: 'frozen',
+      label: '是否冻结库存',
+      component: 'Switch',
+      componentProps: {
+        activeText: '是',
+        inactiveText: '否',
+        inlinePrompt: true,
+      },
+      rules: z.boolean().default(false),
+    },
+    {
+      fieldName: 'userId',
+      label: '盘点人',
+      component: 'ApiSelect',
+      componentProps: {
+        api: getSimpleUserList,
+        clearable: true,
+        labelField: 'nickname',
+        placeholder: '请选择盘点人',
+        valueField: 'id',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'type',
+      label: '盘点类型',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_WM_STOCK_TAKING_TYPE, 'number'),
+        placeholder: '请选择盘点类型',
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '任务编码',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入任务编码',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '任务名称',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入任务名称',
+      },
+    },
+    {
+      fieldName: 'takingDate',
+      label: '盘点日期',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+        clearable: true,
+      },
+    },
+    {
+      fieldName: 'status',
+      label: '单据状态',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(
+          DICT_TYPE.MES_WM_STOCK_TAKING_TASK_STATUS,
+          'number',
+        ),
+        placeholder: '请选择单据状态',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesWmStockTakingTaskApi.StockTakingTask>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '任务编码',
+      minWidth: 160,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '任务名称',
+      minWidth: 160,
+    },
+    {
+      field: 'type',
+      title: '盘点类型',
+      minWidth: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_STOCK_TAKING_TYPE },
+      },
+    },
+    {
+      field: 'planName',
+      title: '盘点方案',
+      minWidth: 180,
+    },
+    {
+      field: 'takingDate',
+      title: '盘点日期',
+      minWidth: 180,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'userNickname',
+      title: '盘点人',
+      minWidth: 120,
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      minWidth: 110,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_STOCK_TAKING_TASK_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 280,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 盘点任务行列表的字段 */
+export function useLineGridColumns(
+  editable = true,
+): VxeTableGridOptions<MesWmStockTakingTaskLineApi.StockTakingTaskLine>['columns'] {
+  return [
+    {
+      field: 'itemCode',
+      title: '物料编码',
+      minWidth: 140,
+    },
+    {
+      field: 'itemName',
+      title: '物料名称',
+      minWidth: 160,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 90,
+    },
+    {
+      field: 'batchCode',
+      title: '批次号',
+      minWidth: 120,
+    },
+    {
+      field: 'quantity',
+      title: '在库数量',
+      width: 120,
+    },
+    {
+      field: 'warehouseName',
+      title: '仓库',
+      minWidth: 120,
+    },
+    {
+      field: 'locationName',
+      title: '库区',
+      minWidth: 120,
+    },
+    {
+      field: 'areaName',
+      title: '库位',
+      minWidth: 120,
+    },
+    {
+      field: 'status',
+      title: '状态',
+      minWidth: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_STOCK_TAKING_LINE_STATUS },
+      },
+    },
+    ...(editable
+      ? [
+          {
+            title: '操作',
+            width: 80,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 盘点结果列表的字段 */
+export function useResultGridColumns(
+  editable = true,
+): VxeTableGridOptions<MesWmStockTakingResultApi.StockTakingResult>['columns'] {
+  return [
+    {
+      field: 'itemCode',
+      title: '产品物料编码',
+      minWidth: 140,
+    },
+    {
+      field: 'itemName',
+      title: '产品物料名称',
+      minWidth: 160,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位名称',
+      width: 90,
+    },
+    {
+      field: 'warehouseName',
+      title: '仓库',
+      minWidth: 120,
+    },
+    {
+      field: 'locationName',
+      title: '库区',
+      minWidth: 120,
+    },
+    {
+      field: 'areaName',
+      title: '库位',
+      minWidth: 120,
+    },
+    {
+      field: 'quantity',
+      title: '数量',
+      minWidth: 120,
+    },
+    {
+      field: 'takingQuantity',
+      title: '盘点数量',
+      minWidth: 120,
+    },
+    ...(editable
+      ? [
+          {
+            title: '操作',
+            width: 160,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 盘点结果新增/修改的表单 */
+export function useResultFormSchema(
+  formApi?: VbenFormApi,
+  taskLines: MesWmStockTakingTaskLineApi.StockTakingTaskLine[] = [],
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'lineId',
+      label: '盘点清单',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        // 选择盘点清单后，自动带出物料、批次和仓储位置信息
+        onChange: async (lineId?: number) => {
+          const line = taskLines.find((item) => item.id === lineId);
+          await formApi?.setValues({
+            areaId: line?.areaId,
+            batchCode: line?.batchCode,
+            itemId: line?.itemId,
+            locationId: line?.locationId,
+            materialStockId: line?.materialStockId,
+            warehouseId: line?.warehouseId,
+          });
+        },
+        options: taskLines.map((line) => ({
+          label: `${line.itemCode} - ${line.itemName} (${line.warehouseName}${
+            line.locationName ? ` / ${line.locationName}` : ''
+          }${line.areaName ? ` / ${line.areaName}` : ''})`,
+          value: line.id,
+        })),
+        placeholder: '请选择盘点清单（可选）',
+      },
+      formItemClass: 'col-span-3',
+    },
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择物料',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次编码',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入批次编码',
+      },
+    },
+    {
+      fieldName: 'takingQuantity',
+      label: '盘点数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        placeholder: '请输入盘点数量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'warehouseId',
+      label: '仓库',
+      component: markRaw(WmWarehouseSelect),
+      componentProps: {
+        // 仓库变化时清空库区和库位
+        onChange: () =>
+          formApi?.setValues({
+            areaId: undefined,
+            locationId: undefined,
+          }),
+        placeholder: '请选择仓库',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'locationId',
+      label: '库区',
+      component: markRaw(WmWarehouseLocationSelect),
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['warehouseId'],
+        show: (values) => !!values.warehouseId,
+        componentProps: (values) => ({
+          onChange: () => formApi?.setFieldValue('areaId', undefined),
+          placeholder: '请选择库区',
+          warehouseId: values.warehouseId,
+        }),
+      },
+    },
+    {
+      fieldName: 'areaId',
+      label: '库位',
+      component: markRaw(WmWarehouseAreaSelect),
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['locationId'],
+        show: (values) => !!values.locationId,
+        componentProps: (values) => ({
+          locationId: values.locationId,
+          placeholder: '请选择库位',
+        }),
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/wm/stocktaking/task/index.vue b/apps/web-ele/src/views/mes/wm/stocktaking/task/index.vue
new file mode 100644
index 000000000..4f6e3c2f8
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/stocktaking/task/index.vue
@@ -0,0 +1,211 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmStockTakingTaskApi } from '#/api/mes/wm/stocktaking/task';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { ElButton, ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  cancelStockTaking,
+  deleteStockTaking,
+  exportStockTaking,
+  getStockTakingPage,
+} from '#/api/mes/wm/stocktaking/task';
+import { $t } from '#/locales';
+import { MesWmStockTakingTaskStatusEnum } from '#/views/mes/utils/constants';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建盘点任务 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看盘点任务 */
+function handleDetail(row: MesWmStockTakingTaskApi.StockTakingTask) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑盘点任务 */
+function handleEdit(row: MesWmStockTakingTaskApi.StockTakingTask) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 提交盘点任务 */
+function handleSubmit(row: MesWmStockTakingTaskApi.StockTakingTask) {
+  formModalApi.setData({ formType: 'submit', id: row.id }).open();
+}
+
+/** 执行盘点 */
+function handleExecute(row: MesWmStockTakingTaskApi.StockTakingTask) {
+  formModalApi.setData({ formType: 'execute', id: row.id }).open();
+}
+
+/** 取消盘点任务 */
+async function handleCancel(row: MesWmStockTakingTaskApi.StockTakingTask) {
+  await cancelStockTaking(row.id!);
+  ElMessage.success('取消成功');
+  handleRefresh();
+}
+
+/** 删除盘点任务 */
+async function handleDelete(row: MesWmStockTakingTaskApi.StockTakingTask) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.code]),
+  });
+  try {
+    await deleteStockTaking(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportStockTaking(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '盘点任务.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getStockTakingPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmStockTakingTaskApi.StockTakingTask>,
+});
+
+const StatusEnum = MesWmStockTakingTaskStatusEnum;
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】库存盘点"
+        url="https://doc.iocoder.cn/mes/wm/stocktaking/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="盘点任务列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['盘点任务']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-stock-taking-task:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:wm-stock-taking-task:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <ElButton link type="primary" @click="handleDetail(row)">
+          {{ row.code }}
+        </ElButton>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:wm-stock-taking-task:update'],
+              ifShow: row.status === StatusEnum.PREPARE,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: '提交',
+              type: 'primary',
+              link: true,
+              auth: ['mes:wm-stock-taking-task:update'],
+              ifShow: row.status === StatusEnum.PREPARE,
+              onClick: handleSubmit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm-stock-taking-task:delete'],
+              ifShow: row.status === StatusEnum.PREPARE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '执行盘点',
+              type: 'primary',
+              link: true,
+              auth: ['mes:wm-stock-taking-task:update'],
+              ifShow: row.status === StatusEnum.APPROVING,
+              onClick: handleExecute.bind(null, row),
+            },
+            {
+              label: '取消',
+              type: 'danger',
+              link: true,
+              auth: ['mes:wm-stock-taking-task:update'],
+              ifShow: row.status === StatusEnum.APPROVING,
+              popConfirm: {
+                title: '确认取消该盘点任务？取消后不可恢复。',
+                confirm: handleCancel.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/stocktaking/task/modules/form.vue b/apps/web-ele/src/views/mes/wm/stocktaking/task/modules/form.vue
new file mode 100644
index 000000000..9a37e207c
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/stocktaking/task/modules/form.vue
@@ -0,0 +1,237 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesWmStockTakingTaskApi } from '#/api/mes/wm/stocktaking/task';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+import { useUserStore } from '@vben/stores';
+
+import { ElButton, ElMessage, ElPopconfirm, ElTabPane, ElTabs } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createStockTaking,
+  finishStockTaking,
+  getStockTaking,
+  submitStockTaking,
+  updateStockTaking,
+} from '#/api/mes/wm/stocktaking/task';
+import { $t } from '#/locales';
+import { MesWmStockTakingTaskStatusEnum } from '#/views/mes/utils/constants';
+
+import { useFormSchema } from '../data';
+import LineList from './line-list.vue';
+import ResultList from './result-list.vue';
+
+const emit = defineEmits(['success']);
+const userStore = useUserStore();
+const formType = ref<FormType>('create');
+const formData = ref<MesWmStockTakingTaskApi.StockTakingTask>();
+const subTabsName = ref('lines'); // 子表当前 tab
+const originalSnapshot = ref(''); // 表单原始数据快照，用于提交时跳过未变更的保存请求
+
+const isEditable = computed(() =>
+  ['create', 'update'].includes(formType.value),
+);
+const isExecute = computed(() => formType.value === 'execute'); // 是否执行盘点模式
+const isSubmit = computed(() => formType.value === 'submit'); // 是否提交模式
+const canSubmit = computed(
+  () =>
+    formType.value === 'update' &&
+    formData.value?.status === MesWmStockTakingTaskStatusEnum.PREPARE,
+);
+const showLineTab = computed(() => !formData.value?.blindFlag); // 盲盘不展示盘点清单
+const showResultTab = computed(
+  () =>
+    isExecute.value ||
+    (!!formData.value?.status &&
+      formData.value.status !== MesWmStockTakingTaskStatusEnum.PREPARE),
+);
+const getTitle = computed(() => {
+  switch (formType.value) {
+    case 'detail': {
+      return $t('ui.actionTitle.view', ['盘点任务']);
+    }
+    case 'execute': {
+      return '执行盘点';
+    }
+    case 'submit': {
+      return '提交盘点任务';
+    }
+    case 'update': {
+      return $t('ui.actionTitle.edit', ['盘点任务']);
+    }
+    default: {
+      return $t('ui.actionTitle.create', ['盘点任务']);
+    }
+  }
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+/** 提交盘点任务：表单有修改时先保存，再调用提交接口 */
+async function handleSubmit() {
+  const { valid } = await formApi.validate();
+  if (!valid || !formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    const current = JSON.stringify(await formApi.getValues());
+    if (current !== originalSnapshot.value) {
+      const data =
+        (await formApi.getValues()) as MesWmStockTakingTaskApi.StockTakingTask;
+      await updateStockTaking({ ...formData.value, ...data });
+      originalSnapshot.value = current;
+    }
+    await submitStockTaking(formData.value.id);
+    ElMessage.success('提交成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 执行盘点 */
+async function handleExecute() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await finishStockTaking(formData.value.id);
+    ElMessage.success('执行盘点成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (!isEditable.value) {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmStockTakingTaskApi.StockTakingTask;
+    try {
+      if (formData.value?.id) {
+        await updateStockTaking({ ...formData.value, ...data });
+        formData.value = { ...formData.value, ...data };
+      } else {
+        const id = await createStockTaking(data);
+        formData.value = {
+          ...data,
+          id,
+          status: MesWmStockTakingTaskStatusEnum.PREPARE,
+        };
+        await formApi.setFieldValue('id', id);
+        await formApi.setFieldValue('status', formData.value.status);
+        formType.value = 'update';
+      }
+      originalSnapshot.value = JSON.stringify(await formApi.getValues());
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      originalSnapshot.value = '';
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    subTabsName.value = data.formType === 'execute' ? 'results' : 'lines';
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    formApi.setDisabled(!isEditable.value);
+    modalApi.setState({ showConfirmButton: isEditable.value });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getStockTaking(data.id);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    } else {
+      // 新建时默认盘点人为当前登录用户
+      await formApi.setFieldValue('userId', userStore.userInfo?.id);
+    }
+    originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-4/5">
+    <Form class="mx-4" />
+    <ElTabs
+      v-if="formData?.id"
+      v-model="subTabsName"
+      class="mx-4 mt-4"
+      type="border-card"
+    >
+      <ElTabPane v-if="showLineTab" label="盘点清单" name="lines">
+        <LineList :form-type="formType" :task-id="formData.id" />
+      </ElTabPane>
+      <ElTabPane v-if="showResultTab" label="盘点结果" name="results">
+        <ResultList
+          :form-type="isExecute ? 'execute' : 'detail'"
+          :task-id="formData.id"
+        />
+      </ElTabPane>
+    </ElTabs>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <ElPopconfirm
+          v-if="canSubmit || isSubmit"
+          title="确认提交该盘点任务？【提交后将不能修改】"
+          width="240"
+          @confirm="handleSubmit"
+        >
+          <template #reference>
+            <ElButton type="primary">提交</ElButton>
+          </template>
+        </ElPopconfirm>
+        <ElPopconfirm
+          v-if="isExecute"
+          title="确认执行盘点操作？"
+          width="240"
+          @confirm="handleExecute"
+        >
+          <template #reference>
+            <ElButton type="primary">执行盘点</ElButton>
+          </template>
+        </ElPopconfirm>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/stocktaking/task/modules/line-list.vue b/apps/web-ele/src/views/mes/wm/stocktaking/task/modules/line-list.vue
new file mode 100644
index 000000000..84fe7be43
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/stocktaking/task/modules/line-list.vue
@@ -0,0 +1,147 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmMaterialStockApi } from '#/api/mes/wm/materialstock';
+import type { MesWmStockTakingTaskLineApi } from '#/api/mes/wm/stocktaking/task/line';
+
+import { computed, ref } from 'vue';
+
+import { ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  createStockTakingTaskLine,
+  deleteStockTakingTaskLine,
+  getStockTakingTaskLinePage,
+} from '#/api/mes/wm/stocktaking/task/line';
+import { $t } from '#/locales';
+import { WmMaterialStockSelectDialog } from '#/views/mes/wm/materialstock/components';
+
+import { type FormType, useLineGridColumns } from '../data';
+
+const props = defineProps<{
+  formType: FormType;
+  taskId: number;
+}>();
+
+const isEditable = computed(() => props.formType === 'update'); // 仅编辑态可维护盘点清单
+
+const dialogRef = ref<InstanceType<typeof WmMaterialStockSelectDialog>>();
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 打开库存选择弹窗批量添加物料 */
+function handleAdd() {
+  dialogRef.value?.open([], { multiple: true });
+}
+
+/** 库存选择确认回调：将选中的库存记录批量创建为盘点行 */
+async function handleStockSelected(rows: MesWmMaterialStockApi.MaterialStock[]) {
+  if (rows.length === 0) {
+    return;
+  }
+  for (const stock of rows) {
+    await createStockTakingTaskLine({
+      areaId: stock.areaId,
+      batchId: stock.batchId,
+      itemId: stock.itemId,
+      locationId: stock.locationId,
+      materialStockId: stock.id,
+      quantity: stock.quantity,
+      taskId: props.taskId,
+      warehouseId: stock.warehouseId,
+    });
+  }
+  ElMessage.success(`成功添加 ${rows.length} 条盘点行`);
+  handleRefresh();
+}
+
+/** 删除盘点行 */
+async function handleDelete(
+  row: MesWmStockTakingTaskLineApi.StockTakingTaskLine,
+) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.itemName]),
+  });
+  try {
+    await deleteStockTakingTaskLine(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.itemName]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useLineGridColumns(isEditable.value),
+    height: 360,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.taskId) {
+            return { list: [], total: 0 };
+          }
+          return await getStockTakingTaskLinePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            taskId: props.taskId,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesWmStockTakingTaskLineApi.StockTakingTaskLine>,
+});
+
+defineExpose({ refresh: handleRefresh });
+</script>
+
+<template>
+  <div>
+    <WmMaterialStockSelectDialog
+      ref="dialogRef"
+      @selected="handleStockSelected"
+    />
+    <Grid table-title="盘点清单">
+      <template v-if="isEditable" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '添加物料',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-stock-taking-task:update'],
+              onClick: handleAdd,
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.itemName]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/stocktaking/task/modules/result-form.vue b/apps/web-ele/src/views/mes/wm/stocktaking/task/modules/result-form.vue
new file mode 100644
index 000000000..ee9ad9e6e
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/stocktaking/task/modules/result-form.vue
@@ -0,0 +1,107 @@
+<script lang="ts" setup>
+import type { MesWmStockTakingResultApi } from '#/api/mes/wm/stocktaking/task/result';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import { getStockTakingTaskLineSimpleList } from '#/api/mes/wm/stocktaking/task/line';
+import {
+  createStockTakingResult,
+  getStockTakingResult,
+  updateStockTakingResult,
+} from '#/api/mes/wm/stocktaking/task/result';
+import { $t } from '#/locales';
+
+import { useResultFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesWmStockTakingResultApi.StockTakingResult>();
+const taskId = ref<number>();
+const isExecute = ref(false); // 是否执行盘点模式（可选择盘点清单回填）
+
+const getTitle = computed(() =>
+  formData.value?.id
+    ? $t('ui.actionTitle.edit', ['盘点结果'])
+    : $t('ui.actionTitle.create', ['盘点结果']),
+);
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 100,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmStockTakingResultApi.StockTakingResult;
+    data.taskId = taskId.value;
+    try {
+      await (formData.value?.id
+        ? updateStockTakingResult({ ...data, id: formData.value.id })
+        : createStockTakingResult(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{
+      execute?: boolean;
+      id?: number;
+      taskId: number;
+    }>();
+    taskId.value = data.taskId;
+    isExecute.value = !!data.execute;
+    // 执行盘点模式：加载盘点清单作为可选项，供选择后回填
+    const taskLines =
+      isExecute.value && !data.id
+        ? await getStockTakingTaskLineSimpleList(data.taskId)
+        : [];
+    formApi.setState({ schema: useResultFormSchema(formApi, taskLines) });
+    if (!data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getStockTakingResult(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/stocktaking/task/modules/result-list.vue b/apps/web-ele/src/views/mes/wm/stocktaking/task/modules/result-list.vue
new file mode 100644
index 000000000..bea93af45
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/stocktaking/task/modules/result-list.vue
@@ -0,0 +1,140 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmStockTakingResultApi } from '#/api/mes/wm/stocktaking/task/result';
+
+import { computed } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteStockTakingResult,
+  getStockTakingResultPage,
+} from '#/api/mes/wm/stocktaking/task/result';
+import { $t } from '#/locales';
+
+import { useResultGridColumns } from '../data';
+import ResultForm from './result-form.vue';
+
+const props = defineProps<{
+  formType: 'detail' | 'execute';
+  taskId: number;
+}>();
+
+const isExecute = computed(() => props.formType === 'execute'); // 执行盘点态可维护盘点结果
+
+const [ResultFormModal, resultFormModalApi] = useVbenModal({
+  connectedComponent: ResultForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 新增盘点结果 */
+function handleCreate() {
+  resultFormModalApi
+    .setData({ execute: true, taskId: props.taskId })
+    .open();
+}
+
+/** 编辑盘点结果 */
+function handleEdit(row: MesWmStockTakingResultApi.StockTakingResult) {
+  resultFormModalApi.setData({ id: row.id, taskId: props.taskId }).open();
+}
+
+/** 删除盘点结果 */
+async function handleDelete(
+  row: MesWmStockTakingResultApi.StockTakingResult,
+) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.itemName]),
+  });
+  try {
+    await deleteStockTakingResult(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.itemName]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useResultGridColumns(isExecute.value),
+    height: 360,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.taskId) {
+            return { list: [], total: 0 };
+          }
+          return await getStockTakingResultPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            taskId: props.taskId,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesWmStockTakingResultApi.StockTakingResult>,
+});
+
+defineExpose({ refresh: handleRefresh });
+</script>
+
+<template>
+  <div>
+    <ResultFormModal @success="handleRefresh" />
+    <Grid table-title="盘点结果">
+      <template v-if="isExecute" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.create'),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-stock-taking-task:update'],
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.itemName]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index deb73380f..9ebcbce27 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -132,6 +132,7 @@ catalog:
   czg: ^1.13.1
   dayjs: ^1.11.20
   defu: ^6.1.7
+  dhtmlx-gantt: ^9.1.1
   diagram-js: ^12.8.1
   dotenv: ^17.4.2
   echarts: ^6.1.0

From 79af870afef470a85a5ecb256c0746962b47481f Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 30 May 2026 09:16:33 +0800
Subject: [PATCH 34/52] =?UTF-8?q?feat(mes):=20=E6=8F=90=E4=BA=A4=20wm=20ou?=
 =?UTF-8?q?tsource=20=E7=9B=B8=E5=85=B3=E7=9A=84=E8=BF=81=E7=A7=BB?=
 =?UTF-8?q?=EF=BC=88=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/api/mes/pro/card/index.ts   |  35 ++
 .../src/api/mes/pro/card/process/index.ts     |  62 +++
 apps/web-antd/src/api/mes/pro/task/index.ts   |  27 ++
 .../src/api/mes/pro/workorder/bom/index.ts    |  62 +++
 .../src/api/mes/pro/workorder/index.ts        |  84 +++-
 .../api/mes/wm/outsourcereceipt/line/index.ts |   1 +
 .../web-antd/src/router/routes/modules/mes.ts |   9 +
 .../web-antd/src/views/mes/utils/constants.ts |   6 +
 .../mes/wm/outsourceissue/modules/form.vue    |  29 +-
 .../wm/outsourceissue/modules/line-list.vue   |   5 +-
 .../outsourcereceipt/modules/detail-list.vue  |   7 +-
 .../mes/wm/outsourcereceipt/modules/form.vue  |  28 +-
 .../wm/outsourcereceipt/modules/line-form.vue |   1 -
 .../wm/outsourcereceipt/modules/line-list.vue |   4 +-
 .../stocktaking/plan/modules/param-list.vue   | 131 ++++++
 .../api/mes/wm/outsourcereceipt/line/index.ts |   1 +
 apps/web-ele/src/views/mes/pro/card/data.ts   | 424 +++++++++++++++++-
 .../mes/pro/workorder/components/index.ts     |   1 +
 .../components/pro-work-order-select.vue      | 192 ++++----
 .../mes/wm/outsourceissue/modules/form.vue    |  27 +-
 .../wm/outsourceissue/modules/line-list.vue   |   4 +-
 .../outsourcereceipt/modules/detail-list.vue  |   6 +-
 .../mes/wm/outsourcereceipt/modules/form.vue  |  27 +-
 .../wm/outsourcereceipt/modules/line-list.vue |   4 +-
 24 files changed, 970 insertions(+), 207 deletions(-)
 create mode 100644 apps/web-antd/src/api/mes/pro/card/process/index.ts
 create mode 100644 apps/web-antd/src/api/mes/pro/workorder/bom/index.ts
 create mode 100644 apps/web-antd/src/views/mes/wm/stocktaking/plan/modules/param-list.vue

diff --git a/apps/web-antd/src/api/mes/pro/card/index.ts b/apps/web-antd/src/api/mes/pro/card/index.ts
index 06c6cb04f..a9d123cc3 100644
--- a/apps/web-antd/src/api/mes/pro/card/index.ts
+++ b/apps/web-antd/src/api/mes/pro/card/index.ts
@@ -42,3 +42,38 @@ export function getCardPage(params: MesProCardApi.PageParams) {
 export function getCard(id: number) {
   return requestClient.get<MesProCardApi.Card>(`/mes/pro/card/get?id=${id}`);
 }
+
+/** 新增生产流转卡 */
+export function createCard(data: MesProCardApi.Card) {
+  return requestClient.post<number>('/mes/pro/card/create', data);
+}
+
+/** 修改生产流转卡 */
+export function updateCard(data: MesProCardApi.Card) {
+  return requestClient.put('/mes/pro/card/update', data);
+}
+
+/** 删除生产流转卡 */
+export function deleteCard(id: number) {
+  return requestClient.delete(`/mes/pro/card/delete?id=${id}`);
+}
+
+/** 导出生产流转卡 */
+export function exportCard(params: any) {
+  return requestClient.download('/mes/pro/card/export-excel', { params });
+}
+
+/** 提交生产流转卡 */
+export function submitCard(id: number) {
+  return requestClient.put(`/mes/pro/card/submit?id=${id}`);
+}
+
+/** 完成生产流转卡 */
+export function finishCard(id: number) {
+  return requestClient.put(`/mes/pro/card/finish?id=${id}`);
+}
+
+/** 取消生产流转卡 */
+export function cancelCard(id: number) {
+  return requestClient.put(`/mes/pro/card/cancel?id=${id}`);
+}
diff --git a/apps/web-antd/src/api/mes/pro/card/process/index.ts b/apps/web-antd/src/api/mes/pro/card/process/index.ts
new file mode 100644
index 000000000..a6f372fe2
--- /dev/null
+++ b/apps/web-antd/src/api/mes/pro/card/process/index.ts
@@ -0,0 +1,62 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesProCardProcessApi {
+  /** MES 流转卡工序记录 */
+  export interface CardProcess {
+    id?: number; // 编号
+    cardId?: number; // 流转卡编号
+    sort?: number; // 序号
+    processId?: number; // 工序编号
+    processCode?: string; // 工序编码
+    processName?: string; // 工序名称
+    inputTime?: number; // 进入工序时间
+    outputTime?: number; // 出工序时间
+    inputQuantity?: number; // 投入数量
+    outputQuantity?: number; // 产出数量
+    unqualifiedQuantity?: number; // 不合格品数量
+    workstationId?: number; // 工位编号
+    workstationCode?: string; // 工位编码
+    workstationName?: string; // 工位名称
+    userId?: number; // 操作人编号
+    nickname?: string; // 操作人名称
+    ipqcId?: number; // 过程检验单编号
+    remark?: string; // 备注
+  }
+
+  /** MES 流转卡工序记录分页查询参数 */
+  export interface PageParams extends PageParam {
+    cardId?: number;
+  }
+}
+
+/** 查询流转卡工序记录分页 */
+export function getCardProcessPage(params: MesProCardProcessApi.PageParams) {
+  return requestClient.get<PageResult<MesProCardProcessApi.CardProcess>>(
+    '/mes/pro/card-process/page',
+    { params },
+  );
+}
+
+/** 查询流转卡工序记录详情 */
+export function getCardProcess(id: number) {
+  return requestClient.get<MesProCardProcessApi.CardProcess>(
+    `/mes/pro/card-process/get?id=${id}`,
+  );
+}
+
+/** 新增流转卡工序记录 */
+export function createCardProcess(data: MesProCardProcessApi.CardProcess) {
+  return requestClient.post('/mes/pro/card-process/create', data);
+}
+
+/** 修改流转卡工序记录 */
+export function updateCardProcess(data: MesProCardProcessApi.CardProcess) {
+  return requestClient.put('/mes/pro/card-process/update', data);
+}
+
+/** 删除流转卡工序记录 */
+export function deleteCardProcess(id: number) {
+  return requestClient.delete(`/mes/pro/card-process/delete?id=${id}`);
+}
diff --git a/apps/web-antd/src/api/mes/pro/task/index.ts b/apps/web-antd/src/api/mes/pro/task/index.ts
index d7bfd2f5e..5e160c840 100644
--- a/apps/web-antd/src/api/mes/pro/task/index.ts
+++ b/apps/web-antd/src/api/mes/pro/task/index.ts
@@ -48,6 +48,8 @@ export namespace MesProTaskApi {
     name?: string;
     workOrderId?: number;
     workstationId?: number;
+    routeId?: number;
+    processId?: number;
     itemId?: number;
     statuses?: number[];
     status?: number;
@@ -66,3 +68,28 @@ export function getTaskPage(params: MesProTaskApi.PageParams) {
 export function getTask(id: number) {
   return requestClient.get<MesProTaskApi.Task>(`/mes/pro/task/get?id=${id}`);
 }
+
+/** 新增生产任务 */
+export function createTask(data: MesProTaskApi.Task) {
+  return requestClient.post('/mes/pro/task/create', data);
+}
+
+/** 修改生产任务 */
+export function updateTask(data: MesProTaskApi.Task) {
+  return requestClient.put('/mes/pro/task/update', data);
+}
+
+/** 删除生产任务 */
+export function deleteTask(id: number) {
+  return requestClient.delete(`/mes/pro/task/delete?id=${id}`);
+}
+
+/** 导出生产任务 */
+export function exportTask(params: any) {
+  return requestClient.download('/mes/pro/task/export-excel', { params });
+}
+
+/** 查询甘特图任务列表（非分页） */
+export function getGanttTaskList(params: any) {
+  return requestClient.get<any[]>('/mes/pro/task/gantt-list', { params });
+}
diff --git a/apps/web-antd/src/api/mes/pro/workorder/bom/index.ts b/apps/web-antd/src/api/mes/pro/workorder/bom/index.ts
new file mode 100644
index 000000000..f04ef761c
--- /dev/null
+++ b/apps/web-antd/src/api/mes/pro/workorder/bom/index.ts
@@ -0,0 +1,62 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesProWorkOrderBomApi {
+  /** MES 生产工单 BOM */
+  export interface WorkOrderBom {
+    id?: number; // 编号
+    workOrderId?: number; // 生产工单编号
+    itemId?: number; // BOM 物料编号
+    itemName?: string; // 物料名称
+    itemCode?: string; // 物料编码
+    itemSpecification?: string; // 规格型号
+    unitMeasureId?: number; // 单位编号
+    unitMeasureName?: string; // 单位名称
+    quantity?: number; // 预计使用量
+    remark?: string; // 备注
+    itemOrProduct?: string; // 物料产品标识
+  }
+
+  /** MES 生产工单 BOM 分页查询参数 */
+  export interface PageParams extends PageParam {
+    workOrderId?: number;
+  }
+}
+
+/** 查询工单 BOM 分页 */
+export function getWorkOrderBomPage(params: MesProWorkOrderBomApi.PageParams) {
+  return requestClient.get<PageResult<MesProWorkOrderBomApi.WorkOrderBom>>(
+    '/mes/pro/work-order-bom/page',
+    { params },
+  );
+}
+
+/** 查询工单 BOM 详情 */
+export function getWorkOrderBom(id: number) {
+  return requestClient.get<MesProWorkOrderBomApi.WorkOrderBom>(
+    `/mes/pro/work-order-bom/get?id=${id}`,
+  );
+}
+
+/** 新增工单 BOM */
+export function createWorkOrderBom(data: MesProWorkOrderBomApi.WorkOrderBom) {
+  return requestClient.post('/mes/pro/work-order-bom/create', data);
+}
+
+/** 修改工单 BOM */
+export function updateWorkOrderBom(data: MesProWorkOrderBomApi.WorkOrderBom) {
+  return requestClient.put('/mes/pro/work-order-bom/update', data);
+}
+
+/** 删除工单 BOM */
+export function deleteWorkOrderBom(id: number) {
+  return requestClient.delete(`/mes/pro/work-order-bom/delete?id=${id}`);
+}
+
+/** 查询工单物料需求列表 */
+export function getWorkOrderBomItemListByWorkOrderId(workOrderId: number) {
+  return requestClient.get<MesProWorkOrderBomApi.WorkOrderBom[]>(
+    `/mes/pro/work-order-bom/item-list-by-work-order-id?workOrderId=${workOrderId}`,
+  );
+}
diff --git a/apps/web-antd/src/api/mes/pro/workorder/index.ts b/apps/web-antd/src/api/mes/pro/workorder/index.ts
index 24de7d057..c4c0a152a 100644
--- a/apps/web-antd/src/api/mes/pro/workorder/index.ts
+++ b/apps/web-antd/src/api/mes/pro/workorder/index.ts
@@ -5,37 +5,48 @@ import { requestClient } from '#/api/request';
 export namespace MesProWorkOrderApi {
   /** MES 生产工单 */
   export interface WorkOrder {
-    id?: number;
+    id?: number; // 编号
     code?: string; // 工单编码
     name?: string; // 工单名称
     type?: number; // 工单类型
-    status?: number; // 工单状态
-    sourceType?: number;
-    productId?: number; // 产品物料编号
-    productCode?: string;
-    productName?: string;
-    productSpecification?: string;
-    quantity?: number;
-    unitName?: string;
-    routeId?: number;
-    routeName?: string;
-    clientId?: number;
-    clientName?: string;
+    orderSourceType?: number; // 来源类型
+    orderSourceCode?: string; // 来源单据编号
+    productId?: number; // 产品编号
+    productName?: string; // 产品名称
+    productCode?: string; // 产品编码
+    productSpecification?: string; // 规格型号
+    unitMeasureName?: string; // 单位名称
+    quantity?: number; // 生产数量
+    quantityProduced?: number; // 已生产数量
+    quantityChanged?: number; // 调整数量
+    quantityScheduled?: number; // 已排产数量
+    clientId?: number; // 客户编号
+    clientCode?: string; // 客户编码
+    clientName?: string; // 客户名称
     vendorId?: number; // 供应商编号
     vendorName?: string; // 供应商名称
-    planStartTime?: number | string;
-    planEndTime?: number | string;
-    actualStartTime?: number | string;
-    actualEndTime?: number | string;
-    remark?: string;
-    createTime?: number | string;
+    vendorCode?: string; // 供应商编码
+    batchCode?: string; // 批次号
+    requestDate?: number; // 需求日期
+    parentId?: number; // 父工单编号
+    parentCode?: string; // 父工单编码
+    finishDate?: number; // 完成时间
+    cancelDate?: number; // 取消时间
+    status?: number; // 工单状态
+    remark?: string; // 备注
+    createTime?: number; // 创建时间
   }
 
+  /** MES 生产工单分页查询参数 */
   export interface PageParams extends PageParam {
     code?: string;
     name?: string;
+    orderSourceCode?: string;
+    productId?: number;
+    clientId?: number;
     status?: number;
     type?: number;
+    requestDate?: number[];
   }
 }
 
@@ -53,3 +64,38 @@ export function getWorkOrder(id: number) {
     `/mes/pro/work-order/get?id=${id}`,
   );
 }
+
+/** 新增生产工单 */
+export function createWorkOrder(data: MesProWorkOrderApi.WorkOrder) {
+  return requestClient.post<number>('/mes/pro/work-order/create', data);
+}
+
+/** 修改生产工单 */
+export function updateWorkOrder(data: MesProWorkOrderApi.WorkOrder) {
+  return requestClient.put('/mes/pro/work-order/update', data);
+}
+
+/** 删除生产工单 */
+export function deleteWorkOrder(id: number) {
+  return requestClient.delete(`/mes/pro/work-order/delete?id=${id}`);
+}
+
+/** 导出生产工单 */
+export function exportWorkOrder(params: any) {
+  return requestClient.download('/mes/pro/work-order/export-excel', { params });
+}
+
+/** 完成工单 */
+export function finishWorkOrder(id: number) {
+  return requestClient.put(`/mes/pro/work-order/finish?id=${id}`);
+}
+
+/** 取消工单 */
+export function cancelWorkOrder(id: number) {
+  return requestClient.put(`/mes/pro/work-order/cancel?id=${id}`);
+}
+
+/** 确认工单 */
+export function confirmWorkOrder(id: number) {
+  return requestClient.put(`/mes/pro/work-order/confirm?id=${id}`);
+}
diff --git a/apps/web-antd/src/api/mes/wm/outsourcereceipt/line/index.ts b/apps/web-antd/src/api/mes/wm/outsourcereceipt/line/index.ts
index fd5c0ce46..d28412a5b 100644
--- a/apps/web-antd/src/api/mes/wm/outsourcereceipt/line/index.ts
+++ b/apps/web-antd/src/api/mes/wm/outsourcereceipt/line/index.ts
@@ -19,6 +19,7 @@ export namespace MesWmOutsourceReceiptLineApi {
     expireDate?: number; // 有效期
     lotNumber?: string; // 生产批号
     iqcCheckFlag?: boolean; // 是否需要质检
+    qualityStatus?: number; // 质量状态
     remark?: string; // 备注
     createTime?: Date; // 创建时间
   }
diff --git a/apps/web-antd/src/router/routes/modules/mes.ts b/apps/web-antd/src/router/routes/modules/mes.ts
index 05af60e29..4172fdbc9 100644
--- a/apps/web-antd/src/router/routes/modules/mes.ts
+++ b/apps/web-antd/src/router/routes/modules/mes.ts
@@ -39,6 +39,15 @@ const routes: RouteRecordRaw[] = [
         },
         component: () => import('#/views/mes/wm/barcode/config/index.vue'),
       },
+      {
+        path: 'pro/task/edit',
+        name: 'MesProTaskGanttEdit',
+        meta: {
+          title: '甘特图编辑',
+          activePath: '/mes/pro/task',
+        },
+        component: () => import('#/views/mes/pro/task/edit/index.vue'),
+      },
     ],
   },
 ];
diff --git a/apps/web-antd/src/views/mes/utils/constants.ts b/apps/web-antd/src/views/mes/utils/constants.ts
index 19315fc41..08b97af14 100644
--- a/apps/web-antd/src/views/mes/utils/constants.ts
+++ b/apps/web-antd/src/views/mes/utils/constants.ts
@@ -225,6 +225,12 @@ export const MesProWorkOrderTypeEnum = {
   PURCHASE: 3, // 采购
 } as const;
 
+/** MES 工单来源类型枚举 */
+export const MesProWorkOrderSourceTypeEnum = {
+  ORDER: 1, // 客户订单
+  STORE: 2, // 库存备货
+} as const;
+
 /** MES 生产任务状态枚举 */
 export const MesProTaskStatusEnum = {
   PREPARE: MesOrderStatusConstants.DRAFT,
diff --git a/apps/web-antd/src/views/mes/wm/outsourceissue/modules/form.vue b/apps/web-antd/src/views/mes/wm/outsourceissue/modules/form.vue
index 160e932af..bbe1b8c25 100644
--- a/apps/web-antd/src/views/mes/wm/outsourceissue/modules/form.vue
+++ b/apps/web-antd/src/views/mes/wm/outsourceissue/modules/form.vue
@@ -38,25 +38,19 @@ const canSubmit = computed(() => // 是否可提交
   formType.value === 'update' &&
   formData.value?.status === MesWmOutsourceIssueStatusEnum.PREPARE,
 );
-// TODO @AI：标题的代码风格；
 const getTitle = computed(() => {
-  switch (formType.value) {
-    case 'detail': {
-      return $t('ui.actionTitle.view', ['外协发料单']);
-    }
-    case 'finish': {
-      return '执行领出';
-    }
-    case 'stock': {
-      return '执行拣货';
-    }
-    case 'update': {
-      return $t('ui.actionTitle.edit', ['外协发料单']);
-    }
-    default: {
-      return $t('ui.actionTitle.create', ['外协发料单']);
-    }
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['外协发料单']);
   }
+  if (formType.value === 'stock') {
+    return '执行拣货';
+  }
+  if (formType.value === 'finish') {
+    return '执行领出';
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['外协发料单'])
+    : $t('ui.actionTitle.create', ['外协发料单']);
 });
 
 const [Form, formApi] = useVbenForm({
@@ -138,7 +132,6 @@ async function handleFinish() {
 }
 
 const [Modal, modalApi] = useVbenModal({
-  // TODO @AI：方法注释，缺少“// 关闭并提示”；看看其他 form.vue 或者 xxx-form.vue 有没类似的情况；
   async onConfirm() {
     if (!isEditable.value) {
       await modalApi.close();
diff --git a/apps/web-antd/src/views/mes/wm/outsourceissue/modules/line-list.vue b/apps/web-antd/src/views/mes/wm/outsourceissue/modules/line-list.vue
index 30548696d..92a804dad 100644
--- a/apps/web-antd/src/views/mes/wm/outsourceissue/modules/line-list.vue
+++ b/apps/web-antd/src/views/mes/wm/outsourceissue/modules/line-list.vue
@@ -27,10 +27,9 @@ const props = defineProps<{
   issueId: number;
 }>();
 
-// TODO @AI：// 是否可编辑明细行 拿到 “computed(() =>”；
-const isEditable = computed(() =>
+const isEditable = computed(() => // 是否可编辑明细行
   ['create', 'update'].includes(props.formType),
-); // 是否可编辑明细行
+);
 const isStock = computed(() => props.formType === 'stock'); // 是否为拣货模式
 const detailMap = reactive<
   Record<number, MesWmOutsourceIssueDetailApi.OutsourceIssueDetail[]>
diff --git a/apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/detail-list.vue b/apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/detail-list.vue
index 8fc1718d9..c46d6a93b 100644
--- a/apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/detail-list.vue
+++ b/apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/detail-list.vue
@@ -22,10 +22,9 @@ const emit = defineEmits<{
   refresh: [];
 }>();
 
-// TODO @AI：放到  “// 是否可维护收货明细（编辑或上架态）” 到 computed( 后面
-const isEditable = computed(
-  () => ['create', 'stock', 'update'].includes(props.formType),
-); // 是否可维护收货明细（编辑或上架态）
+const isEditable = computed(() => // 是否可维护收货明细（编辑或上架态）
+  ['create', 'stock', 'update'].includes(props.formType),
+);
 
 /** 添加收货明细 */
 function handleCreate() {
diff --git a/apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/form.vue b/apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/form.vue
index 76879cb67..d059dfd6a 100644
--- a/apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/form.vue
+++ b/apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/form.vue
@@ -37,25 +37,19 @@ const canSubmit = computed(() => // 是否可提交
   formType.value === 'update' &&
   formData.value?.status === MesWmOutsourceReceiptStatusEnum.PREPARE,
 );
-// TODO @AI：方法的代码风格；
 const getTitle = computed(() => {
-  switch (formType.value) {
-    case 'detail': {
-      return $t('ui.actionTitle.view', ['外协入库单']);
-    }
-    case 'finish': {
-      return '完成入库';
-    }
-    case 'stock': {
-      return '执行上架';
-    }
-    case 'update': {
-      return $t('ui.actionTitle.edit', ['外协入库单']);
-    }
-    default: {
-      return $t('ui.actionTitle.create', ['外协入库单']);
-    }
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['外协入库单']);
   }
+  if (formType.value === 'stock') {
+    return '执行上架';
+  }
+  if (formType.value === 'finish') {
+    return '完成入库';
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['外协入库单'])
+    : $t('ui.actionTitle.create', ['外协入库单']);
 });
 
 const [Form, formApi] = useVbenForm({
diff --git a/apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/line-form.vue b/apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/line-form.vue
index e2b9d6541..f0a612c2f 100644
--- a/apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/line-form.vue
+++ b/apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/line-form.vue
@@ -21,7 +21,6 @@ const emit = defineEmits(['success']);
 const formData = ref<MesWmOutsourceReceiptLineApi.OutsourceReceiptLine>();
 const receiptId = ref<number>(); // 所属入库单编号
 
-// TODO @AI：如果 getTitle 方法的前面，也是 const 变量，不用空行？是不是更符合项目规范？如果是，写到 style vue 文件里；
 const getTitle = computed(() => {
   return formData.value?.id
     ? $t('ui.actionTitle.edit', ['外协入库单行'])
diff --git a/apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/line-list.vue b/apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/line-list.vue
index 23e00bf2e..436291201 100644
--- a/apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/line-list.vue
+++ b/apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/line-list.vue
@@ -28,9 +28,9 @@ const props = defineProps<{
   receiptId: number;
 }>();
 
-const isEditable = computed(() =>
+const isEditable = computed(() => // 是否可编辑明细行
   ['create', 'update'].includes(props.formType),
-); // 是否可编辑明细行
+);
 const isStock = computed(() => props.formType === 'stock'); // 是否为上架模式
 const detailMap = reactive<
   Record<number, MesWmOutsourceReceiptDetailApi.OutsourceReceiptDetail[]>
diff --git a/apps/web-antd/src/views/mes/wm/stocktaking/plan/modules/param-list.vue b/apps/web-antd/src/views/mes/wm/stocktaking/plan/modules/param-list.vue
new file mode 100644
index 000000000..47df0986f
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/stocktaking/plan/modules/param-list.vue
@@ -0,0 +1,131 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmStockTakingPlanParamApi } from '#/api/mes/wm/stocktaking/plan/param';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteStockTakingPlanParam,
+  getStockTakingPlanParamPage,
+} from '#/api/mes/wm/stocktaking/plan/param';
+import { $t } from '#/locales';
+
+import { useParamGridColumns } from '../data';
+import ParamForm from './param-form.vue';
+
+const props = defineProps<{
+  disabled: boolean; // 是否只读（详情态）
+  planId: number; // 所属方案编号
+}>();
+
+const [ParamFormModal, paramFormModalApi] = useVbenModal({
+  connectedComponent: ParamForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 添加条件 */
+function handleCreate() {
+  paramFormModalApi.setData({ planId: props.planId }).open();
+}
+
+/** 编辑条件 */
+function handleEdit(row: MesWmStockTakingPlanParamApi.StockTakingPlanParam) {
+  paramFormModalApi.setData({ id: row.id, planId: props.planId }).open();
+}
+
+/** 删除条件 */
+async function handleDelete(
+  row: MesWmStockTakingPlanParamApi.StockTakingPlanParam,
+) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.valueName]),
+    duration: 0,
+  });
+  try {
+    await deleteStockTakingPlanParam(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.valueName]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useParamGridColumns(!props.disabled),
+    height: 320,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.planId) {
+            return { list: [], total: 0 };
+          }
+          return await getStockTakingPlanParamPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            planId: props.planId,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesWmStockTakingPlanParamApi.StockTakingPlanParam>,
+});
+</script>
+
+<template>
+  <div>
+    <ParamFormModal @success="handleRefresh" />
+    <Grid table-title="盘点参数">
+      <template v-if="!disabled" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '添加条件',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.valueName]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-ele/src/api/mes/wm/outsourcereceipt/line/index.ts b/apps/web-ele/src/api/mes/wm/outsourcereceipt/line/index.ts
index fd5c0ce46..d28412a5b 100644
--- a/apps/web-ele/src/api/mes/wm/outsourcereceipt/line/index.ts
+++ b/apps/web-ele/src/api/mes/wm/outsourcereceipt/line/index.ts
@@ -19,6 +19,7 @@ export namespace MesWmOutsourceReceiptLineApi {
     expireDate?: number; // 有效期
     lotNumber?: string; // 生产批号
     iqcCheckFlag?: boolean; // 是否需要质检
+    qualityStatus?: number; // 质量状态
     remark?: string; // 备注
     createTime?: Date; // 创建时间
   }
diff --git a/apps/web-ele/src/views/mes/pro/card/data.ts b/apps/web-ele/src/views/mes/pro/card/data.ts
index eefd623fa..1bab3d7fc 100644
--- a/apps/web-ele/src/views/mes/pro/card/data.ts
+++ b/apps/web-ele/src/views/mes/pro/card/data.ts
@@ -1,11 +1,431 @@
-import type { VbenFormSchema } from '#/adapter/form';
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesProCardApi } from '#/api/mes/pro/card';
+import type { MesProCardProcessApi } from '#/api/mes/pro/card/process';
 
-import { markRaw } from 'vue';
+import { h, markRaw } from 'vue';
 
+import { DICT_TYPE } from '@vben/constants';
+
+import { ElButton } from 'element-plus';
+
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { MdItemSelect } from '#/views/mes/md/item/components';
+import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
+import { ProProcessSelect } from '#/views/mes/pro/process/components';
 import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
+import {
+  MesAutoCodeRuleCode,
+  MesProWorkOrderStatusEnum,
+} from '#/views/mes/utils/constants';
+import { UserSelect } from '#/views/system/user/components';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'finish' | 'update';
+
+/** 表头是否只读（完成、详情态） */
+function isHeaderReadonly(formType: FormType): boolean {
+  return formType === 'detail' || formType === 'finish';
+}
+
+/** 新增/修改的表单 */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  const headerReadonly = isHeaderReadonly(formType);
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'status',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '流转卡编码',
+      component: 'Input',
+      componentProps: {
+        disabled: headerReadonly,
+        placeholder: '请输入流转卡编码',
+      },
+      rules: 'required',
+      suffix:
+        formType === 'create' || formType === 'update'
+          ? () =>
+              h(
+                ElButton,
+                {
+                  onClick: async () => {
+                    const code = await generateAutoCode(
+                      MesAutoCodeRuleCode.PRO_CARD_CODE,
+                    );
+                    await formApi?.setFieldValue('code', code);
+                  },
+                },
+                { default: () => '生成' },
+              )
+          : undefined,
+    },
+    {
+      fieldName: 'workOrderId',
+      label: '生产工单',
+      component: markRaw(ProWorkOrderSelect),
+      componentProps: {
+        disabled: headerReadonly,
+        placeholder: '请选择生产工单',
+        status: MesProWorkOrderStatusEnum.CONFIRMED,
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'itemId',
+      label: '产品',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        disabled: headerReadonly,
+        placeholder: '请选择产品',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'transferedQuantity',
+      label: '流转数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        disabled: headerReadonly,
+        min: 0,
+        placeholder: '请输入流转数量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        disabled: headerReadonly,
+        placeholder: '请输入批次号',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        disabled: headerReadonly,
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '流转卡编码',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入流转卡编码',
+      },
+    },
+    {
+      fieldName: 'workOrderId',
+      label: '生产工单',
+      component: markRaw(ProWorkOrderSelect),
+      componentProps: {
+        placeholder: '请选择生产工单',
+      },
+    },
+    {
+      fieldName: 'itemId',
+      label: '产品',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择产品',
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入批次号',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesProCardApi.Card>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '流转卡编码',
+      width: 160,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'workOrderCode',
+      title: '生产工单编号',
+      width: 160,
+    },
+    {
+      field: 'workOrderName',
+      title: '工单名称',
+      minWidth: 150,
+    },
+    {
+      field: 'batchCode',
+      title: '批次号',
+      width: 120,
+    },
+    {
+      field: 'itemCode',
+      title: '产品物料编码',
+      width: 140,
+    },
+    {
+      field: 'itemName',
+      title: '产品物料名称',
+      minWidth: 120,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      width: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'transferedQuantity',
+      title: '流转数量',
+      width: 100,
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      minWidth: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_PRO_WORK_ORDER_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 240,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 工序记录子表的字段 */
+export function useProcessGridColumns(
+  editable: boolean,
+): VxeTableGridOptions<MesProCardProcessApi.CardProcess>['columns'] {
+  return [
+    {
+      field: 'sort',
+      title: '序号',
+      width: 60,
+    },
+    {
+      field: 'processName',
+      title: '工序名称',
+      minWidth: 120,
+    },
+    {
+      field: 'processCode',
+      title: '工序编码',
+      width: 120,
+    },
+    {
+      field: 'inputTime',
+      title: '进入工序时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      field: 'outputTime',
+      title: '出工序时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      field: 'inputQuantity',
+      title: '投入数量',
+      width: 100,
+    },
+    {
+      field: 'outputQuantity',
+      title: '产出数量',
+      width: 100,
+    },
+    {
+      field: 'unqualifiedQuantity',
+      title: '不良品数量',
+      width: 100,
+    },
+    {
+      field: 'workstationCode',
+      title: '工位编码',
+      width: 120,
+    },
+    {
+      field: 'workstationName',
+      title: '工位名称',
+      minWidth: 120,
+    },
+    {
+      field: 'nickname',
+      title: '操作人',
+      width: 100,
+    },
+    ...(editable
+      ? [
+          {
+            title: '操作',
+            width: 160,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 工序记录新增/修改的表单 */
+export function useProcessFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'sort',
+      label: '序号',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入序号',
+        precision: 0,
+      },
+    },
+    {
+      fieldName: 'processId',
+      label: '工序',
+      component: markRaw(ProProcessSelect),
+      componentProps: {
+        placeholder: '请选择工序',
+      },
+    },
+    {
+      fieldName: 'inputTime',
+      label: '进入工序时间',
+      component: 'DatePicker',
+      componentProps: {
+        class: '!w-full',
+        placeholder: '请选择进入工序时间',
+        type: 'datetime',
+        valueFormat: 'x',
+      },
+    },
+    {
+      fieldName: 'outputTime',
+      label: '出工序时间',
+      component: 'DatePicker',
+      componentProps: {
+        class: '!w-full',
+        placeholder: '请选择出工序时间',
+        type: 'datetime',
+        valueFormat: 'x',
+      },
+    },
+    {
+      fieldName: 'inputQuantity',
+      label: '投入数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入投入数量',
+        precision: 2,
+      },
+    },
+    {
+      fieldName: 'outputQuantity',
+      label: '产出数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入产出数量',
+        precision: 2,
+      },
+    },
+    {
+      fieldName: 'unqualifiedQuantity',
+      label: '不合格数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入不合格数量',
+        precision: 2,
+      },
+    },
+    {
+      fieldName: 'workstationId',
+      label: '工位',
+      component: markRaw(MdWorkstationSelect),
+      componentProps: {
+        placeholder: '请选择工位',
+      },
+    },
+    {
+      fieldName: 'userId',
+      label: '操作人',
+      component: markRaw(UserSelect),
+      componentProps: {
+        placeholder: '请选择操作人',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-2',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
 
 /** 流转卡选择弹窗的搜索表单 */
 export function useCardSelectGridFormSchema(): VbenFormSchema[] {
diff --git a/apps/web-ele/src/views/mes/pro/workorder/components/index.ts b/apps/web-ele/src/views/mes/pro/workorder/components/index.ts
index 1059f8a79..b53e2876b 100644
--- a/apps/web-ele/src/views/mes/pro/workorder/components/index.ts
+++ b/apps/web-ele/src/views/mes/pro/workorder/components/index.ts
@@ -1 +1,2 @@
+export { default as ProWorkOrderSelectDialog } from './pro-work-order-select-dialog.vue';
 export { default as ProWorkOrderSelect } from './pro-work-order-select.vue';
diff --git a/apps/web-ele/src/views/mes/pro/workorder/components/pro-work-order-select.vue b/apps/web-ele/src/views/mes/pro/workorder/components/pro-work-order-select.vue
index d02e67dd9..affb6907d 100644
--- a/apps/web-ele/src/views/mes/pro/workorder/components/pro-work-order-select.vue
+++ b/apps/web-ele/src/views/mes/pro/workorder/components/pro-work-order-select.vue
@@ -1,20 +1,16 @@
 <script lang="ts" setup>
 import type { MesProWorkOrderApi } from '#/api/mes/pro/workorder';
 
-import { computed, onMounted, ref, watch } from 'vue';
+import { computed, ref, useAttrs, watch } from 'vue';
 
-import { ElOption, ElSelect, ElTag, ElTooltip } from 'element-plus';
+import { CircleX, Search } from '@vben/icons';
 
-import { getWorkOrder, getWorkOrderPage } from '#/api/mes/pro/workorder';
+import { ElInput, ElTooltip } from 'element-plus';
+
+import { getWorkOrder } from '#/api/mes/pro/workorder';
+
+import ProWorkOrderSelectDialog from './pro-work-order-select-dialog.vue';
 
-/**
- * MES 生产工单选择器（轻量版）
- *
- * 当前用于安灯记录等只需要单选工单 ID 的业务页面：
- * - 默认按 `status` 过滤拉取首页 100 条工单作为下拉
- * - 编辑回显走 `getWorkOrder(id)`
- * - 后续 `mes/pro/workorder` 完整迁移后，可替换为带弹窗的复杂选择器
- */
 defineOptions({ name: 'ProWorkOrderSelect', inheritAttrs: false });
 
 const props = withDefaults(
@@ -22,7 +18,6 @@ const props = withDefaults(
     clearable?: boolean;
     disabled?: boolean;
     modelValue?: number;
-    pageSize?: number;
     placeholder?: string;
     status?: number;
     type?: number;
@@ -31,7 +26,6 @@ const props = withDefaults(
     clearable: true,
     disabled: false,
     modelValue: undefined,
-    pageSize: 100,
     placeholder: '请选择工单',
     status: undefined,
     type: undefined,
@@ -43,108 +37,102 @@ const emit = defineEmits<{
   'update:modelValue': [value: number | undefined];
 }>();
 
-const allList = ref<MesProWorkOrderApi.WorkOrder[]>([]);
-const filteredList = ref<MesProWorkOrderApi.WorkOrder[]>([]);
-const selectedItem = ref<MesProWorkOrderApi.WorkOrder>();
+const attrs = useAttrs(); // 透传属性
+const dialogRef = ref<InstanceType<typeof ProWorkOrderSelectDialog>>(); // 工单选择弹窗
+const hovering = ref(false); // 是否悬停
+const selectedItem = ref<MesProWorkOrderApi.WorkOrder>(); // 当前选中工单
 
-const selectValue = computed({
-  get: () => props.modelValue,
-  set: (value: number | undefined) => {
-    emit('update:modelValue', value);
-  },
-});
+const displayLabel = computed(() => selectedItem.value?.code ?? ''); // 选择器展示编码
+const showClear = computed(() => // 是否显示清空图标
+  props.clearable &&
+  !props.disabled &&
+  hovering.value &&
+  props.modelValue != null,
+);
 
-function handleFilter(query: string) {
-  if (!query) {
-    filteredList.value = allList.value;
-    return;
-  }
-  const keyword = query.toLowerCase();
-  filteredList.value = allList.value.filter(
-    (item) =>
-      item.code?.toLowerCase().includes(keyword) ||
-      item.name?.toLowerCase().includes(keyword),
-  );
-}
-
-/** 同步选中工单详情，未在列表内时单独拉取 */
-async function syncSelectedItem(value: number | undefined) {
-  if (value === undefined) {
+/** 根据编号单条查询工单信息（用于编辑回显） */
+async function resolveItemById(id: number | undefined) {
+  if (id == null) {
     selectedItem.value = undefined;
     return;
   }
-  const found = allList.value.find((item) => item.id === value);
-  if (found) {
-    selectedItem.value = found;
+  if (selectedItem.value?.id === id) {
     return;
   }
-  try {
-    selectedItem.value = await getWorkOrder(value);
-  } catch (error) {
-    console.error('[ProWorkOrderSelect] resolveItemById failed:', error);
+  selectedItem.value = await getWorkOrder(id);
+}
+
+watch(() => props.modelValue, resolveItemById, { immediate: true });
+
+/** 清空已选工单 */
+function clearSelected() {
+  selectedItem.value = undefined;
+  emit('update:modelValue', undefined);
+  emit('change', undefined);
+}
+
+/** 打开工单选择弹窗 */
+function handleClick(event: MouseEvent) {
+  if (props.disabled) {
+    return;
   }
+  const target = event.target as HTMLElement;
+  if (showClear.value && target.closest('.el-input__suffix')) {
+    event.stopPropagation();
+    clearSelected();
+    return;
+  }
+  const selectedIds = props.modelValue == null ? [] : [props.modelValue];
+  dialogRef.value?.open(selectedIds, { multiple: false });
 }
 
-/** 除 v-model 外，额外抛出完整工单对象给业务表单使用 */
-function handleChange(value: number | undefined) {
-  syncSelectedItem(value);
-  emit('change', selectedItem.value);
+/** 弹窗选中回调 */
+function handleSelected(rows: MesProWorkOrderApi.WorkOrder[]) {
+  const item = rows[0];
+  if (!item) {
+    return;
+  }
+  selectedItem.value = item;
+  emit('update:modelValue', item.id);
+  emit('change', item);
 }
-
-watch(
-  () => props.modelValue,
-  (value) => {
-    syncSelectedItem(value);
-  },
-);
-
-onMounted(async () => {
-  const data = await getWorkOrderPage({
-    pageNo: 1,
-    pageSize: props.pageSize,
-    status: props.status,
-    type: props.type,
-  });
-  allList.value = data.list ?? [];
-  filteredList.value = allList.value;
-  syncSelectedItem(props.modelValue);
-});
 </script>
 
 <template>
-  <ElTooltip :disabled="!selectedItem" placement="top" :show-after="500">
-    <template #content>
-      <div v-if="selectedItem" class="leading-6">
-        <div>编码：{{ selectedItem.code || '-' }}</div>
-        <div>名称：{{ selectedItem.name || '-' }}</div>
-        <div>产品：{{ selectedItem.productName || '-' }}</div>
-        <div>数量：{{ selectedItem.quantity ?? '-' }}</div>
-      </div>
-    </template>
-    <ElSelect
-      v-bind="$attrs"
-      v-model="selectValue"
-      :clearable="clearable"
-      :disabled="disabled"
-      :filter-method="handleFilter"
-      :placeholder="placeholder"
-      class="w-full"
-      filterable
-      @change="handleChange"
-    >
-      <ElOption
-        v-for="item in filteredList"
-        :key="item.id"
-        :label="item.code"
-        :value="item.id!"
-      >
-        <div class="flex items-center gap-2">
-          <span>{{ item.code }}</span>
-          <ElTag v-if="item.name" size="small" type="info">
-            {{ item.name }}
-          </ElTag>
+  <div
+    v-bind="attrs"
+    class="w-full"
+    :class="disabled ? 'cursor-not-allowed' : 'cursor-pointer'"
+    @click="handleClick"
+    @mouseenter="hovering = true"
+    @mouseleave="hovering = false"
+  >
+    <ElTooltip :disabled="!selectedItem" placement="top" :show-after="500">
+      <template #content>
+        <div v-if="selectedItem" class="leading-6">
+          <div>编码：{{ selectedItem.code || '-' }}</div>
+          <div>名称：{{ selectedItem.name || '-' }}</div>
+          <div>产品：{{ selectedItem.productName || '-' }}</div>
+          <div>数量：{{ selectedItem.quantity ?? '-' }}</div>
         </div>
-      </ElOption>
-    </ElSelect>
-  </ElTooltip>
+      </template>
+      <ElInput
+        :disabled="disabled"
+        :model-value="displayLabel"
+        :placeholder="placeholder"
+        readonly
+      >
+        <template #suffix>
+          <CircleX v-if="showClear" class="size-4" />
+          <Search v-else class="size-4" />
+        </template>
+      </ElInput>
+    </ElTooltip>
+  </div>
+  <ProWorkOrderSelectDialog
+    ref="dialogRef"
+    :status="status"
+    :type="type"
+    @selected="handleSelected"
+  />
 </template>
diff --git a/apps/web-ele/src/views/mes/wm/outsourceissue/modules/form.vue b/apps/web-ele/src/views/mes/wm/outsourceissue/modules/form.vue
index 708935fa0..0aa12cf93 100644
--- a/apps/web-ele/src/views/mes/wm/outsourceissue/modules/form.vue
+++ b/apps/web-ele/src/views/mes/wm/outsourceissue/modules/form.vue
@@ -39,23 +39,18 @@ const canSubmit = computed(() => // 是否可提交
   formData.value?.status === MesWmOutsourceIssueStatusEnum.PREPARE,
 );
 const getTitle = computed(() => {
-  switch (formType.value) {
-    case 'detail': {
-      return $t('ui.actionTitle.view', ['外协发料单']);
-    }
-    case 'finish': {
-      return '执行领出';
-    }
-    case 'stock': {
-      return '执行拣货';
-    }
-    case 'update': {
-      return $t('ui.actionTitle.edit', ['外协发料单']);
-    }
-    default: {
-      return $t('ui.actionTitle.create', ['外协发料单']);
-    }
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['外协发料单']);
   }
+  if (formType.value === 'stock') {
+    return '执行拣货';
+  }
+  if (formType.value === 'finish') {
+    return '执行领出';
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['外协发料单'])
+    : $t('ui.actionTitle.create', ['外协发料单']);
 });
 
 const [Form, formApi] = useVbenForm({
diff --git a/apps/web-ele/src/views/mes/wm/outsourceissue/modules/line-list.vue b/apps/web-ele/src/views/mes/wm/outsourceissue/modules/line-list.vue
index a8ba2b4f3..d8144aaad 100644
--- a/apps/web-ele/src/views/mes/wm/outsourceissue/modules/line-list.vue
+++ b/apps/web-ele/src/views/mes/wm/outsourceissue/modules/line-list.vue
@@ -27,9 +27,9 @@ const props = defineProps<{
   issueId: number;
 }>();
 
-const isEditable = computed(() =>
+const isEditable = computed(() => // 是否可编辑明细行
   ['create', 'update'].includes(props.formType),
-); // 是否可编辑明细行
+);
 const isStock = computed(() => props.formType === 'stock'); // 是否为拣货模式
 const detailMap = reactive<
   Record<number, MesWmOutsourceIssueDetailApi.OutsourceIssueDetail[]>
diff --git a/apps/web-ele/src/views/mes/wm/outsourcereceipt/modules/detail-list.vue b/apps/web-ele/src/views/mes/wm/outsourcereceipt/modules/detail-list.vue
index cabac9479..6c1a39acd 100644
--- a/apps/web-ele/src/views/mes/wm/outsourcereceipt/modules/detail-list.vue
+++ b/apps/web-ele/src/views/mes/wm/outsourcereceipt/modules/detail-list.vue
@@ -22,9 +22,9 @@ const emit = defineEmits<{
   refresh: [];
 }>();
 
-const isEditable = computed(
-  () => ['create', 'stock', 'update'].includes(props.formType),
-); // 是否可维护收货明细（编辑或上架态）
+const isEditable = computed(() => // 是否可维护收货明细（编辑或上架态）
+  ['create', 'stock', 'update'].includes(props.formType),
+);
 
 /** 添加收货明细 */
 function handleCreate() {
diff --git a/apps/web-ele/src/views/mes/wm/outsourcereceipt/modules/form.vue b/apps/web-ele/src/views/mes/wm/outsourcereceipt/modules/form.vue
index 52678831f..b7159bd52 100644
--- a/apps/web-ele/src/views/mes/wm/outsourcereceipt/modules/form.vue
+++ b/apps/web-ele/src/views/mes/wm/outsourcereceipt/modules/form.vue
@@ -38,23 +38,18 @@ const canSubmit = computed(() => // 是否可提交
   formData.value?.status === MesWmOutsourceReceiptStatusEnum.PREPARE,
 );
 const getTitle = computed(() => {
-  switch (formType.value) {
-    case 'detail': {
-      return $t('ui.actionTitle.view', ['外协入库单']);
-    }
-    case 'finish': {
-      return '完成入库';
-    }
-    case 'stock': {
-      return '执行上架';
-    }
-    case 'update': {
-      return $t('ui.actionTitle.edit', ['外协入库单']);
-    }
-    default: {
-      return $t('ui.actionTitle.create', ['外协入库单']);
-    }
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['外协入库单']);
   }
+  if (formType.value === 'stock') {
+    return '执行上架';
+  }
+  if (formType.value === 'finish') {
+    return '完成入库';
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['外协入库单'])
+    : $t('ui.actionTitle.create', ['外协入库单']);
 });
 
 const [Form, formApi] = useVbenForm({
diff --git a/apps/web-ele/src/views/mes/wm/outsourcereceipt/modules/line-list.vue b/apps/web-ele/src/views/mes/wm/outsourcereceipt/modules/line-list.vue
index 362c06a38..c1411a4b2 100644
--- a/apps/web-ele/src/views/mes/wm/outsourcereceipt/modules/line-list.vue
+++ b/apps/web-ele/src/views/mes/wm/outsourcereceipt/modules/line-list.vue
@@ -28,9 +28,9 @@ const props = defineProps<{
   receiptId: number;
 }>();
 
-const isEditable = computed(() =>
+const isEditable = computed(() => // 是否可编辑明细行
   ['create', 'update'].includes(props.formType),
-); // 是否可编辑明细行
+);
 const isStock = computed(() => props.formType === 'stock'); // 是否为上架模式
 const detailMap = reactive<
   Record<number, MesWmOutsourceReceiptDetailApi.OutsourceReceiptDetail[]>

From e313de09c41d6c637dfb67e55e3ca878ec636998 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 30 May 2026 09:35:09 +0800
Subject: [PATCH 35/52] =?UTF-8?q?feat(mes):=20=E4=BC=98=E5=8C=96=20materia?=
 =?UTF-8?q?lstock=20=E7=9A=84=E4=BB=A3=E7=A0=81=E5=AE=9E=E7=8E=B0=E9=A3=8E?=
 =?UTF-8?q?=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/views/mes/pro/card/data.ts  | 420 +++++++++++++++-
 .../views/mes/pro/task/components/index.ts    |   1 +
 apps/web-antd/src/views/mes/pro/task/data.ts  | 451 ++++++++++++++++-
 .../mes/pro/workorder/components/index.ts     |   1 +
 .../components/pro-work-order-select.vue      | 188 ++++----
 .../views/mes/wm/batch/components/index.ts    |   1 +
 apps/web-antd/src/views/mes/wm/batch/data.ts  | 140 +++++-
 .../wm-material-stock-select-dialog.vue       | 126 +++--
 .../components/wm-material-stock-select.vue   |   6 +-
 .../src/views/mes/wm/materialstock/data.ts    |  12 +-
 .../src/views/mes/wm/materialstock/index.vue  |  27 +-
 apps/web-ele/src/router/routes/modules/mes.ts |   9 +
 .../views/mes/pro/task/components/index.ts    |   1 +
 apps/web-ele/src/views/mes/pro/task/data.ts   | 454 +++++++++++++++++-
 .../views/mes/wm/batch/components/index.ts    |   1 +
 .../wm-material-stock-select-dialog.vue       | 130 +++--
 .../components/wm-material-stock-select.vue   |   6 +-
 .../src/views/mes/wm/materialstock/data.ts    |  11 +-
 .../src/views/mes/wm/materialstock/index.vue  |  32 +-
 pnpm-lock.yaml                                |  49 +-
 20 files changed, 1800 insertions(+), 266 deletions(-)

diff --git a/apps/web-antd/src/views/mes/pro/card/data.ts b/apps/web-antd/src/views/mes/pro/card/data.ts
index e4e0d6f9a..b9da83a07 100644
--- a/apps/web-antd/src/views/mes/pro/card/data.ts
+++ b/apps/web-antd/src/views/mes/pro/card/data.ts
@@ -1,11 +1,427 @@
-import type { VbenFormSchema } from '#/adapter/form';
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesProCardApi } from '#/api/mes/pro/card';
+import type { MesProCardProcessApi } from '#/api/mes/pro/card/process';
 
-import { markRaw } from 'vue';
+import { h, markRaw } from 'vue';
 
+import { DICT_TYPE } from '@vben/constants';
+
+import { Button } from 'ant-design-vue';
+
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { MdItemSelect } from '#/views/mes/md/item/components';
+import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
+import { ProProcessSelect } from '#/views/mes/pro/process/components';
 import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
+import {
+  MesAutoCodeRuleCode,
+  MesProWorkOrderStatusEnum,
+} from '#/views/mes/utils/constants';
+import { UserSelect } from '#/views/system/user/components';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'finish' | 'update';
+
+/** 表头是否只读（完成、详情态） */
+function isHeaderReadonly(formType: FormType): boolean {
+  return formType === 'detail' || formType === 'finish';
+}
+
+/** 新增/修改的表单 */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  const headerReadonly = isHeaderReadonly(formType);
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'status',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '流转卡编码',
+      component: 'Input',
+      componentProps: {
+        disabled: headerReadonly,
+        placeholder: '请输入流转卡编码',
+      },
+      rules: 'required',
+      suffix:
+        formType === 'create' || formType === 'update'
+          ? () =>
+              h(
+                Button,
+                {
+                  type: 'default',
+                  onClick: async () => {
+                    const code = await generateAutoCode(
+                      MesAutoCodeRuleCode.PRO_CARD_CODE,
+                    );
+                    await formApi?.setFieldValue('code', code);
+                  },
+                },
+                { default: () => '生成' },
+              )
+          : undefined,
+    },
+    {
+      fieldName: 'workOrderId',
+      label: '生产工单',
+      component: markRaw(ProWorkOrderSelect),
+      componentProps: {
+        disabled: headerReadonly,
+        placeholder: '请选择生产工单',
+        status: MesProWorkOrderStatusEnum.CONFIRMED,
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'itemId',
+      label: '产品',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        disabled: headerReadonly,
+        placeholder: '请选择产品',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'transferedQuantity',
+      label: '流转数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        disabled: headerReadonly,
+        min: 0,
+        placeholder: '请输入流转数量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        disabled: headerReadonly,
+        placeholder: '请输入批次号',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        disabled: headerReadonly,
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '流转卡编码',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入流转卡编码',
+      },
+    },
+    {
+      fieldName: 'workOrderId',
+      label: '生产工单',
+      component: markRaw(ProWorkOrderSelect),
+      componentProps: {
+        placeholder: '请选择生产工单',
+      },
+    },
+    {
+      fieldName: 'itemId',
+      label: '产品',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择产品',
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入批次号',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesProCardApi.Card>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '流转卡编码',
+      width: 160,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'workOrderCode',
+      title: '生产工单编号',
+      width: 160,
+    },
+    {
+      field: 'workOrderName',
+      title: '工单名称',
+      minWidth: 150,
+    },
+    {
+      field: 'batchCode',
+      title: '批次号',
+      width: 120,
+    },
+    {
+      field: 'itemCode',
+      title: '产品物料编码',
+      width: 140,
+    },
+    {
+      field: 'itemName',
+      title: '产品物料名称',
+      minWidth: 120,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      width: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'transferedQuantity',
+      title: '流转数量',
+      width: 100,
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      minWidth: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_PRO_WORK_ORDER_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 240,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 工序记录子表的字段 */
+export function useProcessGridColumns(
+  editable: boolean,
+): VxeTableGridOptions<MesProCardProcessApi.CardProcess>['columns'] {
+  return [
+    {
+      field: 'sort',
+      title: '序号',
+      width: 60,
+    },
+    {
+      field: 'processName',
+      title: '工序名称',
+      minWidth: 120,
+    },
+    {
+      field: 'processCode',
+      title: '工序编码',
+      width: 120,
+    },
+    {
+      field: 'inputTime',
+      title: '进入工序时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      field: 'outputTime',
+      title: '出工序时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      field: 'inputQuantity',
+      title: '投入数量',
+      width: 100,
+    },
+    {
+      field: 'outputQuantity',
+      title: '产出数量',
+      width: 100,
+    },
+    {
+      field: 'unqualifiedQuantity',
+      title: '不良品数量',
+      width: 100,
+    },
+    {
+      field: 'workstationCode',
+      title: '工位编码',
+      width: 120,
+    },
+    {
+      field: 'workstationName',
+      title: '工位名称',
+      minWidth: 120,
+    },
+    {
+      field: 'nickname',
+      title: '操作人',
+      width: 100,
+    },
+    ...(editable
+      ? [
+          {
+            title: '操作',
+            width: 160,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 工序记录新增/修改的表单 */
+export function useProcessFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'sort',
+      label: '序号',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入序号',
+        precision: 0,
+      },
+    },
+    {
+      fieldName: 'processId',
+      label: '工序',
+      component: markRaw(ProProcessSelect),
+      componentProps: {
+        placeholder: '请选择工序',
+      },
+    },
+    {
+      fieldName: 'inputTime',
+      label: '进入工序时间',
+      component: 'DatePicker',
+      componentProps: {
+        class: '!w-full',
+        placeholder: '请选择进入工序时间',
+        showTime: true,
+        valueFormat: 'x',
+      },
+    },
+    {
+      fieldName: 'outputTime',
+      label: '出工序时间',
+      component: 'DatePicker',
+      componentProps: {
+        class: '!w-full',
+        placeholder: '请选择出工序时间',
+        showTime: true,
+        valueFormat: 'x',
+      },
+    },
+    {
+      fieldName: 'inputQuantity',
+      label: '投入数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入投入数量',
+        precision: 2,
+      },
+    },
+    {
+      fieldName: 'outputQuantity',
+      label: '产出数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入产出数量',
+        precision: 2,
+      },
+    },
+    {
+      fieldName: 'unqualifiedQuantity',
+      label: '不合格数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入不合格数量',
+        precision: 2,
+      },
+    },
+    {
+      fieldName: 'workstationId',
+      label: '工位',
+      component: markRaw(MdWorkstationSelect),
+      componentProps: {
+        placeholder: '请选择工位',
+      },
+    },
+    {
+      fieldName: 'userId',
+      label: '操作人',
+      component: markRaw(UserSelect),
+      componentProps: {
+        placeholder: '请选择操作人',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-2',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
 
 /** 流转卡选择弹窗的搜索表单 */
 export function useCardSelectGridFormSchema(): VbenFormSchema[] {
diff --git a/apps/web-antd/src/views/mes/pro/task/components/index.ts b/apps/web-antd/src/views/mes/pro/task/components/index.ts
index 3847bb912..bfaf6ae17 100644
--- a/apps/web-antd/src/views/mes/pro/task/components/index.ts
+++ b/apps/web-antd/src/views/mes/pro/task/components/index.ts
@@ -1,2 +1,3 @@
+export { default as GanttChart } from './gantt-chart.vue';
 export { default as ProTaskSelectDialog } from './pro-task-select-dialog.vue';
 export { default as ProTaskSelect } from './pro-task-select.vue';
diff --git a/apps/web-antd/src/views/mes/pro/task/data.ts b/apps/web-antd/src/views/mes/pro/task/data.ts
index c29921b81..baede0e30 100644
--- a/apps/web-antd/src/views/mes/pro/task/data.ts
+++ b/apps/web-antd/src/views/mes/pro/task/data.ts
@@ -1,15 +1,464 @@
-import type { VbenFormSchema } from '#/adapter/form';
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesProTaskApi } from '#/api/mes/pro/task';
+import type { MesProWorkOrderApi } from '#/api/mes/pro/workorder';
 
 import { markRaw } from 'vue';
 
 import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
 
+import { getRangePickerDefaultProps } from '#/utils';
+import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
+import { MdItemSelect } from '#/views/mes/md/item/components';
 import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
 import { ProProcessSelect } from '#/views/mes/pro/process/components';
+import { RouteColorPicker } from '#/views/mes/pro/route/components';
 import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
 
+/** 待排产工单列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '工单编码',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入工单编码',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '工单名称',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入工单名称',
+      },
+    },
+    {
+      fieldName: 'orderSourceCode',
+      label: '来源单据',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入来源单据编号',
+      },
+    },
+    {
+      fieldName: 'productId',
+      label: '产品',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择产品',
+      },
+    },
+    {
+      fieldName: 'clientId',
+      label: '客户',
+      component: markRaw(MdClientSelect),
+      componentProps: {
+        placeholder: '请选择客户',
+      },
+    },
+    {
+      fieldName: 'requestDate',
+      label: '需求日期',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+        allowClear: true,
+      },
+    },
+  ];
+}
+
+/** 待排产工单列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesProWorkOrderApi.WorkOrder>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '工单编码',
+      fixed: 'left',
+      width: 200,
+      treeNode: true,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '工单名称',
+      minWidth: 150,
+    },
+    {
+      field: 'orderSourceType',
+      title: '工单来源',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_PRO_WORK_ORDER_SOURCE_TYPE },
+      },
+    },
+    {
+      field: 'orderSourceCode',
+      title: '来源单据编号',
+      width: 140,
+    },
+    {
+      field: 'productCode',
+      title: '产品编码',
+      width: 120,
+    },
+    {
+      field: 'productName',
+      title: '产品名称',
+      minWidth: 120,
+    },
+    {
+      field: 'productSpecification',
+      title: '规格型号',
+      width: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'quantity',
+      title: '工单数量',
+      width: 100,
+    },
+    {
+      field: 'quantityChanged',
+      title: '调整数量',
+      width: 100,
+    },
+    {
+      field: 'quantityProduced',
+      title: '已生产数量',
+      width: 100,
+    },
+    {
+      field: 'clientCode',
+      title: '客户编码',
+      width: 120,
+    },
+    {
+      field: 'clientName',
+      title: '客户名称',
+      width: 120,
+    },
+    {
+      field: 'requestDate',
+      title: '需求日期',
+      width: 120,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'status',
+      title: '排产状态',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_PRO_WORK_ORDER_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 100,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 排产对话框只读工单信息的表单 */
+export function useScheduleFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '工单编码',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '工单名称',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'orderSourceType',
+      label: '工单来源',
+      component: 'Select',
+      componentProps: {
+        disabled: true,
+        options: getDictOptions(DICT_TYPE.MES_PRO_WORK_ORDER_SOURCE_TYPE, 'number'),
+      },
+    },
+    {
+      fieldName: 'orderSourceCode',
+      label: '来源单据编号',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'type',
+      label: '工单类型',
+      component: 'Select',
+      componentProps: {
+        disabled: true,
+        options: getDictOptions(DICT_TYPE.MES_PRO_WORK_ORDER_TYPE, 'number'),
+      },
+    },
+    {
+      fieldName: 'productId',
+      label: '产品',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'productSpecification',
+      label: '规格型号',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'unitMeasureName',
+      label: '单位',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'quantity',
+      label: '工单数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        disabled: true,
+        precision: 2,
+      },
+    },
+    {
+      fieldName: 'clientId',
+      label: '客户',
+      component: markRaw(MdClientSelect),
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'requestDate',
+      label: '需求日期',
+      component: 'DatePicker',
+      componentProps: {
+        class: '!w-full',
+        disabled: true,
+        format: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        disabled: true,
+        rows: 2,
+      },
+    },
+  ];
+}
+
+/** 生产任务子表的字段 */
+export function useTaskGridColumns(
+  editable: boolean,
+): VxeTableGridOptions<MesProTaskApi.Task>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '任务编码',
+      width: 140,
+    },
+    {
+      field: 'name',
+      title: '任务名称',
+      minWidth: 150,
+    },
+    {
+      field: 'workstationCode',
+      title: '工作站编号',
+      width: 120,
+    },
+    {
+      field: 'workstationName',
+      title: '工作站名称',
+      width: 120,
+    },
+    {
+      field: 'quantity',
+      title: '排产数量',
+      width: 100,
+    },
+    {
+      field: 'producedQuantity',
+      title: '已生产数量',
+      width: 100,
+    },
+    {
+      field: 'startTime',
+      title: '开始生产时间',
+      width: 170,
+      formatter: 'formatDateTime',
+    },
+    {
+      field: 'duration',
+      title: '生产时长',
+      width: 80,
+    },
+    {
+      field: 'endTime',
+      title: '预计完成时间',
+      width: 170,
+      formatter: 'formatDateTime',
+    },
+    {
+      field: 'colorCode',
+      title: '显示颜色',
+      width: 100,
+      slots: { default: 'colorCode' },
+    },
+    ...(editable
+      ? [
+          {
+            title: '操作',
+            width: 160,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 生产任务新增/修改的表单 */
+export function useTaskFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'workstationId',
+      label: '工作站',
+      component: markRaw(MdWorkstationSelect),
+      componentProps: {
+        placeholder: '请选择工作站',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'quantity',
+      label: '排产数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0.01,
+        placeholder: '请输入排产数量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'colorCode',
+      label: '甘特颜色',
+      component: markRaw(RouteColorPicker),
+    },
+    {
+      fieldName: 'startTime',
+      label: '开始时间',
+      component: 'DatePicker',
+      componentProps: {
+        class: '!w-full',
+        placeholder: '请选择开始时间',
+        showTime: true,
+        valueFormat: 'x',
+        // 开始时间变更：重新计算结束时间
+        onChange: () => recalcEndTime(formApi),
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'duration',
+      label: '生产时长',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 1,
+        placeholder: '请输入生产时长',
+        precision: 0,
+        // 生产时长变更：重新计算结束时间
+        onChange: () => recalcEndTime(formApi),
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'endTime',
+      label: '结束时间',
+      component: 'DatePicker',
+      componentProps: {
+        class: '!w-full',
+        disabled: true,
+        showTime: true,
+        valueFormat: 'x',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 2,
+      },
+    },
+  ];
+}
+
+/** 计算结束时间：开始时间 + 生产时长 × 8 小时 */
+async function recalcEndTime(formApi?: VbenFormApi) {
+  if (!formApi) {
+    return;
+  }
+  const values = await formApi.getValues();
+  if (values.startTime && values.duration) {
+    const start = Number(values.startTime);
+    await formApi.setFieldValue(
+      'endTime',
+      start + values.duration * 8 * 3600 * 1000,
+    );
+  }
+}
+
 /** 任务选择弹窗的搜索表单 */
 export function useTaskSelectGridFormSchema(): VbenFormSchema[] {
   return [
diff --git a/apps/web-antd/src/views/mes/pro/workorder/components/index.ts b/apps/web-antd/src/views/mes/pro/workorder/components/index.ts
index 1059f8a79..b53e2876b 100644
--- a/apps/web-antd/src/views/mes/pro/workorder/components/index.ts
+++ b/apps/web-antd/src/views/mes/pro/workorder/components/index.ts
@@ -1 +1,2 @@
+export { default as ProWorkOrderSelectDialog } from './pro-work-order-select-dialog.vue';
 export { default as ProWorkOrderSelect } from './pro-work-order-select.vue';
diff --git a/apps/web-antd/src/views/mes/pro/workorder/components/pro-work-order-select.vue b/apps/web-antd/src/views/mes/pro/workorder/components/pro-work-order-select.vue
index 8b3907b1a..fb3a53503 100644
--- a/apps/web-antd/src/views/mes/pro/workorder/components/pro-work-order-select.vue
+++ b/apps/web-antd/src/views/mes/pro/workorder/components/pro-work-order-select.vue
@@ -1,20 +1,16 @@
 <script lang="ts" setup>
 import type { MesProWorkOrderApi } from '#/api/mes/pro/workorder';
 
-import { computed, onMounted, ref, watch } from 'vue';
+import { computed, ref, useAttrs, watch } from 'vue';
 
-import { Select, Tag, Tooltip } from 'ant-design-vue';
+import { IconifyIcon } from '@vben/icons';
 
-import { getWorkOrder, getWorkOrderPage } from '#/api/mes/pro/workorder';
+import { Input, Tooltip } from 'ant-design-vue';
+
+import { getWorkOrder } from '#/api/mes/pro/workorder';
+
+import ProWorkOrderSelectDialog from './pro-work-order-select-dialog.vue';
 
-/**
- * MES 生产工单选择器（轻量版）
- *
- * 当前用于安灯记录等只需要单选工单 ID 的业务页面：
- * - 默认按 `status` 过滤拉取首页 100 条工单作为下拉
- * - 编辑回显走 `getWorkOrder(id)`
- * - 后续 `mes/pro/workorder` 完整迁移后，可替换为带弹窗的复杂选择器
- */
 defineOptions({ name: 'ProWorkOrderSelect', inheritAttrs: false });
 
 const props = withDefaults(
@@ -22,7 +18,6 @@ const props = withDefaults(
     allowClear?: boolean;
     disabled?: boolean;
     modelValue?: number;
-    pageSize?: number;
     placeholder?: string;
     status?: number;
     type?: number;
@@ -31,7 +26,6 @@ const props = withDefaults(
     allowClear: true,
     disabled: false,
     modelValue: undefined,
-    pageSize: 100,
     placeholder: '请选择工单',
     status: undefined,
     type: undefined,
@@ -43,102 +37,104 @@ const emit = defineEmits<{
   'update:modelValue': [value: number | undefined];
 }>();
 
-const allList = ref<MesProWorkOrderApi.WorkOrder[]>([]);
-const selectedItem = ref<MesProWorkOrderApi.WorkOrder>();
+const attrs = useAttrs(); // 透传属性
+const dialogRef = ref<InstanceType<typeof ProWorkOrderSelectDialog>>(); // 工单选择弹窗
+const hovering = ref(false); // 是否悬停
+const selectedItem = ref<MesProWorkOrderApi.WorkOrder>(); // 当前选中工单
 
-const selectValue = computed({
-  get: () => props.modelValue,
-  set: (value: number | undefined) => {
-    emit('update:modelValue', value);
-  },
-});
+const displayLabel = computed(() => selectedItem.value?.code ?? ''); // 选择器展示编码
+const showClear = computed(() => // 是否显示清空图标
+  props.allowClear &&
+  !props.disabled &&
+  hovering.value &&
+  props.modelValue != null,
+);
 
-/** 前端过滤：按工单编码或名称模糊匹配 */
-function handleFilter(input: string, option: any) {
-  const keyword = input.toLowerCase();
-  const item = option?.item as MesProWorkOrderApi.WorkOrder | undefined;
-  return Boolean(
-    item?.code?.toLowerCase().includes(keyword) ||
-      item?.name?.toLowerCase().includes(keyword),
-  );
-}
-
-/** 同步选中工单详情，未在列表内时单独拉取 */
-async function syncSelectedItem(value: number | undefined) {
-  if (value === undefined) {
+/** 根据编号单条查询工单信息（用于编辑回显） */
+async function resolveItemById(id: number | undefined) {
+  if (id == null) {
     selectedItem.value = undefined;
     return;
   }
-  const found = allList.value.find((item) => item.id === value);
-  if (found) {
-    selectedItem.value = found;
+  if (selectedItem.value?.id === id) {
     return;
   }
-  try {
-    selectedItem.value = await getWorkOrder(value);
-  } catch (error) {
-    console.error('[ProWorkOrderSelect] resolveItemById failed:', error);
+  selectedItem.value = await getWorkOrder(id);
+}
+
+watch(() => props.modelValue, resolveItemById, { immediate: true });
+
+/** 清空已选工单 */
+function clearSelected() {
+  selectedItem.value = undefined;
+  emit('update:modelValue', undefined);
+  emit('change', undefined);
+}
+
+/** 打开工单选择弹窗 */
+function handleClick(event: MouseEvent) {
+  if (props.disabled) {
+    return;
   }
+  const target = event.target as HTMLElement;
+  if (showClear.value && target.closest('.ant-input-suffix')) {
+    event.stopPropagation();
+    clearSelected();
+    return;
+  }
+  const selectedIds = props.modelValue == null ? [] : [props.modelValue];
+  dialogRef.value?.open(selectedIds, { multiple: false });
 }
 
-/** 除 v-model 外，额外抛出完整工单对象给业务表单使用 */
-function handleChange(value: any) {
-  const nextValue = value === undefined ? undefined : Number(value);
-  syncSelectedItem(nextValue);
-  emit('change', selectedItem.value);
+/** 弹窗选中回调 */
+function handleSelected(rows: MesProWorkOrderApi.WorkOrder[]) {
+  const item = rows[0];
+  if (!item) {
+    return;
+  }
+  selectedItem.value = item;
+  emit('update:modelValue', item.id);
+  emit('change', item);
 }
-
-watch(
-  () => props.modelValue,
-  (value) => {
-    syncSelectedItem(value);
-  },
-);
-
-onMounted(async () => {
-  const data = await getWorkOrderPage({
-    pageNo: 1,
-    pageSize: props.pageSize,
-    status: props.status,
-    type: props.type,
-  });
-  allList.value = data.list ?? [];
-  syncSelectedItem(props.modelValue);
-});
 </script>
 
 <template>
-  <Tooltip :mouse-enter-delay="0.5" :open="selectedItem ? undefined : false">
-    <template #title>
-      <div v-if="selectedItem" class="leading-6">
-        <div>编码：{{ selectedItem.code || '-' }}</div>
-        <div>名称：{{ selectedItem.name || '-' }}</div>
-        <div>产品：{{ selectedItem.productName || '-' }}</div>
-        <div>数量：{{ selectedItem.quantity ?? '-' }}</div>
-      </div>
-    </template>
-    <Select
-      v-bind="$attrs"
-      v-model:value="selectValue"
-      :allow-clear="allowClear"
-      :disabled="disabled"
-      :filter-option="handleFilter"
-      :placeholder="placeholder"
-      class="w-full"
-      show-search
-      @change="handleChange"
-    >
-      <Select.Option
-        v-for="item in allList"
-        :key="item.id"
-        :item="item"
-        :value="item.id"
-      >
-        <div class="flex items-center gap-2">
-          <span>{{ item.code }}</span>
-          <Tag v-if="item.name" color="default">{{ item.name }}</Tag>
+  <div
+    v-bind="attrs"
+    class="w-full"
+    :class="disabled ? 'cursor-not-allowed' : 'cursor-pointer'"
+    @click="handleClick"
+    @mouseenter="hovering = true"
+    @mouseleave="hovering = false"
+  >
+    <Tooltip :mouse-enter-delay="0.5" :open="selectedItem ? undefined : false">
+      <template #title>
+        <div v-if="selectedItem" class="leading-6">
+          <div>编码：{{ selectedItem.code || '-' }}</div>
+          <div>名称：{{ selectedItem.name || '-' }}</div>
+          <div>产品：{{ selectedItem.productName || '-' }}</div>
+          <div>数量：{{ selectedItem.quantity ?? '-' }}</div>
         </div>
-      </Select.Option>
-    </Select>
-  </Tooltip>
+      </template>
+      <Input
+        :disabled="disabled"
+        :placeholder="placeholder"
+        :value="displayLabel"
+        readonly
+      >
+        <template #suffix>
+          <IconifyIcon
+            class="size-4"
+            :icon="showClear ? 'lucide:circle-x' : 'lucide:search'"
+          />
+        </template>
+      </Input>
+    </Tooltip>
+  </div>
+  <ProWorkOrderSelectDialog
+    ref="dialogRef"
+    :status="status"
+    :type="type"
+    @selected="handleSelected"
+  />
 </template>
diff --git a/apps/web-antd/src/views/mes/wm/batch/components/index.ts b/apps/web-antd/src/views/mes/wm/batch/components/index.ts
index 6d4a5d756..1b9294cdd 100644
--- a/apps/web-antd/src/views/mes/wm/batch/components/index.ts
+++ b/apps/web-antd/src/views/mes/wm/batch/components/index.ts
@@ -1,2 +1,3 @@
+export { default as WmBatchDetail } from './wm-batch-detail.vue';
 export { default as WmBatchSelectDialog } from './wm-batch-select-dialog.vue';
 export { default as WmBatchSelect } from './wm-batch-select.vue';
diff --git a/apps/web-antd/src/views/mes/wm/batch/data.ts b/apps/web-antd/src/views/mes/wm/batch/data.ts
index 74b0e3776..285b55e5e 100644
--- a/apps/web-antd/src/views/mes/wm/batch/data.ts
+++ b/apps/web-antd/src/views/mes/wm/batch/data.ts
@@ -1,16 +1,21 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesWmBatchApi } from '#/api/mes/wm/batch';
+import type { DescriptionItemSchema } from '#/components/description';
 
-import { markRaw } from 'vue';
+import { h, markRaw } from 'vue';
 
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
+import { formatDate } from '@vben/utils';
 
+import { DictTag } from '#/components/dict-tag';
+import { getRangePickerDefaultProps } from '#/utils';
 import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
 import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
 import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
 import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
+import { ProTaskSelect } from '#/views/mes/pro/task/components';
 import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
 import { TmToolSelect } from '#/views/mes/tm/tool/components';
 
@@ -66,6 +71,14 @@ export function useBatchSelectGridFormSchema(): VbenFormSchema[] {
         placeholder: '请选择工作站',
       },
     },
+    {
+      fieldName: 'taskId',
+      label: '生产任务',
+      component: markRaw(ProTaskSelect),
+      componentProps: {
+        placeholder: '请选择生产任务',
+      },
+    },
     {
       fieldName: 'toolId',
       label: '工具',
@@ -74,6 +87,15 @@ export function useBatchSelectGridFormSchema(): VbenFormSchema[] {
         placeholder: '请选择工具',
       },
     },
+    {
+      fieldName: 'moldId',
+      label: '模具编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入模具编号',
+      },
+    },
     {
       fieldName: 'salesOrderCode',
       label: '销售订单编号',
@@ -111,6 +133,33 @@ export function useBatchSelectGridFormSchema(): VbenFormSchema[] {
         placeholder: '请选择质量状态',
       },
     },
+    {
+      fieldName: 'produceDate',
+      label: '生产日期',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+        allowClear: true,
+      },
+    },
+    {
+      fieldName: 'expireDate',
+      label: '有效期',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+        allowClear: true,
+      },
+    },
+    {
+      fieldName: 'receiptDate',
+      label: '入库日期',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+        allowClear: true,
+      },
+    },
   ];
 }
 
@@ -232,3 +281,92 @@ export function useBatchSelectGridColumns(
     },
   ];
 }
+
+/** 批次详情的描述字段 */
+export function useDetailSchema(): DescriptionItemSchema[] {
+  return [
+    {
+      field: 'code',
+      label: '批次编号',
+    },
+    {
+      field: 'itemCode',
+      label: '物料编码',
+    },
+    {
+      field: 'itemName',
+      label: '物料名称',
+    },
+    {
+      field: 'itemSpecification',
+      label: '规格型号',
+    },
+    {
+      field: 'unitName',
+      label: '单位',
+    },
+    {
+      field: 'lotNumber',
+      label: '生产批号',
+    },
+    {
+      field: 'produceDate',
+      label: '生产日期',
+      render: (value) => (value ? formatDate(value, 'YYYY-MM-DD') : '-'),
+    },
+    {
+      field: 'expireDate',
+      label: '有效期',
+      render: (value) => (value ? formatDate(value, 'YYYY-MM-DD') : '-'),
+    },
+    {
+      field: 'receiptDate',
+      label: '入库日期',
+      render: (value) => (value ? formatDate(value, 'YYYY-MM-DD') : '-'),
+    },
+    {
+      field: 'vendorName',
+      label: '供应商',
+      render: (value) => value || '-',
+    },
+    {
+      field: 'clientName',
+      label: '客户',
+      render: (value) => value || '-',
+    },
+    {
+      field: 'workstationCode',
+      label: '工作站',
+      render: (value) => value || '-',
+    },
+    {
+      field: 'purchaseOrderCode',
+      label: '采购订单编号',
+      render: (value) => value || '-',
+    },
+    {
+      field: 'salesOrderCode',
+      label: '销售订单编号',
+      render: (value) => value || '-',
+    },
+    {
+      field: 'workOrderCode',
+      label: '生产工单',
+      render: (value) => value || '-',
+    },
+    {
+      field: 'qualityStatus',
+      label: '质量状态',
+      render: (value) =>
+        value == null
+          ? '-'
+          : h(DictTag, { type: DICT_TYPE.MES_WM_QUALITY_STATUS, value }),
+    },
+    {
+      field: 'remark',
+      label: '备注',
+      span: 3,
+      render: (value) => value || '-',
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/wm/materialstock/components/wm-material-stock-select-dialog.vue b/apps/web-antd/src/views/mes/wm/materialstock/components/wm-material-stock-select-dialog.vue
index 837983a1d..a6201fbc6 100644
--- a/apps/web-antd/src/views/mes/wm/materialstock/components/wm-material-stock-select-dialog.vue
+++ b/apps/web-antd/src/views/mes/wm/materialstock/components/wm-material-stock-select-dialog.vue
@@ -35,8 +35,7 @@ const emit = defineEmits<{
 }>();
 
 const open = ref(false);
-const multiple = ref(true);
-const syncingSingleSelection = ref(false);
+const multiple = ref(false); // 是否多选；默认按单选选择器使用
 const selectedRows = ref<MesWmMaterialStockApi.MaterialStock[]>([]);
 const preSelectedIds = ref<number[]>([]);
 const searchItemTypeId = ref<number>();
@@ -64,50 +63,37 @@ const alertTitle = computed(() => {
   return `已按${parts.join('/')}预过滤`;
 });
 
-/** 单选模式同步 VXE 勾选状态 */
-async function syncSingleSelection(row?: MesWmMaterialStockApi.MaterialStock) {
-  syncingSingleSelection.value = true;
-  await nextTick();
-  await gridApi.grid.clearCheckboxRow();
-  if (row) {
-    await gridApi.grid.setCheckboxRow(row, true);
-  }
-  await nextTick();
-  syncingSingleSelection.value = false;
+/** 获取多选记录，包含 VXE reserve 跨页记录 */
+function getMultipleSelectedRows() {
+  const selectedMap = new Map<number, MesWmMaterialStockApi.MaterialStock>();
+  const records = [
+    ...(gridApi.grid.getCheckboxReserveRecords?.() ?? []),
+    ...(gridApi.grid.getCheckboxRecords?.() ?? []),
+  ] as MesWmMaterialStockApi.MaterialStock[];
+  records.forEach((row) => {
+    const rowId = row.id;
+    if (rowId !== undefined) {
+      selectedMap.set(rowId, row);
+    }
+  });
+  return [...selectedMap.values()];
 }
 
-/** 处理勾选变化 */
-async function handleCheckboxChange({
-  checked,
-  records,
-  row,
-}: {
-  checked: boolean;
-  records: MesWmMaterialStockApi.MaterialStock[];
-  row?: MesWmMaterialStockApi.MaterialStock;
-}) {
-  if (syncingSingleSelection.value) {
-    return;
-  }
-  if (!multiple.value) {
-    const selected = checked && row ? [row] : [];
-    selectedRows.value = selected;
-    await syncSingleSelection(selected[0]);
-    return;
-  }
-  selectedRows.value = records;
+/** 处理多选勾选变化 */
+function handleCheckboxSelectChange() {
+  selectedRows.value = getMultipleSelectedRows();
 }
 
-/** 处理全选变化 */
-function handleCheckboxAll({
-  records,
-}: {
-  records: MesWmMaterialStockApi.MaterialStock[];
-}) {
-  if (syncingSingleSelection.value) {
-    return;
-  }
-  selectedRows.value = records;
+/** 处理单选切换 */
+function handleRadioChange(row: MesWmMaterialStockApi.MaterialStock) {
+  selectedRows.value = [row];
+}
+
+/** 多选模式下切换行勾选 */
+async function toggleMultipleRow(row: MesWmMaterialStockApi.MaterialStock) {
+  const selected = gridApi.grid.isCheckedByCheckboxRow(row);
+  await gridApi.grid.setCheckboxRow(row, !selected);
+  selectedRows.value = getMultipleSelectedRows();
 }
 
 /** 双击行：单选直接确认；多选切换勾选 */
@@ -117,33 +103,34 @@ async function handleRowDblclick({
   row: MesWmMaterialStockApi.MaterialStock;
 }) {
   if (multiple.value) {
-    const checked = !gridApi.grid.isCheckedByCheckboxRow(row);
-    await gridApi.grid.setCheckboxRow(row, checked);
-    handleCheckboxChange({
-      checked,
-      records: gridApi.grid.getCheckboxRecords() as MesWmMaterialStockApi.MaterialStock[],
-      row,
-    });
+    await toggleMultipleRow(row);
     return;
   }
   selectedRows.value = [row];
-  await syncSingleSelection(row);
+  await gridApi.grid.setRadioRow(row);
   handleConfirm();
 }
 
 /** 回显预选 */
-function applyPreSelection() {
+async function applyPreSelection() {
   if (preSelectedIds.value.length === 0) {
     return;
   }
   const rows = gridApi.grid.getData() as MesWmMaterialStockApi.MaterialStock[];
   for (const row of rows) {
-    if (row.id && preSelectedIds.value.includes(row.id)) {
-      gridApi.grid.setCheckboxRow(row, true);
-      if (!multiple.value) {
-        selectedRows.value = [row];
-      }
+    if (row.id === undefined || !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();
   }
 }
 
@@ -152,10 +139,11 @@ const [Grid, gridApi] = useVbenVxeGrid({
     schema: useSelectGridFormSchema(),
   },
   gridOptions: {
-    columns: useSelectGridColumns(),
+    columns: useSelectGridColumns(false),
     height: 480,
     keepSource: true,
     checkboxConfig: { highlight: true, range: true, reserve: true },
+    radioConfig: { highlight: true, trigger: 'row' },
     proxyConfig: {
       ajax: {
         query: async ({ page }, formValues) => {
@@ -186,8 +174,11 @@ const [Grid, gridApi] = useVbenVxeGrid({
   } as VxeTableGridOptions<MesWmMaterialStockApi.MaterialStock>,
   gridEvents: {
     cellDblclick: handleRowDblclick,
-    checkboxAll: handleCheckboxAll,
-    checkboxChange: handleCheckboxChange,
+    checkboxAll: handleCheckboxSelectChange,
+    checkboxChange: handleCheckboxSelectChange,
+    radioChange: ({ row }: { row: MesWmMaterialStockApi.MaterialStock }) => {
+      handleRadioChange(row);
+    },
   },
 });
 
@@ -202,6 +193,8 @@ async function resetQueryState() {
   selectedRows.value = [];
   searchItemTypeId.value = undefined;
   await gridApi.grid.clearCheckboxRow();
+  await gridApi.grid.clearCheckboxReserve();
+  await gridApi.grid.clearRadioRow();
   await gridApi.formApi.resetForm();
 }
 
@@ -211,13 +204,16 @@ async function openModal(
   options?: { multiple?: boolean },
 ) {
   open.value = true;
-  multiple.value = options?.multiple ?? true;
+  multiple.value = options?.multiple ?? false;
   preSelectedIds.value = selectedIds || [];
   await nextTick();
+  gridApi.setGridOptions({
+    columns: useSelectGridColumns(multiple.value),
+  });
   await resetQueryState();
   await gridApi.query();
   await nextTick();
-  applyPreSelection();
+  await applyPreSelection();
 }
 
 /** 关闭弹窗 */
@@ -228,14 +224,12 @@ async function closeModal() {
 
 /** 确认选择 */
 function handleConfirm() {
-  if (selectedRows.value.length === 0) {
+  const rows = multiple.value ? getMultipleSelectedRows() : selectedRows.value;
+  if (rows.length === 0) {
     message.warning(multiple.value ? '请至少选择一条数据' : '请选择一条数据');
     return;
   }
-  emit(
-    'selected',
-    multiple.value ? selectedRows.value : [selectedRows.value[0]!],
-  );
+  emit('selected', multiple.value ? rows : [rows[0]!]);
   open.value = false;
 }
 
diff --git a/apps/web-antd/src/views/mes/wm/materialstock/components/wm-material-stock-select.vue b/apps/web-antd/src/views/mes/wm/materialstock/components/wm-material-stock-select.vue
index e8dd366c7..6430bee14 100644
--- a/apps/web-antd/src/views/mes/wm/materialstock/components/wm-material-stock-select.vue
+++ b/apps/web-antd/src/views/mes/wm/materialstock/components/wm-material-stock-select.vue
@@ -71,11 +71,7 @@ async function resolveItemById(id: number | undefined) {
   if (selectedItem.value?.id === id) {
     return;
   }
-  try {
-    selectedItem.value = await getMaterialStock(id);
-  } catch (error) {
-    console.error('[WmMaterialStockSelect] resolveItemById failed:', error);
-  }
+  selectedItem.value = await getMaterialStock(id);
 }
 
 watch(() => props.modelValue, resolveItemById, { immediate: true });
diff --git a/apps/web-antd/src/views/mes/wm/materialstock/data.ts b/apps/web-antd/src/views/mes/wm/materialstock/data.ts
index 0500129ec..cde557f50 100644
--- a/apps/web-antd/src/views/mes/wm/materialstock/data.ts
+++ b/apps/web-antd/src/views/mes/wm/materialstock/data.ts
@@ -72,8 +72,12 @@ export function useGridFormSchema(): VbenFormSchema[] {
 }
 
 /** 列表的字段 */
+// TODO @AI：看看别的模块，是不是会叫 onFrozenChange？还是一般叫什么梗合适？？？
 export function useGridColumns(
-  onFrozenChange: (row: MesWmMaterialStockApi.MaterialStock) => void,
+  onFrozenChange: (
+    newFrozen: boolean,
+    row: MesWmMaterialStockApi.MaterialStock,
+  ) => Promise<boolean | undefined>,
 ): VxeTableGridOptions<MesWmMaterialStockApi.MaterialStock>['columns'] {
   return [
     {
@@ -206,10 +210,12 @@ export function useSelectGridFormSchema(): VbenFormSchema[] {
 }
 
 /** 选择弹窗的字段 */
-export function useSelectGridColumns(): VxeTableGridOptions<MesWmMaterialStockApi.MaterialStock>['columns'] {
+export function useSelectGridColumns(
+  multiple = false,
+): VxeTableGridOptions<MesWmMaterialStockApi.MaterialStock>['columns'] {
   return [
     {
-      type: 'checkbox',
+      type: multiple ? 'checkbox' : 'radio',
       width: 50,
     },
     {
diff --git a/apps/web-antd/src/views/mes/wm/materialstock/index.vue b/apps/web-antd/src/views/mes/wm/materialstock/index.vue
index d24ecaf3e..3006511ed 100644
--- a/apps/web-antd/src/views/mes/wm/materialstock/index.vue
+++ b/apps/web-antd/src/views/mes/wm/materialstock/index.vue
@@ -17,6 +17,7 @@ import {
 } from '#/api/mes/wm/materialstock';
 import { $t } from '#/locales';
 import MdItemTypeTree from '#/views/mes/md/item/type/components/md-item-type-tree.vue';
+import { WmBatchDetail } from '#/views/mes/wm/batch/components';
 import AreaForm from '#/views/mes/wm/warehouse/area/modules/form.vue';
 
 import { useGridColumns, useGridFormSchema } from './data';
@@ -26,6 +27,8 @@ const [AreaModal, areaModalApi] = useVbenModal({
   destroyOnClose: true,
 });
 
+const batchDetailRef = ref<InstanceType<typeof WmBatchDetail>>();
+
 /** 刷新表格 */
 function handleRefresh() {
   gridApi.query();
@@ -55,11 +58,20 @@ function handleOpenAreaDetail(row: MesWmMaterialStockApi.MaterialStock) {
   areaModalApi.setData({ formType: 'detail', id: row.areaId }).open();
 }
 
+/** 打开批次详情弹窗 */
+function handleOpenBatchDetail(row: MesWmMaterialStockApi.MaterialStock) {
+  if (!row.batchId) {
+    return;
+  }
+  batchDetailRef.value?.open(row.batchId);
+}
+
 /** 处理冻结状态切换 */
 async function handleFrozenChange(
+  newFrozen: boolean,
   row: MesWmMaterialStockApi.MaterialStock,
 ): Promise<boolean | undefined> {
-  const text = row.frozen ? '冻结' : '解冻';
+  const text = newFrozen ? '冻结' : '解冻';
   try {
     await confirm(`确认要"${text}"该库存记录吗？`);
   } catch {
@@ -68,7 +80,7 @@ async function handleFrozenChange(
   // 更新冻结状态
   await updateMaterialStockFrozen({
     id: row.id!,
-    frozen: row.frozen!,
+    frozen: newFrozen,
   });
   // 提示并返回成功
   message.success(`${text}成功`);
@@ -117,6 +129,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     </template>
 
     <AreaModal />
+    <WmBatchDetail ref="batchDetailRef" />
 
     <div class="flex h-full w-full">
       <!-- 左侧物料分类树 -->
@@ -140,9 +153,15 @@ const [Grid, gridApi] = useVbenVxeGrid({
             />
           </template>
           <template #batchCode="{ row }">
-            <span v-if="row.batchId" :title="row.batchCode">
+            <Button
+              v-if="row.batchId"
+              :title="row.batchCode"
+              size="small"
+              type="link"
+              @click="handleOpenBatchDetail(row)"
+            >
               {{ row.batchCode }}
-            </span>
+            </Button>
             <span v-else>-</span>
           </template>
           <template #areaName="{ row }">
diff --git a/apps/web-ele/src/router/routes/modules/mes.ts b/apps/web-ele/src/router/routes/modules/mes.ts
index 05af60e29..4172fdbc9 100644
--- a/apps/web-ele/src/router/routes/modules/mes.ts
+++ b/apps/web-ele/src/router/routes/modules/mes.ts
@@ -39,6 +39,15 @@ const routes: RouteRecordRaw[] = [
         },
         component: () => import('#/views/mes/wm/barcode/config/index.vue'),
       },
+      {
+        path: 'pro/task/edit',
+        name: 'MesProTaskGanttEdit',
+        meta: {
+          title: '甘特图编辑',
+          activePath: '/mes/pro/task',
+        },
+        component: () => import('#/views/mes/pro/task/edit/index.vue'),
+      },
     ],
   },
 ];
diff --git a/apps/web-ele/src/views/mes/pro/task/components/index.ts b/apps/web-ele/src/views/mes/pro/task/components/index.ts
index 3847bb912..bfaf6ae17 100644
--- a/apps/web-ele/src/views/mes/pro/task/components/index.ts
+++ b/apps/web-ele/src/views/mes/pro/task/components/index.ts
@@ -1,2 +1,3 @@
+export { default as GanttChart } from './gantt-chart.vue';
 export { default as ProTaskSelectDialog } from './pro-task-select-dialog.vue';
 export { default as ProTaskSelect } from './pro-task-select.vue';
diff --git a/apps/web-ele/src/views/mes/pro/task/data.ts b/apps/web-ele/src/views/mes/pro/task/data.ts
index 1e1cc70a2..b78f2a030 100644
--- a/apps/web-ele/src/views/mes/pro/task/data.ts
+++ b/apps/web-ele/src/views/mes/pro/task/data.ts
@@ -1,15 +1,467 @@
-import type { VbenFormSchema } from '#/adapter/form';
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesProTaskApi } from '#/api/mes/pro/task';
+import type { MesProWorkOrderApi } from '#/api/mes/pro/workorder';
 
 import { markRaw } from 'vue';
 
 import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
 
+import { getRangePickerDefaultProps } from '#/utils';
+import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
+import { MdItemSelect } from '#/views/mes/md/item/components';
 import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
 import { ProProcessSelect } from '#/views/mes/pro/process/components';
+import { RouteColorPicker } from '#/views/mes/pro/route/components';
 import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
 
+/** 待排产工单列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '工单编码',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入工单编码',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '工单名称',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入工单名称',
+      },
+    },
+    {
+      fieldName: 'orderSourceCode',
+      label: '来源单据',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入来源单据编号',
+      },
+    },
+    {
+      fieldName: 'productId',
+      label: '产品',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择产品',
+      },
+    },
+    {
+      fieldName: 'clientId',
+      label: '客户',
+      component: markRaw(MdClientSelect),
+      componentProps: {
+        placeholder: '请选择客户',
+      },
+    },
+    {
+      fieldName: 'requestDate',
+      label: '需求日期',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+        clearable: true,
+      },
+    },
+  ];
+}
+
+/** 待排产工单列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesProWorkOrderApi.WorkOrder>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '工单编码',
+      fixed: 'left',
+      width: 200,
+      treeNode: true,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '工单名称',
+      minWidth: 150,
+    },
+    {
+      field: 'orderSourceType',
+      title: '工单来源',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_PRO_WORK_ORDER_SOURCE_TYPE },
+      },
+    },
+    {
+      field: 'orderSourceCode',
+      title: '来源单据编号',
+      width: 140,
+    },
+    {
+      field: 'productCode',
+      title: '产品编码',
+      width: 120,
+    },
+    {
+      field: 'productName',
+      title: '产品名称',
+      minWidth: 120,
+    },
+    {
+      field: 'productSpecification',
+      title: '规格型号',
+      width: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'quantity',
+      title: '工单数量',
+      width: 100,
+    },
+    {
+      field: 'quantityChanged',
+      title: '调整数量',
+      width: 100,
+    },
+    {
+      field: 'quantityProduced',
+      title: '已生产数量',
+      width: 100,
+    },
+    {
+      field: 'clientCode',
+      title: '客户编码',
+      width: 120,
+    },
+    {
+      field: 'clientName',
+      title: '客户名称',
+      width: 120,
+    },
+    {
+      field: 'requestDate',
+      title: '需求日期',
+      width: 120,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'status',
+      title: '排产状态',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_PRO_WORK_ORDER_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 100,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 排产对话框只读工单信息的表单 */
+export function useScheduleFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '工单编码',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '工单名称',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'orderSourceType',
+      label: '工单来源',
+      component: 'Select',
+      componentProps: {
+        disabled: true,
+        options: getDictOptions(DICT_TYPE.MES_PRO_WORK_ORDER_SOURCE_TYPE, 'number'),
+      },
+    },
+    {
+      fieldName: 'orderSourceCode',
+      label: '来源单据编号',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'type',
+      label: '工单类型',
+      component: 'Select',
+      componentProps: {
+        disabled: true,
+        options: getDictOptions(DICT_TYPE.MES_PRO_WORK_ORDER_TYPE, 'number'),
+      },
+    },
+    {
+      fieldName: 'productId',
+      label: '产品',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'productSpecification',
+      label: '规格型号',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'unitMeasureName',
+      label: '单位',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'quantity',
+      label: '工单数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        disabled: true,
+        precision: 2,
+      },
+    },
+    {
+      fieldName: 'clientId',
+      label: '客户',
+      component: markRaw(MdClientSelect),
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'requestDate',
+      label: '需求日期',
+      component: 'DatePicker',
+      componentProps: {
+        class: '!w-full',
+        disabled: true,
+        type: 'date',
+        valueFormat: 'x',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        disabled: true,
+        rows: 2,
+      },
+    },
+  ];
+}
+
+/** 生产任务子表的字段 */
+export function useTaskGridColumns(
+  editable: boolean,
+): VxeTableGridOptions<MesProTaskApi.Task>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '任务编码',
+      width: 140,
+    },
+    {
+      field: 'name',
+      title: '任务名称',
+      minWidth: 150,
+    },
+    {
+      field: 'workstationCode',
+      title: '工作站编号',
+      width: 120,
+    },
+    {
+      field: 'workstationName',
+      title: '工作站名称',
+      width: 120,
+    },
+    {
+      field: 'quantity',
+      title: '排产数量',
+      width: 100,
+    },
+    {
+      field: 'producedQuantity',
+      title: '已生产数量',
+      width: 100,
+    },
+    {
+      field: 'startTime',
+      title: '开始生产时间',
+      width: 170,
+      formatter: 'formatDateTime',
+    },
+    {
+      field: 'duration',
+      title: '生产时长',
+      width: 80,
+    },
+    {
+      field: 'endTime',
+      title: '预计完成时间',
+      width: 170,
+      formatter: 'formatDateTime',
+    },
+    {
+      field: 'colorCode',
+      title: '显示颜色',
+      width: 100,
+      slots: { default: 'colorCode' },
+    },
+    ...(editable
+      ? [
+          {
+            title: '操作',
+            width: 160,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 生产任务新增/修改的表单 */
+export function useTaskFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'workstationId',
+      label: '工作站',
+      component: markRaw(MdWorkstationSelect),
+      componentProps: {
+        placeholder: '请选择工作站',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'quantity',
+      label: '排产数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0.01,
+        placeholder: '请输入排产数量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'colorCode',
+      label: '甘特颜色',
+      component: markRaw(RouteColorPicker),
+    },
+    {
+      fieldName: 'startTime',
+      label: '开始时间',
+      component: 'DatePicker',
+      componentProps: {
+        class: '!w-full',
+        placeholder: '请选择开始时间',
+        type: 'datetime',
+        valueFormat: 'x',
+        // 开始时间变更：重新计算结束时间
+        onChange: () => recalcEndTime(formApi),
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'duration',
+      label: '生产时长',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 1,
+        placeholder: '请输入生产时长',
+        precision: 0,
+        // 生产时长变更：重新计算结束时间
+        onChange: () => recalcEndTime(formApi),
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'endTime',
+      label: '结束时间',
+      component: 'DatePicker',
+      componentProps: {
+        class: '!w-full',
+        disabled: true,
+        type: 'datetime',
+        valueFormat: 'x',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 2,
+      },
+    },
+  ];
+}
+
+/** 计算结束时间：开始时间 + 生产时长 × 8 小时 */
+async function recalcEndTime(formApi?: VbenFormApi) {
+  if (!formApi) {
+    return;
+  }
+  const values = await formApi.getValues();
+  if (values.startTime && values.duration) {
+    const start = Number(values.startTime);
+    await formApi.setFieldValue(
+      'endTime',
+      start + values.duration * 8 * 3600 * 1000,
+    );
+  }
+}
+
 /** 任务选择弹窗的搜索表单 */
 export function useTaskSelectGridFormSchema(): VbenFormSchema[] {
   return [
diff --git a/apps/web-ele/src/views/mes/wm/batch/components/index.ts b/apps/web-ele/src/views/mes/wm/batch/components/index.ts
index 6d4a5d756..1b9294cdd 100644
--- a/apps/web-ele/src/views/mes/wm/batch/components/index.ts
+++ b/apps/web-ele/src/views/mes/wm/batch/components/index.ts
@@ -1,2 +1,3 @@
+export { default as WmBatchDetail } from './wm-batch-detail.vue';
 export { default as WmBatchSelectDialog } from './wm-batch-select-dialog.vue';
 export { default as WmBatchSelect } from './wm-batch-select.vue';
diff --git a/apps/web-ele/src/views/mes/wm/materialstock/components/wm-material-stock-select-dialog.vue b/apps/web-ele/src/views/mes/wm/materialstock/components/wm-material-stock-select-dialog.vue
index 2d5c5740b..d63337ff9 100644
--- a/apps/web-ele/src/views/mes/wm/materialstock/components/wm-material-stock-select-dialog.vue
+++ b/apps/web-ele/src/views/mes/wm/materialstock/components/wm-material-stock-select-dialog.vue
@@ -35,8 +35,7 @@ const emit = defineEmits<{
 }>();
 
 const open = ref(false);
-const multiple = ref(true);
-const syncingSingleSelection = ref(false);
+const multiple = ref(false); // 是否多选；默认按单选选择器使用
 const selectedRows = ref<MesWmMaterialStockApi.MaterialStock[]>([]);
 const preSelectedIds = ref<number[]>([]);
 const searchItemTypeId = ref<number>();
@@ -64,50 +63,37 @@ const alertTitle = computed(() => {
   return `已按${parts.join('/')}预过滤`;
 });
 
-/** 单选模式同步 VXE 勾选状态 */
-async function syncSingleSelection(row?: MesWmMaterialStockApi.MaterialStock) {
-  syncingSingleSelection.value = true;
-  await nextTick();
-  await gridApi.grid.clearCheckboxRow();
-  if (row) {
-    await gridApi.grid.setCheckboxRow(row, true);
-  }
-  await nextTick();
-  syncingSingleSelection.value = false;
+/** 获取多选记录，包含 VXE reserve 跨页记录 */
+function getMultipleSelectedRows() {
+  const selectedMap = new Map<number, MesWmMaterialStockApi.MaterialStock>();
+  const records = [
+    ...(gridApi.grid.getCheckboxReserveRecords?.() ?? []),
+    ...(gridApi.grid.getCheckboxRecords?.() ?? []),
+  ] as MesWmMaterialStockApi.MaterialStock[];
+  records.forEach((row) => {
+    const rowId = row.id;
+    if (rowId !== undefined) {
+      selectedMap.set(rowId, row);
+    }
+  });
+  return [...selectedMap.values()];
 }
 
-/** 处理勾选变化 */
-async function handleCheckboxChange({
-  checked,
-  records,
-  row,
-}: {
-  checked: boolean;
-  records: MesWmMaterialStockApi.MaterialStock[];
-  row?: MesWmMaterialStockApi.MaterialStock;
-}) {
-  if (syncingSingleSelection.value) {
-    return;
-  }
-  if (!multiple.value) {
-    const selected = checked && row ? [row] : [];
-    selectedRows.value = selected;
-    await syncSingleSelection(selected[0]);
-    return;
-  }
-  selectedRows.value = records;
+/** 处理多选勾选变化 */
+function handleCheckboxSelectChange() {
+  selectedRows.value = getMultipleSelectedRows();
 }
 
-/** 处理全选变化 */
-function handleCheckboxAll({
-  records,
-}: {
-  records: MesWmMaterialStockApi.MaterialStock[];
-}) {
-  if (syncingSingleSelection.value) {
-    return;
-  }
-  selectedRows.value = records;
+/** 处理单选切换 */
+function handleRadioChange(row: MesWmMaterialStockApi.MaterialStock) {
+  selectedRows.value = [row];
+}
+
+/** 多选模式下切换行勾选 */
+async function toggleMultipleRow(row: MesWmMaterialStockApi.MaterialStock) {
+  const selected = gridApi.grid.isCheckedByCheckboxRow(row);
+  await gridApi.grid.setCheckboxRow(row, !selected);
+  selectedRows.value = getMultipleSelectedRows();
 }
 
 /** 双击行：单选直接确认；多选切换勾选 */
@@ -117,34 +103,34 @@ async function handleRowDblclick({
   row: MesWmMaterialStockApi.MaterialStock;
 }) {
   if (multiple.value) {
-    const checked = !gridApi.grid.isCheckedByCheckboxRow(row);
-    await gridApi.grid.setCheckboxRow(row, checked);
-    handleCheckboxChange({
-      checked,
-      records:
-        gridApi.grid.getCheckboxRecords() as MesWmMaterialStockApi.MaterialStock[],
-      row,
-    });
+    await toggleMultipleRow(row);
     return;
   }
   selectedRows.value = [row];
-  await syncSingleSelection(row);
+  await gridApi.grid.setRadioRow(row);
   handleConfirm();
 }
 
 /** 回显预选 */
-function applyPreSelection() {
+async function applyPreSelection() {
   if (preSelectedIds.value.length === 0) {
     return;
   }
   const rows = gridApi.grid.getData() as MesWmMaterialStockApi.MaterialStock[];
   for (const row of rows) {
-    if (row.id && preSelectedIds.value.includes(row.id)) {
-      gridApi.grid.setCheckboxRow(row, true);
-      if (!multiple.value) {
-        selectedRows.value = [row];
-      }
+    if (row.id === undefined || !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();
   }
 }
 
@@ -153,7 +139,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     schema: useSelectGridFormSchema(),
   },
   gridOptions: {
-    columns: useSelectGridColumns(),
+    columns: useSelectGridColumns(false),
     height: 480,
     keepSource: true,
     checkboxConfig: {
@@ -161,6 +147,10 @@ const [Grid, gridApi] = useVbenVxeGrid({
       range: true,
       reserve: true,
     },
+    radioConfig: {
+      highlight: true,
+      trigger: 'row',
+    },
     proxyConfig: {
       ajax: {
         query: async ({ page }, formValues) => {
@@ -191,8 +181,11 @@ const [Grid, gridApi] = useVbenVxeGrid({
   } as VxeTableGridOptions<MesWmMaterialStockApi.MaterialStock>,
   gridEvents: {
     cellDblclick: handleRowDblclick,
-    checkboxAll: handleCheckboxAll,
-    checkboxChange: handleCheckboxChange,
+    checkboxAll: handleCheckboxSelectChange,
+    checkboxChange: handleCheckboxSelectChange,
+    radioChange: ({ row }: { row: MesWmMaterialStockApi.MaterialStock }) => {
+      handleRadioChange(row);
+    },
   },
 });
 
@@ -207,6 +200,8 @@ async function resetQueryState() {
   selectedRows.value = [];
   searchItemTypeId.value = undefined;
   await gridApi.grid.clearCheckboxRow();
+  await gridApi.grid.clearCheckboxReserve();
+  await gridApi.grid.clearRadioRow();
   await gridApi.formApi.resetForm();
 }
 
@@ -216,13 +211,16 @@ async function openModal(
   options?: { multiple?: boolean },
 ) {
   open.value = true;
-  multiple.value = options?.multiple ?? true;
+  multiple.value = options?.multiple ?? false;
   preSelectedIds.value = selectedIds || [];
   await nextTick();
+  gridApi.setGridOptions({
+    columns: useSelectGridColumns(multiple.value),
+  });
   await resetQueryState();
   await gridApi.query();
   await nextTick();
-  applyPreSelection();
+  await applyPreSelection();
 }
 
 /** 关闭弹窗 */
@@ -233,14 +231,12 @@ async function closeModal() {
 
 /** 确认选择 */
 function handleConfirm() {
-  if (selectedRows.value.length === 0) {
+  const rows = multiple.value ? getMultipleSelectedRows() : selectedRows.value;
+  if (rows.length === 0) {
     ElMessage.warning(multiple.value ? '请至少选择一条数据' : '请选择一条数据');
     return;
   }
-  emit(
-    'selected',
-    multiple.value ? selectedRows.value : [selectedRows.value[0]!],
-  );
+  emit('selected', multiple.value ? rows : [rows[0]!]);
   open.value = false;
 }
 
diff --git a/apps/web-ele/src/views/mes/wm/materialstock/components/wm-material-stock-select.vue b/apps/web-ele/src/views/mes/wm/materialstock/components/wm-material-stock-select.vue
index 79a409243..de6d70957 100644
--- a/apps/web-ele/src/views/mes/wm/materialstock/components/wm-material-stock-select.vue
+++ b/apps/web-ele/src/views/mes/wm/materialstock/components/wm-material-stock-select.vue
@@ -71,11 +71,7 @@ async function resolveItemById(id: number | undefined) {
   if (selectedItem.value?.id === id) {
     return;
   }
-  try {
-    selectedItem.value = await getMaterialStock(id);
-  } catch (error) {
-    console.error('[WmMaterialStockSelect] resolveItemById failed:', error);
-  }
+  selectedItem.value = await getMaterialStock(id);
 }
 
 watch(() => props.modelValue, resolveItemById, { immediate: true });
diff --git a/apps/web-ele/src/views/mes/wm/materialstock/data.ts b/apps/web-ele/src/views/mes/wm/materialstock/data.ts
index bb67f3e69..ce1102efd 100644
--- a/apps/web-ele/src/views/mes/wm/materialstock/data.ts
+++ b/apps/web-ele/src/views/mes/wm/materialstock/data.ts
@@ -73,7 +73,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
 
 /** 列表的字段 */
 export function useGridColumns(
-  onFrozenChange: (row: MesWmMaterialStockApi.MaterialStock) => void,
+  onFrozenChange: (
+    newFrozen: boolean,
+    row: MesWmMaterialStockApi.MaterialStock,
+  ) => Promise<boolean | undefined>,
 ): VxeTableGridOptions<MesWmMaterialStockApi.MaterialStock>['columns'] {
   return [
     {
@@ -206,10 +209,12 @@ export function useSelectGridFormSchema(): VbenFormSchema[] {
 }
 
 /** 选择弹窗的字段 */
-export function useSelectGridColumns(): VxeTableGridOptions<MesWmMaterialStockApi.MaterialStock>['columns'] {
+export function useSelectGridColumns(
+  multiple = false,
+): VxeTableGridOptions<MesWmMaterialStockApi.MaterialStock>['columns'] {
   return [
     {
-      type: 'checkbox',
+      type: multiple ? 'checkbox' : 'radio',
       width: 50,
     },
     {
diff --git a/apps/web-ele/src/views/mes/wm/materialstock/index.vue b/apps/web-ele/src/views/mes/wm/materialstock/index.vue
index d68af1a33..942ce925e 100644
--- a/apps/web-ele/src/views/mes/wm/materialstock/index.vue
+++ b/apps/web-ele/src/views/mes/wm/materialstock/index.vue
@@ -17,6 +17,7 @@ import {
 } from '#/api/mes/wm/materialstock';
 import { $t } from '#/locales';
 import MdItemTypeTree from '#/views/mes/md/item/type/components/md-item-type-tree.vue';
+import { WmBatchDetail } from '#/views/mes/wm/batch/components';
 import AreaForm from '#/views/mes/wm/warehouse/area/modules/form.vue';
 
 import { useGridColumns, useGridFormSchema } from './data';
@@ -26,9 +27,14 @@ const [AreaModal, areaModalApi] = useVbenModal({
   destroyOnClose: true,
 });
 
+const batchDetailRef = ref<InstanceType<typeof WmBatchDetail>>();
+
 /** 处理冻结状态切换 */
-async function handleFrozenChange(row: MesWmMaterialStockApi.MaterialStock) {
-  const text = row.frozen ? '冻结' : '解冻';
+async function handleFrozenChange(
+  newFrozen: boolean,
+  row: MesWmMaterialStockApi.MaterialStock,
+): Promise<boolean | undefined> {
+  const text = newFrozen ? '冻结' : '解冻';
   try {
     await confirm(`确认要"${text}"该库存记录吗？`);
   } catch {
@@ -36,7 +42,7 @@ async function handleFrozenChange(row: MesWmMaterialStockApi.MaterialStock) {
   }
   await updateMaterialStockFrozen({
     id: row.id!,
-    frozen: row.frozen!,
+    frozen: newFrozen,
   });
   ElMessage.success(`${text}成功`);
   return true;
@@ -90,6 +96,14 @@ function handleOpenAreaDetail(row: MesWmMaterialStockApi.MaterialStock) {
   areaModalApi.setData({ formType: 'detail', id: row.areaId }).open();
 }
 
+/** 打开批次详情弹窗 */
+function handleOpenBatchDetail(row: MesWmMaterialStockApi.MaterialStock) {
+  if (!row.batchId) {
+    return;
+  }
+  batchDetailRef.value?.open(row.batchId);
+}
+
 /** 导出表格 */
 async function handleExport() {
   const data = await exportMaterialStock({
@@ -110,6 +124,7 @@ async function handleExport() {
     </template>
 
     <AreaModal />
+    <WmBatchDetail ref="batchDetailRef" />
 
     <div class="flex h-full gap-3">
       <div class="bg-card w-1/6 rounded p-3">
@@ -131,9 +146,16 @@ async function handleExport() {
             />
           </template>
           <template #batchCode="{ row }">
-            <span v-if="row.batchId" :title="row.batchCode">
+            <ElButton
+              v-if="row.batchId"
+              link
+              size="small"
+              :title="row.batchCode"
+              type="primary"
+              @click="handleOpenBatchDetail(row)"
+            >
               {{ row.batchCode }}
-            </span>
+            </ElButton>
             <span v-else>-</span>
           </template>
           <template #areaName="{ row }">
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7085a4064..b297da835 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -285,6 +285,9 @@ catalogs:
     defu:
       specifier: ^6.1.7
       version: 6.1.7
+    dhtmlx-gantt:
+      specifier: ^9.1.1
+      version: 9.1.4
     diagram-js:
       specifier: ^12.8.1
       version: 12.8.1
@@ -525,6 +528,9 @@ catalogs:
     tw-animate-css:
       specifier: ^1.4.0
       version: 1.4.0
+    tyme4ts:
+      specifier: ^1.5.0
+      version: 1.5.0
     typescript:
       specifier: ^6.0.3
       version: 6.0.3
@@ -819,6 +825,9 @@ importers:
       dayjs:
         specifier: 'catalog:'
         version: 1.11.20
+      dhtmlx-gantt:
+        specifier: 'catalog:'
+        version: 9.1.4
       diagram-js:
         specifier: 'catalog:'
         version: 12.8.1
@@ -1071,6 +1080,9 @@ importers:
       dayjs:
         specifier: 'catalog:'
         version: 1.11.20
+      dhtmlx-gantt:
+        specifier: 'catalog:'
+        version: 9.1.4
       diagram-js:
         specifier: 'catalog:'
         version: 12.8.1
@@ -1293,14 +1305,14 @@ importers:
         version: 2.9.8(vue@3.5.34(typescript@6.0.3))
       vitepress-plugin-group-icons:
         specifier: 'catalog:'
-        version: 1.7.5(vite@8.0.10(@types/node@25.9.1)(esbuild@0.28.0)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.100.0)(sass@1.100.0)(terser@5.48.0)(yaml@2.9.0))
+        version: 1.7.5(vite@8.0.14(@types/node@25.9.1)(esbuild@0.28.0)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.100.0)(sass@1.100.0)(terser@5.48.0)(yaml@2.9.0))
     devDependencies:
       '@nolebase/vitepress-plugin-git-changelog':
         specifier: 'catalog:'
         version: 2.18.2(vitepress@2.0.0-alpha.17(@types/node@25.9.1)(async-validator@4.2.5)(axios@1.16.1)(change-case@5.4.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(nprogress@0.2.0)(postcss@8.5.15)(qrcode@1.5.4)(sass-embedded@1.100.0)(sass@1.100.0)(sortablejs@1.15.7)(terser@5.48.0)(typescript@6.0.3)(yaml@2.9.0))(vue@3.5.34(typescript@6.0.3))
       '@tailwindcss/vite':
         specifier: 'catalog:'
-        version: 4.3.0(vite@8.0.10(@types/node@25.9.1)(esbuild@0.28.0)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.100.0)(sass@1.100.0)(terser@5.48.0)(yaml@2.9.0))
+        version: 4.3.0(vite@8.0.14(@types/node@25.9.1)(esbuild@0.28.0)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.100.0)(sass@1.100.0)(terser@5.48.0)(yaml@2.9.0))
       '@vben/tailwind-config':
         specifier: workspace:*
         version: link:../internal/tailwind-config
@@ -1309,7 +1321,7 @@ importers:
         version: link:../internal/vite-config
       '@vite-pwa/vitepress':
         specifier: 'catalog:'
-        version: 1.1.0(vite-plugin-pwa@1.3.0(vite@8.0.10(@types/node@25.9.1)(esbuild@0.28.0)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.100.0)(sass@1.100.0)(terser@5.48.0)(yaml@2.9.0))(workbox-build@7.4.1)(workbox-window@7.4.1))
+        version: 1.1.0(vite-plugin-pwa@1.3.0(vite@8.0.14(@types/node@25.9.1)(esbuild@0.28.0)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.100.0)(sass@1.100.0)(terser@5.48.0)(yaml@2.9.0))(workbox-build@7.4.1)(workbox-window@7.4.1))
       vitepress:
         specifier: 'catalog:'
         version: 2.0.0-alpha.17(@types/node@25.9.1)(async-validator@4.2.5)(axios@1.16.1)(change-case@5.4.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(nprogress@0.2.0)(postcss@8.5.15)(qrcode@1.5.4)(sass-embedded@1.100.0)(sass@1.100.0)(sortablejs@1.15.7)(terser@5.48.0)(typescript@6.0.3)(yaml@2.9.0)
@@ -7944,6 +7956,9 @@ packages:
   devlop@1.1.0:
     resolution: {integrity: sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==}
 
+  dhtmlx-gantt@9.1.4:
+    resolution: {integrity: sha512-XCNA5QUiuV79Xq1ykNpH9LFNR2IVpDZMqnmBV6dsBeOkHyPMOpkyQ/gqAPCcK2GAvYHoN2nGAMYb2LldCWhMuQ==}
+
   diagram-js-direct-editing@3.3.0:
     resolution: {integrity: sha512-EjXYb35J3qBU8lLz5U81hn7wNykVmF7U5DXZ7BvPok2IX7rmPz+ZyaI5AEMiqaC6lpSnHqPxFcPgKEiJcAiv5w==}
     peerDependencies:
@@ -15694,6 +15709,13 @@ snapshots:
       tailwindcss: 4.3.0
       vite: 8.0.10(@types/node@25.9.1)(esbuild@0.28.0)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.100.0)(sass@1.100.0)(terser@5.48.0)(yaml@2.9.0)
 
+  '@tailwindcss/vite@4.3.0(vite@8.0.14(@types/node@25.9.1)(esbuild@0.28.0)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.100.0)(sass@1.100.0)(terser@5.48.0)(yaml@2.9.0))':
+    dependencies:
+      '@tailwindcss/node': 4.3.0
+      '@tailwindcss/oxide': 4.3.0
+      tailwindcss: 4.3.0
+      vite: 8.0.14(@types/node@25.9.1)(esbuild@0.28.0)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.100.0)(sass@1.100.0)(terser@5.48.0)(yaml@2.9.0)
+
   '@tanstack/store@0.11.0': {}
 
   '@tanstack/virtual-core@3.15.0': {}
@@ -16590,9 +16612,9 @@ snapshots:
       global: 4.4.0
       is-function: 1.0.2
 
-  '@vite-pwa/vitepress@1.1.0(vite-plugin-pwa@1.3.0(vite@8.0.10(@types/node@25.9.1)(esbuild@0.28.0)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.100.0)(sass@1.100.0)(terser@5.48.0)(yaml@2.9.0))(workbox-build@7.4.1)(workbox-window@7.4.1))':
+  '@vite-pwa/vitepress@1.1.0(vite-plugin-pwa@1.3.0(vite@8.0.14(@types/node@25.9.1)(esbuild@0.28.0)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.100.0)(sass@1.100.0)(terser@5.48.0)(yaml@2.9.0))(workbox-build@7.4.1)(workbox-window@7.4.1))':
     dependencies:
-      vite-plugin-pwa: 1.3.0(vite@8.0.10(@types/node@25.9.1)(esbuild@0.28.0)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.100.0)(sass@1.100.0)(terser@5.48.0)(yaml@2.9.0))(workbox-build@7.4.1)(workbox-window@7.4.1)
+      vite-plugin-pwa: 1.3.0(vite@8.0.14(@types/node@25.9.1)(esbuild@0.28.0)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.100.0)(sass@1.100.0)(terser@5.48.0)(yaml@2.9.0))(workbox-build@7.4.1)(workbox-window@7.4.1)
 
   '@vitejs/plugin-vue-jsx@5.1.5(vite@8.0.10(@types/node@25.9.1)(esbuild@0.28.0)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.100.0)(sass@1.100.0)(terser@5.48.0)(yaml@2.9.0))(vue@3.5.34(typescript@6.0.3))':
     dependencies:
@@ -18132,6 +18154,8 @@ snapshots:
     dependencies:
       dequal: 2.0.3
 
+  dhtmlx-gantt@9.1.4: {}
+
   diagram-js-direct-editing@3.3.0(diagram-js@14.11.3):
     dependencies:
       diagram-js: 14.11.3
@@ -22536,6 +22560,17 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  vite-plugin-pwa@1.3.0(vite@8.0.14(@types/node@25.9.1)(esbuild@0.28.0)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.100.0)(sass@1.100.0)(terser@5.48.0)(yaml@2.9.0))(workbox-build@7.4.1)(workbox-window@7.4.1):
+    dependencies:
+      debug: 4.4.3
+      pretty-bytes: 6.1.1
+      tinyglobby: 0.2.16
+      vite: 8.0.14(@types/node@25.9.1)(esbuild@0.28.0)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.100.0)(sass@1.100.0)(terser@5.48.0)(yaml@2.9.0)
+      workbox-build: 7.4.1
+      workbox-window: 7.4.1
+    transitivePeerDependencies:
+      - supports-color
+
   vite-plugin-vue-devtools@8.1.2(vite@8.0.10(@types/node@25.9.1)(esbuild@0.28.0)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.100.0)(sass@1.100.0)(terser@5.48.0)(yaml@2.9.0))(vue@3.5.34(typescript@6.0.3)):
     dependencies:
       '@vue/devtools-core': 8.1.2(vue@3.5.34(typescript@6.0.3))
@@ -22620,13 +22655,13 @@ snapshots:
       terser: 5.48.0
       yaml: 2.9.0
 
-  vitepress-plugin-group-icons@1.7.5(vite@8.0.10(@types/node@25.9.1)(esbuild@0.28.0)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.100.0)(sass@1.100.0)(terser@5.48.0)(yaml@2.9.0)):
+  vitepress-plugin-group-icons@1.7.5(vite@8.0.14(@types/node@25.9.1)(esbuild@0.28.0)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.100.0)(sass@1.100.0)(terser@5.48.0)(yaml@2.9.0)):
     dependencies:
       '@iconify-json/logos': 1.2.11
       '@iconify-json/vscode-icons': 1.2.50
       '@iconify/utils': 3.1.3
     optionalDependencies:
-      vite: 8.0.10(@types/node@25.9.1)(esbuild@0.28.0)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.100.0)(sass@1.100.0)(terser@5.48.0)(yaml@2.9.0)
+      vite: 8.0.14(@types/node@25.9.1)(esbuild@0.28.0)(jiti@2.7.0)(less@4.6.4)(sass-embedded@1.100.0)(sass@1.100.0)(terser@5.48.0)(yaml@2.9.0)
 
   vitepress@2.0.0-alpha.17(@types/node@25.9.1)(async-validator@4.2.5)(axios@1.16.1)(change-case@5.4.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(nprogress@0.2.0)(postcss@8.5.15)(qrcode@1.5.4)(sass-embedded@1.100.0)(sass@1.100.0)(sortablejs@1.15.7)(terser@5.48.0)(typescript@6.0.3)(yaml@2.9.0):
     dependencies:

From 753fd0e506b831ae97727d2b67808519b61806e3 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 30 May 2026 09:59:50 +0800
Subject: [PATCH 36/52] =?UTF-8?q?feat(mes):=20=E8=BF=81=E7=A7=BB=20SN=20?=
 =?UTF-8?q?=E7=A0=81=E5=B9=B6=E8=A1=A5=E9=BD=90=E6=9D=A1=E7=A0=81=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E9=80=89=E6=8B=A9=E5=99=A8=E3=80=81=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=8F=B0=E8=B4=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增 wm/sn 模块（antd/ele）：SN 码分组列表、生成弹窗、导出分组/明细、删除批次；
  api 补 generate/group-page/delete-batch/export 系列
- 补齐条码管理 USER/BATCH/PROCARD/PACKAGE 业务选择器并按源回填 bizCode/bizName
- 新增 wm/batch 选择器与详情：WmBatchSelect/Dialog（搜索补齐生产任务、模具、
  生产/有效/入库日期）、WmBatchDetail（useDescription）；getBatchPage 收紧 PageParams
- 新增 pro/card 共享 API 与 ProCardSelect/Dialog
- 新增 system/user UserSelect/UserSelectDialog，部门树抽为 system/dept 共用
  DeptTreeSelect，user 列表页改用共享组件
- 修复 wm/materialstock 冻结开关 beforeChange(newFrozen, row) 签名 bug、
  批次号列可点开 WmBatchDetail、选择弹窗按 multiple 切 radio/checkbox
- 选择器 resolveItemById 去掉 try/catch+console.error，清理 TODO @AI
---
 apps/web-antd/src/api/mes/wm/sn/index.ts      |  68 ++++++++
 .../src/views/mes/wm/materialstock/data.ts    |   1 -
 apps/web-antd/src/views/mes/wm/sn/data.ts     | 134 +++++++++++++++
 apps/web-antd/src/views/mes/wm/sn/index.vue   | 153 +++++++++++++++++
 .../src/views/mes/wm/sn/modules/form.vue      |  62 +++++++
 apps/web-ele/src/api/mes/wm/sn/index.ts       |  68 ++++++++
 apps/web-ele/src/views/mes/wm/sn/data.ts      | 135 +++++++++++++++
 apps/web-ele/src/views/mes/wm/sn/index.vue    | 155 ++++++++++++++++++
 .../src/views/mes/wm/sn/modules/form.vue      |  62 +++++++
 9 files changed, 837 insertions(+), 1 deletion(-)
 create mode 100644 apps/web-antd/src/api/mes/wm/sn/index.ts
 create mode 100644 apps/web-antd/src/views/mes/wm/sn/data.ts
 create mode 100644 apps/web-antd/src/views/mes/wm/sn/index.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/sn/modules/form.vue
 create mode 100644 apps/web-ele/src/api/mes/wm/sn/index.ts
 create mode 100644 apps/web-ele/src/views/mes/wm/sn/data.ts
 create mode 100644 apps/web-ele/src/views/mes/wm/sn/index.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/sn/modules/form.vue

diff --git a/apps/web-antd/src/api/mes/wm/sn/index.ts b/apps/web-antd/src/api/mes/wm/sn/index.ts
new file mode 100644
index 000000000..5a733fa39
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/sn/index.ts
@@ -0,0 +1,68 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmSnApi {
+  /** MES SN 码分组 */
+  export interface SnGroup {
+    uuid?: string; // 批次 UUID
+    count?: number; // SN 码数量
+    itemId?: number; // 物料编号
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    specification?: string; // 规格型号
+    unitName?: string; // 单位名称
+    batchCode?: string; // 批次号
+    workOrderId?: number; // 生产工单编号
+    createTime?: Date; // 生成时间
+  }
+
+  /** MES SN 码生成参数 */
+  export interface SnGenerate {
+    itemId?: number; // 物料编号
+    batchCode?: string; // 批次号
+    workOrderId?: number; // 生产工单编号
+    count?: number; // 生成数量
+  }
+
+  /** MES SN 码分组分页查询参数 */
+  export interface PageParams extends PageParam {
+    uuid?: string;
+    code?: string;
+    itemId?: number;
+    batchCode?: string;
+    createTime?: string[];
+  }
+}
+
+/** 生成 SN 码 */
+export function generateSnCodes(data: MesWmSnApi.SnGenerate) {
+  return requestClient.post('/mes/wm/sn/generate', data);
+}
+
+/** 查询 SN 码分组分页 */
+export function getSnGroupPage(params: MesWmSnApi.PageParams) {
+  return requestClient.get<PageResult<MesWmSnApi.SnGroup>>(
+    '/mes/wm/sn/group-page',
+    { params },
+  );
+}
+
+/** 批量删除 SN 码（按批次 UUID） */
+export function deleteSnBatch(uuid: string) {
+  return requestClient.delete('/mes/wm/sn/delete-batch', {
+    params: { uuid },
+  });
+}
+
+/** 导出 SN 码分组 Excel */
+export function exportSnGroupExcel(params: MesWmSnApi.PageParams) {
+  return requestClient.download('/mes/wm/sn/group-export-excel', { params });
+}
+
+/** 导出批次 SN 码明细 Excel */
+export function exportSnDetailExcel(uuid: string) {
+  return requestClient.download('/mes/wm/sn/export-excel', {
+    params: { uuid },
+  });
+}
diff --git a/apps/web-antd/src/views/mes/wm/materialstock/data.ts b/apps/web-antd/src/views/mes/wm/materialstock/data.ts
index cde557f50..2281b6850 100644
--- a/apps/web-antd/src/views/mes/wm/materialstock/data.ts
+++ b/apps/web-antd/src/views/mes/wm/materialstock/data.ts
@@ -72,7 +72,6 @@ export function useGridFormSchema(): VbenFormSchema[] {
 }
 
 /** 列表的字段 */
-// TODO @AI：看看别的模块，是不是会叫 onFrozenChange？还是一般叫什么梗合适？？？
 export function useGridColumns(
   onFrozenChange: (
     newFrozen: boolean,
diff --git a/apps/web-antd/src/views/mes/wm/sn/data.ts b/apps/web-antd/src/views/mes/wm/sn/data.ts
new file mode 100644
index 000000000..50b8020a6
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/sn/data.ts
@@ -0,0 +1,134 @@
+import type { VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmSnApi } from '#/api/mes/wm/sn';
+
+import { markRaw } from 'vue';
+
+import { getRangePickerDefaultProps } from '#/utils';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+
+/** 生成 SN 码的表单 */
+export function useFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择物料',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        maxlength: 100,
+        placeholder: '请输入批次号',
+      },
+    },
+    {
+      fieldName: 'count',
+      label: '生成数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        max: 1000,
+        min: 1,
+        placeholder: '请输入生成数量',
+      },
+      rules: 'required',
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: 'SN 码',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入 SN 码',
+      },
+    },
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择物料',
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入批次号',
+      },
+    },
+    {
+      fieldName: 'createTime',
+      label: '创建时间',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+        allowClear: true,
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesWmSnApi.SnGroup>['columns'] {
+  return [
+    {
+      field: 'itemCode',
+      title: '物料编码',
+      minWidth: 120,
+    },
+    {
+      field: 'itemName',
+      title: '物料名称',
+      minWidth: 150,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'unitName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'batchCode',
+      title: '批次号',
+      minWidth: 120,
+    },
+    {
+      field: 'count',
+      title: 'SN 码数量',
+      width: 100,
+    },
+    {
+      field: 'createTime',
+      title: '生成时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      title: '操作',
+      width: 180,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/wm/sn/index.vue b/apps/web-antd/src/views/mes/wm/sn/index.vue
new file mode 100644
index 000000000..1487f1610
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/sn/index.vue
@@ -0,0 +1,153 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmSnApi } from '#/api/mes/wm/sn';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteSnBatch,
+  exportSnDetailExcel,
+  exportSnGroupExcel,
+  getSnGroupPage,
+} from '#/api/mes/wm/sn';
+import { $t } from '#/locales';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 生成 SN 码 */
+function handleCreate() {
+  formModalApi.setData(null).open();
+}
+
+/** 导出分组表格 */
+async function handleExport() {
+  const data = await exportSnGroupExcel(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: 'SN码分组.xls', source: data });
+}
+
+/** 导出批次明细 */
+async function handleExportDetail(row: MesWmSnApi.SnGroup) {
+  const data = await exportSnDetailExcel(row.uuid!);
+  downloadFileFromBlobPart({ fileName: 'SN码明细.xls', source: data });
+}
+
+/** 删除 SN 码批次 */
+async function handleDelete(row: MesWmSnApi.SnGroup) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.batchCode || row.itemName]),
+    duration: 0,
+  });
+  try {
+    await deleteSnBatch(row.uuid!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.batchCode || '']));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getSnGroupPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'uuid',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmSnApi.SnGroup>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】仓库与库区库位、条码赋码、SN码"
+        url="https://doc.iocoder.cn/mes/wm/warehouse-setup/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="SN 码列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '生成 SN 码',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-sn:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:wm-sn:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: '导出明细',
+              type: 'link',
+              auth: ['mes:wm-sn:export'],
+              onClick: handleExportDetail.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              auth: ['mes:wm-sn:delete'],
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [
+                  row.batchCode || row.itemName,
+                ]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/sn/modules/form.vue b/apps/web-antd/src/views/mes/wm/sn/modules/form.vue
new file mode 100644
index 000000000..ae66172b0
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/sn/modules/form.vue
@@ -0,0 +1,62 @@
+<script lang="ts" setup>
+import type { MesWmSnApi } from '#/api/mes/wm/sn';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import { generateSnCodes } from '#/api/mes/wm/sn';
+import { $t } from '#/locales';
+
+import { useFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-2',
+    labelWidth: 100,
+  },
+  layout: 'horizontal',
+  schema: useFormSchema(),
+  showDefaultActions: false,
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data = (await formApi.getValues()) as MesWmSnApi.SnGenerate;
+    try {
+      await generateSnCodes(data);
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success('生成成功');
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      return;
+    }
+    await formApi.resetForm();
+    await formApi.setValues({ count: 100 });
+  },
+});
+</script>
+
+<template>
+  <Modal :title="$t('ui.actionTitle.create', ['SN 码'])" class="w-1/2">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/api/mes/wm/sn/index.ts b/apps/web-ele/src/api/mes/wm/sn/index.ts
new file mode 100644
index 000000000..5a733fa39
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/sn/index.ts
@@ -0,0 +1,68 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmSnApi {
+  /** MES SN 码分组 */
+  export interface SnGroup {
+    uuid?: string; // 批次 UUID
+    count?: number; // SN 码数量
+    itemId?: number; // 物料编号
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    specification?: string; // 规格型号
+    unitName?: string; // 单位名称
+    batchCode?: string; // 批次号
+    workOrderId?: number; // 生产工单编号
+    createTime?: Date; // 生成时间
+  }
+
+  /** MES SN 码生成参数 */
+  export interface SnGenerate {
+    itemId?: number; // 物料编号
+    batchCode?: string; // 批次号
+    workOrderId?: number; // 生产工单编号
+    count?: number; // 生成数量
+  }
+
+  /** MES SN 码分组分页查询参数 */
+  export interface PageParams extends PageParam {
+    uuid?: string;
+    code?: string;
+    itemId?: number;
+    batchCode?: string;
+    createTime?: string[];
+  }
+}
+
+/** 生成 SN 码 */
+export function generateSnCodes(data: MesWmSnApi.SnGenerate) {
+  return requestClient.post('/mes/wm/sn/generate', data);
+}
+
+/** 查询 SN 码分组分页 */
+export function getSnGroupPage(params: MesWmSnApi.PageParams) {
+  return requestClient.get<PageResult<MesWmSnApi.SnGroup>>(
+    '/mes/wm/sn/group-page',
+    { params },
+  );
+}
+
+/** 批量删除 SN 码（按批次 UUID） */
+export function deleteSnBatch(uuid: string) {
+  return requestClient.delete('/mes/wm/sn/delete-batch', {
+    params: { uuid },
+  });
+}
+
+/** 导出 SN 码分组 Excel */
+export function exportSnGroupExcel(params: MesWmSnApi.PageParams) {
+  return requestClient.download('/mes/wm/sn/group-export-excel', { params });
+}
+
+/** 导出批次 SN 码明细 Excel */
+export function exportSnDetailExcel(uuid: string) {
+  return requestClient.download('/mes/wm/sn/export-excel', {
+    params: { uuid },
+  });
+}
diff --git a/apps/web-ele/src/views/mes/wm/sn/data.ts b/apps/web-ele/src/views/mes/wm/sn/data.ts
new file mode 100644
index 000000000..ea21e7788
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/sn/data.ts
@@ -0,0 +1,135 @@
+import type { VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmSnApi } from '#/api/mes/wm/sn';
+
+import { markRaw } from 'vue';
+
+import { getRangePickerDefaultProps } from '#/utils';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+
+/** 生成 SN 码的表单 */
+export function useFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择物料',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        maxlength: 100,
+        placeholder: '请输入批次号',
+      },
+    },
+    {
+      fieldName: 'count',
+      label: '生成数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        max: 1000,
+        min: 1,
+        placeholder: '请输入生成数量',
+      },
+      rules: 'required',
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: 'SN 码',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入 SN 码',
+      },
+    },
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择物料',
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入批次号',
+      },
+    },
+    {
+      fieldName: 'createTime',
+      label: '创建时间',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+        clearable: true,
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesWmSnApi.SnGroup>['columns'] {
+  return [
+    {
+      field: 'itemCode',
+      title: '物料编码',
+      minWidth: 120,
+    },
+    {
+      field: 'itemName',
+      title: '物料名称',
+      minWidth: 150,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'unitName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'batchCode',
+      title: '批次号',
+      minWidth: 120,
+    },
+    {
+      field: 'count',
+      title: 'SN 码数量',
+      width: 100,
+    },
+    {
+      field: 'createTime',
+      title: '生成时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      title: '操作',
+      width: 180,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/wm/sn/index.vue b/apps/web-ele/src/views/mes/wm/sn/index.vue
new file mode 100644
index 000000000..57fdc4c0b
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/sn/index.vue
@@ -0,0 +1,155 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmSnApi } from '#/api/mes/wm/sn';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteSnBatch,
+  exportSnDetailExcel,
+  exportSnGroupExcel,
+  getSnGroupPage,
+} from '#/api/mes/wm/sn';
+import { $t } from '#/locales';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 生成 SN 码 */
+function handleCreate() {
+  formModalApi.setData(null).open();
+}
+
+/** 导出分组表格 */
+async function handleExport() {
+  const data = await exportSnGroupExcel(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: 'SN码分组.xls', source: data });
+}
+
+/** 导出批次明细 */
+async function handleExportDetail(row: MesWmSnApi.SnGroup) {
+  const data = await exportSnDetailExcel(row.uuid!);
+  downloadFileFromBlobPart({ fileName: 'SN码明细.xls', source: data });
+}
+
+/** 删除 SN 码批次 */
+async function handleDelete(row: MesWmSnApi.SnGroup) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.batchCode || row.itemName]),
+  });
+  try {
+    await deleteSnBatch(row.uuid!);
+    ElMessage.success(
+      $t('ui.actionMessage.deleteSuccess', [row.batchCode || '']),
+    );
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getSnGroupPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'uuid',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmSnApi.SnGroup>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】仓库与库区库位、条码赋码、SN码"
+        url="https://doc.iocoder.cn/mes/wm/warehouse-setup/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="SN 码列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '生成 SN 码',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-sn:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:wm-sn:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: '导出明细',
+              type: 'primary',
+              link: true,
+              auth: ['mes:wm-sn:export'],
+              onClick: handleExportDetail.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              auth: ['mes:wm-sn:delete'],
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [
+                  row.batchCode || row.itemName,
+                ]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/sn/modules/form.vue b/apps/web-ele/src/views/mes/wm/sn/modules/form.vue
new file mode 100644
index 000000000..2f2115db4
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/sn/modules/form.vue
@@ -0,0 +1,62 @@
+<script lang="ts" setup>
+import type { MesWmSnApi } from '#/api/mes/wm/sn';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import { generateSnCodes } from '#/api/mes/wm/sn';
+import { $t } from '#/locales';
+
+import { useFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-2',
+    labelWidth: 100,
+  },
+  layout: 'horizontal',
+  schema: useFormSchema(),
+  showDefaultActions: false,
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data = (await formApi.getValues()) as MesWmSnApi.SnGenerate;
+    try {
+      await generateSnCodes(data);
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      ElMessage.success('生成成功');
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      return;
+    }
+    await formApi.resetForm();
+    await formApi.setValues({ count: 100 });
+  },
+});
+</script>
+
+<template>
+  <Modal :title="$t('ui.actionTitle.create', ['SN 码'])" class="w-1/2">
+    <Form class="mx-4" />
+  </Modal>
+</template>

From 7bf65041f99fcb9dcb6d0601bfed5caf99d1c006 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 30 May 2026 10:03:25 +0800
Subject: [PATCH 37/52] =?UTF-8?q?feat(mes):=20=E8=BF=81=E7=A7=BB=20workord?=
 =?UTF-8?q?er=20=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pro-work-order-select-dialog.vue          | 232 ++++++
 .../src/views/mes/pro/workorder/data.ts       | 733 +++++++++++++++++
 .../src/views/mes/pro/workorder/index.vue     | 242 ++++++
 .../mes/pro/workorder/modules/bom-form.vue    | 101 +++
 .../mes/pro/workorder/modules/bom-list.vue    | 181 +++++
 .../views/mes/pro/workorder/modules/form.vue  | 295 +++++++
 .../mes/pro/workorder/modules/item-list.vue   |  45 ++
 .../pro-work-order-select-dialog.vue          | 226 ++++++
 .../src/views/mes/pro/workorder/data.ts       | 734 ++++++++++++++++++
 .../src/views/mes/pro/workorder/index.vue     | 245 ++++++
 .../mes/pro/workorder/modules/bom-form.vue    | 101 +++
 .../mes/pro/workorder/modules/bom-list.vue    | 182 +++++
 .../views/mes/pro/workorder/modules/form.vue  | 307 ++++++++
 .../mes/pro/workorder/modules/item-list.vue   |  45 ++
 14 files changed, 3669 insertions(+)
 create mode 100644 apps/web-antd/src/views/mes/pro/workorder/components/pro-work-order-select-dialog.vue
 create mode 100644 apps/web-antd/src/views/mes/pro/workorder/data.ts
 create mode 100644 apps/web-antd/src/views/mes/pro/workorder/index.vue
 create mode 100644 apps/web-antd/src/views/mes/pro/workorder/modules/bom-form.vue
 create mode 100644 apps/web-antd/src/views/mes/pro/workorder/modules/bom-list.vue
 create mode 100644 apps/web-antd/src/views/mes/pro/workorder/modules/form.vue
 create mode 100644 apps/web-antd/src/views/mes/pro/workorder/modules/item-list.vue
 create mode 100644 apps/web-ele/src/views/mes/pro/workorder/components/pro-work-order-select-dialog.vue
 create mode 100644 apps/web-ele/src/views/mes/pro/workorder/data.ts
 create mode 100644 apps/web-ele/src/views/mes/pro/workorder/index.vue
 create mode 100644 apps/web-ele/src/views/mes/pro/workorder/modules/bom-form.vue
 create mode 100644 apps/web-ele/src/views/mes/pro/workorder/modules/bom-list.vue
 create mode 100644 apps/web-ele/src/views/mes/pro/workorder/modules/form.vue
 create mode 100644 apps/web-ele/src/views/mes/pro/workorder/modules/item-list.vue

diff --git a/apps/web-antd/src/views/mes/pro/workorder/components/pro-work-order-select-dialog.vue b/apps/web-antd/src/views/mes/pro/workorder/components/pro-work-order-select-dialog.vue
new file mode 100644
index 000000000..5f618b637
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/workorder/components/pro-work-order-select-dialog.vue
@@ -0,0 +1,232 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProWorkOrderApi } from '#/api/mes/pro/workorder';
+
+import { computed, nextTick, ref } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictLabel } from '@vben/hooks';
+
+import { Alert, Button, message, Modal } from 'ant-design-vue';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getWorkOrderPage } from '#/api/mes/pro/workorder';
+
+import {
+  useWorkOrderSelectGridColumns,
+  useWorkOrderSelectGridFormSchema,
+} from '../data';
+
+const props = withDefaults(
+  defineProps<{
+    status?: number;
+    type?: number;
+  }>(),
+  {
+    status: undefined,
+    type: undefined,
+  },
+);
+const emit = defineEmits<{
+  selected: [rows: MesProWorkOrderApi.WorkOrder[]];
+}>();
+
+const open = ref(false); // 弹窗是否打开
+const multiple = ref(false); // 是否多选；默认按单选选择器使用
+const selectedRows = ref<MesProWorkOrderApi.WorkOrder[]>([]); // 已选工单列表
+const preSelectedIds = ref<number[]>([]); // 预选工单编号列表
+
+const typeTip = computed(() => {
+  if (props.type == null) {
+    return '';
+  }
+  return `仅展示【${getDictLabel(DICT_TYPE.MES_PRO_WORK_ORDER_TYPE, props.type)}】类型的工单`;
+});
+
+/** 获取多选记录，包含 VXE reserve 跨页记录 */
+function getMultipleSelectedRows() {
+  const selectedMap = new Map<number, MesProWorkOrderApi.WorkOrder>();
+  const records = [
+    ...(gridApi.grid.getCheckboxReserveRecords?.() ?? []),
+    ...(gridApi.grid.getCheckboxRecords?.() ?? []),
+  ] as MesProWorkOrderApi.WorkOrder[];
+  records.forEach((row) => {
+    const rowId = row.id;
+    if (rowId !== undefined) {
+      selectedMap.set(rowId, row);
+    }
+  });
+  return [...selectedMap.values()];
+}
+
+/** 处理多选勾选变化 */
+function handleCheckboxSelectChange() {
+  selectedRows.value = getMultipleSelectedRows();
+}
+
+/** 处理单选切换 */
+function handleRadioChange(row: MesProWorkOrderApi.WorkOrder) {
+  selectedRows.value = [row];
+}
+
+/** 多选模式下切换行勾选 */
+async function toggleMultipleRow(row: MesProWorkOrderApi.WorkOrder) {
+  const selected = gridApi.grid.isCheckedByCheckboxRow(row);
+  await gridApi.grid.setCheckboxRow(row, !selected);
+  selectedRows.value = getMultipleSelectedRows();
+}
+
+/** 处理行双击：单选直接确认，多选切换勾选 */
+async function handleCellDblclick({ row }: { row: MesProWorkOrderApi.WorkOrder }) {
+  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 = gridApi.grid.getData() as MesProWorkOrderApi.WorkOrder[];
+  for (const row of rows) {
+    if (row.id === undefined || !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: useWorkOrderSelectGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useWorkOrderSelectGridColumns(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 getWorkOrderPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            type: props.type,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesProWorkOrderApi.WorkOrder>,
+  gridEvents: {
+    cellDblclick: handleCellDblclick,
+    checkboxAll: handleCheckboxSelectChange,
+    checkboxChange: handleCheckboxSelectChange,
+    radioChange: ({ row }: { row: MesProWorkOrderApi.WorkOrder }) => {
+      handleRadioChange(row);
+    },
+  },
+});
+
+/** 重置查询和选择状态，保留外部传入的默认状态过滤 */
+async function resetQueryState() {
+  selectedRows.value = [];
+  await gridApi.grid.clearCheckboxRow();
+  await gridApi.grid.clearCheckboxReserve();
+  await gridApi.grid.clearRadioRow();
+  await gridApi.formApi.resetForm();
+  if (props.status != null) {
+    await gridApi.formApi.setFieldValue('status', props.status);
+  }
+}
+
+/** 打开工单选择弹窗 */
+async function openModal(
+  selectedIds?: number[],
+  options?: { multiple?: boolean },
+) {
+  open.value = true;
+  multiple.value = options?.multiple ?? false;
+  preSelectedIds.value = selectedIds || [];
+  await nextTick();
+  gridApi.setGridOptions({
+    columns: useWorkOrderSelectGridColumns(multiple.value),
+  });
+  await resetQueryState();
+  await gridApi.query();
+  await nextTick();
+  await applyPreSelection();
+}
+
+/** 关闭工单选择弹窗 */
+function closeModal() {
+  open.value = false;
+}
+
+/** 确认选择工单 */
+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"
+  >
+    <Alert
+      v-if="typeTip"
+      :message="typeTip"
+      type="info"
+      show-icon
+      class="!mb-3"
+    />
+    <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/pro/workorder/data.ts b/apps/web-antd/src/views/mes/pro/workorder/data.ts
new file mode 100644
index 000000000..7ec534676
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/workorder/data.ts
@@ -0,0 +1,733 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesMdProductBomApi } from '#/api/mes/md/item/productBom';
+import type { MesProWorkOrderApi } from '#/api/mes/pro/workorder';
+import type { MesProWorkOrderBomApi } from '#/api/mes/pro/workorder/bom';
+
+import { h, markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { Button } from 'ant-design-vue';
+
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getRangePickerDefaultProps } from '#/utils';
+import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
+import { MdItemSelect, MdProductBomSelect } from '#/views/mes/md/item/components';
+import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
+import {
+  MesAutoCodeRuleCode,
+  MesProWorkOrderSourceTypeEnum,
+  MesProWorkOrderTypeEnum,
+} from '#/views/mes/utils/constants';
+
+/** 表单类型 */
+export type FormType = 'confirm' | 'create' | 'detail' | 'finish' | 'update';
+
+/** 表头是否只读（确认、完成、详情态） */
+function isHeaderReadonly(formType: FormType): boolean {
+  return ['confirm', 'detail', 'finish'].includes(formType);
+}
+
+/** 新增/修改的表单 */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  const headerReadonly = isHeaderReadonly(formType);
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'parentId',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'status',
+      label: '工单状态',
+      component: 'Select',
+      componentProps: {
+        disabled: true,
+        options: getDictOptions(DICT_TYPE.MES_PRO_WORK_ORDER_STATUS, 'number'),
+      },
+      dependencies: {
+        triggerFields: [''],
+        show: () => formType !== 'create',
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '工单编码',
+      component: 'Input',
+      componentProps: {
+        disabled: headerReadonly,
+        placeholder: '请输入工单编码',
+      },
+      rules: 'required',
+      suffix:
+        formType === 'create' || formType === 'update'
+          ? () =>
+              h(
+                Button,
+                {
+                  type: 'default',
+                  onClick: async () => {
+                    const code = await generateAutoCode(
+                      MesAutoCodeRuleCode.PRO_WORK_ORDER_CODE,
+                    );
+                    await formApi?.setFieldValue('code', code);
+                  },
+                },
+                { default: () => '生成' },
+              )
+          : undefined,
+    },
+    {
+      fieldName: 'name',
+      label: '工单名称',
+      component: 'Input',
+      componentProps: {
+        disabled: headerReadonly,
+        placeholder: '请输入工单名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'orderSourceType',
+      label: '工单来源',
+      component: 'Select',
+      componentProps: {
+        disabled: headerReadonly,
+        options: getDictOptions(
+          DICT_TYPE.MES_PRO_WORK_ORDER_SOURCE_TYPE,
+          'number',
+        ),
+        placeholder: '请选择工单来源',
+        // 工单来源变更：非客户订单时清空来源单据编号和客户
+        onChange: async (value: number) => {
+          if (value !== MesProWorkOrderSourceTypeEnum.ORDER) {
+            await formApi?.setValues({
+              clientId: undefined,
+              orderSourceCode: undefined,
+            });
+          }
+        },
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'orderSourceCode',
+      label: '来源单据编号',
+      component: 'Input',
+      componentProps: {
+        disabled: headerReadonly,
+        placeholder: '请输入来源单据编号',
+      },
+      dependencies: {
+        triggerFields: ['orderSourceType'],
+        show: (values) =>
+          values.orderSourceType === MesProWorkOrderSourceTypeEnum.ORDER,
+      },
+    },
+    {
+      fieldName: 'type',
+      label: '工单类型',
+      component: 'Select',
+      componentProps: {
+        disabled: headerReadonly,
+        options: getDictOptions(DICT_TYPE.MES_PRO_WORK_ORDER_TYPE, 'number'),
+        placeholder: '请选择工单类型',
+        // 工单类型变更：非代工/采购时清空供应商
+        onChange: async (value: number) => {
+          if (
+            value !== MesProWorkOrderTypeEnum.OUTSOURCE &&
+            value !== MesProWorkOrderTypeEnum.PURCHASE
+          ) {
+            await formApi?.setFieldValue('vendorId', undefined);
+          }
+        },
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'productId',
+      label: '产品',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        disabled: headerReadonly,
+        placeholder: '请选择产品',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'quantity',
+      label: '工单数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        disabled: headerReadonly,
+        min: 1,
+        placeholder: '请输入工单数量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'clientId',
+      label: '客户',
+      component: markRaw(MdClientSelect),
+      componentProps: {
+        disabled: headerReadonly,
+        placeholder: '请选择客户',
+      },
+      dependencies: {
+        triggerFields: ['orderSourceType'],
+        show: (values) =>
+          values.orderSourceType === MesProWorkOrderSourceTypeEnum.ORDER,
+      },
+    },
+    {
+      fieldName: 'vendorId',
+      label: '供应商',
+      component: markRaw(MdVendorSelect),
+      componentProps: {
+        disabled: headerReadonly,
+        placeholder: '请选择供应商',
+      },
+      dependencies: {
+        triggerFields: ['type'],
+        show: (values) =>
+          values.type === MesProWorkOrderTypeEnum.OUTSOURCE ||
+          values.type === MesProWorkOrderTypeEnum.PURCHASE,
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        disabled: headerReadonly,
+        placeholder: '请输入批次号',
+      },
+    },
+    {
+      fieldName: 'requestDate',
+      label: '需求日期',
+      component: 'DatePicker',
+      componentProps: {
+        class: '!w-full',
+        disabled: headerReadonly,
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择需求日期',
+        valueFormat: 'x',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        disabled: headerReadonly,
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '工单编码',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入工单编码',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '工单名称',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入工单名称',
+      },
+    },
+    {
+      fieldName: 'orderSourceCode',
+      label: '来源单据',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入来源单据编号',
+      },
+    },
+    {
+      fieldName: 'productId',
+      label: '产品',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择产品',
+      },
+    },
+    {
+      fieldName: 'clientId',
+      label: '客户',
+      component: markRaw(MdClientSelect),
+      componentProps: {
+        placeholder: '请选择客户',
+      },
+    },
+    {
+      fieldName: 'type',
+      label: '工单类型',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_PRO_WORK_ORDER_TYPE, 'number'),
+        placeholder: '请选择工单类型',
+      },
+    },
+    {
+      fieldName: 'requestDate',
+      label: '需求日期',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+        allowClear: true,
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesProWorkOrderApi.WorkOrder>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '工单编码',
+      fixed: 'left',
+      width: 200,
+      treeNode: true,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '工单名称',
+      minWidth: 150,
+    },
+    {
+      field: 'type',
+      title: '工单类型',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_PRO_WORK_ORDER_TYPE },
+      },
+    },
+    {
+      field: 'orderSourceType',
+      title: '工单来源',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_PRO_WORK_ORDER_SOURCE_TYPE },
+      },
+    },
+    {
+      field: 'orderSourceCode',
+      title: '来源单据编号',
+      width: 140,
+    },
+    {
+      field: 'productCode',
+      title: '产品编码',
+      width: 120,
+    },
+    {
+      field: 'productName',
+      title: '产品名称',
+      minWidth: 120,
+    },
+    {
+      field: 'productSpecification',
+      title: '规格型号',
+      width: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'quantity',
+      title: '工单数量',
+      width: 100,
+    },
+    {
+      field: 'quantityProduced',
+      title: '已生产数量',
+      width: 100,
+    },
+    {
+      field: 'clientCode',
+      title: '客户编码',
+      width: 120,
+    },
+    {
+      field: 'clientName',
+      title: '客户名称',
+      width: 120,
+    },
+    {
+      field: 'requestDate',
+      title: '需求日期',
+      width: 180,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'status',
+      title: '工单状态',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_PRO_WORK_ORDER_STATUS },
+      },
+    },
+    {
+      field: 'createTime',
+      title: '创建时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      title: '操作',
+      width: 240,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 工单 BOM 子表的字段 */
+export function useBomGridColumns(
+  editable: boolean,
+  generatable: boolean,
+): VxeTableGridOptions<MesProWorkOrderBomApi.WorkOrderBom>['columns'] {
+  return [
+    {
+      field: 'itemCode',
+      title: 'BOM 物料编码',
+      width: 120,
+    },
+    {
+      field: 'itemName',
+      title: 'BOM 物料名称',
+      minWidth: 150,
+    },
+    {
+      field: 'itemSpecification',
+      title: '规格型号',
+      width: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'itemOrProduct',
+      title: '物料/产品',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_MD_ITEM_OR_PRODUCT },
+      },
+    },
+    {
+      field: 'quantity',
+      title: '预计使用量',
+      width: 120,
+    },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 120,
+    },
+    ...(editable || generatable
+      ? [
+          {
+            title: '操作',
+            width: 160,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 工单 BOM 新增/修改的表单 */
+export function useBomFormSchema(
+  isCreate: boolean,
+  productId?: number,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdProductBomSelect),
+      componentProps: {
+        itemId: productId,
+        placeholder: '请选择物料',
+        // BOM 物料选中后自动回填预计使用量
+        onChange: async (bom?: MesMdProductBomApi.ProductBom) => {
+          await formApi?.setFieldValue('quantity', bom?.quantity ?? undefined);
+        },
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: [''],
+        show: () => isCreate,
+      },
+    },
+    {
+      fieldName: 'itemName',
+      label: '物料',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+      },
+      dependencies: {
+        triggerFields: [''],
+        show: () => !isCreate,
+      },
+    },
+    {
+      fieldName: 'unitMeasureName',
+      label: '单位',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+      },
+      dependencies: {
+        triggerFields: [''],
+        show: () => !isCreate,
+      },
+    },
+    {
+      fieldName: 'quantity',
+      label: '预计使用量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入预计使用量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 工单选择弹窗的搜索表单 */
+export function useWorkOrderSelectGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '工单编码',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入工单编码',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '工单名称',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入工单名称',
+      },
+    },
+    {
+      fieldName: 'productId',
+      label: '产品',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择产品',
+      },
+    },
+    {
+      fieldName: 'clientId',
+      label: '客户',
+      component: markRaw(MdClientSelect),
+      componentProps: {
+        placeholder: '请选择客户',
+      },
+    },
+    {
+      fieldName: 'status',
+      label: '工单状态',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_PRO_WORK_ORDER_STATUS, 'number'),
+        placeholder: '请选择工单状态',
+      },
+    },
+  ];
+}
+
+/** 工单选择弹窗的字段 */
+export function useWorkOrderSelectGridColumns(
+  multiple = false,
+): VxeTableGridOptions<MesProWorkOrderApi.WorkOrder>['columns'] {
+  return [
+    {
+      type: multiple ? 'checkbox' : 'radio',
+      width: 50,
+    },
+    {
+      field: 'code',
+      title: '工单编码',
+      width: 180,
+    },
+    {
+      field: 'name',
+      title: '工单名称',
+      minWidth: 180,
+    },
+    {
+      field: 'orderSourceType',
+      title: '工单来源',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_PRO_WORK_ORDER_SOURCE_TYPE },
+      },
+    },
+    {
+      field: 'orderSourceCode',
+      title: '订单编号',
+      width: 140,
+    },
+    {
+      field: 'productCode',
+      title: '产品编号',
+      width: 120,
+    },
+    {
+      field: 'productName',
+      title: '产品名称',
+      minWidth: 150,
+    },
+    {
+      field: 'productSpecification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'quantity',
+      title: '工单数量',
+      width: 100,
+    },
+    {
+      field: 'clientCode',
+      title: '客户编码',
+      width: 120,
+    },
+    {
+      field: 'clientName',
+      title: '客户名称',
+      minWidth: 120,
+    },
+    {
+      field: 'status',
+      title: '工单状态',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_PRO_WORK_ORDER_STATUS },
+      },
+    },
+    {
+      field: 'requestDate',
+      title: '需求日期',
+      width: 120,
+      formatter: 'formatDate',
+    },
+  ];
+}
+
+/** 工单物料需求子表的字段（只读） */
+export function useItemGridColumns(): VxeTableGridOptions<MesProWorkOrderBomApi.WorkOrderBom>['columns'] {
+  return [
+    {
+      field: 'itemCode',
+      title: '物料编码',
+      width: 120,
+    },
+    {
+      field: 'itemName',
+      title: '物料名称',
+      minWidth: 150,
+    },
+    {
+      field: 'itemSpecification',
+      title: '规格型号',
+      width: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'itemOrProduct',
+      title: '物料/产品',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_MD_ITEM_OR_PRODUCT },
+      },
+    },
+    {
+      field: 'quantity',
+      title: '需求数量',
+      width: 120,
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/pro/workorder/index.vue b/apps/web-antd/src/views/mes/pro/workorder/index.vue
new file mode 100644
index 000000000..904cc96ed
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/workorder/index.vue
@@ -0,0 +1,242 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProWorkOrderApi } from '#/api/mes/pro/workorder';
+
+import { ref } from 'vue';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { Button, message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  cancelWorkOrder,
+  deleteWorkOrder,
+  exportWorkOrder,
+  getWorkOrderPage,
+} from '#/api/mes/pro/workorder';
+import { $t } from '#/locales';
+import {
+  BarcodeBizTypeEnum,
+  MesProWorkOrderStatusEnum,
+  MesProWorkOrderTypeEnum,
+} from '#/views/mes/utils/constants';
+import { BarcodeDetail } from '#/views/mes/wm/barcode/components';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>(); // 条码详情弹窗
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建工单 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 新增子工单 */
+function handleAddChild(row: MesProWorkOrderApi.WorkOrder) {
+  formModalApi.setData({ formType: 'create', parentRow: row }).open();
+}
+
+/** 查看工单详情 */
+function handleDetail(row: MesProWorkOrderApi.WorkOrder) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑工单 */
+function handleEdit(row: MesProWorkOrderApi.WorkOrder) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 完成工单 */
+function handleFinish(row: MesProWorkOrderApi.WorkOrder) {
+  formModalApi.setData({ formType: 'finish', id: row.id }).open();
+}
+
+/** 删除工单 */
+async function handleDelete(row: MesProWorkOrderApi.WorkOrder) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.code]),
+    duration: 0,
+  });
+  try {
+    await deleteWorkOrder(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 取消工单 */
+async function handleCancel(row: MesProWorkOrderApi.WorkOrder) {
+  await cancelWorkOrder(row.id!);
+  message.success('工单已取消');
+  handleRefresh();
+}
+
+/** 查看工单条码 */
+function handleBarcode(row: MesProWorkOrderApi.WorkOrder) {
+  barcodeDetailRef.value?.openByBusiness(
+    row.id!,
+    BarcodeBizTypeEnum.WORKORDER,
+    row.code,
+    row.name,
+  );
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportWorkOrder(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '生产工单.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getWorkOrderPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+    treeConfig: {
+      parentField: 'parentId',
+      rowField: 'id',
+      transform: true,
+      expandAll: true,
+      reserve: true,
+    },
+  } as VxeTableGridOptions<MesProWorkOrderApi.WorkOrder>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【生产】生产工单"
+        url="https://doc.iocoder.cn/mes/pro/work-order/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="生产工单列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['工单']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:pro-work-order:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:pro-work-order:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <Button type="link" @click="handleDetail(row)">
+          {{ row.code }}
+        </Button>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:pro-work-order:update'],
+              ifShow: row.status === MesProWorkOrderStatusEnum.PREPARE,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:pro-work-order:delete'],
+              ifShow: row.status === MesProWorkOrderStatusEnum.PREPARE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: $t('common.create'),
+              type: 'link',
+              auth: ['mes:pro-work-order:create'],
+              ifShow:
+                row.status === MesProWorkOrderStatusEnum.CONFIRMED &&
+                row.type === MesProWorkOrderTypeEnum.SELF,
+              onClick: handleAddChild.bind(null, row),
+            },
+            {
+              label: '完成',
+              type: 'link',
+              auth: ['mes:pro-work-order:update'],
+              ifShow: row.status === MesProWorkOrderStatusEnum.CONFIRMED,
+              onClick: handleFinish.bind(null, row),
+            },
+            {
+              label: '取消',
+              type: 'link',
+              danger: true,
+              auth: ['mes:pro-work-order:update'],
+              ifShow: row.status === MesProWorkOrderStatusEnum.CONFIRMED,
+              popConfirm: {
+                title: '确认要取消该工单吗？取消后不可恢复。',
+                confirm: handleCancel.bind(null, row),
+              },
+            },
+            {
+              label: '条码',
+              type: 'link',
+              auth: ['mes:pro-work-order:query'],
+              onClick: handleBarcode.bind(null, row),
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+    <BarcodeDetail ref="barcodeDetailRef" />
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/mes/pro/workorder/modules/bom-form.vue b/apps/web-antd/src/views/mes/pro/workorder/modules/bom-form.vue
new file mode 100644
index 000000000..847e4b3e1
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/workorder/modules/bom-form.vue
@@ -0,0 +1,101 @@
+<script lang="ts" setup>
+import type { MesProWorkOrderBomApi } from '#/api/mes/pro/workorder/bom';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createWorkOrderBom,
+  getWorkOrderBom,
+  updateWorkOrderBom,
+} from '#/api/mes/pro/workorder/bom';
+import { $t } from '#/locales';
+
+import { useBomFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesProWorkOrderBomApi.WorkOrderBom>();
+const workOrderId = ref<number>(); // 所属工单编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['BOM 物料'])
+    : $t('ui.actionTitle.create', ['BOM 物料']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-2',
+    labelWidth: 100,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-2',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesProWorkOrderBomApi.WorkOrderBom;
+    data.workOrderId = workOrderId.value;
+    try {
+      await (formData.value?.id
+        ? updateWorkOrderBom({ ...data, id: formData.value.id })
+        : createWorkOrderBom(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{
+      id?: number;
+      productId?: number;
+      workOrderId: number;
+    }>();
+    workOrderId.value = data.workOrderId;
+    formApi.setState({
+      schema: useBomFormSchema(!data.id, data.productId, formApi),
+    });
+    if (!data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getWorkOrderBom(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-2/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/pro/workorder/modules/bom-list.vue b/apps/web-antd/src/views/mes/pro/workorder/modules/bom-list.vue
new file mode 100644
index 000000000..cdc69a198
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/workorder/modules/bom-list.vue
@@ -0,0 +1,181 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProWorkOrderApi } from '#/api/mes/pro/workorder';
+import type { MesProWorkOrderBomApi } from '#/api/mes/pro/workorder/bom';
+
+import { computed } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteWorkOrderBom,
+  getWorkOrderBomPage,
+} from '#/api/mes/pro/workorder/bom';
+import { $t } from '#/locales';
+import {
+  MesProWorkOrderStatusEnum,
+  MesProWorkOrderTypeEnum,
+} from '#/views/mes/utils/constants';
+
+import { useBomGridColumns } from '../data';
+import BomForm from './bom-form.vue';
+
+const props = defineProps<{
+  formType: FormType;
+  workOrder: MesProWorkOrderApi.WorkOrder;
+  workOrderId: number;
+}>();
+
+const emit = defineEmits<{
+  generateWorkOrder: [row: MesProWorkOrderBomApi.WorkOrderBom];
+}>();
+
+const isEditable = computed(() => // 编辑态草稿可增删改 BOM
+  ['create', 'update'].includes(props.formType) &&
+  props.workOrder.status === MesProWorkOrderStatusEnum.PREPARE,
+);
+const isConfirmed = computed(() => // 已确认态可生成子工单
+  props.workOrder.status === MesProWorkOrderStatusEnum.CONFIRMED,
+);
+
+const [BomFormModal, bomFormModalApi] = useVbenModal({
+  connectedComponent: BomForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 添加 BOM 物料 */
+function handleCreate() {
+  bomFormModalApi
+    .setData({ productId: props.workOrder.productId, workOrderId: props.workOrderId })
+    .open();
+}
+
+/** 编辑 BOM 物料 */
+function handleEdit(row: MesProWorkOrderBomApi.WorkOrderBom) {
+  bomFormModalApi
+    .setData({
+      id: row.id,
+      productId: props.workOrder.productId,
+      workOrderId: props.workOrderId,
+    })
+    .open();
+}
+
+/** 删除 BOM 物料 */
+async function handleDelete(row: MesProWorkOrderBomApi.WorkOrderBom) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.itemName]),
+    duration: 0,
+  });
+  try {
+    await deleteWorkOrderBom(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.itemName]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 从 BOM 行生成子工单（通知父组件） */
+function handleGenerateWorkOrder(row: MesProWorkOrderBomApi.WorkOrderBom) {
+  emit('generateWorkOrder', row);
+}
+
+/** 是否展示生成子工单按钮：已确认 + 自制 + 产品类型 BOM 行 */
+function showGenerate(row: MesProWorkOrderBomApi.WorkOrderBom) {
+  return (
+    isConfirmed.value &&
+    props.workOrder.type === MesProWorkOrderTypeEnum.SELF &&
+    row.itemOrProduct === 'PRODUCT'
+  );
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useBomGridColumns(isEditable.value, isConfirmed.value),
+    height: 400,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.workOrderId) {
+            return { list: [], total: 0 };
+          }
+          return await getWorkOrderBomPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            workOrderId: props.workOrderId,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesProWorkOrderBomApi.WorkOrderBom>,
+});
+</script>
+
+<template>
+  <div>
+    <BomFormModal @success="handleRefresh" />
+    <Grid table-title="工单 BOM">
+      <template v-if="isEditable" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '添加物料',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              ifShow: isEditable,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              ifShow: isEditable,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.itemName]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '生成工单',
+              type: 'link',
+              ifShow: showGenerate(row),
+              onClick: handleGenerateWorkOrder.bind(null, row),
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-antd/src/views/mes/pro/workorder/modules/form.vue b/apps/web-antd/src/views/mes/pro/workorder/modules/form.vue
new file mode 100644
index 000000000..4a01f16db
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/workorder/modules/form.vue
@@ -0,0 +1,295 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesProWorkOrderApi } from '#/api/mes/pro/workorder';
+import type { MesProWorkOrderBomApi } from '#/api/mes/pro/workorder/bom';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { Button, message, Popconfirm, Tabs } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  confirmWorkOrder,
+  createWorkOrder,
+  finishWorkOrder,
+  getWorkOrder,
+  updateWorkOrder,
+} from '#/api/mes/pro/workorder';
+import { $t } from '#/locales';
+import {
+  BarcodeBizTypeEnum,
+  MesProWorkOrderStatusEnum,
+} from '#/views/mes/utils/constants';
+import { BarcodeDetail } from '#/views/mes/wm/barcode/components';
+
+import { useFormSchema } from '../data';
+import BomList from './bom-list.vue';
+import ItemList from './item-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesProWorkOrderApi.WorkOrder>();
+const originalSnapshot = ref(''); // 表单原始数据快照，用于确认时跳过未变更的保存请求
+const subTabsName = ref('bom'); // 当前选中的子表 Tab
+const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>(); // 条码详情弹窗
+
+const isEditable = computed(() => // 是否为编辑模式（可保存）
+  ['create', 'update'].includes(formType.value),
+);
+const isConfirm = computed(() => formType.value === 'confirm'); // 是否为确认模式
+const isFinish = computed(() => formType.value === 'finish'); // 是否为完成模式
+const canConfirm = computed(() => // 编辑态草稿可确认
+  formType.value === 'update' &&
+  formData.value?.status === MesProWorkOrderStatusEnum.PREPARE,
+);
+const getTitle = computed(() => {
+  const isChild = !!formData.value?.parentId;
+  switch (formType.value) {
+    case 'confirm': {
+      return '确认工单';
+    }
+    case 'detail': {
+      return $t('ui.actionTitle.view', ['工单']);
+    }
+    case 'finish': {
+      return '完成工单';
+    }
+    case 'update': {
+      return isChild ? '编辑子工单' : $t('ui.actionTitle.edit', ['工单']);
+    }
+    default: {
+      return isChild ? '新增子工单' : $t('ui.actionTitle.create', ['工单']);
+    }
+  }
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+/** 重新挂载 schema 并按表单态控制底部确认按钮 */
+function applySchema() {
+  formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+  modalApi.setState({ showConfirmButton: isEditable.value });
+}
+
+/** 查看工单条码 */
+function handleBarcode() {
+  if (!formData.value?.id) {
+    return;
+  }
+  barcodeDetailRef.value?.openByBusiness(
+    formData.value.id,
+    BarcodeBizTypeEnum.WORKORDER,
+    formData.value.code,
+    formData.value.name,
+  );
+}
+
+/** 确认工单：编辑态有修改时先保存，再确认 */
+async function handleConfirm() {
+  const { valid } = await formApi.validate();
+  if (!valid || !formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    if (isEditable.value) {
+      const current = JSON.stringify(await formApi.getValues());
+      if (current !== originalSnapshot.value) {
+        const data = (await formApi.getValues()) as MesProWorkOrderApi.WorkOrder;
+        await updateWorkOrder({ ...formData.value, ...data });
+        originalSnapshot.value = current;
+      }
+    }
+    await confirmWorkOrder(formData.value.id);
+    message.success('工单已确认');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 完成工单 */
+async function handleFinish() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await finishWorkOrder(formData.value.id);
+    message.success('工单已完成');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 从 BOM 物料行预填子工单：复用当前工单上下文，进入新增态 */
+async function handleGenerateWorkOrder(
+  bomRow: MesProWorkOrderBomApi.WorkOrderBom,
+) {
+  const current = formData.value;
+  if (!current) {
+    return;
+  }
+  formData.value = undefined;
+  formType.value = 'create';
+  subTabsName.value = 'bom';
+  applySchema();
+  await formApi.resetForm();
+  await formApi.setValues({
+    clientId: current.clientId,
+    name: `${bomRow.itemName}【${bomRow.quantity}】${bomRow.unitMeasureName || ''}`,
+    orderSourceCode: current.orderSourceCode,
+    orderSourceType: current.orderSourceType,
+    parentId: current.id,
+    productId: bomRow.itemId,
+    quantity: bomRow.quantity,
+    requestDate: current.requestDate,
+    type: current.type,
+    vendorId: current.vendorId,
+  });
+  originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  message.info('已从 BOM 物料预填子工单，请补充工单编码等信息后保存');
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (!isEditable.value) {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data = (await formApi.getValues()) as MesProWorkOrderApi.WorkOrder;
+    try {
+      if (formData.value?.id) {
+        await updateWorkOrder({ ...formData.value, ...data });
+        formData.value = { ...formData.value, ...data };
+      } else {
+        const id = await createWorkOrder(data);
+        formData.value = {
+          ...data,
+          id,
+          status: MesProWorkOrderStatusEnum.PREPARE,
+        };
+        formType.value = 'update';
+        // 创建成功后切换编辑态，重挂 schema 让「工单状态」字段显现
+        applySchema();
+        await formApi.setValues(formData.value);
+      }
+      originalSnapshot.value = JSON.stringify(await formApi.getValues());
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      originalSnapshot.value = '';
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{
+      formType: FormType;
+      id?: number;
+      parentRow?: MesProWorkOrderApi.WorkOrder;
+    }>();
+    formType.value = data.formType;
+    subTabsName.value = 'bom';
+    applySchema();
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getWorkOrder(data.id);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    } else if (data?.parentRow) {
+      // 新增子工单时，预填父工单信息
+      const parent = data.parentRow;
+      await formApi.setValues({
+        clientId: parent.clientId,
+        orderSourceCode: parent.orderSourceCode,
+        orderSourceType: parent.orderSourceType,
+        parentId: parent.id,
+        requestDate: parent.requestDate,
+        type: parent.type,
+        vendorId: parent.vendorId,
+      });
+    }
+    originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+    <!-- BOM / 物料需求 Tab：非新建态展示 -->
+    <template v-if="formData?.id">
+      <Tabs v-model:active-key="subTabsName" class="mx-4">
+        <Tabs.TabPane key="bom" tab="工单 BOM">
+          <BomList
+            :form-type="formType"
+            :work-order="formData"
+            :work-order-id="formData.id"
+            @generate-work-order="handleGenerateWorkOrder"
+          />
+        </Tabs.TabPane>
+        <Tabs.TabPane key="item" tab="物料需求">
+          <ItemList :work-order-id="formData.id" />
+        </Tabs.TabPane>
+      </Tabs>
+    </template>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <Popconfirm
+          v-if="canConfirm || isConfirm"
+          title="确认要完成工单编制吗？确认后将不能更改。"
+          @confirm="handleConfirm"
+        >
+          <Button type="primary">确认</Button>
+        </Popconfirm>
+        <Popconfirm
+          v-if="isFinish"
+          title="确认要完成该工单吗？"
+          @confirm="handleFinish"
+        >
+          <Button type="primary">完成</Button>
+        </Popconfirm>
+        <Button
+          v-if="formType === 'detail' && formData?.id"
+          @click="handleBarcode"
+        >
+          查看条码
+        </Button>
+      </div>
+    </template>
+  </Modal>
+  <BarcodeDetail ref="barcodeDetailRef" />
+</template>
diff --git a/apps/web-antd/src/views/mes/pro/workorder/modules/item-list.vue b/apps/web-antd/src/views/mes/pro/workorder/modules/item-list.vue
new file mode 100644
index 000000000..7832dd209
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/workorder/modules/item-list.vue
@@ -0,0 +1,45 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProWorkOrderBomApi } from '#/api/mes/pro/workorder/bom';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getWorkOrderBomItemListByWorkOrderId } from '#/api/mes/pro/workorder/bom';
+
+import { useItemGridColumns } from '../data';
+
+const props = defineProps<{
+  workOrderId: number;
+}>();
+
+const [Grid] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useItemGridColumns(),
+    height: 400,
+    keepSource: true,
+    pagerConfig: {
+      enabled: false,
+    },
+    proxyConfig: {
+      ajax: {
+        query: async () => {
+          if (!props.workOrderId) {
+            return [];
+          }
+          return await getWorkOrderBomItemListByWorkOrderId(props.workOrderId);
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesProWorkOrderBomApi.WorkOrderBom>,
+});
+</script>
+
+<template>
+  <Grid table-title="物料需求" />
+</template>
diff --git a/apps/web-ele/src/views/mes/pro/workorder/components/pro-work-order-select-dialog.vue b/apps/web-ele/src/views/mes/pro/workorder/components/pro-work-order-select-dialog.vue
new file mode 100644
index 000000000..3e0d61c62
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/workorder/components/pro-work-order-select-dialog.vue
@@ -0,0 +1,226 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProWorkOrderApi } from '#/api/mes/pro/workorder';
+
+import { computed, nextTick, ref } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictLabel } from '@vben/hooks';
+
+import { ElAlert, ElButton, ElDialog, ElMessage } from 'element-plus';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getWorkOrderPage } from '#/api/mes/pro/workorder';
+
+import {
+  useWorkOrderSelectGridColumns,
+  useWorkOrderSelectGridFormSchema,
+} from '../data';
+
+const props = withDefaults(
+  defineProps<{
+    status?: number;
+    type?: number;
+  }>(),
+  {
+    status: undefined,
+    type: undefined,
+  },
+);
+const emit = defineEmits<{
+  selected: [rows: MesProWorkOrderApi.WorkOrder[]];
+}>();
+
+const open = ref(false); // 弹窗是否打开
+const multiple = ref(false); // 是否多选；默认按单选选择器使用
+const selectedRows = ref<MesProWorkOrderApi.WorkOrder[]>([]); // 已选工单列表
+const preSelectedIds = ref<number[]>([]); // 预选工单编号列表
+
+const typeTip = computed(() => {
+  if (props.type == null) {
+    return '';
+  }
+  return `仅展示【${getDictLabel(DICT_TYPE.MES_PRO_WORK_ORDER_TYPE, props.type)}】类型的工单`;
+});
+
+/** 获取多选记录，包含 VXE reserve 跨页记录 */
+function getMultipleSelectedRows() {
+  const selectedMap = new Map<number, MesProWorkOrderApi.WorkOrder>();
+  const records = [
+    ...(gridApi.grid.getCheckboxReserveRecords?.() ?? []),
+    ...(gridApi.grid.getCheckboxRecords?.() ?? []),
+  ] as MesProWorkOrderApi.WorkOrder[];
+  records.forEach((row) => {
+    const rowId = row.id;
+    if (rowId !== undefined) {
+      selectedMap.set(rowId, row);
+    }
+  });
+  return [...selectedMap.values()];
+}
+
+/** 处理多选勾选变化 */
+function handleCheckboxSelectChange() {
+  selectedRows.value = getMultipleSelectedRows();
+}
+
+/** 处理单选切换 */
+function handleRadioChange(row: MesProWorkOrderApi.WorkOrder) {
+  selectedRows.value = [row];
+}
+
+/** 多选模式下切换行勾选 */
+async function toggleMultipleRow(row: MesProWorkOrderApi.WorkOrder) {
+  const selected = gridApi.grid.isCheckedByCheckboxRow(row);
+  await gridApi.grid.setCheckboxRow(row, !selected);
+  selectedRows.value = getMultipleSelectedRows();
+}
+
+/** 处理行双击：单选直接确认，多选切换勾选 */
+async function handleCellDblclick({ row }: { row: MesProWorkOrderApi.WorkOrder }) {
+  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 = gridApi.grid.getData() as MesProWorkOrderApi.WorkOrder[];
+  for (const row of rows) {
+    if (row.id === undefined || !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: useWorkOrderSelectGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useWorkOrderSelectGridColumns(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 getWorkOrderPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            type: props.type,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesProWorkOrderApi.WorkOrder>,
+  gridEvents: {
+    cellDblclick: handleCellDblclick,
+    checkboxAll: handleCheckboxSelectChange,
+    checkboxChange: handleCheckboxSelectChange,
+    radioChange: ({ row }: { row: MesProWorkOrderApi.WorkOrder }) => {
+      handleRadioChange(row);
+    },
+  },
+});
+
+/** 重置查询和选择状态，保留外部传入的默认状态过滤 */
+async function resetQueryState() {
+  selectedRows.value = [];
+  await gridApi.grid.clearCheckboxRow();
+  await gridApi.grid.clearCheckboxReserve();
+  await gridApi.grid.clearRadioRow();
+  await gridApi.formApi.resetForm();
+  if (props.status != null) {
+    await gridApi.formApi.setFieldValue('status', props.status);
+  }
+}
+
+/** 打开工单选择弹窗 */
+async function openModal(
+  selectedIds?: number[],
+  options?: { multiple?: boolean },
+) {
+  open.value = true;
+  multiple.value = options?.multiple ?? false;
+  preSelectedIds.value = selectedIds || [];
+  await nextTick();
+  gridApi.setGridOptions({
+    columns: useWorkOrderSelectGridColumns(multiple.value),
+  });
+  await resetQueryState();
+  await gridApi.query();
+  await nextTick();
+  await applyPreSelection();
+}
+
+/** 关闭工单选择弹窗 */
+function closeModal() {
+  open.value = false;
+}
+
+/** 确认选择工单 */
+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%">
+    <ElAlert
+      v-if="typeTip"
+      :closable="false"
+      :title="typeTip"
+      class="!mb-3"
+      show-icon
+      type="info"
+    />
+    <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/pro/workorder/data.ts b/apps/web-ele/src/views/mes/pro/workorder/data.ts
new file mode 100644
index 000000000..1c0884d47
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/workorder/data.ts
@@ -0,0 +1,734 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesMdProductBomApi } from '#/api/mes/md/item/productBom';
+import type { MesProWorkOrderApi } from '#/api/mes/pro/workorder';
+import type { MesProWorkOrderBomApi } from '#/api/mes/pro/workorder/bom';
+
+import { h, markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { ElButton } from 'element-plus';
+
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getRangePickerDefaultProps } from '#/utils';
+import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
+import { MdItemSelect, MdProductBomSelect } from '#/views/mes/md/item/components';
+import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
+import {
+  MesAutoCodeRuleCode,
+  MesProWorkOrderSourceTypeEnum,
+  MesProWorkOrderTypeEnum,
+} from '#/views/mes/utils/constants';
+
+/** 表单类型 */
+export type FormType = 'confirm' | 'create' | 'detail' | 'finish' | 'update';
+
+/** 表头是否只读（确认、完成、详情态） */
+function isHeaderReadonly(formType: FormType): boolean {
+  return ['confirm', 'detail', 'finish'].includes(formType);
+}
+
+/** 新增/修改的表单 */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  const headerReadonly = isHeaderReadonly(formType);
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'parentId',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'status',
+      label: '工单状态',
+      component: 'Select',
+      componentProps: {
+        disabled: true,
+        options: getDictOptions(DICT_TYPE.MES_PRO_WORK_ORDER_STATUS, 'number'),
+      },
+      dependencies: {
+        triggerFields: [''],
+        show: () => formType !== 'create',
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '工单编码',
+      component: 'Input',
+      componentProps: {
+        disabled: headerReadonly,
+        placeholder: '请输入工单编码',
+      },
+      rules: 'required',
+      suffix:
+        formType === 'create' || formType === 'update'
+          ? () =>
+              h(
+                ElButton,
+                {
+                  onClick: async () => {
+                    const code = await generateAutoCode(
+                      MesAutoCodeRuleCode.PRO_WORK_ORDER_CODE,
+                    );
+                    await formApi?.setFieldValue('code', code);
+                  },
+                },
+                { default: () => '生成' },
+              )
+          : undefined,
+    },
+    {
+      fieldName: 'name',
+      label: '工单名称',
+      component: 'Input',
+      componentProps: {
+        disabled: headerReadonly,
+        placeholder: '请输入工单名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'orderSourceType',
+      label: '工单来源',
+      component: 'Select',
+      componentProps: {
+        disabled: headerReadonly,
+        options: getDictOptions(
+          DICT_TYPE.MES_PRO_WORK_ORDER_SOURCE_TYPE,
+          'number',
+        ),
+        placeholder: '请选择工单来源',
+        // 工单来源变更：非客户订单时清空来源单据编号和客户
+        onChange: async (value: number) => {
+          if (value !== MesProWorkOrderSourceTypeEnum.ORDER) {
+            await formApi?.setValues({
+              clientId: undefined,
+              orderSourceCode: undefined,
+            });
+          }
+        },
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'orderSourceCode',
+      label: '来源单据编号',
+      component: 'Input',
+      componentProps: {
+        disabled: headerReadonly,
+        placeholder: '请输入来源单据编号',
+      },
+      dependencies: {
+        triggerFields: ['orderSourceType'],
+        show: (values) =>
+          values.orderSourceType === MesProWorkOrderSourceTypeEnum.ORDER,
+      },
+    },
+    {
+      fieldName: 'type',
+      label: '工单类型',
+      component: 'Select',
+      componentProps: {
+        disabled: headerReadonly,
+        options: getDictOptions(DICT_TYPE.MES_PRO_WORK_ORDER_TYPE, 'number'),
+        placeholder: '请选择工单类型',
+        // 工单类型变更：非代工/采购时清空供应商
+        onChange: async (value: number) => {
+          if (
+            value !== MesProWorkOrderTypeEnum.OUTSOURCE &&
+            value !== MesProWorkOrderTypeEnum.PURCHASE
+          ) {
+            await formApi?.setFieldValue('vendorId', undefined);
+          }
+        },
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'productId',
+      label: '产品',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        disabled: headerReadonly,
+        placeholder: '请选择产品',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'quantity',
+      label: '工单数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        disabled: headerReadonly,
+        min: 1,
+        placeholder: '请输入工单数量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'clientId',
+      label: '客户',
+      component: markRaw(MdClientSelect),
+      componentProps: {
+        disabled: headerReadonly,
+        placeholder: '请选择客户',
+      },
+      dependencies: {
+        triggerFields: ['orderSourceType'],
+        show: (values) =>
+          values.orderSourceType === MesProWorkOrderSourceTypeEnum.ORDER,
+      },
+    },
+    {
+      fieldName: 'vendorId',
+      label: '供应商',
+      component: markRaw(MdVendorSelect),
+      componentProps: {
+        disabled: headerReadonly,
+        placeholder: '请选择供应商',
+      },
+      dependencies: {
+        triggerFields: ['type'],
+        show: (values) =>
+          values.type === MesProWorkOrderTypeEnum.OUTSOURCE ||
+          values.type === MesProWorkOrderTypeEnum.PURCHASE,
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        disabled: headerReadonly,
+        placeholder: '请输入批次号',
+      },
+    },
+    {
+      fieldName: 'requestDate',
+      label: '需求日期',
+      component: 'DatePicker',
+      componentProps: {
+        class: '!w-full',
+        disabled: headerReadonly,
+        placeholder: '请选择需求日期',
+        type: 'date',
+        valueFormat: 'x',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        disabled: headerReadonly,
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '工单编码',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入工单编码',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '工单名称',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入工单名称',
+      },
+    },
+    {
+      fieldName: 'orderSourceCode',
+      label: '来源单据',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入来源单据编号',
+      },
+    },
+    {
+      fieldName: 'productId',
+      label: '产品',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择产品',
+      },
+    },
+    {
+      fieldName: 'clientId',
+      label: '客户',
+      component: markRaw(MdClientSelect),
+      componentProps: {
+        placeholder: '请选择客户',
+      },
+    },
+    {
+      fieldName: 'type',
+      label: '工单类型',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_PRO_WORK_ORDER_TYPE, 'number'),
+        placeholder: '请选择工单类型',
+      },
+    },
+    {
+      fieldName: 'requestDate',
+      label: '需求日期',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+        clearable: true,
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesProWorkOrderApi.WorkOrder>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '工单编码',
+      fixed: 'left',
+      width: 200,
+      treeNode: true,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '工单名称',
+      minWidth: 150,
+    },
+    {
+      field: 'type',
+      title: '工单类型',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_PRO_WORK_ORDER_TYPE },
+      },
+    },
+    {
+      field: 'orderSourceType',
+      title: '工单来源',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_PRO_WORK_ORDER_SOURCE_TYPE },
+      },
+    },
+    {
+      field: 'orderSourceCode',
+      title: '来源单据编号',
+      width: 140,
+    },
+    {
+      field: 'productCode',
+      title: '产品编码',
+      width: 120,
+    },
+    {
+      field: 'productName',
+      title: '产品名称',
+      minWidth: 120,
+    },
+    {
+      field: 'productSpecification',
+      title: '规格型号',
+      width: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'quantity',
+      title: '工单数量',
+      width: 100,
+    },
+    {
+      field: 'quantityProduced',
+      title: '已生产数量',
+      width: 100,
+    },
+    {
+      field: 'clientCode',
+      title: '客户编码',
+      width: 120,
+    },
+    {
+      field: 'clientName',
+      title: '客户名称',
+      width: 120,
+    },
+    {
+      field: 'requestDate',
+      title: '需求日期',
+      width: 180,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'status',
+      title: '工单状态',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_PRO_WORK_ORDER_STATUS },
+      },
+    },
+    {
+      field: 'createTime',
+      title: '创建时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      title: '操作',
+      width: 240,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 工单 BOM 子表的字段 */
+export function useBomGridColumns(
+  editable: boolean,
+  generatable: boolean,
+): VxeTableGridOptions<MesProWorkOrderBomApi.WorkOrderBom>['columns'] {
+  return [
+    {
+      field: 'itemCode',
+      title: 'BOM 物料编码',
+      width: 120,
+    },
+    {
+      field: 'itemName',
+      title: 'BOM 物料名称',
+      minWidth: 150,
+    },
+    {
+      field: 'itemSpecification',
+      title: '规格型号',
+      width: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'itemOrProduct',
+      title: '物料/产品',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_MD_ITEM_OR_PRODUCT },
+      },
+    },
+    {
+      field: 'quantity',
+      title: '预计使用量',
+      width: 120,
+    },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 120,
+    },
+    ...(editable || generatable
+      ? [
+          {
+            title: '操作',
+            width: 160,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 工单 BOM 新增/修改的表单 */
+export function useBomFormSchema(
+  isCreate: boolean,
+  productId?: number,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdProductBomSelect),
+      componentProps: {
+        itemId: productId,
+        placeholder: '请选择物料',
+        // BOM 物料选中后自动回填预计使用量
+        onChange: async (bom?: MesMdProductBomApi.ProductBom) => {
+          await formApi?.setFieldValue('quantity', bom?.quantity ?? undefined);
+        },
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: [''],
+        show: () => isCreate,
+      },
+    },
+    {
+      fieldName: 'itemName',
+      label: '物料',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+      },
+      dependencies: {
+        triggerFields: [''],
+        show: () => !isCreate,
+      },
+    },
+    {
+      fieldName: 'unitMeasureName',
+      label: '单位',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+      },
+      dependencies: {
+        triggerFields: [''],
+        show: () => !isCreate,
+      },
+    },
+    {
+      fieldName: 'quantity',
+      label: '预计使用量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入预计使用量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 工单选择弹窗的搜索表单 */
+export function useWorkOrderSelectGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '工单编码',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入工单编码',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '工单名称',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入工单名称',
+      },
+    },
+    {
+      fieldName: 'productId',
+      label: '产品',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择产品',
+      },
+    },
+    {
+      fieldName: 'clientId',
+      label: '客户',
+      component: markRaw(MdClientSelect),
+      componentProps: {
+        placeholder: '请选择客户',
+      },
+    },
+    {
+      fieldName: 'status',
+      label: '工单状态',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_PRO_WORK_ORDER_STATUS, 'number'),
+        placeholder: '请选择工单状态',
+      },
+    },
+  ];
+}
+
+/** 工单选择弹窗的字段 */
+export function useWorkOrderSelectGridColumns(
+  multiple = false,
+): VxeTableGridOptions<MesProWorkOrderApi.WorkOrder>['columns'] {
+  return [
+    {
+      type: multiple ? 'checkbox' : 'radio',
+      width: 50,
+    },
+    {
+      field: 'code',
+      title: '工单编码',
+      width: 180,
+    },
+    {
+      field: 'name',
+      title: '工单名称',
+      minWidth: 180,
+    },
+    {
+      field: 'orderSourceType',
+      title: '工单来源',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_PRO_WORK_ORDER_SOURCE_TYPE },
+      },
+    },
+    {
+      field: 'orderSourceCode',
+      title: '订单编号',
+      width: 140,
+    },
+    {
+      field: 'productCode',
+      title: '产品编号',
+      width: 120,
+    },
+    {
+      field: 'productName',
+      title: '产品名称',
+      minWidth: 150,
+    },
+    {
+      field: 'productSpecification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'quantity',
+      title: '工单数量',
+      width: 100,
+    },
+    {
+      field: 'clientCode',
+      title: '客户编码',
+      width: 120,
+    },
+    {
+      field: 'clientName',
+      title: '客户名称',
+      minWidth: 120,
+    },
+    {
+      field: 'status',
+      title: '工单状态',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_PRO_WORK_ORDER_STATUS },
+      },
+    },
+    {
+      field: 'requestDate',
+      title: '需求日期',
+      width: 120,
+      formatter: 'formatDate',
+    },
+  ];
+}
+
+/** 工单物料需求子表的字段（只读） */
+export function useItemGridColumns(): VxeTableGridOptions<MesProWorkOrderBomApi.WorkOrderBom>['columns'] {
+  return [
+    {
+      field: 'itemCode',
+      title: '物料编码',
+      width: 120,
+    },
+    {
+      field: 'itemName',
+      title: '物料名称',
+      minWidth: 150,
+    },
+    {
+      field: 'itemSpecification',
+      title: '规格型号',
+      width: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'itemOrProduct',
+      title: '物料/产品',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_MD_ITEM_OR_PRODUCT },
+      },
+    },
+    {
+      field: 'quantity',
+      title: '需求数量',
+      width: 120,
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/pro/workorder/index.vue b/apps/web-ele/src/views/mes/pro/workorder/index.vue
new file mode 100644
index 000000000..3f7e02c25
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/workorder/index.vue
@@ -0,0 +1,245 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProWorkOrderApi } from '#/api/mes/pro/workorder';
+
+import { ref } from 'vue';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { ElButton, ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  cancelWorkOrder,
+  deleteWorkOrder,
+  exportWorkOrder,
+  getWorkOrderPage,
+} from '#/api/mes/pro/workorder';
+import { $t } from '#/locales';
+import {
+  BarcodeBizTypeEnum,
+  MesProWorkOrderStatusEnum,
+  MesProWorkOrderTypeEnum,
+} from '#/views/mes/utils/constants';
+import { BarcodeDetail } from '#/views/mes/wm/barcode/components';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>(); // 条码详情弹窗
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建工单 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 新增子工单 */
+function handleAddChild(row: MesProWorkOrderApi.WorkOrder) {
+  formModalApi.setData({ formType: 'create', parentRow: row }).open();
+}
+
+/** 查看工单详情 */
+function handleDetail(row: MesProWorkOrderApi.WorkOrder) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑工单 */
+function handleEdit(row: MesProWorkOrderApi.WorkOrder) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 完成工单 */
+function handleFinish(row: MesProWorkOrderApi.WorkOrder) {
+  formModalApi.setData({ formType: 'finish', id: row.id }).open();
+}
+
+/** 删除工单 */
+async function handleDelete(row: MesProWorkOrderApi.WorkOrder) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.code]),
+  });
+  try {
+    await deleteWorkOrder(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+/** 取消工单 */
+async function handleCancel(row: MesProWorkOrderApi.WorkOrder) {
+  await cancelWorkOrder(row.id!);
+  ElMessage.success('工单已取消');
+  handleRefresh();
+}
+
+/** 查看工单条码 */
+function handleBarcode(row: MesProWorkOrderApi.WorkOrder) {
+  barcodeDetailRef.value?.openByBusiness(
+    row.id!,
+    BarcodeBizTypeEnum.WORKORDER,
+    row.code,
+    row.name,
+  );
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportWorkOrder(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '生产工单.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getWorkOrderPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+    treeConfig: {
+      parentField: 'parentId',
+      rowField: 'id',
+      transform: true,
+      expandAll: true,
+      reserve: true,
+    },
+  } as VxeTableGridOptions<MesProWorkOrderApi.WorkOrder>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【生产】生产工单"
+        url="https://doc.iocoder.cn/mes/pro/work-order/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="生产工单列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['工单']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:pro-work-order:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:pro-work-order:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <ElButton link type="primary" @click="handleDetail(row)">
+          {{ row.code }}
+        </ElButton>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:pro-work-order:update'],
+              ifShow: row.status === MesProWorkOrderStatusEnum.PREPARE,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:pro-work-order:delete'],
+              ifShow: row.status === MesProWorkOrderStatusEnum.PREPARE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: $t('common.create'),
+              type: 'primary',
+              link: true,
+              auth: ['mes:pro-work-order:create'],
+              ifShow:
+                row.status === MesProWorkOrderStatusEnum.CONFIRMED &&
+                row.type === MesProWorkOrderTypeEnum.SELF,
+              onClick: handleAddChild.bind(null, row),
+            },
+            {
+              label: '完成',
+              type: 'primary',
+              link: true,
+              auth: ['mes:pro-work-order:update'],
+              ifShow: row.status === MesProWorkOrderStatusEnum.CONFIRMED,
+              onClick: handleFinish.bind(null, row),
+            },
+            {
+              label: '取消',
+              type: 'danger',
+              link: true,
+              auth: ['mes:pro-work-order:update'],
+              ifShow: row.status === MesProWorkOrderStatusEnum.CONFIRMED,
+              popConfirm: {
+                title: '确认要取消该工单吗？取消后不可恢复。',
+                confirm: handleCancel.bind(null, row),
+              },
+            },
+            {
+              label: '条码',
+              type: 'primary',
+              link: true,
+              auth: ['mes:pro-work-order:query'],
+              onClick: handleBarcode.bind(null, row),
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+    <BarcodeDetail ref="barcodeDetailRef" />
+  </Page>
+</template>
diff --git a/apps/web-ele/src/views/mes/pro/workorder/modules/bom-form.vue b/apps/web-ele/src/views/mes/pro/workorder/modules/bom-form.vue
new file mode 100644
index 000000000..69df71ce0
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/workorder/modules/bom-form.vue
@@ -0,0 +1,101 @@
+<script lang="ts" setup>
+import type { MesProWorkOrderBomApi } from '#/api/mes/pro/workorder/bom';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createWorkOrderBom,
+  getWorkOrderBom,
+  updateWorkOrderBom,
+} from '#/api/mes/pro/workorder/bom';
+import { $t } from '#/locales';
+
+import { useBomFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesProWorkOrderBomApi.WorkOrderBom>();
+const workOrderId = ref<number>(); // 所属工单编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['BOM 物料'])
+    : $t('ui.actionTitle.create', ['BOM 物料']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-2',
+    labelWidth: 100,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-2',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesProWorkOrderBomApi.WorkOrderBom;
+    data.workOrderId = workOrderId.value;
+    try {
+      await (formData.value?.id
+        ? updateWorkOrderBom({ ...data, id: formData.value.id })
+        : createWorkOrderBom(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{
+      id?: number;
+      productId?: number;
+      workOrderId: number;
+    }>();
+    workOrderId.value = data.workOrderId;
+    formApi.setState({
+      schema: useBomFormSchema(!data.id, data.productId, formApi),
+    });
+    if (!data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getWorkOrderBom(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-2/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/pro/workorder/modules/bom-list.vue b/apps/web-ele/src/views/mes/pro/workorder/modules/bom-list.vue
new file mode 100644
index 000000000..7b8e63476
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/workorder/modules/bom-list.vue
@@ -0,0 +1,182 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProWorkOrderApi } from '#/api/mes/pro/workorder';
+import type { MesProWorkOrderBomApi } from '#/api/mes/pro/workorder/bom';
+
+import { computed } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteWorkOrderBom,
+  getWorkOrderBomPage,
+} from '#/api/mes/pro/workorder/bom';
+import { $t } from '#/locales';
+import {
+  MesProWorkOrderStatusEnum,
+  MesProWorkOrderTypeEnum,
+} from '#/views/mes/utils/constants';
+
+import { useBomGridColumns } from '../data';
+import BomForm from './bom-form.vue';
+
+const props = defineProps<{
+  formType: FormType;
+  workOrder: MesProWorkOrderApi.WorkOrder;
+  workOrderId: number;
+}>();
+
+const emit = defineEmits<{
+  generateWorkOrder: [row: MesProWorkOrderBomApi.WorkOrderBom];
+}>();
+
+const isEditable = computed(() => // 编辑态草稿可增删改 BOM
+  ['create', 'update'].includes(props.formType) &&
+  props.workOrder.status === MesProWorkOrderStatusEnum.PREPARE,
+);
+const isConfirmed = computed(() => // 已确认态可生成子工单
+  props.workOrder.status === MesProWorkOrderStatusEnum.CONFIRMED,
+);
+
+const [BomFormModal, bomFormModalApi] = useVbenModal({
+  connectedComponent: BomForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 添加 BOM 物料 */
+function handleCreate() {
+  bomFormModalApi
+    .setData({ productId: props.workOrder.productId, workOrderId: props.workOrderId })
+    .open();
+}
+
+/** 编辑 BOM 物料 */
+function handleEdit(row: MesProWorkOrderBomApi.WorkOrderBom) {
+  bomFormModalApi
+    .setData({
+      id: row.id,
+      productId: props.workOrder.productId,
+      workOrderId: props.workOrderId,
+    })
+    .open();
+}
+
+/** 删除 BOM 物料 */
+async function handleDelete(row: MesProWorkOrderBomApi.WorkOrderBom) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.itemName]),
+  });
+  try {
+    await deleteWorkOrderBom(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.itemName]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+/** 从 BOM 行生成子工单（通知父组件） */
+function handleGenerateWorkOrder(row: MesProWorkOrderBomApi.WorkOrderBom) {
+  emit('generateWorkOrder', row);
+}
+
+/** 是否展示生成子工单按钮：已确认 + 自制 + 产品类型 BOM 行 */
+function showGenerate(row: MesProWorkOrderBomApi.WorkOrderBom) {
+  return (
+    isConfirmed.value &&
+    props.workOrder.type === MesProWorkOrderTypeEnum.SELF &&
+    row.itemOrProduct === 'PRODUCT'
+  );
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useBomGridColumns(isEditable.value, isConfirmed.value),
+    height: 400,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.workOrderId) {
+            return { list: [], total: 0 };
+          }
+          return await getWorkOrderBomPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            workOrderId: props.workOrderId,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesProWorkOrderBomApi.WorkOrderBom>,
+});
+</script>
+
+<template>
+  <div>
+    <BomFormModal @success="handleRefresh" />
+    <Grid table-title="工单 BOM">
+      <template v-if="isEditable" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '添加物料',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              ifShow: isEditable,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              ifShow: isEditable,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.itemName]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '生成工单',
+              type: 'primary',
+              link: true,
+              ifShow: showGenerate(row),
+              onClick: handleGenerateWorkOrder.bind(null, row),
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-ele/src/views/mes/pro/workorder/modules/form.vue b/apps/web-ele/src/views/mes/pro/workorder/modules/form.vue
new file mode 100644
index 000000000..79be48a28
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/workorder/modules/form.vue
@@ -0,0 +1,307 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesProWorkOrderApi } from '#/api/mes/pro/workorder';
+import type { MesProWorkOrderBomApi } from '#/api/mes/pro/workorder/bom';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import {
+  ElButton,
+  ElMessage,
+  ElPopconfirm,
+  ElTabPane,
+  ElTabs,
+} from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  confirmWorkOrder,
+  createWorkOrder,
+  finishWorkOrder,
+  getWorkOrder,
+  updateWorkOrder,
+} from '#/api/mes/pro/workorder';
+import { $t } from '#/locales';
+import {
+  BarcodeBizTypeEnum,
+  MesProWorkOrderStatusEnum,
+} from '#/views/mes/utils/constants';
+import { BarcodeDetail } from '#/views/mes/wm/barcode/components';
+
+import { useFormSchema } from '../data';
+import BomList from './bom-list.vue';
+import ItemList from './item-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesProWorkOrderApi.WorkOrder>();
+const originalSnapshot = ref(''); // 表单原始数据快照，用于确认时跳过未变更的保存请求
+const subTabsName = ref('bom'); // 当前选中的子表 Tab
+const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>(); // 条码详情弹窗
+
+const isEditable = computed(() => // 是否为编辑模式（可保存）
+  ['create', 'update'].includes(formType.value),
+);
+const isConfirm = computed(() => formType.value === 'confirm'); // 是否为确认模式
+const isFinish = computed(() => formType.value === 'finish'); // 是否为完成模式
+const canConfirm = computed(() => // 编辑态草稿可确认
+  formType.value === 'update' &&
+  formData.value?.status === MesProWorkOrderStatusEnum.PREPARE,
+);
+const getTitle = computed(() => {
+  const isChild = !!formData.value?.parentId;
+  switch (formType.value) {
+    case 'confirm': {
+      return '确认工单';
+    }
+    case 'detail': {
+      return $t('ui.actionTitle.view', ['工单']);
+    }
+    case 'finish': {
+      return '完成工单';
+    }
+    case 'update': {
+      return isChild ? '编辑子工单' : $t('ui.actionTitle.edit', ['工单']);
+    }
+    default: {
+      return isChild ? '新增子工单' : $t('ui.actionTitle.create', ['工单']);
+    }
+  }
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+/** 重新挂载 schema 并按表单态控制底部确认按钮 */
+function applySchema() {
+  formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+  modalApi.setState({ showConfirmButton: isEditable.value });
+}
+
+/** 查看工单条码 */
+function handleBarcode() {
+  if (!formData.value?.id) {
+    return;
+  }
+  barcodeDetailRef.value?.openByBusiness(
+    formData.value.id,
+    BarcodeBizTypeEnum.WORKORDER,
+    formData.value.code,
+    formData.value.name,
+  );
+}
+
+/** 确认工单：编辑态有修改时先保存，再确认 */
+async function handleConfirm() {
+  const { valid } = await formApi.validate();
+  if (!valid || !formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    if (isEditable.value) {
+      const current = JSON.stringify(await formApi.getValues());
+      if (current !== originalSnapshot.value) {
+        const data = (await formApi.getValues()) as MesProWorkOrderApi.WorkOrder;
+        await updateWorkOrder({ ...formData.value, ...data });
+        originalSnapshot.value = current;
+      }
+    }
+    await confirmWorkOrder(formData.value.id);
+    ElMessage.success('工单已确认');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 完成工单 */
+async function handleFinish() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await finishWorkOrder(formData.value.id);
+    ElMessage.success('工单已完成');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 从 BOM 物料行预填子工单：复用当前工单上下文，进入新增态 */
+async function handleGenerateWorkOrder(
+  bomRow: MesProWorkOrderBomApi.WorkOrderBom,
+) {
+  const current = formData.value;
+  if (!current) {
+    return;
+  }
+  formData.value = undefined;
+  formType.value = 'create';
+  subTabsName.value = 'bom';
+  applySchema();
+  await formApi.resetForm();
+  await formApi.setValues({
+    clientId: current.clientId,
+    name: `${bomRow.itemName}【${bomRow.quantity}】${bomRow.unitMeasureName || ''}`,
+    orderSourceCode: current.orderSourceCode,
+    orderSourceType: current.orderSourceType,
+    parentId: current.id,
+    productId: bomRow.itemId,
+    quantity: bomRow.quantity,
+    requestDate: current.requestDate,
+    type: current.type,
+    vendorId: current.vendorId,
+  });
+  originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  ElMessage.info('已从 BOM 物料预填子工单，请补充工单编码等信息后保存');
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (!isEditable.value) {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data = (await formApi.getValues()) as MesProWorkOrderApi.WorkOrder;
+    try {
+      if (formData.value?.id) {
+        await updateWorkOrder({ ...formData.value, ...data });
+        formData.value = { ...formData.value, ...data };
+      } else {
+        const id = await createWorkOrder(data);
+        formData.value = {
+          ...data,
+          id,
+          status: MesProWorkOrderStatusEnum.PREPARE,
+        };
+        formType.value = 'update';
+        // 创建成功后切换编辑态，重挂 schema 让「工单状态」字段显现
+        applySchema();
+        await formApi.setValues(formData.value);
+      }
+      originalSnapshot.value = JSON.stringify(await formApi.getValues());
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      originalSnapshot.value = '';
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{
+      formType: FormType;
+      id?: number;
+      parentRow?: MesProWorkOrderApi.WorkOrder;
+    }>();
+    formType.value = data.formType;
+    subTabsName.value = 'bom';
+    applySchema();
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getWorkOrder(data.id);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    } else if (data?.parentRow) {
+      // 新增子工单时，预填父工单信息
+      const parent = data.parentRow;
+      await formApi.setValues({
+        clientId: parent.clientId,
+        orderSourceCode: parent.orderSourceCode,
+        orderSourceType: parent.orderSourceType,
+        parentId: parent.id,
+        requestDate: parent.requestDate,
+        type: parent.type,
+        vendorId: parent.vendorId,
+      });
+    }
+    originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+    <!-- BOM / 物料需求 Tab：非新建态展示 -->
+    <template v-if="formData?.id">
+      <ElTabs v-model="subTabsName" class="mx-4">
+        <ElTabPane label="工单 BOM" name="bom">
+          <BomList
+            :form-type="formType"
+            :work-order="formData"
+            :work-order-id="formData.id"
+            @generate-work-order="handleGenerateWorkOrder"
+          />
+        </ElTabPane>
+        <ElTabPane label="物料需求" name="item">
+          <ItemList :work-order-id="formData.id" />
+        </ElTabPane>
+      </ElTabs>
+    </template>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <ElPopconfirm
+          v-if="canConfirm || isConfirm"
+          title="确认要完成工单编制吗？确认后将不能更改。"
+          width="280"
+          @confirm="handleConfirm"
+        >
+          <template #reference>
+            <ElButton type="primary">确认</ElButton>
+          </template>
+        </ElPopconfirm>
+        <ElPopconfirm
+          v-if="isFinish"
+          title="确认要完成该工单吗？"
+          width="220"
+          @confirm="handleFinish"
+        >
+          <template #reference>
+            <ElButton type="primary">完成</ElButton>
+          </template>
+        </ElPopconfirm>
+        <ElButton
+          v-if="formType === 'detail' && formData?.id"
+          @click="handleBarcode"
+        >
+          查看条码
+        </ElButton>
+      </div>
+    </template>
+  </Modal>
+  <BarcodeDetail ref="barcodeDetailRef" />
+</template>
diff --git a/apps/web-ele/src/views/mes/pro/workorder/modules/item-list.vue b/apps/web-ele/src/views/mes/pro/workorder/modules/item-list.vue
new file mode 100644
index 000000000..7832dd209
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/workorder/modules/item-list.vue
@@ -0,0 +1,45 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProWorkOrderBomApi } from '#/api/mes/pro/workorder/bom';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getWorkOrderBomItemListByWorkOrderId } from '#/api/mes/pro/workorder/bom';
+
+import { useItemGridColumns } from '../data';
+
+const props = defineProps<{
+  workOrderId: number;
+}>();
+
+const [Grid] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useItemGridColumns(),
+    height: 400,
+    keepSource: true,
+    pagerConfig: {
+      enabled: false,
+    },
+    proxyConfig: {
+      ajax: {
+        query: async () => {
+          if (!props.workOrderId) {
+            return [];
+          }
+          return await getWorkOrderBomItemListByWorkOrderId(props.workOrderId);
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesProWorkOrderBomApi.WorkOrderBom>,
+});
+</script>
+
+<template>
+  <Grid table-title="物料需求" />
+</template>

From be213b6b3119a416c52e850718b59578a5c3f276 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 30 May 2026 10:37:43 +0800
Subject: [PATCH 38/52] =?UTF-8?q?feat(mes):=20=E8=BF=81=E7=A7=BB=20work=20?=
 =?UTF-8?q?task=20=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web-antd/src/router/routes/modules/mes.ts |   2 +-
 .../mes/pro/task/components/gantt-chart.vue   | 239 ++++++++++++++++++
 .../pro/task/components/pro-task-select.vue   |  13 +-
 apps/web-antd/src/views/mes/pro/task/data.ts  |   9 +
 .../src/views/mes/pro/task/edit/index.vue     |  98 +++++++
 .../web-antd/src/views/mes/pro/task/index.vue | 151 +++++++++++
 .../mes/pro/task/modules/schedule-form.vue    | 148 +++++++++++
 .../views/mes/pro/task/modules/task-form.vue  | 113 +++++++++
 .../views/mes/pro/task/modules/task-list.vue  | 162 ++++++++++++
 .../src/views/mes/wm/materialstock/data.ts    |  20 +-
 apps/web-ele/src/router/routes/modules/mes.ts |   2 +-
 .../mes/pro/task/components/gantt-chart.vue   | 239 ++++++++++++++++++
 .../pro/task/components/pro-task-select.vue   |  13 +-
 apps/web-ele/src/views/mes/pro/task/data.ts   |   9 +
 .../src/views/mes/pro/task/edit/index.vue     |  98 +++++++
 apps/web-ele/src/views/mes/pro/task/index.vue | 152 +++++++++++
 .../mes/pro/task/modules/schedule-form.vue    | 154 +++++++++++
 .../views/mes/pro/task/modules/task-form.vue  | 113 +++++++++
 .../views/mes/pro/task/modules/task-list.vue  | 162 ++++++++++++
 .../src/views/mes/wm/materialstock/data.ts    |  20 +-
 20 files changed, 1895 insertions(+), 22 deletions(-)
 create mode 100644 apps/web-antd/src/views/mes/pro/task/components/gantt-chart.vue
 create mode 100644 apps/web-antd/src/views/mes/pro/task/edit/index.vue
 create mode 100644 apps/web-antd/src/views/mes/pro/task/index.vue
 create mode 100644 apps/web-antd/src/views/mes/pro/task/modules/schedule-form.vue
 create mode 100644 apps/web-antd/src/views/mes/pro/task/modules/task-form.vue
 create mode 100644 apps/web-antd/src/views/mes/pro/task/modules/task-list.vue
 create mode 100644 apps/web-ele/src/views/mes/pro/task/components/gantt-chart.vue
 create mode 100644 apps/web-ele/src/views/mes/pro/task/edit/index.vue
 create mode 100644 apps/web-ele/src/views/mes/pro/task/index.vue
 create mode 100644 apps/web-ele/src/views/mes/pro/task/modules/schedule-form.vue
 create mode 100644 apps/web-ele/src/views/mes/pro/task/modules/task-form.vue
 create mode 100644 apps/web-ele/src/views/mes/pro/task/modules/task-list.vue

diff --git a/apps/web-antd/src/router/routes/modules/mes.ts b/apps/web-antd/src/router/routes/modules/mes.ts
index 4172fdbc9..cf0d1c418 100644
--- a/apps/web-antd/src/router/routes/modules/mes.ts
+++ b/apps/web-antd/src/router/routes/modules/mes.ts
@@ -40,7 +40,7 @@ const routes: RouteRecordRaw[] = [
         component: () => import('#/views/mes/wm/barcode/config/index.vue'),
       },
       {
-        path: 'pro/task/edit',
+        path: 'pro/task/gantt-edit',
         name: 'MesProTaskGanttEdit',
         meta: {
           title: '甘特图编辑',
diff --git a/apps/web-antd/src/views/mes/pro/task/components/gantt-chart.vue b/apps/web-antd/src/views/mes/pro/task/components/gantt-chart.vue
new file mode 100644
index 000000000..573f68d51
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/task/components/gantt-chart.vue
@@ -0,0 +1,239 @@
+<script lang="ts" setup>
+import { onBeforeUnmount, onMounted, ref, watch } from 'vue';
+
+import { gantt } from 'dhtmlx-gantt';
+
+import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
+
+import 'dhtmlx-gantt/codebase/dhtmlxgantt.css';
+
+/**
+ * 甘特图组件（基于 dhtmlx-gantt）
+ *
+ * 1. 按工单分组展示生产任务，工单为 project 行，任务为子行
+ * 2. 支持只读预览和拖拽编辑两种模式
+ * 3. 拖拽后触发 taskUpdate 事件，通知父组件批量保存
+ * 4. 时间刻度：周 → 日 → 8 小时（1 工作日 = 8 小时）
+ */
+defineOptions({ name: 'GanttChart', inheritAttrs: false });
+
+const props = withDefaults(
+  defineProps<{
+    height?: number; // 甘特图高度
+    readonly?: boolean; // 是否只读
+    tasks?: any[]; // 甘特图任务数据
+  }>(),
+  {
+    height: 350,
+    readonly: false,
+    tasks: () => [],
+  },
+);
+
+const emit = defineEmits<{
+  taskClick: [id: number | string];
+  taskUpdate: [task: any];
+}>();
+
+const ganttContainer = ref<HTMLElement>(); // 甘特图挂载容器
+const ganttInited = ref(false); // 甘特图是否已初始化
+
+/** 初始化甘特图配置 */
+function initGantt() {
+  if (!ganttContainer.value) {
+    return;
+  }
+  gantt.i18n.setLocale('cn');
+
+  gantt.config.readonly = props.readonly;
+  gantt.config.date_format = '%Y-%m-%d %H:%i:%s';
+  gantt.config.duration_unit = 'hour'; // 持续时间单位为小时，配合 duration_step 实现工作日单位
+  gantt.config.duration_step = 8; // 1 工作日 = 8 小时
+  gantt.config.row_height = 36;
+  gantt.config.bar_height = 24;
+  gantt.config.fit_tasks = true;
+  gantt.config.auto_scheduling = false;
+  gantt.config.drag_links = false;
+  gantt.config.details_on_create = true;
+  gantt.config.details_on_dblclick = true;
+  gantt.config.show_progress = true;
+  gantt.config.open_tree_initially = true;
+  gantt.config.auto_types = false;
+  gantt.config.drag_move = !props.readonly;
+  gantt.config.drag_resize = !props.readonly;
+  gantt.config.drag_progress = false;
+
+  // lightbox 弹窗只保留时间编辑，去掉描述编辑和删除按钮
+  gantt.config.lightbox.sections = [
+    { name: 'time', type: 'duration', map_to: 'auto' },
+  ];
+  gantt.config.buttons_left = ['gantt_save_btn'];
+  gantt.config.buttons_right = ['gantt_cancel_btn'];
+
+  // 时间刻度：周 > 日 > 8 小时
+  const weekScaleTemplate = (date: Date) => {
+    const dateToStr = gantt.date.date_to_str('%M %d');
+    const endDate = gantt.date.add(gantt.date.add(date, 1, 'week'), -1, 'day');
+    return `${dateToStr(date)} - ${dateToStr(endDate)}`;
+  };
+  const dayTemplate = (date: Date) => gantt.date.date_to_str('%M %d')(date);
+  const daysStyle = (date: Date) =>
+    date.getDay() === 0 || date.getDay() === 6 ? 'weekend' : '';
+  gantt.config.scales = [
+    { unit: 'week', step: 1, format: weekScaleTemplate },
+    { unit: 'day', step: 1, format: dayTemplate, css: daysStyle },
+    { unit: 'hour', step: 8, format: '%H:%i' },
+  ];
+  gantt.config.scale_height = 50;
+  gantt.config.show_task_cells = true;
+
+  gantt.config.columns = [
+    { name: 'text', label: '任务名称', tree: true, width: 180, resize: true },
+    { name: 'workstation', label: '工作站', align: 'center', width: 100, resize: true },
+    { name: 'process', label: '工序', align: 'center', width: 100, resize: true },
+    { name: 'start_date', label: '开始时间', align: 'center', width: 130 },
+    { name: 'end_date', label: '结束时间', align: 'center', width: 130 },
+  ];
+
+  gantt.plugins({ marker: true, tooltip: true });
+  gantt.addMarker({ start_date: new Date(), css: 'today', text: '今天' });
+
+  gantt.templates.task_text = (_start: any, _end: any, task: any) => {
+    const percent = Math.round((task.progress || 0) * 100);
+    if (task.type === 'project') {
+      return `<b>生产工单:</b> ${task.text} <span>完成比例：${percent}%</span>`;
+    }
+    return `<b>生产任务:</b> ${task.process || ''} ${task.text} <span>完成比例：${percent}%</span>`;
+  };
+
+  gantt.templates.tooltip_text = (_start: any, _end: any, task: any) => {
+    const percent = Math.round((task.progress || 0) * 100);
+    if (task.type === 'project') {
+      return `<b>生产工单:</b> ${task.text} <span>完成比例：${percent}%</span>`;
+    }
+    return `<b>生产任务:</b> ${task.process || ''} ${task.text} <span>完成比例：${percent}%</span>`;
+  };
+
+  gantt.templates.task_class = (_start: any, _end: any, task: any) =>
+    task.type === gantt.config.types.project ? 'gantt-project-bar' : '';
+  gantt.templates.timeline_cell_class = () => '';
+  gantt.templates.task_row_class = () => '';
+
+  // 编辑事件监听（通过 lightbox 弹窗编辑后触发）
+  if (!props.readonly) {
+    gantt.attachEvent('onAfterTaskUpdate', (id: number | string) => {
+      const task = gantt.getTask(id);
+      // 只回写 task 节点，避免把工单(project)节点当成任务保存
+      if (task.type !== gantt.config.types.task || !task.originalId) {
+        return;
+      }
+      emit('taskUpdate', {
+        duration: task.duration,
+        endTime: task.end_date,
+        id: task.originalId,
+        startTime: task.start_date,
+      });
+    });
+  }
+
+  gantt.attachEvent('onTaskClick', (id: number | string) => {
+    emit('taskClick', id);
+    return true;
+  });
+
+  gantt.init(ganttContainer.value);
+  ganttInited.value = true;
+}
+
+/** 加载数据到甘特图 */
+function loadData(tasks: any[]) {
+  if (!ganttInited.value) {
+    return;
+  }
+  gantt.clearAll();
+  // 后端 type 使用整数业务类型，需映射为 gantt 类型字符串
+  const typeMap: Record<number, string> = {
+    [BarcodeBizTypeEnum.WORKORDER]: 'project',
+    [BarcodeBizTypeEnum.TASK]: 'task',
+  };
+  gantt.parse({
+    data: tasks.map((item: any) => ({
+      ...item,
+      type: typeMap[item.type] || item.type,
+      start_date: item.startDate ? new Date(item.startDate) : undefined,
+      end_date: item.endDate ? new Date(item.endDate) : undefined,
+    })),
+    links: [],
+  });
+}
+
+watch(
+  () => props.tasks,
+  (val) => {
+    if (val?.length && ganttInited.value) {
+      loadData(val);
+    }
+  },
+  { deep: true },
+);
+
+onMounted(() => {
+  initGantt();
+  if (props.tasks?.length) {
+    loadData(props.tasks);
+  }
+});
+
+onBeforeUnmount(() => {
+  if (ganttInited.value) {
+    gantt.clearAll();
+  }
+});
+
+defineExpose({ loadData });
+</script>
+
+<template>
+  <div ref="ganttContainer" :style="{ width: '100%', height: `${height}px` }"></div>
+</template>
+
+<style>
+/* 今天标记线 */
+.gantt_marker.today {
+  background-color: #f44;
+  opacity: 0.4;
+}
+
+.gantt_marker.today .gantt_marker_content {
+  font-size: 12px;
+  color: #f44;
+}
+
+/* 工单（project）行样式 */
+.gantt-project-bar .gantt_task_progress {
+  background: #7b68ee;
+}
+
+/* 甘特条圆角 */
+.gantt_task_line {
+  border-radius: 8px;
+}
+
+/* 周末背景色 */
+.weekend {
+  background: #f0f0f0 !important;
+}
+
+/* 行悬浮高亮 */
+.gantt_grid_data .gantt_row:hover,
+.gantt_grid_data .gantt_row.odd:hover {
+  background-color: #f3f1fe !important;
+}
+
+/* 选中行高亮 */
+.gantt_grid_data .gantt_row.gantt_selected,
+.gantt_grid_data .gantt_row.odd.gantt_selected,
+.gantt_task_row.gantt_selected {
+  background-color: #f3f1fe !important;
+}
+</style>
diff --git a/apps/web-antd/src/views/mes/pro/task/components/pro-task-select.vue b/apps/web-antd/src/views/mes/pro/task/components/pro-task-select.vue
index 60c5e1133..100a277c0 100644
--- a/apps/web-antd/src/views/mes/pro/task/components/pro-task-select.vue
+++ b/apps/web-antd/src/views/mes/pro/task/components/pro-task-select.vue
@@ -47,23 +47,19 @@ const showClear = computed(() => // 是否显示清空图标
   props.allowClear &&
   !props.disabled &&
   hovering.value &&
-  props.modelValue !== undefined,
+  props.modelValue != null,
 );
 
 /** 根据任务编号回显选择器 */
 async function resolveItemById(id: number | undefined) {
-  if (id === undefined) {
+  if (id == null) {
     selectedItem.value = undefined;
     return;
   }
   if (selectedItem.value?.id === id) {
     return;
   }
-  try {
-    selectedItem.value = await getTask(id);
-  } catch (error) {
-    console.error('[ProTaskSelect] resolveItemById failed:', error);
-  }
+  selectedItem.value = await getTask(id);
 }
 
 watch(
@@ -92,8 +88,7 @@ function handleClick(event: MouseEvent) {
     clearSelected();
     return;
   }
-  const selectedIds =
-    props.modelValue === undefined ? [] : [props.modelValue];
+  const selectedIds = props.modelValue == null ? [] : [props.modelValue];
   dialogRef.value?.open(selectedIds, {
     multiple: false,
     workOrderId: props.workOrderId,
diff --git a/apps/web-antd/src/views/mes/pro/task/data.ts b/apps/web-antd/src/views/mes/pro/task/data.ts
index baede0e30..1c1461e70 100644
--- a/apps/web-antd/src/views/mes/pro/task/data.ts
+++ b/apps/web-antd/src/views/mes/pro/task/data.ts
@@ -279,6 +279,15 @@ export function useScheduleFormSchema(): VbenFormSchema[] {
         valueFormat: 'x',
       },
     },
+    {
+      fieldName: 'status',
+      label: '工单状态',
+      component: 'Select',
+      componentProps: {
+        disabled: true,
+        options: getDictOptions(DICT_TYPE.MES_PRO_WORK_ORDER_STATUS, 'number'),
+      },
+    },
     {
       fieldName: 'remark',
       label: '备注',
diff --git a/apps/web-antd/src/views/mes/pro/task/edit/index.vue b/apps/web-antd/src/views/mes/pro/task/edit/index.vue
new file mode 100644
index 000000000..002bf57cc
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/task/edit/index.vue
@@ -0,0 +1,98 @@
+<script lang="ts" setup>
+import { computed, onMounted, ref } from 'vue';
+
+import { DocAlert, Page } from '@vben/common-ui';
+
+import { Badge, Button, message } from 'ant-design-vue';
+
+import { getGanttTaskList, updateTask } from '#/api/mes/pro/task';
+
+import GanttChart from '../components/gantt-chart.vue';
+
+const submitting = ref(false); // 批量保存按钮加载态
+const taskList = ref<any[]>([]); // 甘特图任务数据
+const pendingChanges = ref(new Map<number, any>()); // 待保存的修改 Map<taskId, changeData>
+
+const pendingCount = computed(() => pendingChanges.value.size); // 待保存数量
+const ganttHeight = computed(() => window.innerHeight - 220); // 甘特图高度
+
+/** 加载甘特图数据 */
+async function loadGanttData() {
+  taskList.value = await getGanttTaskList({});
+}
+
+/** 任务编辑回调：缓存待保存的修改 */
+function handleTaskUpdate(change: any) {
+  pendingChanges.value.set(change.id, change);
+}
+
+/** 批量保存 */
+async function handleSave() {
+  if (pendingChanges.value.size === 0) {
+    return;
+  }
+  submitting.value = true;
+  try {
+    const changes = [...pendingChanges.value.values()];
+    await Promise.all(
+      changes.map((change) =>
+        updateTask({
+          duration: change.duration,
+          endTime: change.endTime,
+          id: change.id,
+          startTime: change.startTime,
+        }),
+      ),
+    );
+    message.success(`已保存 ${changes.length} 条修改`);
+    pendingChanges.value = new Map();
+    await loadGanttData();
+  } finally {
+    submitting.value = false;
+  }
+}
+
+/** 刷新 */
+async function handleRefresh() {
+  pendingChanges.value = new Map();
+  await loadGanttData();
+}
+
+onMounted(loadGanttData);
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【生产】生产排产、工序流转卡"
+        url="https://doc.iocoder.cn/mes/pro/schedule-card/"
+      />
+    </template>
+
+    <div class="mb-3 flex items-center justify-between">
+      <span class="text-sm text-gray-500">
+        可直接拖拽/拉伸任务条，或双击编辑开始时间和时长，修改后点击「批量保存」
+      </span>
+      <div class="flex items-center gap-3">
+        <Badge :count="pendingCount">
+          <Button
+            type="primary"
+            :disabled="pendingCount === 0"
+            :loading="submitting"
+            @click="handleSave"
+          >
+            批量保存
+          </Button>
+        </Badge>
+        <Button @click="handleRefresh">刷新</Button>
+      </div>
+    </div>
+    <GanttChart
+      :height="ganttHeight"
+      :readonly="false"
+      :tasks="taskList"
+      @task-update="handleTaskUpdate"
+    />
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/mes/pro/task/index.vue b/apps/web-antd/src/views/mes/pro/task/index.vue
new file mode 100644
index 000000000..c57faf175
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/task/index.vue
@@ -0,0 +1,151 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProWorkOrderApi } from '#/api/mes/pro/workorder';
+
+import { onMounted, ref } from 'vue';
+import { useRouter } from 'vue-router';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+
+import { Button, Card } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getGanttTaskList } from '#/api/mes/pro/task';
+import { getWorkOrderPage } from '#/api/mes/pro/workorder';
+import {
+  MesProWorkOrderStatusEnum,
+  MesProWorkOrderTypeEnum,
+} from '#/views/mes/utils/constants';
+
+import GanttChart from './components/gantt-chart.vue';
+import { useGridColumns, useGridFormSchema } from './data';
+import ScheduleForm from './modules/schedule-form.vue';
+
+const router = useRouter();
+const ganttTasks = ref<any[]>([]); // 甘特图预览数据
+
+const [ScheduleModal, scheduleModalApi] = useVbenModal({
+  connectedComponent: ScheduleForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+  loadGanttPreview();
+}
+
+/** 加载甘特图预览数据 */
+async function loadGanttPreview() {
+  ganttTasks.value = await getGanttTaskList({
+    status: MesProWorkOrderStatusEnum.CONFIRMED,
+    type: MesProWorkOrderTypeEnum.SELF,
+  });
+}
+
+/** 查看工单详情 */
+function handleDetail(row: MesProWorkOrderApi.WorkOrder) {
+  scheduleModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 排产 */
+function handleSchedule(row: MesProWorkOrderApi.WorkOrder) {
+  scheduleModalApi.setData({ formType: 'schedule', id: row.id }).open();
+}
+
+/** 打开甘特图编辑页面 */
+function handleGanttEdit() {
+  router.push({ name: 'MesProTaskGanttEdit' });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getWorkOrderPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            status: MesProWorkOrderStatusEnum.CONFIRMED,
+            type: MesProWorkOrderTypeEnum.SELF,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+    treeConfig: {
+      parentField: 'parentId',
+      rowField: 'id',
+      transform: true,
+      expandAll: true,
+      reserve: true,
+    },
+  } as VxeTableGridOptions<MesProWorkOrderApi.WorkOrder>,
+});
+
+onMounted(loadGanttPreview);
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【生产】生产排产、工序流转卡"
+        url="https://doc.iocoder.cn/mes/pro/schedule-card/"
+      />
+    </template>
+
+    <ScheduleModal @success="handleRefresh" />
+
+    <!-- 排产甘特图预览 -->
+    <Card title="排产甘特图" class="mb-4">
+      <GanttChart :height="350" :readonly="true" :tasks="ganttTasks" />
+    </Card>
+
+    <Grid table-title="待排产工单">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '甘特图编辑',
+              type: 'primary',
+              icon: ACTION_ICON.EDIT,
+              onClick: handleGanttEdit,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <Button type="link" @click="handleDetail(row)">
+          {{ row.code }}
+        </Button>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: '排产',
+              type: 'link',
+              auth: ['mes:pro-task:create'],
+              ifShow: row.status === MesProWorkOrderStatusEnum.CONFIRMED,
+              onClick: handleSchedule.bind(null, row),
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/mes/pro/task/modules/schedule-form.vue b/apps/web-antd/src/views/mes/pro/task/modules/schedule-form.vue
new file mode 100644
index 000000000..422142844
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/task/modules/schedule-form.vue
@@ -0,0 +1,148 @@
+<script lang="ts" setup>
+import type { MesProRouteProcessApi } from '#/api/mes/pro/route/process';
+import type { MesProWorkOrderApi } from '#/api/mes/pro/workorder';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { Button, Card, message, Popconfirm, Steps } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import { getRouteProcessListByProduct } from '#/api/mes/pro/route/process';
+import { finishWorkOrder, getWorkOrder } from '#/api/mes/pro/workorder';
+
+import { useScheduleFormSchema } from '../data';
+import TaskList from './task-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<'detail' | 'schedule'>('schedule');
+const workOrder = ref<MesProWorkOrderApi.WorkOrder>(); // 当前工单详情
+const routeProcessList = ref<MesProRouteProcessApi.RouteProcess[]>([]); // 工艺路线工序列表
+const activeProcessStep = ref(0); // 当前工序步骤索引
+const currentRouteId = ref(0); // 当前工艺路线编号
+
+const isReadonly = computed(() => formType.value === 'detail'); // 详情态只读
+const getTitle = computed(() =>
+  formType.value === 'detail' ? '工单详情' : '生产排产',
+);
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 100,
+  },
+  layout: 'horizontal',
+  schema: useScheduleFormSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+/** 加载工艺路线工序列表 */
+async function loadRouteProcesses(productId: number) {
+  const processes = await getRouteProcessListByProduct(productId);
+  if (!processes || processes.length === 0) {
+    message.warning('当前产品未配置工艺路线，请先在工艺路线中维护');
+    return;
+  }
+  currentRouteId.value = processes[0]!.routeId ?? 0;
+  routeProcessList.value = [...processes].toSorted(
+    (a, b) => (a.sort ?? 0) - (b.sort ?? 0),
+  );
+}
+
+/** 完成工单 */
+async function handleFinish() {
+  if (!workOrder.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await finishWorkOrder(workOrder.value.id);
+    message.success('工单已完成');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  showConfirmButton: false,
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      workOrder.value = undefined;
+      routeProcessList.value = [];
+      activeProcessStep.value = 0;
+      currentRouteId.value = 0;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ formType: 'detail' | 'schedule'; id: number }>();
+    formType.value = data.formType;
+    activeProcessStep.value = 0;
+    routeProcessList.value = [];
+    modalApi.lock();
+    try {
+      workOrder.value = await getWorkOrder(data.id);
+      // 设置到 values
+      await formApi.setValues(workOrder.value);
+      if (workOrder.value.productId) {
+        await loadRouteProcesses(workOrder.value.productId);
+      }
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-4/5">
+    <Form class="mx-4" />
+    <!-- 工序步骤导航 + 当前工序任务列表 -->
+    <template v-if="routeProcessList.length > 0 && workOrder?.id">
+      <Steps
+        v-model:current="activeProcessStep"
+        class="my-4 px-4"
+        size="small"
+        type="navigation"
+      >
+        <Steps.Step
+          v-for="rp in routeProcessList"
+          :key="rp.processId"
+          :title="rp.processName"
+        />
+      </Steps>
+      <Card
+        v-for="(rp, index) in routeProcessList"
+        v-show="activeProcessStep === index"
+        :key="rp.processId"
+        class="mx-4"
+      >
+        <TaskList
+          :color-code="rp.colorCode"
+          :disabled="isReadonly"
+          :item-id="workOrder.productId"
+          :process-id="rp.processId!"
+          :route-id="currentRouteId"
+          :work-order-id="workOrder.id!"
+        />
+      </Card>
+    </template>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <Popconfirm
+          v-if="formType === 'schedule'"
+          title="确认要完成该工单吗？完成后工单下所有任务将标记为已完成。"
+          @confirm="handleFinish"
+        >
+          <Button type="primary">完成</Button>
+        </Popconfirm>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/pro/task/modules/task-form.vue b/apps/web-antd/src/views/mes/pro/task/modules/task-form.vue
new file mode 100644
index 000000000..e95146c7f
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/task/modules/task-form.vue
@@ -0,0 +1,113 @@
+<script lang="ts" setup>
+import type { MesProTaskApi } from '#/api/mes/pro/task';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import { createTask, getTask, updateTask } from '#/api/mes/pro/task';
+import { $t } from '#/locales';
+
+import { useTaskFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesProTaskApi.Task>();
+const context = ref<{
+  colorCode?: string;
+  itemId?: number;
+  processId?: number;
+  routeId?: number;
+  workOrderId?: number;
+}>({}); // 新增任务时的工单 / 工序上下文
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['生产任务'])
+    : $t('ui.actionTitle.create', ['生产任务']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 100,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data = (await formApi.getValues()) as MesProTaskApi.Task;
+    try {
+      await (formData.value?.id
+        ? updateTask({ ...formData.value, ...data })
+        : createTask({ ...context.value, ...data }));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      context.value = {};
+      return;
+    }
+    formApi.setState({ schema: useTaskFormSchema(formApi) });
+    // 加载数据
+    const data = modalApi.getData<{
+      colorCode?: string;
+      id?: number;
+      itemId?: number;
+      processId?: number;
+      routeId?: number;
+      workOrderId?: number;
+    }>();
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getTask(data.id);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+      return;
+    }
+    context.value = {
+      colorCode: data.colorCode,
+      itemId: data.itemId,
+      processId: data.processId,
+      routeId: data.routeId,
+      workOrderId: data.workOrderId,
+    };
+    await formApi.setValues({
+      colorCode: data.colorCode || '#00AEF3',
+      duration: 1,
+    });
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/pro/task/modules/task-list.vue b/apps/web-antd/src/views/mes/pro/task/modules/task-list.vue
new file mode 100644
index 000000000..0cd3b46ae
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/task/modules/task-list.vue
@@ -0,0 +1,162 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProTaskApi } from '#/api/mes/pro/task';
+
+import { computed, watch } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { deleteTask, getTaskPage } from '#/api/mes/pro/task';
+import { $t } from '#/locales';
+
+import { useTaskGridColumns } from '../data';
+import TaskForm from './task-form.vue';
+
+const props = defineProps<{
+  colorCode?: string;
+  disabled?: boolean;
+  itemId?: number;
+  processId: number;
+  routeId: number;
+  workOrderId: number;
+}>();
+
+const editable = computed(() => !props.disabled); // 是否可维护任务
+
+const [TaskFormModal, taskFormModalApi] = useVbenModal({
+  connectedComponent: TaskForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 新增任务 */
+function handleCreate() {
+  taskFormModalApi
+    .setData({
+      colorCode: props.colorCode,
+      itemId: props.itemId,
+      processId: props.processId,
+      routeId: props.routeId,
+      workOrderId: props.workOrderId,
+    })
+    .open();
+}
+
+/** 编辑任务 */
+function handleEdit(row: MesProTaskApi.Task) {
+  taskFormModalApi.setData({ id: row.id }).open();
+}
+
+/** 删除任务 */
+async function handleDelete(row: MesProTaskApi.Task) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.code]),
+    duration: 0,
+  });
+  try {
+    await deleteTask(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useTaskGridColumns(editable.value),
+    height: 360,
+    keepSource: true,
+    pagerConfig: {
+      enabled: false,
+    },
+    proxyConfig: {
+      ajax: {
+        query: async () => {
+          if (!props.workOrderId) {
+            return { list: [], total: 0 };
+          }
+          return await getTaskPage({
+            pageNo: 1,
+            pageSize: 100,
+            processId: props.processId,
+            routeId: props.routeId,
+            workOrderId: props.workOrderId,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesProTaskApi.Task>,
+});
+
+// 工序步骤切换时重新加载当前工序的任务
+watch(
+  () => props.processId,
+  () => handleRefresh(),
+);
+</script>
+
+<template>
+  <div>
+    <TaskFormModal @success="handleRefresh" />
+    <Grid table-title="生产任务">
+      <template v-if="editable" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '新增任务',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:pro-task:create'],
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #colorCode="{ row }">
+        <div
+          class="mx-auto size-5 rounded"
+          :style="{ background: row.colorCode || '#00AEF3' }"
+        ></div>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:pro-task:update'],
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:pro-task:delete'],
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/materialstock/data.ts b/apps/web-antd/src/views/mes/wm/materialstock/data.ts
index 2281b6850..e23914a99 100644
--- a/apps/web-antd/src/views/mes/wm/materialstock/data.ts
+++ b/apps/web-antd/src/views/mes/wm/materialstock/data.ts
@@ -53,6 +53,12 @@ export function useGridFormSchema(): VbenFormSchema[] {
           warehouseId: values.warehouseId,
           placeholder: '请选择库区',
         }),
+        // 仓库切换时清空库区，避免旧库区条件残留
+        trigger: (values, formApi) => {
+          if (values.locationId !== undefined) {
+            void formApi.setFieldValue('locationId', undefined);
+          }
+        },
       },
     },
     {
@@ -191,6 +197,12 @@ export function useSelectGridFormSchema(): VbenFormSchema[] {
           warehouseId: values.warehouseId,
           placeholder: '请选择库区',
         }),
+        // 仓库切换时清空库区
+        trigger: (values, formApi) => {
+          if (values.locationId !== undefined) {
+            void formApi.setFieldValue('locationId', undefined);
+          }
+        },
       },
     },
     {
@@ -198,11 +210,17 @@ export function useSelectGridFormSchema(): VbenFormSchema[] {
       label: '库位',
       component: markRaw(WmWarehouseAreaSelect),
       dependencies: {
-        triggerFields: ['locationId'],
+        triggerFields: ['warehouseId', 'locationId'],
         componentProps: (values) => ({
           locationId: values.locationId,
           placeholder: '请选择库位',
         }),
+        // 仓库或库区切换时清空库位
+        trigger: (values, formApi) => {
+          if (values.areaId !== undefined) {
+            void formApi.setFieldValue('areaId', undefined);
+          }
+        },
       },
     },
   ];
diff --git a/apps/web-ele/src/router/routes/modules/mes.ts b/apps/web-ele/src/router/routes/modules/mes.ts
index 4172fdbc9..cf0d1c418 100644
--- a/apps/web-ele/src/router/routes/modules/mes.ts
+++ b/apps/web-ele/src/router/routes/modules/mes.ts
@@ -40,7 +40,7 @@ const routes: RouteRecordRaw[] = [
         component: () => import('#/views/mes/wm/barcode/config/index.vue'),
       },
       {
-        path: 'pro/task/edit',
+        path: 'pro/task/gantt-edit',
         name: 'MesProTaskGanttEdit',
         meta: {
           title: '甘特图编辑',
diff --git a/apps/web-ele/src/views/mes/pro/task/components/gantt-chart.vue b/apps/web-ele/src/views/mes/pro/task/components/gantt-chart.vue
new file mode 100644
index 000000000..573f68d51
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/task/components/gantt-chart.vue
@@ -0,0 +1,239 @@
+<script lang="ts" setup>
+import { onBeforeUnmount, onMounted, ref, watch } from 'vue';
+
+import { gantt } from 'dhtmlx-gantt';
+
+import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
+
+import 'dhtmlx-gantt/codebase/dhtmlxgantt.css';
+
+/**
+ * 甘特图组件（基于 dhtmlx-gantt）
+ *
+ * 1. 按工单分组展示生产任务，工单为 project 行，任务为子行
+ * 2. 支持只读预览和拖拽编辑两种模式
+ * 3. 拖拽后触发 taskUpdate 事件，通知父组件批量保存
+ * 4. 时间刻度：周 → 日 → 8 小时（1 工作日 = 8 小时）
+ */
+defineOptions({ name: 'GanttChart', inheritAttrs: false });
+
+const props = withDefaults(
+  defineProps<{
+    height?: number; // 甘特图高度
+    readonly?: boolean; // 是否只读
+    tasks?: any[]; // 甘特图任务数据
+  }>(),
+  {
+    height: 350,
+    readonly: false,
+    tasks: () => [],
+  },
+);
+
+const emit = defineEmits<{
+  taskClick: [id: number | string];
+  taskUpdate: [task: any];
+}>();
+
+const ganttContainer = ref<HTMLElement>(); // 甘特图挂载容器
+const ganttInited = ref(false); // 甘特图是否已初始化
+
+/** 初始化甘特图配置 */
+function initGantt() {
+  if (!ganttContainer.value) {
+    return;
+  }
+  gantt.i18n.setLocale('cn');
+
+  gantt.config.readonly = props.readonly;
+  gantt.config.date_format = '%Y-%m-%d %H:%i:%s';
+  gantt.config.duration_unit = 'hour'; // 持续时间单位为小时，配合 duration_step 实现工作日单位
+  gantt.config.duration_step = 8; // 1 工作日 = 8 小时
+  gantt.config.row_height = 36;
+  gantt.config.bar_height = 24;
+  gantt.config.fit_tasks = true;
+  gantt.config.auto_scheduling = false;
+  gantt.config.drag_links = false;
+  gantt.config.details_on_create = true;
+  gantt.config.details_on_dblclick = true;
+  gantt.config.show_progress = true;
+  gantt.config.open_tree_initially = true;
+  gantt.config.auto_types = false;
+  gantt.config.drag_move = !props.readonly;
+  gantt.config.drag_resize = !props.readonly;
+  gantt.config.drag_progress = false;
+
+  // lightbox 弹窗只保留时间编辑，去掉描述编辑和删除按钮
+  gantt.config.lightbox.sections = [
+    { name: 'time', type: 'duration', map_to: 'auto' },
+  ];
+  gantt.config.buttons_left = ['gantt_save_btn'];
+  gantt.config.buttons_right = ['gantt_cancel_btn'];
+
+  // 时间刻度：周 > 日 > 8 小时
+  const weekScaleTemplate = (date: Date) => {
+    const dateToStr = gantt.date.date_to_str('%M %d');
+    const endDate = gantt.date.add(gantt.date.add(date, 1, 'week'), -1, 'day');
+    return `${dateToStr(date)} - ${dateToStr(endDate)}`;
+  };
+  const dayTemplate = (date: Date) => gantt.date.date_to_str('%M %d')(date);
+  const daysStyle = (date: Date) =>
+    date.getDay() === 0 || date.getDay() === 6 ? 'weekend' : '';
+  gantt.config.scales = [
+    { unit: 'week', step: 1, format: weekScaleTemplate },
+    { unit: 'day', step: 1, format: dayTemplate, css: daysStyle },
+    { unit: 'hour', step: 8, format: '%H:%i' },
+  ];
+  gantt.config.scale_height = 50;
+  gantt.config.show_task_cells = true;
+
+  gantt.config.columns = [
+    { name: 'text', label: '任务名称', tree: true, width: 180, resize: true },
+    { name: 'workstation', label: '工作站', align: 'center', width: 100, resize: true },
+    { name: 'process', label: '工序', align: 'center', width: 100, resize: true },
+    { name: 'start_date', label: '开始时间', align: 'center', width: 130 },
+    { name: 'end_date', label: '结束时间', align: 'center', width: 130 },
+  ];
+
+  gantt.plugins({ marker: true, tooltip: true });
+  gantt.addMarker({ start_date: new Date(), css: 'today', text: '今天' });
+
+  gantt.templates.task_text = (_start: any, _end: any, task: any) => {
+    const percent = Math.round((task.progress || 0) * 100);
+    if (task.type === 'project') {
+      return `<b>生产工单:</b> ${task.text} <span>完成比例：${percent}%</span>`;
+    }
+    return `<b>生产任务:</b> ${task.process || ''} ${task.text} <span>完成比例：${percent}%</span>`;
+  };
+
+  gantt.templates.tooltip_text = (_start: any, _end: any, task: any) => {
+    const percent = Math.round((task.progress || 0) * 100);
+    if (task.type === 'project') {
+      return `<b>生产工单:</b> ${task.text} <span>完成比例：${percent}%</span>`;
+    }
+    return `<b>生产任务:</b> ${task.process || ''} ${task.text} <span>完成比例：${percent}%</span>`;
+  };
+
+  gantt.templates.task_class = (_start: any, _end: any, task: any) =>
+    task.type === gantt.config.types.project ? 'gantt-project-bar' : '';
+  gantt.templates.timeline_cell_class = () => '';
+  gantt.templates.task_row_class = () => '';
+
+  // 编辑事件监听（通过 lightbox 弹窗编辑后触发）
+  if (!props.readonly) {
+    gantt.attachEvent('onAfterTaskUpdate', (id: number | string) => {
+      const task = gantt.getTask(id);
+      // 只回写 task 节点，避免把工单(project)节点当成任务保存
+      if (task.type !== gantt.config.types.task || !task.originalId) {
+        return;
+      }
+      emit('taskUpdate', {
+        duration: task.duration,
+        endTime: task.end_date,
+        id: task.originalId,
+        startTime: task.start_date,
+      });
+    });
+  }
+
+  gantt.attachEvent('onTaskClick', (id: number | string) => {
+    emit('taskClick', id);
+    return true;
+  });
+
+  gantt.init(ganttContainer.value);
+  ganttInited.value = true;
+}
+
+/** 加载数据到甘特图 */
+function loadData(tasks: any[]) {
+  if (!ganttInited.value) {
+    return;
+  }
+  gantt.clearAll();
+  // 后端 type 使用整数业务类型，需映射为 gantt 类型字符串
+  const typeMap: Record<number, string> = {
+    [BarcodeBizTypeEnum.WORKORDER]: 'project',
+    [BarcodeBizTypeEnum.TASK]: 'task',
+  };
+  gantt.parse({
+    data: tasks.map((item: any) => ({
+      ...item,
+      type: typeMap[item.type] || item.type,
+      start_date: item.startDate ? new Date(item.startDate) : undefined,
+      end_date: item.endDate ? new Date(item.endDate) : undefined,
+    })),
+    links: [],
+  });
+}
+
+watch(
+  () => props.tasks,
+  (val) => {
+    if (val?.length && ganttInited.value) {
+      loadData(val);
+    }
+  },
+  { deep: true },
+);
+
+onMounted(() => {
+  initGantt();
+  if (props.tasks?.length) {
+    loadData(props.tasks);
+  }
+});
+
+onBeforeUnmount(() => {
+  if (ganttInited.value) {
+    gantt.clearAll();
+  }
+});
+
+defineExpose({ loadData });
+</script>
+
+<template>
+  <div ref="ganttContainer" :style="{ width: '100%', height: `${height}px` }"></div>
+</template>
+
+<style>
+/* 今天标记线 */
+.gantt_marker.today {
+  background-color: #f44;
+  opacity: 0.4;
+}
+
+.gantt_marker.today .gantt_marker_content {
+  font-size: 12px;
+  color: #f44;
+}
+
+/* 工单（project）行样式 */
+.gantt-project-bar .gantt_task_progress {
+  background: #7b68ee;
+}
+
+/* 甘特条圆角 */
+.gantt_task_line {
+  border-radius: 8px;
+}
+
+/* 周末背景色 */
+.weekend {
+  background: #f0f0f0 !important;
+}
+
+/* 行悬浮高亮 */
+.gantt_grid_data .gantt_row:hover,
+.gantt_grid_data .gantt_row.odd:hover {
+  background-color: #f3f1fe !important;
+}
+
+/* 选中行高亮 */
+.gantt_grid_data .gantt_row.gantt_selected,
+.gantt_grid_data .gantt_row.odd.gantt_selected,
+.gantt_task_row.gantt_selected {
+  background-color: #f3f1fe !important;
+}
+</style>
diff --git a/apps/web-ele/src/views/mes/pro/task/components/pro-task-select.vue b/apps/web-ele/src/views/mes/pro/task/components/pro-task-select.vue
index 41ddaf20a..4eb0318fa 100644
--- a/apps/web-ele/src/views/mes/pro/task/components/pro-task-select.vue
+++ b/apps/web-ele/src/views/mes/pro/task/components/pro-task-select.vue
@@ -47,23 +47,19 @@ const showClear = computed(() => // 是否显示清空图标
   props.clearable &&
   !props.disabled &&
   hovering.value &&
-  props.modelValue !== undefined,
+  props.modelValue != null,
 );
 
 /** 根据任务编号回显选择器 */
 async function resolveItemById(id: number | undefined) {
-  if (id === undefined) {
+  if (id == null) {
     selectedItem.value = undefined;
     return;
   }
   if (selectedItem.value?.id === id) {
     return;
   }
-  try {
-    selectedItem.value = await getTask(id);
-  } catch (error) {
-    console.error('[ProTaskSelect] resolveItemById failed:', error);
-  }
+  selectedItem.value = await getTask(id);
 }
 
 watch(
@@ -92,8 +88,7 @@ function handleClick(event: MouseEvent) {
     clearSelected();
     return;
   }
-  const selectedIds =
-    props.modelValue === undefined ? [] : [props.modelValue];
+  const selectedIds = props.modelValue == null ? [] : [props.modelValue];
   dialogRef.value?.open(selectedIds, {
     multiple: false,
     workOrderId: props.workOrderId,
diff --git a/apps/web-ele/src/views/mes/pro/task/data.ts b/apps/web-ele/src/views/mes/pro/task/data.ts
index b78f2a030..969888d50 100644
--- a/apps/web-ele/src/views/mes/pro/task/data.ts
+++ b/apps/web-ele/src/views/mes/pro/task/data.ts
@@ -280,6 +280,15 @@ export function useScheduleFormSchema(): VbenFormSchema[] {
         valueFormat: 'x',
       },
     },
+    {
+      fieldName: 'status',
+      label: '工单状态',
+      component: 'Select',
+      componentProps: {
+        disabled: true,
+        options: getDictOptions(DICT_TYPE.MES_PRO_WORK_ORDER_STATUS, 'number'),
+      },
+    },
     {
       fieldName: 'remark',
       label: '备注',
diff --git a/apps/web-ele/src/views/mes/pro/task/edit/index.vue b/apps/web-ele/src/views/mes/pro/task/edit/index.vue
new file mode 100644
index 000000000..d84a771d9
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/task/edit/index.vue
@@ -0,0 +1,98 @@
+<script lang="ts" setup>
+import { computed, onMounted, ref } from 'vue';
+
+import { DocAlert, Page } from '@vben/common-ui';
+
+import { ElBadge, ElButton, ElMessage } from 'element-plus';
+
+import { getGanttTaskList, updateTask } from '#/api/mes/pro/task';
+
+import GanttChart from '../components/gantt-chart.vue';
+
+const submitting = ref(false); // 批量保存按钮加载态
+const taskList = ref<any[]>([]); // 甘特图任务数据
+const pendingChanges = ref(new Map<number, any>()); // 待保存的修改 Map<taskId, changeData>
+
+const pendingCount = computed(() => pendingChanges.value.size); // 待保存数量
+const ganttHeight = computed(() => window.innerHeight - 220); // 甘特图高度
+
+/** 加载甘特图数据 */
+async function loadGanttData() {
+  taskList.value = await getGanttTaskList({});
+}
+
+/** 任务编辑回调：缓存待保存的修改 */
+function handleTaskUpdate(change: any) {
+  pendingChanges.value.set(change.id, change);
+}
+
+/** 批量保存 */
+async function handleSave() {
+  if (pendingChanges.value.size === 0) {
+    return;
+  }
+  submitting.value = true;
+  try {
+    const changes = [...pendingChanges.value.values()];
+    await Promise.all(
+      changes.map((change) =>
+        updateTask({
+          duration: change.duration,
+          endTime: change.endTime,
+          id: change.id,
+          startTime: change.startTime,
+        }),
+      ),
+    );
+    ElMessage.success(`已保存 ${changes.length} 条修改`);
+    pendingChanges.value = new Map();
+    await loadGanttData();
+  } finally {
+    submitting.value = false;
+  }
+}
+
+/** 刷新 */
+async function handleRefresh() {
+  pendingChanges.value = new Map();
+  await loadGanttData();
+}
+
+onMounted(loadGanttData);
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【生产】生产排产、工序流转卡"
+        url="https://doc.iocoder.cn/mes/pro/schedule-card/"
+      />
+    </template>
+
+    <div class="mb-3 flex items-center justify-between">
+      <span class="text-sm text-gray-500">
+        可直接拖拽/拉伸任务条，或双击编辑开始时间和时长，修改后点击「批量保存」
+      </span>
+      <div class="flex items-center gap-3">
+        <ElBadge :value="pendingCount" :hidden="pendingCount === 0">
+          <ElButton
+            type="primary"
+            :disabled="pendingCount === 0"
+            :loading="submitting"
+            @click="handleSave"
+          >
+            批量保存
+          </ElButton>
+        </ElBadge>
+        <ElButton @click="handleRefresh">刷新</ElButton>
+      </div>
+    </div>
+    <GanttChart
+      :height="ganttHeight"
+      :readonly="false"
+      :tasks="taskList"
+      @task-update="handleTaskUpdate"
+    />
+  </Page>
+</template>
diff --git a/apps/web-ele/src/views/mes/pro/task/index.vue b/apps/web-ele/src/views/mes/pro/task/index.vue
new file mode 100644
index 000000000..d59becc30
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/task/index.vue
@@ -0,0 +1,152 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProWorkOrderApi } from '#/api/mes/pro/workorder';
+
+import { onMounted, ref } from 'vue';
+import { useRouter } from 'vue-router';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+
+import { ElButton, ElCard } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getGanttTaskList } from '#/api/mes/pro/task';
+import { getWorkOrderPage } from '#/api/mes/pro/workorder';
+import {
+  MesProWorkOrderStatusEnum,
+  MesProWorkOrderTypeEnum,
+} from '#/views/mes/utils/constants';
+
+import GanttChart from './components/gantt-chart.vue';
+import { useGridColumns, useGridFormSchema } from './data';
+import ScheduleForm from './modules/schedule-form.vue';
+
+const router = useRouter();
+const ganttTasks = ref<any[]>([]); // 甘特图预览数据
+
+const [ScheduleModal, scheduleModalApi] = useVbenModal({
+  connectedComponent: ScheduleForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+  loadGanttPreview();
+}
+
+/** 加载甘特图预览数据 */
+async function loadGanttPreview() {
+  ganttTasks.value = await getGanttTaskList({
+    status: MesProWorkOrderStatusEnum.CONFIRMED,
+    type: MesProWorkOrderTypeEnum.SELF,
+  });
+}
+
+/** 查看工单详情 */
+function handleDetail(row: MesProWorkOrderApi.WorkOrder) {
+  scheduleModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 排产 */
+function handleSchedule(row: MesProWorkOrderApi.WorkOrder) {
+  scheduleModalApi.setData({ formType: 'schedule', id: row.id }).open();
+}
+
+/** 打开甘特图编辑页面 */
+function handleGanttEdit() {
+  router.push({ name: 'MesProTaskGanttEdit' });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getWorkOrderPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            status: MesProWorkOrderStatusEnum.CONFIRMED,
+            type: MesProWorkOrderTypeEnum.SELF,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+    treeConfig: {
+      parentField: 'parentId',
+      rowField: 'id',
+      transform: true,
+      expandAll: true,
+      reserve: true,
+    },
+  } as VxeTableGridOptions<MesProWorkOrderApi.WorkOrder>,
+});
+
+onMounted(loadGanttPreview);
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【生产】生产排产、工序流转卡"
+        url="https://doc.iocoder.cn/mes/pro/schedule-card/"
+      />
+    </template>
+
+    <ScheduleModal @success="handleRefresh" />
+
+    <!-- 排产甘特图预览 -->
+    <ElCard class="mb-4" header="排产甘特图">
+      <GanttChart :height="350" :readonly="true" :tasks="ganttTasks" />
+    </ElCard>
+
+    <Grid table-title="待排产工单">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '甘特图编辑',
+              type: 'primary',
+              icon: ACTION_ICON.EDIT,
+              onClick: handleGanttEdit,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <ElButton link type="primary" @click="handleDetail(row)">
+          {{ row.code }}
+        </ElButton>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: '排产',
+              type: 'primary',
+              link: true,
+              auth: ['mes:pro-task:create'],
+              ifShow: row.status === MesProWorkOrderStatusEnum.CONFIRMED,
+              onClick: handleSchedule.bind(null, row),
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-ele/src/views/mes/pro/task/modules/schedule-form.vue b/apps/web-ele/src/views/mes/pro/task/modules/schedule-form.vue
new file mode 100644
index 000000000..4fd73cc93
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/task/modules/schedule-form.vue
@@ -0,0 +1,154 @@
+<script lang="ts" setup>
+import type { MesProRouteProcessApi } from '#/api/mes/pro/route/process';
+import type { MesProWorkOrderApi } from '#/api/mes/pro/workorder';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElButton, ElCard, ElMessage, ElPopconfirm, ElStep, ElSteps } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import { getRouteProcessListByProduct } from '#/api/mes/pro/route/process';
+import { finishWorkOrder, getWorkOrder } from '#/api/mes/pro/workorder';
+
+import { useScheduleFormSchema } from '../data';
+import TaskList from './task-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<'detail' | 'schedule'>('schedule');
+const workOrder = ref<MesProWorkOrderApi.WorkOrder>(); // 当前工单详情
+const routeProcessList = ref<MesProRouteProcessApi.RouteProcess[]>([]); // 工艺路线工序列表
+const activeProcessStep = ref(0); // 当前工序步骤索引
+const currentRouteId = ref(0); // 当前工艺路线编号
+
+const isReadonly = computed(() => formType.value === 'detail'); // 详情态只读
+const getTitle = computed(() =>
+  formType.value === 'detail' ? '工单详情' : '生产排产',
+);
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 100,
+  },
+  layout: 'horizontal',
+  schema: useScheduleFormSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+/** 加载工艺路线工序列表 */
+async function loadRouteProcesses(productId: number) {
+  const processes = await getRouteProcessListByProduct(productId);
+  if (!processes || processes.length === 0) {
+    ElMessage.warning('当前产品未配置工艺路线，请先在工艺路线中维护');
+    return;
+  }
+  currentRouteId.value = processes[0]!.routeId ?? 0;
+  routeProcessList.value = [...processes].toSorted(
+    (a, b) => (a.sort ?? 0) - (b.sort ?? 0),
+  );
+}
+
+/** 完成工单 */
+async function handleFinish() {
+  if (!workOrder.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await finishWorkOrder(workOrder.value.id);
+    ElMessage.success('工单已完成');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  showConfirmButton: false,
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      workOrder.value = undefined;
+      routeProcessList.value = [];
+      activeProcessStep.value = 0;
+      currentRouteId.value = 0;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ formType: 'detail' | 'schedule'; id: number }>();
+    formType.value = data.formType;
+    activeProcessStep.value = 0;
+    routeProcessList.value = [];
+    modalApi.lock();
+    try {
+      workOrder.value = await getWorkOrder(data.id);
+      // 设置到 values
+      await formApi.setValues(workOrder.value);
+      if (workOrder.value.productId) {
+        await loadRouteProcesses(workOrder.value.productId);
+      }
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-4/5">
+    <Form class="mx-4" />
+    <!-- 工序步骤导航 + 当前工序任务列表 -->
+    <template v-if="routeProcessList.length > 0 && workOrder?.id">
+      <ElSteps
+        :active="activeProcessStep"
+        align-center
+        class="my-4 px-4"
+        simple
+      >
+        <ElStep
+          v-for="(rp, index) in routeProcessList"
+          :key="rp.processId"
+          class="cursor-pointer"
+          :title="rp.processName"
+          @click="activeProcessStep = index"
+        />
+      </ElSteps>
+      <ElCard
+        v-for="(rp, index) in routeProcessList"
+        v-show="activeProcessStep === index"
+        :key="rp.processId"
+        class="mx-4"
+        shadow="never"
+      >
+        <TaskList
+          :color-code="rp.colorCode"
+          :disabled="isReadonly"
+          :item-id="workOrder.productId"
+          :process-id="rp.processId!"
+          :route-id="currentRouteId"
+          :work-order-id="workOrder.id!"
+        />
+      </ElCard>
+    </template>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <ElPopconfirm
+          v-if="formType === 'schedule'"
+          title="确认要完成该工单吗？完成后工单下所有任务将标记为已完成。"
+          width="320"
+          @confirm="handleFinish"
+        >
+          <template #reference>
+            <ElButton type="primary">完成</ElButton>
+          </template>
+        </ElPopconfirm>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/pro/task/modules/task-form.vue b/apps/web-ele/src/views/mes/pro/task/modules/task-form.vue
new file mode 100644
index 000000000..9821ed760
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/task/modules/task-form.vue
@@ -0,0 +1,113 @@
+<script lang="ts" setup>
+import type { MesProTaskApi } from '#/api/mes/pro/task';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import { createTask, getTask, updateTask } from '#/api/mes/pro/task';
+import { $t } from '#/locales';
+
+import { useTaskFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesProTaskApi.Task>();
+const context = ref<{
+  colorCode?: string;
+  itemId?: number;
+  processId?: number;
+  routeId?: number;
+  workOrderId?: number;
+}>({}); // 新增任务时的工单 / 工序上下文
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['生产任务'])
+    : $t('ui.actionTitle.create', ['生产任务']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 100,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data = (await formApi.getValues()) as MesProTaskApi.Task;
+    try {
+      await (formData.value?.id
+        ? updateTask({ ...formData.value, ...data })
+        : createTask({ ...context.value, ...data }));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      context.value = {};
+      return;
+    }
+    formApi.setState({ schema: useTaskFormSchema(formApi) });
+    // 加载数据
+    const data = modalApi.getData<{
+      colorCode?: string;
+      id?: number;
+      itemId?: number;
+      processId?: number;
+      routeId?: number;
+      workOrderId?: number;
+    }>();
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getTask(data.id);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+      return;
+    }
+    context.value = {
+      colorCode: data.colorCode,
+      itemId: data.itemId,
+      processId: data.processId,
+      routeId: data.routeId,
+      workOrderId: data.workOrderId,
+    };
+    await formApi.setValues({
+      colorCode: data.colorCode || '#00AEF3',
+      duration: 1,
+    });
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/pro/task/modules/task-list.vue b/apps/web-ele/src/views/mes/pro/task/modules/task-list.vue
new file mode 100644
index 000000000..fcd3304f5
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/task/modules/task-list.vue
@@ -0,0 +1,162 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProTaskApi } from '#/api/mes/pro/task';
+
+import { computed, watch } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { deleteTask, getTaskPage } from '#/api/mes/pro/task';
+import { $t } from '#/locales';
+
+import { useTaskGridColumns } from '../data';
+import TaskForm from './task-form.vue';
+
+const props = defineProps<{
+  colorCode?: string;
+  disabled?: boolean;
+  itemId?: number;
+  processId: number;
+  routeId: number;
+  workOrderId: number;
+}>();
+
+const editable = computed(() => !props.disabled); // 是否可维护任务
+
+const [TaskFormModal, taskFormModalApi] = useVbenModal({
+  connectedComponent: TaskForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 新增任务 */
+function handleCreate() {
+  taskFormModalApi
+    .setData({
+      colorCode: props.colorCode,
+      itemId: props.itemId,
+      processId: props.processId,
+      routeId: props.routeId,
+      workOrderId: props.workOrderId,
+    })
+    .open();
+}
+
+/** 编辑任务 */
+function handleEdit(row: MesProTaskApi.Task) {
+  taskFormModalApi.setData({ id: row.id }).open();
+}
+
+/** 删除任务 */
+async function handleDelete(row: MesProTaskApi.Task) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.code]),
+  });
+  try {
+    await deleteTask(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useTaskGridColumns(editable.value),
+    height: 360,
+    keepSource: true,
+    pagerConfig: {
+      enabled: false,
+    },
+    proxyConfig: {
+      ajax: {
+        query: async () => {
+          if (!props.workOrderId) {
+            return { list: [], total: 0 };
+          }
+          return await getTaskPage({
+            pageNo: 1,
+            pageSize: 100,
+            processId: props.processId,
+            routeId: props.routeId,
+            workOrderId: props.workOrderId,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesProTaskApi.Task>,
+});
+
+// 工序步骤切换时重新加载当前工序的任务
+watch(
+  () => props.processId,
+  () => handleRefresh(),
+);
+</script>
+
+<template>
+  <div>
+    <TaskFormModal @success="handleRefresh" />
+    <Grid table-title="生产任务">
+      <template v-if="editable" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '新增任务',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:pro-task:create'],
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #colorCode="{ row }">
+        <div
+          class="mx-auto size-5 rounded"
+          :style="{ background: row.colorCode || '#00AEF3' }"
+        ></div>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:pro-task:update'],
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:pro-task:delete'],
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/materialstock/data.ts b/apps/web-ele/src/views/mes/wm/materialstock/data.ts
index ce1102efd..dac1d54c0 100644
--- a/apps/web-ele/src/views/mes/wm/materialstock/data.ts
+++ b/apps/web-ele/src/views/mes/wm/materialstock/data.ts
@@ -53,6 +53,12 @@ export function useGridFormSchema(): VbenFormSchema[] {
           placeholder: '请选择库区',
           warehouseId: values.warehouseId,
         }),
+        // 仓库切换时清空库区，避免旧库区条件残留
+        trigger: (values, formApi) => {
+          if (values.locationId !== undefined) {
+            void formApi.setFieldValue('locationId', undefined);
+          }
+        },
       },
     },
     {
@@ -191,6 +197,12 @@ export function useSelectGridFormSchema(): VbenFormSchema[] {
           placeholder: '请选择库区',
           warehouseId: values.warehouseId,
         }),
+        // 仓库切换时清空库区
+        trigger: (values, formApi) => {
+          if (values.locationId !== undefined) {
+            void formApi.setFieldValue('locationId', undefined);
+          }
+        },
       },
     },
     {
@@ -198,11 +210,17 @@ export function useSelectGridFormSchema(): VbenFormSchema[] {
       label: '库位',
       component: markRaw(WmWarehouseAreaSelect),
       dependencies: {
-        triggerFields: ['locationId'],
+        triggerFields: ['warehouseId', 'locationId'],
         componentProps: (values) => ({
           locationId: values.locationId,
           placeholder: '请选择库位',
         }),
+        // 仓库或库区切换时清空库位
+        trigger: (values, formApi) => {
+          if (values.areaId !== undefined) {
+            void formApi.setFieldValue('areaId', undefined);
+          }
+        },
       },
     },
   ];

From 60a423f44ada6508afba38a511456106abcb533e Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 30 May 2026 10:46:21 +0800
Subject: [PATCH 39/52] =?UTF-8?q?feat(mes):=20pro-card=20=E8=BF=81?=
 =?UTF-8?q?=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web-antd/src/views/mes/pro/card/index.vue | 197 +++++++++++++++
 .../src/views/mes/pro/card/modules/form.vue   | 221 +++++++++++++++++
 .../mes/pro/card/modules/process-form.vue     |  94 ++++++++
 .../mes/pro/card/modules/process-list.vue     | 133 +++++++++++
 apps/web-ele/src/views/mes/pro/card/index.vue | 198 +++++++++++++++
 .../src/views/mes/pro/card/modules/form.vue   | 225 ++++++++++++++++++
 .../mes/pro/card/modules/process-form.vue     |  94 ++++++++
 .../mes/pro/card/modules/process-list.vue     | 133 +++++++++++
 8 files changed, 1295 insertions(+)
 create mode 100644 apps/web-antd/src/views/mes/pro/card/index.vue
 create mode 100644 apps/web-antd/src/views/mes/pro/card/modules/form.vue
 create mode 100644 apps/web-antd/src/views/mes/pro/card/modules/process-form.vue
 create mode 100644 apps/web-antd/src/views/mes/pro/card/modules/process-list.vue
 create mode 100644 apps/web-ele/src/views/mes/pro/card/index.vue
 create mode 100644 apps/web-ele/src/views/mes/pro/card/modules/form.vue
 create mode 100644 apps/web-ele/src/views/mes/pro/card/modules/process-form.vue
 create mode 100644 apps/web-ele/src/views/mes/pro/card/modules/process-list.vue

diff --git a/apps/web-antd/src/views/mes/pro/card/index.vue b/apps/web-antd/src/views/mes/pro/card/index.vue
new file mode 100644
index 000000000..718163f13
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/card/index.vue
@@ -0,0 +1,197 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProCardApi } from '#/api/mes/pro/card';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { Button, message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  cancelCard,
+  deleteCard,
+  exportCard,
+  getCardPage,
+} from '#/api/mes/pro/card';
+import { $t } from '#/locales';
+import { MesProCardStatusEnum } from '#/views/mes/utils/constants';
+import { PrinterLabel } from '#/views/mes/wm/barcode/components';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建流转卡 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看流转卡详情 */
+function handleDetail(row: MesProCardApi.Card) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑流转卡 */
+function handleEdit(row: MesProCardApi.Card) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 完成流转卡 */
+function handleFinish(row: MesProCardApi.Card) {
+  formModalApi.setData({ formType: 'finish', id: row.id }).open();
+}
+
+/** 删除流转卡 */
+async function handleDelete(row: MesProCardApi.Card) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.code]),
+    duration: 0,
+  });
+  try {
+    await deleteCard(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 取消流转卡 */
+async function handleCancel(row: MesProCardApi.Card) {
+  await cancelCard(row.id!);
+  message.success('取消成功');
+  handleRefresh();
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportCard(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '生产流转卡.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getCardPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesProCardApi.Card>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【生产】生产排产、工序流转卡"
+        url="https://doc.iocoder.cn/mes/pro/schedule-card/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="生产流转卡列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['流转卡']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:pro-card:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:pro-card:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <Button type="link" @click="handleDetail(row)">
+          {{ row.code }}
+        </Button>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:pro-card:update'],
+              ifShow: row.status === MesProCardStatusEnum.PREPARE,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:pro-card:delete'],
+              ifShow: row.status === MesProCardStatusEnum.PREPARE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '完成',
+              type: 'link',
+              auth: ['mes:pro-card:finish'],
+              ifShow: row.status === MesProCardStatusEnum.ISSUED,
+              onClick: handleFinish.bind(null, row),
+            },
+            {
+              label: '取消',
+              type: 'link',
+              danger: true,
+              auth: ['mes:pro-card:update'],
+              ifShow: row.status === MesProCardStatusEnum.ISSUED,
+              popConfirm: {
+                title: '确认取消该流转卡？取消后不可恢复。',
+                confirm: handleCancel.bind(null, row),
+              },
+            },
+          ]"
+        />
+        <PrinterLabel :biz-code="row.code" :biz-id="row.id" biz-type="PROCARD" />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/mes/pro/card/modules/form.vue b/apps/web-antd/src/views/mes/pro/card/modules/form.vue
new file mode 100644
index 000000000..32af7cc57
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/card/modules/form.vue
@@ -0,0 +1,221 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesProCardApi } from '#/api/mes/pro/card';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { Button, Divider, message, Popconfirm } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createCard,
+  finishCard,
+  getCard,
+  submitCard,
+  updateCard,
+} from '#/api/mes/pro/card';
+import { $t } from '#/locales';
+import {
+  BarcodeBizTypeEnum,
+  MesProCardStatusEnum,
+} from '#/views/mes/utils/constants';
+import { BarcodeDetail } from '#/views/mes/wm/barcode/components';
+
+import { useFormSchema } from '../data';
+import ProcessList from './process-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesProCardApi.Card>();
+const originalSnapshot = ref(''); // 表单原始数据快照，用于提交时跳过未变更的保存请求
+const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>(); // 条码详情弹窗
+
+const isEditable = computed(() => // 是否为编辑模式（可保存）
+  ['create', 'update'].includes(formType.value),
+);
+const isFinish = computed(() => formType.value === 'finish'); // 是否为完成模式
+const canSubmit = computed(() => // 编辑态草稿可提交
+  formType.value === 'update' &&
+  formData.value?.status === MesProCardStatusEnum.PREPARE,
+);
+// TODO @AI：标题方法的代码风格；
+const getTitle = computed(() => {
+  switch (formType.value) {
+    case 'detail': {
+      return $t('ui.actionTitle.view', ['流转卡']);
+    }
+    case 'finish': {
+      return '完成流转卡';
+    }
+    case 'update': {
+      return $t('ui.actionTitle.edit', ['流转卡']);
+    }
+    default: {
+      return $t('ui.actionTitle.create', ['流转卡']);
+    }
+  }
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+/** 查看流转卡条码 */
+function handleBarcode() {
+  if (!formData.value?.id) {
+    return;
+  }
+  barcodeDetailRef.value?.openByBusiness(
+    formData.value.id,
+    BarcodeBizTypeEnum.PROCARD,
+    formData.value.code,
+  );
+}
+
+/** 提交流转卡：表单有修改时先保存，再调用提交接口 */
+async function handleSubmit() {
+  const { valid } = await formApi.validate();
+  if (!valid || !formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    const current = JSON.stringify(await formApi.getValues());
+    if (current !== originalSnapshot.value) {
+      const data = (await formApi.getValues()) as MesProCardApi.Card;
+      await updateCard({ ...formData.value, ...data });
+      originalSnapshot.value = current;
+    }
+    await submitCard(formData.value.id);
+    message.success('提交成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 完成流转卡 */
+async function handleFinish() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await finishCard(formData.value.id);
+    message.success('完成成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  // TODO @AI：检查下 onConfirm 方法的风格，是不是缺了一个 // 关闭并提示？？看看其他模块，是不是也有这个情况？
+  async onConfirm() {
+    if (!isEditable.value) {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data = (await formApi.getValues()) as MesProCardApi.Card;
+    try {
+      if (formData.value?.id) {
+        await updateCard({ ...formData.value, ...data });
+        formData.value = { ...formData.value, ...data };
+      } else {
+        const id = await createCard(data);
+        formData.value = { ...data, id, status: MesProCardStatusEnum.PREPARE };
+        await formApi.setFieldValue('id', id);
+        await formApi.setFieldValue('status', formData.value.status);
+        formType.value = 'update';
+      }
+      originalSnapshot.value = JSON.stringify(await formApi.getValues());
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      originalSnapshot.value = '';
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    modalApi.setState({ showConfirmButton: isEditable.value });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getCard(data.id);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    }
+    originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+    <!-- 工序记录子表：非新建态展示 -->
+    <template v-if="formData?.id">
+      <Divider>工序记录</Divider>
+      <div class="mx-4">
+        <ProcessList :card-id="formData.id" :disabled="!isEditable" />
+      </div>
+    </template>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <Popconfirm
+          v-if="canSubmit"
+          title="确认提交该流转卡？【提交后将不能修改】"
+          @confirm="handleSubmit"
+        >
+          <Button type="primary">提交</Button>
+        </Popconfirm>
+        <Popconfirm
+          v-if="isFinish"
+          title="确认完成该流转卡？"
+          @confirm="handleFinish"
+        >
+          <Button type="primary">完成</Button>
+        </Popconfirm>
+        <Button
+          v-if="formType === 'detail' && formData?.id"
+          @click="handleBarcode"
+        >
+          查看条码
+        </Button>
+      </div>
+    </template>
+  </Modal>
+  <BarcodeDetail ref="barcodeDetailRef" />
+</template>
diff --git a/apps/web-antd/src/views/mes/pro/card/modules/process-form.vue b/apps/web-antd/src/views/mes/pro/card/modules/process-form.vue
new file mode 100644
index 000000000..0711c3ed8
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/card/modules/process-form.vue
@@ -0,0 +1,94 @@
+<script lang="ts" setup>
+import type { MesProCardProcessApi } from '#/api/mes/pro/card/process';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createCardProcess,
+  getCardProcess,
+  updateCardProcess,
+} from '#/api/mes/pro/card/process';
+import { $t } from '#/locales';
+
+import { useProcessFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesProCardProcessApi.CardProcess>();
+const cardId = ref<number>(); // 所属流转卡编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['工序记录'])
+    : $t('ui.actionTitle.create', ['工序记录']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: useProcessFormSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-2',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesProCardProcessApi.CardProcess;
+    data.cardId = cardId.value;
+    try {
+      await (formData.value?.id
+        ? updateCardProcess({ ...data, id: formData.value.id })
+        : createCardProcess(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ cardId: number; id?: number }>();
+    cardId.value = data.cardId;
+    if (!data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getCardProcess(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/pro/card/modules/process-list.vue b/apps/web-antd/src/views/mes/pro/card/modules/process-list.vue
new file mode 100644
index 000000000..91191c37c
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/card/modules/process-list.vue
@@ -0,0 +1,133 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProCardProcessApi } from '#/api/mes/pro/card/process';
+
+import { computed } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteCardProcess,
+  getCardProcessPage,
+} from '#/api/mes/pro/card/process';
+import { $t } from '#/locales';
+
+import { useProcessGridColumns } from '../data';
+import ProcessForm from './process-form.vue';
+
+const props = defineProps<{
+  cardId: number;
+  disabled?: boolean;
+}>();
+
+const editable = computed(() => !props.disabled); // 是否可维护工序记录
+
+const [ProcessFormModal, processFormModalApi] = useVbenModal({
+  connectedComponent: ProcessForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 新增工序记录 */
+function handleCreate() {
+  processFormModalApi.setData({ cardId: props.cardId }).open();
+}
+
+/** 编辑工序记录 */
+function handleEdit(row: MesProCardProcessApi.CardProcess) {
+  processFormModalApi.setData({ cardId: props.cardId, id: row.id }).open();
+}
+
+/** 删除工序记录 */
+async function handleDelete(row: MesProCardProcessApi.CardProcess) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.processName]),
+    duration: 0,
+  });
+  try {
+    await deleteCardProcess(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.processName]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useProcessGridColumns(editable.value),
+    height: 400,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.cardId) {
+            return { list: [], total: 0 };
+          }
+          return await getCardProcessPage({
+            cardId: props.cardId,
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesProCardProcessApi.CardProcess>,
+});
+</script>
+
+<template>
+  <div>
+    <ProcessFormModal @success="handleRefresh" />
+    <Grid table-title="工序记录">
+      <template v-if="editable" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['工序记录']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.processName]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-ele/src/views/mes/pro/card/index.vue b/apps/web-ele/src/views/mes/pro/card/index.vue
new file mode 100644
index 000000000..0bdc1b10f
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/card/index.vue
@@ -0,0 +1,198 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProCardApi } from '#/api/mes/pro/card';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { ElButton, ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  cancelCard,
+  deleteCard,
+  exportCard,
+  getCardPage,
+} from '#/api/mes/pro/card';
+import { $t } from '#/locales';
+import { MesProCardStatusEnum } from '#/views/mes/utils/constants';
+import { PrinterLabel } from '#/views/mes/wm/barcode/components';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建流转卡 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看流转卡详情 */
+function handleDetail(row: MesProCardApi.Card) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑流转卡 */
+function handleEdit(row: MesProCardApi.Card) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 完成流转卡 */
+function handleFinish(row: MesProCardApi.Card) {
+  formModalApi.setData({ formType: 'finish', id: row.id }).open();
+}
+
+/** 删除流转卡 */
+async function handleDelete(row: MesProCardApi.Card) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.code]),
+  });
+  try {
+    await deleteCard(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+/** 取消流转卡 */
+async function handleCancel(row: MesProCardApi.Card) {
+  await cancelCard(row.id!);
+  ElMessage.success('取消成功');
+  handleRefresh();
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportCard(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '生产流转卡.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getCardPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesProCardApi.Card>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【生产】生产排产、工序流转卡"
+        url="https://doc.iocoder.cn/mes/pro/schedule-card/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="生产流转卡列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['流转卡']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:pro-card:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:pro-card:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <ElButton link type="primary" @click="handleDetail(row)">
+          {{ row.code }}
+        </ElButton>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:pro-card:update'],
+              ifShow: row.status === MesProCardStatusEnum.PREPARE,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:pro-card:delete'],
+              ifShow: row.status === MesProCardStatusEnum.PREPARE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '完成',
+              type: 'primary',
+              link: true,
+              auth: ['mes:pro-card:finish'],
+              ifShow: row.status === MesProCardStatusEnum.ISSUED,
+              onClick: handleFinish.bind(null, row),
+            },
+            {
+              label: '取消',
+              type: 'danger',
+              link: true,
+              auth: ['mes:pro-card:update'],
+              ifShow: row.status === MesProCardStatusEnum.ISSUED,
+              popConfirm: {
+                title: '确认取消该流转卡？取消后不可恢复。',
+                confirm: handleCancel.bind(null, row),
+              },
+            },
+          ]"
+        />
+        <PrinterLabel :biz-code="row.code" :biz-id="row.id" biz-type="PROCARD" />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-ele/src/views/mes/pro/card/modules/form.vue b/apps/web-ele/src/views/mes/pro/card/modules/form.vue
new file mode 100644
index 000000000..be95bc98b
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/card/modules/form.vue
@@ -0,0 +1,225 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesProCardApi } from '#/api/mes/pro/card';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElButton, ElDivider, ElMessage, ElPopconfirm } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createCard,
+  finishCard,
+  getCard,
+  submitCard,
+  updateCard,
+} from '#/api/mes/pro/card';
+import { $t } from '#/locales';
+import {
+  BarcodeBizTypeEnum,
+  MesProCardStatusEnum,
+} from '#/views/mes/utils/constants';
+import { BarcodeDetail } from '#/views/mes/wm/barcode/components';
+
+import { useFormSchema } from '../data';
+import ProcessList from './process-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesProCardApi.Card>();
+const originalSnapshot = ref(''); // 表单原始数据快照，用于提交时跳过未变更的保存请求
+const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>(); // 条码详情弹窗
+
+const isEditable = computed(() => // 是否为编辑模式（可保存）
+  ['create', 'update'].includes(formType.value),
+);
+const isFinish = computed(() => formType.value === 'finish'); // 是否为完成模式
+const canSubmit = computed(() => // 编辑态草稿可提交
+  formType.value === 'update' &&
+  formData.value?.status === MesProCardStatusEnum.PREPARE,
+);
+const getTitle = computed(() => {
+  switch (formType.value) {
+    case 'detail': {
+      return $t('ui.actionTitle.view', ['流转卡']);
+    }
+    case 'finish': {
+      return '完成流转卡';
+    }
+    case 'update': {
+      return $t('ui.actionTitle.edit', ['流转卡']);
+    }
+    default: {
+      return $t('ui.actionTitle.create', ['流转卡']);
+    }
+  }
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+/** 查看流转卡条码 */
+function handleBarcode() {
+  if (!formData.value?.id) {
+    return;
+  }
+  barcodeDetailRef.value?.openByBusiness(
+    formData.value.id,
+    BarcodeBizTypeEnum.PROCARD,
+    formData.value.code,
+  );
+}
+
+/** 提交流转卡：表单有修改时先保存，再调用提交接口 */
+async function handleSubmit() {
+  const { valid } = await formApi.validate();
+  if (!valid || !formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    const current = JSON.stringify(await formApi.getValues());
+    if (current !== originalSnapshot.value) {
+      const data = (await formApi.getValues()) as MesProCardApi.Card;
+      await updateCard({ ...formData.value, ...data });
+      originalSnapshot.value = current;
+    }
+    await submitCard(formData.value.id);
+    ElMessage.success('提交成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 完成流转卡 */
+async function handleFinish() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await finishCard(formData.value.id);
+    ElMessage.success('完成成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (!isEditable.value) {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data = (await formApi.getValues()) as MesProCardApi.Card;
+    try {
+      if (formData.value?.id) {
+        await updateCard({ ...formData.value, ...data });
+        formData.value = { ...formData.value, ...data };
+      } else {
+        const id = await createCard(data);
+        formData.value = { ...data, id, status: MesProCardStatusEnum.PREPARE };
+        await formApi.setFieldValue('id', id);
+        await formApi.setFieldValue('status', formData.value.status);
+        formType.value = 'update';
+      }
+      originalSnapshot.value = JSON.stringify(await formApi.getValues());
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      originalSnapshot.value = '';
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    modalApi.setState({ showConfirmButton: isEditable.value });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getCard(data.id);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    }
+    originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+    <!-- 工序记录子表：非新建态展示 -->
+    <template v-if="formData?.id">
+      <ElDivider>工序记录</ElDivider>
+      <div class="mx-4">
+        <ProcessList :card-id="formData.id" :disabled="!isEditable" />
+      </div>
+    </template>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <ElPopconfirm
+          v-if="canSubmit"
+          title="确认提交该流转卡？【提交后将不能修改】"
+          width="280"
+          @confirm="handleSubmit"
+        >
+          <template #reference>
+            <ElButton type="primary">提交</ElButton>
+          </template>
+        </ElPopconfirm>
+        <ElPopconfirm
+          v-if="isFinish"
+          title="确认完成该流转卡？"
+          width="220"
+          @confirm="handleFinish"
+        >
+          <template #reference>
+            <ElButton type="primary">完成</ElButton>
+          </template>
+        </ElPopconfirm>
+        <ElButton
+          v-if="formType === 'detail' && formData?.id"
+          @click="handleBarcode"
+        >
+          查看条码
+        </ElButton>
+      </div>
+    </template>
+  </Modal>
+  <BarcodeDetail ref="barcodeDetailRef" />
+</template>
diff --git a/apps/web-ele/src/views/mes/pro/card/modules/process-form.vue b/apps/web-ele/src/views/mes/pro/card/modules/process-form.vue
new file mode 100644
index 000000000..cabee274d
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/card/modules/process-form.vue
@@ -0,0 +1,94 @@
+<script lang="ts" setup>
+import type { MesProCardProcessApi } from '#/api/mes/pro/card/process';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createCardProcess,
+  getCardProcess,
+  updateCardProcess,
+} from '#/api/mes/pro/card/process';
+import { $t } from '#/locales';
+
+import { useProcessFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesProCardProcessApi.CardProcess>();
+const cardId = ref<number>(); // 所属流转卡编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['工序记录'])
+    : $t('ui.actionTitle.create', ['工序记录']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: useProcessFormSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-2',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesProCardProcessApi.CardProcess;
+    data.cardId = cardId.value;
+    try {
+      await (formData.value?.id
+        ? updateCardProcess({ ...data, id: formData.value.id })
+        : createCardProcess(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ cardId: number; id?: number }>();
+    cardId.value = data.cardId;
+    if (!data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getCardProcess(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/pro/card/modules/process-list.vue b/apps/web-ele/src/views/mes/pro/card/modules/process-list.vue
new file mode 100644
index 000000000..0cc8e3ad4
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/card/modules/process-list.vue
@@ -0,0 +1,133 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProCardProcessApi } from '#/api/mes/pro/card/process';
+
+import { computed } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteCardProcess,
+  getCardProcessPage,
+} from '#/api/mes/pro/card/process';
+import { $t } from '#/locales';
+
+import { useProcessGridColumns } from '../data';
+import ProcessForm from './process-form.vue';
+
+const props = defineProps<{
+  cardId: number;
+  disabled?: boolean;
+}>();
+
+const editable = computed(() => !props.disabled); // 是否可维护工序记录
+
+const [ProcessFormModal, processFormModalApi] = useVbenModal({
+  connectedComponent: ProcessForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 新增工序记录 */
+function handleCreate() {
+  processFormModalApi.setData({ cardId: props.cardId }).open();
+}
+
+/** 编辑工序记录 */
+function handleEdit(row: MesProCardProcessApi.CardProcess) {
+  processFormModalApi.setData({ cardId: props.cardId, id: row.id }).open();
+}
+
+/** 删除工序记录 */
+async function handleDelete(row: MesProCardProcessApi.CardProcess) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.processName]),
+  });
+  try {
+    await deleteCardProcess(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.processName]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useProcessGridColumns(editable.value),
+    height: 400,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.cardId) {
+            return { list: [], total: 0 };
+          }
+          return await getCardProcessPage({
+            cardId: props.cardId,
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesProCardProcessApi.CardProcess>,
+});
+</script>
+
+<template>
+  <div>
+    <ProcessFormModal @success="handleRefresh" />
+    <Grid table-title="工序记录">
+      <template v-if="editable" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['工序记录']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.processName]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>

From 3ef3f246c2fea05221315b6041afbbef6dd5442a Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 30 May 2026 10:54:54 +0800
Subject: [PATCH 40/52] feat(mes): update MES status enums and adjust
 visibility conditions for pro-card actions

---
 .../web-antd/src/views/mes/pro/card/index.vue |  4 ++--
 .../web-antd/src/views/mes/utils/constants.ts | 23 ++++++++-----------
 apps/web-ele/src/views/mes/pro/card/index.vue |  4 ++--
 apps/web-ele/src/views/mes/utils/constants.ts | 23 ++++++++-----------
 4 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/apps/web-antd/src/views/mes/pro/card/index.vue b/apps/web-antd/src/views/mes/pro/card/index.vue
index 718163f13..643efe25f 100644
--- a/apps/web-antd/src/views/mes/pro/card/index.vue
+++ b/apps/web-antd/src/views/mes/pro/card/index.vue
@@ -174,7 +174,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
               label: '完成',
               type: 'link',
               auth: ['mes:pro-card:finish'],
-              ifShow: row.status === MesProCardStatusEnum.ISSUED,
+              ifShow: row.status === MesProCardStatusEnum.CONFIRMED,
               onClick: handleFinish.bind(null, row),
             },
             {
@@ -182,7 +182,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
               type: 'link',
               danger: true,
               auth: ['mes:pro-card:update'],
-              ifShow: row.status === MesProCardStatusEnum.ISSUED,
+              ifShow: row.status === MesProCardStatusEnum.CONFIRMED,
               popConfirm: {
                 title: '确认取消该流转卡？取消后不可恢复。',
                 confirm: handleCancel.bind(null, row),
diff --git a/apps/web-antd/src/views/mes/utils/constants.ts b/apps/web-antd/src/views/mes/utils/constants.ts
index 08b97af14..d247ceb42 100644
--- a/apps/web-antd/src/views/mes/utils/constants.ts
+++ b/apps/web-antd/src/views/mes/utils/constants.ts
@@ -208,14 +208,12 @@ export const MesWmStockTakingParamTypeEnum = {
   QUALITY_STATUS: 900,
 } as const;
 
-/** MES 生产工单状态枚举 */
+/** MES 生产工单状态枚举（独立于通用单据状态，对齐后端 MesProWorkOrderStatusEnum） */
 export const MesProWorkOrderStatusEnum = {
-  PREPARE: MesOrderStatusConstants.DRAFT,
-  CONFIRMED: MesOrderStatusConstants.CONFIRMED,
-  APPROVING: MesOrderStatusConstants.APPROVING,
-  PRODUCING: MesOrderStatusConstants.APPROVED,
-  FINISHED: MesOrderStatusConstants.FINISHED,
-  CANCELLED: MesOrderStatusConstants.CANCELLED,
+  PREPARE: 0, // 草稿
+  CONFIRMED: 1, // 已确认
+  FINISHED: 2, // 已完成
+  CANCELED: 3, // 已取消
 } as const;
 
 /** MES 工单类型枚举 */
@@ -250,13 +248,12 @@ export const MesProFeedbackStatusEnum = {
   CANCELED: MesOrderStatusConstants.CANCELLED,
 } as const;
 
-/** MES 流转卡状态枚举 */
+/** MES 流转卡状态枚举（复用工单状态值，对齐后端 MesProWorkOrderStatusEnum） */
 export const MesProCardStatusEnum = {
-  PREPARE: MesOrderStatusConstants.DRAFT,
-  ISSUED: MesOrderStatusConstants.CONFIRMED,
-  PRODUCING: MesOrderStatusConstants.APPROVED,
-  FINISHED: MesOrderStatusConstants.FINISHED,
-  CANCELLED: MesOrderStatusConstants.CANCELLED,
+  PREPARE: 0, // 草稿
+  CONFIRMED: 1, // 已确认
+  FINISHED: 2, // 已完成
+  CANCELED: 3, // 已取消
 } as const;
 
 /** MES 安灯处置状态枚举 */
diff --git a/apps/web-ele/src/views/mes/pro/card/index.vue b/apps/web-ele/src/views/mes/pro/card/index.vue
index 0bdc1b10f..3d601f7b0 100644
--- a/apps/web-ele/src/views/mes/pro/card/index.vue
+++ b/apps/web-ele/src/views/mes/pro/card/index.vue
@@ -175,7 +175,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
               type: 'primary',
               link: true,
               auth: ['mes:pro-card:finish'],
-              ifShow: row.status === MesProCardStatusEnum.ISSUED,
+              ifShow: row.status === MesProCardStatusEnum.CONFIRMED,
               onClick: handleFinish.bind(null, row),
             },
             {
@@ -183,7 +183,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
               type: 'danger',
               link: true,
               auth: ['mes:pro-card:update'],
-              ifShow: row.status === MesProCardStatusEnum.ISSUED,
+              ifShow: row.status === MesProCardStatusEnum.CONFIRMED,
               popConfirm: {
                 title: '确认取消该流转卡？取消后不可恢复。',
                 confirm: handleCancel.bind(null, row),
diff --git a/apps/web-ele/src/views/mes/utils/constants.ts b/apps/web-ele/src/views/mes/utils/constants.ts
index 08b97af14..d247ceb42 100644
--- a/apps/web-ele/src/views/mes/utils/constants.ts
+++ b/apps/web-ele/src/views/mes/utils/constants.ts
@@ -208,14 +208,12 @@ export const MesWmStockTakingParamTypeEnum = {
   QUALITY_STATUS: 900,
 } as const;
 
-/** MES 生产工单状态枚举 */
+/** MES 生产工单状态枚举（独立于通用单据状态，对齐后端 MesProWorkOrderStatusEnum） */
 export const MesProWorkOrderStatusEnum = {
-  PREPARE: MesOrderStatusConstants.DRAFT,
-  CONFIRMED: MesOrderStatusConstants.CONFIRMED,
-  APPROVING: MesOrderStatusConstants.APPROVING,
-  PRODUCING: MesOrderStatusConstants.APPROVED,
-  FINISHED: MesOrderStatusConstants.FINISHED,
-  CANCELLED: MesOrderStatusConstants.CANCELLED,
+  PREPARE: 0, // 草稿
+  CONFIRMED: 1, // 已确认
+  FINISHED: 2, // 已完成
+  CANCELED: 3, // 已取消
 } as const;
 
 /** MES 工单类型枚举 */
@@ -250,13 +248,12 @@ export const MesProFeedbackStatusEnum = {
   CANCELED: MesOrderStatusConstants.CANCELLED,
 } as const;
 
-/** MES 流转卡状态枚举 */
+/** MES 流转卡状态枚举（复用工单状态值，对齐后端 MesProWorkOrderStatusEnum） */
 export const MesProCardStatusEnum = {
-  PREPARE: MesOrderStatusConstants.DRAFT,
-  ISSUED: MesOrderStatusConstants.CONFIRMED,
-  PRODUCING: MesOrderStatusConstants.APPROVED,
-  FINISHED: MesOrderStatusConstants.FINISHED,
-  CANCELLED: MesOrderStatusConstants.CANCELLED,
+  PREPARE: 0, // 草稿
+  CONFIRMED: 1, // 已确认
+  FINISHED: 2, // 已完成
+  CANCELED: 3, // 已取消
 } as const;
 
 /** MES 安灯处置状态枚举 */

From 2fd44246f84e244e2e759eba33565ad0a3effe11 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 30 May 2026 10:58:56 +0800
Subject: [PATCH 41/52] =?UTF-8?q?feat(mes):=20=E8=BF=81=E7=A7=BB=20wm=20?=
 =?UTF-8?q?=E9=87=8C=E7=9A=84=20return-*=20=E7=B3=BB=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/mes/wm/returnissue/data.ts      | 568 +++++++++++++++++
 .../src/views/mes/wm/returnissue/index.vue    | 221 +++++++
 .../wm/returnissue/modules/detail-form.vue    | 104 ++++
 .../wm/returnissue/modules/detail-list.vue    | 103 ++++
 .../views/mes/wm/returnissue/modules/form.vue | 225 +++++++
 .../mes/wm/returnissue/modules/line-form.vue  |  95 +++
 .../mes/wm/returnissue/modules/line-list.vue  | 247 ++++++++
 .../src/views/mes/wm/returnsales/data.ts      | 519 ++++++++++++++++
 .../src/views/mes/wm/returnsales/index.vue    | 221 +++++++
 .../wm/returnsales/modules/detail-form.vue    | 104 ++++
 .../wm/returnsales/modules/detail-list.vue    | 103 ++++
 .../views/mes/wm/returnsales/modules/form.vue | 233 +++++++
 .../mes/wm/returnsales/modules/line-form.vue  | 102 ++++
 .../mes/wm/returnsales/modules/line-list.vue  | 244 ++++++++
 .../src/views/mes/wm/returnvendor/data.ts     | 533 ++++++++++++++++
 .../src/views/mes/wm/returnvendor/index.vue   | 209 +++++++
 .../wm/returnvendor/modules/detail-form.vue   | 104 ++++
 .../wm/returnvendor/modules/detail-list.vue   | 103 ++++
 .../mes/wm/returnvendor/modules/form.vue      | 238 ++++++++
 .../mes/wm/returnvendor/modules/line-form.vue |  99 +++
 .../mes/wm/returnvendor/modules/line-list.vue | 234 +++++++
 .../src/views/mes/wm/returnissue/data.ts      | 571 ++++++++++++++++++
 .../src/views/mes/wm/returnissue/index.vue    | 224 +++++++
 .../wm/returnissue/modules/detail-form.vue    | 104 ++++
 .../wm/returnissue/modules/detail-list.vue    | 103 ++++
 .../views/mes/wm/returnissue/modules/form.vue | 230 +++++++
 .../mes/wm/returnissue/modules/line-form.vue  |  95 +++
 .../mes/wm/returnissue/modules/line-list.vue  | 249 ++++++++
 .../src/views/mes/wm/returnsales/data.ts      | 521 ++++++++++++++++
 .../src/views/mes/wm/returnsales/index.vue    | 224 +++++++
 .../wm/returnsales/modules/detail-form.vue    | 104 ++++
 .../wm/returnsales/modules/detail-list.vue    | 103 ++++
 .../views/mes/wm/returnsales/modules/form.vue | 242 ++++++++
 .../mes/wm/returnsales/modules/line-form.vue  | 102 ++++
 .../mes/wm/returnsales/modules/line-list.vue  | 245 ++++++++
 .../src/views/mes/wm/returnvendor/data.ts     | 535 ++++++++++++++++
 .../src/views/mes/wm/returnvendor/index.vue   | 211 +++++++
 .../wm/returnvendor/modules/detail-form.vue   | 104 ++++
 .../wm/returnvendor/modules/detail-list.vue   | 103 ++++
 .../mes/wm/returnvendor/modules/form.vue      | 244 ++++++++
 .../mes/wm/returnvendor/modules/line-form.vue |  99 +++
 .../mes/wm/returnvendor/modules/line-list.vue | 235 +++++++
 42 files changed, 9257 insertions(+)
 create mode 100644 apps/web-antd/src/views/mes/wm/returnissue/data.ts
 create mode 100644 apps/web-antd/src/views/mes/wm/returnissue/index.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/returnissue/modules/detail-form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/returnissue/modules/detail-list.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/returnissue/modules/form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/returnissue/modules/line-form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/returnissue/modules/line-list.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/returnsales/data.ts
 create mode 100644 apps/web-antd/src/views/mes/wm/returnsales/index.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/returnsales/modules/detail-form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/returnsales/modules/detail-list.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/returnsales/modules/form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/returnsales/modules/line-form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/returnsales/modules/line-list.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/returnvendor/data.ts
 create mode 100644 apps/web-antd/src/views/mes/wm/returnvendor/index.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/returnvendor/modules/detail-form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/returnvendor/modules/detail-list.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/returnvendor/modules/form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/returnvendor/modules/line-form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/returnvendor/modules/line-list.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/returnissue/data.ts
 create mode 100644 apps/web-ele/src/views/mes/wm/returnissue/index.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/returnissue/modules/detail-form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/returnissue/modules/detail-list.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/returnissue/modules/form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/returnissue/modules/line-form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/returnissue/modules/line-list.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/returnsales/data.ts
 create mode 100644 apps/web-ele/src/views/mes/wm/returnsales/index.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/returnsales/modules/detail-form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/returnsales/modules/detail-list.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/returnsales/modules/form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/returnsales/modules/line-form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/returnsales/modules/line-list.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/returnvendor/data.ts
 create mode 100644 apps/web-ele/src/views/mes/wm/returnvendor/index.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/returnvendor/modules/detail-form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/returnvendor/modules/detail-list.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/returnvendor/modules/form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/returnvendor/modules/line-form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/returnvendor/modules/line-list.vue

diff --git a/apps/web-antd/src/views/mes/wm/returnissue/data.ts b/apps/web-antd/src/views/mes/wm/returnissue/data.ts
new file mode 100644
index 000000000..f1320acca
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/returnissue/data.ts
@@ -0,0 +1,568 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmMaterialStockApi } from '#/api/mes/wm/materialstock';
+import type { MesWmReturnIssueApi } from '#/api/mes/wm/returnissue';
+import type { MesWmReturnIssueDetailApi } from '#/api/mes/wm/returnissue/detail';
+import type { MesWmReturnIssueLineApi } from '#/api/mes/wm/returnissue/line';
+
+import { h, markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { Button } from 'ant-design-vue';
+
+import { z } from '#/adapter/form';
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import MdWorkstationSelect from '#/views/mes/md/workstation/components/md-workstation-select.vue';
+import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
+import {
+  MesAutoCodeRuleCode,
+  MesProWorkOrderStatusEnum,
+} from '#/views/mes/utils/constants';
+import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
+import {
+  WmWarehouseAreaSelect,
+  WmWarehouseLocationSelect,
+  WmWarehouseSelect,
+} from '#/views/mes/wm/warehouse/components';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'finish' | 'stock' | 'update';
+
+/** 表单头部是否只读（上架、详情、执行退料态） */
+function isHeaderReadonly(formType: FormType): boolean {
+  return (
+    formType === 'detail' || formType === 'finish' || formType === 'stock'
+  );
+}
+
+/** 新增/修改的表单 */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'status',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '退料单编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入退料单编号',
+      },
+      rules: 'required',
+      suffix: isHeaderReadonly(formType)
+        ? undefined
+        : () =>
+            h(
+              Button,
+              {
+                type: 'default',
+                onClick: async () => {
+                  const code = await generateAutoCode(
+                    MesAutoCodeRuleCode.WM_RETURN_ISSUE_CODE,
+                  );
+                  await formApi?.setFieldValue('code', code);
+                },
+              },
+              { default: () => '生成' },
+            ),
+    },
+    {
+      fieldName: 'name',
+      label: '退料单名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入退料单名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'type',
+      label: '退料类型',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_WM_RETURN_ISSUE_TYPE, 'number'),
+        placeholder: '请选择退料类型',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'workOrderId',
+      label: '生产工单',
+      component: markRaw(ProWorkOrderSelect),
+      componentProps: {
+        status: MesProWorkOrderStatusEnum.CONFIRMED,
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'workstationId',
+      label: '工作站',
+      component: markRaw(MdWorkstationSelect),
+      componentProps: {
+        placeholder: '请选择工作站',
+      },
+    },
+    {
+      fieldName: 'returnDate',
+      label: '退料日期',
+      component: 'DatePicker',
+      componentProps: {
+        class: '!w-full',
+        format: 'YYYY-MM-DD HH:mm:ss',
+        placeholder: '请选择退料日期',
+        showTime: true,
+        valueFormat: 'x',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '退料单编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入退料单编号',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '退料单名称',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入退料单名称',
+      },
+    },
+    {
+      fieldName: 'workOrderId',
+      label: '生产工单',
+      component: markRaw(ProWorkOrderSelect),
+      componentProps: {
+        placeholder: '请选择生产工单',
+      },
+    },
+    {
+      fieldName: 'type',
+      label: '退料类型',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_WM_RETURN_ISSUE_TYPE, 'number'),
+        placeholder: '请选择退料类型',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesWmReturnIssueApi.ReturnIssue>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '退料单编号',
+      minWidth: 160,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '退料单名称',
+      minWidth: 150,
+    },
+    {
+      field: 'type',
+      title: '退料类型',
+      minWidth: 110,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_RETURN_ISSUE_TYPE },
+      },
+    },
+    {
+      field: 'workOrderCode',
+      title: '生产工单',
+      minWidth: 140,
+    },
+    {
+      field: 'workstationName',
+      title: '工作站',
+      minWidth: 120,
+    },
+    {
+      field: 'returnDate',
+      title: '退料日期',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      minWidth: 110,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_RETURN_ISSUE_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 240,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 退料单行子表的字段 */
+export function useLineGridColumns(
+  editable: boolean,
+  stockable: boolean,
+): VxeTableGridOptions<MesWmReturnIssueLineApi.ReturnIssueLine>['columns'] {
+  return [
+    {
+      type: 'expand',
+      width: 48,
+      slots: { content: 'detail' },
+    },
+    {
+      field: 'itemCode',
+      title: '物料编码',
+      minWidth: 120,
+    },
+    {
+      field: 'itemName',
+      title: '物料名称',
+      minWidth: 140,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'quantity',
+      title: '退料数量',
+      width: 100,
+    },
+    {
+      field: 'batchCode',
+      title: '批次号',
+      minWidth: 120,
+    },
+    {
+      field: 'rqcCheckFlag',
+      title: '是否检测',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+      },
+    },
+    {
+      field: 'qualityStatus',
+      title: '质量状态',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_QUALITY_STATUS },
+      },
+    },
+    ...(editable || stockable
+      ? [
+          {
+            title: '操作',
+            width: 200,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 退料单行新增/修改的表单 */
+export function useLineFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'materialStockId',
+      label: '库存记录',
+      component: markRaw(WmMaterialStockSelect),
+      componentProps: {
+        // 选择库存记录后，自动回填物料/批次/数量
+        onChange: async (stock?: MesWmMaterialStockApi.MaterialStock) => {
+          await formApi?.setValues({
+            batchCode: stock?.batchCode,
+            batchId: stock?.batchId,
+            itemId: stock?.itemId,
+            quantity: stock?.quantity,
+            quantityMax: stock?.quantity,
+          });
+        },
+        virtualFilter: 'only',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'quantityMax',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'quantity',
+      label: '退料数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入退料数量',
+        precision: 2,
+      },
+      rules: 'required',
+      dependencies: {
+        triggerFields: ['quantityMax'],
+        componentProps: (values) => ({
+          class: '!w-full',
+          max: values.quantityMax,
+          min: 0,
+          placeholder: '请输入退料数量',
+          precision: 2,
+        }),
+      },
+    },
+    {
+      fieldName: 'rqcCheckFlag',
+      label: '需要质检',
+      component: 'Switch',
+      rules: z.boolean().default(false),
+    },
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+        placeholder: '选择库存后自动带出',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 上架明细子表的字段 */
+export function useDetailGridColumns(
+  stockable: boolean,
+): VxeTableGridOptions<MesWmReturnIssueDetailApi.ReturnIssueDetail>['columns'] {
+  return [
+    {
+      field: 'batchCode',
+      title: '批次号',
+      minWidth: 120,
+    },
+    {
+      field: 'warehouseName',
+      title: '仓库名称',
+      minWidth: 100,
+    },
+    {
+      field: 'locationName',
+      title: '库区名称',
+      minWidth: 100,
+    },
+    {
+      field: 'areaName',
+      title: '库位名称',
+      minWidth: 100,
+    },
+    {
+      field: 'quantity',
+      title: '数量',
+      width: 100,
+    },
+    ...(stockable
+      ? [
+          {
+            title: '操作',
+            width: 120,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 上架明细新增/修改的表单 */
+export function useDetailFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'quantityMax',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'materialStockId',
+      label: '库存记录',
+      component: markRaw(WmMaterialStockSelect),
+      componentProps: {
+        // 选择库存记录后，自动回填仓库/库区/库位/批次/数量
+        onChange: async (stock?: MesWmMaterialStockApi.MaterialStock) => {
+          await formApi?.setValues({
+            areaId: stock?.areaId,
+            batchCode: stock?.batchCode,
+            batchId: stock?.batchId,
+            locationId: stock?.locationId,
+            quantity: stock?.quantity,
+            quantityMax: stock?.quantity,
+            warehouseId: stock?.warehouseId,
+          });
+        },
+        virtualFilter: 'only',
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['itemId'],
+        componentProps: (values) => ({
+          itemId: values.itemId,
+          virtualFilter: 'only',
+        }),
+      },
+    },
+    {
+      fieldName: 'quantity',
+      label: '数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入数量',
+        precision: 2,
+      },
+      rules: 'required',
+      dependencies: {
+        triggerFields: ['quantityMax'],
+        componentProps: (values) => ({
+          class: '!w-full',
+          max: values.quantityMax,
+          min: 0,
+          placeholder: '请输入数量',
+          precision: 2,
+        }),
+      },
+    },
+    {
+      fieldName: 'warehouseId',
+      label: '入库仓库',
+      component: markRaw(WmWarehouseSelect),
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'locationId',
+      label: '库区',
+      component: markRaw(WmWarehouseLocationSelect),
+      componentProps: {
+        disabled: true,
+      },
+      dependencies: {
+        triggerFields: ['warehouseId'],
+        componentProps: (values) => ({
+          disabled: true,
+          warehouseId: values.warehouseId,
+        }),
+      },
+    },
+    {
+      fieldName: 'areaId',
+      label: '库位',
+      component: markRaw(WmWarehouseAreaSelect),
+      componentProps: {
+        disabled: true,
+      },
+      dependencies: {
+        triggerFields: ['locationId'],
+        componentProps: (values) => ({
+          disabled: true,
+          locationId: values.locationId,
+        }),
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+      },
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/wm/returnissue/index.vue b/apps/web-antd/src/views/mes/wm/returnissue/index.vue
new file mode 100644
index 000000000..4f8aeddfb
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/returnissue/index.vue
@@ -0,0 +1,221 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmReturnIssueApi } from '#/api/mes/wm/returnissue';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { Button, message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  cancelReturnIssue,
+  deleteReturnIssue,
+  exportReturnIssue,
+  getReturnIssuePage,
+} from '#/api/mes/wm/returnissue';
+import { $t } from '#/locales';
+import { MesWmReturnIssueStatusEnum } from '#/views/mes/utils/constants';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建生产退料单 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看生产退料单 */
+function handleDetail(row: MesWmReturnIssueApi.ReturnIssue) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑生产退料单 */
+function handleEdit(row: MesWmReturnIssueApi.ReturnIssue) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 执行上架 */
+function handleStock(row: MesWmReturnIssueApi.ReturnIssue) {
+  formModalApi.setData({ formType: 'stock', id: row.id }).open();
+}
+
+/** 执行退料 */
+function handleFinish(row: MesWmReturnIssueApi.ReturnIssue) {
+  formModalApi.setData({ formType: 'finish', id: row.id }).open();
+}
+
+/** 提示前往质检模块 */
+function handleQc() {
+  message.info('请前往【质量管理 - 退货检验（RQC）】中进行退料检验操作');
+}
+
+/** 删除生产退料单 */
+async function handleDelete(row: MesWmReturnIssueApi.ReturnIssue) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.code]),
+    duration: 0,
+  });
+  try {
+    await deleteReturnIssue(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 取消生产退料单 */
+async function handleCancel(row: MesWmReturnIssueApi.ReturnIssue) {
+  await cancelReturnIssue(row.id!);
+  message.success('取消成功');
+  handleRefresh();
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportReturnIssue(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '生产退料单.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getReturnIssuePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmReturnIssueApi.ReturnIssue>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】生产领料、生产退料、物料消耗"
+        url="https://doc.iocoder.cn/mes/wm/issue-return/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="生产退料单列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['生产退料单']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-return-issue:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:wm-return-issue:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <Button type="link" @click="handleDetail(row)">
+          {{ row.code }}
+        </Button>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:wm-return-issue:update'],
+              ifShow: row.status === MesWmReturnIssueStatusEnum.PREPARE,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm-return-issue:delete'],
+              ifShow: row.status === MesWmReturnIssueStatusEnum.PREPARE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '执行质检',
+              type: 'link',
+              ifShow: row.status === MesWmReturnIssueStatusEnum.CONFIRMED,
+              onClick: handleQc,
+            },
+            {
+              label: '执行上架',
+              type: 'link',
+              auth: ['mes:wm-return-issue:update'],
+              ifShow: row.status === MesWmReturnIssueStatusEnum.APPROVING,
+              onClick: handleStock.bind(null, row),
+            },
+            {
+              label: '执行退料',
+              type: 'link',
+              auth: ['mes:wm-return-issue:finish'],
+              ifShow: row.status === MesWmReturnIssueStatusEnum.APPROVED,
+              onClick: handleFinish.bind(null, row),
+            },
+            {
+              label: '取消',
+              type: 'link',
+              danger: true,
+              auth: ['mes:wm-return-issue:update'],
+              ifShow:
+                row.status === MesWmReturnIssueStatusEnum.CONFIRMED ||
+                row.status === MesWmReturnIssueStatusEnum.APPROVING ||
+                row.status === MesWmReturnIssueStatusEnum.APPROVED,
+              popConfirm: {
+                title: '确认取消该生产退料单？取消后不可恢复。',
+                confirm: handleCancel.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/returnissue/modules/detail-form.vue b/apps/web-antd/src/views/mes/wm/returnissue/modules/detail-form.vue
new file mode 100644
index 000000000..032c77135
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/returnissue/modules/detail-form.vue
@@ -0,0 +1,104 @@
+<script lang="ts" setup>
+import type { MesWmReturnIssueDetailApi } from '#/api/mes/wm/returnissue/detail';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createReturnIssueDetail,
+  getReturnIssueDetail,
+  updateReturnIssueDetail,
+} from '#/api/mes/wm/returnissue/detail';
+import { $t } from '#/locales';
+
+import { useDetailFormSchema } from '../data';
+
+const emit = defineEmits<{ success: [lineId: number] }>();
+const formData = ref<MesWmReturnIssueDetailApi.ReturnIssueDetail>();
+const issueId = ref<number>(); // 所属退料单编号
+const lineId = ref<number>(); // 所属退料单行编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['上架明细'])
+    : $t('ui.actionTitle.create', ['上架明细']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 90,
+  },
+  layout: 'horizontal',
+  schema: useDetailFormSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmReturnIssueDetailApi.ReturnIssueDetail;
+    data.issueId = issueId.value;
+    data.lineId = lineId.value;
+    try {
+      await (formData.value?.id
+        ? updateReturnIssueDetail({ ...data, id: formData.value.id })
+        : createReturnIssueDetail(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success', lineId.value!);
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    formApi.setState({ schema: useDetailFormSchema(formApi) });
+    // 加载数据
+    const data = modalApi.getData<{
+      detailId?: number;
+      issueId: number;
+      itemId?: number;
+      lineId: number;
+    }>();
+    issueId.value = data.issueId;
+    lineId.value = data.lineId;
+    if (data.detailId) {
+      modalApi.lock();
+      try {
+        formData.value = await getReturnIssueDetail(data.detailId);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    } else if (data.itemId) {
+      await formApi.setFieldValue('itemId', data.itemId);
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/returnissue/modules/detail-list.vue b/apps/web-antd/src/views/mes/wm/returnissue/modules/detail-list.vue
new file mode 100644
index 000000000..6f4458f9e
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/returnissue/modules/detail-list.vue
@@ -0,0 +1,103 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmReturnIssueDetailApi } from '#/api/mes/wm/returnissue/detail';
+
+import { computed, watch } from 'vue';
+
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { deleteReturnIssueDetail } from '#/api/mes/wm/returnissue/detail';
+import { $t } from '#/locales';
+
+import { type FormType, useDetailGridColumns } from '../data';
+
+const props = defineProps<{
+  details: MesWmReturnIssueDetailApi.ReturnIssueDetail[];
+  formType: FormType;
+}>();
+
+const emit = defineEmits<{
+  edit: [detailId: number];
+  refresh: [];
+}>();
+
+const isStock = computed(() => props.formType === 'stock'); // 是否为入库上架模式
+
+/** 编辑上架明细 */
+function handleEdit(row: MesWmReturnIssueDetailApi.ReturnIssueDetail) {
+  emit('edit', row.id!);
+}
+
+/** 删除上架明细 */
+async function handleDelete(
+  row: MesWmReturnIssueDetailApi.ReturnIssueDetail,
+) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.warehouseName]),
+    duration: 0,
+  });
+  try {
+    await deleteReturnIssueDetail(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.warehouseName]));
+    emit('refresh');
+  } finally {
+    hideLoading();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    border: true,
+    columns: useDetailGridColumns(isStock.value),
+    data: props.details,
+    pagerConfig: {
+      enabled: false,
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    size: 'small',
+    toolbarConfig: {
+      enabled: false,
+    },
+  } as VxeTableGridOptions<MesWmReturnIssueDetailApi.ReturnIssueDetail>,
+});
+
+watch(
+  () => props.details,
+  (details) => gridApi.setGridOptions({ data: details }),
+);
+</script>
+
+<template>
+  <div class="px-4 py-2">
+    <Grid>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [
+                  row.warehouseName,
+                ]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/returnissue/modules/form.vue b/apps/web-antd/src/views/mes/wm/returnissue/modules/form.vue
new file mode 100644
index 000000000..b971108b1
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/returnissue/modules/form.vue
@@ -0,0 +1,225 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesWmReturnIssueApi } from '#/api/mes/wm/returnissue';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { Button, Divider, message, Popconfirm } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createReturnIssue,
+  finishReturnIssue,
+  getReturnIssue,
+  stockReturnIssue,
+  submitReturnIssue,
+  updateReturnIssue,
+} from '#/api/mes/wm/returnissue';
+import { $t } from '#/locales';
+import { MesWmReturnIssueStatusEnum } from '#/views/mes/utils/constants';
+
+import { useFormSchema } from '../data';
+import LineList from './line-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesWmReturnIssueApi.ReturnIssue>();
+const originalSnapshot = ref(''); // 表单原始数据快照，用于提交时跳过未变更的保存请求
+const isEditable = computed(() => // 是否为编辑模式（可保存）
+  ['create', 'update'].includes(formType.value),
+);
+const isStock = computed(() => formType.value === 'stock'); // 是否为入库上架模式
+const isFinish = computed(() => formType.value === 'finish'); // 是否为执行退料模式
+const canSubmit = computed(() => // 是否可提交
+  formType.value === 'update' &&
+  formData.value?.status === MesWmReturnIssueStatusEnum.PREPARE,
+);
+// TODO @AI：这种标题风格，需要调整对齐
+const getTitle = computed(() => {
+  switch (formType.value) {
+    case 'detail': {
+      return $t('ui.actionTitle.view', ['生产退料单']);
+    }
+    case 'finish': {
+      return '执行退料';
+    }
+    case 'stock': {
+      return '入库上架';
+    }
+    case 'update': {
+      return $t('ui.actionTitle.edit', ['生产退料单']);
+    }
+    default: {
+      return $t('ui.actionTitle.create', ['生产退料单']);
+    }
+  }
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+/** 提交退料单：表单有修改时先保存，再调用提交接口 */
+async function handleSubmit() {
+  const { valid } = await formApi.validate();
+  if (!valid || !formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    const current = JSON.stringify(await formApi.getValues());
+    if (current !== originalSnapshot.value) {
+      const data =
+        (await formApi.getValues()) as MesWmReturnIssueApi.ReturnIssue;
+      await updateReturnIssue({ ...formData.value, ...data });
+      originalSnapshot.value = current;
+    }
+    await submitReturnIssue(formData.value.id);
+    message.success('提交成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 入库上架 */
+async function handleStock() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await stockReturnIssue(formData.value.id);
+    message.success('入库上架成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 执行退料 */
+async function handleFinish() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await finishReturnIssue(formData.value.id);
+    message.success('完成成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (!isEditable.value) {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data = (await formApi.getValues()) as MesWmReturnIssueApi.ReturnIssue;
+    try {
+      if (formData.value?.id) {
+        await updateReturnIssue({ ...formData.value, ...data });
+        formData.value = { ...formData.value, ...data };
+      } else {
+        const id = await createReturnIssue(data);
+        formData.value = {
+          ...data,
+          id,
+          status: MesWmReturnIssueStatusEnum.PREPARE,
+        };
+        await formApi.setFieldValue('id', id);
+        await formApi.setFieldValue('status', formData.value.status);
+        formType.value = 'update';
+      }
+      originalSnapshot.value = JSON.stringify(await formApi.getValues());
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      originalSnapshot.value = '';
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    formApi.setDisabled(!isEditable.value);
+    modalApi.setState({ showConfirmButton: isEditable.value });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getReturnIssue(data.id);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    }
+    originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+    <!-- 非新建模式展示物料信息 -->
+    <template v-if="formData?.id">
+      <Divider>物料信息</Divider>
+      <div class="mx-4">
+        <LineList :form-type="formType" :issue-id="formData.id" />
+      </div>
+    </template>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <Popconfirm
+          v-if="canSubmit"
+          title="确认提交该退料单？【提交后将不能修改】"
+          @confirm="handleSubmit"
+        >
+          <Button type="primary">提交</Button>
+        </Popconfirm>
+        <Button v-if="isStock" type="primary" @click="handleStock">
+          入库上架
+        </Button>
+        <Popconfirm
+          v-if="isFinish"
+          title="确认完成该退料单并执行入库吗？"
+          @confirm="handleFinish"
+        >
+          <Button type="primary">执行退料</Button>
+        </Popconfirm>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/returnissue/modules/line-form.vue b/apps/web-antd/src/views/mes/wm/returnissue/modules/line-form.vue
new file mode 100644
index 000000000..7cdc60151
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/returnissue/modules/line-form.vue
@@ -0,0 +1,95 @@
+<script lang="ts" setup>
+import type { MesWmReturnIssueLineApi } from '#/api/mes/wm/returnissue/line';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createReturnIssueLine,
+  getReturnIssueLine,
+  updateReturnIssueLine,
+} from '#/api/mes/wm/returnissue/line';
+import { $t } from '#/locales';
+
+import { useLineFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesWmReturnIssueLineApi.ReturnIssueLine>();
+const issueId = ref<number>(); // 所属退料单编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['生产退料单行'])
+    : $t('ui.actionTitle.create', ['生产退料单行']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 90,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmReturnIssueLineApi.ReturnIssueLine;
+    data.issueId = issueId.value;
+    try {
+      await (formData.value?.id
+        ? updateReturnIssueLine({ ...data, id: formData.value.id })
+        : createReturnIssueLine(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    formApi.setState({ schema: useLineFormSchema(formApi) });
+    // 加载数据
+    const data = modalApi.getData<{ id?: number; issueId: number }>();
+    issueId.value = data.issueId;
+    if (!data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getReturnIssueLine(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/returnissue/modules/line-list.vue b/apps/web-antd/src/views/mes/wm/returnissue/modules/line-list.vue
new file mode 100644
index 000000000..216dbd665
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/returnissue/modules/line-list.vue
@@ -0,0 +1,247 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmReturnIssueDetailApi } from '#/api/mes/wm/returnissue/detail';
+import type { MesWmReturnIssueLineApi } from '#/api/mes/wm/returnissue/line';
+
+import { computed, reactive, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getReturnIssueDetailListByLineId } from '#/api/mes/wm/returnissue/detail';
+import {
+  deleteReturnIssueLine,
+  getReturnIssueLinePage,
+} from '#/api/mes/wm/returnissue/line';
+import { $t } from '#/locales';
+import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
+import { BarcodeDetail, PrinterLabel } from '#/views/mes/wm/barcode/components';
+
+import { type FormType, useLineGridColumns } from '../data';
+import DetailForm from './detail-form.vue';
+import DetailList from './detail-list.vue';
+import LineForm from './line-form.vue';
+
+const props = defineProps<{
+  formType: FormType;
+  issueId: number;
+}>();
+
+const isEditable = computed(() => // 是否可编辑明细行
+  ['create', 'update'].includes(props.formType),
+);
+const isStock = computed(() => props.formType === 'stock'); // 是否为入库上架模式
+const detailMap = reactive<
+  Record<number, MesWmReturnIssueDetailApi.ReturnIssueDetail[]>
+>({}); // 已展开行的上架明细缓存
+const barcodeDetailRef = ref(); // 条码详情弹窗实例
+
+const [LineFormModal, lineFormModalApi] = useVbenModal({
+  connectedComponent: LineForm,
+  destroyOnClose: true,
+});
+
+const [DetailFormModal, detailFormModalApi] = useVbenModal({
+  connectedComponent: DetailForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  for (const id of Object.keys(detailMap)) {
+    delete detailMap[Number(id)];
+  }
+  gridApi.query();
+}
+
+/** 添加物料 */
+function handleCreate() {
+  lineFormModalApi.setData({ issueId: props.issueId }).open();
+}
+
+/** 编辑物料 */
+function handleEdit(row: MesWmReturnIssueLineApi.ReturnIssueLine) {
+  lineFormModalApi.setData({ id: row.id, issueId: props.issueId }).open();
+}
+
+/** 删除物料 */
+async function handleDelete(row: MesWmReturnIssueLineApi.ReturnIssueLine) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.itemName]),
+    duration: 0,
+  });
+  try {
+    await deleteReturnIssueLine(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.itemName]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 上架：直接打开明细创建表单 */
+function handlePicking(row: MesWmReturnIssueLineApi.ReturnIssueLine) {
+  openDetailForm(row.id!, row.itemId);
+}
+
+/** 查看物料条码 */
+function handleBarcode(row: MesWmReturnIssueLineApi.ReturnIssueLine) {
+  barcodeDetailRef.value?.openByBusiness(
+    row.itemId,
+    BarcodeBizTypeEnum.ITEM,
+    row.itemCode,
+    row.itemName,
+  );
+}
+
+/** 打开上架明细表单 */
+function openDetailForm(lineId: number, itemId?: number, detailId?: number) {
+  detailFormModalApi
+    .setData({ detailId, issueId: props.issueId, itemId, lineId })
+    .open();
+}
+
+/** 获取已展开行的上架明细 */
+function getExpandedDetails(row: MesWmReturnIssueLineApi.ReturnIssueLine) {
+  return detailMap[row.id!] || [];
+}
+
+/** 加载指定行的上架明细 */
+async function loadLineDetails(lineId: number) {
+  detailMap[lineId] = await getReturnIssueDetailListByLineId(lineId);
+}
+
+/** 展开行时懒加载上架明细 */
+async function handleExpandChange(
+  row: MesWmReturnIssueLineApi.ReturnIssueLine,
+  expanded: boolean,
+) {
+  if (!expanded) {
+    return;
+  }
+  await loadLineDetails(row.id!);
+}
+
+/** 明细表单提交成功后，刷新对应行已展开的明细 */
+async function handleDetailSuccess(lineId: number) {
+  await loadLineDetails(lineId);
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useLineGridColumns(isEditable.value, isStock.value),
+    expandConfig: {
+      padding: true,
+    },
+    height: 400,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.issueId) {
+            return { list: [], total: 0 };
+          }
+          return await getReturnIssueLinePage({
+            issueId: props.issueId,
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesWmReturnIssueLineApi.ReturnIssueLine>,
+  gridEvents: {
+    toggleRowExpand: ({
+      expanded,
+      row,
+    }: {
+      expanded: boolean;
+      row: MesWmReturnIssueLineApi.ReturnIssueLine;
+    }) => {
+      handleExpandChange(row, expanded);
+    },
+  },
+});
+</script>
+
+<template>
+  <div>
+    <LineFormModal @success="handleRefresh" />
+    <DetailFormModal @success="handleDetailSuccess" />
+    <Grid table-title="物料信息">
+      <template v-if="isEditable" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '添加物料',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #detail="{ row }">
+        <DetailList
+          :details="getExpandedDetails(row)"
+          :form-type="formType"
+          @edit="(detailId) => openDetailForm(row.id!, row.itemId, detailId)"
+          @refresh="loadLineDetails(row.id!)"
+        />
+      </template>
+      <template #actions="{ row }">
+        <div class="flex items-center justify-center">
+          <TableAction
+            :actions="[
+              {
+                label: $t('common.edit'),
+                type: 'link',
+                icon: ACTION_ICON.EDIT,
+                ifShow: isEditable,
+                onClick: handleEdit.bind(null, row),
+              },
+              {
+                label: $t('common.delete'),
+                type: 'link',
+                danger: true,
+                icon: ACTION_ICON.DELETE,
+                ifShow: isEditable,
+                popConfirm: {
+                  title: $t('ui.actionMessage.deleteConfirm', [row.itemName]),
+                  confirm: handleDelete.bind(null, row),
+                },
+              },
+              {
+                label: '上架',
+                type: 'link',
+                ifShow: isStock,
+                onClick: handlePicking.bind(null, row),
+              },
+              {
+                label: '条码',
+                type: 'link',
+                onClick: handleBarcode.bind(null, row),
+              },
+            ]"
+          />
+          <PrinterLabel
+            v-if="isStock"
+            :biz-code="row.batchCode"
+            :biz-id="row.batchId"
+            biz-type="BATCH"
+          />
+        </div>
+      </template>
+    </Grid>
+    <BarcodeDetail ref="barcodeDetailRef" />
+  </div>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/returnsales/data.ts b/apps/web-antd/src/views/mes/wm/returnsales/data.ts
new file mode 100644
index 000000000..b540e86bf
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/returnsales/data.ts
@@ -0,0 +1,519 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmReturnSalesApi } from '#/api/mes/wm/returnsales';
+import type { MesWmReturnSalesDetailApi } from '#/api/mes/wm/returnsales/detail';
+import type { MesWmReturnSalesLineApi } from '#/api/mes/wm/returnsales/line';
+
+import { h, markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { Button } from 'ant-design-vue';
+
+import { z } from '#/adapter/form';
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
+import { WmBatchSelect } from '#/views/mes/wm/batch/components';
+import {
+  WmWarehouseAreaSelect,
+  WmWarehouseLocationSelect,
+  WmWarehouseSelect,
+} from '#/views/mes/wm/warehouse/components';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'finish' | 'stock' | 'update';
+
+/** 表单头部是否只读（上架、详情、执行退货态） */
+function isHeaderReadonly(formType: FormType): boolean {
+  return (
+    formType === 'detail' || formType === 'finish' || formType === 'stock'
+  );
+}
+
+/** 新增/修改的表单 */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'status',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '退货单编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入退货单编号',
+      },
+      rules: 'required',
+      suffix: isHeaderReadonly(formType)
+        ? undefined
+        : () =>
+            h(
+              Button,
+              {
+                type: 'default',
+                onClick: async () => {
+                  const code = await generateAutoCode(
+                    MesAutoCodeRuleCode.WM_RETURN_SALES_CODE,
+                  );
+                  await formApi?.setFieldValue('code', code);
+                },
+              },
+              { default: () => '生成' },
+            ),
+    },
+    {
+      fieldName: 'name',
+      label: '退货单名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入退货单名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'salesOrderCode',
+      label: '销售订单号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入销售订单号',
+      },
+    },
+    {
+      fieldName: 'clientId',
+      label: '客户',
+      component: markRaw(MdClientSelect),
+      componentProps: {
+        placeholder: '请选择客户',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'returnDate',
+      label: '退货日期',
+      component: 'DatePicker',
+      componentProps: {
+        class: '!w-full',
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择退货日期',
+        valueFormat: 'x',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'returnReason',
+      label: '退货原因',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入退货原因',
+        rows: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '退货单编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入退货单编号',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '退货单名称',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入退货单名称',
+      },
+    },
+    {
+      fieldName: 'salesOrderCode',
+      label: '销售订单号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入销售订单号',
+      },
+    },
+    {
+      fieldName: 'clientId',
+      label: '客户',
+      component: markRaw(MdClientSelect),
+      componentProps: {
+        placeholder: '请选择客户',
+      },
+    },
+    {
+      fieldName: 'status',
+      label: '单据状态',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_WM_RETURN_SALES_STATUS, 'number'),
+        placeholder: '请选择单据状态',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesWmReturnSalesApi.ReturnSales>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '退货单编号',
+      minWidth: 160,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '退货单名称',
+      minWidth: 150,
+    },
+    {
+      field: 'salesOrderCode',
+      title: '销售订单号',
+      minWidth: 140,
+    },
+    {
+      field: 'clientCode',
+      title: '客户编码',
+      minWidth: 120,
+    },
+    {
+      field: 'clientName',
+      title: '客户名称',
+      minWidth: 150,
+    },
+    {
+      field: 'returnReason',
+      title: '退货原因',
+      minWidth: 150,
+    },
+    {
+      field: 'returnDate',
+      title: '退货日期',
+      width: 180,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      minWidth: 110,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_RETURN_SALES_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 240,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 退货单行子表的字段 */
+export function useLineGridColumns(
+  editable: boolean,
+  stockable: boolean,
+): VxeTableGridOptions<MesWmReturnSalesLineApi.ReturnSalesLine>['columns'] {
+  return [
+    {
+      type: 'expand',
+      width: 48,
+      slots: { content: 'detail' },
+    },
+    {
+      field: 'itemCode',
+      title: '物料编码',
+      minWidth: 120,
+    },
+    {
+      field: 'itemName',
+      title: '物料名称',
+      minWidth: 140,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'quantity',
+      title: '退货数量',
+      width: 100,
+    },
+    {
+      field: 'batchCode',
+      title: '批次号',
+      minWidth: 120,
+    },
+    {
+      field: 'rqcCheckFlag',
+      title: '是否需要质检',
+      width: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+      },
+    },
+    {
+      field: 'qualityStatus',
+      title: '质量状态',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_QUALITY_STATUS },
+      },
+    },
+    ...(editable || stockable
+      ? [
+          {
+            title: '操作',
+            width: 160,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 退货单行新增/修改的表单 */
+export function useLineFormSchema(
+  clientId?: number,
+  salesOrderCode?: string,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择物料',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'quantity',
+      label: '退货数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入退货数量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'batchId',
+      label: '批次',
+      component: markRaw(WmBatchSelect),
+      componentProps: {
+        clientId,
+        placeholder: '请选择批次',
+        salesOrderCode,
+      },
+      dependencies: {
+        triggerFields: ['itemId'],
+        componentProps: (values) => ({
+          clientId,
+          itemId: values.itemId,
+          placeholder: '请选择批次',
+          salesOrderCode,
+        }),
+      },
+    },
+    {
+      fieldName: 'rqcCheckFlag',
+      label: '需要质检',
+      component: 'Switch',
+      rules: z.boolean().default(true),
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 上架明细子表的字段 */
+export function useDetailGridColumns(
+  stockable: boolean,
+): VxeTableGridOptions<MesWmReturnSalesDetailApi.ReturnSalesDetail>['columns'] {
+  return [
+    {
+      field: 'batchCode',
+      title: '批次号',
+      minWidth: 120,
+    },
+    {
+      field: 'warehouseName',
+      title: '仓库名称',
+      minWidth: 100,
+    },
+    {
+      field: 'locationName',
+      title: '库区名称',
+      minWidth: 100,
+    },
+    {
+      field: 'areaName',
+      title: '库位名称',
+      minWidth: 100,
+    },
+    {
+      field: 'quantity',
+      title: '数量',
+      width: 100,
+    },
+    ...(stockable
+      ? [
+          {
+            title: '操作',
+            width: 120,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 上架明细新增/修改的表单 */
+export function useDetailFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'warehouseId',
+      label: '入库仓库',
+      component: markRaw(WmWarehouseSelect),
+      componentProps: {
+        // 切换仓库后清空库区和库位
+        onChange: async () => {
+          await formApi?.setValues({
+            areaId: undefined,
+            locationId: undefined,
+          });
+        },
+        placeholder: '请选择仓库',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'locationId',
+      label: '库区',
+      component: markRaw(WmWarehouseLocationSelect),
+      componentProps: {
+        placeholder: '请选择库区',
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['warehouseId'],
+        componentProps: (values) => ({
+          // 切换库区后清空库位
+          onChange: async () => {
+            await formApi?.setFieldValue('areaId', undefined);
+          },
+          placeholder: '请选择库区',
+          warehouseId: values.warehouseId,
+        }),
+      },
+    },
+    {
+      fieldName: 'areaId',
+      label: '库位',
+      component: markRaw(WmWarehouseAreaSelect),
+      componentProps: {
+        placeholder: '请选择库位',
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['locationId'],
+        componentProps: (values) => ({
+          locationId: values.locationId,
+          placeholder: '请选择库位',
+        }),
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入批次号',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'quantity',
+      label: '数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入数量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/wm/returnsales/index.vue b/apps/web-antd/src/views/mes/wm/returnsales/index.vue
new file mode 100644
index 000000000..e746b54b8
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/returnsales/index.vue
@@ -0,0 +1,221 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmReturnSalesApi } from '#/api/mes/wm/returnsales';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { Button, message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  cancelReturnSales,
+  deleteReturnSales,
+  exportReturnSales,
+  getReturnSalesPage,
+} from '#/api/mes/wm/returnsales';
+import { $t } from '#/locales';
+import { MesWmReturnSalesStatusEnum } from '#/views/mes/utils/constants';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建销售退货单 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看销售退货单 */
+function handleDetail(row: MesWmReturnSalesApi.ReturnSales) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑销售退货单 */
+function handleEdit(row: MesWmReturnSalesApi.ReturnSales) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 执行上架 */
+function handleStock(row: MesWmReturnSalesApi.ReturnSales) {
+  formModalApi.setData({ formType: 'stock', id: row.id }).open();
+}
+
+/** 执行退货 */
+function handleFinish(row: MesWmReturnSalesApi.ReturnSales) {
+  formModalApi.setData({ formType: 'finish', id: row.id }).open();
+}
+
+/** 提示前往质检模块 */
+function handleQc() {
+  message.info('请前往【质量管理 - 退货检验（RQC）】中进行退货检验操作');
+}
+
+/** 删除销售退货单 */
+async function handleDelete(row: MesWmReturnSalesApi.ReturnSales) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.code]),
+    duration: 0,
+  });
+  try {
+    await deleteReturnSales(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 取消销售退货单 */
+async function handleCancel(row: MesWmReturnSalesApi.ReturnSales) {
+  await cancelReturnSales(row.id!);
+  message.success('取消成功');
+  handleRefresh();
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportReturnSales(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '销售退货单.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getReturnSalesPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmReturnSalesApi.ReturnSales>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】发货通知、销售出库、销售退货"
+        url="https://doc.iocoder.cn/mes/wm/sales-out/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="销售退货单列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['销售退货单']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-return-sales:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:wm-return-sales:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <Button type="link" @click="handleDetail(row)">
+          {{ row.code }}
+        </Button>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:wm-return-sales:update'],
+              ifShow: row.status === MesWmReturnSalesStatusEnum.PREPARE,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm-return-sales:delete'],
+              ifShow: row.status === MesWmReturnSalesStatusEnum.PREPARE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '执行质检',
+              type: 'link',
+              ifShow: row.status === MesWmReturnSalesStatusEnum.CONFIRMED,
+              onClick: handleQc,
+            },
+            {
+              label: '执行退货',
+              type: 'link',
+              auth: ['mes:wm-return-sales:finish'],
+              ifShow: row.status === MesWmReturnSalesStatusEnum.APPROVING,
+              onClick: handleFinish.bind(null, row),
+            },
+            {
+              label: '执行上架',
+              type: 'link',
+              auth: ['mes:wm-return-sales:stock'],
+              ifShow: row.status === MesWmReturnSalesStatusEnum.APPROVED,
+              onClick: handleStock.bind(null, row),
+            },
+            {
+              label: '取消',
+              type: 'link',
+              danger: true,
+              auth: ['mes:wm-return-sales:cancel'],
+              ifShow:
+                row.status === MesWmReturnSalesStatusEnum.CONFIRMED ||
+                row.status === MesWmReturnSalesStatusEnum.APPROVING ||
+                row.status === MesWmReturnSalesStatusEnum.APPROVED,
+              popConfirm: {
+                title: '确认取消该销售退货单？取消后不可恢复。',
+                confirm: handleCancel.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/returnsales/modules/detail-form.vue b/apps/web-antd/src/views/mes/wm/returnsales/modules/detail-form.vue
new file mode 100644
index 000000000..7fe34f713
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/returnsales/modules/detail-form.vue
@@ -0,0 +1,104 @@
+<script lang="ts" setup>
+import type { MesWmReturnSalesDetailApi } from '#/api/mes/wm/returnsales/detail';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createReturnSalesDetail,
+  getReturnSalesDetail,
+  updateReturnSalesDetail,
+} from '#/api/mes/wm/returnsales/detail';
+import { $t } from '#/locales';
+
+import { useDetailFormSchema } from '../data';
+
+const emit = defineEmits<{ success: [lineId: number] }>();
+const formData = ref<MesWmReturnSalesDetailApi.ReturnSalesDetail>();
+const returnId = ref<number>(); // 所属退货单编号
+const lineId = ref<number>(); // 所属退货单行编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['上架明细'])
+    : $t('ui.actionTitle.create', ['上架明细']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 90,
+  },
+  layout: 'horizontal',
+  schema: useDetailFormSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmReturnSalesDetailApi.ReturnSalesDetail;
+    data.returnId = returnId.value;
+    data.lineId = lineId.value;
+    try {
+      await (formData.value?.id
+        ? updateReturnSalesDetail({ ...data, id: formData.value.id })
+        : createReturnSalesDetail(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success', lineId.value!);
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    formApi.setState({ schema: useDetailFormSchema(formApi) });
+    // 加载数据
+    const data = modalApi.getData<{
+      detailId?: number;
+      itemId?: number;
+      lineId: number;
+      returnId: number;
+    }>();
+    returnId.value = data.returnId;
+    lineId.value = data.lineId;
+    if (data.detailId) {
+      modalApi.lock();
+      try {
+        formData.value = await getReturnSalesDetail(data.detailId);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    } else if (data.itemId) {
+      await formApi.setFieldValue('itemId', data.itemId);
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/returnsales/modules/detail-list.vue b/apps/web-antd/src/views/mes/wm/returnsales/modules/detail-list.vue
new file mode 100644
index 000000000..fa0355430
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/returnsales/modules/detail-list.vue
@@ -0,0 +1,103 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmReturnSalesDetailApi } from '#/api/mes/wm/returnsales/detail';
+
+import { computed, watch } from 'vue';
+
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { deleteReturnSalesDetail } from '#/api/mes/wm/returnsales/detail';
+import { $t } from '#/locales';
+
+import { type FormType, useDetailGridColumns } from '../data';
+
+const props = defineProps<{
+  details: MesWmReturnSalesDetailApi.ReturnSalesDetail[];
+  formType: FormType;
+}>();
+
+const emit = defineEmits<{
+  edit: [detailId: number];
+  refresh: [];
+}>();
+
+const isStock = computed(() => props.formType === 'stock'); // 是否为上架模式
+
+/** 编辑上架明细 */
+function handleEdit(row: MesWmReturnSalesDetailApi.ReturnSalesDetail) {
+  emit('edit', row.id!);
+}
+
+/** 删除上架明细 */
+async function handleDelete(
+  row: MesWmReturnSalesDetailApi.ReturnSalesDetail,
+) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.warehouseName]),
+    duration: 0,
+  });
+  try {
+    await deleteReturnSalesDetail(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.warehouseName]));
+    emit('refresh');
+  } finally {
+    hideLoading();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    border: true,
+    columns: useDetailGridColumns(isStock.value),
+    data: props.details,
+    pagerConfig: {
+      enabled: false,
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    size: 'small',
+    toolbarConfig: {
+      enabled: false,
+    },
+  } as VxeTableGridOptions<MesWmReturnSalesDetailApi.ReturnSalesDetail>,
+});
+
+watch(
+  () => props.details,
+  (details) => gridApi.setGridOptions({ data: details }),
+);
+</script>
+
+<template>
+  <div class="px-4 py-2">
+    <Grid>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [
+                  row.warehouseName,
+                ]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/returnsales/modules/form.vue b/apps/web-antd/src/views/mes/wm/returnsales/modules/form.vue
new file mode 100644
index 000000000..18f98fb6b
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/returnsales/modules/form.vue
@@ -0,0 +1,233 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesWmReturnSalesApi } from '#/api/mes/wm/returnsales';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { Button, Divider, message, Popconfirm } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createReturnSales,
+  finishReturnSales,
+  getReturnSales,
+  stockReturnSales,
+  submitReturnSales,
+  updateReturnSales,
+} from '#/api/mes/wm/returnsales';
+import { $t } from '#/locales';
+import { MesWmReturnSalesStatusEnum } from '#/views/mes/utils/constants';
+
+import { useFormSchema } from '../data';
+import LineList from './line-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesWmReturnSalesApi.ReturnSales>();
+const originalSnapshot = ref(''); // 表单原始数据快照，用于提交时跳过未变更的保存请求
+const isEditable = computed(() => // 是否为编辑模式（可保存）
+  ['create', 'update'].includes(formType.value),
+);
+const isStock = computed(() => formType.value === 'stock'); // 是否为上架模式
+const isFinish = computed(() => formType.value === 'finish'); // 是否为执行退货模式
+const canSubmit = computed(() => // 是否可提交
+  formType.value === 'update' &&
+  formData.value?.status === MesWmReturnSalesStatusEnum.PREPARE,
+);
+const getTitle = computed(() => {
+  switch (formType.value) {
+    case 'detail': {
+      return $t('ui.actionTitle.view', ['销售退货单']);
+    }
+    case 'finish': {
+      return '执行退货';
+    }
+    case 'stock': {
+      return '执行上架';
+    }
+    case 'update': {
+      return $t('ui.actionTitle.edit', ['销售退货单']);
+    }
+    default: {
+      return $t('ui.actionTitle.create', ['销售退货单']);
+    }
+  }
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+/** 提交退货单：表单有修改时先保存，再调用提交接口 */
+async function handleSubmit() {
+  const { valid } = await formApi.validate();
+  if (!valid || !formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    const current = JSON.stringify(await formApi.getValues());
+    if (current !== originalSnapshot.value) {
+      const data =
+        (await formApi.getValues()) as MesWmReturnSalesApi.ReturnSales;
+      await updateReturnSales({ ...formData.value, ...data });
+      originalSnapshot.value = current;
+    }
+    await submitReturnSales(formData.value.id);
+    message.success('提交成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 执行上架 */
+async function handleStock() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await stockReturnSales(formData.value.id);
+    message.success('上架成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 执行退货 */
+async function handleFinish() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await finishReturnSales(formData.value.id);
+    message.success('执行退货成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (!isEditable.value) {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data = (await formApi.getValues()) as MesWmReturnSalesApi.ReturnSales;
+    try {
+      if (formData.value?.id) {
+        await updateReturnSales({ ...formData.value, ...data });
+        formData.value = { ...formData.value, ...data };
+      } else {
+        const id = await createReturnSales(data);
+        formData.value = {
+          ...data,
+          id,
+          status: MesWmReturnSalesStatusEnum.PREPARE,
+        };
+        await formApi.setFieldValue('id', id);
+        await formApi.setFieldValue('status', formData.value.status);
+        formType.value = 'update';
+      }
+      originalSnapshot.value = JSON.stringify(await formApi.getValues());
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      originalSnapshot.value = '';
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    formApi.setDisabled(!isEditable.value);
+    modalApi.setState({ showConfirmButton: isEditable.value });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getReturnSales(data.id);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    }
+    originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+    <!-- 非新建模式展示物料信息 -->
+    <template v-if="formData?.id">
+      <Divider>物料信息</Divider>
+      <div class="mx-4">
+        <LineList
+          :client-id="formData.clientId"
+          :form-type="formType"
+          :return-id="formData.id"
+          :sales-order-code="formData.salesOrderCode"
+        />
+      </div>
+    </template>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <Popconfirm
+          v-if="canSubmit"
+          title="确认提交该销售退货单？【提交后将不能修改】"
+          @confirm="handleSubmit"
+        >
+          <Button type="primary">提交</Button>
+        </Popconfirm>
+        <Popconfirm
+          v-if="isStock"
+          title="确认执行上架？"
+          @confirm="handleStock"
+        >
+          <Button type="primary">执行上架</Button>
+        </Popconfirm>
+        <Popconfirm
+          v-if="isFinish"
+          title="确认执行退货？执行后将进入待上架状态。"
+          @confirm="handleFinish"
+        >
+          <Button type="primary">执行退货</Button>
+        </Popconfirm>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/returnsales/modules/line-form.vue b/apps/web-antd/src/views/mes/wm/returnsales/modules/line-form.vue
new file mode 100644
index 000000000..0736b8bb3
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/returnsales/modules/line-form.vue
@@ -0,0 +1,102 @@
+<script lang="ts" setup>
+import type { MesWmReturnSalesLineApi } from '#/api/mes/wm/returnsales/line';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createReturnSalesLine,
+  getReturnSalesLine,
+  updateReturnSalesLine,
+} from '#/api/mes/wm/returnsales/line';
+import { $t } from '#/locales';
+
+import { useLineFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesWmReturnSalesLineApi.ReturnSalesLine>();
+const returnId = ref<number>(); // 所属退货单编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['销售退货单行'])
+    : $t('ui.actionTitle.create', ['销售退货单行']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 90,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmReturnSalesLineApi.ReturnSalesLine;
+    data.returnId = returnId.value;
+    try {
+      await (formData.value?.id
+        ? updateReturnSalesLine({ ...data, id: formData.value.id })
+        : createReturnSalesLine(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{
+      clientId?: number;
+      id?: number;
+      returnId: number;
+      salesOrderCode?: string;
+    }>();
+    returnId.value = data.returnId;
+    formApi.setState({
+      schema: useLineFormSchema(data.clientId, data.salesOrderCode),
+    });
+    if (!data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getReturnSalesLine(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/returnsales/modules/line-list.vue b/apps/web-antd/src/views/mes/wm/returnsales/modules/line-list.vue
new file mode 100644
index 000000000..316bbe8da
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/returnsales/modules/line-list.vue
@@ -0,0 +1,244 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmReturnSalesDetailApi } from '#/api/mes/wm/returnsales/detail';
+import type { MesWmReturnSalesLineApi } from '#/api/mes/wm/returnsales/line';
+
+import { computed, reactive } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getReturnSalesDetailListByLineId } from '#/api/mes/wm/returnsales/detail';
+import {
+  deleteReturnSalesLine,
+  getReturnSalesLinePage,
+} from '#/api/mes/wm/returnsales/line';
+import { $t } from '#/locales';
+import { PrinterLabel } from '#/views/mes/wm/barcode/components';
+
+import { type FormType, useLineGridColumns } from '../data';
+import DetailForm from './detail-form.vue';
+import DetailList from './detail-list.vue';
+import LineForm from './line-form.vue';
+
+const props = defineProps<{
+  clientId?: number;
+  formType: FormType;
+  returnId: number;
+  salesOrderCode?: string;
+}>();
+
+const isEditable = computed(() => // 是否可编辑明细行
+  ['create', 'update'].includes(props.formType),
+);
+const isStock = computed(() => props.formType === 'stock'); // 是否为上架模式
+const detailMap = reactive<
+  Record<number, MesWmReturnSalesDetailApi.ReturnSalesDetail[]>
+>({}); // 已展开行的上架明细缓存
+
+const [LineFormModal, lineFormModalApi] = useVbenModal({
+  connectedComponent: LineForm,
+  destroyOnClose: true,
+});
+
+const [DetailFormModal, detailFormModalApi] = useVbenModal({
+  connectedComponent: DetailForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  for (const id of Object.keys(detailMap)) {
+    delete detailMap[Number(id)];
+  }
+  gridApi.query();
+}
+
+/** 添加物料 */
+function handleCreate() {
+  lineFormModalApi
+    .setData({
+      clientId: props.clientId,
+      returnId: props.returnId,
+      salesOrderCode: props.salesOrderCode,
+    })
+    .open();
+}
+
+/** 编辑物料 */
+function handleEdit(row: MesWmReturnSalesLineApi.ReturnSalesLine) {
+  lineFormModalApi
+    .setData({
+      clientId: props.clientId,
+      id: row.id,
+      returnId: props.returnId,
+      salesOrderCode: props.salesOrderCode,
+    })
+    .open();
+}
+
+/** 删除物料 */
+async function handleDelete(row: MesWmReturnSalesLineApi.ReturnSalesLine) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.itemName]),
+    duration: 0,
+  });
+  try {
+    await deleteReturnSalesLine(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.itemName]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 上架：直接打开明细创建表单 */
+function handleStock(row: MesWmReturnSalesLineApi.ReturnSalesLine) {
+  openDetailForm(row.id!, row.itemId);
+}
+
+/** 打开上架明细表单 */
+function openDetailForm(lineId: number, itemId?: number, detailId?: number) {
+  detailFormModalApi
+    .setData({ detailId, itemId, lineId, returnId: props.returnId })
+    .open();
+}
+
+/** 获取已展开行的上架明细 */
+function getExpandedDetails(row: MesWmReturnSalesLineApi.ReturnSalesLine) {
+  return detailMap[row.id!] || [];
+}
+
+/** 加载指定行的上架明细 */
+async function loadLineDetails(lineId: number) {
+  detailMap[lineId] = await getReturnSalesDetailListByLineId(lineId);
+}
+
+/** 展开行时懒加载上架明细 */
+async function handleExpandChange(
+  row: MesWmReturnSalesLineApi.ReturnSalesLine,
+  expanded: boolean,
+) {
+  if (!expanded) {
+    return;
+  }
+  await loadLineDetails(row.id!);
+}
+
+/** 明细表单提交成功后，刷新对应行已展开的明细 */
+async function handleDetailSuccess(lineId: number) {
+  await loadLineDetails(lineId);
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useLineGridColumns(isEditable.value, isStock.value),
+    expandConfig: {
+      padding: true,
+    },
+    height: 400,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.returnId) {
+            return { list: [], total: 0 };
+          }
+          return await getReturnSalesLinePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            returnId: props.returnId,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesWmReturnSalesLineApi.ReturnSalesLine>,
+  gridEvents: {
+    toggleRowExpand: ({
+      expanded,
+      row,
+    }: {
+      expanded: boolean;
+      row: MesWmReturnSalesLineApi.ReturnSalesLine;
+    }) => {
+      handleExpandChange(row, expanded);
+    },
+  },
+});
+</script>
+
+<template>
+  <div>
+    <LineFormModal @success="handleRefresh" />
+    <DetailFormModal @success="handleDetailSuccess" />
+    <Grid table-title="物料信息">
+      <template v-if="isEditable" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '添加物料',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #detail="{ row }">
+        <DetailList
+          :details="getExpandedDetails(row)"
+          :form-type="formType"
+          @edit="(detailId) => openDetailForm(row.id!, row.itemId, detailId)"
+          @refresh="loadLineDetails(row.id!)"
+        />
+      </template>
+      <template #actions="{ row }">
+        <div class="flex items-center justify-center">
+          <TableAction
+            :actions="[
+              {
+                label: $t('common.edit'),
+                type: 'link',
+                icon: ACTION_ICON.EDIT,
+                ifShow: isEditable,
+                onClick: handleEdit.bind(null, row),
+              },
+              {
+                label: $t('common.delete'),
+                type: 'link',
+                danger: true,
+                icon: ACTION_ICON.DELETE,
+                ifShow: isEditable,
+                popConfirm: {
+                  title: $t('ui.actionMessage.deleteConfirm', [row.itemName]),
+                  confirm: handleDelete.bind(null, row),
+                },
+              },
+              {
+                label: '上架',
+                type: 'link',
+                ifShow: isStock,
+                onClick: handleStock.bind(null, row),
+              },
+            ]"
+          />
+          <PrinterLabel
+            v-if="isStock"
+            :biz-code="row.batchCode"
+            :biz-id="row.batchId"
+            biz-type="BATCH"
+          />
+        </div>
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/returnvendor/data.ts b/apps/web-antd/src/views/mes/wm/returnvendor/data.ts
new file mode 100644
index 000000000..0b4d33526
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/returnvendor/data.ts
@@ -0,0 +1,533 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmMaterialStockApi } from '#/api/mes/wm/materialstock';
+import type { MesWmReturnVendorApi } from '#/api/mes/wm/returnvendor';
+import type { MesWmReturnVendorDetailApi } from '#/api/mes/wm/returnvendor/detail';
+import type { MesWmReturnVendorLineApi } from '#/api/mes/wm/returnvendor/line';
+
+import { h, markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+
+import { Button } from 'ant-design-vue';
+
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
+import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
+import { WmBatchSelect } from '#/views/mes/wm/batch/components';
+import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
+import {
+  WmWarehouseAreaSelect,
+  WmWarehouseLocationSelect,
+  WmWarehouseSelect,
+} from '#/views/mes/wm/warehouse/components';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'finish' | 'stock' | 'update';
+
+/** 表单头部是否只读（拣货、详情、完成态） */
+function isHeaderReadonly(formType: FormType): boolean {
+  return (
+    formType === 'detail' || formType === 'finish' || formType === 'stock'
+  );
+}
+
+/** 新增/修改的表单 */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'status',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '退货单编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入退货单编号',
+      },
+      rules: 'required',
+      suffix: isHeaderReadonly(formType)
+        ? undefined
+        : () =>
+            h(
+              Button,
+              {
+                type: 'default',
+                onClick: async () => {
+                  const code = await generateAutoCode(
+                    MesAutoCodeRuleCode.WM_RETURN_VENDOR_CODE,
+                  );
+                  await formApi?.setFieldValue('code', code);
+                },
+              },
+              { default: () => '生成' },
+            ),
+    },
+    {
+      fieldName: 'name',
+      label: '退货单名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入退货单名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'purchaseOrderCode',
+      label: '采购订单号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入采购订单号',
+      },
+    },
+    {
+      fieldName: 'vendorId',
+      label: '供应商',
+      component: markRaw(MdVendorSelect),
+      componentProps: {
+        placeholder: '请选择供应商',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'returnDate',
+      label: '退货日期',
+      component: 'DatePicker',
+      componentProps: {
+        class: '!w-full',
+        format: 'YYYY-MM-DD HH:mm:ss',
+        placeholder: '请选择退货日期',
+        showTime: true,
+        valueFormat: 'x',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'returnReason',
+      label: '退货原因',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入退货原因',
+        rows: 2,
+      },
+    },
+    {
+      fieldName: 'transportCode',
+      label: '运单号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入运单号',
+      },
+    },
+    {
+      fieldName: 'transportTelephone',
+      label: '联系电话',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入联系电话',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '退货单编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入退货单编号',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '退货单名称',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入退货单名称',
+      },
+    },
+    {
+      fieldName: 'purchaseOrderCode',
+      label: '采购订单编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入采购订单编号',
+      },
+    },
+    {
+      fieldName: 'vendorId',
+      label: '供应商',
+      component: markRaw(MdVendorSelect),
+      componentProps: {
+        placeholder: '请选择供应商',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesWmReturnVendorApi.ReturnVendor>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '退货单编号',
+      minWidth: 160,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '退货单名称',
+      minWidth: 150,
+    },
+    {
+      field: 'purchaseOrderCode',
+      title: '采购订单号',
+      minWidth: 140,
+    },
+    {
+      field: 'vendorCode',
+      title: '供应商编码',
+      minWidth: 120,
+    },
+    {
+      field: 'vendorName',
+      title: '供应商名称',
+      minWidth: 150,
+    },
+    {
+      field: 'returnDate',
+      title: '退货日期',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      minWidth: 110,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_RETURN_VENDOR_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 240,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 退货单行子表的字段 */
+export function useLineGridColumns(
+  editable: boolean,
+  stockable: boolean,
+): VxeTableGridOptions<MesWmReturnVendorLineApi.ReturnVendorLine>['columns'] {
+  return [
+    {
+      type: 'expand',
+      width: 48,
+      slots: { content: 'detail' },
+    },
+    {
+      field: 'itemCode',
+      title: '物料编码',
+      minWidth: 120,
+    },
+    {
+      field: 'itemName',
+      title: '物料名称',
+      minWidth: 140,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'quantity',
+      title: '退货数量',
+      width: 100,
+    },
+    {
+      field: 'batchCode',
+      title: '批次号',
+      minWidth: 120,
+    },
+    ...(editable || stockable
+      ? [
+          {
+            title: '操作',
+            width: 160,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 退货单行新增/修改的表单 */
+export function useLineFormSchema(
+  vendorId?: number,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'itemId',
+      label: '产品物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择产品物料',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'quantity',
+      label: '退货数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入退货数量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'batchId',
+      label: '批次号',
+      component: markRaw(WmBatchSelect),
+      componentProps: {
+        // 选择批次后同步批次号
+        onChange: async (batch?: { code?: string }) => {
+          await formApi?.setFieldValue('batchCode', batch?.code);
+        },
+        vendorId,
+      },
+      dependencies: {
+        triggerFields: ['itemId'],
+        componentProps: (values) => ({
+          itemId: values.itemId,
+          vendorId,
+        }),
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 拣货明细子表的字段 */
+export function useDetailGridColumns(
+  stockable: boolean,
+): VxeTableGridOptions<MesWmReturnVendorDetailApi.ReturnVendorDetail>['columns'] {
+  return [
+    {
+      field: 'batchCode',
+      title: '批次号',
+      minWidth: 120,
+    },
+    {
+      field: 'warehouseName',
+      title: '仓库名称',
+      minWidth: 100,
+    },
+    {
+      field: 'locationName',
+      title: '库区名称',
+      minWidth: 100,
+    },
+    {
+      field: 'areaName',
+      title: '库位名称',
+      minWidth: 100,
+    },
+    {
+      field: 'quantity',
+      title: '数量',
+      width: 100,
+    },
+    ...(stockable
+      ? [
+          {
+            title: '操作',
+            width: 120,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 拣货明细新增/修改的表单 */
+export function useDetailFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'quantityMax',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'materialStockId',
+      label: '库存记录',
+      component: markRaw(WmMaterialStockSelect),
+      componentProps: {
+        // 选择库存记录后，自动回填仓库/库区/库位/批次/数量
+        onChange: async (stock?: MesWmMaterialStockApi.MaterialStock) => {
+          await formApi?.setValues({
+            areaId: stock?.areaId,
+            batchCode: stock?.batchCode,
+            batchId: stock?.batchId,
+            locationId: stock?.locationId,
+            quantity: stock?.quantity,
+            quantityMax: stock?.quantity,
+            warehouseId: stock?.warehouseId,
+          });
+        },
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['itemId'],
+        componentProps: (values) => ({
+          itemId: values.itemId,
+        }),
+      },
+    },
+    {
+      fieldName: 'quantity',
+      label: '数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入数量',
+        precision: 2,
+      },
+      rules: 'required',
+      dependencies: {
+        triggerFields: ['quantityMax'],
+        componentProps: (values) => ({
+          class: '!w-full',
+          max: values.quantityMax,
+          min: 0,
+          placeholder: '请输入数量',
+          precision: 2,
+        }),
+      },
+    },
+    {
+      fieldName: 'warehouseId',
+      label: '仓库',
+      component: markRaw(WmWarehouseSelect),
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'locationId',
+      label: '库区',
+      component: markRaw(WmWarehouseLocationSelect),
+      componentProps: {
+        disabled: true,
+      },
+      dependencies: {
+        triggerFields: ['warehouseId'],
+        componentProps: (values) => ({
+          disabled: true,
+          warehouseId: values.warehouseId,
+        }),
+      },
+    },
+    {
+      fieldName: 'areaId',
+      label: '库位',
+      component: markRaw(WmWarehouseAreaSelect),
+      componentProps: {
+        disabled: true,
+      },
+      dependencies: {
+        triggerFields: ['locationId'],
+        componentProps: (values) => ({
+          disabled: true,
+          locationId: values.locationId,
+        }),
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+      },
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/wm/returnvendor/index.vue b/apps/web-antd/src/views/mes/wm/returnvendor/index.vue
new file mode 100644
index 000000000..eaa32e016
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/returnvendor/index.vue
@@ -0,0 +1,209 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmReturnVendorApi } from '#/api/mes/wm/returnvendor';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { Button, message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  cancelReturnVendor,
+  deleteReturnVendor,
+  exportReturnVendor,
+  getReturnVendorPage,
+} from '#/api/mes/wm/returnvendor';
+import { $t } from '#/locales';
+import { MesWmReturnVendorStatusEnum } from '#/views/mes/utils/constants';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建供应商退货单 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看供应商退货单 */
+function handleDetail(row: MesWmReturnVendorApi.ReturnVendor) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑供应商退货单 */
+function handleEdit(row: MesWmReturnVendorApi.ReturnVendor) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 执行拣货 */
+function handleStock(row: MesWmReturnVendorApi.ReturnVendor) {
+  formModalApi.setData({ formType: 'stock', id: row.id }).open();
+}
+
+/** 完成退货 */
+function handleFinish(row: MesWmReturnVendorApi.ReturnVendor) {
+  formModalApi.setData({ formType: 'finish', id: row.id }).open();
+}
+
+/** 删除供应商退货单 */
+async function handleDelete(row: MesWmReturnVendorApi.ReturnVendor) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.code]),
+    duration: 0,
+  });
+  try {
+    await deleteReturnVendor(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 取消供应商退货单 */
+async function handleCancel(row: MesWmReturnVendorApi.ReturnVendor) {
+  await cancelReturnVendor(row.id!);
+  message.success('取消成功');
+  handleRefresh();
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportReturnVendor(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '供应商退货单.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getReturnVendorPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmReturnVendorApi.ReturnVendor>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】到货通知、采购入库、采购退货"
+        url="https://doc.iocoder.cn/mes/wm/purchase-in/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="供应商退货单列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['供应商退货单']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-return-vendor:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:wm-return-vendor:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <Button type="link" @click="handleDetail(row)">
+          {{ row.code }}
+        </Button>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:wm-return-vendor:update'],
+              ifShow: row.status === MesWmReturnVendorStatusEnum.PREPARE,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm-return-vendor:delete'],
+              ifShow: row.status === MesWmReturnVendorStatusEnum.PREPARE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '执行拣货',
+              type: 'link',
+              auth: ['mes:wm-return-vendor:update'],
+              ifShow: row.status === MesWmReturnVendorStatusEnum.APPROVING,
+              onClick: handleStock.bind(null, row),
+            },
+            {
+              label: '完成退货',
+              type: 'link',
+              auth: ['mes:wm-return-vendor:update-status'],
+              ifShow: row.status === MesWmReturnVendorStatusEnum.APPROVED,
+              onClick: handleFinish.bind(null, row),
+            },
+            {
+              label: '取消',
+              type: 'link',
+              danger: true,
+              auth: ['mes:wm-return-vendor:update'],
+              ifShow:
+                row.status === MesWmReturnVendorStatusEnum.APPROVING ||
+                row.status === MesWmReturnVendorStatusEnum.APPROVED,
+              popConfirm: {
+                title: '确认取消该供应商退货单？取消后不可恢复。',
+                confirm: handleCancel.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/returnvendor/modules/detail-form.vue b/apps/web-antd/src/views/mes/wm/returnvendor/modules/detail-form.vue
new file mode 100644
index 000000000..f4a27886b
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/returnvendor/modules/detail-form.vue
@@ -0,0 +1,104 @@
+<script lang="ts" setup>
+import type { MesWmReturnVendorDetailApi } from '#/api/mes/wm/returnvendor/detail';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createReturnVendorDetail,
+  getReturnVendorDetail,
+  updateReturnVendorDetail,
+} from '#/api/mes/wm/returnvendor/detail';
+import { $t } from '#/locales';
+
+import { useDetailFormSchema } from '../data';
+
+const emit = defineEmits<{ success: [lineId: number] }>();
+const formData = ref<MesWmReturnVendorDetailApi.ReturnVendorDetail>();
+const returnId = ref<number>(); // 所属退货单编号
+const lineId = ref<number>(); // 所属退货单行编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['拣货明细'])
+    : $t('ui.actionTitle.create', ['拣货明细']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 90,
+  },
+  layout: 'horizontal',
+  schema: useDetailFormSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmReturnVendorDetailApi.ReturnVendorDetail;
+    data.returnId = returnId.value;
+    data.lineId = lineId.value;
+    try {
+      await (formData.value?.id
+        ? updateReturnVendorDetail({ ...data, id: formData.value.id })
+        : createReturnVendorDetail(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success', lineId.value!);
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    formApi.setState({ schema: useDetailFormSchema(formApi) });
+    // 加载数据
+    const data = modalApi.getData<{
+      detailId?: number;
+      itemId?: number;
+      lineId: number;
+      returnId: number;
+    }>();
+    returnId.value = data.returnId;
+    lineId.value = data.lineId;
+    if (data.detailId) {
+      modalApi.lock();
+      try {
+        formData.value = await getReturnVendorDetail(data.detailId);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    } else if (data.itemId) {
+      await formApi.setFieldValue('itemId', data.itemId);
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/returnvendor/modules/detail-list.vue b/apps/web-antd/src/views/mes/wm/returnvendor/modules/detail-list.vue
new file mode 100644
index 000000000..4f91e3148
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/returnvendor/modules/detail-list.vue
@@ -0,0 +1,103 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmReturnVendorDetailApi } from '#/api/mes/wm/returnvendor/detail';
+
+import { computed, watch } from 'vue';
+
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { deleteReturnVendorDetail } from '#/api/mes/wm/returnvendor/detail';
+import { $t } from '#/locales';
+
+import { type FormType, useDetailGridColumns } from '../data';
+
+const props = defineProps<{
+  details: MesWmReturnVendorDetailApi.ReturnVendorDetail[];
+  formType: FormType;
+}>();
+
+const emit = defineEmits<{
+  edit: [detailId: number];
+  refresh: [];
+}>();
+
+const isStock = computed(() => props.formType === 'stock'); // 是否为拣货模式
+
+/** 编辑拣货明细 */
+function handleEdit(row: MesWmReturnVendorDetailApi.ReturnVendorDetail) {
+  emit('edit', row.id!);
+}
+
+/** 删除拣货明细 */
+async function handleDelete(
+  row: MesWmReturnVendorDetailApi.ReturnVendorDetail,
+) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.warehouseName]),
+    duration: 0,
+  });
+  try {
+    await deleteReturnVendorDetail(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.warehouseName]));
+    emit('refresh');
+  } finally {
+    hideLoading();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    border: true,
+    columns: useDetailGridColumns(isStock.value),
+    data: props.details,
+    pagerConfig: {
+      enabled: false,
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    size: 'small',
+    toolbarConfig: {
+      enabled: false,
+    },
+  } as VxeTableGridOptions<MesWmReturnVendorDetailApi.ReturnVendorDetail>,
+});
+
+watch(
+  () => props.details,
+  (details) => gridApi.setGridOptions({ data: details }),
+);
+</script>
+
+<template>
+  <div class="px-4 py-2">
+    <Grid>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [
+                  row.warehouseName,
+                ]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/returnvendor/modules/form.vue b/apps/web-antd/src/views/mes/wm/returnvendor/modules/form.vue
new file mode 100644
index 000000000..137cab234
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/returnvendor/modules/form.vue
@@ -0,0 +1,238 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesWmReturnVendorApi } from '#/api/mes/wm/returnvendor';
+
+import { computed, ref } from 'vue';
+
+import { confirm, useVbenModal } from '@vben/common-ui';
+
+import { Button, Divider, message, Popconfirm } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  checkReturnVendorQuantity,
+  createReturnVendor,
+  finishReturnVendor,
+  getReturnVendor,
+  stockReturnVendor,
+  submitReturnVendor,
+  updateReturnVendor,
+} from '#/api/mes/wm/returnvendor';
+import { $t } from '#/locales';
+import { MesWmReturnVendorStatusEnum } from '#/views/mes/utils/constants';
+
+import { useFormSchema } from '../data';
+import LineList from './line-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesWmReturnVendorApi.ReturnVendor>();
+const originalSnapshot = ref(''); // 表单原始数据快照，用于提交时跳过未变更的保存请求
+const isEditable = computed(() => // 是否为编辑模式（可保存）
+  ['create', 'update'].includes(formType.value),
+);
+const isStock = computed(() => formType.value === 'stock'); // 是否为拣货模式
+const isFinish = computed(() => formType.value === 'finish'); // 是否为完成退货模式
+const canSubmit = computed(() => // 是否可提交
+  formType.value === 'update' &&
+  formData.value?.status === MesWmReturnVendorStatusEnum.PREPARE,
+);
+const getTitle = computed(() => {
+  switch (formType.value) {
+    case 'detail': {
+      return $t('ui.actionTitle.view', ['供应商退货单']);
+    }
+    case 'finish': {
+      return '完成退货';
+    }
+    case 'stock': {
+      return '执行拣货';
+    }
+    case 'update': {
+      return $t('ui.actionTitle.edit', ['供应商退货单']);
+    }
+    default: {
+      return $t('ui.actionTitle.create', ['供应商退货单']);
+    }
+  }
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+/** 提交退货单：表单有修改时先保存，再调用提交接口 */
+async function handleSubmit() {
+  const { valid } = await formApi.validate();
+  if (!valid || !formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    const current = JSON.stringify(await formApi.getValues());
+    if (current !== originalSnapshot.value) {
+      const data =
+        (await formApi.getValues()) as MesWmReturnVendorApi.ReturnVendor;
+      await updateReturnVendor({ ...formData.value, ...data });
+      originalSnapshot.value = current;
+    }
+    await submitReturnVendor(formData.value.id);
+    message.success('提交成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 执行拣货：拣货数量与退货数量不一致时二次确认 */
+async function handleStock() {
+  if (!formData.value?.id) {
+    return;
+  }
+  const quantityMatch = await checkReturnVendorQuantity(formData.value.id);
+  if (!quantityMatch) {
+    try {
+      await confirm('退货数量与拣货数量不一致，确认执行拣货？');
+    } catch {
+      return;
+    }
+  }
+  modalApi.lock();
+  try {
+    await stockReturnVendor(formData.value.id);
+    message.success('拣货成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 完成退货 */
+async function handleFinish() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await finishReturnVendor(formData.value.id);
+    message.success('完成成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (!isEditable.value) {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmReturnVendorApi.ReturnVendor;
+    try {
+      if (formData.value?.id) {
+        await updateReturnVendor({ ...formData.value, ...data });
+        formData.value = { ...formData.value, ...data };
+      } else {
+        const id = await createReturnVendor(data);
+        formData.value = {
+          ...data,
+          id,
+          status: MesWmReturnVendorStatusEnum.PREPARE,
+        };
+        await formApi.setFieldValue('id', id);
+        await formApi.setFieldValue('status', formData.value.status);
+        formType.value = 'update';
+      }
+      originalSnapshot.value = JSON.stringify(await formApi.getValues());
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      originalSnapshot.value = '';
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    formApi.setDisabled(!isEditable.value);
+    modalApi.setState({ showConfirmButton: isEditable.value });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getReturnVendor(data.id);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    }
+    originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+    <!-- 非新建模式展示物料信息 -->
+    <template v-if="formData?.id">
+      <Divider>物料信息</Divider>
+      <div class="mx-4">
+        <LineList
+          :form-type="formType"
+          :return-id="formData.id"
+          :vendor-id="formData.vendorId"
+        />
+      </div>
+    </template>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <Popconfirm
+          v-if="canSubmit"
+          title="确认提交该退货单？【提交后将不能修改】"
+          @confirm="handleSubmit"
+        >
+          <Button type="primary">提交</Button>
+        </Popconfirm>
+        <Button v-if="isStock" type="primary" @click="handleStock">
+          执行拣货
+        </Button>
+        <Popconfirm
+          v-if="isFinish"
+          title="确认完成该退货单并执行退货？"
+          @confirm="handleFinish"
+        >
+          <Button type="primary">完成退货</Button>
+        </Popconfirm>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/returnvendor/modules/line-form.vue b/apps/web-antd/src/views/mes/wm/returnvendor/modules/line-form.vue
new file mode 100644
index 000000000..a7bf7a6b7
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/returnvendor/modules/line-form.vue
@@ -0,0 +1,99 @@
+<script lang="ts" setup>
+import type { MesWmReturnVendorLineApi } from '#/api/mes/wm/returnvendor/line';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createReturnVendorLine,
+  getReturnVendorLine,
+  updateReturnVendorLine,
+} from '#/api/mes/wm/returnvendor/line';
+import { $t } from '#/locales';
+
+import { useLineFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesWmReturnVendorLineApi.ReturnVendorLine>();
+const returnId = ref<number>(); // 所属退货单编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['供应商退货单行'])
+    : $t('ui.actionTitle.create', ['供应商退货单行']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 90,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmReturnVendorLineApi.ReturnVendorLine;
+    data.returnId = returnId.value;
+    try {
+      await (formData.value?.id
+        ? updateReturnVendorLine({ ...data, id: formData.value.id })
+        : createReturnVendorLine(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{
+      id?: number;
+      returnId: number;
+      vendorId?: number;
+    }>();
+    returnId.value = data.returnId;
+    formApi.setState({ schema: useLineFormSchema(data.vendorId, formApi) });
+    if (!data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getReturnVendorLine(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/returnvendor/modules/line-list.vue b/apps/web-antd/src/views/mes/wm/returnvendor/modules/line-list.vue
new file mode 100644
index 000000000..987144edb
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/returnvendor/modules/line-list.vue
@@ -0,0 +1,234 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmReturnVendorDetailApi } from '#/api/mes/wm/returnvendor/detail';
+import type { MesWmReturnVendorLineApi } from '#/api/mes/wm/returnvendor/line';
+
+import { computed, reactive } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getReturnVendorDetailListByLineId } from '#/api/mes/wm/returnvendor/detail';
+import {
+  deleteReturnVendorLine,
+  getReturnVendorLinePage,
+} from '#/api/mes/wm/returnvendor/line';
+import { $t } from '#/locales';
+import { PrinterLabel } from '#/views/mes/wm/barcode/components';
+
+import { type FormType, useLineGridColumns } from '../data';
+import DetailForm from './detail-form.vue';
+import DetailList from './detail-list.vue';
+import LineForm from './line-form.vue';
+
+const props = defineProps<{
+  formType: FormType;
+  returnId: number;
+  vendorId?: number;
+}>();
+
+const isEditable = computed(() => // 是否可编辑明细行
+  ['create', 'update'].includes(props.formType),
+);
+const isStock = computed(() => props.formType === 'stock'); // 是否为拣货模式
+const detailMap = reactive<
+  Record<number, MesWmReturnVendorDetailApi.ReturnVendorDetail[]>
+>({}); // 已展开行的拣货明细缓存
+
+const [LineFormModal, lineFormModalApi] = useVbenModal({
+  connectedComponent: LineForm,
+  destroyOnClose: true,
+});
+
+const [DetailFormModal, detailFormModalApi] = useVbenModal({
+  connectedComponent: DetailForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  for (const id of Object.keys(detailMap)) {
+    delete detailMap[Number(id)];
+  }
+  gridApi.query();
+}
+
+/** 添加物料 */
+function handleCreate() {
+  lineFormModalApi
+    .setData({ returnId: props.returnId, vendorId: props.vendorId })
+    .open();
+}
+
+/** 编辑物料 */
+function handleEdit(row: MesWmReturnVendorLineApi.ReturnVendorLine) {
+  lineFormModalApi
+    .setData({ id: row.id, returnId: props.returnId, vendorId: props.vendorId })
+    .open();
+}
+
+/** 删除物料 */
+async function handleDelete(row: MesWmReturnVendorLineApi.ReturnVendorLine) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.itemName]),
+    duration: 0,
+  });
+  try {
+    await deleteReturnVendorLine(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.itemName]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 拣货：直接打开明细创建表单 */
+function handlePicking(row: MesWmReturnVendorLineApi.ReturnVendorLine) {
+  openDetailForm(row.id!, row.itemId);
+}
+
+/** 打开拣货明细表单 */
+function openDetailForm(lineId: number, itemId?: number, detailId?: number) {
+  detailFormModalApi
+    .setData({ detailId, itemId, lineId, returnId: props.returnId })
+    .open();
+}
+
+/** 获取已展开行的拣货明细 */
+function getExpandedDetails(row: MesWmReturnVendorLineApi.ReturnVendorLine) {
+  return detailMap[row.id!] || [];
+}
+
+/** 加载指定行的拣货明细 */
+async function loadLineDetails(lineId: number) {
+  detailMap[lineId] = await getReturnVendorDetailListByLineId(lineId);
+}
+
+/** 展开行时懒加载拣货明细 */
+async function handleExpandChange(
+  row: MesWmReturnVendorLineApi.ReturnVendorLine,
+  expanded: boolean,
+) {
+  if (!expanded) {
+    return;
+  }
+  await loadLineDetails(row.id!);
+}
+
+/** 明细表单提交成功后，刷新对应行已展开的明细 */
+async function handleDetailSuccess(lineId: number) {
+  await loadLineDetails(lineId);
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useLineGridColumns(isEditable.value, isStock.value),
+    expandConfig: {
+      padding: true,
+    },
+    height: 400,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.returnId) {
+            return { list: [], total: 0 };
+          }
+          return await getReturnVendorLinePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            returnId: props.returnId,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesWmReturnVendorLineApi.ReturnVendorLine>,
+  gridEvents: {
+    toggleRowExpand: ({
+      expanded,
+      row,
+    }: {
+      expanded: boolean;
+      row: MesWmReturnVendorLineApi.ReturnVendorLine;
+    }) => {
+      handleExpandChange(row, expanded);
+    },
+  },
+});
+</script>
+
+<template>
+  <div>
+    <LineFormModal @success="handleRefresh" />
+    <DetailFormModal @success="handleDetailSuccess" />
+    <Grid table-title="物料信息">
+      <template v-if="isEditable" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '添加物料',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #detail="{ row }">
+        <DetailList
+          :details="getExpandedDetails(row)"
+          :form-type="formType"
+          @edit="(detailId) => openDetailForm(row.id!, row.itemId, detailId)"
+          @refresh="loadLineDetails(row.id!)"
+        />
+      </template>
+      <template #actions="{ row }">
+        <div class="flex items-center justify-center">
+          <TableAction
+            :actions="[
+              {
+                label: $t('common.edit'),
+                type: 'link',
+                icon: ACTION_ICON.EDIT,
+                ifShow: isEditable,
+                onClick: handleEdit.bind(null, row),
+              },
+              {
+                label: $t('common.delete'),
+                type: 'link',
+                danger: true,
+                icon: ACTION_ICON.DELETE,
+                ifShow: isEditable,
+                popConfirm: {
+                  title: $t('ui.actionMessage.deleteConfirm', [row.itemName]),
+                  confirm: handleDelete.bind(null, row),
+                },
+              },
+              {
+                label: '拣货',
+                type: 'link',
+                ifShow: isStock,
+                onClick: handlePicking.bind(null, row),
+              },
+            ]"
+          />
+          <PrinterLabel
+            v-if="isStock"
+            :biz-code="row.batchCode"
+            :biz-id="row.batchId"
+            biz-type="BATCH"
+          />
+        </div>
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/returnissue/data.ts b/apps/web-ele/src/views/mes/wm/returnissue/data.ts
new file mode 100644
index 000000000..1c7af56c6
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/returnissue/data.ts
@@ -0,0 +1,571 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmMaterialStockApi } from '#/api/mes/wm/materialstock';
+import type { MesWmReturnIssueApi } from '#/api/mes/wm/returnissue';
+import type { MesWmReturnIssueDetailApi } from '#/api/mes/wm/returnissue/detail';
+import type { MesWmReturnIssueLineApi } from '#/api/mes/wm/returnissue/line';
+
+import { h, markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { ElButton } from 'element-plus';
+
+import { z } from '#/adapter/form';
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import MdWorkstationSelect from '#/views/mes/md/workstation/components/md-workstation-select.vue';
+import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
+import {
+  MesAutoCodeRuleCode,
+  MesProWorkOrderStatusEnum,
+} from '#/views/mes/utils/constants';
+import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
+import {
+  WmWarehouseAreaSelect,
+  WmWarehouseLocationSelect,
+  WmWarehouseSelect,
+} from '#/views/mes/wm/warehouse/components';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'finish' | 'stock' | 'update';
+
+/** 表单头部是否只读（上架、详情、执行退料态） */
+function isHeaderReadonly(formType: FormType): boolean {
+  return (
+    formType === 'detail' || formType === 'finish' || formType === 'stock'
+  );
+}
+
+/** 新增/修改的表单 */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'status',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '退料单编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入退料单编号',
+      },
+      rules: 'required',
+      suffix: isHeaderReadonly(formType)
+        ? undefined
+        : () =>
+            h(
+              ElButton,
+              {
+                onClick: async () => {
+                  const code = await generateAutoCode(
+                    MesAutoCodeRuleCode.WM_RETURN_ISSUE_CODE,
+                  );
+                  await formApi?.setFieldValue('code', code);
+                },
+              },
+              { default: () => '生成' },
+            ),
+    },
+    {
+      fieldName: 'name',
+      label: '退料单名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入退料单名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'type',
+      label: '退料类型',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_WM_RETURN_ISSUE_TYPE, 'number'),
+        placeholder: '请选择退料类型',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'workOrderId',
+      label: '生产工单',
+      component: markRaw(ProWorkOrderSelect),
+      componentProps: {
+        status: MesProWorkOrderStatusEnum.CONFIRMED,
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'workstationId',
+      label: '工作站',
+      component: markRaw(MdWorkstationSelect),
+      componentProps: {
+        placeholder: '请选择工作站',
+      },
+    },
+    {
+      fieldName: 'returnDate',
+      label: '退料日期',
+      component: 'DatePicker',
+      componentProps: {
+        class: '!w-full',
+        format: 'YYYY-MM-DD HH:mm:ss',
+        placeholder: '请选择退料日期',
+        type: 'datetime',
+        valueFormat: 'x',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '退料单编号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入退料单编号',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '退料单名称',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入退料单名称',
+      },
+    },
+    {
+      fieldName: 'workOrderId',
+      label: '生产工单',
+      component: markRaw(ProWorkOrderSelect),
+      componentProps: {
+        placeholder: '请选择生产工单',
+      },
+    },
+    {
+      fieldName: 'type',
+      label: '退料类型',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_WM_RETURN_ISSUE_TYPE, 'number'),
+        placeholder: '请选择退料类型',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesWmReturnIssueApi.ReturnIssue>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '退料单编号',
+      minWidth: 160,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '退料单名称',
+      minWidth: 150,
+    },
+    {
+      field: 'type',
+      title: '退料类型',
+      minWidth: 110,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_RETURN_ISSUE_TYPE },
+      },
+    },
+    {
+      field: 'workOrderCode',
+      title: '生产工单',
+      minWidth: 140,
+    },
+    {
+      field: 'workstationName',
+      title: '工作站',
+      minWidth: 120,
+    },
+    {
+      field: 'returnDate',
+      title: '退料日期',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      minWidth: 110,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_RETURN_ISSUE_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 240,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 退料单行子表的字段 */
+export function useLineGridColumns(
+  editable: boolean,
+  stockable: boolean,
+): VxeTableGridOptions<MesWmReturnIssueLineApi.ReturnIssueLine>['columns'] {
+  return [
+    {
+      type: 'expand',
+      width: 48,
+      slots: { content: 'detail' },
+    },
+    {
+      field: 'itemCode',
+      title: '物料编码',
+      minWidth: 120,
+    },
+    {
+      field: 'itemName',
+      title: '物料名称',
+      minWidth: 140,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'quantity',
+      title: '退料数量',
+      width: 100,
+    },
+    {
+      field: 'batchCode',
+      title: '批次号',
+      minWidth: 120,
+    },
+    {
+      field: 'rqcCheckFlag',
+      title: '是否检测',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+      },
+    },
+    {
+      field: 'qualityStatus',
+      title: '质量状态',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_QUALITY_STATUS },
+      },
+    },
+    ...(editable || stockable
+      ? [
+          {
+            title: '操作',
+            width: 200,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 退料单行新增/修改的表单 */
+export function useLineFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'materialStockId',
+      label: '库存记录',
+      component: markRaw(WmMaterialStockSelect),
+      componentProps: {
+        // 选择库存记录后，自动回填物料/批次/数量
+        onChange: async (stock?: MesWmMaterialStockApi.MaterialStock) => {
+          await formApi?.setValues({
+            batchCode: stock?.batchCode,
+            batchId: stock?.batchId,
+            itemId: stock?.itemId,
+            quantity: stock?.quantity,
+            quantityMax: stock?.quantity,
+          });
+        },
+        virtualFilter: 'only',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'quantityMax',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'quantity',
+      label: '退料数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入退料数量',
+        precision: 2,
+      },
+      rules: 'required',
+      dependencies: {
+        triggerFields: ['quantityMax'],
+        componentProps: (values) => ({
+          class: '!w-full',
+          controlsPosition: 'right',
+          max: values.quantityMax,
+          min: 0,
+          placeholder: '请输入退料数量',
+          precision: 2,
+        }),
+      },
+    },
+    {
+      fieldName: 'rqcCheckFlag',
+      label: '需要质检',
+      component: 'Switch',
+      rules: z.boolean().default(false),
+    },
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+        placeholder: '选择库存后自动带出',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 上架明细子表的字段 */
+export function useDetailGridColumns(
+  stockable: boolean,
+): VxeTableGridOptions<MesWmReturnIssueDetailApi.ReturnIssueDetail>['columns'] {
+  return [
+    {
+      field: 'batchCode',
+      title: '批次号',
+      minWidth: 120,
+    },
+    {
+      field: 'warehouseName',
+      title: '仓库名称',
+      minWidth: 100,
+    },
+    {
+      field: 'locationName',
+      title: '库区名称',
+      minWidth: 100,
+    },
+    {
+      field: 'areaName',
+      title: '库位名称',
+      minWidth: 100,
+    },
+    {
+      field: 'quantity',
+      title: '数量',
+      width: 100,
+    },
+    ...(stockable
+      ? [
+          {
+            title: '操作',
+            width: 120,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 上架明细新增/修改的表单 */
+export function useDetailFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'quantityMax',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'materialStockId',
+      label: '库存记录',
+      component: markRaw(WmMaterialStockSelect),
+      componentProps: {
+        // 选择库存记录后，自动回填仓库/库区/库位/批次/数量
+        onChange: async (stock?: MesWmMaterialStockApi.MaterialStock) => {
+          await formApi?.setValues({
+            areaId: stock?.areaId,
+            batchCode: stock?.batchCode,
+            batchId: stock?.batchId,
+            locationId: stock?.locationId,
+            quantity: stock?.quantity,
+            quantityMax: stock?.quantity,
+            warehouseId: stock?.warehouseId,
+          });
+        },
+        virtualFilter: 'only',
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['itemId'],
+        componentProps: (values) => ({
+          itemId: values.itemId,
+          virtualFilter: 'only',
+        }),
+      },
+    },
+    {
+      fieldName: 'quantity',
+      label: '数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入数量',
+        precision: 2,
+      },
+      rules: 'required',
+      dependencies: {
+        triggerFields: ['quantityMax'],
+        componentProps: (values) => ({
+          class: '!w-full',
+          controlsPosition: 'right',
+          max: values.quantityMax,
+          min: 0,
+          placeholder: '请输入数量',
+          precision: 2,
+        }),
+      },
+    },
+    {
+      fieldName: 'warehouseId',
+      label: '入库仓库',
+      component: markRaw(WmWarehouseSelect),
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'locationId',
+      label: '库区',
+      component: markRaw(WmWarehouseLocationSelect),
+      componentProps: {
+        disabled: true,
+      },
+      dependencies: {
+        triggerFields: ['warehouseId'],
+        componentProps: (values) => ({
+          disabled: true,
+          warehouseId: values.warehouseId,
+        }),
+      },
+    },
+    {
+      fieldName: 'areaId',
+      label: '库位',
+      component: markRaw(WmWarehouseAreaSelect),
+      componentProps: {
+        disabled: true,
+      },
+      dependencies: {
+        triggerFields: ['locationId'],
+        componentProps: (values) => ({
+          disabled: true,
+          locationId: values.locationId,
+        }),
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+      },
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/wm/returnissue/index.vue b/apps/web-ele/src/views/mes/wm/returnissue/index.vue
new file mode 100644
index 000000000..337029bab
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/returnissue/index.vue
@@ -0,0 +1,224 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmReturnIssueApi } from '#/api/mes/wm/returnissue';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { ElButton, ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  cancelReturnIssue,
+  deleteReturnIssue,
+  exportReturnIssue,
+  getReturnIssuePage,
+} from '#/api/mes/wm/returnissue';
+import { $t } from '#/locales';
+import { MesWmReturnIssueStatusEnum } from '#/views/mes/utils/constants';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建生产退料单 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看生产退料单 */
+function handleDetail(row: MesWmReturnIssueApi.ReturnIssue) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑生产退料单 */
+function handleEdit(row: MesWmReturnIssueApi.ReturnIssue) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 执行上架 */
+function handleStock(row: MesWmReturnIssueApi.ReturnIssue) {
+  formModalApi.setData({ formType: 'stock', id: row.id }).open();
+}
+
+/** 执行退料 */
+function handleFinish(row: MesWmReturnIssueApi.ReturnIssue) {
+  formModalApi.setData({ formType: 'finish', id: row.id }).open();
+}
+
+/** 提示前往质检模块 */
+function handleQc() {
+  ElMessage.info('请前往【质量管理 - 退货检验（RQC）】中进行退料检验操作');
+}
+
+/** 删除生产退料单 */
+async function handleDelete(row: MesWmReturnIssueApi.ReturnIssue) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.code]),
+  });
+  try {
+    await deleteReturnIssue(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+/** 取消生产退料单 */
+async function handleCancel(row: MesWmReturnIssueApi.ReturnIssue) {
+  await cancelReturnIssue(row.id!);
+  ElMessage.success('取消成功');
+  handleRefresh();
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportReturnIssue(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '生产退料单.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getReturnIssuePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmReturnIssueApi.ReturnIssue>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】生产领料、生产退料、物料消耗"
+        url="https://doc.iocoder.cn/mes/wm/issue-return/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="生产退料单列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['生产退料单']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-return-issue:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:wm-return-issue:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <ElButton link type="primary" @click="handleDetail(row)">
+          {{ row.code }}
+        </ElButton>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:wm-return-issue:update'],
+              ifShow: row.status === MesWmReturnIssueStatusEnum.PREPARE,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm-return-issue:delete'],
+              ifShow: row.status === MesWmReturnIssueStatusEnum.PREPARE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '执行质检',
+              type: 'primary',
+              link: true,
+              ifShow: row.status === MesWmReturnIssueStatusEnum.CONFIRMED,
+              onClick: handleQc,
+            },
+            {
+              label: '执行上架',
+              type: 'primary',
+              link: true,
+              auth: ['mes:wm-return-issue:update'],
+              ifShow: row.status === MesWmReturnIssueStatusEnum.APPROVING,
+              onClick: handleStock.bind(null, row),
+            },
+            {
+              label: '执行退料',
+              type: 'primary',
+              link: true,
+              auth: ['mes:wm-return-issue:finish'],
+              ifShow: row.status === MesWmReturnIssueStatusEnum.APPROVED,
+              onClick: handleFinish.bind(null, row),
+            },
+            {
+              label: '取消',
+              type: 'danger',
+              link: true,
+              auth: ['mes:wm-return-issue:update'],
+              ifShow:
+                row.status === MesWmReturnIssueStatusEnum.CONFIRMED ||
+                row.status === MesWmReturnIssueStatusEnum.APPROVING ||
+                row.status === MesWmReturnIssueStatusEnum.APPROVED,
+              popConfirm: {
+                title: '确认取消该生产退料单？取消后不可恢复。',
+                confirm: handleCancel.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/returnissue/modules/detail-form.vue b/apps/web-ele/src/views/mes/wm/returnissue/modules/detail-form.vue
new file mode 100644
index 000000000..23586d2a6
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/returnissue/modules/detail-form.vue
@@ -0,0 +1,104 @@
+<script lang="ts" setup>
+import type { MesWmReturnIssueDetailApi } from '#/api/mes/wm/returnissue/detail';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createReturnIssueDetail,
+  getReturnIssueDetail,
+  updateReturnIssueDetail,
+} from '#/api/mes/wm/returnissue/detail';
+import { $t } from '#/locales';
+
+import { useDetailFormSchema } from '../data';
+
+const emit = defineEmits<{ success: [lineId: number] }>();
+const formData = ref<MesWmReturnIssueDetailApi.ReturnIssueDetail>();
+const issueId = ref<number>(); // 所属退料单编号
+const lineId = ref<number>(); // 所属退料单行编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['上架明细'])
+    : $t('ui.actionTitle.create', ['上架明细']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 90,
+  },
+  layout: 'horizontal',
+  schema: useDetailFormSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmReturnIssueDetailApi.ReturnIssueDetail;
+    data.issueId = issueId.value;
+    data.lineId = lineId.value;
+    try {
+      await (formData.value?.id
+        ? updateReturnIssueDetail({ ...data, id: formData.value.id })
+        : createReturnIssueDetail(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success', lineId.value!);
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    formApi.setState({ schema: useDetailFormSchema(formApi) });
+    // 加载数据
+    const data = modalApi.getData<{
+      detailId?: number;
+      issueId: number;
+      itemId?: number;
+      lineId: number;
+    }>();
+    issueId.value = data.issueId;
+    lineId.value = data.lineId;
+    if (data.detailId) {
+      modalApi.lock();
+      try {
+        formData.value = await getReturnIssueDetail(data.detailId);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    } else if (data.itemId) {
+      await formApi.setFieldValue('itemId', data.itemId);
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/returnissue/modules/detail-list.vue b/apps/web-ele/src/views/mes/wm/returnissue/modules/detail-list.vue
new file mode 100644
index 000000000..de6b28af5
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/returnissue/modules/detail-list.vue
@@ -0,0 +1,103 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmReturnIssueDetailApi } from '#/api/mes/wm/returnissue/detail';
+
+import { computed, watch } from 'vue';
+
+import { ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { deleteReturnIssueDetail } from '#/api/mes/wm/returnissue/detail';
+import { $t } from '#/locales';
+
+import { type FormType, useDetailGridColumns } from '../data';
+
+const props = defineProps<{
+  details: MesWmReturnIssueDetailApi.ReturnIssueDetail[];
+  formType: FormType;
+}>();
+
+const emit = defineEmits<{
+  edit: [detailId: number];
+  refresh: [];
+}>();
+
+const isStock = computed(() => props.formType === 'stock'); // 是否为入库上架模式
+
+/** 编辑上架明细 */
+function handleEdit(row: MesWmReturnIssueDetailApi.ReturnIssueDetail) {
+  emit('edit', row.id!);
+}
+
+/** 删除上架明细 */
+async function handleDelete(
+  row: MesWmReturnIssueDetailApi.ReturnIssueDetail,
+) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.warehouseName]),
+  });
+  try {
+    await deleteReturnIssueDetail(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.warehouseName]));
+    emit('refresh');
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    border: true,
+    columns: useDetailGridColumns(isStock.value),
+    data: props.details,
+    pagerConfig: {
+      enabled: false,
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    size: 'small',
+    toolbarConfig: {
+      enabled: false,
+    },
+  } as VxeTableGridOptions<MesWmReturnIssueDetailApi.ReturnIssueDetail>,
+});
+
+watch(
+  () => props.details,
+  (details) => gridApi.setGridOptions({ data: details }),
+);
+</script>
+
+<template>
+  <div class="px-4 py-2">
+    <Grid>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [
+                  row.warehouseName,
+                ]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/returnissue/modules/form.vue b/apps/web-ele/src/views/mes/wm/returnissue/modules/form.vue
new file mode 100644
index 000000000..2cd07a421
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/returnissue/modules/form.vue
@@ -0,0 +1,230 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesWmReturnIssueApi } from '#/api/mes/wm/returnissue';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElButton, ElDivider, ElMessage, ElPopconfirm } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createReturnIssue,
+  finishReturnIssue,
+  getReturnIssue,
+  stockReturnIssue,
+  submitReturnIssue,
+  updateReturnIssue,
+} from '#/api/mes/wm/returnissue';
+import { $t } from '#/locales';
+import { MesWmReturnIssueStatusEnum } from '#/views/mes/utils/constants';
+
+import { useFormSchema } from '../data';
+import LineList from './line-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesWmReturnIssueApi.ReturnIssue>();
+const originalSnapshot = ref(''); // 表单原始数据快照，用于提交时跳过未变更的保存请求
+const isEditable = computed(() => // 是否为编辑模式（可保存）
+  ['create', 'update'].includes(formType.value),
+);
+const isStock = computed(() => formType.value === 'stock'); // 是否为入库上架模式
+const isFinish = computed(() => formType.value === 'finish'); // 是否为执行退料模式
+const canSubmit = computed(() => // 是否可提交
+  formType.value === 'update' &&
+  formData.value?.status === MesWmReturnIssueStatusEnum.PREPARE,
+);
+const getTitle = computed(() => {
+  switch (formType.value) {
+    case 'detail': {
+      return $t('ui.actionTitle.view', ['生产退料单']);
+    }
+    case 'finish': {
+      return '执行退料';
+    }
+    case 'stock': {
+      return '入库上架';
+    }
+    case 'update': {
+      return $t('ui.actionTitle.edit', ['生产退料单']);
+    }
+    default: {
+      return $t('ui.actionTitle.create', ['生产退料单']);
+    }
+  }
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+/** 提交退料单：表单有修改时先保存，再调用提交接口 */
+async function handleSubmit() {
+  const { valid } = await formApi.validate();
+  if (!valid || !formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    const current = JSON.stringify(await formApi.getValues());
+    if (current !== originalSnapshot.value) {
+      const data =
+        (await formApi.getValues()) as MesWmReturnIssueApi.ReturnIssue;
+      await updateReturnIssue({ ...formData.value, ...data });
+      originalSnapshot.value = current;
+    }
+    await submitReturnIssue(formData.value.id);
+    ElMessage.success('提交成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 入库上架 */
+async function handleStock() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await stockReturnIssue(formData.value.id);
+    ElMessage.success('入库上架成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 执行退料 */
+async function handleFinish() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await finishReturnIssue(formData.value.id);
+    ElMessage.success('完成成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (!isEditable.value) {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data = (await formApi.getValues()) as MesWmReturnIssueApi.ReturnIssue;
+    try {
+      if (formData.value?.id) {
+        await updateReturnIssue({ ...formData.value, ...data });
+        formData.value = { ...formData.value, ...data };
+      } else {
+        const id = await createReturnIssue(data);
+        formData.value = {
+          ...data,
+          id,
+          status: MesWmReturnIssueStatusEnum.PREPARE,
+        };
+        await formApi.setFieldValue('id', id);
+        await formApi.setFieldValue('status', formData.value.status);
+        formType.value = 'update';
+      }
+      originalSnapshot.value = JSON.stringify(await formApi.getValues());
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      originalSnapshot.value = '';
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    formApi.setDisabled(!isEditable.value);
+    modalApi.setState({ showConfirmButton: isEditable.value });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getReturnIssue(data.id);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    }
+    originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+    <!-- 非新建模式展示物料信息 -->
+    <template v-if="formData?.id">
+      <ElDivider>物料信息</ElDivider>
+      <div class="mx-4">
+        <LineList :form-type="formType" :issue-id="formData.id" />
+      </div>
+    </template>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <ElPopconfirm
+          v-if="canSubmit"
+          title="确认提交该退料单？【提交后将不能修改】"
+          width="260"
+          @confirm="handleSubmit"
+        >
+          <template #reference>
+            <ElButton type="primary">提交</ElButton>
+          </template>
+        </ElPopconfirm>
+        <ElButton v-if="isStock" type="primary" @click="handleStock">
+          入库上架
+        </ElButton>
+        <ElPopconfirm
+          v-if="isFinish"
+          title="确认完成该退料单并执行入库吗？"
+          width="260"
+          @confirm="handleFinish"
+        >
+          <template #reference>
+            <ElButton type="primary">执行退料</ElButton>
+          </template>
+        </ElPopconfirm>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/returnissue/modules/line-form.vue b/apps/web-ele/src/views/mes/wm/returnissue/modules/line-form.vue
new file mode 100644
index 000000000..30e9da496
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/returnissue/modules/line-form.vue
@@ -0,0 +1,95 @@
+<script lang="ts" setup>
+import type { MesWmReturnIssueLineApi } from '#/api/mes/wm/returnissue/line';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createReturnIssueLine,
+  getReturnIssueLine,
+  updateReturnIssueLine,
+} from '#/api/mes/wm/returnissue/line';
+import { $t } from '#/locales';
+
+import { useLineFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesWmReturnIssueLineApi.ReturnIssueLine>();
+const issueId = ref<number>(); // 所属退料单编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['生产退料单行'])
+    : $t('ui.actionTitle.create', ['生产退料单行']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 90,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmReturnIssueLineApi.ReturnIssueLine;
+    data.issueId = issueId.value;
+    try {
+      await (formData.value?.id
+        ? updateReturnIssueLine({ ...data, id: formData.value.id })
+        : createReturnIssueLine(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    formApi.setState({ schema: useLineFormSchema(formApi) });
+    // 加载数据
+    const data = modalApi.getData<{ id?: number; issueId: number }>();
+    issueId.value = data.issueId;
+    if (!data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getReturnIssueLine(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/returnissue/modules/line-list.vue b/apps/web-ele/src/views/mes/wm/returnissue/modules/line-list.vue
new file mode 100644
index 000000000..b1f9374e1
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/returnissue/modules/line-list.vue
@@ -0,0 +1,249 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmReturnIssueDetailApi } from '#/api/mes/wm/returnissue/detail';
+import type { MesWmReturnIssueLineApi } from '#/api/mes/wm/returnissue/line';
+
+import { computed, reactive, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getReturnIssueDetailListByLineId } from '#/api/mes/wm/returnissue/detail';
+import {
+  deleteReturnIssueLine,
+  getReturnIssueLinePage,
+} from '#/api/mes/wm/returnissue/line';
+import { $t } from '#/locales';
+import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
+import { BarcodeDetail, PrinterLabel } from '#/views/mes/wm/barcode/components';
+
+import { type FormType, useLineGridColumns } from '../data';
+import DetailForm from './detail-form.vue';
+import DetailList from './detail-list.vue';
+import LineForm from './line-form.vue';
+
+const props = defineProps<{
+  formType: FormType;
+  issueId: number;
+}>();
+
+const isEditable = computed(() => // 是否可编辑明细行
+  ['create', 'update'].includes(props.formType),
+);
+const isStock = computed(() => props.formType === 'stock'); // 是否为入库上架模式
+const detailMap = reactive<
+  Record<number, MesWmReturnIssueDetailApi.ReturnIssueDetail[]>
+>({}); // 已展开行的上架明细缓存
+const barcodeDetailRef = ref(); // 条码详情弹窗实例
+
+const [LineFormModal, lineFormModalApi] = useVbenModal({
+  connectedComponent: LineForm,
+  destroyOnClose: true,
+});
+
+const [DetailFormModal, detailFormModalApi] = useVbenModal({
+  connectedComponent: DetailForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  for (const id of Object.keys(detailMap)) {
+    delete detailMap[Number(id)];
+  }
+  gridApi.query();
+}
+
+/** 添加物料 */
+function handleCreate() {
+  lineFormModalApi.setData({ issueId: props.issueId }).open();
+}
+
+/** 编辑物料 */
+function handleEdit(row: MesWmReturnIssueLineApi.ReturnIssueLine) {
+  lineFormModalApi.setData({ id: row.id, issueId: props.issueId }).open();
+}
+
+/** 删除物料 */
+async function handleDelete(row: MesWmReturnIssueLineApi.ReturnIssueLine) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.itemName]),
+  });
+  try {
+    await deleteReturnIssueLine(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.itemName]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+/** 上架：直接打开明细创建表单 */
+function handlePicking(row: MesWmReturnIssueLineApi.ReturnIssueLine) {
+  openDetailForm(row.id!, row.itemId);
+}
+
+/** 查看物料条码 */
+function handleBarcode(row: MesWmReturnIssueLineApi.ReturnIssueLine) {
+  barcodeDetailRef.value?.openByBusiness(
+    row.itemId,
+    BarcodeBizTypeEnum.ITEM,
+    row.itemCode,
+    row.itemName,
+  );
+}
+
+/** 打开上架明细表单 */
+function openDetailForm(lineId: number, itemId?: number, detailId?: number) {
+  detailFormModalApi
+    .setData({ detailId, issueId: props.issueId, itemId, lineId })
+    .open();
+}
+
+/** 获取已展开行的上架明细 */
+function getExpandedDetails(row: MesWmReturnIssueLineApi.ReturnIssueLine) {
+  return detailMap[row.id!] || [];
+}
+
+/** 加载指定行的上架明细 */
+async function loadLineDetails(lineId: number) {
+  detailMap[lineId] = await getReturnIssueDetailListByLineId(lineId);
+}
+
+/** 展开行时懒加载上架明细 */
+async function handleExpandChange(
+  row: MesWmReturnIssueLineApi.ReturnIssueLine,
+  expanded: boolean,
+) {
+  if (!expanded) {
+    return;
+  }
+  await loadLineDetails(row.id!);
+}
+
+/** 明细表单提交成功后，刷新对应行已展开的明细 */
+async function handleDetailSuccess(lineId: number) {
+  await loadLineDetails(lineId);
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useLineGridColumns(isEditable.value, isStock.value),
+    expandConfig: {
+      padding: true,
+    },
+    height: 400,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.issueId) {
+            return { list: [], total: 0 };
+          }
+          return await getReturnIssueLinePage({
+            issueId: props.issueId,
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesWmReturnIssueLineApi.ReturnIssueLine>,
+  gridEvents: {
+    toggleRowExpand: ({
+      expanded,
+      row,
+    }: {
+      expanded: boolean;
+      row: MesWmReturnIssueLineApi.ReturnIssueLine;
+    }) => {
+      handleExpandChange(row, expanded);
+    },
+  },
+});
+</script>
+
+<template>
+  <div>
+    <LineFormModal @success="handleRefresh" />
+    <DetailFormModal @success="handleDetailSuccess" />
+    <Grid table-title="物料信息">
+      <template v-if="isEditable" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '添加物料',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #detail="{ row }">
+        <DetailList
+          :details="getExpandedDetails(row)"
+          :form-type="formType"
+          @edit="(detailId) => openDetailForm(row.id!, row.itemId, detailId)"
+          @refresh="loadLineDetails(row.id!)"
+        />
+      </template>
+      <template #actions="{ row }">
+        <div class="flex items-center justify-center">
+          <TableAction
+            :actions="[
+              {
+                label: $t('common.edit'),
+                type: 'primary',
+                link: true,
+                icon: ACTION_ICON.EDIT,
+                ifShow: isEditable,
+                onClick: handleEdit.bind(null, row),
+              },
+              {
+                label: $t('common.delete'),
+                type: 'danger',
+                link: true,
+                icon: ACTION_ICON.DELETE,
+                ifShow: isEditable,
+                popConfirm: {
+                  title: $t('ui.actionMessage.deleteConfirm', [row.itemName]),
+                  confirm: handleDelete.bind(null, row),
+                },
+              },
+              {
+                label: '上架',
+                type: 'primary',
+                link: true,
+                ifShow: isStock,
+                onClick: handlePicking.bind(null, row),
+              },
+              {
+                label: '条码',
+                type: 'primary',
+                link: true,
+                onClick: handleBarcode.bind(null, row),
+              },
+            ]"
+          />
+          <PrinterLabel
+            v-if="isStock"
+            :biz-code="row.batchCode"
+            :biz-id="row.batchId"
+            biz-type="BATCH"
+          />
+        </div>
+      </template>
+    </Grid>
+    <BarcodeDetail ref="barcodeDetailRef" />
+  </div>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/returnsales/data.ts b/apps/web-ele/src/views/mes/wm/returnsales/data.ts
new file mode 100644
index 000000000..8924217cf
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/returnsales/data.ts
@@ -0,0 +1,521 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmReturnSalesApi } from '#/api/mes/wm/returnsales';
+import type { MesWmReturnSalesDetailApi } from '#/api/mes/wm/returnsales/detail';
+import type { MesWmReturnSalesLineApi } from '#/api/mes/wm/returnsales/line';
+
+import { h, markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { ElButton } from 'element-plus';
+
+import { z } from '#/adapter/form';
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
+import { WmBatchSelect } from '#/views/mes/wm/batch/components';
+import {
+  WmWarehouseAreaSelect,
+  WmWarehouseLocationSelect,
+  WmWarehouseSelect,
+} from '#/views/mes/wm/warehouse/components';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'finish' | 'stock' | 'update';
+
+/** 表单头部是否只读（上架、详情、执行退货态） */
+function isHeaderReadonly(formType: FormType): boolean {
+  return (
+    formType === 'detail' || formType === 'finish' || formType === 'stock'
+  );
+}
+
+/** 新增/修改的表单 */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'status',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '退货单编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入退货单编号',
+      },
+      rules: 'required',
+      suffix: isHeaderReadonly(formType)
+        ? undefined
+        : () =>
+            h(
+              ElButton,
+              {
+                onClick: async () => {
+                  const code = await generateAutoCode(
+                    MesAutoCodeRuleCode.WM_RETURN_SALES_CODE,
+                  );
+                  await formApi?.setFieldValue('code', code);
+                },
+              },
+              { default: () => '生成' },
+            ),
+    },
+    {
+      fieldName: 'name',
+      label: '退货单名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入退货单名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'salesOrderCode',
+      label: '销售订单号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入销售订单号',
+      },
+    },
+    {
+      fieldName: 'clientId',
+      label: '客户',
+      component: markRaw(MdClientSelect),
+      componentProps: {
+        placeholder: '请选择客户',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'returnDate',
+      label: '退货日期',
+      component: 'DatePicker',
+      componentProps: {
+        class: '!w-full',
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择退货日期',
+        type: 'date',
+        valueFormat: 'x',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'returnReason',
+      label: '退货原因',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入退货原因',
+        rows: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '退货单编号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入退货单编号',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '退货单名称',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入退货单名称',
+      },
+    },
+    {
+      fieldName: 'salesOrderCode',
+      label: '销售订单号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入销售订单号',
+      },
+    },
+    {
+      fieldName: 'clientId',
+      label: '客户',
+      component: markRaw(MdClientSelect),
+      componentProps: {
+        placeholder: '请选择客户',
+      },
+    },
+    {
+      fieldName: 'status',
+      label: '单据状态',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_WM_RETURN_SALES_STATUS, 'number'),
+        placeholder: '请选择单据状态',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesWmReturnSalesApi.ReturnSales>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '退货单编号',
+      minWidth: 160,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '退货单名称',
+      minWidth: 150,
+    },
+    {
+      field: 'salesOrderCode',
+      title: '销售订单号',
+      minWidth: 140,
+    },
+    {
+      field: 'clientCode',
+      title: '客户编码',
+      minWidth: 120,
+    },
+    {
+      field: 'clientName',
+      title: '客户名称',
+      minWidth: 150,
+    },
+    {
+      field: 'returnReason',
+      title: '退货原因',
+      minWidth: 150,
+    },
+    {
+      field: 'returnDate',
+      title: '退货日期',
+      width: 180,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      minWidth: 110,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_RETURN_SALES_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 240,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 退货单行子表的字段 */
+export function useLineGridColumns(
+  editable: boolean,
+  stockable: boolean,
+): VxeTableGridOptions<MesWmReturnSalesLineApi.ReturnSalesLine>['columns'] {
+  return [
+    {
+      type: 'expand',
+      width: 48,
+      slots: { content: 'detail' },
+    },
+    {
+      field: 'itemCode',
+      title: '物料编码',
+      minWidth: 120,
+    },
+    {
+      field: 'itemName',
+      title: '物料名称',
+      minWidth: 140,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'quantity',
+      title: '退货数量',
+      width: 100,
+    },
+    {
+      field: 'batchCode',
+      title: '批次号',
+      minWidth: 120,
+    },
+    {
+      field: 'rqcCheckFlag',
+      title: '是否需要质检',
+      width: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+      },
+    },
+    {
+      field: 'qualityStatus',
+      title: '质量状态',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_QUALITY_STATUS },
+      },
+    },
+    ...(editable || stockable
+      ? [
+          {
+            title: '操作',
+            width: 160,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 退货单行新增/修改的表单 */
+export function useLineFormSchema(
+  clientId?: number,
+  salesOrderCode?: string,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择物料',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'quantity',
+      label: '退货数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入退货数量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'batchId',
+      label: '批次',
+      component: markRaw(WmBatchSelect),
+      componentProps: {
+        clientId,
+        placeholder: '请选择批次',
+        salesOrderCode,
+      },
+      dependencies: {
+        triggerFields: ['itemId'],
+        componentProps: (values) => ({
+          clientId,
+          itemId: values.itemId,
+          placeholder: '请选择批次',
+          salesOrderCode,
+        }),
+      },
+    },
+    {
+      fieldName: 'rqcCheckFlag',
+      label: '需要质检',
+      component: 'Switch',
+      rules: z.boolean().default(true),
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 上架明细子表的字段 */
+export function useDetailGridColumns(
+  stockable: boolean,
+): VxeTableGridOptions<MesWmReturnSalesDetailApi.ReturnSalesDetail>['columns'] {
+  return [
+    {
+      field: 'batchCode',
+      title: '批次号',
+      minWidth: 120,
+    },
+    {
+      field: 'warehouseName',
+      title: '仓库名称',
+      minWidth: 100,
+    },
+    {
+      field: 'locationName',
+      title: '库区名称',
+      minWidth: 100,
+    },
+    {
+      field: 'areaName',
+      title: '库位名称',
+      minWidth: 100,
+    },
+    {
+      field: 'quantity',
+      title: '数量',
+      width: 100,
+    },
+    ...(stockable
+      ? [
+          {
+            title: '操作',
+            width: 120,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 上架明细新增/修改的表单 */
+export function useDetailFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'warehouseId',
+      label: '入库仓库',
+      component: markRaw(WmWarehouseSelect),
+      componentProps: {
+        // 切换仓库后清空库区和库位
+        onChange: async () => {
+          await formApi?.setValues({
+            areaId: undefined,
+            locationId: undefined,
+          });
+        },
+        placeholder: '请选择仓库',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'locationId',
+      label: '库区',
+      component: markRaw(WmWarehouseLocationSelect),
+      componentProps: {
+        placeholder: '请选择库区',
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['warehouseId'],
+        componentProps: (values) => ({
+          // 切换库区后清空库位
+          onChange: async () => {
+            await formApi?.setFieldValue('areaId', undefined);
+          },
+          placeholder: '请选择库区',
+          warehouseId: values.warehouseId,
+        }),
+      },
+    },
+    {
+      fieldName: 'areaId',
+      label: '库位',
+      component: markRaw(WmWarehouseAreaSelect),
+      componentProps: {
+        placeholder: '请选择库位',
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['locationId'],
+        componentProps: (values) => ({
+          locationId: values.locationId,
+          placeholder: '请选择库位',
+        }),
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入批次号',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'quantity',
+      label: '数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入数量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/wm/returnsales/index.vue b/apps/web-ele/src/views/mes/wm/returnsales/index.vue
new file mode 100644
index 000000000..7f36786c4
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/returnsales/index.vue
@@ -0,0 +1,224 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmReturnSalesApi } from '#/api/mes/wm/returnsales';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { ElButton, ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  cancelReturnSales,
+  deleteReturnSales,
+  exportReturnSales,
+  getReturnSalesPage,
+} from '#/api/mes/wm/returnsales';
+import { $t } from '#/locales';
+import { MesWmReturnSalesStatusEnum } from '#/views/mes/utils/constants';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建销售退货单 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看销售退货单 */
+function handleDetail(row: MesWmReturnSalesApi.ReturnSales) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑销售退货单 */
+function handleEdit(row: MesWmReturnSalesApi.ReturnSales) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 执行上架 */
+function handleStock(row: MesWmReturnSalesApi.ReturnSales) {
+  formModalApi.setData({ formType: 'stock', id: row.id }).open();
+}
+
+/** 执行退货 */
+function handleFinish(row: MesWmReturnSalesApi.ReturnSales) {
+  formModalApi.setData({ formType: 'finish', id: row.id }).open();
+}
+
+/** 提示前往质检模块 */
+function handleQc() {
+  ElMessage.info('请前往【质量管理 - 退货检验（RQC）】中进行退货检验操作');
+}
+
+/** 删除销售退货单 */
+async function handleDelete(row: MesWmReturnSalesApi.ReturnSales) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.code]),
+  });
+  try {
+    await deleteReturnSales(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+/** 取消销售退货单 */
+async function handleCancel(row: MesWmReturnSalesApi.ReturnSales) {
+  await cancelReturnSales(row.id!);
+  ElMessage.success('取消成功');
+  handleRefresh();
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportReturnSales(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '销售退货单.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getReturnSalesPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmReturnSalesApi.ReturnSales>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】发货通知、销售出库、销售退货"
+        url="https://doc.iocoder.cn/mes/wm/sales-out/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="销售退货单列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['销售退货单']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-return-sales:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:wm-return-sales:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <ElButton link type="primary" @click="handleDetail(row)">
+          {{ row.code }}
+        </ElButton>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:wm-return-sales:update'],
+              ifShow: row.status === MesWmReturnSalesStatusEnum.PREPARE,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm-return-sales:delete'],
+              ifShow: row.status === MesWmReturnSalesStatusEnum.PREPARE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '执行质检',
+              type: 'primary',
+              link: true,
+              ifShow: row.status === MesWmReturnSalesStatusEnum.CONFIRMED,
+              onClick: handleQc,
+            },
+            {
+              label: '执行退货',
+              type: 'primary',
+              link: true,
+              auth: ['mes:wm-return-sales:finish'],
+              ifShow: row.status === MesWmReturnSalesStatusEnum.APPROVING,
+              onClick: handleFinish.bind(null, row),
+            },
+            {
+              label: '执行上架',
+              type: 'primary',
+              link: true,
+              auth: ['mes:wm-return-sales:stock'],
+              ifShow: row.status === MesWmReturnSalesStatusEnum.APPROVED,
+              onClick: handleStock.bind(null, row),
+            },
+            {
+              label: '取消',
+              type: 'danger',
+              link: true,
+              auth: ['mes:wm-return-sales:cancel'],
+              ifShow:
+                row.status === MesWmReturnSalesStatusEnum.CONFIRMED ||
+                row.status === MesWmReturnSalesStatusEnum.APPROVING ||
+                row.status === MesWmReturnSalesStatusEnum.APPROVED,
+              popConfirm: {
+                title: '确认取消该销售退货单？取消后不可恢复。',
+                confirm: handleCancel.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/returnsales/modules/detail-form.vue b/apps/web-ele/src/views/mes/wm/returnsales/modules/detail-form.vue
new file mode 100644
index 000000000..8e30d2393
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/returnsales/modules/detail-form.vue
@@ -0,0 +1,104 @@
+<script lang="ts" setup>
+import type { MesWmReturnSalesDetailApi } from '#/api/mes/wm/returnsales/detail';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createReturnSalesDetail,
+  getReturnSalesDetail,
+  updateReturnSalesDetail,
+} from '#/api/mes/wm/returnsales/detail';
+import { $t } from '#/locales';
+
+import { useDetailFormSchema } from '../data';
+
+const emit = defineEmits<{ success: [lineId: number] }>();
+const formData = ref<MesWmReturnSalesDetailApi.ReturnSalesDetail>();
+const returnId = ref<number>(); // 所属退货单编号
+const lineId = ref<number>(); // 所属退货单行编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['上架明细'])
+    : $t('ui.actionTitle.create', ['上架明细']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 90,
+  },
+  layout: 'horizontal',
+  schema: useDetailFormSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmReturnSalesDetailApi.ReturnSalesDetail;
+    data.returnId = returnId.value;
+    data.lineId = lineId.value;
+    try {
+      await (formData.value?.id
+        ? updateReturnSalesDetail({ ...data, id: formData.value.id })
+        : createReturnSalesDetail(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success', lineId.value!);
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    formApi.setState({ schema: useDetailFormSchema(formApi) });
+    // 加载数据
+    const data = modalApi.getData<{
+      detailId?: number;
+      itemId?: number;
+      lineId: number;
+      returnId: number;
+    }>();
+    returnId.value = data.returnId;
+    lineId.value = data.lineId;
+    if (data.detailId) {
+      modalApi.lock();
+      try {
+        formData.value = await getReturnSalesDetail(data.detailId);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    } else if (data.itemId) {
+      await formApi.setFieldValue('itemId', data.itemId);
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/returnsales/modules/detail-list.vue b/apps/web-ele/src/views/mes/wm/returnsales/modules/detail-list.vue
new file mode 100644
index 000000000..23f1f9817
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/returnsales/modules/detail-list.vue
@@ -0,0 +1,103 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmReturnSalesDetailApi } from '#/api/mes/wm/returnsales/detail';
+
+import { computed, watch } from 'vue';
+
+import { ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { deleteReturnSalesDetail } from '#/api/mes/wm/returnsales/detail';
+import { $t } from '#/locales';
+
+import { type FormType, useDetailGridColumns } from '../data';
+
+const props = defineProps<{
+  details: MesWmReturnSalesDetailApi.ReturnSalesDetail[];
+  formType: FormType;
+}>();
+
+const emit = defineEmits<{
+  edit: [detailId: number];
+  refresh: [];
+}>();
+
+const isStock = computed(() => props.formType === 'stock'); // 是否为上架模式
+
+/** 编辑上架明细 */
+function handleEdit(row: MesWmReturnSalesDetailApi.ReturnSalesDetail) {
+  emit('edit', row.id!);
+}
+
+/** 删除上架明细 */
+async function handleDelete(
+  row: MesWmReturnSalesDetailApi.ReturnSalesDetail,
+) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.warehouseName]),
+  });
+  try {
+    await deleteReturnSalesDetail(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.warehouseName]));
+    emit('refresh');
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    border: true,
+    columns: useDetailGridColumns(isStock.value),
+    data: props.details,
+    pagerConfig: {
+      enabled: false,
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    size: 'small',
+    toolbarConfig: {
+      enabled: false,
+    },
+  } as VxeTableGridOptions<MesWmReturnSalesDetailApi.ReturnSalesDetail>,
+});
+
+watch(
+  () => props.details,
+  (details) => gridApi.setGridOptions({ data: details }),
+);
+</script>
+
+<template>
+  <div class="px-4 py-2">
+    <Grid>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [
+                  row.warehouseName,
+                ]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/returnsales/modules/form.vue b/apps/web-ele/src/views/mes/wm/returnsales/modules/form.vue
new file mode 100644
index 000000000..8b4094bbe
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/returnsales/modules/form.vue
@@ -0,0 +1,242 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesWmReturnSalesApi } from '#/api/mes/wm/returnsales';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElButton, ElDivider, ElMessage, ElPopconfirm } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createReturnSales,
+  finishReturnSales,
+  getReturnSales,
+  stockReturnSales,
+  submitReturnSales,
+  updateReturnSales,
+} from '#/api/mes/wm/returnsales';
+import { $t } from '#/locales';
+import { MesWmReturnSalesStatusEnum } from '#/views/mes/utils/constants';
+
+import { useFormSchema } from '../data';
+import LineList from './line-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesWmReturnSalesApi.ReturnSales>();
+const originalSnapshot = ref(''); // 表单原始数据快照，用于提交时跳过未变更的保存请求
+const isEditable = computed(() => // 是否为编辑模式（可保存）
+  ['create', 'update'].includes(formType.value),
+);
+const isStock = computed(() => formType.value === 'stock'); // 是否为上架模式
+const isFinish = computed(() => formType.value === 'finish'); // 是否为执行退货模式
+const canSubmit = computed(() => // 是否可提交
+  formType.value === 'update' &&
+  formData.value?.status === MesWmReturnSalesStatusEnum.PREPARE,
+);
+const getTitle = computed(() => {
+  switch (formType.value) {
+    case 'detail': {
+      return $t('ui.actionTitle.view', ['销售退货单']);
+    }
+    case 'finish': {
+      return '执行退货';
+    }
+    case 'stock': {
+      return '执行上架';
+    }
+    case 'update': {
+      return $t('ui.actionTitle.edit', ['销售退货单']);
+    }
+    default: {
+      return $t('ui.actionTitle.create', ['销售退货单']);
+    }
+  }
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+/** 提交退货单：表单有修改时先保存，再调用提交接口 */
+async function handleSubmit() {
+  const { valid } = await formApi.validate();
+  if (!valid || !formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    const current = JSON.stringify(await formApi.getValues());
+    if (current !== originalSnapshot.value) {
+      const data =
+        (await formApi.getValues()) as MesWmReturnSalesApi.ReturnSales;
+      await updateReturnSales({ ...formData.value, ...data });
+      originalSnapshot.value = current;
+    }
+    await submitReturnSales(formData.value.id);
+    ElMessage.success('提交成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 执行上架 */
+async function handleStock() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await stockReturnSales(formData.value.id);
+    ElMessage.success('上架成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 执行退货 */
+async function handleFinish() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await finishReturnSales(formData.value.id);
+    ElMessage.success('执行退货成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (!isEditable.value) {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data = (await formApi.getValues()) as MesWmReturnSalesApi.ReturnSales;
+    try {
+      if (formData.value?.id) {
+        await updateReturnSales({ ...formData.value, ...data });
+        formData.value = { ...formData.value, ...data };
+      } else {
+        const id = await createReturnSales(data);
+        formData.value = {
+          ...data,
+          id,
+          status: MesWmReturnSalesStatusEnum.PREPARE,
+        };
+        await formApi.setFieldValue('id', id);
+        await formApi.setFieldValue('status', formData.value.status);
+        formType.value = 'update';
+      }
+      originalSnapshot.value = JSON.stringify(await formApi.getValues());
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      originalSnapshot.value = '';
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    formApi.setDisabled(!isEditable.value);
+    modalApi.setState({ showConfirmButton: isEditable.value });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getReturnSales(data.id);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    }
+    originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+    <!-- 非新建模式展示物料信息 -->
+    <template v-if="formData?.id">
+      <ElDivider>物料信息</ElDivider>
+      <div class="mx-4">
+        <LineList
+          :client-id="formData.clientId"
+          :form-type="formType"
+          :return-id="formData.id"
+          :sales-order-code="formData.salesOrderCode"
+        />
+      </div>
+    </template>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <ElPopconfirm
+          v-if="canSubmit"
+          title="确认提交该销售退货单？【提交后将不能修改】"
+          width="260"
+          @confirm="handleSubmit"
+        >
+          <template #reference>
+            <ElButton type="primary">提交</ElButton>
+          </template>
+        </ElPopconfirm>
+        <ElPopconfirm
+          v-if="isStock"
+          title="确认执行上架？"
+          width="260"
+          @confirm="handleStock"
+        >
+          <template #reference>
+            <ElButton type="primary">执行上架</ElButton>
+          </template>
+        </ElPopconfirm>
+        <ElPopconfirm
+          v-if="isFinish"
+          title="确认执行退货？执行后将进入待上架状态。"
+          width="260"
+          @confirm="handleFinish"
+        >
+          <template #reference>
+            <ElButton type="primary">执行退货</ElButton>
+          </template>
+        </ElPopconfirm>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/returnsales/modules/line-form.vue b/apps/web-ele/src/views/mes/wm/returnsales/modules/line-form.vue
new file mode 100644
index 000000000..8566136a8
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/returnsales/modules/line-form.vue
@@ -0,0 +1,102 @@
+<script lang="ts" setup>
+import type { MesWmReturnSalesLineApi } from '#/api/mes/wm/returnsales/line';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createReturnSalesLine,
+  getReturnSalesLine,
+  updateReturnSalesLine,
+} from '#/api/mes/wm/returnsales/line';
+import { $t } from '#/locales';
+
+import { useLineFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesWmReturnSalesLineApi.ReturnSalesLine>();
+const returnId = ref<number>(); // 所属退货单编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['销售退货单行'])
+    : $t('ui.actionTitle.create', ['销售退货单行']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 90,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmReturnSalesLineApi.ReturnSalesLine;
+    data.returnId = returnId.value;
+    try {
+      await (formData.value?.id
+        ? updateReturnSalesLine({ ...data, id: formData.value.id })
+        : createReturnSalesLine(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{
+      clientId?: number;
+      id?: number;
+      returnId: number;
+      salesOrderCode?: string;
+    }>();
+    returnId.value = data.returnId;
+    formApi.setState({
+      schema: useLineFormSchema(data.clientId, data.salesOrderCode),
+    });
+    if (!data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getReturnSalesLine(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/returnsales/modules/line-list.vue b/apps/web-ele/src/views/mes/wm/returnsales/modules/line-list.vue
new file mode 100644
index 000000000..b6f0a66b9
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/returnsales/modules/line-list.vue
@@ -0,0 +1,245 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmReturnSalesDetailApi } from '#/api/mes/wm/returnsales/detail';
+import type { MesWmReturnSalesLineApi } from '#/api/mes/wm/returnsales/line';
+
+import { computed, reactive } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getReturnSalesDetailListByLineId } from '#/api/mes/wm/returnsales/detail';
+import {
+  deleteReturnSalesLine,
+  getReturnSalesLinePage,
+} from '#/api/mes/wm/returnsales/line';
+import { $t } from '#/locales';
+import { PrinterLabel } from '#/views/mes/wm/barcode/components';
+
+import { type FormType, useLineGridColumns } from '../data';
+import DetailForm from './detail-form.vue';
+import DetailList from './detail-list.vue';
+import LineForm from './line-form.vue';
+
+const props = defineProps<{
+  clientId?: number;
+  formType: FormType;
+  returnId: number;
+  salesOrderCode?: string;
+}>();
+
+const isEditable = computed(() => // 是否可编辑明细行
+  ['create', 'update'].includes(props.formType),
+);
+const isStock = computed(() => props.formType === 'stock'); // 是否为上架模式
+const detailMap = reactive<
+  Record<number, MesWmReturnSalesDetailApi.ReturnSalesDetail[]>
+>({}); // 已展开行的上架明细缓存
+
+const [LineFormModal, lineFormModalApi] = useVbenModal({
+  connectedComponent: LineForm,
+  destroyOnClose: true,
+});
+
+const [DetailFormModal, detailFormModalApi] = useVbenModal({
+  connectedComponent: DetailForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  for (const id of Object.keys(detailMap)) {
+    delete detailMap[Number(id)];
+  }
+  gridApi.query();
+}
+
+/** 添加物料 */
+function handleCreate() {
+  lineFormModalApi
+    .setData({
+      clientId: props.clientId,
+      returnId: props.returnId,
+      salesOrderCode: props.salesOrderCode,
+    })
+    .open();
+}
+
+/** 编辑物料 */
+function handleEdit(row: MesWmReturnSalesLineApi.ReturnSalesLine) {
+  lineFormModalApi
+    .setData({
+      clientId: props.clientId,
+      id: row.id,
+      returnId: props.returnId,
+      salesOrderCode: props.salesOrderCode,
+    })
+    .open();
+}
+
+/** 删除物料 */
+async function handleDelete(row: MesWmReturnSalesLineApi.ReturnSalesLine) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.itemName]),
+  });
+  try {
+    await deleteReturnSalesLine(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.itemName]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+/** 上架：直接打开明细创建表单 */
+function handleStock(row: MesWmReturnSalesLineApi.ReturnSalesLine) {
+  openDetailForm(row.id!, row.itemId);
+}
+
+/** 打开上架明细表单 */
+function openDetailForm(lineId: number, itemId?: number, detailId?: number) {
+  detailFormModalApi
+    .setData({ detailId, itemId, lineId, returnId: props.returnId })
+    .open();
+}
+
+/** 获取已展开行的上架明细 */
+function getExpandedDetails(row: MesWmReturnSalesLineApi.ReturnSalesLine) {
+  return detailMap[row.id!] || [];
+}
+
+/** 加载指定行的上架明细 */
+async function loadLineDetails(lineId: number) {
+  detailMap[lineId] = await getReturnSalesDetailListByLineId(lineId);
+}
+
+/** 展开行时懒加载上架明细 */
+async function handleExpandChange(
+  row: MesWmReturnSalesLineApi.ReturnSalesLine,
+  expanded: boolean,
+) {
+  if (!expanded) {
+    return;
+  }
+  await loadLineDetails(row.id!);
+}
+
+/** 明细表单提交成功后，刷新对应行已展开的明细 */
+async function handleDetailSuccess(lineId: number) {
+  await loadLineDetails(lineId);
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useLineGridColumns(isEditable.value, isStock.value),
+    expandConfig: {
+      padding: true,
+    },
+    height: 400,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.returnId) {
+            return { list: [], total: 0 };
+          }
+          return await getReturnSalesLinePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            returnId: props.returnId,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesWmReturnSalesLineApi.ReturnSalesLine>,
+  gridEvents: {
+    toggleRowExpand: ({
+      expanded,
+      row,
+    }: {
+      expanded: boolean;
+      row: MesWmReturnSalesLineApi.ReturnSalesLine;
+    }) => {
+      handleExpandChange(row, expanded);
+    },
+  },
+});
+</script>
+
+<template>
+  <div>
+    <LineFormModal @success="handleRefresh" />
+    <DetailFormModal @success="handleDetailSuccess" />
+    <Grid table-title="物料信息">
+      <template v-if="isEditable" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '添加物料',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #detail="{ row }">
+        <DetailList
+          :details="getExpandedDetails(row)"
+          :form-type="formType"
+          @edit="(detailId) => openDetailForm(row.id!, row.itemId, detailId)"
+          @refresh="loadLineDetails(row.id!)"
+        />
+      </template>
+      <template #actions="{ row }">
+        <div class="flex items-center justify-center">
+          <TableAction
+            :actions="[
+              {
+                label: $t('common.edit'),
+                type: 'primary',
+                link: true,
+                icon: ACTION_ICON.EDIT,
+                ifShow: isEditable,
+                onClick: handleEdit.bind(null, row),
+              },
+              {
+                label: $t('common.delete'),
+                type: 'danger',
+                link: true,
+                icon: ACTION_ICON.DELETE,
+                ifShow: isEditable,
+                popConfirm: {
+                  title: $t('ui.actionMessage.deleteConfirm', [row.itemName]),
+                  confirm: handleDelete.bind(null, row),
+                },
+              },
+              {
+                label: '上架',
+                type: 'primary',
+                link: true,
+                ifShow: isStock,
+                onClick: handleStock.bind(null, row),
+              },
+            ]"
+          />
+          <PrinterLabel
+            v-if="isStock"
+            :biz-code="row.batchCode"
+            :biz-id="row.batchId"
+            biz-type="BATCH"
+          />
+        </div>
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/returnvendor/data.ts b/apps/web-ele/src/views/mes/wm/returnvendor/data.ts
new file mode 100644
index 000000000..2c551bc2e
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/returnvendor/data.ts
@@ -0,0 +1,535 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmMaterialStockApi } from '#/api/mes/wm/materialstock';
+import type { MesWmReturnVendorApi } from '#/api/mes/wm/returnvendor';
+import type { MesWmReturnVendorDetailApi } from '#/api/mes/wm/returnvendor/detail';
+import type { MesWmReturnVendorLineApi } from '#/api/mes/wm/returnvendor/line';
+
+import { h, markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+
+import { ElButton } from 'element-plus';
+
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
+import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
+import { WmBatchSelect } from '#/views/mes/wm/batch/components';
+import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
+import {
+  WmWarehouseAreaSelect,
+  WmWarehouseLocationSelect,
+  WmWarehouseSelect,
+} from '#/views/mes/wm/warehouse/components';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'finish' | 'stock' | 'update';
+
+/** 表单头部是否只读（拣货、详情、完成态） */
+function isHeaderReadonly(formType: FormType): boolean {
+  return (
+    formType === 'detail' || formType === 'finish' || formType === 'stock'
+  );
+}
+
+/** 新增/修改的表单 */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'status',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '退货单编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入退货单编号',
+      },
+      rules: 'required',
+      suffix: isHeaderReadonly(formType)
+        ? undefined
+        : () =>
+            h(
+              ElButton,
+              {
+                onClick: async () => {
+                  const code = await generateAutoCode(
+                    MesAutoCodeRuleCode.WM_RETURN_VENDOR_CODE,
+                  );
+                  await formApi?.setFieldValue('code', code);
+                },
+              },
+              { default: () => '生成' },
+            ),
+    },
+    {
+      fieldName: 'name',
+      label: '退货单名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入退货单名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'purchaseOrderCode',
+      label: '采购订单号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入采购订单号',
+      },
+    },
+    {
+      fieldName: 'vendorId',
+      label: '供应商',
+      component: markRaw(MdVendorSelect),
+      componentProps: {
+        placeholder: '请选择供应商',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'returnDate',
+      label: '退货日期',
+      component: 'DatePicker',
+      componentProps: {
+        class: '!w-full',
+        format: 'YYYY-MM-DD HH:mm:ss',
+        placeholder: '请选择退货日期',
+        type: 'datetime',
+        valueFormat: 'x',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'returnReason',
+      label: '退货原因',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入退货原因',
+        rows: 2,
+      },
+    },
+    {
+      fieldName: 'transportCode',
+      label: '运单号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入运单号',
+      },
+    },
+    {
+      fieldName: 'transportTelephone',
+      label: '联系电话',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入联系电话',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '退货单编号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入退货单编号',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '退货单名称',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入退货单名称',
+      },
+    },
+    {
+      fieldName: 'purchaseOrderCode',
+      label: '采购订单编号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入采购订单编号',
+      },
+    },
+    {
+      fieldName: 'vendorId',
+      label: '供应商',
+      component: markRaw(MdVendorSelect),
+      componentProps: {
+        placeholder: '请选择供应商',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesWmReturnVendorApi.ReturnVendor>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '退货单编号',
+      minWidth: 160,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '退货单名称',
+      minWidth: 150,
+    },
+    {
+      field: 'purchaseOrderCode',
+      title: '采购订单号',
+      minWidth: 140,
+    },
+    {
+      field: 'vendorCode',
+      title: '供应商编码',
+      minWidth: 120,
+    },
+    {
+      field: 'vendorName',
+      title: '供应商名称',
+      minWidth: 150,
+    },
+    {
+      field: 'returnDate',
+      title: '退货日期',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      minWidth: 110,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_RETURN_VENDOR_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 240,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 退货单行子表的字段 */
+export function useLineGridColumns(
+  editable: boolean,
+  stockable: boolean,
+): VxeTableGridOptions<MesWmReturnVendorLineApi.ReturnVendorLine>['columns'] {
+  return [
+    {
+      type: 'expand',
+      width: 48,
+      slots: { content: 'detail' },
+    },
+    {
+      field: 'itemCode',
+      title: '物料编码',
+      minWidth: 120,
+    },
+    {
+      field: 'itemName',
+      title: '物料名称',
+      minWidth: 140,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'quantity',
+      title: '退货数量',
+      width: 100,
+    },
+    {
+      field: 'batchCode',
+      title: '批次号',
+      minWidth: 120,
+    },
+    ...(editable || stockable
+      ? [
+          {
+            title: '操作',
+            width: 160,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 退货单行新增/修改的表单 */
+export function useLineFormSchema(
+  vendorId?: number,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'itemId',
+      label: '产品物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择产品物料',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'quantity',
+      label: '退货数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入退货数量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'batchId',
+      label: '批次号',
+      component: markRaw(WmBatchSelect),
+      componentProps: {
+        // 选择批次后同步批次号
+        onChange: async (batch?: { code?: string }) => {
+          await formApi?.setFieldValue('batchCode', batch?.code);
+        },
+        vendorId,
+      },
+      dependencies: {
+        triggerFields: ['itemId'],
+        componentProps: (values) => ({
+          itemId: values.itemId,
+          vendorId,
+        }),
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 拣货明细子表的字段 */
+export function useDetailGridColumns(
+  stockable: boolean,
+): VxeTableGridOptions<MesWmReturnVendorDetailApi.ReturnVendorDetail>['columns'] {
+  return [
+    {
+      field: 'batchCode',
+      title: '批次号',
+      minWidth: 120,
+    },
+    {
+      field: 'warehouseName',
+      title: '仓库名称',
+      minWidth: 100,
+    },
+    {
+      field: 'locationName',
+      title: '库区名称',
+      minWidth: 100,
+    },
+    {
+      field: 'areaName',
+      title: '库位名称',
+      minWidth: 100,
+    },
+    {
+      field: 'quantity',
+      title: '数量',
+      width: 100,
+    },
+    ...(stockable
+      ? [
+          {
+            title: '操作',
+            width: 120,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 拣货明细新增/修改的表单 */
+export function useDetailFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'quantityMax',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'materialStockId',
+      label: '库存记录',
+      component: markRaw(WmMaterialStockSelect),
+      componentProps: {
+        // 选择库存记录后，自动回填仓库/库区/库位/批次/数量
+        onChange: async (stock?: MesWmMaterialStockApi.MaterialStock) => {
+          await formApi?.setValues({
+            areaId: stock?.areaId,
+            batchCode: stock?.batchCode,
+            batchId: stock?.batchId,
+            locationId: stock?.locationId,
+            quantity: stock?.quantity,
+            quantityMax: stock?.quantity,
+            warehouseId: stock?.warehouseId,
+          });
+        },
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['itemId'],
+        componentProps: (values) => ({
+          itemId: values.itemId,
+        }),
+      },
+    },
+    {
+      fieldName: 'quantity',
+      label: '数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入数量',
+        precision: 2,
+      },
+      rules: 'required',
+      dependencies: {
+        triggerFields: ['quantityMax'],
+        componentProps: (values) => ({
+          class: '!w-full',
+          controlsPosition: 'right',
+          max: values.quantityMax,
+          min: 0,
+          placeholder: '请输入数量',
+          precision: 2,
+        }),
+      },
+    },
+    {
+      fieldName: 'warehouseId',
+      label: '仓库',
+      component: markRaw(WmWarehouseSelect),
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'locationId',
+      label: '库区',
+      component: markRaw(WmWarehouseLocationSelect),
+      componentProps: {
+        disabled: true,
+      },
+      dependencies: {
+        triggerFields: ['warehouseId'],
+        componentProps: (values) => ({
+          disabled: true,
+          warehouseId: values.warehouseId,
+        }),
+      },
+    },
+    {
+      fieldName: 'areaId',
+      label: '库位',
+      component: markRaw(WmWarehouseAreaSelect),
+      componentProps: {
+        disabled: true,
+      },
+      dependencies: {
+        triggerFields: ['locationId'],
+        componentProps: (values) => ({
+          disabled: true,
+          locationId: values.locationId,
+        }),
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+      },
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/wm/returnvendor/index.vue b/apps/web-ele/src/views/mes/wm/returnvendor/index.vue
new file mode 100644
index 000000000..28e534d65
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/returnvendor/index.vue
@@ -0,0 +1,211 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmReturnVendorApi } from '#/api/mes/wm/returnvendor';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { ElButton, ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  cancelReturnVendor,
+  deleteReturnVendor,
+  exportReturnVendor,
+  getReturnVendorPage,
+} from '#/api/mes/wm/returnvendor';
+import { $t } from '#/locales';
+import { MesWmReturnVendorStatusEnum } from '#/views/mes/utils/constants';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建供应商退货单 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看供应商退货单 */
+function handleDetail(row: MesWmReturnVendorApi.ReturnVendor) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑供应商退货单 */
+function handleEdit(row: MesWmReturnVendorApi.ReturnVendor) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 执行拣货 */
+function handleStock(row: MesWmReturnVendorApi.ReturnVendor) {
+  formModalApi.setData({ formType: 'stock', id: row.id }).open();
+}
+
+/** 完成退货 */
+function handleFinish(row: MesWmReturnVendorApi.ReturnVendor) {
+  formModalApi.setData({ formType: 'finish', id: row.id }).open();
+}
+
+/** 删除供应商退货单 */
+async function handleDelete(row: MesWmReturnVendorApi.ReturnVendor) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.code]),
+  });
+  try {
+    await deleteReturnVendor(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+/** 取消供应商退货单 */
+async function handleCancel(row: MesWmReturnVendorApi.ReturnVendor) {
+  await cancelReturnVendor(row.id!);
+  ElMessage.success('取消成功');
+  handleRefresh();
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportReturnVendor(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '供应商退货单.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getReturnVendorPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmReturnVendorApi.ReturnVendor>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】到货通知、采购入库、采购退货"
+        url="https://doc.iocoder.cn/mes/wm/purchase-in/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="供应商退货单列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['供应商退货单']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-return-vendor:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:wm-return-vendor:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <ElButton link type="primary" @click="handleDetail(row)">
+          {{ row.code }}
+        </ElButton>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:wm-return-vendor:update'],
+              ifShow: row.status === MesWmReturnVendorStatusEnum.PREPARE,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm-return-vendor:delete'],
+              ifShow: row.status === MesWmReturnVendorStatusEnum.PREPARE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '执行拣货',
+              type: 'primary',
+              link: true,
+              auth: ['mes:wm-return-vendor:update'],
+              ifShow: row.status === MesWmReturnVendorStatusEnum.APPROVING,
+              onClick: handleStock.bind(null, row),
+            },
+            {
+              label: '完成退货',
+              type: 'primary',
+              link: true,
+              auth: ['mes:wm-return-vendor:update-status'],
+              ifShow: row.status === MesWmReturnVendorStatusEnum.APPROVED,
+              onClick: handleFinish.bind(null, row),
+            },
+            {
+              label: '取消',
+              type: 'danger',
+              link: true,
+              auth: ['mes:wm-return-vendor:update'],
+              ifShow:
+                row.status === MesWmReturnVendorStatusEnum.APPROVING ||
+                row.status === MesWmReturnVendorStatusEnum.APPROVED,
+              popConfirm: {
+                title: '确认取消该供应商退货单？取消后不可恢复。',
+                confirm: handleCancel.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/returnvendor/modules/detail-form.vue b/apps/web-ele/src/views/mes/wm/returnvendor/modules/detail-form.vue
new file mode 100644
index 000000000..fb1bff90e
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/returnvendor/modules/detail-form.vue
@@ -0,0 +1,104 @@
+<script lang="ts" setup>
+import type { MesWmReturnVendorDetailApi } from '#/api/mes/wm/returnvendor/detail';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createReturnVendorDetail,
+  getReturnVendorDetail,
+  updateReturnVendorDetail,
+} from '#/api/mes/wm/returnvendor/detail';
+import { $t } from '#/locales';
+
+import { useDetailFormSchema } from '../data';
+
+const emit = defineEmits<{ success: [lineId: number] }>();
+const formData = ref<MesWmReturnVendorDetailApi.ReturnVendorDetail>();
+const returnId = ref<number>(); // 所属退货单编号
+const lineId = ref<number>(); // 所属退货单行编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['拣货明细'])
+    : $t('ui.actionTitle.create', ['拣货明细']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 90,
+  },
+  layout: 'horizontal',
+  schema: useDetailFormSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmReturnVendorDetailApi.ReturnVendorDetail;
+    data.returnId = returnId.value;
+    data.lineId = lineId.value;
+    try {
+      await (formData.value?.id
+        ? updateReturnVendorDetail({ ...data, id: formData.value.id })
+        : createReturnVendorDetail(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success', lineId.value!);
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    formApi.setState({ schema: useDetailFormSchema(formApi) });
+    // 加载数据
+    const data = modalApi.getData<{
+      detailId?: number;
+      itemId?: number;
+      lineId: number;
+      returnId: number;
+    }>();
+    returnId.value = data.returnId;
+    lineId.value = data.lineId;
+    if (data.detailId) {
+      modalApi.lock();
+      try {
+        formData.value = await getReturnVendorDetail(data.detailId);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    } else if (data.itemId) {
+      await formApi.setFieldValue('itemId', data.itemId);
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/returnvendor/modules/detail-list.vue b/apps/web-ele/src/views/mes/wm/returnvendor/modules/detail-list.vue
new file mode 100644
index 000000000..11b5a8900
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/returnvendor/modules/detail-list.vue
@@ -0,0 +1,103 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmReturnVendorDetailApi } from '#/api/mes/wm/returnvendor/detail';
+
+import { computed, watch } from 'vue';
+
+import { ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { deleteReturnVendorDetail } from '#/api/mes/wm/returnvendor/detail';
+import { $t } from '#/locales';
+
+import { type FormType, useDetailGridColumns } from '../data';
+
+const props = defineProps<{
+  details: MesWmReturnVendorDetailApi.ReturnVendorDetail[];
+  formType: FormType;
+}>();
+
+const emit = defineEmits<{
+  edit: [detailId: number];
+  refresh: [];
+}>();
+
+const isStock = computed(() => props.formType === 'stock'); // 是否为拣货模式
+
+/** 编辑拣货明细 */
+function handleEdit(row: MesWmReturnVendorDetailApi.ReturnVendorDetail) {
+  emit('edit', row.id!);
+}
+
+/** 删除拣货明细 */
+async function handleDelete(
+  row: MesWmReturnVendorDetailApi.ReturnVendorDetail,
+) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.warehouseName]),
+  });
+  try {
+    await deleteReturnVendorDetail(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.warehouseName]));
+    emit('refresh');
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    border: true,
+    columns: useDetailGridColumns(isStock.value),
+    data: props.details,
+    pagerConfig: {
+      enabled: false,
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    size: 'small',
+    toolbarConfig: {
+      enabled: false,
+    },
+  } as VxeTableGridOptions<MesWmReturnVendorDetailApi.ReturnVendorDetail>,
+});
+
+watch(
+  () => props.details,
+  (details) => gridApi.setGridOptions({ data: details }),
+);
+</script>
+
+<template>
+  <div class="px-4 py-2">
+    <Grid>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [
+                  row.warehouseName,
+                ]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/returnvendor/modules/form.vue b/apps/web-ele/src/views/mes/wm/returnvendor/modules/form.vue
new file mode 100644
index 000000000..e35ca121b
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/returnvendor/modules/form.vue
@@ -0,0 +1,244 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesWmReturnVendorApi } from '#/api/mes/wm/returnvendor';
+
+import { computed, ref } from 'vue';
+
+import { confirm, useVbenModal } from '@vben/common-ui';
+
+import { ElButton, ElDivider, ElMessage, ElPopconfirm } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  checkReturnVendorQuantity,
+  createReturnVendor,
+  finishReturnVendor,
+  getReturnVendor,
+  stockReturnVendor,
+  submitReturnVendor,
+  updateReturnVendor,
+} from '#/api/mes/wm/returnvendor';
+import { $t } from '#/locales';
+import { MesWmReturnVendorStatusEnum } from '#/views/mes/utils/constants';
+
+import { useFormSchema } from '../data';
+import LineList from './line-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesWmReturnVendorApi.ReturnVendor>();
+const originalSnapshot = ref(''); // 表单原始数据快照，用于提交时跳过未变更的保存请求
+const isEditable = computed(() => // 是否为编辑模式（可保存）
+  ['create', 'update'].includes(formType.value),
+);
+const isStock = computed(() => formType.value === 'stock'); // 是否为拣货模式
+const isFinish = computed(() => formType.value === 'finish'); // 是否为完成退货模式
+const canSubmit = computed(() => // 是否可提交
+  formType.value === 'update' &&
+  formData.value?.status === MesWmReturnVendorStatusEnum.PREPARE,
+);
+const getTitle = computed(() => {
+  switch (formType.value) {
+    case 'detail': {
+      return $t('ui.actionTitle.view', ['供应商退货单']);
+    }
+    case 'finish': {
+      return '完成退货';
+    }
+    case 'stock': {
+      return '执行拣货';
+    }
+    case 'update': {
+      return $t('ui.actionTitle.edit', ['供应商退货单']);
+    }
+    default: {
+      return $t('ui.actionTitle.create', ['供应商退货单']);
+    }
+  }
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+/** 提交退货单：表单有修改时先保存，再调用提交接口 */
+async function handleSubmit() {
+  const { valid } = await formApi.validate();
+  if (!valid || !formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    const current = JSON.stringify(await formApi.getValues());
+    if (current !== originalSnapshot.value) {
+      const data =
+        (await formApi.getValues()) as MesWmReturnVendorApi.ReturnVendor;
+      await updateReturnVendor({ ...formData.value, ...data });
+      originalSnapshot.value = current;
+    }
+    await submitReturnVendor(formData.value.id);
+    ElMessage.success('提交成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 执行拣货：拣货数量与退货数量不一致时二次确认 */
+async function handleStock() {
+  if (!formData.value?.id) {
+    return;
+  }
+  const quantityMatch = await checkReturnVendorQuantity(formData.value.id);
+  if (!quantityMatch) {
+    try {
+      await confirm('退货数量与拣货数量不一致，确认执行拣货？');
+    } catch {
+      return;
+    }
+  }
+  modalApi.lock();
+  try {
+    await stockReturnVendor(formData.value.id);
+    ElMessage.success('拣货成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 完成退货 */
+async function handleFinish() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await finishReturnVendor(formData.value.id);
+    ElMessage.success('完成成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (!isEditable.value) {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmReturnVendorApi.ReturnVendor;
+    try {
+      if (formData.value?.id) {
+        await updateReturnVendor({ ...formData.value, ...data });
+        formData.value = { ...formData.value, ...data };
+      } else {
+        const id = await createReturnVendor(data);
+        formData.value = {
+          ...data,
+          id,
+          status: MesWmReturnVendorStatusEnum.PREPARE,
+        };
+        await formApi.setFieldValue('id', id);
+        await formApi.setFieldValue('status', formData.value.status);
+        formType.value = 'update';
+      }
+      originalSnapshot.value = JSON.stringify(await formApi.getValues());
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      originalSnapshot.value = '';
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    formApi.setDisabled(!isEditable.value);
+    modalApi.setState({ showConfirmButton: isEditable.value });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getReturnVendor(data.id);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    }
+    originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+    <!-- 非新建模式展示物料信息 -->
+    <template v-if="formData?.id">
+      <ElDivider>物料信息</ElDivider>
+      <div class="mx-4">
+        <LineList
+          :form-type="formType"
+          :return-id="formData.id"
+          :vendor-id="formData.vendorId"
+        />
+      </div>
+    </template>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <ElPopconfirm
+          v-if="canSubmit"
+          title="确认提交该退货单？【提交后将不能修改】"
+          width="260"
+          @confirm="handleSubmit"
+        >
+          <template #reference>
+            <ElButton type="primary">提交</ElButton>
+          </template>
+        </ElPopconfirm>
+        <ElButton v-if="isStock" type="primary" @click="handleStock">
+          执行拣货
+        </ElButton>
+        <ElPopconfirm
+          v-if="isFinish"
+          title="确认完成该退货单并执行退货？"
+          width="260"
+          @confirm="handleFinish"
+        >
+          <template #reference>
+            <ElButton type="primary">完成退货</ElButton>
+          </template>
+        </ElPopconfirm>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/returnvendor/modules/line-form.vue b/apps/web-ele/src/views/mes/wm/returnvendor/modules/line-form.vue
new file mode 100644
index 000000000..a31191f74
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/returnvendor/modules/line-form.vue
@@ -0,0 +1,99 @@
+<script lang="ts" setup>
+import type { MesWmReturnVendorLineApi } from '#/api/mes/wm/returnvendor/line';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createReturnVendorLine,
+  getReturnVendorLine,
+  updateReturnVendorLine,
+} from '#/api/mes/wm/returnvendor/line';
+import { $t } from '#/locales';
+
+import { useLineFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesWmReturnVendorLineApi.ReturnVendorLine>();
+const returnId = ref<number>(); // 所属退货单编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['供应商退货单行'])
+    : $t('ui.actionTitle.create', ['供应商退货单行']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 90,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmReturnVendorLineApi.ReturnVendorLine;
+    data.returnId = returnId.value;
+    try {
+      await (formData.value?.id
+        ? updateReturnVendorLine({ ...data, id: formData.value.id })
+        : createReturnVendorLine(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{
+      id?: number;
+      returnId: number;
+      vendorId?: number;
+    }>();
+    returnId.value = data.returnId;
+    formApi.setState({ schema: useLineFormSchema(data.vendorId, formApi) });
+    if (!data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getReturnVendorLine(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/returnvendor/modules/line-list.vue b/apps/web-ele/src/views/mes/wm/returnvendor/modules/line-list.vue
new file mode 100644
index 000000000..b6586c6e7
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/returnvendor/modules/line-list.vue
@@ -0,0 +1,235 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmReturnVendorDetailApi } from '#/api/mes/wm/returnvendor/detail';
+import type { MesWmReturnVendorLineApi } from '#/api/mes/wm/returnvendor/line';
+
+import { computed, reactive } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getReturnVendorDetailListByLineId } from '#/api/mes/wm/returnvendor/detail';
+import {
+  deleteReturnVendorLine,
+  getReturnVendorLinePage,
+} from '#/api/mes/wm/returnvendor/line';
+import { $t } from '#/locales';
+import { PrinterLabel } from '#/views/mes/wm/barcode/components';
+
+import { type FormType, useLineGridColumns } from '../data';
+import DetailForm from './detail-form.vue';
+import DetailList from './detail-list.vue';
+import LineForm from './line-form.vue';
+
+const props = defineProps<{
+  formType: FormType;
+  returnId: number;
+  vendorId?: number;
+}>();
+
+const isEditable = computed(() => // 是否可编辑明细行
+  ['create', 'update'].includes(props.formType),
+);
+const isStock = computed(() => props.formType === 'stock'); // 是否为拣货模式
+const detailMap = reactive<
+  Record<number, MesWmReturnVendorDetailApi.ReturnVendorDetail[]>
+>({}); // 已展开行的拣货明细缓存
+
+const [LineFormModal, lineFormModalApi] = useVbenModal({
+  connectedComponent: LineForm,
+  destroyOnClose: true,
+});
+
+const [DetailFormModal, detailFormModalApi] = useVbenModal({
+  connectedComponent: DetailForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  for (const id of Object.keys(detailMap)) {
+    delete detailMap[Number(id)];
+  }
+  gridApi.query();
+}
+
+/** 添加物料 */
+function handleCreate() {
+  lineFormModalApi
+    .setData({ returnId: props.returnId, vendorId: props.vendorId })
+    .open();
+}
+
+/** 编辑物料 */
+function handleEdit(row: MesWmReturnVendorLineApi.ReturnVendorLine) {
+  lineFormModalApi
+    .setData({ id: row.id, returnId: props.returnId, vendorId: props.vendorId })
+    .open();
+}
+
+/** 删除物料 */
+async function handleDelete(row: MesWmReturnVendorLineApi.ReturnVendorLine) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.itemName]),
+  });
+  try {
+    await deleteReturnVendorLine(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.itemName]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+/** 拣货：直接打开明细创建表单 */
+function handlePicking(row: MesWmReturnVendorLineApi.ReturnVendorLine) {
+  openDetailForm(row.id!, row.itemId);
+}
+
+/** 打开拣货明细表单 */
+function openDetailForm(lineId: number, itemId?: number, detailId?: number) {
+  detailFormModalApi
+    .setData({ detailId, itemId, lineId, returnId: props.returnId })
+    .open();
+}
+
+/** 获取已展开行的拣货明细 */
+function getExpandedDetails(row: MesWmReturnVendorLineApi.ReturnVendorLine) {
+  return detailMap[row.id!] || [];
+}
+
+/** 加载指定行的拣货明细 */
+async function loadLineDetails(lineId: number) {
+  detailMap[lineId] = await getReturnVendorDetailListByLineId(lineId);
+}
+
+/** 展开行时懒加载拣货明细 */
+async function handleExpandChange(
+  row: MesWmReturnVendorLineApi.ReturnVendorLine,
+  expanded: boolean,
+) {
+  if (!expanded) {
+    return;
+  }
+  await loadLineDetails(row.id!);
+}
+
+/** 明细表单提交成功后，刷新对应行已展开的明细 */
+async function handleDetailSuccess(lineId: number) {
+  await loadLineDetails(lineId);
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useLineGridColumns(isEditable.value, isStock.value),
+    expandConfig: {
+      padding: true,
+    },
+    height: 400,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.returnId) {
+            return { list: [], total: 0 };
+          }
+          return await getReturnVendorLinePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            returnId: props.returnId,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesWmReturnVendorLineApi.ReturnVendorLine>,
+  gridEvents: {
+    toggleRowExpand: ({
+      expanded,
+      row,
+    }: {
+      expanded: boolean;
+      row: MesWmReturnVendorLineApi.ReturnVendorLine;
+    }) => {
+      handleExpandChange(row, expanded);
+    },
+  },
+});
+</script>
+
+<template>
+  <div>
+    <LineFormModal @success="handleRefresh" />
+    <DetailFormModal @success="handleDetailSuccess" />
+    <Grid table-title="物料信息">
+      <template v-if="isEditable" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '添加物料',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #detail="{ row }">
+        <DetailList
+          :details="getExpandedDetails(row)"
+          :form-type="formType"
+          @edit="(detailId) => openDetailForm(row.id!, row.itemId, detailId)"
+          @refresh="loadLineDetails(row.id!)"
+        />
+      </template>
+      <template #actions="{ row }">
+        <div class="flex items-center justify-center">
+          <TableAction
+            :actions="[
+              {
+                label: $t('common.edit'),
+                type: 'primary',
+                link: true,
+                icon: ACTION_ICON.EDIT,
+                ifShow: isEditable,
+                onClick: handleEdit.bind(null, row),
+              },
+              {
+                label: $t('common.delete'),
+                type: 'danger',
+                link: true,
+                icon: ACTION_ICON.DELETE,
+                ifShow: isEditable,
+                popConfirm: {
+                  title: $t('ui.actionMessage.deleteConfirm', [row.itemName]),
+                  confirm: handleDelete.bind(null, row),
+                },
+              },
+              {
+                label: '拣货',
+                type: 'primary',
+                link: true,
+                ifShow: isStock,
+                onClick: handlePicking.bind(null, row),
+              },
+            ]"
+          />
+          <PrinterLabel
+            v-if="isStock"
+            :biz-code="row.batchCode"
+            :biz-id="row.batchId"
+            biz-type="BATCH"
+          />
+        </div>
+      </template>
+    </Grid>
+  </div>
+</template>

From f5fbd85e262f86270e5f2f6a8870ad13eb7d087d Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 30 May 2026 11:08:37 +0800
Subject: [PATCH 42/52] =?UTF-8?q?feat(mes):=20=E8=BF=81=E7=A7=BB=20wm=20?=
 =?UTF-8?q?=E9=87=8C=E7=9A=84=20return-*=20=E7=B3=BB=E5=88=97=EF=BC=88?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wm/batch/components/wm-batch-detail.vue   | 52 +++++++++++++++++++
 .../views/mes/wm/returnissue/modules/form.vue | 28 ++++------
 .../views/mes/wm/returnsales/modules/form.vue | 27 ++++------
 .../mes/wm/returnvendor/modules/form.vue      | 27 ++++------
 .../wm/batch/components/wm-batch-detail.vue   | 51 ++++++++++++++++++
 .../views/mes/wm/returnissue/modules/form.vue | 27 ++++------
 .../views/mes/wm/returnsales/modules/form.vue | 27 ++++------
 .../mes/wm/returnvendor/modules/form.vue      | 27 ++++------
 8 files changed, 169 insertions(+), 97 deletions(-)
 create mode 100644 apps/web-antd/src/views/mes/wm/batch/components/wm-batch-detail.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/batch/components/wm-batch-detail.vue

diff --git a/apps/web-antd/src/views/mes/wm/batch/components/wm-batch-detail.vue b/apps/web-antd/src/views/mes/wm/batch/components/wm-batch-detail.vue
new file mode 100644
index 000000000..2f0dff089
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/batch/components/wm-batch-detail.vue
@@ -0,0 +1,52 @@
+<script lang="ts" setup>
+import type { MesWmBatchApi } from '#/api/mes/wm/batch';
+
+import { ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { getBatch } from '#/api/mes/wm/batch';
+import { useDescription } from '#/components/description';
+
+import { useDetailSchema } from '../data';
+
+const detailData = ref<MesWmBatchApi.Batch>(); // 当前批次详情
+
+const [Descriptions] = useDescription({
+  bordered: true,
+  column: 3,
+  schema: useDetailSchema(),
+  useCard: false,
+});
+
+const [Modal, modalApi] = useVbenModal({
+  showCancelButton: false,
+  showConfirmButton: false,
+  async onOpenChange(isOpen) {
+    if (!isOpen) {
+      detailData.value = undefined;
+      return;
+    }
+    const data = modalApi.getData<{ id?: number }>();
+    if (!data?.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      detailData.value = await getBatch(data.id);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+
+defineExpose({
+  open: (id: number) => modalApi.setData({ id }).open(),
+});
+</script>
+
+<template>
+  <Modal title="批次详情" class="w-3/5">
+    <Descriptions class="mx-4" :data="detailData" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/returnissue/modules/form.vue b/apps/web-antd/src/views/mes/wm/returnissue/modules/form.vue
index b971108b1..2251ecd48 100644
--- a/apps/web-antd/src/views/mes/wm/returnissue/modules/form.vue
+++ b/apps/web-antd/src/views/mes/wm/returnissue/modules/form.vue
@@ -37,25 +37,19 @@ const canSubmit = computed(() => // 是否可提交
   formType.value === 'update' &&
   formData.value?.status === MesWmReturnIssueStatusEnum.PREPARE,
 );
-// TODO @AI：这种标题风格，需要调整对齐
 const getTitle = computed(() => {
-  switch (formType.value) {
-    case 'detail': {
-      return $t('ui.actionTitle.view', ['生产退料单']);
-    }
-    case 'finish': {
-      return '执行退料';
-    }
-    case 'stock': {
-      return '入库上架';
-    }
-    case 'update': {
-      return $t('ui.actionTitle.edit', ['生产退料单']);
-    }
-    default: {
-      return $t('ui.actionTitle.create', ['生产退料单']);
-    }
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['生产退料单']);
   }
+  if (formType.value === 'stock') {
+    return '入库上架';
+  }
+  if (formType.value === 'finish') {
+    return '执行退料';
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['生产退料单'])
+    : $t('ui.actionTitle.create', ['生产退料单']);
 });
 
 const [Form, formApi] = useVbenForm({
diff --git a/apps/web-antd/src/views/mes/wm/returnsales/modules/form.vue b/apps/web-antd/src/views/mes/wm/returnsales/modules/form.vue
index 18f98fb6b..d329c1d62 100644
--- a/apps/web-antd/src/views/mes/wm/returnsales/modules/form.vue
+++ b/apps/web-antd/src/views/mes/wm/returnsales/modules/form.vue
@@ -38,23 +38,18 @@ const canSubmit = computed(() => // 是否可提交
   formData.value?.status === MesWmReturnSalesStatusEnum.PREPARE,
 );
 const getTitle = computed(() => {
-  switch (formType.value) {
-    case 'detail': {
-      return $t('ui.actionTitle.view', ['销售退货单']);
-    }
-    case 'finish': {
-      return '执行退货';
-    }
-    case 'stock': {
-      return '执行上架';
-    }
-    case 'update': {
-      return $t('ui.actionTitle.edit', ['销售退货单']);
-    }
-    default: {
-      return $t('ui.actionTitle.create', ['销售退货单']);
-    }
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['销售退货单']);
   }
+  if (formType.value === 'stock') {
+    return '执行上架';
+  }
+  if (formType.value === 'finish') {
+    return '执行退货';
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['销售退货单'])
+    : $t('ui.actionTitle.create', ['销售退货单']);
 });
 
 const [Form, formApi] = useVbenForm({
diff --git a/apps/web-antd/src/views/mes/wm/returnvendor/modules/form.vue b/apps/web-antd/src/views/mes/wm/returnvendor/modules/form.vue
index 137cab234..332591901 100644
--- a/apps/web-antd/src/views/mes/wm/returnvendor/modules/form.vue
+++ b/apps/web-antd/src/views/mes/wm/returnvendor/modules/form.vue
@@ -39,23 +39,18 @@ const canSubmit = computed(() => // 是否可提交
   formData.value?.status === MesWmReturnVendorStatusEnum.PREPARE,
 );
 const getTitle = computed(() => {
-  switch (formType.value) {
-    case 'detail': {
-      return $t('ui.actionTitle.view', ['供应商退货单']);
-    }
-    case 'finish': {
-      return '完成退货';
-    }
-    case 'stock': {
-      return '执行拣货';
-    }
-    case 'update': {
-      return $t('ui.actionTitle.edit', ['供应商退货单']);
-    }
-    default: {
-      return $t('ui.actionTitle.create', ['供应商退货单']);
-    }
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['供应商退货单']);
   }
+  if (formType.value === 'stock') {
+    return '执行拣货';
+  }
+  if (formType.value === 'finish') {
+    return '完成退货';
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['供应商退货单'])
+    : $t('ui.actionTitle.create', ['供应商退货单']);
 });
 
 const [Form, formApi] = useVbenForm({
diff --git a/apps/web-ele/src/views/mes/wm/batch/components/wm-batch-detail.vue b/apps/web-ele/src/views/mes/wm/batch/components/wm-batch-detail.vue
new file mode 100644
index 000000000..dc5f483e8
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/batch/components/wm-batch-detail.vue
@@ -0,0 +1,51 @@
+<script lang="ts" setup>
+import type { MesWmBatchApi } from '#/api/mes/wm/batch';
+
+import { ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { getBatch } from '#/api/mes/wm/batch';
+import { useDescription } from '#/components/description';
+
+import { useDetailSchema } from '../data';
+
+const detailData = ref<MesWmBatchApi.Batch>(); // 当前批次详情
+
+const [Descriptions] = useDescription({
+  border: true,
+  column: 3,
+  schema: useDetailSchema(),
+});
+
+const [Modal, modalApi] = useVbenModal({
+  showCancelButton: false,
+  showConfirmButton: false,
+  async onOpenChange(isOpen) {
+    if (!isOpen) {
+      detailData.value = undefined;
+      return;
+    }
+    const data = modalApi.getData<{ id?: number }>();
+    if (!data?.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      detailData.value = await getBatch(data.id);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+
+defineExpose({
+  open: (id: number) => modalApi.setData({ id }).open(),
+});
+</script>
+
+<template>
+  <Modal title="批次详情" class="w-3/5">
+    <Descriptions class="mx-4" :data="detailData" />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/returnissue/modules/form.vue b/apps/web-ele/src/views/mes/wm/returnissue/modules/form.vue
index 2cd07a421..b8e4c6d09 100644
--- a/apps/web-ele/src/views/mes/wm/returnissue/modules/form.vue
+++ b/apps/web-ele/src/views/mes/wm/returnissue/modules/form.vue
@@ -38,23 +38,18 @@ const canSubmit = computed(() => // 是否可提交
   formData.value?.status === MesWmReturnIssueStatusEnum.PREPARE,
 );
 const getTitle = computed(() => {
-  switch (formType.value) {
-    case 'detail': {
-      return $t('ui.actionTitle.view', ['生产退料单']);
-    }
-    case 'finish': {
-      return '执行退料';
-    }
-    case 'stock': {
-      return '入库上架';
-    }
-    case 'update': {
-      return $t('ui.actionTitle.edit', ['生产退料单']);
-    }
-    default: {
-      return $t('ui.actionTitle.create', ['生产退料单']);
-    }
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['生产退料单']);
   }
+  if (formType.value === 'stock') {
+    return '入库上架';
+  }
+  if (formType.value === 'finish') {
+    return '执行退料';
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['生产退料单'])
+    : $t('ui.actionTitle.create', ['生产退料单']);
 });
 
 const [Form, formApi] = useVbenForm({
diff --git a/apps/web-ele/src/views/mes/wm/returnsales/modules/form.vue b/apps/web-ele/src/views/mes/wm/returnsales/modules/form.vue
index 8b4094bbe..cd34c9798 100644
--- a/apps/web-ele/src/views/mes/wm/returnsales/modules/form.vue
+++ b/apps/web-ele/src/views/mes/wm/returnsales/modules/form.vue
@@ -38,23 +38,18 @@ const canSubmit = computed(() => // 是否可提交
   formData.value?.status === MesWmReturnSalesStatusEnum.PREPARE,
 );
 const getTitle = computed(() => {
-  switch (formType.value) {
-    case 'detail': {
-      return $t('ui.actionTitle.view', ['销售退货单']);
-    }
-    case 'finish': {
-      return '执行退货';
-    }
-    case 'stock': {
-      return '执行上架';
-    }
-    case 'update': {
-      return $t('ui.actionTitle.edit', ['销售退货单']);
-    }
-    default: {
-      return $t('ui.actionTitle.create', ['销售退货单']);
-    }
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['销售退货单']);
   }
+  if (formType.value === 'stock') {
+    return '执行上架';
+  }
+  if (formType.value === 'finish') {
+    return '执行退货';
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['销售退货单'])
+    : $t('ui.actionTitle.create', ['销售退货单']);
 });
 
 const [Form, formApi] = useVbenForm({
diff --git a/apps/web-ele/src/views/mes/wm/returnvendor/modules/form.vue b/apps/web-ele/src/views/mes/wm/returnvendor/modules/form.vue
index e35ca121b..bf17b4d9a 100644
--- a/apps/web-ele/src/views/mes/wm/returnvendor/modules/form.vue
+++ b/apps/web-ele/src/views/mes/wm/returnvendor/modules/form.vue
@@ -39,23 +39,18 @@ const canSubmit = computed(() => // 是否可提交
   formData.value?.status === MesWmReturnVendorStatusEnum.PREPARE,
 );
 const getTitle = computed(() => {
-  switch (formType.value) {
-    case 'detail': {
-      return $t('ui.actionTitle.view', ['供应商退货单']);
-    }
-    case 'finish': {
-      return '完成退货';
-    }
-    case 'stock': {
-      return '执行拣货';
-    }
-    case 'update': {
-      return $t('ui.actionTitle.edit', ['供应商退货单']);
-    }
-    default: {
-      return $t('ui.actionTitle.create', ['供应商退货单']);
-    }
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['供应商退货单']);
   }
+  if (formType.value === 'stock') {
+    return '执行拣货';
+  }
+  if (formType.value === 'finish') {
+    return '完成退货';
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['供应商退货单'])
+    : $t('ui.actionTitle.create', ['供应商退货单']);
 });
 
 const [Form, formApi] = useVbenForm({

From 83482781d6be7c0effbc6f5635235a737d47e315 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 30 May 2026 11:09:48 +0800
Subject: [PATCH 43/52] =?UTF-8?q?feat(mes):=20=E8=BF=81=E7=A7=BB=20wm=20?=
 =?UTF-8?q?=E9=87=8C=E7=9A=84=20=E4=BA=A7=E5=93=81=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=EF=BC=88wm=5Fproduct=5Frecpt=EF=BC=89=E3=80=81=E3=80=81?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93=EF=BC=88wm=5Fproduct=5Fsal?=
 =?UTF-8?q?es=EF=BC=89=E3=80=81=E9=94=80=E5=94=AE=E5=8F=91=E8=B4=A7?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=EF=BC=88wm=5Fsales=5Fnotice=EF=BC=89?=
 =?UTF-8?q?=E3=80=81=E9=A2=86=E6=96=99=E5=87=BA=E5=BA=93=EF=BC=88wm=5Fprod?=
 =?UTF-8?q?uction=5Fissue=EF=BC=89=E3=80=81=E9=87=87=E8=B4=AD=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=EF=BC=88wm=5Fitem=5Frecpt=EF=BC=89=E3=80=81=E5=88=B0?=
 =?UTF-8?q?=E8=B4=A7=E9=80=9A=E7=9F=A5=EF=BC=88wm=5Farrival=5Fnotice?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/wm/arrivalnotice/components/index.ts  |   2 +
 .../wm-arrival-notice-line-select-dialog.vue  | 203 ++++++
 .../wm-arrival-notice-line-select.vue         | 151 ++++
 .../wm-arrival-notice-select-dialog.vue       | 262 +++++++
 .../components/wm-arrival-notice-select.vue   | 138 ++++
 .../src/views/mes/wm/arrivalnotice/data.ts    | 353 +++++++++
 .../src/views/mes/wm/arrivalnotice/index.vue  | 187 +++++
 .../mes/wm/arrivalnotice/modules/form.vue     | 168 +++++
 .../wm/arrivalnotice/modules/line-form.vue    |  94 +++
 .../wm/arrivalnotice/modules/line-list.vue    | 139 ++++
 .../src/views/mes/wm/itemreceipt/data.ts      | 530 ++++++++++++++
 .../src/views/mes/wm/itemreceipt/index.vue    | 209 ++++++
 .../wm/itemreceipt/modules/detail-form.vue    | 104 +++
 .../wm/itemreceipt/modules/detail-list.vue    | 103 +++
 .../views/mes/wm/itemreceipt/modules/form.vue | 238 ++++++
 .../mes/wm/itemreceipt/modules/line-form.vue  | 104 +++
 .../mes/wm/itemreceipt/modules/line-list.vue  | 238 ++++++
 .../src/views/mes/wm/productissue/data.ts     | 474 ++++++++++++
 .../src/views/mes/wm/productissue/index.vue   | 227 ++++++
 .../wm/productissue/modules/detail-form.vue   | 104 +++
 .../wm/productissue/modules/detail-list.vue   | 103 +++
 .../mes/wm/productissue/modules/form.vue      | 229 ++++++
 .../mes/wm/productissue/modules/line-form.vue |  94 +++
 .../mes/wm/productissue/modules/line-list.vue | 220 ++++++
 .../src/views/mes/wm/productreceipt/data.ts   | 454 ++++++++++++
 .../src/views/mes/wm/productreceipt/index.vue | 209 ++++++
 .../wm/productreceipt/modules/detail-form.vue | 104 +++
 .../wm/productreceipt/modules/detail-list.vue | 103 +++
 .../mes/wm/productreceipt/modules/form.vue    | 235 ++++++
 .../wm/productreceipt/modules/line-form.vue   |  95 +++
 .../wm/productreceipt/modules/line-list.vue   | 249 +++++++
 .../src/views/mes/wm/productsales/data.ts     | 688 +++++++++++++++++
 .../src/views/mes/wm/productsales/index.vue   | 223 ++++++
 .../wm/productsales/modules/detail-form.vue   | 110 +++
 .../wm/productsales/modules/detail-list.vue   | 103 +++
 .../mes/wm/productsales/modules/form.vue      | 266 +++++++
 .../mes/wm/productsales/modules/line-form.vue | 104 +++
 .../mes/wm/productsales/modules/line-list.vue | 233 ++++++
 .../mes/wm/salesnotice/components/index.ts    |   2 +
 .../wm-sales-notice-line-select-dialog.vue    | 198 +++++
 .../wm-sales-notice-line-select.vue           | 151 ++++
 .../wm-sales-notice-select-dialog.vue         | 262 +++++++
 .../components/wm-sales-notice-select.vue     | 138 ++++
 .../src/views/mes/wm/salesnotice/data.ts      | 363 +++++++++
 .../src/views/mes/wm/salesnotice/index.vue    | 176 +++++
 .../views/mes/wm/salesnotice/modules/form.vue | 179 +++++
 .../mes/wm/salesnotice/modules/line-form.vue  |  94 +++
 .../mes/wm/salesnotice/modules/line-list.vue  | 137 ++++
 .../mes/wm/arrivalnotice/components/index.ts  |   2 +
 .../wm-arrival-notice-line-select-dialog.vue  | 206 ++++++
 .../wm-arrival-notice-line-select.vue         | 149 ++++
 .../wm-arrival-notice-select-dialog.vue       | 265 +++++++
 .../components/wm-arrival-notice-select.vue   | 136 ++++
 .../src/views/mes/wm/arrivalnotice/data.ts    | 354 +++++++++
 .../src/views/mes/wm/arrivalnotice/index.vue  | 189 +++++
 .../mes/wm/arrivalnotice/modules/form.vue     | 171 +++++
 .../wm/arrivalnotice/modules/line-form.vue    |  94 +++
 .../wm/arrivalnotice/modules/line-list.vue    | 139 ++++
 .../src/views/mes/wm/itemreceipt/data.ts      | 534 ++++++++++++++
 .../src/views/mes/wm/itemreceipt/index.vue    | 211 ++++++
 .../wm/itemreceipt/modules/detail-form.vue    | 104 +++
 .../wm/itemreceipt/modules/detail-list.vue    | 103 +++
 .../views/mes/wm/itemreceipt/modules/form.vue | 241 ++++++
 .../mes/wm/itemreceipt/modules/line-form.vue  | 104 +++
 .../mes/wm/itemreceipt/modules/line-list.vue  | 239 ++++++
 .../src/views/mes/wm/productissue/data.ts     | 476 ++++++++++++
 .../src/views/mes/wm/productissue/index.vue   | 230 ++++++
 .../wm/productissue/modules/detail-form.vue   | 104 +++
 .../wm/productissue/modules/detail-list.vue   | 103 +++
 .../mes/wm/productissue/modules/form.vue      | 235 ++++++
 .../mes/wm/productissue/modules/line-form.vue |  94 +++
 .../mes/wm/productissue/modules/line-list.vue | 221 ++++++
 .../src/views/mes/wm/productreceipt/data.ts   | 457 ++++++++++++
 .../src/views/mes/wm/productreceipt/index.vue | 211 ++++++
 .../wm/productreceipt/modules/detail-form.vue | 104 +++
 .../wm/productreceipt/modules/detail-list.vue | 103 +++
 .../mes/wm/productreceipt/modules/form.vue    | 238 ++++++
 .../wm/productreceipt/modules/line-form.vue   |  95 +++
 .../wm/productreceipt/modules/line-list.vue   | 251 +++++++
 .../src/views/mes/wm/productsales/data.ts     | 689 ++++++++++++++++++
 .../src/views/mes/wm/productsales/index.vue   | 226 ++++++
 .../wm/productsales/modules/detail-form.vue   | 110 +++
 .../wm/productsales/modules/detail-list.vue   | 103 +++
 .../mes/wm/productsales/modules/form.vue      | 275 +++++++
 .../mes/wm/productsales/modules/line-form.vue | 104 +++
 .../mes/wm/productsales/modules/line-list.vue | 234 ++++++
 .../mes/wm/salesnotice/components/index.ts    |   2 +
 .../wm-sales-notice-line-select-dialog.vue    | 201 +++++
 .../wm-sales-notice-line-select.vue           | 149 ++++
 .../wm-sales-notice-select-dialog.vue         | 265 +++++++
 .../components/wm-sales-notice-select.vue     | 136 ++++
 .../src/views/mes/wm/salesnotice/data.ts      | 364 +++++++++
 .../src/views/mes/wm/salesnotice/index.vue    | 177 +++++
 .../views/mes/wm/salesnotice/modules/form.vue | 182 +++++
 .../mes/wm/salesnotice/modules/line-form.vue  |  94 +++
 .../mes/wm/salesnotice/modules/line-list.vue  | 137 ++++
 96 files changed, 19161 insertions(+)
 create mode 100644 apps/web-antd/src/views/mes/wm/arrivalnotice/components/index.ts
 create mode 100644 apps/web-antd/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-line-select-dialog.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-line-select.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-select-dialog.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-select.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/arrivalnotice/data.ts
 create mode 100644 apps/web-antd/src/views/mes/wm/arrivalnotice/index.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/arrivalnotice/modules/form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/arrivalnotice/modules/line-form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/arrivalnotice/modules/line-list.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/itemreceipt/data.ts
 create mode 100644 apps/web-antd/src/views/mes/wm/itemreceipt/index.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/itemreceipt/modules/detail-form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/itemreceipt/modules/detail-list.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/itemreceipt/modules/form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/itemreceipt/modules/line-form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/itemreceipt/modules/line-list.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/productissue/data.ts
 create mode 100644 apps/web-antd/src/views/mes/wm/productissue/index.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/productissue/modules/detail-form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/productissue/modules/detail-list.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/productissue/modules/form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/productissue/modules/line-form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/productissue/modules/line-list.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/productreceipt/data.ts
 create mode 100644 apps/web-antd/src/views/mes/wm/productreceipt/index.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/productreceipt/modules/detail-form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/productreceipt/modules/detail-list.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/productreceipt/modules/form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/productreceipt/modules/line-form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/productreceipt/modules/line-list.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/productsales/data.ts
 create mode 100644 apps/web-antd/src/views/mes/wm/productsales/index.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/productsales/modules/detail-form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/productsales/modules/detail-list.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/productsales/modules/form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/productsales/modules/line-form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/productsales/modules/line-list.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/salesnotice/components/index.ts
 create mode 100644 apps/web-antd/src/views/mes/wm/salesnotice/components/wm-sales-notice-line-select-dialog.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/salesnotice/components/wm-sales-notice-line-select.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/salesnotice/components/wm-sales-notice-select-dialog.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/salesnotice/components/wm-sales-notice-select.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/salesnotice/data.ts
 create mode 100644 apps/web-antd/src/views/mes/wm/salesnotice/index.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/salesnotice/modules/form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/salesnotice/modules/line-form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/salesnotice/modules/line-list.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/arrivalnotice/components/index.ts
 create mode 100644 apps/web-ele/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-line-select-dialog.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-line-select.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-select-dialog.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-select.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/arrivalnotice/data.ts
 create mode 100644 apps/web-ele/src/views/mes/wm/arrivalnotice/index.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/arrivalnotice/modules/form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/arrivalnotice/modules/line-form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/arrivalnotice/modules/line-list.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/itemreceipt/data.ts
 create mode 100644 apps/web-ele/src/views/mes/wm/itemreceipt/index.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/itemreceipt/modules/detail-form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/itemreceipt/modules/detail-list.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/itemreceipt/modules/form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/itemreceipt/modules/line-form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/itemreceipt/modules/line-list.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/productissue/data.ts
 create mode 100644 apps/web-ele/src/views/mes/wm/productissue/index.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/productissue/modules/detail-form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/productissue/modules/detail-list.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/productissue/modules/form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/productissue/modules/line-form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/productissue/modules/line-list.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/productreceipt/data.ts
 create mode 100644 apps/web-ele/src/views/mes/wm/productreceipt/index.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/productreceipt/modules/detail-form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/productreceipt/modules/detail-list.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/productreceipt/modules/form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/productreceipt/modules/line-form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/productreceipt/modules/line-list.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/productsales/data.ts
 create mode 100644 apps/web-ele/src/views/mes/wm/productsales/index.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/productsales/modules/detail-form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/productsales/modules/detail-list.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/productsales/modules/form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/productsales/modules/line-form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/productsales/modules/line-list.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/salesnotice/components/index.ts
 create mode 100644 apps/web-ele/src/views/mes/wm/salesnotice/components/wm-sales-notice-line-select-dialog.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/salesnotice/components/wm-sales-notice-line-select.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/salesnotice/components/wm-sales-notice-select-dialog.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/salesnotice/components/wm-sales-notice-select.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/salesnotice/data.ts
 create mode 100644 apps/web-ele/src/views/mes/wm/salesnotice/index.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/salesnotice/modules/form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/salesnotice/modules/line-form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/salesnotice/modules/line-list.vue

diff --git a/apps/web-antd/src/views/mes/wm/arrivalnotice/components/index.ts b/apps/web-antd/src/views/mes/wm/arrivalnotice/components/index.ts
new file mode 100644
index 000000000..1da3df21b
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/arrivalnotice/components/index.ts
@@ -0,0 +1,2 @@
+export { default as WmArrivalNoticeLineSelect } from './wm-arrival-notice-line-select.vue';
+export { default as WmArrivalNoticeSelect } from './wm-arrival-notice-select.vue';
diff --git a/apps/web-antd/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-line-select-dialog.vue b/apps/web-antd/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-line-select-dialog.vue
new file mode 100644
index 000000000..8081565ca
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-line-select-dialog.vue
@@ -0,0 +1,203 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmArrivalNoticeLineApi } from '#/api/mes/wm/arrivalnotice/line';
+
+import { nextTick, ref } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+
+import { message, Modal } from 'ant-design-vue';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getArrivalNoticeLinePage } from '#/api/mes/wm/arrivalnotice/line';
+
+const emit = defineEmits<{
+  selected: [rows: MesWmArrivalNoticeLineApi.ArrivalNoticeLine[]];
+}>();
+
+const open = ref(false); // 弹窗是否打开
+const noticeId = ref<number>(); // 所属通知单编号
+const syncingSingleSelection = ref(false); // 是否同步单选勾选状态
+const selectedRows = ref<MesWmArrivalNoticeLineApi.ArrivalNoticeLine[]>([]); // 已选行列表
+const preSelectedIds = ref<number[]>([]); // 预选行编号列表
+
+/** 表格字段 */
+function useGridColumns(): VxeTableGridOptions<MesWmArrivalNoticeLineApi.ArrivalNoticeLine>['columns'] {
+  return [
+    {
+      type: 'checkbox',
+      width: 50,
+    },
+    {
+      field: 'itemCode',
+      title: '物料编码',
+      minWidth: 120,
+    },
+    {
+      field: 'itemName',
+      title: '物料名称',
+      minWidth: 140,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'arrivalQuantity',
+      title: '到货数量',
+      width: 100,
+    },
+    {
+      field: 'iqcCheckFlag',
+      title: '是否检验',
+      width: 90,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+      },
+    },
+    {
+      field: 'qualifiedQuantity',
+      title: '合格数量',
+      width: 100,
+    },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 120,
+    },
+  ];
+}
+
+/** 单选模式下同步 VXE 勾选状态 */
+async function syncSingleSelection(
+  row?: MesWmArrivalNoticeLineApi.ArrivalNoticeLine,
+) {
+  syncingSingleSelection.value = true;
+  await nextTick();
+  await gridApi.grid.clearCheckboxRow();
+  if (row) {
+    await gridApi.grid.setCheckboxRow(row, true);
+  }
+  await nextTick();
+  syncingSingleSelection.value = false;
+}
+
+/** 处理勾选变化，只保留最后一条 */
+async function handleCheckboxChange({
+  checked,
+  row,
+}: {
+  checked: boolean;
+  row?: MesWmArrivalNoticeLineApi.ArrivalNoticeLine;
+}) {
+  if (syncingSingleSelection.value) {
+    return;
+  }
+  const selected = checked && row ? [row] : [];
+  selectedRows.value = selected;
+  await syncSingleSelection(selected[0]);
+}
+
+/** 回显预选行 */
+function applyPreSelection() {
+  if (preSelectedIds.value.length === 0) {
+    return;
+  }
+  const rows =
+    gridApi.grid.getData() as MesWmArrivalNoticeLineApi.ArrivalNoticeLine[];
+  for (const row of rows) {
+    if (row.id && preSelectedIds.value.includes(row.id)) {
+      gridApi.grid.setCheckboxRow(row, true);
+      selectedRows.value = [row];
+    }
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 460,
+    keepSource: true,
+    checkboxConfig: {
+      highlight: true,
+      reserve: true,
+    },
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!noticeId.value) {
+            return { list: [], total: 0 };
+          }
+          return await getArrivalNoticeLinePage({
+            noticeId: noticeId.value,
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesWmArrivalNoticeLineApi.ArrivalNoticeLine>,
+  gridEvents: {
+    checkboxChange: handleCheckboxChange,
+  },
+});
+
+/** 打开行选择弹窗 */
+async function openModal(id: number | undefined, selectedIds?: number[]) {
+  open.value = true;
+  noticeId.value = id;
+  preSelectedIds.value = selectedIds || [];
+  selectedRows.value = [];
+  await nextTick();
+  await gridApi.grid.clearCheckboxRow();
+  await gridApi.query();
+  await nextTick();
+  applyPreSelection();
+}
+
+/** 关闭弹窗 */
+async function closeModal() {
+  open.value = false;
+  selectedRows.value = [];
+  await gridApi.grid.clearCheckboxRow();
+}
+
+/** 确认选择行 */
+function handleConfirm() {
+  if (selectedRows.value.length === 0) {
+    message.warning('请选择一条数据');
+    return;
+  }
+  emit('selected', [selectedRows.value[0]!]);
+  open.value = false;
+}
+
+defineExpose({ open: openModal });
+</script>
+
+<template>
+  <Modal
+    v-model:open="open"
+    title="到货通知单行选择"
+    width="70%"
+    :destroy-on-close="true"
+    @cancel="closeModal"
+    @ok="handleConfirm"
+  >
+    <Grid table-title="到货通知单行列表" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-line-select.vue b/apps/web-antd/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-line-select.vue
new file mode 100644
index 000000000..e186f465f
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-line-select.vue
@@ -0,0 +1,151 @@
+<script lang="ts" setup>
+import type { MesWmArrivalNoticeLineApi } from '#/api/mes/wm/arrivalnotice/line';
+
+import { computed, ref, useAttrs, watch } from 'vue';
+
+import { IconifyIcon } from '@vben/icons';
+
+import { Input, Tooltip } from 'ant-design-vue';
+
+import { getArrivalNoticeLine } from '#/api/mes/wm/arrivalnotice/line';
+
+import WmArrivalNoticeLineSelectDialog from './wm-arrival-notice-line-select-dialog.vue';
+
+defineOptions({ name: 'WmArrivalNoticeLineSelect', inheritAttrs: false });
+
+const props = withDefaults(
+  defineProps<{
+    allowClear?: boolean;
+    disabled?: boolean;
+    modelValue?: number;
+    noticeId?: number; // 所属到货通知单编号
+    placeholder?: string;
+  }>(),
+  {
+    allowClear: true,
+    disabled: false,
+    modelValue: undefined,
+    noticeId: undefined,
+    placeholder: '请选择到货通知单行',
+  },
+);
+
+const emit = defineEmits<{
+  change: [item: MesWmArrivalNoticeLineApi.ArrivalNoticeLine | undefined];
+  'update:modelValue': [value: number | undefined];
+}>();
+
+const attrs = useAttrs();
+const dialogRef = ref<InstanceType<typeof WmArrivalNoticeLineSelectDialog>>();
+const hovering = ref(false);
+const selectedItem = ref<MesWmArrivalNoticeLineApi.ArrivalNoticeLine>();
+
+const displayLabel = computed(() => {
+  const item = selectedItem.value;
+  if (!item) {
+    return '';
+  }
+  return `${item.itemCode ?? ''} - ${item.itemName ?? ''}`;
+});
+
+const showClear = computed(
+  () =>
+    props.allowClear &&
+    !props.disabled &&
+    hovering.value &&
+    props.modelValue != null,
+);
+
+/** 根据编号单条查询行信息（用于编辑回显） */
+async function resolveItemById(id: number | undefined) {
+  if (id == null) {
+    selectedItem.value = undefined;
+    return;
+  }
+  if (selectedItem.value?.id === id) {
+    return;
+  }
+  selectedItem.value = await getArrivalNoticeLine(id);
+}
+
+watch(() => props.modelValue, resolveItemById, { immediate: true });
+
+/** noticeId 变化时清空选中（关联的行已失效） */
+watch(
+  () => props.noticeId,
+  () => {
+    selectedItem.value = undefined;
+    emit('update:modelValue', undefined);
+    emit('change', undefined);
+  },
+);
+
+/** 清空已选行 */
+function clearSelected() {
+  selectedItem.value = undefined;
+  emit('update:modelValue', undefined);
+  emit('change', undefined);
+}
+
+/** 打开行选择弹窗 */
+function handleClick(event: MouseEvent) {
+  if (props.disabled || !props.noticeId) {
+    return;
+  }
+  const target = event.target as HTMLElement;
+  if (showClear.value && target.closest('.ant-input-suffix')) {
+    event.stopPropagation();
+    clearSelected();
+    return;
+  }
+  const selectedIds = props.modelValue == null ? [] : [props.modelValue];
+  dialogRef.value?.open(props.noticeId, selectedIds);
+}
+
+/** 弹窗选中回调 */
+function handleSelected(rows: MesWmArrivalNoticeLineApi.ArrivalNoticeLine[]) {
+  const item = rows[0];
+  if (!item) {
+    return;
+  }
+  selectedItem.value = item;
+  emit('update:modelValue', item.id);
+  emit('change', item);
+}
+</script>
+
+<template>
+  <div
+    v-bind="attrs"
+    class="w-full"
+    :class="disabled ? 'cursor-not-allowed' : 'cursor-pointer'"
+    @click="handleClick"
+    @mouseenter="hovering = true"
+    @mouseleave="hovering = false"
+  >
+    <Tooltip :mouse-enter-delay="0.5" :open="selectedItem ? undefined : false">
+      <template #title>
+        <div v-if="selectedItem" class="leading-6">
+          <div>物料编码：{{ selectedItem.itemCode || '-' }}</div>
+          <div>物料名称：{{ selectedItem.itemName || '-' }}</div>
+          <div>规格型号：{{ selectedItem.specification || '-' }}</div>
+          <div>到货数量：{{ selectedItem.arrivalQuantity ?? '-' }}</div>
+        </div>
+      </template>
+      <Input
+        :disabled="disabled"
+        :placeholder="placeholder"
+        :value="displayLabel"
+        readonly
+      >
+        <template #suffix>
+          <IconifyIcon
+            class="size-4"
+            :icon="showClear ? 'lucide:circle-x' : 'lucide:search'"
+          />
+        </template>
+      </Input>
+    </Tooltip>
+  </div>
+  <WmArrivalNoticeLineSelectDialog ref="dialogRef" @selected="handleSelected" />
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-select-dialog.vue b/apps/web-antd/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-select-dialog.vue
new file mode 100644
index 000000000..176d9e158
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-select-dialog.vue
@@ -0,0 +1,262 @@
+<script lang="ts" setup>
+import type { VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmArrivalNoticeApi } from '#/api/mes/wm/arrivalnotice';
+
+import { nextTick, ref } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+
+import { message, Modal } from 'ant-design-vue';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getArrivalNoticePage } from '#/api/mes/wm/arrivalnotice';
+
+const emit = defineEmits<{
+  selected: [rows: MesWmArrivalNoticeApi.ArrivalNotice[]];
+}>();
+
+const open = ref(false); // 弹窗是否打开
+const multiple = ref(false); // 是否多选
+const fixedStatus = ref<number>(); // 固定状态筛选
+const syncingSingleSelection = ref(false); // 是否同步单选勾选状态
+const selectedRows = ref<MesWmArrivalNoticeApi.ArrivalNotice[]>([]); // 已选通知单列表
+const preSelectedIds = ref<number[]>([]); // 预选通知单编号列表
+
+/** 搜索表单 */
+function useSearchSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '通知单编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入通知单编号',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '通知单名称',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入通知单名称',
+      },
+    },
+    {
+      fieldName: 'purchaseOrderCode',
+      label: '采购订单编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入采购订单编号',
+      },
+    },
+  ];
+}
+
+/** 表格字段 */
+function useGridColumns(): VxeTableGridOptions<MesWmArrivalNoticeApi.ArrivalNotice>['columns'] {
+  return [
+    {
+      type: 'checkbox',
+      width: 50,
+    },
+    {
+      field: 'code',
+      title: '通知单编号',
+      minWidth: 160,
+    },
+    {
+      field: 'name',
+      title: '通知单名称',
+      minWidth: 150,
+    },
+    {
+      field: 'purchaseOrderCode',
+      title: '采购订单编号',
+      minWidth: 140,
+    },
+    {
+      field: 'vendorName',
+      title: '供应商名称',
+      minWidth: 120,
+    },
+    {
+      field: 'arrivalDate',
+      title: '到货日期',
+      width: 120,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_ARRIVAL_NOTICE_STATUS },
+      },
+    },
+  ];
+}
+
+/** 单选模式下同步 VXE 勾选状态，避免跨页残留多选 */
+async function syncSingleSelection(row?: MesWmArrivalNoticeApi.ArrivalNotice) {
+  syncingSingleSelection.value = true;
+  await nextTick();
+  await gridApi.grid.clearCheckboxRow();
+  if (row) {
+    await gridApi.grid.setCheckboxRow(row, true);
+  }
+  await nextTick();
+  syncingSingleSelection.value = false;
+}
+
+/** 处理勾选变化，单选模式只保留最后一条 */
+async function handleCheckboxChange({
+  checked,
+  records,
+  row,
+}: {
+  checked: boolean;
+  records: MesWmArrivalNoticeApi.ArrivalNotice[];
+  row?: MesWmArrivalNoticeApi.ArrivalNotice;
+}) {
+  if (syncingSingleSelection.value) {
+    return;
+  }
+  if (!multiple.value) {
+    const selected = checked && row ? [row] : [];
+    selectedRows.value = selected;
+    await syncSingleSelection(selected[0]);
+    return;
+  }
+  selectedRows.value = records;
+}
+
+/** 处理全选变化 */
+function handleCheckboxAll({
+  records,
+}: {
+  records: MesWmArrivalNoticeApi.ArrivalNotice[];
+}) {
+  if (syncingSingleSelection.value) {
+    return;
+  }
+  selectedRows.value = records;
+}
+
+/** 回显预选通知单 */
+function applyPreSelection() {
+  if (preSelectedIds.value.length === 0) {
+    return;
+  }
+  const rows = gridApi.grid.getData() as MesWmArrivalNoticeApi.ArrivalNotice[];
+  for (const row of rows) {
+    if (row.id && preSelectedIds.value.includes(row.id)) {
+      gridApi.grid.setCheckboxRow(row, true);
+      if (!multiple.value) {
+        selectedRows.value = [row];
+      }
+    }
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useSearchSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 520,
+    keepSource: true,
+    checkboxConfig: {
+      highlight: true,
+      range: true,
+      reserve: true,
+    },
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getArrivalNoticePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            status: fixedStatus.value,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmArrivalNoticeApi.ArrivalNotice>,
+  gridEvents: {
+    checkboxAll: handleCheckboxAll,
+    checkboxChange: handleCheckboxChange,
+  },
+});
+
+/** 重置查询和选择状态 */
+async function resetQueryState() {
+  selectedRows.value = [];
+  await gridApi.grid.clearCheckboxRow();
+  await gridApi.formApi.resetForm();
+}
+
+/** 打开通知单选择弹窗 */
+async function openModal(
+  selectedIds?: number[],
+  options?: { multiple?: boolean; status?: number },
+) {
+  open.value = true;
+  multiple.value = options?.multiple ?? false;
+  fixedStatus.value = options?.status;
+  preSelectedIds.value = selectedIds || [];
+  await nextTick();
+  await resetQueryState();
+  await gridApi.query();
+  await nextTick();
+  applyPreSelection();
+}
+
+/** 关闭通知单选择弹窗 */
+async function closeModal() {
+  open.value = false;
+  await resetQueryState();
+}
+
+/** 确认选择通知单 */
+function handleConfirm() {
+  if (selectedRows.value.length === 0) {
+    message.warning(multiple.value ? '请至少选择一条数据' : '请选择一条数据');
+    return;
+  }
+  emit(
+    'selected',
+    multiple.value ? selectedRows.value : [selectedRows.value[0]!],
+  );
+  open.value = false;
+}
+
+defineExpose({ open: openModal });
+</script>
+
+<template>
+  <Modal
+    v-model:open="open"
+    title="到货通知单选择"
+    width="70%"
+    :destroy-on-close="true"
+    @cancel="closeModal"
+    @ok="handleConfirm"
+  >
+    <Grid table-title="到货通知单列表" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-select.vue b/apps/web-antd/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-select.vue
new file mode 100644
index 000000000..3858b7f13
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-select.vue
@@ -0,0 +1,138 @@
+<script lang="ts" setup>
+import type { MesWmArrivalNoticeApi } from '#/api/mes/wm/arrivalnotice';
+
+import { computed, ref, useAttrs, watch } from 'vue';
+
+import { IconifyIcon } from '@vben/icons';
+
+import { Input, Tooltip } from 'ant-design-vue';
+
+import { getArrivalNotice } from '#/api/mes/wm/arrivalnotice';
+
+import WmArrivalNoticeSelectDialog from './wm-arrival-notice-select-dialog.vue';
+
+defineOptions({ name: 'WmArrivalNoticeSelect', inheritAttrs: false });
+
+const props = withDefaults(
+  defineProps<{
+    allowClear?: boolean;
+    disabled?: boolean;
+    modelValue?: number;
+    placeholder?: string;
+    status?: number; // 固定状态筛选
+  }>(),
+  {
+    allowClear: true,
+    disabled: false,
+    modelValue: undefined,
+    placeholder: '请选择到货通知单',
+    status: undefined,
+  },
+);
+
+const emit = defineEmits<{
+  change: [item: MesWmArrivalNoticeApi.ArrivalNotice | undefined];
+  'update:modelValue': [value: number | undefined];
+}>();
+
+const attrs = useAttrs();
+const dialogRef = ref<InstanceType<typeof WmArrivalNoticeSelectDialog>>();
+const hovering = ref(false);
+const selectedItem = ref<MesWmArrivalNoticeApi.ArrivalNotice>();
+
+const displayLabel = computed(() => selectedItem.value?.code ?? '');
+
+const showClear = computed(
+  () =>
+    props.allowClear &&
+    !props.disabled &&
+    hovering.value &&
+    props.modelValue != null,
+);
+
+/** 根据编号单条查询通知单信息（用于编辑回显） */
+async function resolveItemById(id: number | undefined) {
+  if (id == null) {
+    selectedItem.value = undefined;
+    return;
+  }
+  if (selectedItem.value?.id === id) {
+    return;
+  }
+  selectedItem.value = await getArrivalNotice(id);
+}
+
+watch(() => props.modelValue, resolveItemById, { immediate: true });
+
+/** 清空已选通知单 */
+function clearSelected() {
+  selectedItem.value = undefined;
+  emit('update:modelValue', undefined);
+  emit('change', undefined);
+}
+
+/** 打开通知单选择弹窗 */
+function handleClick(event: MouseEvent) {
+  if (props.disabled) {
+    return;
+  }
+  const target = event.target as HTMLElement;
+  if (showClear.value && target.closest('.ant-input-suffix')) {
+    event.stopPropagation();
+    clearSelected();
+    return;
+  }
+  const selectedIds = props.modelValue == null ? [] : [props.modelValue];
+  dialogRef.value?.open(selectedIds, {
+    multiple: false,
+    status: props.status,
+  });
+}
+
+/** 弹窗选中回调 */
+function handleSelected(rows: MesWmArrivalNoticeApi.ArrivalNotice[]) {
+  const item = rows[0];
+  if (!item) {
+    return;
+  }
+  selectedItem.value = item;
+  emit('update:modelValue', item.id);
+  emit('change', item);
+}
+</script>
+
+<template>
+  <div
+    v-bind="attrs"
+    class="w-full"
+    :class="disabled ? 'cursor-not-allowed' : 'cursor-pointer'"
+    @click="handleClick"
+    @mouseenter="hovering = true"
+    @mouseleave="hovering = false"
+  >
+    <Tooltip :mouse-enter-delay="0.5" :open="selectedItem ? undefined : false">
+      <template #title>
+        <div v-if="selectedItem" class="leading-6">
+          <div>编号：{{ selectedItem.code || '-' }}</div>
+          <div>名称：{{ selectedItem.name || '-' }}</div>
+          <div>供应商：{{ selectedItem.vendorName || '-' }}</div>
+          <div>采购订单：{{ selectedItem.purchaseOrderCode || '-' }}</div>
+        </div>
+      </template>
+      <Input
+        :disabled="disabled"
+        :placeholder="placeholder"
+        :value="displayLabel"
+        readonly
+      >
+        <template #suffix>
+          <IconifyIcon
+            class="size-4"
+            :icon="showClear ? 'lucide:circle-x' : 'lucide:search'"
+          />
+        </template>
+      </Input>
+    </Tooltip>
+  </div>
+  <WmArrivalNoticeSelectDialog ref="dialogRef" @selected="handleSelected" />
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/arrivalnotice/data.ts b/apps/web-antd/src/views/mes/wm/arrivalnotice/data.ts
new file mode 100644
index 000000000..973d83b38
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/arrivalnotice/data.ts
@@ -0,0 +1,353 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmArrivalNoticeApi } from '#/api/mes/wm/arrivalnotice';
+import type { MesWmArrivalNoticeLineApi } from '#/api/mes/wm/arrivalnotice/line';
+
+import { h, markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+
+import { Button } from 'ant-design-vue';
+
+import { z } from '#/adapter/form';
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getRangePickerDefaultProps } from '#/utils';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
+import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
+/** 新增/修改的表单 */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'status',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '通知单编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入通知单编号',
+      },
+      rules: 'required',
+      suffix:
+        formType === 'detail'
+          ? undefined
+          : () =>
+              h(
+                Button,
+                {
+                  type: 'default',
+                  onClick: async () => {
+                    const code = await generateAutoCode(
+                      MesAutoCodeRuleCode.WM_ARRIVAL_NOTICE_CODE,
+                    );
+                    await formApi?.setFieldValue('code', code);
+                  },
+                },
+                { default: () => '生成' },
+              ),
+    },
+    {
+      fieldName: 'name',
+      label: '通知单名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入通知单名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'purchaseOrderCode',
+      label: '采购订单编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入采购订单编号',
+      },
+    },
+    {
+      fieldName: 'vendorId',
+      label: '供应商',
+      component: markRaw(MdVendorSelect),
+      componentProps: {
+        placeholder: '请选择供应商',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'arrivalDate',
+      label: '到货日期',
+      component: 'DatePicker',
+      componentProps: {
+        class: '!w-full',
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择到货日期',
+        valueFormat: 'x',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'contactName',
+      label: '联系人',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入联系人',
+      },
+    },
+    {
+      fieldName: 'contactTelephone',
+      label: '联系方式',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入联系方式',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '通知单编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入通知单编号',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '通知单名称',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入通知单名称',
+      },
+    },
+    {
+      fieldName: 'purchaseOrderCode',
+      label: '采购订单编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入采购订单编号',
+      },
+    },
+    {
+      fieldName: 'vendorId',
+      label: '供应商',
+      component: markRaw(MdVendorSelect),
+      componentProps: {
+        placeholder: '请选择供应商',
+      },
+    },
+    {
+      fieldName: 'arrivalDate',
+      label: '到货日期',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+        allowClear: true,
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesWmArrivalNoticeApi.ArrivalNotice>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '通知单编号',
+      minWidth: 160,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '通知单名称',
+      minWidth: 150,
+    },
+    {
+      field: 'purchaseOrderCode',
+      title: '采购订单编号',
+      minWidth: 140,
+    },
+    {
+      field: 'vendorName',
+      title: '供应商名称',
+      minWidth: 120,
+    },
+    {
+      field: 'contactName',
+      title: '联系人',
+      minWidth: 100,
+    },
+    {
+      field: 'contactTelephone',
+      title: '联系方式',
+      minWidth: 120,
+    },
+    {
+      field: 'arrivalDate',
+      title: '到货日期',
+      width: 180,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      minWidth: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_ARRIVAL_NOTICE_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 180,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 通知单行子表的字段 */
+export function useLineGridColumns(
+  editable: boolean,
+): VxeTableGridOptions<MesWmArrivalNoticeLineApi.ArrivalNoticeLine>['columns'] {
+  return [
+    {
+      field: 'itemCode',
+      title: '物料编码',
+      minWidth: 120,
+    },
+    {
+      field: 'itemName',
+      title: '物料名称',
+      minWidth: 140,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'arrivalQuantity',
+      title: '到货数量',
+      width: 100,
+    },
+    {
+      field: 'iqcCheckFlag',
+      title: '是否检验',
+      width: 90,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+      },
+    },
+    {
+      field: 'qualifiedQuantity',
+      title: '合格数量',
+      width: 100,
+    },
+    {
+      field: 'iqcCode',
+      title: '检验单号',
+      minWidth: 140,
+    },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 120,
+    },
+    ...(editable
+      ? [
+          {
+            title: '操作',
+            width: 120,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 通知单行新增/修改的表单 */
+export function useLineFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择物料',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'arrivalQuantity',
+      label: '到货数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0.01,
+        placeholder: '请输入到货数量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'iqcCheckFlag',
+      label: '是否检验',
+      component: 'Switch',
+      rules: z.boolean().default(false),
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/wm/arrivalnotice/index.vue b/apps/web-antd/src/views/mes/wm/arrivalnotice/index.vue
new file mode 100644
index 000000000..33017a2de
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/arrivalnotice/index.vue
@@ -0,0 +1,187 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmArrivalNoticeApi } from '#/api/mes/wm/arrivalnotice';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { Button, message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteArrivalNotice,
+  exportArrivalNotice,
+  getArrivalNoticePage,
+} from '#/api/mes/wm/arrivalnotice';
+import { $t } from '#/locales';
+import { MesWmArrivalNoticeStatusEnum } from '#/views/mes/utils/constants';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建到货通知单 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看到货通知单 */
+function handleDetail(row: MesWmArrivalNoticeApi.ArrivalNotice) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑到货通知单 */
+function handleEdit(row: MesWmArrivalNoticeApi.ArrivalNotice) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 删除到货通知单 */
+async function handleDelete(row: MesWmArrivalNoticeApi.ArrivalNotice) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.code]),
+    duration: 0,
+  });
+  try {
+    await deleteArrivalNotice(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 提示前往质检模块 */
+function handleQc() {
+  message.info('请前往【质量管理 - 待检任务】中进行来料检验操作');
+}
+
+/** 提示前往采购入库模块 */
+function handleReceipt() {
+  message.info('请前往【仓库管理 - 采购入库】中进行入库操作');
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportArrivalNotice(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '到货通知单.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getArrivalNoticePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmArrivalNoticeApi.ArrivalNotice>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】到货通知、采购入库、采购退货"
+        url="https://doc.iocoder.cn/mes/wm/purchase-in/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="到货通知单列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['到货通知单']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-arrival-notice:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:wm-arrival-notice:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <Button type="link" @click="handleDetail(row)">
+          {{ row.code }}
+        </Button>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:wm-arrival-notice:update'],
+              ifShow: row.status === MesWmArrivalNoticeStatusEnum.PREPARE,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm-arrival-notice:delete'],
+              ifShow: row.status === MesWmArrivalNoticeStatusEnum.PREPARE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '执行质检',
+              type: 'link',
+              ifShow: row.status === MesWmArrivalNoticeStatusEnum.PENDING_QC,
+              onClick: handleQc,
+            },
+            {
+              label: '执行入库',
+              type: 'link',
+              ifShow:
+                row.status === MesWmArrivalNoticeStatusEnum.PENDING_RECEIPT,
+              onClick: handleReceipt,
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/arrivalnotice/modules/form.vue b/apps/web-antd/src/views/mes/wm/arrivalnotice/modules/form.vue
new file mode 100644
index 000000000..065d8af98
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/arrivalnotice/modules/form.vue
@@ -0,0 +1,168 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesWmArrivalNoticeApi } from '#/api/mes/wm/arrivalnotice';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { Button, Divider, message, Popconfirm } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createArrivalNotice,
+  getArrivalNotice,
+  submitArrivalNotice,
+  updateArrivalNotice,
+} from '#/api/mes/wm/arrivalnotice';
+import { $t } from '#/locales';
+import { MesWmArrivalNoticeStatusEnum } from '#/views/mes/utils/constants';
+
+import { useFormSchema } from '../data';
+import LineList from './line-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesWmArrivalNoticeApi.ArrivalNotice>();
+const originalSnapshot = ref(''); // 表单原始数据快照，用于提交时跳过未变更的保存请求
+const isEditable = computed(() => // 是否为编辑模式（可保存）
+  ['create', 'update'].includes(formType.value),
+);
+const canSubmit = computed(() => // 是否可提交
+  formType.value === 'update' &&
+  formData.value?.status === MesWmArrivalNoticeStatusEnum.PREPARE,
+);
+const getTitle = computed(() => {
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['到货通知单']);
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['到货通知单'])
+    : $t('ui.actionTitle.create', ['到货通知单']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+/** 提交通知单：表单有修改时先保存，再调用提交接口 */
+async function handleSubmit() {
+  const { valid } = await formApi.validate();
+  if (!valid || !formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    const current = JSON.stringify(await formApi.getValues());
+    if (current !== originalSnapshot.value) {
+      const data =
+        (await formApi.getValues()) as MesWmArrivalNoticeApi.ArrivalNotice;
+      await updateArrivalNotice({ ...formData.value, ...data });
+      originalSnapshot.value = current;
+    }
+    await submitArrivalNotice(formData.value.id);
+    message.success('提交成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (!isEditable.value) {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmArrivalNoticeApi.ArrivalNotice;
+    try {
+      if (formData.value?.id) {
+        await updateArrivalNotice({ ...formData.value, ...data });
+        formData.value = { ...formData.value, ...data };
+      } else {
+        const id = await createArrivalNotice(data);
+        formData.value = {
+          ...data,
+          id,
+          status: MesWmArrivalNoticeStatusEnum.PREPARE,
+        };
+        await formApi.setFieldValue('id', id);
+        await formApi.setFieldValue('status', formData.value.status);
+        formType.value = 'update';
+      }
+      originalSnapshot.value = JSON.stringify(await formApi.getValues());
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      originalSnapshot.value = '';
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    formApi.setDisabled(!isEditable.value);
+    modalApi.setState({ showConfirmButton: isEditable.value });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getArrivalNotice(data.id);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    }
+    originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+    <!-- 非新建模式展示物料信息 -->
+    <template v-if="formData?.id">
+      <Divider>物料信息</Divider>
+      <div class="mx-4">
+        <LineList :form-type="formType" :notice-id="formData.id" />
+      </div>
+    </template>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <Popconfirm
+          v-if="canSubmit"
+          title="确认提交该到货通知单？【提交后将不能修改】"
+          @confirm="handleSubmit"
+        >
+          <Button type="primary">提交</Button>
+        </Popconfirm>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/arrivalnotice/modules/line-form.vue b/apps/web-antd/src/views/mes/wm/arrivalnotice/modules/line-form.vue
new file mode 100644
index 000000000..cf9e4dd7f
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/arrivalnotice/modules/line-form.vue
@@ -0,0 +1,94 @@
+<script lang="ts" setup>
+import type { MesWmArrivalNoticeLineApi } from '#/api/mes/wm/arrivalnotice/line';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createArrivalNoticeLine,
+  getArrivalNoticeLine,
+  updateArrivalNoticeLine,
+} from '#/api/mes/wm/arrivalnotice/line';
+import { $t } from '#/locales';
+
+import { useLineFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesWmArrivalNoticeLineApi.ArrivalNoticeLine>();
+const noticeId = ref<number>(); // 所属通知单编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['到货通知单行'])
+    : $t('ui.actionTitle.create', ['到货通知单行']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 90,
+  },
+  layout: 'horizontal',
+  schema: useLineFormSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmArrivalNoticeLineApi.ArrivalNoticeLine;
+    data.noticeId = noticeId.value;
+    try {
+      await (formData.value?.id
+        ? updateArrivalNoticeLine({ ...data, id: formData.value.id })
+        : createArrivalNoticeLine(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ id?: number; noticeId: number }>();
+    noticeId.value = data.noticeId;
+    if (!data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getArrivalNoticeLine(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/arrivalnotice/modules/line-list.vue b/apps/web-antd/src/views/mes/wm/arrivalnotice/modules/line-list.vue
new file mode 100644
index 000000000..b8276c13f
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/arrivalnotice/modules/line-list.vue
@@ -0,0 +1,139 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmArrivalNoticeLineApi } from '#/api/mes/wm/arrivalnotice/line';
+
+import { computed } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteArrivalNoticeLine,
+  getArrivalNoticeLinePage,
+} from '#/api/mes/wm/arrivalnotice/line';
+import { $t } from '#/locales';
+
+import { type FormType, useLineGridColumns } from '../data';
+import LineForm from './line-form.vue';
+
+const props = defineProps<{
+  formType: FormType;
+  noticeId: number;
+}>();
+
+const isEditable = computed(() => // 是否可编辑明细行
+  ['create', 'update'].includes(props.formType),
+);
+
+const [LineFormModal, lineFormModalApi] = useVbenModal({
+  connectedComponent: LineForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 添加物料 */
+function handleCreate() {
+  lineFormModalApi.setData({ noticeId: props.noticeId }).open();
+}
+
+/** 编辑物料 */
+function handleEdit(row: MesWmArrivalNoticeLineApi.ArrivalNoticeLine) {
+  lineFormModalApi.setData({ id: row.id, noticeId: props.noticeId }).open();
+}
+
+/** 删除物料 */
+async function handleDelete(
+  row: MesWmArrivalNoticeLineApi.ArrivalNoticeLine,
+) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.itemName]),
+    duration: 0,
+  });
+  try {
+    await deleteArrivalNoticeLine(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.itemName]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useLineGridColumns(isEditable.value),
+    height: 400,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.noticeId) {
+            return { list: [], total: 0 };
+          }
+          return await getArrivalNoticeLinePage({
+            noticeId: props.noticeId,
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesWmArrivalNoticeLineApi.ArrivalNoticeLine>,
+});
+</script>
+
+<template>
+  <div>
+    <LineFormModal @success="handleRefresh" />
+    <Grid table-title="物料信息">
+      <template v-if="isEditable" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '添加物料',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              ifShow: isEditable,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              ifShow: isEditable,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.itemName]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/itemreceipt/data.ts b/apps/web-antd/src/views/mes/wm/itemreceipt/data.ts
new file mode 100644
index 000000000..fcf5b0169
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/itemreceipt/data.ts
@@ -0,0 +1,530 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmArrivalNoticeApi } from '#/api/mes/wm/arrivalnotice';
+import type { MesWmArrivalNoticeLineApi } from '#/api/mes/wm/arrivalnotice/line';
+import type { MesWmItemReceiptApi } from '#/api/mes/wm/itemreceipt';
+import type { MesWmItemReceiptDetailApi } from '#/api/mes/wm/itemreceipt/detail';
+import type { MesWmItemReceiptLineApi } from '#/api/mes/wm/itemreceipt/line';
+
+import { h, markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+
+import { Button } from 'ant-design-vue';
+
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getRangePickerDefaultProps } from '#/utils';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
+import {
+  MesAutoCodeRuleCode,
+  MesWmArrivalNoticeStatusEnum,
+} from '#/views/mes/utils/constants';
+import {
+  WmArrivalNoticeLineSelect,
+  WmArrivalNoticeSelect,
+} from '#/views/mes/wm/arrivalnotice/components';
+import {
+  WmWarehouseAreaSelect,
+  WmWarehouseLocationSelect,
+  WmWarehouseSelect,
+} from '#/views/mes/wm/warehouse/components';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'finish' | 'stock' | 'update';
+
+/** 表单头部是否只读（上架、详情、入库态） */
+function isHeaderReadonly(formType: FormType): boolean {
+  return (
+    formType === 'detail' || formType === 'finish' || formType === 'stock'
+  );
+}
+
+/** 新增/修改的表单 */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'status',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '入库单编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入入库单编号',
+      },
+      rules: 'required',
+      suffix: isHeaderReadonly(formType)
+        ? undefined
+        : () =>
+            h(
+              Button,
+              {
+                type: 'default',
+                onClick: async () => {
+                  const code = await generateAutoCode(
+                    MesAutoCodeRuleCode.WM_ITEM_RECEIPT_CODE,
+                  );
+                  await formApi?.setFieldValue('code', code);
+                },
+              },
+              { default: () => '生成' },
+            ),
+    },
+    {
+      fieldName: 'name',
+      label: '入库单名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入入库单名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'receiptDate',
+      label: '入库日期',
+      component: 'DatePicker',
+      componentProps: {
+        class: '!w-full',
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择入库日期',
+        valueFormat: 'x',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'noticeId',
+      label: '到货通知单',
+      component: markRaw(WmArrivalNoticeSelect),
+      componentProps: {
+        // 选择到货通知单后，自动回填供应商和采购订单号
+        onChange: async (notice?: MesWmArrivalNoticeApi.ArrivalNotice) => {
+          await formApi?.setValues({
+            purchaseOrderCode: notice?.purchaseOrderCode,
+            vendorId: notice?.vendorId,
+          });
+        },
+        status: MesWmArrivalNoticeStatusEnum.PENDING_RECEIPT,
+      },
+    },
+    {
+      fieldName: 'vendorId',
+      label: '供应商',
+      component: markRaw(MdVendorSelect),
+      componentProps: {
+        placeholder: '请选择供应商',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'purchaseOrderCode',
+      label: '采购订单号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入采购订单号',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '入库单编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入入库单编号',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '入库单名称',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入入库单名称',
+      },
+    },
+    {
+      fieldName: 'vendorId',
+      label: '供应商',
+      component: markRaw(MdVendorSelect),
+      componentProps: {
+        placeholder: '请选择供应商',
+      },
+    },
+    {
+      fieldName: 'receiptDate',
+      label: '入库日期',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+        allowClear: true,
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesWmItemReceiptApi.ItemReceipt>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '入库单编号',
+      minWidth: 160,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '入库单名称',
+      minWidth: 150,
+    },
+    {
+      field: 'purchaseOrderCode',
+      title: '采购订单号',
+      minWidth: 140,
+    },
+    {
+      field: 'vendorName',
+      title: '供应商名称',
+      minWidth: 120,
+    },
+    {
+      field: 'receiptDate',
+      title: '入库日期',
+      width: 180,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      minWidth: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_ITEM_RECEIPT_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 240,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 入库单行子表的字段 */
+export function useLineGridColumns(
+  editable: boolean,
+  stockable: boolean,
+): VxeTableGridOptions<MesWmItemReceiptLineApi.ItemReceiptLine>['columns'] {
+  return [
+    {
+      type: 'expand',
+      width: 48,
+      slots: { content: 'detail' },
+    },
+    {
+      field: 'itemCode',
+      title: '物料编码',
+      minWidth: 120,
+    },
+    {
+      field: 'itemName',
+      title: '物料名称',
+      minWidth: 140,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'receivedQuantity',
+      title: '入库数量',
+      width: 100,
+    },
+    {
+      field: 'batchCode',
+      title: '批次号',
+      minWidth: 120,
+    },
+    ...(editable || stockable
+      ? [
+          {
+            title: '操作',
+            width: 200,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 入库单行新增/修改的表单 */
+export function useLineFormSchema(
+  hasNotice: boolean,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'noticeId',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'arrivalNoticeLineId',
+      label: '到货通知单行',
+      component: markRaw(WmArrivalNoticeLineSelect),
+      componentProps: {
+        // 选择到货通知单行后，自动回填物料和入库数量
+        onChange: async (
+          line?: MesWmArrivalNoticeLineApi.ArrivalNoticeLine,
+        ) => {
+          await formApi?.setValues({
+            itemId: line?.itemId,
+            receivedQuantity: line?.arrivalQuantity,
+          });
+        },
+      },
+      dependencies: {
+        triggerFields: ['noticeId'],
+        if: () => hasNotice,
+        componentProps: (values) => ({
+          noticeId: values.noticeId,
+        }),
+      },
+    },
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择物料',
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['arrivalNoticeLineId'],
+        componentProps: (values) => ({
+          disabled: !!values.arrivalNoticeLineId,
+          placeholder: '请选择物料',
+        }),
+      },
+    },
+    {
+      fieldName: 'receivedQuantity',
+      label: '入库数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入入库数量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'productionDate',
+      label: '生产日期',
+      component: 'DatePicker',
+      componentProps: {
+        class: '!w-full',
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择生产日期',
+        valueFormat: 'x',
+      },
+    },
+    {
+      fieldName: 'expireDate',
+      label: '有效期',
+      component: 'DatePicker',
+      componentProps: {
+        class: '!w-full',
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择有效期',
+        valueFormat: 'x',
+      },
+    },
+    {
+      fieldName: 'lotNumber',
+      label: '生产批号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入生产批号',
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+        placeholder: '由填写信息自动生成',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 上架明细子表的字段 */
+export function useDetailGridColumns(
+  stockable: boolean,
+): VxeTableGridOptions<MesWmItemReceiptDetailApi.ItemReceiptDetail>['columns'] {
+  return [
+    {
+      field: 'warehouseName',
+      title: '仓库名称',
+      minWidth: 100,
+    },
+    {
+      field: 'locationName',
+      title: '库区名称',
+      minWidth: 100,
+    },
+    {
+      field: 'areaName',
+      title: '库位名称',
+      minWidth: 100,
+    },
+    {
+      field: 'quantity',
+      title: '数量',
+      width: 100,
+    },
+    ...(stockable
+      ? [
+          {
+            title: '操作',
+            width: 120,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 上架明细新增/修改的表单 */
+export function useDetailFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'warehouseId',
+      label: '入库仓库',
+      component: markRaw(WmWarehouseSelect),
+      componentProps: {
+        // 切换仓库后清空库区和库位
+        onChange: async () => {
+          await formApi?.setValues({
+            areaId: undefined,
+            locationId: undefined,
+          });
+        },
+        placeholder: '请选择仓库',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'locationId',
+      label: '库区',
+      component: markRaw(WmWarehouseLocationSelect),
+      componentProps: {
+        placeholder: '请选择库区',
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['warehouseId'],
+        componentProps: (values) => ({
+          // 切换库区后清空库位
+          onChange: async () => {
+            await formApi?.setFieldValue('areaId', undefined);
+          },
+          placeholder: '请选择库区',
+          warehouseId: values.warehouseId,
+        }),
+      },
+    },
+    {
+      fieldName: 'areaId',
+      label: '库位',
+      component: markRaw(WmWarehouseAreaSelect),
+      componentProps: {
+        placeholder: '请选择库位',
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['locationId'],
+        componentProps: (values) => ({
+          locationId: values.locationId,
+          placeholder: '请选择库位',
+        }),
+      },
+    },
+    {
+      fieldName: 'quantity',
+      label: '数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入数量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/wm/itemreceipt/index.vue b/apps/web-antd/src/views/mes/wm/itemreceipt/index.vue
new file mode 100644
index 000000000..fa395a8e2
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/itemreceipt/index.vue
@@ -0,0 +1,209 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmItemReceiptApi } from '#/api/mes/wm/itemreceipt';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { Button, message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  cancelItemReceipt,
+  deleteItemReceipt,
+  exportItemReceipt,
+  getItemReceiptPage,
+} from '#/api/mes/wm/itemreceipt';
+import { $t } from '#/locales';
+import { MesWmItemReceiptStatusEnum } from '#/views/mes/utils/constants';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建采购入库单 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看采购入库单 */
+function handleDetail(row: MesWmItemReceiptApi.ItemReceipt) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑采购入库单 */
+function handleEdit(row: MesWmItemReceiptApi.ItemReceipt) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 执行上架 */
+function handleStock(row: MesWmItemReceiptApi.ItemReceipt) {
+  formModalApi.setData({ formType: 'stock', id: row.id }).open();
+}
+
+/** 执行入库 */
+function handleFinish(row: MesWmItemReceiptApi.ItemReceipt) {
+  formModalApi.setData({ formType: 'finish', id: row.id }).open();
+}
+
+/** 删除采购入库单 */
+async function handleDelete(row: MesWmItemReceiptApi.ItemReceipt) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.code]),
+    duration: 0,
+  });
+  try {
+    await deleteItemReceipt(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 取消采购入库单 */
+async function handleCancel(row: MesWmItemReceiptApi.ItemReceipt) {
+  await cancelItemReceipt(row.id!);
+  message.success('取消成功');
+  handleRefresh();
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportItemReceipt(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '采购入库单.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getItemReceiptPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmItemReceiptApi.ItemReceipt>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】到货通知、采购入库、采购退货"
+        url="https://doc.iocoder.cn/mes/wm/purchase-in/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="采购入库单列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['采购入库单']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-item-receipt:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:wm-item-receipt:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <Button type="link" @click="handleDetail(row)">
+          {{ row.code }}
+        </Button>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:wm-item-receipt:update'],
+              ifShow: row.status === MesWmItemReceiptStatusEnum.PREPARE,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm-item-receipt:delete'],
+              ifShow: row.status === MesWmItemReceiptStatusEnum.PREPARE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '执行上架',
+              type: 'link',
+              auth: ['mes:wm-item-receipt:update'],
+              ifShow: row.status === MesWmItemReceiptStatusEnum.APPROVING,
+              onClick: handleStock.bind(null, row),
+            },
+            {
+              label: '执行入库',
+              type: 'link',
+              auth: ['mes:wm-item-receipt:finish'],
+              ifShow: row.status === MesWmItemReceiptStatusEnum.APPROVED,
+              onClick: handleFinish.bind(null, row),
+            },
+            {
+              label: '取消',
+              type: 'link',
+              danger: true,
+              auth: ['mes:wm-item-receipt:update'],
+              ifShow:
+                row.status === MesWmItemReceiptStatusEnum.APPROVING ||
+                row.status === MesWmItemReceiptStatusEnum.APPROVED,
+              popConfirm: {
+                title: '确认取消该采购入库单？取消后不可恢复。',
+                confirm: handleCancel.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/itemreceipt/modules/detail-form.vue b/apps/web-antd/src/views/mes/wm/itemreceipt/modules/detail-form.vue
new file mode 100644
index 000000000..c80e78798
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/itemreceipt/modules/detail-form.vue
@@ -0,0 +1,104 @@
+<script lang="ts" setup>
+import type { MesWmItemReceiptDetailApi } from '#/api/mes/wm/itemreceipt/detail';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createItemReceiptDetail,
+  getItemReceiptDetail,
+  updateItemReceiptDetail,
+} from '#/api/mes/wm/itemreceipt/detail';
+import { $t } from '#/locales';
+
+import { useDetailFormSchema } from '../data';
+
+const emit = defineEmits<{ success: [lineId: number] }>();
+const formData = ref<MesWmItemReceiptDetailApi.ItemReceiptDetail>();
+const receiptId = ref<number>(); // 所属入库单编号
+const lineId = ref<number>(); // 所属入库单行编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['上架明细'])
+    : $t('ui.actionTitle.create', ['上架明细']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 90,
+  },
+  layout: 'horizontal',
+  schema: useDetailFormSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmItemReceiptDetailApi.ItemReceiptDetail;
+    data.receiptId = receiptId.value;
+    data.lineId = lineId.value;
+    try {
+      await (formData.value?.id
+        ? updateItemReceiptDetail({ ...data, id: formData.value.id })
+        : createItemReceiptDetail(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success', lineId.value!);
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    formApi.setState({ schema: useDetailFormSchema(formApi) });
+    // 加载数据
+    const data = modalApi.getData<{
+      detailId?: number;
+      itemId?: number;
+      lineId: number;
+      receiptId: number;
+    }>();
+    receiptId.value = data.receiptId;
+    lineId.value = data.lineId;
+    if (data.detailId) {
+      modalApi.lock();
+      try {
+        formData.value = await getItemReceiptDetail(data.detailId);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    } else if (data.itemId) {
+      await formApi.setFieldValue('itemId', data.itemId);
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/itemreceipt/modules/detail-list.vue b/apps/web-antd/src/views/mes/wm/itemreceipt/modules/detail-list.vue
new file mode 100644
index 000000000..7786e1463
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/itemreceipt/modules/detail-list.vue
@@ -0,0 +1,103 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmItemReceiptDetailApi } from '#/api/mes/wm/itemreceipt/detail';
+
+import { computed, watch } from 'vue';
+
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { deleteItemReceiptDetail } from '#/api/mes/wm/itemreceipt/detail';
+import { $t } from '#/locales';
+
+import { type FormType, useDetailGridColumns } from '../data';
+
+const props = defineProps<{
+  details: MesWmItemReceiptDetailApi.ItemReceiptDetail[];
+  formType: FormType;
+}>();
+
+const emit = defineEmits<{
+  edit: [detailId: number];
+  refresh: [];
+}>();
+
+const isStock = computed(() => props.formType === 'stock'); // 是否为上架模式
+
+/** 编辑上架明细 */
+function handleEdit(row: MesWmItemReceiptDetailApi.ItemReceiptDetail) {
+  emit('edit', row.id!);
+}
+
+/** 删除上架明细 */
+async function handleDelete(
+  row: MesWmItemReceiptDetailApi.ItemReceiptDetail,
+) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.warehouseName]),
+    duration: 0,
+  });
+  try {
+    await deleteItemReceiptDetail(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.warehouseName]));
+    emit('refresh');
+  } finally {
+    hideLoading();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    border: true,
+    columns: useDetailGridColumns(isStock.value),
+    data: props.details,
+    pagerConfig: {
+      enabled: false,
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    size: 'small',
+    toolbarConfig: {
+      enabled: false,
+    },
+  } as VxeTableGridOptions<MesWmItemReceiptDetailApi.ItemReceiptDetail>,
+});
+
+watch(
+  () => props.details,
+  (details) => gridApi.setGridOptions({ data: details }),
+);
+</script>
+
+<template>
+  <div class="px-4 py-2">
+    <Grid>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [
+                  row.warehouseName,
+                ]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/itemreceipt/modules/form.vue b/apps/web-antd/src/views/mes/wm/itemreceipt/modules/form.vue
new file mode 100644
index 000000000..54fa26f86
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/itemreceipt/modules/form.vue
@@ -0,0 +1,238 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesWmItemReceiptApi } from '#/api/mes/wm/itemreceipt';
+
+import { computed, ref } from 'vue';
+
+import { confirm, useVbenModal } from '@vben/common-ui';
+
+import { Button, Divider, message, Popconfirm } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createItemReceipt,
+  finishItemReceipt,
+  getItemReceipt,
+  stockItemReceipt,
+  submitItemReceipt,
+  updateItemReceipt,
+} from '#/api/mes/wm/itemreceipt';
+import { $t } from '#/locales';
+import { MesWmItemReceiptStatusEnum } from '#/views/mes/utils/constants';
+
+import { useFormSchema } from '../data';
+import LineList from './line-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesWmItemReceiptApi.ItemReceipt>();
+const originalSnapshot = ref(''); // 表单原始数据快照，用于提交时跳过未变更的保存请求
+const isEditable = computed(() => // 是否为编辑模式（可保存）
+  ['create', 'update'].includes(formType.value),
+);
+const isStock = computed(() => formType.value === 'stock'); // 是否为上架模式
+const isFinish = computed(() => formType.value === 'finish'); // 是否为执行入库模式
+const canSubmit = computed(() => // 是否可提交
+  formType.value === 'update' &&
+  formData.value?.status === MesWmItemReceiptStatusEnum.PREPARE,
+);
+const getTitle = computed(() => {
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['采购入库单']);
+  }
+  if (formType.value === 'stock') {
+    return '执行上架';
+  }
+  if (formType.value === 'finish') {
+    return '执行入库';
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['采购入库单'])
+    : $t('ui.actionTitle.create', ['采购入库单']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+/** 提交入库单：表单有修改时先保存，再调用提交接口 */
+async function handleSubmit() {
+  const { valid } = await formApi.validate();
+  if (!valid || !formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    const current = JSON.stringify(await formApi.getValues());
+    if (current !== originalSnapshot.value) {
+      const data = (await formApi.getValues()) as MesWmItemReceiptApi.ItemReceipt;
+      await updateItemReceipt({ ...formData.value, ...data });
+      originalSnapshot.value = current;
+    }
+    await submitItemReceipt(formData.value.id);
+    message.success('提交成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 执行上架 */
+async function handleStock() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await stockItemReceipt(formData.value.id);
+    message.success('上架成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 执行入库 */
+async function handleFinish() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await finishItemReceipt(formData.value.id);
+    message.success('入库成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (!isEditable.value) {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data = (await formApi.getValues()) as MesWmItemReceiptApi.ItemReceipt;
+    try {
+      if (formData.value?.id) {
+        await updateItemReceipt({ ...formData.value, ...data });
+        formData.value = { ...formData.value, ...data };
+      } else {
+        const id = await createItemReceipt(data);
+        formData.value = {
+          ...data,
+          id,
+          status: MesWmItemReceiptStatusEnum.PREPARE,
+        };
+        await formApi.setFieldValue('id', id);
+        await formApi.setFieldValue('status', formData.value.status);
+        formType.value = 'update';
+      }
+      originalSnapshot.value = JSON.stringify(await formApi.getValues());
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      originalSnapshot.value = '';
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    formApi.setDisabled(!isEditable.value);
+    modalApi.setState({ showConfirmButton: isEditable.value });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getItemReceipt(data.id);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    }
+    originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  },
+});
+
+/** 上架前确认 */
+async function confirmStock() {
+  try {
+    await confirm('确认执行上架？');
+  } catch {
+    return;
+  }
+  await handleStock();
+}
+
+/** 入库前确认 */
+async function confirmFinish() {
+  try {
+    await confirm('确认执行入库？执行后将更新库存台账。');
+  } catch {
+    return;
+  }
+  await handleFinish();
+}
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+    <!-- 非新建模式展示物料信息 -->
+    <template v-if="formData?.id">
+      <Divider>物料信息</Divider>
+      <div class="mx-4">
+        <LineList
+          :form-type="formType"
+          :notice-id="formData.noticeId"
+          :receipt-id="formData.id"
+        />
+      </div>
+    </template>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <Popconfirm
+          v-if="canSubmit"
+          title="确认提交该采购入库单？【提交后将不能修改】"
+          @confirm="handleSubmit"
+        >
+          <Button type="primary">提交</Button>
+        </Popconfirm>
+        <Button v-if="isStock" type="primary" @click="confirmStock">
+          执行上架
+        </Button>
+        <Button v-if="isFinish" type="primary" @click="confirmFinish">
+          执行入库
+        </Button>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/itemreceipt/modules/line-form.vue b/apps/web-antd/src/views/mes/wm/itemreceipt/modules/line-form.vue
new file mode 100644
index 000000000..debfc76c0
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/itemreceipt/modules/line-form.vue
@@ -0,0 +1,104 @@
+<script lang="ts" setup>
+import type { MesWmItemReceiptLineApi } from '#/api/mes/wm/itemreceipt/line';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createItemReceiptLine,
+  getItemReceiptLine,
+  updateItemReceiptLine,
+} from '#/api/mes/wm/itemreceipt/line';
+import { $t } from '#/locales';
+
+import { useLineFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesWmItemReceiptLineApi.ItemReceiptLine>();
+const receiptId = ref<number>(); // 所属入库单编号
+const noticeId = ref<number>(); // 所属到货通知单编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['物料入库单行'])
+    : $t('ui.actionTitle.create', ['物料入库单行']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmItemReceiptLineApi.ItemReceiptLine;
+    data.receiptId = receiptId.value;
+    try {
+      await (formData.value?.id
+        ? updateItemReceiptLine({ ...data, id: formData.value.id })
+        : createItemReceiptLine(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{
+      id?: number;
+      noticeId?: number;
+      receiptId: number;
+    }>();
+    receiptId.value = data.receiptId;
+    noticeId.value = data.noticeId;
+    formApi.setState({ schema: useLineFormSchema(!!data.noticeId, formApi) });
+    if (data.noticeId) {
+      await formApi.setFieldValue('noticeId', data.noticeId);
+    }
+    if (!data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getItemReceiptLine(data.id);
+      // 设置到 values
+      await formApi.setValues({ ...formData.value, noticeId: noticeId.value });
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/itemreceipt/modules/line-list.vue b/apps/web-antd/src/views/mes/wm/itemreceipt/modules/line-list.vue
new file mode 100644
index 000000000..0979185d9
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/itemreceipt/modules/line-list.vue
@@ -0,0 +1,238 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmItemReceiptDetailApi } from '#/api/mes/wm/itemreceipt/detail';
+import type { MesWmItemReceiptLineApi } from '#/api/mes/wm/itemreceipt/line';
+
+import { computed, reactive } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getItemReceiptDetailListByLineId } from '#/api/mes/wm/itemreceipt/detail';
+import {
+  deleteItemReceiptLine,
+  getItemReceiptLinePage,
+} from '#/api/mes/wm/itemreceipt/line';
+import { $t } from '#/locales';
+import { PrinterLabel } from '#/views/mes/wm/barcode/components';
+
+import { type FormType, useLineGridColumns } from '../data';
+import DetailForm from './detail-form.vue';
+import DetailList from './detail-list.vue';
+import LineForm from './line-form.vue';
+
+const props = defineProps<{
+  formType: FormType;
+  noticeId?: number;
+  receiptId: number;
+}>();
+
+const isEditable = computed(() => // 是否可编辑明细行
+  ['create', 'update'].includes(props.formType),
+);
+const isStock = computed(() => props.formType === 'stock'); // 是否为上架模式
+const detailMap = reactive<
+  Record<number, MesWmItemReceiptDetailApi.ItemReceiptDetail[]>
+>({}); // 已展开行的上架明细缓存
+
+const [LineFormModal, lineFormModalApi] = useVbenModal({
+  connectedComponent: LineForm,
+  destroyOnClose: true,
+});
+
+const [DetailFormModal, detailFormModalApi] = useVbenModal({
+  connectedComponent: DetailForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  for (const id of Object.keys(detailMap)) {
+    delete detailMap[Number(id)];
+  }
+  gridApi.query();
+}
+
+/** 添加物料 */
+function handleCreate() {
+  lineFormModalApi
+    .setData({ noticeId: props.noticeId, receiptId: props.receiptId })
+    .open();
+}
+
+/** 编辑物料 */
+function handleEdit(row: MesWmItemReceiptLineApi.ItemReceiptLine) {
+  lineFormModalApi
+    .setData({
+      id: row.id,
+      noticeId: props.noticeId,
+      receiptId: props.receiptId,
+    })
+    .open();
+}
+
+/** 删除物料 */
+async function handleDelete(row: MesWmItemReceiptLineApi.ItemReceiptLine) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.itemName]),
+    duration: 0,
+  });
+  try {
+    await deleteItemReceiptLine(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.itemName]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 上架：直接打开明细创建表单 */
+function handleStock(row: MesWmItemReceiptLineApi.ItemReceiptLine) {
+  openDetailForm(row.id!, row.itemId);
+}
+
+/** 打开上架明细表单 */
+function openDetailForm(lineId: number, itemId?: number, detailId?: number) {
+  detailFormModalApi
+    .setData({ detailId, itemId, lineId, receiptId: props.receiptId })
+    .open();
+}
+
+/** 获取已展开行的上架明细 */
+function getExpandedDetails(row: MesWmItemReceiptLineApi.ItemReceiptLine) {
+  return detailMap[row.id!] || [];
+}
+
+/** 加载指定行的上架明细 */
+async function loadLineDetails(lineId: number) {
+  detailMap[lineId] = await getItemReceiptDetailListByLineId(lineId);
+}
+
+/** 展开行时懒加载上架明细 */
+async function handleExpandChange(
+  row: MesWmItemReceiptLineApi.ItemReceiptLine,
+  expanded: boolean,
+) {
+  if (!expanded) {
+    return;
+  }
+  await loadLineDetails(row.id!);
+}
+
+/** 明细表单提交成功后，刷新对应行已展开的明细 */
+async function handleDetailSuccess(lineId: number) {
+  await loadLineDetails(lineId);
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useLineGridColumns(isEditable.value, isStock.value),
+    expandConfig: {
+      padding: true,
+    },
+    height: 400,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.receiptId) {
+            return { list: [], total: 0 };
+          }
+          return await getItemReceiptLinePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            receiptId: props.receiptId,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesWmItemReceiptLineApi.ItemReceiptLine>,
+  gridEvents: {
+    toggleRowExpand: ({
+      expanded,
+      row,
+    }: {
+      expanded: boolean;
+      row: MesWmItemReceiptLineApi.ItemReceiptLine;
+    }) => {
+      handleExpandChange(row, expanded);
+    },
+  },
+});
+</script>
+
+<template>
+  <div>
+    <LineFormModal @success="handleRefresh" />
+    <DetailFormModal @success="handleDetailSuccess" />
+    <Grid table-title="物料信息">
+      <template v-if="isEditable" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '添加物料',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #detail="{ row }">
+        <DetailList
+          :details="getExpandedDetails(row)"
+          :form-type="formType"
+          @edit="(detailId) => openDetailForm(row.id!, row.itemId, detailId)"
+          @refresh="loadLineDetails(row.id!)"
+        />
+      </template>
+      <template #actions="{ row }">
+        <div class="flex items-center justify-center">
+          <TableAction
+            :actions="[
+              {
+                label: $t('common.edit'),
+                type: 'link',
+                icon: ACTION_ICON.EDIT,
+                ifShow: isEditable,
+                onClick: handleEdit.bind(null, row),
+              },
+              {
+                label: $t('common.delete'),
+                type: 'link',
+                danger: true,
+                icon: ACTION_ICON.DELETE,
+                ifShow: isEditable,
+                popConfirm: {
+                  title: $t('ui.actionMessage.deleteConfirm', [row.itemName]),
+                  confirm: handleDelete.bind(null, row),
+                },
+              },
+              {
+                label: '上架',
+                type: 'link',
+                ifShow: isStock,
+                onClick: handleStock.bind(null, row),
+              },
+            ]"
+          />
+          <PrinterLabel
+            v-if="isStock"
+            :biz-code="row.batchCode"
+            :biz-id="row.batchId"
+            biz-type="ITEM_BATCH"
+          />
+        </div>
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/productissue/data.ts b/apps/web-antd/src/views/mes/wm/productissue/data.ts
new file mode 100644
index 000000000..5765e8ce3
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/productissue/data.ts
@@ -0,0 +1,474 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmMaterialStockApi } from '#/api/mes/wm/materialstock';
+import type { MesWmProductIssueApi } from '#/api/mes/wm/productissue';
+import type { MesWmProductIssueDetailApi } from '#/api/mes/wm/productissue/detail';
+import type { MesWmProductIssueLineApi } from '#/api/mes/wm/productissue/line';
+
+import { h, markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { Button } from 'ant-design-vue';
+
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getRangePickerDefaultProps } from '#/utils';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import MdWorkstationSelect from '#/views/mes/md/workstation/components/md-workstation-select.vue';
+import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
+import {
+  MesAutoCodeRuleCode,
+  MesProWorkOrderStatusEnum,
+} from '#/views/mes/utils/constants';
+import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
+import {
+  WmWarehouseAreaSelect,
+  WmWarehouseLocationSelect,
+  WmWarehouseSelect,
+} from '#/views/mes/wm/warehouse/components';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'finish' | 'stock' | 'update';
+
+/** 表单头部是否只读（拣货、详情、完成态） */
+function isHeaderReadonly(formType: FormType): boolean {
+  return (
+    formType === 'detail' || formType === 'finish' || formType === 'stock'
+  );
+}
+
+/** 新增/修改的表单 */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'status',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '领料单编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入领料单编号',
+      },
+      rules: 'required',
+      suffix: isHeaderReadonly(formType)
+        ? undefined
+        : () =>
+            h(
+              Button,
+              {
+                type: 'default',
+                onClick: async () => {
+                  const code = await generateAutoCode(
+                    MesAutoCodeRuleCode.WM_PRODUCT_ISSUE_CODE,
+                  );
+                  await formApi?.setFieldValue('code', code);
+                },
+              },
+              { default: () => '生成' },
+            ),
+    },
+    {
+      fieldName: 'name',
+      label: '领料单名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入领料单名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'requiredTime',
+      label: '需求时间',
+      component: 'DatePicker',
+      componentProps: {
+        class: '!w-full',
+        format: 'YYYY-MM-DD HH:mm:ss',
+        placeholder: '请选择需求时间',
+        showTime: true,
+        valueFormat: 'x',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'workOrderId',
+      label: '生产工单',
+      component: markRaw(ProWorkOrderSelect),
+      componentProps: {
+        status: MesProWorkOrderStatusEnum.CONFIRMED,
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'workstationId',
+      label: '工作站',
+      component: markRaw(MdWorkstationSelect),
+      componentProps: {
+        placeholder: '请选择工作站',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '领料单编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入领料单编号',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '领料单名称',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入领料单名称',
+      },
+    },
+    {
+      fieldName: 'issueDate',
+      label: '领料日期',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+        allowClear: true,
+      },
+    },
+    {
+      fieldName: 'status',
+      label: '单据状态',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_WM_PRODUCT_ISSUE_STATUS, 'number'),
+        placeholder: '请选择单据状态',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesWmProductIssueApi.ProductIssue>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '领料单编号',
+      minWidth: 160,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '领料单名称',
+      minWidth: 150,
+    },
+    {
+      field: 'workOrderCode',
+      title: '生产工单',
+      minWidth: 140,
+    },
+    {
+      field: 'workstationName',
+      title: '工作站',
+      minWidth: 120,
+    },
+    {
+      field: 'requiredTime',
+      title: '需求时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      minWidth: 110,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_PRODUCT_ISSUE_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 240,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 领料单行子表的字段 */
+export function useLineGridColumns(
+  editable: boolean,
+  stockable: boolean,
+): VxeTableGridOptions<MesWmProductIssueLineApi.ProductIssueLine>['columns'] {
+  return [
+    {
+      type: 'expand',
+      width: 48,
+      slots: { content: 'detail' },
+    },
+    {
+      field: 'itemCode',
+      title: '物料编码',
+      minWidth: 120,
+    },
+    {
+      field: 'itemName',
+      title: '物料名称',
+      minWidth: 140,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'quantity',
+      title: '领料数量',
+      width: 100,
+    },
+    ...(editable || stockable
+      ? [
+          {
+            title: '操作',
+            width: 160,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 领料单行新增/修改的表单 */
+export function useLineFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'itemId',
+      label: '产品物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择产品物料',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'quantity',
+      label: '领料数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入领料数量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 拣货明细子表的字段 */
+export function useDetailGridColumns(
+  stockable: boolean,
+): VxeTableGridOptions<MesWmProductIssueDetailApi.ProductIssueDetail>['columns'] {
+  return [
+    {
+      field: 'batchCode',
+      title: '批次号',
+      minWidth: 120,
+    },
+    {
+      field: 'warehouseName',
+      title: '仓库名称',
+      minWidth: 100,
+    },
+    {
+      field: 'locationName',
+      title: '库区名称',
+      minWidth: 100,
+    },
+    {
+      field: 'areaName',
+      title: '库位名称',
+      minWidth: 100,
+    },
+    {
+      field: 'quantity',
+      title: '数量',
+      width: 100,
+    },
+    ...(stockable
+      ? [
+          {
+            title: '操作',
+            width: 120,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 拣货明细新增/修改的表单 */
+export function useDetailFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'quantityMax',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'materialStockId',
+      label: '库存记录',
+      component: markRaw(WmMaterialStockSelect),
+      componentProps: {
+        // 选择库存记录后，自动回填仓库/库区/库位/批次/数量
+        onChange: async (stock?: MesWmMaterialStockApi.MaterialStock) => {
+          await formApi?.setValues({
+            areaId: stock?.areaId,
+            batchCode: stock?.batchCode,
+            batchId: stock?.batchId,
+            locationId: stock?.locationId,
+            quantity: stock?.quantity,
+            quantityMax: stock?.quantity,
+            warehouseId: stock?.warehouseId,
+          });
+        },
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['itemId'],
+        componentProps: (values) => ({
+          itemId: values.itemId,
+        }),
+      },
+    },
+    {
+      fieldName: 'quantity',
+      label: '数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入数量',
+        precision: 2,
+      },
+      rules: 'required',
+      dependencies: {
+        triggerFields: ['quantityMax'],
+        componentProps: (values) => ({
+          class: '!w-full',
+          max: values.quantityMax,
+          min: 0,
+          placeholder: '请输入数量',
+          precision: 2,
+        }),
+      },
+    },
+    {
+      fieldName: 'warehouseId',
+      label: '出库仓库',
+      component: markRaw(WmWarehouseSelect),
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'locationId',
+      label: '库区',
+      component: markRaw(WmWarehouseLocationSelect),
+      componentProps: {
+        disabled: true,
+      },
+      dependencies: {
+        triggerFields: ['warehouseId'],
+        componentProps: (values) => ({
+          disabled: true,
+          warehouseId: values.warehouseId,
+        }),
+      },
+    },
+    {
+      fieldName: 'areaId',
+      label: '库位',
+      component: markRaw(WmWarehouseAreaSelect),
+      componentProps: {
+        disabled: true,
+      },
+      dependencies: {
+        triggerFields: ['locationId'],
+        componentProps: (values) => ({
+          disabled: true,
+          locationId: values.locationId,
+        }),
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+      },
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/wm/productissue/index.vue b/apps/web-antd/src/views/mes/wm/productissue/index.vue
new file mode 100644
index 000000000..e3a2d8317
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/productissue/index.vue
@@ -0,0 +1,227 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmProductIssueApi } from '#/api/mes/wm/productissue';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { Button, message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  cancelProductIssue,
+  deleteProductIssue,
+  exportProductIssue,
+  getProductIssuePage,
+  submitProductIssue,
+} from '#/api/mes/wm/productissue';
+import { $t } from '#/locales';
+import { MesWmProductIssueStatusEnum } from '#/views/mes/utils/constants';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建领料出库单 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看领料出库单 */
+function handleDetail(row: MesWmProductIssueApi.ProductIssue) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑领料出库单 */
+function handleEdit(row: MesWmProductIssueApi.ProductIssue) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 执行拣货 */
+function handleStock(row: MesWmProductIssueApi.ProductIssue) {
+  formModalApi.setData({ formType: 'stock', id: row.id }).open();
+}
+
+/** 完成领料出库 */
+function handleFinish(row: MesWmProductIssueApi.ProductIssue) {
+  formModalApi.setData({ formType: 'finish', id: row.id }).open();
+}
+
+/** 提交领料出库单 */
+async function handleSubmit(row: MesWmProductIssueApi.ProductIssue) {
+  await submitProductIssue(row.id!);
+  message.success('提交成功');
+  handleRefresh();
+}
+
+/** 删除领料出库单 */
+async function handleDelete(row: MesWmProductIssueApi.ProductIssue) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.code]),
+    duration: 0,
+  });
+  try {
+    await deleteProductIssue(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 取消领料出库单 */
+async function handleCancel(row: MesWmProductIssueApi.ProductIssue) {
+  await cancelProductIssue(row.id!);
+  message.success('取消成功');
+  handleRefresh();
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportProductIssue(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '领料出库单.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getProductIssuePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmProductIssueApi.ProductIssue>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】生产领料、生产退料、物料消耗"
+        url="https://doc.iocoder.cn/mes/wm/issue-return/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="领料出库单列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['领料出库单']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-product-issue:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:wm-product-issue:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <Button type="link" @click="handleDetail(row)">
+          {{ row.code }}
+        </Button>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:wm-product-issue:update'],
+              ifShow: row.status === MesWmProductIssueStatusEnum.PREPARE,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.submit'),
+              type: 'link',
+              auth: ['mes:wm-product-issue:update'],
+              ifShow: row.status === MesWmProductIssueStatusEnum.PREPARE,
+              popConfirm: {
+                title: '确认提交该领料出库单？提交后将不能修改。',
+                confirm: handleSubmit.bind(null, row),
+              },
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm-product-issue:delete'],
+              ifShow: row.status === MesWmProductIssueStatusEnum.PREPARE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '执行拣货',
+              type: 'link',
+              auth: ['mes:wm-product-issue:update'],
+              ifShow: row.status === MesWmProductIssueStatusEnum.APPROVING,
+              onClick: handleStock.bind(null, row),
+            },
+            {
+              label: '完成',
+              type: 'link',
+              auth: ['mes:wm-product-issue:finish'],
+              ifShow: row.status === MesWmProductIssueStatusEnum.APPROVED,
+              onClick: handleFinish.bind(null, row),
+            },
+            {
+              label: '取消',
+              type: 'link',
+              danger: true,
+              auth: ['mes:wm-product-issue:update'],
+              ifShow:
+                row.status === MesWmProductIssueStatusEnum.APPROVING ||
+                row.status === MesWmProductIssueStatusEnum.APPROVED,
+              popConfirm: {
+                title: '确认取消该领料出库单？取消后不可恢复。',
+                confirm: handleCancel.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/productissue/modules/detail-form.vue b/apps/web-antd/src/views/mes/wm/productissue/modules/detail-form.vue
new file mode 100644
index 000000000..43faa4e2f
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/productissue/modules/detail-form.vue
@@ -0,0 +1,104 @@
+<script lang="ts" setup>
+import type { MesWmProductIssueDetailApi } from '#/api/mes/wm/productissue/detail';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createProductIssueDetail,
+  getProductIssueDetail,
+  updateProductIssueDetail,
+} from '#/api/mes/wm/productissue/detail';
+import { $t } from '#/locales';
+
+import { useDetailFormSchema } from '../data';
+
+const emit = defineEmits<{ success: [lineId: number] }>();
+const formData = ref<MesWmProductIssueDetailApi.ProductIssueDetail>();
+const issueId = ref<number>(); // 所属领料单编号
+const lineId = ref<number>(); // 所属领料单行编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['拣货明细'])
+    : $t('ui.actionTitle.create', ['拣货明细']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 90,
+  },
+  layout: 'horizontal',
+  schema: useDetailFormSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmProductIssueDetailApi.ProductIssueDetail;
+    data.issueId = issueId.value;
+    data.lineId = lineId.value;
+    try {
+      await (formData.value?.id
+        ? updateProductIssueDetail({ ...data, id: formData.value.id })
+        : createProductIssueDetail(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success', lineId.value!);
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    formApi.setState({ schema: useDetailFormSchema(formApi) });
+    // 加载数据
+    const data = modalApi.getData<{
+      detailId?: number;
+      issueId: number;
+      itemId?: number;
+      lineId: number;
+    }>();
+    issueId.value = data.issueId;
+    lineId.value = data.lineId;
+    if (data.detailId) {
+      modalApi.lock();
+      try {
+        formData.value = await getProductIssueDetail(data.detailId);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    } else if (data.itemId) {
+      await formApi.setFieldValue('itemId', data.itemId);
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/productissue/modules/detail-list.vue b/apps/web-antd/src/views/mes/wm/productissue/modules/detail-list.vue
new file mode 100644
index 000000000..21b81e6bd
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/productissue/modules/detail-list.vue
@@ -0,0 +1,103 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmProductIssueDetailApi } from '#/api/mes/wm/productissue/detail';
+
+import { computed, watch } from 'vue';
+
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { deleteProductIssueDetail } from '#/api/mes/wm/productissue/detail';
+import { $t } from '#/locales';
+
+import { type FormType, useDetailGridColumns } from '../data';
+
+const props = defineProps<{
+  details: MesWmProductIssueDetailApi.ProductIssueDetail[];
+  formType: FormType;
+}>();
+
+const emit = defineEmits<{
+  edit: [detailId: number];
+  refresh: [];
+}>();
+
+const isStock = computed(() => props.formType === 'stock'); // 是否为拣货模式
+
+/** 编辑拣货明细 */
+function handleEdit(row: MesWmProductIssueDetailApi.ProductIssueDetail) {
+  emit('edit', row.id!);
+}
+
+/** 删除拣货明细 */
+async function handleDelete(
+  row: MesWmProductIssueDetailApi.ProductIssueDetail,
+) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.warehouseName]),
+    duration: 0,
+  });
+  try {
+    await deleteProductIssueDetail(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.warehouseName]));
+    emit('refresh');
+  } finally {
+    hideLoading();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    border: true,
+    columns: useDetailGridColumns(isStock.value),
+    data: props.details,
+    pagerConfig: {
+      enabled: false,
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    size: 'small',
+    toolbarConfig: {
+      enabled: false,
+    },
+  } as VxeTableGridOptions<MesWmProductIssueDetailApi.ProductIssueDetail>,
+});
+
+watch(
+  () => props.details,
+  (details) => gridApi.setGridOptions({ data: details }),
+);
+</script>
+
+<template>
+  <div class="px-4 py-2">
+    <Grid>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [
+                  row.warehouseName,
+                ]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/productissue/modules/form.vue b/apps/web-antd/src/views/mes/wm/productissue/modules/form.vue
new file mode 100644
index 000000000..89118c038
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/productissue/modules/form.vue
@@ -0,0 +1,229 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesWmProductIssueApi } from '#/api/mes/wm/productissue';
+
+import { computed, ref } from 'vue';
+
+import { confirm, useVbenModal } from '@vben/common-ui';
+
+import { Button, Divider, message, Popconfirm } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  checkProductIssueQuantity,
+  createProductIssue,
+  finishProductIssue,
+  getProductIssue,
+  stockProductIssue,
+  submitProductIssue,
+  updateProductIssue,
+} from '#/api/mes/wm/productissue';
+import { $t } from '#/locales';
+import { MesWmProductIssueStatusEnum } from '#/views/mes/utils/constants';
+
+import { useFormSchema } from '../data';
+import LineList from './line-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesWmProductIssueApi.ProductIssue>();
+const originalSnapshot = ref(''); // 表单原始数据快照，用于提交时跳过未变更的保存请求
+const isEditable = computed(() => // 是否为编辑模式（可保存）
+  ['create', 'update'].includes(formType.value),
+);
+const isStock = computed(() => formType.value === 'stock'); // 是否为拣货模式
+const isFinish = computed(() => formType.value === 'finish'); // 是否为完成出库模式
+const canSubmit = computed(() => // 是否可提交
+  formType.value === 'update' &&
+  formData.value?.status === MesWmProductIssueStatusEnum.PREPARE,
+);
+const getTitle = computed(() => {
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['领料出库单']);
+  }
+  if (formType.value === 'stock') {
+    return '执行拣货';
+  }
+  if (formType.value === 'finish') {
+    return '完成领料出库';
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['领料出库单'])
+    : $t('ui.actionTitle.create', ['领料出库单']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+/** 提交领料单：表单有修改时先保存，再调用提交接口 */
+async function handleSubmit() {
+  const { valid } = await formApi.validate();
+  if (!valid || !formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    const current = JSON.stringify(await formApi.getValues());
+    if (current !== originalSnapshot.value) {
+      const data =
+        (await formApi.getValues()) as MesWmProductIssueApi.ProductIssue;
+      await updateProductIssue({ ...formData.value, ...data });
+      originalSnapshot.value = current;
+    }
+    await submitProductIssue(formData.value.id);
+    message.success('提交成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 执行拣货：领料数量与拣货数量不一致时二次确认 */
+async function handleStock() {
+  if (!formData.value?.id) {
+    return;
+  }
+  const quantityMatch = await checkProductIssueQuantity(formData.value.id);
+  if (!quantityMatch) {
+    try {
+      await confirm('领料数量与拣货数量不一致，确认执行拣货？');
+    } catch {
+      return;
+    }
+  }
+  modalApi.lock();
+  try {
+    await stockProductIssue(formData.value.id);
+    message.success('拣货成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 完成领料出库 */
+async function handleFinish() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await finishProductIssue(formData.value.id);
+    message.success('完成成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (!isEditable.value) {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmProductIssueApi.ProductIssue;
+    try {
+      if (formData.value?.id) {
+        await updateProductIssue({ ...formData.value, ...data });
+        formData.value = { ...formData.value, ...data };
+      } else {
+        const id = await createProductIssue(data);
+        formData.value = {
+          ...data,
+          id,
+          status: MesWmProductIssueStatusEnum.PREPARE,
+        };
+        await formApi.setFieldValue('id', id);
+        await formApi.setFieldValue('status', formData.value.status);
+        formType.value = 'update';
+      }
+      originalSnapshot.value = JSON.stringify(await formApi.getValues());
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      originalSnapshot.value = '';
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    formApi.setDisabled(!isEditable.value);
+    modalApi.setState({ showConfirmButton: isEditable.value });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getProductIssue(data.id);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    }
+    originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+    <!-- 非新建模式展示物料信息 -->
+    <template v-if="formData?.id">
+      <Divider>物料信息</Divider>
+      <div class="mx-4">
+        <LineList :form-type="formType" :issue-id="formData.id" />
+      </div>
+    </template>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <Popconfirm
+          v-if="canSubmit"
+          title="确认提交该领料出库单？【提交后将不能修改】"
+          @confirm="handleSubmit"
+        >
+          <Button type="primary">提交</Button>
+        </Popconfirm>
+        <Button v-if="isStock" type="primary" @click="handleStock">
+          执行拣货
+        </Button>
+        <Popconfirm
+          v-if="isFinish"
+          title="确认完成该领料单并执行出库吗？"
+          @confirm="handleFinish"
+        >
+          <Button type="primary">完成</Button>
+        </Popconfirm>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/productissue/modules/line-form.vue b/apps/web-antd/src/views/mes/wm/productissue/modules/line-form.vue
new file mode 100644
index 000000000..8bf9782bc
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/productissue/modules/line-form.vue
@@ -0,0 +1,94 @@
+<script lang="ts" setup>
+import type { MesWmProductIssueLineApi } from '#/api/mes/wm/productissue/line';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createProductIssueLine,
+  getProductIssueLine,
+  updateProductIssueLine,
+} from '#/api/mes/wm/productissue/line';
+import { $t } from '#/locales';
+
+import { useLineFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesWmProductIssueLineApi.ProductIssueLine>();
+const issueId = ref<number>(); // 所属领料单编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['领料出库单行'])
+    : $t('ui.actionTitle.create', ['领料出库单行']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 90,
+  },
+  layout: 'horizontal',
+  schema: useLineFormSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmProductIssueLineApi.ProductIssueLine;
+    data.issueId = issueId.value;
+    try {
+      await (formData.value?.id
+        ? updateProductIssueLine({ ...data, id: formData.value.id })
+        : createProductIssueLine(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ id?: number; issueId: number }>();
+    issueId.value = data.issueId;
+    if (!data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getProductIssueLine(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/productissue/modules/line-list.vue b/apps/web-antd/src/views/mes/wm/productissue/modules/line-list.vue
new file mode 100644
index 000000000..790d2cdc0
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/productissue/modules/line-list.vue
@@ -0,0 +1,220 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmProductIssueDetailApi } from '#/api/mes/wm/productissue/detail';
+import type { MesWmProductIssueLineApi } from '#/api/mes/wm/productissue/line';
+
+import { computed, reactive } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getProductIssueDetailListByLineId } from '#/api/mes/wm/productissue/detail';
+import {
+  deleteProductIssueLine,
+  getProductIssueLinePage,
+} from '#/api/mes/wm/productissue/line';
+import { $t } from '#/locales';
+
+import { type FormType, useLineGridColumns } from '../data';
+import DetailForm from './detail-form.vue';
+import DetailList from './detail-list.vue';
+import LineForm from './line-form.vue';
+
+const props = defineProps<{
+  formType: FormType;
+  issueId: number;
+}>();
+
+const isEditable = computed(() => // 是否可编辑明细行
+  ['create', 'update'].includes(props.formType),
+);
+const isStock = computed(() => props.formType === 'stock'); // 是否为拣货模式
+const detailMap = reactive<
+  Record<number, MesWmProductIssueDetailApi.ProductIssueDetail[]>
+>({}); // 已展开行的拣货明细缓存
+
+const [LineFormModal, lineFormModalApi] = useVbenModal({
+  connectedComponent: LineForm,
+  destroyOnClose: true,
+});
+
+const [DetailFormModal, detailFormModalApi] = useVbenModal({
+  connectedComponent: DetailForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  for (const id of Object.keys(detailMap)) {
+    delete detailMap[Number(id)];
+  }
+  gridApi.query();
+}
+
+/** 添加物料 */
+function handleCreate() {
+  lineFormModalApi.setData({ issueId: props.issueId }).open();
+}
+
+/** 编辑物料 */
+function handleEdit(row: MesWmProductIssueLineApi.ProductIssueLine) {
+  lineFormModalApi.setData({ id: row.id, issueId: props.issueId }).open();
+}
+
+/** 删除物料 */
+async function handleDelete(row: MesWmProductIssueLineApi.ProductIssueLine) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.itemName]),
+    duration: 0,
+  });
+  try {
+    await deleteProductIssueLine(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.itemName]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 拣货：直接打开明细创建表单 */
+function handlePicking(row: MesWmProductIssueLineApi.ProductIssueLine) {
+  openDetailForm(row.id!, row.itemId);
+}
+
+/** 打开拣货明细表单 */
+function openDetailForm(lineId: number, itemId?: number, detailId?: number) {
+  detailFormModalApi
+    .setData({ detailId, issueId: props.issueId, itemId, lineId })
+    .open();
+}
+
+/** 获取已展开行的拣货明细 */
+function getExpandedDetails(row: MesWmProductIssueLineApi.ProductIssueLine) {
+  return detailMap[row.id!] || [];
+}
+
+/** 加载指定行的拣货明细 */
+async function loadLineDetails(lineId: number) {
+  detailMap[lineId] = await getProductIssueDetailListByLineId(lineId);
+}
+
+/** 展开行时懒加载拣货明细 */
+async function handleExpandChange(
+  row: MesWmProductIssueLineApi.ProductIssueLine,
+  expanded: boolean,
+) {
+  if (!expanded) {
+    return;
+  }
+  await loadLineDetails(row.id!);
+}
+
+/** 明细表单提交成功后，刷新对应行已展开的明细 */
+async function handleDetailSuccess(lineId: number) {
+  await loadLineDetails(lineId);
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useLineGridColumns(isEditable.value, isStock.value),
+    expandConfig: {
+      padding: true,
+    },
+    height: 400,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.issueId) {
+            return { list: [], total: 0 };
+          }
+          return await getProductIssueLinePage({
+            issueId: props.issueId,
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesWmProductIssueLineApi.ProductIssueLine>,
+  gridEvents: {
+    toggleRowExpand: ({
+      expanded,
+      row,
+    }: {
+      expanded: boolean;
+      row: MesWmProductIssueLineApi.ProductIssueLine;
+    }) => {
+      handleExpandChange(row, expanded);
+    },
+  },
+});
+</script>
+
+<template>
+  <div>
+    <LineFormModal @success="handleRefresh" />
+    <DetailFormModal @success="handleDetailSuccess" />
+    <Grid table-title="物料信息">
+      <template v-if="isEditable" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '添加物料',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #detail="{ row }">
+        <DetailList
+          :details="getExpandedDetails(row)"
+          :form-type="formType"
+          @edit="(detailId) => openDetailForm(row.id!, row.itemId, detailId)"
+          @refresh="loadLineDetails(row.id!)"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              ifShow: isEditable,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              ifShow: isEditable,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.itemName]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '拣货',
+              type: 'link',
+              ifShow: isStock,
+              onClick: handlePicking.bind(null, row),
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/productreceipt/data.ts b/apps/web-antd/src/views/mes/wm/productreceipt/data.ts
new file mode 100644
index 000000000..07f679212
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/productreceipt/data.ts
@@ -0,0 +1,454 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmMaterialStockApi } from '#/api/mes/wm/materialstock';
+import type { MesWmProductReceiptApi } from '#/api/mes/wm/productreceipt';
+import type { MesWmProductReceiptDetailApi } from '#/api/mes/wm/productreceipt/detail';
+import type { MesWmProductReceiptLineApi } from '#/api/mes/wm/productreceipt/line';
+
+import { h, markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+
+import { Button } from 'ant-design-vue';
+
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getRangePickerDefaultProps } from '#/utils';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
+import {
+  MesAutoCodeRuleCode,
+  MesProWorkOrderStatusEnum,
+} from '#/views/mes/utils/constants';
+import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
+import {
+  WmWarehouseAreaSelect,
+  WmWarehouseLocationSelect,
+  WmWarehouseSelect,
+} from '#/views/mes/wm/warehouse/components';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'finish' | 'stock' | 'update';
+
+/** 表单头部是否只读（上架、详情、入库态） */
+function isHeaderReadonly(formType: FormType): boolean {
+  return (
+    formType === 'detail' || formType === 'finish' || formType === 'stock'
+  );
+}
+
+/** 新增/修改的表单 */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'status',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '入库单编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入入库单编号',
+      },
+      rules: 'required',
+      suffix: isHeaderReadonly(formType)
+        ? undefined
+        : () =>
+            h(
+              Button,
+              {
+                type: 'default',
+                onClick: async () => {
+                  const code = await generateAutoCode(
+                    MesAutoCodeRuleCode.PRODUCTRECPT_CODE,
+                  );
+                  await formApi?.setFieldValue('code', code);
+                },
+              },
+              { default: () => '生成' },
+            ),
+    },
+    {
+      fieldName: 'name',
+      label: '入库单名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入入库单名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'receiptDate',
+      label: '入库日期',
+      component: 'DatePicker',
+      componentProps: {
+        class: '!w-full',
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择入库日期',
+        valueFormat: 'x',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'workOrderId',
+      label: '生产工单',
+      component: markRaw(ProWorkOrderSelect),
+      componentProps: {
+        status: MesProWorkOrderStatusEnum.CONFIRMED,
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '入库单编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入入库单编号',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '入库单名称',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入入库单名称',
+      },
+    },
+    {
+      fieldName: 'receiptDate',
+      label: '入库日期',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+        allowClear: true,
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesWmProductReceiptApi.ProductReceipt>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '入库单编号',
+      minWidth: 160,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '入库单名称',
+      minWidth: 150,
+    },
+    {
+      field: 'workOrderCode',
+      title: '生产工单',
+      minWidth: 140,
+    },
+    {
+      field: 'receiptDate',
+      title: '入库日期',
+      width: 180,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      minWidth: 110,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_PRODUCT_RECEIPT_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 240,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 入库单行子表的字段 */
+export function useLineGridColumns(
+  editable: boolean,
+  stockable: boolean,
+): VxeTableGridOptions<MesWmProductReceiptLineApi.ProductReceiptLine>['columns'] {
+  return [
+    {
+      type: 'expand',
+      width: 48,
+      slots: { content: 'detail' },
+    },
+    {
+      field: 'itemCode',
+      title: '产品物料编码',
+      minWidth: 120,
+    },
+    {
+      field: 'itemName',
+      title: '产品物料名称',
+      minWidth: 140,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'quantity',
+      title: '入库数量',
+      width: 100,
+    },
+    {
+      field: 'batchCode',
+      title: '批次号',
+      minWidth: 120,
+    },
+    ...(editable || stockable
+      ? [
+          {
+            title: '操作',
+            width: 200,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 入库单行新增/修改的表单 */
+export function useLineFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'materialStockId',
+      label: '库存记录',
+      component: markRaw(WmMaterialStockSelect),
+      componentProps: {
+        // 选择库存记录后，自动回填物料/批次/数量
+        onChange: async (stock?: MesWmMaterialStockApi.MaterialStock) => {
+          await formApi?.setValues({
+            batchCode: stock?.batchCode,
+            batchId: stock?.batchId,
+            itemId: stock?.itemId,
+            quantity: stock?.quantity,
+            quantityMax: stock?.quantity,
+          });
+        },
+        virtualFilter: 'only',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'quantityMax',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'quantity',
+      label: '入库数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入入库数量',
+        precision: 2,
+      },
+      rules: 'required',
+      dependencies: {
+        triggerFields: ['quantityMax'],
+        componentProps: (values) => ({
+          class: '!w-full',
+          max: values.quantityMax,
+          min: 0,
+          placeholder: '请输入入库数量',
+          precision: 2,
+        }),
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+        placeholder: '选择库存后自动带出',
+      },
+    },
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 上架明细子表的字段 */
+export function useDetailGridColumns(
+  stockable: boolean,
+): VxeTableGridOptions<MesWmProductReceiptDetailApi.ProductReceiptDetail>['columns'] {
+  return [
+    {
+      field: 'warehouseName',
+      title: '仓库名称',
+      minWidth: 100,
+    },
+    {
+      field: 'locationName',
+      title: '库区名称',
+      minWidth: 100,
+    },
+    {
+      field: 'areaName',
+      title: '库位名称',
+      minWidth: 100,
+    },
+    {
+      field: 'quantity',
+      title: '数量',
+      width: 100,
+    },
+    ...(stockable
+      ? [
+          {
+            title: '操作',
+            width: 120,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 上架明细新增/修改的表单 */
+export function useDetailFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'warehouseId',
+      label: '入库仓库',
+      component: markRaw(WmWarehouseSelect),
+      componentProps: {
+        // 切换仓库后清空库区和库位
+        onChange: async () => {
+          await formApi?.setValues({
+            areaId: undefined,
+            locationId: undefined,
+          });
+        },
+        placeholder: '请选择仓库',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'locationId',
+      label: '库区',
+      component: markRaw(WmWarehouseLocationSelect),
+      componentProps: {
+        placeholder: '请选择库区',
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['warehouseId'],
+        componentProps: (values) => ({
+          // 切换库区后清空库位
+          onChange: async () => {
+            await formApi?.setFieldValue('areaId', undefined);
+          },
+          placeholder: '请选择库区',
+          warehouseId: values.warehouseId,
+        }),
+      },
+    },
+    {
+      fieldName: 'areaId',
+      label: '库位',
+      component: markRaw(WmWarehouseAreaSelect),
+      componentProps: {
+        placeholder: '请选择库位',
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['locationId'],
+        componentProps: (values) => ({
+          locationId: values.locationId,
+          placeholder: '请选择库位',
+        }),
+      },
+    },
+    {
+      fieldName: 'quantity',
+      label: '数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入数量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/wm/productreceipt/index.vue b/apps/web-antd/src/views/mes/wm/productreceipt/index.vue
new file mode 100644
index 000000000..7ac6f90ac
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/productreceipt/index.vue
@@ -0,0 +1,209 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmProductReceiptApi } from '#/api/mes/wm/productreceipt';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { Button, message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  cancelProductReceipt,
+  deleteProductReceipt,
+  exportProductReceipt,
+  getProductReceiptPage,
+} from '#/api/mes/wm/productreceipt';
+import { $t } from '#/locales';
+import { MesWmProductReceiptStatusEnum } from '#/views/mes/utils/constants';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建产品入库单 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看产品入库单 */
+function handleDetail(row: MesWmProductReceiptApi.ProductReceipt) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑产品入库单 */
+function handleEdit(row: MesWmProductReceiptApi.ProductReceipt) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 执行上架 */
+function handleStock(row: MesWmProductReceiptApi.ProductReceipt) {
+  formModalApi.setData({ formType: 'stock', id: row.id }).open();
+}
+
+/** 执行入库 */
+function handleFinish(row: MesWmProductReceiptApi.ProductReceipt) {
+  formModalApi.setData({ formType: 'finish', id: row.id }).open();
+}
+
+/** 删除产品入库单 */
+async function handleDelete(row: MesWmProductReceiptApi.ProductReceipt) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.code]),
+    duration: 0,
+  });
+  try {
+    await deleteProductReceipt(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 取消产品入库单 */
+async function handleCancel(row: MesWmProductReceiptApi.ProductReceipt) {
+  await cancelProductReceipt(row.id!);
+  message.success('取消成功');
+  handleRefresh();
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportProductReceipt(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '产品入库单.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getProductReceiptPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmProductReceiptApi.ProductReceipt>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】生产入库、生产退料"
+        url="https://doc.iocoder.cn/mes/wm/produce-in/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="产品入库单列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['产品入库单']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-product-receipt:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:wm-product-receipt:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <Button type="link" @click="handleDetail(row)">
+          {{ row.code }}
+        </Button>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:wm-product-receipt:update'],
+              ifShow: row.status === MesWmProductReceiptStatusEnum.PREPARE,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm-product-receipt:delete'],
+              ifShow: row.status === MesWmProductReceiptStatusEnum.PREPARE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '执行上架',
+              type: 'link',
+              auth: ['mes:wm-product-receipt:update'],
+              ifShow: row.status === MesWmProductReceiptStatusEnum.APPROVING,
+              onClick: handleStock.bind(null, row),
+            },
+            {
+              label: '执行入库',
+              type: 'link',
+              auth: ['mes:wm-product-receipt:finish'],
+              ifShow: row.status === MesWmProductReceiptStatusEnum.APPROVED,
+              onClick: handleFinish.bind(null, row),
+            },
+            {
+              label: '取消',
+              type: 'link',
+              danger: true,
+              auth: ['mes:wm-product-receipt:update'],
+              ifShow:
+                row.status === MesWmProductReceiptStatusEnum.APPROVING ||
+                row.status === MesWmProductReceiptStatusEnum.APPROVED,
+              popConfirm: {
+                title: '确认取消该产品入库单？取消后不可恢复。',
+                confirm: handleCancel.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/productreceipt/modules/detail-form.vue b/apps/web-antd/src/views/mes/wm/productreceipt/modules/detail-form.vue
new file mode 100644
index 000000000..b2a91c2b8
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/productreceipt/modules/detail-form.vue
@@ -0,0 +1,104 @@
+<script lang="ts" setup>
+import type { MesWmProductReceiptDetailApi } from '#/api/mes/wm/productreceipt/detail';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createProductReceiptDetail,
+  getProductReceiptDetail,
+  updateProductReceiptDetail,
+} from '#/api/mes/wm/productreceipt/detail';
+import { $t } from '#/locales';
+
+import { useDetailFormSchema } from '../data';
+
+const emit = defineEmits<{ success: [lineId: number] }>();
+const formData = ref<MesWmProductReceiptDetailApi.ProductReceiptDetail>();
+const receiptId = ref<number>(); // 所属入库单编号
+const lineId = ref<number>(); // 所属入库单行编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['上架明细'])
+    : $t('ui.actionTitle.create', ['上架明细']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 90,
+  },
+  layout: 'horizontal',
+  schema: useDetailFormSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmProductReceiptDetailApi.ProductReceiptDetail;
+    data.receiptId = receiptId.value;
+    data.lineId = lineId.value;
+    try {
+      await (formData.value?.id
+        ? updateProductReceiptDetail({ ...data, id: formData.value.id })
+        : createProductReceiptDetail(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success', lineId.value!);
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    formApi.setState({ schema: useDetailFormSchema(formApi) });
+    // 加载数据
+    const data = modalApi.getData<{
+      detailId?: number;
+      itemId?: number;
+      lineId: number;
+      receiptId: number;
+    }>();
+    receiptId.value = data.receiptId;
+    lineId.value = data.lineId;
+    if (data.detailId) {
+      modalApi.lock();
+      try {
+        formData.value = await getProductReceiptDetail(data.detailId);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    } else if (data.itemId) {
+      await formApi.setFieldValue('itemId', data.itemId);
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/productreceipt/modules/detail-list.vue b/apps/web-antd/src/views/mes/wm/productreceipt/modules/detail-list.vue
new file mode 100644
index 000000000..a42bc868f
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/productreceipt/modules/detail-list.vue
@@ -0,0 +1,103 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmProductReceiptDetailApi } from '#/api/mes/wm/productreceipt/detail';
+
+import { computed, watch } from 'vue';
+
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { deleteProductReceiptDetail } from '#/api/mes/wm/productreceipt/detail';
+import { $t } from '#/locales';
+
+import { type FormType, useDetailGridColumns } from '../data';
+
+const props = defineProps<{
+  details: MesWmProductReceiptDetailApi.ProductReceiptDetail[];
+  formType: FormType;
+}>();
+
+const emit = defineEmits<{
+  edit: [detailId: number];
+  refresh: [];
+}>();
+
+const isStock = computed(() => props.formType === 'stock'); // 是否为上架模式
+
+/** 编辑上架明细 */
+function handleEdit(row: MesWmProductReceiptDetailApi.ProductReceiptDetail) {
+  emit('edit', row.id!);
+}
+
+/** 删除上架明细 */
+async function handleDelete(
+  row: MesWmProductReceiptDetailApi.ProductReceiptDetail,
+) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.warehouseName]),
+    duration: 0,
+  });
+  try {
+    await deleteProductReceiptDetail(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.warehouseName]));
+    emit('refresh');
+  } finally {
+    hideLoading();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    border: true,
+    columns: useDetailGridColumns(isStock.value),
+    data: props.details,
+    pagerConfig: {
+      enabled: false,
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    size: 'small',
+    toolbarConfig: {
+      enabled: false,
+    },
+  } as VxeTableGridOptions<MesWmProductReceiptDetailApi.ProductReceiptDetail>,
+});
+
+watch(
+  () => props.details,
+  (details) => gridApi.setGridOptions({ data: details }),
+);
+</script>
+
+<template>
+  <div class="px-4 py-2">
+    <Grid>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [
+                  row.warehouseName,
+                ]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/productreceipt/modules/form.vue b/apps/web-antd/src/views/mes/wm/productreceipt/modules/form.vue
new file mode 100644
index 000000000..5755163fa
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/productreceipt/modules/form.vue
@@ -0,0 +1,235 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesWmProductReceiptApi } from '#/api/mes/wm/productreceipt';
+
+import { computed, ref } from 'vue';
+
+import { confirm, useVbenModal } from '@vben/common-ui';
+
+import { Button, Divider, message, Popconfirm } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  checkProductReceiptQuantity,
+  createProductReceipt,
+  finishProductReceipt,
+  getProductReceipt,
+  stockProductReceipt,
+  submitProductReceipt,
+  updateProductReceipt,
+} from '#/api/mes/wm/productreceipt';
+import { $t } from '#/locales';
+import { MesWmProductReceiptStatusEnum } from '#/views/mes/utils/constants';
+
+import { useFormSchema } from '../data';
+import LineList from './line-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesWmProductReceiptApi.ProductReceipt>();
+const originalSnapshot = ref(''); // 表单原始数据快照，用于提交时跳过未变更的保存请求
+const isEditable = computed(() => // 是否为编辑模式（可保存）
+  ['create', 'update'].includes(formType.value),
+);
+const isStock = computed(() => formType.value === 'stock'); // 是否为上架模式
+const isFinish = computed(() => formType.value === 'finish'); // 是否为执行入库模式
+const canSubmit = computed(() => // 是否可提交
+  formType.value === 'update' &&
+  formData.value?.status === MesWmProductReceiptStatusEnum.PREPARE,
+);
+const getTitle = computed(() => {
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['产品入库单']);
+  }
+  if (formType.value === 'stock') {
+    return '执行上架';
+  }
+  if (formType.value === 'finish') {
+    return '执行入库';
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['产品入库单'])
+    : $t('ui.actionTitle.create', ['产品入库单']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+/** 提交入库单：表单有修改时先保存，再调用提交接口 */
+async function handleSubmit() {
+  const { valid } = await formApi.validate();
+  if (!valid || !formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    const current = JSON.stringify(await formApi.getValues());
+    if (current !== originalSnapshot.value) {
+      const data =
+        (await formApi.getValues()) as MesWmProductReceiptApi.ProductReceipt;
+      await updateProductReceipt({ ...formData.value, ...data });
+      originalSnapshot.value = current;
+    }
+    await submitProductReceipt(formData.value.id);
+    message.success('提交成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 执行上架：明细数量与行收货数量不一致时二次确认 */
+async function handleStock() {
+  if (!formData.value?.id) {
+    return;
+  }
+  const quantityMatch = await checkProductReceiptQuantity(formData.value.id);
+  if (!quantityMatch) {
+    try {
+      await confirm('明细数量与行收货数量不一致，确认执行上架？');
+    } catch {
+      return;
+    }
+  }
+  modalApi.lock();
+  try {
+    await stockProductReceipt(formData.value.id);
+    message.success('上架成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 执行入库 */
+async function handleFinish() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await finishProductReceipt(formData.value.id);
+    message.success('入库成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (!isEditable.value) {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmProductReceiptApi.ProductReceipt;
+    try {
+      if (formData.value?.id) {
+        await updateProductReceipt({ ...formData.value, ...data });
+        formData.value = { ...formData.value, ...data };
+      } else {
+        const id = await createProductReceipt(data);
+        formData.value = {
+          ...data,
+          id,
+          status: MesWmProductReceiptStatusEnum.PREPARE,
+        };
+        await formApi.setFieldValue('id', id);
+        await formApi.setFieldValue('status', formData.value.status);
+        formType.value = 'update';
+      }
+      originalSnapshot.value = JSON.stringify(await formApi.getValues());
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      originalSnapshot.value = '';
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    formApi.setDisabled(!isEditable.value);
+    modalApi.setState({ showConfirmButton: isEditable.value });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getProductReceipt(data.id);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    }
+    originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  },
+});
+
+/** 入库前确认 */
+async function confirmFinish() {
+  try {
+    await confirm('确认执行入库？执行后将更新库存台账。');
+  } catch {
+    return;
+  }
+  await handleFinish();
+}
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+    <!-- 非新建模式展示物料信息 -->
+    <template v-if="formData?.id">
+      <Divider>物料信息</Divider>
+      <div class="mx-4">
+        <LineList :form-type="formType" :receipt-id="formData.id" />
+      </div>
+    </template>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <Popconfirm
+          v-if="canSubmit"
+          title="确认提交该产品入库单？【提交后将不能修改】"
+          @confirm="handleSubmit"
+        >
+          <Button type="primary">提交</Button>
+        </Popconfirm>
+        <Button v-if="isStock" type="primary" @click="handleStock">
+          执行上架
+        </Button>
+        <Button v-if="isFinish" type="primary" @click="confirmFinish">
+          执行入库
+        </Button>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/productreceipt/modules/line-form.vue b/apps/web-antd/src/views/mes/wm/productreceipt/modules/line-form.vue
new file mode 100644
index 000000000..b9e37161e
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/productreceipt/modules/line-form.vue
@@ -0,0 +1,95 @@
+<script lang="ts" setup>
+import type { MesWmProductReceiptLineApi } from '#/api/mes/wm/productreceipt/line';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createProductReceiptLine,
+  getProductReceiptLine,
+  updateProductReceiptLine,
+} from '#/api/mes/wm/productreceipt/line';
+import { $t } from '#/locales';
+
+import { useLineFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesWmProductReceiptLineApi.ProductReceiptLine>();
+const receiptId = ref<number>(); // 所属入库单编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['物料入库单行'])
+    : $t('ui.actionTitle.create', ['物料入库单行']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmProductReceiptLineApi.ProductReceiptLine;
+    data.receiptId = receiptId.value;
+    try {
+      await (formData.value?.id
+        ? updateProductReceiptLine({ ...data, id: formData.value.id })
+        : createProductReceiptLine(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    formApi.setState({ schema: useLineFormSchema(formApi) });
+    // 加载数据
+    const data = modalApi.getData<{ id?: number; receiptId: number }>();
+    receiptId.value = data.receiptId;
+    if (!data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getProductReceiptLine(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/productreceipt/modules/line-list.vue b/apps/web-antd/src/views/mes/wm/productreceipt/modules/line-list.vue
new file mode 100644
index 000000000..de9d10081
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/productreceipt/modules/line-list.vue
@@ -0,0 +1,249 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmProductReceiptDetailApi } from '#/api/mes/wm/productreceipt/detail';
+import type { MesWmProductReceiptLineApi } from '#/api/mes/wm/productreceipt/line';
+
+import { computed, reactive, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getProductReceiptDetailListByLineId } from '#/api/mes/wm/productreceipt/detail';
+import {
+  deleteProductReceiptLine,
+  getProductReceiptLinePage,
+} from '#/api/mes/wm/productreceipt/line';
+import { $t } from '#/locales';
+import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
+import { BarcodeDetail, PrinterLabel } from '#/views/mes/wm/barcode/components';
+
+import { type FormType, useLineGridColumns } from '../data';
+import DetailForm from './detail-form.vue';
+import DetailList from './detail-list.vue';
+import LineForm from './line-form.vue';
+
+const props = defineProps<{
+  formType: FormType;
+  receiptId: number;
+}>();
+
+const isEditable = computed(() => // 是否可编辑明细行
+  ['create', 'update'].includes(props.formType),
+);
+const isStock = computed(() => props.formType === 'stock'); // 是否为上架模式
+const detailMap = reactive<
+  Record<number, MesWmProductReceiptDetailApi.ProductReceiptDetail[]>
+>({}); // 已展开行的上架明细缓存
+const barcodeDetailRef = ref(); // 条码详情弹窗实例
+
+const [LineFormModal, lineFormModalApi] = useVbenModal({
+  connectedComponent: LineForm,
+  destroyOnClose: true,
+});
+
+const [DetailFormModal, detailFormModalApi] = useVbenModal({
+  connectedComponent: DetailForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  for (const id of Object.keys(detailMap)) {
+    delete detailMap[Number(id)];
+  }
+  gridApi.query();
+}
+
+/** 添加物料 */
+function handleCreate() {
+  lineFormModalApi.setData({ receiptId: props.receiptId }).open();
+}
+
+/** 编辑物料 */
+function handleEdit(row: MesWmProductReceiptLineApi.ProductReceiptLine) {
+  lineFormModalApi.setData({ id: row.id, receiptId: props.receiptId }).open();
+}
+
+/** 删除物料 */
+async function handleDelete(
+  row: MesWmProductReceiptLineApi.ProductReceiptLine,
+) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.itemName]),
+    duration: 0,
+  });
+  try {
+    await deleteProductReceiptLine(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.itemName]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 上架：直接打开明细创建表单 */
+function handleStock(row: MesWmProductReceiptLineApi.ProductReceiptLine) {
+  openDetailForm(row.id!, row.itemId);
+}
+
+/** 查看物料条码 */
+function handleBarcode(row: MesWmProductReceiptLineApi.ProductReceiptLine) {
+  barcodeDetailRef.value?.openByBusiness(
+    row.itemId,
+    BarcodeBizTypeEnum.ITEM,
+    row.itemCode,
+    row.itemName,
+  );
+}
+
+/** 打开上架明细表单 */
+function openDetailForm(lineId: number, itemId?: number, detailId?: number) {
+  detailFormModalApi
+    .setData({ detailId, itemId, lineId, receiptId: props.receiptId })
+    .open();
+}
+
+/** 获取已展开行的上架明细 */
+function getExpandedDetails(row: MesWmProductReceiptLineApi.ProductReceiptLine) {
+  return detailMap[row.id!] || [];
+}
+
+/** 加载指定行的上架明细 */
+async function loadLineDetails(lineId: number) {
+  detailMap[lineId] = await getProductReceiptDetailListByLineId(lineId);
+}
+
+/** 展开行时懒加载上架明细 */
+async function handleExpandChange(
+  row: MesWmProductReceiptLineApi.ProductReceiptLine,
+  expanded: boolean,
+) {
+  if (!expanded) {
+    return;
+  }
+  await loadLineDetails(row.id!);
+}
+
+/** 明细表单提交成功后，刷新对应行已展开的明细 */
+async function handleDetailSuccess(lineId: number) {
+  await loadLineDetails(lineId);
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useLineGridColumns(isEditable.value, isStock.value),
+    expandConfig: {
+      padding: true,
+    },
+    height: 400,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.receiptId) {
+            return { list: [], total: 0 };
+          }
+          return await getProductReceiptLinePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            receiptId: props.receiptId,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesWmProductReceiptLineApi.ProductReceiptLine>,
+  gridEvents: {
+    toggleRowExpand: ({
+      expanded,
+      row,
+    }: {
+      expanded: boolean;
+      row: MesWmProductReceiptLineApi.ProductReceiptLine;
+    }) => {
+      handleExpandChange(row, expanded);
+    },
+  },
+});
+</script>
+
+<template>
+  <div>
+    <LineFormModal @success="handleRefresh" />
+    <DetailFormModal @success="handleDetailSuccess" />
+    <Grid table-title="物料信息">
+      <template v-if="isEditable" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '添加物料',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #detail="{ row }">
+        <DetailList
+          :details="getExpandedDetails(row)"
+          :form-type="formType"
+          @edit="(detailId) => openDetailForm(row.id!, row.itemId, detailId)"
+          @refresh="loadLineDetails(row.id!)"
+        />
+      </template>
+      <template #actions="{ row }">
+        <div class="flex items-center justify-center">
+          <TableAction
+            :actions="[
+              {
+                label: $t('common.edit'),
+                type: 'link',
+                icon: ACTION_ICON.EDIT,
+                ifShow: isEditable,
+                onClick: handleEdit.bind(null, row),
+              },
+              {
+                label: $t('common.delete'),
+                type: 'link',
+                danger: true,
+                icon: ACTION_ICON.DELETE,
+                ifShow: isEditable,
+                popConfirm: {
+                  title: $t('ui.actionMessage.deleteConfirm', [row.itemName]),
+                  confirm: handleDelete.bind(null, row),
+                },
+              },
+              {
+                label: '上架',
+                type: 'link',
+                ifShow: isStock,
+                onClick: handleStock.bind(null, row),
+              },
+              {
+                label: '条码',
+                type: 'link',
+                onClick: handleBarcode.bind(null, row),
+              },
+            ]"
+          />
+          <PrinterLabel
+            v-if="isStock"
+            :biz-code="row.batchCode"
+            :biz-id="row.batchId"
+            biz-type="BATCH"
+          />
+        </div>
+      </template>
+    </Grid>
+    <BarcodeDetail ref="barcodeDetailRef" />
+  </div>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/productsales/data.ts b/apps/web-antd/src/views/mes/wm/productsales/data.ts
new file mode 100644
index 000000000..d7fc5fa6a
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/productsales/data.ts
@@ -0,0 +1,688 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmMaterialStockApi } from '#/api/mes/wm/materialstock';
+import type { MesWmProductSalesApi } from '#/api/mes/wm/productsales';
+import type { MesWmProductSalesDetailApi } from '#/api/mes/wm/productsales/detail';
+import type { MesWmProductSalesLineApi } from '#/api/mes/wm/productsales/line';
+import type { MesWmSalesNoticeApi } from '#/api/mes/wm/salesnotice';
+import type { MesWmSalesNoticeLineApi } from '#/api/mes/wm/salesnotice/line';
+
+import { h, markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { Button } from 'ant-design-vue';
+
+import { z } from '#/adapter/form';
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getRangePickerDefaultProps } from '#/utils';
+import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import {
+  MesAutoCodeRuleCode,
+  MesWmSalesNoticeStatusEnum,
+} from '#/views/mes/utils/constants';
+import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
+import {
+  WmSalesNoticeLineSelect,
+  WmSalesNoticeSelect,
+} from '#/views/mes/wm/salesnotice/components';
+import {
+  WmWarehouseAreaSelect,
+  WmWarehouseLocationSelect,
+  WmWarehouseSelect,
+} from '#/views/mes/wm/warehouse/components';
+
+/** 表单类型 */
+export type FormType =
+  | 'create'
+  | 'detail'
+  | 'finish'
+  | 'shipping'
+  | 'stock'
+  | 'update';
+
+/** 表单头部是否只读（拣货、填写运单、出库、详情态） */
+function isHeaderReadonly(formType: FormType): boolean {
+  return (
+    formType === 'detail' ||
+    formType === 'finish' ||
+    formType === 'shipping' ||
+    formType === 'stock'
+  );
+}
+
+/** 是否展示运输信息 */
+export function showShippingInfo(formType: FormType): boolean {
+  return (
+    formType === 'shipping' || formType === 'detail' || formType === 'finish'
+  );
+}
+
+/** 新增/修改的表单 */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'status',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '出库单编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入出库单编号',
+      },
+      rules: 'required',
+      suffix: isHeaderReadonly(formType)
+        ? undefined
+        : () =>
+            h(
+              Button,
+              {
+                type: 'default',
+                onClick: async () => {
+                  const code = await generateAutoCode(
+                    MesAutoCodeRuleCode.WM_PRODUCT_SALES_CODE,
+                  );
+                  await formApi?.setFieldValue('code', code);
+                },
+              },
+              { default: () => '生成' },
+            ),
+    },
+    {
+      fieldName: 'name',
+      label: '出库单名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入出库单名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'noticeId',
+      label: '发货通知单',
+      component: markRaw(WmSalesNoticeSelect),
+      componentProps: {
+        // 选择发货通知单后，自动回填销售订单号、客户、收货人信息
+        onChange: async (notice?: MesWmSalesNoticeApi.SalesNotice) => {
+          await formApi?.setValues({
+            clientId: notice?.clientId,
+            contactAddress: notice?.recipientAddress,
+            contactName: notice?.recipientName,
+            contactTelephone: notice?.recipientTelephone,
+            salesOrderCode: notice?.salesOrderCode,
+          });
+        },
+        status: MesWmSalesNoticeStatusEnum.APPROVED,
+      },
+    },
+    {
+      fieldName: 'salesOrderCode',
+      label: '销售订单编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入销售订单编号',
+      },
+    },
+    {
+      fieldName: 'salesDate',
+      label: '出库日期',
+      component: 'DatePicker',
+      componentProps: {
+        class: '!w-full',
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择出库日期',
+        valueFormat: 'x',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'clientId',
+      label: '客户',
+      component: markRaw(MdClientSelect),
+      componentProps: {
+        placeholder: '请选择客户',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'contactName',
+      label: '收货人',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入收货人',
+      },
+    },
+    {
+      fieldName: 'contactTelephone',
+      label: '联系方式',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入联系方式',
+      },
+    },
+    {
+      fieldName: 'contactAddress',
+      label: '收货地址',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入收货地址',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+    {
+      fieldName: 'carrier',
+      label: '承运商',
+      component: 'Input',
+      componentProps: {
+        disabled: formType !== 'shipping',
+        placeholder: '请输入承运商',
+      },
+      dependencies: {
+        triggerFields: [''],
+        if: () => showShippingInfo(formType),
+      },
+    },
+    {
+      fieldName: 'shippingNumber',
+      label: '运输单号',
+      component: 'Input',
+      componentProps: {
+        disabled: formType !== 'shipping',
+        placeholder: '请输入运输单号',
+      },
+      dependencies: {
+        triggerFields: [''],
+        if: () => showShippingInfo(formType),
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '出库单编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入出库单编号',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '出库单名称',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入出库单名称',
+      },
+    },
+    {
+      fieldName: 'salesOrderCode',
+      label: '销售订单编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入销售订单编号',
+      },
+    },
+    {
+      fieldName: 'clientId',
+      label: '客户',
+      component: markRaw(MdClientSelect),
+      componentProps: {
+        placeholder: '请选择客户',
+      },
+    },
+    {
+      fieldName: 'salesDate',
+      label: '出库日期',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+        allowClear: true,
+      },
+    },
+    {
+      fieldName: 'status',
+      label: '单据状态',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_WM_PRODUCT_SALES_STATUS, 'number'),
+        placeholder: '请选择单据状态',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesWmProductSalesApi.ProductSales>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '出库单编号',
+      minWidth: 160,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '出库单名称',
+      minWidth: 150,
+    },
+    {
+      field: 'noticeCode',
+      title: '发货通知单号',
+      minWidth: 160,
+    },
+    {
+      field: 'salesOrderCode',
+      title: '销售订单编号',
+      minWidth: 160,
+    },
+    {
+      field: 'clientCode',
+      title: '客户编码',
+      minWidth: 120,
+    },
+    {
+      field: 'clientName',
+      title: '客户名称',
+      minWidth: 120,
+    },
+    {
+      field: 'contactName',
+      title: '收货人',
+      minWidth: 100,
+    },
+    {
+      field: 'carrier',
+      title: '承运商',
+      minWidth: 120,
+    },
+    {
+      field: 'shippingNumber',
+      title: '运输单号',
+      minWidth: 160,
+    },
+    {
+      field: 'salesDate',
+      title: '出库日期',
+      width: 180,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      minWidth: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_PRODUCT_SALES_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 240,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 出库单行子表的字段 */
+export function useLineGridColumns(
+  editable: boolean,
+  stockable: boolean,
+): VxeTableGridOptions<MesWmProductSalesLineApi.ProductSalesLine>['columns'] {
+  return [
+    {
+      type: 'expand',
+      width: 48,
+      slots: { content: 'detail' },
+    },
+    {
+      field: 'itemCode',
+      title: '产品编码',
+      minWidth: 120,
+    },
+    {
+      field: 'itemName',
+      title: '产品名称',
+      minWidth: 140,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'quantity',
+      title: '出库数量',
+      width: 100,
+    },
+    {
+      field: 'batchCode',
+      title: '批次号',
+      minWidth: 120,
+    },
+    {
+      field: 'oqcCheckFlag',
+      title: '是否校验',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+      },
+    },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 150,
+    },
+    ...(editable || stockable
+      ? [
+          {
+            title: '操作',
+            width: 160,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 出库单行新增/修改的表单 */
+export function useLineFormSchema(
+  hasNotice: boolean,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'noticeId',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'noticeLineId',
+      label: '发货通知单行',
+      component: markRaw(WmSalesNoticeLineSelect),
+      componentProps: {
+        // 选择发货通知单行后，自动回填物料、数量、批次、是否检验
+        onChange: async (line?: MesWmSalesNoticeLineApi.SalesNoticeLine) => {
+          await formApi?.setValues({
+            batchCode: line?.batchCode,
+            itemId: line?.itemId,
+            oqcCheckFlag: line?.oqcCheckFlag ?? false,
+            quantity: line?.quantity,
+          });
+        },
+      },
+      dependencies: {
+        triggerFields: ['noticeId'],
+        if: () => hasNotice,
+        componentProps: (values) => ({
+          noticeId: values.noticeId,
+        }),
+      },
+    },
+    {
+      fieldName: 'itemId',
+      label: '产品',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择产品',
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['noticeLineId'],
+        componentProps: (values) => ({
+          disabled: !!values.noticeLineId,
+          placeholder: '请选择产品',
+        }),
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入批次号',
+      },
+    },
+    {
+      fieldName: 'quantity',
+      label: '出库数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入出库数量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'oqcCheckFlag',
+      label: '是否校验',
+      component: 'RadioGroup',
+      componentProps: {
+        buttonStyle: 'solid',
+        optionType: 'button',
+        options: getDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING, 'boolean'),
+      },
+      rules: z.boolean().default(false),
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 拣货明细子表的字段 */
+export function useDetailGridColumns(
+  stockable: boolean,
+): VxeTableGridOptions<MesWmProductSalesDetailApi.ProductSalesDetail>['columns'] {
+  return [
+    {
+      field: 'warehouseName',
+      title: '仓库名称',
+      minWidth: 100,
+    },
+    {
+      field: 'locationName',
+      title: '库区名称',
+      minWidth: 100,
+    },
+    {
+      field: 'areaName',
+      title: '库位名称',
+      minWidth: 100,
+    },
+    {
+      field: 'quantity',
+      title: '数量',
+      width: 100,
+    },
+    ...(stockable
+      ? [
+          {
+            title: '操作',
+            width: 120,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 拣货明细新增/修改的表单 */
+export function useDetailFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'quantityMax',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'batchId',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'materialStockId',
+      label: '选择库存',
+      component: markRaw(WmMaterialStockSelect),
+      componentProps: {
+        // 选择库存记录后，自动回填仓库/库区/库位/批次/数量
+        onChange: async (stock?: MesWmMaterialStockApi.MaterialStock) => {
+          await formApi?.setValues({
+            areaId: stock?.areaId,
+            batchCode: stock?.batchCode,
+            batchId: stock?.batchId,
+            locationId: stock?.locationId,
+            quantity: stock?.quantity,
+            quantityMax: stock?.quantity,
+            warehouseId: stock?.warehouseId,
+          });
+        },
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['itemId', 'batchId'],
+        componentProps: (values) => ({
+          batchId: values.batchId,
+          itemId: values.itemId,
+        }),
+      },
+    },
+    {
+      fieldName: 'quantity',
+      label: '数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入数量',
+        precision: 2,
+      },
+      rules: 'required',
+      dependencies: {
+        triggerFields: ['quantityMax'],
+        componentProps: (values) => ({
+          class: '!w-full',
+          max: values.quantityMax,
+          min: 0,
+          placeholder: '请输入数量',
+          precision: 2,
+        }),
+      },
+    },
+    {
+      fieldName: 'warehouseId',
+      label: '出库仓库',
+      component: markRaw(WmWarehouseSelect),
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'locationId',
+      label: '库区',
+      component: markRaw(WmWarehouseLocationSelect),
+      componentProps: {
+        disabled: true,
+      },
+      dependencies: {
+        triggerFields: ['warehouseId'],
+        componentProps: (values) => ({
+          disabled: true,
+          warehouseId: values.warehouseId,
+        }),
+      },
+    },
+    {
+      fieldName: 'areaId',
+      label: '库位',
+      component: markRaw(WmWarehouseAreaSelect),
+      componentProps: {
+        disabled: true,
+      },
+      dependencies: {
+        triggerFields: ['locationId'],
+        componentProps: (values) => ({
+          disabled: true,
+          locationId: values.locationId,
+        }),
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+      },
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/wm/productsales/index.vue b/apps/web-antd/src/views/mes/wm/productsales/index.vue
new file mode 100644
index 000000000..fce6f5cff
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/productsales/index.vue
@@ -0,0 +1,223 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmProductSalesApi } from '#/api/mes/wm/productsales';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { Button, message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  cancelProductSales,
+  deleteProductSales,
+  exportProductSales,
+  getProductSalesPage,
+} from '#/api/mes/wm/productsales';
+import { $t } from '#/locales';
+import { MesWmProductSalesStatusEnum } from '#/views/mes/utils/constants';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建销售出库单 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看销售出库单 */
+function handleDetail(row: MesWmProductSalesApi.ProductSales) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑销售出库单 */
+function handleEdit(row: MesWmProductSalesApi.ProductSales) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 执行拣货 */
+function handleStock(row: MesWmProductSalesApi.ProductSales) {
+  formModalApi.setData({ formType: 'stock', id: row.id }).open();
+}
+
+/** 填写运单 */
+function handleShipping(row: MesWmProductSalesApi.ProductSales) {
+  formModalApi.setData({ formType: 'shipping', id: row.id }).open();
+}
+
+/** 执行出库 */
+function handleFinish(row: MesWmProductSalesApi.ProductSales) {
+  formModalApi.setData({ formType: 'finish', id: row.id }).open();
+}
+
+/** 删除销售出库单 */
+async function handleDelete(row: MesWmProductSalesApi.ProductSales) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.code]),
+    duration: 0,
+  });
+  try {
+    await deleteProductSales(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 取消销售出库单 */
+async function handleCancel(row: MesWmProductSalesApi.ProductSales) {
+  await cancelProductSales(row.id!);
+  message.success('取消成功');
+  handleRefresh();
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportProductSales(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '销售出库单.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getProductSalesPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmProductSalesApi.ProductSales>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】发货通知、销售出库、销售退货"
+        url="https://doc.iocoder.cn/mes/wm/sales-out/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="销售出库单列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['销售出库单']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-product-sales:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:wm-product-sales:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <Button type="link" @click="handleDetail(row)">
+          {{ row.code }}
+        </Button>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:wm-product-sales:update'],
+              ifShow: row.status === MesWmProductSalesStatusEnum.PREPARE,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm-product-sales:delete'],
+              ifShow: row.status === MesWmProductSalesStatusEnum.PREPARE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '拣货',
+              type: 'link',
+              auth: ['mes:wm-product-sales:stock'],
+              ifShow: row.status === MesWmProductSalesStatusEnum.APPROVING,
+              onClick: handleStock.bind(null, row),
+            },
+            {
+              label: '填写运单',
+              type: 'link',
+              auth: ['mes:wm-product-sales:shipping'],
+              ifShow: row.status === MesWmProductSalesStatusEnum.SHIPPING,
+              onClick: handleShipping.bind(null, row),
+            },
+            {
+              label: '执行出库',
+              type: 'link',
+              auth: ['mes:wm-product-sales:finish'],
+              ifShow: row.status === MesWmProductSalesStatusEnum.APPROVED,
+              onClick: handleFinish.bind(null, row),
+            },
+            {
+              label: '取消',
+              type: 'link',
+              danger: true,
+              auth: ['mes:wm-product-sales:cancel'],
+              ifShow:
+                row.status === MesWmProductSalesStatusEnum.CONFIRMED ||
+                row.status === MesWmProductSalesStatusEnum.APPROVING ||
+                row.status === MesWmProductSalesStatusEnum.SHIPPING ||
+                row.status === MesWmProductSalesStatusEnum.APPROVED,
+              popConfirm: {
+                title: '确认取消该销售出库单？取消后不可恢复。',
+                confirm: handleCancel.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/productsales/modules/detail-form.vue b/apps/web-antd/src/views/mes/wm/productsales/modules/detail-form.vue
new file mode 100644
index 000000000..122c318cf
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/productsales/modules/detail-form.vue
@@ -0,0 +1,110 @@
+<script lang="ts" setup>
+import type { MesWmProductSalesDetailApi } from '#/api/mes/wm/productsales/detail';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createProductSalesDetail,
+  getProductSalesDetail,
+  updateProductSalesDetail,
+} from '#/api/mes/wm/productsales/detail';
+import { $t } from '#/locales';
+
+import { useDetailFormSchema } from '../data';
+
+const emit = defineEmits<{ success: [lineId: number] }>();
+const formData = ref<MesWmProductSalesDetailApi.ProductSalesDetail>();
+const salesId = ref<number>(); // 所属出库单编号
+const lineId = ref<number>(); // 所属出库单行编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['拣货明细'])
+    : $t('ui.actionTitle.create', ['拣货明细']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 90,
+  },
+  layout: 'horizontal',
+  schema: useDetailFormSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmProductSalesDetailApi.ProductSalesDetail;
+    data.salesId = salesId.value;
+    data.lineId = lineId.value;
+    try {
+      await (formData.value?.id
+        ? updateProductSalesDetail({ ...data, id: formData.value.id })
+        : createProductSalesDetail(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success', lineId.value!);
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    formApi.setState({ schema: useDetailFormSchema(formApi) });
+    // 加载数据
+    const data = modalApi.getData<{
+      batchId?: number;
+      detailId?: number;
+      itemId?: number;
+      lineId: number;
+      salesId: number;
+    }>();
+    salesId.value = data.salesId;
+    lineId.value = data.lineId;
+    if (data.detailId) {
+      modalApi.lock();
+      try {
+        formData.value = await getProductSalesDetail(data.detailId);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    } else {
+      if (data.itemId) {
+        await formApi.setFieldValue('itemId', data.itemId);
+      }
+      if (data.batchId) {
+        await formApi.setFieldValue('batchId', data.batchId);
+      }
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/productsales/modules/detail-list.vue b/apps/web-antd/src/views/mes/wm/productsales/modules/detail-list.vue
new file mode 100644
index 000000000..e9e8f5ea6
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/productsales/modules/detail-list.vue
@@ -0,0 +1,103 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmProductSalesDetailApi } from '#/api/mes/wm/productsales/detail';
+
+import { computed, watch } from 'vue';
+
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { deleteProductSalesDetail } from '#/api/mes/wm/productsales/detail';
+import { $t } from '#/locales';
+
+import { type FormType, useDetailGridColumns } from '../data';
+
+const props = defineProps<{
+  details: MesWmProductSalesDetailApi.ProductSalesDetail[];
+  formType: FormType;
+}>();
+
+const emit = defineEmits<{
+  edit: [detailId: number];
+  refresh: [];
+}>();
+
+const isStock = computed(() => props.formType === 'stock'); // 是否为拣货模式
+
+/** 编辑拣货明细 */
+function handleEdit(row: MesWmProductSalesDetailApi.ProductSalesDetail) {
+  emit('edit', row.id!);
+}
+
+/** 删除拣货明细 */
+async function handleDelete(
+  row: MesWmProductSalesDetailApi.ProductSalesDetail,
+) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.warehouseName]),
+    duration: 0,
+  });
+  try {
+    await deleteProductSalesDetail(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.warehouseName]));
+    emit('refresh');
+  } finally {
+    hideLoading();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    border: true,
+    columns: useDetailGridColumns(isStock.value),
+    data: props.details,
+    pagerConfig: {
+      enabled: false,
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    size: 'small',
+    toolbarConfig: {
+      enabled: false,
+    },
+  } as VxeTableGridOptions<MesWmProductSalesDetailApi.ProductSalesDetail>,
+});
+
+watch(
+  () => props.details,
+  (details) => gridApi.setGridOptions({ data: details }),
+);
+</script>
+
+<template>
+  <div class="px-4 py-2">
+    <Grid>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [
+                  row.warehouseName,
+                ]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/productsales/modules/form.vue b/apps/web-antd/src/views/mes/wm/productsales/modules/form.vue
new file mode 100644
index 000000000..cf0b15acb
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/productsales/modules/form.vue
@@ -0,0 +1,266 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesWmProductSalesApi } from '#/api/mes/wm/productsales';
+
+import { computed, ref } from 'vue';
+
+import { confirm, useVbenModal } from '@vben/common-ui';
+
+import { Button, Divider, message, Popconfirm } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  checkProductSalesQuantity,
+  createProductSales,
+  finishProductSales,
+  getProductSales,
+  shippingProductSales,
+  stockProductSales,
+  submitProductSales,
+  updateProductSales,
+} from '#/api/mes/wm/productsales';
+import { $t } from '#/locales';
+import { MesWmProductSalesStatusEnum } from '#/views/mes/utils/constants';
+
+import { useFormSchema } from '../data';
+import LineList from './line-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesWmProductSalesApi.ProductSales>();
+const originalSnapshot = ref(''); // 表单原始数据快照，用于提交时跳过未变更的保存请求
+const isEditable = computed(() => // 是否为编辑模式（可保存）
+  ['create', 'update'].includes(formType.value),
+);
+const isStock = computed(() => formType.value === 'stock'); // 是否为拣货模式
+const isShipping = computed(() => formType.value === 'shipping'); // 是否为填写运单模式
+const isFinish = computed(() => formType.value === 'finish'); // 是否为执行出库模式
+const canSubmit = computed(() => // 是否可提交
+  formType.value === 'update' &&
+  formData.value?.status === MesWmProductSalesStatusEnum.PREPARE,
+);
+const getTitle = computed(() => {
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['销售出库单']);
+  }
+  if (formType.value === 'stock') {
+    return '执行拣货';
+  }
+  if (formType.value === 'shipping') {
+    return '填写运单';
+  }
+  if (formType.value === 'finish') {
+    return '执行出库';
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['销售出库单'])
+    : $t('ui.actionTitle.create', ['销售出库单']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+/** 提交出库单：表单有修改时先保存，再调用提交接口 */
+async function handleSubmit() {
+  const { valid } = await formApi.validate();
+  if (!valid || !formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    const current = JSON.stringify(await formApi.getValues());
+    if (current !== originalSnapshot.value) {
+      const data =
+        (await formApi.getValues()) as MesWmProductSalesApi.ProductSales;
+      await updateProductSales({ ...formData.value, ...data });
+      originalSnapshot.value = current;
+    }
+    await submitProductSales(formData.value.id);
+    message.success('提交成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 执行拣货：出库数量与拣货数量不一致时二次确认 */
+async function handleStock() {
+  if (!formData.value?.id) {
+    return;
+  }
+  const quantityMatch = await checkProductSalesQuantity(formData.value.id);
+  if (!quantityMatch) {
+    try {
+      await confirm('出库数量与拣货数量不一致，确认执行拣货？');
+    } catch {
+      return;
+    }
+  }
+  modalApi.lock();
+  try {
+    await stockProductSales(formData.value.id);
+    message.success('拣货成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 填写运单 */
+async function handleShipping() {
+  if (!formData.value?.id) {
+    return;
+  }
+  const values = (await formApi.getValues()) as MesWmProductSalesApi.ProductSales;
+  modalApi.lock();
+  try {
+    await shippingProductSales({
+      carrier: values.carrier,
+      id: formData.value.id,
+      shippingNumber: values.shippingNumber,
+    });
+    message.success('运单信息填写成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 执行出库 */
+async function handleFinish() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await finishProductSales(formData.value.id);
+    message.success('出库成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (!isEditable.value) {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmProductSalesApi.ProductSales;
+    try {
+      if (formData.value?.id) {
+        await updateProductSales({ ...formData.value, ...data });
+        formData.value = { ...formData.value, ...data };
+      } else {
+        const id = await createProductSales(data);
+        formData.value = {
+          ...data,
+          id,
+          status: MesWmProductSalesStatusEnum.PREPARE,
+        };
+        await formApi.setFieldValue('id', id);
+        await formApi.setFieldValue('status', formData.value.status);
+        formType.value = 'update';
+      }
+      originalSnapshot.value = JSON.stringify(await formApi.getValues());
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      originalSnapshot.value = '';
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    formApi.setDisabled(!isEditable.value && !isShipping.value);
+    modalApi.setState({ showConfirmButton: isEditable.value });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getProductSales(data.id);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    }
+    originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+    <!-- 非新建模式展示物料信息 -->
+    <template v-if="formData?.id">
+      <Divider>物料信息</Divider>
+      <div class="mx-4">
+        <LineList
+          :form-type="formType"
+          :notice-id="formData.noticeId"
+          :sales-id="formData.id"
+        />
+      </div>
+    </template>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <Popconfirm
+          v-if="canSubmit"
+          title="确认提交该销售出库单？【提交后将不能修改】"
+          @confirm="handleSubmit"
+        >
+          <Button type="primary">提交</Button>
+        </Popconfirm>
+        <Button v-if="isStock" type="primary" @click="handleStock">
+          执行拣货
+        </Button>
+        <Popconfirm
+          v-if="isShipping"
+          title="确认提交运单信息？"
+          @confirm="handleShipping"
+        >
+          <Button type="primary">确认填写</Button>
+        </Popconfirm>
+        <Popconfirm
+          v-if="isFinish"
+          title="确认执行出库？执行后将扣减库存。"
+          @confirm="handleFinish"
+        >
+          <Button type="primary">确认出库</Button>
+        </Popconfirm>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/productsales/modules/line-form.vue b/apps/web-antd/src/views/mes/wm/productsales/modules/line-form.vue
new file mode 100644
index 000000000..d8470daa1
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/productsales/modules/line-form.vue
@@ -0,0 +1,104 @@
+<script lang="ts" setup>
+import type { MesWmProductSalesLineApi } from '#/api/mes/wm/productsales/line';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createProductSalesLine,
+  getProductSalesLine,
+  updateProductSalesLine,
+} from '#/api/mes/wm/productsales/line';
+import { $t } from '#/locales';
+
+import { useLineFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesWmProductSalesLineApi.ProductSalesLine>();
+const salesId = ref<number>(); // 所属出库单编号
+const noticeId = ref<number>(); // 所属发货通知单编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['销售出库单行'])
+    : $t('ui.actionTitle.create', ['销售出库单行']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmProductSalesLineApi.ProductSalesLine;
+    data.salesId = salesId.value;
+    try {
+      await (formData.value?.id
+        ? updateProductSalesLine({ ...data, id: formData.value.id })
+        : createProductSalesLine(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{
+      id?: number;
+      noticeId?: number;
+      salesId: number;
+    }>();
+    salesId.value = data.salesId;
+    noticeId.value = data.noticeId;
+    formApi.setState({ schema: useLineFormSchema(!!data.noticeId, formApi) });
+    if (data.noticeId) {
+      await formApi.setFieldValue('noticeId', data.noticeId);
+    }
+    if (!data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getProductSalesLine(data.id);
+      // 设置到 values
+      await formApi.setValues({ ...formData.value, noticeId: noticeId.value });
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/productsales/modules/line-list.vue b/apps/web-antd/src/views/mes/wm/productsales/modules/line-list.vue
new file mode 100644
index 000000000..d98fe643d
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/productsales/modules/line-list.vue
@@ -0,0 +1,233 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmProductSalesDetailApi } from '#/api/mes/wm/productsales/detail';
+import type { MesWmProductSalesLineApi } from '#/api/mes/wm/productsales/line';
+
+import { computed, reactive } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getProductSalesDetailListByLineId } from '#/api/mes/wm/productsales/detail';
+import {
+  deleteProductSalesLine,
+  getProductSalesLinePage,
+} from '#/api/mes/wm/productsales/line';
+import { $t } from '#/locales';
+
+import { type FormType, useLineGridColumns } from '../data';
+import DetailForm from './detail-form.vue';
+import DetailList from './detail-list.vue';
+import LineForm from './line-form.vue';
+
+const props = defineProps<{
+  formType: FormType;
+  noticeId?: number;
+  salesId: number;
+}>();
+
+const isEditable = computed(() => // 是否可编辑明细行
+  ['create', 'update'].includes(props.formType),
+);
+const isStock = computed(() => props.formType === 'stock'); // 是否为拣货模式
+const detailMap = reactive<
+  Record<number, MesWmProductSalesDetailApi.ProductSalesDetail[]>
+>({}); // 已展开行的拣货明细缓存
+
+const [LineFormModal, lineFormModalApi] = useVbenModal({
+  connectedComponent: LineForm,
+  destroyOnClose: true,
+});
+
+const [DetailFormModal, detailFormModalApi] = useVbenModal({
+  connectedComponent: DetailForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  for (const id of Object.keys(detailMap)) {
+    delete detailMap[Number(id)];
+  }
+  gridApi.query();
+}
+
+/** 添加物料 */
+function handleCreate() {
+  lineFormModalApi
+    .setData({ noticeId: props.noticeId, salesId: props.salesId })
+    .open();
+}
+
+/** 编辑物料 */
+function handleEdit(row: MesWmProductSalesLineApi.ProductSalesLine) {
+  lineFormModalApi
+    .setData({ id: row.id, noticeId: props.noticeId, salesId: props.salesId })
+    .open();
+}
+
+/** 删除物料 */
+async function handleDelete(row: MesWmProductSalesLineApi.ProductSalesLine) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.itemName]),
+    duration: 0,
+  });
+  try {
+    await deleteProductSalesLine(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.itemName]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 拣货：直接打开明细创建表单 */
+function handlePicking(row: MesWmProductSalesLineApi.ProductSalesLine) {
+  openDetailForm(row.id!, row.itemId, row.batchId);
+}
+
+/** 打开拣货明细表单 */
+function openDetailForm(
+  lineId: number,
+  itemId?: number,
+  batchId?: number,
+  detailId?: number,
+) {
+  detailFormModalApi
+    .setData({ batchId, detailId, itemId, lineId, salesId: props.salesId })
+    .open();
+}
+
+/** 获取已展开行的拣货明细 */
+function getExpandedDetails(row: MesWmProductSalesLineApi.ProductSalesLine) {
+  return detailMap[row.id!] || [];
+}
+
+/** 加载指定行的拣货明细 */
+async function loadLineDetails(lineId: number) {
+  detailMap[lineId] = await getProductSalesDetailListByLineId(lineId);
+}
+
+/** 展开行时懒加载拣货明细 */
+async function handleExpandChange(
+  row: MesWmProductSalesLineApi.ProductSalesLine,
+  expanded: boolean,
+) {
+  if (!expanded) {
+    return;
+  }
+  await loadLineDetails(row.id!);
+}
+
+/** 明细表单提交成功后，刷新对应行已展开的明细 */
+async function handleDetailSuccess(lineId: number) {
+  await loadLineDetails(lineId);
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useLineGridColumns(isEditable.value, isStock.value),
+    expandConfig: {
+      padding: true,
+    },
+    height: 400,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.salesId) {
+            return { list: [], total: 0 };
+          }
+          return await getProductSalesLinePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            salesId: props.salesId,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesWmProductSalesLineApi.ProductSalesLine>,
+  gridEvents: {
+    toggleRowExpand: ({
+      expanded,
+      row,
+    }: {
+      expanded: boolean;
+      row: MesWmProductSalesLineApi.ProductSalesLine;
+    }) => {
+      handleExpandChange(row, expanded);
+    },
+  },
+});
+</script>
+
+<template>
+  <div>
+    <LineFormModal @success="handleRefresh" />
+    <DetailFormModal @success="handleDetailSuccess" />
+    <Grid table-title="物料信息">
+      <template v-if="isEditable" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '添加物料',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #detail="{ row }">
+        <DetailList
+          :details="getExpandedDetails(row)"
+          :form-type="formType"
+          @edit="
+            (detailId) =>
+              openDetailForm(row.id!, row.itemId, row.batchId, detailId)
+          "
+          @refresh="loadLineDetails(row.id!)"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              ifShow: isEditable,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              ifShow: isEditable,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.itemName]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '拣货',
+              type: 'link',
+              ifShow: isStock,
+              onClick: handlePicking.bind(null, row),
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/salesnotice/components/index.ts b/apps/web-antd/src/views/mes/wm/salesnotice/components/index.ts
new file mode 100644
index 000000000..0d5910b0e
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/salesnotice/components/index.ts
@@ -0,0 +1,2 @@
+export { default as WmSalesNoticeLineSelect } from './wm-sales-notice-line-select.vue';
+export { default as WmSalesNoticeSelect } from './wm-sales-notice-select.vue';
diff --git a/apps/web-antd/src/views/mes/wm/salesnotice/components/wm-sales-notice-line-select-dialog.vue b/apps/web-antd/src/views/mes/wm/salesnotice/components/wm-sales-notice-line-select-dialog.vue
new file mode 100644
index 000000000..fdd4c69fb
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/salesnotice/components/wm-sales-notice-line-select-dialog.vue
@@ -0,0 +1,198 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmSalesNoticeLineApi } from '#/api/mes/wm/salesnotice/line';
+
+import { nextTick, ref } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+
+import { message, Modal } from 'ant-design-vue';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getSalesNoticeLinePage } from '#/api/mes/wm/salesnotice/line';
+
+const emit = defineEmits<{
+  selected: [rows: MesWmSalesNoticeLineApi.SalesNoticeLine[]];
+}>();
+
+const open = ref(false); // 弹窗是否打开
+const noticeId = ref<number>(); // 所属通知单编号
+const syncingSingleSelection = ref(false); // 是否同步单选勾选状态
+const selectedRows = ref<MesWmSalesNoticeLineApi.SalesNoticeLine[]>([]); // 已选行列表
+const preSelectedIds = ref<number[]>([]); // 预选行编号列表
+
+/** 表格字段 */
+function useGridColumns(): VxeTableGridOptions<MesWmSalesNoticeLineApi.SalesNoticeLine>['columns'] {
+  return [
+    {
+      type: 'checkbox',
+      width: 50,
+    },
+    {
+      field: 'itemCode',
+      title: '物料编码',
+      minWidth: 120,
+    },
+    {
+      field: 'itemName',
+      title: '物料名称',
+      minWidth: 140,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'quantity',
+      title: '发货数量',
+      width: 100,
+    },
+    {
+      field: 'batchCode',
+      title: '批次号',
+      minWidth: 120,
+    },
+    {
+      field: 'oqcCheckFlag',
+      title: '是否检验',
+      width: 90,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+      },
+    },
+  ];
+}
+
+/** 单选模式下同步 VXE 勾选状态 */
+async function syncSingleSelection(
+  row?: MesWmSalesNoticeLineApi.SalesNoticeLine,
+) {
+  syncingSingleSelection.value = true;
+  await nextTick();
+  await gridApi.grid.clearCheckboxRow();
+  if (row) {
+    await gridApi.grid.setCheckboxRow(row, true);
+  }
+  await nextTick();
+  syncingSingleSelection.value = false;
+}
+
+/** 处理勾选变化，只保留最后一条 */
+async function handleCheckboxChange({
+  checked,
+  row,
+}: {
+  checked: boolean;
+  row?: MesWmSalesNoticeLineApi.SalesNoticeLine;
+}) {
+  if (syncingSingleSelection.value) {
+    return;
+  }
+  const selected = checked && row ? [row] : [];
+  selectedRows.value = selected;
+  await syncSingleSelection(selected[0]);
+}
+
+/** 回显预选行 */
+function applyPreSelection() {
+  if (preSelectedIds.value.length === 0) {
+    return;
+  }
+  const rows =
+    gridApi.grid.getData() as MesWmSalesNoticeLineApi.SalesNoticeLine[];
+  for (const row of rows) {
+    if (row.id && preSelectedIds.value.includes(row.id)) {
+      gridApi.grid.setCheckboxRow(row, true);
+      selectedRows.value = [row];
+    }
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 460,
+    keepSource: true,
+    checkboxConfig: {
+      highlight: true,
+      reserve: true,
+    },
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!noticeId.value) {
+            return { list: [], total: 0 };
+          }
+          return await getSalesNoticeLinePage({
+            noticeId: noticeId.value,
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesWmSalesNoticeLineApi.SalesNoticeLine>,
+  gridEvents: {
+    checkboxChange: handleCheckboxChange,
+  },
+});
+
+/** 打开行选择弹窗 */
+async function openModal(id: number | undefined, selectedIds?: number[]) {
+  open.value = true;
+  noticeId.value = id;
+  preSelectedIds.value = selectedIds || [];
+  selectedRows.value = [];
+  await nextTick();
+  await gridApi.grid.clearCheckboxRow();
+  await gridApi.query();
+  await nextTick();
+  applyPreSelection();
+}
+
+/** 关闭弹窗 */
+async function closeModal() {
+  open.value = false;
+  selectedRows.value = [];
+  await gridApi.grid.clearCheckboxRow();
+}
+
+/** 确认选择行 */
+function handleConfirm() {
+  if (selectedRows.value.length === 0) {
+    message.warning('请选择一条数据');
+    return;
+  }
+  emit('selected', [selectedRows.value[0]!]);
+  open.value = false;
+}
+
+defineExpose({ open: openModal });
+</script>
+
+<template>
+  <Modal
+    v-model:open="open"
+    title="发货通知单行选择"
+    width="70%"
+    :destroy-on-close="true"
+    @cancel="closeModal"
+    @ok="handleConfirm"
+  >
+    <Grid table-title="发货通知单行列表" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/salesnotice/components/wm-sales-notice-line-select.vue b/apps/web-antd/src/views/mes/wm/salesnotice/components/wm-sales-notice-line-select.vue
new file mode 100644
index 000000000..df595918e
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/salesnotice/components/wm-sales-notice-line-select.vue
@@ -0,0 +1,151 @@
+<script lang="ts" setup>
+import type { MesWmSalesNoticeLineApi } from '#/api/mes/wm/salesnotice/line';
+
+import { computed, ref, useAttrs, watch } from 'vue';
+
+import { IconifyIcon } from '@vben/icons';
+
+import { Input, Tooltip } from 'ant-design-vue';
+
+import { getSalesNoticeLine } from '#/api/mes/wm/salesnotice/line';
+
+import WmSalesNoticeLineSelectDialog from './wm-sales-notice-line-select-dialog.vue';
+
+defineOptions({ name: 'WmSalesNoticeLineSelect', inheritAttrs: false });
+
+const props = withDefaults(
+  defineProps<{
+    allowClear?: boolean;
+    disabled?: boolean;
+    modelValue?: number;
+    noticeId?: number; // 所属发货通知单编号
+    placeholder?: string;
+  }>(),
+  {
+    allowClear: true,
+    disabled: false,
+    modelValue: undefined,
+    noticeId: undefined,
+    placeholder: '请选择发货通知单行',
+  },
+);
+
+const emit = defineEmits<{
+  change: [item: MesWmSalesNoticeLineApi.SalesNoticeLine | undefined];
+  'update:modelValue': [value: number | undefined];
+}>();
+
+const attrs = useAttrs();
+const dialogRef = ref<InstanceType<typeof WmSalesNoticeLineSelectDialog>>();
+const hovering = ref(false);
+const selectedItem = ref<MesWmSalesNoticeLineApi.SalesNoticeLine>();
+
+const displayLabel = computed(() => {
+  const item = selectedItem.value;
+  if (!item) {
+    return '';
+  }
+  return `${item.itemCode ?? ''} - ${item.itemName ?? ''}`;
+});
+
+const showClear = computed(
+  () =>
+    props.allowClear &&
+    !props.disabled &&
+    hovering.value &&
+    props.modelValue != null,
+);
+
+/** 根据编号单条查询行信息（用于编辑回显） */
+async function resolveItemById(id: number | undefined) {
+  if (id == null) {
+    selectedItem.value = undefined;
+    return;
+  }
+  if (selectedItem.value?.id === id) {
+    return;
+  }
+  selectedItem.value = await getSalesNoticeLine(id);
+}
+
+watch(() => props.modelValue, resolveItemById, { immediate: true });
+
+/** noticeId 变化时清空选中（关联的行已失效） */
+watch(
+  () => props.noticeId,
+  () => {
+    selectedItem.value = undefined;
+    emit('update:modelValue', undefined);
+    emit('change', undefined);
+  },
+);
+
+/** 清空已选行 */
+function clearSelected() {
+  selectedItem.value = undefined;
+  emit('update:modelValue', undefined);
+  emit('change', undefined);
+}
+
+/** 打开行选择弹窗 */
+function handleClick(event: MouseEvent) {
+  if (props.disabled || !props.noticeId) {
+    return;
+  }
+  const target = event.target as HTMLElement;
+  if (showClear.value && target.closest('.ant-input-suffix')) {
+    event.stopPropagation();
+    clearSelected();
+    return;
+  }
+  const selectedIds = props.modelValue == null ? [] : [props.modelValue];
+  dialogRef.value?.open(props.noticeId, selectedIds);
+}
+
+/** 弹窗选中回调 */
+function handleSelected(rows: MesWmSalesNoticeLineApi.SalesNoticeLine[]) {
+  const item = rows[0];
+  if (!item) {
+    return;
+  }
+  selectedItem.value = item;
+  emit('update:modelValue', item.id);
+  emit('change', item);
+}
+</script>
+
+<template>
+  <div
+    v-bind="attrs"
+    class="w-full"
+    :class="disabled ? 'cursor-not-allowed' : 'cursor-pointer'"
+    @click="handleClick"
+    @mouseenter="hovering = true"
+    @mouseleave="hovering = false"
+  >
+    <Tooltip :mouse-enter-delay="0.5" :open="selectedItem ? undefined : false">
+      <template #title>
+        <div v-if="selectedItem" class="leading-6">
+          <div>物料编码：{{ selectedItem.itemCode || '-' }}</div>
+          <div>物料名称：{{ selectedItem.itemName || '-' }}</div>
+          <div>规格型号：{{ selectedItem.specification || '-' }}</div>
+          <div>发货数量：{{ selectedItem.quantity ?? '-' }}</div>
+        </div>
+      </template>
+      <Input
+        :disabled="disabled"
+        :placeholder="placeholder"
+        :value="displayLabel"
+        readonly
+      >
+        <template #suffix>
+          <IconifyIcon
+            class="size-4"
+            :icon="showClear ? 'lucide:circle-x' : 'lucide:search'"
+          />
+        </template>
+      </Input>
+    </Tooltip>
+  </div>
+  <WmSalesNoticeLineSelectDialog ref="dialogRef" @selected="handleSelected" />
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/salesnotice/components/wm-sales-notice-select-dialog.vue b/apps/web-antd/src/views/mes/wm/salesnotice/components/wm-sales-notice-select-dialog.vue
new file mode 100644
index 000000000..7a7019833
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/salesnotice/components/wm-sales-notice-select-dialog.vue
@@ -0,0 +1,262 @@
+<script lang="ts" setup>
+import type { VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmSalesNoticeApi } from '#/api/mes/wm/salesnotice';
+
+import { nextTick, ref } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+
+import { message, Modal } from 'ant-design-vue';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getSalesNoticePage } from '#/api/mes/wm/salesnotice';
+
+const emit = defineEmits<{
+  selected: [rows: MesWmSalesNoticeApi.SalesNotice[]];
+}>();
+
+const open = ref(false); // 弹窗是否打开
+const multiple = ref(false); // 是否多选
+const fixedStatus = ref<number>(); // 固定状态筛选
+const syncingSingleSelection = ref(false); // 是否同步单选勾选状态
+const selectedRows = ref<MesWmSalesNoticeApi.SalesNotice[]>([]); // 已选通知单列表
+const preSelectedIds = ref<number[]>([]); // 预选通知单编号列表
+
+/** 搜索表单 */
+function useSearchSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '通知单编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入通知单编号',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '通知单名称',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入通知单名称',
+      },
+    },
+    {
+      fieldName: 'salesOrderCode',
+      label: '销售订单编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入销售订单编号',
+      },
+    },
+  ];
+}
+
+/** 表格字段 */
+function useGridColumns(): VxeTableGridOptions<MesWmSalesNoticeApi.SalesNotice>['columns'] {
+  return [
+    {
+      type: 'checkbox',
+      width: 50,
+    },
+    {
+      field: 'code',
+      title: '通知单编号',
+      minWidth: 160,
+    },
+    {
+      field: 'name',
+      title: '通知单名称',
+      minWidth: 150,
+    },
+    {
+      field: 'salesOrderCode',
+      title: '销售订单编号',
+      minWidth: 140,
+    },
+    {
+      field: 'clientName',
+      title: '客户名称',
+      minWidth: 120,
+    },
+    {
+      field: 'salesDate',
+      title: '发货日期',
+      width: 120,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_SALES_NOTICE_STATUS },
+      },
+    },
+  ];
+}
+
+/** 单选模式下同步 VXE 勾选状态，避免跨页残留多选 */
+async function syncSingleSelection(row?: MesWmSalesNoticeApi.SalesNotice) {
+  syncingSingleSelection.value = true;
+  await nextTick();
+  await gridApi.grid.clearCheckboxRow();
+  if (row) {
+    await gridApi.grid.setCheckboxRow(row, true);
+  }
+  await nextTick();
+  syncingSingleSelection.value = false;
+}
+
+/** 处理勾选变化，单选模式只保留最后一条 */
+async function handleCheckboxChange({
+  checked,
+  records,
+  row,
+}: {
+  checked: boolean;
+  records: MesWmSalesNoticeApi.SalesNotice[];
+  row?: MesWmSalesNoticeApi.SalesNotice;
+}) {
+  if (syncingSingleSelection.value) {
+    return;
+  }
+  if (!multiple.value) {
+    const selected = checked && row ? [row] : [];
+    selectedRows.value = selected;
+    await syncSingleSelection(selected[0]);
+    return;
+  }
+  selectedRows.value = records;
+}
+
+/** 处理全选变化 */
+function handleCheckboxAll({
+  records,
+}: {
+  records: MesWmSalesNoticeApi.SalesNotice[];
+}) {
+  if (syncingSingleSelection.value) {
+    return;
+  }
+  selectedRows.value = records;
+}
+
+/** 回显预选通知单 */
+function applyPreSelection() {
+  if (preSelectedIds.value.length === 0) {
+    return;
+  }
+  const rows = gridApi.grid.getData() as MesWmSalesNoticeApi.SalesNotice[];
+  for (const row of rows) {
+    if (row.id && preSelectedIds.value.includes(row.id)) {
+      gridApi.grid.setCheckboxRow(row, true);
+      if (!multiple.value) {
+        selectedRows.value = [row];
+      }
+    }
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useSearchSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 520,
+    keepSource: true,
+    checkboxConfig: {
+      highlight: true,
+      range: true,
+      reserve: true,
+    },
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getSalesNoticePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            status: fixedStatus.value,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmSalesNoticeApi.SalesNotice>,
+  gridEvents: {
+    checkboxAll: handleCheckboxAll,
+    checkboxChange: handleCheckboxChange,
+  },
+});
+
+/** 重置查询和选择状态 */
+async function resetQueryState() {
+  selectedRows.value = [];
+  await gridApi.grid.clearCheckboxRow();
+  await gridApi.formApi.resetForm();
+}
+
+/** 打开通知单选择弹窗 */
+async function openModal(
+  selectedIds?: number[],
+  options?: { multiple?: boolean; status?: number },
+) {
+  open.value = true;
+  multiple.value = options?.multiple ?? false;
+  fixedStatus.value = options?.status;
+  preSelectedIds.value = selectedIds || [];
+  await nextTick();
+  await resetQueryState();
+  await gridApi.query();
+  await nextTick();
+  applyPreSelection();
+}
+
+/** 关闭通知单选择弹窗 */
+async function closeModal() {
+  open.value = false;
+  await resetQueryState();
+}
+
+/** 确认选择通知单 */
+function handleConfirm() {
+  if (selectedRows.value.length === 0) {
+    message.warning(multiple.value ? '请至少选择一条数据' : '请选择一条数据');
+    return;
+  }
+  emit(
+    'selected',
+    multiple.value ? selectedRows.value : [selectedRows.value[0]!],
+  );
+  open.value = false;
+}
+
+defineExpose({ open: openModal });
+</script>
+
+<template>
+  <Modal
+    v-model:open="open"
+    title="发货通知单选择"
+    width="70%"
+    :destroy-on-close="true"
+    @cancel="closeModal"
+    @ok="handleConfirm"
+  >
+    <Grid table-title="发货通知单列表" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/salesnotice/components/wm-sales-notice-select.vue b/apps/web-antd/src/views/mes/wm/salesnotice/components/wm-sales-notice-select.vue
new file mode 100644
index 000000000..13f72c6f3
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/salesnotice/components/wm-sales-notice-select.vue
@@ -0,0 +1,138 @@
+<script lang="ts" setup>
+import type { MesWmSalesNoticeApi } from '#/api/mes/wm/salesnotice';
+
+import { computed, ref, useAttrs, watch } from 'vue';
+
+import { IconifyIcon } from '@vben/icons';
+
+import { Input, Tooltip } from 'ant-design-vue';
+
+import { getSalesNotice } from '#/api/mes/wm/salesnotice';
+
+import WmSalesNoticeSelectDialog from './wm-sales-notice-select-dialog.vue';
+
+defineOptions({ name: 'WmSalesNoticeSelect', inheritAttrs: false });
+
+const props = withDefaults(
+  defineProps<{
+    allowClear?: boolean;
+    disabled?: boolean;
+    modelValue?: number;
+    placeholder?: string;
+    status?: number; // 固定状态筛选
+  }>(),
+  {
+    allowClear: true,
+    disabled: false,
+    modelValue: undefined,
+    placeholder: '请选择发货通知单',
+    status: undefined,
+  },
+);
+
+const emit = defineEmits<{
+  change: [item: MesWmSalesNoticeApi.SalesNotice | undefined];
+  'update:modelValue': [value: number | undefined];
+}>();
+
+const attrs = useAttrs();
+const dialogRef = ref<InstanceType<typeof WmSalesNoticeSelectDialog>>();
+const hovering = ref(false);
+const selectedItem = ref<MesWmSalesNoticeApi.SalesNotice>();
+
+const displayLabel = computed(() => selectedItem.value?.name ?? '');
+
+const showClear = computed(
+  () =>
+    props.allowClear &&
+    !props.disabled &&
+    hovering.value &&
+    props.modelValue != null,
+);
+
+/** 根据编号单条查询通知单信息（用于编辑回显） */
+async function resolveItemById(id: number | undefined) {
+  if (id == null) {
+    selectedItem.value = undefined;
+    return;
+  }
+  if (selectedItem.value?.id === id) {
+    return;
+  }
+  selectedItem.value = await getSalesNotice(id);
+}
+
+watch(() => props.modelValue, resolveItemById, { immediate: true });
+
+/** 清空已选通知单 */
+function clearSelected() {
+  selectedItem.value = undefined;
+  emit('update:modelValue', undefined);
+  emit('change', undefined);
+}
+
+/** 打开通知单选择弹窗 */
+function handleClick(event: MouseEvent) {
+  if (props.disabled) {
+    return;
+  }
+  const target = event.target as HTMLElement;
+  if (showClear.value && target.closest('.ant-input-suffix')) {
+    event.stopPropagation();
+    clearSelected();
+    return;
+  }
+  const selectedIds = props.modelValue == null ? [] : [props.modelValue];
+  dialogRef.value?.open(selectedIds, {
+    multiple: false,
+    status: props.status,
+  });
+}
+
+/** 弹窗选中回调 */
+function handleSelected(rows: MesWmSalesNoticeApi.SalesNotice[]) {
+  const item = rows[0];
+  if (!item) {
+    return;
+  }
+  selectedItem.value = item;
+  emit('update:modelValue', item.id);
+  emit('change', item);
+}
+</script>
+
+<template>
+  <div
+    v-bind="attrs"
+    class="w-full"
+    :class="disabled ? 'cursor-not-allowed' : 'cursor-pointer'"
+    @click="handleClick"
+    @mouseenter="hovering = true"
+    @mouseleave="hovering = false"
+  >
+    <Tooltip :mouse-enter-delay="0.5" :open="selectedItem ? undefined : false">
+      <template #title>
+        <div v-if="selectedItem" class="leading-6">
+          <div>编号：{{ selectedItem.code || '-' }}</div>
+          <div>名称：{{ selectedItem.name || '-' }}</div>
+          <div>客户：{{ selectedItem.clientName || '-' }}</div>
+          <div>销售订单：{{ selectedItem.salesOrderCode || '-' }}</div>
+        </div>
+      </template>
+      <Input
+        :disabled="disabled"
+        :placeholder="placeholder"
+        :value="displayLabel"
+        readonly
+      >
+        <template #suffix>
+          <IconifyIcon
+            class="size-4"
+            :icon="showClear ? 'lucide:circle-x' : 'lucide:search'"
+          />
+        </template>
+      </Input>
+    </Tooltip>
+  </div>
+  <WmSalesNoticeSelectDialog ref="dialogRef" @selected="handleSelected" />
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/salesnotice/data.ts b/apps/web-antd/src/views/mes/wm/salesnotice/data.ts
new file mode 100644
index 000000000..6e30cada5
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/salesnotice/data.ts
@@ -0,0 +1,363 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmSalesNoticeApi } from '#/api/mes/wm/salesnotice';
+import type { MesWmSalesNoticeLineApi } from '#/api/mes/wm/salesnotice/line';
+
+import { h, markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+
+import { Button } from 'ant-design-vue';
+
+import { z } from '#/adapter/form';
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'finish' | 'update';
+
+/** 表单头部是否只读（详情、执行出库态） */
+function isHeaderReadonly(formType: FormType): boolean {
+  return formType === 'detail' || formType === 'finish';
+}
+
+/** 新增/修改的表单 */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'status',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '通知单编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入通知单编号',
+      },
+      rules: 'required',
+      suffix: isHeaderReadonly(formType)
+        ? undefined
+        : () =>
+            h(
+              Button,
+              {
+                type: 'default',
+                onClick: async () => {
+                  const code = await generateAutoCode(
+                    MesAutoCodeRuleCode.WM_SALES_NOTICE_CODE,
+                  );
+                  await formApi?.setFieldValue('code', code);
+                },
+              },
+              { default: () => '生成' },
+            ),
+    },
+    {
+      fieldName: 'name',
+      label: '通知单名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入通知单名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'salesOrderCode',
+      label: '销售订单编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入销售订单编号',
+      },
+    },
+    {
+      fieldName: 'clientId',
+      label: '客户',
+      component: markRaw(MdClientSelect),
+      componentProps: {
+        placeholder: '请选择客户',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'salesDate',
+      label: '发货日期',
+      component: 'DatePicker',
+      componentProps: {
+        class: '!w-full',
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择发货日期',
+        valueFormat: 'x',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'recipientName',
+      label: '收货人',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入收货人',
+      },
+    },
+    {
+      fieldName: 'recipientTelephone',
+      label: '联系方式',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入联系方式',
+      },
+    },
+    {
+      fieldName: 'recipientAddress',
+      label: '收货地址',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入收货地址',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '通知单编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入通知单编号',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '通知单名称',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入通知单名称',
+      },
+    },
+    {
+      fieldName: 'salesOrderCode',
+      label: '销售订单编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入销售订单编号',
+      },
+    },
+    {
+      fieldName: 'clientId',
+      label: '客户',
+      component: markRaw(MdClientSelect),
+      componentProps: {
+        placeholder: '请选择客户',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesWmSalesNoticeApi.SalesNotice>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '通知单编号',
+      minWidth: 160,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '通知单名称',
+      minWidth: 150,
+    },
+    {
+      field: 'salesOrderCode',
+      title: '销售订单编号',
+      minWidth: 140,
+    },
+    {
+      field: 'clientName',
+      title: '客户名称',
+      minWidth: 120,
+    },
+    {
+      field: 'salesDate',
+      title: '发货日期',
+      width: 180,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'recipientName',
+      title: '收货人',
+      minWidth: 100,
+    },
+    {
+      field: 'recipientTelephone',
+      title: '联系方式',
+      minWidth: 120,
+    },
+    {
+      field: 'recipientAddress',
+      title: '收货地址',
+      minWidth: 200,
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      minWidth: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_SALES_NOTICE_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 200,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 通知单行子表的字段 */
+export function useLineGridColumns(
+  editable: boolean,
+): VxeTableGridOptions<MesWmSalesNoticeLineApi.SalesNoticeLine>['columns'] {
+  return [
+    {
+      field: 'itemCode',
+      title: '物料编码',
+      minWidth: 120,
+    },
+    {
+      field: 'itemName',
+      title: '物料名称',
+      minWidth: 140,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'quantity',
+      title: '发货数量',
+      width: 100,
+    },
+    {
+      field: 'batchCode',
+      title: '批次号',
+      minWidth: 120,
+    },
+    {
+      field: 'oqcCheckFlag',
+      title: '是否检验',
+      width: 90,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+      },
+    },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 120,
+    },
+    ...(editable
+      ? [
+          {
+            title: '操作',
+            width: 120,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 通知单行新增/修改的表单 */
+export function useLineFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择物料',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'quantity',
+      label: '发货数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0.01,
+        placeholder: '请输入发货数量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入批次号',
+      },
+    },
+    {
+      fieldName: 'oqcCheckFlag',
+      label: '是否检验',
+      component: 'Switch',
+      rules: z.boolean().default(true),
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/wm/salesnotice/index.vue b/apps/web-antd/src/views/mes/wm/salesnotice/index.vue
new file mode 100644
index 000000000..0faa7ac82
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/salesnotice/index.vue
@@ -0,0 +1,176 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmSalesNoticeApi } from '#/api/mes/wm/salesnotice';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { Button, message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteSalesNotice,
+  exportSalesNotice,
+  getSalesNoticePage,
+} from '#/api/mes/wm/salesnotice';
+import { $t } from '#/locales';
+import { MesWmSalesNoticeStatusEnum } from '#/views/mes/utils/constants';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建发货通知单 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看发货通知单 */
+function handleDetail(row: MesWmSalesNoticeApi.SalesNotice) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑发货通知单 */
+function handleEdit(row: MesWmSalesNoticeApi.SalesNotice) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 执行出库 */
+function handleFinish(row: MesWmSalesNoticeApi.SalesNotice) {
+  formModalApi.setData({ formType: 'finish', id: row.id }).open();
+}
+
+/** 删除发货通知单 */
+async function handleDelete(row: MesWmSalesNoticeApi.SalesNotice) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.code]),
+    duration: 0,
+  });
+  try {
+    await deleteSalesNotice(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportSalesNotice(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '发货通知单.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getSalesNoticePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmSalesNoticeApi.SalesNotice>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】发货通知、销售出库、销售退货"
+        url="https://doc.iocoder.cn/mes/wm/sales-out/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="发货通知单列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['发货通知单']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-sales-notice:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:wm-sales-notice:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <Button type="link" @click="handleDetail(row)">
+          {{ row.code }}
+        </Button>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:wm-sales-notice:update'],
+              ifShow: row.status === MesWmSalesNoticeStatusEnum.PREPARE,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm-sales-notice:delete'],
+              ifShow: row.status === MesWmSalesNoticeStatusEnum.PREPARE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '执行出库',
+              type: 'link',
+              auth: ['mes:wm-sales-notice:update'],
+              ifShow: row.status === MesWmSalesNoticeStatusEnum.APPROVED,
+              onClick: handleFinish.bind(null, row),
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/salesnotice/modules/form.vue b/apps/web-antd/src/views/mes/wm/salesnotice/modules/form.vue
new file mode 100644
index 000000000..ae1c5afad
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/salesnotice/modules/form.vue
@@ -0,0 +1,179 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesWmSalesNoticeApi } from '#/api/mes/wm/salesnotice';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { Button, Divider, message, Popconfirm } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createSalesNotice,
+  getSalesNotice,
+  submitSalesNotice,
+  updateSalesNotice,
+} from '#/api/mes/wm/salesnotice';
+import { $t } from '#/locales';
+import { MesWmSalesNoticeStatusEnum } from '#/views/mes/utils/constants';
+
+import { useFormSchema } from '../data';
+import LineList from './line-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesWmSalesNoticeApi.SalesNotice>();
+const originalSnapshot = ref(''); // 表单原始数据快照，用于提交时跳过未变更的保存请求
+const isEditable = computed(() => // 是否为编辑模式（可保存）
+  ['create', 'update'].includes(formType.value),
+);
+const isFinish = computed(() => formType.value === 'finish'); // 是否为执行出库模式
+const canSubmit = computed(() => // 是否可提交
+  formType.value === 'update' &&
+  formData.value?.status === MesWmSalesNoticeStatusEnum.PREPARE,
+);
+const getTitle = computed(() => {
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['发货通知单']);
+  }
+  if (formType.value === 'finish') {
+    return '执行出库';
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['发货通知单'])
+    : $t('ui.actionTitle.create', ['发货通知单']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+/** 提交通知单：表单有修改时先保存，再调用提交接口 */
+async function handleSubmit() {
+  const { valid } = await formApi.validate();
+  if (!valid || !formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    const current = JSON.stringify(await formApi.getValues());
+    if (current !== originalSnapshot.value) {
+      const data =
+        (await formApi.getValues()) as MesWmSalesNoticeApi.SalesNotice;
+      await updateSalesNotice({ ...formData.value, ...data });
+      originalSnapshot.value = current;
+    }
+    await submitSalesNotice(formData.value.id);
+    message.success('提交成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 执行出库（后端暂未实现，提示用户） */
+function handleFinish() {
+  message.info('执行出库功能暂时不支持，敬请期待！');
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (!isEditable.value) {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data = (await formApi.getValues()) as MesWmSalesNoticeApi.SalesNotice;
+    try {
+      if (formData.value?.id) {
+        await updateSalesNotice({ ...formData.value, ...data });
+        formData.value = { ...formData.value, ...data };
+      } else {
+        const id = await createSalesNotice(data);
+        formData.value = {
+          ...data,
+          id,
+          status: MesWmSalesNoticeStatusEnum.PREPARE,
+        };
+        await formApi.setFieldValue('id', id);
+        await formApi.setFieldValue('status', formData.value.status);
+        formType.value = 'update';
+      }
+      originalSnapshot.value = JSON.stringify(await formApi.getValues());
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      originalSnapshot.value = '';
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    formApi.setDisabled(!isEditable.value);
+    modalApi.setState({ showConfirmButton: isEditable.value });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getSalesNotice(data.id);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    }
+    originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+    <!-- 非新建模式展示物料信息 -->
+    <template v-if="formData?.id">
+      <Divider>物料信息</Divider>
+      <div class="mx-4">
+        <LineList :form-type="formType" :notice-id="formData.id" />
+      </div>
+    </template>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <Popconfirm
+          v-if="canSubmit"
+          title="确认提交该发货通知单？【提交后将不能修改】"
+          @confirm="handleSubmit"
+        >
+          <Button type="primary">提交</Button>
+        </Popconfirm>
+        <Button v-if="isFinish" type="primary" @click="handleFinish">
+          执行出库
+        </Button>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/salesnotice/modules/line-form.vue b/apps/web-antd/src/views/mes/wm/salesnotice/modules/line-form.vue
new file mode 100644
index 000000000..f33e49a6b
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/salesnotice/modules/line-form.vue
@@ -0,0 +1,94 @@
+<script lang="ts" setup>
+import type { MesWmSalesNoticeLineApi } from '#/api/mes/wm/salesnotice/line';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createSalesNoticeLine,
+  getSalesNoticeLine,
+  updateSalesNoticeLine,
+} from '#/api/mes/wm/salesnotice/line';
+import { $t } from '#/locales';
+
+import { useLineFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesWmSalesNoticeLineApi.SalesNoticeLine>();
+const noticeId = ref<number>(); // 所属通知单编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['发货通知单行'])
+    : $t('ui.actionTitle.create', ['发货通知单行']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 90,
+  },
+  layout: 'horizontal',
+  schema: useLineFormSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmSalesNoticeLineApi.SalesNoticeLine;
+    data.noticeId = noticeId.value;
+    try {
+      await (formData.value?.id
+        ? updateSalesNoticeLine({ ...data, id: formData.value.id })
+        : createSalesNoticeLine(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ id?: number; noticeId: number }>();
+    noticeId.value = data.noticeId;
+    if (!data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getSalesNoticeLine(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/salesnotice/modules/line-list.vue b/apps/web-antd/src/views/mes/wm/salesnotice/modules/line-list.vue
new file mode 100644
index 000000000..27ee104f7
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/salesnotice/modules/line-list.vue
@@ -0,0 +1,137 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmSalesNoticeLineApi } from '#/api/mes/wm/salesnotice/line';
+
+import { computed } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteSalesNoticeLine,
+  getSalesNoticeLinePage,
+} from '#/api/mes/wm/salesnotice/line';
+import { $t } from '#/locales';
+
+import { type FormType, useLineGridColumns } from '../data';
+import LineForm from './line-form.vue';
+
+const props = defineProps<{
+  formType: FormType;
+  noticeId: number;
+}>();
+
+const isEditable = computed(() => // 是否可编辑明细行
+  ['create', 'update'].includes(props.formType),
+);
+
+const [LineFormModal, lineFormModalApi] = useVbenModal({
+  connectedComponent: LineForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 添加物料 */
+function handleCreate() {
+  lineFormModalApi.setData({ noticeId: props.noticeId }).open();
+}
+
+/** 编辑物料 */
+function handleEdit(row: MesWmSalesNoticeLineApi.SalesNoticeLine) {
+  lineFormModalApi.setData({ id: row.id, noticeId: props.noticeId }).open();
+}
+
+/** 删除物料 */
+async function handleDelete(row: MesWmSalesNoticeLineApi.SalesNoticeLine) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.itemName]),
+    duration: 0,
+  });
+  try {
+    await deleteSalesNoticeLine(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.itemName]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useLineGridColumns(isEditable.value),
+    height: 400,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.noticeId) {
+            return { list: [], total: 0 };
+          }
+          return await getSalesNoticeLinePage({
+            noticeId: props.noticeId,
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesWmSalesNoticeLineApi.SalesNoticeLine>,
+});
+</script>
+
+<template>
+  <div>
+    <LineFormModal @success="handleRefresh" />
+    <Grid table-title="物料信息">
+      <template v-if="isEditable" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '添加物料',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              ifShow: isEditable,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              ifShow: isEditable,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.itemName]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/arrivalnotice/components/index.ts b/apps/web-ele/src/views/mes/wm/arrivalnotice/components/index.ts
new file mode 100644
index 000000000..1da3df21b
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/arrivalnotice/components/index.ts
@@ -0,0 +1,2 @@
+export { default as WmArrivalNoticeLineSelect } from './wm-arrival-notice-line-select.vue';
+export { default as WmArrivalNoticeSelect } from './wm-arrival-notice-select.vue';
diff --git a/apps/web-ele/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-line-select-dialog.vue b/apps/web-ele/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-line-select-dialog.vue
new file mode 100644
index 000000000..1a12121cc
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-line-select-dialog.vue
@@ -0,0 +1,206 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmArrivalNoticeLineApi } from '#/api/mes/wm/arrivalnotice/line';
+
+import { nextTick, ref } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+
+import { ElButton, ElDialog, ElMessage } from 'element-plus';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getArrivalNoticeLinePage } from '#/api/mes/wm/arrivalnotice/line';
+
+const emit = defineEmits<{
+  selected: [rows: MesWmArrivalNoticeLineApi.ArrivalNoticeLine[]];
+}>();
+
+const open = ref(false); // 弹窗是否打开
+const noticeId = ref<number>(); // 所属通知单编号
+const syncingSingleSelection = ref(false); // 是否同步单选勾选状态
+const selectedRows = ref<MesWmArrivalNoticeLineApi.ArrivalNoticeLine[]>([]); // 已选行列表
+const preSelectedIds = ref<number[]>([]); // 预选行编号列表
+
+/** 表格字段 */
+function useGridColumns(): VxeTableGridOptions<MesWmArrivalNoticeLineApi.ArrivalNoticeLine>['columns'] {
+  return [
+    {
+      type: 'checkbox',
+      width: 50,
+    },
+    {
+      field: 'itemCode',
+      title: '物料编码',
+      minWidth: 120,
+    },
+    {
+      field: 'itemName',
+      title: '物料名称',
+      minWidth: 140,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'arrivalQuantity',
+      title: '到货数量',
+      width: 100,
+    },
+    {
+      field: 'iqcCheckFlag',
+      title: '是否检验',
+      width: 90,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+      },
+    },
+    {
+      field: 'qualifiedQuantity',
+      title: '合格数量',
+      width: 100,
+    },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 120,
+    },
+  ];
+}
+
+/** 单选模式下同步 VXE 勾选状态 */
+async function syncSingleSelection(
+  row?: MesWmArrivalNoticeLineApi.ArrivalNoticeLine,
+) {
+  syncingSingleSelection.value = true;
+  await nextTick();
+  await gridApi.grid.clearCheckboxRow();
+  if (row) {
+    await gridApi.grid.setCheckboxRow(row, true);
+  }
+  await nextTick();
+  syncingSingleSelection.value = false;
+}
+
+/** 处理勾选变化，只保留最后一条 */
+async function handleCheckboxChange({
+  checked,
+  row,
+}: {
+  checked: boolean;
+  row?: MesWmArrivalNoticeLineApi.ArrivalNoticeLine;
+}) {
+  if (syncingSingleSelection.value) {
+    return;
+  }
+  const selected = checked && row ? [row] : [];
+  selectedRows.value = selected;
+  await syncSingleSelection(selected[0]);
+}
+
+/** 回显预选行 */
+function applyPreSelection() {
+  if (preSelectedIds.value.length === 0) {
+    return;
+  }
+  const rows =
+    gridApi.grid.getData() as MesWmArrivalNoticeLineApi.ArrivalNoticeLine[];
+  for (const row of rows) {
+    if (row.id && preSelectedIds.value.includes(row.id)) {
+      gridApi.grid.setCheckboxRow(row, true);
+      selectedRows.value = [row];
+    }
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 460,
+    keepSource: true,
+    checkboxConfig: {
+      highlight: true,
+      reserve: true,
+    },
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!noticeId.value) {
+            return { list: [], total: 0 };
+          }
+          return await getArrivalNoticeLinePage({
+            noticeId: noticeId.value,
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesWmArrivalNoticeLineApi.ArrivalNoticeLine>,
+  gridEvents: {
+    checkboxChange: handleCheckboxChange,
+  },
+});
+
+/** 打开行选择弹窗 */
+async function openModal(id: number | undefined, selectedIds?: number[]) {
+  open.value = true;
+  noticeId.value = id;
+  preSelectedIds.value = selectedIds || [];
+  selectedRows.value = [];
+  await nextTick();
+  await gridApi.grid.clearCheckboxRow();
+  await gridApi.query();
+  await nextTick();
+  applyPreSelection();
+}
+
+/** 关闭弹窗 */
+async function closeModal() {
+  open.value = false;
+  selectedRows.value = [];
+  await gridApi.grid.clearCheckboxRow();
+}
+
+/** 确认选择行 */
+function handleConfirm() {
+  if (selectedRows.value.length === 0) {
+    ElMessage.warning('请选择一条数据');
+    return;
+  }
+  emit('selected', [selectedRows.value[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/wm/arrivalnotice/components/wm-arrival-notice-line-select.vue b/apps/web-ele/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-line-select.vue
new file mode 100644
index 000000000..2d2c482f6
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-line-select.vue
@@ -0,0 +1,149 @@
+<script lang="ts" setup>
+import type { MesWmArrivalNoticeLineApi } from '#/api/mes/wm/arrivalnotice/line';
+
+import { computed, ref, useAttrs, watch } from 'vue';
+
+import { CircleX, Search } from '@vben/icons';
+
+import { ElInput, ElTooltip } from 'element-plus';
+
+import { getArrivalNoticeLine } from '#/api/mes/wm/arrivalnotice/line';
+
+import WmArrivalNoticeLineSelectDialog from './wm-arrival-notice-line-select-dialog.vue';
+
+defineOptions({ name: 'WmArrivalNoticeLineSelect', inheritAttrs: false });
+
+const props = withDefaults(
+  defineProps<{
+    clearable?: boolean;
+    disabled?: boolean;
+    modelValue?: number;
+    noticeId?: number; // 所属到货通知单编号
+    placeholder?: string;
+  }>(),
+  {
+    clearable: true,
+    disabled: false,
+    modelValue: undefined,
+    noticeId: undefined,
+    placeholder: '请选择到货通知单行',
+  },
+);
+
+const emit = defineEmits<{
+  change: [item: MesWmArrivalNoticeLineApi.ArrivalNoticeLine | undefined];
+  'update:modelValue': [value: number | undefined];
+}>();
+
+const attrs = useAttrs();
+const dialogRef = ref<InstanceType<typeof WmArrivalNoticeLineSelectDialog>>();
+const hovering = ref(false);
+const selectedItem = ref<MesWmArrivalNoticeLineApi.ArrivalNoticeLine>();
+
+const displayLabel = computed(() => {
+  const item = selectedItem.value;
+  if (!item) {
+    return '';
+  }
+  return `${item.itemCode ?? ''} - ${item.itemName ?? ''}`;
+});
+
+const showClear = computed(
+  () =>
+    props.clearable &&
+    !props.disabled &&
+    hovering.value &&
+    props.modelValue != null,
+);
+
+/** 根据编号单条查询行信息（用于编辑回显） */
+async function resolveItemById(id: number | undefined) {
+  if (id == null) {
+    selectedItem.value = undefined;
+    return;
+  }
+  if (selectedItem.value?.id === id) {
+    return;
+  }
+  selectedItem.value = await getArrivalNoticeLine(id);
+}
+
+watch(() => props.modelValue, resolveItemById, { immediate: true });
+
+/** noticeId 变化时清空选中（关联的行已失效） */
+watch(
+  () => props.noticeId,
+  () => {
+    selectedItem.value = undefined;
+    emit('update:modelValue', undefined);
+    emit('change', undefined);
+  },
+);
+
+/** 清空已选行 */
+function clearSelected() {
+  selectedItem.value = undefined;
+  emit('update:modelValue', undefined);
+  emit('change', undefined);
+}
+
+/** 打开行选择弹窗 */
+function handleClick(event: MouseEvent) {
+  if (props.disabled || !props.noticeId) {
+    return;
+  }
+  const target = event.target as HTMLElement;
+  if (showClear.value && target.closest('.el-input__suffix')) {
+    event.stopPropagation();
+    clearSelected();
+    return;
+  }
+  const selectedIds = props.modelValue == null ? [] : [props.modelValue];
+  dialogRef.value?.open(props.noticeId, selectedIds);
+}
+
+/** 弹窗选中回调 */
+function handleSelected(rows: MesWmArrivalNoticeLineApi.ArrivalNoticeLine[]) {
+  const item = rows[0];
+  if (!item) {
+    return;
+  }
+  selectedItem.value = item;
+  emit('update:modelValue', item.id);
+  emit('change', item);
+}
+</script>
+
+<template>
+  <div
+    v-bind="attrs"
+    class="w-full"
+    :class="disabled ? 'cursor-not-allowed' : 'cursor-pointer'"
+    @click="handleClick"
+    @mouseenter="hovering = true"
+    @mouseleave="hovering = false"
+  >
+    <ElTooltip :disabled="!selectedItem" placement="top" :show-after="500">
+      <template #content>
+        <div v-if="selectedItem" class="leading-6">
+          <div>物料编码：{{ selectedItem.itemCode || '-' }}</div>
+          <div>物料名称：{{ selectedItem.itemName || '-' }}</div>
+          <div>规格型号：{{ selectedItem.specification || '-' }}</div>
+          <div>到货数量：{{ selectedItem.arrivalQuantity ?? '-' }}</div>
+        </div>
+      </template>
+      <ElInput
+        :disabled="disabled"
+        :model-value="displayLabel"
+        :placeholder="placeholder"
+        readonly
+      >
+        <template #suffix>
+          <CircleX v-if="showClear" class="size-4" />
+          <Search v-else class="size-4" />
+        </template>
+      </ElInput>
+    </ElTooltip>
+  </div>
+  <WmArrivalNoticeLineSelectDialog ref="dialogRef" @selected="handleSelected" />
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-select-dialog.vue b/apps/web-ele/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-select-dialog.vue
new file mode 100644
index 000000000..836078b64
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-select-dialog.vue
@@ -0,0 +1,265 @@
+<script lang="ts" setup>
+import type { VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmArrivalNoticeApi } from '#/api/mes/wm/arrivalnotice';
+
+import { nextTick, ref } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+
+import { ElButton, ElDialog, ElMessage } from 'element-plus';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getArrivalNoticePage } from '#/api/mes/wm/arrivalnotice';
+
+const emit = defineEmits<{
+  selected: [rows: MesWmArrivalNoticeApi.ArrivalNotice[]];
+}>();
+
+const open = ref(false); // 弹窗是否打开
+const multiple = ref(false); // 是否多选
+const fixedStatus = ref<number>(); // 固定状态筛选
+const syncingSingleSelection = ref(false); // 是否同步单选勾选状态
+const selectedRows = ref<MesWmArrivalNoticeApi.ArrivalNotice[]>([]); // 已选通知单列表
+const preSelectedIds = ref<number[]>([]); // 预选通知单编号列表
+
+/** 搜索表单 */
+function useSearchSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '通知单编号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入通知单编号',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '通知单名称',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入通知单名称',
+      },
+    },
+    {
+      fieldName: 'purchaseOrderCode',
+      label: '采购订单编号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入采购订单编号',
+      },
+    },
+  ];
+}
+
+/** 表格字段 */
+function useGridColumns(): VxeTableGridOptions<MesWmArrivalNoticeApi.ArrivalNotice>['columns'] {
+  return [
+    {
+      type: 'checkbox',
+      width: 50,
+    },
+    {
+      field: 'code',
+      title: '通知单编号',
+      minWidth: 160,
+    },
+    {
+      field: 'name',
+      title: '通知单名称',
+      minWidth: 150,
+    },
+    {
+      field: 'purchaseOrderCode',
+      title: '采购订单编号',
+      minWidth: 140,
+    },
+    {
+      field: 'vendorName',
+      title: '供应商名称',
+      minWidth: 120,
+    },
+    {
+      field: 'arrivalDate',
+      title: '到货日期',
+      width: 120,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_ARRIVAL_NOTICE_STATUS },
+      },
+    },
+  ];
+}
+
+/** 单选模式下同步 VXE 勾选状态，避免跨页残留多选 */
+async function syncSingleSelection(row?: MesWmArrivalNoticeApi.ArrivalNotice) {
+  syncingSingleSelection.value = true;
+  await nextTick();
+  await gridApi.grid.clearCheckboxRow();
+  if (row) {
+    await gridApi.grid.setCheckboxRow(row, true);
+  }
+  await nextTick();
+  syncingSingleSelection.value = false;
+}
+
+/** 处理勾选变化，单选模式只保留最后一条 */
+async function handleCheckboxChange({
+  checked,
+  records,
+  row,
+}: {
+  checked: boolean;
+  records: MesWmArrivalNoticeApi.ArrivalNotice[];
+  row?: MesWmArrivalNoticeApi.ArrivalNotice;
+}) {
+  if (syncingSingleSelection.value) {
+    return;
+  }
+  if (!multiple.value) {
+    const selected = checked && row ? [row] : [];
+    selectedRows.value = selected;
+    await syncSingleSelection(selected[0]);
+    return;
+  }
+  selectedRows.value = records;
+}
+
+/** 处理全选变化 */
+function handleCheckboxAll({
+  records,
+}: {
+  records: MesWmArrivalNoticeApi.ArrivalNotice[];
+}) {
+  if (syncingSingleSelection.value) {
+    return;
+  }
+  selectedRows.value = records;
+}
+
+/** 回显预选通知单 */
+function applyPreSelection() {
+  if (preSelectedIds.value.length === 0) {
+    return;
+  }
+  const rows = gridApi.grid.getData() as MesWmArrivalNoticeApi.ArrivalNotice[];
+  for (const row of rows) {
+    if (row.id && preSelectedIds.value.includes(row.id)) {
+      gridApi.grid.setCheckboxRow(row, true);
+      if (!multiple.value) {
+        selectedRows.value = [row];
+      }
+    }
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useSearchSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 520,
+    keepSource: true,
+    checkboxConfig: {
+      highlight: true,
+      range: true,
+      reserve: true,
+    },
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getArrivalNoticePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            status: fixedStatus.value,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmArrivalNoticeApi.ArrivalNotice>,
+  gridEvents: {
+    checkboxAll: handleCheckboxAll,
+    checkboxChange: handleCheckboxChange,
+  },
+});
+
+/** 重置查询和选择状态 */
+async function resetQueryState() {
+  selectedRows.value = [];
+  await gridApi.grid.clearCheckboxRow();
+  await gridApi.formApi.resetForm();
+}
+
+/** 打开通知单选择弹窗 */
+async function openModal(
+  selectedIds?: number[],
+  options?: { multiple?: boolean; status?: number },
+) {
+  open.value = true;
+  multiple.value = options?.multiple ?? false;
+  fixedStatus.value = options?.status;
+  preSelectedIds.value = selectedIds || [];
+  await nextTick();
+  await resetQueryState();
+  await gridApi.query();
+  await nextTick();
+  applyPreSelection();
+}
+
+/** 关闭通知单选择弹窗 */
+async function closeModal() {
+  open.value = false;
+  await resetQueryState();
+}
+
+/** 确认选择通知单 */
+function handleConfirm() {
+  if (selectedRows.value.length === 0) {
+    ElMessage.warning(multiple.value ? '请至少选择一条数据' : '请选择一条数据');
+    return;
+  }
+  emit(
+    'selected',
+    multiple.value ? selectedRows.value : [selectedRows.value[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/wm/arrivalnotice/components/wm-arrival-notice-select.vue b/apps/web-ele/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-select.vue
new file mode 100644
index 000000000..5c02fc81b
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-select.vue
@@ -0,0 +1,136 @@
+<script lang="ts" setup>
+import type { MesWmArrivalNoticeApi } from '#/api/mes/wm/arrivalnotice';
+
+import { computed, ref, useAttrs, watch } from 'vue';
+
+import { CircleX, Search } from '@vben/icons';
+
+import { ElInput, ElTooltip } from 'element-plus';
+
+import { getArrivalNotice } from '#/api/mes/wm/arrivalnotice';
+
+import WmArrivalNoticeSelectDialog from './wm-arrival-notice-select-dialog.vue';
+
+defineOptions({ name: 'WmArrivalNoticeSelect', inheritAttrs: false });
+
+const props = withDefaults(
+  defineProps<{
+    clearable?: boolean;
+    disabled?: boolean;
+    modelValue?: number;
+    placeholder?: string;
+    status?: number; // 固定状态筛选
+  }>(),
+  {
+    clearable: true,
+    disabled: false,
+    modelValue: undefined,
+    placeholder: '请选择到货通知单',
+    status: undefined,
+  },
+);
+
+const emit = defineEmits<{
+  change: [item: MesWmArrivalNoticeApi.ArrivalNotice | undefined];
+  'update:modelValue': [value: number | undefined];
+}>();
+
+const attrs = useAttrs();
+const dialogRef = ref<InstanceType<typeof WmArrivalNoticeSelectDialog>>();
+const hovering = ref(false);
+const selectedItem = ref<MesWmArrivalNoticeApi.ArrivalNotice>();
+
+const displayLabel = computed(() => selectedItem.value?.code ?? '');
+
+const showClear = computed(
+  () =>
+    props.clearable &&
+    !props.disabled &&
+    hovering.value &&
+    props.modelValue != null,
+);
+
+/** 根据编号单条查询通知单信息（用于编辑回显） */
+async function resolveItemById(id: number | undefined) {
+  if (id == null) {
+    selectedItem.value = undefined;
+    return;
+  }
+  if (selectedItem.value?.id === id) {
+    return;
+  }
+  selectedItem.value = await getArrivalNotice(id);
+}
+
+watch(() => props.modelValue, resolveItemById, { immediate: true });
+
+/** 清空已选通知单 */
+function clearSelected() {
+  selectedItem.value = undefined;
+  emit('update:modelValue', undefined);
+  emit('change', undefined);
+}
+
+/** 打开通知单选择弹窗 */
+function handleClick(event: MouseEvent) {
+  if (props.disabled) {
+    return;
+  }
+  const target = event.target as HTMLElement;
+  if (showClear.value && target.closest('.el-input__suffix')) {
+    event.stopPropagation();
+    clearSelected();
+    return;
+  }
+  const selectedIds = props.modelValue == null ? [] : [props.modelValue];
+  dialogRef.value?.open(selectedIds, {
+    multiple: false,
+    status: props.status,
+  });
+}
+
+/** 弹窗选中回调 */
+function handleSelected(rows: MesWmArrivalNoticeApi.ArrivalNotice[]) {
+  const item = rows[0];
+  if (!item) {
+    return;
+  }
+  selectedItem.value = item;
+  emit('update:modelValue', item.id);
+  emit('change', item);
+}
+</script>
+
+<template>
+  <div
+    v-bind="attrs"
+    class="w-full"
+    :class="disabled ? 'cursor-not-allowed' : 'cursor-pointer'"
+    @click="handleClick"
+    @mouseenter="hovering = true"
+    @mouseleave="hovering = false"
+  >
+    <ElTooltip :disabled="!selectedItem" placement="top" :show-after="500">
+      <template #content>
+        <div v-if="selectedItem" class="leading-6">
+          <div>编号：{{ selectedItem.code || '-' }}</div>
+          <div>名称：{{ selectedItem.name || '-' }}</div>
+          <div>供应商：{{ selectedItem.vendorName || '-' }}</div>
+          <div>采购订单：{{ selectedItem.purchaseOrderCode || '-' }}</div>
+        </div>
+      </template>
+      <ElInput
+        :disabled="disabled"
+        :model-value="displayLabel"
+        :placeholder="placeholder"
+        readonly
+      >
+        <template #suffix>
+          <CircleX v-if="showClear" class="size-4" />
+          <Search v-else class="size-4" />
+        </template>
+      </ElInput>
+    </ElTooltip>
+  </div>
+  <WmArrivalNoticeSelectDialog ref="dialogRef" @selected="handleSelected" />
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/arrivalnotice/data.ts b/apps/web-ele/src/views/mes/wm/arrivalnotice/data.ts
new file mode 100644
index 000000000..210a6a37f
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/arrivalnotice/data.ts
@@ -0,0 +1,354 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmArrivalNoticeApi } from '#/api/mes/wm/arrivalnotice';
+import type { MesWmArrivalNoticeLineApi } from '#/api/mes/wm/arrivalnotice/line';
+
+import { h, markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+
+import { ElButton } from 'element-plus';
+
+import { z } from '#/adapter/form';
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getRangePickerDefaultProps } from '#/utils';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
+import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
+/** 新增/修改的表单 */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'status',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '通知单编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入通知单编号',
+      },
+      rules: 'required',
+      suffix:
+        formType === 'detail'
+          ? undefined
+          : () =>
+              h(
+                ElButton,
+                {
+                  onClick: async () => {
+                    const code = await generateAutoCode(
+                      MesAutoCodeRuleCode.WM_ARRIVAL_NOTICE_CODE,
+                    );
+                    await formApi?.setFieldValue('code', code);
+                  },
+                },
+                { default: () => '生成' },
+              ),
+    },
+    {
+      fieldName: 'name',
+      label: '通知单名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入通知单名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'purchaseOrderCode',
+      label: '采购订单编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入采购订单编号',
+      },
+    },
+    {
+      fieldName: 'vendorId',
+      label: '供应商',
+      component: markRaw(MdVendorSelect),
+      componentProps: {
+        placeholder: '请选择供应商',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'arrivalDate',
+      label: '到货日期',
+      component: 'DatePicker',
+      componentProps: {
+        class: '!w-full',
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择到货日期',
+        type: 'date',
+        valueFormat: 'x',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'contactName',
+      label: '联系人',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入联系人',
+      },
+    },
+    {
+      fieldName: 'contactTelephone',
+      label: '联系方式',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入联系方式',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '通知单编号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入通知单编号',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '通知单名称',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入通知单名称',
+      },
+    },
+    {
+      fieldName: 'purchaseOrderCode',
+      label: '采购订单编号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入采购订单编号',
+      },
+    },
+    {
+      fieldName: 'vendorId',
+      label: '供应商',
+      component: markRaw(MdVendorSelect),
+      componentProps: {
+        placeholder: '请选择供应商',
+      },
+    },
+    {
+      fieldName: 'arrivalDate',
+      label: '到货日期',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+        clearable: true,
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesWmArrivalNoticeApi.ArrivalNotice>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '通知单编号',
+      minWidth: 160,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '通知单名称',
+      minWidth: 150,
+    },
+    {
+      field: 'purchaseOrderCode',
+      title: '采购订单编号',
+      minWidth: 140,
+    },
+    {
+      field: 'vendorName',
+      title: '供应商名称',
+      minWidth: 120,
+    },
+    {
+      field: 'contactName',
+      title: '联系人',
+      minWidth: 100,
+    },
+    {
+      field: 'contactTelephone',
+      title: '联系方式',
+      minWidth: 120,
+    },
+    {
+      field: 'arrivalDate',
+      title: '到货日期',
+      width: 180,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      minWidth: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_ARRIVAL_NOTICE_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 180,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 通知单行子表的字段 */
+export function useLineGridColumns(
+  editable: boolean,
+): VxeTableGridOptions<MesWmArrivalNoticeLineApi.ArrivalNoticeLine>['columns'] {
+  return [
+    {
+      field: 'itemCode',
+      title: '物料编码',
+      minWidth: 120,
+    },
+    {
+      field: 'itemName',
+      title: '物料名称',
+      minWidth: 140,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'arrivalQuantity',
+      title: '到货数量',
+      width: 100,
+    },
+    {
+      field: 'iqcCheckFlag',
+      title: '是否检验',
+      width: 90,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+      },
+    },
+    {
+      field: 'qualifiedQuantity',
+      title: '合格数量',
+      width: 100,
+    },
+    {
+      field: 'iqcCode',
+      title: '检验单号',
+      minWidth: 140,
+    },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 120,
+    },
+    ...(editable
+      ? [
+          {
+            title: '操作',
+            width: 120,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 通知单行新增/修改的表单 */
+export function useLineFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择物料',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'arrivalQuantity',
+      label: '到货数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0.01,
+        placeholder: '请输入到货数量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'iqcCheckFlag',
+      label: '是否检验',
+      component: 'Switch',
+      rules: z.boolean().default(false),
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/wm/arrivalnotice/index.vue b/apps/web-ele/src/views/mes/wm/arrivalnotice/index.vue
new file mode 100644
index 000000000..041c6a27a
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/arrivalnotice/index.vue
@@ -0,0 +1,189 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmArrivalNoticeApi } from '#/api/mes/wm/arrivalnotice';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { ElButton, ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteArrivalNotice,
+  exportArrivalNotice,
+  getArrivalNoticePage,
+} from '#/api/mes/wm/arrivalnotice';
+import { $t } from '#/locales';
+import { MesWmArrivalNoticeStatusEnum } from '#/views/mes/utils/constants';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建到货通知单 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看到货通知单 */
+function handleDetail(row: MesWmArrivalNoticeApi.ArrivalNotice) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑到货通知单 */
+function handleEdit(row: MesWmArrivalNoticeApi.ArrivalNotice) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 删除到货通知单 */
+async function handleDelete(row: MesWmArrivalNoticeApi.ArrivalNotice) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.code]),
+  });
+  try {
+    await deleteArrivalNotice(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+/** 提示前往质检模块 */
+function handleQc() {
+  ElMessage.info('请前往【质量管理 - 待检任务】中进行来料检验操作');
+}
+
+/** 提示前往采购入库模块 */
+function handleReceipt() {
+  ElMessage.info('请前往【仓库管理 - 采购入库】中进行入库操作');
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportArrivalNotice(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '到货通知单.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getArrivalNoticePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmArrivalNoticeApi.ArrivalNotice>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】到货通知、采购入库、采购退货"
+        url="https://doc.iocoder.cn/mes/wm/purchase-in/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="到货通知单列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['到货通知单']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-arrival-notice:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:wm-arrival-notice:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <ElButton link type="primary" @click="handleDetail(row)">
+          {{ row.code }}
+        </ElButton>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:wm-arrival-notice:update'],
+              ifShow: row.status === MesWmArrivalNoticeStatusEnum.PREPARE,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm-arrival-notice:delete'],
+              ifShow: row.status === MesWmArrivalNoticeStatusEnum.PREPARE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '执行质检',
+              type: 'primary',
+              link: true,
+              ifShow: row.status === MesWmArrivalNoticeStatusEnum.PENDING_QC,
+              onClick: handleQc,
+            },
+            {
+              label: '执行入库',
+              type: 'primary',
+              link: true,
+              ifShow:
+                row.status === MesWmArrivalNoticeStatusEnum.PENDING_RECEIPT,
+              onClick: handleReceipt,
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/arrivalnotice/modules/form.vue b/apps/web-ele/src/views/mes/wm/arrivalnotice/modules/form.vue
new file mode 100644
index 000000000..4014f8593
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/arrivalnotice/modules/form.vue
@@ -0,0 +1,171 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesWmArrivalNoticeApi } from '#/api/mes/wm/arrivalnotice';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElButton, ElDivider, ElMessage, ElPopconfirm } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createArrivalNotice,
+  getArrivalNotice,
+  submitArrivalNotice,
+  updateArrivalNotice,
+} from '#/api/mes/wm/arrivalnotice';
+import { $t } from '#/locales';
+import { MesWmArrivalNoticeStatusEnum } from '#/views/mes/utils/constants';
+
+import { useFormSchema } from '../data';
+import LineList from './line-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesWmArrivalNoticeApi.ArrivalNotice>();
+const originalSnapshot = ref(''); // 表单原始数据快照，用于提交时跳过未变更的保存请求
+const isEditable = computed(() => // 是否为编辑模式（可保存）
+  ['create', 'update'].includes(formType.value),
+);
+const canSubmit = computed(() => // 是否可提交
+  formType.value === 'update' &&
+  formData.value?.status === MesWmArrivalNoticeStatusEnum.PREPARE,
+);
+const getTitle = computed(() => {
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['到货通知单']);
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['到货通知单'])
+    : $t('ui.actionTitle.create', ['到货通知单']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+/** 提交通知单：表单有修改时先保存，再调用提交接口 */
+async function handleSubmit() {
+  const { valid } = await formApi.validate();
+  if (!valid || !formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    const current = JSON.stringify(await formApi.getValues());
+    if (current !== originalSnapshot.value) {
+      const data =
+        (await formApi.getValues()) as MesWmArrivalNoticeApi.ArrivalNotice;
+      await updateArrivalNotice({ ...formData.value, ...data });
+      originalSnapshot.value = current;
+    }
+    await submitArrivalNotice(formData.value.id);
+    ElMessage.success('提交成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (!isEditable.value) {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmArrivalNoticeApi.ArrivalNotice;
+    try {
+      if (formData.value?.id) {
+        await updateArrivalNotice({ ...formData.value, ...data });
+        formData.value = { ...formData.value, ...data };
+      } else {
+        const id = await createArrivalNotice(data);
+        formData.value = {
+          ...data,
+          id,
+          status: MesWmArrivalNoticeStatusEnum.PREPARE,
+        };
+        await formApi.setFieldValue('id', id);
+        await formApi.setFieldValue('status', formData.value.status);
+        formType.value = 'update';
+      }
+      originalSnapshot.value = JSON.stringify(await formApi.getValues());
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      originalSnapshot.value = '';
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    formApi.setDisabled(!isEditable.value);
+    modalApi.setState({ showConfirmButton: isEditable.value });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getArrivalNotice(data.id);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    }
+    originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+    <!-- 非新建模式展示物料信息 -->
+    <template v-if="formData?.id">
+      <ElDivider>物料信息</ElDivider>
+      <div class="mx-4">
+        <LineList :form-type="formType" :notice-id="formData.id" />
+      </div>
+    </template>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <ElPopconfirm
+          v-if="canSubmit"
+          title="确认提交该到货通知单？【提交后将不能修改】"
+          width="260"
+          @confirm="handleSubmit"
+        >
+          <template #reference>
+            <ElButton type="primary">提交</ElButton>
+          </template>
+        </ElPopconfirm>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/arrivalnotice/modules/line-form.vue b/apps/web-ele/src/views/mes/wm/arrivalnotice/modules/line-form.vue
new file mode 100644
index 000000000..61712f6ff
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/arrivalnotice/modules/line-form.vue
@@ -0,0 +1,94 @@
+<script lang="ts" setup>
+import type { MesWmArrivalNoticeLineApi } from '#/api/mes/wm/arrivalnotice/line';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createArrivalNoticeLine,
+  getArrivalNoticeLine,
+  updateArrivalNoticeLine,
+} from '#/api/mes/wm/arrivalnotice/line';
+import { $t } from '#/locales';
+
+import { useLineFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesWmArrivalNoticeLineApi.ArrivalNoticeLine>();
+const noticeId = ref<number>(); // 所属通知单编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['到货通知单行'])
+    : $t('ui.actionTitle.create', ['到货通知单行']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 90,
+  },
+  layout: 'horizontal',
+  schema: useLineFormSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmArrivalNoticeLineApi.ArrivalNoticeLine;
+    data.noticeId = noticeId.value;
+    try {
+      await (formData.value?.id
+        ? updateArrivalNoticeLine({ ...data, id: formData.value.id })
+        : createArrivalNoticeLine(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ id?: number; noticeId: number }>();
+    noticeId.value = data.noticeId;
+    if (!data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getArrivalNoticeLine(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/arrivalnotice/modules/line-list.vue b/apps/web-ele/src/views/mes/wm/arrivalnotice/modules/line-list.vue
new file mode 100644
index 000000000..4b38709cc
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/arrivalnotice/modules/line-list.vue
@@ -0,0 +1,139 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmArrivalNoticeLineApi } from '#/api/mes/wm/arrivalnotice/line';
+
+import { computed } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteArrivalNoticeLine,
+  getArrivalNoticeLinePage,
+} from '#/api/mes/wm/arrivalnotice/line';
+import { $t } from '#/locales';
+
+import { type FormType, useLineGridColumns } from '../data';
+import LineForm from './line-form.vue';
+
+const props = defineProps<{
+  formType: FormType;
+  noticeId: number;
+}>();
+
+const isEditable = computed(() => // 是否可编辑明细行
+  ['create', 'update'].includes(props.formType),
+);
+
+const [LineFormModal, lineFormModalApi] = useVbenModal({
+  connectedComponent: LineForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 添加物料 */
+function handleCreate() {
+  lineFormModalApi.setData({ noticeId: props.noticeId }).open();
+}
+
+/** 编辑物料 */
+function handleEdit(row: MesWmArrivalNoticeLineApi.ArrivalNoticeLine) {
+  lineFormModalApi.setData({ id: row.id, noticeId: props.noticeId }).open();
+}
+
+/** 删除物料 */
+async function handleDelete(
+  row: MesWmArrivalNoticeLineApi.ArrivalNoticeLine,
+) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.itemName]),
+  });
+  try {
+    await deleteArrivalNoticeLine(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.itemName]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useLineGridColumns(isEditable.value),
+    height: 400,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.noticeId) {
+            return { list: [], total: 0 };
+          }
+          return await getArrivalNoticeLinePage({
+            noticeId: props.noticeId,
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesWmArrivalNoticeLineApi.ArrivalNoticeLine>,
+});
+</script>
+
+<template>
+  <div>
+    <LineFormModal @success="handleRefresh" />
+    <Grid table-title="物料信息">
+      <template v-if="isEditable" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '添加物料',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              ifShow: isEditable,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              ifShow: isEditable,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.itemName]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/itemreceipt/data.ts b/apps/web-ele/src/views/mes/wm/itemreceipt/data.ts
new file mode 100644
index 000000000..a812f6857
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/itemreceipt/data.ts
@@ -0,0 +1,534 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmArrivalNoticeApi } from '#/api/mes/wm/arrivalnotice';
+import type { MesWmArrivalNoticeLineApi } from '#/api/mes/wm/arrivalnotice/line';
+import type { MesWmItemReceiptApi } from '#/api/mes/wm/itemreceipt';
+import type { MesWmItemReceiptDetailApi } from '#/api/mes/wm/itemreceipt/detail';
+import type { MesWmItemReceiptLineApi } from '#/api/mes/wm/itemreceipt/line';
+
+import { h, markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+
+import { ElButton } from 'element-plus';
+
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getRangePickerDefaultProps } from '#/utils';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
+import {
+  MesAutoCodeRuleCode,
+  MesWmArrivalNoticeStatusEnum,
+} from '#/views/mes/utils/constants';
+import {
+  WmArrivalNoticeLineSelect,
+  WmArrivalNoticeSelect,
+} from '#/views/mes/wm/arrivalnotice/components';
+import {
+  WmWarehouseAreaSelect,
+  WmWarehouseLocationSelect,
+  WmWarehouseSelect,
+} from '#/views/mes/wm/warehouse/components';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'finish' | 'stock' | 'update';
+
+/** 表单头部是否只读（上架、详情、入库态） */
+function isHeaderReadonly(formType: FormType): boolean {
+  return (
+    formType === 'detail' || formType === 'finish' || formType === 'stock'
+  );
+}
+
+/** 新增/修改的表单 */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'status',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '入库单编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入入库单编号',
+      },
+      rules: 'required',
+      suffix: isHeaderReadonly(formType)
+        ? undefined
+        : () =>
+            h(
+              ElButton,
+              {
+                onClick: async () => {
+                  const code = await generateAutoCode(
+                    MesAutoCodeRuleCode.WM_ITEM_RECEIPT_CODE,
+                  );
+                  await formApi?.setFieldValue('code', code);
+                },
+              },
+              { default: () => '生成' },
+            ),
+    },
+    {
+      fieldName: 'name',
+      label: '入库单名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入入库单名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'receiptDate',
+      label: '入库日期',
+      component: 'DatePicker',
+      componentProps: {
+        class: '!w-full',
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择入库日期',
+        type: 'date',
+        valueFormat: 'x',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'noticeId',
+      label: '到货通知单',
+      component: markRaw(WmArrivalNoticeSelect),
+      componentProps: {
+        // 选择到货通知单后，自动回填供应商和采购订单号
+        onChange: async (notice?: MesWmArrivalNoticeApi.ArrivalNotice) => {
+          await formApi?.setValues({
+            purchaseOrderCode: notice?.purchaseOrderCode,
+            vendorId: notice?.vendorId,
+          });
+        },
+        status: MesWmArrivalNoticeStatusEnum.PENDING_RECEIPT,
+      },
+    },
+    {
+      fieldName: 'vendorId',
+      label: '供应商',
+      component: markRaw(MdVendorSelect),
+      componentProps: {
+        placeholder: '请选择供应商',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'purchaseOrderCode',
+      label: '采购订单号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入采购订单号',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '入库单编号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入入库单编号',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '入库单名称',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入入库单名称',
+      },
+    },
+    {
+      fieldName: 'vendorId',
+      label: '供应商',
+      component: markRaw(MdVendorSelect),
+      componentProps: {
+        placeholder: '请选择供应商',
+      },
+    },
+    {
+      fieldName: 'receiptDate',
+      label: '入库日期',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+        clearable: true,
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesWmItemReceiptApi.ItemReceipt>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '入库单编号',
+      minWidth: 160,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '入库单名称',
+      minWidth: 150,
+    },
+    {
+      field: 'purchaseOrderCode',
+      title: '采购订单号',
+      minWidth: 140,
+    },
+    {
+      field: 'vendorName',
+      title: '供应商名称',
+      minWidth: 120,
+    },
+    {
+      field: 'receiptDate',
+      title: '入库日期',
+      width: 180,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      minWidth: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_ITEM_RECEIPT_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 240,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 入库单行子表的字段 */
+export function useLineGridColumns(
+  editable: boolean,
+  stockable: boolean,
+): VxeTableGridOptions<MesWmItemReceiptLineApi.ItemReceiptLine>['columns'] {
+  return [
+    {
+      type: 'expand',
+      width: 48,
+      slots: { content: 'detail' },
+    },
+    {
+      field: 'itemCode',
+      title: '物料编码',
+      minWidth: 120,
+    },
+    {
+      field: 'itemName',
+      title: '物料名称',
+      minWidth: 140,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'receivedQuantity',
+      title: '入库数量',
+      width: 100,
+    },
+    {
+      field: 'batchCode',
+      title: '批次号',
+      minWidth: 120,
+    },
+    ...(editable || stockable
+      ? [
+          {
+            title: '操作',
+            width: 200,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 入库单行新增/修改的表单 */
+export function useLineFormSchema(
+  hasNotice: boolean,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'noticeId',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'arrivalNoticeLineId',
+      label: '到货通知单行',
+      component: markRaw(WmArrivalNoticeLineSelect),
+      componentProps: {
+        // 选择到货通知单行后，自动回填物料和入库数量
+        onChange: async (
+          line?: MesWmArrivalNoticeLineApi.ArrivalNoticeLine,
+        ) => {
+          await formApi?.setValues({
+            itemId: line?.itemId,
+            receivedQuantity: line?.arrivalQuantity,
+          });
+        },
+      },
+      dependencies: {
+        triggerFields: ['noticeId'],
+        if: () => hasNotice,
+        componentProps: (values) => ({
+          noticeId: values.noticeId,
+        }),
+      },
+    },
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择物料',
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['arrivalNoticeLineId'],
+        componentProps: (values) => ({
+          disabled: !!values.arrivalNoticeLineId,
+          placeholder: '请选择物料',
+        }),
+      },
+    },
+    {
+      fieldName: 'receivedQuantity',
+      label: '入库数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入入库数量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'productionDate',
+      label: '生产日期',
+      component: 'DatePicker',
+      componentProps: {
+        class: '!w-full',
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择生产日期',
+        type: 'date',
+        valueFormat: 'x',
+      },
+    },
+    {
+      fieldName: 'expireDate',
+      label: '有效期',
+      component: 'DatePicker',
+      componentProps: {
+        class: '!w-full',
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择有效期',
+        type: 'date',
+        valueFormat: 'x',
+      },
+    },
+    {
+      fieldName: 'lotNumber',
+      label: '生产批号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入生产批号',
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+        placeholder: '由填写信息自动生成',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 上架明细子表的字段 */
+export function useDetailGridColumns(
+  stockable: boolean,
+): VxeTableGridOptions<MesWmItemReceiptDetailApi.ItemReceiptDetail>['columns'] {
+  return [
+    {
+      field: 'warehouseName',
+      title: '仓库名称',
+      minWidth: 100,
+    },
+    {
+      field: 'locationName',
+      title: '库区名称',
+      minWidth: 100,
+    },
+    {
+      field: 'areaName',
+      title: '库位名称',
+      minWidth: 100,
+    },
+    {
+      field: 'quantity',
+      title: '数量',
+      width: 100,
+    },
+    ...(stockable
+      ? [
+          {
+            title: '操作',
+            width: 120,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 上架明细新增/修改的表单 */
+export function useDetailFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'warehouseId',
+      label: '入库仓库',
+      component: markRaw(WmWarehouseSelect),
+      componentProps: {
+        // 切换仓库后清空库区和库位
+        onChange: async () => {
+          await formApi?.setValues({
+            areaId: undefined,
+            locationId: undefined,
+          });
+        },
+        placeholder: '请选择仓库',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'locationId',
+      label: '库区',
+      component: markRaw(WmWarehouseLocationSelect),
+      componentProps: {
+        placeholder: '请选择库区',
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['warehouseId'],
+        componentProps: (values) => ({
+          // 切换库区后清空库位
+          onChange: async () => {
+            await formApi?.setFieldValue('areaId', undefined);
+          },
+          placeholder: '请选择库区',
+          warehouseId: values.warehouseId,
+        }),
+      },
+    },
+    {
+      fieldName: 'areaId',
+      label: '库位',
+      component: markRaw(WmWarehouseAreaSelect),
+      componentProps: {
+        placeholder: '请选择库位',
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['locationId'],
+        componentProps: (values) => ({
+          locationId: values.locationId,
+          placeholder: '请选择库位',
+        }),
+      },
+    },
+    {
+      fieldName: 'quantity',
+      label: '数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入数量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/wm/itemreceipt/index.vue b/apps/web-ele/src/views/mes/wm/itemreceipt/index.vue
new file mode 100644
index 000000000..06a610b68
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/itemreceipt/index.vue
@@ -0,0 +1,211 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmItemReceiptApi } from '#/api/mes/wm/itemreceipt';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { ElButton, ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  cancelItemReceipt,
+  deleteItemReceipt,
+  exportItemReceipt,
+  getItemReceiptPage,
+} from '#/api/mes/wm/itemreceipt';
+import { $t } from '#/locales';
+import { MesWmItemReceiptStatusEnum } from '#/views/mes/utils/constants';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建采购入库单 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看采购入库单 */
+function handleDetail(row: MesWmItemReceiptApi.ItemReceipt) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑采购入库单 */
+function handleEdit(row: MesWmItemReceiptApi.ItemReceipt) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 执行上架 */
+function handleStock(row: MesWmItemReceiptApi.ItemReceipt) {
+  formModalApi.setData({ formType: 'stock', id: row.id }).open();
+}
+
+/** 执行入库 */
+function handleFinish(row: MesWmItemReceiptApi.ItemReceipt) {
+  formModalApi.setData({ formType: 'finish', id: row.id }).open();
+}
+
+/** 删除采购入库单 */
+async function handleDelete(row: MesWmItemReceiptApi.ItemReceipt) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.code]),
+  });
+  try {
+    await deleteItemReceipt(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+/** 取消采购入库单 */
+async function handleCancel(row: MesWmItemReceiptApi.ItemReceipt) {
+  await cancelItemReceipt(row.id!);
+  ElMessage.success('取消成功');
+  handleRefresh();
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportItemReceipt(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '采购入库单.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getItemReceiptPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmItemReceiptApi.ItemReceipt>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】到货通知、采购入库、采购退货"
+        url="https://doc.iocoder.cn/mes/wm/purchase-in/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="采购入库单列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['采购入库单']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-item-receipt:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:wm-item-receipt:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <ElButton link type="primary" @click="handleDetail(row)">
+          {{ row.code }}
+        </ElButton>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:wm-item-receipt:update'],
+              ifShow: row.status === MesWmItemReceiptStatusEnum.PREPARE,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm-item-receipt:delete'],
+              ifShow: row.status === MesWmItemReceiptStatusEnum.PREPARE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '执行上架',
+              type: 'primary',
+              link: true,
+              auth: ['mes:wm-item-receipt:update'],
+              ifShow: row.status === MesWmItemReceiptStatusEnum.APPROVING,
+              onClick: handleStock.bind(null, row),
+            },
+            {
+              label: '执行入库',
+              type: 'primary',
+              link: true,
+              auth: ['mes:wm-item-receipt:finish'],
+              ifShow: row.status === MesWmItemReceiptStatusEnum.APPROVED,
+              onClick: handleFinish.bind(null, row),
+            },
+            {
+              label: '取消',
+              type: 'danger',
+              link: true,
+              auth: ['mes:wm-item-receipt:update'],
+              ifShow:
+                row.status === MesWmItemReceiptStatusEnum.APPROVING ||
+                row.status === MesWmItemReceiptStatusEnum.APPROVED,
+              popConfirm: {
+                title: '确认取消该采购入库单？取消后不可恢复。',
+                confirm: handleCancel.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/itemreceipt/modules/detail-form.vue b/apps/web-ele/src/views/mes/wm/itemreceipt/modules/detail-form.vue
new file mode 100644
index 000000000..e1a062a41
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/itemreceipt/modules/detail-form.vue
@@ -0,0 +1,104 @@
+<script lang="ts" setup>
+import type { MesWmItemReceiptDetailApi } from '#/api/mes/wm/itemreceipt/detail';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createItemReceiptDetail,
+  getItemReceiptDetail,
+  updateItemReceiptDetail,
+} from '#/api/mes/wm/itemreceipt/detail';
+import { $t } from '#/locales';
+
+import { useDetailFormSchema } from '../data';
+
+const emit = defineEmits<{ success: [lineId: number] }>();
+const formData = ref<MesWmItemReceiptDetailApi.ItemReceiptDetail>();
+const receiptId = ref<number>(); // 所属入库单编号
+const lineId = ref<number>(); // 所属入库单行编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['上架明细'])
+    : $t('ui.actionTitle.create', ['上架明细']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 90,
+  },
+  layout: 'horizontal',
+  schema: useDetailFormSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmItemReceiptDetailApi.ItemReceiptDetail;
+    data.receiptId = receiptId.value;
+    data.lineId = lineId.value;
+    try {
+      await (formData.value?.id
+        ? updateItemReceiptDetail({ ...data, id: formData.value.id })
+        : createItemReceiptDetail(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success', lineId.value!);
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    formApi.setState({ schema: useDetailFormSchema(formApi) });
+    // 加载数据
+    const data = modalApi.getData<{
+      detailId?: number;
+      itemId?: number;
+      lineId: number;
+      receiptId: number;
+    }>();
+    receiptId.value = data.receiptId;
+    lineId.value = data.lineId;
+    if (data.detailId) {
+      modalApi.lock();
+      try {
+        formData.value = await getItemReceiptDetail(data.detailId);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    } else if (data.itemId) {
+      await formApi.setFieldValue('itemId', data.itemId);
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/itemreceipt/modules/detail-list.vue b/apps/web-ele/src/views/mes/wm/itemreceipt/modules/detail-list.vue
new file mode 100644
index 000000000..b03aa6762
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/itemreceipt/modules/detail-list.vue
@@ -0,0 +1,103 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmItemReceiptDetailApi } from '#/api/mes/wm/itemreceipt/detail';
+
+import { computed, watch } from 'vue';
+
+import { ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { deleteItemReceiptDetail } from '#/api/mes/wm/itemreceipt/detail';
+import { $t } from '#/locales';
+
+import { type FormType, useDetailGridColumns } from '../data';
+
+const props = defineProps<{
+  details: MesWmItemReceiptDetailApi.ItemReceiptDetail[];
+  formType: FormType;
+}>();
+
+const emit = defineEmits<{
+  edit: [detailId: number];
+  refresh: [];
+}>();
+
+const isStock = computed(() => props.formType === 'stock'); // 是否为上架模式
+
+/** 编辑上架明细 */
+function handleEdit(row: MesWmItemReceiptDetailApi.ItemReceiptDetail) {
+  emit('edit', row.id!);
+}
+
+/** 删除上架明细 */
+async function handleDelete(
+  row: MesWmItemReceiptDetailApi.ItemReceiptDetail,
+) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.warehouseName]),
+  });
+  try {
+    await deleteItemReceiptDetail(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.warehouseName]));
+    emit('refresh');
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    border: true,
+    columns: useDetailGridColumns(isStock.value),
+    data: props.details,
+    pagerConfig: {
+      enabled: false,
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    size: 'small',
+    toolbarConfig: {
+      enabled: false,
+    },
+  } as VxeTableGridOptions<MesWmItemReceiptDetailApi.ItemReceiptDetail>,
+});
+
+watch(
+  () => props.details,
+  (details) => gridApi.setGridOptions({ data: details }),
+);
+</script>
+
+<template>
+  <div class="px-4 py-2">
+    <Grid>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [
+                  row.warehouseName,
+                ]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/itemreceipt/modules/form.vue b/apps/web-ele/src/views/mes/wm/itemreceipt/modules/form.vue
new file mode 100644
index 000000000..a67a42031
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/itemreceipt/modules/form.vue
@@ -0,0 +1,241 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesWmItemReceiptApi } from '#/api/mes/wm/itemreceipt';
+
+import { computed, ref } from 'vue';
+
+import { confirm, useVbenModal } from '@vben/common-ui';
+
+import { ElButton, ElDivider, ElMessage, ElPopconfirm } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createItemReceipt,
+  finishItemReceipt,
+  getItemReceipt,
+  stockItemReceipt,
+  submitItemReceipt,
+  updateItemReceipt,
+} from '#/api/mes/wm/itemreceipt';
+import { $t } from '#/locales';
+import { MesWmItemReceiptStatusEnum } from '#/views/mes/utils/constants';
+
+import { useFormSchema } from '../data';
+import LineList from './line-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesWmItemReceiptApi.ItemReceipt>();
+const originalSnapshot = ref(''); // 表单原始数据快照，用于提交时跳过未变更的保存请求
+const isEditable = computed(() => // 是否为编辑模式（可保存）
+  ['create', 'update'].includes(formType.value),
+);
+const isStock = computed(() => formType.value === 'stock'); // 是否为上架模式
+const isFinish = computed(() => formType.value === 'finish'); // 是否为执行入库模式
+const canSubmit = computed(() => // 是否可提交
+  formType.value === 'update' &&
+  formData.value?.status === MesWmItemReceiptStatusEnum.PREPARE,
+);
+const getTitle = computed(() => {
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['采购入库单']);
+  }
+  if (formType.value === 'stock') {
+    return '执行上架';
+  }
+  if (formType.value === 'finish') {
+    return '执行入库';
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['采购入库单'])
+    : $t('ui.actionTitle.create', ['采购入库单']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+/** 提交入库单：表单有修改时先保存，再调用提交接口 */
+async function handleSubmit() {
+  const { valid } = await formApi.validate();
+  if (!valid || !formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    const current = JSON.stringify(await formApi.getValues());
+    if (current !== originalSnapshot.value) {
+      const data = (await formApi.getValues()) as MesWmItemReceiptApi.ItemReceipt;
+      await updateItemReceipt({ ...formData.value, ...data });
+      originalSnapshot.value = current;
+    }
+    await submitItemReceipt(formData.value.id);
+    ElMessage.success('提交成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 执行上架 */
+async function handleStock() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await stockItemReceipt(formData.value.id);
+    ElMessage.success('上架成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 执行入库 */
+async function handleFinish() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await finishItemReceipt(formData.value.id);
+    ElMessage.success('入库成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (!isEditable.value) {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data = (await formApi.getValues()) as MesWmItemReceiptApi.ItemReceipt;
+    try {
+      if (formData.value?.id) {
+        await updateItemReceipt({ ...formData.value, ...data });
+        formData.value = { ...formData.value, ...data };
+      } else {
+        const id = await createItemReceipt(data);
+        formData.value = {
+          ...data,
+          id,
+          status: MesWmItemReceiptStatusEnum.PREPARE,
+        };
+        await formApi.setFieldValue('id', id);
+        await formApi.setFieldValue('status', formData.value.status);
+        formType.value = 'update';
+      }
+      originalSnapshot.value = JSON.stringify(await formApi.getValues());
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      originalSnapshot.value = '';
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    formApi.setDisabled(!isEditable.value);
+    modalApi.setState({ showConfirmButton: isEditable.value });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getItemReceipt(data.id);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    }
+    originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  },
+});
+
+/** 上架前确认 */
+async function confirmStock() {
+  try {
+    await confirm('确认执行上架？');
+  } catch {
+    return;
+  }
+  await handleStock();
+}
+
+/** 入库前确认 */
+async function confirmFinish() {
+  try {
+    await confirm('确认执行入库？执行后将更新库存台账。');
+  } catch {
+    return;
+  }
+  await handleFinish();
+}
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+    <!-- 非新建模式展示物料信息 -->
+    <template v-if="formData?.id">
+      <ElDivider>物料信息</ElDivider>
+      <div class="mx-4">
+        <LineList
+          :form-type="formType"
+          :notice-id="formData.noticeId"
+          :receipt-id="formData.id"
+        />
+      </div>
+    </template>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <ElPopconfirm
+          v-if="canSubmit"
+          title="确认提交该采购入库单？【提交后将不能修改】"
+          width="260"
+          @confirm="handleSubmit"
+        >
+          <template #reference>
+            <ElButton type="primary">提交</ElButton>
+          </template>
+        </ElPopconfirm>
+        <ElButton v-if="isStock" type="primary" @click="confirmStock">
+          执行上架
+        </ElButton>
+        <ElButton v-if="isFinish" type="primary" @click="confirmFinish">
+          执行入库
+        </ElButton>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/itemreceipt/modules/line-form.vue b/apps/web-ele/src/views/mes/wm/itemreceipt/modules/line-form.vue
new file mode 100644
index 000000000..673bde942
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/itemreceipt/modules/line-form.vue
@@ -0,0 +1,104 @@
+<script lang="ts" setup>
+import type { MesWmItemReceiptLineApi } from '#/api/mes/wm/itemreceipt/line';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createItemReceiptLine,
+  getItemReceiptLine,
+  updateItemReceiptLine,
+} from '#/api/mes/wm/itemreceipt/line';
+import { $t } from '#/locales';
+
+import { useLineFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesWmItemReceiptLineApi.ItemReceiptLine>();
+const receiptId = ref<number>(); // 所属入库单编号
+const noticeId = ref<number>(); // 所属到货通知单编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['物料入库单行'])
+    : $t('ui.actionTitle.create', ['物料入库单行']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmItemReceiptLineApi.ItemReceiptLine;
+    data.receiptId = receiptId.value;
+    try {
+      await (formData.value?.id
+        ? updateItemReceiptLine({ ...data, id: formData.value.id })
+        : createItemReceiptLine(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{
+      id?: number;
+      noticeId?: number;
+      receiptId: number;
+    }>();
+    receiptId.value = data.receiptId;
+    noticeId.value = data.noticeId;
+    formApi.setState({ schema: useLineFormSchema(!!data.noticeId, formApi) });
+    if (data.noticeId) {
+      await formApi.setFieldValue('noticeId', data.noticeId);
+    }
+    if (!data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getItemReceiptLine(data.id);
+      // 设置到 values
+      await formApi.setValues({ ...formData.value, noticeId: noticeId.value });
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/itemreceipt/modules/line-list.vue b/apps/web-ele/src/views/mes/wm/itemreceipt/modules/line-list.vue
new file mode 100644
index 000000000..4f4f8d9b9
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/itemreceipt/modules/line-list.vue
@@ -0,0 +1,239 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmItemReceiptDetailApi } from '#/api/mes/wm/itemreceipt/detail';
+import type { MesWmItemReceiptLineApi } from '#/api/mes/wm/itemreceipt/line';
+
+import { computed, reactive } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getItemReceiptDetailListByLineId } from '#/api/mes/wm/itemreceipt/detail';
+import {
+  deleteItemReceiptLine,
+  getItemReceiptLinePage,
+} from '#/api/mes/wm/itemreceipt/line';
+import { $t } from '#/locales';
+import { PrinterLabel } from '#/views/mes/wm/barcode/components';
+
+import { type FormType, useLineGridColumns } from '../data';
+import DetailForm from './detail-form.vue';
+import DetailList from './detail-list.vue';
+import LineForm from './line-form.vue';
+
+const props = defineProps<{
+  formType: FormType;
+  noticeId?: number;
+  receiptId: number;
+}>();
+
+const isEditable = computed(() => // 是否可编辑明细行
+  ['create', 'update'].includes(props.formType),
+);
+const isStock = computed(() => props.formType === 'stock'); // 是否为上架模式
+const detailMap = reactive<
+  Record<number, MesWmItemReceiptDetailApi.ItemReceiptDetail[]>
+>({}); // 已展开行的上架明细缓存
+
+const [LineFormModal, lineFormModalApi] = useVbenModal({
+  connectedComponent: LineForm,
+  destroyOnClose: true,
+});
+
+const [DetailFormModal, detailFormModalApi] = useVbenModal({
+  connectedComponent: DetailForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  for (const id of Object.keys(detailMap)) {
+    delete detailMap[Number(id)];
+  }
+  gridApi.query();
+}
+
+/** 添加物料 */
+function handleCreate() {
+  lineFormModalApi
+    .setData({ noticeId: props.noticeId, receiptId: props.receiptId })
+    .open();
+}
+
+/** 编辑物料 */
+function handleEdit(row: MesWmItemReceiptLineApi.ItemReceiptLine) {
+  lineFormModalApi
+    .setData({
+      id: row.id,
+      noticeId: props.noticeId,
+      receiptId: props.receiptId,
+    })
+    .open();
+}
+
+/** 删除物料 */
+async function handleDelete(row: MesWmItemReceiptLineApi.ItemReceiptLine) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.itemName]),
+  });
+  try {
+    await deleteItemReceiptLine(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.itemName]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+/** 上架：直接打开明细创建表单 */
+function handleStock(row: MesWmItemReceiptLineApi.ItemReceiptLine) {
+  openDetailForm(row.id!, row.itemId);
+}
+
+/** 打开上架明细表单 */
+function openDetailForm(lineId: number, itemId?: number, detailId?: number) {
+  detailFormModalApi
+    .setData({ detailId, itemId, lineId, receiptId: props.receiptId })
+    .open();
+}
+
+/** 获取已展开行的上架明细 */
+function getExpandedDetails(row: MesWmItemReceiptLineApi.ItemReceiptLine) {
+  return detailMap[row.id!] || [];
+}
+
+/** 加载指定行的上架明细 */
+async function loadLineDetails(lineId: number) {
+  detailMap[lineId] = await getItemReceiptDetailListByLineId(lineId);
+}
+
+/** 展开行时懒加载上架明细 */
+async function handleExpandChange(
+  row: MesWmItemReceiptLineApi.ItemReceiptLine,
+  expanded: boolean,
+) {
+  if (!expanded) {
+    return;
+  }
+  await loadLineDetails(row.id!);
+}
+
+/** 明细表单提交成功后，刷新对应行已展开的明细 */
+async function handleDetailSuccess(lineId: number) {
+  await loadLineDetails(lineId);
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useLineGridColumns(isEditable.value, isStock.value),
+    expandConfig: {
+      padding: true,
+    },
+    height: 400,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.receiptId) {
+            return { list: [], total: 0 };
+          }
+          return await getItemReceiptLinePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            receiptId: props.receiptId,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesWmItemReceiptLineApi.ItemReceiptLine>,
+  gridEvents: {
+    toggleRowExpand: ({
+      expanded,
+      row,
+    }: {
+      expanded: boolean;
+      row: MesWmItemReceiptLineApi.ItemReceiptLine;
+    }) => {
+      handleExpandChange(row, expanded);
+    },
+  },
+});
+</script>
+
+<template>
+  <div>
+    <LineFormModal @success="handleRefresh" />
+    <DetailFormModal @success="handleDetailSuccess" />
+    <Grid table-title="物料信息">
+      <template v-if="isEditable" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '添加物料',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #detail="{ row }">
+        <DetailList
+          :details="getExpandedDetails(row)"
+          :form-type="formType"
+          @edit="(detailId) => openDetailForm(row.id!, row.itemId, detailId)"
+          @refresh="loadLineDetails(row.id!)"
+        />
+      </template>
+      <template #actions="{ row }">
+        <div class="flex items-center justify-center">
+          <TableAction
+            :actions="[
+              {
+                label: $t('common.edit'),
+                type: 'primary',
+                link: true,
+                icon: ACTION_ICON.EDIT,
+                ifShow: isEditable,
+                onClick: handleEdit.bind(null, row),
+              },
+              {
+                label: $t('common.delete'),
+                type: 'danger',
+                link: true,
+                icon: ACTION_ICON.DELETE,
+                ifShow: isEditable,
+                popConfirm: {
+                  title: $t('ui.actionMessage.deleteConfirm', [row.itemName]),
+                  confirm: handleDelete.bind(null, row),
+                },
+              },
+              {
+                label: '上架',
+                type: 'primary',
+                link: true,
+                ifShow: isStock,
+                onClick: handleStock.bind(null, row),
+              },
+            ]"
+          />
+          <PrinterLabel
+            v-if="isStock"
+            :biz-code="row.batchCode"
+            :biz-id="row.batchId"
+            biz-type="ITEM_BATCH"
+          />
+        </div>
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/productissue/data.ts b/apps/web-ele/src/views/mes/wm/productissue/data.ts
new file mode 100644
index 000000000..6891918e0
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/productissue/data.ts
@@ -0,0 +1,476 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmMaterialStockApi } from '#/api/mes/wm/materialstock';
+import type { MesWmProductIssueApi } from '#/api/mes/wm/productissue';
+import type { MesWmProductIssueDetailApi } from '#/api/mes/wm/productissue/detail';
+import type { MesWmProductIssueLineApi } from '#/api/mes/wm/productissue/line';
+
+import { h, markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { ElButton } from 'element-plus';
+
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getRangePickerDefaultProps } from '#/utils';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import MdWorkstationSelect from '#/views/mes/md/workstation/components/md-workstation-select.vue';
+import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
+import {
+  MesAutoCodeRuleCode,
+  MesProWorkOrderStatusEnum,
+} from '#/views/mes/utils/constants';
+import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
+import {
+  WmWarehouseAreaSelect,
+  WmWarehouseLocationSelect,
+  WmWarehouseSelect,
+} from '#/views/mes/wm/warehouse/components';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'finish' | 'stock' | 'update';
+
+/** 表单头部是否只读（拣货、详情、完成态） */
+function isHeaderReadonly(formType: FormType): boolean {
+  return (
+    formType === 'detail' || formType === 'finish' || formType === 'stock'
+  );
+}
+
+/** 新增/修改的表单 */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'status',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '领料单编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入领料单编号',
+      },
+      rules: 'required',
+      suffix: isHeaderReadonly(formType)
+        ? undefined
+        : () =>
+            h(
+              ElButton,
+              {
+                onClick: async () => {
+                  const code = await generateAutoCode(
+                    MesAutoCodeRuleCode.WM_PRODUCT_ISSUE_CODE,
+                  );
+                  await formApi?.setFieldValue('code', code);
+                },
+              },
+              { default: () => '生成' },
+            ),
+    },
+    {
+      fieldName: 'name',
+      label: '领料单名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入领料单名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'requiredTime',
+      label: '需求时间',
+      component: 'DatePicker',
+      componentProps: {
+        class: '!w-full',
+        format: 'YYYY-MM-DD HH:mm:ss',
+        placeholder: '请选择需求时间',
+        type: 'datetime',
+        valueFormat: 'x',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'workOrderId',
+      label: '生产工单',
+      component: markRaw(ProWorkOrderSelect),
+      componentProps: {
+        status: MesProWorkOrderStatusEnum.CONFIRMED,
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'workstationId',
+      label: '工作站',
+      component: markRaw(MdWorkstationSelect),
+      componentProps: {
+        placeholder: '请选择工作站',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '领料单编号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入领料单编号',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '领料单名称',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入领料单名称',
+      },
+    },
+    {
+      fieldName: 'issueDate',
+      label: '领料日期',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+        clearable: true,
+      },
+    },
+    {
+      fieldName: 'status',
+      label: '单据状态',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_WM_PRODUCT_ISSUE_STATUS, 'number'),
+        placeholder: '请选择单据状态',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesWmProductIssueApi.ProductIssue>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '领料单编号',
+      minWidth: 160,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '领料单名称',
+      minWidth: 150,
+    },
+    {
+      field: 'workOrderCode',
+      title: '生产工单',
+      minWidth: 140,
+    },
+    {
+      field: 'workstationName',
+      title: '工作站',
+      minWidth: 120,
+    },
+    {
+      field: 'requiredTime',
+      title: '需求时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      minWidth: 110,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_PRODUCT_ISSUE_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 240,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 领料单行子表的字段 */
+export function useLineGridColumns(
+  editable: boolean,
+  stockable: boolean,
+): VxeTableGridOptions<MesWmProductIssueLineApi.ProductIssueLine>['columns'] {
+  return [
+    {
+      type: 'expand',
+      width: 48,
+      slots: { content: 'detail' },
+    },
+    {
+      field: 'itemCode',
+      title: '物料编码',
+      minWidth: 120,
+    },
+    {
+      field: 'itemName',
+      title: '物料名称',
+      minWidth: 140,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'quantity',
+      title: '领料数量',
+      width: 100,
+    },
+    ...(editable || stockable
+      ? [
+          {
+            title: '操作',
+            width: 160,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 领料单行新增/修改的表单 */
+export function useLineFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'itemId',
+      label: '产品物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择产品物料',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'quantity',
+      label: '领料数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入领料数量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 拣货明细子表的字段 */
+export function useDetailGridColumns(
+  stockable: boolean,
+): VxeTableGridOptions<MesWmProductIssueDetailApi.ProductIssueDetail>['columns'] {
+  return [
+    {
+      field: 'batchCode',
+      title: '批次号',
+      minWidth: 120,
+    },
+    {
+      field: 'warehouseName',
+      title: '仓库名称',
+      minWidth: 100,
+    },
+    {
+      field: 'locationName',
+      title: '库区名称',
+      minWidth: 100,
+    },
+    {
+      field: 'areaName',
+      title: '库位名称',
+      minWidth: 100,
+    },
+    {
+      field: 'quantity',
+      title: '数量',
+      width: 100,
+    },
+    ...(stockable
+      ? [
+          {
+            title: '操作',
+            width: 120,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 拣货明细新增/修改的表单 */
+export function useDetailFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'quantityMax',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'materialStockId',
+      label: '库存记录',
+      component: markRaw(WmMaterialStockSelect),
+      componentProps: {
+        // 选择库存记录后，自动回填仓库/库区/库位/批次/数量
+        onChange: async (stock?: MesWmMaterialStockApi.MaterialStock) => {
+          await formApi?.setValues({
+            areaId: stock?.areaId,
+            batchCode: stock?.batchCode,
+            batchId: stock?.batchId,
+            locationId: stock?.locationId,
+            quantity: stock?.quantity,
+            quantityMax: stock?.quantity,
+            warehouseId: stock?.warehouseId,
+          });
+        },
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['itemId'],
+        componentProps: (values) => ({
+          itemId: values.itemId,
+        }),
+      },
+    },
+    {
+      fieldName: 'quantity',
+      label: '数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入数量',
+        precision: 2,
+      },
+      rules: 'required',
+      dependencies: {
+        triggerFields: ['quantityMax'],
+        componentProps: (values) => ({
+          class: '!w-full',
+          controlsPosition: 'right',
+          max: values.quantityMax,
+          min: 0,
+          placeholder: '请输入数量',
+          precision: 2,
+        }),
+      },
+    },
+    {
+      fieldName: 'warehouseId',
+      label: '出库仓库',
+      component: markRaw(WmWarehouseSelect),
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'locationId',
+      label: '库区',
+      component: markRaw(WmWarehouseLocationSelect),
+      componentProps: {
+        disabled: true,
+      },
+      dependencies: {
+        triggerFields: ['warehouseId'],
+        componentProps: (values) => ({
+          disabled: true,
+          warehouseId: values.warehouseId,
+        }),
+      },
+    },
+    {
+      fieldName: 'areaId',
+      label: '库位',
+      component: markRaw(WmWarehouseAreaSelect),
+      componentProps: {
+        disabled: true,
+      },
+      dependencies: {
+        triggerFields: ['locationId'],
+        componentProps: (values) => ({
+          disabled: true,
+          locationId: values.locationId,
+        }),
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+      },
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/wm/productissue/index.vue b/apps/web-ele/src/views/mes/wm/productissue/index.vue
new file mode 100644
index 000000000..c1e8bb461
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/productissue/index.vue
@@ -0,0 +1,230 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmProductIssueApi } from '#/api/mes/wm/productissue';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { ElButton, ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  cancelProductIssue,
+  deleteProductIssue,
+  exportProductIssue,
+  getProductIssuePage,
+  submitProductIssue,
+} from '#/api/mes/wm/productissue';
+import { $t } from '#/locales';
+import { MesWmProductIssueStatusEnum } from '#/views/mes/utils/constants';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建领料出库单 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看领料出库单 */
+function handleDetail(row: MesWmProductIssueApi.ProductIssue) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑领料出库单 */
+function handleEdit(row: MesWmProductIssueApi.ProductIssue) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 执行拣货 */
+function handleStock(row: MesWmProductIssueApi.ProductIssue) {
+  formModalApi.setData({ formType: 'stock', id: row.id }).open();
+}
+
+/** 完成领料出库 */
+function handleFinish(row: MesWmProductIssueApi.ProductIssue) {
+  formModalApi.setData({ formType: 'finish', id: row.id }).open();
+}
+
+/** 提交领料出库单 */
+async function handleSubmit(row: MesWmProductIssueApi.ProductIssue) {
+  await submitProductIssue(row.id!);
+  ElMessage.success('提交成功');
+  handleRefresh();
+}
+
+/** 删除领料出库单 */
+async function handleDelete(row: MesWmProductIssueApi.ProductIssue) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.code]),
+  });
+  try {
+    await deleteProductIssue(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+/** 取消领料出库单 */
+async function handleCancel(row: MesWmProductIssueApi.ProductIssue) {
+  await cancelProductIssue(row.id!);
+  ElMessage.success('取消成功');
+  handleRefresh();
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportProductIssue(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '领料出库单.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getProductIssuePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmProductIssueApi.ProductIssue>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】生产领料、生产退料、物料消耗"
+        url="https://doc.iocoder.cn/mes/wm/issue-return/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="领料出库单列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['领料出库单']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-product-issue:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:wm-product-issue:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <ElButton link type="primary" @click="handleDetail(row)">
+          {{ row.code }}
+        </ElButton>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:wm-product-issue:update'],
+              ifShow: row.status === MesWmProductIssueStatusEnum.PREPARE,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.submit'),
+              type: 'primary',
+              link: true,
+              auth: ['mes:wm-product-issue:update'],
+              ifShow: row.status === MesWmProductIssueStatusEnum.PREPARE,
+              popConfirm: {
+                title: '确认提交该领料出库单？提交后将不能修改。',
+                confirm: handleSubmit.bind(null, row),
+              },
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm-product-issue:delete'],
+              ifShow: row.status === MesWmProductIssueStatusEnum.PREPARE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '执行拣货',
+              type: 'primary',
+              link: true,
+              auth: ['mes:wm-product-issue:update'],
+              ifShow: row.status === MesWmProductIssueStatusEnum.APPROVING,
+              onClick: handleStock.bind(null, row),
+            },
+            {
+              label: '完成',
+              type: 'primary',
+              link: true,
+              auth: ['mes:wm-product-issue:finish'],
+              ifShow: row.status === MesWmProductIssueStatusEnum.APPROVED,
+              onClick: handleFinish.bind(null, row),
+            },
+            {
+              label: '取消',
+              type: 'danger',
+              link: true,
+              auth: ['mes:wm-product-issue:update'],
+              ifShow:
+                row.status === MesWmProductIssueStatusEnum.APPROVING ||
+                row.status === MesWmProductIssueStatusEnum.APPROVED,
+              popConfirm: {
+                title: '确认取消该领料出库单？取消后不可恢复。',
+                confirm: handleCancel.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/productissue/modules/detail-form.vue b/apps/web-ele/src/views/mes/wm/productissue/modules/detail-form.vue
new file mode 100644
index 000000000..785c8ee0b
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/productissue/modules/detail-form.vue
@@ -0,0 +1,104 @@
+<script lang="ts" setup>
+import type { MesWmProductIssueDetailApi } from '#/api/mes/wm/productissue/detail';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createProductIssueDetail,
+  getProductIssueDetail,
+  updateProductIssueDetail,
+} from '#/api/mes/wm/productissue/detail';
+import { $t } from '#/locales';
+
+import { useDetailFormSchema } from '../data';
+
+const emit = defineEmits<{ success: [lineId: number] }>();
+const formData = ref<MesWmProductIssueDetailApi.ProductIssueDetail>();
+const issueId = ref<number>(); // 所属领料单编号
+const lineId = ref<number>(); // 所属领料单行编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['拣货明细'])
+    : $t('ui.actionTitle.create', ['拣货明细']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 90,
+  },
+  layout: 'horizontal',
+  schema: useDetailFormSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmProductIssueDetailApi.ProductIssueDetail;
+    data.issueId = issueId.value;
+    data.lineId = lineId.value;
+    try {
+      await (formData.value?.id
+        ? updateProductIssueDetail({ ...data, id: formData.value.id })
+        : createProductIssueDetail(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success', lineId.value!);
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    formApi.setState({ schema: useDetailFormSchema(formApi) });
+    // 加载数据
+    const data = modalApi.getData<{
+      detailId?: number;
+      issueId: number;
+      itemId?: number;
+      lineId: number;
+    }>();
+    issueId.value = data.issueId;
+    lineId.value = data.lineId;
+    if (data.detailId) {
+      modalApi.lock();
+      try {
+        formData.value = await getProductIssueDetail(data.detailId);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    } else if (data.itemId) {
+      await formApi.setFieldValue('itemId', data.itemId);
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/productissue/modules/detail-list.vue b/apps/web-ele/src/views/mes/wm/productissue/modules/detail-list.vue
new file mode 100644
index 000000000..548fd75fc
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/productissue/modules/detail-list.vue
@@ -0,0 +1,103 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmProductIssueDetailApi } from '#/api/mes/wm/productissue/detail';
+
+import { computed, watch } from 'vue';
+
+import { ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { deleteProductIssueDetail } from '#/api/mes/wm/productissue/detail';
+import { $t } from '#/locales';
+
+import { type FormType, useDetailGridColumns } from '../data';
+
+const props = defineProps<{
+  details: MesWmProductIssueDetailApi.ProductIssueDetail[];
+  formType: FormType;
+}>();
+
+const emit = defineEmits<{
+  edit: [detailId: number];
+  refresh: [];
+}>();
+
+const isStock = computed(() => props.formType === 'stock'); // 是否为拣货模式
+
+/** 编辑拣货明细 */
+function handleEdit(row: MesWmProductIssueDetailApi.ProductIssueDetail) {
+  emit('edit', row.id!);
+}
+
+/** 删除拣货明细 */
+async function handleDelete(
+  row: MesWmProductIssueDetailApi.ProductIssueDetail,
+) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.warehouseName]),
+  });
+  try {
+    await deleteProductIssueDetail(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.warehouseName]));
+    emit('refresh');
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    border: true,
+    columns: useDetailGridColumns(isStock.value),
+    data: props.details,
+    pagerConfig: {
+      enabled: false,
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    size: 'small',
+    toolbarConfig: {
+      enabled: false,
+    },
+  } as VxeTableGridOptions<MesWmProductIssueDetailApi.ProductIssueDetail>,
+});
+
+watch(
+  () => props.details,
+  (details) => gridApi.setGridOptions({ data: details }),
+);
+</script>
+
+<template>
+  <div class="px-4 py-2">
+    <Grid>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [
+                  row.warehouseName,
+                ]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/productissue/modules/form.vue b/apps/web-ele/src/views/mes/wm/productissue/modules/form.vue
new file mode 100644
index 000000000..a5dc6f97c
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/productissue/modules/form.vue
@@ -0,0 +1,235 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesWmProductIssueApi } from '#/api/mes/wm/productissue';
+
+import { computed, ref } from 'vue';
+
+import { confirm, useVbenModal } from '@vben/common-ui';
+
+import { ElButton, ElDivider, ElMessage, ElPopconfirm } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  checkProductIssueQuantity,
+  createProductIssue,
+  finishProductIssue,
+  getProductIssue,
+  stockProductIssue,
+  submitProductIssue,
+  updateProductIssue,
+} from '#/api/mes/wm/productissue';
+import { $t } from '#/locales';
+import { MesWmProductIssueStatusEnum } from '#/views/mes/utils/constants';
+
+import { useFormSchema } from '../data';
+import LineList from './line-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesWmProductIssueApi.ProductIssue>();
+const originalSnapshot = ref(''); // 表单原始数据快照，用于提交时跳过未变更的保存请求
+const isEditable = computed(() => // 是否为编辑模式（可保存）
+  ['create', 'update'].includes(formType.value),
+);
+const isStock = computed(() => formType.value === 'stock'); // 是否为拣货模式
+const isFinish = computed(() => formType.value === 'finish'); // 是否为完成出库模式
+const canSubmit = computed(() => // 是否可提交
+  formType.value === 'update' &&
+  formData.value?.status === MesWmProductIssueStatusEnum.PREPARE,
+);
+const getTitle = computed(() => {
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['领料出库单']);
+  }
+  if (formType.value === 'stock') {
+    return '执行拣货';
+  }
+  if (formType.value === 'finish') {
+    return '完成领料出库';
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['领料出库单'])
+    : $t('ui.actionTitle.create', ['领料出库单']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+/** 提交领料单：表单有修改时先保存，再调用提交接口 */
+async function handleSubmit() {
+  const { valid } = await formApi.validate();
+  if (!valid || !formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    const current = JSON.stringify(await formApi.getValues());
+    if (current !== originalSnapshot.value) {
+      const data =
+        (await formApi.getValues()) as MesWmProductIssueApi.ProductIssue;
+      await updateProductIssue({ ...formData.value, ...data });
+      originalSnapshot.value = current;
+    }
+    await submitProductIssue(formData.value.id);
+    ElMessage.success('提交成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 执行拣货：领料数量与拣货数量不一致时二次确认 */
+async function handleStock() {
+  if (!formData.value?.id) {
+    return;
+  }
+  const quantityMatch = await checkProductIssueQuantity(formData.value.id);
+  if (!quantityMatch) {
+    try {
+      await confirm('领料数量与拣货数量不一致，确认执行拣货？');
+    } catch {
+      return;
+    }
+  }
+  modalApi.lock();
+  try {
+    await stockProductIssue(formData.value.id);
+    ElMessage.success('拣货成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 完成领料出库 */
+async function handleFinish() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await finishProductIssue(formData.value.id);
+    ElMessage.success('完成成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (!isEditable.value) {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmProductIssueApi.ProductIssue;
+    try {
+      if (formData.value?.id) {
+        await updateProductIssue({ ...formData.value, ...data });
+        formData.value = { ...formData.value, ...data };
+      } else {
+        const id = await createProductIssue(data);
+        formData.value = {
+          ...data,
+          id,
+          status: MesWmProductIssueStatusEnum.PREPARE,
+        };
+        await formApi.setFieldValue('id', id);
+        await formApi.setFieldValue('status', formData.value.status);
+        formType.value = 'update';
+      }
+      originalSnapshot.value = JSON.stringify(await formApi.getValues());
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      originalSnapshot.value = '';
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    formApi.setDisabled(!isEditable.value);
+    modalApi.setState({ showConfirmButton: isEditable.value });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getProductIssue(data.id);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    }
+    originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+    <!-- 非新建模式展示物料信息 -->
+    <template v-if="formData?.id">
+      <ElDivider>物料信息</ElDivider>
+      <div class="mx-4">
+        <LineList :form-type="formType" :issue-id="formData.id" />
+      </div>
+    </template>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <ElPopconfirm
+          v-if="canSubmit"
+          title="确认提交该领料出库单？【提交后将不能修改】"
+          width="260"
+          @confirm="handleSubmit"
+        >
+          <template #reference>
+            <ElButton type="primary">提交</ElButton>
+          </template>
+        </ElPopconfirm>
+        <ElButton v-if="isStock" type="primary" @click="handleStock">
+          执行拣货
+        </ElButton>
+        <ElPopconfirm
+          v-if="isFinish"
+          title="确认完成该领料单并执行出库吗？"
+          width="260"
+          @confirm="handleFinish"
+        >
+          <template #reference>
+            <ElButton type="primary">完成</ElButton>
+          </template>
+        </ElPopconfirm>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/productissue/modules/line-form.vue b/apps/web-ele/src/views/mes/wm/productissue/modules/line-form.vue
new file mode 100644
index 000000000..f2e455ff5
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/productissue/modules/line-form.vue
@@ -0,0 +1,94 @@
+<script lang="ts" setup>
+import type { MesWmProductIssueLineApi } from '#/api/mes/wm/productissue/line';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createProductIssueLine,
+  getProductIssueLine,
+  updateProductIssueLine,
+} from '#/api/mes/wm/productissue/line';
+import { $t } from '#/locales';
+
+import { useLineFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesWmProductIssueLineApi.ProductIssueLine>();
+const issueId = ref<number>(); // 所属领料单编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['领料出库单行'])
+    : $t('ui.actionTitle.create', ['领料出库单行']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 90,
+  },
+  layout: 'horizontal',
+  schema: useLineFormSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmProductIssueLineApi.ProductIssueLine;
+    data.issueId = issueId.value;
+    try {
+      await (formData.value?.id
+        ? updateProductIssueLine({ ...data, id: formData.value.id })
+        : createProductIssueLine(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ id?: number; issueId: number }>();
+    issueId.value = data.issueId;
+    if (!data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getProductIssueLine(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/productissue/modules/line-list.vue b/apps/web-ele/src/views/mes/wm/productissue/modules/line-list.vue
new file mode 100644
index 000000000..a40376788
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/productissue/modules/line-list.vue
@@ -0,0 +1,221 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmProductIssueDetailApi } from '#/api/mes/wm/productissue/detail';
+import type { MesWmProductIssueLineApi } from '#/api/mes/wm/productissue/line';
+
+import { computed, reactive } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getProductIssueDetailListByLineId } from '#/api/mes/wm/productissue/detail';
+import {
+  deleteProductIssueLine,
+  getProductIssueLinePage,
+} from '#/api/mes/wm/productissue/line';
+import { $t } from '#/locales';
+
+import { type FormType, useLineGridColumns } from '../data';
+import DetailForm from './detail-form.vue';
+import DetailList from './detail-list.vue';
+import LineForm from './line-form.vue';
+
+const props = defineProps<{
+  formType: FormType;
+  issueId: number;
+}>();
+
+const isEditable = computed(() => // 是否可编辑明细行
+  ['create', 'update'].includes(props.formType),
+);
+const isStock = computed(() => props.formType === 'stock'); // 是否为拣货模式
+const detailMap = reactive<
+  Record<number, MesWmProductIssueDetailApi.ProductIssueDetail[]>
+>({}); // 已展开行的拣货明细缓存
+
+const [LineFormModal, lineFormModalApi] = useVbenModal({
+  connectedComponent: LineForm,
+  destroyOnClose: true,
+});
+
+const [DetailFormModal, detailFormModalApi] = useVbenModal({
+  connectedComponent: DetailForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  for (const id of Object.keys(detailMap)) {
+    delete detailMap[Number(id)];
+  }
+  gridApi.query();
+}
+
+/** 添加物料 */
+function handleCreate() {
+  lineFormModalApi.setData({ issueId: props.issueId }).open();
+}
+
+/** 编辑物料 */
+function handleEdit(row: MesWmProductIssueLineApi.ProductIssueLine) {
+  lineFormModalApi.setData({ id: row.id, issueId: props.issueId }).open();
+}
+
+/** 删除物料 */
+async function handleDelete(row: MesWmProductIssueLineApi.ProductIssueLine) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.itemName]),
+  });
+  try {
+    await deleteProductIssueLine(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.itemName]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+/** 拣货：直接打开明细创建表单 */
+function handlePicking(row: MesWmProductIssueLineApi.ProductIssueLine) {
+  openDetailForm(row.id!, row.itemId);
+}
+
+/** 打开拣货明细表单 */
+function openDetailForm(lineId: number, itemId?: number, detailId?: number) {
+  detailFormModalApi
+    .setData({ detailId, issueId: props.issueId, itemId, lineId })
+    .open();
+}
+
+/** 获取已展开行的拣货明细 */
+function getExpandedDetails(row: MesWmProductIssueLineApi.ProductIssueLine) {
+  return detailMap[row.id!] || [];
+}
+
+/** 加载指定行的拣货明细 */
+async function loadLineDetails(lineId: number) {
+  detailMap[lineId] = await getProductIssueDetailListByLineId(lineId);
+}
+
+/** 展开行时懒加载拣货明细 */
+async function handleExpandChange(
+  row: MesWmProductIssueLineApi.ProductIssueLine,
+  expanded: boolean,
+) {
+  if (!expanded) {
+    return;
+  }
+  await loadLineDetails(row.id!);
+}
+
+/** 明细表单提交成功后，刷新对应行已展开的明细 */
+async function handleDetailSuccess(lineId: number) {
+  await loadLineDetails(lineId);
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useLineGridColumns(isEditable.value, isStock.value),
+    expandConfig: {
+      padding: true,
+    },
+    height: 400,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.issueId) {
+            return { list: [], total: 0 };
+          }
+          return await getProductIssueLinePage({
+            issueId: props.issueId,
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesWmProductIssueLineApi.ProductIssueLine>,
+  gridEvents: {
+    toggleRowExpand: ({
+      expanded,
+      row,
+    }: {
+      expanded: boolean;
+      row: MesWmProductIssueLineApi.ProductIssueLine;
+    }) => {
+      handleExpandChange(row, expanded);
+    },
+  },
+});
+</script>
+
+<template>
+  <div>
+    <LineFormModal @success="handleRefresh" />
+    <DetailFormModal @success="handleDetailSuccess" />
+    <Grid table-title="物料信息">
+      <template v-if="isEditable" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '添加物料',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #detail="{ row }">
+        <DetailList
+          :details="getExpandedDetails(row)"
+          :form-type="formType"
+          @edit="(detailId) => openDetailForm(row.id!, row.itemId, detailId)"
+          @refresh="loadLineDetails(row.id!)"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              ifShow: isEditable,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              ifShow: isEditable,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.itemName]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '拣货',
+              type: 'primary',
+              link: true,
+              ifShow: isStock,
+              onClick: handlePicking.bind(null, row),
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/productreceipt/data.ts b/apps/web-ele/src/views/mes/wm/productreceipt/data.ts
new file mode 100644
index 000000000..159c99407
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/productreceipt/data.ts
@@ -0,0 +1,457 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmMaterialStockApi } from '#/api/mes/wm/materialstock';
+import type { MesWmProductReceiptApi } from '#/api/mes/wm/productreceipt';
+import type { MesWmProductReceiptDetailApi } from '#/api/mes/wm/productreceipt/detail';
+import type { MesWmProductReceiptLineApi } from '#/api/mes/wm/productreceipt/line';
+
+import { h, markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+
+import { ElButton } from 'element-plus';
+
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getRangePickerDefaultProps } from '#/utils';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
+import {
+  MesAutoCodeRuleCode,
+  MesProWorkOrderStatusEnum,
+} from '#/views/mes/utils/constants';
+import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
+import {
+  WmWarehouseAreaSelect,
+  WmWarehouseLocationSelect,
+  WmWarehouseSelect,
+} from '#/views/mes/wm/warehouse/components';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'finish' | 'stock' | 'update';
+
+/** 表单头部是否只读（上架、详情、入库态） */
+function isHeaderReadonly(formType: FormType): boolean {
+  return (
+    formType === 'detail' || formType === 'finish' || formType === 'stock'
+  );
+}
+
+/** 新增/修改的表单 */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'status',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '入库单编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入入库单编号',
+      },
+      rules: 'required',
+      suffix: isHeaderReadonly(formType)
+        ? undefined
+        : () =>
+            h(
+              ElButton,
+              {
+                onClick: async () => {
+                  const code = await generateAutoCode(
+                    MesAutoCodeRuleCode.PRODUCTRECPT_CODE,
+                  );
+                  await formApi?.setFieldValue('code', code);
+                },
+              },
+              { default: () => '生成' },
+            ),
+    },
+    {
+      fieldName: 'name',
+      label: '入库单名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入入库单名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'receiptDate',
+      label: '入库日期',
+      component: 'DatePicker',
+      componentProps: {
+        class: '!w-full',
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择入库日期',
+        type: 'date',
+        valueFormat: 'x',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'workOrderId',
+      label: '生产工单',
+      component: markRaw(ProWorkOrderSelect),
+      componentProps: {
+        status: MesProWorkOrderStatusEnum.CONFIRMED,
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '入库单编号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入入库单编号',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '入库单名称',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入入库单名称',
+      },
+    },
+    {
+      fieldName: 'receiptDate',
+      label: '入库日期',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+        clearable: true,
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesWmProductReceiptApi.ProductReceipt>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '入库单编号',
+      minWidth: 160,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '入库单名称',
+      minWidth: 150,
+    },
+    {
+      field: 'workOrderCode',
+      title: '生产工单',
+      minWidth: 140,
+    },
+    {
+      field: 'receiptDate',
+      title: '入库日期',
+      width: 180,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      minWidth: 110,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_PRODUCT_RECEIPT_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 240,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 入库单行子表的字段 */
+export function useLineGridColumns(
+  editable: boolean,
+  stockable: boolean,
+): VxeTableGridOptions<MesWmProductReceiptLineApi.ProductReceiptLine>['columns'] {
+  return [
+    {
+      type: 'expand',
+      width: 48,
+      slots: { content: 'detail' },
+    },
+    {
+      field: 'itemCode',
+      title: '产品物料编码',
+      minWidth: 120,
+    },
+    {
+      field: 'itemName',
+      title: '产品物料名称',
+      minWidth: 140,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'quantity',
+      title: '入库数量',
+      width: 100,
+    },
+    {
+      field: 'batchCode',
+      title: '批次号',
+      minWidth: 120,
+    },
+    ...(editable || stockable
+      ? [
+          {
+            title: '操作',
+            width: 200,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 入库单行新增/修改的表单 */
+export function useLineFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'materialStockId',
+      label: '库存记录',
+      component: markRaw(WmMaterialStockSelect),
+      componentProps: {
+        // 选择库存记录后，自动回填物料/批次/数量
+        onChange: async (stock?: MesWmMaterialStockApi.MaterialStock) => {
+          await formApi?.setValues({
+            batchCode: stock?.batchCode,
+            batchId: stock?.batchId,
+            itemId: stock?.itemId,
+            quantity: stock?.quantity,
+            quantityMax: stock?.quantity,
+          });
+        },
+        virtualFilter: 'only',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'quantityMax',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'quantity',
+      label: '入库数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入入库数量',
+        precision: 2,
+      },
+      rules: 'required',
+      dependencies: {
+        triggerFields: ['quantityMax'],
+        componentProps: (values) => ({
+          class: '!w-full',
+          controlsPosition: 'right',
+          max: values.quantityMax,
+          min: 0,
+          placeholder: '请输入入库数量',
+          precision: 2,
+        }),
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+        placeholder: '选择库存后自动带出',
+      },
+    },
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 上架明细子表的字段 */
+export function useDetailGridColumns(
+  stockable: boolean,
+): VxeTableGridOptions<MesWmProductReceiptDetailApi.ProductReceiptDetail>['columns'] {
+  return [
+    {
+      field: 'warehouseName',
+      title: '仓库名称',
+      minWidth: 100,
+    },
+    {
+      field: 'locationName',
+      title: '库区名称',
+      minWidth: 100,
+    },
+    {
+      field: 'areaName',
+      title: '库位名称',
+      minWidth: 100,
+    },
+    {
+      field: 'quantity',
+      title: '数量',
+      width: 100,
+    },
+    ...(stockable
+      ? [
+          {
+            title: '操作',
+            width: 120,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 上架明细新增/修改的表单 */
+export function useDetailFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'warehouseId',
+      label: '入库仓库',
+      component: markRaw(WmWarehouseSelect),
+      componentProps: {
+        // 切换仓库后清空库区和库位
+        onChange: async () => {
+          await formApi?.setValues({
+            areaId: undefined,
+            locationId: undefined,
+          });
+        },
+        placeholder: '请选择仓库',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'locationId',
+      label: '库区',
+      component: markRaw(WmWarehouseLocationSelect),
+      componentProps: {
+        placeholder: '请选择库区',
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['warehouseId'],
+        componentProps: (values) => ({
+          // 切换库区后清空库位
+          onChange: async () => {
+            await formApi?.setFieldValue('areaId', undefined);
+          },
+          placeholder: '请选择库区',
+          warehouseId: values.warehouseId,
+        }),
+      },
+    },
+    {
+      fieldName: 'areaId',
+      label: '库位',
+      component: markRaw(WmWarehouseAreaSelect),
+      componentProps: {
+        placeholder: '请选择库位',
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['locationId'],
+        componentProps: (values) => ({
+          locationId: values.locationId,
+          placeholder: '请选择库位',
+        }),
+      },
+    },
+    {
+      fieldName: 'quantity',
+      label: '数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入数量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/wm/productreceipt/index.vue b/apps/web-ele/src/views/mes/wm/productreceipt/index.vue
new file mode 100644
index 000000000..14b8902cc
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/productreceipt/index.vue
@@ -0,0 +1,211 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmProductReceiptApi } from '#/api/mes/wm/productreceipt';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { ElButton, ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  cancelProductReceipt,
+  deleteProductReceipt,
+  exportProductReceipt,
+  getProductReceiptPage,
+} from '#/api/mes/wm/productreceipt';
+import { $t } from '#/locales';
+import { MesWmProductReceiptStatusEnum } from '#/views/mes/utils/constants';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建产品入库单 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看产品入库单 */
+function handleDetail(row: MesWmProductReceiptApi.ProductReceipt) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑产品入库单 */
+function handleEdit(row: MesWmProductReceiptApi.ProductReceipt) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 执行上架 */
+function handleStock(row: MesWmProductReceiptApi.ProductReceipt) {
+  formModalApi.setData({ formType: 'stock', id: row.id }).open();
+}
+
+/** 执行入库 */
+function handleFinish(row: MesWmProductReceiptApi.ProductReceipt) {
+  formModalApi.setData({ formType: 'finish', id: row.id }).open();
+}
+
+/** 删除产品入库单 */
+async function handleDelete(row: MesWmProductReceiptApi.ProductReceipt) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.code]),
+  });
+  try {
+    await deleteProductReceipt(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+/** 取消产品入库单 */
+async function handleCancel(row: MesWmProductReceiptApi.ProductReceipt) {
+  await cancelProductReceipt(row.id!);
+  ElMessage.success('取消成功');
+  handleRefresh();
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportProductReceipt(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '产品入库单.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getProductReceiptPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmProductReceiptApi.ProductReceipt>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】生产入库、生产退料"
+        url="https://doc.iocoder.cn/mes/wm/produce-in/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="产品入库单列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['产品入库单']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-product-receipt:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:wm-product-receipt:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <ElButton link type="primary" @click="handleDetail(row)">
+          {{ row.code }}
+        </ElButton>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:wm-product-receipt:update'],
+              ifShow: row.status === MesWmProductReceiptStatusEnum.PREPARE,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm-product-receipt:delete'],
+              ifShow: row.status === MesWmProductReceiptStatusEnum.PREPARE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '执行上架',
+              type: 'primary',
+              link: true,
+              auth: ['mes:wm-product-receipt:update'],
+              ifShow: row.status === MesWmProductReceiptStatusEnum.APPROVING,
+              onClick: handleStock.bind(null, row),
+            },
+            {
+              label: '执行入库',
+              type: 'primary',
+              link: true,
+              auth: ['mes:wm-product-receipt:finish'],
+              ifShow: row.status === MesWmProductReceiptStatusEnum.APPROVED,
+              onClick: handleFinish.bind(null, row),
+            },
+            {
+              label: '取消',
+              type: 'danger',
+              link: true,
+              auth: ['mes:wm-product-receipt:update'],
+              ifShow:
+                row.status === MesWmProductReceiptStatusEnum.APPROVING ||
+                row.status === MesWmProductReceiptStatusEnum.APPROVED,
+              popConfirm: {
+                title: '确认取消该产品入库单？取消后不可恢复。',
+                confirm: handleCancel.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/productreceipt/modules/detail-form.vue b/apps/web-ele/src/views/mes/wm/productreceipt/modules/detail-form.vue
new file mode 100644
index 000000000..bbdaa353a
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/productreceipt/modules/detail-form.vue
@@ -0,0 +1,104 @@
+<script lang="ts" setup>
+import type { MesWmProductReceiptDetailApi } from '#/api/mes/wm/productreceipt/detail';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createProductReceiptDetail,
+  getProductReceiptDetail,
+  updateProductReceiptDetail,
+} from '#/api/mes/wm/productreceipt/detail';
+import { $t } from '#/locales';
+
+import { useDetailFormSchema } from '../data';
+
+const emit = defineEmits<{ success: [lineId: number] }>();
+const formData = ref<MesWmProductReceiptDetailApi.ProductReceiptDetail>();
+const receiptId = ref<number>(); // 所属入库单编号
+const lineId = ref<number>(); // 所属入库单行编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['上架明细'])
+    : $t('ui.actionTitle.create', ['上架明细']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 90,
+  },
+  layout: 'horizontal',
+  schema: useDetailFormSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmProductReceiptDetailApi.ProductReceiptDetail;
+    data.receiptId = receiptId.value;
+    data.lineId = lineId.value;
+    try {
+      await (formData.value?.id
+        ? updateProductReceiptDetail({ ...data, id: formData.value.id })
+        : createProductReceiptDetail(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success', lineId.value!);
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    formApi.setState({ schema: useDetailFormSchema(formApi) });
+    // 加载数据
+    const data = modalApi.getData<{
+      detailId?: number;
+      itemId?: number;
+      lineId: number;
+      receiptId: number;
+    }>();
+    receiptId.value = data.receiptId;
+    lineId.value = data.lineId;
+    if (data.detailId) {
+      modalApi.lock();
+      try {
+        formData.value = await getProductReceiptDetail(data.detailId);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    } else if (data.itemId) {
+      await formApi.setFieldValue('itemId', data.itemId);
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/productreceipt/modules/detail-list.vue b/apps/web-ele/src/views/mes/wm/productreceipt/modules/detail-list.vue
new file mode 100644
index 000000000..f80b8b42f
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/productreceipt/modules/detail-list.vue
@@ -0,0 +1,103 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmProductReceiptDetailApi } from '#/api/mes/wm/productreceipt/detail';
+
+import { computed, watch } from 'vue';
+
+import { ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { deleteProductReceiptDetail } from '#/api/mes/wm/productreceipt/detail';
+import { $t } from '#/locales';
+
+import { type FormType, useDetailGridColumns } from '../data';
+
+const props = defineProps<{
+  details: MesWmProductReceiptDetailApi.ProductReceiptDetail[];
+  formType: FormType;
+}>();
+
+const emit = defineEmits<{
+  edit: [detailId: number];
+  refresh: [];
+}>();
+
+const isStock = computed(() => props.formType === 'stock'); // 是否为上架模式
+
+/** 编辑上架明细 */
+function handleEdit(row: MesWmProductReceiptDetailApi.ProductReceiptDetail) {
+  emit('edit', row.id!);
+}
+
+/** 删除上架明细 */
+async function handleDelete(
+  row: MesWmProductReceiptDetailApi.ProductReceiptDetail,
+) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.warehouseName]),
+  });
+  try {
+    await deleteProductReceiptDetail(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.warehouseName]));
+    emit('refresh');
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    border: true,
+    columns: useDetailGridColumns(isStock.value),
+    data: props.details,
+    pagerConfig: {
+      enabled: false,
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    size: 'small',
+    toolbarConfig: {
+      enabled: false,
+    },
+  } as VxeTableGridOptions<MesWmProductReceiptDetailApi.ProductReceiptDetail>,
+});
+
+watch(
+  () => props.details,
+  (details) => gridApi.setGridOptions({ data: details }),
+);
+</script>
+
+<template>
+  <div class="px-4 py-2">
+    <Grid>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [
+                  row.warehouseName,
+                ]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/productreceipt/modules/form.vue b/apps/web-ele/src/views/mes/wm/productreceipt/modules/form.vue
new file mode 100644
index 000000000..9da8463bc
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/productreceipt/modules/form.vue
@@ -0,0 +1,238 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesWmProductReceiptApi } from '#/api/mes/wm/productreceipt';
+
+import { computed, ref } from 'vue';
+
+import { confirm, useVbenModal } from '@vben/common-ui';
+
+import { ElButton, ElDivider, ElMessage, ElPopconfirm } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  checkProductReceiptQuantity,
+  createProductReceipt,
+  finishProductReceipt,
+  getProductReceipt,
+  stockProductReceipt,
+  submitProductReceipt,
+  updateProductReceipt,
+} from '#/api/mes/wm/productreceipt';
+import { $t } from '#/locales';
+import { MesWmProductReceiptStatusEnum } from '#/views/mes/utils/constants';
+
+import { useFormSchema } from '../data';
+import LineList from './line-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesWmProductReceiptApi.ProductReceipt>();
+const originalSnapshot = ref(''); // 表单原始数据快照，用于提交时跳过未变更的保存请求
+const isEditable = computed(() => // 是否为编辑模式（可保存）
+  ['create', 'update'].includes(formType.value),
+);
+const isStock = computed(() => formType.value === 'stock'); // 是否为上架模式
+const isFinish = computed(() => formType.value === 'finish'); // 是否为执行入库模式
+const canSubmit = computed(() => // 是否可提交
+  formType.value === 'update' &&
+  formData.value?.status === MesWmProductReceiptStatusEnum.PREPARE,
+);
+const getTitle = computed(() => {
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['产品入库单']);
+  }
+  if (formType.value === 'stock') {
+    return '执行上架';
+  }
+  if (formType.value === 'finish') {
+    return '执行入库';
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['产品入库单'])
+    : $t('ui.actionTitle.create', ['产品入库单']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+/** 提交入库单：表单有修改时先保存，再调用提交接口 */
+async function handleSubmit() {
+  const { valid } = await formApi.validate();
+  if (!valid || !formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    const current = JSON.stringify(await formApi.getValues());
+    if (current !== originalSnapshot.value) {
+      const data =
+        (await formApi.getValues()) as MesWmProductReceiptApi.ProductReceipt;
+      await updateProductReceipt({ ...formData.value, ...data });
+      originalSnapshot.value = current;
+    }
+    await submitProductReceipt(formData.value.id);
+    ElMessage.success('提交成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 执行上架：明细数量与行收货数量不一致时二次确认 */
+async function handleStock() {
+  if (!formData.value?.id) {
+    return;
+  }
+  const quantityMatch = await checkProductReceiptQuantity(formData.value.id);
+  if (!quantityMatch) {
+    try {
+      await confirm('明细数量与行收货数量不一致，确认执行上架？');
+    } catch {
+      return;
+    }
+  }
+  modalApi.lock();
+  try {
+    await stockProductReceipt(formData.value.id);
+    ElMessage.success('上架成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 执行入库 */
+async function handleFinish() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await finishProductReceipt(formData.value.id);
+    ElMessage.success('入库成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (!isEditable.value) {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmProductReceiptApi.ProductReceipt;
+    try {
+      if (formData.value?.id) {
+        await updateProductReceipt({ ...formData.value, ...data });
+        formData.value = { ...formData.value, ...data };
+      } else {
+        const id = await createProductReceipt(data);
+        formData.value = {
+          ...data,
+          id,
+          status: MesWmProductReceiptStatusEnum.PREPARE,
+        };
+        await formApi.setFieldValue('id', id);
+        await formApi.setFieldValue('status', formData.value.status);
+        formType.value = 'update';
+      }
+      originalSnapshot.value = JSON.stringify(await formApi.getValues());
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      originalSnapshot.value = '';
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    formApi.setDisabled(!isEditable.value);
+    modalApi.setState({ showConfirmButton: isEditable.value });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getProductReceipt(data.id);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    }
+    originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  },
+});
+
+/** 入库前确认 */
+async function confirmFinish() {
+  try {
+    await confirm('确认执行入库？执行后将更新库存台账。');
+  } catch {
+    return;
+  }
+  await handleFinish();
+}
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+    <!-- 非新建模式展示物料信息 -->
+    <template v-if="formData?.id">
+      <ElDivider>物料信息</ElDivider>
+      <div class="mx-4">
+        <LineList :form-type="formType" :receipt-id="formData.id" />
+      </div>
+    </template>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <ElPopconfirm
+          v-if="canSubmit"
+          title="确认提交该产品入库单？【提交后将不能修改】"
+          width="260"
+          @confirm="handleSubmit"
+        >
+          <template #reference>
+            <ElButton type="primary">提交</ElButton>
+          </template>
+        </ElPopconfirm>
+        <ElButton v-if="isStock" type="primary" @click="handleStock">
+          执行上架
+        </ElButton>
+        <ElButton v-if="isFinish" type="primary" @click="confirmFinish">
+          执行入库
+        </ElButton>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/productreceipt/modules/line-form.vue b/apps/web-ele/src/views/mes/wm/productreceipt/modules/line-form.vue
new file mode 100644
index 000000000..66676b96d
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/productreceipt/modules/line-form.vue
@@ -0,0 +1,95 @@
+<script lang="ts" setup>
+import type { MesWmProductReceiptLineApi } from '#/api/mes/wm/productreceipt/line';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createProductReceiptLine,
+  getProductReceiptLine,
+  updateProductReceiptLine,
+} from '#/api/mes/wm/productreceipt/line';
+import { $t } from '#/locales';
+
+import { useLineFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesWmProductReceiptLineApi.ProductReceiptLine>();
+const receiptId = ref<number>(); // 所属入库单编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['物料入库单行'])
+    : $t('ui.actionTitle.create', ['物料入库单行']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmProductReceiptLineApi.ProductReceiptLine;
+    data.receiptId = receiptId.value;
+    try {
+      await (formData.value?.id
+        ? updateProductReceiptLine({ ...data, id: formData.value.id })
+        : createProductReceiptLine(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    formApi.setState({ schema: useLineFormSchema(formApi) });
+    // 加载数据
+    const data = modalApi.getData<{ id?: number; receiptId: number }>();
+    receiptId.value = data.receiptId;
+    if (!data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getProductReceiptLine(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/productreceipt/modules/line-list.vue b/apps/web-ele/src/views/mes/wm/productreceipt/modules/line-list.vue
new file mode 100644
index 000000000..49acca838
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/productreceipt/modules/line-list.vue
@@ -0,0 +1,251 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmProductReceiptDetailApi } from '#/api/mes/wm/productreceipt/detail';
+import type { MesWmProductReceiptLineApi } from '#/api/mes/wm/productreceipt/line';
+
+import { computed, reactive, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getProductReceiptDetailListByLineId } from '#/api/mes/wm/productreceipt/detail';
+import {
+  deleteProductReceiptLine,
+  getProductReceiptLinePage,
+} from '#/api/mes/wm/productreceipt/line';
+import { $t } from '#/locales';
+import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
+import { BarcodeDetail, PrinterLabel } from '#/views/mes/wm/barcode/components';
+
+import { type FormType, useLineGridColumns } from '../data';
+import DetailForm from './detail-form.vue';
+import DetailList from './detail-list.vue';
+import LineForm from './line-form.vue';
+
+const props = defineProps<{
+  formType: FormType;
+  receiptId: number;
+}>();
+
+const isEditable = computed(() => // 是否可编辑明细行
+  ['create', 'update'].includes(props.formType),
+);
+const isStock = computed(() => props.formType === 'stock'); // 是否为上架模式
+const detailMap = reactive<
+  Record<number, MesWmProductReceiptDetailApi.ProductReceiptDetail[]>
+>({}); // 已展开行的上架明细缓存
+const barcodeDetailRef = ref(); // 条码详情弹窗实例
+
+const [LineFormModal, lineFormModalApi] = useVbenModal({
+  connectedComponent: LineForm,
+  destroyOnClose: true,
+});
+
+const [DetailFormModal, detailFormModalApi] = useVbenModal({
+  connectedComponent: DetailForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  for (const id of Object.keys(detailMap)) {
+    delete detailMap[Number(id)];
+  }
+  gridApi.query();
+}
+
+/** 添加物料 */
+function handleCreate() {
+  lineFormModalApi.setData({ receiptId: props.receiptId }).open();
+}
+
+/** 编辑物料 */
+function handleEdit(row: MesWmProductReceiptLineApi.ProductReceiptLine) {
+  lineFormModalApi.setData({ id: row.id, receiptId: props.receiptId }).open();
+}
+
+/** 删除物料 */
+async function handleDelete(
+  row: MesWmProductReceiptLineApi.ProductReceiptLine,
+) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.itemName]),
+  });
+  try {
+    await deleteProductReceiptLine(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.itemName]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+/** 上架：直接打开明细创建表单 */
+function handleStock(row: MesWmProductReceiptLineApi.ProductReceiptLine) {
+  openDetailForm(row.id!, row.itemId);
+}
+
+/** 查看物料条码 */
+function handleBarcode(row: MesWmProductReceiptLineApi.ProductReceiptLine) {
+  barcodeDetailRef.value?.openByBusiness(
+    row.itemId,
+    BarcodeBizTypeEnum.ITEM,
+    row.itemCode,
+    row.itemName,
+  );
+}
+
+/** 打开上架明细表单 */
+function openDetailForm(lineId: number, itemId?: number, detailId?: number) {
+  detailFormModalApi
+    .setData({ detailId, itemId, lineId, receiptId: props.receiptId })
+    .open();
+}
+
+/** 获取已展开行的上架明细 */
+function getExpandedDetails(row: MesWmProductReceiptLineApi.ProductReceiptLine) {
+  return detailMap[row.id!] || [];
+}
+
+/** 加载指定行的上架明细 */
+async function loadLineDetails(lineId: number) {
+  detailMap[lineId] = await getProductReceiptDetailListByLineId(lineId);
+}
+
+/** 展开行时懒加载上架明细 */
+async function handleExpandChange(
+  row: MesWmProductReceiptLineApi.ProductReceiptLine,
+  expanded: boolean,
+) {
+  if (!expanded) {
+    return;
+  }
+  await loadLineDetails(row.id!);
+}
+
+/** 明细表单提交成功后，刷新对应行已展开的明细 */
+async function handleDetailSuccess(lineId: number) {
+  await loadLineDetails(lineId);
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useLineGridColumns(isEditable.value, isStock.value),
+    expandConfig: {
+      padding: true,
+    },
+    height: 400,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.receiptId) {
+            return { list: [], total: 0 };
+          }
+          return await getProductReceiptLinePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            receiptId: props.receiptId,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesWmProductReceiptLineApi.ProductReceiptLine>,
+  gridEvents: {
+    toggleRowExpand: ({
+      expanded,
+      row,
+    }: {
+      expanded: boolean;
+      row: MesWmProductReceiptLineApi.ProductReceiptLine;
+    }) => {
+      handleExpandChange(row, expanded);
+    },
+  },
+});
+</script>
+
+<template>
+  <div>
+    <LineFormModal @success="handleRefresh" />
+    <DetailFormModal @success="handleDetailSuccess" />
+    <Grid table-title="物料信息">
+      <template v-if="isEditable" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '添加物料',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #detail="{ row }">
+        <DetailList
+          :details="getExpandedDetails(row)"
+          :form-type="formType"
+          @edit="(detailId) => openDetailForm(row.id!, row.itemId, detailId)"
+          @refresh="loadLineDetails(row.id!)"
+        />
+      </template>
+      <template #actions="{ row }">
+        <div class="flex items-center justify-center">
+          <TableAction
+            :actions="[
+              {
+                label: $t('common.edit'),
+                type: 'primary',
+                link: true,
+                icon: ACTION_ICON.EDIT,
+                ifShow: isEditable,
+                onClick: handleEdit.bind(null, row),
+              },
+              {
+                label: $t('common.delete'),
+                type: 'danger',
+                link: true,
+                icon: ACTION_ICON.DELETE,
+                ifShow: isEditable,
+                popConfirm: {
+                  title: $t('ui.actionMessage.deleteConfirm', [row.itemName]),
+                  confirm: handleDelete.bind(null, row),
+                },
+              },
+              {
+                label: '上架',
+                type: 'primary',
+                link: true,
+                ifShow: isStock,
+                onClick: handleStock.bind(null, row),
+              },
+              {
+                label: '条码',
+                type: 'primary',
+                link: true,
+                onClick: handleBarcode.bind(null, row),
+              },
+            ]"
+          />
+          <PrinterLabel
+            v-if="isStock"
+            :biz-code="row.batchCode"
+            :biz-id="row.batchId"
+            biz-type="BATCH"
+          />
+        </div>
+      </template>
+    </Grid>
+    <BarcodeDetail ref="barcodeDetailRef" />
+  </div>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/productsales/data.ts b/apps/web-ele/src/views/mes/wm/productsales/data.ts
new file mode 100644
index 000000000..eeee968b1
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/productsales/data.ts
@@ -0,0 +1,689 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmMaterialStockApi } from '#/api/mes/wm/materialstock';
+import type { MesWmProductSalesApi } from '#/api/mes/wm/productsales';
+import type { MesWmProductSalesDetailApi } from '#/api/mes/wm/productsales/detail';
+import type { MesWmProductSalesLineApi } from '#/api/mes/wm/productsales/line';
+import type { MesWmSalesNoticeApi } from '#/api/mes/wm/salesnotice';
+import type { MesWmSalesNoticeLineApi } from '#/api/mes/wm/salesnotice/line';
+
+import { h, markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { ElButton } from 'element-plus';
+
+import { z } from '#/adapter/form';
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getRangePickerDefaultProps } from '#/utils';
+import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import {
+  MesAutoCodeRuleCode,
+  MesWmSalesNoticeStatusEnum,
+} from '#/views/mes/utils/constants';
+import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
+import {
+  WmSalesNoticeLineSelect,
+  WmSalesNoticeSelect,
+} from '#/views/mes/wm/salesnotice/components';
+import {
+  WmWarehouseAreaSelect,
+  WmWarehouseLocationSelect,
+  WmWarehouseSelect,
+} from '#/views/mes/wm/warehouse/components';
+
+/** 表单类型 */
+export type FormType =
+  | 'create'
+  | 'detail'
+  | 'finish'
+  | 'shipping'
+  | 'stock'
+  | 'update';
+
+/** 表单头部是否只读（拣货、填写运单、出库、详情态） */
+function isHeaderReadonly(formType: FormType): boolean {
+  return (
+    formType === 'detail' ||
+    formType === 'finish' ||
+    formType === 'shipping' ||
+    formType === 'stock'
+  );
+}
+
+/** 是否展示运输信息 */
+export function showShippingInfo(formType: FormType): boolean {
+  return (
+    formType === 'shipping' || formType === 'detail' || formType === 'finish'
+  );
+}
+
+/** 新增/修改的表单 */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'status',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '出库单编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入出库单编号',
+      },
+      rules: 'required',
+      suffix: isHeaderReadonly(formType)
+        ? undefined
+        : () =>
+            h(
+              ElButton,
+              {
+                onClick: async () => {
+                  const code = await generateAutoCode(
+                    MesAutoCodeRuleCode.WM_PRODUCT_SALES_CODE,
+                  );
+                  await formApi?.setFieldValue('code', code);
+                },
+              },
+              { default: () => '生成' },
+            ),
+    },
+    {
+      fieldName: 'name',
+      label: '出库单名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入出库单名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'noticeId',
+      label: '发货通知单',
+      component: markRaw(WmSalesNoticeSelect),
+      componentProps: {
+        // 选择发货通知单后，自动回填销售订单号、客户、收货人信息
+        onChange: async (notice?: MesWmSalesNoticeApi.SalesNotice) => {
+          await formApi?.setValues({
+            clientId: notice?.clientId,
+            contactAddress: notice?.recipientAddress,
+            contactName: notice?.recipientName,
+            contactTelephone: notice?.recipientTelephone,
+            salesOrderCode: notice?.salesOrderCode,
+          });
+        },
+        status: MesWmSalesNoticeStatusEnum.APPROVED,
+      },
+    },
+    {
+      fieldName: 'salesOrderCode',
+      label: '销售订单编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入销售订单编号',
+      },
+    },
+    {
+      fieldName: 'salesDate',
+      label: '出库日期',
+      component: 'DatePicker',
+      componentProps: {
+        class: '!w-full',
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择出库日期',
+        type: 'date',
+        valueFormat: 'x',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'clientId',
+      label: '客户',
+      component: markRaw(MdClientSelect),
+      componentProps: {
+        placeholder: '请选择客户',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'contactName',
+      label: '收货人',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入收货人',
+      },
+    },
+    {
+      fieldName: 'contactTelephone',
+      label: '联系方式',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入联系方式',
+      },
+    },
+    {
+      fieldName: 'contactAddress',
+      label: '收货地址',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入收货地址',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+    {
+      fieldName: 'carrier',
+      label: '承运商',
+      component: 'Input',
+      componentProps: {
+        disabled: formType !== 'shipping',
+        placeholder: '请输入承运商',
+      },
+      dependencies: {
+        triggerFields: [''],
+        if: () => showShippingInfo(formType),
+      },
+    },
+    {
+      fieldName: 'shippingNumber',
+      label: '运输单号',
+      component: 'Input',
+      componentProps: {
+        disabled: formType !== 'shipping',
+        placeholder: '请输入运输单号',
+      },
+      dependencies: {
+        triggerFields: [''],
+        if: () => showShippingInfo(formType),
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '出库单编号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入出库单编号',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '出库单名称',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入出库单名称',
+      },
+    },
+    {
+      fieldName: 'salesOrderCode',
+      label: '销售订单编号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入销售订单编号',
+      },
+    },
+    {
+      fieldName: 'clientId',
+      label: '客户',
+      component: markRaw(MdClientSelect),
+      componentProps: {
+        placeholder: '请选择客户',
+      },
+    },
+    {
+      fieldName: 'salesDate',
+      label: '出库日期',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+        clearable: true,
+      },
+    },
+    {
+      fieldName: 'status',
+      label: '单据状态',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_WM_PRODUCT_SALES_STATUS, 'number'),
+        placeholder: '请选择单据状态',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesWmProductSalesApi.ProductSales>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '出库单编号',
+      minWidth: 160,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '出库单名称',
+      minWidth: 150,
+    },
+    {
+      field: 'noticeCode',
+      title: '发货通知单号',
+      minWidth: 160,
+    },
+    {
+      field: 'salesOrderCode',
+      title: '销售订单编号',
+      minWidth: 160,
+    },
+    {
+      field: 'clientCode',
+      title: '客户编码',
+      minWidth: 120,
+    },
+    {
+      field: 'clientName',
+      title: '客户名称',
+      minWidth: 120,
+    },
+    {
+      field: 'contactName',
+      title: '收货人',
+      minWidth: 100,
+    },
+    {
+      field: 'carrier',
+      title: '承运商',
+      minWidth: 120,
+    },
+    {
+      field: 'shippingNumber',
+      title: '运输单号',
+      minWidth: 160,
+    },
+    {
+      field: 'salesDate',
+      title: '出库日期',
+      width: 180,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      minWidth: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_PRODUCT_SALES_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 240,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 出库单行子表的字段 */
+export function useLineGridColumns(
+  editable: boolean,
+  stockable: boolean,
+): VxeTableGridOptions<MesWmProductSalesLineApi.ProductSalesLine>['columns'] {
+  return [
+    {
+      type: 'expand',
+      width: 48,
+      slots: { content: 'detail' },
+    },
+    {
+      field: 'itemCode',
+      title: '产品编码',
+      minWidth: 120,
+    },
+    {
+      field: 'itemName',
+      title: '产品名称',
+      minWidth: 140,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'quantity',
+      title: '出库数量',
+      width: 100,
+    },
+    {
+      field: 'batchCode',
+      title: '批次号',
+      minWidth: 120,
+    },
+    {
+      field: 'oqcCheckFlag',
+      title: '是否校验',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+      },
+    },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 150,
+    },
+    ...(editable || stockable
+      ? [
+          {
+            title: '操作',
+            width: 160,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 出库单行新增/修改的表单 */
+export function useLineFormSchema(
+  hasNotice: boolean,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'noticeId',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'noticeLineId',
+      label: '发货通知单行',
+      component: markRaw(WmSalesNoticeLineSelect),
+      componentProps: {
+        // 选择发货通知单行后，自动回填物料、数量、批次、是否检验
+        onChange: async (line?: MesWmSalesNoticeLineApi.SalesNoticeLine) => {
+          await formApi?.setValues({
+            batchCode: line?.batchCode,
+            itemId: line?.itemId,
+            oqcCheckFlag: line?.oqcCheckFlag ?? false,
+            quantity: line?.quantity,
+          });
+        },
+      },
+      dependencies: {
+        triggerFields: ['noticeId'],
+        if: () => hasNotice,
+        componentProps: (values) => ({
+          noticeId: values.noticeId,
+        }),
+      },
+    },
+    {
+      fieldName: 'itemId',
+      label: '产品',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择产品',
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['noticeLineId'],
+        componentProps: (values) => ({
+          disabled: !!values.noticeLineId,
+          placeholder: '请选择产品',
+        }),
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入批次号',
+      },
+    },
+    {
+      fieldName: 'quantity',
+      label: '出库数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入出库数量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'oqcCheckFlag',
+      label: '是否校验',
+      component: 'RadioGroup',
+      componentProps: {
+        options: getDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING, 'boolean'),
+      },
+      rules: z.boolean().default(false),
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 拣货明细子表的字段 */
+export function useDetailGridColumns(
+  stockable: boolean,
+): VxeTableGridOptions<MesWmProductSalesDetailApi.ProductSalesDetail>['columns'] {
+  return [
+    {
+      field: 'warehouseName',
+      title: '仓库名称',
+      minWidth: 100,
+    },
+    {
+      field: 'locationName',
+      title: '库区名称',
+      minWidth: 100,
+    },
+    {
+      field: 'areaName',
+      title: '库位名称',
+      minWidth: 100,
+    },
+    {
+      field: 'quantity',
+      title: '数量',
+      width: 100,
+    },
+    ...(stockable
+      ? [
+          {
+            title: '操作',
+            width: 120,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 拣货明细新增/修改的表单 */
+export function useDetailFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'quantityMax',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'batchId',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'materialStockId',
+      label: '选择库存',
+      component: markRaw(WmMaterialStockSelect),
+      componentProps: {
+        // 选择库存记录后，自动回填仓库/库区/库位/批次/数量
+        onChange: async (stock?: MesWmMaterialStockApi.MaterialStock) => {
+          await formApi?.setValues({
+            areaId: stock?.areaId,
+            batchCode: stock?.batchCode,
+            batchId: stock?.batchId,
+            locationId: stock?.locationId,
+            quantity: stock?.quantity,
+            quantityMax: stock?.quantity,
+            warehouseId: stock?.warehouseId,
+          });
+        },
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['itemId', 'batchId'],
+        componentProps: (values) => ({
+          batchId: values.batchId,
+          itemId: values.itemId,
+        }),
+      },
+    },
+    {
+      fieldName: 'quantity',
+      label: '数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入数量',
+        precision: 2,
+      },
+      rules: 'required',
+      dependencies: {
+        triggerFields: ['quantityMax'],
+        componentProps: (values) => ({
+          class: '!w-full',
+          controlsPosition: 'right',
+          max: values.quantityMax,
+          min: 0,
+          placeholder: '请输入数量',
+          precision: 2,
+        }),
+      },
+    },
+    {
+      fieldName: 'warehouseId',
+      label: '出库仓库',
+      component: markRaw(WmWarehouseSelect),
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'locationId',
+      label: '库区',
+      component: markRaw(WmWarehouseLocationSelect),
+      componentProps: {
+        disabled: true,
+      },
+      dependencies: {
+        triggerFields: ['warehouseId'],
+        componentProps: (values) => ({
+          disabled: true,
+          warehouseId: values.warehouseId,
+        }),
+      },
+    },
+    {
+      fieldName: 'areaId',
+      label: '库位',
+      component: markRaw(WmWarehouseAreaSelect),
+      componentProps: {
+        disabled: true,
+      },
+      dependencies: {
+        triggerFields: ['locationId'],
+        componentProps: (values) => ({
+          disabled: true,
+          locationId: values.locationId,
+        }),
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+      },
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/wm/productsales/index.vue b/apps/web-ele/src/views/mes/wm/productsales/index.vue
new file mode 100644
index 000000000..fef659867
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/productsales/index.vue
@@ -0,0 +1,226 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmProductSalesApi } from '#/api/mes/wm/productsales';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { ElButton, ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  cancelProductSales,
+  deleteProductSales,
+  exportProductSales,
+  getProductSalesPage,
+} from '#/api/mes/wm/productsales';
+import { $t } from '#/locales';
+import { MesWmProductSalesStatusEnum } from '#/views/mes/utils/constants';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建销售出库单 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看销售出库单 */
+function handleDetail(row: MesWmProductSalesApi.ProductSales) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑销售出库单 */
+function handleEdit(row: MesWmProductSalesApi.ProductSales) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 执行拣货 */
+function handleStock(row: MesWmProductSalesApi.ProductSales) {
+  formModalApi.setData({ formType: 'stock', id: row.id }).open();
+}
+
+/** 填写运单 */
+function handleShipping(row: MesWmProductSalesApi.ProductSales) {
+  formModalApi.setData({ formType: 'shipping', id: row.id }).open();
+}
+
+/** 执行出库 */
+function handleFinish(row: MesWmProductSalesApi.ProductSales) {
+  formModalApi.setData({ formType: 'finish', id: row.id }).open();
+}
+
+/** 删除销售出库单 */
+async function handleDelete(row: MesWmProductSalesApi.ProductSales) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.code]),
+  });
+  try {
+    await deleteProductSales(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+/** 取消销售出库单 */
+async function handleCancel(row: MesWmProductSalesApi.ProductSales) {
+  await cancelProductSales(row.id!);
+  ElMessage.success('取消成功');
+  handleRefresh();
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportProductSales(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '销售出库单.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getProductSalesPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmProductSalesApi.ProductSales>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】发货通知、销售出库、销售退货"
+        url="https://doc.iocoder.cn/mes/wm/sales-out/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="销售出库单列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['销售出库单']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-product-sales:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:wm-product-sales:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <ElButton link type="primary" @click="handleDetail(row)">
+          {{ row.code }}
+        </ElButton>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:wm-product-sales:update'],
+              ifShow: row.status === MesWmProductSalesStatusEnum.PREPARE,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm-product-sales:delete'],
+              ifShow: row.status === MesWmProductSalesStatusEnum.PREPARE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '拣货',
+              type: 'primary',
+              link: true,
+              auth: ['mes:wm-product-sales:stock'],
+              ifShow: row.status === MesWmProductSalesStatusEnum.APPROVING,
+              onClick: handleStock.bind(null, row),
+            },
+            {
+              label: '填写运单',
+              type: 'primary',
+              link: true,
+              auth: ['mes:wm-product-sales:shipping'],
+              ifShow: row.status === MesWmProductSalesStatusEnum.SHIPPING,
+              onClick: handleShipping.bind(null, row),
+            },
+            {
+              label: '执行出库',
+              type: 'primary',
+              link: true,
+              auth: ['mes:wm-product-sales:finish'],
+              ifShow: row.status === MesWmProductSalesStatusEnum.APPROVED,
+              onClick: handleFinish.bind(null, row),
+            },
+            {
+              label: '取消',
+              type: 'danger',
+              link: true,
+              auth: ['mes:wm-product-sales:cancel'],
+              ifShow:
+                row.status === MesWmProductSalesStatusEnum.CONFIRMED ||
+                row.status === MesWmProductSalesStatusEnum.APPROVING ||
+                row.status === MesWmProductSalesStatusEnum.SHIPPING ||
+                row.status === MesWmProductSalesStatusEnum.APPROVED,
+              popConfirm: {
+                title: '确认取消该销售出库单？取消后不可恢复。',
+                confirm: handleCancel.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/productsales/modules/detail-form.vue b/apps/web-ele/src/views/mes/wm/productsales/modules/detail-form.vue
new file mode 100644
index 000000000..0451936dd
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/productsales/modules/detail-form.vue
@@ -0,0 +1,110 @@
+<script lang="ts" setup>
+import type { MesWmProductSalesDetailApi } from '#/api/mes/wm/productsales/detail';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createProductSalesDetail,
+  getProductSalesDetail,
+  updateProductSalesDetail,
+} from '#/api/mes/wm/productsales/detail';
+import { $t } from '#/locales';
+
+import { useDetailFormSchema } from '../data';
+
+const emit = defineEmits<{ success: [lineId: number] }>();
+const formData = ref<MesWmProductSalesDetailApi.ProductSalesDetail>();
+const salesId = ref<number>(); // 所属出库单编号
+const lineId = ref<number>(); // 所属出库单行编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['拣货明细'])
+    : $t('ui.actionTitle.create', ['拣货明细']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 90,
+  },
+  layout: 'horizontal',
+  schema: useDetailFormSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmProductSalesDetailApi.ProductSalesDetail;
+    data.salesId = salesId.value;
+    data.lineId = lineId.value;
+    try {
+      await (formData.value?.id
+        ? updateProductSalesDetail({ ...data, id: formData.value.id })
+        : createProductSalesDetail(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success', lineId.value!);
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    formApi.setState({ schema: useDetailFormSchema(formApi) });
+    // 加载数据
+    const data = modalApi.getData<{
+      batchId?: number;
+      detailId?: number;
+      itemId?: number;
+      lineId: number;
+      salesId: number;
+    }>();
+    salesId.value = data.salesId;
+    lineId.value = data.lineId;
+    if (data.detailId) {
+      modalApi.lock();
+      try {
+        formData.value = await getProductSalesDetail(data.detailId);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    } else {
+      if (data.itemId) {
+        await formApi.setFieldValue('itemId', data.itemId);
+      }
+      if (data.batchId) {
+        await formApi.setFieldValue('batchId', data.batchId);
+      }
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/productsales/modules/detail-list.vue b/apps/web-ele/src/views/mes/wm/productsales/modules/detail-list.vue
new file mode 100644
index 000000000..4efd48aca
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/productsales/modules/detail-list.vue
@@ -0,0 +1,103 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmProductSalesDetailApi } from '#/api/mes/wm/productsales/detail';
+
+import { computed, watch } from 'vue';
+
+import { ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { deleteProductSalesDetail } from '#/api/mes/wm/productsales/detail';
+import { $t } from '#/locales';
+
+import { type FormType, useDetailGridColumns } from '../data';
+
+const props = defineProps<{
+  details: MesWmProductSalesDetailApi.ProductSalesDetail[];
+  formType: FormType;
+}>();
+
+const emit = defineEmits<{
+  edit: [detailId: number];
+  refresh: [];
+}>();
+
+const isStock = computed(() => props.formType === 'stock'); // 是否为拣货模式
+
+/** 编辑拣货明细 */
+function handleEdit(row: MesWmProductSalesDetailApi.ProductSalesDetail) {
+  emit('edit', row.id!);
+}
+
+/** 删除拣货明细 */
+async function handleDelete(
+  row: MesWmProductSalesDetailApi.ProductSalesDetail,
+) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.warehouseName]),
+  });
+  try {
+    await deleteProductSalesDetail(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.warehouseName]));
+    emit('refresh');
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    border: true,
+    columns: useDetailGridColumns(isStock.value),
+    data: props.details,
+    pagerConfig: {
+      enabled: false,
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    size: 'small',
+    toolbarConfig: {
+      enabled: false,
+    },
+  } as VxeTableGridOptions<MesWmProductSalesDetailApi.ProductSalesDetail>,
+});
+
+watch(
+  () => props.details,
+  (details) => gridApi.setGridOptions({ data: details }),
+);
+</script>
+
+<template>
+  <div class="px-4 py-2">
+    <Grid>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [
+                  row.warehouseName,
+                ]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/productsales/modules/form.vue b/apps/web-ele/src/views/mes/wm/productsales/modules/form.vue
new file mode 100644
index 000000000..d92ea8336
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/productsales/modules/form.vue
@@ -0,0 +1,275 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesWmProductSalesApi } from '#/api/mes/wm/productsales';
+
+import { computed, ref } from 'vue';
+
+import { confirm, useVbenModal } from '@vben/common-ui';
+
+import { ElButton, ElDivider, ElMessage, ElPopconfirm } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  checkProductSalesQuantity,
+  createProductSales,
+  finishProductSales,
+  getProductSales,
+  shippingProductSales,
+  stockProductSales,
+  submitProductSales,
+  updateProductSales,
+} from '#/api/mes/wm/productsales';
+import { $t } from '#/locales';
+import { MesWmProductSalesStatusEnum } from '#/views/mes/utils/constants';
+
+import { useFormSchema } from '../data';
+import LineList from './line-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesWmProductSalesApi.ProductSales>();
+const originalSnapshot = ref(''); // 表单原始数据快照，用于提交时跳过未变更的保存请求
+const isEditable = computed(() => // 是否为编辑模式（可保存）
+  ['create', 'update'].includes(formType.value),
+);
+const isStock = computed(() => formType.value === 'stock'); // 是否为拣货模式
+const isShipping = computed(() => formType.value === 'shipping'); // 是否为填写运单模式
+const isFinish = computed(() => formType.value === 'finish'); // 是否为执行出库模式
+const canSubmit = computed(() => // 是否可提交
+  formType.value === 'update' &&
+  formData.value?.status === MesWmProductSalesStatusEnum.PREPARE,
+);
+const getTitle = computed(() => {
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['销售出库单']);
+  }
+  if (formType.value === 'stock') {
+    return '执行拣货';
+  }
+  if (formType.value === 'shipping') {
+    return '填写运单';
+  }
+  if (formType.value === 'finish') {
+    return '执行出库';
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['销售出库单'])
+    : $t('ui.actionTitle.create', ['销售出库单']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+/** 提交出库单：表单有修改时先保存，再调用提交接口 */
+async function handleSubmit() {
+  const { valid } = await formApi.validate();
+  if (!valid || !formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    const current = JSON.stringify(await formApi.getValues());
+    if (current !== originalSnapshot.value) {
+      const data =
+        (await formApi.getValues()) as MesWmProductSalesApi.ProductSales;
+      await updateProductSales({ ...formData.value, ...data });
+      originalSnapshot.value = current;
+    }
+    await submitProductSales(formData.value.id);
+    ElMessage.success('提交成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 执行拣货：出库数量与拣货数量不一致时二次确认 */
+async function handleStock() {
+  if (!formData.value?.id) {
+    return;
+  }
+  const quantityMatch = await checkProductSalesQuantity(formData.value.id);
+  if (!quantityMatch) {
+    try {
+      await confirm('出库数量与拣货数量不一致，确认执行拣货？');
+    } catch {
+      return;
+    }
+  }
+  modalApi.lock();
+  try {
+    await stockProductSales(formData.value.id);
+    ElMessage.success('拣货成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 填写运单 */
+async function handleShipping() {
+  if (!formData.value?.id) {
+    return;
+  }
+  const values = (await formApi.getValues()) as MesWmProductSalesApi.ProductSales;
+  modalApi.lock();
+  try {
+    await shippingProductSales({
+      carrier: values.carrier,
+      id: formData.value.id,
+      shippingNumber: values.shippingNumber,
+    });
+    ElMessage.success('运单信息填写成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 执行出库 */
+async function handleFinish() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await finishProductSales(formData.value.id);
+    ElMessage.success('出库成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (!isEditable.value) {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmProductSalesApi.ProductSales;
+    try {
+      if (formData.value?.id) {
+        await updateProductSales({ ...formData.value, ...data });
+        formData.value = { ...formData.value, ...data };
+      } else {
+        const id = await createProductSales(data);
+        formData.value = {
+          ...data,
+          id,
+          status: MesWmProductSalesStatusEnum.PREPARE,
+        };
+        await formApi.setFieldValue('id', id);
+        await formApi.setFieldValue('status', formData.value.status);
+        formType.value = 'update';
+      }
+      originalSnapshot.value = JSON.stringify(await formApi.getValues());
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      originalSnapshot.value = '';
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    formApi.setDisabled(!isEditable.value && !isShipping.value);
+    modalApi.setState({ showConfirmButton: isEditable.value });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getProductSales(data.id);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    }
+    originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+    <!-- 非新建模式展示物料信息 -->
+    <template v-if="formData?.id">
+      <ElDivider>物料信息</ElDivider>
+      <div class="mx-4">
+        <LineList
+          :form-type="formType"
+          :notice-id="formData.noticeId"
+          :sales-id="formData.id"
+        />
+      </div>
+    </template>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <ElPopconfirm
+          v-if="canSubmit"
+          title="确认提交该销售出库单？【提交后将不能修改】"
+          width="260"
+          @confirm="handleSubmit"
+        >
+          <template #reference>
+            <ElButton type="primary">提交</ElButton>
+          </template>
+        </ElPopconfirm>
+        <ElButton v-if="isStock" type="primary" @click="handleStock">
+          执行拣货
+        </ElButton>
+        <ElPopconfirm
+          v-if="isShipping"
+          title="确认提交运单信息？"
+          width="260"
+          @confirm="handleShipping"
+        >
+          <template #reference>
+            <ElButton type="primary">确认填写</ElButton>
+          </template>
+        </ElPopconfirm>
+        <ElPopconfirm
+          v-if="isFinish"
+          title="确认执行出库？执行后将扣减库存。"
+          width="260"
+          @confirm="handleFinish"
+        >
+          <template #reference>
+            <ElButton type="primary">确认出库</ElButton>
+          </template>
+        </ElPopconfirm>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/productsales/modules/line-form.vue b/apps/web-ele/src/views/mes/wm/productsales/modules/line-form.vue
new file mode 100644
index 000000000..44d1a7ec9
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/productsales/modules/line-form.vue
@@ -0,0 +1,104 @@
+<script lang="ts" setup>
+import type { MesWmProductSalesLineApi } from '#/api/mes/wm/productsales/line';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createProductSalesLine,
+  getProductSalesLine,
+  updateProductSalesLine,
+} from '#/api/mes/wm/productsales/line';
+import { $t } from '#/locales';
+
+import { useLineFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesWmProductSalesLineApi.ProductSalesLine>();
+const salesId = ref<number>(); // 所属出库单编号
+const noticeId = ref<number>(); // 所属发货通知单编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['销售出库单行'])
+    : $t('ui.actionTitle.create', ['销售出库单行']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmProductSalesLineApi.ProductSalesLine;
+    data.salesId = salesId.value;
+    try {
+      await (formData.value?.id
+        ? updateProductSalesLine({ ...data, id: formData.value.id })
+        : createProductSalesLine(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{
+      id?: number;
+      noticeId?: number;
+      salesId: number;
+    }>();
+    salesId.value = data.salesId;
+    noticeId.value = data.noticeId;
+    formApi.setState({ schema: useLineFormSchema(!!data.noticeId, formApi) });
+    if (data.noticeId) {
+      await formApi.setFieldValue('noticeId', data.noticeId);
+    }
+    if (!data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getProductSalesLine(data.id);
+      // 设置到 values
+      await formApi.setValues({ ...formData.value, noticeId: noticeId.value });
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/productsales/modules/line-list.vue b/apps/web-ele/src/views/mes/wm/productsales/modules/line-list.vue
new file mode 100644
index 000000000..339d1f24f
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/productsales/modules/line-list.vue
@@ -0,0 +1,234 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmProductSalesDetailApi } from '#/api/mes/wm/productsales/detail';
+import type { MesWmProductSalesLineApi } from '#/api/mes/wm/productsales/line';
+
+import { computed, reactive } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getProductSalesDetailListByLineId } from '#/api/mes/wm/productsales/detail';
+import {
+  deleteProductSalesLine,
+  getProductSalesLinePage,
+} from '#/api/mes/wm/productsales/line';
+import { $t } from '#/locales';
+
+import { type FormType, useLineGridColumns } from '../data';
+import DetailForm from './detail-form.vue';
+import DetailList from './detail-list.vue';
+import LineForm from './line-form.vue';
+
+const props = defineProps<{
+  formType: FormType;
+  noticeId?: number;
+  salesId: number;
+}>();
+
+const isEditable = computed(() => // 是否可编辑明细行
+  ['create', 'update'].includes(props.formType),
+);
+const isStock = computed(() => props.formType === 'stock'); // 是否为拣货模式
+const detailMap = reactive<
+  Record<number, MesWmProductSalesDetailApi.ProductSalesDetail[]>
+>({}); // 已展开行的拣货明细缓存
+
+const [LineFormModal, lineFormModalApi] = useVbenModal({
+  connectedComponent: LineForm,
+  destroyOnClose: true,
+});
+
+const [DetailFormModal, detailFormModalApi] = useVbenModal({
+  connectedComponent: DetailForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  for (const id of Object.keys(detailMap)) {
+    delete detailMap[Number(id)];
+  }
+  gridApi.query();
+}
+
+/** 添加物料 */
+function handleCreate() {
+  lineFormModalApi
+    .setData({ noticeId: props.noticeId, salesId: props.salesId })
+    .open();
+}
+
+/** 编辑物料 */
+function handleEdit(row: MesWmProductSalesLineApi.ProductSalesLine) {
+  lineFormModalApi
+    .setData({ id: row.id, noticeId: props.noticeId, salesId: props.salesId })
+    .open();
+}
+
+/** 删除物料 */
+async function handleDelete(row: MesWmProductSalesLineApi.ProductSalesLine) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.itemName]),
+  });
+  try {
+    await deleteProductSalesLine(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.itemName]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+/** 拣货：直接打开明细创建表单 */
+function handlePicking(row: MesWmProductSalesLineApi.ProductSalesLine) {
+  openDetailForm(row.id!, row.itemId, row.batchId);
+}
+
+/** 打开拣货明细表单 */
+function openDetailForm(
+  lineId: number,
+  itemId?: number,
+  batchId?: number,
+  detailId?: number,
+) {
+  detailFormModalApi
+    .setData({ batchId, detailId, itemId, lineId, salesId: props.salesId })
+    .open();
+}
+
+/** 获取已展开行的拣货明细 */
+function getExpandedDetails(row: MesWmProductSalesLineApi.ProductSalesLine) {
+  return detailMap[row.id!] || [];
+}
+
+/** 加载指定行的拣货明细 */
+async function loadLineDetails(lineId: number) {
+  detailMap[lineId] = await getProductSalesDetailListByLineId(lineId);
+}
+
+/** 展开行时懒加载拣货明细 */
+async function handleExpandChange(
+  row: MesWmProductSalesLineApi.ProductSalesLine,
+  expanded: boolean,
+) {
+  if (!expanded) {
+    return;
+  }
+  await loadLineDetails(row.id!);
+}
+
+/** 明细表单提交成功后，刷新对应行已展开的明细 */
+async function handleDetailSuccess(lineId: number) {
+  await loadLineDetails(lineId);
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useLineGridColumns(isEditable.value, isStock.value),
+    expandConfig: {
+      padding: true,
+    },
+    height: 400,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.salesId) {
+            return { list: [], total: 0 };
+          }
+          return await getProductSalesLinePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            salesId: props.salesId,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesWmProductSalesLineApi.ProductSalesLine>,
+  gridEvents: {
+    toggleRowExpand: ({
+      expanded,
+      row,
+    }: {
+      expanded: boolean;
+      row: MesWmProductSalesLineApi.ProductSalesLine;
+    }) => {
+      handleExpandChange(row, expanded);
+    },
+  },
+});
+</script>
+
+<template>
+  <div>
+    <LineFormModal @success="handleRefresh" />
+    <DetailFormModal @success="handleDetailSuccess" />
+    <Grid table-title="物料信息">
+      <template v-if="isEditable" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '添加物料',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #detail="{ row }">
+        <DetailList
+          :details="getExpandedDetails(row)"
+          :form-type="formType"
+          @edit="
+            (detailId) =>
+              openDetailForm(row.id!, row.itemId, row.batchId, detailId)
+          "
+          @refresh="loadLineDetails(row.id!)"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              ifShow: isEditable,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              ifShow: isEditable,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.itemName]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '拣货',
+              type: 'primary',
+              link: true,
+              ifShow: isStock,
+              onClick: handlePicking.bind(null, row),
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/salesnotice/components/index.ts b/apps/web-ele/src/views/mes/wm/salesnotice/components/index.ts
new file mode 100644
index 000000000..0d5910b0e
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/salesnotice/components/index.ts
@@ -0,0 +1,2 @@
+export { default as WmSalesNoticeLineSelect } from './wm-sales-notice-line-select.vue';
+export { default as WmSalesNoticeSelect } from './wm-sales-notice-select.vue';
diff --git a/apps/web-ele/src/views/mes/wm/salesnotice/components/wm-sales-notice-line-select-dialog.vue b/apps/web-ele/src/views/mes/wm/salesnotice/components/wm-sales-notice-line-select-dialog.vue
new file mode 100644
index 000000000..e10f08af2
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/salesnotice/components/wm-sales-notice-line-select-dialog.vue
@@ -0,0 +1,201 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmSalesNoticeLineApi } from '#/api/mes/wm/salesnotice/line';
+
+import { nextTick, ref } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+
+import { ElButton, ElDialog, ElMessage } from 'element-plus';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getSalesNoticeLinePage } from '#/api/mes/wm/salesnotice/line';
+
+const emit = defineEmits<{
+  selected: [rows: MesWmSalesNoticeLineApi.SalesNoticeLine[]];
+}>();
+
+const open = ref(false); // 弹窗是否打开
+const noticeId = ref<number>(); // 所属通知单编号
+const syncingSingleSelection = ref(false); // 是否同步单选勾选状态
+const selectedRows = ref<MesWmSalesNoticeLineApi.SalesNoticeLine[]>([]); // 已选行列表
+const preSelectedIds = ref<number[]>([]); // 预选行编号列表
+
+/** 表格字段 */
+function useGridColumns(): VxeTableGridOptions<MesWmSalesNoticeLineApi.SalesNoticeLine>['columns'] {
+  return [
+    {
+      type: 'checkbox',
+      width: 50,
+    },
+    {
+      field: 'itemCode',
+      title: '物料编码',
+      minWidth: 120,
+    },
+    {
+      field: 'itemName',
+      title: '物料名称',
+      minWidth: 140,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'quantity',
+      title: '发货数量',
+      width: 100,
+    },
+    {
+      field: 'batchCode',
+      title: '批次号',
+      minWidth: 120,
+    },
+    {
+      field: 'oqcCheckFlag',
+      title: '是否检验',
+      width: 90,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+      },
+    },
+  ];
+}
+
+/** 单选模式下同步 VXE 勾选状态 */
+async function syncSingleSelection(
+  row?: MesWmSalesNoticeLineApi.SalesNoticeLine,
+) {
+  syncingSingleSelection.value = true;
+  await nextTick();
+  await gridApi.grid.clearCheckboxRow();
+  if (row) {
+    await gridApi.grid.setCheckboxRow(row, true);
+  }
+  await nextTick();
+  syncingSingleSelection.value = false;
+}
+
+/** 处理勾选变化，只保留最后一条 */
+async function handleCheckboxChange({
+  checked,
+  row,
+}: {
+  checked: boolean;
+  row?: MesWmSalesNoticeLineApi.SalesNoticeLine;
+}) {
+  if (syncingSingleSelection.value) {
+    return;
+  }
+  const selected = checked && row ? [row] : [];
+  selectedRows.value = selected;
+  await syncSingleSelection(selected[0]);
+}
+
+/** 回显预选行 */
+function applyPreSelection() {
+  if (preSelectedIds.value.length === 0) {
+    return;
+  }
+  const rows =
+    gridApi.grid.getData() as MesWmSalesNoticeLineApi.SalesNoticeLine[];
+  for (const row of rows) {
+    if (row.id && preSelectedIds.value.includes(row.id)) {
+      gridApi.grid.setCheckboxRow(row, true);
+      selectedRows.value = [row];
+    }
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 460,
+    keepSource: true,
+    checkboxConfig: {
+      highlight: true,
+      reserve: true,
+    },
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!noticeId.value) {
+            return { list: [], total: 0 };
+          }
+          return await getSalesNoticeLinePage({
+            noticeId: noticeId.value,
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesWmSalesNoticeLineApi.SalesNoticeLine>,
+  gridEvents: {
+    checkboxChange: handleCheckboxChange,
+  },
+});
+
+/** 打开行选择弹窗 */
+async function openModal(id: number | undefined, selectedIds?: number[]) {
+  open.value = true;
+  noticeId.value = id;
+  preSelectedIds.value = selectedIds || [];
+  selectedRows.value = [];
+  await nextTick();
+  await gridApi.grid.clearCheckboxRow();
+  await gridApi.query();
+  await nextTick();
+  applyPreSelection();
+}
+
+/** 关闭弹窗 */
+async function closeModal() {
+  open.value = false;
+  selectedRows.value = [];
+  await gridApi.grid.clearCheckboxRow();
+}
+
+/** 确认选择行 */
+function handleConfirm() {
+  if (selectedRows.value.length === 0) {
+    ElMessage.warning('请选择一条数据');
+    return;
+  }
+  emit('selected', [selectedRows.value[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/wm/salesnotice/components/wm-sales-notice-line-select.vue b/apps/web-ele/src/views/mes/wm/salesnotice/components/wm-sales-notice-line-select.vue
new file mode 100644
index 000000000..87dd28dd2
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/salesnotice/components/wm-sales-notice-line-select.vue
@@ -0,0 +1,149 @@
+<script lang="ts" setup>
+import type { MesWmSalesNoticeLineApi } from '#/api/mes/wm/salesnotice/line';
+
+import { computed, ref, useAttrs, watch } from 'vue';
+
+import { CircleX, Search } from '@vben/icons';
+
+import { ElInput, ElTooltip } from 'element-plus';
+
+import { getSalesNoticeLine } from '#/api/mes/wm/salesnotice/line';
+
+import WmSalesNoticeLineSelectDialog from './wm-sales-notice-line-select-dialog.vue';
+
+defineOptions({ name: 'WmSalesNoticeLineSelect', inheritAttrs: false });
+
+const props = withDefaults(
+  defineProps<{
+    clearable?: boolean;
+    disabled?: boolean;
+    modelValue?: number;
+    noticeId?: number; // 所属发货通知单编号
+    placeholder?: string;
+  }>(),
+  {
+    clearable: true,
+    disabled: false,
+    modelValue: undefined,
+    noticeId: undefined,
+    placeholder: '请选择发货通知单行',
+  },
+);
+
+const emit = defineEmits<{
+  change: [item: MesWmSalesNoticeLineApi.SalesNoticeLine | undefined];
+  'update:modelValue': [value: number | undefined];
+}>();
+
+const attrs = useAttrs();
+const dialogRef = ref<InstanceType<typeof WmSalesNoticeLineSelectDialog>>();
+const hovering = ref(false);
+const selectedItem = ref<MesWmSalesNoticeLineApi.SalesNoticeLine>();
+
+const displayLabel = computed(() => {
+  const item = selectedItem.value;
+  if (!item) {
+    return '';
+  }
+  return `${item.itemCode ?? ''} - ${item.itemName ?? ''}`;
+});
+
+const showClear = computed(
+  () =>
+    props.clearable &&
+    !props.disabled &&
+    hovering.value &&
+    props.modelValue != null,
+);
+
+/** 根据编号单条查询行信息（用于编辑回显） */
+async function resolveItemById(id: number | undefined) {
+  if (id == null) {
+    selectedItem.value = undefined;
+    return;
+  }
+  if (selectedItem.value?.id === id) {
+    return;
+  }
+  selectedItem.value = await getSalesNoticeLine(id);
+}
+
+watch(() => props.modelValue, resolveItemById, { immediate: true });
+
+/** noticeId 变化时清空选中（关联的行已失效） */
+watch(
+  () => props.noticeId,
+  () => {
+    selectedItem.value = undefined;
+    emit('update:modelValue', undefined);
+    emit('change', undefined);
+  },
+);
+
+/** 清空已选行 */
+function clearSelected() {
+  selectedItem.value = undefined;
+  emit('update:modelValue', undefined);
+  emit('change', undefined);
+}
+
+/** 打开行选择弹窗 */
+function handleClick(event: MouseEvent) {
+  if (props.disabled || !props.noticeId) {
+    return;
+  }
+  const target = event.target as HTMLElement;
+  if (showClear.value && target.closest('.el-input__suffix')) {
+    event.stopPropagation();
+    clearSelected();
+    return;
+  }
+  const selectedIds = props.modelValue == null ? [] : [props.modelValue];
+  dialogRef.value?.open(props.noticeId, selectedIds);
+}
+
+/** 弹窗选中回调 */
+function handleSelected(rows: MesWmSalesNoticeLineApi.SalesNoticeLine[]) {
+  const item = rows[0];
+  if (!item) {
+    return;
+  }
+  selectedItem.value = item;
+  emit('update:modelValue', item.id);
+  emit('change', item);
+}
+</script>
+
+<template>
+  <div
+    v-bind="attrs"
+    class="w-full"
+    :class="disabled ? 'cursor-not-allowed' : 'cursor-pointer'"
+    @click="handleClick"
+    @mouseenter="hovering = true"
+    @mouseleave="hovering = false"
+  >
+    <ElTooltip :disabled="!selectedItem" placement="top" :show-after="500">
+      <template #content>
+        <div v-if="selectedItem" class="leading-6">
+          <div>物料编码：{{ selectedItem.itemCode || '-' }}</div>
+          <div>物料名称：{{ selectedItem.itemName || '-' }}</div>
+          <div>规格型号：{{ selectedItem.specification || '-' }}</div>
+          <div>发货数量：{{ selectedItem.quantity ?? '-' }}</div>
+        </div>
+      </template>
+      <ElInput
+        :disabled="disabled"
+        :model-value="displayLabel"
+        :placeholder="placeholder"
+        readonly
+      >
+        <template #suffix>
+          <CircleX v-if="showClear" class="size-4" />
+          <Search v-else class="size-4" />
+        </template>
+      </ElInput>
+    </ElTooltip>
+  </div>
+  <WmSalesNoticeLineSelectDialog ref="dialogRef" @selected="handleSelected" />
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/salesnotice/components/wm-sales-notice-select-dialog.vue b/apps/web-ele/src/views/mes/wm/salesnotice/components/wm-sales-notice-select-dialog.vue
new file mode 100644
index 000000000..d3d4c351f
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/salesnotice/components/wm-sales-notice-select-dialog.vue
@@ -0,0 +1,265 @@
+<script lang="ts" setup>
+import type { VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmSalesNoticeApi } from '#/api/mes/wm/salesnotice';
+
+import { nextTick, ref } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+
+import { ElButton, ElDialog, ElMessage } from 'element-plus';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getSalesNoticePage } from '#/api/mes/wm/salesnotice';
+
+const emit = defineEmits<{
+  selected: [rows: MesWmSalesNoticeApi.SalesNotice[]];
+}>();
+
+const open = ref(false); // 弹窗是否打开
+const multiple = ref(false); // 是否多选
+const fixedStatus = ref<number>(); // 固定状态筛选
+const syncingSingleSelection = ref(false); // 是否同步单选勾选状态
+const selectedRows = ref<MesWmSalesNoticeApi.SalesNotice[]>([]); // 已选通知单列表
+const preSelectedIds = ref<number[]>([]); // 预选通知单编号列表
+
+/** 搜索表单 */
+function useSearchSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '通知单编号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入通知单编号',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '通知单名称',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入通知单名称',
+      },
+    },
+    {
+      fieldName: 'salesOrderCode',
+      label: '销售订单编号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入销售订单编号',
+      },
+    },
+  ];
+}
+
+/** 表格字段 */
+function useGridColumns(): VxeTableGridOptions<MesWmSalesNoticeApi.SalesNotice>['columns'] {
+  return [
+    {
+      type: 'checkbox',
+      width: 50,
+    },
+    {
+      field: 'code',
+      title: '通知单编号',
+      minWidth: 160,
+    },
+    {
+      field: 'name',
+      title: '通知单名称',
+      minWidth: 150,
+    },
+    {
+      field: 'salesOrderCode',
+      title: '销售订单编号',
+      minWidth: 140,
+    },
+    {
+      field: 'clientName',
+      title: '客户名称',
+      minWidth: 120,
+    },
+    {
+      field: 'salesDate',
+      title: '发货日期',
+      width: 120,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_SALES_NOTICE_STATUS },
+      },
+    },
+  ];
+}
+
+/** 单选模式下同步 VXE 勾选状态，避免跨页残留多选 */
+async function syncSingleSelection(row?: MesWmSalesNoticeApi.SalesNotice) {
+  syncingSingleSelection.value = true;
+  await nextTick();
+  await gridApi.grid.clearCheckboxRow();
+  if (row) {
+    await gridApi.grid.setCheckboxRow(row, true);
+  }
+  await nextTick();
+  syncingSingleSelection.value = false;
+}
+
+/** 处理勾选变化，单选模式只保留最后一条 */
+async function handleCheckboxChange({
+  checked,
+  records,
+  row,
+}: {
+  checked: boolean;
+  records: MesWmSalesNoticeApi.SalesNotice[];
+  row?: MesWmSalesNoticeApi.SalesNotice;
+}) {
+  if (syncingSingleSelection.value) {
+    return;
+  }
+  if (!multiple.value) {
+    const selected = checked && row ? [row] : [];
+    selectedRows.value = selected;
+    await syncSingleSelection(selected[0]);
+    return;
+  }
+  selectedRows.value = records;
+}
+
+/** 处理全选变化 */
+function handleCheckboxAll({
+  records,
+}: {
+  records: MesWmSalesNoticeApi.SalesNotice[];
+}) {
+  if (syncingSingleSelection.value) {
+    return;
+  }
+  selectedRows.value = records;
+}
+
+/** 回显预选通知单 */
+function applyPreSelection() {
+  if (preSelectedIds.value.length === 0) {
+    return;
+  }
+  const rows = gridApi.grid.getData() as MesWmSalesNoticeApi.SalesNotice[];
+  for (const row of rows) {
+    if (row.id && preSelectedIds.value.includes(row.id)) {
+      gridApi.grid.setCheckboxRow(row, true);
+      if (!multiple.value) {
+        selectedRows.value = [row];
+      }
+    }
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useSearchSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 520,
+    keepSource: true,
+    checkboxConfig: {
+      highlight: true,
+      range: true,
+      reserve: true,
+    },
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getSalesNoticePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            status: fixedStatus.value,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmSalesNoticeApi.SalesNotice>,
+  gridEvents: {
+    checkboxAll: handleCheckboxAll,
+    checkboxChange: handleCheckboxChange,
+  },
+});
+
+/** 重置查询和选择状态 */
+async function resetQueryState() {
+  selectedRows.value = [];
+  await gridApi.grid.clearCheckboxRow();
+  await gridApi.formApi.resetForm();
+}
+
+/** 打开通知单选择弹窗 */
+async function openModal(
+  selectedIds?: number[],
+  options?: { multiple?: boolean; status?: number },
+) {
+  open.value = true;
+  multiple.value = options?.multiple ?? false;
+  fixedStatus.value = options?.status;
+  preSelectedIds.value = selectedIds || [];
+  await nextTick();
+  await resetQueryState();
+  await gridApi.query();
+  await nextTick();
+  applyPreSelection();
+}
+
+/** 关闭通知单选择弹窗 */
+async function closeModal() {
+  open.value = false;
+  await resetQueryState();
+}
+
+/** 确认选择通知单 */
+function handleConfirm() {
+  if (selectedRows.value.length === 0) {
+    ElMessage.warning(multiple.value ? '请至少选择一条数据' : '请选择一条数据');
+    return;
+  }
+  emit(
+    'selected',
+    multiple.value ? selectedRows.value : [selectedRows.value[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/wm/salesnotice/components/wm-sales-notice-select.vue b/apps/web-ele/src/views/mes/wm/salesnotice/components/wm-sales-notice-select.vue
new file mode 100644
index 000000000..d1d5d80a0
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/salesnotice/components/wm-sales-notice-select.vue
@@ -0,0 +1,136 @@
+<script lang="ts" setup>
+import type { MesWmSalesNoticeApi } from '#/api/mes/wm/salesnotice';
+
+import { computed, ref, useAttrs, watch } from 'vue';
+
+import { CircleX, Search } from '@vben/icons';
+
+import { ElInput, ElTooltip } from 'element-plus';
+
+import { getSalesNotice } from '#/api/mes/wm/salesnotice';
+
+import WmSalesNoticeSelectDialog from './wm-sales-notice-select-dialog.vue';
+
+defineOptions({ name: 'WmSalesNoticeSelect', inheritAttrs: false });
+
+const props = withDefaults(
+  defineProps<{
+    clearable?: boolean;
+    disabled?: boolean;
+    modelValue?: number;
+    placeholder?: string;
+    status?: number; // 固定状态筛选
+  }>(),
+  {
+    clearable: true,
+    disabled: false,
+    modelValue: undefined,
+    placeholder: '请选择发货通知单',
+    status: undefined,
+  },
+);
+
+const emit = defineEmits<{
+  change: [item: MesWmSalesNoticeApi.SalesNotice | undefined];
+  'update:modelValue': [value: number | undefined];
+}>();
+
+const attrs = useAttrs();
+const dialogRef = ref<InstanceType<typeof WmSalesNoticeSelectDialog>>();
+const hovering = ref(false);
+const selectedItem = ref<MesWmSalesNoticeApi.SalesNotice>();
+
+const displayLabel = computed(() => selectedItem.value?.name ?? '');
+
+const showClear = computed(
+  () =>
+    props.clearable &&
+    !props.disabled &&
+    hovering.value &&
+    props.modelValue != null,
+);
+
+/** 根据编号单条查询通知单信息（用于编辑回显） */
+async function resolveItemById(id: number | undefined) {
+  if (id == null) {
+    selectedItem.value = undefined;
+    return;
+  }
+  if (selectedItem.value?.id === id) {
+    return;
+  }
+  selectedItem.value = await getSalesNotice(id);
+}
+
+watch(() => props.modelValue, resolveItemById, { immediate: true });
+
+/** 清空已选通知单 */
+function clearSelected() {
+  selectedItem.value = undefined;
+  emit('update:modelValue', undefined);
+  emit('change', undefined);
+}
+
+/** 打开通知单选择弹窗 */
+function handleClick(event: MouseEvent) {
+  if (props.disabled) {
+    return;
+  }
+  const target = event.target as HTMLElement;
+  if (showClear.value && target.closest('.el-input__suffix')) {
+    event.stopPropagation();
+    clearSelected();
+    return;
+  }
+  const selectedIds = props.modelValue == null ? [] : [props.modelValue];
+  dialogRef.value?.open(selectedIds, {
+    multiple: false,
+    status: props.status,
+  });
+}
+
+/** 弹窗选中回调 */
+function handleSelected(rows: MesWmSalesNoticeApi.SalesNotice[]) {
+  const item = rows[0];
+  if (!item) {
+    return;
+  }
+  selectedItem.value = item;
+  emit('update:modelValue', item.id);
+  emit('change', item);
+}
+</script>
+
+<template>
+  <div
+    v-bind="attrs"
+    class="w-full"
+    :class="disabled ? 'cursor-not-allowed' : 'cursor-pointer'"
+    @click="handleClick"
+    @mouseenter="hovering = true"
+    @mouseleave="hovering = false"
+  >
+    <ElTooltip :disabled="!selectedItem" placement="top" :show-after="500">
+      <template #content>
+        <div v-if="selectedItem" class="leading-6">
+          <div>编号：{{ selectedItem.code || '-' }}</div>
+          <div>名称：{{ selectedItem.name || '-' }}</div>
+          <div>客户：{{ selectedItem.clientName || '-' }}</div>
+          <div>销售订单：{{ selectedItem.salesOrderCode || '-' }}</div>
+        </div>
+      </template>
+      <ElInput
+        :disabled="disabled"
+        :model-value="displayLabel"
+        :placeholder="placeholder"
+        readonly
+      >
+        <template #suffix>
+          <CircleX v-if="showClear" class="size-4" />
+          <Search v-else class="size-4" />
+        </template>
+      </ElInput>
+    </ElTooltip>
+  </div>
+  <WmSalesNoticeSelectDialog ref="dialogRef" @selected="handleSelected" />
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/salesnotice/data.ts b/apps/web-ele/src/views/mes/wm/salesnotice/data.ts
new file mode 100644
index 000000000..35c0c8512
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/salesnotice/data.ts
@@ -0,0 +1,364 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmSalesNoticeApi } from '#/api/mes/wm/salesnotice';
+import type { MesWmSalesNoticeLineApi } from '#/api/mes/wm/salesnotice/line';
+
+import { h, markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+
+import { ElButton } from 'element-plus';
+
+import { z } from '#/adapter/form';
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
+import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
+
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'finish' | 'update';
+
+/** 表单头部是否只读（详情、执行出库态） */
+function isHeaderReadonly(formType: FormType): boolean {
+  return formType === 'detail' || formType === 'finish';
+}
+
+/** 新增/修改的表单 */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'status',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '通知单编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入通知单编号',
+      },
+      rules: 'required',
+      suffix: isHeaderReadonly(formType)
+        ? undefined
+        : () =>
+            h(
+              ElButton,
+              {
+                onClick: async () => {
+                  const code = await generateAutoCode(
+                    MesAutoCodeRuleCode.WM_SALES_NOTICE_CODE,
+                  );
+                  await formApi?.setFieldValue('code', code);
+                },
+              },
+              { default: () => '生成' },
+            ),
+    },
+    {
+      fieldName: 'name',
+      label: '通知单名称',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入通知单名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'salesOrderCode',
+      label: '销售订单编号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入销售订单编号',
+      },
+    },
+    {
+      fieldName: 'clientId',
+      label: '客户',
+      component: markRaw(MdClientSelect),
+      componentProps: {
+        placeholder: '请选择客户',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'salesDate',
+      label: '发货日期',
+      component: 'DatePicker',
+      componentProps: {
+        class: '!w-full',
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择发货日期',
+        type: 'date',
+        valueFormat: 'x',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'recipientName',
+      label: '收货人',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入收货人',
+      },
+    },
+    {
+      fieldName: 'recipientTelephone',
+      label: '联系方式',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入联系方式',
+      },
+    },
+    {
+      fieldName: 'recipientAddress',
+      label: '收货地址',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入收货地址',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '通知单编号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入通知单编号',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '通知单名称',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入通知单名称',
+      },
+    },
+    {
+      fieldName: 'salesOrderCode',
+      label: '销售订单编号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入销售订单编号',
+      },
+    },
+    {
+      fieldName: 'clientId',
+      label: '客户',
+      component: markRaw(MdClientSelect),
+      componentProps: {
+        placeholder: '请选择客户',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesWmSalesNoticeApi.SalesNotice>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '通知单编号',
+      minWidth: 160,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '通知单名称',
+      minWidth: 150,
+    },
+    {
+      field: 'salesOrderCode',
+      title: '销售订单编号',
+      minWidth: 140,
+    },
+    {
+      field: 'clientName',
+      title: '客户名称',
+      minWidth: 120,
+    },
+    {
+      field: 'salesDate',
+      title: '发货日期',
+      width: 180,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'recipientName',
+      title: '收货人',
+      minWidth: 100,
+    },
+    {
+      field: 'recipientTelephone',
+      title: '联系方式',
+      minWidth: 120,
+    },
+    {
+      field: 'recipientAddress',
+      title: '收货地址',
+      minWidth: 200,
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      minWidth: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_SALES_NOTICE_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 200,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 通知单行子表的字段 */
+export function useLineGridColumns(
+  editable: boolean,
+): VxeTableGridOptions<MesWmSalesNoticeLineApi.SalesNoticeLine>['columns'] {
+  return [
+    {
+      field: 'itemCode',
+      title: '物料编码',
+      minWidth: 120,
+    },
+    {
+      field: 'itemName',
+      title: '物料名称',
+      minWidth: 140,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'quantity',
+      title: '发货数量',
+      width: 100,
+    },
+    {
+      field: 'batchCode',
+      title: '批次号',
+      minWidth: 120,
+    },
+    {
+      field: 'oqcCheckFlag',
+      title: '是否检验',
+      width: 90,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+      },
+    },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 120,
+    },
+    ...(editable
+      ? [
+          {
+            title: '操作',
+            width: 120,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 通知单行新增/修改的表单 */
+export function useLineFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        placeholder: '请选择物料',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'quantity',
+      label: '发货数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0.01,
+        placeholder: '请输入发货数量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入批次号',
+      },
+    },
+    {
+      fieldName: 'oqcCheckFlag',
+      label: '是否检验',
+      component: 'Switch',
+      rules: z.boolean().default(true),
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/wm/salesnotice/index.vue b/apps/web-ele/src/views/mes/wm/salesnotice/index.vue
new file mode 100644
index 000000000..14e72784f
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/salesnotice/index.vue
@@ -0,0 +1,177 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmSalesNoticeApi } from '#/api/mes/wm/salesnotice';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { ElButton, ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteSalesNotice,
+  exportSalesNotice,
+  getSalesNoticePage,
+} from '#/api/mes/wm/salesnotice';
+import { $t } from '#/locales';
+import { MesWmSalesNoticeStatusEnum } from '#/views/mes/utils/constants';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建发货通知单 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看发货通知单 */
+function handleDetail(row: MesWmSalesNoticeApi.SalesNotice) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑发货通知单 */
+function handleEdit(row: MesWmSalesNoticeApi.SalesNotice) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 执行出库 */
+function handleFinish(row: MesWmSalesNoticeApi.SalesNotice) {
+  formModalApi.setData({ formType: 'finish', id: row.id }).open();
+}
+
+/** 删除发货通知单 */
+async function handleDelete(row: MesWmSalesNoticeApi.SalesNotice) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.code]),
+  });
+  try {
+    await deleteSalesNotice(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportSalesNotice(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '发货通知单.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getSalesNoticePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmSalesNoticeApi.SalesNotice>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】发货通知、销售出库、销售退货"
+        url="https://doc.iocoder.cn/mes/wm/sales-out/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="发货通知单列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['发货通知单']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-sales-notice:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:wm-sales-notice:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <ElButton link type="primary" @click="handleDetail(row)">
+          {{ row.code }}
+        </ElButton>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:wm-sales-notice:update'],
+              ifShow: row.status === MesWmSalesNoticeStatusEnum.PREPARE,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm-sales-notice:delete'],
+              ifShow: row.status === MesWmSalesNoticeStatusEnum.PREPARE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '执行出库',
+              type: 'primary',
+              link: true,
+              auth: ['mes:wm-sales-notice:update'],
+              ifShow: row.status === MesWmSalesNoticeStatusEnum.APPROVED,
+              onClick: handleFinish.bind(null, row),
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/salesnotice/modules/form.vue b/apps/web-ele/src/views/mes/wm/salesnotice/modules/form.vue
new file mode 100644
index 000000000..3a1f1258c
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/salesnotice/modules/form.vue
@@ -0,0 +1,182 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesWmSalesNoticeApi } from '#/api/mes/wm/salesnotice';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElButton, ElDivider, ElMessage, ElPopconfirm } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createSalesNotice,
+  getSalesNotice,
+  submitSalesNotice,
+  updateSalesNotice,
+} from '#/api/mes/wm/salesnotice';
+import { $t } from '#/locales';
+import { MesWmSalesNoticeStatusEnum } from '#/views/mes/utils/constants';
+
+import { useFormSchema } from '../data';
+import LineList from './line-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesWmSalesNoticeApi.SalesNotice>();
+const originalSnapshot = ref(''); // 表单原始数据快照，用于提交时跳过未变更的保存请求
+const isEditable = computed(() => // 是否为编辑模式（可保存）
+  ['create', 'update'].includes(formType.value),
+);
+const isFinish = computed(() => formType.value === 'finish'); // 是否为执行出库模式
+const canSubmit = computed(() => // 是否可提交
+  formType.value === 'update' &&
+  formData.value?.status === MesWmSalesNoticeStatusEnum.PREPARE,
+);
+const getTitle = computed(() => {
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['发货通知单']);
+  }
+  if (formType.value === 'finish') {
+    return '执行出库';
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['发货通知单'])
+    : $t('ui.actionTitle.create', ['发货通知单']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+/** 提交通知单：表单有修改时先保存，再调用提交接口 */
+async function handleSubmit() {
+  const { valid } = await formApi.validate();
+  if (!valid || !formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    const current = JSON.stringify(await formApi.getValues());
+    if (current !== originalSnapshot.value) {
+      const data =
+        (await formApi.getValues()) as MesWmSalesNoticeApi.SalesNotice;
+      await updateSalesNotice({ ...formData.value, ...data });
+      originalSnapshot.value = current;
+    }
+    await submitSalesNotice(formData.value.id);
+    ElMessage.success('提交成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 执行出库（后端暂未实现，提示用户） */
+function handleFinish() {
+  ElMessage.info('执行出库功能暂时不支持，敬请期待！');
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (!isEditable.value) {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data = (await formApi.getValues()) as MesWmSalesNoticeApi.SalesNotice;
+    try {
+      if (formData.value?.id) {
+        await updateSalesNotice({ ...formData.value, ...data });
+        formData.value = { ...formData.value, ...data };
+      } else {
+        const id = await createSalesNotice(data);
+        formData.value = {
+          ...data,
+          id,
+          status: MesWmSalesNoticeStatusEnum.PREPARE,
+        };
+        await formApi.setFieldValue('id', id);
+        await formApi.setFieldValue('status', formData.value.status);
+        formType.value = 'update';
+      }
+      originalSnapshot.value = JSON.stringify(await formApi.getValues());
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      originalSnapshot.value = '';
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    formApi.setDisabled(!isEditable.value);
+    modalApi.setState({ showConfirmButton: isEditable.value });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getSalesNotice(data.id);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    }
+    originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+    <!-- 非新建模式展示物料信息 -->
+    <template v-if="formData?.id">
+      <ElDivider>物料信息</ElDivider>
+      <div class="mx-4">
+        <LineList :form-type="formType" :notice-id="formData.id" />
+      </div>
+    </template>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <ElPopconfirm
+          v-if="canSubmit"
+          title="确认提交该发货通知单？【提交后将不能修改】"
+          width="260"
+          @confirm="handleSubmit"
+        >
+          <template #reference>
+            <ElButton type="primary">提交</ElButton>
+          </template>
+        </ElPopconfirm>
+        <ElButton v-if="isFinish" type="primary" @click="handleFinish">
+          执行出库
+        </ElButton>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/salesnotice/modules/line-form.vue b/apps/web-ele/src/views/mes/wm/salesnotice/modules/line-form.vue
new file mode 100644
index 000000000..184a78728
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/salesnotice/modules/line-form.vue
@@ -0,0 +1,94 @@
+<script lang="ts" setup>
+import type { MesWmSalesNoticeLineApi } from '#/api/mes/wm/salesnotice/line';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createSalesNoticeLine,
+  getSalesNoticeLine,
+  updateSalesNoticeLine,
+} from '#/api/mes/wm/salesnotice/line';
+import { $t } from '#/locales';
+
+import { useLineFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesWmSalesNoticeLineApi.SalesNoticeLine>();
+const noticeId = ref<number>(); // 所属通知单编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['发货通知单行'])
+    : $t('ui.actionTitle.create', ['发货通知单行']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 90,
+  },
+  layout: 'horizontal',
+  schema: useLineFormSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmSalesNoticeLineApi.SalesNoticeLine;
+    data.noticeId = noticeId.value;
+    try {
+      await (formData.value?.id
+        ? updateSalesNoticeLine({ ...data, id: formData.value.id })
+        : createSalesNoticeLine(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ id?: number; noticeId: number }>();
+    noticeId.value = data.noticeId;
+    if (!data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getSalesNoticeLine(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/salesnotice/modules/line-list.vue b/apps/web-ele/src/views/mes/wm/salesnotice/modules/line-list.vue
new file mode 100644
index 000000000..bf60f802a
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/salesnotice/modules/line-list.vue
@@ -0,0 +1,137 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmSalesNoticeLineApi } from '#/api/mes/wm/salesnotice/line';
+
+import { computed } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteSalesNoticeLine,
+  getSalesNoticeLinePage,
+} from '#/api/mes/wm/salesnotice/line';
+import { $t } from '#/locales';
+
+import { type FormType, useLineGridColumns } from '../data';
+import LineForm from './line-form.vue';
+
+const props = defineProps<{
+  formType: FormType;
+  noticeId: number;
+}>();
+
+const isEditable = computed(() => // 是否可编辑明细行
+  ['create', 'update'].includes(props.formType),
+);
+
+const [LineFormModal, lineFormModalApi] = useVbenModal({
+  connectedComponent: LineForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 添加物料 */
+function handleCreate() {
+  lineFormModalApi.setData({ noticeId: props.noticeId }).open();
+}
+
+/** 编辑物料 */
+function handleEdit(row: MesWmSalesNoticeLineApi.SalesNoticeLine) {
+  lineFormModalApi.setData({ id: row.id, noticeId: props.noticeId }).open();
+}
+
+/** 删除物料 */
+async function handleDelete(row: MesWmSalesNoticeLineApi.SalesNoticeLine) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.itemName]),
+  });
+  try {
+    await deleteSalesNoticeLine(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.itemName]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useLineGridColumns(isEditable.value),
+    height: 400,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          if (!props.noticeId) {
+            return { list: [], total: 0 };
+          }
+          return await getSalesNoticeLinePage({
+            noticeId: props.noticeId,
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesWmSalesNoticeLineApi.SalesNoticeLine>,
+});
+</script>
+
+<template>
+  <div>
+    <LineFormModal @success="handleRefresh" />
+    <Grid table-title="物料信息">
+      <template v-if="isEditable" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '添加物料',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              ifShow: isEditable,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              ifShow: isEditable,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.itemName]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>

From 37b9db148f23f57c241c0b166532c9ea561e364e Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 30 May 2026 13:20:41 +0800
Subject: [PATCH 44/52] =?UTF-8?q?feat(mes):=20=E6=B7=BB=E5=8A=A0=20MES=20?=
 =?UTF-8?q?=E8=BD=AC=E7=A7=BB=E5=8D=95=E7=B1=BB=E5=9E=8B=E5=8F=8A=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=9E=9A=E4=B8=BE=EF=BC=8C=E6=9B=B4=E6=96=B0=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E8=A1=A8=E5=8D=95=E5=AD=97=E6=AE=B5=E7=A6=81=E7=94=A8?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/views/mes/utils/constants.ts  | 17 +++++++++++++++++
 .../src/views/mes/wm/productreceipt/index.vue   |  4 ++--
 .../mes/wm/productreceipt/modules/form.vue      |  7 ++++++-
 .../src/views/mes/wm/productsales/data.ts       | 10 ++++++++++
 .../views/mes/wm/productsales/modules/form.vue  |  2 +-
 apps/web-ele/src/views/mes/utils/constants.ts   | 17 +++++++++++++++++
 .../src/views/mes/wm/productreceipt/index.vue   |  4 ++--
 .../mes/wm/productreceipt/modules/form.vue      |  7 ++++++-
 .../src/views/mes/wm/productsales/data.ts       | 10 ++++++++++
 .../views/mes/wm/productsales/modules/form.vue  |  2 +-
 packages/constants/src/dict-enum.ts             |  2 ++
 11 files changed, 74 insertions(+), 8 deletions(-)

diff --git a/apps/web-antd/src/views/mes/utils/constants.ts b/apps/web-antd/src/views/mes/utils/constants.ts
index d247ceb42..0e4703326 100644
--- a/apps/web-antd/src/views/mes/utils/constants.ts
+++ b/apps/web-antd/src/views/mes/utils/constants.ts
@@ -168,6 +168,7 @@ export const MesAutoCodeRuleCode = {
   WM_STOCK_TAKING_CODE: 'WM_STOCK_TAKING_CODE',
   WM_STOCK_TAKING_PLAN_CODE: 'WM_STOCK_TAKING_PLAN_CODE',
   WM_WAREHOUSE_CODE: 'WM_WAREHOUSE_CODE',
+  TRANSFER_CODE: 'TRANSFER_CODE',
 } as const;
 
 /** MES 装箱单状态枚举 */
@@ -309,6 +310,22 @@ export const MesWmOutsourceReceiptStatusEnum = {
   CANCELED: MesOrderStatusConstants.CANCELLED,
 } as const;
 
+/** MES 转移单类型枚举 */
+export const MesWmTransferTypeEnum = {
+  INNER: 1, // 内部调拨
+  OUTER: 2, // 外部调拨
+} as const;
+
+/** MES 转移单状态枚举 */
+export const MesWmTransferStatusEnum = {
+  PREPARE: MesOrderStatusConstants.DRAFT, // 草稿
+  UNCONFIRMED: MesOrderStatusConstants.CONFIRMED, // 待确认
+  APPROVING: MesOrderStatusConstants.APPROVING, // 待上架
+  APPROVED: MesOrderStatusConstants.APPROVED, // 待执行
+  FINISHED: MesOrderStatusConstants.FINISHED, // 已完成
+  CANCELED: MesOrderStatusConstants.CANCELLED, // 已取消
+} as const;
+
 /** MES 到货通知单状态枚举 */
 export const MesWmArrivalNoticeStatusEnum = {
   PREPARE: MesOrderStatusConstants.DRAFT,
diff --git a/apps/web-antd/src/views/mes/wm/productreceipt/index.vue b/apps/web-antd/src/views/mes/wm/productreceipt/index.vue
index 7ac6f90ac..860c50d3f 100644
--- a/apps/web-antd/src/views/mes/wm/productreceipt/index.vue
+++ b/apps/web-antd/src/views/mes/wm/productreceipt/index.vue
@@ -118,8 +118,8 @@ const [Grid, gridApi] = useVbenVxeGrid({
   <Page auto-content-height>
     <template #doc>
       <DocAlert
-        title="【仓库】生产入库、生产退料"
-        url="https://doc.iocoder.cn/mes/wm/produce-in/"
+        title="【仓库】产品产出、产品入库"
+        url="https://doc.iocoder.cn/mes/wm/product-in/"
       />
     </template>
 
diff --git a/apps/web-antd/src/views/mes/wm/productreceipt/modules/form.vue b/apps/web-antd/src/views/mes/wm/productreceipt/modules/form.vue
index 5755163fa..4a85b60b5 100644
--- a/apps/web-antd/src/views/mes/wm/productreceipt/modules/form.vue
+++ b/apps/web-antd/src/views/mes/wm/productreceipt/modules/form.vue
@@ -91,11 +91,16 @@ async function handleSubmit() {
   }
 }
 
-/** 执行上架：明细数量与行收货数量不一致时二次确认 */
+/** 执行上架：先确认，再在明细数量与行收货数量不一致时二次确认 */
 async function handleStock() {
   if (!formData.value?.id) {
     return;
   }
+  try {
+    await confirm('确认执行上架？');
+  } catch {
+    return;
+  }
   const quantityMatch = await checkProductReceiptQuantity(formData.value.id);
   if (!quantityMatch) {
     try {
diff --git a/apps/web-antd/src/views/mes/wm/productsales/data.ts b/apps/web-antd/src/views/mes/wm/productsales/data.ts
index d7fc5fa6a..d07c4093c 100644
--- a/apps/web-antd/src/views/mes/wm/productsales/data.ts
+++ b/apps/web-antd/src/views/mes/wm/productsales/data.ts
@@ -87,6 +87,7 @@ export function useFormSchema(
       label: '出库单编号',
       component: 'Input',
       componentProps: {
+        disabled: isHeaderReadonly(formType),
         placeholder: '请输入出库单编号',
       },
       rules: 'required',
@@ -112,6 +113,7 @@ export function useFormSchema(
       label: '出库单名称',
       component: 'Input',
       componentProps: {
+        disabled: isHeaderReadonly(formType),
         placeholder: '请输入出库单名称',
       },
       rules: 'required',
@@ -121,6 +123,7 @@ export function useFormSchema(
       label: '发货通知单',
       component: markRaw(WmSalesNoticeSelect),
       componentProps: {
+        disabled: isHeaderReadonly(formType),
         // 选择发货通知单后，自动回填销售订单号、客户、收货人信息
         onChange: async (notice?: MesWmSalesNoticeApi.SalesNotice) => {
           await formApi?.setValues({
@@ -139,6 +142,7 @@ export function useFormSchema(
       label: '销售订单编号',
       component: 'Input',
       componentProps: {
+        disabled: isHeaderReadonly(formType),
         placeholder: '请输入销售订单编号',
       },
     },
@@ -148,6 +152,7 @@ export function useFormSchema(
       component: 'DatePicker',
       componentProps: {
         class: '!w-full',
+        disabled: isHeaderReadonly(formType),
         format: 'YYYY-MM-DD',
         placeholder: '请选择出库日期',
         valueFormat: 'x',
@@ -159,6 +164,7 @@ export function useFormSchema(
       label: '客户',
       component: markRaw(MdClientSelect),
       componentProps: {
+        disabled: isHeaderReadonly(formType),
         placeholder: '请选择客户',
       },
       rules: 'selectRequired',
@@ -168,6 +174,7 @@ export function useFormSchema(
       label: '收货人',
       component: 'Input',
       componentProps: {
+        disabled: isHeaderReadonly(formType),
         placeholder: '请输入收货人',
       },
     },
@@ -176,6 +183,7 @@ export function useFormSchema(
       label: '联系方式',
       component: 'Input',
       componentProps: {
+        disabled: isHeaderReadonly(formType),
         placeholder: '请输入联系方式',
       },
     },
@@ -184,6 +192,7 @@ export function useFormSchema(
       label: '收货地址',
       component: 'Input',
       componentProps: {
+        disabled: isHeaderReadonly(formType),
         placeholder: '请输入收货地址',
       },
     },
@@ -193,6 +202,7 @@ export function useFormSchema(
       component: 'Textarea',
       formItemClass: 'col-span-3',
       componentProps: {
+        disabled: isHeaderReadonly(formType),
         placeholder: '请输入备注',
         rows: 3,
       },
diff --git a/apps/web-antd/src/views/mes/wm/productsales/modules/form.vue b/apps/web-antd/src/views/mes/wm/productsales/modules/form.vue
index cf0b15acb..70d71d653 100644
--- a/apps/web-antd/src/views/mes/wm/productsales/modules/form.vue
+++ b/apps/web-antd/src/views/mes/wm/productsales/modules/form.vue
@@ -203,7 +203,7 @@ const [Modal, modalApi] = useVbenModal({
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
     formType.value = data.formType;
     formApi.setState({ schema: useFormSchema(formType.value, formApi) });
-    formApi.setDisabled(!isEditable.value && !isShipping.value);
+    formApi.setDisabled(false);
     modalApi.setState({ showConfirmButton: isEditable.value });
     if (data?.id) {
       modalApi.lock();
diff --git a/apps/web-ele/src/views/mes/utils/constants.ts b/apps/web-ele/src/views/mes/utils/constants.ts
index d247ceb42..0e4703326 100644
--- a/apps/web-ele/src/views/mes/utils/constants.ts
+++ b/apps/web-ele/src/views/mes/utils/constants.ts
@@ -168,6 +168,7 @@ export const MesAutoCodeRuleCode = {
   WM_STOCK_TAKING_CODE: 'WM_STOCK_TAKING_CODE',
   WM_STOCK_TAKING_PLAN_CODE: 'WM_STOCK_TAKING_PLAN_CODE',
   WM_WAREHOUSE_CODE: 'WM_WAREHOUSE_CODE',
+  TRANSFER_CODE: 'TRANSFER_CODE',
 } as const;
 
 /** MES 装箱单状态枚举 */
@@ -309,6 +310,22 @@ export const MesWmOutsourceReceiptStatusEnum = {
   CANCELED: MesOrderStatusConstants.CANCELLED,
 } as const;
 
+/** MES 转移单类型枚举 */
+export const MesWmTransferTypeEnum = {
+  INNER: 1, // 内部调拨
+  OUTER: 2, // 外部调拨
+} as const;
+
+/** MES 转移单状态枚举 */
+export const MesWmTransferStatusEnum = {
+  PREPARE: MesOrderStatusConstants.DRAFT, // 草稿
+  UNCONFIRMED: MesOrderStatusConstants.CONFIRMED, // 待确认
+  APPROVING: MesOrderStatusConstants.APPROVING, // 待上架
+  APPROVED: MesOrderStatusConstants.APPROVED, // 待执行
+  FINISHED: MesOrderStatusConstants.FINISHED, // 已完成
+  CANCELED: MesOrderStatusConstants.CANCELLED, // 已取消
+} as const;
+
 /** MES 到货通知单状态枚举 */
 export const MesWmArrivalNoticeStatusEnum = {
   PREPARE: MesOrderStatusConstants.DRAFT,
diff --git a/apps/web-ele/src/views/mes/wm/productreceipt/index.vue b/apps/web-ele/src/views/mes/wm/productreceipt/index.vue
index 14b8902cc..0b0f7094c 100644
--- a/apps/web-ele/src/views/mes/wm/productreceipt/index.vue
+++ b/apps/web-ele/src/views/mes/wm/productreceipt/index.vue
@@ -117,8 +117,8 @@ const [Grid, gridApi] = useVbenVxeGrid({
   <Page auto-content-height>
     <template #doc>
       <DocAlert
-        title="【仓库】生产入库、生产退料"
-        url="https://doc.iocoder.cn/mes/wm/produce-in/"
+        title="【仓库】产品产出、产品入库"
+        url="https://doc.iocoder.cn/mes/wm/product-in/"
       />
     </template>
 
diff --git a/apps/web-ele/src/views/mes/wm/productreceipt/modules/form.vue b/apps/web-ele/src/views/mes/wm/productreceipt/modules/form.vue
index 9da8463bc..cd6598021 100644
--- a/apps/web-ele/src/views/mes/wm/productreceipt/modules/form.vue
+++ b/apps/web-ele/src/views/mes/wm/productreceipt/modules/form.vue
@@ -91,11 +91,16 @@ async function handleSubmit() {
   }
 }
 
-/** 执行上架：明细数量与行收货数量不一致时二次确认 */
+/** 执行上架：先确认，再在明细数量与行收货数量不一致时二次确认 */
 async function handleStock() {
   if (!formData.value?.id) {
     return;
   }
+  try {
+    await confirm('确认执行上架？');
+  } catch {
+    return;
+  }
   const quantityMatch = await checkProductReceiptQuantity(formData.value.id);
   if (!quantityMatch) {
     try {
diff --git a/apps/web-ele/src/views/mes/wm/productsales/data.ts b/apps/web-ele/src/views/mes/wm/productsales/data.ts
index eeee968b1..6be36f29d 100644
--- a/apps/web-ele/src/views/mes/wm/productsales/data.ts
+++ b/apps/web-ele/src/views/mes/wm/productsales/data.ts
@@ -87,6 +87,7 @@ export function useFormSchema(
       label: '出库单编号',
       component: 'Input',
       componentProps: {
+        disabled: isHeaderReadonly(formType),
         placeholder: '请输入出库单编号',
       },
       rules: 'required',
@@ -111,6 +112,7 @@ export function useFormSchema(
       label: '出库单名称',
       component: 'Input',
       componentProps: {
+        disabled: isHeaderReadonly(formType),
         placeholder: '请输入出库单名称',
       },
       rules: 'required',
@@ -120,6 +122,7 @@ export function useFormSchema(
       label: '发货通知单',
       component: markRaw(WmSalesNoticeSelect),
       componentProps: {
+        disabled: isHeaderReadonly(formType),
         // 选择发货通知单后，自动回填销售订单号、客户、收货人信息
         onChange: async (notice?: MesWmSalesNoticeApi.SalesNotice) => {
           await formApi?.setValues({
@@ -138,6 +141,7 @@ export function useFormSchema(
       label: '销售订单编号',
       component: 'Input',
       componentProps: {
+        disabled: isHeaderReadonly(formType),
         placeholder: '请输入销售订单编号',
       },
     },
@@ -147,6 +151,7 @@ export function useFormSchema(
       component: 'DatePicker',
       componentProps: {
         class: '!w-full',
+        disabled: isHeaderReadonly(formType),
         format: 'YYYY-MM-DD',
         placeholder: '请选择出库日期',
         type: 'date',
@@ -159,6 +164,7 @@ export function useFormSchema(
       label: '客户',
       component: markRaw(MdClientSelect),
       componentProps: {
+        disabled: isHeaderReadonly(formType),
         placeholder: '请选择客户',
       },
       rules: 'selectRequired',
@@ -168,6 +174,7 @@ export function useFormSchema(
       label: '收货人',
       component: 'Input',
       componentProps: {
+        disabled: isHeaderReadonly(formType),
         placeholder: '请输入收货人',
       },
     },
@@ -176,6 +183,7 @@ export function useFormSchema(
       label: '联系方式',
       component: 'Input',
       componentProps: {
+        disabled: isHeaderReadonly(formType),
         placeholder: '请输入联系方式',
       },
     },
@@ -184,6 +192,7 @@ export function useFormSchema(
       label: '收货地址',
       component: 'Input',
       componentProps: {
+        disabled: isHeaderReadonly(formType),
         placeholder: '请输入收货地址',
       },
     },
@@ -193,6 +202,7 @@ export function useFormSchema(
       component: 'Textarea',
       formItemClass: 'col-span-3',
       componentProps: {
+        disabled: isHeaderReadonly(formType),
         placeholder: '请输入备注',
         rows: 3,
       },
diff --git a/apps/web-ele/src/views/mes/wm/productsales/modules/form.vue b/apps/web-ele/src/views/mes/wm/productsales/modules/form.vue
index d92ea8336..e2caa6f04 100644
--- a/apps/web-ele/src/views/mes/wm/productsales/modules/form.vue
+++ b/apps/web-ele/src/views/mes/wm/productsales/modules/form.vue
@@ -203,7 +203,7 @@ const [Modal, modalApi] = useVbenModal({
     const data = modalApi.getData<{ formType: FormType; id?: number }>();
     formType.value = data.formType;
     formApi.setState({ schema: useFormSchema(formType.value, formApi) });
-    formApi.setDisabled(!isEditable.value && !isShipping.value);
+    formApi.setDisabled(false);
     modalApi.setState({ showConfirmButton: isEditable.value });
     if (data?.id) {
       modalApi.lock();
diff --git a/packages/constants/src/dict-enum.ts b/packages/constants/src/dict-enum.ts
index 7110f267d..030e38f77 100644
--- a/packages/constants/src/dict-enum.ts
+++ b/packages/constants/src/dict-enum.ts
@@ -245,6 +245,8 @@ const MES_DICT = {
   MES_WM_STOCK_TAKING_TASK_STATUS: 'mes_wm_stock_taking_task_status', // MES 盘点任务状态
   MES_WM_STOCK_TAKING_LINE_STATUS: 'mes_wm_stock_taking_task_line_status', // MES 盘点任务行状态
   MES_WM_STOCK_TAKING_PLAN_PARAM_TYPE: 'mes_wm_stock_taking_plan_param_type', // MES 盘点方案参数类型
+  MES_WM_TRANSFER_STATUS: 'mes_wm_transfer_status', // MES 转移单状态
+  MES_WM_TRANSFER_TYPE: 'mes_wm_transfer_type', // MES 转移单类型
 } as const;
 
 /** ========== WMS - 仓储管理模块 ========== */

From b325db0450c8fc7fa28211d9bb165c6346b190ed Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 30 May 2026 13:21:55 +0800
Subject: [PATCH 45/52] =?UTF-8?q?feat(mes):=20=E8=BF=81=E7=A7=BB=20home=20?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/api/mes/home/index.ts       |  55 ++++++
 .../src/api/mes/wm/transfer/detail/index.ts   |  59 ++++++
 .../web-antd/src/api/mes/wm/transfer/index.ts |  92 +++++++++
 .../src/api/mes/wm/transfer/line/index.ts     |  55 ++++++
 apps/web-antd/src/views/mes/home/data.ts      |  89 +++++++++
 apps/web-antd/src/views/mes/home/index.vue    |  70 +++++++
 .../views/mes/home/modules/alert-panel.vue    |  72 ++++++++
 .../src/views/mes/home/modules/kpi-cards.vue  | 174 ++++++++++++++++++
 .../mes/home/modules/production-trend.vue     |  56 ++++++
 .../src/views/mes/home/modules/shortcuts.vue  |  90 +++++++++
 .../mes/home/modules/work-order-chart.vue     |  39 ++++
 apps/web-ele/src/api/mes/home/index.ts        |  55 ++++++
 .../src/api/mes/wm/transfer/detail/index.ts   |  59 ++++++
 apps/web-ele/src/api/mes/wm/transfer/index.ts |  92 +++++++++
 .../src/api/mes/wm/transfer/line/index.ts     |  55 ++++++
 15 files changed, 1112 insertions(+)
 create mode 100644 apps/web-antd/src/api/mes/home/index.ts
 create mode 100644 apps/web-antd/src/api/mes/wm/transfer/detail/index.ts
 create mode 100644 apps/web-antd/src/api/mes/wm/transfer/index.ts
 create mode 100644 apps/web-antd/src/api/mes/wm/transfer/line/index.ts
 create mode 100644 apps/web-antd/src/views/mes/home/data.ts
 create mode 100644 apps/web-antd/src/views/mes/home/index.vue
 create mode 100644 apps/web-antd/src/views/mes/home/modules/alert-panel.vue
 create mode 100644 apps/web-antd/src/views/mes/home/modules/kpi-cards.vue
 create mode 100644 apps/web-antd/src/views/mes/home/modules/production-trend.vue
 create mode 100644 apps/web-antd/src/views/mes/home/modules/shortcuts.vue
 create mode 100644 apps/web-antd/src/views/mes/home/modules/work-order-chart.vue
 create mode 100644 apps/web-ele/src/api/mes/home/index.ts
 create mode 100644 apps/web-ele/src/api/mes/wm/transfer/detail/index.ts
 create mode 100644 apps/web-ele/src/api/mes/wm/transfer/index.ts
 create mode 100644 apps/web-ele/src/api/mes/wm/transfer/line/index.ts

diff --git a/apps/web-antd/src/api/mes/home/index.ts b/apps/web-antd/src/api/mes/home/index.ts
new file mode 100644
index 000000000..cf1aa9953
--- /dev/null
+++ b/apps/web-antd/src/api/mes/home/index.ts
@@ -0,0 +1,55 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesHomeApi {
+  /** MES 首页汇总统计 */
+  export interface Summary {
+    workOrderActiveCount: number; // 进行中工单数
+    workOrderPrepareCount: number; // 待排产工单数
+    workOrderFinishedCount: number; // 已完成工单数
+    todayOutput: number; // 今日产量
+    yesterdayOutput: number; // 昨日产量
+    todayQualifiedQuantity: number; // 今日合格品数
+    todayUnqualifiedQuantity: number; // 今日不良品数
+    machineryTotal: number; // 设备总数
+    machineryProducing: number; // 生产中设备数
+    machineryStop: number; // 停机设备数
+    machineryMaintenance: number; // 维护中设备数
+    andonActiveCount: number; // 未处置安灯呼叫数
+    repairActiveCount: number; // 待处理维修工单数
+  }
+
+  /** MES 工单状态分布 */
+  export interface WorkOrderStatus {
+    status: number; // 工单状态
+    statusName: string; // 工单状态名称
+    count: number; // 数量
+  }
+
+  /** MES 生产趋势 */
+  export interface ProductionTrend {
+    date: string; // 日期
+    quantity: number; // 产量
+    qualifiedQuantity: number; // 合格品数
+    unqualifiedQuantity: number; // 不良品数
+  }
+}
+
+/** 获得首页汇总统计 */
+export function getHomeSummary() {
+  return requestClient.get<MesHomeApi.Summary>('/mes/home-statistics/summary');
+}
+
+/** 获得工单状态分布 */
+export function getWorkOrderStatusDistribution() {
+  return requestClient.get<MesHomeApi.WorkOrderStatus[]>(
+    '/mes/home-statistics/work-order-status',
+  );
+}
+
+/** 获得生产趋势 */
+export function getProductionTrend(days?: number) {
+  return requestClient.get<MesHomeApi.ProductionTrend[]>(
+    '/mes/home-statistics/production-trend',
+    { params: { days } },
+  );
+}
diff --git a/apps/web-antd/src/api/mes/wm/transfer/detail/index.ts b/apps/web-antd/src/api/mes/wm/transfer/detail/index.ts
new file mode 100644
index 000000000..ff215d92c
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/transfer/detail/index.ts
@@ -0,0 +1,59 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesWmTransferDetailApi {
+  /** MES 调拨明细 */
+  export interface TransferDetail {
+    id?: number; // 编号
+    lineId?: number; // 转移单行编号
+    transferId?: number; // 转移单编号
+    itemId?: number; // 物料产品编号
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    specification?: string; // 规格型号
+    unitMeasureName?: string; // 单位名称
+    quantity?: number; // 数量
+    batchId?: number; // 批次编号
+    batchCode?: string; // 批次号
+    toWarehouseId?: number; // 移入仓库编号
+    toWarehouseName?: string; // 移入仓库名称
+    toLocationId?: number; // 移入库区编号
+    toLocationName?: string; // 移入库区名称
+    toAreaId?: number; // 移入库位编号
+    toAreaName?: string; // 移入库位名称
+    remark?: string; // 备注
+  }
+}
+
+/** 查询调拨明细列表（按行编号） */
+export function getTransferDetailListByLineId(lineId: number) {
+  return requestClient.get<MesWmTransferDetailApi.TransferDetail[]>(
+    '/mes/wm/transfer-detail/list-by-line',
+    { params: { lineId } },
+  );
+}
+
+/** 查询调拨明细详情 */
+export function getTransferDetail(id: number) {
+  return requestClient.get<MesWmTransferDetailApi.TransferDetail>(
+    `/mes/wm/transfer-detail/get?id=${id}`,
+  );
+}
+
+/** 新增调拨明细 */
+export function createTransferDetail(
+  data: MesWmTransferDetailApi.TransferDetail,
+) {
+  return requestClient.post('/mes/wm/transfer-detail/create', data);
+}
+
+/** 修改调拨明细 */
+export function updateTransferDetail(
+  data: MesWmTransferDetailApi.TransferDetail,
+) {
+  return requestClient.put('/mes/wm/transfer-detail/update', data);
+}
+
+/** 删除调拨明细 */
+export function deleteTransferDetail(id: number) {
+  return requestClient.delete(`/mes/wm/transfer-detail/delete?id=${id}`);
+}
diff --git a/apps/web-antd/src/api/mes/wm/transfer/index.ts b/apps/web-antd/src/api/mes/wm/transfer/index.ts
new file mode 100644
index 000000000..14d9b860f
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/transfer/index.ts
@@ -0,0 +1,92 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmTransferApi {
+  /** MES 转移单 */
+  export interface Transfer {
+    id?: number; // 编号
+    code?: string; // 转移单编号
+    name?: string; // 转移单名称
+    type?: number; // 转移单类型
+    deliveryFlag?: boolean; // 是否配送
+    recipientName?: string; // 收货人
+    recipientTelephone?: string; // 联系电话
+    destinationAddress?: string; // 目的地
+    carrier?: string; // 承运商
+    shippingNumber?: string; // 运输单号
+    confirmFlag?: boolean; // 是否确认
+    transferDate?: string; // 转移日期
+    status?: number; // 单据状态
+    remark?: string; // 备注
+    createTime?: number; // 创建时间
+  }
+
+  /** MES 转移单分页查询参数 */
+  export interface PageParams extends PageParam {
+    code?: string;
+    name?: string;
+    type?: number;
+    status?: number;
+  }
+}
+
+/** 查询转移单分页 */
+export function getTransferPage(params: MesWmTransferApi.PageParams) {
+  return requestClient.get<PageResult<MesWmTransferApi.Transfer>>(
+    '/mes/wm/transfer/page',
+    { params },
+  );
+}
+
+/** 查询转移单详情 */
+export function getTransfer(id: number) {
+  return requestClient.get<MesWmTransferApi.Transfer>(
+    `/mes/wm/transfer/get?id=${id}`,
+  );
+}
+
+/** 新增转移单 */
+export function createTransfer(data: MesWmTransferApi.Transfer) {
+  return requestClient.post<number>('/mes/wm/transfer/create', data);
+}
+
+/** 修改转移单 */
+export function updateTransfer(data: MesWmTransferApi.Transfer) {
+  return requestClient.put('/mes/wm/transfer/update', data);
+}
+
+/** 删除转移单 */
+export function deleteTransfer(id: number) {
+  return requestClient.delete(`/mes/wm/transfer/delete?id=${id}`);
+}
+
+/** 提交转移单 */
+export function submitTransfer(id: number) {
+  return requestClient.put(`/mes/wm/transfer/submit?id=${id}`);
+}
+
+/** 到货确认 */
+export function confirmTransfer(id: number) {
+  return requestClient.put(`/mes/wm/transfer/confirm?id=${id}`);
+}
+
+/** 执行上架 */
+export function stockTransfer(id: number) {
+  return requestClient.put(`/mes/wm/transfer/stock?id=${id}`);
+}
+
+/** 完成转移 */
+export function finishTransfer(id: number) {
+  return requestClient.put(`/mes/wm/transfer/finish?id=${id}`);
+}
+
+/** 取消转移单 */
+export function cancelTransfer(id: number) {
+  return requestClient.put(`/mes/wm/transfer/cancel?id=${id}`);
+}
+
+/** 导出转移单 */
+export function exportTransfer(params: any) {
+  return requestClient.download('/mes/wm/transfer/export-excel', { params });
+}
diff --git a/apps/web-antd/src/api/mes/wm/transfer/line/index.ts b/apps/web-antd/src/api/mes/wm/transfer/line/index.ts
new file mode 100644
index 000000000..9ec7b5ea9
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/transfer/line/index.ts
@@ -0,0 +1,55 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesWmTransferLineApi {
+  /** MES 转移单行 */
+  export interface TransferLine {
+    id?: number; // 编号
+    transferId?: number; // 转移单编号
+    materialStockId?: number; // 库存台账编号
+    itemId?: number; // 物料产品编号
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    specification?: string; // 规格型号
+    unitMeasureName?: string; // 单位名称
+    quantity?: number; // 转移数量
+    batchId?: number; // 批次编号
+    batchCode?: string; // 批次号
+    fromWarehouseId?: number; // 移出仓库编号
+    fromWarehouseName?: string; // 移出仓库名称
+    fromLocationId?: number; // 移出库区编号
+    fromLocationName?: string; // 移出库区名称
+    fromAreaId?: number; // 移出库位编号
+    fromAreaName?: string; // 移出库位名称
+    remark?: string; // 备注
+  }
+}
+
+/** 查询转移单行列表 */
+export function getTransferLineList(transferId: number) {
+  return requestClient.get<MesWmTransferLineApi.TransferLine[]>(
+    '/mes/wm/transfer-line/list',
+    { params: { transferId } },
+  );
+}
+
+/** 查询转移单行详情 */
+export function getTransferLine(id: number) {
+  return requestClient.get<MesWmTransferLineApi.TransferLine>(
+    `/mes/wm/transfer-line/get?id=${id}`,
+  );
+}
+
+/** 新增转移单行 */
+export function createTransferLine(data: MesWmTransferLineApi.TransferLine) {
+  return requestClient.post('/mes/wm/transfer-line/create', data);
+}
+
+/** 修改转移单行 */
+export function updateTransferLine(data: MesWmTransferLineApi.TransferLine) {
+  return requestClient.put('/mes/wm/transfer-line/update', data);
+}
+
+/** 删除转移单行 */
+export function deleteTransferLine(id: number) {
+  return requestClient.delete(`/mes/wm/transfer-line/delete?id=${id}`);
+}
diff --git a/apps/web-antd/src/views/mes/home/data.ts b/apps/web-antd/src/views/mes/home/data.ts
new file mode 100644
index 000000000..381016f1c
--- /dev/null
+++ b/apps/web-antd/src/views/mes/home/data.ts
@@ -0,0 +1,89 @@
+import type { MesHomeApi } from '#/api/mes/home';
+
+import { MesProWorkOrderStatusEnum } from '#/views/mes/utils/constants';
+
+/** 首页汇总统计默认值 */
+export const defaultSummary: MesHomeApi.Summary = {
+  andonActiveCount: 0,
+  machineryMaintenance: 0,
+  machineryProducing: 0,
+  machineryStop: 0,
+  machineryTotal: 0,
+  repairActiveCount: 0,
+  todayOutput: 0,
+  todayQualifiedQuantity: 0,
+  todayUnqualifiedQuantity: 0,
+  workOrderActiveCount: 0,
+  workOrderFinishedCount: 0,
+  workOrderPrepareCount: 0,
+  yesterdayOutput: 0,
+};
+
+/** 工单状态对应的颜色映射 */
+export const WORK_ORDER_STATUS_COLOR_MAP: Record<number, string> = {
+  [MesProWorkOrderStatusEnum.PREPARE]: '#909399', // 草稿
+  [MesProWorkOrderStatusEnum.CONFIRMED]: '#409EFF', // 已确认
+  [MesProWorkOrderStatusEnum.FINISHED]: '#67C23A', // 已完成
+  [MesProWorkOrderStatusEnum.CANCELED]: '#F56C6C', // 已取消
+};
+
+/** 生产趋势折线图配置 */
+export function getProductionTrendChartOptions(
+  dates: string[],
+  quantities: number[],
+  qualified: number[],
+  unqualified: number[],
+): any {
+  return {
+    grid: { bottom: 40, left: 50, right: 20, top: 20 },
+    legend: { bottom: 0, data: ['产量', '合格品', '不良品'] },
+    series: [
+      {
+        areaStyle: { color: 'rgba(64,158,255,0.15)' },
+        data: quantities,
+        itemStyle: { color: '#409EFF' },
+        name: '产量',
+        smooth: true,
+        type: 'line',
+      },
+      {
+        data: qualified,
+        itemStyle: { color: '#67C23A' },
+        name: '合格品',
+        smooth: true,
+        type: 'line',
+      },
+      {
+        data: unqualified,
+        itemStyle: { color: '#F56C6C' },
+        name: '不良品',
+        smooth: true,
+        type: 'line',
+      },
+    ],
+    tooltip: { axisPointer: { type: 'cross' }, trigger: 'axis' },
+    xAxis: { boundaryGap: false, data: dates, type: 'category' },
+    yAxis: { minInterval: 1, type: 'value' },
+  };
+}
+
+/** 工单状态分布饼图配置 */
+export function getWorkOrderStatusChartOptions(
+  data: Array<{ itemStyle: { color: string }; name: string; value: number }>,
+): any {
+  return {
+    legend: { bottom: 0, type: 'scroll' },
+    series: [
+      {
+        avoidLabelOverlap: true,
+        data,
+        emphasis: { label: { fontSize: 14, fontWeight: 'bold', show: true } },
+        itemStyle: { borderColor: '#fff', borderRadius: 6, borderWidth: 2 },
+        label: { formatter: '{b}\n{c}', show: true },
+        radius: ['40%', '70%'],
+        type: 'pie',
+      },
+    ],
+    tooltip: { formatter: '{b}: {c} ({d}%)', trigger: 'item' },
+  };
+}
diff --git a/apps/web-antd/src/views/mes/home/index.vue b/apps/web-antd/src/views/mes/home/index.vue
new file mode 100644
index 000000000..ec59771be
--- /dev/null
+++ b/apps/web-antd/src/views/mes/home/index.vue
@@ -0,0 +1,70 @@
+<script lang="ts" setup>
+import type { MesHomeApi } from '#/api/mes/home';
+
+import { onMounted, ref } from 'vue';
+import { useRouter } from 'vue-router';
+
+import { DocAlert, Page } from '@vben/common-ui';
+
+import { Col, Row } from 'ant-design-vue';
+
+import { getHomeSummary } from '#/api/mes/home';
+
+import { defaultSummary } from './data';
+import AlertPanel from './modules/alert-panel.vue';
+import KpiCards from './modules/kpi-cards.vue';
+import ProductionTrend from './modules/production-trend.vue';
+import Shortcuts from './modules/shortcuts.vue';
+import WorkOrderChart from './modules/work-order-chart.vue';
+
+const router = useRouter();
+const summary = ref<MesHomeApi.Summary>(defaultSummary); // 首页汇总统计
+
+/** 跳转到目标页面（按路由 name） */
+function handleNavigate(name: string) {
+  router.push({ name });
+}
+
+/** 加载首页汇总统计 */
+async function loadSummary() {
+  summary.value = await getHomeSummary();
+}
+
+onMounted(() => {
+  loadSummary();
+});
+</script>
+
+<template>
+  <Page>
+    <template #doc>
+      <DocAlert
+        title="MES 手册（功能开启）"
+        url="https://doc.iocoder.cn/mes/build/"
+      />
+    </template>
+
+    <!-- 第一行：核心 KPI 汇总卡片 -->
+    <KpiCards :summary="summary" class="mb-4" @navigate="handleNavigate" />
+
+    <!-- 第二行：生产趋势 + 待办异常 -->
+    <Row :gutter="16" class="mb-4">
+      <Col :lg="16" :md="24" :sm="24" :xl="16" :xs="24" class="mb-4">
+        <ProductionTrend />
+      </Col>
+      <Col :lg="8" :md="24" :sm="24" :xl="8" :xs="24" class="mb-4">
+        <AlertPanel :summary="summary" @navigate="handleNavigate" />
+      </Col>
+    </Row>
+
+    <!-- 第三行：工单分布 + 快捷入口 -->
+    <Row :gutter="16">
+      <Col :lg="12" :md="24" :sm="24" :xl="12" :xs="24" class="mb-4">
+        <WorkOrderChart />
+      </Col>
+      <Col :lg="12" :md="24" :sm="24" :xl="12" :xs="24" class="mb-4">
+        <Shortcuts @navigate="handleNavigate" />
+      </Col>
+    </Row>
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/mes/home/modules/alert-panel.vue b/apps/web-antd/src/views/mes/home/modules/alert-panel.vue
new file mode 100644
index 000000000..ffc31ca03
--- /dev/null
+++ b/apps/web-antd/src/views/mes/home/modules/alert-panel.vue
@@ -0,0 +1,72 @@
+<script lang="ts" setup>
+import type { MesHomeApi } from '#/api/mes/home';
+
+import { computed } from 'vue';
+
+import { IconifyIcon } from '@vben/icons';
+
+import { Badge, Card } from 'ant-design-vue';
+
+defineOptions({ name: 'MesHomeAlertPanel' });
+
+const props = defineProps<{
+  summary: MesHomeApi.Summary;
+}>();
+
+const emit = defineEmits<{
+  navigate: [name: string];
+}>();
+
+/** 待办提醒列表：标签、描述、图标、目标路由名称、数量 */
+const alertItems = computed(() => [
+  {
+    count: props.summary.andonActiveCount,
+    desc: '未处置的安灯呼叫',
+    icon: 'lucide:bell-ring',
+    iconClass: 'bg-red-50 text-red-500',
+    label: '安灯报警',
+    routeName: 'MesProAndonRecord',
+  },
+  {
+    count: props.summary.repairActiveCount,
+    desc: '待处理的维修工单',
+    icon: 'lucide:wrench',
+    iconClass: 'bg-orange-50 text-orange-500',
+    label: '设备维修',
+    routeName: 'MesDvRepair',
+  },
+  {
+    count: props.summary.workOrderPrepareCount,
+    desc: '草稿状态的生产工单',
+    icon: 'lucide:clipboard-list',
+    iconClass: 'bg-blue-50 text-blue-500',
+    label: '待排产工单',
+    routeName: 'MesProWorkOrder',
+  },
+]);
+</script>
+
+<template>
+  <Card title="待办与异常" class="h-full">
+    <div class="flex flex-col">
+      <div
+        v-for="item in alertItems"
+        :key="item.label"
+        class="hover:bg-accent flex cursor-pointer items-center gap-3 border-b px-2 py-4 transition-colors last:border-b-0"
+        @click="emit('navigate', item.routeName)"
+      >
+        <div
+          class="flex size-10 flex-shrink-0 items-center justify-center rounded-lg"
+          :class="item.iconClass"
+        >
+          <IconifyIcon class="size-5" :icon="item.icon" />
+        </div>
+        <div class="flex flex-1 flex-col gap-0.5">
+          <span class="text-sm font-medium">{{ item.label }}</span>
+          <span class="text-muted-foreground text-xs">{{ item.desc }}</span>
+        </div>
+        <Badge :count="item.count" :show-zero="false" />
+      </div>
+    </div>
+  </Card>
+</template>
diff --git a/apps/web-antd/src/views/mes/home/modules/kpi-cards.vue b/apps/web-antd/src/views/mes/home/modules/kpi-cards.vue
new file mode 100644
index 000000000..c92a8968d
--- /dev/null
+++ b/apps/web-antd/src/views/mes/home/modules/kpi-cards.vue
@@ -0,0 +1,174 @@
+<script lang="ts" setup>
+import type { MesHomeApi } from '#/api/mes/home';
+
+import { computed } from 'vue';
+
+import { CountTo } from '@vben/common-ui';
+import { IconifyIcon } from '@vben/icons';
+
+import { Card, Col, Divider, Row } from 'ant-design-vue';
+
+defineOptions({ name: 'MesHomeKpiCards' });
+
+const props = defineProps<{
+  summary: MesHomeApi.Summary;
+}>();
+
+const emit = defineEmits<{
+  navigate: [name: string];
+}>();
+
+/** 是否有质量数据（合格品 + 不良品 > 0） */
+const hasQualityData = computed(
+  () =>
+    props.summary.todayQualifiedQuantity +
+      props.summary.todayUnqualifiedQuantity >
+    0,
+);
+
+/** 质量合格率 = 合格品 / (合格品 + 不良品) * 100，无数据时为 0 */
+const qualityRate = computed(() => {
+  const total =
+    props.summary.todayQualifiedQuantity +
+    props.summary.todayUnqualifiedQuantity;
+  if (total === 0) {
+    return 0;
+  }
+  return (props.summary.todayQualifiedQuantity / total) * 100;
+});
+</script>
+
+<template>
+  <Row :gutter="16">
+    <Col :lg="6" :md="12" :sm="12" :xl="6" :xs="24" class="mb-4">
+      <Card
+        class="kpi-card cursor-pointer transition-all hover:-translate-y-1 hover:shadow-lg"
+        @click="emit('navigate', 'MesProWorkOrder')"
+      >
+        <div class="flex items-center gap-4">
+          <div
+            class="flex size-14 flex-shrink-0 items-center justify-center rounded-xl text-white"
+            style="background: linear-gradient(135deg, #409eff, #66b1ff)"
+          >
+            <IconifyIcon class="size-7" icon="lucide:file-text" />
+          </div>
+          <div>
+            <div class="text-muted-foreground mb-1 text-sm">生产工单</div>
+            <div class="flex items-baseline gap-1">
+              <CountTo
+                class="text-2xl font-bold leading-tight text-[#409eff]"
+                :end-val="summary.workOrderActiveCount"
+                :duration="1500"
+              />
+              <span class="text-muted-foreground text-xs">进行中</span>
+            </div>
+            <div class="text-muted-foreground mt-1 text-xs">
+              <span>待排产 {{ summary.workOrderPrepareCount }}</span>
+              <Divider type="vertical" />
+              <span>已完成 {{ summary.workOrderFinishedCount }}</span>
+            </div>
+          </div>
+        </div>
+      </Card>
+    </Col>
+    <Col :lg="6" :md="12" :sm="12" :xl="6" :xs="24" class="mb-4">
+      <Card
+        class="kpi-card cursor-pointer transition-all hover:-translate-y-1 hover:shadow-lg"
+        @click="emit('navigate', 'MesProFeedback')"
+      >
+        <div class="flex items-center gap-4">
+          <div
+            class="flex size-14 flex-shrink-0 items-center justify-center rounded-xl text-white"
+            style="background: linear-gradient(135deg, #67c23a, #85ce61)"
+          >
+            <IconifyIcon class="size-7" icon="lucide:bar-chart-3" />
+          </div>
+          <div>
+            <div class="text-muted-foreground mb-1 text-sm">今日产量</div>
+            <div class="flex items-baseline gap-1">
+              <CountTo
+                class="text-2xl font-bold leading-tight text-[#67c23a]"
+                :end-val="summary.todayOutput"
+                :duration="1500"
+              />
+              <span class="text-muted-foreground text-xs">件</span>
+            </div>
+            <div class="text-muted-foreground mt-1 text-xs">
+              <span>昨日 {{ summary.yesterdayOutput }} 件</span>
+            </div>
+          </div>
+        </div>
+      </Card>
+    </Col>
+    <Col :lg="6" :md="12" :sm="12" :xl="6" :xs="24" class="mb-4">
+      <Card
+        class="kpi-card cursor-pointer transition-all hover:-translate-y-1 hover:shadow-lg"
+        @click="emit('navigate', 'MesProFeedback')"
+      >
+        <div class="flex items-center gap-4">
+          <div
+            class="flex size-14 flex-shrink-0 items-center justify-center rounded-xl text-white"
+            style="background: linear-gradient(135deg, #e6a23c, #ebb563)"
+          >
+            <IconifyIcon class="size-7" icon="lucide:circle-check" />
+          </div>
+          <div>
+            <div class="text-muted-foreground mb-1 text-sm">质量合格率</div>
+            <div class="flex items-baseline gap-1">
+              <CountTo
+                class="text-2xl font-bold leading-tight text-[#e6a23c]"
+                :decimals="1"
+                :end-val="qualityRate"
+                :duration="1500"
+              />
+              <span class="text-muted-foreground text-xs">%</span>
+            </div>
+            <div class="text-muted-foreground mt-1 text-xs">
+              <template v-if="hasQualityData">
+                <span>合格 {{ summary.todayQualifiedQuantity }}</span>
+                <Divider type="vertical" />
+                <span>不良 {{ summary.todayUnqualifiedQuantity }}</span>
+              </template>
+              <span v-else>暂无数据</span>
+            </div>
+          </div>
+        </div>
+      </Card>
+    </Col>
+    <Col :lg="6" :md="12" :sm="12" :xl="6" :xs="24" class="mb-4">
+      <Card
+        class="kpi-card cursor-pointer transition-all hover:-translate-y-1 hover:shadow-lg"
+        @click="emit('navigate', 'MesDvMachinery')"
+      >
+        <div class="flex items-center gap-4">
+          <div
+            class="flex size-14 flex-shrink-0 items-center justify-center rounded-xl text-white"
+            style="background: linear-gradient(135deg, #7c3aed, #9461f5)"
+          >
+            <IconifyIcon class="size-7" icon="lucide:cpu" />
+          </div>
+          <div>
+            <div class="text-muted-foreground mb-1 text-sm">设备状态</div>
+            <div class="flex items-baseline gap-1">
+              <CountTo
+                class="text-2xl font-bold leading-tight text-[#7c3aed]"
+                :end-val="summary.machineryProducing"
+                :duration="1500"
+              />
+              <span class="text-muted-foreground text-xs">
+                / {{ summary.machineryTotal }} 运行中
+              </span>
+            </div>
+            <div class="text-muted-foreground mt-1 text-xs">
+              <span class="text-red-400">停机 {{ summary.machineryStop }}</span>
+              <Divider type="vertical" />
+              <span class="text-orange-400">
+                维护 {{ summary.machineryMaintenance }}
+              </span>
+            </div>
+          </div>
+        </div>
+      </Card>
+    </Col>
+  </Row>
+</template>
diff --git a/apps/web-antd/src/views/mes/home/modules/production-trend.vue b/apps/web-antd/src/views/mes/home/modules/production-trend.vue
new file mode 100644
index 000000000..6890abc1d
--- /dev/null
+++ b/apps/web-antd/src/views/mes/home/modules/production-trend.vue
@@ -0,0 +1,56 @@
+<script lang="ts" setup>
+import type { EchartsUIType } from '@vben/plugins/echarts';
+
+import { onMounted, ref } from 'vue';
+
+import { EchartsUI, useEcharts } from '@vben/plugins/echarts';
+
+import { Card, RadioButton, RadioGroup } from 'ant-design-vue';
+
+import { getProductionTrend } from '#/api/mes/home';
+
+import { getProductionTrendChartOptions } from '../data';
+
+defineOptions({ name: 'MesHomeProductionTrend' });
+
+const trendDays = ref(7); // 当前选中的天数范围
+const chartRef = ref<EchartsUIType>();
+const { renderEcharts } = useEcharts(chartRef);
+
+/** 加载生产趋势数据并渲染图表 */
+async function loadData() {
+  const data = await getProductionTrend(trendDays.value);
+  const dates = data.map((d) => d.date.slice(5));
+  const quantities = data.map((d) => d.quantity);
+  const qualified = data.map((d) => d.qualifiedQuantity);
+  const unqualified = data.map((d) => d.unqualifiedQuantity);
+  await renderEcharts(
+    getProductionTrendChartOptions(dates, quantities, qualified, unqualified),
+  );
+}
+
+/** 切换天数范围 */
+function handleDaysChange() {
+  loadData();
+}
+
+onMounted(() => {
+  loadData();
+});
+</script>
+
+<template>
+  <Card title="生产趋势" class="h-full">
+    <template #extra>
+      <RadioGroup
+        v-model:value="trendDays"
+        size="small"
+        @change="handleDaysChange"
+      >
+        <RadioButton :value="7">近 7 天</RadioButton>
+        <RadioButton :value="30">近 30 天</RadioButton>
+      </RadioGroup>
+    </template>
+    <EchartsUI ref="chartRef" class="h-[320px] w-full" />
+  </Card>
+</template>
diff --git a/apps/web-antd/src/views/mes/home/modules/shortcuts.vue b/apps/web-antd/src/views/mes/home/modules/shortcuts.vue
new file mode 100644
index 000000000..f2d4b7ae3
--- /dev/null
+++ b/apps/web-antd/src/views/mes/home/modules/shortcuts.vue
@@ -0,0 +1,90 @@
+<script lang="ts" setup>
+import { IconifyIcon } from '@vben/icons';
+
+import { Card, Col, Row } from 'ant-design-vue';
+
+defineOptions({ name: 'MesHomeShortcuts' });
+
+const emit = defineEmits<{
+  navigate: [name: string];
+}>();
+
+/** 快捷入口列表，3×3 网格布局与工单状态分布面板等高 */
+const shortcuts = [
+  {
+    bgColor: '#409EFF',
+    icon: 'lucide:file-text',
+    name: '生产工单',
+    routeName: 'MesProWorkOrder',
+  },
+  {
+    bgColor: '#67C23A',
+    icon: 'lucide:edit',
+    name: '生产报工',
+    routeName: 'MesProFeedback',
+  },
+  {
+    bgColor: '#E6A23C',
+    icon: 'lucide:search',
+    name: '质量检验',
+    routeName: 'MesQcIqc',
+  },
+  {
+    bgColor: '#F56C6C',
+    icon: 'lucide:box',
+    name: '库存查询',
+    routeName: 'MesWmMaterialStock',
+  },
+  {
+    bgColor: '#7c3aed',
+    icon: 'lucide:cpu',
+    name: '设备管理',
+    routeName: 'MesDvMachinery',
+  },
+  {
+    bgColor: '#0ea5e9',
+    icon: 'lucide:list',
+    name: '生产任务',
+    routeName: 'MesProTask',
+  },
+  {
+    bgColor: '#14b8a6',
+    icon: 'lucide:truck',
+    name: '到货通知',
+    routeName: 'MesWmArrivalNotice',
+  },
+  {
+    bgColor: '#f59e0b',
+    icon: 'lucide:settings-2',
+    name: '设备维修',
+    routeName: 'MesDvRepair',
+  },
+  {
+    bgColor: '#ec4899',
+    icon: 'lucide:tickets',
+    name: '流转卡',
+    routeName: 'MesProCard',
+  },
+];
+</script>
+
+<template>
+  <Card title="快捷入口" class="h-full">
+    <Row :gutter="16">
+      <Col v-for="item in shortcuts" :key="item.name" :span="8" class="mb-4">
+        <div
+          class="hover:bg-accent flex cursor-pointer flex-col items-center gap-2 rounded-lg py-3 transition-all hover:-translate-y-0.5"
+          @click="emit('navigate', item.routeName)"
+        >
+          <div
+            class="flex size-12 items-center justify-center rounded-xl text-white"
+            :style="{ background: item.bgColor }"
+          >
+            <IconifyIcon class="size-6" :icon="item.icon" />
+          </div>
+          <span class="text-sm">{{ item.name }}</span>
+        </div>
+      </Col>
+    </Row>
+  </Card>
+</template>
diff --git a/apps/web-antd/src/views/mes/home/modules/work-order-chart.vue b/apps/web-antd/src/views/mes/home/modules/work-order-chart.vue
new file mode 100644
index 000000000..244bda2db
--- /dev/null
+++ b/apps/web-antd/src/views/mes/home/modules/work-order-chart.vue
@@ -0,0 +1,39 @@
+<script lang="ts" setup>
+import type { EchartsUIType } from '@vben/plugins/echarts';
+
+import { onMounted, ref } from 'vue';
+
+import { EchartsUI, useEcharts } from '@vben/plugins/echarts';
+
+import { Card } from 'ant-design-vue';
+
+import { getWorkOrderStatusDistribution } from '#/api/mes/home';
+
+import { getWorkOrderStatusChartOptions, WORK_ORDER_STATUS_COLOR_MAP } from '../data';
+
+defineOptions({ name: 'MesHomeWorkOrderChart' });
+
+const chartRef = ref<EchartsUIType>();
+const { renderEcharts } = useEcharts(chartRef);
+
+/** 加载工单状态分布数据并渲染饼图 */
+async function loadData() {
+  const data = await getWorkOrderStatusDistribution();
+  const chartData = data.map((d) => ({
+    itemStyle: { color: WORK_ORDER_STATUS_COLOR_MAP[d.status] || '#409EFF' },
+    name: d.statusName,
+    value: d.count,
+  }));
+  await renderEcharts(getWorkOrderStatusChartOptions(chartData));
+}
+
+onMounted(() => {
+  loadData();
+});
+</script>
+
+<template>
+  <Card title="工单状态分布" class="h-full">
+    <EchartsUI ref="chartRef" class="h-[280px] w-full" />
+  </Card>
+</template>
diff --git a/apps/web-ele/src/api/mes/home/index.ts b/apps/web-ele/src/api/mes/home/index.ts
new file mode 100644
index 000000000..cf1aa9953
--- /dev/null
+++ b/apps/web-ele/src/api/mes/home/index.ts
@@ -0,0 +1,55 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesHomeApi {
+  /** MES 首页汇总统计 */
+  export interface Summary {
+    workOrderActiveCount: number; // 进行中工单数
+    workOrderPrepareCount: number; // 待排产工单数
+    workOrderFinishedCount: number; // 已完成工单数
+    todayOutput: number; // 今日产量
+    yesterdayOutput: number; // 昨日产量
+    todayQualifiedQuantity: number; // 今日合格品数
+    todayUnqualifiedQuantity: number; // 今日不良品数
+    machineryTotal: number; // 设备总数
+    machineryProducing: number; // 生产中设备数
+    machineryStop: number; // 停机设备数
+    machineryMaintenance: number; // 维护中设备数
+    andonActiveCount: number; // 未处置安灯呼叫数
+    repairActiveCount: number; // 待处理维修工单数
+  }
+
+  /** MES 工单状态分布 */
+  export interface WorkOrderStatus {
+    status: number; // 工单状态
+    statusName: string; // 工单状态名称
+    count: number; // 数量
+  }
+
+  /** MES 生产趋势 */
+  export interface ProductionTrend {
+    date: string; // 日期
+    quantity: number; // 产量
+    qualifiedQuantity: number; // 合格品数
+    unqualifiedQuantity: number; // 不良品数
+  }
+}
+
+/** 获得首页汇总统计 */
+export function getHomeSummary() {
+  return requestClient.get<MesHomeApi.Summary>('/mes/home-statistics/summary');
+}
+
+/** 获得工单状态分布 */
+export function getWorkOrderStatusDistribution() {
+  return requestClient.get<MesHomeApi.WorkOrderStatus[]>(
+    '/mes/home-statistics/work-order-status',
+  );
+}
+
+/** 获得生产趋势 */
+export function getProductionTrend(days?: number) {
+  return requestClient.get<MesHomeApi.ProductionTrend[]>(
+    '/mes/home-statistics/production-trend',
+    { params: { days } },
+  );
+}
diff --git a/apps/web-ele/src/api/mes/wm/transfer/detail/index.ts b/apps/web-ele/src/api/mes/wm/transfer/detail/index.ts
new file mode 100644
index 000000000..ff215d92c
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/transfer/detail/index.ts
@@ -0,0 +1,59 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesWmTransferDetailApi {
+  /** MES 调拨明细 */
+  export interface TransferDetail {
+    id?: number; // 编号
+    lineId?: number; // 转移单行编号
+    transferId?: number; // 转移单编号
+    itemId?: number; // 物料产品编号
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    specification?: string; // 规格型号
+    unitMeasureName?: string; // 单位名称
+    quantity?: number; // 数量
+    batchId?: number; // 批次编号
+    batchCode?: string; // 批次号
+    toWarehouseId?: number; // 移入仓库编号
+    toWarehouseName?: string; // 移入仓库名称
+    toLocationId?: number; // 移入库区编号
+    toLocationName?: string; // 移入库区名称
+    toAreaId?: number; // 移入库位编号
+    toAreaName?: string; // 移入库位名称
+    remark?: string; // 备注
+  }
+}
+
+/** 查询调拨明细列表（按行编号） */
+export function getTransferDetailListByLineId(lineId: number) {
+  return requestClient.get<MesWmTransferDetailApi.TransferDetail[]>(
+    '/mes/wm/transfer-detail/list-by-line',
+    { params: { lineId } },
+  );
+}
+
+/** 查询调拨明细详情 */
+export function getTransferDetail(id: number) {
+  return requestClient.get<MesWmTransferDetailApi.TransferDetail>(
+    `/mes/wm/transfer-detail/get?id=${id}`,
+  );
+}
+
+/** 新增调拨明细 */
+export function createTransferDetail(
+  data: MesWmTransferDetailApi.TransferDetail,
+) {
+  return requestClient.post('/mes/wm/transfer-detail/create', data);
+}
+
+/** 修改调拨明细 */
+export function updateTransferDetail(
+  data: MesWmTransferDetailApi.TransferDetail,
+) {
+  return requestClient.put('/mes/wm/transfer-detail/update', data);
+}
+
+/** 删除调拨明细 */
+export function deleteTransferDetail(id: number) {
+  return requestClient.delete(`/mes/wm/transfer-detail/delete?id=${id}`);
+}
diff --git a/apps/web-ele/src/api/mes/wm/transfer/index.ts b/apps/web-ele/src/api/mes/wm/transfer/index.ts
new file mode 100644
index 000000000..14d9b860f
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/transfer/index.ts
@@ -0,0 +1,92 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmTransferApi {
+  /** MES 转移单 */
+  export interface Transfer {
+    id?: number; // 编号
+    code?: string; // 转移单编号
+    name?: string; // 转移单名称
+    type?: number; // 转移单类型
+    deliveryFlag?: boolean; // 是否配送
+    recipientName?: string; // 收货人
+    recipientTelephone?: string; // 联系电话
+    destinationAddress?: string; // 目的地
+    carrier?: string; // 承运商
+    shippingNumber?: string; // 运输单号
+    confirmFlag?: boolean; // 是否确认
+    transferDate?: string; // 转移日期
+    status?: number; // 单据状态
+    remark?: string; // 备注
+    createTime?: number; // 创建时间
+  }
+
+  /** MES 转移单分页查询参数 */
+  export interface PageParams extends PageParam {
+    code?: string;
+    name?: string;
+    type?: number;
+    status?: number;
+  }
+}
+
+/** 查询转移单分页 */
+export function getTransferPage(params: MesWmTransferApi.PageParams) {
+  return requestClient.get<PageResult<MesWmTransferApi.Transfer>>(
+    '/mes/wm/transfer/page',
+    { params },
+  );
+}
+
+/** 查询转移单详情 */
+export function getTransfer(id: number) {
+  return requestClient.get<MesWmTransferApi.Transfer>(
+    `/mes/wm/transfer/get?id=${id}`,
+  );
+}
+
+/** 新增转移单 */
+export function createTransfer(data: MesWmTransferApi.Transfer) {
+  return requestClient.post<number>('/mes/wm/transfer/create', data);
+}
+
+/** 修改转移单 */
+export function updateTransfer(data: MesWmTransferApi.Transfer) {
+  return requestClient.put('/mes/wm/transfer/update', data);
+}
+
+/** 删除转移单 */
+export function deleteTransfer(id: number) {
+  return requestClient.delete(`/mes/wm/transfer/delete?id=${id}`);
+}
+
+/** 提交转移单 */
+export function submitTransfer(id: number) {
+  return requestClient.put(`/mes/wm/transfer/submit?id=${id}`);
+}
+
+/** 到货确认 */
+export function confirmTransfer(id: number) {
+  return requestClient.put(`/mes/wm/transfer/confirm?id=${id}`);
+}
+
+/** 执行上架 */
+export function stockTransfer(id: number) {
+  return requestClient.put(`/mes/wm/transfer/stock?id=${id}`);
+}
+
+/** 完成转移 */
+export function finishTransfer(id: number) {
+  return requestClient.put(`/mes/wm/transfer/finish?id=${id}`);
+}
+
+/** 取消转移单 */
+export function cancelTransfer(id: number) {
+  return requestClient.put(`/mes/wm/transfer/cancel?id=${id}`);
+}
+
+/** 导出转移单 */
+export function exportTransfer(params: any) {
+  return requestClient.download('/mes/wm/transfer/export-excel', { params });
+}
diff --git a/apps/web-ele/src/api/mes/wm/transfer/line/index.ts b/apps/web-ele/src/api/mes/wm/transfer/line/index.ts
new file mode 100644
index 000000000..9ec7b5ea9
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/transfer/line/index.ts
@@ -0,0 +1,55 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesWmTransferLineApi {
+  /** MES 转移单行 */
+  export interface TransferLine {
+    id?: number; // 编号
+    transferId?: number; // 转移单编号
+    materialStockId?: number; // 库存台账编号
+    itemId?: number; // 物料产品编号
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    specification?: string; // 规格型号
+    unitMeasureName?: string; // 单位名称
+    quantity?: number; // 转移数量
+    batchId?: number; // 批次编号
+    batchCode?: string; // 批次号
+    fromWarehouseId?: number; // 移出仓库编号
+    fromWarehouseName?: string; // 移出仓库名称
+    fromLocationId?: number; // 移出库区编号
+    fromLocationName?: string; // 移出库区名称
+    fromAreaId?: number; // 移出库位编号
+    fromAreaName?: string; // 移出库位名称
+    remark?: string; // 备注
+  }
+}
+
+/** 查询转移单行列表 */
+export function getTransferLineList(transferId: number) {
+  return requestClient.get<MesWmTransferLineApi.TransferLine[]>(
+    '/mes/wm/transfer-line/list',
+    { params: { transferId } },
+  );
+}
+
+/** 查询转移单行详情 */
+export function getTransferLine(id: number) {
+  return requestClient.get<MesWmTransferLineApi.TransferLine>(
+    `/mes/wm/transfer-line/get?id=${id}`,
+  );
+}
+
+/** 新增转移单行 */
+export function createTransferLine(data: MesWmTransferLineApi.TransferLine) {
+  return requestClient.post('/mes/wm/transfer-line/create', data);
+}
+
+/** 修改转移单行 */
+export function updateTransferLine(data: MesWmTransferLineApi.TransferLine) {
+  return requestClient.put('/mes/wm/transfer-line/update', data);
+}
+
+/** 删除转移单行 */
+export function deleteTransferLine(id: number) {
+  return requestClient.delete(`/mes/wm/transfer-line/delete?id=${id}`);
+}

From a237758516e014f20d7b5c82856003f83e7566ec Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 30 May 2026 13:22:16 +0800
Subject: [PATCH 46/52] =?UTF-8?q?feat(mes):=20=E8=BF=81=E7=A7=BB=20home=20?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-ele/src/views/mes/home/data.ts       |  89 +++++++++
 apps/web-ele/src/views/mes/home/index.vue     |  70 +++++++
 .../views/mes/home/modules/alert-panel.vue    |  72 +++++++
 .../src/views/mes/home/modules/kpi-cards.vue  | 178 ++++++++++++++++++
 .../mes/home/modules/production-trend.vue     |  59 ++++++
 .../src/views/mes/home/modules/shortcuts.vue  |  90 +++++++++
 .../mes/home/modules/work-order-chart.vue     |  39 ++++
 7 files changed, 597 insertions(+)
 create mode 100644 apps/web-ele/src/views/mes/home/data.ts
 create mode 100644 apps/web-ele/src/views/mes/home/index.vue
 create mode 100644 apps/web-ele/src/views/mes/home/modules/alert-panel.vue
 create mode 100644 apps/web-ele/src/views/mes/home/modules/kpi-cards.vue
 create mode 100644 apps/web-ele/src/views/mes/home/modules/production-trend.vue
 create mode 100644 apps/web-ele/src/views/mes/home/modules/shortcuts.vue
 create mode 100644 apps/web-ele/src/views/mes/home/modules/work-order-chart.vue

diff --git a/apps/web-ele/src/views/mes/home/data.ts b/apps/web-ele/src/views/mes/home/data.ts
new file mode 100644
index 000000000..381016f1c
--- /dev/null
+++ b/apps/web-ele/src/views/mes/home/data.ts
@@ -0,0 +1,89 @@
+import type { MesHomeApi } from '#/api/mes/home';
+
+import { MesProWorkOrderStatusEnum } from '#/views/mes/utils/constants';
+
+/** 首页汇总统计默认值 */
+export const defaultSummary: MesHomeApi.Summary = {
+  andonActiveCount: 0,
+  machineryMaintenance: 0,
+  machineryProducing: 0,
+  machineryStop: 0,
+  machineryTotal: 0,
+  repairActiveCount: 0,
+  todayOutput: 0,
+  todayQualifiedQuantity: 0,
+  todayUnqualifiedQuantity: 0,
+  workOrderActiveCount: 0,
+  workOrderFinishedCount: 0,
+  workOrderPrepareCount: 0,
+  yesterdayOutput: 0,
+};
+
+/** 工单状态对应的颜色映射 */
+export const WORK_ORDER_STATUS_COLOR_MAP: Record<number, string> = {
+  [MesProWorkOrderStatusEnum.PREPARE]: '#909399', // 草稿
+  [MesProWorkOrderStatusEnum.CONFIRMED]: '#409EFF', // 已确认
+  [MesProWorkOrderStatusEnum.FINISHED]: '#67C23A', // 已完成
+  [MesProWorkOrderStatusEnum.CANCELED]: '#F56C6C', // 已取消
+};
+
+/** 生产趋势折线图配置 */
+export function getProductionTrendChartOptions(
+  dates: string[],
+  quantities: number[],
+  qualified: number[],
+  unqualified: number[],
+): any {
+  return {
+    grid: { bottom: 40, left: 50, right: 20, top: 20 },
+    legend: { bottom: 0, data: ['产量', '合格品', '不良品'] },
+    series: [
+      {
+        areaStyle: { color: 'rgba(64,158,255,0.15)' },
+        data: quantities,
+        itemStyle: { color: '#409EFF' },
+        name: '产量',
+        smooth: true,
+        type: 'line',
+      },
+      {
+        data: qualified,
+        itemStyle: { color: '#67C23A' },
+        name: '合格品',
+        smooth: true,
+        type: 'line',
+      },
+      {
+        data: unqualified,
+        itemStyle: { color: '#F56C6C' },
+        name: '不良品',
+        smooth: true,
+        type: 'line',
+      },
+    ],
+    tooltip: { axisPointer: { type: 'cross' }, trigger: 'axis' },
+    xAxis: { boundaryGap: false, data: dates, type: 'category' },
+    yAxis: { minInterval: 1, type: 'value' },
+  };
+}
+
+/** 工单状态分布饼图配置 */
+export function getWorkOrderStatusChartOptions(
+  data: Array<{ itemStyle: { color: string }; name: string; value: number }>,
+): any {
+  return {
+    legend: { bottom: 0, type: 'scroll' },
+    series: [
+      {
+        avoidLabelOverlap: true,
+        data,
+        emphasis: { label: { fontSize: 14, fontWeight: 'bold', show: true } },
+        itemStyle: { borderColor: '#fff', borderRadius: 6, borderWidth: 2 },
+        label: { formatter: '{b}\n{c}', show: true },
+        radius: ['40%', '70%'],
+        type: 'pie',
+      },
+    ],
+    tooltip: { formatter: '{b}: {c} ({d}%)', trigger: 'item' },
+  };
+}
diff --git a/apps/web-ele/src/views/mes/home/index.vue b/apps/web-ele/src/views/mes/home/index.vue
new file mode 100644
index 000000000..bcaf9b771
--- /dev/null
+++ b/apps/web-ele/src/views/mes/home/index.vue
@@ -0,0 +1,70 @@
+<script lang="ts" setup>
+import type { MesHomeApi } from '#/api/mes/home';
+
+import { onMounted, ref } from 'vue';
+import { useRouter } from 'vue-router';
+
+import { DocAlert, Page } from '@vben/common-ui';
+
+import { ElCol, ElRow } from 'element-plus';
+
+import { getHomeSummary } from '#/api/mes/home';
+
+import { defaultSummary } from './data';
+import AlertPanel from './modules/alert-panel.vue';
+import KpiCards from './modules/kpi-cards.vue';
+import ProductionTrend from './modules/production-trend.vue';
+import Shortcuts from './modules/shortcuts.vue';
+import WorkOrderChart from './modules/work-order-chart.vue';
+
+const router = useRouter();
+const summary = ref<MesHomeApi.Summary>(defaultSummary); // 首页汇总统计
+
+/** 跳转到目标页面（按路由 name） */
+function handleNavigate(name: string) {
+  router.push({ name });
+}
+
+/** 加载首页汇总统计 */
+async function loadSummary() {
+  summary.value = await getHomeSummary();
+}
+
+onMounted(() => {
+  loadSummary();
+});
+</script>
+
+<template>
+  <Page>
+    <template #doc>
+      <DocAlert
+        title="MES 手册（功能开启）"
+        url="https://doc.iocoder.cn/mes/build/"
+      />
+    </template>
+
+    <!-- 第一行：核心 KPI 汇总卡片 -->
+    <KpiCards :summary="summary" class="mb-4" @navigate="handleNavigate" />
+
+    <!-- 第二行：生产趋势 + 待办异常 -->
+    <ElRow :gutter="16" class="mb-4">
+      <ElCol :lg="16" :md="24" :sm="24" :xl="16" :xs="24" class="mb-4">
+        <ProductionTrend />
+      </ElCol>
+      <ElCol :lg="8" :md="24" :sm="24" :xl="8" :xs="24" class="mb-4">
+        <AlertPanel :summary="summary" @navigate="handleNavigate" />
+      </ElCol>
+    </ElRow>
+
+    <!-- 第三行：工单分布 + 快捷入口 -->
+    <ElRow :gutter="16">
+      <ElCol :lg="12" :md="24" :sm="24" :xl="12" :xs="24" class="mb-4">
+        <WorkOrderChart />
+      </ElCol>
+      <ElCol :lg="12" :md="24" :sm="24" :xl="12" :xs="24" class="mb-4">
+        <Shortcuts @navigate="handleNavigate" />
+      </ElCol>
+    </ElRow>
+  </Page>
+</template>
diff --git a/apps/web-ele/src/views/mes/home/modules/alert-panel.vue b/apps/web-ele/src/views/mes/home/modules/alert-panel.vue
new file mode 100644
index 000000000..c758a0dae
--- /dev/null
+++ b/apps/web-ele/src/views/mes/home/modules/alert-panel.vue
@@ -0,0 +1,72 @@
+<script lang="ts" setup>
+import type { MesHomeApi } from '#/api/mes/home';
+
+import { computed } from 'vue';
+
+import { IconifyIcon } from '@vben/icons';
+
+import { ElBadge, ElCard } from 'element-plus';
+
+defineOptions({ name: 'MesHomeAlertPanel' });
+
+const props = defineProps<{
+  summary: MesHomeApi.Summary;
+}>();
+
+const emit = defineEmits<{
+  navigate: [name: string];
+}>();
+
+/** 待办提醒列表：标签、描述、图标、目标路由名称、数量 */
+const alertItems = computed(() => [
+  {
+    count: props.summary.andonActiveCount,
+    desc: '未处置的安灯呼叫',
+    icon: 'lucide:bell-ring',
+    iconClass: 'bg-red-50 text-red-500',
+    label: '安灯报警',
+    routeName: 'MesProAndonRecord',
+  },
+  {
+    count: props.summary.repairActiveCount,
+    desc: '待处理的维修工单',
+    icon: 'lucide:wrench',
+    iconClass: 'bg-orange-50 text-orange-500',
+    label: '设备维修',
+    routeName: 'MesDvRepair',
+  },
+  {
+    count: props.summary.workOrderPrepareCount,
+    desc: '草稿状态的生产工单',
+    icon: 'lucide:clipboard-list',
+    iconClass: 'bg-blue-50 text-blue-500',
+    label: '待排产工单',
+    routeName: 'MesProWorkOrder',
+  },
+]);
+</script>
+
+<template>
+  <ElCard header="待办与异常" class="h-full">
+    <div class="flex flex-col">
+      <div
+        v-for="item in alertItems"
+        :key="item.label"
+        class="hover:bg-accent flex cursor-pointer items-center gap-3 border-b px-2 py-4 transition-colors last:border-b-0"
+        @click="emit('navigate', item.routeName)"
+      >
+        <div
+          class="flex size-10 flex-shrink-0 items-center justify-center rounded-lg"
+          :class="item.iconClass"
+        >
+          <IconifyIcon class="size-5" :icon="item.icon" />
+        </div>
+        <div class="flex flex-1 flex-col gap-0.5">
+          <span class="text-sm font-medium">{{ item.label }}</span>
+          <span class="text-muted-foreground text-xs">{{ item.desc }}</span>
+        </div>
+        <ElBadge :value="item.count" :hidden="!item.count" />
+      </div>
+    </div>
+  </ElCard>
+</template>
diff --git a/apps/web-ele/src/views/mes/home/modules/kpi-cards.vue b/apps/web-ele/src/views/mes/home/modules/kpi-cards.vue
new file mode 100644
index 000000000..6e3f94418
--- /dev/null
+++ b/apps/web-ele/src/views/mes/home/modules/kpi-cards.vue
@@ -0,0 +1,178 @@
+<script lang="ts" setup>
+import type { MesHomeApi } from '#/api/mes/home';
+
+import { computed } from 'vue';
+
+import { CountTo } from '@vben/common-ui';
+import { IconifyIcon } from '@vben/icons';
+
+import { ElCard, ElCol, ElDivider, ElRow } from 'element-plus';
+
+defineOptions({ name: 'MesHomeKpiCards' });
+
+const props = defineProps<{
+  summary: MesHomeApi.Summary;
+}>();
+
+const emit = defineEmits<{
+  navigate: [name: string];
+}>();
+
+/** 是否有质量数据（合格品 + 不良品 > 0） */
+const hasQualityData = computed(
+  () =>
+    props.summary.todayQualifiedQuantity +
+      props.summary.todayUnqualifiedQuantity >
+    0,
+);
+
+/** 质量合格率 = 合格品 / (合格品 + 不良品) * 100，无数据时为 0 */
+const qualityRate = computed(() => {
+  const total =
+    props.summary.todayQualifiedQuantity +
+    props.summary.todayUnqualifiedQuantity;
+  if (total === 0) {
+    return 0;
+  }
+  return (props.summary.todayQualifiedQuantity / total) * 100;
+});
+</script>
+
+<template>
+  <ElRow :gutter="16">
+    <ElCol :lg="6" :md="12" :sm="12" :xl="6" :xs="24" class="mb-4">
+      <ElCard
+        shadow="hover"
+        class="kpi-card cursor-pointer transition-all hover:-translate-y-1"
+        @click="emit('navigate', 'MesProWorkOrder')"
+      >
+        <div class="flex items-center gap-4">
+          <div
+            class="flex size-14 flex-shrink-0 items-center justify-center rounded-xl text-white"
+            style="background: linear-gradient(135deg, #409eff, #66b1ff)"
+          >
+            <IconifyIcon class="size-7" icon="lucide:file-text" />
+          </div>
+          <div>
+            <div class="text-muted-foreground mb-1 text-sm">生产工单</div>
+            <div class="flex items-baseline gap-1">
+              <CountTo
+                class="text-2xl font-bold leading-tight text-[#409eff]"
+                :end-val="summary.workOrderActiveCount"
+                :duration="1500"
+              />
+              <span class="text-muted-foreground text-xs">进行中</span>
+            </div>
+            <div class="text-muted-foreground mt-1 text-xs">
+              <span>待排产 {{ summary.workOrderPrepareCount }}</span>
+              <ElDivider direction="vertical" />
+              <span>已完成 {{ summary.workOrderFinishedCount }}</span>
+            </div>
+          </div>
+        </div>
+      </ElCard>
+    </ElCol>
+    <ElCol :lg="6" :md="12" :sm="12" :xl="6" :xs="24" class="mb-4">
+      <ElCard
+        shadow="hover"
+        class="kpi-card cursor-pointer transition-all hover:-translate-y-1"
+        @click="emit('navigate', 'MesProFeedback')"
+      >
+        <div class="flex items-center gap-4">
+          <div
+            class="flex size-14 flex-shrink-0 items-center justify-center rounded-xl text-white"
+            style="background: linear-gradient(135deg, #67c23a, #85ce61)"
+          >
+            <IconifyIcon class="size-7" icon="lucide:bar-chart-3" />
+          </div>
+          <div>
+            <div class="text-muted-foreground mb-1 text-sm">今日产量</div>
+            <div class="flex items-baseline gap-1">
+              <CountTo
+                class="text-2xl font-bold leading-tight text-[#67c23a]"
+                :end-val="summary.todayOutput"
+                :duration="1500"
+              />
+              <span class="text-muted-foreground text-xs">件</span>
+            </div>
+            <div class="text-muted-foreground mt-1 text-xs">
+              <span>昨日 {{ summary.yesterdayOutput }} 件</span>
+            </div>
+          </div>
+        </div>
+      </ElCard>
+    </ElCol>
+    <ElCol :lg="6" :md="12" :sm="12" :xl="6" :xs="24" class="mb-4">
+      <ElCard
+        shadow="hover"
+        class="kpi-card cursor-pointer transition-all hover:-translate-y-1"
+        @click="emit('navigate', 'MesProFeedback')"
+      >
+        <div class="flex items-center gap-4">
+          <div
+            class="flex size-14 flex-shrink-0 items-center justify-center rounded-xl text-white"
+            style="background: linear-gradient(135deg, #e6a23c, #ebb563)"
+          >
+            <IconifyIcon class="size-7" icon="lucide:circle-check" />
+          </div>
+          <div>
+            <div class="text-muted-foreground mb-1 text-sm">质量合格率</div>
+            <div class="flex items-baseline gap-1">
+              <CountTo
+                class="text-2xl font-bold leading-tight text-[#e6a23c]"
+                :decimals="1"
+                :end-val="qualityRate"
+                :duration="1500"
+              />
+              <span class="text-muted-foreground text-xs">%</span>
+            </div>
+            <div class="text-muted-foreground mt-1 text-xs">
+              <template v-if="hasQualityData">
+                <span>合格 {{ summary.todayQualifiedQuantity }}</span>
+                <ElDivider direction="vertical" />
+                <span>不良 {{ summary.todayUnqualifiedQuantity }}</span>
+              </template>
+              <span v-else>暂无数据</span>
+            </div>
+          </div>
+        </div>
+      </ElCard>
+    </ElCol>
+    <ElCol :lg="6" :md="12" :sm="12" :xl="6" :xs="24" class="mb-4">
+      <ElCard
+        shadow="hover"
+        class="kpi-card cursor-pointer transition-all hover:-translate-y-1"
+        @click="emit('navigate', 'MesDvMachinery')"
+      >
+        <div class="flex items-center gap-4">
+          <div
+            class="flex size-14 flex-shrink-0 items-center justify-center rounded-xl text-white"
+            style="background: linear-gradient(135deg, #7c3aed, #9461f5)"
+          >
+            <IconifyIcon class="size-7" icon="lucide:cpu" />
+          </div>
+          <div>
+            <div class="text-muted-foreground mb-1 text-sm">设备状态</div>
+            <div class="flex items-baseline gap-1">
+              <CountTo
+                class="text-2xl font-bold leading-tight text-[#7c3aed]"
+                :end-val="summary.machineryProducing"
+                :duration="1500"
+              />
+              <span class="text-muted-foreground text-xs">
+                / {{ summary.machineryTotal }} 运行中
+              </span>
+            </div>
+            <div class="text-muted-foreground mt-1 text-xs">
+              <span class="text-red-400">停机 {{ summary.machineryStop }}</span>
+              <ElDivider direction="vertical" />
+              <span class="text-orange-400">
+                维护 {{ summary.machineryMaintenance }}
+              </span>
+            </div>
+          </div>
+        </div>
+      </ElCard>
+    </ElCol>
+  </ElRow>
+</template>
diff --git a/apps/web-ele/src/views/mes/home/modules/production-trend.vue b/apps/web-ele/src/views/mes/home/modules/production-trend.vue
new file mode 100644
index 000000000..caa128456
--- /dev/null
+++ b/apps/web-ele/src/views/mes/home/modules/production-trend.vue
@@ -0,0 +1,59 @@
+<script lang="ts" setup>
+import type { EchartsUIType } from '@vben/plugins/echarts';
+
+import { onMounted, ref } from 'vue';
+
+import { EchartsUI, useEcharts } from '@vben/plugins/echarts';
+
+import { ElCard, ElRadioButton, ElRadioGroup } from 'element-plus';
+
+import { getProductionTrend } from '#/api/mes/home';
+
+import { getProductionTrendChartOptions } from '../data';
+
+defineOptions({ name: 'MesHomeProductionTrend' });
+
+const trendDays = ref(7); // 当前选中的天数范围
+const chartRef = ref<EchartsUIType>();
+const { renderEcharts } = useEcharts(chartRef);
+
+/** 加载生产趋势数据并渲染图表 */
+async function loadData() {
+  const data = await getProductionTrend(trendDays.value);
+  const dates = data.map((d) => d.date.slice(5));
+  const quantities = data.map((d) => d.quantity);
+  const qualified = data.map((d) => d.qualifiedQuantity);
+  const unqualified = data.map((d) => d.unqualifiedQuantity);
+  await renderEcharts(
+    getProductionTrendChartOptions(dates, quantities, qualified, unqualified),
+  );
+}
+
+/** 切换天数范围 */
+function handleDaysChange() {
+  loadData();
+}
+
+onMounted(() => {
+  loadData();
+});
+</script>
+
+<template>
+  <ElCard class="h-full">
+    <template #header>
+      <div class="flex items-center justify-between">
+        <span class="font-medium">生产趋势</span>
+        <ElRadioGroup
+          v-model="trendDays"
+          size="small"
+          @change="handleDaysChange"
+        >
+          <ElRadioButton :value="7">近 7 天</ElRadioButton>
+          <ElRadioButton :value="30">近 30 天</ElRadioButton>
+        </ElRadioGroup>
+      </div>
+    </template>
+    <EchartsUI ref="chartRef" class="h-[320px] w-full" />
+  </ElCard>
+</template>
diff --git a/apps/web-ele/src/views/mes/home/modules/shortcuts.vue b/apps/web-ele/src/views/mes/home/modules/shortcuts.vue
new file mode 100644
index 000000000..3ffcb9064
--- /dev/null
+++ b/apps/web-ele/src/views/mes/home/modules/shortcuts.vue
@@ -0,0 +1,90 @@
+<script lang="ts" setup>
+import { IconifyIcon } from '@vben/icons';
+
+import { ElCard, ElCol, ElRow } from 'element-plus';
+
+defineOptions({ name: 'MesHomeShortcuts' });
+
+const emit = defineEmits<{
+  navigate: [name: string];
+}>();
+
+/** 快捷入口列表，3×3 网格布局与工单状态分布面板等高 */
+const shortcuts = [
+  {
+    bgColor: '#409EFF',
+    icon: 'lucide:file-text',
+    name: '生产工单',
+    routeName: 'MesProWorkOrder',
+  },
+  {
+    bgColor: '#67C23A',
+    icon: 'lucide:edit',
+    name: '生产报工',
+    routeName: 'MesProFeedback',
+  },
+  {
+    bgColor: '#E6A23C',
+    icon: 'lucide:search',
+    name: '质量检验',
+    routeName: 'MesQcIqc',
+  },
+  {
+    bgColor: '#F56C6C',
+    icon: 'lucide:box',
+    name: '库存查询',
+    routeName: 'MesWmMaterialStock',
+  },
+  {
+    bgColor: '#7c3aed',
+    icon: 'lucide:cpu',
+    name: '设备管理',
+    routeName: 'MesDvMachinery',
+  },
+  {
+    bgColor: '#0ea5e9',
+    icon: 'lucide:list',
+    name: '生产任务',
+    routeName: 'MesProTask',
+  },
+  {
+    bgColor: '#14b8a6',
+    icon: 'lucide:truck',
+    name: '到货通知',
+    routeName: 'MesWmArrivalNotice',
+  },
+  {
+    bgColor: '#f59e0b',
+    icon: 'lucide:settings-2',
+    name: '设备维修',
+    routeName: 'MesDvRepair',
+  },
+  {
+    bgColor: '#ec4899',
+    icon: 'lucide:tickets',
+    name: '流转卡',
+    routeName: 'MesProCard',
+  },
+];
+</script>
+
+<template>
+  <ElCard header="快捷入口" class="h-full">
+    <ElRow :gutter="16">
+      <ElCol v-for="item in shortcuts" :key="item.name" :span="8" class="mb-4">
+        <div
+          class="hover:bg-accent flex cursor-pointer flex-col items-center gap-2 rounded-lg py-3 transition-all hover:-translate-y-0.5"
+          @click="emit('navigate', item.routeName)"
+        >
+          <div
+            class="flex size-12 items-center justify-center rounded-xl text-white"
+            :style="{ background: item.bgColor }"
+          >
+            <IconifyIcon class="size-6" :icon="item.icon" />
+          </div>
+          <span class="text-sm">{{ item.name }}</span>
+        </div>
+      </ElCol>
+    </ElRow>
+  </ElCard>
+</template>
diff --git a/apps/web-ele/src/views/mes/home/modules/work-order-chart.vue b/apps/web-ele/src/views/mes/home/modules/work-order-chart.vue
new file mode 100644
index 000000000..366a3072f
--- /dev/null
+++ b/apps/web-ele/src/views/mes/home/modules/work-order-chart.vue
@@ -0,0 +1,39 @@
+<script lang="ts" setup>
+import type { EchartsUIType } from '@vben/plugins/echarts';
+
+import { onMounted, ref } from 'vue';
+
+import { EchartsUI, useEcharts } from '@vben/plugins/echarts';
+
+import { ElCard } from 'element-plus';
+
+import { getWorkOrderStatusDistribution } from '#/api/mes/home';
+
+import { getWorkOrderStatusChartOptions, WORK_ORDER_STATUS_COLOR_MAP } from '../data';
+
+defineOptions({ name: 'MesHomeWorkOrderChart' });
+
+const chartRef = ref<EchartsUIType>();
+const { renderEcharts } = useEcharts(chartRef);
+
+/** 加载工单状态分布数据并渲染饼图 */
+async function loadData() {
+  const data = await getWorkOrderStatusDistribution();
+  const chartData = data.map((d) => ({
+    itemStyle: { color: WORK_ORDER_STATUS_COLOR_MAP[d.status] || '#409EFF' },
+    name: d.statusName,
+    value: d.count,
+  }));
+  await renderEcharts(getWorkOrderStatusChartOptions(chartData));
+}
+
+onMounted(() => {
+  loadData();
+});
+</script>
+
+<template>
+  <ElCard header="工单状态分布" class="h-full">
+    <EchartsUI ref="chartRef" class="h-[280px] w-full" />
+  </ElCard>
+</template>

From 7d75ab8d8ea26276e50d6eee6c06abf3b633dd1e Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 30 May 2026 13:23:19 +0800
Subject: [PATCH 47/52] =?UTF-8?q?feat(mes):=20=E8=BF=81=E7=A7=BB=20home=20?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=EF=BC=88=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/mes/home/chart-options.ts       | 60 +++++++++++++++++++
 .../src/views/mes/home/chart-options.ts       | 60 +++++++++++++++++++
 2 files changed, 120 insertions(+)
 create mode 100644 apps/web-antd/src/views/mes/home/chart-options.ts
 create mode 100644 apps/web-ele/src/views/mes/home/chart-options.ts

diff --git a/apps/web-antd/src/views/mes/home/chart-options.ts b/apps/web-antd/src/views/mes/home/chart-options.ts
new file mode 100644
index 000000000..f2390563a
--- /dev/null
+++ b/apps/web-antd/src/views/mes/home/chart-options.ts
@@ -0,0 +1,60 @@
+/** 生产趋势折线图配置 */
+export function getProductionTrendChartOptions(
+  dates: string[],
+  quantities: number[],
+  qualified: number[],
+  unqualified: number[],
+): any {
+  return {
+    grid: { bottom: 40, left: 50, right: 20, top: 20 },
+    legend: { bottom: 0, data: ['产量', '合格品', '不良品'] },
+    series: [
+      {
+        areaStyle: { color: 'rgba(64,158,255,0.15)' },
+        data: quantities,
+        itemStyle: { color: '#409EFF' },
+        name: '产量',
+        smooth: true,
+        type: 'line',
+      },
+      {
+        data: qualified,
+        itemStyle: { color: '#67C23A' },
+        name: '合格品',
+        smooth: true,
+        type: 'line',
+      },
+      {
+        data: unqualified,
+        itemStyle: { color: '#F56C6C' },
+        name: '不良品',
+        smooth: true,
+        type: 'line',
+      },
+    ],
+    tooltip: { axisPointer: { type: 'cross' }, trigger: 'axis' },
+    xAxis: { boundaryGap: false, data: dates, type: 'category' },
+    yAxis: { minInterval: 1, type: 'value' },
+  };
+}
+
+/** 工单状态分布饼图配置 */
+export function getWorkOrderStatusChartOptions(
+  data: Array<{ itemStyle: { color: string }; name: string; value: number }>,
+): any {
+  return {
+    legend: { bottom: 0, type: 'scroll' },
+    series: [
+      {
+        avoidLabelOverlap: true,
+        data,
+        emphasis: { label: { fontSize: 14, fontWeight: 'bold', show: true } },
+        itemStyle: { borderColor: '#fff', borderRadius: 6, borderWidth: 2 },
+        label: { formatter: '{b}\n{c}', show: true },
+        radius: ['40%', '70%'],
+        type: 'pie',
+      },
+    ],
+    tooltip: { formatter: '{b}: {c} ({d}%)', trigger: 'item' },
+  };
+}
diff --git a/apps/web-ele/src/views/mes/home/chart-options.ts b/apps/web-ele/src/views/mes/home/chart-options.ts
new file mode 100644
index 000000000..f2390563a
--- /dev/null
+++ b/apps/web-ele/src/views/mes/home/chart-options.ts
@@ -0,0 +1,60 @@
+/** 生产趋势折线图配置 */
+export function getProductionTrendChartOptions(
+  dates: string[],
+  quantities: number[],
+  qualified: number[],
+  unqualified: number[],
+): any {
+  return {
+    grid: { bottom: 40, left: 50, right: 20, top: 20 },
+    legend: { bottom: 0, data: ['产量', '合格品', '不良品'] },
+    series: [
+      {
+        areaStyle: { color: 'rgba(64,158,255,0.15)' },
+        data: quantities,
+        itemStyle: { color: '#409EFF' },
+        name: '产量',
+        smooth: true,
+        type: 'line',
+      },
+      {
+        data: qualified,
+        itemStyle: { color: '#67C23A' },
+        name: '合格品',
+        smooth: true,
+        type: 'line',
+      },
+      {
+        data: unqualified,
+        itemStyle: { color: '#F56C6C' },
+        name: '不良品',
+        smooth: true,
+        type: 'line',
+      },
+    ],
+    tooltip: { axisPointer: { type: 'cross' }, trigger: 'axis' },
+    xAxis: { boundaryGap: false, data: dates, type: 'category' },
+    yAxis: { minInterval: 1, type: 'value' },
+  };
+}
+
+/** 工单状态分布饼图配置 */
+export function getWorkOrderStatusChartOptions(
+  data: Array<{ itemStyle: { color: string }; name: string; value: number }>,
+): any {
+  return {
+    legend: { bottom: 0, type: 'scroll' },
+    series: [
+      {
+        avoidLabelOverlap: true,
+        data,
+        emphasis: { label: { fontSize: 14, fontWeight: 'bold', show: true } },
+        itemStyle: { borderColor: '#fff', borderRadius: 6, borderWidth: 2 },
+        label: { formatter: '{b}\n{c}', show: true },
+        radius: ['40%', '70%'],
+        type: 'pie',
+      },
+    ],
+    tooltip: { formatter: '{b}: {c} ({d}%)', trigger: 'item' },
+  };
+}

From dd4b7e045a35b6ce25e3d8f070cd919fd642e1a7 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 30 May 2026 13:23:41 +0800
Subject: [PATCH 48/52] =?UTF-8?q?feat(mes):=20=E8=BF=81=E7=A7=BB=20home=20?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=EF=BC=88=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/views/mes/home/data.ts      | 61 -------------------
 .../mes/home/modules/production-trend.vue     |  2 +-
 .../mes/home/modules/work-order-chart.vue     |  3 +-
 apps/web-ele/src/views/mes/home/data.ts       | 61 -------------------
 .../mes/home/modules/production-trend.vue     |  2 +-
 .../mes/home/modules/work-order-chart.vue     |  3 +-
 6 files changed, 6 insertions(+), 126 deletions(-)

diff --git a/apps/web-antd/src/views/mes/home/data.ts b/apps/web-antd/src/views/mes/home/data.ts
index 381016f1c..eaa1f27e7 100644
--- a/apps/web-antd/src/views/mes/home/data.ts
+++ b/apps/web-antd/src/views/mes/home/data.ts
@@ -26,64 +26,3 @@ export const WORK_ORDER_STATUS_COLOR_MAP: Record<number, string> = {
   [MesProWorkOrderStatusEnum.FINISHED]: '#67C23A', // 已完成
   [MesProWorkOrderStatusEnum.CANCELED]: '#F56C6C', // 已取消
 };
-
-/** 生产趋势折线图配置 */
-export function getProductionTrendChartOptions(
-  dates: string[],
-  quantities: number[],
-  qualified: number[],
-  unqualified: number[],
-): any {
-  return {
-    grid: { bottom: 40, left: 50, right: 20, top: 20 },
-    legend: { bottom: 0, data: ['产量', '合格品', '不良品'] },
-    series: [
-      {
-        areaStyle: { color: 'rgba(64,158,255,0.15)' },
-        data: quantities,
-        itemStyle: { color: '#409EFF' },
-        name: '产量',
-        smooth: true,
-        type: 'line',
-      },
-      {
-        data: qualified,
-        itemStyle: { color: '#67C23A' },
-        name: '合格品',
-        smooth: true,
-        type: 'line',
-      },
-      {
-        data: unqualified,
-        itemStyle: { color: '#F56C6C' },
-        name: '不良品',
-        smooth: true,
-        type: 'line',
-      },
-    ],
-    tooltip: { axisPointer: { type: 'cross' }, trigger: 'axis' },
-    xAxis: { boundaryGap: false, data: dates, type: 'category' },
-    yAxis: { minInterval: 1, type: 'value' },
-  };
-}
-
-/** 工单状态分布饼图配置 */
-export function getWorkOrderStatusChartOptions(
-  data: Array<{ itemStyle: { color: string }; name: string; value: number }>,
-): any {
-  return {
-    legend: { bottom: 0, type: 'scroll' },
-    series: [
-      {
-        avoidLabelOverlap: true,
-        data,
-        emphasis: { label: { fontSize: 14, fontWeight: 'bold', show: true } },
-        itemStyle: { borderColor: '#fff', borderRadius: 6, borderWidth: 2 },
-        label: { formatter: '{b}\n{c}', show: true },
-        radius: ['40%', '70%'],
-        type: 'pie',
-      },
-    ],
-    tooltip: { formatter: '{b}: {c} ({d}%)', trigger: 'item' },
-  };
-}
diff --git a/apps/web-antd/src/views/mes/home/modules/production-trend.vue b/apps/web-antd/src/views/mes/home/modules/production-trend.vue
index 6890abc1d..4441514c4 100644
--- a/apps/web-antd/src/views/mes/home/modules/production-trend.vue
+++ b/apps/web-antd/src/views/mes/home/modules/production-trend.vue
@@ -9,7 +9,7 @@ import { Card, RadioButton, RadioGroup } from 'ant-design-vue';
 
 import { getProductionTrend } from '#/api/mes/home';
 
-import { getProductionTrendChartOptions } from '../data';
+import { getProductionTrendChartOptions } from '../chart-options';
 
 defineOptions({ name: 'MesHomeProductionTrend' });
 
diff --git a/apps/web-antd/src/views/mes/home/modules/work-order-chart.vue b/apps/web-antd/src/views/mes/home/modules/work-order-chart.vue
index 244bda2db..c04f63425 100644
--- a/apps/web-antd/src/views/mes/home/modules/work-order-chart.vue
+++ b/apps/web-antd/src/views/mes/home/modules/work-order-chart.vue
@@ -9,7 +9,8 @@ import { Card } from 'ant-design-vue';
 
 import { getWorkOrderStatusDistribution } from '#/api/mes/home';
 
-import { getWorkOrderStatusChartOptions, WORK_ORDER_STATUS_COLOR_MAP } from '../data';
+import { getWorkOrderStatusChartOptions } from '../chart-options';
+import { WORK_ORDER_STATUS_COLOR_MAP } from '../data';
 
 defineOptions({ name: 'MesHomeWorkOrderChart' });
 
diff --git a/apps/web-ele/src/views/mes/home/data.ts b/apps/web-ele/src/views/mes/home/data.ts
index 381016f1c..eaa1f27e7 100644
--- a/apps/web-ele/src/views/mes/home/data.ts
+++ b/apps/web-ele/src/views/mes/home/data.ts
@@ -26,64 +26,3 @@ export const WORK_ORDER_STATUS_COLOR_MAP: Record<number, string> = {
   [MesProWorkOrderStatusEnum.FINISHED]: '#67C23A', // 已完成
   [MesProWorkOrderStatusEnum.CANCELED]: '#F56C6C', // 已取消
 };
-
-/** 生产趋势折线图配置 */
-export function getProductionTrendChartOptions(
-  dates: string[],
-  quantities: number[],
-  qualified: number[],
-  unqualified: number[],
-): any {
-  return {
-    grid: { bottom: 40, left: 50, right: 20, top: 20 },
-    legend: { bottom: 0, data: ['产量', '合格品', '不良品'] },
-    series: [
-      {
-        areaStyle: { color: 'rgba(64,158,255,0.15)' },
-        data: quantities,
-        itemStyle: { color: '#409EFF' },
-        name: '产量',
-        smooth: true,
-        type: 'line',
-      },
-      {
-        data: qualified,
-        itemStyle: { color: '#67C23A' },
-        name: '合格品',
-        smooth: true,
-        type: 'line',
-      },
-      {
-        data: unqualified,
-        itemStyle: { color: '#F56C6C' },
-        name: '不良品',
-        smooth: true,
-        type: 'line',
-      },
-    ],
-    tooltip: { axisPointer: { type: 'cross' }, trigger: 'axis' },
-    xAxis: { boundaryGap: false, data: dates, type: 'category' },
-    yAxis: { minInterval: 1, type: 'value' },
-  };
-}
-
-/** 工单状态分布饼图配置 */
-export function getWorkOrderStatusChartOptions(
-  data: Array<{ itemStyle: { color: string }; name: string; value: number }>,
-): any {
-  return {
-    legend: { bottom: 0, type: 'scroll' },
-    series: [
-      {
-        avoidLabelOverlap: true,
-        data,
-        emphasis: { label: { fontSize: 14, fontWeight: 'bold', show: true } },
-        itemStyle: { borderColor: '#fff', borderRadius: 6, borderWidth: 2 },
-        label: { formatter: '{b}\n{c}', show: true },
-        radius: ['40%', '70%'],
-        type: 'pie',
-      },
-    ],
-    tooltip: { formatter: '{b}: {c} ({d}%)', trigger: 'item' },
-  };
-}
diff --git a/apps/web-ele/src/views/mes/home/modules/production-trend.vue b/apps/web-ele/src/views/mes/home/modules/production-trend.vue
index caa128456..840650ec3 100644
--- a/apps/web-ele/src/views/mes/home/modules/production-trend.vue
+++ b/apps/web-ele/src/views/mes/home/modules/production-trend.vue
@@ -9,7 +9,7 @@ import { ElCard, ElRadioButton, ElRadioGroup } from 'element-plus';
 
 import { getProductionTrend } from '#/api/mes/home';
 
-import { getProductionTrendChartOptions } from '../data';
+import { getProductionTrendChartOptions } from '../chart-options';
 
 defineOptions({ name: 'MesHomeProductionTrend' });
 
diff --git a/apps/web-ele/src/views/mes/home/modules/work-order-chart.vue b/apps/web-ele/src/views/mes/home/modules/work-order-chart.vue
index 366a3072f..38527bd0b 100644
--- a/apps/web-ele/src/views/mes/home/modules/work-order-chart.vue
+++ b/apps/web-ele/src/views/mes/home/modules/work-order-chart.vue
@@ -9,7 +9,8 @@ import { ElCard } from 'element-plus';
 
 import { getWorkOrderStatusDistribution } from '#/api/mes/home';
 
-import { getWorkOrderStatusChartOptions, WORK_ORDER_STATUS_COLOR_MAP } from '../data';
+import { getWorkOrderStatusChartOptions } from '../chart-options';
+import { WORK_ORDER_STATUS_COLOR_MAP } from '../data';
 
 defineOptions({ name: 'MesHomeWorkOrderChart' });
 

From c8deb9e91e6955587ad8614c47f82d4fa09b8a51 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 30 May 2026 13:24:04 +0800
Subject: [PATCH 49/52] =?UTF-8?q?feat(mes):=20=E8=BF=81=E7=A7=BB=20wm=20tr?=
 =?UTF-8?q?ansfer=20=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/mes/wm/transfer/data.ts         | 645 +++++++++++++++++
 .../src/views/mes/wm/transfer/index.vue       | 223 ++++++
 .../mes/wm/transfer/modules/detail-form.vue   | 103 +++
 .../mes/wm/transfer/modules/detail-list.vue   | 101 +++
 .../views/mes/wm/transfer/modules/form.vue    | 255 +++++++
 .../mes/wm/transfer/modules/line-form.vue     | 102 +++
 .../mes/wm/transfer/modules/line-list.vue     | 226 ++++++
 .../web-ele/src/views/mes/wm/transfer/data.ts | 647 ++++++++++++++++++
 .../mes/wm/transfer/modules/detail-form.vue   | 103 +++
 .../mes/wm/transfer/modules/detail-list.vue   | 103 +++
 .../mes/wm/transfer/modules/line-form.vue     | 102 +++
 .../mes/wm/transfer/modules/line-list.vue     | 227 ++++++
 12 files changed, 2837 insertions(+)
 create mode 100644 apps/web-antd/src/views/mes/wm/transfer/data.ts
 create mode 100644 apps/web-antd/src/views/mes/wm/transfer/index.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/transfer/modules/detail-form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/transfer/modules/detail-list.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/transfer/modules/form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/transfer/modules/line-form.vue
 create mode 100644 apps/web-antd/src/views/mes/wm/transfer/modules/line-list.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/transfer/data.ts
 create mode 100644 apps/web-ele/src/views/mes/wm/transfer/modules/detail-form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/transfer/modules/detail-list.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/transfer/modules/line-form.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/transfer/modules/line-list.vue

diff --git a/apps/web-antd/src/views/mes/wm/transfer/data.ts b/apps/web-antd/src/views/mes/wm/transfer/data.ts
new file mode 100644
index 000000000..41caadaec
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/transfer/data.ts
@@ -0,0 +1,645 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmMaterialStockApi } from '#/api/mes/wm/materialstock';
+import type { MesWmTransferApi } from '#/api/mes/wm/transfer';
+import type { MesWmTransferDetailApi } from '#/api/mes/wm/transfer/detail';
+import type { MesWmTransferLineApi } from '#/api/mes/wm/transfer/line';
+
+import { h, markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { Button } from 'ant-design-vue';
+
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { MdItemSelect } from '#/views/mes/md/item/components';
+import {
+  MesAutoCodeRuleCode,
+  MesWmTransferTypeEnum,
+} from '#/views/mes/utils/constants';
+import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
+import {
+  WmWarehouseAreaSelect,
+  WmWarehouseLocationSelect,
+  WmWarehouseSelect,
+} from '#/views/mes/wm/warehouse/components';
+
+/** 表单类型 */
+export type FormType =
+  | 'confirm'
+  | 'create'
+  | 'detail'
+  | 'finish'
+  | 'stock'
+  | 'update';
+
+/** 表头是否只读（上架、确认、执行、详情态） */
+function isHeaderReadonly(formType: FormType): boolean {
+  return ['confirm', 'detail', 'finish', 'stock'].includes(formType);
+}
+
+/** 新增/修改的表单 */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  const headerReadonly = isHeaderReadonly(formType);
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'status',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '转移单编号',
+      component: 'Input',
+      componentProps: {
+        disabled: headerReadonly,
+        placeholder: '请输入转移单编号',
+      },
+      rules: 'required',
+      suffix:
+        formType === 'create' || formType === 'update'
+          ? () =>
+              h(
+                Button,
+                {
+                  type: 'default',
+                  onClick: async () => {
+                    const code = await generateAutoCode(
+                      MesAutoCodeRuleCode.TRANSFER_CODE,
+                    );
+                    await formApi?.setFieldValue('code', code);
+                  },
+                },
+                { default: () => '生成' },
+              )
+          : undefined,
+    },
+    {
+      fieldName: 'name',
+      label: '转移单名称',
+      component: 'Input',
+      componentProps: {
+        disabled: headerReadonly,
+        placeholder: '请输入转移单名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'type',
+      label: '转移单类型',
+      component: 'Select',
+      componentProps: {
+        disabled: headerReadonly,
+        options: getDictOptions(DICT_TYPE.MES_WM_TRANSFER_TYPE, 'number'),
+        placeholder: '请选择转移单类型',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'transferDate',
+      label: '转移日期',
+      component: 'DatePicker',
+      componentProps: {
+        class: '!w-full',
+        disabled: headerReadonly,
+        format: 'YYYY-MM-DD',
+        placeholder: '请选择转移日期',
+        valueFormat: 'YYYY-MM-DD 00:00:00',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'deliveryFlag',
+      label: '是否配送',
+      component: 'Switch',
+      componentProps: {
+        disabled: headerReadonly,
+      },
+      dependencies: {
+        triggerFields: ['type'],
+        show: (values) => values.type === MesWmTransferTypeEnum.OUTER,
+      },
+    },
+    {
+      fieldName: 'confirmFlag',
+      label: '是否确认',
+      component: 'Switch',
+      componentProps: {
+        disabled: true,
+      },
+      dependencies: {
+        triggerFields: ['type'],
+        show: (values) => values.type === MesWmTransferTypeEnum.OUTER,
+      },
+    },
+    {
+      fieldName: 'recipientName',
+      label: '收货人',
+      component: 'Input',
+      componentProps: {
+        disabled: headerReadonly,
+        placeholder: '请输入收货人',
+      },
+      dependencies: {
+        triggerFields: ['type', 'deliveryFlag'],
+        show: (values) =>
+          values.type === MesWmTransferTypeEnum.OUTER && !!values.deliveryFlag,
+      },
+    },
+    {
+      fieldName: 'recipientTelephone',
+      label: '联系电话',
+      component: 'Input',
+      componentProps: {
+        disabled: headerReadonly,
+        placeholder: '请输入联系电话',
+      },
+      dependencies: {
+        triggerFields: ['type', 'deliveryFlag'],
+        show: (values) =>
+          values.type === MesWmTransferTypeEnum.OUTER && !!values.deliveryFlag,
+      },
+    },
+    {
+      fieldName: 'carrier',
+      label: '承运商',
+      component: 'Input',
+      componentProps: {
+        disabled: headerReadonly,
+        placeholder: '请输入承运商',
+      },
+      dependencies: {
+        triggerFields: ['type', 'deliveryFlag'],
+        show: (values) =>
+          values.type === MesWmTransferTypeEnum.OUTER && !!values.deliveryFlag,
+      },
+    },
+    {
+      fieldName: 'shippingNumber',
+      label: '运输单号',
+      component: 'Input',
+      componentProps: {
+        disabled: headerReadonly,
+        placeholder: '请输入运输单号',
+      },
+      dependencies: {
+        triggerFields: ['type', 'deliveryFlag'],
+        show: (values) =>
+          values.type === MesWmTransferTypeEnum.OUTER && !!values.deliveryFlag,
+      },
+    },
+    {
+      fieldName: 'destinationAddress',
+      label: '目的地',
+      component: 'Input',
+      formItemClass: 'col-span-2',
+      componentProps: {
+        disabled: headerReadonly,
+        placeholder: '请输入目的地',
+      },
+      dependencies: {
+        triggerFields: ['type', 'deliveryFlag'],
+        show: (values) =>
+          values.type === MesWmTransferTypeEnum.OUTER && !!values.deliveryFlag,
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        disabled: headerReadonly,
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '转移单编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入转移单编号',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '转移单名称',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入转移单名称',
+      },
+    },
+    {
+      fieldName: 'type',
+      label: '转移单类型',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_WM_TRANSFER_TYPE, 'number'),
+        placeholder: '请选择转移单类型',
+      },
+    },
+    {
+      fieldName: 'status',
+      label: '单据状态',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_WM_TRANSFER_STATUS, 'number'),
+        placeholder: '请选择单据状态',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesWmTransferApi.Transfer>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '转移单编号',
+      minWidth: 160,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '转移单名称',
+      minWidth: 160,
+    },
+    {
+      field: 'type',
+      title: '转移单类型',
+      minWidth: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_TRANSFER_TYPE },
+      },
+    },
+    {
+      field: 'deliveryFlag',
+      title: '是否配送',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+      },
+    },
+    {
+      field: 'transferDate',
+      title: '转移日期',
+      width: 180,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      minWidth: 110,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_TRANSFER_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 240,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 转移单行子表的字段 */
+export function useLineGridColumns(
+  editable: boolean,
+  stockable: boolean,
+): VxeTableGridOptions<MesWmTransferLineApi.TransferLine>['columns'] {
+  return [
+    {
+      type: 'expand',
+      width: 48,
+      slots: { content: 'detail' },
+    },
+    {
+      field: 'itemCode',
+      title: '物料编码',
+      minWidth: 120,
+    },
+    {
+      field: 'itemName',
+      title: '物料名称',
+      minWidth: 140,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'quantity',
+      title: '转移数量',
+      width: 100,
+    },
+    {
+      field: 'batchCode',
+      title: '批次号',
+      minWidth: 120,
+    },
+    {
+      field: 'fromWarehouseName',
+      title: '移出仓库',
+      minWidth: 120,
+    },
+    {
+      field: 'fromLocationName',
+      title: '移出库区',
+      minWidth: 120,
+    },
+    {
+      field: 'fromAreaName',
+      title: '移出库位',
+      minWidth: 120,
+    },
+    ...(editable || stockable
+      ? [
+          {
+            title: '操作',
+            width: 180,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 转移单行新增/修改的表单 */
+export function useLineFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'quantityMax',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'batchId',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'materialStockId',
+      label: '选择库存',
+      component: markRaw(WmMaterialStockSelect),
+      componentProps: {
+        // 选择库存后，自动回填物料/仓库位置/批次/数量
+        onChange: async (stock?: MesWmMaterialStockApi.MaterialStock) => {
+          await formApi?.setValues({
+            batchCode: stock?.batchCode,
+            batchId: stock?.batchId,
+            fromAreaId: stock?.areaId,
+            fromLocationId: stock?.locationId,
+            fromWarehouseId: stock?.warehouseId,
+            itemId: stock?.itemId,
+            quantity: stock?.quantity,
+            quantityMax: stock?.quantity,
+          });
+        },
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'quantity',
+      label: '转移数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入转移数量',
+        precision: 2,
+      },
+      rules: 'required',
+      dependencies: {
+        triggerFields: ['quantityMax'],
+        componentProps: (values) => ({
+          class: '!w-full',
+          max: values.quantityMax,
+          min: 0,
+          placeholder: '请输入转移数量',
+          precision: 2,
+        }),
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'fromWarehouseId',
+      label: '移出仓库',
+      component: markRaw(WmWarehouseSelect),
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'fromLocationId',
+      label: '移出库区',
+      component: markRaw(WmWarehouseLocationSelect),
+      componentProps: {
+        disabled: true,
+      },
+      dependencies: {
+        triggerFields: ['fromWarehouseId'],
+        componentProps: (values) => ({
+          disabled: true,
+          warehouseId: values.fromWarehouseId,
+        }),
+      },
+    },
+    {
+      fieldName: 'fromAreaId',
+      label: '移出库位',
+      component: markRaw(WmWarehouseAreaSelect),
+      componentProps: {
+        disabled: true,
+      },
+      dependencies: {
+        triggerFields: ['fromLocationId'],
+        componentProps: (values) => ({
+          disabled: true,
+          locationId: values.fromLocationId,
+        }),
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 调拨明细子表的字段 */
+export function useDetailGridColumns(
+  stockable: boolean,
+): VxeTableGridOptions<MesWmTransferDetailApi.TransferDetail>['columns'] {
+  return [
+    {
+      field: 'toWarehouseName',
+      title: '移入仓库',
+      minWidth: 100,
+    },
+    {
+      field: 'toLocationName',
+      title: '移入库区',
+      minWidth: 100,
+    },
+    {
+      field: 'toAreaName',
+      title: '移入库位',
+      minWidth: 100,
+    },
+    {
+      field: 'quantity',
+      title: '数量',
+      width: 100,
+    },
+    ...(stockable
+      ? [
+          {
+            title: '操作',
+            width: 120,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 调拨明细新增/修改的表单 */
+export function useDetailFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'toWarehouseId',
+      label: '移入仓库',
+      component: markRaw(WmWarehouseSelect),
+      componentProps: {
+        placeholder: '请选择移入仓库',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'toLocationId',
+      label: '移入库区',
+      component: markRaw(WmWarehouseLocationSelect),
+      componentProps: {
+        placeholder: '请选择移入库区',
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['toWarehouseId'],
+        componentProps: (values) => ({
+          placeholder: '请选择移入库区',
+          warehouseId: values.toWarehouseId,
+        }),
+      },
+    },
+    {
+      fieldName: 'toAreaId',
+      label: '移入库位',
+      component: markRaw(WmWarehouseAreaSelect),
+      componentProps: {
+        placeholder: '请选择移入库位',
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['toLocationId'],
+        componentProps: (values) => ({
+          locationId: values.toLocationId,
+          placeholder: '请选择移入库位',
+        }),
+      },
+    },
+    {
+      fieldName: 'quantity',
+      label: '数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        placeholder: '请输入数量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/wm/transfer/index.vue b/apps/web-antd/src/views/mes/wm/transfer/index.vue
new file mode 100644
index 000000000..aa6fe7535
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/transfer/index.vue
@@ -0,0 +1,223 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmTransferApi } from '#/api/mes/wm/transfer';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { Button, message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  cancelTransfer,
+  deleteTransfer,
+  exportTransfer,
+  getTransferPage,
+} from '#/api/mes/wm/transfer';
+import { $t } from '#/locales';
+import { MesWmTransferStatusEnum } from '#/views/mes/utils/constants';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建转移单 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看转移单详情 */
+function handleDetail(row: MesWmTransferApi.Transfer) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑转移单 */
+function handleEdit(row: MesWmTransferApi.Transfer) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 到货确认 */
+function handleConfirm(row: MesWmTransferApi.Transfer) {
+  formModalApi.setData({ formType: 'confirm', id: row.id }).open();
+}
+
+/** 执行上架 */
+function handleStock(row: MesWmTransferApi.Transfer) {
+  formModalApi.setData({ formType: 'stock', id: row.id }).open();
+}
+
+/** 执行转移 */
+function handleFinish(row: MesWmTransferApi.Transfer) {
+  formModalApi.setData({ formType: 'finish', id: row.id }).open();
+}
+
+/** 删除转移单 */
+async function handleDelete(row: MesWmTransferApi.Transfer) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.code]),
+    duration: 0,
+  });
+  try {
+    await deleteTransfer(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 取消转移单 */
+async function handleCancel(row: MesWmTransferApi.Transfer) {
+  await cancelTransfer(row.id!);
+  message.success('取消成功');
+  handleRefresh();
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportTransfer(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '转移单.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getTransferPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmTransferApi.Transfer>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】调拨单、装箱管理"
+        url="https://doc.iocoder.cn/mes/wm/transfer/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="转移单列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['转移单']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-transfer:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:wm-transfer:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <Button type="link" @click="handleDetail(row)">
+          {{ row.code }}
+        </Button>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:wm-transfer:update'],
+              ifShow: row.status === MesWmTransferStatusEnum.PREPARE,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm-transfer:delete'],
+              ifShow: row.status === MesWmTransferStatusEnum.PREPARE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '到货确认',
+              type: 'link',
+              auth: ['mes:wm-transfer:update'],
+              ifShow: row.status === MesWmTransferStatusEnum.UNCONFIRMED,
+              onClick: handleConfirm.bind(null, row),
+            },
+            {
+              label: '执行上架',
+              type: 'link',
+              auth: ['mes:wm-transfer:update'],
+              ifShow: row.status === MesWmTransferStatusEnum.APPROVING,
+              onClick: handleStock.bind(null, row),
+            },
+            {
+              label: '执行转移',
+              type: 'link',
+              auth: ['mes:wm-transfer:finish'],
+              ifShow: row.status === MesWmTransferStatusEnum.APPROVED,
+              onClick: handleFinish.bind(null, row),
+            },
+            {
+              label: '取消',
+              type: 'link',
+              danger: true,
+              auth: ['mes:wm-transfer:update'],
+              ifShow: [
+                MesWmTransferStatusEnum.UNCONFIRMED,
+                MesWmTransferStatusEnum.APPROVING,
+                MesWmTransferStatusEnum.APPROVED,
+              ].includes(row.status),
+              popConfirm: {
+                title: '确认取消该转移单？取消后不可恢复。',
+                confirm: handleCancel.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/transfer/modules/detail-form.vue b/apps/web-antd/src/views/mes/wm/transfer/modules/detail-form.vue
new file mode 100644
index 000000000..f83f539f7
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/transfer/modules/detail-form.vue
@@ -0,0 +1,103 @@
+<script lang="ts" setup>
+import type { MesWmTransferDetailApi } from '#/api/mes/wm/transfer/detail';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createTransferDetail,
+  getTransferDetail,
+  updateTransferDetail,
+} from '#/api/mes/wm/transfer/detail';
+import { $t } from '#/locales';
+
+import { useDetailFormSchema } from '../data';
+
+const emit = defineEmits<{ success: [lineId: number] }>();
+const formData = ref<MesWmTransferDetailApi.TransferDetail>();
+const transferId = ref<number>(); // 所属转移单编号
+const lineId = ref<number>(); // 所属转移单行编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['调拨明细'])
+    : $t('ui.actionTitle.create', ['调拨明细']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-2',
+    labelWidth: 90,
+  },
+  layout: 'horizontal',
+  schema: useDetailFormSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-2',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmTransferDetailApi.TransferDetail;
+    data.transferId = transferId.value;
+    data.lineId = lineId.value;
+    try {
+      await (formData.value?.id
+        ? updateTransferDetail({ ...data, id: formData.value.id })
+        : createTransferDetail(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success', lineId.value!);
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{
+      detailId?: number;
+      itemId?: number;
+      lineId: number;
+      transferId: number;
+    }>();
+    transferId.value = data.transferId;
+    lineId.value = data.lineId;
+    if (data.detailId) {
+      modalApi.lock();
+      try {
+        formData.value = await getTransferDetail(data.detailId);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    } else if (data.itemId) {
+      await formApi.setFieldValue('itemId', data.itemId);
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-2/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/transfer/modules/detail-list.vue b/apps/web-antd/src/views/mes/wm/transfer/modules/detail-list.vue
new file mode 100644
index 000000000..ab56e31e2
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/transfer/modules/detail-list.vue
@@ -0,0 +1,101 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmTransferDetailApi } from '#/api/mes/wm/transfer/detail';
+
+import { computed, watch } from 'vue';
+
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { deleteTransferDetail } from '#/api/mes/wm/transfer/detail';
+import { $t } from '#/locales';
+
+import { type FormType, useDetailGridColumns } from '../data';
+
+const props = defineProps<{
+  details: MesWmTransferDetailApi.TransferDetail[];
+  formType: FormType;
+}>();
+
+const emit = defineEmits<{
+  edit: [detailId: number];
+  refresh: [];
+}>();
+
+const isStock = computed(() => props.formType === 'stock'); // 是否为上架模式
+
+/** 编辑调拨明细 */
+function handleEdit(row: MesWmTransferDetailApi.TransferDetail) {
+  emit('edit', row.id!);
+}
+
+/** 删除调拨明细 */
+async function handleDelete(row: MesWmTransferDetailApi.TransferDetail) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.toWarehouseName]),
+    duration: 0,
+  });
+  try {
+    await deleteTransferDetail(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.toWarehouseName]));
+    emit('refresh');
+  } finally {
+    hideLoading();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    border: true,
+    columns: useDetailGridColumns(isStock.value),
+    data: props.details,
+    pagerConfig: {
+      enabled: false,
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    size: 'small',
+    toolbarConfig: {
+      enabled: false,
+    },
+  } as VxeTableGridOptions<MesWmTransferDetailApi.TransferDetail>,
+});
+
+watch(
+  () => props.details,
+  (details) => gridApi.setGridOptions({ data: details }),
+);
+</script>
+
+<template>
+  <div class="px-4 py-2">
+    <Grid>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [
+                  row.toWarehouseName,
+                ]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/transfer/modules/form.vue b/apps/web-antd/src/views/mes/wm/transfer/modules/form.vue
new file mode 100644
index 000000000..3522ce30f
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/transfer/modules/form.vue
@@ -0,0 +1,255 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesWmTransferApi } from '#/api/mes/wm/transfer';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { Button, Divider, message, Popconfirm } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  confirmTransfer,
+  createTransfer,
+  finishTransfer,
+  getTransfer,
+  stockTransfer,
+  submitTransfer,
+  updateTransfer,
+} from '#/api/mes/wm/transfer';
+import { $t } from '#/locales';
+import { MesWmTransferStatusEnum } from '#/views/mes/utils/constants';
+
+import { useFormSchema } from '../data';
+import LineList from './line-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesWmTransferApi.Transfer>();
+const originalSnapshot = ref(''); // 表单原始数据快照，用于提交时跳过未变更的保存请求
+const isEditable = computed(() => // 是否为编辑模式（可保存）
+  ['create', 'update'].includes(formType.value),
+);
+const isConfirm = computed(() => formType.value === 'confirm'); // 是否为到货确认模式
+const isStock = computed(() => formType.value === 'stock'); // 是否为上架模式
+const isFinish = computed(() => formType.value === 'finish'); // 是否为执行转移模式
+const canSubmit = computed(() => // 编辑态草稿可提交
+  formType.value === 'update' &&
+  formData.value?.status === MesWmTransferStatusEnum.PREPARE,
+);
+const getTitle = computed(() => {
+  switch (formType.value) {
+    case 'confirm': {
+      return '到货确认';
+    }
+    case 'detail': {
+      return $t('ui.actionTitle.view', ['转移单']);
+    }
+    case 'finish': {
+      return '执行转移';
+    }
+    case 'stock': {
+      return '执行上架';
+    }
+    case 'update': {
+      return $t('ui.actionTitle.edit', ['转移单']);
+    }
+    default: {
+      return $t('ui.actionTitle.create', ['转移单']);
+    }
+  }
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+/** 提交转移单：表单有修改时先保存，再调用提交接口 */
+async function handleSubmit() {
+  const { valid } = await formApi.validate();
+  if (!valid || !formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    const current = JSON.stringify(await formApi.getValues());
+    if (current !== originalSnapshot.value) {
+      const data = (await formApi.getValues()) as MesWmTransferApi.Transfer;
+      await updateTransfer({ ...formData.value, ...data });
+      originalSnapshot.value = current;
+    }
+    await submitTransfer(formData.value.id);
+    message.success('提交成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 到货确认 */
+async function handleConfirm() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await confirmTransfer(formData.value.id);
+    message.success('确认成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 执行上架 */
+async function handleStock() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await stockTransfer(formData.value.id);
+    message.success('上架成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 执行转移 */
+async function handleFinish() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await finishTransfer(formData.value.id);
+    message.success('执行成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (!isEditable.value) {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data = (await formApi.getValues()) as MesWmTransferApi.Transfer;
+    try {
+      if (formData.value?.id) {
+        await updateTransfer({ ...formData.value, ...data });
+        formData.value = { ...formData.value, ...data };
+      } else {
+        const id = await createTransfer(data);
+        formData.value = {
+          ...data,
+          id,
+          status: MesWmTransferStatusEnum.PREPARE,
+        };
+        formType.value = 'update';
+        // 创建成功后切换编辑态，重挂 schema 并回填主键 / 状态
+        formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+        await formApi.setValues(formData.value);
+      }
+      originalSnapshot.value = JSON.stringify(await formApi.getValues());
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      originalSnapshot.value = '';
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    modalApi.setState({ showConfirmButton: isEditable.value });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getTransfer(data.id);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    }
+    originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+    <!-- 非新建模式展示物料信息 -->
+    <template v-if="formData?.id">
+      <Divider>物料信息</Divider>
+      <div class="mx-4">
+        <LineList :form-type="formType" :transfer-id="formData.id" />
+      </div>
+    </template>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <Popconfirm
+          v-if="canSubmit"
+          title="确认提交该转移单？【提交后将不能修改】"
+          @confirm="handleSubmit"
+        >
+          <Button type="primary">提交</Button>
+        </Popconfirm>
+        <Popconfirm
+          v-if="isConfirm"
+          title="确认到货后，将进入待上架状态，是否继续？"
+          @confirm="handleConfirm"
+        >
+          <Button type="primary">到货确认</Button>
+        </Popconfirm>
+        <Popconfirm
+          v-if="isStock"
+          title="确认执行上架？"
+          @confirm="handleStock"
+        >
+          <Button type="primary">执行上架</Button>
+        </Popconfirm>
+        <Popconfirm
+          v-if="isFinish"
+          title="确认执行调拨？执行后将更新库存。"
+          @confirm="handleFinish"
+        >
+          <Button type="primary">执行转移</Button>
+        </Popconfirm>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/transfer/modules/line-form.vue b/apps/web-antd/src/views/mes/wm/transfer/modules/line-form.vue
new file mode 100644
index 000000000..c4c41f683
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/transfer/modules/line-form.vue
@@ -0,0 +1,102 @@
+<script lang="ts" setup>
+import type { MesWmTransferLineApi } from '#/api/mes/wm/transfer/line';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import { getMaterialStock } from '#/api/mes/wm/materialstock';
+import {
+  createTransferLine,
+  getTransferLine,
+  updateTransferLine,
+} from '#/api/mes/wm/transfer/line';
+import { $t } from '#/locales';
+
+import { useLineFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesWmTransferLineApi.TransferLine>();
+const transferId = ref<number>(); // 所属转移单编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['调拨物料'])
+    : $t('ui.actionTitle.create', ['调拨物料']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 90,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmTransferLineApi.TransferLine;
+    data.transferId = transferId.value;
+    try {
+      await (formData.value?.id
+        ? updateTransferLine({ ...data, id: formData.value.id })
+        : createTransferLine(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    formApi.setState({ schema: useLineFormSchema(formApi) });
+    // 加载数据
+    const data = modalApi.getData<{ id?: number; transferId: number }>();
+    transferId.value = data.transferId;
+    if (!data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getTransferLine(data.id);
+      // 编辑时按当前库存在库量作为数量上限
+      let quantityMax: number | undefined;
+      if (formData.value.materialStockId) {
+        const stock = await getMaterialStock(formData.value.materialStockId);
+        quantityMax = stock?.quantity;
+      }
+      // 设置到 values
+      await formApi.setValues({ ...formData.value, quantityMax });
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/transfer/modules/line-list.vue b/apps/web-antd/src/views/mes/wm/transfer/modules/line-list.vue
new file mode 100644
index 000000000..c4ea86897
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/transfer/modules/line-list.vue
@@ -0,0 +1,226 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmTransferDetailApi } from '#/api/mes/wm/transfer/detail';
+import type { MesWmTransferLineApi } from '#/api/mes/wm/transfer/line';
+
+import { computed, reactive } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getTransferDetailListByLineId } from '#/api/mes/wm/transfer/detail';
+import {
+  deleteTransferLine,
+  getTransferLineList,
+} from '#/api/mes/wm/transfer/line';
+import { $t } from '#/locales';
+import { PrinterLabel } from '#/views/mes/wm/barcode/components';
+
+import { type FormType, useLineGridColumns } from '../data';
+import DetailForm from './detail-form.vue';
+import DetailList from './detail-list.vue';
+import LineForm from './line-form.vue';
+
+const props = defineProps<{
+  formType: FormType;
+  transferId: number;
+}>();
+
+const isEditable = computed(() =>
+  ['create', 'update'].includes(props.formType),
+); // 是否可编辑调拨物料行
+const isStock = computed(() => props.formType === 'stock'); // 是否为上架模式
+const detailMap = reactive<
+  Record<number, MesWmTransferDetailApi.TransferDetail[]>
+>({}); // 已展开行的调拨明细缓存
+
+const [LineFormModal, lineFormModalApi] = useVbenModal({
+  connectedComponent: LineForm,
+  destroyOnClose: true,
+});
+
+const [DetailFormModal, detailFormModalApi] = useVbenModal({
+  connectedComponent: DetailForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  for (const id of Object.keys(detailMap)) {
+    delete detailMap[Number(id)];
+  }
+  gridApi.query();
+}
+
+/** 添加调拨物料 */
+function handleCreate() {
+  lineFormModalApi.setData({ transferId: props.transferId }).open();
+}
+
+/** 编辑调拨物料 */
+function handleEdit(row: MesWmTransferLineApi.TransferLine) {
+  lineFormModalApi.setData({ id: row.id, transferId: props.transferId }).open();
+}
+
+/** 删除调拨物料 */
+async function handleDelete(row: MesWmTransferLineApi.TransferLine) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.itemName]),
+    duration: 0,
+  });
+  try {
+    await deleteTransferLine(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.itemName]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 上架：直接打开明细新增表单 */
+function handleStock(row: MesWmTransferLineApi.TransferLine) {
+  openDetailForm(row.id!, row.itemId);
+}
+
+/** 打开调拨明细表单 */
+function openDetailForm(lineId: number, itemId?: number, detailId?: number) {
+  detailFormModalApi
+    .setData({ detailId, itemId, lineId, transferId: props.transferId })
+    .open();
+}
+
+/** 获取已展开行的调拨明细 */
+function getExpandedDetails(row: MesWmTransferLineApi.TransferLine) {
+  return detailMap[row.id!] || [];
+}
+
+/** 加载指定行的调拨明细 */
+async function loadLineDetails(lineId: number) {
+  detailMap[lineId] = await getTransferDetailListByLineId(lineId);
+}
+
+/** 展开行时懒加载调拨明细 */
+async function handleExpandChange(
+  row: MesWmTransferLineApi.TransferLine,
+  expanded: boolean,
+) {
+  if (!expanded) {
+    return;
+  }
+  await loadLineDetails(row.id!);
+}
+
+/** 明细表单提交成功后，刷新对应行已展开的明细 */
+async function handleDetailSuccess(lineId: number) {
+  await loadLineDetails(lineId);
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useLineGridColumns(isEditable.value, isStock.value),
+    expandConfig: {
+      padding: true,
+    },
+    height: 400,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async () => {
+          if (!props.transferId) {
+            return [];
+          }
+          return await getTransferLineList(props.transferId);
+        },
+      },
+    },
+    pagerConfig: {
+      enabled: false,
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesWmTransferLineApi.TransferLine>,
+  gridEvents: {
+    toggleRowExpand: ({
+      expanded,
+      row,
+    }: {
+      expanded: boolean;
+      row: MesWmTransferLineApi.TransferLine;
+    }) => {
+      handleExpandChange(row, expanded);
+    },
+  },
+});
+</script>
+
+<template>
+  <div>
+    <LineFormModal @success="handleRefresh" />
+    <DetailFormModal @success="handleDetailSuccess" />
+    <Grid table-title="物料信息">
+      <template v-if="isEditable" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '添加调拨物料',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #detail="{ row }">
+        <DetailList
+          :details="getExpandedDetails(row)"
+          :form-type="formType"
+          @edit="(detailId) => openDetailForm(row.id!, row.itemId, detailId)"
+          @refresh="loadLineDetails(row.id!)"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              ifShow: isEditable,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              ifShow: isEditable,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.itemName]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '上架',
+              type: 'link',
+              ifShow: isStock,
+              onClick: handleStock.bind(null, row),
+            },
+          ]"
+        />
+        <PrinterLabel
+          v-if="isStock"
+          :biz-code="row.batchCode"
+          :biz-id="row.batchId"
+          biz-type="BATCH"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/transfer/data.ts b/apps/web-ele/src/views/mes/wm/transfer/data.ts
new file mode 100644
index 000000000..c9a0f03f4
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/transfer/data.ts
@@ -0,0 +1,647 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmMaterialStockApi } from '#/api/mes/wm/materialstock';
+import type { MesWmTransferApi } from '#/api/mes/wm/transfer';
+import type { MesWmTransferDetailApi } from '#/api/mes/wm/transfer/detail';
+import type { MesWmTransferLineApi } from '#/api/mes/wm/transfer/line';
+
+import { h, markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { ElButton } from 'element-plus';
+
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { MdItemSelect } from '#/views/mes/md/item/components';
+import {
+  MesAutoCodeRuleCode,
+  MesWmTransferTypeEnum,
+} from '#/views/mes/utils/constants';
+import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
+import {
+  WmWarehouseAreaSelect,
+  WmWarehouseLocationSelect,
+  WmWarehouseSelect,
+} from '#/views/mes/wm/warehouse/components';
+
+/** 表单类型 */
+export type FormType =
+  | 'confirm'
+  | 'create'
+  | 'detail'
+  | 'finish'
+  | 'stock'
+  | 'update';
+
+/** 表头是否只读（上架、确认、执行、详情态） */
+function isHeaderReadonly(formType: FormType): boolean {
+  return ['confirm', 'detail', 'finish', 'stock'].includes(formType);
+}
+
+/** 新增/修改的表单 */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  const headerReadonly = isHeaderReadonly(formType);
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'status',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '转移单编号',
+      component: 'Input',
+      componentProps: {
+        disabled: headerReadonly,
+        placeholder: '请输入转移单编号',
+      },
+      rules: 'required',
+      suffix:
+        formType === 'create' || formType === 'update'
+          ? () =>
+              h(
+                ElButton,
+                {
+                  onClick: async () => {
+                    const code = await generateAutoCode(
+                      MesAutoCodeRuleCode.TRANSFER_CODE,
+                    );
+                    await formApi?.setFieldValue('code', code);
+                  },
+                },
+                { default: () => '生成' },
+              )
+          : undefined,
+    },
+    {
+      fieldName: 'name',
+      label: '转移单名称',
+      component: 'Input',
+      componentProps: {
+        disabled: headerReadonly,
+        placeholder: '请输入转移单名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'type',
+      label: '转移单类型',
+      component: 'Select',
+      componentProps: {
+        disabled: headerReadonly,
+        options: getDictOptions(DICT_TYPE.MES_WM_TRANSFER_TYPE, 'number'),
+        placeholder: '请选择转移单类型',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'transferDate',
+      label: '转移日期',
+      component: 'DatePicker',
+      componentProps: {
+        class: '!w-full',
+        disabled: headerReadonly,
+        placeholder: '请选择转移日期',
+        type: 'date',
+        valueFormat: 'YYYY-MM-DD 00:00:00',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'deliveryFlag',
+      label: '是否配送',
+      component: 'Switch',
+      componentProps: {
+        disabled: headerReadonly,
+      },
+      dependencies: {
+        triggerFields: ['type'],
+        show: (values) => values.type === MesWmTransferTypeEnum.OUTER,
+      },
+    },
+    {
+      fieldName: 'confirmFlag',
+      label: '是否确认',
+      component: 'Switch',
+      componentProps: {
+        disabled: true,
+      },
+      dependencies: {
+        triggerFields: ['type'],
+        show: (values) => values.type === MesWmTransferTypeEnum.OUTER,
+      },
+    },
+    {
+      fieldName: 'recipientName',
+      label: '收货人',
+      component: 'Input',
+      componentProps: {
+        disabled: headerReadonly,
+        placeholder: '请输入收货人',
+      },
+      dependencies: {
+        triggerFields: ['type', 'deliveryFlag'],
+        show: (values) =>
+          values.type === MesWmTransferTypeEnum.OUTER && !!values.deliveryFlag,
+      },
+    },
+    {
+      fieldName: 'recipientTelephone',
+      label: '联系电话',
+      component: 'Input',
+      componentProps: {
+        disabled: headerReadonly,
+        placeholder: '请输入联系电话',
+      },
+      dependencies: {
+        triggerFields: ['type', 'deliveryFlag'],
+        show: (values) =>
+          values.type === MesWmTransferTypeEnum.OUTER && !!values.deliveryFlag,
+      },
+    },
+    {
+      fieldName: 'carrier',
+      label: '承运商',
+      component: 'Input',
+      componentProps: {
+        disabled: headerReadonly,
+        placeholder: '请输入承运商',
+      },
+      dependencies: {
+        triggerFields: ['type', 'deliveryFlag'],
+        show: (values) =>
+          values.type === MesWmTransferTypeEnum.OUTER && !!values.deliveryFlag,
+      },
+    },
+    {
+      fieldName: 'shippingNumber',
+      label: '运输单号',
+      component: 'Input',
+      componentProps: {
+        disabled: headerReadonly,
+        placeholder: '请输入运输单号',
+      },
+      dependencies: {
+        triggerFields: ['type', 'deliveryFlag'],
+        show: (values) =>
+          values.type === MesWmTransferTypeEnum.OUTER && !!values.deliveryFlag,
+      },
+    },
+    {
+      fieldName: 'destinationAddress',
+      label: '目的地',
+      component: 'Input',
+      formItemClass: 'col-span-2',
+      componentProps: {
+        disabled: headerReadonly,
+        placeholder: '请输入目的地',
+      },
+      dependencies: {
+        triggerFields: ['type', 'deliveryFlag'],
+        show: (values) =>
+          values.type === MesWmTransferTypeEnum.OUTER && !!values.deliveryFlag,
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        disabled: headerReadonly,
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '转移单编号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入转移单编号',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '转移单名称',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入转移单名称',
+      },
+    },
+    {
+      fieldName: 'type',
+      label: '转移单类型',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_WM_TRANSFER_TYPE, 'number'),
+        placeholder: '请选择转移单类型',
+      },
+    },
+    {
+      fieldName: 'status',
+      label: '单据状态',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_WM_TRANSFER_STATUS, 'number'),
+        placeholder: '请选择单据状态',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesWmTransferApi.Transfer>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '转移单编号',
+      minWidth: 160,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'name',
+      title: '转移单名称',
+      minWidth: 160,
+    },
+    {
+      field: 'type',
+      title: '转移单类型',
+      minWidth: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_TRANSFER_TYPE },
+      },
+    },
+    {
+      field: 'deliveryFlag',
+      title: '是否配送',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+      },
+    },
+    {
+      field: 'transferDate',
+      title: '转移日期',
+      width: 180,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'status',
+      title: '单据状态',
+      minWidth: 110,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_WM_TRANSFER_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 240,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 转移单行子表的字段 */
+export function useLineGridColumns(
+  editable: boolean,
+  stockable: boolean,
+): VxeTableGridOptions<MesWmTransferLineApi.TransferLine>['columns'] {
+  return [
+    {
+      type: 'expand',
+      width: 48,
+      slots: { content: 'detail' },
+    },
+    {
+      field: 'itemCode',
+      title: '物料编码',
+      minWidth: 120,
+    },
+    {
+      field: 'itemName',
+      title: '物料名称',
+      minWidth: 140,
+    },
+    {
+      field: 'specification',
+      title: '规格型号',
+      minWidth: 120,
+    },
+    {
+      field: 'unitMeasureName',
+      title: '单位',
+      width: 80,
+    },
+    {
+      field: 'quantity',
+      title: '转移数量',
+      width: 100,
+    },
+    {
+      field: 'batchCode',
+      title: '批次号',
+      minWidth: 120,
+    },
+    {
+      field: 'fromWarehouseName',
+      title: '移出仓库',
+      minWidth: 120,
+    },
+    {
+      field: 'fromLocationName',
+      title: '移出库区',
+      minWidth: 120,
+    },
+    {
+      field: 'fromAreaName',
+      title: '移出库位',
+      minWidth: 120,
+    },
+    ...(editable || stockable
+      ? [
+          {
+            title: '操作',
+            width: 180,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 转移单行新增/修改的表单 */
+export function useLineFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'quantityMax',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'batchId',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'materialStockId',
+      label: '选择库存',
+      component: markRaw(WmMaterialStockSelect),
+      componentProps: {
+        // 选择库存后，自动回填物料/仓库位置/批次/数量
+        onChange: async (stock?: MesWmMaterialStockApi.MaterialStock) => {
+          await formApi?.setValues({
+            batchCode: stock?.batchCode,
+            batchId: stock?.batchId,
+            fromAreaId: stock?.areaId,
+            fromLocationId: stock?.locationId,
+            fromWarehouseId: stock?.warehouseId,
+            itemId: stock?.itemId,
+            quantity: stock?.quantity,
+            quantityMax: stock?.quantity,
+          });
+        },
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'quantity',
+      label: '转移数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入转移数量',
+        precision: 2,
+      },
+      rules: 'required',
+      dependencies: {
+        triggerFields: ['quantityMax'],
+        componentProps: (values) => ({
+          class: '!w-full',
+          controlsPosition: 'right',
+          max: values.quantityMax,
+          min: 0,
+          placeholder: '请输入转移数量',
+          precision: 2,
+        }),
+      },
+    },
+    {
+      fieldName: 'batchCode',
+      label: '批次号',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'fromWarehouseId',
+      label: '移出仓库',
+      component: markRaw(WmWarehouseSelect),
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'fromLocationId',
+      label: '移出库区',
+      component: markRaw(WmWarehouseLocationSelect),
+      componentProps: {
+        disabled: true,
+      },
+      dependencies: {
+        triggerFields: ['fromWarehouseId'],
+        componentProps: (values) => ({
+          disabled: true,
+          warehouseId: values.fromWarehouseId,
+        }),
+      },
+    },
+    {
+      fieldName: 'fromAreaId',
+      label: '移出库位',
+      component: markRaw(WmWarehouseAreaSelect),
+      componentProps: {
+        disabled: true,
+      },
+      dependencies: {
+        triggerFields: ['fromLocationId'],
+        componentProps: (values) => ({
+          disabled: true,
+          locationId: values.fromLocationId,
+        }),
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 调拨明细子表的字段 */
+export function useDetailGridColumns(
+  stockable: boolean,
+): VxeTableGridOptions<MesWmTransferDetailApi.TransferDetail>['columns'] {
+  return [
+    {
+      field: 'toWarehouseName',
+      title: '移入仓库',
+      minWidth: 100,
+    },
+    {
+      field: 'toLocationName',
+      title: '移入库区',
+      minWidth: 100,
+    },
+    {
+      field: 'toAreaName',
+      title: '移入库位',
+      minWidth: 100,
+    },
+    {
+      field: 'quantity',
+      title: '数量',
+      width: 100,
+    },
+    ...(stockable
+      ? [
+          {
+            title: '操作',
+            width: 120,
+            fixed: 'right',
+            slots: { default: 'actions' },
+          } as const,
+        ]
+      : []),
+  ];
+}
+
+/** 调拨明细新增/修改的表单 */
+export function useDetailFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'itemId',
+      label: '物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'toWarehouseId',
+      label: '移入仓库',
+      component: markRaw(WmWarehouseSelect),
+      componentProps: {
+        placeholder: '请选择移入仓库',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'toLocationId',
+      label: '移入库区',
+      component: markRaw(WmWarehouseLocationSelect),
+      componentProps: {
+        placeholder: '请选择移入库区',
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['toWarehouseId'],
+        componentProps: (values) => ({
+          placeholder: '请选择移入库区',
+          warehouseId: values.toWarehouseId,
+        }),
+      },
+    },
+    {
+      fieldName: 'toAreaId',
+      label: '移入库位',
+      component: markRaw(WmWarehouseAreaSelect),
+      componentProps: {
+        placeholder: '请选择移入库位',
+      },
+      rules: 'selectRequired',
+      dependencies: {
+        triggerFields: ['toLocationId'],
+        componentProps: (values) => ({
+          locationId: values.toLocationId,
+          placeholder: '请选择移入库位',
+        }),
+      },
+    },
+    {
+      fieldName: 'quantity',
+      label: '数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        placeholder: '请输入数量',
+        precision: 2,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/wm/transfer/modules/detail-form.vue b/apps/web-ele/src/views/mes/wm/transfer/modules/detail-form.vue
new file mode 100644
index 000000000..64d3886c4
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/transfer/modules/detail-form.vue
@@ -0,0 +1,103 @@
+<script lang="ts" setup>
+import type { MesWmTransferDetailApi } from '#/api/mes/wm/transfer/detail';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createTransferDetail,
+  getTransferDetail,
+  updateTransferDetail,
+} from '#/api/mes/wm/transfer/detail';
+import { $t } from '#/locales';
+
+import { useDetailFormSchema } from '../data';
+
+const emit = defineEmits<{ success: [lineId: number] }>();
+const formData = ref<MesWmTransferDetailApi.TransferDetail>();
+const transferId = ref<number>(); // 所属转移单编号
+const lineId = ref<number>(); // 所属转移单行编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['调拨明细'])
+    : $t('ui.actionTitle.create', ['调拨明细']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-2',
+    labelWidth: 90,
+  },
+  layout: 'horizontal',
+  schema: useDetailFormSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-2',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmTransferDetailApi.TransferDetail;
+    data.transferId = transferId.value;
+    data.lineId = lineId.value;
+    try {
+      await (formData.value?.id
+        ? updateTransferDetail({ ...data, id: formData.value.id })
+        : createTransferDetail(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success', lineId.value!);
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{
+      detailId?: number;
+      itemId?: number;
+      lineId: number;
+      transferId: number;
+    }>();
+    transferId.value = data.transferId;
+    lineId.value = data.lineId;
+    if (data.detailId) {
+      modalApi.lock();
+      try {
+        formData.value = await getTransferDetail(data.detailId);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    } else if (data.itemId) {
+      await formApi.setFieldValue('itemId', data.itemId);
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-2/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/transfer/modules/detail-list.vue b/apps/web-ele/src/views/mes/wm/transfer/modules/detail-list.vue
new file mode 100644
index 000000000..59e7956e7
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/transfer/modules/detail-list.vue
@@ -0,0 +1,103 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmTransferDetailApi } from '#/api/mes/wm/transfer/detail';
+
+import { computed, watch } from 'vue';
+
+import { ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { deleteTransferDetail } from '#/api/mes/wm/transfer/detail';
+import { $t } from '#/locales';
+
+import { type FormType, useDetailGridColumns } from '../data';
+
+const props = defineProps<{
+  details: MesWmTransferDetailApi.TransferDetail[];
+  formType: FormType;
+}>();
+
+const emit = defineEmits<{
+  edit: [detailId: number];
+  refresh: [];
+}>();
+
+const isStock = computed(() => props.formType === 'stock'); // 是否为上架模式
+
+/** 编辑调拨明细 */
+function handleEdit(row: MesWmTransferDetailApi.TransferDetail) {
+  emit('edit', row.id!);
+}
+
+/** 删除调拨明细 */
+async function handleDelete(row: MesWmTransferDetailApi.TransferDetail) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.toWarehouseName]),
+  });
+  try {
+    await deleteTransferDetail(row.id!);
+    ElMessage.success(
+      $t('ui.actionMessage.deleteSuccess', [row.toWarehouseName]),
+    );
+    emit('refresh');
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    border: true,
+    columns: useDetailGridColumns(isStock.value),
+    data: props.details,
+    pagerConfig: {
+      enabled: false,
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    size: 'small',
+    toolbarConfig: {
+      enabled: false,
+    },
+  } as VxeTableGridOptions<MesWmTransferDetailApi.TransferDetail>,
+});
+
+watch(
+  () => props.details,
+  (details) => gridApi.setGridOptions({ data: details }),
+);
+</script>
+
+<template>
+  <div class="px-4 py-2">
+    <Grid>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [
+                  row.toWarehouseName,
+                ]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/transfer/modules/line-form.vue b/apps/web-ele/src/views/mes/wm/transfer/modules/line-form.vue
new file mode 100644
index 000000000..ca8c2fe7c
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/transfer/modules/line-form.vue
@@ -0,0 +1,102 @@
+<script lang="ts" setup>
+import type { MesWmTransferLineApi } from '#/api/mes/wm/transfer/line';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import { getMaterialStock } from '#/api/mes/wm/materialstock';
+import {
+  createTransferLine,
+  getTransferLine,
+  updateTransferLine,
+} from '#/api/mes/wm/transfer/line';
+import { $t } from '#/locales';
+
+import { useLineFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesWmTransferLineApi.TransferLine>();
+const transferId = ref<number>(); // 所属转移单编号
+
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['调拨物料'])
+    : $t('ui.actionTitle.create', ['调拨物料']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 90,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesWmTransferLineApi.TransferLine;
+    data.transferId = transferId.value;
+    try {
+      await (formData.value?.id
+        ? updateTransferLine({ ...data, id: formData.value.id })
+        : createTransferLine(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    formApi.setState({ schema: useLineFormSchema(formApi) });
+    // 加载数据
+    const data = modalApi.getData<{ id?: number; transferId: number }>();
+    transferId.value = data.transferId;
+    if (!data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getTransferLine(data.id);
+      // 编辑时按当前库存在库量作为数量上限
+      let quantityMax: number | undefined;
+      if (formData.value.materialStockId) {
+        const stock = await getMaterialStock(formData.value.materialStockId);
+        quantityMax = stock?.quantity;
+      }
+      // 设置到 values
+      await formApi.setValues({ ...formData.value, quantityMax });
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/transfer/modules/line-list.vue b/apps/web-ele/src/views/mes/wm/transfer/modules/line-list.vue
new file mode 100644
index 000000000..bc3018f65
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/transfer/modules/line-list.vue
@@ -0,0 +1,227 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmTransferDetailApi } from '#/api/mes/wm/transfer/detail';
+import type { MesWmTransferLineApi } from '#/api/mes/wm/transfer/line';
+
+import { computed, reactive } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getTransferDetailListByLineId } from '#/api/mes/wm/transfer/detail';
+import {
+  deleteTransferLine,
+  getTransferLineList,
+} from '#/api/mes/wm/transfer/line';
+import { $t } from '#/locales';
+import { PrinterLabel } from '#/views/mes/wm/barcode/components';
+
+import { type FormType, useLineGridColumns } from '../data';
+import DetailForm from './detail-form.vue';
+import DetailList from './detail-list.vue';
+import LineForm from './line-form.vue';
+
+const props = defineProps<{
+  formType: FormType;
+  transferId: number;
+}>();
+
+const isEditable = computed(() =>
+  ['create', 'update'].includes(props.formType),
+); // 是否可编辑调拨物料行
+const isStock = computed(() => props.formType === 'stock'); // 是否为上架模式
+const detailMap = reactive<
+  Record<number, MesWmTransferDetailApi.TransferDetail[]>
+>({}); // 已展开行的调拨明细缓存
+
+const [LineFormModal, lineFormModalApi] = useVbenModal({
+  connectedComponent: LineForm,
+  destroyOnClose: true,
+});
+
+const [DetailFormModal, detailFormModalApi] = useVbenModal({
+  connectedComponent: DetailForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  for (const id of Object.keys(detailMap)) {
+    delete detailMap[Number(id)];
+  }
+  gridApi.query();
+}
+
+/** 添加调拨物料 */
+function handleCreate() {
+  lineFormModalApi.setData({ transferId: props.transferId }).open();
+}
+
+/** 编辑调拨物料 */
+function handleEdit(row: MesWmTransferLineApi.TransferLine) {
+  lineFormModalApi.setData({ id: row.id, transferId: props.transferId }).open();
+}
+
+/** 删除调拨物料 */
+async function handleDelete(row: MesWmTransferLineApi.TransferLine) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.itemName]),
+  });
+  try {
+    await deleteTransferLine(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.itemName]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+/** 上架：直接打开明细新增表单 */
+function handleStock(row: MesWmTransferLineApi.TransferLine) {
+  openDetailForm(row.id!, row.itemId);
+}
+
+/** 打开调拨明细表单 */
+function openDetailForm(lineId: number, itemId?: number, detailId?: number) {
+  detailFormModalApi
+    .setData({ detailId, itemId, lineId, transferId: props.transferId })
+    .open();
+}
+
+/** 获取已展开行的调拨明细 */
+function getExpandedDetails(row: MesWmTransferLineApi.TransferLine) {
+  return detailMap[row.id!] || [];
+}
+
+/** 加载指定行的调拨明细 */
+async function loadLineDetails(lineId: number) {
+  detailMap[lineId] = await getTransferDetailListByLineId(lineId);
+}
+
+/** 展开行时懒加载调拨明细 */
+async function handleExpandChange(
+  row: MesWmTransferLineApi.TransferLine,
+  expanded: boolean,
+) {
+  if (!expanded) {
+    return;
+  }
+  await loadLineDetails(row.id!);
+}
+
+/** 明细表单提交成功后，刷新对应行已展开的明细 */
+async function handleDetailSuccess(lineId: number) {
+  await loadLineDetails(lineId);
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useLineGridColumns(isEditable.value, isStock.value),
+    expandConfig: {
+      padding: true,
+    },
+    height: 400,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async () => {
+          if (!props.transferId) {
+            return [];
+          }
+          return await getTransferLineList(props.transferId);
+        },
+      },
+    },
+    pagerConfig: {
+      enabled: false,
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesWmTransferLineApi.TransferLine>,
+  gridEvents: {
+    toggleRowExpand: ({
+      expanded,
+      row,
+    }: {
+      expanded: boolean;
+      row: MesWmTransferLineApi.TransferLine;
+    }) => {
+      handleExpandChange(row, expanded);
+    },
+  },
+});
+</script>
+
+<template>
+  <div>
+    <LineFormModal @success="handleRefresh" />
+    <DetailFormModal @success="handleDetailSuccess" />
+    <Grid table-title="物料信息">
+      <template v-if="isEditable" #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: '添加调拨物料',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              onClick: handleCreate,
+            },
+          ]"
+        />
+      </template>
+      <template #detail="{ row }">
+        <DetailList
+          :details="getExpandedDetails(row)"
+          :form-type="formType"
+          @edit="(detailId) => openDetailForm(row.id!, row.itemId, detailId)"
+          @refresh="loadLineDetails(row.id!)"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              ifShow: isEditable,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              ifShow: isEditable,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.itemName]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '上架',
+              type: 'primary',
+              link: true,
+              ifShow: isStock,
+              onClick: handleStock.bind(null, row),
+            },
+          ]"
+        />
+        <PrinterLabel
+          v-if="isStock"
+          :biz-code="row.batchCode"
+          :biz-id="row.batchId"
+          biz-type="BATCH"
+        />
+      </template>
+    </Grid>
+  </div>
+</template>

From 71cec9ac6a5d4ea63967ca9bdbfe8f14fa6e621e Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 30 May 2026 16:34:12 +0800
Subject: [PATCH 50/52] feat(mes): update chart options to use EChartsOption
 type and refactor imports

---
 .../src/views/mes/home/chart-options.ts       |   6 +-
 .../src/views/mes/wm/transfer/data.ts         |   4 +-
 .../src/views/mes/wm/transfer/index.vue       |  11 +-
 .../wms-home-inventory-chart-options.ts       |  10 +-
 .../wms-home-order-trend-chart-options.ts     |  10 +-
 .../src/views/mes/home/chart-options.ts       |   6 +-
 .../web-ele/src/views/mes/wm/transfer/data.ts |   4 +-
 .../src/views/mes/wm/transfer/index.vue       | 225 +++++++++++++++
 .../views/mes/wm/transfer/modules/form.vue    | 267 ++++++++++++++++++
 .../wms-home-inventory-chart-options.ts       |  10 +-
 .../wms-home-order-trend-chart-options.ts     |  10 +-
 packages/effects/plugins/src/echarts/index.ts |   6 +-
 12 files changed, 527 insertions(+), 42 deletions(-)
 create mode 100644 apps/web-ele/src/views/mes/wm/transfer/index.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/transfer/modules/form.vue

diff --git a/apps/web-antd/src/views/mes/home/chart-options.ts b/apps/web-antd/src/views/mes/home/chart-options.ts
index f2390563a..e83f2a8db 100644
--- a/apps/web-antd/src/views/mes/home/chart-options.ts
+++ b/apps/web-antd/src/views/mes/home/chart-options.ts
@@ -1,10 +1,12 @@
+import type { EChartsOption } from '@vben/plugins/echarts';
+
 /** 生产趋势折线图配置 */
 export function getProductionTrendChartOptions(
   dates: string[],
   quantities: number[],
   qualified: number[],
   unqualified: number[],
-): any {
+): EChartsOption {
   return {
     grid: { bottom: 40, left: 50, right: 20, top: 20 },
     legend: { bottom: 0, data: ['产量', '合格品', '不良品'] },
@@ -41,7 +43,7 @@ export function getProductionTrendChartOptions(
 /** 工单状态分布饼图配置 */
 export function getWorkOrderStatusChartOptions(
   data: Array<{ itemStyle: { color: string }; name: string; value: number }>,
-): any {
+): EChartsOption {
   return {
     legend: { bottom: 0, type: 'scroll' },
     series: [
diff --git a/apps/web-antd/src/views/mes/wm/transfer/data.ts b/apps/web-antd/src/views/mes/wm/transfer/data.ts
index 41caadaec..64f3f80cd 100644
--- a/apps/web-antd/src/views/mes/wm/transfer/data.ts
+++ b/apps/web-antd/src/views/mes/wm/transfer/data.ts
@@ -12,12 +12,13 @@ import { getDictOptions } from '@vben/hooks';
 
 import { Button } from 'ant-design-vue';
 
+import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { MdItemSelect } from '#/views/mes/md/item/components';
 import {
   MesAutoCodeRuleCode,
   MesWmTransferTypeEnum,
-} from '#/views/mes/utils/constants';
+} from '/constants';
 import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
 import {
   WmWarehouseAreaSelect,
@@ -130,6 +131,7 @@ export function useFormSchema(
       componentProps: {
         disabled: headerReadonly,
       },
+      rules: z.boolean().default(false),
       dependencies: {
         triggerFields: ['type'],
         show: (values) => values.type === MesWmTransferTypeEnum.OUTER,
diff --git a/apps/web-antd/src/views/mes/wm/transfer/index.vue b/apps/web-antd/src/views/mes/wm/transfer/index.vue
index aa6fe7535..56e173ab1 100644
--- a/apps/web-antd/src/views/mes/wm/transfer/index.vue
+++ b/apps/web-antd/src/views/mes/wm/transfer/index.vue
@@ -15,7 +15,7 @@ import {
   getTransferPage,
 } from '#/api/mes/wm/transfer';
 import { $t } from '#/locales';
-import { MesWmTransferStatusEnum } from '#/views/mes/utils/constants';
+import { MesWmTransferStatusEnum } from '/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
@@ -205,11 +205,10 @@ const [Grid, gridApi] = useVbenVxeGrid({
               type: 'link',
               danger: true,
               auth: ['mes:wm-transfer:update'],
-              ifShow: [
-                MesWmTransferStatusEnum.UNCONFIRMED,
-                MesWmTransferStatusEnum.APPROVING,
-                MesWmTransferStatusEnum.APPROVED,
-              ].includes(row.status),
+              ifShow:
+                row.status === MesWmTransferStatusEnum.UNCONFIRMED ||
+                row.status === MesWmTransferStatusEnum.APPROVING ||
+                row.status === MesWmTransferStatusEnum.APPROVED,
               popConfirm: {
                 title: '确认取消该转移单？取消后不可恢复。',
                 confirm: handleCancel.bind(null, row),
diff --git a/apps/web-antd/src/views/wms/home/modules/wms-home-inventory-chart-options.ts b/apps/web-antd/src/views/wms/home/modules/wms-home-inventory-chart-options.ts
index ce4ac4555..bc55e5d2d 100644
--- a/apps/web-antd/src/views/wms/home/modules/wms-home-inventory-chart-options.ts
+++ b/apps/web-antd/src/views/wms/home/modules/wms-home-inventory-chart-options.ts
@@ -1,13 +1,9 @@
-import type { useEcharts } from '@vben/plugins/echarts';
+import type { EChartsOption } from '@vben/plugins/echarts';
 
 import type { WmsHomeStatisticsApi } from '#/api/wms/home';
 
 import { formatQuantity } from '#/views/wms/utils/format';
 
-type WmsHomeChartOption = Parameters<
-  ReturnType<typeof useEcharts>['renderEcharts']
->[0];
-
 export interface InventoryChartItem {
   name: string;
   value: number;
@@ -44,7 +40,7 @@ function formatGoodsLegend(name: string, goodsShareList: InventoryChartItem[]) {
 /** 货物占比图表配置 */
 export function getGoodsShareChartOptions(
   goodsShareList: InventoryChartItem[],
-): WmsHomeChartOption {
+): EChartsOption {
   return {
     color: ['#2f7df6', '#18a058', '#f59e0b', '#7c3aed', '#14b8a6'],
     legend: {
@@ -78,7 +74,7 @@ export function getGoodsShareChartOptions(
 /** 库存分布图表配置 */
 export function getWarehouseDistributionChartOptions(
   warehouseDistributionList: InventoryChartItem[],
-): WmsHomeChartOption {
+): EChartsOption {
   const sortedList = warehouseDistributionList.toReversed();
   return {
     color: ['#2f7df6'],
diff --git a/apps/web-antd/src/views/wms/home/modules/wms-home-order-trend-chart-options.ts b/apps/web-antd/src/views/wms/home/modules/wms-home-order-trend-chart-options.ts
index 47d025cee..f2b6c5832 100644
--- a/apps/web-antd/src/views/wms/home/modules/wms-home-order-trend-chart-options.ts
+++ b/apps/web-antd/src/views/wms/home/modules/wms-home-order-trend-chart-options.ts
@@ -1,4 +1,4 @@
-import type { useEcharts } from '@vben/plugins/echarts';
+import type { EChartsOption } from '@vben/plugins/echarts';
 
 import type { WmsHomeStatisticsApi } from '#/api/wms/home';
 
@@ -6,11 +6,7 @@ import { DICT_TYPE } from '@vben/constants';
 import { getDictLabel } from '@vben/hooks';
 import { formatDate } from '@vben/utils';
 
-import { OrderTypeEnum } from '#/views/wms/utils/constants';
-
-type WmsHomeChartOption = Parameters<
-  ReturnType<typeof useEcharts>['renderEcharts']
->[0];
+import { OrderTypeEnum } from '/constants';
 
 interface OrderDefinition {
   color: string;
@@ -72,7 +68,7 @@ function formatTrendTime(time: number | string) {
 /** 单据趋势图表配置 */
 export function getOrderTrendChartOptions(
   list: WmsHomeStatisticsApi.OrderTrend[],
-): WmsHomeChartOption {
+): EChartsOption {
   const labels = list.map((item) => formatTrendTime(item.time));
   return {
     color: orderDefinitions.map((item) => item.color),
diff --git a/apps/web-ele/src/views/mes/home/chart-options.ts b/apps/web-ele/src/views/mes/home/chart-options.ts
index f2390563a..e83f2a8db 100644
--- a/apps/web-ele/src/views/mes/home/chart-options.ts
+++ b/apps/web-ele/src/views/mes/home/chart-options.ts
@@ -1,10 +1,12 @@
+import type { EChartsOption } from '@vben/plugins/echarts';
+
 /** 生产趋势折线图配置 */
 export function getProductionTrendChartOptions(
   dates: string[],
   quantities: number[],
   qualified: number[],
   unqualified: number[],
-): any {
+): EChartsOption {
   return {
     grid: { bottom: 40, left: 50, right: 20, top: 20 },
     legend: { bottom: 0, data: ['产量', '合格品', '不良品'] },
@@ -41,7 +43,7 @@ export function getProductionTrendChartOptions(
 /** 工单状态分布饼图配置 */
 export function getWorkOrderStatusChartOptions(
   data: Array<{ itemStyle: { color: string }; name: string; value: number }>,
-): any {
+): EChartsOption {
   return {
     legend: { bottom: 0, type: 'scroll' },
     series: [
diff --git a/apps/web-ele/src/views/mes/wm/transfer/data.ts b/apps/web-ele/src/views/mes/wm/transfer/data.ts
index c9a0f03f4..385f8183f 100644
--- a/apps/web-ele/src/views/mes/wm/transfer/data.ts
+++ b/apps/web-ele/src/views/mes/wm/transfer/data.ts
@@ -12,12 +12,13 @@ import { getDictOptions } from '@vben/hooks';
 
 import { ElButton } from 'element-plus';
 
+import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { MdItemSelect } from '#/views/mes/md/item/components';
 import {
   MesAutoCodeRuleCode,
   MesWmTransferTypeEnum,
-} from '#/views/mes/utils/constants';
+} from '/constants';
 import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
 import {
   WmWarehouseAreaSelect,
@@ -129,6 +130,7 @@ export function useFormSchema(
       componentProps: {
         disabled: headerReadonly,
       },
+      rules: z.boolean().default(false),
       dependencies: {
         triggerFields: ['type'],
         show: (values) => values.type === MesWmTransferTypeEnum.OUTER,
diff --git a/apps/web-ele/src/views/mes/wm/transfer/index.vue b/apps/web-ele/src/views/mes/wm/transfer/index.vue
new file mode 100644
index 000000000..82d13670a
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/transfer/index.vue
@@ -0,0 +1,225 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmTransferApi } from '#/api/mes/wm/transfer';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { ElButton, ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  cancelTransfer,
+  deleteTransfer,
+  exportTransfer,
+  getTransferPage,
+} from '#/api/mes/wm/transfer';
+import { $t } from '#/locales';
+import { MesWmTransferStatusEnum } from '/constants';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建转移单 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 查看转移单详情 */
+function handleDetail(row: MesWmTransferApi.Transfer) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 编辑转移单 */
+function handleEdit(row: MesWmTransferApi.Transfer) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 到货确认 */
+function handleConfirm(row: MesWmTransferApi.Transfer) {
+  formModalApi.setData({ formType: 'confirm', id: row.id }).open();
+}
+
+/** 执行上架 */
+function handleStock(row: MesWmTransferApi.Transfer) {
+  formModalApi.setData({ formType: 'stock', id: row.id }).open();
+}
+
+/** 执行转移 */
+function handleFinish(row: MesWmTransferApi.Transfer) {
+  formModalApi.setData({ formType: 'finish', id: row.id }).open();
+}
+
+/** 删除转移单 */
+async function handleDelete(row: MesWmTransferApi.Transfer) {
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.code]),
+  });
+  try {
+    await deleteTransfer(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
+}
+
+/** 取消转移单 */
+async function handleCancel(row: MesWmTransferApi.Transfer) {
+  await cancelTransfer(row.id!);
+  ElMessage.success('取消成功');
+  handleRefresh();
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportTransfer(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '转移单.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getTransferPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesWmTransferApi.Transfer>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【仓库】调拨单、装箱管理"
+        url="https://doc.iocoder.cn/mes/wm/transfer/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+
+    <Grid table-title="转移单列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['转移单']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:wm-transfer:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:wm-transfer:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <ElButton link type="primary" @click="handleDetail(row)">
+          {{ row.code }}
+        </ElButton>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:wm-transfer:update'],
+              ifShow: row.status === MesWmTransferStatusEnum.PREPARE,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:wm-transfer:delete'],
+              ifShow: row.status === MesWmTransferStatusEnum.PREPARE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+            {
+              label: '到货确认',
+              type: 'primary',
+              link: true,
+              auth: ['mes:wm-transfer:update'],
+              ifShow: row.status === MesWmTransferStatusEnum.UNCONFIRMED,
+              onClick: handleConfirm.bind(null, row),
+            },
+            {
+              label: '执行上架',
+              type: 'primary',
+              link: true,
+              auth: ['mes:wm-transfer:update'],
+              ifShow: row.status === MesWmTransferStatusEnum.APPROVING,
+              onClick: handleStock.bind(null, row),
+            },
+            {
+              label: '执行转移',
+              type: 'primary',
+              link: true,
+              auth: ['mes:wm-transfer:finish'],
+              ifShow: row.status === MesWmTransferStatusEnum.APPROVED,
+              onClick: handleFinish.bind(null, row),
+            },
+            {
+              label: '取消',
+              type: 'danger',
+              link: true,
+              auth: ['mes:wm-transfer:update'],
+              ifShow:
+                row.status === MesWmTransferStatusEnum.UNCONFIRMED ||
+                row.status === MesWmTransferStatusEnum.APPROVING ||
+                row.status === MesWmTransferStatusEnum.APPROVED,
+              popConfirm: {
+                title: '确认取消该转移单？取消后不可恢复。',
+                confirm: handleCancel.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/transfer/modules/form.vue b/apps/web-ele/src/views/mes/wm/transfer/modules/form.vue
new file mode 100644
index 000000000..c6a972619
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/transfer/modules/form.vue
@@ -0,0 +1,267 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesWmTransferApi } from '#/api/mes/wm/transfer';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElButton, ElDivider, ElMessage, ElPopconfirm } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  confirmTransfer,
+  createTransfer,
+  finishTransfer,
+  getTransfer,
+  stockTransfer,
+  submitTransfer,
+  updateTransfer,
+} from '#/api/mes/wm/transfer';
+import { $t } from '#/locales';
+import { MesWmTransferStatusEnum } from '/constants';
+
+import { useFormSchema } from '../data';
+import LineList from './line-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesWmTransferApi.Transfer>();
+const originalSnapshot = ref(''); // 表单原始数据快照，用于提交时跳过未变更的保存请求
+const isEditable = computed(() => // 是否为编辑模式（可保存）
+  ['create', 'update'].includes(formType.value),
+);
+const isConfirm = computed(() => formType.value === 'confirm'); // 是否为到货确认模式
+const isStock = computed(() => formType.value === 'stock'); // 是否为上架模式
+const isFinish = computed(() => formType.value === 'finish'); // 是否为执行转移模式
+const canSubmit = computed(() => // 编辑态草稿可提交
+  formType.value === 'update' &&
+  formData.value?.status === MesWmTransferStatusEnum.PREPARE,
+);
+const getTitle = computed(() => {
+  switch (formType.value) {
+    case 'confirm': {
+      return '到货确认';
+    }
+    case 'detail': {
+      return $t('ui.actionTitle.view', ['转移单']);
+    }
+    case 'finish': {
+      return '执行转移';
+    }
+    case 'stock': {
+      return '执行上架';
+    }
+    case 'update': {
+      return $t('ui.actionTitle.edit', ['转移单']);
+    }
+    default: {
+      return $t('ui.actionTitle.create', ['转移单']);
+    }
+  }
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+/** 提交转移单：表单有修改时先保存，再调用提交接口 */
+async function handleSubmit() {
+  const { valid } = await formApi.validate();
+  if (!valid || !formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    const current = JSON.stringify(await formApi.getValues());
+    if (current !== originalSnapshot.value) {
+      const data = (await formApi.getValues()) as MesWmTransferApi.Transfer;
+      await updateTransfer({ ...formData.value, ...data });
+      originalSnapshot.value = current;
+    }
+    await submitTransfer(formData.value.id);
+    ElMessage.success('提交成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 到货确认 */
+async function handleConfirm() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await confirmTransfer(formData.value.id);
+    ElMessage.success('确认成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 执行上架 */
+async function handleStock() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await stockTransfer(formData.value.id);
+    ElMessage.success('上架成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 执行转移 */
+async function handleFinish() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await finishTransfer(formData.value.id);
+    ElMessage.success('执行成功');
+    await modalApi.close();
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (!isEditable.value) {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data = (await formApi.getValues()) as MesWmTransferApi.Transfer;
+    try {
+      if (formData.value?.id) {
+        await updateTransfer({ ...formData.value, ...data });
+        formData.value = { ...formData.value, ...data };
+      } else {
+        const id = await createTransfer(data);
+        formData.value = {
+          ...data,
+          id,
+          status: MesWmTransferStatusEnum.PREPARE,
+        };
+        formType.value = 'update';
+        // 创建成功后切换编辑态，重挂 schema 并回填主键 / 状态
+        formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+        await formApi.setValues(formData.value);
+      }
+      originalSnapshot.value = JSON.stringify(await formApi.getValues());
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      originalSnapshot.value = '';
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    modalApi.setState({ showConfirmButton: isEditable.value });
+    if (data?.id) {
+      modalApi.lock();
+      try {
+        formData.value = await getTransfer(data.id);
+        // 设置到 values
+        await formApi.setValues(formData.value);
+      } finally {
+        modalApi.unlock();
+      }
+    }
+    originalSnapshot.value = JSON.stringify(await formApi.getValues());
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+    <!-- 非新建模式展示物料信息 -->
+    <template v-if="formData?.id">
+      <ElDivider>物料信息</ElDivider>
+      <div class="mx-4">
+        <LineList :form-type="formType" :transfer-id="formData.id" />
+      </div>
+    </template>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center gap-2">
+        <ElPopconfirm
+          v-if="canSubmit"
+          title="确认提交该转移单？【提交后将不能修改】"
+          width="280"
+          @confirm="handleSubmit"
+        >
+          <template #reference>
+            <ElButton type="primary">提交</ElButton>
+          </template>
+        </ElPopconfirm>
+        <ElPopconfirm
+          v-if="isConfirm"
+          title="确认到货后，将进入待上架状态，是否继续？"
+          width="280"
+          @confirm="handleConfirm"
+        >
+          <template #reference>
+            <ElButton type="primary">到货确认</ElButton>
+          </template>
+        </ElPopconfirm>
+        <ElPopconfirm
+          v-if="isStock"
+          title="确认执行上架？"
+          width="220"
+          @confirm="handleStock"
+        >
+          <template #reference>
+            <ElButton type="primary">执行上架</ElButton>
+          </template>
+        </ElPopconfirm>
+        <ElPopconfirm
+          v-if="isFinish"
+          title="确认执行调拨？执行后将更新库存。"
+          width="280"
+          @confirm="handleFinish"
+        >
+          <template #reference>
+            <ElButton type="primary">执行转移</ElButton>
+          </template>
+        </ElPopconfirm>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/wms/home/modules/wms-home-inventory-chart-options.ts b/apps/web-ele/src/views/wms/home/modules/wms-home-inventory-chart-options.ts
index ce4ac4555..bc55e5d2d 100644
--- a/apps/web-ele/src/views/wms/home/modules/wms-home-inventory-chart-options.ts
+++ b/apps/web-ele/src/views/wms/home/modules/wms-home-inventory-chart-options.ts
@@ -1,13 +1,9 @@
-import type { useEcharts } from '@vben/plugins/echarts';
+import type { EChartsOption } from '@vben/plugins/echarts';
 
 import type { WmsHomeStatisticsApi } from '#/api/wms/home';
 
 import { formatQuantity } from '#/views/wms/utils/format';
 
-type WmsHomeChartOption = Parameters<
-  ReturnType<typeof useEcharts>['renderEcharts']
->[0];
-
 export interface InventoryChartItem {
   name: string;
   value: number;
@@ -44,7 +40,7 @@ function formatGoodsLegend(name: string, goodsShareList: InventoryChartItem[]) {
 /** 货物占比图表配置 */
 export function getGoodsShareChartOptions(
   goodsShareList: InventoryChartItem[],
-): WmsHomeChartOption {
+): EChartsOption {
   return {
     color: ['#2f7df6', '#18a058', '#f59e0b', '#7c3aed', '#14b8a6'],
     legend: {
@@ -78,7 +74,7 @@ export function getGoodsShareChartOptions(
 /** 库存分布图表配置 */
 export function getWarehouseDistributionChartOptions(
   warehouseDistributionList: InventoryChartItem[],
-): WmsHomeChartOption {
+): EChartsOption {
   const sortedList = warehouseDistributionList.toReversed();
   return {
     color: ['#2f7df6'],
diff --git a/apps/web-ele/src/views/wms/home/modules/wms-home-order-trend-chart-options.ts b/apps/web-ele/src/views/wms/home/modules/wms-home-order-trend-chart-options.ts
index 47d025cee..f2b6c5832 100644
--- a/apps/web-ele/src/views/wms/home/modules/wms-home-order-trend-chart-options.ts
+++ b/apps/web-ele/src/views/wms/home/modules/wms-home-order-trend-chart-options.ts
@@ -1,4 +1,4 @@
-import type { useEcharts } from '@vben/plugins/echarts';
+import type { EChartsOption } from '@vben/plugins/echarts';
 
 import type { WmsHomeStatisticsApi } from '#/api/wms/home';
 
@@ -6,11 +6,7 @@ import { DICT_TYPE } from '@vben/constants';
 import { getDictLabel } from '@vben/hooks';
 import { formatDate } from '@vben/utils';
 
-import { OrderTypeEnum } from '#/views/wms/utils/constants';
-
-type WmsHomeChartOption = Parameters<
-  ReturnType<typeof useEcharts>['renderEcharts']
->[0];
+import { OrderTypeEnum } from '/constants';
 
 interface OrderDefinition {
   color: string;
@@ -72,7 +68,7 @@ function formatTrendTime(time: number | string) {
 /** 单据趋势图表配置 */
 export function getOrderTrendChartOptions(
   list: WmsHomeStatisticsApi.OrderTrend[],
-): WmsHomeChartOption {
+): EChartsOption {
   const labels = list.map((item) => formatTrendTime(item.time));
   return {
     color: orderDefinitions.map((item) => item.color),
diff --git a/packages/effects/plugins/src/echarts/index.ts b/packages/effects/plugins/src/echarts/index.ts
index acb0f1e25..dbc5e2e11 100644
--- a/packages/effects/plugins/src/echarts/index.ts
+++ b/packages/effects/plugins/src/echarts/index.ts
@@ -1,4 +1,6 @@
-export * from './echarts';
 export { default as EchartsUI } from './echarts-ui.vue';
-export * from './types';
+export type { ECOption } from './types';
 export * from './use-echarts';
+
+// add by 芋艿：额外透出 echarts 原生 EChartsOption 类型，方便业务模块（如 mes/home 图表配置）声明 option 返回值类型，避免业务侧直接依赖 echarts 包（apps 未把 echarts 列为直接依赖）
+export type { EChartsOption } from 'echarts';

From c9a32ba780b8bc69bae54a3ef60edc4145298ba5 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 30 May 2026 16:51:13 +0800
Subject: [PATCH 51/52] =?UTF-8?q?```text=20refactor:=20=E8=BF=81=E7=A7=BB?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=20constants=20=E5=88=B0=E5=85=B1=E4=BA=AB?=
 =?UTF-8?q?=E5=B8=B8=E9=87=8F=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增 MES/WMS 共享业务常量导出
- 将 Mall 客服、IoT 缺失常量合并到 @vben/constants
- 替换各模块本地 constants 引用
- 删除模块内重复 constants 文件
```
---
 .../src/views/mall/promotion/kefu/index.vue   |   2 +-
 .../kefu/modules/conversation-list.vue        |   2 +-
 .../promotion/kefu/modules/message-list.vue   |   3 +-
 .../promotion/kefu/modules/tools/constants.ts |  17 -
 .../components/calendar-date-cell.vue         |   4 +-
 .../cal/calendar/components/use-calendar.ts   |   3 +-
 .../src/views/mes/cal/holiday/data.ts         |   3 +-
 .../src/views/mes/cal/holiday/index.vue       |   2 +-
 .../views/mes/cal/holiday/modules/form.vue    |   2 +-
 apps/web-antd/src/views/mes/cal/plan/data.ts  |   8 +-
 .../web-antd/src/views/mes/cal/plan/index.vue |   2 +-
 .../src/views/mes/cal/plan/modules/form.vue   |   2 +-
 apps/web-antd/src/views/mes/cal/team/data.ts  |   3 +-
 .../src/views/mes/dv/checkplan/data.ts        |   7 +-
 .../src/views/mes/dv/checkplan/index.vue      |   2 +-
 .../views/mes/dv/checkplan/modules/form.vue   |   2 +-
 .../src/views/mes/dv/checkrecord/data.ts      |   7 +-
 .../src/views/mes/dv/checkrecord/index.vue    |   2 +-
 .../views/mes/dv/checkrecord/modules/form.vue |   2 +-
 .../mes/dv/checkrecord/modules/line-list.vue  |   3 +-
 .../src/views/mes/dv/machinery/data.ts        |   3 +-
 .../views/mes/dv/machinery/modules/form.vue   |   2 +-
 .../src/views/mes/dv/machinery/type/data.ts   |   5 +-
 .../src/views/mes/dv/maintenrecord/data.ts    |   7 +-
 .../src/views/mes/dv/maintenrecord/index.vue  |   2 +-
 .../mes/dv/maintenrecord/modules/form.vue     |   2 +-
 .../dv/maintenrecord/modules/line-list.vue    |   3 +-
 apps/web-antd/src/views/mes/dv/repair/data.ts |   3 +-
 .../src/views/mes/dv/repair/index.vue         |   2 +-
 .../src/views/mes/dv/repair/modules/form.vue  |   2 +-
 .../web-antd/src/views/mes/dv/subject/data.ts |   5 +-
 apps/web-antd/src/views/mes/home/data.ts      |   2 +-
 .../src/views/mes/md/autocode/data.ts         |   3 +-
 .../mes/md/autocode/modules/part-form.vue     |   2 +-
 apps/web-antd/src/views/mes/md/client/data.ts |   5 +-
 apps/web-antd/src/views/mes/md/item/data.ts   |   5 +-
 .../src/views/mes/md/item/modules/form.vue    |   2 +-
 .../item/modules/item-batch-config-form.vue   |   3 +-
 .../src/views/mes/md/item/type/data.ts        |   8 +-
 apps/web-antd/src/views/mes/md/vendor/data.ts |   5 +-
 .../src/views/mes/md/workstation/data.ts      |   5 +-
 .../src/views/mes/md/workstation/index.vue    |   2 +-
 .../views/mes/md/workstation/modules/form.vue |   2 +-
 .../views/mes/md/workstation/workshop/data.ts |   5 +-
 .../md/workstation/workshop/modules/form.vue  |   2 +-
 .../src/views/mes/pro/andon/record/data.ts    |   3 +-
 .../src/views/mes/pro/andon/record/index.vue  |   2 +-
 .../mes/pro/andon/record/modules/form.vue     |   2 +-
 apps/web-antd/src/views/mes/pro/card/data.ts  |   6 +-
 .../web-antd/src/views/mes/pro/card/index.vue |   2 +-
 .../src/views/mes/pro/card/modules/form.vue   |   8 +-
 .../src/views/mes/pro/feedback/data.ts        |   7 +-
 .../src/views/mes/pro/feedback/index.vue      |   2 +-
 .../views/mes/pro/feedback/modules/form.vue   |   8 +-
 .../src/views/mes/pro/process/data.ts         |   5 +-
 apps/web-antd/src/views/mes/pro/route/data.ts |   5 +-
 .../mes/pro/task/components/gantt-chart.vue   |   4 +-
 .../web-antd/src/views/mes/pro/task/index.vue |   8 +-
 .../src/views/mes/pro/workorder/data.ts       |   7 +-
 .../src/views/mes/pro/workorder/index.vue     |  10 +-
 .../mes/pro/workorder/modules/bom-list.vue    |   8 +-
 .../views/mes/pro/workorder/modules/form.vue  |   8 +-
 .../components/work-record-status-bar.vue     |   2 +-
 apps/web-antd/src/views/mes/qc/defect/data.ts |   3 +-
 .../src/views/mes/qc/indicator/data.ts        |   6 +-
 .../mes/qc/indicatorresult/components/data.ts |   3 +-
 .../components/qc-indicator-result-form.vue   |   2 +-
 apps/web-antd/src/views/mes/qc/ipqc/data.ts   |   7 +-
 apps/web-antd/src/views/mes/qc/ipqc/index.vue |   2 +-
 .../src/views/mes/qc/ipqc/modules/form.vue    |   2 +-
 .../views/mes/qc/ipqc/modules/line-list.vue   |   2 +-
 apps/web-antd/src/views/mes/qc/iqc/data.ts    |   3 +-
 apps/web-antd/src/views/mes/qc/iqc/index.vue  |   2 +-
 .../src/views/mes/qc/iqc/modules/form.vue     |   2 +-
 .../views/mes/qc/iqc/modules/line-list.vue    |   2 +-
 apps/web-antd/src/views/mes/qc/oqc/data.ts    |   3 +-
 apps/web-antd/src/views/mes/qc/oqc/index.vue  |   2 +-
 .../src/views/mes/qc/oqc/modules/form.vue     |   2 +-
 .../views/mes/qc/oqc/modules/line-list.vue    |   2 +-
 .../src/views/mes/qc/pendinginspect/index.vue |   2 +-
 apps/web-antd/src/views/mes/qc/rqc/data.ts    |   6 +-
 apps/web-antd/src/views/mes/qc/rqc/index.vue  |   2 +-
 .../src/views/mes/qc/rqc/modules/form.vue     |   2 +-
 .../views/mes/qc/rqc/modules/line-list.vue    |   2 +-
 .../src/views/mes/qc/template/data.ts         |   5 +-
 apps/web-antd/src/views/mes/tm/tool/data.ts   |   7 +-
 .../src/views/mes/tm/tool/modules/form.vue    |   2 +-
 .../src/views/mes/tm/tool/type/data.ts        |   3 +-
 .../src/views/mes/wm/arrivalnotice/data.ts    |   3 +-
 .../src/views/mes/wm/arrivalnotice/index.vue  |   2 +-
 .../mes/wm/arrivalnotice/modules/form.vue     |   2 +-
 .../web-antd/src/views/mes/wm/barcode/data.ts |   5 +-
 .../src/views/mes/wm/barcode/modules/form.vue |   3 +-
 .../src/views/mes/wm/itemreceipt/data.ts      |   6 +-
 .../src/views/mes/wm/itemreceipt/index.vue    |   2 +-
 .../views/mes/wm/itemreceipt/modules/form.vue |   2 +-
 .../src/views/mes/wm/miscissue/data.ts        |   3 +-
 .../src/views/mes/wm/miscissue/index.vue      |   2 +-
 .../views/mes/wm/miscissue/modules/form.vue   |   2 +-
 .../src/views/mes/wm/miscreceipt/data.ts      |   3 +-
 .../src/views/mes/wm/miscreceipt/index.vue    |   2 +-
 .../views/mes/wm/miscreceipt/modules/form.vue |   2 +-
 .../src/views/mes/wm/outsourceissue/data.ts   |   7 +-
 .../src/views/mes/wm/outsourceissue/index.vue |   2 +-
 .../mes/wm/outsourceissue/modules/form.vue    |   2 +-
 .../src/views/mes/wm/outsourcereceipt/data.ts |   7 +-
 .../views/mes/wm/outsourcereceipt/index.vue   |   2 +-
 .../mes/wm/outsourcereceipt/modules/form.vue  |   2 +-
 .../components/wm-package-select-dialog.vue   |   3 +-
 .../src/views/mes/wm/packages/data.ts         |   6 +-
 .../src/views/mes/wm/packages/index.vue       |   2 +-
 .../views/mes/wm/packages/modules/form.vue    |   2 +-
 .../src/views/mes/wm/productissue/data.ts     |   6 +-
 .../src/views/mes/wm/productissue/index.vue   |   2 +-
 .../mes/wm/productissue/modules/form.vue      |   2 +-
 .../src/views/mes/wm/productreceipt/data.ts   |   6 +-
 .../src/views/mes/wm/productreceipt/index.vue |   2 +-
 .../mes/wm/productreceipt/modules/form.vue    |   2 +-
 .../wm/productreceipt/modules/line-list.vue   |   2 +-
 .../src/views/mes/wm/productsales/data.ts     |   6 +-
 .../src/views/mes/wm/productsales/index.vue   |   2 +-
 .../mes/wm/productsales/modules/form.vue      |   2 +-
 .../src/views/mes/wm/returnissue/data.ts      |   6 +-
 .../src/views/mes/wm/returnissue/index.vue    |   2 +-
 .../views/mes/wm/returnissue/modules/form.vue |   2 +-
 .../mes/wm/returnissue/modules/line-list.vue  |   2 +-
 .../src/views/mes/wm/returnsales/data.ts      |   3 +-
 .../src/views/mes/wm/returnsales/index.vue    |   2 +-
 .../views/mes/wm/returnsales/modules/form.vue |   2 +-
 .../src/views/mes/wm/returnvendor/data.ts     |   3 +-
 .../src/views/mes/wm/returnvendor/index.vue   |   2 +-
 .../mes/wm/returnvendor/modules/form.vue      |   2 +-
 .../src/views/mes/wm/salesnotice/data.ts      |   3 +-
 .../src/views/mes/wm/salesnotice/index.vue    |   2 +-
 .../views/mes/wm/salesnotice/modules/form.vue |   2 +-
 .../src/views/mes/wm/stocktaking/plan/data.ts |   8 +-
 .../stocktaking/plan/modules/param-form.vue   |   3 +-
 .../src/views/mes/wm/stocktaking/task/data.ts |   6 +-
 .../views/mes/wm/stocktaking/task/index.vue   |   2 +-
 .../mes/wm/stocktaking/task/modules/form.vue  |   2 +-
 .../src/views/mes/wm/transfer/data.ts         |   6 +-
 .../src/views/mes/wm/transfer/index.vue       |   2 +-
 .../views/mes/wm/transfer/modules/form.vue    |   2 +-
 .../src/views/mes/wm/warehouse/area/data.ts   |   5 +-
 .../src/views/mes/wm/warehouse/area/index.vue |   2 +-
 .../mes/wm/warehouse/area/modules/form.vue    |   2 +-
 .../src/views/mes/wm/warehouse/data.ts        |   3 +-
 .../src/views/mes/wm/warehouse/index.vue      |   2 +-
 .../views/mes/wm/warehouse/location/data.ts   |   3 +-
 .../views/mes/wm/warehouse/location/index.vue |   2 +-
 .../wm/warehouse/location/modules/form.vue    |   2 +-
 .../views/mes/wm/warehouse/modules/form.vue   |   2 +-
 .../modules/wms-home-order-summary-cards.vue  |   3 +-
 .../wms-home-order-trend-chart-options.ts     |   4 +-
 .../src/views/wms/md/item/brand/data.ts       |   3 +-
 .../src/views/wms/md/item/category/data.ts    |   5 +-
 apps/web-antd/src/views/wms/md/item/data.ts   |   3 +-
 .../views/wms/md/item/modules/sku-form.vue    |   3 +-
 .../merchant/components/merchant-select.vue   |   9 +-
 .../src/views/wms/md/merchant/data.ts         |   3 +-
 .../src/views/wms/md/warehouse/data.ts        |   3 +-
 .../src/views/wms/order/check/index.vue       |  10 +-
 .../views/wms/order/check/modules/form.vue    |   8 +-
 .../src/views/wms/order/movement/index.vue    |  10 +-
 .../views/wms/order/movement/modules/form.vue |   8 +-
 .../src/views/wms/order/receipt/index.vue     |  10 +-
 .../views/wms/order/receipt/modules/form.vue  |   8 +-
 .../src/views/wms/order/shipment/index.vue    |  10 +-
 .../views/wms/order/shipment/modules/form.vue |   8 +-
 .../detail/modules/modbus-config-form.vue     |   8 +-
 .../device/detail/modules/modbus-config.vue   |   3 +-
 .../detail/modules/modbus-point-form.vue      |  10 +-
 .../device/detail/modules/simulator.vue       |   6 +-
 .../detail/modules/thing-model-event.vue      |   6 +-
 .../modules/thing-model-property-history.vue  |   2 +-
 .../detail/modules/thing-model-service.vue    |   6 +-
 .../iot/home/modules/device-map-card.vue      |   3 +-
 .../views/iot/ota/modules/detail/index.vue    |   2 +-
 .../iot/ota/modules/firmware-detail/index.vue |   2 +-
 .../iot/ota/modules/task/ota-task-detail.vue  |   2 +-
 .../iot/ota/modules/task/ota-task-form.vue    |   2 +-
 .../iot/ota/modules/task/ota-task-list.vue    |   2 +-
 .../rule/components/source-config-form.vue    |   3 +-
 .../scene/form/configs/condition-config.vue   |   8 +-
 .../configs/current-time-condition-config.vue |   3 +-
 .../form/configs/device-control-config.vue    |  10 +-
 .../configs/main-condition-inner-config.vue   |   8 +-
 .../configs/sub-condition-group-config.vue    |   9 +-
 .../scene/form/inputs/json-params-input.vue   |  13 +-
 .../rule/scene/form/inputs/value-input.vue    |   8 +-
 .../iot/rule/scene/form/rule-scene-form.vue   |   7 +-
 .../scene/form/sections/action-section.vue    |  11 +-
 .../scene/form/sections/trigger-section.vue   |  10 +-
 .../scene/form/selectors/device-selector.vue  |   3 +-
 .../form/selectors/operator-selector.vue      |   8 +-
 .../form/selectors/property-selector.vue      |  14 +-
 .../src/views/iot/thingmodel/index.vue        |   2 +-
 .../modules/components/data-definition.vue    |   6 +-
 .../thing-model-array-data-specs.vue          |   8 +-
 .../thing-model-struct-data-specs.vue         |   3 +-
 .../thingmodel/modules/thing-model-event.vue  |   9 +-
 .../thingmodel/modules/thing-model-form.vue   |   7 +-
 .../thing-model-input-output-param.vue        |   3 +-
 .../modules/thing-model-property.vue          |  11 +-
 .../modules/thing-model-service.vue           |   9 +-
 .../thingmodel/modules/thing-model-tsl.vue    |   3 +-
 .../src/views/iot/utils/constants.ts          | 656 ------------------
 .../src/views/mall/promotion/kefu/index.vue   |   2 +-
 .../kefu/modules/conversation-list.vue        |   2 +-
 .../promotion/kefu/modules/message-list.vue   |   3 +-
 .../promotion/kefu/modules/tools/constants.ts |  17 -
 .../src/views/mall/promotion/kefu/index.vue   |   2 +-
 .../kefu/modules/conversation-list.vue        |   2 +-
 .../promotion/kefu/modules/message-list.vue   |   3 +-
 .../promotion/kefu/modules/tools/constants.ts |  17 -
 .../components/calendar-date-cell.vue         |   4 +-
 .../cal/calendar/components/use-calendar.ts   |   3 +-
 .../web-ele/src/views/mes/cal/holiday/data.ts |   3 +-
 .../src/views/mes/cal/holiday/index.vue       |   2 +-
 .../views/mes/cal/holiday/modules/form.vue    |   2 +-
 apps/web-ele/src/views/mes/cal/plan/data.ts   |   8 +-
 apps/web-ele/src/views/mes/cal/plan/index.vue |   2 +-
 .../src/views/mes/cal/plan/modules/form.vue   |   2 +-
 apps/web-ele/src/views/mes/cal/team/data.ts   |   3 +-
 .../src/views/mes/dv/checkplan/data.ts        |   7 +-
 .../src/views/mes/dv/checkplan/index.vue      |   2 +-
 .../views/mes/dv/checkplan/modules/form.vue   |   2 +-
 .../src/views/mes/dv/checkrecord/data.ts      |   7 +-
 .../src/views/mes/dv/checkrecord/index.vue    |   2 +-
 .../views/mes/dv/checkrecord/modules/form.vue |   2 +-
 .../mes/dv/checkrecord/modules/line-list.vue  |   3 +-
 .../src/views/mes/dv/machinery/data.ts        |   3 +-
 .../views/mes/dv/machinery/modules/form.vue   |   2 +-
 .../src/views/mes/dv/machinery/type/data.ts   |   5 +-
 .../src/views/mes/dv/maintenrecord/data.ts    |   7 +-
 .../src/views/mes/dv/maintenrecord/index.vue  |   2 +-
 .../mes/dv/maintenrecord/modules/form.vue     |   2 +-
 .../dv/maintenrecord/modules/line-list.vue    |   3 +-
 apps/web-ele/src/views/mes/dv/repair/data.ts  |   3 +-
 .../web-ele/src/views/mes/dv/repair/index.vue |   2 +-
 .../src/views/mes/dv/repair/modules/form.vue  |   2 +-
 apps/web-ele/src/views/mes/dv/subject/data.ts |   5 +-
 apps/web-ele/src/views/mes/home/data.ts       |   2 +-
 .../web-ele/src/views/mes/md/autocode/data.ts |   3 +-
 .../mes/md/autocode/modules/part-form.vue     |   2 +-
 apps/web-ele/src/views/mes/md/client/data.ts  |   5 +-
 apps/web-ele/src/views/mes/md/item/data.ts    |   5 +-
 .../src/views/mes/md/item/modules/form.vue    |   2 +-
 .../item/modules/item-batch-config-form.vue   |   3 +-
 .../src/views/mes/md/item/type/data.ts        |   8 +-
 apps/web-ele/src/views/mes/md/vendor/data.ts  |   5 +-
 .../src/views/mes/md/workstation/data.ts      |   5 +-
 .../src/views/mes/md/workstation/index.vue    |   2 +-
 .../views/mes/md/workstation/modules/form.vue |   2 +-
 .../views/mes/md/workstation/workshop/data.ts |   5 +-
 .../md/workstation/workshop/modules/form.vue  |   2 +-
 .../src/views/mes/pro/andon/record/data.ts    |   3 +-
 .../src/views/mes/pro/andon/record/index.vue  |   2 +-
 .../mes/pro/andon/record/modules/form.vue     |   2 +-
 apps/web-ele/src/views/mes/pro/card/data.ts   |   6 +-
 apps/web-ele/src/views/mes/pro/card/index.vue |   2 +-
 .../src/views/mes/pro/card/modules/form.vue   |   8 +-
 .../src/views/mes/pro/feedback/data.ts        |   7 +-
 .../src/views/mes/pro/feedback/index.vue      |   2 +-
 .../views/mes/pro/feedback/modules/form.vue   |   8 +-
 .../web-ele/src/views/mes/pro/process/data.ts |   5 +-
 apps/web-ele/src/views/mes/pro/route/data.ts  |   5 +-
 .../mes/pro/task/components/gantt-chart.vue   |   4 +-
 apps/web-ele/src/views/mes/pro/task/index.vue |   8 +-
 .../src/views/mes/pro/workorder/data.ts       |   7 +-
 .../src/views/mes/pro/workorder/index.vue     |  10 +-
 .../mes/pro/workorder/modules/bom-list.vue    |   8 +-
 .../views/mes/pro/workorder/modules/form.vue  |   8 +-
 .../components/work-record-status-bar.vue     |   2 +-
 apps/web-ele/src/views/mes/qc/defect/data.ts  |   3 +-
 .../src/views/mes/qc/indicator/data.ts        |   6 +-
 .../mes/qc/indicatorresult/components/data.ts |   3 +-
 .../components/qc-indicator-result-form.vue   |   2 +-
 apps/web-ele/src/views/mes/qc/ipqc/data.ts    |   7 +-
 apps/web-ele/src/views/mes/qc/ipqc/index.vue  |   2 +-
 .../src/views/mes/qc/ipqc/modules/form.vue    |   2 +-
 .../views/mes/qc/ipqc/modules/line-list.vue   |   2 +-
 apps/web-ele/src/views/mes/qc/iqc/data.ts     |   3 +-
 apps/web-ele/src/views/mes/qc/iqc/index.vue   |   2 +-
 .../src/views/mes/qc/iqc/modules/form.vue     |   2 +-
 .../views/mes/qc/iqc/modules/line-list.vue    |   2 +-
 apps/web-ele/src/views/mes/qc/oqc/data.ts     |   3 +-
 apps/web-ele/src/views/mes/qc/oqc/index.vue   |   2 +-
 .../src/views/mes/qc/oqc/modules/form.vue     |   2 +-
 .../views/mes/qc/oqc/modules/line-list.vue    |   2 +-
 .../src/views/mes/qc/pendinginspect/index.vue |   2 +-
 apps/web-ele/src/views/mes/qc/rqc/data.ts     |   6 +-
 apps/web-ele/src/views/mes/qc/rqc/index.vue   |   2 +-
 .../src/views/mes/qc/rqc/modules/form.vue     |   2 +-
 .../views/mes/qc/rqc/modules/line-list.vue    |   2 +-
 .../web-ele/src/views/mes/qc/template/data.ts |   5 +-
 apps/web-ele/src/views/mes/tm/tool/data.ts    |   7 +-
 .../src/views/mes/tm/tool/modules/form.vue    |   2 +-
 .../src/views/mes/tm/tool/type/data.ts        |   3 +-
 apps/web-ele/src/views/mes/utils/constants.ts | 504 --------------
 .../src/views/mes/wm/arrivalnotice/data.ts    |   3 +-
 .../src/views/mes/wm/arrivalnotice/index.vue  |   2 +-
 .../mes/wm/arrivalnotice/modules/form.vue     |   2 +-
 apps/web-ele/src/views/mes/wm/barcode/data.ts |   5 +-
 .../src/views/mes/wm/barcode/modules/form.vue |   3 +-
 .../src/views/mes/wm/itemreceipt/data.ts      |   6 +-
 .../src/views/mes/wm/itemreceipt/index.vue    |   2 +-
 .../views/mes/wm/itemreceipt/modules/form.vue |   2 +-
 .../src/views/mes/wm/miscissue/data.ts        |   3 +-
 .../src/views/mes/wm/miscissue/index.vue      |   2 +-
 .../views/mes/wm/miscissue/modules/form.vue   |   2 +-
 .../src/views/mes/wm/miscreceipt/data.ts      |   3 +-
 .../src/views/mes/wm/miscreceipt/index.vue    |   2 +-
 .../views/mes/wm/miscreceipt/modules/form.vue |   2 +-
 .../src/views/mes/wm/outsourceissue/data.ts   |   7 +-
 .../src/views/mes/wm/outsourceissue/index.vue |   2 +-
 .../mes/wm/outsourceissue/modules/form.vue    |   2 +-
 .../src/views/mes/wm/outsourcereceipt/data.ts |   7 +-
 .../views/mes/wm/outsourcereceipt/index.vue   |   2 +-
 .../mes/wm/outsourcereceipt/modules/form.vue  |   2 +-
 .../components/wm-package-select-dialog.vue   |   3 +-
 .../web-ele/src/views/mes/wm/packages/data.ts |   6 +-
 .../src/views/mes/wm/packages/index.vue       |   2 +-
 .../views/mes/wm/packages/modules/form.vue    |   2 +-
 .../src/views/mes/wm/productissue/data.ts     |   6 +-
 .../src/views/mes/wm/productissue/index.vue   |   2 +-
 .../mes/wm/productissue/modules/form.vue      |   2 +-
 .../src/views/mes/wm/productreceipt/data.ts   |   6 +-
 .../src/views/mes/wm/productreceipt/index.vue |   2 +-
 .../mes/wm/productreceipt/modules/form.vue    |   2 +-
 .../wm/productreceipt/modules/line-list.vue   |   2 +-
 .../src/views/mes/wm/productsales/data.ts     |   6 +-
 .../src/views/mes/wm/productsales/index.vue   |   2 +-
 .../mes/wm/productsales/modules/form.vue      |   2 +-
 .../src/views/mes/wm/returnissue/data.ts      |   6 +-
 .../src/views/mes/wm/returnissue/index.vue    |   2 +-
 .../views/mes/wm/returnissue/modules/form.vue |   2 +-
 .../mes/wm/returnissue/modules/line-list.vue  |   2 +-
 .../src/views/mes/wm/returnsales/data.ts      |   3 +-
 .../src/views/mes/wm/returnsales/index.vue    |   2 +-
 .../views/mes/wm/returnsales/modules/form.vue |   2 +-
 .../src/views/mes/wm/returnvendor/data.ts     |   3 +-
 .../src/views/mes/wm/returnvendor/index.vue   |   2 +-
 .../mes/wm/returnvendor/modules/form.vue      |   2 +-
 .../src/views/mes/wm/salesnotice/data.ts      |   3 +-
 .../src/views/mes/wm/salesnotice/index.vue    |   2 +-
 .../views/mes/wm/salesnotice/modules/form.vue |   2 +-
 .../src/views/mes/wm/stocktaking/plan/data.ts |   8 +-
 .../stocktaking/plan/modules/param-form.vue   |   3 +-
 .../src/views/mes/wm/stocktaking/task/data.ts |   6 +-
 .../views/mes/wm/stocktaking/task/index.vue   |   2 +-
 .../mes/wm/stocktaking/task/modules/form.vue  |   2 +-
 .../web-ele/src/views/mes/wm/transfer/data.ts |   6 +-
 .../src/views/mes/wm/transfer/index.vue       |   2 +-
 .../views/mes/wm/transfer/modules/form.vue    |   2 +-
 .../src/views/mes/wm/warehouse/area/data.ts   |   5 +-
 .../src/views/mes/wm/warehouse/area/index.vue |   2 +-
 .../mes/wm/warehouse/area/modules/form.vue    |   2 +-
 .../src/views/mes/wm/warehouse/data.ts        |   3 +-
 .../src/views/mes/wm/warehouse/index.vue      |   2 +-
 .../views/mes/wm/warehouse/location/data.ts   |   3 +-
 .../views/mes/wm/warehouse/location/index.vue |   2 +-
 .../wm/warehouse/location/modules/form.vue    |   2 +-
 .../views/mes/wm/warehouse/modules/form.vue   |   2 +-
 .../modules/wms-home-order-summary-cards.vue  |   3 +-
 .../wms-home-order-trend-chart-options.ts     |   4 +-
 .../src/views/wms/md/item/brand/data.ts       |   3 +-
 .../src/views/wms/md/item/category/data.ts    |   5 +-
 apps/web-ele/src/views/wms/md/item/data.ts    |   3 +-
 .../views/wms/md/item/modules/sku-form.vue    |   3 +-
 .../merchant/components/merchant-select.vue   |   9 +-
 .../web-ele/src/views/wms/md/merchant/data.ts |   3 +-
 .../src/views/wms/md/warehouse/data.ts        |   3 +-
 .../src/views/wms/order/check/index.vue       |  10 +-
 .../views/wms/order/check/modules/form.vue    |   8 +-
 .../src/views/wms/order/movement/index.vue    |  10 +-
 .../views/wms/order/movement/modules/form.vue |   8 +-
 .../src/views/wms/order/receipt/index.vue     |  10 +-
 .../views/wms/order/receipt/modules/form.vue  |   8 +-
 .../src/views/wms/order/shipment/index.vue    |  10 +-
 .../views/wms/order/shipment/modules/form.vue |   8 +-
 apps/web-ele/src/views/wms/utils/constants.ts |  58 --
 packages/constants/src/biz-iot-enum.ts        |  21 +
 packages/constants/src/biz-mall-enum.ts       |  18 +
 .../constants/src/biz-mes-enum.ts             |   0
 .../constants/src/biz-wms-enum.ts             |   0
 packages/constants/src/index.ts               |   2 +
 387 files changed, 626 insertions(+), 2165 deletions(-)
 delete mode 100644 apps/web-antd/src/views/mall/promotion/kefu/modules/tools/constants.ts
 delete mode 100644 apps/web-antdv-next/src/views/iot/utils/constants.ts
 delete mode 100644 apps/web-antdv-next/src/views/mall/promotion/kefu/modules/tools/constants.ts
 delete mode 100644 apps/web-ele/src/views/mall/promotion/kefu/modules/tools/constants.ts
 delete mode 100644 apps/web-ele/src/views/mes/utils/constants.ts
 delete mode 100644 apps/web-ele/src/views/wms/utils/constants.ts
 rename apps/web-antd/src/views/mes/utils/constants.ts => packages/constants/src/biz-mes-enum.ts (100%)
 rename apps/web-antd/src/views/wms/utils/constants.ts => packages/constants/src/biz-wms-enum.ts (100%)

diff --git a/apps/web-antd/src/views/mall/promotion/kefu/index.vue b/apps/web-antd/src/views/mall/promotion/kefu/index.vue
index 55e833784..6fb7d5d9f 100644
--- a/apps/web-antd/src/views/mall/promotion/kefu/index.vue
+++ b/apps/web-antd/src/views/mall/promotion/kefu/index.vue
@@ -4,6 +4,7 @@ import type { MallKefuConversationApi } from '#/api/mall/promotion/kefu/conversa
 import { onBeforeUnmount, onMounted, ref, watch } from 'vue';
 
 import { Page } from '@vben/common-ui';
+import { WebSocketMessageTypeConstants } from '@vben/constants';
 import { useAccessStore } from '@vben/stores';
 
 import { useWebSocket } from '@vueuse/core';
@@ -14,7 +15,6 @@ import { useMallKefuStore } from '#/store/mall/kefu';
 import ConversationList from './modules/conversation-list.vue';
 import MemberInfo from './modules/member/member-info.vue';
 import MessageList from './modules/message-list.vue';
-import { WebSocketMessageTypeConstants } from './modules/tools/constants';
 
 const accessStore = useAccessStore();
 const kefuStore = useMallKefuStore(); // 客服缓存
diff --git a/apps/web-antd/src/views/mall/promotion/kefu/modules/conversation-list.vue b/apps/web-antd/src/views/mall/promotion/kefu/modules/conversation-list.vue
index b8460957b..91921d15d 100644
--- a/apps/web-antd/src/views/mall/promotion/kefu/modules/conversation-list.vue
+++ b/apps/web-antd/src/views/mall/promotion/kefu/modules/conversation-list.vue
@@ -4,6 +4,7 @@ import type { MallKefuConversationApi } from '#/api/mall/promotion/kefu/conversa
 import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue';
 
 import { confirm } from '@vben/common-ui';
+import { KeFuMessageContentTypeEnum } from '@vben/constants';
 import { IconifyIcon } from '@vben/icons';
 import { formatPast, jsonParse } from '@vben/utils';
 
@@ -15,7 +16,6 @@ import {
 } from '#/api/mall/promotion/kefu/conversation';
 import { useMallKefuStore } from '#/store/mall/kefu';
 
-import { KeFuMessageContentTypeEnum } from './tools/constants';
 import { useEmoji } from './tools/emoji';
 
 /** 打开右侧的消息列表 */
diff --git a/apps/web-antd/src/views/mall/promotion/kefu/modules/message-list.vue b/apps/web-antd/src/views/mall/promotion/kefu/modules/message-list.vue
index dcb34aaca..b888ee66d 100644
--- a/apps/web-antd/src/views/mall/promotion/kefu/modules/message-list.vue
+++ b/apps/web-antd/src/views/mall/promotion/kefu/modules/message-list.vue
@@ -4,7 +4,7 @@ import type { Emoji } from './tools/emoji';
 import type { MallKefuConversationApi } from '#/api/mall/promotion/kefu/conversation';
 import type { MallKefuMessageApi } from '#/api/mall/promotion/kefu/message';
 
-import { computed, reactive, ref, toRefs, unref, watch } from 'vue';
+import { computed, KeFuMessageContentTypeEnum, reactive, ref, toRefs, unref, watch } from 'vue';
 
 import { UserTypeEnum } from '@vben/constants';
 import { IconifyIcon } from '@vben/icons';
@@ -25,7 +25,6 @@ import { useMallKefuStore } from '#/store/mall/kefu';
 import MessageItem from './message/message-item.vue';
 import OrderItem from './message/order-item.vue';
 import ProductItem from './message/product-item.vue';
-import { KeFuMessageContentTypeEnum } from './tools/constants';
 import { useEmoji } from './tools/emoji';
 import EmojiSelectPopover from './tools/emoji-select-popover.vue';
 import PictureSelectUpload from './tools/picture-select-upload.vue';
diff --git a/apps/web-antd/src/views/mall/promotion/kefu/modules/tools/constants.ts b/apps/web-antd/src/views/mall/promotion/kefu/modules/tools/constants.ts
deleted file mode 100644
index 266a6cf02..000000000
--- a/apps/web-antd/src/views/mall/promotion/kefu/modules/tools/constants.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/** 客服消息类型枚举类 */
-export const KeFuMessageContentTypeEnum = {
-  TEXT: 1, // 文本消息
-  IMAGE: 2, // 图片消息
-  VOICE: 3, // 语音消息
-  VIDEO: 4, // 视频消息
-  SYSTEM: 5, // 系统消息
-  // ========== 商城特殊消息 ==========
-  PRODUCT: 10, //  商品消息
-  ORDER: 11, //  订单消息"
-};
-
-/** Promotion 的 WebSocket 消息类型枚举类 */
-export const WebSocketMessageTypeConstants = {
-  KEFU_MESSAGE_TYPE: 'kefu_message_type', // 客服消息类型
-  KEFU_MESSAGE_ADMIN_READ: 'kefu_message_read_status_change', // 客服消息管理员已读
-};
diff --git a/apps/web-antd/src/views/mes/cal/calendar/components/calendar-date-cell.vue b/apps/web-antd/src/views/mes/cal/calendar/components/calendar-date-cell.vue
index e8d162119..1ea132565 100644
--- a/apps/web-antd/src/views/mes/cal/calendar/components/calendar-date-cell.vue
+++ b/apps/web-antd/src/views/mes/cal/calendar/components/calendar-date-cell.vue
@@ -3,12 +3,12 @@ import type { MesCalCalendarApi } from '#/api/mes/cal/calendar';
 
 import { computed } from 'vue';
 
+import { MesCalShiftTypeEnum } from '@vben/constants';
+
 import { Tag } from 'ant-design-vue';
 import dayjs from 'dayjs';
 import { SolarDay } from 'tyme4ts';
 
-import { MesCalShiftTypeEnum } from '#/views/mes/utils/constants';
-
 const props = defineProps<{
   calendarDayMap: Map<string, MesCalCalendarApi.CalendarDay>; // 排班数据
   day: string; // 日期，格式 yyyy-MM-dd
diff --git a/apps/web-antd/src/views/mes/cal/calendar/components/use-calendar.ts b/apps/web-antd/src/views/mes/cal/calendar/components/use-calendar.ts
index 381e7f5bd..860c48a1b 100644
--- a/apps/web-antd/src/views/mes/cal/calendar/components/use-calendar.ts
+++ b/apps/web-antd/src/views/mes/cal/calendar/components/use-calendar.ts
@@ -4,11 +4,12 @@ import type { MesCalCalendarApi } from '#/api/mes/cal/calendar';
 
 import { ref, watch } from 'vue';
 
+import { HolidayType } from '@vben/constants';
+
 import dayjs from 'dayjs';
 
 import { getCalendarList } from '#/api/mes/cal/calendar';
 import { getHolidayList } from '#/api/mes/cal/holiday';
-import { HolidayType } from '#/views/mes/utils/constants';
 
 /**
  * 排班日历通用 composable
diff --git a/apps/web-antd/src/views/mes/cal/holiday/data.ts b/apps/web-antd/src/views/mes/cal/holiday/data.ts
index 891aa335a..a63e9d8aa 100644
--- a/apps/web-antd/src/views/mes/cal/holiday/data.ts
+++ b/apps/web-antd/src/views/mes/cal/holiday/data.ts
@@ -1,10 +1,9 @@
 import type { VbenFormSchema } from '#/adapter/form';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, HolidayType } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { z } from '#/adapter/form';
-import { HolidayType } from '#/views/mes/utils/constants';
 
 /** 假期设置表单 */
 export function useHolidayFormSchema(): VbenFormSchema[] {
diff --git a/apps/web-antd/src/views/mes/cal/holiday/index.vue b/apps/web-antd/src/views/mes/cal/holiday/index.vue
index 73be66f52..a3d037394 100644
--- a/apps/web-antd/src/views/mes/cal/holiday/index.vue
+++ b/apps/web-antd/src/views/mes/cal/holiday/index.vue
@@ -5,13 +5,13 @@ import { onMounted, ref, watch } from 'vue';
 
 import { useAccess } from '@vben/access';
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { HolidayType } from '@vben/constants';
 
 import { Button, Calendar, message, Tag } from 'ant-design-vue';
 import dayjs from 'dayjs';
 import { SolarDay } from 'tyme4ts';
 
 import { getHolidayList } from '#/api/mes/cal/holiday';
-import { HolidayType } from '#/views/mes/utils/constants';
 
 import HolidayForm from './modules/form.vue';
 
diff --git a/apps/web-antd/src/views/mes/cal/holiday/modules/form.vue b/apps/web-antd/src/views/mes/cal/holiday/modules/form.vue
index aac5a48d6..2fa745b7f 100644
--- a/apps/web-antd/src/views/mes/cal/holiday/modules/form.vue
+++ b/apps/web-antd/src/views/mes/cal/holiday/modules/form.vue
@@ -2,13 +2,13 @@
 import type { MesCalHolidayApi } from '#/api/mes/cal/holiday';
 
 import { useVbenModal } from '@vben/common-ui';
+import { HolidayType } from '@vben/constants';
 
 import { message } from 'ant-design-vue';
 import dayjs from 'dayjs';
 
 import { useVbenForm } from '#/adapter/form';
 import { getHolidayByDay, saveHoliday } from '#/api/mes/cal/holiday';
-import { HolidayType } from '#/views/mes/utils/constants';
 
 import { useHolidayFormSchema } from '../data';
 
diff --git a/apps/web-antd/src/views/mes/cal/plan/data.ts b/apps/web-antd/src/views/mes/cal/plan/data.ts
index d325202f1..c0c957956 100644
--- a/apps/web-antd/src/views/mes/cal/plan/data.ts
+++ b/apps/web-antd/src/views/mes/cal/plan/data.ts
@@ -4,19 +4,13 @@ import type { MesCalPlanApi } from '#/api/mes/cal/plan';
 
 import { h } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode, MesCalPlanStatusEnum, MesCalShiftMethodEnum, MesCalShiftTypeEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { Button } from 'ant-design-vue';
 
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getRangePickerDefaultProps } from '#/utils';
-import {
-  MesAutoCodeRuleCode,
-  MesCalPlanStatusEnum,
-  MesCalShiftMethodEnum,
-  MesCalShiftTypeEnum,
-} from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-antd/src/views/mes/cal/plan/index.vue b/apps/web-antd/src/views/mes/cal/plan/index.vue
index 94ae51603..3e6dc48d0 100644
--- a/apps/web-antd/src/views/mes/cal/plan/index.vue
+++ b/apps/web-antd/src/views/mes/cal/plan/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesCalPlanApi } from '#/api/mes/cal/plan';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesCalPlanStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { Button, message } from 'ant-design-vue';
@@ -10,7 +11,6 @@ import { Button, message } from 'ant-design-vue';
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { deletePlan, exportPlan, getPlanPage } from '#/api/mes/cal/plan';
 import { $t } from '#/locales';
-import { MesCalPlanStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-antd/src/views/mes/cal/plan/modules/form.vue b/apps/web-antd/src/views/mes/cal/plan/modules/form.vue
index c76ed81e6..c2402d002 100644
--- a/apps/web-antd/src/views/mes/cal/plan/modules/form.vue
+++ b/apps/web-antd/src/views/mes/cal/plan/modules/form.vue
@@ -6,13 +6,13 @@ import type { MesCalPlanApi } from '#/api/mes/cal/plan';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { MesCalPlanStatusEnum } from '@vben/constants';
 
 import { Button, message, Popconfirm, Tabs } from 'ant-design-vue';
 
 import { useVbenForm } from '#/adapter/form';
 import { confirmPlan, createPlan, getPlan, updatePlan } from '#/api/mes/cal/plan';
 import { $t } from '#/locales';
-import { MesCalPlanStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 import ShiftList from './shift-list.vue';
diff --git a/apps/web-antd/src/views/mes/cal/team/data.ts b/apps/web-antd/src/views/mes/cal/team/data.ts
index a44bba18d..fac2487aa 100644
--- a/apps/web-antd/src/views/mes/cal/team/data.ts
+++ b/apps/web-antd/src/views/mes/cal/team/data.ts
@@ -4,14 +4,13 @@ import type { MesCalTeamApi } from '#/api/mes/cal/team';
 
 import { h } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { Button } from 'ant-design-vue';
 
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-antd/src/views/mes/dv/checkplan/data.ts b/apps/web-antd/src/views/mes/dv/checkplan/data.ts
index 4f6409181..6c42eb7b3 100644
--- a/apps/web-antd/src/views/mes/dv/checkplan/data.ts
+++ b/apps/web-antd/src/views/mes/dv/checkplan/data.ts
@@ -4,7 +4,7 @@ import type { MesDvCheckPlanApi } from '#/api/mes/dv/checkplan';
 
 import { h } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode, MesDvCheckPlanStatusEnum, MesDvSubjectTypeEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { Button } from 'ant-design-vue';
@@ -12,11 +12,6 @@ import { Button } from 'ant-design-vue';
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getRangePickerDefaultProps } from '#/utils';
-import {
-  MesAutoCodeRuleCode,
-  MesDvCheckPlanStatusEnum,
-  MesDvSubjectTypeEnum,
-} from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-antd/src/views/mes/dv/checkplan/index.vue b/apps/web-antd/src/views/mes/dv/checkplan/index.vue
index f20a5d5ac..51a29a5aa 100644
--- a/apps/web-antd/src/views/mes/dv/checkplan/index.vue
+++ b/apps/web-antd/src/views/mes/dv/checkplan/index.vue
@@ -4,6 +4,7 @@ import type { MesDvCheckPlanApi } from '#/api/mes/dv/checkplan';
 import type { ActionItem } from '#/components/table-action/typing';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesDvCheckPlanStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { Button, message } from 'ant-design-vue';
@@ -17,7 +18,6 @@ import {
   getCheckPlanPage,
 } from '#/api/mes/dv/checkplan';
 import { $t } from '#/locales';
-import { MesDvCheckPlanStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-antd/src/views/mes/dv/checkplan/modules/form.vue b/apps/web-antd/src/views/mes/dv/checkplan/modules/form.vue
index 650003ed6..94b3f064d 100644
--- a/apps/web-antd/src/views/mes/dv/checkplan/modules/form.vue
+++ b/apps/web-antd/src/views/mes/dv/checkplan/modules/form.vue
@@ -6,13 +6,13 @@ import type { MesDvCheckPlanApi } from '#/api/mes/dv/checkplan';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { MesDvCheckPlanStatusEnum } from '@vben/constants';
 
 import { message, Tabs } from 'ant-design-vue';
 
 import { useVbenForm } from '#/adapter/form';
 import { createCheckPlan, getCheckPlan, updateCheckPlan } from '#/api/mes/dv/checkplan';
 import { $t } from '#/locales';
-import { MesDvCheckPlanStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 import MachineryList from './machinery-list.vue';
diff --git a/apps/web-antd/src/views/mes/dv/checkrecord/data.ts b/apps/web-antd/src/views/mes/dv/checkrecord/data.ts
index fce03470a..665e3c988 100644
--- a/apps/web-antd/src/views/mes/dv/checkrecord/data.ts
+++ b/apps/web-antd/src/views/mes/dv/checkrecord/data.ts
@@ -4,18 +4,13 @@ import type { MesDvCheckRecordApi } from '#/api/mes/dv/checkrecord';
 
 import { markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesDvCheckPlanStatusEnum, MesDvCheckRecordStatusEnum, MesDvSubjectTypeEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 import { DvCheckPlanSelect } from '#/views/mes/dv/checkplan/components';
 import { DvMachinerySelect } from '#/views/mes/dv/machinery/components';
-import {
-  MesDvCheckPlanStatusEnum,
-  MesDvCheckRecordStatusEnum,
-  MesDvSubjectTypeEnum,
-} from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-antd/src/views/mes/dv/checkrecord/index.vue b/apps/web-antd/src/views/mes/dv/checkrecord/index.vue
index 0e5346ac7..1bc821568 100644
--- a/apps/web-antd/src/views/mes/dv/checkrecord/index.vue
+++ b/apps/web-antd/src/views/mes/dv/checkrecord/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesDvCheckRecordApi } from '#/api/mes/dv/checkrecord';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesDvCheckRecordStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { Button, message } from 'ant-design-vue';
@@ -10,7 +11,6 @@ import { Button, message } from 'ant-design-vue';
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { deleteCheckRecord, exportCheckRecord, getCheckRecordPage } from '#/api/mes/dv/checkrecord';
 import { $t } from '#/locales';
-import { MesDvCheckRecordStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-antd/src/views/mes/dv/checkrecord/modules/form.vue b/apps/web-antd/src/views/mes/dv/checkrecord/modules/form.vue
index 0f85d632f..1e60dead1 100644
--- a/apps/web-antd/src/views/mes/dv/checkrecord/modules/form.vue
+++ b/apps/web-antd/src/views/mes/dv/checkrecord/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesDvCheckRecordApi } from '#/api/mes/dv/checkrecord';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { MesDvCheckRecordStatusEnum } from '@vben/constants';
 
 import { Button, message, Popconfirm } from 'ant-design-vue';
 
@@ -17,7 +18,6 @@ import {
   updateCheckRecord,
 } from '#/api/mes/dv/checkrecord';
 import { $t } from '#/locales';
-import { MesDvCheckRecordStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 import LineList from './line-list.vue';
diff --git a/apps/web-antd/src/views/mes/dv/checkrecord/modules/line-list.vue b/apps/web-antd/src/views/mes/dv/checkrecord/modules/line-list.vue
index 467077d99..9debff5fd 100644
--- a/apps/web-antd/src/views/mes/dv/checkrecord/modules/line-list.vue
+++ b/apps/web-antd/src/views/mes/dv/checkrecord/modules/line-list.vue
@@ -2,7 +2,7 @@
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesDvCheckRecordLineApi } from '#/api/mes/dv/checkrecord/line';
 
-import { computed, ref, watch } from 'vue';
+import { computed, MesDvCheckResultEnum, MesDvSubjectTypeEnum, ref, watch } from 'vue';
 
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
@@ -20,7 +20,6 @@ import {
 } from '#/api/mes/dv/checkrecord/line';
 import { $t } from '#/locales';
 import { DvSubjectSelect } from '#/views/mes/dv/subject/components';
-import { MesDvCheckResultEnum, MesDvSubjectTypeEnum } from '#/views/mes/utils/constants';
 
 const props = defineProps<{ disabled?: boolean; recordId: number }>();
 const formOpen = ref(false);
diff --git a/apps/web-antd/src/views/mes/dv/machinery/data.ts b/apps/web-antd/src/views/mes/dv/machinery/data.ts
index 6a1f64063..b32f87ad9 100644
--- a/apps/web-antd/src/views/mes/dv/machinery/data.ts
+++ b/apps/web-antd/src/views/mes/dv/machinery/data.ts
@@ -4,7 +4,7 @@ import type { MesDvMachineryApi } from '#/api/mes/dv/machinery';
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode, MesDvMachineryStatusEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { Button } from 'ant-design-vue';
@@ -12,7 +12,6 @@ import { Button } from 'ant-design-vue';
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { MdWorkshopSelect } from '#/views/mes/md/workstation/components';
-import { MesAutoCodeRuleCode, MesDvMachineryStatusEnum } from '#/views/mes/utils/constants';
 
 import { DvMachineryTypeSelect } from './type/components';
 
diff --git a/apps/web-antd/src/views/mes/dv/machinery/modules/form.vue b/apps/web-antd/src/views/mes/dv/machinery/modules/form.vue
index 9599dc74a..3e8d68f1f 100644
--- a/apps/web-antd/src/views/mes/dv/machinery/modules/form.vue
+++ b/apps/web-antd/src/views/mes/dv/machinery/modules/form.vue
@@ -6,13 +6,13 @@ import type { MesDvMachineryApi } from '#/api/mes/dv/machinery';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { BarcodeBizTypeEnum } from '@vben/constants';
 
 import { Button, message, Tabs } from 'ant-design-vue';
 
 import { useVbenForm } from '#/adapter/form';
 import { createMachinery, getMachinery, updateMachinery } from '#/api/mes/dv/machinery';
 import { $t } from '#/locales';
-import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
 import { BarcodeDetail } from '#/views/mes/wm/barcode/components';
 
 import { useFormSchema } from '../data';
diff --git a/apps/web-antd/src/views/mes/dv/machinery/type/data.ts b/apps/web-antd/src/views/mes/dv/machinery/type/data.ts
index 2e3120f3a..e817fcea1 100644
--- a/apps/web-antd/src/views/mes/dv/machinery/type/data.ts
+++ b/apps/web-antd/src/views/mes/dv/machinery/type/data.ts
@@ -2,9 +2,9 @@ import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesDvMachineryTypeApi } from '#/api/mes/dv/machinery/type';
 
-import { h } from 'vue';
+import { DICT_TYPE, h } from 'vue';
 
-import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { CommonStatusEnum, MesAutoCodeRuleCode } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 import { handleTree } from '@vben/utils';
 
@@ -13,7 +13,6 @@ import { Button } from 'ant-design-vue';
 import { z } from '#/adapter/form';
 import { getMachineryTypeList } from '#/api/mes/dv/machinery/type';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
 /** 新增/修改设备类型的表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
diff --git a/apps/web-antd/src/views/mes/dv/maintenrecord/data.ts b/apps/web-antd/src/views/mes/dv/maintenrecord/data.ts
index 4a7b0e2d4..badcf2162 100644
--- a/apps/web-antd/src/views/mes/dv/maintenrecord/data.ts
+++ b/apps/web-antd/src/views/mes/dv/maintenrecord/data.ts
@@ -4,18 +4,13 @@ import type { MesDvMaintenRecordApi } from '#/api/mes/dv/maintenrecord';
 
 import { markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesDvCheckPlanStatusEnum, MesDvMaintenRecordStatusEnum, MesDvSubjectTypeEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 import { DvCheckPlanSelect } from '#/views/mes/dv/checkplan/components';
 import { DvMachinerySelect } from '#/views/mes/dv/machinery/components';
-import {
-  MesDvCheckPlanStatusEnum,
-  MesDvMaintenRecordStatusEnum,
-  MesDvSubjectTypeEnum,
-} from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-antd/src/views/mes/dv/maintenrecord/index.vue b/apps/web-antd/src/views/mes/dv/maintenrecord/index.vue
index c7940f347..b96762895 100644
--- a/apps/web-antd/src/views/mes/dv/maintenrecord/index.vue
+++ b/apps/web-antd/src/views/mes/dv/maintenrecord/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesDvMaintenRecordApi } from '#/api/mes/dv/maintenrecord';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesDvMaintenRecordStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { Button, message } from 'ant-design-vue';
@@ -14,7 +15,6 @@ import {
   getMaintenRecordPage,
 } from '#/api/mes/dv/maintenrecord';
 import { $t } from '#/locales';
-import { MesDvMaintenRecordStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-antd/src/views/mes/dv/maintenrecord/modules/form.vue b/apps/web-antd/src/views/mes/dv/maintenrecord/modules/form.vue
index 0827b1cef..172c8814f 100644
--- a/apps/web-antd/src/views/mes/dv/maintenrecord/modules/form.vue
+++ b/apps/web-antd/src/views/mes/dv/maintenrecord/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesDvMaintenRecordApi } from '#/api/mes/dv/maintenrecord';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { MesDvMaintenRecordStatusEnum } from '@vben/constants';
 import { useUserStore } from '@vben/stores';
 
 import { Button, message, Popconfirm } from 'ant-design-vue';
@@ -18,7 +19,6 @@ import {
   updateMaintenRecord,
 } from '#/api/mes/dv/maintenrecord';
 import { $t } from '#/locales';
-import { MesDvMaintenRecordStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 import LineList from './line-list.vue';
diff --git a/apps/web-antd/src/views/mes/dv/maintenrecord/modules/line-list.vue b/apps/web-antd/src/views/mes/dv/maintenrecord/modules/line-list.vue
index c8969bcb9..1b03fa032 100644
--- a/apps/web-antd/src/views/mes/dv/maintenrecord/modules/line-list.vue
+++ b/apps/web-antd/src/views/mes/dv/maintenrecord/modules/line-list.vue
@@ -2,7 +2,7 @@
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesDvMaintenRecordLineApi } from '#/api/mes/dv/maintenrecord/line';
 
-import { computed, ref, watch } from 'vue';
+import { computed, MesDvMaintenStatusEnum, MesDvSubjectTypeEnum, ref, watch } from 'vue';
 
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
@@ -20,7 +20,6 @@ import {
 } from '#/api/mes/dv/maintenrecord/line';
 import { $t } from '#/locales';
 import { DvSubjectSelect } from '#/views/mes/dv/subject/components';
-import { MesDvMaintenStatusEnum, MesDvSubjectTypeEnum } from '#/views/mes/utils/constants';
 
 const props = defineProps<{ disabled?: boolean; recordId: number }>();
 const formOpen = ref(false);
diff --git a/apps/web-antd/src/views/mes/dv/repair/data.ts b/apps/web-antd/src/views/mes/dv/repair/data.ts
index 76674cf38..524f41e87 100644
--- a/apps/web-antd/src/views/mes/dv/repair/data.ts
+++ b/apps/web-antd/src/views/mes/dv/repair/data.ts
@@ -4,7 +4,7 @@ import type { MesDvRepairApi } from '#/api/mes/dv/repair';
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode, MesDvRepairStatusEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { Button } from 'ant-design-vue';
@@ -13,7 +13,6 @@ import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 import { DvMachinerySelect } from '#/views/mes/dv/machinery/components';
-import { MesAutoCodeRuleCode, MesDvRepairStatusEnum } from '#/views/mes/utils/constants';
 /** 表单类型 */
 export type FormType = 'confirm' | 'create' | 'detail' | 'finish' | 'update';
 
diff --git a/apps/web-antd/src/views/mes/dv/repair/index.vue b/apps/web-antd/src/views/mes/dv/repair/index.vue
index c66bf2f73..7dbc37d28 100644
--- a/apps/web-antd/src/views/mes/dv/repair/index.vue
+++ b/apps/web-antd/src/views/mes/dv/repair/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesDvRepairApi } from '#/api/mes/dv/repair';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesDvRepairStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { Button, message } from 'ant-design-vue';
@@ -10,7 +11,6 @@ import { Button, message } from 'ant-design-vue';
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { deleteRepair, exportRepair, getRepairPage } from '#/api/mes/dv/repair';
 import { $t } from '#/locales';
-import { MesDvRepairStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-antd/src/views/mes/dv/repair/modules/form.vue b/apps/web-antd/src/views/mes/dv/repair/modules/form.vue
index d9863755b..1ae2e612b 100644
--- a/apps/web-antd/src/views/mes/dv/repair/modules/form.vue
+++ b/apps/web-antd/src/views/mes/dv/repair/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesDvRepairApi } from '#/api/mes/dv/repair';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { MesDvRepairResultEnum, MesDvRepairStatusEnum } from '@vben/constants';
 
 import { Button, message, Popconfirm } from 'ant-design-vue';
 
@@ -19,7 +20,6 @@ import {
   updateRepair,
 } from '#/api/mes/dv/repair';
 import { $t } from '#/locales';
-import { MesDvRepairResultEnum, MesDvRepairStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 import LineList from './line-list.vue';
diff --git a/apps/web-antd/src/views/mes/dv/subject/data.ts b/apps/web-antd/src/views/mes/dv/subject/data.ts
index cbc88abd8..3748e9c42 100644
--- a/apps/web-antd/src/views/mes/dv/subject/data.ts
+++ b/apps/web-antd/src/views/mes/dv/subject/data.ts
@@ -2,16 +2,15 @@ import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesDvSubjectApi } from '#/api/mes/dv/subject';
 
-import { h } from 'vue';
+import { DICT_TYPE, h } from 'vue';
 
-import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { CommonStatusEnum, MesAutoCodeRuleCode, MesDvSubjectTypeEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { Button } from 'ant-design-vue';
 
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
-import { MesAutoCodeRuleCode, MesDvSubjectTypeEnum } from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-antd/src/views/mes/home/data.ts b/apps/web-antd/src/views/mes/home/data.ts
index eaa1f27e7..3ad2de089 100644
--- a/apps/web-antd/src/views/mes/home/data.ts
+++ b/apps/web-antd/src/views/mes/home/data.ts
@@ -1,6 +1,6 @@
 import type { MesHomeApi } from '#/api/mes/home';
 
-import { MesProWorkOrderStatusEnum } from '#/views/mes/utils/constants';
+import { MesProWorkOrderStatusEnum } from '@vben/constants';
 
 /** 首页汇总统计默认值 */
 export const defaultSummary: MesHomeApi.Summary = {
diff --git a/apps/web-antd/src/views/mes/md/autocode/data.ts b/apps/web-antd/src/views/mes/md/autocode/data.ts
index 7dab76a6d..4613d02fd 100644
--- a/apps/web-antd/src/views/mes/md/autocode/data.ts
+++ b/apps/web-antd/src/views/mes/md/autocode/data.ts
@@ -3,11 +3,10 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesMdAutoCodePartApi } from '#/api/mes/md/autocode/part';
 import type { MesMdAutoCodeRuleApi } from '#/api/mes/md/autocode/rule';
 
-import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { CommonStatusEnum, DICT_TYPE, MesAutoCodePartTypeEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { z } from '#/adapter/form';
-import { MesAutoCodePartTypeEnum } from '#/views/mes/utils/constants';
 
 /** 新增/修改编码规则的表单 */
 export function useFormSchema(): VbenFormSchema[] {
diff --git a/apps/web-antd/src/views/mes/md/autocode/modules/part-form.vue b/apps/web-antd/src/views/mes/md/autocode/modules/part-form.vue
index d1ba56e4e..1b5324e99 100644
--- a/apps/web-antd/src/views/mes/md/autocode/modules/part-form.vue
+++ b/apps/web-antd/src/views/mes/md/autocode/modules/part-form.vue
@@ -4,6 +4,7 @@ import type { MesMdAutoCodePartApi } from '#/api/mes/md/autocode/part';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { MesAutoCodePartTypeEnum } from '@vben/constants';
 
 import { message } from 'ant-design-vue';
 
@@ -14,7 +15,6 @@ import {
   updateAutoCodePart,
 } from '#/api/mes/md/autocode/part';
 import { $t } from '#/locales';
-import { MesAutoCodePartTypeEnum } from '#/views/mes/utils/constants';
 
 import { usePartFormSchema } from '../data';
 
diff --git a/apps/web-antd/src/views/mes/md/client/data.ts b/apps/web-antd/src/views/mes/md/client/data.ts
index 301973cc5..8b03d6e84 100644
--- a/apps/web-antd/src/views/mes/md/client/data.ts
+++ b/apps/web-antd/src/views/mes/md/client/data.ts
@@ -2,16 +2,15 @@ import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesMdClientApi } from '#/api/mes/md/client';
 
-import { h } from 'vue';
+import { DICT_TYPE, h } from 'vue';
 
-import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { CommonStatusEnum, MesAutoCodeRuleCode } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { Button } from 'ant-design-vue';
 
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-antd/src/views/mes/md/item/data.ts b/apps/web-antd/src/views/mes/md/item/data.ts
index 2da12e5a1..21e55f602 100644
--- a/apps/web-antd/src/views/mes/md/item/data.ts
+++ b/apps/web-antd/src/views/mes/md/item/data.ts
@@ -3,9 +3,9 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesMdItemApi } from '#/api/mes/md/item';
 import type { MesMdProductBomApi } from '#/api/mes/md/item/productBom';
 
-import { h, markRaw } from 'vue';
+import { DICT_TYPE, h, markRaw } from 'vue';
 
-import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { CommonStatusEnum, MesAutoCodeRuleCode } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { Button } from 'ant-design-vue';
@@ -14,7 +14,6 @@ import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { MdItemTypeSelect } from '#/views/mes/md/item/type/components';
 import { MdUnitMeasureSelect } from '#/views/mes/md/unitmeasure/components';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-antd/src/views/mes/md/item/modules/form.vue b/apps/web-antd/src/views/mes/md/item/modules/form.vue
index 9008507c5..fb5bdd0f4 100644
--- a/apps/web-antd/src/views/mes/md/item/modules/form.vue
+++ b/apps/web-antd/src/views/mes/md/item/modules/form.vue
@@ -6,13 +6,13 @@ import type { MesMdItemApi } from '#/api/mes/md/item';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { BarcodeBizTypeEnum } from '@vben/constants';
 
 import { Button, Empty, message, Tabs } from 'ant-design-vue';
 
 import { useVbenForm } from '#/adapter/form';
 import { createItem, getItem, updateItem } from '#/api/mes/md/item';
 import { $t } from '#/locales';
-import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
 import { BarcodeDetail } from '#/views/mes/wm/barcode/components';
 
 import { useFormSchema } from '../data';
diff --git a/apps/web-antd/src/views/mes/md/item/modules/item-batch-config-form.vue b/apps/web-antd/src/views/mes/md/item/modules/item-batch-config-form.vue
index 31975250d..99d1e54e7 100644
--- a/apps/web-antd/src/views/mes/md/item/modules/item-batch-config-form.vue
+++ b/apps/web-antd/src/views/mes/md/item/modules/item-batch-config-form.vue
@@ -5,13 +5,14 @@ import type { MesMdItemBatchConfigApi } from '#/api/mes/md/item/batchConfig';
 
 import { computed, ref, watch } from 'vue';
 
+import { MesItemOrProductEnum } from '@vben/constants';
+
 import { Button, Checkbox, message, Spin } from 'ant-design-vue';
 
 import {
   getBatchConfigByItemId,
   saveBatchConfig,
 } from '#/api/mes/md/item/batchConfig';
-import { MesItemOrProductEnum } from '#/views/mes/utils/constants';
 
 const props = withDefaults(
   defineProps<{
diff --git a/apps/web-antd/src/views/mes/md/item/type/data.ts b/apps/web-antd/src/views/mes/md/item/type/data.ts
index 7f61f4f03..a5a8c7549 100644
--- a/apps/web-antd/src/views/mes/md/item/type/data.ts
+++ b/apps/web-antd/src/views/mes/md/item/type/data.ts
@@ -2,9 +2,9 @@ import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesMdItemTypeApi } from '#/api/mes/md/item/type';
 
-import { h } from 'vue';
+import { DICT_TYPE, h } from 'vue';
 
-import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { CommonStatusEnum, MesAutoCodeRuleCode, MesItemOrProductEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 import { handleTree } from '@vben/utils';
 
@@ -13,10 +13,6 @@ import { Button } from 'ant-design-vue';
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getItemTypeList } from '#/api/mes/md/item/type';
-import {
-  MesAutoCodeRuleCode,
-  MesItemOrProductEnum,
-} from '#/views/mes/utils/constants';
 
 /** 新增/修改物料分类的表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
diff --git a/apps/web-antd/src/views/mes/md/vendor/data.ts b/apps/web-antd/src/views/mes/md/vendor/data.ts
index 24f692030..1395328b8 100644
--- a/apps/web-antd/src/views/mes/md/vendor/data.ts
+++ b/apps/web-antd/src/views/mes/md/vendor/data.ts
@@ -2,16 +2,15 @@ import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesMdVendorApi } from '#/api/mes/md/vendor';
 
-import { h } from 'vue';
+import { DICT_TYPE, h } from 'vue';
 
-import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { CommonStatusEnum, MesAutoCodeRuleCode } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { Button } from 'ant-design-vue';
 
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-antd/src/views/mes/md/workstation/data.ts b/apps/web-antd/src/views/mes/md/workstation/data.ts
index 7ddf1d272..3807d5db7 100644
--- a/apps/web-antd/src/views/mes/md/workstation/data.ts
+++ b/apps/web-antd/src/views/mes/md/workstation/data.ts
@@ -2,9 +2,9 @@ import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesMdWorkstationApi } from '#/api/mes/md/workstation';
 
-import { h, markRaw } from 'vue';
+import { DICT_TYPE, h, markRaw } from 'vue';
 
-import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { CommonStatusEnum, MesAutoCodeRuleCode } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { Button } from 'ant-design-vue';
@@ -15,7 +15,6 @@ import { getWarehouseSimpleList } from '#/api/mes/wm/warehouse';
 import { getWarehouseAreaSimpleList } from '#/api/mes/wm/warehouse/area';
 import { getWarehouseLocationSimpleList } from '#/api/mes/wm/warehouse/location';
 import { ProProcessSelect } from '#/views/mes/pro/process/components';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
 import { MdWorkshopSelect } from './components';
 
diff --git a/apps/web-antd/src/views/mes/md/workstation/index.vue b/apps/web-antd/src/views/mes/md/workstation/index.vue
index 657342ca7..704778694 100644
--- a/apps/web-antd/src/views/mes/md/workstation/index.vue
+++ b/apps/web-antd/src/views/mes/md/workstation/index.vue
@@ -5,6 +5,7 @@ import type { MesMdWorkstationApi } from '#/api/mes/md/workstation';
 import { ref } from 'vue';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { BarcodeBizTypeEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { Button, message } from 'ant-design-vue';
@@ -16,7 +17,6 @@ import {
   getWorkstationPage,
 } from '#/api/mes/md/workstation';
 import { $t } from '#/locales';
-import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
 import { BarcodeDetail } from '#/views/mes/wm/barcode/components';
 
 import { useGridColumns, useGridFormSchema } from './data';
diff --git a/apps/web-antd/src/views/mes/md/workstation/modules/form.vue b/apps/web-antd/src/views/mes/md/workstation/modules/form.vue
index 204cb5214..8489fc30e 100644
--- a/apps/web-antd/src/views/mes/md/workstation/modules/form.vue
+++ b/apps/web-antd/src/views/mes/md/workstation/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesMdWorkstationApi } from '#/api/mes/md/workstation';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { BarcodeBizTypeEnum } from '@vben/constants';
 
 import { Button, message, Tabs } from 'ant-design-vue';
 
@@ -16,7 +17,6 @@ import {
   updateWorkstation,
 } from '#/api/mes/md/workstation';
 import { $t } from '#/locales';
-import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
 import { BarcodeDetail } from '#/views/mes/wm/barcode/components';
 
 import { useFormSchema } from '../data';
diff --git a/apps/web-antd/src/views/mes/md/workstation/workshop/data.ts b/apps/web-antd/src/views/mes/md/workstation/workshop/data.ts
index 82bd678d3..1db3673b4 100644
--- a/apps/web-antd/src/views/mes/md/workstation/workshop/data.ts
+++ b/apps/web-antd/src/views/mes/md/workstation/workshop/data.ts
@@ -2,9 +2,9 @@ import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesMdWorkshopApi } from '#/api/mes/md/workstation/workshop';
 
-import { h } from 'vue';
+import { DICT_TYPE, h } from 'vue';
 
-import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { CommonStatusEnum, MesAutoCodeRuleCode } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { Button } from 'ant-design-vue';
@@ -12,7 +12,6 @@ import { Button } from 'ant-design-vue';
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getSimpleUserList } from '#/api/system/user';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-antd/src/views/mes/md/workstation/workshop/modules/form.vue b/apps/web-antd/src/views/mes/md/workstation/workshop/modules/form.vue
index 372006587..4cf478c03 100644
--- a/apps/web-antd/src/views/mes/md/workstation/workshop/modules/form.vue
+++ b/apps/web-antd/src/views/mes/md/workstation/workshop/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesMdWorkshopApi } from '#/api/mes/md/workstation/workshop';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { BarcodeBizTypeEnum } from '@vben/constants';
 
 import { Button, message } from 'ant-design-vue';
 
@@ -16,7 +17,6 @@ import {
   updateWorkshop,
 } from '#/api/mes/md/workstation/workshop';
 import { $t } from '#/locales';
-import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
 import { BarcodeDetail } from '#/views/mes/wm/barcode/components';
 
 import { useFormSchema } from '../data';
diff --git a/apps/web-antd/src/views/mes/pro/andon/record/data.ts b/apps/web-antd/src/views/mes/pro/andon/record/data.ts
index baafa5d1a..f88aad631 100644
--- a/apps/web-antd/src/views/mes/pro/andon/record/data.ts
+++ b/apps/web-antd/src/views/mes/pro/andon/record/data.ts
@@ -5,7 +5,7 @@ import type { MesProAndonRecordApi } from '#/api/mes/pro/andon/record';
 
 import { markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesProWorkOrderStatusEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { getSimpleUserList } from '#/api/system/user';
@@ -13,7 +13,6 @@ import { getRangePickerDefaultProps } from '#/utils';
 import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
 import { ProProcessSelect } from '#/views/mes/pro/process/components';
 import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
-import { MesProWorkOrderStatusEnum } from '#/views/mes/utils/constants';
 
 import { AndonConfigSelect } from '../config/components';
 
diff --git a/apps/web-antd/src/views/mes/pro/andon/record/index.vue b/apps/web-antd/src/views/mes/pro/andon/record/index.vue
index d6b256fbc..95774ac98 100644
--- a/apps/web-antd/src/views/mes/pro/andon/record/index.vue
+++ b/apps/web-antd/src/views/mes/pro/andon/record/index.vue
@@ -5,6 +5,7 @@ import type { MesProAndonRecordApi } from '#/api/mes/pro/andon/record';
 import { ref } from 'vue';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesProAndonStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { message } from 'ant-design-vue';
@@ -16,7 +17,6 @@ import {
   getAndonRecordPage,
 } from '#/api/mes/pro/andon/record';
 import { $t } from '#/locales';
-import { MesProAndonStatusEnum } from '#/views/mes/utils/constants';
 
 import ConfigList from '../config/modules/list.vue';
 import { useGridColumns, useGridFormSchema } from './data';
diff --git a/apps/web-antd/src/views/mes/pro/andon/record/modules/form.vue b/apps/web-antd/src/views/mes/pro/andon/record/modules/form.vue
index e233b77f1..4f96c2386 100644
--- a/apps/web-antd/src/views/mes/pro/andon/record/modules/form.vue
+++ b/apps/web-antd/src/views/mes/pro/andon/record/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesProAndonRecordApi } from '#/api/mes/pro/andon/record';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { MesProAndonStatusEnum } from '@vben/constants';
 import { useUserStore } from '@vben/stores';
 
 import { Button, message, Popconfirm } from 'ant-design-vue';
@@ -17,7 +18,6 @@ import {
   updateAndonRecord,
 } from '#/api/mes/pro/andon/record';
 import { $t } from '#/locales';
-import { MesProAndonStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 
diff --git a/apps/web-antd/src/views/mes/pro/card/data.ts b/apps/web-antd/src/views/mes/pro/card/data.ts
index b9da83a07..6b2cef847 100644
--- a/apps/web-antd/src/views/mes/pro/card/data.ts
+++ b/apps/web-antd/src/views/mes/pro/card/data.ts
@@ -5,7 +5,7 @@ import type { MesProCardProcessApi } from '#/api/mes/pro/card/process';
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode, MesProWorkOrderStatusEnum } from '@vben/constants';
 
 import { Button } from 'ant-design-vue';
 
@@ -14,10 +14,6 @@ import { MdItemSelect } from '#/views/mes/md/item/components';
 import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
 import { ProProcessSelect } from '#/views/mes/pro/process/components';
 import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
-import {
-  MesAutoCodeRuleCode,
-  MesProWorkOrderStatusEnum,
-} from '#/views/mes/utils/constants';
 import { UserSelect } from '#/views/system/user/components';
 
 /** 表单类型 */
diff --git a/apps/web-antd/src/views/mes/pro/card/index.vue b/apps/web-antd/src/views/mes/pro/card/index.vue
index 643efe25f..2f9119076 100644
--- a/apps/web-antd/src/views/mes/pro/card/index.vue
+++ b/apps/web-antd/src/views/mes/pro/card/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesProCardApi } from '#/api/mes/pro/card';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesProCardStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { Button, message } from 'ant-design-vue';
@@ -15,7 +16,6 @@ import {
   getCardPage,
 } from '#/api/mes/pro/card';
 import { $t } from '#/locales';
-import { MesProCardStatusEnum } from '#/views/mes/utils/constants';
 import { PrinterLabel } from '#/views/mes/wm/barcode/components';
 
 import { useGridColumns, useGridFormSchema } from './data';
diff --git a/apps/web-antd/src/views/mes/pro/card/modules/form.vue b/apps/web-antd/src/views/mes/pro/card/modules/form.vue
index 32af7cc57..f4222f2e8 100644
--- a/apps/web-antd/src/views/mes/pro/card/modules/form.vue
+++ b/apps/web-antd/src/views/mes/pro/card/modules/form.vue
@@ -6,6 +6,10 @@ import type { MesProCardApi } from '#/api/mes/pro/card';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import {
+  BarcodeBizTypeEnum,
+  MesProCardStatusEnum,
+} from '@vben/constants';
 
 import { Button, Divider, message, Popconfirm } from 'ant-design-vue';
 
@@ -18,10 +22,6 @@ import {
   updateCard,
 } from '#/api/mes/pro/card';
 import { $t } from '#/locales';
-import {
-  BarcodeBizTypeEnum,
-  MesProCardStatusEnum,
-} from '#/views/mes/utils/constants';
 import { BarcodeDetail } from '#/views/mes/wm/barcode/components';
 
 import { useFormSchema } from '../data';
diff --git a/apps/web-antd/src/views/mes/pro/feedback/data.ts b/apps/web-antd/src/views/mes/pro/feedback/data.ts
index cfd5a5015..f14625e96 100644
--- a/apps/web-antd/src/views/mes/pro/feedback/data.ts
+++ b/apps/web-antd/src/views/mes/pro/feedback/data.ts
@@ -5,7 +5,7 @@ import type { MesProTaskApi } from '#/api/mes/pro/task';
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode, MesProTaskStatusEnum, MesProWorkOrderStatusEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { Button } from 'ant-design-vue';
@@ -18,11 +18,6 @@ import { MdItemSelect } from '#/views/mes/md/item/components';
 import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
 import { ProTaskSelect } from '#/views/mes/pro/task/components';
 import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
-import {
-  MesAutoCodeRuleCode,
-  MesProTaskStatusEnum,
-  MesProWorkOrderStatusEnum,
-} from '#/views/mes/utils/constants';
 
 /** 生产报工表单类型 */
 export type FormType = 'approve' | 'create' | 'detail' | 'submit' | 'update';
diff --git a/apps/web-antd/src/views/mes/pro/feedback/index.vue b/apps/web-antd/src/views/mes/pro/feedback/index.vue
index b3ad35785..08a274d31 100644
--- a/apps/web-antd/src/views/mes/pro/feedback/index.vue
+++ b/apps/web-antd/src/views/mes/pro/feedback/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesProFeedbackApi } from '#/api/mes/pro/feedback';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesProFeedbackStatusEnum } from '@vben/constants';
 import { useUserStore } from '@vben/stores';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
@@ -15,7 +16,6 @@ import {
   getFeedbackPage,
 } from '#/api/mes/pro/feedback';
 import { $t } from '#/locales';
-import { MesProFeedbackStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-antd/src/views/mes/pro/feedback/modules/form.vue b/apps/web-antd/src/views/mes/pro/feedback/modules/form.vue
index 40e22c3e8..8d23430b8 100644
--- a/apps/web-antd/src/views/mes/pro/feedback/modules/form.vue
+++ b/apps/web-antd/src/views/mes/pro/feedback/modules/form.vue
@@ -6,6 +6,10 @@ import type { MesProFeedbackApi } from '#/api/mes/pro/feedback';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import {
+  MesAutoCodeRuleCode,
+  MesProFeedbackStatusEnum,
+} from '@vben/constants';
 import { useUserStore } from '@vben/stores';
 
 import { Button, message, Popconfirm, Tabs } from 'ant-design-vue';
@@ -22,10 +26,6 @@ import {
 } from '#/api/mes/pro/feedback';
 import { getRouteProcessByRouteAndProcess } from '#/api/mes/pro/route/process';
 import { $t } from '#/locales';
-import {
-  MesAutoCodeRuleCode,
-  MesProFeedbackStatusEnum,
-} from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 import ItemConsumeList from './item-consume-list.vue';
diff --git a/apps/web-antd/src/views/mes/pro/process/data.ts b/apps/web-antd/src/views/mes/pro/process/data.ts
index 59c56bb98..a5d37c260 100644
--- a/apps/web-antd/src/views/mes/pro/process/data.ts
+++ b/apps/web-antd/src/views/mes/pro/process/data.ts
@@ -3,16 +3,15 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesProProcessApi } from '#/api/mes/pro/process';
 import type { MesProProcessContentApi } from '#/api/mes/pro/process/content';
 
-import { h } from 'vue';
+import { DICT_TYPE, h } from 'vue';
 
-import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { CommonStatusEnum, MesAutoCodeRuleCode } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { Button } from 'ant-design-vue';
 
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-antd/src/views/mes/pro/route/data.ts b/apps/web-antd/src/views/mes/pro/route/data.ts
index 7ba9f1083..24ce8c65d 100644
--- a/apps/web-antd/src/views/mes/pro/route/data.ts
+++ b/apps/web-antd/src/views/mes/pro/route/data.ts
@@ -5,9 +5,9 @@ import type { MesProRouteProcessApi } from '#/api/mes/pro/route/process';
 import type { MesProRouteProductApi } from '#/api/mes/pro/route/product';
 import type { MesProRouteProductBomApi } from '#/api/mes/pro/route/productbom';
 
-import { h } from 'vue';
+import { DICT_TYPE, h } from 'vue';
 
-import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { CommonStatusEnum, MesAutoCodeRuleCode } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { Button } from 'ant-design-vue';
@@ -18,7 +18,6 @@ import {
   MdItemSelect,
   MdProductBomSelect,
 } from '#/views/mes/md/item/components';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
 import { RouteColorPicker } from './components';
 
diff --git a/apps/web-antd/src/views/mes/pro/task/components/gantt-chart.vue b/apps/web-antd/src/views/mes/pro/task/components/gantt-chart.vue
index 573f68d51..dca1347c9 100644
--- a/apps/web-antd/src/views/mes/pro/task/components/gantt-chart.vue
+++ b/apps/web-antd/src/views/mes/pro/task/components/gantt-chart.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup>
 import { onBeforeUnmount, onMounted, ref, watch } from 'vue';
 
-import { gantt } from 'dhtmlx-gantt';
+import { BarcodeBizTypeEnum } from '@vben/constants';
 
-import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
+import { gantt } from 'dhtmlx-gantt';
 
 import 'dhtmlx-gantt/codebase/dhtmlxgantt.css';
 
diff --git a/apps/web-antd/src/views/mes/pro/task/index.vue b/apps/web-antd/src/views/mes/pro/task/index.vue
index c57faf175..356b73306 100644
--- a/apps/web-antd/src/views/mes/pro/task/index.vue
+++ b/apps/web-antd/src/views/mes/pro/task/index.vue
@@ -6,16 +6,16 @@ import { onMounted, ref } from 'vue';
 import { useRouter } from 'vue-router';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import {
+  MesProWorkOrderStatusEnum,
+  MesProWorkOrderTypeEnum,
+} from '@vben/constants';
 
 import { Button, Card } from 'ant-design-vue';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getGanttTaskList } from '#/api/mes/pro/task';
 import { getWorkOrderPage } from '#/api/mes/pro/workorder';
-import {
-  MesProWorkOrderStatusEnum,
-  MesProWorkOrderTypeEnum,
-} from '#/views/mes/utils/constants';
 
 import GanttChart from './components/gantt-chart.vue';
 import { useGridColumns, useGridFormSchema } from './data';
diff --git a/apps/web-antd/src/views/mes/pro/workorder/data.ts b/apps/web-antd/src/views/mes/pro/workorder/data.ts
index 7ec534676..ff44a05e7 100644
--- a/apps/web-antd/src/views/mes/pro/workorder/data.ts
+++ b/apps/web-antd/src/views/mes/pro/workorder/data.ts
@@ -6,7 +6,7 @@ import type { MesProWorkOrderBomApi } from '#/api/mes/pro/workorder/bom';
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode, MesProWorkOrderSourceTypeEnum, MesProWorkOrderTypeEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { Button } from 'ant-design-vue';
@@ -16,11 +16,6 @@ import { getRangePickerDefaultProps } from '#/utils';
 import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
 import { MdItemSelect, MdProductBomSelect } from '#/views/mes/md/item/components';
 import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
-import {
-  MesAutoCodeRuleCode,
-  MesProWorkOrderSourceTypeEnum,
-  MesProWorkOrderTypeEnum,
-} from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'confirm' | 'create' | 'detail' | 'finish' | 'update';
diff --git a/apps/web-antd/src/views/mes/pro/workorder/index.vue b/apps/web-antd/src/views/mes/pro/workorder/index.vue
index 904cc96ed..1cf216383 100644
--- a/apps/web-antd/src/views/mes/pro/workorder/index.vue
+++ b/apps/web-antd/src/views/mes/pro/workorder/index.vue
@@ -5,6 +5,11 @@ import type { MesProWorkOrderApi } from '#/api/mes/pro/workorder';
 import { ref } from 'vue';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import {
+  BarcodeBizTypeEnum,
+  MesProWorkOrderStatusEnum,
+  MesProWorkOrderTypeEnum,
+} from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { Button, message } from 'ant-design-vue';
@@ -17,11 +22,6 @@ import {
   getWorkOrderPage,
 } from '#/api/mes/pro/workorder';
 import { $t } from '#/locales';
-import {
-  BarcodeBizTypeEnum,
-  MesProWorkOrderStatusEnum,
-  MesProWorkOrderTypeEnum,
-} from '#/views/mes/utils/constants';
 import { BarcodeDetail } from '#/views/mes/wm/barcode/components';
 
 import { useGridColumns, useGridFormSchema } from './data';
diff --git a/apps/web-antd/src/views/mes/pro/workorder/modules/bom-list.vue b/apps/web-antd/src/views/mes/pro/workorder/modules/bom-list.vue
index cdc69a198..3d4672fb7 100644
--- a/apps/web-antd/src/views/mes/pro/workorder/modules/bom-list.vue
+++ b/apps/web-antd/src/views/mes/pro/workorder/modules/bom-list.vue
@@ -8,6 +8,10 @@ import type { MesProWorkOrderBomApi } from '#/api/mes/pro/workorder/bom';
 import { computed } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import {
+  MesProWorkOrderStatusEnum,
+  MesProWorkOrderTypeEnum,
+} from '@vben/constants';
 
 import { message } from 'ant-design-vue';
 
@@ -17,10 +21,6 @@ import {
   getWorkOrderBomPage,
 } from '#/api/mes/pro/workorder/bom';
 import { $t } from '#/locales';
-import {
-  MesProWorkOrderStatusEnum,
-  MesProWorkOrderTypeEnum,
-} from '#/views/mes/utils/constants';
 
 import { useBomGridColumns } from '../data';
 import BomForm from './bom-form.vue';
diff --git a/apps/web-antd/src/views/mes/pro/workorder/modules/form.vue b/apps/web-antd/src/views/mes/pro/workorder/modules/form.vue
index 4a01f16db..0d2f86243 100644
--- a/apps/web-antd/src/views/mes/pro/workorder/modules/form.vue
+++ b/apps/web-antd/src/views/mes/pro/workorder/modules/form.vue
@@ -7,6 +7,10 @@ import type { MesProWorkOrderBomApi } from '#/api/mes/pro/workorder/bom';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import {
+  BarcodeBizTypeEnum,
+  MesProWorkOrderStatusEnum,
+} from '@vben/constants';
 
 import { Button, message, Popconfirm, Tabs } from 'ant-design-vue';
 
@@ -19,10 +23,6 @@ import {
   updateWorkOrder,
 } from '#/api/mes/pro/workorder';
 import { $t } from '#/locales';
-import {
-  BarcodeBizTypeEnum,
-  MesProWorkOrderStatusEnum,
-} from '#/views/mes/utils/constants';
 import { BarcodeDetail } from '#/views/mes/wm/barcode/components';
 
 import { useFormSchema } from '../data';
diff --git a/apps/web-antd/src/views/mes/pro/workrecord/components/work-record-status-bar.vue b/apps/web-antd/src/views/mes/pro/workrecord/components/work-record-status-bar.vue
index 52cd0ce2f..f4f4b00ef 100644
--- a/apps/web-antd/src/views/mes/pro/workrecord/components/work-record-status-bar.vue
+++ b/apps/web-antd/src/views/mes/pro/workrecord/components/work-record-status-bar.vue
@@ -4,6 +4,7 @@ import type { MesProWorkRecordApi } from '#/api/mes/pro/workrecord';
 import { computed, onMounted, ref } from 'vue';
 
 import { confirm } from '@vben/common-ui';
+import { MesProWorkRecordTypeEnum } from '@vben/constants';
 import { IconifyIcon } from '@vben/icons';
 import { formatDateTime } from '@vben/utils';
 
@@ -15,7 +16,6 @@ import {
   getMyWorkRecord,
 } from '#/api/mes/pro/workrecord';
 import MdWorkstationSelect from '#/views/mes/md/workstation/components/md-workstation-select.vue';
-import { MesProWorkRecordTypeEnum } from '#/views/mes/utils/constants';
 
 const emit = defineEmits<{
   (e: 'change'): void;
diff --git a/apps/web-antd/src/views/mes/qc/defect/data.ts b/apps/web-antd/src/views/mes/qc/defect/data.ts
index ed72e1cfb..f9c678e18 100644
--- a/apps/web-antd/src/views/mes/qc/defect/data.ts
+++ b/apps/web-antd/src/views/mes/qc/defect/data.ts
@@ -4,13 +4,12 @@ import type { MesQcDefectApi } from '#/api/mes/qc/defect';
 
 import { h } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { Button } from 'ant-design-vue';
 
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
 /** 新增/修改的表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
diff --git a/apps/web-antd/src/views/mes/qc/indicator/data.ts b/apps/web-antd/src/views/mes/qc/indicator/data.ts
index df350a4e5..0f8e3d14d 100644
--- a/apps/web-antd/src/views/mes/qc/indicator/data.ts
+++ b/apps/web-antd/src/views/mes/qc/indicator/data.ts
@@ -4,17 +4,13 @@ import type { MesQcIndicatorApi } from '#/api/mes/qc/indicator';
 
 import { h } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode, MesQcResultValueType } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { Button } from 'ant-design-vue';
 
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getSimpleDictTypeList } from '#/api/system/dict/type';
-import {
-  MesAutoCodeRuleCode,
-  MesQcResultValueType,
-} from '#/views/mes/utils/constants';
 
 /** 新增/修改的表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
diff --git a/apps/web-antd/src/views/mes/qc/indicatorresult/components/data.ts b/apps/web-antd/src/views/mes/qc/indicatorresult/components/data.ts
index 38557a984..d60f0a508 100644
--- a/apps/web-antd/src/views/mes/qc/indicatorresult/components/data.ts
+++ b/apps/web-antd/src/views/mes/qc/indicatorresult/components/data.ts
@@ -4,10 +4,11 @@ import type { MesQcIndicatorResultApi } from '#/api/mes/qc/indicatorresult';
 
 import { h } from 'vue';
 
+import { MesAutoCodeRuleCode } from '@vben/constants';
+
 import { Button } from 'ant-design-vue';
 
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'update';
diff --git a/apps/web-antd/src/views/mes/qc/indicatorresult/components/qc-indicator-result-form.vue b/apps/web-antd/src/views/mes/qc/indicatorresult/components/qc-indicator-result-form.vue
index 4a95486d6..4f7a1962b 100644
--- a/apps/web-antd/src/views/mes/qc/indicatorresult/components/qc-indicator-result-form.vue
+++ b/apps/web-antd/src/views/mes/qc/indicatorresult/components/qc-indicator-result-form.vue
@@ -6,6 +6,7 @@ import type { MesQcIndicatorResultApi } from '#/api/mes/qc/indicatorresult';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { MesQcResultValueType } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import {
@@ -25,7 +26,6 @@ import {
   updateIndicatorResult,
 } from '#/api/mes/qc/indicatorresult';
 import { $t } from '#/locales';
-import { MesQcResultValueType } from '#/views/mes/utils/constants';
 
 import { useQcIndicatorResultFormSchema } from './data';
 
diff --git a/apps/web-antd/src/views/mes/qc/ipqc/data.ts b/apps/web-antd/src/views/mes/qc/ipqc/data.ts
index da7215475..0d6615ab4 100644
--- a/apps/web-antd/src/views/mes/qc/ipqc/data.ts
+++ b/apps/web-antd/src/views/mes/qc/ipqc/data.ts
@@ -5,7 +5,7 @@ import type { MesQcIpqcLineApi } from '#/api/mes/qc/ipqc/line';
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode, MesProTaskStatusEnum, MesProWorkOrderStatusEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { Button } from 'ant-design-vue';
@@ -16,11 +16,6 @@ import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
 import MdWorkstationSelect from '#/views/mes/md/workstation/components/md-workstation-select.vue';
 import ProTaskSelect from '#/views/mes/pro/task/components/pro-task-select.vue';
 import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
-import {
-  MesAutoCodeRuleCode,
-  MesProTaskStatusEnum,
-  MesProWorkOrderStatusEnum,
-} from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-antd/src/views/mes/qc/ipqc/index.vue b/apps/web-antd/src/views/mes/qc/ipqc/index.vue
index 1bdb9c826..8baabc150 100644
--- a/apps/web-antd/src/views/mes/qc/ipqc/index.vue
+++ b/apps/web-antd/src/views/mes/qc/ipqc/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesQcIpqcApi } from '#/api/mes/qc/ipqc';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesQcStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { Button, message } from 'ant-design-vue';
@@ -10,7 +11,6 @@ import { Button, message } from 'ant-design-vue';
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { deleteIpqc, exportIpqc, getIpqcPage } from '#/api/mes/qc/ipqc';
 import { $t } from '#/locales';
-import { MesQcStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-antd/src/views/mes/qc/ipqc/modules/form.vue b/apps/web-antd/src/views/mes/qc/ipqc/modules/form.vue
index 87062e316..92831fea5 100644
--- a/apps/web-antd/src/views/mes/qc/ipqc/modules/form.vue
+++ b/apps/web-antd/src/views/mes/qc/ipqc/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesQcIpqcApi } from '#/api/mes/qc/ipqc';
 import { computed, ref } from 'vue';
 
 import { confirm, useVbenModal } from '@vben/common-ui';
+import { MesQcStatusEnum, MesQcTypeEnum } from '@vben/constants';
 
 import { Button, Descriptions, message, Tabs } from 'ant-design-vue';
 
@@ -17,7 +18,6 @@ import {
   updateIpqc,
 } from '#/api/mes/qc/ipqc';
 import { $t } from '#/locales';
-import { MesQcStatusEnum, MesQcTypeEnum } from '#/views/mes/utils/constants';
 
 import { QcIndicatorResultList } from '../../indicatorresult/components';
 import { useFormSchema } from '../data';
diff --git a/apps/web-antd/src/views/mes/qc/ipqc/modules/line-list.vue b/apps/web-antd/src/views/mes/qc/ipqc/modules/line-list.vue
index 87aebb48a..01f2f8b32 100644
--- a/apps/web-antd/src/views/mes/qc/ipqc/modules/line-list.vue
+++ b/apps/web-antd/src/views/mes/qc/ipqc/modules/line-list.vue
@@ -3,10 +3,10 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesQcIpqcLineApi } from '#/api/mes/qc/ipqc/line';
 
 import { useVbenModal } from '@vben/common-ui';
+import { MesQcTypeEnum } from '@vben/constants';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getIpqcLinePage } from '#/api/mes/qc/ipqc/line';
-import { MesQcTypeEnum } from '#/views/mes/utils/constants';
 
 import { DefectRecordInlineList } from '../../defectrecord/components';
 import { type FormType, useLineGridColumns } from '../data';
diff --git a/apps/web-antd/src/views/mes/qc/iqc/data.ts b/apps/web-antd/src/views/mes/qc/iqc/data.ts
index 226ad962a..f1d3e806b 100644
--- a/apps/web-antd/src/views/mes/qc/iqc/data.ts
+++ b/apps/web-antd/src/views/mes/qc/iqc/data.ts
@@ -5,7 +5,7 @@ import type { MesQcIqcLineApi } from '#/api/mes/qc/iqc/line';
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { Button } from 'ant-design-vue';
@@ -15,7 +15,6 @@ import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
 import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-antd/src/views/mes/qc/iqc/index.vue b/apps/web-antd/src/views/mes/qc/iqc/index.vue
index d3be3989f..46b9259c5 100644
--- a/apps/web-antd/src/views/mes/qc/iqc/index.vue
+++ b/apps/web-antd/src/views/mes/qc/iqc/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesQcIqcApi } from '#/api/mes/qc/iqc';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesQcStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { Button, message } from 'ant-design-vue';
@@ -10,7 +11,6 @@ import { Button, message } from 'ant-design-vue';
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { deleteIqc, exportIqc, getIqcPage } from '#/api/mes/qc/iqc';
 import { $t } from '#/locales';
-import { MesQcStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-antd/src/views/mes/qc/iqc/modules/form.vue b/apps/web-antd/src/views/mes/qc/iqc/modules/form.vue
index fec8d932f..eb7d43990 100644
--- a/apps/web-antd/src/views/mes/qc/iqc/modules/form.vue
+++ b/apps/web-antd/src/views/mes/qc/iqc/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesQcIqcApi } from '#/api/mes/qc/iqc';
 import { computed, ref } from 'vue';
 
 import { confirm, useVbenModal } from '@vben/common-ui';
+import { MesQcStatusEnum, MesQcTypeEnum } from '@vben/constants';
 
 import {
   Button,
@@ -22,7 +23,6 @@ import {
   updateIqc,
 } from '#/api/mes/qc/iqc';
 import { $t } from '#/locales';
-import { MesQcStatusEnum, MesQcTypeEnum } from '#/views/mes/utils/constants';
 
 import { QcIndicatorResultList } from '../../indicatorresult/components';
 import { useFormSchema } from '../data';
diff --git a/apps/web-antd/src/views/mes/qc/iqc/modules/line-list.vue b/apps/web-antd/src/views/mes/qc/iqc/modules/line-list.vue
index 825b07059..faaef9c95 100644
--- a/apps/web-antd/src/views/mes/qc/iqc/modules/line-list.vue
+++ b/apps/web-antd/src/views/mes/qc/iqc/modules/line-list.vue
@@ -3,10 +3,10 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesQcIqcLineApi } from '#/api/mes/qc/iqc/line';
 
 import { useVbenModal } from '@vben/common-ui';
+import { MesQcTypeEnum } from '@vben/constants';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getIqcLinePage } from '#/api/mes/qc/iqc/line';
-import { MesQcTypeEnum } from '#/views/mes/utils/constants';
 
 import { DefectRecordInlineList } from '../../defectrecord/components';
 import { type FormType, useLineGridColumns } from '../data';
diff --git a/apps/web-antd/src/views/mes/qc/oqc/data.ts b/apps/web-antd/src/views/mes/qc/oqc/data.ts
index 41b79218d..855b97bf2 100644
--- a/apps/web-antd/src/views/mes/qc/oqc/data.ts
+++ b/apps/web-antd/src/views/mes/qc/oqc/data.ts
@@ -5,7 +5,7 @@ import type { MesQcOqcLineApi } from '#/api/mes/qc/oqc/line';
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { Button } from 'ant-design-vue';
@@ -14,7 +14,6 @@ import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getSimpleUserList } from '#/api/system/user';
 import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
 import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-antd/src/views/mes/qc/oqc/index.vue b/apps/web-antd/src/views/mes/qc/oqc/index.vue
index bda817e71..e019dc3a3 100644
--- a/apps/web-antd/src/views/mes/qc/oqc/index.vue
+++ b/apps/web-antd/src/views/mes/qc/oqc/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesQcOqcApi } from '#/api/mes/qc/oqc';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesQcStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { Button, message } from 'ant-design-vue';
@@ -10,7 +11,6 @@ import { Button, message } from 'ant-design-vue';
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { deleteOqc, exportOqc, getOqcPage } from '#/api/mes/qc/oqc';
 import { $t } from '#/locales';
-import { MesQcStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-antd/src/views/mes/qc/oqc/modules/form.vue b/apps/web-antd/src/views/mes/qc/oqc/modules/form.vue
index 05e6b749a..11f1d4b50 100644
--- a/apps/web-antd/src/views/mes/qc/oqc/modules/form.vue
+++ b/apps/web-antd/src/views/mes/qc/oqc/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesQcOqcApi } from '#/api/mes/qc/oqc';
 import { computed, ref } from 'vue';
 
 import { confirm, useVbenModal } from '@vben/common-ui';
+import { MesQcStatusEnum, MesQcTypeEnum } from '@vben/constants';
 
 import { Button, Descriptions, message, Tabs } from 'ant-design-vue';
 
@@ -17,7 +18,6 @@ import {
   updateOqc,
 } from '#/api/mes/qc/oqc';
 import { $t } from '#/locales';
-import { MesQcStatusEnum, MesQcTypeEnum } from '#/views/mes/utils/constants';
 
 import { QcIndicatorResultList } from '../../indicatorresult/components';
 import { useFormSchema } from '../data';
diff --git a/apps/web-antd/src/views/mes/qc/oqc/modules/line-list.vue b/apps/web-antd/src/views/mes/qc/oqc/modules/line-list.vue
index 5bcde58cf..fa868cbb7 100644
--- a/apps/web-antd/src/views/mes/qc/oqc/modules/line-list.vue
+++ b/apps/web-antd/src/views/mes/qc/oqc/modules/line-list.vue
@@ -3,10 +3,10 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesQcOqcLineApi } from '#/api/mes/qc/oqc/line';
 
 import { useVbenModal } from '@vben/common-ui';
+import { MesQcTypeEnum } from '@vben/constants';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getOqcLinePage } from '#/api/mes/qc/oqc/line';
-import { MesQcTypeEnum } from '#/views/mes/utils/constants';
 
 import { DefectRecordInlineList } from '../../defectrecord/components';
 import { type FormType, useLineGridColumns } from '../data';
diff --git a/apps/web-antd/src/views/mes/qc/pendinginspect/index.vue b/apps/web-antd/src/views/mes/qc/pendinginspect/index.vue
index bbcfc727d..613a10ede 100644
--- a/apps/web-antd/src/views/mes/qc/pendinginspect/index.vue
+++ b/apps/web-antd/src/views/mes/qc/pendinginspect/index.vue
@@ -7,10 +7,10 @@ import type { MesQcPendingInspectApi } from '#/api/mes/qc/pendinginspect';
 import type { MesQcRqcApi } from '#/api/mes/qc/rqc';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesQcTypeEnum } from '@vben/constants';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getPendingInspectPage } from '#/api/mes/qc/pendinginspect';
-import { MesQcTypeEnum } from '#/views/mes/utils/constants';
 
 import IpqcForm from '../ipqc/modules/form.vue';
 import IqcForm from '../iqc/modules/form.vue';
diff --git a/apps/web-antd/src/views/mes/qc/rqc/data.ts b/apps/web-antd/src/views/mes/qc/rqc/data.ts
index ee765a373..41f895e33 100644
--- a/apps/web-antd/src/views/mes/qc/rqc/data.ts
+++ b/apps/web-antd/src/views/mes/qc/rqc/data.ts
@@ -5,7 +5,7 @@ import type { MesQcRqcLineApi } from '#/api/mes/qc/rqc/line';
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode, MesQcSourceDocTypeEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { Button } from 'ant-design-vue';
@@ -13,10 +13,6 @@ import { Button } from 'ant-design-vue';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getSimpleUserList } from '#/api/system/user';
 import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
-import {
-  MesAutoCodeRuleCode,
-  MesQcSourceDocTypeEnum,
-} from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-antd/src/views/mes/qc/rqc/index.vue b/apps/web-antd/src/views/mes/qc/rqc/index.vue
index f37370a86..abf9284fe 100644
--- a/apps/web-antd/src/views/mes/qc/rqc/index.vue
+++ b/apps/web-antd/src/views/mes/qc/rqc/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesQcRqcApi } from '#/api/mes/qc/rqc';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesQcStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { Button, message } from 'ant-design-vue';
@@ -10,7 +11,6 @@ import { Button, message } from 'ant-design-vue';
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { deleteRqc, exportRqc, getRqcPage } from '#/api/mes/qc/rqc';
 import { $t } from '#/locales';
-import { MesQcStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-antd/src/views/mes/qc/rqc/modules/form.vue b/apps/web-antd/src/views/mes/qc/rqc/modules/form.vue
index db30062cf..952ec0854 100644
--- a/apps/web-antd/src/views/mes/qc/rqc/modules/form.vue
+++ b/apps/web-antd/src/views/mes/qc/rqc/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesQcRqcApi } from '#/api/mes/qc/rqc';
 import { computed, ref } from 'vue';
 
 import { confirm, useVbenModal } from '@vben/common-ui';
+import { MesQcStatusEnum, MesQcTypeEnum } from '@vben/constants';
 
 import { Button, Descriptions, message, Tabs } from 'ant-design-vue';
 
@@ -17,7 +18,6 @@ import {
   updateRqc,
 } from '#/api/mes/qc/rqc';
 import { $t } from '#/locales';
-import { MesQcStatusEnum, MesQcTypeEnum } from '#/views/mes/utils/constants';
 
 import { QcIndicatorResultList } from '../../indicatorresult/components';
 import { useFormSchema } from '../data';
diff --git a/apps/web-antd/src/views/mes/qc/rqc/modules/line-list.vue b/apps/web-antd/src/views/mes/qc/rqc/modules/line-list.vue
index f542d2fa2..0f3592edf 100644
--- a/apps/web-antd/src/views/mes/qc/rqc/modules/line-list.vue
+++ b/apps/web-antd/src/views/mes/qc/rqc/modules/line-list.vue
@@ -3,10 +3,10 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesQcRqcLineApi } from '#/api/mes/qc/rqc/line';
 
 import { useVbenModal } from '@vben/common-ui';
+import { MesQcTypeEnum } from '@vben/constants';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getRqcLinePage } from '#/api/mes/qc/rqc/line';
-import { MesQcTypeEnum } from '#/views/mes/utils/constants';
 
 import { DefectRecordInlineList } from '../../defectrecord/components';
 import { type FormType, useLineGridColumns } from '../data';
diff --git a/apps/web-antd/src/views/mes/qc/template/data.ts b/apps/web-antd/src/views/mes/qc/template/data.ts
index 69aff5072..98778297c 100644
--- a/apps/web-antd/src/views/mes/qc/template/data.ts
+++ b/apps/web-antd/src/views/mes/qc/template/data.ts
@@ -4,9 +4,9 @@ import type { MesQcTemplateApi } from '#/api/mes/qc/template';
 import type { MesQcTemplateIndicatorApi } from '#/api/mes/qc/template/indicator';
 import type { MesQcTemplateItemApi } from '#/api/mes/qc/template/item';
 
-import { h, markRaw } from 'vue';
+import { DICT_TYPE, h, markRaw } from 'vue';
 
-import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { CommonStatusEnum, MesAutoCodeRuleCode } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { Button } from 'ant-design-vue';
@@ -16,7 +16,6 @@ import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
 import MdUnitMeasureSelect from '#/views/mes/md/unitmeasure/components/md-unit-measure-select.vue';
 import QcIndicatorSelect from '#/views/mes/qc/indicator/components/qc-indicator-select.vue';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-antd/src/views/mes/tm/tool/data.ts b/apps/web-antd/src/views/mes/tm/tool/data.ts
index b2e012145..4d3e6d093 100644
--- a/apps/web-antd/src/views/mes/tm/tool/data.ts
+++ b/apps/web-antd/src/views/mes/tm/tool/data.ts
@@ -4,7 +4,7 @@ import type { MesTmToolApi } from '#/api/mes/tm/tool';
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode, MesMaintenTypeEnum, MesToolStatusEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 import { formatDateTime } from '@vben/utils';
 
@@ -12,11 +12,6 @@ import { Button } from 'ant-design-vue';
 
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
-import {
-  MesAutoCodeRuleCode,
-  MesMaintenTypeEnum,
-  MesToolStatusEnum,
-} from '#/views/mes/utils/constants';
 
 import { TmToolTypeSelect } from './type/components';
 
diff --git a/apps/web-antd/src/views/mes/tm/tool/modules/form.vue b/apps/web-antd/src/views/mes/tm/tool/modules/form.vue
index 03f88e467..0ff726b23 100644
--- a/apps/web-antd/src/views/mes/tm/tool/modules/form.vue
+++ b/apps/web-antd/src/views/mes/tm/tool/modules/form.vue
@@ -6,13 +6,13 @@ import type { MesTmToolApi } from '#/api/mes/tm/tool';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { BarcodeBizTypeEnum } from '@vben/constants';
 
 import { Button, message } from 'ant-design-vue';
 
 import { useVbenForm } from '#/adapter/form';
 import { createTool, getTool, updateTool } from '#/api/mes/tm/tool';
 import { $t } from '#/locales';
-import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
 import { BarcodeDetail } from '#/views/mes/wm/barcode/components';
 
 import { useFormSchema } from '../data';
diff --git a/apps/web-antd/src/views/mes/tm/tool/type/data.ts b/apps/web-antd/src/views/mes/tm/tool/type/data.ts
index c9bf4ca5b..30965004b 100644
--- a/apps/web-antd/src/views/mes/tm/tool/type/data.ts
+++ b/apps/web-antd/src/views/mes/tm/tool/type/data.ts
@@ -4,14 +4,13 @@ import type { MesTmToolTypeApi } from '#/api/mes/tm/tool/type';
 
 import { h } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode, MesMaintenTypeEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { Button } from 'ant-design-vue';
 
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
-import { MesAutoCodeRuleCode, MesMaintenTypeEnum } from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-antd/src/views/mes/wm/arrivalnotice/data.ts b/apps/web-antd/src/views/mes/wm/arrivalnotice/data.ts
index 973d83b38..c80cb6212 100644
--- a/apps/web-antd/src/views/mes/wm/arrivalnotice/data.ts
+++ b/apps/web-antd/src/views/mes/wm/arrivalnotice/data.ts
@@ -5,7 +5,7 @@ import type { MesWmArrivalNoticeLineApi } from '#/api/mes/wm/arrivalnotice/line'
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode } from '@vben/constants';
 
 import { Button } from 'ant-design-vue';
 
@@ -14,7 +14,6 @@ import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getRangePickerDefaultProps } from '#/utils';
 import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
 import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-antd/src/views/mes/wm/arrivalnotice/index.vue b/apps/web-antd/src/views/mes/wm/arrivalnotice/index.vue
index 33017a2de..c12b81321 100644
--- a/apps/web-antd/src/views/mes/wm/arrivalnotice/index.vue
+++ b/apps/web-antd/src/views/mes/wm/arrivalnotice/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesWmArrivalNoticeApi } from '#/api/mes/wm/arrivalnotice';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesWmArrivalNoticeStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { Button, message } from 'ant-design-vue';
@@ -14,7 +15,6 @@ import {
   getArrivalNoticePage,
 } from '#/api/mes/wm/arrivalnotice';
 import { $t } from '#/locales';
-import { MesWmArrivalNoticeStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-antd/src/views/mes/wm/arrivalnotice/modules/form.vue b/apps/web-antd/src/views/mes/wm/arrivalnotice/modules/form.vue
index 065d8af98..e3d5dcacf 100644
--- a/apps/web-antd/src/views/mes/wm/arrivalnotice/modules/form.vue
+++ b/apps/web-antd/src/views/mes/wm/arrivalnotice/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesWmArrivalNoticeApi } from '#/api/mes/wm/arrivalnotice';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { MesWmArrivalNoticeStatusEnum } from '@vben/constants';
 
 import { Button, Divider, message, Popconfirm } from 'ant-design-vue';
 
@@ -17,7 +18,6 @@ import {
   updateArrivalNotice,
 } from '#/api/mes/wm/arrivalnotice';
 import { $t } from '#/locales';
-import { MesWmArrivalNoticeStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 import LineList from './line-list.vue';
diff --git a/apps/web-antd/src/views/mes/wm/barcode/data.ts b/apps/web-antd/src/views/mes/wm/barcode/data.ts
index 3c57d300b..6ae33acc6 100644
--- a/apps/web-antd/src/views/mes/wm/barcode/data.ts
+++ b/apps/web-antd/src/views/mes/wm/barcode/data.ts
@@ -4,9 +4,9 @@ import type { MesWmBarcodeApi } from '#/api/mes/wm/barcode';
 import type { MesWmBarcodeConfigApi } from '#/api/mes/wm/barcode/config';
 import type { DescriptionItemSchema } from '#/components/description';
 
-import { h, markRaw } from 'vue';
+import { BarcodeBizTypeEnum, DICT_TYPE, h, markRaw } from 'vue';
 
-import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { CommonStatusEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 import { formatDateTime } from '@vben/utils';
 
@@ -22,7 +22,6 @@ import MdWorkstationSelect from '#/views/mes/md/workstation/components/md-workst
 import { ProCardSelect } from '#/views/mes/pro/card/components';
 import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
 import TmToolSelect from '#/views/mes/tm/tool/components/tm-tool-select.vue';
-import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
 import { WmBatchSelect } from '#/views/mes/wm/batch/components';
 import { UserSelect } from '#/views/system/user/components';
 
diff --git a/apps/web-antd/src/views/mes/wm/barcode/modules/form.vue b/apps/web-antd/src/views/mes/wm/barcode/modules/form.vue
index 08d218f4d..553e9416e 100644
--- a/apps/web-antd/src/views/mes/wm/barcode/modules/form.vue
+++ b/apps/web-antd/src/views/mes/wm/barcode/modules/form.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import type { MesWmBarcodeApi } from '#/api/mes/wm/barcode';
 
-import { computed, ref } from 'vue';
+import { BarcodeBizTypeEnum, computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
 import { CommonStatusEnum } from '@vben/constants';
@@ -17,7 +17,6 @@ import {
 import { getWarehouseArea } from '#/api/mes/wm/warehouse/area';
 import { getWarehouseLocation } from '#/api/mes/wm/warehouse/location';
 import { $t } from '#/locales';
-import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 
diff --git a/apps/web-antd/src/views/mes/wm/itemreceipt/data.ts b/apps/web-antd/src/views/mes/wm/itemreceipt/data.ts
index fcf5b0169..24aadac33 100644
--- a/apps/web-antd/src/views/mes/wm/itemreceipt/data.ts
+++ b/apps/web-antd/src/views/mes/wm/itemreceipt/data.ts
@@ -8,7 +8,7 @@ import type { MesWmItemReceiptLineApi } from '#/api/mes/wm/itemreceipt/line';
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode, MesWmArrivalNoticeStatusEnum } from '@vben/constants';
 
 import { Button } from 'ant-design-vue';
 
@@ -16,10 +16,6 @@ import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getRangePickerDefaultProps } from '#/utils';
 import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
 import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
-import {
-  MesAutoCodeRuleCode,
-  MesWmArrivalNoticeStatusEnum,
-} from '#/views/mes/utils/constants';
 import {
   WmArrivalNoticeLineSelect,
   WmArrivalNoticeSelect,
diff --git a/apps/web-antd/src/views/mes/wm/itemreceipt/index.vue b/apps/web-antd/src/views/mes/wm/itemreceipt/index.vue
index fa395a8e2..71f361a05 100644
--- a/apps/web-antd/src/views/mes/wm/itemreceipt/index.vue
+++ b/apps/web-antd/src/views/mes/wm/itemreceipt/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesWmItemReceiptApi } from '#/api/mes/wm/itemreceipt';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesWmItemReceiptStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { Button, message } from 'ant-design-vue';
@@ -15,7 +16,6 @@ import {
   getItemReceiptPage,
 } from '#/api/mes/wm/itemreceipt';
 import { $t } from '#/locales';
-import { MesWmItemReceiptStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-antd/src/views/mes/wm/itemreceipt/modules/form.vue b/apps/web-antd/src/views/mes/wm/itemreceipt/modules/form.vue
index 54fa26f86..4acb8d8a8 100644
--- a/apps/web-antd/src/views/mes/wm/itemreceipt/modules/form.vue
+++ b/apps/web-antd/src/views/mes/wm/itemreceipt/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesWmItemReceiptApi } from '#/api/mes/wm/itemreceipt';
 import { computed, ref } from 'vue';
 
 import { confirm, useVbenModal } from '@vben/common-ui';
+import { MesWmItemReceiptStatusEnum } from '@vben/constants';
 
 import { Button, Divider, message, Popconfirm } from 'ant-design-vue';
 
@@ -19,7 +20,6 @@ import {
   updateItemReceipt,
 } from '#/api/mes/wm/itemreceipt';
 import { $t } from '#/locales';
-import { MesWmItemReceiptStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 import LineList from './line-list.vue';
diff --git a/apps/web-antd/src/views/mes/wm/miscissue/data.ts b/apps/web-antd/src/views/mes/wm/miscissue/data.ts
index 04272d2ca..c54b66455 100644
--- a/apps/web-antd/src/views/mes/wm/miscissue/data.ts
+++ b/apps/web-antd/src/views/mes/wm/miscissue/data.ts
@@ -6,14 +6,13 @@ import type { MesWmMiscIssueLineApi } from '#/api/mes/wm/miscissue/line';
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { Button } from 'ant-design-vue';
 
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getRangePickerDefaultProps } from '#/utils';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
 import {
   WmWarehouseAreaSelect,
diff --git a/apps/web-antd/src/views/mes/wm/miscissue/index.vue b/apps/web-antd/src/views/mes/wm/miscissue/index.vue
index f7ed9e698..a3244adb6 100644
--- a/apps/web-antd/src/views/mes/wm/miscissue/index.vue
+++ b/apps/web-antd/src/views/mes/wm/miscissue/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesWmMiscIssueApi } from '#/api/mes/wm/miscissue';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesWmMiscIssueStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { Button, message } from 'ant-design-vue';
@@ -15,7 +16,6 @@ import {
   getMiscIssuePage,
 } from '#/api/mes/wm/miscissue';
 import { $t } from '#/locales';
-import { MesWmMiscIssueStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-antd/src/views/mes/wm/miscissue/modules/form.vue b/apps/web-antd/src/views/mes/wm/miscissue/modules/form.vue
index 01393d2a4..ad2597357 100644
--- a/apps/web-antd/src/views/mes/wm/miscissue/modules/form.vue
+++ b/apps/web-antd/src/views/mes/wm/miscissue/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesWmMiscIssueApi } from '#/api/mes/wm/miscissue';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { MesWmMiscIssueStatusEnum } from '@vben/constants';
 
 import { Button, Divider, message, Popconfirm } from 'ant-design-vue';
 
@@ -18,7 +19,6 @@ import {
   updateMiscIssue,
 } from '#/api/mes/wm/miscissue';
 import { $t } from '#/locales';
-import { MesWmMiscIssueStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 import LineList from './line-list.vue';
diff --git a/apps/web-antd/src/views/mes/wm/miscreceipt/data.ts b/apps/web-antd/src/views/mes/wm/miscreceipt/data.ts
index 8b192fc0f..290fd691d 100644
--- a/apps/web-antd/src/views/mes/wm/miscreceipt/data.ts
+++ b/apps/web-antd/src/views/mes/wm/miscreceipt/data.ts
@@ -5,7 +5,7 @@ import type { MesWmMiscReceiptLineApi } from '#/api/mes/wm/miscreceipt/line';
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { Button } from 'ant-design-vue';
@@ -13,7 +13,6 @@ import { Button } from 'ant-design-vue';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getRangePickerDefaultProps } from '#/utils';
 import { MdItemSelect } from '#/views/mes/md/item/components';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 import {
   WmWarehouseAreaSelect,
   WmWarehouseLocationSelect,
diff --git a/apps/web-antd/src/views/mes/wm/miscreceipt/index.vue b/apps/web-antd/src/views/mes/wm/miscreceipt/index.vue
index 39c2b8439..6898848a8 100644
--- a/apps/web-antd/src/views/mes/wm/miscreceipt/index.vue
+++ b/apps/web-antd/src/views/mes/wm/miscreceipt/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesWmMiscReceiptApi } from '#/api/mes/wm/miscreceipt';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesWmMiscReceiptStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { Button, message } from 'ant-design-vue';
@@ -15,7 +16,6 @@ import {
   getMiscReceiptPage,
 } from '#/api/mes/wm/miscreceipt';
 import { $t } from '#/locales';
-import { MesWmMiscReceiptStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-antd/src/views/mes/wm/miscreceipt/modules/form.vue b/apps/web-antd/src/views/mes/wm/miscreceipt/modules/form.vue
index 267ad0fcd..d9f6ef898 100644
--- a/apps/web-antd/src/views/mes/wm/miscreceipt/modules/form.vue
+++ b/apps/web-antd/src/views/mes/wm/miscreceipt/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesWmMiscReceiptApi } from '#/api/mes/wm/miscreceipt';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { MesWmMiscReceiptStatusEnum } from '@vben/constants';
 
 import { Button, Divider, message, Popconfirm } from 'ant-design-vue';
 
@@ -18,7 +19,6 @@ import {
   updateMiscReceipt,
 } from '#/api/mes/wm/miscreceipt';
 import { $t } from '#/locales';
-import { MesWmMiscReceiptStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 import LineList from './line-list.vue';
diff --git a/apps/web-antd/src/views/mes/wm/outsourceissue/data.ts b/apps/web-antd/src/views/mes/wm/outsourceissue/data.ts
index 70da52788..77b352dfe 100644
--- a/apps/web-antd/src/views/mes/wm/outsourceissue/data.ts
+++ b/apps/web-antd/src/views/mes/wm/outsourceissue/data.ts
@@ -8,7 +8,7 @@ import type { MesWmOutsourceIssueLineApi } from '#/api/mes/wm/outsourceissue/lin
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode, MesProWorkOrderStatusEnum, MesProWorkOrderTypeEnum } from '@vben/constants';
 
 import { Button } from 'ant-design-vue';
 
@@ -17,11 +17,6 @@ import { getRangePickerDefaultProps } from '#/utils';
 import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
 import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
 import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
-import {
-  MesAutoCodeRuleCode,
-  MesProWorkOrderStatusEnum,
-  MesProWorkOrderTypeEnum,
-} from '#/views/mes/utils/constants';
 import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
 import {
   WmWarehouseAreaSelect,
diff --git a/apps/web-antd/src/views/mes/wm/outsourceissue/index.vue b/apps/web-antd/src/views/mes/wm/outsourceissue/index.vue
index 4e80842d9..32fb3a7c5 100644
--- a/apps/web-antd/src/views/mes/wm/outsourceissue/index.vue
+++ b/apps/web-antd/src/views/mes/wm/outsourceissue/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesWmOutsourceIssueApi } from '#/api/mes/wm/outsourceissue';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesWmOutsourceIssueStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { Button, message } from 'ant-design-vue';
@@ -15,7 +16,6 @@ import {
   getOutsourceIssuePage,
 } from '#/api/mes/wm/outsourceissue';
 import { $t } from '#/locales';
-import { MesWmOutsourceIssueStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-antd/src/views/mes/wm/outsourceissue/modules/form.vue b/apps/web-antd/src/views/mes/wm/outsourceissue/modules/form.vue
index bbe1b8c25..9445dbc14 100644
--- a/apps/web-antd/src/views/mes/wm/outsourceissue/modules/form.vue
+++ b/apps/web-antd/src/views/mes/wm/outsourceissue/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesWmOutsourceIssueApi } from '#/api/mes/wm/outsourceissue';
 import { computed, ref } from 'vue';
 
 import { confirm, useVbenModal } from '@vben/common-ui';
+import { MesWmOutsourceIssueStatusEnum } from '@vben/constants';
 
 import { Button, Divider, message, Popconfirm } from 'ant-design-vue';
 
@@ -20,7 +21,6 @@ import {
   updateOutsourceIssue,
 } from '#/api/mes/wm/outsourceissue';
 import { $t } from '#/locales';
-import { MesWmOutsourceIssueStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 import LineList from './line-list.vue';
diff --git a/apps/web-antd/src/views/mes/wm/outsourcereceipt/data.ts b/apps/web-antd/src/views/mes/wm/outsourcereceipt/data.ts
index a4b96f1db..0aa83616c 100644
--- a/apps/web-antd/src/views/mes/wm/outsourcereceipt/data.ts
+++ b/apps/web-antd/src/views/mes/wm/outsourcereceipt/data.ts
@@ -7,7 +7,7 @@ import type { MesWmOutsourceReceiptLineApi } from '#/api/mes/wm/outsourcereceipt
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode, MesProWorkOrderStatusEnum, MesProWorkOrderTypeEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { Button } from 'ant-design-vue';
@@ -18,11 +18,6 @@ import { getRangePickerDefaultProps } from '#/utils';
 import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
 import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
 import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
-import {
-  MesAutoCodeRuleCode,
-  MesProWorkOrderStatusEnum,
-  MesProWorkOrderTypeEnum,
-} from '#/views/mes/utils/constants';
 import {
   WmWarehouseAreaSelect,
   WmWarehouseLocationSelect,
diff --git a/apps/web-antd/src/views/mes/wm/outsourcereceipt/index.vue b/apps/web-antd/src/views/mes/wm/outsourcereceipt/index.vue
index ae1def5f0..3f454046c 100644
--- a/apps/web-antd/src/views/mes/wm/outsourcereceipt/index.vue
+++ b/apps/web-antd/src/views/mes/wm/outsourcereceipt/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesWmOutsourceReceiptApi } from '#/api/mes/wm/outsourcereceipt';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesWmOutsourceReceiptStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { Button, message } from 'ant-design-vue';
@@ -15,7 +16,6 @@ import {
   getOutsourceReceiptPage,
 } from '#/api/mes/wm/outsourcereceipt';
 import { $t } from '#/locales';
-import { MesWmOutsourceReceiptStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/form.vue b/apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/form.vue
index d059dfd6a..5dea11ffb 100644
--- a/apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/form.vue
+++ b/apps/web-antd/src/views/mes/wm/outsourcereceipt/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesWmOutsourceReceiptApi } from '#/api/mes/wm/outsourcereceipt';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { MesWmOutsourceReceiptStatusEnum } from '@vben/constants';
 
 import { Button, Divider, message, Popconfirm } from 'ant-design-vue';
 
@@ -19,7 +20,6 @@ import {
   updateOutsourceReceipt,
 } from '#/api/mes/wm/outsourcereceipt';
 import { $t } from '#/locales';
-import { MesWmOutsourceReceiptStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 import LineList from './line-list.vue';
diff --git a/apps/web-antd/src/views/mes/wm/packages/components/wm-package-select-dialog.vue b/apps/web-antd/src/views/mes/wm/packages/components/wm-package-select-dialog.vue
index 77c72c573..da96e508b 100644
--- a/apps/web-antd/src/views/mes/wm/packages/components/wm-package-select-dialog.vue
+++ b/apps/web-antd/src/views/mes/wm/packages/components/wm-package-select-dialog.vue
@@ -4,11 +4,12 @@ import type { MesWmPackageApi } from '#/api/mes/wm/packages';
 
 import { nextTick, ref } from 'vue';
 
+import { MesWmPackageStatusEnum } from '@vben/constants';
+
 import { Alert, Button, message, Modal } from 'ant-design-vue';
 
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getPackagePage } from '#/api/mes/wm/packages';
-import { MesWmPackageStatusEnum } from '#/views/mes/utils/constants';
 
 import { useSelectGridColumns, useSelectGridFormSchema } from '../data';
 
diff --git a/apps/web-antd/src/views/mes/wm/packages/data.ts b/apps/web-antd/src/views/mes/wm/packages/data.ts
index ffa941e4d..82aa03c10 100644
--- a/apps/web-antd/src/views/mes/wm/packages/data.ts
+++ b/apps/web-antd/src/views/mes/wm/packages/data.ts
@@ -5,7 +5,7 @@ import type { MesWmPackageLineApi } from '#/api/mes/wm/packages/line';
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode, MesProWorkOrderStatusEnum } from '@vben/constants';
 
 import { Button } from 'ant-design-vue';
 
@@ -15,10 +15,6 @@ import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vu
 import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
 import { MdUnitMeasureSelect } from '#/views/mes/md/unitmeasure/components';
 import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
-import {
-  MesAutoCodeRuleCode,
-  MesProWorkOrderStatusEnum,
-} from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-antd/src/views/mes/wm/packages/index.vue b/apps/web-antd/src/views/mes/wm/packages/index.vue
index 78f3d0c8d..5f6407247 100644
--- a/apps/web-antd/src/views/mes/wm/packages/index.vue
+++ b/apps/web-antd/src/views/mes/wm/packages/index.vue
@@ -5,13 +5,13 @@ import type { MesWmPackageApi } from '#/api/mes/wm/packages';
 import { ref } from 'vue';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesWmPackageStatusEnum } from '@vben/constants';
 
 import { Button, message } from 'ant-design-vue';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { deletePackage, getPackagePage } from '#/api/mes/wm/packages';
 import { $t } from '#/locales';
-import { MesWmPackageStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-antd/src/views/mes/wm/packages/modules/form.vue b/apps/web-antd/src/views/mes/wm/packages/modules/form.vue
index ab7854ade..d81813ff9 100644
--- a/apps/web-antd/src/views/mes/wm/packages/modules/form.vue
+++ b/apps/web-antd/src/views/mes/wm/packages/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesWmPackageApi } from '#/api/mes/wm/packages';
 import { computed, ref } from 'vue';
 
 import { confirm, useVbenModal } from '@vben/common-ui';
+import { MesWmPackageStatusEnum } from '@vben/constants';
 
 import { Button, message, Tabs } from 'ant-design-vue';
 
@@ -17,7 +18,6 @@ import {
   updatePackage,
 } from '#/api/mes/wm/packages';
 import { $t } from '#/locales';
-import { MesWmPackageStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 import PackageLineList from './package-line-list.vue';
diff --git a/apps/web-antd/src/views/mes/wm/productissue/data.ts b/apps/web-antd/src/views/mes/wm/productissue/data.ts
index 5765e8ce3..35439aae5 100644
--- a/apps/web-antd/src/views/mes/wm/productissue/data.ts
+++ b/apps/web-antd/src/views/mes/wm/productissue/data.ts
@@ -7,7 +7,7 @@ import type { MesWmProductIssueLineApi } from '#/api/mes/wm/productissue/line';
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode, MesProWorkOrderStatusEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { Button } from 'ant-design-vue';
@@ -17,10 +17,6 @@ import { getRangePickerDefaultProps } from '#/utils';
 import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
 import MdWorkstationSelect from '#/views/mes/md/workstation/components/md-workstation-select.vue';
 import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
-import {
-  MesAutoCodeRuleCode,
-  MesProWorkOrderStatusEnum,
-} from '#/views/mes/utils/constants';
 import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
 import {
   WmWarehouseAreaSelect,
diff --git a/apps/web-antd/src/views/mes/wm/productissue/index.vue b/apps/web-antd/src/views/mes/wm/productissue/index.vue
index e3a2d8317..759e15f31 100644
--- a/apps/web-antd/src/views/mes/wm/productissue/index.vue
+++ b/apps/web-antd/src/views/mes/wm/productissue/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesWmProductIssueApi } from '#/api/mes/wm/productissue';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesWmProductIssueStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { Button, message } from 'ant-design-vue';
@@ -16,7 +17,6 @@ import {
   submitProductIssue,
 } from '#/api/mes/wm/productissue';
 import { $t } from '#/locales';
-import { MesWmProductIssueStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-antd/src/views/mes/wm/productissue/modules/form.vue b/apps/web-antd/src/views/mes/wm/productissue/modules/form.vue
index 89118c038..8d22f551c 100644
--- a/apps/web-antd/src/views/mes/wm/productissue/modules/form.vue
+++ b/apps/web-antd/src/views/mes/wm/productissue/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesWmProductIssueApi } from '#/api/mes/wm/productissue';
 import { computed, ref } from 'vue';
 
 import { confirm, useVbenModal } from '@vben/common-ui';
+import { MesWmProductIssueStatusEnum } from '@vben/constants';
 
 import { Button, Divider, message, Popconfirm } from 'ant-design-vue';
 
@@ -20,7 +21,6 @@ import {
   updateProductIssue,
 } from '#/api/mes/wm/productissue';
 import { $t } from '#/locales';
-import { MesWmProductIssueStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 import LineList from './line-list.vue';
diff --git a/apps/web-antd/src/views/mes/wm/productreceipt/data.ts b/apps/web-antd/src/views/mes/wm/productreceipt/data.ts
index 07f679212..68c4ae666 100644
--- a/apps/web-antd/src/views/mes/wm/productreceipt/data.ts
+++ b/apps/web-antd/src/views/mes/wm/productreceipt/data.ts
@@ -7,7 +7,7 @@ import type { MesWmProductReceiptLineApi } from '#/api/mes/wm/productreceipt/lin
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode, MesProWorkOrderStatusEnum } from '@vben/constants';
 
 import { Button } from 'ant-design-vue';
 
@@ -15,10 +15,6 @@ import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getRangePickerDefaultProps } from '#/utils';
 import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
 import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
-import {
-  MesAutoCodeRuleCode,
-  MesProWorkOrderStatusEnum,
-} from '#/views/mes/utils/constants';
 import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
 import {
   WmWarehouseAreaSelect,
diff --git a/apps/web-antd/src/views/mes/wm/productreceipt/index.vue b/apps/web-antd/src/views/mes/wm/productreceipt/index.vue
index 860c50d3f..07a55e7a3 100644
--- a/apps/web-antd/src/views/mes/wm/productreceipt/index.vue
+++ b/apps/web-antd/src/views/mes/wm/productreceipt/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesWmProductReceiptApi } from '#/api/mes/wm/productreceipt';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesWmProductReceiptStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { Button, message } from 'ant-design-vue';
@@ -15,7 +16,6 @@ import {
   getProductReceiptPage,
 } from '#/api/mes/wm/productreceipt';
 import { $t } from '#/locales';
-import { MesWmProductReceiptStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-antd/src/views/mes/wm/productreceipt/modules/form.vue b/apps/web-antd/src/views/mes/wm/productreceipt/modules/form.vue
index 4a85b60b5..0c607e8a3 100644
--- a/apps/web-antd/src/views/mes/wm/productreceipt/modules/form.vue
+++ b/apps/web-antd/src/views/mes/wm/productreceipt/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesWmProductReceiptApi } from '#/api/mes/wm/productreceipt';
 import { computed, ref } from 'vue';
 
 import { confirm, useVbenModal } from '@vben/common-ui';
+import { MesWmProductReceiptStatusEnum } from '@vben/constants';
 
 import { Button, Divider, message, Popconfirm } from 'ant-design-vue';
 
@@ -20,7 +21,6 @@ import {
   updateProductReceipt,
 } from '#/api/mes/wm/productreceipt';
 import { $t } from '#/locales';
-import { MesWmProductReceiptStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 import LineList from './line-list.vue';
diff --git a/apps/web-antd/src/views/mes/wm/productreceipt/modules/line-list.vue b/apps/web-antd/src/views/mes/wm/productreceipt/modules/line-list.vue
index de9d10081..377673d20 100644
--- a/apps/web-antd/src/views/mes/wm/productreceipt/modules/line-list.vue
+++ b/apps/web-antd/src/views/mes/wm/productreceipt/modules/line-list.vue
@@ -6,6 +6,7 @@ import type { MesWmProductReceiptLineApi } from '#/api/mes/wm/productreceipt/lin
 import { computed, reactive, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { BarcodeBizTypeEnum } from '@vben/constants';
 
 import { message } from 'ant-design-vue';
 
@@ -16,7 +17,6 @@ import {
   getProductReceiptLinePage,
 } from '#/api/mes/wm/productreceipt/line';
 import { $t } from '#/locales';
-import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
 import { BarcodeDetail, PrinterLabel } from '#/views/mes/wm/barcode/components';
 
 import { type FormType, useLineGridColumns } from '../data';
diff --git a/apps/web-antd/src/views/mes/wm/productsales/data.ts b/apps/web-antd/src/views/mes/wm/productsales/data.ts
index d07c4093c..a82be53e4 100644
--- a/apps/web-antd/src/views/mes/wm/productsales/data.ts
+++ b/apps/web-antd/src/views/mes/wm/productsales/data.ts
@@ -9,7 +9,7 @@ import type { MesWmSalesNoticeLineApi } from '#/api/mes/wm/salesnotice/line';
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode, MesWmSalesNoticeStatusEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { Button } from 'ant-design-vue';
@@ -19,10 +19,6 @@ import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getRangePickerDefaultProps } from '#/utils';
 import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
 import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
-import {
-  MesAutoCodeRuleCode,
-  MesWmSalesNoticeStatusEnum,
-} from '#/views/mes/utils/constants';
 import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
 import {
   WmSalesNoticeLineSelect,
diff --git a/apps/web-antd/src/views/mes/wm/productsales/index.vue b/apps/web-antd/src/views/mes/wm/productsales/index.vue
index fce6f5cff..1192c5ba6 100644
--- a/apps/web-antd/src/views/mes/wm/productsales/index.vue
+++ b/apps/web-antd/src/views/mes/wm/productsales/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesWmProductSalesApi } from '#/api/mes/wm/productsales';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesWmProductSalesStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { Button, message } from 'ant-design-vue';
@@ -15,7 +16,6 @@ import {
   getProductSalesPage,
 } from '#/api/mes/wm/productsales';
 import { $t } from '#/locales';
-import { MesWmProductSalesStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-antd/src/views/mes/wm/productsales/modules/form.vue b/apps/web-antd/src/views/mes/wm/productsales/modules/form.vue
index 70d71d653..044a82b80 100644
--- a/apps/web-antd/src/views/mes/wm/productsales/modules/form.vue
+++ b/apps/web-antd/src/views/mes/wm/productsales/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesWmProductSalesApi } from '#/api/mes/wm/productsales';
 import { computed, ref } from 'vue';
 
 import { confirm, useVbenModal } from '@vben/common-ui';
+import { MesWmProductSalesStatusEnum } from '@vben/constants';
 
 import { Button, Divider, message, Popconfirm } from 'ant-design-vue';
 
@@ -21,7 +22,6 @@ import {
   updateProductSales,
 } from '#/api/mes/wm/productsales';
 import { $t } from '#/locales';
-import { MesWmProductSalesStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 import LineList from './line-list.vue';
diff --git a/apps/web-antd/src/views/mes/wm/returnissue/data.ts b/apps/web-antd/src/views/mes/wm/returnissue/data.ts
index f1320acca..54fa15924 100644
--- a/apps/web-antd/src/views/mes/wm/returnissue/data.ts
+++ b/apps/web-antd/src/views/mes/wm/returnissue/data.ts
@@ -7,7 +7,7 @@ import type { MesWmReturnIssueLineApi } from '#/api/mes/wm/returnissue/line';
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode, MesProWorkOrderStatusEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { Button } from 'ant-design-vue';
@@ -17,10 +17,6 @@ import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
 import MdWorkstationSelect from '#/views/mes/md/workstation/components/md-workstation-select.vue';
 import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
-import {
-  MesAutoCodeRuleCode,
-  MesProWorkOrderStatusEnum,
-} from '#/views/mes/utils/constants';
 import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
 import {
   WmWarehouseAreaSelect,
diff --git a/apps/web-antd/src/views/mes/wm/returnissue/index.vue b/apps/web-antd/src/views/mes/wm/returnissue/index.vue
index 4f8aeddfb..0e2583c84 100644
--- a/apps/web-antd/src/views/mes/wm/returnissue/index.vue
+++ b/apps/web-antd/src/views/mes/wm/returnissue/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesWmReturnIssueApi } from '#/api/mes/wm/returnissue';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesWmReturnIssueStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { Button, message } from 'ant-design-vue';
@@ -15,7 +16,6 @@ import {
   getReturnIssuePage,
 } from '#/api/mes/wm/returnissue';
 import { $t } from '#/locales';
-import { MesWmReturnIssueStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-antd/src/views/mes/wm/returnissue/modules/form.vue b/apps/web-antd/src/views/mes/wm/returnissue/modules/form.vue
index 2251ecd48..2bfe5fdc2 100644
--- a/apps/web-antd/src/views/mes/wm/returnissue/modules/form.vue
+++ b/apps/web-antd/src/views/mes/wm/returnissue/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesWmReturnIssueApi } from '#/api/mes/wm/returnissue';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { MesWmReturnIssueStatusEnum } from '@vben/constants';
 
 import { Button, Divider, message, Popconfirm } from 'ant-design-vue';
 
@@ -19,7 +20,6 @@ import {
   updateReturnIssue,
 } from '#/api/mes/wm/returnissue';
 import { $t } from '#/locales';
-import { MesWmReturnIssueStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 import LineList from './line-list.vue';
diff --git a/apps/web-antd/src/views/mes/wm/returnissue/modules/line-list.vue b/apps/web-antd/src/views/mes/wm/returnissue/modules/line-list.vue
index 216dbd665..7468af09f 100644
--- a/apps/web-antd/src/views/mes/wm/returnissue/modules/line-list.vue
+++ b/apps/web-antd/src/views/mes/wm/returnissue/modules/line-list.vue
@@ -6,6 +6,7 @@ import type { MesWmReturnIssueLineApi } from '#/api/mes/wm/returnissue/line';
 import { computed, reactive, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { BarcodeBizTypeEnum } from '@vben/constants';
 
 import { message } from 'ant-design-vue';
 
@@ -16,7 +17,6 @@ import {
   getReturnIssueLinePage,
 } from '#/api/mes/wm/returnissue/line';
 import { $t } from '#/locales';
-import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
 import { BarcodeDetail, PrinterLabel } from '#/views/mes/wm/barcode/components';
 
 import { type FormType, useLineGridColumns } from '../data';
diff --git a/apps/web-antd/src/views/mes/wm/returnsales/data.ts b/apps/web-antd/src/views/mes/wm/returnsales/data.ts
index b540e86bf..2b6a35cc3 100644
--- a/apps/web-antd/src/views/mes/wm/returnsales/data.ts
+++ b/apps/web-antd/src/views/mes/wm/returnsales/data.ts
@@ -6,7 +6,7 @@ import type { MesWmReturnSalesLineApi } from '#/api/mes/wm/returnsales/line';
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { Button } from 'ant-design-vue';
@@ -15,7 +15,6 @@ import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
 import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 import { WmBatchSelect } from '#/views/mes/wm/batch/components';
 import {
   WmWarehouseAreaSelect,
diff --git a/apps/web-antd/src/views/mes/wm/returnsales/index.vue b/apps/web-antd/src/views/mes/wm/returnsales/index.vue
index e746b54b8..f7f32b32a 100644
--- a/apps/web-antd/src/views/mes/wm/returnsales/index.vue
+++ b/apps/web-antd/src/views/mes/wm/returnsales/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesWmReturnSalesApi } from '#/api/mes/wm/returnsales';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesWmReturnSalesStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { Button, message } from 'ant-design-vue';
@@ -15,7 +16,6 @@ import {
   getReturnSalesPage,
 } from '#/api/mes/wm/returnsales';
 import { $t } from '#/locales';
-import { MesWmReturnSalesStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-antd/src/views/mes/wm/returnsales/modules/form.vue b/apps/web-antd/src/views/mes/wm/returnsales/modules/form.vue
index d329c1d62..8dfa82d14 100644
--- a/apps/web-antd/src/views/mes/wm/returnsales/modules/form.vue
+++ b/apps/web-antd/src/views/mes/wm/returnsales/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesWmReturnSalesApi } from '#/api/mes/wm/returnsales';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { MesWmReturnSalesStatusEnum } from '@vben/constants';
 
 import { Button, Divider, message, Popconfirm } from 'ant-design-vue';
 
@@ -19,7 +20,6 @@ import {
   updateReturnSales,
 } from '#/api/mes/wm/returnsales';
 import { $t } from '#/locales';
-import { MesWmReturnSalesStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 import LineList from './line-list.vue';
diff --git a/apps/web-antd/src/views/mes/wm/returnvendor/data.ts b/apps/web-antd/src/views/mes/wm/returnvendor/data.ts
index 0b4d33526..e707b48ab 100644
--- a/apps/web-antd/src/views/mes/wm/returnvendor/data.ts
+++ b/apps/web-antd/src/views/mes/wm/returnvendor/data.ts
@@ -7,14 +7,13 @@ import type { MesWmReturnVendorLineApi } from '#/api/mes/wm/returnvendor/line';
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode } from '@vben/constants';
 
 import { Button } from 'ant-design-vue';
 
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
 import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 import { WmBatchSelect } from '#/views/mes/wm/batch/components';
 import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
 import {
diff --git a/apps/web-antd/src/views/mes/wm/returnvendor/index.vue b/apps/web-antd/src/views/mes/wm/returnvendor/index.vue
index eaa32e016..7759142d0 100644
--- a/apps/web-antd/src/views/mes/wm/returnvendor/index.vue
+++ b/apps/web-antd/src/views/mes/wm/returnvendor/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesWmReturnVendorApi } from '#/api/mes/wm/returnvendor';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesWmReturnVendorStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { Button, message } from 'ant-design-vue';
@@ -15,7 +16,6 @@ import {
   getReturnVendorPage,
 } from '#/api/mes/wm/returnvendor';
 import { $t } from '#/locales';
-import { MesWmReturnVendorStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-antd/src/views/mes/wm/returnvendor/modules/form.vue b/apps/web-antd/src/views/mes/wm/returnvendor/modules/form.vue
index 332591901..8258b6ed7 100644
--- a/apps/web-antd/src/views/mes/wm/returnvendor/modules/form.vue
+++ b/apps/web-antd/src/views/mes/wm/returnvendor/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesWmReturnVendorApi } from '#/api/mes/wm/returnvendor';
 import { computed, ref } from 'vue';
 
 import { confirm, useVbenModal } from '@vben/common-ui';
+import { MesWmReturnVendorStatusEnum } from '@vben/constants';
 
 import { Button, Divider, message, Popconfirm } from 'ant-design-vue';
 
@@ -20,7 +21,6 @@ import {
   updateReturnVendor,
 } from '#/api/mes/wm/returnvendor';
 import { $t } from '#/locales';
-import { MesWmReturnVendorStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 import LineList from './line-list.vue';
diff --git a/apps/web-antd/src/views/mes/wm/salesnotice/data.ts b/apps/web-antd/src/views/mes/wm/salesnotice/data.ts
index 6e30cada5..551de1cd2 100644
--- a/apps/web-antd/src/views/mes/wm/salesnotice/data.ts
+++ b/apps/web-antd/src/views/mes/wm/salesnotice/data.ts
@@ -5,7 +5,7 @@ import type { MesWmSalesNoticeLineApi } from '#/api/mes/wm/salesnotice/line';
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode } from '@vben/constants';
 
 import { Button } from 'ant-design-vue';
 
@@ -13,7 +13,6 @@ import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
 import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'finish' | 'update';
diff --git a/apps/web-antd/src/views/mes/wm/salesnotice/index.vue b/apps/web-antd/src/views/mes/wm/salesnotice/index.vue
index 0faa7ac82..01720e1cf 100644
--- a/apps/web-antd/src/views/mes/wm/salesnotice/index.vue
+++ b/apps/web-antd/src/views/mes/wm/salesnotice/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesWmSalesNoticeApi } from '#/api/mes/wm/salesnotice';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesWmSalesNoticeStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { Button, message } from 'ant-design-vue';
@@ -14,7 +15,6 @@ import {
   getSalesNoticePage,
 } from '#/api/mes/wm/salesnotice';
 import { $t } from '#/locales';
-import { MesWmSalesNoticeStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-antd/src/views/mes/wm/salesnotice/modules/form.vue b/apps/web-antd/src/views/mes/wm/salesnotice/modules/form.vue
index ae1c5afad..82dff6f23 100644
--- a/apps/web-antd/src/views/mes/wm/salesnotice/modules/form.vue
+++ b/apps/web-antd/src/views/mes/wm/salesnotice/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesWmSalesNoticeApi } from '#/api/mes/wm/salesnotice';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { MesWmSalesNoticeStatusEnum } from '@vben/constants';
 
 import { Button, Divider, message, Popconfirm } from 'ant-design-vue';
 
@@ -17,7 +18,6 @@ import {
   updateSalesNotice,
 } from '#/api/mes/wm/salesnotice';
 import { $t } from '#/locales';
-import { MesWmSalesNoticeStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 import LineList from './line-list.vue';
diff --git a/apps/web-antd/src/views/mes/wm/stocktaking/plan/data.ts b/apps/web-antd/src/views/mes/wm/stocktaking/plan/data.ts
index 883fbff90..a83743b6b 100644
--- a/apps/web-antd/src/views/mes/wm/stocktaking/plan/data.ts
+++ b/apps/web-antd/src/views/mes/wm/stocktaking/plan/data.ts
@@ -3,19 +3,15 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesWmStockTakingPlanApi } from '#/api/mes/wm/stocktaking/plan';
 import type { MesWmStockTakingPlanParamApi } from '#/api/mes/wm/stocktaking/plan/param';
 
-import { h } from 'vue';
+import { DICT_TYPE, h } from 'vue';
 
-import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { CommonStatusEnum, MesAutoCodeRuleCode, MesWmStockTakingTypeEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { Button } from 'ant-design-vue';
 
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
-import {
-  MesAutoCodeRuleCode,
-  MesWmStockTakingTypeEnum,
-} from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-antd/src/views/mes/wm/stocktaking/plan/modules/param-form.vue b/apps/web-antd/src/views/mes/wm/stocktaking/plan/modules/param-form.vue
index 49128ca83..53bac9412 100644
--- a/apps/web-antd/src/views/mes/wm/stocktaking/plan/modules/param-form.vue
+++ b/apps/web-antd/src/views/mes/wm/stocktaking/plan/modules/param-form.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import type { MesWmStockTakingPlanParamApi } from '#/api/mes/wm/stocktaking/plan/param';
 
-import { computed, ref } from 'vue';
+import { computed, MesWmStockTakingParamTypeEnum, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
 import { DICT_TYPE } from '@vben/constants';
@@ -18,7 +18,6 @@ import { getWarehouseArea } from '#/api/mes/wm/warehouse/area';
 import { getWarehouseLocation } from '#/api/mes/wm/warehouse/location';
 import { $t } from '#/locales';
 import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
-import { MesWmStockTakingParamTypeEnum } from '#/views/mes/utils/constants';
 import { WmBatchSelect } from '#/views/mes/wm/batch/components';
 import {
   WmWarehouseAreaSelect,
diff --git a/apps/web-antd/src/views/mes/wm/stocktaking/task/data.ts b/apps/web-antd/src/views/mes/wm/stocktaking/task/data.ts
index cb118ef7c..1f797ac74 100644
--- a/apps/web-antd/src/views/mes/wm/stocktaking/task/data.ts
+++ b/apps/web-antd/src/views/mes/wm/stocktaking/task/data.ts
@@ -7,7 +7,7 @@ import type { MesWmStockTakingResultApi } from '#/api/mes/wm/stocktaking/task/re
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode, MesWmStockTakingTypeEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { Button } from 'ant-design-vue';
@@ -17,10 +17,6 @@ import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
-import {
-  MesAutoCodeRuleCode,
-  MesWmStockTakingTypeEnum,
-} from '#/views/mes/utils/constants';
 import { StockTakingPlanSelect } from '#/views/mes/wm/stocktaking/plan/components';
 import {
   WmWarehouseAreaSelect,
diff --git a/apps/web-antd/src/views/mes/wm/stocktaking/task/index.vue b/apps/web-antd/src/views/mes/wm/stocktaking/task/index.vue
index 974357c65..cd4ae87f7 100644
--- a/apps/web-antd/src/views/mes/wm/stocktaking/task/index.vue
+++ b/apps/web-antd/src/views/mes/wm/stocktaking/task/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesWmStockTakingTaskApi } from '#/api/mes/wm/stocktaking/task';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesWmStockTakingTaskStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { Button, message } from 'ant-design-vue';
@@ -15,7 +16,6 @@ import {
   getStockTakingPage,
 } from '#/api/mes/wm/stocktaking/task';
 import { $t } from '#/locales';
-import { MesWmStockTakingTaskStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-antd/src/views/mes/wm/stocktaking/task/modules/form.vue b/apps/web-antd/src/views/mes/wm/stocktaking/task/modules/form.vue
index fbb42b708..05cc93b33 100644
--- a/apps/web-antd/src/views/mes/wm/stocktaking/task/modules/form.vue
+++ b/apps/web-antd/src/views/mes/wm/stocktaking/task/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesWmStockTakingTaskApi } from '#/api/mes/wm/stocktaking/task';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { MesWmStockTakingTaskStatusEnum } from '@vben/constants';
 import { useUserStore } from '@vben/stores';
 
 import { Button, message, Popconfirm, Tabs } from 'ant-design-vue';
@@ -19,7 +20,6 @@ import {
   updateStockTaking,
 } from '#/api/mes/wm/stocktaking/task';
 import { $t } from '#/locales';
-import { MesWmStockTakingTaskStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 import LineList from './line-list.vue';
diff --git a/apps/web-antd/src/views/mes/wm/transfer/data.ts b/apps/web-antd/src/views/mes/wm/transfer/data.ts
index 64f3f80cd..1bba99af5 100644
--- a/apps/web-antd/src/views/mes/wm/transfer/data.ts
+++ b/apps/web-antd/src/views/mes/wm/transfer/data.ts
@@ -7,7 +7,7 @@ import type { MesWmTransferLineApi } from '#/api/mes/wm/transfer/line';
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode, MesWmTransferTypeEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { Button } from 'ant-design-vue';
@@ -15,10 +15,6 @@ import { Button } from 'ant-design-vue';
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { MdItemSelect } from '#/views/mes/md/item/components';
-import {
-  MesAutoCodeRuleCode,
-  MesWmTransferTypeEnum,
-} from '/constants';
 import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
 import {
   WmWarehouseAreaSelect,
diff --git a/apps/web-antd/src/views/mes/wm/transfer/index.vue b/apps/web-antd/src/views/mes/wm/transfer/index.vue
index 56e173ab1..17a9c5899 100644
--- a/apps/web-antd/src/views/mes/wm/transfer/index.vue
+++ b/apps/web-antd/src/views/mes/wm/transfer/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesWmTransferApi } from '#/api/mes/wm/transfer';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesWmTransferStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { Button, message } from 'ant-design-vue';
@@ -15,7 +16,6 @@ import {
   getTransferPage,
 } from '#/api/mes/wm/transfer';
 import { $t } from '#/locales';
-import { MesWmTransferStatusEnum } from '/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-antd/src/views/mes/wm/transfer/modules/form.vue b/apps/web-antd/src/views/mes/wm/transfer/modules/form.vue
index 3522ce30f..f94898fc5 100644
--- a/apps/web-antd/src/views/mes/wm/transfer/modules/form.vue
+++ b/apps/web-antd/src/views/mes/wm/transfer/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesWmTransferApi } from '#/api/mes/wm/transfer';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { MesWmTransferStatusEnum } from '@vben/constants';
 
 import { Button, Divider, message, Popconfirm } from 'ant-design-vue';
 
@@ -20,7 +21,6 @@ import {
   updateTransfer,
 } from '#/api/mes/wm/transfer';
 import { $t } from '#/locales';
-import { MesWmTransferStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 import LineList from './line-list.vue';
diff --git a/apps/web-antd/src/views/mes/wm/warehouse/area/data.ts b/apps/web-antd/src/views/mes/wm/warehouse/area/data.ts
index 60c70f580..8ec581e54 100644
--- a/apps/web-antd/src/views/mes/wm/warehouse/area/data.ts
+++ b/apps/web-antd/src/views/mes/wm/warehouse/area/data.ts
@@ -2,9 +2,9 @@ import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesWmWarehouseAreaApi } from '#/api/mes/wm/warehouse/area';
 
-import { h } from 'vue';
+import { DICT_TYPE, h } from 'vue';
 
-import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { CommonStatusEnum, MesAutoCodeRuleCode } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { Button } from 'ant-design-vue';
@@ -13,7 +13,6 @@ import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getWarehouseSimpleList } from '#/api/mes/wm/warehouse';
 import { getWarehouseLocationSimpleList } from '#/api/mes/wm/warehouse/location';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-antd/src/views/mes/wm/warehouse/area/index.vue b/apps/web-antd/src/views/mes/wm/warehouse/area/index.vue
index f30a2211c..163ccbdc1 100644
--- a/apps/web-antd/src/views/mes/wm/warehouse/area/index.vue
+++ b/apps/web-antd/src/views/mes/wm/warehouse/area/index.vue
@@ -6,6 +6,7 @@ import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { BarcodeBizTypeEnum } from '@vben/constants';
 
 import { Alert, Button, message } from 'ant-design-vue';
 
@@ -16,7 +17,6 @@ import {
 } from '#/api/mes/wm/warehouse/area';
 import { getWarehouseLocation } from '#/api/mes/wm/warehouse/location';
 import { $t } from '#/locales';
-import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
 
 import { BarcodeDetail } from '../../barcode/components';
 import { useGridColumns, useGridFormSchema } from './data';
diff --git a/apps/web-antd/src/views/mes/wm/warehouse/area/modules/form.vue b/apps/web-antd/src/views/mes/wm/warehouse/area/modules/form.vue
index 19dc5a60d..e4d65a104 100644
--- a/apps/web-antd/src/views/mes/wm/warehouse/area/modules/form.vue
+++ b/apps/web-antd/src/views/mes/wm/warehouse/area/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesWmWarehouseAreaApi } from '#/api/mes/wm/warehouse/area';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { BarcodeBizTypeEnum } from '@vben/constants';
 
 import { Button, message } from 'ant-design-vue';
 
@@ -17,7 +18,6 @@ import {
 } from '#/api/mes/wm/warehouse/area';
 import { getWarehouseLocation } from '#/api/mes/wm/warehouse/location';
 import { $t } from '#/locales';
-import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
 import { BarcodeDetail } from '#/views/mes/wm/barcode/components';
 
 import { useFormSchema } from '../data';
diff --git a/apps/web-antd/src/views/mes/wm/warehouse/data.ts b/apps/web-antd/src/views/mes/wm/warehouse/data.ts
index 2adc6f512..6eaf20162 100644
--- a/apps/web-antd/src/views/mes/wm/warehouse/data.ts
+++ b/apps/web-antd/src/views/mes/wm/warehouse/data.ts
@@ -5,14 +5,13 @@ import type { SystemUserApi } from '#/api/system/user';
 
 import { h } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode } from '@vben/constants';
 
 import { Button } from 'ant-design-vue';
 
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getSimpleUserList } from '#/api/system/user';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-antd/src/views/mes/wm/warehouse/index.vue b/apps/web-antd/src/views/mes/wm/warehouse/index.vue
index b96de2554..254376c0a 100644
--- a/apps/web-antd/src/views/mes/wm/warehouse/index.vue
+++ b/apps/web-antd/src/views/mes/wm/warehouse/index.vue
@@ -6,13 +6,13 @@ import { ref } from 'vue';
 import { useRouter } from 'vue-router';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { BarcodeBizTypeEnum } from '@vben/constants';
 
 import { Button, message } from 'ant-design-vue';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { deleteWarehouse, getWarehousePage } from '#/api/mes/wm/warehouse';
 import { $t } from '#/locales';
-import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
 
 import { BarcodeDetail } from '../barcode/components';
 import { useGridColumns, useGridFormSchema } from './data';
diff --git a/apps/web-antd/src/views/mes/wm/warehouse/location/data.ts b/apps/web-antd/src/views/mes/wm/warehouse/location/data.ts
index 360102a58..703c33e31 100644
--- a/apps/web-antd/src/views/mes/wm/warehouse/location/data.ts
+++ b/apps/web-antd/src/views/mes/wm/warehouse/location/data.ts
@@ -5,14 +5,13 @@ import type { MesWmWarehouseLocationApi } from '#/api/mes/wm/warehouse/location'
 
 import { h } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode } from '@vben/constants';
 
 import { Button } from 'ant-design-vue';
 
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getWarehouseSimpleList } from '#/api/mes/wm/warehouse';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-antd/src/views/mes/wm/warehouse/location/index.vue b/apps/web-antd/src/views/mes/wm/warehouse/location/index.vue
index 971284258..2b2d3218f 100644
--- a/apps/web-antd/src/views/mes/wm/warehouse/location/index.vue
+++ b/apps/web-antd/src/views/mes/wm/warehouse/location/index.vue
@@ -6,6 +6,7 @@ import { ref } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { BarcodeBizTypeEnum } from '@vben/constants';
 
 import { Alert, Button, message } from 'ant-design-vue';
 
@@ -16,7 +17,6 @@ import {
   getWarehouseLocationPage,
 } from '#/api/mes/wm/warehouse/location';
 import { $t } from '#/locales';
-import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
 
 import { BarcodeDetail } from '../../barcode/components';
 import { useGridColumns, useGridFormSchema } from './data';
diff --git a/apps/web-antd/src/views/mes/wm/warehouse/location/modules/form.vue b/apps/web-antd/src/views/mes/wm/warehouse/location/modules/form.vue
index 4d1daec3c..db40ffa00 100644
--- a/apps/web-antd/src/views/mes/wm/warehouse/location/modules/form.vue
+++ b/apps/web-antd/src/views/mes/wm/warehouse/location/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesWmWarehouseLocationApi } from '#/api/mes/wm/warehouse/location'
 import { computed, ref } from 'vue';
 
 import { confirm, useVbenModal } from '@vben/common-ui';
+import { BarcodeBizTypeEnum } from '@vben/constants';
 
 import { Button, message } from 'ant-design-vue';
 
@@ -17,7 +18,6 @@ import {
   updateWarehouseLocation,
 } from '#/api/mes/wm/warehouse/location';
 import { $t } from '#/locales';
-import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
 import { BarcodeDetail } from '#/views/mes/wm/barcode/components';
 
 import { useFormSchema } from '../data';
diff --git a/apps/web-antd/src/views/mes/wm/warehouse/modules/form.vue b/apps/web-antd/src/views/mes/wm/warehouse/modules/form.vue
index 9de8bc39e..ab55fec16 100644
--- a/apps/web-antd/src/views/mes/wm/warehouse/modules/form.vue
+++ b/apps/web-antd/src/views/mes/wm/warehouse/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesWmWarehouseApi } from '#/api/mes/wm/warehouse';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { BarcodeBizTypeEnum } from '@vben/constants';
 
 import { Button, message } from 'ant-design-vue';
 
@@ -16,7 +17,6 @@ import {
   updateWarehouse,
 } from '#/api/mes/wm/warehouse';
 import { $t } from '#/locales';
-import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
 import { BarcodeDetail } from '#/views/mes/wm/barcode/components';
 
 import { useFormSchema } from '../data';
diff --git a/apps/web-antd/src/views/wms/home/modules/wms-home-order-summary-cards.vue b/apps/web-antd/src/views/wms/home/modules/wms-home-order-summary-cards.vue
index ae928fa13..6142657fb 100644
--- a/apps/web-antd/src/views/wms/home/modules/wms-home-order-summary-cards.vue
+++ b/apps/web-antd/src/views/wms/home/modules/wms-home-order-summary-cards.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import type { WmsHomeStatisticsApi } from '#/api/wms/home';
 
-import { ref } from 'vue';
+import { OrderStatusEnum, OrderTypeEnum, ref } from 'vue';
 import { useRouter } from 'vue-router';
 
 import { DICT_TYPE } from '@vben/constants';
@@ -10,7 +10,6 @@ import { getDictLabel } from '@vben/hooks';
 import { Button, Card, message } from 'ant-design-vue';
 
 import { getOrderSummary } from '#/api/wms/home';
-import { OrderStatusEnum, OrderTypeEnum } from '#/views/wms/utils/constants';
 
 defineOptions({ name: 'WmsHomeOrderSummaryCards' });
 
diff --git a/apps/web-antd/src/views/wms/home/modules/wms-home-order-trend-chart-options.ts b/apps/web-antd/src/views/wms/home/modules/wms-home-order-trend-chart-options.ts
index f2b6c5832..9e76d9d4f 100644
--- a/apps/web-antd/src/views/wms/home/modules/wms-home-order-trend-chart-options.ts
+++ b/apps/web-antd/src/views/wms/home/modules/wms-home-order-trend-chart-options.ts
@@ -2,12 +2,10 @@ import type { EChartsOption } from '@vben/plugins/echarts';
 
 import type { WmsHomeStatisticsApi } from '#/api/wms/home';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, OrderTypeEnum } from '@vben/constants';
 import { getDictLabel } from '@vben/hooks';
 import { formatDate } from '@vben/utils';
 
-import { OrderTypeEnum } from '/constants';
-
 interface OrderDefinition {
   color: string;
   title: string;
diff --git a/apps/web-antd/src/views/wms/md/item/brand/data.ts b/apps/web-antd/src/views/wms/md/item/brand/data.ts
index 55feec3fe..e04dc5134 100644
--- a/apps/web-antd/src/views/wms/md/item/brand/data.ts
+++ b/apps/web-antd/src/views/wms/md/item/brand/data.ts
@@ -3,10 +3,11 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
 import { h } from 'vue';
 
+import { generateWmsCode } from '@vben/constants';
+
 import { Button } from 'ant-design-vue';
 
 import { z } from '#/adapter/form';
-import { generateWmsCode } from '#/views/wms/utils/constants';
 
 /** 新增/修改商品品牌的表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
diff --git a/apps/web-antd/src/views/wms/md/item/category/data.ts b/apps/web-antd/src/views/wms/md/item/category/data.ts
index 30e3823a7..3dde41431 100644
--- a/apps/web-antd/src/views/wms/md/item/category/data.ts
+++ b/apps/web-antd/src/views/wms/md/item/category/data.ts
@@ -2,9 +2,9 @@ import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { WmsItemCategoryApi } from '#/api/wms/md/item/category';
 
-import { h } from 'vue';
+import { DICT_TYPE, generateWmsCode, h } from 'vue';
 
-import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { CommonStatusEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 import { handleTree } from '@vben/utils';
 
@@ -12,7 +12,6 @@ import { Button } from 'ant-design-vue';
 
 import { z } from '#/adapter/form';
 import { getItemCategorySimpleList } from '#/api/wms/md/item/category';
-import { generateWmsCode } from '#/views/wms/utils/constants';
 
 /** 新增/修改商品分类的表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
diff --git a/apps/web-antd/src/views/wms/md/item/data.ts b/apps/web-antd/src/views/wms/md/item/data.ts
index 47482e5ac..7f7d81e1b 100644
--- a/apps/web-antd/src/views/wms/md/item/data.ts
+++ b/apps/web-antd/src/views/wms/md/item/data.ts
@@ -3,11 +3,12 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
 import { h, markRaw } from 'vue';
 
+import { generateWmsCode } from '@vben/constants';
+
 import { Button } from 'ant-design-vue';
 
 import { z } from '#/adapter/form';
 import { getItemBrandSimpleList } from '#/api/wms/md/item/brand';
-import { generateWmsCode } from '#/views/wms/utils/constants';
 
 import { WmsItemBrandSelect } from './brand/components';
 import { WmsItemCategorySelect } from './category/components';
diff --git a/apps/web-antd/src/views/wms/md/item/modules/sku-form.vue b/apps/web-antd/src/views/wms/md/item/modules/sku-form.vue
index f706e1f3e..52b0db4af 100644
--- a/apps/web-antd/src/views/wms/md/item/modules/sku-form.vue
+++ b/apps/web-antd/src/views/wms/md/item/modules/sku-form.vue
@@ -4,10 +4,11 @@ import type { WmsItemSkuApi } from '#/api/wms/md/item/sku';
 
 import { nextTick, ref } from 'vue';
 
+import { generateWmsCode } from '@vben/constants';
+
 import { Button, Input, InputNumber, message } from 'ant-design-vue';
 
 import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
-import { generateWmsCode } from '#/views/wms/utils/constants';
 import {
   DIMENSION_PRECISION,
   PRICE_PRECISION,
diff --git a/apps/web-antd/src/views/wms/md/merchant/components/merchant-select.vue b/apps/web-antd/src/views/wms/md/merchant/components/merchant-select.vue
index be64fddcc..9412782be 100644
--- a/apps/web-antd/src/views/wms/md/merchant/components/merchant-select.vue
+++ b/apps/web-antd/src/views/wms/md/merchant/components/merchant-select.vue
@@ -5,13 +5,14 @@ import type { WmsMerchantApi } from '#/api/wms/md/merchant';
 
 import { computed, onMounted, ref, watch } from 'vue';
 
-import { Select } from 'ant-design-vue';
-
-import { getMerchantSimpleList } from '#/api/wms/md/merchant';
 import {
   CustomerMerchantTypeList,
   SupplierMerchantTypeList,
-} from '#/views/wms/utils/constants';
+} from '@vben/constants';
+
+import { Select } from 'ant-design-vue';
+
+import { getMerchantSimpleList } from '#/api/wms/md/merchant';
 
 defineOptions({ name: 'WmsMerchantSelect', inheritAttrs: false });
 
diff --git a/apps/web-antd/src/views/wms/md/merchant/data.ts b/apps/web-antd/src/views/wms/md/merchant/data.ts
index bbc16d574..a860faddb 100644
--- a/apps/web-antd/src/views/wms/md/merchant/data.ts
+++ b/apps/web-antd/src/views/wms/md/merchant/data.ts
@@ -1,7 +1,7 @@
 import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
-import { h } from 'vue';
+import { generateWmsCode, h } from 'vue';
 
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
@@ -9,7 +9,6 @@ import { getDictOptions } from '@vben/hooks';
 import { Button } from 'ant-design-vue';
 
 import { z } from '#/adapter/form';
-import { generateWmsCode } from '#/views/wms/utils/constants';
 
 /** 新增/修改往来企业的表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
diff --git a/apps/web-antd/src/views/wms/md/warehouse/data.ts b/apps/web-antd/src/views/wms/md/warehouse/data.ts
index 7b1813a09..a286b3590 100644
--- a/apps/web-antd/src/views/wms/md/warehouse/data.ts
+++ b/apps/web-antd/src/views/wms/md/warehouse/data.ts
@@ -3,10 +3,11 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
 import { h } from 'vue';
 
+import { generateWmsCode } from '@vben/constants';
+
 import { Button } from 'ant-design-vue';
 
 import { z } from '#/adapter/form';
-import { generateWmsCode } from '#/views/wms/utils/constants';
 
 /** 新增/修改仓库的表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
diff --git a/apps/web-antd/src/views/wms/order/check/index.vue b/apps/web-antd/src/views/wms/order/check/index.vue
index f3b428b86..eb6ddfeaa 100644
--- a/apps/web-antd/src/views/wms/order/check/index.vue
+++ b/apps/web-antd/src/views/wms/order/check/index.vue
@@ -6,6 +6,11 @@ import type { WmsCheckOrderDetailApi } from '#/api/wms/order/check/detail';
 import { reactive, ref } from 'vue';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import {
+  OrderDeleteStatusList,
+  OrderStatusEnum,
+  OrderUpdateStatusList,
+} from '@vben/constants';
 import { downloadFileFromBlobPart, formatDateTime } from '@vben/utils';
 
 import { message } from 'ant-design-vue';
@@ -24,11 +29,6 @@ import {
   getCheckOrderPage,
 } from '#/api/wms/order/check';
 import { $t } from '#/locales';
-import {
-  OrderDeleteStatusList,
-  OrderStatusEnum,
-  OrderUpdateStatusList,
-} from '#/views/wms/utils/constants';
 import {
   formatPrice,
   formatQuantity,
diff --git a/apps/web-antd/src/views/wms/order/check/modules/form.vue b/apps/web-antd/src/views/wms/order/check/modules/form.vue
index 6094ec1b2..bb3c0753a 100644
--- a/apps/web-antd/src/views/wms/order/check/modules/form.vue
+++ b/apps/web-antd/src/views/wms/order/check/modules/form.vue
@@ -11,6 +11,10 @@ import type { WmsCheckOrderDetailApi } from '#/api/wms/order/check/detail';
 import { computed, nextTick, ref, watch } from 'vue';
 
 import { confirm, useVbenModal } from '@vben/common-ui';
+import {
+  OrderStatusEnum,
+  OrderUpdateStatusList,
+} from '@vben/constants';
 import { isEqual } from '@vben/utils';
 
 import { InputNumber, message } from 'ant-design-vue';
@@ -28,10 +32,6 @@ import {
 } from '#/api/wms/order/check';
 import { $t } from '#/locales';
 import { WmsItemSkuSelect } from '#/views/wms/md/item/sku/components';
-import {
-  OrderStatusEnum,
-  OrderUpdateStatusList,
-} from '#/views/wms/utils/constants';
 import {
   dividePrice,
   formatPrice,
diff --git a/apps/web-antd/src/views/wms/order/movement/index.vue b/apps/web-antd/src/views/wms/order/movement/index.vue
index d97571c13..34730a978 100644
--- a/apps/web-antd/src/views/wms/order/movement/index.vue
+++ b/apps/web-antd/src/views/wms/order/movement/index.vue
@@ -6,6 +6,11 @@ import type { WmsMovementOrderDetailApi } from '#/api/wms/order/movement/detail'
 import { reactive, ref } from 'vue';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import {
+  OrderDeleteStatusList,
+  OrderStatusEnum,
+  OrderUpdateStatusList,
+} from '@vben/constants';
 import { downloadFileFromBlobPart, formatDateTime } from '@vben/utils';
 
 import { message } from 'ant-design-vue';
@@ -24,11 +29,6 @@ import {
   getMovementOrderPage,
 } from '#/api/wms/order/movement';
 import { $t } from '#/locales';
-import {
-  OrderDeleteStatusList,
-  OrderStatusEnum,
-  OrderUpdateStatusList,
-} from '#/views/wms/utils/constants';
 import {
   formatPrice,
   formatQuantity,
diff --git a/apps/web-antd/src/views/wms/order/movement/modules/form.vue b/apps/web-antd/src/views/wms/order/movement/modules/form.vue
index 1e0bf8f5d..908ab0614 100644
--- a/apps/web-antd/src/views/wms/order/movement/modules/form.vue
+++ b/apps/web-antd/src/views/wms/order/movement/modules/form.vue
@@ -10,6 +10,10 @@ import type { InventorySelectRow } from '#/views/wms/inventory/components/invent
 import { computed, nextTick, ref } from 'vue';
 
 import { confirm, useVbenModal } from '@vben/common-ui';
+import {
+  OrderStatusEnum,
+  OrderUpdateStatusList,
+} from '@vben/constants';
 import { isEqual } from '@vben/utils';
 
 import { InputNumber, message } from 'ant-design-vue';
@@ -26,10 +30,6 @@ import {
 } from '#/api/wms/order/movement';
 import { $t } from '#/locales';
 import { WmsInventorySelect } from '#/views/wms/inventory/components';
-import {
-  OrderStatusEnum,
-  OrderUpdateStatusList,
-} from '#/views/wms/utils/constants';
 import {
   dividePrice,
   formatQuantity,
diff --git a/apps/web-antd/src/views/wms/order/receipt/index.vue b/apps/web-antd/src/views/wms/order/receipt/index.vue
index 2f15504ec..37e2f0817 100644
--- a/apps/web-antd/src/views/wms/order/receipt/index.vue
+++ b/apps/web-antd/src/views/wms/order/receipt/index.vue
@@ -6,6 +6,11 @@ import type { WmsReceiptOrderDetailApi } from '#/api/wms/order/receipt/detail';
 import { reactive, ref } from 'vue';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import {
+  OrderDeleteStatusList,
+  OrderStatusEnum,
+  OrderUpdateStatusList,
+} from '@vben/constants';
 import { downloadFileFromBlobPart, formatDateTime } from '@vben/utils';
 
 import { message } from 'ant-design-vue';
@@ -24,11 +29,6 @@ import {
   getReceiptOrderPage,
 } from '#/api/wms/order/receipt';
 import { $t } from '#/locales';
-import {
-  OrderDeleteStatusList,
-  OrderStatusEnum,
-  OrderUpdateStatusList,
-} from '#/views/wms/utils/constants';
 import {
   formatPrice,
   formatQuantity,
diff --git a/apps/web-antd/src/views/wms/order/receipt/modules/form.vue b/apps/web-antd/src/views/wms/order/receipt/modules/form.vue
index fd47e02ce..5bda31073 100644
--- a/apps/web-antd/src/views/wms/order/receipt/modules/form.vue
+++ b/apps/web-antd/src/views/wms/order/receipt/modules/form.vue
@@ -9,6 +9,10 @@ import type { WmsReceiptOrderDetailApi } from '#/api/wms/order/receipt/detail';
 import { computed, nextTick, ref } from 'vue';
 
 import { confirm, useVbenModal } from '@vben/common-ui';
+import {
+  OrderStatusEnum,
+  OrderUpdateStatusList,
+} from '@vben/constants';
 import { isEqual } from '@vben/utils';
 
 import { InputNumber, message } from 'ant-design-vue';
@@ -25,10 +29,6 @@ import {
 } from '#/api/wms/order/receipt';
 import { $t } from '#/locales';
 import { WmsItemSkuSelect } from '#/views/wms/md/item/sku/components';
-import {
-  OrderStatusEnum,
-  OrderUpdateStatusList,
-} from '#/views/wms/utils/constants';
 import {
   dividePrice,
   multiplyPrice,
diff --git a/apps/web-antd/src/views/wms/order/shipment/index.vue b/apps/web-antd/src/views/wms/order/shipment/index.vue
index 56aa5686a..ef9a8ff40 100644
--- a/apps/web-antd/src/views/wms/order/shipment/index.vue
+++ b/apps/web-antd/src/views/wms/order/shipment/index.vue
@@ -6,6 +6,11 @@ import type { WmsShipmentOrderDetailApi } from '#/api/wms/order/shipment/detail'
 import { reactive, ref } from 'vue';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import {
+  OrderDeleteStatusList,
+  OrderStatusEnum,
+  OrderUpdateStatusList,
+} from '@vben/constants';
 import { downloadFileFromBlobPart, formatDateTime } from '@vben/utils';
 
 import { message } from 'ant-design-vue';
@@ -24,11 +29,6 @@ import {
   getShipmentOrderPage,
 } from '#/api/wms/order/shipment';
 import { $t } from '#/locales';
-import {
-  OrderDeleteStatusList,
-  OrderStatusEnum,
-  OrderUpdateStatusList,
-} from '#/views/wms/utils/constants';
 import {
   formatPrice,
   formatQuantity,
diff --git a/apps/web-antd/src/views/wms/order/shipment/modules/form.vue b/apps/web-antd/src/views/wms/order/shipment/modules/form.vue
index 4928298ee..259192d69 100644
--- a/apps/web-antd/src/views/wms/order/shipment/modules/form.vue
+++ b/apps/web-antd/src/views/wms/order/shipment/modules/form.vue
@@ -10,6 +10,10 @@ import type { InventorySelectRow } from '#/views/wms/inventory/components/invent
 import { computed, nextTick, ref } from 'vue';
 
 import { confirm, useVbenModal } from '@vben/common-ui';
+import {
+  OrderStatusEnum,
+  OrderUpdateStatusList,
+} from '@vben/constants';
 import { isEqual } from '@vben/utils';
 
 import { InputNumber, message } from 'ant-design-vue';
@@ -26,10 +30,6 @@ import {
 } from '#/api/wms/order/shipment';
 import { $t } from '#/locales';
 import { WmsInventorySelect } from '#/views/wms/inventory/components';
-import {
-  OrderStatusEnum,
-  OrderUpdateStatusList,
-} from '#/views/wms/utils/constants';
 import {
   dividePrice,
   formatQuantity,
diff --git a/apps/web-antdv-next/src/views/iot/device/device/detail/modules/modbus-config-form.vue b/apps/web-antdv-next/src/views/iot/device/device/detail/modules/modbus-config-form.vue
index 80751d80d..0598ffd3f 100644
--- a/apps/web-antdv-next/src/views/iot/device/device/detail/modules/modbus-config-form.vue
+++ b/apps/web-antdv-next/src/views/iot/device/device/detail/modules/modbus-config-form.vue
@@ -2,10 +2,10 @@
 <script lang="ts" setup>
 import type { IotDeviceModbusConfigApi } from '#/api/iot/device/modbus/config';
 
-import { computed, ref } from 'vue';
+import { computed, DICT_TYPE, ModbusFrameFormatEnum, ModbusModeEnum, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
-import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { CommonStatusEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { message } from 'antdv-next';
@@ -14,10 +14,6 @@ import { useVbenForm, z } from '#/adapter/form';
 import { saveModbusConfig } from '#/api/iot/device/modbus/config';
 import { ProtocolTypeEnum } from '#/api/iot/product/product';
 import { $t } from '#/locales';
-import {
-  ModbusFrameFormatEnum,
-  ModbusModeEnum,
-} from '#/views/iot/utils/constants';
 
 defineOptions({ name: 'DeviceModbusConfigForm' });
 
diff --git a/apps/web-antdv-next/src/views/iot/device/device/detail/modules/modbus-config.vue b/apps/web-antdv-next/src/views/iot/device/device/detail/modules/modbus-config.vue
index 1df624be0..e1e1856d3 100644
--- a/apps/web-antdv-next/src/views/iot/device/device/detail/modules/modbus-config.vue
+++ b/apps/web-antdv-next/src/views/iot/device/device/detail/modules/modbus-config.vue
@@ -9,7 +9,7 @@ import type { IotProductApi } from '#/api/iot/product/product';
 import type { ThingModelData } from '#/api/iot/thingmodel';
 import type { DescriptionItemSchema } from '#/components/description';
 
-import { computed, h, onMounted, ref } from 'vue';
+import { computed, h, ModbusFunctionCodeOptions, onMounted, ref } from 'vue';
 
 import { confirm, useVbenModal } from '@vben/common-ui';
 import { DICT_TYPE } from '@vben/constants';
@@ -25,7 +25,6 @@ import {
 import { ProtocolTypeEnum } from '#/api/iot/product/product';
 import { useDescription } from '#/components/description';
 import { DictTag } from '#/components/dict-tag';
-import { ModbusFunctionCodeOptions } from '#/views/iot/utils/constants';
 
 import DeviceModbusConfigForm from './modbus-config-form.vue';
 import DeviceModbusPointForm from './modbus-point-form.vue';
diff --git a/apps/web-antdv-next/src/views/iot/device/device/detail/modules/modbus-point-form.vue b/apps/web-antdv-next/src/views/iot/device/device/detail/modules/modbus-point-form.vue
index 608f85642..457199382 100644
--- a/apps/web-antdv-next/src/views/iot/device/device/detail/modules/modbus-point-form.vue
+++ b/apps/web-antdv-next/src/views/iot/device/device/detail/modules/modbus-point-form.vue
@@ -4,10 +4,10 @@ import type { VbenFormSchema } from '#/adapter/form';
 import type { IotDeviceModbusPointApi } from '#/api/iot/device/modbus/point';
 import type { ThingModelData } from '#/api/iot/thingmodel';
 
-import { computed, h, ref } from 'vue';
+import { computed, DICT_TYPE, getByteOrderOptions, h, IoTThingModelTypeEnum, ModbusFunctionCodeOptions, ModbusRawDataTypeOptions, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
-import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { CommonStatusEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { message } from 'antdv-next';
@@ -19,12 +19,6 @@ import {
   updateModbusPoint,
 } from '#/api/iot/device/modbus/point';
 import { $t } from '#/locales';
-import {
-  getByteOrderOptions,
-  IoTThingModelTypeEnum,
-  ModbusFunctionCodeOptions,
-  ModbusRawDataTypeOptions,
-} from '#/views/iot/utils/constants';
 
 defineOptions({ name: 'DeviceModbusPointForm' });
 
diff --git a/apps/web-antdv-next/src/views/iot/device/device/detail/modules/simulator.vue b/apps/web-antdv-next/src/views/iot/device/device/detail/modules/simulator.vue
index 254115824..b92ef1710 100644
--- a/apps/web-antdv-next/src/views/iot/device/device/detail/modules/simulator.vue
+++ b/apps/web-antdv-next/src/views/iot/device/device/detail/modules/simulator.vue
@@ -6,7 +6,7 @@ import type { IotDeviceApi } from '#/api/iot/device/device';
 import type { IotProductApi } from '#/api/iot/product/product';
 import type { ThingModelData } from '#/api/iot/thingmodel';
 
-import { computed, ref } from 'vue';
+import { computed, DeviceStateEnum, IoTThingModelTypeEnum, ref } from 'vue';
 
 import { ContentWrap } from '@vben/common-ui';
 import { IotDeviceMessageMethodEnum } from '@vben/constants';
@@ -25,10 +25,6 @@ import {
 } from 'antdv-next';
 
 import { sendDeviceMessage } from '#/api/iot/device/device';
-import {
-  DeviceStateEnum,
-  IoTThingModelTypeEnum,
-} from '#/views/iot/utils/constants';
 
 import DataDefinition from '../../../../thingmodel/modules/components/data-definition.vue';
 import DeviceDetailsMessage from './message.vue';
diff --git a/apps/web-antdv-next/src/views/iot/device/device/detail/modules/thing-model-event.vue b/apps/web-antdv-next/src/views/iot/device/device/detail/modules/thing-model-event.vue
index 121ff77c4..4f40b1b54 100644
--- a/apps/web-antdv-next/src/views/iot/device/device/detail/modules/thing-model-event.vue
+++ b/apps/web-antdv-next/src/views/iot/device/device/detail/modules/thing-model-event.vue
@@ -3,7 +3,7 @@
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { ThingModelData } from '#/api/iot/thingmodel';
 
-import { computed, onMounted, reactive, watch } from 'vue';
+import { computed, getEventTypeLabel, IoTThingModelTypeEnum, onMounted, reactive, watch } from 'vue';
 
 import { Page } from '@vben/common-ui';
 import { IotDeviceMessageMethodEnum } from '@vben/constants';
@@ -14,10 +14,6 @@ import { Button, DateRangePicker, Select, Space, Tag } from 'antdv-next';
 
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getDeviceMessagePairPage } from '#/api/iot/device/device';
-import {
-  getEventTypeLabel,
-  IoTThingModelTypeEnum,
-} from '#/views/iot/utils/constants';
 
 const props = defineProps<{
   deviceId: number;
diff --git a/apps/web-antdv-next/src/views/iot/device/device/detail/modules/thing-model-property-history.vue b/apps/web-antdv-next/src/views/iot/device/device/detail/modules/thing-model-property-history.vue
index e2975a3ad..9449307d4 100644
--- a/apps/web-antdv-next/src/views/iot/device/device/detail/modules/thing-model-property-history.vue
+++ b/apps/web-antdv-next/src/views/iot/device/device/detail/modules/thing-model-property-history.vue
@@ -8,6 +8,7 @@ import type { IotDeviceApi } from '#/api/iot/device/device';
 
 import { computed, nextTick, reactive, ref, watch } from 'vue';
 
+import { IoTDataSpecsDataTypeEnum } from '@vben/constants';
 import { IconifyIcon } from '@vben/icons';
 import { EchartsUI, useEcharts } from '@vben/plugins/echarts';
 import { formatDate, formatDateTime } from '@vben/utils';
@@ -26,7 +27,6 @@ import dayjs from 'dayjs';
 
 import { getHistoryDevicePropertyList } from '#/api/iot/device/device';
 import ShortcutDateRangePicker from '#/components/shortcut-date-range-picker/shortcut-date-range-picker.vue';
-import { IoTDataSpecsDataTypeEnum } from '#/views/iot/utils/constants';
 
 /** IoT 设备属性历史数据详情 */
 defineOptions({ name: 'DeviceDetailsThingModelPropertyHistory' });
diff --git a/apps/web-antdv-next/src/views/iot/device/device/detail/modules/thing-model-service.vue b/apps/web-antdv-next/src/views/iot/device/device/detail/modules/thing-model-service.vue
index 64c5720ae..74f14e64a 100644
--- a/apps/web-antdv-next/src/views/iot/device/device/detail/modules/thing-model-service.vue
+++ b/apps/web-antdv-next/src/views/iot/device/device/detail/modules/thing-model-service.vue
@@ -3,7 +3,7 @@
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { ThingModelData } from '#/api/iot/thingmodel';
 
-import { computed, onMounted, reactive, watch } from 'vue';
+import { computed, getThingModelServiceCallTypeLabel, IoTThingModelTypeEnum, onMounted, reactive, watch } from 'vue';
 
 import { Page } from '@vben/common-ui';
 import { IotDeviceMessageMethodEnum } from '@vben/constants';
@@ -14,10 +14,6 @@ import { Button, DateRangePicker, Select, Space, Tag } from 'antdv-next';
 
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getDeviceMessagePairPage } from '#/api/iot/device/device';
-import {
-  getThingModelServiceCallTypeLabel,
-  IoTThingModelTypeEnum,
-} from '#/views/iot/utils/constants';
 
 const props = defineProps<{
   deviceId: number;
diff --git a/apps/web-antdv-next/src/views/iot/home/modules/device-map-card.vue b/apps/web-antdv-next/src/views/iot/home/modules/device-map-card.vue
index 813d322e2..f11754a36 100644
--- a/apps/web-antdv-next/src/views/iot/home/modules/device-map-card.vue
+++ b/apps/web-antdv-next/src/views/iot/home/modules/device-map-card.vue
@@ -4,11 +4,12 @@ import type { IotDeviceApi } from '#/api/iot/device/device';
 import { computed, onMounted, onUnmounted, ref } from 'vue';
 import { useRouter } from 'vue-router';
 
+import { DeviceStateEnum } from '@vben/constants';
+
 import { Card, Empty, Spin } from 'antdv-next';
 
 import { getDeviceLocationList } from '#/api/iot/device/device';
 import { loadBaiduMapSdk } from '#/components/map';
-import { DeviceStateEnum } from '#/views/iot/utils/constants';
 
 defineOptions({ name: 'DeviceMapCard' });
 
diff --git a/apps/web-antdv-next/src/views/iot/ota/modules/detail/index.vue b/apps/web-antdv-next/src/views/iot/ota/modules/detail/index.vue
index 18764b09c..cda8f8848 100644
--- a/apps/web-antdv-next/src/views/iot/ota/modules/detail/index.vue
+++ b/apps/web-antdv-next/src/views/iot/ota/modules/detail/index.vue
@@ -4,13 +4,13 @@ import type { IoTOtaFirmware } from '#/api/iot/ota/firmware';
 import { onMounted, ref } from 'vue';
 import { useRoute } from 'vue-router';
 
+import { IoTOtaTaskRecordStatusEnum } from '@vben/constants';
 import { formatDate } from '@vben/utils';
 
 import { Card, Col, Descriptions, Row } from 'antdv-next';
 
 import { getOtaFirmware } from '#/api/iot/ota/firmware';
 import { getOtaTaskRecordStatusStatistics } from '#/api/iot/ota/task/record';
-import { IoTOtaTaskRecordStatusEnum } from '#/views/iot/utils/constants';
 
 import OtaTaskList from '../task/ota-task-list.vue';
 
diff --git a/apps/web-antdv-next/src/views/iot/ota/modules/firmware-detail/index.vue b/apps/web-antdv-next/src/views/iot/ota/modules/firmware-detail/index.vue
index d8ff864dd..1e4cc3adf 100644
--- a/apps/web-antdv-next/src/views/iot/ota/modules/firmware-detail/index.vue
+++ b/apps/web-antdv-next/src/views/iot/ota/modules/firmware-detail/index.vue
@@ -4,13 +4,13 @@ import type { IoTOtaFirmware } from '#/api/iot/ota/firmware';
 import { onMounted, ref } from 'vue';
 import { useRoute } from 'vue-router';
 
+import { IoTOtaTaskRecordStatusEnum } from '@vben/constants';
 import { formatDate } from '@vben/utils';
 
 import { Card, Col, Descriptions, Row } from 'antdv-next';
 
 import { getOtaFirmware } from '#/api/iot/ota/firmware';
 import { getOtaTaskRecordStatusStatistics } from '#/api/iot/ota/task/record';
-import { IoTOtaTaskRecordStatusEnum } from '#/views/iot/utils/constants';
 
 import OtaTaskList from '../task/ota-task-list.vue';
 
diff --git a/apps/web-antdv-next/src/views/iot/ota/modules/task/ota-task-detail.vue b/apps/web-antdv-next/src/views/iot/ota/modules/task/ota-task-detail.vue
index 2bdb70ace..d45630df9 100644
--- a/apps/web-antdv-next/src/views/iot/ota/modules/task/ota-task-detail.vue
+++ b/apps/web-antdv-next/src/views/iot/ota/modules/task/ota-task-detail.vue
@@ -7,6 +7,7 @@ import type { OtaTaskRecord } from '#/api/iot/ota/task/record';
 import { computed, reactive, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { IoTOtaTaskRecordStatusEnum } from '@vben/constants';
 import { formatDate } from '@vben/utils';
 
 import {
@@ -27,7 +28,6 @@ import {
   getOtaTaskRecordPage,
   getOtaTaskRecordStatusStatistics,
 } from '#/api/iot/ota/task/record';
-import { IoTOtaTaskRecordStatusEnum } from '#/views/iot/utils/constants';
 
 /** OTA 任务详情组件 */
 defineOptions({ name: 'OtaTaskDetail' });
diff --git a/apps/web-antdv-next/src/views/iot/ota/modules/task/ota-task-form.vue b/apps/web-antdv-next/src/views/iot/ota/modules/task/ota-task-form.vue
index 27f2fb3e9..0a153ca38 100644
--- a/apps/web-antdv-next/src/views/iot/ota/modules/task/ota-task-form.vue
+++ b/apps/web-antdv-next/src/views/iot/ota/modules/task/ota-task-form.vue
@@ -5,12 +5,12 @@ import type { OtaTask } from '#/api/iot/ota/task';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { IoTOtaTaskDeviceScopeEnum } from '@vben/constants';
 
 import { Form, Input, message, Select, Spin } from 'antdv-next';
 
 import { getDeviceListByProductId } from '#/api/iot/device/device';
 import { createOtaTask } from '#/api/iot/ota/task';
-import { IoTOtaTaskDeviceScopeEnum } from '#/views/iot/utils/constants';
 
 /** IoT OTA 升级任务表单 */
 defineOptions({ name: 'OtaTaskForm' });
diff --git a/apps/web-antdv-next/src/views/iot/ota/modules/task/ota-task-list.vue b/apps/web-antdv-next/src/views/iot/ota/modules/task/ota-task-list.vue
index 66c749250..f3a815bce 100644
--- a/apps/web-antdv-next/src/views/iot/ota/modules/task/ota-task-list.vue
+++ b/apps/web-antdv-next/src/views/iot/ota/modules/task/ota-task-list.vue
@@ -5,6 +5,7 @@ import type { OtaTask } from '#/api/iot/ota/task';
 
 import { onMounted, reactive, ref } from 'vue';
 
+import { IoTOtaTaskStatusEnum } from '@vben/constants';
 import { IconifyIcon } from '@vben/icons';
 import { formatDate } from '@vben/utils';
 
@@ -20,7 +21,6 @@ import {
 } from 'antdv-next';
 
 import { getOtaTaskPage } from '#/api/iot/ota/task';
-import { IoTOtaTaskStatusEnum } from '#/views/iot/utils/constants';
 
 import OtaTaskDetail from './ota-task-detail.vue';
 import OtaTaskForm from './ota-task-form.vue';
diff --git a/apps/web-antdv-next/src/views/iot/rule/data/rule/components/source-config-form.vue b/apps/web-antdv-next/src/views/iot/rule/data/rule/components/source-config-form.vue
index 4c1a47b70..a13b72f89 100644
--- a/apps/web-antdv-next/src/views/iot/rule/data/rule/components/source-config-form.vue
+++ b/apps/web-antdv-next/src/views/iot/rule/data/rule/components/source-config-form.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, onMounted, reactive, ref } from 'vue';
+import { computed, IoTThingModelTypeEnum, onMounted, reactive, ref } from 'vue';
 
 import { IotDeviceMessageMethodEnum } from '@vben/constants';
 import { IconifyIcon } from '@vben/icons';
@@ -9,7 +9,6 @@ import { Button, Form, Select, Table } from 'antdv-next';
 import { getSimpleDeviceList } from '#/api/iot/device/device';
 import { getSimpleProductList } from '#/api/iot/product/product';
 import { getThingModelListByProductId } from '#/api/iot/thingmodel';
-import { IoTThingModelTypeEnum } from '#/views/iot/utils/constants';
 
 const formData = ref<any[]>([]);
 const productList = ref<any[]>([]); // 产品列表
diff --git a/apps/web-antdv-next/src/views/iot/rule/scene/form/configs/condition-config.vue b/apps/web-antdv-next/src/views/iot/rule/scene/form/configs/condition-config.vue
index 440165f8c..e1fa3673e 100644
--- a/apps/web-antdv-next/src/views/iot/rule/scene/form/configs/condition-config.vue
+++ b/apps/web-antdv-next/src/views/iot/rule/scene/form/configs/condition-config.vue
@@ -4,15 +4,15 @@ import type { TriggerCondition } from '#/api/iot/rule/scene';
 
 import { computed, ref } from 'vue';
 
-import { useVModel } from '@vueuse/core';
-import { Col, Row, Select } from 'antdv-next';
-
 import {
   getConditionTypeOptions,
   IoTDeviceStatusEnum,
   IotRuleSceneTriggerConditionParameterOperatorEnum,
   IotRuleSceneTriggerConditionTypeEnum,
-} from '#/views/iot/utils/constants';
+} from '@vben/constants';
+
+import { useVModel } from '@vueuse/core';
+import { Col, Row, Select } from 'antdv-next';
 
 import ValueInput from '../inputs/value-input.vue';
 import DeviceSelector from '../selectors/device-selector.vue';
diff --git a/apps/web-antdv-next/src/views/iot/rule/scene/form/configs/current-time-condition-config.vue b/apps/web-antdv-next/src/views/iot/rule/scene/form/configs/current-time-condition-config.vue
index 14d3e8803..6561860b5 100644
--- a/apps/web-antdv-next/src/views/iot/rule/scene/form/configs/current-time-condition-config.vue
+++ b/apps/web-antdv-next/src/views/iot/rule/scene/form/configs/current-time-condition-config.vue
@@ -4,13 +4,12 @@ import type { TriggerCondition } from '#/api/iot/rule/scene';
 
 import { computed, watch } from 'vue';
 
+import { IotRuleSceneTriggerTimeOperatorEnum } from '@vben/constants';
 import { IconifyIcon } from '@vben/icons';
 
 import { useVModel } from '@vueuse/core';
 import { Col, DatePicker, Row, Select, Tag, TimePicker } from 'antdv-next';
 
-import { IotRuleSceneTriggerTimeOperatorEnum } from '#/views/iot/utils/constants';
-
 /** 当前时间条件配置组件 */
 defineOptions({ name: 'CurrentTimeConditionConfig' });
 
diff --git a/apps/web-antdv-next/src/views/iot/rule/scene/form/configs/device-control-config.vue b/apps/web-antdv-next/src/views/iot/rule/scene/form/configs/device-control-config.vue
index a728a3065..388140c9c 100644
--- a/apps/web-antdv-next/src/views/iot/rule/scene/form/configs/device-control-config.vue
+++ b/apps/web-antdv-next/src/views/iot/rule/scene/form/configs/device-control-config.vue
@@ -8,17 +8,17 @@ import type {
 
 import { computed, onMounted, ref, watch } from 'vue';
 
+import {
+  IoTDataSpecsDataTypeEnum,
+  IotRuleSceneActionTypeEnum,
+  IoTThingModelAccessModeEnum,
+} from '@vben/constants';
 import { isObject } from '@vben/utils';
 
 import { useVModel } from '@vueuse/core';
 import { Col, Row, Select, Tag } from 'antdv-next';
 
 import { getThingModelListByProductId } from '#/api/iot/thingmodel';
-import {
-  IoTDataSpecsDataTypeEnum,
-  IotRuleSceneActionTypeEnum,
-  IoTThingModelAccessModeEnum,
-} from '#/views/iot/utils/constants';
 
 import JsonParamsInput from '../inputs/json-params-input.vue';
 import DeviceSelector from '../selectors/device-selector.vue';
diff --git a/apps/web-antdv-next/src/views/iot/rule/scene/form/configs/main-condition-inner-config.vue b/apps/web-antdv-next/src/views/iot/rule/scene/form/configs/main-condition-inner-config.vue
index da0f2fd36..0032ab2ff 100644
--- a/apps/web-antdv-next/src/views/iot/rule/scene/form/configs/main-condition-inner-config.vue
+++ b/apps/web-antdv-next/src/views/iot/rule/scene/form/configs/main-condition-inner-config.vue
@@ -3,16 +3,16 @@ import type { Trigger } from '#/api/iot/rule/scene';
 
 import { computed, ref } from 'vue';
 
-import { useVModel } from '@vueuse/core';
-import { Col, Row, Select } from 'antdv-next';
-
 import {
   getTriggerTypeLabel,
   IoTDeviceStatusEnum,
   IotRuleSceneTriggerConditionParameterOperatorEnum,
   IotRuleSceneTriggerTypeEnum,
   triggerTypeOptions,
-} from '#/views/iot/utils/constants';
+} from '@vben/constants';
+
+import { useVModel } from '@vueuse/core';
+import { Col, Row, Select } from 'antdv-next';
 
 import JsonParamsInput from '../inputs/json-params-input.vue';
 import ValueInput from '../inputs/value-input.vue';
diff --git a/apps/web-antdv-next/src/views/iot/rule/scene/form/configs/sub-condition-group-config.vue b/apps/web-antdv-next/src/views/iot/rule/scene/form/configs/sub-condition-group-config.vue
index c16abc71f..f03de803a 100644
--- a/apps/web-antdv-next/src/views/iot/rule/scene/form/configs/sub-condition-group-config.vue
+++ b/apps/web-antdv-next/src/views/iot/rule/scene/form/configs/sub-condition-group-config.vue
@@ -3,16 +3,15 @@ import type { TriggerCondition } from '#/api/iot/rule/scene';
 
 import { computed, nextTick } from 'vue';
 
+import {
+  IotRuleSceneTriggerConditionParameterOperatorEnum,
+  IotRuleSceneTriggerConditionTypeEnum,
+} from '@vben/constants';
 import { IconifyIcon } from '@vben/icons';
 
 import { useVModel } from '@vueuse/core';
 import { Button } from 'antdv-next';
 
-import {
-  IotRuleSceneTriggerConditionParameterOperatorEnum,
-  IotRuleSceneTriggerConditionTypeEnum,
-} from '#/views/iot/utils/constants';
-
 import ConditionConfig from './condition-config.vue';
 
 /** 子条件组配置组件 */
diff --git a/apps/web-antdv-next/src/views/iot/rule/scene/form/inputs/json-params-input.vue b/apps/web-antdv-next/src/views/iot/rule/scene/form/inputs/json-params-input.vue
index 4f47f9acd..fa886779e 100644
--- a/apps/web-antdv-next/src/views/iot/rule/scene/form/inputs/json-params-input.vue
+++ b/apps/web-antdv-next/src/views/iot/rule/scene/form/inputs/json-params-input.vue
@@ -1,21 +1,20 @@
 <!-- JSON参数输入组件 - 通用版本 -->
 <script setup lang="ts">
-import type { JsonParamsInputType } from '#/views/iot/utils/constants';
+import type { JsonParamsInputType } from '@vben/constants';
 
 import { computed, nextTick, onMounted, ref, watch } from 'vue';
 
-import { IconifyIcon } from '@vben/icons';
-
-import { useVModel } from '@vueuse/core';
-import { Button, Input, Popover, Tag } from 'antdv-next';
-
 import {
   IoTDataSpecsDataTypeEnum,
   JSON_PARAMS_EXAMPLE_VALUES,
   JSON_PARAMS_INPUT_CONSTANTS,
   JSON_PARAMS_INPUT_ICONS,
   JsonParamsInputTypeEnum,
-} from '#/views/iot/utils/constants';
+} from '@vben/constants';
+import { IconifyIcon } from '@vben/icons';
+
+import { useVModel } from '@vueuse/core';
+import { Button, Input, Popover, Tag } from 'antdv-next';
 
 /** JSON参数输入组件 - 通用版本 */
 defineOptions({ name: 'JsonParamsInput' });
diff --git a/apps/web-antdv-next/src/views/iot/rule/scene/form/inputs/value-input.vue b/apps/web-antdv-next/src/views/iot/rule/scene/form/inputs/value-input.vue
index 6d137df52..21fdd26f2 100644
--- a/apps/web-antdv-next/src/views/iot/rule/scene/form/inputs/value-input.vue
+++ b/apps/web-antdv-next/src/views/iot/rule/scene/form/inputs/value-input.vue
@@ -2,13 +2,13 @@
 <script setup lang="ts">
 import { computed, ref, watch } from 'vue';
 
-import { useVModel } from '@vueuse/core';
-import { DatePicker, Input, Select, Tag, Tooltip } from 'antdv-next';
-
 import {
   IoTDataSpecsDataTypeEnum,
   IotRuleSceneTriggerConditionParameterOperatorEnum,
-} from '#/views/iot/utils/constants';
+} from '@vben/constants';
+
+import { useVModel } from '@vueuse/core';
+import { DatePicker, Input, Select, Tag, Tooltip } from 'antdv-next';
 
 /** 值输入组件 */
 defineOptions({ name: 'ValueInput' });
diff --git a/apps/web-antdv-next/src/views/iot/rule/scene/form/rule-scene-form.vue b/apps/web-antdv-next/src/views/iot/rule/scene/form/rule-scene-form.vue
index 72de1cdd1..9dbb55db4 100644
--- a/apps/web-antdv-next/src/views/iot/rule/scene/form/rule-scene-form.vue
+++ b/apps/web-antdv-next/src/views/iot/rule/scene/form/rule-scene-form.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { IotSceneRule } from '#/api/iot/rule/scene';
 
-import { computed, nextTick, reactive, ref, watch } from 'vue';
+import { computed, IotRuleSceneActionTypeEnum, IotRuleSceneTriggerTypeEnum, isDeviceTrigger, nextTick, reactive, ref, watch } from 'vue';
 
 import { CommonStatusEnum } from '@vben/constants';
 import { IconifyIcon } from '@vben/icons';
@@ -10,11 +10,6 @@ import { useVModel } from '@vueuse/core';
 import { Button, Drawer, Form, message } from 'antdv-next';
 
 import { createSceneRule, updateSceneRule } from '#/api/iot/rule/scene';
-import {
-  IotRuleSceneActionTypeEnum,
-  IotRuleSceneTriggerTypeEnum,
-  isDeviceTrigger,
-} from '#/views/iot/utils/constants';
 
 import ActionSection from './sections/action-section.vue';
 import BasicInfoSection from './sections/basic-info-section.vue';
diff --git a/apps/web-antdv-next/src/views/iot/rule/scene/form/sections/action-section.vue b/apps/web-antdv-next/src/views/iot/rule/scene/form/sections/action-section.vue
index c9b6e2e13..be82d35a9 100644
--- a/apps/web-antdv-next/src/views/iot/rule/scene/form/sections/action-section.vue
+++ b/apps/web-antdv-next/src/views/iot/rule/scene/form/sections/action-section.vue
@@ -2,16 +2,15 @@
 <script setup lang="ts">
 import type { Action } from '#/api/iot/rule/scene';
 
-import { IconifyIcon } from '@vben/icons';
-
-import { useVModel } from '@vueuse/core';
-import { Button, Card, Empty, Select, Tag } from 'antdv-next';
-
 import {
   getActionTypeLabel,
   getActionTypeOptions,
   IotRuleSceneActionTypeEnum,
-} from '#/views/iot/utils/constants';
+} from '@vben/constants';
+import { IconifyIcon } from '@vben/icons';
+
+import { useVModel } from '@vueuse/core';
+import { Button, Card, Empty, Select, Tag } from 'antdv-next';
 
 import AlertConfig from '../configs/alert-config.vue';
 import DeviceControlConfig from '../configs/device-control-config.vue';
diff --git a/apps/web-antdv-next/src/views/iot/rule/scene/form/sections/trigger-section.vue b/apps/web-antdv-next/src/views/iot/rule/scene/form/sections/trigger-section.vue
index 0634b2f37..882da116c 100644
--- a/apps/web-antdv-next/src/views/iot/rule/scene/form/sections/trigger-section.vue
+++ b/apps/web-antdv-next/src/views/iot/rule/scene/form/sections/trigger-section.vue
@@ -3,17 +3,17 @@ import type { Trigger } from '#/api/iot/rule/scene';
 
 import { onMounted } from 'vue';
 
+import {
+  getTriggerTypeLabel,
+  IotRuleSceneTriggerTypeEnum,
+  isDeviceTrigger,
+} from '@vben/constants';
 import { IconifyIcon } from '@vben/icons';
 
 import { useVModel } from '@vueuse/core';
 import { Button, Card, Empty, Tag } from 'antdv-next';
 
 import { CronTab } from '#/components/cron-tab';
-import {
-  getTriggerTypeLabel,
-  IotRuleSceneTriggerTypeEnum,
-  isDeviceTrigger,
-} from '#/views/iot/utils/constants';
 
 import DeviceTriggerConfig from '../configs/device-trigger-config.vue';
 
diff --git a/apps/web-antdv-next/src/views/iot/rule/scene/form/selectors/device-selector.vue b/apps/web-antdv-next/src/views/iot/rule/scene/form/selectors/device-selector.vue
index 750c63621..9c0dd732e 100644
--- a/apps/web-antdv-next/src/views/iot/rule/scene/form/selectors/device-selector.vue
+++ b/apps/web-antdv-next/src/views/iot/rule/scene/form/selectors/device-selector.vue
@@ -1,6 +1,6 @@
 <!-- 设备选择器组件 -->
 <script setup lang="ts">
-import { ref, watch } from 'vue';
+import { DEVICE_SELECTOR_OPTIONS, ref, watch } from 'vue';
 
 import { DICT_TYPE } from '@vben/constants';
 
@@ -8,7 +8,6 @@ import { Select } from 'antdv-next';
 
 import { getDeviceListByProductId } from '#/api/iot/device/device';
 import { DictTag } from '#/components/dict-tag';
-import { DEVICE_SELECTOR_OPTIONS } from '#/views/iot/utils/constants';
 
 /** 设备选择器组件 */
 defineOptions({ name: 'DeviceSelector' });
diff --git a/apps/web-antdv-next/src/views/iot/rule/scene/form/selectors/operator-selector.vue b/apps/web-antdv-next/src/views/iot/rule/scene/form/selectors/operator-selector.vue
index 258fc4b69..0044e2d98 100644
--- a/apps/web-antdv-next/src/views/iot/rule/scene/form/selectors/operator-selector.vue
+++ b/apps/web-antdv-next/src/views/iot/rule/scene/form/selectors/operator-selector.vue
@@ -2,13 +2,13 @@
 <script setup lang="ts">
 import { computed, watch } from 'vue';
 
-import { useVModel } from '@vueuse/core';
-import { Select } from 'antdv-next';
-
 import {
   IoTDataSpecsDataTypeEnum,
   IotRuleSceneTriggerConditionParameterOperatorEnum,
-} from '#/views/iot/utils/constants';
+} from '@vben/constants';
+
+import { useVModel } from '@vueuse/core';
+import { Select } from 'antdv-next';
 
 /** 操作符选择器组件 */
 defineOptions({ name: 'OperatorSelector' });
diff --git a/apps/web-antdv-next/src/views/iot/rule/scene/form/selectors/property-selector.vue b/apps/web-antdv-next/src/views/iot/rule/scene/form/selectors/property-selector.vue
index d08b22168..802da3610 100644
--- a/apps/web-antdv-next/src/views/iot/rule/scene/form/selectors/property-selector.vue
+++ b/apps/web-antdv-next/src/views/iot/rule/scene/form/selectors/property-selector.vue
@@ -9,12 +9,6 @@ import type {
 
 import { computed, ref, watch } from 'vue';
 
-import { IconifyIcon } from '@vben/icons';
-
-import { useVModel } from '@vueuse/core';
-import { Button, Popover, Select, Tag } from 'antdv-next';
-
-import { getThingModelListByProductId } from '#/api/iot/thingmodel';
 import {
   getAccessModeLabel,
   getDataTypeName,
@@ -24,7 +18,13 @@ import {
   IotRuleSceneTriggerTypeEnum,
   IoTThingModelTypeEnum,
   THING_MODEL_GROUP_LABELS,
-} from '#/views/iot/utils/constants';
+} from '@vben/constants';
+import { IconifyIcon } from '@vben/icons';
+
+import { useVModel } from '@vueuse/core';
+import { Button, Popover, Select, Tag } from 'antdv-next';
+
+import { getThingModelListByProductId } from '#/api/iot/thingmodel';
 
 /** 属性选择器组件 */
 defineOptions({ name: 'PropertySelector' });
diff --git a/apps/web-antdv-next/src/views/iot/thingmodel/index.vue b/apps/web-antdv-next/src/views/iot/thingmodel/index.vue
index a531aacdf..f5879ee6b 100644
--- a/apps/web-antdv-next/src/views/iot/thingmodel/index.vue
+++ b/apps/web-antdv-next/src/views/iot/thingmodel/index.vue
@@ -4,6 +4,7 @@ import type { IotProductApi } from '#/api/iot/product/product';
 import { onMounted, provide, ref } from 'vue';
 
 import { Page } from '@vben/common-ui';
+import { getDataTypeOptionsLabel, IOT_PROVIDE_KEY } from '@vben/constants';
 
 import { message } from 'antdv-next';
 
@@ -11,7 +12,6 @@ import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getProduct } from '#/api/iot/product/product';
 import { deleteThingModel, getThingModelPage } from '#/api/iot/thingmodel';
 
-import { getDataTypeOptionsLabel, IOT_PROVIDE_KEY } from '../utils/constants';
 import { useGridColumns, useGridFormSchema } from './data';
 import { DataDefinition } from './modules/components';
 import ThingModelForm from './modules/thing-model-form.vue';
diff --git a/apps/web-antdv-next/src/views/iot/thingmodel/modules/components/data-definition.vue b/apps/web-antdv-next/src/views/iot/thingmodel/modules/components/data-definition.vue
index 9000338a4..ca969b1b8 100644
--- a/apps/web-antdv-next/src/views/iot/thingmodel/modules/components/data-definition.vue
+++ b/apps/web-antdv-next/src/views/iot/thingmodel/modules/components/data-definition.vue
@@ -4,14 +4,14 @@ import type { ThingModelData } from '#/api/iot/thingmodel';
 
 import { computed } from 'vue';
 
-import { Tooltip } from 'antdv-next';
-
 import {
   getEventTypeLabel,
   getThingModelServiceCallTypeLabel,
   IoTDataSpecsDataTypeEnum,
   IoTThingModelTypeEnum,
-} from '#/views/iot/utils/constants';
+} from '@vben/constants';
+
+import { Tooltip } from 'antdv-next';
 
 /** 数据定义展示组件 */
 defineOptions({ name: 'DataDefinition' });
diff --git a/apps/web-antdv-next/src/views/iot/thingmodel/modules/dataSpecs/thing-model-array-data-specs.vue b/apps/web-antdv-next/src/views/iot/thingmodel/modules/dataSpecs/thing-model-array-data-specs.vue
index c2597b9c3..bbbd4dcf7 100644
--- a/apps/web-antdv-next/src/views/iot/thingmodel/modules/dataSpecs/thing-model-array-data-specs.vue
+++ b/apps/web-antdv-next/src/views/iot/thingmodel/modules/dataSpecs/thing-model-array-data-specs.vue
@@ -2,13 +2,13 @@
 <script lang="ts" setup>
 import type { Ref } from 'vue';
 
-import { useVModel } from '@vueuse/core';
-import { Input, Radio } from 'antdv-next';
-
 import {
   getDataTypeOptions,
   IoTDataSpecsDataTypeEnum,
-} from '#/views/iot/utils/constants';
+} from '@vben/constants';
+
+import { useVModel } from '@vueuse/core';
+import { Input, Radio } from 'antdv-next';
 
 import ThingModelStructDataSpecs from './thing-model-struct-data-specs.vue';
 
diff --git a/apps/web-antdv-next/src/views/iot/thingmodel/modules/dataSpecs/thing-model-struct-data-specs.vue b/apps/web-antdv-next/src/views/iot/thingmodel/modules/dataSpecs/thing-model-struct-data-specs.vue
index ba8a9d47a..4b3b4a01d 100644
--- a/apps/web-antdv-next/src/views/iot/thingmodel/modules/dataSpecs/thing-model-struct-data-specs.vue
+++ b/apps/web-antdv-next/src/views/iot/thingmodel/modules/dataSpecs/thing-model-struct-data-specs.vue
@@ -4,13 +4,12 @@ import type { Ref } from 'vue';
 
 import { nextTick, onMounted, ref, unref } from 'vue';
 
+import { IoTDataSpecsDataTypeEnum } from '@vben/constants';
 import { isEmpty } from '@vben/utils';
 
 import { useVModel } from '@vueuse/core';
 import { Button, Divider, Form, Input, Modal } from 'antdv-next';
 
-import { IoTDataSpecsDataTypeEnum } from '#/views/iot/utils/constants';
-
 import ThingModelProperty from '../thing-model-property.vue';
 
 /** Struct 型的 dataSpecs 配置组件 */
diff --git a/apps/web-antdv-next/src/views/iot/thingmodel/modules/thing-model-event.vue b/apps/web-antdv-next/src/views/iot/thingmodel/modules/thing-model-event.vue
index c116fd336..fe4fe0360 100644
--- a/apps/web-antdv-next/src/views/iot/thingmodel/modules/thing-model-event.vue
+++ b/apps/web-antdv-next/src/views/iot/thingmodel/modules/thing-model-event.vue
@@ -4,16 +4,15 @@ import type { Ref } from 'vue';
 
 import { watch } from 'vue';
 
+import {
+  IoTThingModelEventTypeEnum,
+  IoTThingModelParamDirectionEnum,
+} from '@vben/constants';
 import { isEmpty } from '@vben/utils';
 
 import { useVModel } from '@vueuse/core';
 import { Radio } from 'antdv-next';
 
-import {
-  IoTThingModelEventTypeEnum,
-  IoTThingModelParamDirectionEnum,
-} from '#/views/iot/utils/constants';
-
 import ThingModelInputOutputParam from './thing-model-input-output-param.vue';
 
 /** IoT 物模型事件 */
diff --git a/apps/web-antdv-next/src/views/iot/thingmodel/modules/thing-model-form.vue b/apps/web-antdv-next/src/views/iot/thingmodel/modules/thing-model-form.vue
index 9167da04f..53c6cb5f5 100644
--- a/apps/web-antdv-next/src/views/iot/thingmodel/modules/thing-model-form.vue
+++ b/apps/web-antdv-next/src/views/iot/thingmodel/modules/thing-model-form.vue
@@ -6,7 +6,7 @@ import type { Ref } from 'vue';
 import type { IotProductApi } from '#/api/iot/product/product';
 import type { ThingModelData } from '#/api/iot/thingmodel';
 
-import { inject, ref } from 'vue';
+import { inject, IOT_PROVIDE_KEY, IoTDataSpecsDataTypeEnum, IoTThingModelTypeEnum, ref } from 'vue';
 
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
@@ -20,11 +20,6 @@ import {
   getThingModel,
   updateThingModel,
 } from '#/api/iot/thingmodel';
-import {
-  IOT_PROVIDE_KEY,
-  IoTDataSpecsDataTypeEnum,
-  IoTThingModelTypeEnum,
-} from '#/views/iot/utils/constants';
 
 import ThingModelEvent from './thing-model-event.vue';
 import ThingModelProperty from './thing-model-property.vue';
diff --git a/apps/web-antdv-next/src/views/iot/thingmodel/modules/thing-model-input-output-param.vue b/apps/web-antdv-next/src/views/iot/thingmodel/modules/thing-model-input-output-param.vue
index 6879105da..4ea508bc5 100644
--- a/apps/web-antdv-next/src/views/iot/thingmodel/modules/thing-model-input-output-param.vue
+++ b/apps/web-antdv-next/src/views/iot/thingmodel/modules/thing-model-input-output-param.vue
@@ -4,13 +4,12 @@ import type { Ref } from 'vue';
 
 import { ref, unref } from 'vue';
 
+import { IoTDataSpecsDataTypeEnum } from '@vben/constants';
 import { isEmpty } from '@vben/utils';
 
 import { useVModel } from '@vueuse/core';
 import { Button, Divider, Form, Input, Modal } from 'antdv-next';
 
-import { IoTDataSpecsDataTypeEnum } from '#/views/iot/utils/constants';
-
 import ThingModelProperty from './thing-model-property.vue';
 
 /** 输入输出参数配置组件 */
diff --git a/apps/web-antdv-next/src/views/iot/thingmodel/modules/thing-model-property.vue b/apps/web-antdv-next/src/views/iot/thingmodel/modules/thing-model-property.vue
index 90150679b..342cf0cc2 100644
--- a/apps/web-antdv-next/src/views/iot/thingmodel/modules/thing-model-property.vue
+++ b/apps/web-antdv-next/src/views/iot/thingmodel/modules/thing-model-property.vue
@@ -6,16 +6,15 @@ import type { ThingModelProperty } from '#/api/iot/thingmodel';
 
 import { computed, watch } from 'vue';
 
-import { isEmpty } from '@vben/utils';
-
-import { useVModel } from '@vueuse/core';
-import { Input, Radio, Select } from 'antdv-next';
-
 import {
   getDataTypeOptions,
   IoTDataSpecsDataTypeEnum,
   IoTThingModelAccessModeEnum,
-} from '#/views/iot/utils/constants';
+} from '@vben/constants';
+import { isEmpty } from '@vben/utils';
+
+import { useVModel } from '@vueuse/core';
+import { Input, Radio, Select } from 'antdv-next';
 
 import {
   ThingModelArrayDataSpecs,
diff --git a/apps/web-antdv-next/src/views/iot/thingmodel/modules/thing-model-service.vue b/apps/web-antdv-next/src/views/iot/thingmodel/modules/thing-model-service.vue
index 90f16e5ef..a9ed916ee 100644
--- a/apps/web-antdv-next/src/views/iot/thingmodel/modules/thing-model-service.vue
+++ b/apps/web-antdv-next/src/views/iot/thingmodel/modules/thing-model-service.vue
@@ -4,16 +4,15 @@ import type { Ref } from 'vue';
 
 import { watch } from 'vue';
 
+import {
+  IoTThingModelParamDirectionEnum,
+  IoTThingModelServiceCallTypeEnum,
+} from '@vben/constants';
 import { isEmpty } from '@vben/utils';
 
 import { useVModel } from '@vueuse/core';
 import { Radio } from 'antdv-next';
 
-import {
-  IoTThingModelParamDirectionEnum,
-  IoTThingModelServiceCallTypeEnum,
-} from '#/views/iot/utils/constants';
-
 import ThingModelInputOutputParam from './thing-model-input-output-param.vue';
 
 /** IoT 物模型服务 */
diff --git a/apps/web-antdv-next/src/views/iot/thingmodel/modules/thing-model-tsl.vue b/apps/web-antdv-next/src/views/iot/thingmodel/modules/thing-model-tsl.vue
index 05e8d7ca7..72018cecd 100644
--- a/apps/web-antdv-next/src/views/iot/thingmodel/modules/thing-model-tsl.vue
+++ b/apps/web-antdv-next/src/views/iot/thingmodel/modules/thing-model-tsl.vue
@@ -5,10 +5,11 @@ import type { IotProductApi } from '#/api/iot/product/product';
 
 import { computed, inject, ref, watch } from 'vue';
 
+import { IOT_PROVIDE_KEY } from '@vben/constants';
+
 import { Modal, TextArea } from 'antdv-next';
 
 import { getThingModelTSL } from '#/api/iot/thingmodel';
-import { IOT_PROVIDE_KEY } from '#/views/iot/utils/constants';
 
 defineOptions({ name: 'ThingModelTsl' });
 
diff --git a/apps/web-antdv-next/src/views/iot/utils/constants.ts b/apps/web-antdv-next/src/views/iot/utils/constants.ts
deleted file mode 100644
index e5c6b5db2..000000000
--- a/apps/web-antdv-next/src/views/iot/utils/constants.ts
+++ /dev/null
@@ -1,656 +0,0 @@
-// TODO @AI：感觉这块，放到 biz-iot-enum 里好点。
-
-/** 检查值是否为空 */
-const isEmpty = (value: any): boolean => {
-  return value === null || value === undefined || value === '';
-};
-
-/** IoT 依赖注入 KEY */
-export const IOT_PROVIDE_KEY = {
-  PRODUCT: 'IOT_PRODUCT',
-};
-
-/** IoT 设备状态枚举 */
-export enum DeviceStateEnum {
-  INACTIVE = 0, // 未激活
-  ONLINE = 1, // 在线
-  OFFLINE = 2, // 离线
-}
-
-/** IoT 产品物模型类型枚举类 */
-export const IoTThingModelTypeEnum = {
-  PROPERTY: 1, // 属性
-  SERVICE: 2, // 服务
-  EVENT: 3, // 事件
-};
-
-// IoT 产品物模型服务调用方式枚举
-export const IoTThingModelServiceCallTypeEnum = {
-  ASYNC: {
-    label: '异步',
-    value: 'async',
-  },
-  SYNC: {
-    label: '同步',
-    value: 'sync',
-  },
-};
-export const getThingModelServiceCallTypeLabel = (
-  value: string,
-): string | undefined =>
-  Object.values(IoTThingModelServiceCallTypeEnum).find(
-    (type) => type.value === value,
-  )?.label;
-
-// IoT 产品物模型事件类型枚举
-export const IoTThingModelEventTypeEnum = {
-  INFO: {
-    label: '信息',
-    value: 'info',
-  },
-  ALERT: {
-    label: '告警',
-    value: 'alert',
-  },
-  ERROR: {
-    label: '故障',
-    value: 'error',
-  },
-};
-export const getEventTypeLabel = (value: string): string | undefined =>
-  Object.values(IoTThingModelEventTypeEnum).find((type) => type.value === value)
-    ?.label;
-
-// IoT 产品物模型参数是输入参数还是输出参数
-export const IoTThingModelParamDirectionEnum = {
-  INPUT: 'input', // 输入参数
-  OUTPUT: 'output', // 输出参数
-};
-
-// IoT 产品物模型访问模式枚举类
-export const IoTThingModelAccessModeEnum = {
-  READ_WRITE: {
-    label: '读写',
-    value: 'rw',
-  },
-  READ_ONLY: {
-    label: '只读',
-    value: 'r',
-  },
-  WRITE_ONLY: {
-    label: '只写',
-    value: 'w',
-  },
-};
-
-/** 获取访问模式标签 */
-export const getAccessModeLabel = (value: string): string => {
-  const mode = Object.values(IoTThingModelAccessModeEnum).find(
-    (mode) => mode.value === value,
-  );
-  return mode?.label || value;
-};
-
-/** 属性值的数据类型 */
-export const IoTDataSpecsDataTypeEnum = {
-  INT: 'int',
-  FLOAT: 'float',
-  DOUBLE: 'double',
-  ENUM: 'enum',
-  BOOL: 'bool',
-  TEXT: 'text',
-  DATE: 'date',
-  STRUCT: 'struct',
-  ARRAY: 'array',
-};
-
-export const getDataTypeOptions = () => {
-  return [
-    { value: IoTDataSpecsDataTypeEnum.INT, label: '整数型' },
-    { value: IoTDataSpecsDataTypeEnum.FLOAT, label: '单精度浮点型' },
-    { value: IoTDataSpecsDataTypeEnum.DOUBLE, label: '双精度浮点型' },
-    { value: IoTDataSpecsDataTypeEnum.ENUM, label: '枚举型' },
-    { value: IoTDataSpecsDataTypeEnum.BOOL, label: '布尔型' },
-    { value: IoTDataSpecsDataTypeEnum.TEXT, label: '文本型' },
-    { value: IoTDataSpecsDataTypeEnum.DATE, label: '时间型' },
-    { value: IoTDataSpecsDataTypeEnum.STRUCT, label: '结构体' },
-    { value: IoTDataSpecsDataTypeEnum.ARRAY, label: '数组' },
-  ];
-};
-
-/** 获得物体模型数据类型配置项名称 */
-export const getDataTypeOptionsLabel = (value: string) => {
-  if (isEmpty(value)) {
-    return value;
-  }
-  const dataType = getDataTypeOptions().find(
-    (option) => option.value === value,
-  );
-  return dataType && `${dataType.value}(${dataType.label})`;
-};
-
-/** 获取数据类型显示名称（用于属性选择器） */
-export const getDataTypeName = (dataType: string): string => {
-  const typeMap: Record<string, string> = {
-    [IoTDataSpecsDataTypeEnum.INT]: '整数',
-    [IoTDataSpecsDataTypeEnum.FLOAT]: '浮点数',
-    [IoTDataSpecsDataTypeEnum.DOUBLE]: '双精度',
-    [IoTDataSpecsDataTypeEnum.TEXT]: '字符串',
-    [IoTDataSpecsDataTypeEnum.BOOL]: '布尔值',
-    [IoTDataSpecsDataTypeEnum.ENUM]: '枚举',
-    [IoTDataSpecsDataTypeEnum.DATE]: '日期',
-    [IoTDataSpecsDataTypeEnum.STRUCT]: '结构体',
-    [IoTDataSpecsDataTypeEnum.ARRAY]: '数组',
-  };
-  return typeMap[dataType] || dataType;
-};
-
-/** 获取数据类型标签类型（用于 tag 的 type 属性） */
-export const getDataTypeTagType = (
-  dataType: string,
-): 'danger' | 'info' | 'primary' | 'success' | 'warning' => {
-  const tagMap: Record<
-    string,
-    'danger' | 'info' | 'primary' | 'success' | 'warning'
-  > = {
-    [IoTDataSpecsDataTypeEnum.INT]: 'primary',
-    [IoTDataSpecsDataTypeEnum.FLOAT]: 'success',
-    [IoTDataSpecsDataTypeEnum.DOUBLE]: 'success',
-    [IoTDataSpecsDataTypeEnum.TEXT]: 'info',
-    [IoTDataSpecsDataTypeEnum.BOOL]: 'warning',
-    [IoTDataSpecsDataTypeEnum.ENUM]: 'danger',
-    [IoTDataSpecsDataTypeEnum.DATE]: 'primary',
-    [IoTDataSpecsDataTypeEnum.STRUCT]: 'info',
-    [IoTDataSpecsDataTypeEnum.ARRAY]: 'warning',
-  };
-  return tagMap[dataType] || 'info';
-};
-
-/** 物模型组标签常量 */
-export const THING_MODEL_GROUP_LABELS = {
-  PROPERTY: '设备属性',
-  EVENT: '设备事件',
-  SERVICE: '设备服务',
-};
-
-// IoT OTA 任务设备范围枚举
-export const IoTOtaTaskDeviceScopeEnum = {
-  ALL: {
-    label: '全部设备',
-    value: 1,
-  },
-  SELECT: {
-    label: '指定设备',
-    value: 2,
-  },
-};
-
-// IoT OTA 任务状态枚举
-export const IoTOtaTaskStatusEnum = {
-  IN_PROGRESS: {
-    label: '进行中',
-    value: 10,
-  },
-  END: {
-    label: '已结束',
-    value: 20,
-  },
-  CANCELED: {
-    label: '已取消',
-    value: 30,
-  },
-};
-
-// IoT OTA 升级记录状态枚举
-export const IoTOtaTaskRecordStatusEnum = {
-  PENDING: {
-    label: '待推送',
-    value: 0,
-  },
-  PUSHED: {
-    label: '已推送',
-    value: 10,
-  },
-  UPGRADING: {
-    label: '升级中',
-    value: 20,
-  },
-  SUCCESS: {
-    label: '升级成功',
-    value: 30,
-  },
-  FAILURE: {
-    label: '升级失败',
-    value: 40,
-  },
-  CANCELED: {
-    label: '升级取消',
-    value: 50,
-  },
-};
-
-// ========== 场景联动规则相关常量 ==========
-
-/** IoT 场景联动触发器类型枚举 */
-export const IotRuleSceneTriggerTypeEnum = {
-  DEVICE_STATE_UPDATE: 1, // 设备上下线变更
-  DEVICE_PROPERTY_POST: 2, // 物模型属性上报
-  DEVICE_EVENT_POST: 3, // 设备事件上报
-  DEVICE_SERVICE_INVOKE: 4, // 设备服务调用
-  TIMER: 100, // 定时触发
-};
-
-/** 触发器类型选项配置 */
-export const triggerTypeOptions = [
-  {
-    value: IotRuleSceneTriggerTypeEnum.DEVICE_STATE_UPDATE,
-    label: '设备状态变更',
-  },
-  {
-    value: IotRuleSceneTriggerTypeEnum.DEVICE_PROPERTY_POST,
-    label: '设备属性上报',
-  },
-  {
-    value: IotRuleSceneTriggerTypeEnum.DEVICE_EVENT_POST,
-    label: '设备事件上报',
-  },
-  {
-    value: IotRuleSceneTriggerTypeEnum.DEVICE_SERVICE_INVOKE,
-    label: '设备服务调用',
-  },
-  {
-    value: IotRuleSceneTriggerTypeEnum.TIMER,
-    label: '定时触发',
-  },
-];
-
-/** 判断是否为设备触发器类型 */
-export function isDeviceTrigger(type: number): boolean {
-  const deviceTriggerTypes = [
-    IotRuleSceneTriggerTypeEnum.DEVICE_STATE_UPDATE,
-    IotRuleSceneTriggerTypeEnum.DEVICE_PROPERTY_POST,
-    IotRuleSceneTriggerTypeEnum.DEVICE_EVENT_POST,
-    IotRuleSceneTriggerTypeEnum.DEVICE_SERVICE_INVOKE,
-  ] as number[];
-  return deviceTriggerTypes.includes(type);
-}
-
-// ========== 场景联动规则执行器相关常量 ==========
-
-/** IoT 场景联动执行器类型枚举 */
-export const IotRuleSceneActionTypeEnum = {
-  DEVICE_PROPERTY_SET: 1, // 设备属性设置
-  DEVICE_SERVICE_INVOKE: 2, // 设备服务调用
-  ALERT_TRIGGER: 100, // 告警触发
-  ALERT_RECOVER: 101, // 告警恢复
-};
-
-/** 执行器类型选项配置 */
-export const getActionTypeOptions = () => [
-  {
-    value: IotRuleSceneActionTypeEnum.DEVICE_PROPERTY_SET,
-    label: '设备属性设置',
-  },
-  {
-    value: IotRuleSceneActionTypeEnum.DEVICE_SERVICE_INVOKE,
-    label: '设备服务调用',
-  },
-  {
-    value: IotRuleSceneActionTypeEnum.ALERT_TRIGGER,
-    label: '触发告警',
-  },
-  {
-    value: IotRuleSceneActionTypeEnum.ALERT_RECOVER,
-    label: '恢复告警',
-  },
-];
-
-/** 获取执行器类型标签 */
-export const getActionTypeLabel = (type: number): string => {
-  const option = getActionTypeOptions().find((opt) => opt.value === type);
-  return option?.label || '未知类型';
-};
-
-/** IoT 场景联动触发条件参数操作符枚举 */
-export const IotRuleSceneTriggerConditionParameterOperatorEnum = {
-  EQUALS: { name: '等于', value: '=' }, // 等于
-  NOT_EQUALS: { name: '不等于', value: '!=' }, // 不等于
-  GREATER_THAN: { name: '大于', value: '>' }, // 大于
-  GREATER_THAN_OR_EQUALS: { name: '大于等于', value: '>=' }, // 大于等于
-  LESS_THAN: { name: '小于', value: '<' }, // 小于
-  LESS_THAN_OR_EQUALS: { name: '小于等于', value: '<=' }, // 小于等于
-  IN: { name: '在...之中', value: 'in' }, // 在...之中
-  NOT_IN: { name: '不在...之中', value: 'not in' }, // 不在...之中
-  BETWEEN: { name: '在...之间', value: 'between' }, // 在...之间
-  NOT_BETWEEN: { name: '不在...之间', value: 'not between' }, // 不在...之间
-  LIKE: { name: '字符串匹配', value: 'like' }, // 字符串匹配
-  NOT_NULL: { name: '非空', value: 'not null' }, // 非空
-};
-
-/** IoT 场景联动触发条件类型枚举 */
-export const IotRuleSceneTriggerConditionTypeEnum = {
-  DEVICE_STATUS: 1, // 设备状态
-  DEVICE_PROPERTY: 2, // 设备属性
-  CURRENT_TIME: 3, // 当前时间
-};
-
-/** 获取条件类型选项 */
-export const getConditionTypeOptions = () => [
-  {
-    value: IotRuleSceneTriggerConditionTypeEnum.DEVICE_STATUS,
-    label: '设备状态',
-  },
-  {
-    value: IotRuleSceneTriggerConditionTypeEnum.DEVICE_PROPERTY,
-    label: '设备属性',
-  },
-  {
-    value: IotRuleSceneTriggerConditionTypeEnum.CURRENT_TIME,
-    label: '当前时间',
-  },
-];
-
-/** 设备状态枚举 - 统一的设备状态管理 */
-export const IoTDeviceStatusEnum = {
-  // 在线状态
-  ONLINE: {
-    label: '在线',
-    value: 'online',
-    tagType: 'success',
-  },
-  OFFLINE: {
-    label: '离线',
-    value: 'offline',
-    tagType: 'danger',
-  },
-  // 启用状态
-  ENABLED: {
-    label: '正常',
-    value: 0,
-    value2: 'enabled',
-    tagType: 'success',
-  },
-  DISABLED: {
-    label: '禁用',
-    value: 1,
-    value2: 'disabled',
-    tagType: 'danger',
-  },
-  // 激活状态
-  ACTIVATED: {
-    label: '已激活',
-    value2: 'activated',
-    tagType: 'success',
-  },
-  NOT_ACTIVATED: {
-    label: '未激活',
-    value2: 'not_activated',
-    tagType: 'info',
-  },
-};
-
-/** 设备选择器特殊选项 */
-export const DEVICE_SELECTOR_OPTIONS = {
-  ALL_DEVICES: {
-    id: 0,
-    deviceName: '全部设备',
-  },
-};
-
-/** IoT 场景联动触发时间操作符枚举 */
-export const IotRuleSceneTriggerTimeOperatorEnum = {
-  BEFORE_TIME: { name: '在时间之前', value: 'before_time' }, // 在时间之前
-  AFTER_TIME: { name: '在时间之后', value: 'after_time' }, // 在时间之后
-  BETWEEN_TIME: { name: '在时间之间', value: 'between_time' }, // 在时间之间
-  AT_TIME: { name: '在指定时间', value: 'at_time' }, // 在指定时间
-  BEFORE_TODAY: { name: '在今日之前', value: 'before_today' }, // 在今日之前
-  AFTER_TODAY: { name: '在今日之后', value: 'after_today' }, // 在今日之后
-  TODAY: { name: '在今日之间', value: 'today' }, // 在今日之间
-};
-
-/** 获取触发器类型标签 */
-export const getTriggerTypeLabel = (type: number): string => {
-  const option = triggerTypeOptions.find((item) => item.value === type);
-  return option?.label || '未知类型';
-};
-
-// ========== JSON 参数输入组件相关常量 ==========
-
-/** JSON 参数输入组件类型枚举 */
-export const JsonParamsInputTypeEnum = {
-  SERVICE: 'service',
-  EVENT: 'event',
-  PROPERTY: 'property',
-  CUSTOM: 'custom',
-};
-
-/** JSON 参数输入组件类型 */
-export type JsonParamsInputType =
-  (typeof JsonParamsInputTypeEnum)[keyof typeof JsonParamsInputTypeEnum];
-
-/** JSON 参数输入组件文本常量 */
-export const JSON_PARAMS_INPUT_CONSTANTS = {
-  // 基础文本
-  PLACEHOLDER: '请输入JSON格式的参数',
-  JSON_FORMAT_CORRECT: 'JSON 格式正确',
-  QUICK_FILL_LABEL: '快速填充：',
-  EXAMPLE_DATA_BUTTON: '示例数据',
-  CLEAR_BUTTON: '清空',
-  VIEW_EXAMPLE_TITLE: '查看参数示例',
-  COMPLETE_JSON_FORMAT: '完整 JSON 格式：',
-  REQUIRED_TAG: '必填',
-
-  // 错误信息
-  PARAMS_MUST_BE_OBJECT: '参数必须是一个有效的 JSON 对象',
-  PARAM_REQUIRED_ERROR: (paramName: string) => `参数 ${paramName} 为必填项`,
-  JSON_FORMAT_ERROR: (error: string) => `JSON格式错误: ${error}`,
-  UNKNOWN_ERROR: '未知错误',
-
-  // 类型相关标题
-  TITLES: {
-    SERVICE: (name?: string) => `${name || '服务'} - 输入参数示例`,
-    EVENT: (name?: string) => `${name || '事件'} - 输出参数示例`,
-    PROPERTY: '属性设置 - 参数示例',
-    CUSTOM: (name?: string) => `${name || '自定义'} - 参数示例`,
-    DEFAULT: '参数示例',
-  },
-
-  // 参数标签
-  PARAMS_LABELS: {
-    SERVICE: '输入参数',
-    EVENT: '输出参数',
-    PROPERTY: '属性参数',
-    CUSTOM: '参数列表',
-    DEFAULT: '参数',
-  },
-
-  // 空状态消息
-  EMPTY_MESSAGES: {
-    SERVICE: '此服务无需输入参数',
-    EVENT: '此事件无输出参数',
-    PROPERTY: '无可设置的属性',
-    CUSTOM: '无参数配置',
-    DEFAULT: '无参数',
-  },
-
-  // 无配置消息
-  NO_CONFIG_MESSAGES: {
-    SERVICE: '请先选择服务',
-    EVENT: '请先选择事件',
-    PROPERTY: '请先选择产品',
-    CUSTOM: '请先进行配置',
-    DEFAULT: '请先进行配置',
-  },
-};
-
-/** JSON 参数输入组件图标常量 */
-export const JSON_PARAMS_INPUT_ICONS = {
-  // 标题图标
-  TITLE_ICONS: {
-    SERVICE: 'ep:service',
-    EVENT: 'ep:bell',
-    PROPERTY: 'ep:edit',
-    CUSTOM: 'ep:document',
-    DEFAULT: 'ep:document',
-  },
-
-  // 参数图标
-  PARAMS_ICONS: {
-    SERVICE: 'ep:edit',
-    EVENT: 'ep:upload',
-    PROPERTY: 'ep:setting',
-    CUSTOM: 'ep:list',
-    DEFAULT: 'ep:edit',
-  },
-
-  // 状态图标
-  STATUS_ICONS: {
-    ERROR: 'ep:warning',
-    SUCCESS: 'ep:circle-check',
-  },
-};
-
-/** JSON 参数输入组件示例值常量 */
-export const JSON_PARAMS_EXAMPLE_VALUES: Record<string, any> = {
-  [IoTDataSpecsDataTypeEnum.INT]: { display: '25', value: 25 },
-  [IoTDataSpecsDataTypeEnum.FLOAT]: { display: '25.5', value: 25.5 },
-  [IoTDataSpecsDataTypeEnum.DOUBLE]: { display: '25.5', value: 25.5 },
-  [IoTDataSpecsDataTypeEnum.BOOL]: { display: 'false', value: false },
-  [IoTDataSpecsDataTypeEnum.TEXT]: { display: '"auto"', value: 'auto' },
-  [IoTDataSpecsDataTypeEnum.ENUM]: { display: '"option1"', value: 'option1' },
-  [IoTDataSpecsDataTypeEnum.STRUCT]: { display: '{}', value: {} },
-  [IoTDataSpecsDataTypeEnum.ARRAY]: { display: '[]', value: [] },
-  DEFAULT: { display: '""', value: '' },
-};
-
-// ========== Modbus 通用常量 ==========
-
-/** Modbus 模式枚举 */
-export const ModbusModeEnum = {
-  POLLING: 1, // 云端轮询
-  ACTIVE_REPORT: 2, // 主动上报
-} as const;
-
-/** Modbus 帧格式枚举 */
-export const ModbusFrameFormatEnum = {
-  MODBUS_TCP: 1, // Modbus TCP
-  MODBUS_RTU: 2, // Modbus RTU
-} as const;
-
-/** Modbus 功能码枚举 */
-export const ModbusFunctionCodeEnum = {
-  READ_COILS: 1, // 读线圈
-  READ_DISCRETE_INPUTS: 2, // 读离散输入
-  READ_HOLDING_REGISTERS: 3, // 读保持寄存器
-  READ_INPUT_REGISTERS: 4, // 读输入寄存器
-} as const;
-
-/** Modbus 功能码选项 */
-export const ModbusFunctionCodeOptions = [
-  { value: 1, label: '01 - 读线圈 (Coils)', description: '可读写布尔值' },
-  {
-    value: 2,
-    label: '02 - 读离散输入 (Discrete Inputs)',
-    description: '只读布尔值',
-  },
-  {
-    value: 3,
-    label: '03 - 读保持寄存器 (Holding Registers)',
-    description: '可读写 16 位数据',
-  },
-  {
-    value: 4,
-    label: '04 - 读输入寄存器 (Input Registers)',
-    description: '只读 16 位数据',
-  },
-];
-
-/** Modbus 原始数据类型枚举 */
-export const ModbusRawDataTypeEnum = {
-  INT16: 'INT16',
-  UINT16: 'UINT16',
-  INT32: 'INT32',
-  UINT32: 'UINT32',
-  FLOAT: 'FLOAT',
-  DOUBLE: 'DOUBLE',
-  BOOLEAN: 'BOOLEAN',
-  STRING: 'STRING',
-} as const;
-
-/** Modbus 原始数据类型选项 */
-export const ModbusRawDataTypeOptions = [
-  {
-    value: 'INT16',
-    label: 'INT16',
-    description: '有符号16位整数',
-    registerCount: 1,
-  },
-  {
-    value: 'UINT16',
-    label: 'UINT16',
-    description: '无符号16位整数',
-    registerCount: 1,
-  },
-  {
-    value: 'INT32',
-    label: 'INT32',
-    description: '有符号32位整数',
-    registerCount: 2,
-  },
-  {
-    value: 'UINT32',
-    label: 'UINT32',
-    description: '无符号32位整数',
-    registerCount: 2,
-  },
-  {
-    value: 'FLOAT',
-    label: 'FLOAT',
-    description: '32位浮点数',
-    registerCount: 2,
-  },
-  {
-    value: 'DOUBLE',
-    label: 'DOUBLE',
-    description: '64位浮点数',
-    registerCount: 4,
-  },
-  {
-    value: 'BOOLEAN',
-    label: 'BOOLEAN',
-    description: '布尔值',
-    registerCount: 1,
-  },
-  {
-    value: 'STRING',
-    label: 'STRING',
-    description: '字符串',
-    registerCount: 0,
-  },
-];
-
-/** Modbus 字节序选项 - 16位 */
-export const ModbusByteOrder16Options = [
-  { value: 'AB', label: 'AB', description: '大端序' },
-  { value: 'BA', label: 'BA', description: '小端序' },
-];
-
-/** Modbus 字节序选项 - 32位 */
-export const ModbusByteOrder32Options = [
-  { value: 'ABCD', label: 'ABCD', description: '大端序' },
-  { value: 'CDAB', label: 'CDAB', description: '大端字交换' },
-  { value: 'DCBA', label: 'DCBA', description: '小端序' },
-  { value: 'BADC', label: 'BADC', description: '小端字交换' },
-];
-
-/** 根据数据类型获取字节序选项 */
-export const getByteOrderOptions = (rawDataType: string) => {
-  if (['FLOAT', 'INT32', 'UINT32'].includes(rawDataType)) {
-    return ModbusByteOrder32Options;
-  }
-  if (rawDataType === 'DOUBLE') {
-    // 64 位暂时复用 32 位字节序
-    return ModbusByteOrder32Options;
-  }
-  return ModbusByteOrder16Options;
-};
diff --git a/apps/web-antdv-next/src/views/mall/promotion/kefu/index.vue b/apps/web-antdv-next/src/views/mall/promotion/kefu/index.vue
index 110d56564..4e65b393d 100644
--- a/apps/web-antdv-next/src/views/mall/promotion/kefu/index.vue
+++ b/apps/web-antdv-next/src/views/mall/promotion/kefu/index.vue
@@ -4,6 +4,7 @@ import type { MallKefuConversationApi } from '#/api/mall/promotion/kefu/conversa
 import { onBeforeUnmount, onMounted, ref, watch } from 'vue';
 
 import { Page } from '@vben/common-ui';
+import { WebSocketMessageTypeConstants } from '@vben/constants';
 import { useAccessStore } from '@vben/stores';
 
 import { useWebSocket } from '@vueuse/core';
@@ -14,7 +15,6 @@ import { useMallKefuStore } from '#/store/mall/kefu';
 import ConversationList from './modules/conversation-list.vue';
 import MemberInfo from './modules/member/member-info.vue';
 import MessageList from './modules/message-list.vue';
-import { WebSocketMessageTypeConstants } from './modules/tools/constants';
 
 const accessStore = useAccessStore();
 const kefuStore = useMallKefuStore(); // 客服缓存
diff --git a/apps/web-antdv-next/src/views/mall/promotion/kefu/modules/conversation-list.vue b/apps/web-antdv-next/src/views/mall/promotion/kefu/modules/conversation-list.vue
index 7777d4931..d4da15bab 100644
--- a/apps/web-antdv-next/src/views/mall/promotion/kefu/modules/conversation-list.vue
+++ b/apps/web-antdv-next/src/views/mall/promotion/kefu/modules/conversation-list.vue
@@ -4,6 +4,7 @@ import type { MallKefuConversationApi } from '#/api/mall/promotion/kefu/conversa
 import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue';
 
 import { confirm } from '@vben/common-ui';
+import { KeFuMessageContentTypeEnum } from '@vben/constants';
 import { IconifyIcon } from '@vben/icons';
 import { formatPast, jsonParse } from '@vben/utils';
 
@@ -15,7 +16,6 @@ import {
 } from '#/api/mall/promotion/kefu/conversation';
 import { useMallKefuStore } from '#/store/mall/kefu';
 
-import { KeFuMessageContentTypeEnum } from './tools/constants';
 import { useEmoji } from './tools/emoji';
 
 /** 打开右侧的消息列表 */
diff --git a/apps/web-antdv-next/src/views/mall/promotion/kefu/modules/message-list.vue b/apps/web-antdv-next/src/views/mall/promotion/kefu/modules/message-list.vue
index 90c5eee56..94debb681 100644
--- a/apps/web-antdv-next/src/views/mall/promotion/kefu/modules/message-list.vue
+++ b/apps/web-antdv-next/src/views/mall/promotion/kefu/modules/message-list.vue
@@ -4,7 +4,7 @@ import type { Emoji } from './tools/emoji';
 import type { MallKefuConversationApi } from '#/api/mall/promotion/kefu/conversation';
 import type { MallKefuMessageApi } from '#/api/mall/promotion/kefu/message';
 
-import { computed, reactive, ref, toRefs, unref, watch } from 'vue';
+import { computed, KeFuMessageContentTypeEnum, reactive, ref, toRefs, unref, watch } from 'vue';
 
 import { UserTypeEnum } from '@vben/constants';
 import { IconifyIcon } from '@vben/icons';
@@ -25,7 +25,6 @@ import { useMallKefuStore } from '#/store/mall/kefu';
 import MessageItem from './message/message-item.vue';
 import OrderItem from './message/order-item.vue';
 import ProductItem from './message/product-item.vue';
-import { KeFuMessageContentTypeEnum } from './tools/constants';
 import { useEmoji } from './tools/emoji';
 import EmojiSelectPopover from './tools/emoji-select-popover.vue';
 import PictureSelectUpload from './tools/picture-select-upload.vue';
diff --git a/apps/web-antdv-next/src/views/mall/promotion/kefu/modules/tools/constants.ts b/apps/web-antdv-next/src/views/mall/promotion/kefu/modules/tools/constants.ts
deleted file mode 100644
index 266a6cf02..000000000
--- a/apps/web-antdv-next/src/views/mall/promotion/kefu/modules/tools/constants.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/** 客服消息类型枚举类 */
-export const KeFuMessageContentTypeEnum = {
-  TEXT: 1, // 文本消息
-  IMAGE: 2, // 图片消息
-  VOICE: 3, // 语音消息
-  VIDEO: 4, // 视频消息
-  SYSTEM: 5, // 系统消息
-  // ========== 商城特殊消息 ==========
-  PRODUCT: 10, //  商品消息
-  ORDER: 11, //  订单消息"
-};
-
-/** Promotion 的 WebSocket 消息类型枚举类 */
-export const WebSocketMessageTypeConstants = {
-  KEFU_MESSAGE_TYPE: 'kefu_message_type', // 客服消息类型
-  KEFU_MESSAGE_ADMIN_READ: 'kefu_message_read_status_change', // 客服消息管理员已读
-};
diff --git a/apps/web-ele/src/views/mall/promotion/kefu/index.vue b/apps/web-ele/src/views/mall/promotion/kefu/index.vue
index 096cb0cd2..902ed4d46 100644
--- a/apps/web-ele/src/views/mall/promotion/kefu/index.vue
+++ b/apps/web-ele/src/views/mall/promotion/kefu/index.vue
@@ -4,6 +4,7 @@ import type { MallKefuConversationApi } from '#/api/mall/promotion/kefu/conversa
 import { onBeforeUnmount, onMounted, ref, watch } from 'vue';
 
 import { Page } from '@vben/common-ui';
+import { WebSocketMessageTypeConstants } from '@vben/constants';
 import { useAccessStore } from '@vben/stores';
 
 import { useWebSocket } from '@vueuse/core';
@@ -14,7 +15,6 @@ import { useMallKefuStore } from '#/store/mall/kefu';
 import ConversationList from './modules/conversation-list.vue';
 import MemberInfo from './modules/member/member-info.vue';
 import MessageList from './modules/message-list.vue';
-import { WebSocketMessageTypeConstants } from './modules/tools/constants';
 
 const accessStore = useAccessStore();
 const kefuStore = useMallKefuStore(); // 客服缓存
diff --git a/apps/web-ele/src/views/mall/promotion/kefu/modules/conversation-list.vue b/apps/web-ele/src/views/mall/promotion/kefu/modules/conversation-list.vue
index ca38ca6bf..69ed72f9a 100644
--- a/apps/web-ele/src/views/mall/promotion/kefu/modules/conversation-list.vue
+++ b/apps/web-ele/src/views/mall/promotion/kefu/modules/conversation-list.vue
@@ -4,6 +4,7 @@ import type { MallKefuConversationApi } from '#/api/mall/promotion/kefu/conversa
 import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue';
 
 import { confirm } from '@vben/common-ui';
+import { KeFuMessageContentTypeEnum } from '@vben/constants';
 import { IconifyIcon } from '@vben/icons';
 import { formatPast, jsonParse } from '@vben/utils';
 
@@ -15,7 +16,6 @@ import {
 } from '#/api/mall/promotion/kefu/conversation';
 import { useMallKefuStore } from '#/store/mall/kefu';
 
-import { KeFuMessageContentTypeEnum } from './tools/constants';
 import { useEmoji } from './tools/emoji';
 
 /** 打开右侧的消息列表 */
diff --git a/apps/web-ele/src/views/mall/promotion/kefu/modules/message-list.vue b/apps/web-ele/src/views/mall/promotion/kefu/modules/message-list.vue
index 633187084..fc971c096 100644
--- a/apps/web-ele/src/views/mall/promotion/kefu/modules/message-list.vue
+++ b/apps/web-ele/src/views/mall/promotion/kefu/modules/message-list.vue
@@ -4,7 +4,7 @@ import type { Emoji } from './tools/emoji';
 import type { MallKefuConversationApi } from '#/api/mall/promotion/kefu/conversation';
 import type { MallKefuMessageApi } from '#/api/mall/promotion/kefu/message';
 
-import { computed, reactive, ref, toRefs, unref, watch } from 'vue';
+import { computed, KeFuMessageContentTypeEnum, reactive, ref, toRefs, unref, watch } from 'vue';
 
 import { UserTypeEnum } from '@vben/constants';
 import { IconifyIcon } from '@vben/icons';
@@ -31,7 +31,6 @@ import { useMallKefuStore } from '#/store/mall/kefu';
 import MessageItem from './message/message-item.vue';
 import OrderItem from './message/order-item.vue';
 import ProductItem from './message/product-item.vue';
-import { KeFuMessageContentTypeEnum } from './tools/constants';
 import { useEmoji } from './tools/emoji';
 import EmojiSelectPopover from './tools/emoji-select-popover.vue';
 import PictureSelectUpload from './tools/picture-select-upload.vue';
diff --git a/apps/web-ele/src/views/mall/promotion/kefu/modules/tools/constants.ts b/apps/web-ele/src/views/mall/promotion/kefu/modules/tools/constants.ts
deleted file mode 100644
index 266a6cf02..000000000
--- a/apps/web-ele/src/views/mall/promotion/kefu/modules/tools/constants.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/** 客服消息类型枚举类 */
-export const KeFuMessageContentTypeEnum = {
-  TEXT: 1, // 文本消息
-  IMAGE: 2, // 图片消息
-  VOICE: 3, // 语音消息
-  VIDEO: 4, // 视频消息
-  SYSTEM: 5, // 系统消息
-  // ========== 商城特殊消息 ==========
-  PRODUCT: 10, //  商品消息
-  ORDER: 11, //  订单消息"
-};
-
-/** Promotion 的 WebSocket 消息类型枚举类 */
-export const WebSocketMessageTypeConstants = {
-  KEFU_MESSAGE_TYPE: 'kefu_message_type', // 客服消息类型
-  KEFU_MESSAGE_ADMIN_READ: 'kefu_message_read_status_change', // 客服消息管理员已读
-};
diff --git a/apps/web-ele/src/views/mes/cal/calendar/components/calendar-date-cell.vue b/apps/web-ele/src/views/mes/cal/calendar/components/calendar-date-cell.vue
index 2b9322bc0..2c7697c83 100644
--- a/apps/web-ele/src/views/mes/cal/calendar/components/calendar-date-cell.vue
+++ b/apps/web-ele/src/views/mes/cal/calendar/components/calendar-date-cell.vue
@@ -3,12 +3,12 @@ import type { MesCalCalendarApi } from '#/api/mes/cal/calendar';
 
 import { computed } from 'vue';
 
+import { MesCalShiftTypeEnum } from '@vben/constants';
+
 import dayjs from 'dayjs';
 import { ElTag } from 'element-plus';
 import { SolarDay } from 'tyme4ts';
 
-import { MesCalShiftTypeEnum } from '#/views/mes/utils/constants';
-
 const props = defineProps<{
   calendarDayMap: Map<string, MesCalCalendarApi.CalendarDay>; // 排班数据
   day: string; // 日期，格式 yyyy-MM-dd
diff --git a/apps/web-ele/src/views/mes/cal/calendar/components/use-calendar.ts b/apps/web-ele/src/views/mes/cal/calendar/components/use-calendar.ts
index 381e7f5bd..860c48a1b 100644
--- a/apps/web-ele/src/views/mes/cal/calendar/components/use-calendar.ts
+++ b/apps/web-ele/src/views/mes/cal/calendar/components/use-calendar.ts
@@ -4,11 +4,12 @@ import type { MesCalCalendarApi } from '#/api/mes/cal/calendar';
 
 import { ref, watch } from 'vue';
 
+import { HolidayType } from '@vben/constants';
+
 import dayjs from 'dayjs';
 
 import { getCalendarList } from '#/api/mes/cal/calendar';
 import { getHolidayList } from '#/api/mes/cal/holiday';
-import { HolidayType } from '#/views/mes/utils/constants';
 
 /**
  * 排班日历通用 composable
diff --git a/apps/web-ele/src/views/mes/cal/holiday/data.ts b/apps/web-ele/src/views/mes/cal/holiday/data.ts
index a16b76999..8927a8845 100644
--- a/apps/web-ele/src/views/mes/cal/holiday/data.ts
+++ b/apps/web-ele/src/views/mes/cal/holiday/data.ts
@@ -1,10 +1,9 @@
 import type { VbenFormSchema } from '#/adapter/form';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, HolidayType } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { z } from '#/adapter/form';
-import { HolidayType } from '#/views/mes/utils/constants';
 
 /** 假期设置表单 */
 export function useHolidayFormSchema(): VbenFormSchema[] {
diff --git a/apps/web-ele/src/views/mes/cal/holiday/index.vue b/apps/web-ele/src/views/mes/cal/holiday/index.vue
index 5c36d8b77..d886d0b3f 100644
--- a/apps/web-ele/src/views/mes/cal/holiday/index.vue
+++ b/apps/web-ele/src/views/mes/cal/holiday/index.vue
@@ -5,13 +5,13 @@ import { computed, onMounted, ref, watch } from 'vue';
 
 import { useAccess } from '@vben/access';
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { HolidayType } from '@vben/constants';
 
 import dayjs from 'dayjs';
 import { ElCalendar, ElMessage, ElTag } from 'element-plus';
 import { SolarDay } from 'tyme4ts';
 
 import { getHolidayList } from '#/api/mes/cal/holiday';
-import { HolidayType } from '#/views/mes/utils/constants';
 
 import HolidayForm from './modules/form.vue';
 
diff --git a/apps/web-ele/src/views/mes/cal/holiday/modules/form.vue b/apps/web-ele/src/views/mes/cal/holiday/modules/form.vue
index 38c8c74b9..7ba966307 100644
--- a/apps/web-ele/src/views/mes/cal/holiday/modules/form.vue
+++ b/apps/web-ele/src/views/mes/cal/holiday/modules/form.vue
@@ -2,13 +2,13 @@
 import type { MesCalHolidayApi } from '#/api/mes/cal/holiday';
 
 import { useVbenModal } from '@vben/common-ui';
+import { HolidayType } from '@vben/constants';
 
 import dayjs from 'dayjs';
 import { ElMessage } from 'element-plus';
 
 import { useVbenForm } from '#/adapter/form';
 import { getHolidayByDay, saveHoliday } from '#/api/mes/cal/holiday';
-import { HolidayType } from '#/views/mes/utils/constants';
 
 import { useHolidayFormSchema } from '../data';
 
diff --git a/apps/web-ele/src/views/mes/cal/plan/data.ts b/apps/web-ele/src/views/mes/cal/plan/data.ts
index 97bdb57de..4e60b04c5 100644
--- a/apps/web-ele/src/views/mes/cal/plan/data.ts
+++ b/apps/web-ele/src/views/mes/cal/plan/data.ts
@@ -4,19 +4,13 @@ import type { MesCalPlanApi } from '#/api/mes/cal/plan';
 
 import { h } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode, MesCalPlanStatusEnum, MesCalShiftMethodEnum, MesCalShiftTypeEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { ElButton } from 'element-plus';
 
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getRangePickerDefaultProps } from '#/utils';
-import {
-  MesAutoCodeRuleCode,
-  MesCalPlanStatusEnum,
-  MesCalShiftMethodEnum,
-  MesCalShiftTypeEnum,
-} from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-ele/src/views/mes/cal/plan/index.vue b/apps/web-ele/src/views/mes/cal/plan/index.vue
index 3a517c6ed..146787fe5 100644
--- a/apps/web-ele/src/views/mes/cal/plan/index.vue
+++ b/apps/web-ele/src/views/mes/cal/plan/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesCalPlanApi } from '#/api/mes/cal/plan';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesCalPlanStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { ElButton, ElLoading, ElMessage } from 'element-plus';
@@ -10,7 +11,6 @@ import { ElButton, ElLoading, ElMessage } from 'element-plus';
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { deletePlan, exportPlan, getPlanPage } from '#/api/mes/cal/plan';
 import { $t } from '#/locales';
-import { MesCalPlanStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-ele/src/views/mes/cal/plan/modules/form.vue b/apps/web-ele/src/views/mes/cal/plan/modules/form.vue
index 433658c5b..6dd67719d 100644
--- a/apps/web-ele/src/views/mes/cal/plan/modules/form.vue
+++ b/apps/web-ele/src/views/mes/cal/plan/modules/form.vue
@@ -6,13 +6,13 @@ import type { MesCalPlanApi } from '#/api/mes/cal/plan';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { MesCalPlanStatusEnum } from '@vben/constants';
 
 import { ElButton, ElMessage, ElPopconfirm, ElTabPane, ElTabs } from 'element-plus';
 
 import { useVbenForm } from '#/adapter/form';
 import { confirmPlan, createPlan, getPlan, updatePlan } from '#/api/mes/cal/plan';
 import { $t } from '#/locales';
-import { MesCalPlanStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 import ShiftList from './shift-list.vue';
diff --git a/apps/web-ele/src/views/mes/cal/team/data.ts b/apps/web-ele/src/views/mes/cal/team/data.ts
index 6f5544162..a0b518750 100644
--- a/apps/web-ele/src/views/mes/cal/team/data.ts
+++ b/apps/web-ele/src/views/mes/cal/team/data.ts
@@ -4,14 +4,13 @@ import type { MesCalTeamApi } from '#/api/mes/cal/team';
 
 import { h } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { ElButton } from 'element-plus';
 
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-ele/src/views/mes/dv/checkplan/data.ts b/apps/web-ele/src/views/mes/dv/checkplan/data.ts
index 9094bd4d8..53dc8da6d 100644
--- a/apps/web-ele/src/views/mes/dv/checkplan/data.ts
+++ b/apps/web-ele/src/views/mes/dv/checkplan/data.ts
@@ -4,7 +4,7 @@ import type { MesDvCheckPlanApi } from '#/api/mes/dv/checkplan';
 
 import { h } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode, MesDvCheckPlanStatusEnum, MesDvSubjectTypeEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { ElButton } from 'element-plus';
@@ -12,11 +12,6 @@ import { ElButton } from 'element-plus';
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getRangePickerDefaultProps } from '#/utils';
-import {
-  MesAutoCodeRuleCode,
-  MesDvCheckPlanStatusEnum,
-  MesDvSubjectTypeEnum,
-} from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-ele/src/views/mes/dv/checkplan/index.vue b/apps/web-ele/src/views/mes/dv/checkplan/index.vue
index 4b0713f73..e420ee95c 100644
--- a/apps/web-ele/src/views/mes/dv/checkplan/index.vue
+++ b/apps/web-ele/src/views/mes/dv/checkplan/index.vue
@@ -4,6 +4,7 @@ import type { MesDvCheckPlanApi } from '#/api/mes/dv/checkplan';
 import type { ActionItem } from '#/components/table-action/typing';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesDvCheckPlanStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { ElButton, ElLoading, ElMessage } from 'element-plus';
@@ -17,7 +18,6 @@ import {
   getCheckPlanPage,
 } from '#/api/mes/dv/checkplan';
 import { $t } from '#/locales';
-import { MesDvCheckPlanStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-ele/src/views/mes/dv/checkplan/modules/form.vue b/apps/web-ele/src/views/mes/dv/checkplan/modules/form.vue
index 179675c36..b5a2900c9 100644
--- a/apps/web-ele/src/views/mes/dv/checkplan/modules/form.vue
+++ b/apps/web-ele/src/views/mes/dv/checkplan/modules/form.vue
@@ -6,13 +6,13 @@ import type { MesDvCheckPlanApi } from '#/api/mes/dv/checkplan';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { MesDvCheckPlanStatusEnum } from '@vben/constants';
 
 import { ElMessage, ElTabPane, ElTabs } from 'element-plus';
 
 import { useVbenForm } from '#/adapter/form';
 import { createCheckPlan, getCheckPlan, updateCheckPlan } from '#/api/mes/dv/checkplan';
 import { $t } from '#/locales';
-import { MesDvCheckPlanStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 import MachineryList from './machinery-list.vue';
diff --git a/apps/web-ele/src/views/mes/dv/checkrecord/data.ts b/apps/web-ele/src/views/mes/dv/checkrecord/data.ts
index dc7b48ae5..04e3d443b 100644
--- a/apps/web-ele/src/views/mes/dv/checkrecord/data.ts
+++ b/apps/web-ele/src/views/mes/dv/checkrecord/data.ts
@@ -4,18 +4,13 @@ import type { MesDvCheckRecordApi } from '#/api/mes/dv/checkrecord';
 
 import { markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesDvCheckPlanStatusEnum, MesDvCheckRecordStatusEnum, MesDvSubjectTypeEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 import { DvCheckPlanSelect } from '#/views/mes/dv/checkplan/components';
 import { DvMachinerySelect } from '#/views/mes/dv/machinery/components';
-import {
-  MesDvCheckPlanStatusEnum,
-  MesDvCheckRecordStatusEnum,
-  MesDvSubjectTypeEnum,
-} from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-ele/src/views/mes/dv/checkrecord/index.vue b/apps/web-ele/src/views/mes/dv/checkrecord/index.vue
index 2a71d2a49..61026800f 100644
--- a/apps/web-ele/src/views/mes/dv/checkrecord/index.vue
+++ b/apps/web-ele/src/views/mes/dv/checkrecord/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesDvCheckRecordApi } from '#/api/mes/dv/checkrecord';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesDvCheckRecordStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { ElButton, ElLoading, ElMessage } from 'element-plus';
@@ -10,7 +11,6 @@ import { ElButton, ElLoading, ElMessage } from 'element-plus';
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { deleteCheckRecord, exportCheckRecord, getCheckRecordPage } from '#/api/mes/dv/checkrecord';
 import { $t } from '#/locales';
-import { MesDvCheckRecordStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-ele/src/views/mes/dv/checkrecord/modules/form.vue b/apps/web-ele/src/views/mes/dv/checkrecord/modules/form.vue
index 67d2874a8..793707ece 100644
--- a/apps/web-ele/src/views/mes/dv/checkrecord/modules/form.vue
+++ b/apps/web-ele/src/views/mes/dv/checkrecord/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesDvCheckRecordApi } from '#/api/mes/dv/checkrecord';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { MesDvCheckRecordStatusEnum } from '@vben/constants';
 
 import { ElButton, ElMessage, ElPopconfirm } from 'element-plus';
 
@@ -17,7 +18,6 @@ import {
   updateCheckRecord,
 } from '#/api/mes/dv/checkrecord';
 import { $t } from '#/locales';
-import { MesDvCheckRecordStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 import LineList from './line-list.vue';
diff --git a/apps/web-ele/src/views/mes/dv/checkrecord/modules/line-list.vue b/apps/web-ele/src/views/mes/dv/checkrecord/modules/line-list.vue
index 42bd2e466..93af8e2a7 100644
--- a/apps/web-ele/src/views/mes/dv/checkrecord/modules/line-list.vue
+++ b/apps/web-ele/src/views/mes/dv/checkrecord/modules/line-list.vue
@@ -2,7 +2,7 @@
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesDvCheckRecordLineApi } from '#/api/mes/dv/checkrecord/line';
 
-import { computed, ref, watch } from 'vue';
+import { computed, MesDvCheckResultEnum, MesDvSubjectTypeEnum, ref, watch } from 'vue';
 
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
@@ -20,7 +20,6 @@ import {
 } from '#/api/mes/dv/checkrecord/line';
 import { $t } from '#/locales';
 import { DvSubjectSelect } from '#/views/mes/dv/subject/components';
-import { MesDvCheckResultEnum, MesDvSubjectTypeEnum } from '#/views/mes/utils/constants';
 
 const props = defineProps<{ disabled?: boolean; recordId: number }>();
 const formOpen = ref(false);
diff --git a/apps/web-ele/src/views/mes/dv/machinery/data.ts b/apps/web-ele/src/views/mes/dv/machinery/data.ts
index be9568d44..1b6871ca2 100644
--- a/apps/web-ele/src/views/mes/dv/machinery/data.ts
+++ b/apps/web-ele/src/views/mes/dv/machinery/data.ts
@@ -4,7 +4,7 @@ import type { MesDvMachineryApi } from '#/api/mes/dv/machinery';
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode, MesDvMachineryStatusEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { ElButton } from 'element-plus';
@@ -12,7 +12,6 @@ import { ElButton } from 'element-plus';
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { MdWorkshopSelect } from '#/views/mes/md/workstation/components';
-import { MesAutoCodeRuleCode, MesDvMachineryStatusEnum } from '#/views/mes/utils/constants';
 
 import { DvMachineryTypeSelect } from './type/components';
 
diff --git a/apps/web-ele/src/views/mes/dv/machinery/modules/form.vue b/apps/web-ele/src/views/mes/dv/machinery/modules/form.vue
index e8727173a..dc257b61d 100644
--- a/apps/web-ele/src/views/mes/dv/machinery/modules/form.vue
+++ b/apps/web-ele/src/views/mes/dv/machinery/modules/form.vue
@@ -6,13 +6,13 @@ import type { MesDvMachineryApi } from '#/api/mes/dv/machinery';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { BarcodeBizTypeEnum } from '@vben/constants';
 
 import { ElButton, ElMessage, ElTabPane, ElTabs } from 'element-plus';
 
 import { useVbenForm } from '#/adapter/form';
 import { createMachinery, getMachinery, updateMachinery } from '#/api/mes/dv/machinery';
 import { $t } from '#/locales';
-import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
 import { BarcodeDetail } from '#/views/mes/wm/barcode/components';
 
 import { useFormSchema } from '../data';
diff --git a/apps/web-ele/src/views/mes/dv/machinery/type/data.ts b/apps/web-ele/src/views/mes/dv/machinery/type/data.ts
index bc7b2e3f5..e5a20b1c7 100644
--- a/apps/web-ele/src/views/mes/dv/machinery/type/data.ts
+++ b/apps/web-ele/src/views/mes/dv/machinery/type/data.ts
@@ -2,9 +2,9 @@ import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesDvMachineryTypeApi } from '#/api/mes/dv/machinery/type';
 
-import { h } from 'vue';
+import { DICT_TYPE, h } from 'vue';
 
-import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { CommonStatusEnum, MesAutoCodeRuleCode } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 import { handleTree } from '@vben/utils';
 
@@ -13,7 +13,6 @@ import { ElButton } from 'element-plus';
 import { z } from '#/adapter/form';
 import { getMachineryTypeList } from '#/api/mes/dv/machinery/type';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
 /** 新增/修改设备类型的表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
diff --git a/apps/web-ele/src/views/mes/dv/maintenrecord/data.ts b/apps/web-ele/src/views/mes/dv/maintenrecord/data.ts
index 59bde5664..4b6c3d4c3 100644
--- a/apps/web-ele/src/views/mes/dv/maintenrecord/data.ts
+++ b/apps/web-ele/src/views/mes/dv/maintenrecord/data.ts
@@ -4,18 +4,13 @@ import type { MesDvMaintenRecordApi } from '#/api/mes/dv/maintenrecord';
 
 import { markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesDvCheckPlanStatusEnum, MesDvMaintenRecordStatusEnum, MesDvSubjectTypeEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 import { DvCheckPlanSelect } from '#/views/mes/dv/checkplan/components';
 import { DvMachinerySelect } from '#/views/mes/dv/machinery/components';
-import {
-  MesDvCheckPlanStatusEnum,
-  MesDvMaintenRecordStatusEnum,
-  MesDvSubjectTypeEnum,
-} from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-ele/src/views/mes/dv/maintenrecord/index.vue b/apps/web-ele/src/views/mes/dv/maintenrecord/index.vue
index 9ecffa447..aad5ba679 100644
--- a/apps/web-ele/src/views/mes/dv/maintenrecord/index.vue
+++ b/apps/web-ele/src/views/mes/dv/maintenrecord/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesDvMaintenRecordApi } from '#/api/mes/dv/maintenrecord';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesDvMaintenRecordStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { ElButton, ElLoading, ElMessage } from 'element-plus';
@@ -14,7 +15,6 @@ import {
   getMaintenRecordPage,
 } from '#/api/mes/dv/maintenrecord';
 import { $t } from '#/locales';
-import { MesDvMaintenRecordStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-ele/src/views/mes/dv/maintenrecord/modules/form.vue b/apps/web-ele/src/views/mes/dv/maintenrecord/modules/form.vue
index 5211903a8..fe465c4b6 100644
--- a/apps/web-ele/src/views/mes/dv/maintenrecord/modules/form.vue
+++ b/apps/web-ele/src/views/mes/dv/maintenrecord/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesDvMaintenRecordApi } from '#/api/mes/dv/maintenrecord';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { MesDvMaintenRecordStatusEnum } from '@vben/constants';
 import { useUserStore } from '@vben/stores';
 
 import { ElButton, ElMessage, ElPopconfirm } from 'element-plus';
@@ -18,7 +19,6 @@ import {
   updateMaintenRecord,
 } from '#/api/mes/dv/maintenrecord';
 import { $t } from '#/locales';
-import { MesDvMaintenRecordStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 import LineList from './line-list.vue';
diff --git a/apps/web-ele/src/views/mes/dv/maintenrecord/modules/line-list.vue b/apps/web-ele/src/views/mes/dv/maintenrecord/modules/line-list.vue
index 1599cd0c6..5f38aaecf 100644
--- a/apps/web-ele/src/views/mes/dv/maintenrecord/modules/line-list.vue
+++ b/apps/web-ele/src/views/mes/dv/maintenrecord/modules/line-list.vue
@@ -2,7 +2,7 @@
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesDvMaintenRecordLineApi } from '#/api/mes/dv/maintenrecord/line';
 
-import { computed, ref, watch } from 'vue';
+import { computed, MesDvMaintenStatusEnum, MesDvSubjectTypeEnum, ref, watch } from 'vue';
 
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
@@ -20,7 +20,6 @@ import {
 } from '#/api/mes/dv/maintenrecord/line';
 import { $t } from '#/locales';
 import { DvSubjectSelect } from '#/views/mes/dv/subject/components';
-import { MesDvMaintenStatusEnum, MesDvSubjectTypeEnum } from '#/views/mes/utils/constants';
 
 const props = defineProps<{ disabled?: boolean; recordId: number }>();
 const formOpen = ref(false);
diff --git a/apps/web-ele/src/views/mes/dv/repair/data.ts b/apps/web-ele/src/views/mes/dv/repair/data.ts
index f43cf83ec..98e1fbe45 100644
--- a/apps/web-ele/src/views/mes/dv/repair/data.ts
+++ b/apps/web-ele/src/views/mes/dv/repair/data.ts
@@ -4,7 +4,7 @@ import type { MesDvRepairApi } from '#/api/mes/dv/repair';
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode, MesDvRepairStatusEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { ElButton } from 'element-plus';
@@ -13,7 +13,6 @@ import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 import { DvMachinerySelect } from '#/views/mes/dv/machinery/components';
-import { MesAutoCodeRuleCode, MesDvRepairStatusEnum } from '#/views/mes/utils/constants';
 /** 表单类型 */
 export type FormType = 'confirm' | 'create' | 'detail' | 'finish' | 'update';
 
diff --git a/apps/web-ele/src/views/mes/dv/repair/index.vue b/apps/web-ele/src/views/mes/dv/repair/index.vue
index d8d4899f6..7e00bf4e5 100644
--- a/apps/web-ele/src/views/mes/dv/repair/index.vue
+++ b/apps/web-ele/src/views/mes/dv/repair/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesDvRepairApi } from '#/api/mes/dv/repair';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesDvRepairStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { ElButton, ElLoading, ElMessage } from 'element-plus';
@@ -10,7 +11,6 @@ import { ElButton, ElLoading, ElMessage } from 'element-plus';
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { deleteRepair, exportRepair, getRepairPage } from '#/api/mes/dv/repair';
 import { $t } from '#/locales';
-import { MesDvRepairStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-ele/src/views/mes/dv/repair/modules/form.vue b/apps/web-ele/src/views/mes/dv/repair/modules/form.vue
index 695138673..a1e0bec11 100644
--- a/apps/web-ele/src/views/mes/dv/repair/modules/form.vue
+++ b/apps/web-ele/src/views/mes/dv/repair/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesDvRepairApi } from '#/api/mes/dv/repair';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { MesDvRepairResultEnum, MesDvRepairStatusEnum } from '@vben/constants';
 
 import { ElButton, ElMessage, ElPopconfirm } from 'element-plus';
 
@@ -19,7 +20,6 @@ import {
   updateRepair,
 } from '#/api/mes/dv/repair';
 import { $t } from '#/locales';
-import { MesDvRepairResultEnum, MesDvRepairStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 import LineList from './line-list.vue';
diff --git a/apps/web-ele/src/views/mes/dv/subject/data.ts b/apps/web-ele/src/views/mes/dv/subject/data.ts
index 4df64c1ed..5a778f118 100644
--- a/apps/web-ele/src/views/mes/dv/subject/data.ts
+++ b/apps/web-ele/src/views/mes/dv/subject/data.ts
@@ -2,16 +2,15 @@ import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesDvSubjectApi } from '#/api/mes/dv/subject';
 
-import { h } from 'vue';
+import { DICT_TYPE, h } from 'vue';
 
-import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { CommonStatusEnum, MesAutoCodeRuleCode, MesDvSubjectTypeEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { ElButton } from 'element-plus';
 
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
-import { MesAutoCodeRuleCode, MesDvSubjectTypeEnum } from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-ele/src/views/mes/home/data.ts b/apps/web-ele/src/views/mes/home/data.ts
index eaa1f27e7..3ad2de089 100644
--- a/apps/web-ele/src/views/mes/home/data.ts
+++ b/apps/web-ele/src/views/mes/home/data.ts
@@ -1,6 +1,6 @@
 import type { MesHomeApi } from '#/api/mes/home';
 
-import { MesProWorkOrderStatusEnum } from '#/views/mes/utils/constants';
+import { MesProWorkOrderStatusEnum } from '@vben/constants';
 
 /** 首页汇总统计默认值 */
 export const defaultSummary: MesHomeApi.Summary = {
diff --git a/apps/web-ele/src/views/mes/md/autocode/data.ts b/apps/web-ele/src/views/mes/md/autocode/data.ts
index 6ad058418..38aa69aee 100644
--- a/apps/web-ele/src/views/mes/md/autocode/data.ts
+++ b/apps/web-ele/src/views/mes/md/autocode/data.ts
@@ -3,11 +3,10 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesMdAutoCodePartApi } from '#/api/mes/md/autocode/part';
 import type { MesMdAutoCodeRuleApi } from '#/api/mes/md/autocode/rule';
 
-import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { CommonStatusEnum, DICT_TYPE, MesAutoCodePartTypeEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { z } from '#/adapter/form';
-import { MesAutoCodePartTypeEnum } from '#/views/mes/utils/constants';
 
 /** 新增/修改编码规则的表单 */
 export function useFormSchema(): VbenFormSchema[] {
diff --git a/apps/web-ele/src/views/mes/md/autocode/modules/part-form.vue b/apps/web-ele/src/views/mes/md/autocode/modules/part-form.vue
index efc1e95a1..17b48c3ba 100644
--- a/apps/web-ele/src/views/mes/md/autocode/modules/part-form.vue
+++ b/apps/web-ele/src/views/mes/md/autocode/modules/part-form.vue
@@ -4,6 +4,7 @@ import type { MesMdAutoCodePartApi } from '#/api/mes/md/autocode/part';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { MesAutoCodePartTypeEnum } from '@vben/constants';
 
 import { ElMessage } from 'element-plus';
 
@@ -14,7 +15,6 @@ import {
   updateAutoCodePart,
 } from '#/api/mes/md/autocode/part';
 import { $t } from '#/locales';
-import { MesAutoCodePartTypeEnum } from '#/views/mes/utils/constants';
 
 import { usePartFormSchema } from '../data';
 
diff --git a/apps/web-ele/src/views/mes/md/client/data.ts b/apps/web-ele/src/views/mes/md/client/data.ts
index 2c8945d32..e254e0576 100644
--- a/apps/web-ele/src/views/mes/md/client/data.ts
+++ b/apps/web-ele/src/views/mes/md/client/data.ts
@@ -2,16 +2,15 @@ import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesMdClientApi } from '#/api/mes/md/client';
 
-import { h } from 'vue';
+import { DICT_TYPE, h } from 'vue';
 
-import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { CommonStatusEnum, MesAutoCodeRuleCode } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { ElButton } from 'element-plus';
 
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-ele/src/views/mes/md/item/data.ts b/apps/web-ele/src/views/mes/md/item/data.ts
index b1143013b..5a6de2a82 100644
--- a/apps/web-ele/src/views/mes/md/item/data.ts
+++ b/apps/web-ele/src/views/mes/md/item/data.ts
@@ -3,9 +3,9 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesMdItemApi } from '#/api/mes/md/item';
 import type { MesMdProductBomApi } from '#/api/mes/md/item/productBom';
 
-import { h, markRaw } from 'vue';
+import { DICT_TYPE, h, markRaw } from 'vue';
 
-import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { CommonStatusEnum, MesAutoCodeRuleCode } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { ElButton } from 'element-plus';
@@ -14,7 +14,6 @@ import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { MdItemTypeSelect } from '#/views/mes/md/item/type/components';
 import { MdUnitMeasureSelect } from '#/views/mes/md/unitmeasure/components';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-ele/src/views/mes/md/item/modules/form.vue b/apps/web-ele/src/views/mes/md/item/modules/form.vue
index 101113e24..423efce70 100644
--- a/apps/web-ele/src/views/mes/md/item/modules/form.vue
+++ b/apps/web-ele/src/views/mes/md/item/modules/form.vue
@@ -6,13 +6,13 @@ import type { MesMdItemApi } from '#/api/mes/md/item';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { BarcodeBizTypeEnum } from '@vben/constants';
 
 import { ElButton, ElEmpty, ElMessage, ElTabPane, ElTabs } from 'element-plus';
 
 import { useVbenForm } from '#/adapter/form';
 import { createItem, getItem, updateItem } from '#/api/mes/md/item';
 import { $t } from '#/locales';
-import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
 import { BarcodeDetail } from '#/views/mes/wm/barcode/components';
 
 import { useFormSchema } from '../data';
diff --git a/apps/web-ele/src/views/mes/md/item/modules/item-batch-config-form.vue b/apps/web-ele/src/views/mes/md/item/modules/item-batch-config-form.vue
index 888492903..139706b7a 100644
--- a/apps/web-ele/src/views/mes/md/item/modules/item-batch-config-form.vue
+++ b/apps/web-ele/src/views/mes/md/item/modules/item-batch-config-form.vue
@@ -5,13 +5,14 @@ import type { MesMdItemBatchConfigApi } from '#/api/mes/md/item/batchConfig';
 
 import { computed, ref, watch } from 'vue';
 
+import { MesItemOrProductEnum } from '@vben/constants';
+
 import { ElButton, ElCheckbox, ElMessage } from 'element-plus';
 
 import {
   getBatchConfigByItemId,
   saveBatchConfig,
 } from '#/api/mes/md/item/batchConfig';
-import { MesItemOrProductEnum } from '#/views/mes/utils/constants';
 
 const props = withDefaults(
   defineProps<{
diff --git a/apps/web-ele/src/views/mes/md/item/type/data.ts b/apps/web-ele/src/views/mes/md/item/type/data.ts
index 7faad1956..bc6152f8e 100644
--- a/apps/web-ele/src/views/mes/md/item/type/data.ts
+++ b/apps/web-ele/src/views/mes/md/item/type/data.ts
@@ -2,9 +2,9 @@ import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesMdItemTypeApi } from '#/api/mes/md/item/type';
 
-import { h } from 'vue';
+import { DICT_TYPE, h } from 'vue';
 
-import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { CommonStatusEnum, MesAutoCodeRuleCode, MesItemOrProductEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 import { handleTree } from '@vben/utils';
 
@@ -13,10 +13,6 @@ import { ElButton } from 'element-plus';
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getItemTypeList } from '#/api/mes/md/item/type';
-import {
-  MesAutoCodeRuleCode,
-  MesItemOrProductEnum,
-} from '#/views/mes/utils/constants';
 
 /** 新增/修改物料分类的表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
diff --git a/apps/web-ele/src/views/mes/md/vendor/data.ts b/apps/web-ele/src/views/mes/md/vendor/data.ts
index c612e8abf..7f10ba16e 100644
--- a/apps/web-ele/src/views/mes/md/vendor/data.ts
+++ b/apps/web-ele/src/views/mes/md/vendor/data.ts
@@ -2,16 +2,15 @@ import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesMdVendorApi } from '#/api/mes/md/vendor';
 
-import { h } from 'vue';
+import { DICT_TYPE, h } from 'vue';
 
-import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { CommonStatusEnum, MesAutoCodeRuleCode } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { ElButton } from 'element-plus';
 
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-ele/src/views/mes/md/workstation/data.ts b/apps/web-ele/src/views/mes/md/workstation/data.ts
index 51ba029ec..f074a6170 100644
--- a/apps/web-ele/src/views/mes/md/workstation/data.ts
+++ b/apps/web-ele/src/views/mes/md/workstation/data.ts
@@ -2,9 +2,9 @@ import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesMdWorkstationApi } from '#/api/mes/md/workstation';
 
-import { h, markRaw } from 'vue';
+import { DICT_TYPE, h, markRaw } from 'vue';
 
-import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { CommonStatusEnum, MesAutoCodeRuleCode } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { ElButton } from 'element-plus';
@@ -15,7 +15,6 @@ import { getWarehouseSimpleList } from '#/api/mes/wm/warehouse';
 import { getWarehouseAreaSimpleList } from '#/api/mes/wm/warehouse/area';
 import { getWarehouseLocationSimpleList } from '#/api/mes/wm/warehouse/location';
 import { ProProcessSelect } from '#/views/mes/pro/process/components';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
 import { MdWorkshopSelect } from './components';
 
diff --git a/apps/web-ele/src/views/mes/md/workstation/index.vue b/apps/web-ele/src/views/mes/md/workstation/index.vue
index 2692caea0..d616f2810 100644
--- a/apps/web-ele/src/views/mes/md/workstation/index.vue
+++ b/apps/web-ele/src/views/mes/md/workstation/index.vue
@@ -5,6 +5,7 @@ import type { MesMdWorkstationApi } from '#/api/mes/md/workstation';
 import { ref } from 'vue';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { BarcodeBizTypeEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { ElButton, ElLoading, ElMessage } from 'element-plus';
@@ -16,7 +17,6 @@ import {
   getWorkstationPage,
 } from '#/api/mes/md/workstation';
 import { $t } from '#/locales';
-import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
 import { BarcodeDetail } from '#/views/mes/wm/barcode/components';
 
 import { useGridColumns, useGridFormSchema } from './data';
diff --git a/apps/web-ele/src/views/mes/md/workstation/modules/form.vue b/apps/web-ele/src/views/mes/md/workstation/modules/form.vue
index 0e24bae46..c3e271308 100644
--- a/apps/web-ele/src/views/mes/md/workstation/modules/form.vue
+++ b/apps/web-ele/src/views/mes/md/workstation/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesMdWorkstationApi } from '#/api/mes/md/workstation';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { BarcodeBizTypeEnum } from '@vben/constants';
 
 import { ElButton, ElMessage, ElTabPane, ElTabs } from 'element-plus';
 
@@ -16,7 +17,6 @@ import {
   updateWorkstation,
 } from '#/api/mes/md/workstation';
 import { $t } from '#/locales';
-import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
 import { BarcodeDetail } from '#/views/mes/wm/barcode/components';
 
 import { useFormSchema } from '../data';
diff --git a/apps/web-ele/src/views/mes/md/workstation/workshop/data.ts b/apps/web-ele/src/views/mes/md/workstation/workshop/data.ts
index 9835ba25f..b7ba9f169 100644
--- a/apps/web-ele/src/views/mes/md/workstation/workshop/data.ts
+++ b/apps/web-ele/src/views/mes/md/workstation/workshop/data.ts
@@ -2,9 +2,9 @@ import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesMdWorkshopApi } from '#/api/mes/md/workstation/workshop';
 
-import { h } from 'vue';
+import { DICT_TYPE, h } from 'vue';
 
-import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { CommonStatusEnum, MesAutoCodeRuleCode } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { ElButton } from 'element-plus';
@@ -12,7 +12,6 @@ import { ElButton } from 'element-plus';
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getSimpleUserList } from '#/api/system/user';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-ele/src/views/mes/md/workstation/workshop/modules/form.vue b/apps/web-ele/src/views/mes/md/workstation/workshop/modules/form.vue
index 3f8fe45cd..b68a4d182 100644
--- a/apps/web-ele/src/views/mes/md/workstation/workshop/modules/form.vue
+++ b/apps/web-ele/src/views/mes/md/workstation/workshop/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesMdWorkshopApi } from '#/api/mes/md/workstation/workshop';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { BarcodeBizTypeEnum } from '@vben/constants';
 
 import { ElButton, ElMessage } from 'element-plus';
 
@@ -16,7 +17,6 @@ import {
   updateWorkshop,
 } from '#/api/mes/md/workstation/workshop';
 import { $t } from '#/locales';
-import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
 import { BarcodeDetail } from '#/views/mes/wm/barcode/components';
 
 import { useFormSchema } from '../data';
diff --git a/apps/web-ele/src/views/mes/pro/andon/record/data.ts b/apps/web-ele/src/views/mes/pro/andon/record/data.ts
index 4947ebf27..4716a3b9f 100644
--- a/apps/web-ele/src/views/mes/pro/andon/record/data.ts
+++ b/apps/web-ele/src/views/mes/pro/andon/record/data.ts
@@ -5,7 +5,7 @@ import type { MesProAndonRecordApi } from '#/api/mes/pro/andon/record';
 
 import { markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesProWorkOrderStatusEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { getSimpleUserList } from '#/api/system/user';
@@ -13,7 +13,6 @@ import { getRangePickerDefaultProps } from '#/utils';
 import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
 import { ProProcessSelect } from '#/views/mes/pro/process/components';
 import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
-import { MesProWorkOrderStatusEnum } from '#/views/mes/utils/constants';
 
 import { AndonConfigSelect } from '../config/components';
 
diff --git a/apps/web-ele/src/views/mes/pro/andon/record/index.vue b/apps/web-ele/src/views/mes/pro/andon/record/index.vue
index d31901204..b7051be55 100644
--- a/apps/web-ele/src/views/mes/pro/andon/record/index.vue
+++ b/apps/web-ele/src/views/mes/pro/andon/record/index.vue
@@ -5,6 +5,7 @@ import type { MesProAndonRecordApi } from '#/api/mes/pro/andon/record';
 import { ref } from 'vue';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesProAndonStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { ElLoading, ElMessage } from 'element-plus';
@@ -16,7 +17,6 @@ import {
   getAndonRecordPage,
 } from '#/api/mes/pro/andon/record';
 import { $t } from '#/locales';
-import { MesProAndonStatusEnum } from '#/views/mes/utils/constants';
 
 import ConfigList from '../config/modules/list.vue';
 import { useGridColumns, useGridFormSchema } from './data';
diff --git a/apps/web-ele/src/views/mes/pro/andon/record/modules/form.vue b/apps/web-ele/src/views/mes/pro/andon/record/modules/form.vue
index 7963930d5..728cc9de2 100644
--- a/apps/web-ele/src/views/mes/pro/andon/record/modules/form.vue
+++ b/apps/web-ele/src/views/mes/pro/andon/record/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesProAndonRecordApi } from '#/api/mes/pro/andon/record';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { MesProAndonStatusEnum } from '@vben/constants';
 import { useUserStore } from '@vben/stores';
 
 import { ElButton, ElMessage, ElPopconfirm } from 'element-plus';
@@ -17,7 +18,6 @@ import {
   updateAndonRecord,
 } from '#/api/mes/pro/andon/record';
 import { $t } from '#/locales';
-import { MesProAndonStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 
diff --git a/apps/web-ele/src/views/mes/pro/card/data.ts b/apps/web-ele/src/views/mes/pro/card/data.ts
index 1bab3d7fc..20d6649fe 100644
--- a/apps/web-ele/src/views/mes/pro/card/data.ts
+++ b/apps/web-ele/src/views/mes/pro/card/data.ts
@@ -5,7 +5,7 @@ import type { MesProCardProcessApi } from '#/api/mes/pro/card/process';
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode, MesProWorkOrderStatusEnum } from '@vben/constants';
 
 import { ElButton } from 'element-plus';
 
@@ -14,10 +14,6 @@ import { MdItemSelect } from '#/views/mes/md/item/components';
 import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
 import { ProProcessSelect } from '#/views/mes/pro/process/components';
 import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
-import {
-  MesAutoCodeRuleCode,
-  MesProWorkOrderStatusEnum,
-} from '#/views/mes/utils/constants';
 import { UserSelect } from '#/views/system/user/components';
 
 /** 表单类型 */
diff --git a/apps/web-ele/src/views/mes/pro/card/index.vue b/apps/web-ele/src/views/mes/pro/card/index.vue
index 3d601f7b0..1973dff43 100644
--- a/apps/web-ele/src/views/mes/pro/card/index.vue
+++ b/apps/web-ele/src/views/mes/pro/card/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesProCardApi } from '#/api/mes/pro/card';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesProCardStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { ElButton, ElLoading, ElMessage } from 'element-plus';
@@ -15,7 +16,6 @@ import {
   getCardPage,
 } from '#/api/mes/pro/card';
 import { $t } from '#/locales';
-import { MesProCardStatusEnum } from '#/views/mes/utils/constants';
 import { PrinterLabel } from '#/views/mes/wm/barcode/components';
 
 import { useGridColumns, useGridFormSchema } from './data';
diff --git a/apps/web-ele/src/views/mes/pro/card/modules/form.vue b/apps/web-ele/src/views/mes/pro/card/modules/form.vue
index be95bc98b..90948c90e 100644
--- a/apps/web-ele/src/views/mes/pro/card/modules/form.vue
+++ b/apps/web-ele/src/views/mes/pro/card/modules/form.vue
@@ -6,6 +6,10 @@ import type { MesProCardApi } from '#/api/mes/pro/card';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import {
+  BarcodeBizTypeEnum,
+  MesProCardStatusEnum,
+} from '@vben/constants';
 
 import { ElButton, ElDivider, ElMessage, ElPopconfirm } from 'element-plus';
 
@@ -18,10 +22,6 @@ import {
   updateCard,
 } from '#/api/mes/pro/card';
 import { $t } from '#/locales';
-import {
-  BarcodeBizTypeEnum,
-  MesProCardStatusEnum,
-} from '#/views/mes/utils/constants';
 import { BarcodeDetail } from '#/views/mes/wm/barcode/components';
 
 import { useFormSchema } from '../data';
diff --git a/apps/web-ele/src/views/mes/pro/feedback/data.ts b/apps/web-ele/src/views/mes/pro/feedback/data.ts
index 21a677ff5..72b6cbebf 100644
--- a/apps/web-ele/src/views/mes/pro/feedback/data.ts
+++ b/apps/web-ele/src/views/mes/pro/feedback/data.ts
@@ -5,7 +5,7 @@ import type { MesProTaskApi } from '#/api/mes/pro/task';
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode, MesProTaskStatusEnum, MesProWorkOrderStatusEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { ElButton } from 'element-plus';
@@ -18,11 +18,6 @@ import { MdItemSelect } from '#/views/mes/md/item/components';
 import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
 import { ProTaskSelect } from '#/views/mes/pro/task/components';
 import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
-import {
-  MesAutoCodeRuleCode,
-  MesProTaskStatusEnum,
-  MesProWorkOrderStatusEnum,
-} from '#/views/mes/utils/constants';
 
 /** 生产报工表单类型 */
 export type FormType = 'approve' | 'create' | 'detail' | 'submit' | 'update';
diff --git a/apps/web-ele/src/views/mes/pro/feedback/index.vue b/apps/web-ele/src/views/mes/pro/feedback/index.vue
index ef65e4629..cffe856a4 100644
--- a/apps/web-ele/src/views/mes/pro/feedback/index.vue
+++ b/apps/web-ele/src/views/mes/pro/feedback/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesProFeedbackApi } from '#/api/mes/pro/feedback';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesProFeedbackStatusEnum } from '@vben/constants';
 import { useUserStore } from '@vben/stores';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
@@ -15,7 +16,6 @@ import {
   getFeedbackPage,
 } from '#/api/mes/pro/feedback';
 import { $t } from '#/locales';
-import { MesProFeedbackStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-ele/src/views/mes/pro/feedback/modules/form.vue b/apps/web-ele/src/views/mes/pro/feedback/modules/form.vue
index 879223439..99591e9eb 100644
--- a/apps/web-ele/src/views/mes/pro/feedback/modules/form.vue
+++ b/apps/web-ele/src/views/mes/pro/feedback/modules/form.vue
@@ -6,6 +6,10 @@ import type { MesProFeedbackApi } from '#/api/mes/pro/feedback';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import {
+  MesAutoCodeRuleCode,
+  MesProFeedbackStatusEnum,
+} from '@vben/constants';
 import { useUserStore } from '@vben/stores';
 
 import {
@@ -28,10 +32,6 @@ import {
 } from '#/api/mes/pro/feedback';
 import { getRouteProcessByRouteAndProcess } from '#/api/mes/pro/route/process';
 import { $t } from '#/locales';
-import {
-  MesAutoCodeRuleCode,
-  MesProFeedbackStatusEnum,
-} from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 import ItemConsumeList from './item-consume-list.vue';
diff --git a/apps/web-ele/src/views/mes/pro/process/data.ts b/apps/web-ele/src/views/mes/pro/process/data.ts
index d58db63a5..b56653275 100644
--- a/apps/web-ele/src/views/mes/pro/process/data.ts
+++ b/apps/web-ele/src/views/mes/pro/process/data.ts
@@ -3,16 +3,15 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesProProcessApi } from '#/api/mes/pro/process';
 import type { MesProProcessContentApi } from '#/api/mes/pro/process/content';
 
-import { h } from 'vue';
+import { DICT_TYPE, h } from 'vue';
 
-import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { CommonStatusEnum, MesAutoCodeRuleCode } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { ElButton } from 'element-plus';
 
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-ele/src/views/mes/pro/route/data.ts b/apps/web-ele/src/views/mes/pro/route/data.ts
index bb1c8ab3d..dad418087 100644
--- a/apps/web-ele/src/views/mes/pro/route/data.ts
+++ b/apps/web-ele/src/views/mes/pro/route/data.ts
@@ -5,9 +5,9 @@ import type { MesProRouteProcessApi } from '#/api/mes/pro/route/process';
 import type { MesProRouteProductApi } from '#/api/mes/pro/route/product';
 import type { MesProRouteProductBomApi } from '#/api/mes/pro/route/productbom';
 
-import { h } from 'vue';
+import { DICT_TYPE, h } from 'vue';
 
-import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { CommonStatusEnum, MesAutoCodeRuleCode } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { ElButton } from 'element-plus';
@@ -18,7 +18,6 @@ import {
   MdItemSelect,
   MdProductBomSelect,
 } from '#/views/mes/md/item/components';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
 import { RouteColorPicker } from './components';
 
diff --git a/apps/web-ele/src/views/mes/pro/task/components/gantt-chart.vue b/apps/web-ele/src/views/mes/pro/task/components/gantt-chart.vue
index 573f68d51..dca1347c9 100644
--- a/apps/web-ele/src/views/mes/pro/task/components/gantt-chart.vue
+++ b/apps/web-ele/src/views/mes/pro/task/components/gantt-chart.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup>
 import { onBeforeUnmount, onMounted, ref, watch } from 'vue';
 
-import { gantt } from 'dhtmlx-gantt';
+import { BarcodeBizTypeEnum } from '@vben/constants';
 
-import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
+import { gantt } from 'dhtmlx-gantt';
 
 import 'dhtmlx-gantt/codebase/dhtmlxgantt.css';
 
diff --git a/apps/web-ele/src/views/mes/pro/task/index.vue b/apps/web-ele/src/views/mes/pro/task/index.vue
index d59becc30..8d29ccf3e 100644
--- a/apps/web-ele/src/views/mes/pro/task/index.vue
+++ b/apps/web-ele/src/views/mes/pro/task/index.vue
@@ -6,16 +6,16 @@ import { onMounted, ref } from 'vue';
 import { useRouter } from 'vue-router';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import {
+  MesProWorkOrderStatusEnum,
+  MesProWorkOrderTypeEnum,
+} from '@vben/constants';
 
 import { ElButton, ElCard } from 'element-plus';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getGanttTaskList } from '#/api/mes/pro/task';
 import { getWorkOrderPage } from '#/api/mes/pro/workorder';
-import {
-  MesProWorkOrderStatusEnum,
-  MesProWorkOrderTypeEnum,
-} from '#/views/mes/utils/constants';
 
 import GanttChart from './components/gantt-chart.vue';
 import { useGridColumns, useGridFormSchema } from './data';
diff --git a/apps/web-ele/src/views/mes/pro/workorder/data.ts b/apps/web-ele/src/views/mes/pro/workorder/data.ts
index 1c0884d47..87ffca1e7 100644
--- a/apps/web-ele/src/views/mes/pro/workorder/data.ts
+++ b/apps/web-ele/src/views/mes/pro/workorder/data.ts
@@ -6,7 +6,7 @@ import type { MesProWorkOrderBomApi } from '#/api/mes/pro/workorder/bom';
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode, MesProWorkOrderSourceTypeEnum, MesProWorkOrderTypeEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { ElButton } from 'element-plus';
@@ -16,11 +16,6 @@ import { getRangePickerDefaultProps } from '#/utils';
 import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
 import { MdItemSelect, MdProductBomSelect } from '#/views/mes/md/item/components';
 import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
-import {
-  MesAutoCodeRuleCode,
-  MesProWorkOrderSourceTypeEnum,
-  MesProWorkOrderTypeEnum,
-} from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'confirm' | 'create' | 'detail' | 'finish' | 'update';
diff --git a/apps/web-ele/src/views/mes/pro/workorder/index.vue b/apps/web-ele/src/views/mes/pro/workorder/index.vue
index 3f7e02c25..4771baa87 100644
--- a/apps/web-ele/src/views/mes/pro/workorder/index.vue
+++ b/apps/web-ele/src/views/mes/pro/workorder/index.vue
@@ -5,6 +5,11 @@ import type { MesProWorkOrderApi } from '#/api/mes/pro/workorder';
 import { ref } from 'vue';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import {
+  BarcodeBizTypeEnum,
+  MesProWorkOrderStatusEnum,
+  MesProWorkOrderTypeEnum,
+} from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { ElButton, ElLoading, ElMessage } from 'element-plus';
@@ -17,11 +22,6 @@ import {
   getWorkOrderPage,
 } from '#/api/mes/pro/workorder';
 import { $t } from '#/locales';
-import {
-  BarcodeBizTypeEnum,
-  MesProWorkOrderStatusEnum,
-  MesProWorkOrderTypeEnum,
-} from '#/views/mes/utils/constants';
 import { BarcodeDetail } from '#/views/mes/wm/barcode/components';
 
 import { useGridColumns, useGridFormSchema } from './data';
diff --git a/apps/web-ele/src/views/mes/pro/workorder/modules/bom-list.vue b/apps/web-ele/src/views/mes/pro/workorder/modules/bom-list.vue
index 7b8e63476..5f7866789 100644
--- a/apps/web-ele/src/views/mes/pro/workorder/modules/bom-list.vue
+++ b/apps/web-ele/src/views/mes/pro/workorder/modules/bom-list.vue
@@ -8,6 +8,10 @@ import type { MesProWorkOrderBomApi } from '#/api/mes/pro/workorder/bom';
 import { computed } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import {
+  MesProWorkOrderStatusEnum,
+  MesProWorkOrderTypeEnum,
+} from '@vben/constants';
 
 import { ElLoading, ElMessage } from 'element-plus';
 
@@ -17,10 +21,6 @@ import {
   getWorkOrderBomPage,
 } from '#/api/mes/pro/workorder/bom';
 import { $t } from '#/locales';
-import {
-  MesProWorkOrderStatusEnum,
-  MesProWorkOrderTypeEnum,
-} from '#/views/mes/utils/constants';
 
 import { useBomGridColumns } from '../data';
 import BomForm from './bom-form.vue';
diff --git a/apps/web-ele/src/views/mes/pro/workorder/modules/form.vue b/apps/web-ele/src/views/mes/pro/workorder/modules/form.vue
index 79be48a28..005c0d6b9 100644
--- a/apps/web-ele/src/views/mes/pro/workorder/modules/form.vue
+++ b/apps/web-ele/src/views/mes/pro/workorder/modules/form.vue
@@ -7,6 +7,10 @@ import type { MesProWorkOrderBomApi } from '#/api/mes/pro/workorder/bom';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import {
+  BarcodeBizTypeEnum,
+  MesProWorkOrderStatusEnum,
+} from '@vben/constants';
 
 import {
   ElButton,
@@ -25,10 +29,6 @@ import {
   updateWorkOrder,
 } from '#/api/mes/pro/workorder';
 import { $t } from '#/locales';
-import {
-  BarcodeBizTypeEnum,
-  MesProWorkOrderStatusEnum,
-} from '#/views/mes/utils/constants';
 import { BarcodeDetail } from '#/views/mes/wm/barcode/components';
 
 import { useFormSchema } from '../data';
diff --git a/apps/web-ele/src/views/mes/pro/workrecord/components/work-record-status-bar.vue b/apps/web-ele/src/views/mes/pro/workrecord/components/work-record-status-bar.vue
index 53bceb42d..b778048f8 100644
--- a/apps/web-ele/src/views/mes/pro/workrecord/components/work-record-status-bar.vue
+++ b/apps/web-ele/src/views/mes/pro/workrecord/components/work-record-status-bar.vue
@@ -4,6 +4,7 @@ import type { MesProWorkRecordApi } from '#/api/mes/pro/workrecord';
 import { computed, onMounted, ref } from 'vue';
 
 import { confirm } from '@vben/common-ui';
+import { MesProWorkRecordTypeEnum } from '@vben/constants';
 import { IconifyIcon } from '@vben/icons';
 import { formatDateTime } from '@vben/utils';
 
@@ -15,7 +16,6 @@ import {
   getMyWorkRecord,
 } from '#/api/mes/pro/workrecord';
 import MdWorkstationSelect from '#/views/mes/md/workstation/components/md-workstation-select.vue';
-import { MesProWorkRecordTypeEnum } from '#/views/mes/utils/constants';
 
 const emit = defineEmits<{
   (e: 'change'): void;
diff --git a/apps/web-ele/src/views/mes/qc/defect/data.ts b/apps/web-ele/src/views/mes/qc/defect/data.ts
index 848e0b0ee..2fd595d28 100644
--- a/apps/web-ele/src/views/mes/qc/defect/data.ts
+++ b/apps/web-ele/src/views/mes/qc/defect/data.ts
@@ -4,13 +4,12 @@ import type { MesQcDefectApi } from '#/api/mes/qc/defect';
 
 import { h } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { ElButton } from 'element-plus';
 
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
 /** 新增/修改的表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
diff --git a/apps/web-ele/src/views/mes/qc/indicator/data.ts b/apps/web-ele/src/views/mes/qc/indicator/data.ts
index 48819cef0..caf816c66 100644
--- a/apps/web-ele/src/views/mes/qc/indicator/data.ts
+++ b/apps/web-ele/src/views/mes/qc/indicator/data.ts
@@ -4,17 +4,13 @@ import type { MesQcIndicatorApi } from '#/api/mes/qc/indicator';
 
 import { h } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode, MesQcResultValueType } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { ElButton } from 'element-plus';
 
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getSimpleDictTypeList } from '#/api/system/dict/type';
-import {
-  MesAutoCodeRuleCode,
-  MesQcResultValueType,
-} from '#/views/mes/utils/constants';
 
 /** 新增/修改的表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
diff --git a/apps/web-ele/src/views/mes/qc/indicatorresult/components/data.ts b/apps/web-ele/src/views/mes/qc/indicatorresult/components/data.ts
index 7a6779885..d325df7d5 100644
--- a/apps/web-ele/src/views/mes/qc/indicatorresult/components/data.ts
+++ b/apps/web-ele/src/views/mes/qc/indicatorresult/components/data.ts
@@ -4,10 +4,11 @@ import type { MesQcIndicatorResultApi } from '#/api/mes/qc/indicatorresult';
 
 import { h } from 'vue';
 
+import { MesAutoCodeRuleCode } from '@vben/constants';
+
 import { ElButton } from 'element-plus';
 
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'update';
diff --git a/apps/web-ele/src/views/mes/qc/indicatorresult/components/qc-indicator-result-form.vue b/apps/web-ele/src/views/mes/qc/indicatorresult/components/qc-indicator-result-form.vue
index a7cc9dfba..35788a063 100644
--- a/apps/web-ele/src/views/mes/qc/indicatorresult/components/qc-indicator-result-form.vue
+++ b/apps/web-ele/src/views/mes/qc/indicatorresult/components/qc-indicator-result-form.vue
@@ -6,6 +6,7 @@ import type { MesQcIndicatorResultApi } from '#/api/mes/qc/indicatorresult';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { MesQcResultValueType } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import {
@@ -26,7 +27,6 @@ import {
   updateIndicatorResult,
 } from '#/api/mes/qc/indicatorresult';
 import { $t } from '#/locales';
-import { MesQcResultValueType } from '#/views/mes/utils/constants';
 
 import { useQcIndicatorResultFormSchema } from './data';
 
diff --git a/apps/web-ele/src/views/mes/qc/ipqc/data.ts b/apps/web-ele/src/views/mes/qc/ipqc/data.ts
index 4f8f3b7e5..05cf9d534 100644
--- a/apps/web-ele/src/views/mes/qc/ipqc/data.ts
+++ b/apps/web-ele/src/views/mes/qc/ipqc/data.ts
@@ -5,7 +5,7 @@ import type { MesQcIpqcLineApi } from '#/api/mes/qc/ipqc/line';
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode, MesProTaskStatusEnum, MesProWorkOrderStatusEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { ElButton } from 'element-plus';
@@ -16,11 +16,6 @@ import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
 import MdWorkstationSelect from '#/views/mes/md/workstation/components/md-workstation-select.vue';
 import ProTaskSelect from '#/views/mes/pro/task/components/pro-task-select.vue';
 import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
-import {
-  MesAutoCodeRuleCode,
-  MesProTaskStatusEnum,
-  MesProWorkOrderStatusEnum,
-} from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-ele/src/views/mes/qc/ipqc/index.vue b/apps/web-ele/src/views/mes/qc/ipqc/index.vue
index 5cf39a502..f00294568 100644
--- a/apps/web-ele/src/views/mes/qc/ipqc/index.vue
+++ b/apps/web-ele/src/views/mes/qc/ipqc/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesQcIpqcApi } from '#/api/mes/qc/ipqc';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesQcStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { ElButton, ElLoading, ElMessage } from 'element-plus';
@@ -10,7 +11,6 @@ import { ElButton, ElLoading, ElMessage } from 'element-plus';
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { deleteIpqc, exportIpqc, getIpqcPage } from '#/api/mes/qc/ipqc';
 import { $t } from '#/locales';
-import { MesQcStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-ele/src/views/mes/qc/ipqc/modules/form.vue b/apps/web-ele/src/views/mes/qc/ipqc/modules/form.vue
index 0bb0f75ca..b9fe9824e 100644
--- a/apps/web-ele/src/views/mes/qc/ipqc/modules/form.vue
+++ b/apps/web-ele/src/views/mes/qc/ipqc/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesQcIpqcApi } from '#/api/mes/qc/ipqc';
 import { computed, ref } from 'vue';
 
 import { confirm, useVbenModal } from '@vben/common-ui';
+import { MesQcStatusEnum, MesQcTypeEnum } from '@vben/constants';
 
 import {
   ElButton,
@@ -24,7 +25,6 @@ import {
   updateIpqc,
 } from '#/api/mes/qc/ipqc';
 import { $t } from '#/locales';
-import { MesQcStatusEnum, MesQcTypeEnum } from '#/views/mes/utils/constants';
 
 import { QcIndicatorResultList } from '../../indicatorresult/components';
 import { useFormSchema } from '../data';
diff --git a/apps/web-ele/src/views/mes/qc/ipqc/modules/line-list.vue b/apps/web-ele/src/views/mes/qc/ipqc/modules/line-list.vue
index 1008e517b..1eb7e4ea6 100644
--- a/apps/web-ele/src/views/mes/qc/ipqc/modules/line-list.vue
+++ b/apps/web-ele/src/views/mes/qc/ipqc/modules/line-list.vue
@@ -3,10 +3,10 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesQcIpqcLineApi } from '#/api/mes/qc/ipqc/line';
 
 import { useVbenModal } from '@vben/common-ui';
+import { MesQcTypeEnum } from '@vben/constants';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getIpqcLinePage } from '#/api/mes/qc/ipqc/line';
-import { MesQcTypeEnum } from '#/views/mes/utils/constants';
 
 import { DefectRecordInlineList } from '../../defectrecord/components';
 import { type FormType, useLineGridColumns } from '../data';
diff --git a/apps/web-ele/src/views/mes/qc/iqc/data.ts b/apps/web-ele/src/views/mes/qc/iqc/data.ts
index c95250a6e..7265d1ab5 100644
--- a/apps/web-ele/src/views/mes/qc/iqc/data.ts
+++ b/apps/web-ele/src/views/mes/qc/iqc/data.ts
@@ -5,7 +5,7 @@ import type { MesQcIqcLineApi } from '#/api/mes/qc/iqc/line';
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { ElButton } from 'element-plus';
@@ -15,7 +15,6 @@ import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
 import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-ele/src/views/mes/qc/iqc/index.vue b/apps/web-ele/src/views/mes/qc/iqc/index.vue
index eadb60428..1db4d1ee4 100644
--- a/apps/web-ele/src/views/mes/qc/iqc/index.vue
+++ b/apps/web-ele/src/views/mes/qc/iqc/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesQcIqcApi } from '#/api/mes/qc/iqc';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesQcStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { ElButton, ElLoading, ElMessage } from 'element-plus';
@@ -10,7 +11,6 @@ import { ElButton, ElLoading, ElMessage } from 'element-plus';
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { deleteIqc, exportIqc, getIqcPage } from '#/api/mes/qc/iqc';
 import { $t } from '#/locales';
-import { MesQcStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-ele/src/views/mes/qc/iqc/modules/form.vue b/apps/web-ele/src/views/mes/qc/iqc/modules/form.vue
index 246a26cc7..7f4244197 100644
--- a/apps/web-ele/src/views/mes/qc/iqc/modules/form.vue
+++ b/apps/web-ele/src/views/mes/qc/iqc/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesQcIqcApi } from '#/api/mes/qc/iqc';
 import { computed, ref } from 'vue';
 
 import { confirm, useVbenModal } from '@vben/common-ui';
+import { MesQcStatusEnum, MesQcTypeEnum } from '@vben/constants';
 
 import {
   ElButton,
@@ -24,7 +25,6 @@ import {
   updateIqc,
 } from '#/api/mes/qc/iqc';
 import { $t } from '#/locales';
-import { MesQcStatusEnum, MesQcTypeEnum } from '#/views/mes/utils/constants';
 
 import { QcIndicatorResultList } from '../../indicatorresult/components';
 import { useFormSchema } from '../data';
diff --git a/apps/web-ele/src/views/mes/qc/iqc/modules/line-list.vue b/apps/web-ele/src/views/mes/qc/iqc/modules/line-list.vue
index fb1d7bcbc..b627daf43 100644
--- a/apps/web-ele/src/views/mes/qc/iqc/modules/line-list.vue
+++ b/apps/web-ele/src/views/mes/qc/iqc/modules/line-list.vue
@@ -3,10 +3,10 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesQcIqcLineApi } from '#/api/mes/qc/iqc/line';
 
 import { useVbenModal } from '@vben/common-ui';
+import { MesQcTypeEnum } from '@vben/constants';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getIqcLinePage } from '#/api/mes/qc/iqc/line';
-import { MesQcTypeEnum } from '#/views/mes/utils/constants';
 
 import { DefectRecordInlineList } from '../../defectrecord/components';
 import { type FormType, useLineGridColumns } from '../data';
diff --git a/apps/web-ele/src/views/mes/qc/oqc/data.ts b/apps/web-ele/src/views/mes/qc/oqc/data.ts
index 25654bfbc..45ff7afc6 100644
--- a/apps/web-ele/src/views/mes/qc/oqc/data.ts
+++ b/apps/web-ele/src/views/mes/qc/oqc/data.ts
@@ -5,7 +5,7 @@ import type { MesQcOqcLineApi } from '#/api/mes/qc/oqc/line';
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { ElButton } from 'element-plus';
@@ -14,7 +14,6 @@ import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getSimpleUserList } from '#/api/system/user';
 import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
 import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-ele/src/views/mes/qc/oqc/index.vue b/apps/web-ele/src/views/mes/qc/oqc/index.vue
index f736d25c1..3fae91e3c 100644
--- a/apps/web-ele/src/views/mes/qc/oqc/index.vue
+++ b/apps/web-ele/src/views/mes/qc/oqc/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesQcOqcApi } from '#/api/mes/qc/oqc';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesQcStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { ElButton, ElLoading, ElMessage } from 'element-plus';
@@ -10,7 +11,6 @@ import { ElButton, ElLoading, ElMessage } from 'element-plus';
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { deleteOqc, exportOqc, getOqcPage } from '#/api/mes/qc/oqc';
 import { $t } from '#/locales';
-import { MesQcStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-ele/src/views/mes/qc/oqc/modules/form.vue b/apps/web-ele/src/views/mes/qc/oqc/modules/form.vue
index b61273f7d..e2bb0b551 100644
--- a/apps/web-ele/src/views/mes/qc/oqc/modules/form.vue
+++ b/apps/web-ele/src/views/mes/qc/oqc/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesQcOqcApi } from '#/api/mes/qc/oqc';
 import { computed, ref } from 'vue';
 
 import { confirm, useVbenModal } from '@vben/common-ui';
+import { MesQcStatusEnum, MesQcTypeEnum } from '@vben/constants';
 
 import {
   ElButton,
@@ -24,7 +25,6 @@ import {
   updateOqc,
 } from '#/api/mes/qc/oqc';
 import { $t } from '#/locales';
-import { MesQcStatusEnum, MesQcTypeEnum } from '#/views/mes/utils/constants';
 
 import { QcIndicatorResultList } from '../../indicatorresult/components';
 import { useFormSchema } from '../data';
diff --git a/apps/web-ele/src/views/mes/qc/oqc/modules/line-list.vue b/apps/web-ele/src/views/mes/qc/oqc/modules/line-list.vue
index 602ba913d..7c3ebc3e8 100644
--- a/apps/web-ele/src/views/mes/qc/oqc/modules/line-list.vue
+++ b/apps/web-ele/src/views/mes/qc/oqc/modules/line-list.vue
@@ -3,10 +3,10 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesQcOqcLineApi } from '#/api/mes/qc/oqc/line';
 
 import { useVbenModal } from '@vben/common-ui';
+import { MesQcTypeEnum } from '@vben/constants';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getOqcLinePage } from '#/api/mes/qc/oqc/line';
-import { MesQcTypeEnum } from '#/views/mes/utils/constants';
 
 import { DefectRecordInlineList } from '../../defectrecord/components';
 import { type FormType, useLineGridColumns } from '../data';
diff --git a/apps/web-ele/src/views/mes/qc/pendinginspect/index.vue b/apps/web-ele/src/views/mes/qc/pendinginspect/index.vue
index 8363fd201..b765a6da5 100644
--- a/apps/web-ele/src/views/mes/qc/pendinginspect/index.vue
+++ b/apps/web-ele/src/views/mes/qc/pendinginspect/index.vue
@@ -7,10 +7,10 @@ import type { MesQcPendingInspectApi } from '#/api/mes/qc/pendinginspect';
 import type { MesQcRqcApi } from '#/api/mes/qc/rqc';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesQcTypeEnum } from '@vben/constants';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getPendingInspectPage } from '#/api/mes/qc/pendinginspect';
-import { MesQcTypeEnum } from '#/views/mes/utils/constants';
 
 import IpqcForm from '../ipqc/modules/form.vue';
 import IqcForm from '../iqc/modules/form.vue';
diff --git a/apps/web-ele/src/views/mes/qc/rqc/data.ts b/apps/web-ele/src/views/mes/qc/rqc/data.ts
index 7a7c6177e..3992b8131 100644
--- a/apps/web-ele/src/views/mes/qc/rqc/data.ts
+++ b/apps/web-ele/src/views/mes/qc/rqc/data.ts
@@ -5,7 +5,7 @@ import type { MesQcRqcLineApi } from '#/api/mes/qc/rqc/line';
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode, MesQcSourceDocTypeEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { ElButton } from 'element-plus';
@@ -13,10 +13,6 @@ import { ElButton } from 'element-plus';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getSimpleUserList } from '#/api/system/user';
 import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
-import {
-  MesAutoCodeRuleCode,
-  MesQcSourceDocTypeEnum,
-} from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-ele/src/views/mes/qc/rqc/index.vue b/apps/web-ele/src/views/mes/qc/rqc/index.vue
index 7621abb5c..164391422 100644
--- a/apps/web-ele/src/views/mes/qc/rqc/index.vue
+++ b/apps/web-ele/src/views/mes/qc/rqc/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesQcRqcApi } from '#/api/mes/qc/rqc';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesQcStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { ElButton, ElLoading, ElMessage } from 'element-plus';
@@ -10,7 +11,6 @@ import { ElButton, ElLoading, ElMessage } from 'element-plus';
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { deleteRqc, exportRqc, getRqcPage } from '#/api/mes/qc/rqc';
 import { $t } from '#/locales';
-import { MesQcStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-ele/src/views/mes/qc/rqc/modules/form.vue b/apps/web-ele/src/views/mes/qc/rqc/modules/form.vue
index 84f383020..72e1eb760 100644
--- a/apps/web-ele/src/views/mes/qc/rqc/modules/form.vue
+++ b/apps/web-ele/src/views/mes/qc/rqc/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesQcRqcApi } from '#/api/mes/qc/rqc';
 import { computed, ref } from 'vue';
 
 import { confirm, useVbenModal } from '@vben/common-ui';
+import { MesQcStatusEnum, MesQcTypeEnum } from '@vben/constants';
 
 import {
   ElButton,
@@ -24,7 +25,6 @@ import {
   updateRqc,
 } from '#/api/mes/qc/rqc';
 import { $t } from '#/locales';
-import { MesQcStatusEnum, MesQcTypeEnum } from '#/views/mes/utils/constants';
 
 import { QcIndicatorResultList } from '../../indicatorresult/components';
 import { useFormSchema } from '../data';
diff --git a/apps/web-ele/src/views/mes/qc/rqc/modules/line-list.vue b/apps/web-ele/src/views/mes/qc/rqc/modules/line-list.vue
index 3ca1ab744..fe106a5e5 100644
--- a/apps/web-ele/src/views/mes/qc/rqc/modules/line-list.vue
+++ b/apps/web-ele/src/views/mes/qc/rqc/modules/line-list.vue
@@ -3,10 +3,10 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesQcRqcLineApi } from '#/api/mes/qc/rqc/line';
 
 import { useVbenModal } from '@vben/common-ui';
+import { MesQcTypeEnum } from '@vben/constants';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getRqcLinePage } from '#/api/mes/qc/rqc/line';
-import { MesQcTypeEnum } from '#/views/mes/utils/constants';
 
 import { DefectRecordInlineList } from '../../defectrecord/components';
 import { type FormType, useLineGridColumns } from '../data';
diff --git a/apps/web-ele/src/views/mes/qc/template/data.ts b/apps/web-ele/src/views/mes/qc/template/data.ts
index 91b66d858..170dbfec1 100644
--- a/apps/web-ele/src/views/mes/qc/template/data.ts
+++ b/apps/web-ele/src/views/mes/qc/template/data.ts
@@ -4,9 +4,9 @@ import type { MesQcTemplateApi } from '#/api/mes/qc/template';
 import type { MesQcTemplateIndicatorApi } from '#/api/mes/qc/template/indicator';
 import type { MesQcTemplateItemApi } from '#/api/mes/qc/template/item';
 
-import { h, markRaw } from 'vue';
+import { DICT_TYPE, h, markRaw } from 'vue';
 
-import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { CommonStatusEnum, MesAutoCodeRuleCode } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { ElButton } from 'element-plus';
@@ -16,7 +16,6 @@ import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
 import MdUnitMeasureSelect from '#/views/mes/md/unitmeasure/components/md-unit-measure-select.vue';
 import QcIndicatorSelect from '#/views/mes/qc/indicator/components/qc-indicator-select.vue';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-ele/src/views/mes/tm/tool/data.ts b/apps/web-ele/src/views/mes/tm/tool/data.ts
index 73d57ad13..514205966 100644
--- a/apps/web-ele/src/views/mes/tm/tool/data.ts
+++ b/apps/web-ele/src/views/mes/tm/tool/data.ts
@@ -4,7 +4,7 @@ import type { MesTmToolApi } from '#/api/mes/tm/tool';
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode, MesMaintenTypeEnum, MesToolStatusEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 import { formatDateTime } from '@vben/utils';
 
@@ -12,11 +12,6 @@ import { ElButton } from 'element-plus';
 
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
-import {
-  MesAutoCodeRuleCode,
-  MesMaintenTypeEnum,
-  MesToolStatusEnum,
-} from '#/views/mes/utils/constants';
 
 import { TmToolTypeSelect } from './type/components';
 
diff --git a/apps/web-ele/src/views/mes/tm/tool/modules/form.vue b/apps/web-ele/src/views/mes/tm/tool/modules/form.vue
index ccb2b405e..bc6765efa 100644
--- a/apps/web-ele/src/views/mes/tm/tool/modules/form.vue
+++ b/apps/web-ele/src/views/mes/tm/tool/modules/form.vue
@@ -6,13 +6,13 @@ import type { MesTmToolApi } from '#/api/mes/tm/tool';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { BarcodeBizTypeEnum } from '@vben/constants';
 
 import { ElButton, ElMessage } from 'element-plus';
 
 import { useVbenForm } from '#/adapter/form';
 import { createTool, getTool, updateTool } from '#/api/mes/tm/tool';
 import { $t } from '#/locales';
-import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
 import { BarcodeDetail } from '#/views/mes/wm/barcode/components';
 
 import { useFormSchema } from '../data';
diff --git a/apps/web-ele/src/views/mes/tm/tool/type/data.ts b/apps/web-ele/src/views/mes/tm/tool/type/data.ts
index ad2e3900a..f06a407de 100644
--- a/apps/web-ele/src/views/mes/tm/tool/type/data.ts
+++ b/apps/web-ele/src/views/mes/tm/tool/type/data.ts
@@ -4,14 +4,13 @@ import type { MesTmToolTypeApi } from '#/api/mes/tm/tool/type';
 
 import { h } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode, MesMaintenTypeEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { ElButton } from 'element-plus';
 
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
-import { MesAutoCodeRuleCode, MesMaintenTypeEnum } from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-ele/src/views/mes/utils/constants.ts b/apps/web-ele/src/views/mes/utils/constants.ts
deleted file mode 100644
index 0e4703326..000000000
--- a/apps/web-ele/src/views/mes/utils/constants.ts
+++ /dev/null
@@ -1,504 +0,0 @@
-/** MES 单据状态常量 */
-export const MesOrderStatusConstants = {
-  DRAFT: 0,
-  CONFIRMED: 1,
-  APPROVING: 2,
-  APPROVED: 3,
-  FINISHED: 4,
-  CANCELLED: 5,
-} as const;
-
-/** MES 物料/产品标识枚举 */
-export const MesItemOrProductEnum = {
-  ITEM: {
-    label: '物料',
-    value: 'ITEM',
-  },
-  PRODUCT: {
-    label: '产品',
-    value: 'PRODUCT',
-  },
-} as const;
-
-/** MES 工具状态枚举 */
-export const MesToolStatusEnum = {
-  STORE: 1,
-  ISSUE: 2,
-  REPAIR: 3,
-  SCRAP: 4,
-} as const;
-
-/** MES 保养维护类型枚举 */
-export const MesMaintenTypeEnum = {
-  REGULAR: 1,
-  USAGE: 2,
-} as const;
-
-/** MES 设备状态枚举 */
-export const MesDvMachineryStatusEnum = {
-  STOP: 1,
-  PRODUCING: 2,
-  MAINTENANCE: 3,
-} as const;
-
-/** MES 假期类型枚举 */
-export const HolidayType = {
-  WORKDAY: 1,
-  HOLIDAY: 2,
-} as const;
-
-/** MES 排班计划状态枚举 */
-export const MesCalPlanStatusEnum = {
-  PREPARE: 0,
-  CONFIRMED: 1,
-} as const;
-
-/** MES 轮班方式枚举 */
-export const MesCalShiftTypeEnum = {
-  SINGLE: 1,
-  TWO: 2,
-  THREE: 3,
-} as const;
-
-/** MES 倒班方式枚举 */
-export const MesCalShiftMethodEnum = {
-  QUARTER: 1,
-  MONTH: 2,
-  WEEK: 3,
-  DAY: 4,
-} as const;
-
-/** MES 点检保养项目类型枚举 */
-export const MesDvSubjectTypeEnum = {
-  CHECK: 1,
-  MAINTENANCE: 2,
-} as const;
-
-/** MES 点检保养方案状态枚举 */
-export const MesDvCheckPlanStatusEnum = {
-  PREPARE: 0,
-  ENABLED: 1,
-} as const;
-
-/** MES 设备保养记录状态枚举 */
-export const MesDvMaintenRecordStatusEnum = {
-  PREPARE: MesOrderStatusConstants.DRAFT,
-  SUBMITTED: MesOrderStatusConstants.FINISHED,
-} as const;
-
-/** MES 设备保养明细结果枚举 */
-export const MesDvMaintenStatusEnum = {
-  NORMAL: 1,
-  ABNORMAL: 2,
-} as const;
-
-/** MES 设备点检记录状态枚举 */
-export const MesDvCheckRecordStatusEnum = {
-  DRAFT: 10,
-  FINISHED: 20,
-} as const;
-
-/** MES 设备点检结果枚举 */
-export const MesDvCheckResultEnum = {
-  NORMAL: 1,
-  ABNORMAL: 2,
-} as const;
-
-/** MES 维修工单状态枚举 */
-export const MesDvRepairStatusEnum = {
-  PREPARE: MesOrderStatusConstants.DRAFT,
-  CONFIRMED: MesOrderStatusConstants.CONFIRMED,
-  APPROVING: MesOrderStatusConstants.APPROVING,
-  FINISHED: MesOrderStatusConstants.FINISHED,
-} as const;
-
-/** MES 维修结果枚举 */
-export const MesDvRepairResultEnum = {
-  PASS: 1,
-  FAIL: 2,
-} as const;
-
-/** MES 自动编码规则 Code 枚举 */
-export const MesAutoCodeRuleCode = {
-  CAL_PLAN_CODE: 'CAL_PLAN_CODE',
-  CAL_TEAM_CODE: 'CAL_TEAM_CODE',
-  DV_CHECK_PLAN_CODE: 'DV_CHECK_PLAN_CODE',
-  DV_MACHINERY_TYPE_CODE: 'DV_MACHINERY_TYPE_CODE',
-  DV_MACHINERY_CODE: 'DV_MACHINERY_CODE',
-  DV_REPAIR_CODE: 'DV_REPAIR_CODE',
-  DV_SUBJECT_CODE: 'DV_SUBJECT_CODE',
-  MD_CLIENT_CODE: 'MD_CLIENT_CODE',
-  MD_ITEM_TYPE_CODE: 'MD_ITEM_TYPE_CODE',
-  MD_ITEM_CODE: 'MD_ITEM_CODE',
-  MD_VENDOR_CODE: 'MD_VENDOR_CODE',
-  MD_WORKSTATION_CODE: 'MD_WORKSTATION_CODE',
-  MD_WORKSHOP_CODE: 'MD_WORKSHOP_CODE',
-  PRO_CARD_CODE: 'PRO_CARD_CODE',
-  PRO_FEEDBACK_CODE: 'PRO_FEEDBACK_CODE',
-  PRO_PROCESS_CODE: 'PRO_PROCESS_CODE',
-  PRO_ROUTE_CODE: 'PRO_ROUTE_CODE',
-  PRO_TASK_CODE: 'PRO_TASK_CODE',
-  PRO_WORK_ORDER_CODE: 'PRO_WORK_ORDER_CODE',
-  QC_DEFECT_CODE: 'QC_DEFECT_CODE',
-  QC_INDICATOR_CODE: 'QC_INDICATOR_CODE',
-  QC_INDICATOR_RESULT_CODE: 'QC_INDICATOR_RESULT_CODE',
-  QC_IQC_CODE: 'QC_IQC_CODE',
-  QC_IPQC_CODE: 'QC_IPQC_CODE',
-  QC_OQC_CODE: 'QC_OQC_CODE',
-  QC_RQC_CODE: 'QC_RQC_CODE',
-  QC_TEMPLATE_CODE: 'QC_TEMPLATE_CODE',
-  TM_TOOL_TYPE_CODE: 'TM_TOOL_TYPE_CODE',
-  TM_TOOL_CODE: 'TM_TOOL_CODE',
-  WM_AREA_CODE: 'WM_AREA_CODE',
-  WM_LOCATION_CODE: 'WM_LOCATION_CODE',
-  WM_ARRIVAL_NOTICE_CODE: 'WM_ARRIVAL_NOTICE_CODE',
-  WM_ITEM_RECEIPT_CODE: 'WM_ITEM_RECEIPT_CODE',
-  WM_RETURN_VENDOR_CODE: 'WM_RETURN_VENDOR_CODE',
-  WM_SALES_NOTICE_CODE: 'WM_SALES_NOTICE_CODE',
-  WM_RETURN_SALES_CODE: 'WM_RETURN_SALES_CODE',
-  WM_RETURN_ISSUE_CODE: 'WM_RETURN_ISSUE_CODE',
-  WM_PRODUCT_ISSUE_CODE: 'WM_PRODUCT_ISSUE_CODE',
-  WM_PRODUCT_SALES_CODE: 'WM_PRODUCT_SALES_CODE',
-  PRODUCTRECPT_CODE: 'PRODUCTRECPT_CODE',
-  WM_MISC_ISSUE_CODE: 'WM_MISC_ISSUE_CODE',
-  WM_MISC_RECEIPT_CODE: 'WM_MISC_RECEIPT_CODE',
-  WM_OUTSOURCE_ISSUE_CODE: 'WM_OUTSOURCE_ISSUE_CODE',
-  WM_OUTSOURCE_RECEIPT_CODE: 'WM_OUTSOURCE_RECEIPT_CODE',
-  WM_PACKAGE_CODE: 'WM_PACKAGE_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',
-  TRANSFER_CODE: 'TRANSFER_CODE',
-} as const;
-
-/** MES 装箱单状态枚举 */
-export const MesWmPackageStatusEnum = {
-  PREPARE: MesOrderStatusConstants.DRAFT,
-  FINISHED: MesOrderStatusConstants.FINISHED,
-} as const;
-
-/** MES 盘点类型枚举 */
-export const MesWmStockTakingTypeEnum = {
-  STATIC: 1,
-  DYNAMIC: 2,
-} as const;
-
-/** MES 盘点任务状态枚举 */
-export const MesWmStockTakingTaskStatusEnum = {
-  PREPARE: MesOrderStatusConstants.DRAFT,
-  APPROVING: MesOrderStatusConstants.APPROVING,
-  FINISHED: MesOrderStatusConstants.FINISHED,
-  CANCELED: MesOrderStatusConstants.CANCELLED,
-} as const;
-
-/** MES 盘点任务行状态枚举 */
-export const MesWmStockTakingTaskLineStatusEnum = {
-  UNCOUNTED: 0,
-  NORMAL: 1,
-  GAIN: 2,
-  LOSS: 3,
-} as const;
-
-/** MES 盘点方案参数类型枚举 */
-export const MesWmStockTakingParamTypeEnum = {
-  WAREHOUSE: 102,
-  LOCATION: 103,
-  AREA: 104,
-  BATCH: 107,
-  ITEM: 600,
-  QUALITY_STATUS: 900,
-} as const;
-
-/** MES 生产工单状态枚举（独立于通用单据状态，对齐后端 MesProWorkOrderStatusEnum） */
-export const MesProWorkOrderStatusEnum = {
-  PREPARE: 0, // 草稿
-  CONFIRMED: 1, // 已确认
-  FINISHED: 2, // 已完成
-  CANCELED: 3, // 已取消
-} as const;
-
-/** MES 工单类型枚举 */
-export const MesProWorkOrderTypeEnum = {
-  SELF: 1, // 自行生产
-  OUTSOURCE: 2, // 代工
-  PURCHASE: 3, // 采购
-} as const;
-
-/** MES 工单来源类型枚举 */
-export const MesProWorkOrderSourceTypeEnum = {
-  ORDER: 1, // 客户订单
-  STORE: 2, // 库存备货
-} as const;
-
-/** MES 生产任务状态枚举 */
-export const MesProTaskStatusEnum = {
-  PREPARE: MesOrderStatusConstants.DRAFT,
-  CONFIRMED: MesOrderStatusConstants.CONFIRMED,
-  APPROVING: MesOrderStatusConstants.APPROVING,
-  PRODUCING: MesOrderStatusConstants.APPROVED,
-  FINISHED: MesOrderStatusConstants.FINISHED,
-  CANCELLED: MesOrderStatusConstants.CANCELLED,
-} as const;
-
-/** MES 生产报工状态枚举 */
-export const MesProFeedbackStatusEnum = {
-  PREPARE: MesOrderStatusConstants.DRAFT,
-  APPROVING: MesOrderStatusConstants.APPROVING,
-  UNCHECK: MesOrderStatusConstants.APPROVED,
-  FINISHED: MesOrderStatusConstants.FINISHED,
-  CANCELED: MesOrderStatusConstants.CANCELLED,
-} as const;
-
-/** MES 流转卡状态枚举（复用工单状态值，对齐后端 MesProWorkOrderStatusEnum） */
-export const MesProCardStatusEnum = {
-  PREPARE: 0, // 草稿
-  CONFIRMED: 1, // 已确认
-  FINISHED: 2, // 已完成
-  CANCELED: 3, // 已取消
-} as const;
-
-/** MES 安灯处置状态枚举 */
-export const MesProAndonStatusEnum = {
-  ACTIVE: 0, // 未处置
-  HANDLED: 1, // 已处置
-} as const;
-
-/** MES 安灯级别枚举 */
-export const MesProAndonLevelEnum = {
-  LEVEL1: 1,
-  LEVEL2: 2,
-  LEVEL3: 3,
-} as const;
-
-/** MES 上下工状态类型枚举 */
-export const MesProWorkRecordTypeEnum = {
-  CLOCK_IN: 1,
-  CLOCK_OUT: 2,
-} as const;
-
-/** MES 杂项出库单状态枚举 */
-export const MesWmMiscIssueStatusEnum = {
-  PREPARE: MesOrderStatusConstants.DRAFT,
-  APPROVED: MesOrderStatusConstants.APPROVED,
-  FINISHED: MesOrderStatusConstants.FINISHED,
-  CANCELED: MesOrderStatusConstants.CANCELLED,
-} as const;
-
-/** MES 杂项入库单状态枚举 */
-export const MesWmMiscReceiptStatusEnum = {
-  PREPARE: MesOrderStatusConstants.DRAFT,
-  APPROVED: MesOrderStatusConstants.APPROVED,
-  FINISHED: MesOrderStatusConstants.FINISHED,
-  CANCELED: MesOrderStatusConstants.CANCELLED,
-} as const;
-
-/** MES 外协发料单状态枚举 */
-export const MesWmOutsourceIssueStatusEnum = {
-  PREPARE: MesOrderStatusConstants.DRAFT,
-  APPROVING: MesOrderStatusConstants.APPROVING,
-  APPROVED: MesOrderStatusConstants.APPROVED,
-  FINISHED: MesOrderStatusConstants.FINISHED,
-  CANCELLED: MesOrderStatusConstants.CANCELLED,
-} as const;
-
-/** MES 外协入库单状态枚举 */
-export const MesWmOutsourceReceiptStatusEnum = {
-  PREPARE: MesOrderStatusConstants.DRAFT,
-  APPROVING: MesOrderStatusConstants.APPROVING,
-  APPROVED: MesOrderStatusConstants.APPROVED,
-  FINISHED: MesOrderStatusConstants.FINISHED,
-  CANCELED: MesOrderStatusConstants.CANCELLED,
-} as const;
-
-/** MES 转移单类型枚举 */
-export const MesWmTransferTypeEnum = {
-  INNER: 1, // 内部调拨
-  OUTER: 2, // 外部调拨
-} as const;
-
-/** MES 转移单状态枚举 */
-export const MesWmTransferStatusEnum = {
-  PREPARE: MesOrderStatusConstants.DRAFT, // 草稿
-  UNCONFIRMED: MesOrderStatusConstants.CONFIRMED, // 待确认
-  APPROVING: MesOrderStatusConstants.APPROVING, // 待上架
-  APPROVED: MesOrderStatusConstants.APPROVED, // 待执行
-  FINISHED: MesOrderStatusConstants.FINISHED, // 已完成
-  CANCELED: MesOrderStatusConstants.CANCELLED, // 已取消
-} as const;
-
-/** MES 到货通知单状态枚举 */
-export const MesWmArrivalNoticeStatusEnum = {
-  PREPARE: MesOrderStatusConstants.DRAFT,
-  PENDING_QC: MesOrderStatusConstants.APPROVING,
-  PENDING_RECEIPT: MesOrderStatusConstants.APPROVED,
-  FINISHED: MesOrderStatusConstants.FINISHED,
-} as const;
-
-/** MES 采购入库单状态枚举 */
-export const MesWmItemReceiptStatusEnum = {
-  PREPARE: MesOrderStatusConstants.DRAFT,
-  APPROVING: MesOrderStatusConstants.APPROVING,
-  APPROVED: MesOrderStatusConstants.APPROVED,
-  FINISHED: MesOrderStatusConstants.FINISHED,
-  CANCELED: MesOrderStatusConstants.CANCELLED,
-} as const;
-
-/** MES 供应商退货单状态枚举 */
-export const MesWmReturnVendorStatusEnum = {
-  PREPARE: MesOrderStatusConstants.DRAFT,
-  APPROVING: MesOrderStatusConstants.APPROVING,
-  APPROVED: MesOrderStatusConstants.APPROVED,
-  FINISHED: MesOrderStatusConstants.FINISHED,
-  CANCELED: MesOrderStatusConstants.CANCELLED,
-} as const;
-
-/** MES 发货通知单状态枚举 */
-export const MesWmSalesNoticeStatusEnum = {
-  PREPARE: MesOrderStatusConstants.DRAFT,
-  APPROVED: MesOrderStatusConstants.APPROVED,
-} as const;
-
-/** MES 销售退货单状态枚举 */
-export const MesWmReturnSalesStatusEnum = {
-  PREPARE: MesOrderStatusConstants.DRAFT,
-  CONFIRMED: MesOrderStatusConstants.CONFIRMED,
-  APPROVING: MesOrderStatusConstants.APPROVING,
-  APPROVED: MesOrderStatusConstants.APPROVED,
-  FINISHED: MesOrderStatusConstants.FINISHED,
-  CANCELED: MesOrderStatusConstants.CANCELLED,
-} as const;
-
-/** MES 生产退料单状态枚举 */
-export const MesWmReturnIssueStatusEnum = {
-  PREPARE: MesOrderStatusConstants.DRAFT,
-  CONFIRMED: MesOrderStatusConstants.CONFIRMED,
-  APPROVING: MesOrderStatusConstants.APPROVING,
-  APPROVED: MesOrderStatusConstants.APPROVED,
-  FINISHED: MesOrderStatusConstants.FINISHED,
-  CANCELED: MesOrderStatusConstants.CANCELLED,
-} as const;
-
-/** MES 领料出库单状态枚举 */
-export const MesWmProductIssueStatusEnum = {
-  PREPARE: MesOrderStatusConstants.DRAFT,
-  APPROVING: MesOrderStatusConstants.APPROVING,
-  APPROVED: MesOrderStatusConstants.APPROVED,
-  FINISHED: MesOrderStatusConstants.FINISHED,
-  CANCELED: MesOrderStatusConstants.CANCELLED,
-} as const;
-
-/** MES 产品入库单状态枚举 */
-export const MesWmProductReceiptStatusEnum = {
-  PREPARE: MesOrderStatusConstants.DRAFT,
-  APPROVING: MesOrderStatusConstants.APPROVING,
-  APPROVED: MesOrderStatusConstants.APPROVED,
-  FINISHED: MesOrderStatusConstants.FINISHED,
-  CANCELED: MesOrderStatusConstants.CANCELLED,
-} as const;
-
-/** MES 销售出库单状态枚举 */
-export const MesWmProductSalesStatusEnum = {
-  PREPARE: MesOrderStatusConstants.DRAFT,
-  CONFIRMED: MesOrderStatusConstants.CONFIRMED,
-  APPROVING: MesOrderStatusConstants.APPROVING,
-  SHIPPING: 10, // 待填写运单
-  APPROVED: MesOrderStatusConstants.APPROVED,
-  FINISHED: MesOrderStatusConstants.FINISHED,
-  CANCELED: MesOrderStatusConstants.CANCELLED,
-} as const;
-
-/** MES 质检结果值类型枚举 */
-export const MesQcResultValueType = {
-  FLOAT: 1,
-  INTEGER: 2,
-  TEXT: 3,
-  DICT: 4,
-  FILE: 5,
-} as const;
-
-/** MES 业务类型常量 */
-export const MesBizTypeEnum = {
-  // WM 仓库模块 [100, 200)
-  WM_ARRIVAL_NOTICE: 100, // 到货通知单
-  WM_RETURN_ISSUE: 116, // 生产退料
-  WM_PRODUCT_SALES: 118, // 销售出库
-  WM_RETURN_SALES: 119, // 销售退货入库
-  WM_OUTSOURCE_RECPT: 121, // 外协入库
-
-  // PRO 生产模块 [300, 400)
-  PRO_FEEDBACK: 304, // 生产报工
-} as const;
-
-/** MES 质检来源单据类型枚举 */
-export const MesQcSourceDocTypeEnum = {
-  // IQC
-  ARRIVAL_NOTICE: MesBizTypeEnum.WM_ARRIVAL_NOTICE,
-  OUTSOURCE_RECPT: MesBizTypeEnum.WM_OUTSOURCE_RECPT,
-  // IPQC
-  PRO_FEEDBACK: MesBizTypeEnum.PRO_FEEDBACK,
-  // OQC
-  PRODUCT_SALES: MesBizTypeEnum.WM_PRODUCT_SALES,
-  // RQC
-  RETURN_ISSUE: MesBizTypeEnum.WM_RETURN_ISSUE,
-  RETURN_SALES: MesBizTypeEnum.WM_RETURN_SALES,
-} as const;
-
-/** MES 质检类型枚举 */
-export const MesQcTypeEnum = {
-  IQC: 1, // 来料检验
-  IPQC: 2, // 过程检验
-  OQC: 3, // 出货检验
-  RQC: 4, // 退货检验
-} as const;
-
-/** MES 质检单状态枚举 */
-export const MesQcStatusEnum = {
-  DRAFT: MesOrderStatusConstants.DRAFT,
-  FINISHED: MesOrderStatusConstants.FINISHED,
-} as const;
-
-/** MES 编码规则分段类型枚举 */
-export const MesAutoCodePartTypeEnum = {
-  INPUT: 1,
-  DATE: 2,
-  FIX: 3,
-  SERIAL: 4,
-} as const;
-
-/** MES 条码格式枚举 */
-export enum BarcodeFormatEnum {
-  QR_CODE = 1,
-  EAN13 = 2,
-  CODE39 = 3,
-  UPC_A = 4,
-}
-
-/** 条码格式映射表（枚举值 -> JsBarcode 格式名） */
-export const BARCODE_FORMAT_MAP: Record<BarcodeFormatEnum, string> = {
-  [BarcodeFormatEnum.QR_CODE]: 'QR_CODE',
-  [BarcodeFormatEnum.EAN13]: 'EAN13',
-  [BarcodeFormatEnum.CODE39]: 'CODE39',
-  [BarcodeFormatEnum.UPC_A]: 'UPC_A',
-};
-
-/** MES 条码业务类型枚举 */
-export enum BarcodeBizTypeEnum {
-  WAREHOUSE = 102,
-  LOCATION = 103,
-  AREA = 104,
-  PACKAGE = 105,
-  STOCK = 106,
-  BATCH = 107,
-  PROCARD = 300,
-  WORKORDER = 301,
-  TRANSORDER = 302,
-  TASK = 303,
-  MACHINERY = 400,
-  TOOL = 500,
-  ITEM = 600,
-  VENDOR = 601,
-  WORKSTATION = 602,
-  WORKSHOP = 603,
-  USER = 604,
-  CLIENT = 605,
-}
diff --git a/apps/web-ele/src/views/mes/wm/arrivalnotice/data.ts b/apps/web-ele/src/views/mes/wm/arrivalnotice/data.ts
index 210a6a37f..c8969e9ac 100644
--- a/apps/web-ele/src/views/mes/wm/arrivalnotice/data.ts
+++ b/apps/web-ele/src/views/mes/wm/arrivalnotice/data.ts
@@ -5,7 +5,7 @@ import type { MesWmArrivalNoticeLineApi } from '#/api/mes/wm/arrivalnotice/line'
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode } from '@vben/constants';
 
 import { ElButton } from 'element-plus';
 
@@ -14,7 +14,6 @@ import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getRangePickerDefaultProps } from '#/utils';
 import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
 import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-ele/src/views/mes/wm/arrivalnotice/index.vue b/apps/web-ele/src/views/mes/wm/arrivalnotice/index.vue
index 041c6a27a..e0fda3149 100644
--- a/apps/web-ele/src/views/mes/wm/arrivalnotice/index.vue
+++ b/apps/web-ele/src/views/mes/wm/arrivalnotice/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesWmArrivalNoticeApi } from '#/api/mes/wm/arrivalnotice';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesWmArrivalNoticeStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { ElButton, ElLoading, ElMessage } from 'element-plus';
@@ -14,7 +15,6 @@ import {
   getArrivalNoticePage,
 } from '#/api/mes/wm/arrivalnotice';
 import { $t } from '#/locales';
-import { MesWmArrivalNoticeStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-ele/src/views/mes/wm/arrivalnotice/modules/form.vue b/apps/web-ele/src/views/mes/wm/arrivalnotice/modules/form.vue
index 4014f8593..d2601a134 100644
--- a/apps/web-ele/src/views/mes/wm/arrivalnotice/modules/form.vue
+++ b/apps/web-ele/src/views/mes/wm/arrivalnotice/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesWmArrivalNoticeApi } from '#/api/mes/wm/arrivalnotice';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { MesWmArrivalNoticeStatusEnum } from '@vben/constants';
 
 import { ElButton, ElDivider, ElMessage, ElPopconfirm } from 'element-plus';
 
@@ -17,7 +18,6 @@ import {
   updateArrivalNotice,
 } from '#/api/mes/wm/arrivalnotice';
 import { $t } from '#/locales';
-import { MesWmArrivalNoticeStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 import LineList from './line-list.vue';
diff --git a/apps/web-ele/src/views/mes/wm/barcode/data.ts b/apps/web-ele/src/views/mes/wm/barcode/data.ts
index 15362beed..8e0011b42 100644
--- a/apps/web-ele/src/views/mes/wm/barcode/data.ts
+++ b/apps/web-ele/src/views/mes/wm/barcode/data.ts
@@ -4,9 +4,9 @@ import type { MesWmBarcodeApi } from '#/api/mes/wm/barcode';
 import type { MesWmBarcodeConfigApi } from '#/api/mes/wm/barcode/config';
 import type { DescriptionItemSchema } from '#/components/description';
 
-import { h, markRaw } from 'vue';
+import { BarcodeBizTypeEnum, DICT_TYPE, h, markRaw } from 'vue';
 
-import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { CommonStatusEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 import { formatDateTime } from '@vben/utils';
 
@@ -22,7 +22,6 @@ import MdWorkstationSelect from '#/views/mes/md/workstation/components/md-workst
 import { ProCardSelect } from '#/views/mes/pro/card/components';
 import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
 import TmToolSelect from '#/views/mes/tm/tool/components/tm-tool-select.vue';
-import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
 import { WmBatchSelect } from '#/views/mes/wm/batch/components';
 import { UserSelect } from '#/views/system/user/components';
 
diff --git a/apps/web-ele/src/views/mes/wm/barcode/modules/form.vue b/apps/web-ele/src/views/mes/wm/barcode/modules/form.vue
index ad56c6a3f..db39bae3b 100644
--- a/apps/web-ele/src/views/mes/wm/barcode/modules/form.vue
+++ b/apps/web-ele/src/views/mes/wm/barcode/modules/form.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import type { MesWmBarcodeApi } from '#/api/mes/wm/barcode';
 
-import { computed, ref } from 'vue';
+import { BarcodeBizTypeEnum, computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
 import { CommonStatusEnum } from '@vben/constants';
@@ -17,7 +17,6 @@ import {
 import { getWarehouseArea } from '#/api/mes/wm/warehouse/area';
 import { getWarehouseLocation } from '#/api/mes/wm/warehouse/location';
 import { $t } from '#/locales';
-import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 
diff --git a/apps/web-ele/src/views/mes/wm/itemreceipt/data.ts b/apps/web-ele/src/views/mes/wm/itemreceipt/data.ts
index a812f6857..fd883365c 100644
--- a/apps/web-ele/src/views/mes/wm/itemreceipt/data.ts
+++ b/apps/web-ele/src/views/mes/wm/itemreceipt/data.ts
@@ -8,7 +8,7 @@ import type { MesWmItemReceiptLineApi } from '#/api/mes/wm/itemreceipt/line';
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode, MesWmArrivalNoticeStatusEnum } from '@vben/constants';
 
 import { ElButton } from 'element-plus';
 
@@ -16,10 +16,6 @@ import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getRangePickerDefaultProps } from '#/utils';
 import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
 import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
-import {
-  MesAutoCodeRuleCode,
-  MesWmArrivalNoticeStatusEnum,
-} from '#/views/mes/utils/constants';
 import {
   WmArrivalNoticeLineSelect,
   WmArrivalNoticeSelect,
diff --git a/apps/web-ele/src/views/mes/wm/itemreceipt/index.vue b/apps/web-ele/src/views/mes/wm/itemreceipt/index.vue
index 06a610b68..df956851b 100644
--- a/apps/web-ele/src/views/mes/wm/itemreceipt/index.vue
+++ b/apps/web-ele/src/views/mes/wm/itemreceipt/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesWmItemReceiptApi } from '#/api/mes/wm/itemreceipt';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesWmItemReceiptStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { ElButton, ElLoading, ElMessage } from 'element-plus';
@@ -15,7 +16,6 @@ import {
   getItemReceiptPage,
 } from '#/api/mes/wm/itemreceipt';
 import { $t } from '#/locales';
-import { MesWmItemReceiptStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-ele/src/views/mes/wm/itemreceipt/modules/form.vue b/apps/web-ele/src/views/mes/wm/itemreceipt/modules/form.vue
index a67a42031..d247cf2a8 100644
--- a/apps/web-ele/src/views/mes/wm/itemreceipt/modules/form.vue
+++ b/apps/web-ele/src/views/mes/wm/itemreceipt/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesWmItemReceiptApi } from '#/api/mes/wm/itemreceipt';
 import { computed, ref } from 'vue';
 
 import { confirm, useVbenModal } from '@vben/common-ui';
+import { MesWmItemReceiptStatusEnum } from '@vben/constants';
 
 import { ElButton, ElDivider, ElMessage, ElPopconfirm } from 'element-plus';
 
@@ -19,7 +20,6 @@ import {
   updateItemReceipt,
 } from '#/api/mes/wm/itemreceipt';
 import { $t } from '#/locales';
-import { MesWmItemReceiptStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 import LineList from './line-list.vue';
diff --git a/apps/web-ele/src/views/mes/wm/miscissue/data.ts b/apps/web-ele/src/views/mes/wm/miscissue/data.ts
index 9ff928496..94b33fae0 100644
--- a/apps/web-ele/src/views/mes/wm/miscissue/data.ts
+++ b/apps/web-ele/src/views/mes/wm/miscissue/data.ts
@@ -6,14 +6,13 @@ import type { MesWmMiscIssueLineApi } from '#/api/mes/wm/miscissue/line';
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { ElButton } from 'element-plus';
 
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getRangePickerDefaultProps } from '#/utils';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
 import {
   WmWarehouseAreaSelect,
diff --git a/apps/web-ele/src/views/mes/wm/miscissue/index.vue b/apps/web-ele/src/views/mes/wm/miscissue/index.vue
index 516565b77..2bd98d468 100644
--- a/apps/web-ele/src/views/mes/wm/miscissue/index.vue
+++ b/apps/web-ele/src/views/mes/wm/miscissue/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesWmMiscIssueApi } from '#/api/mes/wm/miscissue';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesWmMiscIssueStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { ElButton, ElLoading, ElMessage } from 'element-plus';
@@ -15,7 +16,6 @@ import {
   getMiscIssuePage,
 } from '#/api/mes/wm/miscissue';
 import { $t } from '#/locales';
-import { MesWmMiscIssueStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-ele/src/views/mes/wm/miscissue/modules/form.vue b/apps/web-ele/src/views/mes/wm/miscissue/modules/form.vue
index ead78d938..218e279fb 100644
--- a/apps/web-ele/src/views/mes/wm/miscissue/modules/form.vue
+++ b/apps/web-ele/src/views/mes/wm/miscissue/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesWmMiscIssueApi } from '#/api/mes/wm/miscissue';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { MesWmMiscIssueStatusEnum } from '@vben/constants';
 
 import { ElButton, ElDivider, ElMessage, ElPopconfirm } from 'element-plus';
 
@@ -18,7 +19,6 @@ import {
   updateMiscIssue,
 } from '#/api/mes/wm/miscissue';
 import { $t } from '#/locales';
-import { MesWmMiscIssueStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 import LineList from './line-list.vue';
diff --git a/apps/web-ele/src/views/mes/wm/miscreceipt/data.ts b/apps/web-ele/src/views/mes/wm/miscreceipt/data.ts
index 2e308be2d..64c5e0711 100644
--- a/apps/web-ele/src/views/mes/wm/miscreceipt/data.ts
+++ b/apps/web-ele/src/views/mes/wm/miscreceipt/data.ts
@@ -5,7 +5,7 @@ import type { MesWmMiscReceiptLineApi } from '#/api/mes/wm/miscreceipt/line';
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { ElButton } from 'element-plus';
@@ -13,7 +13,6 @@ import { ElButton } from 'element-plus';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getRangePickerDefaultProps } from '#/utils';
 import { MdItemSelect } from '#/views/mes/md/item/components';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 import {
   WmWarehouseAreaSelect,
   WmWarehouseLocationSelect,
diff --git a/apps/web-ele/src/views/mes/wm/miscreceipt/index.vue b/apps/web-ele/src/views/mes/wm/miscreceipt/index.vue
index 4b0711511..a58266bb1 100644
--- a/apps/web-ele/src/views/mes/wm/miscreceipt/index.vue
+++ b/apps/web-ele/src/views/mes/wm/miscreceipt/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesWmMiscReceiptApi } from '#/api/mes/wm/miscreceipt';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesWmMiscReceiptStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { ElButton, ElLoading, ElMessage } from 'element-plus';
@@ -15,7 +16,6 @@ import {
   getMiscReceiptPage,
 } from '#/api/mes/wm/miscreceipt';
 import { $t } from '#/locales';
-import { MesWmMiscReceiptStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-ele/src/views/mes/wm/miscreceipt/modules/form.vue b/apps/web-ele/src/views/mes/wm/miscreceipt/modules/form.vue
index 32710862f..d41248364 100644
--- a/apps/web-ele/src/views/mes/wm/miscreceipt/modules/form.vue
+++ b/apps/web-ele/src/views/mes/wm/miscreceipt/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesWmMiscReceiptApi } from '#/api/mes/wm/miscreceipt';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { MesWmMiscReceiptStatusEnum } from '@vben/constants';
 
 import { ElButton, ElDivider, ElMessage, ElPopconfirm } from 'element-plus';
 
@@ -18,7 +19,6 @@ import {
   updateMiscReceipt,
 } from '#/api/mes/wm/miscreceipt';
 import { $t } from '#/locales';
-import { MesWmMiscReceiptStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 import LineList from './line-list.vue';
diff --git a/apps/web-ele/src/views/mes/wm/outsourceissue/data.ts b/apps/web-ele/src/views/mes/wm/outsourceissue/data.ts
index 67abe167e..a6b699db2 100644
--- a/apps/web-ele/src/views/mes/wm/outsourceissue/data.ts
+++ b/apps/web-ele/src/views/mes/wm/outsourceissue/data.ts
@@ -8,7 +8,7 @@ import type { MesWmOutsourceIssueLineApi } from '#/api/mes/wm/outsourceissue/lin
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode, MesProWorkOrderStatusEnum, MesProWorkOrderTypeEnum } from '@vben/constants';
 
 import { ElButton } from 'element-plus';
 
@@ -17,11 +17,6 @@ import { getRangePickerDefaultProps } from '#/utils';
 import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
 import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
 import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
-import {
-  MesAutoCodeRuleCode,
-  MesProWorkOrderStatusEnum,
-  MesProWorkOrderTypeEnum,
-} from '#/views/mes/utils/constants';
 import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
 import {
   WmWarehouseAreaSelect,
diff --git a/apps/web-ele/src/views/mes/wm/outsourceissue/index.vue b/apps/web-ele/src/views/mes/wm/outsourceissue/index.vue
index c241d9808..41d8d75d2 100644
--- a/apps/web-ele/src/views/mes/wm/outsourceissue/index.vue
+++ b/apps/web-ele/src/views/mes/wm/outsourceissue/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesWmOutsourceIssueApi } from '#/api/mes/wm/outsourceissue';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesWmOutsourceIssueStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { ElButton, ElLoading, ElMessage } from 'element-plus';
@@ -15,7 +16,6 @@ import {
   getOutsourceIssuePage,
 } from '#/api/mes/wm/outsourceissue';
 import { $t } from '#/locales';
-import { MesWmOutsourceIssueStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-ele/src/views/mes/wm/outsourceissue/modules/form.vue b/apps/web-ele/src/views/mes/wm/outsourceissue/modules/form.vue
index 0aa12cf93..878689845 100644
--- a/apps/web-ele/src/views/mes/wm/outsourceissue/modules/form.vue
+++ b/apps/web-ele/src/views/mes/wm/outsourceissue/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesWmOutsourceIssueApi } from '#/api/mes/wm/outsourceissue';
 import { computed, ref } from 'vue';
 
 import { confirm, useVbenModal } from '@vben/common-ui';
+import { MesWmOutsourceIssueStatusEnum } from '@vben/constants';
 
 import { ElButton, ElDivider, ElMessage, ElPopconfirm } from 'element-plus';
 
@@ -20,7 +21,6 @@ import {
   updateOutsourceIssue,
 } from '#/api/mes/wm/outsourceissue';
 import { $t } from '#/locales';
-import { MesWmOutsourceIssueStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 import LineList from './line-list.vue';
diff --git a/apps/web-ele/src/views/mes/wm/outsourcereceipt/data.ts b/apps/web-ele/src/views/mes/wm/outsourcereceipt/data.ts
index c908feff8..645c50d80 100644
--- a/apps/web-ele/src/views/mes/wm/outsourcereceipt/data.ts
+++ b/apps/web-ele/src/views/mes/wm/outsourcereceipt/data.ts
@@ -7,7 +7,7 @@ import type { MesWmOutsourceReceiptLineApi } from '#/api/mes/wm/outsourcereceipt
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode, MesProWorkOrderStatusEnum, MesProWorkOrderTypeEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { ElButton } from 'element-plus';
@@ -18,11 +18,6 @@ import { getRangePickerDefaultProps } from '#/utils';
 import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
 import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
 import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
-import {
-  MesAutoCodeRuleCode,
-  MesProWorkOrderStatusEnum,
-  MesProWorkOrderTypeEnum,
-} from '#/views/mes/utils/constants';
 import {
   WmWarehouseAreaSelect,
   WmWarehouseLocationSelect,
diff --git a/apps/web-ele/src/views/mes/wm/outsourcereceipt/index.vue b/apps/web-ele/src/views/mes/wm/outsourcereceipt/index.vue
index ce3808463..cc5b41e51 100644
--- a/apps/web-ele/src/views/mes/wm/outsourcereceipt/index.vue
+++ b/apps/web-ele/src/views/mes/wm/outsourcereceipt/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesWmOutsourceReceiptApi } from '#/api/mes/wm/outsourcereceipt';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesWmOutsourceReceiptStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { ElButton, ElLoading, ElMessage } from 'element-plus';
@@ -15,7 +16,6 @@ import {
   getOutsourceReceiptPage,
 } from '#/api/mes/wm/outsourcereceipt';
 import { $t } from '#/locales';
-import { MesWmOutsourceReceiptStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-ele/src/views/mes/wm/outsourcereceipt/modules/form.vue b/apps/web-ele/src/views/mes/wm/outsourcereceipt/modules/form.vue
index b7159bd52..635802bb0 100644
--- a/apps/web-ele/src/views/mes/wm/outsourcereceipt/modules/form.vue
+++ b/apps/web-ele/src/views/mes/wm/outsourcereceipt/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesWmOutsourceReceiptApi } from '#/api/mes/wm/outsourcereceipt';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { MesWmOutsourceReceiptStatusEnum } from '@vben/constants';
 
 import { ElButton, ElDivider, ElMessage, ElPopconfirm } from 'element-plus';
 
@@ -19,7 +20,6 @@ import {
   updateOutsourceReceipt,
 } from '#/api/mes/wm/outsourcereceipt';
 import { $t } from '#/locales';
-import { MesWmOutsourceReceiptStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 import LineList from './line-list.vue';
diff --git a/apps/web-ele/src/views/mes/wm/packages/components/wm-package-select-dialog.vue b/apps/web-ele/src/views/mes/wm/packages/components/wm-package-select-dialog.vue
index 6a933eaf8..adee5fece 100644
--- a/apps/web-ele/src/views/mes/wm/packages/components/wm-package-select-dialog.vue
+++ b/apps/web-ele/src/views/mes/wm/packages/components/wm-package-select-dialog.vue
@@ -4,11 +4,12 @@ import type { MesWmPackageApi } from '#/api/mes/wm/packages';
 
 import { nextTick, ref } from 'vue';
 
+import { MesWmPackageStatusEnum } from '@vben/constants';
+
 import { ElAlert, ElButton, ElDialog, ElMessage } from 'element-plus';
 
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getPackagePage } from '#/api/mes/wm/packages';
-import { MesWmPackageStatusEnum } from '#/views/mes/utils/constants';
 
 import { useSelectGridColumns, useSelectGridFormSchema } from '../data';
 
diff --git a/apps/web-ele/src/views/mes/wm/packages/data.ts b/apps/web-ele/src/views/mes/wm/packages/data.ts
index b05fddef8..998b82a7f 100644
--- a/apps/web-ele/src/views/mes/wm/packages/data.ts
+++ b/apps/web-ele/src/views/mes/wm/packages/data.ts
@@ -5,7 +5,7 @@ import type { MesWmPackageLineApi } from '#/api/mes/wm/packages/line';
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode, MesProWorkOrderStatusEnum } from '@vben/constants';
 
 import { ElButton } from 'element-plus';
 
@@ -15,10 +15,6 @@ import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vu
 import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
 import { MdUnitMeasureSelect } from '#/views/mes/md/unitmeasure/components';
 import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
-import {
-  MesAutoCodeRuleCode,
-  MesProWorkOrderStatusEnum,
-} from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-ele/src/views/mes/wm/packages/index.vue b/apps/web-ele/src/views/mes/wm/packages/index.vue
index 109774c91..4ff55baab 100644
--- a/apps/web-ele/src/views/mes/wm/packages/index.vue
+++ b/apps/web-ele/src/views/mes/wm/packages/index.vue
@@ -5,13 +5,13 @@ import type { MesWmPackageApi } from '#/api/mes/wm/packages';
 import { ref } from 'vue';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesWmPackageStatusEnum } from '@vben/constants';
 
 import { ElButton, ElLoading, ElMessage } from 'element-plus';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { deletePackage, getPackagePage } from '#/api/mes/wm/packages';
 import { $t } from '#/locales';
-import { MesWmPackageStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-ele/src/views/mes/wm/packages/modules/form.vue b/apps/web-ele/src/views/mes/wm/packages/modules/form.vue
index 18453128c..986772903 100644
--- a/apps/web-ele/src/views/mes/wm/packages/modules/form.vue
+++ b/apps/web-ele/src/views/mes/wm/packages/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesWmPackageApi } from '#/api/mes/wm/packages';
 import { computed, ref } from 'vue';
 
 import { confirm, useVbenModal } from '@vben/common-ui';
+import { MesWmPackageStatusEnum } from '@vben/constants';
 
 import { ElButton, ElMessage, ElTabPane, ElTabs } from 'element-plus';
 
@@ -17,7 +18,6 @@ import {
   updatePackage,
 } from '#/api/mes/wm/packages';
 import { $t } from '#/locales';
-import { MesWmPackageStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 import PackageLineList from './package-line-list.vue';
diff --git a/apps/web-ele/src/views/mes/wm/productissue/data.ts b/apps/web-ele/src/views/mes/wm/productissue/data.ts
index 6891918e0..70ba78c49 100644
--- a/apps/web-ele/src/views/mes/wm/productissue/data.ts
+++ b/apps/web-ele/src/views/mes/wm/productissue/data.ts
@@ -7,7 +7,7 @@ import type { MesWmProductIssueLineApi } from '#/api/mes/wm/productissue/line';
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode, MesProWorkOrderStatusEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { ElButton } from 'element-plus';
@@ -17,10 +17,6 @@ import { getRangePickerDefaultProps } from '#/utils';
 import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
 import MdWorkstationSelect from '#/views/mes/md/workstation/components/md-workstation-select.vue';
 import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
-import {
-  MesAutoCodeRuleCode,
-  MesProWorkOrderStatusEnum,
-} from '#/views/mes/utils/constants';
 import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
 import {
   WmWarehouseAreaSelect,
diff --git a/apps/web-ele/src/views/mes/wm/productissue/index.vue b/apps/web-ele/src/views/mes/wm/productissue/index.vue
index c1e8bb461..f8df8dc50 100644
--- a/apps/web-ele/src/views/mes/wm/productissue/index.vue
+++ b/apps/web-ele/src/views/mes/wm/productissue/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesWmProductIssueApi } from '#/api/mes/wm/productissue';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesWmProductIssueStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { ElButton, ElLoading, ElMessage } from 'element-plus';
@@ -16,7 +17,6 @@ import {
   submitProductIssue,
 } from '#/api/mes/wm/productissue';
 import { $t } from '#/locales';
-import { MesWmProductIssueStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-ele/src/views/mes/wm/productissue/modules/form.vue b/apps/web-ele/src/views/mes/wm/productissue/modules/form.vue
index a5dc6f97c..22ef7f243 100644
--- a/apps/web-ele/src/views/mes/wm/productissue/modules/form.vue
+++ b/apps/web-ele/src/views/mes/wm/productissue/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesWmProductIssueApi } from '#/api/mes/wm/productissue';
 import { computed, ref } from 'vue';
 
 import { confirm, useVbenModal } from '@vben/common-ui';
+import { MesWmProductIssueStatusEnum } from '@vben/constants';
 
 import { ElButton, ElDivider, ElMessage, ElPopconfirm } from 'element-plus';
 
@@ -20,7 +21,6 @@ import {
   updateProductIssue,
 } from '#/api/mes/wm/productissue';
 import { $t } from '#/locales';
-import { MesWmProductIssueStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 import LineList from './line-list.vue';
diff --git a/apps/web-ele/src/views/mes/wm/productreceipt/data.ts b/apps/web-ele/src/views/mes/wm/productreceipt/data.ts
index 159c99407..922f213a7 100644
--- a/apps/web-ele/src/views/mes/wm/productreceipt/data.ts
+++ b/apps/web-ele/src/views/mes/wm/productreceipt/data.ts
@@ -7,7 +7,7 @@ import type { MesWmProductReceiptLineApi } from '#/api/mes/wm/productreceipt/lin
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode, MesProWorkOrderStatusEnum } from '@vben/constants';
 
 import { ElButton } from 'element-plus';
 
@@ -15,10 +15,6 @@ import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getRangePickerDefaultProps } from '#/utils';
 import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
 import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
-import {
-  MesAutoCodeRuleCode,
-  MesProWorkOrderStatusEnum,
-} from '#/views/mes/utils/constants';
 import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
 import {
   WmWarehouseAreaSelect,
diff --git a/apps/web-ele/src/views/mes/wm/productreceipt/index.vue b/apps/web-ele/src/views/mes/wm/productreceipt/index.vue
index 0b0f7094c..54516000b 100644
--- a/apps/web-ele/src/views/mes/wm/productreceipt/index.vue
+++ b/apps/web-ele/src/views/mes/wm/productreceipt/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesWmProductReceiptApi } from '#/api/mes/wm/productreceipt';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesWmProductReceiptStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { ElButton, ElLoading, ElMessage } from 'element-plus';
@@ -15,7 +16,6 @@ import {
   getProductReceiptPage,
 } from '#/api/mes/wm/productreceipt';
 import { $t } from '#/locales';
-import { MesWmProductReceiptStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-ele/src/views/mes/wm/productreceipt/modules/form.vue b/apps/web-ele/src/views/mes/wm/productreceipt/modules/form.vue
index cd6598021..c0b85ae87 100644
--- a/apps/web-ele/src/views/mes/wm/productreceipt/modules/form.vue
+++ b/apps/web-ele/src/views/mes/wm/productreceipt/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesWmProductReceiptApi } from '#/api/mes/wm/productreceipt';
 import { computed, ref } from 'vue';
 
 import { confirm, useVbenModal } from '@vben/common-ui';
+import { MesWmProductReceiptStatusEnum } from '@vben/constants';
 
 import { ElButton, ElDivider, ElMessage, ElPopconfirm } from 'element-plus';
 
@@ -20,7 +21,6 @@ import {
   updateProductReceipt,
 } from '#/api/mes/wm/productreceipt';
 import { $t } from '#/locales';
-import { MesWmProductReceiptStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 import LineList from './line-list.vue';
diff --git a/apps/web-ele/src/views/mes/wm/productreceipt/modules/line-list.vue b/apps/web-ele/src/views/mes/wm/productreceipt/modules/line-list.vue
index 49acca838..91bf70690 100644
--- a/apps/web-ele/src/views/mes/wm/productreceipt/modules/line-list.vue
+++ b/apps/web-ele/src/views/mes/wm/productreceipt/modules/line-list.vue
@@ -6,6 +6,7 @@ import type { MesWmProductReceiptLineApi } from '#/api/mes/wm/productreceipt/lin
 import { computed, reactive, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { BarcodeBizTypeEnum } from '@vben/constants';
 
 import { ElLoading, ElMessage } from 'element-plus';
 
@@ -16,7 +17,6 @@ import {
   getProductReceiptLinePage,
 } from '#/api/mes/wm/productreceipt/line';
 import { $t } from '#/locales';
-import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
 import { BarcodeDetail, PrinterLabel } from '#/views/mes/wm/barcode/components';
 
 import { type FormType, useLineGridColumns } from '../data';
diff --git a/apps/web-ele/src/views/mes/wm/productsales/data.ts b/apps/web-ele/src/views/mes/wm/productsales/data.ts
index 6be36f29d..12afc9b78 100644
--- a/apps/web-ele/src/views/mes/wm/productsales/data.ts
+++ b/apps/web-ele/src/views/mes/wm/productsales/data.ts
@@ -9,7 +9,7 @@ import type { MesWmSalesNoticeLineApi } from '#/api/mes/wm/salesnotice/line';
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode, MesWmSalesNoticeStatusEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { ElButton } from 'element-plus';
@@ -19,10 +19,6 @@ import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getRangePickerDefaultProps } from '#/utils';
 import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
 import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
-import {
-  MesAutoCodeRuleCode,
-  MesWmSalesNoticeStatusEnum,
-} from '#/views/mes/utils/constants';
 import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
 import {
   WmSalesNoticeLineSelect,
diff --git a/apps/web-ele/src/views/mes/wm/productsales/index.vue b/apps/web-ele/src/views/mes/wm/productsales/index.vue
index fef659867..0c5c6bae2 100644
--- a/apps/web-ele/src/views/mes/wm/productsales/index.vue
+++ b/apps/web-ele/src/views/mes/wm/productsales/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesWmProductSalesApi } from '#/api/mes/wm/productsales';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesWmProductSalesStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { ElButton, ElLoading, ElMessage } from 'element-plus';
@@ -15,7 +16,6 @@ import {
   getProductSalesPage,
 } from '#/api/mes/wm/productsales';
 import { $t } from '#/locales';
-import { MesWmProductSalesStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-ele/src/views/mes/wm/productsales/modules/form.vue b/apps/web-ele/src/views/mes/wm/productsales/modules/form.vue
index e2caa6f04..d530f0707 100644
--- a/apps/web-ele/src/views/mes/wm/productsales/modules/form.vue
+++ b/apps/web-ele/src/views/mes/wm/productsales/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesWmProductSalesApi } from '#/api/mes/wm/productsales';
 import { computed, ref } from 'vue';
 
 import { confirm, useVbenModal } from '@vben/common-ui';
+import { MesWmProductSalesStatusEnum } from '@vben/constants';
 
 import { ElButton, ElDivider, ElMessage, ElPopconfirm } from 'element-plus';
 
@@ -21,7 +22,6 @@ import {
   updateProductSales,
 } from '#/api/mes/wm/productsales';
 import { $t } from '#/locales';
-import { MesWmProductSalesStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 import LineList from './line-list.vue';
diff --git a/apps/web-ele/src/views/mes/wm/returnissue/data.ts b/apps/web-ele/src/views/mes/wm/returnissue/data.ts
index 1c7af56c6..b94027e40 100644
--- a/apps/web-ele/src/views/mes/wm/returnissue/data.ts
+++ b/apps/web-ele/src/views/mes/wm/returnissue/data.ts
@@ -7,7 +7,7 @@ import type { MesWmReturnIssueLineApi } from '#/api/mes/wm/returnissue/line';
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode, MesProWorkOrderStatusEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { ElButton } from 'element-plus';
@@ -17,10 +17,6 @@ import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
 import MdWorkstationSelect from '#/views/mes/md/workstation/components/md-workstation-select.vue';
 import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
-import {
-  MesAutoCodeRuleCode,
-  MesProWorkOrderStatusEnum,
-} from '#/views/mes/utils/constants';
 import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
 import {
   WmWarehouseAreaSelect,
diff --git a/apps/web-ele/src/views/mes/wm/returnissue/index.vue b/apps/web-ele/src/views/mes/wm/returnissue/index.vue
index 337029bab..af27ef9f8 100644
--- a/apps/web-ele/src/views/mes/wm/returnissue/index.vue
+++ b/apps/web-ele/src/views/mes/wm/returnissue/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesWmReturnIssueApi } from '#/api/mes/wm/returnissue';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesWmReturnIssueStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { ElButton, ElLoading, ElMessage } from 'element-plus';
@@ -15,7 +16,6 @@ import {
   getReturnIssuePage,
 } from '#/api/mes/wm/returnissue';
 import { $t } from '#/locales';
-import { MesWmReturnIssueStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-ele/src/views/mes/wm/returnissue/modules/form.vue b/apps/web-ele/src/views/mes/wm/returnissue/modules/form.vue
index b8e4c6d09..441f811d9 100644
--- a/apps/web-ele/src/views/mes/wm/returnissue/modules/form.vue
+++ b/apps/web-ele/src/views/mes/wm/returnissue/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesWmReturnIssueApi } from '#/api/mes/wm/returnissue';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { MesWmReturnIssueStatusEnum } from '@vben/constants';
 
 import { ElButton, ElDivider, ElMessage, ElPopconfirm } from 'element-plus';
 
@@ -19,7 +20,6 @@ import {
   updateReturnIssue,
 } from '#/api/mes/wm/returnissue';
 import { $t } from '#/locales';
-import { MesWmReturnIssueStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 import LineList from './line-list.vue';
diff --git a/apps/web-ele/src/views/mes/wm/returnissue/modules/line-list.vue b/apps/web-ele/src/views/mes/wm/returnissue/modules/line-list.vue
index b1f9374e1..4cabb8f9d 100644
--- a/apps/web-ele/src/views/mes/wm/returnissue/modules/line-list.vue
+++ b/apps/web-ele/src/views/mes/wm/returnissue/modules/line-list.vue
@@ -6,6 +6,7 @@ import type { MesWmReturnIssueLineApi } from '#/api/mes/wm/returnissue/line';
 import { computed, reactive, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { BarcodeBizTypeEnum } from '@vben/constants';
 
 import { ElLoading, ElMessage } from 'element-plus';
 
@@ -16,7 +17,6 @@ import {
   getReturnIssueLinePage,
 } from '#/api/mes/wm/returnissue/line';
 import { $t } from '#/locales';
-import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
 import { BarcodeDetail, PrinterLabel } from '#/views/mes/wm/barcode/components';
 
 import { type FormType, useLineGridColumns } from '../data';
diff --git a/apps/web-ele/src/views/mes/wm/returnsales/data.ts b/apps/web-ele/src/views/mes/wm/returnsales/data.ts
index 8924217cf..d42f8cf74 100644
--- a/apps/web-ele/src/views/mes/wm/returnsales/data.ts
+++ b/apps/web-ele/src/views/mes/wm/returnsales/data.ts
@@ -6,7 +6,7 @@ import type { MesWmReturnSalesLineApi } from '#/api/mes/wm/returnsales/line';
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { ElButton } from 'element-plus';
@@ -15,7 +15,6 @@ import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
 import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 import { WmBatchSelect } from '#/views/mes/wm/batch/components';
 import {
   WmWarehouseAreaSelect,
diff --git a/apps/web-ele/src/views/mes/wm/returnsales/index.vue b/apps/web-ele/src/views/mes/wm/returnsales/index.vue
index 7f36786c4..3f4e1e1a6 100644
--- a/apps/web-ele/src/views/mes/wm/returnsales/index.vue
+++ b/apps/web-ele/src/views/mes/wm/returnsales/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesWmReturnSalesApi } from '#/api/mes/wm/returnsales';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesWmReturnSalesStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { ElButton, ElLoading, ElMessage } from 'element-plus';
@@ -15,7 +16,6 @@ import {
   getReturnSalesPage,
 } from '#/api/mes/wm/returnsales';
 import { $t } from '#/locales';
-import { MesWmReturnSalesStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-ele/src/views/mes/wm/returnsales/modules/form.vue b/apps/web-ele/src/views/mes/wm/returnsales/modules/form.vue
index cd34c9798..496616f6f 100644
--- a/apps/web-ele/src/views/mes/wm/returnsales/modules/form.vue
+++ b/apps/web-ele/src/views/mes/wm/returnsales/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesWmReturnSalesApi } from '#/api/mes/wm/returnsales';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { MesWmReturnSalesStatusEnum } from '@vben/constants';
 
 import { ElButton, ElDivider, ElMessage, ElPopconfirm } from 'element-plus';
 
@@ -19,7 +20,6 @@ import {
   updateReturnSales,
 } from '#/api/mes/wm/returnsales';
 import { $t } from '#/locales';
-import { MesWmReturnSalesStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 import LineList from './line-list.vue';
diff --git a/apps/web-ele/src/views/mes/wm/returnvendor/data.ts b/apps/web-ele/src/views/mes/wm/returnvendor/data.ts
index 2c551bc2e..e8ce8023e 100644
--- a/apps/web-ele/src/views/mes/wm/returnvendor/data.ts
+++ b/apps/web-ele/src/views/mes/wm/returnvendor/data.ts
@@ -7,14 +7,13 @@ import type { MesWmReturnVendorLineApi } from '#/api/mes/wm/returnvendor/line';
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode } from '@vben/constants';
 
 import { ElButton } from 'element-plus';
 
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
 import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 import { WmBatchSelect } from '#/views/mes/wm/batch/components';
 import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
 import {
diff --git a/apps/web-ele/src/views/mes/wm/returnvendor/index.vue b/apps/web-ele/src/views/mes/wm/returnvendor/index.vue
index 28e534d65..6572c71c7 100644
--- a/apps/web-ele/src/views/mes/wm/returnvendor/index.vue
+++ b/apps/web-ele/src/views/mes/wm/returnvendor/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesWmReturnVendorApi } from '#/api/mes/wm/returnvendor';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesWmReturnVendorStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { ElButton, ElLoading, ElMessage } from 'element-plus';
@@ -15,7 +16,6 @@ import {
   getReturnVendorPage,
 } from '#/api/mes/wm/returnvendor';
 import { $t } from '#/locales';
-import { MesWmReturnVendorStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-ele/src/views/mes/wm/returnvendor/modules/form.vue b/apps/web-ele/src/views/mes/wm/returnvendor/modules/form.vue
index bf17b4d9a..206010982 100644
--- a/apps/web-ele/src/views/mes/wm/returnvendor/modules/form.vue
+++ b/apps/web-ele/src/views/mes/wm/returnvendor/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesWmReturnVendorApi } from '#/api/mes/wm/returnvendor';
 import { computed, ref } from 'vue';
 
 import { confirm, useVbenModal } from '@vben/common-ui';
+import { MesWmReturnVendorStatusEnum } from '@vben/constants';
 
 import { ElButton, ElDivider, ElMessage, ElPopconfirm } from 'element-plus';
 
@@ -20,7 +21,6 @@ import {
   updateReturnVendor,
 } from '#/api/mes/wm/returnvendor';
 import { $t } from '#/locales';
-import { MesWmReturnVendorStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 import LineList from './line-list.vue';
diff --git a/apps/web-ele/src/views/mes/wm/salesnotice/data.ts b/apps/web-ele/src/views/mes/wm/salesnotice/data.ts
index 35c0c8512..42012d680 100644
--- a/apps/web-ele/src/views/mes/wm/salesnotice/data.ts
+++ b/apps/web-ele/src/views/mes/wm/salesnotice/data.ts
@@ -5,7 +5,7 @@ import type { MesWmSalesNoticeLineApi } from '#/api/mes/wm/salesnotice/line';
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode } from '@vben/constants';
 
 import { ElButton } from 'element-plus';
 
@@ -13,7 +13,6 @@ import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
 import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'finish' | 'update';
diff --git a/apps/web-ele/src/views/mes/wm/salesnotice/index.vue b/apps/web-ele/src/views/mes/wm/salesnotice/index.vue
index 14e72784f..deaca48e2 100644
--- a/apps/web-ele/src/views/mes/wm/salesnotice/index.vue
+++ b/apps/web-ele/src/views/mes/wm/salesnotice/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesWmSalesNoticeApi } from '#/api/mes/wm/salesnotice';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesWmSalesNoticeStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { ElButton, ElLoading, ElMessage } from 'element-plus';
@@ -14,7 +15,6 @@ import {
   getSalesNoticePage,
 } from '#/api/mes/wm/salesnotice';
 import { $t } from '#/locales';
-import { MesWmSalesNoticeStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-ele/src/views/mes/wm/salesnotice/modules/form.vue b/apps/web-ele/src/views/mes/wm/salesnotice/modules/form.vue
index 3a1f1258c..501dc00c3 100644
--- a/apps/web-ele/src/views/mes/wm/salesnotice/modules/form.vue
+++ b/apps/web-ele/src/views/mes/wm/salesnotice/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesWmSalesNoticeApi } from '#/api/mes/wm/salesnotice';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { MesWmSalesNoticeStatusEnum } from '@vben/constants';
 
 import { ElButton, ElDivider, ElMessage, ElPopconfirm } from 'element-plus';
 
@@ -17,7 +18,6 @@ import {
   updateSalesNotice,
 } from '#/api/mes/wm/salesnotice';
 import { $t } from '#/locales';
-import { MesWmSalesNoticeStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 import LineList from './line-list.vue';
diff --git a/apps/web-ele/src/views/mes/wm/stocktaking/plan/data.ts b/apps/web-ele/src/views/mes/wm/stocktaking/plan/data.ts
index ba61b68cc..dfe31fa17 100644
--- a/apps/web-ele/src/views/mes/wm/stocktaking/plan/data.ts
+++ b/apps/web-ele/src/views/mes/wm/stocktaking/plan/data.ts
@@ -3,19 +3,15 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesWmStockTakingPlanApi } from '#/api/mes/wm/stocktaking/plan';
 import type { MesWmStockTakingPlanParamApi } from '#/api/mes/wm/stocktaking/plan/param';
 
-import { h } from 'vue';
+import { DICT_TYPE, h } from 'vue';
 
-import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { CommonStatusEnum, MesAutoCodeRuleCode, MesWmStockTakingTypeEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { ElButton } from 'element-plus';
 
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
-import {
-  MesAutoCodeRuleCode,
-  MesWmStockTakingTypeEnum,
-} from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-ele/src/views/mes/wm/stocktaking/plan/modules/param-form.vue b/apps/web-ele/src/views/mes/wm/stocktaking/plan/modules/param-form.vue
index 57a6c9549..f428d9ce4 100644
--- a/apps/web-ele/src/views/mes/wm/stocktaking/plan/modules/param-form.vue
+++ b/apps/web-ele/src/views/mes/wm/stocktaking/plan/modules/param-form.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import type { MesWmStockTakingPlanParamApi } from '#/api/mes/wm/stocktaking/plan/param';
 
-import { computed, ref } from 'vue';
+import { computed, MesWmStockTakingParamTypeEnum, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
 import { DICT_TYPE } from '@vben/constants';
@@ -25,7 +25,6 @@ import { getWarehouseArea } from '#/api/mes/wm/warehouse/area';
 import { getWarehouseLocation } from '#/api/mes/wm/warehouse/location';
 import { $t } from '#/locales';
 import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
-import { MesWmStockTakingParamTypeEnum } from '#/views/mes/utils/constants';
 import { WmBatchSelect } from '#/views/mes/wm/batch/components';
 import {
   WmWarehouseAreaSelect,
diff --git a/apps/web-ele/src/views/mes/wm/stocktaking/task/data.ts b/apps/web-ele/src/views/mes/wm/stocktaking/task/data.ts
index 86b025d5a..697a77559 100644
--- a/apps/web-ele/src/views/mes/wm/stocktaking/task/data.ts
+++ b/apps/web-ele/src/views/mes/wm/stocktaking/task/data.ts
@@ -7,7 +7,7 @@ import type { MesWmStockTakingResultApi } from '#/api/mes/wm/stocktaking/task/re
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode, MesWmStockTakingTypeEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { ElButton } from 'element-plus';
@@ -17,10 +17,6 @@ import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
-import {
-  MesAutoCodeRuleCode,
-  MesWmStockTakingTypeEnum,
-} from '#/views/mes/utils/constants';
 import { StockTakingPlanSelect } from '#/views/mes/wm/stocktaking/plan/components';
 import {
   WmWarehouseAreaSelect,
diff --git a/apps/web-ele/src/views/mes/wm/stocktaking/task/index.vue b/apps/web-ele/src/views/mes/wm/stocktaking/task/index.vue
index 4f6e3c2f8..def9c0029 100644
--- a/apps/web-ele/src/views/mes/wm/stocktaking/task/index.vue
+++ b/apps/web-ele/src/views/mes/wm/stocktaking/task/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesWmStockTakingTaskApi } from '#/api/mes/wm/stocktaking/task';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesWmStockTakingTaskStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { ElButton, ElLoading, ElMessage } from 'element-plus';
@@ -15,7 +16,6 @@ import {
   getStockTakingPage,
 } from '#/api/mes/wm/stocktaking/task';
 import { $t } from '#/locales';
-import { MesWmStockTakingTaskStatusEnum } from '#/views/mes/utils/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-ele/src/views/mes/wm/stocktaking/task/modules/form.vue b/apps/web-ele/src/views/mes/wm/stocktaking/task/modules/form.vue
index 9a37e207c..e2dfb6e60 100644
--- a/apps/web-ele/src/views/mes/wm/stocktaking/task/modules/form.vue
+++ b/apps/web-ele/src/views/mes/wm/stocktaking/task/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesWmStockTakingTaskApi } from '#/api/mes/wm/stocktaking/task';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { MesWmStockTakingTaskStatusEnum } from '@vben/constants';
 import { useUserStore } from '@vben/stores';
 
 import { ElButton, ElMessage, ElPopconfirm, ElTabPane, ElTabs } from 'element-plus';
@@ -19,7 +20,6 @@ import {
   updateStockTaking,
 } from '#/api/mes/wm/stocktaking/task';
 import { $t } from '#/locales';
-import { MesWmStockTakingTaskStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 import LineList from './line-list.vue';
diff --git a/apps/web-ele/src/views/mes/wm/transfer/data.ts b/apps/web-ele/src/views/mes/wm/transfer/data.ts
index 385f8183f..53b5ccf70 100644
--- a/apps/web-ele/src/views/mes/wm/transfer/data.ts
+++ b/apps/web-ele/src/views/mes/wm/transfer/data.ts
@@ -7,7 +7,7 @@ import type { MesWmTransferLineApi } from '#/api/mes/wm/transfer/line';
 
 import { h, markRaw } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode, MesWmTransferTypeEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { ElButton } from 'element-plus';
@@ -15,10 +15,6 @@ import { ElButton } from 'element-plus';
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { MdItemSelect } from '#/views/mes/md/item/components';
-import {
-  MesAutoCodeRuleCode,
-  MesWmTransferTypeEnum,
-} from '/constants';
 import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
 import {
   WmWarehouseAreaSelect,
diff --git a/apps/web-ele/src/views/mes/wm/transfer/index.vue b/apps/web-ele/src/views/mes/wm/transfer/index.vue
index 82d13670a..3371e704b 100644
--- a/apps/web-ele/src/views/mes/wm/transfer/index.vue
+++ b/apps/web-ele/src/views/mes/wm/transfer/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesWmTransferApi } from '#/api/mes/wm/transfer';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { MesWmTransferStatusEnum } from '@vben/constants';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { ElButton, ElLoading, ElMessage } from 'element-plus';
@@ -15,7 +16,6 @@ import {
   getTransferPage,
 } from '#/api/mes/wm/transfer';
 import { $t } from '#/locales';
-import { MesWmTransferStatusEnum } from '/constants';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
diff --git a/apps/web-ele/src/views/mes/wm/transfer/modules/form.vue b/apps/web-ele/src/views/mes/wm/transfer/modules/form.vue
index c6a972619..985df605b 100644
--- a/apps/web-ele/src/views/mes/wm/transfer/modules/form.vue
+++ b/apps/web-ele/src/views/mes/wm/transfer/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesWmTransferApi } from '#/api/mes/wm/transfer';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { MesWmTransferStatusEnum } from '@vben/constants';
 
 import { ElButton, ElDivider, ElMessage, ElPopconfirm } from 'element-plus';
 
@@ -20,7 +21,6 @@ import {
   updateTransfer,
 } from '#/api/mes/wm/transfer';
 import { $t } from '#/locales';
-import { MesWmTransferStatusEnum } from '/constants';
 
 import { useFormSchema } from '../data';
 import LineList from './line-list.vue';
diff --git a/apps/web-ele/src/views/mes/wm/warehouse/area/data.ts b/apps/web-ele/src/views/mes/wm/warehouse/area/data.ts
index d787774c3..c4e0f226c 100644
--- a/apps/web-ele/src/views/mes/wm/warehouse/area/data.ts
+++ b/apps/web-ele/src/views/mes/wm/warehouse/area/data.ts
@@ -2,9 +2,9 @@ import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesWmWarehouseAreaApi } from '#/api/mes/wm/warehouse/area';
 
-import { h } from 'vue';
+import { DICT_TYPE, h } from 'vue';
 
-import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { CommonStatusEnum, MesAutoCodeRuleCode } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { ElButton } from 'element-plus';
@@ -13,7 +13,6 @@ import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getWarehouseSimpleList } from '#/api/mes/wm/warehouse';
 import { getWarehouseLocationSimpleList } from '#/api/mes/wm/warehouse/location';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-ele/src/views/mes/wm/warehouse/area/index.vue b/apps/web-ele/src/views/mes/wm/warehouse/area/index.vue
index b0f4a441c..305b5dffb 100644
--- a/apps/web-ele/src/views/mes/wm/warehouse/area/index.vue
+++ b/apps/web-ele/src/views/mes/wm/warehouse/area/index.vue
@@ -6,6 +6,7 @@ import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { BarcodeBizTypeEnum } from '@vben/constants';
 
 import { ElAlert, ElButton, ElLoading, ElMessage } from 'element-plus';
 
@@ -16,7 +17,6 @@ import {
 } from '#/api/mes/wm/warehouse/area';
 import { getWarehouseLocation } from '#/api/mes/wm/warehouse/location';
 import { $t } from '#/locales';
-import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
 
 import { BarcodeDetail } from '../../barcode/components';
 import { useGridColumns, useGridFormSchema } from './data';
diff --git a/apps/web-ele/src/views/mes/wm/warehouse/area/modules/form.vue b/apps/web-ele/src/views/mes/wm/warehouse/area/modules/form.vue
index 1d31e18bb..140782a86 100644
--- a/apps/web-ele/src/views/mes/wm/warehouse/area/modules/form.vue
+++ b/apps/web-ele/src/views/mes/wm/warehouse/area/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesWmWarehouseAreaApi } from '#/api/mes/wm/warehouse/area';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { BarcodeBizTypeEnum } from '@vben/constants';
 
 import { ElButton, ElMessage } from 'element-plus';
 
@@ -17,7 +18,6 @@ import {
 } from '#/api/mes/wm/warehouse/area';
 import { getWarehouseLocation } from '#/api/mes/wm/warehouse/location';
 import { $t } from '#/locales';
-import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
 import { BarcodeDetail } from '#/views/mes/wm/barcode/components';
 
 import { useFormSchema } from '../data';
diff --git a/apps/web-ele/src/views/mes/wm/warehouse/data.ts b/apps/web-ele/src/views/mes/wm/warehouse/data.ts
index 5516a3ce4..87e80d57f 100644
--- a/apps/web-ele/src/views/mes/wm/warehouse/data.ts
+++ b/apps/web-ele/src/views/mes/wm/warehouse/data.ts
@@ -5,14 +5,13 @@ import type { SystemUserApi } from '#/api/system/user';
 
 import { h } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode } from '@vben/constants';
 
 import { ElButton } from 'element-plus';
 
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getSimpleUserList } from '#/api/system/user';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-ele/src/views/mes/wm/warehouse/index.vue b/apps/web-ele/src/views/mes/wm/warehouse/index.vue
index 92a9e4059..e95b35278 100644
--- a/apps/web-ele/src/views/mes/wm/warehouse/index.vue
+++ b/apps/web-ele/src/views/mes/wm/warehouse/index.vue
@@ -6,13 +6,13 @@ import { ref } from 'vue';
 import { useRouter } from 'vue-router';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { BarcodeBizTypeEnum } from '@vben/constants';
 
 import { ElButton, ElLoading, ElMessage } from 'element-plus';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { deleteWarehouse, getWarehousePage } from '#/api/mes/wm/warehouse';
 import { $t } from '#/locales';
-import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
 
 import { BarcodeDetail } from '../barcode/components';
 import { useGridColumns, useGridFormSchema } from './data';
diff --git a/apps/web-ele/src/views/mes/wm/warehouse/location/data.ts b/apps/web-ele/src/views/mes/wm/warehouse/location/data.ts
index dbba0d318..9d2b41a70 100644
--- a/apps/web-ele/src/views/mes/wm/warehouse/location/data.ts
+++ b/apps/web-ele/src/views/mes/wm/warehouse/location/data.ts
@@ -5,14 +5,13 @@ import type { MesWmWarehouseLocationApi } from '#/api/mes/wm/warehouse/location'
 
 import { h } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, MesAutoCodeRuleCode } from '@vben/constants';
 
 import { ElButton } from 'element-plus';
 
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getWarehouseSimpleList } from '#/api/mes/wm/warehouse';
-import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-ele/src/views/mes/wm/warehouse/location/index.vue b/apps/web-ele/src/views/mes/wm/warehouse/location/index.vue
index 87bad456e..5dbae2d49 100644
--- a/apps/web-ele/src/views/mes/wm/warehouse/location/index.vue
+++ b/apps/web-ele/src/views/mes/wm/warehouse/location/index.vue
@@ -6,6 +6,7 @@ import { ref } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { BarcodeBizTypeEnum } from '@vben/constants';
 
 import { ElAlert, ElButton, ElLoading, ElMessage } from 'element-plus';
 
@@ -16,7 +17,6 @@ import {
   getWarehouseLocationPage,
 } from '#/api/mes/wm/warehouse/location';
 import { $t } from '#/locales';
-import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
 
 import { BarcodeDetail } from '../../barcode/components';
 import { useGridColumns, useGridFormSchema } from './data';
diff --git a/apps/web-ele/src/views/mes/wm/warehouse/location/modules/form.vue b/apps/web-ele/src/views/mes/wm/warehouse/location/modules/form.vue
index 59ca8eb28..156f81199 100644
--- a/apps/web-ele/src/views/mes/wm/warehouse/location/modules/form.vue
+++ b/apps/web-ele/src/views/mes/wm/warehouse/location/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesWmWarehouseLocationApi } from '#/api/mes/wm/warehouse/location'
 import { computed, ref } from 'vue';
 
 import { confirm, useVbenModal } from '@vben/common-ui';
+import { BarcodeBizTypeEnum } from '@vben/constants';
 
 import { ElButton, ElMessage } from 'element-plus';
 
@@ -17,7 +18,6 @@ import {
   updateWarehouseLocation,
 } from '#/api/mes/wm/warehouse/location';
 import { $t } from '#/locales';
-import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
 import { BarcodeDetail } from '#/views/mes/wm/barcode/components';
 
 import { useFormSchema } from '../data';
diff --git a/apps/web-ele/src/views/mes/wm/warehouse/modules/form.vue b/apps/web-ele/src/views/mes/wm/warehouse/modules/form.vue
index c944e9498..0b4c82bc9 100644
--- a/apps/web-ele/src/views/mes/wm/warehouse/modules/form.vue
+++ b/apps/web-ele/src/views/mes/wm/warehouse/modules/form.vue
@@ -6,6 +6,7 @@ import type { MesWmWarehouseApi } from '#/api/mes/wm/warehouse';
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { BarcodeBizTypeEnum } from '@vben/constants';
 
 import { ElButton, ElMessage } from 'element-plus';
 
@@ -16,7 +17,6 @@ import {
   updateWarehouse,
 } from '#/api/mes/wm/warehouse';
 import { $t } from '#/locales';
-import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants';
 import { BarcodeDetail } from '#/views/mes/wm/barcode/components';
 
 import { useFormSchema } from '../data';
diff --git a/apps/web-ele/src/views/wms/home/modules/wms-home-order-summary-cards.vue b/apps/web-ele/src/views/wms/home/modules/wms-home-order-summary-cards.vue
index 69ce6b66e..fa5927912 100644
--- a/apps/web-ele/src/views/wms/home/modules/wms-home-order-summary-cards.vue
+++ b/apps/web-ele/src/views/wms/home/modules/wms-home-order-summary-cards.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import type { WmsHomeStatisticsApi } from '#/api/wms/home';
 
-import { ref } from 'vue';
+import { OrderStatusEnum, OrderTypeEnum, ref } from 'vue';
 import { useRouter } from 'vue-router';
 
 import { DICT_TYPE } from '@vben/constants';
@@ -10,7 +10,6 @@ import { getDictLabel } from '@vben/hooks';
 import { ElButton, ElCard, ElMessage, ElSkeleton } from 'element-plus';
 
 import { getOrderSummary } from '#/api/wms/home';
-import { OrderStatusEnum, OrderTypeEnum } from '#/views/wms/utils/constants';
 
 defineOptions({ name: 'WmsHomeOrderSummaryCards' });
 
diff --git a/apps/web-ele/src/views/wms/home/modules/wms-home-order-trend-chart-options.ts b/apps/web-ele/src/views/wms/home/modules/wms-home-order-trend-chart-options.ts
index f2b6c5832..9e76d9d4f 100644
--- a/apps/web-ele/src/views/wms/home/modules/wms-home-order-trend-chart-options.ts
+++ b/apps/web-ele/src/views/wms/home/modules/wms-home-order-trend-chart-options.ts
@@ -2,12 +2,10 @@ import type { EChartsOption } from '@vben/plugins/echarts';
 
 import type { WmsHomeStatisticsApi } from '#/api/wms/home';
 
-import { DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE, OrderTypeEnum } from '@vben/constants';
 import { getDictLabel } from '@vben/hooks';
 import { formatDate } from '@vben/utils';
 
-import { OrderTypeEnum } from '/constants';
-
 interface OrderDefinition {
   color: string;
   title: string;
diff --git a/apps/web-ele/src/views/wms/md/item/brand/data.ts b/apps/web-ele/src/views/wms/md/item/brand/data.ts
index 692c23138..d92bc7cb6 100644
--- a/apps/web-ele/src/views/wms/md/item/brand/data.ts
+++ b/apps/web-ele/src/views/wms/md/item/brand/data.ts
@@ -3,10 +3,11 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
 import { h } from 'vue';
 
+import { generateWmsCode } from '@vben/constants';
+
 import { ElButton } from 'element-plus';
 
 import { z } from '#/adapter/form';
-import { generateWmsCode } from '#/views/wms/utils/constants';
 
 /** 新增/修改商品品牌的表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
diff --git a/apps/web-ele/src/views/wms/md/item/category/data.ts b/apps/web-ele/src/views/wms/md/item/category/data.ts
index be1da0778..54909673c 100644
--- a/apps/web-ele/src/views/wms/md/item/category/data.ts
+++ b/apps/web-ele/src/views/wms/md/item/category/data.ts
@@ -2,9 +2,9 @@ import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { WmsItemCategoryApi } from '#/api/wms/md/item/category';
 
-import { h } from 'vue';
+import { DICT_TYPE, generateWmsCode, h } from 'vue';
 
-import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { CommonStatusEnum } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 import { handleTree } from '@vben/utils';
 
@@ -12,7 +12,6 @@ import { ElButton } from 'element-plus';
 
 import { z } from '#/adapter/form';
 import { getItemCategorySimpleList } from '#/api/wms/md/item/category';
-import { generateWmsCode } from '#/views/wms/utils/constants';
 
 /** 新增/修改商品分类的表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
diff --git a/apps/web-ele/src/views/wms/md/item/data.ts b/apps/web-ele/src/views/wms/md/item/data.ts
index e8463a57a..4fee450cd 100644
--- a/apps/web-ele/src/views/wms/md/item/data.ts
+++ b/apps/web-ele/src/views/wms/md/item/data.ts
@@ -3,11 +3,12 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
 import { h, markRaw } from 'vue';
 
+import { generateWmsCode } from '@vben/constants';
+
 import { ElButton } from 'element-plus';
 
 import { z } from '#/adapter/form';
 import { getItemBrandSimpleList } from '#/api/wms/md/item/brand';
-import { generateWmsCode } from '#/views/wms/utils/constants';
 
 import { WmsItemBrandSelect } from './brand/components';
 import { WmsItemCategorySelect } from './category/components';
diff --git a/apps/web-ele/src/views/wms/md/item/modules/sku-form.vue b/apps/web-ele/src/views/wms/md/item/modules/sku-form.vue
index 4bb74a31e..f46ec5780 100644
--- a/apps/web-ele/src/views/wms/md/item/modules/sku-form.vue
+++ b/apps/web-ele/src/views/wms/md/item/modules/sku-form.vue
@@ -4,10 +4,11 @@ import type { WmsItemSkuApi } from '#/api/wms/md/item/sku';
 
 import { nextTick, ref } from 'vue';
 
+import { generateWmsCode } from '@vben/constants';
+
 import { ElButton, ElInput, ElInputNumber, ElMessage } from 'element-plus';
 
 import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
-import { generateWmsCode } from '#/views/wms/utils/constants';
 import {
   DIMENSION_PRECISION,
   PRICE_PRECISION,
diff --git a/apps/web-ele/src/views/wms/md/merchant/components/merchant-select.vue b/apps/web-ele/src/views/wms/md/merchant/components/merchant-select.vue
index 587aee847..aa5ae2718 100644
--- a/apps/web-ele/src/views/wms/md/merchant/components/merchant-select.vue
+++ b/apps/web-ele/src/views/wms/md/merchant/components/merchant-select.vue
@@ -3,13 +3,14 @@ import type { WmsMerchantApi } from '#/api/wms/md/merchant';
 
 import { computed, onMounted, ref, watch } from 'vue';
 
-import { ElOption, ElSelect } from 'element-plus';
-
-import { getMerchantSimpleList } from '#/api/wms/md/merchant';
 import {
   CustomerMerchantTypeList,
   SupplierMerchantTypeList,
-} from '#/views/wms/utils/constants';
+} from '@vben/constants';
+
+import { ElOption, ElSelect } from 'element-plus';
+
+import { getMerchantSimpleList } from '#/api/wms/md/merchant';
 
 defineOptions({ name: 'WmsMerchantSelect', inheritAttrs: false });
 
diff --git a/apps/web-ele/src/views/wms/md/merchant/data.ts b/apps/web-ele/src/views/wms/md/merchant/data.ts
index 189c6870b..0d198cf4a 100644
--- a/apps/web-ele/src/views/wms/md/merchant/data.ts
+++ b/apps/web-ele/src/views/wms/md/merchant/data.ts
@@ -1,7 +1,7 @@
 import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
-import { h } from 'vue';
+import { generateWmsCode, h } from 'vue';
 
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
@@ -9,7 +9,6 @@ import { getDictOptions } from '@vben/hooks';
 import { ElButton } from 'element-plus';
 
 import { z } from '#/adapter/form';
-import { generateWmsCode } from '#/views/wms/utils/constants';
 
 /** 新增/修改往来企业的表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
diff --git a/apps/web-ele/src/views/wms/md/warehouse/data.ts b/apps/web-ele/src/views/wms/md/warehouse/data.ts
index 0803bf321..e02314f7c 100644
--- a/apps/web-ele/src/views/wms/md/warehouse/data.ts
+++ b/apps/web-ele/src/views/wms/md/warehouse/data.ts
@@ -3,10 +3,11 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
 import { h } from 'vue';
 
+import { generateWmsCode } from '@vben/constants';
+
 import { ElButton } from 'element-plus';
 
 import { z } from '#/adapter/form';
-import { generateWmsCode } from '#/views/wms/utils/constants';
 
 /** 新增/修改仓库的表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
diff --git a/apps/web-ele/src/views/wms/order/check/index.vue b/apps/web-ele/src/views/wms/order/check/index.vue
index 784e8550d..1264136ad 100644
--- a/apps/web-ele/src/views/wms/order/check/index.vue
+++ b/apps/web-ele/src/views/wms/order/check/index.vue
@@ -6,6 +6,11 @@ import type { WmsCheckOrderDetailApi } from '#/api/wms/order/check/detail';
 import { reactive, ref } from 'vue';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import {
+  OrderDeleteStatusList,
+  OrderStatusEnum,
+  OrderUpdateStatusList,
+} from '@vben/constants';
 import { downloadFileFromBlobPart, formatDateTime } from '@vben/utils';
 
 import { ElLoading, ElMessage } from 'element-plus';
@@ -24,11 +29,6 @@ import {
   getCheckOrderPage,
 } from '#/api/wms/order/check';
 import { $t } from '#/locales';
-import {
-  OrderDeleteStatusList,
-  OrderStatusEnum,
-  OrderUpdateStatusList,
-} from '#/views/wms/utils/constants';
 import {
   formatPrice,
   formatQuantity,
diff --git a/apps/web-ele/src/views/wms/order/check/modules/form.vue b/apps/web-ele/src/views/wms/order/check/modules/form.vue
index fb259a46d..13a7181a4 100644
--- a/apps/web-ele/src/views/wms/order/check/modules/form.vue
+++ b/apps/web-ele/src/views/wms/order/check/modules/form.vue
@@ -11,6 +11,10 @@ import type { WmsCheckOrderDetailApi } from '#/api/wms/order/check/detail';
 import { computed, nextTick, ref, watch } from 'vue';
 
 import { confirm, useVbenModal } from '@vben/common-ui';
+import {
+  OrderStatusEnum,
+  OrderUpdateStatusList,
+} from '@vben/constants';
 import { isEqual } from '@vben/utils';
 
 import { ElInputNumber, ElMessage } from 'element-plus';
@@ -28,10 +32,6 @@ import {
 } from '#/api/wms/order/check';
 import { $t } from '#/locales';
 import { WmsItemSkuSelect } from '#/views/wms/md/item/sku/components';
-import {
-  OrderStatusEnum,
-  OrderUpdateStatusList,
-} from '#/views/wms/utils/constants';
 import {
   dividePrice,
   formatPrice,
diff --git a/apps/web-ele/src/views/wms/order/movement/index.vue b/apps/web-ele/src/views/wms/order/movement/index.vue
index ec9eff141..874fb4d57 100644
--- a/apps/web-ele/src/views/wms/order/movement/index.vue
+++ b/apps/web-ele/src/views/wms/order/movement/index.vue
@@ -6,6 +6,11 @@ import type { WmsMovementOrderDetailApi } from '#/api/wms/order/movement/detail'
 import { reactive, ref } from 'vue';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import {
+  OrderDeleteStatusList,
+  OrderStatusEnum,
+  OrderUpdateStatusList,
+} from '@vben/constants';
 import { downloadFileFromBlobPart, formatDateTime } from '@vben/utils';
 
 import { ElLoading, ElMessage } from 'element-plus';
@@ -24,11 +29,6 @@ import {
   getMovementOrderPage,
 } from '#/api/wms/order/movement';
 import { $t } from '#/locales';
-import {
-  OrderDeleteStatusList,
-  OrderStatusEnum,
-  OrderUpdateStatusList,
-} from '#/views/wms/utils/constants';
 import {
   formatPrice,
   formatQuantity,
diff --git a/apps/web-ele/src/views/wms/order/movement/modules/form.vue b/apps/web-ele/src/views/wms/order/movement/modules/form.vue
index 148277c07..38a611762 100644
--- a/apps/web-ele/src/views/wms/order/movement/modules/form.vue
+++ b/apps/web-ele/src/views/wms/order/movement/modules/form.vue
@@ -10,6 +10,10 @@ import type { InventorySelectRow } from '#/views/wms/inventory/components/invent
 import { computed, nextTick, ref } from 'vue';
 
 import { confirm, useVbenModal } from '@vben/common-ui';
+import {
+  OrderStatusEnum,
+  OrderUpdateStatusList,
+} from '@vben/constants';
 import { isEqual } from '@vben/utils';
 
 import { ElInputNumber, ElMessage } from 'element-plus';
@@ -26,10 +30,6 @@ import {
 } from '#/api/wms/order/movement';
 import { $t } from '#/locales';
 import { WmsInventorySelect } from '#/views/wms/inventory/components';
-import {
-  OrderStatusEnum,
-  OrderUpdateStatusList,
-} from '#/views/wms/utils/constants';
 import {
   dividePrice,
   formatQuantity,
diff --git a/apps/web-ele/src/views/wms/order/receipt/index.vue b/apps/web-ele/src/views/wms/order/receipt/index.vue
index 88ab201cf..6f5cc4941 100644
--- a/apps/web-ele/src/views/wms/order/receipt/index.vue
+++ b/apps/web-ele/src/views/wms/order/receipt/index.vue
@@ -6,6 +6,11 @@ import type { WmsReceiptOrderDetailApi } from '#/api/wms/order/receipt/detail';
 import { reactive, ref } from 'vue';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import {
+  OrderDeleteStatusList,
+  OrderStatusEnum,
+  OrderUpdateStatusList,
+} from '@vben/constants';
 import { downloadFileFromBlobPart, formatDateTime } from '@vben/utils';
 
 import { ElLoading, ElMessage } from 'element-plus';
@@ -24,11 +29,6 @@ import {
   getReceiptOrderPage,
 } from '#/api/wms/order/receipt';
 import { $t } from '#/locales';
-import {
-  OrderDeleteStatusList,
-  OrderStatusEnum,
-  OrderUpdateStatusList,
-} from '#/views/wms/utils/constants';
 import {
   formatPrice,
   formatQuantity,
diff --git a/apps/web-ele/src/views/wms/order/receipt/modules/form.vue b/apps/web-ele/src/views/wms/order/receipt/modules/form.vue
index 72fdb7369..f0f349bde 100644
--- a/apps/web-ele/src/views/wms/order/receipt/modules/form.vue
+++ b/apps/web-ele/src/views/wms/order/receipt/modules/form.vue
@@ -9,6 +9,10 @@ import type { WmsReceiptOrderDetailApi } from '#/api/wms/order/receipt/detail';
 import { computed, nextTick, ref } from 'vue';
 
 import { confirm, useVbenModal } from '@vben/common-ui';
+import {
+  OrderStatusEnum,
+  OrderUpdateStatusList,
+} from '@vben/constants';
 import { isEqual } from '@vben/utils';
 
 import { ElInputNumber, ElMessage } from 'element-plus';
@@ -25,10 +29,6 @@ import {
 } from '#/api/wms/order/receipt';
 import { $t } from '#/locales';
 import { WmsItemSkuSelect } from '#/views/wms/md/item/sku/components';
-import {
-  OrderStatusEnum,
-  OrderUpdateStatusList,
-} from '#/views/wms/utils/constants';
 import {
   dividePrice,
   multiplyPrice,
diff --git a/apps/web-ele/src/views/wms/order/shipment/index.vue b/apps/web-ele/src/views/wms/order/shipment/index.vue
index 0d356db3e..ebdbea3c2 100644
--- a/apps/web-ele/src/views/wms/order/shipment/index.vue
+++ b/apps/web-ele/src/views/wms/order/shipment/index.vue
@@ -6,6 +6,11 @@ import type { WmsShipmentOrderDetailApi } from '#/api/wms/order/shipment/detail'
 import { reactive, ref } from 'vue';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import {
+  OrderDeleteStatusList,
+  OrderStatusEnum,
+  OrderUpdateStatusList,
+} from '@vben/constants';
 import { downloadFileFromBlobPart, formatDateTime } from '@vben/utils';
 
 import { ElLoading, ElMessage } from 'element-plus';
@@ -24,11 +29,6 @@ import {
   getShipmentOrderPage,
 } from '#/api/wms/order/shipment';
 import { $t } from '#/locales';
-import {
-  OrderDeleteStatusList,
-  OrderStatusEnum,
-  OrderUpdateStatusList,
-} from '#/views/wms/utils/constants';
 import {
   formatPrice,
   formatQuantity,
diff --git a/apps/web-ele/src/views/wms/order/shipment/modules/form.vue b/apps/web-ele/src/views/wms/order/shipment/modules/form.vue
index 19fa19fa1..235d90ef0 100644
--- a/apps/web-ele/src/views/wms/order/shipment/modules/form.vue
+++ b/apps/web-ele/src/views/wms/order/shipment/modules/form.vue
@@ -10,6 +10,10 @@ import type { InventorySelectRow } from '#/views/wms/inventory/components/invent
 import { computed, nextTick, ref } from 'vue';
 
 import { confirm, useVbenModal } from '@vben/common-ui';
+import {
+  OrderStatusEnum,
+  OrderUpdateStatusList,
+} from '@vben/constants';
 import { isEqual } from '@vben/utils';
 
 import { ElInputNumber, ElMessage } from 'element-plus';
@@ -26,10 +30,6 @@ import {
 } from '#/api/wms/order/shipment';
 import { $t } from '#/locales';
 import { WmsInventorySelect } from '#/views/wms/inventory/components';
-import {
-  OrderStatusEnum,
-  OrderUpdateStatusList,
-} from '#/views/wms/utils/constants';
 import {
   dividePrice,
   formatQuantity,
diff --git a/apps/web-ele/src/views/wms/utils/constants.ts b/apps/web-ele/src/views/wms/utils/constants.ts
deleted file mode 100644
index aedddcade..000000000
--- a/apps/web-ele/src/views/wms/utils/constants.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-/** 单据状态枚举 */
-export const OrderStatusEnum = {
-  PREPARE: 0, // 草稿
-  FINISHED: 4, // 已完成
-  CANCELED: 5, // 已作废
-} as const;
-
-/** 单据类型枚举 */
-export const OrderTypeEnum = {
-  RECEIPT: 1, // 入库
-  SHIPMENT: 2, // 出库
-  MOVEMENT: 3, // 移库
-  CHECK: 4, // 盘库
-} as const;
-
-export type OrderType = (typeof OrderTypeEnum)[keyof typeof OrderTypeEnum];
-
-/** 可修改的单据状态 */
-export const OrderUpdateStatusList: number[] = [OrderStatusEnum.PREPARE];
-
-/** 可删除的单据状态 */
-export const OrderDeleteStatusList: number[] = [
-  OrderStatusEnum.PREPARE,
-  OrderStatusEnum.CANCELED,
-];
-
-/** 往来企业类型枚举 */
-export const MerchantTypeEnum = {
-  CUSTOMER: 1, // 客户
-  SUPPLIER: 2, // 供应商
-  CUSTOMER_SUPPLIER: 3, // 客户/供应商
-} as const;
-
-/** 供应商类型的往来企业 */
-export const SupplierMerchantTypeList = [
-  MerchantTypeEnum.SUPPLIER,
-  MerchantTypeEnum.CUSTOMER_SUPPLIER,
-];
-
-/** 客户类型的往来企业 */
-export const CustomerMerchantTypeList = [
-  MerchantTypeEnum.CUSTOMER,
-  MerchantTypeEnum.CUSTOMER_SUPPLIER,
-];
-
-/**
- * 生成 WMS 编号 / 条码。
- *
- * @param prefix 可选前缀，按业务域区分编号种类。
- * @returns 前缀 + 8 位随机数字串。
- */
-export function generateWmsCode(prefix = ''): string {
-  let result = '';
-  for (let i = 0; i < 8; i++) {
-    result += Math.floor(Math.random() * 10).toString();
-  }
-  return prefix + result;
-}
diff --git a/packages/constants/src/biz-iot-enum.ts b/packages/constants/src/biz-iot-enum.ts
index 6a91397ba..5275bc9da 100644
--- a/packages/constants/src/biz-iot-enum.ts
+++ b/packages/constants/src/biz-iot-enum.ts
@@ -202,6 +202,27 @@ export const getDataTypeName = (dataType: string): string => {
   return typeMap[dataType] || dataType;
 };
 
+/** 获取数据类型标签类型（用于 tag 的 type 属性） */
+export const getDataTypeTagType = (
+  dataType: string,
+): 'danger' | 'info' | 'primary' | 'success' | 'warning' => {
+  const tagMap: Record<
+    string,
+    'danger' | 'info' | 'primary' | 'success' | 'warning'
+  > = {
+    [IoTDataSpecsDataTypeEnum.INT]: 'primary',
+    [IoTDataSpecsDataTypeEnum.FLOAT]: 'success',
+    [IoTDataSpecsDataTypeEnum.DOUBLE]: 'success',
+    [IoTDataSpecsDataTypeEnum.TEXT]: 'info',
+    [IoTDataSpecsDataTypeEnum.BOOL]: 'warning',
+    [IoTDataSpecsDataTypeEnum.ENUM]: 'danger',
+    [IoTDataSpecsDataTypeEnum.DATE]: 'primary',
+    [IoTDataSpecsDataTypeEnum.STRUCT]: 'info',
+    [IoTDataSpecsDataTypeEnum.ARRAY]: 'warning',
+  };
+  return tagMap[dataType] || 'info';
+};
+
 // ========== IOT - 设备消息 ==========
 /** IoT 设备消息的方法枚举 */
 export const IotDeviceMessageMethodEnum = {
diff --git a/packages/constants/src/biz-mall-enum.ts b/packages/constants/src/biz-mall-enum.ts
index 124e007c2..97e3de171 100644
--- a/packages/constants/src/biz-mall-enum.ts
+++ b/packages/constants/src/biz-mall-enum.ts
@@ -236,6 +236,24 @@ export const TradeOrderStatusEnum = {
   },
 };
 
+/** 客服消息类型枚举类 */
+export const KeFuMessageContentTypeEnum = {
+  TEXT: 1, // 文本消息
+  IMAGE: 2, // 图片消息
+  VOICE: 3, // 语音消息
+  VIDEO: 4, // 视频消息
+  SYSTEM: 5, // 系统消息
+  // ========== 商城特殊消息 ==========
+  PRODUCT: 10, // 商品消息
+  ORDER: 11, // 订单消息
+};
+
+/** Promotion 的 WebSocket 消息类型枚举类 */
+export const WebSocketMessageTypeConstants = {
+  KEFU_MESSAGE_TYPE: 'kefu_message_type', // 客服消息类型
+  KEFU_MESSAGE_ADMIN_READ: 'kefu_message_read_status_change', // 客服消息管理员已读
+};
+
 // 预设颜色
 export const PREDEFINE_COLORS = [
   '#ff4500',
diff --git a/apps/web-antd/src/views/mes/utils/constants.ts b/packages/constants/src/biz-mes-enum.ts
similarity index 100%
rename from apps/web-antd/src/views/mes/utils/constants.ts
rename to packages/constants/src/biz-mes-enum.ts
diff --git a/apps/web-antd/src/views/wms/utils/constants.ts b/packages/constants/src/biz-wms-enum.ts
similarity index 100%
rename from apps/web-antd/src/views/wms/utils/constants.ts
rename to packages/constants/src/biz-wms-enum.ts
diff --git a/packages/constants/src/index.ts b/packages/constants/src/index.ts
index 311c86d65..1469be121 100644
--- a/packages/constants/src/index.ts
+++ b/packages/constants/src/index.ts
@@ -4,9 +4,11 @@ export * from './biz-erp-enum';
 export * from './biz-infra-enum';
 export * from './biz-iot-enum';
 export * from './biz-mall-enum';
+export * from './biz-mes-enum';
 export * from './biz-mp-enum';
 export * from './biz-pay-enum';
 export * from './biz-system-enum';
+export * from './biz-wms-enum';
 export * from './core';
 export * from './dict-enum';
 

From 51e633f6c96dcaeb3638f5a62b531540d756ae14 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 30 May 2026 17:29:05 +0800
Subject: [PATCH 52/52] =?UTF-8?q?refactor:=20=E8=A7=84=E8=8C=83=20MES/WMS?=
 =?UTF-8?q?=20=E7=BB=84=E4=BB=B6=E6=96=87=E4=BB=B6=E5=91=BD=E5=90=8D?=
 =?UTF-8?q?=E5=92=8C=E5=AF=BC=E5=87=BA=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{calendar-date-cell.vue => date-cell.vue} |  0
 .../mes/cal/calendar/components/index.ts      |  4 ++++
 .../{calendar-legend.vue => legend.vue}       |  0
 .../{calendar-panel.vue => panel.vue}         |  4 ++--
 .../mes/cal/calendar/modules/team-view.vue    |  3 +--
 .../mes/cal/calendar/modules/type-view.vue    |  3 +--
 .../mes/cal/calendar/modules/user-view.vue    |  3 +--
 .../views/mes/cal/team/components/index.ts    |  4 ++--
 ...am-select-dialog.vue => select-dialog.vue} |  0
 .../{cal-team-select.vue => select.vue}       |  2 +-
 .../mes/dv/checkplan/components/index.ts      |  2 +-
 .../{dv-check-plan-select.vue => select.vue}  |  0
 .../mes/dv/machinery/components/index.ts      |  2 +-
 .../{dv-machinery-select.vue => select.vue}   |  0
 .../mes/dv/machinery/type/components/index.ts |  4 ++--
 ...v-machinery-type-select.vue => select.vue} |  0
 .../{machinery-type-tree.vue => tree.vue}     |  0
 .../views/mes/dv/subject/components/index.ts  |  2 +-
 .../{dv-subject-select.vue => select.vue}     |  0
 .../views/mes/md/client/components/index.ts   |  2 ++
 ...nt-select-dialog.vue => select-dialog.vue} |  0
 .../{md-client-select.vue => select.vue}      |  2 +-
 .../src/views/mes/md/item/components/index.ts |  8 +++----
 ...alog.vue => product-bom-select-dialog.vue} |  0
 ...-bom-select.vue => product-bom-select.vue} |  2 +-
 ...em-select-dialog.vue => select-dialog.vue} |  0
 .../{md-item-select.vue => select.vue}        |  2 +-
 .../mes/md/item/type/components/index.ts      |  4 ++--
 .../{md-item-type-select.vue => select.vue}   |  0
 .../{md-item-type-tree.vue => tree.vue}       |  0
 .../mes/md/unitmeasure/components/index.ts    |  2 +-
 ...{md-unit-measure-select.vue => select.vue} |  0
 .../views/mes/md/vendor/components/index.ts   |  2 ++
 ...or-select-dialog.vue => select-dialog.vue} |  0
 .../{md-vendor-select.vue => select.vue}      |  2 +-
 .../mes/md/workstation/components/index.ts    |  6 ++---
 ...on-select-dialog.vue => select-dialog.vue} |  0
 .../{md-workstation-select.vue => select.vue} |  2 +-
 ...orkshop-select.vue => workshop-select.vue} |  0
 .../mes/pro/andon/config/components/index.ts  |  2 +-
 .../{andon-config-select.vue => select.vue}   |  0
 .../views/mes/pro/card/components/index.ts    |  4 ++--
 ...rd-select-dialog.vue => select-dialog.vue} |  0
 .../{pro-card-select.vue => select.vue}       |  2 +-
 .../views/mes/pro/process/components/index.ts |  2 +-
 .../{pro-process-select.vue => select.vue}    |  0
 .../views/mes/pro/task/components/index.ts    |  4 ++--
 ...sk-select-dialog.vue => select-dialog.vue} |  0
 .../{pro-task-select.vue => select.vue}       |  2 +-
 apps/web-antd/src/views/mes/pro/task/data.ts  |  2 +-
 .../src/views/mes/pro/task/edit/index.vue     |  2 +-
 .../web-antd/src/views/mes/pro/task/index.vue |  2 +-
 .../mes/pro/workorder/components/index.ts     |  4 ++--
 ...er-select-dialog.vue => select-dialog.vue} |  0
 .../{pro-work-order-select.vue => select.vue} |  2 +-
 .../src/views/mes/pro/workorder/data.ts       |  4 ++--
 .../mes/pro/workrecord/components/index.ts    |  1 +
 ...k-record-status-bar.vue => status-bar.vue} |  2 +-
 .../src/views/mes/pro/workrecord/data.ts      |  2 +-
 .../src/views/mes/pro/workrecord/index.vue    |  2 +-
 .../src/views/mes/qc/batchtrace/data.ts       |  6 ++---
 .../mes/qc/defectrecord/components/index.ts   |  4 ++--
 ...record-inline-form.vue => inline-form.vue} |  0
 ...record-inline-list.vue => inline-list.vue} |  2 +-
 .../mes/qc/indicator/components/index.ts      |  4 ++--
 ...or-select-dialog.vue => select-dialog.vue} |  0
 .../{qc-indicator-select.vue => select.vue}   |  2 +-
 ...{qc-indicator-result-form.vue => form.vue} |  0
 .../qc/indicatorresult/components/index.ts    |  4 ++--
 ...{qc-indicator-result-list.vue => list.vue} |  2 +-
 apps/web-antd/src/views/mes/qc/ipqc/data.ts   |  8 +++----
 apps/web-antd/src/views/mes/qc/iqc/data.ts    |  4 ++--
 apps/web-antd/src/views/mes/qc/oqc/data.ts    |  4 ++--
 .../src/views/mes/qc/pendinginspect/data.ts   |  2 +-
 apps/web-antd/src/views/mes/qc/rqc/data.ts    |  2 +-
 .../src/views/mes/qc/template/data.ts         |  6 ++---
 .../src/views/mes/tm/tool/components/index.ts |  2 +-
 .../{tm-tool-select.vue => select.vue}        |  0
 .../mes/tm/tool/type/components/index.ts      |  4 ++--
 .../{tm-tool-type-list.vue => list.vue}       |  0
 .../{tm-tool-type-select.vue => select.vue}   |  0
 .../mes/wm/arrivalnotice/components/index.ts  |  4 ++--
 ...lect-dialog.vue => line-select-dialog.vue} |  0
 ...notice-line-select.vue => line-select.vue} |  2 +-
 ...ce-select-dialog.vue => select-dialog.vue} |  0
 ...m-arrival-notice-select.vue => select.vue} |  2 +-
 .../src/views/mes/wm/arrivalnotice/data.ts    |  4 ++--
 .../{barcode-detail.vue => detail.vue}        |  0
 .../views/mes/wm/barcode/components/index.ts  |  2 +-
 .../web-antd/src/views/mes/wm/barcode/data.ts | 24 ++++++++++---------
 .../{wm-batch-detail.vue => detail.vue}       |  0
 .../views/mes/wm/batch/components/index.ts    |  6 ++---
 ...ch-select-dialog.vue => select-dialog.vue} |  0
 .../{wm-batch-select.vue => select.vue}       |  2 +-
 apps/web-antd/src/views/mes/wm/batch/data.ts  |  6 ++---
 .../src/views/mes/wm/itemreceipt/data.ts      |  4 ++--
 .../mes/wm/materialstock/components/index.ts  |  4 ++--
 ...ck-select-dialog.vue => select-dialog.vue} |  2 +-
 ...m-material-stock-select.vue => select.vue} |  2 +-
 .../src/views/mes/wm/materialstock/data.ts    |  4 ++--
 .../src/views/mes/wm/materialstock/index.vue  |  2 +-
 .../src/views/mes/wm/outsourceissue/data.ts   |  6 ++---
 .../src/views/mes/wm/outsourcereceipt/data.ts |  6 ++---
 .../views/mes/wm/packages/components/index.ts |  4 ++--
 ...ge-select-dialog.vue => select-dialog.vue} |  0
 .../{wm-package-select.vue => select.vue}     |  2 +-
 .../src/views/mes/wm/packages/data.ts         |  6 ++---
 .../wm/packages/modules/sub-package-list.vue  |  2 +-
 .../src/views/mes/wm/productissue/data.ts     |  6 ++---
 .../src/views/mes/wm/productreceipt/data.ts   |  4 ++--
 .../src/views/mes/wm/productsales/data.ts     |  4 ++--
 .../src/views/mes/wm/returnissue/data.ts      |  6 ++---
 .../src/views/mes/wm/returnsales/data.ts      |  4 ++--
 .../src/views/mes/wm/returnvendor/data.ts     |  4 ++--
 .../mes/wm/salesnotice/components/index.ts    |  4 ++--
 ...lect-dialog.vue => line-select-dialog.vue} |  0
 ...notice-line-select.vue => line-select.vue} |  2 +-
 ...ce-select-dialog.vue => select-dialog.vue} |  0
 ...{wm-sales-notice-select.vue => select.vue} |  2 +-
 .../src/views/mes/wm/salesnotice/data.ts      |  4 ++--
 apps/web-antd/src/views/mes/wm/sn/data.ts     |  2 +-
 .../wm/stocktaking/plan/components/index.ts   |  4 ++--
 ...an-select-dialog.vue => select-dialog.vue} |  0
 ...tock-taking-plan-select.vue => select.vue} |  2 +-
 .../stocktaking/plan/modules/param-form.vue   |  2 +-
 .../src/views/mes/wm/stocktaking/task/data.ts |  2 +-
 ...ehouse-area-select.vue => area-select.vue} |  0
 .../mes/wm/warehouse/components/index.ts      |  6 ++---
 ...ocation-select.vue => location-select.vue} |  0
 .../{wm-warehouse-select.vue => select.vue}   |  0
 .../views/wms/inventory/components/index.ts   |  3 ++-
 .../{inventory-select.vue => select.vue}      |  0
 .../wms/md/item/brand/components/index.ts     |  2 +-
 .../{item-brand-select.vue => select.vue}     |  0
 .../wms/md/item/category/components/index.ts  |  4 ++--
 .../{item-category-select.vue => select.vue}  |  0
 .../{item-category-tree.vue => tree.vue}      |  0
 .../views/wms/md/item/sku/components/index.ts |  2 +-
 .../{item-sku-select.vue => select.vue}       |  0
 .../views/wms/md/merchant/components/index.ts |  2 +-
 .../{merchant-select.vue => select.vue}       |  0
 .../wms/md/warehouse/components/index.ts      |  2 +-
 .../{warehouse-select.vue => select.vue}      |  0
 .../views/wms/order/movement/modules/form.vue |  2 +-
 .../views/wms/order/shipment/modules/form.vue |  2 +-
 .../{calendar-date-cell.vue => date-cell.vue} |  0
 .../mes/cal/calendar/components/index.ts      |  4 ++++
 .../{calendar-legend.vue => legend.vue}       |  0
 .../{calendar-panel.vue => panel.vue}         |  4 ++--
 .../mes/cal/calendar/modules/team-view.vue    |  3 +--
 .../mes/cal/calendar/modules/type-view.vue    |  3 +--
 .../mes/cal/calendar/modules/user-view.vue    |  3 +--
 .../views/mes/cal/team/components/index.ts    |  4 ++--
 ...am-select-dialog.vue => select-dialog.vue} |  0
 .../{cal-team-select.vue => select.vue}       |  2 +-
 .../mes/dv/checkplan/components/index.ts      |  2 +-
 .../{dv-check-plan-select.vue => select.vue}  |  0
 .../mes/dv/machinery/components/index.ts      |  2 +-
 .../{dv-machinery-select.vue => select.vue}   |  0
 .../mes/dv/machinery/type/components/index.ts |  4 ++--
 ...v-machinery-type-select.vue => select.vue} |  0
 .../{machinery-type-tree.vue => tree.vue}     |  0
 .../views/mes/dv/subject/components/index.ts  |  2 +-
 .../{dv-subject-select.vue => select.vue}     |  0
 .../views/mes/md/client/components/index.ts   |  2 ++
 ...nt-select-dialog.vue => select-dialog.vue} |  0
 .../{md-client-select.vue => select.vue}      |  2 +-
 .../src/views/mes/md/item/components/index.ts |  8 +++----
 ...alog.vue => product-bom-select-dialog.vue} |  0
 ...-bom-select.vue => product-bom-select.vue} |  2 +-
 ...em-select-dialog.vue => select-dialog.vue} |  0
 .../{md-item-select.vue => select.vue}        |  2 +-
 .../mes/md/item/type/components/index.ts      |  4 ++--
 .../{md-item-type-select.vue => select.vue}   |  0
 .../{md-item-type-tree.vue => tree.vue}       |  0
 .../mes/md/unitmeasure/components/index.ts    |  2 +-
 ...{md-unit-measure-select.vue => select.vue} |  0
 .../views/mes/md/vendor/components/index.ts   |  2 ++
 ...or-select-dialog.vue => select-dialog.vue} |  0
 .../{md-vendor-select.vue => select.vue}      |  2 +-
 .../mes/md/workstation/components/index.ts    |  6 ++---
 ...on-select-dialog.vue => select-dialog.vue} |  0
 .../{md-workstation-select.vue => select.vue} |  2 +-
 ...orkshop-select.vue => workshop-select.vue} |  0
 .../mes/pro/andon/config/components/index.ts  |  2 +-
 .../{andon-config-select.vue => select.vue}   |  0
 .../views/mes/pro/card/components/index.ts    |  4 ++--
 ...rd-select-dialog.vue => select-dialog.vue} |  0
 .../{pro-card-select.vue => select.vue}       |  2 +-
 .../views/mes/pro/process/components/index.ts |  2 +-
 .../{pro-process-select.vue => select.vue}    |  0
 .../views/mes/pro/task/components/index.ts    |  4 ++--
 ...sk-select-dialog.vue => select-dialog.vue} |  0
 .../{pro-task-select.vue => select.vue}       |  2 +-
 apps/web-ele/src/views/mes/pro/task/data.ts   |  2 +-
 .../src/views/mes/pro/task/edit/index.vue     |  2 +-
 apps/web-ele/src/views/mes/pro/task/index.vue |  2 +-
 .../mes/pro/workorder/components/index.ts     |  4 ++--
 ...er-select-dialog.vue => select-dialog.vue} |  0
 .../{pro-work-order-select.vue => select.vue} |  2 +-
 .../src/views/mes/pro/workorder/data.ts       |  4 ++--
 .../mes/pro/workrecord/components/index.ts    |  1 +
 ...k-record-status-bar.vue => status-bar.vue} |  2 +-
 .../src/views/mes/pro/workrecord/data.ts      |  2 +-
 .../src/views/mes/pro/workrecord/index.vue    |  2 +-
 .../src/views/mes/qc/batchtrace/data.ts       |  6 ++---
 .../mes/qc/defectrecord/components/index.ts   |  4 ++--
 ...record-inline-form.vue => inline-form.vue} |  0
 ...record-inline-list.vue => inline-list.vue} |  2 +-
 .../mes/qc/indicator/components/index.ts      |  4 ++--
 ...or-select-dialog.vue => select-dialog.vue} |  0
 .../{qc-indicator-select.vue => select.vue}   |  2 +-
 ...{qc-indicator-result-form.vue => form.vue} |  0
 .../qc/indicatorresult/components/index.ts    |  4 ++--
 ...{qc-indicator-result-list.vue => list.vue} |  2 +-
 apps/web-ele/src/views/mes/qc/ipqc/data.ts    |  8 +++----
 apps/web-ele/src/views/mes/qc/iqc/data.ts     |  4 ++--
 apps/web-ele/src/views/mes/qc/oqc/data.ts     |  4 ++--
 .../src/views/mes/qc/pendinginspect/data.ts   |  2 +-
 apps/web-ele/src/views/mes/qc/rqc/data.ts     |  2 +-
 .../web-ele/src/views/mes/qc/template/data.ts |  6 ++---
 .../src/views/mes/tm/tool/components/index.ts |  2 +-
 .../{tm-tool-select.vue => select.vue}        |  0
 .../mes/tm/tool/type/components/index.ts      |  4 ++--
 .../{tm-tool-type-list.vue => list.vue}       |  0
 .../{tm-tool-type-select.vue => select.vue}   |  0
 .../mes/wm/arrivalnotice/components/index.ts  |  4 ++--
 ...lect-dialog.vue => line-select-dialog.vue} |  0
 ...notice-line-select.vue => line-select.vue} |  2 +-
 ...ce-select-dialog.vue => select-dialog.vue} |  0
 ...m-arrival-notice-select.vue => select.vue} |  2 +-
 .../src/views/mes/wm/arrivalnotice/data.ts    |  4 ++--
 .../{barcode-detail.vue => detail.vue}        |  0
 .../views/mes/wm/barcode/components/index.ts  |  2 +-
 apps/web-ele/src/views/mes/wm/barcode/data.ts | 24 ++++++++++---------
 .../{wm-batch-detail.vue => detail.vue}       |  0
 .../views/mes/wm/batch/components/index.ts    |  6 ++---
 ...ch-select-dialog.vue => select-dialog.vue} |  0
 .../{wm-batch-select.vue => select.vue}       |  2 +-
 .../src/views/mes/wm/itemreceipt/data.ts      |  4 ++--
 .../mes/wm/materialstock/components/index.ts  |  4 ++--
 ...ck-select-dialog.vue => select-dialog.vue} |  2 +-
 ...m-material-stock-select.vue => select.vue} |  2 +-
 .../src/views/mes/wm/materialstock/data.ts    |  4 ++--
 .../src/views/mes/wm/materialstock/index.vue  |  2 +-
 .../src/views/mes/wm/outsourceissue/data.ts   |  6 ++---
 .../src/views/mes/wm/outsourcereceipt/data.ts |  6 ++---
 .../views/mes/wm/packages/components/index.ts |  4 ++--
 ...ge-select-dialog.vue => select-dialog.vue} |  0
 .../{wm-package-select.vue => select.vue}     |  2 +-
 .../web-ele/src/views/mes/wm/packages/data.ts |  6 ++---
 .../wm/packages/modules/sub-package-list.vue  |  2 +-
 .../src/views/mes/wm/productissue/data.ts     |  6 ++---
 .../src/views/mes/wm/productreceipt/data.ts   |  4 ++--
 .../src/views/mes/wm/productsales/data.ts     |  4 ++--
 .../src/views/mes/wm/returnissue/data.ts      |  6 ++---
 .../src/views/mes/wm/returnsales/data.ts      |  4 ++--
 .../src/views/mes/wm/returnvendor/data.ts     |  4 ++--
 .../mes/wm/salesnotice/components/index.ts    |  4 ++--
 ...lect-dialog.vue => line-select-dialog.vue} |  0
 ...notice-line-select.vue => line-select.vue} |  2 +-
 ...ce-select-dialog.vue => select-dialog.vue} |  0
 ...{wm-sales-notice-select.vue => select.vue} |  2 +-
 .../src/views/mes/wm/salesnotice/data.ts      |  4 ++--
 apps/web-ele/src/views/mes/wm/sn/data.ts      |  2 +-
 .../wm/stocktaking/plan/components/index.ts   |  4 ++--
 ...an-select-dialog.vue => select-dialog.vue} |  0
 ...tock-taking-plan-select.vue => select.vue} |  2 +-
 .../stocktaking/plan/modules/param-form.vue   |  2 +-
 .../src/views/mes/wm/stocktaking/task/data.ts |  2 +-
 ...ehouse-area-select.vue => area-select.vue} |  0
 .../mes/wm/warehouse/components/index.ts      |  6 ++---
 ...ocation-select.vue => location-select.vue} |  0
 .../{wm-warehouse-select.vue => select.vue}   |  0
 274 files changed, 331 insertions(+), 314 deletions(-)
 rename apps/web-antd/src/views/mes/cal/calendar/components/{calendar-date-cell.vue => date-cell.vue} (100%)
 create mode 100644 apps/web-antd/src/views/mes/cal/calendar/components/index.ts
 rename apps/web-antd/src/views/mes/cal/calendar/components/{calendar-legend.vue => legend.vue} (100%)
 rename apps/web-antd/src/views/mes/cal/calendar/components/{calendar-panel.vue => panel.vue} (96%)
 rename apps/web-antd/src/views/mes/cal/team/components/{cal-team-select-dialog.vue => select-dialog.vue} (100%)
 rename apps/web-antd/src/views/mes/cal/team/components/{cal-team-select.vue => select.vue} (97%)
 rename apps/web-antd/src/views/mes/dv/checkplan/components/{dv-check-plan-select.vue => select.vue} (100%)
 rename apps/web-antd/src/views/mes/dv/machinery/components/{dv-machinery-select.vue => select.vue} (100%)
 rename apps/web-antd/src/views/mes/dv/machinery/type/components/{dv-machinery-type-select.vue => select.vue} (100%)
 rename apps/web-antd/src/views/mes/dv/machinery/type/components/{machinery-type-tree.vue => tree.vue} (100%)
 rename apps/web-antd/src/views/mes/dv/subject/components/{dv-subject-select.vue => select.vue} (100%)
 create mode 100644 apps/web-antd/src/views/mes/md/client/components/index.ts
 rename apps/web-antd/src/views/mes/md/client/components/{md-client-select-dialog.vue => select-dialog.vue} (100%)
 rename apps/web-antd/src/views/mes/md/client/components/{md-client-select.vue => select.vue} (98%)
 rename apps/web-antd/src/views/mes/md/item/components/{md-product-bom-select-dialog.vue => product-bom-select-dialog.vue} (100%)
 rename apps/web-antd/src/views/mes/md/item/components/{md-product-bom-select.vue => product-bom-select.vue} (98%)
 rename apps/web-antd/src/views/mes/md/item/components/{md-item-select-dialog.vue => select-dialog.vue} (100%)
 rename apps/web-antd/src/views/mes/md/item/components/{md-item-select.vue => select.vue} (98%)
 rename apps/web-antd/src/views/mes/md/item/type/components/{md-item-type-select.vue => select.vue} (100%)
 rename apps/web-antd/src/views/mes/md/item/type/components/{md-item-type-tree.vue => tree.vue} (100%)
 rename apps/web-antd/src/views/mes/md/unitmeasure/components/{md-unit-measure-select.vue => select.vue} (100%)
 create mode 100644 apps/web-antd/src/views/mes/md/vendor/components/index.ts
 rename apps/web-antd/src/views/mes/md/vendor/components/{md-vendor-select-dialog.vue => select-dialog.vue} (100%)
 rename apps/web-antd/src/views/mes/md/vendor/components/{md-vendor-select.vue => select.vue} (98%)
 rename apps/web-antd/src/views/mes/md/workstation/components/{md-workstation-select-dialog.vue => select-dialog.vue} (100%)
 rename apps/web-antd/src/views/mes/md/workstation/components/{md-workstation-select.vue => select.vue} (98%)
 rename apps/web-antd/src/views/mes/md/workstation/components/{md-workshop-select.vue => workshop-select.vue} (100%)
 rename apps/web-antd/src/views/mes/pro/andon/config/components/{andon-config-select.vue => select.vue} (100%)
 rename apps/web-antd/src/views/mes/pro/card/components/{pro-card-select-dialog.vue => select-dialog.vue} (100%)
 rename apps/web-antd/src/views/mes/pro/card/components/{pro-card-select.vue => select.vue} (98%)
 rename apps/web-antd/src/views/mes/pro/process/components/{pro-process-select.vue => select.vue} (100%)
 rename apps/web-antd/src/views/mes/pro/task/components/{pro-task-select-dialog.vue => select-dialog.vue} (100%)
 rename apps/web-antd/src/views/mes/pro/task/components/{pro-task-select.vue => select.vue} (98%)
 rename apps/web-antd/src/views/mes/pro/workorder/components/{pro-work-order-select-dialog.vue => select-dialog.vue} (100%)
 rename apps/web-antd/src/views/mes/pro/workorder/components/{pro-work-order-select.vue => select.vue} (98%)
 create mode 100644 apps/web-antd/src/views/mes/pro/workrecord/components/index.ts
 rename apps/web-antd/src/views/mes/pro/workrecord/components/{work-record-status-bar.vue => status-bar.vue} (97%)
 rename apps/web-antd/src/views/mes/qc/defectrecord/components/{defect-record-inline-form.vue => inline-form.vue} (100%)
 rename apps/web-antd/src/views/mes/qc/defectrecord/components/{defect-record-inline-list.vue => inline-list.vue} (98%)
 rename apps/web-antd/src/views/mes/qc/indicator/components/{qc-indicator-select-dialog.vue => select-dialog.vue} (100%)
 rename apps/web-antd/src/views/mes/qc/indicator/components/{qc-indicator-select.vue => select.vue} (98%)
 rename apps/web-antd/src/views/mes/qc/indicatorresult/components/{qc-indicator-result-form.vue => form.vue} (100%)
 rename apps/web-antd/src/views/mes/qc/indicatorresult/components/{qc-indicator-result-list.vue => list.vue} (98%)
 rename apps/web-antd/src/views/mes/tm/tool/components/{tm-tool-select.vue => select.vue} (100%)
 rename apps/web-antd/src/views/mes/tm/tool/type/components/{tm-tool-type-list.vue => list.vue} (100%)
 rename apps/web-antd/src/views/mes/tm/tool/type/components/{tm-tool-type-select.vue => select.vue} (100%)
 rename apps/web-antd/src/views/mes/wm/arrivalnotice/components/{wm-arrival-notice-line-select-dialog.vue => line-select-dialog.vue} (100%)
 rename apps/web-antd/src/views/mes/wm/arrivalnotice/components/{wm-arrival-notice-line-select.vue => line-select.vue} (97%)
 rename apps/web-antd/src/views/mes/wm/arrivalnotice/components/{wm-arrival-notice-select-dialog.vue => select-dialog.vue} (100%)
 rename apps/web-antd/src/views/mes/wm/arrivalnotice/components/{wm-arrival-notice-select.vue => select.vue} (97%)
 rename apps/web-antd/src/views/mes/wm/barcode/components/{barcode-detail.vue => detail.vue} (100%)
 rename apps/web-antd/src/views/mes/wm/batch/components/{wm-batch-detail.vue => detail.vue} (100%)
 rename apps/web-antd/src/views/mes/wm/batch/components/{wm-batch-select-dialog.vue => select-dialog.vue} (100%)
 rename apps/web-antd/src/views/mes/wm/batch/components/{wm-batch-select.vue => select.vue} (98%)
 rename apps/web-antd/src/views/mes/wm/materialstock/components/{wm-material-stock-select-dialog.vue => select-dialog.vue} (98%)
 rename apps/web-antd/src/views/mes/wm/materialstock/components/{wm-material-stock-select.vue => select.vue} (98%)
 rename apps/web-antd/src/views/mes/wm/packages/components/{wm-package-select-dialog.vue => select-dialog.vue} (100%)
 rename apps/web-antd/src/views/mes/wm/packages/components/{wm-package-select.vue => select.vue} (98%)
 rename apps/web-antd/src/views/mes/wm/salesnotice/components/{wm-sales-notice-line-select-dialog.vue => line-select-dialog.vue} (100%)
 rename apps/web-antd/src/views/mes/wm/salesnotice/components/{wm-sales-notice-line-select.vue => line-select.vue} (97%)
 rename apps/web-antd/src/views/mes/wm/salesnotice/components/{wm-sales-notice-select-dialog.vue => select-dialog.vue} (100%)
 rename apps/web-antd/src/views/mes/wm/salesnotice/components/{wm-sales-notice-select.vue => select.vue} (97%)
 rename apps/web-antd/src/views/mes/wm/stocktaking/plan/components/{stock-taking-plan-select-dialog.vue => select-dialog.vue} (100%)
 rename apps/web-antd/src/views/mes/wm/stocktaking/plan/components/{stock-taking-plan-select.vue => select.vue} (97%)
 rename apps/web-antd/src/views/mes/wm/warehouse/components/{wm-warehouse-area-select.vue => area-select.vue} (100%)
 rename apps/web-antd/src/views/mes/wm/warehouse/components/{wm-warehouse-location-select.vue => location-select.vue} (100%)
 rename apps/web-antd/src/views/mes/wm/warehouse/components/{wm-warehouse-select.vue => select.vue} (100%)
 rename apps/web-antd/src/views/wms/inventory/components/{inventory-select.vue => select.vue} (100%)
 rename apps/web-antd/src/views/wms/md/item/brand/components/{item-brand-select.vue => select.vue} (100%)
 rename apps/web-antd/src/views/wms/md/item/category/components/{item-category-select.vue => select.vue} (100%)
 rename apps/web-antd/src/views/wms/md/item/category/components/{item-category-tree.vue => tree.vue} (100%)
 rename apps/web-antd/src/views/wms/md/item/sku/components/{item-sku-select.vue => select.vue} (100%)
 rename apps/web-antd/src/views/wms/md/merchant/components/{merchant-select.vue => select.vue} (100%)
 rename apps/web-antd/src/views/wms/md/warehouse/components/{warehouse-select.vue => select.vue} (100%)
 rename apps/web-ele/src/views/mes/cal/calendar/components/{calendar-date-cell.vue => date-cell.vue} (100%)
 create mode 100644 apps/web-ele/src/views/mes/cal/calendar/components/index.ts
 rename apps/web-ele/src/views/mes/cal/calendar/components/{calendar-legend.vue => legend.vue} (100%)
 rename apps/web-ele/src/views/mes/cal/calendar/components/{calendar-panel.vue => panel.vue} (93%)
 rename apps/web-ele/src/views/mes/cal/team/components/{cal-team-select-dialog.vue => select-dialog.vue} (100%)
 rename apps/web-ele/src/views/mes/cal/team/components/{cal-team-select.vue => select.vue} (97%)
 rename apps/web-ele/src/views/mes/dv/checkplan/components/{dv-check-plan-select.vue => select.vue} (100%)
 rename apps/web-ele/src/views/mes/dv/machinery/components/{dv-machinery-select.vue => select.vue} (100%)
 rename apps/web-ele/src/views/mes/dv/machinery/type/components/{dv-machinery-type-select.vue => select.vue} (100%)
 rename apps/web-ele/src/views/mes/dv/machinery/type/components/{machinery-type-tree.vue => tree.vue} (100%)
 rename apps/web-ele/src/views/mes/dv/subject/components/{dv-subject-select.vue => select.vue} (100%)
 create mode 100644 apps/web-ele/src/views/mes/md/client/components/index.ts
 rename apps/web-ele/src/views/mes/md/client/components/{md-client-select-dialog.vue => select-dialog.vue} (100%)
 rename apps/web-ele/src/views/mes/md/client/components/{md-client-select.vue => select.vue} (98%)
 rename apps/web-ele/src/views/mes/md/item/components/{md-product-bom-select-dialog.vue => product-bom-select-dialog.vue} (100%)
 rename apps/web-ele/src/views/mes/md/item/components/{md-product-bom-select.vue => product-bom-select.vue} (98%)
 rename apps/web-ele/src/views/mes/md/item/components/{md-item-select-dialog.vue => select-dialog.vue} (100%)
 rename apps/web-ele/src/views/mes/md/item/components/{md-item-select.vue => select.vue} (98%)
 rename apps/web-ele/src/views/mes/md/item/type/components/{md-item-type-select.vue => select.vue} (100%)
 rename apps/web-ele/src/views/mes/md/item/type/components/{md-item-type-tree.vue => tree.vue} (100%)
 rename apps/web-ele/src/views/mes/md/unitmeasure/components/{md-unit-measure-select.vue => select.vue} (100%)
 create mode 100644 apps/web-ele/src/views/mes/md/vendor/components/index.ts
 rename apps/web-ele/src/views/mes/md/vendor/components/{md-vendor-select-dialog.vue => select-dialog.vue} (100%)
 rename apps/web-ele/src/views/mes/md/vendor/components/{md-vendor-select.vue => select.vue} (98%)
 rename apps/web-ele/src/views/mes/md/workstation/components/{md-workstation-select-dialog.vue => select-dialog.vue} (100%)
 rename apps/web-ele/src/views/mes/md/workstation/components/{md-workstation-select.vue => select.vue} (98%)
 rename apps/web-ele/src/views/mes/md/workstation/components/{md-workshop-select.vue => workshop-select.vue} (100%)
 rename apps/web-ele/src/views/mes/pro/andon/config/components/{andon-config-select.vue => select.vue} (100%)
 rename apps/web-ele/src/views/mes/pro/card/components/{pro-card-select-dialog.vue => select-dialog.vue} (100%)
 rename apps/web-ele/src/views/mes/pro/card/components/{pro-card-select.vue => select.vue} (98%)
 rename apps/web-ele/src/views/mes/pro/process/components/{pro-process-select.vue => select.vue} (100%)
 rename apps/web-ele/src/views/mes/pro/task/components/{pro-task-select-dialog.vue => select-dialog.vue} (100%)
 rename apps/web-ele/src/views/mes/pro/task/components/{pro-task-select.vue => select.vue} (98%)
 rename apps/web-ele/src/views/mes/pro/workorder/components/{pro-work-order-select-dialog.vue => select-dialog.vue} (100%)
 rename apps/web-ele/src/views/mes/pro/workorder/components/{pro-work-order-select.vue => select.vue} (98%)
 create mode 100644 apps/web-ele/src/views/mes/pro/workrecord/components/index.ts
 rename apps/web-ele/src/views/mes/pro/workrecord/components/{work-record-status-bar.vue => status-bar.vue} (97%)
 rename apps/web-ele/src/views/mes/qc/defectrecord/components/{defect-record-inline-form.vue => inline-form.vue} (100%)
 rename apps/web-ele/src/views/mes/qc/defectrecord/components/{defect-record-inline-list.vue => inline-list.vue} (98%)
 rename apps/web-ele/src/views/mes/qc/indicator/components/{qc-indicator-select-dialog.vue => select-dialog.vue} (100%)
 rename apps/web-ele/src/views/mes/qc/indicator/components/{qc-indicator-select.vue => select.vue} (98%)
 rename apps/web-ele/src/views/mes/qc/indicatorresult/components/{qc-indicator-result-form.vue => form.vue} (100%)
 rename apps/web-ele/src/views/mes/qc/indicatorresult/components/{qc-indicator-result-list.vue => list.vue} (98%)
 rename apps/web-ele/src/views/mes/tm/tool/components/{tm-tool-select.vue => select.vue} (100%)
 rename apps/web-ele/src/views/mes/tm/tool/type/components/{tm-tool-type-list.vue => list.vue} (100%)
 rename apps/web-ele/src/views/mes/tm/tool/type/components/{tm-tool-type-select.vue => select.vue} (100%)
 rename apps/web-ele/src/views/mes/wm/arrivalnotice/components/{wm-arrival-notice-line-select-dialog.vue => line-select-dialog.vue} (100%)
 rename apps/web-ele/src/views/mes/wm/arrivalnotice/components/{wm-arrival-notice-line-select.vue => line-select.vue} (97%)
 rename apps/web-ele/src/views/mes/wm/arrivalnotice/components/{wm-arrival-notice-select-dialog.vue => select-dialog.vue} (100%)
 rename apps/web-ele/src/views/mes/wm/arrivalnotice/components/{wm-arrival-notice-select.vue => select.vue} (97%)
 rename apps/web-ele/src/views/mes/wm/barcode/components/{barcode-detail.vue => detail.vue} (100%)
 rename apps/web-ele/src/views/mes/wm/batch/components/{wm-batch-detail.vue => detail.vue} (100%)
 rename apps/web-ele/src/views/mes/wm/batch/components/{wm-batch-select-dialog.vue => select-dialog.vue} (100%)
 rename apps/web-ele/src/views/mes/wm/batch/components/{wm-batch-select.vue => select.vue} (98%)
 rename apps/web-ele/src/views/mes/wm/materialstock/components/{wm-material-stock-select-dialog.vue => select-dialog.vue} (98%)
 rename apps/web-ele/src/views/mes/wm/materialstock/components/{wm-material-stock-select.vue => select.vue} (98%)
 rename apps/web-ele/src/views/mes/wm/packages/components/{wm-package-select-dialog.vue => select-dialog.vue} (100%)
 rename apps/web-ele/src/views/mes/wm/packages/components/{wm-package-select.vue => select.vue} (98%)
 rename apps/web-ele/src/views/mes/wm/salesnotice/components/{wm-sales-notice-line-select-dialog.vue => line-select-dialog.vue} (100%)
 rename apps/web-ele/src/views/mes/wm/salesnotice/components/{wm-sales-notice-line-select.vue => line-select.vue} (97%)
 rename apps/web-ele/src/views/mes/wm/salesnotice/components/{wm-sales-notice-select-dialog.vue => select-dialog.vue} (100%)
 rename apps/web-ele/src/views/mes/wm/salesnotice/components/{wm-sales-notice-select.vue => select.vue} (97%)
 rename apps/web-ele/src/views/mes/wm/stocktaking/plan/components/{stock-taking-plan-select-dialog.vue => select-dialog.vue} (100%)
 rename apps/web-ele/src/views/mes/wm/stocktaking/plan/components/{stock-taking-plan-select.vue => select.vue} (97%)
 rename apps/web-ele/src/views/mes/wm/warehouse/components/{wm-warehouse-area-select.vue => area-select.vue} (100%)
 rename apps/web-ele/src/views/mes/wm/warehouse/components/{wm-warehouse-location-select.vue => location-select.vue} (100%)
 rename apps/web-ele/src/views/mes/wm/warehouse/components/{wm-warehouse-select.vue => select.vue} (100%)

diff --git a/apps/web-antd/src/views/mes/cal/calendar/components/calendar-date-cell.vue b/apps/web-antd/src/views/mes/cal/calendar/components/date-cell.vue
similarity index 100%
rename from apps/web-antd/src/views/mes/cal/calendar/components/calendar-date-cell.vue
rename to apps/web-antd/src/views/mes/cal/calendar/components/date-cell.vue
diff --git a/apps/web-antd/src/views/mes/cal/calendar/components/index.ts b/apps/web-antd/src/views/mes/cal/calendar/components/index.ts
new file mode 100644
index 000000000..e347f44b7
--- /dev/null
+++ b/apps/web-antd/src/views/mes/cal/calendar/components/index.ts
@@ -0,0 +1,4 @@
+export { default as CalendarDateCell } from './date-cell.vue';
+export { default as CalendarLegend } from './legend.vue';
+export { default as CalendarPanel } from './panel.vue';
+export { useCalendar } from './use-calendar';
diff --git a/apps/web-antd/src/views/mes/cal/calendar/components/calendar-legend.vue b/apps/web-antd/src/views/mes/cal/calendar/components/legend.vue
similarity index 100%
rename from apps/web-antd/src/views/mes/cal/calendar/components/calendar-legend.vue
rename to apps/web-antd/src/views/mes/cal/calendar/components/legend.vue
diff --git a/apps/web-antd/src/views/mes/cal/calendar/components/calendar-panel.vue b/apps/web-antd/src/views/mes/cal/calendar/components/panel.vue
similarity index 96%
rename from apps/web-antd/src/views/mes/cal/calendar/components/calendar-panel.vue
rename to apps/web-antd/src/views/mes/cal/calendar/components/panel.vue
index 55fd9049a..2794f40ef 100644
--- a/apps/web-antd/src/views/mes/cal/calendar/components/calendar-panel.vue
+++ b/apps/web-antd/src/views/mes/cal/calendar/components/panel.vue
@@ -6,8 +6,8 @@ import type { MesCalCalendarApi } from '#/api/mes/cal/calendar';
 import { Button, Calendar, Spin } from 'ant-design-vue';
 import dayjs from 'dayjs';
 
-import CalendarDateCell from './calendar-date-cell.vue';
-import CalendarLegend from './calendar-legend.vue';
+import CalendarDateCell from './date-cell.vue';
+import CalendarLegend from './legend.vue';
 
 defineProps<{
   calendarDayMap: Map<string, MesCalCalendarApi.CalendarDay>;
diff --git a/apps/web-antd/src/views/mes/cal/calendar/modules/team-view.vue b/apps/web-antd/src/views/mes/cal/calendar/modules/team-view.vue
index 7637c755b..5a0527a03 100644
--- a/apps/web-antd/src/views/mes/cal/calendar/modules/team-view.vue
+++ b/apps/web-antd/src/views/mes/cal/calendar/modules/team-view.vue
@@ -5,8 +5,7 @@ import { onMounted, ref } from 'vue';
 
 import { getTeamList } from '#/api/mes/cal/team';
 
-import CalendarPanel from '../components/calendar-panel.vue';
-import { useCalendar } from '../components/use-calendar';
+import { CalendarPanel, useCalendar } from '../components';
 
 const {
   calendarDayMap,
diff --git a/apps/web-antd/src/views/mes/cal/calendar/modules/type-view.vue b/apps/web-antd/src/views/mes/cal/calendar/modules/type-view.vue
index 2919e0755..74274f62c 100644
--- a/apps/web-antd/src/views/mes/cal/calendar/modules/type-view.vue
+++ b/apps/web-antd/src/views/mes/cal/calendar/modules/type-view.vue
@@ -6,8 +6,7 @@ import { onMounted, ref } from 'vue';
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
-import CalendarPanel from '../components/calendar-panel.vue';
-import { useCalendar } from '../components/use-calendar';
+import { CalendarPanel, useCalendar } from '../components';
 
 const {
   calendarDayMap,
diff --git a/apps/web-antd/src/views/mes/cal/calendar/modules/user-view.vue b/apps/web-antd/src/views/mes/cal/calendar/modules/user-view.vue
index e42bd2342..3177809fb 100644
--- a/apps/web-antd/src/views/mes/cal/calendar/modules/user-view.vue
+++ b/apps/web-antd/src/views/mes/cal/calendar/modules/user-view.vue
@@ -9,8 +9,7 @@ import { Button, Form, FormItem, Select } from 'ant-design-vue';
 
 import { getSimpleUserList } from '#/api/system/user';
 
-import CalendarPanel from '../components/calendar-panel.vue';
-import { useCalendar } from '../components/use-calendar';
+import { CalendarPanel, useCalendar } from '../components';
 
 const {
   calendarDayMap,
diff --git a/apps/web-antd/src/views/mes/cal/team/components/index.ts b/apps/web-antd/src/views/mes/cal/team/components/index.ts
index 092b24a19..e40fc9490 100644
--- a/apps/web-antd/src/views/mes/cal/team/components/index.ts
+++ b/apps/web-antd/src/views/mes/cal/team/components/index.ts
@@ -1,2 +1,2 @@
-export { default as CalTeamSelectDialog } from './cal-team-select-dialog.vue';
-export { default as CalTeamSelect } from './cal-team-select.vue';
+export { default as CalTeamSelectDialog } from './select-dialog.vue';
+export { default as CalTeamSelect } from './select.vue';
diff --git a/apps/web-antd/src/views/mes/cal/team/components/cal-team-select-dialog.vue b/apps/web-antd/src/views/mes/cal/team/components/select-dialog.vue
similarity index 100%
rename from apps/web-antd/src/views/mes/cal/team/components/cal-team-select-dialog.vue
rename to apps/web-antd/src/views/mes/cal/team/components/select-dialog.vue
diff --git a/apps/web-antd/src/views/mes/cal/team/components/cal-team-select.vue b/apps/web-antd/src/views/mes/cal/team/components/select.vue
similarity index 97%
rename from apps/web-antd/src/views/mes/cal/team/components/cal-team-select.vue
rename to apps/web-antd/src/views/mes/cal/team/components/select.vue
index 73a276e69..a00fe96f2 100644
--- a/apps/web-antd/src/views/mes/cal/team/components/cal-team-select.vue
+++ b/apps/web-antd/src/views/mes/cal/team/components/select.vue
@@ -9,7 +9,7 @@ import { Button, Select } from 'ant-design-vue';
 
 import { getTeamList } from '#/api/mes/cal/team';
 
-import CalTeamSelectDialog from './cal-team-select-dialog.vue';
+import CalTeamSelectDialog from './select-dialog.vue';
 
 const props = withDefaults(
   defineProps<{
diff --git a/apps/web-antd/src/views/mes/dv/checkplan/components/index.ts b/apps/web-antd/src/views/mes/dv/checkplan/components/index.ts
index 379957e07..ff080b299 100644
--- a/apps/web-antd/src/views/mes/dv/checkplan/components/index.ts
+++ b/apps/web-antd/src/views/mes/dv/checkplan/components/index.ts
@@ -1 +1 @@
-export { default as DvCheckPlanSelect } from './dv-check-plan-select.vue';
+export { default as DvCheckPlanSelect } from './select.vue';
diff --git a/apps/web-antd/src/views/mes/dv/checkplan/components/dv-check-plan-select.vue b/apps/web-antd/src/views/mes/dv/checkplan/components/select.vue
similarity index 100%
rename from apps/web-antd/src/views/mes/dv/checkplan/components/dv-check-plan-select.vue
rename to apps/web-antd/src/views/mes/dv/checkplan/components/select.vue
diff --git a/apps/web-antd/src/views/mes/dv/machinery/components/index.ts b/apps/web-antd/src/views/mes/dv/machinery/components/index.ts
index cbe225de1..fee5e15af 100644
--- a/apps/web-antd/src/views/mes/dv/machinery/components/index.ts
+++ b/apps/web-antd/src/views/mes/dv/machinery/components/index.ts
@@ -1 +1 @@
-export { default as DvMachinerySelect } from './dv-machinery-select.vue';
+export { default as DvMachinerySelect } from './select.vue';
diff --git a/apps/web-antd/src/views/mes/dv/machinery/components/dv-machinery-select.vue b/apps/web-antd/src/views/mes/dv/machinery/components/select.vue
similarity index 100%
rename from apps/web-antd/src/views/mes/dv/machinery/components/dv-machinery-select.vue
rename to apps/web-antd/src/views/mes/dv/machinery/components/select.vue
diff --git a/apps/web-antd/src/views/mes/dv/machinery/type/components/index.ts b/apps/web-antd/src/views/mes/dv/machinery/type/components/index.ts
index c4cff7c14..eab3ca005 100644
--- a/apps/web-antd/src/views/mes/dv/machinery/type/components/index.ts
+++ b/apps/web-antd/src/views/mes/dv/machinery/type/components/index.ts
@@ -1,2 +1,2 @@
-export { default as DvMachineryTypeSelect } from './dv-machinery-type-select.vue';
-export { default as MachineryTypeTree } from './machinery-type-tree.vue';
+export { default as DvMachineryTypeSelect } from './select.vue';
+export { default as MachineryTypeTree } from './tree.vue';
diff --git a/apps/web-antd/src/views/mes/dv/machinery/type/components/dv-machinery-type-select.vue b/apps/web-antd/src/views/mes/dv/machinery/type/components/select.vue
similarity index 100%
rename from apps/web-antd/src/views/mes/dv/machinery/type/components/dv-machinery-type-select.vue
rename to apps/web-antd/src/views/mes/dv/machinery/type/components/select.vue
diff --git a/apps/web-antd/src/views/mes/dv/machinery/type/components/machinery-type-tree.vue b/apps/web-antd/src/views/mes/dv/machinery/type/components/tree.vue
similarity index 100%
rename from apps/web-antd/src/views/mes/dv/machinery/type/components/machinery-type-tree.vue
rename to apps/web-antd/src/views/mes/dv/machinery/type/components/tree.vue
diff --git a/apps/web-antd/src/views/mes/dv/subject/components/index.ts b/apps/web-antd/src/views/mes/dv/subject/components/index.ts
index a8c12d3be..ef696470f 100644
--- a/apps/web-antd/src/views/mes/dv/subject/components/index.ts
+++ b/apps/web-antd/src/views/mes/dv/subject/components/index.ts
@@ -1 +1 @@
-export { default as DvSubjectSelect } from './dv-subject-select.vue';
+export { default as DvSubjectSelect } from './select.vue';
diff --git a/apps/web-antd/src/views/mes/dv/subject/components/dv-subject-select.vue b/apps/web-antd/src/views/mes/dv/subject/components/select.vue
similarity index 100%
rename from apps/web-antd/src/views/mes/dv/subject/components/dv-subject-select.vue
rename to apps/web-antd/src/views/mes/dv/subject/components/select.vue
diff --git a/apps/web-antd/src/views/mes/md/client/components/index.ts b/apps/web-antd/src/views/mes/md/client/components/index.ts
new file mode 100644
index 000000000..1339c9bca
--- /dev/null
+++ b/apps/web-antd/src/views/mes/md/client/components/index.ts
@@ -0,0 +1,2 @@
+export { default as MdClientSelectDialog } from './select-dialog.vue';
+export { default as MdClientSelect } from './select.vue';
diff --git a/apps/web-antd/src/views/mes/md/client/components/md-client-select-dialog.vue b/apps/web-antd/src/views/mes/md/client/components/select-dialog.vue
similarity index 100%
rename from apps/web-antd/src/views/mes/md/client/components/md-client-select-dialog.vue
rename to apps/web-antd/src/views/mes/md/client/components/select-dialog.vue
diff --git a/apps/web-antd/src/views/mes/md/client/components/md-client-select.vue b/apps/web-antd/src/views/mes/md/client/components/select.vue
similarity index 98%
rename from apps/web-antd/src/views/mes/md/client/components/md-client-select.vue
rename to apps/web-antd/src/views/mes/md/client/components/select.vue
index 2b3dc0a4c..fe70ff96b 100644
--- a/apps/web-antd/src/views/mes/md/client/components/md-client-select.vue
+++ b/apps/web-antd/src/views/mes/md/client/components/select.vue
@@ -9,7 +9,7 @@ import { Input, Tooltip } from 'ant-design-vue';
 
 import { getClient } from '#/api/mes/md/client';
 
-import MdClientSelectDialog from './md-client-select-dialog.vue';
+import MdClientSelectDialog from './select-dialog.vue';
 
 defineOptions({ name: 'MdClientSelect', inheritAttrs: false });
 
diff --git a/apps/web-antd/src/views/mes/md/item/components/index.ts b/apps/web-antd/src/views/mes/md/item/components/index.ts
index 348ae8798..64d15593a 100644
--- a/apps/web-antd/src/views/mes/md/item/components/index.ts
+++ b/apps/web-antd/src/views/mes/md/item/components/index.ts
@@ -1,4 +1,4 @@
-export { default as MdItemSelectDialog } from './md-item-select-dialog.vue';
-export { default as MdItemSelect } from './md-item-select.vue';
-export { default as MdProductBomSelectDialog } from './md-product-bom-select-dialog.vue';
-export { default as MdProductBomSelect } from './md-product-bom-select.vue';
+export { default as MdProductBomSelectDialog } from './product-bom-select-dialog.vue';
+export { default as MdProductBomSelect } from './product-bom-select.vue';
+export { default as MdItemSelectDialog } from './select-dialog.vue';
+export { default as MdItemSelect } from './select.vue';
diff --git a/apps/web-antd/src/views/mes/md/item/components/md-product-bom-select-dialog.vue b/apps/web-antd/src/views/mes/md/item/components/product-bom-select-dialog.vue
similarity index 100%
rename from apps/web-antd/src/views/mes/md/item/components/md-product-bom-select-dialog.vue
rename to apps/web-antd/src/views/mes/md/item/components/product-bom-select-dialog.vue
diff --git a/apps/web-antd/src/views/mes/md/item/components/md-product-bom-select.vue b/apps/web-antd/src/views/mes/md/item/components/product-bom-select.vue
similarity index 98%
rename from apps/web-antd/src/views/mes/md/item/components/md-product-bom-select.vue
rename to apps/web-antd/src/views/mes/md/item/components/product-bom-select.vue
index 079928585..ac4964f94 100644
--- a/apps/web-antd/src/views/mes/md/item/components/md-product-bom-select.vue
+++ b/apps/web-antd/src/views/mes/md/item/components/product-bom-select.vue
@@ -9,7 +9,7 @@ import { Input, Tooltip } from 'ant-design-vue';
 
 import { getProductBomListByItemId } from '#/api/mes/md/item/productBom';
 
-import MdProductBomSelectDialog from './md-product-bom-select-dialog.vue';
+import MdProductBomSelectDialog from './product-bom-select-dialog.vue';
 
 defineOptions({ name: 'MdProductBomSelect', inheritAttrs: false });
 
diff --git a/apps/web-antd/src/views/mes/md/item/components/md-item-select-dialog.vue b/apps/web-antd/src/views/mes/md/item/components/select-dialog.vue
similarity index 100%
rename from apps/web-antd/src/views/mes/md/item/components/md-item-select-dialog.vue
rename to apps/web-antd/src/views/mes/md/item/components/select-dialog.vue
diff --git a/apps/web-antd/src/views/mes/md/item/components/md-item-select.vue b/apps/web-antd/src/views/mes/md/item/components/select.vue
similarity index 98%
rename from apps/web-antd/src/views/mes/md/item/components/md-item-select.vue
rename to apps/web-antd/src/views/mes/md/item/components/select.vue
index 197d74424..22bd15384 100644
--- a/apps/web-antd/src/views/mes/md/item/components/md-item-select.vue
+++ b/apps/web-antd/src/views/mes/md/item/components/select.vue
@@ -9,7 +9,7 @@ import { Input, Tooltip } from 'ant-design-vue';
 
 import { getItem } from '#/api/mes/md/item';
 
-import MdItemSelectDialog from './md-item-select-dialog.vue';
+import MdItemSelectDialog from './select-dialog.vue';
 
 defineOptions({ name: 'MdItemSelect', inheritAttrs: false });
 
diff --git a/apps/web-antd/src/views/mes/md/item/type/components/index.ts b/apps/web-antd/src/views/mes/md/item/type/components/index.ts
index c5d4dd2c4..d6d2b808a 100644
--- a/apps/web-antd/src/views/mes/md/item/type/components/index.ts
+++ b/apps/web-antd/src/views/mes/md/item/type/components/index.ts
@@ -1,2 +1,2 @@
-export { default as MdItemTypeSelect } from './md-item-type-select.vue';
-export { default as MdItemTypeTree } from './md-item-type-tree.vue';
+export { default as MdItemTypeSelect } from './select.vue';
+export { default as MdItemTypeTree } from './tree.vue';
diff --git a/apps/web-antd/src/views/mes/md/item/type/components/md-item-type-select.vue b/apps/web-antd/src/views/mes/md/item/type/components/select.vue
similarity index 100%
rename from apps/web-antd/src/views/mes/md/item/type/components/md-item-type-select.vue
rename to apps/web-antd/src/views/mes/md/item/type/components/select.vue
diff --git a/apps/web-antd/src/views/mes/md/item/type/components/md-item-type-tree.vue b/apps/web-antd/src/views/mes/md/item/type/components/tree.vue
similarity index 100%
rename from apps/web-antd/src/views/mes/md/item/type/components/md-item-type-tree.vue
rename to apps/web-antd/src/views/mes/md/item/type/components/tree.vue
diff --git a/apps/web-antd/src/views/mes/md/unitmeasure/components/index.ts b/apps/web-antd/src/views/mes/md/unitmeasure/components/index.ts
index 59e066096..e2257ff65 100644
--- a/apps/web-antd/src/views/mes/md/unitmeasure/components/index.ts
+++ b/apps/web-antd/src/views/mes/md/unitmeasure/components/index.ts
@@ -1 +1 @@
-export { default as MdUnitMeasureSelect } from './md-unit-measure-select.vue';
+export { default as MdUnitMeasureSelect } from './select.vue';
diff --git a/apps/web-antd/src/views/mes/md/unitmeasure/components/md-unit-measure-select.vue b/apps/web-antd/src/views/mes/md/unitmeasure/components/select.vue
similarity index 100%
rename from apps/web-antd/src/views/mes/md/unitmeasure/components/md-unit-measure-select.vue
rename to apps/web-antd/src/views/mes/md/unitmeasure/components/select.vue
diff --git a/apps/web-antd/src/views/mes/md/vendor/components/index.ts b/apps/web-antd/src/views/mes/md/vendor/components/index.ts
new file mode 100644
index 000000000..0f16061ab
--- /dev/null
+++ b/apps/web-antd/src/views/mes/md/vendor/components/index.ts
@@ -0,0 +1,2 @@
+export { default as MdVendorSelectDialog } from './select-dialog.vue';
+export { default as MdVendorSelect } from './select.vue';
diff --git a/apps/web-antd/src/views/mes/md/vendor/components/md-vendor-select-dialog.vue b/apps/web-antd/src/views/mes/md/vendor/components/select-dialog.vue
similarity index 100%
rename from apps/web-antd/src/views/mes/md/vendor/components/md-vendor-select-dialog.vue
rename to apps/web-antd/src/views/mes/md/vendor/components/select-dialog.vue
diff --git a/apps/web-antd/src/views/mes/md/vendor/components/md-vendor-select.vue b/apps/web-antd/src/views/mes/md/vendor/components/select.vue
similarity index 98%
rename from apps/web-antd/src/views/mes/md/vendor/components/md-vendor-select.vue
rename to apps/web-antd/src/views/mes/md/vendor/components/select.vue
index 1ef8b9d04..a202650f6 100644
--- a/apps/web-antd/src/views/mes/md/vendor/components/md-vendor-select.vue
+++ b/apps/web-antd/src/views/mes/md/vendor/components/select.vue
@@ -9,7 +9,7 @@ import { Input, Tooltip } from 'ant-design-vue';
 
 import { getVendor } from '#/api/mes/md/vendor';
 
-import MdVendorSelectDialog from './md-vendor-select-dialog.vue';
+import MdVendorSelectDialog from './select-dialog.vue';
 
 defineOptions({ name: 'MdVendorSelect', inheritAttrs: false });
 
diff --git a/apps/web-antd/src/views/mes/md/workstation/components/index.ts b/apps/web-antd/src/views/mes/md/workstation/components/index.ts
index b5855ec6f..a22a0ce28 100644
--- a/apps/web-antd/src/views/mes/md/workstation/components/index.ts
+++ b/apps/web-antd/src/views/mes/md/workstation/components/index.ts
@@ -1,3 +1,3 @@
-export { default as MdWorkshopSelect } from './md-workshop-select.vue';
-export { default as MdWorkstationSelectDialog } from './md-workstation-select-dialog.vue';
-export { default as MdWorkstationSelect } from './md-workstation-select.vue';
+export { default as MdWorkstationSelectDialog } from './select-dialog.vue';
+export { default as MdWorkstationSelect } from './select.vue';
+export { default as MdWorkshopSelect } from './workshop-select.vue';
diff --git a/apps/web-antd/src/views/mes/md/workstation/components/md-workstation-select-dialog.vue b/apps/web-antd/src/views/mes/md/workstation/components/select-dialog.vue
similarity index 100%
rename from apps/web-antd/src/views/mes/md/workstation/components/md-workstation-select-dialog.vue
rename to apps/web-antd/src/views/mes/md/workstation/components/select-dialog.vue
diff --git a/apps/web-antd/src/views/mes/md/workstation/components/md-workstation-select.vue b/apps/web-antd/src/views/mes/md/workstation/components/select.vue
similarity index 98%
rename from apps/web-antd/src/views/mes/md/workstation/components/md-workstation-select.vue
rename to apps/web-antd/src/views/mes/md/workstation/components/select.vue
index 10d8dfd4f..4f65aedea 100644
--- a/apps/web-antd/src/views/mes/md/workstation/components/md-workstation-select.vue
+++ b/apps/web-antd/src/views/mes/md/workstation/components/select.vue
@@ -9,7 +9,7 @@ import { Input, Tooltip } from 'ant-design-vue';
 
 import { getWorkstation } from '#/api/mes/md/workstation';
 
-import MdWorkstationSelectDialog from './md-workstation-select-dialog.vue';
+import MdWorkstationSelectDialog from './select-dialog.vue';
 
 defineOptions({ name: 'MdWorkstationSelect', inheritAttrs: false });
 
diff --git a/apps/web-antd/src/views/mes/md/workstation/components/md-workshop-select.vue b/apps/web-antd/src/views/mes/md/workstation/components/workshop-select.vue
similarity index 100%
rename from apps/web-antd/src/views/mes/md/workstation/components/md-workshop-select.vue
rename to apps/web-antd/src/views/mes/md/workstation/components/workshop-select.vue
diff --git a/apps/web-antd/src/views/mes/pro/andon/config/components/index.ts b/apps/web-antd/src/views/mes/pro/andon/config/components/index.ts
index e7a766883..ac0d63a26 100644
--- a/apps/web-antd/src/views/mes/pro/andon/config/components/index.ts
+++ b/apps/web-antd/src/views/mes/pro/andon/config/components/index.ts
@@ -1 +1 @@
-export { default as AndonConfigSelect } from './andon-config-select.vue';
+export { default as AndonConfigSelect } from './select.vue';
diff --git a/apps/web-antd/src/views/mes/pro/andon/config/components/andon-config-select.vue b/apps/web-antd/src/views/mes/pro/andon/config/components/select.vue
similarity index 100%
rename from apps/web-antd/src/views/mes/pro/andon/config/components/andon-config-select.vue
rename to apps/web-antd/src/views/mes/pro/andon/config/components/select.vue
diff --git a/apps/web-antd/src/views/mes/pro/card/components/index.ts b/apps/web-antd/src/views/mes/pro/card/components/index.ts
index 8092d6cb7..ab7ff1d17 100644
--- a/apps/web-antd/src/views/mes/pro/card/components/index.ts
+++ b/apps/web-antd/src/views/mes/pro/card/components/index.ts
@@ -1,2 +1,2 @@
-export { default as ProCardSelectDialog } from './pro-card-select-dialog.vue';
-export { default as ProCardSelect } from './pro-card-select.vue';
+export { default as ProCardSelectDialog } from './select-dialog.vue';
+export { default as ProCardSelect } from './select.vue';
diff --git a/apps/web-antd/src/views/mes/pro/card/components/pro-card-select-dialog.vue b/apps/web-antd/src/views/mes/pro/card/components/select-dialog.vue
similarity index 100%
rename from apps/web-antd/src/views/mes/pro/card/components/pro-card-select-dialog.vue
rename to apps/web-antd/src/views/mes/pro/card/components/select-dialog.vue
diff --git a/apps/web-antd/src/views/mes/pro/card/components/pro-card-select.vue b/apps/web-antd/src/views/mes/pro/card/components/select.vue
similarity index 98%
rename from apps/web-antd/src/views/mes/pro/card/components/pro-card-select.vue
rename to apps/web-antd/src/views/mes/pro/card/components/select.vue
index 46c5a8804..7523f877f 100644
--- a/apps/web-antd/src/views/mes/pro/card/components/pro-card-select.vue
+++ b/apps/web-antd/src/views/mes/pro/card/components/select.vue
@@ -9,7 +9,7 @@ import { Input, Tooltip } from 'ant-design-vue';
 
 import { getCard } from '#/api/mes/pro/card';
 
-import ProCardSelectDialog from './pro-card-select-dialog.vue';
+import ProCardSelectDialog from './select-dialog.vue';
 
 defineOptions({ name: 'ProCardSelect', inheritAttrs: false });
 
diff --git a/apps/web-antd/src/views/mes/pro/process/components/index.ts b/apps/web-antd/src/views/mes/pro/process/components/index.ts
index e0cca7d22..4204017de 100644
--- a/apps/web-antd/src/views/mes/pro/process/components/index.ts
+++ b/apps/web-antd/src/views/mes/pro/process/components/index.ts
@@ -1 +1 @@
-export { default as ProProcessSelect } from './pro-process-select.vue';
+export { default as ProProcessSelect } from './select.vue';
diff --git a/apps/web-antd/src/views/mes/pro/process/components/pro-process-select.vue b/apps/web-antd/src/views/mes/pro/process/components/select.vue
similarity index 100%
rename from apps/web-antd/src/views/mes/pro/process/components/pro-process-select.vue
rename to apps/web-antd/src/views/mes/pro/process/components/select.vue
diff --git a/apps/web-antd/src/views/mes/pro/task/components/index.ts b/apps/web-antd/src/views/mes/pro/task/components/index.ts
index bfaf6ae17..4c3982323 100644
--- a/apps/web-antd/src/views/mes/pro/task/components/index.ts
+++ b/apps/web-antd/src/views/mes/pro/task/components/index.ts
@@ -1,3 +1,3 @@
 export { default as GanttChart } from './gantt-chart.vue';
-export { default as ProTaskSelectDialog } from './pro-task-select-dialog.vue';
-export { default as ProTaskSelect } from './pro-task-select.vue';
+export { default as ProTaskSelectDialog } from './select-dialog.vue';
+export { default as ProTaskSelect } from './select.vue';
diff --git a/apps/web-antd/src/views/mes/pro/task/components/pro-task-select-dialog.vue b/apps/web-antd/src/views/mes/pro/task/components/select-dialog.vue
similarity index 100%
rename from apps/web-antd/src/views/mes/pro/task/components/pro-task-select-dialog.vue
rename to apps/web-antd/src/views/mes/pro/task/components/select-dialog.vue
diff --git a/apps/web-antd/src/views/mes/pro/task/components/pro-task-select.vue b/apps/web-antd/src/views/mes/pro/task/components/select.vue
similarity index 98%
rename from apps/web-antd/src/views/mes/pro/task/components/pro-task-select.vue
rename to apps/web-antd/src/views/mes/pro/task/components/select.vue
index 100a277c0..34b8f84f8 100644
--- a/apps/web-antd/src/views/mes/pro/task/components/pro-task-select.vue
+++ b/apps/web-antd/src/views/mes/pro/task/components/select.vue
@@ -9,7 +9,7 @@ import { Input, Tooltip } from 'ant-design-vue';
 
 import { getTask } from '#/api/mes/pro/task';
 
-import ProTaskSelectDialog from './pro-task-select-dialog.vue';
+import ProTaskSelectDialog from './select-dialog.vue';
 
 defineOptions({ name: 'ProTaskSelect', inheritAttrs: false });
 
diff --git a/apps/web-antd/src/views/mes/pro/task/data.ts b/apps/web-antd/src/views/mes/pro/task/data.ts
index 1c1461e70..7a6dcb324 100644
--- a/apps/web-antd/src/views/mes/pro/task/data.ts
+++ b/apps/web-antd/src/views/mes/pro/task/data.ts
@@ -9,7 +9,7 @@ import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { getRangePickerDefaultProps } from '#/utils';
-import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
+import { MdClientSelect } from '#/views/mes/md/client/components';
 import { MdItemSelect } from '#/views/mes/md/item/components';
 import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
 import { ProProcessSelect } from '#/views/mes/pro/process/components';
diff --git a/apps/web-antd/src/views/mes/pro/task/edit/index.vue b/apps/web-antd/src/views/mes/pro/task/edit/index.vue
index 002bf57cc..5cde8dc75 100644
--- a/apps/web-antd/src/views/mes/pro/task/edit/index.vue
+++ b/apps/web-antd/src/views/mes/pro/task/edit/index.vue
@@ -7,7 +7,7 @@ import { Badge, Button, message } from 'ant-design-vue';
 
 import { getGanttTaskList, updateTask } from '#/api/mes/pro/task';
 
-import GanttChart from '../components/gantt-chart.vue';
+import { GanttChart } from '../components';
 
 const submitting = ref(false); // 批量保存按钮加载态
 const taskList = ref<any[]>([]); // 甘特图任务数据
diff --git a/apps/web-antd/src/views/mes/pro/task/index.vue b/apps/web-antd/src/views/mes/pro/task/index.vue
index 356b73306..5de88a40a 100644
--- a/apps/web-antd/src/views/mes/pro/task/index.vue
+++ b/apps/web-antd/src/views/mes/pro/task/index.vue
@@ -17,7 +17,7 @@ import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getGanttTaskList } from '#/api/mes/pro/task';
 import { getWorkOrderPage } from '#/api/mes/pro/workorder';
 
-import GanttChart from './components/gantt-chart.vue';
+import { GanttChart } from './components';
 import { useGridColumns, useGridFormSchema } from './data';
 import ScheduleForm from './modules/schedule-form.vue';
 
diff --git a/apps/web-antd/src/views/mes/pro/workorder/components/index.ts b/apps/web-antd/src/views/mes/pro/workorder/components/index.ts
index b53e2876b..7c84b3bf7 100644
--- a/apps/web-antd/src/views/mes/pro/workorder/components/index.ts
+++ b/apps/web-antd/src/views/mes/pro/workorder/components/index.ts
@@ -1,2 +1,2 @@
-export { default as ProWorkOrderSelectDialog } from './pro-work-order-select-dialog.vue';
-export { default as ProWorkOrderSelect } from './pro-work-order-select.vue';
+export { default as ProWorkOrderSelectDialog } from './select-dialog.vue';
+export { default as ProWorkOrderSelect } from './select.vue';
diff --git a/apps/web-antd/src/views/mes/pro/workorder/components/pro-work-order-select-dialog.vue b/apps/web-antd/src/views/mes/pro/workorder/components/select-dialog.vue
similarity index 100%
rename from apps/web-antd/src/views/mes/pro/workorder/components/pro-work-order-select-dialog.vue
rename to apps/web-antd/src/views/mes/pro/workorder/components/select-dialog.vue
diff --git a/apps/web-antd/src/views/mes/pro/workorder/components/pro-work-order-select.vue b/apps/web-antd/src/views/mes/pro/workorder/components/select.vue
similarity index 98%
rename from apps/web-antd/src/views/mes/pro/workorder/components/pro-work-order-select.vue
rename to apps/web-antd/src/views/mes/pro/workorder/components/select.vue
index fb3a53503..d8c15a3f6 100644
--- a/apps/web-antd/src/views/mes/pro/workorder/components/pro-work-order-select.vue
+++ b/apps/web-antd/src/views/mes/pro/workorder/components/select.vue
@@ -9,7 +9,7 @@ import { Input, Tooltip } from 'ant-design-vue';
 
 import { getWorkOrder } from '#/api/mes/pro/workorder';
 
-import ProWorkOrderSelectDialog from './pro-work-order-select-dialog.vue';
+import ProWorkOrderSelectDialog from './select-dialog.vue';
 
 defineOptions({ name: 'ProWorkOrderSelect', inheritAttrs: false });
 
diff --git a/apps/web-antd/src/views/mes/pro/workorder/data.ts b/apps/web-antd/src/views/mes/pro/workorder/data.ts
index ff44a05e7..3c3d2e8ee 100644
--- a/apps/web-antd/src/views/mes/pro/workorder/data.ts
+++ b/apps/web-antd/src/views/mes/pro/workorder/data.ts
@@ -13,9 +13,9 @@ import { Button } from 'ant-design-vue';
 
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getRangePickerDefaultProps } from '#/utils';
-import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
+import { MdClientSelect } from '#/views/mes/md/client/components';
 import { MdItemSelect, MdProductBomSelect } from '#/views/mes/md/item/components';
-import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
+import { MdVendorSelect } from '#/views/mes/md/vendor/components';
 
 /** 表单类型 */
 export type FormType = 'confirm' | 'create' | 'detail' | 'finish' | 'update';
diff --git a/apps/web-antd/src/views/mes/pro/workrecord/components/index.ts b/apps/web-antd/src/views/mes/pro/workrecord/components/index.ts
new file mode 100644
index 000000000..5b9734865
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/workrecord/components/index.ts
@@ -0,0 +1 @@
+export { default as WorkRecordStatusBar } from './status-bar.vue';
diff --git a/apps/web-antd/src/views/mes/pro/workrecord/components/work-record-status-bar.vue b/apps/web-antd/src/views/mes/pro/workrecord/components/status-bar.vue
similarity index 97%
rename from apps/web-antd/src/views/mes/pro/workrecord/components/work-record-status-bar.vue
rename to apps/web-antd/src/views/mes/pro/workrecord/components/status-bar.vue
index f4f4b00ef..d3782b861 100644
--- a/apps/web-antd/src/views/mes/pro/workrecord/components/work-record-status-bar.vue
+++ b/apps/web-antd/src/views/mes/pro/workrecord/components/status-bar.vue
@@ -15,7 +15,7 @@ import {
   clockOutWorkRecord,
   getMyWorkRecord,
 } from '#/api/mes/pro/workrecord';
-import MdWorkstationSelect from '#/views/mes/md/workstation/components/md-workstation-select.vue';
+import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
 
 const emit = defineEmits<{
   (e: 'change'): void;
diff --git a/apps/web-antd/src/views/mes/pro/workrecord/data.ts b/apps/web-antd/src/views/mes/pro/workrecord/data.ts
index 291d7e156..685fb6ad8 100644
--- a/apps/web-antd/src/views/mes/pro/workrecord/data.ts
+++ b/apps/web-antd/src/views/mes/pro/workrecord/data.ts
@@ -10,7 +10,7 @@ import { getDictOptions } from '@vben/hooks';
 
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
-import MdWorkstationSelect from '#/views/mes/md/workstation/components/md-workstation-select.vue';
+import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
 
 /** 关联数据 */
 let userList: SystemUserApi.User[] = [];
diff --git a/apps/web-antd/src/views/mes/pro/workrecord/index.vue b/apps/web-antd/src/views/mes/pro/workrecord/index.vue
index 3c9483954..7f08c5413 100644
--- a/apps/web-antd/src/views/mes/pro/workrecord/index.vue
+++ b/apps/web-antd/src/views/mes/pro/workrecord/index.vue
@@ -12,7 +12,7 @@ import {
 } from '#/api/mes/pro/workrecord';
 import { $t } from '#/locales';
 
-import WorkRecordStatusBar from './components/work-record-status-bar.vue';
+import { WorkRecordStatusBar } from './components';
 import { useGridColumns, useGridFormSchema } from './data';
 
 /** 刷新表格 */
diff --git a/apps/web-antd/src/views/mes/qc/batchtrace/data.ts b/apps/web-antd/src/views/mes/qc/batchtrace/data.ts
index 1b215487a..35f141214 100644
--- a/apps/web-antd/src/views/mes/qc/batchtrace/data.ts
+++ b/apps/web-antd/src/views/mes/qc/batchtrace/data.ts
@@ -5,9 +5,9 @@ import type { DescriptionItemSchema } from '#/components/description';
 
 import { markRaw } from 'vue';
 
-import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
-import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
+import { MdClientSelect } from '#/views/mes/md/client/components';
+import { MdItemSelect } from '#/views/mes/md/item/components';
+import { MdVendorSelect } from '#/views/mes/md/vendor/components';
 
 /** 列表的搜索表单 */
 export function useGridFormSchema(): VbenFormSchema[] {
diff --git a/apps/web-antd/src/views/mes/qc/defectrecord/components/index.ts b/apps/web-antd/src/views/mes/qc/defectrecord/components/index.ts
index 6a2bd142a..b616a60e5 100644
--- a/apps/web-antd/src/views/mes/qc/defectrecord/components/index.ts
+++ b/apps/web-antd/src/views/mes/qc/defectrecord/components/index.ts
@@ -1,2 +1,2 @@
-export { default as DefectRecordInlineForm } from './defect-record-inline-form.vue';
-export { default as DefectRecordInlineList } from './defect-record-inline-list.vue';
+export { default as DefectRecordInlineForm } from './inline-form.vue';
+export { default as DefectRecordInlineList } from './inline-list.vue';
diff --git a/apps/web-antd/src/views/mes/qc/defectrecord/components/defect-record-inline-form.vue b/apps/web-antd/src/views/mes/qc/defectrecord/components/inline-form.vue
similarity index 100%
rename from apps/web-antd/src/views/mes/qc/defectrecord/components/defect-record-inline-form.vue
rename to apps/web-antd/src/views/mes/qc/defectrecord/components/inline-form.vue
diff --git a/apps/web-antd/src/views/mes/qc/defectrecord/components/defect-record-inline-list.vue b/apps/web-antd/src/views/mes/qc/defectrecord/components/inline-list.vue
similarity index 98%
rename from apps/web-antd/src/views/mes/qc/defectrecord/components/defect-record-inline-list.vue
rename to apps/web-antd/src/views/mes/qc/defectrecord/components/inline-list.vue
index 834880e03..9db420bea 100644
--- a/apps/web-antd/src/views/mes/qc/defectrecord/components/defect-record-inline-list.vue
+++ b/apps/web-antd/src/views/mes/qc/defectrecord/components/inline-list.vue
@@ -16,7 +16,7 @@ import {
 import { $t } from '#/locales';
 
 import { useDefectRecordInlineGridColumns } from './data';
-import DefectRecordInlineForm from './defect-record-inline-form.vue';
+import DefectRecordInlineForm from './inline-form.vue';
 
 defineOptions({ name: 'DefectRecordInlineList' });
 
diff --git a/apps/web-antd/src/views/mes/qc/indicator/components/index.ts b/apps/web-antd/src/views/mes/qc/indicator/components/index.ts
index 5958cc7c5..60918e03c 100644
--- a/apps/web-antd/src/views/mes/qc/indicator/components/index.ts
+++ b/apps/web-antd/src/views/mes/qc/indicator/components/index.ts
@@ -1,2 +1,2 @@
-export { default as QcIndicatorSelectDialog } from './qc-indicator-select-dialog.vue';
-export { default as QcIndicatorSelect } from './qc-indicator-select.vue';
+export { default as QcIndicatorSelectDialog } from './select-dialog.vue';
+export { default as QcIndicatorSelect } from './select.vue';
diff --git a/apps/web-antd/src/views/mes/qc/indicator/components/qc-indicator-select-dialog.vue b/apps/web-antd/src/views/mes/qc/indicator/components/select-dialog.vue
similarity index 100%
rename from apps/web-antd/src/views/mes/qc/indicator/components/qc-indicator-select-dialog.vue
rename to apps/web-antd/src/views/mes/qc/indicator/components/select-dialog.vue
diff --git a/apps/web-antd/src/views/mes/qc/indicator/components/qc-indicator-select.vue b/apps/web-antd/src/views/mes/qc/indicator/components/select.vue
similarity index 98%
rename from apps/web-antd/src/views/mes/qc/indicator/components/qc-indicator-select.vue
rename to apps/web-antd/src/views/mes/qc/indicator/components/select.vue
index 7857d06f2..010323d45 100644
--- a/apps/web-antd/src/views/mes/qc/indicator/components/qc-indicator-select.vue
+++ b/apps/web-antd/src/views/mes/qc/indicator/components/select.vue
@@ -9,7 +9,7 @@ import { Input, Tooltip } from 'ant-design-vue';
 
 import { getIndicator } from '#/api/mes/qc/indicator';
 
-import QcIndicatorSelectDialog from './qc-indicator-select-dialog.vue';
+import QcIndicatorSelectDialog from './select-dialog.vue';
 
 defineOptions({ name: 'QcIndicatorSelect', inheritAttrs: false });
 
diff --git a/apps/web-antd/src/views/mes/qc/indicatorresult/components/qc-indicator-result-form.vue b/apps/web-antd/src/views/mes/qc/indicatorresult/components/form.vue
similarity index 100%
rename from apps/web-antd/src/views/mes/qc/indicatorresult/components/qc-indicator-result-form.vue
rename to apps/web-antd/src/views/mes/qc/indicatorresult/components/form.vue
diff --git a/apps/web-antd/src/views/mes/qc/indicatorresult/components/index.ts b/apps/web-antd/src/views/mes/qc/indicatorresult/components/index.ts
index 590fb8b8e..5fdd4eeaf 100644
--- a/apps/web-antd/src/views/mes/qc/indicatorresult/components/index.ts
+++ b/apps/web-antd/src/views/mes/qc/indicatorresult/components/index.ts
@@ -1,2 +1,2 @@
-export { default as QcIndicatorResultForm } from './qc-indicator-result-form.vue';
-export { default as QcIndicatorResultList } from './qc-indicator-result-list.vue';
+export { default as QcIndicatorResultForm } from './form.vue';
+export { default as QcIndicatorResultList } from './list.vue';
diff --git a/apps/web-antd/src/views/mes/qc/indicatorresult/components/qc-indicator-result-list.vue b/apps/web-antd/src/views/mes/qc/indicatorresult/components/list.vue
similarity index 98%
rename from apps/web-antd/src/views/mes/qc/indicatorresult/components/qc-indicator-result-list.vue
rename to apps/web-antd/src/views/mes/qc/indicatorresult/components/list.vue
index 856668d10..48e11bb2b 100644
--- a/apps/web-antd/src/views/mes/qc/indicatorresult/components/qc-indicator-result-list.vue
+++ b/apps/web-antd/src/views/mes/qc/indicatorresult/components/list.vue
@@ -14,7 +14,7 @@ import {
 import { $t } from '#/locales';
 
 import { useQcIndicatorResultGridColumns } from './data';
-import QcIndicatorResultForm from './qc-indicator-result-form.vue';
+import QcIndicatorResultForm from './form.vue';
 
 const props = defineProps<{
   qcId: number;
diff --git a/apps/web-antd/src/views/mes/qc/ipqc/data.ts b/apps/web-antd/src/views/mes/qc/ipqc/data.ts
index 0d6615ab4..09f91e471 100644
--- a/apps/web-antd/src/views/mes/qc/ipqc/data.ts
+++ b/apps/web-antd/src/views/mes/qc/ipqc/data.ts
@@ -12,10 +12,10 @@ import { Button } from 'ant-design-vue';
 
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getSimpleUserList } from '#/api/system/user';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
-import MdWorkstationSelect from '#/views/mes/md/workstation/components/md-workstation-select.vue';
-import ProTaskSelect from '#/views/mes/pro/task/components/pro-task-select.vue';
-import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
+import { MdItemSelect } from '#/views/mes/md/item/components';
+import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
+import { ProTaskSelect } from '#/views/mes/pro/task/components';
+import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-antd/src/views/mes/qc/iqc/data.ts b/apps/web-antd/src/views/mes/qc/iqc/data.ts
index f1d3e806b..7b5b3ee3c 100644
--- a/apps/web-antd/src/views/mes/qc/iqc/data.ts
+++ b/apps/web-antd/src/views/mes/qc/iqc/data.ts
@@ -13,8 +13,8 @@ import { Button } from 'ant-design-vue';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
-import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
+import { MdItemSelect } from '#/views/mes/md/item/components';
+import { MdVendorSelect } from '#/views/mes/md/vendor/components';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-antd/src/views/mes/qc/oqc/data.ts b/apps/web-antd/src/views/mes/qc/oqc/data.ts
index 855b97bf2..45f163532 100644
--- a/apps/web-antd/src/views/mes/qc/oqc/data.ts
+++ b/apps/web-antd/src/views/mes/qc/oqc/data.ts
@@ -12,8 +12,8 @@ import { Button } from 'ant-design-vue';
 
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getSimpleUserList } from '#/api/system/user';
-import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import { MdClientSelect } from '#/views/mes/md/client/components';
+import { MdItemSelect } from '#/views/mes/md/item/components';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-antd/src/views/mes/qc/pendinginspect/data.ts b/apps/web-antd/src/views/mes/qc/pendinginspect/data.ts
index f303b65a5..71c6adc0f 100644
--- a/apps/web-antd/src/views/mes/qc/pendinginspect/data.ts
+++ b/apps/web-antd/src/views/mes/qc/pendinginspect/data.ts
@@ -7,7 +7,7 @@ import { markRaw } from 'vue';
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import { MdItemSelect } from '#/views/mes/md/item/components';
 
 /** 列表的搜索表单 */
 export function useGridFormSchema(): VbenFormSchema[] {
diff --git a/apps/web-antd/src/views/mes/qc/rqc/data.ts b/apps/web-antd/src/views/mes/qc/rqc/data.ts
index 41f895e33..558f365f4 100644
--- a/apps/web-antd/src/views/mes/qc/rqc/data.ts
+++ b/apps/web-antd/src/views/mes/qc/rqc/data.ts
@@ -12,7 +12,7 @@ import { Button } from 'ant-design-vue';
 
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getSimpleUserList } from '#/api/system/user';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import { MdItemSelect } from '#/views/mes/md/item/components';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-antd/src/views/mes/qc/template/data.ts b/apps/web-antd/src/views/mes/qc/template/data.ts
index 98778297c..48536ec1c 100644
--- a/apps/web-antd/src/views/mes/qc/template/data.ts
+++ b/apps/web-antd/src/views/mes/qc/template/data.ts
@@ -13,9 +13,9 @@ import { Button } from 'ant-design-vue';
 
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
-import MdUnitMeasureSelect from '#/views/mes/md/unitmeasure/components/md-unit-measure-select.vue';
-import QcIndicatorSelect from '#/views/mes/qc/indicator/components/qc-indicator-select.vue';
+import { MdItemSelect } from '#/views/mes/md/item/components';
+import { MdUnitMeasureSelect } from '#/views/mes/md/unitmeasure/components';
+import { QcIndicatorSelect } from '#/views/mes/qc/indicator/components';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-antd/src/views/mes/tm/tool/components/index.ts b/apps/web-antd/src/views/mes/tm/tool/components/index.ts
index cdddb2cfd..8af00d7b0 100644
--- a/apps/web-antd/src/views/mes/tm/tool/components/index.ts
+++ b/apps/web-antd/src/views/mes/tm/tool/components/index.ts
@@ -1 +1 @@
-export { default as TmToolSelect } from './tm-tool-select.vue';
+export { default as TmToolSelect } from './select.vue';
diff --git a/apps/web-antd/src/views/mes/tm/tool/components/tm-tool-select.vue b/apps/web-antd/src/views/mes/tm/tool/components/select.vue
similarity index 100%
rename from apps/web-antd/src/views/mes/tm/tool/components/tm-tool-select.vue
rename to apps/web-antd/src/views/mes/tm/tool/components/select.vue
diff --git a/apps/web-antd/src/views/mes/tm/tool/type/components/index.ts b/apps/web-antd/src/views/mes/tm/tool/type/components/index.ts
index 7d68a5c4d..d0fa32ee7 100644
--- a/apps/web-antd/src/views/mes/tm/tool/type/components/index.ts
+++ b/apps/web-antd/src/views/mes/tm/tool/type/components/index.ts
@@ -1,2 +1,2 @@
-export { default as TmToolTypeList } from './tm-tool-type-list.vue';
-export { default as TmToolTypeSelect } from './tm-tool-type-select.vue';
+export { default as TmToolTypeList } from './list.vue';
+export { default as TmToolTypeSelect } from './select.vue';
diff --git a/apps/web-antd/src/views/mes/tm/tool/type/components/tm-tool-type-list.vue b/apps/web-antd/src/views/mes/tm/tool/type/components/list.vue
similarity index 100%
rename from apps/web-antd/src/views/mes/tm/tool/type/components/tm-tool-type-list.vue
rename to apps/web-antd/src/views/mes/tm/tool/type/components/list.vue
diff --git a/apps/web-antd/src/views/mes/tm/tool/type/components/tm-tool-type-select.vue b/apps/web-antd/src/views/mes/tm/tool/type/components/select.vue
similarity index 100%
rename from apps/web-antd/src/views/mes/tm/tool/type/components/tm-tool-type-select.vue
rename to apps/web-antd/src/views/mes/tm/tool/type/components/select.vue
diff --git a/apps/web-antd/src/views/mes/wm/arrivalnotice/components/index.ts b/apps/web-antd/src/views/mes/wm/arrivalnotice/components/index.ts
index 1da3df21b..9f30fda12 100644
--- a/apps/web-antd/src/views/mes/wm/arrivalnotice/components/index.ts
+++ b/apps/web-antd/src/views/mes/wm/arrivalnotice/components/index.ts
@@ -1,2 +1,2 @@
-export { default as WmArrivalNoticeLineSelect } from './wm-arrival-notice-line-select.vue';
-export { default as WmArrivalNoticeSelect } from './wm-arrival-notice-select.vue';
+export { default as WmArrivalNoticeLineSelect } from './line-select.vue';
+export { default as WmArrivalNoticeSelect } from './select.vue';
diff --git a/apps/web-antd/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-line-select-dialog.vue b/apps/web-antd/src/views/mes/wm/arrivalnotice/components/line-select-dialog.vue
similarity index 100%
rename from apps/web-antd/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-line-select-dialog.vue
rename to apps/web-antd/src/views/mes/wm/arrivalnotice/components/line-select-dialog.vue
diff --git a/apps/web-antd/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-line-select.vue b/apps/web-antd/src/views/mes/wm/arrivalnotice/components/line-select.vue
similarity index 97%
rename from apps/web-antd/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-line-select.vue
rename to apps/web-antd/src/views/mes/wm/arrivalnotice/components/line-select.vue
index e186f465f..c8eaee1a5 100644
--- a/apps/web-antd/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-line-select.vue
+++ b/apps/web-antd/src/views/mes/wm/arrivalnotice/components/line-select.vue
@@ -9,7 +9,7 @@ import { Input, Tooltip } from 'ant-design-vue';
 
 import { getArrivalNoticeLine } from '#/api/mes/wm/arrivalnotice/line';
 
-import WmArrivalNoticeLineSelectDialog from './wm-arrival-notice-line-select-dialog.vue';
+import WmArrivalNoticeLineSelectDialog from './line-select-dialog.vue';
 
 defineOptions({ name: 'WmArrivalNoticeLineSelect', inheritAttrs: false });
 
diff --git a/apps/web-antd/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-select-dialog.vue b/apps/web-antd/src/views/mes/wm/arrivalnotice/components/select-dialog.vue
similarity index 100%
rename from apps/web-antd/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-select-dialog.vue
rename to apps/web-antd/src/views/mes/wm/arrivalnotice/components/select-dialog.vue
diff --git a/apps/web-antd/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-select.vue b/apps/web-antd/src/views/mes/wm/arrivalnotice/components/select.vue
similarity index 97%
rename from apps/web-antd/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-select.vue
rename to apps/web-antd/src/views/mes/wm/arrivalnotice/components/select.vue
index 3858b7f13..399ac1b3a 100644
--- a/apps/web-antd/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-select.vue
+++ b/apps/web-antd/src/views/mes/wm/arrivalnotice/components/select.vue
@@ -9,7 +9,7 @@ import { Input, Tooltip } from 'ant-design-vue';
 
 import { getArrivalNotice } from '#/api/mes/wm/arrivalnotice';
 
-import WmArrivalNoticeSelectDialog from './wm-arrival-notice-select-dialog.vue';
+import WmArrivalNoticeSelectDialog from './select-dialog.vue';
 
 defineOptions({ name: 'WmArrivalNoticeSelect', inheritAttrs: false });
 
diff --git a/apps/web-antd/src/views/mes/wm/arrivalnotice/data.ts b/apps/web-antd/src/views/mes/wm/arrivalnotice/data.ts
index c80cb6212..0d7679af1 100644
--- a/apps/web-antd/src/views/mes/wm/arrivalnotice/data.ts
+++ b/apps/web-antd/src/views/mes/wm/arrivalnotice/data.ts
@@ -12,8 +12,8 @@ import { Button } from 'ant-design-vue';
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getRangePickerDefaultProps } from '#/utils';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
-import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
+import { MdItemSelect } from '#/views/mes/md/item/components';
+import { MdVendorSelect } from '#/views/mes/md/vendor/components';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-antd/src/views/mes/wm/barcode/components/barcode-detail.vue b/apps/web-antd/src/views/mes/wm/barcode/components/detail.vue
similarity index 100%
rename from apps/web-antd/src/views/mes/wm/barcode/components/barcode-detail.vue
rename to apps/web-antd/src/views/mes/wm/barcode/components/detail.vue
diff --git a/apps/web-antd/src/views/mes/wm/barcode/components/index.ts b/apps/web-antd/src/views/mes/wm/barcode/components/index.ts
index 87168be0a..9bd45dfbc 100644
--- a/apps/web-antd/src/views/mes/wm/barcode/components/index.ts
+++ b/apps/web-antd/src/views/mes/wm/barcode/components/index.ts
@@ -1,3 +1,3 @@
-export { default as BarcodeDetail } from './barcode-detail.vue';
 export { default as Barcode } from './barcode.vue';
+export { default as BarcodeDetail } from './detail.vue';
 export { default as PrinterLabel } from './printer-label.vue';
diff --git a/apps/web-antd/src/views/mes/wm/barcode/data.ts b/apps/web-antd/src/views/mes/wm/barcode/data.ts
index 6ae33acc6..4d79c7b3b 100644
--- a/apps/web-antd/src/views/mes/wm/barcode/data.ts
+++ b/apps/web-antd/src/views/mes/wm/barcode/data.ts
@@ -13,25 +13,27 @@ import { formatDateTime } from '@vben/utils';
 import { z } from '#/adapter/form';
 import { generateBarcodeContent } from '#/api/mes/wm/barcode';
 import { DictTag } from '#/components/dict-tag';
-import DvMachinerySelect from '#/views/mes/dv/machinery/components/dv-machinery-select.vue';
-import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
-import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
-import MdWorkshopSelect from '#/views/mes/md/workstation/components/md-workshop-select.vue';
-import MdWorkstationSelect from '#/views/mes/md/workstation/components/md-workstation-select.vue';
+import { DvMachinerySelect } from '#/views/mes/dv/machinery/components';
+import { MdClientSelect } from '#/views/mes/md/client/components';
+import { MdItemSelect } from '#/views/mes/md/item/components';
+import { MdVendorSelect } from '#/views/mes/md/vendor/components';
+import {
+  MdWorkshopSelect,
+  MdWorkstationSelect,
+} from '#/views/mes/md/workstation/components';
 import { ProCardSelect } from '#/views/mes/pro/card/components';
-import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
-import TmToolSelect from '#/views/mes/tm/tool/components/tm-tool-select.vue';
+import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
+import { TmToolSelect } from '#/views/mes/tm/tool/components';
 import { WmBatchSelect } from '#/views/mes/wm/batch/components';
 import { UserSelect } from '#/views/system/user/components';
 
-import WmMaterialStockSelect from './../materialstock/components/wm-material-stock-select.vue';
-import { WmPackageSelect } from './../packages/components';
+import { WmMaterialStockSelect } from '../materialstock/components';
+import { WmPackageSelect } from '../packages/components';
 import {
   WmWarehouseAreaSelect,
   WmWarehouseLocationSelect,
   WmWarehouseSelect,
-} from './../warehouse/components';
+} from '../warehouse/components';
 
 /** 业务对象选中后回填业务编码、业务名称、条码内容 */
 async function syncBizDetail(
diff --git a/apps/web-antd/src/views/mes/wm/batch/components/wm-batch-detail.vue b/apps/web-antd/src/views/mes/wm/batch/components/detail.vue
similarity index 100%
rename from apps/web-antd/src/views/mes/wm/batch/components/wm-batch-detail.vue
rename to apps/web-antd/src/views/mes/wm/batch/components/detail.vue
diff --git a/apps/web-antd/src/views/mes/wm/batch/components/index.ts b/apps/web-antd/src/views/mes/wm/batch/components/index.ts
index 1b9294cdd..e4b04017f 100644
--- a/apps/web-antd/src/views/mes/wm/batch/components/index.ts
+++ b/apps/web-antd/src/views/mes/wm/batch/components/index.ts
@@ -1,3 +1,3 @@
-export { default as WmBatchDetail } from './wm-batch-detail.vue';
-export { default as WmBatchSelectDialog } from './wm-batch-select-dialog.vue';
-export { default as WmBatchSelect } from './wm-batch-select.vue';
+export { default as WmBatchDetail } from './detail.vue';
+export { default as WmBatchSelectDialog } from './select-dialog.vue';
+export { default as WmBatchSelect } from './select.vue';
diff --git a/apps/web-antd/src/views/mes/wm/batch/components/wm-batch-select-dialog.vue b/apps/web-antd/src/views/mes/wm/batch/components/select-dialog.vue
similarity index 100%
rename from apps/web-antd/src/views/mes/wm/batch/components/wm-batch-select-dialog.vue
rename to apps/web-antd/src/views/mes/wm/batch/components/select-dialog.vue
diff --git a/apps/web-antd/src/views/mes/wm/batch/components/wm-batch-select.vue b/apps/web-antd/src/views/mes/wm/batch/components/select.vue
similarity index 98%
rename from apps/web-antd/src/views/mes/wm/batch/components/wm-batch-select.vue
rename to apps/web-antd/src/views/mes/wm/batch/components/select.vue
index 7464a6639..9f208caff 100644
--- a/apps/web-antd/src/views/mes/wm/batch/components/wm-batch-select.vue
+++ b/apps/web-antd/src/views/mes/wm/batch/components/select.vue
@@ -9,7 +9,7 @@ import { Input, Tooltip } from 'ant-design-vue';
 
 import { getBatch } from '#/api/mes/wm/batch';
 
-import WmBatchSelectDialog from './wm-batch-select-dialog.vue';
+import WmBatchSelectDialog from './select-dialog.vue';
 
 defineOptions({ name: 'WmBatchSelect', inheritAttrs: false });
 
diff --git a/apps/web-antd/src/views/mes/wm/batch/data.ts b/apps/web-antd/src/views/mes/wm/batch/data.ts
index 285b55e5e..006ec0e9f 100644
--- a/apps/web-antd/src/views/mes/wm/batch/data.ts
+++ b/apps/web-antd/src/views/mes/wm/batch/data.ts
@@ -11,9 +11,9 @@ import { formatDate } from '@vben/utils';
 
 import { DictTag } from '#/components/dict-tag';
 import { getRangePickerDefaultProps } from '#/utils';
-import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
-import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
+import { MdClientSelect } from '#/views/mes/md/client/components';
+import { MdItemSelect } from '#/views/mes/md/item/components';
+import { MdVendorSelect } from '#/views/mes/md/vendor/components';
 import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
 import { ProTaskSelect } from '#/views/mes/pro/task/components';
 import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
diff --git a/apps/web-antd/src/views/mes/wm/itemreceipt/data.ts b/apps/web-antd/src/views/mes/wm/itemreceipt/data.ts
index 24aadac33..7d00cfcf3 100644
--- a/apps/web-antd/src/views/mes/wm/itemreceipt/data.ts
+++ b/apps/web-antd/src/views/mes/wm/itemreceipt/data.ts
@@ -14,8 +14,8 @@ import { Button } from 'ant-design-vue';
 
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getRangePickerDefaultProps } from '#/utils';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
-import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
+import { MdItemSelect } from '#/views/mes/md/item/components';
+import { MdVendorSelect } from '#/views/mes/md/vendor/components';
 import {
   WmArrivalNoticeLineSelect,
   WmArrivalNoticeSelect,
diff --git a/apps/web-antd/src/views/mes/wm/materialstock/components/index.ts b/apps/web-antd/src/views/mes/wm/materialstock/components/index.ts
index 8e0321711..aa23039f9 100644
--- a/apps/web-antd/src/views/mes/wm/materialstock/components/index.ts
+++ b/apps/web-antd/src/views/mes/wm/materialstock/components/index.ts
@@ -1,2 +1,2 @@
-export { default as WmMaterialStockSelectDialog } from './wm-material-stock-select-dialog.vue';
-export { default as WmMaterialStockSelect } from './wm-material-stock-select.vue';
+export { default as WmMaterialStockSelectDialog } from './select-dialog.vue';
+export { default as WmMaterialStockSelect } from './select.vue';
diff --git a/apps/web-antd/src/views/mes/wm/materialstock/components/wm-material-stock-select-dialog.vue b/apps/web-antd/src/views/mes/wm/materialstock/components/select-dialog.vue
similarity index 98%
rename from apps/web-antd/src/views/mes/wm/materialstock/components/wm-material-stock-select-dialog.vue
rename to apps/web-antd/src/views/mes/wm/materialstock/components/select-dialog.vue
index a6201fbc6..09317804a 100644
--- a/apps/web-antd/src/views/mes/wm/materialstock/components/wm-material-stock-select-dialog.vue
+++ b/apps/web-antd/src/views/mes/wm/materialstock/components/select-dialog.vue
@@ -8,7 +8,7 @@ import { Alert, message, Modal } from 'ant-design-vue';
 
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getMaterialStockPage } from '#/api/mes/wm/materialstock';
-import MdItemTypeTree from '#/views/mes/md/item/type/components/md-item-type-tree.vue';
+import { MdItemTypeTree } from '#/views/mes/md/item/type/components';
 
 import { useSelectGridColumns, useSelectGridFormSchema } from '../data';
 
diff --git a/apps/web-antd/src/views/mes/wm/materialstock/components/wm-material-stock-select.vue b/apps/web-antd/src/views/mes/wm/materialstock/components/select.vue
similarity index 98%
rename from apps/web-antd/src/views/mes/wm/materialstock/components/wm-material-stock-select.vue
rename to apps/web-antd/src/views/mes/wm/materialstock/components/select.vue
index 6430bee14..cd7ae7c89 100644
--- a/apps/web-antd/src/views/mes/wm/materialstock/components/wm-material-stock-select.vue
+++ b/apps/web-antd/src/views/mes/wm/materialstock/components/select.vue
@@ -9,7 +9,7 @@ import { Input, Tooltip } from 'ant-design-vue';
 
 import { getMaterialStock } from '#/api/mes/wm/materialstock';
 
-import WmMaterialStockSelectDialog from './wm-material-stock-select-dialog.vue';
+import WmMaterialStockSelectDialog from './select-dialog.vue';
 
 defineOptions({ name: 'WmMaterialStockSelect', inheritAttrs: false });
 
diff --git a/apps/web-antd/src/views/mes/wm/materialstock/data.ts b/apps/web-antd/src/views/mes/wm/materialstock/data.ts
index e23914a99..7b36c38b5 100644
--- a/apps/web-antd/src/views/mes/wm/materialstock/data.ts
+++ b/apps/web-antd/src/views/mes/wm/materialstock/data.ts
@@ -6,8 +6,8 @@ import { markRaw } from 'vue';
 
 import { DICT_TYPE } from '@vben/constants';
 
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
-import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
+import { MdItemSelect } from '#/views/mes/md/item/components';
+import { MdVendorSelect } from '#/views/mes/md/vendor/components';
 
 import {
   WmWarehouseAreaSelect,
diff --git a/apps/web-antd/src/views/mes/wm/materialstock/index.vue b/apps/web-antd/src/views/mes/wm/materialstock/index.vue
index 3006511ed..567d57e64 100644
--- a/apps/web-antd/src/views/mes/wm/materialstock/index.vue
+++ b/apps/web-antd/src/views/mes/wm/materialstock/index.vue
@@ -16,7 +16,7 @@ import {
   updateMaterialStockFrozen,
 } from '#/api/mes/wm/materialstock';
 import { $t } from '#/locales';
-import MdItemTypeTree from '#/views/mes/md/item/type/components/md-item-type-tree.vue';
+import { MdItemTypeTree } from '#/views/mes/md/item/type/components';
 import { WmBatchDetail } from '#/views/mes/wm/batch/components';
 import AreaForm from '#/views/mes/wm/warehouse/area/modules/form.vue';
 
diff --git a/apps/web-antd/src/views/mes/wm/outsourceissue/data.ts b/apps/web-antd/src/views/mes/wm/outsourceissue/data.ts
index 77b352dfe..707d50dc2 100644
--- a/apps/web-antd/src/views/mes/wm/outsourceissue/data.ts
+++ b/apps/web-antd/src/views/mes/wm/outsourceissue/data.ts
@@ -14,9 +14,9 @@ import { Button } from 'ant-design-vue';
 
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getRangePickerDefaultProps } from '#/utils';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
-import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
-import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
+import { MdItemSelect } from '#/views/mes/md/item/components';
+import { MdVendorSelect } from '#/views/mes/md/vendor/components';
+import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
 import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
 import {
   WmWarehouseAreaSelect,
diff --git a/apps/web-antd/src/views/mes/wm/outsourcereceipt/data.ts b/apps/web-antd/src/views/mes/wm/outsourcereceipt/data.ts
index 0aa83616c..c60315d12 100644
--- a/apps/web-antd/src/views/mes/wm/outsourcereceipt/data.ts
+++ b/apps/web-antd/src/views/mes/wm/outsourcereceipt/data.ts
@@ -15,9 +15,9 @@ import { Button } from 'ant-design-vue';
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getRangePickerDefaultProps } from '#/utils';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
-import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
-import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
+import { MdItemSelect } from '#/views/mes/md/item/components';
+import { MdVendorSelect } from '#/views/mes/md/vendor/components';
+import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
 import {
   WmWarehouseAreaSelect,
   WmWarehouseLocationSelect,
diff --git a/apps/web-antd/src/views/mes/wm/packages/components/index.ts b/apps/web-antd/src/views/mes/wm/packages/components/index.ts
index 18bbc399e..de95a0617 100644
--- a/apps/web-antd/src/views/mes/wm/packages/components/index.ts
+++ b/apps/web-antd/src/views/mes/wm/packages/components/index.ts
@@ -1,2 +1,2 @@
-export { default as WmPackageSelectDialog } from './wm-package-select-dialog.vue';
-export { default as WmPackageSelect } from './wm-package-select.vue';
+export { default as WmPackageSelectDialog } from './select-dialog.vue';
+export { default as WmPackageSelect } from './select.vue';
diff --git a/apps/web-antd/src/views/mes/wm/packages/components/wm-package-select-dialog.vue b/apps/web-antd/src/views/mes/wm/packages/components/select-dialog.vue
similarity index 100%
rename from apps/web-antd/src/views/mes/wm/packages/components/wm-package-select-dialog.vue
rename to apps/web-antd/src/views/mes/wm/packages/components/select-dialog.vue
diff --git a/apps/web-antd/src/views/mes/wm/packages/components/wm-package-select.vue b/apps/web-antd/src/views/mes/wm/packages/components/select.vue
similarity index 98%
rename from apps/web-antd/src/views/mes/wm/packages/components/wm-package-select.vue
rename to apps/web-antd/src/views/mes/wm/packages/components/select.vue
index 93c311e34..db71b969a 100644
--- a/apps/web-antd/src/views/mes/wm/packages/components/wm-package-select.vue
+++ b/apps/web-antd/src/views/mes/wm/packages/components/select.vue
@@ -9,7 +9,7 @@ import { Input, Tooltip } from 'ant-design-vue';
 
 import { getPackage } from '#/api/mes/wm/packages';
 
-import WmPackageSelectDialog from './wm-package-select-dialog.vue';
+import WmPackageSelectDialog from './select-dialog.vue';
 
 defineOptions({ name: 'WmPackageSelect', inheritAttrs: false });
 
diff --git a/apps/web-antd/src/views/mes/wm/packages/data.ts b/apps/web-antd/src/views/mes/wm/packages/data.ts
index 82aa03c10..dcbb87e15 100644
--- a/apps/web-antd/src/views/mes/wm/packages/data.ts
+++ b/apps/web-antd/src/views/mes/wm/packages/data.ts
@@ -11,10 +11,10 @@ import { Button } from 'ant-design-vue';
 
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getSimpleUserList } from '#/api/system/user';
-import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import { MdClientSelect } from '#/views/mes/md/client/components';
+import { MdItemSelect } from '#/views/mes/md/item/components';
 import { MdUnitMeasureSelect } from '#/views/mes/md/unitmeasure/components';
-import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
+import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-antd/src/views/mes/wm/packages/modules/sub-package-list.vue b/apps/web-antd/src/views/mes/wm/packages/modules/sub-package-list.vue
index b5183ce4c..b35bc3d37 100644
--- a/apps/web-antd/src/views/mes/wm/packages/modules/sub-package-list.vue
+++ b/apps/web-antd/src/views/mes/wm/packages/modules/sub-package-list.vue
@@ -14,7 +14,7 @@ import {
 } from '#/api/mes/wm/packages';
 import { $t } from '#/locales';
 
-import WmPackageSelectDialog from '../components/wm-package-select-dialog.vue';
+import { WmPackageSelectDialog } from '../components';
 import { useSubPackageGridColumns } from '../data';
 
 const props = defineProps<{
diff --git a/apps/web-antd/src/views/mes/wm/productissue/data.ts b/apps/web-antd/src/views/mes/wm/productissue/data.ts
index 35439aae5..070f27c5d 100644
--- a/apps/web-antd/src/views/mes/wm/productissue/data.ts
+++ b/apps/web-antd/src/views/mes/wm/productissue/data.ts
@@ -14,9 +14,9 @@ import { Button } from 'ant-design-vue';
 
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getRangePickerDefaultProps } from '#/utils';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
-import MdWorkstationSelect from '#/views/mes/md/workstation/components/md-workstation-select.vue';
-import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
+import { MdItemSelect } from '#/views/mes/md/item/components';
+import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
+import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
 import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
 import {
   WmWarehouseAreaSelect,
diff --git a/apps/web-antd/src/views/mes/wm/productreceipt/data.ts b/apps/web-antd/src/views/mes/wm/productreceipt/data.ts
index 68c4ae666..c08c1318b 100644
--- a/apps/web-antd/src/views/mes/wm/productreceipt/data.ts
+++ b/apps/web-antd/src/views/mes/wm/productreceipt/data.ts
@@ -13,8 +13,8 @@ import { Button } from 'ant-design-vue';
 
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getRangePickerDefaultProps } from '#/utils';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
-import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
+import { MdItemSelect } from '#/views/mes/md/item/components';
+import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
 import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
 import {
   WmWarehouseAreaSelect,
diff --git a/apps/web-antd/src/views/mes/wm/productsales/data.ts b/apps/web-antd/src/views/mes/wm/productsales/data.ts
index a82be53e4..bcc535727 100644
--- a/apps/web-antd/src/views/mes/wm/productsales/data.ts
+++ b/apps/web-antd/src/views/mes/wm/productsales/data.ts
@@ -17,8 +17,8 @@ import { Button } from 'ant-design-vue';
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getRangePickerDefaultProps } from '#/utils';
-import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import { MdClientSelect } from '#/views/mes/md/client/components';
+import { MdItemSelect } from '#/views/mes/md/item/components';
 import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
 import {
   WmSalesNoticeLineSelect,
diff --git a/apps/web-antd/src/views/mes/wm/returnissue/data.ts b/apps/web-antd/src/views/mes/wm/returnissue/data.ts
index 54fa15924..1ad1b1919 100644
--- a/apps/web-antd/src/views/mes/wm/returnissue/data.ts
+++ b/apps/web-antd/src/views/mes/wm/returnissue/data.ts
@@ -14,9 +14,9 @@ import { Button } from 'ant-design-vue';
 
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
-import MdWorkstationSelect from '#/views/mes/md/workstation/components/md-workstation-select.vue';
-import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
+import { MdItemSelect } from '#/views/mes/md/item/components';
+import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
+import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
 import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
 import {
   WmWarehouseAreaSelect,
diff --git a/apps/web-antd/src/views/mes/wm/returnsales/data.ts b/apps/web-antd/src/views/mes/wm/returnsales/data.ts
index 2b6a35cc3..d22313a70 100644
--- a/apps/web-antd/src/views/mes/wm/returnsales/data.ts
+++ b/apps/web-antd/src/views/mes/wm/returnsales/data.ts
@@ -13,8 +13,8 @@ import { Button } from 'ant-design-vue';
 
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
-import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import { MdClientSelect } from '#/views/mes/md/client/components';
+import { MdItemSelect } from '#/views/mes/md/item/components';
 import { WmBatchSelect } from '#/views/mes/wm/batch/components';
 import {
   WmWarehouseAreaSelect,
diff --git a/apps/web-antd/src/views/mes/wm/returnvendor/data.ts b/apps/web-antd/src/views/mes/wm/returnvendor/data.ts
index e707b48ab..4d7ad5b2a 100644
--- a/apps/web-antd/src/views/mes/wm/returnvendor/data.ts
+++ b/apps/web-antd/src/views/mes/wm/returnvendor/data.ts
@@ -12,8 +12,8 @@ import { DICT_TYPE, MesAutoCodeRuleCode } from '@vben/constants';
 import { Button } from 'ant-design-vue';
 
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
-import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
+import { MdItemSelect } from '#/views/mes/md/item/components';
+import { MdVendorSelect } from '#/views/mes/md/vendor/components';
 import { WmBatchSelect } from '#/views/mes/wm/batch/components';
 import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
 import {
diff --git a/apps/web-antd/src/views/mes/wm/salesnotice/components/index.ts b/apps/web-antd/src/views/mes/wm/salesnotice/components/index.ts
index 0d5910b0e..2bc67d699 100644
--- a/apps/web-antd/src/views/mes/wm/salesnotice/components/index.ts
+++ b/apps/web-antd/src/views/mes/wm/salesnotice/components/index.ts
@@ -1,2 +1,2 @@
-export { default as WmSalesNoticeLineSelect } from './wm-sales-notice-line-select.vue';
-export { default as WmSalesNoticeSelect } from './wm-sales-notice-select.vue';
+export { default as WmSalesNoticeLineSelect } from './line-select.vue';
+export { default as WmSalesNoticeSelect } from './select.vue';
diff --git a/apps/web-antd/src/views/mes/wm/salesnotice/components/wm-sales-notice-line-select-dialog.vue b/apps/web-antd/src/views/mes/wm/salesnotice/components/line-select-dialog.vue
similarity index 100%
rename from apps/web-antd/src/views/mes/wm/salesnotice/components/wm-sales-notice-line-select-dialog.vue
rename to apps/web-antd/src/views/mes/wm/salesnotice/components/line-select-dialog.vue
diff --git a/apps/web-antd/src/views/mes/wm/salesnotice/components/wm-sales-notice-line-select.vue b/apps/web-antd/src/views/mes/wm/salesnotice/components/line-select.vue
similarity index 97%
rename from apps/web-antd/src/views/mes/wm/salesnotice/components/wm-sales-notice-line-select.vue
rename to apps/web-antd/src/views/mes/wm/salesnotice/components/line-select.vue
index df595918e..07b1b531b 100644
--- a/apps/web-antd/src/views/mes/wm/salesnotice/components/wm-sales-notice-line-select.vue
+++ b/apps/web-antd/src/views/mes/wm/salesnotice/components/line-select.vue
@@ -9,7 +9,7 @@ import { Input, Tooltip } from 'ant-design-vue';
 
 import { getSalesNoticeLine } from '#/api/mes/wm/salesnotice/line';
 
-import WmSalesNoticeLineSelectDialog from './wm-sales-notice-line-select-dialog.vue';
+import WmSalesNoticeLineSelectDialog from './line-select-dialog.vue';
 
 defineOptions({ name: 'WmSalesNoticeLineSelect', inheritAttrs: false });
 
diff --git a/apps/web-antd/src/views/mes/wm/salesnotice/components/wm-sales-notice-select-dialog.vue b/apps/web-antd/src/views/mes/wm/salesnotice/components/select-dialog.vue
similarity index 100%
rename from apps/web-antd/src/views/mes/wm/salesnotice/components/wm-sales-notice-select-dialog.vue
rename to apps/web-antd/src/views/mes/wm/salesnotice/components/select-dialog.vue
diff --git a/apps/web-antd/src/views/mes/wm/salesnotice/components/wm-sales-notice-select.vue b/apps/web-antd/src/views/mes/wm/salesnotice/components/select.vue
similarity index 97%
rename from apps/web-antd/src/views/mes/wm/salesnotice/components/wm-sales-notice-select.vue
rename to apps/web-antd/src/views/mes/wm/salesnotice/components/select.vue
index 13f72c6f3..2f359d1ee 100644
--- a/apps/web-antd/src/views/mes/wm/salesnotice/components/wm-sales-notice-select.vue
+++ b/apps/web-antd/src/views/mes/wm/salesnotice/components/select.vue
@@ -9,7 +9,7 @@ import { Input, Tooltip } from 'ant-design-vue';
 
 import { getSalesNotice } from '#/api/mes/wm/salesnotice';
 
-import WmSalesNoticeSelectDialog from './wm-sales-notice-select-dialog.vue';
+import WmSalesNoticeSelectDialog from './select-dialog.vue';
 
 defineOptions({ name: 'WmSalesNoticeSelect', inheritAttrs: false });
 
diff --git a/apps/web-antd/src/views/mes/wm/salesnotice/data.ts b/apps/web-antd/src/views/mes/wm/salesnotice/data.ts
index 551de1cd2..f9a19310f 100644
--- a/apps/web-antd/src/views/mes/wm/salesnotice/data.ts
+++ b/apps/web-antd/src/views/mes/wm/salesnotice/data.ts
@@ -11,8 +11,8 @@ import { Button } from 'ant-design-vue';
 
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
-import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import { MdClientSelect } from '#/views/mes/md/client/components';
+import { MdItemSelect } from '#/views/mes/md/item/components';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'finish' | 'update';
diff --git a/apps/web-antd/src/views/mes/wm/sn/data.ts b/apps/web-antd/src/views/mes/wm/sn/data.ts
index 50b8020a6..804fd203f 100644
--- a/apps/web-antd/src/views/mes/wm/sn/data.ts
+++ b/apps/web-antd/src/views/mes/wm/sn/data.ts
@@ -5,7 +5,7 @@ import type { MesWmSnApi } from '#/api/mes/wm/sn';
 import { markRaw } from 'vue';
 
 import { getRangePickerDefaultProps } from '#/utils';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import { MdItemSelect } from '#/views/mes/md/item/components';
 
 /** 生成 SN 码的表单 */
 export function useFormSchema(): VbenFormSchema[] {
diff --git a/apps/web-antd/src/views/mes/wm/stocktaking/plan/components/index.ts b/apps/web-antd/src/views/mes/wm/stocktaking/plan/components/index.ts
index d6289b11d..5a374ab09 100644
--- a/apps/web-antd/src/views/mes/wm/stocktaking/plan/components/index.ts
+++ b/apps/web-antd/src/views/mes/wm/stocktaking/plan/components/index.ts
@@ -1,2 +1,2 @@
-export { default as StockTakingPlanSelectDialog } from './stock-taking-plan-select-dialog.vue';
-export { default as StockTakingPlanSelect } from './stock-taking-plan-select.vue';
+export { default as StockTakingPlanSelectDialog } from './select-dialog.vue';
+export { default as StockTakingPlanSelect } from './select.vue';
diff --git a/apps/web-antd/src/views/mes/wm/stocktaking/plan/components/stock-taking-plan-select-dialog.vue b/apps/web-antd/src/views/mes/wm/stocktaking/plan/components/select-dialog.vue
similarity index 100%
rename from apps/web-antd/src/views/mes/wm/stocktaking/plan/components/stock-taking-plan-select-dialog.vue
rename to apps/web-antd/src/views/mes/wm/stocktaking/plan/components/select-dialog.vue
diff --git a/apps/web-antd/src/views/mes/wm/stocktaking/plan/components/stock-taking-plan-select.vue b/apps/web-antd/src/views/mes/wm/stocktaking/plan/components/select.vue
similarity index 97%
rename from apps/web-antd/src/views/mes/wm/stocktaking/plan/components/stock-taking-plan-select.vue
rename to apps/web-antd/src/views/mes/wm/stocktaking/plan/components/select.vue
index 82cf2f4ee..2f287f63d 100644
--- a/apps/web-antd/src/views/mes/wm/stocktaking/plan/components/stock-taking-plan-select.vue
+++ b/apps/web-antd/src/views/mes/wm/stocktaking/plan/components/select.vue
@@ -9,7 +9,7 @@ import { Input, Tooltip } from 'ant-design-vue';
 
 import { getStockTakingPlan } from '#/api/mes/wm/stocktaking/plan';
 
-import StockTakingPlanSelectDialog from './stock-taking-plan-select-dialog.vue';
+import StockTakingPlanSelectDialog from './select-dialog.vue';
 
 defineOptions({ name: 'StockTakingPlanSelect', inheritAttrs: false });
 
diff --git a/apps/web-antd/src/views/mes/wm/stocktaking/plan/modules/param-form.vue b/apps/web-antd/src/views/mes/wm/stocktaking/plan/modules/param-form.vue
index 53bac9412..e689f6c63 100644
--- a/apps/web-antd/src/views/mes/wm/stocktaking/plan/modules/param-form.vue
+++ b/apps/web-antd/src/views/mes/wm/stocktaking/plan/modules/param-form.vue
@@ -17,7 +17,7 @@ import {
 import { getWarehouseArea } from '#/api/mes/wm/warehouse/area';
 import { getWarehouseLocation } from '#/api/mes/wm/warehouse/location';
 import { $t } from '#/locales';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import { MdItemSelect } from '#/views/mes/md/item/components';
 import { WmBatchSelect } from '#/views/mes/wm/batch/components';
 import {
   WmWarehouseAreaSelect,
diff --git a/apps/web-antd/src/views/mes/wm/stocktaking/task/data.ts b/apps/web-antd/src/views/mes/wm/stocktaking/task/data.ts
index 1f797ac74..74da1d3b5 100644
--- a/apps/web-antd/src/views/mes/wm/stocktaking/task/data.ts
+++ b/apps/web-antd/src/views/mes/wm/stocktaking/task/data.ts
@@ -16,7 +16,7 @@ import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import { MdItemSelect } from '#/views/mes/md/item/components';
 import { StockTakingPlanSelect } from '#/views/mes/wm/stocktaking/plan/components';
 import {
   WmWarehouseAreaSelect,
diff --git a/apps/web-antd/src/views/mes/wm/warehouse/components/wm-warehouse-area-select.vue b/apps/web-antd/src/views/mes/wm/warehouse/components/area-select.vue
similarity index 100%
rename from apps/web-antd/src/views/mes/wm/warehouse/components/wm-warehouse-area-select.vue
rename to apps/web-antd/src/views/mes/wm/warehouse/components/area-select.vue
diff --git a/apps/web-antd/src/views/mes/wm/warehouse/components/index.ts b/apps/web-antd/src/views/mes/wm/warehouse/components/index.ts
index d2981238b..a2019dfd7 100644
--- a/apps/web-antd/src/views/mes/wm/warehouse/components/index.ts
+++ b/apps/web-antd/src/views/mes/wm/warehouse/components/index.ts
@@ -1,3 +1,3 @@
-export { default as WmWarehouseAreaSelect } from './wm-warehouse-area-select.vue';
-export { default as WmWarehouseLocationSelect } from './wm-warehouse-location-select.vue';
-export { default as WmWarehouseSelect } from './wm-warehouse-select.vue';
+export { default as WmWarehouseAreaSelect } from './area-select.vue';
+export { default as WmWarehouseLocationSelect } from './location-select.vue';
+export { default as WmWarehouseSelect } from './select.vue';
diff --git a/apps/web-antd/src/views/mes/wm/warehouse/components/wm-warehouse-location-select.vue b/apps/web-antd/src/views/mes/wm/warehouse/components/location-select.vue
similarity index 100%
rename from apps/web-antd/src/views/mes/wm/warehouse/components/wm-warehouse-location-select.vue
rename to apps/web-antd/src/views/mes/wm/warehouse/components/location-select.vue
diff --git a/apps/web-antd/src/views/mes/wm/warehouse/components/wm-warehouse-select.vue b/apps/web-antd/src/views/mes/wm/warehouse/components/select.vue
similarity index 100%
rename from apps/web-antd/src/views/mes/wm/warehouse/components/wm-warehouse-select.vue
rename to apps/web-antd/src/views/mes/wm/warehouse/components/select.vue
diff --git a/apps/web-antd/src/views/wms/inventory/components/index.ts b/apps/web-antd/src/views/wms/inventory/components/index.ts
index 31806be2a..a86d9117d 100644
--- a/apps/web-antd/src/views/wms/inventory/components/index.ts
+++ b/apps/web-antd/src/views/wms/inventory/components/index.ts
@@ -1 +1,2 @@
-export { default as WmsInventorySelect } from './inventory-select.vue';
+export { default as WmsInventorySelect } from './select.vue';
+export type { InventorySelectRow } from './select.vue';
diff --git a/apps/web-antd/src/views/wms/inventory/components/inventory-select.vue b/apps/web-antd/src/views/wms/inventory/components/select.vue
similarity index 100%
rename from apps/web-antd/src/views/wms/inventory/components/inventory-select.vue
rename to apps/web-antd/src/views/wms/inventory/components/select.vue
diff --git a/apps/web-antd/src/views/wms/md/item/brand/components/index.ts b/apps/web-antd/src/views/wms/md/item/brand/components/index.ts
index 98419d2fc..bbff4fe4b 100644
--- a/apps/web-antd/src/views/wms/md/item/brand/components/index.ts
+++ b/apps/web-antd/src/views/wms/md/item/brand/components/index.ts
@@ -1 +1 @@
-export { default as WmsItemBrandSelect } from './item-brand-select.vue';
+export { default as WmsItemBrandSelect } from './select.vue';
diff --git a/apps/web-antd/src/views/wms/md/item/brand/components/item-brand-select.vue b/apps/web-antd/src/views/wms/md/item/brand/components/select.vue
similarity index 100%
rename from apps/web-antd/src/views/wms/md/item/brand/components/item-brand-select.vue
rename to apps/web-antd/src/views/wms/md/item/brand/components/select.vue
diff --git a/apps/web-antd/src/views/wms/md/item/category/components/index.ts b/apps/web-antd/src/views/wms/md/item/category/components/index.ts
index 13cd052aa..c61267e76 100644
--- a/apps/web-antd/src/views/wms/md/item/category/components/index.ts
+++ b/apps/web-antd/src/views/wms/md/item/category/components/index.ts
@@ -1,2 +1,2 @@
-export { default as WmsItemCategorySelect } from './item-category-select.vue';
-export { default as WmsItemCategoryTree } from './item-category-tree.vue';
+export { default as WmsItemCategorySelect } from './select.vue';
+export { default as WmsItemCategoryTree } from './tree.vue';
diff --git a/apps/web-antd/src/views/wms/md/item/category/components/item-category-select.vue b/apps/web-antd/src/views/wms/md/item/category/components/select.vue
similarity index 100%
rename from apps/web-antd/src/views/wms/md/item/category/components/item-category-select.vue
rename to apps/web-antd/src/views/wms/md/item/category/components/select.vue
diff --git a/apps/web-antd/src/views/wms/md/item/category/components/item-category-tree.vue b/apps/web-antd/src/views/wms/md/item/category/components/tree.vue
similarity index 100%
rename from apps/web-antd/src/views/wms/md/item/category/components/item-category-tree.vue
rename to apps/web-antd/src/views/wms/md/item/category/components/tree.vue
diff --git a/apps/web-antd/src/views/wms/md/item/sku/components/index.ts b/apps/web-antd/src/views/wms/md/item/sku/components/index.ts
index 040fe7a2d..ed8725397 100644
--- a/apps/web-antd/src/views/wms/md/item/sku/components/index.ts
+++ b/apps/web-antd/src/views/wms/md/item/sku/components/index.ts
@@ -1 +1 @@
-export { default as WmsItemSkuSelect } from './item-sku-select.vue';
+export { default as WmsItemSkuSelect } from './select.vue';
diff --git a/apps/web-antd/src/views/wms/md/item/sku/components/item-sku-select.vue b/apps/web-antd/src/views/wms/md/item/sku/components/select.vue
similarity index 100%
rename from apps/web-antd/src/views/wms/md/item/sku/components/item-sku-select.vue
rename to apps/web-antd/src/views/wms/md/item/sku/components/select.vue
diff --git a/apps/web-antd/src/views/wms/md/merchant/components/index.ts b/apps/web-antd/src/views/wms/md/merchant/components/index.ts
index c6a83bd0e..b21bf58f3 100644
--- a/apps/web-antd/src/views/wms/md/merchant/components/index.ts
+++ b/apps/web-antd/src/views/wms/md/merchant/components/index.ts
@@ -1 +1 @@
-export { default as WmsMerchantSelect } from './merchant-select.vue';
+export { default as WmsMerchantSelect } from './select.vue';
diff --git a/apps/web-antd/src/views/wms/md/merchant/components/merchant-select.vue b/apps/web-antd/src/views/wms/md/merchant/components/select.vue
similarity index 100%
rename from apps/web-antd/src/views/wms/md/merchant/components/merchant-select.vue
rename to apps/web-antd/src/views/wms/md/merchant/components/select.vue
diff --git a/apps/web-antd/src/views/wms/md/warehouse/components/index.ts b/apps/web-antd/src/views/wms/md/warehouse/components/index.ts
index 38d2851c3..b612ee62a 100644
--- a/apps/web-antd/src/views/wms/md/warehouse/components/index.ts
+++ b/apps/web-antd/src/views/wms/md/warehouse/components/index.ts
@@ -1 +1 @@
-export { default as WmsWarehouseSelect } from './warehouse-select.vue';
+export { default as WmsWarehouseSelect } from './select.vue';
diff --git a/apps/web-antd/src/views/wms/md/warehouse/components/warehouse-select.vue b/apps/web-antd/src/views/wms/md/warehouse/components/select.vue
similarity index 100%
rename from apps/web-antd/src/views/wms/md/warehouse/components/warehouse-select.vue
rename to apps/web-antd/src/views/wms/md/warehouse/components/select.vue
diff --git a/apps/web-antd/src/views/wms/order/movement/modules/form.vue b/apps/web-antd/src/views/wms/order/movement/modules/form.vue
index 908ab0614..4051bb7e4 100644
--- a/apps/web-antd/src/views/wms/order/movement/modules/form.vue
+++ b/apps/web-antd/src/views/wms/order/movement/modules/form.vue
@@ -5,7 +5,7 @@ import type { VxeTableInstance } from '#/adapter/vxe-table';
 import type { WmsWarehouseApi } from '#/api/wms/md/warehouse';
 import type { WmsMovementOrderApi } from '#/api/wms/order/movement';
 import type { WmsMovementOrderDetailApi } from '#/api/wms/order/movement/detail';
-import type { InventorySelectRow } from '#/views/wms/inventory/components/inventory-select.vue';
+import type { InventorySelectRow } from '#/views/wms/inventory/components';
 
 import { computed, nextTick, ref } from 'vue';
 
diff --git a/apps/web-antd/src/views/wms/order/shipment/modules/form.vue b/apps/web-antd/src/views/wms/order/shipment/modules/form.vue
index 259192d69..c3d8e5ff6 100644
--- a/apps/web-antd/src/views/wms/order/shipment/modules/form.vue
+++ b/apps/web-antd/src/views/wms/order/shipment/modules/form.vue
@@ -5,7 +5,7 @@ import type { VxeTableInstance } from '#/adapter/vxe-table';
 import type { WmsWarehouseApi } from '#/api/wms/md/warehouse';
 import type { WmsShipmentOrderApi } from '#/api/wms/order/shipment';
 import type { WmsShipmentOrderDetailApi } from '#/api/wms/order/shipment/detail';
-import type { InventorySelectRow } from '#/views/wms/inventory/components/inventory-select.vue';
+import type { InventorySelectRow } from '#/views/wms/inventory/components';
 
 import { computed, nextTick, ref } from 'vue';
 
diff --git a/apps/web-ele/src/views/mes/cal/calendar/components/calendar-date-cell.vue b/apps/web-ele/src/views/mes/cal/calendar/components/date-cell.vue
similarity index 100%
rename from apps/web-ele/src/views/mes/cal/calendar/components/calendar-date-cell.vue
rename to apps/web-ele/src/views/mes/cal/calendar/components/date-cell.vue
diff --git a/apps/web-ele/src/views/mes/cal/calendar/components/index.ts b/apps/web-ele/src/views/mes/cal/calendar/components/index.ts
new file mode 100644
index 000000000..e347f44b7
--- /dev/null
+++ b/apps/web-ele/src/views/mes/cal/calendar/components/index.ts
@@ -0,0 +1,4 @@
+export { default as CalendarDateCell } from './date-cell.vue';
+export { default as CalendarLegend } from './legend.vue';
+export { default as CalendarPanel } from './panel.vue';
+export { useCalendar } from './use-calendar';
diff --git a/apps/web-ele/src/views/mes/cal/calendar/components/calendar-legend.vue b/apps/web-ele/src/views/mes/cal/calendar/components/legend.vue
similarity index 100%
rename from apps/web-ele/src/views/mes/cal/calendar/components/calendar-legend.vue
rename to apps/web-ele/src/views/mes/cal/calendar/components/legend.vue
diff --git a/apps/web-ele/src/views/mes/cal/calendar/components/calendar-panel.vue b/apps/web-ele/src/views/mes/cal/calendar/components/panel.vue
similarity index 93%
rename from apps/web-ele/src/views/mes/cal/calendar/components/calendar-panel.vue
rename to apps/web-ele/src/views/mes/cal/calendar/components/panel.vue
index 207061e0e..168791ecc 100644
--- a/apps/web-ele/src/views/mes/cal/calendar/components/calendar-panel.vue
+++ b/apps/web-ele/src/views/mes/cal/calendar/components/panel.vue
@@ -8,8 +8,8 @@ import { computed } from 'vue';
 import dayjs from 'dayjs';
 import { ElCalendar } from 'element-plus';
 
-import CalendarDateCell from './calendar-date-cell.vue';
-import CalendarLegend from './calendar-legend.vue';
+import CalendarDateCell from './date-cell.vue';
+import CalendarLegend from './legend.vue';
 
 defineProps<{
   calendarDayMap: Map<string, MesCalCalendarApi.CalendarDay>;
diff --git a/apps/web-ele/src/views/mes/cal/calendar/modules/team-view.vue b/apps/web-ele/src/views/mes/cal/calendar/modules/team-view.vue
index 7637c755b..5a0527a03 100644
--- a/apps/web-ele/src/views/mes/cal/calendar/modules/team-view.vue
+++ b/apps/web-ele/src/views/mes/cal/calendar/modules/team-view.vue
@@ -5,8 +5,7 @@ import { onMounted, ref } from 'vue';
 
 import { getTeamList } from '#/api/mes/cal/team';
 
-import CalendarPanel from '../components/calendar-panel.vue';
-import { useCalendar } from '../components/use-calendar';
+import { CalendarPanel, useCalendar } from '../components';
 
 const {
   calendarDayMap,
diff --git a/apps/web-ele/src/views/mes/cal/calendar/modules/type-view.vue b/apps/web-ele/src/views/mes/cal/calendar/modules/type-view.vue
index 2919e0755..74274f62c 100644
--- a/apps/web-ele/src/views/mes/cal/calendar/modules/type-view.vue
+++ b/apps/web-ele/src/views/mes/cal/calendar/modules/type-view.vue
@@ -6,8 +6,7 @@ import { onMounted, ref } from 'vue';
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
-import CalendarPanel from '../components/calendar-panel.vue';
-import { useCalendar } from '../components/use-calendar';
+import { CalendarPanel, useCalendar } from '../components';
 
 const {
   calendarDayMap,
diff --git a/apps/web-ele/src/views/mes/cal/calendar/modules/user-view.vue b/apps/web-ele/src/views/mes/cal/calendar/modules/user-view.vue
index 556af5fe3..c29c470da 100644
--- a/apps/web-ele/src/views/mes/cal/calendar/modules/user-view.vue
+++ b/apps/web-ele/src/views/mes/cal/calendar/modules/user-view.vue
@@ -15,8 +15,7 @@ import {
 
 import { getSimpleUserList } from '#/api/system/user';
 
-import CalendarPanel from '../components/calendar-panel.vue';
-import { useCalendar } from '../components/use-calendar';
+import { CalendarPanel, useCalendar } from '../components';
 
 const {
   calendarDayMap,
diff --git a/apps/web-ele/src/views/mes/cal/team/components/index.ts b/apps/web-ele/src/views/mes/cal/team/components/index.ts
index 092b24a19..e40fc9490 100644
--- a/apps/web-ele/src/views/mes/cal/team/components/index.ts
+++ b/apps/web-ele/src/views/mes/cal/team/components/index.ts
@@ -1,2 +1,2 @@
-export { default as CalTeamSelectDialog } from './cal-team-select-dialog.vue';
-export { default as CalTeamSelect } from './cal-team-select.vue';
+export { default as CalTeamSelectDialog } from './select-dialog.vue';
+export { default as CalTeamSelect } from './select.vue';
diff --git a/apps/web-ele/src/views/mes/cal/team/components/cal-team-select-dialog.vue b/apps/web-ele/src/views/mes/cal/team/components/select-dialog.vue
similarity index 100%
rename from apps/web-ele/src/views/mes/cal/team/components/cal-team-select-dialog.vue
rename to apps/web-ele/src/views/mes/cal/team/components/select-dialog.vue
diff --git a/apps/web-ele/src/views/mes/cal/team/components/cal-team-select.vue b/apps/web-ele/src/views/mes/cal/team/components/select.vue
similarity index 97%
rename from apps/web-ele/src/views/mes/cal/team/components/cal-team-select.vue
rename to apps/web-ele/src/views/mes/cal/team/components/select.vue
index 30a946224..2d2bc65c8 100644
--- a/apps/web-ele/src/views/mes/cal/team/components/cal-team-select.vue
+++ b/apps/web-ele/src/views/mes/cal/team/components/select.vue
@@ -7,7 +7,7 @@ import { ElButton, ElOption, ElSelect } from 'element-plus';
 
 import { getTeamList } from '#/api/mes/cal/team';
 
-import CalTeamSelectDialog from './cal-team-select-dialog.vue';
+import CalTeamSelectDialog from './select-dialog.vue';
 
 const props = withDefaults(
   defineProps<{
diff --git a/apps/web-ele/src/views/mes/dv/checkplan/components/index.ts b/apps/web-ele/src/views/mes/dv/checkplan/components/index.ts
index 379957e07..ff080b299 100644
--- a/apps/web-ele/src/views/mes/dv/checkplan/components/index.ts
+++ b/apps/web-ele/src/views/mes/dv/checkplan/components/index.ts
@@ -1 +1 @@
-export { default as DvCheckPlanSelect } from './dv-check-plan-select.vue';
+export { default as DvCheckPlanSelect } from './select.vue';
diff --git a/apps/web-ele/src/views/mes/dv/checkplan/components/dv-check-plan-select.vue b/apps/web-ele/src/views/mes/dv/checkplan/components/select.vue
similarity index 100%
rename from apps/web-ele/src/views/mes/dv/checkplan/components/dv-check-plan-select.vue
rename to apps/web-ele/src/views/mes/dv/checkplan/components/select.vue
diff --git a/apps/web-ele/src/views/mes/dv/machinery/components/index.ts b/apps/web-ele/src/views/mes/dv/machinery/components/index.ts
index cbe225de1..fee5e15af 100644
--- a/apps/web-ele/src/views/mes/dv/machinery/components/index.ts
+++ b/apps/web-ele/src/views/mes/dv/machinery/components/index.ts
@@ -1 +1 @@
-export { default as DvMachinerySelect } from './dv-machinery-select.vue';
+export { default as DvMachinerySelect } from './select.vue';
diff --git a/apps/web-ele/src/views/mes/dv/machinery/components/dv-machinery-select.vue b/apps/web-ele/src/views/mes/dv/machinery/components/select.vue
similarity index 100%
rename from apps/web-ele/src/views/mes/dv/machinery/components/dv-machinery-select.vue
rename to apps/web-ele/src/views/mes/dv/machinery/components/select.vue
diff --git a/apps/web-ele/src/views/mes/dv/machinery/type/components/index.ts b/apps/web-ele/src/views/mes/dv/machinery/type/components/index.ts
index c4cff7c14..eab3ca005 100644
--- a/apps/web-ele/src/views/mes/dv/machinery/type/components/index.ts
+++ b/apps/web-ele/src/views/mes/dv/machinery/type/components/index.ts
@@ -1,2 +1,2 @@
-export { default as DvMachineryTypeSelect } from './dv-machinery-type-select.vue';
-export { default as MachineryTypeTree } from './machinery-type-tree.vue';
+export { default as DvMachineryTypeSelect } from './select.vue';
+export { default as MachineryTypeTree } from './tree.vue';
diff --git a/apps/web-ele/src/views/mes/dv/machinery/type/components/dv-machinery-type-select.vue b/apps/web-ele/src/views/mes/dv/machinery/type/components/select.vue
similarity index 100%
rename from apps/web-ele/src/views/mes/dv/machinery/type/components/dv-machinery-type-select.vue
rename to apps/web-ele/src/views/mes/dv/machinery/type/components/select.vue
diff --git a/apps/web-ele/src/views/mes/dv/machinery/type/components/machinery-type-tree.vue b/apps/web-ele/src/views/mes/dv/machinery/type/components/tree.vue
similarity index 100%
rename from apps/web-ele/src/views/mes/dv/machinery/type/components/machinery-type-tree.vue
rename to apps/web-ele/src/views/mes/dv/machinery/type/components/tree.vue
diff --git a/apps/web-ele/src/views/mes/dv/subject/components/index.ts b/apps/web-ele/src/views/mes/dv/subject/components/index.ts
index a8c12d3be..ef696470f 100644
--- a/apps/web-ele/src/views/mes/dv/subject/components/index.ts
+++ b/apps/web-ele/src/views/mes/dv/subject/components/index.ts
@@ -1 +1 @@
-export { default as DvSubjectSelect } from './dv-subject-select.vue';
+export { default as DvSubjectSelect } from './select.vue';
diff --git a/apps/web-ele/src/views/mes/dv/subject/components/dv-subject-select.vue b/apps/web-ele/src/views/mes/dv/subject/components/select.vue
similarity index 100%
rename from apps/web-ele/src/views/mes/dv/subject/components/dv-subject-select.vue
rename to apps/web-ele/src/views/mes/dv/subject/components/select.vue
diff --git a/apps/web-ele/src/views/mes/md/client/components/index.ts b/apps/web-ele/src/views/mes/md/client/components/index.ts
new file mode 100644
index 000000000..1339c9bca
--- /dev/null
+++ b/apps/web-ele/src/views/mes/md/client/components/index.ts
@@ -0,0 +1,2 @@
+export { default as MdClientSelectDialog } from './select-dialog.vue';
+export { default as MdClientSelect } from './select.vue';
diff --git a/apps/web-ele/src/views/mes/md/client/components/md-client-select-dialog.vue b/apps/web-ele/src/views/mes/md/client/components/select-dialog.vue
similarity index 100%
rename from apps/web-ele/src/views/mes/md/client/components/md-client-select-dialog.vue
rename to apps/web-ele/src/views/mes/md/client/components/select-dialog.vue
diff --git a/apps/web-ele/src/views/mes/md/client/components/md-client-select.vue b/apps/web-ele/src/views/mes/md/client/components/select.vue
similarity index 98%
rename from apps/web-ele/src/views/mes/md/client/components/md-client-select.vue
rename to apps/web-ele/src/views/mes/md/client/components/select.vue
index bc80c3ccb..eda669a31 100644
--- a/apps/web-ele/src/views/mes/md/client/components/md-client-select.vue
+++ b/apps/web-ele/src/views/mes/md/client/components/select.vue
@@ -9,7 +9,7 @@ import { ElInput, ElTooltip } from 'element-plus';
 
 import { getClient } from '#/api/mes/md/client';
 
-import MdClientSelectDialog from './md-client-select-dialog.vue';
+import MdClientSelectDialog from './select-dialog.vue';
 
 defineOptions({ name: 'MdClientSelect', inheritAttrs: false });
 
diff --git a/apps/web-ele/src/views/mes/md/item/components/index.ts b/apps/web-ele/src/views/mes/md/item/components/index.ts
index 348ae8798..64d15593a 100644
--- a/apps/web-ele/src/views/mes/md/item/components/index.ts
+++ b/apps/web-ele/src/views/mes/md/item/components/index.ts
@@ -1,4 +1,4 @@
-export { default as MdItemSelectDialog } from './md-item-select-dialog.vue';
-export { default as MdItemSelect } from './md-item-select.vue';
-export { default as MdProductBomSelectDialog } from './md-product-bom-select-dialog.vue';
-export { default as MdProductBomSelect } from './md-product-bom-select.vue';
+export { default as MdProductBomSelectDialog } from './product-bom-select-dialog.vue';
+export { default as MdProductBomSelect } from './product-bom-select.vue';
+export { default as MdItemSelectDialog } from './select-dialog.vue';
+export { default as MdItemSelect } from './select.vue';
diff --git a/apps/web-ele/src/views/mes/md/item/components/md-product-bom-select-dialog.vue b/apps/web-ele/src/views/mes/md/item/components/product-bom-select-dialog.vue
similarity index 100%
rename from apps/web-ele/src/views/mes/md/item/components/md-product-bom-select-dialog.vue
rename to apps/web-ele/src/views/mes/md/item/components/product-bom-select-dialog.vue
diff --git a/apps/web-ele/src/views/mes/md/item/components/md-product-bom-select.vue b/apps/web-ele/src/views/mes/md/item/components/product-bom-select.vue
similarity index 98%
rename from apps/web-ele/src/views/mes/md/item/components/md-product-bom-select.vue
rename to apps/web-ele/src/views/mes/md/item/components/product-bom-select.vue
index 2ba7948fd..2a8ce7e1e 100644
--- a/apps/web-ele/src/views/mes/md/item/components/md-product-bom-select.vue
+++ b/apps/web-ele/src/views/mes/md/item/components/product-bom-select.vue
@@ -9,7 +9,7 @@ import { ElInput, ElTooltip } from 'element-plus';
 
 import { getProductBomListByItemId } from '#/api/mes/md/item/productBom';
 
-import MdProductBomSelectDialog from './md-product-bom-select-dialog.vue';
+import MdProductBomSelectDialog from './product-bom-select-dialog.vue';
 
 defineOptions({ name: 'MdProductBomSelect', inheritAttrs: false });
 
diff --git a/apps/web-ele/src/views/mes/md/item/components/md-item-select-dialog.vue b/apps/web-ele/src/views/mes/md/item/components/select-dialog.vue
similarity index 100%
rename from apps/web-ele/src/views/mes/md/item/components/md-item-select-dialog.vue
rename to apps/web-ele/src/views/mes/md/item/components/select-dialog.vue
diff --git a/apps/web-ele/src/views/mes/md/item/components/md-item-select.vue b/apps/web-ele/src/views/mes/md/item/components/select.vue
similarity index 98%
rename from apps/web-ele/src/views/mes/md/item/components/md-item-select.vue
rename to apps/web-ele/src/views/mes/md/item/components/select.vue
index 46d4d9995..577c7a669 100644
--- a/apps/web-ele/src/views/mes/md/item/components/md-item-select.vue
+++ b/apps/web-ele/src/views/mes/md/item/components/select.vue
@@ -9,7 +9,7 @@ import { ElInput, ElTooltip } from 'element-plus';
 
 import { getItem } from '#/api/mes/md/item';
 
-import MdItemSelectDialog from './md-item-select-dialog.vue';
+import MdItemSelectDialog from './select-dialog.vue';
 
 defineOptions({ name: 'MdItemSelect', inheritAttrs: false });
 
diff --git a/apps/web-ele/src/views/mes/md/item/type/components/index.ts b/apps/web-ele/src/views/mes/md/item/type/components/index.ts
index c5d4dd2c4..d6d2b808a 100644
--- a/apps/web-ele/src/views/mes/md/item/type/components/index.ts
+++ b/apps/web-ele/src/views/mes/md/item/type/components/index.ts
@@ -1,2 +1,2 @@
-export { default as MdItemTypeSelect } from './md-item-type-select.vue';
-export { default as MdItemTypeTree } from './md-item-type-tree.vue';
+export { default as MdItemTypeSelect } from './select.vue';
+export { default as MdItemTypeTree } from './tree.vue';
diff --git a/apps/web-ele/src/views/mes/md/item/type/components/md-item-type-select.vue b/apps/web-ele/src/views/mes/md/item/type/components/select.vue
similarity index 100%
rename from apps/web-ele/src/views/mes/md/item/type/components/md-item-type-select.vue
rename to apps/web-ele/src/views/mes/md/item/type/components/select.vue
diff --git a/apps/web-ele/src/views/mes/md/item/type/components/md-item-type-tree.vue b/apps/web-ele/src/views/mes/md/item/type/components/tree.vue
similarity index 100%
rename from apps/web-ele/src/views/mes/md/item/type/components/md-item-type-tree.vue
rename to apps/web-ele/src/views/mes/md/item/type/components/tree.vue
diff --git a/apps/web-ele/src/views/mes/md/unitmeasure/components/index.ts b/apps/web-ele/src/views/mes/md/unitmeasure/components/index.ts
index 59e066096..e2257ff65 100644
--- a/apps/web-ele/src/views/mes/md/unitmeasure/components/index.ts
+++ b/apps/web-ele/src/views/mes/md/unitmeasure/components/index.ts
@@ -1 +1 @@
-export { default as MdUnitMeasureSelect } from './md-unit-measure-select.vue';
+export { default as MdUnitMeasureSelect } from './select.vue';
diff --git a/apps/web-ele/src/views/mes/md/unitmeasure/components/md-unit-measure-select.vue b/apps/web-ele/src/views/mes/md/unitmeasure/components/select.vue
similarity index 100%
rename from apps/web-ele/src/views/mes/md/unitmeasure/components/md-unit-measure-select.vue
rename to apps/web-ele/src/views/mes/md/unitmeasure/components/select.vue
diff --git a/apps/web-ele/src/views/mes/md/vendor/components/index.ts b/apps/web-ele/src/views/mes/md/vendor/components/index.ts
new file mode 100644
index 000000000..0f16061ab
--- /dev/null
+++ b/apps/web-ele/src/views/mes/md/vendor/components/index.ts
@@ -0,0 +1,2 @@
+export { default as MdVendorSelectDialog } from './select-dialog.vue';
+export { default as MdVendorSelect } from './select.vue';
diff --git a/apps/web-ele/src/views/mes/md/vendor/components/md-vendor-select-dialog.vue b/apps/web-ele/src/views/mes/md/vendor/components/select-dialog.vue
similarity index 100%
rename from apps/web-ele/src/views/mes/md/vendor/components/md-vendor-select-dialog.vue
rename to apps/web-ele/src/views/mes/md/vendor/components/select-dialog.vue
diff --git a/apps/web-ele/src/views/mes/md/vendor/components/md-vendor-select.vue b/apps/web-ele/src/views/mes/md/vendor/components/select.vue
similarity index 98%
rename from apps/web-ele/src/views/mes/md/vendor/components/md-vendor-select.vue
rename to apps/web-ele/src/views/mes/md/vendor/components/select.vue
index fa22adf36..3a378b992 100644
--- a/apps/web-ele/src/views/mes/md/vendor/components/md-vendor-select.vue
+++ b/apps/web-ele/src/views/mes/md/vendor/components/select.vue
@@ -9,7 +9,7 @@ import { ElInput, ElTooltip } from 'element-plus';
 
 import { getVendor } from '#/api/mes/md/vendor';
 
-import MdVendorSelectDialog from './md-vendor-select-dialog.vue';
+import MdVendorSelectDialog from './select-dialog.vue';
 
 defineOptions({ name: 'MdVendorSelect', inheritAttrs: false });
 
diff --git a/apps/web-ele/src/views/mes/md/workstation/components/index.ts b/apps/web-ele/src/views/mes/md/workstation/components/index.ts
index b5855ec6f..a22a0ce28 100644
--- a/apps/web-ele/src/views/mes/md/workstation/components/index.ts
+++ b/apps/web-ele/src/views/mes/md/workstation/components/index.ts
@@ -1,3 +1,3 @@
-export { default as MdWorkshopSelect } from './md-workshop-select.vue';
-export { default as MdWorkstationSelectDialog } from './md-workstation-select-dialog.vue';
-export { default as MdWorkstationSelect } from './md-workstation-select.vue';
+export { default as MdWorkstationSelectDialog } from './select-dialog.vue';
+export { default as MdWorkstationSelect } from './select.vue';
+export { default as MdWorkshopSelect } from './workshop-select.vue';
diff --git a/apps/web-ele/src/views/mes/md/workstation/components/md-workstation-select-dialog.vue b/apps/web-ele/src/views/mes/md/workstation/components/select-dialog.vue
similarity index 100%
rename from apps/web-ele/src/views/mes/md/workstation/components/md-workstation-select-dialog.vue
rename to apps/web-ele/src/views/mes/md/workstation/components/select-dialog.vue
diff --git a/apps/web-ele/src/views/mes/md/workstation/components/md-workstation-select.vue b/apps/web-ele/src/views/mes/md/workstation/components/select.vue
similarity index 98%
rename from apps/web-ele/src/views/mes/md/workstation/components/md-workstation-select.vue
rename to apps/web-ele/src/views/mes/md/workstation/components/select.vue
index 6129baf5a..1f34206a8 100644
--- a/apps/web-ele/src/views/mes/md/workstation/components/md-workstation-select.vue
+++ b/apps/web-ele/src/views/mes/md/workstation/components/select.vue
@@ -9,7 +9,7 @@ import { ElInput, ElTooltip } from 'element-plus';
 
 import { getWorkstation } from '#/api/mes/md/workstation';
 
-import MdWorkstationSelectDialog from './md-workstation-select-dialog.vue';
+import MdWorkstationSelectDialog from './select-dialog.vue';
 
 defineOptions({ name: 'MdWorkstationSelect', inheritAttrs: false });
 
diff --git a/apps/web-ele/src/views/mes/md/workstation/components/md-workshop-select.vue b/apps/web-ele/src/views/mes/md/workstation/components/workshop-select.vue
similarity index 100%
rename from apps/web-ele/src/views/mes/md/workstation/components/md-workshop-select.vue
rename to apps/web-ele/src/views/mes/md/workstation/components/workshop-select.vue
diff --git a/apps/web-ele/src/views/mes/pro/andon/config/components/index.ts b/apps/web-ele/src/views/mes/pro/andon/config/components/index.ts
index e7a766883..ac0d63a26 100644
--- a/apps/web-ele/src/views/mes/pro/andon/config/components/index.ts
+++ b/apps/web-ele/src/views/mes/pro/andon/config/components/index.ts
@@ -1 +1 @@
-export { default as AndonConfigSelect } from './andon-config-select.vue';
+export { default as AndonConfigSelect } from './select.vue';
diff --git a/apps/web-ele/src/views/mes/pro/andon/config/components/andon-config-select.vue b/apps/web-ele/src/views/mes/pro/andon/config/components/select.vue
similarity index 100%
rename from apps/web-ele/src/views/mes/pro/andon/config/components/andon-config-select.vue
rename to apps/web-ele/src/views/mes/pro/andon/config/components/select.vue
diff --git a/apps/web-ele/src/views/mes/pro/card/components/index.ts b/apps/web-ele/src/views/mes/pro/card/components/index.ts
index 8092d6cb7..ab7ff1d17 100644
--- a/apps/web-ele/src/views/mes/pro/card/components/index.ts
+++ b/apps/web-ele/src/views/mes/pro/card/components/index.ts
@@ -1,2 +1,2 @@
-export { default as ProCardSelectDialog } from './pro-card-select-dialog.vue';
-export { default as ProCardSelect } from './pro-card-select.vue';
+export { default as ProCardSelectDialog } from './select-dialog.vue';
+export { default as ProCardSelect } from './select.vue';
diff --git a/apps/web-ele/src/views/mes/pro/card/components/pro-card-select-dialog.vue b/apps/web-ele/src/views/mes/pro/card/components/select-dialog.vue
similarity index 100%
rename from apps/web-ele/src/views/mes/pro/card/components/pro-card-select-dialog.vue
rename to apps/web-ele/src/views/mes/pro/card/components/select-dialog.vue
diff --git a/apps/web-ele/src/views/mes/pro/card/components/pro-card-select.vue b/apps/web-ele/src/views/mes/pro/card/components/select.vue
similarity index 98%
rename from apps/web-ele/src/views/mes/pro/card/components/pro-card-select.vue
rename to apps/web-ele/src/views/mes/pro/card/components/select.vue
index e06a2d1eb..95d8abe88 100644
--- a/apps/web-ele/src/views/mes/pro/card/components/pro-card-select.vue
+++ b/apps/web-ele/src/views/mes/pro/card/components/select.vue
@@ -9,7 +9,7 @@ import { ElInput, ElTooltip } from 'element-plus';
 
 import { getCard } from '#/api/mes/pro/card';
 
-import ProCardSelectDialog from './pro-card-select-dialog.vue';
+import ProCardSelectDialog from './select-dialog.vue';
 
 defineOptions({ name: 'ProCardSelect', inheritAttrs: false });
 
diff --git a/apps/web-ele/src/views/mes/pro/process/components/index.ts b/apps/web-ele/src/views/mes/pro/process/components/index.ts
index e0cca7d22..4204017de 100644
--- a/apps/web-ele/src/views/mes/pro/process/components/index.ts
+++ b/apps/web-ele/src/views/mes/pro/process/components/index.ts
@@ -1 +1 @@
-export { default as ProProcessSelect } from './pro-process-select.vue';
+export { default as ProProcessSelect } from './select.vue';
diff --git a/apps/web-ele/src/views/mes/pro/process/components/pro-process-select.vue b/apps/web-ele/src/views/mes/pro/process/components/select.vue
similarity index 100%
rename from apps/web-ele/src/views/mes/pro/process/components/pro-process-select.vue
rename to apps/web-ele/src/views/mes/pro/process/components/select.vue
diff --git a/apps/web-ele/src/views/mes/pro/task/components/index.ts b/apps/web-ele/src/views/mes/pro/task/components/index.ts
index bfaf6ae17..4c3982323 100644
--- a/apps/web-ele/src/views/mes/pro/task/components/index.ts
+++ b/apps/web-ele/src/views/mes/pro/task/components/index.ts
@@ -1,3 +1,3 @@
 export { default as GanttChart } from './gantt-chart.vue';
-export { default as ProTaskSelectDialog } from './pro-task-select-dialog.vue';
-export { default as ProTaskSelect } from './pro-task-select.vue';
+export { default as ProTaskSelectDialog } from './select-dialog.vue';
+export { default as ProTaskSelect } from './select.vue';
diff --git a/apps/web-ele/src/views/mes/pro/task/components/pro-task-select-dialog.vue b/apps/web-ele/src/views/mes/pro/task/components/select-dialog.vue
similarity index 100%
rename from apps/web-ele/src/views/mes/pro/task/components/pro-task-select-dialog.vue
rename to apps/web-ele/src/views/mes/pro/task/components/select-dialog.vue
diff --git a/apps/web-ele/src/views/mes/pro/task/components/pro-task-select.vue b/apps/web-ele/src/views/mes/pro/task/components/select.vue
similarity index 98%
rename from apps/web-ele/src/views/mes/pro/task/components/pro-task-select.vue
rename to apps/web-ele/src/views/mes/pro/task/components/select.vue
index 4eb0318fa..7ab754ebb 100644
--- a/apps/web-ele/src/views/mes/pro/task/components/pro-task-select.vue
+++ b/apps/web-ele/src/views/mes/pro/task/components/select.vue
@@ -9,7 +9,7 @@ import { ElInput, ElTooltip } from 'element-plus';
 
 import { getTask } from '#/api/mes/pro/task';
 
-import ProTaskSelectDialog from './pro-task-select-dialog.vue';
+import ProTaskSelectDialog from './select-dialog.vue';
 
 defineOptions({ name: 'ProTaskSelect', inheritAttrs: false });
 
diff --git a/apps/web-ele/src/views/mes/pro/task/data.ts b/apps/web-ele/src/views/mes/pro/task/data.ts
index 969888d50..a72b8c963 100644
--- a/apps/web-ele/src/views/mes/pro/task/data.ts
+++ b/apps/web-ele/src/views/mes/pro/task/data.ts
@@ -9,7 +9,7 @@ import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { getRangePickerDefaultProps } from '#/utils';
-import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
+import { MdClientSelect } from '#/views/mes/md/client/components';
 import { MdItemSelect } from '#/views/mes/md/item/components';
 import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
 import { ProProcessSelect } from '#/views/mes/pro/process/components';
diff --git a/apps/web-ele/src/views/mes/pro/task/edit/index.vue b/apps/web-ele/src/views/mes/pro/task/edit/index.vue
index d84a771d9..19551c9be 100644
--- a/apps/web-ele/src/views/mes/pro/task/edit/index.vue
+++ b/apps/web-ele/src/views/mes/pro/task/edit/index.vue
@@ -7,7 +7,7 @@ import { ElBadge, ElButton, ElMessage } from 'element-plus';
 
 import { getGanttTaskList, updateTask } from '#/api/mes/pro/task';
 
-import GanttChart from '../components/gantt-chart.vue';
+import { GanttChart } from '../components';
 
 const submitting = ref(false); // 批量保存按钮加载态
 const taskList = ref<any[]>([]); // 甘特图任务数据
diff --git a/apps/web-ele/src/views/mes/pro/task/index.vue b/apps/web-ele/src/views/mes/pro/task/index.vue
index 8d29ccf3e..ec38c4831 100644
--- a/apps/web-ele/src/views/mes/pro/task/index.vue
+++ b/apps/web-ele/src/views/mes/pro/task/index.vue
@@ -17,7 +17,7 @@ import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getGanttTaskList } from '#/api/mes/pro/task';
 import { getWorkOrderPage } from '#/api/mes/pro/workorder';
 
-import GanttChart from './components/gantt-chart.vue';
+import { GanttChart } from './components';
 import { useGridColumns, useGridFormSchema } from './data';
 import ScheduleForm from './modules/schedule-form.vue';
 
diff --git a/apps/web-ele/src/views/mes/pro/workorder/components/index.ts b/apps/web-ele/src/views/mes/pro/workorder/components/index.ts
index b53e2876b..7c84b3bf7 100644
--- a/apps/web-ele/src/views/mes/pro/workorder/components/index.ts
+++ b/apps/web-ele/src/views/mes/pro/workorder/components/index.ts
@@ -1,2 +1,2 @@
-export { default as ProWorkOrderSelectDialog } from './pro-work-order-select-dialog.vue';
-export { default as ProWorkOrderSelect } from './pro-work-order-select.vue';
+export { default as ProWorkOrderSelectDialog } from './select-dialog.vue';
+export { default as ProWorkOrderSelect } from './select.vue';
diff --git a/apps/web-ele/src/views/mes/pro/workorder/components/pro-work-order-select-dialog.vue b/apps/web-ele/src/views/mes/pro/workorder/components/select-dialog.vue
similarity index 100%
rename from apps/web-ele/src/views/mes/pro/workorder/components/pro-work-order-select-dialog.vue
rename to apps/web-ele/src/views/mes/pro/workorder/components/select-dialog.vue
diff --git a/apps/web-ele/src/views/mes/pro/workorder/components/pro-work-order-select.vue b/apps/web-ele/src/views/mes/pro/workorder/components/select.vue
similarity index 98%
rename from apps/web-ele/src/views/mes/pro/workorder/components/pro-work-order-select.vue
rename to apps/web-ele/src/views/mes/pro/workorder/components/select.vue
index affb6907d..1bbf89f39 100644
--- a/apps/web-ele/src/views/mes/pro/workorder/components/pro-work-order-select.vue
+++ b/apps/web-ele/src/views/mes/pro/workorder/components/select.vue
@@ -9,7 +9,7 @@ import { ElInput, ElTooltip } from 'element-plus';
 
 import { getWorkOrder } from '#/api/mes/pro/workorder';
 
-import ProWorkOrderSelectDialog from './pro-work-order-select-dialog.vue';
+import ProWorkOrderSelectDialog from './select-dialog.vue';
 
 defineOptions({ name: 'ProWorkOrderSelect', inheritAttrs: false });
 
diff --git a/apps/web-ele/src/views/mes/pro/workorder/data.ts b/apps/web-ele/src/views/mes/pro/workorder/data.ts
index 87ffca1e7..121e07ab9 100644
--- a/apps/web-ele/src/views/mes/pro/workorder/data.ts
+++ b/apps/web-ele/src/views/mes/pro/workorder/data.ts
@@ -13,9 +13,9 @@ import { ElButton } from 'element-plus';
 
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getRangePickerDefaultProps } from '#/utils';
-import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
+import { MdClientSelect } from '#/views/mes/md/client/components';
 import { MdItemSelect, MdProductBomSelect } from '#/views/mes/md/item/components';
-import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
+import { MdVendorSelect } from '#/views/mes/md/vendor/components';
 
 /** 表单类型 */
 export type FormType = 'confirm' | 'create' | 'detail' | 'finish' | 'update';
diff --git a/apps/web-ele/src/views/mes/pro/workrecord/components/index.ts b/apps/web-ele/src/views/mes/pro/workrecord/components/index.ts
new file mode 100644
index 000000000..5b9734865
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/workrecord/components/index.ts
@@ -0,0 +1 @@
+export { default as WorkRecordStatusBar } from './status-bar.vue';
diff --git a/apps/web-ele/src/views/mes/pro/workrecord/components/work-record-status-bar.vue b/apps/web-ele/src/views/mes/pro/workrecord/components/status-bar.vue
similarity index 97%
rename from apps/web-ele/src/views/mes/pro/workrecord/components/work-record-status-bar.vue
rename to apps/web-ele/src/views/mes/pro/workrecord/components/status-bar.vue
index b778048f8..59667f52e 100644
--- a/apps/web-ele/src/views/mes/pro/workrecord/components/work-record-status-bar.vue
+++ b/apps/web-ele/src/views/mes/pro/workrecord/components/status-bar.vue
@@ -15,7 +15,7 @@ import {
   clockOutWorkRecord,
   getMyWorkRecord,
 } from '#/api/mes/pro/workrecord';
-import MdWorkstationSelect from '#/views/mes/md/workstation/components/md-workstation-select.vue';
+import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
 
 const emit = defineEmits<{
   (e: 'change'): void;
diff --git a/apps/web-ele/src/views/mes/pro/workrecord/data.ts b/apps/web-ele/src/views/mes/pro/workrecord/data.ts
index dea5783d5..f528a3a6b 100644
--- a/apps/web-ele/src/views/mes/pro/workrecord/data.ts
+++ b/apps/web-ele/src/views/mes/pro/workrecord/data.ts
@@ -10,7 +10,7 @@ import { getDictOptions } from '@vben/hooks';
 
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
-import MdWorkstationSelect from '#/views/mes/md/workstation/components/md-workstation-select.vue';
+import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
 
 /** 关联数据 */
 let userList: SystemUserApi.User[] = [];
diff --git a/apps/web-ele/src/views/mes/pro/workrecord/index.vue b/apps/web-ele/src/views/mes/pro/workrecord/index.vue
index 3c9483954..7f08c5413 100644
--- a/apps/web-ele/src/views/mes/pro/workrecord/index.vue
+++ b/apps/web-ele/src/views/mes/pro/workrecord/index.vue
@@ -12,7 +12,7 @@ import {
 } from '#/api/mes/pro/workrecord';
 import { $t } from '#/locales';
 
-import WorkRecordStatusBar from './components/work-record-status-bar.vue';
+import { WorkRecordStatusBar } from './components';
 import { useGridColumns, useGridFormSchema } from './data';
 
 /** 刷新表格 */
diff --git a/apps/web-ele/src/views/mes/qc/batchtrace/data.ts b/apps/web-ele/src/views/mes/qc/batchtrace/data.ts
index 807d64e68..46e22e459 100644
--- a/apps/web-ele/src/views/mes/qc/batchtrace/data.ts
+++ b/apps/web-ele/src/views/mes/qc/batchtrace/data.ts
@@ -5,9 +5,9 @@ import type { DescriptionItemSchema } from '#/components/description';
 
 import { markRaw } from 'vue';
 
-import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
-import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
+import { MdClientSelect } from '#/views/mes/md/client/components';
+import { MdItemSelect } from '#/views/mes/md/item/components';
+import { MdVendorSelect } from '#/views/mes/md/vendor/components';
 
 /** 列表的搜索表单 */
 export function useGridFormSchema(): VbenFormSchema[] {
diff --git a/apps/web-ele/src/views/mes/qc/defectrecord/components/index.ts b/apps/web-ele/src/views/mes/qc/defectrecord/components/index.ts
index 6a2bd142a..b616a60e5 100644
--- a/apps/web-ele/src/views/mes/qc/defectrecord/components/index.ts
+++ b/apps/web-ele/src/views/mes/qc/defectrecord/components/index.ts
@@ -1,2 +1,2 @@
-export { default as DefectRecordInlineForm } from './defect-record-inline-form.vue';
-export { default as DefectRecordInlineList } from './defect-record-inline-list.vue';
+export { default as DefectRecordInlineForm } from './inline-form.vue';
+export { default as DefectRecordInlineList } from './inline-list.vue';
diff --git a/apps/web-ele/src/views/mes/qc/defectrecord/components/defect-record-inline-form.vue b/apps/web-ele/src/views/mes/qc/defectrecord/components/inline-form.vue
similarity index 100%
rename from apps/web-ele/src/views/mes/qc/defectrecord/components/defect-record-inline-form.vue
rename to apps/web-ele/src/views/mes/qc/defectrecord/components/inline-form.vue
diff --git a/apps/web-ele/src/views/mes/qc/defectrecord/components/defect-record-inline-list.vue b/apps/web-ele/src/views/mes/qc/defectrecord/components/inline-list.vue
similarity index 98%
rename from apps/web-ele/src/views/mes/qc/defectrecord/components/defect-record-inline-list.vue
rename to apps/web-ele/src/views/mes/qc/defectrecord/components/inline-list.vue
index 77cc64d73..0e9dda56a 100644
--- a/apps/web-ele/src/views/mes/qc/defectrecord/components/defect-record-inline-list.vue
+++ b/apps/web-ele/src/views/mes/qc/defectrecord/components/inline-list.vue
@@ -16,7 +16,7 @@ import {
 import { $t } from '#/locales';
 
 import { useDefectRecordInlineGridColumns } from './data';
-import DefectRecordInlineForm from './defect-record-inline-form.vue';
+import DefectRecordInlineForm from './inline-form.vue';
 
 defineOptions({ name: 'DefectRecordInlineList' });
 
diff --git a/apps/web-ele/src/views/mes/qc/indicator/components/index.ts b/apps/web-ele/src/views/mes/qc/indicator/components/index.ts
index 5958cc7c5..60918e03c 100644
--- a/apps/web-ele/src/views/mes/qc/indicator/components/index.ts
+++ b/apps/web-ele/src/views/mes/qc/indicator/components/index.ts
@@ -1,2 +1,2 @@
-export { default as QcIndicatorSelectDialog } from './qc-indicator-select-dialog.vue';
-export { default as QcIndicatorSelect } from './qc-indicator-select.vue';
+export { default as QcIndicatorSelectDialog } from './select-dialog.vue';
+export { default as QcIndicatorSelect } from './select.vue';
diff --git a/apps/web-ele/src/views/mes/qc/indicator/components/qc-indicator-select-dialog.vue b/apps/web-ele/src/views/mes/qc/indicator/components/select-dialog.vue
similarity index 100%
rename from apps/web-ele/src/views/mes/qc/indicator/components/qc-indicator-select-dialog.vue
rename to apps/web-ele/src/views/mes/qc/indicator/components/select-dialog.vue
diff --git a/apps/web-ele/src/views/mes/qc/indicator/components/qc-indicator-select.vue b/apps/web-ele/src/views/mes/qc/indicator/components/select.vue
similarity index 98%
rename from apps/web-ele/src/views/mes/qc/indicator/components/qc-indicator-select.vue
rename to apps/web-ele/src/views/mes/qc/indicator/components/select.vue
index 450621c23..76348179f 100644
--- a/apps/web-ele/src/views/mes/qc/indicator/components/qc-indicator-select.vue
+++ b/apps/web-ele/src/views/mes/qc/indicator/components/select.vue
@@ -9,7 +9,7 @@ import { ElInput, ElTooltip } from 'element-plus';
 
 import { getIndicator } from '#/api/mes/qc/indicator';
 
-import QcIndicatorSelectDialog from './qc-indicator-select-dialog.vue';
+import QcIndicatorSelectDialog from './select-dialog.vue';
 
 defineOptions({ name: 'QcIndicatorSelect', inheritAttrs: false });
 
diff --git a/apps/web-ele/src/views/mes/qc/indicatorresult/components/qc-indicator-result-form.vue b/apps/web-ele/src/views/mes/qc/indicatorresult/components/form.vue
similarity index 100%
rename from apps/web-ele/src/views/mes/qc/indicatorresult/components/qc-indicator-result-form.vue
rename to apps/web-ele/src/views/mes/qc/indicatorresult/components/form.vue
diff --git a/apps/web-ele/src/views/mes/qc/indicatorresult/components/index.ts b/apps/web-ele/src/views/mes/qc/indicatorresult/components/index.ts
index 590fb8b8e..5fdd4eeaf 100644
--- a/apps/web-ele/src/views/mes/qc/indicatorresult/components/index.ts
+++ b/apps/web-ele/src/views/mes/qc/indicatorresult/components/index.ts
@@ -1,2 +1,2 @@
-export { default as QcIndicatorResultForm } from './qc-indicator-result-form.vue';
-export { default as QcIndicatorResultList } from './qc-indicator-result-list.vue';
+export { default as QcIndicatorResultForm } from './form.vue';
+export { default as QcIndicatorResultList } from './list.vue';
diff --git a/apps/web-ele/src/views/mes/qc/indicatorresult/components/qc-indicator-result-list.vue b/apps/web-ele/src/views/mes/qc/indicatorresult/components/list.vue
similarity index 98%
rename from apps/web-ele/src/views/mes/qc/indicatorresult/components/qc-indicator-result-list.vue
rename to apps/web-ele/src/views/mes/qc/indicatorresult/components/list.vue
index bc9f555fc..b08c2a168 100644
--- a/apps/web-ele/src/views/mes/qc/indicatorresult/components/qc-indicator-result-list.vue
+++ b/apps/web-ele/src/views/mes/qc/indicatorresult/components/list.vue
@@ -14,7 +14,7 @@ import {
 import { $t } from '#/locales';
 
 import { useQcIndicatorResultGridColumns } from './data';
-import QcIndicatorResultForm from './qc-indicator-result-form.vue';
+import QcIndicatorResultForm from './form.vue';
 
 const props = defineProps<{
   qcId: number;
diff --git a/apps/web-ele/src/views/mes/qc/ipqc/data.ts b/apps/web-ele/src/views/mes/qc/ipqc/data.ts
index 05cf9d534..b2f22b360 100644
--- a/apps/web-ele/src/views/mes/qc/ipqc/data.ts
+++ b/apps/web-ele/src/views/mes/qc/ipqc/data.ts
@@ -12,10 +12,10 @@ import { ElButton } from 'element-plus';
 
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getSimpleUserList } from '#/api/system/user';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
-import MdWorkstationSelect from '#/views/mes/md/workstation/components/md-workstation-select.vue';
-import ProTaskSelect from '#/views/mes/pro/task/components/pro-task-select.vue';
-import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
+import { MdItemSelect } from '#/views/mes/md/item/components';
+import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
+import { ProTaskSelect } from '#/views/mes/pro/task/components';
+import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-ele/src/views/mes/qc/iqc/data.ts b/apps/web-ele/src/views/mes/qc/iqc/data.ts
index 7265d1ab5..f6e44a964 100644
--- a/apps/web-ele/src/views/mes/qc/iqc/data.ts
+++ b/apps/web-ele/src/views/mes/qc/iqc/data.ts
@@ -13,8 +13,8 @@ import { ElButton } from 'element-plus';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
-import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
+import { MdItemSelect } from '#/views/mes/md/item/components';
+import { MdVendorSelect } from '#/views/mes/md/vendor/components';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-ele/src/views/mes/qc/oqc/data.ts b/apps/web-ele/src/views/mes/qc/oqc/data.ts
index 45ff7afc6..c69e8248c 100644
--- a/apps/web-ele/src/views/mes/qc/oqc/data.ts
+++ b/apps/web-ele/src/views/mes/qc/oqc/data.ts
@@ -12,8 +12,8 @@ import { ElButton } from 'element-plus';
 
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getSimpleUserList } from '#/api/system/user';
-import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import { MdClientSelect } from '#/views/mes/md/client/components';
+import { MdItemSelect } from '#/views/mes/md/item/components';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-ele/src/views/mes/qc/pendinginspect/data.ts b/apps/web-ele/src/views/mes/qc/pendinginspect/data.ts
index 758f1a23f..ec8b33a0a 100644
--- a/apps/web-ele/src/views/mes/qc/pendinginspect/data.ts
+++ b/apps/web-ele/src/views/mes/qc/pendinginspect/data.ts
@@ -7,7 +7,7 @@ import { markRaw } from 'vue';
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import { MdItemSelect } from '#/views/mes/md/item/components';
 
 /** 列表的搜索表单 */
 export function useGridFormSchema(): VbenFormSchema[] {
diff --git a/apps/web-ele/src/views/mes/qc/rqc/data.ts b/apps/web-ele/src/views/mes/qc/rqc/data.ts
index 3992b8131..0213582d5 100644
--- a/apps/web-ele/src/views/mes/qc/rqc/data.ts
+++ b/apps/web-ele/src/views/mes/qc/rqc/data.ts
@@ -12,7 +12,7 @@ import { ElButton } from 'element-plus';
 
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getSimpleUserList } from '#/api/system/user';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import { MdItemSelect } from '#/views/mes/md/item/components';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-ele/src/views/mes/qc/template/data.ts b/apps/web-ele/src/views/mes/qc/template/data.ts
index 170dbfec1..dc7ac76dd 100644
--- a/apps/web-ele/src/views/mes/qc/template/data.ts
+++ b/apps/web-ele/src/views/mes/qc/template/data.ts
@@ -13,9 +13,9 @@ import { ElButton } from 'element-plus';
 
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
-import MdUnitMeasureSelect from '#/views/mes/md/unitmeasure/components/md-unit-measure-select.vue';
-import QcIndicatorSelect from '#/views/mes/qc/indicator/components/qc-indicator-select.vue';
+import { MdItemSelect } from '#/views/mes/md/item/components';
+import { MdUnitMeasureSelect } from '#/views/mes/md/unitmeasure/components';
+import { QcIndicatorSelect } from '#/views/mes/qc/indicator/components';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-ele/src/views/mes/tm/tool/components/index.ts b/apps/web-ele/src/views/mes/tm/tool/components/index.ts
index cdddb2cfd..8af00d7b0 100644
--- a/apps/web-ele/src/views/mes/tm/tool/components/index.ts
+++ b/apps/web-ele/src/views/mes/tm/tool/components/index.ts
@@ -1 +1 @@
-export { default as TmToolSelect } from './tm-tool-select.vue';
+export { default as TmToolSelect } from './select.vue';
diff --git a/apps/web-ele/src/views/mes/tm/tool/components/tm-tool-select.vue b/apps/web-ele/src/views/mes/tm/tool/components/select.vue
similarity index 100%
rename from apps/web-ele/src/views/mes/tm/tool/components/tm-tool-select.vue
rename to apps/web-ele/src/views/mes/tm/tool/components/select.vue
diff --git a/apps/web-ele/src/views/mes/tm/tool/type/components/index.ts b/apps/web-ele/src/views/mes/tm/tool/type/components/index.ts
index 7d68a5c4d..d0fa32ee7 100644
--- a/apps/web-ele/src/views/mes/tm/tool/type/components/index.ts
+++ b/apps/web-ele/src/views/mes/tm/tool/type/components/index.ts
@@ -1,2 +1,2 @@
-export { default as TmToolTypeList } from './tm-tool-type-list.vue';
-export { default as TmToolTypeSelect } from './tm-tool-type-select.vue';
+export { default as TmToolTypeList } from './list.vue';
+export { default as TmToolTypeSelect } from './select.vue';
diff --git a/apps/web-ele/src/views/mes/tm/tool/type/components/tm-tool-type-list.vue b/apps/web-ele/src/views/mes/tm/tool/type/components/list.vue
similarity index 100%
rename from apps/web-ele/src/views/mes/tm/tool/type/components/tm-tool-type-list.vue
rename to apps/web-ele/src/views/mes/tm/tool/type/components/list.vue
diff --git a/apps/web-ele/src/views/mes/tm/tool/type/components/tm-tool-type-select.vue b/apps/web-ele/src/views/mes/tm/tool/type/components/select.vue
similarity index 100%
rename from apps/web-ele/src/views/mes/tm/tool/type/components/tm-tool-type-select.vue
rename to apps/web-ele/src/views/mes/tm/tool/type/components/select.vue
diff --git a/apps/web-ele/src/views/mes/wm/arrivalnotice/components/index.ts b/apps/web-ele/src/views/mes/wm/arrivalnotice/components/index.ts
index 1da3df21b..9f30fda12 100644
--- a/apps/web-ele/src/views/mes/wm/arrivalnotice/components/index.ts
+++ b/apps/web-ele/src/views/mes/wm/arrivalnotice/components/index.ts
@@ -1,2 +1,2 @@
-export { default as WmArrivalNoticeLineSelect } from './wm-arrival-notice-line-select.vue';
-export { default as WmArrivalNoticeSelect } from './wm-arrival-notice-select.vue';
+export { default as WmArrivalNoticeLineSelect } from './line-select.vue';
+export { default as WmArrivalNoticeSelect } from './select.vue';
diff --git a/apps/web-ele/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-line-select-dialog.vue b/apps/web-ele/src/views/mes/wm/arrivalnotice/components/line-select-dialog.vue
similarity index 100%
rename from apps/web-ele/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-line-select-dialog.vue
rename to apps/web-ele/src/views/mes/wm/arrivalnotice/components/line-select-dialog.vue
diff --git a/apps/web-ele/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-line-select.vue b/apps/web-ele/src/views/mes/wm/arrivalnotice/components/line-select.vue
similarity index 97%
rename from apps/web-ele/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-line-select.vue
rename to apps/web-ele/src/views/mes/wm/arrivalnotice/components/line-select.vue
index 2d2c482f6..43cf301a8 100644
--- a/apps/web-ele/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-line-select.vue
+++ b/apps/web-ele/src/views/mes/wm/arrivalnotice/components/line-select.vue
@@ -9,7 +9,7 @@ import { ElInput, ElTooltip } from 'element-plus';
 
 import { getArrivalNoticeLine } from '#/api/mes/wm/arrivalnotice/line';
 
-import WmArrivalNoticeLineSelectDialog from './wm-arrival-notice-line-select-dialog.vue';
+import WmArrivalNoticeLineSelectDialog from './line-select-dialog.vue';
 
 defineOptions({ name: 'WmArrivalNoticeLineSelect', inheritAttrs: false });
 
diff --git a/apps/web-ele/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-select-dialog.vue b/apps/web-ele/src/views/mes/wm/arrivalnotice/components/select-dialog.vue
similarity index 100%
rename from apps/web-ele/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-select-dialog.vue
rename to apps/web-ele/src/views/mes/wm/arrivalnotice/components/select-dialog.vue
diff --git a/apps/web-ele/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-select.vue b/apps/web-ele/src/views/mes/wm/arrivalnotice/components/select.vue
similarity index 97%
rename from apps/web-ele/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-select.vue
rename to apps/web-ele/src/views/mes/wm/arrivalnotice/components/select.vue
index 5c02fc81b..d91b16dd5 100644
--- a/apps/web-ele/src/views/mes/wm/arrivalnotice/components/wm-arrival-notice-select.vue
+++ b/apps/web-ele/src/views/mes/wm/arrivalnotice/components/select.vue
@@ -9,7 +9,7 @@ import { ElInput, ElTooltip } from 'element-plus';
 
 import { getArrivalNotice } from '#/api/mes/wm/arrivalnotice';
 
-import WmArrivalNoticeSelectDialog from './wm-arrival-notice-select-dialog.vue';
+import WmArrivalNoticeSelectDialog from './select-dialog.vue';
 
 defineOptions({ name: 'WmArrivalNoticeSelect', inheritAttrs: false });
 
diff --git a/apps/web-ele/src/views/mes/wm/arrivalnotice/data.ts b/apps/web-ele/src/views/mes/wm/arrivalnotice/data.ts
index c8969e9ac..27a33dfb6 100644
--- a/apps/web-ele/src/views/mes/wm/arrivalnotice/data.ts
+++ b/apps/web-ele/src/views/mes/wm/arrivalnotice/data.ts
@@ -12,8 +12,8 @@ import { ElButton } from 'element-plus';
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getRangePickerDefaultProps } from '#/utils';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
-import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
+import { MdItemSelect } from '#/views/mes/md/item/components';
+import { MdVendorSelect } from '#/views/mes/md/vendor/components';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-ele/src/views/mes/wm/barcode/components/barcode-detail.vue b/apps/web-ele/src/views/mes/wm/barcode/components/detail.vue
similarity index 100%
rename from apps/web-ele/src/views/mes/wm/barcode/components/barcode-detail.vue
rename to apps/web-ele/src/views/mes/wm/barcode/components/detail.vue
diff --git a/apps/web-ele/src/views/mes/wm/barcode/components/index.ts b/apps/web-ele/src/views/mes/wm/barcode/components/index.ts
index 87168be0a..9bd45dfbc 100644
--- a/apps/web-ele/src/views/mes/wm/barcode/components/index.ts
+++ b/apps/web-ele/src/views/mes/wm/barcode/components/index.ts
@@ -1,3 +1,3 @@
-export { default as BarcodeDetail } from './barcode-detail.vue';
 export { default as Barcode } from './barcode.vue';
+export { default as BarcodeDetail } from './detail.vue';
 export { default as PrinterLabel } from './printer-label.vue';
diff --git a/apps/web-ele/src/views/mes/wm/barcode/data.ts b/apps/web-ele/src/views/mes/wm/barcode/data.ts
index 8e0011b42..c2ac10ada 100644
--- a/apps/web-ele/src/views/mes/wm/barcode/data.ts
+++ b/apps/web-ele/src/views/mes/wm/barcode/data.ts
@@ -13,25 +13,27 @@ import { formatDateTime } from '@vben/utils';
 import { z } from '#/adapter/form';
 import { generateBarcodeContent } from '#/api/mes/wm/barcode';
 import { DictTag } from '#/components/dict-tag';
-import DvMachinerySelect from '#/views/mes/dv/machinery/components/dv-machinery-select.vue';
-import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
-import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
-import MdWorkshopSelect from '#/views/mes/md/workstation/components/md-workshop-select.vue';
-import MdWorkstationSelect from '#/views/mes/md/workstation/components/md-workstation-select.vue';
+import { DvMachinerySelect } from '#/views/mes/dv/machinery/components';
+import { MdClientSelect } from '#/views/mes/md/client/components';
+import { MdItemSelect } from '#/views/mes/md/item/components';
+import { MdVendorSelect } from '#/views/mes/md/vendor/components';
+import {
+  MdWorkshopSelect,
+  MdWorkstationSelect,
+} from '#/views/mes/md/workstation/components';
 import { ProCardSelect } from '#/views/mes/pro/card/components';
-import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
-import TmToolSelect from '#/views/mes/tm/tool/components/tm-tool-select.vue';
+import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
+import { TmToolSelect } from '#/views/mes/tm/tool/components';
 import { WmBatchSelect } from '#/views/mes/wm/batch/components';
 import { UserSelect } from '#/views/system/user/components';
 
-import WmMaterialStockSelect from './../materialstock/components/wm-material-stock-select.vue';
-import { WmPackageSelect } from './../packages/components';
+import { WmMaterialStockSelect } from '../materialstock/components';
+import { WmPackageSelect } from '../packages/components';
 import {
   WmWarehouseAreaSelect,
   WmWarehouseLocationSelect,
   WmWarehouseSelect,
-} from './../warehouse/components';
+} from '../warehouse/components';
 
 /** 业务对象选中后回填业务编码、业务名称、条码内容 */
 async function syncBizDetail(
diff --git a/apps/web-ele/src/views/mes/wm/batch/components/wm-batch-detail.vue b/apps/web-ele/src/views/mes/wm/batch/components/detail.vue
similarity index 100%
rename from apps/web-ele/src/views/mes/wm/batch/components/wm-batch-detail.vue
rename to apps/web-ele/src/views/mes/wm/batch/components/detail.vue
diff --git a/apps/web-ele/src/views/mes/wm/batch/components/index.ts b/apps/web-ele/src/views/mes/wm/batch/components/index.ts
index 1b9294cdd..e4b04017f 100644
--- a/apps/web-ele/src/views/mes/wm/batch/components/index.ts
+++ b/apps/web-ele/src/views/mes/wm/batch/components/index.ts
@@ -1,3 +1,3 @@
-export { default as WmBatchDetail } from './wm-batch-detail.vue';
-export { default as WmBatchSelectDialog } from './wm-batch-select-dialog.vue';
-export { default as WmBatchSelect } from './wm-batch-select.vue';
+export { default as WmBatchDetail } from './detail.vue';
+export { default as WmBatchSelectDialog } from './select-dialog.vue';
+export { default as WmBatchSelect } from './select.vue';
diff --git a/apps/web-ele/src/views/mes/wm/batch/components/wm-batch-select-dialog.vue b/apps/web-ele/src/views/mes/wm/batch/components/select-dialog.vue
similarity index 100%
rename from apps/web-ele/src/views/mes/wm/batch/components/wm-batch-select-dialog.vue
rename to apps/web-ele/src/views/mes/wm/batch/components/select-dialog.vue
diff --git a/apps/web-ele/src/views/mes/wm/batch/components/wm-batch-select.vue b/apps/web-ele/src/views/mes/wm/batch/components/select.vue
similarity index 98%
rename from apps/web-ele/src/views/mes/wm/batch/components/wm-batch-select.vue
rename to apps/web-ele/src/views/mes/wm/batch/components/select.vue
index 10fc23af4..7243b375f 100644
--- a/apps/web-ele/src/views/mes/wm/batch/components/wm-batch-select.vue
+++ b/apps/web-ele/src/views/mes/wm/batch/components/select.vue
@@ -9,7 +9,7 @@ import { ElInput, ElTooltip } from 'element-plus';
 
 import { getBatch } from '#/api/mes/wm/batch';
 
-import WmBatchSelectDialog from './wm-batch-select-dialog.vue';
+import WmBatchSelectDialog from './select-dialog.vue';
 
 defineOptions({ name: 'WmBatchSelect', inheritAttrs: false });
 
diff --git a/apps/web-ele/src/views/mes/wm/itemreceipt/data.ts b/apps/web-ele/src/views/mes/wm/itemreceipt/data.ts
index fd883365c..469d66db2 100644
--- a/apps/web-ele/src/views/mes/wm/itemreceipt/data.ts
+++ b/apps/web-ele/src/views/mes/wm/itemreceipt/data.ts
@@ -14,8 +14,8 @@ import { ElButton } from 'element-plus';
 
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getRangePickerDefaultProps } from '#/utils';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
-import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
+import { MdItemSelect } from '#/views/mes/md/item/components';
+import { MdVendorSelect } from '#/views/mes/md/vendor/components';
 import {
   WmArrivalNoticeLineSelect,
   WmArrivalNoticeSelect,
diff --git a/apps/web-ele/src/views/mes/wm/materialstock/components/index.ts b/apps/web-ele/src/views/mes/wm/materialstock/components/index.ts
index 8e0321711..aa23039f9 100644
--- a/apps/web-ele/src/views/mes/wm/materialstock/components/index.ts
+++ b/apps/web-ele/src/views/mes/wm/materialstock/components/index.ts
@@ -1,2 +1,2 @@
-export { default as WmMaterialStockSelectDialog } from './wm-material-stock-select-dialog.vue';
-export { default as WmMaterialStockSelect } from './wm-material-stock-select.vue';
+export { default as WmMaterialStockSelectDialog } from './select-dialog.vue';
+export { default as WmMaterialStockSelect } from './select.vue';
diff --git a/apps/web-ele/src/views/mes/wm/materialstock/components/wm-material-stock-select-dialog.vue b/apps/web-ele/src/views/mes/wm/materialstock/components/select-dialog.vue
similarity index 98%
rename from apps/web-ele/src/views/mes/wm/materialstock/components/wm-material-stock-select-dialog.vue
rename to apps/web-ele/src/views/mes/wm/materialstock/components/select-dialog.vue
index d63337ff9..a5f6b977c 100644
--- a/apps/web-ele/src/views/mes/wm/materialstock/components/wm-material-stock-select-dialog.vue
+++ b/apps/web-ele/src/views/mes/wm/materialstock/components/select-dialog.vue
@@ -8,7 +8,7 @@ import { ElAlert, ElButton, ElDialog, ElMessage } from 'element-plus';
 
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getMaterialStockPage } from '#/api/mes/wm/materialstock';
-import MdItemTypeTree from '#/views/mes/md/item/type/components/md-item-type-tree.vue';
+import { MdItemTypeTree } from '#/views/mes/md/item/type/components';
 
 import { useSelectGridColumns, useSelectGridFormSchema } from '../data';
 
diff --git a/apps/web-ele/src/views/mes/wm/materialstock/components/wm-material-stock-select.vue b/apps/web-ele/src/views/mes/wm/materialstock/components/select.vue
similarity index 98%
rename from apps/web-ele/src/views/mes/wm/materialstock/components/wm-material-stock-select.vue
rename to apps/web-ele/src/views/mes/wm/materialstock/components/select.vue
index de6d70957..0455126b3 100644
--- a/apps/web-ele/src/views/mes/wm/materialstock/components/wm-material-stock-select.vue
+++ b/apps/web-ele/src/views/mes/wm/materialstock/components/select.vue
@@ -9,7 +9,7 @@ import { ElInput, ElTooltip } from 'element-plus';
 
 import { getMaterialStock } from '#/api/mes/wm/materialstock';
 
-import WmMaterialStockSelectDialog from './wm-material-stock-select-dialog.vue';
+import WmMaterialStockSelectDialog from './select-dialog.vue';
 
 defineOptions({ name: 'WmMaterialStockSelect', inheritAttrs: false });
 
diff --git a/apps/web-ele/src/views/mes/wm/materialstock/data.ts b/apps/web-ele/src/views/mes/wm/materialstock/data.ts
index dac1d54c0..4d67df13a 100644
--- a/apps/web-ele/src/views/mes/wm/materialstock/data.ts
+++ b/apps/web-ele/src/views/mes/wm/materialstock/data.ts
@@ -6,8 +6,8 @@ import { markRaw } from 'vue';
 
 import { DICT_TYPE } from '@vben/constants';
 
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
-import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
+import { MdItemSelect } from '#/views/mes/md/item/components';
+import { MdVendorSelect } from '#/views/mes/md/vendor/components';
 
 import {
   WmWarehouseAreaSelect,
diff --git a/apps/web-ele/src/views/mes/wm/materialstock/index.vue b/apps/web-ele/src/views/mes/wm/materialstock/index.vue
index 942ce925e..04e979e38 100644
--- a/apps/web-ele/src/views/mes/wm/materialstock/index.vue
+++ b/apps/web-ele/src/views/mes/wm/materialstock/index.vue
@@ -16,7 +16,7 @@ import {
   updateMaterialStockFrozen,
 } from '#/api/mes/wm/materialstock';
 import { $t } from '#/locales';
-import MdItemTypeTree from '#/views/mes/md/item/type/components/md-item-type-tree.vue';
+import { MdItemTypeTree } from '#/views/mes/md/item/type/components';
 import { WmBatchDetail } from '#/views/mes/wm/batch/components';
 import AreaForm from '#/views/mes/wm/warehouse/area/modules/form.vue';
 
diff --git a/apps/web-ele/src/views/mes/wm/outsourceissue/data.ts b/apps/web-ele/src/views/mes/wm/outsourceissue/data.ts
index a6b699db2..c17cfc080 100644
--- a/apps/web-ele/src/views/mes/wm/outsourceissue/data.ts
+++ b/apps/web-ele/src/views/mes/wm/outsourceissue/data.ts
@@ -14,9 +14,9 @@ import { ElButton } from 'element-plus';
 
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getRangePickerDefaultProps } from '#/utils';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
-import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
-import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
+import { MdItemSelect } from '#/views/mes/md/item/components';
+import { MdVendorSelect } from '#/views/mes/md/vendor/components';
+import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
 import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
 import {
   WmWarehouseAreaSelect,
diff --git a/apps/web-ele/src/views/mes/wm/outsourcereceipt/data.ts b/apps/web-ele/src/views/mes/wm/outsourcereceipt/data.ts
index 645c50d80..d9874ac6a 100644
--- a/apps/web-ele/src/views/mes/wm/outsourcereceipt/data.ts
+++ b/apps/web-ele/src/views/mes/wm/outsourcereceipt/data.ts
@@ -15,9 +15,9 @@ import { ElButton } from 'element-plus';
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getRangePickerDefaultProps } from '#/utils';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
-import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
-import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
+import { MdItemSelect } from '#/views/mes/md/item/components';
+import { MdVendorSelect } from '#/views/mes/md/vendor/components';
+import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
 import {
   WmWarehouseAreaSelect,
   WmWarehouseLocationSelect,
diff --git a/apps/web-ele/src/views/mes/wm/packages/components/index.ts b/apps/web-ele/src/views/mes/wm/packages/components/index.ts
index 18bbc399e..de95a0617 100644
--- a/apps/web-ele/src/views/mes/wm/packages/components/index.ts
+++ b/apps/web-ele/src/views/mes/wm/packages/components/index.ts
@@ -1,2 +1,2 @@
-export { default as WmPackageSelectDialog } from './wm-package-select-dialog.vue';
-export { default as WmPackageSelect } from './wm-package-select.vue';
+export { default as WmPackageSelectDialog } from './select-dialog.vue';
+export { default as WmPackageSelect } from './select.vue';
diff --git a/apps/web-ele/src/views/mes/wm/packages/components/wm-package-select-dialog.vue b/apps/web-ele/src/views/mes/wm/packages/components/select-dialog.vue
similarity index 100%
rename from apps/web-ele/src/views/mes/wm/packages/components/wm-package-select-dialog.vue
rename to apps/web-ele/src/views/mes/wm/packages/components/select-dialog.vue
diff --git a/apps/web-ele/src/views/mes/wm/packages/components/wm-package-select.vue b/apps/web-ele/src/views/mes/wm/packages/components/select.vue
similarity index 98%
rename from apps/web-ele/src/views/mes/wm/packages/components/wm-package-select.vue
rename to apps/web-ele/src/views/mes/wm/packages/components/select.vue
index a533c7b1a..a0f8382f1 100644
--- a/apps/web-ele/src/views/mes/wm/packages/components/wm-package-select.vue
+++ b/apps/web-ele/src/views/mes/wm/packages/components/select.vue
@@ -9,7 +9,7 @@ import { ElInput, ElTooltip } from 'element-plus';
 
 import { getPackage } from '#/api/mes/wm/packages';
 
-import WmPackageSelectDialog from './wm-package-select-dialog.vue';
+import WmPackageSelectDialog from './select-dialog.vue';
 
 defineOptions({ name: 'WmPackageSelect', inheritAttrs: false });
 
diff --git a/apps/web-ele/src/views/mes/wm/packages/data.ts b/apps/web-ele/src/views/mes/wm/packages/data.ts
index 998b82a7f..6b5b20d0a 100644
--- a/apps/web-ele/src/views/mes/wm/packages/data.ts
+++ b/apps/web-ele/src/views/mes/wm/packages/data.ts
@@ -11,10 +11,10 @@ import { ElButton } from 'element-plus';
 
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getSimpleUserList } from '#/api/system/user';
-import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import { MdClientSelect } from '#/views/mes/md/client/components';
+import { MdItemSelect } from '#/views/mes/md/item/components';
 import { MdUnitMeasureSelect } from '#/views/mes/md/unitmeasure/components';
-import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
+import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'update';
diff --git a/apps/web-ele/src/views/mes/wm/packages/modules/sub-package-list.vue b/apps/web-ele/src/views/mes/wm/packages/modules/sub-package-list.vue
index 8180fa3fe..99e25c6aa 100644
--- a/apps/web-ele/src/views/mes/wm/packages/modules/sub-package-list.vue
+++ b/apps/web-ele/src/views/mes/wm/packages/modules/sub-package-list.vue
@@ -14,7 +14,7 @@ import {
 } from '#/api/mes/wm/packages';
 import { $t } from '#/locales';
 
-import WmPackageSelectDialog from '../components/wm-package-select-dialog.vue';
+import { WmPackageSelectDialog } from '../components';
 import { useSubPackageGridColumns } from '../data';
 
 const props = defineProps<{
diff --git a/apps/web-ele/src/views/mes/wm/productissue/data.ts b/apps/web-ele/src/views/mes/wm/productissue/data.ts
index 70ba78c49..5971fa02b 100644
--- a/apps/web-ele/src/views/mes/wm/productissue/data.ts
+++ b/apps/web-ele/src/views/mes/wm/productissue/data.ts
@@ -14,9 +14,9 @@ import { ElButton } from 'element-plus';
 
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getRangePickerDefaultProps } from '#/utils';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
-import MdWorkstationSelect from '#/views/mes/md/workstation/components/md-workstation-select.vue';
-import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
+import { MdItemSelect } from '#/views/mes/md/item/components';
+import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
+import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
 import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
 import {
   WmWarehouseAreaSelect,
diff --git a/apps/web-ele/src/views/mes/wm/productreceipt/data.ts b/apps/web-ele/src/views/mes/wm/productreceipt/data.ts
index 922f213a7..a84ec4c1b 100644
--- a/apps/web-ele/src/views/mes/wm/productreceipt/data.ts
+++ b/apps/web-ele/src/views/mes/wm/productreceipt/data.ts
@@ -13,8 +13,8 @@ import { ElButton } from 'element-plus';
 
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getRangePickerDefaultProps } from '#/utils';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
-import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
+import { MdItemSelect } from '#/views/mes/md/item/components';
+import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
 import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
 import {
   WmWarehouseAreaSelect,
diff --git a/apps/web-ele/src/views/mes/wm/productsales/data.ts b/apps/web-ele/src/views/mes/wm/productsales/data.ts
index 12afc9b78..29ee3fcd0 100644
--- a/apps/web-ele/src/views/mes/wm/productsales/data.ts
+++ b/apps/web-ele/src/views/mes/wm/productsales/data.ts
@@ -17,8 +17,8 @@ import { ElButton } from 'element-plus';
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getRangePickerDefaultProps } from '#/utils';
-import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import { MdClientSelect } from '#/views/mes/md/client/components';
+import { MdItemSelect } from '#/views/mes/md/item/components';
 import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
 import {
   WmSalesNoticeLineSelect,
diff --git a/apps/web-ele/src/views/mes/wm/returnissue/data.ts b/apps/web-ele/src/views/mes/wm/returnissue/data.ts
index b94027e40..59df1e444 100644
--- a/apps/web-ele/src/views/mes/wm/returnissue/data.ts
+++ b/apps/web-ele/src/views/mes/wm/returnissue/data.ts
@@ -14,9 +14,9 @@ import { ElButton } from 'element-plus';
 
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
-import MdWorkstationSelect from '#/views/mes/md/workstation/components/md-workstation-select.vue';
-import ProWorkOrderSelect from '#/views/mes/pro/workorder/components/pro-work-order-select.vue';
+import { MdItemSelect } from '#/views/mes/md/item/components';
+import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
+import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
 import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
 import {
   WmWarehouseAreaSelect,
diff --git a/apps/web-ele/src/views/mes/wm/returnsales/data.ts b/apps/web-ele/src/views/mes/wm/returnsales/data.ts
index d42f8cf74..249d19012 100644
--- a/apps/web-ele/src/views/mes/wm/returnsales/data.ts
+++ b/apps/web-ele/src/views/mes/wm/returnsales/data.ts
@@ -13,8 +13,8 @@ import { ElButton } from 'element-plus';
 
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
-import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import { MdClientSelect } from '#/views/mes/md/client/components';
+import { MdItemSelect } from '#/views/mes/md/item/components';
 import { WmBatchSelect } from '#/views/mes/wm/batch/components';
 import {
   WmWarehouseAreaSelect,
diff --git a/apps/web-ele/src/views/mes/wm/returnvendor/data.ts b/apps/web-ele/src/views/mes/wm/returnvendor/data.ts
index e8ce8023e..8f3aa8f16 100644
--- a/apps/web-ele/src/views/mes/wm/returnvendor/data.ts
+++ b/apps/web-ele/src/views/mes/wm/returnvendor/data.ts
@@ -12,8 +12,8 @@ import { DICT_TYPE, MesAutoCodeRuleCode } from '@vben/constants';
 import { ElButton } from 'element-plus';
 
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
-import MdVendorSelect from '#/views/mes/md/vendor/components/md-vendor-select.vue';
+import { MdItemSelect } from '#/views/mes/md/item/components';
+import { MdVendorSelect } from '#/views/mes/md/vendor/components';
 import { WmBatchSelect } from '#/views/mes/wm/batch/components';
 import { WmMaterialStockSelect } from '#/views/mes/wm/materialstock/components';
 import {
diff --git a/apps/web-ele/src/views/mes/wm/salesnotice/components/index.ts b/apps/web-ele/src/views/mes/wm/salesnotice/components/index.ts
index 0d5910b0e..2bc67d699 100644
--- a/apps/web-ele/src/views/mes/wm/salesnotice/components/index.ts
+++ b/apps/web-ele/src/views/mes/wm/salesnotice/components/index.ts
@@ -1,2 +1,2 @@
-export { default as WmSalesNoticeLineSelect } from './wm-sales-notice-line-select.vue';
-export { default as WmSalesNoticeSelect } from './wm-sales-notice-select.vue';
+export { default as WmSalesNoticeLineSelect } from './line-select.vue';
+export { default as WmSalesNoticeSelect } from './select.vue';
diff --git a/apps/web-ele/src/views/mes/wm/salesnotice/components/wm-sales-notice-line-select-dialog.vue b/apps/web-ele/src/views/mes/wm/salesnotice/components/line-select-dialog.vue
similarity index 100%
rename from apps/web-ele/src/views/mes/wm/salesnotice/components/wm-sales-notice-line-select-dialog.vue
rename to apps/web-ele/src/views/mes/wm/salesnotice/components/line-select-dialog.vue
diff --git a/apps/web-ele/src/views/mes/wm/salesnotice/components/wm-sales-notice-line-select.vue b/apps/web-ele/src/views/mes/wm/salesnotice/components/line-select.vue
similarity index 97%
rename from apps/web-ele/src/views/mes/wm/salesnotice/components/wm-sales-notice-line-select.vue
rename to apps/web-ele/src/views/mes/wm/salesnotice/components/line-select.vue
index 87dd28dd2..04f7ce67e 100644
--- a/apps/web-ele/src/views/mes/wm/salesnotice/components/wm-sales-notice-line-select.vue
+++ b/apps/web-ele/src/views/mes/wm/salesnotice/components/line-select.vue
@@ -9,7 +9,7 @@ import { ElInput, ElTooltip } from 'element-plus';
 
 import { getSalesNoticeLine } from '#/api/mes/wm/salesnotice/line';
 
-import WmSalesNoticeLineSelectDialog from './wm-sales-notice-line-select-dialog.vue';
+import WmSalesNoticeLineSelectDialog from './line-select-dialog.vue';
 
 defineOptions({ name: 'WmSalesNoticeLineSelect', inheritAttrs: false });
 
diff --git a/apps/web-ele/src/views/mes/wm/salesnotice/components/wm-sales-notice-select-dialog.vue b/apps/web-ele/src/views/mes/wm/salesnotice/components/select-dialog.vue
similarity index 100%
rename from apps/web-ele/src/views/mes/wm/salesnotice/components/wm-sales-notice-select-dialog.vue
rename to apps/web-ele/src/views/mes/wm/salesnotice/components/select-dialog.vue
diff --git a/apps/web-ele/src/views/mes/wm/salesnotice/components/wm-sales-notice-select.vue b/apps/web-ele/src/views/mes/wm/salesnotice/components/select.vue
similarity index 97%
rename from apps/web-ele/src/views/mes/wm/salesnotice/components/wm-sales-notice-select.vue
rename to apps/web-ele/src/views/mes/wm/salesnotice/components/select.vue
index d1d5d80a0..702d394aa 100644
--- a/apps/web-ele/src/views/mes/wm/salesnotice/components/wm-sales-notice-select.vue
+++ b/apps/web-ele/src/views/mes/wm/salesnotice/components/select.vue
@@ -9,7 +9,7 @@ import { ElInput, ElTooltip } from 'element-plus';
 
 import { getSalesNotice } from '#/api/mes/wm/salesnotice';
 
-import WmSalesNoticeSelectDialog from './wm-sales-notice-select-dialog.vue';
+import WmSalesNoticeSelectDialog from './select-dialog.vue';
 
 defineOptions({ name: 'WmSalesNoticeSelect', inheritAttrs: false });
 
diff --git a/apps/web-ele/src/views/mes/wm/salesnotice/data.ts b/apps/web-ele/src/views/mes/wm/salesnotice/data.ts
index 42012d680..9dba2f51f 100644
--- a/apps/web-ele/src/views/mes/wm/salesnotice/data.ts
+++ b/apps/web-ele/src/views/mes/wm/salesnotice/data.ts
@@ -11,8 +11,8 @@ import { ElButton } from 'element-plus';
 
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
-import MdClientSelect from '#/views/mes/md/client/components/md-client-select.vue';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import { MdClientSelect } from '#/views/mes/md/client/components';
+import { MdItemSelect } from '#/views/mes/md/item/components';
 
 /** 表单类型 */
 export type FormType = 'create' | 'detail' | 'finish' | 'update';
diff --git a/apps/web-ele/src/views/mes/wm/sn/data.ts b/apps/web-ele/src/views/mes/wm/sn/data.ts
index ea21e7788..ccdb95899 100644
--- a/apps/web-ele/src/views/mes/wm/sn/data.ts
+++ b/apps/web-ele/src/views/mes/wm/sn/data.ts
@@ -5,7 +5,7 @@ import type { MesWmSnApi } from '#/api/mes/wm/sn';
 import { markRaw } from 'vue';
 
 import { getRangePickerDefaultProps } from '#/utils';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import { MdItemSelect } from '#/views/mes/md/item/components';
 
 /** 生成 SN 码的表单 */
 export function useFormSchema(): VbenFormSchema[] {
diff --git a/apps/web-ele/src/views/mes/wm/stocktaking/plan/components/index.ts b/apps/web-ele/src/views/mes/wm/stocktaking/plan/components/index.ts
index d6289b11d..5a374ab09 100644
--- a/apps/web-ele/src/views/mes/wm/stocktaking/plan/components/index.ts
+++ b/apps/web-ele/src/views/mes/wm/stocktaking/plan/components/index.ts
@@ -1,2 +1,2 @@
-export { default as StockTakingPlanSelectDialog } from './stock-taking-plan-select-dialog.vue';
-export { default as StockTakingPlanSelect } from './stock-taking-plan-select.vue';
+export { default as StockTakingPlanSelectDialog } from './select-dialog.vue';
+export { default as StockTakingPlanSelect } from './select.vue';
diff --git a/apps/web-ele/src/views/mes/wm/stocktaking/plan/components/stock-taking-plan-select-dialog.vue b/apps/web-ele/src/views/mes/wm/stocktaking/plan/components/select-dialog.vue
similarity index 100%
rename from apps/web-ele/src/views/mes/wm/stocktaking/plan/components/stock-taking-plan-select-dialog.vue
rename to apps/web-ele/src/views/mes/wm/stocktaking/plan/components/select-dialog.vue
diff --git a/apps/web-ele/src/views/mes/wm/stocktaking/plan/components/stock-taking-plan-select.vue b/apps/web-ele/src/views/mes/wm/stocktaking/plan/components/select.vue
similarity index 97%
rename from apps/web-ele/src/views/mes/wm/stocktaking/plan/components/stock-taking-plan-select.vue
rename to apps/web-ele/src/views/mes/wm/stocktaking/plan/components/select.vue
index 7b116c992..b1ba6d15d 100644
--- a/apps/web-ele/src/views/mes/wm/stocktaking/plan/components/stock-taking-plan-select.vue
+++ b/apps/web-ele/src/views/mes/wm/stocktaking/plan/components/select.vue
@@ -9,7 +9,7 @@ import { ElInput, ElTooltip } from 'element-plus';
 
 import { getStockTakingPlan } from '#/api/mes/wm/stocktaking/plan';
 
-import StockTakingPlanSelectDialog from './stock-taking-plan-select-dialog.vue';
+import StockTakingPlanSelectDialog from './select-dialog.vue';
 
 defineOptions({ name: 'StockTakingPlanSelect', inheritAttrs: false });
 
diff --git a/apps/web-ele/src/views/mes/wm/stocktaking/plan/modules/param-form.vue b/apps/web-ele/src/views/mes/wm/stocktaking/plan/modules/param-form.vue
index f428d9ce4..da49b777f 100644
--- a/apps/web-ele/src/views/mes/wm/stocktaking/plan/modules/param-form.vue
+++ b/apps/web-ele/src/views/mes/wm/stocktaking/plan/modules/param-form.vue
@@ -24,7 +24,7 @@ import {
 import { getWarehouseArea } from '#/api/mes/wm/warehouse/area';
 import { getWarehouseLocation } from '#/api/mes/wm/warehouse/location';
 import { $t } from '#/locales';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import { MdItemSelect } from '#/views/mes/md/item/components';
 import { WmBatchSelect } from '#/views/mes/wm/batch/components';
 import {
   WmWarehouseAreaSelect,
diff --git a/apps/web-ele/src/views/mes/wm/stocktaking/task/data.ts b/apps/web-ele/src/views/mes/wm/stocktaking/task/data.ts
index 697a77559..61843466a 100644
--- a/apps/web-ele/src/views/mes/wm/stocktaking/task/data.ts
+++ b/apps/web-ele/src/views/mes/wm/stocktaking/task/data.ts
@@ -16,7 +16,7 @@ import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
-import MdItemSelect from '#/views/mes/md/item/components/md-item-select.vue';
+import { MdItemSelect } from '#/views/mes/md/item/components';
 import { StockTakingPlanSelect } from '#/views/mes/wm/stocktaking/plan/components';
 import {
   WmWarehouseAreaSelect,
diff --git a/apps/web-ele/src/views/mes/wm/warehouse/components/wm-warehouse-area-select.vue b/apps/web-ele/src/views/mes/wm/warehouse/components/area-select.vue
similarity index 100%
rename from apps/web-ele/src/views/mes/wm/warehouse/components/wm-warehouse-area-select.vue
rename to apps/web-ele/src/views/mes/wm/warehouse/components/area-select.vue
diff --git a/apps/web-ele/src/views/mes/wm/warehouse/components/index.ts b/apps/web-ele/src/views/mes/wm/warehouse/components/index.ts
index d2981238b..a2019dfd7 100644
--- a/apps/web-ele/src/views/mes/wm/warehouse/components/index.ts
+++ b/apps/web-ele/src/views/mes/wm/warehouse/components/index.ts
@@ -1,3 +1,3 @@
-export { default as WmWarehouseAreaSelect } from './wm-warehouse-area-select.vue';
-export { default as WmWarehouseLocationSelect } from './wm-warehouse-location-select.vue';
-export { default as WmWarehouseSelect } from './wm-warehouse-select.vue';
+export { default as WmWarehouseAreaSelect } from './area-select.vue';
+export { default as WmWarehouseLocationSelect } from './location-select.vue';
+export { default as WmWarehouseSelect } from './select.vue';
diff --git a/apps/web-ele/src/views/mes/wm/warehouse/components/wm-warehouse-location-select.vue b/apps/web-ele/src/views/mes/wm/warehouse/components/location-select.vue
similarity index 100%
rename from apps/web-ele/src/views/mes/wm/warehouse/components/wm-warehouse-location-select.vue
rename to apps/web-ele/src/views/mes/wm/warehouse/components/location-select.vue
diff --git a/apps/web-ele/src/views/mes/wm/warehouse/components/wm-warehouse-select.vue b/apps/web-ele/src/views/mes/wm/warehouse/components/select.vue
similarity index 100%
rename from apps/web-ele/src/views/mes/wm/warehouse/components/wm-warehouse-select.vue
rename to apps/web-ele/src/views/mes/wm/warehouse/components/select.vue