Merge branch '生产及设备基础资料'

新增停机大类、停机类型 CRUD（含 Flyway 与独立 db 脚本）；调整工序/设备分类/设备类型菜单归属与权限；同步厂家信息菜单脚本。

Co-authored-by: Cursor <cursoragent@cursor.com>

jeecg-boot/db/mes-process-operation-menu-permission.sql

@@ -32,19 +32,19 @@ VALUES ('1860000000000000060', @mes_base_pid, '工序管理', '/xslmes/mesXslPro
 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`),
+`is_route` = VALUES(`is_route`), `is_leaf` = 0, `hidden` = 0, `status` = '1', `del_flag` = 0,
 `keep_alive` = VALUES(`keep_alive`), `internal_or_external` = VALUES(`internal_or_external`);
 
-INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `status`, `del_flag`, `create_by`, `create_time`) VALUES
+INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `is_leaf`, `status`, `del_flag`, `create_by`, `create_time`) VALUES
-('1860000000000000061', '1860000000000000060', '新增', 2, 'mes:mes_process_operation:add', '1', '1', 0, 'admin', NOW()),
+('1860000000000000061', '1860000000000000060', '新增', 2, 'mes:mes_process_operation:add', '1', 1, '1', 0, 'admin', NOW()),
-('1860000000000000062', '1860000000000000060', '编辑', 2, 'mes:mes_process_operation:edit', '1', '1', 0, 'admin', NOW()),
+('1860000000000000062', '1860000000000000060', '编辑', 2, 'mes:mes_process_operation:edit', '1', 1, '1', 0, 'admin', NOW()),
-('1860000000000000063', '1860000000000000060', '删除', 2, 'mes:mes_process_operation:delete', '1', '1', 0, 'admin', NOW()),
+('1860000000000000063', '1860000000000000060', '删除', 2, 'mes:mes_process_operation:delete', '1', 1, '1', 0, 'admin', NOW()),
-('1860000000000000064', '1860000000000000060', '批量删除', 2, 'mes:mes_process_operation:deleteBatch', '1', '1', 0, 'admin', NOW()),
+('1860000000000000064', '1860000000000000060', '批量删除', 2, 'mes:mes_process_operation:deleteBatch', '1', 1, '1', 0, 'admin', NOW()),
-('1860000000000000065', '1860000000000000060', '导出', 2, 'mes:mes_process_operation:exportXls', '1', '1', 0, 'admin', NOW()),
+('1860000000000000065', '1860000000000000060', '导出', 2, 'mes:mes_process_operation:exportXls', '1', 1, '1', 0, 'admin', NOW()),
-('1860000000000000066', '1860000000000000060', '导入', 2, 'mes:mes_process_operation:importExcel', '1', '1', 0, 'admin', NOW())
+('1860000000000000066', '1860000000000000060', '导入', 2, 'mes:mes_process_operation:importExcel', '1', 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`);
+`is_leaf` = 1, `status` = '1', `del_flag` = 0;
 
 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'

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

