Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin

- 对齐后端字段 lastTriggerTime
- 修复 web-antd、web-ele、web-antdv-next 的 API 类型、表格列和插槽读取

.changeset/.prettierrc.json

@@ -0,0 +1,3 @@
+{
+  "singleQuote": true
+}

.changeset/fancy-ears-walk.md

@@ -0,0 +1,7 @@
+---
+'@vben/styles': patch
+'@vben-core/form-ui': patch
+'@vben/web-naive': patch
+---
+
+feat(@core/form-ui): 新增 useVbenForm 数组编辑器 VbenFormFieldArray

.github/actions/setup-node/action.yml

@@ -6,10 +6,10 @@ runs:
   using: 'composite'
   steps:
     - name: Install pnpm
-      uses: pnpm/action-setup@v4
+      uses: pnpm/action-setup@v6
 
     - name: Install Node.js
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v6
       with:
         node-version-file: .node-version
         cache: 'pnpm'

.github/workflows/build.yml

@@ -30,7 +30,7 @@ jobs:
           - windows-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 

.github/workflows/changeset-version.yml

@@ -25,7 +25,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 

.github/workflows/ci.yml

@@ -28,12 +28,12 @@ jobs:
     timeout-minutes: 20
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@v6
         with:
           run_install: false
 
@@ -67,7 +67,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
@@ -90,7 +90,7 @@ jobs:
           - windows-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 

.github/workflows/codeql.yml

@@ -57,11 +57,11 @@ jobs:
         # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v4
         with:
           languages: ${{ matrix.language }}
           build-mode: ${{ matrix.build-mode }}
@@ -89,6 +89,6 @@ jobs:
           exit 1
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v4
         with:
           category: '/language:${{matrix.language}}'

.github/workflows/deploy.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
@@ -30,7 +30,7 @@ jobs:
         run: pnpm build:play
 
       - name: Sync Playground files
-        uses: SamKirkland/FTP-Deploy-Action@v4.3.6
+        uses: SamKirkland/FTP-Deploy-Action@v4.4.0
         with:
           server: ${{ secrets.PRO_FTP_HOST }}
           username: ${{ secrets.WEB_PLAYGROUND_FTP_ACCOUNT }}
@@ -43,7 +43,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
@@ -54,7 +54,7 @@ jobs:
         run: pnpm build:docs
 
       - name: Sync Docs files
-        uses: SamKirkland/FTP-Deploy-Action@v4.3.6
+        uses: SamKirkland/FTP-Deploy-Action@v4.4.0
         with:
           server: ${{ secrets.PRO_FTP_HOST }}
           username: ${{ secrets.WEBSITE_FTP_ACCOUNT }}
@@ -67,7 +67,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
@@ -85,7 +85,7 @@ jobs:
         run: pnpm run build:antd
 
       - name: Sync files
-        uses: SamKirkland/FTP-Deploy-Action@v4.3.6
+        uses: SamKirkland/FTP-Deploy-Action@v4.4.0
         with:
           server: ${{ secrets.PRO_FTP_HOST }}
           username: ${{ secrets.WEB_ANTD_FTP_ACCOUNT }}
@@ -98,7 +98,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
@@ -116,7 +116,7 @@ jobs:
         run: pnpm run build:ele
 
       - name: Sync files
-        uses: SamKirkland/FTP-Deploy-Action@v4.3.6
+        uses: SamKirkland/FTP-Deploy-Action@v4.4.0
         with:
           server: ${{ secrets.PRO_FTP_HOST }}
           username: ${{ secrets.WEB_ELE_FTP_ACCOUNT }}
@@ -129,7 +129,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
@@ -147,7 +147,7 @@ jobs:
         run: pnpm run build:naive
 
       - name: Sync files
-        uses: SamKirkland/FTP-Deploy-Action@v4.3.6
+        uses: SamKirkland/FTP-Deploy-Action@v4.4.0
         with:
           server: ${{ secrets.PRO_FTP_HOST }}
           username: ${{ secrets.WEB_NAIVE_FTP_ACCOUNT }}

.github/workflows/draft.yml

@@ -20,6 +20,6 @@ jobs:
     if: github.repository == 'vbenjs/vue-vben-admin'
     runs-on: ubuntu-latest
     steps:
-      - uses: release-drafter/release-drafter@v6
+      - uses: release-drafter/release-drafter@v7
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/issue-close-require.yml

@@ -19,7 +19,7 @@ jobs:
     steps:
       # 关闭未活动的 Issues
       - name: Close Inactive Issues
-        uses: actions/stale@v9
+        uses: actions/stale@v10
         with:
           days-before-stale: -1 # Issues and PR will never be flagged stale automatically.
           stale-issue-label: needs-reproduction # Label that flags an issue as stale.

.github/workflows/issue-labeled.yml

@@ -18,7 +18,7 @@ jobs:
     steps:
       - name: remove enhancement pending
         if: github.event.label.name == 'enhancement'
-        uses: actions-cool/issues-helper@v3
+        uses: actions-cool/issues-helper-backup@d65454423c6fbbd20026b9b499d403f79422ac69
         with:
           actions: 'remove-labels'
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -27,7 +27,7 @@ jobs:
 
       - name: remove bug pending
         if: github.event.label.name == 'bug'
-        uses: actions-cool/issues-helper@v3
+        uses: actions-cool/issues-helper-backup@d65454423c6fbbd20026b9b499d403f79422ac69
         with:
           actions: 'remove-labels'
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -36,7 +36,7 @@ jobs:
 
       - name: needs reproduction
         if: github.event.label.name == 'needs reproduction'
-        uses: actions-cool/issues-helper@v3
+        uses: actions-cool/issues-helper-backup@d65454423c6fbbd20026b9b499d403f79422ac69
         with:
           actions: 'create-comment, remove-labels'
           token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/lock.yml

@@ -14,7 +14,7 @@ jobs:
     if: github.repository == 'vbenjs/vue-vben-admin'
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v5
+      - uses: dessant/lock-threads@v6
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           issue-inactive-days: '14'

.github/workflows/release-tag.yml

@@ -3,78 +3,48 @@ name: Create Release Tag
 on:
   push:
     tags:
-      - 'v*.*.*' # Push events to matching v*, i.e. v1.0, v20.15.10
+      - 'v*.*.*'
-
+  workflow_dispatch:
-env:
+    inputs:
-  HUSKY: '0'
+      tag:
+        description: 'Tag to create (e.g. v1.2.3)'
+        required: true
+        type: string
 
 permissions:
-  pull-requests: write
   contents: write
 
 jobs:
-  build:
+  release:
     name: Create Release
     if: github.repository == 'vbenjs/vue-vben-admin'
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [20]
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
-      # - name: Checkout code
+      - name: Extract version
-      #   uses: actions/checkout@v4
-      #   with:
-      #     fetch-depth: 0
-
-      # - name: Install pnpm
-      #   uses: pnpm/action-setup@v4
-
-      # - name: Use Node.js ${{ matrix.node-version }}
-      #   uses: actions/setup-node@v4
-      #   with:
-      #     node-version: ${{ matrix.node-version }}
-      #     cache: "pnpm"
-
-      # - name: Install dependencies
-      #   run: pnpm install --frozen-lockfile
-
-      # - name: Test and Build
-      #   run: |
-      #     pnpm run test
-      #     pnpm run build
-
-      - name: version
         id: version
         run: |
