Merge remote-tracking branch 'origin/生产及设备基础资料'

.gitignore

@@ -1,10 +1,20 @@
 ## ide
 **/.idea
+**/.project
+**/.classpath
+**/.factorypath
+**/.settings/
 *.iml
 rebel.xml
+.project
+.classpath
+.settings/
+.factorypath
+**/.settings/
 
 ## backend
 **/target
+**/bin/
 **/logs
 
 ## front

.vscode/launch.json

@@ -1,12 +1,14 @@
 {
-    "configurations": [
-        {
-            "type": "java",
-            "name": "JeecgSystemApplication",
-            "request": "launch",
-            "mainClass": "org.jeecg.JeecgSystemApplication",
-            "projectName": "jeecg-system-start",
-            "preLaunchTask": "JeecgBoot: compile"
-        }
-    ]
-}
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "java",
+      "name": "JeecgSystemApplication (单体)",
+      "request": "launch",
+      "mainClass": "org.jeecg.JeecgSystemApplication",
+      "projectName": "jeecg-system-start",
+      "cwd": "${workspaceFolder}/jeecg-boot/jeecg-module-system/jeecg-system-start",
+      "vmArgs": "-Dfile.encoding=UTF-8 -Dspring.main.banner-mode=log -Dspring.banner.charset=UTF-8 -Dlogging.charset.console=GBK"
+    }
+  ]
+}

.vscode/settings.json

@@ -11,5 +11,28 @@
       "path": "C:\\Program Files\\Java\\jdk-17",
       "default": true
     }
-  ]
+  ],
+  "java.import.exclusions": [
+    "**/jeecg-server-cloud/**",
+    "**/jeecg-boot-platform/**",
+    "**/node_modules/**",
+    "**/.metadata/**",
+    "**/archetype-resources/**",
+    "**/META-INF/maven/**"
+  ],
+  "java.project.resourceFilters": [
+    "node_modules",
+    ".git",
+    "jeecg-server-cloud",
+    "jeecg-boot-platform"
+  ],
+  "java.debug.settings.console": "integratedTerminal",
+  "java.debug.settings.vmArgs": "-Dfile.encoding=UTF-8 -Dspring.main.banner-mode=log -Dspring.banner.charset=UTF-8 -Dlogging.charset.console=GBK",
+  "terminal.integrated.defaultProfile.windows": "PowerShell",
+  "terminal.integrated.profiles.windows": {
+    "PowerShell": {
+      "source": "PowerShell",
+      "args": ["-NoExit", "-Command", "chcp 936 | Out-Null"]
+    }
+  }
 }

jeecg-boot/.gitignore

@@ -2,6 +2,12 @@
 **/.idea
 *.iml
 rebel.xml
+# VS Code/Cursor Java 扩展（Eclipse JDT）导入 Maven 时自动生成，勿提交
+.project
+.classpath
+.settings/
+.factorypath
+**/.settings/
 
 ## backend
 **/target

jeecg-boot/.vscode/launch.json

@@ -0,0 +1,14 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "java",
+      "name": "JeecgSystemApplication (单体)",
+      "request": "launch",
+      "mainClass": "org.jeecg.JeecgSystemApplication",
+      "projectName": "jeecg-system-start",
+      "cwd": "${workspaceFolder}/jeecg-module-system/jeecg-system-start",
+      "vmArgs": "-Dspring.main.banner-mode=log -Dspring.banner.charset=UTF-8 -Dlogging.charset.console=GBK"
+    }
+  ]
+}

jeecg-boot/.vscode/settings.json

@@ -0,0 +1,31 @@
+{
+  "java.compile.nullAnalysis.mode": "automatic",
+  "java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx4G -Xms100m -Xlog:disable",
+  "java.import.maven.enabled": true,
+  "java.configuration.updateBuildConfiguration": "automatic",
+  "java.autobuild.enabled": true,
+  "java.jdt.ls.java.home": "C:\\Program Files\\Java\\jdk-17",
+  "java.configuration.runtimes": [
+    {
+      "name": "JavaSE-17",
+      "path": "C:\\Program Files\\Java\\jdk-17",
+      "default": true
+    }
+  ],
+  "java.import.exclusions": [
+    "**/jeecg-server-cloud/**",
+    "**/jeecg-boot-platform/**",
+    "**/node_modules/**",
+    "**/.metadata/**",
+    "**/archetype-resources/**",
+    "**/META-INF/maven/**"
+  ],
+  "java.project.resourceFilters": [
+    "node_modules",
+    ".git",
+    "jeecg-server-cloud",
+    "jeecg-boot-platform"
+  ],
+  "java.debug.settings.console": "integratedTerminal",
+  "java.debug.settings.vmArgs": "-Dspring.main.banner-mode=log -Dspring.banner.charset=UTF-8 -Dlogging.charset.console=GBK"
+}

jeecg-boot/db/mes-material-menu.sql

@@ -11,9 +11,9 @@ menu_type=VALUES(menu_type), perms=VALUES(perms), perms_type=VALUES(perms_type),
 is_route=VALUES(is_route), is_leaf=VALUES(is_leaf), hidden=VALUES(hidden), status=VALUES(status), del_flag=VALUES(del_flag),
 always_show=VALUES(always_show), keep_alive=VALUES(keep_alive), internal_or_external=VALUES(internal_or_external);
 
--- 二级菜单：物料信息
+-- 二级菜单：胶料信息
 INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, menu_type, perms, perms_type, sort_no, is_route, is_leaf, hidden, status, del_flag, keep_alive, internal_or_external, create_by, create_time)
-VALUES ('1860000000000000011', '1860000000000000001', '物料信息', '/mes/materialinfo', 'mes/materialinfo/index', 'MesMaterialList', 1, NULL, '1', 1, 1, 1, 0, '1', 0, 1, 0, 'admin', NOW())
+VALUES ('1860000000000000011', '1860000000000000001', '胶料信息', '/mes/materialinfo', 'mes/materialinfo/index', 'MesMaterialList', 1, NULL, '1', 1, 1, 1, 0, '1', 0, 1, 0, 'admin', NOW())
 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), perms=VALUES(perms), perms_type=VALUES(perms_type), sort_no=VALUES(sort_no),

jeecg-boot/db/mes-xsl-day-tank-material-map-menu.sql

@@ -0,0 +1,92 @@
+-- 日罐物料对应信息菜单与权限（挂到「MES密炼工程」目录）
+SET NAMES utf8mb4;
+
+SET @mixer_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 @mixer_parent_id = IFNULL(@mixer_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 @mixer_parent_id = IFNULL(@mixer_parent_id, '1860000000000000001');
+
+INSERT INTO sys_permission(
+  id, parent_id, name, url, component, component_name, menu_type, perms, perms_type, sort_no,
+  is_route, is_leaf, hidden, status, del_flag, keep_alive, internal_or_external, create_by, create_time
+)
+VALUES (
+  '1860000000000099311', @mixer_parent_id, '日罐物料对应信息',
+  '/mes/daytankmaterialmapinfo',
+  'mes/daytankmaterialmapinfo/index',
+  'MesXslDayTankMaterialMapList', 1, NULL, '1', 31,
+  1, 1, 0, '1', 0, 1, 0, 'admin', NOW()
+)
+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),
+  perms = VALUES(perms),
+  perms_type = VALUES(perms_type),
+  sort_no = VALUES(sort_no),
+  is_route = VALUES(is_route),
+  is_leaf = VALUES(is_leaf),
+  hidden = VALUES(hidden),
+  status = VALUES(status),
+  del_flag = VALUES(del_flag),
+  keep_alive = VALUES(keep_alive),
+  internal_or_external = VALUES(internal_or_external);
+
+INSERT INTO sys_permission(id, parent_id, name, menu_type, perms, perms_type, status, del_flag, create_by, create_time) VALUES
+('1860000000000099312', '1860000000000099311', '新增', 2, 'xslmes:mes_xsl_day_tank_material_map:add', '1', '1', 0, 'admin', NOW()),
+('1860000000000099313', '1860000000000099311', '编辑', 2, 'xslmes:mes_xsl_day_tank_material_map:edit', '1', '1', 0, 'admin', NOW()),
+('1860000000000099314', '1860000000000099311', '删除', 2, 'xslmes:mes_xsl_day_tank_material_map:delete', '1', '1', 0, 'admin', NOW()),
+('1860000000000099315', '1860000000000099311', '批量删除', 2, 'xslmes:mes_xsl_day_tank_material_map:deleteBatch', '1', '1', 0, 'admin', NOW()),
+('1860000000000099316', '1860000000000099311', '导出', 2, 'xslmes:mes_xsl_day_tank_material_map:exportXls', '1', '1', 0, 'admin', NOW())
+ON DUPLICATE KEY UPDATE
+  parent_id = VALUES(parent_id),
+  name = VALUES(name),
+  menu_type = VALUES(menu_type),
+  perms = VALUES(perms),
+  perms_type = VALUES(perms_type),
+  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 (
+  '1860000000000099311',
+  '1860000000000099312', '1860000000000099313', '1860000000000099314', '1860000000000099315', '1860000000000099316'
+)
+  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 = @mixer_parent_id,
+  url = '/mes/daytankmaterialmapinfo',
+  component = 'mes/daytankmaterialmapinfo/index',
+  component_name = 'MesXslDayTankMaterialMapList',
+  menu_type = 1,
+  is_route = 1,
+  is_leaf = 1,
+  hidden = 0,
+  status = '1',
+  del_flag = 0
+WHERE id = '1860000000000099311';

jeecg-boot/db/mes-xsl-downtime-main-type-menu-permission.sql

@@ -37,19 +37,22 @@ CREATE TABLE IF NOT EXISTS `mes_xsl_downtime_main_type` (
 
 SET @mes_tenant_id = 1002;
 
-SET @mes_base_pid = (
-  SELECT MIN(`id`) FROM `sys_permission`
-  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` IN ('MES基础资料', 'MES资料')
+SET @mes_equip_pid = (
+  SELECT `id` FROM `sys_permission`
+  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` = '设备管理'
+  LIMIT 1
 );
-SET @mes_base_pid = IFNULL(@mes_base_pid, '1860000000000000001');
+SET @mes_equip_pid = IFNULL(@mes_equip_pid, '1860000000000000133');
 
 INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `keep_alive`, `internal_or_external`, `create_by`, `create_time`)
-VALUES ('1860000000000000119', @mes_base_pid, '停机主类型', '/xslmes/mesXslDowntimeMainType', 'xslmes/mesXslDowntimeMainType/MesXslDowntimeMainTypeList', NULL, 1, NULL, '1', 18, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW())
+VALUES ('1860000000000000119', @mes_equip_pid, '停机主类型', '/xslmes/mesXslDowntimeMainType', 'xslmes/mesXslDowntimeMainType/MesXslDowntimeMainTypeList', NULL, 1, NULL, '1', 9, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW())
 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`), `perms` = VALUES(`perms`), `perms_type` = VALUES(`perms_type`), `sort_no` = VALUES(`sort_no`),
 `is_route` = VALUES(`is_route`), `is_leaf` = VALUES(`is_leaf`), `hidden` = VALUES(`hidden`), `status` = VALUES(`status`), `del_flag` = VALUES(`del_flag`),
-`keep_alive` = VALUES(`keep_alive`), `internal_or_external` = VALUES(`internal_or_external`);
+`keep_alive` = VALUES(`keep_alive`), `internal_or_external` = VALUES(`internal_or_external`), `icon` = 'ant-design:partition-outlined';
+
+UPDATE `sys_permission` SET `icon` = 'ant-design:partition-outlined' WHERE `id` = '1860000000000000119' AND `del_flag` = 0;
 
 INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `status`, `del_flag`, `create_by`, `create_time`) VALUES
 ('1860000000000000120', '1860000000000000119', '新增', 2, 'mes:mes_xsl_downtime_main_type:add', '1', '1', 0, 'admin', NOW()),

jeecg-boot/db/mes-xsl-downtime-type-menu-permission.sql

@@ -45,19 +45,22 @@ CREATE TABLE IF NOT EXISTS `mes_xsl_downtime_type` (
 
 SET @mes_tenant_id = 1002;
 
-SET @mes_base_pid = (
-  SELECT MIN(`id`) FROM `sys_permission`
-  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` IN ('MES基础资料', 'MES资料')
+SET @mes_equip_pid = (
+  SELECT `id` FROM `sys_permission`
+  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` = '设备管理'
+  LIMIT 1
 );
-SET @mes_base_pid = IFNULL(@mes_base_pid, '1860000000000000001');
+SET @mes_equip_pid = IFNULL(@mes_equip_pid, '1860000000000000133');
 
 INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `keep_alive`, `internal_or_external`, `create_by`, `create_time`)
-VALUES ('1860000000000000126', @mes_base_pid, '停机类型', '/xslmes/mesXslDowntimeType', 'xslmes/mesXslDowntimeType/MesXslDowntimeTypeList', NULL, 1, NULL, '1', 19, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW())
+VALUES ('1860000000000000126', @mes_equip_pid, '停机类型', '/xslmes/mesXslDowntimeType', 'xslmes/mesXslDowntimeType/MesXslDowntimeTypeList', NULL, 1, NULL, '1', 10, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW())
 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`), `perms` = VALUES(`perms`), `perms_type` = VALUES(`perms_type`), `sort_no` = VALUES(`sort_no`),
 `is_route` = VALUES(`is_route`), `is_leaf` = VALUES(`is_leaf`), `hidden` = VALUES(`hidden`), `status` = VALUES(`status`), `del_flag` = VALUES(`del_flag`),
-`keep_alive` = VALUES(`keep_alive`), `internal_or_external` = VALUES(`internal_or_external`);
+`keep_alive` = VALUES(`keep_alive`), `internal_or_external` = VALUES(`internal_or_external`), `icon` = 'ant-design:pause-circle-outlined';
+
+UPDATE `sys_permission` SET `icon` = 'ant-design:pause-circle-outlined' WHERE `id` = '1860000000000000126' AND `del_flag` = 0;
 
 INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `status`, `del_flag`, `create_by`, `create_time`) VALUES
 ('1860000000000000127', '1860000000000000126', '新增', 2, 'mes:mes_xsl_downtime_type:add', '1', '1', 0, 'admin', NOW()),

jeecg-boot/db/mes-xsl-equip-inspect-config-menu-permission.sql

@@ -0,0 +1,91 @@
+-- MES 设备点检配置（主子表）：建表 + 菜单 + 按钮 + 租户 admin 授权
+-- 权限前缀：mes:mes_xsl_equip_inspect_config:*
+-- 父菜单：设备管理；类型字典复用 xslmes_im_item_category（须先有点检及保养项目功能）
+-- Flyway：V3.9.2_78__mes_xsl_equip_inspect_config.sql
+SET NAMES utf8mb4;
+
+CREATE TABLE IF NOT EXISTS `mes_xsl_equip_inspect_config` (
+  `id` varchar(32) NOT NULL COMMENT '主键',
+  `equipment_ledger_id` varchar(32) NOT NULL COMMENT '设备台账主键 mes_xsl_equipment_ledger.id',
+  `equipment_name` varchar(500) DEFAULT NULL COMMENT '设备名称冗余',
+  `equipment_code` varchar(500) DEFAULT NULL COMMENT '设备编号冗余',
+  `config_type` varchar(500) NOT NULL COMMENT '配置类型（字典xslmes_im_item_category：inspect点检/maintain保养；同设备同类型唯一）',
+  `tenant_id` int DEFAULT NULL COMMENT '租户',
+  `sys_org_code` varchar(500) DEFAULT NULL COMMENT '部门',
+  `create_by` varchar(500) DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(500) DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `del_flag` int DEFAULT '0' COMMENT '删除标记（0正常1删除）',
+  PRIMARY KEY (`id`),
+  KEY `idx_meic_tenant_equip_type` (`tenant_id`, `equipment_ledger_id`, `config_type`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES设备点检配置';
+
+CREATE TABLE IF NOT EXISTS `mes_xsl_equip_inspect_config_line` (
+  `id` varchar(32) NOT NULL COMMENT '主键',
+  `config_id` varchar(32) NOT NULL COMMENT '主表主键 mes_xsl_equip_inspect_config.id',
+  `inspect_maintain_item_id` varchar(32) NOT NULL COMMENT '点检及保养项目主键 mes_xsl_inspect_maintain_item.id',
+  `item_code` varchar(500) DEFAULT NULL COMMENT '点检项目编号冗余',
+  `item_name` varchar(500) DEFAULT NULL COMMENT '项目名称冗余',
+  `item_category` varchar(500) DEFAULT NULL COMMENT '项目类别冗余',
+  `item_type` varchar(500) DEFAULT NULL COMMENT '项目类型冗余',
+  `equipment_part_name` varchar(500) DEFAULT NULL COMMENT '设备部位名称冗余',
+  `equipment_sub_part_name` varchar(500) DEFAULT NULL COMMENT '设备小部位名称冗余',
+  `inspect_method` varchar(500) DEFAULT NULL COMMENT '点检方式冗余',
+  `judgment_criteria` varchar(500) DEFAULT NULL COMMENT '判断基准冗余',
+  `sort_no` int DEFAULT '0' COMMENT '排序号',
+  `create_by` varchar(500) DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(500) DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`),
+  KEY `idx_meicl_config` (`config_id`),
+  KEY `idx_meicl_item` (`inspect_maintain_item_id`),
+  UNIQUE KEY `uk_meicl_config_item` (`config_id`, `inspect_maintain_item_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES设备点检配置明细';
+
+SET @mes_tenant_id = 1002;
+
+SET @mes_equip_pid = (
+  SELECT `id` FROM `sys_permission`
+  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` = '设备管理'
+  LIMIT 1
+);
+SET @mes_equip_pid = IFNULL(@mes_equip_pid, '1860000000000000133');
+
+INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `keep_alive`, `internal_or_external`, `create_by`, `create_time`)
+VALUES ('1860000000000000148', @mes_equip_pid, '设备点检配置', '/xslmes/mesXslEquipInspectConfig', 'xslmes/mesXslEquipInspectConfig/MesXslEquipInspectConfigList', NULL, 1, NULL, '1', 12, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW())
+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`), `perms` = VALUES(`perms`), `perms_type` = VALUES(`perms_type`), `sort_no` = VALUES(`sort_no`),
+`is_route` = VALUES(`is_route`), `is_leaf` = VALUES(`is_leaf`), `hidden` = VALUES(`hidden`), `status` = VALUES(`status`), `del_flag` = VALUES(`del_flag`),
+`keep_alive` = VALUES(`keep_alive`), `internal_or_external` = VALUES(`internal_or_external`), `icon` = 'ant-design:control-outlined';
+
+UPDATE `sys_permission` SET `icon` = 'ant-design:control-outlined' WHERE `id` = '1860000000000000148' AND `del_flag` = 0;
+
+INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `status`, `del_flag`, `create_by`, `create_time`) VALUES
+('1860000000000000149', '1860000000000000148', '新增', 2, 'mes:mes_xsl_equip_inspect_config:add', '1', '1', 0, 'admin', NOW()),
+('1860000000000000150', '1860000000000000148', '编辑', 2, 'mes:mes_xsl_equip_inspect_config:edit', '1', '1', 0, 'admin', NOW()),
+('1860000000000000151', '1860000000000000148', '删除', 2, 'mes:mes_xsl_equip_inspect_config:delete', '1', '1', 0, 'admin', NOW()),
+('1860000000000000152', '1860000000000000148', '批量删除', 2, 'mes:mes_xsl_equip_inspect_config:deleteBatch', '1', '1', 0, 'admin', NOW()),
+('1860000000000000153', '1860000000000000148', '导出', 2, 'mes:mes_xsl_equip_inspect_config:exportXls', '1', '1', 0, 'admin', NOW()),
+('1860000000000000154', '1860000000000000148', '导入', 2, 'mes:mes_xsl_equip_inspect_config:importExcel', '1', '1', 0, 'admin', NOW())
+ON DUPLICATE KEY UPDATE
+`parent_id` = VALUES(`parent_id`), `name` = VALUES(`name`), `menu_type` = VALUES(`menu_type`), `perms` = VALUES(`perms`), `perms_type` = VALUES(`perms_type`),
+`status` = VALUES(`status`), `del_flag` = VALUES(`del_flag`);
+
+INSERT INTO `sys_role_permission`(`id`, `role_id`, `permission_id`, `operate_date`, `operate_ip`)
+SELECT REPLACE(UUID(), '-', ''), r.`id`, p.`id`, NOW(), '127.0.0.1'
+FROM `sys_role` r
+CROSS JOIN `sys_permission` p
+WHERE r.`tenant_id` = @mes_tenant_id
+  AND r.`role_code` = 'admin'
+  AND p.`id` IN (
+    '1860000000000000148',
+    '1860000000000000149', '1860000000000000150', '1860000000000000151', '1860000000000000152',
+    '1860000000000000153', '1860000000000000154'
+  )
+  AND NOT EXISTS (
+    SELECT 1 FROM `sys_role_permission` rp
+    WHERE rp.`role_id` = r.`id` AND rp.`permission_id` = p.`id`
+  );

jeecg-boot/db/mes-xsl-equip-inspect-record-menu-permission.sql

@@ -0,0 +1,138 @@
+-- MES 点检/保养记录（主子表）：建表 + 字典 + 菜单 + 按钮 + 租户 admin 授权
+-- 权限前缀：mes:mes_xsl_equip_inspect_record:*
+-- 父菜单：设备管理；依赖设备点检配置、设备台账
+-- Flyway：V3.9.2_79__mes_xsl_equip_inspect_record.sql
+SET NAMES utf8mb4;
+
+INSERT INTO `sys_dict`(`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `type`, `tenant_id`)
+SELECT REPLACE(UUID(), '-', ''), 'MES点检记录结果', 'xslmes_im_inspect_result', '合格/不合格', 0, 'admin', NOW(), 0, 0
+WHERE NOT EXISTS (SELECT 1 FROM `sys_dict` WHERE `dict_code` = 'xslmes_im_inspect_result' AND `del_flag` = 0);
+
+INSERT INTO `sys_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`)
+SELECT REPLACE(UUID(), '-', ''), d.`id`, '合格', 'pass', '', 1, 1, 'admin', NOW()
+FROM `sys_dict` d
+WHERE d.`dict_code` = 'xslmes_im_inspect_result' AND NOT EXISTS (SELECT 1 FROM `sys_dict_item` i WHERE i.`dict_id` = d.`id` AND i.`item_value` = 'pass');
+
+INSERT INTO `sys_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`)
+SELECT REPLACE(UUID(), '-', ''), d.`id`, '不合格', 'fail', '', 2, 1, 'admin', NOW()
+FROM `sys_dict` d
+WHERE d.`dict_code` = 'xslmes_im_inspect_result' AND NOT EXISTS (SELECT 1 FROM `sys_dict_item` i WHERE i.`dict_id` = d.`id` AND i.`item_value` = 'fail');
+
+INSERT INTO `sys_dict`(`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `type`, `tenant_id`)
+SELECT REPLACE(UUID(), '-', ''), 'MES点检记录状态', 'xslmes_im_record_status', '待点检/已点检', 0, 'admin', NOW(), 0, 0
+WHERE NOT EXISTS (SELECT 1 FROM `sys_dict` WHERE `dict_code` = 'xslmes_im_record_status' AND `del_flag` = 0);
+
+INSERT INTO `sys_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`)
+SELECT REPLACE(UUID(), '-', ''), d.`id`, '待点检', 'pending', '', 1, 1, 'admin', NOW()
+FROM `sys_dict` d
+WHERE d.`dict_code` = 'xslmes_im_record_status' AND NOT EXISTS (SELECT 1 FROM `sys_dict_item` i WHERE i.`dict_id` = d.`id` AND i.`item_value` = 'pending');
+
+INSERT INTO `sys_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`)
+SELECT REPLACE(UUID(), '-', ''), d.`id`, '已点检', 'done', '', 2, 1, 'admin', NOW()
+FROM `sys_dict` d
+WHERE d.`dict_code` = 'xslmes_im_record_status' AND NOT EXISTS (SELECT 1 FROM `sys_dict_item` i WHERE i.`dict_id` = d.`id` AND i.`item_value` = 'done');
+
+CREATE TABLE IF NOT EXISTS `mes_xsl_equip_inspect_record` (
+  `id` varchar(32) NOT NULL COMMENT '主键',
+  `record_no` varchar(32) NOT NULL COMMENT '记录编号（EC+yyyyMMdd+4位流水，租户内按日递增）',
+  `plan_no` varchar(500) DEFAULT NULL COMMENT '计划单号',
+  `plan_id` varchar(32) DEFAULT NULL COMMENT '计划主键（隐藏）',
+  `equipment_ledger_id` varchar(32) NOT NULL COMMENT '设备台账主键 mes_xsl_equipment_ledger.id',
+  `equipment_code` varchar(500) DEFAULT NULL COMMENT '设备编码冗余',
+  `equipment_name` varchar(500) DEFAULT NULL COMMENT '设备名称冗余',
+  `equip_inspect_config_id` varchar(32) DEFAULT NULL COMMENT '设备点检配置主键 mes_xsl_equip_inspect_config.id',
+  `record_type` varchar(500) NOT NULL COMMENT '类型（字典xslmes_im_item_category：inspect点检/maintain保养）',
+  `inspect_date` date DEFAULT NULL COMMENT '点检日期',
+  `inspector_user_id` varchar(32) DEFAULT NULL COMMENT '点检人用户ID',
+  `inspector_username` varchar(500) DEFAULT NULL COMMENT '点检人账号',
+  `inspector_realname` varchar(500) DEFAULT NULL COMMENT '点检人姓名',
+  `inspect_result` varchar(500) NOT NULL COMMENT '点检结果（字典xslmes_im_inspect_result：pass合格/fail不合格）',
+  `record_status` varchar(500) NOT NULL COMMENT '状态（字典xslmes_im_record_status：pending待点检/done已点检）',
+  `handled_flag` varchar(1) DEFAULT NULL COMMENT '是否已处理（字典yn：1是0否，仅不合格记录使用）',
+  `handler_user_id` varchar(32) DEFAULT NULL COMMENT '处理人用户ID',
+  `handler_username` varchar(500) DEFAULT NULL COMMENT '处理人账号',
+  `handler_realname` varchar(500) DEFAULT NULL COMMENT '处理人姓名',
+  `handle_time` datetime DEFAULT NULL COMMENT '处理时间',
+  `tenant_id` int DEFAULT NULL COMMENT '租户',
+  `sys_org_code` varchar(500) DEFAULT NULL COMMENT '部门',
+  `create_by` varchar(500) DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(500) DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `del_flag` int DEFAULT '0' COMMENT '删除标记（0正常1删除）',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_meir_tenant_record_no` (`tenant_id`, `record_no`),
+  KEY `idx_meir_equip_type` (`equipment_ledger_id`, `record_type`),
+  KEY `idx_meir_inspect_date` (`inspect_date`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES点检保养记录';
+
+CREATE TABLE IF NOT EXISTS `mes_xsl_equip_inspect_record_line` (
+  `id` varchar(32) NOT NULL COMMENT '主键',
+  `record_id` varchar(32) NOT NULL COMMENT '主表主键 mes_xsl_equip_inspect_record.id',
+  `equip_inspect_config_line_id` varchar(32) NOT NULL COMMENT '设备点检配置明细主键 mes_xsl_equip_inspect_config_line.id',
+  `inspect_maintain_item_id` varchar(32) DEFAULT NULL COMMENT '点检及保养项目主键冗余',
+  `item_code` varchar(500) DEFAULT NULL COMMENT '点检项目编号冗余',
+  `item_name` varchar(500) DEFAULT NULL COMMENT '项目名称冗余',
+  `item_category` varchar(500) DEFAULT NULL COMMENT '项目类别冗余',
+  `item_type` varchar(500) DEFAULT NULL COMMENT '项目类型冗余',
+  `equipment_part_name` varchar(500) DEFAULT NULL COMMENT '设备部位冗余',
+  `equipment_sub_part_name` varchar(500) DEFAULT NULL COMMENT '设备小部位冗余',
+  `inspect_method` varchar(500) DEFAULT NULL COMMENT '点检方式冗余',
+  `judgment_criteria` varchar(500) DEFAULT NULL COMMENT '判断基准冗余',
+  `line_inspect_result` varchar(500) DEFAULT NULL COMMENT '明细点检结果（文本）',
+  `picture_files` varchar(2000) DEFAULT NULL COMMENT '图片（上传路径，逗号分隔）',
+  `sort_no` int DEFAULT '0' COMMENT '排序号',
+  `create_by` varchar(500) DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(500) DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`),
+  KEY `idx_meirl_record` (`record_id`),
+  KEY `idx_meirl_config_line` (`equip_inspect_config_line_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES点检保养记录明细';
+
+SET @mes_tenant_id = 1002;
+
+SET @mes_equip_pid = (
+  SELECT `id` FROM `sys_permission`
+  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` = '设备管理'
+  LIMIT 1
+);
+SET @mes_equip_pid = IFNULL(@mes_equip_pid, '1860000000000000133');
+
+INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `keep_alive`, `internal_or_external`, `create_by`, `create_time`)
+VALUES ('1860000000000000155', @mes_equip_pid, '点检保养记录', '/xslmes/mesXslEquipInspectRecord', 'xslmes/mesXslEquipInspectRecord/MesXslEquipInspectRecordList', 'MesXslEquipInspectRecordList', 1, NULL, '1', 13, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW())
+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`), `perms` = VALUES(`perms`), `perms_type` = VALUES(`perms_type`), `sort_no` = VALUES(`sort_no`),
+`is_route` = VALUES(`is_route`), `is_leaf` = VALUES(`is_leaf`), `hidden` = VALUES(`hidden`), `status` = VALUES(`status`), `del_flag` = VALUES(`del_flag`),
+`keep_alive` = VALUES(`keep_alive`), `internal_or_external` = VALUES(`internal_or_external`), `icon` = 'ant-design:file-done-outlined';
+
+UPDATE `sys_permission` SET `icon` = 'ant-design:file-done-outlined' WHERE `id` = '1860000000000000155' AND `del_flag` = 0;
+
+INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `status`, `del_flag`, `create_by`, `create_time`) VALUES
+('1860000000000000156', '1860000000000000155', '新增', 2, 'mes:mes_xsl_equip_inspect_record:add', '1', '1', 0, 'admin', NOW()),
+('1860000000000000157', '1860000000000000155', '编辑', 2, 'mes:mes_xsl_equip_inspect_record:edit', '1', '1', 0, 'admin', NOW()),
+('1860000000000000158', '1860000000000000155', '删除', 2, 'mes:mes_xsl_equip_inspect_record:delete', '1', '1', 0, 'admin', NOW()),
+('1860000000000000159', '1860000000000000155', '批量删除', 2, 'mes:mes_xsl_equip_inspect_record:deleteBatch', '1', '1', 0, 'admin', NOW()),
+('1860000000000000160', '1860000000000000155', '导出', 2, 'mes:mes_xsl_equip_inspect_record:exportXls', '1', '1', 0, 'admin', NOW()),
+('1860000000000000161', '1860000000000000155', '导入', 2, 'mes:mes_xsl_equip_inspect_record:importExcel', '1', '1', 0, 'admin', NOW())
+ON DUPLICATE KEY UPDATE
+`parent_id` = VALUES(`parent_id`), `name` = VALUES(`name`), `menu_type` = VALUES(`menu_type`), `perms` = VALUES(`perms`), `perms_type` = VALUES(`perms_type`),
+`status` = VALUES(`status`), `del_flag` = VALUES(`del_flag`);
+
+INSERT INTO `sys_role_permission`(`id`, `role_id`, `permission_id`, `operate_date`, `operate_ip`)
+SELECT REPLACE(UUID(), '-', ''), r.`id`, p.`id`, NOW(), '127.0.0.1'
+FROM `sys_role` r
+CROSS JOIN `sys_permission` p
+WHERE r.`tenant_id` = @mes_tenant_id
+  AND r.`role_code` = 'admin'
+  AND p.`id` IN (
+    '1860000000000000155',
+    '1860000000000000156', '1860000000000000157', '1860000000000000158', '1860000000000000159',
+    '1860000000000000160', '1860000000000000161'
+  )
+  AND NOT EXISTS (
+    SELECT 1 FROM `sys_role_permission` rp
+    WHERE rp.`role_id` = r.`id` AND rp.`permission_id` = p.`id`
+  );

jeecg-boot/db/mes-xsl-equipment-category-menu-permission.sql

@@ -56,14 +56,15 @@ WHERE d.`dict_code` = 'xslmes_equipment_maintain_distinct'
 
 SET @mes_tenant_id = 1002;
 
-SET @mes_base_pid = (
-  SELECT MIN(`id`) FROM `sys_permission`
-  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` IN ('MES基础资料', 'MES资料')
+SET @mes_equip_pid = (
+  SELECT `id` FROM `sys_permission`
+  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` = '设备管理'
+  LIMIT 1
 );
-SET @mes_base_pid = IFNULL(@mes_base_pid, '1860000000000000001');
+SET @mes_equip_pid = IFNULL(@mes_equip_pid, '1860000000000000133');
 
 INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `keep_alive`, `internal_or_external`, `create_by`, `create_time`)
-VALUES ('1860000000000000070', @mes_base_pid, '设备类别', '/xslmes/mesXslEquipmentCategory', 'xslmes/mesXslEquipmentCategory/MesXslEquipmentCategoryList', NULL, 1, NULL, '1', 10, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW())
+VALUES ('1860000000000000070', @mes_equip_pid, '设备类别', '/xslmes/mesXslEquipmentCategory', 'xslmes/mesXslEquipmentCategory/MesXslEquipmentCategoryList', NULL, 1, NULL, '1', 2, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW())
 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`), `perms` = VALUES(`perms`), `perms_type` = VALUES(`perms_type`), `sort_no` = VALUES(`sort_no`),

jeecg-boot/db/mes-xsl-equipment-ledger-menu-parent-fix.sql