@@ -0,0 +1,82 @@
+-- MES 停机主类型：字典 + 建表 + 菜单 + 按钮 + 租户 admin 授权（可整文件一次执行）
+-- 权限前缀与 Controller、前端 v-auth 一致：mes:mes_xsl_downtime_main_type:*
+-- 父菜单：MES基础资料 / MES资料；修改租户改 SET @mes_tenant_id
+-- 新环境也可依赖 Flyway：V3.9.2_64__mes_xsl_downtime_main_type.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_downtime_main_type_status', '0启用1停用', 0, 'admin', NOW(), 0, 0
+WHERE NOT EXISTS (SELECT 1 FROM `sys_dict` WHERE `dict_code` = 'xslmes_downtime_main_type_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_downtime_main_type_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_downtime_main_type_status' AND NOT EXISTS (SELECT 1 FROM `sys_dict_item` i WHERE i.`dict_id` = d.id AND i.`item_value` = '1');
+
+CREATE TABLE IF NOT EXISTS `mes_xsl_downtime_main_type` (
+  `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 '工序名称冗余',
+  `downtime_type` varchar(500) NOT NULL COMMENT '停机类型（同租户未删除数据中唯一）',
+  `display_order` int NOT NULL DEFAULT '0' COMMENT '显示顺序（升序）',
+  `distinguish_color` varchar(500) DEFAULT NULL COMMENT '区分颜色（十六进制色值，如#1890ff）',
+  `status` varchar(1) NOT NULL DEFAULT '0' COMMENT '是否启用（字典xslmes_downtime_main_type_status：0启用1停用）',
+  `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_mdmt_tenant_type` (`tenant_id`, `downtime_type`),
+  KEY `idx_mdmt_process` (`process_operation_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 ('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`), `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()),
+('1860000000000000121', '1860000000000000119', '编辑', 2, 'mes:mes_xsl_downtime_main_type:edit', '1', '1', 0, 'admin', NOW()),
+('1860000000000000122', '1860000000000000119', '删除', 2, 'mes:mes_xsl_downtime_main_type:delete', '1', '1', 0, 'admin', NOW()),
+('1860000000000000123', '1860000000000000119', '批量删除', 2, 'mes:mes_xsl_downtime_main_type:deleteBatch', '1', '1', 0, 'admin', NOW()),
+('1860000000000000124', '1860000000000000119', '导出', 2, 'mes:mes_xsl_downtime_main_type:exportXls', '1', '1', 0, 'admin', NOW()),
+('1860000000000000125', '1860000000000000119', '导入', 2, 'mes:mes_xsl_downtime_main_type: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 (
+    '1860000000000000119',
+    '1860000000000000120', '1860000000000000121', '1860000000000000122', '1860000000000000123',
+    '1860000000000000124', '1860000000000000125'
+  )
+  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-downtime-main-type.sql

@@ -0,0 +1,22 @@
+-- 仅建表 mes_xsl_downtime_main_type。完整初始化请执行 mes-xsl-downtime-main-type-menu-permission.sql
+SET NAMES utf8mb4;
+
+CREATE TABLE IF NOT EXISTS `mes_xsl_downtime_main_type` (
+  `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 '工序名称冗余',
+  `downtime_type` varchar(500) NOT NULL COMMENT '停机类型（同租户未删除数据中唯一）',
+  `display_order` int NOT NULL DEFAULT '0' COMMENT '显示顺序（升序）',
+  `distinguish_color` varchar(500) DEFAULT NULL COMMENT '区分颜色（十六进制色值，如#1890ff）',
+  `status` varchar(1) NOT NULL DEFAULT '0' COMMENT '是否启用（字典xslmes_downtime_main_type_status：0启用1停用）',
+  `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_mdmt_tenant_type` (`tenant_id`, `downtime_type`),
+  KEY `idx_mdmt_process` (`process_operation_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES停机主类型';

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

@@ -0,0 +1,90 @@
+-- MES 停机类型：字典 + 建表 + 菜单 + 按钮 + 租户 admin 授权（可整文件一次执行）
+-- 权限前缀：mes:mes_xsl_downtime_type:*
+-- 依赖：mes_xsl_process_operation、mes_xsl_downtime_main_type；父菜单 MES基础资料
+-- Flyway：V3.9.2_65__mes_xsl_downtime_type.sql
+SET NAMES utf8mb4;
+
+-- 责任区分、故障等级为手填，不初始化字典；已上线库请执行 mes-xsl-downtime-type-remove-unused-dict.sql
+
+INSERT INTO `sys_dict` (`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `type`, `tenant_id`)
+SELECT REPLACE(UUID(), '-', ''), 'MES停机类型是否启用', 'xslmes_downtime_type_status', '0启用1停用', 0, 'admin', NOW(), 0, 0
+WHERE NOT EXISTS (SELECT 1 FROM `sys_dict` WHERE `dict_code` = 'xslmes_downtime_type_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_downtime_type_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_downtime_type_status' AND NOT EXISTS (SELECT 1 FROM `sys_dict_item` i WHERE i.`dict_id` = d.id AND i.`item_value` = '1');
+
+CREATE TABLE IF NOT EXISTS `mes_xsl_downtime_type` (
+  `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 '工序名称冗余',
+  `downtime_main_type_id` varchar(32) NOT NULL COMMENT '所属主类型 mes_xsl_downtime_main_type.id',
+  `downtime_main_type_name` varchar(500) DEFAULT NULL COMMENT '主类型名称冗余（停机主类型.downtime_type）',
+  `downtime_type` varchar(500) NOT NULL COMMENT '停机类型（同租户未删除数据中唯一）',
+  `display_order` int NOT NULL DEFAULT '0' COMMENT '显示顺序（升序，必填）',
+  `distinguish_color` varchar(500) DEFAULT NULL COMMENT '区分颜色（十六进制色值）',
+  `responsibility_distinct` varchar(500) DEFAULT NULL COMMENT '责任区分（手填）',
+  `fault_level` varchar(500) DEFAULT NULL COMMENT '故障等级（手填）',
+  `downtime_maintenance` varchar(1) DEFAULT '0' COMMENT '是否停机维修（字典yn：1是0否）',
+  `status` varchar(1) NOT NULL DEFAULT '0' COMMENT '是否启用（字典xslmes_downtime_type_status：0启用1停用）',
+  `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_mdt_tenant_type` (`tenant_id`, `downtime_type`),
+  KEY `idx_mdt_process` (`process_operation_id`),
+  KEY `idx_mdt_main_type` (`downtime_main_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 ('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`), `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()),
+('1860000000000000128', '1860000000000000126', '编辑', 2, 'mes:mes_xsl_downtime_type:edit', '1', '1', 0, 'admin', NOW()),
+('1860000000000000129', '1860000000000000126', '删除', 2, 'mes:mes_xsl_downtime_type:delete', '1', '1', 0, 'admin', NOW()),
+('1860000000000000130', '1860000000000000126', '批量删除', 2, 'mes:mes_xsl_downtime_type:deleteBatch', '1', '1', 0, 'admin', NOW()),
+('1860000000000000131', '1860000000000000126', '导出', 2, 'mes:mes_xsl_downtime_type:exportXls', '1', '1', 0, 'admin', NOW()),
+('1860000000000000132', '1860000000000000126', '导入', 2, 'mes:mes_xsl_downtime_type: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 (
+    '1860000000000000126',
+    '1860000000000000127', '1860000000000000128', '1860000000000000129', '1860000000000000130',
+    '1860000000000000131', '1860000000000000132'
+  )
+  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-downtime-type-remove-unused-dict.sql

@@ -0,0 +1,11 @@
+-- 删除停机类型模块中已废弃的字典（责任区分、故障等级已改为手填，不再使用下拉字典）
+-- 保留：xslmes_downtime_type_status（是否启用）、xslmes_downtime_main_type_status（停机主类型是否启用）
+-- 执行后请在系统管理刷新字典缓存，或重新登录
+SET NAMES utf8mb4;
+
+DELETE i FROM `sys_dict_item` i
+INNER JOIN `sys_dict` d ON i.`dict_id` = d.`id`
+WHERE d.`dict_code` IN ('xslmes_downtime_responsibility', 'xslmes_downtime_fault_level');
+
+DELETE FROM `sys_dict`
+WHERE `dict_code` IN ('xslmes_downtime_responsibility', 'xslmes_downtime_fault_level');

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

@@ -0,0 +1,28 @@
+-- 仅建表 mes_xsl_downtime_type。完整初始化请执行 mes-xsl-downtime-type-menu-permission.sql
+SET NAMES utf8mb4;
+
+CREATE TABLE IF NOT EXISTS `mes_xsl_downtime_type` (
+  `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 '工序名称冗余',
+  `downtime_main_type_id` varchar(32) NOT NULL COMMENT '所属主类型 mes_xsl_downtime_main_type.id',
+  `downtime_main_type_name` varchar(500) DEFAULT NULL COMMENT '主类型名称冗余（停机主类型.downtime_type）',
+  `downtime_type` varchar(500) NOT NULL COMMENT '停机类型（同租户未删除数据中唯一）',
+  `display_order` int NOT NULL DEFAULT '0' COMMENT '显示顺序（升序，必填）',
+  `distinguish_color` varchar(500) DEFAULT NULL COMMENT '区分颜色（十六进制色值）',
+  `responsibility_distinct` varchar(500) DEFAULT NULL COMMENT '责任区分（手填）',
+  `fault_level` varchar(500) DEFAULT NULL COMMENT '故障等级（手填）',
+  `downtime_maintenance` varchar(1) DEFAULT '0' COMMENT '是否停机维修（字典yn：1是0否）',
+  `status` varchar(1) NOT NULL DEFAULT '0' COMMENT '是否启用（字典xslmes_downtime_type_status：0启用1停用）',
+  `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_mdt_tenant_type` (`tenant_id`, `downtime_type`),
+  KEY `idx_mdt_process` (`process_operation_id`),
+  KEY `idx_mdt_main_type` (`downtime_main_type_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES停机类型';

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

@@ -56,30 +56,31 @@ WHERE d.`dict_code` = 'xslmes_equipment_maintain_distinct'
 
 SET @mes_tenant_id = 1002;
 
-SET @mes_base_pid = (
+SET @mes_equip_pid = (
-  SELECT MIN(`id`) FROM `sys_permission`
+  SELECT `id` FROM `sys_permission`
-  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` IN ('MES基础资料', 'MES资料')
+  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`),
-`is_route` = VALUES(`is_route`), `is_leaf` = VALUES(`is_leaf`), `hidden` = VALUES(`hidden`), `status` = VALUES(`status`), `del_flag` = VALUES(`del_flag`),
+`is_route` = VALUES(`is_route`), `is_leaf` = 0, `hidden` = 0, `status` = '1', `del_flag` = 0,
 `keep_alive` = VALUES(`keep_alive`), `internal_or_external` = VALUES(`internal_or_external`);
 
-INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `status`, `del_flag`, `create_by`, `create_time`) VALUES
+INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `is_leaf`, `status`, `del_flag`, `create_by`, `create_time`) VALUES
-('1860000000000000071', '1860000000000000070', '新增', 2, 'mes:mes_xsl_equipment_category:add', '1', '1', 0, 'admin', NOW()),
+('1860000000000000071', '1860000000000000070', '新增', 2, 'mes:mes_xsl_equipment_category:add', '1', 1, '1', 0, 'admin', NOW()),
-('1860000000000000072', '1860000000000000070', '编辑', 2, 'mes:mes_xsl_equipment_category:edit', '1', '1', 0, 'admin', NOW()),
+('1860000000000000072', '1860000000000000070', '编辑', 2, 'mes:mes_xsl_equipment_category:edit', '1', 1, '1', 0, 'admin', NOW()),
-('1860000000000000073', '1860000000000000070', '删除', 2, 'mes:mes_xsl_equipment_category:delete', '1', '1', 0, 'admin', NOW()),
+('1860000000000000073', '1860000000000000070', '删除', 2, 'mes:mes_xsl_equipment_category:delete', '1', 1, '1', 0, 'admin', NOW()),
-('1860000000000000074', '1860000000000000070', '批量删除', 2, 'mes:mes_xsl_equipment_category:deleteBatch', '1', '1', 0, 'admin', NOW()),
+('1860000000000000074', '1860000000000000070', '批量删除', 2, 'mes:mes_xsl_equipment_category:deleteBatch', '1', 1, '1', 0, 'admin', NOW()),
-('1860000000000000075', '1860000000000000070', '导出', 2, 'mes:mes_xsl_equipment_category:exportXls', '1', '1', 0, 'admin', NOW()),
+('1860000000000000075', '1860000000000000070', '导出', 2, 'mes:mes_xsl_equipment_category:exportXls', '1', 1, '1', 0, 'admin', NOW()),
-('1860000000000000076', '1860000000000000070', '导入', 2, 'mes:mes_xsl_equipment_category:importExcel', '1', '1', 0, 'admin', NOW())
+('1860000000000000076', '1860000000000000070', '导入', 2, 'mes:mes_xsl_equipment_category:importExcel', '1', 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`);
+`is_leaf` = 1, `status` = '1', `del_flag` = 0;
 
 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'

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 = (
+SET @mes_equip_pid = (
-  SELECT MIN(`id`) FROM `sys_permission`
+  SELECT `id` FROM `sys_permission`
-  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` IN ('MES基础资料', 'MES资料')
+  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 = (
+SET @mes_equip_pid = (
-  SELECT MIN(`id`) FROM `sys_permission`
+  SELECT `id` FROM `sys_permission`
-  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` IN ('MES XSL', 'XSLMES管理', 'XSLMES')
+  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

@@ -0,0 +1,65 @@
+-- 设备类型菜单/按钮补全并挂到「设备管理」（解决仅 UPDATE 时 id 077 不存在、菜单与权限均不显示）
+-- 可重复执行；修改租户改 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
+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_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`),
+`is_route` = VALUES(`is_route`), `is_leaf` = 0, `hidden` = 0, `status` = '1', `del_flag` = 0,
+`keep_alive` = VALUES(`keep_alive`), `internal_or_external` = VALUES(`internal_or_external`);
+
+INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `is_leaf`, `status`, `del_flag`, `create_by`, `create_time`) VALUES
+('1860000000000000078', '1860000000000000077', '新增', 2, 'mes:mes_xsl_equipment_type:add', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000079', '1860000000000000077', '编辑', 2, 'mes:mes_xsl_equipment_type:edit', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000080', '1860000000000000077', '删除', 2, 'mes:mes_xsl_equipment_type:delete', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000081', '1860000000000000077', '批量删除', 2, 'mes:mes_xsl_equipment_type:deleteBatch', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000082', '1860000000000000077', '导出', 2, 'mes:mes_xsl_equipment_type:exportXls', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000083', '1860000000000000077', '导入', 2, 'mes:mes_xsl_equipment_type:importExcel', '1', 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`), `is_leaf` = 1, `status` = '1', `del_flag` = 0;
+
+UPDATE `sys_permission` p
+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',
+    p.`component` = 'xslmes/mesXslEquipmentType/MesXslEquipmentTypeList',
+    p.`hidden` = 0,
+    p.`del_flag` = 0,
+    p.`status` = '1',
+    p.`update_time` = NOW()
+WHERE p.`menu_type` = 1
+  AND p.`url` = '/xslmes/mesXslEquipmentType'
+  AND p.`id` <> '1860000000000000077';
+
+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 (
+    '1860000000000000077',
+    '1860000000000000078', '1860000000000000079', '1860000000000000080',
+    '1860000000000000081', '1860000000000000082', '1860000000000000083'
+  )
+  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-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 = (
+SET @mes_equip_pid = (
-  SELECT MIN(`id`) FROM `sys_permission`
+  SELECT `id` FROM `sys_permission`
-  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` IN ('MES基础资料', 'MES资料')
+  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-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;
 
@@ -31,14 +31,14 @@ WHERE d.`dict_code` = 'xslmes_manufacturer_valid' AND NOT EXISTS (SELECT 1 FROM
 
 CREATE TABLE IF NOT EXISTS `mes_xsl_manufacturer` (
   `id` varchar(32) NOT NULL COMMENT '主键',
-  `manufacturer_category` varchar(32) NOT NULL COMMENT '厂家类别（字典xslmes_manufacturer_category：mold模具 capsule胶囊 equipment设备）',
+  `manufacturer_category` varchar(500) NOT NULL COMMENT '厂家类别（字典xslmes_manufacturer_category：mold模具 capsule胶囊 equipment设备）',
-  `manufacturer_name` varchar(128) NOT NULL COMMENT '厂家名称（同租户未删除数据中唯一）',
+  `manufacturer_name` varchar(500) NOT NULL COMMENT '厂家名称（同租户未删除数据中唯一）',
   `valid_status` varchar(1) NOT NULL DEFAULT '0' COMMENT '是否有效（字典xslmes_manufacturer_valid：0有效1无效）',
   `tenant_id` int DEFAULT NULL COMMENT '租户',
-  `sys_org_code` varchar(64) DEFAULT NULL COMMENT '部门',
+  `sys_org_code` varchar(500) DEFAULT NULL COMMENT '部门',
-  `create_by` varchar(32) DEFAULT NULL COMMENT '创建人',
+  `create_by` varchar(500) DEFAULT NULL COMMENT '创建人',
   `create_time` datetime DEFAULT NULL COMMENT '创建时间',
-  `update_by` varchar(32) 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`),
@@ -47,19 +47,22 @@ CREATE TABLE IF NOT EXISTS `mes_xsl_manufacturer` (
 
 SET @mes_tenant_id = 1002;
 
-SET @mes_base_pid = (
+SET @mes_equip_pid = (
-  SELECT MIN(`id`) FROM `sys_permission`
+  SELECT `id` FROM `sys_permission`
-  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` IN ('MES基础资料', 'MES资料')
+  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-manufacturer.sql

@@ -3,14 +3,14 @@ SET NAMES utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `mes_xsl_manufacturer` (
   `id` varchar(32) NOT NULL COMMENT '主键',
-  `manufacturer_category` varchar(32) NOT NULL COMMENT '厂家类别（字典xslmes_manufacturer_category：mold模具 capsule胶囊 equipment设备）',
+  `manufacturer_category` varchar(500) NOT NULL COMMENT '厂家类别（字典xslmes_manufacturer_category：mold模具 capsule胶囊 equipment设备）',
-  `manufacturer_name` varchar(128) NOT NULL COMMENT '厂家名称（同租户未删除数据中唯一）',
+  `manufacturer_name` varchar(500) NOT NULL COMMENT '厂家名称（同租户未删除数据中唯一）',
   `valid_status` varchar(1) NOT NULL DEFAULT '0' COMMENT '是否有效（字典xslmes_manufacturer_valid：0有效1无效）',
   `tenant_id` int DEFAULT NULL COMMENT '租户',
-  `sys_org_code` varchar(64) DEFAULT NULL COMMENT '部门',
+  `sys_org_code` varchar(500) DEFAULT NULL COMMENT '部门',
-  `create_by` varchar(32) DEFAULT NULL COMMENT '创建人',
+  `create_by` varchar(500) DEFAULT NULL COMMENT '创建人',
   `create_time` datetime DEFAULT NULL COMMENT '创建时间',
-  `update_by` varchar(32) 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`),

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

@@ -0,0 +1,104 @@
+-- 工序管理挂「MES基础资料」；设备类别、设备类型挂「设备管理」；修复权限树（is_leaf）与租户 admin 授权
+-- 适用：菜单曾在 MES XSL 根下或 is_leaf=1 导致角色授权页不显示按钮权限
+-- 修改租户：改 SET @mes_tenant_id
+SET NAMES utf8mb4;
+
+SET @mes_tenant_id = 1002;
+
+SET @mes_base_pid = (
+  SELECT `id` FROM `sys_permission`
+  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` = 'MES基础资料'
+  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 = (
+  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
+`parent_id` = VALUES(`parent_id`), `url` = VALUES(`url`), `component` = VALUES(`component`),
+`is_leaf` = 0, `hidden` = 0, `status` = '1', `del_flag` = 0;
+
+INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `is_leaf`, `status`, `del_flag`, `create_by`, `create_time`) VALUES
+('1860000000000000061', '1860000000000000060', '新增', 2, 'mes:mes_process_operation:add', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000062', '1860000000000000060', '编辑', 2, 'mes:mes_process_operation:edit', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000063', '1860000000000000060', '删除', 2, 'mes:mes_process_operation:delete', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000064', '1860000000000000060', '批量删除', 2, 'mes:mes_process_operation:deleteBatch', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000065', '1860000000000000060', '导出', 2, 'mes:mes_process_operation:exportXls', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000066', '1860000000000000060', '导入', 2, 'mes:mes_process_operation:importExcel', '1', 1, '1', 0, 'admin', NOW())
+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_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;
+
+INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `is_leaf`, `status`, `del_flag`, `create_by`, `create_time`) VALUES
+('1860000000000000071', '1860000000000000070', '新增', 2, 'mes:mes_xsl_equipment_category:add', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000072', '1860000000000000070', '编辑', 2, 'mes:mes_xsl_equipment_category:edit', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000073', '1860000000000000070', '删除', 2, 'mes:mes_xsl_equipment_category:delete', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000074', '1860000000000000070', '批量删除', 2, 'mes:mes_xsl_equipment_category:deleteBatch', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000075', '1860000000000000070', '导出', 2, 'mes:mes_xsl_equipment_category:exportXls', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000076', '1860000000000000070', '导入', 2, 'mes:mes_xsl_equipment_category:importExcel', '1', 1, '1', 0, 'admin', NOW())
+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_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;
+
+INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `is_leaf`, `status`, `del_flag`, `create_by`, `create_time`) VALUES
+('1860000000000000078', '1860000000000000077', '新增', 2, 'mes:mes_xsl_equipment_type:add', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000079', '1860000000000000077', '编辑', 2, 'mes:mes_xsl_equipment_type:edit', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000080', '1860000000000000077', '删除', 2, 'mes:mes_xsl_equipment_type:delete', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000081', '1860000000000000077', '批量删除', 2, 'mes:mes_xsl_equipment_type:deleteBatch', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000082', '1860000000000000077', '导出', 2, 'mes:mes_xsl_equipment_type:exportXls', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000083', '1860000000000000077', '导入', 2, 'mes:mes_xsl_equipment_type:importExcel', '1', 1, '1', 0, 'admin', NOW())
+ON DUPLICATE KEY UPDATE
+`parent_id` = VALUES(`parent_id`), `perms` = VALUES(`perms`), `is_leaf` = 1, `status` = '1', `del_flag` = 0;
+
+UPDATE `sys_permission` SET `name` = '新增' WHERE `id` = '1860000000000000061' AND `name` = '添加';
+
+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 (
+    '1860000000000000060',
+    '1860000000000000061', '1860000000000000062', '1860000000000000063',
+    '1860000000000000064', '1860000000000000065', '1860000000000000066',
+    '1860000000000000070',
+    '1860000000000000071', '1860000000000000072', '1860000000000000073',
+    '1860000000000000074', '1860000000000000075', '1860000000000000076',
+    '1860000000000000077',
+    '1860000000000000078', '1860000000000000079', '1860000000000000080',
+    '1860000000000000081', '1860000000000000082', '1860000000000000083'
+  )
+  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-process-and-category-menu-fix.sql

@@ -0,0 +1,90 @@
+-- 工序管理(060)挂 MES基础资料；设备类别(070)挂设备管理；修复 is_leaf、租户 admin 授权
+-- 可重复执行；修改租户改 SET @mes_tenant_id
+SET NAMES utf8mb4;
+
+SET @mes_tenant_id = 1002;
+
+SET @mes_base_pid = (
+  SELECT `id` FROM `sys_permission`
+  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` = 'MES基础资料'
+  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 = (
+  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
+`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`),
+`is_route` = VALUES(`is_route`), `is_leaf` = 0, `hidden` = 0, `status` = '1', `del_flag` = 0;
+
+INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `is_leaf`, `status`, `del_flag`, `create_by`, `create_time`) VALUES
+('1860000000000000061', '1860000000000000060', '新增', 2, 'mes:mes_process_operation:add', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000062', '1860000000000000060', '编辑', 2, 'mes:mes_process_operation:edit', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000063', '1860000000000000060', '删除', 2, 'mes:mes_process_operation:delete', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000064', '1860000000000000060', '批量删除', 2, 'mes:mes_process_operation:deleteBatch', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000065', '1860000000000000060', '导出', 2, 'mes:mes_process_operation:exportXls', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000066', '1860000000000000060', '导入', 2, 'mes:mes_process_operation:importExcel', '1', 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`), `is_leaf` = 1, `status` = '1', `del_flag` = 0;
+
+UPDATE `sys_permission` SET `name` = '新增' WHERE `id` = '1860000000000000061' AND `name` = '添加';
+
+-- 设备类别
+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_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`),
+`is_route` = VALUES(`is_route`), `is_leaf` = 0, `hidden` = 0, `status` = '1', `del_flag` = 0;
+
+INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `is_leaf`, `status`, `del_flag`, `create_by`, `create_time`) VALUES
+('1860000000000000071', '1860000000000000070', '新增', 2, 'mes:mes_xsl_equipment_category:add', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000072', '1860000000000000070', '编辑', 2, 'mes:mes_xsl_equipment_category:edit', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000073', '1860000000000000070', '删除', 2, 'mes:mes_xsl_equipment_category:delete', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000074', '1860000000000000070', '批量删除', 2, 'mes:mes_xsl_equipment_category:deleteBatch', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000075', '1860000000000000070', '导出', 2, 'mes:mes_xsl_equipment_category:exportXls', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000076', '1860000000000000070', '导入', 2, 'mes:mes_xsl_equipment_category:importExcel', '1', 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`), `is_leaf` = 1, `status` = '1', `del_flag` = 0;
+
+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 (
+    '1860000000000000060',
+    '1860000000000000061', '1860000000000000062', '1860000000000000063',
+    '1860000000000000064', '1860000000000000065', '1860000000000000066',
+    '1860000000000000070',
+    '1860000000000000071', '1860000000000000072', '1860000000000000073',
+    '1860000000000000074', '1860000000000000075', '1860000000000000076'
+  )
+  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-raw-material-inspect-record-menu.sql

@@ -0,0 +1,66 @@
+-- 原材料送检记录菜单与权限（挂到 MES管理）
+SET NAMES utf8mb4;
+
+SET @mes_parent_id = (
+  SELECT id
+  FROM sys_permission
+  WHERE url = '/mes' AND menu_type = 0
+  ORDER BY create_time ASC
+  LIMIT 1
+);
+SET @mes_parent_id = IFNULL(@mes_parent_id, '1860000000000000001');
+
+-- 二级菜单：原材料送检记录
+INSERT INTO sys_permission(
+  id, parent_id, name, url, component, component_name, menu_type, perms, perms_type, sort_no,
+  is_route, is_leaf, hidden, status, del_flag, keep_alive, internal_or_external, create_by, create_time
+)
+VALUES (
+  '1860000000000099111', @mes_parent_id, '原材料送检记录',
+  '/xslmes/mesXslRawMaterialInspectRecordList',
+  'xslmes/mesXslRawMaterialInspectRecord/MesXslRawMaterialInspectRecordList',
+  'MesXslRawMaterialInspectRecordList', 1, NULL, '1', 22,
+  1, 1, 0, '1', 0, 1, 0, 'admin', NOW()
+)
+ON DUPLICATE KEY UPDATE
+  parent_id = VALUES(parent_id),
+  name = VALUES(name),
+  url = VALUES(url),
+  component = VALUES(component),
+  component_name = VALUES(component_name),
+  menu_type = VALUES(menu_type),
+  perms = VALUES(perms),
+  perms_type = VALUES(perms_type),
+  sort_no = VALUES(sort_no),
+  is_route = VALUES(is_route),
+  is_leaf = VALUES(is_leaf),
+  hidden = VALUES(hidden),
+  status = VALUES(status),
+  del_flag = VALUES(del_flag),
+  keep_alive = VALUES(keep_alive),
+  internal_or_external = VALUES(internal_or_external);
+
+-- 按钮权限
+INSERT INTO sys_permission(id, parent_id, name, menu_type, perms, perms_type, status, del_flag, create_by, create_time) VALUES
+('1860000000000099112', '1860000000000099111', '编辑', 2, 'xslmes:mes_xsl_raw_material_inspect_record:edit', '1', '1', 0, 'admin', NOW()),
+('1860000000000099113', '1860000000000099111', '导出', 2, 'xslmes:mes_xsl_raw_material_inspect_record:exportXls', '1', '1', 0, 'admin', NOW())
+ON DUPLICATE KEY UPDATE
+  parent_id = VALUES(parent_id),
+  name = VALUES(name),
+  menu_type = VALUES(menu_type),
+  perms = VALUES(perms),
+  perms_type = VALUES(perms_type),
+  status = VALUES(status),
+  del_flag = VALUES(del_flag);
+
+-- admin 角色授权
+INSERT INTO sys_role_permission(id, role_id, permission_id, operate_date, operate_ip)
+SELECT REPLACE(UUID(), '-', ''), 'f6817f48af4fb3af11b9e8bf182f618b', p.id, NOW(), '127.0.0.1'
+FROM sys_permission p
+WHERE p.id IN ('1860000000000099111', '1860000000000099112', '1860000000000099113')
+  AND NOT EXISTS (
+    SELECT 1
+    FROM sys_role_permission rp
+    WHERE rp.role_id = 'f6817f48af4fb3af11b9e8bf182f618b'
+      AND rp.permission_id = p.id
+  );

jeecg-boot/db/mes-xsl-raw-material-inspect-record-reset.sql

@@ -0,0 +1,36 @@
+-- 原材料送检记录测试数据重置脚本（稳妥版）
+-- 作用：
+-- 1) 将存在送检记录关联的原材料卡片检测结果重置为「未检(0)」
+-- 2) 清空原材料送检记录主表/子表数据
+SET NAMES utf8mb4;
+
+START TRANSACTION;
+
+-- 执行前计数（便于确认是否命中数据）
+SELECT COUNT(1) AS before_record_count FROM mes_xsl_raw_material_inspect_record;
+SELECT COUNT(1) AS before_record_line_count FROM mes_xsl_raw_material_inspect_record_line;
+
+-- 回写原材料卡片检测结果为未检（0）：只重置存在送检记录关联的卡片
+UPDATE mes_xsl_raw_material_card c
+JOIN (
+  SELECT DISTINCT r.raw_material_card_id AS card_id
+  FROM mes_xsl_raw_material_inspect_record r
+  WHERE r.raw_material_card_id IS NOT NULL
+    AND r.raw_material_card_id <> ''
+) t ON t.card_id = c.id
+SET c.test_result = '0',
+    c.update_time = NOW();
+
+-- 先删子表，再删主表
+DELETE FROM mes_xsl_raw_material_inspect_record_line
+WHERE record_id IN (
+  SELECT id FROM mes_xsl_raw_material_inspect_record
+);
+
+DELETE FROM mes_xsl_raw_material_inspect_record;
+
+COMMIT;
+
+-- 执行后计数
+SELECT COUNT(1) AS remaining_record_count FROM mes_xsl_raw_material_inspect_record;
+SELECT COUNT(1) AS remaining_record_line_count FROM mes_xsl_raw_material_inspect_record_line;

jeecg-boot/db/mes-xsl-raw-material-inspect-record.sql

@@ -0,0 +1,80 @@
+-- 原材料送检记录（主表 + 子表）
+SET NAMES utf8mb4;
+
+CREATE TABLE IF NOT EXISTS `mes_xsl_raw_material_inspect_record` (
+  `id` varchar(32) NOT NULL COMMENT '主键',
+  `raw_material_card_id` varchar(32) DEFAULT NULL COMMENT '原材料卡片ID',
+  `barcode` varchar(128) DEFAULT NULL COMMENT '条码',
+  `batch_no` varchar(128) DEFAULT NULL COMMENT '批次号',
+  `material_id` varchar(32) DEFAULT NULL COMMENT '物料ID',
+  `material_name` varchar(200) DEFAULT NULL COMMENT '物料名称',
+  `inspect_status` varchar(10) DEFAULT '0' COMMENT '检验状态（字典 xslmes_inspect_status：0待检 1合格 2不合格）',
+  `inspect_time` datetime DEFAULT NULL COMMENT '送检时间',
+  `result_time` datetime DEFAULT NULL COMMENT '判定时间',
+  `remark` varchar(500) DEFAULT NULL COMMENT '备注',
+  `create_by` varchar(32) DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(32) DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `tenant_id` int DEFAULT NULL COMMENT '租户',
+  PRIMARY KEY (`id`),
+  KEY `idx_xsl_rm_ir_card` (`raw_material_card_id`),
+  KEY `idx_xsl_rm_ir_status` (`inspect_status`),
+  KEY `idx_xsl_rm_ir_time` (`inspect_time`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='原材料送检记录';
+
+CREATE TABLE IF NOT EXISTS `mes_xsl_raw_material_inspect_record_line` (
+  `id` varchar(32) NOT NULL COMMENT '主键',
+  `record_id` varchar(32) NOT NULL COMMENT '送检记录主表ID',
+  `inspect_std_id` varchar(32) DEFAULT NULL COMMENT '检验标准ID',
+  `inspect_item_id` varchar(32) DEFAULT NULL COMMENT '检验项目ID',
+  `inspect_item_name` varchar(200) DEFAULT NULL COMMENT '检验项目名称',
+  `allow_min` decimal(24,6) DEFAULT NULL COMMENT '容许最小值',
+  `include_min_flag` int NOT NULL DEFAULT '0' COMMENT '包含最小值：1是 0否',
+  `allow_max` decimal(24,6) DEFAULT NULL COMMENT '容许最大值',
+  `include_max_flag` int NOT NULL DEFAULT '0' COMMENT '包含最大值：1是 0否',
+  `inspect_value` decimal(24,6) DEFAULT NULL COMMENT '检验值',
+  `pass_flag` varchar(10) DEFAULT '0' COMMENT '判定状态（字典 xslmes_inspect_status：0待检 1合格 2不合格）',
+  `sort_no` int DEFAULT NULL COMMENT '排序',
+  `create_by` varchar(32) DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(32) DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`),
+  KEY `idx_xsl_rm_irl_record` (`record_id`),
+  KEY `idx_xsl_rm_irl_item` (`inspect_item_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='原材料送检记录-检验明细';
+
+-- 字典：送检状态
+INSERT INTO `sys_dict` (`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `type`)
+SELECT REPLACE(UUID(), '-', ''), '送检状态', 'xslmes_inspect_status', '原材料送检状态：待检/合格/不合格', 0, 'admin', NOW(), 0
+WHERE NOT EXISTS (
+  SELECT 1 FROM `sys_dict` WHERE `dict_code` = 'xslmes_inspect_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, '待检', '0', '待检', 1, 1, 'admin', NOW()
+FROM `sys_dict` d
+WHERE d.`dict_code` = 'xslmes_inspect_status'
+  AND d.`del_flag` = 0
+  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`, `description`, `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_inspect_status'
+  AND d.`del_flag` = 0
+  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`, `description`, `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_inspect_status'
+  AND d.`del_flag` = 0
+  AND NOT EXISTS (
+    SELECT 1 FROM `sys_dict_item` i WHERE i.dict_id = d.id AND i.item_value = '2'
+  );

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 = (
+SET @mes_equip_pid = (
-  SELECT MIN(`id`) FROM `sys_permission`
+  SELECT `id` FROM `sys_permission`
-  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` IN ('MES基础资料', 'MES资料')
+  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 = (
+SET @mes_equip_pid = (
-  SELECT MIN(`id`) FROM `sys_permission`
+  SELECT `id` FROM `sys_permission`
-  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` IN ('MES基础资料', 'MES资料')
+  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/MesXslDesktopAnonController.java

@@ -43,6 +43,7 @@ import org.jeecg.modules.xslmes.service.MesXslStompNotifyService;
 import org.jeecg.modules.xslmes.vo.MesXslRawMaterialCardBriefVO;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
@@ -405,12 +406,7 @@ public class MesXslDesktopAnonController {
         if (oConvertUtils.isEmpty(mesXslWeightRecord.getPlateNumber())) {
             return Result.error("车牌号不能为空");
         }
-        // 净重自动计算
+        applyWeightNetAndBillType(mesXslWeightRecord);
-        if (mesXslWeightRecord.getGrossWeight() != null && mesXslWeightRecord.getTareWeight() != null) {
-            mesXslWeightRecord.setNetWeight(
-                mesXslWeightRecord.getGrossWeight().subtract(mesXslWeightRecord.getTareWeight()));
-        }
-        applyWeightBillType(mesXslWeightRecord);
         applyMaterialTypeDefault(mesXslWeightRecord);
         weightRecordService.save(mesXslWeightRecord);
         stompNotify.publishWeightRecordChanged("add", mesXslWeightRecord.getId());
@@ -423,12 +419,7 @@ public class MesXslDesktopAnonController {
         if (oConvertUtils.isEmpty(mesXslWeightRecord.getId())) {
             return Result.error("主键不能为空");
         }
-        // 净重自动计算
+        applyWeightNetAndBillType(mesXslWeightRecord);
-        if (mesXslWeightRecord.getGrossWeight() != null && mesXslWeightRecord.getTareWeight() != null) {
-            mesXslWeightRecord.setNetWeight(
-                mesXslWeightRecord.getGrossWeight().subtract(mesXslWeightRecord.getTareWeight()));
-        }
-        applyWeightBillType(mesXslWeightRecord);
         applyMaterialTypeDefault(mesXslWeightRecord);
         boolean ok = weightRecordService.updateById(mesXslWeightRecord);
         if (!ok) {
@@ -839,18 +830,47 @@ public class MesXslDesktopAnonController {
 
     // ─────────────────────────── 车辆私有辅助 ────────────────────────────
 
+    private void applyWeightNetAndBillType(MesXslWeightRecord record) {
+        sanitizeNonPositiveWeightsToNull(record);
+        if (isEffectiveWeight(record.getGrossWeight()) && isEffectiveWeight(record.getTareWeight())) {
+            BigDecimal net = record.getGrossWeight().subtract(record.getTareWeight());
+            record.setNetWeight(net.compareTo(BigDecimal.ZERO) >= 0 ? net : BigDecimal.ZERO);
+        } else {
+            record.setNetWeight(null);
+        }
+        applyWeightBillType(record);
+    }
+
+    /** 将 ≤0 的重量视为未录入，避免 JSON/Numeric 占位 0 被当成已称皮重、误判称重完成 */
+    private static void sanitizeNonPositiveWeightsToNull(MesXslWeightRecord record) {
+        if (record.getGrossWeight() != null && record.getGrossWeight().compareTo(BigDecimal.ZERO) <= 0) {
+            record.setGrossWeight(null);
+        }
+        if (record.getTareWeight() != null && record.getTareWeight().compareTo(BigDecimal.ZERO) <= 0) {
+            record.setTareWeight(null);
+        }
+    }
+
+    private static boolean isEffectiveWeight(BigDecimal w) {
+        return w != null && w.compareTo(BigDecimal.ZERO) > 0;
+    }
+
     private void applyWeightBillType(MesXslWeightRecord record) {
-        if (record.getGrossWeight() != null && record.getTareWeight() != null) {
+        boolean g = isEffectiveWeight(record.getGrossWeight());
+        boolean t = isEffectiveWeight(record.getTareWeight());
+        if (g && t) {
             record.setBillType("2");
             return;
         }
-        if (record.getGrossWeight() != null) {
+        if (g) {
             record.setBillType("1");
             return;
         }
-        if (record.getTareWeight() != null) {
+        if (t) {
             record.setBillType("3");
+            return;
         }
+        record.setBillType(null);
     }
 
     private void applyMaterialTypeDefault(MesXslWeightRecord record) {

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

@@ -0,0 +1,324 @@
+package org.jeecg.modules.xslmes.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Pattern;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.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.MesXslDowntimeMainType;
+import org.jeecg.modules.xslmes.entity.MesXslProcessOperation;
+import org.jeecg.modules.xslmes.service.IMesXslDowntimeMainTypeService;
+import org.jeecg.modules.xslmes.service.IMesXslProcessOperationService;
+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/mesXslDowntimeMainType")
+@Slf4j
+public class MesXslDowntimeMainTypeController extends JeecgController<MesXslDowntimeMainType, IMesXslDowntimeMainTypeService> {
+
+    private static final Set<String> STATUS_VALUES = Set.of("0", "1");
+    private static final Pattern COLOR_HEX = Pattern.compile("^#([0-9A-Fa-f]{6}|[0-9A-Fa-f]{3})$");
+
+    @Autowired
+    private IMesXslDowntimeMainTypeService mesXslDowntimeMainTypeService;
+
+    @Autowired
+    private IMesXslProcessOperationService mesXslProcessOperationService;
+
+    @Operation(summary = "MES停机主类型-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<MesXslDowntimeMainType>> queryPageList(
+            MesXslDowntimeMainType model,
+            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+            HttpServletRequest req) {
+        QueryWrapper<MesXslDowntimeMainType> queryWrapper = QueryGenerator.initQueryWrapper(model, req.getParameterMap());
+        //update-begin---author:jiangxh ---date:20260518  for：【MES】停机主类型列表默认按显示顺序升序-----------
+        queryWrapper.orderByAsc("display_order").orderByDesc("create_time");
+        //update-end---author:jiangxh ---date:20260518  for：【MES】停机主类型列表默认按显示顺序升序-----------
+        Page<MesXslDowntimeMainType> page = new Page<>(pageNo, pageSize);
+        IPage<MesXslDowntimeMainType> pageList = mesXslDowntimeMainTypeService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    @AutoLog(value = "MES停机主类型-添加")
+    @Operation(summary = "MES停机主类型-添加")
+    @RequiresPermissions("mes:mes_xsl_downtime_main_type:add")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody MesXslDowntimeMainType 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】停机主类型保存前校验-----------
+        mesXslDowntimeMainTypeService.save(model);
+        return Result.OK("添加成功！");
+    }
+
+    @AutoLog(value = "MES停机主类型-编辑")
+    @Operation(summary = "MES停机主类型-编辑")
+    @RequiresPermissions("mes:mes_xsl_downtime_main_type:edit")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody MesXslDowntimeMainType 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】停机主类型保存前校验-----------
+        mesXslDowntimeMainTypeService.updateById(model);
+        return Result.OK("编辑成功!");
+    }
+
+    @AutoLog(value = "MES停机主类型-删除")
+    @Operation(summary = "MES停机主类型-通过id删除")
+    @RequiresPermissions("mes:mes_xsl_downtime_main_type:delete")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        mesXslDowntimeMainTypeService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    @AutoLog(value = "MES停机主类型-批量删除")
+    @Operation(summary = "MES停机主类型-批量删除")
+    @RequiresPermissions("mes:mes_xsl_downtime_main_type:deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        mesXslDowntimeMainTypeService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
+
+    @Operation(summary = "MES停机主类型-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<MesXslDowntimeMainType> queryById(@RequestParam(name = "id", required = true) String id) {
+        MesXslDowntimeMainType entity = mesXslDowntimeMainTypeService.getById(id);
+        if (entity == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(entity);
+    }
+
+    @Operation(summary = "校验停机类型是否重复（同租户未删除数据；dataId 为编辑时当前主键）")
+    @GetMapping(value = "/checkDowntimeType")
+    public Result<String> checkDowntimeType(
+            @RequestParam(name = "downtimeType", required = true) String downtimeType,
+            @RequestParam(name = "dataId", required = false) String dataId) {
+        if (oConvertUtils.isEmpty(downtimeType) || downtimeType.trim().isEmpty()) {
+            return Result.OK("该值可用！");
+        }
+        MesXslDowntimeMainType ctx = new MesXslDowntimeMainType();
+        if (mesXslDowntimeMainTypeService.isDowntimeTypeDuplicated(downtimeType.trim(), dataId, ctx)) {
+            return Result.error("停机类型不能重复");
+        }
+        return Result.OK("该值可用！");
+    }
+
+    @RequiresPermissions("mes:mes_xsl_downtime_main_type:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, MesXslDowntimeMainType model) {
+        return super.exportXls(request, model, MesXslDowntimeMainType.class, "MES停机主类型");
+    }
+
+    @RequiresPermissions("mes:mes_xsl_downtime_main_type:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        //update-begin---author:jiangxh ---date:20260518  for：【MES】停机主类型导入：类型唯一、工序编码解析、颜色与启用状态校验-----------
+        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<MesXslDowntimeMainType> list =
+                        ExcelImportUtil.importExcel(file.getInputStream(), MesXslDowntimeMainType.class, params);
+                if (list == null) {
+                    list = List.of();
+                }
+                Set<String> typesInFile = new HashSet<>();
+                for (int i = 0; i < list.size(); i++) {
+                    MesXslDowntimeMainType row = list.get(i);
+                    int rowNo = i + 1;
+                    if (row == null) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条数据无效（空行）");
+                    }
+                    String dt = row.getDowntimeType();
+                    if (dt != null) {
+                        dt = dt.trim();
+                    }
+                    if (oConvertUtils.isEmpty(dt)) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条停机类型不能为空");
+                    }
+                    row.setDowntimeType(dt);
+                    if (!typesInFile.add(dt)) {
+                        return Result.error("文件导入失败：停机类型【" + dt + "】在导入文件中重复");
+                    }
+                    if (mesXslDowntimeMainTypeService.isDowntimeTypeDuplicated(dt, null, row)) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条停机类型【" + dt + "】不能重复（同租户未删除数据中已存在）");
+                    }
+                    String opCode = row.getImportOperationCode();
+                    if (opCode != null) {
+                        opCode = opCode.trim();
+                    }
+                    if (oConvertUtils.isEmpty(opCode)) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条工序编码不能为空");
+                    }
+                    MesXslProcessOperation op = findProcessByOperationCode(opCode, row);
+                    if (op == null) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条工序编码【" + opCode + "】不存在");
+                    }
+                    row.setProcessOperationId(op.getId());
+                    row.setProcessOperationName(op.getOperationName());
+
+                    if (row.getDisplayOrder() == null) {
+                        row.setDisplayOrder(0);
+                    }
+                    String colorErr = normalizeColor(row);
+                    if (colorErr != null) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条" + colorErr);
+                    }
+                    String st = row.getStatus();
+                    if (oConvertUtils.isEmpty(st)) {
+                        row.setStatus("0");
+                    } else {
+                        st = st.trim();
+                        if (!STATUS_VALUES.contains(st)) {
+                            return Result.error("文件导入失败：第 " + rowNo + " 条是否启用无效（须为 0 启用或 1 停用）");
+                        }
+                        row.setStatus(st);
+                    }
+                    row.setImportOperationCode(null);
+                }
+                long start = System.currentTimeMillis();
+                mesXslDowntimeMainTypeService.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);
+                }
+            }
+        }
+        //update-end---author:jiangxh ---date:20260518  for：【MES】停机主类型导入：类型唯一、工序编码解析、颜色与启用状态校验-----------
+        return Result.error("文件导入失败！");
+    }
+
+    //update-begin---author:jiangxh ---date:20260518  for：【MES】停机主类型保存前校验与工序名称回填-----------
+    private String validateForSave(MesXslDowntimeMainType model, String excludeId) {
+        if (oConvertUtils.isEmpty(model.getDowntimeType()) || model.getDowntimeType().trim().isEmpty()) {
+            return "停机类型不能为空";
+        }
+        String dt = model.getDowntimeType().trim();
+        model.setDowntimeType(dt);
+        if (mesXslDowntimeMainTypeService.isDowntimeTypeDuplicated(dt, excludeId, model)) {
+            return "停机类型不能重复";
+        }
+        if (oConvertUtils.isEmpty(model.getProcessOperationId())) {
+            return "请选择所属工序";
+        }
+        MesXslProcessOperation op = mesXslProcessOperationService.getById(model.getProcessOperationId());
+        if (op == null) {
+            return "所属工序不存在";
+        }
+        model.setProcessOperationName(op.getOperationName());
+
+        if (model.getDisplayOrder() == null) {
+            model.setDisplayOrder(0);
+        }
+
+        String colorErr = normalizeColor(model);
+        if (colorErr != null) {
+            return colorErr;
+        }
+
+        String st = model.getStatus();
+        if (oConvertUtils.isEmpty(st)) {
+            model.setStatus("0");
+        } else {
+            st = st.trim();
+            if (!STATUS_VALUES.contains(st)) {
+                return "是否启用取值无效";
+            }
+            model.setStatus(st);
+        }
+        model.setImportOperationCode(null);
+        return null;
+    }
+
+    private static String normalizeColor(MesXslDowntimeMainType model) {
+        String color = model.getDistinguishColor();
+        if (oConvertUtils.isEmpty(color)) {
+            model.setDistinguishColor(null);
+            return null;
+        }
+        color = color.trim();
+        if (!color.startsWith("#")) {
+            color = "#" + color;
+        }
+        if (!COLOR_HEX.matcher(color).matches()) {
+            return "区分颜色格式无效（须为十六进制色值，如 #1890ff）";
+        }
+        model.setDistinguishColor(color.toLowerCase());
+        return null;
+    }
+
+    private MesXslProcessOperation findProcessByOperationCode(String operationCode, MesXslDowntimeMainType context) {
+        LambdaQueryWrapper<MesXslProcessOperation> w = new LambdaQueryWrapper<>();
+        w.eq(MesXslProcessOperation::getOperationCode, operationCode.trim());
+        w.and(
+                q ->
+                        q.eq(MesXslProcessOperation::getDelFlag, CommonConstant.DEL_FLAG_0)
+                                .or()
+                                .isNull(MesXslProcessOperation::getDelFlag));
+        Integer tenantId = context != null ? context.getTenantId() : null;
+        if (tenantId != null) {
+            w.eq(MesXslProcessOperation::getTenantId, tenantId);
+        }
+        List<MesXslProcessOperation> found = mesXslProcessOperationService.list(w);
+        if (found == null || found.isEmpty()) {
+            return null;
+        }
+        return found.get(0);
+    }
+    //update-end---author:jiangxh ---date:20260518  for：【MES】停机主类型保存前校验与工序名称回填-----------
+}

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

@@ -0,0 +1,433 @@
+package org.jeecg.modules.xslmes.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Pattern;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.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.MesXslDowntimeMainType;
+import org.jeecg.modules.xslmes.entity.MesXslDowntimeType;
+import org.jeecg.modules.xslmes.entity.MesXslProcessOperation;
+import org.jeecg.modules.xslmes.service.IMesXslDowntimeMainTypeService;
+import org.jeecg.modules.xslmes.service.IMesXslDowntimeTypeService;
+import org.jeecg.modules.xslmes.service.IMesXslProcessOperationService;
+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/mesXslDowntimeType")
+@Slf4j
+public class MesXslDowntimeTypeController extends JeecgController<MesXslDowntimeType, IMesXslDowntimeTypeService> {
+
+    private static final Set<String> STATUS_VALUES = Set.of("0", "1");
+    private static final Set<String> YN_VALUES = Set.of("0", "1");
+    private static final Pattern COLOR_HEX = Pattern.compile("^#([0-9A-Fa-f]{6}|[0-9A-Fa-f]{3})$");
+
+    @Autowired
+    private IMesXslDowntimeTypeService mesXslDowntimeTypeService;
+
+    @Autowired
+    private IMesXslProcessOperationService mesXslProcessOperationService;
+
+    @Autowired
+    private IMesXslDowntimeMainTypeService mesXslDowntimeMainTypeService;
+
+    @Operation(summary = "MES停机类型-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<MesXslDowntimeType>> queryPageList(
+            MesXslDowntimeType model,
+            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+            HttpServletRequest req) {
+        QueryWrapper<MesXslDowntimeType> queryWrapper = QueryGenerator.initQueryWrapper(model, req.getParameterMap());
+        //update-begin---author:jiangxh ---date:20260518  for：【MES】停机类型列表默认按显示顺序升序-----------
+        queryWrapper.orderByAsc("display_order").orderByDesc("create_time");
+        //update-end---author:jiangxh ---date:20260518  for：【MES】停机类型列表默认按显示顺序升序-----------
+        Page<MesXslDowntimeType> page = new Page<>(pageNo, pageSize);
+        IPage<MesXslDowntimeType> pageList = mesXslDowntimeTypeService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    @AutoLog(value = "MES停机类型-添加")
+    @Operation(summary = "MES停机类型-添加")
+    @RequiresPermissions("mes:mes_xsl_downtime_type:add")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody MesXslDowntimeType 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】停机类型保存前校验-----------
+        mesXslDowntimeTypeService.save(model);
+        return Result.OK("添加成功！");
+    }
+
+    @AutoLog(value = "MES停机类型-编辑")
+    @Operation(summary = "MES停机类型-编辑")
+    @RequiresPermissions("mes:mes_xsl_downtime_type:edit")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody MesXslDowntimeType 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】停机类型保存前校验-----------
+        mesXslDowntimeTypeService.updateById(model);
+        return Result.OK("编辑成功!");
+    }
+
+    @AutoLog(value = "MES停机类型-删除")
+    @Operation(summary = "MES停机类型-通过id删除")
+    @RequiresPermissions("mes:mes_xsl_downtime_type:delete")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        mesXslDowntimeTypeService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    @AutoLog(value = "MES停机类型-批量删除")
+    @Operation(summary = "MES停机类型-批量删除")
+    @RequiresPermissions("mes:mes_xsl_downtime_type:deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        mesXslDowntimeTypeService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
+
+    @Operation(summary = "MES停机类型-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<MesXslDowntimeType> queryById(@RequestParam(name = "id", required = true) String id) {
+        MesXslDowntimeType entity = mesXslDowntimeTypeService.getById(id);
+        if (entity == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(entity);
+    }
+
+    @Operation(summary = "校验停机类型是否重复（同租户未删除数据；dataId 为编辑时当前主键）")
+    @GetMapping(value = "/checkDowntimeType")
+    public Result<String> checkDowntimeType(
+            @RequestParam(name = "downtimeType", required = true) String downtimeType,
+            @RequestParam(name = "dataId", required = false) String dataId) {
+        if (oConvertUtils.isEmpty(downtimeType) || downtimeType.trim().isEmpty()) {
+            return Result.OK("该值可用！");
+        }
+        MesXslDowntimeType ctx = new MesXslDowntimeType();
+        if (mesXslDowntimeTypeService.isDowntimeTypeDuplicated(downtimeType.trim(), dataId, ctx)) {
+            return Result.error("停机类型不能重复");
+        }
+        return Result.OK("该值可用！");
+    }
+
+    @RequiresPermissions("mes:mes_xsl_downtime_type:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, MesXslDowntimeType model) {
+        return super.exportXls(request, model, MesXslDowntimeType.class, "MES停机类型");
+    }
+
+    @RequiresPermissions("mes:mes_xsl_downtime_type:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        //update-begin---author:jiangxh ---date:20260518  for：【MES】停机类型导入：必填校验、类型唯一、工序与主类型解析-----------
+        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<MesXslDowntimeType> list =
+                        ExcelImportUtil.importExcel(file.getInputStream(), MesXslDowntimeType.class, params);
+                if (list == null) {
+                    list = List.of();
+                }
+                Set<String> typesInFile = new HashSet<>();
+                for (int i = 0; i < list.size(); i++) {
+                    MesXslDowntimeType row = list.get(i);
+                    int rowNo = i + 1;
+                    if (row == null) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条数据无效（空行）");
+                    }
+                    String err = validateImportRow(row, rowNo, typesInFile);
+                    if (err != null) {
+                        return Result.error(err);
+                    }
+                }
+                long start = System.currentTimeMillis();
+                mesXslDowntimeTypeService.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);
+                }
+            }
+        }
+        //update-end---author:jiangxh ---date:20260518  for：【MES】停机类型导入：必填校验、类型唯一、工序与主类型解析-----------
+        return Result.error("文件导入失败！");
+    }
+
+    //update-begin---author:jiangxh ---date:20260518  for：【MES】停机类型保存前校验、关联工序与主类型回填-----------
+    private String validateForSave(MesXslDowntimeType model, String excludeId) {
+        if (oConvertUtils.isEmpty(model.getProcessOperationId())) {
+            return "请选择所属工序";
+        }
+        MesXslProcessOperation op = mesXslProcessOperationService.getById(model.getProcessOperationId());
+        if (op == null) {
+            return "所属工序不存在";
+        }
+        model.setProcessOperationName(op.getOperationName());
+
+        if (oConvertUtils.isEmpty(model.getDowntimeMainTypeId())) {
+            return "请选择所属主类型";
+        }
+        String mainErr = fillAndValidateMainType(model);
+        if (mainErr != null) {
+            return mainErr;
+        }
+
+        if (oConvertUtils.isEmpty(model.getDowntimeType()) || model.getDowntimeType().trim().isEmpty()) {
+            return "停机类型不能为空";
+        }
+        String dt = model.getDowntimeType().trim();
+        model.setDowntimeType(dt);
+        if (mesXslDowntimeTypeService.isDowntimeTypeDuplicated(dt, excludeId, model)) {
+            return "停机类型不能重复";
+        }
+
+        if (model.getDisplayOrder() == null) {
+            return "显示顺序不能为空";
+        }
+
+        String colorErr = normalizeColor(model);
+        if (colorErr != null) {
+            return colorErr;
+        }
+
+        //update-begin---author:jiangxh ---date:20260518  for：【MES】责任区分、故障等级改为手填文本，仅 trim-----------
+        model.setResponsibilityDistinct(trimToNull(model.getResponsibilityDistinct()));
+        model.setFaultLevel(trimToNull(model.getFaultLevel()));
+        //update-end---author:jiangxh ---date:20260518  for：【MES】责任区分、故障等级改为手填文本，仅 trim-----------
+
+        String dm = model.getDowntimeMaintenance();
+        if (oConvertUtils.isEmpty(dm)) {
+            model.setDowntimeMaintenance("0");
+        } else {
+            dm = dm.trim();
+            if (!YN_VALUES.contains(dm)) {
+                return "是否停机维修取值无效";
+            }
+            model.setDowntimeMaintenance(dm);
+        }
+
+        String st = model.getStatus();
+        if (oConvertUtils.isEmpty(st)) {
+            model.setStatus("0");
+        } else {
+            st = st.trim();
+            if (!STATUS_VALUES.contains(st)) {
+                return "是否启用取值无效";
+            }
+            model.setStatus(st);
+        }
+        model.setImportOperationCode(null);
+        model.setImportMainTypeName(null);
+        return null;
+    }
+
+    private String fillAndValidateMainType(MesXslDowntimeType model) {
+        MesXslDowntimeMainType main = mesXslDowntimeMainTypeService.getById(model.getDowntimeMainTypeId());
+        if (main == null) {
+            return "所属主类型不存在";
+        }
+        if (!model.getProcessOperationId().equals(main.getProcessOperationId())) {
+            return "所属主类型与所选工序不匹配";
+        }
+        model.setDowntimeMainTypeName(main.getDowntimeType());
+        return null;
+    }
+
+    private String validateImportRow(MesXslDowntimeType row, int rowNo, Set<String> typesInFile) {
+        String opCode = row.getImportOperationCode();
+        if (opCode != null) {
+            opCode = opCode.trim();
+        }
+        if (oConvertUtils.isEmpty(opCode)) {
+            return "文件导入失败：第 " + rowNo + " 条工序编码不能为空";
+        }
+        MesXslProcessOperation op = findProcessByOperationCode(opCode, row);
+        if (op == null) {
+            return "文件导入失败：第 " + rowNo + " 条工序编码【" + opCode + "】不存在";
+        }
+        row.setProcessOperationId(op.getId());
+        row.setProcessOperationName(op.getOperationName());
+
+        String mainName = row.getImportMainTypeName();
+        if (mainName != null) {
+            mainName = mainName.trim();
+        }
+        if (oConvertUtils.isEmpty(mainName)) {
+            return "文件导入失败：第 " + rowNo + " 条主类型名称不能为空";
+        }
+        MesXslDowntimeMainType main = findMainTypeByNameAndProcess(mainName, op.getId(), row);
+        if (main == null) {
+            return "文件导入失败：第 " + rowNo + " 条主类型【" + mainName + "】在所选工序下不存在";
+        }
+        row.setDowntimeMainTypeId(main.getId());
+        row.setDowntimeMainTypeName(main.getDowntimeType());
+
+        String dt = row.getDowntimeType();
+        if (dt != null) {
+            dt = dt.trim();
+        }
+        if (oConvertUtils.isEmpty(dt)) {
+            return "文件导入失败：第 " + rowNo + " 条停机类型不能为空";
+        }
+        row.setDowntimeType(dt);
+        if (!typesInFile.add(dt)) {
+            return "文件导入失败：停机类型【" + dt + "】在导入文件中重复";
+        }
+        if (mesXslDowntimeTypeService.isDowntimeTypeDuplicated(dt, null, row)) {
+            return "文件导入失败：第 " + rowNo + " 条停机类型【" + dt + "】不能重复（同租户未删除数据中已存在）";
+        }
+        if (row.getDisplayOrder() == null) {
+            return "文件导入失败：第 " + rowNo + " 条显示顺序不能为空";
+        }
+
+        String colorErr = normalizeColor(row);
+        if (colorErr != null) {
+            return "文件导入失败：第 " + rowNo + " 条" + colorErr;
+        }
+
+        row.setResponsibilityDistinct(trimToNull(row.getResponsibilityDistinct()));
+        row.setFaultLevel(trimToNull(row.getFaultLevel()));
+
+        String dm = row.getDowntimeMaintenance();
+        if (oConvertUtils.isEmpty(dm)) {
+            row.setDowntimeMaintenance("0");
+        } else {
+            dm = dm.trim();
+            if (!YN_VALUES.contains(dm)) {
+                return "文件导入失败：第 " + rowNo + " 条是否停机维修无效";
+            }
+            row.setDowntimeMaintenance(dm);
+        }
+
+        String st = row.getStatus();
+        if (oConvertUtils.isEmpty(st)) {
+            row.setStatus("0");
+        } else {
+            st = st.trim();
+            if (!STATUS_VALUES.contains(st)) {
+                return "文件导入失败：第 " + rowNo + " 条是否启用无效";
+            }
+            row.setStatus(st);
+        }
+        row.setImportOperationCode(null);
+        row.setImportMainTypeName(null);
+        return null;
+    }
+
+    private MesXslDowntimeMainType findMainTypeByNameAndProcess(
+            String mainTypeName, String processOperationId, MesXslDowntimeType context) {
+        LambdaQueryWrapper<MesXslDowntimeMainType> w = new LambdaQueryWrapper<>();
+        w.eq(MesXslDowntimeMainType::getDowntimeType, mainTypeName.trim());
+        w.eq(MesXslDowntimeMainType::getProcessOperationId, processOperationId);
+        w.and(
+                q ->
+                        q.eq(MesXslDowntimeMainType::getDelFlag, CommonConstant.DEL_FLAG_0)
+                                .or()
+                                .isNull(MesXslDowntimeMainType::getDelFlag));
+        Integer tenantId = context != null ? context.getTenantId() : null;
+        if (tenantId != null) {
+            w.eq(MesXslDowntimeMainType::getTenantId, tenantId);
+        }
+        w.last("LIMIT 1");
+        return mesXslDowntimeMainTypeService.getOne(w, false);
+    }
+
+    private MesXslProcessOperation findProcessByOperationCode(String operationCode, MesXslDowntimeType context) {
+        LambdaQueryWrapper<MesXslProcessOperation> w = new LambdaQueryWrapper<>();
+        w.eq(MesXslProcessOperation::getOperationCode, operationCode.trim());
+        w.and(
+                q ->
+                        q.eq(MesXslProcessOperation::getDelFlag, CommonConstant.DEL_FLAG_0)
+                                .or()
+                                .isNull(MesXslProcessOperation::getDelFlag));
+        Integer tenantId = context != null ? context.getTenantId() : null;
+        if (tenantId != null) {
+            w.eq(MesXslProcessOperation::getTenantId, tenantId);
+        }
+        List<MesXslProcessOperation> found = mesXslProcessOperationService.list(w);
+        if (found == null || found.isEmpty()) {
+            return null;
+        }
+        return found.get(0);
+    }
+
+    private static String trimToNull(String value) {
+        if (value == null) {
+            return null;
+        }
+        String v = value.trim();
+        return v.isEmpty() ? null : v;
+    }
+
+    private static String normalizeColor(MesXslDowntimeType model) {
+        String color = model.getDistinguishColor();
+        if (oConvertUtils.isEmpty(color)) {
+            model.setDistinguishColor(null);
+            return null;
+        }
+        color = color.trim();
+        if (!color.startsWith("#")) {
+            color = "#" + color;
+        }
+        if (!COLOR_HEX.matcher(color).matches()) {
+            return "区分颜色格式无效（须为十六进制色值，如 #1890ff）";
+        }
+        model.setDistinguishColor(color.toLowerCase());
+        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/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/MesXslRawMaterialCardController.java

@@ -12,8 +12,12 @@ 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.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.util.oConvertUtils;
@@ -32,6 +36,8 @@ import org.jeecg.modules.print.support.PrintServerPdfJobService;
 import org.jeecg.modules.print.util.PrintBizDataMappingUtil;
 import org.jeecg.modules.xslmes.constant.MesXslPrintConstants;
 import org.jeecg.modules.xslmes.entity.MesXslRawMaterialCard;
+import org.jeecg.modules.xslmes.entity.MesXslRawMaterialInspectRecord;
+import org.jeecg.modules.xslmes.mapper.MesXslRawMaterialInspectRecordMapper;
 import org.jeecg.modules.xslmes.service.IMesXslRawMaterialCardService;
 import org.jeecg.modules.xslmes.service.MesXslStompNotifyService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -72,6 +78,8 @@ public class MesXslRawMaterialCardController extends JeecgController<MesXslRawMa
     private IPrintTemplateService printTemplateService;
     @Autowired
     private ObjectMapper objectMapper;
+    @Autowired
+    private MesXslRawMaterialInspectRecordMapper inspectRecordMapper;
 
     /**
      * 分页列表查询
@@ -82,8 +90,11 @@ public class MesXslRawMaterialCardController extends JeecgController<MesXslRawMa
                                                                @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                                @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                                HttpServletRequest req) {
+        if (mesXslRawMaterialCard == null) {
+            mesXslRawMaterialCard = new MesXslRawMaterialCard();
+        }
         // 库区条件：去掉实体上的值避免 QueryGenerator 再拼一班；用 TRIM 与看板聚合一致（避免首尾空格导致「有汇总无明细」）
-        String rawWarehouseArea = mesXslRawMaterialCard != null ? mesXslRawMaterialCard.getWarehouseArea() : null;
+        String rawWarehouseArea = mesXslRawMaterialCard.getWarehouseArea();
         String areaEq = oConvertUtils.isNotEmpty(rawWarehouseArea) ? rawWarehouseArea.trim() : "";
         boolean filterByWarehouseArea = !areaEq.isEmpty();
         if (filterByWarehouseArea) {
@@ -114,9 +125,34 @@ public class MesXslRawMaterialCardController extends JeecgController<MesXslRawMa
         }
         Page<MesXslRawMaterialCard> page = new Page<>(pageNo, pageSize);
         IPage<MesXslRawMaterialCard> pageList = mesXslRawMaterialCardService.page(page, queryWrapper);
+        fillPendingInspectFlag(pageList.getRecords());
         return Result.OK(pageList);
     }
 
+    private void fillPendingInspectFlag(List<MesXslRawMaterialCard> cards) {
+        if (cards == null || cards.isEmpty()) {
+            return;
+        }
+        Set<String> cardIds = cards.stream()
+                .map(MesXslRawMaterialCard::getId)
+                .filter(StringUtils::isNotBlank)
+                .collect(Collectors.toSet());
+        if (cardIds.isEmpty()) {
+            return;
+        }
+        List<MesXslRawMaterialInspectRecord> pendingList = inspectRecordMapper.selectList(
+                new QueryWrapper<MesXslRawMaterialInspectRecord>()
+                        .select("raw_material_card_id")
+                        .in("raw_material_card_id", cardIds)
+                        .eq("inspect_status", "0")
+                        .groupBy("raw_material_card_id"));
+        Set<String> pendingCardIds = pendingList == null ? Collections.emptySet() : pendingList.stream()
+                .map(MesXslRawMaterialInspectRecord::getRawMaterialCardId)
+                .filter(StringUtils::isNotBlank)
+                .collect(Collectors.toSet());
+        cards.forEach(card -> card.setHasPendingInspect(pendingCardIds.contains(card.getId())));
+    }
+
     /**
      * 添加
      */

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

@@ -0,0 +1,115 @@
+package org.jeecg.modules.xslmes.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.xslmes.entity.MesXslRawMaterialInspectRecord;
+import org.jeecg.modules.xslmes.entity.MesXslRawMaterialInspectRecordLine;
+import org.jeecg.modules.xslmes.service.IMesXslRawMaterialInspectRecordService;
+import org.jeecg.modules.xslmes.vo.MesXslRawMaterialInspectRecordPage;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+@Tag(name = "原材料送检记录")
+@RestController
+@RequestMapping("/xslmes/mesXslRawMaterialInspectRecord")
+public class MesXslRawMaterialInspectRecordController
+    extends JeecgController<MesXslRawMaterialInspectRecord, IMesXslRawMaterialInspectRecordService> {
+
+  @Autowired private IMesXslRawMaterialInspectRecordService inspectRecordService;
+
+  @Operation(summary = "原材料送检记录-分页列表查询")
+  @GetMapping("/list")
+  public Result<IPage<MesXslRawMaterialInspectRecord>> queryPageList(
+      MesXslRawMaterialInspectRecord query,
+      @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+      HttpServletRequest req) {
+    QueryWrapper<MesXslRawMaterialInspectRecord> queryWrapper =
+        QueryGenerator.initQueryWrapper(query, req.getParameterMap());
+    queryWrapper.orderByDesc("inspect_time");
+    IPage<MesXslRawMaterialInspectRecord> pageList =
+        inspectRecordService.page(new Page<>(pageNo, pageSize), queryWrapper);
+    return Result.OK(pageList);
+  }
+
+  @AutoLog(value = "原材料送检记录-送检")
+  @Operation(summary = "原材料送检记录-送检（由原材料卡片生成）")
+  @RequiresPermissions("xslmes:mes_xsl_raw_material_card:edit")
+  @PostMapping("/createByCard")
+  public Result<MesXslRawMaterialInspectRecord> createByCard(@RequestBody Map<String, Object> body) {
+    String rawMaterialCardId =
+        body.get("rawMaterialCardId") == null ? "" : body.get("rawMaterialCardId").toString();
+    if (StringUtils.isBlank(rawMaterialCardId)) {
+      return Result.error("rawMaterialCardId不能为空");
+    }
+    MesXslRawMaterialInspectRecord record =
+        inspectRecordService.createByRawMaterialCardId(rawMaterialCardId.trim());
+    return Result.OK("送检成功", record);
+  }
+
+  @Operation(summary = "原材料送检记录-通过id查询")
+  @GetMapping("/queryById")
+  public Result<MesXslRawMaterialInspectRecord> queryById(@RequestParam(name = "id") String id) {
+    MesXslRawMaterialInspectRecord db = inspectRecordService.getById(id);
+    if (db == null) {
+      return Result.error("未找到对应数据");
+    }
+    return Result.OK(db);
+  }
+
+  @Operation(summary = "原材料送检记录-按主表查询子表")
+  @GetMapping("/queryLineListByRecordId")
+  public Result<List<MesXslRawMaterialInspectRecordLine>> queryLineListByRecordId(
+      @RequestParam(name = "id") String id) {
+    return Result.OK(inspectRecordService.selectLinesByRecordId(id));
+  }
+
+  @AutoLog(value = "原材料送检记录-录入检验结果前加载明细")
+  @Operation(summary = "原材料送检记录-录入检验结果前加载明细")
+  @RequiresPermissions("xslmes:mes_xsl_raw_material_inspect_record:edit")
+  @PostMapping("/prepareResultEntry")
+  public Result<List<MesXslRawMaterialInspectRecordLine>> prepareResultEntry(
+      @RequestBody Map<String, Object> body) {
+    String id = body.get("id") == null ? "" : body.get("id").toString();
+    if (StringUtils.isBlank(id)) {
+      return Result.error("id不能为空");
+    }
+    return Result.OK(inspectRecordService.prepareResultEntryLines(id.trim()));
+  }
+
+  @AutoLog(value = "原材料送检记录-保存检验结果")
+  @Operation(summary = "原材料送检记录-保存检验结果")
+  @RequiresPermissions("xslmes:mes_xsl_raw_material_inspect_record:edit")
+  @PostMapping("/saveInspectResult")
+  public Result<String> saveInspectResult(@RequestBody MesXslRawMaterialInspectRecordPage page) {
+    if (StringUtils.isBlank(page.getId())) {
+      return Result.error("id不能为空");
+    }
+    inspectRecordService.saveInspectResult(page.getId(), page.getLineList());
+    return Result.OK("保存成功");
+  }
+
+  @RequiresPermissions("xslmes:mes_xsl_raw_material_inspect_record:exportXls")
+  @RequestMapping("/exportXls")
+  public ModelAndView exportXls(HttpServletRequest request, MesXslRawMaterialInspectRecord query) {
+    return super.exportXls(request, query, MesXslRawMaterialInspectRecord.class, "原材料送检记录");
+  }
+}

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

@@ -101,7 +101,8 @@ public class MesXslRawMaterialSummaryController {
                 .append("AND (w.del_flag = 0 OR w.del_flag IS NULL) ")
                 .append("LEFT JOIN mes_mixer_material m ON m.id = i.material_id ")
                 .append("AND (m.del_flag = 0 OR m.del_flag IS NULL) ")
-                .append("WHERE (i.del_flag = 0 OR i.del_flag IS NULL) ");
+                // mes_xsl_raw_material_inventory 表当前无 del_flag 字段，这里使用恒真条件避免 SQL 报错
+                .append("WHERE 1=1 ");
 
         if (query != null && StringUtils.isNotBlank(query.getWarehouseName())) {
             sql.append("AND ").append(warehouseExpr).append(" LIKE ? ");

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

@@ -72,9 +72,9 @@ public class MesXslWeightRecordController extends JeecgController<MesXslWeightRe
             String seq = String.format("%03d", new Random().nextInt(1000));
             mesXslWeightRecord.setBillNo("BDH-" + dateStr + seq);
         }
-        computeBillType(mesXslWeightRecord);
         applyMaterialTypeDefault(mesXslWeightRecord);
         computeNetWeight(mesXslWeightRecord);
+        computeBillType(mesXslWeightRecord);
         mesXslWeightRecordService.save(mesXslWeightRecord);
         stompNotifyService.publishWeightRecordChanged("add", mesXslWeightRecord.getId());
         return Result.OK("添加成功！");
@@ -85,9 +85,9 @@ public class MesXslWeightRecordController extends JeecgController<MesXslWeightRe
     @RequiresPermissions("xslmes:mes_xsl_weight_record:edit")
     @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
     public Result<String> edit(@RequestBody MesXslWeightRecord mesXslWeightRecord) {
-        computeBillType(mesXslWeightRecord);
         applyMaterialTypeDefault(mesXslWeightRecord);
         computeNetWeight(mesXslWeightRecord);
+        computeBillType(mesXslWeightRecord);
         mesXslWeightRecordService.updateById(mesXslWeightRecord);
         stompNotifyService.publishWeightRecordChanged("edit", mesXslWeightRecord.getId());
         return Result.OK("编辑成功!");
@@ -137,26 +137,47 @@ public class MesXslWeightRecordController extends JeecgController<MesXslWeightRe
     }
 
     private void computeNetWeight(MesXslWeightRecord record) {
+        sanitizeNonPositiveWeightsToNull(record);
         BigDecimal gross = record.getGrossWeight();
         BigDecimal tare = record.getTareWeight();
-        if (gross != null && tare != null) {
+        if (isEffectiveWeight(gross) && isEffectiveWeight(tare)) {
             BigDecimal net = gross.subtract(tare);
             record.setNetWeight(net.compareTo(BigDecimal.ZERO) >= 0 ? net : BigDecimal.ZERO);
+        } else {
+            record.setNetWeight(null);
         }
     }
 
     private void computeBillType(MesXslWeightRecord record) {
-        if (record.getGrossWeight() != null && record.getTareWeight() != null) {
+        boolean g = isEffectiveWeight(record.getGrossWeight());
+        boolean t = isEffectiveWeight(record.getTareWeight());
+        if (g && t) {
             record.setBillType("2");
             return;
         }
-        if (record.getGrossWeight() != null) {
+        if (g) {
             record.setBillType("1");
             return;
         }
-        if (record.getTareWeight() != null) {
+        if (t) {
             record.setBillType("3");
+            return;
         }
+        record.setBillType(null);
+    }
+
+    /** 将 ≤0 的重量视为未录入，避免占位 0 误判称重完成 */
+    private static void sanitizeNonPositiveWeightsToNull(MesXslWeightRecord record) {
+        if (record.getGrossWeight() != null && record.getGrossWeight().compareTo(BigDecimal.ZERO) <= 0) {
+            record.setGrossWeight(null);
+        }
+        if (record.getTareWeight() != null && record.getTareWeight().compareTo(BigDecimal.ZERO) <= 0) {
+            record.setTareWeight(null);
+        }
+    }
+
+    private static boolean isEffectiveWeight(BigDecimal w) {
+        return w != null && w.compareTo(BigDecimal.ZERO) > 0;
     }
 
     private void applyMaterialTypeDefault(MesXslWeightRecord record) {

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

@@ -0,0 +1,74 @@
+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 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_downtime_main_type）
+ */
+@Data
+@TableName("mes_xsl_downtime_main_type")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "MES停机主类型")
+public class MesXslDowntimeMainType implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
+
+    @Schema(description = "所属工序主键")
+    private String processOperationId;
+
+    @Excel(name = "工序名称", width = 24)
+    @Schema(description = "工序名称冗余")
+    private String processOperationName;
+
+    @Excel(name = "停机类型", width = 24)
+    @Schema(description = "停机类型（同租户未删除数据中唯一）")
+    private String downtimeType;
+
+    @Excel(name = "显示顺序", width = 12)
+    @Schema(description = "显示顺序（升序）")
+    private Integer displayOrder;
+
+    @Excel(name = "区分颜色", width = 16)
+    @Schema(description = "区分颜色（十六进制色值）")
+    private String distinguishColor;
+
+    @Excel(name = "是否启用", width = 12, dicCode = "xslmes_downtime_main_type_status")
+    @Dict(dicCode = "xslmes_downtime_main_type_status")
+    @Schema(description = "是否启用（字典 xslmes_downtime_main_type_status：0启用1停用）")
+    private String status;
+
+    /** Excel 导入用：工序编码，不落库 */
+    @TableField(exist = false)
+    @Excel(name = "工序编码", width = 18)
+    @Schema(description = "导入用工序编码")
+    private String importOperationCode;
+
+    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/MesXslDowntimeType.java

@@ -0,0 +1,98 @@
+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 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_downtime_type）
+ */
+@Data
+@TableName("mes_xsl_downtime_type")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "MES停机类型")
+public class MesXslDowntimeType implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
+
+    @Schema(description = "所属工序主键")
+    private String processOperationId;
+
+    @Excel(name = "工序名称", width = 24)
+    @Schema(description = "工序名称冗余")
+    private String processOperationName;
+
+    @Schema(description = "所属停机主类型主键")
+    private String downtimeMainTypeId;
+
+    @Excel(name = "所属主类型", width = 24)
+    @Schema(description = "主类型名称冗余")
+    private String downtimeMainTypeName;
+
+    @Excel(name = "停机类型", width = 24)
+    @Schema(description = "停机类型（同租户未删除数据中唯一）")
+    private String downtimeType;
+
+    @Excel(name = "显示顺序", width = 12)
+    @Schema(description = "显示顺序（升序，必填）")
+    private Integer displayOrder;
+
+    @Excel(name = "区分颜色", width = 16)
+    @Schema(description = "区分颜色（十六进制色值）")
+    private String distinguishColor;
+
+    @Excel(name = "责任区分", width = 20)
+    @Schema(description = "责任区分（手填）")
+    private String responsibilityDistinct;
+
+    @Excel(name = "故障等级", width = 16)
+    @Schema(description = "故障等级（手填）")
+    private String faultLevel;
+
+    @Excel(name = "是否停机维修", width = 14, dicCode = "yn")
+    @Dict(dicCode = "yn")
+    @Schema(description = "是否停机维修（字典 yn：1是0否）")
+    private String downtimeMaintenance;
+
+    @Excel(name = "是否启用", width = 12, dicCode = "xslmes_downtime_type_status")
+    @Dict(dicCode = "xslmes_downtime_type_status")
+    @Schema(description = "是否启用（字典 xslmes_downtime_type_status：0启用1停用）")
+    private String status;
+
+    @TableField(exist = false)
+    @Excel(name = "工序编码", width = 18)
+    @Schema(description = "导入用工序编码")
+    private String importOperationCode;
+
+    @TableField(exist = false)
+    @Excel(name = "主类型名称", width = 24)
+    @Schema(description = "导入用停机主类型名称")
+    private String importMainTypeName;
+
+    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/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/MesXslRawMaterialCard.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.util.Date;
 import java.math.BigDecimal;
 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 lombok.Data;
@@ -138,4 +139,8 @@ public class MesXslRawMaterialCard implements Serializable {
 
     @Schema(description = "租户ID")
     private Integer tenantId;
+
+    @TableField(exist = false)
+    @Schema(description = "是否存在待检送检记录（前端控制送检按钮显隐）")
+    private Boolean hasPendingInspect;
 }

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

@@ -0,0 +1,91 @@
+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;
+
+@Data
+@TableName("mes_xsl_raw_material_inspect_record")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "原材料送检记录")
+public class MesXslRawMaterialInspectRecord implements Serializable {
+  private static final long serialVersionUID = 1L;
+
+  @TableId(type = IdType.ASSIGN_ID)
+  @Schema(description = "主键")
+  private String id;
+
+  @Schema(description = "原材料卡片ID")
+  private String rawMaterialCardId;
+
+  @Excel(name = "条码", width = 20)
+  @Schema(description = "条码")
+  private String barcode;
+
+  @Excel(name = "批次号", width = 20)
+  @Schema(description = "批次号")
+  private String batchNo;
+
+  @Schema(description = "物料ID")
+  private String materialId;
+
+  @Excel(name = "物料名称", width = 20)
+  @Schema(description = "物料名称")
+  private String materialName;
+
+  @Excel(name = "检验状态", width = 12, dicCode = "xslmes_inspect_status")
+  @Dict(dicCode = "xslmes_inspect_status")
+  @Schema(description = "检验状态（xslmes_inspect_status：0待检 1合格 2不合格）")
+  private String inspectStatus;
+
+  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @Excel(name = "送检时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+  @Schema(description = "送检时间")
+  private Date inspectTime;
+
+  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @Excel(name = "判定时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+  @Schema(description = "判定时间")
+  private Date resultTime;
+
+  @Schema(description = "备注")
+  private String remark;
+
+  @Schema(description = "创建人")
+  private String createBy;
+
+  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @Schema(description = "创建时间")
+  private Date createTime;
+
+  @Schema(description = "更新人")
+  private String updateBy;
+
+  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @Schema(description = "更新时间")
+  private Date updateTime;
+
+  @Schema(description = "租户ID")
+  private Integer tenantId;
+
+  @TableField(exist = false)
+  @Schema(description = "送检明细")
+  private List<MesXslRawMaterialInspectRecordLine> lineList;
+}

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslRawMaterialInspectRecordLine.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.math.BigDecimal;
+import java.util.Date;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+@TableName("mes_xsl_raw_material_inspect_record_line")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "原材料送检记录-检验明细")
+public class MesXslRawMaterialInspectRecordLine implements Serializable {
+  private static final long serialVersionUID = 1L;
+
+  @TableId(type = IdType.ASSIGN_ID)
+  private String id;
+
+  @Schema(description = "送检记录主表ID")
+  private String recordId;
+
+  @Schema(description = "检验标准ID")
+  private String inspectStdId;
+
+  @Schema(description = "检验项目ID")
+  private String inspectItemId;
+
+  @Schema(description = "检验项目名称")
+  private String inspectItemName;
+
+  @Schema(description = "容许最小值")
+  private BigDecimal allowMin;
+
+  @Schema(description = "包含最小值 1是 0否")
+  private Integer includeMinFlag;
+
+  @Schema(description = "容许最大值")
+  private BigDecimal allowMax;
+
+  @Schema(description = "包含最大值 1是 0否")
+  private Integer includeMaxFlag;
+
+  @Schema(description = "检验值")
+  private BigDecimal inspectValue;
+
+  @Dict(dicCode = "xslmes_inspect_status")
+  @Schema(description = "明细判定状态（xslmes_inspect_status：0待检 1合格 2不合格）")
+  private String passFlag;
+
+  @Schema(description = "排序")
+  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/mapper/MesXslDowntimeMainTypeMapper.java

@@ -0,0 +1,9 @@
+package org.jeecg.modules.xslmes.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.xslmes.entity.MesXslDowntimeMainType;
+
+/**
+ * MES 停机主类型
+ */
+public interface MesXslDowntimeMainTypeMapper extends BaseMapper<MesXslDowntimeMainType> {}

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

@@ -0,0 +1,9 @@
+package org.jeecg.modules.xslmes.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.xslmes.entity.MesXslDowntimeType;
+
+/**
+ * MES 停机类型
+ */
+public interface MesXslDowntimeTypeMapper extends BaseMapper<MesXslDowntimeType> {}

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/MesXslRawMaterialInspectRecordLineMapper.java

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

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

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

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.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.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/IMesXslDowntimeMainTypeService.java

@@ -0,0 +1,16 @@
+package org.jeecg.modules.xslmes.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.xslmes.entity.MesXslDowntimeMainType;
+
+public interface IMesXslDowntimeMainTypeService extends IService<MesXslDowntimeMainType> {
+
+    /**
+     * 停机类型是否已被占用（仅统计未删除：del_flag 为 0 或 null）。租户与拦截器注入逻辑一致。
+     *
+     * @param downtimeType 停机类型（已 trim 后传入）
+     * @param excludeId 编辑时排除自身主键，新增传 null
+     * @param context 当前提交的实体（可取 tenantId；可为 null）
+     */
+    boolean isDowntimeTypeDuplicated(String downtimeType, String excludeId, MesXslDowntimeMainType context);
+}

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

@@ -0,0 +1,12 @@
+package org.jeecg.modules.xslmes.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.xslmes.entity.MesXslDowntimeType;
+
+public interface IMesXslDowntimeTypeService extends IService<MesXslDowntimeType> {
+
+    /**
+     * 停机类型名称是否已被占用（仅统计未删除：del_flag 为 0 或 null）。租户与拦截器注入逻辑一致。
+     */
+    boolean isDowntimeTypeDuplicated(String downtimeType, String excludeId, MesXslDowntimeType context);
+}

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/IMesXslRawMaterialInspectRecordService.java

@@ -0,0 +1,26 @@
+package org.jeecg.modules.xslmes.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.math.BigDecimal;
+import java.util.List;
+import org.jeecg.modules.xslmes.entity.MesXslRawMaterialInspectRecord;
+import org.jeecg.modules.xslmes.entity.MesXslRawMaterialInspectRecordLine;
+
+public interface IMesXslRawMaterialInspectRecordService
+    extends IService<MesXslRawMaterialInspectRecord> {
+
+  MesXslRawMaterialInspectRecord createByRawMaterialCardId(String rawMaterialCardId);
+
+  List<MesXslRawMaterialInspectRecordLine> selectLinesByRecordId(String recordId);
+
+  List<MesXslRawMaterialInspectRecordLine> prepareResultEntryLines(String recordId);
+
+  void saveInspectResult(String recordId, List<MesXslRawMaterialInspectRecordLine> lineList);
+
+  String evaluatePassFlag(
+      BigDecimal inspectValue,
+      BigDecimal allowMin,
+      Integer includeMinFlag,
+      BigDecimal allowMax,
+      Integer includeMaxFlag);
+}

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

@@ -0,0 +1,63 @@
+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.MesXslDowntimeMainType;
+import org.jeecg.modules.xslmes.mapper.MesXslDowntimeMainTypeMapper;
+import org.jeecg.modules.xslmes.service.IMesXslDowntimeMainTypeService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class MesXslDowntimeMainTypeServiceImpl extends ServiceImpl<MesXslDowntimeMainTypeMapper, MesXslDowntimeMainType>
+        implements IMesXslDowntimeMainTypeService {
+
+    //update-begin---author:jiangxh ---date:20260518  for：【MES】停机类型同租户不可重复；仅统计未删除（del_flag=0 或 null）-----------
+    @Override
+    public boolean isDowntimeTypeDuplicated(String downtimeType, String excludeId, MesXslDowntimeMainType context) {
+        if (oConvertUtils.isEmpty(downtimeType)) {
+            return false;
+        }
+        Integer tenantId = resolveTenantId(context);
+        LambdaQueryWrapper<MesXslDowntimeMainType> w = new LambdaQueryWrapper<>();
+        w.eq(MesXslDowntimeMainType::getDowntimeType, downtimeType.trim());
+        w.and(
+                q ->
+                        q.eq(MesXslDowntimeMainType::getDelFlag, CommonConstant.DEL_FLAG_0)
+                                .or()
+                                .isNull(MesXslDowntimeMainType::getDelFlag));
+        if (oConvertUtils.isNotEmpty(excludeId)) {
+            w.ne(MesXslDowntimeMainType::getId, excludeId);
+        }
+        if (tenantId != null) {
+            w.eq(MesXslDowntimeMainType::getTenantId, tenantId);
+        }
+        return this.count(w) > 0;
+    }
+
+    private static Integer resolveTenantId(MesXslDowntimeMainType 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】停机类型同租户不可重复；仅统计未删除（del_flag=0 或 null）-----------
+}

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

@@ -0,0 +1,63 @@
+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.MesXslDowntimeType;
+import org.jeecg.modules.xslmes.mapper.MesXslDowntimeTypeMapper;
+import org.jeecg.modules.xslmes.service.IMesXslDowntimeTypeService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class MesXslDowntimeTypeServiceImpl extends ServiceImpl<MesXslDowntimeTypeMapper, MesXslDowntimeType>
+        implements IMesXslDowntimeTypeService {
+
+    //update-begin---author:jiangxh ---date:20260518  for：【MES】停机类型名称同租户不可重复；仅统计未删除（del_flag=0 或 null）-----------
+    @Override
+    public boolean isDowntimeTypeDuplicated(String downtimeType, String excludeId, MesXslDowntimeType context) {
+        if (oConvertUtils.isEmpty(downtimeType)) {
+            return false;
+        }
+        Integer tenantId = resolveTenantId(context);
+        LambdaQueryWrapper<MesXslDowntimeType> w = new LambdaQueryWrapper<>();
+        w.eq(MesXslDowntimeType::getDowntimeType, downtimeType.trim());
+        w.and(
+                q ->
+                        q.eq(MesXslDowntimeType::getDelFlag, CommonConstant.DEL_FLAG_0)
+                                .or()
+                                .isNull(MesXslDowntimeType::getDelFlag));
+        if (oConvertUtils.isNotEmpty(excludeId)) {
+            w.ne(MesXslDowntimeType::getId, excludeId);
+        }
+        if (tenantId != null) {
+            w.eq(MesXslDowntimeType::getTenantId, tenantId);
+        }
+        return this.count(w) > 0;
+    }
+
+    private static Integer resolveTenantId(MesXslDowntimeType 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】停机类型名称同租户不可重复；仅统计未删除（del_flag=0 或 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/MesXslRawMaterialInspectRecordServiceImpl.java

@@ -0,0 +1,302 @@
+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.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.modules.mes.material.entity.MesMaterial;
+import org.jeecg.modules.mes.material.entity.MesMixerMaterial;
+import org.jeecg.modules.mes.material.entity.MesRawMaterialInspectStd;
+import org.jeecg.modules.mes.material.entity.MesRawMaterialInspectStdLine;
+import org.jeecg.modules.mes.material.mapper.MesMaterialMapper;
+import org.jeecg.modules.mes.material.mapper.MesMixerMaterialMapper;
+import org.jeecg.modules.mes.material.mapper.MesRawMaterialInspectStdLineMapper;
+import org.jeecg.modules.mes.material.mapper.MesRawMaterialInspectStdMapper;
+import org.jeecg.modules.xslmes.entity.MesXslRawMaterialCard;
+import org.jeecg.modules.xslmes.entity.MesXslRawMaterialInspectRecord;
+import org.jeecg.modules.xslmes.entity.MesXslRawMaterialInspectRecordLine;
+import org.jeecg.modules.xslmes.mapper.MesXslRawMaterialInspectRecordLineMapper;
+import org.jeecg.modules.xslmes.mapper.MesXslRawMaterialInspectRecordMapper;
+import org.jeecg.modules.xslmes.service.IMesXslRawMaterialCardService;
+import org.jeecg.modules.xslmes.service.IMesXslRawMaterialInspectRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@Slf4j
+public class MesXslRawMaterialInspectRecordServiceImpl
+    extends ServiceImpl<MesXslRawMaterialInspectRecordMapper, MesXslRawMaterialInspectRecord>
+    implements IMesXslRawMaterialInspectRecordService {
+
+  private static final String CARD_TEST_RESULT_UNTESTED = "0";
+  private static final String CARD_TEST_RESULT_PASS = "1";
+  private static final String CARD_TEST_RESULT_FAIL = "2";
+  private static final String STATUS_PENDING = "0";
+  private static final String STATUS_PASS = "1";
+  private static final String STATUS_FAIL = "2";
+
+  @Autowired private IMesXslRawMaterialCardService rawMaterialCardService;
+  @Autowired private MesXslRawMaterialInspectRecordLineMapper recordLineMapper;
+  @Autowired private MesMaterialMapper mesMaterialMapper;
+  @Autowired private MesMixerMaterialMapper mesMixerMaterialMapper;
+  @Autowired private MesRawMaterialInspectStdMapper inspectStdMapper;
+  @Autowired private MesRawMaterialInspectStdLineMapper inspectStdLineMapper;
+
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public MesXslRawMaterialInspectRecord createByRawMaterialCardId(String rawMaterialCardId) {
+    MesXslRawMaterialCard card = rawMaterialCardService.getById(rawMaterialCardId);
+    if (card == null) {
+      throw new JeecgBootException("未找到原材料卡片");
+    }
+    long pendingCount =
+        this.lambdaQuery()
+            .eq(MesXslRawMaterialInspectRecord::getRawMaterialCardId, rawMaterialCardId)
+            .eq(MesXslRawMaterialInspectRecord::getInspectStatus, STATUS_PENDING)
+            .count();
+    if (pendingCount > 0) {
+      throw new JeecgBootException("该原材料卡片已存在待检送检记录，不能重复送检");
+    }
+    String cardTestResult = normalize(card.getTestResult());
+    if (StringUtils.isNotBlank(cardTestResult) && !CARD_TEST_RESULT_UNTESTED.equals(cardTestResult)) {
+      throw new JeecgBootException("仅未检状态的原材料卡片允许送检");
+    }
+    MesXslRawMaterialInspectRecord entity = new MesXslRawMaterialInspectRecord();
+    entity.setRawMaterialCardId(card.getId());
+    entity.setBarcode(card.getBarcode());
+    entity.setBatchNo(card.getBatchNo());
+    entity.setMaterialId(card.getMaterialId());
+    entity.setMaterialName(card.getMaterialName());
+    entity.setInspectStatus(STATUS_PENDING);
+    entity.setInspectTime(new Date());
+    this.save(entity);
+    // 送检后将卡片检测结果置为待检
+    MesXslRawMaterialCard updateCard = new MesXslRawMaterialCard();
+    updateCard.setId(card.getId());
+    updateCard.setTestResult(CARD_TEST_RESULT_UNTESTED);
+    rawMaterialCardService.updateById(updateCard);
+    return entity;
+  }
+
+  @Override
+  public List<MesXslRawMaterialInspectRecordLine> selectLinesByRecordId(String recordId) {
+    return recordLineMapper.selectList(
+        new LambdaQueryWrapper<MesXslRawMaterialInspectRecordLine>()
+            .eq(MesXslRawMaterialInspectRecordLine::getRecordId, recordId)
+            .orderByAsc(MesXslRawMaterialInspectRecordLine::getSortNo));
+  }
+
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public List<MesXslRawMaterialInspectRecordLine> prepareResultEntryLines(String recordId) {
+    MesXslRawMaterialInspectRecord record = this.getById(recordId);
+    if (record == null) {
+      throw new JeecgBootException("送检记录不存在");
+    }
+    List<MesXslRawMaterialInspectRecordLine> current = selectLinesByRecordId(recordId);
+    if (!current.isEmpty()) {
+      return current;
+    }
+
+    MesRawMaterialInspectStd std = resolveEnableInspectStd(record.getMaterialId(), record.getMaterialName());
+    if (std == null) {
+      throw new JeecgBootException("未找到已启用的原材料检验标准，请先维护并启用检验标准");
+    }
+    List<MesRawMaterialInspectStdLine> stdLines =
+        inspectStdLineMapper.selectList(
+            new LambdaQueryWrapper<MesRawMaterialInspectStdLine>()
+                .eq(MesRawMaterialInspectStdLine::getStdId, std.getId())
+                .orderByAsc(MesRawMaterialInspectStdLine::getSortNo));
+    if (stdLines.isEmpty()) {
+      throw new JeecgBootException("当前检验标准未配置明细检验项目");
+    }
+
+    int sortNo = 0;
+    List<MesXslRawMaterialInspectRecordLine> out = new ArrayList<>(stdLines.size());
+    for (MesRawMaterialInspectStdLine stdLine : stdLines) {
+      MesXslRawMaterialInspectRecordLine line = new MesXslRawMaterialInspectRecordLine();
+      line.setRecordId(recordId);
+      line.setInspectStdId(std.getId());
+      line.setInspectItemId(stdLine.getInspectItemId());
+      line.setInspectItemName(stdLine.getInspectItemName());
+      line.setAllowMin(stdLine.getAllowMin());
+      line.setIncludeMinFlag(stdLine.getIncludeMinFlag() == null ? 0 : stdLine.getIncludeMinFlag());
+      line.setAllowMax(stdLine.getAllowMax());
+      line.setIncludeMaxFlag(stdLine.getIncludeMaxFlag() == null ? 0 : stdLine.getIncludeMaxFlag());
+      line.setPassFlag(STATUS_PENDING);
+      line.setSortNo(sortNo++);
+      recordLineMapper.insert(line);
+      out.add(line);
+    }
+    return out;
+  }
+
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public void saveInspectResult(String recordId, List<MesXslRawMaterialInspectRecordLine> lineList) {
+    MesXslRawMaterialInspectRecord record = this.getById(recordId);
+    if (record == null) {
+      throw new JeecgBootException("送检记录不存在");
+    }
+    if (lineList == null || lineList.isEmpty()) {
+      throw new JeecgBootException("请至少录入一条检验结果");
+    }
+
+    boolean allPass = true;
+    for (MesXslRawMaterialInspectRecordLine line : lineList) {
+      if (StringUtils.isBlank(line.getId())) {
+        throw new JeecgBootException("明细ID不能为空，请刷新后重试");
+      }
+      MesXslRawMaterialInspectRecordLine dbLine = recordLineMapper.selectById(line.getId());
+      if (dbLine == null || !recordId.equals(dbLine.getRecordId())) {
+        throw new JeecgBootException("明细不存在或不属于当前送检记录");
+      }
+      String passFlag =
+          evaluatePassFlag(
+              line.getInspectValue(),
+              dbLine.getAllowMin(),
+              dbLine.getIncludeMinFlag(),
+              dbLine.getAllowMax(),
+              dbLine.getIncludeMaxFlag());
+      dbLine.setInspectValue(line.getInspectValue());
+      dbLine.setPassFlag(passFlag);
+      recordLineMapper.updateById(dbLine);
+      if (!STATUS_PASS.equals(passFlag)) {
+        allPass = false;
+      }
+    }
+
+    record.setInspectStatus(allPass ? STATUS_PASS : STATUS_FAIL);
+    record.setResultTime(new Date());
+    this.updateById(record);
+    // 判定完成后回写原材料卡片检测结果
+    if (StringUtils.isNotBlank(record.getRawMaterialCardId())) {
+      MesXslRawMaterialCard card = new MesXslRawMaterialCard();
+      card.setId(record.getRawMaterialCardId());
+      card.setTestResult(allPass ? CARD_TEST_RESULT_PASS : CARD_TEST_RESULT_FAIL);
+      rawMaterialCardService.updateById(card);
+    }
+  }
+
+  @Override
+  public String evaluatePassFlag(
+      BigDecimal inspectValue,
+      BigDecimal allowMin,
+      Integer includeMinFlag,
+      BigDecimal allowMax,
+      Integer includeMaxFlag) {
+    if (inspectValue == null) {
+      return STATUS_FAIL;
+    }
+    if (allowMin != null) {
+      int cmpMin = inspectValue.compareTo(allowMin);
+      boolean includeMin = includeMinFlag != null && includeMinFlag == 1;
+      if (includeMin ? cmpMin < 0 : cmpMin <= 0) {
+        return STATUS_FAIL;
+      }
+    }
+    if (allowMax != null) {
+      int cmpMax = inspectValue.compareTo(allowMax);
+      boolean includeMax = includeMaxFlag != null && includeMaxFlag == 1;
+      if (includeMax ? cmpMax > 0 : cmpMax >= 0) {
+        return STATUS_FAIL;
+      }
+    }
+    return STATUS_PASS;
+  }
+
+  private MesRawMaterialInspectStd resolveEnableInspectStd(String materialId, String materialName) {
+    String normalizedMaterialId = normalize(materialId);
+    if (StringUtils.isBlank(normalizedMaterialId)) {
+      log.warn("送检标准匹配失败：送检记录物料ID为空，materialName={}", materialName);
+      return null;
+    }
+    List<MesRawMaterialInspectStd> allStds =
+        inspectStdMapper.selectList(
+            new LambdaQueryWrapper<MesRawMaterialInspectStd>()
+                .and(
+                    w ->
+                        w.eq(MesRawMaterialInspectStd::getDelFlag, 0)
+                            .or()
+                            .isNull(MesRawMaterialInspectStd::getDelFlag))
+                .orderByDesc(MesRawMaterialInspectStd::getEnableFlag)
+                .orderByDesc(MesRawMaterialInspectStd::getEffectiveDate)
+                .orderByDesc(MesRawMaterialInspectStd::getCreateTime));
+    if (allStds.isEmpty()) {
+      log.warn("送检标准匹配失败：没有可用检验标准，materialId={}", materialId);
+      return null;
+    }
+
+    String mappedMixerMaterialId = mapMaterialIdToMixerMaterialId(normalizedMaterialId);
+
+    // 第一优先级：仅在启用标准中匹配
+    MesRawMaterialInspectStd matchedEnabled = matchByMaterialId(allStds, normalizedMaterialId, mappedMixerMaterialId, true);
+    if (matchedEnabled != null) {
+      return matchedEnabled;
+    }
+
+    // 第二优先级：若未启用标准，则回退到同物料最新标准（避免业务无法录入）
+    MesRawMaterialInspectStd matchedAny = matchByMaterialId(allStds, normalizedMaterialId, mappedMixerMaterialId, false);
+    if (matchedAny != null) {
+      log.warn(
+          "送检标准未找到启用版本，已回退到未启用标准 stdId={}, materialId={}, mappedMixerMaterialId={}, enableFlag={}",
+          matchedAny.getId(),
+          materialId,
+          mappedMixerMaterialId,
+          matchedAny.getEnableFlag());
+      return matchedAny;
+    }
+
+    log.warn(
+        "送检标准匹配失败（仅物料ID匹配），materialId={}, mappedMixerMaterialId={}, materialName={}, stdCount={}",
+        materialId,
+        mappedMixerMaterialId,
+        materialName,
+        allStds.size());
+    return null;
+  }
+
+  private MesRawMaterialInspectStd matchByMaterialId(
+      List<MesRawMaterialInspectStd> standards,
+      String normalizedMaterialId,
+      String mappedMixerMaterialId,
+      boolean onlyEnabled) {
+    for (MesRawMaterialInspectStd std : standards) {
+      if (onlyEnabled && !Objects.equals(std.getEnableFlag(), 1)) {
+        continue;
+      }
+      String stdMaterialId = normalize(std.getMixerMaterialId());
+      if (Objects.equals(normalizedMaterialId, stdMaterialId)) {
+        return std;
+      }
+      if (StringUtils.isNotBlank(mappedMixerMaterialId) && Objects.equals(mappedMixerMaterialId, stdMaterialId)) {
+        return std;
+      }
+    }
+    return null;
+  }
+
+  private String mapMaterialIdToMixerMaterialId(String materialId) {
+    MesMaterial material = mesMaterialMapper.selectById(materialId);
+    if (material == null || StringUtils.isBlank(material.getMaterialCode())) {
+      return null;
+    }
+    MesMixerMaterial mixerMaterial =
+        mesMixerMaterialMapper.selectOne(
+            new LambdaQueryWrapper<MesMixerMaterial>()
+                .eq(MesMixerMaterial::getMaterialCode, StringUtils.trimToEmpty(material.getMaterialCode()))
+                .last("LIMIT 1"));
+    return mixerMaterial == null ? null : normalize(mixerMaterial.getId());
+  }
+
+  private String normalize(String value) {
+    return StringUtils.trimToEmpty(value);
+  }
+}

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

@@ -0,0 +1,10 @@
+package org.jeecg.modules.xslmes.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.jeecg.modules.xslmes.entity.MesXslRawMaterialInspectRecord;
+
+/** 原材料送检记录主子表保存页。 */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class MesXslRawMaterialInspectRecordPage extends MesXslRawMaterialInspectRecord {}

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

@@ -195,3 +195,117 @@ jeecgboot-vue3/src/views/xslmes/mesXslManufacturer/MesXslManufacturerList.vue
 jeecgboot-vue3/src/views/xslmes/mesXslManufacturer/MesXslManufacturer.data.ts
 jeecgboot-vue3/src/views/xslmes/mesXslManufacturer/MesXslManufacturer.api.ts
 jeecgboot-vue3/src/views/xslmes/mesXslManufacturer/components/MesXslManufacturerModal.vue
+-- author:jiangxh---date:20260518--for: 【MES】停机主类型（所属工序、停机类型唯一、显示顺序、区分颜色、是否启用） ---
+jeecg-boot/db/mes-xsl-downtime-main-type-menu-permission.sql
+jeecg-boot/db/mes-xsl-downtime-main-type.sql
+jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_64__mes_xsl_downtime_main_type.sql
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslDowntimeMainType.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslDowntimeMainTypeMapper.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslDowntimeMainTypeService.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslDowntimeMainTypeServiceImpl.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslDowntimeMainTypeController.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/package-info.java
+jeecgboot-vue3/src/views/xslmes/mesXslDowntimeMainType/MesXslDowntimeMainTypeList.vue
+jeecgboot-vue3/src/views/xslmes/mesXslDowntimeMainType/MesXslDowntimeMainType.data.ts
+jeecgboot-vue3/src/views/xslmes/mesXslDowntimeMainType/MesXslDowntimeMainType.api.ts
+jeecgboot-vue3/src/views/xslmes/mesXslDowntimeMainType/components/MesXslDowntimeMainTypeModal.vue
+-- author:jiangxh---date:20260518--for: 【MES】停机类型（工序+主类型+停机类型、责任区分、故障等级、停机维修、色卡） ---
+jeecg-boot/db/mes-xsl-downtime-type-menu-permission.sql
+jeecg-boot/db/mes-xsl-downtime-type.sql
+jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_65__mes_xsl_downtime_type.sql
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslDowntimeType.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslDowntimeTypeMapper.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslDowntimeTypeService.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslDowntimeTypeServiceImpl.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslDowntimeTypeController.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/package-info.java
+jeecgboot-vue3/src/views/xslmes/mesXslDowntimeType/MesXslDowntimeTypeList.vue
+jeecgboot-vue3/src/views/xslmes/mesXslDowntimeType/MesXslDowntimeType.data.ts
+jeecgboot-vue3/src/views/xslmes/mesXslDowntimeType/MesXslDowntimeType.api.ts
+jeecgboot-vue3/src/views/xslmes/mesXslDowntimeType/components/MesXslDowntimeTypeModal.vue
+jeecgboot-vue3/src/views/xslmes/mesXslDowntimeType/components/MesXslDowntimeMainTypeSelectModal.vue
+-- author:jiangxh---date:20260518--for: 【MES】停机类型责任区分、故障等级改为手填（非字典） ---
+jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_66__mes_xsl_downtime_type_text_fields.sql
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslDowntimeType.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslDowntimeTypeController.java
+jeecgboot-vue3/src/views/xslmes/mesXslDowntimeType/MesXslDowntimeType.data.ts
+jeecg-boot/db/mes-xsl-downtime-type.sql
+jeecg-boot/db/mes-xsl-downtime-type-menu-permission.sql
+-- author:jiangxh---date:20260518--for: 【MES】停机主类型/停机类型/厂家信息业务字符字段统一 varchar(500) ---
+jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_67__mes_xsl_varchar500_biz_fields.sql
+jeecg-boot/db/mes-xsl-downtime-main-type.sql
+jeecg-boot/db/mes-xsl-downtime-main-type-menu-permission.sql
+jeecg-boot/db/mes-xsl-manufacturer.sql
+jeecg-boot/db/mes-xsl-manufacturer-menu-permission.sql
+-- author:jiangxh---date:20260518--for: 【MES】删除停机类型废弃字典（责任区分、故障等级改手填后） ---
+jeecg-boot/db/mes-xsl-downtime-type-remove-unused-dict.sql
+jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_68__mes_xsl_downtime_remove_unused_dict.sql
+jeecg-boot/db/mes-xsl-downtime-type-menu-permission.sql
+-- author:jiangxh---date:20260518--for: 【MES】工序管理/设备类别/设备类型菜单挂 MES基础资料并修复权限树与租户授权 ---
+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
+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
+jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_71__mes_xsl_process_and_category_menu_ensure.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

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

@@ -1,5 +1,5 @@
 server:
-  port: 8080
+  port: 8888
   tomcat:
     max-swallow-size: -1
   error:

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

@@ -0,0 +1,77 @@
+-- MES 停机主类型：字典 + 建表 + 菜单 + 按钮 + 租户 admin 授权（与 jeecg-boot/db/mes-xsl-downtime-main-type-menu-permission.sql 一致）
+-- 权限前缀：mes:mes_xsl_downtime_main_type:*；父菜单 MES基础资料 / MES资料
+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_downtime_main_type_status', '0启用1停用', 0, 'admin', NOW(), 0, 0
+WHERE NOT EXISTS (SELECT 1 FROM `sys_dict` WHERE `dict_code` = 'xslmes_downtime_main_type_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_downtime_main_type_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_downtime_main_type_status' AND NOT EXISTS (SELECT 1 FROM `sys_dict_item` i WHERE i.`dict_id` = d.id AND i.`item_value` = '1');
+
+CREATE TABLE IF NOT EXISTS `mes_xsl_downtime_main_type` (
+  `id` varchar(32) NOT NULL COMMENT '主键',
+  `process_operation_id` varchar(32) NOT NULL COMMENT '所属工序 mes_xsl_process_operation.id',
+  `process_operation_name` varchar(128) DEFAULT NULL COMMENT '工序名称冗余',
+  `downtime_type` varchar(128) NOT NULL COMMENT '停机类型（同租户未删除数据中唯一）',
+  `display_order` int NOT NULL DEFAULT '0' COMMENT '显示顺序（升序）',
+  `distinguish_color` varchar(32) DEFAULT NULL COMMENT '区分颜色（十六进制色值，如#1890ff）',
+  `status` varchar(1) NOT NULL DEFAULT '0' COMMENT '是否启用（字典xslmes_downtime_main_type_status：0启用1停用）',
+  `tenant_id` int DEFAULT NULL COMMENT '租户',
+  `sys_org_code` varchar(64) DEFAULT NULL COMMENT '部门',
+  `create_by` varchar(32) DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(32) DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `del_flag` int DEFAULT '0' COMMENT '删除标记（0正常1删除）',
+  PRIMARY KEY (`id`),
+  KEY `idx_mdmt_tenant_type` (`tenant_id`, `downtime_type`),
+  KEY `idx_mdmt_process` (`process_operation_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES停机主类型';
+
+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_base_pid = IFNULL(@mes_base_pid, '1860000000000000001');
+
+INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `keep_alive`, `internal_or_external`, `create_by`, `create_time`)
+VALUES ('1860000000000000119', @mes_base_pid, '停机主类型', '/xslmes/mesXslDowntimeMainType', 'xslmes/mesXslDowntimeMainType/MesXslDowntimeMainTypeList', NULL, 1, NULL, '1', 18, 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`);
+
+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()),
+('1860000000000000121', '1860000000000000119', '编辑', 2, 'mes:mes_xsl_downtime_main_type:edit', '1', '1', 0, 'admin', NOW()),
+('1860000000000000122', '1860000000000000119', '删除', 2, 'mes:mes_xsl_downtime_main_type:delete', '1', '1', 0, 'admin', NOW()),
+('1860000000000000123', '1860000000000000119', '批量删除', 2, 'mes:mes_xsl_downtime_main_type:deleteBatch', '1', '1', 0, 'admin', NOW()),
+('1860000000000000124', '1860000000000000119', '导出', 2, 'mes:mes_xsl_downtime_main_type:exportXls', '1', '1', 0, 'admin', NOW()),
+('1860000000000000125', '1860000000000000119', '导入', 2, 'mes:mes_xsl_downtime_main_type: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 (
+    '1860000000000000119',
+    '1860000000000000120', '1860000000000000121', '1860000000000000122', '1860000000000000123',
+    '1860000000000000124', '1860000000000000125'
+  )
+  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_65__mes_xsl_downtime_type.sql

@@ -0,0 +1,114 @@
+-- MES 停机类型：字典 + 建表 + 菜单 + 按钮 + 租户 admin 授权
+-- 权限前缀：mes:mes_xsl_downtime_type:*；父菜单 MES基础资料 / MES资料
+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_downtime_responsibility', '生产、设备、质量、其他', 0, 'admin', NOW(), 0, 0
+WHERE NOT EXISTS (SELECT 1 FROM `sys_dict` WHERE `dict_code` = 'xslmes_downtime_responsibility' 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, '生产', 'production', 1, 1, 'admin', NOW() FROM `sys_dict` d
+WHERE d.`dict_code` = 'xslmes_downtime_responsibility' AND NOT EXISTS (SELECT 1 FROM `sys_dict_item` i WHERE i.`dict_id` = d.id AND i.`item_value` = 'production');
+INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `sort_order`, `status`, `create_by`, `create_time`)
+SELECT REPLACE(UUID(), '-', ''), d.id, '设备', 'equipment', 2, 1, 'admin', NOW() FROM `sys_dict` d
+WHERE d.`dict_code` = 'xslmes_downtime_responsibility' AND NOT EXISTS (SELECT 1 FROM `sys_dict_item` i WHERE i.`dict_id` = d.id AND i.`item_value` = 'equipment');
+INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `sort_order`, `status`, `create_by`, `create_time`)
+SELECT REPLACE(UUID(), '-', ''), d.id, '质量', 'quality', 3, 1, 'admin', NOW() FROM `sys_dict` d
+WHERE d.`dict_code` = 'xslmes_downtime_responsibility' AND NOT EXISTS (SELECT 1 FROM `sys_dict_item` i WHERE i.`dict_id` = d.id AND i.`item_value` = 'quality');
+INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `sort_order`, `status`, `create_by`, `create_time`)
+SELECT REPLACE(UUID(), '-', ''), d.id, '其他', 'other', 4, 1, 'admin', NOW() FROM `sys_dict` d
+WHERE d.`dict_code` = 'xslmes_downtime_responsibility' AND NOT EXISTS (SELECT 1 FROM `sys_dict_item` i WHERE i.`dict_id` = d.id AND i.`item_value` = 'other');
+
+INSERT INTO `sys_dict` (`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `type`, `tenant_id`)
+SELECT REPLACE(UUID(), '-', ''), 'MES停机故障等级', 'xslmes_downtime_fault_level', '一级、二级、三级', 0, 'admin', NOW(), 0, 0
+WHERE NOT EXISTS (SELECT 1 FROM `sys_dict` WHERE `dict_code` = 'xslmes_downtime_fault_level' 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, '一级', '1', 1, 1, 'admin', NOW() FROM `sys_dict` d
+WHERE d.`dict_code` = 'xslmes_downtime_fault_level' 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', 2, 1, 'admin', NOW() FROM `sys_dict` d
+WHERE d.`dict_code` = 'xslmes_downtime_fault_level' AND NOT EXISTS (SELECT 1 FROM `sys_dict_item` i WHERE i.`dict_id` = d.id AND i.`item_value` = '2');
+INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `sort_order`, `status`, `create_by`, `create_time`)
+SELECT REPLACE(UUID(), '-', ''), d.id, '三级', '3', 3, 1, 'admin', NOW() FROM `sys_dict` d
+WHERE d.`dict_code` = 'xslmes_downtime_fault_level' AND NOT EXISTS (SELECT 1 FROM `sys_dict_item` i WHERE i.`dict_id` = d.id AND i.`item_value` = '3');
+
+INSERT INTO `sys_dict` (`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `type`, `tenant_id`)
+SELECT REPLACE(UUID(), '-', ''), 'MES停机类型是否启用', 'xslmes_downtime_type_status', '0启用1停用', 0, 'admin', NOW(), 0, 0
+WHERE NOT EXISTS (SELECT 1 FROM `sys_dict` WHERE `dict_code` = 'xslmes_downtime_type_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_downtime_type_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_downtime_type_status' AND NOT EXISTS (SELECT 1 FROM `sys_dict_item` i WHERE i.`dict_id` = d.id AND i.`item_value` = '1');
+
+CREATE TABLE IF NOT EXISTS `mes_xsl_downtime_type` (
+  `id` varchar(32) NOT NULL COMMENT '主键',
+  `process_operation_id` varchar(32) NOT NULL COMMENT '所属工序 mes_xsl_process_operation.id',
+  `process_operation_name` varchar(128) DEFAULT NULL COMMENT '工序名称冗余',
+  `downtime_main_type_id` varchar(32) NOT NULL COMMENT '所属主类型 mes_xsl_downtime_main_type.id',
+  `downtime_main_type_name` varchar(128) DEFAULT NULL COMMENT '主类型名称冗余（停机主类型.downtime_type）',
+  `downtime_type` varchar(128) NOT NULL COMMENT '停机类型（同租户未删除数据中唯一）',
+  `display_order` int NOT NULL DEFAULT '0' COMMENT '显示顺序（升序，必填）',
+  `distinguish_color` varchar(32) DEFAULT NULL COMMENT '区分颜色（十六进制色值）',
+  `responsibility_distinct` varchar(32) DEFAULT NULL COMMENT '责任区分（字典xslmes_downtime_responsibility）',
+  `fault_level` varchar(10) DEFAULT NULL COMMENT '故障等级（字典xslmes_downtime_fault_level：1一级2二级3三级）',
+  `downtime_maintenance` varchar(1) DEFAULT '0' COMMENT '是否停机维修（字典yn：1是0否）',
+  `status` varchar(1) NOT NULL DEFAULT '0' COMMENT '是否启用（字典xslmes_downtime_type_status：0启用1停用）',
+  `tenant_id` int DEFAULT NULL COMMENT '租户',
+  `sys_org_code` varchar(64) DEFAULT NULL COMMENT '部门',
+  `create_by` varchar(32) DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(32) DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `del_flag` int DEFAULT '0' COMMENT '删除标记（0正常1删除）',
+  PRIMARY KEY (`id`),
+  KEY `idx_mdt_tenant_type` (`tenant_id`, `downtime_type`),
+  KEY `idx_mdt_process` (`process_operation_id`),
+  KEY `idx_mdt_main_type` (`downtime_main_type_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES停机类型';
+
+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_base_pid = IFNULL(@mes_base_pid, '1860000000000000001');
+
+INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `keep_alive`, `internal_or_external`, `create_by`, `create_time`)
+VALUES ('1860000000000000126', @mes_base_pid, '停机类型', '/xslmes/mesXslDowntimeType', 'xslmes/mesXslDowntimeType/MesXslDowntimeTypeList', NULL, 1, NULL, '1', 19, 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`);
+
+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()),
+('1860000000000000128', '1860000000000000126', '编辑', 2, 'mes:mes_xsl_downtime_type:edit', '1', '1', 0, 'admin', NOW()),
+('1860000000000000129', '1860000000000000126', '删除', 2, 'mes:mes_xsl_downtime_type:delete', '1', '1', 0, 'admin', NOW()),
+('1860000000000000130', '1860000000000000126', '批量删除', 2, 'mes:mes_xsl_downtime_type:deleteBatch', '1', '1', 0, 'admin', NOW()),
+('1860000000000000131', '1860000000000000126', '导出', 2, 'mes:mes_xsl_downtime_type:exportXls', '1', '1', 0, 'admin', NOW()),
+('1860000000000000132', '1860000000000000126', '导入', 2, 'mes:mes_xsl_downtime_type: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 (
+    '1860000000000000126',
+    '1860000000000000127', '1860000000000000128', '1860000000000000129', '1860000000000000130',
+    '1860000000000000131', '1860000000000000132'
+  )
+  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_66__mes_xsl_downtime_type_text_fields.sql

@@ -0,0 +1,4 @@
+-- 停机类型：责任区分、故障等级改为手填，放宽字段长度
+ALTER TABLE `mes_xsl_downtime_type`
+  MODIFY COLUMN `responsibility_distinct` varchar(128) DEFAULT NULL COMMENT '责任区分（手填）',
+  MODIFY COLUMN `fault_level` varchar(64) DEFAULT NULL COMMENT '故障等级（手填）';

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

@@ -0,0 +1,26 @@
+-- MES：业务字符字段统一 varchar(500)（MySQL；状态/字典码仍 varchar(1)，主键及外键仍 varchar(32)）
+ALTER TABLE `mes_xsl_downtime_main_type`
+  MODIFY COLUMN `process_operation_name` varchar(500) DEFAULT NULL COMMENT '工序名称冗余',
+  MODIFY COLUMN `downtime_type` varchar(500) NOT NULL COMMENT '停机类型（同租户未删除数据中唯一）',
+  MODIFY COLUMN `distinguish_color` varchar(500) DEFAULT NULL COMMENT '区分颜色（十六进制色值）',
+  MODIFY COLUMN `sys_org_code` varchar(500) DEFAULT NULL COMMENT '部门',
+  MODIFY COLUMN `create_by` varchar(500) DEFAULT NULL COMMENT '创建人',
+  MODIFY COLUMN `update_by` varchar(500) DEFAULT NULL COMMENT '更新人';
+
+ALTER TABLE `mes_xsl_downtime_type`
+  MODIFY COLUMN `process_operation_name` varchar(500) DEFAULT NULL COMMENT '工序名称冗余',
+  MODIFY COLUMN `downtime_main_type_name` varchar(500) DEFAULT NULL COMMENT '主类型名称冗余',
+  MODIFY COLUMN `downtime_type` varchar(500) NOT NULL COMMENT '停机类型（同租户未删除数据中唯一）',
+  MODIFY COLUMN `distinguish_color` varchar(500) DEFAULT NULL COMMENT '区分颜色（十六进制色值）',
+  MODIFY COLUMN `responsibility_distinct` varchar(500) DEFAULT NULL COMMENT '责任区分（手填）',
+  MODIFY COLUMN `fault_level` varchar(500) DEFAULT NULL COMMENT '故障等级（手填）',
+  MODIFY COLUMN `sys_org_code` varchar(500) DEFAULT NULL COMMENT '部门',
+  MODIFY COLUMN `create_by` varchar(500) DEFAULT NULL COMMENT '创建人',
+  MODIFY COLUMN `update_by` varchar(500) DEFAULT NULL COMMENT '更新人';
+
+ALTER TABLE `mes_xsl_manufacturer`
+  MODIFY COLUMN `manufacturer_category` varchar(500) NOT NULL COMMENT '厂家类别（字典xslmes_manufacturer_category）',
+  MODIFY COLUMN `manufacturer_name` varchar(500) NOT NULL COMMENT '厂家名称（同租户未删除数据中唯一）',
+  MODIFY COLUMN `sys_org_code` varchar(500) DEFAULT NULL COMMENT '部门',
+  MODIFY COLUMN `create_by` varchar(500) DEFAULT NULL COMMENT '创建人',
+  MODIFY COLUMN `update_by` varchar(500) DEFAULT NULL COMMENT '更新人';

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

@@ -0,0 +1,9 @@
+-- 停机类型：删除未使用的字典（责任区分、故障等级已改为手填）
+SET NAMES utf8mb4;
+
+DELETE i FROM `sys_dict_item` i
+INNER JOIN `sys_dict` d ON i.`dict_id` = d.`id`
+WHERE d.`dict_code` IN ('xslmes_downtime_responsibility', 'xslmes_downtime_fault_level');
+
+DELETE FROM `sys_dict`
+WHERE `dict_code` IN ('xslmes_downtime_responsibility', 'xslmes_downtime_fault_level');

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

@@ -0,0 +1,74 @@
+-- 工序管理、设备类别、设备类型：挂 MES基础资料 + 权限树 is_leaf + 租户 admin 授权（与 db/mes-xsl-move-process-equipment-menus-to-mes-base.sql 一致）
+SET NAMES utf8mb4;
+
+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_base_pid = IFNULL(@mes_base_pid, '1860000000000000001');
+
+UPDATE `sys_permission`
+SET `is_leaf` = 0
+WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` IN ('MES基础资料', 'MES资料');
+
+UPDATE `sys_permission` p
+INNER JOIN (SELECT @mes_base_pid AS `pid`) x ON 1 = 1
+SET p.`parent_id` = x.`pid`,
+    p.`is_leaf` = 0,
+    p.`url` = '/xslmes/mesXslProcessOperation',
+    p.`component` = 'xslmes/mesXslProcessOperation/MesXslProcessOperationList',
+    p.`component_name` = NULL,
+    p.`perms_type` = '1',
+    p.`update_by` = 'admin',
+    p.`update_time` = NOW()
+WHERE p.`id` = '1860000000000000060';
+
+UPDATE `sys_permission` p
+INNER JOIN (SELECT @mes_base_pid AS `pid`) x ON 1 = 1
+SET p.`parent_id` = x.`pid`,
+    p.`is_leaf` = 0,
+    p.`url` = '/xslmes/mesXslEquipmentCategory',
+    p.`component` = 'xslmes/mesXslEquipmentCategory/MesXslEquipmentCategoryList',
+    p.`component_name` = NULL,
+    p.`perms_type` = '1',
+    p.`update_by` = 'admin',
+    p.`update_time` = NOW()
+WHERE p.`id` = '1860000000000000070';
+
+UPDATE `sys_permission` p
+INNER JOIN (SELECT @mes_base_pid AS `pid`) x ON 1 = 1
+SET p.`parent_id` = x.`pid`,
+    p.`is_leaf` = 0,
+    p.`url` = '/xslmes/mesXslEquipmentType',
+    p.`component` = 'xslmes/mesXslEquipmentType/MesXslEquipmentTypeList',
+    p.`component_name` = NULL,
+    p.`perms_type` = '1',
+    p.`update_by` = 'admin',
+    p.`update_time` = NOW()
+WHERE p.`id` = '1860000000000000077';
+
+UPDATE `sys_permission` SET `name` = '新增' WHERE `id` = '1860000000000000061' AND `name` = '添加';
+
+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 (
+    '1860000000000000060',
+    '1860000000000000061', '1860000000000000062', '1860000000000000063',
+    '1860000000000000064', '1860000000000000065', '1860000000000000066',
+    '1860000000000000070',
+    '1860000000000000071', '1860000000000000072', '1860000000000000073',
+    '1860000000000000074', '1860000000000000075', '1860000000000000076',
+    '1860000000000000077',
+    '1860000000000000078', '1860000000000000079', '1860000000000000080',
+    '1860000000000000081', '1860000000000000082', '1860000000000000083'
+  )
+  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_70__mes_xsl_equipment_type_menu_ensure.sql

@@ -0,0 +1,54 @@
+-- 设备类型：补全菜单与按钮（id 077 可能从未插入），挂 MES基础资料，修复权限树 is_leaf
+SET NAMES utf8mb4;
+
+SET @mes_tenant_id = 1002;
+
+SET @mes_base_pid = (
+  SELECT `id` FROM `sys_permission`
+  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` = 'MES基础资料'
+  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');
+
+UPDATE `sys_permission`
+SET `is_leaf` = 0
+WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` IN ('MES基础资料', 'MES资料');
+
+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())
+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`),
+`is_route` = VALUES(`is_route`), `is_leaf` = 0, `hidden` = 0, `status` = '1', `del_flag` = 0,
+`keep_alive` = VALUES(`keep_alive`), `internal_or_external` = VALUES(`internal_or_external`);
+
+INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `is_leaf`, `status`, `del_flag`, `create_by`, `create_time`) VALUES
+('1860000000000000078', '1860000000000000077', '新增', 2, 'mes:mes_xsl_equipment_type:add', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000079', '1860000000000000077', '编辑', 2, 'mes:mes_xsl_equipment_type:edit', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000080', '1860000000000000077', '删除', 2, 'mes:mes_xsl_equipment_type:delete', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000081', '1860000000000000077', '批量删除', 2, 'mes:mes_xsl_equipment_type:deleteBatch', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000082', '1860000000000000077', '导出', 2, 'mes:mes_xsl_equipment_type:exportXls', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000083', '1860000000000000077', '导入', 2, 'mes:mes_xsl_equipment_type:importExcel', '1', 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`), `is_leaf` = 1, `status` = '1', `del_flag` = 0;
+
+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 (
+    '1860000000000000077',
+    '1860000000000000078', '1860000000000000079', '1860000000000000080',
+    '1860000000000000081', '1860000000000000082', '1860000000000000083'
+  )
+  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_71__mes_xsl_process_and_category_menu_ensure.sql

@@ -0,0 +1,72 @@
+-- 工序管理、设备类别：补全菜单/按钮与租户 admin 授权（与 db/mes-xsl-process-and-category-menu-fix.sql 一致）
+SET NAMES utf8mb4;
+
+SET @mes_tenant_id = 1002;
+
+SET @mes_base_pid = (
+  SELECT `id` FROM `sys_permission`
+  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` = 'MES基础资料'
+  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');
+
+UPDATE `sys_permission`
+SET `is_leaf` = 0
+WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` IN ('MES基础资料', 'MES资料');
+
+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
+`parent_id` = VALUES(`parent_id`), `name` = VALUES(`name`), `url` = VALUES(`url`), `component` = VALUES(`component`),
+`is_leaf` = 0, `hidden` = 0, `status` = '1', `del_flag` = 0;
+
+INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `is_leaf`, `status`, `del_flag`, `create_by`, `create_time`) VALUES
+('1860000000000000061', '1860000000000000060', '新增', 2, 'mes:mes_process_operation:add', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000062', '1860000000000000060', '编辑', 2, 'mes:mes_process_operation:edit', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000063', '1860000000000000060', '删除', 2, 'mes:mes_process_operation:delete', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000064', '1860000000000000060', '批量删除', 2, 'mes:mes_process_operation:deleteBatch', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000065', '1860000000000000060', '导出', 2, 'mes:mes_process_operation:exportXls', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000066', '1860000000000000060', '导入', 2, 'mes:mes_process_operation:importExcel', '1', 1, '1', 0, 'admin', NOW())
+ON DUPLICATE KEY UPDATE
+`parent_id` = VALUES(`parent_id`), `perms` = VALUES(`perms`), `is_leaf` = 1, `status` = '1', `del_flag` = 0;
+
+UPDATE `sys_permission` SET `name` = '新增' WHERE `id` = '1860000000000000061' AND `name` = '添加';
+
+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())
+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;
+
+INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `is_leaf`, `status`, `del_flag`, `create_by`, `create_time`) VALUES
+('1860000000000000071', '1860000000000000070', '新增', 2, 'mes:mes_xsl_equipment_category:add', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000072', '1860000000000000070', '编辑', 2, 'mes:mes_xsl_equipment_category:edit', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000073', '1860000000000000070', '删除', 2, 'mes:mes_xsl_equipment_category:delete', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000074', '1860000000000000070', '批量删除', 2, 'mes:mes_xsl_equipment_category:deleteBatch', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000075', '1860000000000000070', '导出', 2, 'mes:mes_xsl_equipment_category:exportXls', '1', 1, '1', 0, 'admin', NOW()),
+('1860000000000000076', '1860000000000000070', '导入', 2, 'mes:mes_xsl_equipment_category:importExcel', '1', 1, '1', 0, 'admin', NOW())
+ON DUPLICATE KEY UPDATE
+`parent_id` = VALUES(`parent_id`), `perms` = VALUES(`perms`), `is_leaf` = 1, `status` = '1', `del_flag` = 0;
+
+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 (
+    '1860000000000000060',
+    '1860000000000000061', '1860000000000000062', '1860000000000000063',
+    '1860000000000000064', '1860000000000000065', '1860000000000000066',
+    '1860000000000000070',
+    '1860000000000000071', '1860000000000000072', '1860000000000000073',
+    '1860000000000000074', '1860000000000000075', '1860000000000000076'
+  )
+  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_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;

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:8080/jeecg-boot"],["/upload","http://localhost:3300/upload"]]
+VITE_PROXY = [["/jeecg-boot","http://localhost:8888/jeecg-boot"],["/upload","http://localhost:3300/upload"]]
 
 #后台接口全路径地址(必填)
-VITE_GLOB_DOMAIN_URL=http://localhost:8080/jeecg-boot
+VITE_GLOB_DOMAIN_URL=http://localhost:8888/jeecg-boot
 
 #后台接口父地址(必填)，与 server.servlet.context-path 一致，避免仅去掉别名前缀后缺少 /jeecg-boot
 VITE_GLOB_API_URL=/jeecg-boot

jeecgboot-vue3/src/assets/loginmini/style/home.less

@@ -30,7 +30,12 @@
 }
 
 .aui-image {
-  padding: 180px 80px;
+  /* 左侧蓝色区：flex 垂直水平居中展示宣传图（替代大块 padding 顶在上方） */
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  box-sizing: border-box;
+  padding: 32px 40px;
   flex-basis: 60%;
   -webkit-flex-basis: 60%;
   background-color: #0198cd;
@@ -39,9 +44,21 @@
 }
 
 .aui-image-text {
-  top: 50%;
+  display: flex;
-  left: 50%;
+  align-items: center;
+  justify-content: center;
   width: 100%;
+  max-width: 100%;
+  padding: 0;
+  box-sizing: border-box;
+}
+
+/* 相对原图约 331×118 放大 30% → 430×153；资源为 2× 导出，浏览器缩放回该尺寸更清晰 */
+.aui-image-text img {
+  width: 430px;
+  max-width: min(430px, 100%);
+  height: auto;
+  display: block;
 }
 
 .aui-formBox {

jeecgboot-vue3/src/views/xslmes/mesXslDowntimeMainType/MesXslDowntimeMainType.api.ts

@@ -0,0 +1,58 @@
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from '/@/hooks/web/useMessage';
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/xslmes/mesXslDowntimeMainType/list',
+  checkDowntimeType = '/xslmes/mesXslDowntimeMainType/checkDowntimeType',
+  save = '/xslmes/mesXslDowntimeMainType/add',
+  edit = '/xslmes/mesXslDowntimeMainType/edit',
+  deleteOne = '/xslmes/mesXslDowntimeMainType/delete',
+  deleteBatch = '/xslmes/mesXslDowntimeMainType/deleteBatch',
+  importExcel = '/xslmes/mesXslDowntimeMainType/importExcel',
+  exportXls = '/xslmes/mesXslDowntimeMainType/exportXls',
+  queryById = '/xslmes/mesXslDowntimeMainType/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 checkDowntimeType = (params: { downtimeType: string; dataId?: string }) =>
+  defHttp.get(
+    { url: Api.checkDowntimeType, 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/mesXslDowntimeMainType/MesXslDowntimeMainType.data.ts

@@ -0,0 +1,113 @@
+import { BasicColumn, FormSchema } from '/@/components/Table';
+import { h } from 'vue';
+import { checkDowntimeType } from './MesXslDowntimeMainType.api';
+
+export const columns: BasicColumn[] = [
+  { title: '工序名称', align: 'center', dataIndex: 'processOperationName', width: 160 },
+  { title: '停机类型', align: 'center', dataIndex: 'downtimeType', width: 160 },
+  { title: '显示顺序', align: 'center', dataIndex: 'displayOrder', width: 90 },
+  {
+    title: '区分颜色',
+    align: 'center',
+    dataIndex: 'distinguishColor',
+    width: 120,
+    customRender: ({ text }) => {
+      const c = text ? String(text) : '';
+      if (!c) {
+        return '';
+      }
+      return h('span', { style: { display: 'inline-flex', alignItems: 'center', gap: '6px' } }, [
+        h('span', {
+          style: {
+            display: 'inline-block',
+            width: '20px',
+            height: '20px',
+            borderRadius: '2px',
+            backgroundColor: c,
+            border: '1px solid #d9d9d9',
+          },
+        }),
+        h('span', c),
+      ]);
+    },
+  },
+  { title: '是否启用', align: 'center', dataIndex: 'status_dictText', width: 100 },
+  { 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),
+  },
+  { title: '租户ID', align: 'center', dataIndex: 'tenantId', width: 90, defaultHidden: true },
+];
+
+export const searchFormSchema: FormSchema[] = [
+  { label: '工序名称', field: 'processOperationName', component: 'Input', colProps: { span: 6 } },
+  { label: '停机类型', field: 'downtimeType', component: 'Input', colProps: { span: 6 } },
+  {
+    label: '是否启用',
+    field: 'status',
+    component: 'JDictSelectTag',
+    componentProps: { dictCode: 'xslmes_downtime_main_type_status' },
+    colProps: { span: 6 },
+  },
+];
+
+export const formSchema: FormSchema[] = [
+  { label: '', field: 'id', component: 'Input', show: false },
+  { label: '', field: 'processOperationId', component: 'Input', show: false, dynamicRules: () => [{ required: true, message: '请选择所属工序' }] },
+  {
+    label: '所属工序',
+    field: 'processOperationName',
+    component: 'Input',
+    slot: 'processOperationPicker',
+  },
+  {
+    label: '停机类型',
+    field: 'downtimeType',
+    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 checkDowntimeType({ downtimeType: 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: 'displayOrder',
+    component: 'InputNumber',
+    defaultValue: 0,
+    componentProps: { min: 0, precision: 0, style: { width: '100%' } },
+  },
+  {
+    label: '区分颜色',
+    field: 'distinguishColor',
+    component: 'Input',
+    slot: 'distinguishColorPicker',
+  },
+  {
+    label: '是否启用',
+    field: 'status',
+    required: true,
+    defaultValue: '0',
+    component: 'JDictSelectTag',
+    componentProps: { dictCode: 'xslmes_downtime_main_type_status', placeholder: '请选择' },
+  },
+];

jeecgboot-vue3/src/views/xslmes/mesXslDowntimeMainType/MesXslDowntimeMainTypeList.vue

@@ -0,0 +1,127 @@
+<template>
+  <div>
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <template #tableTitle>
+        <a-button type="primary" v-auth="'mes:mes_xsl_downtime_main_type:add'" @click="handleAdd" preIcon="ant-design:plus-outlined">
+          新增
+        </a-button>
+        <a-button
+          type="primary"
+          v-auth="'mes:mes_xsl_downtime_main_type:exportXls'"
+          preIcon="ant-design:export-outlined"
+          @click="onExportXls"
+        >
+          导出
+        </a-button>
+        <j-upload-button
+          type="primary"
+          v-auth="'mes:mes_xsl_downtime_main_type: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_downtime_main_type: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_downtime_main_type:edit' },
+          ]"
+          :dropDownActions="getDropDownAction(record)"
+        />
+      </template>
+    </BasicTable>
+    <MesXslDowntimeMainTypeModal @register="registerModal" @success="handleSuccess" />
+  </div>
+</template>
+
+<script lang="ts" name="xslmes-mesXslDowntimeMainType" setup>
+  import { BasicTable, TableAction } from '/@/components/Table';
+  import { useModal } from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import Icon from '/@/components/Icon';
+  import MesXslDowntimeMainTypeModal from './components/MesXslDowntimeMainTypeModal.vue';
+  import { columns, searchFormSchema } from './MesXslDowntimeMainType.data';
+  import { list, deleteOne, batchDelete, getExportUrl, getImportUrl } from './MesXslDowntimeMainType.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_downtime_main_type:delete',
+      },
+    ];
+  }
+</script>

jeecgboot-vue3/src/views/xslmes/mesXslDowntimeMainType/components/MesXslDowntimeMainTypeModal.vue

@@ -0,0 +1,102 @@
+<template>
+  <BasicModal @register="registerModal" :title="title" width="680" v-bind="$attrs" destroyOnClose @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">清除</a-button>
+        </a-input-group>
+      </template>
+      <template #distinguishColorPicker="{ model, field }">
+        <div style="display: flex; align-items: center; gap: 12px; width: 100%">
+          <input
+            type="color"
+            :value="normalizeColorValue(model[field])"
+            :disabled="isDetail"
+            style="width: 48px; height: 32px; padding: 0; border: 1px solid #d9d9d9; cursor: pointer"
+            @input="(e) => onColorInput(model, field, e)"
+          />
+          <a-input v-model:value="model[field]" :disabled="isDetail" placeholder="如 #1890ff" allow-clear style="flex: 1" />
+        </div>
+      </template>
+    </BasicForm>
+    <MesXslProcessOperationSelectModal @register="registerProcessModal" @select="onProcessSelect" />
+  </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 { formSchema } from '../MesXslDowntimeMainType.data';
+  import { saveOrUpdate } from '../MesXslDowntimeMainType.api';
+  import MesXslProcessOperationSelectModal from '/@/views/xslmes/mesXslEquipmentCategory/components/MesXslProcessOperationSelectModal.vue';
+
+  const emit = defineEmits(['register', 'success']);
+  const isUpdate = ref(true);
+  const isDetail = ref(false);
+
+  const [registerProcessModal, { openModal: openProcessModal }] = useModal();
+
+  const [registerForm, { resetFields, setFieldsValue, validate, setProps, getFieldsValue }] = useForm({
+    labelWidth: 100,
+    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 });
+    else await setFieldsValue({ status: '0', displayOrder: 0 });
+    setProps({ disabled: !data?.showFooter });
+  });
+
+  const title = computed(() =>
+    !unref(isUpdate) ? '新增停机主类型' : unref(isDetail) ? '停机主类型详情' : '编辑停机主类型',
+  );
+
+  function normalizeColorValue(val: unknown) {
+    const s = val == null ? '' : String(val).trim();
+    if (!s) {
+      return '#1890ff';
+    }
+    return s.startsWith('#') ? s : `#${s}`;
+  }
+
+  function onColorInput(model: Recordable, field: string, e: Event) {
+    const v = (e.target as HTMLInputElement).value;
+    model[field] = v;
+  }
+
+  function openProcessSelect() {
+    const vals = getFieldsValue();
+    openProcessModal(true, { processOperationId: vals.processOperationId });
+  }
+
+  function clearProcess() {
+    setFieldsValue({ processOperationId: '', processOperationName: '' });
+  }
+
+  function onProcessSelect(payload: { processOperationId?: string; processOperationName?: string }) {
+    setFieldsValue({
+      processOperationId: payload.processOperationId || '',
+      processOperationName: payload.processOperationName || '',
+    });
+  }
+
+  async function handleSubmit() {
+    try {
+      const values = await validate();
+      setModalProps({ confirmLoading: true });
+      await saveOrUpdate(values, isUpdate.value);
+      closeModal();
+      emit('success');
+    } finally {
+      setModalProps({ confirmLoading: false });
+    }
+  }
+</script>

jeecgboot-vue3/src/views/xslmes/mesXslDowntimeType/MesXslDowntimeType.api.ts

@@ -0,0 +1,58 @@
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from '/@/hooks/web/useMessage';
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/xslmes/mesXslDowntimeType/list',
+  checkDowntimeType = '/xslmes/mesXslDowntimeType/checkDowntimeType',
+  save = '/xslmes/mesXslDowntimeType/add',
+  edit = '/xslmes/mesXslDowntimeType/edit',
+  deleteOne = '/xslmes/mesXslDowntimeType/delete',
+  deleteBatch = '/xslmes/mesXslDowntimeType/deleteBatch',
+  importExcel = '/xslmes/mesXslDowntimeType/importExcel',
+  exportXls = '/xslmes/mesXslDowntimeType/exportXls',
+  queryById = '/xslmes/mesXslDowntimeType/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 checkDowntimeType = (params: { downtimeType: string; dataId?: string }) =>
+  defHttp.get(
+    { url: Api.checkDowntimeType, 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/mesXslDowntimeType/MesXslDowntimeType.data.ts

@@ -0,0 +1,144 @@
+import { BasicColumn, FormSchema } from '/@/components/Table';
+import { h } from 'vue';
+import { checkDowntimeType } from './MesXslDowntimeType.api';
+
+export const columns: BasicColumn[] = [
+  { title: '工序名称', align: 'center', dataIndex: 'processOperationName', width: 140 },
+  { title: '所属主类型', align: 'center', dataIndex: 'downtimeMainTypeName', width: 140 },
+  { title: '停机类型', align: 'center', dataIndex: 'downtimeType', width: 140 },
+  { title: '显示顺序', align: 'center', dataIndex: 'displayOrder', width: 90 },
+  {
+    title: '区分颜色',
+    align: 'center',
+    dataIndex: 'distinguishColor',
+    width: 120,
+    customRender: ({ text }) => {
+      const c = text ? String(text) : '';
+      if (!c) {
+        return '';
+      }
+      return h('span', { style: { display: 'inline-flex', alignItems: 'center', gap: '6px' } }, [
+        h('span', {
+          style: {
+            display: 'inline-block',
+            width: '20px',
+            height: '20px',
+            borderRadius: '2px',
+            backgroundColor: c,
+            border: '1px solid #d9d9d9',
+          },
+        }),
+        h('span', c),
+      ]);
+    },
+  },
+  { title: '责任区分', align: 'center', dataIndex: 'responsibilityDistinct', width: 120 },
+  { title: '故障等级', align: 'center', dataIndex: 'faultLevel', width: 100 },
+  { title: '是否停机维修', align: 'center', dataIndex: 'downtimeMaintenance_dictText', width: 110 },
+  { title: '是否启用', align: 'center', dataIndex: 'status_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: 'processOperationName', component: 'Input', colProps: { span: 6 } },
+  { label: '主类型', field: 'downtimeMainTypeName', component: 'Input', colProps: { span: 6 } },
+  { label: '停机类型', field: 'downtimeType', component: 'Input', colProps: { span: 6 } },
+  {
+    label: '是否启用',
+    field: 'status',
+    component: 'JDictSelectTag',
+    componentProps: { dictCode: 'xslmes_downtime_type_status' },
+    colProps: { span: 6 },
+  },
+];
+
+export const formSchema: FormSchema[] = [
+  { label: '', field: 'id', component: 'Input', show: false },
+  { label: '', field: 'processOperationId', component: 'Input', show: false, dynamicRules: () => [{ required: true, message: '请选择所属工序' }] },
+  {
+    label: '所属工序',
+    field: 'processOperationName',
+    component: 'Input',
+    slot: 'processOperationPicker',
+  },
+  { label: '', field: 'downtimeMainTypeId', component: 'Input', show: false, dynamicRules: () => [{ required: true, message: '请选择所属主类型' }] },
+  {
+    label: '所属主类型',
+    field: 'downtimeMainTypeName',
+    component: 'Input',
+    slot: 'downtimeMainTypePicker',
+  },
+  {
+    label: '停机类型',
+    field: 'downtimeType',
+    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 checkDowntimeType({ downtimeType: 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: 'displayOrder',
+    required: true,
+    component: 'InputNumber',
+    defaultValue: 0,
+    componentProps: { min: 0, precision: 0, style: { width: '100%' } },
+  },
+  {
+    label: '区分颜色',
+    field: 'distinguishColor',
+    component: 'Input',
+    slot: 'distinguishColorPicker',
+  },
+  {
+    label: '责任区分',
+    field: 'responsibilityDistinct',
+    component: 'Input',
+    componentProps: { placeholder: '手填' },
+  },
+  {
+    label: '故障等级',
+    field: 'faultLevel',
+    component: 'Input',
+    componentProps: { placeholder: '手填' },
+  },
+  {
+    label: '是否停机维修',
+    field: 'downtimeMaintenance',
+    defaultValue: '0',
+    component: 'JDictSelectTag',
+    componentProps: { dictCode: 'yn', placeholder: '请选择' },
+  },
+  {
+    label: '是否启用',
+    field: 'status',
+    required: true,
+    defaultValue: '0',
+    component: 'JDictSelectTag',
+    componentProps: { dictCode: 'xslmes_downtime_type_status', placeholder: '请选择' },
+  },
+];

jeecgboot-vue3/src/views/xslmes/mesXslDowntimeType/MesXslDowntimeTypeList.vue

@@ -0,0 +1,127 @@
+<template>
+  <div>
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <template #tableTitle>
+        <a-button type="primary" v-auth="'mes:mes_xsl_downtime_type:add'" @click="handleAdd" preIcon="ant-design:plus-outlined">
+          新增
+        </a-button>
+        <a-button
+          type="primary"
+          v-auth="'mes:mes_xsl_downtime_type:exportXls'"
+          preIcon="ant-design:export-outlined"
+          @click="onExportXls"
+        >
+          导出
+        </a-button>
+        <j-upload-button
+          type="primary"
+          v-auth="'mes:mes_xsl_downtime_type: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_downtime_type: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_downtime_type:edit' },
+          ]"
+          :dropDownActions="getDropDownAction(record)"
+        />
+      </template>
+    </BasicTable>
+    <MesXslDowntimeTypeModal @register="registerModal" @success="handleSuccess" />
+  </div>
+</template>
+
+<script lang="ts" name="xslmes-mesXslDowntimeType" setup>
+  import { BasicTable, TableAction } from '/@/components/Table';
+  import { useModal } from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import Icon from '/@/components/Icon';
+  import MesXslDowntimeTypeModal from './components/MesXslDowntimeTypeModal.vue';
+  import { columns, searchFormSchema } from './MesXslDowntimeType.data';
+  import { list, deleteOne, batchDelete, getExportUrl, getImportUrl } from './MesXslDowntimeType.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_downtime_type:delete',
+      },
+    ];
+  }
+</script>

jeecgboot-vue3/src/views/xslmes/mesXslDowntimeType/components/MesXslDowntimeMainTypeSelectModal.vue

@@ -0,0 +1,105 @@
+<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/mesXslDowntimeMainType/MesXslDowntimeMainType.api';
+
+  const emit = defineEmits(['register', 'select']);
+
+  const selectedRow = ref<Recordable | null>(null);
+  const processOperationIdRef = ref<string>('');
+
+  function handleSelectionChange(_keys: string[], rows: Recordable[]) {
+    selectedRow.value = rows?.[0] ?? null;
+  }
+
+  const [registerTable, { reload, setProps, getSelectRowKeys, getSelectRows, setSelectedRowKeys, clearSelectedRowKeys }] =
+    useTable({
+      api: (params) => {
+        const p = { ...params };
+        if (processOperationIdRef.value) {
+          p.processOperationId = processOperationIdRef.value;
+        }
+        return list(p);
+      },
+      columns: [
+        { title: '工序名称', dataIndex: 'processOperationName', width: 160 },
+        { title: '停机类型', dataIndex: 'downtimeType', width: 200 },
+        { title: '显示顺序', dataIndex: 'displayOrder', width: 90 },
+      ],
+      rowKey: 'id',
+      useSearchForm: true,
+      formConfig: {
+        labelWidth: 90,
+        schemas: [{ label: '停机类型', field: 'downtimeType', component: 'Input', colProps: { span: 10 } }],
+      },
+      pagination: { pageSize: 10 },
+      canResize: false,
+      showIndexColumn: false,
+      immediate: false,
+      rowSelection: {
+        type: 'radio',
+        columnWidth: 48,
+        onChange: handleSelectionChange,
+      },
+      clickToRowSelect: true,
+    });
+
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    selectedRow.value = null;
+    processOperationIdRef.value = (data?.processOperationId as string) || '';
+    clearSelectedRowKeys?.();
+    setProps({
+      rowSelection: {
+        type: 'radio',
+        columnWidth: 48,
+        onChange: handleSelectionChange,
+      },
+      clickToRowSelect: true,
+    });
+    setModalProps({ confirmLoading: false });
+    const mid = data?.downtimeMainTypeId 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', { downtimeMainTypeId: '', downtimeMainTypeName: '' });
+      closeModal();
+      return;
+    }
+    emit('select', {
+      downtimeMainTypeId: row.id,
+      downtimeMainTypeName: row.downtimeType || '',
+    });
+    closeModal();
+  }
+</script>

jeecgboot-vue3/src/views/xslmes/mesXslDowntimeType/components/MesXslDowntimeTypeModal.vue

@@ -0,0 +1,154 @@
+<template>
+  <BasicModal @register="registerModal" :title="title" width="720" v-bind="$attrs" destroyOnClose @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">清除</a-button>
+        </a-input-group>
+      </template>
+      <template #downtimeMainTypePicker="{ 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.processOperationId" @click="openMainTypeSelect">
+            选择主类型
+          </a-button>
+          <a-button v-if="model.downtimeMainTypeId && !isDetail" @click="clearMainType">清除</a-button>
+        </a-input-group>
+      </template>
+      <template #distinguishColorPicker="{ model, field }">
+        <div style="display: flex; align-items: center; gap: 12px; width: 100%">
+          <input
+            type="color"
+            :value="normalizeColorValue(model[field])"
+            :disabled="isDetail"
+            style="width: 48px; height: 32px; padding: 0; border: 1px solid #d9d9d9; cursor: pointer"
+            @input="(e) => onColorInput(model, field, e)"
+          />
+          <a-input v-model:value="model[field]" :disabled="isDetail" placeholder="如 #1890ff" allow-clear style="flex: 1" />
+        </div>
+      </template>
+    </BasicForm>
+    <MesXslProcessOperationSelectModal @register="registerProcessModal" @select="onProcessSelect" />
+    <MesXslDowntimeMainTypeSelectModal @register="registerMainTypeModal" @select="onMainTypeSelect" />
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+  import { computed, ref, unref } from 'vue';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { BasicModal, useModalInner, useModal } from '/@/components/Modal';
+  import { BasicForm, useForm } from '/@/components/Form/index';
+  import { formSchema } from '../MesXslDowntimeType.data';
+  import { saveOrUpdate } from '../MesXslDowntimeType.api';
+  import MesXslProcessOperationSelectModal from '/@/views/xslmes/mesXslEquipmentCategory/components/MesXslProcessOperationSelectModal.vue';
+  import MesXslDowntimeMainTypeSelectModal from './MesXslDowntimeMainTypeSelectModal.vue';
+
+  const { createMessage } = useMessage();
+  const emit = defineEmits(['register', 'success']);
+  const isUpdate = ref(true);
+  const isDetail = ref(false);
+
+  const [registerProcessModal, { openModal: openProcessModal }] = useModal();
+  const [registerMainTypeModal, { openModal: openMainTypeModal }] = useModal();
+
+  const [registerForm, { resetFields, setFieldsValue, validate, setProps, getFieldsValue }] = useForm({
+    labelWidth: 110,
+    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 });
+    else await setFieldsValue({ status: '0', downtimeMaintenance: '0', displayOrder: 0 });
+    setProps({ disabled: !data?.showFooter });
+  });
+
+  const title = computed(() =>
+    !unref(isUpdate) ? '新增停机类型' : unref(isDetail) ? '停机类型详情' : '编辑停机类型',
+  );
+
+  function normalizeColorValue(val: unknown) {
+    const s = val == null ? '' : String(val).trim();
+    if (!s) {
+      return '#1890ff';
+    }
+    return s.startsWith('#') ? s : `#${s}`;
+  }
+
+  function onColorInput(model: Recordable, field: string, e: Event) {
+    model[field] = (e.target as HTMLInputElement).value;
+  }
+
+  function openProcessSelect() {
+    const vals = getFieldsValue();
+    openProcessModal(true, { processOperationId: vals.processOperationId });
+  }
+
+  function clearProcess() {
+    setFieldsValue({
+      processOperationId: '',
+      processOperationName: '',
+      downtimeMainTypeId: '',
+      downtimeMainTypeName: '',
+    });
+  }
+
+  function onProcessSelect(payload: { processOperationId?: string; processOperationName?: string }) {
+    const vals = getFieldsValue();
+    const pid = payload.processOperationId || '';
+    if (vals.downtimeMainTypeId && vals.processOperationId && vals.processOperationId !== pid) {
+      setFieldsValue({
+        processOperationId: pid,
+        processOperationName: payload.processOperationName || '',
+        downtimeMainTypeId: '',
+        downtimeMainTypeName: '',
+      });
+    } else {
+      setFieldsValue({
+        processOperationId: pid,
+        processOperationName: payload.processOperationName || '',
+      });
+    }
+  }
+
+  function openMainTypeSelect() {
+    const vals = getFieldsValue();
+    if (!vals.processOperationId) {
+      createMessage.warning('请先选择所属工序');
+      return;
+    }
+    openMainTypeModal(true, {
+      processOperationId: vals.processOperationId,
+      downtimeMainTypeId: vals.downtimeMainTypeId,
+    });
+  }
+
+  function clearMainType() {
+    setFieldsValue({ downtimeMainTypeId: '', downtimeMainTypeName: '' });
+  }
+
+  function onMainTypeSelect(payload: { downtimeMainTypeId?: string; downtimeMainTypeName?: string }) {
+    setFieldsValue({
+      downtimeMainTypeId: payload.downtimeMainTypeId || '',
+      downtimeMainTypeName: payload.downtimeMainTypeName || '',
+    });
+  }
+
+  async function handleSubmit() {
+    try {
+      const values = await validate();
+      setModalProps({ confirmLoading: true });
+      await saveOrUpdate(values, isUpdate.value);
+      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,127 @@
+<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_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 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';
+
+  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 });
+  }
+
+  function handleDelete(record: Recordable) {
+    deleteOne({ id: record.id }, handleSuccess);
+  }
+
+  function batchHandleDelete() {
+    batchDelete({ ids: selectedRowKeys.value.join(',') }, handleSuccess);
+  }
+
+  function handleSuccess() {
+    reload();
+    selectedRowKeys.value = [];
+  }
+
+  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/mesXslRawMaterialCard/MesXslRawMaterialCard.api.ts

@@ -16,6 +16,7 @@ enum Api {
   queryPrinters = '/xslmes/mesXslRawMaterialCard/queryPrinters',
   prepareNativePrint = '/xslmes/mesXslRawMaterialCard/prepareNativePrint',
   printPdf = '/xslmes/mesXslRawMaterialCard/printPdf',
+  createInspectRecordByCard = '/xslmes/mesXslRawMaterialInspectRecord/createByCard',
 }
 
 export const getExportUrl = Api.exportXls;
@@ -63,3 +64,6 @@ export const prepareNativePrint = (id: string) =>
 /** id + 前端生成的 pdfBase64；printerName 空则用默认队列 */
 export const printPdf = (data: { id: string; printerName?: string; pdfBase64: string; fileName?: string }) =>
   defHttp.post({ url: Api.printPdf, data, timeout: 3 * 60 * 1000 });
+
+export const createInspectRecordByCard = (rawMaterialCardId: string) =>
+  defHttp.post({ url: Api.createInspectRecordByCard, params: { rawMaterialCardId } });

jeecgboot-vue3/src/views/xslmes/mesXslRawMaterialCard/MesXslRawMaterialCardList.vue

@@ -99,6 +99,7 @@
     getExportUrl,
     updatePriority,
     prepareNativePrint,
+    createInspectRecordByCard,
   } from './MesXslRawMaterialCard.api';
   import { useMessage } from '/@/hooks/web/useMessage';
   import {
@@ -431,6 +432,14 @@
     }
   }
 
+  async function handleSendInspect(record: Recordable) {
+    await createInspectRecordByCard(record.id as string);
+    record.testResult = '0';
+    record.hasPendingInspect = true;
+    createMessage.success('已生成送检记录');
+    reload();
+  }
+
   function handleSuccess() {
     (selectedRowKeys.value = []) && reload();
   }
@@ -452,6 +461,12 @@
         onClick: handlePrintRow.bind(null, record),
         auth: 'xslmes:mes_xsl_raw_material_card:edit',
       },
+      {
+        label: '送检',
+        onClick: handleSendInspect.bind(null, record),
+        auth: 'xslmes:mes_xsl_raw_material_card:edit',
+        ifShow: () => (!record.testResult || record.testResult === '0') && !record.hasPendingInspect,
+      },
     ];
   }
 