-          tag=${GITHUB_REF/refs\/tags\//}
+          if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
-          version=${tag#v}
+            raw_tag="${{ inputs.tag }}"
-          major=${version%%.*}
+          else
-          echo "tag=${tag}" >> $GITHUB_OUTPUT
+            raw_tag="${GITHUB_REF_NAME}"
-          echo "version=${version}" >> $GITHUB_OUTPUT
+          fi
-          echo "major=${major}" >> $GITHUB_OUTPUT
+          # Normalize: ensure v prefix
+          tag="${raw_tag}"
+          [[ "${tag:0:1}" != "v" ]] && tag="v${tag}"
+          version="${tag#v}"
+          major="${version%%.*}"
+          echo "tag=${tag}" >> "${GITHUB_OUTPUT}"
+          echo "version=${version}" >> "${GITHUB_OUTPUT}"
+          echo "major=${major}" >> "${GITHUB_OUTPUT}"
 
-      - uses: release-drafter/release-drafter@v6
+      - uses: release-drafter/release-drafter@v7
         with:
           version: ${{ steps.version.outputs.version }}
           publish: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      # - name: force update major tag
-      #   run: |
-      #     git tag v${{ steps.version.outputs.major }} ${{ steps.version.outputs.tag }} -f
-      #     git push origin refs/tags/v${{ steps.version.outputs.major }} -f
-
-      # - name: Create Release for Tag
-      #   id: release_tag
-      #   uses: ncipollo/release-action@v1
-      #   with:
-      #     token: ${{ secrets.GITHUB_TOKEN }}
-      #     generateReleaseNotes: "true"
-      #     body: |
-      #       > Please refer to [CHANGELOG.md](https://github.com/vbenjs/vue-vben-admin/blob/main/CHANGELOG.md) for details.

.github/workflows/semantic-pull-request.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Validate PR title
-        uses: amannn/action-semantic-pull-request@v5
+        uses: amannn/action-semantic-pull-request@v6
         with:
           wip: true
           subjectPattern: ^(?![A-Z]).+$

.github/workflows/stale.yml

@@ -9,7 +9,7 @@ jobs:
     if: github.repository == 'vbenjs/vue-vben-admin'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v9
+      - uses: actions/stale@v10
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           stale-issue-message: 'This issue is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 7 days'

.gitignore

@@ -22,7 +22,8 @@ yarn.lock
 package-lock.json
 .VSCodeCounter
 **/backend-mock/data
-
+.omx
+.pnpm-store
 # local env files
 .env.local
 .env.*.local
@@ -50,3 +51,15 @@ vite.config.ts.*
 *.sw?
 .history
 .cursor
+
+# AI
+.agent
+.agents
+.claude
+.codex
+skills-lock.json
+.atomcode
+datalog
+
+# Playwright CLI 录制产物（本地调试，不入库）
+.playwright-cli

.node-version

@@ -1 +1 @@
-22.1.0
+24.16.0

.npmrc

@@ -1,13 +1 @@
 registry=https://registry.npmmirror.com
-public-hoist-pattern[]=lefthook
-public-hoist-pattern[]=eslint
-public-hoist-pattern[]=prettier
-public-hoist-pattern[]=prettier-plugin-tailwindcss
-public-hoist-pattern[]=stylelint
-public-hoist-pattern[]=*postcss*
-public-hoist-pattern[]=@commitlint/*
-public-hoist-pattern[]=czg
-
-strict-peer-dependencies=false
-auto-install-peers=true
-dedupe-peer-dependents=true

.prettierignore

@@ -1,18 +0,0 @@
-dist
-dev-dist
-.local
-.output.js
-node_modules
-.nvmrc
-coverage
-CODEOWNERS
-.nitro
-.output
-
-
-**/*.svg
-**/*.sh
-
-public
-.npmrc
-*-lock.yaml

.prettierrc.mjs

@@ -1 +0,0 @@
-export { default } from '@vben/prettier-config';

.stylelintignore

@@ -2,3 +2,7 @@ dist
 public
 __tests__
 coverage
+.codex
+.claude
+.agent
+.agents

.vscode/extensions.json

@@ -2,14 +2,18 @@
   "recommendations": [
     // Vue 3 的语言支持
     "Vue.volar",
-    // 将 ESLint JavaScript 集成到 VS Code 中。
+    // 将 eslint 集成到 VS Code 中。
     "dbaeumer.vscode-eslint",
+    // 将 oxlint 集成到 VS Code 中。
+    "oxc.oxc-vscode",
     // Visual Studio Code 的官方 Stylelint 扩展
     "stylelint.vscode-stylelint",
-    // 使用 Prettier 的代码格式化程序
+    // 使用 oxfmt 的代码格式化程序
-    "esbenp.prettier-vscode",
+    "oxc.oxc-vscode",
     // 支持 dotenv 文件语法
     "mikestead.dotenv",
+    // YAML 语言支持，供 ESLint 校验 pnpm-workspace.yaml 等文件
+    "redhat.vscode-yaml",
     // 源代码的拼写检查器
     "streetsidesoftware.code-spell-checker",
     // Tailwind CSS 的官方 VS Code 插件

.vscode/launch.json

@@ -2,6 +2,15 @@
   "$schema": "https://json.schemastore.org/launchsettings.json",
   "version": "0.2.0",
   "configurations": [
+    {
+      "type": "chrome",
+      "name": "vben admin antd dev",
+      "request": "launch",
+      "url": "http://localhost:5999",
+      "env": { "NODE_ENV": "development" },
+      "sourceMaps": true,
+      "webRoot": "${workspaceFolder}/apps/web-antdv-next"
+    },
     {
       "type": "chrome",
       "name": "vben admin antd dev",

.vscode/settings.json

@@ -1,5 +1,6 @@
 {
-  "tailwindCSS.experimental.configFile": "internal/tailwind-config/src/index.ts",
+  "tailwindCSS.experimental.configFile": "internal/tailwind-config/src/theme.css",
+  "tailwindCSS.lint.suggestCanonicalClasses": "ignore",
   // workbench
   "workbench.list.smoothScrolling": true,
   "workbench.startupEditor": "newUntitledFile",
@@ -31,39 +32,51 @@
   "editor.autoClosingOvertype": "always",
   "editor.autoClosingQuotes": "beforeWhitespace",
   "editor.wordSeparators": "`~!@#%^&*()=+[{]}\\|;:'\",.<>/?",
+  "editor.quickSuggestions": {
+    "strings": "on"
+  },
+
+  // lint && format
+  "oxc.enable": true,
+  "oxc.typeAware": false,
+  "oxc.configPath": "oxlint.config.ts",
+  "oxc.fmt.configPath": "oxfmt.config.ts",
+  "eslint.useFlatConfig": true,
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": "explicit",
+    "source.fixAll.oxc": "explicit",
     "source.fixAll.stylelint": "explicit",
     "source.organizeImports": "never"
   },
-  "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "editor.defaultFormatter": "oxc.oxc-vscode",
   "[html]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
+    "editor.defaultFormatter": "oxc.oxc-vscode"
   },
   "[css]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
+    "editor.defaultFormatter": "oxc.oxc-vscode"
   },
   "[scss]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
+    "editor.defaultFormatter": "oxc.oxc-vscode"
   },
   "[javascript]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
+    "editor.defaultFormatter": "oxc.oxc-vscode"
   },
   "[typescript]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
+    "editor.defaultFormatter": "oxc.oxc-vscode"
   },
   "[json]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
+    "editor.defaultFormatter": "oxc.oxc-vscode"
   },
   "[markdown]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
+    "editor.defaultFormatter": "oxc.oxc-vscode"
   },
   "[jsonc]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
+    "editor.defaultFormatter": "oxc.oxc-vscode"
   },
   "[vue]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
+    "editor.defaultFormatter": "oxc.oxc-vscode"
   },
+
   // extensions
   "extensions.ignoreRecommendations": true,
 
@@ -79,6 +92,7 @@
   "files.insertFinalNewline": true,
   "files.simpleDialog.enable": true,
   "files.associations": {
+    "*.css": "tailwindcss",
     "*.ejs": "html",
     "*.art": "html",
     "**/tsconfig.json": "jsonc",
@@ -118,7 +132,7 @@
   // search
   "search.searchEditor.singleClickBehaviour": "peekDefinition",
   "search.followSymlinks": false,
-  // 在使用搜索功能时，将这些文件夹/文件排除在外
+  // 使用搜索功能时，将这些文件和文件夹排除在外
   "search.exclude": {
     "**/node_modules": true,
     "**/*.log": true,
@@ -159,7 +173,7 @@
   "emmet.triggerExpansionOnTab": false,
 
   "errorLens.enabledDiagnosticLevels": ["warning", "error"],
-  "errorLens.excludeBySource": ["cSpell", "Grammarly", "eslint"],
+  "errorLens.excludeBySource": ["cSpell", "Grammarly"],
 
   "stylelint.enable": true,
   "stylelint.packageManager": "pnpm",
@@ -167,9 +181,10 @@
   "stylelint.customSyntax": "postcss-html",
   "stylelint.snippet": ["css", "less", "postcss", "scss", "vue"],
 
-  "typescript.inlayHints.enumMemberValues.enabled": true,
+  "js/ts.tsdk.path": "node_modules/typescript/lib",
-  "typescript.preferences.preferTypeOnlyAutoImports": true,
+  "js/ts.inlayHints.enumMemberValues.enabled": true,
-  "typescript.preferences.includePackageJsonAutoImports": "on",
+  "js/ts.preferences.preferTypeOnlyAutoImports": true,
+  "js/ts.preferences.includePackageJsonAutoImports": "on",
 
   "eslint.validate": [
     "javascript",
@@ -193,7 +208,7 @@
     "*": false
   },
 
-  "cssVariables.lookupFiles": ["packages/core/base/design/src/**/*.css"],
+  "cssVariables.lookupFiles": ["packages/@core/base/design/src/**/*.css"],
 
   "i18n-ally.localesPaths": [
     "packages/locales/src/langs",
@@ -218,12 +233,9 @@
     "*.env": "$(capture).env.*",
     "README.md": "README*,CHANGELOG*,LICENSE,CNAME",
     "package.json": "pnpm-lock.yaml,pnpm-workspace.yaml,.gitattributes,.gitignore,.gitpod.yml,.npmrc,.browserslistrc,.node-version,.git*,.tazerc.json",
-    "eslint.config.mjs": ".eslintignore,.prettierignore,.stylelintignore,.commitlintrc.*,.prettierrc.*,stylelint.config.*,.lintstagedrc.mjs,cspell.json,lefthook.yml",
+    "oxlint.config.ts": ".eslintignore,.stylelintignore,.commitlintrc.*,stylelint.config.*,.lintstagedrc.mjs,cspell.json,lefthook.yml,oxfmt.config.*,eslint.config.*"
-    "tailwind.config.mjs": "postcss.*"
   },
   "commentTranslate.hover.enabled": false,
   "commentTranslate.multiLineMerge": true,
-  "vue.server.hybridMode": true,
+  "vue.server.hybridMode": true
-  "typescript.tsdk": "node_modules/typescript/lib",
-  "oxc.enable": false
 }

README.md

@@ -9,7 +9,7 @@
 
 ## 🐶 新手必读
 
-- nodejs > v20.19.0 | v22 | v24 && pnpm > 10.20.0 (强制使用pnpm)
+- nodejs >= v22.18.0（推荐v24） && pnpm >= 11.0.0（强制使用 pnpm）
 - 演示地址【Vue3 + element-plus】：<http://dashboard-vue3.yudao.iocoder.cn>
 - 演示地址【Vue3 + vben5(ant-design-vue)】：<http://dashboard-vben.yudao.iocoder.cn>
 - 演示地址【Vue2 + element-ui】：<http://dashboard.yudao.iocoder.cn>
@@ -20,12 +20,12 @@
 
 **芋道**，以开发者为中心，打造中国第一流的快速开发平台，全部开源，个人与企业可 100% 免费使用。
 
-- 采用最新 [vue-vben-admin](https://github.com/vbenjs/vue-vben-admin) v5 实现
+- 采用最新 [vue-vben-admin](https://github.com/vbenjs/vue-vben-admin) v5.7.0 实现
 - 支持 [Ant Design Vue](https://www.antdv.com/) | [Element Plus](https://element-plus.org/zh-CN/) | [Naive UI](https://www.naiveui.com/) | [TDesign](https://tdesign.tencent.com/) 多种免费开源的中后台模版，具备如下特性：
 
 ![首页](.gitee/image/demo/vben.png)
 
-- **最新技术栈**：使用 Vue3、Vite7 等前端前沿技术开发
+- **最新技术栈**：使用 Vue3、Vite8 等前端前沿技术开发
 - **TypeScript**: 应用程序级 JavaScript 的语言
 - **主题**: 提供多套主题色彩，可配置自定义主题
 - **国际化**：内置完善的国际化方案
@@ -41,24 +41,24 @@
 
 | 框架 | 说明 | 版本 |
 | --- | --- | --- |
-| [Vue](https://staging-cn.vuejs.org/) | vue框架 | 3.5.27 |
+| [Vue](https://staging-cn.vuejs.org/) | vue框架 | 3.5.35 |
-| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 7.3.1 |
+| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 8.0.10 |
 | [Ant Design Vue](https://www.antdv.com/) | Ant Design Vue | 4.2.6 |
-| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.13.1 |
+| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.14.1 |
-| [Naive UI](https://www.naiveui.com/) | Naive UI | 2.43.2 |
+| [Naive UI](https://www.naiveui.com/) | Naive UI | 2.44.1 |
-| [TDesign](https://tdesign.tencent.com/) | TDesign | 1.18.0 |
+| [TDesign](https://tdesign.tencent.com/) | TDesign | 1.20.0 |
-| [TypeScript](https://www.typescriptlang.org/docs/) | JavaScript 超集 | 5.9.3 |
+| [TypeScript](https://www.typescriptlang.org/docs/) | JavaScript 超集 | 6.0.3 |
 | [pinia](https://pinia.vuejs.org/) | Vue 存储库替代 vuex5 | 3.0.4 |
-| [vueuse](https://vueuse.org/) | 常用工具集 | 14.1.0 |
+| [vueuse](https://vueuse.org/) | 常用工具集 | 14.3.0 |
-| [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化 | 11.2.8 |
+| [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化 | 11.4.4 |
-| [vue-router](https://router.vuejs.org/) | Vue 路由 | 4.6.4 |
+| [vue-router](https://router.vuejs.org/) | Vue 路由 | 5.1.0 |
-| [Tailwind CSS](https://tailwindcss.com/) | 原子 CSS | 3.4.19 |
+| [Tailwind CSS](https://tailwindcss.com/) | 原子 CSS | 4.3.0 |
-| [Iconify](https://iconify.design/) | 图标组件 | 5.0.0 |
+| [Iconify](https://iconify.design/) | 图标组件 | 5.0.1 |
-| [Iconify](https://icon-sets.iconify.design/) | 在线图标库 | 2.2.431 |
+| [Iconify](https://icon-sets.iconify.design/) | 在线图标库 | 2.2.481 |
 | [TinyMCE](https://www.tiny.cloud/) | 富文本编辑器 | 7.3.0 |
-| [Echarts](https://echarts.apache.org/) | 图表库 | 6.0.0 |
+| [Echarts](https://echarts.apache.org/) | 图表库 | 6.1.0 |
-| [axios](https://axios-http.com/) | http客户端 | 1.13.2 |
+| [axios](https://axios-http.com/) | http客户端 | 1.16.1 |
-| [dayjs](https://day.js.org/) | 日期处理库 | 1.11.19 |
+| [dayjs](https://day.js.org/) | 日期处理库 | 1.11.21 |
 | [vee-validate](https://vee-validate.logaretm.com/) | 表单验证 | 4.15.1 |
 | [zod](https://zod.dev/) | 数据验证 | 3.25.76 |
 
@@ -84,7 +84,7 @@
 
 - 通用模块（必选）：系统功能、基础设施
 - 通用模块（可选）：工作流程、支付系统、数据报表、会员中心
-- 业务系统（按需）：ERP 系统、CRM 系统、商城系统、微信公众号、AI 大模型
+- 业务系统（按需）：Mall 电子商城、OA 办公自动化、ERP 企业资源计划系统、WMS 仓库管理系统、CRM 客户关系管理、CMS 内容管理系统、MES 执行制造系统、AI 大模型平台、IoT 物联网系统、IM 即时通讯系统、Mobile 手机移动端、Report 数据大屏
 
 ### 系统功能
 
@@ -219,18 +219,44 @@
 
 ![功能图](/.gitee/image/common/mall-preview.png)
 
+### 会员中心
+
+|  | 功能 | 描述 |
+| --- | --- | --- |
+| 🚀 | 会员管理 | 会员是 C 端的消费者，该功能用于会员的搜索与管理 |
+| 🚀 | 会员标签 | 对会员的标签进行创建、查询、修改、删除等操作 |
+| 🚀 | 会员等级 | 对会员的等级、成长值进行管理，可用于订单折扣等会员权益 |
+| 🚀 | 会员分组 | 对会员进行分组，用于用户画像、内容推送等运营手段 |
+| 🚀 | 积分签到 | 回馈给签到、消费等行为的积分，会员可订单抵现、积分兑换等途径消耗 |
+
 ### ERP 系统
 
 演示地址：<https://doc.iocoder.cn/erp-preview/>
 
 ![功能图](/.gitee/image/common/erp-feature.png)
 
+### WMS 系统
+
+演示地址：<https://doc.iocoder.cn/wms-preview/>
+
+![功能图](/.gitee/image/common/wms-feature.png)
+
+![预览图](/.gitee/image/common/wms-preview.png)
+
 ### CRM 系统
 
 演示地址：<https://doc.iocoder.cn/crm-preview/>
 
 ![功能图](/.gitee/image/common/crm-feature.png)
 
+### MES 系统
+
+演示地址：<https://doc.iocoder.cn/mes-preview/>
+
+![功能图](/.gitee/image/common/mes-feature.png)
+
+![功能图](/.gitee/image/common/mes-preview.png)
+
 ### AI 大模型
 
 演示地址：<https://doc.iocoder.cn/ai-preview/>
@@ -238,3 +264,23 @@
 ![功能图](/.gitee/image/common/ai-feature.png)
 
 ![功能图](/.gitee/image/common/ai-preview.gif)
+
+### IoT 物联网
+
+演示地址：<https://doc.iocoder.cn/iot/build>
+
+![功能图](/.gitee/image/common/iot-feature.png)
+
+![预览图](/.gitee/image/common/iot-preview.png)
+
+### IM 即时通讯
+
+演示地址（Vue3 + Vben5）：<http://dashboard-vben.yudao.iocoder.cn>
+
+使用文档：<https://doc.iocoder.cn/im-preview/>
+
+![功能图](/.gitee/image/common/im-feature.png)
+
+| 聊天界面 | 聊天管理 |
+| --- | --- |
+| ![聊天界面](/.gitee/image/common/im-preview-home.png) | ![聊天管理](/.gitee/image/common/im-preview-manager.png) |

apps/web-antd/index.html

@@ -12,7 +12,7 @@
       content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=0"
     />
     <!-- 由 vite 注入 VITE_APP_TITLE 变量，在 .env 文件内配置 -->
-    <title><%= VITE_APP_TITLE %></title>
+    <title>%VITE_APP_TITLE%</title>
     <link rel="icon" href="/favicon.ico" />
     <script>
       var HM_ID = '<%= VITE_APP_BAIDU_CODE %>';

apps/web-antd/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vben/web-antd",
-  "version": "5.5.9",
+  "version": "5.7.0",
   "homepage": "https://vben.pro",
   "bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
   "repository": {
@@ -54,12 +54,14 @@
     "camunda-bpmn-moddle": "catalog:",
     "cropperjs": "catalog:",
     "dayjs": "catalog:",
+    "dhtmlx-gantt": "catalog:",
     "diagram-js": "catalog:",
     "fast-xml-parser": "catalog:",
     "highlight.js": "catalog:",
     "pinia": "catalog:",
     "steady-xml": "catalog:",
     "tinymce": "catalog:",
+    "tyme4ts": "catalog:",
     "video.js": "catalog:",
     "vue": "catalog:",
     "vue-dompurify-html": "catalog:",

apps/web-antd/postcss.config.mjs

@@ -1 +0,0 @@
-export { default } from '@vben/tailwind-config/postcss';

apps/web-antd/public/tinymce/tinymce.d.ts

@@ -2537,12 +2537,12 @@ interface EditorSelection {
     normalize: () => Range;
     selectorChanged: (selector: string, callback: (active: boolean, args: {
         node: Node;
-        selector: String;
+        selector: string;
         parents: Node[];
     }) => void) => EditorSelection;
     selectorChangedWithUnbind: (selector: string, callback: (active: boolean, args: {
         node: Node;
-        selector: String;
+        selector: string;
         parents: Node[];
     }) => void) => {
         unbind: () => void;
@@ -3217,9 +3217,9 @@ interface Tools {
         <T, R>(arr: ArrayLike<T> | null | undefined, cb: ArrayCallback<T, R>): R[];
         <T, R>(obj: Record<string, T> | null | undefined, cb: ObjCallback<T, R>): R[];
     };
-    extend: (obj: Object, ext: Object, ...objs: Object[]) => any;
+    extend: (obj: object, ext: object, ...objs: object[]) => any;
     walk: <T extends Record<string, any>>(obj: T, f: WalkCallback<T>, n?: keyof T, scope?: any) => void;
-    resolve: (path: string, o?: Object) => any;
+    resolve: (path: string, o?: object) => any;
     explode: (s: string | string[], d?: string | RegExp) => string[];
     _addCacheSuffix: (url: string) => string;
 }

apps/web-antd/src/adapter/component/index.ts

@@ -6,14 +6,39 @@
 /* eslint-disable vue/one-component-per-file */
 
 import type {
+  AutoCompleteProps,
+  ButtonProps,
+  CascaderProps,
+  CheckboxGroupProps,
+  CheckboxProps,
+  DatePickerProps,
+  DividerProps,
+  InputNumberProps,
+  InputProps,
+  MentionsProps,
+  RadioGroupProps,
+  RadioProps,
+  RateProps,
+  SelectProps,
+  SpaceProps,
+  SwitchProps,
+  TextAreaProps,
+  TimePickerProps,
+  TreeSelectProps,
   UploadChangeParam,
   UploadFile,
   UploadProps,
 } from 'ant-design-vue';
+import type { RangePickerProps } from 'ant-design-vue/es/date-picker';
 
 import type { Component, Ref } from 'vue';
 
-import type { BaseFormComponentType } from '@vben/common-ui';
+import type {
+  ApiComponentSharedProps,
+  BaseFormComponentType,
+  IconPickerProps,
+} from '@vben/common-ui';
+import type { Sortable } from '@vben/hooks';
 import type { Recordable } from '@vben/types';
 
 import {
@@ -21,6 +46,9 @@ import {
   defineAsyncComponent,
   defineComponent,
   h,
+  nextTick,
+  onMounted,
+  onUnmounted,
   ref,
   render,
   unref,
@@ -33,6 +61,7 @@ import {
   IconPicker,
   VCropper,
 } from '@vben/common-ui';
+import { useSortable } from '@vben/hooks';
 import { IconifyIcon } from '@vben/icons';
 import { $t } from '@vben/locales';
 import { isEmpty } from '@vben/utils';
@@ -41,6 +70,15 @@ import { message, Modal, notification } from 'ant-design-vue';
 
 import { Tinymce as RichTextarea } from '#/components/tinymce';
 import { FileUpload, ImageUpload } from '#/components/upload';
+type AdapterUploadProps = UploadProps & {
+  aspectRatio?: string;
+  crop?: boolean;
+  draggable?: boolean;
+  handleChange?: (event: UploadChangeParam) => void;
+  maxSize?: number;
+  onDragSort?: (oldIndex: number, newIndex: number) => void;
+  onHandleChange?: (event: UploadChangeParam) => void;
+};
 
 const AutoComplete = defineAsyncComponent(
   () => import('ant-design-vue/es/auto-complete'),
@@ -98,8 +136,8 @@ const PreviewGroup = defineAsyncComponent(() =>
   import('ant-design-vue/es/image').then((res) => res.ImagePreviewGroup),
 );
 
-const withDefaultPlaceholder = <T extends Component>(
+const withDefaultPlaceholder = (
-  component: T,
+  component: Component,
   type: 'input' | 'select',
   componentProps: Recordable<any> = {},
 ) => {
@@ -132,260 +170,261 @@ const withDefaultPlaceholder = <T extends Component>(
   });
 };
 
-const withPreviewUpload = () => {
+const IMAGE_EXTENSIONS = new Set([
-  // 检查是否为图片文件的辅助函数
+  'bmp',
-  const isImageFile = (file: UploadFile): boolean => {
+  'gif',
-    const imageExtensions = new Set([
+  'jpeg',
-      'bmp',
+  'jpg',
-      'gif',
+  'png',
-      'jpeg',
+  'svg',
-      'jpg',
+  'webp',
-      'png',
+]);
-      'svg',
+
-      'webp',
+/**
-    ]);
+ * 检查是否为图片文件
-    if (file.url) {
+ */
-      try {
+function isImageFile(file: UploadFile): boolean {
-        const pathname = new URL(file.url, 'http://localhost').pathname;
+  if (file.url) {
-        const ext = pathname.split('.').pop()?.toLowerCase();
+    try {
-        return ext ? imageExtensions.has(ext) : false;
+      const pathname = new URL(file.url, 'http://localhost').pathname;
-      } catch {
+      const ext = pathname.split('.').pop()?.toLowerCase();
-        const ext = file.url?.split('.').pop()?.toLowerCase();
+      return ext ? IMAGE_EXTENSIONS.has(ext) : false;
-        return ext ? imageExtensions.has(ext) : false;
+    } catch {
-      }
+      const ext = file.url?.split('.').pop()?.toLowerCase();
+      return ext ? IMAGE_EXTENSIONS.has(ext) : false;
     }
-    if (!file.type) {
+  }
-      const ext = file.name?.split('.').pop()?.toLowerCase();
+  if (!file.type) {
-      return ext ? imageExtensions.has(ext) : false;
+    const ext = file.name?.split('.').pop()?.toLowerCase();
-    }
+    return ext ? IMAGE_EXTENSIONS.has(ext) : false;
-    return file.type.startsWith('image/');
+  }
+  return file.type.startsWith('image/');
+}
+
+/**
+ * 创建默认的上传按钮插槽
+ */
+function createDefaultUploadSlots(listType: string, placeholder: string) {
+  if (listType === 'picture-card') {
+    return { default: () => placeholder };
+  }
+  return {
+    default: () =>
+      h(
+        Button,
+        {
+          icon: h(IconifyIcon, {
+            icon: 'ant-design:upload-outlined',
+            class: 'mb-1 size-4',
+          }),
+        },
+        () => placeholder,
+      ),
   };
-  // 创建默认的上传按钮插槽
+}
-  const createDefaultSlotsWithUpload = (
+
-    listType: string,
+/**
-    placeholder: string,
+ * 获取文件的 Base64
-  ) => {
+ */
-    switch (listType) {
+function getBase64(file: File): Promise<string> {
-      case 'picture-card': {
+  return new Promise((resolve, reject) => {
-        return {
+    const reader = new FileReader();
-          default: () => placeholder,
+    reader.readAsDataURL(file);
-        };
+    reader.addEventListener('load', () => resolve(reader.result as string));
-      }
+    reader.addEventListener('error', reject);
-      default: {
+  });
-        return {
+}
-          default: () =>
+
-            h(
+/**
-              Button,
+ * 预览图片
-              {
+ */
-                icon: h(IconifyIcon, {
+async function previewImage(
-                  icon: 'ant-design:upload-outlined',
+  file: UploadFile,
-                  class: 'mb-1 size-4',
+  visible: Ref<boolean>,
-                }),
+  fileList: Ref<UploadProps['fileList']>,
+) {
+  // 非图片文件直接打开链接
+  if (!isImageFile(file)) {
+    const url = file.url || file.preview;
+    if (url) {
+      window.open(url, '_blank');
+    } else {
+      message.error($t('ui.formRules.previewWarning'));
+    }
+    return;
+  }
+
+  const [ImageComponent, PreviewGroupComponent] = await Promise.all([
+    Image,
+    PreviewGroup,
+  ]);
+
+  // 过滤图片文件并生成预览
+  const imageFiles = (unref(fileList) || []).filter((f) => isImageFile(f));
+
+  for (const imgFile of imageFiles) {
+    if (!imgFile.url && !imgFile.preview && imgFile.originFileObj) {
+      imgFile.preview = await getBase64(imgFile.originFileObj);
+    }
+  }
+
+  const container = document.createElement('div');
+  document.body.append(container);
+  let isUnmounted = false;
+
+  const currentIndex = imageFiles.findIndex((f) => f.uid === file.uid);
+
+  const PreviewWrapper = {
+    setup() {
+      return () => {
+        if (isUnmounted) return null;
+        return h(
+          PreviewGroupComponent,
+          {
+            class: 'hidden',
+            preview: {
+              visible: visible.value,
+              current: currentIndex,
+              onVisibleChange: (value: boolean) => {
+                visible.value = value;
+                if (!value) {
+                  setTimeout(() => {
+                    if (!isUnmounted && container) {
+                      isUnmounted = true;
+                      render(null, container);
+                      container.remove();
+                    }
+                  }, 300);
+                }
               },
-              () => placeholder,
+            },
+          },
+          () =>
+            imageFiles.map((imgFile) =>
+              h(ImageComponent, {
+                key: imgFile.uid,
+                src: imgFile.url || imgFile.preview,
+              }),
             ),
-        };
+        );
-      }
+      };
-    }
+    },
   };
-  // 构建预览图片组
-  const previewImage = async (
-    file: UploadFile,
-    visible: Ref<boolean>,
-    fileList: Ref<UploadProps['fileList']>,
-  ) => {
-    // 如果当前文件不是图片，直接打开
-    if (!isImageFile(file)) {
-      if (file.url) {
-        window.open(file.url, '_blank');
-      } else if (file.preview) {
-        window.open(file.preview, '_blank');
-      } else {
-        message.error($t('ui.formRules.previewWarning'));
-      }
-      return;
-    }
 
-    // 对于图片文件，继续使用预览组
+  render(h(PreviewWrapper), container);
-    const [ImageComponent, PreviewGroupComponent] = await Promise.all([
+}
-      Image,
-      PreviewGroup,
-    ]);
 
-    const getBase64 = (file: File) => {
+/**
-      return new Promise((resolve, reject) => {
+ * 图片裁剪操作
-        const reader = new FileReader();
+ */
-        reader.readAsDataURL(file);
+function cropImage(file: File, aspectRatio: string | undefined) {
-        reader.addEventListener('load', () => resolve(reader.result));
+  return new Promise<Blob | string | undefined>((resolve, reject) => {
-        reader.addEventListener('error', (error) => reject(error));
+    const container = document.createElement('div');
-      });
-    };
-    // 从fileList中过滤出所有图片文件
-    const imageFiles = (unref(fileList) || []).filter((element) =>
-      isImageFile(element),
-    );
-
-    // 为所有没有预览地址的图片生成预览
-    for (const imgFile of imageFiles) {
-      if (!imgFile.url && !imgFile.preview && imgFile.originFileObj) {
-        imgFile.preview = (await getBase64(imgFile.originFileObj)) as string;
-      }
-    }
-    const container: HTMLElement | null = document.createElement('div');
     document.body.append(container);
 
-    // 用于追踪组件是否已卸载
     let isUnmounted = false;
+    let objectUrl: null | string = null;
 
-    const PreviewWrapper = {
+    const open = ref<boolean>(true);
+    const cropperRef = ref<InstanceType<typeof VCropper> | null>(null);
+
+    const closeModal = () => {
+      open.value = false;
+      setTimeout(() => {
+        if (!isUnmounted && container) {
+          if (objectUrl) {
+            URL.revokeObjectURL(objectUrl);
+          }
+          isUnmounted = true;
+          render(null, container);
+          container.remove();
+        }
+      }, 300);
+    };
+
+    const CropperWrapper = {
       setup() {
         return () => {
           if (isUnmounted) return null;
+          if (!objectUrl) {
+            objectUrl = URL.createObjectURL(file);
+          }
           return h(
-            PreviewGroupComponent,
+            Modal,
             {
-              class: 'hidden',
+              open: open.value,
-              preview: {
+              title: h('div', {}, [
-                visible: visible.value,
+                $t('ui.crop.title'),
-                // 设置初始显示的图片索引
+                h(
-                current: imageFiles.findIndex((f) => f.uid === file.uid),
+                  'span',
-                onVisibleChange: (value: boolean) => {
+                  {
-                  visible.value = value;
+                    class: `${aspectRatio ? '' : 'hidden'} ml-2 text-sm text-gray-400 font-normal`,
-                  if (!value) {
+                  },
-                    // 延迟清理，确保动画完成
+                  $t('ui.crop.titleTip', [aspectRatio]),
-                    setTimeout(() => {
+                ),
-                      if (!isUnmounted && container) {
+              ]),
-                        isUnmounted = true;
+              centered: true,
-                        render(null, container);
+              width: 548,
-                        container.remove();
+              keyboard: false,
-                      }
+              maskClosable: false,
-                    }, 300);
+              closable: false,
+              cancelText: $t('common.cancel'),
+              okText: $t('ui.crop.confirm'),
+              destroyOnClose: true,
+              onOk: async () => {
+                const cropper = cropperRef.value;
+                if (!cropper) {
+                  reject(new Error('Cropper not found'));
+                  closeModal();
+                  return;
+                }
+                try {
+                  const dataUrl = await cropper.getCropImage();
+                  if (dataUrl) {
+                    resolve(dataUrl);
+                  } else {
+                    reject(new Error($t('ui.crop.errorTip')));
                   }
-                },
+                } catch {
+                  reject(new Error($t('ui.crop.errorTip')));
+                } finally {
+                  closeModal();
+                }
+              },
+              onCancel() {
+                resolve('');
+                closeModal();
               },
             },
             () =>
-              // 渲染所有图片文件
+              h(VCropper, {
-              imageFiles.map((imgFile) =>
+                ref: (ref: any) => (cropperRef.value = ref),
-                h(ImageComponent, {
+                img: objectUrl as string,
-                  key: imgFile.uid,
+                aspectRatio,
-                  src: imgFile.url || imgFile.preview,
+              }),
-                }),
-              ),
           );
         };
       },
     };
 
-    render(h(PreviewWrapper), container);
+    render(h(CropperWrapper), container);
-  };
+  });
-
+}
-  // 图片裁剪操作
-  const cropImage = (file: File, aspectRatio: string | undefined) => {
-    return new Promise((resolve, reject) => {
-      const container: HTMLElement | null = document.createElement('div');
-      document.body.append(container);
-
-      // 用于追踪组件是否已卸载
-      let isUnmounted = false;
-      let objectUrl: null | string = null;
-
-      const open = ref<boolean>(true);
-      const cropperRef = ref<InstanceType<typeof VCropper> | null>(null);
-
-      const closeModal = () => {
-        open.value = false;
-        // 延迟清理，确保动画完成
-        setTimeout(() => {
-          if (!isUnmounted && container) {
-            if (objectUrl) {
-              URL.revokeObjectURL(objectUrl);
-            }
-            isUnmounted = true;
-            render(null, container);
-            container.remove();
-          }
-        }, 300);
-      };
-
-      const CropperWrapper = {
-        setup() {
-          return () => {
-            if (isUnmounted) return null;
-            if (!objectUrl) {
-              objectUrl = URL.createObjectURL(file);
-            }
-            return h(
-              Modal,
-              {
-                open: open.value,
-                title: h('div', {}, [
-                  $t('ui.crop.title'),
-                  h(
-                    'span',
-                    {
-                      class: `${aspectRatio ? '' : 'hidden'} ml-2 text-sm text-gray-400 font-normal`,
-                    },
-                    $t('ui.crop.titleTip', [aspectRatio]),
-                  ),
-                ]),
-                centered: true,
-                width: 548,
-                keyboard: false,
-                maskClosable: false,
-                closable: false,
-                cancelText: $t('common.cancel'),
-                okText: $t('ui.crop.confirm'),
-                destroyOnClose: true,
-                onOk: async () => {
-                  const cropper = cropperRef.value;
-                  if (!cropper) {
-                    reject(new Error('Cropper not found'));
-                    closeModal();
-                    return;
-                  }
-                  try {
-                    const dataUrl = await cropper.getCropImage();
-                    resolve(dataUrl);
-                  } catch {
-                    reject(new Error($t('ui.crop.errorTip')));
-                  } finally {
-                    closeModal();
-                  }
-                },
-                onCancel() {
-                  resolve('');
-                  closeModal();
-                },
-              },
-              () =>
-                h(VCropper, {
-                  ref: (ref: any) => (cropperRef.value = ref),
-                  img: objectUrl as string,
-                  aspectRatio,
-                }),
-            );
-          };
-        },
-      };
-
-      render(h(CropperWrapper), container);
-    });
-  };
 
+/**
+ * 带预览功能的上传组件
+ */
+const withPreviewUpload = () => {
   return defineComponent({
     name: Upload.name,
     emits: ['update:modelValue'],
-    setup: (
+    setup(
       props: any,
       { attrs, slots, emit }: { attrs: any; emit: any; slots: any },
-    ) => {
+    ) {
       const previewVisible = ref<boolean>(false);
-
+      const placeholder = attrs?.placeholder || $t('ui.placeholder.upload');
-      const placeholder = attrs?.placeholder || $t(`ui.placeholder.upload`);
-
       const listType = attrs?.listType || attrs?.['list-type'] || 'text';
-
       const fileList = ref<UploadProps['fileList']>(
         attrs?.fileList || attrs?.['file-list'] || [],
       );
@@ -399,12 +438,14 @@ const withPreviewUpload = () => {
         file: UploadFile,
         originFileList: Array<File>,
       ) => {
+        // 文件大小限制
         if (maxSize.value && (file.size || 0) / 1024 / 1024 > maxSize.value) {
           message.error($t('ui.formRules.sizeLimit', [maxSize.value]));
           file.status = 'removed';
           return false;
         }
-        // 多选或者非图片不唤起裁剪框
+
+        // 图片裁剪处理
         if (
           attrs.crop &&
           !attrs.multiple &&
@@ -412,14 +453,11 @@ const withPreviewUpload = () => {
           isImageFile(file)
         ) {
           file.status = 'removed';
-          // antd Upload组件问题 file参数获取的是UploadFile类型对象无法取到File类型 所以通过originFileList[0]获取
           const blob = await cropImage(originFileList[0], aspectRatio.value);
-          return new Promise((resolve, reject) => {
+          if (!blob) {
-            if (!blob) {
+            throw new Error($t('ui.crop.errorTip'));
-              return reject(new Error($t('ui.crop.errorTip')));
+          }
-            }
+          return blob;
-            resolve(blob);
-          });
         }
 
         return attrs.beforeUpload?.(file) ?? true;
@@ -427,12 +465,9 @@ const withPreviewUpload = () => {
 
       const handleChange = (event: UploadChangeParam) => {
         try {
-          // 行内写法 handleChange: (event) => {}
           attrs.handleChange?.(event);
-          // template写法 @handle-change="(event) => {}"
           attrs.onHandleChange?.(event);
         } catch (error) {
-          // Avoid breaking internal v-model sync on user handler errors
           console.error(error);
         }
         fileList.value = event.fileList.filter(
@@ -449,21 +484,88 @@ const withPreviewUpload = () => {
         await previewImage(file, previewVisible, fileList);
       };
 
-      const renderUploadButton = (): any => {
+      const renderUploadButton = () => {
-        const isDisabled = attrs.disabled;
+        if (attrs.disabled) return null;
-
-        // 如果禁用，不渲染上传按钮
-        if (isDisabled) {
-          return null;
-        }
-
-        // 否则渲染默认上传按钮
         return isEmpty(slots)
-          ? createDefaultSlotsWithUpload(listType, placeholder)
+          ? createDefaultUploadSlots(listType, placeholder)
           : slots;
       };
 
-      // 可以监听到表单API设置的值
+      // 拖拽排序
+      const draggable = computed(
+        () => (attrs.draggable ?? false) && !attrs.disabled,
+      );
+      const uploadId = `upload-${Date.now()}-${Math.random().toString(36).slice(2, 9)}`;
+      const sortableInstance = ref<null | Sortable>(null);
+
+      const styleId = `upload-drag-style-${uploadId}`;
+
+      function injectDragStyle() {
+        if (!document.querySelector(`[id="${styleId}"]`)) {
+          const style = document.createElement('style');
+          style.id = styleId;
+          style.textContent = `
+            [data-upload-id="${uploadId}"] .ant-upload-list-item { cursor: move; }
+            [data-upload-id="${uploadId}"] .ant-upload-list-item:hover { box-shadow: 0 2px 8px rgba(0,0,0,0.15); }
+          `;
+          document.head.append(style);
+        }
+      }
+
+      function removeDragStyle() {
+        document.querySelector(`[id="${styleId}"]`)?.remove();
+      }
+
+      async function initSortable(retryCount = 0) {
+        if (!draggable.value) return;
+
+        injectDragStyle();
+        await nextTick();
+        await new Promise((resolve) => setTimeout(resolve, 100));
+
+        const container = document.querySelector(
+          `[data-upload-id="${uploadId}"] .ant-upload-list`,
+        ) as HTMLElement;
+
+        if (!container) {
+          if (retryCount < 5) {
+            setTimeout(() => initSortable(retryCount + 1), 200);
+          }
+          return;
+        }
+
+        const { initializeSortable } = useSortable(container, {
+          animation: 300,
+          delay: 400,
+          delayOnTouchOnly: true,
+          filter:
+            '.ant-upload-select, .ant-upload-list-item-error, .ant-upload-list-item-uploading',
+          onEnd: (evt) => {
+            const { oldIndex, newIndex } = evt;
+            if (
+              oldIndex === undefined ||
+              newIndex === undefined ||
+              oldIndex === newIndex
+            ) {
+              return;
+            }
+
+            const list = [...(fileList.value || [])];
+            const [movedItem] = list.splice(oldIndex, 1);
+            if (movedItem) {
+              list.splice(newIndex, 0, movedItem);
+              fileList.value = list;
+            }
+
+            attrs.onDragSort?.(oldIndex, newIndex);
+            emit('update:modelValue', fileList.value);
+          },
+        });
+
+        sortableInstance.value = await initializeSortable();
+      }
+
+      // 监听表单值变化
       watch(
         () => attrs.modelValue,
         (res) => {
@@ -471,18 +573,28 @@ const withPreviewUpload = () => {
         },
       );
 
+      onMounted(initSortable);
+      onUnmounted(() => {
+        sortableInstance.value?.destroy();
+        removeDragStyle();
+      });
+
       return () =>
         h(
-          Upload,
+          'div',
-          {
+          { 'data-upload-id': uploadId, class: 'w-full' },
-            ...props,
+          h(
-            ...attrs,
+            Upload,
-            fileList: fileList.value,
+            {
-            beforeUpload: handleBeforeUpload,
+              ...props,
-            onChange: handleChange,
+              ...attrs,
-            onPreview: handlePreview,
+              fileList: fileList.value,
-          },
+              beforeUpload: handleBeforeUpload,
-          renderUploadButton(),
+              onChange: handleChange,
+              onPreview: handlePreview,
+            },
+            renderUploadButton() as any,
+          ),
         );
     },
   });
@@ -523,6 +635,39 @@ export type ComponentType =
   | 'Upload'
   | BaseFormComponentType;
 
+/**
+ * 与 {@link ComponentType} 中注册的组件名一一对应，便于 Schema 上 `component` + `componentProps` 联动提示
+ */
+export interface ComponentPropsMap {
+  ApiCascader: ApiComponentSharedProps & CascaderProps;
+  ApiSelect: ApiComponentSharedProps & SelectProps;
+  ApiTreeSelect: ApiComponentSharedProps & TreeSelectProps;
+  AutoComplete: AutoCompleteProps;
+  Cascader: CascaderProps;
+  Checkbox: CheckboxProps;
+  CheckboxGroup: CheckboxGroupProps;
+  DatePicker: DatePickerProps;
+  DefaultButton: ButtonProps;
+  Divider: DividerProps;
+  IconPicker: IconPickerProps;
+  Input: InputProps;
+  InputNumber: InputNumberProps;
+  InputPassword: InputProps;
+  Mentions: MentionsProps;
+  PrimaryButton: ButtonProps;
+  Radio: RadioProps;
+  RadioGroup: RadioGroupProps;
+  RangePicker: RangePickerProps;
+  Rate: RateProps;
+  Select: SelectProps;
+  Space: SpaceProps;
+  Switch: SwitchProps;
+  Textarea: TextAreaProps;
+  TimePicker: TimePickerProps;
+  TreeSelect: TreeSelectProps;
+  Upload: AdapterUploadProps;
+}
+
 async function initComponentAdapter() {
   const components: Partial<Record<ComponentType, Component>> = {
     // 如果你的组件体积比较大，可以使用异步加载
@@ -566,7 +711,9 @@ async function initComponentAdapter() {
       modelValueProp: 'value',
     }),
     Input: withDefaultPlaceholder(Input, 'input'),
-    InputNumber: withDefaultPlaceholder(InputNumber, 'input'),
+    InputNumber: withDefaultPlaceholder(InputNumber, 'input', {
+      style: { width: '100%' },
+    }),
     InputPassword: withDefaultPlaceholder(InputPassword, 'input'),
     Mentions: withDefaultPlaceholder(Mentions, 'input'),
     // 自定义主要按钮

apps/web-antd/src/adapter/form.ts

@@ -1,9 +1,9 @@
 import type {
+  VbenFormProps as FormProps,
   VbenFormSchema as FormSchema,
-  VbenFormProps,
 } from '@vben/common-ui';
 
-import type { ComponentType } from './component';
+import type { ComponentPropsMap, ComponentType } from './component';
 
 import { setupVbenForm, useVbenForm as useForm, z } from '@vben/common-ui';
 import { $t } from '@vben/locales';
@@ -61,9 +61,10 @@ async function initSetupVbenForm() {
   });
 }
 
-const useVbenForm = useForm<ComponentType>;
+const useVbenForm = useForm<ComponentType, ComponentPropsMap>;
 
 export { initSetupVbenForm, useVbenForm, z };
 
-export type VbenFormSchema = FormSchema<ComponentType>;
+export type VbenFormApi = ReturnType<typeof useVbenForm>[1]; // add by 芋艿：用于 data.ts 表单 schema 内调用 setFieldValue
-export type { VbenFormProps };
+export type VbenFormSchema = FormSchema<ComponentType, ComponentPropsMap>;
+export type VbenFormProps = FormProps<ComponentType, ComponentPropsMap>;

apps/web-antd/src/adapter/vxe-table.ts

@@ -1,6 +1,8 @@
 import type { VxeTableGridOptions } from '@vben/plugins/vxe-table';
 import type { Recordable } from '@vben/types';
 
+import type { ComponentPropsMap, ComponentType } from './component';
+
 import { h } from 'vue';
 
 import { IconifyIcon } from '@vben/icons';
@@ -10,7 +12,7 @@ import {
   AsyncVxeTable,
   createRequiredValidation,
   setupVbenVxeTable,
-  useVbenVxeGrid,
+  useVbenVxeGrid as useGrid,
 } from '@vben/plugins/vxe-table';
 import {
   erpCountInputFormatter,
@@ -199,7 +201,7 @@ setupVbenVxeTable({
     vxeUI.renderer.add('CellOperation', {
       renderTableDefault({ attrs, options, props }, { column, row }) {
         const defaultProps = { size: 'small', type: 'link', ...props };
-        let align = 'end';
+        let align: string;
         switch (column.align) {
           case 'center': {
             align = 'center';
@@ -363,10 +365,13 @@ setupVbenVxeTable({
   useVbenForm,
 });
 
-export { createRequiredValidation, useVbenVxeGrid };
+export { createRequiredValidation };
 
 export const [VxeTable, VxeColumn] = [AsyncVxeTable, AsyncVxeColumn];
 
 export * from '#/components/table-action';
+export const useVbenVxeGrid = <T extends Record<string, any>>(
+  ...rest: Parameters<typeof useGrid<T, ComponentType, ComponentPropsMap>>
+) => useGrid<T, ComponentType, ComponentPropsMap>(...rest);
 
 export type * from '@vben/plugins/vxe-table';

apps/web-antd/src/api/bpm/oa/leave/index.ts

@@ -21,11 +21,6 @@ export async function createLeave(data: BpmOALeaveApi.Leave) {
   return requestClient.post('/bpm/oa/leave/create', data);
 }
 
-/** 更新请假申请 */
-export async function updateLeave(data: BpmOALeaveApi.Leave) {
-  return requestClient.post('/bpm/oa/leave/update', data);
-}
-
 /** 获得请假申请 */
 export async function getLeave(id: number) {
   return requestClient.get<BpmOALeaveApi.Leave>(`/bpm/oa/leave/get?id=${id}`);

apps/web-antd/src/api/crm/customer/limitConfig/index.ts

@@ -16,10 +16,10 @@ export namespace CrmCustomerLimitConfigApi {
 
 /** 客户限制配置类型 */
 export enum LimitConfType {
-  /** 锁定客户数限制 */
-  CUSTOMER_LOCK_LIMIT = 2,
   /** 拥有客户数限制 */
   CUSTOMER_QUANTITY_LIMIT = 1,
+  /** 锁定客户数限制 */
+  CUSTOMER_LOCK_LIMIT = 2,
 }
 
 /** 查询客户限制配置列表 */

apps/web-antd/src/api/crm/permission/index.ts

@@ -35,11 +35,11 @@ export namespace CrmPermissionApi {
  * CRM 业务类型枚举
  */
 export enum BizTypeEnum {
-  CRM_BUSINESS = 4, // 商机
   CRM_CLUE = 1, // 线索
-  CRM_CONTACT = 3, // 联系人
-  CRM_CONTRACT = 5, // 合同
   CRM_CUSTOMER = 2, // 客户
+  CRM_CONTACT = 3, // 联系人
+  CRM_BUSINESS = 4, // 商机
+  CRM_CONTRACT = 5, // 合同
   CRM_PRODUCT = 6, // 产品
   CRM_RECEIVABLE = 7, // 回款
   CRM_RECEIVABLE_PLAN = 8, // 回款计划

apps/web-antd/src/api/crm/receivable/plan/index.ts

@@ -29,6 +29,10 @@ export namespace CrmReceivablePlanApi {
       returnTime: Date;
     };
   }
+  export interface PlanPageParam extends PageParam {
+    customerId?: number;
+    contractId?: number;
+  }
 }
 
 /** 查询回款计划列表 */

apps/web-antd/src/api/iot/alert/config/index.ts

@@ -3,37 +3,24 @@ import type { PageParam, PageResult } from '@vben/request';
 import { requestClient } from '#/api/request';
 
 export namespace AlertConfigApi {
-  /** IoT 告警配置 VO */
+  /** IoT 告警配置 */
   export interface AlertConfig {
     id?: number;
-    name: string;
+    name?: string;
     description?: string;
     level?: number;
     status?: number;
     sceneRuleIds?: number[];
     receiveUserIds?: number[];
-    receiveUserNames?: string;
+    receiveUserNames?: string[];
     receiveTypes?: number[];
+    smsTemplateCode?: string;
+    mailTemplateCode?: string;
+    notifyTemplateCode?: string;
     createTime?: Date;
-    updateTime?: Date;
   }
 }
 
-/** IoT 告警配置 */
-export interface AlertConfig {
-  id?: number;
-  name?: string;
-  description?: string;
-  level?: number;
-  status?: number;
-  sceneRuleIds?: number[];
-  receiveUserIds?: number[];
-  receiveUserNames?: string;
-  receiveTypes?: number[];
-  createTime?: Date;
-  updateTime?: Date;
-}
-
 /** 查询告警配置分页 */
 export function getAlertConfigPage(params: PageParam) {
   return requestClient.get<PageResult<AlertConfigApi.AlertConfig>>(
@@ -49,20 +36,20 @@ export function getAlertConfig(id: number) {
   );
 }
 
-/** 查询所有告警配置列表 */
+/** 获取告警配置简单列表 */
-export function getAlertConfigList() {
+export function getSimpleAlertConfigList() {
   return requestClient.get<AlertConfigApi.AlertConfig[]>(
-    '/iot/alert-config/list',
+    '/iot/alert-config/simple-list',
   );
 }
 
 /** 新增告警配置 */
-export function createAlertConfig(data: AlertConfig) {
+export function createAlertConfig(data: AlertConfigApi.AlertConfig) {
   return requestClient.post('/iot/alert-config/create', data);
 }
 
 /** 修改告警配置 */
-export function updateAlertConfig(data: AlertConfig) {
+export function updateAlertConfig(data: AlertConfigApi.AlertConfig) {
   return requestClient.put('/iot/alert-config/update', data);
 }
 
@@ -70,25 +57,3 @@ export function updateAlertConfig(data: AlertConfig) {
 export function deleteAlertConfig(id: number) {
   return requestClient.delete(`/iot/alert-config/delete?id=${id}`);
 }
-
-/** 批量删除告警配置 */
-export function deleteAlertConfigList(ids: number[]) {
-  return requestClient.delete('/iot/alert-config/delete-list', {
-    params: { ids: ids.join(',') },
-  });
-}
-
-/** 启用/禁用告警配置 */
-export function toggleAlertConfig(id: number, enabled: boolean) {
-  return requestClient.put(`/iot/alert-config/toggle`, {
-    id,
-    enabled,
-  });
-}
-
-/** 获取告警配置简单列表 */
-export function getSimpleAlertConfigList() {
-  return requestClient.get<AlertConfigApi.AlertConfig[]>(
-    '/iot/alert-config/simple-list',
-  );
-}

apps/web-antd/src/api/iot/alert/record/index.ts

@@ -3,41 +3,21 @@ import type { PageParam, PageResult } from '@vben/request';
 import { requestClient } from '#/api/request';
 
 export namespace AlertRecordApi {
-  /** IoT 告警记录 VO */
+  /** IoT 告警记录 */
   export interface AlertRecord {
     id?: number;
     configId?: number;
     configName?: string;
     configLevel?: number;
     deviceId?: number;
-    deviceName?: string;
     productId?: number;
-    productName?: string;
+    deviceMessage?: any;
-    deviceMessage?: string;
     processStatus?: boolean;
     processRemark?: string;
-    processTime?: Date;
     createTime?: Date;
   }
 }
 
-/** IoT 告警记录 */
-export interface AlertRecord {
-  id?: number;
-  configId?: number;
-  configName?: string;
-  configLevel?: number;
-  deviceId?: number;
-  deviceName?: string;
-  productId?: number;
-  productName?: string;
-  deviceMessage?: string;
-  processStatus?: boolean;
-  processRemark?: string;
-  processTime?: Date;
-  createTime?: Date;
-}
-
 /** 查询告警记录分页 */
 export function getAlertRecordPage(params: PageParam) {
   return requestClient.get<PageResult<AlertRecordApi.AlertRecord>>(
@@ -54,29 +34,9 @@ export function getAlertRecord(id: number) {
 }
 
 /** 处理告警记录 */
-export function processAlertRecord(id: number, remark?: string) {
+export function processAlertRecord(id: number, processRemark?: string) {
   return requestClient.put('/iot/alert-record/process', {
     id,
-    remark,
+    processRemark,
-  });
-}
-
-/** 批量处理告警记录 */
-export function batchProcessAlertRecord(ids: number[], remark?: string) {
-  return requestClient.put('/iot/alert-record/batch-process', {
-    ids,
-    remark,
-  });
-}
-
-/** 删除告警记录 */
-export function deleteAlertRecord(id: number) {
-  return requestClient.delete(`/iot/alert-record/delete?id=${id}`);
-}
-
-/** 批量删除告警记录 */
-export function deleteAlertRecordList(ids: number[]) {
-  return requestClient.delete('/iot/alert-record/delete-list', {
-    params: { ids: ids.join(',') },
   });
 }

apps/web-antd/src/api/iot/device/device/index.ts

@@ -150,11 +150,8 @@ export function importDeviceTemplate() {
 /** 导入设备 */
 export function importDevice(file: File, updateSupport: boolean) {
   return requestClient.upload<IotDeviceApi.DeviceImportRespVO>(
-    '/iot/device/import',
+    `/iot/device/import?updateSupport=${updateSupport}`,
-    {
+    { file },
-      file,
-      updateSupport,
-    },
   );
 }
 
@@ -168,7 +165,7 @@ export function getLatestDeviceProperties(params: any) {
 
 /** 获取设备属性历史数据 */
 export function getHistoryDevicePropertyList(params: any) {
-  return requestClient.get<PageResult<IotDeviceApi.DeviceProperty>>(
+  return requestClient.get<IotDeviceApi.DeviceProperty[]>(
     '/iot/device/property/history-list',
     { params },
   );

apps/web-antd/src/api/iot/device/modbus/config/index.ts

@@ -0,0 +1,30 @@
+import { requestClient } from '#/api/request';
+
+export namespace IotDeviceModbusConfigApi {
+  /** Modbus 连接配置 VO */
+  export interface ModbusConfig {
+    id?: number; // 主键
+    deviceId: number; // 设备编号
+    ip: string; // Modbus 服务器 IP 地址
+    port: number; // Modbus 服务器端口
+    slaveId: number; // 从站地址
+    timeout: number; // 连接超时时间，单位：毫秒
+    retryInterval: number; // 重试间隔，单位：毫秒
+    mode: number; // 模式
+    frameFormat: number; // 帧格式
+    status: number; // 状态
+  }
+}
+
+/** 获取设备的 Modbus 连接配置 */
+export function getModbusConfig(deviceId: number) {
+  return requestClient.get<IotDeviceModbusConfigApi.ModbusConfig>(
+    '/iot/device-modbus-config/get',
+    { params: { deviceId } },
+  );
+}
+
+/** 保存 Modbus 连接配置 */
+export function saveModbusConfig(data: IotDeviceModbusConfigApi.ModbusConfig) {
+  return requestClient.post('/iot/device-modbus-config/save', data);
+}

apps/web-antd/src/api/iot/device/modbus/point/index.ts

@@ -0,0 +1,52 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace IotDeviceModbusPointApi {
+  /** Modbus 点位配置 VO */
+  export interface ModbusPoint {
+    id?: number; // 主键
+    deviceId: number; // 设备编号
+    thingModelId?: number; // 物模型属性编号
+    identifier: string; // 属性标识符
+    name: string; // 属性名称
+    functionCode?: number; // Modbus 功能码
+    registerAddress?: number; // 寄存器起始地址
+    registerCount?: number; // 寄存器数量
+    byteOrder?: string; // 字节序
+    rawDataType?: string; // 原始数据类型
+    scale: number; // 缩放因子
+    pollInterval: number; // 轮询间隔，单位：毫秒
+    status: number; // 状态
+  }
+}
+
+/** 获取设备的 Modbus 点位分页 */
+export function getModbusPointPage(params: PageParam) {
+  return requestClient.get<PageResult<IotDeviceModbusPointApi.ModbusPoint>>(
+    '/iot/device-modbus-point/page',
+    { params },
+  );
+}
+
+/** 获取 Modbus 点位详情 */
+export function getModbusPoint(id: number) {
+  return requestClient.get<IotDeviceModbusPointApi.ModbusPoint>(
+    `/iot/device-modbus-point/get?id=${id}`,
+  );
+}
+
+/** 创建 Modbus 点位配置 */
+export function createModbusPoint(data: IotDeviceModbusPointApi.ModbusPoint) {
+  return requestClient.post('/iot/device-modbus-point/create', data);
+}
+
+/** 更新 Modbus 点位配置 */
+export function updateModbusPoint(data: IotDeviceModbusPointApi.ModbusPoint) {
+  return requestClient.put('/iot/device-modbus-point/update', data);
+}
+
+/** 删除 Modbus 点位配置 */
+export function deleteModbusPoint(id: number) {
+  return requestClient.delete(`/iot/device-modbus-point/delete?id=${id}`);
+}

apps/web-antd/src/api/iot/ota/firmware/index.ts

@@ -3,39 +3,22 @@ import type { PageParam, PageResult } from '@vben/request';
 import { requestClient } from '#/api/request';
 
 export namespace IoTOtaFirmwareApi {
-  /** IoT OTA 固件 VO */
+  /** IoT OTA 固件信息 */
   export interface Firmware {
     id?: number;
-    name: string;
+    name?: string;
-    version: string;
-    productId: number;
-    productName?: string;
     description?: string;
+    version?: string;
+    productId?: number;
+    productName?: string;
     fileUrl?: string;
-    fileMd5?: string;
     fileSize?: number;
-    status?: number;
+    fileDigestAlgorithm?: string;
+    fileDigestValue?: string;
     createTime?: Date;
-    updateTime?: Date;
   }
 }
 
-/** IoT OTA 固件 */
-export interface IoTOtaFirmware {
-  id?: number;
-  name?: string;
-  version?: string;
-  productId?: number;
-  productName?: string;
-  description?: string;
-  fileUrl?: string;
-  fileMd5?: string;
-  fileSize?: number;
-  status?: number;
-  createTime?: Date;
-  updateTime?: Date;
-}
-
 /** 查询 OTA 固件分页 */
 export function getOtaFirmwarePage(params: PageParam) {
   return requestClient.get<PageResult<IoTOtaFirmwareApi.Firmware>>(
@@ -52,12 +35,12 @@ export function getOtaFirmware(id: number) {
 }
 
 /** 新增 OTA 固件 */
-export function createOtaFirmware(data: IoTOtaFirmware) {
+export function createOtaFirmware(data: IoTOtaFirmwareApi.Firmware) {
   return requestClient.post('/iot/ota/firmware/create', data);
 }
 
 /** 修改 OTA 固件 */
-export function updateOtaFirmware(data: IoTOtaFirmware) {
+export function updateOtaFirmware(data: IoTOtaFirmwareApi.Firmware) {
   return requestClient.put('/iot/ota/firmware/update', data);
 }
 
@@ -65,26 +48,3 @@ export function updateOtaFirmware(data: IoTOtaFirmware) {
 export function deleteOtaFirmware(id: number) {
   return requestClient.delete(`/iot/ota/firmware/delete?id=${id}`);
 }
-
-/** 批量删除 OTA 固件 */
-export function deleteOtaFirmwareList(ids: number[]) {
-  return requestClient.delete('/iot/ota/firmware/delete-list', {
-    params: { ids: ids.join(',') },
-  });
-}
-
-/** 更新 OTA 固件状态 */
-export function updateOtaFirmwareStatus(id: number, status: number) {
-  return requestClient.put(`/iot/ota/firmware/update-status`, {
-    id,
-    status,
-  });
-}
-
-/** 根据产品 ID 查询固件列表 */
-export function getOtaFirmwareListByProductId(productId: number) {
-  return requestClient.get<IoTOtaFirmwareApi.Firmware[]>(
-    '/iot/ota/firmware/list-by-product-id',
-    { params: { productId } },
-  );
-}

apps/web-antd/src/api/iot/ota/task/index.ts

@@ -3,45 +3,21 @@ import type { PageParam, PageResult } from '@vben/request';
 import { requestClient } from '#/api/request';
 
 export namespace IoTOtaTaskApi {
-  /** IoT OTA 升级任务 VO */
+  /** IoT OTA 升级任务 */
   export interface Task {
     id?: number;
-    name: string;
+    name?: string;
     description?: string;
-    firmwareId: number;
+    firmwareId?: number;
-    firmwareName?: string;
+    status?: number;
-    productId?: number;
-    productName?: string;
     deviceScope?: number;
     deviceIds?: number[];
-    status?: number;
+    deviceTotalCount?: number;
-    successCount?: number;
+    deviceSuccessCount?: number;
-    failureCount?: number;
-    pendingCount?: number;
     createTime?: Date;
-    updateTime?: Date;
   }
 }
 
-/** IoT OTA 升级任务 */
-export interface OtaTask {
-  id?: number;
-  name?: string;
-  description?: string;
-  firmwareId?: number;
-  firmwareName?: string;
-  productId?: number;
-  productName?: string;
-  deviceScope?: number;
-  deviceIds?: number[];
-  status?: number;
-  successCount?: number;
-  failureCount?: number;
-  pendingCount?: number;
-  createTime?: Date;
-  updateTime?: Date;
-}
-
 /** 查询 OTA 升级任务分页 */
 export function getOtaTaskPage(params: PageParam) {
   return requestClient.get<PageResult<IoTOtaTaskApi.Task>>(
@@ -56,43 +32,11 @@ export function getOtaTask(id: number) {
 }
 
 /** 新增 OTA 升级任务 */
-export function createOtaTask(data: OtaTask) {
+export function createOtaTask(data: IoTOtaTaskApi.Task) {
   return requestClient.post('/iot/ota/task/create', data);
 }
 
-/** 修改 OTA 升级任务 */
-export function updateOtaTask(data: OtaTask) {
-  return requestClient.put('/iot/ota/task/update', data);
-}
-
-/** 删除 OTA 升级任务 */
-export function deleteOtaTask(id: number) {
-  return requestClient.delete(`/iot/ota/task/delete?id=${id}`);
-}
-
-/** 批量删除 OTA 升级任务 */
-export function deleteOtaTaskList(ids: number[]) {
-  return requestClient.delete('/iot/ota/task/delete-list', {
-    params: { ids: ids.join(',') },
-  });
-}
-
 /** 取消 OTA 升级任务 */
 export function cancelOtaTask(id: number) {
-  return requestClient.put(`/iot/ota/task/cancel?id=${id}`);
+  return requestClient.post(`/iot/ota/task/cancel?id=${id}`);
-}
-
-/** 启动 OTA 升级任务 */
-export function startOtaTask(id: number) {
-  return requestClient.put(`/iot/ota/task/start?id=${id}`);
-}
-
-/** 暂停 OTA 升级任务 */
-export function pauseOtaTask(id: number) {
-  return requestClient.put(`/iot/ota/task/pause?id=${id}`);
-}
-
-/** 恢复 OTA 升级任务 */
-export function resumeOtaTask(id: number) {
-  return requestClient.put(`/iot/ota/task/resume?id=${id}`);
 }

apps/web-antd/src/api/iot/ota/task/record/index.ts

@@ -3,44 +3,24 @@ import type { PageParam, PageResult } from '@vben/request';
 import { requestClient } from '#/api/request';
 
 export namespace IoTOtaTaskRecordApi {
-  /** IoT OTA 升级任务记录 VO */
+  /** IoT OTA 升级任务记录 */
   export interface TaskRecord {
     id?: number;
-    taskId: number;
-    taskName?: string;
-    deviceId: number;
-    deviceName?: string;
     firmwareId?: number;
-    firmwareName?: string;
     firmwareVersion?: string;
+    taskId?: number;
+    deviceId?: string;
+    deviceName?: string;
+    currentVersion?: string;
+    fromFirmwareId?: number;
+    fromFirmwareVersion?: string;
     status?: number;
     progress?: number;
-    errorMessage?: string;
+    description?: string;
-    startTime?: Date;
+    updateTime?: Date;
-    endTime?: Date;
-    createTime?: Date;
   }
 }
 
-// TODO @AI：这里应该拿到 IoTOtaTaskRecordApi 里
-/** IoT OTA 升级任务记录 */
-export interface OtaTaskRecord {
-  id?: number;
-  taskId?: number;
-  taskName?: string;
-  deviceId?: number;
-  deviceName?: string;
-  firmwareId?: number;
-  firmwareName?: string;
-  firmwareVersion?: string;
-  status?: number;
-  progress?: number;
-  errorMessage?: string;
-  startTime?: Date;
-  endTime?: Date;
-  createTime?: Date;
-}
-
 /** 查询 OTA 升级任务记录分页 */
 export function getOtaTaskRecordPage(params: PageParam) {
   return requestClient.get<PageResult<IoTOtaTaskRecordApi.TaskRecord>>(
@@ -49,48 +29,12 @@ export function getOtaTaskRecordPage(params: PageParam) {
   );
 }
 
-/** 查询 OTA 升级任务记录详情 */
+/** 取消 OTA 升级任务记录 */
-export function getOtaTaskRecord(id: number) {
-  return requestClient.get<IoTOtaTaskRecordApi.TaskRecord>(
-    `/iot/ota/task/record/get?id=${id}`,
-  );
-}
-
-/** 根据任务 ID 查询记录列表 */
-export function getOtaTaskRecordListByTaskId(taskId: number) {
-  return requestClient.get<IoTOtaTaskRecordApi.TaskRecord[]>(
-    '/iot/ota/task/record/list-by-task-id',
-    { params: { taskId } },
-  );
-}
-
-/** 根据设备 ID 查询记录列表 */
-export function getOtaTaskRecordListByDeviceId(deviceId: number) {
-  return requestClient.get<IoTOtaTaskRecordApi.TaskRecord[]>(
-    '/iot/ota/task/record/list-by-device-id',
-    { params: { deviceId } },
-  );
-}
-
-/** 根据固件 ID 查询记录列表 */
-export function getOtaTaskRecordListByFirmwareId(firmwareId: number) {
-  return requestClient.get<IoTOtaTaskRecordApi.TaskRecord[]>(
-    '/iot/ota/task/record/list-by-firmware-id',
-    { params: { firmwareId } },
-  );
-}
-
-/** 重试升级任务记录 */
-export function retryOtaTaskRecord(id: number) {
-  return requestClient.put(`/iot/ota/task/record/retry?id=${id}`);
-}
-
-/** 取消升级任务记录 */
 export function cancelOtaTaskRecord(id: number) {
   return requestClient.put(`/iot/ota/task/record/cancel?id=${id}`);
 }
 
-/** 获取升级任务记录状态统计 */
+/** 获取 OTA 升级任务记录状态统计 */
 export function getOtaTaskRecordStatusStatistics(
   firmwareId?: number,
   taskId?: number,

apps/web-antd/src/api/iot/product/category/index.ts

@@ -7,11 +7,10 @@ export namespace IotProductCategoryApi {
   export interface ProductCategory {
     id?: number; // 分类 ID
     name: string; // 分类名称
-    parentId?: number; // 父级分类 ID
     sort?: number; // 分类排序
     status?: number; // 分类状态
     description?: string; // 分类描述
-    createTime?: string; // 创建时间
+    createTime?: Date; // 创建时间
   }
 }
 

apps/web-antd/src/api/iot/product/product/index.ts

@@ -10,7 +10,7 @@ export namespace IotProductApi {
     productKey?: string; // 产品标识
     productSecret?: string; // 产品密钥
     protocolId?: number; // 协议编号
-    protocolType?: number; // 接入协议类型
+    protocolType?: string; // 协议类型
     categoryId?: number; // 产品所属品类标识符
     categoryName?: string; // 产品所属品类名称
     icon?: string; // 产品图标
@@ -19,15 +19,32 @@ export namespace IotProductApi {
     status?: number; // 产品状态
     deviceType?: number; // 设备类型
     netType?: number; // 联网方式
-    codecType?: string; // 数据格式（编解码器类型）
+    serializeType?: string; // 序列化类型
-    dataFormat?: number; // 数据格式
-    validateType?: number; // 认证方式
     registerEnabled?: boolean; // 是否开启动态注册
     deviceCount?: number; // 设备数量
     createTime?: Date; // 创建时间
   }
 }
 
+// IoT 协议类型枚举
+export enum ProtocolTypeEnum {
+  COAP = 'coap',
+  EMQX = 'emqx',
+  HTTP = 'http',
+  MODBUS_TCP_CLIENT = 'modbus_tcp_client',
+  MODBUS_TCP_SERVER = 'modbus_tcp_server',
+  MQTT = 'mqtt',
+  TCP = 'tcp',
+  UDP = 'udp',
+  WEBSOCKET = 'websocket',
+}
+
+// IoT 序列化类型枚举
+export enum SerializeTypeEnum {
+  BINARY = 'binary',
+  JSON = 'json',
+}
+
 /** 查询产品分页 */
 export function getProductPage(params: PageParam) {
   return requestClient.get<PageResult<IotProductApi.Product>>(
@@ -84,3 +101,10 @@ export function getProductByKey(productKey: string) {
     params: { productKey },
   });
 }
+
+/** 同步产品物模型 TDengine 超级表结构 */
+export function syncProductPropertyTable(productId: number) {
+  return requestClient.post(
+    `/iot/product/sync-property-table?productId=${productId}`,
+  );
+}

apps/web-antd/src/api/iot/rule/data/rule/index.ts

@@ -3,45 +3,21 @@ import type { PageParam, PageResult } from '@vben/request';
 import { requestClient } from '#/api/request';
 
 export namespace DataRuleApi {
-  /** IoT 数据流转规则 VO */
+  /** IoT 数据流转规则 */
-  export interface Rule {
+  export interface DataRule {
     id?: number;
-    name: string;
+    name?: string;
     description?: string;
     status?: number;
-    productId?: number;
+    sourceConfigs?: any[];
-    productKey?: string;
-    sourceConfigs?: SourceConfig[];
     sinkIds?: number[];
     createTime?: Date;
   }
-
-  /** IoT 数据源配置 */
-  export interface SourceConfig {
-    productId?: number;
-    productKey?: string;
-    deviceId?: number;
-    type?: string;
-    topic?: string;
-  }
-}
-
-/** IoT 数据流转规则 */
-export interface DataRule {
-  id?: number;
-  name?: string;
-  description?: string;
-  status?: number;
-  productId?: number;
-  productKey?: string;
-  sourceConfigs?: any[];
-  sinkIds?: number[];
-  createTime?: Date;
 }
 
 /** 查询数据流转规则分页 */
 export function getDataRulePage(params: PageParam) {
-  return requestClient.get<PageResult<DataRuleApi.Rule>>(
+  return requestClient.get<PageResult<DataRuleApi.DataRule>>(
     '/iot/data-rule/page',
     { params },
   );
@@ -49,16 +25,16 @@ export function getDataRulePage(params: PageParam) {
 
 /** 查询数据流转规则详情 */
 export function getDataRule(id: number) {
-  return requestClient.get<DataRuleApi.Rule>(`/iot/data-rule/get?id=${id}`);
+  return requestClient.get<DataRuleApi.DataRule>(`/iot/data-rule/get?id=${id}`);
 }
 
 /** 新增数据流转规则 */
-export function createDataRule(data: DataRule) {
+export function createDataRule(data: DataRuleApi.DataRule) {
   return requestClient.post('/iot/data-rule/create', data);
 }
 
 /** 修改数据流转规则 */
-export function updateDataRule(data: DataRule) {
+export function updateDataRule(data: DataRuleApi.DataRule) {
   return requestClient.put('/iot/data-rule/update', data);
 }
 
@@ -66,18 +42,3 @@ export function updateDataRule(data: DataRule) {
 export function deleteDataRule(id: number) {
   return requestClient.delete(`/iot/data-rule/delete?id=${id}`);
 }
-
-/** 批量删除数据流转规则 */
-export function deleteDataRuleList(ids: number[]) {
-  return requestClient.delete('/iot/data-rule/delete-list', {
-    params: { ids: ids.join(',') },
-  });
-}
-
-/** 更新数据流转规则状态 */
-export function updateDataRuleStatus(id: number, status: number) {
-  return requestClient.put(`/iot/data-rule/update-status`, {
-    id,
-    status,
-  });
-}

apps/web-antd/src/api/iot/rule/data/sink/index.ts

@@ -2,101 +2,147 @@ import type { PageParam, PageResult } from '@vben/request';
 
 import { requestClient } from '#/api/request';
 
+interface BaseConfig {
+  type: string;
+}
+
 export namespace DataSinkApi {
   /** IoT 数据流转目的 VO */
-  export interface Sink {
+  export interface DataSink {
     id?: number;
-    name: string;
+    name?: string;
     description?: string;
     status?: number;
-    type: string;
+    direction?: number;
-    config?: any;
+    type?: number;
+    config?:
+      | DatabaseConfig
+      | HttpConfig
+      | KafkaMQConfig
+      | MqttConfig
+      | RabbitMQConfig
+      | RedisStreamMQConfig
+      | RocketMQConfig
+      | TcpConfig
+      | WebSocketConfig;
     createTime?: Date;
   }
+
+  /** HTTP 配置 */
+  export interface HttpConfig extends BaseConfig {
+    url: string;
+    method: string;
+    headers: Record<string, string>;
+    query: Record<string, string>;
+    body: string;
+  }
+
+  /** TCP 配置 */
+  export interface TcpConfig extends BaseConfig {
+    host: string;
+    port: number;
+    connectTimeoutMs: number;
+    readTimeoutMs: number;
+    ssl: boolean;
+    sslCertPath: string;
+    dataFormat: string;
+    heartbeatIntervalMs: number;
+    reconnectIntervalMs: number;
+    maxReconnectAttempts: number;
+  }
+
+  /** WebSocket 配置 */
+  export interface WebSocketConfig extends BaseConfig {
+    serverUrl: string;
+    connectTimeoutMs: number;
+    sendTimeoutMs: number;
+    heartbeatIntervalMs: number;
+    heartbeatMessage: string;
+    subprotocols: string;
+    customHeaders: string;
+    verifySslCert: boolean;
+    dataFormat: string;
+    reconnectIntervalMs: number;
+    maxReconnectAttempts: number;
+    enableCompression: boolean;
+    sendRetryCount: number;
+    sendRetryIntervalMs: number;
+  }
+
+  /** MQTT 配置 */
+  export interface MqttConfig extends BaseConfig {
+    url: string;
+    username: string;
+    password: string;
+    clientId: string;
+    topic: string;
+  }
+
+  /** Database 配置 */
+  export interface DatabaseConfig extends BaseConfig {
+    jdbcUrl: string;
+    username: string;
+    password: string;
+    tableName: string;
+  }
+
+  /** RocketMQ 配置 */
+  export interface RocketMQConfig extends BaseConfig {
+    nameServer: string;
+    accessKey: string;
+    secretKey: string;
+    group: string;
+    topic: string;
+    tags: string;
+  }
+
+  /** Kafka 配置 */
+  export interface KafkaMQConfig extends BaseConfig {
+    bootstrapServers: string;
+    username: string;
+    password: string;
+    ssl: boolean;
+    topic: string;
+  }
+
+  /** RabbitMQ 配置 */
+  export interface RabbitMQConfig extends BaseConfig {
+    host: string;
+    port: number;
+    virtualHost: string;
+    username: string;
+    password: string;
+    exchange: string;
+    routingKey: string;
+    queue: string;
+  }
+
+  /** Redis Stream MQ 配置 */
+  export interface RedisStreamMQConfig extends BaseConfig {
+    host: string;
+    port: number;
+    password: string;
+    database: number;
+    topic: string;
+  }
 }
 
-/** IoT 数据流转目的 */
+/** 数据流转目的类型 */
-export interface DataSinkVO {
+export const IotDataSinkTypeEnum = {
-  id?: number;
+  HTTP: 1,
-  name?: string;
+  TCP: 2,
-  description?: string;
+  WEBSOCKET: 3,
-  status?: number;
+  MQTT: 10,
-  type?: string;
+  DATABASE: 20,
-  config?: any;
+  REDIS_STREAM: 21,
-  createTime?: Date;
+  ROCKETMQ: 30,
-}
+  RABBITMQ: 31,
-
+  KAFKA: 32,
-/** IoT 数据目的类型枚举 */
+} as const;
-export enum IotDataSinkTypeEnum {
-  HTTP = 'HTTP',
-  KAFKA = 'KAFKA',
-  MQTT = 'MQTT',
-  RABBITMQ = 'RABBITMQ',
-  REDIS_STREAM = 'REDIS_STREAM',
-  ROCKETMQ = 'ROCKETMQ',
-}
-
-/** HTTP 配置 */
-export interface HttpConfig {
-  url?: string;
-  method?: string;
-  headers?: Record<string, string>;
-  timeout?: number;
-}
-
-/** MQTT 配置 */
-export interface MqttConfig {
-  broker?: string;
-  port?: number;
-  topic?: string;
-  username?: string;
-  password?: string;
-  clientId?: string;
-  qos?: number;
-}
-
-/** Kafka 配置 */
-export interface KafkaMQConfig {
-  bootstrapServers?: string;
-  topic?: string;
-  acks?: string;
-  retries?: number;
-  batchSize?: number;
-}
-
-/** RabbitMQ 配置 */
-export interface RabbitMQConfig {
-  host?: string;
-  port?: number;
-  virtualHost?: string;
-  username?: string;
-  password?: string;
-  exchange?: string;
-  routingKey?: string;
-  queue?: string;
-}
-
-/** RocketMQ 配置 */
-export interface RocketMQConfig {
-  nameServer?: string;
-  topic?: string;
-  tag?: string;
-  producerGroup?: string;
-}
-
-/** Redis Stream 配置 */
-export interface RedisStreamMQConfig {
-  host?: string;
-  port?: number;
-  password?: string;
-  database?: number;
-  streamKey?: string;
-  maxLen?: number;
-}
 
 /** 查询数据流转目的分页 */
 export function getDataSinkPage(params: PageParam) {
-  return requestClient.get<PageResult<DataSinkApi.Sink>>(
+  return requestClient.get<PageResult<DataSinkApi.DataSink>>(
     '/iot/data-sink/page',
     { params },
   );
@@ -104,26 +150,23 @@ export function getDataSinkPage(params: PageParam) {
 
 /** 查询数据流转目的详情 */
 export function getDataSink(id: number) {
-  return requestClient.get<DataSinkApi.Sink>(`/iot/data-sink/get?id=${id}`);
+  return requestClient.get<DataSinkApi.DataSink>(`/iot/data-sink/get?id=${id}`);
 }
 
-/** 查询所有数据流转目的列表 */
+/** 查询数据流转目的（精简）列表 */
-export function getDataSinkList() {
-  return requestClient.get<DataSinkApi.Sink[]>('/iot/data-sink/list');
-}
-
-/** 查询数据流转目的简单列表 */
 export function getDataSinkSimpleList() {
-  return requestClient.get<DataSinkApi.Sink[]>('/iot/data-sink/simple-list');
+  return requestClient.get<DataSinkApi.DataSink[]>(
+    '/iot/data-sink/simple-list',
+  );
 }
 
 /** 新增数据流转目的 */
-export function createDataSink(data: DataSinkVO) {
+export function createDataSink(data: DataSinkApi.DataSink) {
   return requestClient.post('/iot/data-sink/create', data);
 }
 
 /** 修改数据流转目的 */
-export function updateDataSink(data: DataSinkVO) {
+export function updateDataSink(data: DataSinkApi.DataSink) {
   return requestClient.put('/iot/data-sink/update', data);
 }
 
@@ -131,18 +174,3 @@ export function updateDataSink(data: DataSinkVO) {
 export function deleteDataSink(id: number) {
   return requestClient.delete(`/iot/data-sink/delete?id=${id}`);
 }
-
-/** 批量删除数据流转目的 */
-export function deleteDataSinkList(ids: number[]) {
-  return requestClient.delete('/iot/data-sink/delete-list', {
-    params: { ids: ids.join(',') },
-  });
-}
-
-/** 更新数据流转目的状态 */
-export function updateDataSinkStatus(id: number, status: number) {
-  return requestClient.put(`/iot/data-sink/update-status`, {
-    id,
-    status,
-  });
-}

apps/web-antd/src/api/iot/rule/scene/index.ts

@@ -11,25 +11,20 @@ export namespace RuleSceneApi {
     status?: number;
     triggers?: Trigger[];
     actions?: Action[];
+    lastTriggerTime?: Date;
     createTime?: Date;
   }
 
   /** 场景联动规则的触发器 */
   export interface Trigger {
-    type?: string;
+    type?: number;
     productId?: number;
     deviceId?: number;
     identifier?: string;
     operator?: string;
     value?: any;
     cronExpression?: string;
-    conditionGroups?: TriggerConditionGroup[];
+    conditionGroups?: TriggerCondition[][]; // 后端结构：List<List<TriggerCondition>>；外层「或」、组内「且」
-  }
-
-  /** 场景联动规则的触发条件组 */
-  export interface TriggerConditionGroup {
-    conditions?: TriggerCondition[];
-    operator?: string;
   }
 
   /**  场景联动规则的触发条件 */
@@ -39,72 +34,22 @@ export namespace RuleSceneApi {
     identifier?: string;
     operator?: string;
     value?: any;
-    type?: string;
+    type?: number;
+    param?: string;
   }
 
   /** 场景联动规则的动作 */
   export interface Action {
-    type?: string;
+    type?: number;
     productId?: number;
     deviceId?: number;
     identifier?: string;
     value?: any;
     alertConfigId?: number;
+    params?: string;
   }
 }
 
-// TODO @haohao：貌似下面的，和 RuleSceneApi 重复了。
-/** IoT 场景联动规则 */
-export interface IotSceneRule {
-  id?: number;
-  name?: string;
-  description?: string;
-  status?: number;
-  triggers?: Trigger[];
-  actions?: Action[];
-  createTime?: Date;
-}
-
-/** IoT 场景联动规则触发器 */
-export interface Trigger {
-  type?: string;
-  productId?: number;
-  deviceId?: number;
-  identifier?: string;
-  operator?: string;
-  value?: any;
-  cronExpression?: string;
-  conditionGroups?: TriggerConditionGroup[];
-}
-
-/** IoT 场景联动规则触发条件组 */
-export interface TriggerConditionGroup {
-  conditions?: TriggerCondition[];
-  operator?: string;
-}
-
-/** IoT 场景联动规则触发条件 */
-export interface TriggerCondition {
-  productId?: number;
-  deviceId?: number;
-  identifier?: string;
-  operator?: string;
-  value?: any;
-  type?: string;
-  param?: string;
-}
-
-/** IoT 场景联动规则动作 */
-export interface Action {
-  type?: string;
-  productId?: number;
-  deviceId?: number;
-  identifier?: string;
-  value?: any;
-  alertConfigId?: number;
-  params?: string;
-}
-
 /** 查询场景联动规则分页 */
 export function getSceneRulePage(params: PageParam) {
   return requestClient.get<PageResult<RuleSceneApi.SceneRule>>(
@@ -121,12 +66,12 @@ export function getSceneRule(id: number) {
 }
 
 /** 新增场景联动规则 */
-export function createSceneRule(data: IotSceneRule) {
+export function createSceneRule(data: RuleSceneApi.SceneRule) {
   return requestClient.post('/iot/scene-rule/create', data);
 }
 
 /** 修改场景联动规则 */
-export function updateSceneRule(data: IotSceneRule) {
+export function updateSceneRule(data: RuleSceneApi.SceneRule) {
   return requestClient.put('/iot/scene-rule/update', data);
 }
 
@@ -135,14 +80,6 @@ export function deleteSceneRule(id: number) {
   return requestClient.delete(`/iot/scene-rule/delete?id=${id}`);
 }
 
-/** 批量删除场景联动规则 */
-// TODO @haohao：貌似用上。
-export function deleteSceneRuleList(ids: number[]) {
-  return requestClient.delete('/iot/scene-rule/delete-list', {
-    params: { ids: ids.join(',') },
-  });
-}
-
 /** 更新场景联动规则状态 */
 export function updateSceneRuleStatus(id: number, status: number) {
   return requestClient.put(`/iot/scene-rule/update-status`, {

apps/web-antd/src/api/iot/statistics/index.ts

@@ -17,18 +17,6 @@ export namespace IotStatisticsApi {
     productCategoryDeviceCounts: Record<string, number>; // 按品类统计的设备数量
   }
 
-  /** 时间戳-数值的键值对类型 */
-  export interface TimeValueItem {
-    [key: string]: number;
-  }
-
-  /** 消息统计数据类型 */
-  export interface DeviceMessageSummary {
-    statType: number;
-    upstreamCounts: TimeValueItem[];
-    downstreamCounts: TimeValueItem[];
-  }
-
   /** 设备消息数量统计（按日期） */
   export interface DeviceMessageSummaryByDateRespVO {
     time: string; // 时间轴

apps/web-antd/src/api/iot/thingmodel/index.ts

@@ -1,126 +1,209 @@
+import type { Rule } from 'ant-design-vue/es/form';
+
 import type { PageParam, PageResult } from '@vben/request';
 
+import { isEmpty } from '@vben/utils';
+
 import { requestClient } from '#/api/request';
 
 export namespace ThingModelApi {
-  /** IoT 物模型数据 VO */
+  /** IoT 物模型数据 */
   export interface ThingModel {
     id?: number;
     productId?: number;
     productKey?: string;
-    identifier: string;
+    identifier?: string;
-    name: string;
+    name?: string;
-    desc?: string;
+    description?: string;
-    type: string;
+    dataType?: string;
-    property?: ThingModelProperty;
+    type?: number; // 参见 IoTThingModelTypeEnum 枚举类
-    event?: ThingModelEvent;
+    property?: Property;
-    service?: ThingModelService;
+    event?: Event;
+    service?: Service;
   }
 
   /** IoT 物模型属性 */
   export interface Property {
-    identifier: string;
+    identifier?: string;
-    name: string;
+    name?: string;
-    accessMode: string;
+    accessMode?: string;
-    dataType: string;
+    required?: boolean;
+    dataType?: string;
+    description?: string;
     dataSpecs?: any;
     dataSpecsList?: any[];
-    desc?: string;
   }
 
   /** IoT 物模型服务 */
   export interface Service {
-    identifier: string;
+    identifier?: string;
-    name: string;
+    name?: string;
-    callType: string;
+    required?: boolean;
-    inputData?: any[];
+    callType?: string;
-    outputData?: any[];
+    description?: string;
-    desc?: string;
+    inputParams?: Param[];
+    outputParams?: Param[];
+    method?: string;
   }
 
   /** IoT 物模型事件 */
   export interface Event {
-    identifier: string;
+    identifier?: string;
+    name?: string;
+    required?: boolean;
+    type?: string;
+    description?: string;
+    outputParams?: Param[];
+    method?: string;
+  }
+
+  /** IoT 物模型参数 */
+  export interface Param {
+    identifier?: string;
+    name?: string;
+    direction?: string;
+    paraOrder?: number;
+    dataType?: string;
+    dataSpecs?: any;
+    dataSpecsList?: any[];
+  }
+
+  /** IoT 物模型 TSL（树形）响应 */
+  export interface ThingModelTSL {
+    productId?: number;
+    productKey?: string;
+    properties?: Property[];
+    events?: Event[];
+    services?: Service[];
+  }
+
+  /** IoT 数据定义（数值型） */
+  export interface DataSpecsNumberData {
+    min?: number | string;
+    max?: number | string;
+    step?: number | string;
+    unit?: string;
+    unitName?: string;
+  }
+
+  /** IoT 数据定义（枚举/布尔型） */
+  export interface DataSpecsEnumOrBoolData {
+    value: number | string;
     name: string;
-    type: string;
-    outputData?: any[];
-    desc?: string;
   }
 }
 
-/** IoT 物模型数据 */
+/** 生成「必填 + 数字」类校验器：拼到 size / length / 枚举值上 */
-export interface ThingModelData {
+function buildRequiredNumberValidator(label: string) {
-  id?: number;
+  return (_rule: any, value: any, callback: any) => {
-  productId?: number;
+    if (isEmpty(value)) {
-  productKey?: string;
+      callback(new Error(`${label}不能为空`));
-  identifier?: string;
+      return;
-  name?: string;
+    }
-  desc?: string;
+    if (Number.isNaN(Number(value))) {
-  type?: string;
+      callback(new Error(`${label}必须是数字`));
-  dataType?: string;
+      return;
-  property?: ThingModelProperty;
+    }
-  event?: ThingModelEvent;
+    callback();
-  service?: ThingModelService;
+  };
 }
 
-/** IoT 物模型属性 */
+/** 生成「标识符样式」名称校验器：开头需为中文 / 英文 / 数字，整体仅允许中文、英文、数字、下划线、短划线，长度 ≤ 20 */
-export interface ThingModelProperty {
+export function buildIdentifierLikeNameValidator(label: string) {
-  identifier?: string;
+  return (_rule: any, value: string, callback: any) => {
-  name?: string;
+    if (isEmpty(value)) {
-  accessMode?: string;
+      callback(new Error(`${label}不能为空`));
-  dataType?: string;
+      return;
-  dataSpecs?: any;
+    }
-  dataSpecsList?: any[];
+    if (!/^[一-龥A-Za-z0-9]/.test(value)) {
-  desc?: string;
+      callback(new Error(`${label}必须以中文、英文字母或数字开头`));
-}
+      return;
-
+    }
-/** IoT 物模型服务 */
+    if (!/^[一-龥A-Za-z0-9][\w一-龥-]*$/.test(value)) {
-export interface ThingModelService {
+      callback(
-  identifier?: string;
+        new Error(`${label}只能包含中文、英文字母、数字、下划线和短划线`),
-  name?: string;
+      );
-  callType?: string;
+      return;
-  inputData?: any[];
+    }
-  outputData?: any[];
+    if (value.length > 20) {
-  desc?: string;
+      callback(new Error(`${label}长度不能超过 20 个字符`));
-}
+      return;
-
+    }
-/** IoT 物模型事件 */
+    callback();
-export interface ThingModelEvent {
+  };
-  identifier?: string;
-  name?: string;
-  type?: string;
-  outputData?: any[];
-  desc?: string;
-}
-
-/** IoT 数据定义（数值型） */
-export interface DataSpecsNumberData {
-  min?: number | string;
-  max?: number | string;
-  step?: number | string;
-  unit?: string;
-  unitName?: string;
-}
-
-/** IoT 数据定义（枚举/布尔型） */
-export interface DataSpecsEnumOrBoolData {
-  value: number | string;
-  name: string;
 }
 
 /** IoT 物模型表单校验规则 */
-export interface ThingModelFormRules {
+export const ThingModelFormRules: Record<string, Rule[]> = {
-  [key: string]: any;
+  name: [
-}
+    { required: true, message: '功能名称不能为空', trigger: 'blur' },
+    {
+      pattern: /^[一-龥A-Za-z0-9][一-龥A-Za-z0-9\-_/.]{0,29}$/,
+      message:
+        '支持中文、大小写字母、日文、数字、短划线、下划线、斜杠和小数点，必须以中文、英文或数字开头，不超过 30 个字符',
+      trigger: 'blur',
+    },
+  ],
+  type: [{ required: true, message: '功能类型不能为空', trigger: 'blur' }],
+  identifier: [
+    { required: true, message: '标识符不能为空', trigger: 'blur' },
+    {
+      pattern: /^[a-zA-Z][a-zA-Z0-9_]{0,31}$/,
+      message: '支持大小写字母、数字和下划线，必须以字母开头，不超过 32 个字符',
+      trigger: 'blur',
+    },
+    {
+      validator: (_rule: any, value: string, callback: any) => {
+        const reservedKeywords = [
+          'set',
+          'get',
+          'post',
+          'property',
+          'event',
+          'time',
+          'value',
+        ];
+        if (reservedKeywords.includes(value)) {
+          callback(
+            new Error(
+              'set, get, post, property, event, time, value 是系统保留字段，不能用于标识符定义',
+            ),
+          );
+          return;
+        }
+        if (/^\d+$/.test(value)) {
+          callback(new Error('标识符不能是纯数字'));
+          return;
+        }
+        callback();
+      },
+      trigger: 'blur',
+    },
+  ],
+  childDataType: [{ required: true, message: '元素类型不能为空' }],
+  size: [
+    {
+      required: true,
+      validator: buildRequiredNumberValidator('元素个数'),
+      trigger: 'blur',
+    },
+  ],
+  length: [
+    {
+      required: true,
+      validator: buildRequiredNumberValidator('文本长度'),
+      trigger: 'blur',
+    },
+  ],
+  accessMode: [
+    { required: true, message: '请选择读写类型', trigger: 'change' },
+  ],
+  callType: [{ required: true, message: '请选择调用方式', trigger: 'change' }],
+  eventType: [{ required: true, message: '请选择事件类型', trigger: 'change' }],
+};
 
-/** 验证布尔型名称 */
+/** 校验布尔值名称 */
-export function validateBoolName(_rule: any, value: any, callback: any) {
+export const validateBoolName = buildIdentifierLikeNameValidator('布尔值名称');
-  if (value) {
-    callback();
-  } else {
-    callback(new Error('枚举描述不能为空'));
-  }
-}
 
 /** 查询产品物模型分页 */
 export function getThingModelPage(params: PageParam) {
@@ -141,17 +224,19 @@ export function getThingModel(id: number) {
 export function getThingModelListByProductId(productId: number) {
   return requestClient.get<ThingModelApi.ThingModel[]>(
     '/iot/thing-model/list',
-    { params: { productId } },
+    {
+      params: { productId },
+    },
   );
 }
 
 /** 新增物模型 */
-export function createThingModel(data: ThingModelData) {
+export function createThingModel(data: ThingModelApi.ThingModel) {
   return requestClient.post('/iot/thing-model/create', data);
 }
 
 /** 修改物模型 */
-export function updateThingModel(data: ThingModelData) {
+export function updateThingModel(data: ThingModelApi.ThingModel) {
   return requestClient.put('/iot/thing-model/update', data);
 }
 
@@ -161,26 +246,11 @@ export function deleteThingModel(id: number) {
 }
 
 /** 获取物模型 TSL */
-export function getThingModelTSL(productId: number) {
+export function getThingModelTSLByProductId(productId: number) {
-  return requestClient.get<ThingModelApi.ThingModel[]>(
+  return requestClient.get<ThingModelApi.ThingModelTSL>(
     '/iot/thing-model/get-tsl',
-    { params: { productId } },
+    {
+      params: { productId },
+    },
   );
 }
-
-/** 导入物模型 TSL
-export function importThingModelTSL(productId: number, tslData: any) {
-  return requestClient.post('/iot/thing-model/import-tsl', {
-    productId,
-    tslData,
-  });
-}
- */
-
-/** 导出物模型 TSL
-export function exportThingModelTSL(productId: number) {
-  return requestClient.get<any>('/iot/thing-model/export-tsl', {
-    params: { productId },
-  });
-}
- */

apps/web-antd/src/api/mall/statistics/trade.ts

@@ -7,7 +7,7 @@ import { requestClient } from '#/api/request';
 export namespace MallTradeStatisticsApi {
   /** 交易状况 Request */
   export interface TradeTrendReqVO {
-    times: [Date, Date];
+    times?: string[];
   }
 
   /** 交易统计 Response */

apps/web-antd/src/api/member/user/index.ts

@@ -13,6 +13,7 @@ export namespace MemberUserApi {
     loginIp: string;
     mark: string;
     mobile: string;
+    email?: string;
     name?: string;
     nickname?: string;
     registerIp: string;

apps/web-antd/src/api/mes/cal/calendar/index.ts

@@ -0,0 +1,27 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesCalCalendarApi {
+  /** 排班日历班组排班项 */
+  export interface CalendarTeamShiftItem {
+    teamId?: number; // 班组编号
+    teamName?: string; // 班组名称
+    shiftId?: number; // 班次编号
+    shiftName?: string; // 班次名称
+    sort?: number; // 排序
+  }
+
+  /** 排班日历天 */
+  export interface CalendarDay {
+    day?: string; // 日期
+    shiftType?: number; // 轮班方式
+    teamShifts?: CalendarTeamShiftItem[]; // 班组班次
+  }
+}
+
+/** 查询排班日历列表 */
+export function getCalendarList(params: any) {
+  return requestClient.get<MesCalCalendarApi.CalendarDay[]>(
+    '/mes/cal/calendar/list',
+    { params },
+  );
+}

apps/web-antd/src/api/mes/cal/holiday/index.ts

@@ -0,0 +1,39 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesCalHolidayApi {
+  /** MES 假期设置 */
+  export interface Holiday {
+    id?: number; // 编号
+    day?: number | string; // 日期
+    type?: number; // 日期类型
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+
+  /** 假期查询参数 */
+  export interface HolidayQuery {
+    startDay?: string;
+    endDay?: string;
+  }
+}
+
+/** 查询假期设置列表 */
+export function getHolidayList(params?: MesCalHolidayApi.HolidayQuery) {
+  return requestClient.get<MesCalHolidayApi.Holiday[]>(
+    '/mes/cal/holiday/list',
+    { params },
+  );
+}
+
+/** 根据日期查询假期设置 */
+export function getHolidayByDay(day: string) {
+  return requestClient.get<MesCalHolidayApi.Holiday>(
+    '/mes/cal/holiday/get-by-day',
+    { params: { day } },
+  );
+}
+
+/** 保存假期设置 */
+export function saveHoliday(data: MesCalHolidayApi.Holiday) {
+  return requestClient.post('/mes/cal/holiday/save', data);
+}

apps/web-antd/src/api/mes/cal/plan/index.ts

@@ -0,0 +1,59 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesCalPlanApi {
+  /** MES 排班计划 */
+  export interface Plan {
+    id?: number; // 计划编号
+    code?: string; // 计划编码
+    name?: string; // 计划名称
+    calendarType?: number; // 班组类型
+    startDate?: number; // 开始日期
+    endDate?: number; // 结束日期
+    shiftType?: number; // 轮班方式
+    shiftMethod?: number; // 倒班方式
+    shiftCount?: number; // 倒班天数
+    status?: number; // 状态
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询排班计划分页 */
+export function getPlanPage(params: PageParam) {
+  return requestClient.get<PageResult<MesCalPlanApi.Plan>>(
+    '/mes/cal/plan/page',
+    { params },
+  );
+}
+
+/** 查询排班计划详情 */
+export function getPlan(id: number) {
+  return requestClient.get<MesCalPlanApi.Plan>(`/mes/cal/plan/get?id=${id}`);
+}
+
+/** 新增排班计划 */
+export function createPlan(data: MesCalPlanApi.Plan) {
+  return requestClient.post<number>('/mes/cal/plan/create', data);
+}
+
+/** 修改排班计划 */
+export function updatePlan(data: MesCalPlanApi.Plan) {
+  return requestClient.put('/mes/cal/plan/update', data);
+}
+
+/** 确认排班计划 */
+export function confirmPlan(id: number) {
+  return requestClient.put(`/mes/cal/plan/confirm?id=${id}`);
+}
+
+/** 删除排班计划 */
+export function deletePlan(id: number) {
+  return requestClient.delete(`/mes/cal/plan/delete?id=${id}`);
+}
+
+/** 导出排班计划 */
+export function exportPlan(params: any) {
+  return requestClient.download('/mes/cal/plan/export-excel', { params });
+}

apps/web-antd/src/api/mes/cal/plan/shift/index.ts

@@ -0,0 +1,36 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesCalPlanShiftApi {
+  /** MES 计划班次 */
+  export interface PlanShift {
+    id?: number; // 班次编号
+    planId?: number; // 排班计划编号
+    sort?: number; // 显示顺序
+    name?: string; // 班次名称
+    startTime?: string; // 开始时间
+    endTime?: string; // 结束时间
+    remark?: string; // 备注
+  }
+}
+
+/** 查询指定排班计划的班次列表 */
+export function getPlanShiftListByPlan(planId: number) {
+  return requestClient.get<MesCalPlanShiftApi.PlanShift[]>(
+    `/mes/cal/plan-shift/list-by-plan?planId=${planId}`,
+  );
+}
+
+/** 新增计划班次 */
+export function createPlanShift(data: MesCalPlanShiftApi.PlanShift) {
+  return requestClient.post('/mes/cal/plan-shift/create', data);
+}
+
+/** 修改计划班次 */
+export function updatePlanShift(data: MesCalPlanShiftApi.PlanShift) {
+  return requestClient.put('/mes/cal/plan-shift/update', data);
+}
+
+/** 删除计划班次 */
+export function deletePlanShift(id: number) {
+  return requestClient.delete(`/mes/cal/plan-shift/delete?id=${id}`);
+}

apps/web-antd/src/api/mes/cal/plan/team/index.ts

@@ -0,0 +1,30 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesCalPlanTeamApi {
+  /** MES 计划班组关联 */
+  export interface PlanTeam {
+    id?: number; // 关联编号
+    planId?: number; // 排班计划编号
+    teamId?: number; // 班组编号
+    teamCode?: string; // 班组编码
+    teamName?: string; // 班组名称
+    remark?: string; // 备注
+  }
+}
+
+/** 查询指定排班计划的班组列表 */
+export function getPlanTeamListByPlan(planId: number) {
+  return requestClient.get<MesCalPlanTeamApi.PlanTeam[]>(
+    `/mes/cal/plan-team/list-by-plan?planId=${planId}`,
+  );
+}
+
+/** 新增计划班组关联 */
+export function createPlanTeam(data: MesCalPlanTeamApi.PlanTeam) {
+  return requestClient.post('/mes/cal/plan-team/create', data);
+}
+
+/** 删除计划班组关联 */
+export function deletePlanTeam(id: number) {
+  return requestClient.delete(`/mes/cal/plan-team/delete?id=${id}`);
+}

apps/web-antd/src/api/mes/cal/team/index.ts

@@ -0,0 +1,53 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesCalTeamApi {
+  /** MES 班组 */
+  export interface Team {
+    id?: number; // 班组编号
+    code?: string; // 班组编码
+    name?: string; // 班组名称
+    calendarType?: number; // 班组类型
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询班组分页 */
+export function getTeamPage(params: PageParam) {
+  return requestClient.get<PageResult<MesCalTeamApi.Team>>(
+    '/mes/cal/team/page',
+    { params },
+  );
+}
+
+/** 查询班组列表 */
+export function getTeamList() {
+  return requestClient.get<MesCalTeamApi.Team[]>('/mes/cal/team/list');
+}
+
+/** 查询班组详情 */
+export function getTeam(id: number) {
+  return requestClient.get<MesCalTeamApi.Team>(`/mes/cal/team/get?id=${id}`);
+}
+
+/** 新增班组 */
+export function createTeam(data: MesCalTeamApi.Team) {
+  return requestClient.post('/mes/cal/team/create', data);
+}
+
+/** 修改班组 */
+export function updateTeam(data: MesCalTeamApi.Team) {
+  return requestClient.put('/mes/cal/team/update', data);
+}
+
+/** 删除班组 */
+export function deleteTeam(id: number) {
+  return requestClient.delete(`/mes/cal/team/delete?id=${id}`);
+}
+
+/** 导出班组 */
+export function exportTeam(params: any) {
+  return requestClient.download('/mes/cal/team/export-excel', { params });
+}

apps/web-antd/src/api/mes/cal/team/member/index.ts

@@ -0,0 +1,51 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesCalTeamMemberApi {
+  /** MES 班组成员 */
+  export interface TeamMember {
+    id?: number; // 成员编号
+    teamId?: number; // 班组编号
+    userId?: number; // 用户编号
+    nickname?: string; // 用户昵称
+    telephone?: string; // 用户手机号
+    remark?: string; // 备注
+  }
+}
+
+/** 创建班组成员 */
+export function createTeamMember(data: MesCalTeamMemberApi.TeamMember) {
+  return requestClient.post('/mes/cal/team-member/create', data);
+}
+
+/** 删除班组成员 */
+export function deleteTeamMember(id: number) {
+  return requestClient.delete(`/mes/cal/team-member/delete?id=${id}`);
+}
+
+/** 查询班组成员分页 */
+export function getTeamMemberPage(params: PageParam) {
+  return requestClient.get<PageResult<MesCalTeamMemberApi.TeamMember>>(
+    '/mes/cal/team-member/page',
+    { params },
+  );
+}
+
+/** 查询指定班组的成员列表 */
+export function getTeamMemberListByTeam(teamId: number) {
+  return requestClient.get<MesCalTeamMemberApi.TeamMember[]>(
+    '/mes/cal/team-member/list-by-team',
+    { params: { teamId } },
+  );
+}
+
+/** 查询多个班组的成员列表 */
+export function getTeamMemberListByTeamIds(teamIds: number[]) {
+  return requestClient.get<MesCalTeamMemberApi.TeamMember[]>(
+    '/mes/cal/team-member/list-by-team',
+    {
+      params: { teamIds: teamIds.join(',') },
+    },
+  );
+}

apps/web-antd/src/api/mes/dv/checkplan/index.ts

@@ -0,0 +1,65 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesDvCheckPlanApi {
+  /** MES 点检保养方案 */
+  export interface CheckPlan {
+    id?: number; // 方案编号
+    code?: string; // 方案编码
+    name?: string; // 方案名称
+    type?: number; // 方案类型
+    startDate?: Date | number; // 开始日期
+    endDate?: Date | number; // 结束日期
+    cycleType?: number; // 周期类型
+    cycleCount?: number; // 周期数量
+    status?: number; // 状态
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询点检保养方案分页 */
+export function getCheckPlanPage(params: PageParam) {
+  return requestClient.get<PageResult<MesDvCheckPlanApi.CheckPlan>>(
+    '/mes/dv/check-plan/page',
+    { params },
+  );
+}
+
+/** 查询点检保养方案详情 */
+export function getCheckPlan(id: number) {
+  return requestClient.get<MesDvCheckPlanApi.CheckPlan>(
+    `/mes/dv/check-plan/get?id=${id}`,
+  );
+}
+
+/** 新增点检保养方案 */
+export function createCheckPlan(data: MesDvCheckPlanApi.CheckPlan) {
+  return requestClient.post<number>('/mes/dv/check-plan/create', data);
+}
+
+/** 修改点检保养方案 */
+export function updateCheckPlan(data: MesDvCheckPlanApi.CheckPlan) {
+  return requestClient.put('/mes/dv/check-plan/update', data);
+}
+
+/** 启用点检保养方案 */
+export function enableCheckPlan(id: number) {
+  return requestClient.put(`/mes/dv/check-plan/enable?id=${id}`);
+}
+
+/** 停用点检保养方案 */
+export function disableCheckPlan(id: number) {
+  return requestClient.put(`/mes/dv/check-plan/disable?id=${id}`);
+}
+
+/** 删除点检保养方案 */
+export function deleteCheckPlan(id: number) {
+  return requestClient.delete(`/mes/dv/check-plan/delete?id=${id}`);
+}
+
+/** 导出点检保养方案 */
+export function exportCheckPlan(params: any) {
+  return requestClient.download('/mes/dv/check-plan/export-excel', { params });
+}

apps/web-antd/src/api/mes/dv/checkplan/machinery/index.ts

@@ -0,0 +1,34 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesDvCheckPlanMachineryApi {
+  /** MES 点检保养方案设备 */
+  export interface CheckPlanMachinery {
+    id?: number; // 关联编号
+    planId?: number; // 方案编号
+    machineryId?: number; // 设备编号
+    machineryCode?: string; // 设备编码
+    machineryName?: string; // 设备名称
+    machineryBrand?: string; // 品牌
+    machinerySpecification?: string; // 规格型号
+    remark?: string; // 备注
+  }
+}
+
+/** 查询指定方案的设备列表 */
+export function getCheckPlanMachineryListByPlan(planId: number) {
+  return requestClient.get<MesDvCheckPlanMachineryApi.CheckPlanMachinery[]>(
+    `/mes/dv/check-plan-machinery/list-by-plan?planId=${planId}`,
+  );
+}
+
+/** 新增方案设备关联 */
+export function createCheckPlanMachinery(
+  data: MesDvCheckPlanMachineryApi.CheckPlanMachinery,
+) {
+  return requestClient.post('/mes/dv/check-plan-machinery/create', data);
+}
+
+/** 删除方案设备关联 */
+export function deleteCheckPlanMachinery(id: number) {
+  return requestClient.delete(`/mes/dv/check-plan-machinery/delete?id=${id}`);
+}

apps/web-antd/src/api/mes/dv/checkplan/subject/index.ts

@@ -0,0 +1,35 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesDvCheckPlanSubjectApi {
+  /** MES 点检保养方案项目 */
+  export interface CheckPlanSubject {
+    id?: number; // 关联编号
+    planId?: number; // 方案编号
+    subjectId?: number; // 项目编号
+    subjectCode?: string; // 项目编码
+    subjectName?: string; // 项目名称
+    subjectType?: number; // 项目类型
+    subjectContent?: string; // 项目内容
+    subjectStandard?: string; // 标准
+    remark?: string; // 备注
+  }
+}
+
+/** 查询指定方案的项目列表 */
+export function getCheckPlanSubjectListByPlan(planId: number) {
+  return requestClient.get<MesDvCheckPlanSubjectApi.CheckPlanSubject[]>(
+    `/mes/dv/check-plan-subject/list-by-plan?planId=${planId}`,
+  );
+}
+
+/** 新增方案项目关联 */
+export function createCheckPlanSubject(
+  data: MesDvCheckPlanSubjectApi.CheckPlanSubject,
+) {
+  return requestClient.post('/mes/dv/check-plan-subject/create', data);
+}
+
+/** 删除方案项目关联 */
+export function deleteCheckPlanSubject(id: number) {
+  return requestClient.delete(`/mes/dv/check-plan-subject/delete?id=${id}`);
+}

apps/web-antd/src/api/mes/dv/checkrecord/index.ts

@@ -0,0 +1,65 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesDvCheckRecordApi {
+  /** MES 设备点检记录 */
+  export interface CheckRecord {
+    id?: number; // 记录编号
+    planId?: number; // 点检计划编号
+    planName?: string; // 计划名称
+    machineryId?: number; // 设备编号
+    machineryCode?: string; // 设备编码
+    machineryName?: string; // 设备名称
+    machineryBrand?: string; // 品牌
+    machinerySpecification?: string; // 规格型号
+    checkTime?: Date | number; // 点检时间
+    userId?: number; // 点检人编号
+    nickname?: string; // 点检人名称
+    status?: number; // 状态
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询设备点检记录分页 */
+export function getCheckRecordPage(params: PageParam) {
+  return requestClient.get<PageResult<MesDvCheckRecordApi.CheckRecord>>(
+    '/mes/dv/check-record/page',
+    { params },
+  );
+}
+
+/** 查询设备点检记录详情 */
+export function getCheckRecord(id: number) {
+  return requestClient.get<MesDvCheckRecordApi.CheckRecord>(
+    `/mes/dv/check-record/get?id=${id}`,
+  );
+}
+
+/** 新增设备点检记录 */
+export function createCheckRecord(data: MesDvCheckRecordApi.CheckRecord) {
+  return requestClient.post<number>('/mes/dv/check-record/create', data);
+}
+
+/** 修改设备点检记录 */
+export function updateCheckRecord(data: MesDvCheckRecordApi.CheckRecord) {
+  return requestClient.put('/mes/dv/check-record/update', data);
+}
+
+/** 提交设备点检记录 */
+export function submitCheckRecord(id: number) {
+  return requestClient.put(`/mes/dv/check-record/submit?id=${id}`);
+}
+
+/** 删除设备点检记录 */
+export function deleteCheckRecord(id: number) {
+  return requestClient.delete(`/mes/dv/check-record/delete?id=${id}`);
+}
+
+/** 导出设备点检记录 */
+export function exportCheckRecord(params: any) {
+  return requestClient.download('/mes/dv/check-record/export-excel', {
+    params,
+  });
+}

apps/web-antd/src/api/mes/dv/checkrecord/line/index.ts

@@ -0,0 +1,53 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesDvCheckRecordLineApi {
+  /** MES 设备点检记录明细 */
+  export interface CheckRecordLine {
+    id?: number; // 明细编号
+    recordId?: number; // 点检记录编号
+    subjectId?: number; // 点检项目编号
+    subjectCode?: string; // 项目编码
+    subjectName?: string; // 项目名称
+    subjectContent?: string; // 检查内容
+    subjectStandard?: string; // 检查标准
+    checkStatus?: number; // 点检结果
+    checkResult?: string; // 异常描述
+    remark?: string; // 备注
+  }
+}
+
+/** 查询设备点检记录明细分页 */
+export function getCheckRecordLinePage(params: PageParam) {
+  return requestClient.get<PageResult<MesDvCheckRecordLineApi.CheckRecordLine>>(
+    '/mes/dv/check-record-line/page',
+    { params },
+  );
+}
+
+/** 查询设备点检记录明细详情 */
+export function getCheckRecordLine(id: number) {
+  return requestClient.get<MesDvCheckRecordLineApi.CheckRecordLine>(
+    `/mes/dv/check-record-line/get?id=${id}`,
+  );
+}
+
+/** 新增设备点检记录明细 */
+export function createCheckRecordLine(
+  data: MesDvCheckRecordLineApi.CheckRecordLine,
+) {
+  return requestClient.post('/mes/dv/check-record-line/create', data);
+}
+
+/** 修改设备点检记录明细 */
+export function updateCheckRecordLine(
+  data: MesDvCheckRecordLineApi.CheckRecordLine,
+) {
+  return requestClient.put('/mes/dv/check-record-line/update', data);
+}
+
+/** 删除设备点检记录明细 */
+export function deleteCheckRecordLine(id: number) {
+  return requestClient.delete(`/mes/dv/check-record-line/delete?id=${id}`);
+}

apps/web-antd/src/api/mes/dv/machinery/index.ts

@@ -0,0 +1,85 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesDvMachineryApi {
+  /** MES 设备台账 */
+  export interface Machinery {
+    id?: number; // 设备编号
+    code?: string; // 设备编码
+    name?: string; // 设备名称
+    brand?: string; // 品牌
+    specification?: string; // 规格型号
+    machineryTypeId?: number; // 设备类型编号
+    machineryTypeName?: string; // 设备类型名称
+    workshopId?: number; // 所属车间编号
+    workshopName?: string; // 所属车间名称
+    status?: number; // 设备状态
+    lastMaintenTime?: Date; // 最近保养时间
+    lastCheckTime?: Date; // 最近点检时间
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+
+  /** 设备导入结果 */
+  export interface MachineryImportRespVO {
+    createCodes?: string[]; // 新增成功的设备编码
+    updateCodes?: string[]; // 更新成功的设备编码
+    failureCodes?: Record<string, string>; // 导入失败的设备编码及原因
+  }
+}
+
+/** 查询设备分页 */
+export function getMachineryPage(params: PageParam) {
+  return requestClient.get<PageResult<MesDvMachineryApi.Machinery>>(
+    '/mes/dv/machinery/page',
+    { params },
+  );
+}
+
+/** 查询设备精简列表 */
+export function getMachinerySimpleList() {
+  return requestClient.get<MesDvMachineryApi.Machinery[]>(
+    '/mes/dv/machinery/simple-list',
+  );
+}
+
+/** 查询设备详情 */
+export function getMachinery(id: number) {
+  return requestClient.get<MesDvMachineryApi.Machinery>(
+    `/mes/dv/machinery/get?id=${id}`,
+  );
+}
+
+/** 新增设备 */
+export function createMachinery(data: MesDvMachineryApi.Machinery) {
+  return requestClient.post('/mes/dv/machinery/create', data);
+}
+
+/** 修改设备 */
+export function updateMachinery(data: MesDvMachineryApi.Machinery) {
+  return requestClient.put('/mes/dv/machinery/update', data);
+}
+
+/** 删除设备 */
+export function deleteMachinery(id: number) {
+  return requestClient.delete(`/mes/dv/machinery/delete?id=${id}`);
+}
+
+/** 导出设备 */
+export function exportMachinery(params: any) {
+  return requestClient.download('/mes/dv/machinery/export-excel', { params });
+}
+
+/** 下载设备导入模板 */
+export function importMachineryTemplate() {
+  return requestClient.download('/mes/dv/machinery/get-import-template');
+}
+
+/** 导入设备 */
+export function importMachinery(file: File, updateSupport: boolean) {
+  return requestClient.upload<MesDvMachineryApi.MachineryImportRespVO>(
+    `/mes/dv/machinery/import?updateSupport=${updateSupport}`,
+    { file },
+  );
+}

apps/web-antd/src/api/mes/dv/machinery/type/index.ts

@@ -0,0 +1,53 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesDvMachineryTypeApi {
+  /** MES 设备类型 */
+  export interface MachineryType {
+    id?: number; // 设备类型编号
+    parentId?: number; // 父类型编号
+    code?: string; // 类型编码
+    name?: string; // 类型名称
+    sort?: number; // 显示排序
+    status?: number; // 状态
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+    children?: MachineryType[]; // 子类型
+  }
+}
+
+/** 查询设备类型列表 */
+export function getMachineryTypeList(params?: any) {
+  return requestClient.get<MesDvMachineryTypeApi.MachineryType[]>(
+    '/mes/dv/machinery-type/list',
+    { params },
+  );
+}
+
+/** 查询设备类型精简列表 */
+export function getMachineryTypeSimpleList() {
+  return requestClient.get<MesDvMachineryTypeApi.MachineryType[]>(
+    '/mes/dv/machinery-type/simple-list',
+  );
+}
+
+/** 查询设备类型详情 */
+export function getMachineryType(id: number) {
+  return requestClient.get<MesDvMachineryTypeApi.MachineryType>(
+    `/mes/dv/machinery-type/get?id=${id}`,
+  );
+}
+
+/** 新增设备类型 */
+export function createMachineryType(data: MesDvMachineryTypeApi.MachineryType) {
+  return requestClient.post('/mes/dv/machinery-type/create', data);
+}
+
+/** 修改设备类型 */
+export function updateMachineryType(data: MesDvMachineryTypeApi.MachineryType) {
+  return requestClient.put('/mes/dv/machinery-type/update', data);
+}
+
+/** 删除设备类型 */
+export function deleteMachineryType(id: number) {
+  return requestClient.delete(`/mes/dv/machinery-type/delete?id=${id}`);
+}

apps/web-antd/src/api/mes/dv/maintenrecord/index.ts

@@ -0,0 +1,65 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesDvMaintenRecordApi {
+  /** MES 设备保养记录 */
+  export interface MaintenRecord {
+    id?: number; // 记录编号
+    planId?: number; // 计划编号
+    planName?: string; // 计划名称
+    machineryId?: number; // 设备编号
+    machineryCode?: string; // 设备编码
+    machineryName?: string; // 设备名称
+    machineryBrand?: string; // 品牌
+    machinerySpecification?: string; // 规格型号
+    maintenTime?: Date | number; // 保养时间
+    userId?: number; // 用户编号
+    nickname?: string; // 保养人名称
+    status?: number; // 状态
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询设备保养记录分页 */
+export function getMaintenRecordPage(params: PageParam) {
+  return requestClient.get<PageResult<MesDvMaintenRecordApi.MaintenRecord>>(
+    '/mes/dv/mainten-record/page',
+    { params },
+  );
+}
+
+/** 查询设备保养记录详情 */
+export function getMaintenRecord(id: number) {
+  return requestClient.get<MesDvMaintenRecordApi.MaintenRecord>(
+    `/mes/dv/mainten-record/get?id=${id}`,
+  );
+}
+
+/** 新增设备保养记录 */
+export function createMaintenRecord(data: MesDvMaintenRecordApi.MaintenRecord) {
+  return requestClient.post<number>('/mes/dv/mainten-record/create', data);
+}
+
+/** 修改设备保养记录 */
+export function updateMaintenRecord(data: MesDvMaintenRecordApi.MaintenRecord) {
+  return requestClient.put('/mes/dv/mainten-record/update', data);
+}
+
+/** 提交设备保养记录 */
+export function submitMaintenRecord(id: number) {
+  return requestClient.put(`/mes/dv/mainten-record/submit?id=${id}`);
+}
+
+/** 删除设备保养记录 */
+export function deleteMaintenRecord(id: number) {
+  return requestClient.delete(`/mes/dv/mainten-record/delete?id=${id}`);
+}
+
+/** 导出设备保养记录 */
+export function exportMaintenRecord(params: any) {
+  return requestClient.download('/mes/dv/mainten-record/export-excel', {
+    params,
+  });
+}

apps/web-antd/src/api/mes/dv/maintenrecord/line/index.ts

@@ -0,0 +1,51 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesDvMaintenRecordLineApi {
+  /** MES 设备保养记录明细 */
+  export interface MaintenRecordLine {
+    id?: number; // 明细编号
+    recordId?: number; // 保养记录编号
+    subjectId?: number; // 项目编号
+    subjectName?: string; // 项目名称
+    subjectContent?: string; // 项目内容
+    subjectStandard?: string; // 项目标准
+    status?: number; // 保养结果
+    result?: string; // 异常描述
+    remark?: string; // 备注
+  }
+}
+
+/** 查询设备保养记录明细分页 */
+export function getMaintenRecordLinePage(params: PageParam) {
+  return requestClient.get<
+    PageResult<MesDvMaintenRecordLineApi.MaintenRecordLine>
+  >('/mes/dv/mainten-record-line/page', { params });
+}
+
+/** 查询设备保养记录明细详情 */
+export function getMaintenRecordLine(id: number) {
+  return requestClient.get<MesDvMaintenRecordLineApi.MaintenRecordLine>(
+    `/mes/dv/mainten-record-line/get?id=${id}`,
+  );
+}
+
+/** 新增设备保养记录明细 */
+export function createMaintenRecordLine(
+  data: MesDvMaintenRecordLineApi.MaintenRecordLine,
+) {
+  return requestClient.post('/mes/dv/mainten-record-line/create', data);
+}
+
+/** 修改设备保养记录明细 */
+export function updateMaintenRecordLine(
+  data: MesDvMaintenRecordLineApi.MaintenRecordLine,
+) {
+  return requestClient.put('/mes/dv/mainten-record-line/update', data);
+}
+
+/** 删除设备保养记录明细 */
+export function deleteMaintenRecordLine(id: number) {
+  return requestClient.delete(`/mes/dv/mainten-record-line/delete?id=${id}`);
+}

apps/web-antd/src/api/mes/dv/repair/index.ts

@@ -0,0 +1,81 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesDvRepairApi {
+  /** MES 维修工单 */
+  export interface Repair {
+    id?: number; // 工单编号
+    code?: string; // 维修工单编码
+    name?: string; // 维修工单名称
+    machineryId?: number; // 设备编号
+    machineryCode?: string; // 设备编码
+    machineryName?: string; // 设备名称
+    machineryBrand?: string; // 品牌
+    machinerySpecification?: string; // 规格型号
+    requireDate?: Date | number; // 报修日期
+    finishDate?: Date | number; // 维修完成日期
+    confirmDate?: Date | number; // 验收日期
+    result?: number; // 维修结果
+    acceptedUserId?: number; // 维修人编号
+    acceptedUserNickname?: string; // 维修人名称
+    confirmUserId?: number; // 验收人编号
+    confirmUserNickname?: string; // 验收人名称
+    sourceDocType?: number; // 来源单据类型
+    sourceDocId?: number; // 来源单据编号
+    sourceDocCode?: string; // 来源单据编码
+    status?: number; // 状态
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询维修工单分页 */
+export function getRepairPage(params: PageParam) {
+  return requestClient.get<PageResult<MesDvRepairApi.Repair>>(
+    '/mes/dv/repair/page',
+    { params },
+  );
+}
+
+/** 查询维修工单详情 */
+export function getRepair(id: number) {
+  return requestClient.get<MesDvRepairApi.Repair>(
+    `/mes/dv/repair/get?id=${id}`,
+  );
+}
+
+/** 新增维修工单 */
+export function createRepair(data: MesDvRepairApi.Repair) {
+  return requestClient.post<number>('/mes/dv/repair/create', data);
+}
+
+/** 修改维修工单 */
+export function updateRepair(data: MesDvRepairApi.Repair) {
+  return requestClient.put('/mes/dv/repair/update', data);
+}
+
+/** 删除维修工单 */
+export function deleteRepair(id: number) {
+  return requestClient.delete(`/mes/dv/repair/delete?id=${id}`);
+}
+
+/** 导出维修工单 */
+export function exportRepair(params: any) {
+  return requestClient.download('/mes/dv/repair/export-excel', { params });
+}
+
+/** 提交维修工单 */
+export function submitRepair(id: number) {
+  return requestClient.put(`/mes/dv/repair/submit?id=${id}`);
+}
+
+/** 确认维修完成 */
+export function confirmRepair(data: MesDvRepairApi.Repair) {
+  return requestClient.put('/mes/dv/repair/confirm', data);
+}
+
+/** 完成验收 */
+export function finishRepair(id: number, result: number) {
+  return requestClient.put(`/mes/dv/repair/finish?id=${id}&result=${result}`);
+}

apps/web-antd/src/api/mes/dv/repair/line/index.ts

@@ -0,0 +1,49 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesDvRepairLineApi {
+  /** MES 维修工单行 */
+  export interface RepairLine {
+    id?: number; // 明细编号
+    repairId?: number; // 维修工单编号
+    subjectId?: number; // 项目编号
+    subjectName?: string; // 项目名称
+    subjectContent?: string; // 项目内容
+    subjectStandard?: string; // 项目标准
+    malfunction?: string; // 故障描述
+    malfunctionUrl?: string; // 故障图片 URL
+    description?: string; // 维修描述
+    remark?: string; // 备注
+  }
+}
+
+/** 查询维修工单行分页 */
+export function getRepairLinePage(params: PageParam) {
+  return requestClient.get<PageResult<MesDvRepairLineApi.RepairLine>>(
+    '/mes/dv/repair-line/page',
+    { params },
+  );
+}
+
+/** 查询维修工单行详情 */
+export function getRepairLine(id: number) {
+  return requestClient.get<MesDvRepairLineApi.RepairLine>(
+    `/mes/dv/repair-line/get?id=${id}`,
+  );
+}
+
+/** 新增维修工单行 */
+export function createRepairLine(data: MesDvRepairLineApi.RepairLine) {
+  return requestClient.post('/mes/dv/repair-line/create', data);
+}
+
+/** 修改维修工单行 */
+export function updateRepairLine(data: MesDvRepairLineApi.RepairLine) {
+  return requestClient.put('/mes/dv/repair-line/update', data);
+}
+
+/** 删除维修工单行 */
+export function deleteRepairLine(id: number) {
+  return requestClient.delete(`/mes/dv/repair-line/delete?id=${id}`);
+}

apps/web-antd/src/api/mes/dv/subject/index.ts

@@ -0,0 +1,60 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesDvSubjectApi {
+  /** MES 点检保养项目 */
+  export interface Subject {
+    id?: number; // 项目编号
+    code?: string; // 项目编码
+    name?: string; // 项目名称
+    type?: number; // 项目类型
+    content?: string; // 项目内容
+    standard?: string; // 标准
+    status?: number; // 状态
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询点检保养项目分页 */
+export function getSubjectPage(params: PageParam) {
+  return requestClient.get<PageResult<MesDvSubjectApi.Subject>>(
+    '/mes/dv/subject/page',
+    { params },
+  );
+}
+
+/** 查询点检保养项目精简列表 */
+export function getSubjectSimpleList() {
+  return requestClient.get<MesDvSubjectApi.Subject[]>(
+    '/mes/dv/subject/simple-list',
+  );
+}
+
+/** 查询点检保养项目详情 */
+export function getSubject(id: number) {
+  return requestClient.get<MesDvSubjectApi.Subject>(
+    `/mes/dv/subject/get?id=${id}`,
+  );
+}
+
+/** 新增点检保养项目 */
+export function createSubject(data: MesDvSubjectApi.Subject) {
+  return requestClient.post('/mes/dv/subject/create', data);
+}
+
+/** 修改点检保养项目 */
+export function updateSubject(data: MesDvSubjectApi.Subject) {
+  return requestClient.put('/mes/dv/subject/update', data);
+}
+
+/** 删除点检保养项目 */
+export function deleteSubject(id: number) {
+  return requestClient.delete(`/mes/dv/subject/delete?id=${id}`);
+}
+
+/** 导出点检保养项目 */
+export function exportSubject(params: any) {
+  return requestClient.download('/mes/dv/subject/export-excel', { params });
+}

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 } },
+  );
+}

apps/web-antd/src/api/mes/md/autocode/part/index.ts

@@ -0,0 +1,49 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesMdAutoCodePartApi {
+  /** MES 编码规则分段 */
+  export interface AutoCodePart {
+    id?: number; // 分段编号
+    ruleId?: number; // 规则编号
+    sort?: number; // 排序
+    type?: number; // 分段类型
+    length?: number; // 长度
+    dateFormat?: string; // 日期格式
+    fixCharacter?: string; // 固定字符
+    serialStartNo?: number; // 流水号起始值
+    serialStep?: number; // 流水号步长
+    cycleFlag?: boolean; // 是否循环
+    cycleMethod?: number; // 循环方式
+    remark?: string; // 备注
+  }
+}
+
+/** 查询编码规则分段详情 */
+export function getAutoCodePart(id: number) {
+  return requestClient.get<MesMdAutoCodePartApi.AutoCodePart>(
+    `/mes/md/auto-code-part/get?id=${id}`,
+  );
+}
+
+/** 查询编码规则分段列表 */
+export function getAutoCodePartListByRuleId(ruleId: number) {
+  return requestClient.get<MesMdAutoCodePartApi.AutoCodePart[]>(
+    '/mes/md/auto-code-part/list-by-rule-id',
+    { params: { ruleId } },
+  );
+}
+
+/** 新增编码规则分段 */
+export function createAutoCodePart(data: MesMdAutoCodePartApi.AutoCodePart) {
+  return requestClient.post('/mes/md/auto-code-part/create', data);
+}
+
+/** 修改编码规则分段 */
+export function updateAutoCodePart(data: MesMdAutoCodePartApi.AutoCodePart) {
+  return requestClient.put('/mes/md/auto-code-part/update', data);
+}
+
+/** 删除编码规则分段 */
+export function deleteAutoCodePart(id: number) {
+  return requestClient.delete(`/mes/md/auto-code-part/delete?id=${id}`);
+}

apps/web-antd/src/api/mes/md/autocode/record/index.ts

@@ -0,0 +1,9 @@
+import { requestClient } from '#/api/request';
+
+/** 生成 MES 编码 */
+export function generateAutoCode(ruleCode: string, inputChar?: string) {
+  return requestClient.post<string>('/mes/md/auto-code-record/generate', {
+    inputChar,
+    ruleCode,
+  });
+}

apps/web-antd/src/api/mes/md/autocode/rule/index.ts

@@ -0,0 +1,57 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesMdAutoCodeRuleApi {
+  /** MES 编码规则 */
+  export interface AutoCodeRule {
+    id?: number; // 规则编号
+    code?: string; // 规则编码
+    name?: string; // 规则名称
+    description?: string; // 规则描述
+    maxLength?: number; // 最大长度
+    padded?: boolean; // 是否补齐
+    paddedChar?: string; // 补齐字符
+    paddedMethod?: number; // 补齐方式
+    status?: number; // 状态
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询编码规则分页 */
+export function getAutoCodeRulePage(params: PageParam) {
+  return requestClient.get<PageResult<MesMdAutoCodeRuleApi.AutoCodeRule>>(
+    '/mes/md/auto-code-rule/page',
+    { params },
+  );
+}
+
+/** 查询编码规则详情 */
+export function getAutoCodeRule(id: number) {
+  return requestClient.get<MesMdAutoCodeRuleApi.AutoCodeRule>(
+    `/mes/md/auto-code-rule/get?id=${id}`,
+  );
+}
+
+/** 新增编码规则 */
+export function createAutoCodeRule(data: MesMdAutoCodeRuleApi.AutoCodeRule) {
+  return requestClient.post('/mes/md/auto-code-rule/create', data);
+}
+
+/** 修改编码规则 */
+export function updateAutoCodeRule(data: MesMdAutoCodeRuleApi.AutoCodeRule) {
+  return requestClient.put('/mes/md/auto-code-rule/update', data);
+}
+
+/** 删除编码规则 */
+export function deleteAutoCodeRule(id: number) {
+  return requestClient.delete(`/mes/md/auto-code-rule/delete?id=${id}`);
+}
+
+/** 导出编码规则 */
+export function exportAutoCodeRule(params: PageParam) {
+  return requestClient.download('/mes/md/auto-code-rule/export-excel', {
+    params,
+  });
+}

apps/web-antd/src/api/mes/md/client/index.ts

@@ -0,0 +1,86 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesMdClientApi {
+  /** MES 客户 */
+  export interface Client {
+    id?: number; // 客户编号
+    code?: string; // 客户编码
+    name?: string; // 客户名称
+    nickname?: string; // 客户简称
+    englishName?: string; // 客户英文名称
+    description?: string; // 客户简介
+    logo?: string; // 客户 LOGO 地址
+    type?: number; // 客户类型
+    address?: string; // 客户地址
+    website?: string; // 客户官网地址
+    email?: string; // 客户邮箱地址
+    telephone?: string; // 客户电话
+    contact1Name?: string; // 联系人1
+    contact1Telephone?: string; // 联系人1电话
+    contact1Email?: string; // 联系人1邮箱
+    contact2Name?: string; // 联系人2
+    contact2Telephone?: string; // 联系人2电话
+    contact2Email?: string; // 联系人2邮箱
+    creditCode?: string; // 统一社会信用代码
+    status?: number; // 状态
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+
+  /** 客户导入结果 */
+  export interface ClientImportRespVO {
+    createCodes?: string[]; // 新增成功的客户编码
+    updateCodes?: string[]; // 更新成功的客户编码
+    failureCodes?: Record<string, string>; // 导入失败的客户编码及原因
+  }
+}
+
+/** 查询客户分页 */
+export function getClientPage(params: PageParam) {
+  return requestClient.get<PageResult<MesMdClientApi.Client>>(
+    '/mes/md-client/page',
+    { params },
+  );
+}
+
+/** 查询客户详情 */
+export function getClient(id: number) {
+  return requestClient.get<MesMdClientApi.Client>(
+    `/mes/md-client/get?id=${id}`,
+  );
+}
+
+/** 新增客户 */
+export function createClient(data: MesMdClientApi.Client) {
+  return requestClient.post('/mes/md-client/create', data);
+}
+
+/** 修改客户 */
+export function updateClient(data: MesMdClientApi.Client) {
+  return requestClient.put('/mes/md-client/update', data);
+}
+
+/** 删除客户 */
+export function deleteClient(id: number) {
+  return requestClient.delete(`/mes/md-client/delete?id=${id}`);
+}
+
+/** 导出客户 */
+export function exportClient(params: any) {
+  return requestClient.download('/mes/md-client/export-excel', { params });
+}
+
+/** 下载客户导入模板 */
+export function importClientTemplate() {
+  return requestClient.download('/mes/md-client/get-import-template');
+}
+
+/** 导入客户 */
+export function importClient(file: File, updateSupport: boolean) {
+  return requestClient.upload<MesMdClientApi.ClientImportRespVO>(
+    `/mes/md-client/import?updateSupport=${updateSupport}`,
+    { file },
+  );
+}

apps/web-antd/src/api/mes/md/item/batchConfig/index.ts

@@ -0,0 +1,35 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesMdItemBatchConfigApi {
+  /** MES 物料批次属性配置 */
+  export interface BatchConfig {
+    id?: number; // 编号
+    itemId?: number; // 物料编号
+    produceDateFlag?: boolean; // 批次属性-生产日期
+    expireDateFlag?: boolean; // 批次属性-有效期
+    receiptDateFlag?: boolean; // 批次属性-入库日期
+    vendorFlag?: boolean; // 批次属性-供应商
+    clientFlag?: boolean; // 批次属性-客户
+    salesOrderCodeFlag?: boolean; // 批次属性-销售订单编号
+    purchaseOrderCodeFlag?: boolean; // 批次属性-采购订单编号
+    workorderFlag?: boolean; // 批次属性-生产工单
+    taskFlag?: boolean; // 批次属性-生产任务
+    workstationFlag?: boolean; // 批次属性-工作站
+    toolFlag?: boolean; // 批次属性-工具
+    moldFlag?: boolean; // 批次属性-模具
+    lotNumberFlag?: boolean; // 批次属性-生产批号
+    qualityStatusFlag?: boolean; // 批次属性-质量状态
+  }
+}
+
+/** 根据物料编号获取批次属性配置 */
+export function getBatchConfigByItemId(itemId: number) {
+  return requestClient.get<MesMdItemBatchConfigApi.BatchConfig>(
+    `/mes/md/item-batch-config/get-by-item-id?itemId=${itemId}`,
+  );
+}
+
+/** 保存批次属性配置 */
+export function saveBatchConfig(data: MesMdItemBatchConfigApi.BatchConfig) {
+  return requestClient.post('/mes/md/item-batch-config/save', data);
+}

apps/web-antd/src/api/mes/md/item/index.ts

@@ -0,0 +1,85 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesMdItemApi {
+  /** MES 物料产品 */
+  export interface Item {
+    id?: number; // 物料编号
+    code?: string; // 物料编码
+    name?: string; // 物料名称
+    specification?: string; // 规格型号
+    unitMeasureId?: number; // 计量单位编号
+    unitMeasureName?: string; // 计量单位名称
+    itemTypeId?: number; // 物料分类编号
+    itemTypeName?: string; // 物料分类名称
+    itemOrProduct?: string; // 物料/产品标识
+    status?: number; // 状态
+    safeStockFlag?: boolean; // 是否启用安全库存
+    minStock?: number; // 最低库存量
+    maxStock?: number; // 最高库存量
+    highValue?: boolean; // 是否高值物料
+    batchFlag?: boolean; // 是否启用批次管理
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+
+  /** 物料导入结果 */
+  export interface ItemImportRespVO {
+    createCodes?: string[]; // 新增成功的物料编码
+    updateCodes?: string[]; // 更新成功的物料编码
+    failureCodes?: Record<string, string>; // 导入失败的物料编码及原因
+  }
+}
+
+/** 查询物料产品分页 */
+export function getItemPage(params: PageParam) {
+  return requestClient.get<PageResult<MesMdItemApi.Item>>('/mes/md/item/page', {
+    params,
+  });
+}
+
+/** 查询物料产品详情 */
+export function getItem(id: number) {
+  return requestClient.get<MesMdItemApi.Item>(`/mes/md/item/get?id=${id}`);
+}
+
+/** 新增物料产品 */
+export function createItem(data: MesMdItemApi.Item) {
+  return requestClient.post<number>('/mes/md/item/create', data);
+}
+
+/** 修改物料产品 */
+export function updateItem(data: MesMdItemApi.Item) {
+  return requestClient.put('/mes/md/item/update', data);
+}
+
+/** 修改物料产品状态 */
+export function updateItemStatus(id: number, status: number) {
+  return requestClient.put('/mes/md/item/update-status', undefined, {
+    params: { id, status },
+  });
+}
+
+/** 删除物料产品 */
+export function deleteItem(id: number) {
+  return requestClient.delete(`/mes/md/item/delete?id=${id}`);
+}
+
+/** 导出物料产品 */
+export function exportItem(params: any) {
+  return requestClient.download('/mes/md/item/export-excel', { params });
+}
+
+/** 下载物料导入模板 */
+export function importItemTemplate() {
+  return requestClient.download('/mes/md/item/get-import-template');
+}
+
+/** 导入物料产品 */
+export function importItem(file: File, updateSupport: boolean) {
+  return requestClient.upload<MesMdItemApi.ItemImportRespVO>(
+    `/mes/md/item/import?updateSupport=${updateSupport}`,
+    { file },
+  );
+}

apps/web-antd/src/api/mes/md/item/productBom/index.ts

@@ -0,0 +1,58 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesMdProductBomApi {
+  /** MES 产品 BOM */
+  export interface ProductBom {
+    id?: number; // BOM 编号
+    itemId?: number; // 物料产品编号
+    bomItemId?: number; // BOM 物料编号
+    quantity?: number; // 物料使用比例
+    status?: number; // 是否启用
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+    bomItemCode?: string; // BOM 物料编码
+    bomItemName?: string; // BOM 物料名称
+    bomItemSpecification?: string; // BOM 物料规格
+    unitMeasureName?: string; // 计量单位名称
+    itemOrProduct?: string; // 物料/产品标识
+  }
+}
+
+/** 新增产品 BOM */
+export function createProductBom(data: MesMdProductBomApi.ProductBom) {
+  return requestClient.post('/mes/md/product-bom/create', data);
+}
+
+/** 修改产品 BOM */
+export function updateProductBom(data: MesMdProductBomApi.ProductBom) {
+  return requestClient.put('/mes/md/product-bom/update', data);
+}
+
+/** 删除产品 BOM */
+export function deleteProductBom(id: number) {
+  return requestClient.delete(`/mes/md/product-bom/delete?id=${id}`);
+}
+
+/** 查询产品 BOM 详情 */
+export function getProductBom(id: number) {
+  return requestClient.get<MesMdProductBomApi.ProductBom>(
+    `/mes/md/product-bom/get?id=${id}`,
+  );
+}
+
+/** 查询产品 BOM 分页 */
+export function getProductBomPage(params: PageParam) {
+  return requestClient.get<PageResult<MesMdProductBomApi.ProductBom>>(
+    '/mes/md/product-bom/page',
+    { params },
+  );
+}
+
+/** 根据物料产品编号查询产品 BOM 列表 */
+export function getProductBomListByItemId(itemId: number) {
+  return requestClient.get<MesMdProductBomApi.ProductBom[]>(
+    `/mes/md/product-bom/list-by-item-id?itemId=${itemId}`,
+  );
+}

apps/web-antd/src/api/mes/md/item/productSip/index.ts

@@ -0,0 +1,57 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesMdProductSipApi {
+  /** MES 产品 SIP */
+  export interface ProductSip {
+    id?: number; // SIP 编号
+    itemId?: number; // 物料产品编号
+    sort?: number; // 排列顺序
+    processId?: number; // 工序编号
+    title?: string; // 标题
+    description?: string; // 详细描述
+    url?: string; // 图片地址
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+    processCode?: string; // 工序编码
+    processName?: string; // 工序名称
+  }
+}
+
+/** 新增产品 SIP */
+export function createProductSip(data: MesMdProductSipApi.ProductSip) {
+  return requestClient.post('/mes/md/product-sip/create', data);
+}
+
+/** 修改产品 SIP */
+export function updateProductSip(data: MesMdProductSipApi.ProductSip) {
+  return requestClient.put('/mes/md/product-sip/update', data);
+}
+
+/** 删除产品 SIP */
+export function deleteProductSip(id: number) {
+  return requestClient.delete(`/mes/md/product-sip/delete?id=${id}`);
+}
+
+/** 查询产品 SIP 详情 */
+export function getProductSip(id: number) {
+  return requestClient.get<MesMdProductSipApi.ProductSip>(
+    `/mes/md/product-sip/get?id=${id}`,
+  );
+}
+
+/** 查询产品 SIP 分页 */
+export function getProductSipPage(params: PageParam) {
+  return requestClient.get<PageResult<MesMdProductSipApi.ProductSip>>(
+    '/mes/md/product-sip/page',
+    { params },
+  );
+}
+
+/** 根据物料产品编号查询产品 SIP 列表 */
+export function getProductSipListByItemId(itemId: number) {
+  return requestClient.get<MesMdProductSipApi.ProductSip[]>(
+    `/mes/md/product-sip/list-by-item-id?itemId=${itemId}`,
+  );
+}

apps/web-antd/src/api/mes/md/item/productSop/index.ts

@@ -0,0 +1,57 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesMdProductSopApi {
+  /** MES 产品 SOP */
+  export interface ProductSop {
+    id?: number; // SOP 编号
+    itemId?: number; // 物料产品编号
+    sort?: number; // 排列顺序
+    processId?: number; // 工序编号
+    title?: string; // 标题
+    description?: string; // 详细描述
+    url?: string; // 图片地址
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+    processCode?: string; // 工序编码
+    processName?: string; // 工序名称
+  }
+}
+
+/** 新增产品 SOP */
+export function createProductSop(data: MesMdProductSopApi.ProductSop) {
+  return requestClient.post('/mes/md/product-sop/create', data);
+}
+
+/** 修改产品 SOP */
+export function updateProductSop(data: MesMdProductSopApi.ProductSop) {
+  return requestClient.put('/mes/md/product-sop/update', data);
+}
+
+/** 删除产品 SOP */
+export function deleteProductSop(id: number) {
+  return requestClient.delete(`/mes/md/product-sop/delete?id=${id}`);
+}
+
+/** 查询产品 SOP 详情 */
+export function getProductSop(id: number) {
+  return requestClient.get<MesMdProductSopApi.ProductSop>(
+    `/mes/md/product-sop/get?id=${id}`,
+  );
+}
+
+/** 查询产品 SOP 分页 */
+export function getProductSopPage(params: PageParam) {
+  return requestClient.get<PageResult<MesMdProductSopApi.ProductSop>>(
+    '/mes/md/product-sop/page',
+    { params },
+  );
+}
+
+/** 根据物料产品编号查询产品 SOP 列表 */
+export function getProductSopListByItemId(itemId: number) {
+  return requestClient.get<MesMdProductSopApi.ProductSop[]>(
+    `/mes/md/product-sop/list-by-item-id?itemId=${itemId}`,
+  );
+}

apps/web-antd/src/api/mes/md/item/type/index.ts

@@ -0,0 +1,54 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesMdItemTypeApi {
+  /** MES 物料产品分类 */
+  export interface ItemType {
+    id?: number; // 分类编号
+    parentId?: number; // 父分类编号
+    code?: string; // 分类编码
+    name?: string; // 分类名称
+    itemOrProduct?: string; // 物料/产品标识
+    sort?: number; // 显示排序
+    status?: number; // 状态
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+    children?: ItemType[]; // 子分类
+  }
+}
+
+/** 查询物料产品分类列表 */
+export function getItemTypeList(params?: any) {
+  return requestClient.get<MesMdItemTypeApi.ItemType[]>(
+    '/mes/md/item-type/list',
+    { params },
+  );
+}
+
+/** 查询物料产品分类精简列表 */
+export function getItemTypeSimpleList() {
+  return requestClient.get<MesMdItemTypeApi.ItemType[]>(
+    '/mes/md/item-type/simple-list',
+  );
+}
+
+/** 查询物料产品分类详情 */
+export function getItemType(id: number) {
+  return requestClient.get<MesMdItemTypeApi.ItemType>(
+    `/mes/md/item-type/get?id=${id}`,
+  );
+}
+
+/** 新增物料产品分类 */
+export function createItemType(data: MesMdItemTypeApi.ItemType) {
+  return requestClient.post('/mes/md/item-type/create', data);
+}
+
+/** 修改物料产品分类 */
+export function updateItemType(data: MesMdItemTypeApi.ItemType) {
+  return requestClient.put('/mes/md/item-type/update', data);
+}
+
+/** 删除物料产品分类 */
+export function deleteItemType(id: number) {
+  return requestClient.delete(`/mes/md/item-type/delete?id=${id}`);
+}

apps/web-antd/src/api/mes/md/unitmeasure/index.ts

@@ -0,0 +1,62 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesMdUnitMeasureApi {
+  /** MES 计量单位 */
+  export interface UnitMeasure {
+    id?: number; // 单位编号
+    code?: string; // 单位编码
+    name?: string; // 单位名称
+    primaryFlag?: boolean; // 是否主单位
+    primaryId?: number; // 主单位编号
+    changeRate?: number; // 与主单位换算比例
+    status?: number; // 状态
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询计量单位分页 */
+export function getUnitMeasurePage(params: PageParam) {
+  return requestClient.get<PageResult<MesMdUnitMeasureApi.UnitMeasure>>(
+    '/mes/md/unit-measure/page',
+    { params },
+  );
+}
+
+/** 查询计量单位精简列表 */
+export function getUnitMeasureSimpleList() {
+  return requestClient.get<MesMdUnitMeasureApi.UnitMeasure[]>(
+    '/mes/md/unit-measure/simple-list',
+  );
+}
+
+/** 查询计量单位详情 */
+export function getUnitMeasure(id: number) {
+  return requestClient.get<MesMdUnitMeasureApi.UnitMeasure>(
+    `/mes/md/unit-measure/get?id=${id}`,
+  );
+}
+
+/** 新增计量单位 */
+export function createUnitMeasure(data: MesMdUnitMeasureApi.UnitMeasure) {
+  return requestClient.post('/mes/md/unit-measure/create', data);
+}
+
+/** 修改计量单位 */
+export function updateUnitMeasure(data: MesMdUnitMeasureApi.UnitMeasure) {
+  return requestClient.put('/mes/md/unit-measure/update', data);
+}
+
+/** 删除计量单位 */
+export function deleteUnitMeasure(id: number) {
+  return requestClient.delete(`/mes/md/unit-measure/delete?id=${id}`);
+}
+
+/** 导出计量单位 */
+export function exportUnitMeasure(params: PageParam) {
+  return requestClient.download('/mes/md/unit-measure/export-excel', {
+    params,
+  });
+}

apps/web-antd/src/api/mes/md/vendor/index.ts

@@ -0,0 +1,87 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesMdVendorApi {
+  /** MES 供应商 */
+  export interface Vendor {
+    id?: number; // 供应商编号
+    code?: string; // 供应商编码
+    name?: string; // 供应商名称
+    nickname?: string; // 供应商简称
+    englishName?: string; // 供应商英文名称
+    description?: string; // 供应商简介
+    logo?: string; // 供应商 LOGO 地址
+    level?: string; // 供应商等级
+    score?: number; // 供应商评分
+    address?: string; // 供应商地址
+    website?: string; // 供应商官网地址
+    email?: string; // 供应商邮箱地址
+    telephone?: string; // 供应商电话
+    contact1Name?: string; // 联系人1
+    contact1Telephone?: string; // 联系人1电话
+    contact1Email?: string; // 联系人1邮箱
+    contact2Name?: string; // 联系人2
+    contact2Telephone?: string; // 联系人2电话
+    contact2Email?: string; // 联系人2邮箱
+    creditCode?: string; // 统一社会信用代码
+    status?: number; // 状态
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+
+  /** 供应商导入结果 */
+  export interface VendorImportRespVO {
+    createCodes?: string[]; // 新增成功的供应商编码
+    updateCodes?: string[]; // 更新成功的供应商编码
+    failureCodes?: Record<string, string>; // 导入失败的供应商编码及原因
+  }
+}
+
+/** 查询供应商分页 */
+export function getVendorPage(params: PageParam) {
+  return requestClient.get<PageResult<MesMdVendorApi.Vendor>>(
+    '/mes/md-vendor/page',
+    { params },
+  );
+}
+
+/** 查询供应商详情 */
+export function getVendor(id: number) {
+  return requestClient.get<MesMdVendorApi.Vendor>(
+    `/mes/md-vendor/get?id=${id}`,
+  );
+}
+
+/** 新增供应商 */
+export function createVendor(data: MesMdVendorApi.Vendor) {
+  return requestClient.post('/mes/md-vendor/create', data);
+}
+
+/** 修改供应商 */
+export function updateVendor(data: MesMdVendorApi.Vendor) {
+  return requestClient.put('/mes/md-vendor/update', data);
+}
+
+/** 删除供应商 */
+export function deleteVendor(id: number) {
+  return requestClient.delete(`/mes/md-vendor/delete?id=${id}`);
+}
+
+/** 导出供应商 */
+export function exportVendor(params: any) {
+  return requestClient.download('/mes/md-vendor/export-excel', { params });
+}
+
+/** 下载供应商导入模板 */
+export function importVendorTemplate() {
+  return requestClient.download('/mes/md-vendor/get-import-template');
+}
+
+/** 导入供应商 */
+export function importVendor(file: File, updateSupport: boolean) {
+  return requestClient.upload<MesMdVendorApi.VendorImportRespVO>(
+    `/mes/md-vendor/import?updateSupport=${updateSupport}`,
+    { file },
+  );
+}

apps/web-antd/src/api/mes/md/workstation/index.ts

@@ -0,0 +1,58 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesMdWorkstationApi {
+  /** MES 工作站 */
+  export interface Workstation {
+    id?: number; // 工作站编号
+    code?: string; // 工作站编码
+    name?: string; // 工作站名称
+    address?: string; // 工作站地点
+    workshopId?: number; // 所在车间编号
+    workshopName?: string; // 所在车间名称
+    processId?: number; // 工序编号
+    processName?: string; // 工序名称
+    warehouseId?: number; // 线边库编号
+    locationId?: number; // 库区编号
+    areaId?: number; // 库位编号
+    status?: number; // 状态
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询工作站分页 */
+export function getWorkstationPage(params: PageParam) {
+  return requestClient.get<PageResult<MesMdWorkstationApi.Workstation>>(
+    '/mes/md-workstation/page',
+    { params },
+  );
+}
+
+/** 查询工作站详情 */
+export function getWorkstation(id: number) {
+  return requestClient.get<MesMdWorkstationApi.Workstation>(
+    `/mes/md-workstation/get?id=${id}`,
+  );
+}
+
+/** 新增工作站 */
+export function createWorkstation(data: MesMdWorkstationApi.Workstation) {
+  return requestClient.post<number>('/mes/md-workstation/create', data);
+}
+
+/** 修改工作站 */
+export function updateWorkstation(data: MesMdWorkstationApi.Workstation) {
+  return requestClient.put('/mes/md-workstation/update', data);
+}
+
+/** 删除工作站 */
+export function deleteWorkstation(id: number) {
+  return requestClient.delete(`/mes/md-workstation/delete?id=${id}`);
+}
+
+/** 导出工作站 */
+export function exportWorkstation(params: any) {
+  return requestClient.download('/mes/md-workstation/export-excel', { params });
+}

apps/web-antd/src/api/mes/md/workstation/machine/index.ts

@@ -0,0 +1,35 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesMdWorkstationMachineApi {
+  /** MES 工作站设备资源 */
+  export interface WorkstationMachine {
+    id?: number; // 资源编号
+    workstationId?: number; // 工作站编号
+    machineryId?: number; // 设备编号
+    machineryCode?: string; // 设备编码
+    machineryName?: string; // 设备名称
+    quantity?: number; // 数量
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询工作站设备资源列表 */
+export function getWorkstationMachineList(workstationId: number) {
+  return requestClient.get<MesMdWorkstationMachineApi.WorkstationMachine[]>(
+    '/mes/md-workstation-machine/list-by-workstation',
+    { params: { workstationId } },
+  );
+}
+
+/** 新增工作站设备资源 */
+export function createWorkstationMachine(
+  data: MesMdWorkstationMachineApi.WorkstationMachine,
+) {
+  return requestClient.post('/mes/md-workstation-machine/create', data);
+}
+
+/** 删除工作站设备资源 */
+export function deleteWorkstationMachine(id: number) {
+  return requestClient.delete(`/mes/md-workstation-machine/delete?id=${id}`);
+}

apps/web-antd/src/api/mes/md/workstation/tool/index.ts

@@ -0,0 +1,41 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesMdWorkstationToolApi {
+  /** MES 工作站工装夹具资源 */
+  export interface WorkstationTool {
+    id?: number; // 资源编号
+    workstationId?: number; // 工作站编号
+    toolTypeId?: number; // 工具类型编号
+    toolTypeName?: string; // 工具类型名称
+    quantity?: number; // 数量
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询工作站工装夹具资源列表 */
+export function getWorkstationToolList(workstationId: number) {
+  return requestClient.get<MesMdWorkstationToolApi.WorkstationTool[]>(
+    '/mes/md-workstation-tool/list-by-workstation',
+    { params: { workstationId } },
+  );
+}
+
+/** 新增工作站工装夹具资源 */
+export function createWorkstationTool(
+  data: MesMdWorkstationToolApi.WorkstationTool,
+) {
+  return requestClient.post('/mes/md-workstation-tool/create', data);
+}
+
+/** 修改工作站工装夹具资源 */
+export function updateWorkstationTool(
+  data: MesMdWorkstationToolApi.WorkstationTool,
+) {
+  return requestClient.put('/mes/md-workstation-tool/update', data);
+}
+
+/** 删除工作站工装夹具资源 */
+export function deleteWorkstationTool(id: number) {
+  return requestClient.delete(`/mes/md-workstation-tool/delete?id=${id}`);
+}

apps/web-antd/src/api/mes/md/workstation/worker/index.ts

@@ -0,0 +1,41 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesMdWorkstationWorkerApi {
+  /** MES 工作站人力资源 */
+  export interface WorkstationWorker {
+    id?: number; // 资源编号
+    workstationId?: number; // 工作站编号
+    postId?: number; // 岗位编号
+    postName?: string; // 岗位名称
+    quantity?: number; // 数量
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询工作站人力资源列表 */
+export function getWorkstationWorkerList(workstationId: number) {
+  return requestClient.get<MesMdWorkstationWorkerApi.WorkstationWorker[]>(
+    '/mes/md-workstation-worker/list-by-workstation',
+    { params: { workstationId } },
+  );
+}
+
+/** 新增工作站人力资源 */
+export function createWorkstationWorker(
+  data: MesMdWorkstationWorkerApi.WorkstationWorker,
+) {
+  return requestClient.post('/mes/md-workstation-worker/create', data);
+}
+
+/** 修改工作站人力资源 */
+export function updateWorkstationWorker(
+  data: MesMdWorkstationWorkerApi.WorkstationWorker,
+) {
+  return requestClient.put('/mes/md-workstation-worker/update', data);
+}
+
+/** 删除工作站人力资源 */
+export function deleteWorkstationWorker(id: number) {
+  return requestClient.delete(`/mes/md-workstation-worker/delete?id=${id}`);
+}

apps/web-antd/src/api/mes/md/workstation/workshop/index.ts

@@ -0,0 +1,60 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesMdWorkshopApi {
+  /** MES 车间 */
+  export interface Workshop {
+    id?: number; // 车间编号
+    code?: string; // 车间编码
+    name?: string; // 车间名称
+    area?: number; // 面积
+    chargeUserId?: number; // 负责人用户编号
+    chargeUserName?: string; // 负责人名称
+    status?: number; // 状态
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询车间分页 */
+export function getWorkshopPage(params: PageParam) {
+  return requestClient.get<PageResult<MesMdWorkshopApi.Workshop>>(
+    '/mes/md-workshop/page',
+    { params },
+  );
+}
+
+/** 查询车间精简列表 */
+export function getWorkshopSimpleList() {
+  return requestClient.get<MesMdWorkshopApi.Workshop[]>(
+    '/mes/md-workshop/simple-list',
+  );
+}
+
+/** 查询车间详情 */
+export function getWorkshop(id: number) {
+  return requestClient.get<MesMdWorkshopApi.Workshop>(
+    `/mes/md-workshop/get?id=${id}`,
+  );
+}
+
+/** 新增车间 */
+export function createWorkshop(data: MesMdWorkshopApi.Workshop) {
+  return requestClient.post('/mes/md-workshop/create', data);
+}
+
+/** 修改车间 */
+export function updateWorkshop(data: MesMdWorkshopApi.Workshop) {
+  return requestClient.put('/mes/md-workshop/update', data);
+}
+
+/** 删除车间 */
+export function deleteWorkshop(id: number) {
+  return requestClient.delete(`/mes/md-workshop/delete?id=${id}`);
+}
+
+/** 导出车间 */
+export function exportWorkshop(params: any) {
+  return requestClient.download('/mes/md-workshop/export-excel', { params });
+}