@@ -0,0 +1,31 @@
+-- 设备管理目录：从 MES管理 下迁出，与 MES基础资料 同级（已执行旧版 mes-xsl-equipment-ledger-menu-permission 时用）
+SET NAMES utf8mb4;
+
+SET @mes_equip_root_parent = (
+  SELECT `parent_id` FROM `sys_permission`
+  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` = 'MES基础资料'
+  LIMIT 1
+);
+SET @mes_equip_root_parent = IFNULL(@mes_equip_root_parent, (
+  SELECT `parent_id` FROM `sys_permission`
+  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` = 'MES资料'
+  LIMIT 1
+));
+
+SET @mes_equip_root_sort = IFNULL((
+  SELECT `sort_no` + 1 FROM `sys_permission`
+  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` IN ('MES基础资料', 'MES资料')
+  ORDER BY `sort_no` DESC
+  LIMIT 1
+), 51);
+
+UPDATE `sys_permission`
+SET
+  `parent_id` = @mes_equip_root_parent,
+  `sort_no` = @mes_equip_root_sort,
+  `menu_type` = 0,
+  `is_leaf` = 0,
+  `hidden` = 0,
+  `status` = '1',
+  `del_flag` = 0
+WHERE `id` = '1860000000000000133';

jeecg-boot/db/mes-xsl-equipment-ledger-menu-permission.sql

@@ -0,0 +1,131 @@
+-- MES 设备台账：字典 + 建表 + 设备管理目录菜单 + 设备台账菜单 + 按钮 + 租户 admin 授权（可整文件一次执行）
+-- 权限前缀：mes:mes_xsl_equipment_ledger:*
+-- 父菜单：设备管理（目录，与 MES基础资料 同级，非 MES管理 子级）；子菜单：设备台账
+-- 修改租户：改 SET @mes_tenant_id；新环境也可依赖 Flyway V3.9.2_72__mes_xsl_equipment_ledger.sql
+SET NAMES utf8mb4;
+
+INSERT INTO `sys_dict` (`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `type`, `tenant_id`)
+SELECT REPLACE(UUID(), '-', ''), 'MES设备台账状态', 'xslmes_equipment_ledger_status', '在用/停用/报废', 0, 'admin', NOW(), 0, 0
+WHERE NOT EXISTS (SELECT 1 FROM `sys_dict` WHERE `dict_code` = 'xslmes_equipment_ledger_status' AND `del_flag` = 0);
+
+INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `sort_order`, `status`, `create_by`, `create_time`)
+SELECT REPLACE(UUID(), '-', ''), d.id, '在用', '0', 1, 1, 'admin', NOW() FROM `sys_dict` d
+WHERE d.`dict_code` = 'xslmes_equipment_ledger_status' AND NOT EXISTS (SELECT 1 FROM `sys_dict_item` i WHERE i.`dict_id` = d.id AND i.`item_value` = '0');
+INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `sort_order`, `status`, `create_by`, `create_time`)
+SELECT REPLACE(UUID(), '-', ''), d.id, '停用', '1', 2, 1, 'admin', NOW() FROM `sys_dict` d
+WHERE d.`dict_code` = 'xslmes_equipment_ledger_status' AND NOT EXISTS (SELECT 1 FROM `sys_dict_item` i WHERE i.`dict_id` = d.id AND i.`item_value` = '1');
+INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `sort_order`, `status`, `create_by`, `create_time`)
+SELECT REPLACE(UUID(), '-', ''), d.id, '报废', '2', 3, 1, 'admin', NOW() FROM `sys_dict` d
+WHERE d.`dict_code` = 'xslmes_equipment_ledger_status' AND NOT EXISTS (SELECT 1 FROM `sys_dict_item` i WHERE i.`dict_id` = d.id AND i.`item_value` = '2');
+
+CREATE TABLE IF NOT EXISTS `mes_xsl_equipment_ledger` (
+  `id` varchar(32) NOT NULL COMMENT '主键',
+  `process_operation_id` varchar(32) NOT NULL COMMENT '所属工序 mes_xsl_process_operation.id',
+  `process_operation_name` varchar(500) DEFAULT NULL COMMENT '工序名称冗余',
+  `equipment_name` varchar(500) NOT NULL COMMENT '设备名称（同租户未删除唯一）',
+  `equipment_code` varchar(128) NOT NULL COMMENT '设备编号（同租户未删除唯一）',
+  `manufacturer_id` varchar(32) DEFAULT NULL COMMENT '所属设备厂家 mes_xsl_manufacturer.id',
+  `manufacturer_name` varchar(500) DEFAULT NULL COMMENT '设备厂家名称冗余',
+  `equipment_category_id` varchar(32) DEFAULT NULL COMMENT '设备类别 mes_xsl_equipment_category.id',
+  `equipment_category_name` varchar(500) DEFAULT NULL COMMENT '设备类别名称冗余',
+  `equipment_type_id` varchar(32) DEFAULT NULL COMMENT '设备类型 mes_xsl_equipment_type.id',
+  `equipment_type_name` varchar(500) DEFAULT NULL COMMENT '设备类型名称冗余',
+  `factory_id` varchar(32) DEFAULT NULL COMMENT '所属工厂（厂家信息）',
+  `factory_name` varchar(500) DEFAULT NULL COMMENT '所属工厂名称冗余',
+  `equipment_model` varchar(500) DEFAULT NULL COMMENT '设备型号',
+  `equipment_status` varchar(1) NOT NULL DEFAULT '0' COMMENT '设备状态 字典xslmes_equipment_ledger_status：0在用1停用2报废',
+  `serial_no` varchar(500) DEFAULT NULL COMMENT '序列号',
+  `nameplate` varchar(500) DEFAULT NULL COMMENT '铭牌',
+  `maintain_dept_id` varchar(32) DEFAULT NULL COMMENT '维修部门 sys_depart.id',
+  `maintain_person` varchar(500) DEFAULT NULL COMMENT '维修人员',
+  `manage_dept_id` varchar(32) DEFAULT NULL COMMENT '主管部门 sys_depart.id',
+  `doc_file_no` varchar(500) DEFAULT NULL COMMENT '资料文件编号',
+  `production_date` date DEFAULT NULL COMMENT '生产日期',
+  `purchase_date` date DEFAULT NULL COMMENT '购买日期',
+  `use_date` date DEFAULT NULL COMMENT '使用日期',
+  `vendor_contact` varchar(500) DEFAULT NULL COMMENT '厂商联系人',
+  `asset_value` varchar(128) DEFAULT NULL COMMENT '价值',
+  `controlled_pda` varchar(500) DEFAULT NULL COMMENT '受控PDA',
+  `overproduction_ratio` varchar(128) DEFAULT NULL COMMENT '超产比率',
+  `effective_volume` varchar(128) DEFAULT NULL COMMENT '有效体积',
+  `enabled_flag` varchar(1) NOT NULL DEFAULT '1' COMMENT '是否启用 字典yn：1是0否',
+  `equipment_desc` varchar(1000) DEFAULT NULL COMMENT '设备描述',
+  `tenant_id` int DEFAULT NULL COMMENT '租户',
+  `sys_org_code` varchar(500) DEFAULT NULL COMMENT '部门',
+  `create_by` varchar(500) DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(500) DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `del_flag` int DEFAULT '0' COMMENT '删除标记（0正常1删除）',
+  PRIMARY KEY (`id`),
+  KEY `idx_mel_tenant_code` (`tenant_id`, `equipment_code`),
+  KEY `idx_mel_tenant_name` (`tenant_id`, `equipment_name`),
+  KEY `idx_mel_process` (`process_operation_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES设备台账';
+
+SET @mes_tenant_id = 1002;
+
+-- 与「MES基础资料」同级：取其 parent_id（通常为 NULL，与 MES管理 并列）
+SET @mes_equip_root_parent = (
+  SELECT `parent_id` FROM `sys_permission`
+  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` = 'MES基础资料'
+  LIMIT 1
+);
+SET @mes_equip_root_parent = IFNULL(@mes_equip_root_parent, (
+  SELECT `parent_id` FROM `sys_permission`
+  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` = 'MES资料'
+  LIMIT 1
+));
+
+SET @mes_equip_root_sort = IFNULL((
+  SELECT `sort_no` + 1 FROM `sys_permission`
+  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` IN ('MES基础资料', 'MES资料')
+  ORDER BY `sort_no` DESC
+  LIMIT 1
+), 51);
+
+UPDATE `sys_permission`
+SET `is_leaf` = 0
+WHERE `id` = '1860000000000000133' AND `del_flag` = 0;
+
+INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `keep_alive`, `internal_or_external`, `create_by`, `create_time`)
+VALUES ('1860000000000000133', @mes_equip_root_parent, '设备管理', '/xslmes/equipment', 'layouts/RouteView', 'MesEquipmentLayout', 0, NULL, '1', @mes_equip_root_sort, 1, 0, 0, '1', 0, 0, 0, 'admin', NOW())
+ON DUPLICATE KEY UPDATE
+`parent_id` = VALUES(`parent_id`), `name` = VALUES(`name`), `url` = VALUES(`url`), `component` = VALUES(`component`),
+`menu_type` = VALUES(`menu_type`), `icon` = 'ant-design:tool-outlined', `is_leaf` = 0, `hidden` = 0, `status` = '1', `del_flag` = 0;
+
+UPDATE `sys_permission` SET `icon` = 'ant-design:tool-outlined' WHERE `id` = '1860000000000000133' AND `del_flag` = 0;
+
+INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `keep_alive`, `internal_or_external`, `create_by`, `create_time`)
+VALUES ('1860000000000000134', '1860000000000000133', '设备台账', '/xslmes/mesXslEquipmentLedger', 'xslmes/mesXslEquipmentLedger/MesXslEquipmentLedgerList', 'MesXslEquipmentLedgerList', 1, NULL, '1', 1, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW())
+ON DUPLICATE KEY UPDATE
+`parent_id` = VALUES(`parent_id`), `name` = VALUES(`name`), `url` = VALUES(`url`), `component` = VALUES(`component`), `component_name` = VALUES(`component_name`),
+`is_leaf` = 0, `hidden` = 0, `status` = '1', `del_flag` = 0;
+
+INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `status`, `del_flag`, `create_by`, `create_time`) VALUES
+('1860000000000000135', '1860000000000000134', '新增', 2, 'mes:mes_xsl_equipment_ledger:add', '1', '1', 0, 'admin', NOW()),
+('1860000000000000136', '1860000000000000134', '编辑', 2, 'mes:mes_xsl_equipment_ledger:edit', '1', '1', 0, 'admin', NOW()),
+('1860000000000000137', '1860000000000000134', '删除', 2, 'mes:mes_xsl_equipment_ledger:delete', '1', '1', 0, 'admin', NOW()),
+('1860000000000000138', '1860000000000000134', '批量删除', 2, 'mes:mes_xsl_equipment_ledger:deleteBatch', '1', '1', 0, 'admin', NOW()),
+('1860000000000000139', '1860000000000000134', '导出', 2, 'mes:mes_xsl_equipment_ledger:exportXls', '1', '1', 0, 'admin', NOW()),
+('1860000000000000140', '1860000000000000134', '导入', 2, 'mes:mes_xsl_equipment_ledger:importExcel', '1', '1', 0, 'admin', NOW())
+ON DUPLICATE KEY UPDATE
+`parent_id` = VALUES(`parent_id`), `name` = VALUES(`name`), `menu_type` = VALUES(`menu_type`), `perms` = VALUES(`perms`),
+`status` = VALUES(`status`), `del_flag` = VALUES(`del_flag`);
+
+INSERT INTO `sys_role_permission`(`id`, `role_id`, `permission_id`, `operate_date`, `operate_ip`)
+SELECT REPLACE(UUID(), '-', ''), r.`id`, p.`id`, NOW(), '127.0.0.1'
+FROM `sys_role` r
+CROSS JOIN `sys_permission` p
+WHERE r.`tenant_id` = @mes_tenant_id
+  AND r.`role_code` = 'admin'
+  AND p.`id` IN (
+    '1860000000000000133',
+    '1860000000000000134',
+    '1860000000000000135', '1860000000000000136', '1860000000000000137', '1860000000000000138',
+    '1860000000000000139', '1860000000000000140'
+  )
+  AND NOT EXISTS (
+    SELECT 1 FROM `sys_role_permission` rp
+    WHERE rp.`role_id` = r.`id` AND rp.`permission_id` = p.`id`
+  );

jeecg-boot/db/mes-xsl-equipment-ledger.sql

@@ -0,0 +1,46 @@
+-- MES 设备台账：仅建表（完整初始化请执行 mes-xsl-equipment-ledger-menu-permission.sql）
+SET NAMES utf8mb4;
+
+CREATE TABLE IF NOT EXISTS `mes_xsl_equipment_ledger` (
+  `id` varchar(32) NOT NULL COMMENT '主键',
+  `process_operation_id` varchar(32) NOT NULL COMMENT '所属工序',
+  `process_operation_name` varchar(500) DEFAULT NULL COMMENT '工序名称冗余',
+  `equipment_name` varchar(500) NOT NULL COMMENT '设备名称',
+  `equipment_code` varchar(128) NOT NULL COMMENT '设备编号',
+  `manufacturer_id` varchar(32) DEFAULT NULL COMMENT '所属设备厂家',
+  `manufacturer_name` varchar(500) DEFAULT NULL COMMENT '设备厂家名称冗余',
+  `equipment_category_id` varchar(32) DEFAULT NULL COMMENT '设备类别',
+  `equipment_category_name` varchar(500) DEFAULT NULL COMMENT '设备类别名称冗余',
+  `equipment_type_id` varchar(32) DEFAULT NULL COMMENT '设备类型',
+  `equipment_type_name` varchar(500) DEFAULT NULL COMMENT '设备类型名称冗余',
+  `factory_id` varchar(32) DEFAULT NULL COMMENT '所属工厂',
+  `factory_name` varchar(500) DEFAULT NULL COMMENT '所属工厂名称冗余',
+  `equipment_model` varchar(500) DEFAULT NULL COMMENT '设备型号',
+  `equipment_status` varchar(1) NOT NULL DEFAULT '0' COMMENT '设备状态',
+  `serial_no` varchar(500) DEFAULT NULL COMMENT '序列号',
+  `nameplate` varchar(500) DEFAULT NULL COMMENT '铭牌',
+  `maintain_dept_id` varchar(32) DEFAULT NULL COMMENT '维修部门',
+  `maintain_person` varchar(500) DEFAULT NULL COMMENT '维修人员',
+  `manage_dept_id` varchar(32) DEFAULT NULL COMMENT '主管部门',
+  `doc_file_no` varchar(500) DEFAULT NULL COMMENT '资料文件编号',
+  `production_date` date DEFAULT NULL COMMENT '生产日期',
+  `purchase_date` date DEFAULT NULL COMMENT '购买日期',
+  `use_date` date DEFAULT NULL COMMENT '使用日期',
+  `vendor_contact` varchar(500) DEFAULT NULL COMMENT '厂商联系人',
+  `asset_value` varchar(128) DEFAULT NULL COMMENT '价值',
+  `controlled_pda` varchar(500) DEFAULT NULL COMMENT '受控PDA',
+  `overproduction_ratio` varchar(128) DEFAULT NULL COMMENT '超产比率',
+  `effective_volume` varchar(128) DEFAULT NULL COMMENT '有效体积',
+  `enabled_flag` varchar(1) NOT NULL DEFAULT '1' COMMENT '是否启用',
+  `equipment_desc` varchar(1000) DEFAULT NULL COMMENT '设备描述',
+  `tenant_id` int DEFAULT NULL COMMENT '租户',
+  `sys_org_code` varchar(500) DEFAULT NULL COMMENT '部门',
+  `create_by` varchar(500) DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(500) DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `del_flag` int DEFAULT '0' COMMENT '删除标记',
+  PRIMARY KEY (`id`),
+  KEY `idx_mel_tenant_code` (`tenant_id`, `equipment_code`),
+  KEY `idx_mel_tenant_name` (`tenant_id`, `equipment_name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES设备台账';

jeecg-boot/db/mes-xsl-equipment-menus-icon.sql

@@ -0,0 +1,10 @@
+-- 设备管理目录及指定子菜单图标（可重复执行）
+SET NAMES utf8mb4;
+
+UPDATE `sys_permission` SET `icon` = 'ant-design:tool-outlined' WHERE `id` = '1860000000000000133' AND `del_flag` = 0;
+UPDATE `sys_permission` SET `icon` = 'ant-design:apartment-outlined' WHERE `id` = '1860000000000000091' AND `del_flag` = 0;
+UPDATE `sys_permission` SET `icon` = 'ant-design:tags-outlined' WHERE `id` = '1860000000000000098' AND `del_flag` = 0;
+UPDATE `sys_permission` SET `icon` = 'ant-design:shopping-outlined' WHERE `id` = '1860000000000000105' AND `del_flag` = 0;
+UPDATE `sys_permission` SET `icon` = 'ant-design:shop-outlined' WHERE `id` = '1860000000000000112' AND `del_flag` = 0;
+UPDATE `sys_permission` SET `icon` = 'ant-design:partition-outlined' WHERE `id` = '1860000000000000119' AND `del_flag` = 0;
+UPDATE `sys_permission` SET `icon` = 'ant-design:pause-circle-outlined' WHERE `id` = '1860000000000000126' AND `del_flag` = 0;

jeecg-boot/db/mes-xsl-equipment-part-menu-permission.sql

@@ -24,14 +24,15 @@ CREATE TABLE IF NOT EXISTS `mes_xsl_equipment_part` (
 
 SET @mes_tenant_id = 1002;
 
-SET @mes_base_pid = (
-  SELECT MIN(`id`) FROM `sys_permission`
-  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` IN ('MES基础资料', 'MES资料')
+SET @mes_equip_pid = (
+  SELECT `id` FROM `sys_permission`
+  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` = '设备管理'
+  LIMIT 1
 );
-SET @mes_base_pid = IFNULL(@mes_base_pid, '1860000000000000001');
+SET @mes_equip_pid = IFNULL(@mes_equip_pid, '1860000000000000133');
 
 INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `keep_alive`, `internal_or_external`, `create_by`, `create_time`)
-VALUES ('1860000000000000084', @mes_base_pid, '设备部位', '/xslmes/mesXslEquipmentPart', 'xslmes/mesXslEquipmentPart/MesXslEquipmentPartList', NULL, 1, NULL, '1', 12, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW())
+VALUES ('1860000000000000084', @mes_equip_pid, '设备部位', '/xslmes/mesXslEquipmentPart', 'xslmes/mesXslEquipmentPart/MesXslEquipmentPartList', NULL, 1, NULL, '1', 4, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW())
 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`), `perms` = VALUES(`perms`), `perms_type` = VALUES(`perms_type`), `sort_no` = VALUES(`sort_no`),

jeecg-boot/db/mes-xsl-equipment-sub-part-menu-permission.sql

@@ -27,19 +27,22 @@ CREATE TABLE IF NOT EXISTS `mes_xsl_equipment_sub_part` (
 
 SET @mes_tenant_id = 1002;
 
-SET @xslmes_root_pid = (
-  SELECT MIN(`id`) FROM `sys_permission`
-  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` IN ('MES XSL', 'XSLMES管理', 'XSLMES')
+SET @mes_equip_pid = (
+  SELECT `id` FROM `sys_permission`
+  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` = '设备管理'
+  LIMIT 1
 );
-SET @xslmes_root_pid = IFNULL(@xslmes_root_pid, '1900000000000000300');
+SET @mes_equip_pid = IFNULL(@mes_equip_pid, '1860000000000000133');
 
 INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `keep_alive`, `internal_or_external`, `create_by`, `create_time`)
-VALUES ('1860000000000000091', @xslmes_root_pid, '设备小部位', '/xslmes/mesXslEquipmentSubPart', 'xslmes/mesXslEquipmentSubPart/MesXslEquipmentSubPartList', NULL, 1, NULL, '1', 14, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW())
+VALUES ('1860000000000000091', @mes_equip_pid, '设备小部位', '/xslmes/mesXslEquipmentSubPart', 'xslmes/mesXslEquipmentSubPart/MesXslEquipmentSubPartList', NULL, 1, NULL, '1', 5, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW())
 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`), `perms` = VALUES(`perms`), `perms_type` = VALUES(`perms_type`), `sort_no` = VALUES(`sort_no`),
 `is_route` = VALUES(`is_route`), `is_leaf` = VALUES(`is_leaf`), `hidden` = VALUES(`hidden`), `status` = VALUES(`status`), `del_flag` = VALUES(`del_flag`),
-`keep_alive` = VALUES(`keep_alive`), `internal_or_external` = VALUES(`internal_or_external`);
+`keep_alive` = VALUES(`keep_alive`), `internal_or_external` = VALUES(`internal_or_external`), `icon` = 'ant-design:apartment-outlined';
+
+UPDATE `sys_permission` SET `icon` = 'ant-design:apartment-outlined' WHERE `id` = '1860000000000000091' AND `del_flag` = 0;
 
 INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `status`, `del_flag`, `create_by`, `create_time`) VALUES
 ('1860000000000000092', '1860000000000000091', '新增', 2, 'mes:mes_xsl_equipment_sub_part:add', '1', '1', 0, 'admin', NOW()),

jeecg-boot/db/mes-xsl-equipment-type-menu-fix.sql

@@ -1,26 +1,22 @@
--- 设备类型菜单/按钮补全并挂到 MES基础资料（解决仅 UPDATE 时 id 077 不存在、菜单与权限均不显示）
+-- 设备类型菜单/按钮补全并挂到「设备管理」（解决仅 UPDATE 时 id 077 不存在、菜单与权限均不显示）
 -- 可重复执行；修改租户改 SET @mes_tenant_id
 SET NAMES utf8mb4;
 
 SET @mes_tenant_id = 1002;
 
-SET @mes_base_pid = (
+SET @mes_equip_pid = (
   SELECT `id` FROM `sys_permission`
-  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` = 'MES基础资料'
+  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` = '设备管理'
   LIMIT 1
 );
-SET @mes_base_pid = IFNULL(@mes_base_pid, (
-  SELECT MIN(`id`) FROM `sys_permission`
-  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` = 'MES资料'
-));
-SET @mes_base_pid = IFNULL(@mes_base_pid, '1860000000000000001');
+SET @mes_equip_pid = IFNULL(@mes_equip_pid, '1860000000000000133');
 
 UPDATE `sys_permission`
 SET `is_leaf` = 0
-WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` IN ('MES基础资料', 'MES资料');
+WHERE `id` = @mes_equip_pid;
 
 INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `keep_alive`, `internal_or_external`, `create_by`, `create_time`)
-VALUES ('1860000000000000077', @mes_base_pid, '设备类型', '/xslmes/mesXslEquipmentType', 'xslmes/mesXslEquipmentType/MesXslEquipmentTypeList', NULL, 1, NULL, '1', 11, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW())
+VALUES ('1860000000000000077', @mes_equip_pid, '设备类型', '/xslmes/mesXslEquipmentType', 'xslmes/mesXslEquipmentType/MesXslEquipmentTypeList', NULL, 1, NULL, '1', 3, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW())
 ON DUPLICATE KEY UPDATE
 `parent_id` = VALUES(`parent_id`), `name` = VALUES(`name`), `url` = VALUES(`url`), `component` = VALUES(`component`),
 `menu_type` = VALUES(`menu_type`), `perms` = VALUES(`perms`), `perms_type` = VALUES(`perms_type`), `sort_no` = VALUES(`sort_no`),
@@ -39,7 +35,7 @@ ON DUPLICATE KEY UPDATE
 `perms_type` = VALUES(`perms_type`), `is_leaf` = 1, `status` = '1', `del_flag` = 0;
 
 UPDATE `sys_permission` p
-INNER JOIN (SELECT @mes_base_pid AS `pid`) x ON 1 = 1
+INNER JOIN (SELECT @mes_equip_pid AS `pid`) x ON 1 = 1
 SET p.`parent_id` = x.`pid`,
     p.`is_leaf` = 0,
     p.`url` = '/xslmes/mesXslEquipmentType',

jeecg-boot/db/mes-xsl-equipment-type-menu-permission.sql

@@ -23,14 +23,15 @@ CREATE TABLE IF NOT EXISTS `mes_xsl_equipment_type` (
 
 SET @mes_tenant_id = 1002;
 
-SET @mes_base_pid = (
-  SELECT MIN(`id`) FROM `sys_permission`
-  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` IN ('MES基础资料', 'MES资料')
+SET @mes_equip_pid = (
+  SELECT `id` FROM `sys_permission`
+  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` = '设备管理'
+  LIMIT 1
 );
-SET @mes_base_pid = IFNULL(@mes_base_pid, '1860000000000000001');
+SET @mes_equip_pid = IFNULL(@mes_equip_pid, '1860000000000000133');
 
 INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `keep_alive`, `internal_or_external`, `create_by`, `create_time`)
-VALUES ('1860000000000000077', @mes_base_pid, '设备类型', '/xslmes/mesXslEquipmentType', 'xslmes/mesXslEquipmentType/MesXslEquipmentTypeList', NULL, 1, NULL, '1', 11, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW())
+VALUES ('1860000000000000077', @mes_equip_pid, '设备类型', '/xslmes/mesXslEquipmentType', 'xslmes/mesXslEquipmentType/MesXslEquipmentTypeList', NULL, 1, NULL, '1', 3, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW())
 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`), `perms` = VALUES(`perms`), `perms_type` = VALUES(`perms_type`), `sort_no` = VALUES(`sort_no`),

jeecg-boot/db/mes-xsl-inspect-maintain-item-menu-permission.sql

@@ -0,0 +1,118 @@
+-- MES 点检及保养项目：字典 + 建表 + 菜单 + 按钮 + 租户 admin 授权（可整文件一次执行）
+-- 权限前缀与 Controller、前端 v-auth 一致：mes:mes_xsl_inspect_maintain_item:*
+-- 父菜单：设备管理；修改租户改 SET @mes_tenant_id
+-- 新环境也可依赖 Flyway：V3.9.2_77__mes_xsl_inspect_maintain_item.sql
+SET NAMES utf8mb4;
+
+INSERT INTO `sys_dict` (`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `type`, `tenant_id`)
+SELECT REPLACE(UUID(), '-', ''), 'MES点检保养项目类别', 'xslmes_im_item_category', 'inspect点检/maintain保养', 0, 'admin', NOW(), 0, 0
+WHERE NOT EXISTS (SELECT 1 FROM `sys_dict` WHERE `dict_code` = 'xslmes_im_item_category' AND `del_flag` = 0);
+
+INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `sort_order`, `status`, `create_by`, `create_time`)
+SELECT REPLACE(UUID(), '-', ''), d.id, '点检', 'inspect', 1, 1, 'admin', NOW() FROM `sys_dict` d
+WHERE d.`dict_code` = 'xslmes_im_item_category' AND NOT EXISTS (SELECT 1 FROM `sys_dict_item` i WHERE i.`dict_id` = d.id AND i.`item_value` = 'inspect');
+INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `sort_order`, `status`, `create_by`, `create_time`)
+SELECT REPLACE(UUID(), '-', ''), d.id, '保养', 'maintain', 2, 1, 'admin', NOW() FROM `sys_dict` d
+WHERE d.`dict_code` = 'xslmes_im_item_category' AND NOT EXISTS (SELECT 1 FROM `sys_dict_item` i WHERE i.`dict_id` = d.id AND i.`item_value` = 'maintain');
+
+INSERT INTO `sys_dict` (`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `type`, `tenant_id`)
+SELECT REPLACE(UUID(), '-', ''), 'MES点检保养项目类型', 'xslmes_im_item_type', 'mechanical机械类/electrical电气类', 0, 'admin', NOW(), 0, 0
+WHERE NOT EXISTS (SELECT 1 FROM `sys_dict` WHERE `dict_code` = 'xslmes_im_item_type' AND `del_flag` = 0);
+
+INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `sort_order`, `status`, `create_by`, `create_time`)
+SELECT REPLACE(UUID(), '-', ''), d.id, '机械类', 'mechanical', 1, 1, 'admin', NOW() FROM `sys_dict` d
+WHERE d.`dict_code` = 'xslmes_im_item_type' AND NOT EXISTS (SELECT 1 FROM `sys_dict_item` i WHERE i.`dict_id` = d.id AND i.`item_value` = 'mechanical');
+INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `sort_order`, `status`, `create_by`, `create_time`)
+SELECT REPLACE(UUID(), '-', ''), d.id, '电气类', 'electrical', 2, 1, 'admin', NOW() FROM `sys_dict` d
+WHERE d.`dict_code` = 'xslmes_im_item_type' AND NOT EXISTS (SELECT 1 FROM `sys_dict_item` i WHERE i.`dict_id` = d.id AND i.`item_value` = 'electrical');
+
+INSERT INTO `sys_dict` (`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `type`, `tenant_id`)
+SELECT REPLACE(UUID(), '-', ''), 'MES点检方式', 'xslmes_im_inspect_method', 'visual视觉/sight目测/hearing听觉', 0, 'admin', NOW(), 0, 0
+WHERE NOT EXISTS (SELECT 1 FROM `sys_dict` WHERE `dict_code` = 'xslmes_im_inspect_method' AND `del_flag` = 0);
+
+INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `sort_order`, `status`, `create_by`, `create_time`)
+SELECT REPLACE(UUID(), '-', ''), d.id, '视觉', 'visual', 1, 1, 'admin', NOW() FROM `sys_dict` d
+WHERE d.`dict_code` = 'xslmes_im_inspect_method' AND NOT EXISTS (SELECT 1 FROM `sys_dict_item` i WHERE i.`dict_id` = d.id AND i.`item_value` = 'visual');
+INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `sort_order`, `status`, `create_by`, `create_time`)
+SELECT REPLACE(UUID(), '-', ''), d.id, '目测', 'sight', 2, 1, 'admin', NOW() FROM `sys_dict` d
+WHERE d.`dict_code` = 'xslmes_im_inspect_method' AND NOT EXISTS (SELECT 1 FROM `sys_dict_item` i WHERE i.`dict_id` = d.id AND i.`item_value` = 'sight');
+INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `sort_order`, `status`, `create_by`, `create_time`)
+SELECT REPLACE(UUID(), '-', ''), d.id, '听觉', 'hearing', 3, 1, 'admin', NOW() FROM `sys_dict` d
+WHERE d.`dict_code` = 'xslmes_im_inspect_method' AND NOT EXISTS (SELECT 1 FROM `sys_dict_item` i WHERE i.`dict_id` = d.id AND i.`item_value` = 'hearing');
+
+CREATE TABLE IF NOT EXISTS `mes_xsl_inspect_maintain_item` (
+  `id` varchar(32) NOT NULL COMMENT '主键',
+  `item_name` varchar(500) NOT NULL COMMENT '项目名称（同租户未删除数据中唯一）',
+  `item_code` varchar(500) NOT NULL COMMENT '项目编号（同租户未删除数据中唯一）',
+  `equipment_category_id` varchar(32) NOT NULL COMMENT '设备类别主键 mes_xsl_equipment_category.id',
+  `equipment_category_name` varchar(500) DEFAULT NULL COMMENT '设备类别名称冗余',
+  `equipment_type_id` varchar(32) NOT NULL COMMENT '设备类型主键 mes_xsl_equipment_type.id',
+  `equipment_type_name` varchar(500) DEFAULT NULL COMMENT '设备类型名称冗余',
+  `equipment_part_id` varchar(32) NOT NULL COMMENT '设备部位主键 mes_xsl_equipment_part.id',
+  `equipment_part_name` varchar(500) DEFAULT NULL COMMENT '设备部位名称冗余',
+  `equipment_sub_part_id` varchar(32) NOT NULL COMMENT '设备小部位主键 mes_xsl_equipment_sub_part.id',
+  `equipment_sub_part_name` varchar(500) DEFAULT NULL COMMENT '设备小部位名称冗余',
+  `item_category` varchar(500) NOT NULL COMMENT '项目类别（字典xslmes_im_item_category：inspect点检/maintain保养）',
+  `item_type` varchar(500) NOT NULL COMMENT '项目类型（字典xslmes_im_item_type：mechanical机械类/electrical电气类）',
+  `inspect_method` varchar(500) NOT NULL COMMENT '点检方式（字典xslmes_im_inspect_method：visual视觉/sight目测/hearing听觉）',
+  `judgment_criteria` varchar(500) NOT NULL COMMENT '判断基准',
+  `maintain_cycle_days` int DEFAULT NULL COMMENT '保养周期（天）',
+  `tenant_id` int DEFAULT NULL COMMENT '租户',
+  `sys_org_code` varchar(500) DEFAULT NULL COMMENT '部门',
+  `create_by` varchar(500) DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(500) DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `del_flag` int DEFAULT '0' COMMENT '删除标记（0正常1删除）',
+  PRIMARY KEY (`id`),
+  KEY `idx_mimi_tenant_name` (`tenant_id`, `item_name`),
+  KEY `idx_mimi_tenant_code` (`tenant_id`, `item_code`),
+  KEY `idx_mimi_category` (`equipment_category_id`),
+  KEY `idx_mimi_type` (`equipment_type_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES点检及保养项目';
+
+SET @mes_tenant_id = 1002;
+
+SET @mes_equip_pid = (
+  SELECT `id` FROM `sys_permission`
+  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` = '设备管理'
+  LIMIT 1
+);
+SET @mes_equip_pid = IFNULL(@mes_equip_pid, '1860000000000000133');
+
+INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `keep_alive`, `internal_or_external`, `create_by`, `create_time`)
+VALUES ('1860000000000000141', @mes_equip_pid, '点检及保养项目', '/xslmes/mesXslInspectMaintainItem', 'xslmes/mesXslInspectMaintainItem/MesXslInspectMaintainItemList', NULL, 1, NULL, '1', 11, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW())
+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`), `perms` = VALUES(`perms`), `perms_type` = VALUES(`perms_type`), `sort_no` = VALUES(`sort_no`),
+`is_route` = VALUES(`is_route`), `is_leaf` = VALUES(`is_leaf`), `hidden` = VALUES(`hidden`), `status` = VALUES(`status`), `del_flag` = VALUES(`del_flag`),
+`keep_alive` = VALUES(`keep_alive`), `internal_or_external` = VALUES(`internal_or_external`), `icon` = 'ant-design:audit-outlined';
+
+UPDATE `sys_permission` SET `icon` = 'ant-design:audit-outlined' WHERE `id` = '1860000000000000141' AND `del_flag` = 0;
+
+INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `status`, `del_flag`, `create_by`, `create_time`) VALUES
+('1860000000000000142', '1860000000000000141', '新增', 2, 'mes:mes_xsl_inspect_maintain_item:add', '1', '1', 0, 'admin', NOW()),
+('1860000000000000143', '1860000000000000141', '编辑', 2, 'mes:mes_xsl_inspect_maintain_item:edit', '1', '1', 0, 'admin', NOW()),
+('1860000000000000144', '1860000000000000141', '删除', 2, 'mes:mes_xsl_inspect_maintain_item:delete', '1', '1', 0, 'admin', NOW()),
+('1860000000000000145', '1860000000000000141', '批量删除', 2, 'mes:mes_xsl_inspect_maintain_item:deleteBatch', '1', '1', 0, 'admin', NOW()),
+('1860000000000000146', '1860000000000000141', '导出', 2, 'mes:mes_xsl_inspect_maintain_item:exportXls', '1', '1', 0, 'admin', NOW()),
+('1860000000000000147', '1860000000000000141', '导入', 2, 'mes:mes_xsl_inspect_maintain_item:importExcel', '1', '1', 0, 'admin', NOW())
+ON DUPLICATE KEY UPDATE
+`parent_id` = VALUES(`parent_id`), `name` = VALUES(`name`), `menu_type` = VALUES(`menu_type`), `perms` = VALUES(`perms`), `perms_type` = VALUES(`perms_type`),
+`status` = VALUES(`status`), `del_flag` = VALUES(`del_flag`);
+
+INSERT INTO `sys_role_permission`(`id`, `role_id`, `permission_id`, `operate_date`, `operate_ip`)
+SELECT REPLACE(UUID(), '-', ''), r.`id`, p.`id`, NOW(), '127.0.0.1'
+FROM `sys_role` r
+CROSS JOIN `sys_permission` p
+WHERE r.`tenant_id` = @mes_tenant_id
+  AND r.`role_code` = 'admin'
+  AND p.`id` IN (
+    '1860000000000000141',
+    '1860000000000000142', '1860000000000000143', '1860000000000000144', '1860000000000000145',
+    '1860000000000000146', '1860000000000000147'
+  )
+  AND NOT EXISTS (
+    SELECT 1 FROM `sys_role_permission` rp
+    WHERE rp.`role_id` = r.`id` AND rp.`permission_id` = p.`id`
+  );

jeecg-boot/db/mes-xsl-manufacturer-menu-permission.sql

@@ -1,6 +1,6 @@
 -- MES 厂家信息：字典 + 建表 + 菜单 + 按钮 + 租户 admin 授权（可整文件一次执行）
 -- 权限前缀与 Controller、前端 v-auth 一致：mes:mes_xsl_manufacturer:*
--- 父菜单：MES基础资料 / MES资料（与备品件等脚本相同 @mes_base_pid）；修改租户改 SET @mes_tenant_id
+-- 父菜单：设备管理（@mes_equip_pid）；修改租户改 SET @mes_tenant_id
 -- 新环境也可依赖 Flyway：V3.9.2_63__mes_xsl_manufacturer.sql（与本文内容一致，重复执行幂等）
 SET NAMES utf8mb4;
 
@@ -47,19 +47,22 @@ CREATE TABLE IF NOT EXISTS `mes_xsl_manufacturer` (
 
 SET @mes_tenant_id = 1002;
 
-SET @mes_base_pid = (
-  SELECT MIN(`id`) FROM `sys_permission`
-  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` IN ('MES基础资料', 'MES资料')
+SET @mes_equip_pid = (
+  SELECT `id` FROM `sys_permission`
+  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` = '设备管理'
+  LIMIT 1
 );
-SET @mes_base_pid = IFNULL(@mes_base_pid, '1860000000000000001');
+SET @mes_equip_pid = IFNULL(@mes_equip_pid, '1860000000000000133');
 
 INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `keep_alive`, `internal_or_external`, `create_by`, `create_time`)