jeecgboot-vue3/src/views/xslmes/mesXslRawMaterialInspectRecord/MesXslRawMaterialInspectRecord.api.ts

@@ -0,0 +1,17 @@
+import { defHttp } from '/@/utils/http/axios';
+
+enum Api {
+  list = '/xslmes/mesXslRawMaterialInspectRecord/list',
+  queryById = '/xslmes/mesXslRawMaterialInspectRecord/queryById',
+  queryLineListByRecordId = '/xslmes/mesXslRawMaterialInspectRecord/queryLineListByRecordId',
+  prepareResultEntry = '/xslmes/mesXslRawMaterialInspectRecord/prepareResultEntry',
+  saveInspectResult = '/xslmes/mesXslRawMaterialInspectRecord/saveInspectResult',
+  exportXls = '/xslmes/mesXslRawMaterialInspectRecord/exportXls',
+}
+
+export const getExportUrl = Api.exportXls;
+export const list = (params) => defHttp.get({ url: Api.list, params });
+export const queryById = (params) => defHttp.get({ url: Api.queryById, params });
+export const queryLineListByRecordId = (params) => defHttp.get({ url: Api.queryLineListByRecordId, params });
+export const prepareResultEntry = (id: string) => defHttp.post({ url: Api.prepareResultEntry, params: { id } });
+export const saveInspectResult = (params) => defHttp.post({ url: Api.saveInspectResult, params });

