Merge branch 'main' of http://27.223.88.102:33000/chenx/qhmes

build-frontend.bat

@@ -0,0 +1,31 @@
+@echo off
+setlocal
+set REPO=%~dp0
+set WEBDIST=%REPO%web-dist
+
+echo [1/4] build frontend (pnpm install + build) ...
+cd /d %REPO%jeecgboot-vue3
+call pnpm install
+if errorlevel 1 ( echo [ERROR] pnpm install failed & pause & exit /b 1 )
+call pnpm run build
+if errorlevel 1 ( echo [ERROR] frontend build failed & pause & exit /b 1 )
+if not exist "%REPO%jeecgboot-vue3\dist\index.html" ( echo [ERROR] dist/index.html not found & pause & exit /b 1 )
+
+echo [2/4] refresh web-dist folder ...
+if exist "%WEBDIST%" rmdir /S /Q "%WEBDIST%"
+mkdir "%WEBDIST%"
+xcopy "%REPO%jeecgboot-vue3\dist\*" "%WEBDIST%\" /E /Y /I >nul
+
+echo [3/4] git add and commit web-dist ...
+cd /d %REPO%
+git add web-dist
+git commit -m "frontend build dist update"
+
+echo [4/4] git push ...
+git push
+if errorlevel 1 ( echo [ERROR] git push failed & pause & exit /b 1 )
+
+echo.
+echo ===== FRONTEND BUILT AND PUSHED. Now run deploy-frontend.bat on the server. =====
+endlocal
+pause

build.bat

@@ -0,0 +1,26 @@
+@echo off
+setlocal
+echo ========================================
+echo   QH-MES Backend Quick Build
+echo ========================================
+
+cd /d %~dp0jeecg-boot
+
+echo [1/2] Building start module and its dependencies...
+call mvn clean package -pl jeecg-module-system/jeecg-system-start -am -DskipTests -T 1C
+if errorlevel 1 (
+    echo.
+    echo [FAILED] Build error, please check the log above.
+    pause
+    exit /b 1
+)
+
+echo.
+echo [2/2] Build SUCCESS!
+echo Output: %~dp0jeecg-boot\jeecg-module-system\jeecg-system-start\target\jeecg-system-start-3.9.2.jar
+echo.
+
+explorer "%~dp0jeecg-boot\jeecg-module-system\jeecg-system-start\target"
+
+endlocal
+pause

deploy-frontend.bat

@@ -0,0 +1,27 @@
+@echo off
+setlocal
+set SRC=D:\qhmes-src
+set GIT="C:\Program Files\Git\cmd\git.exe"
+set WEB=D:\qhmes\nginx-1.30.1\html\jeecg
+set NGINX_DIR=D:\qhmes\nginx-1.30.1
+
+echo [1/3] git pull ...
+cd /d %SRC%
+%GIT% pull
+if errorlevel 1 ( echo [ERROR] git pull failed & pause & exit /b 1 )
+if not exist "%SRC%\web-dist\index.html" ( echo [ERROR] web-dist not found in repo, run build-frontend.bat first & pause & exit /b 1 )
+
+echo [2/3] replace nginx frontend files ...
+if exist "%WEB%" rmdir /S /Q "%WEB%"
+mkdir "%WEB%"
+xcopy "%SRC%\web-dist\*" "%WEB%\" /E /Y /I >nul
+if errorlevel 1 ( echo [ERROR] copy failed & pause & exit /b 1 )
+
+echo [3/3] reload nginx (ignore error if nginx not running) ...
+cd /d %NGINX_DIR%
+nginx.exe -s reload
+
+echo.
+echo ===== FRONTEND DEPLOY DONE =====
+endlocal
+pause

deploy-server.bat

@@ -0,0 +1,36 @@
+@echo off
+setlocal
+set SRC=D:\qhmes-src
+set GIT="C:\Program Files\Git\cmd\git.exe"
+set DEPLOY_DIR=D:\qhmes
+set JAR_NAME=jeecg-system-start-3.9.2.jar
+set SVC=D:\qhmes\qhmes-service.exe
+set BUILT_JAR=%SRC%\jeecg-boot\jeecg-module-system\jeecg-system-start\target\%JAR_NAME%
+
+echo [1/5] git pull ...
+cd /d %SRC%
+%GIT% pull
+if errorlevel 1 ( echo [ERROR] git pull failed & pause & exit /b 1 )
+
+echo [2/5] maven package with prod profile ...
+cd /d %SRC%\jeecg-boot
+call mvn clean package -pl jeecg-module-system/jeecg-system-start -am -DskipTests -P prod -T 1C
+if errorlevel 1 ( echo [ERROR] build failed & pause & exit /b 1 )
+if not exist "%BUILT_JAR%" ( echo [ERROR] built jar not found & pause & exit /b 1 )
+
+echo [3/5] stop service ...
+"%SVC%" stop
+timeout /t 6 /nobreak >nul
+
+echo [4/5] copy new jar ...
+copy /Y "%BUILT_JAR%" "%DEPLOY_DIR%\%JAR_NAME%"
+if errorlevel 1 ( echo [ERROR] copy failed, jar locked? & pause & exit /b 1 )
+
+echo [5/5] start service ...
+"%SVC%" start
+
+echo.
+echo ===== DEPLOY DONE =====
+echo Check log: powershell -Command "Get-Content D:\qhmes\logs\qhmes-service.out.log -Wait -Tail 50"
+endlocal
+pause

docs/QH-MES部署与热部署方案.md

@@ -0,0 +1,282 @@
+# QH-MES 部署与热部署方案
+
+> 本文档记录 QH-MES(jeecg-boot 3.9.2)在 Windows Server 上的部署方案,包含后端、前端的一键发版流程、关键配置、踩过的坑,以及未来上线客户正式服务器的规划。
+> 最后更新:2026-06-17
+
+---
+
+## 一、环境概况
+
+### 测试服务器(当前)
+- **系统**:Windows Server 2016 Standard
+- **JDK**:17.0.11(`C:\Program Files\Java\jdk-17`,注意 `JAVA_HOME` 要指根目录,**不能带 `\bin`**)
+- **Maven**:3.9.8(`D:\apache-maven-3.9.8`,从本地 Win11 拷过去的,因服务器网络受限无法在线下载)
+- **Git**:已装在 `C:\Program Files\Git`,但不在 PATH(用完整路径 `"C:\Program Files\Git\cmd\git.exe"` 调用)
+- **Gitea**:跑在**同一台机器**,裸仓库在 `D:\gitea\data\gitea-repositories\chenx\qhmes.git`,Web 地址 `http://27.223.88.102:33000/chenx/qhmes`
+- **Nginx**:1.30.1,装在 `D:\qhmes\nginx-1.30.1\`,前端文件目录 `D:\qhmes\nginx-1.30.1\html\jeecg\`
+- **Node/pnpm/npm**:**服务器上没装**(前端不在服务器构建)
+
+### 关键路径
+| 用途 | 路径 |
+|------|------|
+| 后端运行目录(jar + WinSW 服务) | `D:\qhmes\` |
+| 后端运行 jar | `D:\qhmes\jeecg-system-start-3.9.2.jar` |
+| 服务器源码工作副本 | `D:\qhmes-src\`(从本地裸仓库 clone,分支 `main`) |
+| 前端 nginx 目录 | `D:\qhmes\nginx-1.30.1\html\jeecg\` |
+| WinSW 服务程序/配置 | `D:\qhmes\qhmes-service.exe` / `qhmes-service.xml` |
+| 后端发版脚本 | `D:\deploy-server.bat`(放源码目录外,避免 git pull 自我覆盖) |
+
+### 本地开发机(Win11)
+- 项目路径:`D:\XSL-PROJECT\QH-MES\qhmes`
+- 后端模块:`jeecg-boot/`,前端:`jeecgboot-vue3/`(同一个 git 仓库)
+- 传文件到服务器的方式:**向日葵远程传输**(只能手动,不能脚本化)
+
+---
+
+## 二、后端部署(已跑通 ✅)
+
+### 2.1 后端做成 Windows 服务(WinSW)
+后端不再手动 `java -jar`(关窗口/断 RDP 就掉),改用 **WinSW** 注册成 Windows 服务,开机自启、崩溃自动重启。
+
+- 服务 id:`qhmes`,名称:`QH-MES Backend`
+- 配置文件 `D:\qhmes\qhmes-service.xml` 关键内容:
+  ```xml
+  <executable>java</executable>
+  <arguments>-Xms1g -Xmx2g -jar "D:\qhmes\jeecg-system-start-3.9.2.jar"</arguments>
+  <workingdirectory>D:\qhmes</workingdirectory>
+  <logpath>D:\qhmes\logs</logpath>
+  <onfailure action="restart" delay="10 sec"/>
+  ```
+- **注意**:`<arguments>` 里**不加** `--spring.profiles.active`,因为 profile 已在打包时烤进 jar(见第四节)。
+- 常用命令(管理员):
+  ```
+  D:\qhmes\qhmes-service.exe install   # 安装服务(一次性)
+  D:\qhmes\qhmes-service.exe start     # 启动
+  D:\qhmes\qhmes-service.exe stop      # 停止
+  ```
+- 查日志:
+  ```powershell
+  Get-Content D:\qhmes\logs\qhmes-service.out.log -Wait -Tail 60
+  ```
+  启动成功标志:`Started JeecgSystemApplication in xx seconds`,Tomcat 监听 8888。
+
+### 2.2 一键发版脚本 `D:\deploy-server.bat`
+流程:`git pull → mvn 打包(prod) → 停服务 → 换 jar → 启服务`。脚本自带 `git pull`,**双击即自动拉最新代码**。
+
+```bat
+@echo off
+setlocal
+set SRC=D:\qhmes-src
+set GIT="C:\Program Files\Git\cmd\git.exe"
+set DEPLOY_DIR=D:\qhmes
+set JAR_NAME=jeecg-system-start-3.9.2.jar
+set SVC=D:\qhmes\qhmes-service.exe
+set BUILT_JAR=%SRC%\jeecg-boot\jeecg-module-system\jeecg-system-start\target\%JAR_NAME%
+
+echo [1/5] git pull ...
+cd /d %SRC%
+%GIT% pull
+if errorlevel 1 ( echo [ERROR] git pull failed & pause & exit /b 1 )
+
+echo [2/5] maven package with prod profile ...
+cd /d %SRC%\jeecg-boot
+call mvn clean package -pl jeecg-module-system/jeecg-system-start -am -DskipTests -P prod -T 1C
+if errorlevel 1 ( echo [ERROR] build failed & pause & exit /b 1 )
+if not exist "%BUILT_JAR%" ( echo [ERROR] built jar not found & pause & exit /b 1 )
+
+echo [3/5] stop service ...
+"%SVC%" stop
+timeout /t 6 /nobreak >nul
+
+echo [4/5] copy new jar ...
+copy /Y "%BUILT_JAR%" "%DEPLOY_DIR%\%JAR_NAME%"
+if errorlevel 1 ( echo [ERROR] copy failed, jar locked? & pause & exit /b 1 )
+
+echo [5/5] start service ...
+"%SVC%" start
+echo ===== DEPLOY DONE =====
+endlocal
+pause
+```
+
+### 2.3 后端发版流程
+1. 本地改代码 → `git push`(推到 `main`)
+2. RDP/向日葵到服务器 → 双击 `D:\deploy-server.bat`
+3. 看日志确认 `Started ... in xx seconds`
+
+> 首次构建会下载几百 MB 依赖(约 8 分钟),缓存在 `D:\maven-repo`,之后每次只需 1~3 分钟。
+
+---
+
+## 三、前端部署(脚本已就绪)
+
+前端 `jeecgboot-vue3` 用 **pnpm** 构建,产物 `dist/`,放到 nginx 的 `html\jeecg\`。
+因服务器没 Node 且网络受限,**前端不在服务器构建**,而是:**本地构建 → dist 走 git → 服务器拉取替换**。
+
+> `jeecgboot-vue3/dist` 被 `.gitignore` 忽略,所以构建后复制到根目录 **`web-dist`** 文件夹(未被忽略)再提交。
+
+### 3.1 本地构建脚本 `build-frontend.bat`(本地 Win11 双击)
+核心构建步骤与官网一致:`pnpm install` + `pnpm run build`,之后自动复制 dist 到 web-dist 并 git push。
+
+```bat
+@echo off
+setlocal
+set REPO=%~dp0
+set WEBDIST=%REPO%web-dist
+
+echo [1/4] build frontend (pnpm install + build) ...
+cd /d %REPO%jeecgboot-vue3
+call pnpm install
+if errorlevel 1 ( echo [ERROR] pnpm install failed & pause & exit /b 1 )
+call pnpm run build
+if errorlevel 1 ( echo [ERROR] frontend build failed & pause & exit /b 1 )
+if not exist "%REPO%jeecgboot-vue3\dist\index.html" ( echo [ERROR] dist/index.html not found & pause & exit /b 1 )
+
+echo [2/4] refresh web-dist folder ...
+if exist "%WEBDIST%" rmdir /S /Q "%WEBDIST%"
+mkdir "%WEBDIST%"
+xcopy "%REPO%jeecgboot-vue3\dist\*" "%WEBDIST%\" /E /Y /I >nul
+
+echo [3/4] git add and commit web-dist ...
+cd /d %REPO%
+git add web-dist
+git commit -m "frontend build dist update"
+
+echo [4/4] git push ...
+git push
+if errorlevel 1 ( echo [ERROR] git push failed & pause & exit /b 1 )
+echo ===== FRONTEND BUILT AND PUSHED =====
+endlocal
+pause
+```
+
+### 3.2 服务器部署脚本 `D:\deploy-frontend.bat`(服务器双击)
+```bat
+@echo off
+setlocal
+set SRC=D:\qhmes-src
+set GIT="C:\Program Files\Git\cmd\git.exe"
+set WEB=D:\qhmes\nginx-1.30.1\html\jeecg
+set NGINX_DIR=D:\qhmes\nginx-1.30.1
+
+echo [1/3] git pull ...
+cd /d %SRC%
+%GIT% pull
+if errorlevel 1 ( echo [ERROR] git pull failed & pause & exit /b 1 )
+if not exist "%SRC%\web-dist\index.html" ( echo [ERROR] web-dist not found, run build-frontend.bat first & pause & exit /b 1 )
+
+echo [2/3] replace nginx frontend files ...
+if exist "%WEB%" rmdir /S /Q "%WEB%"
+mkdir "%WEB%"
+xcopy "%SRC%\web-dist\*" "%WEB%\" /E /Y /I >nul
+if errorlevel 1 ( echo [ERROR] copy failed & pause & exit /b 1 )
+
+echo [3/3] reload nginx (ignore error if not running) ...
+cd /d %NGINX_DIR%
+nginx.exe -s reload
+echo ===== FRONTEND DEPLOY DONE =====
+endlocal
+pause
+```
+> **nginx 不用重启**:静态文件替换后自动生效。`nginx -s reload` 是平滑重载,**不要直接跑 `nginx.exe`**(会报端口占用)。
+
+### 3.3 前端发版流程(两步双击)
+1. 本地双击 `build-frontend.bat`(构建 + 推送 web-dist)
+2. 服务器双击 `D:\deploy-frontend.bat`(拉取 + 替换 + reload)
+3. 刷新浏览器
+
+---
+
+## 四、配置(profile)说明 —— 重点
+
+### 4.1 哪个配置生效,由打包时的 Maven `-P` 决定
+`application.yml` 里 `spring.profiles.active: '@profile.name@'` 是 Maven 占位符,打包时填入:
+
+| 打包命令 | 生效配置 |
+|---------|---------|
+| `mvn package`(不带 -P) | **dev**(默认,`<activeByDefault>` 在 dev 上) |
+| `mvn package -P prod` | **prod** |
+| `mvn package -P test` | test |
+
+> 发版脚本用的是 **`-P prod`**,所以烤进 jar 的是 prod 配置,运行时无需再加 `--spring.profiles.active`。
+
+### 4.2 判断一个 jar 用的哪个配置
+- 看启动日志:`The following 1 profile is active: "prod"`
+- 解压 jar 看 `BOOT-INF/classes/application.yml` 里 `active` 的实际值
+- 运行时 `--spring.profiles.active=xxx` 可强制覆盖
+
+### 4.3 dev vs prod 的区别(本项目)
+| 项 | dev | prod(当前测试服务器用) |
+|----|-----|------|
+| 端口 | 8888 | 8888(已改成与现网一致) |
+| MySQL | `xsl.qdxsl.top:50768`(公网绕一圈) | `127.0.0.1:3306`(本机直连) |
+| MySQL 密码 | 123456 | 123456(已改,原为 root) |
+
+> **重要事实**:`xsl.qdxsl.top:50768` 与本机 `127.0.0.1:3306` 是**同一个生产库**(公网域名+端口转发到本机)。prod 走本机直连更快更稳。
+> prod 配置的修改在 `application-prod.yml`,已带 `update-begin/update-end` 痕迹注释。
+
+---
+
+## 五、踩过的坑(避免重复)
+
+1. **bat 文件乱码/无法执行**:bat 里写中文 + 存成 UTF-8,cmd 按 GBK 读会乱码,连 `@echo off` 都坏。→ **bat 只用英文 ASCII,不带 BOM**。
+2. **WinSW 报 `Invalid character in encoding`**:xml 里中文存成了 ANSI/GBK。→ 用 UTF-8 保存,或描述改英文。
+3. **服务用 prod 启动报 `Access denied for user 'root'`**:prod 密码原写的 `root`,实际应为 `123456`。
+4. **PowerShell 下载报 `未能创建 SSL/TLS 安全通道`**:Server 2016 默认 TLS 1.0。→ 先 `[Net.ServicePointManager]::SecurityProtocol = ... -bor 3072` 开启 TLS 1.2。
+5. **服务器下载被 `127.0.0.1:10080` 的本机 Apache 拦截 404**:服务器网络有本机代理/DNS 劫持,外网下载不通。→ Maven/Node 等**在本地下好,向日葵拷过去**。
+6. **`mvn` 报 `JAVA_HOME not defined correctly`**:`JAVA_HOME` 误设成了 `...\jdk-17\bin`。→ 应为根目录 `...\jdk-17`。
+7. **`git clone D:\gitea\...qhmes.git` 拿到的没有源码**:那是 Gitea 裸仓库(只有 git 底层数据)。→ `git clone` 它到 `D:\qhmes-src` 得到工作副本。
+8. **cmd 里 `cd D:\xxx` 不切盘**:要用 `cd /d D:\xxx`;`&` 是 PowerShell 语法,cmd 里不能用。
+9. **PowerShell 粘贴 here-string 卡在 `>>`**:终止符 `'@` 没识别。→ 大段内容改用**记事本**另存为(All Files + ANSI),或写进 git 拉取。
+
+---
+
+## 六、未来上线客户正式服务器的规划(待落地)
+
+**核心原则:测试服务器可以 git 拉源码+构建;客户正式服务器只部署"已构建的成品",不放源码、不装构建工具、不依赖我方 gitea。**
+
+### 6.1 目标流程
+```
+我方(测试服务器/开发机):打包出成品(jar + 前端dist)并测好
+        ↓ 向日葵/U盘/网盘 传过去
+客户正式服务器:双击 deploy.bat → 停服务 → 换jar → 换前端 → 启服务
+```
+
+### 6.2 必做改造:配置外置(同一 jar 走天下)
+现在 prod 配置(数据库/IP/密码)烤死在 jar 里,是测试服务器的。客户的库不同,需把配置挪到 jar 外:
+```
+D:\qhmes\
+├── jeecg-system-start-3.9.2.jar     ← 所有环境通用,不用为每个客户重打
+└── config\
+    └── application-prod.yml          ← 本机专属:客户的数据库/IP/密码
+```
+Spring Boot 自动优先读 jar 同级 `config\` 目录的配置(外部 > jar 内 classpath)。
+
+### 6.3 待办(上线时找 Claude 做)
+1. 把 prod 配置从 jar 内挪到外部 `config\`,jar 变环境无关
+2. 写"打 release 包"脚本:一键产出 `jar + 前端dist + deploy.bat` 发布包
+3. 写客户服务器 `deploy.bat`:只"换文件+重启",不构建、不拉源码
+4. (建议)测试服务器也提前切到外置配置,与客户环境保持一致,上线零改动
+
+---
+
+## 七、快速命令速查
+
+```powershell
+# 后端发版
+D:\deploy-server.bat                 # 服务器双击
+
+# 前端发版
+build-frontend.bat                   # 本地 Win11 双击
+D:\deploy-frontend.bat               # 服务器双击
+
+# 看后端日志
+Get-Content D:\qhmes\logs\qhmes-service.out.log -Wait -Tail 60
+
+# 后端服务控制(管理员)
+D:\qhmes\qhmes-service.exe stop|start|status
+
+# nginx 平滑重载(在 nginx 目录下)
+cd /d D:\qhmes\nginx-1.30.1
+nginx.exe -s reload
+```

jeecg-boot/db/mes-xsl-small-material-demand-plan-menu.sql

@@ -0,0 +1,76 @@
+-- 自动/人工小料需求计划 菜单与权限（挂载到 MES密炼工程，兼容 MES管理）
+SET NAMES utf8mb4;
+
+SET @small_parent_id = (
+  SELECT id
+  FROM sys_permission
+  WHERE name = 'MES密炼工程' AND menu_type = 0 AND del_flag = 0
+  ORDER BY create_time ASC
+  LIMIT 1
+);
+SET @small_parent_id = IFNULL(@small_parent_id, (
+  SELECT id
+  FROM sys_permission
+  WHERE url = '/mes' AND menu_type = 0 AND del_flag = 0
+  ORDER BY create_time ASC
+  LIMIT 1
+));
+SET @small_parent_id = IFNULL(@small_parent_id, '1860000000000000001');
+
+-- 自动小料需求计划
+INSERT INTO sys_permission
+(`id`,`parent_id`,`name`,`url`,`component`,`component_name`,`menu_type`,`perms`,`perms_type`,`sort_no`,`always_show`,`icon`,`is_route`,`is_leaf`,`keep_alive`,`hidden`,`hide_tab`,`description`,`status`,`del_flag`,`create_by`,`create_time`,`rule_flag`,`internal_or_external`)
+VALUES
+('1900000000000000720',@small_parent_id,'自动小料需求计划','/mes/autosmallmaterialdemandplan','mes/autosmallmaterialdemandplan/index','MesXslAutoSmallMaterialDemandPlanList',1,NULL,'1',96,0,'ant-design:ordered-list-outlined',1,1,1,0,0,'自动小料需求计划',1,0,'admin',NOW(),0,0)
+ON DUPLICATE KEY UPDATE
+`parent_id`=VALUES(`parent_id`),`name`=VALUES(`name`),`url`=VALUES(`url`),`component`=VALUES(`component`),
+`component_name`=VALUES(`component_name`),`menu_type`=VALUES(`menu_type`),`sort_no`=VALUES(`sort_no`),
+`is_route`=VALUES(`is_route`),`is_leaf`=VALUES(`is_leaf`),`keep_alive`=VALUES(`keep_alive`),`icon`=VALUES(`icon`),
+`status`=VALUES(`status`),`hidden`=VALUES(`hidden`),`del_flag`=VALUES(`del_flag`);
+
+INSERT INTO sys_permission
+(`id`,`parent_id`,`name`,`menu_type`,`perms`,`perms_type`,`sort_no`,`status`,`del_flag`,`create_by`,`create_time`)
+VALUES
+('1900000000000000721','1900000000000000720','导出',2,'xslmes:mes_xsl_auto_small_material_demand_plan:exportXls','1',1,'1',0,'admin',NOW())
+ON DUPLICATE KEY UPDATE
+`name`=VALUES(`name`),`perms`=VALUES(`perms`),`sort_no`=VALUES(`sort_no`),`status`=VALUES(`status`),`del_flag`=VALUES(`del_flag`);
+
+-- 人工小料需求计划
+INSERT INTO sys_permission
+(`id`,`parent_id`,`name`,`url`,`component`,`component_name`,`menu_type`,`perms`,`perms_type`,`sort_no`,`always_show`,`icon`,`is_route`,`is_leaf`,`keep_alive`,`hidden`,`hide_tab`,`description`,`status`,`del_flag`,`create_by`,`create_time`,`rule_flag`,`internal_or_external`)
+VALUES
+('1900000000000000730',@small_parent_id,'人工小料需求计划','/mes/manualsmallmaterialdemandplan','mes/manualsmallmaterialdemandplan/index','MesXslManualSmallMaterialDemandPlanList',1,NULL,'1',97,0,'ant-design:ordered-list-outlined',1,1,1,0,0,'人工小料需求计划',1,0,'admin',NOW(),0,0)
+ON DUPLICATE KEY UPDATE
+`parent_id`=VALUES(`parent_id`),`name`=VALUES(`name`),`url`=VALUES(`url`),`component`=VALUES(`component`),
+`component_name`=VALUES(`component_name`),`menu_type`=VALUES(`menu_type`),`sort_no`=VALUES(`sort_no`),
+`is_route`=VALUES(`is_route`),`is_leaf`=VALUES(`is_leaf`),`keep_alive`=VALUES(`keep_alive`),`icon`=VALUES(`icon`),
+`status`=VALUES(`status`),`hidden`=VALUES(`hidden`),`del_flag`=VALUES(`del_flag`);
+
+INSERT INTO sys_permission
+(`id`,`parent_id`,`name`,`menu_type`,`perms`,`perms_type`,`sort_no`,`status`,`del_flag`,`create_by`,`create_time`)
+VALUES
+('1900000000000000731','1900000000000000730','导出',2,'xslmes:mes_xsl_manual_small_material_demand_plan:exportXls','1',1,'1',0,'admin',NOW())
+ON DUPLICATE KEY UPDATE
+`name`=VALUES(`name`),`perms`=VALUES(`perms`),`sort_no`=VALUES(`sort_no`),`status`=VALUES(`status`),`del_flag`=VALUES(`del_flag`);
+
+-- admin 角色授权
+INSERT INTO sys_role_permission(id, role_id, permission_id, operate_date, operate_ip)
+SELECT REPLACE(UUID(), '-', ''), 'f6817f48af4fb3af11b9e8bf182f618b', p.id, NOW(), '127.0.0.1'
+FROM sys_permission p
+WHERE p.id IN ('1900000000000000720','1900000000000000721','1900000000000000730','1900000000000000731')
+  AND NOT EXISTS (
+    SELECT 1 FROM sys_role_permission rp
+    WHERE rp.role_id = 'f6817f48af4fb3af11b9e8bf182f618b'
+      AND rp.permission_id = p.id
+  );
+
+-- 强制修复
+UPDATE sys_permission
+SET parent_id=@small_parent_id,url='/mes/autosmallmaterialdemandplan',component='mes/autosmallmaterialdemandplan/index',
+    component_name='MesXslAutoSmallMaterialDemandPlanList',menu_type=1,is_route=1,is_leaf=1,hidden=0,status='1',del_flag=0,redirect=NULL
+WHERE id='1900000000000000720' OR name='自动小料需求计划' OR url='/mes/autosmallmaterialdemandplan';
+
+UPDATE sys_permission
+SET parent_id=@small_parent_id,url='/mes/manualsmallmaterialdemandplan',component='mes/manualsmallmaterialdemandplan/index',
+    component_name='MesXslManualSmallMaterialDemandPlanList',menu_type=1,is_route=1,is_leaf=1,hidden=0,status='1',del_flag=0,redirect=NULL
+WHERE id='1900000000000000730' OR name='人工小料需求计划' OR url='/mes/manualsmallmaterialdemandplan';

jeecg-boot/db/mes-xsl-small-material-plan-maintain-menu.sql

@@ -0,0 +1,75 @@
+-- 自动/人工小料计划维护 菜单与权限（挂载到 MES密炼工程，兼容 MES管理）
+SET NAMES utf8mb4;
+
+SET @plan_parent_id = (
+  SELECT id
+  FROM sys_permission
+  WHERE name = 'MES密炼工程' AND menu_type = 0 AND del_flag = 0
+  ORDER BY create_time ASC
+  LIMIT 1
+);
+SET @plan_parent_id = IFNULL(@plan_parent_id, (
+  SELECT id
+  FROM sys_permission
+  WHERE url = '/mes' AND menu_type = 0 AND del_flag = 0
+  ORDER BY create_time ASC
+  LIMIT 1
+));
+SET @plan_parent_id = IFNULL(@plan_parent_id, '1860000000000000001');
+
+-- 自动小料计划维护
+INSERT INTO sys_permission
+(`id`,`parent_id`,`name`,`url`,`component`,`component_name`,`menu_type`,`perms`,`perms_type`,`sort_no`,`always_show`,`icon`,`is_route`,`is_leaf`,`keep_alive`,`hidden`,`hide_tab`,`description`,`status`,`del_flag`,`create_by`,`create_time`,`rule_flag`,`internal_or_external`)
+VALUES
+('1900000000000000740',@plan_parent_id,'自动小料计划维护','/mes/autosmallmaterialplanmaintain','mes/autosmallmaterialplanmaintain/index','MesXslAutoSmallMaterialPlanMaintainList',1,NULL,'1',98,0,'ant-design:table-outlined',1,1,1,0,0,'自动小料计划维护',1,0,'admin',NOW(),0,0)
+ON DUPLICATE KEY UPDATE
+`parent_id`=VALUES(`parent_id`),`name`=VALUES(`name`),`url`=VALUES(`url`),`component`=VALUES(`component`),
+`component_name`=VALUES(`component_name`),`menu_type`=VALUES(`menu_type`),`sort_no`=VALUES(`sort_no`),
+`is_route`=VALUES(`is_route`),`is_leaf`=VALUES(`is_leaf`),`keep_alive`=VALUES(`keep_alive`),`icon`=VALUES(`icon`),
+`status`=VALUES(`status`),`hidden`=VALUES(`hidden`),`del_flag`=VALUES(`del_flag`);
+
+INSERT INTO sys_permission
+(`id`,`parent_id`,`name`,`menu_type`,`perms`,`perms_type`,`sort_no`,`status`,`del_flag`,`create_by`,`create_time`)
+VALUES
+('1900000000000000741','1900000000000000740','整表保存',2,'xslmes:mes_xsl_auto_small_material_plan_maintain:saveAll','1',1,'1',0,'admin',NOW())
+ON DUPLICATE KEY UPDATE
+`name`=VALUES(`name`),`perms`=VALUES(`perms`),`sort_no`=VALUES(`sort_no`),`status`=VALUES(`status`),`del_flag`=VALUES(`del_flag`);
+
+-- 人工小料计划维护
+INSERT INTO sys_permission
+(`id`,`parent_id`,`name`,`url`,`component`,`component_name`,`menu_type`,`perms`,`perms_type`,`sort_no`,`always_show`,`icon`,`is_route`,`is_leaf`,`keep_alive`,`hidden`,`hide_tab`,`description`,`status`,`del_flag`,`create_by`,`create_time`,`rule_flag`,`internal_or_external`)
+VALUES
+('1900000000000000750',@plan_parent_id,'人工小料计划维护','/mes/manualsmallmaterialplanmaintain','mes/manualsmallmaterialplanmaintain/index','MesXslManualSmallMaterialPlanMaintainList',1,NULL,'1',99,0,'ant-design:table-outlined',1,1,1,0,0,'人工小料计划维护',1,0,'admin',NOW(),0,0)
+ON DUPLICATE KEY UPDATE
+`parent_id`=VALUES(`parent_id`),`name`=VALUES(`name`),`url`=VALUES(`url`),`component`=VALUES(`component`),
+`component_name`=VALUES(`component_name`),`menu_type`=VALUES(`menu_type`),`sort_no`=VALUES(`sort_no`),
+`is_route`=VALUES(`is_route`),`is_leaf`=VALUES(`is_leaf`),`keep_alive`=VALUES(`keep_alive`),`icon`=VALUES(`icon`),
+`status`=VALUES(`status`),`hidden`=VALUES(`hidden`),`del_flag`=VALUES(`del_flag`);
+
+INSERT INTO sys_permission
+(`id`,`parent_id`,`name`,`menu_type`,`perms`,`perms_type`,`sort_no`,`status`,`del_flag`,`create_by`,`create_time`)
+VALUES
+('1900000000000000751','1900000000000000750','整表保存',2,'xslmes:mes_xsl_manual_small_material_plan_maintain:saveAll','1',1,'1',0,'admin',NOW())
+ON DUPLICATE KEY UPDATE
+`name`=VALUES(`name`),`perms`=VALUES(`perms`),`sort_no`=VALUES(`sort_no`),`status`=VALUES(`status`),`del_flag`=VALUES(`del_flag`);
+
+-- admin授权
+INSERT INTO sys_role_permission(id, role_id, permission_id, operate_date, operate_ip)
+SELECT REPLACE(UUID(), '-', ''), 'f6817f48af4fb3af11b9e8bf182f618b', p.id, NOW(), '127.0.0.1'
+FROM sys_permission p
+WHERE p.id IN ('1900000000000000740','1900000000000000741','1900000000000000750','1900000000000000751')
+  AND NOT EXISTS (
+    SELECT 1 FROM sys_role_permission rp
+    WHERE rp.role_id = 'f6817f48af4fb3af11b9e8bf182f618b' AND rp.permission_id = p.id
+  );
+
+-- 强制修正
+UPDATE sys_permission
+SET parent_id=@plan_parent_id,url='/mes/autosmallmaterialplanmaintain',component='mes/autosmallmaterialplanmaintain/index',
+    component_name='MesXslAutoSmallMaterialPlanMaintainList',menu_type=1,is_route=1,is_leaf=1,hidden=0,status='1',del_flag=0,redirect=NULL
+WHERE id='1900000000000000740' OR name='自动小料计划维护' OR url='/mes/autosmallmaterialplanmaintain';
+
+UPDATE sys_permission
+SET parent_id=@plan_parent_id,url='/mes/manualsmallmaterialplanmaintain',component='mes/manualsmallmaterialplanmaintain/index',
+    component_name='MesXslManualSmallMaterialPlanMaintainList',menu_type=1,is_route=1,is_leaf=1,hidden=0,status='1',del_flag=0,redirect=NULL
+WHERE id='1900000000000000750' OR name='人工小料计划维护' OR url='/mes/manualsmallmaterialplanmaintain';

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java

@@ -217,6 +217,12 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/xslmes/mesXslUnit/anon/**", "anon");
         // MES密炼物料管理免密接口（供桌面端调用）
         filterChainDefinitionMap.put("/mes/material/mixerMaterial/anon/**", "anon");
+        // MES密炼生产计划维护免密接口（供桌面端快检记录调用）
+        filterChainDefinitionMap.put("/xslmes/mesXslMixingProductionPlan/anon/**", "anon");
+        // MES胶料快检实验标准免密接口（供桌面端快检记录调用）
+        filterChainDefinitionMap.put("/xslmes/mesXslRubberQuickTestStd/anon/**", "anon");
+        // MES胶料快检记录免密接口（供桌面端快检记录调用）
+        filterChainDefinitionMap.put("/xslmes/mesXslRubberQuickTestRecord/anon/**", "anon");
         // 打印模板免密接口（供桌面端调用）
         filterChainDefinitionMap.put("/print/template/anon/**", "anon");
         filterChainDefinitionMap.put("/print/bizTemplateBind/anon/**", "anon");

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/doc/代码修改日志

@@ -1092,3 +1092,91 @@ jeecgboot-vue3/src/views/xslmes/mesXslEquipDowntimeRecord/MesXslEquipDowntimeRec
 jeecgboot-vue3/src/views/xslmes/mesXslEquipDowntimeRecord/MesXslEquipDowntimeRecord.data.ts
 jeecgboot-vue3/src/views/xslmes/mesXslEquipDowntimeRecord/MesXslEquipDowntimeRecordList.vue
 jeecgboot-vue3/src/views/xslmes/mesXslEquipDowntimeRecord/components/MesXslEquipDowntimeRecordModal.vue
+
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/datasource/McsDataSourceManager.java
+
+-- author:GHT---date:20260616--for: 【MES上辅机】重启后中间库配置未自动加载（租户ID硬编码为0）---
+原因：McsDataSourceInitializer 启动时只查 tenant_id=0，页面保存用当前租户（如1002），重启后查不到配置，连接状态回退为 yml。
+修改：新增 loadStartupConfig 按最近更新时间加载任意租户配置；isDbConfigActive 同时校验数据源是否已注册。
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/service/IMesXslMcsDbConfigService.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/service/impl/MesXslMcsDbConfigServiceImpl.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/config/McsDataSourceInitializer.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/datasource/McsDataSourceManager.java
+
+-- author:jiangxh---date:20260617--for: 【快检实验标准】补齐 tenant_id 为空的历史数据并恢复租户过滤 ---
+原因：一条快检实验标准 tenant_id 为 NULL，桌面端按 tenantId=1002 拉取时漏掉该条。
+修改：Flyway 将 NULL tenant_id 对齐为 1002；新增保存时自动写入 tenant_id；恢复 anon/list 与桌面端 tenantId 查询参数。
+jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_152__mes_xsl_rubber_quick_test_std_tenant_backfill.sql
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslDesktopAnonController.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslRubberQuickTestStdServiceImpl.java
+yy-admin-master/YY.Admin.Services/Service/RubberQuickTestStd/RubberQuickTestStdService.cs
+
+-- author:GHT---date:20260617--for: 【MES上辅机】密炼动作秒级采集 + 通用中间表采集配置 ---
+需求：密炼机动作维护数据从中间表 MCSToMES_MixAct 秒级采集（机台名称→设备名称、动作名称→动作名称、动作地址→动作代号），
+在「密炼动作」页支持 启动/停止采集与设置时间间隔（默认1秒）；采集配置落库为通用配置表(mes_xsl_mcs_sync_config)供后续功能复用。
+设计：新增通用采集配置表 + McsSyncHandler 扩展点 + McsSyncScheduler(ThreadPoolTaskScheduler 动态重排+启动加载)；
+MixActSyncHandler 增量 Upsert(按机台编号+动作代号唯一)，保留手动维护数据；密炼机动作维护补全 equip_id/equip_type 字段，
+唯一性由全局唯一改为(设备+动作代号)同设备内唯一，equipment_id 允许为空(采集未匹配台账时)。
+jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_153__mes_xsl_mcs_sync_config.sql
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/entity/MesXslMcsSyncConfig.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/mapper/MesXslMcsSyncConfigMapper.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/service/IMesXslMcsSyncConfigService.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/service/impl/MesXslMcsSyncConfigServiceImpl.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/controller/MesXslMcsSyncConfigController.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/sync/McsSyncHandler.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/sync/McsSyncScheduler.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/sync/handler/MixActSyncHandler.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslMixerAction.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslMixerActionService.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslMixerActionServiceImpl.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslMixerActionController.java
+jeecgboot-vue3/src/views/xslmesMcs/mcsToMesMixAct/index.vue
+jeecgboot-vue3/src/views/xslmesMcs/mcsToMesMixAct/McsToMesMixAct.api.ts
+jeecgboot-vue3/src/views/xslmes/mesXslMixerAction/MesXslMixerAction.data.ts
+jeecgboot-vue3/src/views/xslmes/mesXslMixerAction/MesXslMixerAction.api.ts
+-- author:GHT---date:20260617--for: 【MES上辅机】密炼动作秒级采集 + 通用中间表采集配置 ---
+
+-- author:GHT---date:20260617--for: 【MES上辅机】采集配置：通用表/字段绑定 + 配置驱动采集 ---
+需求：在「MES上辅机数据」下新增「采集配置」，左选中间库表、右选MES表(mes_xsl_前缀)，下方左带出中间库字段、右由用户选MES接收字段；
+采集操作改为弹窗(是否采集+采集间隔)，密炼动作页同样改为弹窗。
+设计：统一为配置驱动——删除硬编码 MixActSyncHandler/McsSyncHandler，新增 GenericMcsSyncEngine(JdbcTemplate跨库读源表→按"匹配键"Upsert写MES表，
+自动填充 id/时间/租户/del_flag，纯字段拷贝)；McsSyncScheduler 改为按 configId 调度；新增字段映射表 mes_xsl_mcs_sync_field 与配置头扩展(target_table/config_name等)；
+密炼动作(MIX_ACT)改造为预置配置+字段映射；新增 McsMetaMapper 查询SQLServer/MySQL表与字段元数据；采集配置CRUD/详情/采集操作接口。
+jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_154__mes_xsl_mcs_sync_field.sql
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/entity/MesXslMcsSyncConfig.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/entity/MesXslMcsSyncField.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/mapper/MesXslMcsSyncFieldMapper.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/mapper/McsMetaMapper.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/sync/GenericMcsSyncEngine.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/sync/McsSyncScheduler.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/service/IMesXslMcsSyncConfigService.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/service/impl/MesXslMcsSyncConfigServiceImpl.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/controller/MesXslMcsSyncConfigController.java
+（删除）jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/sync/McsSyncHandler.java
+（删除）jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/sync/handler/MixActSyncHandler.java
+jeecgboot-vue3/src/views/xslmesMcs/mcsSyncConfig/index.vue
+jeecgboot-vue3/src/views/xslmesMcs/mcsSyncConfig/mcsSyncConfig.api.ts
+jeecgboot-vue3/src/views/xslmesMcs/mcsSyncConfig/mcsSyncConfig.data.ts
+jeecgboot-vue3/src/views/xslmesMcs/mcsSyncConfig/components/SyncConfigModal.vue
+jeecgboot-vue3/src/views/xslmesMcs/mcsSyncConfig/components/CollectModal.vue
+jeecgboot-vue3/src/views/xslmesMcs/mcsToMesMixAct/index.vue
+jeecgboot-vue3/src/views/xslmesMcs/mcsToMesMixAct/McsToMesMixAct.api.ts
+-- author:GHT---date:20260617--for: 【MES上辅机】采集配置：通用表/字段绑定 + 配置驱动采集 ---
+
+-- author:GHT---date:20260617--for: 【MES上辅机】采集模式：全量/时间/增量 + 批量增量写入(应对大表) ---
+背景：原通用引擎每周期全表读源+全表读目标逐行Upsert，autocommit逐行往返，大表(上万~数十万)采集慢。
+优化：GenericMcsSyncEngine 改为「一次读现有建索引+内存比对+变更检测+batchUpdate分批」；并新增三种采集模式(采集操作弹窗可配)：
+FULL全量匹配(小表全量Upsert)、TIME时间匹配(按时间列取当天/最近七天再Upsert，目标侧按窗口匹配键定向IN读取)、
+INCR增量匹配(按增量列高水位>last_watermark、ORDER BY ASC取TOP N，仅追加并推进水位)。调度器落库 last_watermark。
+mes_xsl_mcs_sync_config 增加 sync_mode/incr_column/time_window/batch_limit/last_watermark。
+jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_155__mes_xsl_mcs_sync_mode.sql
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/entity/MesXslMcsSyncConfig.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/sync/GenericMcsSyncEngine.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/sync/McsSyncScheduler.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/service/IMesXslMcsSyncConfigService.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/service/impl/MesXslMcsSyncConfigServiceImpl.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/controller/MesXslMcsSyncConfigController.java
+jeecgboot-vue3/src/views/xslmesMcs/mcsSyncConfig/components/CollectModal.vue
+jeecgboot-vue3/src/views/xslmesMcs/mcsSyncConfig/mcsSyncConfig.api.ts
+jeecgboot-vue3/src/views/xslmesMcs/mcsSyncConfig/mcsSyncConfig.data.ts
+-- author:GHT---date:20260617--for: 【MES上辅机】采集模式：全量/时间/增量 + 批量增量写入(应对大表) ---

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/approval/callback/impl/RubberQuickTestStdApprovalCallback.java

@@ -7,6 +7,7 @@ import org.jeecg.modules.xslmes.approval.callback.IApprovalBizCallback;
 import org.jeecg.modules.xslmes.common.XslMesBizConstants;
 import org.jeecg.modules.xslmes.entity.MesXslRubberQuickTestStd;
 import org.jeecg.modules.xslmes.service.IMesXslRubberQuickTestStdService;
+import org.jeecg.modules.xslmes.service.MesXslStompNotifyService;
 import org.springframework.stereotype.Component;
 
 /**
@@ -25,9 +26,13 @@ import org.springframework.stereotype.Component;
 public class RubberQuickTestStdApprovalCallback implements IApprovalBizCallback {
 
     private final IMesXslRubberQuickTestStdService stdService;
+    private final MesXslStompNotifyService stompNotify;
 
-    public RubberQuickTestStdApprovalCallback(IMesXslRubberQuickTestStdService stdService) {
+    public RubberQuickTestStdApprovalCallback(
+            IMesXslRubberQuickTestStdService stdService,
+            MesXslStompNotifyService stompNotify) {
         this.stdService = stdService;
+        this.stompNotify = stompNotify;
     }
 
     @Override
@@ -55,5 +60,8 @@ public class RubberQuickTestStdApprovalCallback implements IApprovalBizCallback
                 .eq(MesXslRubberQuickTestStd::getId, bizDataId)
                 .set(MesXslRubberQuickTestStd::getAuditStatus, auditStatus)
                 .update();
+        //update-begin---author:jiangxh ---date:20260617  for：【快检实验标准】审批联动 STOMP 同步桌面端-----------
+        stompNotify.publishRubberQuickTestStdChanged("audit", bizDataId);
+        //update-end---author:jiangxh ---date:20260617  for：【快检实验标准】审批联动 STOMP 同步桌面端-----------
     }
 }

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslAutoSmallMaterialDemandPlanController.java

@@ -0,0 +1,176 @@
+package org.jeecg.modules.xslmes.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.xslmes.entity.MesXslSmallMaterialDemandPlanSummary;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.enmus.ExcelType;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+@Tag(name = "自动小料需求计划")
+@RestController
+@RequestMapping("/xslmes/mesXslAutoSmallMaterialDemandPlan")
+public class MesXslAutoSmallMaterialDemandPlanController {
+
+  private static final String TABLE_NAME = "mes_xsl_auto_small_material_demand_plan";
+
+  @Autowired private JdbcTemplate jdbcTemplate;
+
+  @Operation(summary = "自动小料需求计划-分页列表查询")
+  @GetMapping("/list")
+  public Result<IPage<MesXslSmallMaterialDemandPlanSummary>> queryPageList(
+      MesXslSmallMaterialDemandPlanSummary query,
+      @RequestParam(name = "groupByMachine", required = false, defaultValue = "0") Integer groupByMachine,
+      @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+    boolean groupedByMachine = groupByMachine != null && groupByMachine == 1;
+    List<Object> params = new ArrayList<>();
+    String groupedSql = buildGroupedSql(query, groupedByMachine, params);
+
+    String countSql = "SELECT COUNT(1) FROM (" + groupedSql + ") t";
+    Long total = jdbcTemplate.queryForObject(countSql, Long.class, params.toArray());
+    long totalCount = total == null ? 0L : total;
+
+    int offset = Math.max((pageNo - 1) * pageSize, 0);
+    String pageSql = groupedSql + buildOrderBy(groupedByMachine) + " LIMIT ? OFFSET ?";
+    List<Object> pageParams = new ArrayList<>(params);
+    pageParams.add(pageSize);
+    pageParams.add(offset);
+    List<MesXslSmallMaterialDemandPlanSummary> rows = queryRows(pageSql, pageParams, groupedByMachine);
+
+    Page<MesXslSmallMaterialDemandPlanSummary> page = new Page<>(pageNo, pageSize, totalCount);
+    page.setRecords(rows);
+    return Result.OK(page);
+  }
+
+  @RequiresPermissions("xslmes:mes_xsl_auto_small_material_demand_plan:exportXls")
+  @RequestMapping("/exportXls")
+  public ModelAndView exportXls(
+      HttpServletRequest request,
+      MesXslSmallMaterialDemandPlanSummary query,
+      @RequestParam(name = "groupByMachine", required = false, defaultValue = "0") Integer groupByMachine) {
+    boolean groupedByMachine = groupByMachine != null && groupByMachine == 1;
+    List<Object> params = new ArrayList<>();
+    String groupedSql = buildGroupedSql(query, groupedByMachine, params) + buildOrderBy(groupedByMachine);
+    List<MesXslSmallMaterialDemandPlanSummary> exportList = queryRows(groupedSql, params, groupedByMachine);
+
+    LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+    ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+    mv.addObject(NormalExcelConstants.FILE_NAME, "自动小料需求计划");
+    mv.addObject(NormalExcelConstants.CLASS, MesXslSmallMaterialDemandPlanSummary.class);
+    mv.addObject(
+        NormalExcelConstants.PARAMS,
+        new ExportParams(
+            "自动小料需求计划",
+            "导出人:" + (sysUser == null ? "admin" : sysUser.getRealname()),
+            "自动小料需求计划",
+            ExcelType.XSSF));
+    mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
+    String exportFields = request.getParameter(NormalExcelConstants.EXPORT_FIELDS);
+    if (oConvertUtils.isNotEmpty(exportFields)) {
+      mv.addObject(NormalExcelConstants.EXPORT_FIELDS, exportFields);
+    }
+    return mv;
+  }
+
+  private String buildGroupedSql(
+      MesXslSmallMaterialDemandPlanSummary query, boolean groupedByMachine, List<Object> params) {
+    String machineExpr = "COALESCE(NULLIF(TRIM(t.machine_name),''), '')";
+    String rawMaterialExpr = "COALESCE(NULLIF(TRIM(t.raw_material_name),''), '')";
+    String statDateExpr = "DATE_FORMAT(t.stat_date, '%Y-%m-%d')";
+
+    StringBuilder sql = new StringBuilder();
+    sql.append("SELECT ");
+    if (groupedByMachine) {
+      sql.append(machineExpr).append(" AS machineName, ");
+    } else {
+      sql.append("'' AS machineName, ");
+    }
+    sql.append(rawMaterialExpr)
+        .append(" AS rawMaterialName, ")
+        .append("SUM(COALESCE(t.demand_weight,0)) AS demandWeight, ")
+        .append("MAX(")
+        .append(statDateExpr)
+        .append(") AS statDate ")
+        .append("FROM ")
+        .append(TABLE_NAME)
+        .append(" t ")
+        .append("WHERE (t.del_flag = 0 OR t.del_flag IS NULL) ");
+
+    if (query != null && StringUtils.isNotBlank(query.getStatDate())) {
+      sql.append("AND ").append(statDateExpr).append(" = ? ");
+      params.add(query.getStatDate().trim());
+    }
+    if (query != null && StringUtils.isNotBlank(query.getRawMaterialName())) {
+      sql.append("AND ").append(rawMaterialExpr).append(" LIKE ? ");
+      params.add("%" + query.getRawMaterialName().trim() + "%");
+    }
+    if (groupedByMachine && query != null && StringUtils.isNotBlank(query.getMachineName())) {
+      sql.append("AND ").append(machineExpr).append(" LIKE ? ");
+      params.add("%" + query.getMachineName().trim() + "%");
+    }
+
+    sql.append("GROUP BY ");
+    if (groupedByMachine) {
+      sql.append(machineExpr).append(", ");
+    }
+    sql.append(rawMaterialExpr);
+    return sql.toString();
+  }
+
+  private List<MesXslSmallMaterialDemandPlanSummary> queryRows(
+      String sql, List<Object> params, boolean groupedByMachine) {
+    return jdbcTemplate.query(
+        sql,
+        rs -> {
+          List<MesXslSmallMaterialDemandPlanSummary> list = new ArrayList<>();
+          int seq = 1;
+          while (rs.next()) {
+            MesXslSmallMaterialDemandPlanSummary row = new MesXslSmallMaterialDemandPlanSummary();
+            row.setMachineName(groupedByMachine ? trim(rs.getString("machineName")) : "");
+            row.setRawMaterialName(trim(rs.getString("rawMaterialName")));
+            row.setDemandWeight(rs.getBigDecimal("demandWeight"));
+            row.setStatDate(trim(rs.getString("statDate")));
+            row.setId(buildRowId(row, groupedByMachine, seq++));
+            list.add(row);
+          }
+          return list;
+        },
+        params.toArray());
+  }
+
+  private String buildOrderBy(boolean groupedByMachine) {
+    if (groupedByMachine) {
+      return " ORDER BY machineName, rawMaterialName";
+    }
+    return " ORDER BY rawMaterialName";
+  }
+
+  private String buildRowId(MesXslSmallMaterialDemandPlanSummary row, boolean groupedByMachine, int seq) {
+    String machine = groupedByMachine ? StringUtils.defaultString(row.getMachineName()) : "ALL";
+    return machine + "_" + StringUtils.defaultString(row.getRawMaterialName()) + "_" + seq;
+  }
+
+  private String trim(String value) {
+    return value == null ? "" : value.trim();
+  }
+}

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslAutoSmallMaterialPlanMaintainController.java

@@ -0,0 +1,61 @@
+package org.jeecg.modules.xslmes.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletRequest;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.xslmes.entity.MesXslAutoSmallMaterialPlanMaintain;
+import org.jeecg.modules.xslmes.service.IMesXslAutoSmallMaterialPlanMaintainService;
+import org.jeecg.modules.xslmes.vo.MesXslAutoSmallMaterialPlanMaintainSaveAllVO;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@Tag(name = "自动小料计划维护")
+@RestController
+@RequestMapping("/xslmes/mesXslAutoSmallMaterialPlanMaintain")
+public class MesXslAutoSmallMaterialPlanMaintainController
+    extends JeecgController<
+        MesXslAutoSmallMaterialPlanMaintain, IMesXslAutoSmallMaterialPlanMaintainService> {
+
+  private final IMesXslAutoSmallMaterialPlanMaintainService service;
+
+  public MesXslAutoSmallMaterialPlanMaintainController(
+      IMesXslAutoSmallMaterialPlanMaintainService service) {
+    this.service = service;
+  }
+
+  @Operation(summary = "自动小料计划维护-分页列表查询")
+  @GetMapping("/list")
+  public Result<IPage<MesXslAutoSmallMaterialPlanMaintain>> queryPageList(
+      MesXslAutoSmallMaterialPlanMaintain model,
+      @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+      @RequestParam(name = "pageSize", defaultValue = "50") Integer pageSize,
+      HttpServletRequest req) {
+    QueryWrapper<MesXslAutoSmallMaterialPlanMaintain> queryWrapper =
+        QueryGenerator.initQueryWrapper(model, req.getParameterMap());
+    queryWrapper.orderByAsc("sort_no").orderByAsc("create_time");
+    IPage<MesXslAutoSmallMaterialPlanMaintain> pageList =
+        service.page(new Page<>(pageNo, pageSize), queryWrapper);
+    return Result.OK(pageList);
+  }
+
+  @AutoLog(value = "自动小料计划维护-整表保存")
+  @Operation(summary = "自动小料计划维护-整表保存")
+  @RequiresPermissions("xslmes:mes_xsl_auto_small_material_plan_maintain:saveAll")
+  @PostMapping("/saveAll")
+  public Result<String> saveAll(@RequestBody MesXslAutoSmallMaterialPlanMaintainSaveAllVO req) {
+    service.saveAllRows(req == null ? null : req.getRows());
+    return Result.OK("保存成功");
+  }
+}

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslDesktopAnonController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.xslmes.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -21,6 +22,7 @@ import org.jeecg.modules.print.entity.PrintTemplate;
 import org.jeecg.modules.print.service.IPrintBizTemplateBindService;
 import org.jeecg.modules.print.service.IPrintTemplateService;
 import org.jeecg.modules.print.util.PrintBizDataMappingUtil;
+import org.jeecg.modules.xslmes.common.XslMesBizConstants;
 import org.jeecg.modules.xslmes.constant.MesXslCustomerBizStatus;
 import org.jeecg.modules.xslmes.constant.MesXslPrintConstants;
 import org.jeecg.modules.xslmes.entity.MesXslCustomer;
@@ -32,6 +34,12 @@ import org.jeecg.modules.xslmes.entity.MesXslUnit;
 import org.jeecg.modules.xslmes.entity.MesXslVehicle;
 import org.jeecg.modules.xslmes.entity.MesXslWarehouse;
 import org.jeecg.modules.xslmes.entity.MesXslWarehouseArea;
+import org.jeecg.modules.xslmes.entity.MesXslMixingProductionPlan;
+import org.jeecg.modules.xslmes.entity.MesXslRubberQuickTestMethod;
+import org.jeecg.modules.xslmes.entity.MesXslRubberQuickTestRecord;
+import org.jeecg.modules.xslmes.entity.MesXslRubberQuickTestRecordLine;
+import org.jeecg.modules.xslmes.entity.MesXslRubberQuickTestStd;
+import org.jeecg.modules.xslmes.entity.MesXslRubberQuickTestStdLine;
 import org.jeecg.modules.xslmes.entity.MesXslWeightRecord;
 import org.jeecg.modules.xslmes.service.IMesXslCustomerService;
 import org.jeecg.modules.xslmes.service.IMesXslRawMaterialCardService;
@@ -42,6 +50,10 @@ import org.jeecg.modules.xslmes.service.IMesXslUnitService;
 import org.jeecg.modules.xslmes.service.IMesXslVehicleService;
 import org.jeecg.modules.xslmes.service.IMesXslWarehouseAreaService;
 import org.jeecg.modules.xslmes.service.IMesXslWarehouseService;
+import org.jeecg.modules.xslmes.service.IMesXslMixingProductionPlanService;
+import org.jeecg.modules.xslmes.service.IMesXslRubberQuickTestMethodService;
+import org.jeecg.modules.xslmes.service.IMesXslRubberQuickTestRecordService;
+import org.jeecg.modules.xslmes.service.IMesXslRubberQuickTestStdService;
 import org.jeecg.modules.xslmes.service.IMesXslWeightRecordService;
 import org.jeecg.modules.xslmes.service.MesXslStompNotifyService;
 import org.jeecg.modules.xslmes.vo.MesXslRawMaterialCardBriefVO;
@@ -87,6 +99,10 @@ public class MesXslDesktopAnonController {
     private final IPrintBizTemplateBindService printBizTemplateBindService;
     private final IPrintTemplateService printTemplateService;
     private final ObjectMapper objectMapper;
+    private final IMesXslMixingProductionPlanService mixingProductionPlanService;
+    private final IMesXslRubberQuickTestStdService rubberQuickTestStdService;
+    private final IMesXslRubberQuickTestRecordService rubberQuickTestRecordService;
+    private final IMesXslRubberQuickTestMethodService rubberQuickTestMethodService;
 
     // ═══════════════════════════ 车辆管理 ═══════════════════════════
 
@@ -925,6 +941,128 @@ public class MesXslDesktopAnonController {
     }
     //update-end---author:cursor ---date:20250602  for：【密炼物料皮重策略】桌面端单位下拉只读-----------
 
+    //update-begin---author:jiangxh ---date:2026-06-17 for：【快检记录】桌面端密炼生产计划只读-----------
+    @Operation(summary = "密炼生产计划维护-免密分页列表查询（供桌面端快检记录筛选）")
+    @GetMapping("/xslmes/mesXslMixingProductionPlan/anon/list")
+    public Result<IPage<MesXslMixingProductionPlan>> mixingProductionPlanAnonList(
+            MesXslMixingProductionPlan model,
+            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+            @RequestParam(name = "pageSize", defaultValue = "500") Integer pageSize,
+            HttpServletRequest req) {
+        QueryWrapper<MesXslMixingProductionPlan> qw = QueryGenerator.initQueryWrapper(model, req.getParameterMap());
+        qw.orderByAsc("sort_no").orderByAsc("create_time");
+        IPage<MesXslMixingProductionPlan> page =
+                mixingProductionPlanService.page(new Page<>(pageNo, pageSize), qw);
+        return Result.OK(page);
+    }
+    //update-end---author:jiangxh ---date:2026-06-17 for：【快检记录】桌面端密炼生产计划只读-----------
+
+    //update-begin---author:jiangxh ---date:2026-06-17 for：【快检实验标准】桌面端只读列表与详情-----------
+    @Operation(summary = "胶料快检实验标准-免密分页列表")
+    @GetMapping("/xslmes/mesXslRubberQuickTestStd/anon/list")
+    public Result<IPage<MesXslRubberQuickTestStd>> rubberQuickTestStdAnonList(
+            MesXslRubberQuickTestStd model,
+            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+            HttpServletRequest req) {
+        QueryWrapper<MesXslRubberQuickTestStd> qw = QueryGenerator.initQueryWrapper(model, req.getParameterMap());
+        qw.orderByDesc("create_time");
+        IPage<MesXslRubberQuickTestStd> page = rubberQuickTestStdService.page(new Page<>(pageNo, pageSize), qw);
+        if (page.getRecords() != null) {
+            page.getRecords().forEach(this::fillStdQuickTestTypeFromMethod);
+        }
+        return Result.OK(page);
+    }
+
+    @Operation(summary = "胶料快检实验标准-免密通过id查询（含明细）")
+    @GetMapping("/xslmes/mesXslRubberQuickTestStd/anon/queryById")
+    public Result<MesXslRubberQuickTestStd> rubberQuickTestStdAnonQueryById(@RequestParam(name = "id") String id) {
+        MesXslRubberQuickTestStd entity = rubberQuickTestStdService.getById(id);
+        if (entity == null) {
+            return Result.error("未找到对应数据");
+        }
+        entity.setLineList(rubberQuickTestStdService.selectLinesByStdId(id));
+        fillStdQuickTestTypeFromMethod(entity);
+        return Result.OK(entity);
+    }
+    //update-end---author:jiangxh ---date:2026-06-17 for：【快检实验标准】桌面端只读列表与详情-----------
+
+    //update-begin---author:jiangxh ---date:2026-06-17 for：【快检记录】桌面端胶料快检实验标准查询-----------
+  private static final String RUBBER_QUICK_TEST_STD_ENABLE_IN_USE = "1";
+
+    @Operation(summary = "胶料快检实验标准-免密按胶料名称查询使用中标准及明细")
+    @GetMapping("/xslmes/mesXslRubberQuickTestStd/anon/queryByRubberMaterialName")
+    public Result<MesXslRubberQuickTestStd> rubberQuickTestStdAnonQueryByRubberMaterialName(
+            @RequestParam(name = "rubberMaterialName") String rubberMaterialName) {
+        if (oConvertUtils.isEmpty(rubberMaterialName)) {
+            return Result.error("胶料名称不能为空");
+        }
+        String name = rubberMaterialName.trim();
+        LambdaQueryWrapper<MesXslRubberQuickTestStd> qw = new LambdaQueryWrapper<>();
+        qw.eq(MesXslRubberQuickTestStd::getRubberMaterialName, name);
+        qw.eq(MesXslRubberQuickTestStd::getEnableStatus, RUBBER_QUICK_TEST_STD_ENABLE_IN_USE);
+        qw.eq(MesXslRubberQuickTestStd::getAuditStatus, XslMesBizConstants.RUBBER_QUICK_TEST_STD_AUDIT_APPROVED);
+        qw.orderByDesc(MesXslRubberQuickTestStd::getCreateTime);
+        MesXslRubberQuickTestStd std = rubberQuickTestStdService.getOne(qw, false);
+        if (std == null) {
+            return Result.error("未找到胶料「" + name + "」对应的使用中且已批准的快检实验标准");
+        }
+        std.setLineList(rubberQuickTestStdService.selectLinesByStdId(std.getId()));
+        fillStdQuickTestTypeFromMethod(std);
+        return Result.OK(std);
+    }
+
+    @Operation(summary = "胶料快检实验标准-免密查询明细")
+    @GetMapping("/xslmes/mesXslRubberQuickTestStd/anon/queryLineListByStdId")
+    public Result<List<MesXslRubberQuickTestStdLine>> rubberQuickTestStdAnonQueryLineListByStdId(
+            @RequestParam(name = "id") String id) {
+        return Result.OK(rubberQuickTestStdService.selectLinesByStdId(id));
+    }
+    //update-end---author:jiangxh ---date:2026-06-17 for：【快检记录】桌面端胶料快检实验标准查询-----------
+
+    //update-begin---author:jiangxh ---date:2026-06-17 for：【快检记录】桌面端胶料快检记录保存-----------
+    @Operation(summary = "胶料快检记录-免密添加")
+    @PostMapping("/xslmes/mesXslRubberQuickTestRecord/anon/add")
+    public Result<String> rubberQuickTestRecordAnonAdd(@RequestBody MesXslRubberQuickTestRecord record) {
+        if (record == null) {
+            return Result.error("参数不能为空");
+        }
+        if (oConvertUtils.isEmpty(record.getRubberMaterialName())) {
+            return Result.error("胶料名称不能为空");
+        }
+        List<MesXslRubberQuickTestRecordLine> lineList = record.getLineList();
+        if (lineList == null || lineList.isEmpty()) {
+            return Result.error("请维护检验明细");
+        }
+        try {
+            if (oConvertUtils.isEmpty(record.getRecordNo())) {
+                record.setRecordNo(rubberQuickTestRecordService.generateDesktopRecordNo(record));
+            }
+            rubberQuickTestRecordService.fillQuickTestTypeForRecord(record);
+            rubberQuickTestRecordService.saveMain(record, lineList);
+            stompNotify.publishRubberQuickTestRecordChanged("add", record.getId());
+            return Result.OK(record.getRecordNo());
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return Result.error(e.getMessage());
+        }
+    }
+    //update-end---author:jiangxh ---date:2026-06-17 for：【快检记录】桌面端胶料快检记录保存-----------
+
+    //update-begin---author:jiangxh ---date:20260618  for：【快检实验标准】桌面端回填实验方法关联实验类型-----------
+    private void fillStdQuickTestTypeFromMethod(MesXslRubberQuickTestStd std) {
+        if (std == null || oConvertUtils.isEmpty(std.getTestMethodId())) {
+            return;
+        }
+        MesXslRubberQuickTestMethod method = rubberQuickTestMethodService.getById(std.getTestMethodId());
+        if (method == null) {
+            return;
+        }
+        std.setQuickTestTypeId(method.getQuickTestTypeId());
+        std.setQuickTestTypeName(method.getQuickTestTypeName());
+    }
+    //update-end---author:jiangxh ---date:20260618  for：【快检实验标准】桌面端回填实验方法关联实验类型-----------
+
     // ─────────────────────────── 车辆私有辅助 ────────────────────────────
 
     private void applyWeightNetAndBillType(MesXslWeightRecord record) {

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslManualSmallMaterialDemandPlanController.java

@@ -0,0 +1,176 @@
+package org.jeecg.modules.xslmes.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.xslmes.entity.MesXslSmallMaterialDemandPlanSummary;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.enmus.ExcelType;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+@Tag(name = "人工小料需求计划")
+@RestController
+@RequestMapping("/xslmes/mesXslManualSmallMaterialDemandPlan")
+public class MesXslManualSmallMaterialDemandPlanController {
+
+  private static final String TABLE_NAME = "mes_xsl_manual_small_material_demand_plan";
+
+  @Autowired private JdbcTemplate jdbcTemplate;
+
+  @Operation(summary = "人工小料需求计划-分页列表查询")
+  @GetMapping("/list")
+  public Result<IPage<MesXslSmallMaterialDemandPlanSummary>> queryPageList(
+      MesXslSmallMaterialDemandPlanSummary query,
+      @RequestParam(name = "groupByMachine", required = false, defaultValue = "0") Integer groupByMachine,
+      @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+    boolean groupedByMachine = groupByMachine != null && groupByMachine == 1;
+    List<Object> params = new ArrayList<>();
+    String groupedSql = buildGroupedSql(query, groupedByMachine, params);
+
+    String countSql = "SELECT COUNT(1) FROM (" + groupedSql + ") t";
+    Long total = jdbcTemplate.queryForObject(countSql, Long.class, params.toArray());
+    long totalCount = total == null ? 0L : total;
+
+    int offset = Math.max((pageNo - 1) * pageSize, 0);
+    String pageSql = groupedSql + buildOrderBy(groupedByMachine) + " LIMIT ? OFFSET ?";
+    List<Object> pageParams = new ArrayList<>(params);
+    pageParams.add(pageSize);
+    pageParams.add(offset);
+    List<MesXslSmallMaterialDemandPlanSummary> rows = queryRows(pageSql, pageParams, groupedByMachine);
+
+    Page<MesXslSmallMaterialDemandPlanSummary> page = new Page<>(pageNo, pageSize, totalCount);
+    page.setRecords(rows);
+    return Result.OK(page);
+  }
+
+  @RequiresPermissions("xslmes:mes_xsl_manual_small_material_demand_plan:exportXls")
+  @RequestMapping("/exportXls")
+  public ModelAndView exportXls(
+      HttpServletRequest request,
+      MesXslSmallMaterialDemandPlanSummary query,
+      @RequestParam(name = "groupByMachine", required = false, defaultValue = "0") Integer groupByMachine) {
+    boolean groupedByMachine = groupByMachine != null && groupByMachine == 1;
+    List<Object> params = new ArrayList<>();
+    String groupedSql = buildGroupedSql(query, groupedByMachine, params) + buildOrderBy(groupedByMachine);
+    List<MesXslSmallMaterialDemandPlanSummary> exportList = queryRows(groupedSql, params, groupedByMachine);
+
+    LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+    ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+    mv.addObject(NormalExcelConstants.FILE_NAME, "人工小料需求计划");
+    mv.addObject(NormalExcelConstants.CLASS, MesXslSmallMaterialDemandPlanSummary.class);
+    mv.addObject(
+        NormalExcelConstants.PARAMS,
+        new ExportParams(
+            "人工小料需求计划",
+            "导出人:" + (sysUser == null ? "admin" : sysUser.getRealname()),
+            "人工小料需求计划",
+            ExcelType.XSSF));
+    mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
+    String exportFields = request.getParameter(NormalExcelConstants.EXPORT_FIELDS);
+    if (oConvertUtils.isNotEmpty(exportFields)) {
+      mv.addObject(NormalExcelConstants.EXPORT_FIELDS, exportFields);
+    }
+    return mv;
+  }
+
+  private String buildGroupedSql(
+      MesXslSmallMaterialDemandPlanSummary query, boolean groupedByMachine, List<Object> params) {
+    String machineExpr = "COALESCE(NULLIF(TRIM(t.machine_name),''), '')";
+    String rawMaterialExpr = "COALESCE(NULLIF(TRIM(t.raw_material_name),''), '')";
+    String statDateExpr = "DATE_FORMAT(t.stat_date, '%Y-%m-%d')";
+
+    StringBuilder sql = new StringBuilder();
+    sql.append("SELECT ");
+    if (groupedByMachine) {
+      sql.append(machineExpr).append(" AS machineName, ");
+    } else {
+      sql.append("'' AS machineName, ");
+    }
+    sql.append(rawMaterialExpr)
+        .append(" AS rawMaterialName, ")
+        .append("SUM(COALESCE(t.demand_weight,0)) AS demandWeight, ")
+        .append("MAX(")
+        .append(statDateExpr)
+        .append(") AS statDate ")
+        .append("FROM ")
+        .append(TABLE_NAME)
+        .append(" t ")
+        .append("WHERE (t.del_flag = 0 OR t.del_flag IS NULL) ");
+
+    if (query != null && StringUtils.isNotBlank(query.getStatDate())) {
+      sql.append("AND ").append(statDateExpr).append(" = ? ");
+      params.add(query.getStatDate().trim());
+    }
+    if (query != null && StringUtils.isNotBlank(query.getRawMaterialName())) {
+      sql.append("AND ").append(rawMaterialExpr).append(" LIKE ? ");
+      params.add("%" + query.getRawMaterialName().trim() + "%");
+    }
+    if (groupedByMachine && query != null && StringUtils.isNotBlank(query.getMachineName())) {
+      sql.append("AND ").append(machineExpr).append(" LIKE ? ");
+      params.add("%" + query.getMachineName().trim() + "%");
+    }
+
+    sql.append("GROUP BY ");
+    if (groupedByMachine) {
+      sql.append(machineExpr).append(", ");
+    }
+    sql.append(rawMaterialExpr);
+    return sql.toString();
+  }
+
+  private List<MesXslSmallMaterialDemandPlanSummary> queryRows(
+      String sql, List<Object> params, boolean groupedByMachine) {
+    return jdbcTemplate.query(
+        sql,
+        rs -> {
+          List<MesXslSmallMaterialDemandPlanSummary> list = new ArrayList<>();
+          int seq = 1;
+          while (rs.next()) {
+            MesXslSmallMaterialDemandPlanSummary row = new MesXslSmallMaterialDemandPlanSummary();
+            row.setMachineName(groupedByMachine ? trim(rs.getString("machineName")) : "");
+            row.setRawMaterialName(trim(rs.getString("rawMaterialName")));
+            row.setDemandWeight(rs.getBigDecimal("demandWeight"));
+            row.setStatDate(trim(rs.getString("statDate")));
+            row.setId(buildRowId(row, groupedByMachine, seq++));
+            list.add(row);
+          }
+          return list;
+        },
+        params.toArray());
+  }
+
+  private String buildOrderBy(boolean groupedByMachine) {
+    if (groupedByMachine) {
+      return " ORDER BY machineName, rawMaterialName";
+    }
+    return " ORDER BY rawMaterialName";
+  }
+
+  private String buildRowId(MesXslSmallMaterialDemandPlanSummary row, boolean groupedByMachine, int seq) {
+    String machine = groupedByMachine ? StringUtils.defaultString(row.getMachineName()) : "ALL";
+    return machine + "_" + StringUtils.defaultString(row.getRawMaterialName()) + "_" + seq;
+  }
+
+  private String trim(String value) {
+    return value == null ? "" : value.trim();
+  }
+}

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslManualSmallMaterialPlanMaintainController.java

@@ -0,0 +1,61 @@
+package org.jeecg.modules.xslmes.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletRequest;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.xslmes.entity.MesXslManualSmallMaterialPlanMaintain;
+import org.jeecg.modules.xslmes.service.IMesXslManualSmallMaterialPlanMaintainService;
+import org.jeecg.modules.xslmes.vo.MesXslManualSmallMaterialPlanMaintainSaveAllVO;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@Tag(name = "人工小料计划维护")
+@RestController
+@RequestMapping("/xslmes/mesXslManualSmallMaterialPlanMaintain")
+public class MesXslManualSmallMaterialPlanMaintainController
+    extends JeecgController<
+        MesXslManualSmallMaterialPlanMaintain, IMesXslManualSmallMaterialPlanMaintainService> {
+
+  private final IMesXslManualSmallMaterialPlanMaintainService service;
+
+  public MesXslManualSmallMaterialPlanMaintainController(
+      IMesXslManualSmallMaterialPlanMaintainService service) {
+    this.service = service;
+  }
+
+  @Operation(summary = "人工小料计划维护-分页列表查询")
+  @GetMapping("/list")
+  public Result<IPage<MesXslManualSmallMaterialPlanMaintain>> queryPageList(
+      MesXslManualSmallMaterialPlanMaintain model,
+      @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+      @RequestParam(name = "pageSize", defaultValue = "50") Integer pageSize,
+      HttpServletRequest req) {
+    QueryWrapper<MesXslManualSmallMaterialPlanMaintain> queryWrapper =
+        QueryGenerator.initQueryWrapper(model, req.getParameterMap());
+    queryWrapper.orderByAsc("sort_no").orderByAsc("create_time");
+    IPage<MesXslManualSmallMaterialPlanMaintain> pageList =
+        service.page(new Page<>(pageNo, pageSize), queryWrapper);
+    return Result.OK(pageList);
+  }
+
+  @AutoLog(value = "人工小料计划维护-整表保存")
+  @Operation(summary = "人工小料计划维护-整表保存")
+  @RequiresPermissions("xslmes:mes_xsl_manual_small_material_plan_maintain:saveAll")
+  @PostMapping("/saveAll")
+  public Result<String> saveAll(@RequestBody MesXslManualSmallMaterialPlanMaintainSaveAllVO req) {
+    service.saveAllRows(req == null ? null : req.getRows());
+    return Result.OK("保存成功");
+  }
+}

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslMixerActionController.java

@@ -112,13 +112,14 @@ public class MesXslMixerActionController extends JeecgController<MesXslMixerActi
   @Operation(summary = "校验动作名称是否重复")
   @GetMapping("/checkActionName")
   public Result<String> checkActionName(
+      @RequestParam(name = "equipmentId", required = false) String equipmentId,
       @RequestParam(name = "actionName", required = true) String actionName,
       @RequestParam(name = "dataId", required = false) String dataId) {
     if (oConvertUtils.isEmpty(actionName) || actionName.trim().isEmpty()) {
       return Result.OK("该值可用！");
     }
-    if (mesXslMixerActionService.isActionNameDuplicated(actionName, dataId)) {
-      return Result.error("动作名称不能重复");
+    if (mesXslMixerActionService.isActionNameDuplicated(equipmentId, actionName, dataId)) {
+      return Result.error("同一设备下动作名称不能重复");
     }
     return Result.OK("该值可用！");
   }
@@ -126,13 +127,14 @@ public class MesXslMixerActionController extends JeecgController<MesXslMixerActi
   @Operation(summary = "校验动作代号是否重复")
   @GetMapping("/checkActionCode")
   public Result<String> checkActionCode(
+      @RequestParam(name = "equipmentId", required = false) String equipmentId,
       @RequestParam(name = "actionCode", required = true) String actionCode,
       @RequestParam(name = "dataId", required = false) String dataId) {
     if (oConvertUtils.isEmpty(actionCode) || actionCode.trim().isEmpty()) {
       return Result.OK("该值可用！");
     }
-    if (mesXslMixerActionService.isActionCodeDuplicated(actionCode, dataId)) {
-      return Result.error("动作代号不能重复");
+    if (mesXslMixerActionService.isActionCodeDuplicated(equipmentId, actionCode, dataId)) {
+      return Result.error("同一设备下动作代号不能重复");
     }
     return Result.OK("该值可用！");
   }
@@ -152,15 +154,15 @@ public class MesXslMixerActionController extends JeecgController<MesXslMixerActi
       return "动作名称不能为空";
     }
     model.setActionName(model.getActionName().trim());
-    if (mesXslMixerActionService.isActionNameDuplicated(model.getActionName(), excludeId)) {
-      return "动作名称不能重复";
+    if (mesXslMixerActionService.isActionNameDuplicated(model.getEquipmentId(), model.getActionName(), excludeId)) {
+      return "同一设备下动作名称不能重复";
     }
     if (oConvertUtils.isEmpty(model.getActionCode()) || StringUtils.isBlank(model.getActionCode())) {
       return "动作代号不能为空";
     }
     model.setActionCode(model.getActionCode().trim());
-    if (mesXslMixerActionService.isActionCodeDuplicated(model.getActionCode(), excludeId)) {
-      return "动作代号不能重复";
+    if (mesXslMixerActionService.isActionCodeDuplicated(model.getEquipmentId(), model.getActionCode(), excludeId)) {
+      return "同一设备下动作代号不能重复";
     }
     return null;
   }

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslMixingProductionPlanController.java

@@ -13,6 +13,7 @@ import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.xslmes.entity.MesXslMixingProductionPlan;
 import org.jeecg.modules.xslmes.service.IMesXslMixingProductionPlanService;
+import org.jeecg.modules.xslmes.service.MesXslStompNotifyService;
 import org.jeecg.modules.xslmes.vo.MesXslMixingProductionPlanOrderOptionVO;
 import org.jeecg.modules.xslmes.vo.MesXslMixingProductionPlanSaveAllVO;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -29,10 +30,13 @@ public class MesXslMixingProductionPlanController
     extends JeecgController<MesXslMixingProductionPlan, IMesXslMixingProductionPlanService> {
 
   private final IMesXslMixingProductionPlanService mixingProductionPlanService;
+  private final MesXslStompNotifyService stompNotify;
 
   public MesXslMixingProductionPlanController(
-      IMesXslMixingProductionPlanService mixingProductionPlanService) {
+      IMesXslMixingProductionPlanService mixingProductionPlanService,
+      MesXslStompNotifyService stompNotify) {
     this.mixingProductionPlanService = mixingProductionPlanService;
+    this.stompNotify = stompNotify;
   }
 
   @Operation(summary = "密炼生产计划维护-分页列表查询")
@@ -56,6 +60,9 @@ public class MesXslMixingProductionPlanController
   @PostMapping("/saveAll")
   public Result<String> saveAll(@RequestBody MesXslMixingProductionPlanSaveAllVO req) {
     mixingProductionPlanService.saveAllRows(req == null ? null : req.getRows());
+    //update-begin---author:jiangxh ---date:20260617  for：【密炼计划】整表保存后广播桌面端同步-----------
+    stompNotify.publishMixingProductionPlanChanged("saveAll", null);
+    //update-end---author:jiangxh ---date:20260617  for：【密炼计划】整表保存后广播桌面端同步-----------
     return Result.OK("保存成功");
   }
 

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslRubberQuickTestRecordController.java

@@ -24,6 +24,7 @@ import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.service.ISysUserService;
 import org.jeecg.modules.xslmes.entity.MesXslRubberQuickTestRecord;
 import org.jeecg.modules.xslmes.entity.MesXslRubberQuickTestRecordLine;
+import org.jeecg.modules.xslmes.entity.MesXslRubberQuickTestRecordRawLine;
 import org.jeecg.modules.xslmes.entity.MesXslRubberQuickTestType;
 import org.jeecg.modules.xslmes.service.IMesXslRubberQuickTestRecordService;
 import org.jeecg.modules.xslmes.service.IMesXslRubberQuickTestTypeService;
@@ -163,6 +164,15 @@ public class MesXslRubberQuickTestRecordController
         return Result.OK(mesXslRubberQuickTestRecordService.selectLinesByRecordId(id));
     }
 
+    //update-begin---author:jiangxh ---date:2026-06-17 for：【快检记录】查询原始数据明细-----------
+    @Operation(summary = "MES胶料快检记录-查询原始数据明细")
+    @GetMapping(value = "/queryRawLineListByRecordId")
+    public Result<List<MesXslRubberQuickTestRecordRawLine>> queryRawLineListByRecordId(
+            @RequestParam(name = "id", required = true) String id) {
+        return Result.OK(mesXslRubberQuickTestRecordService.selectRawLinesByRecordId(id));
+    }
+    //update-end---author:jiangxh ---date:2026-06-17 for：【快检记录】查询原始数据明细-----------
+
     @RequiresPermissions("mes:mes_xsl_rubber_quick_test_record:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, MesXslRubberQuickTestRecord model) {

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslRubberQuickTestStdController.java

@@ -36,6 +36,7 @@ import org.jeecg.modules.xslmes.service.IMesXslMixerPsCompileService;
 import org.jeecg.modules.xslmes.service.IMesXslRubberQuickTestMethodService;
 import org.jeecg.modules.xslmes.service.IMesXslDeleteReferenceService;
 import org.jeecg.modules.xslmes.service.IMesXslRubberQuickTestStdService;
+import org.jeecg.modules.xslmes.service.MesXslStompNotifyService;
 import org.jeecg.modules.xslmes.vo.MesXslRubberQuickTestStdPage;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -73,6 +74,9 @@ public class MesXslRubberQuickTestStdController
     @Autowired
     private IMesXslDeleteReferenceService mesXslDeleteReferenceService;
 
+    @Autowired
+    private MesXslStompNotifyService stompNotify;
+
     @Operation(summary = "MES胶料快检实验标准-分页列表查询")
     @GetMapping(value = "/list")
     public Result<IPage<MesXslRubberQuickTestStd>> queryPageList(
@@ -107,6 +111,9 @@ public class MesXslRubberQuickTestStdController
             log.error(e.getMessage(), e);
             return Result.error(e.getMessage());
         }
+        //update-begin---author:jiangxh ---date:20260617  for：【快检实验标准】桌面端 STOMP 同步-----------
+        stompNotify.publishRubberQuickTestStdChanged("add", main.getId());
+        //update-end---author:jiangxh ---date:20260617  for：【快检实验标准】桌面端 STOMP 同步-----------
         return Result.OK("添加成功！");
     }
 
@@ -129,6 +136,9 @@ public class MesXslRubberQuickTestStdController
             log.error(e.getMessage(), e);
             return Result.error(e.getMessage());
         }
+        //update-begin---author:jiangxh ---date:20260617  for：【快检实验标准】桌面端 STOMP 同步-----------
+        stompNotify.publishRubberQuickTestStdChanged("edit", main.getId());
+        //update-end---author:jiangxh ---date:20260617  for：【快检实验标准】桌面端 STOMP 同步-----------
         return Result.OK("编辑成功!");
     }
 
@@ -142,6 +152,9 @@ public class MesXslRubberQuickTestStdController
             return Result.error(refErr);
         }
         mesXslRubberQuickTestStdService.delMain(id);
+        //update-begin---author:jiangxh ---date:20260617  for：【快检实验标准】桌面端 STOMP 同步-----------
+        stompNotify.publishRubberQuickTestStdChanged("delete", id);
+        //update-end---author:jiangxh ---date:20260617  for：【快检实验标准】桌面端 STOMP 同步-----------
         return Result.OK("删除成功!");
     }
 
@@ -155,6 +168,9 @@ public class MesXslRubberQuickTestStdController
             return Result.error(refErr);
         }
         mesXslRubberQuickTestStdService.delBatchMain(Arrays.asList(ids.split(",")));
+        //update-begin---author:jiangxh ---date:20260617  for：【快检实验标准】桌面端 STOMP 同步-----------
+        stompNotify.publishRubberQuickTestStdChanged("batchDelete", ids);
+        //update-end---author:jiangxh ---date:20260617  for：【快检实验标准】桌面端 STOMP 同步-----------
         return Result.OK("批量删除成功!");
     }
 
@@ -196,6 +212,9 @@ public class MesXslRubberQuickTestStdController
                 .set(MesXslRubberQuickTestStd::getEnableStatus, enableStatus)
                 .update();
         if (updated) {
+            //update-begin---author:jiangxh ---date:20260617  for：【快检实验标准】桌面端 STOMP 同步-----------
+            stompNotify.publishRubberQuickTestStdChanged("status", id);
+            //update-end---author:jiangxh ---date:20260617  for：【快检实验标准】桌面端 STOMP 同步-----------
             return Result.OK("操作成功");
         }
         MesXslRubberQuickTestStd cur = mesXslRubberQuickTestStdService.getById(id);
@@ -272,6 +291,18 @@ public class MesXslRubberQuickTestStdController
             if (!XslMesBizConstants.PS_TYPE_RAW_INSPECT_STD.equals(ps.getPsType())) {
                 return "发行编号须选择类型为原材料检验标准的密炼PS";
             }
+            //update-begin---author:jiangxh ---date:20260617  for：【快检实验标准】发行编号仅允许选择编制状态密炼PS-----------
+            boolean psCompileIdChanged = true;
+            if (oConvertUtils.isNotEmpty(excludeId)) {
+                MesXslRubberQuickTestStd existingStd = mesXslRubberQuickTestStdService.getById(excludeId);
+                if (existingStd != null && oConvertUtils.isNotEmpty(existingStd.getPsCompileId())) {
+                    psCompileIdChanged = !existingStd.getPsCompileId().equals(main.getPsCompileId());
+                }
+            }
+            if (psCompileIdChanged && !"compile".equals(ps.getStatus())) {
+                return "发行编号须选择编制状态的密炼PS";
+            }
+            //update-end---author:jiangxh ---date:20260617  for：【快检实验标准】发行编号仅允许选择编制状态密炼PS-----------
             main.setIssueNumber(ps.getPsCode());
             if (main.getIssueDate() == null && ps.getIssueDate() != null) {
                 main.setIssueDate(ps.getIssueDate());

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslAutoSmallMaterialPlanMaintain.java

@@ -0,0 +1,69 @@
+package org.jeecg.modules.xslmes.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 自动小料计划维护
+ */
+@Data
+@TableName("mes_xsl_auto_small_material_plan_maintain")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "自动小料计划维护")
+public class MesXslAutoSmallMaterialPlanMaintain implements Serializable {
+
+  private static final long serialVersionUID = 1L;
+
+  @TableId(type = IdType.ASSIGN_ID)
+  private String id;
+
+  @Excel(name = "排序号", width = 10)
+  private Integer sortNo;
+
+  @Excel(name = "配方名称", width = 20)
+  private String formulaName;
+
+  @Excel(name = "早班序号", width = 12)
+  private Integer morningSeqNo;
+  @Excel(name = "早班计划", width = 12)
+  private Integer morningPlanCount;
+  @Excel(name = "早班备注", width = 20)
+  private String morningRemark;
+
+  @Excel(name = "中班序号", width = 12)
+  private Integer noonSeqNo;
+  @Excel(name = "中班计划", width = 12)
+  private Integer noonPlanCount;
+  @Excel(name = "中班备注", width = 20)
+  private String noonRemark;
+
+  @Excel(name = "夜班序号", width = 12)
+  private Integer nightSeqNo;
+  @Excel(name = "夜班计划", width = 12)
+  private Integer nightPlanCount;
+  @Excel(name = "夜班备注", width = 20)
+  private String nightRemark;
+
+  private Integer tenantId;
+  private String sysOrgCode;
+  private String createBy;
+  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  private Date createTime;
+  private String updateBy;
+  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  private Date updateTime;
+  private Integer delFlag;
+}

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslManualSmallMaterialPlanMaintain.java

@@ -0,0 +1,69 @@
+package org.jeecg.modules.xslmes.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 人工小料计划维护
+ */
+@Data
+@TableName("mes_xsl_manual_small_material_plan_maintain")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "人工小料计划维护")
+public class MesXslManualSmallMaterialPlanMaintain implements Serializable {
+
+  private static final long serialVersionUID = 1L;
+
+  @TableId(type = IdType.ASSIGN_ID)
+  private String id;
+
+  @Excel(name = "排序号", width = 10)
+  private Integer sortNo;
+
+  @Excel(name = "配方名称", width = 20)
+  private String formulaName;
+
+  @Excel(name = "早班序号", width = 12)
+  private Integer morningSeqNo;
+  @Excel(name = "早班计划", width = 12)
+  private Integer morningPlanCount;
+  @Excel(name = "早班备注", width = 20)
+  private String morningRemark;
+
+  @Excel(name = "中班序号", width = 12)
+  private Integer noonSeqNo;
+  @Excel(name = "中班计划", width = 12)
+  private Integer noonPlanCount;
+  @Excel(name = "中班备注", width = 20)
+  private String noonRemark;
+
+  @Excel(name = "夜班序号", width = 12)
+  private Integer nightSeqNo;
+  @Excel(name = "夜班计划", width = 12)
+  private Integer nightPlanCount;
+  @Excel(name = "夜班备注", width = 20)
+  private String nightRemark;
+
+  private Integer tenantId;
+  private String sysOrgCode;
+  private String createBy;
+  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  private Date createTime;
+  private String updateBy;
+  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  private Date updateTime;
+  private Integer delFlag;
+}

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslMixerAction.java

@@ -38,6 +38,16 @@ public class MesXslMixerAction implements Serializable {
   @Schema(description = "设备名称冗余")
   private String equipmentName;
 
+  //update-begin---author:GHT ---date:20260617 for：【MES上辅机】密炼动作秒级采集-补全机台字段-----------
+  @Excel(name = "机台编号", width = 15)
+  @Schema(description = "机台编号（采集自中间表 EquipID）")
+  private String equipId;
+
+  @Excel(name = "机台类型", width = 15)
+  @Schema(description = "机台类型（采集自中间表 EquipType）")
+  private String equipType;
+  //update-end---author:GHT ---date:20260617 for：【MES上辅机】密炼动作秒级采集-补全机台字段-----------
+
   @Excel(name = "动作名称", width = 20)
   @Schema(description = "动作名称")
   private String actionName;

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslMixingProductionPlan.java

@@ -43,80 +43,47 @@ public class MesXslMixingProductionPlan implements Serializable {
   @Schema(description = "机台名称")
   private String machineName;
 
-  @Schema(description = "早班计划ID")
-  private String morningPlanId;
-  @Schema(description = "早班计划类型 M母胶/F终胶")
-  private String morningPlanType;
-  @Excel(name = "早班生产订单", width = 20)
-  private String morningOrderNo;
-  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-  @DateTimeFormat(pattern = "yyyy-MM-dd")
-  @Schema(description = "早班订单日期")
-  private Date morningOrderDate;
-  @Excel(name = "早班配方名称", width = 20)
-  private String morningFormulaName;
-  @Excel(name = "早班计划重量", width = 15)
-  private BigDecimal morningPlanWeight;
-  @Excel(name = "早班计划车数", width = 12)
-  private Integer morningPlannedCarCount;
-  @Excel(name = "早班已排产车数", width = 12)
-  private Integer morningScheduledCarCount;
-  @Excel(name = "早班完成车数", width = 12)
-  private Integer morningFinishedCarCount;
-  @Excel(name = "早班计划", width = 12)
-  private Integer morningPlanCount;
-  @Excel(name = "早班备注", width = 20)
-  private String morningRemark;
+  @Excel(name = "班次标识", width = 10)
+  @Schema(description = "班次标识：1早班 2中班 3晚班")
+  private Integer shiftFlag;
 
-  @Schema(description = "中班计划ID")
-  private String noonPlanId;
-  @Schema(description = "中班计划类型 M母胶/F终胶")
-  private String noonPlanType;
-  @Excel(name = "中班生产订单", width = 20)
-  private String noonOrderNo;
   @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
   @DateTimeFormat(pattern = "yyyy-MM-dd")
-  @Schema(description = "中班订单日期")
-  private Date noonOrderDate;
-  @Excel(name = "中班配方名称", width = 20)
-  private String noonFormulaName;
-  @Excel(name = "中班计划重量", width = 15)
-  private BigDecimal noonPlanWeight;
-  @Excel(name = "中班计划车数", width = 12)
-  private Integer noonPlannedCarCount;
-  @Excel(name = "中班已排产车数", width = 12)
-  private Integer noonScheduledCarCount;
-  @Excel(name = "中班完成车数", width = 12)
-  private Integer noonFinishedCarCount;
-  @Excel(name = "中班计划", width = 12)
-  private Integer noonPlanCount;
-  @Excel(name = "中班备注", width = 20)
-  private String noonRemark;
+  @Schema(description = "计划日期（保存时写入当前日期）")
+  private Date planDate;
+  @Schema(description = "计划号（yyyyMMddA三位流水）")
+  private String planNo;
 
-  @Schema(description = "晚班计划ID")
-  private String nightPlanId;
-  @Schema(description = "晚班计划类型 M母胶/F终胶")
-  private String nightPlanType;
-  @Excel(name = "晚班生产订单", width = 20)
-  private String nightOrderNo;
+  @Schema(description = "计划ID（母胶/终胶计划）")
+  private String planId;
+  @Schema(description = "计划类型 M母胶/F终胶")
+  private String planType;
+  @Schema(description = "生产订单ID")
+  private String sourceOrderId;
+  @Schema(description = "胶料ID（取母胶/终胶计划materialCode）")
+  private String materialId;
+  @Schema(description = "胶料名称（取母胶/终胶计划mesMaterialName）")
+  private String materialName;
+  @Excel(name = "生产订单", width = 20)
+  private String orderNo;
   @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
   @DateTimeFormat(pattern = "yyyy-MM-dd")
-  @Schema(description = "晚班订单日期")
-  private Date nightOrderDate;
-  @Excel(name = "晚班配方名称", width = 20)
-  private String nightFormulaName;
-  @Excel(name = "晚班计划重量", width = 15)
-  private BigDecimal nightPlanWeight;
-  @Excel(name = "晚班计划车数", width = 12)
-  private Integer nightPlannedCarCount;
-  @Excel(name = "晚班已排产车数", width = 12)
-  private Integer nightScheduledCarCount;
-  @Excel(name = "晚班完成车数", width = 12)
-  private Integer nightFinishedCarCount;
-  @Excel(name = "晚班计划", width = 12)
-  private Integer nightPlanCount;
-  @Excel(name = "晚班备注", width = 20)
-  private String nightRemark;
+  @Schema(description = "订单日期")
+  private Date orderDate;
+  @Excel(name = "配方名称", width = 20)
+  private String formulaName;
+  @Excel(name = "计划重量", width = 15)
+  private BigDecimal planWeight;
+  @Excel(name = "计划车数", width = 12)
+  private Integer plannedCarCount;
+  @Excel(name = "已排产车数", width = 12)
+  private Integer scheduledCarCount;
+  @Excel(name = "完成车数", width = 12)
+  private Integer finishedCarCount;
+  @Excel(name = "计划", width = 12)
+  private Integer planCount;
+  @Excel(name = "备注", width = 20)
+  private String remark;
 
   private Integer tenantId;
   private String sysOrgCode;

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslRubberQuickTestRecord.java

@@ -130,4 +130,8 @@ public class MesXslRubberQuickTestRecord implements Serializable {
 
     @TableField(exist = false)
     private List<MesXslRubberQuickTestRecordLine> lineList;
+
+    @TableField(exist = false)
+    @Schema(description = "原始数据明细（试验结果全部检测值）")
+    private List<MesXslRubberQuickTestRecordRawLine> rawLineList;
 }

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslRubberQuickTestRecordRawLine.java

@@ -0,0 +1,72 @@
+package org.jeecg.modules.xslmes.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * MES 胶料快检记录原始数据明细（试验结果全部检测值）
+ */
+@Data
+@TableName("mes_xsl_rubber_quick_test_record_raw_line")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "MES胶料快检记录原始数据明细")
+public class MesXslRubberQuickTestRecordRawLine implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
+
+    @Schema(description = "主表ID mes_xsl_rubber_quick_test_record.id")
+    private String recordId;
+
+    @Excel(name = "编号", width = 14)
+    @Schema(description = "试验结果编号（如1_1）")
+    private String rowNo;
+
+    @Schema(description = "数据点ID")
+    private String dataPointId;
+
+    @Excel(name = "数据点", width = 18)
+    private String inspectItem;
+
+    @Excel(name = "下限值", width = 12, type = 10)
+    private BigDecimal lowerLimit;
+
+    @Excel(name = "上限值", width = 12, type = 10)
+    private BigDecimal upperLimit;
+
+    @Excel(name = "检测值", width = 12, type = 10)
+    private BigDecimal inspectValue;
+
+    @Excel(name = "行检验结果", width = 10, dicCode = "xslmes_rubber_quick_test_record_result")
+    @Dict(dicCode = "xslmes_rubber_quick_test_record_result")
+    @Schema(description = "行检验结果（1合格0不合格）")
+    private String rowInspectResult;
+
+    private Integer sortNo;
+    private String createBy;
+
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    private String updateBy;
+
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+}

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslRubberQuickTestStd.java

@@ -106,4 +106,12 @@ public class MesXslRubberQuickTestStd implements Serializable {
     @TableField(exist = false)
     @Schema(description = "标准明细")
     private List<MesXslRubberQuickTestStdLine> lineList;
+
+    @TableField(exist = false)
+    @Schema(description = "实验类型ID（来自实验方法，桌面端展示）")
+    private String quickTestTypeId;
+
+    @TableField(exist = false)
+    @Schema(description = "实验类型名称（来自实验方法，桌面端展示）")
+    private String quickTestTypeName;
 }

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslSmallMaterialDemandPlanSummary.java

@@ -0,0 +1,35 @@
+package org.jeecg.modules.xslmes.entity;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * 小料需求计划汇总（自动/人工）
+ */
+@Data
+@Schema(description = "小料需求计划汇总")
+public class MesXslSmallMaterialDemandPlanSummary implements Serializable {
+
+  private static final long serialVersionUID = 1L;
+
+  @Schema(description = "主键")
+  private String id;
+
+  @Excel(name = "机台", width = 20)
+  @Schema(description = "机台")
+  private String machineName;
+
+  @Excel(name = "原材料名称", width = 24)
+  @Schema(description = "原材料名称")
+  private String rawMaterialName;
+
+  @Excel(name = "需求重量(KG)", width = 18)
+  @Schema(description = "需求重量(KG)")
+  private BigDecimal demandWeight;
+
+  @Schema(description = "统计日期(yyyy-MM-dd)")
+  private String statDate;
+}

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslAutoSmallMaterialPlanMaintainMapper.java

@@ -0,0 +1,7 @@
+package org.jeecg.modules.xslmes.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.xslmes.entity.MesXslAutoSmallMaterialPlanMaintain;
+
+public interface MesXslAutoSmallMaterialPlanMaintainMapper
+    extends BaseMapper<MesXslAutoSmallMaterialPlanMaintain> {}

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslManualSmallMaterialPlanMaintainMapper.java

@@ -0,0 +1,7 @@
+package org.jeecg.modules.xslmes.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.xslmes.entity.MesXslManualSmallMaterialPlanMaintain;
+
+public interface MesXslManualSmallMaterialPlanMaintainMapper
+    extends BaseMapper<MesXslManualSmallMaterialPlanMaintain> {}

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslRubberQuickTestRecordRawLineMapper.java

@@ -0,0 +1,6 @@
+package org.jeecg.modules.xslmes.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.xslmes.entity.MesXslRubberQuickTestRecordRawLine;
+
+public interface MesXslRubberQuickTestRecordRawLineMapper extends BaseMapper<MesXslRubberQuickTestRecordRawLine> {}

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/config/McsDataSourceInitializer.java

@@ -28,20 +28,16 @@ public class McsDataSourceInitializer implements ApplicationRunner {
     @Override
     public void run(ApplicationArguments args) {
         try {
-            MesXslMcsDbConfig config = mcsDbConfigService.getOne(
-                    new com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<MesXslMcsDbConfig>()
-                            .eq(MesXslMcsDbConfig::getTenantId, 0)
-                            .orderByDesc(MesXslMcsDbConfig::getUpdateTime)
-                            .last("LIMIT 1"),
-                    false);
+            MesXslMcsDbConfig config = mcsDbConfigService.loadStartupConfig();
             if (config != null) {
                 mcsDataSourceManager.applyConfig(config);
-                log.info("[MCS中间库] 已加载数据库中的中间库配置（含读写开关）");
+                log.info("[MCS中间库] 已加载数据库中的中间库配置 tenantId={}, status={}, host={}:{}",
+                        config.getTenantId(), config.getStatus(), config.getServerHost(), config.getServerPort());
             } else {
-                log.info("[MCS中间库] 未找到已启用的数据库配置，继续使用 application.yml 中的 sqlserver_mcs");
+                log.info("[MCS中间库] 数据库中无中间库配置，继续使用 application.yml 中的 sqlserver_mcs");
             }
         } catch (Exception e) {
-            log.warn("[MCS中间库] 启动加载配置失败，将使用 yml 默认连接: {}", e.getMessage());
+            log.error("[MCS中间库] 启动加载配置失败，将使用 yml 默认连接", e);
         }
     }
     //update-end---author:GHT ---date:20260616 for：【MES上辅机】启动时加载中间库可视化配置-----------

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/controller/MesXslMcsSyncConfigController.java

@@ -0,0 +1,150 @@
+package org.jeecg.modules.xslmes.mcs.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.xslmes.mcs.datasource.McsDataSourceManager;
+import org.jeecg.modules.xslmes.mcs.entity.MesXslMcsSyncConfig;
+import org.jeecg.modules.xslmes.mcs.mapper.McsMetaMapper;
+import org.jeecg.modules.xslmes.mcs.service.IMesXslMcsSyncConfigService;
+import org.jeecg.modules.xslmes.mcs.sync.McsSyncScheduler;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * MES上辅机 中间表采集配置（表/字段绑定 + 采集操作 + 元数据）
+ *
+ * @author GHT
+ * @date 2026-06-17 for：【MES上辅机】采集配置-表与字段绑定
+ */
+@Tag(name = "MES上辅机采集配置")
+@RestController
+@RequestMapping("/xslmes/mcs/syncConfig")
+public class MesXslMcsSyncConfigController {
+
+    @Autowired
+    private IMesXslMcsSyncConfigService syncConfigService;
+
+    @Autowired
+    private McsSyncScheduler syncScheduler;
+
+    @Autowired
+    private McsMetaMapper metaMapper;
+
+    @Autowired
+    private McsDataSourceManager mcsDataSourceManager;
+
+    @Operation(summary = "采集配置-分页列表")
+    @GetMapping("/list")
+    public Result<IPage<MesXslMcsSyncConfig>> list(MesXslMcsSyncConfig query,
+                                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+        LambdaQueryWrapper<MesXslMcsSyncConfig> qw = new LambdaQueryWrapper<MesXslMcsSyncConfig>()
+                .eq(MesXslMcsSyncConfig::getDelFlag, 0)
+                .like(StringUtils.isNotBlank(query.getConfigName()), MesXslMcsSyncConfig::getConfigName, query.getConfigName())
+                .like(StringUtils.isNotBlank(query.getSourceTable()), MesXslMcsSyncConfig::getSourceTable, query.getSourceTable())
+                .orderByDesc(MesXslMcsSyncConfig::getUpdateTime);
+        IPage<MesXslMcsSyncConfig> page = syncConfigService.page(new Page<>(pageNo, pageSize), qw);
+        page.getRecords().forEach(c -> c.setRunning(syncScheduler.isRunning(c.getId())));
+        return Result.OK(page);
+    }
+
+    @Operation(summary = "采集配置-详情(含字段映射)")
+    @GetMapping("/queryById")
+    public Result<MesXslMcsSyncConfig> queryById(@RequestParam("id") String id) {
+        MesXslMcsSyncConfig cfg = syncConfigService.getDetail(id);
+        if (cfg == null) {
+            return Result.error("配置不存在");
+        }
+        cfg.setRunning(syncScheduler.isRunning(id));
+        return Result.OK(cfg);
+    }
+
+    @Operation(summary = "采集配置-按业务类型获取(密炼动作页用)")
+    @GetMapping("/getByBizType")
+    public Result<MesXslMcsSyncConfig> getByBizType(@RequestParam(name = "bizType", defaultValue = "MIX_ACT") String bizType) {
+        MesXslMcsSyncConfig cfg = syncConfigService.getByBizType(bizType);
+        if (cfg != null) {
+            cfg.setRunning(syncScheduler.isRunning(cfg.getId()));
+        }
+        return Result.OK(cfg);
+    }
+
+    @Operation(summary = "采集配置-新增")
+    @RequiresPermissions("xslmes:mcsSyncConfig:add")
+    @PostMapping("/add")
+    public Result<String> add(@RequestBody MesXslMcsSyncConfig config) {
+        config.setId(null);
+        return syncConfigService.saveConfig(config);
+    }
+
+    @Operation(summary = "采集配置-编辑")
+    @RequiresPermissions("xslmes:mcsSyncConfig:edit")
+    @PostMapping("/edit")
+    public Result<String> edit(@RequestBody MesXslMcsSyncConfig config) {
+        if (StringUtils.isBlank(config.getId())) {
+            return Result.error("缺少配置ID");
+        }
+        return syncConfigService.saveConfig(config);
+    }
+
+    @Operation(summary = "采集配置-删除")
+    @RequiresPermissions("xslmes:mcsSyncConfig:delete")
+    @DeleteMapping("/delete")
+    public Result<String> delete(@RequestParam("id") String id) {
+        return syncConfigService.deleteConfig(id);
+    }
+
+    @Operation(summary = "采集操作-是否采集+采集间隔")
+    @RequiresPermissions("xslmes:mcsSyncConfig:setting")
+    @PostMapping("/saveCollect")
+    public Result<String> saveCollect(@RequestBody MesXslMcsSyncConfig body) {
+        return syncConfigService.saveCollect(body);
+    }
+
+    // ===================== 元数据 =====================
+
+    @Operation(summary = "元数据-中间库表清单")
+    @GetMapping("/meta/sourceTables")
+    public Result<List<Map<String, Object>>> sourceTables() {
+        if (!mcsDataSourceManager.isDbConfigActive()) {
+            return Result.error("中间库未连接，请先在「中间库连接配置」中启用");
+        }
+        return Result.OK(metaMapper.listSourceTables());
+    }
+
+    @Operation(summary = "元数据-中间库表字段")
+    @GetMapping("/meta/sourceColumns")
+    public Result<List<Map<String, Object>>> sourceColumns(@RequestParam("table") String table) {
+        if (!mcsDataSourceManager.isDbConfigActive()) {
+            return Result.error("中间库未连接，请先在「中间库连接配置」中启用");
+        }
+        if (!table.matches("^[A-Za-z0-9_]+$")) {
+            return Result.error("非法表名");
+        }
+        return Result.OK(metaMapper.listSourceColumns(table));
+    }
+
+    @Operation(summary = "元数据-MES业务表清单(mes_xsl_前缀)")
+    @GetMapping("/meta/targetTables")
+    public Result<List<Map<String, Object>>> targetTables() {
+        return Result.OK(metaMapper.listTargetTables());
+    }
+
+    @Operation(summary = "元数据-MES表字段")
+    @GetMapping("/meta/targetColumns")
+    public Result<List<Map<String, Object>>> targetColumns(@RequestParam("table") String table) {
+        if (!table.matches("^[A-Za-z0-9_]+$")) {
+            return Result.error("非法表名");
+        }
+        return Result.OK(metaMapper.listTargetColumns(table));
+    }
+}

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/datasource/McsDataSourceManager.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.xslmes.mcs.datasource;
 import com.alibaba.druid.pool.DruidDataSource;
 import com.baomidou.dynamic.datasource.DynamicRoutingDataSource;
 import com.baomidou.dynamic.datasource.creator.DataSourceProperty;
+import com.baomidou.dynamic.datasource.creator.druid.DruidConfig;
 import com.baomidou.dynamic.datasource.creator.druid.DruidDataSourceCreator;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
@@ -58,7 +59,11 @@ public class McsDataSourceManager {
 
     public boolean isDbConfigActive() {
         MesXslMcsDbConfig cfg = cachedConfig.get();
-        return cfg != null && Integer.valueOf(1).equals(cfg.getStatus());
+        if (cfg == null || !Integer.valueOf(1).equals(cfg.getStatus())) {
+            return false;
+        }
+        DynamicRoutingDataSource routing = (DynamicRoutingDataSource) dataSource;
+        return routing.getDataSources().containsKey(DS_KEY);
     }
 
     public boolean isReadEnabled() {
@@ -82,11 +87,11 @@ public class McsDataSourceManager {
      * 将配置应用到动态数据源（启用时注册/更新，禁用时移除）
      */
     public void applyConfig(MesXslMcsDbConfig config) {
-        cachedConfig.set(config);
         DynamicRoutingDataSource routing = (DynamicRoutingDataSource) dataSource;
         closeAndRemoveDataSource(routing);
         DataSourceCachePool.removeCache(DS_KEY);
         if (config == null) {
+            cachedConfig.set(null);
             restoreYmlDataSource(routing);
             log.info("[MCS中间库] 已清除页面配置");
             return;
@@ -97,6 +102,7 @@ public class McsDataSourceManager {
                 DataSourceProperty property = buildDataSourceProperty(config, plainPassword);
                 DataSource mcsDs = dataSourceCreator.createDataSource(property);
                 routing.addDataSource(DS_KEY, mcsDs);
+                cachedConfig.set(config);
                 log.info("[MCS中间库] 动态数据源 {} 已热刷新（无需重启）: {}:{}/{}", DS_KEY,
                         config.getServerHost(), config.getServerPort(), config.getDbName());
             } catch (Exception e) {
@@ -106,6 +112,7 @@ public class McsDataSourceManager {
             }
             return;
         }
+        cachedConfig.set(config);
         restoreYmlDataSource(routing);
         log.info("[MCS中间库] 连接未启用，读写开关仍按页面配置生效");
     }
@@ -171,9 +178,22 @@ public class McsDataSourceManager {
         property.setUrl(buildJdbcUrl(config));
         property.setUsername(config.getDbUsername());
         property.setPassword(plainPassword);
+        applySqlServerDruidConfig(property);
         return property;
     }
 
+    /**
+     * SQL Server 不支持 Oracle/MySQL 的 DUAL 表，覆盖全局 validationQuery 避免连接池校验失败
+     */
+    private void applySqlServerDruidConfig(DataSourceProperty property) {
+        DruidConfig druid = property.getDruid();
+        if (druid == null) {
+            druid = new DruidConfig();
+            property.setDruid(druid);
+        }
+        druid.setValidationQuery("SELECT 1");
+    }
+
     private void restoreYmlDataSource(DynamicRoutingDataSource routing) {
         if (StringUtils.isBlank(ymlUrl)) {
             log.warn("[MCS中间库] yml 中未配置 sqlserver_mcs，无法恢复默认数据源");
@@ -186,6 +206,7 @@ public class McsDataSourceManager {
             property.setUrl(ymlUrl);
             property.setUsername(ymlUsername);
             property.setPassword(ymlPassword);
+            applySqlServerDruidConfig(property);
             routing.addDataSource(DS_KEY, dataSourceCreator.createDataSource(property));
         } catch (Exception e) {
             log.error("[MCS中间库] 恢复 yml 默认数据源失败", e);

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/entity/MesXslMcsSyncConfig.java

@@ -0,0 +1,126 @@
+package org.jeecg.modules.xslmes.mcs.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * MES上辅机 中间表采集配置（通用）
+ * <p>按 bizType 区分不同业务（密炼动作/报警/配方等），供秒级定时采集统一复用</p>
+ *
+ * @author GHT
+ * @date 2026-06-17 for：【MES上辅机】密炼动作秒级采集
+ */
+@Data
+@TableName("mes_xsl_mcs_sync_config")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "MES上辅机中间表采集配置")
+public class MesXslMcsSyncConfig implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.ASSIGN_ID)
+    @Schema(description = "主键")
+    private String id;
+
+    @Schema(description = "业务类型(采集任务唯一标识，如 MIX_ACT 密炼动作；通用配置可为空)")
+    private String bizType;
+
+    @Schema(description = "配置名称")
+    private String configName;
+
+    @Schema(description = "业务名称")
+    private String bizName;
+
+    @Schema(description = "源中间表名")
+    private String sourceTable;
+
+    @Schema(description = "源中间表注释")
+    private String sourceTableComment;
+
+    @Schema(description = "MES目标表名")
+    private String targetTable;
+
+    @Schema(description = "MES目标表注释")
+    private String targetTableComment;
+
+    @Schema(description = "采集时间间隔(秒)，默认1秒")
+    private Integer intervalSeconds;
+
+    @Schema(description = "采集状态(0停止,1运行)")
+    private String status;
+
+    @Schema(description = "采集模式(FULL全量匹配,TIME时间匹配,INCR增量匹配-标记位回写)")
+    private String syncMode;
+
+    @Schema(description = "时间列/标记列(源表列名)。TIME模式=时间列；INCR模式=同步标记列(为空表示未采集,采集后回写'1')")
+    private String incrColumn;
+
+    @Schema(description = "时间范围(TODAY当天,LAST7最近七天)")
+    private String timeWindow;
+
+    @Schema(description = "每轮最大采集行数(INCR模式TOP N)")
+    private Integer batchLimit;
+
+    @Schema(description = "增量采集高水位(INCR模式自动维护)")
+    private String lastWatermark;
+
+    @Schema(description = "增量标记采集条件(IS_NULL为空,EQ_EMPTY等于匹配值,NE_EMPTY不等于匹配值)，INCR模式用")
+    private String flagCondition;
+
+    //update-begin---author:GHT ---date:20260617 for：【MES上辅机】增量采集条件等于/不等于支持自定义匹配值-----------
+    @Schema(description = "增量标记采集条件比较值(EQ_EMPTY/NE_EMPTY 用，留空表示空字符串)，INCR模式用")
+    private String flagMatchValue;
+    //update-end---author:GHT ---date:20260617 for：【MES上辅机】增量采集条件等于/不等于支持自定义匹配值-----------
+
+    @Schema(description = "增量标记采集完成后回写值(默认1)，INCR模式用")
+    private String flagWriteValue;
+
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "最近一次采集时间")
+    private Date lastSyncTime;
+
+    @Schema(description = "最近一次采集结果")
+    private String lastSyncResult;
+
+    @Schema(description = "备注")
+    private String remark;
+
+    @Schema(description = "租户ID")
+    private Integer tenantId;
+
+    private String createBy;
+
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    private String updateBy;
+
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    private Integer delFlag;
+
+    @TableField(exist = false)
+    @Schema(description = "字段映射明细（主子保存/详情用）")
+    private List<MesXslMcsSyncField> fieldList;
+
+    @TableField(exist = false)
+    @Schema(description = "采集任务是否运行中（运行态由调度器实时给出）")
+    private Boolean running;
+}

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/entity/MesXslMcsSyncField.java

@@ -0,0 +1,75 @@
+package org.jeecg.modules.xslmes.mcs.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * MES上辅机 采集字段映射（中间库源字段 → MES目标字段）
+ *
+ * @author GHT
+ * @date 2026-06-17 for：【MES上辅机】采集配置-表与字段绑定
+ */
+@Data
+@TableName("mes_xsl_mcs_sync_field")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "MES上辅机采集字段映射")
+public class MesXslMcsSyncField implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.ASSIGN_ID)
+    @Schema(description = "主键")
+    private String id;
+
+    @Schema(description = "采集配置ID")
+    private String configId;
+
+    @Schema(description = "中间库源字段名")
+    private String sourceField;
+
+    @Schema(description = "源字段注释")
+    private String sourceFieldComment;
+
+    @Schema(description = "源字段类型")
+    private String sourceFieldType;
+
+    @Schema(description = "MES目标字段名(接收字段)")
+    private String targetField;
+
+    @Schema(description = "MES目标字段注释")
+    private String targetFieldComment;
+
+    @Schema(description = "是否匹配键(0否,1是)")
+    private String matchKey;
+
+    @Schema(description = "排序")
+    private Integer sortNo;
+
+    @Schema(description = "租户ID")
+    private Integer tenantId;
+
+    private String createBy;
+
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    private String updateBy;
+
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    private Integer delFlag;
+}

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/mapper/McsMetaMapper.java

@@ -0,0 +1,58 @@
+package org.jeecg.modules.xslmes.mcs.mapper;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 中间库(SQL Server) / MES(MySQL) 表与字段元数据查询。
+ * <p>源表元数据走 sqlserver_mcs 数据源，目标表元数据走默认 MES 库。</p>
+ *
+ * @author GHT
+ * @date 2026-06-17 for：【MES上辅机】采集配置-表与字段绑定
+ */
+public interface McsMetaMapper {
+
+    /**
+     * 中间库表清单（含表注释 MS_Description）
+     */
+    @DS("sqlserver_mcs")
+    @Select("SELECT t.name AS tableName, CAST(ep.value AS NVARCHAR(200)) AS tableComment "
+            + "FROM sys.tables t "
+            + "LEFT JOIN sys.extended_properties ep ON ep.major_id = t.object_id AND ep.minor_id = 0 AND ep.name = 'MS_Description' "
+            + "ORDER BY t.name")
+    List<Map<String, Object>> listSourceTables();
+
+    /**
+     * 中间库表字段清单（含字段注释、类型）
+     */
+    @DS("sqlserver_mcs")
+    @Select("SELECT c.name AS columnName, ty.name AS dataType, CAST(ep.value AS NVARCHAR(200)) AS columnComment "
+            + "FROM sys.columns c "
+            + "JOIN sys.types ty ON c.user_type_id = ty.user_type_id "
+            + "LEFT JOIN sys.extended_properties ep ON ep.major_id = c.object_id AND ep.minor_id = c.column_id AND ep.name = 'MS_Description' "
+            + "WHERE c.object_id = OBJECT_ID(#{table}) "
+            + "ORDER BY c.column_id")
+    List<Map<String, Object>> listSourceColumns(@Param("table") String table);
+
+    /**
+     * MES 业务表清单（仅 mes_xsl_ 前缀）
+     */
+    @Select("SELECT table_name AS tableName, table_comment AS tableComment "
+            + "FROM information_schema.tables "
+            + "WHERE table_schema = (SELECT DATABASE()) AND table_name LIKE 'mes\\_xsl\\_%' "
+            + "ORDER BY table_name")
+    List<Map<String, Object>> listTargetTables();
+
+    /**
+     * MES 表字段清单（含字段注释、类型）
+     */
+    @Select("SELECT column_name AS columnName, data_type AS dataType, column_comment AS columnComment "
+            + "FROM information_schema.columns "
+            + "WHERE table_schema = (SELECT DATABASE()) AND table_name = #{table} "
+            + "ORDER BY ordinal_position")
+    List<Map<String, Object>> listTargetColumns(@Param("table") String table);
+}

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/mapper/MesXslMcsSyncConfigMapper.java

@@ -0,0 +1,13 @@
+package org.jeecg.modules.xslmes.mcs.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.xslmes.mcs.entity.MesXslMcsSyncConfig;
+
+/**
+ * MES上辅机 中间表采集配置 Mapper
+ *
+ * @author GHT
+ * @date 2026-06-17 for：【MES上辅机】密炼动作秒级采集
+ */
+public interface MesXslMcsSyncConfigMapper extends BaseMapper<MesXslMcsSyncConfig> {
+}

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/mapper/MesXslMcsSyncFieldMapper.java

@@ -0,0 +1,13 @@
+package org.jeecg.modules.xslmes.mcs.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.xslmes.mcs.entity.MesXslMcsSyncField;
+
+/**
+ * MES上辅机 采集字段映射 Mapper
+ *
+ * @author GHT
+ * @date 2026-06-17 for：【MES上辅机】采集配置-表与字段绑定
+ */
+public interface MesXslMcsSyncFieldMapper extends BaseMapper<MesXslMcsSyncField> {
+}

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/service/IMesXslMcsDbConfigService.java

@@ -28,4 +28,9 @@ public interface IMesXslMcsDbConfigService extends IService<MesXslMcsDbConfig> {
      * 删除配置并移除动态数据源
      */
     Result<String> deleteConfig(String id);
+
+    /**
+     * 启动时加载中间库配置（不限定租户，取最近更新的一条）
+     */
+    MesXslMcsDbConfig loadStartupConfig();
 }

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/service/IMesXslMcsSyncConfigService.java

@@ -0,0 +1,40 @@
+package org.jeecg.modules.xslmes.mcs.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.xslmes.mcs.entity.MesXslMcsSyncConfig;
+
+/**
+ * MES上辅机 中间表采集配置 Service（配置驱动：表/字段绑定 + 采集操作）
+ *
+ * @author GHT
+ * @date 2026-06-17 for：【MES上辅机】采集配置-表与字段绑定
+ */
+public interface IMesXslMcsSyncConfigService extends IService<MesXslMcsSyncConfig> {
+
+    /**
+     * 获取配置详情（含字段映射明细 fieldList）
+     */
+    MesXslMcsSyncConfig getDetail(String id);
+
+    /**
+     * 按业务类型获取最近配置（密炼动作页用，bizType=MIX_ACT）
+     */
+    MesXslMcsSyncConfig getByBizType(String bizType);
+
+    /**
+     * 保存配置（头 + 字段映射明细，主子整存）
+     */
+    Result<String> saveConfig(MesXslMcsSyncConfig config);
+
+    /**
+     * 删除配置及其字段映射，并停止采集
+     */
+    Result<String> deleteConfig(String id);
+
+    /**
+     * 采集操作：维护是否采集、采集间隔、采集模式（全量/时间/增量）及其参数。
+     * status='1' 启动并按间隔重排，'0' 停止。
+     */
+    Result<String> saveCollect(MesXslMcsSyncConfig body);
+}

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/service/impl/MesXslMcsDbConfigServiceImpl.java

@@ -44,6 +44,16 @@ public class MesXslMcsDbConfigServiceImpl extends ServiceImpl<MesXslMcsDbConfigM
         return config;
     }
 
+    //update-begin---author:GHT ---date:20260616 for：【MES上辅机】启动时加载中间库配置（不限定租户）-----------
+    @Override
+    public MesXslMcsDbConfig loadStartupConfig() {
+        LambdaQueryWrapper<MesXslMcsDbConfig> qw = new LambdaQueryWrapper<>();
+        qw.orderByDesc(MesXslMcsDbConfig::getUpdateTime);
+        qw.last("LIMIT 1");
+        return getOne(qw, false);
+    }
+    //update-end---author:GHT ---date:20260616 for：【MES上辅机】启动时加载中间库配置（不限定租户）-----------
+
     //update-begin---author:GHT ---date:20260616 for：【MES上辅机】SQL Server中间库可视化配置-----------
     @Override
     @Transactional(rollbackFor = Exception.class)

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/service/impl/MesXslMcsSyncConfigServiceImpl.java

@@ -0,0 +1,223 @@
+package org.jeecg.modules.xslmes.mcs.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.xslmes.mcs.entity.MesXslMcsSyncConfig;
+import org.jeecg.modules.xslmes.mcs.entity.MesXslMcsSyncField;
+import org.jeecg.modules.xslmes.mcs.mapper.MesXslMcsSyncConfigMapper;
+import org.jeecg.modules.xslmes.mcs.mapper.MesXslMcsSyncFieldMapper;
+import org.jeecg.modules.xslmes.mcs.service.IMesXslMcsSyncConfigService;
+import org.jeecg.modules.xslmes.mcs.sync.McsSyncScheduler;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * MES上辅机 中间表采集配置 Service 实现
+ *
+ * @author GHT
+ * @date 2026-06-17 for：【MES上辅机】采集配置-表与字段绑定
+ */
+@Slf4j
+@Service
+public class MesXslMcsSyncConfigServiceImpl extends ServiceImpl<MesXslMcsSyncConfigMapper, MesXslMcsSyncConfig>
+        implements IMesXslMcsSyncConfigService {
+
+    @Autowired
+    private MesXslMcsSyncFieldMapper syncFieldMapper;
+
+    @Autowired
+    private McsSyncScheduler syncScheduler;
+
+    @Override
+    public MesXslMcsSyncConfig getDetail(String id) {
+        MesXslMcsSyncConfig cfg = getById(id);
+        if (cfg == null) {
+            return null;
+        }
+        cfg.setFieldList(listFields(id));
+        return cfg;
+    }
+
+    @Override
+    public MesXslMcsSyncConfig getByBizType(String bizType) {
+        return getOne(new LambdaQueryWrapper<MesXslMcsSyncConfig>()
+                .eq(MesXslMcsSyncConfig::getBizType, bizType)
+                .eq(MesXslMcsSyncConfig::getDelFlag, 0)
+                .orderByDesc(MesXslMcsSyncConfig::getUpdateTime)
+                .last("LIMIT 1"), false);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result<String> saveConfig(MesXslMcsSyncConfig config) {
+        if (config == null) {
+            return Result.error("配置不能为空");
+        }
+        if (StringUtils.isBlank(config.getSourceTable())) {
+            return Result.error("请选择中间库源表");
+        }
+        if (StringUtils.isBlank(config.getTargetTable())) {
+            return Result.error("请选择MES目标表");
+        }
+        List<MesXslMcsSyncField> fields = config.getFieldList() != null ? config.getFieldList() : new ArrayList<>();
+        // 至少一个有效映射
+        boolean hasValid = fields.stream().anyMatch(f -> StringUtils.isNotBlank(f.getSourceField())
+                && StringUtils.isNotBlank(f.getTargetField()));
+        if (!hasValid) {
+            return Result.error("请至少配置一个字段映射（源字段+接收字段）");
+        }
+
+        String username = currentUsername();
+        Date now = new Date();
+        if (config.getIntervalSeconds() == null || config.getIntervalSeconds() < 1) {
+            config.setIntervalSeconds(1);
+        }
+        if (config.getTenantId() == null) {
+            config.setTenantId(0);
+        }
+        config.setDelFlag(0);
+        config.setUpdateBy(username);
+        config.setUpdateTime(now);
+
+        boolean isUpdate = StringUtils.isNotBlank(config.getId());
+        if (isUpdate) {
+            MesXslMcsSyncConfig old = getById(config.getId());
+            if (old == null) {
+                return Result.error("配置不存在");
+            }
+            // 状态由采集操作维护，保存配置不改变运行状态
+            config.setStatus(old.getStatus());
+            updateById(config);
+        } else {
+            if (StringUtils.isBlank(config.getStatus())) {
+                config.setStatus("0");
+            }
+            config.setCreateBy(username);
+            config.setCreateTime(now);
+            save(config);
+        }
+
+        // 整存字段映射：先物理删除旧映射再插入
+        syncFieldMapper.delete(new LambdaQueryWrapper<MesXslMcsSyncField>()
+                .eq(MesXslMcsSyncField::getConfigId, config.getId()));
+        int sort = 0;
+        for (MesXslMcsSyncField f : fields) {
+            if (StringUtils.isBlank(f.getSourceField())) {
+                continue;
+            }
+            f.setId(null);
+            f.setConfigId(config.getId());
+            f.setSortNo(sort++);
+            f.setTenantId(config.getTenantId());
+            f.setDelFlag(0);
+            f.setCreateBy(username);
+            f.setCreateTime(now);
+            f.setUpdateBy(username);
+            f.setUpdateTime(now);
+            syncFieldMapper.insert(f);
+        }
+
+        // 运行中则按新配置重排（间隔/映射即时生效）
+        if ("1".equals(config.getStatus())) {
+            syncScheduler.scheduleTask(getById(config.getId()));
+        }
+        return Result.OK(isUpdate ? "保存成功" : "新增成功");
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result<String> deleteConfig(String id) {
+        MesXslMcsSyncConfig cfg = getById(id);
+        if (cfg == null) {
+            return Result.error("配置不存在");
+        }
+        syncScheduler.cancelTask(id);
+        syncFieldMapper.delete(new LambdaQueryWrapper<MesXslMcsSyncField>()
+                .eq(MesXslMcsSyncField::getConfigId, id));
+        removeById(id);
+        return Result.OK("删除成功");
+    }
+
+    @Override
+    public Result<String> saveCollect(MesXslMcsSyncConfig body) {
+        if (body == null || StringUtils.isBlank(body.getId())) {
+            return Result.error("缺少配置ID");
+        }
+        MesXslMcsSyncConfig cfg = getById(body.getId());
+        if (cfg == null) {
+            return Result.error("配置不存在");
+        }
+        if (body.getIntervalSeconds() != null) {
+            if (body.getIntervalSeconds() < 1) {
+                return Result.error("采集间隔不能小于1秒");
+            }
+            cfg.setIntervalSeconds(body.getIntervalSeconds());
+        }
+        // 采集模式及参数
+        String mode = StringUtils.isBlank(body.getSyncMode()) ? "FULL" : body.getSyncMode().trim().toUpperCase();
+        cfg.setSyncMode(mode);
+        cfg.setIncrColumn(StringUtils.trimToNull(body.getIncrColumn()));
+        cfg.setTimeWindow(StringUtils.isBlank(body.getTimeWindow()) ? "TODAY" : body.getTimeWindow());
+        if (body.getBatchLimit() != null && body.getBatchLimit() > 0) {
+            cfg.setBatchLimit(body.getBatchLimit());
+        }
+        // INCR(标记回写)：采集条件 + 回写值（可视化配置，回写值默认"1"）
+        cfg.setFlagCondition(StringUtils.isBlank(body.getFlagCondition()) ? "IS_NULL" : body.getFlagCondition().trim().toUpperCase());
+        //update-begin---author:GHT ---date:20260617 for：【MES上辅机】增量采集条件等于/不等于支持自定义匹配值-----------
+        cfg.setFlagMatchValue(body.getFlagMatchValue());
+        //update-end---author:GHT ---date:20260617 for：【MES上辅机】增量采集条件等于/不等于支持自定义匹配值-----------
+        cfg.setFlagWriteValue(StringUtils.isBlank(body.getFlagWriteValue()) ? "1" : body.getFlagWriteValue());
+        if (("TIME".equals(mode) || "INCR".equals(mode)) && StringUtils.isBlank(cfg.getIncrColumn())) {
+            return Result.error("时间匹配/增量匹配需选择" + ("TIME".equals(mode) ? "时间列" : "标记列"));
+        }
+
+        boolean on = "1".equals(body.getStatus());
+        cfg.setStatus(on ? "1" : "0");
+        cfg.setUpdateBy(currentUsername());
+        cfg.setUpdateTime(new Date());
+        updateById(cfg);
+        if (on) {
+            syncScheduler.scheduleTask(cfg);
+            return Result.OK("已启动采集（" + modeText(mode) + "），间隔 " + cfg.getIntervalSeconds() + " 秒");
+        }
+        syncScheduler.cancelTask(cfg.getId());
+        return Result.OK("已停止采集");
+    }
+
+    private String modeText(String mode) {
+        switch (mode) {
+            case "TIME":
+                return "时间匹配";
+            case "INCR":
+                return "增量匹配";
+            default:
+                return "全量匹配";
+        }
+    }
+
+    private List<MesXslMcsSyncField> listFields(String configId) {
+        return syncFieldMapper.selectList(new LambdaQueryWrapper<MesXslMcsSyncField>()
+                .eq(MesXslMcsSyncField::getConfigId, configId)
+                .eq(MesXslMcsSyncField::getDelFlag, 0)
+                .orderByAsc(MesXslMcsSyncField::getSortNo));
+    }
+
+    private String currentUsername() {
+        try {
+            LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+            return user != null ? user.getUsername() : "system";
+        } catch (Exception e) {
+            return "system";
+        }
+    }
+}

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/sync/GenericMcsSyncEngine.java

@@ -0,0 +1,524 @@
+package org.jeecg.modules.xslmes.mcs.sync;
+
+import com.baomidou.dynamic.datasource.DynamicRoutingDataSource;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.jeecg.modules.xslmes.mcs.datasource.McsDataSourceManager;
+import org.jeecg.modules.xslmes.mcs.entity.MesXslMcsSyncConfig;
+import org.jeecg.modules.xslmes.mcs.entity.MesXslMcsSyncField;
+import org.jeecg.modules.xslmes.mcs.mapper.McsMetaMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
+
+import javax.sql.DataSource;
+import java.sql.Timestamp;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+/**
+ * 通用中间表采集引擎（配置驱动，纯字段拷贝）。
+ * <p>支持三种采集模式，应对中间库不同规模的表：</p>
+ * <ul>
+ *   <li><b>FULL 全量匹配</b>：全表读源+全表读目标→按匹配键 Upsert，仅写新增/变化行。适合小状态表、以更新为主。</li>
+ *   <li><b>TIME 时间匹配</b>：按时间列只取窗口内数据（当天/最近七天）→按匹配键 Upsert，目标侧按窗口匹配键定向读取。避免全表扫描。</li>
+ *   <li><b>INCR 增量匹配（标记位回写）</b>：源表选一「同步标记列」，仅采集该列为空（NULL/''）的行（TOP N 限流），
+ *       按匹配键 Upsert 到 MES 后，回写源表该列为 {@code '1'}，下轮不再重复采集。适合带 GUID 主键、无可靠递增列的流水表。</li>
+ * </ul>
+ *
+ * @author GHT
+ * @date 2026-06-17 for：【MES上辅机】采集配置-表与字段绑定
+ */
+@Slf4j
+@Component
+public class GenericMcsSyncEngine {
+
+    public static final String MODE_FULL = "FULL";
+    public static final String MODE_TIME = "TIME";
+    public static final String MODE_INCR = "INCR";
+
+    /** 合法标识符（表名/列名），防止 SQL 注入 */
+    private static final Pattern IDENT = Pattern.compile("^[A-Za-z0-9_]+$");
+
+    /** 批量写入分批大小 */
+    private static final int BATCH_SIZE = 500;
+    /** IN 查询分块大小 */
+    private static final int IN_CHUNK = 1000;
+    /** INCR 默认每轮行数 */
+    private static final int DEFAULT_BATCH_LIMIT = 2000;
+    /** INCR 标记位回写后的已同步标识值 */
+    private static final String FLAG_SYNCED = "1";
+
+    @Autowired
+    private DataSource dataSource;
+
+    @Autowired
+    private McsMetaMapper metaMapper;
+
+    @Autowired
+    private org.jeecg.modules.xslmes.mcs.datasource.McsDataSourceManager mcsDataSourceManager;
+
+    //update-begin---author:GHT ---date:20260617 for：【MES上辅机】采集模式 全量/时间/增量-----------
+    public String sync(MesXslMcsSyncConfig cfg, List<MesXslMcsSyncField> fields) {
+        String sourceTable = trim(cfg.getSourceTable());
+        String targetTable = trim(cfg.getTargetTable());
+        if (StringUtils.isBlank(sourceTable) || StringUtils.isBlank(targetTable)) {
+            return "未配置源表或目标表，跳过";
+        }
+        validateIdent(sourceTable);
+        validateIdent(targetTable);
+
+        List<MesXslMcsSyncField> maps = fields == null ? List.of() : fields.stream()
+                .filter(f -> StringUtils.isNotBlank(f.getSourceField()) && StringUtils.isNotBlank(f.getTargetField()))
+                .collect(Collectors.toList());
+        if (maps.isEmpty()) {
+            return "无有效字段映射，跳过";
+        }
+        for (MesXslMcsSyncField f : maps) {
+            validateIdent(f.getSourceField());
+            validateIdent(f.getTargetField());
+        }
+
+        String mode = StringUtils.isBlank(cfg.getSyncMode()) ? MODE_FULL : cfg.getSyncMode().trim().toUpperCase();
+        JdbcTemplate sourceJt = new JdbcTemplate(getSourceDataSource());
+        JdbcTemplate targetJt = new JdbcTemplate(dataSource);
+
+        // 目标表标准字段探测 + 自动填充列
+        Set<String> targetCols = metaMapper.listTargetColumns(targetTable).stream()
+                .map(m -> String.valueOf(m.get("columnName")).toLowerCase())
+                .collect(Collectors.toSet());
+        boolean hasDel = targetCols.contains("del_flag");
+
+        List<MesXslMcsSyncField> keyMaps = maps.stream().filter(f -> "1".equals(f.getMatchKey())).collect(Collectors.toList());
+        Set<String> keyTargetsLower = keyMaps.stream().map(k -> k.getTargetField().toLowerCase()).collect(Collectors.toSet());
+        List<MesXslMcsSyncField> nonKeyMaps = maps.stream()
+                .filter(f -> !keyTargetsLower.contains(f.getTargetField().toLowerCase()))
+                .collect(Collectors.toList());
+
+        int tenantId = cfg.getTenantId() != null ? cfg.getTenantId() : 0;
+        Timestamp now = new Timestamp(System.currentTimeMillis());
+
+        AutoCols auto = buildAutoCols(targetCols, maps, tenantId, now);
+
+        // 1. 按模式读源数据
+        LinkedHashSet<String> srcCols = maps.stream().map(MesXslMcsSyncField::getSourceField)
+                .collect(Collectors.toCollection(LinkedHashSet::new));
+        List<Map<String, Object>> rows;
+
+        //update-begin---author:GHT ---date:20260617 for：【MES上辅机】增量匹配改为标记位回写-----------
+        // INCR(标记回写)模式：仅采集「标记列」为空的行，采完回写"1"，下轮不再重复采集
+        String flagCol = null;
+        boolean flagMode = MODE_INCR.equals(mode);
+
+        if (flagMode) {
+            flagCol = requireIncrColumn(cfg);
+            if (keyMaps.isEmpty()) {
+                return "增量(标记)采集需在字段映射中勾选至少一个匹配键作为回写主键（如 GUID）";
+            }
+            if (!mcsDataSourceManager.isWriteEnabled()) {
+                return "增量(标记)采集需开启中间库写入开关以回写同步标记，请在「中间库连接配置」开启写入";
+            }
+            srcCols.add(flagCol);
+            int limit = cfg.getBatchLimit() != null && cfg.getBatchLimit() > 0 ? cfg.getBatchLimit() : DEFAULT_BATCH_LIMIT;
+            String predicate = flagPredicate(flagCol, cfg.getFlagCondition(), cfg.getFlagMatchValue());
+            String sql = "SELECT TOP " + limit + " " + colList(srcCols) + " FROM [" + sourceTable + "]"
+                    + " WHERE (" + predicate + ")";
+            rows = sourceJt.queryForList(sql);
+            if (rows.isEmpty()) {
+                return "增量采集：无待采集数据";
+            }
+        } else if (MODE_TIME.equals(mode)) {
+            String incrCol = requireIncrColumn(cfg);
+            Timestamp[] window = timeWindow(cfg.getTimeWindow(), now);
+            StringBuilder sql = new StringBuilder("SELECT ").append(colList(srcCols))
+                    .append(" FROM [").append(sourceTable).append("] WHERE [").append(incrCol).append("] >= ?");
+            List<Object> args = new ArrayList<>();
+            args.add(window[0]);
+            if (window[1] != null) {
+                sql.append(" AND [").append(incrCol).append("] < ?");
+                args.add(window[1]);
+            }
+            rows = sourceJt.queryForList(sql.toString(), args.toArray());
+        } else {
+            // FULL
+            rows = sourceJt.queryForList("SELECT " + colList(srcCols) + " FROM [" + sourceTable + "]");
+        }
+
+        if (rows.isEmpty()) {
+            return ("TIME".equals(mode) ? "时间匹配" : "全量匹配") + "：窗口/源表无数据，未更新";
+        }
+
+        // 无匹配键 → 整批追加
+        if (keyMaps.isEmpty()) {
+            int ins = appendInsert(targetJt, targetTable, maps, auto, rows);
+            return String.format("采集完成(无匹配键，追加)：新增%d，源%d条", ins, rows.size());
+        }
+
+        // 2. 加载现有目标数据（FULL 全量；TIME/INCR 仅按本批匹配键定向读取）
+        LinkedHashSet<String> existCols = new LinkedHashSet<>();
+        keyMaps.forEach(k -> existCols.add(k.getTargetField()));
+        maps.forEach(m -> existCols.add(m.getTargetField()));
+        Map<String, Map<String, Object>> existingByKey = (MODE_TIME.equals(mode) || flagMode)
+                ? loadExistingByKeys(targetJt, targetTable, existCols, keyMaps, hasDel, rows)
+                : loadExistingAll(targetJt, targetTable, existCols, keyMaps, hasDel);
+
+        // 3. 比对 → 批量 Upsert
+        List<String> updateSetCols = nonKeyMaps.stream().map(MesXslMcsSyncField::getTargetField).collect(Collectors.toList());
+        boolean updTime = targetCols.contains("update_time") && !mappedContains(maps, "update_time");
+        boolean updBy = targetCols.contains("update_by") && !mappedContains(maps, "update_by");
+        String updateSql = buildUpdateSql(targetTable, updateSetCols, keyMaps, updTime, updBy, hasDel);
+        String insertSql = buildInsertSql(targetTable, maps, auto);
+
+        List<Object[]> insertArgs = new ArrayList<>();
+        List<Object[]> updateArgs = new ArrayList<>();
+        Set<String> handled = new HashSet<>();
+        int unchanged = 0;
+
+        for (Map<String, Object> row : rows) {
+            Map<String, Object> rci = ci(row);
+            String key = buildKeyFromSource(keyMaps, rci);
+            if (!handled.add(key)) {
+                continue;
+            }
+            Map<String, Object> existing = existingByKey.get(key);
+            if (existing == null) {
+                insertArgs.add(buildInsertArgs(maps, rci, auto));
+            } else if (updateSetCols.isEmpty()) {
+                unchanged++;
+            } else if (isChanged(nonKeyMaps, rci, existing)) {
+                updateArgs.add(buildUpdateArgs(nonKeyMaps, keyMaps, rci, updTime, updBy, now));
+            } else {
+                unchanged++;
+            }
+        }
+
+        int ins = batch(targetJt, insertSql, insertArgs);
+        int upd = updateSetCols.isEmpty() ? 0 : batch(targetJt, updateSql, updateArgs);
+
+        // INCR(标记回写)：对本批所有源行回写标记值，下轮不再采集
+        if (flagMode) {
+            String writeValue = StringUtils.isBlank(cfg.getFlagWriteValue()) ? FLAG_SYNCED : cfg.getFlagWriteValue();
+            int marked = writeBackFlag(sourceJt, sourceTable, flagCol, cfg.getFlagCondition(), cfg.getFlagMatchValue(), writeValue, keyMaps, rows);
+            return String.format("增量采集：新增%d，更新%d，未变%d，回写标记%d，源%d条",
+                    ins, upd, unchanged, marked, rows.size());
+        }
+        return String.format("%s：新增%d，更新%d，未变%d，源%d条",
+                "TIME".equals(mode) ? "时间匹配" : "全量匹配", ins, upd, unchanged, rows.size());
+        //update-end---author:GHT ---date:20260617 for：【MES上辅机】增量匹配改为标记位回写-----------
+    }
+
+    //update-begin---author:GHT ---date:20260617 for：【MES上辅机】增量匹配改为标记位回写-----------
+    /**
+     * INCR 标记采集条件：根据配置构造源表标记列的判定谓词（SELECT 取数 + 回写守卫共用）。
+     * <ul>
+     *   <li>{@code IS_NULL} 为空：{@code [col] IS NULL}</li>
+     *   <li>{@code EQ_EMPTY} 等于：{@code [col] = '<匹配值>'}（匹配值留空时退化为等于空串）</li>
+     *   <li>{@code NE_EMPTY} 不等于：{@code [col] <> '<匹配值>'}（匹配值留空时退化为不等于空串）</li>
+     * </ul>
+     * @param matchValue EQ_EMPTY/NE_EMPTY 的比较值，由用户填写，留空表示空字符串
+     */
+    private String flagPredicate(String flagCol, String condition, String matchValue) {
+        String c = StringUtils.isBlank(condition) ? "IS_NULL" : condition.trim().toUpperCase();
+        switch (c) {
+            case "EQ_EMPTY":
+                return "[" + flagCol + "] = '" + sqlLiteral(matchValue) + "'";
+            case "NE_EMPTY":
+                return "[" + flagCol + "] <> '" + sqlLiteral(matchValue) + "'";
+            case "IS_NULL":
+            default:
+                return "[" + flagCol + "] IS NULL";
+        }
+    }
+
+    /** 将用户填写的匹配值转义为 SQL 字符串字面量内容（单引号翻倍），防止注入。 */
+    private String sqlLiteral(String value) {
+        return value == null ? "" : value.replace("'", "''");
+    }
+
+    /**
+     * INCR 标记回写：把本批读到的源行该标记列回写为配置的回写值。
+     * <p>仅按匹配键精确定位本批读到的行（而非整列条件批量更新），
+     * 避免误标在本轮 SELECT 之后才进入中间库、尚未采集的新数据；
+     * 并以采集条件谓词做守卫，避开本轮已被其他进程改动的行。</p>
+     */
+    private int writeBackFlag(JdbcTemplate sourceJt, String sourceTable, String flagCol, String condition,
+                             String matchValue, String writeValue, List<MesXslMcsSyncField> keyMaps, List<Map<String, Object>> rows) {
+        validateIdent(flagCol);
+        StringBuilder sql = new StringBuilder("UPDATE [").append(sourceTable).append("] SET [")
+                .append(flagCol).append("] = ? WHERE ");
+        sql.append(keyMaps.stream().map(k -> "[" + k.getSourceField() + "] = ?").collect(Collectors.joining(" AND ")));
+        sql.append(" AND (").append(flagPredicate(flagCol, condition, matchValue)).append(")");
+        List<Object[]> argsList = new ArrayList<>();
+        Set<String> handled = new HashSet<>();
+        for (Map<String, Object> row : rows) {
+            Map<String, Object> rci = ci(row);
+            String key = buildKeyFromSource(keyMaps, rci);
+            if (!handled.add(key)) {
+                continue;
+            }
+            List<Object> args = new ArrayList<>(keyMaps.size() + 1);
+            args.add(writeValue);
+            for (MesXslMcsSyncField k : keyMaps) {
+                args.add(rci.get(k.getSourceField()));
+            }
+            argsList.add(args.toArray());
+        }
+        return batch(sourceJt, sql.toString(), argsList);
+    }
+    //update-end---author:GHT ---date:20260617 for：【MES上辅机】增量匹配改为标记位回写-----------
+
+    // ---------------- 现有数据加载 ----------------
+
+    private Map<String, Map<String, Object>> loadExistingAll(JdbcTemplate jt, String table, LinkedHashSet<String> existCols,
+                                                             List<MesXslMcsSyncField> keyMaps, boolean hasDel) {
+        String sql = "SELECT " + colListBt(existCols) + " FROM `" + table + "`" + (hasDel ? " WHERE `del_flag` = 0" : "");
+        Map<String, Map<String, Object>> map = new HashMap<>();
+        for (Map<String, Object> er : jt.queryForList(sql)) {
+            Map<String, Object> eci = ci(er);
+            map.put(buildKeyFromTarget(keyMaps, eci), eci);
+        }
+        return map;
+    }
+
+    private Map<String, Map<String, Object>> loadExistingByKeys(JdbcTemplate jt, String table, LinkedHashSet<String> existCols,
+                                                                List<MesXslMcsSyncField> keyMaps, boolean hasDel,
+                                                                List<Map<String, Object>> rows) {
+        Map<String, Map<String, Object>> map = new HashMap<>();
+        MesXslMcsSyncField firstKey = keyMaps.get(0);
+        // 收集窗口内首匹配键去重值
+        LinkedHashSet<Object> values = new LinkedHashSet<>();
+        for (Map<String, Object> row : rows) {
+            Object v = ci(row).get(firstKey.getSourceField());
+            if (v != null) {
+                values.add(v);
+            }
+        }
+        if (values.isEmpty()) {
+            return map;
+        }
+        List<Object> valueList = new ArrayList<>(values);
+        for (int i = 0; i < valueList.size(); i += IN_CHUNK) {
+            List<Object> part = valueList.subList(i, Math.min(i + IN_CHUNK, valueList.size()));
+            String ph = part.stream().map(x -> "?").collect(Collectors.joining(","));
+            String sql = "SELECT " + colListBt(existCols) + " FROM `" + table + "` WHERE `"
+                    + firstKey.getTargetField() + "` IN (" + ph + ")" + (hasDel ? " AND `del_flag` = 0" : "");
+            for (Map<String, Object> er : jt.queryForList(sql, part.toArray())) {
+                Map<String, Object> eci = ci(er);
+                map.put(buildKeyFromTarget(keyMaps, eci), eci);
+            }
+        }
+        return map;
+    }
+
+    // ---------------- 追加写入 ----------------
+
+    private int appendInsert(JdbcTemplate jt, String table, List<MesXslMcsSyncField> maps, AutoCols auto,
+                             List<Map<String, Object>> rows) {
+        List<Object[]> insertArgs = new ArrayList<>();
+        for (Map<String, Object> row : rows) {
+            insertArgs.add(buildInsertArgs(maps, ci(row), auto));
+        }
+        return batch(jt, buildInsertSql(table, maps, auto), insertArgs);
+    }
+
+    // ---------------- SQL 构建 ----------------
+
+    private String buildInsertSql(String table, List<MesXslMcsSyncField> maps, AutoCols auto) {
+        List<String> cols = new ArrayList<>();
+        maps.forEach(m -> cols.add(m.getTargetField()));
+        if (auto.id) {
+            cols.add("id");
+        }
+        cols.addAll(auto.cols);
+        String colSql = cols.stream().map(c -> "`" + c + "`").collect(Collectors.joining(","));
+        String ph = cols.stream().map(c -> "?").collect(Collectors.joining(","));
+        return "INSERT INTO `" + table + "` (" + colSql + ") VALUES (" + ph + ")";
+    }
+
+    private Object[] buildInsertArgs(List<MesXslMcsSyncField> maps, Map<String, Object> ci, AutoCols auto) {
+        List<Object> args = new ArrayList<>(maps.size() + auto.vals.size() + 1);
+        for (MesXslMcsSyncField m : maps) {
+            args.add(ci.get(m.getSourceField()));
+        }
+        if (auto.id) {
+            args.add(IdWorker.getIdStr());
+        }
+        args.addAll(auto.vals);
+        return args.toArray();
+    }
+
+    private String buildUpdateSql(String table, List<String> setCols, List<MesXslMcsSyncField> keyMaps,
+                                  boolean updTime, boolean updBy, boolean hasDel) {
+        if (setCols.isEmpty()) {
+            return null;
+        }
+        StringBuilder sql = new StringBuilder("UPDATE `").append(table).append("` SET ");
+        sql.append(setCols.stream().map(c -> "`" + c + "` = ?").collect(Collectors.joining(",")));
+        if (updTime) {
+            sql.append(", `update_time` = ?");
+        }
+        if (updBy) {
+            sql.append(", `update_by` = ?");
+        }
+        sql.append(" WHERE ");
+        sql.append(keyMaps.stream().map(k -> "`" + k.getTargetField() + "` = ?").collect(Collectors.joining(" AND ")));
+        if (hasDel) {
+            sql.append(" AND `del_flag` = 0");
+        }
+        return sql.toString();
+    }
+
+    private Object[] buildUpdateArgs(List<MesXslMcsSyncField> nonKeyMaps, List<MesXslMcsSyncField> keyMaps,
+                                     Map<String, Object> ci, boolean updTime, boolean updBy, Timestamp now) {
+        List<Object> args = new ArrayList<>();
+        for (MesXslMcsSyncField m : nonKeyMaps) {
+            args.add(ci.get(m.getSourceField()));
+        }
+        if (updTime) {
+            args.add(now);
+        }
+        if (updBy) {
+            args.add("mcs-sync");
+        }
+        for (MesXslMcsSyncField k : keyMaps) {
+            args.add(ci.get(k.getSourceField()));
+        }
+        return args.toArray();
+    }
+
+    // ---------------- 工具 ----------------
+
+    /** 自动填充列汇总（id 单独标记，因每行不同） */
+    private static class AutoCols {
+        boolean id;
+        final List<String> cols = new ArrayList<>();
+        final List<Object> vals = new ArrayList<>();
+    }
+
+    private AutoCols buildAutoCols(Set<String> targetCols, List<MesXslMcsSyncField> maps, int tenantId, Timestamp now) {
+        AutoCols a = new AutoCols();
+        a.id = targetCols.contains("id") && !mappedContains(maps, "id");
+        addAuto(a, targetCols, maps, "create_time", now);
+        addAuto(a, targetCols, maps, "update_time", now);
+        addAuto(a, targetCols, maps, "create_by", "mcs-sync");
+        addAuto(a, targetCols, maps, "update_by", "mcs-sync");
+        addAuto(a, targetCols, maps, "tenant_id", tenantId);
+        addAuto(a, targetCols, maps, "del_flag", 0);
+        return a;
+    }
+
+    private void addAuto(AutoCols a, Set<String> targetCols, List<MesXslMcsSyncField> maps, String col, Object val) {
+        if (targetCols.contains(col) && !mappedContains(maps, col)) {
+            a.cols.add(col);
+            a.vals.add(val);
+        }
+    }
+
+    /** 返回 [start, end]，end 可为 null */
+    private Timestamp[] timeWindow(String window, Timestamp now) {
+        String w = StringUtils.isBlank(window) ? "TODAY" : window.trim().toUpperCase();
+        if ("LAST7".equals(w)) {
+            return new Timestamp[]{Timestamp.valueOf(LocalDateTime.now().minusDays(7)), null};
+        }
+        // 默认当天
+        Timestamp start = Timestamp.valueOf(LocalDate.now().atStartOfDay());
+        Timestamp end = Timestamp.valueOf(LocalDate.now().plusDays(1).atStartOfDay());
+        return new Timestamp[]{start, end};
+    }
+
+    private String requireIncrColumn(MesXslMcsSyncConfig cfg) {
+        String col = trim(cfg.getIncrColumn());
+        if (StringUtils.isBlank(col)) {
+            throw new IllegalArgumentException("当前采集模式需指定标记列/时间列，请在采集操作中配置");
+        }
+        validateIdent(col);
+        return col;
+    }
+
+    private int batch(JdbcTemplate jt, String sql, List<Object[]> argsList) {
+        if (sql == null || argsList.isEmpty()) {
+            return 0;
+        }
+        int total = 0;
+        for (int i = 0; i < argsList.size(); i += BATCH_SIZE) {
+            List<Object[]> part = argsList.subList(i, Math.min(i + BATCH_SIZE, argsList.size()));
+            jt.batchUpdate(sql, part);
+            total += part.size();
+        }
+        return total;
+    }
+
+    private boolean isChanged(List<MesXslMcsSyncField> nonKeyMaps, Map<String, Object> ci, Map<String, Object> existing) {
+        for (MesXslMcsSyncField m : nonKeyMaps) {
+            if (!normVal(ci.get(m.getSourceField())).equals(normVal(existing.get(m.getTargetField())))) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private String buildKeyFromSource(List<MesXslMcsSyncField> keyMaps, Map<String, Object> ci) {
+        return keyMaps.stream().map(k -> normKey(ci.get(k.getSourceField()))).collect(Collectors.joining("||"));
+    }
+
+    private String buildKeyFromTarget(List<MesXslMcsSyncField> keyMaps, Map<String, Object> eci) {
+        return keyMaps.stream().map(k -> normKey(eci.get(k.getTargetField()))).collect(Collectors.joining("||"));
+    }
+
+    private Map<String, Object> ci(Map<String, Object> row) {
+        Map<String, Object> m = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+        m.putAll(row);
+        return m;
+    }
+
+    private String colList(LinkedHashSet<String> cols) {
+        return cols.stream().map(c -> "[" + c + "]").collect(Collectors.joining(","));
+    }
+
+    private String colListBt(LinkedHashSet<String> cols) {
+        return cols.stream().map(c -> "`" + c + "`").collect(Collectors.joining(","));
+    }
+
+    private String normKey(Object v) {
+        return v == null ? "" : String.valueOf(v).trim();
+    }
+
+    private String normVal(Object v) {
+        return v == null ? " " : String.valueOf(v);
+    }
+
+    private boolean mappedContains(List<MesXslMcsSyncField> maps, String targetCol) {
+        return maps.stream().anyMatch(m -> m.getTargetField() != null && m.getTargetField().equalsIgnoreCase(targetCol));
+    }
+
+    private DataSource getSourceDataSource() {
+        DynamicRoutingDataSource routing = (DynamicRoutingDataSource) dataSource;
+        DataSource src = routing.getDataSources().get(McsDataSourceManager.DS_KEY);
+        if (src == null) {
+            throw new IllegalStateException("中间库数据源 " + McsDataSourceManager.DS_KEY + " 未注册");
+        }
+        return src;
+    }
+
+    private void validateIdent(String name) {
+        if (name == null || !IDENT.matcher(name).matches()) {
+            throw new IllegalArgumentException("非法的表名或字段名: " + name);
+        }
+    }
+
+    private String trim(String s) {
+        return s == null ? null : s.trim();
+    }
+    //update-end---author:GHT ---date:20260617 for：【MES上辅机】采集模式 全量/时间/增量-----------
+}

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mcs/sync/McsSyncScheduler.java

@@ -0,0 +1,162 @@
+package org.jeecg.modules.xslmes.mcs.sync;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.modules.xslmes.mcs.datasource.McsDataSourceManager;
+import org.jeecg.modules.xslmes.mcs.entity.MesXslMcsSyncConfig;
+import org.jeecg.modules.xslmes.mcs.entity.MesXslMcsSyncField;
+import org.jeecg.modules.xslmes.mcs.mapper.MesXslMcsSyncConfigMapper;
+import org.jeecg.modules.xslmes.mcs.mapper.MesXslMcsSyncFieldMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.context.event.EventListener;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
+import org.springframework.stereotype.Component;
+
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import java.time.Duration;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ScheduledFuture;
+
+/**
+ * 中间表采集调度器（通用，配置驱动）。
+ * <p>基于 {@link ThreadPoolTaskScheduler} 为每个运行中的采集配置维护一个可重排的定时任务，
+ * 支持秒级间隔、运行时改间隔、启动/停止。每次触发调用 {@link GenericMcsSyncEngine} 执行采集。</p>
+ *
+ * @author GHT
+ * @date 2026-06-17 for：【MES上辅机】采集配置-表与字段绑定
+ */
+@Slf4j
+@Component
+public class McsSyncScheduler {
+
+    private static final String LOG_TAG = "[MCS采集]";
+
+    @Autowired
+    private MesXslMcsSyncConfigMapper syncConfigMapper;
+
+    @Autowired
+    private MesXslMcsSyncFieldMapper syncFieldMapper;
+
+    @Autowired
+    private McsDataSourceManager mcsDataSourceManager;
+
+    @Autowired
+    private GenericMcsSyncEngine syncEngine;
+
+    /** 运行中的定时任务，configId -> future */
+    private final Map<String, ScheduledFuture<?>> runningTasks = new ConcurrentHashMap<>();
+
+    private ThreadPoolTaskScheduler taskScheduler;
+
+    @PostConstruct
+    public void init() {
+        taskScheduler = new ThreadPoolTaskScheduler();
+        taskScheduler.setPoolSize(4);
+        taskScheduler.setThreadNamePrefix("mcs-sync-");
+        taskScheduler.setWaitForTasksToCompleteOnShutdown(true);
+        taskScheduler.setAwaitTerminationSeconds(10);
+        taskScheduler.initialize();
+        log.info("{} 采集调度器初始化完成", LOG_TAG);
+    }
+
+    @PreDestroy
+    public void destroy() {
+        runningTasks.values().forEach(f -> f.cancel(false));
+        runningTasks.clear();
+        if (taskScheduler != null) {
+            taskScheduler.shutdown();
+        }
+    }
+
+    /**
+     * 应用启动后，加载所有 status=1 的采集配置并启动定时任务
+     */
+    @EventListener(ApplicationReadyEvent.class)
+    public void loadOnStartup() {
+        try {
+            List<MesXslMcsSyncConfig> configs = syncConfigMapper.selectList(
+                    new LambdaQueryWrapper<MesXslMcsSyncConfig>()
+                            .eq(MesXslMcsSyncConfig::getDelFlag, 0)
+                            .eq(MesXslMcsSyncConfig::getStatus, "1"));
+            configs.forEach(this::scheduleTask);
+            log.info("{} 启动加载采集任务完成，已启动={}", LOG_TAG, configs.size());
+        } catch (Exception e) {
+            log.error("{} 启动加载采集任务失败: {}", LOG_TAG, e.getMessage(), e);
+        }
+    }
+
+    public boolean isRunning(String configId) {
+        ScheduledFuture<?> f = runningTasks.get(configId);
+        return f != null && !f.isCancelled();
+    }
+
+    /**
+     * （重新）按配置的间隔调度采集任务。已存在则先取消再重排，实现运行时改间隔。
+     */
+    public synchronized void scheduleTask(MesXslMcsSyncConfig config) {
+        if (config == null || config.getId() == null) {
+            return;
+        }
+        cancelTask(config.getId());
+        long seconds = config.getIntervalSeconds() != null && config.getIntervalSeconds() > 0
+                ? config.getIntervalSeconds() : 1L;
+        String configId = config.getId();
+        ScheduledFuture<?> future = taskScheduler.scheduleWithFixedDelay(
+                () -> runOnce(configId), Duration.ofSeconds(seconds));
+        runningTasks.put(configId, future);
+        log.info("{} 采集任务已启动 configId={} 间隔={}s", LOG_TAG, configId, seconds);
+    }
+
+    /**
+     * 取消采集任务（仅停内存定时，不改库）
+     */
+    public synchronized void cancelTask(String configId) {
+        ScheduledFuture<?> old = runningTasks.remove(configId);
+        if (old != null) {
+            old.cancel(false);
+            log.info("{} 采集任务已停止 configId={}", LOG_TAG, configId);
+        }
+    }
+
+    /**
+     * 单次采集执行：连接/读取开关守卫 + 调用通用引擎 + 落库结果
+     */
+    private void runOnce(String configId) {
+        MesXslMcsSyncConfig cfg = syncConfigMapper.selectById(configId);
+        if (cfg == null || cfg.getDelFlag() != null && cfg.getDelFlag() == 1 || !"1".equals(cfg.getStatus())) {
+            return;
+        }
+        // 中间库未启用或读取开关关闭时安静跳过
+        if (!mcsDataSourceManager.isDbConfigActive() || !mcsDataSourceManager.isReadEnabled()) {
+            log.debug("{} 中间库未就绪或读取关闭，跳过 configId={}", LOG_TAG, configId);
+            return;
+        }
+        try {
+            List<MesXslMcsSyncField> fields = syncFieldMapper.selectList(
+                    new LambdaQueryWrapper<MesXslMcsSyncField>()
+                            .eq(MesXslMcsSyncField::getConfigId, configId)
+                            .eq(MesXslMcsSyncField::getDelFlag, 0)
+                            .orderByAsc(MesXslMcsSyncField::getSortNo));
+            String result = syncEngine.sync(cfg, fields);
+            // INCR 改为标记位回写后不再维护高水位，仅落库采集结果
+            updateSyncResult(configId, result, null);
+        } catch (Exception e) {
+            log.error("{} 采集异常 configId={}: {}", LOG_TAG, configId, e.getMessage(), e);
+            updateSyncResult(configId, "采集失败：" + e.getMessage(), null);
+        }
+    }
+
+    private void updateSyncResult(String id, String result, String watermark) {
+        MesXslMcsSyncConfig update = new MesXslMcsSyncConfig();
+        update.setId(id);
+        update.setLastSyncTime(new Date());
+        update.setLastSyncResult(result != null && result.length() > 480 ? result.substring(0, 480) : result);
+        update.setLastWatermark(watermark);
+        syncConfigMapper.updateById(update);
+    }
+}

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslAutoSmallMaterialPlanMaintainService.java

@@ -0,0 +1,10 @@
+package org.jeecg.modules.xslmes.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+import org.jeecg.modules.xslmes.entity.MesXslAutoSmallMaterialPlanMaintain;
+
+public interface IMesXslAutoSmallMaterialPlanMaintainService
+    extends IService<MesXslAutoSmallMaterialPlanMaintain> {
+  void saveAllRows(List<MesXslAutoSmallMaterialPlanMaintain> rows);
+}

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslManualSmallMaterialPlanMaintainService.java

@@ -0,0 +1,10 @@
+package org.jeecg.modules.xslmes.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+import org.jeecg.modules.xslmes.entity.MesXslManualSmallMaterialPlanMaintain;
+
+public interface IMesXslManualSmallMaterialPlanMaintainService
+    extends IService<MesXslManualSmallMaterialPlanMaintain> {
+  void saveAllRows(List<MesXslManualSmallMaterialPlanMaintain> rows);
+}

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslMixerActionService.java

@@ -5,9 +5,9 @@ import org.jeecg.modules.xslmes.entity.MesXslMixerAction;
 
 public interface IMesXslMixerActionService extends IService<MesXslMixerAction> {
 
-  boolean isActionNameDuplicated(String actionName, String excludeId);
+  boolean isActionNameDuplicated(String equipmentId, String actionName, String excludeId);
 
-  boolean isActionCodeDuplicated(String actionCode, String excludeId);
+  boolean isActionCodeDuplicated(String equipmentId, String actionCode, String excludeId);
 
   void fillEquipmentName(MesXslMixerAction model);
 }

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslRubberQuickTestRecordService.java

@@ -6,6 +6,7 @@ import java.util.Collection;
 import java.util.List;
 import org.jeecg.modules.xslmes.entity.MesXslRubberQuickTestRecord;
 import org.jeecg.modules.xslmes.entity.MesXslRubberQuickTestRecordLine;
+import org.jeecg.modules.xslmes.entity.MesXslRubberQuickTestRecordRawLine;
 import org.jeecg.modules.xslmes.vo.MesXslRubberQuickTestRecordBatchFromMaterialVO;
 
 public interface IMesXslRubberQuickTestRecordService extends IService<MesXslRubberQuickTestRecord> {
@@ -20,7 +21,17 @@ public interface IMesXslRubberQuickTestRecordService extends IService<MesXslRubb
 
     List<MesXslRubberQuickTestRecordLine> selectLinesByRecordId(String recordId);
 
+    List<MesXslRubberQuickTestRecordRawLine> selectRawLinesByRecordId(String recordId);
+
     String generateRecordNo(MesXslRubberQuickTestRecord context);
 
+    //update-begin---author:jiangxh ---date:20260618  for：【快检记录】桌面端快检记录号生成-----------
+    /** 桌面端快检记录号：yyyyMMdd + 4位流水 + 胶料名称，如 202606180001SA889 */
+    String generateDesktopRecordNo(MesXslRubberQuickTestRecord context);
+
+    /** 桌面端保存前：按实验标准关联实验方法回填检验类型 */
+    void fillQuickTestTypeForRecord(MesXslRubberQuickTestRecord record);
+    //update-end---author:jiangxh ---date:20260618  for：【快检记录】桌面端快检记录号生成-----------
+
     List<String> batchFromMaterial(MesXslRubberQuickTestRecordBatchFromMaterialVO vo);
 }

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/MesXslStompNotifyService.java

@@ -83,6 +83,30 @@ public class MesXslStompNotifyService {
     }
     //update-end---author:cursor ---date:20250602  for：【密炼物料皮重策略】桌面端同步-----------
 
+    //update-begin---author:jiangxh ---date:2026-06-17 for：【快检记录】桌面端胶料快检记录同步-----------
+    /** 广播胶料快检记录变更事件到 /topic/sync/mes-rubber-quick-test-records */
+    public void publishRubberQuickTestRecordChanged(String action, String recordId) {
+        publish("/topic/sync/mes-rubber-quick-test-records", "MES_RUBBER_QUICK_TEST_RECORD_CHANGED",
+                "recordId", recordId, action);
+    }
+    //update-end---author:jiangxh ---date:20260525  for：【MES】原材料检验标准密炼PS批准时关联实验标准置已批准-----------
+
+    //update-begin---author:jiangxh ---date:20260617  for：【快检实验标准】桌面端只读同步 STOMP-----------
+    /** 广播胶料快检实验标准变更事件到 /topic/sync/mes-rubber-quick-test-stds */
+    public void publishRubberQuickTestStdChanged(String action, String stdId) {
+        publish("/topic/sync/mes-rubber-quick-test-stds", "MES_RUBBER_QUICK_TEST_STD_CHANGED",
+                "stdId", stdId, action);
+    }
+    //update-end---author:jiangxh ---date:20260617  for：【快检实验标准】桌面端只读同步 STOMP-----------
+
+    //update-begin---author:jiangxh ---date:20260617  for：【密炼计划】桌面端只读同步 STOMP-----------
+    /** 广播密炼生产计划变更事件到 /topic/sync/mes-mixing-production-plans */
+    public void publishMixingProductionPlanChanged(String action, String mixingProductionPlanId) {
+        publish("/topic/sync/mes-mixing-production-plans", "MIXING_PRODUCTION_PLAN_CHANGED",
+                "mixingProductionPlanId", mixingProductionPlanId, action);
+    }
+    //update-end---author:jiangxh ---date:20260617  for：【密炼计划】桌面端只读同步 STOMP-----------
+
     // ─────────────────────────── 私有辅助 ────────────────────────────
 
     private void publish(String topic, String cmd, String idKey, String idValue, String action) {

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslAutoSmallMaterialPlanMaintainServiceImpl.java

@@ -0,0 +1,66 @@
+package org.jeecg.modules.xslmes.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import org.apache.commons.lang3.StringUtils;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.modules.xslmes.entity.MesXslAutoSmallMaterialPlanMaintain;
+import org.jeecg.modules.xslmes.mapper.MesXslAutoSmallMaterialPlanMaintainMapper;
+import org.jeecg.modules.xslmes.service.IMesXslAutoSmallMaterialPlanMaintainService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+@Service
+public class MesXslAutoSmallMaterialPlanMaintainServiceImpl
+    extends ServiceImpl<MesXslAutoSmallMaterialPlanMaintainMapper, MesXslAutoSmallMaterialPlanMaintain>
+    implements IMesXslAutoSmallMaterialPlanMaintainService {
+
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public void saveAllRows(List<MesXslAutoSmallMaterialPlanMaintain> rows) {
+    this.remove(new LambdaQueryWrapper<>());
+    if (CollectionUtils.isEmpty(rows)) {
+      return;
+    }
+    List<MesXslAutoSmallMaterialPlanMaintain> saveList = new ArrayList<>();
+    int sort = 1;
+    Date now = new Date();
+    for (MesXslAutoSmallMaterialPlanMaintain row : rows) {
+      if (row == null || !hasBusinessData(row)) {
+        continue;
+      }
+      row.setId(null);
+      row.setSortNo(sort++);
+      row.setFormulaName(StringUtils.trimToNull(row.getFormulaName()));
+      row.setMorningRemark(StringUtils.trimToNull(row.getMorningRemark()));
+      row.setNoonRemark(StringUtils.trimToNull(row.getNoonRemark()));
+      row.setNightRemark(StringUtils.trimToNull(row.getNightRemark()));
+      row.setCreateTime(now);
+      row.setUpdateTime(now);
+      if (row.getDelFlag() == null) {
+        row.setDelFlag(CommonConstant.DEL_FLAG_0);
+      }
+      saveList.add(row);
+    }
+    if (!saveList.isEmpty()) {
+      this.saveBatch(saveList, 200);
+    }
+  }
+
+  private boolean hasBusinessData(MesXslAutoSmallMaterialPlanMaintain row) {
+    return StringUtils.isNotBlank(row.getFormulaName())
+        || row.getMorningSeqNo() != null
+        || row.getMorningPlanCount() != null
+        || StringUtils.isNotBlank(row.getMorningRemark())
+        || row.getNoonSeqNo() != null
+        || row.getNoonPlanCount() != null
+        || StringUtils.isNotBlank(row.getNoonRemark())
+        || row.getNightSeqNo() != null
+        || row.getNightPlanCount() != null
+        || StringUtils.isNotBlank(row.getNightRemark());
+  }
+}

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslFinalBatchPlanServiceImpl.java

@@ -13,8 +13,12 @@ import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.modules.mes.material.entity.MesMaterial;
 import org.jeecg.modules.mes.material.mapper.MesMaterialMapper;
 import org.jeecg.modules.xslmes.entity.MesXslFinalBatchPlan;
+import org.jeecg.modules.xslmes.entity.MesXslMixingSpec;
+import org.jeecg.modules.xslmes.entity.MesXslMixingSpecMaterial;
 import org.jeecg.modules.xslmes.entity.MesXslProductionOrder;
 import org.jeecg.modules.xslmes.mapper.MesXslFinalBatchPlanMapper;
+import org.jeecg.modules.xslmes.mapper.MesXslMixingSpecMapper;
+import org.jeecg.modules.xslmes.mapper.MesXslMixingSpecMaterialMapper;
 import org.jeecg.modules.xslmes.service.IMesXslFinalBatchPlanService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -25,6 +29,8 @@ public class MesXslFinalBatchPlanServiceImpl
     implements IMesXslFinalBatchPlanService {
 
   @Autowired private MesMaterialMapper mesMaterialMapper;
+  @Autowired private MesXslMixingSpecMapper mesXslMixingSpecMapper;
+  @Autowired private MesXslMixingSpecMaterialMapper mesXslMixingSpecMaterialMapper;
 
   @Override
   public MesXslFinalBatchPlan generateFromProductionOrder(MesXslProductionOrder productionOrder) {
@@ -43,7 +49,11 @@ public class MesXslFinalBatchPlanServiceImpl
     }
 
     BigDecimal planWeight = productionOrder.getPlanQty() == null ? BigDecimal.ZERO : productionOrder.getPlanQty();
-    BigDecimal perCarWeight = BigDecimal.ZERO;
+    BigDecimal perCarWeight = resolvePerCarWeightFromMixingSpec(finalMaterial.getMaterialCode());
+    if (perCarWeight.compareTo(BigDecimal.ZERO) <= 0) {
+      throw new JeecgBootException(
+          "对应混炼示方未配置有效合计重量，无法计算每车重量（物料：" + finalMaterial.getMaterialCode() + "）");
+    }
     int planCarCount = calcPlanCarCount(planWeight, perCarWeight);
 
     MesXslFinalBatchPlan plan = new MesXslFinalBatchPlan();
@@ -136,4 +146,38 @@ public class MesXslFinalBatchPlanServiceImpl
     }
     return planWeight.divide(perCarWeight, 0, RoundingMode.CEILING).intValue();
   }
+
+  private BigDecimal resolvePerCarWeightFromMixingSpec(String materialCode) {
+    String specName = buildMixingSpecName(materialCode);
+    MesXslMixingSpec spec =
+        mesXslMixingSpecMapper.selectOne(
+            new LambdaQueryWrapper<MesXslMixingSpec>()
+                .eq(MesXslMixingSpec::getSpecName, specName)
+                .and(w -> w.eq(MesXslMixingSpec::getDelFlag, 0).or().isNull(MesXslMixingSpec::getDelFlag))
+                .orderByDesc(MesXslMixingSpec::getCreateTime)
+                .orderByDesc(MesXslMixingSpec::getId)
+                .last("LIMIT 1"));
+    if (spec == null || StringUtils.isBlank(spec.getId())) {
+      return BigDecimal.ZERO;
+    }
+    List<MesXslMixingSpecMaterial> materials =
+        mesXslMixingSpecMaterialMapper.selectList(
+            new LambdaQueryWrapper<MesXslMixingSpecMaterial>()
+                .eq(MesXslMixingSpecMaterial::getMixingSpecId, spec.getId()));
+    BigDecimal total = BigDecimal.ZERO;
+    for (MesXslMixingSpecMaterial item : materials) {
+      if (item != null && item.getUnitWeight() != null) {
+        total = total.add(item.getUnitWeight());
+      }
+    }
+    return total;
+  }
+
+  private String buildMixingSpecName(String materialCode) {
+    String code = StringUtils.trimToEmpty(materialCode).toUpperCase();
+    if (code.matches(".*SA\\d{2}$")) {
+      return code;
+    }
+    return code + "SA01";
+  }
 }

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslManualSmallMaterialPlanMaintainServiceImpl.java

@@ -0,0 +1,67 @@
+package org.jeecg.modules.xslmes.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import org.apache.commons.lang3.StringUtils;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.modules.xslmes.entity.MesXslManualSmallMaterialPlanMaintain;
+import org.jeecg.modules.xslmes.mapper.MesXslManualSmallMaterialPlanMaintainMapper;
+import org.jeecg.modules.xslmes.service.IMesXslManualSmallMaterialPlanMaintainService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+@Service
+public class MesXslManualSmallMaterialPlanMaintainServiceImpl
+    extends ServiceImpl<
+        MesXslManualSmallMaterialPlanMaintainMapper, MesXslManualSmallMaterialPlanMaintain>
+    implements IMesXslManualSmallMaterialPlanMaintainService {
+
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public void saveAllRows(List<MesXslManualSmallMaterialPlanMaintain> rows) {
+    this.remove(new LambdaQueryWrapper<>());
+    if (CollectionUtils.isEmpty(rows)) {
+      return;
+    }
+    List<MesXslManualSmallMaterialPlanMaintain> saveList = new ArrayList<>();
+    int sort = 1;
+    Date now = new Date();
+    for (MesXslManualSmallMaterialPlanMaintain row : rows) {
+      if (row == null || !hasBusinessData(row)) {
+        continue;
+      }
+      row.setId(null);
+      row.setSortNo(sort++);
+      row.setFormulaName(StringUtils.trimToNull(row.getFormulaName()));
+      row.setMorningRemark(StringUtils.trimToNull(row.getMorningRemark()));
+      row.setNoonRemark(StringUtils.trimToNull(row.getNoonRemark()));
+      row.setNightRemark(StringUtils.trimToNull(row.getNightRemark()));
+      row.setCreateTime(now);
+      row.setUpdateTime(now);
+      if (row.getDelFlag() == null) {
+        row.setDelFlag(CommonConstant.DEL_FLAG_0);
+      }
+      saveList.add(row);
+    }
+    if (!saveList.isEmpty()) {
+      this.saveBatch(saveList, 200);
+    }
+  }
+
+  private boolean hasBusinessData(MesXslManualSmallMaterialPlanMaintain row) {
+    return StringUtils.isNotBlank(row.getFormulaName())
+        || row.getMorningSeqNo() != null
+        || row.getMorningPlanCount() != null
+        || StringUtils.isNotBlank(row.getMorningRemark())
+        || row.getNoonSeqNo() != null
+        || row.getNoonPlanCount() != null
+        || StringUtils.isNotBlank(row.getNoonRemark())
+        || row.getNightSeqNo() != null
+        || row.getNightPlanCount() != null
+        || StringUtils.isNotBlank(row.getNightRemark());
+  }
+}

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslMasterBatchPlanServiceImpl.java

@@ -13,8 +13,12 @@ import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.modules.mes.material.entity.MesMaterial;
 import org.jeecg.modules.mes.material.mapper.MesMaterialMapper;
 import org.jeecg.modules.xslmes.entity.MesXslMasterBatchPlan;
+import org.jeecg.modules.xslmes.entity.MesXslMixingSpec;
+import org.jeecg.modules.xslmes.entity.MesXslMixingSpecMaterial;
 import org.jeecg.modules.xslmes.entity.MesXslProductionOrder;
 import org.jeecg.modules.xslmes.mapper.MesXslMasterBatchPlanMapper;
+import org.jeecg.modules.xslmes.mapper.MesXslMixingSpecMapper;
+import org.jeecg.modules.xslmes.mapper.MesXslMixingSpecMaterialMapper;
 import org.jeecg.modules.xslmes.service.IMesXslMasterBatchPlanService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -25,6 +29,8 @@ public class MesXslMasterBatchPlanServiceImpl
     implements IMesXslMasterBatchPlanService {
 
   @Autowired private MesMaterialMapper mesMaterialMapper;
+  @Autowired private MesXslMixingSpecMapper mesXslMixingSpecMapper;
+  @Autowired private MesXslMixingSpecMaterialMapper mesXslMixingSpecMaterialMapper;
 
   @Override
   public List<MesXslMasterBatchPlan> generateBatchFromProductionOrder(MesXslProductionOrder productionOrder) {
@@ -70,7 +76,11 @@ public class MesXslMasterBatchPlanServiceImpl
   private MesXslMasterBatchPlan buildMotherPlan(
       MesXslProductionOrder productionOrder, MesMaterial motherMaterial, int stageIndex) {
     BigDecimal planWeight = productionOrder.getPlanQty() == null ? BigDecimal.ZERO : productionOrder.getPlanQty();
-    BigDecimal perCarWeight = BigDecimal.ZERO;
+    BigDecimal perCarWeight = resolvePerCarWeightFromMixingSpec(motherMaterial.getMaterialCode());
+    if (perCarWeight.compareTo(BigDecimal.ZERO) <= 0) {
+      throw new JeecgBootException(
+          "对应混炼示方未配置有效合计重量，无法计算每车重量（物料：" + motherMaterial.getMaterialCode() + "）");
+    }
     int planCarCount = calcPlanCarCount(planWeight, perCarWeight);
 
     MesXslMasterBatchPlan plan = new MesXslMasterBatchPlan();
@@ -182,4 +192,38 @@ public class MesXslMasterBatchPlanServiceImpl
     }
     return planWeight.divide(perCarWeight, 0, RoundingMode.CEILING).intValue();
   }
+
+  private BigDecimal resolvePerCarWeightFromMixingSpec(String materialCode) {
+    String specName = buildMixingSpecName(materialCode);
+    MesXslMixingSpec spec =
+        mesXslMixingSpecMapper.selectOne(
+            new LambdaQueryWrapper<MesXslMixingSpec>()
+                .eq(MesXslMixingSpec::getSpecName, specName)
+                .and(w -> w.eq(MesXslMixingSpec::getDelFlag, 0).or().isNull(MesXslMixingSpec::getDelFlag))
+                .orderByDesc(MesXslMixingSpec::getCreateTime)
+                .orderByDesc(MesXslMixingSpec::getId)
+                .last("LIMIT 1"));
+    if (spec == null || StringUtils.isBlank(spec.getId())) {
+      return BigDecimal.ZERO;
+    }
+    List<MesXslMixingSpecMaterial> materials =
+        mesXslMixingSpecMaterialMapper.selectList(
+            new LambdaQueryWrapper<MesXslMixingSpecMaterial>()
+                .eq(MesXslMixingSpecMaterial::getMixingSpecId, spec.getId()));
+    BigDecimal total = BigDecimal.ZERO;
+    for (MesXslMixingSpecMaterial item : materials) {
+      if (item != null && item.getUnitWeight() != null) {
+        total = total.add(item.getUnitWeight());
+      }
+    }
+    return total;
+  }
+
+  private String buildMixingSpecName(String materialCode) {
+    String code = StringUtils.trimToEmpty(materialCode).toUpperCase();
+    if (code.matches(".*SA\\d{2}$")) {
+      return code;
+    }
+    return code + "SA01";
+  }
 }

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslMixerActionServiceImpl.java

@@ -17,13 +17,16 @@ public class MesXslMixerActionServiceImpl extends ServiceImpl<MesXslMixerActionM
 
   @Autowired private MesXslEquipmentLedgerMapper equipmentLedgerMapper;
 
+  //update-begin---author:GHT ---date:20260617 for：【MES上辅机】密炼动作秒级采集-唯一性改为(设备+动作代号)同设备内唯一-----------
   @Override
-  public boolean isActionNameDuplicated(String actionName, String excludeId) {
-    if (StringUtils.isBlank(actionName)) {
+  public boolean isActionNameDuplicated(String equipmentId, String actionName, String excludeId) {
+    if (StringUtils.isBlank(actionName) || StringUtils.isBlank(equipmentId)) {
       return false;
     }
     LambdaQueryWrapper<MesXslMixerAction> wrapper =
-        new LambdaQueryWrapper<MesXslMixerAction>().eq(MesXslMixerAction::getActionName, actionName.trim());
+        new LambdaQueryWrapper<MesXslMixerAction>()
+            .eq(MesXslMixerAction::getEquipmentId, equipmentId.trim())
+            .eq(MesXslMixerAction::getActionName, actionName.trim());
     if (StringUtils.isNotBlank(excludeId)) {
       wrapper.ne(MesXslMixerAction::getId, excludeId.trim());
     }
@@ -31,17 +34,20 @@ public class MesXslMixerActionServiceImpl extends ServiceImpl<MesXslMixerActionM
   }
 
   @Override
-  public boolean isActionCodeDuplicated(String actionCode, String excludeId) {
-    if (StringUtils.isBlank(actionCode)) {
+  public boolean isActionCodeDuplicated(String equipmentId, String actionCode, String excludeId) {
+    if (StringUtils.isBlank(actionCode) || StringUtils.isBlank(equipmentId)) {
       return false;
     }
     LambdaQueryWrapper<MesXslMixerAction> wrapper =
-        new LambdaQueryWrapper<MesXslMixerAction>().eq(MesXslMixerAction::getActionCode, actionCode.trim());
+        new LambdaQueryWrapper<MesXslMixerAction>()
+            .eq(MesXslMixerAction::getEquipmentId, equipmentId.trim())
+            .eq(MesXslMixerAction::getActionCode, actionCode.trim());
     if (StringUtils.isNotBlank(excludeId)) {
       wrapper.ne(MesXslMixerAction::getId, excludeId.trim());
     }
     return this.count(wrapper) > 0;
   }
+  //update-end---author:GHT ---date:20260617 for：【MES上辅机】密炼动作秒级采集-唯一性改为(设备+动作代号)同设备内唯一-----------
 
   @Override
   public void fillEquipmentName(MesXslMixerAction model) {

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslMixingProductionPlanServiceImpl.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -15,6 +17,8 @@ import java.util.Objects;
 import java.util.stream.Collectors;
 import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.modules.mes.material.entity.MesMaterial;
+import org.jeecg.modules.mes.material.mapper.MesMaterialMapper;
 import org.jeecg.modules.xslmes.entity.MesXslEquipmentLedger;
 import org.jeecg.modules.xslmes.entity.MesXslFinalBatchPlan;
 import org.jeecg.modules.xslmes.entity.MesXslMasterBatchPlan;
@@ -35,21 +39,25 @@ import org.springframework.util.CollectionUtils;
 public class MesXslMixingProductionPlanServiceImpl
     extends ServiceImpl<MesXslMixingProductionPlanMapper, MesXslMixingProductionPlan>
     implements IMesXslMixingProductionPlanService {
+  private static final DateTimeFormatter PLAN_NO_DATE_FMT = DateTimeFormatter.BASIC_ISO_DATE;
 
   private final MesXslEquipmentLedgerMapper equipmentLedgerMapper;
   private final MesXslMasterBatchPlanMapper masterBatchPlanMapper;
   private final MesXslFinalBatchPlanMapper finalBatchPlanMapper;
   private final MesXslMixingSpecMapper mixingSpecMapper;
+  private final MesMaterialMapper mesMaterialMapper;
 
   public MesXslMixingProductionPlanServiceImpl(
       MesXslEquipmentLedgerMapper equipmentLedgerMapper,
       MesXslMasterBatchPlanMapper masterBatchPlanMapper,
       MesXslFinalBatchPlanMapper finalBatchPlanMapper,
-      MesXslMixingSpecMapper mixingSpecMapper) {
+      MesXslMixingSpecMapper mixingSpecMapper,
+      MesMaterialMapper mesMaterialMapper) {
     this.equipmentLedgerMapper = equipmentLedgerMapper;
     this.masterBatchPlanMapper = masterBatchPlanMapper;
     this.finalBatchPlanMapper = finalBatchPlanMapper;
     this.mixingSpecMapper = mixingSpecMapper;
+    this.mesMaterialMapper = mesMaterialMapper;
   }
 
   @Override
@@ -60,13 +68,14 @@ public class MesXslMixingProductionPlanServiceImpl
       return;
     }
     Map<String, String> machineNameCache = new HashMap<>();
+    Map<String, Integer> dailyPlanNoCounter = new HashMap<>();
     List<MesXslMixingProductionPlan> saveList = new ArrayList<>();
     int sort = 1;
     for (MesXslMixingProductionPlan row : rows) {
       if (row == null || !hasBusinessData(row)) {
         continue;
       }
-      normalizeRow(row, machineNameCache);
+      normalizeRow(row, machineNameCache, dailyPlanNoCounter);
       row.setSortNo(sort++);
       saveList.add(row);
     }
@@ -77,25 +86,27 @@ public class MesXslMixingProductionPlanServiceImpl
 
   private boolean hasBusinessData(MesXslMixingProductionPlan row) {
     return StringUtils.isNotBlank(row.getMachineId())
-        || StringUtils.isNotBlank(row.getMorningPlanId())
-        || StringUtils.isNotBlank(row.getNoonPlanId())
-        || StringUtils.isNotBlank(row.getNightPlanId())
-        || StringUtils.isNotBlank(row.getMorningRemark())
-        || StringUtils.isNotBlank(row.getNoonRemark())
-        || StringUtils.isNotBlank(row.getNightRemark())
-        || row.getMorningPlanCount() != null
-        || row.getNoonPlanCount() != null
-        || row.getNightPlanCount() != null;
+        || StringUtils.isNotBlank(row.getPlanId())
+        || StringUtils.isNotBlank(row.getRemark())
+        || row.getPlanCount() != null;
   }
 
   private void normalizeRow(
-      MesXslMixingProductionPlan row, Map<String, String> machineNameCache) {
+      MesXslMixingProductionPlan row,
+      Map<String, String> machineNameCache,
+      Map<String, Integer> dailyPlanNoCounter) {
     row.setId(null);
     row.setMachineId(StringUtils.trimToNull(row.getMachineId()));
     row.setMachineName(resolveMachineName(row.getMachineId(), machineNameCache));
-    fillShiftFromPlan(row, "morning");
-    fillShiftFromPlan(row, "noon");
-    fillShiftFromPlan(row, "night");
+    Integer shiftFlag = row.getShiftFlag();
+    if (shiftFlag == null || shiftFlag < 1 || shiftFlag > 3) {
+      row.setShiftFlag(1);
+    }
+    row.setPlanId(StringUtils.trimToNull(row.getPlanId()));
+    row.setPlanType(StringUtils.upperCase(StringUtils.trimToNull(row.getPlanType())));
+    row.setPlanDate(new Date());
+    row.setPlanNo(generatePlanNo(row.getPlanDate(), dailyPlanNoCounter));
+    fillFromPlan(row);
     Date now = new Date();
     if (row.getCreateTime() == null) {
       row.setCreateTime(now);
@@ -106,6 +117,14 @@ public class MesXslMixingProductionPlanServiceImpl
     }
   }
 
+  private String generatePlanNo(Date planDate, Map<String, Integer> dailyPlanNoCounter) {
+    String datePart = planDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate().format(PLAN_NO_DATE_FMT);
+    Integer current = dailyPlanNoCounter.get(datePart);
+    int next = current == null ? 1 : current + 1;
+    dailyPlanNoCounter.put(datePart, next);
+    return datePart + "A" + String.format("%03d", next);
+  }
+
   private String resolveMachineName(String machineId, Map<String, String> cache) {
     if (StringUtils.isBlank(machineId)) {
       return null;
@@ -118,152 +137,118 @@ public class MesXslMixingProductionPlanServiceImpl
         });
   }
 
-  private void fillShiftFromPlan(MesXslMixingProductionPlan row, String shift) {
-    String planId = getPlanId(row, shift);
-    String planType = StringUtils.upperCase(StringUtils.trimToEmpty(getPlanType(row, shift)));
+  private void fillFromPlan(MesXslMixingProductionPlan row) {
+    String planId = row.getPlanId();
+    String planType = StringUtils.upperCase(StringUtils.trimToEmpty(row.getPlanType()));
     if (StringUtils.isBlank(planId)) {
-      clearShiftPlanFields(row, shift);
+      clearPlanFields(row);
       return;
     }
     if ("M".equals(planType)) {
       MesXslMasterBatchPlan plan = masterBatchPlanMapper.selectById(planId);
       if (plan == null) {
-        clearShiftPlanFields(row, shift);
+        clearPlanFields(row);
         return;
       }
-      setShiftFromMasterPlan(row, shift, plan);
+      setFromMasterPlan(row, plan);
       return;
     }
     MesXslFinalBatchPlan finalPlan = finalBatchPlanMapper.selectById(planId);
     if (finalPlan == null) {
-      clearShiftPlanFields(row, shift);
+      clearPlanFields(row);
       return;
     }
-    setShiftFromFinalPlan(row, shift, finalPlan);
+    setFromFinalPlan(row, finalPlan);
   }
 
-  private String getPlanId(MesXslMixingProductionPlan row, String shift) {
-    return switch (shift) {
-      case "morning" -> StringUtils.trimToNull(row.getMorningPlanId());
-      case "noon" -> StringUtils.trimToNull(row.getNoonPlanId());
-      default -> StringUtils.trimToNull(row.getNightPlanId());
-    };
-  }
-
-  private String getPlanType(MesXslMixingProductionPlan row, String shift) {
-    return switch (shift) {
-      case "morning" -> row.getMorningPlanType();
-      case "noon" -> row.getNoonPlanType();
-      default -> row.getNightPlanType();
-    };
-  }
-
-  private void setShiftFromMasterPlan(
-      MesXslMixingProductionPlan row, String shift, MesXslMasterBatchPlan plan) {
-    setShiftPlanType(row, shift, "M");
-    setShiftOrderNo(row, shift, plan.getOrderNo());
-    setShiftOrderDate(row, shift, plan.getOrderDate());
-    setShiftFormulaName(
-        row,
-        shift,
+  private void setFromMasterPlan(MesXslMixingProductionPlan row, MesXslMasterBatchPlan plan) {
+    row.setPlanType("M");
+    row.setSourceOrderId(plan.getSourceOrderId());
+    row.setMaterialId(resolveMesMaterialId(plan.getMesMaterialName(), plan.getMaterialCode()));
+    row.setMaterialName(plan.getMesMaterialName());
+    row.setOrderNo(plan.getOrderNo());
+    row.setOrderDate(plan.getOrderDate());
+    row.setFormulaName(
         resolveFormulaNameByMachineAndMaterial(
-            row.getMachineId(), row.getMachineName(), plan.getMaterialCode(), plan.getMesMaterialName()));
-    setShiftPlanWeight(row, shift, plan.getPlanWeight());
-    setShiftPlannedCarCount(row, shift, plan.getPlannedCarCount());
-    setShiftScheduledCarCount(row, shift, plan.getScheduledCarCount());
-    setShiftFinishedCarCount(row, shift, plan.getFinishedCarCount());
+            row.getMachineId(),
+            row.getMachineName(),
+            plan.getMaterialCode(),
+            plan.getMesMaterialName(),
+            true));
+    row.setPlanWeight(plan.getPlanWeight());
+    row.setPlannedCarCount(plan.getPlannedCarCount());
+    row.setScheduledCarCount(plan.getScheduledCarCount());
+    row.setFinishedCarCount(plan.getFinishedCarCount());
   }
 
-  private void setShiftFromFinalPlan(
-      MesXslMixingProductionPlan row, String shift, MesXslFinalBatchPlan plan) {
-    setShiftPlanType(row, shift, "F");
-    setShiftOrderNo(row, shift, plan.getOrderNo());
-    setShiftOrderDate(row, shift, plan.getOrderDate());
-    setShiftFormulaName(
-        row,
-        shift,
+  private void setFromFinalPlan(MesXslMixingProductionPlan row, MesXslFinalBatchPlan plan) {
+    row.setPlanType("F");
+    row.setSourceOrderId(plan.getSourceOrderId());
+    row.setMaterialId(resolveMesMaterialId(plan.getMesMaterialName(), plan.getMaterialCode()));
+    row.setMaterialName(plan.getMesMaterialName());
+    row.setOrderNo(plan.getOrderNo());
+    row.setOrderDate(plan.getOrderDate());
+    row.setFormulaName(
         resolveFormulaNameByMachineAndMaterial(
-            row.getMachineId(), row.getMachineName(), plan.getMaterialCode(), plan.getMesMaterialName()));
-    setShiftPlanWeight(row, shift, plan.getPlanWeight());
-    setShiftPlannedCarCount(row, shift, plan.getPlannedCarCount());
-    setShiftScheduledCarCount(row, shift, plan.getScheduledCarCount());
-    setShiftFinishedCarCount(row, shift, plan.getFinishedCarCount());
+            row.getMachineId(),
+            row.getMachineName(),
+            plan.getMaterialCode(),
+            plan.getMesMaterialName(),
+            true));
+    row.setPlanWeight(plan.getPlanWeight());
+    row.setPlannedCarCount(plan.getPlannedCarCount());
+    row.setScheduledCarCount(plan.getScheduledCarCount());
+    row.setFinishedCarCount(plan.getFinishedCarCount());
   }
 
-  private void clearShiftPlanFields(MesXslMixingProductionPlan row, String shift) {
-    setShiftPlanType(row, shift, null);
-    setShiftOrderNo(row, shift, null);
-    setShiftOrderDate(row, shift, null);
-    setShiftFormulaName(row, shift, null);
-    setShiftPlanWeight(row, shift, null);
-    setShiftPlannedCarCount(row, shift, null);
-    setShiftScheduledCarCount(row, shift, null);
-    setShiftFinishedCarCount(row, shift, null);
+  private void clearPlanFields(MesXslMixingProductionPlan row) {
+    row.setPlanType(null);
+    row.setSourceOrderId(null);
+    row.setMaterialId(null);
+    row.setMaterialName(null);
+    row.setOrderNo(null);
+    row.setOrderDate(null);
+    row.setFormulaName(null);
+    row.setPlanWeight(null);
+    row.setPlannedCarCount(null);
+    row.setScheduledCarCount(null);
+    row.setFinishedCarCount(null);
   }
 
-  private void setShiftPlanType(MesXslMixingProductionPlan row, String shift, String value) {
-    switch (shift) {
-      case "morning" -> row.setMorningPlanType(value);
-      case "noon" -> row.setNoonPlanType(value);
-      default -> row.setNightPlanType(value);
+  private String resolveMesMaterialId(String mesMaterialName, String materialCode) {
+    String name = StringUtils.trimToNull(mesMaterialName);
+    String code = StringUtils.trimToNull(materialCode);
+    LambdaQueryWrapper<MesMaterial> byNameWrapper =
+        new LambdaQueryWrapper<MesMaterial>()
+            .eq(name != null, MesMaterial::getMaterialName, name)
+            .and(
+                w ->
+                    w.eq(MesMaterial::getDelFlag, CommonConstant.DEL_FLAG_0)
+                        .or()
+                        .isNull(MesMaterial::getDelFlag))
+            .orderByDesc(MesMaterial::getUpdateTime)
+            .orderByDesc(MesMaterial::getCreateTime)
+            .last("LIMIT 1");
+    MesMaterial byName = mesMaterialMapper.selectOne(byNameWrapper);
+    if (byName != null) {
+      return byName.getId();
     }
-  }
-
-  private void setShiftOrderNo(MesXslMixingProductionPlan row, String shift, String value) {
-    switch (shift) {
-      case "morning" -> row.setMorningOrderNo(value);
-      case "noon" -> row.setNoonOrderNo(value);
-      default -> row.setNightOrderNo(value);
-    }
-  }
-
-  private void setShiftOrderDate(MesXslMixingProductionPlan row, String shift, Date value) {
-    switch (shift) {
-      case "morning" -> row.setMorningOrderDate(value);
-      case "noon" -> row.setNoonOrderDate(value);
-      default -> row.setNightOrderDate(value);
-    }
-  }
-
-  private void setShiftFormulaName(MesXslMixingProductionPlan row, String shift, String value) {
-    switch (shift) {
-      case "morning" -> row.setMorningFormulaName(value);
-      case "noon" -> row.setNoonFormulaName(value);
-      default -> row.setNightFormulaName(value);
-    }
-  }
-
-  private void setShiftPlanWeight(
-      MesXslMixingProductionPlan row, String shift, java.math.BigDecimal value) {
-    switch (shift) {
-      case "morning" -> row.setMorningPlanWeight(value);
-      case "noon" -> row.setNoonPlanWeight(value);
-      default -> row.setNightPlanWeight(value);
-    }
-  }
-
-  private void setShiftPlannedCarCount(MesXslMixingProductionPlan row, String shift, Integer value) {
-    switch (shift) {
-      case "morning" -> row.setMorningPlannedCarCount(value);
-      case "noon" -> row.setNoonPlannedCarCount(value);
-      default -> row.setNightPlannedCarCount(value);
-    }
-  }
-
-  private void setShiftScheduledCarCount(MesXslMixingProductionPlan row, String shift, Integer value) {
-    switch (shift) {
-      case "morning" -> row.setMorningScheduledCarCount(value);
-      case "noon" -> row.setNoonScheduledCarCount(value);
-      default -> row.setNightScheduledCarCount(value);
-    }
-  }
-
-  private void setShiftFinishedCarCount(MesXslMixingProductionPlan row, String shift, Integer value) {
-    switch (shift) {
-      case "morning" -> row.setMorningFinishedCarCount(value);
-      case "noon" -> row.setNoonFinishedCarCount(value);
-      default -> row.setNightFinishedCarCount(value);
+    if (code == null) {
+      return null;
     }
+    LambdaQueryWrapper<MesMaterial> byCodeWrapper =
+        new LambdaQueryWrapper<MesMaterial>()
+            .eq(MesMaterial::getMaterialCode, code)
+            .and(
+                w ->
+                    w.eq(MesMaterial::getDelFlag, CommonConstant.DEL_FLAG_0)
+                        .or()
+                        .isNull(MesMaterial::getDelFlag))
+            .orderByDesc(MesMaterial::getUpdateTime)
+            .orderByDesc(MesMaterial::getCreateTime)
+            .last("LIMIT 1");
+    MesMaterial byCode = mesMaterialMapper.selectOne(byCodeWrapper);
+    return byCode == null ? null : byCode.getId();
   }
 
   @Override
@@ -271,6 +256,9 @@ public class MesXslMixingProductionPlanServiceImpl
       Integer pageNo, Integer pageSize, String keyword, String machineId, String machineName) {
     String machineIdTrimmed = StringUtils.trimToNull(machineId);
     String machineNameTrimmed = StringUtils.trimToNull(machineName);
+    if (machineIdTrimmed == null && machineNameTrimmed == null) {
+      return buildEmptyPage(pageNo, pageSize);
+    }
     List<MesXslMixingProductionPlanOrderOptionVO> all = new ArrayList<>();
     LambdaQueryWrapper<MesXslMasterBatchPlan> masterWrapper =
         new LambdaQueryWrapper<MesXslMasterBatchPlan>()
@@ -297,9 +285,17 @@ public class MesXslMixingProductionPlanServiceImpl
       vo.setPlanType("M");
       vo.setOrderNo(m.getOrderNo());
       vo.setOrderDate(m.getOrderDate());
-      vo.setFormulaName(
+      String formulaName =
           resolveFormulaNameByMachineAndMaterial(
-              machineIdTrimmed, machineNameTrimmed, m.getMaterialCode(), m.getMesMaterialName()));
+              machineIdTrimmed,
+              machineNameTrimmed,
+              m.getMaterialCode(),
+              m.getMesMaterialName(),
+              true);
+      if (StringUtils.isBlank(formulaName)) {
+        continue;
+      }
+      vo.setFormulaName(formulaName);
       vo.setPlanWeight(m.getPlanWeight());
       vo.setPlannedCarCount(m.getPlannedCarCount());
       vo.setScheduledCarCount(m.getScheduledCarCount());
@@ -313,9 +309,17 @@ public class MesXslMixingProductionPlanServiceImpl
       vo.setPlanType("F");
       vo.setOrderNo(f.getOrderNo());
       vo.setOrderDate(f.getOrderDate());
-      vo.setFormulaName(
+      String formulaName =
           resolveFormulaNameByMachineAndMaterial(
-              machineIdTrimmed, machineNameTrimmed, f.getMaterialCode(), f.getMesMaterialName()));
+              machineIdTrimmed,
+              machineNameTrimmed,
+              f.getMaterialCode(),
+              f.getMesMaterialName(),
+              true);
+      if (StringUtils.isBlank(formulaName)) {
+        continue;
+      }
+      vo.setFormulaName(formulaName);
       vo.setPlanWeight(f.getPlanWeight());
       vo.setPlannedCarCount(f.getPlannedCarCount());
       vo.setScheduledCarCount(f.getScheduledCarCount());
@@ -346,7 +350,11 @@ public class MesXslMixingProductionPlanServiceImpl
   }
 
   private String resolveFormulaNameByMachineAndMaterial(
-      String machineId, String machineName, String materialCode, String fallbackName) {
+      String machineId,
+      String machineName,
+      String materialCode,
+      String fallbackName,
+      boolean requireMachineMatch) {
     String code = StringUtils.trimToEmpty(materialCode);
     if (StringUtils.isBlank(code)) {
       return StringUtils.defaultString(fallbackName);
@@ -382,9 +390,21 @@ public class MesXslMixingProductionPlanServiceImpl
     if (prefix != null && StringUtils.isNotBlank(prefix.getSpecName())) {
       return prefix.getSpecName().trim();
     }
+    if (requireMachineMatch) {
+      return null;
+    }
     return StringUtils.defaultIfBlank(fallbackName, targetSpec);
   }
 
+  private IPage<MesXslMixingProductionPlanOrderOptionVO> buildEmptyPage(Integer pageNo, Integer pageSize) {
+    long current = pageNo == null || pageNo < 1 ? 1 : pageNo;
+    long size = pageSize == null || pageSize < 1 ? 20 : pageSize;
+    Page<MesXslMixingProductionPlanOrderOptionVO> empty = new Page<>(current, size);
+    empty.setTotal(0);
+    empty.setRecords(Collections.emptyList());
+    return empty;
+  }
+
   private String buildTargetSpecName(String materialCode) {
     String code = StringUtils.trimToEmpty(materialCode).toUpperCase();
     if (code.matches(".*SA\\d{2}$")) {

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslRubberQuickTestRecordServiceImpl.java

@@ -20,11 +20,13 @@ import org.jeecg.modules.xslmes.common.XslMesBizConstants;
 import org.jeecg.modules.xslmes.entity.MesXslRubberQuickTestMethod;
 import org.jeecg.modules.xslmes.entity.MesXslRubberQuickTestRecord;
 import org.jeecg.modules.xslmes.entity.MesXslRubberQuickTestRecordLine;
+import org.jeecg.modules.xslmes.entity.MesXslRubberQuickTestRecordRawLine;
 import org.jeecg.modules.xslmes.entity.MesXslRubberQuickTestStd;
 import org.jeecg.modules.xslmes.entity.MesXslRubberQuickTestStdLine;
 import org.jeecg.modules.xslmes.entity.MesXslRubberQuickTestType;
 import org.jeecg.modules.xslmes.mapper.MesXslRubberQuickTestRecordLineMapper;
 import org.jeecg.modules.xslmes.mapper.MesXslRubberQuickTestRecordMapper;
+import org.jeecg.modules.xslmes.mapper.MesXslRubberQuickTestRecordRawLineMapper;
 import org.jeecg.modules.xslmes.service.IMesXslRubberQuickTestMethodService;
 import org.jeecg.modules.xslmes.service.IMesXslRubberQuickTestRecordService;
 import org.jeecg.modules.xslmes.service.IMesXslRubberQuickTestStdService;
@@ -45,6 +47,9 @@ public class MesXslRubberQuickTestRecordServiceImpl
     @Autowired
     private MesXslRubberQuickTestRecordLineMapper mesXslRubberQuickTestRecordLineMapper;
 
+    @Autowired
+    private MesXslRubberQuickTestRecordRawLineMapper mesXslRubberQuickTestRecordRawLineMapper;
+
     @Autowired
     private IMesXslRubberQuickTestStdService mesXslRubberQuickTestStdService;
 
@@ -65,6 +70,9 @@ public class MesXslRubberQuickTestRecordServiceImpl
         }
         this.save(main);
         insertLines(main.getId(), lineList);
+        //update-begin---author:jiangxh ---date:2026-06-17 for：【快检记录】保存试验结果原始数据明细-----------
+        insertRawLines(main.getId(), main.getRawLineList());
+        //update-end---author:jiangxh ---date:2026-06-17 for：【快检记录】保存试验结果原始数据明细-----------
     }
 
     @Override
@@ -81,6 +89,12 @@ public class MesXslRubberQuickTestRecordServiceImpl
                 new LambdaQueryWrapper<MesXslRubberQuickTestRecordLine>()
                         .eq(MesXslRubberQuickTestRecordLine::getRecordId, main.getId()));
         insertLines(main.getId(), lineList);
+        //update-begin---author:jiangxh ---date:2026-06-17 for：【快检记录】更新时同步原始数据明细-----------
+        mesXslRubberQuickTestRecordRawLineMapper.delete(
+                new LambdaQueryWrapper<MesXslRubberQuickTestRecordRawLine>()
+                        .eq(MesXslRubberQuickTestRecordRawLine::getRecordId, main.getId()));
+        insertRawLines(main.getId(), main.getRawLineList());
+        //update-end---author:jiangxh ---date:2026-06-17 for：【快检记录】更新时同步原始数据明细-----------
     }
 
     private void insertLines(String recordId, List<MesXslRubberQuickTestRecordLine> lineList) {
@@ -96,11 +110,31 @@ public class MesXslRubberQuickTestRecordServiceImpl
         }
     }
 
+    //update-begin---author:jiangxh ---date:2026-06-17 for：【快检记录】原始数据明细入库-----------
+    private void insertRawLines(String recordId, List<MesXslRubberQuickTestRecordRawLine> rawLineList) {
+        if (CollectionUtils.isEmpty(rawLineList)) {
+            return;
+        }
+        int sort = 0;
+        for (MesXslRubberQuickTestRecordRawLine line : rawLineList) {
+            if (line == null) {
+                continue;
+            }
+            line.setId(null);
+            line.setRecordId(recordId);
+            line.setSortNo(sort++);
+            mesXslRubberQuickTestRecordRawLineMapper.insert(line);
+        }
+    }
+    //update-end---author:jiangxh ---date:2026-06-17 for：【快检记录】原始数据明细入库-----------
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delMain(String id) {
         mesXslRubberQuickTestRecordLineMapper.delete(
                 new LambdaQueryWrapper<MesXslRubberQuickTestRecordLine>().eq(MesXslRubberQuickTestRecordLine::getRecordId, id));
+        mesXslRubberQuickTestRecordRawLineMapper.delete(
+                new LambdaQueryWrapper<MesXslRubberQuickTestRecordRawLine>().eq(MesXslRubberQuickTestRecordRawLine::getRecordId, id));
         this.removeById(id);
     }
 
@@ -120,6 +154,14 @@ public class MesXslRubberQuickTestRecordServiceImpl
                         .orderByAsc(MesXslRubberQuickTestRecordLine::getSortNo));
     }
 
+    @Override
+    public List<MesXslRubberQuickTestRecordRawLine> selectRawLinesByRecordId(String recordId) {
+        return mesXslRubberQuickTestRecordRawLineMapper.selectList(
+                new LambdaQueryWrapper<MesXslRubberQuickTestRecordRawLine>()
+                        .eq(MesXslRubberQuickTestRecordRawLine::getRecordId, recordId)
+                        .orderByAsc(MesXslRubberQuickTestRecordRawLine::getSortNo));
+    }
+
     //update-begin---author:jiangxh ---date:20260528  for：【MES】胶料快检记录单号JL+日期+4位流水自动生成-----------
     @Override
     public String generateRecordNo(MesXslRubberQuickTestRecord context) {
@@ -174,6 +216,66 @@ public class MesXslRubberQuickTestRecordServiceImpl
     }
     //update-end---author:jiangxh ---date:20260528  for：【MES】胶料快检记录单号JL+日期+4位流水自动生成-----------
 
+    //update-begin---author:jiangxh ---date:20260618  for：【快检记录】桌面端快检记录号 yyyyMMdd+流水+胶料号-----------
+    @Override
+    public String generateDesktopRecordNo(MesXslRubberQuickTestRecord context) {
+        String dateStr = new SimpleDateFormat("yyyyMMdd").format(new Date());
+        if (context == null || oConvertUtils.isEmpty(context.getRubberMaterialName())) {
+            throw new JeecgBootException("胶料名称不能为空，无法生成快检记录号");
+        }
+        String material = context.getRubberMaterialName().trim();
+        int expectedLen = dateStr.length() + 4 + material.length();
+        Integer tenantId = resolveTenantId(context);
+
+        LambdaQueryWrapper<MesXslRubberQuickTestRecord> qw = new LambdaQueryWrapper<>();
+        qw.likeRight(MesXslRubberQuickTestRecord::getRecordNo, dateStr);
+        qw.and(q -> q.eq(MesXslRubberQuickTestRecord::getDelFlag, CommonConstant.DEL_FLAG_0).or().isNull(MesXslRubberQuickTestRecord::getDelFlag));
+        if (tenantId != null) {
+            qw.eq(MesXslRubberQuickTestRecord::getTenantId, tenantId);
+        }
+        qw.select(MesXslRubberQuickTestRecord::getRecordNo);
+
+        int maxSeq = 0;
+        for (MesXslRubberQuickTestRecord row : this.list(qw)) {
+            String no = row.getRecordNo();
+            if (oConvertUtils.isEmpty(no) || no.length() != expectedLen) {
+                continue;
+            }
+            if (!no.startsWith(dateStr) || !no.endsWith(material)) {
+                continue;
+            }
+            String seqPart = no.substring(dateStr.length(), dateStr.length() + 4);
+            try {
+                maxSeq = Math.max(maxSeq, Integer.parseInt(seqPart));
+            } catch (NumberFormatException ignored) {
+                // ignore malformed historical numbers
+            }
+        }
+        return dateStr + String.format("%04d", maxSeq + 1) + material;
+    }
+
+    @Override
+    public void fillQuickTestTypeForRecord(MesXslRubberQuickTestRecord record) {
+        if (record == null || oConvertUtils.isNotEmpty(record.getQuickTestTypeId())) {
+            return;
+        }
+        String testMethodId = null;
+        if (oConvertUtils.isNotEmpty(record.getStdId())) {
+            MesXslRubberQuickTestStd std = mesXslRubberQuickTestStdService.getById(record.getStdId());
+            if (std != null) {
+                testMethodId = std.getTestMethodId();
+            }
+        }
+        if (oConvertUtils.isEmpty(testMethodId)) {
+            return;
+        }
+        MesXslRubberQuickTestMethod method = mesXslRubberQuickTestMethodService.getById(testMethodId);
+        if (method != null && oConvertUtils.isNotEmpty(method.getQuickTestTypeId())) {
+            fillQuickTestType(record, method.getQuickTestTypeId());
+        }
+    }
+    //update-end---author:jiangxh ---date:20260618  for：【快检记录】桌面端快检记录号 yyyyMMdd+流水+胶料号-----------
+
     //update-begin---author:jiangxh ---date:20260525  for：【MES】胶料信息多选按实验标准批量生成快检记录-----------
     @Override
     @Transactional(rollbackFor = Exception.class)

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslRubberQuickTestStdServiceImpl.java

@@ -87,6 +87,11 @@ public class MesXslRubberQuickTestStdServiceImpl
         if (oConvertUtils.isEmpty(main.getAuditStatus())) {
             main.setAuditStatus("0");
         }
+        //update-begin---author:jiangxh ---date:20260617  for：【快检实验标准】新增时补齐 tenant_id-----------
+        if (main.getTenantId() == null) {
+            main.setTenantId(MesXslTenantUtils.resolveTenantId(null));
+        }
+        //update-end---author:jiangxh ---date:20260617  for：【快检实验标准】新增时补齐 tenant_id-----------
     }
 
     private void insertLines(String stdId, List<MesXslRubberQuickTestStdLine> lineList) {

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/vo/MesXslAutoSmallMaterialPlanMaintainSaveAllVO.java

@@ -0,0 +1,10 @@
+package org.jeecg.modules.xslmes.vo;
+
+import java.util.List;
+import lombok.Data;
+import org.jeecg.modules.xslmes.entity.MesXslAutoSmallMaterialPlanMaintain;
+
+@Data
+public class MesXslAutoSmallMaterialPlanMaintainSaveAllVO {
+  private List<MesXslAutoSmallMaterialPlanMaintain> rows;
+}

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/vo/MesXslManualSmallMaterialPlanMaintainSaveAllVO.java

@@ -0,0 +1,10 @@
+package org.jeecg.modules.xslmes.vo;
+
+import java.util.List;
+import lombok.Data;
+import org.jeecg.modules.xslmes.entity.MesXslManualSmallMaterialPlanMaintain;
+
+@Data
+public class MesXslManualSmallMaterialPlanMaintainSaveAllVO {
+  private List<MesXslManualSmallMaterialPlanMaintain> rows;
+}

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mes/material/controller/MesMaterialController.java

@@ -34,11 +34,22 @@ public class MesMaterialController extends JeecgController<MesMaterial, IMesMate
       @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
       @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
       @RequestParam(name = "onlySales", required = false) Integer onlySales,
+      @RequestParam(name = "excludeProductionFB1", required = false) Integer excludeProductionFB1,
       HttpServletRequest req) {
     QueryWrapper<MesMaterial> queryWrapper = QueryGenerator.initQueryWrapper(model, req.getParameterMap());
     if (onlySales != null && onlySales == 1) {
       queryWrapper.and(w -> w.isNull("material_phase").or().eq("material_phase", ""));
     }
+    if (excludeProductionFB1 != null && excludeProductionFB1 == 1) {
+      queryWrapper.and(
+          w ->
+              w.and(p -> p.isNull("material_phase").or().notLikeRight("material_phase", "F"))
+                  .and(p -> p.isNull("material_phase").or().notLikeRight("material_phase", "B1"))
+                  .and(c -> c.isNull("material_code").or().notLikeRight("material_code", "F"))
+                  .and(c -> c.isNull("material_code").or().notLikeRight("material_code", "B1"))
+                  .and(n -> n.isNull("material_name").or().notLikeRight("material_name", "F"))
+                  .and(n -> n.isNull("material_name").or().notLikeRight("material_name", "B1")));
+    }
     IPage<MesMaterial> pageList = mesMaterialService.page(new Page<>(pageNo, pageSize), queryWrapper);
     return Result.OK(pageList);
   }

jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml

@@ -1,5 +1,7 @@
 server:
-  port: 8080
+  #update-begin---author:geht ---date:2026-06-16 for：生产端口与现有环境(8888)保持一致，避免前端连不上-----------
+  port: 8888
+  #update-end---author:geht ---date:2026-06-16 for：生产端口与现有环境(8888)保持一致，避免前端连不上-----------
   tomcat:
     max-swallow-size: -1
   error:
@@ -126,7 +128,8 @@ spring:
         timeBetweenEvictionRunsMillis: 60000
         # 配置一个连接在池中最小生存的时间，单位是毫秒
         minEvictableIdleTimeMillis: 300000
-        validationQuery: SELECT 1 FROM DUAL
+        # SQL Server 中间库不支持 DUAL，使用通用校验语句（MySQL/SQL Server 均兼容）
+        validationQuery: SELECT 1
         testWhileIdle: true
         testOnBorrow: false
         testOnReturn: false
@@ -146,7 +149,9 @@ spring:
         master:
           url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
-          password: root
+          #update-begin---author:geht ---date:2026-06-16 for：生产库密码与测试库一致，修正为123456-----------
+          password: 123456
+          #update-end---author:geht ---date:2026-06-16 for：生产库密码与测试库一致，修正为123456-----------
           driver-class-name: com.mysql.cj.jdbc.Driver
           # 多数据源配置
           #multi-datasource1:

jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_130__mes_xsl_mixing_spec_material_kind_views.sql

@@ -0,0 +1,33 @@
+SET NAMES utf8mb4;
+
+-- 视图1：橡胶及配合剂（自动）
+DROP VIEW IF EXISTS `vw_mes_xsl_mixing_spec_material_auto`;
+CREATE VIEW `vw_mes_xsl_mixing_spec_material_auto` AS
+SELECT
+  CONCAT(
+    COALESCE(TRIM(s.spec_name), ''),
+    '-自动-',
+    COALESCE(NULLIF(TRIM(s.machine_name), ''), '')
+  ) AS `spec_name`,
+  m.`mixer_material_name` AS `mixer_material_name`,
+  m.`unit_weight` AS `unit_weight`
+FROM `mes_xsl_mixing_spec_material` m
+INNER JOIN `mes_xsl_mixing_spec` s ON s.`id` = m.`mixing_spec_id`
+WHERE (s.`del_flag` = 0 OR s.`del_flag` IS NULL)
+  AND TRIM(COALESCE(m.`material_kind`, '')) = '自动';
+
+-- 视图2：橡胶及配合剂（人工）
+DROP VIEW IF EXISTS `vw_mes_xsl_mixing_spec_material_manual`;
+CREATE VIEW `vw_mes_xsl_mixing_spec_material_manual` AS
+SELECT
+  CONCAT(
+    COALESCE(TRIM(s.spec_name), ''),
+    '-人工-',
+    COALESCE(NULLIF(TRIM(s.machine_name), ''), '')
+  ) AS `spec_name`,
+  m.`mixer_material_name` AS `mixer_material_name`,
+  m.`unit_weight` AS `unit_weight`
+FROM `mes_xsl_mixing_spec_material` m
+INNER JOIN `mes_xsl_mixing_spec` s ON s.`id` = m.`mixing_spec_id`
+WHERE (s.`del_flag` = 0 OR s.`del_flag` IS NULL)
+  AND TRIM(COALESCE(m.`material_kind`, '')) = '人工';

jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_131__mes_xsl_small_material_demand_plan.sql

@@ -0,0 +1,45 @@
+SET NAMES utf8mb4;
+
+-- 自动小料需求计划
+CREATE TABLE IF NOT EXISTS `mes_xsl_auto_small_material_demand_plan` (
+  `id` varchar(32) NOT NULL COMMENT '主键',
+  `stat_date` date DEFAULT NULL COMMENT '统计日期',
+  `machine_id` varchar(32) DEFAULT NULL COMMENT '机台ID',
+  `machine_name` varchar(64) DEFAULT NULL COMMENT '机台名称',
+  `raw_material_name` varchar(128) NOT NULL COMMENT '原材料名称',
+  `demand_weight` decimal(18,6) DEFAULT '0.000000' COMMENT '需求重量(KG)',
+  `tenant_id` int DEFAULT NULL COMMENT '租户ID',
+  `sys_org_code` varchar(64) DEFAULT NULL COMMENT '所属部门',
+  `create_by` varchar(50) DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(50) DEFAULT NULL COMMENT '修改人',
+  `update_time` datetime DEFAULT NULL COMMENT '修改时间',
+  `del_flag` tinyint(1) DEFAULT '0' COMMENT '删除标识(0-正常,1-删除)',
+  PRIMARY KEY (`id`),
+  KEY `idx_auto_small_date` (`stat_date`),
+  KEY `idx_auto_small_machine` (`machine_name`),
+  KEY `idx_auto_small_material` (`raw_material_name`),
+  KEY `idx_auto_small_del` (`del_flag`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='自动小料需求计划';
+
+-- 人工小料需求计划
+CREATE TABLE IF NOT EXISTS `mes_xsl_manual_small_material_demand_plan` (
+  `id` varchar(32) NOT NULL COMMENT '主键',
+  `stat_date` date DEFAULT NULL COMMENT '统计日期',
+  `machine_id` varchar(32) DEFAULT NULL COMMENT '机台ID',
+  `machine_name` varchar(64) DEFAULT NULL COMMENT '机台名称',
+  `raw_material_name` varchar(128) NOT NULL COMMENT '原材料名称',
+  `demand_weight` decimal(18,6) DEFAULT '0.000000' COMMENT '需求重量(KG)',
+  `tenant_id` int DEFAULT NULL COMMENT '租户ID',
+  `sys_org_code` varchar(64) DEFAULT NULL COMMENT '所属部门',
+  `create_by` varchar(50) DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(50) DEFAULT NULL COMMENT '修改人',
+  `update_time` datetime DEFAULT NULL COMMENT '修改时间',
+  `del_flag` tinyint(1) DEFAULT '0' COMMENT '删除标识(0-正常,1-删除)',
+  PRIMARY KEY (`id`),
+  KEY `idx_manual_small_date` (`stat_date`),
+  KEY `idx_manual_small_machine` (`machine_name`),
+  KEY `idx_manual_small_material` (`raw_material_name`),
+  KEY `idx_manual_small_del` (`del_flag`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='人工小料需求计划';

jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_132__mes_xsl_small_material_plan_maintain.sql

@@ -0,0 +1,51 @@
+SET NAMES utf8mb4;
+
+-- 自动小料计划维护
+CREATE TABLE IF NOT EXISTS `mes_xsl_auto_small_material_plan_maintain` (
+  `id` varchar(32) NOT NULL COMMENT '主键',
+  `sort_no` int DEFAULT NULL COMMENT '排序号',
+  `formula_name` varchar(128) DEFAULT NULL COMMENT '配方名称',
+  `morning_seq_no` int DEFAULT NULL COMMENT '早班序号',
+  `morning_plan_count` int DEFAULT NULL COMMENT '早班计划',
+  `morning_remark` varchar(500) DEFAULT NULL COMMENT '早班备注',
+  `noon_seq_no` int DEFAULT NULL COMMENT '中班序号',
+  `noon_plan_count` int DEFAULT NULL COMMENT '中班计划',
+  `noon_remark` varchar(500) DEFAULT NULL COMMENT '中班备注',
+  `night_seq_no` int DEFAULT NULL COMMENT '夜班序号',
+  `night_plan_count` int DEFAULT NULL COMMENT '夜班计划',
+  `night_remark` varchar(500) DEFAULT NULL COMMENT '夜班备注',
+  `tenant_id` int DEFAULT NULL COMMENT '租户',
+  `sys_org_code` varchar(64) DEFAULT NULL COMMENT '部门编码',
+  `create_by` varchar(32) DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(32) DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `del_flag` int DEFAULT '0' COMMENT '删除标记（0正常1删除）',
+  PRIMARY KEY (`id`),
+  KEY `idx_auto_small_plan_sort` (`sort_no`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='自动小料计划维护';
+
+-- 人工小料计划维护
+CREATE TABLE IF NOT EXISTS `mes_xsl_manual_small_material_plan_maintain` (
+  `id` varchar(32) NOT NULL COMMENT '主键',
+  `sort_no` int DEFAULT NULL COMMENT '排序号',
+  `formula_name` varchar(128) DEFAULT NULL COMMENT '配方名称',
+  `morning_seq_no` int DEFAULT NULL COMMENT '早班序号',
+  `morning_plan_count` int DEFAULT NULL COMMENT '早班计划',
+  `morning_remark` varchar(500) DEFAULT NULL COMMENT '早班备注',
+  `noon_seq_no` int DEFAULT NULL COMMENT '中班序号',
+  `noon_plan_count` int DEFAULT NULL COMMENT '中班计划',
+  `noon_remark` varchar(500) DEFAULT NULL COMMENT '中班备注',
+  `night_seq_no` int DEFAULT NULL COMMENT '夜班序号',
+  `night_plan_count` int DEFAULT NULL COMMENT '夜班计划',
+  `night_remark` varchar(500) DEFAULT NULL COMMENT '夜班备注',
+  `tenant_id` int DEFAULT NULL COMMENT '租户',
+  `sys_org_code` varchar(64) DEFAULT NULL COMMENT '部门编码',
+  `create_by` varchar(32) DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(32) DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `del_flag` int DEFAULT '0' COMMENT '删除标记（0正常1删除）',
+  PRIMARY KEY (`id`),
+  KEY `idx_manual_small_plan_sort` (`sort_no`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='人工小料计划维护';

jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_133__mes_xsl_mixing_production_plan_add_date_order_id.sql

@@ -0,0 +1,9 @@
+-- 密炼生产计划维护：补充保存字段（当前日期、生产订单ID）
+SET NAMES utf8mb4;
+
+ALTER TABLE `mes_xsl_mixing_production_plan`
+  ADD COLUMN IF NOT EXISTS `plan_date` date DEFAULT NULL COMMENT '计划日期（保存时写入当前日期）' AFTER `machine_name`,
+  ADD COLUMN IF NOT EXISTS `morning_source_order_id` varchar(32) DEFAULT NULL COMMENT '早班生产订单ID' AFTER `morning_plan_type`,
+  ADD COLUMN IF NOT EXISTS `noon_source_order_id` varchar(32) DEFAULT NULL COMMENT '中班生产订单ID' AFTER `noon_plan_type`,
+  ADD COLUMN IF NOT EXISTS `night_source_order_id` varchar(32) DEFAULT NULL COMMENT '晚班生产订单ID' AFTER `night_plan_type`;
+

jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_134__mes_xsl_mixing_production_plan_shared_shift_fields.sql

@@ -0,0 +1,18 @@
+-- 密炼生产计划维护：早中晚共用字段 + 班次标识
+SET NAMES utf8mb4;
+
+ALTER TABLE `mes_xsl_mixing_production_plan`
+  ADD COLUMN IF NOT EXISTS `shift_flag` int DEFAULT NULL COMMENT '班次标识：1早班 2中班 3晚班' AFTER `machine_name`,
+  ADD COLUMN IF NOT EXISTS `plan_id` varchar(32) DEFAULT NULL COMMENT '计划ID（母胶/终胶计划）' AFTER `plan_date`,
+  ADD COLUMN IF NOT EXISTS `plan_type` varchar(2) DEFAULT NULL COMMENT '计划类型：M母胶/F终胶' AFTER `plan_id`,
+  ADD COLUMN IF NOT EXISTS `source_order_id` varchar(32) DEFAULT NULL COMMENT '生产订单ID' AFTER `plan_type`,
+  ADD COLUMN IF NOT EXISTS `order_no` varchar(64) DEFAULT NULL COMMENT '生产订单号' AFTER `source_order_id`,
+  ADD COLUMN IF NOT EXISTS `order_date` date DEFAULT NULL COMMENT '订单日期' AFTER `order_no`,
+  ADD COLUMN IF NOT EXISTS `formula_name` varchar(128) DEFAULT NULL COMMENT '配方名称' AFTER `order_date`,
+  ADD COLUMN IF NOT EXISTS `plan_weight` decimal(18,6) DEFAULT NULL COMMENT '计划重量' AFTER `formula_name`,
+  ADD COLUMN IF NOT EXISTS `planned_car_count` int DEFAULT NULL COMMENT '计划车数' AFTER `plan_weight`,
+  ADD COLUMN IF NOT EXISTS `scheduled_car_count` int DEFAULT NULL COMMENT '已排产车数' AFTER `planned_car_count`,
+  ADD COLUMN IF NOT EXISTS `finished_car_count` int DEFAULT NULL COMMENT '完成车数' AFTER `scheduled_car_count`,
+  ADD COLUMN IF NOT EXISTS `plan_count` int DEFAULT NULL COMMENT '计划' AFTER `finished_car_count`,
+  ADD COLUMN IF NOT EXISTS `remark` varchar(500) DEFAULT NULL COMMENT '备注' AFTER `plan_count`;
+

jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_135__mes_xsl_mixing_production_plan_drop_redundant_shift_columns.sql

@@ -0,0 +1,31 @@
+-- 密炼生产计划维护：删除早/中/晚冗余字段，保留共用字段 + 班次标识
+SET NAMES utf8mb4;
+
+SET @drop_sql = (
+  SELECT IFNULL(
+    CONCAT(
+      'ALTER TABLE `mes_xsl_mixing_production_plan` ',
+      GROUP_CONCAT(CONCAT('DROP COLUMN `', column_name, '`') ORDER BY ordinal_position SEPARATOR ', ')
+    ),
+    'SELECT 1'
+  )
+  FROM information_schema.COLUMNS
+  WHERE TABLE_SCHEMA = DATABASE()
+    AND TABLE_NAME = 'mes_xsl_mixing_production_plan'
+    AND COLUMN_NAME IN (
+      'morning_plan_id', 'morning_plan_type', 'morning_source_order_id', 'morning_order_no', 'morning_order_date',
+      'morning_formula_name', 'morning_plan_weight', 'morning_planned_car_count', 'morning_scheduled_car_count',
+      'morning_finished_car_count', 'morning_plan_count', 'morning_remark',
+      'noon_plan_id', 'noon_plan_type', 'noon_source_order_id', 'noon_order_no', 'noon_order_date',
+      'noon_formula_name', 'noon_plan_weight', 'noon_planned_car_count', 'noon_scheduled_car_count',
+      'noon_finished_car_count', 'noon_plan_count', 'noon_remark',
+      'night_plan_id', 'night_plan_type', 'night_source_order_id', 'night_order_no', 'night_order_date',
+      'night_formula_name', 'night_plan_weight', 'night_planned_car_count', 'night_scheduled_car_count',
+      'night_finished_car_count', 'night_plan_count', 'night_remark'
+    )
+);
+
+PREPARE stmt FROM @drop_sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+

jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_136__mes_xsl_mixing_production_plan_recreate.sql

@@ -0,0 +1,44 @@
+-- 密炼生产计划维护：删表重建（注意：会清空原表数据）
+SET NAMES utf8mb4;
+
+DROP TABLE IF EXISTS `mes_xsl_mixing_production_plan`;
+
+CREATE TABLE `mes_xsl_mixing_production_plan` (
+  `id` varchar(32) NOT NULL COMMENT '主键',
+  `sort_no` int DEFAULT NULL COMMENT '排序号',
+  `machine_id` varchar(32) DEFAULT NULL COMMENT '机台ID（mes_xsl_equipment_ledger.id）',
+  `machine_name` varchar(128) DEFAULT NULL COMMENT '机台名称冗余',
+  `shift_flag` int DEFAULT NULL COMMENT '班次标识：1早班 2中班 3晚班',
+  `plan_date` date DEFAULT NULL COMMENT '计划日期（保存时写入当前日期）',
+  `plan_no` varchar(32) DEFAULT NULL COMMENT '计划号（yyyyMMddA三位流水）',
+  `plan_id` varchar(32) DEFAULT NULL COMMENT '计划ID（母胶/终胶计划）',
+  `plan_type` varchar(2) DEFAULT NULL COMMENT '计划类型：M母胶/F终胶',
+  `source_order_id` varchar(32) DEFAULT NULL COMMENT '生产订单ID',
+  `material_id` varchar(32) DEFAULT NULL COMMENT '胶料ID（mes_material.id）',
+  `material_name` varchar(128) DEFAULT NULL COMMENT '胶料名称（取母胶/终胶计划mesMaterialName）',
+  `order_no` varchar(64) DEFAULT NULL COMMENT '生产订单号',
+  `order_date` date DEFAULT NULL COMMENT '订单日期',
+  `formula_name` varchar(128) DEFAULT NULL COMMENT '配方名称',
+  `plan_weight` decimal(18,6) DEFAULT NULL COMMENT '计划重量',
+  `planned_car_count` int DEFAULT NULL COMMENT '计划车数',
+  `scheduled_car_count` int DEFAULT NULL COMMENT '已排产车数',
+  `finished_car_count` int DEFAULT NULL COMMENT '完成车数',
+  `plan_count` int DEFAULT NULL COMMENT '计划',
+  `remark` varchar(500) DEFAULT NULL COMMENT '备注',
+  `tenant_id` int DEFAULT NULL COMMENT '租户',
+  `sys_org_code` varchar(64) DEFAULT NULL COMMENT '部门编码',
+  `create_by` varchar(32) DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(32) DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `del_flag` int DEFAULT '0' COMMENT '删除标记（0正常1删除）',
+  PRIMARY KEY (`id`),
+  KEY `idx_mxmp_machine` (`machine_id`),
+  KEY `idx_mxmp_plan_date` (`plan_date`),
+  KEY `idx_mxmp_plan_no` (`plan_no`),
+  KEY `idx_mxmp_shift_flag` (`shift_flag`),
+  KEY `idx_mxmp_plan_id` (`plan_id`),
+  KEY `idx_mxmp_sort` (`sort_no`),
+  KEY `idx_mxmp_tenant` (`tenant_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES密炼生产计划维护';
+

jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_137__mes_xsl_mixing_production_plan_add_material_fields.sql

@@ -0,0 +1,7 @@
+-- 密炼生产计划维护：新增胶料ID和胶料名称字段
+SET NAMES utf8mb4;
+
+ALTER TABLE `mes_xsl_mixing_production_plan`
+  ADD COLUMN IF NOT EXISTS `material_id` varchar(32) DEFAULT NULL COMMENT '胶料ID（mes_material.id）' AFTER `source_order_id`,
+  ADD COLUMN IF NOT EXISTS `material_name` varchar(128) DEFAULT NULL COMMENT '胶料名称（取母胶/终胶计划mesMaterialName）' AFTER `material_id`;
+

jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_138__mes_xsl_mixing_production_plan_fix_material_id_definition.sql

@@ -0,0 +1,6 @@
+-- 密炼生产计划维护：修正胶料ID字段定义为mes_material主键ID
+SET NAMES utf8mb4;
+
+ALTER TABLE `mes_xsl_mixing_production_plan`
+  MODIFY COLUMN `material_id` varchar(32) DEFAULT NULL COMMENT '胶料ID（mes_material.id）';
+

jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_139__mes_xsl_mixing_production_plan_add_plan_no.sql

@@ -0,0 +1,7 @@
+-- 密炼生产计划维护：新增计划号字段
+SET NAMES utf8mb4;
+
+ALTER TABLE `mes_xsl_mixing_production_plan`
+  ADD COLUMN IF NOT EXISTS `plan_no` varchar(32) DEFAULT NULL COMMENT '计划号（yyyyMMddA三位流水）' AFTER `plan_date`,
+  ADD INDEX `idx_mxmp_plan_no` (`plan_no`);
+

jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_151__mes_xsl_rubber_quick_test_record_raw_line.sql

@@ -0,0 +1,21 @@
+-- MES 胶料快检记录原始数据明细（存储桌面端试验结果全部检测值）
+SET NAMES utf8mb4;
+
+CREATE TABLE IF NOT EXISTS `mes_xsl_rubber_quick_test_record_raw_line` (
+  `id` varchar(32) NOT NULL COMMENT '主键',
+  `record_id` varchar(32) NOT NULL COMMENT '主表 mes_xsl_rubber_quick_test_record.id',
+  `row_no` varchar(32) DEFAULT NULL COMMENT '试验结果编号（如1_1）',
+  `data_point_id` varchar(32) DEFAULT NULL COMMENT '数据点ID',
+  `inspect_item` varchar(128) DEFAULT NULL COMMENT '数据点名称',
+  `lower_limit` decimal(18,6) DEFAULT NULL COMMENT '下限值',
+  `upper_limit` decimal(18,6) DEFAULT NULL COMMENT '上限值',
+  `inspect_value` decimal(18,6) DEFAULT NULL COMMENT '检测值',
+  `row_inspect_result` varchar(2) DEFAULT NULL COMMENT '行检验结果（字典xslmes_rubber_quick_test_record_result：1合格0不合格）',
+  `sort_no` int DEFAULT NULL COMMENT '排序号',
+  `create_by` varchar(32) DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(32) DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`),
+  KEY `idx_rubber_quick_test_record_raw_record_id` (`record_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES胶料快检记录原始数据明细';

jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_152__mes_xsl_rubber_quick_test_std_tenant_backfill.sql

@@ -0,0 +1,11 @@
+-- 胶料快检实验标准：补齐 tenant_id 为空的记录（与 MES 默认租户 1002 一致）
+-- 说明：桌面端按 tenantId 拉取列表，tenant_id 为 NULL 的记录会被过滤导致条数不一致
+
+SET NAMES utf8mb4;
+
+SET @mes_tenant_id = 1002;
+
+UPDATE `mes_xsl_rubber_quick_test_std`
+SET `tenant_id` = @mes_tenant_id
+WHERE `tenant_id` IS NULL
+  AND (`del_flag` = 0 OR `del_flag` IS NULL);

jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_153__mes_xsl_mcs_sync_config.sql

@@ -0,0 +1,73 @@
+-- 【MES上辅机】密炼动作秒级采集
+-- 1. 通用中间表采集配置表（可被密炼动作/报警/配方等多功能复用，按 biz_type 区分）
+-- 2. 密炼机动作维护表补全机台字段、放开台账关联、调整唯一键为(设备+动作代号)
+-- 3. 密炼动作菜单下新增 启动采集/停止采集/采集设置 按钮权限
+
+-- ===================== 1. 通用采集配置表 =====================
+CREATE TABLE IF NOT EXISTS `mes_xsl_mcs_sync_config` (
+  `id` varchar(32) NOT NULL COMMENT '主键',
+  `biz_type` varchar(50) NOT NULL COMMENT '业务类型(采集任务唯一标识，如 MIX_ACT 密炼动作)',
+  `biz_name` varchar(100) DEFAULT NULL COMMENT '业务名称',
+  `source_table` varchar(100) DEFAULT NULL COMMENT '源中间表名',
+  `interval_seconds` int NOT NULL DEFAULT '1' COMMENT '采集时间间隔(秒)，默认1秒',
+  `status` varchar(1) NOT NULL DEFAULT '0' COMMENT '采集状态(0停止,1运行)',
+  `last_sync_time` datetime DEFAULT NULL COMMENT '最近一次采集时间',
+  `last_sync_result` varchar(500) DEFAULT NULL COMMENT '最近一次采集结果',
+  `remark` varchar(500) DEFAULT NULL COMMENT '备注',
+  `tenant_id` int DEFAULT '0' COMMENT '租户',
+  `create_by` varchar(100) DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(100) DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `del_flag` int DEFAULT '0' COMMENT '删除标记(0正常,1删除)',
+  PRIMARY KEY (`id`),
+  KEY `idx_mscfg_biz` (`biz_type`, `tenant_id`, `del_flag`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES上辅机中间表采集配置(通用)';
+
+-- 初始化密炼动作采集配置（默认间隔1秒、默认停止）
+INSERT INTO `mes_xsl_mcs_sync_config`
+  (`id`, `biz_type`, `biz_name`, `source_table`, `interval_seconds`, `status`, `remark`, `tenant_id`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`)
+SELECT '1900000000000000860', 'MIX_ACT', '密炼机动作', 'MCSToMES_MixAct', 1, '0', '密炼机动作维护数据采集', 0, 'admin', NOW(), 'admin', NOW(), 0
+FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `mes_xsl_mcs_sync_config` WHERE `biz_type` = 'MIX_ACT' AND `tenant_id` = 0);
+
+-- ===================== 2. 密炼机动作维护表补全字段 =====================
+-- 机台编号、机台类型（采集自中间表 EquipID/EquipType）
+ALTER TABLE `mes_xsl_mixer_action`
+  ADD COLUMN `equip_id` varchar(50) DEFAULT NULL COMMENT '机台编号(采集自中间表 EquipID)' AFTER `equipment_name`,
+  ADD COLUMN `equip_type` varchar(50) DEFAULT NULL COMMENT '机台类型(采集自中间表 EquipType)' AFTER `equip_id`;
+
+-- 采集未匹配到台账时 equipment_id 允许为空
+ALTER TABLE `mes_xsl_mixer_action`
+  MODIFY COLUMN `equipment_id` varchar(32) DEFAULT NULL COMMENT '设备台账ID(mes_xsl_equipment_ledger.id)，采集未匹配时为空';
+
+-- 唯一性改为(设备+动作代号)：按机台编号+动作代号建索引，便于采集 upsert
+ALTER TABLE `mes_xsl_mixer_action`
+  ADD KEY `idx_mxma_equip_code` (`tenant_id`, `equip_id`, `action_code`, `del_flag`);
+
+-- ===================== 3. 密炼动作菜单按钮权限 =====================
+-- 父菜单：密炼动作 1900000000000000835
+INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `is_route`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_leaf`, `keep_alive`, `hidden`, `hide_tab`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`)
+SELECT '1900000000000000861', '1900000000000000835', '启动采集', NULL, NULL, 0, NULL, NULL, 2, 'xslmes:mcsSyncConfig:start', '1', 1.00, 0, NULL, 1, 0, 0, 0, NULL, 'admin', NOW(), 'admin', NOW(), 0, 0, '1', 0
+FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `sys_permission` WHERE `id` = '1900000000000000861');
+
+INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `is_route`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_leaf`, `keep_alive`, `hidden`, `hide_tab`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`)
+SELECT '1900000000000000862', '1900000000000000835', '停止采集', NULL, NULL, 0, NULL, NULL, 2, 'xslmes:mcsSyncConfig:stop', '1', 2.00, 0, NULL, 1, 0, 0, 0, NULL, 'admin', NOW(), 'admin', NOW(), 0, 0, '1', 0
+FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `sys_permission` WHERE `id` = '1900000000000000862');
+
+INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `is_route`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_leaf`, `keep_alive`, `hidden`, `hide_tab`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`)
+SELECT '1900000000000000863', '1900000000000000835', '采集设置', NULL, NULL, 0, NULL, NULL, 2, 'xslmes:mcsSyncConfig:setting', '1', 3.00, 0, NULL, 1, 0, 0, 0, NULL, 'admin', NOW(), 'admin', NOW(), 0, 0, '1', 0
+FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `sys_permission` WHERE `id` = '1900000000000000863');
+
+-- admin 角色授权
+INSERT INTO `sys_role_permission` (`id`, `role_id`, `permission_id`, `data_rule_ids`, `operate_date`, `operate_ip`)
+SELECT REPLACE(UUID(), '-', ''), r.id, p.id, NULL, NOW(), '127.0.0.1'
+FROM `sys_role` r
+JOIN (
+  SELECT id FROM `sys_permission`
+  WHERE id IN ('1900000000000000861','1900000000000000862','1900000000000000863')
+) p ON 1 = 1
+WHERE r.`role_code` = 'admin'
+  AND NOT EXISTS (
+    SELECT 1 FROM `sys_role_permission` rp
+    WHERE rp.`role_id` = r.id AND rp.`permission_id` = p.id
+  );

jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_154__mes_xsl_mcs_sync_field.sql

@@ -0,0 +1,85 @@
+-- 【MES上辅机】采集配置：通用表+字段映射（中间库表 ↔ MES表，配置驱动）
+-- 1. 扩展采集配置头：目标表、配置名称、表注释
+-- 2. 新建字段映射表 mes_xsl_mcs_sync_field
+-- 3. 将密炼动作(MIX_ACT)改造为配置驱动：补目标表+预置字段映射
+-- 4. 新增"采集配置"菜单及按钮权限
+
+-- ===================== 1. 采集配置头扩展 =====================
+ALTER TABLE `mes_xsl_mcs_sync_config`
+  ADD COLUMN `config_name` varchar(100) DEFAULT NULL COMMENT '配置名称' AFTER `biz_type`,
+  ADD COLUMN `source_table_comment` varchar(200) DEFAULT NULL COMMENT '源中间表注释' AFTER `source_table`,
+  ADD COLUMN `target_table` varchar(100) DEFAULT NULL COMMENT 'MES目标表名' AFTER `source_table_comment`,
+  ADD COLUMN `target_table_comment` varchar(200) DEFAULT NULL COMMENT 'MES目标表注释' AFTER `target_table`;
+
+-- 密炼动作改造为配置驱动
+UPDATE `mes_xsl_mcs_sync_config`
+SET `config_name` = '密炼机动作采集',
+    `source_table_comment` = '密炼机实时动作',
+    `target_table` = 'mes_xsl_mixer_action',
+    `target_table_comment` = 'MES密炼机动作维护'
+WHERE `biz_type` = 'MIX_ACT';
+
+-- ===================== 2. 字段映射表 =====================
+CREATE TABLE IF NOT EXISTS `mes_xsl_mcs_sync_field` (
+  `id` varchar(32) NOT NULL COMMENT '主键',
+  `config_id` varchar(32) NOT NULL COMMENT '采集配置ID(mes_xsl_mcs_sync_config.id)',
+  `source_field` varchar(100) NOT NULL COMMENT '中间库源字段名',
+  `source_field_comment` varchar(200) DEFAULT NULL COMMENT '源字段注释',
+  `source_field_type` varchar(50) DEFAULT NULL COMMENT '源字段类型',
+  `target_field` varchar(100) DEFAULT NULL COMMENT 'MES目标字段名(接收字段)',
+  `target_field_comment` varchar(200) DEFAULT NULL COMMENT 'MES目标字段注释',
+  `match_key` varchar(1) DEFAULT '0' COMMENT '是否匹配键(0否,1是)，作为Upsert唯一键',
+  `sort_no` int DEFAULT '0' COMMENT '排序',
+  `tenant_id` int DEFAULT '0' COMMENT '租户',
+  `create_by` varchar(100) DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(100) DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `del_flag` int DEFAULT '0' COMMENT '删除标记(0正常,1删除)',
+  PRIMARY KEY (`id`),
+  KEY `idx_msf_config` (`config_id`, `del_flag`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES上辅机采集字段映射';
+
+-- 预置密炼动作字段映射（EquipName→equipment_name 等；匹配键=机台编号+动作代号）
+INSERT INTO `mes_xsl_mcs_sync_field`
+  (`id`, `config_id`, `source_field`, `source_field_comment`, `source_field_type`, `target_field`, `target_field_comment`, `match_key`, `sort_no`, `tenant_id`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`)
+SELECT * FROM (
+  SELECT '1900000000000000870' id, '1900000000000000860' config_id, 'EquipName' sf, '机台名称' sfc, 'nvarchar' sft, 'equipment_name' tf, '设备名称' tfc, '0' mk, 1 sn, 0 tid, 'admin' cb, NOW() ct, 'admin' ub, NOW() ut, 0 df
+  UNION ALL SELECT '1900000000000000871', '1900000000000000860', 'EquipID', '机台编号', 'varchar', 'equip_id', '机台编号', '1', 2, 0, 'admin', NOW(), 'admin', NOW(), 0
+  UNION ALL SELECT '1900000000000000872', '1900000000000000860', 'EquipType', '机台类型', 'nvarchar', 'equip_type', '机台类型', '0', 3, 0, 'admin', NOW(), 'admin', NOW(), 0
+  UNION ALL SELECT '1900000000000000873', '1900000000000000860', 'MixActName', '动作名称', 'nvarchar', 'action_name', '动作名称', '0', 4, 0, 'admin', NOW(), 'admin', NOW(), 0
+  UNION ALL SELECT '1900000000000000874', '1900000000000000860', 'MixActAddress', '动作地址', 'int', 'action_code', '动作代号', '1', 5, 0, 'admin', NOW(), 'admin', NOW(), 0
+) t
+WHERE NOT EXISTS (SELECT 1 FROM `mes_xsl_mcs_sync_field` WHERE `config_id` = '1900000000000000860');
+
+-- ===================== 3. 采集配置菜单 + 按钮权限 =====================
+-- 父菜单：MES上辅机数据 1900000000000000830
+INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `is_route`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_leaf`, `keep_alive`, `hidden`, `hide_tab`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`)
+SELECT '1900000000000000865', '1900000000000000830', '采集配置', '/xslmesMcs/mcsSyncConfig', 'xslmesMcs/mcsSyncConfig/index', 1, NULL, NULL, 0, NULL, '0', 0.50, 0, 'ant-design:sync-outlined', 1, 1, 0, 0, '中间表→MES表 采集配置与字段映射', 'admin', NOW(), 'admin', NOW(), 0, 0, '1', 0
+FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `sys_permission` WHERE `id` = '1900000000000000865');
+
+INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `is_route`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_leaf`, `keep_alive`, `hidden`, `hide_tab`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`)
+SELECT '1900000000000000866', '1900000000000000865', '新增', NULL, NULL, 0, NULL, NULL, 2, 'xslmes:mcsSyncConfig:add', '1', 1.00, 0, NULL, 1, 0, 0, 0, NULL, 'admin', NOW(), 'admin', NOW(), 0, 0, '1', 0
+FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `sys_permission` WHERE `id` = '1900000000000000866');
+
+INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `is_route`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_leaf`, `keep_alive`, `hidden`, `hide_tab`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`)
+SELECT '1900000000000000867', '1900000000000000865', '编辑', NULL, NULL, 0, NULL, NULL, 2, 'xslmes:mcsSyncConfig:edit', '1', 2.00, 0, NULL, 1, 0, 0, 0, NULL, 'admin', NOW(), 'admin', NOW(), 0, 0, '1', 0
+FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `sys_permission` WHERE `id` = '1900000000000000867');
+
+INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `is_route`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_leaf`, `keep_alive`, `hidden`, `hide_tab`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`)
+SELECT '1900000000000000868', '1900000000000000865', '删除', NULL, NULL, 0, NULL, NULL, 2, 'xslmes:mcsSyncConfig:delete', '1', 3.00, 0, NULL, 1, 0, 0, 0, NULL, 'admin', NOW(), 'admin', NOW(), 0, 0, '1', 0
+FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `sys_permission` WHERE `id` = '1900000000000000868');
+
+-- admin 授权
+INSERT INTO `sys_role_permission` (`id`, `role_id`, `permission_id`, `data_rule_ids`, `operate_date`, `operate_ip`)
+SELECT REPLACE(UUID(), '-', ''), r.id, p.id, NULL, NOW(), '127.0.0.1'
+FROM `sys_role` r
+JOIN (
+  SELECT id FROM `sys_permission`
+  WHERE id IN ('1900000000000000865','1900000000000000866','1900000000000000867','1900000000000000868')
+) p ON 1 = 1
+WHERE r.`role_code` = 'admin'
+  AND NOT EXISTS (
+    SELECT 1 FROM `sys_role_permission` rp
+    WHERE rp.`role_id` = r.id AND rp.`permission_id` = p.id
+  );

jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_155__mes_xsl_mcs_sync_mode.sql

@@ -0,0 +1,10 @@
+-- 【MES上辅机】采集模式：全量匹配/时间匹配/增量匹配（应对中间库大表）
+ALTER TABLE `mes_xsl_mcs_sync_config`
+  ADD COLUMN `sync_mode` varchar(20) NOT NULL DEFAULT 'FULL' COMMENT '采集模式(FULL全量匹配,TIME时间匹配,INCR增量匹配)' AFTER `status`,
+  ADD COLUMN `incr_column` varchar(100) DEFAULT NULL COMMENT '增量/时间列(源表列名，TIME/INCR模式用)' AFTER `sync_mode`,
+  ADD COLUMN `time_window` varchar(20) DEFAULT 'TODAY' COMMENT '时间范围(TODAY当天,LAST7最近七天)，TIME模式用' AFTER `incr_column`,
+  ADD COLUMN `batch_limit` int DEFAULT '2000' COMMENT '每轮最大采集行数(INCR模式TOP N限流)' AFTER `time_window`,
+  ADD COLUMN `last_watermark` varchar(64) DEFAULT NULL COMMENT '增量采集已处理到的高水位(INCR模式自动维护)' AFTER `batch_limit`;
+
+-- 密炼动作为小状态表，保持全量匹配
+UPDATE `mes_xsl_mcs_sync_config` SET `sync_mode` = 'FULL' WHERE `biz_type` = 'MIX_ACT';

jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_156__mes_xsl_mcs_sync_flag_condition.sql

@@ -0,0 +1,4 @@
+-- 【MES上辅机】增量匹配改为标记位回写：可视化采集条件 + 可配置回写值
+ALTER TABLE `mes_xsl_mcs_sync_config`
+  ADD COLUMN `flag_condition` varchar(20) DEFAULT 'IS_NULL' COMMENT '增量标记采集条件(IS_NULL为空,EQ_EMPTY等于空串,NE_EMPTY不等于空串)' AFTER `last_watermark`,
+  ADD COLUMN `flag_write_value` varchar(64) DEFAULT '1' COMMENT '增量标记采集完成后回写值(默认1)' AFTER `flag_condition`;

jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_157__mes_xsl_mcs_sync_flag_match_value.sql

@@ -0,0 +1,3 @@
+-- 【MES上辅机】增量采集条件「等于/不等于」支持自定义匹配值（留空时退化为空字符串）
+ALTER TABLE `mes_xsl_mcs_sync_config`
+  ADD COLUMN `flag_match_value` varchar(255) DEFAULT NULL COMMENT '增量标记采集条件比较值(EQ_EMPTY/NE_EMPTY用,留空表示空字符串)' AFTER `flag_condition`;

jeecg-boot/scan_mixing_plan.json

@@ -0,0 +1,374 @@
+{
+  "scanKeyword": "MesXslMixingProductionPlan",
+  "entityClass": "MesXslMixingProductionPlan",
+  "tableName": "mes_xsl_mixing_production_plan",
+  "javaEntityFile": "jeecg-boot\\jeecg-boot-module\\jeecg-module-xslmes\\src\\main\\java\\org\\jeecg\\modules\\xslmes\\entity\\MesXslMixingProductionPlan.java",
+  "hasIzEnable": false,
+  "hasCodeUniqueness": false,
+  "uniquenessFields": [],
+  "backendArch": {
+    "unifiedAnonCtrl": "jeecg-boot\\jeecg-boot-module\\jeecg-module-xslmes\\src\\main\\java\\org\\jeecg\\modules\\xslmes\\controller\\MesXslDesktopAnonController.java",
+    "registeredInAnonCtrl": true,
+    "anonEndpoints": [
+      "list"
+    ],
+    "stompNotifySvc": "jeecg-boot\\jeecg-boot-module\\jeecg-module-xslmes\\src\\main\\java\\org\\jeecg\\modules\\xslmes\\service\\MesXslStompNotifyService.java",
+    "registeredInStompSvc": false,
+    "bizCtrlFile": "jeecg-boot\\jeecg-boot-module\\jeecg-module-xslmes\\src\\main\\java\\org\\jeecg\\modules\\xslmes\\controller\\MesXslMixingProductionPlanController.java",
+    "bizCtrlUsesSharedNotify": false,
+    "bizCtrlHasPrivatePublish": false
+  },
+  "wpfRegistrationStatus": {
+    "syncModuleService": false,
+    "syncModuleCoordinator": false,
+    "navigationView": false,
+    "stompSubscribe": false,
+    "menuRegistered": false,
+    "tenantMenuRegistered": false,
+    "syncModuleFilePath": "yy-admin-master\\YY.Admin\\Module\\SyncModule.cs",
+    "navExtFilePath": "yy-admin-master\\YY.Admin\\Module\\NavigationExtensions.cs",
+    "stompWsFilePath": "yy-admin-master\\YY.Admin\\Infrastructure\\Hubs\\StompWebSocketService.cs",
+    "menuSeedFilePath": "yy-admin-master\\YY.Admin.Core\\SeedData\\SysMenuSeedData.cs",
+    "summary": "✗ 待完成: SyncModule服务注册, SyncModule协调器注册, NavigationExtensions视图注册, STOMP订阅, 菜单注册"
+  },
+  "menuSuggestion": {
+    "parentMenuId": 1300150000101,
+    "parentMenuTitle": "基础资料",
+    "nextMenuId": 1300150011401,
+    "nextOrderNo": 113,
+    "menuIdPattern": "130015001{N}01，N 每次 +1（1→101,2→201...）",
+    "alreadyExists": false,
+    "existingMenuId": null
+  },
+  "apiPrefix": "/xslmes/mesXslMixingProductionPlan",
+  "stompCmd": "MIXING_PRODUCTION_PLAN_CHANGED",
+  "stompTopic": "/topic/sync/mes-mixing-production-plans",
+  "stompSubscriptionId": "sub-mes-xsl-mixing-production-plan",
+  "syncMode": "B",
+  "syncModeReason": "有/anon/免密端点，适合模式B",
+  "filterFields": [
+    "machineId",
+    "machineName",
+    "planNo",
+    "planType",
+    "materialName"
+  ],
+  "fields": [
+    {
+      "javaName": "sortNo",
+      "csName": "SortNo",
+      "sqlName": "sort_no",
+      "javaType": "Integer",
+      "csType": "int?",
+      "comment": "",
+      "isPk": false,
+      "isAudit": false,
+      "isIzEnable": false,
+      "required": false,
+      "dictCode": null
+    },
+    {
+      "javaName": "machineId",
+      "csName": "MachineId",
+      "sqlName": "machine_id",
+      "javaType": "String",
+      "csType": "string?",
+      "comment": "",
+      "isPk": false,
+      "isAudit": false,
+      "isIzEnable": false,
+      "required": false,
+      "dictCode": "id"
+    },
+    {
+      "javaName": "machineName",
+      "csName": "MachineName",
+      "sqlName": "machine_name",
+      "javaType": "String",
+      "csType": "string?",
+      "comment": "",
+      "isPk": false,
+      "isAudit": false,
+      "isIzEnable": false,
+      "required": false,
+      "dictCode": null
+    },
+    {
+      "javaName": "shiftFlag",
+      "csName": "ShiftFlag",
+      "sqlName": "shift_flag",
+      "javaType": "Integer",
+      "csType": "int?",
+      "comment": "",
+      "isPk": false,
+      "isAudit": false,
+      "isIzEnable": false,
+      "required": false,
+      "dictCode": null
+    },
+    {
+      "javaName": "planDate",
+      "csName": "PlanDate",
+      "sqlName": "plan_date",
+      "javaType": "Date",
+      "csType": "DateTime?",
+      "comment": "",
+      "isPk": false,
+      "isAudit": false,
+      "isIzEnable": false,
+      "required": false,
+      "dictCode": null
+    },
+    {
+      "javaName": "planNo",
+      "csName": "PlanNo",
+      "sqlName": "plan_no",
+      "javaType": "String",
+      "csType": "string?",
+      "comment": "",
+      "isPk": false,
+      "isAudit": false,
+      "isIzEnable": false,
+      "required": false,
+      "dictCode": null
+    },
+    {
+      "javaName": "planId",
+      "csName": "PlanId",
+      "sqlName": "plan_id",
+      "javaType": "String",
+      "csType": "string?",
+      "comment": "",
+      "isPk": false,
+      "isAudit": false,
+      "isIzEnable": false,
+      "required": false,
+      "dictCode": null
+    },
+    {
+      "javaName": "planType",
+      "csName": "PlanType",
+      "sqlName": "plan_type",
+      "javaType": "String",
+      "csType": "string?",
+      "comment": "",
+      "isPk": false,
+      "isAudit": false,
+      "isIzEnable": false,
+      "required": false,
+      "dictCode": null
+    },
+    {
+      "javaName": "sourceOrderId",
+      "csName": "SourceOrderId",
+      "sqlName": "source_order_id",
+      "javaType": "String",
+      "csType": "string?",
+      "comment": "",
+      "isPk": false,
+      "isAudit": false,
+      "isIzEnable": false,
+      "required": false,
+      "dictCode": null
+    },
+    {
+      "javaName": "materialId",
+      "csName": "MaterialId",
+      "sqlName": "material_id",
+      "javaType": "String",
+      "csType": "string?",
+      "comment": "",
+      "isPk": false,
+      "isAudit": false,
+      "isIzEnable": false,
+      "required": false,
+      "dictCode": null
+    },
+    {
+      "javaName": "materialName",
+      "csName": "MaterialName",
+      "sqlName": "material_name",
+      "javaType": "String",
+      "csType": "string?",
+      "comment": "",
+      "isPk": false,
+      "isAudit": false,
+      "isIzEnable": false,
+      "required": false,
+      "dictCode": null
+    },
+    {
+      "javaName": "orderNo",
+      "csName": "OrderNo",
+      "sqlName": "order_no",
+      "javaType": "String",
+      "csType": "string?",
+      "comment": "",
+      "isPk": false,
+      "isAudit": false,
+      "isIzEnable": false,
+      "required": false,
+      "dictCode": null
+    },
+    {
+      "javaName": "orderDate",
+      "csName": "OrderDate",
+      "sqlName": "order_date",
+      "javaType": "Date",
+      "csType": "DateTime?",
+      "comment": "",
+      "isPk": false,
+      "isAudit": false,
+      "isIzEnable": false,
+      "required": false,
+      "dictCode": null
+    },
+    {
+      "javaName": "formulaName",
+      "csName": "FormulaName",
+      "sqlName": "formula_name",
+      "javaType": "String",
+      "csType": "string?",
+      "comment": "",
+      "isPk": false,
+      "isAudit": false,
+      "isIzEnable": false,
+      "required": false,
+      "dictCode": null
+    },
+    {
+      "javaName": "planWeight",
+      "csName": "PlanWeight",
+      "sqlName": "plan_weight",
+      "javaType": "BigDecimal",
+      "csType": "double?",
+      "comment": "",
+      "isPk": false,
+      "isAudit": false,
+      "isIzEnable": false,
+      "required": false,
+      "dictCode": null
+    },
+    {
+      "javaName": "plannedCarCount",
+      "csName": "PlannedCarCount",
+      "sqlName": "planned_car_count",
+      "javaType": "Integer",
+      "csType": "int?",
+      "comment": "",
+      "isPk": false,
+      "isAudit": false,
+      "isIzEnable": false,
+      "required": false,
+      "dictCode": null
+    },
+    {
+      "javaName": "scheduledCarCount",
+      "csName": "ScheduledCarCount",
+      "sqlName": "scheduled_car_count",
+      "javaType": "Integer",
+      "csType": "int?",
+      "comment": "",
+      "isPk": false,
+      "isAudit": false,
+      "isIzEnable": false,
+      "required": false,
+      "dictCode": null
+    },
+    {
+      "javaName": "finishedCarCount",
+      "csName": "FinishedCarCount",
+      "sqlName": "finished_car_count",
+      "javaType": "Integer",
+      "csType": "int?",
+      "comment": "",
+      "isPk": false,
+      "isAudit": false,
+      "isIzEnable": false,
+      "required": false,
+      "dictCode": null
+    },
+    {
+      "javaName": "planCount",
+      "csName": "PlanCount",
+      "sqlName": "plan_count",
+      "javaType": "Integer",
+      "csType": "int?",
+      "comment": "",
+      "isPk": false,
+      "isAudit": false,
+      "isIzEnable": false,
+      "required": false,
+      "dictCode": null
+    },
+    {
+      "javaName": "remark",
+      "csName": "Remark",
+      "sqlName": "remark",
+      "javaType": "String",
+      "csType": "string?",
+      "comment": "",
+      "isPk": false,
+      "isAudit": false,
+      "isIzEnable": false,
+      "required": false,
+      "dictCode": null
+    }
+  ],
+  "pkField": {
+    "javaName": "id",
+    "csName": "Id",
+    "sqlName": "id",
+    "javaType": "String",
+    "csType": "string?",
+    "comment": "",
+    "isPk": true,
+    "isAudit": false,
+    "isIzEnable": false,
+    "required": false,
+    "dictCode": null
+  },
+  "auditFields": [
+    "TenantId",
+    "SysOrgCode",
+    "CreateBy",
+    "CreateTime",
+    "UpdateBy",
+    "UpdateTime",
+    "DelFlag"
+  ],
+  "dbConfig": {
+    "url": "jdbc:mysql://localhost:3306/jeecg-boot-dev?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai",
+    "username": "root",
+    "configFile": "jeecg-boot\\jeecg-boot-module\\jeecg-boot-module-airag\\src\\main\\resources\\application.yml"
+  },
+  "dbColumns": [],
+  "csEntityStub": "public class MesXslMixingProductionPlan\n{\n    public string? Id { get; set; }\n    public int? SortNo { get; set; }\n    public string? MachineId { get; set; } [Dict:id]\n    public string? MachineName { get; set; }\n    public int? ShiftFlag { get; set; }\n    public DateTime? PlanDate { get; set; }\n    public string? PlanNo { get; set; }\n    public string? PlanId { get; set; }\n    public string? PlanType { get; set; }\n    public string? SourceOrderId { get; set; }\n    public string? MaterialId { get; set; }\n    public string? MaterialName { get; set; }\n    public string? OrderNo { get; set; }\n    public DateTime? OrderDate { get; set; }\n    public string? FormulaName { get; set; }\n    public double? PlanWeight { get; set; }\n    public int? PlannedCarCount { get; set; }\n    public int? ScheduledCarCount { get; set; }\n    public int? FinishedCarCount { get; set; }\n    public int? PlanCount { get; set; }\n    public string? Remark { get; set; }\n    public int? TenantId { get; set; }\n    public string? SysOrgCode { get; set; }\n    public string? CreateBy { get; set; }\n    public DateTime? CreateTime { get; set; }\n    public string? UpdateBy { get; set; }\n    public DateTime? UpdateTime { get; set; }\n    public int? DelFlag { get; set; }\n    // 只读显示属性:\n    // public string StatusText => Status == \"1\" ? \"停用\" : \"启用\";\n}",
+  "generationHints": {
+    "eventClassName": "MesXslMixingProductionPlanChangedEvent",
+    "serviceInterface": "IMixingProductionPlanService",
+    "serviceImpl": "MixingProductionPlanService",
+    "syncCoordinator": "MixingProductionPlanSyncCoordinator",
+    "listViewModel": "MixingProductionPlanListViewModel",
+    "editDialogViewModel": "MixingProductionPlanEditDialogViewModel",
+    "listView": "MixingProductionPlanListView",
+    "editDialogView": "MixingProductionPlanEditDialogView",
+    "pendingOpsFile": "mes-xsl-mixing-production-plan-pending-ops.json",
+    "cacheFile": "mes-xsl-mixing-production-plan-cache.json",
+    "nextMenuId": 1300150011401,
+    "nextMenuOrderNo": 113,
+    "backendFilesToModify": [
+      "jeecg-boot\\jeecg-boot-module\\jeecg-module-xslmes\\src\\main\\java\\org\\jeecg\\modules\\xslmes\\controller\\MesXslDesktopAnonController.java",
+      "jeecg-boot\\jeecg-boot-module\\jeecg-module-xslmes\\src\\main\\java\\org\\jeecg\\modules\\xslmes\\service\\MesXslStompNotifyService.java",
+      "jeecg-boot\\jeecg-boot-module\\jeecg-module-xslmes\\src\\main\\java\\org\\jeecg\\modules\\xslmes\\controller\\MesXslMixingProductionPlanController.java",
+      "jeecg-boot-base-core/.../ShiroConfig.java"
+    ],
+    "wpfFilesToModify": [
+      "yy-admin-master\\YY.Admin\\Module\\SyncModule.cs",
+      "yy-admin-master\\YY.Admin\\Module\\NavigationExtensions.cs",
+      "yy-admin-master\\YY.Admin\\Infrastructure\\Hubs\\StompWebSocketService.cs",
+      "yy-admin-master\\YY.Admin.Core\\SeedData\\SysMenuSeedData.cs",
+      "YY.Admin.Core/SeedData/SysTenantMenuSeedData.cs"
+    ]
+  }
+}

jeecgboot-vue3/src/views/mes/autosmallmaterialdemandplan/index.vue

@@ -0,0 +1,7 @@
+<template>
+  <MesXslAutoSmallMaterialDemandPlanList />
+</template>
+
+<script lang="ts" setup>
+import MesXslAutoSmallMaterialDemandPlanList from '../../xslmes/mesXslAutoSmallMaterialDemandPlan/MesXslAutoSmallMaterialDemandPlanList.vue';
+</script>

jeecgboot-vue3/src/views/mes/autosmallmaterialplanmaintain/index.vue

@@ -0,0 +1,7 @@
+<template>
+  <MesXslAutoSmallMaterialPlanMaintainList />
+</template>
+
+<script lang="ts" setup>
+import MesXslAutoSmallMaterialPlanMaintainList from '../../xslmes/mesXslAutoSmallMaterialPlanMaintain/MesXslAutoSmallMaterialPlanMaintainList.vue';
+</script>

jeecgboot-vue3/src/views/mes/manualsmallmaterialdemandplan/index.vue

@@ -0,0 +1,7 @@
+<template>
+  <MesXslManualSmallMaterialDemandPlanList />
+</template>
+
+<script lang="ts" setup>
+import MesXslManualSmallMaterialDemandPlanList from '../../xslmes/mesXslManualSmallMaterialDemandPlan/MesXslManualSmallMaterialDemandPlanList.vue';
+</script>

jeecgboot-vue3/src/views/mes/manualsmallmaterialplanmaintain/index.vue

@@ -0,0 +1,7 @@
+<template>
+  <MesXslManualSmallMaterialPlanMaintainList />
+</template>
+
+<script lang="ts" setup>
+import MesXslManualSmallMaterialPlanMaintainList from '../../xslmes/mesXslManualSmallMaterialPlanMaintain/MesXslManualSmallMaterialPlanMaintainList.vue';
+</script>

jeecgboot-vue3/src/views/mes/material/modules/MesMaterialSelectModal.vue

@@ -17,6 +17,7 @@
 
   const selectedRow = ref<Recordable | null>(null);
   const onlySales = ref(false);
+  const excludeProductionFB1 = ref(false);
 
   const [registerTable, { reload, getSelectRowKeys, getSelectRows, setSelectedRowKeys, clearSelectedRowKeys }] = useTable({
     api: materialList,
@@ -35,6 +36,7 @@
       ...params,
       enableFlag: params.enableFlag ?? 1,
       onlySales: onlySales.value ? 1 : undefined,
+      excludeProductionFB1: excludeProductionFB1.value ? 1 : undefined,
     }),
     rowSelection: {
       type: 'radio',
@@ -49,6 +51,7 @@
   const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
     selectedRow.value = null;
     onlySales.value = !!data?.onlySales;
+    excludeProductionFB1.value = !!data?.excludeProductionFB1;
     clearSelectedRowKeys?.();
     setModalProps({ confirmLoading: false });
     const materialId = data?.materialId as string | undefined;
@@ -84,9 +87,9 @@
     }
     emit('select', {
       materialId: row.id,
-      materialName: row.materialName || '',
-      aliasName: row.aliasName || '',
-      materialCode: row.materialCode || '',
+      materialName: row.materialName || row.material_name || '',
+      aliasName: row.aliasName || row.alias_name || '',
+      materialCode: row.materialCode || row.material_code || '',
     });
     closeModal();
   }

jeecgboot-vue3/src/views/xslmes/mesXslAutoSmallMaterialDemandPlan/MesXslAutoSmallMaterialDemandPlan.api.ts

@@ -0,0 +1,10 @@
+import { defHttp } from '/@/utils/http/axios';
+
+enum Api {
+  list = '/xslmes/mesXslAutoSmallMaterialDemandPlan/list',
+  exportXls = '/xslmes/mesXslAutoSmallMaterialDemandPlan/exportXls',
+}
+
+export const getExportUrl = Api.exportXls;
+
+export const list = (params) => defHttp.get({ url: Api.list, params });

jeecgboot-vue3/src/views/xslmes/mesXslAutoSmallMaterialDemandPlan/MesXslAutoSmallMaterialDemandPlan.data.ts

@@ -0,0 +1,26 @@
+import { BasicColumn, FormSchema } from '/@/components/Table';
+
+export const baseColumns: BasicColumn[] = [
+  { title: '原材料名称', align: 'center', dataIndex: 'rawMaterialName', width: 260, ellipsis: true },
+  { title: '需求重量(KG)', align: 'center', dataIndex: 'demandWeight', width: 180 },
+];
+
+export const machineColumns: BasicColumn[] = [{ title: '机台', align: 'center', dataIndex: 'machineName', width: 180 }, ...baseColumns];
+
+export const searchFormSchema: FormSchema[] = [
+  {
+    label: '日期',
+    field: 'statDate',
+    component: 'DatePicker',
+    componentProps: { valueFormat: 'YYYY-MM-DD', placeholder: '请选择日期' },
+    colProps: { span: 6 },
+  },
+  { label: '原材料名称', field: 'rawMaterialName', component: 'JInput', colProps: { span: 6 } },
+];
+
+export const superQuerySchema = {
+  machineName: { title: '机台', order: 0, view: 'text' },
+  statDate: { title: '日期', order: 1, view: 'date' },
+  rawMaterialName: { title: '原材料名称', order: 2, view: 'text' },
+  demandWeight: { title: '需求重量(KG)', order: 3, view: 'number' },
+};

jeecgboot-vue3/src/views/xslmes/mesXslAutoSmallMaterialDemandPlan/MesXslAutoSmallMaterialDemandPlanList.vue

@@ -0,0 +1,83 @@
+<template>
+  <div>
+    <BasicTable @register="registerTable">
+      <template #tableTitle>
+        <a-checkbox v-model:checked="groupByMachine" @change="onGroupByMachineChange">按机台统计</a-checkbox>
+        <a-button
+          style="margin-left: 8px"
+          type="primary"
+          v-auth="'xslmes:mes_xsl_auto_small_material_demand_plan:exportXls'"
+          preIcon="ant-design:export-outlined"
+          @click="onExportXls"
+        >
+          导出
+        </a-button>
+        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
+      </template>
+    </BasicTable>
+  </div>
+</template>
+
+<script lang="ts" name="xslmes-mesXslAutoSmallMaterialDemandPlan" setup>
+  import { onMounted, reactive, ref } from 'vue';
+  import { BasicTable } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import {
+    baseColumns,
+    machineColumns,
+    searchFormSchema,
+    superQuerySchema,
+  } from './MesXslAutoSmallMaterialDemandPlan.data';
+  import { list, getExportUrl } from './MesXslAutoSmallMaterialDemandPlan.api';
+
+  const queryParam = reactive<any>({ groupByMachine: 0 });
+  const groupByMachine = ref(false);
+
+  const { tableContext, onExportXls } = useListPage({
+    tableProps: {
+      title: '自动小料需求计划',
+      api: list,
+      columns: baseColumns,
+      canResize: true,
+      formConfig: {
+        schemas: searchFormSchema,
+        autoSubmitOnEnter: true,
+        showAdvancedButton: true,
+      },
+      beforeFetch: (params) => {
+        return Object.assign(params, queryParam, {
+          groupByMachine: groupByMachine.value ? 1 : 0,
+        });
+      },
+    },
+    exportConfig: {
+      name: '自动小料需求计划',
+      url: getExportUrl,
+      params: queryParam,
+    },
+  });
+
+  const [registerTable, { reload, setColumns }] = tableContext;
+  const superQueryConfig = reactive(superQuerySchema);
+
+  onMounted(() => {
+    applyColumns();
+  });
+
+  function applyColumns() {
+    setColumns(groupByMachine.value ? machineColumns : baseColumns);
+  }
+
+  function onGroupByMachineChange() {
+    queryParam.groupByMachine = groupByMachine.value ? 1 : 0;
+    applyColumns();
+    reload();
+  }
+
+  function handleSuperQuery(params) {
+    Object.keys(params).forEach((k) => {
+      queryParam[k] = params[k];
+    });
+    reload();
+  }
+</script>

jeecgboot-vue3/src/views/xslmes/mesXslAutoSmallMaterialPlanMaintain/MesXslAutoSmallMaterialPlanMaintain.api.ts

@@ -0,0 +1,9 @@
+import { defHttp } from '/@/utils/http/axios';
+
+enum Api {
+  list = '/xslmes/mesXslAutoSmallMaterialPlanMaintain/list',
+  saveAll = '/xslmes/mesXslAutoSmallMaterialPlanMaintain/saveAll',
+}
+
+export const list = (params) => defHttp.get({ url: Api.list, params });
+export const saveAll = (params) => defHttp.post({ url: Api.saveAll, params });

jeecgboot-vue3/src/views/xslmes/mesXslAutoSmallMaterialPlanMaintain/MesXslAutoSmallMaterialPlanMaintainList.vue

@@ -0,0 +1,198 @@
+<template>
+  <div class="small-plan-page">
+    <div class="small-plan-toolbar">
+      <a-button type="primary" preIcon="ant-design:save-outlined" :loading="saving" @click="handleSaveAll">保存</a-button>
+    </div>
+
+    <a-table :columns="columns" :data-source="rows" :pagination="false" :scroll="{ x: 1220 }" row-key="_rowKey" size="small" bordered>
+      <template #bodyCell="{ column, record, index }">
+        <template v-if="column.dataIndex === 'formulaName'">
+          <a-input :value="record.formulaName" @change="(e) => updateCell(index, 'formulaName', e?.target?.value)" />
+        </template>
+
+        <template
+          v-else-if="
+            column.dataIndex === 'morningSeqNo' ||
+            column.dataIndex === 'noonSeqNo' ||
+            column.dataIndex === 'nightSeqNo' ||
+            column.dataIndex === 'morningPlanCount' ||
+            column.dataIndex === 'noonPlanCount' ||
+            column.dataIndex === 'nightPlanCount'
+          "
+        >
+          <a-input-number
+            :value="record[column.dataIndex]"
+            :min="0"
+            :precision="0"
+            :controls="false"
+            style="width: 100%"
+            @change="(v) => updateCell(index, column.dataIndex as string, v)"
+          />
+        </template>
+
+        <template
+          v-else-if="
+            column.dataIndex === 'morningRemark' || column.dataIndex === 'noonRemark' || column.dataIndex === 'nightRemark'
+          "
+        >
+          <a-input :value="record[column.dataIndex]" @change="(e) => updateCell(index, column.dataIndex as string, e?.target?.value)" />
+        </template>
+
+        <template v-else-if="column.key === 'action'">
+          <a-button type="text" size="small" class="insert-plus-btn" title="新增" @click="insertBelow(index)">+</a-button>
+          <a-button type="link" size="small" danger @click="removeRow(index)">删</a-button>
+        </template>
+      </template>
+    </a-table>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { computed, ref } from 'vue';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { buildUUID } from '/@/utils/uuid';
+  import { list, saveAll } from './MesXslAutoSmallMaterialPlanMaintain.api';
+
+  const { createMessage } = useMessage();
+  const saving = ref(false);
+  const rows = ref<Recordable[]>([]);
+
+  const columns = computed(() => [
+    { title: '操作', key: 'action', width: 96, fixed: 'left', align: 'center' },
+    { title: '配方名称', dataIndex: 'formulaName', width: 220, fixed: 'left', align: 'center' },
+    {
+      title: '早班',
+      align: 'center',
+      children: [
+        { title: '序号', dataIndex: 'morningSeqNo', width: 90, align: 'center' },
+        { title: '计划', dataIndex: 'morningPlanCount', width: 90, align: 'center' },
+        { title: '备注', dataIndex: 'morningRemark', width: 160, align: 'center' },
+      ],
+    },
+    {
+      title: '中班',
+      align: 'center',
+      children: [
+        { title: '序号', dataIndex: 'noonSeqNo', width: 90, align: 'center' },
+        { title: '计划', dataIndex: 'noonPlanCount', width: 90, align: 'center' },
+        { title: '备注', dataIndex: 'noonRemark', width: 160, align: 'center' },
+      ],
+    },
+    {
+      title: '夜班',
+      align: 'center',
+      children: [
+        { title: '序号', dataIndex: 'nightSeqNo', width: 90, align: 'center' },
+        { title: '计划', dataIndex: 'nightPlanCount', width: 90, align: 'center' },
+        { title: '备注', dataIndex: 'nightRemark', width: 160, align: 'center' },
+      ],
+    },
+  ]);
+
+  function createEmptyRow(): Recordable {
+    return {
+      _rowKey: buildUUID(),
+      id: '',
+      formulaName: '',
+      morningSeqNo: null,
+      morningPlanCount: null,
+      morningRemark: '',
+      noonSeqNo: null,
+      noonPlanCount: null,
+      noonRemark: '',
+      nightSeqNo: null,
+      nightPlanCount: null,
+      nightRemark: '',
+    };
+  }
+
+  function createBlankRows(count = 12) {
+    return Array.from({ length: count }, () => createEmptyRow());
+  }
+
+  function updateCell(index: number, field: string, value: any) {
+    const row = rows.value[index];
+    if (!row) return;
+    row[field] = value;
+  }
+
+  function insertBelow(index: number) {
+    rows.value.splice(index + 1, 0, createEmptyRow());
+  }
+
+  function removeRow(index: number) {
+    rows.value.splice(index, 1);
+    if (!rows.value.length) {
+      rows.value = createBlankRows();
+    }
+  }
+
+  async function loadRows() {
+    const res = await list({ pageNo: 1, pageSize: 500 });
+    const records = (res?.records || res?.result?.records || []) as Recordable[];
+    rows.value = (records || []).map((item) => ({ ...createEmptyRow(), ...item, _rowKey: item.id || buildUUID() }));
+    if (!rows.value.length) {
+      rows.value = createBlankRows();
+    }
+  }
+
+  async function handleSaveAll() {
+    saving.value = true;
+    try {
+      const payload = rows.value.map((r) => {
+        const { _rowKey, ...rest } = r;
+        return rest;
+      });
+      await saveAll({ rows: payload });
+      createMessage.success('保存成功');
+      await loadRows();
+    } finally {
+      saving.value = false;
+    }
+  }
+
+  loadRows();
+</script>
+
+<style scoped>
+  .small-plan-page {
+    padding: 8px;
+    background: #fff;
+  }
+
+  .small-plan-toolbar {
+    margin-bottom: 12px;
+    display: flex;
+    gap: 8px;
+  }
+
+  :deep(.ant-table-thead > tr > th) {
+    text-align: center !important;
+    padding: 4px 6px !important;
+    font-size: 12px;
+  }
+
+  :deep(.ant-table-tbody > tr > td) {
+    padding: 2px 3px !important;
+  }
+
+  :deep(.ant-input),
+  :deep(.ant-input-number),
+  :deep(.ant-input-number-input) {
+    font-size: 12px;
+  }
+
+  :deep(.ant-input),
+  :deep(.ant-input-number) {
+    width: 100%;
+    min-width: 0;
+  }
+
+  .insert-plus-btn {
+    color: #52c41a;
+    font-size: 18px;
+    font-weight: 700;
+    line-height: 1;
+    padding: 0 4px;
+  }
+</style>

jeecgboot-vue3/src/views/xslmes/mesXslManualSmallMaterialDemandPlan/MesXslManualSmallMaterialDemandPlan.api.ts

@@ -0,0 +1,10 @@
+import { defHttp } from '/@/utils/http/axios';
+
+enum Api {
+  list = '/xslmes/mesXslManualSmallMaterialDemandPlan/list',
+  exportXls = '/xslmes/mesXslManualSmallMaterialDemandPlan/exportXls',
+}
+
+export const getExportUrl = Api.exportXls;
+
+export const list = (params) => defHttp.get({ url: Api.list, params });

jeecgboot-vue3/src/views/xslmes/mesXslManualSmallMaterialDemandPlan/MesXslManualSmallMaterialDemandPlan.data.ts

@@ -0,0 +1,26 @@
+import { BasicColumn, FormSchema } from '/@/components/Table';
+
+export const baseColumns: BasicColumn[] = [
+  { title: '原材料名称', align: 'center', dataIndex: 'rawMaterialName', width: 260, ellipsis: true },
+  { title: '需求重量(KG)', align: 'center', dataIndex: 'demandWeight', width: 180 },
+];
+
+export const machineColumns: BasicColumn[] = [{ title: '机台', align: 'center', dataIndex: 'machineName', width: 180 }, ...baseColumns];
+
+export const searchFormSchema: FormSchema[] = [
+  {
+    label: '日期',
+    field: 'statDate',
+    component: 'DatePicker',
+    componentProps: { valueFormat: 'YYYY-MM-DD', placeholder: '请选择日期' },
+    colProps: { span: 6 },
+  },
+  { label: '原材料名称', field: 'rawMaterialName', component: 'JInput', colProps: { span: 6 } },
+];
+
+export const superQuerySchema = {
+  machineName: { title: '机台', order: 0, view: 'text' },
+  statDate: { title: '日期', order: 1, view: 'date' },
+  rawMaterialName: { title: '原材料名称', order: 2, view: 'text' },
+  demandWeight: { title: '需求重量(KG)', order: 3, view: 'number' },
+};

jeecgboot-vue3/src/views/xslmes/mesXslManualSmallMaterialDemandPlan/MesXslManualSmallMaterialDemandPlanList.vue

@@ -0,0 +1,83 @@
+<template>
+  <div>
+    <BasicTable @register="registerTable">
+      <template #tableTitle>
+        <a-checkbox v-model:checked="groupByMachine" @change="onGroupByMachineChange">按机台统计</a-checkbox>
+        <a-button
+          style="margin-left: 8px"
+          type="primary"
+          v-auth="'xslmes:mes_xsl_manual_small_material_demand_plan:exportXls'"
+          preIcon="ant-design:export-outlined"
+          @click="onExportXls"
+        >
+          导出
+        </a-button>
+        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
+      </template>
+    </BasicTable>
+  </div>
+</template>
+
+<script lang="ts" name="xslmes-mesXslManualSmallMaterialDemandPlan" setup>
+  import { onMounted, reactive, ref } from 'vue';
+  import { BasicTable } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import {
+    baseColumns,
+    machineColumns,
+    searchFormSchema,
+    superQuerySchema,
+  } from './MesXslManualSmallMaterialDemandPlan.data';
+  import { list, getExportUrl } from './MesXslManualSmallMaterialDemandPlan.api';
+
+  const queryParam = reactive<any>({ groupByMachine: 0 });
+  const groupByMachine = ref(false);
+
+  const { tableContext, onExportXls } = useListPage({
+    tableProps: {
+      title: '人工小料需求计划',
+      api: list,
+      columns: baseColumns,
+      canResize: true,
+      formConfig: {
+        schemas: searchFormSchema,
+        autoSubmitOnEnter: true,
+        showAdvancedButton: true,
+      },
+      beforeFetch: (params) => {
+        return Object.assign(params, queryParam, {
+          groupByMachine: groupByMachine.value ? 1 : 0,
+        });
+      },
+    },
+    exportConfig: {
+      name: '人工小料需求计划',
+      url: getExportUrl,
+      params: queryParam,
+    },
+  });
+
+  const [registerTable, { reload, setColumns }] = tableContext;
+  const superQueryConfig = reactive(superQuerySchema);
+
+  onMounted(() => {
+    applyColumns();
+  });
+
+  function applyColumns() {
+    setColumns(groupByMachine.value ? machineColumns : baseColumns);
+  }
+
+  function onGroupByMachineChange() {
+    queryParam.groupByMachine = groupByMachine.value ? 1 : 0;
+    applyColumns();
+    reload();
+  }
+
+  function handleSuperQuery(params) {
+    Object.keys(params).forEach((k) => {
+      queryParam[k] = params[k];
+    });
+    reload();
+  }
+</script>

jeecgboot-vue3/src/views/xslmes/mesXslManualSmallMaterialPlanMaintain/MesXslManualSmallMaterialPlanMaintain.api.ts

@@ -0,0 +1,9 @@
+import { defHttp } from '/@/utils/http/axios';
+
+enum Api {
+  list = '/xslmes/mesXslManualSmallMaterialPlanMaintain/list',
+  saveAll = '/xslmes/mesXslManualSmallMaterialPlanMaintain/saveAll',
+}
+
+export const list = (params) => defHttp.get({ url: Api.list, params });
+export const saveAll = (params) => defHttp.post({ url: Api.saveAll, params });

jeecgboot-vue3/src/views/xslmes/mesXslManualSmallMaterialPlanMaintain/MesXslManualSmallMaterialPlanMaintainList.vue

@@ -0,0 +1,198 @@
+<template>
+  <div class="small-plan-page">
+    <div class="small-plan-toolbar">
+      <a-button type="primary" preIcon="ant-design:save-outlined" :loading="saving" @click="handleSaveAll">保存</a-button>
+    </div>
+
+    <a-table :columns="columns" :data-source="rows" :pagination="false" :scroll="{ x: 1220 }" row-key="_rowKey" size="small" bordered>
+      <template #bodyCell="{ column, record, index }">
+        <template v-if="column.dataIndex === 'formulaName'">
+          <a-input :value="record.formulaName" @change="(e) => updateCell(index, 'formulaName', e?.target?.value)" />
+        </template>
+
+        <template
+          v-else-if="
+            column.dataIndex === 'morningSeqNo' ||
+            column.dataIndex === 'noonSeqNo' ||
+            column.dataIndex === 'nightSeqNo' ||
+            column.dataIndex === 'morningPlanCount' ||
+            column.dataIndex === 'noonPlanCount' ||
+            column.dataIndex === 'nightPlanCount'
+          "
+        >
+          <a-input-number
+            :value="record[column.dataIndex]"
+            :min="0"
+            :precision="0"
+            :controls="false"
+            style="width: 100%"
+            @change="(v) => updateCell(index, column.dataIndex as string, v)"
+          />
+        </template>
+
+        <template
+          v-else-if="
+            column.dataIndex === 'morningRemark' || column.dataIndex === 'noonRemark' || column.dataIndex === 'nightRemark'
+          "
+        >
+          <a-input :value="record[column.dataIndex]" @change="(e) => updateCell(index, column.dataIndex as string, e?.target?.value)" />
+        </template>
+
+        <template v-else-if="column.key === 'action'">
+          <a-button type="text" size="small" class="insert-plus-btn" title="新增" @click="insertBelow(index)">+</a-button>
+          <a-button type="link" size="small" danger @click="removeRow(index)">删</a-button>
+        </template>
+      </template>
+    </a-table>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { computed, ref } from 'vue';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { buildUUID } from '/@/utils/uuid';
+  import { list, saveAll } from './MesXslManualSmallMaterialPlanMaintain.api';
+
+  const { createMessage } = useMessage();
+  const saving = ref(false);
+  const rows = ref<Recordable[]>([]);
+
+  const columns = computed(() => [
+    { title: '操作', key: 'action', width: 96, fixed: 'left', align: 'center' },
+    { title: '配方名称', dataIndex: 'formulaName', width: 220, fixed: 'left', align: 'center' },
+    {
+      title: '早班',
+      align: 'center',
+      children: [
+        { title: '序号', dataIndex: 'morningSeqNo', width: 90, align: 'center' },
+        { title: '计划', dataIndex: 'morningPlanCount', width: 90, align: 'center' },
+        { title: '备注', dataIndex: 'morningRemark', width: 160, align: 'center' },
+      ],
+    },
+    {
+      title: '中班',
+      align: 'center',
+      children: [
+        { title: '序号', dataIndex: 'noonSeqNo', width: 90, align: 'center' },
+        { title: '计划', dataIndex: 'noonPlanCount', width: 90, align: 'center' },
+        { title: '备注', dataIndex: 'noonRemark', width: 160, align: 'center' },
+      ],
+    },
+    {
+      title: '夜班',
+      align: 'center',
+      children: [
+        { title: '序号', dataIndex: 'nightSeqNo', width: 90, align: 'center' },
+        { title: '计划', dataIndex: 'nightPlanCount', width: 90, align: 'center' },
+        { title: '备注', dataIndex: 'nightRemark', width: 160, align: 'center' },
+      ],
+    },
+  ]);
+
+  function createEmptyRow(): Recordable {
+    return {
+      _rowKey: buildUUID(),
+      id: '',
+      formulaName: '',
+      morningSeqNo: null,
+      morningPlanCount: null,
+      morningRemark: '',
+      noonSeqNo: null,
+      noonPlanCount: null,
+      noonRemark: '',
+      nightSeqNo: null,
+      nightPlanCount: null,
+      nightRemark: '',
+    };
+  }
+
+  function createBlankRows(count = 12) {
+    return Array.from({ length: count }, () => createEmptyRow());
+  }
+
+  function updateCell(index: number, field: string, value: any) {
+    const row = rows.value[index];
+    if (!row) return;
+    row[field] = value;
+  }
+
+  function insertBelow(index: number) {
+    rows.value.splice(index + 1, 0, createEmptyRow());
+  }
+
+  function removeRow(index: number) {
+    rows.value.splice(index, 1);
+    if (!rows.value.length) {
+      rows.value = createBlankRows();
+    }
+  }
+
+  async function loadRows() {
+    const res = await list({ pageNo: 1, pageSize: 500 });
+    const records = (res?.records || res?.result?.records || []) as Recordable[];
+    rows.value = (records || []).map((item) => ({ ...createEmptyRow(), ...item, _rowKey: item.id || buildUUID() }));
+    if (!rows.value.length) {
+      rows.value = createBlankRows();
+    }
+  }
+
+  async function handleSaveAll() {
+    saving.value = true;
+    try {
+      const payload = rows.value.map((r) => {
+        const { _rowKey, ...rest } = r;
+        return rest;
+      });
+      await saveAll({ rows: payload });
+      createMessage.success('保存成功');
+      await loadRows();
+    } finally {
+      saving.value = false;
+    }
+  }
+
+  loadRows();
+</script>
+
+<style scoped>
+  .small-plan-page {
+    padding: 8px;
+    background: #fff;
+  }
+
+  .small-plan-toolbar {
+    margin-bottom: 12px;
+    display: flex;
+    gap: 8px;
+  }
+
+  :deep(.ant-table-thead > tr > th) {
+    text-align: center !important;
+    padding: 4px 6px !important;
+    font-size: 12px;
+  }
+
+  :deep(.ant-table-tbody > tr > td) {
+    padding: 2px 3px !important;
+  }
+
+  :deep(.ant-input),
+  :deep(.ant-input-number),
+  :deep(.ant-input-number-input) {
+    font-size: 12px;
+  }
+
+  :deep(.ant-input),
+  :deep(.ant-input-number) {
+    width: 100%;
+    min-width: 0;
+  }
+
+  .insert-plus-btn {
+    color: #52c41a;
+    font-size: 18px;
+    font-weight: 700;
+    line-height: 1;
+    padding: 0 4px;
+  }
+</style>

jeecgboot-vue3/src/views/xslmes/mesXslMixerAction/MesXslMixerAction.api.ts

@@ -14,10 +14,10 @@ enum Api {
 
 export const list = (params) => defHttp.get({ url: Api.list, params });
 
-export const checkActionName = (params: { actionName: string; dataId?: string }) =>
+export const checkActionName = (params: { equipmentId?: string; actionName: string; dataId?: string }) =>
   defHttp.get({ url: Api.checkActionName, params }, { successMessageMode: 'none', errorMessageMode: 'none' });
 
-export const checkActionCode = (params: { actionCode: string; dataId?: string }) =>
+export const checkActionCode = (params: { equipmentId?: string; actionCode: string; dataId?: string }) =>
   defHttp.get({ url: Api.checkActionCode, params }, { successMessageMode: 'none', errorMessageMode: 'none' });
 
 export const deleteOne = (params, handleSuccess) =>

jeecgboot-vue3/src/views/xslmes/mesXslMixerAction/MesXslMixerAction.data.ts

@@ -2,9 +2,11 @@ import { BasicColumn, FormSchema } from '/@/components/Table';
 import { checkActionCode, checkActionName } from './MesXslMixerAction.api';
 
 export const columns: BasicColumn[] = [
-  { title: '设备名称', align: 'center', dataIndex: 'equipmentId_dictText', width: 180 },
+  { title: '设备名称', align: 'center', dataIndex: 'equipmentName', width: 180 },
+  { title: '机台编号', align: 'center', dataIndex: 'equipId', width: 110 },
+  { title: '机台类型', align: 'center', dataIndex: 'equipType', width: 110 },
   { title: '动作名称', align: 'center', dataIndex: 'actionName', width: 180 },
-  { title: '动作代号', align: 'center', dataIndex: 'actionCode', width: 160 },
+  { title: '动作代号', align: 'center', dataIndex: 'actionCode', width: 120 },
   { title: '创建时间', align: 'center', dataIndex: 'createTime', width: 170 },
 ];
 
@@ -16,6 +18,7 @@ export const searchFormSchema: FormSchema[] = [
     componentProps: { dictCode: 'mes_xsl_equipment_ledger,equipment_name,id' },
     colProps: { span: 6 },
   },
+  { label: '机台编号', field: 'equipId', component: 'Input', colProps: { span: 6 } },
   { label: '动作名称', field: 'actionName', component: 'Input', colProps: { span: 6 } },
   { label: '动作代号', field: 'actionCode', component: 'Input', colProps: { span: 6 } },
 ];
@@ -29,6 +32,21 @@ export const formSchema: FormSchema[] = [
     required: true,
     componentProps: { dictCode: 'mes_xsl_equipment_ledger,equipment_name,id', placeholder: '请选择设备台账中的设备' },
   },
+  // 采集冗余字段：仅采集数据有值，只读展示
+  {
+    label: '机台编号',
+    field: 'equipId',
+    component: 'Input',
+    componentProps: { disabled: true },
+    ifShow: ({ values }) => !!values.equipId,
+  },
+  {
+    label: '机台类型',
+    field: 'equipType',
+    component: 'Input',
+    componentProps: { disabled: true },
+    ifShow: ({ values }) => !!values.equipType,
+  },
   {
     label: '动作名称',
     field: 'actionName',
@@ -41,10 +59,10 @@ export const formSchema: FormSchema[] = [
           const v = value == null ? '' : String(value).trim();
           if (!v) return Promise.resolve();
           try {
-            await checkActionName({ actionName: v, dataId: model?.id });
+            await checkActionName({ equipmentId: model?.equipmentId, actionName: v, dataId: model?.id });
             return Promise.resolve();
           } catch (e: any) {
-            return Promise.reject(e?.response?.data?.message || e?.message || '动作名称不能重复');
+            return Promise.reject(e?.response?.data?.message || e?.message || '同一设备下动作名称不能重复');
           }
         },
         trigger: 'blur',
@@ -63,10 +81,10 @@ export const formSchema: FormSchema[] = [
           const v = value == null ? '' : String(value).trim();
           if (!v) return Promise.resolve();
           try {
-            await checkActionCode({ actionCode: v, dataId: model?.id });
+            await checkActionCode({ equipmentId: model?.equipmentId, actionCode: v, dataId: model?.id });
             return Promise.resolve();
           } catch (e: any) {
-            return Promise.reject(e?.response?.data?.message || e?.message || '动作代号不能重复');
+            return Promise.reject(e?.response?.data?.message || e?.message || '同一设备下动作代号不能重复');
           }
         },
         trigger: 'blur',

jeecgboot-vue3/src/views/xslmes/mesXslMixingProductionPlan/MesXslMixingProductionPlanList.vue

@@ -1,18 +1,20 @@
 <template>
   <div class="mixing-plan-page">
     <div class="mixing-plan-toolbar">
+      <a-date-picker
+        v-model:value="queryPlanDate"
+        value-format="YYYY-MM-DD"
+        format="YYYY-MM-DD"
+        placeholder="选择计划日期"
+        style="width: 160px"
+        :disabled="saving || refreshing"
+      />
+      <a-button preIcon="ant-design:search-outlined" :loading="querying" :disabled="saving" @click="handleQuery">查询</a-button>
       <a-button type="primary" preIcon="ant-design:save-outlined" :loading="saving" @click="handleSaveAll">保存</a-button>
+      <a-button preIcon="ant-design:reload-outlined" :loading="refreshing" :disabled="saving" @click="handleRefresh">刷新</a-button>
     </div>
 
-    <a-table
-      :columns="columns"
-      :data-source="rows"
-      :pagination="false"
-      :scroll="{ x: 1560 }"
-      row-key="_rowKey"
-      size="small"
-      bordered
-    >
+    <a-table :columns="columns" :data-source="rows" :pagination="false" :scroll="{ x: 1560 }" row-key="_rowKey" size="small" bordered>
       <template #bodyCell="{ column, record, index }">
         <template v-if="column.dataIndex === 'machineName'">
           <a-input
@@ -98,10 +100,15 @@
   import MesXslMixingPlanOrderSelectModal from './components/MesXslMixingPlanOrderSelectModal.vue';
   import { list, saveAll } from './MesXslMixingProductionPlan.api';
 
+  type ShiftKey = 'morning' | 'noon' | 'night';
+
   const { createMessage } = useMessage();
   const saving = ref(false);
+  const refreshing = ref(false);
+  const querying = ref(false);
+  const queryPlanDate = ref<string>('');
   const rows = ref<Recordable[]>([]);
-  const pickerContext = ref<{ rowIndex: number; shift?: 'morning' | 'noon' | 'night' } | null>(null);
+  const pickerContext = ref<{ rowIndex: number; shift?: ShiftKey } | null>(null);
 
   const [registerEquipmentModal, { openModal: openEquipmentModal }] = useModal();
   const [registerOrderModal, { openModal: openOrderModal }] = useModal();
@@ -145,11 +152,14 @@
   function createEmptyRow(): Recordable {
     return {
       _rowKey: buildUUID(),
-      id: '',
+      planDate: queryPlanDate.value || '',
       machineId: '',
       machineName: '',
+      morningId: '',
+      morningShiftFlag: 1,
       morningPlanId: '',
       morningPlanType: '',
+      morningSourceOrderId: '',
       morningOrderNo: '',
       morningOrderDate: '',
       morningFormulaName: '',
@@ -159,8 +169,11 @@
       morningFinishedCarCount: null,
       morningPlanCount: null,
       morningRemark: '',
+      noonId: '',
+      noonShiftFlag: 2,
       noonPlanId: '',
       noonPlanType: '',
+      noonSourceOrderId: '',
       noonOrderNo: '',
       noonOrderDate: '',
       noonFormulaName: '',
@@ -170,8 +183,11 @@
       noonFinishedCarCount: null,
       noonPlanCount: null,
       noonRemark: '',
+      nightId: '',
+      nightShiftFlag: 3,
       nightPlanId: '',
       nightPlanType: '',
+      nightSourceOrderId: '',
       nightOrderNo: '',
       nightOrderDate: '',
       nightFormulaName: '',
@@ -184,7 +200,7 @@
     };
   }
 
-  function shiftByOrderField(field: string): 'morning' | 'noon' | 'night' {
+  function shiftByOrderField(field: string): ShiftKey {
     if (field.startsWith('morning')) return 'morning';
     if (field.startsWith('noon')) return 'noon';
     return 'night';
@@ -227,9 +243,13 @@
     pickerContext.value = null;
   }
 
-  function openOrderPicker(rowIndex: number, shift: 'morning' | 'noon' | 'night') {
-    pickerContext.value = { rowIndex, shift };
+  function openOrderPicker(rowIndex: number, shift: ShiftKey) {
     const row = rows.value[rowIndex];
+    if (!row?.machineId && !row?.machineName) {
+      createMessage.warning('请先选择机台信息');
+      return;
+    }
+    pickerContext.value = { rowIndex, shift };
     openOrderModal(true, {
       planId: row?.[`${shift}PlanId`] || '',
       machineId: row?.machineId || '',
@@ -252,24 +272,146 @@
     row[`${shift}PlannedCarCount`] = payload?.plannedCarCount ?? null;
     row[`${shift}ScheduledCarCount`] = payload?.scheduledCarCount ?? null;
     row[`${shift}FinishedCarCount`] = payload?.finishedCarCount ?? null;
+    row[`${shift}PlanCount`] = calcPlanCount(payload?.plannedCarCount, payload?.finishedCarCount);
     pickerContext.value = null;
   }
 
+  function calcPlanCount(plannedCarCount?: number | null, finishedCarCount?: number | null) {
+    const planned = Number(plannedCarCount ?? 0);
+    const finished = Number(finishedCarCount ?? 0);
+    const remain = planned - finished;
+    if (!Number.isFinite(remain)) {
+      return null;
+    }
+    return Math.max(0, remain);
+  }
+
+  function applyShiftRecord(row: Recordable, shift: ShiftKey, record: Recordable) {
+    if (!record) return;
+    row[`${shift}Id`] = record.id || '';
+    row[`${shift}ShiftFlag`] = record.shiftFlag ?? (shift === 'morning' ? 1 : shift === 'noon' ? 2 : 3);
+    row[`${shift}PlanId`] = record.planId || '';
+    row[`${shift}PlanType`] = record.planType || '';
+    row[`${shift}SourceOrderId`] = record.sourceOrderId || '';
+    row[`${shift}OrderNo`] = record.orderNo || '';
+    row[`${shift}OrderDate`] = record.orderDate || '';
+    row[`${shift}FormulaName`] = record.formulaName || '';
+    row[`${shift}PlanWeight`] = record.planWeight ?? null;
+    row[`${shift}PlannedCarCount`] = record.plannedCarCount ?? null;
+    row[`${shift}ScheduledCarCount`] = record.scheduledCarCount ?? null;
+    row[`${shift}FinishedCarCount`] = record.finishedCarCount ?? null;
+    row[`${shift}PlanCount`] = record.planCount ?? null;
+    row[`${shift}Remark`] = record.remark || '';
+  }
+
+  function convertSharedRecordsToDisplayRows(records: Recordable[]) {
+    const groupMap = new Map<string, { machineId: string; machineName: string; planDate: string; morning: Recordable[]; noon: Recordable[]; night: Recordable[] }>();
+    (records || []).forEach((rec) => {
+      const machineId = rec.machineId || '';
+      const machineName = rec.machineName || '';
+      const planDate = rec.planDate || '';
+      const key = `${planDate}__${machineId}__${machineName}`;
+      if (!groupMap.has(key)) {
+        groupMap.set(key, {
+          machineId,
+          machineName,
+          planDate,
+          morning: [],
+          noon: [],
+          night: [],
+        });
+      }
+      const group = groupMap.get(key)!;
+      const flag = Number(rec.shiftFlag);
+      if (flag === 1) group.morning.push(rec);
+      else if (flag === 2) group.noon.push(rec);
+      else group.night.push(rec);
+    });
+
+    const result: Recordable[] = [];
+    Array.from(groupMap.values()).forEach((group) => {
+      const maxLen = Math.max(group.morning.length, group.noon.length, group.night.length);
+      for (let i = 0; i < maxLen; i++) {
+        const row = createEmptyRow();
+        row._rowKey = buildUUID();
+        row.planDate = group.planDate;
+        row.machineId = group.machineId;
+        row.machineName = group.machineName;
+        applyShiftRecord(row, 'morning', group.morning[i]);
+        applyShiftRecord(row, 'noon', group.noon[i]);
+        applyShiftRecord(row, 'night', group.night[i]);
+        result.push(row);
+      }
+    });
+    return result;
+  }
+
+  function hasShiftData(row: Recordable, shift: ShiftKey) {
+    return !!(
+      row?.[`${shift}PlanId`] ||
+      row?.[`${shift}OrderNo`] ||
+      row?.[`${shift}FormulaName`] ||
+      row?.[`${shift}PlanCount`] != null ||
+      row?.[`${shift}Remark`]
+    );
+  }
+
+  function buildSharedShiftRecord(row: Recordable, shift: ShiftKey): Recordable | null {
+    if (!hasShiftData(row, shift) || (!row?.machineId && !row?.machineName)) {
+      return null;
+    }
+    const shiftFlag = shift === 'morning' ? 1 : shift === 'noon' ? 2 : 3;
+    return {
+      id: row?.[`${shift}Id`] || '',
+      planDate: row?.planDate || queryPlanDate.value || '',
+      machineId: row?.machineId || '',
+      machineName: row?.machineName || '',
+      shiftFlag,
+      planId: row?.[`${shift}PlanId`] || '',
+      planType: row?.[`${shift}PlanType`] || '',
+      sourceOrderId: row?.[`${shift}SourceOrderId`] || '',
+      orderNo: row?.[`${shift}OrderNo`] || '',
+      orderDate: row?.[`${shift}OrderDate`] || '',
+      formulaName: row?.[`${shift}FormulaName`] || '',
+      planWeight: row?.[`${shift}PlanWeight`] ?? null,
+      plannedCarCount: row?.[`${shift}PlannedCarCount`] ?? null,
+      scheduledCarCount: row?.[`${shift}ScheduledCarCount`] ?? null,
+      finishedCarCount: row?.[`${shift}FinishedCarCount`] ?? null,
+      planCount: row?.[`${shift}PlanCount`] ?? null,
+      remark: row?.[`${shift}Remark`] || '',
+    };
+  }
+
   async function loadRows() {
-    const res = await list({ pageNo: 1, pageSize: 500 });
+    const res = await list({
+      pageNo: 1,
+      pageSize: 500,
+      planDate: queryPlanDate.value || undefined,
+    });
     const records = (res?.records || res?.result?.records || []) as Recordable[];
-    rows.value = (records || []).map((item) => ({ ...createEmptyRow(), ...item, _rowKey: item.id || buildUUID() }));
+    rows.value = convertSharedRecordsToDisplayRows(records);
+    const minRows = 20;
     if (!rows.value.length) {
-      rows.value = createBlankRows();
+      rows.value = createBlankRows(minRows);
+      return;
+    }
+    if (rows.value.length < minRows) {
+      rows.value.push(...createBlankRows(minRows - rows.value.length));
     }
   }
 
   async function handleSaveAll() {
     saving.value = true;
     try {
-      const payload = rows.value.map((r) => {
-        const { _rowKey, ...rest } = r;
-        return rest;
+      const payload = rows.value.flatMap((row) => {
+        const list: Recordable[] = [];
+        const morning = buildSharedShiftRecord(row, 'morning');
+        const noon = buildSharedShiftRecord(row, 'noon');
+        const night = buildSharedShiftRecord(row, 'night');
+        if (morning) list.push(morning);
+        if (noon) list.push(noon);
+        if (night) list.push(night);
+        return list;
       });
       await saveAll({ rows: payload });
       createMessage.success('保存成功');
@@ -279,6 +421,25 @@
     }
   }
 
+  async function handleRefresh() {
+    refreshing.value = true;
+    try {
+      await loadRows();
+      createMessage.success('已刷新最新数据');
+    } finally {
+      refreshing.value = false;
+    }
+  }
+
+  async function handleQuery() {
+    querying.value = true;
+    try {
+      await loadRows();
+    } finally {
+      querying.value = false;
+    }
+  }
+
   loadRows();
 </script>
 

jeecgboot-vue3/src/views/xslmes/mesXslProductionOrder/MesXslProductionOrder.data.ts

@@ -51,7 +51,12 @@ export const formSchema: FormSchema[] = [
   },
   { label: '生产车间', field: 'productionWorkshop', component: 'Input' },
   { label: '加工段数', field: 'processSegmentCount', component: 'InputNumber', componentProps: { min: 0, precision: 0 } },
-  { label: '物料编号', field: 'materialCode', component: 'Input' },
+  {
+    label: '物料编号',
+    field: 'materialCode',
+    component: 'Input',
+    slot: 'materialCodeSlot',
+  },
   { label: 'MES胶料名称', field: 'mesMaterialName', component: 'Input' },
   { label: '金蝶物料名称', field: 'kingdeeMaterialName', component: 'Input' },
   { label: '金蝶物料规格', field: 'kingdeeMaterialSpec', component: 'Input' },

jeecgboot-vue3/src/views/xslmes/mesXslProductionOrder/modules/MesXslProductionOrderModal.vue

@@ -1,19 +1,32 @@
 <template>
   <BasicModal v-bind="$attrs" @register="registerModal" :title="title" width="860px" @ok="handleSubmit">
-    <BasicForm @register="registerForm" />
+    <BasicForm @register="registerForm">
+      <template #materialCodeSlot="{ model }">
+        <a-input
+          :value="model.materialCode"
+          readonly
+          placeholder="点击选择胶料"
+          @click="openMaterialPicker"
+        />
+      </template>
+    </BasicForm>
   </BasicModal>
+  <MesMaterialSelectModal @register="registerMaterialModal" @select="onMaterialSelected" />
 </template>
 
 <script lang="ts" setup>
   import { computed, ref, unref } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicForm, useForm } from '/@/components/Form/index';
+  import { useModal } from '/@/components/Modal';
   import { formSchema } from '../MesXslProductionOrder.data';
   import { saveOrUpdate } from '../MesXslProductionOrder.api';
+  import MesMaterialSelectModal from '/@/views/mes/material/modules/MesMaterialSelectModal.vue';
 
   const emit = defineEmits(['register', 'success']);
   const isUpdate = ref(true);
   const isDetail = ref(false);
+  const [registerMaterialModal, { openModal: openMaterialModal }] = useModal();
 
   const [registerForm, { resetFields, setFieldsValue, validate, setProps }] = useForm({
     labelWidth: 110,
@@ -50,4 +63,22 @@
       setModalProps({ confirmLoading: false });
     }
   }
+
+  function openMaterialPicker() {
+    if (isDetail.value) {
+      return;
+    }
+    openMaterialModal(true, {
+      materialId: '',
+      excludeProductionFB1: true,
+    });
+  }
+
+  async function onMaterialSelected(payload: Recordable) {
+    const materialName = payload?.materialName || payload?.material_name || '';
+    await setFieldsValue({
+      materialCode: materialName,
+      mesMaterialName: materialName,
+    });
+  }
 </script>

jeecgboot-vue3/src/views/xslmes/mesXslRubberQuickTestStd/components/MesXslRubberQuickTestStdMixerPsSelectModal.vue

@@ -18,6 +18,8 @@
 
   /** 密炼PS类型：原材料检验标准 */
   const PS_TYPE_RAW_INSPECT_STD = 'raw_inspect_std';
+  /** 密炼PS状态：编制 */
+  const COMPILE_STATUS = 'compile';
 
   const selectSearchSchema: FormSchema[] = [
     { label: 'PS编码', field: 'psCode', component: 'JInput', colProps: { span: 8 } },
@@ -42,6 +44,7 @@
     beforeFetch: (params) => ({
       ...params,
       psType: PS_TYPE_RAW_INSPECT_STD,
+      status: COMPILE_STATUS,
     }),
     rowSelection: {
       type: 'radio',
@@ -85,7 +88,11 @@
       }
     }
     if (!row?.id) {
-      createMessage.warning('请选择一条密炼PS');
+      createMessage.warning('请选择一条编制状态的密炼PS');
+      return;
+    }
+    if (row.status && row.status !== COMPILE_STATUS) {
+      createMessage.warning('仅可选择编制状态的密炼PS');
       return;
     }
     if (row.psType && row.psType !== PS_TYPE_RAW_INSPECT_STD) {