-VALUES ('1860000000000000112', @mes_base_pid, '厂家信息', '/xslmes/mesXslManufacturer', 'xslmes/mesXslManufacturer/MesXslManufacturerList', NULL, 1, NULL, '1', 17, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW())
+VALUES ('1860000000000000112', @mes_equip_pid, '厂家信息', '/xslmes/mesXslManufacturer', 'xslmes/mesXslManufacturer/MesXslManufacturerList', NULL, 1, NULL, '1', 8, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW())
 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`), `perms` = VALUES(`perms`), `perms_type` = VALUES(`perms_type`), `sort_no` = VALUES(`sort_no`),
 `is_route` = VALUES(`is_route`), `is_leaf` = VALUES(`is_leaf`), `hidden` = VALUES(`hidden`), `status` = VALUES(`status`), `del_flag` = VALUES(`del_flag`),
-`keep_alive` = VALUES(`keep_alive`), `internal_or_external` = VALUES(`internal_or_external`);
+`keep_alive` = VALUES(`keep_alive`), `internal_or_external` = VALUES(`internal_or_external`), `icon` = 'ant-design:shop-outlined';
+
+UPDATE `sys_permission` SET `icon` = 'ant-design:shop-outlined' WHERE `id` = '1860000000000000112' AND `del_flag` = 0;
 
 INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `status`, `del_flag`, `create_by`, `create_time`) VALUES
 ('1860000000000000113', '1860000000000000112', '新增', 2, 'mes:mes_xsl_manufacturer:add', '1', '1', 0, 'admin', NOW()),

jeecg-boot/db/mes-xsl-mixer-action-menu.sql

@@ -0,0 +1,92 @@
+-- 密炼机动作维护菜单与权限（挂到「MES密炼工程」目录）
+SET NAMES utf8mb4;
+
+SET @mixer_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 @mixer_parent_id = IFNULL(@mixer_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 @mixer_parent_id = IFNULL(@mixer_parent_id, '1860000000000000001');
+
+INSERT INTO sys_permission(
+  id, parent_id, name, url, component, component_name, menu_type, perms, perms_type, sort_no,
+  is_route, is_leaf, hidden, status, del_flag, keep_alive, internal_or_external, create_by, create_time
+)
+VALUES (
+  '1860000000000099211', @mixer_parent_id, '密炼机动作维护',
+  '/mes/mixeractioninfo',
+  'mes/mixeractioninfo/index',
+  'MesXslMixerActionList', 1, NULL, '1', 30,
+  1, 1, 0, '1', 0, 1, 0, 'admin', NOW()
+)
+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),
+  perms = VALUES(perms),
+  perms_type = VALUES(perms_type),
+  sort_no = VALUES(sort_no),
+  is_route = VALUES(is_route),
+  is_leaf = VALUES(is_leaf),
+  hidden = VALUES(hidden),
+  status = VALUES(status),
+  del_flag = VALUES(del_flag),
+  keep_alive = VALUES(keep_alive),
+  internal_or_external = VALUES(internal_or_external);
+
+INSERT INTO sys_permission(id, parent_id, name, menu_type, perms, perms_type, status, del_flag, create_by, create_time) VALUES
+('1860000000000099212', '1860000000000099211', '新增', 2, 'xslmes:mes_xsl_mixer_action:add', '1', '1', 0, 'admin', NOW()),
+('1860000000000099213', '1860000000000099211', '编辑', 2, 'xslmes:mes_xsl_mixer_action:edit', '1', '1', 0, 'admin', NOW()),
+('1860000000000099214', '1860000000000099211', '删除', 2, 'xslmes:mes_xsl_mixer_action:delete', '1', '1', 0, 'admin', NOW()),
+('1860000000000099215', '1860000000000099211', '批量删除', 2, 'xslmes:mes_xsl_mixer_action:deleteBatch', '1', '1', 0, 'admin', NOW()),
+('1860000000000099216', '1860000000000099211', '导出', 2, 'xslmes:mes_xsl_mixer_action:exportXls', '1', '1', 0, 'admin', NOW())
+ON DUPLICATE KEY UPDATE
+  parent_id = VALUES(parent_id),
+  name = VALUES(name),
+  menu_type = VALUES(menu_type),
+  perms = VALUES(perms),
+  perms_type = VALUES(perms_type),
+  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 (
+  '1860000000000099211',
+  '1860000000000099212', '1860000000000099213', '1860000000000099214', '1860000000000099215', '1860000000000099216'
+)
+  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 = @mixer_parent_id,
+  url = '/mes/mixeractioninfo',
+  component = 'mes/mixeractioninfo/index',
+  component_name = 'MesXslMixerActionList',
+  menu_type = 1,
+  is_route = 1,
+  is_leaf = 1,
+  hidden = 0,
+  status = '1',
+  del_flag = 0
+WHERE id = '1860000000000099211';

jeecg-boot/db/mes-xsl-move-menus-to-equipment-mgmt.sql

@@ -0,0 +1,62 @@
+-- 将设备类别/类型/部位/小部位、备品件、厂家、停机类菜单挂到「设备管理」目录下（工序管理仍留 MES基础资料）
+-- 前置：已执行 mes-xsl-equipment-ledger-menu-permission.sql 或 Flyway V3.9.2_72 创建「设备管理」目录 id=1860000000000000133
+-- 修改租户：改 SET @mes_tenant_id
+SET NAMES utf8mb4;
+
+SET @mes_tenant_id = 1002;
+
+SET @mes_equip_pid = (
+  SELECT `id` FROM `sys_permission`
+  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` = '设备管理'
+  LIMIT 1
+);
+SET @mes_equip_pid = IFNULL(@mes_equip_pid, '1860000000000000133');
+
+UPDATE `sys_permission`
+SET `is_leaf` = 0, `hidden` = 0, `status` = '1', `del_flag` = 0
+WHERE `id` = @mes_equip_pid;
+
+UPDATE `sys_permission` SET `parent_id` = @mes_equip_pid, `sort_no` = 1, `is_leaf` = 0 WHERE `id` = '1860000000000000134';
+UPDATE `sys_permission` SET `parent_id` = @mes_equip_pid, `sort_no` = 2, `is_leaf` = 0 WHERE `id` = '1860000000000000070';
+UPDATE `sys_permission` SET `parent_id` = @mes_equip_pid, `sort_no` = 3, `is_leaf` = 0 WHERE `id` = '1860000000000000077';
+UPDATE `sys_permission` SET `parent_id` = @mes_equip_pid, `sort_no` = 4, `is_leaf` = 0 WHERE `id` = '1860000000000000084';
+UPDATE `sys_permission` SET `parent_id` = @mes_equip_pid, `sort_no` = 5, `is_leaf` = 0 WHERE `id` = '1860000000000000091';
+UPDATE `sys_permission` SET `parent_id` = @mes_equip_pid, `sort_no` = 6, `is_leaf` = 0 WHERE `id` = '1860000000000000098';
+UPDATE `sys_permission` SET `parent_id` = @mes_equip_pid, `sort_no` = 7, `is_leaf` = 0 WHERE `id` = '1860000000000000105';
+UPDATE `sys_permission` SET `parent_id` = @mes_equip_pid, `sort_no` = 8, `is_leaf` = 0 WHERE `id` = '1860000000000000112';
+UPDATE `sys_permission` SET `parent_id` = @mes_equip_pid, `sort_no` = 9, `is_leaf` = 0 WHERE `id` = '1860000000000000119';
+UPDATE `sys_permission` SET `parent_id` = @mes_equip_pid, `sort_no` = 10, `is_leaf` = 0 WHERE `id` = '1860000000000000126';
+
+INSERT INTO `sys_role_permission`(`id`, `role_id`, `permission_id`, `operate_date`, `operate_ip`)
+SELECT REPLACE(UUID(), '-', ''), r.`id`, p.`id`, NOW(), '127.0.0.1'
+FROM `sys_role` r
+CROSS JOIN `sys_permission` p
+WHERE r.`tenant_id` = @mes_tenant_id
+  AND r.`role_code` = 'admin'
+  AND p.`id` IN (
+    @mes_equip_pid,
+    '1860000000000000134',
+    '1860000000000000070',
+    '1860000000000000071', '1860000000000000072', '1860000000000000073', '1860000000000000074', '1860000000000000075', '1860000000000000076',
+    '1860000000000000077',
+    '1860000000000000078', '1860000000000000079', '1860000000000000080', '1860000000000000081', '1860000000000000082', '1860000000000000083',
+    '1860000000000000084',
+    '1860000000000000085', '1860000000000000086', '1860000000000000087', '1860000000000000088', '1860000000000000089', '1860000000000000090',
+    '1860000000000000091',
+    '1860000000000000092', '1860000000000000093', '1860000000000000094', '1860000000000000095', '1860000000000000096', '1860000000000000097',
+    '1860000000000000098',
+    '1860000000000000099', '1860000000000000100', '1860000000000000101', '1860000000000000102', '1860000000000000103', '1860000000000000104',
+    '1860000000000000105',
+    '1860000000000000106', '1860000000000000107', '1860000000000000108', '1860000000000000109', '1860000000000000110', '1860000000000000111',
+    '1860000000000000112',
+    '1860000000000000113', '1860000000000000114', '1860000000000000115', '1860000000000000116', '1860000000000000117', '1860000000000000118',
+    '1860000000000000119',
+    '1860000000000000120', '1860000000000000121', '1860000000000000122', '1860000000000000123', '1860000000000000124', '1860000000000000125',
+    '1860000000000000126',
+    '1860000000000000127', '1860000000000000128', '1860000000000000129', '1860000000000000130', '1860000000000000131', '1860000000000000132',
+    '1860000000000000135', '1860000000000000136', '1860000000000000137', '1860000000000000138', '1860000000000000139', '1860000000000000140'
+  )
+  AND NOT EXISTS (
+    SELECT 1 FROM `sys_role_permission` rp
+    WHERE rp.`role_id` = r.`id` AND rp.`permission_id` = p.`id`
+  );

jeecg-boot/db/mes-xsl-move-process-equipment-menus-to-mes-base.sql

@@ -1,4 +1,4 @@
--- 工序管理、设备类别、设备类型：挂到「MES基础资料」下，并修复权限树（is_leaf）与租户 admin 授权
+-- 工序管理挂「MES基础资料」；设备类别、设备类型挂「设备管理」；修复权限树（is_leaf）与租户 admin 授权
 -- 适用：菜单曾在 MES XSL 根下或 is_leaf=1 导致角色授权页不显示按钮权限
 -- 修改租户：改 SET @mes_tenant_id
 SET NAMES utf8mb4;
@@ -16,10 +16,21 @@ SET @mes_base_pid = IFNULL(@mes_base_pid, (
 ));
 SET @mes_base_pid = IFNULL(@mes_base_pid, '1860000000000000001');
 
+SET @mes_equip_pid = (
+  SELECT `id` FROM `sys_permission`
+  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` = '设备管理'
+  LIMIT 1
+);
+SET @mes_equip_pid = IFNULL(@mes_equip_pid, '1860000000000000133');
+
 UPDATE `sys_permission`
 SET `is_leaf` = 0
 WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` IN ('MES基础资料', 'MES资料');
 
+UPDATE `sys_permission`
+SET `is_leaf` = 0
+WHERE `id` = @mes_equip_pid;
+
 INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `keep_alive`, `internal_or_external`, `create_by`, `create_time`)
 VALUES ('1860000000000000060', @mes_base_pid, '工序管理', '/xslmes/mesXslProcessOperation', 'xslmes/mesXslProcessOperation/MesXslProcessOperationList', NULL, 1, NULL, '1', 9, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW())
 ON DUPLICATE KEY UPDATE
@@ -37,7 +48,7 @@ ON DUPLICATE KEY UPDATE
 `parent_id` = VALUES(`parent_id`), `perms` = VALUES(`perms`), `is_leaf` = 1, `status` = '1', `del_flag` = 0;
 
 INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `keep_alive`, `internal_or_external`, `create_by`, `create_time`)
-VALUES ('1860000000000000070', @mes_base_pid, '设备类别', '/xslmes/mesXslEquipmentCategory', 'xslmes/mesXslEquipmentCategory/MesXslEquipmentCategoryList', NULL, 1, NULL, '1', 10, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW())
+VALUES ('1860000000000000070', @mes_equip_pid, '设备类别', '/xslmes/mesXslEquipmentCategory', 'xslmes/mesXslEquipmentCategory/MesXslEquipmentCategoryList', NULL, 1, NULL, '1', 2, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW())
 ON DUPLICATE KEY UPDATE
 `parent_id` = VALUES(`parent_id`), `url` = VALUES(`url`), `component` = VALUES(`component`),
 `is_leaf` = 0, `hidden` = 0, `status` = '1', `del_flag` = 0;
@@ -53,7 +64,7 @@ ON DUPLICATE KEY UPDATE
 `parent_id` = VALUES(`parent_id`), `perms` = VALUES(`perms`), `is_leaf` = 1, `status` = '1', `del_flag` = 0;
 
 INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `keep_alive`, `internal_or_external`, `create_by`, `create_time`)
-VALUES ('1860000000000000077', @mes_base_pid, '设备类型', '/xslmes/mesXslEquipmentType', 'xslmes/mesXslEquipmentType/MesXslEquipmentTypeList', NULL, 1, NULL, '1', 11, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW())
+VALUES ('1860000000000000077', @mes_equip_pid, '设备类型', '/xslmes/mesXslEquipmentType', 'xslmes/mesXslEquipmentType/MesXslEquipmentTypeList', NULL, 1, NULL, '1', 3, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW())
 ON DUPLICATE KEY UPDATE
 `parent_id` = VALUES(`parent_id`), `name` = VALUES(`name`), `url` = VALUES(`url`), `component` = VALUES(`component`),
 `is_leaf` = 0, `hidden` = 0, `status` = '1', `del_flag` = 0;

jeecg-boot/db/mes-xsl-process-and-category-menu-fix.sql

@@ -1,4 +1,4 @@
--- 工序管理(060)、设备类别(070)：补全菜单/按钮、挂 MES基础资料、修复 is_leaf、租户 admin 授权
+-- 工序管理(060)挂 MES基础资料；设备类别(070)挂设备管理；修复 is_leaf、租户 admin 授权
 -- 可重复执行；修改租户改 SET @mes_tenant_id
 SET NAMES utf8mb4;
 
@@ -15,10 +15,21 @@ SET @mes_base_pid = IFNULL(@mes_base_pid, (
 ));
 SET @mes_base_pid = IFNULL(@mes_base_pid, '1860000000000000001');
 
+SET @mes_equip_pid = (
+  SELECT `id` FROM `sys_permission`
+  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` = '设备管理'
+  LIMIT 1
+);
+SET @mes_equip_pid = IFNULL(@mes_equip_pid, '1860000000000000133');
+
 UPDATE `sys_permission`
 SET `is_leaf` = 0
 WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` IN ('MES基础资料', 'MES资料');
 
+UPDATE `sys_permission`
+SET `is_leaf` = 0
+WHERE `id` = @mes_equip_pid;
+
 -- 工序管理
 INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `keep_alive`, `internal_or_external`, `create_by`, `create_time`)
 VALUES ('1860000000000000060', @mes_base_pid, '工序管理', '/xslmes/mesXslProcessOperation', 'xslmes/mesXslProcessOperation/MesXslProcessOperationList', NULL, 1, NULL, '1', 9, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW())
@@ -42,7 +53,7 @@ UPDATE `sys_permission` SET `name` = '新增' WHERE `id` = '1860000000000000061'
 
 -- 设备类别
 INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `keep_alive`, `internal_or_external`, `create_by`, `create_time`)
-VALUES ('1860000000000000070', @mes_base_pid, '设备类别', '/xslmes/mesXslEquipmentCategory', 'xslmes/mesXslEquipmentCategory/MesXslEquipmentCategoryList', NULL, 1, NULL, '1', 10, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW())
+VALUES ('1860000000000000070', @mes_equip_pid, '设备类别', '/xslmes/mesXslEquipmentCategory', 'xslmes/mesXslEquipmentCategory/MesXslEquipmentCategoryList', NULL, 1, NULL, '1', 2, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW())
 ON DUPLICATE KEY UPDATE
 `parent_id` = VALUES(`parent_id`), `name` = VALUES(`name`), `url` = VALUES(`url`), `component` = VALUES(`component`),
 `menu_type` = VALUES(`menu_type`), `perms_type` = VALUES(`perms_type`), `sort_no` = VALUES(`sort_no`),

jeecg-boot/db/mes-xsl-spare-part-menu-permission.sql

@@ -26,19 +26,22 @@ CREATE TABLE IF NOT EXISTS `mes_xsl_spare_part` (
 
 SET @mes_tenant_id = 1002;
 
-SET @mes_base_pid = (
-  SELECT MIN(`id`) FROM `sys_permission`
-  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` IN ('MES基础资料', 'MES资料')
+SET @mes_equip_pid = (
+  SELECT `id` FROM `sys_permission`
+  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` = '设备管理'
+  LIMIT 1
 );
-SET @mes_base_pid = IFNULL(@mes_base_pid, '1860000000000000001');
+SET @mes_equip_pid = IFNULL(@mes_equip_pid, '1860000000000000133');
 
 INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `keep_alive`, `internal_or_external`, `create_by`, `create_time`)
-VALUES ('1860000000000000105', @mes_base_pid, '备品件信息', '/xslmes/mesXslSparePart', 'xslmes/mesXslSparePart/MesXslSparePartList', NULL, 1, NULL, '1', 16, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW())
+VALUES ('1860000000000000105', @mes_equip_pid, '备品件信息', '/xslmes/mesXslSparePart', 'xslmes/mesXslSparePart/MesXslSparePartList', NULL, 1, NULL, '1', 7, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW())
 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`), `perms` = VALUES(`perms`), `perms_type` = VALUES(`perms_type`), `sort_no` = VALUES(`sort_no`),
 `is_route` = VALUES(`is_route`), `is_leaf` = VALUES(`is_leaf`), `hidden` = VALUES(`hidden`), `status` = VALUES(`status`), `del_flag` = VALUES(`del_flag`),
-`keep_alive` = VALUES(`keep_alive`), `internal_or_external` = VALUES(`internal_or_external`);
+`keep_alive` = VALUES(`keep_alive`), `internal_or_external` = VALUES(`internal_or_external`), `icon` = 'ant-design:shopping-outlined';
+
+UPDATE `sys_permission` SET `icon` = 'ant-design:shopping-outlined' WHERE `id` = '1860000000000000105' AND `del_flag` = 0;
 
 INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `status`, `del_flag`, `create_by`, `create_time`) VALUES
 ('1860000000000000106', '1860000000000000105', '新增', 2, 'mes:mes_xsl_spare_part:add', '1', '1', 0, 'admin', NOW()),

jeecg-boot/db/mes-xsl-spare-parts-category-menu-permission.sql

@@ -20,19 +20,22 @@ CREATE TABLE IF NOT EXISTS `mes_xsl_spare_parts_category` (
 
 SET @mes_tenant_id = 1002;
 
-SET @mes_base_pid = (
-  SELECT MIN(`id`) FROM `sys_permission`
-  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` IN ('MES基础资料', 'MES资料')
+SET @mes_equip_pid = (
+  SELECT `id` FROM `sys_permission`
+  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` = '设备管理'
+  LIMIT 1
 );
-SET @mes_base_pid = IFNULL(@mes_base_pid, '1860000000000000001');
+SET @mes_equip_pid = IFNULL(@mes_equip_pid, '1860000000000000133');
 
 INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `keep_alive`, `internal_or_external`, `create_by`, `create_time`)
-VALUES ('1860000000000000098', @mes_base_pid, '备品件类别', '/xslmes/mesXslSparePartsCategory', 'xslmes/mesXslSparePartsCategory/MesXslSparePartsCategoryList', NULL, 1, NULL, '1', 15, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW())
+VALUES ('1860000000000000098', @mes_equip_pid, '备品件类别', '/xslmes/mesXslSparePartsCategory', 'xslmes/mesXslSparePartsCategory/MesXslSparePartsCategoryList', NULL, 1, NULL, '1', 6, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW())
 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`), `perms` = VALUES(`perms`), `perms_type` = VALUES(`perms_type`), `sort_no` = VALUES(`sort_no`),
 `is_route` = VALUES(`is_route`), `is_leaf` = VALUES(`is_leaf`), `hidden` = VALUES(`hidden`), `status` = VALUES(`status`), `del_flag` = VALUES(`del_flag`),
-`keep_alive` = VALUES(`keep_alive`), `internal_or_external` = VALUES(`internal_or_external`);
+`keep_alive` = VALUES(`keep_alive`), `internal_or_external` = VALUES(`internal_or_external`), `icon` = 'ant-design:tags-outlined';
+
+UPDATE `sys_permission` SET `icon` = 'ant-design:tags-outlined' WHERE `id` = '1860000000000000098' AND `del_flag` = 0;
 
 INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `status`, `del_flag`, `create_by`, `create_time`) VALUES
 ('1860000000000000099', '1860000000000000098', '新增', 2, 'mes:mes_xsl_spare_parts_category:add', '1', '1', 0, 'admin', NOW()),

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

@@ -0,0 +1,105 @@
+-- author:jiangxh---date:20260521--for: 【配合示方】新增配合示方主子表模块 ---
+jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_91__mes_xsl_formula_spec.sql
+jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslFormulaSpec.java
+jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslFormulaSpecLine.java
+jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/vo/MesXslFormulaSpecPage.java
+jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslFormulaSpecMapper.java
+jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslFormulaSpecLineMapper.java
+jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslFormulaSpecService.java
+jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslFormulaSpecServiceImpl.java
+jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslFormulaSpecController.java
+jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpecList.vue
+jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.data.ts
+jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.api.ts
+jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
+
+-- author:jiangxh---date:20260521--for: 【配合示方】主表新增混合段1-7合计字段 ---
+jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_92__mes_xsl_formula_spec_stage_total.sql
+jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslFormulaSpec.java
+jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.data.ts
+jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
+
+-- author:cursor---date:20260521--for: 【配合示方】STEP全为A/Q时对应胶比重清零 ---
+jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslFormulaSpecServiceImpl.java
+jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.data.ts
+jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
+
+-- author:cursor---date:20260521--for: 【配合示方】含胶率按密炼物料小类汇总重量% ---
+jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslFormulaSpecServiceImpl.java
+jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.data.ts
+jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
+jeecgboot-vue3/src/views/mes/material/modules/MesMixerMaterialSelectModal.vue
+
+-- author:cursor---date:20260521--for: 【配合示方】含胶率物料小类可配置设置弹窗 ---
+jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_96__mes_xsl_formula_spec_rubber_content_setting.sql
+jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslFormulaSpecSetting.java
+jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/vo/MesXslFormulaRubberContentSettingVO.java
+jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslFormulaSpecSettingMapper.java
+jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslFormulaSpecSettingService.java
+jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslFormulaSpecSettingServiceImpl.java
+jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslFormulaSpecController.java
+jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslFormulaSpecServiceImpl.java
+jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.api.ts
+jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.data.ts
+jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
+jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaRubberContentSettingModal.vue
+
+-- author:cursor---date:20260521--for: 【配合示方】含胶率设置改用系统MES物料分类字典 ---
+jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.data.ts
+jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.api.ts
+jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaRubberContentSettingModal.vue
+jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslFormulaSpecSettingService.java
+jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslFormulaSpecSettingServiceImpl.java
+jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslFormulaSpecController.java
+
+-- author:cursor---date:20260521--for: 【配合示方】含胶率设置小类下拉对齐密炼物料loadTreeData加载 ---
+jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.data.ts
+jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaRubberContentSettingModal.vue
+
+-- author:cursor---date:20260521--for: 【配合示方】含胶率设置改为loadAllData加载MES物料分类全部节点 ---
+jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.data.ts
+jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaRubberContentSettingModal.vue
+
+-- author:cursor---date:20260521--for: 【配合示方】含胶率设置弹窗openModal未传data导致不加载分类 ---
+jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
+jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaRubberContentSettingModal.vue
+
+-- author:cursor---date:20260521--for: 【配合示方】明细新增物料大类/小类展示列（不落库） ---
+jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.data.ts
+jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
+jeecgboot-vue3/src/views/mes/material/modules/MesMixerMaterialSelectModal.vue
+
+-- author:cursor---date:20260521--for: 【配合示方】明细备注列与1-7段列宽适当缩小 ---
+jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.data.ts
+
+-- author:cursor---date:20260521--for: 【配合示方】基本信息模块改为汇总格状布局 ---
+jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
+
+-- author:cursor---date:20260521--for: 【配合示方】基本信息改为显式表格格状布局 ---
+jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
+jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.data.ts
+
+-- author:cursor---date:20260521--for: 【配合示方】汇总与基本信息标题格增加内阴影 ---
+jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
+
+-- author:cursor---date:20260521--for: 【配合示方】明细列表新增列显示/隐藏设置 ---
+jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.data.ts
+jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
+jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaLineColumnSetting.vue
+
+-- author:cursor---date:20260521--for: 【配合示方】明细列表列设置改为保存后生效并修复勾选状态 ---
+jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.data.ts
+jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
+jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaLineColumnSetting.vue
+
+-- author:cursor---date:20260521--for: 【配合示方】审批进度编制人展示真实姓名 ---
+jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.data.ts
+jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
+jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslFormulaSpec.java
+jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslFormulaSpecServiceImpl.java
+
+-- author:cursor---date:20260521--for: 【配合示方】编辑页A胶TOTAL PHR缺失时按明细补算回显 ---
+jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
+
+-- author:cursor---date:20260521--for: 【配合示方】编辑打开时基本资料闪清修复 ---
+jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue

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

@@ -0,0 +1,151 @@
+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 java.util.Arrays;
+import org.apache.commons.lang3.StringUtils;
+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.common.util.oConvertUtils;
+import org.jeecg.modules.xslmes.entity.MesXslDayTankMaterialMap;
+import org.jeecg.modules.xslmes.service.IMesXslDayTankMaterialMapService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+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.RequestMethod;
+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/mesXslDayTankMaterialMap")
+public class MesXslDayTankMaterialMapController
+    extends JeecgController<MesXslDayTankMaterialMap, IMesXslDayTankMaterialMapService> {
+
+  @Autowired private IMesXslDayTankMaterialMapService dayTankMaterialMapService;
+
+  @Operation(summary = "日罐物料对应信息-分页列表查询")
+  @GetMapping("/list")
+  public Result<IPage<MesXslDayTankMaterialMap>> queryPageList(
+      MesXslDayTankMaterialMap model,
+      @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+      HttpServletRequest req) {
+    QueryWrapper<MesXslDayTankMaterialMap> queryWrapper = QueryGenerator.initQueryWrapper(model, req.getParameterMap());
+    queryWrapper.orderByDesc("create_time");
+    IPage<MesXslDayTankMaterialMap> pageList = dayTankMaterialMapService.page(new Page<>(pageNo, pageSize), queryWrapper);
+    return Result.OK(pageList);
+  }
+
+  @AutoLog(value = "日罐物料对应信息-添加")
+  @Operation(summary = "日罐物料对应信息-添加")
+  @RequiresPermissions("xslmes:mes_xsl_day_tank_material_map:add")
+  @PostMapping("/add")
+  public Result<String> add(@RequestBody MesXslDayTankMaterialMap model) {
+    String err = validateForSave(model);
+    if (err != null) {
+      return Result.error(err);
+    }
+    dayTankMaterialMapService.fillReferenceFields(model);
+    if (StringUtils.isBlank(model.getMachineCode()) || StringUtils.isBlank(model.getMachineName())) {
+      return Result.error("请选择有效的机台名称");
+    }
+    if (StringUtils.isBlank(model.getMaterialName())) {
+      return Result.error("请选择有效的物料名称");
+    }
+    dayTankMaterialMapService.save(model);
+    return Result.OK("添加成功！");
+  }
+
+  @AutoLog(value = "日罐物料对应信息-编辑")
+  @Operation(summary = "日罐物料对应信息-编辑")
+  @RequiresPermissions("xslmes:mes_xsl_day_tank_material_map:edit")
+  @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+  public Result<String> edit(@RequestBody MesXslDayTankMaterialMap model) {
+    String err = validateForSave(model);
+    if (err != null) {
+      return Result.error(err);
+    }
+    dayTankMaterialMapService.fillReferenceFields(model);
+    if (StringUtils.isBlank(model.getMachineCode()) || StringUtils.isBlank(model.getMachineName())) {
+      return Result.error("请选择有效的机台名称");
+    }
+    if (StringUtils.isBlank(model.getMaterialName())) {
+      return Result.error("请选择有效的物料名称");
+    }
+    dayTankMaterialMapService.updateById(model);
+    return Result.OK("编辑成功!");
+  }
+
+  @AutoLog(value = "日罐物料对应信息-通过id删除")
+  @Operation(summary = "日罐物料对应信息-通过id删除")
+  @RequiresPermissions("xslmes:mes_xsl_day_tank_material_map:delete")
+  @DeleteMapping("/delete")
+  public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+    dayTankMaterialMapService.removeById(id);
+    return Result.OK("删除成功!");
+  }
+
+  @AutoLog(value = "日罐物料对应信息-批量删除")
+  @Operation(summary = "日罐物料对应信息-批量删除")
+  @RequiresPermissions("xslmes:mes_xsl_day_tank_material_map:deleteBatch")
+  @DeleteMapping("/deleteBatch")
+  public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+    dayTankMaterialMapService.removeByIds(Arrays.asList(ids.split(",")));
+    return Result.OK("批量删除成功!");
+  }
+
+  @Operation(summary = "日罐物料对应信息-通过id查询")
+  @GetMapping("/queryById")
+  public Result<MesXslDayTankMaterialMap> queryById(@RequestParam(name = "id", required = true) String id) {
+    MesXslDayTankMaterialMap entity = dayTankMaterialMapService.getById(id);
+    if (entity == null) {
+      return Result.error("未找到对应数据");
+    }
+    return Result.OK(entity);
+  }
+
+  @RequiresPermissions("xslmes:mes_xsl_day_tank_material_map:exportXls")
+  @RequestMapping("/exportXls")
+  public ModelAndView exportXls(HttpServletRequest request, MesXslDayTankMaterialMap model) {
+    return super.exportXls(request, model, MesXslDayTankMaterialMap.class, "日罐物料对应信息");
+  }
+
+  private String validateForSave(MesXslDayTankMaterialMap model) {
+    if (oConvertUtils.isEmpty(model.getEquipmentId()) || StringUtils.isBlank(model.getEquipmentId())) {
+      return "机台名称不能为空";
+    }
+    model.setEquipmentId(model.getEquipmentId().trim());
+    if (oConvertUtils.isEmpty(model.getMaterialId()) || StringUtils.isBlank(model.getMaterialId())) {
+      return "物料名称不能为空";
+    }
+    model.setMaterialId(model.getMaterialId().trim());
+    if (model.getUseStatus() == null) {
+      model.setUseStatus(1);
+    }
+    if (model.getAllowSync() == null) {
+      model.setAllowSync(1);
+    }
+    if (model.getSiloCategoryId() != null) {
+      model.setSiloCategoryId(model.getSiloCategoryId().trim());
+    }
+    if (model.getStation() != null) {
+      model.setStation(model.getStation().trim());
+    }
+    if (model.getSiloNo() != null) {
+      model.setSiloNo(model.getSiloNo().trim());
+    }
+    return null;
+  }
+}

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