jeecgboot-vue3/src/views/xslmes/mesXslRawMaterialInspectRecord/MesXslRawMaterialInspectRecord.data.ts

@@ -0,0 +1,80 @@
+import { BasicColumn, FormSchema } from '/@/components/Table';
+import { JVxeColumn, JVxeTypes } from '/@/components/jeecg/JVxeTable/types';
+
+export const columns: BasicColumn[] = [
+  { title: '条码', align: 'center', dataIndex: 'barcode', width: 180 },
+  { title: '批次号', align: 'center', dataIndex: 'batchNo', width: 160 },
+  { title: '物料名称', align: 'center', dataIndex: 'materialName', width: 180 },
+  { title: '检验状态', align: 'center', dataIndex: 'inspectStatus_dictText', width: 120 },
+  { title: '送检时间', align: 'center', dataIndex: 'inspectTime', width: 170 },
+  { title: '判定时间', align: 'center', dataIndex: 'resultTime', width: 170 },
+];
+
+export const searchFormSchema: FormSchema[] = [
+  { label: '条码', field: 'barcode', component: 'Input', colProps: { span: 6 } },
+  { label: '批次号', field: 'batchNo', component: 'Input', colProps: { span: 6 } },
+  { label: '物料名称', field: 'materialName', component: 'Input', colProps: { span: 6 } },
+  {
+    label: '检验状态',
+    field: 'inspectStatus',
+    component: 'JDictSelectTag',
+    componentProps: { dictCode: 'xslmes_inspect_status' },
+    colProps: { span: 6 },
+  },
+];
+
+export const lineJVxeColumns: JVxeColumn[] = [
+  {
+    title: '检验项目',
+    key: 'inspectItemName',
+    type: JVxeTypes.input,
+    width: 220,
+    disabled: true,
+  },
+  {
+    title: '容许最小值',
+    key: 'allowMin',
+    type: JVxeTypes.inputNumber,
+    width: 120,
+    disabled: true,
+  },
+  {
+    title: '包含最小值',
+    key: 'includeMinFlag',
+    type: JVxeTypes.checkbox,
+    width: 110,
+    align: 'center',
+    customValue: [1, 0],
+    disabled: true,
+  },
+  {
+    title: '容许最大值',
+    key: 'allowMax',
+    type: JVxeTypes.inputNumber,
+    width: 120,
+    disabled: true,
+  },
+  {
+    title: '包含最大值',
+    key: 'includeMaxFlag',
+    type: JVxeTypes.checkbox,
+    width: 110,
+    align: 'center',
+    customValue: [1, 0],
+    disabled: true,
+  },
+  {
+    title: '检验值',
+    key: 'inspectValue',
+    type: JVxeTypes.inputNumber,
+    width: 120,
+    validateRules: [{ required: true, message: '${title}必填' }],
+  },
+  {
+    title: '判定',
+    key: 'passFlag_dictText',
+    type: JVxeTypes.input,
+    width: 100,
+    disabled: true,
+  },
+];

