Merge remote-tracking branch 'origin/生产基础资料' into SCADA系统测试

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

@@ -0,0 +1,63 @@
+-- MES 工序管理：建表 + 菜单 + 按钮权限 + 租户 admin 授权（可整文件一次执行）
+-- 权限前缀与 Controller、前端 v-auth 一致：mes:mes_process_operation:*
+-- 修改租户：改 SET @mes_tenant_id；仅建表可只执行下面 CREATE 段或单独文件 mes-process-operation.sql
+SET NAMES utf8mb4;
+
+CREATE TABLE IF NOT EXISTS `mes_process_operation` (
+  `id` varchar(32) NOT NULL COMMENT '主键',
+  `operation_code` varchar(64) NOT NULL COMMENT '工序编码',
+  `operation_name` varchar(128) NOT NULL COMMENT '工序名称',
+  `remark` varchar(500) DEFAULT NULL COMMENT '备注',
+  `tenant_id` int DEFAULT NULL COMMENT '租户',
+  `sys_org_code` varchar(64) DEFAULT NULL COMMENT '部门',
+  `create_by` varchar(32) DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(32) DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `del_flag` int DEFAULT '0' COMMENT '删除标记（0正常1删除）',
+  PRIMARY KEY (`id`),
+  KEY `idx_mpo_operation_code` (`operation_code`)
+) 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 ('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`), `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
+('1860000000000000061', '1860000000000000060', '新增', 2, 'mes:mes_process_operation:add', '1', '1', 0, 'admin', NOW()),
+('1860000000000000062', '1860000000000000060', '编辑', 2, 'mes:mes_process_operation:edit', '1', '1', 0, 'admin', NOW()),
+('1860000000000000063', '1860000000000000060', '删除', 2, 'mes:mes_process_operation:delete', '1', '1', 0, 'admin', NOW()),
+('1860000000000000064', '1860000000000000060', '批量删除', 2, 'mes:mes_process_operation:deleteBatch', '1', '1', 0, 'admin', NOW()),
+('1860000000000000065', '1860000000000000060', '导出', 2, 'mes:mes_process_operation:exportXls', '1', '1', 0, 'admin', NOW()),
+('1860000000000000066', '1860000000000000060', '导入', 2, 'mes:mes_process_operation: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 (
+    '1860000000000000060',
+    '1860000000000000061', '1860000000000000062', '1860000000000000063', '1860000000000000064',
+    '1860000000000000065', '1860000000000000066'
+  )
+  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-process-operation.sql

@@ -0,0 +1,18 @@
+-- 仅建表（与 Flyway V3.9.2_53 表结构一致）。建表+菜单+授权请执行 mes-process-operation-menu-permission.sql
+SET NAMES utf8mb4;
+
+CREATE TABLE IF NOT EXISTS `mes_process_operation` (
+  `id` varchar(32) NOT NULL COMMENT '主键',
+  `operation_code` varchar(64) NOT NULL COMMENT '工序编码',
+  `operation_name` varchar(128) NOT NULL COMMENT '工序名称',
+  `remark` varchar(500) DEFAULT NULL COMMENT '备注',
+  `tenant_id` int DEFAULT NULL COMMENT '租户',
+  `sys_org_code` varchar(64) DEFAULT NULL COMMENT '部门',
+  `create_by` varchar(32) DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(32) DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `del_flag` int DEFAULT '0' COMMENT '删除标记（0正常1删除）',
+  PRIMARY KEY (`id`),
+  KEY `idx_mpo_operation_code` (`operation_code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES工序管理';

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

@@ -0,0 +1,98 @@
+-- MES 设备类别：建表 + 字典 + 菜单 + 按钮权限 + 租户 admin 授权（可整文件一次执行）
+-- 权限前缀与 Controller、前端 v-auth 一致：mes:mes_xsl_equipment_category:*
+-- 修改租户：改 SET @mes_tenant_id；Flyway 已含同内容时可只执行本脚本做手工补数
+-- 仅建表见 mes-xsl-equipment-category.sql
+SET NAMES utf8mb4;
+
+CREATE TABLE IF NOT EXISTS `mes_xsl_equipment_category` (
+  `id` varchar(32) NOT NULL COMMENT '主键',
+  `category_name` varchar(128) NOT NULL COMMENT '设备类别名称',
+  `process_operation_id` varchar(32) NOT NULL COMMENT '所属工序主键 mes_process_operation.id',
+  `process_operation_name` varchar(128) DEFAULT NULL COMMENT '工序名称冗余展示',
+  `inspect_distinct` varchar(32) NOT NULL COMMENT '点检区分 字典xslmes_equipment_inspect_distinct：generic通用 distinct区分',
+  `maintain_distinct` varchar(32) NOT NULL COMMENT '保养区分 字典xslmes_equipment_maintain_distinct：maintain保养 distinct区分',
+  `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_mec_tenant_name` (`tenant_id`, `category_name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES设备类别';
+
+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_inspect_distinct', '设备类别点检区分：通用/区分', 0, 'admin', NOW(), 0, 0
+WHERE NOT EXISTS (SELECT 1 FROM `sys_dict` WHERE `dict_code` = 'xslmes_equipment_inspect_distinct' 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, '通用', 'generic', 1, 1, 'admin', NOW()
+FROM `sys_dict` d
+WHERE d.`dict_code` = 'xslmes_equipment_inspect_distinct'
+  AND NOT EXISTS (SELECT 1 FROM `sys_dict_item` i WHERE i.`dict_id` = d.`id` AND i.`item_value` = 'generic');
+
+INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `sort_order`, `status`, `create_by`, `create_time`)
+SELECT REPLACE(UUID(), '-', ''), d.id, '区分', 'distinct', 2, 1, 'admin', NOW()
+FROM `sys_dict` d
+WHERE d.`dict_code` = 'xslmes_equipment_inspect_distinct'
+  AND NOT EXISTS (SELECT 1 FROM `sys_dict_item` i WHERE i.`dict_id` = d.`id` AND i.`item_value` = 'distinct');
+
+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_maintain_distinct', '设备类别保养区分：保养/区分', 0, 'admin', NOW(), 0, 0
+WHERE NOT EXISTS (SELECT 1 FROM `sys_dict` WHERE `dict_code` = 'xslmes_equipment_maintain_distinct' 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, '保养', 'maintain', 1, 1, 'admin', NOW()
+FROM `sys_dict` d
+WHERE d.`dict_code` = 'xslmes_equipment_maintain_distinct'
+  AND NOT EXISTS (SELECT 1 FROM `sys_dict_item` i WHERE i.`dict_id` = d.`id` AND i.`item_value` = 'maintain');
+
+INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `sort_order`, `status`, `create_by`, `create_time`)
+SELECT REPLACE(UUID(), '-', ''), d.id, '区分', 'distinct', 2, 1, 'admin', NOW()
+FROM `sys_dict` d
+WHERE d.`dict_code` = 'xslmes_equipment_maintain_distinct'
+  AND NOT EXISTS (SELECT 1 FROM `sys_dict_item` i WHERE i.`dict_id` = d.`id` AND i.`item_value` = 'distinct');
+
+SET @mes_tenant_id = 1002;
+
+SET @mes_base_pid = (
+  SELECT MIN(`id`) FROM `sys_permission`
+  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` IN ('MES基础资料', 'MES资料')
+);
+SET @mes_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 ('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`), `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
+('1860000000000000071', '1860000000000000070', '新增', 2, 'mes:mes_xsl_equipment_category:add', '1', '1', 0, 'admin', NOW()),
+('1860000000000000072', '1860000000000000070', '编辑', 2, 'mes:mes_xsl_equipment_category:edit', '1', '1', 0, 'admin', NOW()),
+('1860000000000000073', '1860000000000000070', '删除', 2, 'mes:mes_xsl_equipment_category:delete', '1', '1', 0, 'admin', NOW()),
+('1860000000000000074', '1860000000000000070', '批量删除', 2, 'mes:mes_xsl_equipment_category:deleteBatch', '1', '1', 0, 'admin', NOW()),
+('1860000000000000075', '1860000000000000070', '导出', 2, 'mes:mes_xsl_equipment_category:exportXls', '1', '1', 0, 'admin', NOW()),
+('1860000000000000076', '1860000000000000070', '导入', 2, 'mes:mes_xsl_equipment_category: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 (
+    '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-equipment-category.sql

@@ -0,0 +1,21 @@
+-- 仅建表：MES 设备类别 mes_xsl_equipment_category
+-- 完整初始化（字典、菜单、租户授权）请执行 mes-xsl-equipment-category-menu-permission.sql
+SET NAMES utf8mb4;
+
+CREATE TABLE IF NOT EXISTS `mes_xsl_equipment_category` (
+  `id` varchar(32) NOT NULL COMMENT '主键',
+  `category_name` varchar(128) NOT NULL COMMENT '设备类别名称',
+  `process_operation_id` varchar(32) NOT NULL COMMENT '所属工序主键 mes_process_operation.id',
+  `process_operation_name` varchar(128) DEFAULT NULL COMMENT '工序名称冗余展示',
+  `inspect_distinct` varchar(32) NOT NULL COMMENT '点检区分 字典xslmes_equipment_inspect_distinct：generic通用 distinct区分',
+  `maintain_distinct` varchar(32) NOT NULL COMMENT '保养区分 字典xslmes_equipment_maintain_distinct：maintain保养 distinct区分',
+  `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_mec_tenant_name` (`tenant_id`, `category_name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES设备类别';

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

@@ -0,0 +1,66 @@
+-- MES 设备部位：建表 + 菜单 + 按钮权限 + 租户 admin 授权（可整文件一次执行）
+-- 权限前缀与 Controller、前端 v-auth 一致：mes:mes_xsl_equipment_part:*
+-- 依赖：mes_xsl_equipment_category；修改租户改 SET @mes_tenant_id
+SET NAMES utf8mb4;
+
+CREATE TABLE IF NOT EXISTS `mes_xsl_equipment_part` (
+  `id` varchar(32) NOT NULL COMMENT '主键',
+  `equipment_category_id` varchar(32) NOT NULL COMMENT '所属设备类别主键 mes_xsl_equipment_category.id',
+  `equipment_category_name` varchar(128) DEFAULT NULL COMMENT '设备类别名称冗余展示',
+  `part_name` varchar(128) NOT NULL COMMENT '部位名称',
+  `part_code` varchar(64) NOT NULL COMMENT '部位代码（同租户未删除数据中唯一）',
+  `part_description` varchar(500) DEFAULT NULL COMMENT '部位描述',
+  `enable_status` varchar(1) NOT NULL DEFAULT '0' COMMENT '是否启用（字典xslmes_unit_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_mep_tenant_partcode` (`tenant_id`, `part_code`)
+) 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 ('1860000000000000084', @mes_base_pid, '设备部位', '/xslmes/mesXslEquipmentPart', 'xslmes/mesXslEquipmentPart/MesXslEquipmentPartList', NULL, 1, NULL, '1', 12, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW())
+ON DUPLICATE KEY UPDATE
+`parent_id` = VALUES(`parent_id`), `name` = VALUES(`name`), `url` = VALUES(`url`), `component` = VALUES(`component`), `component_name` = VALUES(`component_name`),
+`menu_type` = VALUES(`menu_type`), `perms` = VALUES(`perms`), `perms_type` = VALUES(`perms_type`), `sort_no` = VALUES(`sort_no`),
+`is_route` = VALUES(`is_route`), `is_leaf` = VALUES(`is_leaf`), `hidden` = VALUES(`hidden`), `status` = VALUES(`status`), `del_flag` = VALUES(`del_flag`),
+`keep_alive` = VALUES(`keep_alive`), `internal_or_external` = VALUES(`internal_or_external`);
+
+INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `status`, `del_flag`, `create_by`, `create_time`) VALUES
+('1860000000000000085', '1860000000000000084', '新增', 2, 'mes:mes_xsl_equipment_part:add', '1', '1', 0, 'admin', NOW()),
+('1860000000000000086', '1860000000000000084', '编辑', 2, 'mes:mes_xsl_equipment_part:edit', '1', '1', 0, 'admin', NOW()),
+('1860000000000000087', '1860000000000000084', '删除', 2, 'mes:mes_xsl_equipment_part:delete', '1', '1', 0, 'admin', NOW()),
+('1860000000000000088', '1860000000000000084', '批量删除', 2, 'mes:mes_xsl_equipment_part:deleteBatch', '1', '1', 0, 'admin', NOW()),
+('1860000000000000089', '1860000000000000084', '导出', 2, 'mes:mes_xsl_equipment_part:exportXls', '1', '1', 0, 'admin', NOW()),
+('1860000000000000090', '1860000000000000084', '导入', 2, 'mes:mes_xsl_equipment_part: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 (
+    '1860000000000000084',
+    '1860000000000000085', '1860000000000000086', '1860000000000000087', '1860000000000000088',
+    '1860000000000000089', '1860000000000000090'
+  )
+  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-part.sql

@@ -0,0 +1,22 @@
+-- 仅建表：MES 设备部位 mes_xsl_equipment_part
+-- 完整初始化（菜单、租户授权）请执行 mes-xsl-equipment-part-menu-permission.sql
+SET NAMES utf8mb4;
+
+CREATE TABLE IF NOT EXISTS `mes_xsl_equipment_part` (
+  `id` varchar(32) NOT NULL COMMENT '主键',
+  `equipment_category_id` varchar(32) NOT NULL COMMENT '所属设备类别主键 mes_xsl_equipment_category.id',
+  `equipment_category_name` varchar(128) DEFAULT NULL COMMENT '设备类别名称冗余展示',
+  `part_name` varchar(128) NOT NULL COMMENT '部位名称',
+  `part_code` varchar(64) NOT NULL COMMENT '部位代码（同租户未删除数据中唯一）',
+  `part_description` varchar(500) DEFAULT NULL COMMENT '部位描述',
+  `enable_status` varchar(1) NOT NULL DEFAULT '0' COMMENT '是否启用（字典xslmes_unit_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_mep_tenant_partcode` (`tenant_id`, `part_code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES设备部位';

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

@@ -0,0 +1,69 @@
+-- MES 设备小部位：建表 + 菜单 + 按钮权限 + 租户 admin 授权（可整文件一次执行）
+-- 权限前缀与 Controller、前端 v-auth 一致：mes:mes_xsl_equipment_sub_part:*
+-- 依赖：mes_xsl_equipment_category、mes_xsl_equipment_part；二级菜单父级为「MES XSL / XSLMES管理」（sys_permission.id 1900000000000000300 或按名称解析）
+-- 修改租户改 SET @mes_tenant_id；已跑过 Flyway 的旧库可另执行 V3.9.2_60 仅改 parent_id
+SET NAMES utf8mb4;
+
+CREATE TABLE IF NOT EXISTS `mes_xsl_equipment_sub_part` (
+  `id` varchar(32) NOT NULL COMMENT '主键',
+  `equipment_category_id` varchar(32) NOT NULL COMMENT '所属设备类别主键 mes_xsl_equipment_category.id',
+  `equipment_category_name` varchar(128) DEFAULT NULL COMMENT '设备类别名称冗余展示',
+  `equipment_part_id` varchar(32) NOT NULL COMMENT '所属设备大部位主键 mes_xsl_equipment_part.id',
+  `equipment_part_name` varchar(128) DEFAULT NULL COMMENT '设备大部位名称冗余（mes_xsl_equipment_part.part_name）',
+  `sub_part_name` varchar(128) NOT NULL COMMENT '小部位名称',
+  `sub_part_code` varchar(64) NOT NULL COMMENT '小部位代码（同租户未删除数据中唯一）',
+  `sub_part_description` varchar(500) DEFAULT NULL COMMENT '部位描述',
+  `enable_status` varchar(1) NOT NULL DEFAULT '0' COMMENT '是否启用（字典xslmes_unit_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_mesp_tenant_subcode` (`tenant_id`, `sub_part_code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES设备小部位';
+
+SET @mes_tenant_id = 1002;
+
+SET @xslmes_root_pid = (
+  SELECT MIN(`id`) FROM `sys_permission`
+  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` IN ('MES XSL', 'XSLMES管理', 'XSLMES')
+);
+SET @xslmes_root_pid = IFNULL(@xslmes_root_pid, '1900000000000000300');
+
+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())
+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
+('1860000000000000092', '1860000000000000091', '新增', 2, 'mes:mes_xsl_equipment_sub_part:add', '1', '1', 0, 'admin', NOW()),
+('1860000000000000093', '1860000000000000091', '编辑', 2, 'mes:mes_xsl_equipment_sub_part:edit', '1', '1', 0, 'admin', NOW()),
+('1860000000000000094', '1860000000000000091', '删除', 2, 'mes:mes_xsl_equipment_sub_part:delete', '1', '1', 0, 'admin', NOW()),
+('1860000000000000095', '1860000000000000091', '批量删除', 2, 'mes:mes_xsl_equipment_sub_part:deleteBatch', '1', '1', 0, 'admin', NOW()),
+('1860000000000000096', '1860000000000000091', '导出', 2, 'mes:mes_xsl_equipment_sub_part:exportXls', '1', '1', 0, 'admin', NOW()),
+('1860000000000000097', '1860000000000000091', '导入', 2, 'mes:mes_xsl_equipment_sub_part: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 (
+    '1860000000000000091',
+    '1860000000000000092', '1860000000000000093', '1860000000000000094', '1860000000000000095',
+    '1860000000000000096', '1860000000000000097'
+  )
+  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-sub-part.sql

@@ -0,0 +1,24 @@
+-- 仅建表：MES 设备小部位 mes_xsl_equipment_sub_part
+-- 完整初始化（建表 + 菜单 + 租户授权）请执行 mes-xsl-equipment-sub-part-menu-permission.sql
+SET NAMES utf8mb4;
+
+CREATE TABLE IF NOT EXISTS `mes_xsl_equipment_sub_part` (
+  `id` varchar(32) NOT NULL COMMENT '主键',
+  `equipment_category_id` varchar(32) NOT NULL COMMENT '所属设备类别主键 mes_xsl_equipment_category.id',
+  `equipment_category_name` varchar(128) DEFAULT NULL COMMENT '设备类别名称冗余展示',
+  `equipment_part_id` varchar(32) NOT NULL COMMENT '所属设备大部位主键 mes_xsl_equipment_part.id',
+  `equipment_part_name` varchar(128) DEFAULT NULL COMMENT '设备大部位名称冗余（mes_xsl_equipment_part.part_name）',
+  `sub_part_name` varchar(128) NOT NULL COMMENT '小部位名称',
+  `sub_part_code` varchar(64) NOT NULL COMMENT '小部位代码（同租户未删除数据中唯一）',
+  `sub_part_description` varchar(500) DEFAULT NULL COMMENT '部位描述',
+  `enable_status` varchar(1) NOT NULL DEFAULT '0' COMMENT '是否启用（字典xslmes_unit_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_mesp_tenant_subcode` (`tenant_id`, `sub_part_code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES设备小部位';

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

@@ -0,0 +1,65 @@
+-- MES 设备类型：建表 + 菜单 + 按钮权限 + 租户 admin 授权（可整文件一次执行）
+-- 权限前缀与 Controller、前端 v-auth 一致：mes:mes_xsl_equipment_type:*
+-- 依赖：mes_process_operation、mes_xsl_equipment_category；修改租户改 SET @mes_tenant_id
+SET NAMES utf8mb4;
+
+CREATE TABLE IF NOT EXISTS `mes_xsl_equipment_type` (
+  `id` varchar(32) NOT NULL COMMENT '主键',
+  `type_name` varchar(128) NOT NULL COMMENT '设备类型名称',
+  `process_operation_id` varchar(32) NOT NULL COMMENT '所属工序主键 mes_process_operation.id',
+  `process_operation_name` varchar(128) DEFAULT NULL COMMENT '工序名称冗余展示',
+  `equipment_category_id` varchar(32) NOT NULL COMMENT '所属设备类别主键 mes_xsl_equipment_category.id',
+  `equipment_category_name` varchar(128) DEFAULT NULL COMMENT '设备类别名称冗余展示',
+  `tenant_id` int DEFAULT NULL COMMENT '租户',
+  `sys_org_code` varchar(64) DEFAULT NULL COMMENT '部门',
+  `create_by` varchar(32) DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(32) DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `del_flag` int DEFAULT '0' COMMENT '删除标记（0正常1删除）',
+  PRIMARY KEY (`id`),
+  KEY `idx_met_tenant_typename` (`tenant_id`, `type_name`)
+) 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 ('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`), `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
+('1860000000000000078', '1860000000000000077', '新增', 2, 'mes:mes_xsl_equipment_type:add', '1', '1', 0, 'admin', NOW()),
+('1860000000000000079', '1860000000000000077', '编辑', 2, 'mes:mes_xsl_equipment_type:edit', '1', '1', 0, 'admin', NOW()),
+('1860000000000000080', '1860000000000000077', '删除', 2, 'mes:mes_xsl_equipment_type:delete', '1', '1', 0, 'admin', NOW()),
+('1860000000000000081', '1860000000000000077', '批量删除', 2, 'mes:mes_xsl_equipment_type:deleteBatch', '1', '1', 0, 'admin', NOW()),
+('1860000000000000082', '1860000000000000077', '导出', 2, 'mes:mes_xsl_equipment_type:exportXls', '1', '1', 0, 'admin', NOW()),
+('1860000000000000083', '1860000000000000077', '导入', 2, 'mes:mes_xsl_equipment_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 (
+    '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.sql

@@ -0,0 +1,21 @@
+-- 仅建表：MES 设备类型 mes_xsl_equipment_type
+-- 完整初始化（菜单、租户授权）请执行 mes-xsl-equipment-type-menu-permission.sql
+SET NAMES utf8mb4;
+
+CREATE TABLE IF NOT EXISTS `mes_xsl_equipment_type` (
+  `id` varchar(32) NOT NULL COMMENT '主键',
+  `type_name` varchar(128) NOT NULL COMMENT '设备类型名称',
+  `process_operation_id` varchar(32) NOT NULL COMMENT '所属工序主键 mes_process_operation.id',
+  `process_operation_name` varchar(128) DEFAULT NULL COMMENT '工序名称冗余展示',
+  `equipment_category_id` varchar(32) NOT NULL COMMENT '所属设备类别主键 mes_xsl_equipment_category.id',
+  `equipment_category_name` varchar(128) DEFAULT NULL COMMENT '设备类别名称冗余展示',
+  `tenant_id` int DEFAULT NULL COMMENT '租户',
+  `sys_org_code` varchar(64) DEFAULT NULL COMMENT '部门',
+  `create_by` varchar(32) DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(32) DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `del_flag` int DEFAULT '0' COMMENT '删除标记（0正常1删除）',
+  PRIMARY KEY (`id`),
+  KEY `idx_met_tenant_typename` (`tenant_id`, `type_name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES设备类型';

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

@@ -0,0 +1,89 @@
+-- MES 厂家信息：字典 + 建表 + 菜单 + 按钮 + 租户 admin 授权（可整文件一次执行）
+-- 权限前缀与 Controller、前端 v-auth 一致：mes:mes_xsl_manufacturer:*
+-- 父菜单：MES基础资料 / MES资料（与备品件等脚本相同 @mes_base_pid）；修改租户改 SET @mes_tenant_id
+-- 新环境也可依赖 Flyway：V3.9.2_63__mes_xsl_manufacturer.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_manufacturer_category', '模具厂家、胶囊厂家、设备厂家', 0, 'admin', NOW(), 0, 0
+WHERE NOT EXISTS (SELECT 1 FROM `sys_dict` WHERE `dict_code` = 'xslmes_manufacturer_category' AND `del_flag` = 0);
+
+INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `sort_order`, `status`, `create_by`, `create_time`)
+SELECT REPLACE(UUID(), '-', ''), d.id, '模具厂家', 'mold', 1, 1, 'admin', NOW() FROM `sys_dict` d
+WHERE d.`dict_code` = 'xslmes_manufacturer_category' AND NOT EXISTS (SELECT 1 FROM `sys_dict_item` i WHERE i.`dict_id` = d.id AND i.`item_value` = 'mold');
+INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `sort_order`, `status`, `create_by`, `create_time`)
+SELECT REPLACE(UUID(), '-', ''), d.id, '胶囊厂家', 'capsule', 2, 1, 'admin', NOW() FROM `sys_dict` d
+WHERE d.`dict_code` = 'xslmes_manufacturer_category' AND NOT EXISTS (SELECT 1 FROM `sys_dict_item` i WHERE i.`dict_id` = d.id AND i.`item_value` = 'capsule');
+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', 3, 1, 'admin', NOW() FROM `sys_dict` d
+WHERE d.`dict_code` = 'xslmes_manufacturer_category' 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` (`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `type`, `tenant_id`)
+SELECT REPLACE(UUID(), '-', ''), 'MES厂家是否有效', 'xslmes_manufacturer_valid', '0有效1无效', 0, 'admin', NOW(), 0, 0
+WHERE NOT EXISTS (SELECT 1 FROM `sys_dict` WHERE `dict_code` = 'xslmes_manufacturer_valid' 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_manufacturer_valid' 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_manufacturer_valid' 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_manufacturer` (
+  `id` varchar(32) NOT NULL COMMENT '主键',
+  `manufacturer_category` varchar(32) NOT NULL COMMENT '厂家类别（字典xslmes_manufacturer_category：mold模具 capsule胶囊 equipment设备）',
+  `manufacturer_name` varchar(128) 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 '部门',
+  `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_mxm_tenant_name` (`tenant_id`, `manufacturer_name`)
+) 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 ('1860000000000000112', @mes_base_pid, '厂家信息', '/xslmes/mesXslManufacturer', 'xslmes/mesXslManufacturer/MesXslManufacturerList', NULL, 1, NULL, '1', 17, 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
+('1860000000000000113', '1860000000000000112', '新增', 2, 'mes:mes_xsl_manufacturer:add', '1', '1', 0, 'admin', NOW()),
+('1860000000000000114', '1860000000000000112', '编辑', 2, 'mes:mes_xsl_manufacturer:edit', '1', '1', 0, 'admin', NOW()),
+('1860000000000000115', '1860000000000000112', '删除', 2, 'mes:mes_xsl_manufacturer:delete', '1', '1', 0, 'admin', NOW()),
+('1860000000000000116', '1860000000000000112', '批量删除', 2, 'mes:mes_xsl_manufacturer:deleteBatch', '1', '1', 0, 'admin', NOW()),
+('1860000000000000117', '1860000000000000112', '导出', 2, 'mes:mes_xsl_manufacturer:exportXls', '1', '1', 0, 'admin', NOW()),
+('1860000000000000118', '1860000000000000112', '导入', 2, 'mes:mes_xsl_manufacturer: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 (
+    '1860000000000000112',
+    '1860000000000000113', '1860000000000000114', '1860000000000000115', '1860000000000000116',
+    '1860000000000000117', '1860000000000000118'
+  )
+  AND NOT EXISTS (
+    SELECT 1 FROM `sys_role_permission` rp
+    WHERE rp.`role_id` = r.`id` AND rp.`permission_id` = p.`id`
+  );

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

@@ -0,0 +1,18 @@
+-- 仅建表 mes_xsl_manufacturer。完整初始化（厂家类别/是否有效字典、菜单、租户授权）请执行 mes-xsl-manufacturer-menu-permission.sql
+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_name` varchar(128) 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 '部门',
+  `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_mxm_tenant_name` (`tenant_id`, `manufacturer_name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES厂家信息';

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

@@ -0,0 +1,68 @@
+-- MES 备品件信息：建表 + 菜单 + 按钮权限 + 租户 admin 授权（可整文件一次执行）
+-- 权限前缀与 Controller、前端 v-auth 一致：mes:mes_xsl_spare_part:*
+-- 依赖：mes_xsl_spare_parts_category、mes_xsl_unit；父菜单 MES基础资料 / MES资料；修改租户改 SET @mes_tenant_id
+SET NAMES utf8mb4;
+
+CREATE TABLE IF NOT EXISTS `mes_xsl_spare_part` (
+  `id` varchar(32) NOT NULL COMMENT '主键',
+  `spare_part_name` varchar(128) NOT NULL COMMENT '备品件名称（同租户未删除数据中唯一）',
+  `spare_parts_category_id` varchar(32) NOT NULL COMMENT '所属备品件类别 mes_xsl_spare_parts_category.id',
+  `spare_parts_category_name` varchar(128) DEFAULT NULL COMMENT '备品件类别名称冗余',
+  `spec_model` varchar(200) DEFAULT NULL COMMENT '规格型号',
+  `max_stock` decimal(18,4) NOT NULL DEFAULT '0.0000' COMMENT '最大库存',
+  `min_stock` decimal(18,4) NOT NULL DEFAULT '0.0000' COMMENT '最小库存',
+  `unit_id` varchar(36) NOT NULL COMMENT '单位 mes_xsl_unit.id',
+  `unit_name` varchar(100) DEFAULT NULL COMMENT '单位名称冗余',
+  `tenant_id` int DEFAULT NULL COMMENT '租户',
+  `sys_org_code` varchar(64) DEFAULT NULL COMMENT '部门',
+  `create_by` varchar(32) DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(32) DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `del_flag` int DEFAULT '0' COMMENT '删除标记（0正常1删除）',
+  PRIMARY KEY (`id`),
+  KEY `idx_msp_tenant_name` (`tenant_id`, `spare_part_name`)
+) 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 ('1860000000000000105', @mes_base_pid, '备品件信息', '/xslmes/mesXslSparePart', 'xslmes/mesXslSparePart/MesXslSparePartList', NULL, 1, NULL, '1', 16, 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
+('1860000000000000106', '1860000000000000105', '新增', 2, 'mes:mes_xsl_spare_part:add', '1', '1', 0, 'admin', NOW()),
+('1860000000000000107', '1860000000000000105', '编辑', 2, 'mes:mes_xsl_spare_part:edit', '1', '1', 0, 'admin', NOW()),
+('1860000000000000108', '1860000000000000105', '删除', 2, 'mes:mes_xsl_spare_part:delete', '1', '1', 0, 'admin', NOW()),
+('1860000000000000109', '1860000000000000105', '批量删除', 2, 'mes:mes_xsl_spare_part:deleteBatch', '1', '1', 0, 'admin', NOW()),
+('1860000000000000110', '1860000000000000105', '导出', 2, 'mes:mes_xsl_spare_part:exportXls', '1', '1', 0, 'admin', NOW()),
+('1860000000000000111', '1860000000000000105', '导入', 2, 'mes:mes_xsl_spare_part: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 (
+    '1860000000000000105',
+    '1860000000000000106', '1860000000000000107', '1860000000000000108', '1860000000000000109',
+    '1860000000000000110', '1860000000000000111'
+  )
+  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-spare-part.sql

@@ -0,0 +1,24 @@
+-- 仅建表：MES 备品件信息 mes_xsl_spare_part
+-- 完整初始化请执行 mes-xsl-spare-part-menu-permission.sql
+SET NAMES utf8mb4;
+
+CREATE TABLE IF NOT EXISTS `mes_xsl_spare_part` (
+  `id` varchar(32) NOT NULL COMMENT '主键',
+  `spare_part_name` varchar(128) NOT NULL COMMENT '备品件名称（同租户未删除数据中唯一）',
+  `spare_parts_category_id` varchar(32) NOT NULL COMMENT '所属备品件类别 mes_xsl_spare_parts_category.id',
+  `spare_parts_category_name` varchar(128) DEFAULT NULL COMMENT '备品件类别名称冗余',
+  `spec_model` varchar(200) DEFAULT NULL COMMENT '规格型号',
+  `max_stock` decimal(18,4) NOT NULL DEFAULT '0.0000' COMMENT '最大库存',
+  `min_stock` decimal(18,4) NOT NULL DEFAULT '0.0000' COMMENT '最小库存',
+  `unit_id` varchar(36) NOT NULL COMMENT '单位 mes_xsl_unit.id',
+  `unit_name` varchar(100) DEFAULT NULL COMMENT '单位名称冗余',
+  `tenant_id` int DEFAULT NULL COMMENT '租户',
+  `sys_org_code` varchar(64) DEFAULT NULL COMMENT '部门',
+  `create_by` varchar(32) DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(32) DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `del_flag` int DEFAULT '0' COMMENT '删除标记（0正常1删除）',
+  PRIMARY KEY (`id`),
+  KEY `idx_msp_tenant_name` (`tenant_id`, `spare_part_name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES备品件信息';

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

@@ -0,0 +1,62 @@
+-- MES 备品件类别：建表 + 菜单 + 按钮权限 + 租户 admin 授权（可整文件一次执行）
+-- 权限前缀与 Controller、前端 v-auth 一致：mes:mes_xsl_spare_parts_category:*
+-- 父菜单：MES基础资料 / MES资料；修改租户改 SET @mes_tenant_id
+SET NAMES utf8mb4;
+
+CREATE TABLE IF NOT EXISTS `mes_xsl_spare_parts_category` (
+  `id` varchar(32) NOT NULL COMMENT '主键',
+  `category_name` varchar(128) NOT NULL COMMENT '类别名称（同租户未删除数据中唯一）',
+  `category_description` varchar(500) DEFAULT NULL COMMENT '描述',
+  `tenant_id` int DEFAULT NULL COMMENT '租户',
+  `sys_org_code` varchar(64) DEFAULT NULL COMMENT '部门',
+  `create_by` varchar(32) DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(32) DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `del_flag` int DEFAULT '0' COMMENT '删除标记（0正常1删除）',
+  PRIMARY KEY (`id`),
+  KEY `idx_mspc_tenant_catname` (`tenant_id`, `category_name`)
+) 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 ('1860000000000000098', @mes_base_pid, '备品件类别', '/xslmes/mesXslSparePartsCategory', 'xslmes/mesXslSparePartsCategory/MesXslSparePartsCategoryList', NULL, 1, NULL, '1', 15, 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
+('1860000000000000099', '1860000000000000098', '新增', 2, 'mes:mes_xsl_spare_parts_category:add', '1', '1', 0, 'admin', NOW()),
+('1860000000000000100', '1860000000000000098', '编辑', 2, 'mes:mes_xsl_spare_parts_category:edit', '1', '1', 0, 'admin', NOW()),
+('1860000000000000101', '1860000000000000098', '删除', 2, 'mes:mes_xsl_spare_parts_category:delete', '1', '1', 0, 'admin', NOW()),
+('1860000000000000102', '1860000000000000098', '批量删除', 2, 'mes:mes_xsl_spare_parts_category:deleteBatch', '1', '1', 0, 'admin', NOW()),
+('1860000000000000103', '1860000000000000098', '导出', 2, 'mes:mes_xsl_spare_parts_category:exportXls', '1', '1', 0, 'admin', NOW()),
+('1860000000000000104', '1860000000000000098', '导入', 2, 'mes:mes_xsl_spare_parts_category: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 (
+    '1860000000000000098',
+    '1860000000000000099', '1860000000000000100', '1860000000000000101', '1860000000000000102',
+    '1860000000000000103', '1860000000000000104'
+  )
+  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-spare-parts-category.sql

@@ -0,0 +1,18 @@
+-- 仅建表：MES 备品件类别 mes_xsl_spare_parts_category
+-- 完整初始化（建表 + 菜单 + 租户授权）请执行 mes-xsl-spare-parts-category-menu-permission.sql
+SET NAMES utf8mb4;
+
+CREATE TABLE IF NOT EXISTS `mes_xsl_spare_parts_category` (
+  `id` varchar(32) NOT NULL COMMENT '主键',
+  `category_name` varchar(128) NOT NULL COMMENT '类别名称（同租户未删除数据中唯一）',
+  `category_description` varchar(500) DEFAULT NULL COMMENT '描述',
+  `tenant_id` int DEFAULT NULL COMMENT '租户',
+  `sys_org_code` varchar(64) DEFAULT NULL COMMENT '部门',
+  `create_by` varchar(32) DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(32) DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `del_flag` int DEFAULT '0' COMMENT '删除标记（0正常1删除）',
+  PRIMARY KEY (`id`),
+  KEY `idx_mspc_tenant_catname` (`tenant_id`, `category_name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES备品件类别';

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

@@ -0,0 +1,300 @@
+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 lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.xslmes.entity.MesXslEquipmentCategory;
+import org.jeecg.modules.xslmes.entity.MesXslProcessOperation;
+import org.jeecg.modules.xslmes.service.IMesXslEquipmentCategoryService;
+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/mesXslEquipmentCategory")
+@Slf4j
+public class MesXslEquipmentCategoryController extends JeecgController<MesXslEquipmentCategory, IMesXslEquipmentCategoryService> {
+
+    private static final Set<String> INSPECT_DISTINCT = Set.of("generic", "distinct");
+    private static final Set<String> MAINTAIN_DISTINCT = Set.of("maintain", "distinct");
+
+    @Autowired
+    private IMesXslEquipmentCategoryService mesXslEquipmentCategoryService;
+
+    @Autowired
+    private IMesXslProcessOperationService mesXslProcessOperationService;
+
+    @Operation(summary = "MES设备类别-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<MesXslEquipmentCategory>> queryPageList(
+            MesXslEquipmentCategory model,
+            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+            HttpServletRequest req) {
+        QueryWrapper<MesXslEquipmentCategory> queryWrapper = QueryGenerator.initQueryWrapper(model, req.getParameterMap());
+        Page<MesXslEquipmentCategory> page = new Page<>(pageNo, pageSize);
+        IPage<MesXslEquipmentCategory> pageList = mesXslEquipmentCategoryService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    @AutoLog(value = "MES设备类别-添加")
+    @Operation(summary = "MES设备类别-添加")
+    @RequiresPermissions("mes:mes_xsl_equipment_category:add")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody MesXslEquipmentCategory model) {
+        //update-begin---author:jiangxh ---date:20260514  for：【MES】设备类别：名称唯一、工序与字典校验、冗余工序名称-----------
+        String err = validateForSave(model, null);
+        if (err != null) {
+            return Result.error(err);
+        }
+        //update-end---author:jiangxh ---date:20260514  for：【MES】设备类别：名称唯一、工序与字典校验、冗余工序名称-----------
+        mesXslEquipmentCategoryService.save(model);
+        return Result.OK("添加成功！");
+    }
+
+    @AutoLog(value = "MES设备类别-编辑")
+    @Operation(summary = "MES设备类别-编辑")
+    @RequiresPermissions("mes:mes_xsl_equipment_category:edit")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody MesXslEquipmentCategory model) {
+        //update-begin---author:jiangxh ---date:20260514  for：【MES】设备类别：名称唯一、工序与字典校验、冗余工序名称-----------
+        String err = validateForSave(model, model.getId());
+        if (err != null) {
+            return Result.error(err);
+        }
+        //update-end---author:jiangxh ---date:20260514  for：【MES】设备类别：名称唯一、工序与字典校验、冗余工序名称-----------
+        mesXslEquipmentCategoryService.updateById(model);
+        return Result.OK("编辑成功!");
+    }
+
+    @AutoLog(value = "MES设备类别-删除")
+    @Operation(summary = "MES设备类别-通过id删除")
+    @RequiresPermissions("mes:mes_xsl_equipment_category:delete")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        mesXslEquipmentCategoryService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    @AutoLog(value = "MES设备类别-批量删除")
+    @Operation(summary = "MES设备类别-批量删除")
+    @RequiresPermissions("mes:mes_xsl_equipment_category:deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        mesXslEquipmentCategoryService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
+
+    @Operation(summary = "MES设备类别-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<MesXslEquipmentCategory> queryById(@RequestParam(name = "id", required = true) String id) {
+        MesXslEquipmentCategory entity = mesXslEquipmentCategoryService.getById(id);
+        if (entity == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(entity);
+    }
+
+    @Operation(summary = "校验设备类别名称是否重复（仅未删除数据；同租户，dataId 为编辑时当前主键）")
+    @GetMapping(value = "/checkCategoryName")
+    public Result<String> checkCategoryName(
+            @RequestParam(name = "categoryName", required = true) String categoryName,
+            @RequestParam(name = "dataId", required = false) String dataId) {
+        if (oConvertUtils.isEmpty(categoryName) || categoryName.trim().isEmpty()) {
+            return Result.OK("该值可用！");
+        }
+        MesXslEquipmentCategory ctx = new MesXslEquipmentCategory();
+        if (mesXslEquipmentCategoryService.isCategoryNameDuplicated(categoryName.trim(), dataId, ctx)) {
+            return Result.error("该类别名称已存在");
+        }
+        return Result.OK("该值可用！");
+    }
+
+    @RequiresPermissions("mes:mes_xsl_equipment_category:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, MesXslEquipmentCategory model) {
+        return super.exportXls(request, model, MesXslEquipmentCategory.class, "MES设备类别");
+    }
+
+    @RequiresPermissions("mes:mes_xsl_equipment_category:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        //update-begin---author:jiangxh ---date:20260514  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<MesXslEquipmentCategory> list = ExcelImportUtil.importExcel(file.getInputStream(), MesXslEquipmentCategory.class, params);
+                if (list == null) {
+                    list = List.of();
+                }
+                Set<String> namesInFile = new HashSet<>();
+                for (int i = 0; i < list.size(); i++) {
+                    MesXslEquipmentCategory row = list.get(i);
+                    int rowNo = i + 1;
+                    if (row == null) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条数据无效（空行）");
+                    }
+                    String name = row.getCategoryName();
+                    if (name != null) {
+                        name = name.trim();
+                    }
+                    if (oConvertUtils.isEmpty(name)) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条类别名称不能为空");
+                    }
+                    row.setCategoryName(name);
+                    if (!namesInFile.add(name)) {
+                        return Result.error("文件导入失败：类别名称【" + name + "】在导入文件中重复");
+                    }
+                    if (mesXslEquipmentCategoryService.isCategoryNameDuplicated(name, null, row)) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条类别名称【" + name + "】已存在（未删除数据中不允许重复）");
+                    }
+                    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());
+                    row.setImportOperationCode(null);
+
+                    String ins = row.getInspectDistinct();
+                    if (ins != null) {
+                        ins = ins.trim();
+                    }
+                    if (oConvertUtils.isEmpty(ins) || !INSPECT_DISTINCT.contains(ins)) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条点检区分须为字典项值 generic 或 distinct");
+                    }
+                    row.setInspectDistinct(ins);
+
+                    String mtn = row.getMaintainDistinct();
+                    if (mtn != null) {
+                        mtn = mtn.trim();
+                    }
+                    if (oConvertUtils.isEmpty(mtn) || !MAINTAIN_DISTINCT.contains(mtn)) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条保养区分须为字典项值 maintain 或 distinct");
+                    }
+                    row.setMaintainDistinct(mtn);
+                }
+                long start = System.currentTimeMillis();
+                mesXslEquipmentCategoryService.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:20260514  for：【MES】设备类别导入：名称唯一、工序编码解析、字典取值校验-----------
+        return Result.error("文件导入失败！");
+    }
+
+    //update-begin---author:jiangxh ---date:20260514  for：【MES】设备类别保存前校验与工序名称回填-----------
+    private String validateForSave(MesXslEquipmentCategory model, String excludeId) {
+        if (oConvertUtils.isEmpty(model.getCategoryName()) || model.getCategoryName().trim().isEmpty()) {
+            return "类别名称不能为空";
+        }
+        String cn = model.getCategoryName().trim();
+        model.setCategoryName(cn);
+        if (mesXslEquipmentCategoryService.isCategoryNameDuplicated(cn, excludeId, model)) {
+            return "类别名称已存在";
+        }
+        if (oConvertUtils.isEmpty(model.getProcessOperationId())) {
+            return "请选择所属工序";
+        }
+        MesXslProcessOperation op = mesXslProcessOperationService.getById(model.getProcessOperationId());
+        if (op == null) {
+            return "所属工序不存在";
+        }
+        model.setProcessOperationName(op.getOperationName());
+
+        String ins = model.getInspectDistinct();
+        if (ins != null) {
+            ins = ins.trim();
+        }
+        if (oConvertUtils.isEmpty(ins) || !INSPECT_DISTINCT.contains(ins)) {
+            return "点检区分不合法（须为字典项值 generic 或 distinct）";
+        }
+        model.setInspectDistinct(ins);
+
+        String mtn = model.getMaintainDistinct();
+        if (mtn != null) {
+            mtn = mtn.trim();
+        }
+        if (oConvertUtils.isEmpty(mtn) || !MAINTAIN_DISTINCT.contains(mtn)) {
+            return "保养区分不合法（须为字典项值 maintain 或 distinct）";
+        }
+        model.setMaintainDistinct(mtn);
+        model.setImportOperationCode(null);
+        return null;
+    }
+
+    private MesXslProcessOperation findProcessByOperationCode(String operationCode, MesXslEquipmentCategory 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:20260514  for：【MES】设备类别保存前校验与工序名称回填-----------
+}

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

@@ -0,0 +1,284 @@
+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.MesXslEquipmentCategory;
+import org.jeecg.modules.xslmes.entity.MesXslEquipmentPart;
+import org.jeecg.modules.xslmes.service.IMesXslEquipmentCategoryService;
+import org.jeecg.modules.xslmes.service.IMesXslEquipmentPartService;
+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/mesXslEquipmentPart")
+@Slf4j
+public class MesXslEquipmentPartController extends JeecgController<MesXslEquipmentPart, IMesXslEquipmentPartService> {
+
+    private static final Set<String> ENABLE_STATUS = Set.of("0", "1");
+
+    @Autowired
+    private IMesXslEquipmentPartService mesXslEquipmentPartService;
+
+    @Autowired
+    private IMesXslEquipmentCategoryService mesXslEquipmentCategoryService;
+
+    @Operation(summary = "MES设备部位-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<MesXslEquipmentPart>> queryPageList(
+            MesXslEquipmentPart model,
+            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+            HttpServletRequest req) {
+        QueryWrapper<MesXslEquipmentPart> queryWrapper = QueryGenerator.initQueryWrapper(model, req.getParameterMap());
+        Page<MesXslEquipmentPart> page = new Page<>(pageNo, pageSize);
+        IPage<MesXslEquipmentPart> pageList = mesXslEquipmentPartService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    @AutoLog(value = "MES设备部位-添加")
+    @Operation(summary = "MES设备部位-添加")
+    @RequiresPermissions("mes:mes_xsl_equipment_part:add")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody MesXslEquipmentPart model) {
+        //update-begin---author:jiangxh ---date:20260515  for：【MES】设备部位：部位代码唯一、设备类别与启用状态校验、冗余类别名称-----------
+        String err = validateForSave(model, null);
+        if (err != null) {
+            return Result.error(err);
+        }
+        //update-end---author:jiangxh ---date:20260515  for：【MES】设备部位：部位代码唯一、设备类别与启用状态校验、冗余类别名称-----------
+        mesXslEquipmentPartService.save(model);
+        return Result.OK("添加成功！");
+    }
+
+    @AutoLog(value = "MES设备部位-编辑")
+    @Operation(summary = "MES设备部位-编辑")
+    @RequiresPermissions("mes:mes_xsl_equipment_part:edit")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody MesXslEquipmentPart model) {
+        //update-begin---author:jiangxh ---date:20260515  for：【MES】设备部位：部位代码唯一、设备类别与启用状态校验、冗余类别名称-----------
+        String err = validateForSave(model, model.getId());
+        if (err != null) {
+            return Result.error(err);
+        }
+        //update-end---author:jiangxh ---date:20260515  for：【MES】设备部位：部位代码唯一、设备类别与启用状态校验、冗余类别名称-----------
+        mesXslEquipmentPartService.updateById(model);
+        return Result.OK("编辑成功!");
+    }
+
+    @AutoLog(value = "MES设备部位-删除")
+    @Operation(summary = "MES设备部位-通过id删除")
+    @RequiresPermissions("mes:mes_xsl_equipment_part:delete")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        mesXslEquipmentPartService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    @AutoLog(value = "MES设备部位-批量删除")
+    @Operation(summary = "MES设备部位-批量删除")
+    @RequiresPermissions("mes:mes_xsl_equipment_part:deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        mesXslEquipmentPartService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
+
+    @Operation(summary = "MES设备部位-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<MesXslEquipmentPart> queryById(@RequestParam(name = "id", required = true) String id) {
+        MesXslEquipmentPart entity = mesXslEquipmentPartService.getById(id);
+        if (entity == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(entity);
+    }
+
+    @Operation(summary = "校验部位代码是否重复（同租户未删除数据；dataId 为编辑时当前主键）")
+    @GetMapping(value = "/checkPartCode")
+    public Result<String> checkPartCode(
+            @RequestParam(name = "partCode", required = true) String partCode,
+            @RequestParam(name = "dataId", required = false) String dataId) {
+        if (oConvertUtils.isEmpty(partCode) || partCode.trim().isEmpty()) {
+            return Result.OK("该值可用！");
+        }
+        MesXslEquipmentPart ctx = new MesXslEquipmentPart();
+        if (mesXslEquipmentPartService.isPartCodeDuplicated(partCode.trim(), dataId, ctx)) {
+            return Result.error("部位代码不能重复");
+        }
+        return Result.OK("该值可用！");
+    }
+
+    @RequiresPermissions("mes:mes_xsl_equipment_part:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, MesXslEquipmentPart model) {
+        return super.exportXls(request, model, MesXslEquipmentPart.class, "MES设备部位");
+    }
+
+    @RequiresPermissions("mes:mes_xsl_equipment_part:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        //update-begin---author:jiangxh ---date:20260515  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<MesXslEquipmentPart> list = ExcelImportUtil.importExcel(file.getInputStream(), MesXslEquipmentPart.class, params);
+                if (list == null) {
+                    list = List.of();
+                }
+                Set<String> codesInFile = new HashSet<>();
+                for (int i = 0; i < list.size(); i++) {
+                    MesXslEquipmentPart row = list.get(i);
+                    int rowNo = i + 1;
+                    if (row == null) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条数据无效（空行）");
+                    }
+                    String pc = row.getPartCode();
+                    if (pc != null) {
+                        pc = pc.trim();
+                    }
+                    if (oConvertUtils.isEmpty(pc)) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条部位代码不能为空");
+                    }
+                    row.setPartCode(pc);
+                    String catName = row.getImportCategoryName();
+                    if (catName != null) {
+                        catName = catName.trim();
+                    }
+                    if (oConvertUtils.isEmpty(catName)) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条设备类别名称不能为空");
+                    }
+                    MesXslEquipmentCategory cat =
+                            mesXslEquipmentCategoryService.findOneActiveByNameAndTenant(catName, row.getTenantId());
+                    if (cat == null) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条设备类别名称【" + catName + "】不存在或未删除数据中无匹配");
+                    }
+                    row.setEquipmentCategoryId(cat.getId());
+                    row.setEquipmentCategoryName(cat.getCategoryName());
+                    row.setImportCategoryName(null);
+                    if (!codesInFile.add(pc)) {
+                        return Result.error("文件导入失败：部位代码【" + pc + "】在导入文件中重复（部位代码不能重复）");
+                    }
+                    if (mesXslEquipmentPartService.isPartCodeDuplicated(pc, null, row)) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条部位代码【" + pc + "】不能重复（同租户未删除数据中已存在）");
+                    }
+
+                    if (row.getPartName() != null) {
+                        row.setPartName(row.getPartName().trim());
+                    }
+                    if (row.getPartDescription() != null) {
+                        row.setPartDescription(row.getPartDescription().trim());
+                    }
+
+                    String en = row.getEnableStatus();
+                    if (en != null) {
+                        en = en.trim();
+                    }
+                    if (oConvertUtils.isEmpty(en)) {
+                        en = "0";
+                    }
+                    if (!ENABLE_STATUS.contains(en)) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条是否启用须为字典项值 0 或 1（xslmes_unit_status）");
+                    }
+                    row.setEnableStatus(en);
+                }
+                long start = System.currentTimeMillis();
+                mesXslEquipmentPartService.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:20260515  for：【MES】设备部位导入：部位代码唯一、设备类别名称解析、启用状态校验-----------
+        return Result.error("文件导入失败！");
+    }
+
+    //update-begin---author:jiangxh ---date:20260515  for：【MES】设备部位保存前校验与类别名称回填-----------
+    private String validateForSave(MesXslEquipmentPart model, String excludeId) {
+        if (oConvertUtils.isEmpty(model.getEquipmentCategoryId())) {
+            return "请选择所属设备类别";
+        }
+        MesXslEquipmentCategory cat = mesXslEquipmentCategoryService.getById(model.getEquipmentCategoryId());
+        if (cat == null) {
+            return "所属设备类别不存在";
+        }
+        model.setEquipmentCategoryName(cat.getCategoryName());
+
+        if (oConvertUtils.isEmpty(model.getPartCode()) || model.getPartCode().trim().isEmpty()) {
+            return "部位代码不能为空";
+        }
+        String pc = model.getPartCode().trim();
+        model.setPartCode(pc);
+        if (mesXslEquipmentPartService.isPartCodeDuplicated(pc, excludeId, model)) {
+            return "部位代码不能重复";
+        }
+
+        if (oConvertUtils.isEmpty(model.getPartName()) || model.getPartName().trim().isEmpty()) {
+            return "部位名称不能为空";
+        }
+        model.setPartName(model.getPartName().trim());
+
+        String en = model.getEnableStatus();
+        if (en != null) {
+            en = en.trim();
+        }
+        if (oConvertUtils.isEmpty(en)) {
+            en = "0";
+        }
+        if (!ENABLE_STATUS.contains(en)) {
+            return "是否启用不合法（须为字典项值 0 或 1，xslmes_unit_status）";
+        }
+        model.setEnableStatus(en);
+
+        if (model.getPartDescription() != null) {
+            model.setPartDescription(model.getPartDescription().trim());
+        }
+        model.setImportCategoryName(null);
+        return null;
+    }
+    //update-end---author:jiangxh ---date:20260515  for：【MES】设备部位保存前校验与类别名称回填-----------
+}

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

@@ -0,0 +1,325 @@
+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.MesXslEquipmentCategory;
+import org.jeecg.modules.xslmes.entity.MesXslEquipmentPart;
+import org.jeecg.modules.xslmes.entity.MesXslEquipmentSubPart;
+import org.jeecg.modules.xslmes.service.IMesXslEquipmentCategoryService;
+import org.jeecg.modules.xslmes.service.IMesXslEquipmentPartService;
+import org.jeecg.modules.xslmes.service.IMesXslEquipmentSubPartService;
+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/mesXslEquipmentSubPart")
+@Slf4j
+public class MesXslEquipmentSubPartController extends JeecgController<MesXslEquipmentSubPart, IMesXslEquipmentSubPartService> {
+
+    private static final Set<String> ENABLE_STATUS = Set.of("0", "1");
+
+    @Autowired
+    private IMesXslEquipmentSubPartService mesXslEquipmentSubPartService;
+
+    @Autowired
+    private IMesXslEquipmentCategoryService mesXslEquipmentCategoryService;
+
+    @Autowired
+    private IMesXslEquipmentPartService mesXslEquipmentPartService;
+
+    @Operation(summary = "MES设备小部位-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<MesXslEquipmentSubPart>> queryPageList(
+            MesXslEquipmentSubPart model,
+            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+            HttpServletRequest req) {
+        QueryWrapper<MesXslEquipmentSubPart> queryWrapper = QueryGenerator.initQueryWrapper(model, req.getParameterMap());
+        Page<MesXslEquipmentSubPart> page = new Page<>(pageNo, pageSize);
+        IPage<MesXslEquipmentSubPart> pageList = mesXslEquipmentSubPartService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    @AutoLog(value = "MES设备小部位-添加")
+    @Operation(summary = "MES设备小部位-添加")
+    @RequiresPermissions("mes:mes_xsl_equipment_sub_part:add")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody MesXslEquipmentSubPart model) {
+        //update-begin---author:jiangxh ---date:20260515  for：【MES】设备小部位保存前校验：类别/大部位一致、小部位代码唯一、冗余名称-----------
+        String err = validateForSave(model, null);
+        if (err != null) {
+            return Result.error(err);
+        }
+        //update-end---author:jiangxh ---date:20260515  for：【MES】设备小部位保存前校验：类别/大部位一致、小部位代码唯一、冗余名称-----------
+        mesXslEquipmentSubPartService.save(model);
+        return Result.OK("添加成功！");
+    }
+
+    @AutoLog(value = "MES设备小部位-编辑")
+    @Operation(summary = "MES设备小部位-编辑")
+    @RequiresPermissions("mes:mes_xsl_equipment_sub_part:edit")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody MesXslEquipmentSubPart model) {
+        //update-begin---author:jiangxh ---date:20260515  for：【MES】设备小部位保存前校验：类别/大部位一致、小部位代码唯一、冗余名称-----------
+        String err = validateForSave(model, model.getId());
+        if (err != null) {
+            return Result.error(err);
+        }
+        //update-end---author:jiangxh ---date:20260515  for：【MES】设备小部位保存前校验：类别/大部位一致、小部位代码唯一、冗余名称-----------
+        mesXslEquipmentSubPartService.updateById(model);
+        return Result.OK("编辑成功!");
+    }
+
+    @AutoLog(value = "MES设备小部位-删除")
+    @Operation(summary = "MES设备小部位-通过id删除")
+    @RequiresPermissions("mes:mes_xsl_equipment_sub_part:delete")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        mesXslEquipmentSubPartService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    @AutoLog(value = "MES设备小部位-批量删除")
+    @Operation(summary = "MES设备小部位-批量删除")
+    @RequiresPermissions("mes:mes_xsl_equipment_sub_part:deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        mesXslEquipmentSubPartService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
+
+    @Operation(summary = "MES设备小部位-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<MesXslEquipmentSubPart> queryById(@RequestParam(name = "id", required = true) String id) {
+        MesXslEquipmentSubPart entity = mesXslEquipmentSubPartService.getById(id);
+        if (entity == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(entity);
+    }
+
+    @Operation(summary = "校验小部位代码是否重复（同租户未删除数据；dataId 为编辑时当前主键）")
+    @GetMapping(value = "/checkSubPartCode")
+    public Result<String> checkSubPartCode(
+            @RequestParam(name = "subPartCode", required = true) String subPartCode,
+            @RequestParam(name = "dataId", required = false) String dataId) {
+        if (oConvertUtils.isEmpty(subPartCode) || subPartCode.trim().isEmpty()) {
+            return Result.OK("该值可用！");
+        }
+        MesXslEquipmentSubPart ctx = new MesXslEquipmentSubPart();
+        if (mesXslEquipmentSubPartService.isSubPartCodeDuplicated(subPartCode.trim(), dataId, ctx)) {
+            return Result.error("小部位代码不能重复");
+        }
+        return Result.OK("该值可用！");
+    }
+
+    @RequiresPermissions("mes:mes_xsl_equipment_sub_part:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, MesXslEquipmentSubPart model) {
+        return super.exportXls(request, model, MesXslEquipmentSubPart.class, "MES设备小部位");
+    }
+
+    @RequiresPermissions("mes:mes_xsl_equipment_sub_part:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        //update-begin---author:jiangxh ---date:20260515  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<MesXslEquipmentSubPart> list = ExcelImportUtil.importExcel(file.getInputStream(), MesXslEquipmentSubPart.class, params);
+                if (list == null) {
+                    list = List.of();
+                }
+                Set<String> codesInFile = new HashSet<>();
+                for (int i = 0; i < list.size(); i++) {
+                    MesXslEquipmentSubPart row = list.get(i);
+                    int rowNo = i + 1;
+                    if (row == null) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条数据无效（空行）");
+                    }
+                    String sc = row.getSubPartCode();
+                    if (sc != null) {
+                        sc = sc.trim();
+                    }
+                    if (oConvertUtils.isEmpty(sc)) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条小部位代码不能为空");
+                    }
+                    row.setSubPartCode(sc);
+                    String catName = row.getImportCategoryName();
+                    if (catName != null) {
+                        catName = catName.trim();
+                    }
+                    if (oConvertUtils.isEmpty(catName)) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条设备类别名称不能为空");
+                    }
+                    MesXslEquipmentCategory cat =
+                            mesXslEquipmentCategoryService.findOneActiveByNameAndTenant(catName, row.getTenantId());
+                    if (cat == null) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条设备类别名称【" + catName + "】不存在或未删除数据中无匹配");
+                    }
+                    row.setEquipmentCategoryId(cat.getId());
+                    row.setEquipmentCategoryName(cat.getCategoryName());
+
+                    String ipc = row.getImportEquipmentPartCode();
+                    if (ipc != null) {
+                        ipc = ipc.trim();
+                    }
+                    if (oConvertUtils.isEmpty(ipc)) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条大部位代码不能为空");
+                    }
+                    MesXslEquipmentPart part =
+                            mesXslEquipmentPartService.findOneActiveByPartCodeAndTenant(ipc, row.getTenantId());
+                    if (part == null) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条大部位代码【" + ipc + "】不存在或未删除数据中无匹配");
+                    }
+                    if (!cat.getId().equals(part.getEquipmentCategoryId())) {
+                        return Result.error(
+                                "文件导入失败：第 " + rowNo + " 条设备类别名称与所选大部位不匹配（大部位所属类别须与类别名称一致）");
+                    }
+                    row.setEquipmentPartId(part.getId());
+                    row.setEquipmentPartName(part.getPartName());
+                    row.setImportCategoryName(null);
+                    row.setImportEquipmentPartCode(null);
+
+                    if (oConvertUtils.isEmpty(row.getSubPartName()) || row.getSubPartName().trim().isEmpty()) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条小部位名称不能为空");
+                    }
+                    row.setSubPartName(row.getSubPartName().trim());
+
+                    if (!codesInFile.add(sc)) {
+                        return Result.error("文件导入失败：小部位代码【" + sc + "】在导入文件中重复（小部位代码不能重复）");
+                    }
+                    if (mesXslEquipmentSubPartService.isSubPartCodeDuplicated(sc, null, row)) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条小部位代码【" + sc + "】不能重复（同租户未删除数据中已存在）");
+                    }
+
+                    if (row.getSubPartDescription() != null) {
+                        row.setSubPartDescription(row.getSubPartDescription().trim());
+                    }
+
+                    String en = row.getEnableStatus();
+                    if (en != null) {
+                        en = en.trim();
+                    }
+                    if (oConvertUtils.isEmpty(en)) {
+                        en = "0";
+                    }
+                    if (!ENABLE_STATUS.contains(en)) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条是否启用须为字典项值 0 或 1（xslmes_unit_status）");
+                    }
+                    row.setEnableStatus(en);
+                }
+                long start = System.currentTimeMillis();
+                mesXslEquipmentSubPartService.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:20260515  for：【MES】设备小部位导入：小部位代码唯一、类别名称与大部位代码解析、与大部位类别一致性-----------
+        return Result.error("文件导入失败！");
+    }
+
+    //update-begin---author:jiangxh ---date:20260515  for：【MES】设备小部位保存前校验与冗余名称回填-----------
+    private String validateForSave(MesXslEquipmentSubPart model, String excludeId) {
+        if (oConvertUtils.isEmpty(model.getEquipmentCategoryId())) {
+            return "请选择所属设备类别";
+        }
+        MesXslEquipmentCategory cat = mesXslEquipmentCategoryService.getById(model.getEquipmentCategoryId());
+        if (cat == null) {
+            return "所属设备类别不存在";
+        }
+        model.setEquipmentCategoryName(cat.getCategoryName());
+
+        if (oConvertUtils.isEmpty(model.getEquipmentPartId())) {
+            return "请选择所属设备大部位";
+        }
+        MesXslEquipmentPart part = mesXslEquipmentPartService.getById(model.getEquipmentPartId());
+        if (part == null) {
+            return "所属设备大部位不存在";
+        }
+        if (!model.getEquipmentCategoryId().equals(part.getEquipmentCategoryId())) {
+            return "所属设备类别与所选设备大部位不匹配";
+        }
+        model.setEquipmentPartName(part.getPartName());
+
+        if (oConvertUtils.isEmpty(model.getSubPartCode()) || model.getSubPartCode().trim().isEmpty()) {
+            return "小部位代码不能为空";
+        }
+        String sc = model.getSubPartCode().trim();
+        model.setSubPartCode(sc);
+        if (mesXslEquipmentSubPartService.isSubPartCodeDuplicated(sc, excludeId, model)) {
+            return "小部位代码不能重复";
+        }
+
+        if (oConvertUtils.isEmpty(model.getSubPartName()) || model.getSubPartName().trim().isEmpty()) {
+            return "小部位名称不能为空";
+        }
+        model.setSubPartName(model.getSubPartName().trim());
+
+        String en = model.getEnableStatus();
+        if (en != null) {
+            en = en.trim();
+        }
+        if (oConvertUtils.isEmpty(en)) {
+            en = "0";
+        }
+        if (!ENABLE_STATUS.contains(en)) {
+            return "是否启用不合法（须为字典项值 0 或 1，xslmes_unit_status）";
+        }
+        model.setEnableStatus(en);
+
+        if (model.getSubPartDescription() != null) {
+            model.setSubPartDescription(model.getSubPartDescription().trim());
+        }
+        model.setImportCategoryName(null);
+        model.setImportEquipmentPartCode(null);
+        return null;
+    }
+    //update-end---author:jiangxh ---date:20260515  for：【MES】设备小部位保存前校验与冗余名称回填-----------
+}

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

@@ -0,0 +1,293 @@
+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 lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.xslmes.entity.MesXslEquipmentCategory;
+import org.jeecg.modules.xslmes.entity.MesXslEquipmentType;
+import org.jeecg.modules.xslmes.entity.MesXslProcessOperation;
+import org.jeecg.modules.xslmes.service.IMesXslEquipmentCategoryService;
+import org.jeecg.modules.xslmes.service.IMesXslEquipmentTypeService;
+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/mesXslEquipmentType")
+@Slf4j
+public class MesXslEquipmentTypeController extends JeecgController<MesXslEquipmentType, IMesXslEquipmentTypeService> {
+
+    @Autowired
+    private IMesXslEquipmentTypeService mesXslEquipmentTypeService;
+
+    @Autowired
+    private IMesXslProcessOperationService mesXslProcessOperationService;
+
+    @Autowired
+    private IMesXslEquipmentCategoryService mesXslEquipmentCategoryService;
+
+    @Operation(summary = "MES设备类型-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<MesXslEquipmentType>> queryPageList(
+            MesXslEquipmentType model,
+            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+            HttpServletRequest req) {
+        QueryWrapper<MesXslEquipmentType> queryWrapper = QueryGenerator.initQueryWrapper(model, req.getParameterMap());
+        Page<MesXslEquipmentType> page = new Page<>(pageNo, pageSize);
+        IPage<MesXslEquipmentType> pageList = mesXslEquipmentTypeService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    @AutoLog(value = "MES设备类型-添加")
+    @Operation(summary = "MES设备类型-添加")
+    @RequiresPermissions("mes:mes_xsl_equipment_type:add")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody MesXslEquipmentType model) {
+        //update-begin---author:jiangxh ---date:20260514  for：【MES】设备类型：名称唯一、工序与设备类别校验、冗余名称-----------
+        String err = validateForSave(model, null);
+        if (err != null) {
+            return Result.error(err);
+        }
+        //update-end---author:jiangxh ---date:20260514  for：【MES】设备类型：名称唯一、工序与设备类别校验、冗余名称-----------
+        mesXslEquipmentTypeService.save(model);
+        return Result.OK("添加成功！");
+    }
+
+    @AutoLog(value = "MES设备类型-编辑")
+    @Operation(summary = "MES设备类型-编辑")
+    @RequiresPermissions("mes:mes_xsl_equipment_type:edit")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody MesXslEquipmentType model) {
+        //update-begin---author:jiangxh ---date:20260514  for：【MES】设备类型：名称唯一、工序与设备类别校验、冗余名称-----------
+        String err = validateForSave(model, model.getId());
+        if (err != null) {
+            return Result.error(err);
+        }
+        //update-end---author:jiangxh ---date:20260514  for：【MES】设备类型：名称唯一、工序与设备类别校验、冗余名称-----------
+        mesXslEquipmentTypeService.updateById(model);
+        return Result.OK("编辑成功!");
+    }
+
+    @AutoLog(value = "MES设备类型-删除")
+    @Operation(summary = "MES设备类型-通过id删除")
+    @RequiresPermissions("mes:mes_xsl_equipment_type:delete")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        mesXslEquipmentTypeService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    @AutoLog(value = "MES设备类型-批量删除")
+    @Operation(summary = "MES设备类型-批量删除")
+    @RequiresPermissions("mes:mes_xsl_equipment_type:deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        mesXslEquipmentTypeService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
+
+    @Operation(summary = "MES设备类型-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<MesXslEquipmentType> queryById(@RequestParam(name = "id", required = true) String id) {
+        MesXslEquipmentType entity = mesXslEquipmentTypeService.getById(id);
+        if (entity == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(entity);
+    }
+
+    @Operation(summary = "校验设备类型名称是否重复（仅未删除数据；同租户，dataId 为编辑时当前主键）")
+    @GetMapping(value = "/checkTypeName")
+    public Result<String> checkTypeName(
+            @RequestParam(name = "typeName", required = true) String typeName,
+            @RequestParam(name = "dataId", required = false) String dataId) {
+        if (oConvertUtils.isEmpty(typeName) || typeName.trim().isEmpty()) {
+            return Result.OK("该值可用！");
+        }
+        MesXslEquipmentType ctx = new MesXslEquipmentType();
+        if (mesXslEquipmentTypeService.isTypeNameDuplicated(typeName.trim(), dataId, ctx)) {
+            return Result.error("该类型名称已存在");
+        }
+        return Result.OK("该值可用！");
+    }
+
+    @RequiresPermissions("mes:mes_xsl_equipment_type:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, MesXslEquipmentType model) {
+        return super.exportXls(request, model, MesXslEquipmentType.class, "MES设备类型");
+    }
+
+    @RequiresPermissions("mes:mes_xsl_equipment_type:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        //update-begin---author:jiangxh ---date:20260514  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<MesXslEquipmentType> list = ExcelImportUtil.importExcel(file.getInputStream(), MesXslEquipmentType.class, params);
+                if (list == null) {
+                    list = List.of();
+                }
+                Set<String> namesInFile = new HashSet<>();
+                for (int i = 0; i < list.size(); i++) {
+                    MesXslEquipmentType row = list.get(i);
+                    int rowNo = i + 1;
+                    if (row == null) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条数据无效（空行）");
+                    }
+                    String tn = row.getTypeName();
+                    if (tn != null) {
+                        tn = tn.trim();
+                    }
+                    if (oConvertUtils.isEmpty(tn)) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条类型名称不能为空");
+                    }
+                    row.setTypeName(tn);
+                    if (!namesInFile.add(tn)) {
+                        return Result.error("文件导入失败：类型名称【" + tn + "】在导入文件中重复");
+                    }
+                    if (mesXslEquipmentTypeService.isTypeNameDuplicated(tn, null, row)) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条类型名称【" + tn + "】已存在（未删除数据中不允许重复）");
+                    }
+                    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());
+                    row.setImportOperationCode(null);
+
+                    String catName = row.getImportCategoryName();
+                    if (catName != null) {
+                        catName = catName.trim();
+                    }
+                    if (oConvertUtils.isEmpty(catName)) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条设备类别名称不能为空");
+                    }
+                    MesXslEquipmentCategory cat =
+                            mesXslEquipmentCategoryService.findOneActiveByNameAndTenant(catName, row.getTenantId());
+                    if (cat == null) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条设备类别名称【" + catName + "】不存在或未删除数据中无匹配");
+                    }
+                    row.setEquipmentCategoryId(cat.getId());
+                    row.setEquipmentCategoryName(cat.getCategoryName());
+                    row.setImportCategoryName(null);
+                }
+                long start = System.currentTimeMillis();
+                mesXslEquipmentTypeService.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:20260514  for：【MES】设备类型导入：名称唯一、工序编码与设备类别名称解析-----------
+        return Result.error("文件导入失败！");
+    }
+
+    //update-begin---author:jiangxh ---date:20260514  for：【MES】设备类型保存前校验与工序、类别名称回填-----------
+    private String validateForSave(MesXslEquipmentType model, String excludeId) {
+        if (oConvertUtils.isEmpty(model.getTypeName()) || model.getTypeName().trim().isEmpty()) {
+            return "类型名称不能为空";
+        }
+        String tn = model.getTypeName().trim();
+        model.setTypeName(tn);
+        if (mesXslEquipmentTypeService.isTypeNameDuplicated(tn, excludeId, model)) {
+            return "类型名称已存在";
+        }
+        if (oConvertUtils.isEmpty(model.getProcessOperationId())) {
+            return "请选择所属工序";
+        }
+        MesXslProcessOperation op = mesXslProcessOperationService.getById(model.getProcessOperationId());
+        if (op == null) {
+            return "所属工序不存在";
+        }
+        model.setProcessOperationName(op.getOperationName());
+
+        if (oConvertUtils.isEmpty(model.getEquipmentCategoryId())) {
+            return "请选择所属设备类别";
+        }
+        MesXslEquipmentCategory cat = mesXslEquipmentCategoryService.getById(model.getEquipmentCategoryId());
+        if (cat == null) {
+            return "所属设备类别不存在";
+        }
+        model.setEquipmentCategoryName(cat.getCategoryName());
+
+        model.setImportOperationCode(null);
+        model.setImportCategoryName(null);
+        return null;
+    }
+
+    private MesXslProcessOperation findProcessByOperationCode(String operationCode, MesXslEquipmentType 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:20260514  for：【MES】设备类型保存前校验与工序、类别名称回填-----------
+}

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

@@ -0,0 +1,249 @@
+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.MesXslManufacturer;
+import org.jeecg.modules.xslmes.service.IMesXslManufacturerService;
+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/mesXslManufacturer")
+@Slf4j
+public class MesXslManufacturerController extends JeecgController<MesXslManufacturer, IMesXslManufacturerService> {
+
+    private static final Set<String> MANUFACTURER_CATEGORIES = Set.of("mold", "capsule", "equipment");
+    private static final Set<String> VALID_STATUS = Set.of("0", "1");
+
+    @Autowired
+    private IMesXslManufacturerService mesXslManufacturerService;
+
+    @Operation(summary = "MES厂家信息-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<MesXslManufacturer>> queryPageList(
+            MesXslManufacturer model,
+            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+            HttpServletRequest req) {
+        QueryWrapper<MesXslManufacturer> queryWrapper = QueryGenerator.initQueryWrapper(model, req.getParameterMap());
+        Page<MesXslManufacturer> page = new Page<>(pageNo, pageSize);
+        IPage<MesXslManufacturer> pageList = mesXslManufacturerService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    @AutoLog(value = "MES厂家信息-添加")
+    @Operation(summary = "MES厂家信息-添加")
+    @RequiresPermissions("mes:mes_xsl_manufacturer:add")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody MesXslManufacturer model) {
+        //update-begin---author:jiangxh ---date:20260515  for：【MES】厂家信息保存前校验：类别字典值、名称唯一、有效状态-----------
+        String err = validateForSave(model, null);
+        if (err != null) {
+            return Result.error(err);
+        }
+        //update-end---author:jiangxh ---date:20260515  for：【MES】厂家信息保存前校验：类别字典值、名称唯一、有效状态-----------
+        mesXslManufacturerService.save(model);
+        return Result.OK("添加成功！");
+    }
+
+    @AutoLog(value = "MES厂家信息-编辑")
+    @Operation(summary = "MES厂家信息-编辑")
+    @RequiresPermissions("mes:mes_xsl_manufacturer:edit")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody MesXslManufacturer model) {
+        //update-begin---author:jiangxh ---date:20260515  for：【MES】厂家信息保存前校验：类别字典值、名称唯一、有效状态-----------
+        String err = validateForSave(model, model.getId());
+        if (err != null) {
+            return Result.error(err);
+        }
+        //update-end---author:jiangxh ---date:20260515  for：【MES】厂家信息保存前校验：类别字典值、名称唯一、有效状态-----------
+        mesXslManufacturerService.updateById(model);
+        return Result.OK("编辑成功!");
+    }
+
+    @AutoLog(value = "MES厂家信息-删除")
+    @Operation(summary = "MES厂家信息-通过id删除")
+    @RequiresPermissions("mes:mes_xsl_manufacturer:delete")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        mesXslManufacturerService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    @AutoLog(value = "MES厂家信息-批量删除")
+    @Operation(summary = "MES厂家信息-批量删除")
+    @RequiresPermissions("mes:mes_xsl_manufacturer:deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        mesXslManufacturerService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
+
+    @Operation(summary = "MES厂家信息-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<MesXslManufacturer> queryById(@RequestParam(name = "id", required = true) String id) {
+        MesXslManufacturer entity = mesXslManufacturerService.getById(id);
+        if (entity == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(entity);
+    }
+
+    @Operation(summary = "校验厂家名称是否重复（同租户未删除数据；dataId 为编辑时当前主键）")
+    @GetMapping(value = "/checkManufacturerName")
+    public Result<String> checkManufacturerName(
+            @RequestParam(name = "manufacturerName", required = true) String manufacturerName,
+            @RequestParam(name = "dataId", required = false) String dataId) {
+        if (oConvertUtils.isEmpty(manufacturerName) || manufacturerName.trim().isEmpty()) {
+            return Result.OK("该值可用！");
+        }
+        MesXslManufacturer ctx = new MesXslManufacturer();
+        if (mesXslManufacturerService.isManufacturerNameDuplicated(manufacturerName.trim(), dataId, ctx)) {
+            return Result.error("厂家名称不能重复");
+        }
+        return Result.OK("该值可用！");
+    }
+
+    @RequiresPermissions("mes:mes_xsl_manufacturer:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, MesXslManufacturer model) {
+        return super.exportXls(request, model, MesXslManufacturer.class, "MES厂家信息");
+    }
+
+    @RequiresPermissions("mes:mes_xsl_manufacturer:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        //update-begin---author:jiangxh ---date:20260515  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<MesXslManufacturer> list =
+                        ExcelImportUtil.importExcel(file.getInputStream(), MesXslManufacturer.class, params);
+                if (list == null) {
+                    list = List.of();
+                }
+                Set<String> namesInFile = new HashSet<>();
+                for (int i = 0; i < list.size(); i++) {
+                    MesXslManufacturer row = list.get(i);
+                    int rowNo = i + 1;
+                    if (row == null) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条数据无效（空行）");
+                    }
+                    String name = row.getManufacturerName();
+                    if (name != null) {
+                        name = name.trim();
+                    }
+                    if (oConvertUtils.isEmpty(name)) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条厂家名称不能为空");
+                    }
+                    row.setManufacturerName(name);
+                    if (!namesInFile.add(name)) {
+                        return Result.error("文件导入失败：厂家名称【" + name + "】在导入文件中重复");
+                    }
+                    String cat = row.getManufacturerCategory();
+                    if (oConvertUtils.isEmpty(cat) || !MANUFACTURER_CATEGORIES.contains(cat.trim())) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条厂家类别无效（须为模具厂家/胶囊厂家/设备厂家对应字典值）");
+                    }
+                    row.setManufacturerCategory(cat.trim());
+                    String vs = row.getValidStatus();
+                    if (oConvertUtils.isEmpty(vs)) {
+                        row.setValidStatus("0");
+                    } else {
+                        vs = vs.trim();
+                        if (!VALID_STATUS.contains(vs)) {
+                            return Result.error("文件导入失败：第 " + rowNo + " 条是否有效无效（须为有效或无效对应字典值）");
+                        }
+                        row.setValidStatus(vs);
+                    }
+                    if (mesXslManufacturerService.isManufacturerNameDuplicated(name, null, row)) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条厂家名称【" + name + "】不能重复（同租户未删除数据中已存在）");
+                    }
+                }
+                long start = System.currentTimeMillis();
+                mesXslManufacturerService.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:20260515  for：【MES】厂家信息导入：名称唯一、文件内去重、类别与有效状态校验-----------
+        return Result.error("文件导入失败！");
+    }
+
+    //update-begin---author:jiangxh ---date:20260515  for：【MES】厂家信息保存前校验-----------
+    private String validateForSave(MesXslManufacturer model, String excludeId) {
+        if (oConvertUtils.isEmpty(model.getManufacturerCategory()) || model.getManufacturerCategory().trim().isEmpty()) {
+            return "厂家类别不能为空";
+        }
+        String cat = model.getManufacturerCategory().trim();
+        if (!MANUFACTURER_CATEGORIES.contains(cat)) {
+            return "厂家类别无效";
+        }
+        model.setManufacturerCategory(cat);
+        if (oConvertUtils.isEmpty(model.getManufacturerName()) || model.getManufacturerName().trim().isEmpty()) {
+            return "厂家名称不能为空";
+        }
+        String name = model.getManufacturerName().trim();
+        model.setManufacturerName(name);
+        if (mesXslManufacturerService.isManufacturerNameDuplicated(name, excludeId, model)) {
+            return "厂家名称不能重复";
+        }
+        String vs = model.getValidStatus();
+        if (oConvertUtils.isEmpty(vs)) {
+            model.setValidStatus("0");
+        } else {
+            vs = vs.trim();
+            if (!VALID_STATUS.contains(vs)) {
+                return "是否有效取值无效";
+            }
+            model.setValidStatus(vs);
+        }
+        return null;
+    }
+    //update-end---author:jiangxh ---date:20260515  for：【MES】厂家信息保存前校验-----------
+}

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

@@ -0,0 +1,210 @@
+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.MesXslProcessOperation;
+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/mesXslProcessOperation")
+@Slf4j
+public class MesXslProcessOperationController extends JeecgController<MesXslProcessOperation, IMesXslProcessOperationService> {
+
+    @Autowired
+    private IMesXslProcessOperationService mesXslProcessOperationService;
+
+    @Operation(summary = "MES工序管理-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<MesXslProcessOperation>> queryPageList(
+            MesXslProcessOperation model,
+            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+            HttpServletRequest req) {
+        QueryWrapper<MesXslProcessOperation> queryWrapper = QueryGenerator.initQueryWrapper(model, req.getParameterMap());
+        Page<MesXslProcessOperation> page = new Page<>(pageNo, pageSize);
+        IPage<MesXslProcessOperation> pageList = mesXslProcessOperationService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    @AutoLog(value = "MES工序管理-添加")
+    @Operation(summary = "MES工序管理-添加")
+    @RequiresPermissions("mes:mes_process_operation:add")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody MesXslProcessOperation model) {
+        //update-begin---author:jiangxh ---date:20260514  for：【MES】工序编码、名称必填；同租户工序编码不可重复-----------
+        if (oConvertUtils.isEmpty(model.getOperationCode()) || oConvertUtils.isEmpty(model.getOperationName())) {
+            return Result.error("工序编码、工序名称不能为空");
+        }
+        String code = model.getOperationCode().trim();
+        model.setOperationCode(code);
+        if (mesXslProcessOperationService.isOperationCodeDuplicated(code, null, model)) {
+            return Result.error("工序编码已存在");
+        }
+        //update-end---author:jiangxh ---date:20260514  for：【MES】工序编码、名称必填；同租户工序编码不可重复-----------
+        mesXslProcessOperationService.save(model);
+        return Result.OK("添加成功！");
+    }
+
+    @AutoLog(value = "MES工序管理-编辑")
+    @Operation(summary = "MES工序管理-编辑")
+    @RequiresPermissions("mes:mes_process_operation:edit")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody MesXslProcessOperation model) {
+        //update-begin---author:jiangxh ---date:20260514  for：【MES】工序编码、名称必填；同租户工序编码不可重复-----------
+        if (oConvertUtils.isEmpty(model.getOperationCode()) || oConvertUtils.isEmpty(model.getOperationName())) {
+            return Result.error("工序编码、工序名称不能为空");
+        }
+        String code = model.getOperationCode().trim();
+        model.setOperationCode(code);
+        if (mesXslProcessOperationService.isOperationCodeDuplicated(code, model.getId(), model)) {
+            return Result.error("工序编码已存在");
+        }
+        //update-end---author:jiangxh ---date:20260514  for：【MES】工序编码、名称必填；同租户工序编码不可重复-----------
+        mesXslProcessOperationService.updateById(model);
+        return Result.OK("编辑成功!");
+    }
+
+    @AutoLog(value = "MES工序管理-删除")
+    @Operation(summary = "MES工序管理-通过id删除")
+    @RequiresPermissions("mes:mes_process_operation:delete")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        mesXslProcessOperationService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    @AutoLog(value = "MES工序管理-批量删除")
+    @Operation(summary = "MES工序管理-批量删除")
+    @RequiresPermissions("mes:mes_process_operation:deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        mesXslProcessOperationService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
+
+    @Operation(summary = "MES工序管理-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<MesXslProcessOperation> queryById(@RequestParam(name = "id", required = true) String id) {
+        MesXslProcessOperation entity = mesXslProcessOperationService.getById(id);
+        if (entity == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(entity);
+    }
+
+    @Operation(summary = "校验工序编码是否重复（仅未删除数据；同租户，dataId 为编辑时当前主键）")
+    @GetMapping(value = "/checkOperationCode")
+    public Result<String> checkOperationCode(
+            @RequestParam(name = "operationCode", required = true) String operationCode,
+            @RequestParam(name = "dataId", required = false) String dataId) {
+        if (oConvertUtils.isEmpty(operationCode) || operationCode.trim().isEmpty()) {
+            return Result.OK("该值可用！");
+        }
+        MesXslProcessOperation ctx = new MesXslProcessOperation();
+        if (mesXslProcessOperationService.isOperationCodeDuplicated(operationCode.trim(), dataId, ctx)) {
+            return Result.error("该工序编码已存在");
+        }
+        return Result.OK("该值可用！");
+    }
+
+    @RequiresPermissions("mes:mes_process_operation:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, MesXslProcessOperation model) {
+        return super.exportXls(request, model, MesXslProcessOperation.class, "MES工序管理");
+    }
+
+    @RequiresPermissions("mes:mes_process_operation:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        //update-begin---author:jiangxh ---date:20260514  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<MesXslProcessOperation> list = ExcelImportUtil.importExcel(file.getInputStream(), MesXslProcessOperation.class, params);
+                if (list == null) {
+                    list = List.of();
+                }
+                Set<String> codesInFile = new HashSet<>();
+                for (int i = 0; i < list.size(); i++) {
+                    MesXslProcessOperation row = list.get(i);
+                    int rowNo = i + 1;
+                    if (row == null) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条数据无效（空行）");
+                    }
+                    String code = row.getOperationCode();
+                    if (code != null) {
+                        code = code.trim();
+                    }
+                    if (oConvertUtils.isEmpty(code)) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条工序编码不能为空");
+                    }
+                    row.setOperationCode(code);
+                    if (oConvertUtils.isEmpty(row.getOperationName()) || row.getOperationName().trim().isEmpty()) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条工序名称不能为空");
+                    }
+                    row.setOperationName(row.getOperationName().trim());
+                    if (!codesInFile.add(code)) {
+                        return Result.error("文件导入失败：工序编码【" + code + "】在导入文件中重复");
+                    }
+                    if (mesXslProcessOperationService.isOperationCodeDuplicated(code, null, row)) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条工序编码【" + code + "】已存在（未删除数据中不允许重复）");
+                    }
+                }
+                long start = System.currentTimeMillis();
+                mesXslProcessOperationService.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:20260514  for：【MES】工序导入：文件内编码不重复，且与库中未删除数据不重复-----------
+        return Result.error("文件导入失败！");
+    }
+}

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

@@ -0,0 +1,320 @@
+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.math.BigDecimal;
+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.MesXslSparePart;
+import org.jeecg.modules.xslmes.entity.MesXslSparePartsCategory;
+import org.jeecg.modules.xslmes.entity.MesXslUnit;
+import org.jeecg.modules.xslmes.service.IMesXslSparePartService;
+import org.jeecg.modules.xslmes.service.IMesXslSparePartsCategoryService;
+import org.jeecg.modules.xslmes.service.IMesXslUnitService;
+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/mesXslSparePart")
+@Slf4j
+public class MesXslSparePartController extends JeecgController<MesXslSparePart, IMesXslSparePartService> {
+
+    @Autowired
+    private IMesXslSparePartService mesXslSparePartService;
+
+    @Autowired
+    private IMesXslSparePartsCategoryService mesXslSparePartsCategoryService;
+
+    @Autowired
+    private IMesXslUnitService mesXslUnitService;
+
+    @Operation(summary = "MES备品件信息-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<MesXslSparePart>> queryPageList(
+            MesXslSparePart model,
+            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+            HttpServletRequest req) {
+        QueryWrapper<MesXslSparePart> queryWrapper = QueryGenerator.initQueryWrapper(model, req.getParameterMap());
+        Page<MesXslSparePart> page = new Page<>(pageNo, pageSize);
+        IPage<MesXslSparePart> pageList = mesXslSparePartService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    @AutoLog(value = "MES备品件信息-添加")
+    @Operation(summary = "MES备品件信息-添加")
+    @RequiresPermissions("mes:mes_xsl_spare_part:add")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody MesXslSparePart model) {
+        //update-begin---author:jiangxh ---date:20260515  for：【MES】备品件信息保存前校验：名称唯一、类别与单位回填、库存上下限-----------
+        String err = validateForSave(model, null);
+        if (err != null) {
+            return Result.error(err);
+        }
+        //update-end---author:jiangxh ---date:20260515  for：【MES】备品件信息保存前校验：名称唯一、类别与单位回填、库存上下限-----------
+        mesXslSparePartService.save(model);
+        return Result.OK("添加成功！");
+    }
+
+    @AutoLog(value = "MES备品件信息-编辑")
+    @Operation(summary = "MES备品件信息-编辑")
+    @RequiresPermissions("mes:mes_xsl_spare_part:edit")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody MesXslSparePart model) {
+        //update-begin---author:jiangxh ---date:20260515  for：【MES】备品件信息保存前校验：名称唯一、类别与单位回填、库存上下限-----------
+        String err = validateForSave(model, model.getId());
+        if (err != null) {
+            return Result.error(err);
+        }
+        //update-end---author:jiangxh ---date:20260515  for：【MES】备品件信息保存前校验：名称唯一、类别与单位回填、库存上下限-----------
+        mesXslSparePartService.updateById(model);
+        return Result.OK("编辑成功!");
+    }
+
+    @AutoLog(value = "MES备品件信息-删除")
+    @Operation(summary = "MES备品件信息-通过id删除")
+    @RequiresPermissions("mes:mes_xsl_spare_part:delete")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        mesXslSparePartService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    @AutoLog(value = "MES备品件信息-批量删除")
+    @Operation(summary = "MES备品件信息-批量删除")
+    @RequiresPermissions("mes:mes_xsl_spare_part:deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        mesXslSparePartService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
+
+    @Operation(summary = "MES备品件信息-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<MesXslSparePart> queryById(@RequestParam(name = "id", required = true) String id) {
+        MesXslSparePart entity = mesXslSparePartService.getById(id);
+        if (entity == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(entity);
+    }
+
+    @Operation(summary = "校验备品件名称是否重复（同租户未删除数据；dataId 为编辑时当前主键）")
+    @GetMapping(value = "/checkSparePartName")
+    public Result<String> checkSparePartName(
+            @RequestParam(name = "sparePartName", required = true) String sparePartName,
+            @RequestParam(name = "dataId", required = false) String dataId) {
+        if (oConvertUtils.isEmpty(sparePartName) || sparePartName.trim().isEmpty()) {
+            return Result.OK("该值可用！");
+        }
+        MesXslSparePart ctx = new MesXslSparePart();
+        if (mesXslSparePartService.isSparePartNameDuplicated(sparePartName.trim(), dataId, ctx)) {
+            return Result.error("备品件名称不能重复");
+        }
+        return Result.OK("该值可用！");
+    }
+
+    @RequiresPermissions("mes:mes_xsl_spare_part:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, MesXslSparePart model) {
+        return super.exportXls(request, model, MesXslSparePart.class, "MES备品件信息");
+    }
+
+    @RequiresPermissions("mes:mes_xsl_spare_part:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        //update-begin---author:jiangxh ---date:20260515  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<MesXslSparePart> list = ExcelImportUtil.importExcel(file.getInputStream(), MesXslSparePart.class, params);
+                if (list == null) {
+                    list = List.of();
+                }
+                Set<String> namesInFile = new HashSet<>();
+                for (int i = 0; i < list.size(); i++) {
+                    MesXslSparePart row = list.get(i);
+                    int rowNo = i + 1;
+                    if (row == null) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条数据无效（空行）");
+                    }
+                    String pn = row.getSparePartName();
+                    if (pn != null) {
+                        pn = pn.trim();
+                    }
+                    if (oConvertUtils.isEmpty(pn)) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条备品件名称不能为空");
+                    }
+                    row.setSparePartName(pn);
+                    if (!namesInFile.add(pn)) {
+                        return Result.error("文件导入失败：备品件名称【" + pn + "】在导入文件中重复");
+                    }
+                    if (mesXslSparePartService.isSparePartNameDuplicated(pn, null, row)) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条备品件名称【" + pn + "】不能重复（同租户未删除数据中已存在）");
+                    }
+
+                    String catName = row.getImportCategoryName();
+                    if (catName != null) {
+                        catName = catName.trim();
+                    }
+                    if (oConvertUtils.isEmpty(catName)) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条备品件类别名称不能为空");
+                    }
+                    MesXslSparePartsCategory cat =
+                            mesXslSparePartsCategoryService.findOneActiveByCategoryNameAndTenant(catName, row.getTenantId());
+                    if (cat == null) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条备品件类别名称【" + catName + "】不存在或未删除数据中无匹配");
+                    }
+                    row.setSparePartsCategoryId(cat.getId());
+                    row.setSparePartsCategoryName(cat.getCategoryName());
+                    row.setImportCategoryName(null);
+
+                    String ucode = row.getImportUnitCode();
+                    if (ucode != null) {
+                        ucode = ucode.trim();
+                    }
+                    if (oConvertUtils.isEmpty(ucode)) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条单位编码不能为空");
+                    }
+                    MesXslUnit unit = mesXslUnitService.findOneActiveByUnitCodeAndTenant(ucode, row.getTenantId());
+                    if (unit == null) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条单位编码【" + ucode + "】不存在或未删除数据中无匹配");
+                    }
+                    String st = unit.getStatus();
+                    if (st != null && "1".equals(st.trim())) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条单位编码【" + ucode + "】对应单位已停用");
+                    }
+                    row.setUnitId(unit.getId());
+                    row.setUnitName(unit.getUnitName());
+                    row.setImportUnitCode(null);
+
+                    String errStock = normalizeAndValidateStocks(row, rowNo);
+                    if (errStock != null) {
+                        return Result.error(errStock);
+                    }
+
+                    if (row.getSpecModel() != null) {
+                        row.setSpecModel(row.getSpecModel().trim());
+                    }
+                }
+                long start = System.currentTimeMillis();
+                mesXslSparePartService.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:20260515  for：【MES】备品件信息导入：名称唯一、类别名称与单位编码解析、库存校验-----------
+        return Result.error("文件导入失败！");
+    }
+
+    //update-begin---author:jiangxh ---date:20260515  for：【MES】备品件信息保存前校验与冗余名称回填-----------
+    private String validateForSave(MesXslSparePart model, String excludeId) {
+        if (oConvertUtils.isEmpty(model.getSparePartName()) || model.getSparePartName().trim().isEmpty()) {
+            return "备品件名称不能为空";
+        }
+        String pn = model.getSparePartName().trim();
+        model.setSparePartName(pn);
+        if (mesXslSparePartService.isSparePartNameDuplicated(pn, excludeId, model)) {
+            return "备品件名称不能重复";
+        }
+
+        if (oConvertUtils.isEmpty(model.getSparePartsCategoryId())) {
+            return "请选择所属备品件类别";
+        }
+        MesXslSparePartsCategory cat = mesXslSparePartsCategoryService.getById(model.getSparePartsCategoryId());
+        if (cat == null) {
+            return "所属备品件类别不存在";
+        }
+        model.setSparePartsCategoryName(cat.getCategoryName());
+
+        if (oConvertUtils.isEmpty(model.getUnitId())) {
+            return "请选择单位";
+        }
+        MesXslUnit unit = mesXslUnitService.getById(model.getUnitId());
+        if (unit == null) {
+            return "所选单位不存在";
+        }
+        String ust = unit.getStatus();
+        if (ust != null && "1".equals(ust.trim())) {
+            return "所选单位已停用，请重新选择";
+        }
+        model.setUnitName(unit.getUnitName());
+
+        String errStock = normalizeAndValidateStocks(model, null);
+        if (errStock != null) {
+            return errStock;
+        }
+
+        if (model.getSpecModel() != null) {
+            model.setSpecModel(model.getSpecModel().trim());
+        }
+        model.setImportCategoryName(null);
+        model.setImportUnitCode(null);
+        return null;
+    }
+
+    /** 规范化 max/min 库存并校验；rowNo 非空时错误信息带行号（导入用） */
+    private String normalizeAndValidateStocks(MesXslSparePart model, Integer rowNo) {
+        BigDecimal max = model.getMaxStock();
+        BigDecimal min = model.getMinStock();
+        if (max == null || min == null) {
+            return rowNo == null ? "最大库存、最小库存不能为空" : "文件导入失败：第 " + rowNo + " 条最大库存、最小库存不能为空";
+        }
+        max = max.stripTrailingZeros();
+        min = min.stripTrailingZeros();
+        model.setMaxStock(max);
+        model.setMinStock(min);
+        if (max.compareTo(BigDecimal.ZERO) < 0 || min.compareTo(BigDecimal.ZERO) < 0) {
+            return rowNo == null ? "最大库存、最小库存不能为负数" : "文件导入失败：第 " + rowNo + " 条最大库存、最小库存不能为负数";
+        }
+        if (max.compareTo(min) < 0) {
+            return rowNo == null ? "最大库存不能小于最小库存" : "文件导入失败：第 " + rowNo + " 条最大库存不能小于最小库存";
+        }
+        return null;
+    }
+    //update-end---author:jiangxh ---date:20260515  for：【MES】备品件信息保存前校验与冗余名称回填-----------
+}

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

@@ -0,0 +1,219 @@
+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.MesXslSparePartsCategory;
+import org.jeecg.modules.xslmes.service.IMesXslSparePartsCategoryService;
+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/mesXslSparePartsCategory")
+@Slf4j
+public class MesXslSparePartsCategoryController extends JeecgController<MesXslSparePartsCategory, IMesXslSparePartsCategoryService> {
+
+    @Autowired
+    private IMesXslSparePartsCategoryService mesXslSparePartsCategoryService;
+
+    @Operation(summary = "MES备品件类别-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<MesXslSparePartsCategory>> queryPageList(
+            MesXslSparePartsCategory model,
+            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+            HttpServletRequest req) {
+        QueryWrapper<MesXslSparePartsCategory> queryWrapper = QueryGenerator.initQueryWrapper(model, req.getParameterMap());
+        Page<MesXslSparePartsCategory> page = new Page<>(pageNo, pageSize);
+        IPage<MesXslSparePartsCategory> pageList = mesXslSparePartsCategoryService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    @AutoLog(value = "MES备品件类别-添加")
+    @Operation(summary = "MES备品件类别-添加")
+    @RequiresPermissions("mes:mes_xsl_spare_parts_category:add")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody MesXslSparePartsCategory model) {
+        //update-begin---author:jiangxh ---date:20260515  for：【MES】备品件类别保存前校验：类别名称唯一、描述 trim-----------
+        String err = validateForSave(model, null);
+        if (err != null) {
+            return Result.error(err);
+        }
+        //update-end---author:jiangxh ---date:20260515  for：【MES】备品件类别保存前校验：类别名称唯一、描述 trim-----------
+        mesXslSparePartsCategoryService.save(model);
+        return Result.OK("添加成功！");
+    }
+
+    @AutoLog(value = "MES备品件类别-编辑")
+    @Operation(summary = "MES备品件类别-编辑")
+    @RequiresPermissions("mes:mes_xsl_spare_parts_category:edit")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody MesXslSparePartsCategory model) {
+        //update-begin---author:jiangxh ---date:20260515  for：【MES】备品件类别保存前校验：类别名称唯一、描述 trim-----------
+        String err = validateForSave(model, model.getId());
+        if (err != null) {
+            return Result.error(err);
+        }
+        //update-end---author:jiangxh ---date:20260515  for：【MES】备品件类别保存前校验：类别名称唯一、描述 trim-----------
+        mesXslSparePartsCategoryService.updateById(model);
+        return Result.OK("编辑成功!");
+    }
+
+    @AutoLog(value = "MES备品件类别-删除")
+    @Operation(summary = "MES备品件类别-通过id删除")
+    @RequiresPermissions("mes:mes_xsl_spare_parts_category:delete")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        mesXslSparePartsCategoryService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    @AutoLog(value = "MES备品件类别-批量删除")
+    @Operation(summary = "MES备品件类别-批量删除")
+    @RequiresPermissions("mes:mes_xsl_spare_parts_category:deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        mesXslSparePartsCategoryService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
+
+    @Operation(summary = "MES备品件类别-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<MesXslSparePartsCategory> queryById(@RequestParam(name = "id", required = true) String id) {
+        MesXslSparePartsCategory entity = mesXslSparePartsCategoryService.getById(id);
+        if (entity == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(entity);
+    }
+
+    @Operation(summary = "校验备品件类别名称是否重复（同租户未删除数据；dataId 为编辑时当前主键）")
+    @GetMapping(value = "/checkCategoryName")
+    public Result<String> checkCategoryName(
+            @RequestParam(name = "categoryName", required = true) String categoryName,
+            @RequestParam(name = "dataId", required = false) String dataId) {
+        if (oConvertUtils.isEmpty(categoryName) || categoryName.trim().isEmpty()) {
+            return Result.OK("该值可用！");
+        }
+        MesXslSparePartsCategory ctx = new MesXslSparePartsCategory();
+        if (mesXslSparePartsCategoryService.isCategoryNameDuplicated(categoryName.trim(), dataId, ctx)) {
+            return Result.error("类别名称不能重复");
+        }
+        return Result.OK("该值可用！");
+    }
+
+    @RequiresPermissions("mes:mes_xsl_spare_parts_category:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, MesXslSparePartsCategory model) {
+        return super.exportXls(request, model, MesXslSparePartsCategory.class, "MES备品件类别");
+    }
+
+    @RequiresPermissions("mes:mes_xsl_spare_parts_category:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        //update-begin---author:jiangxh ---date:20260515  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<MesXslSparePartsCategory> list =
+                        ExcelImportUtil.importExcel(file.getInputStream(), MesXslSparePartsCategory.class, params);
+                if (list == null) {
+                    list = List.of();
+                }
+                Set<String> namesInFile = new HashSet<>();
+                for (int i = 0; i < list.size(); i++) {
+                    MesXslSparePartsCategory row = list.get(i);
+                    int rowNo = i + 1;
+                    if (row == null) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条数据无效（空行）");
+                    }
+                    String name = row.getCategoryName();
+                    if (name != null) {
+                        name = name.trim();
+                    }
+                    if (oConvertUtils.isEmpty(name)) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条类别名称不能为空");
+                    }
+                    row.setCategoryName(name);
+                    if (!namesInFile.add(name)) {
+                        return Result.error("文件导入失败：类别名称【" + name + "】在导入文件中重复");
+                    }
+                    if (mesXslSparePartsCategoryService.isCategoryNameDuplicated(name, null, row)) {
+                        return Result.error("文件导入失败：第 " + rowNo + " 条类别名称【" + name + "】不能重复（同租户未删除数据中已存在）");
+                    }
+                    if (row.getCategoryDescription() != null) {
+                        row.setCategoryDescription(row.getCategoryDescription().trim());
+                    }
+                }
+                long start = System.currentTimeMillis();
+                mesXslSparePartsCategoryService.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:20260515  for：【MES】备品件类别导入：类别名称唯一、文件内去重-----------
+        return Result.error("文件导入失败！");
+    }
+
+    //update-begin---author:jiangxh ---date:20260515  for：【MES】备品件类别保存前校验-----------
+    private String validateForSave(MesXslSparePartsCategory model, String excludeId) {
+        if (oConvertUtils.isEmpty(model.getCategoryName()) || model.getCategoryName().trim().isEmpty()) {
+            return "类别名称不能为空";
+        }
+        String name = model.getCategoryName().trim();
+        model.setCategoryName(name);
+        if (mesXslSparePartsCategoryService.isCategoryNameDuplicated(name, excludeId, model)) {
+            return "类别名称不能重复";
+        }
+        if (model.getCategoryDescription() != null) {
+            model.setCategoryDescription(model.getCategoryDescription().trim());
+        }
+        return null;
+    }
+    //update-end---author:jiangxh ---date:20260515  for：【MES】备品件类别保存前校验-----------
+}

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

@@ -0,0 +1,71 @@
+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_equipment_category）
+ */
+@Data
+@TableName("mes_xsl_equipment_category")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "MES设备类别")
+public class MesXslEquipmentCategory implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
+
+    @Excel(name = "类别名称", width = 22)
+    @Schema(description = "设备类别名称（同租户未删除数据中唯一）")
+    private String categoryName;
+
+    @Schema(description = "所属工序主键")
+    private String processOperationId;
+
+    @Excel(name = "工序名称", width = 24)
+    @Schema(description = "工序名称冗余，用于列表与导出展示")
+    private String processOperationName;
+
+    @Excel(name = "点检区分", width = 14, dicCode = "xslmes_equipment_inspect_distinct")
+    @Dict(dicCode = "xslmes_equipment_inspect_distinct")
+    @Schema(description = "点检区分（字典 xslmes_equipment_inspect_distinct）")
+    private String inspectDistinct;
+
+    @Excel(name = "保养区分", width = 14, dicCode = "xslmes_equipment_maintain_distinct")
+    @Dict(dicCode = "xslmes_equipment_maintain_distinct")
+    @Schema(description = "保养区分（字典 xslmes_equipment_maintain_distinct）")
+    private String maintainDistinct;
+
+    /** 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/MesXslEquipmentPart.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_equipment_part）
+ */
+@Data
+@TableName("mes_xsl_equipment_part")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "MES设备部位")
+public class MesXslEquipmentPart implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
+
+    @Schema(description = "所属设备类别主键")
+    private String equipmentCategoryId;
+
+    @Excel(name = "类别名称", width = 22)
+    @Schema(description = "设备类别名称冗余展示")
+    private String equipmentCategoryName;
+
+    @Excel(name = "部位名称", width = 20)
+    @Schema(description = "部位名称")
+    private String partName;
+
+    @Excel(name = "部位代码", width = 16)
+    @Schema(description = "部位代码（同租户未删除数据中唯一）")
+    private String partCode;
+
+    @Excel(name = "部位描述", width = 28)
+    @Schema(description = "部位描述")
+    private String partDescription;
+
+    @Excel(name = "是否启用", width = 12, dicCode = "xslmes_unit_status")
+    @Dict(dicCode = "xslmes_unit_status")
+    @Schema(description = "是否启用（字典xslmes_unit_status：0启用1停用）")
+    private String enableStatus;
+
+    /** Excel 导入用：设备类别名称，不落库 */
+    @TableField(exist = false)
+    @Excel(name = "设备类别名称", width = 22)
+    @Schema(description = "导入用设备类别名称")
+    private String importCategoryName;
+
+    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/MesXslEquipmentSubPart.java

@@ -0,0 +1,87 @@
+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_equipment_sub_part）
+ */
+@Data
+@TableName("mes_xsl_equipment_sub_part")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "MES设备小部位")
+public class MesXslEquipmentSubPart implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
+
+    @Schema(description = "所属设备类别主键")
+    private String equipmentCategoryId;
+
+    @Excel(name = "类别名称", width = 22)
+    @Schema(description = "设备类别名称冗余展示")
+    private String equipmentCategoryName;
+
+    @Schema(description = "所属设备大部位主键 mes_xsl_equipment_part.id")
+    private String equipmentPartId;
+
+    @Excel(name = "大部位名称", width = 20)
+    @Schema(description = "设备大部位名称冗余")
+    private String equipmentPartName;
+
+    @Excel(name = "小部位名称", width = 20)
+    @Schema(description = "小部位名称")
+    private String subPartName;
+
+    @Excel(name = "小部位代码", width = 16)
+    @Schema(description = "小部位代码（同租户未删除数据中唯一）")
+    private String subPartCode;
+
+    @Excel(name = "部位描述", width = 28)
+    @Schema(description = "部位描述")
+    private String subPartDescription;
+
+    @Excel(name = "是否启用", width = 12, dicCode = "xslmes_unit_status")
+    @Dict(dicCode = "xslmes_unit_status")
+    @Schema(description = "是否启用（字典xslmes_unit_status：0启用1停用）")
+    private String enableStatus;
+
+    /** Excel 导入用：设备类别名称，不落库 */
+    @TableField(exist = false)
+    @Excel(name = "设备类别名称", width = 22)
+    @Schema(description = "导入用设备类别名称")
+    private String importCategoryName;
+
+    /** Excel 导入用：大部位代码 mes_xsl_equipment_part.part_code，不落库 */
+    @TableField(exist = false)
+    @Excel(name = "大部位代码", width = 16)
+    @Schema(description = "导入用设备大部位代码")
+    private String importEquipmentPartCode;
+
+    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/MesXslEquipmentType.java

@@ -0,0 +1,73 @@
+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.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * MES 设备类型（表 mes_xsl_equipment_type）
+ */
+@Data
+@TableName("mes_xsl_equipment_type")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "MES设备类型")
+public class MesXslEquipmentType implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
+
+    @Excel(name = "类型名称", width = 22)
+    @Schema(description = "设备类型名称（同租户未删除数据中唯一）")
+    private String typeName;
+
+    @Schema(description = "所属工序主键")
+    private String processOperationId;
+
+    @Excel(name = "工序名称", width = 24)
+    @Schema(description = "工序名称冗余展示")
+    private String processOperationName;
+
+    @Schema(description = "所属设备类别主键")
+    private String equipmentCategoryId;
+
+    @Excel(name = "类别名称", width = 22)
+    @Schema(description = "设备类别名称冗余展示")
+    private String equipmentCategoryName;
+
+    /** Excel 导入用：工序编码，不落库 */
+    @TableField(exist = false)
+    @Excel(name = "工序编码", width = 18)
+    @Schema(description = "导入用工序编码")
+    private String importOperationCode;
+
+    /** Excel 导入用：设备类别名称（与设备类别维护中名称一致），不落库 */
+    @TableField(exist = false)
+    @Excel(name = "设备类别名称", width = 22)
+    @Schema(description = "导入用设备类别名称")
+    private String importCategoryName;
+
+    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/MesXslManufacturer.java

@@ -0,0 +1,57 @@
+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_manufacturer）
+ */
+@Data
+@TableName("mes_xsl_manufacturer")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "MES厂家信息")
+public class MesXslManufacturer implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
+
+    @Excel(name = "厂家类别", width = 16, dicCode = "xslmes_manufacturer_category")
+    @Dict(dicCode = "xslmes_manufacturer_category")
+    @Schema(description = "厂家类别（字典 xslmes_manufacturer_category）")
+    private String manufacturerCategory;
+
+    @Excel(name = "厂家名称", width = 28)
+    @Schema(description = "厂家名称（同租户未删除数据中唯一）")
+    private String manufacturerName;
+
+    @Excel(name = "是否有效", width = 12, dicCode = "xslmes_manufacturer_valid")
+    @Dict(dicCode = "xslmes_manufacturer_valid")
+    @Schema(description = "是否有效（字典 xslmes_manufacturer_valid：0有效1无效）")
+    private String validStatus;
+
+    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/MesXslProcessOperation.java

@@ -0,0 +1,54 @@
+package org.jeecg.modules.xslmes.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * MES 工序管理（表 mes_process_operation）
+ */
+@Data
+@TableName("mes_process_operation")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "MES工序管理")
+public class MesXslProcessOperation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
+
+    @Excel(name = "工序编码", width = 20)
+    @Schema(description = "工序编码（同租户内唯一）")
+    private String operationCode;
+
+    @Excel(name = "工序名称", width = 24)
+    @Schema(description = "工序名称")
+    private String operationName;
+
+    @Excel(name = "备注", width = 28)
+    @Schema(description = "备注")
+    private String remark;
+
+    private Integer tenantId;
+    private String sysOrgCode;
+    private String createBy;
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+    private String updateBy;
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+    private Integer delFlag;
+}

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

@@ -0,0 +1,86 @@
+package org.jeecg.modules.xslmes.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * MES 备品件信息（表 mes_xsl_spare_part）
+ */
+@Data
+@TableName("mes_xsl_spare_part")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "MES备品件信息")
+public class MesXslSparePart implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
+
+    @Excel(name = "备品件名称", width = 22)
+    @Schema(description = "备品件名称（同租户未删除数据中唯一）")
+    private String sparePartName;
+
+    @Schema(description = "所属备品件类别主键")
+    private String sparePartsCategoryId;
+
+    @Excel(name = "类别名称", width = 20)
+    @Schema(description = "备品件类别名称冗余")
+    private String sparePartsCategoryName;
+
+    @Excel(name = "规格型号", width = 20)
+    @Schema(description = "规格型号")
+    private String specModel;
+
+    @Excel(name = "最大库存", width = 14)
+    @Schema(description = "最大库存")
+    private BigDecimal maxStock;
+
+    @Excel(name = "最小库存", width = 14)
+    @Schema(description = "最小库存")
+    private BigDecimal minStock;
+
+    @Schema(description = "单位 mes_xsl_unit.id")
+    private String unitId;
+
+    @Excel(name = "单位名称", width = 14)
+    @Schema(description = "单位名称冗余")
+    private String unitName;
+
+    /** Excel 导入用：备品件类别名称，不落库 */
+    @TableField(exist = false)
+    @Excel(name = "备品件类别名称", width = 22)
+    @Schema(description = "导入用备品件类别名称")
+    private String importCategoryName;
+
+    /** Excel 导入用：单位编码 mes_xsl_unit.unit_code，不落库 */
+    @TableField(exist = false)
+    @Excel(name = "单位编码", width = 16)
+    @Schema(description = "导入用单位编码")
+    private String importUnitCode;
+
+    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/MesXslSparePartsCategory.java

@@ -0,0 +1,50 @@
+package org.jeecg.modules.xslmes.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * MES 备品件类别（表 mes_xsl_spare_parts_category）
+ */
+@Data
+@TableName("mes_xsl_spare_parts_category")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "MES备品件类别")
+public class MesXslSparePartsCategory implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
+
+    @Excel(name = "类别名称", width = 24)
+    @Schema(description = "类别名称（同租户未删除数据中唯一）")
+    private String categoryName;
+
+    @Excel(name = "描述", width = 36)
+    @Schema(description = "描述")
+    private String categoryDescription;
+
+    private Integer tenantId;
+    private String sysOrgCode;
+    private String createBy;
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+    private String updateBy;
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+    private Integer delFlag;
+}

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

@@ -0,0 +1,11 @@
+package org.jeecg.modules.xslmes.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.jeecg.modules.xslmes.entity.MesXslEquipmentCategory;
+
+/**
+ * MES 设备类别 Mapper
+ */
+@Mapper
+public interface MesXslEquipmentCategoryMapper extends BaseMapper<MesXslEquipmentCategory> {}

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

@@ -0,0 +1,11 @@
+package org.jeecg.modules.xslmes.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.jeecg.modules.xslmes.entity.MesXslEquipmentPart;
+
+/**
+ * MES 设备部位 Mapper
+ */
+@Mapper
+public interface MesXslEquipmentPartMapper extends BaseMapper<MesXslEquipmentPart> {}

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

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

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

@@ -0,0 +1,11 @@
+package org.jeecg.modules.xslmes.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.jeecg.modules.xslmes.entity.MesXslEquipmentType;
+
+/**
+ * MES 设备类型 Mapper
+ */
+@Mapper
+public interface MesXslEquipmentTypeMapper extends BaseMapper<MesXslEquipmentType> {}

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

@@ -0,0 +1,9 @@
+package org.jeecg.modules.xslmes.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.xslmes.entity.MesXslManufacturer;
+
+/**
+ * MES 厂家信息
+ */
+public interface MesXslManufacturerMapper extends BaseMapper<MesXslManufacturer> {}

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

@@ -0,0 +1,11 @@
+package org.jeecg.modules.xslmes.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.jeecg.modules.xslmes.entity.MesXslProcessOperation;
+
+/**
+ * MES 工序管理 Mapper
+ */
+@Mapper
+public interface MesXslProcessOperationMapper extends BaseMapper<MesXslProcessOperation> {}

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

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

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

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

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.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}）等。
  */
 package org.jeecg.modules.xslmes;

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

@@ -0,0 +1,24 @@
+package org.jeecg.modules.xslmes.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.xslmes.entity.MesXslEquipmentCategory;
+
+public interface IMesXslEquipmentCategoryService extends IService<MesXslEquipmentCategory> {
+
+    /**
+     * 类别名称是否已被占用（仅统计未删除：del_flag 为 0 或 null）。租户与 MybatisInterceptor 注入逻辑一致。
+     *
+     * @param categoryName 类别名称（已 trim 后传入）
+     * @param excludeId 编辑时排除自身主键，新增传 null
+     * @param context 当前提交的实体（可取 tenantId；可为 null）
+     */
+    boolean isCategoryNameDuplicated(String categoryName, String excludeId, MesXslEquipmentCategory context);
+
+    /**
+     * 按类别名称在未删除数据中查询一条（同租户；名称需 trim 后传入）。用于设备类型关联类别解析等。
+     *
+     * @param categoryName 类别名称
+     * @param tenantId 租户 ID，可为 null（不按租户过滤）
+     */
+    MesXslEquipmentCategory findOneActiveByNameAndTenant(String categoryName, Integer tenantId);
+}

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

@@ -0,0 +1,24 @@
+package org.jeecg.modules.xslmes.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.xslmes.entity.MesXslEquipmentPart;
+
+public interface IMesXslEquipmentPartService extends IService<MesXslEquipmentPart> {
+
+    /**
+     * 按部位代码在指定租户下查找一条未删除记录（用于设备小部位导入解析等）。
+     *
+     * @param partCode 部位代码（已 trim）
+     * @param tenantId 租户 ID，可为 null（不按租户过滤）
+     */
+    MesXslEquipmentPart findOneActiveByPartCodeAndTenant(String partCode, Integer tenantId);
+
+    /**
+     * 部位代码是否已被占用：同租户下未删除数据中部位代码不可重复。租户与 MybatisInterceptor 注入逻辑一致。
+     *
+     * @param partCode 部位代码（已 trim 后传入）
+     * @param excludeId 编辑时排除自身主键，新增传 null
+     * @param context 当前提交的实体（可取 tenantId；可为 null）
+     */
+    boolean isPartCodeDuplicated(String partCode, String excludeId, MesXslEquipmentPart context);
+}

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

@@ -0,0 +1,16 @@
+package org.jeecg.modules.xslmes.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.xslmes.entity.MesXslEquipmentSubPart;
+
+public interface IMesXslEquipmentSubPartService extends IService<MesXslEquipmentSubPart> {
+
+    /**
+     * 小部位代码是否已被占用：同租户下未删除数据中小部位代码不可重复。
+     *
+     * @param subPartCode 小部位代码（已 trim 后传入）
+     * @param excludeId 编辑时排除自身主键，新增传 null
+     * @param context 当前提交的实体（可取 tenantId；可为 null）
+     */
+    boolean isSubPartCodeDuplicated(String subPartCode, String excludeId, MesXslEquipmentSubPart context);
+}

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

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

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

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

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

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

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

@@ -0,0 +1,12 @@
+package org.jeecg.modules.xslmes.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.xslmes.entity.MesXslSparePart;
+
+public interface IMesXslSparePartService extends IService<MesXslSparePart> {
+
+    /**
+     * 备品件名称是否已被占用（同租户未删除数据中唯一）。
+     */
+    boolean isSparePartNameDuplicated(String sparePartName, String excludeId, MesXslSparePart context);
+}

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

@@ -0,0 +1,21 @@
+package org.jeecg.modules.xslmes.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.xslmes.entity.MesXslSparePartsCategory;
+
+public interface IMesXslSparePartsCategoryService extends IService<MesXslSparePartsCategory> {
+
+    /**
+     * 备品件类别名称是否已被占用（仅统计未删除：del_flag 为 0 或 null）。租户与 MybatisInterceptor 注入逻辑一致。
+     *
+     * @param categoryName 类别名称（已 trim 后传入）
+     * @param excludeId 编辑时排除自身主键，新增传 null
+     * @param context 当前提交的实体（可取 tenantId；可为 null）
+     */
+    boolean isCategoryNameDuplicated(String categoryName, String excludeId, MesXslSparePartsCategory context);
+
+    /**
+     * 按类别名称在未删除数据中查询一条（同租户），用于备品件信息导入解析等。
+     */
+    MesXslSparePartsCategory findOneActiveByCategoryNameAndTenant(String categoryName, Integer tenantId);
+}

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

@@ -12,4 +12,9 @@ public interface IMesXslUnitService extends IService<MesXslUnit> {
 
     /** 单位分类（sys_category）选中节点及其所有下级 id，用于列表筛选 */
     List<String> listDescendantCategoryIds(String rootId);
+
+    /**
+     * 按单位编码在未删除数据中查询一条（同租户），用于备品件信息导入解析等。
+     */
+    MesXslUnit findOneActiveByUnitCodeAndTenant(String unitCode, Integer tenantId);
 }

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

@@ -0,0 +1,84 @@
+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.MesXslEquipmentCategory;
+import org.jeecg.modules.xslmes.mapper.MesXslEquipmentCategoryMapper;
+import org.jeecg.modules.xslmes.service.IMesXslEquipmentCategoryService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class MesXslEquipmentCategoryServiceImpl extends ServiceImpl<MesXslEquipmentCategoryMapper, MesXslEquipmentCategory>
+        implements IMesXslEquipmentCategoryService {
+
+    //update-begin---author:jiangxh ---date:20260514  for：【MES】设备类别名称同租户唯一；仅统计未删除（del_flag=0 或 null）-----------
+    @Override
+    public boolean isCategoryNameDuplicated(String categoryName, String excludeId, MesXslEquipmentCategory context) {
+        if (oConvertUtils.isEmpty(categoryName)) {
+            return false;
+        }
+        Integer tenantId = resolveTenantId(context);
+        LambdaQueryWrapper<MesXslEquipmentCategory> w = new LambdaQueryWrapper<>();
+        w.eq(MesXslEquipmentCategory::getCategoryName, categoryName.trim());
+        w.and(
+                q ->
+                        q.eq(MesXslEquipmentCategory::getDelFlag, CommonConstant.DEL_FLAG_0)
+                                .or()
+                                .isNull(MesXslEquipmentCategory::getDelFlag));
+        if (oConvertUtils.isNotEmpty(excludeId)) {
+            w.ne(MesXslEquipmentCategory::getId, excludeId);
+        }
+        if (tenantId != null) {
+            w.eq(MesXslEquipmentCategory::getTenantId, tenantId);
+        }
+        return this.count(w) > 0;
+    }
+
+    //update-begin---author:jiangxh ---date:20260514  for：【MES】设备类型按类别名称解析关联，提供未删除单条查询-----------
+    @Override
+    public MesXslEquipmentCategory findOneActiveByNameAndTenant(String categoryName, Integer tenantId) {
+        if (oConvertUtils.isEmpty(categoryName)) {
+            return null;
+        }
+        LambdaQueryWrapper<MesXslEquipmentCategory> w = new LambdaQueryWrapper<>();
+        w.eq(MesXslEquipmentCategory::getCategoryName, categoryName.trim());
+        w.and(
+                q ->
+                        q.eq(MesXslEquipmentCategory::getDelFlag, CommonConstant.DEL_FLAG_0)
+                                .or()
+                                .isNull(MesXslEquipmentCategory::getDelFlag));
+        if (tenantId != null) {
+            w.eq(MesXslEquipmentCategory::getTenantId, tenantId);
+        }
+        w.last("LIMIT 1");
+        return this.getOne(w, false);
+    }
+    //update-end---author:jiangxh ---date:20260514  for：【MES】设备类型按类别名称解析关联，提供未删除单条查询-----------
+
+    private static Integer resolveTenantId(MesXslEquipmentCategory 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:20260514  for：【MES】设备类别名称同租户唯一；仅统计未删除（del_flag=0 或 null）-----------
+}

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

@@ -0,0 +1,84 @@
+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.MesXslEquipmentPart;
+import org.jeecg.modules.xslmes.mapper.MesXslEquipmentPartMapper;
+import org.jeecg.modules.xslmes.service.IMesXslEquipmentPartService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class MesXslEquipmentPartServiceImpl extends ServiceImpl<MesXslEquipmentPartMapper, MesXslEquipmentPart>
+        implements IMesXslEquipmentPartService {
+
+    //update-begin---author:jiangxh ---date:20260515  for：【MES】设备部位代码同租户不可重复；仅统计未删除（del_flag=0 或 null）-----------
+    @Override
+    public boolean isPartCodeDuplicated(String partCode, String excludeId, MesXslEquipmentPart context) {
+        if (oConvertUtils.isEmpty(partCode)) {
+            return false;
+        }
+        Integer tenantId = resolveTenantId(context);
+        LambdaQueryWrapper<MesXslEquipmentPart> w = new LambdaQueryWrapper<>();
+        w.eq(MesXslEquipmentPart::getPartCode, partCode.trim());
+        w.and(
+                q ->
+                        q.eq(MesXslEquipmentPart::getDelFlag, CommonConstant.DEL_FLAG_0)
+                                .or()
+                                .isNull(MesXslEquipmentPart::getDelFlag));
+        if (oConvertUtils.isNotEmpty(excludeId)) {
+            w.ne(MesXslEquipmentPart::getId, excludeId);
+        }
+        if (tenantId != null) {
+            w.eq(MesXslEquipmentPart::getTenantId, tenantId);
+        }
+        return this.count(w) > 0;
+    }
+
+    private static Integer resolveTenantId(MesXslEquipmentPart 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:20260515  for：【MES】设备部位代码同租户不可重复；仅统计未删除（del_flag=0 或 null）-----------
+
+    //update-begin---author:jiangxh ---date:20260515  for：【MES】设备部位按代码+租户查询单条，供设备小部位导入解析大部位-----------
+    @Override
+    public MesXslEquipmentPart findOneActiveByPartCodeAndTenant(String partCode, Integer tenantId) {
+        if (oConvertUtils.isEmpty(partCode)) {
+            return null;
+        }
+        LambdaQueryWrapper<MesXslEquipmentPart> w = new LambdaQueryWrapper<>();
+        w.eq(MesXslEquipmentPart::getPartCode, partCode.trim());
+        w.and(
+                q ->
+                        q.eq(MesXslEquipmentPart::getDelFlag, CommonConstant.DEL_FLAG_0)
+                                .or()
+                                .isNull(MesXslEquipmentPart::getDelFlag));
+        if (tenantId != null) {
+            w.eq(MesXslEquipmentPart::getTenantId, tenantId);
+        }
+        w.last("LIMIT 1");
+        return this.getOne(w, false);
+    }
+    //update-end---author:jiangxh ---date:20260515  for：【MES】设备部位按代码+租户查询单条，供设备小部位导入解析大部位-----------
+}

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslEquipmentSubPartServiceImpl.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.MesXslEquipmentSubPart;
+import org.jeecg.modules.xslmes.mapper.MesXslEquipmentSubPartMapper;
+import org.jeecg.modules.xslmes.service.IMesXslEquipmentSubPartService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class MesXslEquipmentSubPartServiceImpl extends ServiceImpl<MesXslEquipmentSubPartMapper, MesXslEquipmentSubPart>
+        implements IMesXslEquipmentSubPartService {
+
+    //update-begin---author:jiangxh ---date:20260515  for：【MES】设备小部位代码同租户不可重复；仅统计未删除（del_flag=0 或 null）-----------
+    @Override
+    public boolean isSubPartCodeDuplicated(String subPartCode, String excludeId, MesXslEquipmentSubPart context) {
+        if (oConvertUtils.isEmpty(subPartCode)) {
+            return false;
+        }
+        Integer tenantId = resolveTenantId(context);
+        LambdaQueryWrapper<MesXslEquipmentSubPart> w = new LambdaQueryWrapper<>();
+        w.eq(MesXslEquipmentSubPart::getSubPartCode, subPartCode.trim());
+        w.and(
+                q ->
+                        q.eq(MesXslEquipmentSubPart::getDelFlag, CommonConstant.DEL_FLAG_0)
+                                .or()
+                                .isNull(MesXslEquipmentSubPart::getDelFlag));
+        if (oConvertUtils.isNotEmpty(excludeId)) {
+            w.ne(MesXslEquipmentSubPart::getId, excludeId);
+        }
+        if (tenantId != null) {
+            w.eq(MesXslEquipmentSubPart::getTenantId, tenantId);
+        }
+        return this.count(w) > 0;
+    }
+
+    private static Integer resolveTenantId(MesXslEquipmentSubPart 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:20260515  for：【MES】设备小部位代码同租户不可重复；仅统计未删除（del_flag=0 或 null）-----------
+}

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslEquipmentTypeServiceImpl.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.MesXslEquipmentType;
+import org.jeecg.modules.xslmes.mapper.MesXslEquipmentTypeMapper;
+import org.jeecg.modules.xslmes.service.IMesXslEquipmentTypeService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class MesXslEquipmentTypeServiceImpl extends ServiceImpl<MesXslEquipmentTypeMapper, MesXslEquipmentType>
+        implements IMesXslEquipmentTypeService {
+
+    //update-begin---author:jiangxh ---date:20260514  for：【MES】设备类型名称同租户唯一；仅统计未删除（del_flag=0 或 null）-----------
+    @Override
+    public boolean isTypeNameDuplicated(String typeName, String excludeId, MesXslEquipmentType context) {
+        if (oConvertUtils.isEmpty(typeName)) {
+            return false;
+        }
+        Integer tenantId = resolveTenantId(context);
+        LambdaQueryWrapper<MesXslEquipmentType> w = new LambdaQueryWrapper<>();
+        w.eq(MesXslEquipmentType::getTypeName, typeName.trim());
+        w.and(
+                q ->
+                        q.eq(MesXslEquipmentType::getDelFlag, CommonConstant.DEL_FLAG_0)
+                                .or()
+                                .isNull(MesXslEquipmentType::getDelFlag));
+        if (oConvertUtils.isNotEmpty(excludeId)) {
+            w.ne(MesXslEquipmentType::getId, excludeId);
+        }
+        if (tenantId != null) {
+            w.eq(MesXslEquipmentType::getTenantId, tenantId);
+        }
+        return this.count(w) > 0;
+    }
+
+    private static Integer resolveTenantId(MesXslEquipmentType 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:20260514  for：【MES】设备类型名称同租户唯一；仅统计未删除（del_flag=0 或 null）-----------
+}

jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslManufacturerServiceImpl.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.MesXslManufacturer;
+import org.jeecg.modules.xslmes.mapper.MesXslManufacturerMapper;
+import org.jeecg.modules.xslmes.service.IMesXslManufacturerService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class MesXslManufacturerServiceImpl extends ServiceImpl<MesXslManufacturerMapper, MesXslManufacturer>
+        implements IMesXslManufacturerService {
+
+    //update-begin---author:jiangxh ---date:20260515  for：【MES】厂家名称同租户不可重复；仅统计未删除（del_flag=0 或 null）-----------
+    @Override
+    public boolean isManufacturerNameDuplicated(String manufacturerName, String excludeId, MesXslManufacturer context) {
+        if (oConvertUtils.isEmpty(manufacturerName)) {
+            return false;
+        }
+        Integer tenantId = resolveTenantId(context);
+        LambdaQueryWrapper<MesXslManufacturer> w = new LambdaQueryWrapper<>();
+        w.eq(MesXslManufacturer::getManufacturerName, manufacturerName.trim());
+        w.and(
+                q ->
+                        q.eq(MesXslManufacturer::getDelFlag, CommonConstant.DEL_FLAG_0)
+                                .or()
+                                .isNull(MesXslManufacturer::getDelFlag));
+        if (oConvertUtils.isNotEmpty(excludeId)) {
+            w.ne(MesXslManufacturer::getId, excludeId);
+        }
+        if (tenantId != null) {
+            w.eq(MesXslManufacturer::getTenantId, tenantId);
+        }
+        return this.count(w) > 0;
+    }
+
+    private static Integer resolveTenantId(MesXslManufacturer 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:20260515  for：【MES】厂家名称同租户不可重复；仅统计未删除（del_flag=0 或 null）-----------
+}

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

@@ -0,0 +1,65 @@
+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.MesXslProcessOperation;
+import org.jeecg.modules.xslmes.mapper.MesXslProcessOperationMapper;
+import org.jeecg.modules.xslmes.service.IMesXslProcessOperationService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class MesXslProcessOperationServiceImpl extends ServiceImpl<MesXslProcessOperationMapper, MesXslProcessOperation>
+        implements IMesXslProcessOperationService {
+
+    //update-begin---author:jiangxh ---date:20260514  for：【MES】工序编码同租户唯一；仅统计未删除（del_flag=0 或 null）-----------
+    @Override
+    public boolean isOperationCodeDuplicated(String operationCode, String excludeId, MesXslProcessOperation context) {
+        if (oConvertUtils.isEmpty(operationCode)) {
+            return false;
+        }
+        Integer tenantId = resolveTenantId(context);
+        LambdaQueryWrapper<MesXslProcessOperation> w = new LambdaQueryWrapper<>();
+        w.eq(MesXslProcessOperation::getOperationCode, operationCode.trim());
+        // 仅与「未删除」数据判重：del_flag=0 或历史空值视为正常行，排除已删除（del_flag=1）
+        w.and(
+                q ->
+                        q.eq(MesXslProcessOperation::getDelFlag, CommonConstant.DEL_FLAG_0)
+                                .or()
+                                .isNull(MesXslProcessOperation::getDelFlag));
+        if (oConvertUtils.isNotEmpty(excludeId)) {
+            w.ne(MesXslProcessOperation::getId, excludeId);
+        }
+        if (tenantId != null) {
+            w.eq(MesXslProcessOperation::getTenantId, tenantId);
+        }
+        return this.count(w) > 0;
+    }
+
+    /** 与 MybatisInterceptor 注入 tenant_id 的取值顺序尽量一致，避免前端未传 tenantId 时查不到已存在数据 */
+    private static Integer resolveTenantId(MesXslProcessOperation 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:20260514  for：【MES】工序编码同租户唯一；仅统计未删除（del_flag=0 或 null）-----------
+}

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

@@ -0,0 +1,62 @@
+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.MesXslSparePart;
+import org.jeecg.modules.xslmes.mapper.MesXslSparePartMapper;
+import org.jeecg.modules.xslmes.service.IMesXslSparePartService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class MesXslSparePartServiceImpl extends ServiceImpl<MesXslSparePartMapper, MesXslSparePart> implements IMesXslSparePartService {
+
+    //update-begin---author:jiangxh ---date:20260515  for：【MES】备品件名称同租户不可重复；仅统计未删除（del_flag=0 或 null）-----------
+    @Override
+    public boolean isSparePartNameDuplicated(String sparePartName, String excludeId, MesXslSparePart context) {
+        if (oConvertUtils.isEmpty(sparePartName)) {
+            return false;
+        }
+        Integer tenantId = resolveTenantId(context);
+        LambdaQueryWrapper<MesXslSparePart> w = new LambdaQueryWrapper<>();
+        w.eq(MesXslSparePart::getSparePartName, sparePartName.trim());
+        w.and(
+                q ->
+                        q.eq(MesXslSparePart::getDelFlag, CommonConstant.DEL_FLAG_0)
+                                .or()
+                                .isNull(MesXslSparePart::getDelFlag));
+        if (oConvertUtils.isNotEmpty(excludeId)) {
+            w.ne(MesXslSparePart::getId, excludeId);
+        }
+        if (tenantId != null) {
+            w.eq(MesXslSparePart::getTenantId, tenantId);
+        }
+        return this.count(w) > 0;
+    }
+
+    private static Integer resolveTenantId(MesXslSparePart 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:20260515  for：【MES】备品件名称同租户不可重复；仅统计未删除（del_flag=0 或 null）-----------
+}

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

@@ -0,0 +1,84 @@
+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.MesXslSparePartsCategory;
+import org.jeecg.modules.xslmes.mapper.MesXslSparePartsCategoryMapper;
+import org.jeecg.modules.xslmes.service.IMesXslSparePartsCategoryService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class MesXslSparePartsCategoryServiceImpl extends ServiceImpl<MesXslSparePartsCategoryMapper, MesXslSparePartsCategory>
+        implements IMesXslSparePartsCategoryService {
+
+    //update-begin---author:jiangxh ---date:20260515  for：【MES】备品件类别名称同租户不可重复；仅统计未删除（del_flag=0 或 null）-----------
+    @Override
+    public boolean isCategoryNameDuplicated(String categoryName, String excludeId, MesXslSparePartsCategory context) {
+        if (oConvertUtils.isEmpty(categoryName)) {
+            return false;
+        }
+        Integer tenantId = resolveTenantId(context);
+        LambdaQueryWrapper<MesXslSparePartsCategory> w = new LambdaQueryWrapper<>();
+        w.eq(MesXslSparePartsCategory::getCategoryName, categoryName.trim());
+        w.and(
+                q ->
+                        q.eq(MesXslSparePartsCategory::getDelFlag, CommonConstant.DEL_FLAG_0)
+                                .or()
+                                .isNull(MesXslSparePartsCategory::getDelFlag));
+        if (oConvertUtils.isNotEmpty(excludeId)) {
+            w.ne(MesXslSparePartsCategory::getId, excludeId);
+        }
+        if (tenantId != null) {
+            w.eq(MesXslSparePartsCategory::getTenantId, tenantId);
+        }
+        return this.count(w) > 0;
+    }
+
+    //update-begin---author:jiangxh ---date:20260515  for：【MES】备品件类别按名称+租户查询单条，供备品件信息导入解析-----------
+    @Override
+    public MesXslSparePartsCategory findOneActiveByCategoryNameAndTenant(String categoryName, Integer tenantId) {
+        if (oConvertUtils.isEmpty(categoryName)) {
+            return null;
+        }
+        LambdaQueryWrapper<MesXslSparePartsCategory> w = new LambdaQueryWrapper<>();
+        w.eq(MesXslSparePartsCategory::getCategoryName, categoryName.trim());
+        w.and(
+                q ->
+                        q.eq(MesXslSparePartsCategory::getDelFlag, CommonConstant.DEL_FLAG_0)
+                                .or()
+                                .isNull(MesXslSparePartsCategory::getDelFlag));
+        if (tenantId != null) {
+            w.eq(MesXslSparePartsCategory::getTenantId, tenantId);
+        }
+        w.last("LIMIT 1");
+        return this.getOne(w, false);
+    }
+    //update-end---author:jiangxh ---date:20260515  for：【MES】备品件类别按名称+租户查询单条，供备品件信息导入解析-----------
+
+    private static Integer resolveTenantId(MesXslSparePartsCategory 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:20260515  for：【MES】备品件类别名称同租户不可重复；仅统计未删除（del_flag=0 或 null）-----------
+}

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

@@ -1,6 +1,8 @@
 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.util.oConvertUtils;
 import org.jeecg.modules.xslmes.entity.MesXslUnit;
 import org.jeecg.modules.xslmes.mapper.MesXslUnitMapper;
 import org.jeecg.modules.xslmes.service.IMesXslUnitService;
@@ -18,4 +20,20 @@ public class MesXslUnitServiceImpl extends ServiceImpl<MesXslUnitMapper, MesXslU
     public List<String> listDescendantCategoryIds(String rootId) {
         return baseMapper.listDescendantCategoryIds(rootId);
     }
+
+    //update-begin---author:jiangxh ---date:20260515  for：【MES】单位按编码+租户查询单条，供备品件信息导入解析-----------
+    @Override
+    public MesXslUnit findOneActiveByUnitCodeAndTenant(String unitCode, Integer tenantId) {
+        if (oConvertUtils.isEmpty(unitCode)) {
+            return null;
+        }
+        LambdaQueryWrapper<MesXslUnit> w = new LambdaQueryWrapper<>();
+        w.eq(MesXslUnit::getUnitCode, unitCode.trim());
+        if (tenantId != null) {
+            w.eq(MesXslUnit::getTenantId, tenantId);
+        }
+        w.last("LIMIT 1");
+        return this.getOne(w, false);
+    }
+    //update-end---author:jiangxh ---date:20260515  for：【MES】单位按编码+租户查询单条，供备品件信息导入解析-----------
 }

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

@@ -0,0 +1,197 @@
+-- author:jiangxh---date:20260513--for: 【MES】MES基础资料下新增工序管理（mes_process_operation，与原材料检验项目同级菜单） ---
+jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_53__mes_process_operation.sql
+jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mes/material/entity/MesProcessOperation.java
+jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mes/material/mapper/MesProcessOperationMapper.java
+jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mes/material/service/IMesProcessOperationService.java
+jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mes/material/service/impl/MesProcessOperationServiceImpl.java
+jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mes/material/controller/MesProcessOperationController.java
+jeecg-boot/db/mes-process-operation.sql
+jeecgboot-vue3/src/views/mes/processoperation/index.vue
+jeecgboot-vue3/src/views/mes/material/MesProcessOperationList.vue
+jeecgboot-vue3/src/views/mes/material/MesProcessOperation.data.ts
+jeecgboot-vue3/src/views/mes/material/MesProcessOperation.api.ts
+jeecgboot-vue3/src/views/mes/material/modules/MesProcessOperationModal.vue
+
+-- author:jiangxh---date:20260513--for: 【MES】补全工序管理后端/前端/Flyway 源码文件 ---
+jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_53__mes_process_operation.sql
+jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mes/material/entity/MesProcessOperation.java
+jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mes/material/mapper/MesProcessOperationMapper.java
+jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mes/material/service/IMesProcessOperationService.java
+jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mes/material/service/impl/MesProcessOperationServiceImpl.java
+jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mes/material/controller/MesProcessOperationController.java
+jeecg-boot/db/mes-process-operation.sql
+jeecgboot-vue3/src/views/mes/processoperation/index.vue
+jeecgboot-vue3/src/views/mes/material/MesProcessOperationList.vue
+jeecgboot-vue3/src/views/mes/material/MesProcessOperation.data.ts
+jeecgboot-vue3/src/views/mes/material/MesProcessOperation.api.ts
+jeecgboot-vue3/src/views/mes/material/modules/MesProcessOperationModal.vue
+
+-- author:jiangxh---date:20260513--for: 【MES】工序管理-工序编码同租户下不可重复 ---
+jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mes/material/service/IMesProcessOperationService.java
+jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mes/material/service/impl/MesProcessOperationServiceImpl.java
+jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mes/material/controller/MesProcessOperationController.java
+
+-- author:jiangxh---date:20260514--for: 【MES】工序管理迁至 jeecg-module-xslmes，前端 xslmes/mesXslProcessOperation，菜单挂 MES基础资料、租户1002 授权脚本，Flyway V3.9.2_54 同步路由组件 ---
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslProcessOperation.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslProcessOperationMapper.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslProcessOperationService.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslProcessOperationServiceImpl.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslProcessOperationController.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/package-info.java
+jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_54__mes_process_operation_menu_xslmes_mes_base.sql
+jeecg-boot/db/mes-process-operation-menu-permission.sql
+jeecgboot-vue3/src/views/xslmes/mesXslProcessOperation/MesXslProcessOperationList.vue
+jeecgboot-vue3/src/views/xslmes/mesXslProcessOperation/MesXslProcessOperation.data.ts
+jeecgboot-vue3/src/views/xslmes/mesXslProcessOperation/MesXslProcessOperation.api.ts
+jeecgboot-vue3/src/views/xslmes/mesXslProcessOperation/components/MesXslProcessOperationModal.vue
+jeecgboot-vue3/src/views/mes/processoperation/index.vue
+
+-- author:jiangxh---date:20260514--for: 【MES】mes-process-operation-menu-permission.sql 增补建表段，避免只执行菜单脚本未建表 ---
+jeecg-boot/db/mes-process-operation-menu-permission.sql
+jeecg-boot/db/mes-process-operation.sql
+
+-- author:jiangxh---date:20260514--for: 【MES】工序编码唯一：排除已删除、表单异步校验接口、Excel 导入校验 ---
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslProcessOperationServiceImpl.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslProcessOperationService.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslProcessOperationController.java
+jeecgboot-vue3/src/views/xslmes/mesXslProcessOperation/MesXslProcessOperation.api.ts
+jeecgboot-vue3/src/views/xslmes/mesXslProcessOperation/MesXslProcessOperation.data.ts
+
+-- author:jiangxh---date:20260514--for: 【MES】MES基础资料下新增设备类别（mes_xsl_equipment_category，关联工序、点检/保养字典、类别名称同租户唯一） ---
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslEquipmentCategory.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslEquipmentCategoryMapper.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslEquipmentCategoryService.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslEquipmentCategoryServiceImpl.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslEquipmentCategoryController.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/package-info.java
+jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_55__mes_xsl_equipment_category.sql
+jeecg-boot/db/mes-xsl-equipment-category-menu-permission.sql
+jeecg-boot/db/mes-xsl-equipment-category.sql
+jeecgboot-vue3/src/views/xslmes/mesXslEquipmentCategory/MesXslEquipmentCategoryList.vue
+jeecgboot-vue3/src/views/xslmes/mesXslEquipmentCategory/MesXslEquipmentCategory.data.ts
+jeecgboot-vue3/src/views/xslmes/mesXslEquipmentCategory/MesXslEquipmentCategory.api.ts
+jeecgboot-vue3/src/views/xslmes/mesXslEquipmentCategory/components/MesXslEquipmentCategoryModal.vue
+jeecgboot-vue3/src/views/xslmes/mesXslEquipmentCategory/components/MesXslProcessOperationSelectModal.vue
+
+-- author:jiangxh---date:20260514--for: 【MES】MES基础资料下新增设备类型（mes_xsl_equipment_type，关联工序与设备类别、类型名称同租户唯一） ---
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslEquipmentType.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslEquipmentTypeMapper.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslEquipmentTypeService.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslEquipmentTypeServiceImpl.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslEquipmentTypeController.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslEquipmentCategoryService.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslEquipmentCategoryServiceImpl.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/package-info.java
+jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_56__mes_xsl_equipment_type.sql
+jeecg-boot/db/mes-xsl-equipment-type-menu-permission.sql
+jeecg-boot/db/mes-xsl-equipment-type.sql
+jeecgboot-vue3/src/views/xslmes/mesXslEquipmentType/MesXslEquipmentTypeList.vue
+jeecgboot-vue3/src/views/xslmes/mesXslEquipmentType/MesXslEquipmentType.data.ts
+jeecgboot-vue3/src/views/xslmes/mesXslEquipmentType/MesXslEquipmentType.api.ts
+jeecgboot-vue3/src/views/xslmes/mesXslEquipmentType/components/MesXslEquipmentTypeModal.vue
+jeecgboot-vue3/src/views/xslmes/mesXslEquipmentType/components/MesXslEquipmentCategorySelectModal.vue
+
+-- author:jiangxh---date:20260515--for: 【MES】MES基础资料下新增设备部位（mes_xsl_equipment_part，关联设备类别、部位代码同租户唯一、是否启用xslmes_unit_status） ---
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslEquipmentPart.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslEquipmentPartMapper.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslEquipmentPartService.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslEquipmentPartServiceImpl.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslEquipmentPartController.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/package-info.java
+jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_57__mes_xsl_equipment_part.sql
+jeecg-boot/db/mes-xsl-equipment-part-menu-permission.sql
+jeecg-boot/db/mes-xsl-equipment-part.sql
+jeecgboot-vue3/src/views/xslmes/mesXslEquipmentPart/MesXslEquipmentPartList.vue
+jeecgboot-vue3/src/views/xslmes/mesXslEquipmentPart/MesXslEquipmentPart.data.ts
+jeecgboot-vue3/src/views/xslmes/mesXslEquipmentPart/MesXslEquipmentPart.api.ts
+jeecgboot-vue3/src/views/xslmes/mesXslEquipmentPart/components/MesXslEquipmentPartModal.vue
+
+-- author:jiangxh---date:20260515--for: 【MES】设备部位：部位代码不能重复（文案与保存/导入顺序、选类别后重验代码） ---
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslEquipmentPartController.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslEquipmentPartService.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslEquipmentPartServiceImpl.java
+jeecgboot-vue3/src/views/xslmes/mesXslEquipmentPart/MesXslEquipmentPart.data.ts
+jeecgboot-vue3/src/views/xslmes/mesXslEquipmentPart/components/MesXslEquipmentPartModal.vue
+
+-- author:jiangxh---date:20260515--for: 【MES】设备部位：明确部位代码仅同租户全局唯一（不按设备类别）；去掉选类别后重验部位代码 ---
+jeecgboot-vue3/src/views/xslmes/mesXslEquipmentPart/MesXslEquipmentPart.data.ts
+jeecgboot-vue3/src/views/xslmes/mesXslEquipmentPart/components/MesXslEquipmentPartModal.vue
+
+-- author:jiangxh---date:20260515--for: 【MES】设备部位：部门名称字段改为部位名称（dept_name->part_name，实体partName） ---
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslEquipmentPart.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslEquipmentPartController.java
+jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_58__mes_xsl_equipment_part_dept_name_to_part_name.sql
+jeecg-boot/db/mes-xsl-equipment-part.sql
+jeecg-boot/db/mes-xsl-equipment-part-menu-permission.sql
+jeecgboot-vue3/src/views/xslmes/mesXslEquipmentPart/MesXslEquipmentPart.data.ts
+
+-- author:jiangxh---date:20260515--for: 【MES】新增设备小部位（mes_xsl_equipment_sub_part，挂 MES 基础资料，类别/大部位冗余、小部位代码同租户唯一） ---
+jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_59__mes_xsl_equipment_sub_part.sql
+jeecg-boot/db/mes-xsl-equipment-sub-part-menu-permission.sql
+jeecg-boot/db/mes-xsl-equipment-sub-part.sql
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslEquipmentSubPart.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslEquipmentSubPartMapper.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslEquipmentSubPartService.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslEquipmentSubPartServiceImpl.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslEquipmentSubPartController.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslEquipmentPartService.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslEquipmentPartServiceImpl.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/package-info.java
+jeecgboot-vue3/src/views/xslmes/mesXslEquipmentSubPart/MesXslEquipmentSubPartList.vue
+jeecgboot-vue3/src/views/xslmes/mesXslEquipmentSubPart/MesXslEquipmentSubPart.data.ts
+jeecgboot-vue3/src/views/xslmes/mesXslEquipmentSubPart/MesXslEquipmentSubPart.api.ts
+jeecgboot-vue3/src/views/xslmes/mesXslEquipmentSubPart/components/MesXslEquipmentSubPartModal.vue
+jeecgboot-vue3/src/views/xslmes/mesXslEquipmentSubPart/components/MesXslEquipmentPartSelectModal.vue
+
+-- author:jiangxh---date:20260515--for: 【MES】设备小部位菜单挂到 MES XSL（XSLMES管理）父级下 ---
+jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_60__mes_xsl_equipment_sub_part_menu_xslmes_root.sql
+jeecg-boot/db/mes-xsl-equipment-sub-part-menu-permission.sql
+
+-- author:jiangxh---date:20260515--for: 【MES】新增备品件类别（mes_xsl_spare_parts_category，挂 MES 基础资料，类别名称同租户唯一） ---
+jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_61__mes_xsl_spare_parts_category.sql
+jeecg-boot/db/mes-xsl-spare-parts-category-menu-permission.sql
+jeecg-boot/db/mes-xsl-spare-parts-category.sql
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslSparePartsCategory.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslSparePartsCategoryMapper.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslSparePartsCategoryService.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslSparePartsCategoryServiceImpl.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslSparePartsCategoryController.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/package-info.java
+jeecgboot-vue3/src/views/xslmes/mesXslSparePartsCategory/MesXslSparePartsCategoryList.vue
+jeecgboot-vue3/src/views/xslmes/mesXslSparePartsCategory/MesXslSparePartsCategory.data.ts
+jeecgboot-vue3/src/views/xslmes/mesXslSparePartsCategory/MesXslSparePartsCategory.api.ts
+jeecgboot-vue3/src/views/xslmes/mesXslSparePartsCategory/components/MesXslSparePartsCategoryModal.vue
+
+-- author:jiangxh---date:20260515--for: 【MES】新增备品件信息（mes_xsl_spare_part，挂 MES 基础资料，名称同租户唯一、类别与单位冗余、库存上下限） ---
+jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_62__mes_xsl_spare_part.sql
+jeecg-boot/db/mes-xsl-spare-part-menu-permission.sql
+jeecg-boot/db/mes-xsl-spare-part.sql
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslSparePart.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslSparePartMapper.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslSparePartService.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslSparePartServiceImpl.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslSparePartController.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslSparePartsCategoryService.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslSparePartsCategoryServiceImpl.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslUnitService.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslUnitServiceImpl.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/package-info.java
+jeecgboot-vue3/src/views/xslmes/mesXslSparePartsCategory/components/MesXslSparePartsCategorySelectModal.vue
+jeecgboot-vue3/src/views/xslmes/mesXslSparePart/MesXslSparePartList.vue
+jeecgboot-vue3/src/views/xslmes/mesXslSparePart/MesXslSparePart.data.ts
+jeecgboot-vue3/src/views/xslmes/mesXslSparePart/MesXslSparePart.api.ts
+jeecgboot-vue3/src/views/xslmes/mesXslSparePart/components/MesXslSparePartModal.vue
+-- author:jiangxh---date:20260515--for: 【MES】厂家信息（厂家类别字典、名称同租户唯一、是否有效） ---
+jeecg-boot/db/mes-xsl-manufacturer-menu-permission.sql
+jeecg-boot/db/mes-xsl-manufacturer.sql
+jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_63__mes_xsl_manufacturer.sql
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslManufacturer.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslManufacturerMapper.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslManufacturerService.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslManufacturerServiceImpl.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslManufacturerController.java
+jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/package-info.java
+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

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

@@ -0,0 +1,23 @@
+-- MES 工序管理：将菜单挂到「MES基础资料」下，url/component 对齐 xslmes 前端（与客户管理同目录风格）
+-- 依赖：V3.9.2_53 已创建 mes_process_operation 表及 sys_permission id 1860000000000000060～066
+
+UPDATE `sys_permission` p
+INNER JOIN (
+  SELECT COALESCE(
+    (SELECT MIN(s2.`id`) FROM `sys_permission` s2
+     WHERE s2.`del_flag` = 0 AND s2.`menu_type` = 0
+       AND s2.`name` IN ('MES基础资料', 'MES资料')),
+    '1860000000000000001'
+  ) AS `pid`
+  FROM DUAL
+) x ON 1 = 1
+SET p.`parent_id` = x.`pid`,
+    p.`url` = '/xslmes/mesXslProcessOperation',
+    p.`component` = 'xslmes/mesXslProcessOperation/MesXslProcessOperationList',
+    p.`component_name` = NULL,
+    p.`is_leaf` = 0,
+    p.`update_by` = 'admin',
+    p.`update_time` = NOW()
+WHERE p.`id` = '1860000000000000060';
+
+UPDATE `sys_permission` SET `name` = '新增' WHERE `id` = '1860000000000000061' AND `name` = '添加';

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

@@ -0,0 +1,98 @@
+-- MES 设备类别：建表 + 字典 + 菜单 + 按钮 + 租户 admin 授权（幂等片段可重复执行）
+-- 权限前缀：mes:mes_xsl_equipment_category:*（与 Controller、前端 v-auth 一致）
+-- 依赖：mes_process_operation 表已存在；父菜单「MES基础资料」或「MES资料」
+
+SET NAMES utf8mb4;
+
+CREATE TABLE IF NOT EXISTS `mes_xsl_equipment_category` (
+  `id` varchar(32) NOT NULL COMMENT '主键',
+  `category_name` varchar(128) NOT NULL COMMENT '设备类别名称',
+  `process_operation_id` varchar(32) NOT NULL COMMENT '所属工序主键 mes_process_operation.id',
+  `process_operation_name` varchar(128) DEFAULT NULL COMMENT '工序名称冗余展示',
+  `inspect_distinct` varchar(32) NOT NULL COMMENT '点检区分 字典xslmes_equipment_inspect_distinct：generic通用 distinct区分',
+  `maintain_distinct` varchar(32) NOT NULL COMMENT '保养区分 字典xslmes_equipment_maintain_distinct：maintain保养 distinct区分',
+  `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_mec_tenant_name` (`tenant_id`, `category_name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES设备类别';
+
+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_inspect_distinct', '设备类别点检区分：通用/区分', 0, 'admin', NOW(), 0, 0
+WHERE NOT EXISTS (SELECT 1 FROM `sys_dict` WHERE `dict_code` = 'xslmes_equipment_inspect_distinct' 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, '通用', 'generic', 1, 1, 'admin', NOW()
+FROM `sys_dict` d
+WHERE d.`dict_code` = 'xslmes_equipment_inspect_distinct'
+  AND NOT EXISTS (SELECT 1 FROM `sys_dict_item` i WHERE i.`dict_id` = d.`id` AND i.`item_value` = 'generic');
+
+INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `sort_order`, `status`, `create_by`, `create_time`)
+SELECT REPLACE(UUID(), '-', ''), d.id, '区分', 'distinct', 2, 1, 'admin', NOW()
+FROM `sys_dict` d
+WHERE d.`dict_code` = 'xslmes_equipment_inspect_distinct'
+  AND NOT EXISTS (SELECT 1 FROM `sys_dict_item` i WHERE i.`dict_id` = d.`id` AND i.`item_value` = 'distinct');
+
+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_maintain_distinct', '设备类别保养区分：保养/区分', 0, 'admin', NOW(), 0, 0
+WHERE NOT EXISTS (SELECT 1 FROM `sys_dict` WHERE `dict_code` = 'xslmes_equipment_maintain_distinct' 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, '保养', 'maintain', 1, 1, 'admin', NOW()
+FROM `sys_dict` d
+WHERE d.`dict_code` = 'xslmes_equipment_maintain_distinct'
+  AND NOT EXISTS (SELECT 1 FROM `sys_dict_item` i WHERE i.`dict_id` = d.`id` AND i.`item_value` = 'maintain');
+
+INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `sort_order`, `status`, `create_by`, `create_time`)
+SELECT REPLACE(UUID(), '-', ''), d.id, '区分', 'distinct', 2, 1, 'admin', NOW()
+FROM `sys_dict` d
+WHERE d.`dict_code` = 'xslmes_equipment_maintain_distinct'
+  AND NOT EXISTS (SELECT 1 FROM `sys_dict_item` i WHERE i.`dict_id` = d.`id` AND i.`item_value` = 'distinct');
+
+SET @mes_tenant_id = 1002;
+
+SET @mes_base_pid = (
+  SELECT MIN(`id`) FROM `sys_permission`
+  WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` IN ('MES基础资料', 'MES资料')
+);
+SET @mes_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 ('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`), `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
+('1860000000000000071', '1860000000000000070', '新增', 2, 'mes:mes_xsl_equipment_category:add', '1', '1', 0, 'admin', NOW()),
+('1860000000000000072', '1860000000000000070', '编辑', 2, 'mes:mes_xsl_equipment_category:edit', '1', '1', 0, 'admin', NOW()),
+('1860000000000000073', '1860000000000000070', '删除', 2, 'mes:mes_xsl_equipment_category:delete', '1', '1', 0, 'admin', NOW()),
+('1860000000000000074', '1860000000000000070', '批量删除', 2, 'mes:mes_xsl_equipment_category:deleteBatch', '1', '1', 0, 'admin', NOW()),
+('1860000000000000075', '1860000000000000070', '导出', 2, 'mes:mes_xsl_equipment_category:exportXls', '1', '1', 0, 'admin', NOW()),
+('1860000000000000076', '1860000000000000070', '导入', 2, 'mes:mes_xsl_equipment_category: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 (
+    '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_56__mes_xsl_equipment_type.sql

@@ -0,0 +1,65 @@
+-- MES 设备类型：建表 + 菜单 + 按钮 + 租户 admin 授权（与 Flyway V3.9.2_56 内容一致，可手工执行）
+-- 权限前缀：mes:mes_xsl_equipment_type:*（与 Controller、前端 v-auth 一致）
+-- 依赖：mes_process_operation、mes_xsl_equipment_category 已存在；父菜单「MES基础资料」或「MES资料」
+SET NAMES utf8mb4;
+
+CREATE TABLE IF NOT EXISTS `mes_xsl_equipment_type` (
+  `id` varchar(32) NOT NULL COMMENT '主键',
+  `type_name` varchar(128) NOT NULL COMMENT '设备类型名称',
+  `process_operation_id` varchar(32) NOT NULL COMMENT '所属工序主键 mes_process_operation.id',
+  `process_operation_name` varchar(128) DEFAULT NULL COMMENT '工序名称冗余展示',
+  `equipment_category_id` varchar(32) NOT NULL COMMENT '所属设备类别主键 mes_xsl_equipment_category.id',
+  `equipment_category_name` varchar(128) DEFAULT NULL COMMENT '设备类别名称冗余展示',
+  `tenant_id` int DEFAULT NULL COMMENT '租户',
+  `sys_org_code` varchar(64) DEFAULT NULL COMMENT '部门',
+  `create_by` varchar(32) DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(32) DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `del_flag` int DEFAULT '0' COMMENT '删除标记（0正常1删除）',
+  PRIMARY KEY (`id`),
+  KEY `idx_met_tenant_typename` (`tenant_id`, `type_name`)
+) 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 ('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`), `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
+('1860000000000000078', '1860000000000000077', '新增', 2, 'mes:mes_xsl_equipment_type:add', '1', '1', 0, 'admin', NOW()),
+('1860000000000000079', '1860000000000000077', '编辑', 2, 'mes:mes_xsl_equipment_type:edit', '1', '1', 0, 'admin', NOW()),
+('1860000000000000080', '1860000000000000077', '删除', 2, 'mes:mes_xsl_equipment_type:delete', '1', '1', 0, 'admin', NOW()),
+('1860000000000000081', '1860000000000000077', '批量删除', 2, 'mes:mes_xsl_equipment_type:deleteBatch', '1', '1', 0, 'admin', NOW()),
+('1860000000000000082', '1860000000000000077', '导出', 2, 'mes:mes_xsl_equipment_type:exportXls', '1', '1', 0, 'admin', NOW()),
+('1860000000000000083', '1860000000000000077', '导入', 2, 'mes:mes_xsl_equipment_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 (
+    '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_57__mes_xsl_equipment_part.sql

@@ -0,0 +1,66 @@
+-- MES 设备部位：建表 + 菜单 + 按钮 + 租户 admin 授权（与 Flyway V3.9.2_57 内容一致，可手工执行）
+-- 权限前缀：mes:mes_xsl_equipment_part:*（与 Controller、前端 v-auth 一致）
+-- 依赖：mes_xsl_equipment_category；父菜单「MES基础资料」或「MES资料」
+SET NAMES utf8mb4;
+
+CREATE TABLE IF NOT EXISTS `mes_xsl_equipment_part` (
+  `id` varchar(32) NOT NULL COMMENT '主键',
+  `equipment_category_id` varchar(32) NOT NULL COMMENT '所属设备类别主键 mes_xsl_equipment_category.id',
+  `equipment_category_name` varchar(128) DEFAULT NULL COMMENT '设备类别名称冗余展示',
+  `dept_name` varchar(128) NOT NULL COMMENT '部门名称',
+  `part_code` varchar(64) NOT NULL COMMENT '部位代码（同租户未删除数据中唯一）',
+  `part_description` varchar(500) DEFAULT NULL COMMENT '部位描述',
+  `enable_status` varchar(1) NOT NULL DEFAULT '0' COMMENT '是否启用（字典xslmes_unit_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_mep_tenant_partcode` (`tenant_id`, `part_code`)
+) 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 ('1860000000000000084', @mes_base_pid, '设备部位', '/xslmes/mesXslEquipmentPart', 'xslmes/mesXslEquipmentPart/MesXslEquipmentPartList', NULL, 1, NULL, '1', 12, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW())
+ON DUPLICATE KEY UPDATE
+`parent_id` = VALUES(`parent_id`), `name` = VALUES(`name`), `url` = VALUES(`url`), `component` = VALUES(`component`), `component_name` = VALUES(`component_name`),
+`menu_type` = VALUES(`menu_type`), `perms` = VALUES(`perms`), `perms_type` = VALUES(`perms_type`), `sort_no` = VALUES(`sort_no`),
+`is_route` = VALUES(`is_route`), `is_leaf` = VALUES(`is_leaf`), `hidden` = VALUES(`hidden`), `status` = VALUES(`status`), `del_flag` = VALUES(`del_flag`),
+`keep_alive` = VALUES(`keep_alive`), `internal_or_external` = VALUES(`internal_or_external`);
+
+INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `status`, `del_flag`, `create_by`, `create_time`) VALUES
+('1860000000000000085', '1860000000000000084', '新增', 2, 'mes:mes_xsl_equipment_part:add', '1', '1', 0, 'admin', NOW()),
+('1860000000000000086', '1860000000000000084', '编辑', 2, 'mes:mes_xsl_equipment_part:edit', '1', '1', 0, 'admin', NOW()),
+('1860000000000000087', '1860000000000000084', '删除', 2, 'mes:mes_xsl_equipment_part:delete', '1', '1', 0, 'admin', NOW()),
+('1860000000000000088', '1860000000000000084', '批量删除', 2, 'mes:mes_xsl_equipment_part:deleteBatch', '1', '1', 0, 'admin', NOW()),
+('1860000000000000089', '1860000000000000084', '导出', 2, 'mes:mes_xsl_equipment_part:exportXls', '1', '1', 0, 'admin', NOW()),
+('1860000000000000090', '1860000000000000084', '导入', 2, 'mes:mes_xsl_equipment_part: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 (
+    '1860000000000000084',
+    '1860000000000000085', '1860000000000000086', '1860000000000000087', '1860000000000000088',
+    '1860000000000000089', '1860000000000000090'
+  )
+  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_58__mes_xsl_equipment_part_dept_name_to_part_name.sql

@@ -0,0 +1,16 @@
+-- 设备部位：部门名称字段更名为部位名称（dept_name -> part_name）
+SET @col_exists := (
+  SELECT COUNT(1)
+  FROM information_schema.COLUMNS
+  WHERE TABLE_SCHEMA = DATABASE()
+    AND TABLE_NAME = 'mes_xsl_equipment_part'
+    AND COLUMN_NAME = 'dept_name'
+);
+SET @ddl_sql := IF(
+  @col_exists > 0,
+  'ALTER TABLE `mes_xsl_equipment_part` CHANGE COLUMN `dept_name` `part_name` varchar(128) NOT NULL COMMENT ''部位名称''',
+  'SELECT 1'
+);
+PREPARE stmt_mep_part_name FROM @ddl_sql;
+EXECUTE stmt_mep_part_name;
+DEALLOCATE PREPARE stmt_mep_part_name;

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

@@ -0,0 +1,68 @@
+-- MES 设备小部位：建表 + 菜单 + 按钮 + 租户 admin 授权（与 jeecg-boot/db/mes-xsl-equipment-sub-part-menu-permission.sql 建表与菜单段一致）
+-- 权限前缀：mes:mes_xsl_equipment_sub_part:*（与 Controller、前端 v-auth 一致）
+-- 依赖：mes_xsl_equipment_category、mes_xsl_equipment_part；父菜单「MES基础资料」或「MES资料」
+SET NAMES utf8mb4;
+
+CREATE TABLE IF NOT EXISTS `mes_xsl_equipment_sub_part` (
+  `id` varchar(32) NOT NULL COMMENT '主键',
+  `equipment_category_id` varchar(32) NOT NULL COMMENT '所属设备类别主键 mes_xsl_equipment_category.id',
+  `equipment_category_name` varchar(128) DEFAULT NULL COMMENT '设备类别名称冗余展示',
+  `equipment_part_id` varchar(32) NOT NULL COMMENT '所属设备大部位主键 mes_xsl_equipment_part.id',
+  `equipment_part_name` varchar(128) DEFAULT NULL COMMENT '设备大部位名称冗余（mes_xsl_equipment_part.part_name）',
+  `sub_part_name` varchar(128) NOT NULL COMMENT '小部位名称',
+  `sub_part_code` varchar(64) NOT NULL COMMENT '小部位代码（同租户未删除数据中唯一）',
+  `sub_part_description` varchar(500) DEFAULT NULL COMMENT '部位描述',
+  `enable_status` varchar(1) NOT NULL DEFAULT '0' COMMENT '是否启用（字典xslmes_unit_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_mesp_tenant_subcode` (`tenant_id`, `sub_part_code`)
+) 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 ('1860000000000000091', @mes_base_pid, '设备小部位', '/xslmes/mesXslEquipmentSubPart', 'xslmes/mesXslEquipmentSubPart/MesXslEquipmentSubPartList', NULL, 1, NULL, '1', 13, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW())
+ON DUPLICATE KEY UPDATE
+`parent_id` = VALUES(`parent_id`), `name` = VALUES(`name`), `url` = VALUES(`url`), `component` = VALUES(`component`), `component_name` = VALUES(`component_name`),
+`menu_type` = VALUES(`menu_type`), `perms` = VALUES(`perms`), `perms_type` = VALUES(`perms_type`), `sort_no` = VALUES(`sort_no`),
+`is_route` = VALUES(`is_route`), `is_leaf` = VALUES(`is_leaf`), `hidden` = VALUES(`hidden`), `status` = VALUES(`status`), `del_flag` = VALUES(`del_flag`),
+`keep_alive` = VALUES(`keep_alive`), `internal_or_external` = VALUES(`internal_or_external`);
+
+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()),
+('1860000000000000093', '1860000000000000091', '编辑', 2, 'mes:mes_xsl_equipment_sub_part:edit', '1', '1', 0, 'admin', NOW()),
+('1860000000000000094', '1860000000000000091', '删除', 2, 'mes:mes_xsl_equipment_sub_part:delete', '1', '1', 0, 'admin', NOW()),
+('1860000000000000095', '1860000000000000091', '批量删除', 2, 'mes:mes_xsl_equipment_sub_part:deleteBatch', '1', '1', 0, 'admin', NOW()),
+('1860000000000000096', '1860000000000000091', '导出', 2, 'mes:mes_xsl_equipment_sub_part:exportXls', '1', '1', 0, 'admin', NOW()),
+('1860000000000000097', '1860000000000000091', '导入', 2, 'mes:mes_xsl_equipment_sub_part: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 (
+    '1860000000000000091',
+    '1860000000000000092', '1860000000000000093', '1860000000000000094', '1860000000000000095',
+    '1860000000000000096', '1860000000000000097'
+  )
+  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_60__mes_xsl_equipment_sub_part_menu_xslmes_root.sql

@@ -0,0 +1,18 @@
+-- MES 设备小部位：将二级菜单从「MES基础资料」挪到「MES XSL / XSLMES管理」根菜单下
+-- 依赖：V3.9.2_59 已写入 sys_permission id 1860000000000000091
+
+UPDATE `sys_permission` p
+INNER JOIN (
+  SELECT COALESCE(
+    (SELECT MIN(s2.`id`) FROM `sys_permission` s2
+     WHERE s2.`del_flag` = 0 AND s2.`menu_type` = 0
+       AND s2.`name` IN ('MES XSL', 'XSLMES管理', 'XSLMES')),
+    '1900000000000000300'
+  ) AS `pid`
+  FROM DUAL
+) x ON 1 = 1
+SET p.`parent_id` = x.`pid`,
+    p.`sort_no` = 14.00,
+    p.`update_by` = 'admin',
+    p.`update_time` = NOW()
+WHERE p.`id` = '1860000000000000091';

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

@@ -0,0 +1,62 @@
+-- MES 备品件类别：建表 + 菜单 + 按钮 + 租户 admin 授权（与 jeecg-boot/db/mes-xsl-spare-parts-category-menu-permission.sql 建表与菜单段一致）
+-- 权限前缀：mes:mes_xsl_spare_parts_category:*（与 Controller、前端 v-auth 一致）
+-- 父菜单：MES基础资料 / MES资料
+SET NAMES utf8mb4;
+
+CREATE TABLE IF NOT EXISTS `mes_xsl_spare_parts_category` (
+  `id` varchar(32) NOT NULL COMMENT '主键',
+  `category_name` varchar(128) NOT NULL COMMENT '类别名称（同租户未删除数据中唯一）',
+  `category_description` varchar(500) DEFAULT NULL COMMENT '描述',
+  `tenant_id` int DEFAULT NULL COMMENT '租户',
+  `sys_org_code` varchar(64) DEFAULT NULL COMMENT '部门',
+  `create_by` varchar(32) DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(32) DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `del_flag` int DEFAULT '0' COMMENT '删除标记（0正常1删除）',
+  PRIMARY KEY (`id`),
+  KEY `idx_mspc_tenant_catname` (`tenant_id`, `category_name`)
+) 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 ('1860000000000000098', @mes_base_pid, '备品件类别', '/xslmes/mesXslSparePartsCategory', 'xslmes/mesXslSparePartsCategory/MesXslSparePartsCategoryList', NULL, 1, NULL, '1', 15, 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
+('1860000000000000099', '1860000000000000098', '新增', 2, 'mes:mes_xsl_spare_parts_category:add', '1', '1', 0, 'admin', NOW()),
+('1860000000000000100', '1860000000000000098', '编辑', 2, 'mes:mes_xsl_spare_parts_category:edit', '1', '1', 0, 'admin', NOW()),
+('1860000000000000101', '1860000000000000098', '删除', 2, 'mes:mes_xsl_spare_parts_category:delete', '1', '1', 0, 'admin', NOW()),
+('1860000000000000102', '1860000000000000098', '批量删除', 2, 'mes:mes_xsl_spare_parts_category:deleteBatch', '1', '1', 0, 'admin', NOW()),
+('1860000000000000103', '1860000000000000098', '导出', 2, 'mes:mes_xsl_spare_parts_category:exportXls', '1', '1', 0, 'admin', NOW()),
+('1860000000000000104', '1860000000000000098', '导入', 2, 'mes:mes_xsl_spare_parts_category: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 (
+    '1860000000000000098',
+    '1860000000000000099', '1860000000000000100', '1860000000000000101', '1860000000000000102',
+    '1860000000000000103', '1860000000000000104'
+  )
+  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_62__mes_xsl_spare_part.sql

@@ -0,0 +1,68 @@
+-- MES 备品件信息：建表 + 菜单 + 按钮 + 租户 admin 授权（与 jeecg-boot/db/mes-xsl-spare-part-menu-permission.sql 建表与菜单段一致）
+-- 权限前缀：mes:mes_xsl_spare_part:*（与 Controller、前端 v-auth 一致）
+-- 依赖：mes_xsl_spare_parts_category、mes_xsl_unit；父菜单 MES基础资料 / MES资料
+SET NAMES utf8mb4;
+
+CREATE TABLE IF NOT EXISTS `mes_xsl_spare_part` (
+  `id` varchar(32) NOT NULL COMMENT '主键',
+  `spare_part_name` varchar(128) NOT NULL COMMENT '备品件名称（同租户未删除数据中唯一）',
+  `spare_parts_category_id` varchar(32) NOT NULL COMMENT '所属备品件类别 mes_xsl_spare_parts_category.id',
+  `spare_parts_category_name` varchar(128) DEFAULT NULL COMMENT '备品件类别名称冗余',
+  `spec_model` varchar(200) DEFAULT NULL COMMENT '规格型号',
+  `max_stock` decimal(18,4) NOT NULL DEFAULT '0.0000' COMMENT '最大库存',
+  `min_stock` decimal(18,4) NOT NULL DEFAULT '0.0000' COMMENT '最小库存',
+  `unit_id` varchar(36) NOT NULL COMMENT '单位 mes_xsl_unit.id',
+  `unit_name` varchar(100) DEFAULT NULL COMMENT '单位名称冗余',
+  `tenant_id` int DEFAULT NULL COMMENT '租户',
+  `sys_org_code` varchar(64) DEFAULT NULL COMMENT '部门',
+  `create_by` varchar(32) DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(32) DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `del_flag` int DEFAULT '0' COMMENT '删除标记（0正常1删除）',
+  PRIMARY KEY (`id`),
+  KEY `idx_msp_tenant_name` (`tenant_id`, `spare_part_name`)
+) 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 ('1860000000000000105', @mes_base_pid, '备品件信息', '/xslmes/mesXslSparePart', 'xslmes/mesXslSparePart/MesXslSparePartList', NULL, 1, NULL, '1', 16, 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
+('1860000000000000106', '1860000000000000105', '新增', 2, 'mes:mes_xsl_spare_part:add', '1', '1', 0, 'admin', NOW()),
+('1860000000000000107', '1860000000000000105', '编辑', 2, 'mes:mes_xsl_spare_part:edit', '1', '1', 0, 'admin', NOW()),
+('1860000000000000108', '1860000000000000105', '删除', 2, 'mes:mes_xsl_spare_part:delete', '1', '1', 0, 'admin', NOW()),
+('1860000000000000109', '1860000000000000105', '批量删除', 2, 'mes:mes_xsl_spare_part:deleteBatch', '1', '1', 0, 'admin', NOW()),
+('1860000000000000110', '1860000000000000105', '导出', 2, 'mes:mes_xsl_spare_part:exportXls', '1', '1', 0, 'admin', NOW()),
+('1860000000000000111', '1860000000000000105', '导入', 2, 'mes:mes_xsl_spare_part: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 (
+    '1860000000000000105',
+    '1860000000000000106', '1860000000000000107', '1860000000000000108', '1860000000000000109',
+    '1860000000000000110', '1860000000000000111'
+  )
+  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_63__mes_xsl_manufacturer.sql

@@ -0,0 +1,87 @@
+-- MES 厂家信息：字典 + 建表 + 菜单 + 按钮 + 租户 admin 授权（与 jeecg-boot/db/mes-xsl-manufacturer-menu-permission.sql 一致）
+-- 权限前缀：mes:mes_xsl_manufacturer:*；父菜单 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_manufacturer_category', '模具厂家、胶囊厂家、设备厂家', 0, 'admin', NOW(), 0, 0
+WHERE NOT EXISTS (SELECT 1 FROM `sys_dict` WHERE `dict_code` = 'xslmes_manufacturer_category' AND `del_flag` = 0);
+
+INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `sort_order`, `status`, `create_by`, `create_time`)
+SELECT REPLACE(UUID(), '-', ''), d.id, '模具厂家', 'mold', 1, 1, 'admin', NOW() FROM `sys_dict` d
+WHERE d.`dict_code` = 'xslmes_manufacturer_category' AND NOT EXISTS (SELECT 1 FROM `sys_dict_item` i WHERE i.`dict_id` = d.id AND i.`item_value` = 'mold');
+INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `sort_order`, `status`, `create_by`, `create_time`)
+SELECT REPLACE(UUID(), '-', ''), d.id, '胶囊厂家', 'capsule', 2, 1, 'admin', NOW() FROM `sys_dict` d
+WHERE d.`dict_code` = 'xslmes_manufacturer_category' AND NOT EXISTS (SELECT 1 FROM `sys_dict_item` i WHERE i.`dict_id` = d.id AND i.`item_value` = 'capsule');
+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', 3, 1, 'admin', NOW() FROM `sys_dict` d
+WHERE d.`dict_code` = 'xslmes_manufacturer_category' 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` (`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `type`, `tenant_id`)
+SELECT REPLACE(UUID(), '-', ''), 'MES厂家是否有效', 'xslmes_manufacturer_valid', '0有效1无效', 0, 'admin', NOW(), 0, 0
+WHERE NOT EXISTS (SELECT 1 FROM `sys_dict` WHERE `dict_code` = 'xslmes_manufacturer_valid' 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_manufacturer_valid' 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_manufacturer_valid' 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_manufacturer` (
+  `id` varchar(32) NOT NULL COMMENT '主键',
+  `manufacturer_category` varchar(32) NOT NULL COMMENT '厂家类别（字典xslmes_manufacturer_category：mold模具 capsule胶囊 equipment设备）',
+  `manufacturer_name` varchar(128) 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 '部门',
+  `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_mxm_tenant_name` (`tenant_id`, `manufacturer_name`)
+) 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 ('1860000000000000112', @mes_base_pid, '厂家信息', '/xslmes/mesXslManufacturer', 'xslmes/mesXslManufacturer/MesXslManufacturerList', NULL, 1, NULL, '1', 17, 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
+('1860000000000000113', '1860000000000000112', '新增', 2, 'mes:mes_xsl_manufacturer:add', '1', '1', 0, 'admin', NOW()),
+('1860000000000000114', '1860000000000000112', '编辑', 2, 'mes:mes_xsl_manufacturer:edit', '1', '1', 0, 'admin', NOW()),
+('1860000000000000115', '1860000000000000112', '删除', 2, 'mes:mes_xsl_manufacturer:delete', '1', '1', 0, 'admin', NOW()),
+('1860000000000000116', '1860000000000000112', '批量删除', 2, 'mes:mes_xsl_manufacturer:deleteBatch', '1', '1', 0, 'admin', NOW()),
+('1860000000000000117', '1860000000000000112', '导出', 2, 'mes:mes_xsl_manufacturer:exportXls', '1', '1', 0, 'admin', NOW()),
+('1860000000000000118', '1860000000000000112', '导入', 2, 'mes:mes_xsl_manufacturer: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 (
+    '1860000000000000112',
+    '1860000000000000113', '1860000000000000114', '1860000000000000115', '1860000000000000116',
+    '1860000000000000117', '1860000000000000118'
+  )
+  AND NOT EXISTS (
+    SELECT 1 FROM `sys_role_permission` rp
+    WHERE rp.`role_id` = r.`id` AND rp.`permission_id` = p.`id`
+  );

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

@@ -0,0 +1,10 @@
+<template>
+  <MesXslProcessOperationList />
+</template>
+
+<script lang="ts" setup>
+  /**
+   * 兼容旧菜单 component：mes/processoperation/index（V3.9.2_53 历史配置），实际页面在 xslmes。
+   */
+  import MesXslProcessOperationList from '/@/views/xslmes/mesXslProcessOperation/MesXslProcessOperationList.vue';
+</script>

jeecgboot-vue3/src/views/xslmes/mesXslEquipmentCategory/MesXslEquipmentCategory.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/mesXslEquipmentCategory/list',
+  checkCategoryName = '/xslmes/mesXslEquipmentCategory/checkCategoryName',
+  save = '/xslmes/mesXslEquipmentCategory/add',
+  edit = '/xslmes/mesXslEquipmentCategory/edit',
+  deleteOne = '/xslmes/mesXslEquipmentCategory/delete',
+  deleteBatch = '/xslmes/mesXslEquipmentCategory/deleteBatch',
+  importExcel = '/xslmes/mesXslEquipmentCategory/importExcel',
+  exportXls = '/xslmes/mesXslEquipmentCategory/exportXls',
+  queryById = '/xslmes/mesXslEquipmentCategory/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 checkCategoryName = (params: { categoryName: string; dataId?: string }) =>
+  defHttp.get(
+    { url: Api.checkCategoryName, 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/mesXslEquipmentCategory/MesXslEquipmentCategory.data.ts

@@ -0,0 +1,87 @@
+import { BasicColumn, FormSchema } from '/@/components/Table';
+import { checkCategoryName } from './MesXslEquipmentCategory.api';
+
+export const columns: BasicColumn[] = [
+  { title: '类别名称', align: 'center', dataIndex: 'categoryName', width: 160 },
+  { title: '工序名称', align: 'center', dataIndex: 'processOperationName', width: 180 },
+  { title: '点检区分', align: 'center', dataIndex: 'inspectDistinct_dictText', width: 100 },
+  { title: '保养区分', align: 'center', dataIndex: 'maintainDistinct_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: 'categoryName', component: 'Input', colProps: { span: 6 } },
+  { label: '工序名称', field: 'processOperationName', component: 'Input', colProps: { span: 6 } },
+  {
+    label: '点检区分',
+    field: 'inspectDistinct',
+    component: 'JDictSelectTag',
+    componentProps: { dictCode: 'xslmes_equipment_inspect_distinct' },
+    colProps: { span: 6 },
+  },
+  {
+    label: '保养区分',
+    field: 'maintainDistinct',
+    component: 'JDictSelectTag',
+    componentProps: { dictCode: 'xslmes_equipment_maintain_distinct' },
+    colProps: { span: 6 },
+  },
+];
+
+export const formSchema: FormSchema[] = [
+  { label: '', field: 'id', component: 'Input', show: false },
+  {
+    label: '类别名称',
+    field: 'categoryName',
+    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 checkCategoryName({ categoryName: 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: 'processOperationId', component: 'Input', show: false, dynamicRules: () => [{ required: true, message: '请选择所属工序' }] },
+  {
+    label: '所属工序',
+    field: 'processOperationName',
+    component: 'Input',
+    slot: 'processOperationPicker',
+  },
+  {
+    label: '点检区分',
+    field: 'inspectDistinct',
+    required: true,
+    component: 'JDictSelectTag',
+    componentProps: { dictCode: 'xslmes_equipment_inspect_distinct', placeholder: '请选择' },
+  },
+  {
+    label: '保养区分',
+    field: 'maintainDistinct',
+    required: true,
+    component: 'JDictSelectTag',
+    componentProps: { dictCode: 'xslmes_equipment_maintain_distinct', placeholder: '请选择' },
+  },
+];

jeecgboot-vue3/src/views/xslmes/mesXslEquipmentCategory/MesXslEquipmentCategoryList.vue

@@ -0,0 +1,127 @@
+<template>
+  <div>
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <template #tableTitle>
+        <a-button type="primary" v-auth="'mes:mes_xsl_equipment_category:add'" @click="handleAdd" preIcon="ant-design:plus-outlined">
+          新增
+        </a-button>
+        <a-button
+          type="primary"
+          v-auth="'mes:mes_xsl_equipment_category:exportXls'"
+          preIcon="ant-design:export-outlined"
+          @click="onExportXls"
+        >
+          导出
+        </a-button>
+        <j-upload-button
+          type="primary"
+          v-auth="'mes:mes_xsl_equipment_category: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_category: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_category:edit' },
+          ]"
+          :dropDownActions="getDropDownAction(record)"
+        />
+      </template>
+    </BasicTable>
+    <MesXslEquipmentCategoryModal @register="registerModal" @success="handleSuccess" />
+  </div>
+</template>
+
+<script lang="ts" name="xslmes-mesXslEquipmentCategory" setup>
+  import { BasicTable, TableAction } from '/@/components/Table';
+  import { useModal } from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import Icon from '/@/components/Icon';
+  import MesXslEquipmentCategoryModal from './components/MesXslEquipmentCategoryModal.vue';
+  import { columns, searchFormSchema } from './MesXslEquipmentCategory.data';
+  import { list, deleteOne, batchDelete, getExportUrl, getImportUrl } from './MesXslEquipmentCategory.api';
+
+  const [registerModal, { openModal }] = useModal();
+
+  const { tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '设备类别',
+      api: list,
+      columns,
+      canResize: true,
+      formConfig: {
+        schemas: searchFormSchema,
+        labelWidth: 120,
+        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_equipment_category:delete',
+      },
+    ];
+  }
+</script>

jeecgboot-vue3/src/views/xslmes/mesXslEquipmentCategory/components/MesXslEquipmentCategoryModal.vue

@@ -0,0 +1,76 @@
+<template>
+  <BasicModal @register="registerModal" :title="title" width="640" 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>
+    </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 '../MesXslEquipmentCategory.data';
+  import { saveOrUpdate } from '../MesXslEquipmentCategory.api';
+  import MesXslProcessOperationSelectModal from './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: 120,
+    schemas: formSchema,
+    showActionButtonGroup: false,
+  });
+
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    await resetFields();
+    setModalProps({ confirmLoading: false, showCancelBtn: data?.showFooter, showOkBtn: data?.showFooter });
+    isUpdate.value = !!data?.isUpdate;
+    isDetail.value = !data?.showFooter;
+    if (unref(isUpdate)) await setFieldsValue({ ...data.record });
+    setProps({ disabled: !data?.showFooter });
+  });
+
+  const title = computed(() =>
+    !unref(isUpdate) ? '新增设备类别' : unref(isDetail) ? '设备类别详情' : '编辑设备类别',
+  );
+
+  function 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/mesXslEquipmentCategory/components/MesXslProcessOperationSelectModal.vue

@@ -0,0 +1,99 @@
+<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/mesXslProcessOperation/MesXslProcessOperation.api';
+
+  const emit = defineEmits(['register', 'select']);
+
+  const selectedRow = ref<Recordable | null>(null);
+
+  function handleSelectionChange(_keys: string[], rows: Recordable[]) {
+    selectedRow.value = rows?.[0] ?? null;
+  }
+
+  const [registerTable, { reload, setProps, getSelectRowKeys, getSelectRows, setSelectedRowKeys, clearSelectedRowKeys }] =
+    useTable({
+      api: list,
+      columns: [
+        { title: '工序编码', dataIndex: 'operationCode', width: 140 },
+        { title: '工序名称', dataIndex: 'operationName', width: 200 },
+      ],
+      rowKey: 'id',
+      useSearchForm: true,
+      formConfig: {
+        labelWidth: 90,
+        schemas: [
+          { label: '工序编码', field: 'operationCode', component: 'Input', colProps: { span: 8 } },
+          { label: '工序名称', field: 'operationName', component: 'Input', colProps: { span: 8 } },
+        ],
+      },
+      pagination: { pageSize: 10 },
+      canResize: false,
+      showIndexColumn: false,
+      immediate: true,
+      rowSelection: {
+        type: 'radio',
+        columnWidth: 48,
+        onChange: handleSelectionChange,
+      },
+      clickToRowSelect: true,
+    });
+
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    selectedRow.value = null;
+    clearSelectedRowKeys?.();
+    setProps({
+      rowSelection: {
+        type: 'radio',
+        columnWidth: 48,
+        onChange: handleSelectionChange,
+      },
+      clickToRowSelect: true,
+    });
+    setModalProps({ confirmLoading: false });
+    const pid = data?.processOperationId as string | undefined;
+    if (pid) {
+      setSelectedRowKeys?.([pid]);
+      try {
+        const raw = await queryById({ id: pid });
+        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', { processOperationId: '', processOperationName: '' });
+      closeModal();
+      return;
+    }
+    emit('select', {
+      processOperationId: row.id,
+      processOperationName: row.operationName || '',
+    });
+    closeModal();
+  }
+</script>

jeecgboot-vue3/src/views/xslmes/mesXslEquipmentPart/MesXslEquipmentPart.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/mesXslEquipmentPart/list',
+  checkPartCode = '/xslmes/mesXslEquipmentPart/checkPartCode',
+  save = '/xslmes/mesXslEquipmentPart/add',
+  edit = '/xslmes/mesXslEquipmentPart/edit',
+  deleteOne = '/xslmes/mesXslEquipmentPart/delete',
+  deleteBatch = '/xslmes/mesXslEquipmentPart/deleteBatch',
+  importExcel = '/xslmes/mesXslEquipmentPart/importExcel',
+  exportXls = '/xslmes/mesXslEquipmentPart/exportXls',
+  queryById = '/xslmes/mesXslEquipmentPart/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 checkPartCode = (params: { partCode: string; dataId?: string }) =>
+  defHttp.get(
+    { url: Api.checkPartCode, 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/mesXslEquipmentPart/MesXslEquipmentPart.data.ts

@@ -0,0 +1,84 @@
+import { BasicColumn, FormSchema } from '/@/components/Table';
+import { checkPartCode } from './MesXslEquipmentPart.api';
+
+export const columns: BasicColumn[] = [
+  { title: '部位代码', align: 'center', dataIndex: 'partCode', width: 120 },
+  { title: '类别名称', align: 'center', dataIndex: 'equipmentCategoryName', width: 160 },
+  { title: '部位名称', align: 'center', dataIndex: 'partName', width: 140 },
+  { title: '部位描述', align: 'center', dataIndex: 'partDescription', width: 200, ellipsis: true },
+  { title: '是否启用', align: 'center', dataIndex: 'enableStatus_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: 'partCode', component: 'Input', colProps: { span: 6 } },
+  { label: '类别名称', field: 'equipmentCategoryName', component: 'Input', colProps: { span: 6 } },
+  { label: '部位名称', field: 'partName', component: 'Input', colProps: { span: 6 } },
+  {
+    label: '是否启用',
+    field: 'enableStatus',
+    component: 'JDictSelectTag',
+    componentProps: { dictCode: 'xslmes_unit_status' },
+    colProps: { span: 6 },
+  },
+];
+
+export const formSchema: FormSchema[] = [
+  { label: '', field: 'id', component: 'Input', show: false },
+  {
+    label: '部位代码',
+    field: 'partCode',
+    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 checkPartCode({ partCode: v, dataId: model?.id });
+            return Promise.resolve();
+          } catch (e: any) {
+            const msg = e?.response?.data?.message || e?.message || '部位代码不能重复';
+            return Promise.reject(msg);
+          }
+        },
+        trigger: 'blur',
+      },
+    ],
+  },
+  { label: '', field: 'equipmentCategoryId', component: 'Input', show: false, dynamicRules: () => [{ required: true, message: '请选择所属设备类别' }] },
+  {
+    label: '所属类别',
+    field: 'equipmentCategoryName',
+    component: 'Input',
+    slot: 'equipmentCategoryPicker',
+  },
+  {
+    label: '部位名称',
+    field: 'partName',
+    required: true,
+    component: 'Input',
+    componentProps: { placeholder: '请输入部位名称' },
+  },
+  { label: '部位描述', field: 'partDescription', component: 'InputTextArea', componentProps: { rows: 3 } },
+  {
+    label: '是否启用',
+    field: 'enableStatus',
+    required: true,
+    component: 'JDictSelectTag',
+    componentProps: { dictCode: 'xslmes_unit_status', placeholder: '请选择' },
+    defaultValue: '0',
+  },
+];

jeecgboot-vue3/src/views/xslmes/mesXslEquipmentPart/MesXslEquipmentPartList.vue

@@ -0,0 +1,127 @@
+<template>
+  <div>
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <template #tableTitle>
+        <a-button type="primary" v-auth="'mes:mes_xsl_equipment_part:add'" @click="handleAdd" preIcon="ant-design:plus-outlined">
+          新增
+        </a-button>
+        <a-button
+          type="primary"
+          v-auth="'mes:mes_xsl_equipment_part:exportXls'"
+          preIcon="ant-design:export-outlined"
+          @click="onExportXls"
+        >
+          导出
+        </a-button>
+        <j-upload-button
+          type="primary"
+          v-auth="'mes:mes_xsl_equipment_part: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_part: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_part:edit' },
+          ]"
+          :dropDownActions="getDropDownAction(record)"
+        />
+      </template>
+    </BasicTable>
+    <MesXslEquipmentPartModal @register="registerModal" @success="handleSuccess" />
+  </div>
+</template>
+
+<script lang="ts" name="xslmes-mesXslEquipmentPart" setup>
+  import { BasicTable, TableAction } from '/@/components/Table';
+  import { useModal } from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import Icon from '/@/components/Icon';
+  import MesXslEquipmentPartModal from './components/MesXslEquipmentPartModal.vue';
+  import { columns, searchFormSchema } from './MesXslEquipmentPart.data';
+  import { list, deleteOne, batchDelete, getExportUrl, getImportUrl } from './MesXslEquipmentPart.api';
+
+  const [registerModal, { openModal }] = useModal();
+
+  const { tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '设备部位',
+      api: list,
+      columns,
+      canResize: true,
+      formConfig: {
+        schemas: searchFormSchema,
+        labelWidth: 120,
+        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_equipment_part:delete',
+      },
+    ];
+  }
+</script>

jeecgboot-vue3/src/views/xslmes/mesXslEquipmentPart/components/MesXslEquipmentPartModal.vue

@@ -0,0 +1,76 @@
+<template>
+  <BasicModal @register="registerModal" :title="title" width="720" v-bind="$attrs" destroyOnClose @ok="handleSubmit">
+    <BasicForm @register="registerForm">
+      <template #equipmentCategoryPicker="{ model, field }">
+        <a-input-group compact style="display: flex; width: 100%">
+          <a-input v-model:value="model[field]" read-only placeholder="请选择设备类别" style="flex: 1" />
+          <a-button type="primary" :disabled="isDetail" @click="openCategorySelect">选择类别</a-button>
+          <a-button v-if="model.equipmentCategoryId && !isDetail" @click="clearCategory">清除</a-button>
+        </a-input-group>
+      </template>
+    </BasicForm>
+    <MesXslEquipmentCategorySelectModal @register="registerCategoryModal" @select="onCategorySelect" />
+  </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 '../MesXslEquipmentPart.data';
+  import { saveOrUpdate } from '../MesXslEquipmentPart.api';
+  import MesXslEquipmentCategorySelectModal from '/@/views/xslmes/mesXslEquipmentType/components/MesXslEquipmentCategorySelectModal.vue';
+
+  const emit = defineEmits(['register', 'success']);
+  const isUpdate = ref(true);
+  const isDetail = ref(false);
+
+  const [registerCategoryModal, { openModal: openCategoryModal }] = useModal();
+
+  const [registerForm, { resetFields, setFieldsValue, validate, setProps, getFieldsValue }] = useForm({
+    labelWidth: 120,
+    schemas: formSchema,
+    showActionButtonGroup: false,
+  });
+
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    await resetFields();
+    setModalProps({ confirmLoading: false, showCancelBtn: data?.showFooter, showOkBtn: data?.showFooter });
+    isUpdate.value = !!data?.isUpdate;
+    isDetail.value = !data?.showFooter;
+    if (unref(isUpdate)) await setFieldsValue({ ...data.record });
+    setProps({ disabled: !data?.showFooter });
+  });
+
+  const title = computed(() =>
+    !unref(isUpdate) ? '新增设备部位' : unref(isDetail) ? '设备部位详情' : '编辑设备部位',
+  );
+
+  function openCategorySelect() {
+    const vals = getFieldsValue();
+    openCategoryModal(true, { equipmentCategoryId: vals.equipmentCategoryId });
+  }
+
+  function clearCategory() {
+    setFieldsValue({ equipmentCategoryId: '', equipmentCategoryName: '' });
+  }
+
+  function onCategorySelect(payload: { equipmentCategoryId?: string; equipmentCategoryName?: string }) {
+    setFieldsValue({
+      equipmentCategoryId: payload.equipmentCategoryId || '',
+      equipmentCategoryName: payload.equipmentCategoryName || '',
+    });
+  }
+
+  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/mesXslEquipmentSubPart/MesXslEquipmentSubPart.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/mesXslEquipmentSubPart/list',
+  checkSubPartCode = '/xslmes/mesXslEquipmentSubPart/checkSubPartCode',
+  save = '/xslmes/mesXslEquipmentSubPart/add',
+  edit = '/xslmes/mesXslEquipmentSubPart/edit',
+  deleteOne = '/xslmes/mesXslEquipmentSubPart/delete',
+  deleteBatch = '/xslmes/mesXslEquipmentSubPart/deleteBatch',
+  importExcel = '/xslmes/mesXslEquipmentSubPart/importExcel',
+  exportXls = '/xslmes/mesXslEquipmentSubPart/exportXls',
+  queryById = '/xslmes/mesXslEquipmentSubPart/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 checkSubPartCode = (params: { subPartCode: string; dataId?: string }) =>
+  defHttp.get(
+    { url: Api.checkSubPartCode, 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/mesXslEquipmentSubPart/MesXslEquipmentSubPart.data.ts

@@ -0,0 +1,110 @@
+import { BasicColumn, FormSchema } from '/@/components/Table';
+import { checkSubPartCode } from './MesXslEquipmentSubPart.api';
+
+export const columns: BasicColumn[] = [
+  { title: '小部位代码', align: 'center', dataIndex: 'subPartCode', width: 120 },
+  { title: '类别名称', align: 'center', dataIndex: 'equipmentCategoryName', width: 140 },
+  { title: '大部位名称', align: 'center', dataIndex: 'equipmentPartName', width: 140 },
+  { title: '小部位名称', align: 'center', dataIndex: 'subPartName', width: 140 },
+  { title: '部位描述', align: 'center', dataIndex: 'subPartDescription', width: 200, ellipsis: true },
+  { title: '是否启用', align: 'center', dataIndex: 'enableStatus_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: 'subPartCode', component: 'Input', colProps: { span: 6 } },
+  { label: '类别名称', field: 'equipmentCategoryName', component: 'Input', colProps: { span: 6 } },
+  { label: '大部位名称', field: 'equipmentPartName', component: 'Input', colProps: { span: 6 } },
+  { label: '小部位名称', field: 'subPartName', component: 'Input', colProps: { span: 6 } },
+  {
+    label: '是否启用',
+    field: 'enableStatus',
+    component: 'JDictSelectTag',
+    componentProps: { dictCode: 'xslmes_unit_status' },
+    colProps: { span: 6 },
+  },
+];
+
+export const formSchema: FormSchema[] = [
+  { label: '', field: 'id', component: 'Input', show: false },
+  {
+    label: '小部位代码',
+    field: 'subPartCode',
+    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 checkSubPartCode({ subPartCode: v, dataId: model?.id });
+            return Promise.resolve();
+          } catch (e: any) {
+            const msg = e?.response?.data?.message || e?.message || '小部位代码不能重复';
+            return Promise.reject(msg);
+          }
+        },
+        trigger: 'blur',
+      },
+    ],
+  },
+  {
+    label: '',
+    field: 'equipmentCategoryId',
+    component: 'Input',
+    show: false,
+    dynamicRules: () => [{ required: true, message: '请选择所属设备类别' }],
+  },
+  {
+    label: '所属类别',
+    field: 'equipmentCategoryName',
+    component: 'Input',
+    slot: 'equipmentCategoryPicker',
+  },
+  {
+    label: '',
+    field: 'equipmentPartId',
+    component: 'Input',
+    show: false,
+    dynamicRules: () => [{ required: true, message: '请选择所属设备大部位' }],
+  },
+  {
+    label: '所属大部位',
+    field: 'equipmentPartName',
+    component: 'Input',
+    slot: 'equipmentPartPicker',
+  },
+  {
+    label: '小部位名称',
+    field: 'subPartName',
+    required: true,
+    component: 'Input',
+    componentProps: { placeholder: '请输入小部位名称' },
+  },
+  {
+    label: '部位描述',
+    field: 'subPartDescription',
+    component: 'InputTextArea',
+    componentProps: { rows: 3 },
+  },
+  {
+    label: '是否启用',
+    field: 'enableStatus',
+    required: true,
+    component: 'JDictSelectTag',
+    componentProps: { dictCode: 'xslmes_unit_status', placeholder: '请选择' },
+    defaultValue: '0',
+  },
+];

jeecgboot-vue3/src/views/xslmes/mesXslEquipmentSubPart/MesXslEquipmentSubPartList.vue

@@ -0,0 +1,127 @@
+<template>
+  <div>
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <template #tableTitle>
+        <a-button type="primary" v-auth="'mes:mes_xsl_equipment_sub_part:add'" @click="handleAdd" preIcon="ant-design:plus-outlined">
+          新增
+        </a-button>
+        <a-button
+          type="primary"
+          v-auth="'mes:mes_xsl_equipment_sub_part:exportXls'"
+          preIcon="ant-design:export-outlined"
+          @click="onExportXls"
+        >
+          导出
+        </a-button>
+        <j-upload-button
+          type="primary"
+          v-auth="'mes:mes_xsl_equipment_sub_part: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_sub_part: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_sub_part:edit' },
+          ]"
+          :dropDownActions="getDropDownAction(record)"
+        />
+      </template>
+    </BasicTable>
+    <MesXslEquipmentSubPartModal @register="registerModal" @success="handleSuccess" />
+  </div>
+</template>
+
+<script lang="ts" name="xslmes-mesXslEquipmentSubPart" setup>
+  import { BasicTable, TableAction } from '/@/components/Table';
+  import { useModal } from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import Icon from '/@/components/Icon';
+  import MesXslEquipmentSubPartModal from './components/MesXslEquipmentSubPartModal.vue';
+  import { columns, searchFormSchema } from './MesXslEquipmentSubPart.data';
+  import { list, deleteOne, batchDelete, getExportUrl, getImportUrl } from './MesXslEquipmentSubPart.api';
+
+  const [registerModal, { openModal }] = useModal();
+
+  const { tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '设备小部位',
+      api: list,
+      columns,
+      canResize: true,
+      formConfig: {
+        schemas: searchFormSchema,
+        labelWidth: 120,
+        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_equipment_sub_part:delete',
+      },
+    ];
+  }
+</script>

jeecgboot-vue3/src/views/xslmes/mesXslEquipmentSubPart/components/MesXslEquipmentPartSelectModal.vue

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

jeecgboot-vue3/src/views/xslmes/mesXslEquipmentSubPart/components/MesXslEquipmentSubPartModal.vue

@@ -0,0 +1,113 @@
+<template>
+  <BasicModal @register="registerModal" :title="title" width="720" v-bind="$attrs" destroyOnClose @ok="handleSubmit">
+    <BasicForm @register="registerForm">
+      <template #equipmentCategoryPicker="{ model, field }">
+        <a-input-group compact style="display: flex; width: 100%">
+          <a-input v-model:value="model[field]" read-only placeholder="请选择设备类别" style="flex: 1" />
+          <a-button type="primary" :disabled="isDetail" @click="openCategorySelect">选择类别</a-button>
+          <a-button v-if="model.equipmentCategoryId && !isDetail" @click="clearCategory">清除</a-button>
+        </a-input-group>
+      </template>
+      <template #equipmentPartPicker="{ model, field }">
+        <a-input-group compact style="display: flex; width: 100%">
+          <a-input v-model:value="model[field]" read-only placeholder="请选择设备大部位" style="flex: 1" />
+          <a-button type="primary" :disabled="isDetail" @click="openPartSelect">选择大部位</a-button>
+          <a-button v-if="model.equipmentPartId && !isDetail" @click="clearPart">清除</a-button>
+        </a-input-group>
+      </template>
+    </BasicForm>
+    <MesXslEquipmentCategorySelectModal @register="registerCategoryModal" @select="onCategorySelect" />
+    <MesXslEquipmentPartSelectModal @register="registerPartModal" @select="onPartSelect" />
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+  import { computed, ref, unref } from 'vue';
+  import { BasicModal, useModalInner, useModal } from '/@/components/Modal';
+  import { BasicForm, useForm } from '/@/components/Form/index';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { formSchema } from '../MesXslEquipmentSubPart.data';
+  import { saveOrUpdate } from '../MesXslEquipmentSubPart.api';
+  import MesXslEquipmentCategorySelectModal from '/@/views/xslmes/mesXslEquipmentType/components/MesXslEquipmentCategorySelectModal.vue';
+  import MesXslEquipmentPartSelectModal from './MesXslEquipmentPartSelectModal.vue';
+
+  const emit = defineEmits(['register', 'success']);
+  const { createMessage } = useMessage();
+  const isUpdate = ref(true);
+  const isDetail = ref(false);
+
+  const [registerCategoryModal, { openModal: openCategoryModal }] = useModal();
+  const [registerPartModal, { openModal: openPartModal }] = useModal();
+
+  const [registerForm, { resetFields, setFieldsValue, validate, setProps, getFieldsValue }] = useForm({
+    labelWidth: 120,
+    schemas: formSchema,
+    showActionButtonGroup: false,
+  });
+
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    await resetFields();
+    setModalProps({ confirmLoading: false, showCancelBtn: data?.showFooter, showOkBtn: data?.showFooter });
+    isUpdate.value = !!data?.isUpdate;
+    isDetail.value = !data?.showFooter;
+    if (unref(isUpdate)) await setFieldsValue({ ...data.record });
+    setProps({ disabled: !data?.showFooter });
+  });
+
+  const title = computed(() =>
+    !unref(isUpdate) ? '新增设备小部位' : unref(isDetail) ? '设备小部位详情' : '编辑设备小部位',
+  );
+
+  function openCategorySelect() {
+    const vals = getFieldsValue();
+    openCategoryModal(true, { equipmentCategoryId: vals.equipmentCategoryId });
+  }
+
+  function clearCategory() {
+    setFieldsValue({ equipmentCategoryId: '', equipmentCategoryName: '', equipmentPartId: '', equipmentPartName: '' });
+  }
+
+  function onCategorySelect(payload: { equipmentCategoryId?: string; equipmentCategoryName?: string }) {
+    setFieldsValue({
+      equipmentCategoryId: payload.equipmentCategoryId || '',
+      equipmentCategoryName: payload.equipmentCategoryName || '',
+      equipmentPartId: '',
+      equipmentPartName: '',
+    });
+  }
+
+  function openPartSelect() {
+    const vals = getFieldsValue();
+    if (!vals.equipmentCategoryId) {
+      createMessage.warning('请先选择所属设备类别');
+      return;
+    }
+    openPartModal(true, {
+      equipmentCategoryId: vals.equipmentCategoryId,
+      equipmentPartId: vals.equipmentPartId,
+    });
+  }
+
+  function clearPart() {
+    setFieldsValue({ equipmentPartId: '', equipmentPartName: '' });
+  }
+
+  function onPartSelect(payload: { equipmentPartId?: string; equipmentPartName?: string }) {
+    setFieldsValue({
+      equipmentPartId: payload.equipmentPartId || '',
+      equipmentPartName: payload.equipmentPartName || '',
+    });
+  }
+
+  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/mesXslEquipmentType/MesXslEquipmentType.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/mesXslEquipmentType/list',
+  checkTypeName = '/xslmes/mesXslEquipmentType/checkTypeName',
+  save = '/xslmes/mesXslEquipmentType/add',
+  edit = '/xslmes/mesXslEquipmentType/edit',
+  deleteOne = '/xslmes/mesXslEquipmentType/delete',
+  deleteBatch = '/xslmes/mesXslEquipmentType/deleteBatch',
+  importExcel = '/xslmes/mesXslEquipmentType/importExcel',
+  exportXls = '/xslmes/mesXslEquipmentType/exportXls',
+  queryById = '/xslmes/mesXslEquipmentType/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 checkTypeName = (params: { typeName: string; dataId?: string }) =>
+  defHttp.get(
+    { url: Api.checkTypeName, 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/mesXslEquipmentType/MesXslEquipmentType.data.ts

@@ -0,0 +1,66 @@
+import { BasicColumn, FormSchema } from '/@/components/Table';
+import { checkTypeName } from './MesXslEquipmentType.api';
+
+export const columns: BasicColumn[] = [
+  { title: '类型名称', align: 'center', dataIndex: 'typeName', width: 160 },
+  { title: '工序名称', align: 'center', dataIndex: 'processOperationName', width: 180 },
+  { title: '类别名称', align: 'center', dataIndex: 'equipmentCategoryName', width: 160 },
+  { 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: 'typeName', component: 'Input', colProps: { span: 6 } },
+  { label: '工序名称', field: 'processOperationName', component: 'Input', colProps: { span: 6 } },
+  { label: '类别名称', field: 'equipmentCategoryName', component: 'Input', colProps: { span: 6 } },
+];
+
+export const formSchema: FormSchema[] = [
+  { label: '', field: 'id', component: 'Input', show: false },
+  {
+    label: '类型名称',
+    field: 'typeName',
+    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 checkTypeName({ typeName: 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: 'processOperationId', component: 'Input', show: false, dynamicRules: () => [{ required: true, message: '请选择所属工序' }] },
+  {
+    label: '所属工序',
+    field: 'processOperationName',
+    component: 'Input',
+    slot: 'processOperationPicker',
+  },
+  { label: '', field: 'equipmentCategoryId', component: 'Input', show: false, dynamicRules: () => [{ required: true, message: '请选择所属设备类别' }] },
+  {
+    label: '所属类别',
+    field: 'equipmentCategoryName',
+    component: 'Input',
+    slot: 'equipmentCategoryPicker',
+  },
+];

jeecgboot-vue3/src/views/xslmes/mesXslEquipmentType/MesXslEquipmentTypeList.vue

@@ -0,0 +1,127 @@
+<template>
+  <div>
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <template #tableTitle>
+        <a-button type="primary" v-auth="'mes:mes_xsl_equipment_type:add'" @click="handleAdd" preIcon="ant-design:plus-outlined">
+          新增
+        </a-button>
+        <a-button
+          type="primary"
+          v-auth="'mes:mes_xsl_equipment_type:exportXls'"
+          preIcon="ant-design:export-outlined"
+          @click="onExportXls"
+        >
+          导出
+        </a-button>
+        <j-upload-button
+          type="primary"
+          v-auth="'mes:mes_xsl_equipment_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_equipment_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_equipment_type:edit' },
+          ]"
+          :dropDownActions="getDropDownAction(record)"
+        />
+      </template>
+    </BasicTable>
+    <MesXslEquipmentTypeModal @register="registerModal" @success="handleSuccess" />
+  </div>
+</template>
+
+<script lang="ts" name="xslmes-mesXslEquipmentType" setup>
+  import { BasicTable, TableAction } from '/@/components/Table';
+  import { useModal } from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import Icon from '/@/components/Icon';
+  import MesXslEquipmentTypeModal from './components/MesXslEquipmentTypeModal.vue';
+  import { columns, searchFormSchema } from './MesXslEquipmentType.data';
+  import { list, deleteOne, batchDelete, getExportUrl, getImportUrl } from './MesXslEquipmentType.api';
+
+  const [registerModal, { openModal }] = useModal();
+
+  const { tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '设备类型',
+      api: list,
+      columns,
+      canResize: true,
+      formConfig: {
+        schemas: searchFormSchema,
+        labelWidth: 120,
+        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_equipment_type:delete',
+      },
+    ];
+  }
+</script>

jeecgboot-vue3/src/views/xslmes/mesXslEquipmentType/components/MesXslEquipmentCategorySelectModal.vue

@@ -0,0 +1,99 @@
+<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/mesXslEquipmentCategory/MesXslEquipmentCategory.api';
+
+  const emit = defineEmits(['register', 'select']);
+
+  const selectedRow = ref<Recordable | null>(null);
+
+  function handleSelectionChange(_keys: string[], rows: Recordable[]) {
+    selectedRow.value = rows?.[0] ?? null;
+  }
+
+  const [registerTable, { reload, setProps, getSelectRowKeys, getSelectRows, setSelectedRowKeys, clearSelectedRowKeys }] =
+    useTable({
+      api: list,
+      columns: [
+        { title: '类别名称', dataIndex: 'categoryName', width: 160 },
+        { title: '工序名称', dataIndex: 'processOperationName', width: 180 },
+      ],
+      rowKey: 'id',
+      useSearchForm: true,
+      formConfig: {
+        labelWidth: 90,
+        schemas: [
+          { label: '类别名称', field: 'categoryName', component: 'Input', colProps: { span: 8 } },
+          { label: '工序名称', field: 'processOperationName', component: 'Input', colProps: { span: 8 } },
+        ],
+      },
+      pagination: { pageSize: 10 },
+      canResize: false,
+      showIndexColumn: false,
+      immediate: true,
+      rowSelection: {
+        type: 'radio',
+        columnWidth: 48,
+        onChange: handleSelectionChange,
+      },
+      clickToRowSelect: true,
+    });
+
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    selectedRow.value = null;
+    clearSelectedRowKeys?.();
+    setProps({
+      rowSelection: {
+        type: 'radio',
+        columnWidth: 48,
+        onChange: handleSelectionChange,
+      },
+      clickToRowSelect: true,
+    });
+    setModalProps({ confirmLoading: false });
+    const cid = data?.equipmentCategoryId as string | undefined;
+    if (cid) {
+      setSelectedRowKeys?.([cid]);
+      try {
+        const raw = await queryById({ id: cid });
+        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', { equipmentCategoryId: '', equipmentCategoryName: '' });
+      closeModal();
+      return;
+    }
+    emit('select', {
+      equipmentCategoryId: row.id,
+      equipmentCategoryName: row.categoryName || '',
+    });
+    closeModal();
+  }
+</script>

jeecgboot-vue3/src/views/xslmes/mesXslEquipmentType/components/MesXslEquipmentTypeModal.vue

@@ -0,0 +1,102 @@
+<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 #equipmentCategoryPicker="{ model, field }">
+        <a-input-group compact style="display: flex; width: 100%">
+          <a-input v-model:value="model[field]" read-only placeholder="请选择设备类别" style="flex: 1" />
+          <a-button type="primary" :disabled="isDetail" @click="openCategorySelect">选择类别</a-button>
+          <a-button v-if="model.equipmentCategoryId && !isDetail" @click="clearCategory">清除</a-button>
+        </a-input-group>
+      </template>
+    </BasicForm>
+    <MesXslProcessOperationSelectModal @register="registerProcessModal" @select="onProcessSelect" />
+    <MesXslEquipmentCategorySelectModal @register="registerCategoryModal" @select="onCategorySelect" />
+  </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 '../MesXslEquipmentType.data';
+  import { saveOrUpdate } from '../MesXslEquipmentType.api';
+  import MesXslProcessOperationSelectModal from '/@/views/xslmes/mesXslEquipmentCategory/components/MesXslProcessOperationSelectModal.vue';
+  import MesXslEquipmentCategorySelectModal from './MesXslEquipmentCategorySelectModal.vue';
+
+  const emit = defineEmits(['register', 'success']);
+  const isUpdate = ref(true);
+  const isDetail = ref(false);
+
+  const [registerProcessModal, { openModal: openProcessModal }] = useModal();
+  const [registerCategoryModal, { openModal: openCategoryModal }] = useModal();
+
+  const [registerForm, { resetFields, setFieldsValue, validate, setProps, getFieldsValue }] = useForm({
+    labelWidth: 120,
+    schemas: formSchema,
+    showActionButtonGroup: false,
+  });
+
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    await resetFields();
+    setModalProps({ confirmLoading: false, showCancelBtn: data?.showFooter, showOkBtn: data?.showFooter });
+    isUpdate.value = !!data?.isUpdate;
+    isDetail.value = !data?.showFooter;
+    if (unref(isUpdate)) await setFieldsValue({ ...data.record });
+    setProps({ disabled: !data?.showFooter });
+  });
+
+  const title = computed(() =>
+    !unref(isUpdate) ? '新增设备类型' : unref(isDetail) ? '设备类型详情' : '编辑设备类型',
+  );
+
+  function 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 || '',
+    });
+  }
+
+  function openCategorySelect() {
+    const vals = getFieldsValue();
+    openCategoryModal(true, { equipmentCategoryId: vals.equipmentCategoryId });
+  }
+
+  function clearCategory() {
+    setFieldsValue({ equipmentCategoryId: '', equipmentCategoryName: '' });
+  }
+
+  function onCategorySelect(payload: { equipmentCategoryId?: string; equipmentCategoryName?: string }) {
+    setFieldsValue({
+      equipmentCategoryId: payload.equipmentCategoryId || '',
+      equipmentCategoryName: payload.equipmentCategoryName || '',
+    });
+  }
+
+  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/mesXslManufacturer/MesXslManufacturer.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/mesXslManufacturer/list',
+  checkManufacturerName = '/xslmes/mesXslManufacturer/checkManufacturerName',
+  save = '/xslmes/mesXslManufacturer/add',
+  edit = '/xslmes/mesXslManufacturer/edit',
+  deleteOne = '/xslmes/mesXslManufacturer/delete',
+  deleteBatch = '/xslmes/mesXslManufacturer/deleteBatch',
+  importExcel = '/xslmes/mesXslManufacturer/importExcel',
+  exportXls = '/xslmes/mesXslManufacturer/exportXls',
+  queryById = '/xslmes/mesXslManufacturer/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 checkManufacturerName = (params: { manufacturerName: string; dataId?: string }) =>
+  defHttp.get(
+    { url: Api.checkManufacturerName, 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/mesXslManufacturer/MesXslManufacturer.data.ts

@@ -0,0 +1,79 @@
+import { BasicColumn, FormSchema } from '/@/components/Table';
+import { checkManufacturerName } from './MesXslManufacturer.api';
+
+export const columns: BasicColumn[] = [
+  { title: '厂家类别', align: 'center', dataIndex: 'manufacturerCategory_dictText', width: 120 },
+  { title: '厂家名称', align: 'center', dataIndex: 'manufacturerName', width: 200 },
+  { title: '是否有效', align: 'center', dataIndex: 'validStatus_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: 'manufacturerCategory',
+    component: 'JDictSelectTag',
+    componentProps: { dictCode: 'xslmes_manufacturer_category' },
+    colProps: { span: 8 },
+  },
+  { label: '厂家名称', field: 'manufacturerName', component: 'Input', colProps: { span: 8 } },
+  {
+    label: '是否有效',
+    field: 'validStatus',
+    component: 'JDictSelectTag',
+    componentProps: { dictCode: 'xslmes_manufacturer_valid' },
+    colProps: { span: 8 },
+  },
+];
+
+export const formSchema: FormSchema[] = [
+  { label: '', field: 'id', component: 'Input', show: false },
+  {
+    label: '厂家类别',
+    field: 'manufacturerCategory',
+    required: true,
+    component: 'JDictSelectTag',
+    componentProps: { dictCode: 'xslmes_manufacturer_category', placeholder: '请选择' },
+  },
+  {
+    label: '厂家名称',
+    field: 'manufacturerName',
+    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 checkManufacturerName({ manufacturerName: 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: 'validStatus',
+    required: true,
+    defaultValue: '0',
+    component: 'JDictSelectTag',
+    componentProps: { dictCode: 'xslmes_manufacturer_valid', placeholder: '请选择' },
+  },
+];

jeecgboot-vue3/src/views/xslmes/mesXslManufacturer/MesXslManufacturerList.vue

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

jeecgboot-vue3/src/views/xslmes/mesXslManufacturer/components/MesXslManufacturerModal.vue

@@ -0,0 +1,49 @@
+<template>
+  <BasicModal @register="registerModal" :title="title" width="640" v-bind="$attrs" destroyOnClose @ok="handleSubmit">
+    <BasicForm @register="registerForm" />
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+  import { computed, ref, unref } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { BasicForm, useForm } from '/@/components/Form/index';
+  import { formSchema } from '../MesXslManufacturer.data';
+  import { saveOrUpdate } from '../MesXslManufacturer.api';
+
+  const emit = defineEmits(['register', 'success']);
+  const isUpdate = ref(true);
+  const isDetail = ref(false);
+
+  const [registerForm, { resetFields, setFieldsValue, validate, setProps }] = 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({ validStatus: '0' });
+    setProps({ disabled: !data?.showFooter });
+  });
+
+  const title = computed(() =>
+    !unref(isUpdate) ? '新增厂家信息' : unref(isDetail) ? '厂家信息详情' : '编辑厂家信息',
+  );
+
+  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/mesXslProcessOperation/MesXslProcessOperation.api.ts

@@ -0,0 +1,59 @@
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from '/@/hooks/web/useMessage';
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/xslmes/mesXslProcessOperation/list',
+  checkOperationCode = '/xslmes/mesXslProcessOperation/checkOperationCode',
+  save = '/xslmes/mesXslProcessOperation/add',
+  edit = '/xslmes/mesXslProcessOperation/edit',
+  deleteOne = '/xslmes/mesXslProcessOperation/delete',
+  deleteBatch = '/xslmes/mesXslProcessOperation/deleteBatch',
+  importExcel = '/xslmes/mesXslProcessOperation/importExcel',
+  exportXls = '/xslmes/mesXslProcessOperation/exportXls',
+  queryById = '/xslmes/mesXslProcessOperation/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 });
+
+/** 工序编码唯一性校验（仅未删除数据；同租户；编辑传 dataId） */
+export const checkOperationCode = (params: { operationCode: string; dataId?: string }) =>
+  defHttp.get(
+    { url: Api.checkOperationCode, 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/mesXslProcessOperation/MesXslProcessOperation.data.ts

@@ -0,0 +1,66 @@
+import { BasicColumn, FormSchema } from '/@/components/Table';
+import { checkOperationCode } from './MesXslProcessOperation.api';
+
+export const columns: BasicColumn[] = [
+  { title: '工序编码', align: 'center', dataIndex: 'operationCode', width: 140 },
+  { title: '工序名称', align: 'center', dataIndex: 'operationName', width: 180 },
+  { 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: '修改人', align: 'center', dataIndex: 'updateBy', width: 100 },
+  {
+    title: '修改时间',
+    align: 'center',
+    dataIndex: 'updateTime',
+    width: 165,
+    customRender: ({ text }) => (!text ? '' : String(text).length > 19 ? String(text).substring(0, 19) : text),
+  },
+  { title: '备注', align: 'center', dataIndex: 'remark', width: 200, ellipsis: true },
+];
+
+export const searchFormSchema: FormSchema[] = [
+  { label: '工序编码', field: 'operationCode', component: 'Input', colProps: { span: 6 } },
+  { label: '工序名称', field: 'operationName', component: 'Input', colProps: { span: 6 } },
+];
+
+export const formSchema: FormSchema[] = [
+  { label: '', field: 'id', component: 'Input', show: false },
+  {
+    label: '工序编码',
+    field: 'operationCode',
+    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 checkOperationCode({ operationCode: 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: 'operationName',
+    component: 'Input',
+    required: true,
+    componentProps: { placeholder: '请输入工序名称' },
+  },
+  { label: '备注', field: 'remark', component: 'InputTextArea', componentProps: { rows: 3 } },
+];

jeecgboot-vue3/src/views/xslmes/mesXslProcessOperation/MesXslProcessOperationList.vue

@@ -0,0 +1,127 @@
+<template>
+  <div>
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <template #tableTitle>
+        <a-button type="primary" v-auth="'mes:mes_process_operation:add'" @click="handleAdd" preIcon="ant-design:plus-outlined">
+          新增
+        </a-button>
+        <a-button
+          type="primary"
+          v-auth="'mes:mes_process_operation:exportXls'"
+          preIcon="ant-design:export-outlined"
+          @click="onExportXls"
+        >
+          导出
+        </a-button>
+        <j-upload-button
+          type="primary"
+          v-auth="'mes:mes_process_operation: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_process_operation: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_process_operation:edit' },
+          ]"
+          :dropDownActions="getDropDownAction(record)"
+        />
+      </template>
+    </BasicTable>
+    <MesXslProcessOperationModal @register="registerModal" @success="handleSuccess" />
+  </div>
+</template>
+
+<script lang="ts" name="xslmes-mesXslProcessOperation" setup>
+  import { BasicTable, TableAction } from '/@/components/Table';
+  import { useModal } from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import Icon from '/@/components/Icon';
+  import MesXslProcessOperationModal from './components/MesXslProcessOperationModal.vue';
+  import { columns, searchFormSchema } from './MesXslProcessOperation.data';
+  import { list, deleteOne, batchDelete, getExportUrl, getImportUrl } from './MesXslProcessOperation.api';
+
+  const [registerModal, { openModal }] = useModal();
+
+  const { tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '工序管理',
+      api: list,
+      columns,
+      canResize: true,
+      formConfig: {
+        schemas: searchFormSchema,
+        labelWidth: 120,
+        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_process_operation:delete',
+      },
+    ];
+  }
+</script>

jeecgboot-vue3/src/views/xslmes/mesXslProcessOperation/components/MesXslProcessOperationModal.vue

@@ -0,0 +1,48 @@
+<template>
+  <BasicModal @register="registerModal" :title="title" width="50%" v-bind="$attrs" destroyOnClose @ok="handleSubmit">
+    <BasicForm @register="registerForm" />
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+  import { computed, ref, unref } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { BasicForm, useForm } from '/@/components/Form/index';
+  import { formSchema } from '../MesXslProcessOperation.data';
+  import { saveOrUpdate } from '../MesXslProcessOperation.api';
+
+  const emit = defineEmits(['register', 'success']);
+  const isUpdate = ref(true);
+  const isDetail = ref(false);
+
+  const [registerForm, { resetFields, setFieldsValue, validate, setProps }] = useForm({
+    labelWidth: 120,
+    schemas: formSchema,
+    showActionButtonGroup: false,
+  });
+
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    await resetFields();
+    setModalProps({ confirmLoading: false, showCancelBtn: data?.showFooter, showOkBtn: data?.showFooter });
+    isUpdate.value = !!data?.isUpdate;
+    isDetail.value = !data?.showFooter;
+    if (unref(isUpdate)) await setFieldsValue({ ...data.record });
+    setProps({ disabled: !data?.showFooter });
+  });
+
+  const title = computed(() =>
+    !unref(isUpdate) ? '新增工序' : unref(isDetail) ? '工序详情' : '编辑工序',
+  );
+
+  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/mesXslSparePart/MesXslSparePart.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/mesXslSparePart/list',
+  checkSparePartName = '/xslmes/mesXslSparePart/checkSparePartName',
+  save = '/xslmes/mesXslSparePart/add',
+  edit = '/xslmes/mesXslSparePart/edit',
+  deleteOne = '/xslmes/mesXslSparePart/delete',
+  deleteBatch = '/xslmes/mesXslSparePart/deleteBatch',
+  importExcel = '/xslmes/mesXslSparePart/importExcel',
+  exportXls = '/xslmes/mesXslSparePart/exportXls',
+  queryById = '/xslmes/mesXslSparePart/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 checkSparePartName = (params: { sparePartName: string; dataId?: string }) =>
+  defHttp.get(
+    { url: Api.checkSparePartName, 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/mesXslSparePart/MesXslSparePart.data.ts

@@ -0,0 +1,101 @@
+import { BasicColumn, FormSchema } from '/@/components/Table';
+import { checkSparePartName } from './MesXslSparePart.api';
+
+export const columns: BasicColumn[] = [
+  { title: '备品件名称', align: 'center', dataIndex: 'sparePartName', width: 160 },
+  { title: '类别名称', align: 'center', dataIndex: 'sparePartsCategoryName', width: 140 },
+  { title: '规格型号', align: 'center', dataIndex: 'specModel', width: 140, ellipsis: true },
+  { title: '最大库存', align: 'center', dataIndex: 'maxStock', width: 110 },
+  { title: '最小库存', align: 'center', dataIndex: 'minStock', width: 110 },
+  { title: '单位', align: 'center', dataIndex: 'unitName', 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),
+  },
+  { title: '租户ID', align: 'center', dataIndex: 'tenantId', width: 90, defaultHidden: true },
+];
+
+export const searchFormSchema: FormSchema[] = [
+  { label: '备品件名称', field: 'sparePartName', component: 'Input', colProps: { span: 6 } },
+  { label: '类别名称', field: 'sparePartsCategoryName', component: 'Input', colProps: { span: 6 } },
+  { label: '规格型号', field: 'specModel', component: 'Input', colProps: { span: 6 } },
+];
+
+export const formSchema: FormSchema[] = [
+  { label: '', field: 'id', component: 'Input', show: false },
+  {
+    label: '备品件名称',
+    field: 'sparePartName',
+    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 checkSparePartName({ sparePartName: 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: 'sparePartsCategoryId',
+    component: 'Input',
+    show: false,
+    dynamicRules: () => [{ required: true, message: '请选择所属备品件类别' }],
+  },
+  {
+    label: '所属类别',
+    field: 'sparePartsCategoryName',
+    component: 'Input',
+    slot: 'sparePartsCategoryPicker',
+  },
+  {
+    label: '规格型号',
+    field: 'specModel',
+    component: 'Input',
+    componentProps: { placeholder: '可选' },
+  },
+  {
+    label: '最大库存',
+    field: 'maxStock',
+    required: true,
+    component: 'InputNumber',
+    componentProps: { min: 0, precision: 4, style: { width: '100%' } },
+  },
+  {
+    label: '最小库存',
+    field: 'minStock',
+    required: true,
+    component: 'InputNumber',
+    componentProps: { min: 0, precision: 4, style: { width: '100%' } },
+  },
+  {
+    label: '',
+    field: 'unitId',
+    component: 'Input',
+    show: false,
+    dynamicRules: () => [{ required: true, message: '请选择单位' }],
+  },
+  {
+    label: '单位',
+    field: 'unitName',
+    component: 'Input',
+    slot: 'unitPicker',
+  },
+];