@@ -0,0 +1,230 @@
+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 jakarta.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import lombok.extern.slf4j.Slf4j;
+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.constant.CommonConstant;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfig;
+import org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfigLine;
+import org.jeecg.modules.xslmes.entity.MesXslEquipmentLedger;
+import org.jeecg.modules.xslmes.entity.MesXslInspectMaintainItem;
+import org.jeecg.modules.xslmes.service.IMesXslEquipInspectConfigService;
+import org.jeecg.modules.xslmes.service.IMesXslEquipmentLedgerService;
+import org.jeecg.modules.xslmes.service.IMesXslInspectMaintainItemService;
+import org.jeecg.modules.xslmes.vo.MesXslEquipInspectConfigPage;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+/**
+ * MES 设备点检配置（主子表）
+ */
+@Tag(name = "MES设备点检配置")
+@RestController
+@RequestMapping("/xslmes/mesXslEquipInspectConfig")
+@Slf4j
+public class MesXslEquipInspectConfigController
+        extends JeecgController<MesXslEquipInspectConfig, IMesXslEquipInspectConfigService> {
+
+    private static final Set<String> CONFIG_TYPE = Set.of("inspect", "maintain");
+
+    @Autowired
+    private IMesXslEquipInspectConfigService mesXslEquipInspectConfigService;
+
+    @Autowired
+    private IMesXslEquipmentLedgerService mesXslEquipmentLedgerService;
+
+    @Autowired
+    private IMesXslInspectMaintainItemService mesXslInspectMaintainItemService;
+
+    @Operation(summary = "MES设备点检配置-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<MesXslEquipInspectConfig>> queryPageList(
+            MesXslEquipInspectConfig model,
+            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+            HttpServletRequest req) {
+        QueryWrapper<MesXslEquipInspectConfig> queryWrapper = QueryGenerator.initQueryWrapper(model, req.getParameterMap());
+        queryWrapper.orderByDesc("create_time");
+        Page<MesXslEquipInspectConfig> page = new Page<>(pageNo, pageSize);
+        IPage<MesXslEquipInspectConfig> pageList = mesXslEquipInspectConfigService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    @AutoLog(value = "MES设备点检配置-添加")
+    @Operation(summary = "MES设备点检配置-添加")
+    @RequiresPermissions("mes:mes_xsl_equip_inspect_config:add")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody MesXslEquipInspectConfigPage page) {
+        MesXslEquipInspectConfig main = new MesXslEquipInspectConfig();
+        BeanUtils.copyProperties(page, main);
+        //update-begin---author:jiangxh ---date:20260519  for：【MES】设备点检配置保存校验-----------
+        String err = validateForSave(main, page.getLineList(), null);
+        if (err != null) {
+            return Result.error(err);
+        }
+        //update-end---author:jiangxh ---date:20260519  for：【MES】设备点检配置保存校验-----------
+        mesXslEquipInspectConfigService.saveMain(main, page.getLineList());
+        return Result.OK("添加成功！");
+    }
+
+    @AutoLog(value = "MES设备点检配置-编辑")
+    @Operation(summary = "MES设备点检配置-编辑")
+    @RequiresPermissions("mes:mes_xsl_equip_inspect_config:edit")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody MesXslEquipInspectConfigPage page) {
+        MesXslEquipInspectConfig main = new MesXslEquipInspectConfig();
+        BeanUtils.copyProperties(page, main);
+        //update-begin---author:jiangxh ---date:20260519  for：【MES】设备点检配置保存校验-----------
+        String err = validateForSave(main, page.getLineList(), main.getId());
+        if (err != null) {
+            return Result.error(err);
+        }
+        //update-end---author:jiangxh ---date:20260519  for：【MES】设备点检配置保存校验-----------
+        mesXslEquipInspectConfigService.updateMain(main, page.getLineList());
+        return Result.OK("编辑成功!");
+    }
+
+    @AutoLog(value = "MES设备点检配置-删除")
+    @Operation(summary = "MES设备点检配置-通过id删除")
+    @RequiresPermissions("mes:mes_xsl_equip_inspect_config:delete")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        mesXslEquipInspectConfigService.delMain(id);
+        return Result.OK("删除成功!");
+    }
+
+    @AutoLog(value = "MES设备点检配置-批量删除")
+    @Operation(summary = "MES设备点检配置-批量删除")
+    @RequiresPermissions("mes:mes_xsl_equip_inspect_config:deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        mesXslEquipInspectConfigService.delBatchMain(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
+
+    @Operation(summary = "MES设备点检配置-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<MesXslEquipInspectConfig> queryById(@RequestParam(name = "id", required = true) String id) {
+        MesXslEquipInspectConfig entity = mesXslEquipInspectConfigService.getById(id);
+        if (entity == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(entity);
+    }
+
+    @Operation(summary = "MES设备点检配置-查询明细")
+    @GetMapping(value = "/queryLineListByConfigId")
+    public Result<List<MesXslEquipInspectConfigLine>> queryLineListByConfigId(
+            @RequestParam(name = "id", required = true) String id) {
+        return Result.OK(mesXslEquipInspectConfigService.selectLinesByConfigId(id));
+    }
+
+    @RequiresPermissions("mes:mes_xsl_equip_inspect_config:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, MesXslEquipInspectConfig model) {
+        return super.exportXls(request, model, MesXslEquipInspectConfig.class, "MES设备点检配置");
+    }
+
+    @RequiresPermissions("mes:mes_xsl_equip_inspect_config:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, MesXslEquipInspectConfig.class);
+    }
+
+    //update-begin---author:jiangxh ---date:20260519  for：【MES】设备点检配置：主表唯一、明细项目不重复、从点检保养项目带出-----------
+    private String validateForSave(
+            MesXslEquipInspectConfig main, List<MesXslEquipInspectConfigLine> lineList, String excludeId) {
+        if (main == null) {
+            return "参数不能为空";
+        }
+        if (oConvertUtils.isEmpty(main.getEquipmentLedgerId())) {
+            return "请选择设备台账";
+        }
+        MesXslEquipmentLedger ledger = mesXslEquipmentLedgerService.getById(main.getEquipmentLedgerId());
+        if (ledger == null || isDeleted(ledger.getDelFlag())) {
+            return "设备台账不存在或已删除";
+        }
+        main.setEquipmentName(ledger.getEquipmentName());
+        main.setEquipmentCode(ledger.getEquipmentCode());
+
+        String configType = main.getConfigType();
+        if (configType != null) {
+            configType = configType.trim();
+        }
+        if (oConvertUtils.isEmpty(configType) || !CONFIG_TYPE.contains(configType)) {
+            return "类型无效，请选择点检或保养";
+        }
+        main.setConfigType(configType);
+
+        if (mesXslEquipInspectConfigService.isConfigDuplicated(
+                main.getEquipmentLedgerId(), configType, excludeId, main)) {
+            return "该设备在此类型（点检/保养）下已存在配置，不能重复添加";
+        }
+
+        if (lineList == null || lineList.isEmpty()) {
+            return "请至少添加一条点检项目明细";
+        }
+
+        Set<String> itemIds = new HashSet<>();
+        int sort = 0;
+        for (int i = 0; i < lineList.size(); i++) {
+            MesXslEquipInspectConfigLine line = lineList.get(i);
+            if (line == null) {
+                continue;
+            }
+            int rowNo = i + 1;
+            if (oConvertUtils.isEmpty(line.getInspectMaintainItemId())) {
+                return "第 " + rowNo + " 行未选择点检及保养项目";
+            }
+            String itemId = line.getInspectMaintainItemId().trim();
+            if (!itemIds.add(itemId)) {
+                return "第 " + rowNo + " 行点检项目与前面行重复，同一配置中点检项目不能重复";
+            }
+            MesXslInspectMaintainItem item = mesXslInspectMaintainItemService.getById(itemId);
+            if (item == null || isDeleted(item.getDelFlag())) {
+                return "第 " + rowNo + " 行点检及保养项目不存在或已删除";
+            }
+            if (!configType.equals(item.getItemCategory())) {
+                return "第 " + rowNo + " 行项目类别与配置类型不一致（配置为"
+                        + ("inspect".equals(configType) ? "点检" : "保养")
+                        + "）";
+            }
+            line.setInspectMaintainItemId(itemId);
+            line.setItemCode(item.getItemCode());
+            line.setItemName(item.getItemName());
+            line.setItemCategory(item.getItemCategory());
+            line.setItemType(item.getItemType());
+            line.setEquipmentPartName(item.getEquipmentPartName());
+            line.setEquipmentSubPartName(item.getEquipmentSubPartName());
+            line.setInspectMethod(item.getInspectMethod());
+            line.setJudgmentCriteria(item.getJudgmentCriteria());
+            line.setSortNo(sort++);
+        }
+        if (itemIds.isEmpty()) {
+            return "请至少添加一条点检项目明细";
+        }
+        return null;
+    }
+
+    private static boolean isDeleted(Integer delFlag) {
+        return delFlag != null && delFlag.equals(CommonConstant.DEL_FLAG_1);
+    }
+    //update-end---author:jiangxh ---date:20260519  for：【MES】设备点检配置：主表唯一、明细项目不重复、从点检保养项目带出-----------
+}

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

@@ -0,0 +1,411 @@
+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 jakarta.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
+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.constant.CommonConstant;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfig;
+import org.jeecg.modules.xslmes.entity.MesXslEquipInspectRecord;
+import org.jeecg.modules.xslmes.entity.MesXslEquipInspectRecordLine;
+import org.jeecg.modules.xslmes.entity.MesXslEquipmentLedger;
+import org.jeecg.modules.xslmes.service.IMesXslEquipInspectConfigService;
+import org.jeecg.modules.xslmes.service.IMesXslEquipInspectRecordService;
+import org.jeecg.modules.xslmes.service.IMesXslEquipmentLedgerService;
+import org.jeecg.modules.xslmes.util.MesXslEquipInspectBizMsg;
+import org.jeecg.modules.xslmes.vo.MesXslEquipInspectRecordBatchCreateDTO;
+import org.jeecg.modules.xslmes.vo.MesXslEquipInspectRecordBatchCreateResult;
+import org.jeecg.modules.xslmes.vo.MesXslEquipInspectRecordHandleDTO;
+import org.jeecg.modules.xslmes.vo.MesXslEquipInspectRecordPage;
+import org.springframework.beans.BeanUtils;
+import org.springframework.util.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+/**
+ * MES 点检/保养记录（主子表）
+ */
+@Tag(name = "MES点检保养记录")
+@RestController
+@RequestMapping("/xslmes/mesXslEquipInspectRecord")
+@Slf4j
+public class MesXslEquipInspectRecordController
+        extends JeecgController<MesXslEquipInspectRecord, IMesXslEquipInspectRecordService> {
+
+    private static final Set<String> RECORD_TYPE = Set.of("inspect", "maintain");
+    private static final Set<String> INSPECT_RESULT = Set.of("pass", "fail");
+    private static final Set<String> RECORD_STATUS = Set.of("pending", "done");
+
+    @Autowired
+    private IMesXslEquipInspectRecordService mesXslEquipInspectRecordService;
+
+    @Autowired
+    private IMesXslEquipmentLedgerService mesXslEquipmentLedgerService;
+
+    @Autowired
+    private IMesXslEquipInspectConfigService mesXslEquipInspectConfigService;
+
+    @Operation(summary = "MES点检保养记录-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<MesXslEquipInspectRecord>> queryPageList(
+            MesXslEquipInspectRecord model,
+            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+            HttpServletRequest req) {
+        QueryWrapper<MesXslEquipInspectRecord> queryWrapper = QueryGenerator.initQueryWrapper(model, req.getParameterMap());
+        queryWrapper.orderByDesc("create_time");
+        Page<MesXslEquipInspectRecord> page = new Page<>(pageNo, pageSize);
+        IPage<MesXslEquipInspectRecord> pageList = mesXslEquipInspectRecordService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    @AutoLog(value = "MES点检保养记录-添加")
+    @Operation(summary = "MES点检保养记录-添加")
+    @RequiresPermissions("mes:mes_xsl_equip_inspect_record:add")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody MesXslEquipInspectRecordPage page) {
+        MesXslEquipInspectRecord main = new MesXslEquipInspectRecord();
+        BeanUtils.copyProperties(page, main);
+        String err = validateForSave(main, page.getLineList(), null);
+        if (err != null) {
+            return Result.error(err);
+        }
+        fillRecordNoIfEmpty(main);
+        fillInspector(main);
+        mesXslEquipInspectRecordService.saveMain(main, page.getLineList());
+        return Result.OK("添加成功！");
+    }
+
+    @AutoLog(value = "MES点检保养记录-编辑")
+    @Operation(summary = "MES点检保养记录-编辑")
+    @RequiresPermissions("mes:mes_xsl_equip_inspect_record:edit")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody MesXslEquipInspectRecordPage page) {
+        MesXslEquipInspectRecord main = new MesXslEquipInspectRecord();
+        BeanUtils.copyProperties(page, main);
+        //update-begin---author:jiangxh ---date:20260520  for：【MES】仅待点检可录入，保存后变已点检-----------
+        if (oConvertUtils.isEmpty(main.getId())) {
+            return Result.error("记录主键不能为空");
+        }
+        MesXslEquipInspectRecord existing = mesXslEquipInspectRecordService.getById(main.getId());
+        if (existing == null) {
+            return Result.error("未找到对应数据");
+        }
+        if ("done".equals(existing.getRecordStatus())) {
+            return Result.error("已点检记录不可修改，仅可查看");
+        }
+        main.setRecordStatus("done");
+        String err = validateForEntry(main, page.getLineList());
+        if (err != null) {
+            return Result.error(err);
+        }
+        fillInspector(main);
+        mesXslEquipInspectRecordService.updateMain(main, page.getLineList());
+        return Result.OK("录入成功!");
+        //update-end---author:jiangxh ---date:20260520  for：【MES】仅待点检可录入，保存后变已点检-----------
+    }
+
+    @AutoLog(value = "MES点检保养记录-删除")
+    @Operation(summary = "MES点检保养记录-通过id删除")
+    @RequiresPermissions("mes:mes_xsl_equip_inspect_record:delete")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        mesXslEquipInspectRecordService.delMain(id);
+        return Result.OK("删除成功!");
+    }
+
+    @AutoLog(value = "MES点检保养记录-批量删除")
+    @Operation(summary = "MES点检保养记录-批量删除")
+    @RequiresPermissions("mes:mes_xsl_equip_inspect_record:deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        mesXslEquipInspectRecordService.delBatchMain(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
+
+    @Operation(summary = "MES点检保养记录-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<MesXslEquipInspectRecord> queryById(@RequestParam(name = "id", required = true) String id) {
+        MesXslEquipInspectRecord entity = mesXslEquipInspectRecordService.getById(id);
+        if (entity == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(entity);
+    }
+
+    @Operation(summary = "MES点检保养记录-查询明细")
+    @GetMapping(value = "/queryLineListByRecordId")
+    public Result<List<MesXslEquipInspectRecordLine>> queryLineListByRecordId(
+            @RequestParam(name = "id", required = true) String id) {
+        return Result.OK(mesXslEquipInspectRecordService.selectLinesByRecordId(id));
+    }
+
+    //update-begin---author:jiangxh ---date:20260521  for：【MES】不合格点检记录登记处理人及处理时间-----------
+    @AutoLog(value = "MES点检保养记录-不合格处理")
+    @Operation(summary = "MES点检保养记录-不合格处理")
+    @RequiresPermissions("mes:mes_xsl_equip_inspect_record:edit")
+    @PostMapping(value = "/handleFail")
+    public Result<String> handleFail(@RequestBody MesXslEquipInspectRecordHandleDTO dto) {
+        try {
+            mesXslEquipInspectRecordService.handleFailRecord(dto);
+            return Result.OK("处理成功!");
+        } catch (IllegalArgumentException ex) {
+            return Result.error(ex.getMessage());
+        }
+    }
+    //update-end---author:jiangxh ---date:20260521  for：【MES】不合格点检记录登记处理人及处理时间-----------
+
+    @Operation(summary = "MES点检保养记录-生成记录编号")
+    @GetMapping(value = "/generateRecordNo")
+    public Result<String> generateRecordNo() {
+        MesXslEquipInspectRecord ctx = new MesXslEquipInspectRecord();
+        return Result.OK(mesXslEquipInspectRecordService.generateRecordNo(ctx));
+    }
+
+    @AutoLog(value = "MES点检保养记录-从设备台账批量生成")
+    @Operation(summary = "MES点检保养记录-从设备台账批量生成")
+    @RequiresPermissions("mes:mes_xsl_equip_inspect_record:add")
+    @PostMapping(value = "/batchCreateFromEquipment")
+    public Result<MesXslEquipInspectRecordBatchCreateResult> batchCreateFromEquipment(
+            @RequestBody MesXslEquipInspectRecordBatchCreateDTO dto) {
+        if (dto == null || CollectionUtils.isEmpty(dto.getEquipmentLedgerIds())) {
+            return Result.error("请先选择设备");
+        }
+        String recordType = dto.getRecordType();
+        if (recordType != null) {
+            recordType = recordType.trim();
+        }
+        if (oConvertUtils.isEmpty(recordType) || !RECORD_TYPE.contains(recordType)) {
+            return Result.error("类型无效，请使用点检或保养");
+        }
+        MesXslEquipInspectRecord inspectorCtx = new MesXslEquipInspectRecord();
+        fillInspector(inspectorCtx);
+        MesXslEquipInspectRecordBatchCreateResult result =
+                mesXslEquipInspectRecordService.batchCreateFromEquipment(
+                        dto.getEquipmentLedgerIds(), recordType, inspectorCtx);
+        if (result.getSuccessCount() <= 0 && !result.getFailMessages().isEmpty()) {
+            return Result.error(String.join("；", result.getFailMessages()));
+        }
+        String msg = "成功生成 " + result.getSuccessCount() + " 条记录";
+        if (!result.getFailMessages().isEmpty()) {
+            msg = msg + "；" + String.join("；", result.getFailMessages());
+        }
+        return Result.OK(msg, result);
+    }
+
+    @Operation(summary = "MES点检保养记录-按设备与类型带出配置明细")
+    @GetMapping(value = "/loadLinesByEquipment")
+    public Result<List<MesXslEquipInspectRecordLine>> loadLinesByEquipment(
+            @RequestParam(name = "equipmentLedgerId") String equipmentLedgerId,
+            @RequestParam(name = "recordType") String recordType) {
+        String type = recordType != null ? recordType.trim() : "";
+        if (oConvertUtils.isEmpty(equipmentLedgerId) || !RECORD_TYPE.contains(type)) {
+            return Result.error("请选择设备与类型（点检/保养）");
+        }
+        List<MesXslEquipInspectRecordLine> lines =
+                mesXslEquipInspectRecordService.buildLinesFromEquipConfig(equipmentLedgerId, type);
+        if (lines.isEmpty()) {
+            MesXslEquipmentLedger ledger = mesXslEquipmentLedgerService.getById(equipmentLedgerId);
+            String equipName =
+                    ledger != null && oConvertUtils.isNotEmpty(ledger.getEquipmentName())
+                            ? ledger.getEquipmentName()
+                            : (ledger != null ? ledger.getEquipmentCode() : equipmentLedgerId);
+            return Result.error(MesXslEquipInspectBizMsg.noConfigMessage(equipName, type));
+        }
+        return Result.OK(lines);
+    }
+
+    @RequiresPermissions("mes:mes_xsl_equip_inspect_record:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, MesXslEquipInspectRecord model) {
+        return super.exportXls(request, model, MesXslEquipInspectRecord.class, "MES点检保养记录");
+    }
+
+    @RequiresPermissions("mes:mes_xsl_equip_inspect_record:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, MesXslEquipInspectRecord.class);
+    }
+
+    private void fillRecordNoIfEmpty(MesXslEquipInspectRecord main) {
+        if (oConvertUtils.isEmpty(main.getRecordNo())) {
+            main.setRecordNo(mesXslEquipInspectRecordService.generateRecordNo(main));
+        }
+    }
+
+    private void fillInspector(MesXslEquipInspectRecord main) {
+        if (SecurityUtils.getSubject() == null || SecurityUtils.getSubject().getPrincipal() == null) {
+            return;
+        }
+        if (!(SecurityUtils.getSubject().getPrincipal() instanceof LoginUser user)) {
+            return;
+        }
+        main.setInspectorUserId(user.getId());
+        main.setInspectorUsername(user.getUsername());
+        main.setInspectorRealname(user.getRealname());
+    }
+
+    //update-begin---author:jiangxh ---date:20260520  for：【MES】录入点检结果：必填项校验，保存为已点检-----------
+    private String validateForEntry(MesXslEquipInspectRecord main, List<MesXslEquipInspectRecordLine> lineList) {
+        String err = validateForSave(main, lineList, main.getId());
+        if (err != null) {
+            return err;
+        }
+        if (main.getInspectDate() == null) {
+            return "请选择点检日期";
+        }
+        if (oConvertUtils.isEmpty(main.getInspectorUserId()) && oConvertUtils.isEmpty(main.getInspectorRealname())) {
+            return "点检人不能为空";
+        }
+        String inspectResult = main.getInspectResult();
+        if (inspectResult != null) {
+            inspectResult = inspectResult.trim();
+        }
+        if (oConvertUtils.isEmpty(inspectResult) || !INSPECT_RESULT.contains(inspectResult)) {
+            return "请选择点检结果（合格/不合格）";
+        }
+        main.setInspectResult(inspectResult);
+        main.setRecordStatus("done");
+        //update-begin---author:jiangxh ---date:20260521  for：【MES】不合格记录默认未处理-----------
+        if ("fail".equals(inspectResult)) {
+            main.setHandledFlag("0");
+        } else {
+            main.setHandledFlag(null);
+            main.setHandlerUserId(null);
+            main.setHandlerUsername(null);
+            main.setHandlerRealname(null);
+            main.setHandleTime(null);
+        }
+        //update-end---author:jiangxh ---date:20260521  for：【MES】不合格记录默认未处理-----------
+        return null;
+    }
+    //update-end---author:jiangxh ---date:20260520  for：【MES】录入点检结果：必填项校验，保存为已点检-----------
+
+    //update-begin---author:jiangxh ---date:20260520  for：【MES】点检保养记录保存校验与配置明细关联-----------
+    private String validateForSave(
+            MesXslEquipInspectRecord main, List<MesXslEquipInspectRecordLine> lineList, String excludeId) {
+        if (main == null) {
+            return "参数不能为空";
+        }
+        if (oConvertUtils.isEmpty(main.getEquipmentLedgerId())) {
+            return "请选择设备";
+        }
+        MesXslEquipmentLedger ledger = mesXslEquipmentLedgerService.getById(main.getEquipmentLedgerId());
+        if (ledger == null || isDeleted(ledger.getDelFlag())) {
+            return "设备台账不存在或已删除";
+        }
+        main.setEquipmentName(ledger.getEquipmentName());
+        main.setEquipmentCode(ledger.getEquipmentCode());
+
+        String recordType = main.getRecordType();
+        if (recordType != null) {
+            recordType = recordType.trim();
+        }
+        if (oConvertUtils.isEmpty(recordType) || !RECORD_TYPE.contains(recordType)) {
+            return "类型无效，请选择点检或保养";
+        }
+        main.setRecordType(recordType);
+
+        if (main.getInspectDate() == null) {
+            main.setInspectDate(new Date());
+        }
+
+        String recordStatus = main.getRecordStatus();
+        if (recordStatus != null) {
+            recordStatus = recordStatus.trim();
+        }
+        if (oConvertUtils.isEmpty(recordStatus) || !RECORD_STATUS.contains(recordStatus)) {
+            return "请选择状态（待点检/已点检）";
+        }
+        main.setRecordStatus(recordStatus);
+
+        String inspectResult = main.getInspectResult();
+        if (inspectResult != null) {
+            inspectResult = inspectResult.trim();
+        }
+        if ("done".equals(recordStatus)) {
+            if (oConvertUtils.isEmpty(inspectResult) || !INSPECT_RESULT.contains(inspectResult)) {
+                return "已点检时请选择点检结果（合格/不合格）";
+            }
+            main.setInspectResult(inspectResult);
+        } else {
+            if (oConvertUtils.isNotEmpty(inspectResult) && !INSPECT_RESULT.contains(inspectResult)) {
+                return "点检结果无效";
+            }
+            main.setInspectResult(oConvertUtils.isEmpty(inspectResult) ? null : inspectResult);
+        }
+
+        if (oConvertUtils.isEmpty(main.getRecordNo())) {
+            return "记录编号不能为空";
+        }
+
+        com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<MesXslEquipInspectConfig> cw =
+                new com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<>();
+        cw.eq(MesXslEquipInspectConfig::getEquipmentLedgerId, main.getEquipmentLedgerId());
+        cw.eq(MesXslEquipInspectConfig::getConfigType, recordType);
+        cw.and(
+                q ->
+                        q.eq(MesXslEquipInspectConfig::getDelFlag, CommonConstant.DEL_FLAG_0)
+                                .or()
+                                .isNull(MesXslEquipInspectConfig::getDelFlag));
+        MesXslEquipInspectConfig config = mesXslEquipInspectConfigService.getOne(cw, false);
+        if (config == null) {
+            String equipName =
+                    oConvertUtils.isNotEmpty(ledger.getEquipmentName())
+                            ? ledger.getEquipmentName()
+                            : ledger.getEquipmentCode();
+            return MesXslEquipInspectBizMsg.noConfigMessage(equipName, recordType);
+        }
+        main.setEquipInspectConfigId(config.getId());
+
+        if (lineList == null || lineList.isEmpty()) {
+            return "明细不能为空，请选择设备后自动带出点检项目";
+        }
+
+        Set<String> configLineIds = new HashSet<>();
+        int sort = 0;
+        for (int i = 0; i < lineList.size(); i++) {
+            MesXslEquipInspectRecordLine line = lineList.get(i);
+            if (line == null) {
+                continue;
+            }
+            int rowNo = i + 1;
+            if (oConvertUtils.isEmpty(line.getEquipInspectConfigLineId())) {
+                return "第 " + rowNo + " 行未关联点检配置明细";
+            }
+            String lineId = line.getEquipInspectConfigLineId().trim();
+            if (!configLineIds.add(lineId)) {
+                return "第 " + rowNo + " 行点检配置明细重复";
+            }
+            line.setEquipInspectConfigLineId(lineId);
+            line.setSortNo(sort++);
+        }
+        if (configLineIds.isEmpty()) {
+            return "明细不能为空";
+        }
+        return null;
+    }
+
+    private static boolean isDeleted(Integer delFlag) {
+        return delFlag != null && delFlag.equals(CommonConstant.DEL_FLAG_1);
+    }
+    //update-end---author:jiangxh ---date:20260520  for：【MES】点检保养记录保存校验与配置明细关联-----------
+}

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

@@ -0,0 +1,319 @@
+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 jakarta.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import lombok.extern.slf4j.Slf4j;
+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.common.util.oConvertUtils;
+import org.jeecg.modules.xslmes.entity.MesXslEquipmentLedger;
+import org.jeecg.modules.xslmes.service.IMesXslEquipmentLedgerService;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+
+/**
+ * MES 设备台账
+ */
+@Tag(name = "MES设备台账")
+@RestController
+@RequestMapping("/xslmes/mesXslEquipmentLedger")
+@Slf4j
+public class MesXslEquipmentLedgerController extends JeecgController<MesXslEquipmentLedger, IMesXslEquipmentLedgerService> {
+
+    private static final Set<String> EQUIPMENT_STATUS = Set.of("0", "1", "2");
+    private static final Set<String> ENABLED_FLAGS = Set.of("0", "1");
+
+    @Autowired
+    private IMesXslEquipmentLedgerService mesXslEquipmentLedgerService;
+
+    @Operation(summary = "MES设备台账-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<MesXslEquipmentLedger>> queryPageList(
+            MesXslEquipmentLedger model,
+            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+            HttpServletRequest req) {
+        QueryWrapper<MesXslEquipmentLedger> queryWrapper = QueryGenerator.initQueryWrapper(model, req.getParameterMap());
+        Page<MesXslEquipmentLedger> page = new Page<>(pageNo, pageSize);
+        IPage<MesXslEquipmentLedger> pageList = mesXslEquipmentLedgerService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    @AutoLog(value = "MES设备台账-添加")
+    @Operation(summary = "MES设备台账-添加")
+    @RequiresPermissions("mes:mes_xsl_equipment_ledger:add")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody MesXslEquipmentLedger model) {
+        //update-begin---author:jiangxh ---date:20260518  for：【MES】设备台账保存前校验-----------
+        String err = validateForSave(model, null);
+        if (err != null) {
+            return Result.error(err);
+        }
+        //update-end---author:jiangxh ---date:20260518  for：【MES】设备台账保存前校验-----------
+        mesXslEquipmentLedgerService.save(model);
+        return Result.OK("添加成功！");
+    }
+
+    @AutoLog(value = "MES设备台账-编辑")
+    @Operation(summary = "MES设备台账-编辑")
+    @RequiresPermissions("mes:mes_xsl_equipment_ledger:edit")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody MesXslEquipmentLedger model) {
+        //update-begin---author:jiangxh ---date:20260518  for：【MES】设备台账保存前校验-----------
+        String err = validateForSave(model, model.getId());
+        if (err != null) {
+            return Result.error(err);
+        }
+        //update-end---author:jiangxh ---date:20260518  for：【MES】设备台账保存前校验-----------
+        mesXslEquipmentLedgerService.updateById(model);
+        return Result.OK("编辑成功!");
+    }
+
+    @AutoLog(value = "MES设备台账-删除")
+    @Operation(summary = "MES设备台账-通过id删除")
+    @RequiresPermissions("mes:mes_xsl_equipment_ledger:delete")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        mesXslEquipmentLedgerService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    @AutoLog(value = "MES设备台账-批量删除")
+    @Operation(summary = "MES设备台账-批量删除")
+    @RequiresPermissions("mes:mes_xsl_equipment_ledger:deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        mesXslEquipmentLedgerService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
+
+    @Operation(summary = "MES设备台账-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<MesXslEquipmentLedger> queryById(@RequestParam(name = "id", required = true) String id) {
+        MesXslEquipmentLedger entity = mesXslEquipmentLedgerService.getById(id);
+        if (entity == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(entity);
+    }
+
+    @Operation(summary = "校验设备编号是否重复")
+    @GetMapping(value = "/checkEquipmentCode")
+    public Result<String> checkEquipmentCode(
+            @RequestParam(name = "equipmentCode", required = true) String equipmentCode,
+            @RequestParam(name = "dataId", required = false) String dataId) {
+        if (oConvertUtils.isEmpty(equipmentCode) || equipmentCode.trim().isEmpty()) {
+            return Result.OK("该值可用！");
+        }
+        MesXslEquipmentLedger ctx = new MesXslEquipmentLedger();
+        if (mesXslEquipmentLedgerService.isEquipmentCodeDuplicated(equipmentCode.trim(), dataId, ctx)) {
+            return Result.error("设备编号不能重复");
+        }
+        return Result.OK("该值可用！");
+    }
+
+    @Operation(summary = "校验设备名称是否重复")
+    @GetMapping(value = "/checkEquipmentName")
+    public Result<String> checkEquipmentName(
+            @RequestParam(name = "equipmentName", required = true) String equipmentName,
+            @RequestParam(name = "dataId", required = false) String dataId) {
+        if (oConvertUtils.isEmpty(equipmentName) || equipmentName.trim().isEmpty()) {
+            return Result.OK("该值可用！");
+        }
+        MesXslEquipmentLedger ctx = new MesXslEquipmentLedger();
+        if (mesXslEquipmentLedgerService.isEquipmentNameDuplicated(equipmentName.trim(), dataId, ctx)) {
+            return Result.error("设备名称不能重复");
+        }
+        return Result.OK("该值可用！");
+    }
+
+    @RequiresPermissions("mes:mes_xsl_equipment_ledger:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, MesXslEquipmentLedger model) {
+        return super.exportXls(request, model, MesXslEquipmentLedger.class, "MES设备台账");
+    }
+
+    @RequiresPermissions("mes:mes_xsl_equipment_ledger:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+        for (Map.Entry<String, MultipartFile> ent : fileMap.entrySet()) {
+            MultipartFile file = ent.getValue();
+            ImportParams params = new ImportParams();
+            params.setTitleRows(2);
+            params.setHeadRows(1);
+            params.setNeedSave(true);
+            try {
+                List<MesXslEquipmentLedger> list =
+                        ExcelImportUtil.importExcel(file.getInputStream(), MesXslEquipmentLedger.class, params);
+                if (list == null) {
+                    list = List.of();
+                }
+                Set<String> codesInFile = new HashSet<>();
+                Set<String> namesInFile = new HashSet<>();
+                for (int i = 0; i < list.size(); i++) {
+                    MesXslEquipmentLedger row = list.get(i);
+                    int rowNo = i + 1;
+                    if (row == null) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条数据无效（空行）");
+                    }
+                    String err = validateImportRow(row, rowNo, codesInFile, namesInFile);
+                    if (err != null) {
+                        return Result.error(err);
+                    }
+                }
+                long start = System.currentTimeMillis();
+                mesXslEquipmentLedgerService.saveBatch(list);
+                log.info("设备台账Excel导入完成，耗时{}ms，行数={}", System.currentTimeMillis() - start, list.size());
+                return Result.ok("文件导入成功！数据行数：" + list.size());
+            } catch (Exception e) {
+                String msg = e.getMessage();
+                log.error(msg, e);
+                if (msg != null && msg.indexOf("Duplicate entry") >= 0) {
+                    return Result.error("文件导入失败: 存在重复数据（设备编号或设备名称不能重复）");
+                }
+                return Result.error("文件导入失败:" + e.getMessage());
+            } finally {
+                try {
+                    file.getInputStream().close();
+                } catch (IOException e) {
+                    log.error(e.getMessage(), e);
+                }
+            }
+        }
+        return Result.error("文件导入失败！");
+    }
+
+    //update-begin---author:jiangxh ---date:20260518  for：【MES】设备台账保存与导入校验-----------
+    private String validateForSave(MesXslEquipmentLedger model, String excludeId) {
+        if (oConvertUtils.isEmpty(model.getProcessOperationId())) {
+            return "请选择所属工序";
+        }
+        if (oConvertUtils.isEmpty(model.getEquipmentName()) || model.getEquipmentName().trim().isEmpty()) {
+            return "设备名称不能为空";
+        }
+        String name = model.getEquipmentName().trim();
+        model.setEquipmentName(name);
+        if (mesXslEquipmentLedgerService.isEquipmentNameDuplicated(name, excludeId, model)) {
+            return "设备名称不能重复";
+        }
+        if (oConvertUtils.isEmpty(model.getEquipmentCode()) || model.getEquipmentCode().trim().isEmpty()) {
+            return "设备编号不能为空";
+        }
+        String code = model.getEquipmentCode().trim();
+        model.setEquipmentCode(code);
+        if (mesXslEquipmentLedgerService.isEquipmentCodeDuplicated(code, excludeId, model)) {
+            return "设备编号不能重复";
+        }
+        trimRelationNames(model);
+        String status = model.getEquipmentStatus();
+        if (oConvertUtils.isEmpty(status)) {
+            model.setEquipmentStatus("0");
+        } else {
+            status = status.trim();
+            if (!EQUIPMENT_STATUS.contains(status)) {
+                return "设备状态无效（须为在用/停用/报废）";
+            }
+            model.setEquipmentStatus(status);
+        }
+        String enabled = model.getEnabledFlag();
+        if (oConvertUtils.isEmpty(enabled)) {
+            model.setEnabledFlag("1");
+        } else {
+            enabled = enabled.trim();
+            if (!ENABLED_FLAGS.contains(enabled)) {
+                return "是否启用无效（须为是/否）";
+            }
+            model.setEnabledFlag(enabled);
+        }
+        return null;
+    }
+
+    private String validateImportRow(MesXslEquipmentLedger row, int rowNo, Set<String> codesInFile, Set<String> namesInFile) {
+        String code = row.getEquipmentCode();
+        if (code != null) {
+            code = code.trim();
+        }
+        if (oConvertUtils.isEmpty(code)) {
+            return "文件导入失败：第 " + rowNo + " 条设备编号不能为空";
+        }
+        row.setEquipmentCode(code);
+        if (!codesInFile.add(code)) {
+            return "文件导入失败：设备编号【" + code + "】在导入文件中重复";
+        }
+        if (mesXslEquipmentLedgerService.isEquipmentCodeDuplicated(code, null, row)) {
+            return "文件导入失败：第 " + rowNo + " 条设备编号【" + code + "】不能重复";
+        }
+        String name = row.getEquipmentName();
+        if (name != null) {
+            name = name.trim();
+        }
+        if (oConvertUtils.isEmpty(name)) {
+            return "文件导入失败：第 " + rowNo + " 条设备名称不能为空";
+        }
+        row.setEquipmentName(name);
+        if (!namesInFile.add(name)) {
+            return "文件导入失败：设备名称【" + name + "】在导入文件中重复";
+        }
+        if (mesXslEquipmentLedgerService.isEquipmentNameDuplicated(name, null, row)) {
+            return "文件导入失败：第 " + rowNo + " 条设备名称【" + name + "】不能重复";
+        }
+        trimRelationNames(row);
+        String status = row.getEquipmentStatus();
+        if (oConvertUtils.isEmpty(status)) {
+            row.setEquipmentStatus("0");
+        } else if (!EQUIPMENT_STATUS.contains(status.trim())) {
+            return "文件导入失败：第 " + rowNo + " 条设备状态无效";
+        } else {
+            row.setEquipmentStatus(status.trim());
+        }
+        String enabled = row.getEnabledFlag();
+        if (oConvertUtils.isEmpty(enabled)) {
+            row.setEnabledFlag("1");
+        } else if (!ENABLED_FLAGS.contains(enabled.trim())) {
+            return "文件导入失败：第 " + rowNo + " 条是否启用无效";
+        } else {
+            row.setEnabledFlag(enabled.trim());
+        }
+        return null;
+    }
+
+    private static void trimRelationNames(MesXslEquipmentLedger model) {
+        if (model.getProcessOperationName() != null) {
+            model.setProcessOperationName(model.getProcessOperationName().trim());
+        }
+        if (model.getManufacturerName() != null) {
+            model.setManufacturerName(model.getManufacturerName().trim());
+        }
+        if (model.getEquipmentCategoryName() != null) {
+            model.setEquipmentCategoryName(model.getEquipmentCategoryName().trim());
+        }
+        if (model.getEquipmentTypeName() != null) {
+            model.setEquipmentTypeName(model.getEquipmentTypeName().trim());
+        }
+        if (model.getFactoryName() != null) {
+            model.setFactoryName(model.getFactoryName().trim());
+        }
+    }
+    //update-end---author:jiangxh ---date:20260518  for：【MES】设备台账保存与导入校验-----------
+}

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