jeecgboot-vue3/src/views/xslmes/mesXslRawMaterialInspectRecord/MesXslRawMaterialInspectRecordList.vue

@@ -0,0 +1,70 @@
+<template>
+  <div>
+    <BasicTable @register="registerTable">
+      <template #tableTitle>
+        <a-button
+          type="primary"
+          v-auth="'xslmes:mes_xsl_raw_material_inspect_record:exportXls'"
+          preIcon="ant-design:export-outlined"
+          @click="onExportXls"
+        >
+          导出
+        </a-button>
+      </template>
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" />
+      </template>
+    </BasicTable>
+    <MesXslRawMaterialInspectRecordResultModal @register="registerResultModal" @success="reload" />
+  </div>
+</template>
+
+<script lang="ts" name="xslmes-mesXslRawMaterialInspectRecord" setup>
+  import { BasicTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { useModal } from '/@/components/Modal';
+  import { columns, searchFormSchema } from './MesXslRawMaterialInspectRecord.data';
+  import { getExportUrl, list } from './MesXslRawMaterialInspectRecord.api';
+  import MesXslRawMaterialInspectRecordResultModal from './modules/MesXslRawMaterialInspectRecordResultModal.vue';
+
+  const [registerResultModal, { openModal: openResultModal }] = useModal();
+
+  const { tableContext, onExportXls } = useListPage({
+    tableProps: {
+      title: '原材料送检记录',
+      api: list,
+      columns,
+      canResize: true,
+      formConfig: { labelWidth: 100, schemas: searchFormSchema, autoSubmitOnEnter: true },
+      actionColumn: { width: 180, fixed: 'right' },
+    },
+    exportConfig: {
+      name: '原材料送检记录',
+      url: getExportUrl,
+    },
+  });
+  const [registerTable, { reload }] = tableContext;
+
+  function handleEntryResult(record: Recordable) {
+    openResultModal(true, { record, editable: true });
+  }
+
+  function handleDetail(record: Recordable) {
+    openResultModal(true, { record, editable: false });
+  }
+
+  function getTableAction(record: Recordable) {
+    return [
+      {
+        label: '录入检验结果',
+        onClick: handleEntryResult.bind(null, record),
+        auth: 'xslmes:mes_xsl_raw_material_inspect_record:edit',
+        ifShow: () => record.inspectStatus === '0',
+      },
+      {
+        label: '查看',
+        onClick: handleDetail.bind(null, record),
+      },
+    ];
+  }
+</script>

jeecgboot-vue3/src/views/xslmes/mesXslRawMaterialInspectRecord/modules/MesXslRawMaterialInspectRecordResultModal.vue

@@ -0,0 +1,141 @@
+<template>
+  <BasicModal
+    v-bind="$attrs"
+    destroyOnClose
+    :title="title"
+    width="1100px"
+    @register="registerModal"
+    @ok="handleSubmit"
+  >
+    <a-descriptions bordered :column="2" size="small">
+      <a-descriptions-item label="条码">{{ mainRecord.barcode || '-' }}</a-descriptions-item>
+      <a-descriptions-item label="批次号">{{ mainRecord.batchNo || '-' }}</a-descriptions-item>
+      <a-descriptions-item label="物料名称">{{ mainRecord.materialName || '-' }}</a-descriptions-item>
+      <a-descriptions-item label="检验状态">{{ mainRecord.inspectStatus_dictText || '-' }}</a-descriptions-item>
+      <a-descriptions-item label="送检时间">{{ mainRecord.inspectTime || '-' }}</a-descriptions-item>
+      <a-descriptions-item label="判定时间">{{ mainRecord.resultTime || '-' }}</a-descriptions-item>
+    </a-descriptions>
+    <a-divider orientation="left">检验明细</a-divider>
+    <JVxeTable
+      v-if="tableReady"
+      ref="lineTableRef"
+      row-number
+      keep-source
+      :max-height="400"
+      :loading="lineLoading"
+      :columns="tableColumns"
+      :dataSource="lineDataSource"
+      :disabled="!editable"
+    />
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+  import { computed, ref } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import type { JVxeTableInstance } from '/@/components/jeecg/JVxeTable/types';
+  import { lineJVxeColumns } from '../MesXslRawMaterialInspectRecord.data';
+  import { prepareResultEntry, queryById, queryLineListByRecordId, saveInspectResult } from '../MesXslRawMaterialInspectRecord.api';
+  import { useMessage } from '/@/hooks/web/useMessage';
+
+  const emit = defineEmits(['register', 'success']);
+  const { createMessage } = useMessage();
+  const editable = ref(false);
+  const tableReady = ref(false);
+  const lineLoading = ref(false);
+  const lineDataSource = ref<Recordable[]>([]);
+  const lineTableRef = ref<JVxeTableInstance>();
+  const recordId = ref('');
+  const mainRecord = ref<Recordable>({});
+
+  const tableColumns = computed(() => {
+    if (editable.value) {
+      return lineJVxeColumns;
+    }
+    return lineJVxeColumns.map((c) => {
+      if (c.key === 'inspectValue') {
+        return { ...c, disabled: true };
+      }
+      return c;
+    });
+  });
+
+  function mapPassFlagText(list: Recordable[]) {
+    return (list || []).map((row) => {
+      const passFlag = String(row?.passFlag ?? '');
+      let passText = '';
+      if (passFlag === '0') passText = '待检';
+      else if (passFlag === '1') passText = '合格';
+      else if (passFlag === '2') passText = '不合格';
+      return { ...row, passFlag_dictText: passText };
+    });
+  }
+
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    tableReady.value = false;
+    lineDataSource.value = [];
+    editable.value = !!data?.editable;
+    recordId.value = data?.record?.id || '';
+    setModalProps({
+      confirmLoading: false,
+      showCancelBtn: true,
+      showOkBtn: editable.value,
+      okText: '保存',
+    });
+    if (!recordId.value) {
+      return;
+    }
+
+    lineLoading.value = true;
+    try {
+      const mainRaw = await queryById({ id: recordId.value });
+      mainRecord.value = (mainRaw as any)?.id != null ? (mainRaw as Recordable) : ((mainRaw as any)?.result ?? {});
+      if (editable.value) {
+        const linesRaw = await prepareResultEntry(recordId.value);
+        const list = Array.isArray(linesRaw) ? linesRaw : ((linesRaw as any)?.result ?? []);
+        lineDataSource.value = mapPassFlagText(list || []);
+      } else {
+        const linesRaw = await queryLineListByRecordId({ id: recordId.value });
+        const list = Array.isArray(linesRaw) ? linesRaw : ((linesRaw as any)?.result ?? []);
+        lineDataSource.value = mapPassFlagText(list || []);
+      }
+    } finally {
+      lineLoading.value = false;
+      tableReady.value = true;
+    }
+  });
+
+  const title = computed(() => (editable.value ? '录入检验结果' : '送检记录详情'));
+
+  async function handleSubmit() {
+    if (!editable.value) {
+      closeModal();
+      return;
+    }
+    try {
+      const lineRef = lineTableRef.value as any;
+      if (lineRef?.validateTable) {
+        const err = await lineRef.validateTable();
+        if (err) {
+          createMessage.warning('请完善检验值');
+          return;
+        }
+      }
+      const tableData = (lineRef?.getTableData?.() || []) as Recordable[];
+      const lineList = tableData.map((item) => ({
+        id: item.id,
+        inspectValue: item.inspectValue,
+      }));
+      setModalProps({ confirmLoading: true });
+      await saveInspectResult({
+        id: recordId.value,
+        lineList,
+      });
+      createMessage.success('保存成功');
+      closeModal();
+      emit('success');
+    } finally {
+      setModalProps({ confirmLoading: false });
+    }
+  }
+</script>

