设备点检记录新增

.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-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-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/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/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/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/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/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/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/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/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/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/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/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/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-module-system/jeecg-system-api/jeecg-system-local-api/pom.xml

@@ -11,4 +11,13 @@
 
     <artifactId>jeecg-system-local-api</artifactId>
 
+    <dependencies>
+        <!-- 接口含 SseEmitter/RequestParam，显式声明便于 IDE 与编译期解析（optional 不传递给调用方） -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
+
 </project>

jeecg-boot/jeecg-module-system/jeecg-system-biz/docs/代码修改日志

@@ -246,6 +246,31 @@ jeecg-boot/db/mes-xsl-move-process-equipment-menus-to-mes-base.sql
 jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_69__mes_xsl_move_process_equipment_menus_to_mes_base.sql
 -- author:jiangxh---date:20260518--for: 【MES】设备类型菜单补全 INSERT（077 未建时仅 UPDATE 无效）---
 jeecg-boot/db/mes-xsl-equipment-type-menu-fix.sql
+-- author:jiangxh---date:20260518--for: 【MES】设备管理及子菜单图标 ---
+jeecg-boot/db/mes-xsl-equipment-menus-icon.sql
+jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_75__mes_xsl_equipment_menus_icon.sql
+jeecg-boot/db/mes-xsl-equipment-ledger-menu-permission.sql
+jeecg-boot/db/mes-xsl-equipment-sub-part-menu-permission.sql
+jeecg-boot/db/mes-xsl-spare-parts-category-menu-permission.sql
+jeecg-boot/db/mes-xsl-spare-part-menu-permission.sql
+jeecg-boot/db/mes-xsl-manufacturer-menu-permission.sql
+jeecg-boot/db/mes-xsl-downtime-main-type-menu-permission.sql
+jeecg-boot/db/mes-xsl-downtime-type-menu-permission.sql
+-- author:jiangxh---date:20260519--for: 【MES】点检及保养项目（建表、字典、菜单、CRUD、设备关联选择）---
+jeecg-boot/db/mes-xsl-inspect-maintain-item-menu-permission.sql
+jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_77__mes_xsl_inspect_maintain_item.sql
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslInspectMaintainItem.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslInspectMaintainItemMapper.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslInspectMaintainItemService.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslInspectMaintainItemServiceImpl.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslInspectMaintainItemController.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/package-info.java
+jeecgboot-vue3/src/views/xslmes/mesXslInspectMaintainItem/MesXslInspectMaintainItemList.vue
+jeecgboot-vue3/src/views/xslmes/mesXslInspectMaintainItem/MesXslInspectMaintainItem.data.ts
+jeecgboot-vue3/src/views/xslmes/mesXslInspectMaintainItem/MesXslInspectMaintainItem.api.ts
+jeecgboot-vue3/src/views/xslmes/mesXslInspectMaintainItem/components/MesXslInspectMaintainItemModal.vue
+jeecgboot-vue3/src/views/xslmes/mesXslInspectMaintainItem/components/MesXslEquipmentTypeFilterSelectModal.vue
+jeecgboot-vue3/src/views/xslmes/mesXslInspectMaintainItem/components/MesXslEquipmentSubPartFilterSelectModal.vue
 jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_70__mes_xsl_equipment_type_menu_ensure.sql
 -- author:jiangxh---date:20260518--for: 【MES】工序管理/设备类别菜单与按钮权限补全及租户授权 ---
 jeecg-boot/db/mes-xsl-process-and-category-menu-fix.sql
@@ -253,3 +278,143 @@ jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/
 jeecg-boot/db/mes-process-operation-menu-permission.sql
 jeecg-boot/db/mes-xsl-equipment-category-menu-permission.sql
 jeecg-boot/db/mes-xsl-move-process-equipment-menus-to-mes-base.sql
+-- author:jiangxh---date:20260518--for: 【MES】设备台账管理（建表、设备管理菜单、CRUD、编号名称唯一校验） ---
+jeecg-boot/db/mes-xsl-equipment-ledger-menu-permission.sql
+jeecg-boot/db/mes-xsl-equipment-ledger.sql
+jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_72__mes_xsl_equipment_ledger.sql
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslEquipmentLedger.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslEquipmentLedgerMapper.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslEquipmentLedgerService.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslEquipmentLedgerServiceImpl.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslEquipmentLedgerController.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/package-info.java
+jeecgboot-vue3/src/views/xslmes/mesXslEquipmentLedger/MesXslEquipmentLedger.api.ts
+jeecgboot-vue3/src/views/xslmes/mesXslEquipmentLedger/MesXslEquipmentLedger.data.ts
+jeecgboot-vue3/src/views/xslmes/mesXslEquipmentLedger/MesXslEquipmentLedgerList.vue
+jeecgboot-vue3/src/views/xslmes/mesXslEquipmentLedger/components/MesXslEquipmentLedgerModal.vue
+jeecgboot-vue3/src/views/xslmes/mesXslEquipmentLedger/components/MesXslManufacturerSelectModal.vue
+jeecgboot-vue3/src/views/xslmes/mesXslEquipmentLedger/components/MesXslEquipmentTypeSelectModal.vue
+-- author:jiangxh---date:20260518--for: 【MES】设备管理目录与 MES基础资料 同级（非 MES管理 子菜单） ---
+jeecg-boot/db/mes-xsl-equipment-ledger-menu-permission.sql
+jeecg-boot/db/mes-xsl-equipment-ledger-menu-parent-fix.sql
+jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_72__mes_xsl_equipment_ledger.sql
+jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_73__mes_xsl_equipment_mgmt_menu_parent_fix.sql
+-- author:jiangxh---date:20260518--for: 【MES】设备类别/类型/部位/小部位、备品件、厂家、停机类菜单挂「设备管理」目录 ---
+jeecg-boot/db/mes-xsl-move-menus-to-equipment-mgmt.sql
+jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_74__mes_xsl_move_menus_to_equipment_mgmt.sql
+jeecg-boot/db/mes-xsl-equipment-category-menu-permission.sql
+jeecg-boot/db/mes-xsl-equipment-type-menu-permission.sql
+jeecg-boot/db/mes-xsl-equipment-part-menu-permission.sql
+jeecg-boot/db/mes-xsl-equipment-sub-part-menu-permission.sql
+jeecg-boot/db/mes-xsl-spare-parts-category-menu-permission.sql
+jeecg-boot/db/mes-xsl-spare-part-menu-permission.sql
+jeecg-boot/db/mes-xsl-manufacturer-menu-permission.sql
+jeecg-boot/db/mes-xsl-downtime-main-type-menu-permission.sql
+jeecg-boot/db/mes-xsl-downtime-type-menu-permission.sql
+jeecg-boot/db/mes-xsl-move-process-equipment-menus-to-mes-base.sql
+jeecg-boot/db/mes-xsl-process-and-category-menu-fix.sql
+jeecg-boot/db/mes-xsl-equipment-type-menu-fix.sql
+-- author:jiangxh---date:20260518--for: 【MES】设备管理及子菜单图标 ---
+jeecg-boot/db/mes-xsl-equipment-menus-icon.sql
+jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_75__mes_xsl_equipment_menus_icon.sql
+jeecg-boot/db/mes-xsl-equipment-ledger-menu-permission.sql
+jeecg-boot/db/mes-xsl-equipment-sub-part-menu-permission.sql
+jeecg-boot/db/mes-xsl-spare-parts-category-menu-permission.sql
+jeecg-boot/db/mes-xsl-spare-part-menu-permission.sql
+jeecg-boot/db/mes-xsl-manufacturer-menu-permission.sql
+jeecg-boot/db/mes-xsl-downtime-main-type-menu-permission.sql
+jeecg-boot/db/mes-xsl-downtime-type-menu-permission.sql
+-- author:jiangxh---date:20260519--for: 【MES】点检及保养项目（建表、字典、菜单、CRUD、设备关联选择）---
+jeecg-boot/db/mes-xsl-inspect-maintain-item-menu-permission.sql
+jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_77__mes_xsl_inspect_maintain_item.sql
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslInspectMaintainItem.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslInspectMaintainItemMapper.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslInspectMaintainItemService.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslInspectMaintainItemServiceImpl.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslInspectMaintainItemController.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/package-info.java
+jeecgboot-vue3/src/views/xslmes/mesXslInspectMaintainItem/MesXslInspectMaintainItemList.vue
+jeecgboot-vue3/src/views/xslmes/mesXslInspectMaintainItem/MesXslInspectMaintainItem.data.ts
+jeecgboot-vue3/src/views/xslmes/mesXslInspectMaintainItem/MesXslInspectMaintainItem.api.ts
+jeecgboot-vue3/src/views/xslmes/mesXslInspectMaintainItem/components/MesXslInspectMaintainItemModal.vue
+jeecgboot-vue3/src/views/xslmes/mesXslInspectMaintainItem/components/MesXslEquipmentTypeFilterSelectModal.vue
+jeecgboot-vue3/src/views/xslmes/mesXslInspectMaintainItem/components/MesXslEquipmentSubPartFilterSelectModal.vue
+-- author:jiangxh---date:20260519--for: 【MES】设备点检配置主子表（设备台账+类型唯一、明细从点检保养项目带出）---
+jeecg-boot/db/mes-xsl-equip-inspect-config-menu-permission.sql
+jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_78__mes_xsl_equip_inspect_config.sql
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslEquipInspectConfig.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslEquipInspectConfigLine.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/vo/MesXslEquipInspectConfigPage.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslEquipInspectConfigMapper.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslEquipInspectConfigLineMapper.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslEquipInspectConfigService.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslEquipInspectConfigServiceImpl.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslEquipInspectConfigController.java
+jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/MesXslEquipInspectConfigList.vue
+jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/MesXslEquipInspectConfig.data.ts
+jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/MesXslEquipInspectConfig.api.ts
+jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/components/MesXslEquipInspectConfigModal.vue
+jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/components/MesXslEquipmentLedgerSelectModal.vue
+jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/components/MesXslInspectMaintainItemSelectModal.vue
+-- author:jiangxh---date:20260519--for: 【MES】修复设备点检配置保存失败（Page VO 与主实体重复 lineList 导致编译错误）---
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/vo/MesXslEquipInspectConfigPage.java
+-- author:jiangxh---date:20260519--for: 【MES】设备点检配置明细改为多选点检保养项目、禁用JVxe新增---
+jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/components/MesXslEquipInspectConfigModal.vue
+jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/components/MesXslInspectMaintainItemSelectModal.vue
+jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/MesXslEquipInspectConfig.data.ts
+-- author:jiangxh---date:20260520--for: 【MES】点检保养记录主子表（EC编号、设备配置带出明细、字典与菜单）---
+jeecg-boot/db/mes-xsl-equip-inspect-record-menu-permission.sql
+jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_79__mes_xsl_equip_inspect_record.sql
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslEquipInspectRecord.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslEquipInspectRecordLine.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/vo/MesXslEquipInspectRecordPage.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslEquipInspectRecordMapper.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslEquipInspectRecordLineMapper.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslEquipInspectRecordService.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslEquipInspectRecordServiceImpl.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslEquipInspectRecordController.java
+jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/MesXslEquipInspectRecordList.vue
+jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/MesXslEquipInspectRecord.data.ts
+jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/MesXslEquipInspectRecord.api.ts
+jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/components/MesXslEquipInspectRecordModal.vue
+-- author:jiangxh---date:20260520--for: 【MES】点检记录改由设备台账批量生成，去掉记录列表新增与表单选设备---
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/vo/MesXslEquipInspectRecordBatchCreateDTO.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/vo/MesXslEquipInspectRecordBatchCreateResult.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslEquipInspectRecordService.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslEquipInspectRecordServiceImpl.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslEquipInspectRecordController.java
+jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/MesXslEquipInspectRecordList.vue
+jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/MesXslEquipInspectRecord.data.ts
+jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/MesXslEquipInspectRecord.api.ts
+jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/components/MesXslEquipInspectRecordModal.vue
+jeecgboot-vue3/src/views/xslmes/mesXslEquipmentLedger/MesXslEquipmentLedgerList.vue
+-- author:jiangxh---date:20260520--for: 【MES】点检记录录入流程：去导入、待点检录入、保存变已点检---
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslEquipInspectRecordController.java
+jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/MesXslEquipInspectRecordList.vue
+jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/MesXslEquipInspectRecord.data.ts
+jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/components/MesXslEquipInspectRecordModal.vue
+-- author:jiangxh---date:20260520--for: 【MES】修复点检记录明细图片上传一直转圈（uploadUrl 补全 jeecg-boot 上下文）---
+jeecgboot-vue3/src/api/common/api.ts
+jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/MesXslEquipInspectRecord.data.ts
+-- author:jiangxh---date:20260520--for: 【MES】修复点检明细图片上传后预览「图片错误」（getFileAccessHttpUrl 补全 context-path）---
+jeecgboot-vue3/src/utils/env/apiBaseUrl.ts
+jeecgboot-vue3/src/utils/common/compUtils.ts
+jeecgboot-vue3/src/api/common/api.ts
+-- author:jiangxh---date:20260520--for: 【MES】设备台账批量点检/保养：未维护对应类型点检配置不生成并提示设备名称---
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/util/MesXslEquipInspectBizMsg.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslEquipInspectRecordServiceImpl.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslEquipInspectRecordController.java
+jeecgboot-vue3/src/views/xslmes/mesXslEquipmentLedger/MesXslEquipmentLedgerList.vue
+-- author:jiangxh---date:20260521--for: 【MES】点检保养记录不合格处理：是否已处理/处理人/处理时间字段与处理按钮---
+jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_80__mes_xsl_equip_inspect_record_handle.sql
+jeecg-boot/db/mes-xsl-equip-inspect-record-menu-permission.sql
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslEquipInspectRecord.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/vo/MesXslEquipInspectRecordHandleDTO.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslEquipInspectRecordService.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslEquipInspectRecordServiceImpl.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslEquipInspectRecordController.java
+jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/MesXslEquipInspectRecord.data.ts
+jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/MesXslEquipInspectRecord.api.ts
+jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/MesXslEquipInspectRecordList.vue
+jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/components/MesXslEquipInspectRecordModal.vue
+jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/components/MesXslEquipInspectRecordHandleModal.vue

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

@@ -23,6 +23,11 @@ spring:
 #  main:
 #    # 启动加速 (建议开发环境，开启后flyway自动升级失效)
 #    lazy-initialization: true
+  # banner.txt 为 UTF-8；Windows 下改走日志输出（与 logging.charset.console=GBK 一致），避免 System.out 乱码
+  main:
+    banner-mode: log
+  banner:
+    charset: UTF-8
   flyway:
     # 是否启用flyway
     enabled: false
@@ -315,6 +320,10 @@ cas:
   prefixUrl: http://cas.example.org:8443/cas
 #Mybatis输出sql日志
 logging:
+  charset:
+    # Windows 终端/Cursor 默认 GBK；终端已 chcp 65001 时可改为 UTF-8
+    console: GBK
+    file: UTF-8
   level:
     org.springframework.context.support.PostProcessorRegistrationDelegate: error
     org.flywaydb: debug

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