@@ -0,0 +1,208 @@
+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 jakarta.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import lombok.extern.slf4j.Slf4j;
+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.common.util.oConvertUtils;
+import org.jeecg.modules.xslmes.entity.MesXslFormulaSpec;
+import org.jeecg.modules.xslmes.entity.MesXslFormulaSpecLine;
+import org.jeecg.modules.xslmes.service.IMesXslFormulaSpecService;
+import org.jeecg.modules.xslmes.service.IMesXslFormulaSpecSettingService;
+import org.jeecg.modules.xslmes.vo.MesXslFormulaRubberContentSettingVO;
+import org.jeecg.modules.xslmes.vo.MesXslFormulaSpecPage;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+/**
+ * MES 配合示方
+ */
+@Tag(name = "MES配合示方")
+@RestController
+@RequestMapping("/xslmes/mesXslFormulaSpec")
+@Slf4j
+public class MesXslFormulaSpecController extends JeecgController<MesXslFormulaSpec, IMesXslFormulaSpecService> {
+
+    @Autowired
+    private IMesXslFormulaSpecService mesXslFormulaSpecService;
+
+    @Autowired
+    private IMesXslFormulaSpecSettingService mesXslFormulaSpecSettingService;
+
+    @Operation(summary = "MES配合示方-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<MesXslFormulaSpec>> queryPageList(
+            MesXslFormulaSpec model,
+            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+            @RequestParam(name = "keyword", required = false) String keyword,
+            HttpServletRequest req) {
+        QueryWrapper<MesXslFormulaSpec> queryWrapper = QueryGenerator.initQueryWrapper(model, req.getParameterMap());
+        if (oConvertUtils.isNotEmpty(keyword)) {
+            queryWrapper.and(
+                    w -> w.like("spec_code", keyword)
+                            .or()
+                            .like("rubber_code", keyword)
+                            .or()
+                            .like("issue_number", keyword)
+                            .or()
+                            .like("purpose", keyword));
+        }
+        queryWrapper.orderByDesc("update_time").orderByDesc("create_time");
+        Page<MesXslFormulaSpec> page = new Page<>(pageNo, pageSize);
+        IPage<MesXslFormulaSpec> pageList = mesXslFormulaSpecService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    @AutoLog(value = "MES配合示方-添加")
+    @Operation(summary = "MES配合示方-添加")
+    @RequiresPermissions("xslmes:mes_xsl_formula_spec:add")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody MesXslFormulaSpecPage page) {
+        //update-begin---author:jiangxh ---date:20260521  for：【配合示方】主子表保存校验-----------
+        String err = validateMain(page);
+        if (err != null) {
+            return Result.error(err);
+        }
+        //update-end---author:jiangxh ---date:20260521  for：【配合示方】主子表保存校验-----------
+        MesXslFormulaSpec main = new MesXslFormulaSpec();
+        BeanUtils.copyProperties(page, main);
+        mesXslFormulaSpecService.saveMain(main, page.getLineList());
+        return Result.OK("添加成功！");
+    }
+
+    @AutoLog(value = "MES配合示方-编辑")
+    @Operation(summary = "MES配合示方-编辑")
+    @RequiresPermissions("xslmes:mes_xsl_formula_spec:edit")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody MesXslFormulaSpecPage page) {
+        //update-begin---author:jiangxh ---date:20260521  for：【配合示方】主子表保存校验-----------
+        String err = validateMain(page);
+        if (err != null) {
+            return Result.error(err);
+        }
+        //update-end---author:jiangxh ---date:20260521  for：【配合示方】主子表保存校验-----------
+        MesXslFormulaSpec main = new MesXslFormulaSpec();
+        BeanUtils.copyProperties(page, main);
+        mesXslFormulaSpecService.updateMain(main, page.getLineList());
+        return Result.OK("编辑成功!");
+    }
+
+    @AutoLog(value = "MES配合示方-删除")
+    @Operation(summary = "MES配合示方-通过id删除")
+    @RequiresPermissions("xslmes:mes_xsl_formula_spec:delete")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        mesXslFormulaSpecService.delMain(id);
+        return Result.OK("删除成功!");
+    }
+
+    @AutoLog(value = "MES配合示方-批量删除")
+    @Operation(summary = "MES配合示方-批量删除")
+    @RequiresPermissions("xslmes:mes_xsl_formula_spec:deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        mesXslFormulaSpecService.delBatchMain(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
+
+    @Operation(summary = "MES配合示方-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<MesXslFormulaSpec> queryById(@RequestParam(name = "id", required = true) String id) {
+        MesXslFormulaSpec entity = mesXslFormulaSpecService.getByIdWithLines(id);
+        if (entity == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(entity);
+    }
+
+    @Operation(summary = "MES配合示方-查询明细")
+    @GetMapping(value = "/queryLineListByMainId")
+    public Result<List<MesXslFormulaSpecLine>> queryLineListByMainId(@RequestParam(name = "id", required = true) String id) {
+        return Result.OK(mesXslFormulaSpecService.selectLinesByMainId(id));
+    }
+
+    //update-begin---author:cursor ---date:20260521  for：配合示方胶料代号自动生成-----------
+    @Operation(summary = "MES配合示方-生成胶料代号")
+    @GetMapping(value = "/generateRubberCode")
+    public Result<Map<String, String>> generateRubberCode(
+            @RequestParam(name = "rubberMaterialId") String rubberMaterialId,
+            @RequestParam(name = "category") String category,
+            @RequestParam(name = "excludeSpecId", required = false) String excludeSpecId) {
+        try {
+            String rubberCode = mesXslFormulaSpecService.generateRubberCode(rubberMaterialId, category, excludeSpecId);
+            return Result.OK(Map.of("rubberCode", rubberCode));
+        } catch (IllegalArgumentException ex) {
+            return Result.error(ex.getMessage());
+        }
+    }
+    //update-end---author:cursor ---date:20260521  for：配合示方胶料代号自动生成-----------
+
+    //update-begin---author:cursor ---date:20260521  for：【配合示方】含胶率物料小类可配置-----------
+    @Operation(summary = "MES配合示方-查询含胶率物料小类配置")
+    @GetMapping(value = "/getRubberContentSetting")
+    public Result<MesXslFormulaRubberContentSettingVO> getRubberContentSetting() {
+        return Result.OK(mesXslFormulaSpecSettingService.getRubberContentSetting());
+    }
+
+    @AutoLog(value = "MES配合示方-保存含胶率物料小类配置")
+    @Operation(summary = "MES配合示方-保存含胶率物料小类配置")
+    @RequiresPermissions("xslmes:mes_xsl_formula_spec:edit")
+    @PostMapping(value = "/saveRubberContentSetting")
+    public Result<String> saveRubberContentSetting(@RequestBody MesXslFormulaRubberContentSettingVO setting) {
+        mesXslFormulaSpecSettingService.saveRubberContentSetting(setting);
+        return Result.OK("保存成功");
+    }
+    //update-end---author:cursor ---date:20260521  for：【配合示方】含胶率物料小类可配置-----------
+
+    @RequiresPermissions("xslmes:mes_xsl_formula_spec:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, MesXslFormulaSpec model) {
+        return super.exportXls(request, model, MesXslFormulaSpec.class, "配合示方");
+    }
+
+    @RequiresPermissions("xslmes:mes_xsl_formula_spec:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, MesXslFormulaSpec.class);
+    }
+
+    //update-begin---author:jiangxh ---date:20260521  for：【配合示方】主子表保存校验-----------
+    private String validateMain(MesXslFormulaSpecPage page) {
+        if (oConvertUtils.isEmpty(page.getSpecCode())) {
+            return "请输入示方编号";
+        }
+        if (oConvertUtils.isEmpty(page.getRubberCode())) {
+            return "请选择胶料并生成胶料代号";
+        }
+        if (oConvertUtils.isEmpty(page.getRubberMaterialId())) {
+            return "请选择胶料信息";
+        }
+        if (page.getMixingStages() != null && (page.getMixingStages() < 1 || page.getMixingStages() > 7)) {
+            return "混合段数必须在1-7之间";
+        }
+        if (page.getLineList() == null || page.getLineList().isEmpty()) {
+            return "请至少添加一行配合明细";
+        }
+        return null;
+    }
+    //update-end---author:jiangxh ---date:20260521  for：【配合示方】主子表保存校验-----------
+}

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

@@ -0,0 +1,301 @@
+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 jakarta.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.Set;
+import lombok.extern.slf4j.Slf4j;
+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.constant.CommonConstant;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.xslmes.entity.MesXslEquipmentCategory;
+import org.jeecg.modules.xslmes.entity.MesXslEquipmentPart;
+import org.jeecg.modules.xslmes.entity.MesXslEquipmentSubPart;
+import org.jeecg.modules.xslmes.entity.MesXslEquipmentType;
+import org.jeecg.modules.xslmes.entity.MesXslInspectMaintainItem;
+import org.jeecg.modules.xslmes.service.IMesXslEquipmentCategoryService;
+import org.jeecg.modules.xslmes.service.IMesXslEquipmentPartService;
+import org.jeecg.modules.xslmes.service.IMesXslEquipmentSubPartService;
+import org.jeecg.modules.xslmes.service.IMesXslEquipmentTypeService;
+import org.jeecg.modules.xslmes.service.IMesXslInspectMaintainItemService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+/**
+ * MES 点检及保养项目
+ */
+@Tag(name = "MES点检及保养项目")
+@RestController
+@RequestMapping("/xslmes/mesXslInspectMaintainItem")
+@Slf4j
+public class MesXslInspectMaintainItemController
+        extends JeecgController<MesXslInspectMaintainItem, IMesXslInspectMaintainItemService> {
+
+    private static final Set<String> ITEM_CATEGORY = Set.of("inspect", "maintain");
+    private static final Set<String> ITEM_TYPE = Set.of("mechanical", "electrical");
+    private static final Set<String> INSPECT_METHOD = Set.of("visual", "sight", "hearing");
+
+    @Autowired
+    private IMesXslInspectMaintainItemService mesXslInspectMaintainItemService;
+
+    @Autowired
+    private IMesXslEquipmentCategoryService mesXslEquipmentCategoryService;
+
+    @Autowired
+    private IMesXslEquipmentTypeService mesXslEquipmentTypeService;
+
+    @Autowired
+    private IMesXslEquipmentPartService mesXslEquipmentPartService;
+
+    @Autowired
+    private IMesXslEquipmentSubPartService mesXslEquipmentSubPartService;
+
+    @Operation(summary = "MES点检及保养项目-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<MesXslInspectMaintainItem>> queryPageList(
+            MesXslInspectMaintainItem model,
+            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+            HttpServletRequest req) {
+        QueryWrapper<MesXslInspectMaintainItem> queryWrapper = QueryGenerator.initQueryWrapper(model, req.getParameterMap());
+        queryWrapper.orderByDesc("create_time");
+        Page<MesXslInspectMaintainItem> page = new Page<>(pageNo, pageSize);
+        IPage<MesXslInspectMaintainItem> pageList = mesXslInspectMaintainItemService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    @AutoLog(value = "MES点检及保养项目-添加")
+    @Operation(summary = "MES点检及保养项目-添加")
+    @RequiresPermissions("mes:mes_xsl_inspect_maintain_item:add")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody MesXslInspectMaintainItem model) {
+        //update-begin---author:jiangxh ---date:20260519  for：【MES】点检及保养项目保存前校验-----------
+        String err = validateForSave(model, null);
+        if (err != null) {
+            return Result.error(err);
+        }
+        //update-end---author:jiangxh ---date:20260519  for：【MES】点检及保养项目保存前校验-----------
+        mesXslInspectMaintainItemService.save(model);
+        return Result.OK("添加成功！");
+    }
+
+    @AutoLog(value = "MES点检及保养项目-编辑")
+    @Operation(summary = "MES点检及保养项目-编辑")
+    @RequiresPermissions("mes:mes_xsl_inspect_maintain_item:edit")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody MesXslInspectMaintainItem model) {
+        //update-begin---author:jiangxh ---date:20260519  for：【MES】点检及保养项目保存前校验-----------
+        String err = validateForSave(model, model.getId());
+        if (err != null) {
+            return Result.error(err);
+        }
+        //update-end---author:jiangxh ---date:20260519  for：【MES】点检及保养项目保存前校验-----------
+        mesXslInspectMaintainItemService.updateById(model);
+        return Result.OK("编辑成功!");
+    }
+
+    @AutoLog(value = "MES点检及保养项目-删除")
+    @Operation(summary = "MES点检及保养项目-通过id删除")
+    @RequiresPermissions("mes:mes_xsl_inspect_maintain_item:delete")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        mesXslInspectMaintainItemService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    @AutoLog(value = "MES点检及保养项目-批量删除")
+    @Operation(summary = "MES点检及保养项目-批量删除")
+    @RequiresPermissions("mes:mes_xsl_inspect_maintain_item:deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        mesXslInspectMaintainItemService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
+
+    @Operation(summary = "MES点检及保养项目-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<MesXslInspectMaintainItem> queryById(@RequestParam(name = "id", required = true) String id) {
+        MesXslInspectMaintainItem entity = mesXslInspectMaintainItemService.getById(id);
+        if (entity == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(entity);
+    }
+
+    @Operation(summary = "校验项目名称是否重复（同租户未删除数据；dataId 为编辑时当前主键）")
+    @GetMapping(value = "/checkItemName")
+    public Result<String> checkItemName(
+            @RequestParam(name = "itemName", required = true) String itemName,
+            @RequestParam(name = "dataId", required = false) String dataId) {
+        if (oConvertUtils.isEmpty(itemName) || itemName.trim().isEmpty()) {
+            return Result.OK("该值可用！");
+        }
+        MesXslInspectMaintainItem ctx = new MesXslInspectMaintainItem();
+        if (mesXslInspectMaintainItemService.isItemNameDuplicated(itemName.trim(), dataId, ctx)) {
+            return Result.error("项目名称不能重复");
+        }
+        return Result.OK("该值可用！");
+    }
+
+    @Operation(summary = "校验项目编号是否重复（同租户未删除数据；dataId 为编辑时当前主键）")
+    @GetMapping(value = "/checkItemCode")
+    public Result<String> checkItemCode(
+            @RequestParam(name = "itemCode", required = true) String itemCode,
+            @RequestParam(name = "dataId", required = false) String dataId) {
+        if (oConvertUtils.isEmpty(itemCode) || itemCode.trim().isEmpty()) {
+            return Result.OK("该值可用！");
+        }
+        MesXslInspectMaintainItem ctx = new MesXslInspectMaintainItem();
+        if (mesXslInspectMaintainItemService.isItemCodeDuplicated(itemCode.trim(), dataId, ctx)) {
+            return Result.error("项目编号不能重复");
+        }
+        return Result.OK("该值可用！");
+    }
+
+    @RequiresPermissions("mes:mes_xsl_inspect_maintain_item:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, MesXslInspectMaintainItem model) {
+        return super.exportXls(request, model, MesXslInspectMaintainItem.class, "MES点检及保养项目");
+    }
+
+    @RequiresPermissions("mes:mes_xsl_inspect_maintain_item:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, MesXslInspectMaintainItem.class);
+    }
+
+    //update-begin---author:jiangxh ---date:20260519  for：【MES】点检及保养项目保存校验：唯一性、设备关联、字典-----------
+    private String validateForSave(MesXslInspectMaintainItem model, String excludeId) {
+        if (model == null) {
+            return "参数不能为空";
+        }
+        String itemName = model.getItemName();
+        if (itemName != null) {
+            itemName = itemName.trim();
+        }
+        if (oConvertUtils.isEmpty(itemName)) {
+            return "项目名称不能为空";
+        }
+        model.setItemName(itemName);
+
+        String itemCode = model.getItemCode();
+        if (itemCode != null) {
+            itemCode = itemCode.trim();
+        }
+        if (oConvertUtils.isEmpty(itemCode)) {
+            return "项目编号不能为空";
+        }
+        model.setItemCode(itemCode);
+
+        if (mesXslInspectMaintainItemService.isItemNameDuplicated(itemName, excludeId, model)) {
+            return "项目名称不能重复";
+        }
+        if (mesXslInspectMaintainItemService.isItemCodeDuplicated(itemCode, excludeId, model)) {
+            return "项目编号不能重复";
+        }
+
+        if (oConvertUtils.isEmpty(model.getEquipmentCategoryId())) {
+            return "请选择设备类别";
+        }
+        if (oConvertUtils.isEmpty(model.getEquipmentTypeId())) {
+            return "请选择设备类型";
+        }
+        if (oConvertUtils.isEmpty(model.getEquipmentPartId())) {
+            return "请选择设备部位";
+        }
+        if (oConvertUtils.isEmpty(model.getEquipmentSubPartId())) {
+            return "请选择设备小部位";
+        }
+
+        MesXslEquipmentCategory cat = mesXslEquipmentCategoryService.getById(model.getEquipmentCategoryId());
+        if (cat == null || isDeleted(cat.getDelFlag())) {
+            return "设备类别不存在或已删除";
+        }
+        model.setEquipmentCategoryName(cat.getCategoryName());
+
+        MesXslEquipmentType type = mesXslEquipmentTypeService.getById(model.getEquipmentTypeId());
+        if (type == null || isDeleted(type.getDelFlag())) {
+            return "设备类型不存在或已删除";
+        }
+        if (!model.getEquipmentCategoryId().equals(type.getEquipmentCategoryId())) {
+            return "设备类型与所选设备类别不匹配";
+        }
+        model.setEquipmentTypeName(type.getTypeName());
+
+        MesXslEquipmentPart part = mesXslEquipmentPartService.getById(model.getEquipmentPartId());
+        if (part == null || isDeleted(part.getDelFlag())) {
+            return "设备部位不存在或已删除";
+        }
+        if (!model.getEquipmentCategoryId().equals(part.getEquipmentCategoryId())) {
+            return "设备部位与所选设备类别不匹配";
+        }
+        model.setEquipmentPartName(part.getPartName());
+
+        MesXslEquipmentSubPart sub = mesXslEquipmentSubPartService.getById(model.getEquipmentSubPartId());
+        if (sub == null || isDeleted(sub.getDelFlag())) {
+            return "设备小部位不存在或已删除";
+        }
+        if (!model.getEquipmentCategoryId().equals(sub.getEquipmentCategoryId())) {
+            return "设备小部位与所选设备类别不匹配";
+        }
+        if (!model.getEquipmentPartId().equals(sub.getEquipmentPartId())) {
+            return "设备小部位与所选设备部位不匹配";
+        }
+        model.setEquipmentSubPartName(sub.getSubPartName());
+
+        String itemCategory = model.getItemCategory();
+        if (itemCategory != null) {
+            itemCategory = itemCategory.trim();
+        }
+        if (oConvertUtils.isEmpty(itemCategory) || !ITEM_CATEGORY.contains(itemCategory)) {
+            return "项目类别无效，请选择点检或保养";
+        }
+        model.setItemCategory(itemCategory);
+
+        String itemType = model.getItemType();
+        if (itemType != null) {
+            itemType = itemType.trim();
+        }
+        if (oConvertUtils.isEmpty(itemType) || !ITEM_TYPE.contains(itemType)) {
+            return "项目类型无效，请选择机械类或电气类";
+        }
+        model.setItemType(itemType);
+
+        String inspectMethod = model.getInspectMethod();
+        if (inspectMethod != null) {
+            inspectMethod = inspectMethod.trim();
+        }
+        if (oConvertUtils.isEmpty(inspectMethod) || !INSPECT_METHOD.contains(inspectMethod)) {
+            return "点检方式无效，请选择视觉、目测或听觉";
+        }
+        model.setInspectMethod(inspectMethod);
+
+        if (model.getJudgmentCriteria() != null) {
+            model.setJudgmentCriteria(model.getJudgmentCriteria().trim());
+        }
+        if (oConvertUtils.isEmpty(model.getJudgmentCriteria())) {
+            return "判断基准不能为空";
+        }
+
+        if (model.getMaintainCycleDays() != null && model.getMaintainCycleDays() < 0) {
+            return "保养周期（天）不能为负数";
+        }
+
+        return null;
+    }
+
+    private static boolean isDeleted(Integer delFlag) {
+        return delFlag != null && delFlag.equals(CommonConstant.DEL_FLAG_1);
+    }
+    //update-end---author:jiangxh ---date:20260519  for：【MES】点检及保养项目保存校验：唯一性、设备关联、字典-----------
+}

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

@@ -0,0 +1,167 @@
+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 java.util.Arrays;
+import org.apache.commons.lang3.StringUtils;
+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.common.util.oConvertUtils;
+import org.jeecg.modules.xslmes.entity.MesXslMixerAction;
+import org.jeecg.modules.xslmes.service.IMesXslMixerActionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+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.RequestMethod;
+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/mesXslMixerAction")
+public class MesXslMixerActionController extends JeecgController<MesXslMixerAction, IMesXslMixerActionService> {
+
+  @Autowired private IMesXslMixerActionService mesXslMixerActionService;
+
+  @Operation(summary = "密炼机动作维护-分页列表查询")
+  @GetMapping("/list")
+  public Result<IPage<MesXslMixerAction>> queryPageList(
+      MesXslMixerAction model,
+      @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+      HttpServletRequest req) {
+    QueryWrapper<MesXslMixerAction> queryWrapper = QueryGenerator.initQueryWrapper(model, req.getParameterMap());
+    queryWrapper.orderByDesc("create_time");
+    IPage<MesXslMixerAction> pageList = mesXslMixerActionService.page(new Page<>(pageNo, pageSize), queryWrapper);
+    return Result.OK(pageList);
+  }
+
+  @AutoLog(value = "密炼机动作维护-添加")
+  @Operation(summary = "密炼机动作维护-添加")
+  @RequiresPermissions("xslmes:mes_xsl_mixer_action:add")
+  @PostMapping("/add")
+  public Result<String> add(@RequestBody MesXslMixerAction model) {
+    String err = validateForSave(model, null);
+    if (err != null) {
+      return Result.error(err);
+    }
+    mesXslMixerActionService.fillEquipmentName(model);
+    if (StringUtils.isBlank(model.getEquipmentName())) {
+      return Result.error("请选择有效的设备名称");
+    }
+    mesXslMixerActionService.save(model);
+    return Result.OK("添加成功！");
+  }
+
+  @AutoLog(value = "密炼机动作维护-编辑")
+  @Operation(summary = "密炼机动作维护-编辑")
+  @RequiresPermissions("xslmes:mes_xsl_mixer_action:edit")
+  @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+  public Result<String> edit(@RequestBody MesXslMixerAction model) {
+    String err = validateForSave(model, model.getId());
+    if (err != null) {
+      return Result.error(err);
+    }
+    mesXslMixerActionService.fillEquipmentName(model);
+    if (StringUtils.isBlank(model.getEquipmentName())) {
+      return Result.error("请选择有效的设备名称");
+    }
+    mesXslMixerActionService.updateById(model);
+    return Result.OK("编辑成功!");
+  }
+
+  @AutoLog(value = "密炼机动作维护-通过id删除")
+  @Operation(summary = "密炼机动作维护-通过id删除")
+  @RequiresPermissions("xslmes:mes_xsl_mixer_action:delete")
+  @DeleteMapping("/delete")
+  public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+    mesXslMixerActionService.removeById(id);
+    return Result.OK("删除成功!");
+  }
+
+  @AutoLog(value = "密炼机动作维护-批量删除")
+  @Operation(summary = "密炼机动作维护-批量删除")
+  @RequiresPermissions("xslmes:mes_xsl_mixer_action:deleteBatch")
+  @DeleteMapping("/deleteBatch")
+  public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+    mesXslMixerActionService.removeByIds(Arrays.asList(ids.split(",")));
+    return Result.OK("批量删除成功!");
+  }
+
+  @Operation(summary = "密炼机动作维护-通过id查询")
+  @GetMapping("/queryById")
+  public Result<MesXslMixerAction> queryById(@RequestParam(name = "id", required = true) String id) {
+    MesXslMixerAction entity = mesXslMixerActionService.getById(id);
+    if (entity == null) {
+      return Result.error("未找到对应数据");
+    }
+    return Result.OK(entity);
+  }
+
+  @Operation(summary = "校验动作名称是否重复")
+  @GetMapping("/checkActionName")
+  public Result<String> checkActionName(
+      @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("动作名称不能重复");
+    }
+    return Result.OK("该值可用！");
+  }
+
+  @Operation(summary = "校验动作代号是否重复")
+  @GetMapping("/checkActionCode")
+  public Result<String> checkActionCode(
+      @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("动作代号不能重复");
+    }
+    return Result.OK("该值可用！");
+  }
+
+  @RequiresPermissions("xslmes:mes_xsl_mixer_action:exportXls")
+  @RequestMapping("/exportXls")
+  public ModelAndView exportXls(HttpServletRequest request, MesXslMixerAction model) {
+    return super.exportXls(request, model, MesXslMixerAction.class, "密炼机动作维护");
+  }
+
+  private String validateForSave(MesXslMixerAction model, String excludeId) {
+    if (oConvertUtils.isEmpty(model.getEquipmentId()) || StringUtils.isBlank(model.getEquipmentId())) {
+      return "设备名称不能为空";
+    }
+    model.setEquipmentId(model.getEquipmentId().trim());
+    if (oConvertUtils.isEmpty(model.getActionName()) || StringUtils.isBlank(model.getActionName())) {
+      return "动作名称不能为空";
+    }
+    model.setActionName(model.getActionName().trim());
+    if (mesXslMixerActionService.isActionNameDuplicated(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 "动作代号不能重复";
+    }
+    return null;
+  }
+}

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

@@ -0,0 +1,172 @@
+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.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 jakarta.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import lombok.extern.slf4j.Slf4j;
+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.common.system.query.QueryRuleEnum;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.mes.material.entity.MesMixerMaterial;
+import org.jeecg.modules.mes.material.service.IMesMixerMaterialService;
+import org.jeecg.modules.xslmes.entity.MesXslMixerMaterialSubstitute;
+import org.jeecg.modules.xslmes.service.IMesXslMixerMaterialSubstituteService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+/**
+ * MES 密炼物料替代对应关系
+ */
+@Tag(name = "MES密炼物料替代对应关系")
+@RestController
+@RequestMapping("/xslmes/mesXslMixerMaterialSubstitute")
+@Slf4j
+public class MesXslMixerMaterialSubstituteController
+        extends JeecgController<MesXslMixerMaterialSubstitute, IMesXslMixerMaterialSubstituteService> {
+
+    @Autowired
+    private IMesXslMixerMaterialSubstituteService mesXslMixerMaterialSubstituteService;
+
+    @Autowired
+    private IMesMixerMaterialService mesMixerMaterialService;
+
+    @Operation(summary = "MES密炼物料替代对应关系-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<MesXslMixerMaterialSubstitute>> queryPageList(
+            MesXslMixerMaterialSubstitute model,
+            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+            HttpServletRequest req) {
+        Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
+        customeRuleMap.put("mixerMaterialId", QueryRuleEnum.LIKE_WITH_OR);
+        customeRuleMap.put("substituteMaterialId", QueryRuleEnum.LIKE_WITH_OR);
+        QueryWrapper<MesXslMixerMaterialSubstitute> queryWrapper =
+                QueryGenerator.initQueryWrapper(model, req.getParameterMap(), customeRuleMap);
+        queryWrapper.orderByAsc("serial_no");
+        Page<MesXslMixerMaterialSubstitute> page = new Page<>(pageNo, pageSize);
+        IPage<MesXslMixerMaterialSubstitute> pageList = mesXslMixerMaterialSubstituteService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    @AutoLog(value = "MES密炼物料替代对应关系-添加")
+    @Operation(summary = "MES密炼物料替代对应关系-添加")
+    @RequiresPermissions("xslmes:mes_xsl_mixer_material_substitute:add")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody MesXslMixerMaterialSubstitute model) {
+        //update-begin---author:jiangxh ---date:20260520  for：【密炼物料替代对应关系】保存前校验与物料冗余回填-----------
+        String err = validateAndFillMaterials(model, false);
+        if (err != null) {
+            return Result.error(err);
+        }
+        //update-end---author:jiangxh ---date:20260520  for：【密炼物料替代对应关系】保存前校验与物料冗余回填-----------
+        mesXslMixerMaterialSubstituteService.saveWithSerialNo(model);
+        return Result.OK("添加成功！");
+    }
+
+    @AutoLog(value = "MES密炼物料替代对应关系-编辑")
+    @Operation(summary = "MES密炼物料替代对应关系-编辑")
+    @RequiresPermissions("xslmes:mes_xsl_mixer_material_substitute:edit")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody MesXslMixerMaterialSubstitute model) {
+        //update-begin---author:jiangxh ---date:20260520  for：【密炼物料替代对应关系】保存前校验与物料冗余回填-----------
+        String err = validateAndFillMaterials(model, true);
+        if (err != null) {
+            return Result.error(err);
+        }
+        //update-end---author:jiangxh ---date:20260520  for：【密炼物料替代对应关系】保存前校验与物料冗余回填-----------
+        mesXslMixerMaterialSubstituteService.updateById(model);
+        return Result.OK("编辑成功!");
+    }
+
+    @AutoLog(value = "MES密炼物料替代对应关系-删除")
+    @Operation(summary = "MES密炼物料替代对应关系-通过id删除")
+    @RequiresPermissions("xslmes:mes_xsl_mixer_material_substitute:delete")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        mesXslMixerMaterialSubstituteService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    @AutoLog(value = "MES密炼物料替代对应关系-批量删除")
+    @Operation(summary = "MES密炼物料替代对应关系-批量删除")
+    @RequiresPermissions("xslmes:mes_xsl_mixer_material_substitute:deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        mesXslMixerMaterialSubstituteService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
+
+    @Operation(summary = "MES密炼物料替代对应关系-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<MesXslMixerMaterialSubstitute> queryById(@RequestParam(name = "id", required = true) String id) {
+        MesXslMixerMaterialSubstitute entity = mesXslMixerMaterialSubstituteService.getById(id);
+        if (entity == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(entity);
+    }
+
+    @RequiresPermissions("xslmes:mes_xsl_mixer_material_substitute:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, MesXslMixerMaterialSubstitute model) {
+        return super.exportXls(request, model, MesXslMixerMaterialSubstitute.class, "密炼物料替代对应关系");
+    }
+
+    @RequiresPermissions("xslmes:mes_xsl_mixer_material_substitute:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, MesXslMixerMaterialSubstitute.class);
+    }
+
+    //update-begin---author:jiangxh ---date:20260520  for：【密炼物料替代对应关系】保存前校验与物料冗余回填-----------
+    private String validateAndFillMaterials(MesXslMixerMaterialSubstitute model, boolean isUpdate) {
+        if (oConvertUtils.isEmpty(model.getMixerMaterialId())) {
+            return "请选择密炼物料";
+        }
+        if (oConvertUtils.isEmpty(model.getSubstituteMaterialId())) {
+            return "请选择替代密炼物料";
+        }
+        if (model.getMixerMaterialId().equals(model.getSubstituteMaterialId())) {
+            return "密炼物料与替代密炼物料不能相同";
+        }
+
+        MesMixerMaterial mixerMaterial = mesMixerMaterialService.getById(model.getMixerMaterialId());
+        if (mixerMaterial == null) {
+            return "所选密炼物料不存在，请重新选择";
+        }
+        MesMixerMaterial substituteMaterial = mesMixerMaterialService.getById(model.getSubstituteMaterialId());
+        if (substituteMaterial == null) {
+            return "所选替代密炼物料不存在，请重新选择";
+        }
+
+        model.setMixerMaterialCode(mixerMaterial.getMaterialCode());
+        model.setMixerMaterialName(mixerMaterial.getMaterialName());
+        model.setSubstituteMaterialCode(substituteMaterial.getMaterialCode());
+        model.setSubstituteMaterialName(substituteMaterial.getMaterialName());
+
+        LambdaQueryWrapper<MesXslMixerMaterialSubstitute> dupQw = new LambdaQueryWrapper<>();
+        dupQw.eq(MesXslMixerMaterialSubstitute::getMixerMaterialId, model.getMixerMaterialId())
+                .eq(MesXslMixerMaterialSubstitute::getSubstituteMaterialId, model.getSubstituteMaterialId());
+        if (isUpdate && oConvertUtils.isNotEmpty(model.getId())) {
+            dupQw.ne(MesXslMixerMaterialSubstitute::getId, model.getId());
+        }
+        if (mesXslMixerMaterialSubstituteService.count(dupQw) > 0) {
+            return "该密炼物料与替代密炼物料的对应关系已存在";
+        }
+        return null;
+    }
+    //update-end---author:jiangxh ---date:20260520  for：【密炼物料替代对应关系】保存前校验与物料冗余回填-----------
+}

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

@@ -0,0 +1,261 @@
+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 jakarta.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
+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.common.system.query.QueryRuleEnum;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.system.entity.SysDepart;
+import org.jeecg.modules.system.service.ISysDepartService;
+import org.jeecg.modules.xslmes.entity.MesXslMixerPsCompile;
+import org.jeecg.modules.xslmes.service.IMesXslMixerPsCompileService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+/**
+ * MES 密炼PS编制
+ */
+@Tag(name = "MES密炼PS编制")
+@RestController
+@RequestMapping("/xslmes/mesXslMixerPsCompile")
+@Slf4j
+public class MesXslMixerPsCompileController extends JeecgController<MesXslMixerPsCompile, IMesXslMixerPsCompileService> {
+
+    @Autowired
+    private IMesXslMixerPsCompileService mesXslMixerPsCompileService;
+
+    @Autowired
+    private ISysDepartService sysDepartService;
+
+    @Operation(summary = "MES密炼PS编制-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<MesXslMixerPsCompile>> queryPageList(
+            MesXslMixerPsCompile model,
+            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+            HttpServletRequest req) {
+        Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
+        customeRuleMap.put("psCode", QueryRuleEnum.LIKE);
+        customeRuleMap.put("title", QueryRuleEnum.LIKE);
+        QueryWrapper<MesXslMixerPsCompile> queryWrapper =
+                QueryGenerator.initQueryWrapper(model, req.getParameterMap(), customeRuleMap);
+        queryWrapper.orderByDesc("issue_date", "create_time");
+        Page<MesXslMixerPsCompile> page = new Page<>(pageNo, pageSize);
+        IPage<MesXslMixerPsCompile> pageList = mesXslMixerPsCompileService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    @AutoLog(value = "MES密炼PS编制-添加")
+    @Operation(summary = "MES密炼PS编制-添加")
+    @RequiresPermissions("xslmes:mes_xsl_mixer_ps_compile:add")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody MesXslMixerPsCompile model) {
+        //update-begin---author:jiangxh ---date:20260520  for：【密炼PS编制】保存前校验与冗余回填-----------
+        String err = validateAndFill(model);
+        if (err != null) {
+            return Result.error(err);
+        }
+        //update-end---author:jiangxh ---date:20260520  for：【密炼PS编制】保存前校验与冗余回填-----------
+        mesXslMixerPsCompileService.save(model);
+        return Result.OK("添加成功！");
+    }
+
+    @AutoLog(value = "MES密炼PS编制-编辑")
+    @Operation(summary = "MES密炼PS编制-编辑")
+    @RequiresPermissions("xslmes:mes_xsl_mixer_ps_compile:edit")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody MesXslMixerPsCompile model) {
+        //update-begin---author:jiangxh ---date:20260520  for：【密炼PS编制】保存前校验与冗余回填-----------
+        String err = validateAndFill(model);
+        if (err != null) {
+            return Result.error(err);
+        }
+        //update-end---author:jiangxh ---date:20260520  for：【密炼PS编制】保存前校验与冗余回填-----------
+        MesXslMixerPsCompile existing = mesXslMixerPsCompileService.getById(model.getId());
+        if (existing == null) {
+            return Result.error("未找到对应数据");
+        }
+        if (!"compile".equals(existing.getStatus())) {
+            return Result.error("仅编制状态的单据允许编辑");
+        }
+        model.setStatus("compile");
+        model.setProofreadBy(existing.getProofreadBy());
+        model.setProofreadTime(existing.getProofreadTime());
+        model.setAuditBy(existing.getAuditBy());
+        model.setAuditTime(existing.getAuditTime());
+        model.setApproveBy(existing.getApproveBy());
+        model.setApproveTime(existing.getApproveTime());
+        mesXslMixerPsCompileService.updateById(model);
+        return Result.OK("编辑成功!");
+    }
+
+    @AutoLog(value = "MES密炼PS编制-删除")
+    @Operation(summary = "MES密炼PS编制-通过id删除")
+    @RequiresPermissions("xslmes:mes_xsl_mixer_ps_compile:delete")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        //update-begin---author:jiangxh ---date:20260520  for：【密炼PS编制】仅编制状态允许删除-----------
+        MesXslMixerPsCompile existing = mesXslMixerPsCompileService.getById(id);
+        String err = assertCompileStatusForDelete(existing);
+        if (err != null) {
+            return Result.error(err);
+        }
+        //update-end---author:jiangxh ---date:20260520  for：【密炼PS编制】仅编制状态允许删除-----------
+        mesXslMixerPsCompileService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    @AutoLog(value = "MES密炼PS编制-批量删除")
+    @Operation(summary = "MES密炼PS编制-批量删除")
+    @RequiresPermissions("xslmes:mes_xsl_mixer_ps_compile:deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        //update-begin---author:jiangxh ---date:20260520  for：【密炼PS编制】仅编制状态允许删除-----------
+        if (oConvertUtils.isEmpty(ids)) {
+            return Result.error("请选择要删除的记录");
+        }
+        for (String id : ids.split(",")) {
+            if (oConvertUtils.isEmpty(id)) {
+                continue;
+            }
+            MesXslMixerPsCompile existing = mesXslMixerPsCompileService.getById(id.trim());
+            String err = assertCompileStatusForDelete(existing);
+            if (err != null) {
+                return Result.error(err);
+            }
+        }
+        //update-end---author:jiangxh ---date:20260520  for：【密炼PS编制】仅编制状态允许删除-----------
+        mesXslMixerPsCompileService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
+
+    @Operation(summary = "MES密炼PS编制-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<MesXslMixerPsCompile> queryById(@RequestParam(name = "id", required = true) String id) {
+        MesXslMixerPsCompile entity = mesXslMixerPsCompileService.getById(id);
+        if (entity == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(entity);
+    }
+
+    @RequiresPermissions("xslmes:mes_xsl_mixer_ps_compile:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, MesXslMixerPsCompile model) {
+        return super.exportXls(request, model, MesXslMixerPsCompile.class, "密炼PS编制");
+    }
+
+    @RequiresPermissions("xslmes:mes_xsl_mixer_ps_compile:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, MesXslMixerPsCompile.class);
+    }
+
+    //update-begin---author:jiangxh ---date:20260520  for：【密炼PS编制】校对/审核/批准-----------
+    @AutoLog(value = "MES密炼PS编制-校对")
+    @Operation(summary = "MES密炼PS编制-校对")
+    @RequiresPermissions("xslmes:mes_xsl_mixer_ps_compile:proofread")
+    @PostMapping(value = "/proofread")
+    public Result<String> proofread(@RequestParam(name = "ids") String ids) {
+        return doChangeStatus(ids, "compile", "proofread", "校对");
+    }
+
+    @AutoLog(value = "MES密炼PS编制-审核")
+    @Operation(summary = "MES密炼PS编制-审核")
+    @RequiresPermissions("xslmes:mes_xsl_mixer_ps_compile:audit")
+    @PostMapping(value = "/audit")
+    public Result<String> audit(@RequestParam(name = "ids") String ids) {
+        return doChangeStatus(ids, "proofread", "audit", "审核");
+    }
+
+    @AutoLog(value = "MES密炼PS编制-批准")
+    @Operation(summary = "MES密炼PS编制-批准")
+    @RequiresPermissions("xslmes:mes_xsl_mixer_ps_compile:approve")
+    @PostMapping(value = "/approve")
+    public Result<String> approve(@RequestParam(name = "ids") String ids) {
+        return doChangeStatus(ids, "audit", "approve", "批准");
+    }
+
+    private Result<String> doChangeStatus(String ids, String expectedStatus, String targetStatus, String actionLabel) {
+        String err = mesXslMixerPsCompileService.changeStatusBatch(
+                ids, expectedStatus, targetStatus, actionLabel, getOperatorName());
+        if (err != null) {
+            return Result.error(err);
+        }
+        return Result.OK(actionLabel + "成功！");
+    }
+
+    private String getOperatorName() {
+        LoginUser loginUser = null;
+        try {
+            loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        } catch (Exception e) {
+            log.debug("获取当前登录用户失败", e);
+        }
+        if (loginUser == null) {
+            return null;
+        }
+        if (oConvertUtils.isNotEmpty(loginUser.getRealname())) {
+            return loginUser.getRealname();
+        }
+        return loginUser.getUsername();
+    }
+    //update-end---author:jiangxh ---date:20260520  for：【密炼PS编制】校对/审核/批准-----------
+
+    //update-begin---author:jiangxh ---date:20260520  for：【密炼PS编制】保存前校验与冗余回填-----------
+    private String validateAndFill(MesXslMixerPsCompile model) {
+        if (oConvertUtils.isEmpty(model.getReceiveDeptId())) {
+            return "请选择收信部门";
+        }
+        if (oConvertUtils.isEmpty(model.getReferenceDeptId())) {
+            return "请选择参照部门";
+        }
+        if (oConvertUtils.isEmpty(model.getTitle())) {
+            return "请输入标题";
+        }
+        if (oConvertUtils.isEmpty(model.getStatus())) {
+            model.setStatus("compile");
+        }
+        if (oConvertUtils.isNotEmpty(model.getFactoryId())) {
+            SysDepart factory = sysDepartService.getById(model.getFactoryId());
+            if (factory == null) {
+                return "所选所属工厂不存在，请重新选择";
+            }
+            model.setFactoryName(factory.getDepartName());
+        } else {
+            model.setFactoryName(null);
+        }
+        return null;
+    }
+    //update-end---author:jiangxh ---date:20260520  for：【密炼PS编制】保存前校验与冗余回填-----------
+
+    //update-begin---author:jiangxh ---date:20260520  for：【密炼PS编制】仅编制状态允许删除-----------
+    private String assertCompileStatusForDelete(MesXslMixerPsCompile entity) {
+        if (entity == null) {
+            return "记录不存在或已删除";
+        }
+        String status = entity.getStatus() == null ? "" : entity.getStatus();
+        if (!"compile".equals(status)) {
+            String psCode = oConvertUtils.isEmpty(entity.getPsCode()) ? entity.getId() : entity.getPsCode();
+            return "PS编码[" + psCode + "]当前状态不允许删除，仅编制状态可删除";
+        }
+        return null;
+    }
+    //update-end---author:jiangxh ---date:20260520  for：【密炼PS编制】仅编制状态允许删除-----------
+}

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

@@ -0,0 +1,181 @@
+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 jakarta.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import lombok.extern.slf4j.Slf4j;
+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.common.system.query.QueryRuleEnum;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.mes.material.entity.MesMaterial;
+import org.jeecg.modules.mes.material.service.IMesMaterialService;
+import org.jeecg.modules.xslmes.entity.MesXslOpenMillParam;
+import org.jeecg.modules.xslmes.service.IMesXslOpenMillParamService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+/**
+ * MES 开炼机参数维护
+ */
+@Tag(name = "MES开炼机参数维护")
+@RestController
+@RequestMapping("/xslmes/mesXslOpenMillParam")
+@Slf4j
+public class MesXslOpenMillParamController extends JeecgController<MesXslOpenMillParam, IMesXslOpenMillParamService> {
+
+    @Autowired
+    private IMesXslOpenMillParamService mesXslOpenMillParamService;
+
+    @Autowired
+    private IMesMaterialService mesMaterialService;
+
+    @Operation(summary = "MES开炼机参数维护-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<MesXslOpenMillParam>> queryPageList(
+            MesXslOpenMillParam model,
+            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+            HttpServletRequest req) {
+        Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
+        customeRuleMap.put("materialId", QueryRuleEnum.LIKE_WITH_OR);
+        QueryWrapper<MesXslOpenMillParam> queryWrapper =
+                QueryGenerator.initQueryWrapper(model, req.getParameterMap(), customeRuleMap);
+        Page<MesXslOpenMillParam> page = new Page<>(pageNo, pageSize);
+        IPage<MesXslOpenMillParam> pageList = mesXslOpenMillParamService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    @AutoLog(value = "MES开炼机参数维护-添加")
+    @Operation(summary = "MES开炼机参数维护-添加")
+    @RequiresPermissions("xslmes:mes_xsl_open_mill_param:add")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody MesXslOpenMillParam model) {
+        //update-begin---author:jiangxh ---date:20260520  for：【开炼机参数维护】保存前校验与胶料冗余回填-----------
+        String err = validateAndFillMaterial(model);
+        if (err != null) {
+            return Result.error(err);
+        }
+        //update-end---author:jiangxh ---date:20260520  for：【开炼机参数维护】保存前校验与胶料冗余回填-----------
+        mesXslOpenMillParamService.save(model);
+        return Result.OK("添加成功！");
+    }
+
+    @AutoLog(value = "MES开炼机参数维护-编辑")
+    @Operation(summary = "MES开炼机参数维护-编辑")
+    @RequiresPermissions("xslmes:mes_xsl_open_mill_param:edit")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody MesXslOpenMillParam model) {
+        //update-begin---author:jiangxh ---date:20260520  for：【开炼机参数维护】保存前校验与胶料冗余回填-----------
+        String err = validateAndFillMaterial(model);
+        if (err != null) {
+            return Result.error(err);
+        }
+        //update-end---author:jiangxh ---date:20260520  for：【开炼机参数维护】保存前校验与胶料冗余回填-----------
+        mesXslOpenMillParamService.updateById(model);
+        return Result.OK("编辑成功!");
+    }
+
+    @AutoLog(value = "MES开炼机参数维护-删除")
+    @Operation(summary = "MES开炼机参数维护-通过id删除")
+    @RequiresPermissions("xslmes:mes_xsl_open_mill_param:delete")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        mesXslOpenMillParamService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    @AutoLog(value = "MES开炼机参数维护-批量删除")
+    @Operation(summary = "MES开炼机参数维护-批量删除")
+    @RequiresPermissions("xslmes:mes_xsl_open_mill_param:deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        mesXslOpenMillParamService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
+
+    @Operation(summary = "MES开炼机参数维护-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<MesXslOpenMillParam> queryById(@RequestParam(name = "id", required = true) String id) {
+        MesXslOpenMillParam entity = mesXslOpenMillParamService.getById(id);
+        if (entity == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(entity);
+    }
+
+    @RequiresPermissions("xslmes:mes_xsl_open_mill_param:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, MesXslOpenMillParam model) {
+        return super.exportXls(request, model, MesXslOpenMillParam.class, "开炼机参数维护");
+    }
+
+    @RequiresPermissions("xslmes:mes_xsl_open_mill_param:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, MesXslOpenMillParam.class);
+    }
+
+    //update-begin---author:jiangxh ---date:20260520  for：【开炼机参数维护】保存前校验与胶料冗余回填-----------
+    private String validateAndFillMaterial(MesXslOpenMillParam model) {
+        if (oConvertUtils.isEmpty(model.getMaterialId())) {
+            return "请选择胶料";
+        }
+        MesMaterial material = mesMaterialService.getById(model.getMaterialId());
+        if (material == null) {
+            return "所选胶料不存在，请重新选择";
+        }
+        model.setMaterialName(material.getMaterialName());
+        model.setMaterialCode(oConvertUtils.isEmpty(material.getAliasName()) ? "" : material.getAliasName());
+        String timeErr = validateTimeFields(model);
+        if (timeErr != null) {
+            return timeErr;
+        }
+        return null;
+    }
+
+    private String validateTimeFields(MesXslOpenMillParam model) {
+        if (isNegative(model.getR0FeedTime())) {
+            return "R0进胶时间不能为负数";
+        }
+        if (isNegative(model.getR0RingTime())) {
+            return "R0成环时间不能为负数";
+        }
+        if (isNegative(model.getR0BreakTime())) {
+            return "R0拉断时间不能为负数";
+        }
+        if (isNegative(model.getR0DischargeTime())) {
+            return "R0排胶时间不能为负数";
+        }
+        if (isNegative(model.getR1FeedTime())) {
+            return "R1进胶时间不能为负数";
+        }
+        if (isNegative(model.getR1RingTime())) {
+            return "R1成环时间不能为负数";
+        }
+        if (isNegative(model.getR1BreakTime())) {
+            return "R1拉断时间不能为负数";
+        }
+        if (isNegative(model.getR1DischargeTime())) {
+            return "R1排胶时间不能为负数";
+        }
+        return null;
+    }
+
+    private static boolean isNegative(BigDecimal value) {
+        return value != null && value.compareTo(BigDecimal.ZERO) < 0;
+    }
+    //update-end---author:jiangxh ---date:20260520  for：【开炼机参数维护】保存前校验与胶料冗余回填-----------
+}

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

@@ -0,0 +1,90 @@
+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.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * MES 日罐物料对应信息
+ */
+@Data
+@TableName("mes_xsl_day_tank_material_map")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "MES日罐物料对应信息")
+public class MesXslDayTankMaterialMap implements Serializable {
+
+  private static final long serialVersionUID = 1L;
+
+  @TableId(type = IdType.ASSIGN_ID)
+  private String id;
+
+  @Excel(name = "机台名称", width = 20, dictTable = "mes_xsl_equipment_ledger", dicText = "equipment_name", dicCode = "id")
+  @Dict(dictTable = "mes_xsl_equipment_ledger", dicText = "equipment_name", dicCode = "id")
+  @Schema(description = "设备台账ID")
+  private String equipmentId;
+
+  @Excel(name = "机台代码", width = 20)
+  @Schema(description = "机台代码（设备编号冗余）")
+  private String machineCode;
+
+  @Excel(name = "机台名称", width = 20)
+  @Schema(description = "机台名称冗余")
+  private String machineName;
+
+  @Excel(name = "料仓分类", width = 20, dictTable = "sys_category", dicText = "name", dicCode = "id")
+  @Dict(dictTable = "sys_category", dicText = "name", dicCode = "id")
+  @Schema(description = "料仓分类ID（分类字典）")
+  private String siloCategoryId;
+
+  @Excel(name = "工位", width = 20)
+  @Schema(description = "工位")
+  private String station;
+
+  @Excel(name = "料仓号", width = 20)
+  @Schema(description = "料仓号")
+  private String siloNo;
+
+  @Excel(name = "物料名称", width = 20, dictTable = "mes_material", dicText = "material_name", dicCode = "id")
+  @Dict(dictTable = "mes_material", dicText = "material_name", dicCode = "id")
+  @Schema(description = "胶料信息ID")
+  private String materialId;
+
+  @Excel(name = "物料名称", width = 20)
+  @Schema(description = "物料名称冗余")
+  private String materialName;
+
+  @Excel(name = "使用状态", width = 12, replace = {"使用中_1", "停用_0"})
+  @Schema(description = "使用状态：1使用中 0停用")
+  private Integer useStatus;
+
+  @Excel(name = "是否允许同步", width = 12, replace = {"允许_1", "不允许_0"})
+  @Schema(description = "是否允许同步：1允许 0不允许")
+  private Integer allowSync;
+
+  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/MesXslEquipInspectConfig.java

@@ -0,0 +1,65 @@
+package org.jeecg.modules.xslmes.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 java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+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 设备点检配置主表（表 mes_xsl_equip_inspect_config）
+ */
+@Data
+@TableName("mes_xsl_equip_inspect_config")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "MES设备点检配置")
+public class MesXslEquipInspectConfig implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
+
+    @Schema(description = "设备台账主键 mes_xsl_equipment_ledger.id")
+    private String equipmentLedgerId;
+
+    @Excel(name = "设备名称", width = 22)
+    @Schema(description = "设备名称冗余")
+    private String equipmentName;
+
+    @Excel(name = "设备编号", width = 18)
+    @Schema(description = "设备编号冗余")
+    private String equipmentCode;
+
+    @Excel(name = "类型", width = 12, dicCode = "xslmes_im_item_category")
+    @Dict(dicCode = "xslmes_im_item_category")
+    @Schema(description = "配置类型（字典xslmes_im_item_category：inspect点检/maintain保养；同设备同类型唯一）")
+    private String configType;
+
+    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;
+
+    @TableField(exist = false)
+    @Schema(description = "点检项目明细")
+    private List<MesXslEquipInspectConfigLine> lineList;
+}

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

@@ -0,0 +1,73 @@
+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.jeecg.common.aspect.annotation.Dict;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * MES 设备点检配置明细（表 mes_xsl_equip_inspect_config_line）
+ */
+@Data
+@TableName("mes_xsl_equip_inspect_config_line")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "MES设备点检配置明细")
+public class MesXslEquipInspectConfigLine implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
+
+    @Schema(description = "主表主键 mes_xsl_equip_inspect_config.id")
+    private String configId;
+
+    @Schema(description = "点检及保养项目主键 mes_xsl_inspect_maintain_item.id")
+    private String inspectMaintainItemId;
+
+    @Schema(description = "点检项目编号冗余")
+    private String itemCode;
+
+    @Schema(description = "项目名称冗余")
+    private String itemName;
+
+    @Dict(dicCode = "xslmes_im_item_category")
+    @Schema(description = "项目类别冗余")
+    private String itemCategory;
+
+    @Dict(dicCode = "xslmes_im_item_type")
+    @Schema(description = "项目类型冗余")
+    private String itemType;
+
+    @Schema(description = "设备部位名称冗余")
+    private String equipmentPartName;
+
+    @Schema(description = "设备小部位名称冗余")
+    private String equipmentSubPartName;
+
+    @Dict(dicCode = "xslmes_im_inspect_method")
+    @Schema(description = "点检方式冗余")
+    private String inspectMethod;
+
+    @Schema(description = "判断基准冗余")
+    private String judgmentCriteria;
+
+    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/MesXslEquipInspectRecord.java