yy-admin-master/YY.Admin.Core/Core/Services/IRawMaterialEntryService.cs

@@ -21,7 +21,7 @@ public interface IRawMaterialEntryService
     Task<bool> DeleteAsync(string id, CancellationToken ct = default);
     Task<bool> DeleteBatchAsync(string ids, CancellationToken ct = default);
 
-    /// <summary>调用后端接口生成条码/批次号（格式：QH+物料编码+yyMMdd+序号）</summary>
+    /// <summary>生成条码/批次号（优先后端，离线回退本地；格式：QH+物料编码+yyMMdd+序号）</summary>
     Task<string?> GenerateBarcodeAsync(string materialCode, CancellationToken ct = default);
 
     /// <summary>按业务打印绑定准备模板 JSON 与 printData（与后端 prepareNativePrint 一致，免密 anon）。</summary>

yy-admin-master/YY.Admin.Core/Core/Services/IWarehouseService.cs

@@ -4,6 +4,6 @@ namespace YY.Admin.Core.Services;
 
 public interface IWarehouseService
 {
-    /// <summary>获取全部仓库列表（在线时拉取远端并刷新缓存，离线时返回本地缓存）</summary>
+    /// <summary>获取全部仓库列表（优先内存/磁盘缓存；仅缓存为空且在线时拉取远端）</summary>
     Task<List<MesXslWarehouse>> GetAllAsync(CancellationToken ct = default);
 }