@@ -0,0 +1,121 @@
+-- MES 设备台账：字典 + 建表 + 设备管理目录 + 设备台账菜单 + 按钮 + 租户 admin 授权
+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;
+
+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);
+
+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`), `is_leaf` = 0, `hidden` = 0, `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 ('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/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_73__mes_xsl_equipment_mgmt_menu_parent_fix.sql

@@ -0,0 +1,31 @@
+-- 设备管理目录与 MES基础资料 同级（修正 V3.9.2_72 曾挂在 MES管理 下）
+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/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_74__mes_xsl_move_menus_to_equipment_mgmt.sql

@@ -0,0 +1,60 @@
+-- 设备相关子菜单挂到「设备管理」目录（与 db/mes-xsl-move-menus-to-equipment-mgmt.sql 一致）
+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/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_75__mes_xsl_equipment_menus_icon.sql

@@ -0,0 +1,10 @@
+-- 设备管理目录及指定子菜单图标（与 db/mes-xsl-equipment-menus-icon.sql 一致）
+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/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_77__mes_xsl_inspect_maintain_item.sql

@@ -0,0 +1,116 @@
+-- MES 点检及保养项目：字典 + 建表 + 菜单 + 按钮 + 租户 admin 授权（与 jeecg-boot/db/mes-xsl-inspect-maintain-item-menu-permission.sql 一致）
+-- 权限前缀：mes:mes_xsl_inspect_maintain_item:*；父菜单：设备管理
+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/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_78__mes_xsl_equip_inspect_config.sql

@@ -0,0 +1,88 @@
+-- MES 设备点检配置（主子表）：与 jeecg-boot/db/mes-xsl-equip-inspect-config-menu-permission.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/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_79__mes_xsl_equip_inspect_record.sql

@@ -0,0 +1,133 @@
+-- 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已点检）',
+  `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/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_80__mes_xsl_equip_inspect_record_handle.sql

@@ -0,0 +1,9 @@
+-- MES 点检保养记录：不合格处理字段（是否已处理/处理人/处理时间）
+SET NAMES utf8mb4;
+
+ALTER TABLE `mes_xsl_equip_inspect_record`
+  ADD COLUMN `handled_flag` varchar(1) DEFAULT NULL COMMENT '是否已处理（字典yn：1是0否，仅不合格记录使用）' AFTER `record_status`,
+  ADD COLUMN `handler_user_id` varchar(32) DEFAULT NULL COMMENT '处理人用户ID' AFTER `handled_flag`,
+  ADD COLUMN `handler_username` varchar(500) DEFAULT NULL COMMENT '处理人账号' AFTER `handler_user_id`,
+  ADD COLUMN `handler_realname` varchar(500) DEFAULT NULL COMMENT '处理人姓名' AFTER `handler_username`,
+  ADD COLUMN `handle_time` datetime DEFAULT NULL COMMENT '处理时间' AFTER `handler_realname`;

jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/logback-spring.xml

@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="false">
+	<!-- 与 application-*.yml 中 logging.charset 对齐；Windows 集成终端默认 GBK -->
+	<springProperty scope="context" name="CONSOLE_LOG_CHARSET" source="logging.charset.console" defaultValue="GBK"/>
+	<springProperty scope="context" name="FILE_LOG_CHARSET" source="logging.charset.file" defaultValue="UTF-8"/>
+
 	<!--定义日志文件的存储地址 -->
 	<property name="LOG_HOME" value="../logs" />
 
@@ -10,6 +14,7 @@
 			<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符
 			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n</pattern>-->
 			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %highlight(%-5level) %cyan(%logger{50}:%L) - %msg%n</pattern>
+			<charset>${CONSOLE_LOG_CHARSET}</charset>
 		</encoder>
 	</appender>
 
@@ -25,6 +30,7 @@
 		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
 			<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
 			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n</pattern>
+			<charset>${FILE_LOG_CHARSET}</charset>
 		</encoder>
 	</appender>
 

jeecgboot-vue3/.env.development

@@ -7,10 +7,10 @@ VITE_PUBLIC_PATH = /
 
 # 跨域代理：前缀需与 VITE_GLOB_API_URL 一致，且 rewrite 后路径需包含后端 context-path（/jeecg-boot）
 # 详见 build/vite/proxy.ts
-VITE_PROXY = [["/jeecg-boot","http://localhost:8888/jeecg-boot"],["/upload","http://localhost:3300/upload"]]
+VITE_PROXY = [["/jeecg-boot","http://localhost:8888"],["/upload","http://localhost:3300/upload"]]
 
 #后台接口全路径地址(必填)
-VITE_GLOB_DOMAIN_URL=http://localhost:8888/jeecg-boot
+VITE_GLOB_DOMAIN_URL=http://localhost:8888
 
 #后台接口父地址(必填)，与 server.servlet.context-path 一致，避免仅去掉别名前缀后缺少 /jeecg-boot
 VITE_GLOB_API_URL=/jeecg-boot

jeecgboot-vue3/.env.production

@@ -13,10 +13,10 @@ VITE_BUILD_COMPRESS = 'gzip'
 VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false
 
 #后台接口父地址(必填)
-VITE_GLOB_API_URL=/jeecgboot
+VITE_GLOB_API_URL=/jeecg-boot
 
 #后台接口全路径地址(必填)
-VITE_GLOB_DOMAIN_URL=http://127.0.0.1:8080/jeecg-boot
+VITE_GLOB_DOMAIN_URL=http://127.0.0.1:8888/jeecg-boot
 
 # 接口父路径前缀
 VITE_GLOB_API_URL_PREFIX=

jeecgboot-vue3/src/api/common/api.ts

@@ -1,8 +1,7 @@
 import { defHttp } from '/@/utils/http/axios';
 import { message } from 'ant-design-vue';
-import { useGlobSetting } from '/@/hooks/setting';
-const globSetting = useGlobSetting();
-const baseUploadUrl = globSetting.uploadUrl;
+import { resolveApiBaseUrl } from '/@/utils/env/apiBaseUrl';
+
 enum Api {
   positionList = '/sys/position/list',
   userList = '/sys/user/list',
@@ -25,9 +24,9 @@ enum Api {
 }
 
 /**
- * 上传父路径
+ * 上传地址（须含 context-path；开发环境 domain 仅为 host 时需拼 apiUrl）
  */
-export const uploadUrl = `${baseUploadUrl}/sys/common/upload`;
+export const uploadUrl = `${resolveApiBaseUrl()}/sys/common/upload`;
 
 /**
  * 职务列表

jeecgboot-vue3/src/utils/common/compUtils.ts

@@ -1,4 +1,3 @@
-import { useGlobSetting } from '/@/hooks/setting';
 import { merge, random } from 'lodash-es';
 import { isArray } from '/@/utils/is';
 import { FormSchema } from '/@/components/Form';
@@ -14,11 +13,10 @@ import { useI18n } from "@/hooks/web/useI18n";
 import {$electron} from "@/electron";
 import {router} from "@/router";
 import {encryptByBase64} from "@/utils/cipher";
+import { resolveApiBaseUrl } from '/@/utils/env/apiBaseUrl';
 //存放部门路径的数组
 const departNamePath = ref<Record<string, string>>({});
 
-const globSetting = useGlobSetting();
-const baseApiUrl = globSetting.domainUrl;
 /**
  *  获取文件服务访问路径
  * @param fileUrl 文件路径
@@ -31,10 +29,10 @@ export const getFileAccessHttpUrl = (fileUrl, prefix = 'http') => {
       //判断是否是数组格式
       let isArray = fileUrl.indexOf('[') != -1;
       if (!isArray) {
-        let prefix = `${baseApiUrl}/sys/common/static/`;
+        const staticPrefix = `${resolveApiBaseUrl()}/sys/common/static/`;
         // 判断是否已包含前缀
-        if (!fileUrl.startsWith(prefix)) {
-          result = `${prefix}${fileUrl}`;
+        if (!fileUrl.startsWith(staticPrefix)) {
+          result = `${staticPrefix}${fileUrl}`;
         }
       }
     }

jeecgboot-vue3/src/utils/env/apiBaseUrl.ts

@@ -0,0 +1,18 @@
+import { useGlobSetting } from '/@/hooks/setting';
+
+/**
+ * 后端 API 根地址（含 servlet.context-path，如 /jeecg-boot）
+ * 开发环境 VITE_GLOB_DOMAIN_URL 常为 http://host:port，需与 VITE_GLOB_API_URL 拼接
+ */
+export function resolveApiBaseUrl(): string {
+  const { domainUrl, apiUrl } = useGlobSetting();
+  const domain = (domainUrl || '').replace(/\/$/, '');
+  const api = apiUrl || '';
+  if (!domain) {
+    return api;
+  }
+  if (!api || domain.endsWith(api) || domain.includes(`${api}/`)) {
+    return domain;
+  }
+  return `${domain}${api}`;
+}

jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/MesXslEquipInspectConfig.api.ts

@@ -0,0 +1,51 @@
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from '/@/hooks/web/useMessage';
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/xslmes/mesXslEquipInspectConfig/list',
+  save = '/xslmes/mesXslEquipInspectConfig/add',
+  edit = '/xslmes/mesXslEquipInspectConfig/edit',
+  deleteOne = '/xslmes/mesXslEquipInspectConfig/delete',
+  deleteBatch = '/xslmes/mesXslEquipInspectConfig/deleteBatch',
+  importExcel = '/xslmes/mesXslEquipInspectConfig/importExcel',
+  exportXls = '/xslmes/mesXslEquipInspectConfig/exportXls',
+  queryById = '/xslmes/mesXslEquipInspectConfig/queryById',
+  queryLineList = '/xslmes/mesXslEquipInspectConfig/queryLineListByConfigId',
+}
+
+export const getExportUrl = Api.exportXls;
+export const getImportUrl = Api.importExcel;
+
+export const list = (params) => defHttp.get({ url: Api.list, params });
+
+export const queryById = (params: { id: string }) => defHttp.get({ url: Api.queryById, params });
+
+export const queryLineListByConfigId = (params: { id: string }) => defHttp.get({ url: Api.queryLineList, params });
+
+export const deleteOne = (params, handleSuccess) => {
+  return defHttp.delete({ url: Api.deleteOne, params }, { joinParamsToUrl: true }).then(() => {
+    handleSuccess();
+  });
+};
+
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({ url: Api.deleteBatch, data: params }, { joinParamsToUrl: true }).then(() => {
+        handleSuccess();
+      });
+    },
+  });
+};
+
+export const saveOrUpdate = (params, isUpdate) => {
+  const url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({ url, params });
+};

jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/MesXslEquipInspectConfig.data.ts

@@ -0,0 +1,86 @@
+import { BasicColumn, FormSchema } from '/@/components/Table';
+import { JVxeColumn, JVxeTypes } from '/@/components/jeecg/JVxeTable/types';
+
+export const columns: BasicColumn[] = [
+  { title: '设备名称', align: 'center', dataIndex: 'equipmentName', width: 160 },
+  { title: '设备编号', align: 'center', dataIndex: 'equipmentCode', width: 140 },
+  { title: '类型', align: 'center', dataIndex: 'configType_dictText', width: 90 },
+  { title: '创建人', align: 'center', dataIndex: 'createBy', width: 100 },
+  {
+    title: '创建时间',
+    align: 'center',
+    dataIndex: 'createTime',
+    width: 165,
+    customRender: ({ text }) => (!text ? '' : String(text).length > 19 ? String(text).substring(0, 19) : text),
+  },
+];
+
+export const searchFormSchema: FormSchema[] = [
+  { label: '设备名称', field: 'equipmentName', component: 'Input', colProps: { span: 6 } },
+  { label: '设备编号', field: 'equipmentCode', component: 'Input', colProps: { span: 6 } },
+  {
+    label: '类型',
+    field: 'configType',
+    component: 'JDictSelectTag',
+    componentProps: { dictCode: 'xslmes_im_item_category' },
+    colProps: { span: 6 },
+  },
+];
+
+export const formSchema: FormSchema[] = [
+  { label: '', field: 'id', component: 'Input', show: false },
+  { label: '', field: 'equipmentLedgerId', component: 'Input', show: false },
+  {
+    label: '设备名称',
+    field: 'equipmentName',
+    component: 'Input',
+    slot: 'equipmentLedgerPicker',
+    dynamicRules: () => [{ required: true, message: '请选择设备台账' }],
+  },
+  {
+    label: '设备编号',
+    field: 'equipmentCode',
+    component: 'Input',
+    componentProps: { readonly: true, placeholder: '选择设备后自动带出' },
+  },
+  {
+    label: '类型',
+    field: 'configType',
+    component: 'JDictSelectTag',
+    required: true,
+    componentProps: { dictCode: 'xslmes_im_item_category', placeholder: '点检/保养' },
+  },
+];
+
+export const lineJVxeColumns: JVxeColumn[] = [
+  { title: '', key: 'inspectMaintainItemId', type: JVxeTypes.hidden },
+  { title: '点检项目编号', key: 'itemCode', type: JVxeTypes.normal, width: 130, disabled: true },
+  { title: '项目名称', key: 'itemName', type: JVxeTypes.normal, width: 140, disabled: true },
+  {
+    title: '项目类别',
+    key: 'itemCategory',
+    type: JVxeTypes.select,
+    width: 100,
+    disabled: true,
+    dictCode: 'xslmes_im_item_category',
+  },
+  {
+    title: '项目类型',
+    key: 'itemType',
+    type: JVxeTypes.select,
+    width: 100,
+    disabled: true,
+    dictCode: 'xslmes_im_item_type',
+  },
+  { title: '设备部位', key: 'equipmentPartName', type: JVxeTypes.normal, width: 120, disabled: true },
+  { title: '设备小部位', key: 'equipmentSubPartName', type: JVxeTypes.normal, width: 120, disabled: true },
+  {
+    title: '点检方式',
+    key: 'inspectMethod',
+    type: JVxeTypes.select,
+    width: 100,
+    disabled: true,
+    dictCode: 'xslmes_im_inspect_method',
+  },
+  { title: '判断基准', key: 'judgmentCriteria', type: JVxeTypes.normal, width: 180, disabled: true },
+];

jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/MesXslEquipInspectConfigList.vue

@@ -0,0 +1,132 @@
+<template>
+  <div>
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <template #tableTitle>
+        <a-button
+          type="primary"
+          v-auth="'mes:mes_xsl_equip_inspect_config:add'"
+          @click="handleAdd"
+          preIcon="ant-design:plus-outlined"
+        >
+          新增
+        </a-button>
+        <a-button
+          type="primary"
+          v-auth="'mes:mes_xsl_equip_inspect_config:exportXls'"
+          preIcon="ant-design:export-outlined"
+          @click="onExportXls"
+        >
+          导出
+        </a-button>
+        <j-upload-button
+          type="primary"
+          v-auth="'mes:mes_xsl_equip_inspect_config:importExcel'"
+          preIcon="ant-design:import-outlined"
+          @click="onImportXls"
+        >
+          导入
+        </j-upload-button>
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <template #overlay>
+            <a-menu>
+              <a-menu-item key="1" @click="batchHandleDelete">
+                <Icon icon="ant-design:delete-outlined" />
+                删除
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button v-auth="'mes:mes_xsl_equip_inspect_config:deleteBatch'">
+            批量操作
+            <Icon icon="mdi:chevron-down" />
+          </a-button>
+        </a-dropdown>
+      </template>
+      <template #action="{ record }">
+        <TableAction
+          :actions="[
+            { label: '编辑', onClick: handleEdit.bind(null, record), auth: 'mes:mes_xsl_equip_inspect_config:edit' },
+          ]"
+          :dropDownActions="getDropDownAction(record)"
+        />
+      </template>
+    </BasicTable>
+    <MesXslEquipInspectConfigModal @register="registerModal" @success="handleSuccess" />
+  </div>
+</template>
+
+<script lang="ts" name="xslmes-mesXslEquipInspectConfig" setup>
+  import { BasicTable, TableAction } from '/@/components/Table';
+  import { useModal } from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import Icon from '/@/components/Icon';
+  import MesXslEquipInspectConfigModal from './components/MesXslEquipInspectConfigModal.vue';
+  import { columns, searchFormSchema } from './MesXslEquipInspectConfig.data';
+  import { list, deleteOne, batchDelete, getExportUrl, getImportUrl } from './MesXslEquipInspectConfig.api';
+
+  const [registerModal, { openModal }] = useModal();
+
+  const { tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '设备点检配置',
+      api: list,
+      columns,
+      canResize: true,
+      formConfig: {
+        schemas: searchFormSchema,
+        labelWidth: 100,
+        autoSubmitOnEnter: true,
+        showAdvancedButton: true,
+      },
+      actionColumn: {
+        width: 200,
+        fixed: 'right',
+      },
+    },
+    exportConfig: {
+      name: '设备点检配置',
+      url: getExportUrl,
+    },
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess,
+    },
+  });
+
+  const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
+
+  function handleAdd() {
+    openModal(true, { isUpdate: false, showFooter: true });
+  }
+
+  function handleEdit(record: Recordable) {
+    openModal(true, { record, isUpdate: true, showFooter: true });
+  }
+
+  function handleDetail(record: Recordable) {
+    openModal(true, { record, isUpdate: true, showFooter: false });
+  }
+
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
+
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
+
+  function handleSuccess() {
+    selectedRowKeys.value = [];
+    reload();
+  }
+
+  function getDropDownAction(record) {
+    return [
+      { label: '详情', onClick: handleDetail.bind(null, record) },
+      {
+        label: '删除',
+        popConfirm: { title: '是否确认删除', confirm: handleDelete.bind(null, record) },
+        auth: 'mes:mes_xsl_equip_inspect_config:delete',
+      },
+    ];
+  }
+</script>

jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/components/MesXslEquipInspectConfigModal.vue

@@ -0,0 +1,239 @@
+<template>
+  <BasicModal
+    v-bind="$attrs"
+    destroyOnClose
+    :title="title"
+    width="1100px"
+    @register="registerModal"
+    @ok="handleSubmit"
+  >
+    <BasicForm @register="registerForm">
+      <template #equipmentLedgerPicker="{ model, field }">
+        <a-input-group compact style="display: flex; width: 100%">
+          <a-input v-model:value="model[field]" read-only placeholder="请选择设备台账" style="flex: 1" />
+          <a-button type="primary" :disabled="isDetail" @click="openLedgerSelect">选择</a-button>
+          <a-button v-if="model.equipmentLedgerId && !isDetail" @click="clearLedger">清除</a-button>
+        </a-input-group>
+      </template>
+    </BasicForm>
+    <a-divider orientation="left">点检项目明细</a-divider>
+    <JVxeTable
+      v-if="tableReady"
+      ref="lineTableRef"
+      toolbar
+      row-number
+      rowSelection
+      keep-source
+      :insert-row="false"
+      :max-height="380"
+      :loading="lineLoading"
+      :columns="lineJVxeColumns"
+      :dataSource="lineDataSource"
+      :disabled="!showFooterFlag"
+      :toolbar-config="{ btn: ['remove'], slots: ['suffix'] }"
+      :add-btn-cfg="{ enabled: false }"
+    >
+      <template #toolbarSuffix>
+        <a-button
+          v-if="showFooterFlag"
+          type="primary"
+          preIcon="ant-design:plus-outlined"
+          @click="openBatchItemSelect"
+        >
+          选择点检及保养项目
+        </a-button>
+      </template>
+    </JVxeTable>
+    <MesXslEquipmentLedgerSelectModal @register="registerLedgerModal" @select="onLedgerSelect" />
+    <MesXslInspectMaintainItemSelectModal @register="registerItemModal" @select="onItemsSelect" />
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+  import { computed, ref, unref } from 'vue';
+  import { BasicModal, useModalInner, useModal } from '/@/components/Modal';
+  import { BasicForm, useForm } from '/@/components/Form/index';
+  import type { JVxeTableInstance } from '/@/components/jeecg/JVxeTable/types';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { formSchema, lineJVxeColumns } from '../MesXslEquipInspectConfig.data';
+  import { saveOrUpdate, queryById, queryLineListByConfigId } from '../MesXslEquipInspectConfig.api';
+  import MesXslEquipmentLedgerSelectModal from './MesXslEquipmentLedgerSelectModal.vue';
+  import MesXslInspectMaintainItemSelectModal from './MesXslInspectMaintainItemSelectModal.vue';
+
+  const emit = defineEmits(['register', 'success']);
+  const { createMessage } = useMessage();
+  const isUpdate = ref(false);
+  const isDetail = ref(false);
+  const showFooterFlag = ref(true);
+  const tableReady = ref(false);
+  const lineLoading = ref(false);
+  const lineDataSource = ref<Recordable[]>([]);
+  const lineTableRef = ref<JVxeTableInstance>();
+
+  const [registerForm, { resetFields, setFieldsValue, validate, setProps, getFieldsValue }] = useForm({
+    labelWidth: 110,
+    schemas: formSchema,
+    showActionButtonGroup: false,
+    baseColProps: { span: 12 },
+  });
+
+  const [registerLedgerModal, { openModal: openLedgerModal }] = useModal();
+  const [registerItemModal, { openModal: openItemModal }] = useModal();
+
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    tableReady.value = false;
+    lineDataSource.value = [];
+    await resetFields();
+    setModalProps({ confirmLoading: false, showCancelBtn: data?.showFooter, showOkBtn: data?.showFooter });
+    isUpdate.value = !!data?.isUpdate;
+    isDetail.value = !data?.showFooter;
+    showFooterFlag.value = !!data?.showFooter;
+    setProps({ disabled: !data?.showFooter });
+    if (unref(isUpdate) && data?.record?.id) {
+      lineLoading.value = true;
+      try {
+        const mainRaw = await queryById({ id: data.record.id });
+        const m = (mainRaw as any)?.id != null ? mainRaw : (mainRaw as any)?.result ?? mainRaw;
+        const linesRaw = await queryLineListByConfigId({ id: data.record.id });
+        const list = Array.isArray(linesRaw) ? linesRaw : (linesRaw as any)?.result ?? [];
+        await setFieldsValue({ ...m });
+        lineDataSource.value = [...(list || [])];
+      } finally {
+        lineLoading.value = false;
+      }
+    }
+    tableReady.value = true;
+  });
+
+  const title = computed(() =>
+    !unref(isUpdate) ? '新增设备点检配置' : unref(isDetail) ? '设备点检配置详情' : '编辑设备点检配置',
+  );
+
+  function itemToLineRow(item: Recordable) {
+    return {
+      inspectMaintainItemId: item.id,
+      itemCode: item.itemCode,
+      itemName: item.itemName,
+      itemCategory: item.itemCategory,
+      itemType: item.itemType,
+      equipmentPartName: item.equipmentPartName,
+      equipmentSubPartName: item.equipmentSubPartName,
+      inspectMethod: item.inspectMethod,
+      judgmentCriteria: item.judgmentCriteria,
+    };
+  }
+
+  function getExistingItemIds(): Set<string> {
+    const lineRef = lineTableRef.value as any;
+    const tableData = (lineRef?.getTableData?.() || lineDataSource.value || []) as Recordable[];
+    const ids = new Set<string>();
+    for (const r of tableData) {
+      if (r?.inspectMaintainItemId) {
+        ids.add(String(r.inspectMaintainItemId));
+      }
+    }
+    return ids;
+  }
+
+  function openLedgerSelect() {
+    const vals = getFieldsValue();
+    openLedgerModal(true, { equipmentLedgerId: vals.equipmentLedgerId });
+  }
+
+  function clearLedger() {
+    setFieldsValue({ equipmentLedgerId: '', equipmentName: '', equipmentCode: '' });
+  }
+
+  function onLedgerSelect(payload: { equipmentLedgerId?: string; equipmentName?: string; equipmentCode?: string }) {
+    setFieldsValue({
+      equipmentLedgerId: payload.equipmentLedgerId || '',
+      equipmentName: payload.equipmentName || '',
+      equipmentCode: payload.equipmentCode || '',
+    });
+  }
+
+  function openBatchItemSelect() {
+    const configType = getFieldsValue()?.configType;
+    if (!configType) {
+      createMessage.warning('请先选择类型（点检/保养）');
+      return;
+    }
+    openItemModal(true, { itemCategory: configType, multiple: true });
+  }
+
+  function onItemsSelect(payload: Recordable | Recordable[]) {
+    const items = Array.isArray(payload) ? payload : payload ? [payload] : [];
+    if (!items.length) {
+      return;
+    }
+    const existing = getExistingItemIds();
+    const toAdd: Recordable[] = [];
+    const skipped: string[] = [];
+    for (const item of items) {
+      if (!item?.id) {
+        continue;
+      }
+      const id = String(item.id);
+      if (existing.has(id)) {
+        skipped.push(item.itemName || item.itemCode || id);
+        continue;
+      }
+      existing.add(id);
+      toAdd.push(itemToLineRow(item));
+    }
+    if (!toAdd.length) {
+      if (skipped.length) {
+        createMessage.warning('所选项目均已在明细中，未添加新行');
+      }
+      return;
+    }
+    const lineRef = lineTableRef.value as any;
+    if (lineRef?.pushRows) {
+      lineRef.pushRows(toAdd);
+    } else {
+      lineDataSource.value = [...lineDataSource.value, ...toAdd];
+    }
+    if (skipped.length) {
+      createMessage.warning(`已添加 ${toAdd.length} 项，跳过 ${skipped.length} 项重复项目`);
+    }
+  }
+
+  async function handleSubmit() {
+    try {
+      const values = await validate();
+      const lineRef = lineTableRef.value as any;
+      const tableData = (lineRef?.getTableData?.() || []) as Recordable[];
+      const lineList = tableData
+        .filter((r) => r && r.inspectMaintainItemId)
+        .map((r) => ({
+          inspectMaintainItemId: r.inspectMaintainItemId,
+          itemCode: r.itemCode,
+          itemName: r.itemName,
+          itemCategory: r.itemCategory,
+          itemType: r.itemType,
+          equipmentPartName: r.equipmentPartName,
+          equipmentSubPartName: r.equipmentSubPartName,
+          inspectMethod: r.inspectMethod,
+          judgmentCriteria: r.judgmentCriteria,
+        }));
+      if (!lineList.length) {
+        createMessage.warning('请通过「选择点检及保养项目」至少添加一条明细');
+        return;
+      }
+      const ids = new Set<string>();
+      for (const line of lineList) {
+        if (ids.has(line.inspectMaintainItemId)) {
+          createMessage.warning('明细中点检项目不能重复');
+          return;
+        }
+        ids.add(line.inspectMaintainItemId);
+      }
+      setModalProps({ confirmLoading: true });
+      await saveOrUpdate({ ...values, lineList }, unref(isUpdate));
+      closeModal();
+      emit('success');
+    } finally {
+      setModalProps({ confirmLoading: false });
+    }
+  }
+</script>

jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/components/MesXslEquipmentLedgerSelectModal.vue

@@ -0,0 +1,93 @@
+<template>
+  <BasicModal v-bind="$attrs" title="选择设备台账" :width="1000" @register="registerModal" @ok="handleOk">
+    <BasicTable @register="registerTable" />
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+  import { ref } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { BasicTable, useTable } from '/@/components/Table';
+  import { list, queryById } from '/@/views/xslmes/mesXslEquipmentLedger/MesXslEquipmentLedger.api';
+
+  const emit = defineEmits(['register', 'select']);
+
+  const selectedRow = ref<Recordable | null>(null);
+
+  function handleSelectionChange(_keys: string[], rows: Recordable[]) {
+    selectedRow.value = rows?.[0] ?? null;
+  }
+
+  const [registerTable, { reload, getSelectRowKeys, getSelectRows, setSelectedRowKeys, clearSelectedRowKeys }] = useTable({
+    api: list,
+    columns: [
+      { title: '设备名称', dataIndex: 'equipmentName', width: 160 },
+      { title: '设备编号', dataIndex: 'equipmentCode', width: 140 },
+      { title: '设备类别', dataIndex: 'equipmentCategoryName', width: 120 },
+      { title: '设备类型', dataIndex: 'equipmentTypeName', width: 120 },
+    ],
+    rowKey: 'id',
+    useSearchForm: true,
+    formConfig: {
+      labelWidth: 90,
+      schemas: [
+        { label: '设备名称', field: 'equipmentName', component: 'Input', colProps: { span: 8 } },
+        { label: '设备编号', field: 'equipmentCode', component: 'Input', colProps: { span: 8 } },
+      ],
+    },
+    pagination: { pageSize: 10 },
+    canResize: false,
+    showIndexColumn: false,
+    immediate: true,
+    rowSelection: {
+      type: 'radio',
+      columnWidth: 48,
+      onChange: handleSelectionChange,
+    },
+    clickToRowSelect: true,
+  });
+
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    selectedRow.value = null;
+    clearSelectedRowKeys?.();
+    setModalProps({ confirmLoading: false });
+    const lid = data?.equipmentLedgerId as string | undefined;
+    if (lid) {
+      setSelectedRowKeys?.([lid]);
+      try {
+        const raw = await queryById({ id: lid });
+        const row = (raw as any)?.id != null ? raw : (raw as any)?.result;
+        if (row) {
+          selectedRow.value = row;
+        }
+      } catch {
+        // 忽略
+      }
+    }
+    reload();
+  });
+
+  async function handleOk() {
+    const keys = (getSelectRowKeys?.() || []) as string[];
+    let row = selectedRow.value || ((getSelectRows?.() || []) as Recordable[])[0];
+    if (!row && keys.length) {
+      try {
+        const raw = await queryById({ id: keys[0] });
+        row = (raw as any)?.id != null ? raw : (raw as any)?.result;
+      } catch {
+        // 忽略
+      }
+    }
+    if (!row?.id) {
+      emit('select', { equipmentLedgerId: '', equipmentName: '', equipmentCode: '' });
+      closeModal();
+      return;
+    }
+    emit('select', {
+      equipmentLedgerId: row.id,
+      equipmentName: row.equipmentName || '',
+      equipmentCode: row.equipmentCode || '',
+    });
+    closeModal();
+  }
+</script>

jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/components/MesXslInspectMaintainItemSelectModal.vue

@@ -0,0 +1,89 @@
+<template>
+  <BasicModal v-bind="$attrs" :title="modalTitle" :width="1100" @register="registerModal" @ok="handleOk">
+    <BasicTable @register="registerTable" />
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+  import { computed, ref } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { BasicTable, useTable } from '/@/components/Table';
+  import { list } from '/@/views/xslmes/mesXslInspectMaintainItem/MesXslInspectMaintainItem.api';
+
+  const emit = defineEmits(['register', 'select']);
+
+  const multipleMode = ref(true);
+  const filterItemCategory = ref('');
+  const selectedRows = ref<Recordable[]>([]);
+
+  const modalTitle = computed(() => (multipleMode.value ? '选择点检及保养项目（可多选）' : '选择点检及保养项目'));
+
+  function handleSelectionChange(_keys: string[], rows: Recordable[]) {
+    selectedRows.value = rows || [];
+  }
+
+  function fetchItemPage(params: Recordable) {
+    const p = { ...params };
+    if (filterItemCategory.value) {
+      p.itemCategory = filterItemCategory.value;
+    }
+    return list(p);
+  }
+
+  const [registerTable, { reload, getSelectRows, clearSelectedRowKeys }] = useTable({
+    api: fetchItemPage,
+    columns: [
+      { title: '项目编号', dataIndex: 'itemCode', width: 120 },
+      { title: '项目名称', dataIndex: 'itemName', width: 140 },
+      { title: '项目类别', dataIndex: 'itemCategory_dictText', width: 90 },
+      { title: '项目类型', dataIndex: 'itemType_dictText', width: 90 },
+      { title: '设备部位', dataIndex: 'equipmentPartName', width: 110 },
+      { title: '设备小部位', dataIndex: 'equipmentSubPartName', width: 110 },
+      { title: '点检方式', dataIndex: 'inspectMethod_dictText', width: 90 },
+      { title: '判断基准', dataIndex: 'judgmentCriteria', width: 160, ellipsis: true },
+    ],
+    rowKey: 'id',
+    useSearchForm: true,
+    formConfig: {
+      labelWidth: 90,
+      schemas: [
+        { label: '项目编号', field: 'itemCode', component: 'Input', colProps: { span: 8 } },
+        { label: '项目名称', field: 'itemName', component: 'Input', colProps: { span: 8 } },
+      ],
+    },
+    pagination: { pageSize: 10 },
+    canResize: false,
+    showIndexColumn: false,
+    immediate: true,
+    rowSelection: {
+      type: 'checkbox',
+      columnWidth: 48,
+      onChange: handleSelectionChange,
+    },
+    clickToRowSelect: true,
+  });
+
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    multipleMode.value = data?.multiple !== false;
+    filterItemCategory.value = data?.itemCategory ? String(data.itemCategory) : '';
+    selectedRows.value = [];
+    clearSelectedRowKeys?.();
+    setModalProps({ confirmLoading: false });
+    reload();
+  });
+
+  async function handleOk() {
+    let rows = selectedRows.value?.length ? [...selectedRows.value] : ((getSelectRows?.() || []) as Recordable[]);
+    const valid = rows.filter((r) => r?.id && (r.itemCode != null || r.itemName != null));
+    if (!valid.length) {
+      closeModal();
+      return;
+    }
+    if (multipleMode.value) {
+      emit('select', valid);
+    } else {
+      emit('select', valid[0]);
+    }
+    closeModal();
+  }
+</script>

jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/MesXslEquipInspectRecord.api.ts

@@ -0,0 +1,65 @@
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from '/@/hooks/web/useMessage';
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/xslmes/mesXslEquipInspectRecord/list',
+  save = '/xslmes/mesXslEquipInspectRecord/add',
+  edit = '/xslmes/mesXslEquipInspectRecord/edit',
+  deleteOne = '/xslmes/mesXslEquipInspectRecord/delete',
+  deleteBatch = '/xslmes/mesXslEquipInspectRecord/deleteBatch',
+  importExcel = '/xslmes/mesXslEquipInspectRecord/importExcel',
+  exportXls = '/xslmes/mesXslEquipInspectRecord/exportXls',
+  queryById = '/xslmes/mesXslEquipInspectRecord/queryById',
+  queryLineList = '/xslmes/mesXslEquipInspectRecord/queryLineListByRecordId',
+  generateRecordNo = '/xslmes/mesXslEquipInspectRecord/generateRecordNo',
+  loadLinesByEquipment = '/xslmes/mesXslEquipInspectRecord/loadLinesByEquipment',
+  batchCreateFromEquipment = '/xslmes/mesXslEquipInspectRecord/batchCreateFromEquipment',
+  handleFail = '/xslmes/mesXslEquipInspectRecord/handleFail',
+}
+
+export const getExportUrl = Api.exportXls;
+export const getImportUrl = Api.importExcel;
+
+export const list = (params) => defHttp.get({ url: Api.list, params });
+
+export const queryById = (params: { id: string }) => defHttp.get({ url: Api.queryById, params });
+
+export const queryLineListByRecordId = (params: { id: string }) => defHttp.get({ url: Api.queryLineList, params });
+
+export const generateRecordNo = () => defHttp.get({ url: Api.generateRecordNo });
+
+export const loadLinesByEquipment = (params: { equipmentLedgerId: string; recordType: string }) =>
+  defHttp.get({ url: Api.loadLinesByEquipment, params });
+
+export const batchCreateFromEquipment = (params: { equipmentLedgerIds: string[]; recordType: string }) =>
+  defHttp.post({ url: Api.batchCreateFromEquipment, params });
+
+export const deleteOne = (params, handleSuccess) => {
+  return defHttp.delete({ url: Api.deleteOne, params }, { joinParamsToUrl: true }).then(() => {
+    handleSuccess();
+  });
+};
+
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({ url: Api.deleteBatch, data: params }, { joinParamsToUrl: true }).then(() => {
+        handleSuccess();
+      });
+    },
+  });
+};
+
+export const saveOrUpdate = (params, isUpdate) => {
+  const url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({ url, params });
+};
+
+export const handleFailRecord = (params: Recordable) => defHttp.post({ url: Api.handleFail, params });

jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/MesXslEquipInspectRecord.data.ts

@@ -0,0 +1,222 @@
+import { BasicColumn, FormSchema } from '/@/components/Table';
+import { JVxeColumn, JVxeTypes } from '/@/components/jeecg/JVxeTable/types';
+import { uploadUrl } from '/@/api/common/api';
+
+export const columns: BasicColumn[] = [
+  { title: '记录编号', align: 'center', dataIndex: 'recordNo', width: 150 },
+  { title: '计划单号', align: 'center', dataIndex: 'planNo', width: 130 },
+  { title: '设备名称', align: 'center', dataIndex: 'equipmentName', width: 150 },
+  { title: '设备编码', align: 'center', dataIndex: 'equipmentCode', width: 130 },
+  { title: '类型', align: 'center', dataIndex: 'recordType_dictText', width: 80 },
+  { title: '点检日期', align: 'center', dataIndex: 'inspectDate', width: 110 },
+  { title: '点检人', align: 'center', dataIndex: 'inspectorRealname', width: 100 },
+  { title: '点检结果', align: 'center', dataIndex: 'inspectResult_dictText', width: 90 },
+  { title: '是否已处理', align: 'center', dataIndex: 'handledFlag_dictText', width: 90 },
+  { title: '状态', align: 'center', dataIndex: 'recordStatus_dictText', width: 90 },
+  {
+    title: '创建时间',
+    align: 'center',
+    dataIndex: 'createTime',
+    width: 165,
+    customRender: ({ text }) => (!text ? '' : String(text).length > 19 ? String(text).substring(0, 19) : text),
+  },
+];
+
+export const searchFormSchema: FormSchema[] = [
+  { label: '记录编号', field: 'recordNo', component: 'Input', colProps: { span: 6 } },
+  { label: '计划单号', field: 'planNo', component: 'Input', colProps: { span: 6 } },
+  { label: '设备名称', field: 'equipmentName', component: 'Input', colProps: { span: 6 } },
+  {
+    label: '类型',
+    field: 'recordType',
+    component: 'JDictSelectTag',
+    componentProps: { dictCode: 'xslmes_im_item_category' },
+    colProps: { span: 6 },
+  },
+  {
+    label: '状态',
+    field: 'recordStatus',
+    component: 'JDictSelectTag',
+    componentProps: { dictCode: 'xslmes_im_record_status' },
+    colProps: { span: 6 },
+  },
+];
+
+export const formSchema: FormSchema[] = [
+  { label: '', field: 'id', component: 'Input', show: false },
+  { label: '', field: 'equipmentLedgerId', component: 'Input', show: false },
+  { label: '', field: 'planId', component: 'Input', show: false },
+  { label: '', field: 'equipInspectConfigId', component: 'Input', show: false },
+  { label: '', field: 'inspectorUserId', component: 'Input', show: false },
+  { label: '', field: 'inspectorUsername', component: 'Input', show: false },
+  {
+    label: '记录编号',
+    field: 'recordNo',
+    component: 'Input',
+    componentProps: { readonly: true, placeholder: '保存时自动生成' },
+    dynamicRules: () => [{ required: true, message: '记录编号不能为空' }],
+  },
+  { label: '计划单号', field: 'planNo', component: 'Input' },
+  {
+    label: '设备名称',
+    field: 'equipmentName',
+    component: 'Input',
+    componentProps: { readonly: true },
+  },
+  {
+    label: '设备编码',
+    field: 'equipmentCode',
+    component: 'Input',
+    componentProps: { readonly: true },
+  },
+  {
+    label: '类型',
+    field: 'recordType',
+    component: 'JDictSelectTag',
+    componentProps: { dictCode: 'xslmes_im_item_category', disabled: true },
+  },
+  {
+    label: '点检日期',
+    field: 'inspectDate',
+    component: 'DatePicker',
+    required: true,
+    componentProps: { valueFormat: 'YYYY-MM-DD', style: { width: '100%' } },
+  },
+  {
+    label: '点检人',
+    field: 'inspectorRealname',
+    component: 'Input',
+    componentProps: { readonly: true, placeholder: '当前登录用户' },
+    dynamicRules: () => [{ required: true, message: '点检人不能为空' }],
+  },
+  {
+    label: '点检结果',
+    field: 'inspectResult',
+    component: 'JDictSelectTag',
+    required: true,
+    componentProps: { dictCode: 'xslmes_im_inspect_result', placeholder: '合格/不合格' },
+  },
+  {
+    label: '状态',
+    field: 'recordStatus',
+    component: 'JDictSelectTag',
+    componentProps: { dictCode: 'xslmes_im_record_status', disabled: true },
+  },
+];
+
+/** 详情页：仅不合格记录展示的处理信息（只读） */
+export const processDisplayFormSchema: FormSchema[] = [
+  {
+    label: '是否已处理',
+    field: 'handledFlag',
+    component: 'JDictSelectTag',
+    componentProps: { dictCode: 'yn', disabled: true },
+  },
+  {
+    label: '处理人',
+    field: 'handlerRealname',
+    component: 'Input',
+    componentProps: { readonly: true },
+  },
+  {
+    label: '处理时间',
+    field: 'handleTime',
+    component: 'DatePicker',
+    componentProps: {
+      showTime: true,
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      style: { width: '100%' },
+      disabled: true,
+    },
+  },
+];
+
+/** 不合格记录处理弹窗 */
+export const handleFormSchema: FormSchema[] = [
+  { label: '', field: 'id', component: 'Input', show: false },
+  { label: '', field: 'handlerUsername', component: 'Input', show: false },
+  { label: '', field: 'handlerRealname', component: 'Input', show: false },
+  {
+    label: '处理人',
+    field: 'handlerUserId',
+    component: 'JSelectUser',
+    required: true,
+    componentProps: ({ formActionType }) => ({
+      rowKey: 'id',
+      labelKey: 'realname',
+      isRadioSelection: true,
+      maxSelectCount: 1,
+      onOptionsChange: (options) => {
+        const row = options?.[0];
+        if (row && formActionType) {
+          formActionType.setFieldsValue({
+            handlerUsername: row.username,
+            handlerRealname: row.realname,
+          });
+        }
+      },
+    }),
+  },
+  {
+    label: '处理时间',
+    field: 'handleTime',
+    component: 'DatePicker',
+    required: true,
+    componentProps: {
+      showTime: true,
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      style: { width: '100%' },
+    },
+  },
+];
+
+export const lineJVxeColumns: JVxeColumn[] = [
+  { title: '', key: 'equipInspectConfigLineId', type: JVxeTypes.hidden },
+  { title: '', key: 'inspectMaintainItemId', type: JVxeTypes.hidden },
+  { title: '点检项目编号', key: 'itemCode', type: JVxeTypes.normal, width: 120, disabled: true },
+  { title: '点检项目', key: 'itemName', type: JVxeTypes.normal, width: 130, disabled: true },
+  {
+    title: '项目类别',
+    key: 'itemCategory',
+    type: JVxeTypes.select,
+    width: 90,
+    disabled: true,
+    dictCode: 'xslmes_im_item_category',
+    filters: false,
+    sortable: false,
+  },
+  {
+    title: '项目类型',
+    key: 'itemType',
+    type: JVxeTypes.select,
+    width: 90,
+    disabled: true,
+    dictCode: 'xslmes_im_item_type',
+    filters: false,
+    sortable: false,
+  },
+  { title: '设备部位', key: 'equipmentPartName', type: JVxeTypes.normal, width: 100, disabled: true },
+  { title: '设备小部位', key: 'equipmentSubPartName', type: JVxeTypes.normal, width: 100, disabled: true },
+  {
+    title: '点检方式',
+    key: 'inspectMethod',
+    type: JVxeTypes.select,
+    width: 90,
+    disabled: true,
+    dictCode: 'xslmes_im_inspect_method',
+    filters: false,
+    sortable: false,
+  },
+  { title: '判断基准', key: 'judgmentCriteria', type: JVxeTypes.normal, width: 150, disabled: true },
+  { title: '点检描述', key: 'lineInspectResult', type: JVxeTypes.input, width: 140 },
+  {
+    title: '图片',
+    key: 'pictureFiles',
+    type: JVxeTypes.image,
+    width: 160,
+    maxCount: 3,
+    token: true,
+    action: uploadUrl,
+    responseName: 'message',
+  },
+];

jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/MesXslEquipInspectRecordList.vue

@@ -0,0 +1,153 @@
+<template>
+  <div>
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <template #tableTitle>
+        <a-button
+          type="primary"
+          v-auth="'mes:mes_xsl_equip_inspect_record:exportXls'"
+          preIcon="ant-design:export-outlined"
+          @click="onExportXls"
+        >
+          导出
+        </a-button>
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <template #overlay>
+            <a-menu>
+              <a-menu-item key="1" @click="batchHandleDelete">
+                <Icon icon="ant-design:delete-outlined" />
+                删除
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button v-auth="'mes:mes_xsl_equip_inspect_record:deleteBatch'">
+            批量操作
+            <Icon icon="mdi:chevron-down" />
+          </a-button>
+        </a-dropdown>
+      </template>
+      <template #action="{ record }">
+        <TableAction :actions="getTableActions(record)" :dropDownActions="getDropDownAction(record)" />
+      </template>
+    </BasicTable>
+    <MesXslEquipInspectRecordModal @register="registerModal" @success="handleSuccess" />
+    <MesXslEquipInspectRecordHandleModal @register="registerHandleModal" @success="handleSuccess" />
+  </div>
+</template>
+
+<script lang="ts" name="xslmes-mesXslEquipInspectRecord" setup>
+  import { BasicTable, TableAction } from '/@/components/Table';
+  import { useModal } from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import Icon from '/@/components/Icon';
+  import MesXslEquipInspectRecordModal from './components/MesXslEquipInspectRecordModal.vue';
+  import MesXslEquipInspectRecordHandleModal from './components/MesXslEquipInspectRecordHandleModal.vue';
+  import { columns, searchFormSchema } from './MesXslEquipInspectRecord.data';
+  import { list, deleteOne, batchDelete, getExportUrl } from './MesXslEquipInspectRecord.api';
+
+  const { createMessage } = useMessage();
+
+  const [registerModal, { openModal }] = useModal();
+  const [registerHandleModal, { openModal: openHandleModal }] = useModal();
+
+  const { tableContext, onExportXls } = useListPage({
+    tableProps: {
+      title: '点检保养记录',
+      api: list,
+      columns,
+      canResize: true,
+      formConfig: {
+        schemas: searchFormSchema,
+        labelWidth: 100,
+        autoSubmitOnEnter: true,
+        showAdvancedButton: true,
+      },
+      actionColumn: {
+        width: 240,
+        fixed: 'right',
+      },
+    },
+    exportConfig: {
+      name: '点检保养记录',
+      url: getExportUrl,
+    },
+  });
+
+  const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
+
+  function handleEnterResult(record: Recordable) {
+    if (record.recordStatus !== 'pending') {
+      createMessage.warning('仅待点检记录可录入点检结果');
+      return;
+    }
+    openModal(true, { record, showFooter: true });
+  }
+
+  function handleDetail(record: Recordable) {
+    openModal(true, { record, showFooter: false });
+  }
+
+  function canHandleFail(record: Recordable) {
+    return (
+      record.inspectResult === 'fail' &&
+      record.recordStatus === 'done' &&
+      record.handledFlag !== '1'
+    );
+  }
+
+  function handleProcess(record: Recordable) {
+    if (!canHandleFail(record)) {
+      createMessage.warning('仅未处理的不合格记录可登记处理');
+      return;
+    }
+    openHandleModal(true, { record });
+  }
+
+  function getTableActions(record: Recordable) {
+    if (record.recordStatus === 'pending') {
+      return [
+        {
+          label: '录入点检结果',
+          onClick: handleEnterResult.bind(null, record),
+          auth: 'mes:mes_xsl_equip_inspect_record:edit',
+        },
+      ];
+    }
+    const actions: Recordable[] = [{ label: '详情', onClick: handleDetail.bind(null, record) }];
+    if (canHandleFail(record)) {
+      actions.push({
+        label: '处理',
+        onClick: handleProcess.bind(null, record),
+        auth: 'mes:mes_xsl_equip_inspect_record:edit',
+      });
+    }
+    return actions;
+  }
+
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
+
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
+
+  function handleSuccess() {
+    selectedRowKeys.value = [];
+    reload();
+  }
+
+  function getDropDownAction(record: Recordable) {
+    if (record.recordStatus === 'pending') {
+      return [
+        { label: '详情', onClick: handleDetail.bind(null, record) },
+        {
+          label: '删除',
+          popConfirm: { title: '是否确认删除', confirm: handleDelete.bind(null, record) },
+          auth: 'mes:mes_xsl_equip_inspect_record:delete',
+        },
+      ];
+    }
+    return [];
+  }
+</script>

jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/components/MesXslEquipInspectRecordHandleModal.vue

@@ -0,0 +1,63 @@
+<template>
+  <BasicModal v-bind="$attrs" destroyOnClose title="不合格记录处理" width="520px" @register="registerModal" @ok="handleSubmit">
+    <BasicForm @register="registerForm" />
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+  import dayjs from 'dayjs';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { BasicForm, useForm } from '/@/components/Form/index';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { useUserStore } from '/@/store/modules/user';
+  import { handleFormSchema } from '../MesXslEquipInspectRecord.data';
+  import { handleFailRecord } from '../MesXslEquipInspectRecord.api';
+
+  const emit = defineEmits(['register', 'success']);
+  const { createMessage } = useMessage();
+  const userStore = useUserStore();
+
+  const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
+    labelWidth: 100,
+    schemas: handleFormSchema,
+    showActionButtonGroup: false,
+    baseColProps: { span: 24 },
+  });
+
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    await resetFields();
+    setModalProps({ confirmLoading: false });
+    const record = data?.record;
+    if (!record?.id) {
+      return;
+    }
+    const user = userStore.getUserInfo || {};
+    await setFieldsValue({
+      id: record.id,
+      handlerUserId: user.id,
+      handlerUsername: user.username,
+      handlerRealname: user.realname,
+      handleTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    });
+  });
+
+  async function handleSubmit() {
+    try {
+      const values = await validate();
+      if (!values.handlerUserId) {
+        createMessage.warning('请选择处理人');
+        return;
+      }
+      if (!values.handleTime) {
+        createMessage.warning('请选择处理时间');
+        return;
+      }
+      setModalProps({ confirmLoading: true });
+      await handleFailRecord(values);
+      closeModal();
+      emit('success');
+    } finally {
+      setModalProps({ confirmLoading: false });
+    }
+  }
+</script>

jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/components/MesXslEquipInspectRecordModal.vue

@@ -0,0 +1,173 @@
+<template>
+  <BasicModal
+    v-bind="$attrs"
+    destroyOnClose
+    :title="title"
+    width="1150px"
+    @register="registerModal"
+    @ok="handleSubmit"
+  >
+    <BasicForm @register="registerForm" />
+    <a-divider orientation="left">点检项目明细（来自设备点检配置，只读）</a-divider>
+    <JVxeTable
+      v-if="tableReady"
+      ref="lineTableRef"
+      row-number
+      keep-source
+      :insert-row="false"
+      :toolbar="false"
+      :row-selection="false"
+      :max-height="400"
+      :loading="lineLoading"
+      :columns="lineColumns"
+      :dataSource="lineDataSource"
+    />
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+  import { computed, ref, unref } from 'vue';
+  import dayjs from 'dayjs';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { BasicForm, useForm } from '/@/components/Form/index';
+  import type { JVxeColumn, JVxeTableInstance } from '/@/components/jeecg/JVxeTable/types';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { useUserStore } from '/@/store/modules/user';
+  import { formSchema, lineJVxeColumns, processDisplayFormSchema } from '../MesXslEquipInspectRecord.data';
+  import { saveOrUpdate, queryById, queryLineListByRecordId } from '../MesXslEquipInspectRecord.api';
+
+  const emit = defineEmits(['register', 'success']);
+  const { createMessage } = useMessage();
+  const userStore = useUserStore();
+  const isDetail = ref(false);
+  const showFooterFlag = ref(true);
+  const tableReady = ref(false);
+  const lineLoading = ref(false);
+  const lineDataSource = ref<Recordable[]>([]);
+  const lineTableRef = ref<JVxeTableInstance>();
+
+  const lineColumns = computed<JVxeColumn[]>(() =>
+    lineJVxeColumns.map((col) => {
+      const editable = col.key === 'lineInspectResult' || col.key === 'pictureFiles';
+      if (editable) {
+        return { ...col, disabled: !showFooterFlag.value };
+      }
+      return { ...col, disabled: true };
+    }),
+  );
+
+  const showProcessFields = ref(false);
+
+  const [registerForm, { resetFields, setFieldsValue, validate, setProps, resetSchema }] = useForm({
+    labelWidth: 110,
+    schemas: formSchema,
+    showActionButtonGroup: false,
+    baseColProps: { span: 12 },
+  });
+
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    tableReady.value = false;
+    lineDataSource.value = [];
+    await resetFields();
+    const editable = !!data?.showFooter;
+    setModalProps({ confirmLoading: false, showCancelBtn: editable, showOkBtn: editable });
+    isDetail.value = !editable;
+    showFooterFlag.value = editable;
+    setProps({ disabled: !editable });
+    showProcessFields.value = false;
+    await resetSchema(formSchema);
+
+    if (data?.record?.id) {
+      lineLoading.value = true;
+      try {
+        const mainRaw = await queryById({ id: data.record.id });
+        const m = (mainRaw as any)?.id != null ? mainRaw : (mainRaw as any)?.result ?? mainRaw;
+        if (editable && m.recordStatus !== 'pending') {
+          createMessage.warning('仅待点检记录可录入点检结果');
+          setModalProps({ showOkBtn: false, showCancelBtn: true });
+          isDetail.value = true;
+          showFooterFlag.value = false;
+          setProps({ disabled: true });
+        }
+        const linesRaw = await queryLineListByRecordId({ id: data.record.id });
+        const list = Array.isArray(linesRaw) ? linesRaw : (linesRaw as any)?.result ?? [];
+        const user = userStore.getUserInfo || {};
+        const patch: Recordable = { ...m };
+        if (editable && showFooterFlag.value) {
+          if (!patch.inspectDate) {
+            patch.inspectDate = dayjs().format('YYYY-MM-DD');
+          }
+          if (!patch.inspectorRealname) {
+            patch.inspectorUserId = user.id;
+            patch.inspectorUsername = user.username;
+            patch.inspectorRealname = user.realname;
+          }
+        }
+        await setFieldsValue(patch);
+        if (!editable && m.inspectResult === 'fail') {
+          showProcessFields.value = true;
+          await resetSchema([...formSchema, ...processDisplayFormSchema]);
+          await setFieldsValue(patch);
+        }
+        lineDataSource.value = [...(list || [])];
+      } finally {
+        lineLoading.value = false;
+      }
+    }
+    tableReady.value = true;
+  });
+
+  const title = computed(() =>
+    unref(isDetail) ? '点检保养记录详情' : '录入点检结果',
+  );
+
+  async function handleSubmit() {
+    if (!showFooterFlag.value) {
+      return;
+    }
+    try {
+      const values = await validate();
+      const lineRef = lineTableRef.value as any;
+      const tableData = (lineRef?.getTableData?.() || lineDataSource.value || []) as Recordable[];
+      const lineList = tableData
+        .filter((r) => r && r.equipInspectConfigLineId)
+        .map((r) => ({
+          id: r.id,
+          equipInspectConfigLineId: r.equipInspectConfigLineId,
+          inspectMaintainItemId: r.inspectMaintainItemId,
+          itemCode: r.itemCode,
+          itemName: r.itemName,
+          itemCategory: r.itemCategory,
+          itemType: r.itemType,
+          equipmentPartName: r.equipmentPartName,
+          equipmentSubPartName: r.equipmentSubPartName,
+          inspectMethod: r.inspectMethod,
+          judgmentCriteria: r.judgmentCriteria,
+          lineInspectResult: r.lineInspectResult,
+          pictureFiles: r.pictureFiles,
+        }));
+      if (!lineList.length) {
+        createMessage.warning('点检明细不能为空');
+        return;
+      }
+      if (!values.inspectResult) {
+        createMessage.warning('请选择点检结果');
+        return;
+      }
+      if (!values.inspectDate) {
+        createMessage.warning('请选择点检日期');
+        return;
+      }
+      if (!values.inspectorRealname) {
+        createMessage.warning('点检人不能为空');
+        return;
+      }
+      setModalProps({ confirmLoading: true });
+      await saveOrUpdate({ ...values, recordStatus: 'done', lineList }, true);
+      closeModal();
+      emit('success');
+    } finally {
+      setModalProps({ confirmLoading: false });
+    }
+  }
+</script>

jeecgboot-vue3/src/views/xslmes/mesXslEquipmentLedger/MesXslEquipmentLedger.api.ts

@@ -0,0 +1,31 @@
+import { defHttp } from '/@/utils/http/axios';
+
+enum Api {
+  list = '/xslmes/mesXslEquipmentLedger/list',
+  checkEquipmentCode = '/xslmes/mesXslEquipmentLedger/checkEquipmentCode',
+  checkEquipmentName = '/xslmes/mesXslEquipmentLedger/checkEquipmentName',
+  save = '/xslmes/mesXslEquipmentLedger/add',
+  edit = '/xslmes/mesXslEquipmentLedger/edit',
+  deleteOne = '/xslmes/mesXslEquipmentLedger/delete',
+  deleteBatch = '/xslmes/mesXslEquipmentLedger/deleteBatch',
+  importExcel = '/xslmes/mesXslEquipmentLedger/importExcel',
+  exportXls = '/xslmes/mesXslEquipmentLedger/exportXls',
+  queryById = '/xslmes/mesXslEquipmentLedger/queryById',
+}
+
+export const list = (params) => defHttp.get({ url: Api.list, params });
+
+export const checkEquipmentCode = (params: { equipmentCode: string; dataId?: string }) =>
+  defHttp.get({ url: Api.checkEquipmentCode, params }, { successMessageMode: 'none', errorMessageMode: 'none' });
+
+export const checkEquipmentName = (params: { equipmentName: string; dataId?: string }) =>
+  defHttp.get({ url: Api.checkEquipmentName, params }, { successMessageMode: 'none', errorMessageMode: 'none' });
+export const deleteOne = (params, handleSuccess) => defHttp.delete({ url: Api.deleteOne, params }, { joinParamsToUrl: true }).then(() => handleSuccess());
+export const batchDelete = (params, handleSuccess) => defHttp.delete({ url: Api.deleteBatch, params }, { joinParamsToUrl: true }).then(() => handleSuccess());
+export const saveOrUpdate = (params, isUpdate) => {
+  const url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({ url, params });
+};
+export const queryById = (params) => defHttp.get({ url: Api.queryById, params });
+export const getExportUrl = Api.exportXls;
+export const getImportUrl = Api.importExcel;

jeecgboot-vue3/src/views/xslmes/mesXslEquipmentLedger/MesXslEquipmentLedger.data.ts

@@ -0,0 +1,199 @@
+import { BasicColumn, FormSchema } from '/@/components/Table';
+import { checkEquipmentCode, checkEquipmentName } from './MesXslEquipmentLedger.api';
+
+const colHalf = { span: 12 };
+
+export const columns: BasicColumn[] = [
+  { title: '设备编号', align: 'center', dataIndex: 'equipmentCode', width: 130 },
+  { title: '设备名称', align: 'center', dataIndex: 'equipmentName', width: 160 },
+  { title: '工序', align: 'center', dataIndex: 'processOperationName', width: 120 },
+  { title: '设备类别', align: 'center', dataIndex: 'equipmentCategoryName', width: 110 },
+  { title: '设备类型', align: 'center', dataIndex: 'equipmentTypeName', width: 110 },
+  { title: '设备厂家', align: 'center', dataIndex: 'manufacturerName', width: 120 },
+  { title: '所属工厂', align: 'center', dataIndex: 'factoryName', width: 120 },
+  { title: '设备状态', align: 'center', dataIndex: 'equipmentStatus_dictText', width: 90 },
+  { title: '是否启用', align: 'center', dataIndex: 'enabledFlag_dictText', width: 90 },
+  { title: '设备型号', align: 'center', dataIndex: 'equipmentModel', width: 110, defaultHidden: true },
+  { title: '创建时间', align: 'center', dataIndex: 'createTime', width: 165, defaultHidden: true },
+];
+
+export const searchFormSchema: FormSchema[] = [
+  { label: '设备编号', field: 'equipmentCode', component: 'Input', colProps: { span: 6 } },
+  { label: '设备名称', field: 'equipmentName', component: 'Input', colProps: { span: 6 } },
+  { label: '工序名称', field: 'processOperationName', component: 'Input', colProps: { span: 6 } },
+  {
+    label: '设备状态',
+    field: 'equipmentStatus',
+    component: 'JDictSelectTag',
+    componentProps: { dictCode: 'xslmes_equipment_ledger_status' },
+    colProps: { span: 6 },
+  },
+  {
+    label: '是否启用',
+    field: 'enabledFlag',
+    component: 'JDictSelectTag',
+    componentProps: { dictCode: 'yn' },
+    colProps: { span: 6 },
+  },
+];
+
+export const formSchema: FormSchema[] = [
+  { label: '', field: 'id', component: 'Input', show: false },
+  { label: '', field: 'processOperationId', component: 'Input', show: false },
+  { label: '', field: 'manufacturerId', component: 'Input', show: false },
+  { label: '', field: 'equipmentCategoryId', component: 'Input', show: false },
+  { label: '', field: 'equipmentTypeId', component: 'Input', show: false },
+  { label: '', field: 'factoryId', component: 'Input', show: false },
+  {
+    label: '所属工序',
+    field: 'processOperationName',
+    component: 'Input',
+    slot: 'processOperationPicker',
+    colProps: colHalf,
+    dynamicRules: () => [{ required: true, message: '请选择所属工序' }],
+  },
+  {
+    label: '设备编号',
+    field: 'equipmentCode',
+    component: 'Input',
+    colProps: colHalf,
+    componentProps: { placeholder: '同租户内不可重复' },
+    dynamicRules: ({ model }) => [
+      { required: true, message: '请输入设备编号' },
+      {
+        validator: async (_rule, value) => {
+          const v = value == null ? '' : String(value).trim();
+          if (!v) return Promise.resolve();
+          try {
+            await checkEquipmentCode({ equipmentCode: v, dataId: model?.id });
+            return Promise.resolve();
+          } catch (e: any) {
+            return Promise.reject(e?.response?.data?.message || e?.message || '设备编号不能重复');
+          }
+        },
+        trigger: 'blur',
+      },
+    ],
+  },
+  {
+    label: '设备名称',
+    field: 'equipmentName',
+    component: 'Input',
+    colProps: colHalf,
+    componentProps: { placeholder: '同租户内不可重复' },
+    dynamicRules: ({ model }) => [
+      { required: true, message: '请输入设备名称' },
+      {
+        validator: async (_rule, value) => {
+          const v = value == null ? '' : String(value).trim();
+          if (!v) return Promise.resolve();
+          try {
+            await checkEquipmentName({ equipmentName: v, dataId: model?.id });
+            return Promise.resolve();
+          } catch (e: any) {
+            return Promise.reject(e?.response?.data?.message || e?.message || '设备名称不能重复');
+          }
+        },
+        trigger: 'blur',
+      },
+    ],
+  },
+  {
+    label: '所属设备厂家',
+    field: 'manufacturerName',
+    component: 'Input',
+    slot: 'manufacturerPicker',
+    colProps: colHalf,
+  },
+  {
+    label: '设备类别',
+    field: 'equipmentCategoryName',
+    component: 'Input',
+    slot: 'equipmentCategoryPicker',
+    colProps: colHalf,
+  },
+  {
+    label: '设备类型',
+    field: 'equipmentTypeName',
+    component: 'Input',
+    slot: 'equipmentTypePicker',
+    colProps: colHalf,
+  },
+  {
+    label: '所属工厂',
+    field: 'factoryName',
+    component: 'Input',
+    slot: 'factoryPicker',
+    colProps: colHalf,
+  },
+  { label: '设备型号', field: 'equipmentModel', component: 'Input', colProps: colHalf },
+  {
+    label: '设备状态',
+    field: 'equipmentStatus',
+    component: 'JDictSelectTag',
+    defaultValue: '0',
+    componentProps: { dictCode: 'xslmes_equipment_ledger_status' },
+    colProps: colHalf,
+    required: true,
+  },
+  { label: '序列号', field: 'serialNo', component: 'Input', colProps: colHalf },
+  { label: '铭牌', field: 'nameplate', component: 'Input', colProps: colHalf },
+  {
+    label: '维修部门',
+    field: 'maintainDeptId',
+    component: 'JSelectDept',
+    componentProps: { checkStrictly: true, multiple: false },
+    colProps: colHalf,
+  },
+  { label: '维修人员', field: 'maintainPerson', component: 'Input', colProps: colHalf },
+  {
+    label: '主管部门',
+    field: 'manageDeptId',
+    component: 'JSelectDept',
+    componentProps: { checkStrictly: true, multiple: false },
+    colProps: colHalf,
+  },
+  { label: '资料文件编号', field: 'docFileNo', component: 'Input', colProps: colHalf },
+  {
+    label: '生产日期',
+    field: 'productionDate',
+    component: 'DatePicker',
+    componentProps: { valueFormat: 'YYYY-MM-DD', style: { width: '100%' } },
+    colProps: colHalf,
+  },
+  {
+    label: '购买日期',
+    field: 'purchaseDate',
+    component: 'DatePicker',
+    componentProps: { valueFormat: 'YYYY-MM-DD', style: { width: '100%' } },
+    colProps: colHalf,
+  },
+  {
+    label: '使用日期',
+    field: 'useDate',
+    component: 'DatePicker',
+    componentProps: { valueFormat: 'YYYY-MM-DD', style: { width: '100%' } },
+    colProps: colHalf,
+  },
+  { label: '厂商联系人', field: 'vendorContact', component: 'Input', colProps: colHalf },
+  { label: '价值', field: 'assetValue', component: 'Input', colProps: colHalf },
+  { label: '受控PDA', field: 'controlledPda', component: 'Input', colProps: colHalf },
+  { label: '超产比率', field: 'overproductionRatio', component: 'Input', colProps: colHalf },
+  { label: '有效体积', field: 'effectiveVolume', component: 'Input', colProps: colHalf },
+  {
+    label: '是否启用',
+    field: 'enabledFlag',
+    component: 'JDictSelectTag',
+    defaultValue: '1',
+    componentProps: { dictCode: 'yn' },
+    colProps: colHalf,
+    required: true,
+  },
+  {
+    label: '设备描述',
+    field: 'equipmentDesc',
+    component: 'InputTextArea',
+    componentProps: { rows: 3 },
+    colProps: { span: 24 },
+  },
+];

jeecgboot-vue3/src/views/xslmes/mesXslEquipmentLedger/MesXslEquipmentLedgerList.vue

@@ -0,0 +1,189 @@
+<template>
+  <div>
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <template #tableTitle>
+        <a-button type="primary" v-auth="'mes:mes_xsl_equipment_ledger:add'" @click="handleAdd" preIcon="ant-design:plus-outlined">
+          新增
+        </a-button>
+        <a-button
+          type="primary"
+          v-auth="'mes:mes_xsl_equip_inspect_record:add'"
+          :disabled="selectedRowKeys.length === 0"
+          preIcon="ant-design:audit-outlined"
+          @click="handleBatchCreateRecord('inspect')"
+        >
+          点检
+        </a-button>
+        <a-button
+          type="primary"
+          v-auth="'mes:mes_xsl_equip_inspect_record:add'"
+          :disabled="selectedRowKeys.length === 0"
+          preIcon="ant-design:tool-outlined"
+          @click="handleBatchCreateRecord('maintain')"
+        >
+          保养
+        </a-button>
+        <a-button
+          type="primary"
+          v-auth="'mes:mes_xsl_equipment_ledger:exportXls'"
+          preIcon="ant-design:export-outlined"
+          @click="onExportXls"
+        >
+          导出
+        </a-button>
+        <j-upload-button
+          type="primary"
+          v-auth="'mes:mes_xsl_equipment_ledger:importExcel'"
+          preIcon="ant-design:import-outlined"
+          @click="onImportXls"
+        >
+          导入
+        </j-upload-button>
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <template #overlay>
+            <a-menu>
+              <a-menu-item key="1" @click="batchHandleDelete">
+                <Icon icon="ant-design:delete-outlined" />
+                删除
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button v-auth="'mes:mes_xsl_equipment_ledger:deleteBatch'">
+            批量操作
+            <Icon icon="mdi:chevron-down" />
+          </a-button>
+        </a-dropdown>
+      </template>
+      <template #action="{ record }">
+        <TableAction
+          :actions="[
+            { label: '编辑', onClick: handleEdit.bind(null, record), auth: 'mes:mes_xsl_equipment_ledger:edit' },
+          ]"
+          :dropDownActions="getDropDownAction(record)"
+        />
+      </template>
+    </BasicTable>
+    <MesXslEquipmentLedgerModal @register="registerModal" @success="handleSuccess" />
+  </div>
+</template>
+
+<script lang="ts" name="xslmes-mesXslEquipmentLedger" setup>
+  import { BasicTable, TableAction } from '/@/components/Table';
+  import { useModal } from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import Icon from '/@/components/Icon';
+  import MesXslEquipmentLedgerModal from './components/MesXslEquipmentLedgerModal.vue';
+  import { columns, searchFormSchema } from './MesXslEquipmentLedger.data';
+  import { list, deleteOne, batchDelete, getExportUrl, getImportUrl } from './MesXslEquipmentLedger.api';
+  import { batchCreateFromEquipment } from '../mesXslEquipInspectRecord/MesXslEquipInspectRecord.api';
+
+  const { createMessage, createConfirm } = useMessage();
+
+  const [registerModal, { openModal }] = useModal();
+
+  const { tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '设备台账',
+      api: list,
+      columns,
+      canResize: true,
+      formConfig: {
+        schemas: searchFormSchema,
+        labelWidth: 100,
+        autoSubmitOnEnter: true,
+        showAdvancedButton: true,
+      },
+      actionColumn: {
+        width: 200,
+        fixed: 'right',
+      },
+    },
+    exportConfig: {
+      name: '设备台账',
+      url: getExportUrl,
+    },
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess,
+    },
+  });
+
+  const [registerTable, { reload, getSelectRows }, { rowSelection, selectedRowKeys }] = tableContext;
+
+  function handleAdd() {
+    openModal(true, { isUpdate: false, showFooter: true });
+  }
+
+  function handleEdit(record: Recordable) {
+    openModal(true, { record, isUpdate: true, showFooter: true });
+  }
+
+  function handleDetail(record: Recordable) {
+    openModal(true, { record, isUpdate: true, showFooter: false });
+  }
+
+  function handleDelete(record: Recordable) {
+    deleteOne({ id: record.id }, handleSuccess);
+  }
+
+  function batchHandleDelete() {
+    batchDelete({ ids: selectedRowKeys.value.join(',') }, handleSuccess);
+  }
+
+  function handleSuccess() {
+    reload();
+    selectedRowKeys.value = [];
+  }
+
+  function handleBatchCreateRecord(recordType: 'inspect' | 'maintain') {
+    const rows = (getSelectRows?.() || []) as Recordable[];
+    if (!rows.length) {
+      createMessage.warning('请先勾选设备');
+      return;
+    }
+    const ids = rows.map((r) => r.id).filter(Boolean);
+    const typeLabel = recordType === 'inspect' ? '点检' : '保养';
+    createConfirm({
+      iconType: 'info',
+      title: `生成${typeLabel}记录`,
+      content: `确定为选中的 ${ids.length} 台设备各生成一条${typeLabel}记录？`,
+      okText: '确定',
+      cancelText: '取消',
+      onOk: async () => {
+        try {
+          const res = await batchCreateFromEquipment({ equipmentLedgerIds: ids, recordType });
+          const data = (res as any)?.result ?? res;
+          const failList: string[] = data?.failMessages || [];
+          const successCount = data?.successCount ?? 0;
+          if (successCount > 0 && !failList.length) {
+            createMessage.success(`成功生成 ${successCount} 条${typeLabel}记录`);
+            handleSuccess();
+          } else if (successCount > 0 && failList.length) {
+            createMessage.warning(`成功生成 ${successCount} 条；未生成：${failList.join('；')}`);
+            handleSuccess();
+          } else if (failList.length) {
+            createMessage.warning(failList.join('；'));
+          } else {
+            createMessage.warning((res as any)?.message || `未生成任何${typeLabel}记录`);
+          }
+        } catch (e: any) {
+          const errMsg =
+            e?.response?.data?.message || e?.message || `生成${typeLabel}记录失败`;
+          createMessage.warning(errMsg);
+        }
+      },
+    });
+  }
+
+  function getDropDownAction(record: Recordable) {
+    return [
+      { label: '详情', onClick: handleDetail.bind(null, record) },
+      {
+        label: '删除',
+        popConfirm: { title: '是否确认删除', confirm: handleDelete.bind(null, record) },
+        auth: 'mes:mes_xsl_equipment_ledger:delete',
+      },
+    ];
+  }
+</script>

jeecgboot-vue3/src/views/xslmes/mesXslEquipmentLedger/components/MesXslEquipmentLedgerModal.vue

@@ -0,0 +1,243 @@
+<template>
+  <BasicModal
+    v-bind="$attrs"
+    @register="registerModal"
+    destroyOnClose
+    :title="title"
+    :width="MODAL_WIDTH"
+    :maxHeight="modalContentMaxHeight"
+    wrap-class-name="mes-xsl-equipment-ledger-modal"
+    @ok="handleSubmit"
+  >
+    <BasicForm @register="registerForm">
+      <template #processOperationPicker="{ model, field }">
+        <a-input-group compact style="display: flex; width: 100%">
+          <a-input v-model:value="model[field]" read-only placeholder="请选择工序" style="flex: 1" />
+          <a-button type="primary" :disabled="isDetail" @click="openProcessSelect">选择</a-button>
+          <a-button v-if="model.processOperationId && !isDetail" @click="clearProcess(model)">清除</a-button>
+        </a-input-group>
+      </template>
+      <template #manufacturerPicker="{ model, field }">
+        <a-input-group compact style="display: flex; width: 100%">
+          <a-input v-model:value="model[field]" read-only placeholder="请选择设备厂家" style="flex: 1" />
+          <a-button type="primary" :disabled="isDetail" @click="openManufacturerSelect('manufacturer')">选择</a-button>
+          <a-button v-if="model.manufacturerId && !isDetail" @click="clearManufacturer(model)">清除</a-button>
+        </a-input-group>
+      </template>
+      <template #equipmentCategoryPicker="{ model, field }">
+        <a-input-group compact style="display: flex; width: 100%">
+          <a-input v-model:value="model[field]" read-only placeholder="请选择设备类别" style="flex: 1" />
+          <a-button type="primary" :disabled="isDetail" @click="openCategorySelect">选择</a-button>
+          <a-button v-if="model.equipmentCategoryId && !isDetail" @click="clearCategory(model)">清除</a-button>
+        </a-input-group>
+      </template>
+      <template #equipmentTypePicker="{ model, field }">
+        <a-input-group compact style="display: flex; width: 100%">
+          <a-input v-model:value="model[field]" read-only placeholder="请选择设备类型" style="flex: 1" />
+          <a-button type="primary" :disabled="isDetail" @click="openTypeSelect">选择</a-button>
+          <a-button v-if="model.equipmentTypeId && !isDetail" @click="clearType(model)">清除</a-button>
+        </a-input-group>
+      </template>
+      <template #factoryPicker="{ model, field }">
+        <a-input-group compact style="display: flex; width: 100%">
+          <a-input v-model:value="model[field]" read-only placeholder="请选择所属工厂" style="flex: 1" />
+          <a-button type="primary" :disabled="isDetail" @click="openManufacturerSelect('factory')">选择</a-button>
+          <a-button v-if="model.factoryId && !isDetail" @click="clearFactory(model)">清除</a-button>
+        </a-input-group>
+      </template>
+    </BasicForm>
+    <MesXslProcessOperationSelectModal @register="registerProcessModal" @select="onProcessSelect" />
+    <MesXslManufacturerSelectModal
+      @register="registerManufacturerModal"
+      :modal-title="manufacturerModalTitle"
+      @select="onManufacturerSelect"
+    />
+    <MesXslEquipmentCategorySelectModal @register="registerCategoryModal" @select="onCategorySelect" />
+    <MesXslEquipmentTypeSelectModal @register="registerTypeModal" @select="onTypeSelect" />
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+  import { computed, ref, unref, onMounted } from 'vue';
+  import { BasicModal, useModalInner, useModal } from '/@/components/Modal';
+  import { BasicForm, useForm } from '/@/components/Form/index';
+  import { formSchema } from '../MesXslEquipmentLedger.data';
+  import { saveOrUpdate } from '../MesXslEquipmentLedger.api';
+  import MesXslProcessOperationSelectModal from '/@/views/xslmes/mesXslEquipmentCategory/components/MesXslProcessOperationSelectModal.vue';
+  import MesXslManufacturerSelectModal from './MesXslManufacturerSelectModal.vue';
+  import MesXslEquipmentCategorySelectModal from '/@/views/xslmes/mesXslEquipmentType/components/MesXslEquipmentCategorySelectModal.vue';
+  import MesXslEquipmentTypeSelectModal from './MesXslEquipmentTypeSelectModal.vue';
+
+  const emit = defineEmits(['register', 'success']);
+  const isUpdate = ref(true);
+  const isDetail = ref(false);
+
+  /** 弹窗宽度；须配合 wrap-class-name 覆盖全局 .ant-modal{width:520px} */
+  const MODAL_WIDTH = 1200;
+
+  /** 仅纵向滚动（像素高度，供 ModalWrapper 使用）；在基准高度上缩短 20% */
+  const MODAL_HEIGHT_SCALE = 0.8;
+  const modalContentMaxHeight = ref(Math.round(600 * MODAL_HEIGHT_SCALE));
+
+  onMounted(() => {
+    const base = Math.min(800, Math.max(480, window.innerHeight - 220));
+    modalContentMaxHeight.value = Math.round(base * MODAL_HEIGHT_SCALE);
+  });
+  const manufacturerPickTarget = ref<'manufacturer' | 'factory'>('manufacturer');
+
+  const manufacturerModalTitle = computed(() =>
+    manufacturerPickTarget.value === 'factory' ? '选择所属工厂' : '选择设备厂家',
+  );
+
+  const [registerProcessModal, { openModal: openProcessModal }] = useModal();
+  const [registerManufacturerModal, { openModal: openManufacturerModal }] = useModal();
+  const [registerCategoryModal, { openModal: openCategoryModal }] = useModal();
+  const [registerTypeModal, { openModal: openTypeModal }] = useModal();
+
+  const [registerForm, { resetFields, setFieldsValue, validate, setProps, getFieldsValue }] = useForm({
+    labelWidth: 110,
+    schemas: formSchema,
+    showActionButtonGroup: false,
+    baseColProps: { span: 12 },
+  });
+
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    await resetFields();
+    setModalProps({
+      width: MODAL_WIDTH,
+      confirmLoading: false,
+      showCancelBtn: data?.showFooter,
+      showOkBtn: data?.showFooter,
+    });
+    isUpdate.value = !!data?.isUpdate;
+    isDetail.value = !data?.showFooter;
+    if (unref(isUpdate)) await setFieldsValue({ ...data.record });
+    else await setFieldsValue({ equipmentStatus: '0', enabledFlag: '1' });
+    setProps({ disabled: !data?.showFooter });
+  });
+
+  const title = computed(() =>
+    !unref(isUpdate) ? '新增设备台账' : unref(isDetail) ? '设备台账详情' : '编辑设备台账',
+  );
+
+  function openProcessSelect() {
+    const v = getFieldsValue();
+    openProcessModal(true, { processOperationId: v?.processOperationId });
+  }
+
+  function openManufacturerSelect(target: 'manufacturer' | 'factory') {
+    manufacturerPickTarget.value = target;
+    const v = getFieldsValue();
+    openManufacturerModal(true, {
+      manufacturerId: target === 'factory' ? v?.factoryId : v?.manufacturerId,
+    });
+  }
+
+  function openCategorySelect() {
+    const v = getFieldsValue();
+    openCategoryModal(true, { equipmentCategoryId: v?.equipmentCategoryId });
+  }
+
+  function openTypeSelect() {
+    const v = getFieldsValue();
+    openTypeModal(true, { equipmentTypeId: v?.equipmentTypeId });
+  }
+
+  function onProcessSelect(payload: Recordable) {
+    setFieldsValue({
+      processOperationId: payload.processOperationId,
+      processOperationName: payload.processOperationName,
+    });
+  }
+
+  function onManufacturerSelect(payload: Recordable) {
+    if (manufacturerPickTarget.value === 'factory') {
+      setFieldsValue({
+        factoryId: payload.manufacturerId,
+        factoryName: payload.manufacturerName,
+      });
+    } else {
+      setFieldsValue({
+        manufacturerId: payload.manufacturerId,
+        manufacturerName: payload.manufacturerName,
+      });
+    }
+  }
+
+  function onCategorySelect(payload: Recordable) {
+    setFieldsValue({
+      equipmentCategoryId: payload.equipmentCategoryId,
+      equipmentCategoryName: payload.equipmentCategoryName,
+    });
+  }
+
+  function onTypeSelect(payload: Recordable) {
+    setFieldsValue({
+      equipmentTypeId: payload.equipmentTypeId,
+      equipmentTypeName: payload.equipmentTypeName,
+      equipmentCategoryId: payload.equipmentCategoryId || getFieldsValue()?.equipmentCategoryId,
+      equipmentCategoryName: payload.equipmentCategoryName || getFieldsValue()?.equipmentCategoryName,
+    });
+  }
+
+  function clearProcess(model: Recordable) {
+    model.processOperationId = '';
+    model.processOperationName = '';
+  }
+
+  function clearManufacturer(model: Recordable) {
+    model.manufacturerId = '';
+    model.manufacturerName = '';
+  }
+
+  function clearFactory(model: Recordable) {
+    model.factoryId = '';
+    model.factoryName = '';
+  }
+
+  function clearCategory(model: Recordable) {
+    model.equipmentCategoryId = '';
+    model.equipmentCategoryName = '';
+  }
+
+  function clearType(model: Recordable) {
+    model.equipmentTypeId = '';
+    model.equipmentTypeName = '';
+  }
+
+  async function handleSubmit() {
+    try {
+      const values = await validate();
+      if (!values.processOperationId) {
+        return;
+      }
+      setModalProps({ confirmLoading: true });
+      await saveOrUpdate(values, isUpdate.value);
+      closeModal();
+      emit('success');
+    } finally {
+      setModalProps({ confirmLoading: false });
+    }
+  }
+</script>
+
+<style lang="less">
+  /* 覆盖 jeecg components/Modal/src/index.less 中 .ant-modal { width: 520px } */
+  .ant-modal-wrap.mes-xsl-equipment-ledger-modal > .ant-modal,
+  .mes-xsl-equipment-ledger-modal .ant-modal {
+    width: min(1200px, calc(100vw - 48px)) !important;
+    max-width: min(1200px, calc(100vw - 48px)) !important;
+  }
+
+  .mes-xsl-equipment-ledger-modal {
+
+    .scroll-container .scrollbar__wrap {
+      overflow-x: hidden !important;
+      overflow-y: auto !important;
+    }
+
+    .scrollbar__view > div {
+      overflow-x: hidden;
+    }
+  }
+</style>

jeecgboot-vue3/src/views/xslmes/mesXslEquipmentLedger/components/MesXslEquipmentTypeSelectModal.vue

@@ -0,0 +1,94 @@
+<template>
+  <BasicModal v-bind="$attrs" title="选择设备类型" :width="960" @register="registerModal" @ok="handleOk">
+    <BasicTable @register="registerTable" />
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+  import { ref } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { BasicTable, useTable } from '/@/components/Table';
+  import { list, queryById } from '/@/views/xslmes/mesXslEquipmentType/MesXslEquipmentType.api';
+
+  const emit = defineEmits(['register', 'select']);
+
+  const selectedRow = ref<Recordable | null>(null);
+
+  const [registerTable, { reload, getSelectRowKeys, getSelectRows, setSelectedRowKeys, clearSelectedRowKeys }] = useTable({
+    api: list,
+    columns: [
+      { title: '类型名称', dataIndex: 'typeName', width: 160 },
+      { title: '工序名称', dataIndex: 'processOperationName', width: 160 },
+      { title: '设备类别', dataIndex: 'equipmentCategoryName', width: 160 },
+    ],
+    rowKey: 'id',
+    useSearchForm: true,
+    formConfig: {
+      labelWidth: 90,
+      schemas: [
+        { label: '类型名称', field: 'typeName', component: 'Input', colProps: { span: 8 } },
+        { label: '类别名称', field: 'equipmentCategoryName', component: 'Input', colProps: { span: 8 } },
+      ],
+    },
+    pagination: { pageSize: 10 },
+    canResize: false,
+    showIndexColumn: false,
+    immediate: true,
+    rowSelection: {
+      type: 'radio',
+      columnWidth: 48,
+      onChange: (_keys, rows) => {
+        selectedRow.value = rows?.[0] ?? null;
+      },
+    },
+    clickToRowSelect: true,
+  });
+
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    selectedRow.value = null;
+    clearSelectedRowKeys?.();
+    setModalProps({ confirmLoading: false });
+    const tid = data?.equipmentTypeId as string | undefined;
+    if (tid) {
+      setSelectedRowKeys?.([tid]);
+      try {
+        const raw = await queryById({ id: tid });
+        const row = (raw as any)?.id != null ? raw : (raw as any)?.result;
+        if (row) selectedRow.value = row;
+      } catch {
+        // 忽略
+      }
+    }
+    reload();
+  });
+
+  async function handleOk() {
+    const keys = (getSelectRowKeys?.() || []) as string[];
+    let row = selectedRow.value || ((getSelectRows?.() || []) as Recordable[])[0];
+    if (!row && keys.length) {
+      try {
+        const raw = await queryById({ id: keys[0] });
+        row = (raw as any)?.id != null ? raw : (raw as any)?.result;
+      } catch {
+        // 忽略
+      }
+    }
+    if (!row?.id) {
+      emit('select', {
+        equipmentTypeId: '',
+        equipmentTypeName: '',
+        equipmentCategoryId: '',
+        equipmentCategoryName: '',
+      });
+      closeModal();
+      return;
+    }
+    emit('select', {
+      equipmentTypeId: row.id,
+      equipmentTypeName: row.typeName || '',
+      equipmentCategoryId: row.equipmentCategoryId || '',
+      equipmentCategoryName: row.equipmentCategoryName || '',
+    });
+    closeModal();
+  }
+</script>

jeecgboot-vue3/src/views/xslmes/mesXslEquipmentLedger/components/MesXslManufacturerSelectModal.vue

@@ -0,0 +1,95 @@
+<template>
+  <BasicModal v-bind="$attrs" :title="title" :width="900" @register="registerModal" @ok="handleOk">
+    <BasicTable @register="registerTable" />
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+  import { computed, ref } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { BasicTable, useTable } from '/@/components/Table';
+  import { list, queryById } from '/@/views/xslmes/mesXslManufacturer/MesXslManufacturer.api';
+
+  const props = defineProps<{ modalTitle?: string }>();
+  const emit = defineEmits(['register', 'select']);
+
+  const title = computed(() => props.modalTitle || '选择厂家信息');
+  const selectedRow = ref<Recordable | null>(null);
+
+  const [registerTable, { reload, getSelectRowKeys, getSelectRows, setSelectedRowKeys, clearSelectedRowKeys }] = useTable({
+    api: list,
+    columns: [
+      { title: '厂家类别', dataIndex: 'manufacturerCategory_dictText', width: 120 },
+      { title: '厂家名称', dataIndex: 'manufacturerName', width: 200 },
+      { title: '是否有效', dataIndex: 'validStatus_dictText', width: 90 },
+    ],
+    rowKey: 'id',
+    useSearchForm: true,
+    formConfig: {
+      labelWidth: 90,
+      schemas: [
+        {
+          label: '厂家类别',
+          field: 'manufacturerCategory',
+          component: 'JDictSelectTag',
+          componentProps: { dictCode: 'xslmes_manufacturer_category' },
+          colProps: { span: 8 },
+        },
+        { label: '厂家名称', field: 'manufacturerName', component: 'Input', colProps: { span: 8 } },
+      ],
+    },
+    pagination: { pageSize: 10 },
+    canResize: false,
+    showIndexColumn: false,
+    immediate: true,
+    rowSelection: {
+      type: 'radio',
+      columnWidth: 48,
+      onChange: (_keys, rows) => {
+        selectedRow.value = rows?.[0] ?? null;
+      },
+    },
+    clickToRowSelect: true,
+  });
+
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    selectedRow.value = null;
+    clearSelectedRowKeys?.();
+    setModalProps({ confirmLoading: false });
+    const mid = data?.manufacturerId as string | undefined;
+    if (mid) {
+      setSelectedRowKeys?.([mid]);
+      try {
+        const raw = await queryById({ id: mid });
+        const row = (raw as any)?.id != null ? raw : (raw as any)?.result;
+        if (row) selectedRow.value = row;
+      } catch {
+        // 忽略
+      }
+    }
+    reload();
+  });
+
+  async function handleOk() {
+    const keys = (getSelectRowKeys?.() || []) as string[];
+    let row = selectedRow.value || ((getSelectRows?.() || []) as Recordable[])[0];
+    if (!row && keys.length) {
+      try {
+        const raw = await queryById({ id: keys[0] });
+        row = (raw as any)?.id != null ? raw : (raw as any)?.result;
+      } catch {
+        // 忽略
+      }
+    }
+    if (!row?.id) {
+      emit('select', { manufacturerId: '', manufacturerName: '' });
+      closeModal();
+      return;
+    }
+    emit('select', {
+      manufacturerId: row.id,
+      manufacturerName: row.manufacturerName || '',
+    });
+    closeModal();
+  }
+</script>

jeecgboot-vue3/src/views/xslmes/mesXslInspectMaintainItem/MesXslInspectMaintainItem.api.ts

@@ -0,0 +1,68 @@
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from '/@/hooks/web/useMessage';
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/xslmes/mesXslInspectMaintainItem/list',
+  checkItemName = '/xslmes/mesXslInspectMaintainItem/checkItemName',
+  checkItemCode = '/xslmes/mesXslInspectMaintainItem/checkItemCode',
+  save = '/xslmes/mesXslInspectMaintainItem/add',
+  edit = '/xslmes/mesXslInspectMaintainItem/edit',
+  deleteOne = '/xslmes/mesXslInspectMaintainItem/delete',
+  deleteBatch = '/xslmes/mesXslInspectMaintainItem/deleteBatch',
+  importExcel = '/xslmes/mesXslInspectMaintainItem/importExcel',
+  exportXls = '/xslmes/mesXslInspectMaintainItem/exportXls',
+  queryById = '/xslmes/mesXslInspectMaintainItem/queryById',
+}
+
+export const getExportUrl = Api.exportXls;
+export const getImportUrl = Api.importExcel;
+
+export const list = (params) => defHttp.get({ url: Api.list, params });
+
+export const queryById = (params: { id: string }) => defHttp.get({ url: Api.queryById, params });
+
+export const checkItemName = (params: { itemName: string; dataId?: string }) =>
+  defHttp.get(
+    { url: Api.checkItemName, params },
+    {
+      successMessageMode: 'none',
+      errorMessageMode: 'none',
+    },
+  );
+
+export const checkItemCode = (params: { itemCode: string; dataId?: string }) =>
+  defHttp.get(
+    { url: Api.checkItemCode, params },
+    {
+      successMessageMode: 'none',
+      errorMessageMode: 'none',
+    },
+  );
+
+export const deleteOne = (params, handleSuccess) => {
+  return defHttp.delete({ url: Api.deleteOne, params }, { joinParamsToUrl: true }).then(() => {
+    handleSuccess();
+  });
+};
+
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({ url: Api.deleteBatch, data: params }, { joinParamsToUrl: true }).then(() => {
+        handleSuccess();
+      });
+    },
+  });
+};
+
+export const saveOrUpdate = (params, isUpdate) => {
+  const url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({ url, params });
+};

jeecgboot-vue3/src/views/xslmes/mesXslInspectMaintainItem/MesXslInspectMaintainItem.data.ts

@@ -0,0 +1,153 @@
+import { BasicColumn, FormSchema } from '/@/components/Table';
+import { checkItemCode, checkItemName } from './MesXslInspectMaintainItem.api';
+
+export const columns: BasicColumn[] = [
+  { title: '项目名称', align: 'center', dataIndex: 'itemName', width: 140 },
+  { title: '项目编号', align: 'center', dataIndex: 'itemCode', width: 120 },
+  { title: '设备类别', align: 'center', dataIndex: 'equipmentCategoryName', width: 120 },
+  { title: '设备类型', align: 'center', dataIndex: 'equipmentTypeName', width: 120 },
+  { title: '设备部位', align: 'center', dataIndex: 'equipmentPartName', width: 120 },
+  { title: '设备小部位', align: 'center', dataIndex: 'equipmentSubPartName', width: 120 },
+  { title: '项目类别', align: 'center', dataIndex: 'itemCategory_dictText', width: 90 },
+  { title: '项目类型', align: 'center', dataIndex: 'itemType_dictText', width: 90 },
+  { title: '点检方式', align: 'center', dataIndex: 'inspectMethod_dictText', width: 90 },
+  { title: '判断基准', align: 'center', dataIndex: 'judgmentCriteria', width: 160, ellipsis: true },
+  { title: '保养周期(天)', align: 'center', dataIndex: 'maintainCycleDays', width: 110 },
+  { title: '创建人', align: 'center', dataIndex: 'createBy', width: 100 },
+  {
+    title: '创建时间',
+    align: 'center',
+    dataIndex: 'createTime',
+    width: 165,
+    customRender: ({ text }) => (!text ? '' : String(text).length > 19 ? String(text).substring(0, 19) : text),
+  },
+];
+
+export const searchFormSchema: FormSchema[] = [
+  { label: '项目名称', field: 'itemName', component: 'Input', colProps: { span: 6 } },
+  { label: '项目编号', field: 'itemCode', component: 'Input', colProps: { span: 6 } },
+  { label: '设备类别', field: 'equipmentCategoryName', component: 'Input', colProps: { span: 6 } },
+  {
+    label: '项目类别',
+    field: 'itemCategory',
+    component: 'JDictSelectTag',
+    componentProps: { dictCode: 'xslmes_im_item_category' },
+    colProps: { span: 6 },
+  },
+];
+
+export const formSchema: FormSchema[] = [
+  { label: '', field: 'id', component: 'Input', show: false },
+  {
+    label: '项目名称',
+    field: 'itemName',
+    component: 'Input',
+    componentProps: { placeholder: '同租户内未删除数据中不可重复' },
+    dynamicRules: ({ model }) => [
+      { required: true, message: '请输入项目名称' },
+      {
+        validator: async (_rule, value) => {
+          const v = value == null ? '' : String(value).trim();
+          if (!v) {
+            return Promise.resolve();
+          }
+          try {
+            await checkItemName({ itemName: v, dataId: model?.id });
+            return Promise.resolve();
+          } catch (e: any) {
+            const msg = e?.response?.data?.message || e?.message || '项目名称不能重复';
+            return Promise.reject(msg);
+          }
+        },
+        trigger: 'blur',
+      },
+    ],
+  },
+  {
+    label: '项目编号',
+    field: 'itemCode',
+    component: 'Input',
+    componentProps: { placeholder: '同租户内未删除数据中不可重复' },
+    dynamicRules: ({ model }) => [
+      { required: true, message: '请输入项目编号' },
+      {
+        validator: async (_rule, value) => {
+          const v = value == null ? '' : String(value).trim();
+          if (!v) {
+            return Promise.resolve();
+          }
+          try {
+            await checkItemCode({ itemCode: v, dataId: model?.id });
+            return Promise.resolve();
+          } catch (e: any) {
+            const msg = e?.response?.data?.message || e?.message || '项目编号不能重复';
+            return Promise.reject(msg);
+          }
+        },
+        trigger: 'blur',
+      },
+    ],
+  },
+  { label: '', field: 'equipmentCategoryId', component: 'Input', show: false },
+  {
+    label: '设备类别',
+    field: 'equipmentCategoryName',
+    component: 'Input',
+    slot: 'equipmentCategoryPicker',
+  },
+  { label: '', field: 'equipmentTypeId', component: 'Input', show: false },
+  {
+    label: '设备类型',
+    field: 'equipmentTypeName',
+    component: 'Input',
+    slot: 'equipmentTypePicker',
+  },
+  { label: '', field: 'equipmentPartId', component: 'Input', show: false },
+  {
+    label: '设备部位',
+    field: 'equipmentPartName',
+    component: 'Input',
+    slot: 'equipmentPartPicker',
+  },
+  { label: '', field: 'equipmentSubPartId', component: 'Input', show: false },
+  {
+    label: '设备小部位',
+    field: 'equipmentSubPartName',
+    component: 'Input',
+    slot: 'equipmentSubPartPicker',
+  },
+  {
+    label: '项目类别',
+    field: 'itemCategory',
+    component: 'JDictSelectTag',
+    required: true,
+    componentProps: { dictCode: 'xslmes_im_item_category', placeholder: '点检/保养' },
+  },
+  {
+    label: '项目类型',
+    field: 'itemType',
+    component: 'JDictSelectTag',
+    required: true,
+    componentProps: { dictCode: 'xslmes_im_item_type', placeholder: '机械类/电气类' },
+  },
+  {
+    label: '点检方式',
+    field: 'inspectMethod',
+    component: 'JDictSelectTag',
+    required: true,
+    componentProps: { dictCode: 'xslmes_im_inspect_method', placeholder: '视觉/目测/听觉' },
+  },
+  {
+    label: '判断基准',
+    field: 'judgmentCriteria',
+    component: 'InputTextArea',
+    required: true,
+    componentProps: { rows: 3, maxlength: 500, showCount: true },
+  },
+  {
+    label: '保养周期(天)',
+    field: 'maintainCycleDays',
+    component: 'InputNumber',
+    componentProps: { min: 0, precision: 0, style: { width: '100%' } },
+  },
+];

jeecgboot-vue3/src/views/xslmes/mesXslInspectMaintainItem/MesXslInspectMaintainItemList.vue

@@ -0,0 +1,132 @@
+<template>
+  <div>
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <template #tableTitle>
+        <a-button
+          type="primary"
+          v-auth="'mes:mes_xsl_inspect_maintain_item:add'"
+          @click="handleAdd"
+          preIcon="ant-design:plus-outlined"
+        >
+          新增
+        </a-button>
+        <a-button
+          type="primary"
+          v-auth="'mes:mes_xsl_inspect_maintain_item:exportXls'"
+          preIcon="ant-design:export-outlined"
+          @click="onExportXls"
+        >
+          导出
+        </a-button>
+        <j-upload-button
+          type="primary"
+          v-auth="'mes:mes_xsl_inspect_maintain_item:importExcel'"
+          preIcon="ant-design:import-outlined"
+          @click="onImportXls"
+        >
+          导入
+        </j-upload-button>
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <template #overlay>
+            <a-menu>
+              <a-menu-item key="1" @click="batchHandleDelete">
+                <Icon icon="ant-design:delete-outlined" />
+                删除
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button v-auth="'mes:mes_xsl_inspect_maintain_item:deleteBatch'">
+            批量操作
+            <Icon icon="mdi:chevron-down" />
+          </a-button>
+        </a-dropdown>
+      </template>
+      <template #action="{ record }">
+        <TableAction
+          :actions="[
+            { label: '编辑', onClick: handleEdit.bind(null, record), auth: 'mes:mes_xsl_inspect_maintain_item:edit' },
+          ]"
+          :dropDownActions="getDropDownAction(record)"
+        />
+      </template>
+    </BasicTable>
+    <MesXslInspectMaintainItemModal @register="registerModal" @success="handleSuccess" />
+  </div>
+</template>
+
+<script lang="ts" name="xslmes-mesXslInspectMaintainItem" setup>
+  import { BasicTable, TableAction } from '/@/components/Table';
+  import { useModal } from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import Icon from '/@/components/Icon';
+  import MesXslInspectMaintainItemModal from './components/MesXslInspectMaintainItemModal.vue';
+  import { columns, searchFormSchema } from './MesXslInspectMaintainItem.data';
+  import { list, deleteOne, batchDelete, getExportUrl, getImportUrl } from './MesXslInspectMaintainItem.api';
+
+  const [registerModal, { openModal }] = useModal();
+
+  const { tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '点检及保养项目',
+      api: list,
+      columns,
+      canResize: true,
+      formConfig: {
+        schemas: searchFormSchema,
+        labelWidth: 100,
+        autoSubmitOnEnter: true,
+        showAdvancedButton: true,
+      },
+      actionColumn: {
+        width: 200,
+        fixed: 'right',
+      },
+    },
+    exportConfig: {
+      name: '点检及保养项目',
+      url: getExportUrl,
+    },
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess,
+    },
+  });
+
+  const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
+
+  function handleAdd() {
+    openModal(true, { isUpdate: false, showFooter: true });
+  }
+
+  function handleEdit(record: Recordable) {
+    openModal(true, { record, isUpdate: true, showFooter: true });
+  }
+
+  function handleDetail(record: Recordable) {
+    openModal(true, { record, isUpdate: true, showFooter: false });
+  }
+
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
+
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
+
+  function handleSuccess() {
+    selectedRowKeys.value = [];
+    reload();
+  }
+
+  function getDropDownAction(record) {
+    return [
+      { label: '详情', onClick: handleDetail.bind(null, record) },
+      {
+        label: '删除',
+        popConfirm: { title: '是否确认删除', confirm: handleDelete.bind(null, record) },
+        auth: 'mes:mes_xsl_inspect_maintain_item:delete',
+      },
+    ];
+  }
+</script>

jeecgboot-vue3/src/views/xslmes/mesXslInspectMaintainItem/components/MesXslEquipmentSubPartFilterSelectModal.vue

@@ -0,0 +1,116 @@
+<template>
+  <BasicModal v-bind="$attrs" title="选择设备小部位" :width="960" @register="registerModal" @ok="handleOk">
+    <BasicTable @register="registerTable" />
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+  import { ref } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { BasicTable, useTable } from '/@/components/Table';
+  import { list, queryById } from '/@/views/xslmes/mesXslEquipmentSubPart/MesXslEquipmentSubPart.api';
+
+  const emit = defineEmits(['register', 'select']);
+
+  const selectedRow = ref<Recordable | null>(null);
+  const filterCategoryId = ref('');
+  const filterPartId = ref('');
+
+  function handleSelectionChange(_keys: string[], rows: Recordable[]) {
+    selectedRow.value = rows?.[0] ?? null;
+  }
+
+  function fetchSubPartPage(params: Recordable) {
+    const p = { ...params };
+    if (filterCategoryId.value) {
+      p.equipmentCategoryId = filterCategoryId.value;
+    }
+    if (filterPartId.value) {
+      p.equipmentPartId = filterPartId.value;
+    }
+    return list(p);
+  }
+
+  const [registerTable, { reload, setProps, getSelectRowKeys, getSelectRows, setSelectedRowKeys, clearSelectedRowKeys }] =
+    useTable({
+      api: fetchSubPartPage,
+      columns: [
+        { title: '小部位代码', dataIndex: 'subPartCode', width: 120 },
+        { title: '小部位名称', dataIndex: 'subPartName', width: 160 },
+        { title: '大部位名称', dataIndex: 'equipmentPartName', width: 140 },
+        { title: '类别名称', dataIndex: 'equipmentCategoryName', width: 140 },
+      ],
+      rowKey: 'id',
+      useSearchForm: true,
+      formConfig: {
+        labelWidth: 90,
+        schemas: [
+          { label: '小部位代码', field: 'subPartCode', component: 'Input', colProps: { span: 8 } },
+          { label: '小部位名称', field: 'subPartName', component: 'Input', colProps: { span: 8 } },
+        ],
+      },
+      pagination: { pageSize: 10 },
+      canResize: false,
+      showIndexColumn: false,
+      immediate: true,
+      rowSelection: {
+        type: 'radio',
+        columnWidth: 48,
+        onChange: handleSelectionChange,
+      },
+      clickToRowSelect: true,
+    });
+
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    filterCategoryId.value = data?.equipmentCategoryId ? String(data.equipmentCategoryId) : '';
+    filterPartId.value = data?.equipmentPartId ? String(data.equipmentPartId) : '';
+    selectedRow.value = null;
+    clearSelectedRowKeys?.();
+    setProps({
+      rowSelection: {
+        type: 'radio',
+        columnWidth: 48,
+        onChange: handleSelectionChange,
+      },
+      clickToRowSelect: true,
+    });
+    setModalProps({ confirmLoading: false });
+    const sid = data?.equipmentSubPartId as string | undefined;
+    if (sid) {
+      setSelectedRowKeys?.([sid]);
+      try {
+        const raw = await queryById({ id: sid });
+        const row = (raw as any)?.id != null ? raw : (raw as any)?.result;
+        if (row) {
+          selectedRow.value = row;
+        }
+      } catch {
+        // 忽略
+      }
+    }
+    reload();
+  });
+
+  async function handleOk() {
+    const keys = (getSelectRowKeys?.() || []) as string[];
+    let row = selectedRow.value || ((getSelectRows?.() || []) as Recordable[])[0];
+    if (!row && keys.length) {
+      try {
+        const raw = await queryById({ id: keys[0] });
+        row = (raw as any)?.id != null ? raw : (raw as any)?.result;
+      } catch {
+        // 忽略
+      }
+    }
+    if (!row?.id) {
+      emit('select', { equipmentSubPartId: '', equipmentSubPartName: '' });
+      closeModal();
+      return;
+    }
+    emit('select', {
+      equipmentSubPartId: row.id,
+      equipmentSubPartName: row.subPartName || '',
+    });
+    closeModal();
+  }
+</script>

jeecgboot-vue3/src/views/xslmes/mesXslInspectMaintainItem/components/MesXslEquipmentTypeFilterSelectModal.vue

@@ -0,0 +1,110 @@
+<template>
+  <BasicModal v-bind="$attrs" title="选择设备类型" :width="960" @register="registerModal" @ok="handleOk">
+    <BasicTable @register="registerTable" />
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+  import { ref } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { BasicTable, useTable } from '/@/components/Table';
+  import { list, queryById } from '/@/views/xslmes/mesXslEquipmentType/MesXslEquipmentType.api';
+
+  const emit = defineEmits(['register', 'select']);
+
+  const selectedRow = ref<Recordable | null>(null);
+  const filterCategoryId = ref('');
+
+  function handleSelectionChange(_keys: string[], rows: Recordable[]) {
+    selectedRow.value = rows?.[0] ?? null;
+  }
+
+  function fetchTypePage(params: Recordable) {
+    const p = { ...params };
+    if (filterCategoryId.value) {
+      p.equipmentCategoryId = filterCategoryId.value;
+    }
+    return list(p);
+  }
+
+  const [registerTable, { reload, setProps, getSelectRowKeys, getSelectRows, setSelectedRowKeys, clearSelectedRowKeys }] =
+    useTable({
+      api: fetchTypePage,
+      columns: [
+        { title: '类型名称', dataIndex: 'typeName', width: 160 },
+        { title: '工序名称', dataIndex: 'processOperationName', width: 160 },
+        { title: '设备类别', dataIndex: 'equipmentCategoryName', width: 160 },
+      ],
+      rowKey: 'id',
+      useSearchForm: true,
+      formConfig: {
+        labelWidth: 90,
+        schemas: [
+          { label: '类型名称', field: 'typeName', component: 'Input', colProps: { span: 8 } },
+          { label: '类别名称', field: 'equipmentCategoryName', component: 'Input', colProps: { span: 8 } },
+        ],
+      },
+      pagination: { pageSize: 10 },
+      canResize: false,
+      showIndexColumn: false,
+      immediate: true,
+      rowSelection: {
+        type: 'radio',
+        columnWidth: 48,
+        onChange: handleSelectionChange,
+      },
+      clickToRowSelect: true,
+    });
+
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    filterCategoryId.value = data?.equipmentCategoryId ? String(data.equipmentCategoryId) : '';
+    selectedRow.value = null;
+    clearSelectedRowKeys?.();
+    setProps({
+      rowSelection: {
+        type: 'radio',
+        columnWidth: 48,
+        onChange: handleSelectionChange,
+      },
+      clickToRowSelect: true,
+    });
+    setModalProps({ confirmLoading: false });
+    const tid = data?.equipmentTypeId as string | undefined;
+    if (tid) {
+      setSelectedRowKeys?.([tid]);
+      try {
+        const raw = await queryById({ id: tid });
+        const row = (raw as any)?.id != null ? raw : (raw as any)?.result;
+        if (row) {
+          selectedRow.value = row;
+        }
+      } catch {
+        // 忽略
+      }
+    }
+    reload();
+  });
+
+  async function handleOk() {
+    const keys = (getSelectRowKeys?.() || []) as string[];
+    let row = selectedRow.value || ((getSelectRows?.() || []) as Recordable[])[0];
+    if (!row && keys.length) {
+      try {
+        const raw = await queryById({ id: keys[0] });
+        row = (raw as any)?.id != null ? raw : (raw as any)?.result;
+      } catch {
+        // 忽略
+      }
+    }
+    if (!row?.id) {
+      emit('select', { equipmentTypeId: '', equipmentTypeName: '' });
+      closeModal();
+      return;
+    }
+    emit('select', {
+      equipmentTypeId: row.id,
+      equipmentTypeName: row.typeName || '',
+    });
+    closeModal();
+  }
+</script>

jeecgboot-vue3/src/views/xslmes/mesXslInspectMaintainItem/components/MesXslInspectMaintainItemModal.vue

@@ -0,0 +1,218 @@
+<template>
+  <BasicModal @register="registerModal" :title="title" width="800" v-bind="$attrs" destroyOnClose @ok="handleSubmit">
+    <BasicForm @register="registerForm">
+      <template #equipmentCategoryPicker="{ model, field }">
+        <a-input-group compact style="display: flex; width: 100%">
+          <a-input v-model:value="model[field]" read-only placeholder="请选择设备类别" style="flex: 1" />
+          <a-button type="primary" :disabled="isDetail" @click="openCategorySelect">选择</a-button>
+          <a-button v-if="model.equipmentCategoryId && !isDetail" @click="clearCategory">清除</a-button>
+        </a-input-group>
+      </template>
+      <template #equipmentTypePicker="{ model, field }">
+        <a-input-group compact style="display: flex; width: 100%">
+          <a-input v-model:value="model[field]" read-only placeholder="请先选类别，再选类型" style="flex: 1" />
+          <a-button type="primary" :disabled="isDetail || !model.equipmentCategoryId" @click="openTypeSelect">选择</a-button>
+          <a-button v-if="model.equipmentTypeId && !isDetail" @click="clearType">清除</a-button>
+        </a-input-group>
+      </template>
+      <template #equipmentPartPicker="{ model, field }">
+        <a-input-group compact style="display: flex; width: 100%">
+          <a-input v-model:value="model[field]" read-only placeholder="请先选类别，再选部位" style="flex: 1" />
+          <a-button type="primary" :disabled="isDetail || !model.equipmentCategoryId" @click="openPartSelect">选择</a-button>
+          <a-button v-if="model.equipmentPartId && !isDetail" @click="clearPart">清除</a-button>
+        </a-input-group>
+      </template>
+      <template #equipmentSubPartPicker="{ model, field }">
+        <a-input-group compact style="display: flex; width: 100%">
+          <a-input v-model:value="model[field]" read-only placeholder="请先选类别与部位，再选小部位" style="flex: 1" />
+          <a-button
+            type="primary"
+            :disabled="isDetail || !model.equipmentCategoryId || !model.equipmentPartId"
+            @click="openSubPartSelect"
+          >
+            选择
+          </a-button>
+          <a-button v-if="model.equipmentSubPartId && !isDetail" @click="clearSubPart">清除</a-button>
+        </a-input-group>
+      </template>
+    </BasicForm>
+    <MesXslEquipmentCategorySelectModal @register="registerCategoryModal" @select="onCategorySelect" />
+    <MesXslEquipmentTypeFilterSelectModal @register="registerTypeModal" @select="onTypeSelect" />
+    <MesXslEquipmentPartSelectModal @register="registerPartModal" @select="onPartSelect" />
+    <MesXslEquipmentSubPartFilterSelectModal @register="registerSubPartModal" @select="onSubPartSelect" />
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+  import { computed, ref, unref } from 'vue';
+  import { BasicModal, useModalInner, useModal } from '/@/components/Modal';
+  import { BasicForm, useForm } from '/@/components/Form/index';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { formSchema } from '../MesXslInspectMaintainItem.data';
+  import { saveOrUpdate } from '../MesXslInspectMaintainItem.api';
+  import MesXslEquipmentCategorySelectModal from '/@/views/xslmes/mesXslEquipmentType/components/MesXslEquipmentCategorySelectModal.vue';
+  import MesXslEquipmentPartSelectModal from '/@/views/xslmes/mesXslEquipmentSubPart/components/MesXslEquipmentPartSelectModal.vue';
+  import MesXslEquipmentTypeFilterSelectModal from './MesXslEquipmentTypeFilterSelectModal.vue';
+  import MesXslEquipmentSubPartFilterSelectModal from './MesXslEquipmentSubPartFilterSelectModal.vue';
+
+  const emit = defineEmits(['register', 'success']);
+  const { createMessage } = useMessage();
+  const isUpdate = ref(true);
+  const isDetail = ref(false);
+
+  const [registerCategoryModal, { openModal: openCategoryModal }] = useModal();
+  const [registerTypeModal, { openModal: openTypeModal }] = useModal();
+  const [registerPartModal, { openModal: openPartModal }] = useModal();
+  const [registerSubPartModal, { openModal: openSubPartModal }] = useModal();
+
+  const [registerForm, { resetFields, setFieldsValue, validate, setProps, getFieldsValue }] = useForm({
+    labelWidth: 120,
+    schemas: formSchema,
+    showActionButtonGroup: false,
+  });
+
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    await resetFields();
+    setModalProps({ confirmLoading: false, showCancelBtn: data?.showFooter, showOkBtn: data?.showFooter });
+    isUpdate.value = !!data?.isUpdate;
+    isDetail.value = !data?.showFooter;
+    if (unref(isUpdate)) {
+      await setFieldsValue({ ...data.record });
+    }
+    setProps({ disabled: !data?.showFooter });
+  });
+
+  const title = computed(() =>
+    !unref(isUpdate) ? '新增点检及保养项目' : unref(isDetail) ? '点检及保养项目详情' : '编辑点检及保养项目',
+  );
+
+  function clearEquipmentCascade(from: 'category' | 'type' | 'part') {
+    const patch: Recordable = {};
+    if (from === 'category') {
+      patch.equipmentTypeId = '';
+      patch.equipmentTypeName = '';
+      patch.equipmentPartId = '';
+      patch.equipmentPartName = '';
+      patch.equipmentSubPartId = '';
+      patch.equipmentSubPartName = '';
+    } else if (from === 'type') {
+      patch.equipmentTypeId = '';
+      patch.equipmentTypeName = '';
+    } else if (from === 'part') {
+      patch.equipmentPartId = '';
+      patch.equipmentPartName = '';
+      patch.equipmentSubPartId = '';
+      patch.equipmentSubPartName = '';
+    }
+    setFieldsValue(patch);
+  }
+
+  function openCategorySelect() {
+    const vals = getFieldsValue();
+    openCategoryModal(true, { equipmentCategoryId: vals.equipmentCategoryId });
+  }
+
+  function clearCategory() {
+    setFieldsValue({
+      equipmentCategoryId: '',
+      equipmentCategoryName: '',
+    });
+    clearEquipmentCascade('category');
+  }
+
+  function onCategorySelect(payload: { equipmentCategoryId?: string; equipmentCategoryName?: string }) {
+    setFieldsValue({
+      equipmentCategoryId: payload.equipmentCategoryId || '',
+      equipmentCategoryName: payload.equipmentCategoryName || '',
+    });
+    clearEquipmentCascade('category');
+  }
+
+  function openTypeSelect() {
+    const vals = getFieldsValue();
+    if (!vals.equipmentCategoryId) {
+      createMessage.warning('请先选择设备类别');
+      return;
+    }
+    openTypeModal(true, {
+      equipmentCategoryId: vals.equipmentCategoryId,
+      equipmentTypeId: vals.equipmentTypeId,
+    });
+  }
+
+  function clearType() {
+    clearEquipmentCascade('type');
+  }
+
+  function onTypeSelect(payload: { equipmentTypeId?: string; equipmentTypeName?: string }) {
+    setFieldsValue({
+      equipmentTypeId: payload.equipmentTypeId || '',
+      equipmentTypeName: payload.equipmentTypeName || '',
+    });
+  }
+
+  function openPartSelect() {
+    const vals = getFieldsValue();
+    if (!vals.equipmentCategoryId) {
+      createMessage.warning('请先选择设备类别');
+      return;
+    }
+    openPartModal(true, {
+      equipmentCategoryId: vals.equipmentCategoryId,
+      equipmentPartId: vals.equipmentPartId,
+    });
+  }
+
+  function clearPart() {
+    clearEquipmentCascade('part');
+  }
+
+  function onPartSelect(payload: { equipmentPartId?: string; equipmentPartName?: string }) {
+    setFieldsValue({
+      equipmentPartId: payload.equipmentPartId || '',
+      equipmentPartName: payload.equipmentPartName || '',
+      equipmentSubPartId: '',
+      equipmentSubPartName: '',
+    });
+  }
+
+  function openSubPartSelect() {
+    const vals = getFieldsValue();
+    if (!vals.equipmentCategoryId) {
+      createMessage.warning('请先选择设备类别');
+      return;
+    }
+    if (!vals.equipmentPartId) {
+      createMessage.warning('请先选择设备部位');
+      return;
+    }
+    openSubPartModal(true, {
+      equipmentCategoryId: vals.equipmentCategoryId,
+      equipmentPartId: vals.equipmentPartId,
+      equipmentSubPartId: vals.equipmentSubPartId,
+    });
+  }
+
+  function clearSubPart() {
+    setFieldsValue({ equipmentSubPartId: '', equipmentSubPartName: '' });
+  }
+
+  function onSubPartSelect(payload: { equipmentSubPartId?: string; equipmentSubPartName?: string }) {
+    setFieldsValue({
+      equipmentSubPartId: payload.equipmentSubPartId || '',
+      equipmentSubPartName: payload.equipmentSubPartName || '',
+    });
+  }
+
+  async function handleSubmit() {
+    const values = await validate();
+    setModalProps({ confirmLoading: true });
+    try {
+      await saveOrUpdate(values, isUpdate.value);
+      closeModal();
+      emit('success');
+    } finally {
+      setModalProps({ confirmLoading: false });
+    }
+  }
+</script>