@@ -0,0 +1,126 @@
+package org.jeecg.modules.xslmes.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 java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+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 点检/保养记录主表（表 mes_xsl_equip_inspect_record）
+ */
+@Data
+@TableName("mes_xsl_equip_inspect_record")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "MES点检保养记录")
+public class MesXslEquipInspectRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
+
+    @Excel(name = "记录编号", width = 20)
+    @Schema(description = "记录编号 EC+yyyyMMdd+4位流水")
+    private String recordNo;
+
+    @Excel(name = "计划单号", width = 18)
+    @Schema(description = "计划单号")
+    private String planNo;
+
+    @Schema(description = "计划主键")
+    private String planId;
+
+    @Schema(description = "设备台账主键")
+    private String equipmentLedgerId;
+
+    @Excel(name = "设备编码", width = 16)
+    @Schema(description = "设备编码冗余")
+    private String equipmentCode;
+
+    @Excel(name = "设备名称", width = 20)
+    @Schema(description = "设备名称冗余")
+    private String equipmentName;
+
+    @Schema(description = "设备点检配置主键")
+    private String equipInspectConfigId;
+
+    @Excel(name = "类型", width = 10, dicCode = "xslmes_im_item_category")
+    @Dict(dicCode = "xslmes_im_item_category")
+    @Schema(description = "点检/保养类型")
+    private String recordType;
+
+    @Excel(name = "点检日期", width = 12, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Schema(description = "点检日期")
+    private Date inspectDate;
+
+    @Schema(description = "点检人用户ID")
+    private String inspectorUserId;
+
+    @Schema(description = "点检人账号")
+    private String inspectorUsername;
+
+    @Excel(name = "点检人", width = 12)
+    @Schema(description = "点检人姓名")
+    private String inspectorRealname;
+
+    @Excel(name = "点检结果", width = 10, dicCode = "xslmes_im_inspect_result")
+    @Dict(dicCode = "xslmes_im_inspect_result")
+    @Schema(description = "点检结果 pass/fail")
+    private String inspectResult;
+
+    @Excel(name = "状态", width = 10, dicCode = "xslmes_im_record_status")
+    @Dict(dicCode = "xslmes_im_record_status")
+    @Schema(description = "记录状态 pending/done")
+    private String recordStatus;
+
+    @Excel(name = "是否已处理", width = 10, dicCode = "yn")
+    @Dict(dicCode = "yn")
+    @Schema(description = "是否已处理（字典yn：1是0否，不合格记录使用）")
+    private String handledFlag;
+
+    @Schema(description = "处理人用户ID")
+    private String handlerUserId;
+
+    @Schema(description = "处理人账号")
+    private String handlerUsername;
+
+    @Excel(name = "处理人", width = 12)
+    @Schema(description = "处理人姓名")
+    private String handlerRealname;
+
+    @Excel(name = "处理时间", width = 18, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "处理时间")
+    private Date handleTime;
+
+    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;
+
+    @TableField(exist = false)
+    @Schema(description = "点检明细")
+    private List<MesXslEquipInspectRecordLine> lineList;
+}

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

@@ -0,0 +1,82 @@
+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.jeecg.common.aspect.annotation.Dict;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * MES 点检/保养记录明细（表 mes_xsl_equip_inspect_record_line）
+ */
+@Data
+@TableName("mes_xsl_equip_inspect_record_line")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "MES点检保养记录明细")
+public class MesXslEquipInspectRecordLine implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
+
+    @Schema(description = "主表主键")
+    private String recordId;
+
+    @Schema(description = "设备点检配置明细主键")
+    private String equipInspectConfigLineId;
+
+    @Schema(description = "点检及保养项目主键冗余")
+    private String inspectMaintainItemId;
+
+    @Schema(description = "点检项目编号")
+    private String itemCode;
+
+    @Schema(description = "项目名称")
+    private String itemName;
+
+    @Dict(dicCode = "xslmes_im_item_category")
+    @Schema(description = "项目类别")
+    private String itemCategory;
+
+    @Dict(dicCode = "xslmes_im_item_type")
+    @Schema(description = "项目类型")
+    private String itemType;
+
+    @Schema(description = "设备部位")
+    private String equipmentPartName;
+
+    @Schema(description = "设备小部位")
+    private String equipmentSubPartName;
+
+    @Dict(dicCode = "xslmes_im_inspect_method")
+    @Schema(description = "点检方式")
+    private String inspectMethod;
+
+    @Schema(description = "判断基准")
+    private String judgmentCriteria;
+
+    @Schema(description = "明细点检结果文本")
+    private String lineInspectResult;
+
+    @Schema(description = "图片路径，逗号分隔")
+    private String pictureFiles;
+
+    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/MesXslEquipmentLedger.java

@@ -0,0 +1,168 @@
+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.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * MES 设备台账（表 mes_xsl_equipment_ledger）
+ */
+@Data
+@TableName("mes_xsl_equipment_ledger")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "MES设备台账")
+public class MesXslEquipmentLedger implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
+
+    @Schema(description = "所属工序主键")
+    private String processOperationId;
+
+    @Excel(name = "工序名称", width = 20)
+    @Schema(description = "工序名称冗余")
+    private String processOperationName;
+
+    @Excel(name = "设备名称", width = 22)
+    @Schema(description = "设备名称（同租户未删除数据中唯一）")
+    private String equipmentName;
+
+    @Excel(name = "设备编号", width = 18)
+    @Schema(description = "设备编号（同租户未删除数据中唯一）")
+    private String equipmentCode;
+
+    @Schema(description = "所属设备厂家主键")
+    private String manufacturerId;
+
+    @Excel(name = "设备厂家", width = 20)
+    @Schema(description = "设备厂家名称冗余")
+    private String manufacturerName;
+
+    @Schema(description = "设备类别主键")
+    private String equipmentCategoryId;
+
+    @Excel(name = "设备类别", width = 16)
+    @Schema(description = "设备类别名称冗余")
+    private String equipmentCategoryName;
+
+    @Schema(description = "设备类型主键")
+    private String equipmentTypeId;
+
+    @Excel(name = "设备类型", width = 16)
+    @Schema(description = "设备类型名称冗余")
+    private String equipmentTypeName;
+
+    @Schema(description = "所属工厂主键（厂家信息）")
+    private String factoryId;
+
+    @Excel(name = "所属工厂", width = 20)
+    @Schema(description = "所属工厂名称冗余")
+    private String factoryName;
+
+    @Excel(name = "设备型号", width = 16)
+    @Schema(description = "设备型号")
+    private String equipmentModel;
+
+    @Excel(name = "设备状态", width = 12, dicCode = "xslmes_equipment_ledger_status")
+    @Dict(dicCode = "xslmes_equipment_ledger_status")
+    @Schema(description = "设备状态（字典：在用/停用/报废）")
+    private String equipmentStatus;
+
+    @Excel(name = "序列号", width = 18)
+    @Schema(description = "序列号")
+    private String serialNo;
+
+    @Excel(name = "铭牌", width = 18)
+    @Schema(description = "铭牌")
+    private String nameplate;
+
+    @Excel(name = "维修部门", width = 16, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
+    @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
+    @Schema(description = "维修部门主键")
+    private String maintainDeptId;
+
+    @Excel(name = "维修人员", width = 12)
+    @Schema(description = "维修人员")
+    private String maintainPerson;
+
+    @Excel(name = "主管部门", width = 16, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
+    @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
+    @Schema(description = "主管部门主键")
+    private String manageDeptId;
+
+    @Excel(name = "资料文件编号", width = 18)
+    @Schema(description = "资料文件编号")
+    private String docFileNo;
+
+    @Excel(name = "生产日期", width = 14, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Schema(description = "生产日期")
+    private Date productionDate;
+
+    @Excel(name = "购买日期", width = 14, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Schema(description = "购买日期")
+    private Date purchaseDate;
+
+    @Excel(name = "使用日期", width = 14, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Schema(description = "使用日期")
+    private Date useDate;
+
+    @Excel(name = "厂商联系人", width = 14)
+    @Schema(description = "厂商联系人")
+    private String vendorContact;
+
+    @Excel(name = "价值", width = 14)
+    @Schema(description = "价值")
+    private String assetValue;
+
+    @Excel(name = "受控PDA", width = 14)
+    @Schema(description = "受控PDA")
+    private String controlledPda;
+
+    @Excel(name = "超产比率", width = 12)
+    @Schema(description = "超产比率")
+    private String overproductionRatio;
+
+    @Excel(name = "有效体积", width = 12)
+    @Schema(description = "有效体积")
+    private String effectiveVolume;
+
+    @Excel(name = "是否启用", width = 10, dicCode = "yn")
+    @Dict(dicCode = "yn")
+    @Schema(description = "是否启用（字典yn：1是0否）")
+    private String enabledFlag;
+
+    @Excel(name = "设备描述", width = 30)
+    @Schema(description = "设备描述")
+    private String equipmentDesc;
+
+    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/MesXslFormulaSpec.java

@@ -0,0 +1,220 @@
+package org.jeecg.modules.xslmes.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 java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+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_formula_spec")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "MES配合示方")
+public class MesXslFormulaSpec implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
+
+    @Excel(name = "分类", width = 10, dicCode = "xslmes_formula_spec_category")
+    @Dict(dicCode = "xslmes_formula_spec_category")
+    @Schema(description = "分类")
+    private String category;
+
+    @Excel(name = "示方编号", width = 18)
+    @Schema(description = "示方编号")
+    private String specCode;
+
+    @Excel(name = "胶料代号", width = 18)
+    @Schema(description = "胶料代号")
+    private String rubberCode;
+
+    @Schema(description = "胶料ID（关联mes_material.id）")
+    private String rubberMaterialId;
+
+    @Excel(name = "基本配合", width = 15)
+    @Schema(description = "基本配合")
+    private String basicFormula;
+
+    @Excel(name = "发行日期", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Schema(description = "发行日期")
+    private Date issueDate;
+
+    @Excel(name = "用途", width = 20)
+    @Schema(description = "用途")
+    private String purpose;
+
+    @Excel(name = "发行编号", width = 15)
+    @Schema(description = "发行编号")
+    private String issueNumber;
+
+    @Excel(name = "混合段数", width = 10)
+    @Schema(description = "混合段数")
+    private Integer mixingStages;
+
+    @Excel(name = "混合机器", width = 15)
+    @Schema(description = "混合机器")
+    private String mixingMachine;
+
+    @Schema(description = "发行部门ID")
+    private String issueDeptId;
+
+    @Excel(name = "发行部门", width = 15)
+    @Schema(description = "发行部门名称")
+    private String issueDeptName;
+
+    @Excel(name = "A胶TOTAL PHR", width = 14)
+    @Schema(description = "A胶TOTAL PHR")
+    private BigDecimal aRubberTotalPhr;
+
+    @Excel(name = "TOTAL PHR", width = 12)
+    @Schema(description = "TOTAL PHR")
+    private BigDecimal totalPhr;
+
+    //update-begin---author:jiangxh ---date:20260521  for：【配合示方】主表新增混合段1-7合计字段-----------
+    @Excel(name = "混合段1合计", width = 12)
+    @Schema(description = "混合段1合计")
+    private BigDecimal stage1Total;
+
+    @Excel(name = "混合段2合计", width = 12)
+    @Schema(description = "混合段2合计")
+    private BigDecimal stage2Total;
+
+    @Excel(name = "混合段3合计", width = 12)
+    @Schema(description = "混合段3合计")
+    private BigDecimal stage3Total;
+
+    @Excel(name = "混合段4合计", width = 12)
+    @Schema(description = "混合段4合计")
+    private BigDecimal stage4Total;
+
+    @Excel(name = "混合段5合计", width = 12)
+    @Schema(description = "混合段5合计")
+    private BigDecimal stage5Total;
+
+    @Excel(name = "混合段6合计", width = 12)
+    @Schema(description = "混合段6合计")
+    private BigDecimal stage6Total;
+
+    @Excel(name = "混合段7合计", width = 12)
+    @Schema(description = "混合段7合计")
+    private BigDecimal stage7Total;
+    //update-end---author:jiangxh ---date:20260521  for：【配合示方】主表新增混合段1-7合计字段-----------
+
+    @Excel(name = "发行理由", width = 30)
+    @Schema(description = "发行理由")
+    private String issueReason;
+
+    @Excel(name = "天然橡胶", width = 12)
+    @Schema(description = "天然橡胶")
+    private BigDecimal naturalRubber;
+
+    @Excel(name = "合成橡胶", width = 12)
+    @Schema(description = "合成橡胶")
+    private BigDecimal syntheticRubber;
+
+    @Excel(name = "合计", width = 12)
+    @Schema(description = "合计")
+    private BigDecimal totalAmount;
+
+    @Excel(name = "重量单价", width = 12)
+    @Schema(description = "重量单价")
+    private BigDecimal weightUnitPrice;
+
+    @Excel(name = "体积单价", width = 12)
+    @Schema(description = "体积单价")
+    private BigDecimal volumeUnitPrice;
+
+    @Excel(name = "Q胶比重", width = 12)
+    @Schema(description = "Q胶比重")
+    @TableField("q_rubber_sg")
+    private BigDecimal qRubberSg;
+
+    @Excel(name = "A胶比重", width = 12)
+    @Schema(description = "A胶比重")
+    @TableField("a_rubber_sg")
+    private BigDecimal aRubberSg;
+
+    @Excel(name = "人工配料", width = 10, replace = {"是_1", "否_0"})
+    @Schema(description = "是否有人工配料（0否 1是）")
+    private Integer hasManualBatch;
+
+    @Excel(name = "状态", width = 12, dicCode = "xslmes_formula_spec_status")
+    @Dict(dicCode = "xslmes_formula_spec_status")
+    @Schema(description = "状态")
+    private String status;
+
+    @Excel(name = "校对人", width = 12)
+    @Schema(description = "校对人")
+    private String proofreadBy;
+
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "校对时间")
+    private Date proofreadTime;
+
+    @Excel(name = "审核人", width = 12)
+    @Schema(description = "审核人")
+    private String auditBy;
+
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "审核时间")
+    private Date auditTime;
+
+    @Excel(name = "批准人", width = 12)
+    @Schema(description = "批准人")
+    private String approveBy;
+
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "批准时间")
+    private Date approveTime;
+
+    @Excel(name = "创建人", width = 12, dictTable = "sys_user", dicText = "realname", dicCode = "username")
+    @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
+    private String createBy;
+
+    /** queryById 等非分页接口补充创建人姓名（DictAspect 仅翻译分页列表） */
+    @TableField(exist = false)
+    @Schema(description = "创建人姓名")
+    private String createBy_dictText;
+
+    @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;
+
+    @Schema(description = "租户ID")
+    private Integer tenantId;
+
+    private String sysOrgCode;
+    private Integer delFlag;
+
+    @TableField(exist = false)
+    @Schema(description = "配合明细")
+    private List<MesXslFormulaSpecLine> lineList;
+}

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

@@ -0,0 +1,105 @@
+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.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * MES 配合示方明细
+ */
+@Data
+@TableName("mes_xsl_formula_spec_line")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "MES配合示方明细")
+public class MesXslFormulaSpecLine implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
+
+    @Schema(description = "配合示方主表ID")
+    private String formulaSpecId;
+
+    @Schema(description = "行序号")
+    private Integer sortNo;
+
+    @Schema(description = "PHR")
+    private BigDecimal phr;
+
+    @Schema(description = "密炼物料ID")
+    private String mixerMaterialId;
+
+    @Schema(description = "密炼物料编码")
+    private String mixerMaterialCode;
+
+    @Schema(description = "密炼物料名称")
+    private String mixerMaterialName;
+
+    @Schema(description = "物料描述")
+    private String materialDesc;
+
+    @Dict(dicCode = "xslmes_formula_spec_step")
+    @Schema(description = "STEP")
+    private String step;
+
+    @Dict(dicCode = "xslmes_formula_spec_weigh_mode")
+    @Schema(description = "称量方式")
+    private String weighMode;
+
+    @Schema(description = "重量%")
+    private BigDecimal weightPercent;
+
+    @Schema(description = "体积")
+    private BigDecimal volume;
+
+    @Schema(description = "备注")
+    private String remark;
+
+    @Schema(description = "混合段1")
+    private BigDecimal stage1;
+
+    @Schema(description = "混合段2")
+    private BigDecimal stage2;
+
+    @Schema(description = "混合段3")
+    private BigDecimal stage3;
+
+    @Schema(description = "混合段4")
+    private BigDecimal stage4;
+
+    @Schema(description = "混合段5")
+    private BigDecimal stage5;
+
+    @Schema(description = "混合段6")
+    private BigDecimal stage6;
+
+    @Schema(description = "混合段7")
+    private BigDecimal stage7;
+
+    @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;
+}

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

@@ -0,0 +1,48 @@
+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.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 配合示方模块配置
+ */
+@Data
+@TableName("mes_xsl_formula_spec_setting")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "配合示方模块配置")
+public class MesXslFormulaSpecSetting implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    public static final String DEFAULT_ID = "1993000000000000991";
+
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
+
+    @Schema(description = "天然橡胶物料小类ID，逗号分隔")
+    private String naturalMinorCategoryIds;
+
+    @Schema(description = "合成橡胶物料小类ID，逗号分隔")
+    private String syntheticMinorCategoryIds;
+
+    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/MesXslInspectMaintainItem.java

@@ -0,0 +1,102 @@
+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.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * MES 点检及保养项目（表 mes_xsl_inspect_maintain_item）
+ */
+@Data
+@TableName("mes_xsl_inspect_maintain_item")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "MES点检及保养项目")
+public class MesXslInspectMaintainItem implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
+
+    @Excel(name = "项目名称", width = 22)
+    @Schema(description = "项目名称（同租户未删除数据中唯一）")
+    private String itemName;
+
+    @Excel(name = "项目编号", width = 18)
+    @Schema(description = "项目编号（同租户未删除数据中唯一）")
+    private String itemCode;
+
+    @Schema(description = "设备类别主键 mes_xsl_equipment_category.id")
+    private String equipmentCategoryId;
+
+    @Excel(name = "设备类别", width = 20)
+    @Schema(description = "设备类别名称冗余")
+    private String equipmentCategoryName;
+
+    @Schema(description = "设备类型主键 mes_xsl_equipment_type.id")
+    private String equipmentTypeId;
+
+    @Excel(name = "设备类型", width = 20)
+    @Schema(description = "设备类型名称冗余")
+    private String equipmentTypeName;
+
+    @Schema(description = "设备部位主键 mes_xsl_equipment_part.id")
+    private String equipmentPartId;
+
+    @Excel(name = "设备部位", width = 20)
+    @Schema(description = "设备部位名称冗余")
+    private String equipmentPartName;
+
+    @Schema(description = "设备小部位主键 mes_xsl_equipment_sub_part.id")
+    private String equipmentSubPartId;
+
+    @Excel(name = "设备小部位", width = 20)
+    @Schema(description = "设备小部位名称冗余")
+    private String equipmentSubPartName;
+
+    @Excel(name = "项目类别", width = 12, dicCode = "xslmes_im_item_category")
+    @Dict(dicCode = "xslmes_im_item_category")
+    @Schema(description = "项目类别（字典xslmes_im_item_category：inspect点检/maintain保养）")
+    private String itemCategory;
+
+    @Excel(name = "项目类型", width = 12, dicCode = "xslmes_im_item_type")
+    @Dict(dicCode = "xslmes_im_item_type")
+    @Schema(description = "项目类型（字典xslmes_im_item_type：mechanical机械类/electrical电气类）")
+    private String itemType;
+
+    @Excel(name = "点检方式", width = 12, dicCode = "xslmes_im_inspect_method")
+    @Dict(dicCode = "xslmes_im_inspect_method")
+    @Schema(description = "点检方式（字典xslmes_im_inspect_method：visual视觉/sight目测/hearing听觉）")
+    private String inspectMethod;
+
+    @Excel(name = "判断基准", width = 28)
+    @Schema(description = "判断基准")
+    private String judgmentCriteria;
+
+    @Excel(name = "保养周期(天)", width = 14)
+    @Schema(description = "保养周期（天）")
+    private Integer maintainCycleDays;
+
+    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

@@ -0,0 +1,68 @@
+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.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * MES 密炼机动作维护
+ */
+@Data
+@TableName("mes_xsl_mixer_action")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "MES密炼机动作维护")
+public class MesXslMixerAction implements Serializable {
+
+  private static final long serialVersionUID = 1L;
+
+  @TableId(type = IdType.ASSIGN_ID)
+  private String id;
+
+  @Excel(name = "设备名称", width = 20, dictTable = "mes_xsl_equipment_ledger", dicText = "equipment_name", dicCode = "id")
+  @Dict(dictTable = "mes_xsl_equipment_ledger", dicText = "equipment_name", dicCode = "id")
+  @Schema(description = "设备台账ID")
+  private String equipmentId;
+
+  @Excel(name = "设备名称", width = 20)
+  @Schema(description = "设备名称冗余")
+  private String equipmentName;
+
+  @Excel(name = "动作名称", width = 20)
+  @Schema(description = "动作名称")
+  private String actionName;
+
+  @Excel(name = "动作代号", width = 20)
+  @Schema(description = "动作代号")
+  private String actionCode;
+
+  @Excel(name = "备注", width = 30)
+  @Schema(description = "备注")
+  private String remark;
+
+  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/MesXslMixerMaterialSubstitute.java

@@ -0,0 +1,82 @@
+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.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * MES 密炼物料替代对应关系
+ */
+@Data
+@TableName("mes_xsl_mixer_material_substitute")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "MES密炼物料替代对应关系")
+public class MesXslMixerMaterialSubstitute implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
+
+    @Excel(name = "编号", width = 10)
+    @Schema(description = "编号（租户内自动累加，从1开始）")
+    private Integer serialNo;
+
+    @Excel(name = "密炼物料ID", width = 15, dictTable = "mes_mixer_material", dicText = "material_name", dicCode = "id")
+    @Dict(dictTable = "mes_mixer_material", dicText = "material_name", dicCode = "id")
+    @Schema(description = "密炼物料ID（关联 mes_mixer_material.id）")
+    private String mixerMaterialId;
+
+    @Excel(name = "密炼物料编码", width = 15)
+    @Schema(description = "密炼物料编码冗余")
+    private String mixerMaterialCode;
+
+    @Excel(name = "密炼物料名称", width = 20)
+    @Schema(description = "密炼物料名称冗余")
+    private String mixerMaterialName;
+
+    @Excel(name = "替代密炼物料ID", width = 15, dictTable = "mes_mixer_material", dicText = "material_name", dicCode = "id")
+    @Dict(dictTable = "mes_mixer_material", dicText = "material_name", dicCode = "id")
+    @Schema(description = "替代密炼物料ID（关联 mes_mixer_material.id）")
+    private String substituteMaterialId;
+
+    @Excel(name = "替代密炼物料编码", width = 15)
+    @Schema(description = "替代密炼物料编码冗余")
+    private String substituteMaterialCode;
+
+    @Excel(name = "替代密炼物料名称", width = 20)
+    @Schema(description = "替代密炼物料名称冗余")
+    private String substituteMaterialName;
+
+    @Excel(name = "创建人", width = 15)
+    private String createBy;
+
+    @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @Excel(name = "修改人", width = 15)
+    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;
+
+    @Schema(description = "租户ID")
+    private Integer tenantId;
+
+    private String sysOrgCode;
+    private Integer delFlag;
+}

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