yy-admin-master/YY.Admin.Core/Entity/SysMenu.cs

@@ -103,6 +103,12 @@ public partial class SysMenu : EntityBase
     [SugarColumn(ColumnDescription = "是否固定")]
     public bool IsAffix { get; set; }
 
+    /// <summary>
+    /// 桌面端登录后默认打开的首页（全库仅一项建议为 true，保存时由服务层互斥）
+    /// </summary>
+    [SugarColumn(ColumnDescription = "桌面端默认首页")]
+    public bool IsDefaultDesktopHome { get; set; }
+
     /// <summary>
     /// 排序
     /// </summary>

yy-admin-master/YY.Admin.Core/SeedData/SysMenuSeedData.cs

@@ -16,7 +16,7 @@ public class SysMenuSeedData : ISqlSugarEntitySeedData<SysMenu>
         return new[]
         {
             new SysMenu{ Id=1300100000101, Pid=0, Title="工作台", Path="", Name="dashboard", Component="Layout", Icon="&#xe801;", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=0 },
-            new SysMenu{ Id=1300100010101, Pid=1300100000101, Title="仪表盘", Path="DashboardView", Name="home", Component="/home/index", IsAffix=true, Icon="&#xe79e;", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=1300100010101, Pid=1300100000101, Title="仪表盘", Path="DashboardView", Name="home", Component="/home/index", IsAffix=true, IsDefaultDesktopHome=true, Icon="&#xe79e;", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=1300100010201, Pid=1300100000101, Title="站内信", Path="/dashboard/notice", Name="notice", Component="/home/notice/index", Icon="&#xe7fc;", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=101 },
 
             // 建议此处Id范围之间放置具体业务应用菜单

yy-admin-master/YY.Admin.Core/SqlSugar/SqlSugarSetup.cs

@@ -163,9 +163,11 @@ namespace YY.Admin.Core.SqlSugar
                     config.ConnectionString = CryptogramUtil.Decrypt(config.ConnectionString);
                 }
 