@@ -0,0 +1,152 @@
+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.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * MES 密炼PS编制
+ */
+@Data
+@TableName("mes_xsl_mixer_ps_compile")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "MES密炼PS编制")
+public class MesXslMixerPsCompile implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
+
+    @Excel(name = "所属工厂", width = 20)
+    @Schema(description = "所属工厂名称冗余（公司）")
+    private String factoryName;
+
+    @Schema(description = "所属工厂ID（sys_depart.id，公司）")
+    private String factoryId;
+
+    @Excel(name = "PS编码", width = 18)
+    @Schema(description = "PS编码")
+    private String psCode;
+
+    @Excel(name = "类型", width = 15, dicCode = "xslmes_ps_belong")
+    @Dict(dicCode = "xslmes_ps_belong")
+    @Schema(description = "类型（字典PS归属）")
+    private String psType;
+
+    @Excel(name = "施工代号", width = 15, dicCode = "xslmes_construction_code")
+    @Dict(dicCode = "xslmes_construction_code")
+    @Schema(description = "施工代号")
+    private String constructionCode;
+
+    @Excel(name = "发放日期", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Schema(description = "发放日期")
+    private Date issueDate;
+
+    @Excel(name = "发送部门", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
+    @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
+    @Schema(description = "发送部门ID")
+    private String sendDeptId;
+
+    @Excel(name = "收信部门", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
+    @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
+    @Schema(description = "收信部门ID")
+    private String receiveDeptId;
+
+    @Excel(name = "参照部门", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
+    @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
+    @Schema(description = "参照部门ID")
+    private String referenceDeptId;
+
+    @Excel(name = "标题", width = 25)
+    @Schema(description = "标题")
+    private String title;
+
+    @Excel(name = "目的", width = 30)
+    @Schema(description = "目的")
+    private String purpose;
+
+    @Excel(name = "依据", width = 30)
+    @Schema(description = "依据")
+    private String basis;
+
+    @Excel(name = "内容", width = 40)
+    @Schema(description = "内容")
+    private String content;
+
+    @Excel(name = "担当", width = 12)
+    @Schema(description = "担当")
+    private String responsiblePerson;
+
+    @Excel(name = "状态", width = 10, dicCode = "xslmes_mixer_ps_status")
+    @Dict(dicCode = "xslmes_mixer_ps_status")
+    @Schema(description = "状态")
+    private String status;
+
+    @Excel(name = "校对人", width = 15)
+    @Schema(description = "校对人")
+    private String proofreadBy;
+
+    @Excel(name = "校对时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "校对时间")
+    private Date proofreadTime;
+
+    @Excel(name = "审核人", width = 15)
+    @Schema(description = "审核人")
+    private String auditBy;
+
+    @Excel(name = "审核时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "审核时间")
+    private Date auditTime;
+
+    @Excel(name = "批准人", width = 15)
+    @Schema(description = "批准人")
+    private String approveBy;
+
+    @Excel(name = "批准时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "批准时间")
+    private Date approveTime;
+
+    @Excel(name = "创建人", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username")
+    //update-begin---author:jiangxh ---date:20260520  for：【密炼PS编制】创建人翻译为姓名供编制人展示-----------
+    @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
+    //update-end---author:jiangxh ---date:20260520  for：【密炼PS编制】创建人翻译为姓名供编制人展示-----------
+    private String createBy;
+
+    @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @Excel(name = "修改人", width = 15)
+    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;
+
+    @Schema(description = "租户ID")
+    private Integer tenantId;
+
+    private String sysOrgCode;
+    private Integer delFlag;
+}

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

@@ -0,0 +1,98 @@
+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_open_mill_param")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "MES开炼机参数维护")
+public class MesXslOpenMillParam implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
+
+    @Excel(name = "胶料ID", width = 15, dictTable = "mes_material", dicText = "material_name", dicCode = "id")
+    @Dict(dictTable = "mes_material", dicText = "material_name", dicCode = "id")
+    @Schema(description = "胶料ID（关联 mes_material.id）")
+    private String materialId;
+
+    @Excel(name = "胶料名称", width = 20)
+    @Schema(description = "胶料名称冗余")
+    private String materialName;
+
+    @Excel(name = "胶料别名", width = 15)
+    @Schema(description = "胶料别名冗余（取自 mes_material.alias_name）")
+    private String materialCode;
+
+    @Excel(name = "R0进胶时间(秒)", width = 14)
+    @Schema(description = "R0进胶时间（秒）")
+    private BigDecimal r0FeedTime;
+
+    @Excel(name = "R0成环时间(秒)", width = 14)
+    @Schema(description = "R0成环时间（秒）")
+    private BigDecimal r0RingTime;
+
+    @Excel(name = "R0拉断时间(秒)", width = 14)
+    @Schema(description = "R0拉断时间（秒）")
+    private BigDecimal r0BreakTime;
+
+    @Excel(name = "R0排胶时间(秒)", width = 14)
+    @Schema(description = "R0排胶时间（秒）")
+    private BigDecimal r0DischargeTime;
+
+    @Excel(name = "R1进胶时间(秒)", width = 14)
+    @Schema(description = "R1进胶时间（秒）")
+    private BigDecimal r1FeedTime;
+
+    @Excel(name = "R1成环时间(秒)", width = 14)
+    @Schema(description = "R1成环时间（秒）")
+    private BigDecimal r1RingTime;
+
+    @Excel(name = "R1拉断时间(秒)", width = 14)
+    @Schema(description = "R1拉断时间（秒）")
+    private BigDecimal r1BreakTime;
+
+    @Excel(name = "R1排胶时间(秒)", width = 14)
+    @Schema(description = "R1排胶时间（秒）")
+    private BigDecimal r1DischargeTime;
+
+    @Excel(name = "创建人", width = 15)
+    private String createBy;
+
+    @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @Excel(name = "修改人", width = 15)
+    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;
+
+    @Schema(description = "租户ID")
+    private Integer tenantId;
+
+    private String sysOrgCode;
+    private Integer delFlag;
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,9 @@
+package org.jeecg.modules.xslmes.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.xslmes.entity.MesXslInspectMaintainItem;
+
+/**
+ * MES 点检及保养项目
+ */
+public interface MesXslInspectMaintainItemMapper extends BaseMapper<MesXslInspectMaintainItem> {}

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

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

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

@@ -0,0 +1,20 @@
+package org.jeecg.modules.xslmes.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.jeecg.modules.xslmes.entity.MesXslMixerMaterialSubstitute;
+
+/**
+ * MES 密炼物料替代对应关系 Mapper
+ */
+@Mapper
+public interface MesXslMixerMaterialSubstituteMapper extends BaseMapper<MesXslMixerMaterialSubstitute> {
+
+    //update-begin---author:jiangxh ---date:20260520  for：【密炼物料替代对应关系】查询租户内最大编号-----------
+    @Select("SELECT IFNULL(MAX(serial_no), 0) FROM mes_xsl_mixer_material_substitute "
+            + "WHERE del_flag = 0 AND (#{tenantId} IS NULL OR tenant_id = #{tenantId})")
+    Integer selectMaxSerialNo(@Param("tenantId") Integer tenantId);
+    //update-end---author:jiangxh ---date:20260520  for：【密炼物料替代对应关系】查询租户内最大编号-----------
+}

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

@@ -0,0 +1,12 @@
+package org.jeecg.modules.xslmes.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.jeecg.modules.xslmes.entity.MesXslMixerPsCompile;
+
+/**
+ * MES 密炼PS编制 Mapper
+ */
+@Mapper
+public interface MesXslMixerPsCompileMapper extends BaseMapper<MesXslMixerPsCompile> {
+}

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

@@ -0,0 +1,12 @@
+package org.jeecg.modules.xslmes.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.jeecg.modules.xslmes.entity.MesXslOpenMillParam;
+
+/**
+ * MES 开炼机参数维护 Mapper
+ */
+@Mapper
+public interface MesXslOpenMillParamMapper extends BaseMapper<MesXslOpenMillParam> {
+}

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

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.xslmes.mapper.MesXslOpenMillParamMapper">
+</mapper>

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/package-info.java

@@ -1,5 +1,5 @@
 /**
  * MES XSL 业务模块（Maven 工程名：jeecg-module-xslmes）。
- * 包含：客户管理（{@link org.jeecg.modules.xslmes.entity.MesXslCustomer}）、工序管理（{@link org.jeecg.modules.xslmes.entity.MesXslProcessOperation}）、设备类别（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentCategory}）、设备类型（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentType}）、设备部位（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentPart}）、设备小部位（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentSubPart}）、备品件类别（{@link org.jeecg.modules.xslmes.entity.MesXslSparePartsCategory}）、备品件信息（{@link org.jeecg.modules.xslmes.entity.MesXslSparePart}）、厂家信息（{@link org.jeecg.modules.xslmes.entity.MesXslManufacturer}）、停机主类型（{@link org.jeecg.modules.xslmes.entity.MesXslDowntimeMainType}）、停机类型（{@link org.jeecg.modules.xslmes.entity.MesXslDowntimeType}）等。
+ * 包含：客户管理（{@link org.jeecg.modules.xslmes.entity.MesXslCustomer}）、工序管理（{@link org.jeecg.modules.xslmes.entity.MesXslProcessOperation}）、设备类别（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentCategory}）、设备类型（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentType}）、设备台账（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentLedger}）、设备部位（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentPart}）、设备小部位（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentSubPart}）、点检及保养项目（{@link org.jeecg.modules.xslmes.entity.MesXslInspectMaintainItem}）、设备点检配置（{@link org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfig}）、备品件类别（{@link org.jeecg.modules.xslmes.entity.MesXslSparePartsCategory}）、备品件信息（{@link org.jeecg.modules.xslmes.entity.MesXslSparePart}）、厂家信息（{@link org.jeecg.modules.xslmes.entity.MesXslManufacturer}）、停机主类型（{@link org.jeecg.modules.xslmes.entity.MesXslDowntimeMainType}）、停机类型（{@link org.jeecg.modules.xslmes.entity.MesXslDowntimeType}）等。
  */
 package org.jeecg.modules.xslmes;

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

@@ -0,0 +1,12 @@
+package org.jeecg.modules.xslmes.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.xslmes.entity.MesXslDayTankMaterialMap;
+
+public interface IMesXslDayTankMaterialMapService extends IService<MesXslDayTankMaterialMap> {
+
+  /**
+   * 由选择类字段ID回填冗余展示信息（机台代码/机台名称/物料名称）
+   */
+  void fillReferenceFields(MesXslDayTankMaterialMap model);
+}

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

@@ -0,0 +1,23 @@
+package org.jeecg.modules.xslmes.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.List;
+import org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfig;
+import org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfigLine;
+
+public interface IMesXslEquipInspectConfigService extends IService<MesXslEquipInspectConfig> {
+
+    void saveMain(MesXslEquipInspectConfig main, List<MesXslEquipInspectConfigLine> lineList);
+
+    void updateMain(MesXslEquipInspectConfig main, List<MesXslEquipInspectConfigLine> lineList);
+
+    void delMain(String id);
+
+    void delBatchMain(Collection<? extends Serializable> idList);
+
+    List<MesXslEquipInspectConfigLine> selectLinesByConfigId(String configId);
+
+    boolean isConfigDuplicated(String equipmentLedgerId, String configType, String excludeId, MesXslEquipInspectConfig context);
+}

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

@@ -0,0 +1,34 @@
+package org.jeecg.modules.xslmes.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.List;
+import org.jeecg.modules.xslmes.entity.MesXslEquipInspectRecord;
+import org.jeecg.modules.xslmes.entity.MesXslEquipInspectRecordLine;
+import org.jeecg.modules.xslmes.vo.MesXslEquipInspectRecordBatchCreateResult;
+import org.jeecg.modules.xslmes.vo.MesXslEquipInspectRecordHandleDTO;
+
+public interface IMesXslEquipInspectRecordService extends IService<MesXslEquipInspectRecord> {
+
+    void saveMain(MesXslEquipInspectRecord main, List<MesXslEquipInspectRecordLine> lineList);
+
+    void updateMain(MesXslEquipInspectRecord main, List<MesXslEquipInspectRecordLine> lineList);
+
+    void delMain(String id);
+
+    void delBatchMain(Collection<? extends Serializable> idList);
+
+    List<MesXslEquipInspectRecordLine> selectLinesByRecordId(String recordId);
+
+    String generateRecordNo(MesXslEquipInspectRecord context);
+
+    List<MesXslEquipInspectRecordLine> buildLinesFromEquipConfig(String equipmentLedgerId, String recordType);
+
+    MesXslEquipInspectRecordBatchCreateResult batchCreateFromEquipment(
+            List<String> equipmentLedgerIds, String recordType, MesXslEquipInspectRecord inspectorContext);
+
+    //update-begin---author:jiangxh ---date:20260521  for：【MES】不合格点检记录登记处理人及处理时间-----------
+    void handleFailRecord(MesXslEquipInspectRecordHandleDTO dto);
+    //update-end---author:jiangxh ---date:20260521  for：【MES】不合格点检记录登记处理人及处理时间-----------
+}

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

@@ -0,0 +1,11 @@
+package org.jeecg.modules.xslmes.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.xslmes.entity.MesXslEquipmentLedger;
+
+public interface IMesXslEquipmentLedgerService extends IService<MesXslEquipmentLedger> {
+
+    boolean isEquipmentCodeDuplicated(String equipmentCode, String excludeId, MesXslEquipmentLedger context);
+
+    boolean isEquipmentNameDuplicated(String equipmentName, String excludeId, MesXslEquipmentLedger context);
+}

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

@@ -0,0 +1,28 @@
+package org.jeecg.modules.xslmes.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.List;
+import org.jeecg.modules.xslmes.entity.MesXslFormulaSpec;
+import org.jeecg.modules.xslmes.entity.MesXslFormulaSpecLine;
+
+public interface IMesXslFormulaSpecService extends IService<MesXslFormulaSpec> {
+
+    void saveMain(MesXslFormulaSpec main, List<MesXslFormulaSpecLine> lineList);
+
+    void updateMain(MesXslFormulaSpec main, List<MesXslFormulaSpecLine> lineList);
+
+    void delMain(String id);
+
+    void delBatchMain(Collection<? extends Serializable> idList);
+
+    List<MesXslFormulaSpecLine> selectLinesByMainId(String mainId);
+
+    MesXslFormulaSpec getByIdWithLines(String id);
+
+    /**
+     * 生成胶料代号：D + 胶料名称 + 分类键值(S/P/T/C) + 版本号(A01-Z01)
+     */
+    String generateRubberCode(String rubberMaterialId, String category, String excludeSpecId);
+}

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

@@ -0,0 +1,17 @@
+package org.jeecg.modules.xslmes.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.Set;
+import org.jeecg.modules.xslmes.entity.MesXslFormulaSpecSetting;
+import org.jeecg.modules.xslmes.vo.MesXslFormulaRubberContentSettingVO;
+
+public interface IMesXslFormulaSpecSettingService extends IService<MesXslFormulaSpecSetting> {
+
+    MesXslFormulaRubberContentSettingVO getRubberContentSetting();
+
+    void saveRubberContentSetting(MesXslFormulaRubberContentSettingVO setting);
+
+    Set<String> getNaturalMinorCategoryIds();
+
+    Set<String> getSyntheticMinorCategoryIds();
+}

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.xslmes.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.xslmes.entity.MesXslInspectMaintainItem;
+
+/**
+ * MES 点检及保养项目
+ */
+public interface IMesXslInspectMaintainItemService extends IService<MesXslInspectMaintainItem> {
+
+    boolean isItemNameDuplicated(String itemName, String excludeId, MesXslInspectMaintainItem context);
+
+    boolean isItemCodeDuplicated(String itemCode, String excludeId, MesXslInspectMaintainItem context);
+}

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

@@ -0,0 +1,13 @@
+package org.jeecg.modules.xslmes.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.xslmes.entity.MesXslMixerAction;
+
+public interface IMesXslMixerActionService extends IService<MesXslMixerAction> {
+
+  boolean isActionNameDuplicated(String actionName, String excludeId);
+
+  boolean isActionCodeDuplicated(String actionCode, String excludeId);
+
+  void fillEquipmentName(MesXslMixerAction model);
+}

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

@@ -0,0 +1,17 @@
+package org.jeecg.modules.xslmes.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.xslmes.entity.MesXslMixerMaterialSubstitute;
+
+/**
+ * MES 密炼物料替代对应关系
+ */
+public interface IMesXslMixerMaterialSubstituteService extends IService<MesXslMixerMaterialSubstitute> {
+
+    //update-begin---author:jiangxh ---date:20260520  for：【密炼物料替代对应关系】新增时分配编号-----------
+    /**
+     * 新增保存（自动分配租户内递增编号）
+     */
+    boolean saveWithSerialNo(MesXslMixerMaterialSubstitute entity);
+    //update-end---author:jiangxh ---date:20260520  for：【密炼物料替代对应关系】新增时分配编号-----------
+}

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.xslmes.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.xslmes.entity.MesXslMixerPsCompile;
+
+/**
+ * MES 密炼PS编制
+ */
+public interface IMesXslMixerPsCompileService extends IService<MesXslMixerPsCompile> {
+
+    //update-begin---author:jiangxh ---date:20260520  for：【密炼PS编制】批量流转状态-----------
+    /**
+     * 批量变更状态（校验当前状态后更新，并记录操作人/时间）
+     *
+     * @return 失败原因，null 表示成功
+     */
+    String changeStatusBatch(String ids, String expectedStatus, String targetStatus, String actionLabel, String operatorName);
+    //update-end---author:jiangxh ---date:20260520  for：【密炼PS编制】批量流转状态-----------
+}

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

@@ -0,0 +1,10 @@
+package org.jeecg.modules.xslmes.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.xslmes.entity.MesXslOpenMillParam;
+
+/**
+ * MES 开炼机参数维护
+ */
+public interface IMesXslOpenMillParamService extends IService<MesXslOpenMillParam> {
+}

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

@@ -0,0 +1,56 @@
+package org.jeecg.modules.xslmes.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
+import org.jeecg.modules.mes.material.entity.MesMaterial;
+import org.jeecg.modules.mes.material.mapper.MesMaterialMapper;
+import org.jeecg.modules.xslmes.entity.MesXslDayTankMaterialMap;
+import org.jeecg.modules.xslmes.entity.MesXslEquipmentLedger;
+import org.jeecg.modules.xslmes.mapper.MesXslDayTankMaterialMapMapper;
+import org.jeecg.modules.xslmes.mapper.MesXslEquipmentLedgerMapper;
+import org.jeecg.modules.xslmes.service.IMesXslDayTankMaterialMapService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class MesXslDayTankMaterialMapServiceImpl
+    extends ServiceImpl<MesXslDayTankMaterialMapMapper, MesXslDayTankMaterialMap>
+    implements IMesXslDayTankMaterialMapService {
+
+  @Autowired private MesXslEquipmentLedgerMapper equipmentLedgerMapper;
+  @Autowired private MesMaterialMapper mesMaterialMapper;
+
+  @Override
+  public void fillReferenceFields(MesXslDayTankMaterialMap model) {
+    if (model == null) {
+      return;
+    }
+    fillEquipmentFields(model);
+    fillMaterialFields(model);
+  }
+
+  private void fillEquipmentFields(MesXslDayTankMaterialMap model) {
+    if (StringUtils.isBlank(model.getEquipmentId())) {
+      model.setMachineCode(null);
+      model.setMachineName(null);
+      return;
+    }
+    MesXslEquipmentLedger equipment = equipmentLedgerMapper.selectById(model.getEquipmentId().trim());
+    if (equipment == null) {
+      model.setMachineCode(null);
+      model.setMachineName(null);
+      return;
+    }
+    model.setMachineCode(equipment.getEquipmentCode());
+    model.setMachineName(equipment.getEquipmentName());
+  }
+
+  private void fillMaterialFields(MesXslDayTankMaterialMap model) {
+    if (StringUtils.isBlank(model.getMaterialId())) {
+      model.setMaterialName(null);
+      return;
+    }
+    MesMaterial material = mesMaterialMapper.selectById(model.getMaterialId().trim());
+    model.setMaterialName(material == null ? null : material.getMaterialName());
+  }
+}

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

@@ -0,0 +1,132 @@
+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.io.Serializable;
+import java.util.Collection;
+import java.util.List;
+import org.jeecg.common.config.TenantContext;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.util.SpringContextUtils;
+import org.jeecg.common.util.TokenUtils;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfig;
+import org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfigLine;
+import org.jeecg.modules.xslmes.mapper.MesXslEquipInspectConfigLineMapper;
+import org.jeecg.modules.xslmes.mapper.MesXslEquipInspectConfigMapper;
+import org.jeecg.modules.xslmes.service.IMesXslEquipInspectConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+@Service
+public class MesXslEquipInspectConfigServiceImpl
+        extends ServiceImpl<MesXslEquipInspectConfigMapper, MesXslEquipInspectConfig>
+        implements IMesXslEquipInspectConfigService {
+
+    @Autowired
+    private MesXslEquipInspectConfigLineMapper mesXslEquipInspectConfigLineMapper;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveMain(MesXslEquipInspectConfig main, List<MesXslEquipInspectConfigLine> lineList) {
+        this.save(main);
+        insertLines(main.getId(), lineList);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateMain(MesXslEquipInspectConfig main, List<MesXslEquipInspectConfigLine> lineList) {
+        this.updateById(main);
+        mesXslEquipInspectConfigLineMapper.delete(
+                new LambdaQueryWrapper<MesXslEquipInspectConfigLine>()
+                        .eq(MesXslEquipInspectConfigLine::getConfigId, main.getId()));
+        insertLines(main.getId(), lineList);
+    }
+
+    private void insertLines(String configId, List<MesXslEquipInspectConfigLine> lineList) {
+        if (CollectionUtils.isEmpty(lineList)) {
+            return;
+        }
+        int sort = 0;
+        for (MesXslEquipInspectConfigLine line : lineList) {
+            line.setId(null);
+            line.setConfigId(configId);
+            line.setSortNo(sort++);
+            mesXslEquipInspectConfigLineMapper.insert(line);
+        }
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delMain(String id) {
+        mesXslEquipInspectConfigLineMapper.delete(
+                new LambdaQueryWrapper<MesXslEquipInspectConfigLine>().eq(MesXslEquipInspectConfigLine::getConfigId, id));
+        this.removeById(id);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delBatchMain(Collection<? extends Serializable> idList) {
+        for (Serializable id : idList) {
+            delMain(id.toString());
+        }
+    }
+
+    @Override
+    public List<MesXslEquipInspectConfigLine> selectLinesByConfigId(String configId) {
+        return mesXslEquipInspectConfigLineMapper.selectList(
+                new LambdaQueryWrapper<MesXslEquipInspectConfigLine>()
+                        .eq(MesXslEquipInspectConfigLine::getConfigId, configId)
+                        .orderByAsc(MesXslEquipInspectConfigLine::getSortNo));
+    }
+
+    //update-begin---author:jiangxh ---date:20260519  for：【MES】设备点检配置：同设备同类型（点检/保养）仅允许一条主数据-----------
+    @Override
+    public boolean isConfigDuplicated(
+            String equipmentLedgerId, String configType, String excludeId, MesXslEquipInspectConfig context) {
+        if (oConvertUtils.isEmpty(equipmentLedgerId) || oConvertUtils.isEmpty(configType)) {
+            return false;
+        }
+        Integer tenantId = resolveTenantId(context);
+        LambdaQueryWrapper<MesXslEquipInspectConfig> w = new LambdaQueryWrapper<>();
+        w.eq(MesXslEquipInspectConfig::getEquipmentLedgerId, equipmentLedgerId.trim());
+        w.eq(MesXslEquipInspectConfig::getConfigType, configType.trim());
+        w.and(
+                q ->
+                        q.eq(MesXslEquipInspectConfig::getDelFlag, CommonConstant.DEL_FLAG_0)
+                                .or()
+                                .isNull(MesXslEquipInspectConfig::getDelFlag));
+        if (oConvertUtils.isNotEmpty(excludeId)) {
+            w.ne(MesXslEquipInspectConfig::getId, excludeId);
+        }
+        if (tenantId != null) {
+            w.eq(MesXslEquipInspectConfig::getTenantId, tenantId);
+        }
+        return this.count(w) > 0;
+    }
+
+    private static Integer resolveTenantId(MesXslEquipInspectConfig context) {
+        if (context != null && context.getTenantId() != null) {
+            return context.getTenantId();
+        }
+        String ts = TenantContext.getTenant();
+        if (oConvertUtils.isEmpty(ts)) {
+            try {
+                ts = TokenUtils.getTenantIdByRequest(SpringContextUtils.getHttpServletRequest());
+            } catch (Exception ignored) {
+                // ignore
+            }
+        }
+        if (oConvertUtils.isEmpty(ts)) {
+            return null;
+        }
+        try {
+            return Integer.parseInt(ts);
+        } catch (NumberFormatException e) {
+            return null;
+        }
+    }
+    //update-end---author:jiangxh ---date:20260519  for：【MES】设备点检配置：同设备同类型（点检/保养）仅允许一条主数据-----------
+}

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

@@ -0,0 +1,312 @@
+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.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import org.jeecg.common.config.TenantContext;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.util.SpringContextUtils;
+import org.jeecg.common.util.TokenUtils;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfig;
+import org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfigLine;
+import org.jeecg.modules.xslmes.entity.MesXslEquipInspectRecord;
+import org.jeecg.modules.xslmes.entity.MesXslEquipInspectRecordLine;
+import org.jeecg.modules.xslmes.mapper.MesXslEquipInspectRecordLineMapper;
+import org.jeecg.modules.xslmes.mapper.MesXslEquipInspectRecordMapper;
+import org.jeecg.modules.xslmes.service.IMesXslEquipInspectConfigService;
+import org.jeecg.modules.xslmes.service.IMesXslEquipInspectRecordService;
+import org.jeecg.modules.xslmes.service.IMesXslEquipmentLedgerService;
+import org.jeecg.modules.xslmes.entity.MesXslEquipmentLedger;
+import org.jeecg.modules.xslmes.util.MesXslEquipInspectBizMsg;
+import org.jeecg.modules.xslmes.vo.MesXslEquipInspectRecordBatchCreateResult;
+import org.jeecg.modules.xslmes.vo.MesXslEquipInspectRecordHandleDTO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+@Service
+public class MesXslEquipInspectRecordServiceImpl
+        extends ServiceImpl<MesXslEquipInspectRecordMapper, MesXslEquipInspectRecord>
+        implements IMesXslEquipInspectRecordService {
+
+    @Autowired
+    private MesXslEquipInspectRecordLineMapper mesXslEquipInspectRecordLineMapper;
+
+    @Autowired
+    private IMesXslEquipInspectConfigService mesXslEquipInspectConfigService;
+
+    @Autowired
+    private IMesXslEquipmentLedgerService mesXslEquipmentLedgerService;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveMain(MesXslEquipInspectRecord main, List<MesXslEquipInspectRecordLine> lineList) {
+        this.save(main);
+        insertLines(main.getId(), lineList);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateMain(MesXslEquipInspectRecord main, List<MesXslEquipInspectRecordLine> lineList) {
+        this.updateById(main);
+        mesXslEquipInspectRecordLineMapper.delete(
+                new LambdaQueryWrapper<MesXslEquipInspectRecordLine>()
+                        .eq(MesXslEquipInspectRecordLine::getRecordId, main.getId()));
+        insertLines(main.getId(), lineList);
+    }
+
+    private void insertLines(String recordId, List<MesXslEquipInspectRecordLine> lineList) {
+        if (CollectionUtils.isEmpty(lineList)) {
+            return;
+        }
+        int sort = 0;
+        for (MesXslEquipInspectRecordLine line : lineList) {
+            line.setId(null);
+            line.setRecordId(recordId);
+            line.setSortNo(sort++);
+            mesXslEquipInspectRecordLineMapper.insert(line);
+        }
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delMain(String id) {
+        mesXslEquipInspectRecordLineMapper.delete(
+                new LambdaQueryWrapper<MesXslEquipInspectRecordLine>().eq(MesXslEquipInspectRecordLine::getRecordId, id));
+        this.removeById(id);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delBatchMain(Collection<? extends Serializable> idList) {
+        for (Serializable id : idList) {
+            delMain(id.toString());
+        }
+    }
+
+    @Override
+    public List<MesXslEquipInspectRecordLine> selectLinesByRecordId(String recordId) {
+        return mesXslEquipInspectRecordLineMapper.selectList(
+                new LambdaQueryWrapper<MesXslEquipInspectRecordLine>()
+                        .eq(MesXslEquipInspectRecordLine::getRecordId, recordId)
+                        .orderByAsc(MesXslEquipInspectRecordLine::getSortNo));
+    }
+
+    //update-begin---author:jiangxh ---date:20260520  for：【MES】点检保养记录编号 EC+日期+4位流水-----------
+    @Override
+    public String generateRecordNo(MesXslEquipInspectRecord context) {
+        String dateStr = new SimpleDateFormat("yyyyMMdd").format(new Date());
+        String prefix = "EC" + dateStr;
+        Integer tenantId = resolveTenantId(context);
+
+        LambdaQueryWrapper<MesXslEquipInspectRecord> qw = new LambdaQueryWrapper<>();
+        qw.likeRight(MesXslEquipInspectRecord::getRecordNo, prefix);
+        qw.and(
+                q ->
+                        q.eq(MesXslEquipInspectRecord::getDelFlag, CommonConstant.DEL_FLAG_0)
+                                .or()
+                                .isNull(MesXslEquipInspectRecord::getDelFlag));
+        if (tenantId != null) {
+            qw.eq(MesXslEquipInspectRecord::getTenantId, tenantId);
+        }
+        qw.select(MesXslEquipInspectRecord::getRecordNo);
+        qw.orderByDesc(MesXslEquipInspectRecord::getRecordNo);
+        qw.last("LIMIT 1");
+
+        MesXslEquipInspectRecord last = this.getOne(qw, false);
+        int nextSeq = 1;
+        if (last != null && oConvertUtils.isNotEmpty(last.getRecordNo()) && last.getRecordNo().length() >= prefix.length() + 4) {
+            String suffix = last.getRecordNo().substring(prefix.length());
+            try {
+                nextSeq = Integer.parseInt(suffix) + 1;
+            } catch (NumberFormatException ignored) {
+                nextSeq = (int) this.count(qw) + 1;
+            }
+        }
+        return prefix + String.format("%04d", nextSeq);
+    }
+    //update-end---author:jiangxh ---date:20260520  for：【MES】点检保养记录编号 EC+日期+4位流水-----------
+
+    //update-begin---author:jiangxh ---date:20260520  for：【MES】点检保养记录从设备点检配置带出明细-----------
+    @Override
+    public List<MesXslEquipInspectRecordLine> buildLinesFromEquipConfig(String equipmentLedgerId, String recordType) {
+        if (oConvertUtils.isEmpty(equipmentLedgerId) || oConvertUtils.isEmpty(recordType)) {
+            return List.of();
+        }
+        String type = recordType.trim();
+        MesXslEquipInspectConfig config = findEquipInspectConfig(equipmentLedgerId.trim(), type);
+        if (config == null) {
+            return List.of();
+        }
+        List<MesXslEquipInspectConfigLine> configLines =
+                mesXslEquipInspectConfigService.selectLinesByConfigId(config.getId());
+        if (CollectionUtils.isEmpty(configLines)) {
+            return List.of();
+        }
+        return buildRecordLinesFromConfigLines(configLines);
+    }
+
+    private MesXslEquipInspectConfig findEquipInspectConfig(String equipmentLedgerId, String configType) {
+        LambdaQueryWrapper<MesXslEquipInspectConfig> cw = new LambdaQueryWrapper<>();
+        cw.eq(MesXslEquipInspectConfig::getEquipmentLedgerId, equipmentLedgerId);
+        cw.eq(MesXslEquipInspectConfig::getConfigType, configType);
+        cw.and(
+                q ->
+                        q.eq(MesXslEquipInspectConfig::getDelFlag, CommonConstant.DEL_FLAG_0)
+                                .or()
+                                .isNull(MesXslEquipInspectConfig::getDelFlag));
+        return mesXslEquipInspectConfigService.getOne(cw, false);
+    }
+
+    private List<MesXslEquipInspectRecordLine> buildRecordLinesFromConfigLines(
+            List<MesXslEquipInspectConfigLine> configLines) {
+        List<MesXslEquipInspectRecordLine> result = new ArrayList<>(configLines.size());
+        for (MesXslEquipInspectConfigLine cl : configLines) {
+            MesXslEquipInspectRecordLine line = new MesXslEquipInspectRecordLine();
+            line.setEquipInspectConfigLineId(cl.getId());
+            line.setInspectMaintainItemId(cl.getInspectMaintainItemId());
+            line.setItemCode(cl.getItemCode());
+            line.setItemName(cl.getItemName());
+            line.setItemCategory(cl.getItemCategory());
+            line.setItemType(cl.getItemType());
+            line.setEquipmentPartName(cl.getEquipmentPartName());
+            line.setEquipmentSubPartName(cl.getEquipmentSubPartName());
+            line.setInspectMethod(cl.getInspectMethod());
+            line.setJudgmentCriteria(cl.getJudgmentCriteria());
+            result.add(line);
+        }
+        return result;
+    }
+    //update-end---author:jiangxh ---date:20260520  for：【MES】点检保养记录从设备点检配置带出明细-----------
+
+    //update-begin---author:jiangxh ---date:20260520  for：【MES】设备台账多选批量生成点检保养记录（待点检）-----------
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public MesXslEquipInspectRecordBatchCreateResult batchCreateFromEquipment(
+            List<String> equipmentLedgerIds, String recordType, MesXslEquipInspectRecord inspectorContext) {
+        MesXslEquipInspectRecordBatchCreateResult result = new MesXslEquipInspectRecordBatchCreateResult();
+        if (CollectionUtils.isEmpty(equipmentLedgerIds) || oConvertUtils.isEmpty(recordType)) {
+            result.getFailMessages().add("请选择设备并指定点检或保养类型");
+            return result;
+        }
+        String type = recordType.trim();
+        for (String equipmentLedgerId : equipmentLedgerIds) {
+            if (oConvertUtils.isEmpty(equipmentLedgerId)) {
+                continue;
+            }
+            String equipId = equipmentLedgerId.trim();
+            MesXslEquipmentLedger ledger = mesXslEquipmentLedgerService.getById(equipId);
+            String equipName =
+                    ledger != null
+                            ? (oConvertUtils.isNotEmpty(ledger.getEquipmentName())
+                                    ? ledger.getEquipmentName()
+                                    : ledger.getEquipmentCode())
+                            : equipId;
+            if (ledger == null
+                    || (ledger.getDelFlag() != null && ledger.getDelFlag().equals(CommonConstant.DEL_FLAG_1))) {
+                result.getFailMessages().add("设备【" + equipName + "】不存在或已删除");
+                continue;
+            }
+            //update-begin---author:jiangxh ---date:20260520  for：【MES】未维护对应类型设备点检配置则不生成记录并提示设备名称-----------
+            MesXslEquipInspectConfig config = findEquipInspectConfig(equipId, type);
+            if (config == null) {
+                result.getFailMessages().add(MesXslEquipInspectBizMsg.noConfigMessage(equipName, type));
+                continue;
+            }
+            List<MesXslEquipInspectConfigLine> configLines =
+                    mesXslEquipInspectConfigService.selectLinesByConfigId(config.getId());
+            if (CollectionUtils.isEmpty(configLines)) {
+                result.getFailMessages().add(MesXslEquipInspectBizMsg.noConfigLineMessage(equipName, type));
+                continue;
+            }
+            List<MesXslEquipInspectRecordLine> lines = buildRecordLinesFromConfigLines(configLines);
+            //update-end---author:jiangxh ---date:20260520  for：【MES】未维护对应类型设备点检配置则不生成记录并提示设备名称-----------
+
+            MesXslEquipInspectRecord main = new MesXslEquipInspectRecord();
+            main.setEquipmentLedgerId(equipId);
+            main.setEquipmentCode(ledger.getEquipmentCode());
+            main.setEquipmentName(ledger.getEquipmentName());
+            main.setEquipInspectConfigId(config.getId());
+            main.setRecordType(type);
+            main.setRecordNo(generateRecordNo(main));
+            main.setRecordStatus("pending");
+            main.setInspectResult("");
+            main.setInspectDate(new Date());
+            if (inspectorContext != null) {
+                main.setInspectorUserId(inspectorContext.getInspectorUserId());
+                main.setInspectorUsername(inspectorContext.getInspectorUsername());
+                main.setInspectorRealname(inspectorContext.getInspectorRealname());
+            }
+            saveMain(main, lines);
+            result.setSuccessCount(result.getSuccessCount() + 1);
+        }
+        return result;
+    }
+    //update-end---author:jiangxh ---date:20260520  for：【MES】设备台账多选批量生成点检保养记录（待点检）-----------
+
+    //update-begin---author:jiangxh ---date:20260521  for：【MES】不合格点检记录登记处理人及处理时间-----------
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void handleFailRecord(MesXslEquipInspectRecordHandleDTO dto) {
+        if (dto == null || oConvertUtils.isEmpty(dto.getId())) {
+            throw new IllegalArgumentException("记录主键不能为空");
+        }
+        MesXslEquipInspectRecord existing = this.getById(dto.getId().trim());
+        if (existing == null) {
+            throw new IllegalArgumentException("未找到对应数据");
+        }
+        if (!"fail".equals(existing.getInspectResult())) {
+            throw new IllegalArgumentException("仅不合格记录可处理");
+        }
+        if (!"done".equals(existing.getRecordStatus())) {
+            throw new IllegalArgumentException("请先完成点检录入");
+        }
+        if ("1".equals(existing.getHandledFlag())) {
+            throw new IllegalArgumentException("该记录已处理");
+        }
+        if (oConvertUtils.isEmpty(dto.getHandlerUserId())
+                && oConvertUtils.isEmpty(dto.getHandlerUsername())
+                && oConvertUtils.isEmpty(dto.getHandlerRealname())) {
+            throw new IllegalArgumentException("请选择处理人");
+        }
+        Date handleTime = dto.getHandleTime() != null ? dto.getHandleTime() : new Date();
+        MesXslEquipInspectRecord patch = new MesXslEquipInspectRecord();
+        patch.setId(existing.getId());
+        patch.setHandledFlag("1");
+        patch.setHandlerUserId(dto.getHandlerUserId());
+        patch.setHandlerUsername(dto.getHandlerUsername());
+        patch.setHandlerRealname(dto.getHandlerRealname());
+        patch.setHandleTime(handleTime);
+        this.updateById(patch);
+    }
+    //update-end---author:jiangxh ---date:20260521  for：【MES】不合格点检记录登记处理人及处理时间-----------
+
+    private static Integer resolveTenantId(MesXslEquipInspectRecord context) {
+        if (context != null && context.getTenantId() != null) {
+            return context.getTenantId();
+        }
+        String ts = TenantContext.getTenant();
+        if (oConvertUtils.isEmpty(ts)) {
+            try {
+                ts = TokenUtils.getTenantIdByRequest(SpringContextUtils.getHttpServletRequest());
+            } catch (Exception ignored) {
+                // ignore
+            }
+        }
+        if (oConvertUtils.isEmpty(ts)) {
+            return null;
+        }
+        try {
+            return Integer.parseInt(ts);
+        } catch (NumberFormatException e) {
+            return null;
+        }
+    }
+}

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

@@ -0,0 +1,72 @@
+package org.jeecg.modules.xslmes.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.common.config.TenantContext;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.util.SpringContextUtils;
+import org.jeecg.common.util.TokenUtils;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.xslmes.entity.MesXslEquipmentLedger;
+import org.jeecg.modules.xslmes.mapper.MesXslEquipmentLedgerMapper;
+import org.jeecg.modules.xslmes.service.IMesXslEquipmentLedgerService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class MesXslEquipmentLedgerServiceImpl extends ServiceImpl<MesXslEquipmentLedgerMapper, MesXslEquipmentLedger>
+        implements IMesXslEquipmentLedgerService {
+
+    //update-begin---author:jiangxh ---date:20260518  for：【MES】设备台账编号、名称同租户不可重复-----------
+    @Override
+    public boolean isEquipmentCodeDuplicated(String equipmentCode, String excludeId, MesXslEquipmentLedger context) {
+        return isFieldDuplicated(MesXslEquipmentLedger::getEquipmentCode, equipmentCode, excludeId, context);
+    }
+
+    @Override
+    public boolean isEquipmentNameDuplicated(String equipmentName, String excludeId, MesXslEquipmentLedger context) {
+        return isFieldDuplicated(MesXslEquipmentLedger::getEquipmentName, equipmentName, excludeId, context);
+    }
+
+    private boolean isFieldDuplicated(
+            com.baomidou.mybatisplus.core.toolkit.support.SFunction<MesXslEquipmentLedger, String> column,
+            String value,
+            String excludeId,
+            MesXslEquipmentLedger context) {
+        if (oConvertUtils.isEmpty(value)) {
+            return false;
+        }
+        Integer tenantId = resolveTenantId(context);
+        LambdaQueryWrapper<MesXslEquipmentLedger> w = new LambdaQueryWrapper<>();
+        w.eq(column, value.trim());
+        w.and(q -> q.eq(MesXslEquipmentLedger::getDelFlag, CommonConstant.DEL_FLAG_0).or().isNull(MesXslEquipmentLedger::getDelFlag));
+        if (oConvertUtils.isNotEmpty(excludeId)) {
+            w.ne(MesXslEquipmentLedger::getId, excludeId);
+        }
+        if (tenantId != null) {
+            w.eq(MesXslEquipmentLedger::getTenantId, tenantId);
+        }
+        return this.count(w) > 0;
+    }
+
+    private static Integer resolveTenantId(MesXslEquipmentLedger context) {
+        if (context != null && context.getTenantId() != null) {
+            return context.getTenantId();
+        }
+        String ts = TenantContext.getTenant();
+        if (oConvertUtils.isEmpty(ts)) {
+            try {
+                ts = TokenUtils.getTenantIdByRequest(SpringContextUtils.getHttpServletRequest());
+            } catch (Exception ignored) {
+            }
+        }
+        if (oConvertUtils.isEmpty(ts)) {
+            return null;
+        }
+        try {
+            return Integer.parseInt(ts.trim());
+        } catch (NumberFormatException e) {
+            return null;
+        }
+    }
+    //update-end---author:jiangxh ---date:20260518  for：【MES】设备台账编号、名称同租户不可重复-----------
+}

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

@@ -0,0 +1,403 @@
+package org.jeecg.modules.xslmes.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jakarta.annotation.Resource;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.apache.commons.lang3.StringUtils;
+import org.jeecg.modules.mes.material.entity.MesMaterial;
+import org.jeecg.modules.mes.material.entity.MesMixerMaterial;
+import org.jeecg.modules.mes.material.service.IMesMaterialService;
+import org.jeecg.modules.mes.material.service.IMesMixerMaterialService;
+import org.jeecg.modules.xslmes.entity.MesXslFormulaSpec;
+import org.jeecg.modules.xslmes.entity.MesXslFormulaSpecLine;
+import org.jeecg.modules.xslmes.mapper.MesXslFormulaSpecLineMapper;
+import org.jeecg.modules.xslmes.mapper.MesXslFormulaSpecMapper;
+import org.jeecg.modules.xslmes.service.IMesXslFormulaSpecService;
+import org.jeecg.modules.xslmes.service.IMesXslFormulaSpecSettingService;
+import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.service.ISysUserService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+@Service
+public class MesXslFormulaSpecServiceImpl extends ServiceImpl<MesXslFormulaSpecMapper, MesXslFormulaSpec>
+        implements IMesXslFormulaSpecService {
+
+    private static final Set<String> RUBBER_CATEGORY_KEYS = Set.of("S", "P", "T", "C");
+    private static final Pattern RUBBER_CODE_VERSION_PATTERN = Pattern.compile("([A-Z])01$");
+
+    @Resource
+    private MesXslFormulaSpecLineMapper lineMapper;
+
+    @Resource
+    private IMesMixerMaterialService mesMixerMaterialService;
+
+    @Resource
+    private IMesMaterialService mesMaterialService;
+
+    @Resource
+    private IMesXslFormulaSpecSettingService mesXslFormulaSpecSettingService;
+
+    @Resource
+    private ISysUserService sysUserService;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveMain(MesXslFormulaSpec main, List<MesXslFormulaSpecLine> lineList) {
+        fillMainDefaults(main);
+        //update-begin---author:cursor ---date:20260521  for：配合示方新增时服务端生成胶料代号-----------
+        fillRubberCodeOnCreate(main);
+        //update-end---author:cursor ---date:20260521  for：配合示方新增时服务端生成胶料代号-----------
+        this.save(main);
+        insertLines(main, lineList);
+        refreshMainSummary(main.getId());
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateMain(MesXslFormulaSpec main, List<MesXslFormulaSpecLine> lineList) {
+        fillMainDefaults(main);
+        this.updateById(main);
+        lineMapper.delete(new LambdaQueryWrapper<MesXslFormulaSpecLine>().eq(MesXslFormulaSpecLine::getFormulaSpecId, main.getId()));
+        insertLines(main, lineList);
+        refreshMainSummary(main.getId());
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delMain(String id) {
+        lineMapper.delete(new LambdaQueryWrapper<MesXslFormulaSpecLine>().eq(MesXslFormulaSpecLine::getFormulaSpecId, id));
+        this.removeById(id);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delBatchMain(Collection<? extends Serializable> idList) {
+        if (idList == null || idList.isEmpty()) {
+            return;
+        }
+        for (Serializable id : idList) {
+            if (id != null) {
+                delMain(id.toString());
+            }
+        }
+    }
+
+    @Override
+    public List<MesXslFormulaSpecLine> selectLinesByMainId(String mainId) {
+        return lineMapper.selectList(
+                new LambdaQueryWrapper<MesXslFormulaSpecLine>()
+                        .eq(MesXslFormulaSpecLine::getFormulaSpecId, mainId)
+                        .orderByAsc(MesXslFormulaSpecLine::getSortNo)
+                        .orderByAsc(MesXslFormulaSpecLine::getId));
+    }
+
+    @Override
+    public MesXslFormulaSpec getByIdWithLines(String id) {
+        MesXslFormulaSpec main = this.getById(id);
+        if (main == null) {
+            return null;
+        }
+        main.setLineList(selectLinesByMainId(id));
+        //update-begin---author:cursor ---date:20260521  for：【配合示方】queryById补充创建人姓名供审批进度展示-----------
+        fillCreateByDictText(main);
+        //update-end---author:cursor ---date:20260521  for：【配合示方】queryById补充创建人姓名供审批进度展示-----------
+        return main;
+    }
+
+    private void fillCreateByDictText(MesXslFormulaSpec main) {
+        if (main == null || StringUtils.isBlank(main.getCreateBy())) {
+            return;
+        }
+        SysUser user = sysUserService.getUserByName(main.getCreateBy());
+        if (user != null && StringUtils.isNotBlank(user.getRealname())) {
+            main.setCreateBy_dictText(user.getRealname());
+        }
+    }
+
+    //update-begin---author:cursor ---date:20260521  for：配合示方胶料代号自动生成 D+胶料名称+分类+版本号-----------
+    @Override
+    public String generateRubberCode(String rubberMaterialId, String category, String excludeSpecId) {
+        if (StringUtils.isBlank(rubberMaterialId)) {
+            throw new IllegalArgumentException("请选择胶料信息");
+        }
+        if (StringUtils.isBlank(category) || !RUBBER_CATEGORY_KEYS.contains(category)) {
+            throw new IllegalArgumentException("请选择有效的示方分类");
+        }
+        MesMaterial material = mesMaterialService.getById(rubberMaterialId);
+        if (material == null || StringUtils.isBlank(material.getMaterialName())) {
+            throw new IllegalArgumentException("所选胶料不存在或未维护胶料名称");
+        }
+        String basePrefix = buildRubberCodePrefix(material.getMaterialName(), category);
+        Set<Character> usedLetters = loadUsedRubberCodeLetters(rubberMaterialId, category, basePrefix, excludeSpecId);
+        for (char letter = 'A'; letter <= 'Z'; letter++) {
+            if (!usedLetters.contains(letter)) {
+                return basePrefix + letter + "01";
+            }
+        }
+        throw new IllegalArgumentException("该胶料在当前分类下的代号版本已用尽(A01-Z01)");
+    }
+
+    private void fillRubberCodeOnCreate(MesXslFormulaSpec main) {
+        if (StringUtils.isBlank(main.getRubberMaterialId()) || StringUtils.isBlank(main.getCategory())) {
+            return;
+        }
+        main.setRubberCode(generateRubberCode(main.getRubberMaterialId(), main.getCategory(), null));
+        main.setSpecCode(main.getRubberCode());
+    }
+
+    private String buildRubberCodePrefix(String materialName, String category) {
+        return "D" + materialName.trim() + category;
+    }
+
+    private Set<Character> loadUsedRubberCodeLetters(
+            String rubberMaterialId, String category, String basePrefix, String excludeSpecId) {
+        LambdaQueryWrapper<MesXslFormulaSpec> queryWrapper = new LambdaQueryWrapper<MesXslFormulaSpec>()
+                .eq(MesXslFormulaSpec::getRubberMaterialId, rubberMaterialId)
+                .eq(MesXslFormulaSpec::getCategory, category)
+                .likeRight(MesXslFormulaSpec::getRubberCode, basePrefix);
+        if (StringUtils.isNotBlank(excludeSpecId)) {
+            queryWrapper.ne(MesXslFormulaSpec::getId, excludeSpecId);
+        }
+        List<MesXslFormulaSpec> existingList = this.list(queryWrapper);
+        Set<Character> usedLetters = new HashSet<>();
+        for (MesXslFormulaSpec item : existingList) {
+            if (item == null || StringUtils.isBlank(item.getRubberCode())) {
+                continue;
+            }
+            if (!item.getRubberCode().startsWith(basePrefix) || item.getRubberCode().length() <= basePrefix.length()) {
+                continue;
+            }
+            String suffix = item.getRubberCode().substring(basePrefix.length());
+            Matcher matcher = RUBBER_CODE_VERSION_PATTERN.matcher(suffix);
+            if (matcher.matches()) {
+                usedLetters.add(matcher.group(1).charAt(0));
+            }
+        }
+        return usedLetters;
+    }
+    //update-end---author:cursor ---date:20260521  for：配合示方胶料代号自动生成 D+胶料名称+分类+版本号-----------
+
+    private void fillMainDefaults(MesXslFormulaSpec main) {
+        if (StringUtils.isBlank(main.getCategory())) {
+            //update-begin---author:cursor ---date:20260521  for：配合示方分类字典默认值改为 S-----------
+            main.setCategory("S");
+            //update-end---author:cursor ---date:20260521  for：配合示方分类字典默认值改为 S-----------
+        }
+        if (StringUtils.isBlank(main.getStatus())) {
+            main.setStatus("compile");
+        }
+        if (main.getHasManualBatch() == null) {
+            main.setHasManualBatch(0);
+        }
+    }
+
+    private void insertLines(MesXslFormulaSpec main, List<MesXslFormulaSpecLine> lineList) {
+        if (CollectionUtils.isEmpty(lineList)) {
+            return;
+        }
+        Date now = new Date();
+        int sort = 0;
+        //update-begin---author:cursor ---date:20260521  for：配合示方明细重量%按PHR/总PHR自动计算-----------
+        BigDecimal totalPhr = BigDecimal.ZERO;
+        for (MesXslFormulaSpecLine line : lineList) {
+            if (line == null || StringUtils.isBlank(line.getMixerMaterialId()) || line.getPhr() == null) {
+                continue;
+            }
+            totalPhr = totalPhr.add(line.getPhr());
+        }
+        if (main.getTotalPhr() == null) {
+            main.setTotalPhr(totalPhr);
+        }
+        BigDecimal weightBase = main.getTotalPhr() != null && main.getTotalPhr().compareTo(BigDecimal.ZERO) > 0
+                ? main.getTotalPhr()
+                : totalPhr;
+        //update-end---author:cursor ---date:20260521  for：配合示方明细重量%按PHR/总PHR自动计算-----------
+        boolean hasManual = false;
+        for (MesXslFormulaSpecLine line : lineList) {
+            if (line == null || StringUtils.isBlank(line.getMixerMaterialId())) {
+                continue;
+            }
+            line.setId(null);
+            line.setFormulaSpecId(main.getId());
+            line.setSortNo(sort++);
+            fillMaterialInfo(line);
+            fillVolumeIfBlank(line);
+            //update-begin---author:cursor ---date:20260521  for：配合示方明细重量%按PHR/总PHR自动计算-----------
+            fillWeightPercent(line, weightBase);
+            //update-end---author:cursor ---date:20260521  for：配合示方明细重量%按PHR/总PHR自动计算-----------
+            if (line.getCreateTime() == null) {
+                line.setCreateTime(now);
+            }
+            if (line.getUpdateTime() == null) {
+                line.setUpdateTime(now);
+            }
+            if ("manual".equals(line.getWeighMode())) {
+                hasManual = true;
+            }
+            lineMapper.insert(line);
+        }
+        if (main.getTotalPhr() == null) {
+            main.setTotalPhr(totalPhr);
+        }
+        if (main.getHasManualBatch() == null || main.getHasManualBatch() == 0) {
+            main.setHasManualBatch(hasManual ? 1 : 0);
+        }
+    }
+
+    private void fillMaterialInfo(MesXslFormulaSpecLine line) {
+        MesMixerMaterial material = mesMixerMaterialService.getById(line.getMixerMaterialId());
+        if (material == null) {
+            return;
+        }
+        line.setMixerMaterialCode(material.getMaterialCode());
+        line.setMixerMaterialName(material.getMaterialName());
+        if (StringUtils.isBlank(line.getMaterialDesc())) {
+            line.setMaterialDesc(StringUtils.defaultIfBlank(material.getMaterialDesc(), material.getMaterialName()));
+        }
+    }
+
+    private void fillVolumeIfBlank(MesXslFormulaSpecLine line) {
+        if (line.getVolume() != null || line.getPhr() == null || StringUtils.isBlank(line.getMixerMaterialId())) {
+            return;
+        }
+        MesMixerMaterial material = mesMixerMaterialService.getById(line.getMixerMaterialId());
+        if (material == null || material.getSpecificGravity() == null || material.getSpecificGravity().compareTo(BigDecimal.ZERO) <= 0) {
+            return;
+        }
+        line.setVolume(line.getPhr().divide(material.getSpecificGravity(), 6, RoundingMode.HALF_UP));
+    }
+
+    private void fillWeightPercent(MesXslFormulaSpecLine line, BigDecimal totalPhr) {
+        //update-begin---author:cursor ---date:20260521  for：配合示方明细重量%按PHR/总PHR自动计算（可手工覆盖）-----------
+        if (line.getWeightPercent() != null || line.getPhr() == null || totalPhr == null || totalPhr.compareTo(BigDecimal.ZERO) <= 0) {
+            return;
+        }
+        line.setWeightPercent(line.getPhr().multiply(BigDecimal.valueOf(100)).divide(totalPhr, 4, RoundingMode.HALF_UP));
+        //update-end---author:cursor ---date:20260521  for：配合示方明细重量%按PHR/总PHR自动计算（可手工覆盖）-----------
+    }
+
+    //update-begin---author:cursor ---date:20260521  for：【配合示方】保存后汇总A/Q胶比重写入数据库-----------
+    /** 根据明细重新汇总主表 TOTAL PHR、A胶TOTAL PHR、比重与人工配料标记 */
+    private void refreshMainSummary(String mainId) {
+        List<MesXslFormulaSpecLine> lines = selectLinesByMainId(mainId);
+        if (CollectionUtils.isEmpty(lines)) {
+            return;
+        }
+        BigDecimal totalPhr = BigDecimal.ZERO;
+        BigDecimal aRubberPhr = BigDecimal.ZERO;
+        BigDecimal aRubberVolume = BigDecimal.ZERO;
+        BigDecimal qRubberPhr = BigDecimal.ZERO;
+        BigDecimal qRubberVolume = BigDecimal.ZERO;
+        BigDecimal naturalRubber = BigDecimal.ZERO;
+        BigDecimal syntheticRubber = BigDecimal.ZERO;
+        boolean hasManual = false;
+        Map<String, MesMixerMaterial> materialCache = new HashMap<>();
+        Set<String> naturalCategoryIds = mesXslFormulaSpecSettingService.getNaturalMinorCategoryIds();
+        Set<String> syntheticCategoryIds = mesXslFormulaSpecSettingService.getSyntheticMinorCategoryIds();
+        for (MesXslFormulaSpecLine line : lines) {
+            if (line == null) {
+                continue;
+            }
+            if (line.getPhr() != null) {
+                totalPhr = totalPhr.add(line.getPhr());
+                if ("A".equals(line.getStep())) {
+                    aRubberPhr = aRubberPhr.add(line.getPhr());
+                } else if ("Q".equals(line.getStep())) {
+                    qRubberPhr = qRubberPhr.add(line.getPhr());
+                }
+            }
+            if ("manual".equals(line.getWeighMode())) {
+                hasManual = true;
+            }
+            BigDecimal volume = resolveLineVolume(line);
+            if (volume == null) {
+                continue;
+            }
+            if ("A".equals(line.getStep())) {
+                aRubberVolume = aRubberVolume.add(volume);
+            } else if ("Q".equals(line.getStep())) {
+                qRubberVolume = qRubberVolume.add(volume);
+            }
+            //update-begin---author:cursor ---date:20260521  for：【配合示方】含胶率按密炼物料小类汇总重量%-----------
+            if (line.getWeightPercent() != null && StringUtils.isNotBlank(line.getMixerMaterialId())) {
+                MesMixerMaterial mixerMaterial = materialCache.computeIfAbsent(
+                        line.getMixerMaterialId(), mesMixerMaterialService::getById);
+                if (mixerMaterial != null && StringUtils.isNotBlank(mixerMaterial.getMinorCategoryId())) {
+                    String minorCategoryId = mixerMaterial.getMinorCategoryId();
+                    if (!naturalCategoryIds.isEmpty() && naturalCategoryIds.contains(minorCategoryId)) {
+                        naturalRubber = naturalRubber.add(line.getWeightPercent());
+                    } else if (!syntheticCategoryIds.isEmpty() && syntheticCategoryIds.contains(minorCategoryId)) {
+                        syntheticRubber = syntheticRubber.add(line.getWeightPercent());
+                    }
+                }
+            }
+            //update-end---author:cursor ---date:20260521  for：【配合示方】含胶率按密炼物料小类汇总重量%-----------
+        }
+        //update-begin---author:cursor ---date:20260521  for：【配合示方】STEP全为A/Q时对应胶比重清零并写库-----------
+        BigDecimal aRubberSg = aRubberVolume.compareTo(BigDecimal.ZERO) > 0
+                ? aRubberPhr.divide(aRubberVolume, 6, RoundingMode.HALF_UP)
+                : null;
+        BigDecimal qRubberSg = qRubberVolume.compareTo(BigDecimal.ZERO) > 0
+                ? qRubberPhr.divide(qRubberVolume, 6, RoundingMode.HALF_UP)
+                : null;
+        BigDecimal aRubberTotalPhr = aRubberPhr.compareTo(BigDecimal.ZERO) > 0 ? aRubberPhr : null;
+        BigDecimal naturalRubberValue = naturalRubber.compareTo(BigDecimal.ZERO) > 0
+                ? naturalRubber.setScale(4, RoundingMode.HALF_UP)
+                : null;
+        BigDecimal syntheticRubberValue = syntheticRubber.compareTo(BigDecimal.ZERO) > 0
+                ? syntheticRubber.setScale(4, RoundingMode.HALF_UP)
+                : null;
+        BigDecimal totalAmount = null;
+        if (naturalRubberValue != null || syntheticRubberValue != null) {
+            totalAmount = (naturalRubberValue != null ? naturalRubberValue : BigDecimal.ZERO)
+                    .add(syntheticRubberValue != null ? syntheticRubberValue : BigDecimal.ZERO)
+                    .setScale(4, RoundingMode.HALF_UP);
+        }
+        LambdaUpdateWrapper<MesXslFormulaSpec> updateWrapper = new LambdaUpdateWrapper<MesXslFormulaSpec>()
+                .eq(MesXslFormulaSpec::getId, mainId)
+                .set(MesXslFormulaSpec::getTotalPhr, totalPhr)
+                .set(MesXslFormulaSpec::getHasManualBatch, hasManual ? 1 : 0)
+                .set(MesXslFormulaSpec::getARubberTotalPhr, aRubberTotalPhr)
+                .set(MesXslFormulaSpec::getARubberSg, aRubberSg)
+                .set(MesXslFormulaSpec::getQRubberSg, qRubberSg)
+                .set(MesXslFormulaSpec::getNaturalRubber, naturalRubberValue)
+                .set(MesXslFormulaSpec::getSyntheticRubber, syntheticRubberValue)
+                .set(MesXslFormulaSpec::getTotalAmount, totalAmount);
+        this.update(updateWrapper);
+        //update-end---author:cursor ---date:20260521  for：【配合示方】STEP全为A/Q时对应胶比重清零并写库-----------
+    }
+
+    /** 优先取明细已保存体积，缺失时按 PHR/物料比重补算 */
+    private BigDecimal resolveLineVolume(MesXslFormulaSpecLine line) {
+        if (line == null) {
+            return null;
+        }
+        if (line.getVolume() != null && line.getVolume().compareTo(BigDecimal.ZERO) > 0) {
+            return line.getVolume();
+        }
+        if (line.getPhr() == null || StringUtils.isBlank(line.getMixerMaterialId())) {
+            return null;
+        }
+        MesMixerMaterial material = mesMixerMaterialService.getById(line.getMixerMaterialId());
+        if (material == null || material.getSpecificGravity() == null || material.getSpecificGravity().compareTo(BigDecimal.ZERO) <= 0) {
+            return null;
+        }
+        return line.getPhr().divide(material.getSpecificGravity(), 6, RoundingMode.HALF_UP);
+    }
+    //update-end---author:cursor ---date:20260521  for：【配合示方】保存后汇总A/Q胶比重写入数据库-----------
+}

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

@@ -0,0 +1,104 @@
+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.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.apache.commons.lang3.StringUtils;
+import org.jeecg.modules.system.entity.SysCategory;
+import org.jeecg.modules.system.service.ISysCategoryService;
+import org.jeecg.modules.xslmes.entity.MesXslFormulaSpecSetting;
+import org.jeecg.modules.xslmes.mapper.MesXslFormulaSpecSettingMapper;
+import org.jeecg.modules.xslmes.service.IMesXslFormulaSpecSettingService;
+import org.jeecg.modules.xslmes.vo.MesXslFormulaRubberContentSettingVO;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+public class MesXslFormulaSpecSettingServiceImpl extends ServiceImpl<MesXslFormulaSpecSettingMapper, MesXslFormulaSpecSetting>
+        implements IMesXslFormulaSpecSettingService {
+
+    private static final String DEFAULT_NATURAL_CATEGORY_CODE = "XSLMES_MATERIAL_RAW_AUX_TRJ";
+    private static final String DEFAULT_SYNTHETIC_CATEGORY_CODE = "XSLMES_MATERIAL_RAW_AUX_HCJ";
+
+    private final ISysCategoryService sysCategoryService;
+
+    public MesXslFormulaSpecSettingServiceImpl(ISysCategoryService sysCategoryService) {
+        this.sysCategoryService = sysCategoryService;
+    }
+
+    @Override
+    public MesXslFormulaRubberContentSettingVO getRubberContentSetting() {
+        MesXslFormulaSpecSetting setting = loadOrInitSetting();
+        MesXslFormulaRubberContentSettingVO vo = new MesXslFormulaRubberContentSettingVO();
+        vo.setNaturalMinorCategoryIds(parseIdList(setting.getNaturalMinorCategoryIds()));
+        vo.setSyntheticMinorCategoryIds(parseIdList(setting.getSyntheticMinorCategoryIds()));
+        return vo;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveRubberContentSetting(MesXslFormulaRubberContentSettingVO settingVo) {
+        MesXslFormulaSpecSetting setting = loadOrInitSetting();
+        setting.setNaturalMinorCategoryIds(joinIdList(settingVo != null ? settingVo.getNaturalMinorCategoryIds() : null));
+        setting.setSyntheticMinorCategoryIds(joinIdList(settingVo != null ? settingVo.getSyntheticMinorCategoryIds() : null));
+        setting.setUpdateTime(new Date());
+        this.updateById(setting);
+    }
+
+    @Override
+    public Set<String> getNaturalMinorCategoryIds() {
+        return new LinkedHashSet<>(parseIdList(loadOrInitSetting().getNaturalMinorCategoryIds()));
+    }
+
+    @Override
+    public Set<String> getSyntheticMinorCategoryIds() {
+        return new LinkedHashSet<>(parseIdList(loadOrInitSetting().getSyntheticMinorCategoryIds()));
+    }
+
+    private MesXslFormulaSpecSetting loadOrInitSetting() {
+        MesXslFormulaSpecSetting setting = this.getById(MesXslFormulaSpecSetting.DEFAULT_ID);
+        if (setting != null) {
+            return setting;
+        }
+        setting = new MesXslFormulaSpecSetting();
+        setting.setId(MesXslFormulaSpecSetting.DEFAULT_ID);
+        setting.setNaturalMinorCategoryIds(resolveCategoryIdByCode(DEFAULT_NATURAL_CATEGORY_CODE));
+        setting.setSyntheticMinorCategoryIds(resolveCategoryIdByCode(DEFAULT_SYNTHETIC_CATEGORY_CODE));
+        setting.setCreateTime(new Date());
+        this.save(setting);
+        return setting;
+    }
+
+    private String resolveCategoryIdByCode(String categoryCode) {
+        if (StringUtils.isBlank(categoryCode)) {
+            return null;
+        }
+        SysCategory category = sysCategoryService.getOne(
+                new LambdaQueryWrapper<SysCategory>().eq(SysCategory::getCode, categoryCode).last("LIMIT 1"));
+        return category != null ? category.getId() : null;
+    }
+
+    private List<String> parseIdList(String raw) {
+        if (StringUtils.isBlank(raw)) {
+            return Collections.emptyList();
+        }
+        return Arrays.stream(raw.split(","))
+                .map(String::trim)
+                .filter(StringUtils::isNotBlank)
+                .distinct()
+                .collect(Collectors.toList());
+    }
+
+    private String joinIdList(List<String> ids) {
+        if (ids == null || ids.isEmpty()) {
+            return null;
+        }
+        return ids.stream().filter(StringUtils::isNotBlank).map(String::trim).distinct().collect(Collectors.joining(","));
+    }
+}

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

@@ -0,0 +1,78 @@
+package org.jeecg.modules.xslmes.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.common.config.TenantContext;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.util.SpringContextUtils;
+import org.jeecg.common.util.TokenUtils;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.xslmes.entity.MesXslInspectMaintainItem;
+import org.jeecg.modules.xslmes.mapper.MesXslInspectMaintainItemMapper;
+import org.jeecg.modules.xslmes.service.IMesXslInspectMaintainItemService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class MesXslInspectMaintainItemServiceImpl
+        extends ServiceImpl<MesXslInspectMaintainItemMapper, MesXslInspectMaintainItem>
+        implements IMesXslInspectMaintainItemService {
+
+    //update-begin---author:jiangxh ---date:20260519  for：【MES】点检及保养项目：项目名称/编号同租户不可重复-----------
+    @Override
+    public boolean isItemNameDuplicated(String itemName, String excludeId, MesXslInspectMaintainItem context) {
+        return isFieldDuplicated(MesXslInspectMaintainItem::getItemName, itemName, excludeId, context);
+    }
+
+    @Override
+    public boolean isItemCodeDuplicated(String itemCode, String excludeId, MesXslInspectMaintainItem context) {
+        return isFieldDuplicated(MesXslInspectMaintainItem::getItemCode, itemCode, excludeId, context);
+    }
+
+    private boolean isFieldDuplicated(
+            com.baomidou.mybatisplus.core.toolkit.support.SFunction<MesXslInspectMaintainItem, String> column,
+            String value,
+            String excludeId,
+            MesXslInspectMaintainItem context) {
+        if (oConvertUtils.isEmpty(value)) {
+            return false;
+        }
+        Integer tenantId = resolveTenantId(context);
+        LambdaQueryWrapper<MesXslInspectMaintainItem> w = new LambdaQueryWrapper<>();
+        w.eq(column, value.trim());
+        w.and(
+                q ->
+                        q.eq(MesXslInspectMaintainItem::getDelFlag, CommonConstant.DEL_FLAG_0)
+                                .or()
+                                .isNull(MesXslInspectMaintainItem::getDelFlag));
+        if (oConvertUtils.isNotEmpty(excludeId)) {
+            w.ne(MesXslInspectMaintainItem::getId, excludeId);
+        }
+        if (tenantId != null) {
+            w.eq(MesXslInspectMaintainItem::getTenantId, tenantId);
+        }
+        return this.count(w) > 0;
+    }
+
+    private static Integer resolveTenantId(MesXslInspectMaintainItem context) {
+        if (context != null && context.getTenantId() != null) {
+            return context.getTenantId();
+        }
+        String ts = TenantContext.getTenant();
+        if (oConvertUtils.isEmpty(ts)) {
+            try {
+                ts = TokenUtils.getTenantIdByRequest(SpringContextUtils.getHttpServletRequest());
+            } catch (Exception ignored) {
+                // ignore
+            }
+        }
+        if (oConvertUtils.isEmpty(ts)) {
+            return null;
+        }
+        try {
+            return Integer.parseInt(ts);
+        } catch (NumberFormatException e) {
+            return null;
+        }
+    }
+    //update-end---author:jiangxh ---date:20260519  for：【MES】点检及保养项目：项目名称/编号同租户不可重复-----------
+}

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

@@ -0,0 +1,58 @@
+package org.jeecg.modules.xslmes.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
+import org.jeecg.modules.xslmes.entity.MesXslEquipmentLedger;
+import org.jeecg.modules.xslmes.entity.MesXslMixerAction;
+import org.jeecg.modules.xslmes.mapper.MesXslEquipmentLedgerMapper;
+import org.jeecg.modules.xslmes.mapper.MesXslMixerActionMapper;
+import org.jeecg.modules.xslmes.service.IMesXslMixerActionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class MesXslMixerActionServiceImpl extends ServiceImpl<MesXslMixerActionMapper, MesXslMixerAction>
+    implements IMesXslMixerActionService {
+
+  @Autowired private MesXslEquipmentLedgerMapper equipmentLedgerMapper;
+
+  @Override
+  public boolean isActionNameDuplicated(String actionName, String excludeId) {
+    if (StringUtils.isBlank(actionName)) {
+      return false;
+    }
+    LambdaQueryWrapper<MesXslMixerAction> wrapper =
+        new LambdaQueryWrapper<MesXslMixerAction>().eq(MesXslMixerAction::getActionName, actionName.trim());
+    if (StringUtils.isNotBlank(excludeId)) {
+      wrapper.ne(MesXslMixerAction::getId, excludeId.trim());
+    }
+    return this.count(wrapper) > 0;
+  }
+
+  @Override
+  public boolean isActionCodeDuplicated(String actionCode, String excludeId) {
+    if (StringUtils.isBlank(actionCode)) {
+      return false;
+    }
+    LambdaQueryWrapper<MesXslMixerAction> wrapper =
+        new LambdaQueryWrapper<MesXslMixerAction>().eq(MesXslMixerAction::getActionCode, actionCode.trim());
+    if (StringUtils.isNotBlank(excludeId)) {
+      wrapper.ne(MesXslMixerAction::getId, excludeId.trim());
+    }
+    return this.count(wrapper) > 0;
+  }
+
+  @Override
+  public void fillEquipmentName(MesXslMixerAction model) {
+    if (model == null) {
+      return;
+    }
+    if (StringUtils.isBlank(model.getEquipmentId())) {
+      model.setEquipmentName(null);
+      return;
+    }
+    MesXslEquipmentLedger ledger = equipmentLedgerMapper.selectById(model.getEquipmentId().trim());
+    model.setEquipmentName(ledger == null ? null : ledger.getEquipmentName());
+  }
+}

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

@@ -0,0 +1,29 @@
+package org.jeecg.modules.xslmes.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.xslmes.entity.MesXslMixerMaterialSubstitute;
+import org.jeecg.modules.xslmes.mapper.MesXslMixerMaterialSubstituteMapper;
+import org.jeecg.modules.xslmes.service.IMesXslMixerMaterialSubstituteService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * MES 密炼物料替代对应关系
+ */
+@Service
+public class MesXslMixerMaterialSubstituteServiceImpl
+        extends ServiceImpl<MesXslMixerMaterialSubstituteMapper, MesXslMixerMaterialSubstitute>
+        implements IMesXslMixerMaterialSubstituteService {
+
+    //update-begin---author:jiangxh ---date:20260520  for：【密炼物料替代对应关系】新增时分配编号-----------
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean saveWithSerialNo(MesXslMixerMaterialSubstitute entity) {
+        if (entity.getSerialNo() == null) {
+            Integer maxSerial = baseMapper.selectMaxSerialNo(entity.getTenantId());
+            entity.setSerialNo(maxSerial == null ? 1 : maxSerial + 1);
+        }
+        return save(entity);
+    }
+    //update-end---author:jiangxh ---date:20260520  for：【密炼物料替代对应关系】新增时分配编号-----------
+}

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

@@ -0,0 +1,64 @@
+package org.jeecg.modules.xslmes.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.xslmes.entity.MesXslMixerPsCompile;
+import org.jeecg.modules.xslmes.mapper.MesXslMixerPsCompileMapper;
+import org.jeecg.modules.xslmes.service.IMesXslMixerPsCompileService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * MES 密炼PS编制
+ */
+@Service
+public class MesXslMixerPsCompileServiceImpl extends ServiceImpl<MesXslMixerPsCompileMapper, MesXslMixerPsCompile>
+        implements IMesXslMixerPsCompileService {
+
+    //update-begin---author:jiangxh ---date:20260520  for：【密炼PS编制】批量流转状态-----------
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String changeStatusBatch(String ids, String expectedStatus, String targetStatus, String actionLabel,
+            String operatorName) {
+        if (oConvertUtils.isEmpty(ids)) {
+            return "请选择要" + actionLabel + "的记录";
+        }
+        List<String> idList = Arrays.asList(ids.split(","));
+        Date now = new Date();
+        for (String id : idList) {
+            if (oConvertUtils.isEmpty(id)) {
+                continue;
+            }
+            MesXslMixerPsCompile entity = getById(id.trim());
+            if (entity == null) {
+                return "记录不存在或已删除";
+            }
+            String current = entity.getStatus() == null ? "" : entity.getStatus();
+            if (!expectedStatus.equals(current)) {
+                String psCode = oConvertUtils.isEmpty(entity.getPsCode()) ? id : entity.getPsCode();
+                return "PS编码[" + psCode + "]当前状态不允许" + actionLabel + "，请先完成上一环节";
+            }
+            entity.setStatus(targetStatus);
+            fillWorkflowInfo(entity, targetStatus, operatorName, now);
+            updateById(entity);
+        }
+        return null;
+    }
+
+    private void fillWorkflowInfo(MesXslMixerPsCompile entity, String targetStatus, String operatorName, Date now) {
+        if ("proofread".equals(targetStatus)) {
+            entity.setProofreadBy(operatorName);
+            entity.setProofreadTime(now);
+        } else if ("audit".equals(targetStatus)) {
+            entity.setAuditBy(operatorName);
+            entity.setAuditTime(now);
+        } else if ("approve".equals(targetStatus)) {
+            entity.setApproveBy(operatorName);
+            entity.setApproveTime(now);
+        }
+    }
+    //update-end---author:jiangxh ---date:20260520  for：【密炼PS编制】批量流转状态-----------
+}

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

@@ -0,0 +1,15 @@
+package org.jeecg.modules.xslmes.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.xslmes.entity.MesXslOpenMillParam;
+import org.jeecg.modules.xslmes.mapper.MesXslOpenMillParamMapper;
+import org.jeecg.modules.xslmes.service.IMesXslOpenMillParamService;
+import org.springframework.stereotype.Service;
+
+/**
+ * MES 开炼机参数维护
+ */
+@Service
+public class MesXslOpenMillParamServiceImpl extends ServiceImpl<MesXslOpenMillParamMapper, MesXslOpenMillParam>
+        implements IMesXslOpenMillParamService {
+}

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/util/MesXslEquipInspectBizMsg.java

@@ -0,0 +1,27 @@
+package org.jeecg.modules.xslmes.util;
+
+import org.jeecg.common.util.oConvertUtils;
+
+/**
+ * 设备点检/保养业务提示文案
+ */
+public final class MesXslEquipInspectBizMsg {
+
+    private MesXslEquipInspectBizMsg() {}
+
+    public static String recordTypeLabel(String recordType) {
+        return "inspect".equals(recordType) ? "点检" : "保养";
+    }
+
+    /** 未维护该类型设备点检配置（不生成记录） */
+    public static String noConfigMessage(String equipmentName, String recordType) {
+        String name = oConvertUtils.isNotEmpty(equipmentName) ? equipmentName.trim() : "该设备";
+        return name + " 未维护" + recordTypeLabel(recordType) + "类型的设备点检配置";
+    }
+
+    /** 已有点检配置主表但无明细行 */
+    public static String noConfigLineMessage(String equipmentName, String recordType) {
+        String name = oConvertUtils.isNotEmpty(equipmentName) ? equipmentName.trim() : "该设备";
+        return name + " 的" + recordTypeLabel(recordType) + "类型设备点检配置未维护明细项";
+    }
+}

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

@@ -0,0 +1,12 @@
+package org.jeecg.modules.xslmes.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfig;
+
+/**
+ * 设备点检配置主子保存页 VO，继承主表实体（含 {@link MesXslEquipInspectConfig#lineList} 明细）。
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class MesXslEquipInspectConfigPage extends MesXslEquipInspectConfig {}

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.xslmes.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import java.util.List;
+import lombok.Data;
+
+/**
+ * 从设备台账批量生成点检/保养记录
+ */
+@Data
+@Schema(description = "批量生成点检保养记录请求")
+public class MesXslEquipInspectRecordBatchCreateDTO {
+
+    @Schema(description = "设备台账主键列表")
+    private List<String> equipmentLedgerIds;
+
+    @Schema(description = "记录类型 inspect点检/maintain保养")
+    private String recordType;
+}

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

@@ -0,0 +1,20 @@
+package org.jeecg.modules.xslmes.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import java.util.ArrayList;
+import java.util.List;
+import lombok.Data;
+
+/**
+ * 批量生成点检/保养记录结果
+ */
+@Data
+@Schema(description = "批量生成点检保养记录结果")
+public class MesXslEquipInspectRecordBatchCreateResult {
+
+    @Schema(description = "成功条数")
+    private int successCount;
+
+    @Schema(description = "失败说明（按设备）")
+    private List<String> failMessages = new ArrayList<>();
+}

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

@@ -0,0 +1,32 @@
+package org.jeecg.modules.xslmes.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import java.util.Date;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 不合格点检记录处理入参
+ */
+@Data
+@Schema(description = "点检保养记录-不合格处理")
+public class MesXslEquipInspectRecordHandleDTO {
+
+    @Schema(description = "记录主键", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String id;
+
+    @Schema(description = "处理人用户ID")
+    private String handlerUserId;
+
+    @Schema(description = "处理人账号")
+    private String handlerUsername;
+
+    @Schema(description = "处理人姓名")
+    private String handlerRealname;
+
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "处理时间")
+    private Date handleTime;
+}

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

@@ -0,0 +1,12 @@
+package org.jeecg.modules.xslmes.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.jeecg.modules.xslmes.entity.MesXslEquipInspectRecord;
+
+/**
+ * 点检/保养记录主子保存 VO
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class MesXslEquipInspectRecordPage extends MesXslEquipInspectRecord {}

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

@@ -0,0 +1,22 @@
+package org.jeecg.modules.xslmes.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import lombok.Data;
+
+/**
+ * 配合示方含胶率物料小类配置
+ */
+@Data
+@Schema(description = "配合示方含胶率物料小类配置")
+public class MesXslFormulaRubberContentSettingVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "天然橡胶物料小类ID列表")
+    private List<String> naturalMinorCategoryIds = new ArrayList<>();
+
+    @Schema(description = "合成橡胶物料小类ID列表")
+    private List<String> syntheticMinorCategoryIds = new ArrayList<>();
+}

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

@@ -0,0 +1,10 @@
+package org.jeecg.modules.xslmes.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.jeecg.modules.xslmes.entity.MesXslFormulaSpec;
+
+/** 配合示方主子保存 VO */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class MesXslFormulaSpecPage extends MesXslFormulaSpec {}