-                // SQLite 相对路径默认依赖进程工作目录；快捷方式/从不同目录启动会在别处生成空库，表现为发布后菜单全空
+                // SQLite 相对路径会解析到 LocalApplicationData\Data（见 ResolveSqliteConnectionToAbsolutePath）
                 if (config.DbType == DbType.Sqlite && !string.IsNullOrWhiteSpace(config.ConnectionString))
                 {
+                    // 安装包随带的 Admin.NET.db / Slave.db 在安装目录；运行时代码只读写可写目录。首启若无用户库则从安装目录复制模板。
+                    TrySeedSqliteFromInstallDirectory(config.ConnectionString);
                     config.ConnectionString = ResolveSqliteConnectionToAbsolutePath(config.ConnectionString);
                 }
 
@@ -251,6 +253,8 @@ namespace YY.Admin.Core.SqlSugar
 
             // 兼容旧库：曾关闭表初始化或升级前库无 Jeecg 盐列时补齐，避免脱网按 Jeecg 规则验密时读列失败
             EnsureSysUserJeecgPasswordSaltColumn(dbProvider, config);
+            // 兼容旧库：菜单表增加「桌面默认首页」标记列
+            EnsureSysMenuDefaultDesktopHomeColumn(dbProvider, config);
             // 兜底：确保 Jeecg 用户同构表存在（登录页“同步 Jeecg 用户”写入此表）
             EnsureJeecgSysUserMirrorTable(dbProvider, config);
             // 兜底：确保 Jeecg 数据字典同构表存在（数据字典页面“同步数据字典”写入此表）
@@ -264,7 +268,41 @@ namespace YY.Admin.Core.SqlSugar
         }
 
         /// <summary>
-        /// 将 SQLite 连接串中的相对 DataSource 解析为基于应用程序基目录的绝对路径。
+        /// 首次启动时：若用户数据目录中尚无该 SQLite 文件，且安装目录（exe 旁）存在同名库，则复制一份作为初始模板。
+        /// 否则安装包内随带的菜单/配置永远不会被用到（实际始终读写 %LocalAppData%\YY.Admin\Data\）。
+        /// </summary>
+        private static void TrySeedSqliteFromInstallDirectory(string connectionString)
+        {
+            try
+            {
+                var builder = new SqliteConnectionStringBuilder(connectionString);
+                var ds = builder.DataSource;
+                if (string.IsNullOrWhiteSpace(ds) || Path.IsPathFullyQualified(ds))
+                    return;
+
+                var fileName = Path.GetFileName(ds.TrimStart('.', '/', '\\'));
+                if (string.IsNullOrWhiteSpace(fileName))
+                    fileName = "Admin.NET.db";
+
+                var dataDir = AppWritablePaths.EnsureDirectoryExists(AppWritablePaths.DataDirectory);
+                var targetPath = Path.Combine(dataDir, fileName);
+                if (File.Exists(targetPath))
+                    return;
+
+                var bundledPath = Path.Combine(AppContext.BaseDirectory, fileName);
+                if (!File.Exists(bundledPath))
+                    return;
+
+                File.Copy(bundledPath, targetPath, overwrite: false);
+            }
+            catch
+            {
+                // 忽略：后续仍可按空库走建表/基准种子
+            }
+        }
+
+        /// <summary>
+        /// 将 SQLite 连接串中的相对 DataSource 解析为 %LocalAppData%\YY.Admin\Data\ 下绝对路径（适配 Program Files 只读安装）。
         /// </summary>
         private static string ResolveSqliteConnectionToAbsolutePath(string connectionString)
         {
@@ -282,7 +320,7 @@ namespace YY.Admin.Core.SqlSugar
                     return connectionString;
                 }
 
-                // Program Files 等安装目录对普通用户只读；SQLite 库放到 LocalApplicationData
+                // Program Files 等安装目录对普通用户只读；运行期 SQLite 放到 LocalApplicationData（首启可由 TrySeedSqliteFromInstallDirectory 从安装目录拷贝模板）
                 var dataDir = AppWritablePaths.EnsureDirectoryExists(AppWritablePaths.DataDirectory);
                 var fileName = Path.GetFileName(ds.TrimStart('.', '/', '\\'));
                 if (string.IsNullOrWhiteSpace(fileName))
@@ -352,8 +390,57 @@ namespace YY.Admin.Core.SqlSugar
         }
 
         /// <summary>
-        /// 若 sys_user 缺少 jeecg_password_salt，则执行 ALTER 补列（与实体 SysUser.JeecgPasswordSalt 一致）
+        /// 若 sys_menu 缺少桌面默认首页标记列，则 ALTER 补齐（与实体 SysMenu.IsDefaultDesktopHome 一致）
         /// </summary>
+        private static void EnsureSysMenuDefaultDesktopHomeColumn(SqlSugarScopeProvider dbProvider, DbConnectionConfig config)
+        {
+            try
+            {
+                var entityInfo = dbProvider.EntityMaintenance.GetEntityInfo(typeof(SysMenu));
+                var tableName = entityInfo.DbTableName;
+                if (!dbProvider.DbMaintenance.IsAnyTable(tableName, false))
+                {
+                    return;
+                }
+
+                var col = entityInfo.Columns.FirstOrDefault(c => c.PropertyName == nameof(SysMenu.IsDefaultDesktopHome));
+                if (col == null)
+                {
+                    return;
+                }
+
+                var columns = dbProvider.DbMaintenance.GetColumnInfosByTableName(tableName, false);
+                if (columns != null &&
+                    columns.Any(c => string.Equals(c.DbColumnName, col.DbColumnName, StringComparison.OrdinalIgnoreCase)))
+                {
+                    return;
+                }
+
+                var cName = col.DbColumnName;
+                var sql = config.DbType switch
+                {
+                    DbType.Sqlite => $"ALTER TABLE {tableName} ADD COLUMN {cName} INTEGER NOT NULL DEFAULT 0;",
+                    DbType.MySql => $"ALTER TABLE `{tableName}` ADD COLUMN `{cName}` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '桌面端默认首页';",
+                    DbType.PostgreSQL => $"ALTER TABLE \"{tableName}\" ADD COLUMN IF NOT EXISTS {cName} BOOLEAN NOT NULL DEFAULT FALSE;",
+                    DbType.SqlServer => $"ALTER TABLE [{tableName}] ADD [{cName}] BIT NOT NULL DEFAULT 0;",
+                    DbType.Kdbndp => $"ALTER TABLE \"{tableName}\" ADD COLUMN IF NOT EXISTS {cName} BOOLEAN NOT NULL DEFAULT FALSE;",
+                    DbType.Dm => $"ALTER TABLE {tableName} ADD {cName} NUMBER(1) DEFAULT 0 NOT NULL;",
+                    _ => (string?)null
+                };
+
+                if (string.IsNullOrEmpty(sql))
+                {
+                    return;
+                }
+
+                Retry(() => dbProvider.Ado.ExecuteCommand(sql), maxRetry: 3, retryIntervalMs: 1000);
+            }
+            catch
+            {
+                // 无权限、从库只读等场景不阻断启动
+            }
+        }
+
         private static void EnsureSysUserJeecgPasswordSaltColumn(SqlSugarScopeProvider dbProvider, DbConnectionConfig config)
         {
             try

yy-admin-master/YY.Admin.Services/Service/Menu/Dto/MenuOutput.cs

@@ -121,6 +121,11 @@ namespace YY.Admin.Services
         /// 是否固定
         /// </summary>
         public bool IsAffix { get; set; }
+
+        /// <summary>
+        /// 桌面端登录后作为默认首页打开的菜单
+        /// </summary>
+        public bool IsDefaultDesktopHome { get; set; }
         #endregion
         /// <summary>
         /// 菜单子项

yy-admin-master/YY.Admin.Services/Service/Menu/SysMenuService.cs

@@ -157,6 +157,9 @@ namespace YY.Admin.Services.Service.Menu
             if (n <= 0)
                 return (false, "保存失败", 0);
 
+            if (input.IsDefaultDesktopHome)
+                await ClearDefaultDesktopHomeExceptAsync(input.Id);
+
             await TryLinkCurrentTenantMenuAsync(id);
             return (true, "保存成功", id);
         }
@@ -180,6 +183,9 @@ namespace YY.Admin.Services.Service.Menu
             if (NewParentIsInsideMenuSubtree(input.Id, input.Pid, all))
                 return (false, "不能将父级设为当前菜单或其子菜单");
 
+            if (input.IsDefaultDesktopHome)
+                await ClearDefaultDesktopHomeExceptAsync(input.Id);
+
             existing.Pid = input.Pid;
             existing.Type = input.Type;
             existing.Name = input.Name;
@@ -194,13 +200,17 @@ namespace YY.Admin.Services.Service.Menu
             existing.IsHide = input.IsHide;
             existing.IsKeepAlive = input.IsKeepAlive;
             existing.IsAffix = input.IsAffix;
+            existing.IsDefaultDesktopHome = input.IsDefaultDesktopHome;
             existing.OrderNo = input.OrderNo;
             existing.Status = input.Status;
             existing.Remark = input.Remark;
             existing.UpdateTime = DateTime.Now;
 
             var n = await _dbContext.Updateable(existing).ExecuteCommandAsync();
-            return n > 0 ? (true, "保存成功") : (false, "更新失败");
+            if (n <= 0)
+                return (false, "更新失败");
+            await TryLinkCurrentTenantMenuAsync(input.Id);
+            return (true, "保存成功");
         }
 
         /// <inheritdoc />
@@ -219,6 +229,17 @@ namespace YY.Admin.Services.Service.Menu
             return n > 0 ? (true, "已删除") : (false, "删除失败");
         }
 
+        /// <summary>
+        /// 保证全表仅一条菜单为桌面默认首页（当前保留项除外全部置 false）
+        /// </summary>
+        private async Task ClearDefaultDesktopHomeExceptAsync(long keepMenuId)
+        {
+            await _dbContext.Updateable<SysMenu>()
+                .SetColumns(m => new SysMenu { IsDefaultDesktopHome = false })
+                .Where(m => m.Id != keepMenuId && m.IsDefaultDesktopHome)
+                .ExecuteCommandAsync();
+        }
+
         private async Task TryLinkCurrentTenantMenuAsync(long menuId)
         {
             var tenantId = AppSession.CurrentUser?.TenantId;