Merge branch 'main' of http://27.223.88.102:33000/chenx/qhmes
This commit is contained in:
2
.vscode/launch.json
vendored
2
.vscode/launch.json
vendored
@@ -8,7 +8,7 @@
|
||||
"mainClass": "org.jeecg.JeecgSystemApplication",
|
||||
"projectName": "jeecg-system-start",
|
||||
"cwd": "${workspaceFolder}/jeecg-boot/jeecg-module-system/jeecg-system-start",
|
||||
"vmArgs": "-Dfile.encoding=UTF-8 -Dsun.stdout.encoding=UTF-8 -Dsun.stderr.encoding=UTF-8"
|
||||
"vmArgs": "-Dfile.encoding=UTF-8 -Dspring.main.banner-mode=log -Dspring.banner.charset=UTF-8 -Dlogging.charset.console=GBK"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
9
.vscode/settings.json
vendored
9
.vscode/settings.json
vendored
@@ -27,5 +27,12 @@
|
||||
"jeecg-boot-platform"
|
||||
],
|
||||
"java.debug.settings.console": "integratedTerminal",
|
||||
"java.debug.settings.vmArgs": "-Dspring.main.banner-mode=log -Dspring.banner.charset=UTF-8 -Dlogging.charset.console=GBK"
|
||||
"java.debug.settings.vmArgs": "-Dfile.encoding=UTF-8 -Dspring.main.banner-mode=log -Dspring.banner.charset=UTF-8 -Dlogging.charset.console=GBK",
|
||||
"terminal.integrated.defaultProfile.windows": "PowerShell",
|
||||
"terminal.integrated.profiles.windows": {
|
||||
"PowerShell": {
|
||||
"source": "PowerShell",
|
||||
"args": ["-NoExit", "-Command", "chcp 936 | Out-Null"]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,91 @@
|
||||
-- MES 设备点检配置（主子表）：建表 + 菜单 + 按钮 + 租户 admin 授权
|
||||
-- 权限前缀：mes:mes_xsl_equip_inspect_config:*
|
||||
-- 父菜单：设备管理；类型字典复用 xslmes_im_item_category（须先有点检及保养项目功能）
|
||||
-- Flyway：V3.9.2_78__mes_xsl_equip_inspect_config.sql
|
||||
SET NAMES utf8mb4;
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `mes_xsl_equip_inspect_config` (
|
||||
`id` varchar(32) NOT NULL COMMENT '主键',
|
||||
`equipment_ledger_id` varchar(32) NOT NULL COMMENT '设备台账主键 mes_xsl_equipment_ledger.id',
|
||||
`equipment_name` varchar(500) DEFAULT NULL COMMENT '设备名称冗余',
|
||||
`equipment_code` varchar(500) DEFAULT NULL COMMENT '设备编号冗余',
|
||||
`config_type` varchar(500) NOT NULL COMMENT '配置类型（字典xslmes_im_item_category：inspect点检/maintain保养；同设备同类型唯一）',
|
||||
`tenant_id` int DEFAULT NULL COMMENT '租户',
|
||||
`sys_org_code` varchar(500) DEFAULT NULL COMMENT '部门',
|
||||
`create_by` varchar(500) DEFAULT NULL COMMENT '创建人',
|
||||
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
|
||||
`update_by` varchar(500) DEFAULT NULL COMMENT '更新人',
|
||||
`update_time` datetime DEFAULT NULL COMMENT '更新时间',
|
||||
`del_flag` int DEFAULT '0' COMMENT '删除标记（0正常1删除）',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `idx_meic_tenant_equip_type` (`tenant_id`, `equipment_ledger_id`, `config_type`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES设备点检配置';
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `mes_xsl_equip_inspect_config_line` (
|
||||
`id` varchar(32) NOT NULL COMMENT '主键',
|
||||
`config_id` varchar(32) NOT NULL COMMENT '主表主键 mes_xsl_equip_inspect_config.id',
|
||||
`inspect_maintain_item_id` varchar(32) NOT NULL COMMENT '点检及保养项目主键 mes_xsl_inspect_maintain_item.id',
|
||||
`item_code` varchar(500) DEFAULT NULL COMMENT '点检项目编号冗余',
|
||||
`item_name` varchar(500) DEFAULT NULL COMMENT '项目名称冗余',
|
||||
`item_category` varchar(500) DEFAULT NULL COMMENT '项目类别冗余',
|
||||
`item_type` varchar(500) DEFAULT NULL COMMENT '项目类型冗余',
|
||||
`equipment_part_name` varchar(500) DEFAULT NULL COMMENT '设备部位名称冗余',
|
||||
`equipment_sub_part_name` varchar(500) DEFAULT NULL COMMENT '设备小部位名称冗余',
|
||||
`inspect_method` varchar(500) DEFAULT NULL COMMENT '点检方式冗余',
|
||||
`judgment_criteria` varchar(500) DEFAULT NULL COMMENT '判断基准冗余',
|
||||
`sort_no` int DEFAULT '0' COMMENT '排序号',
|
||||
`create_by` varchar(500) DEFAULT NULL COMMENT '创建人',
|
||||
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
|
||||
`update_by` varchar(500) DEFAULT NULL COMMENT '更新人',
|
||||
`update_time` datetime DEFAULT NULL COMMENT '更新时间',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `idx_meicl_config` (`config_id`),
|
||||
KEY `idx_meicl_item` (`inspect_maintain_item_id`),
|
||||
UNIQUE KEY `uk_meicl_config_item` (`config_id`, `inspect_maintain_item_id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES设备点检配置明细';
|
||||
|
||||
SET @mes_tenant_id = 1002;
|
||||
|
||||
SET @mes_equip_pid = (
|
||||
SELECT `id` FROM `sys_permission`
|
||||
WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` = '设备管理'
|
||||
LIMIT 1
|
||||
);
|
||||
SET @mes_equip_pid = IFNULL(@mes_equip_pid, '1860000000000000133');
|
||||
|
||||
INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `keep_alive`, `internal_or_external`, `create_by`, `create_time`)
|
||||
VALUES ('1860000000000000148', @mes_equip_pid, '设备点检配置', '/xslmes/mesXslEquipInspectConfig', 'xslmes/mesXslEquipInspectConfig/MesXslEquipInspectConfigList', NULL, 1, NULL, '1', 12, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW())
|
||||
ON DUPLICATE KEY UPDATE
|
||||
`parent_id` = VALUES(`parent_id`), `name` = VALUES(`name`), `url` = VALUES(`url`), `component` = VALUES(`component`), `component_name` = VALUES(`component_name`),
|
||||
`menu_type` = VALUES(`menu_type`), `perms` = VALUES(`perms`), `perms_type` = VALUES(`perms_type`), `sort_no` = VALUES(`sort_no`),
|
||||
`is_route` = VALUES(`is_route`), `is_leaf` = VALUES(`is_leaf`), `hidden` = VALUES(`hidden`), `status` = VALUES(`status`), `del_flag` = VALUES(`del_flag`),
|
||||
`keep_alive` = VALUES(`keep_alive`), `internal_or_external` = VALUES(`internal_or_external`), `icon` = 'ant-design:control-outlined';
|
||||
|
||||
UPDATE `sys_permission` SET `icon` = 'ant-design:control-outlined' WHERE `id` = '1860000000000000148' AND `del_flag` = 0;
|
||||
|
||||
INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `status`, `del_flag`, `create_by`, `create_time`) VALUES
|
||||
('1860000000000000149', '1860000000000000148', '新增', 2, 'mes:mes_xsl_equip_inspect_config:add', '1', '1', 0, 'admin', NOW()),
|
||||
('1860000000000000150', '1860000000000000148', '编辑', 2, 'mes:mes_xsl_equip_inspect_config:edit', '1', '1', 0, 'admin', NOW()),
|
||||
('1860000000000000151', '1860000000000000148', '删除', 2, 'mes:mes_xsl_equip_inspect_config:delete', '1', '1', 0, 'admin', NOW()),
|
||||
('1860000000000000152', '1860000000000000148', '批量删除', 2, 'mes:mes_xsl_equip_inspect_config:deleteBatch', '1', '1', 0, 'admin', NOW()),
|
||||
('1860000000000000153', '1860000000000000148', '导出', 2, 'mes:mes_xsl_equip_inspect_config:exportXls', '1', '1', 0, 'admin', NOW()),
|
||||
('1860000000000000154', '1860000000000000148', '导入', 2, 'mes:mes_xsl_equip_inspect_config:importExcel', '1', '1', 0, 'admin', NOW())
|
||||
ON DUPLICATE KEY UPDATE
|
||||
`parent_id` = VALUES(`parent_id`), `name` = VALUES(`name`), `menu_type` = VALUES(`menu_type`), `perms` = VALUES(`perms`), `perms_type` = VALUES(`perms_type`),
|
||||
`status` = VALUES(`status`), `del_flag` = VALUES(`del_flag`);
|
||||
|
||||
INSERT INTO `sys_role_permission`(`id`, `role_id`, `permission_id`, `operate_date`, `operate_ip`)
|
||||
SELECT REPLACE(UUID(), '-', ''), r.`id`, p.`id`, NOW(), '127.0.0.1'
|
||||
FROM `sys_role` r
|
||||
CROSS JOIN `sys_permission` p
|
||||
WHERE r.`tenant_id` = @mes_tenant_id
|
||||
AND r.`role_code` = 'admin'
|
||||
AND p.`id` IN (
|
||||
'1860000000000000148',
|
||||
'1860000000000000149', '1860000000000000150', '1860000000000000151', '1860000000000000152',
|
||||
'1860000000000000153', '1860000000000000154'
|
||||
)
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM `sys_role_permission` rp
|
||||
WHERE rp.`role_id` = r.`id` AND rp.`permission_id` = p.`id`
|
||||
);
|
||||
138
jeecg-boot/db/mes-xsl-equip-inspect-record-menu-permission.sql
Normal file
138
jeecg-boot/db/mes-xsl-equip-inspect-record-menu-permission.sql
Normal file
@@ -0,0 +1,138 @@
|
||||
-- MES 点检/保养记录（主子表）：建表 + 字典 + 菜单 + 按钮 + 租户 admin 授权
|
||||
-- 权限前缀：mes:mes_xsl_equip_inspect_record:*
|
||||
-- 父菜单：设备管理；依赖设备点检配置、设备台账
|
||||
-- Flyway：V3.9.2_79__mes_xsl_equip_inspect_record.sql
|
||||
SET NAMES utf8mb4;
|
||||
|
||||
INSERT INTO `sys_dict`(`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `type`, `tenant_id`)
|
||||
SELECT REPLACE(UUID(), '-', ''), 'MES点检记录结果', 'xslmes_im_inspect_result', '合格/不合格', 0, 'admin', NOW(), 0, 0
|
||||
WHERE NOT EXISTS (SELECT 1 FROM `sys_dict` WHERE `dict_code` = 'xslmes_im_inspect_result' AND `del_flag` = 0);
|
||||
|
||||
INSERT INTO `sys_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`)
|
||||
SELECT REPLACE(UUID(), '-', ''), d.`id`, '合格', 'pass', '', 1, 1, 'admin', NOW()
|
||||
FROM `sys_dict` d
|
||||
WHERE d.`dict_code` = 'xslmes_im_inspect_result' AND NOT EXISTS (SELECT 1 FROM `sys_dict_item` i WHERE i.`dict_id` = d.`id` AND i.`item_value` = 'pass');
|
||||
|
||||
INSERT INTO `sys_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`)
|
||||
SELECT REPLACE(UUID(), '-', ''), d.`id`, '不合格', 'fail', '', 2, 1, 'admin', NOW()
|
||||
FROM `sys_dict` d
|
||||
WHERE d.`dict_code` = 'xslmes_im_inspect_result' AND NOT EXISTS (SELECT 1 FROM `sys_dict_item` i WHERE i.`dict_id` = d.`id` AND i.`item_value` = 'fail');
|
||||
|
||||
INSERT INTO `sys_dict`(`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `type`, `tenant_id`)
|
||||
SELECT REPLACE(UUID(), '-', ''), 'MES点检记录状态', 'xslmes_im_record_status', '待点检/已点检', 0, 'admin', NOW(), 0, 0
|
||||
WHERE NOT EXISTS (SELECT 1 FROM `sys_dict` WHERE `dict_code` = 'xslmes_im_record_status' AND `del_flag` = 0);
|
||||
|
||||
INSERT INTO `sys_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`)
|
||||
SELECT REPLACE(UUID(), '-', ''), d.`id`, '待点检', 'pending', '', 1, 1, 'admin', NOW()
|
||||
FROM `sys_dict` d
|
||||
WHERE d.`dict_code` = 'xslmes_im_record_status' AND NOT EXISTS (SELECT 1 FROM `sys_dict_item` i WHERE i.`dict_id` = d.`id` AND i.`item_value` = 'pending');
|
||||
|
||||
INSERT INTO `sys_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`)
|
||||
SELECT REPLACE(UUID(), '-', ''), d.`id`, '已点检', 'done', '', 2, 1, 'admin', NOW()
|
||||
FROM `sys_dict` d
|
||||
WHERE d.`dict_code` = 'xslmes_im_record_status' AND NOT EXISTS (SELECT 1 FROM `sys_dict_item` i WHERE i.`dict_id` = d.`id` AND i.`item_value` = 'done');
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `mes_xsl_equip_inspect_record` (
|
||||
`id` varchar(32) NOT NULL COMMENT '主键',
|
||||
`record_no` varchar(32) NOT NULL COMMENT '记录编号（EC+yyyyMMdd+4位流水，租户内按日递增）',
|
||||
`plan_no` varchar(500) DEFAULT NULL COMMENT '计划单号',
|
||||
`plan_id` varchar(32) DEFAULT NULL COMMENT '计划主键（隐藏）',
|
||||
`equipment_ledger_id` varchar(32) NOT NULL COMMENT '设备台账主键 mes_xsl_equipment_ledger.id',
|
||||
`equipment_code` varchar(500) DEFAULT NULL COMMENT '设备编码冗余',
|
||||
`equipment_name` varchar(500) DEFAULT NULL COMMENT '设备名称冗余',
|
||||
`equip_inspect_config_id` varchar(32) DEFAULT NULL COMMENT '设备点检配置主键 mes_xsl_equip_inspect_config.id',
|
||||
`record_type` varchar(500) NOT NULL COMMENT '类型（字典xslmes_im_item_category：inspect点检/maintain保养）',
|
||||
`inspect_date` date DEFAULT NULL COMMENT '点检日期',
|
||||
`inspector_user_id` varchar(32) DEFAULT NULL COMMENT '点检人用户ID',
|
||||
`inspector_username` varchar(500) DEFAULT NULL COMMENT '点检人账号',
|
||||
`inspector_realname` varchar(500) DEFAULT NULL COMMENT '点检人姓名',
|
||||
`inspect_result` varchar(500) NOT NULL COMMENT '点检结果（字典xslmes_im_inspect_result：pass合格/fail不合格）',
|
||||
`record_status` varchar(500) NOT NULL COMMENT '状态（字典xslmes_im_record_status：pending待点检/done已点检）',
|
||||
`handled_flag` varchar(1) DEFAULT NULL COMMENT '是否已处理（字典yn：1是0否，仅不合格记录使用）',
|
||||
`handler_user_id` varchar(32) DEFAULT NULL COMMENT '处理人用户ID',
|
||||
`handler_username` varchar(500) DEFAULT NULL COMMENT '处理人账号',
|
||||
`handler_realname` varchar(500) DEFAULT NULL COMMENT '处理人姓名',
|
||||
`handle_time` datetime DEFAULT NULL COMMENT '处理时间',
|
||||
`tenant_id` int DEFAULT NULL COMMENT '租户',
|
||||
`sys_org_code` varchar(500) DEFAULT NULL COMMENT '部门',
|
||||
`create_by` varchar(500) DEFAULT NULL COMMENT '创建人',
|
||||
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
|
||||
`update_by` varchar(500) DEFAULT NULL COMMENT '更新人',
|
||||
`update_time` datetime DEFAULT NULL COMMENT '更新时间',
|
||||
`del_flag` int DEFAULT '0' COMMENT '删除标记（0正常1删除）',
|
||||
PRIMARY KEY (`id`),
|
||||
UNIQUE KEY `uk_meir_tenant_record_no` (`tenant_id`, `record_no`),
|
||||
KEY `idx_meir_equip_type` (`equipment_ledger_id`, `record_type`),
|
||||
KEY `idx_meir_inspect_date` (`inspect_date`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES点检保养记录';
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `mes_xsl_equip_inspect_record_line` (
|
||||
`id` varchar(32) NOT NULL COMMENT '主键',
|
||||
`record_id` varchar(32) NOT NULL COMMENT '主表主键 mes_xsl_equip_inspect_record.id',
|
||||
`equip_inspect_config_line_id` varchar(32) NOT NULL COMMENT '设备点检配置明细主键 mes_xsl_equip_inspect_config_line.id',
|
||||
`inspect_maintain_item_id` varchar(32) DEFAULT NULL COMMENT '点检及保养项目主键冗余',
|
||||
`item_code` varchar(500) DEFAULT NULL COMMENT '点检项目编号冗余',
|
||||
`item_name` varchar(500) DEFAULT NULL COMMENT '项目名称冗余',
|
||||
`item_category` varchar(500) DEFAULT NULL COMMENT '项目类别冗余',
|
||||
`item_type` varchar(500) DEFAULT NULL COMMENT '项目类型冗余',
|
||||
`equipment_part_name` varchar(500) DEFAULT NULL COMMENT '设备部位冗余',
|
||||
`equipment_sub_part_name` varchar(500) DEFAULT NULL COMMENT '设备小部位冗余',
|
||||
`inspect_method` varchar(500) DEFAULT NULL COMMENT '点检方式冗余',
|
||||
`judgment_criteria` varchar(500) DEFAULT NULL COMMENT '判断基准冗余',
|
||||
`line_inspect_result` varchar(500) DEFAULT NULL COMMENT '明细点检结果（文本）',
|
||||
`picture_files` varchar(2000) DEFAULT NULL COMMENT '图片（上传路径，逗号分隔）',
|
||||
`sort_no` int DEFAULT '0' COMMENT '排序号',
|
||||
`create_by` varchar(500) DEFAULT NULL COMMENT '创建人',
|
||||
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
|
||||
`update_by` varchar(500) DEFAULT NULL COMMENT '更新人',
|
||||
`update_time` datetime DEFAULT NULL COMMENT '更新时间',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `idx_meirl_record` (`record_id`),
|
||||
KEY `idx_meirl_config_line` (`equip_inspect_config_line_id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES点检保养记录明细';
|
||||
|
||||
SET @mes_tenant_id = 1002;
|
||||
|
||||
SET @mes_equip_pid = (
|
||||
SELECT `id` FROM `sys_permission`
|
||||
WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` = '设备管理'
|
||||
LIMIT 1
|
||||
);
|
||||
SET @mes_equip_pid = IFNULL(@mes_equip_pid, '1860000000000000133');
|
||||
|
||||
INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `keep_alive`, `internal_or_external`, `create_by`, `create_time`)
|
||||
VALUES ('1860000000000000155', @mes_equip_pid, '点检保养记录', '/xslmes/mesXslEquipInspectRecord', 'xslmes/mesXslEquipInspectRecord/MesXslEquipInspectRecordList', 'MesXslEquipInspectRecordList', 1, NULL, '1', 13, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW())
|
||||
ON DUPLICATE KEY UPDATE
|
||||
`parent_id` = VALUES(`parent_id`), `name` = VALUES(`name`), `url` = VALUES(`url`), `component` = VALUES(`component`), `component_name` = VALUES(`component_name`),
|
||||
`menu_type` = VALUES(`menu_type`), `perms` = VALUES(`perms`), `perms_type` = VALUES(`perms_type`), `sort_no` = VALUES(`sort_no`),
|
||||
`is_route` = VALUES(`is_route`), `is_leaf` = VALUES(`is_leaf`), `hidden` = VALUES(`hidden`), `status` = VALUES(`status`), `del_flag` = VALUES(`del_flag`),
|
||||
`keep_alive` = VALUES(`keep_alive`), `internal_or_external` = VALUES(`internal_or_external`), `icon` = 'ant-design:file-done-outlined';
|
||||
|
||||
UPDATE `sys_permission` SET `icon` = 'ant-design:file-done-outlined' WHERE `id` = '1860000000000000155' AND `del_flag` = 0;
|
||||
|
||||
INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `status`, `del_flag`, `create_by`, `create_time`) VALUES
|
||||
('1860000000000000156', '1860000000000000155', '新增', 2, 'mes:mes_xsl_equip_inspect_record:add', '1', '1', 0, 'admin', NOW()),
|
||||
('1860000000000000157', '1860000000000000155', '编辑', 2, 'mes:mes_xsl_equip_inspect_record:edit', '1', '1', 0, 'admin', NOW()),
|
||||
('1860000000000000158', '1860000000000000155', '删除', 2, 'mes:mes_xsl_equip_inspect_record:delete', '1', '1', 0, 'admin', NOW()),
|
||||
('1860000000000000159', '1860000000000000155', '批量删除', 2, 'mes:mes_xsl_equip_inspect_record:deleteBatch', '1', '1', 0, 'admin', NOW()),
|
||||
('1860000000000000160', '1860000000000000155', '导出', 2, 'mes:mes_xsl_equip_inspect_record:exportXls', '1', '1', 0, 'admin', NOW()),
|
||||
('1860000000000000161', '1860000000000000155', '导入', 2, 'mes:mes_xsl_equip_inspect_record:importExcel', '1', '1', 0, 'admin', NOW())
|
||||
ON DUPLICATE KEY UPDATE
|
||||
`parent_id` = VALUES(`parent_id`), `name` = VALUES(`name`), `menu_type` = VALUES(`menu_type`), `perms` = VALUES(`perms`), `perms_type` = VALUES(`perms_type`),
|
||||
`status` = VALUES(`status`), `del_flag` = VALUES(`del_flag`);
|
||||
|
||||
INSERT INTO `sys_role_permission`(`id`, `role_id`, `permission_id`, `operate_date`, `operate_ip`)
|
||||
SELECT REPLACE(UUID(), '-', ''), r.`id`, p.`id`, NOW(), '127.0.0.1'
|
||||
FROM `sys_role` r
|
||||
CROSS JOIN `sys_permission` p
|
||||
WHERE r.`tenant_id` = @mes_tenant_id
|
||||
AND r.`role_code` = 'admin'
|
||||
AND p.`id` IN (
|
||||
'1860000000000000155',
|
||||
'1860000000000000156', '1860000000000000157', '1860000000000000158', '1860000000000000159',
|
||||
'1860000000000000160', '1860000000000000161'
|
||||
)
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM `sys_role_permission` rp
|
||||
WHERE rp.`role_id` = r.`id` AND rp.`permission_id` = p.`id`
|
||||
);
|
||||
105
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/doc/代码修改日志
Normal file
105
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/doc/代码修改日志
Normal file
@@ -0,0 +1,105 @@
|
||||
-- author:jiangxh---date:20260521--for: 【配合示方】新增配合示方主子表模块 ---
|
||||
jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_91__mes_xsl_formula_spec.sql
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslFormulaSpec.java
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslFormulaSpecLine.java
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/vo/MesXslFormulaSpecPage.java
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslFormulaSpecMapper.java
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslFormulaSpecLineMapper.java
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslFormulaSpecService.java
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslFormulaSpecServiceImpl.java
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslFormulaSpecController.java
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpecList.vue
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.data.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.api.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
|
||||
|
||||
-- author:jiangxh---date:20260521--for: 【配合示方】主表新增混合段1-7合计字段 ---
|
||||
jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_92__mes_xsl_formula_spec_stage_total.sql
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslFormulaSpec.java
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.data.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
|
||||
|
||||
-- author:cursor---date:20260521--for: 【配合示方】STEP全为A/Q时对应胶比重清零 ---
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslFormulaSpecServiceImpl.java
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.data.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
|
||||
|
||||
-- author:cursor---date:20260521--for: 【配合示方】含胶率按密炼物料小类汇总重量% ---
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslFormulaSpecServiceImpl.java
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.data.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
|
||||
jeecgboot-vue3/src/views/mes/material/modules/MesMixerMaterialSelectModal.vue
|
||||
|
||||
-- author:cursor---date:20260521--for: 【配合示方】含胶率物料小类可配置设置弹窗 ---
|
||||
jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_96__mes_xsl_formula_spec_rubber_content_setting.sql
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslFormulaSpecSetting.java
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/vo/MesXslFormulaRubberContentSettingVO.java
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslFormulaSpecSettingMapper.java
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslFormulaSpecSettingService.java
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslFormulaSpecSettingServiceImpl.java
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslFormulaSpecController.java
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslFormulaSpecServiceImpl.java
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.api.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.data.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaRubberContentSettingModal.vue
|
||||
|
||||
-- author:cursor---date:20260521--for: 【配合示方】含胶率设置改用系统MES物料分类字典 ---
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.data.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.api.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaRubberContentSettingModal.vue
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslFormulaSpecSettingService.java
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslFormulaSpecSettingServiceImpl.java
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslFormulaSpecController.java
|
||||
|
||||
-- author:cursor---date:20260521--for: 【配合示方】含胶率设置小类下拉对齐密炼物料loadTreeData加载 ---
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.data.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaRubberContentSettingModal.vue
|
||||
|
||||
-- author:cursor---date:20260521--for: 【配合示方】含胶率设置改为loadAllData加载MES物料分类全部节点 ---
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.data.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaRubberContentSettingModal.vue
|
||||
|
||||
-- author:cursor---date:20260521--for: 【配合示方】含胶率设置弹窗openModal未传data导致不加载分类 ---
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaRubberContentSettingModal.vue
|
||||
|
||||
-- author:cursor---date:20260521--for: 【配合示方】明细新增物料大类/小类展示列（不落库） ---
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.data.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
|
||||
jeecgboot-vue3/src/views/mes/material/modules/MesMixerMaterialSelectModal.vue
|
||||
|
||||
-- author:cursor---date:20260521--for: 【配合示方】明细备注列与1-7段列宽适当缩小 ---
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.data.ts
|
||||
|
||||
-- author:cursor---date:20260521--for: 【配合示方】基本信息模块改为汇总格状布局 ---
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
|
||||
|
||||
-- author:cursor---date:20260521--for: 【配合示方】基本信息改为显式表格格状布局 ---
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.data.ts
|
||||
|
||||
-- author:cursor---date:20260521--for: 【配合示方】汇总与基本信息标题格增加内阴影 ---
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
|
||||
|
||||
-- author:cursor---date:20260521--for: 【配合示方】明细列表新增列显示/隐藏设置 ---
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.data.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaLineColumnSetting.vue
|
||||
|
||||
-- author:cursor---date:20260521--for: 【配合示方】明细列表列设置改为保存后生效并修复勾选状态 ---
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.data.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaLineColumnSetting.vue
|
||||
|
||||
-- author:cursor---date:20260521--for: 【配合示方】审批进度编制人展示真实姓名 ---
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.data.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslFormulaSpec.java
|
||||
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslFormulaSpecServiceImpl.java
|
||||
|
||||
-- author:cursor---date:20260521--for: 【配合示方】编辑页A胶TOTAL PHR缺失时按明细补算回显 ---
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
|
||||
|
||||
-- author:cursor---date:20260521--for: 【配合示方】编辑打开时基本资料闪清修复 ---
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
|
||||
@@ -0,0 +1,230 @@
|
||||
package org.jeecg.modules.xslmes.controller;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.jeecg.common.aspect.annotation.AutoLog;
|
||||
import org.jeecg.common.constant.CommonConstant;
|
||||
import org.jeecg.common.system.base.controller.JeecgController;
|
||||
import org.jeecg.common.system.query.QueryGenerator;
|
||||
import org.jeecg.common.util.oConvertUtils;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfig;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfigLine;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipmentLedger;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslInspectMaintainItem;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslEquipInspectConfigService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslEquipmentLedgerService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslInspectMaintainItemService;
|
||||
import org.jeecg.modules.xslmes.vo.MesXslEquipInspectConfigPage;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
/**
|
||||
* MES 设备点检配置（主子表）
|
||||
*/
|
||||
@Tag(name = "MES设备点检配置")
|
||||
@RestController
|
||||
@RequestMapping("/xslmes/mesXslEquipInspectConfig")
|
||||
@Slf4j
|
||||
public class MesXslEquipInspectConfigController
|
||||
extends JeecgController<MesXslEquipInspectConfig, IMesXslEquipInspectConfigService> {
|
||||
|
||||
private static final Set<String> CONFIG_TYPE = Set.of("inspect", "maintain");
|
||||
|
||||
@Autowired
|
||||
private IMesXslEquipInspectConfigService mesXslEquipInspectConfigService;
|
||||
|
||||
@Autowired
|
||||
private IMesXslEquipmentLedgerService mesXslEquipmentLedgerService;
|
||||
|
||||
@Autowired
|
||||
private IMesXslInspectMaintainItemService mesXslInspectMaintainItemService;
|
||||
|
||||
@Operation(summary = "MES设备点检配置-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<MesXslEquipInspectConfig>> queryPageList(
|
||||
MesXslEquipInspectConfig model,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<MesXslEquipInspectConfig> queryWrapper = QueryGenerator.initQueryWrapper(model, req.getParameterMap());
|
||||
queryWrapper.orderByDesc("create_time");
|
||||
Page<MesXslEquipInspectConfig> page = new Page<>(pageNo, pageSize);
|
||||
IPage<MesXslEquipInspectConfig> pageList = mesXslEquipInspectConfigService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
@AutoLog(value = "MES设备点检配置-添加")
|
||||
@Operation(summary = "MES设备点检配置-添加")
|
||||
@RequiresPermissions("mes:mes_xsl_equip_inspect_config:add")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<String> add(@RequestBody MesXslEquipInspectConfigPage page) {
|
||||
MesXslEquipInspectConfig main = new MesXslEquipInspectConfig();
|
||||
BeanUtils.copyProperties(page, main);
|
||||
//update-begin---author:jiangxh ---date:20260519 for：【MES】设备点检配置保存校验-----------
|
||||
String err = validateForSave(main, page.getLineList(), null);
|
||||
if (err != null) {
|
||||
return Result.error(err);
|
||||
}
|
||||
//update-end---author:jiangxh ---date:20260519 for：【MES】设备点检配置保存校验-----------
|
||||
mesXslEquipInspectConfigService.saveMain(main, page.getLineList());
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
|
||||
@AutoLog(value = "MES设备点检配置-编辑")
|
||||
@Operation(summary = "MES设备点检配置-编辑")
|
||||
@RequiresPermissions("mes:mes_xsl_equip_inspect_config:edit")
|
||||
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
|
||||
public Result<String> edit(@RequestBody MesXslEquipInspectConfigPage page) {
|
||||
MesXslEquipInspectConfig main = new MesXslEquipInspectConfig();
|
||||
BeanUtils.copyProperties(page, main);
|
||||
//update-begin---author:jiangxh ---date:20260519 for：【MES】设备点检配置保存校验-----------
|
||||
String err = validateForSave(main, page.getLineList(), main.getId());
|
||||
if (err != null) {
|
||||
return Result.error(err);
|
||||
}
|
||||
//update-end---author:jiangxh ---date:20260519 for：【MES】设备点检配置保存校验-----------
|
||||
mesXslEquipInspectConfigService.updateMain(main, page.getLineList());
|
||||
return Result.OK("编辑成功!");
|
||||
}
|
||||
|
||||
@AutoLog(value = "MES设备点检配置-删除")
|
||||
@Operation(summary = "MES设备点检配置-通过id删除")
|
||||
@RequiresPermissions("mes:mes_xsl_equip_inspect_config:delete")
|
||||
@DeleteMapping(value = "/delete")
|
||||
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
|
||||
mesXslEquipInspectConfigService.delMain(id);
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
|
||||
@AutoLog(value = "MES设备点检配置-批量删除")
|
||||
@Operation(summary = "MES设备点检配置-批量删除")
|
||||
@RequiresPermissions("mes:mes_xsl_equip_inspect_config:deleteBatch")
|
||||
@DeleteMapping(value = "/deleteBatch")
|
||||
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
||||
mesXslEquipInspectConfigService.delBatchMain(Arrays.asList(ids.split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
@Operation(summary = "MES设备点检配置-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<MesXslEquipInspectConfig> queryById(@RequestParam(name = "id", required = true) String id) {
|
||||
MesXslEquipInspectConfig entity = mesXslEquipInspectConfigService.getById(id);
|
||||
if (entity == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(entity);
|
||||
}
|
||||
|
||||
@Operation(summary = "MES设备点检配置-查询明细")
|
||||
@GetMapping(value = "/queryLineListByConfigId")
|
||||
public Result<List<MesXslEquipInspectConfigLine>> queryLineListByConfigId(
|
||||
@RequestParam(name = "id", required = true) String id) {
|
||||
return Result.OK(mesXslEquipInspectConfigService.selectLinesByConfigId(id));
|
||||
}
|
||||
|
||||
@RequiresPermissions("mes:mes_xsl_equip_inspect_config:exportXls")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, MesXslEquipInspectConfig model) {
|
||||
return super.exportXls(request, model, MesXslEquipInspectConfig.class, "MES设备点检配置");
|
||||
}
|
||||
|
||||
@RequiresPermissions("mes:mes_xsl_equip_inspect_config:importExcel")
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
return super.importExcel(request, response, MesXslEquipInspectConfig.class);
|
||||
}
|
||||
|
||||
//update-begin---author:jiangxh ---date:20260519 for：【MES】设备点检配置：主表唯一、明细项目不重复、从点检保养项目带出-----------
|
||||
private String validateForSave(
|
||||
MesXslEquipInspectConfig main, List<MesXslEquipInspectConfigLine> lineList, String excludeId) {
|
||||
if (main == null) {
|
||||
return "参数不能为空";
|
||||
}
|
||||
if (oConvertUtils.isEmpty(main.getEquipmentLedgerId())) {
|
||||
return "请选择设备台账";
|
||||
}
|
||||
MesXslEquipmentLedger ledger = mesXslEquipmentLedgerService.getById(main.getEquipmentLedgerId());
|
||||
if (ledger == null || isDeleted(ledger.getDelFlag())) {
|
||||
return "设备台账不存在或已删除";
|
||||
}
|
||||
main.setEquipmentName(ledger.getEquipmentName());
|
||||
main.setEquipmentCode(ledger.getEquipmentCode());
|
||||
|
||||
String configType = main.getConfigType();
|
||||
if (configType != null) {
|
||||
configType = configType.trim();
|
||||
}
|
||||
if (oConvertUtils.isEmpty(configType) || !CONFIG_TYPE.contains(configType)) {
|
||||
return "类型无效，请选择点检或保养";
|
||||
}
|
||||
main.setConfigType(configType);
|
||||
|
||||
if (mesXslEquipInspectConfigService.isConfigDuplicated(
|
||||
main.getEquipmentLedgerId(), configType, excludeId, main)) {
|
||||
return "该设备在此类型（点检/保养）下已存在配置，不能重复添加";
|
||||
}
|
||||
|
||||
if (lineList == null || lineList.isEmpty()) {
|
||||
return "请至少添加一条点检项目明细";
|
||||
}
|
||||
|
||||
Set<String> itemIds = new HashSet<>();
|
||||
int sort = 0;
|
||||
for (int i = 0; i < lineList.size(); i++) {
|
||||
MesXslEquipInspectConfigLine line = lineList.get(i);
|
||||
if (line == null) {
|
||||
continue;
|
||||
}
|
||||
int rowNo = i + 1;
|
||||
if (oConvertUtils.isEmpty(line.getInspectMaintainItemId())) {
|
||||
return "第 " + rowNo + " 行未选择点检及保养项目";
|
||||
}
|
||||
String itemId = line.getInspectMaintainItemId().trim();
|
||||
if (!itemIds.add(itemId)) {
|
||||
return "第 " + rowNo + " 行点检项目与前面行重复，同一配置中点检项目不能重复";
|
||||
}
|
||||
MesXslInspectMaintainItem item = mesXslInspectMaintainItemService.getById(itemId);
|
||||
if (item == null || isDeleted(item.getDelFlag())) {
|
||||
return "第 " + rowNo + " 行点检及保养项目不存在或已删除";
|
||||
}
|
||||
if (!configType.equals(item.getItemCategory())) {
|
||||
return "第 " + rowNo + " 行项目类别与配置类型不一致（配置为"
|
||||
+ ("inspect".equals(configType) ? "点检" : "保养")
|
||||
+ "）";
|
||||
}
|
||||
line.setInspectMaintainItemId(itemId);
|
||||
line.setItemCode(item.getItemCode());
|
||||
line.setItemName(item.getItemName());
|
||||
line.setItemCategory(item.getItemCategory());
|
||||
line.setItemType(item.getItemType());
|
||||
line.setEquipmentPartName(item.getEquipmentPartName());
|
||||
line.setEquipmentSubPartName(item.getEquipmentSubPartName());
|
||||
line.setInspectMethod(item.getInspectMethod());
|
||||
line.setJudgmentCriteria(item.getJudgmentCriteria());
|
||||
line.setSortNo(sort++);
|
||||
}
|
||||
if (itemIds.isEmpty()) {
|
||||
return "请至少添加一条点检项目明细";
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private static boolean isDeleted(Integer delFlag) {
|
||||
return delFlag != null && delFlag.equals(CommonConstant.DEL_FLAG_1);
|
||||
}
|
||||
//update-end---author:jiangxh ---date:20260519 for：【MES】设备点检配置：主表唯一、明细项目不重复、从点检保养项目带出-----------
|
||||
}
|
||||
@@ -0,0 +1,411 @@
|
||||
package org.jeecg.modules.xslmes.controller;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import java.util.Arrays;
|
||||
import java.util.Date;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.shiro.SecurityUtils;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.jeecg.common.aspect.annotation.AutoLog;
|
||||
import org.jeecg.common.constant.CommonConstant;
|
||||
import org.jeecg.common.system.base.controller.JeecgController;
|
||||
import org.jeecg.common.system.query.QueryGenerator;
|
||||
import org.jeecg.common.system.vo.LoginUser;
|
||||
import org.jeecg.common.util.oConvertUtils;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfig;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipInspectRecord;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipInspectRecordLine;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipmentLedger;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslEquipInspectConfigService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslEquipInspectRecordService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslEquipmentLedgerService;
|
||||
import org.jeecg.modules.xslmes.util.MesXslEquipInspectBizMsg;
|
||||
import org.jeecg.modules.xslmes.vo.MesXslEquipInspectRecordBatchCreateDTO;
|
||||
import org.jeecg.modules.xslmes.vo.MesXslEquipInspectRecordBatchCreateResult;
|
||||
import org.jeecg.modules.xslmes.vo.MesXslEquipInspectRecordHandleDTO;
|
||||
import org.jeecg.modules.xslmes.vo.MesXslEquipInspectRecordPage;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
/**
|
||||
* MES 点检/保养记录（主子表）
|
||||
*/
|
||||
@Tag(name = "MES点检保养记录")
|
||||
@RestController
|
||||
@RequestMapping("/xslmes/mesXslEquipInspectRecord")
|
||||
@Slf4j
|
||||
public class MesXslEquipInspectRecordController
|
||||
extends JeecgController<MesXslEquipInspectRecord, IMesXslEquipInspectRecordService> {
|
||||
|
||||
private static final Set<String> RECORD_TYPE = Set.of("inspect", "maintain");
|
||||
private static final Set<String> INSPECT_RESULT = Set.of("pass", "fail");
|
||||
private static final Set<String> RECORD_STATUS = Set.of("pending", "done");
|
||||
|
||||
@Autowired
|
||||
private IMesXslEquipInspectRecordService mesXslEquipInspectRecordService;
|
||||
|
||||
@Autowired
|
||||
private IMesXslEquipmentLedgerService mesXslEquipmentLedgerService;
|
||||
|
||||
@Autowired
|
||||
private IMesXslEquipInspectConfigService mesXslEquipInspectConfigService;
|
||||
|
||||
@Operation(summary = "MES点检保养记录-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<MesXslEquipInspectRecord>> queryPageList(
|
||||
MesXslEquipInspectRecord model,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<MesXslEquipInspectRecord> queryWrapper = QueryGenerator.initQueryWrapper(model, req.getParameterMap());
|
||||
queryWrapper.orderByDesc("create_time");
|
||||
Page<MesXslEquipInspectRecord> page = new Page<>(pageNo, pageSize);
|
||||
IPage<MesXslEquipInspectRecord> pageList = mesXslEquipInspectRecordService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
@AutoLog(value = "MES点检保养记录-添加")
|
||||
@Operation(summary = "MES点检保养记录-添加")
|
||||
@RequiresPermissions("mes:mes_xsl_equip_inspect_record:add")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<String> add(@RequestBody MesXslEquipInspectRecordPage page) {
|
||||
MesXslEquipInspectRecord main = new MesXslEquipInspectRecord();
|
||||
BeanUtils.copyProperties(page, main);
|
||||
String err = validateForSave(main, page.getLineList(), null);
|
||||
if (err != null) {
|
||||
return Result.error(err);
|
||||
}
|
||||
fillRecordNoIfEmpty(main);
|
||||
fillInspector(main);
|
||||
mesXslEquipInspectRecordService.saveMain(main, page.getLineList());
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
|
||||
@AutoLog(value = "MES点检保养记录-编辑")
|
||||
@Operation(summary = "MES点检保养记录-编辑")
|
||||
@RequiresPermissions("mes:mes_xsl_equip_inspect_record:edit")
|
||||
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
|
||||
public Result<String> edit(@RequestBody MesXslEquipInspectRecordPage page) {
|
||||
MesXslEquipInspectRecord main = new MesXslEquipInspectRecord();
|
||||
BeanUtils.copyProperties(page, main);
|
||||
//update-begin---author:jiangxh ---date:20260520 for：【MES】仅待点检可录入，保存后变已点检-----------
|
||||
if (oConvertUtils.isEmpty(main.getId())) {
|
||||
return Result.error("记录主键不能为空");
|
||||
}
|
||||
MesXslEquipInspectRecord existing = mesXslEquipInspectRecordService.getById(main.getId());
|
||||
if (existing == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
if ("done".equals(existing.getRecordStatus())) {
|
||||
return Result.error("已点检记录不可修改，仅可查看");
|
||||
}
|
||||
main.setRecordStatus("done");
|
||||
String err = validateForEntry(main, page.getLineList());
|
||||
if (err != null) {
|
||||
return Result.error(err);
|
||||
}
|
||||
fillInspector(main);
|
||||
mesXslEquipInspectRecordService.updateMain(main, page.getLineList());
|
||||
return Result.OK("录入成功!");
|
||||
//update-end---author:jiangxh ---date:20260520 for：【MES】仅待点检可录入，保存后变已点检-----------
|
||||
}
|
||||
|
||||
@AutoLog(value = "MES点检保养记录-删除")
|
||||
@Operation(summary = "MES点检保养记录-通过id删除")
|
||||
@RequiresPermissions("mes:mes_xsl_equip_inspect_record:delete")
|
||||
@DeleteMapping(value = "/delete")
|
||||
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
|
||||
mesXslEquipInspectRecordService.delMain(id);
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
|
||||
@AutoLog(value = "MES点检保养记录-批量删除")
|
||||
@Operation(summary = "MES点检保养记录-批量删除")
|
||||
@RequiresPermissions("mes:mes_xsl_equip_inspect_record:deleteBatch")
|
||||
@DeleteMapping(value = "/deleteBatch")
|
||||
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
||||
mesXslEquipInspectRecordService.delBatchMain(Arrays.asList(ids.split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
@Operation(summary = "MES点检保养记录-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<MesXslEquipInspectRecord> queryById(@RequestParam(name = "id", required = true) String id) {
|
||||
MesXslEquipInspectRecord entity = mesXslEquipInspectRecordService.getById(id);
|
||||
if (entity == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(entity);
|
||||
}
|
||||
|
||||
@Operation(summary = "MES点检保养记录-查询明细")
|
||||
@GetMapping(value = "/queryLineListByRecordId")
|
||||
public Result<List<MesXslEquipInspectRecordLine>> queryLineListByRecordId(
|
||||
@RequestParam(name = "id", required = true) String id) {
|
||||
return Result.OK(mesXslEquipInspectRecordService.selectLinesByRecordId(id));
|
||||
}
|
||||
|
||||
//update-begin---author:jiangxh ---date:20260521 for：【MES】不合格点检记录登记处理人及处理时间-----------
|
||||
@AutoLog(value = "MES点检保养记录-不合格处理")
|
||||
@Operation(summary = "MES点检保养记录-不合格处理")
|
||||
@RequiresPermissions("mes:mes_xsl_equip_inspect_record:edit")
|
||||
@PostMapping(value = "/handleFail")
|
||||
public Result<String> handleFail(@RequestBody MesXslEquipInspectRecordHandleDTO dto) {
|
||||
try {
|
||||
mesXslEquipInspectRecordService.handleFailRecord(dto);
|
||||
return Result.OK("处理成功!");
|
||||
} catch (IllegalArgumentException ex) {
|
||||
return Result.error(ex.getMessage());
|
||||
}
|
||||
}
|
||||
//update-end---author:jiangxh ---date:20260521 for：【MES】不合格点检记录登记处理人及处理时间-----------
|
||||
|
||||
@Operation(summary = "MES点检保养记录-生成记录编号")
|
||||
@GetMapping(value = "/generateRecordNo")
|
||||
public Result<String> generateRecordNo() {
|
||||
MesXslEquipInspectRecord ctx = new MesXslEquipInspectRecord();
|
||||
return Result.OK(mesXslEquipInspectRecordService.generateRecordNo(ctx));
|
||||
}
|
||||
|
||||
@AutoLog(value = "MES点检保养记录-从设备台账批量生成")
|
||||
@Operation(summary = "MES点检保养记录-从设备台账批量生成")
|
||||
@RequiresPermissions("mes:mes_xsl_equip_inspect_record:add")
|
||||
@PostMapping(value = "/batchCreateFromEquipment")
|
||||
public Result<MesXslEquipInspectRecordBatchCreateResult> batchCreateFromEquipment(
|
||||
@RequestBody MesXslEquipInspectRecordBatchCreateDTO dto) {
|
||||
if (dto == null || CollectionUtils.isEmpty(dto.getEquipmentLedgerIds())) {
|
||||
return Result.error("请先选择设备");
|
||||
}
|
||||
String recordType = dto.getRecordType();
|
||||
if (recordType != null) {
|
||||
recordType = recordType.trim();
|
||||
}
|
||||
if (oConvertUtils.isEmpty(recordType) || !RECORD_TYPE.contains(recordType)) {
|
||||
return Result.error("类型无效，请使用点检或保养");
|
||||
}
|
||||
MesXslEquipInspectRecord inspectorCtx = new MesXslEquipInspectRecord();
|
||||
fillInspector(inspectorCtx);
|
||||
MesXslEquipInspectRecordBatchCreateResult result =
|
||||
mesXslEquipInspectRecordService.batchCreateFromEquipment(
|
||||
dto.getEquipmentLedgerIds(), recordType, inspectorCtx);
|
||||
if (result.getSuccessCount() <= 0 && !result.getFailMessages().isEmpty()) {
|
||||
return Result.error(String.join("；", result.getFailMessages()));
|
||||
}
|
||||
String msg = "成功生成 " + result.getSuccessCount() + " 条记录";
|
||||
if (!result.getFailMessages().isEmpty()) {
|
||||
msg = msg + "；" + String.join("；", result.getFailMessages());
|
||||
}
|
||||
return Result.OK(msg, result);
|
||||
}
|
||||
|
||||
@Operation(summary = "MES点检保养记录-按设备与类型带出配置明细")
|
||||
@GetMapping(value = "/loadLinesByEquipment")
|
||||
public Result<List<MesXslEquipInspectRecordLine>> loadLinesByEquipment(
|
||||
@RequestParam(name = "equipmentLedgerId") String equipmentLedgerId,
|
||||
@RequestParam(name = "recordType") String recordType) {
|
||||
String type = recordType != null ? recordType.trim() : "";
|
||||
if (oConvertUtils.isEmpty(equipmentLedgerId) || !RECORD_TYPE.contains(type)) {
|
||||
return Result.error("请选择设备与类型（点检/保养）");
|
||||
}
|
||||
List<MesXslEquipInspectRecordLine> lines =
|
||||
mesXslEquipInspectRecordService.buildLinesFromEquipConfig(equipmentLedgerId, type);
|
||||
if (lines.isEmpty()) {
|
||||
MesXslEquipmentLedger ledger = mesXslEquipmentLedgerService.getById(equipmentLedgerId);
|
||||
String equipName =
|
||||
ledger != null && oConvertUtils.isNotEmpty(ledger.getEquipmentName())
|
||||
? ledger.getEquipmentName()
|
||||
: (ledger != null ? ledger.getEquipmentCode() : equipmentLedgerId);
|
||||
return Result.error(MesXslEquipInspectBizMsg.noConfigMessage(equipName, type));
|
||||
}
|
||||
return Result.OK(lines);
|
||||
}
|
||||
|
||||
@RequiresPermissions("mes:mes_xsl_equip_inspect_record:exportXls")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, MesXslEquipInspectRecord model) {
|
||||
return super.exportXls(request, model, MesXslEquipInspectRecord.class, "MES点检保养记录");
|
||||
}
|
||||
|
||||
@RequiresPermissions("mes:mes_xsl_equip_inspect_record:importExcel")
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
return super.importExcel(request, response, MesXslEquipInspectRecord.class);
|
||||
}
|
||||
|
||||
private void fillRecordNoIfEmpty(MesXslEquipInspectRecord main) {
|
||||
if (oConvertUtils.isEmpty(main.getRecordNo())) {
|
||||
main.setRecordNo(mesXslEquipInspectRecordService.generateRecordNo(main));
|
||||
}
|
||||
}
|
||||
|
||||
private void fillInspector(MesXslEquipInspectRecord main) {
|
||||
if (SecurityUtils.getSubject() == null || SecurityUtils.getSubject().getPrincipal() == null) {
|
||||
return;
|
||||
}
|
||||
if (!(SecurityUtils.getSubject().getPrincipal() instanceof LoginUser user)) {
|
||||
return;
|
||||
}
|
||||
main.setInspectorUserId(user.getId());
|
||||
main.setInspectorUsername(user.getUsername());
|
||||
main.setInspectorRealname(user.getRealname());
|
||||
}
|
||||
|
||||
//update-begin---author:jiangxh ---date:20260520 for：【MES】录入点检结果：必填项校验，保存为已点检-----------
|
||||
private String validateForEntry(MesXslEquipInspectRecord main, List<MesXslEquipInspectRecordLine> lineList) {
|
||||
String err = validateForSave(main, lineList, main.getId());
|
||||
if (err != null) {
|
||||
return err;
|
||||
}
|
||||
if (main.getInspectDate() == null) {
|
||||
return "请选择点检日期";
|
||||
}
|
||||
if (oConvertUtils.isEmpty(main.getInspectorUserId()) && oConvertUtils.isEmpty(main.getInspectorRealname())) {
|
||||
return "点检人不能为空";
|
||||
}
|
||||
String inspectResult = main.getInspectResult();
|
||||
if (inspectResult != null) {
|
||||
inspectResult = inspectResult.trim();
|
||||
}
|
||||
if (oConvertUtils.isEmpty(inspectResult) || !INSPECT_RESULT.contains(inspectResult)) {
|
||||
return "请选择点检结果（合格/不合格）";
|
||||
}
|
||||
main.setInspectResult(inspectResult);
|
||||
main.setRecordStatus("done");
|
||||
//update-begin---author:jiangxh ---date:20260521 for：【MES】不合格记录默认未处理-----------
|
||||
if ("fail".equals(inspectResult)) {
|
||||
main.setHandledFlag("0");
|
||||
} else {
|
||||
main.setHandledFlag(null);
|
||||
main.setHandlerUserId(null);
|
||||
main.setHandlerUsername(null);
|
||||
main.setHandlerRealname(null);
|
||||
main.setHandleTime(null);
|
||||
}
|
||||
//update-end---author:jiangxh ---date:20260521 for：【MES】不合格记录默认未处理-----------
|
||||
return null;
|
||||
}
|
||||
//update-end---author:jiangxh ---date:20260520 for：【MES】录入点检结果：必填项校验，保存为已点检-----------
|
||||
|
||||
//update-begin---author:jiangxh ---date:20260520 for：【MES】点检保养记录保存校验与配置明细关联-----------
|
||||
private String validateForSave(
|
||||
MesXslEquipInspectRecord main, List<MesXslEquipInspectRecordLine> lineList, String excludeId) {
|
||||
if (main == null) {
|
||||
return "参数不能为空";
|
||||
}
|
||||
if (oConvertUtils.isEmpty(main.getEquipmentLedgerId())) {
|
||||
return "请选择设备";
|
||||
}
|
||||
MesXslEquipmentLedger ledger = mesXslEquipmentLedgerService.getById(main.getEquipmentLedgerId());
|
||||
if (ledger == null || isDeleted(ledger.getDelFlag())) {
|
||||
return "设备台账不存在或已删除";
|
||||
}
|
||||
main.setEquipmentName(ledger.getEquipmentName());
|
||||
main.setEquipmentCode(ledger.getEquipmentCode());
|
||||
|
||||
String recordType = main.getRecordType();
|
||||
if (recordType != null) {
|
||||
recordType = recordType.trim();
|
||||
}
|
||||
if (oConvertUtils.isEmpty(recordType) || !RECORD_TYPE.contains(recordType)) {
|
||||
return "类型无效，请选择点检或保养";
|
||||
}
|
||||
main.setRecordType(recordType);
|
||||
|
||||
if (main.getInspectDate() == null) {
|
||||
main.setInspectDate(new Date());
|
||||
}
|
||||
|
||||
String recordStatus = main.getRecordStatus();
|
||||
if (recordStatus != null) {
|
||||
recordStatus = recordStatus.trim();
|
||||
}
|
||||
if (oConvertUtils.isEmpty(recordStatus) || !RECORD_STATUS.contains(recordStatus)) {
|
||||
return "请选择状态（待点检/已点检）";
|
||||
}
|
||||
main.setRecordStatus(recordStatus);
|
||||
|
||||
String inspectResult = main.getInspectResult();
|
||||
if (inspectResult != null) {
|
||||
inspectResult = inspectResult.trim();
|
||||
}
|
||||
if ("done".equals(recordStatus)) {
|
||||
if (oConvertUtils.isEmpty(inspectResult) || !INSPECT_RESULT.contains(inspectResult)) {
|
||||
return "已点检时请选择点检结果（合格/不合格）";
|
||||
}
|
||||
main.setInspectResult(inspectResult);
|
||||
} else {
|
||||
if (oConvertUtils.isNotEmpty(inspectResult) && !INSPECT_RESULT.contains(inspectResult)) {
|
||||
return "点检结果无效";
|
||||
}
|
||||
main.setInspectResult(oConvertUtils.isEmpty(inspectResult) ? null : inspectResult);
|
||||
}
|
||||
|
||||
if (oConvertUtils.isEmpty(main.getRecordNo())) {
|
||||
return "记录编号不能为空";
|
||||
}
|
||||
|
||||
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<MesXslEquipInspectConfig> cw =
|
||||
new com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<>();
|
||||
cw.eq(MesXslEquipInspectConfig::getEquipmentLedgerId, main.getEquipmentLedgerId());
|
||||
cw.eq(MesXslEquipInspectConfig::getConfigType, recordType);
|
||||
cw.and(
|
||||
q ->
|
||||
q.eq(MesXslEquipInspectConfig::getDelFlag, CommonConstant.DEL_FLAG_0)
|
||||
.or()
|
||||
.isNull(MesXslEquipInspectConfig::getDelFlag));
|
||||
MesXslEquipInspectConfig config = mesXslEquipInspectConfigService.getOne(cw, false);
|
||||
if (config == null) {
|
||||
String equipName =
|
||||
oConvertUtils.isNotEmpty(ledger.getEquipmentName())
|
||||
? ledger.getEquipmentName()
|
||||
: ledger.getEquipmentCode();
|
||||
return MesXslEquipInspectBizMsg.noConfigMessage(equipName, recordType);
|
||||
}
|
||||
main.setEquipInspectConfigId(config.getId());
|
||||
|
||||
if (lineList == null || lineList.isEmpty()) {
|
||||
return "明细不能为空，请选择设备后自动带出点检项目";
|
||||
}
|
||||
|
||||
Set<String> configLineIds = new HashSet<>();
|
||||
int sort = 0;
|
||||
for (int i = 0; i < lineList.size(); i++) {
|
||||
MesXslEquipInspectRecordLine line = lineList.get(i);
|
||||
if (line == null) {
|
||||
continue;
|
||||
}
|
||||
int rowNo = i + 1;
|
||||
if (oConvertUtils.isEmpty(line.getEquipInspectConfigLineId())) {
|
||||
return "第 " + rowNo + " 行未关联点检配置明细";
|
||||
}
|
||||
String lineId = line.getEquipInspectConfigLineId().trim();
|
||||
if (!configLineIds.add(lineId)) {
|
||||
return "第 " + rowNo + " 行点检配置明细重复";
|
||||
}
|
||||
line.setEquipInspectConfigLineId(lineId);
|
||||
line.setSortNo(sort++);
|
||||
}
|
||||
if (configLineIds.isEmpty()) {
|
||||
return "明细不能为空";
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private static boolean isDeleted(Integer delFlag) {
|
||||
return delFlag != null && delFlag.equals(CommonConstant.DEL_FLAG_1);
|
||||
}
|
||||
//update-end---author:jiangxh ---date:20260520 for：【MES】点检保养记录保存校验与配置明细关联-----------
|
||||
}
|
||||
@@ -0,0 +1,208 @@
|
||||
package org.jeecg.modules.xslmes.controller;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.jeecg.common.aspect.annotation.AutoLog;
|
||||
import org.jeecg.common.system.base.controller.JeecgController;
|
||||
import org.jeecg.common.system.query.QueryGenerator;
|
||||
import org.jeecg.common.util.oConvertUtils;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslFormulaSpec;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslFormulaSpecLine;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslFormulaSpecService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslFormulaSpecSettingService;
|
||||
import org.jeecg.modules.xslmes.vo.MesXslFormulaRubberContentSettingVO;
|
||||
import org.jeecg.modules.xslmes.vo.MesXslFormulaSpecPage;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
/**
|
||||
* MES 配合示方
|
||||
*/
|
||||
@Tag(name = "MES配合示方")
|
||||
@RestController
|
||||
@RequestMapping("/xslmes/mesXslFormulaSpec")
|
||||
@Slf4j
|
||||
public class MesXslFormulaSpecController extends JeecgController<MesXslFormulaSpec, IMesXslFormulaSpecService> {
|
||||
|
||||
@Autowired
|
||||
private IMesXslFormulaSpecService mesXslFormulaSpecService;
|
||||
|
||||
@Autowired
|
||||
private IMesXslFormulaSpecSettingService mesXslFormulaSpecSettingService;
|
||||
|
||||
@Operation(summary = "MES配合示方-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<MesXslFormulaSpec>> queryPageList(
|
||||
MesXslFormulaSpec model,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
@RequestParam(name = "keyword", required = false) String keyword,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<MesXslFormulaSpec> queryWrapper = QueryGenerator.initQueryWrapper(model, req.getParameterMap());
|
||||
if (oConvertUtils.isNotEmpty(keyword)) {
|
||||
queryWrapper.and(
|
||||
w -> w.like("spec_code", keyword)
|
||||
.or()
|
||||
.like("rubber_code", keyword)
|
||||
.or()
|
||||
.like("issue_number", keyword)
|
||||
.or()
|
||||
.like("purpose", keyword));
|
||||
}
|
||||
queryWrapper.orderByDesc("update_time").orderByDesc("create_time");
|
||||
Page<MesXslFormulaSpec> page = new Page<>(pageNo, pageSize);
|
||||
IPage<MesXslFormulaSpec> pageList = mesXslFormulaSpecService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
@AutoLog(value = "MES配合示方-添加")
|
||||
@Operation(summary = "MES配合示方-添加")
|
||||
@RequiresPermissions("xslmes:mes_xsl_formula_spec:add")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<String> add(@RequestBody MesXslFormulaSpecPage page) {
|
||||
//update-begin---author:jiangxh ---date:20260521 for：【配合示方】主子表保存校验-----------
|
||||
String err = validateMain(page);
|
||||
if (err != null) {
|
||||
return Result.error(err);
|
||||
}
|
||||
//update-end---author:jiangxh ---date:20260521 for：【配合示方】主子表保存校验-----------
|
||||
MesXslFormulaSpec main = new MesXslFormulaSpec();
|
||||
BeanUtils.copyProperties(page, main);
|
||||
mesXslFormulaSpecService.saveMain(main, page.getLineList());
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
|
||||
@AutoLog(value = "MES配合示方-编辑")
|
||||
@Operation(summary = "MES配合示方-编辑")
|
||||
@RequiresPermissions("xslmes:mes_xsl_formula_spec:edit")
|
||||
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
|
||||
public Result<String> edit(@RequestBody MesXslFormulaSpecPage page) {
|
||||
//update-begin---author:jiangxh ---date:20260521 for：【配合示方】主子表保存校验-----------
|
||||
String err = validateMain(page);
|
||||
if (err != null) {
|
||||
return Result.error(err);
|
||||
}
|
||||
//update-end---author:jiangxh ---date:20260521 for：【配合示方】主子表保存校验-----------
|
||||
MesXslFormulaSpec main = new MesXslFormulaSpec();
|
||||
BeanUtils.copyProperties(page, main);
|
||||
mesXslFormulaSpecService.updateMain(main, page.getLineList());
|
||||
return Result.OK("编辑成功!");
|
||||
}
|
||||
|
||||
@AutoLog(value = "MES配合示方-删除")
|
||||
@Operation(summary = "MES配合示方-通过id删除")
|
||||
@RequiresPermissions("xslmes:mes_xsl_formula_spec:delete")
|
||||
@DeleteMapping(value = "/delete")
|
||||
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
|
||||
mesXslFormulaSpecService.delMain(id);
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
|
||||
@AutoLog(value = "MES配合示方-批量删除")
|
||||
@Operation(summary = "MES配合示方-批量删除")
|
||||
@RequiresPermissions("xslmes:mes_xsl_formula_spec:deleteBatch")
|
||||
@DeleteMapping(value = "/deleteBatch")
|
||||
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
||||
mesXslFormulaSpecService.delBatchMain(Arrays.asList(ids.split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
@Operation(summary = "MES配合示方-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<MesXslFormulaSpec> queryById(@RequestParam(name = "id", required = true) String id) {
|
||||
MesXslFormulaSpec entity = mesXslFormulaSpecService.getByIdWithLines(id);
|
||||
if (entity == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(entity);
|
||||
}
|
||||
|
||||
@Operation(summary = "MES配合示方-查询明细")
|
||||
@GetMapping(value = "/queryLineListByMainId")
|
||||
public Result<List<MesXslFormulaSpecLine>> queryLineListByMainId(@RequestParam(name = "id", required = true) String id) {
|
||||
return Result.OK(mesXslFormulaSpecService.selectLinesByMainId(id));
|
||||
}
|
||||
|
||||
//update-begin---author:cursor ---date:20260521 for：配合示方胶料代号自动生成-----------
|
||||
@Operation(summary = "MES配合示方-生成胶料代号")
|
||||
@GetMapping(value = "/generateRubberCode")
|
||||
public Result<Map<String, String>> generateRubberCode(
|
||||
@RequestParam(name = "rubberMaterialId") String rubberMaterialId,
|
||||
@RequestParam(name = "category") String category,
|
||||
@RequestParam(name = "excludeSpecId", required = false) String excludeSpecId) {
|
||||
try {
|
||||
String rubberCode = mesXslFormulaSpecService.generateRubberCode(rubberMaterialId, category, excludeSpecId);
|
||||
return Result.OK(Map.of("rubberCode", rubberCode));
|
||||
} catch (IllegalArgumentException ex) {
|
||||
return Result.error(ex.getMessage());
|
||||
}
|
||||
}
|
||||
//update-end---author:cursor ---date:20260521 for：配合示方胶料代号自动生成-----------
|
||||
|
||||
//update-begin---author:cursor ---date:20260521 for：【配合示方】含胶率物料小类可配置-----------
|
||||
@Operation(summary = "MES配合示方-查询含胶率物料小类配置")
|
||||
@GetMapping(value = "/getRubberContentSetting")
|
||||
public Result<MesXslFormulaRubberContentSettingVO> getRubberContentSetting() {
|
||||
return Result.OK(mesXslFormulaSpecSettingService.getRubberContentSetting());
|
||||
}
|
||||
|
||||
@AutoLog(value = "MES配合示方-保存含胶率物料小类配置")
|
||||
@Operation(summary = "MES配合示方-保存含胶率物料小类配置")
|
||||
@RequiresPermissions("xslmes:mes_xsl_formula_spec:edit")
|
||||
@PostMapping(value = "/saveRubberContentSetting")
|
||||
public Result<String> saveRubberContentSetting(@RequestBody MesXslFormulaRubberContentSettingVO setting) {
|
||||
mesXslFormulaSpecSettingService.saveRubberContentSetting(setting);
|
||||
return Result.OK("保存成功");
|
||||
}
|
||||
//update-end---author:cursor ---date:20260521 for：【配合示方】含胶率物料小类可配置-----------
|
||||
|
||||
@RequiresPermissions("xslmes:mes_xsl_formula_spec:exportXls")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, MesXslFormulaSpec model) {
|
||||
return super.exportXls(request, model, MesXslFormulaSpec.class, "配合示方");
|
||||
}
|
||||
|
||||
@RequiresPermissions("xslmes:mes_xsl_formula_spec:importExcel")
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
return super.importExcel(request, response, MesXslFormulaSpec.class);
|
||||
}
|
||||
|
||||
//update-begin---author:jiangxh ---date:20260521 for：【配合示方】主子表保存校验-----------
|
||||
private String validateMain(MesXslFormulaSpecPage page) {
|
||||
if (oConvertUtils.isEmpty(page.getSpecCode())) {
|
||||
return "请输入示方编号";
|
||||
}
|
||||
if (oConvertUtils.isEmpty(page.getRubberCode())) {
|
||||
return "请选择胶料并生成胶料代号";
|
||||
}
|
||||
if (oConvertUtils.isEmpty(page.getRubberMaterialId())) {
|
||||
return "请选择胶料信息";
|
||||
}
|
||||
if (page.getMixingStages() != null && (page.getMixingStages() < 1 || page.getMixingStages() > 7)) {
|
||||
return "混合段数必须在1-7之间";
|
||||
}
|
||||
if (page.getLineList() == null || page.getLineList().isEmpty()) {
|
||||
return "请至少添加一行配合明细";
|
||||
}
|
||||
return null;
|
||||
}
|
||||
//update-end---author:jiangxh ---date:20260521 for：【配合示方】主子表保存校验-----------
|
||||
}
|
||||
@@ -0,0 +1,65 @@
|
||||
package org.jeecg.modules.xslmes.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
import org.jeecg.common.aspect.annotation.Dict;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
/**
|
||||
* MES 设备点检配置主表（表 mes_xsl_equip_inspect_config）
|
||||
*/
|
||||
@Data
|
||||
@TableName("mes_xsl_equip_inspect_config")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Schema(description = "MES设备点检配置")
|
||||
public class MesXslEquipInspectConfig implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
private String id;
|
||||
|
||||
@Schema(description = "设备台账主键 mes_xsl_equipment_ledger.id")
|
||||
private String equipmentLedgerId;
|
||||
|
||||
@Excel(name = "设备名称", width = 22)
|
||||
@Schema(description = "设备名称冗余")
|
||||
private String equipmentName;
|
||||
|
||||
@Excel(name = "设备编号", width = 18)
|
||||
@Schema(description = "设备编号冗余")
|
||||
private String equipmentCode;
|
||||
|
||||
@Excel(name = "类型", width = 12, dicCode = "xslmes_im_item_category")
|
||||
@Dict(dicCode = "xslmes_im_item_category")
|
||||
@Schema(description = "配置类型（字典xslmes_im_item_category：inspect点检/maintain保养；同设备同类型唯一）")
|
||||
private String configType;
|
||||
|
||||
private Integer tenantId;
|
||||
private String sysOrgCode;
|
||||
private String createBy;
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date createTime;
|
||||
private String updateBy;
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date updateTime;
|
||||
private Integer delFlag;
|
||||
|
||||
@TableField(exist = false)
|
||||
@Schema(description = "点检项目明细")
|
||||
private List<MesXslEquipInspectConfigLine> lineList;
|
||||
}
|
||||
@@ -0,0 +1,73 @@
|
||||
package org.jeecg.modules.xslmes.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
import org.jeecg.common.aspect.annotation.Dict;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
/**
|
||||
* MES 设备点检配置明细（表 mes_xsl_equip_inspect_config_line）
|
||||
*/
|
||||
@Data
|
||||
@TableName("mes_xsl_equip_inspect_config_line")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Schema(description = "MES设备点检配置明细")
|
||||
public class MesXslEquipInspectConfigLine implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
private String id;
|
||||
|
||||
@Schema(description = "主表主键 mes_xsl_equip_inspect_config.id")
|
||||
private String configId;
|
||||
|
||||
@Schema(description = "点检及保养项目主键 mes_xsl_inspect_maintain_item.id")
|
||||
private String inspectMaintainItemId;
|
||||
|
||||
@Schema(description = "点检项目编号冗余")
|
||||
private String itemCode;
|
||||
|
||||
@Schema(description = "项目名称冗余")
|
||||
private String itemName;
|
||||
|
||||
@Dict(dicCode = "xslmes_im_item_category")
|
||||
@Schema(description = "项目类别冗余")
|
||||
private String itemCategory;
|
||||
|
||||
@Dict(dicCode = "xslmes_im_item_type")
|
||||
@Schema(description = "项目类型冗余")
|
||||
private String itemType;
|
||||
|
||||
@Schema(description = "设备部位名称冗余")
|
||||
private String equipmentPartName;
|
||||
|
||||
@Schema(description = "设备小部位名称冗余")
|
||||
private String equipmentSubPartName;
|
||||
|
||||
@Dict(dicCode = "xslmes_im_inspect_method")
|
||||
@Schema(description = "点检方式冗余")
|
||||
private String inspectMethod;
|
||||
|
||||
@Schema(description = "判断基准冗余")
|
||||
private String judgmentCriteria;
|
||||
|
||||
private Integer sortNo;
|
||||
private String createBy;
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date createTime;
|
||||
private String updateBy;
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date updateTime;
|
||||
}
|
||||
@@ -0,0 +1,126 @@
|
||||
package org.jeecg.modules.xslmes.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
import org.jeecg.common.aspect.annotation.Dict;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
/**
|
||||
* MES 点检/保养记录主表（表 mes_xsl_equip_inspect_record）
|
||||
*/
|
||||
@Data
|
||||
@TableName("mes_xsl_equip_inspect_record")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Schema(description = "MES点检保养记录")
|
||||
public class MesXslEquipInspectRecord implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
private String id;
|
||||
|
||||
@Excel(name = "记录编号", width = 20)
|
||||
@Schema(description = "记录编号 EC+yyyyMMdd+4位流水")
|
||||
private String recordNo;
|
||||
|
||||
@Excel(name = "计划单号", width = 18)
|
||||
@Schema(description = "计划单号")
|
||||
private String planNo;
|
||||
|
||||
@Schema(description = "计划主键")
|
||||
private String planId;
|
||||
|
||||
@Schema(description = "设备台账主键")
|
||||
private String equipmentLedgerId;
|
||||
|
||||
@Excel(name = "设备编码", width = 16)
|
||||
@Schema(description = "设备编码冗余")
|
||||
private String equipmentCode;
|
||||
|
||||
@Excel(name = "设备名称", width = 20)
|
||||
@Schema(description = "设备名称冗余")
|
||||
private String equipmentName;
|
||||
|
||||
@Schema(description = "设备点检配置主键")
|
||||
private String equipInspectConfigId;
|
||||
|
||||
@Excel(name = "类型", width = 10, dicCode = "xslmes_im_item_category")
|
||||
@Dict(dicCode = "xslmes_im_item_category")
|
||||
@Schema(description = "点检/保养类型")
|
||||
private String recordType;
|
||||
|
||||
@Excel(name = "点检日期", width = 12, format = "yyyy-MM-dd")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
@Schema(description = "点检日期")
|
||||
private Date inspectDate;
|
||||
|
||||
@Schema(description = "点检人用户ID")
|
||||
private String inspectorUserId;
|
||||
|
||||
@Schema(description = "点检人账号")
|
||||
private String inspectorUsername;
|
||||
|
||||
@Excel(name = "点检人", width = 12)
|
||||
@Schema(description = "点检人姓名")
|
||||
private String inspectorRealname;
|
||||
|
||||
@Excel(name = "点检结果", width = 10, dicCode = "xslmes_im_inspect_result")
|
||||
@Dict(dicCode = "xslmes_im_inspect_result")
|
||||
@Schema(description = "点检结果 pass/fail")
|
||||
private String inspectResult;
|
||||
|
||||
@Excel(name = "状态", width = 10, dicCode = "xslmes_im_record_status")
|
||||
@Dict(dicCode = "xslmes_im_record_status")
|
||||
@Schema(description = "记录状态 pending/done")
|
||||
private String recordStatus;
|
||||
|
||||
@Excel(name = "是否已处理", width = 10, dicCode = "yn")
|
||||
@Dict(dicCode = "yn")
|
||||
@Schema(description = "是否已处理（字典yn：1是0否，不合格记录使用）")
|
||||
private String handledFlag;
|
||||
|
||||
@Schema(description = "处理人用户ID")
|
||||
private String handlerUserId;
|
||||
|
||||
@Schema(description = "处理人账号")
|
||||
private String handlerUsername;
|
||||
|
||||
@Excel(name = "处理人", width = 12)
|
||||
@Schema(description = "处理人姓名")
|
||||
private String handlerRealname;
|
||||
|
||||
@Excel(name = "处理时间", width = 18, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "处理时间")
|
||||
private Date handleTime;
|
||||
|
||||
private Integer tenantId;
|
||||
private String sysOrgCode;
|
||||
private String createBy;
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date createTime;
|
||||
private String updateBy;
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date updateTime;
|
||||
private Integer delFlag;
|
||||
|
||||
@TableField(exist = false)
|
||||
@Schema(description = "点检明细")
|
||||
private List<MesXslEquipInspectRecordLine> lineList;
|
||||
}
|
||||
@@ -0,0 +1,82 @@
|
||||
package org.jeecg.modules.xslmes.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
import org.jeecg.common.aspect.annotation.Dict;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
/**
|
||||
* MES 点检/保养记录明细（表 mes_xsl_equip_inspect_record_line）
|
||||
*/
|
||||
@Data
|
||||
@TableName("mes_xsl_equip_inspect_record_line")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Schema(description = "MES点检保养记录明细")
|
||||
public class MesXslEquipInspectRecordLine implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
private String id;
|
||||
|
||||
@Schema(description = "主表主键")
|
||||
private String recordId;
|
||||
|
||||
@Schema(description = "设备点检配置明细主键")
|
||||
private String equipInspectConfigLineId;
|
||||
|
||||
@Schema(description = "点检及保养项目主键冗余")
|
||||
private String inspectMaintainItemId;
|
||||
|
||||
@Schema(description = "点检项目编号")
|
||||
private String itemCode;
|
||||
|
||||
@Schema(description = "项目名称")
|
||||
private String itemName;
|
||||
|
||||
@Dict(dicCode = "xslmes_im_item_category")
|
||||
@Schema(description = "项目类别")
|
||||
private String itemCategory;
|
||||
|
||||
@Dict(dicCode = "xslmes_im_item_type")
|
||||
@Schema(description = "项目类型")
|
||||
private String itemType;
|
||||
|
||||
@Schema(description = "设备部位")
|
||||
private String equipmentPartName;
|
||||
|
||||
@Schema(description = "设备小部位")
|
||||
private String equipmentSubPartName;
|
||||
|
||||
@Dict(dicCode = "xslmes_im_inspect_method")
|
||||
@Schema(description = "点检方式")
|
||||
private String inspectMethod;
|
||||
|
||||
@Schema(description = "判断基准")
|
||||
private String judgmentCriteria;
|
||||
|
||||
@Schema(description = "明细点检结果文本")
|
||||
private String lineInspectResult;
|
||||
|
||||
@Schema(description = "图片路径，逗号分隔")
|
||||
private String pictureFiles;
|
||||
|
||||
private Integer sortNo;
|
||||
private String createBy;
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date createTime;
|
||||
private String updateBy;
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date updateTime;
|
||||
}
|
||||
@@ -0,0 +1,220 @@
|
||||
package org.jeecg.modules.xslmes.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
import org.jeecg.common.aspect.annotation.Dict;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
/**
|
||||
* MES 配合示方
|
||||
*/
|
||||
@Data
|
||||
@TableName("mes_xsl_formula_spec")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Schema(description = "MES配合示方")
|
||||
public class MesXslFormulaSpec implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
private String id;
|
||||
|
||||
@Excel(name = "分类", width = 10, dicCode = "xslmes_formula_spec_category")
|
||||
@Dict(dicCode = "xslmes_formula_spec_category")
|
||||
@Schema(description = "分类")
|
||||
private String category;
|
||||
|
||||
@Excel(name = "示方编号", width = 18)
|
||||
@Schema(description = "示方编号")
|
||||
private String specCode;
|
||||
|
||||
@Excel(name = "胶料代号", width = 18)
|
||||
@Schema(description = "胶料代号")
|
||||
private String rubberCode;
|
||||
|
||||
@Schema(description = "胶料ID（关联mes_material.id）")
|
||||
private String rubberMaterialId;
|
||||
|
||||
@Excel(name = "基本配合", width = 15)
|
||||
@Schema(description = "基本配合")
|
||||
private String basicFormula;
|
||||
|
||||
@Excel(name = "发行日期", width = 15, format = "yyyy-MM-dd")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
@Schema(description = "发行日期")
|
||||
private Date issueDate;
|
||||
|
||||
@Excel(name = "用途", width = 20)
|
||||
@Schema(description = "用途")
|
||||
private String purpose;
|
||||
|
||||
@Excel(name = "发行编号", width = 15)
|
||||
@Schema(description = "发行编号")
|
||||
private String issueNumber;
|
||||
|
||||
@Excel(name = "混合段数", width = 10)
|
||||
@Schema(description = "混合段数")
|
||||
private Integer mixingStages;
|
||||
|
||||
@Excel(name = "混合机器", width = 15)
|
||||
@Schema(description = "混合机器")
|
||||
private String mixingMachine;
|
||||
|
||||
@Schema(description = "发行部门ID")
|
||||
private String issueDeptId;
|
||||
|
||||
@Excel(name = "发行部门", width = 15)
|
||||
@Schema(description = "发行部门名称")
|
||||
private String issueDeptName;
|
||||
|
||||
@Excel(name = "A胶TOTAL PHR", width = 14)
|
||||
@Schema(description = "A胶TOTAL PHR")
|
||||
private BigDecimal aRubberTotalPhr;
|
||||
|
||||
@Excel(name = "TOTAL PHR", width = 12)
|
||||
@Schema(description = "TOTAL PHR")
|
||||
private BigDecimal totalPhr;
|
||||
|
||||
//update-begin---author:jiangxh ---date:20260521 for：【配合示方】主表新增混合段1-7合计字段-----------
|
||||
@Excel(name = "混合段1合计", width = 12)
|
||||
@Schema(description = "混合段1合计")
|
||||
private BigDecimal stage1Total;
|
||||
|
||||
@Excel(name = "混合段2合计", width = 12)
|
||||
@Schema(description = "混合段2合计")
|
||||
private BigDecimal stage2Total;
|
||||
|
||||
@Excel(name = "混合段3合计", width = 12)
|
||||
@Schema(description = "混合段3合计")
|
||||
private BigDecimal stage3Total;
|
||||
|
||||
@Excel(name = "混合段4合计", width = 12)
|
||||
@Schema(description = "混合段4合计")
|
||||
private BigDecimal stage4Total;
|
||||
|
||||
@Excel(name = "混合段5合计", width = 12)
|
||||
@Schema(description = "混合段5合计")
|
||||
private BigDecimal stage5Total;
|
||||
|
||||
@Excel(name = "混合段6合计", width = 12)
|
||||
@Schema(description = "混合段6合计")
|
||||
private BigDecimal stage6Total;
|
||||
|
||||
@Excel(name = "混合段7合计", width = 12)
|
||||
@Schema(description = "混合段7合计")
|
||||
private BigDecimal stage7Total;
|
||||
//update-end---author:jiangxh ---date:20260521 for：【配合示方】主表新增混合段1-7合计字段-----------
|
||||
|
||||
@Excel(name = "发行理由", width = 30)
|
||||
@Schema(description = "发行理由")
|
||||
private String issueReason;
|
||||
|
||||
@Excel(name = "天然橡胶", width = 12)
|
||||
@Schema(description = "天然橡胶")
|
||||
private BigDecimal naturalRubber;
|
||||
|
||||
@Excel(name = "合成橡胶", width = 12)
|
||||
@Schema(description = "合成橡胶")
|
||||
private BigDecimal syntheticRubber;
|
||||
|
||||
@Excel(name = "合计", width = 12)
|
||||
@Schema(description = "合计")
|
||||
private BigDecimal totalAmount;
|
||||
|
||||
@Excel(name = "重量单价", width = 12)
|
||||
@Schema(description = "重量单价")
|
||||
private BigDecimal weightUnitPrice;
|
||||
|
||||
@Excel(name = "体积单价", width = 12)
|
||||
@Schema(description = "体积单价")
|
||||
private BigDecimal volumeUnitPrice;
|
||||
|
||||
@Excel(name = "Q胶比重", width = 12)
|
||||
@Schema(description = "Q胶比重")
|
||||
@TableField("q_rubber_sg")
|
||||
private BigDecimal qRubberSg;
|
||||
|
||||
@Excel(name = "A胶比重", width = 12)
|
||||
@Schema(description = "A胶比重")
|
||||
@TableField("a_rubber_sg")
|
||||
private BigDecimal aRubberSg;
|
||||
|
||||
@Excel(name = "人工配料", width = 10, replace = {"是_1", "否_0"})
|
||||
@Schema(description = "是否有人工配料（0否 1是）")
|
||||
private Integer hasManualBatch;
|
||||
|
||||
@Excel(name = "状态", width = 12, dicCode = "xslmes_formula_spec_status")
|
||||
@Dict(dicCode = "xslmes_formula_spec_status")
|
||||
@Schema(description = "状态")
|
||||
private String status;
|
||||
|
||||
@Excel(name = "校对人", width = 12)
|
||||
@Schema(description = "校对人")
|
||||
private String proofreadBy;
|
||||
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "校对时间")
|
||||
private Date proofreadTime;
|
||||
|
||||
@Excel(name = "审核人", width = 12)
|
||||
@Schema(description = "审核人")
|
||||
private String auditBy;
|
||||
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "审核时间")
|
||||
private Date auditTime;
|
||||
|
||||
@Excel(name = "批准人", width = 12)
|
||||
@Schema(description = "批准人")
|
||||
private String approveBy;
|
||||
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "批准时间")
|
||||
private Date approveTime;
|
||||
|
||||
@Excel(name = "创建人", width = 12, dictTable = "sys_user", dicText = "realname", dicCode = "username")
|
||||
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
|
||||
private String createBy;
|
||||
|
||||
/** queryById 等非分页接口补充创建人姓名（DictAspect 仅翻译分页列表） */
|
||||
@TableField(exist = false)
|
||||
@Schema(description = "创建人姓名")
|
||||
private String createBy_dictText;
|
||||
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date createTime;
|
||||
|
||||
private String updateBy;
|
||||
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date updateTime;
|
||||
|
||||
@Schema(description = "租户ID")
|
||||
private Integer tenantId;
|
||||
|
||||
private String sysOrgCode;
|
||||
private Integer delFlag;
|
||||
|
||||
@TableField(exist = false)
|
||||
@Schema(description = "配合明细")
|
||||
private List<MesXslFormulaSpecLine> lineList;
|
||||
}
|
||||
@@ -0,0 +1,105 @@
|
||||
package org.jeecg.modules.xslmes.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
import org.jeecg.common.aspect.annotation.Dict;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
/**
|
||||
* MES 配合示方明细
|
||||
*/
|
||||
@Data
|
||||
@TableName("mes_xsl_formula_spec_line")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Schema(description = "MES配合示方明细")
|
||||
public class MesXslFormulaSpecLine implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
private String id;
|
||||
|
||||
@Schema(description = "配合示方主表ID")
|
||||
private String formulaSpecId;
|
||||
|
||||
@Schema(description = "行序号")
|
||||
private Integer sortNo;
|
||||
|
||||
@Schema(description = "PHR")
|
||||
private BigDecimal phr;
|
||||
|
||||
@Schema(description = "密炼物料ID")
|
||||
private String mixerMaterialId;
|
||||
|
||||
@Schema(description = "密炼物料编码")
|
||||
private String mixerMaterialCode;
|
||||
|
||||
@Schema(description = "密炼物料名称")
|
||||
private String mixerMaterialName;
|
||||
|
||||
@Schema(description = "物料描述")
|
||||
private String materialDesc;
|
||||
|
||||
@Dict(dicCode = "xslmes_formula_spec_step")
|
||||
@Schema(description = "STEP")
|
||||
private String step;
|
||||
|
||||
@Dict(dicCode = "xslmes_formula_spec_weigh_mode")
|
||||
@Schema(description = "称量方式")
|
||||
private String weighMode;
|
||||
|
||||
@Schema(description = "重量%")
|
||||
private BigDecimal weightPercent;
|
||||
|
||||
@Schema(description = "体积")
|
||||
private BigDecimal volume;
|
||||
|
||||
@Schema(description = "备注")
|
||||
private String remark;
|
||||
|
||||
@Schema(description = "混合段1")
|
||||
private BigDecimal stage1;
|
||||
|
||||
@Schema(description = "混合段2")
|
||||
private BigDecimal stage2;
|
||||
|
||||
@Schema(description = "混合段3")
|
||||
private BigDecimal stage3;
|
||||
|
||||
@Schema(description = "混合段4")
|
||||
private BigDecimal stage4;
|
||||
|
||||
@Schema(description = "混合段5")
|
||||
private BigDecimal stage5;
|
||||
|
||||
@Schema(description = "混合段6")
|
||||
private BigDecimal stage6;
|
||||
|
||||
@Schema(description = "混合段7")
|
||||
private BigDecimal stage7;
|
||||
|
||||
@Schema(description = "租户ID")
|
||||
private Integer tenantId;
|
||||
|
||||
private String createBy;
|
||||
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date createTime;
|
||||
|
||||
private String updateBy;
|
||||
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date updateTime;
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
package org.jeecg.modules.xslmes.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
/**
|
||||
* 配合示方模块配置
|
||||
*/
|
||||
@Data
|
||||
@TableName("mes_xsl_formula_spec_setting")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Schema(description = "配合示方模块配置")
|
||||
public class MesXslFormulaSpecSetting implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
public static final String DEFAULT_ID = "1993000000000000991";
|
||||
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
private String id;
|
||||
|
||||
@Schema(description = "天然橡胶物料小类ID，逗号分隔")
|
||||
private String naturalMinorCategoryIds;
|
||||
|
||||
@Schema(description = "合成橡胶物料小类ID，逗号分隔")
|
||||
private String syntheticMinorCategoryIds;
|
||||
|
||||
private String createBy;
|
||||
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date createTime;
|
||||
|
||||
private String updateBy;
|
||||
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date updateTime;
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
package org.jeecg.modules.xslmes.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfigLine;
|
||||
|
||||
public interface MesXslEquipInspectConfigLineMapper extends BaseMapper<MesXslEquipInspectConfigLine> {}
|
||||
@@ -0,0 +1,6 @@
|
||||
package org.jeecg.modules.xslmes.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfig;
|
||||
|
||||
public interface MesXslEquipInspectConfigMapper extends BaseMapper<MesXslEquipInspectConfig> {}
|
||||
@@ -0,0 +1,6 @@
|
||||
package org.jeecg.modules.xslmes.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipInspectRecordLine;
|
||||
|
||||
public interface MesXslEquipInspectRecordLineMapper extends BaseMapper<MesXslEquipInspectRecordLine> {}
|
||||
@@ -0,0 +1,6 @@
|
||||
package org.jeecg.modules.xslmes.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipInspectRecord;
|
||||
|
||||
public interface MesXslEquipInspectRecordMapper extends BaseMapper<MesXslEquipInspectRecord> {}
|
||||
@@ -0,0 +1,6 @@
|
||||
package org.jeecg.modules.xslmes.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslFormulaSpecLine;
|
||||
|
||||
public interface MesXslFormulaSpecLineMapper extends BaseMapper<MesXslFormulaSpecLine> {}
|
||||
@@ -0,0 +1,6 @@
|
||||
package org.jeecg.modules.xslmes.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslFormulaSpec;
|
||||
|
||||
public interface MesXslFormulaSpecMapper extends BaseMapper<MesXslFormulaSpec> {}
|
||||
@@ -0,0 +1,7 @@
|
||||
package org.jeecg.modules.xslmes.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslFormulaSpecSetting;
|
||||
|
||||
public interface MesXslFormulaSpecSettingMapper extends BaseMapper<MesXslFormulaSpecSetting> {
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
/**
|
||||
* MES XSL 业务模块（Maven 工程名：jeecg-module-xslmes）。
|
||||
* 包含：客户管理（{@link org.jeecg.modules.xslmes.entity.MesXslCustomer}）、工序管理（{@link org.jeecg.modules.xslmes.entity.MesXslProcessOperation}）、设备类别（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentCategory}）、设备类型（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentType}）、设备台账（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentLedger}）、设备部位（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentPart}）、设备小部位（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentSubPart}）、点检及保养项目（{@link org.jeecg.modules.xslmes.entity.MesXslInspectMaintainItem}）、备品件类别（{@link org.jeecg.modules.xslmes.entity.MesXslSparePartsCategory}）、备品件信息（{@link org.jeecg.modules.xslmes.entity.MesXslSparePart}）、厂家信息（{@link org.jeecg.modules.xslmes.entity.MesXslManufacturer}）、停机主类型（{@link org.jeecg.modules.xslmes.entity.MesXslDowntimeMainType}）、停机类型（{@link org.jeecg.modules.xslmes.entity.MesXslDowntimeType}）等。
|
||||
* 包含：客户管理（{@link org.jeecg.modules.xslmes.entity.MesXslCustomer}）、工序管理（{@link org.jeecg.modules.xslmes.entity.MesXslProcessOperation}）、设备类别（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentCategory}）、设备类型（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentType}）、设备台账（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentLedger}）、设备部位（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentPart}）、设备小部位（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentSubPart}）、点检及保养项目（{@link org.jeecg.modules.xslmes.entity.MesXslInspectMaintainItem}）、设备点检配置（{@link org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfig}）、备品件类别（{@link org.jeecg.modules.xslmes.entity.MesXslSparePartsCategory}）、备品件信息（{@link org.jeecg.modules.xslmes.entity.MesXslSparePart}）、厂家信息（{@link org.jeecg.modules.xslmes.entity.MesXslManufacturer}）、停机主类型（{@link org.jeecg.modules.xslmes.entity.MesXslDowntimeMainType}）、停机类型（{@link org.jeecg.modules.xslmes.entity.MesXslDowntimeType}）等。
|
||||
*/
|
||||
package org.jeecg.modules.xslmes;
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
package org.jeecg.modules.xslmes.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import java.io.Serializable;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfig;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfigLine;
|
||||
|
||||
public interface IMesXslEquipInspectConfigService extends IService<MesXslEquipInspectConfig> {
|
||||
|
||||
void saveMain(MesXslEquipInspectConfig main, List<MesXslEquipInspectConfigLine> lineList);
|
||||
|
||||
void updateMain(MesXslEquipInspectConfig main, List<MesXslEquipInspectConfigLine> lineList);
|
||||
|
||||
void delMain(String id);
|
||||
|
||||
void delBatchMain(Collection<? extends Serializable> idList);
|
||||
|
||||
List<MesXslEquipInspectConfigLine> selectLinesByConfigId(String configId);
|
||||
|
||||
boolean isConfigDuplicated(String equipmentLedgerId, String configType, String excludeId, MesXslEquipInspectConfig context);
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
package org.jeecg.modules.xslmes.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import java.io.Serializable;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipInspectRecord;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipInspectRecordLine;
|
||||
import org.jeecg.modules.xslmes.vo.MesXslEquipInspectRecordBatchCreateResult;
|
||||
import org.jeecg.modules.xslmes.vo.MesXslEquipInspectRecordHandleDTO;
|
||||
|
||||
public interface IMesXslEquipInspectRecordService extends IService<MesXslEquipInspectRecord> {
|
||||
|
||||
void saveMain(MesXslEquipInspectRecord main, List<MesXslEquipInspectRecordLine> lineList);
|
||||
|
||||
void updateMain(MesXslEquipInspectRecord main, List<MesXslEquipInspectRecordLine> lineList);
|
||||
|
||||
void delMain(String id);
|
||||
|
||||
void delBatchMain(Collection<? extends Serializable> idList);
|
||||
|
||||
List<MesXslEquipInspectRecordLine> selectLinesByRecordId(String recordId);
|
||||
|
||||
String generateRecordNo(MesXslEquipInspectRecord context);
|
||||
|
||||
List<MesXslEquipInspectRecordLine> buildLinesFromEquipConfig(String equipmentLedgerId, String recordType);
|
||||
|
||||
MesXslEquipInspectRecordBatchCreateResult batchCreateFromEquipment(
|
||||
List<String> equipmentLedgerIds, String recordType, MesXslEquipInspectRecord inspectorContext);
|
||||
|
||||
//update-begin---author:jiangxh ---date:20260521 for：【MES】不合格点检记录登记处理人及处理时间-----------
|
||||
void handleFailRecord(MesXslEquipInspectRecordHandleDTO dto);
|
||||
//update-end---author:jiangxh ---date:20260521 for：【MES】不合格点检记录登记处理人及处理时间-----------
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
package org.jeecg.modules.xslmes.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import java.io.Serializable;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslFormulaSpec;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslFormulaSpecLine;
|
||||
|
||||
public interface IMesXslFormulaSpecService extends IService<MesXslFormulaSpec> {
|
||||
|
||||
void saveMain(MesXslFormulaSpec main, List<MesXslFormulaSpecLine> lineList);
|
||||
|
||||
void updateMain(MesXslFormulaSpec main, List<MesXslFormulaSpecLine> lineList);
|
||||
|
||||
void delMain(String id);
|
||||
|
||||
void delBatchMain(Collection<? extends Serializable> idList);
|
||||
|
||||
List<MesXslFormulaSpecLine> selectLinesByMainId(String mainId);
|
||||
|
||||
MesXslFormulaSpec getByIdWithLines(String id);
|
||||
|
||||
/**
|
||||
* 生成胶料代号：D + 胶料名称 + 分类键值(S/P/T/C) + 版本号(A01-Z01)
|
||||
*/
|
||||
String generateRubberCode(String rubberMaterialId, String category, String excludeSpecId);
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package org.jeecg.modules.xslmes.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import java.util.Set;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslFormulaSpecSetting;
|
||||
import org.jeecg.modules.xslmes.vo.MesXslFormulaRubberContentSettingVO;
|
||||
|
||||
public interface IMesXslFormulaSpecSettingService extends IService<MesXslFormulaSpecSetting> {
|
||||
|
||||
MesXslFormulaRubberContentSettingVO getRubberContentSetting();
|
||||
|
||||
void saveRubberContentSetting(MesXslFormulaRubberContentSettingVO setting);
|
||||
|
||||
Set<String> getNaturalMinorCategoryIds();
|
||||
|
||||
Set<String> getSyntheticMinorCategoryIds();
|
||||
}
|
||||
@@ -0,0 +1,132 @@
|
||||
package org.jeecg.modules.xslmes.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import java.io.Serializable;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import org.jeecg.common.config.TenantContext;
|
||||
import org.jeecg.common.constant.CommonConstant;
|
||||
import org.jeecg.common.util.SpringContextUtils;
|
||||
import org.jeecg.common.util.TokenUtils;
|
||||
import org.jeecg.common.util.oConvertUtils;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfig;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfigLine;
|
||||
import org.jeecg.modules.xslmes.mapper.MesXslEquipInspectConfigLineMapper;
|
||||
import org.jeecg.modules.xslmes.mapper.MesXslEquipInspectConfigMapper;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslEquipInspectConfigService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
|
||||
@Service
|
||||
public class MesXslEquipInspectConfigServiceImpl
|
||||
extends ServiceImpl<MesXslEquipInspectConfigMapper, MesXslEquipInspectConfig>
|
||||
implements IMesXslEquipInspectConfigService {
|
||||
|
||||
@Autowired
|
||||
private MesXslEquipInspectConfigLineMapper mesXslEquipInspectConfigLineMapper;
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void saveMain(MesXslEquipInspectConfig main, List<MesXslEquipInspectConfigLine> lineList) {
|
||||
this.save(main);
|
||||
insertLines(main.getId(), lineList);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void updateMain(MesXslEquipInspectConfig main, List<MesXslEquipInspectConfigLine> lineList) {
|
||||
this.updateById(main);
|
||||
mesXslEquipInspectConfigLineMapper.delete(
|
||||
new LambdaQueryWrapper<MesXslEquipInspectConfigLine>()
|
||||
.eq(MesXslEquipInspectConfigLine::getConfigId, main.getId()));
|
||||
insertLines(main.getId(), lineList);
|
||||
}
|
||||
|
||||
private void insertLines(String configId, List<MesXslEquipInspectConfigLine> lineList) {
|
||||
if (CollectionUtils.isEmpty(lineList)) {
|
||||
return;
|
||||
}
|
||||
int sort = 0;
|
||||
for (MesXslEquipInspectConfigLine line : lineList) {
|
||||
line.setId(null);
|
||||
line.setConfigId(configId);
|
||||
line.setSortNo(sort++);
|
||||
mesXslEquipInspectConfigLineMapper.insert(line);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void delMain(String id) {
|
||||
mesXslEquipInspectConfigLineMapper.delete(
|
||||
new LambdaQueryWrapper<MesXslEquipInspectConfigLine>().eq(MesXslEquipInspectConfigLine::getConfigId, id));
|
||||
this.removeById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void delBatchMain(Collection<? extends Serializable> idList) {
|
||||
for (Serializable id : idList) {
|
||||
delMain(id.toString());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<MesXslEquipInspectConfigLine> selectLinesByConfigId(String configId) {
|
||||
return mesXslEquipInspectConfigLineMapper.selectList(
|
||||
new LambdaQueryWrapper<MesXslEquipInspectConfigLine>()
|
||||
.eq(MesXslEquipInspectConfigLine::getConfigId, configId)
|
||||
.orderByAsc(MesXslEquipInspectConfigLine::getSortNo));
|
||||
}
|
||||
|
||||
//update-begin---author:jiangxh ---date:20260519 for：【MES】设备点检配置：同设备同类型（点检/保养）仅允许一条主数据-----------
|
||||
@Override
|
||||
public boolean isConfigDuplicated(
|
||||
String equipmentLedgerId, String configType, String excludeId, MesXslEquipInspectConfig context) {
|
||||
if (oConvertUtils.isEmpty(equipmentLedgerId) || oConvertUtils.isEmpty(configType)) {
|
||||
return false;
|
||||
}
|
||||
Integer tenantId = resolveTenantId(context);
|
||||
LambdaQueryWrapper<MesXslEquipInspectConfig> w = new LambdaQueryWrapper<>();
|
||||
w.eq(MesXslEquipInspectConfig::getEquipmentLedgerId, equipmentLedgerId.trim());
|
||||
w.eq(MesXslEquipInspectConfig::getConfigType, configType.trim());
|
||||
w.and(
|
||||
q ->
|
||||
q.eq(MesXslEquipInspectConfig::getDelFlag, CommonConstant.DEL_FLAG_0)
|
||||
.or()
|
||||
.isNull(MesXslEquipInspectConfig::getDelFlag));
|
||||
if (oConvertUtils.isNotEmpty(excludeId)) {
|
||||
w.ne(MesXslEquipInspectConfig::getId, excludeId);
|
||||
}
|
||||
if (tenantId != null) {
|
||||
w.eq(MesXslEquipInspectConfig::getTenantId, tenantId);
|
||||
}
|
||||
return this.count(w) > 0;
|
||||
}
|
||||
|
||||
private static Integer resolveTenantId(MesXslEquipInspectConfig context) {
|
||||
if (context != null && context.getTenantId() != null) {
|
||||
return context.getTenantId();
|
||||
}
|
||||
String ts = TenantContext.getTenant();
|
||||
if (oConvertUtils.isEmpty(ts)) {
|
||||
try {
|
||||
ts = TokenUtils.getTenantIdByRequest(SpringContextUtils.getHttpServletRequest());
|
||||
} catch (Exception ignored) {
|
||||
// ignore
|
||||
}
|
||||
}
|
||||
if (oConvertUtils.isEmpty(ts)) {
|
||||
return null;
|
||||
}
|
||||
try {
|
||||
return Integer.parseInt(ts);
|
||||
} catch (NumberFormatException e) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
//update-end---author:jiangxh ---date:20260519 for：【MES】设备点检配置：同设备同类型（点检/保养）仅允许一条主数据-----------
|
||||
}
|
||||
@@ -0,0 +1,312 @@
|
||||
package org.jeecg.modules.xslmes.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import java.io.Serializable;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import org.jeecg.common.config.TenantContext;
|
||||
import org.jeecg.common.constant.CommonConstant;
|
||||
import org.jeecg.common.util.SpringContextUtils;
|
||||
import org.jeecg.common.util.TokenUtils;
|
||||
import org.jeecg.common.util.oConvertUtils;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfig;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfigLine;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipInspectRecord;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipInspectRecordLine;
|
||||
import org.jeecg.modules.xslmes.mapper.MesXslEquipInspectRecordLineMapper;
|
||||
import org.jeecg.modules.xslmes.mapper.MesXslEquipInspectRecordMapper;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslEquipInspectConfigService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslEquipInspectRecordService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslEquipmentLedgerService;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipmentLedger;
|
||||
import org.jeecg.modules.xslmes.util.MesXslEquipInspectBizMsg;
|
||||
import org.jeecg.modules.xslmes.vo.MesXslEquipInspectRecordBatchCreateResult;
|
||||
import org.jeecg.modules.xslmes.vo.MesXslEquipInspectRecordHandleDTO;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
|
||||
@Service
|
||||
public class MesXslEquipInspectRecordServiceImpl
|
||||
extends ServiceImpl<MesXslEquipInspectRecordMapper, MesXslEquipInspectRecord>
|
||||
implements IMesXslEquipInspectRecordService {
|
||||
|
||||
@Autowired
|
||||
private MesXslEquipInspectRecordLineMapper mesXslEquipInspectRecordLineMapper;
|
||||
|
||||
@Autowired
|
||||
private IMesXslEquipInspectConfigService mesXslEquipInspectConfigService;
|
||||
|
||||
@Autowired
|
||||
private IMesXslEquipmentLedgerService mesXslEquipmentLedgerService;
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void saveMain(MesXslEquipInspectRecord main, List<MesXslEquipInspectRecordLine> lineList) {
|
||||
this.save(main);
|
||||
insertLines(main.getId(), lineList);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void updateMain(MesXslEquipInspectRecord main, List<MesXslEquipInspectRecordLine> lineList) {
|
||||
this.updateById(main);
|
||||
mesXslEquipInspectRecordLineMapper.delete(
|
||||
new LambdaQueryWrapper<MesXslEquipInspectRecordLine>()
|
||||
.eq(MesXslEquipInspectRecordLine::getRecordId, main.getId()));
|
||||
insertLines(main.getId(), lineList);
|
||||
}
|
||||
|
||||
private void insertLines(String recordId, List<MesXslEquipInspectRecordLine> lineList) {
|
||||
if (CollectionUtils.isEmpty(lineList)) {
|
||||
return;
|
||||
}
|
||||
int sort = 0;
|
||||
for (MesXslEquipInspectRecordLine line : lineList) {
|
||||
line.setId(null);
|
||||
line.setRecordId(recordId);
|
||||
line.setSortNo(sort++);
|
||||
mesXslEquipInspectRecordLineMapper.insert(line);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void delMain(String id) {
|
||||
mesXslEquipInspectRecordLineMapper.delete(
|
||||
new LambdaQueryWrapper<MesXslEquipInspectRecordLine>().eq(MesXslEquipInspectRecordLine::getRecordId, id));
|
||||
this.removeById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void delBatchMain(Collection<? extends Serializable> idList) {
|
||||
for (Serializable id : idList) {
|
||||
delMain(id.toString());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<MesXslEquipInspectRecordLine> selectLinesByRecordId(String recordId) {
|
||||
return mesXslEquipInspectRecordLineMapper.selectList(
|
||||
new LambdaQueryWrapper<MesXslEquipInspectRecordLine>()
|
||||
.eq(MesXslEquipInspectRecordLine::getRecordId, recordId)
|
||||
.orderByAsc(MesXslEquipInspectRecordLine::getSortNo));
|
||||
}
|
||||
|
||||
//update-begin---author:jiangxh ---date:20260520 for：【MES】点检保养记录编号 EC+日期+4位流水-----------
|
||||
@Override
|
||||
public String generateRecordNo(MesXslEquipInspectRecord context) {
|
||||
String dateStr = new SimpleDateFormat("yyyyMMdd").format(new Date());
|
||||
String prefix = "EC" + dateStr;
|
||||
Integer tenantId = resolveTenantId(context);
|
||||
|
||||
LambdaQueryWrapper<MesXslEquipInspectRecord> qw = new LambdaQueryWrapper<>();
|
||||
qw.likeRight(MesXslEquipInspectRecord::getRecordNo, prefix);
|
||||
qw.and(
|
||||
q ->
|
||||
q.eq(MesXslEquipInspectRecord::getDelFlag, CommonConstant.DEL_FLAG_0)
|
||||
.or()
|
||||
.isNull(MesXslEquipInspectRecord::getDelFlag));
|
||||
if (tenantId != null) {
|
||||
qw.eq(MesXslEquipInspectRecord::getTenantId, tenantId);
|
||||
}
|
||||
qw.select(MesXslEquipInspectRecord::getRecordNo);
|
||||
qw.orderByDesc(MesXslEquipInspectRecord::getRecordNo);
|
||||
qw.last("LIMIT 1");
|
||||
|
||||
MesXslEquipInspectRecord last = this.getOne(qw, false);
|
||||
int nextSeq = 1;
|
||||
if (last != null && oConvertUtils.isNotEmpty(last.getRecordNo()) && last.getRecordNo().length() >= prefix.length() + 4) {
|
||||
String suffix = last.getRecordNo().substring(prefix.length());
|
||||
try {
|
||||
nextSeq = Integer.parseInt(suffix) + 1;
|
||||
} catch (NumberFormatException ignored) {
|
||||
nextSeq = (int) this.count(qw) + 1;
|
||||
}
|
||||
}
|
||||
return prefix + String.format("%04d", nextSeq);
|
||||
}
|
||||
//update-end---author:jiangxh ---date:20260520 for：【MES】点检保养记录编号 EC+日期+4位流水-----------
|
||||
|
||||
//update-begin---author:jiangxh ---date:20260520 for：【MES】点检保养记录从设备点检配置带出明细-----------
|
||||
@Override
|
||||
public List<MesXslEquipInspectRecordLine> buildLinesFromEquipConfig(String equipmentLedgerId, String recordType) {
|
||||
if (oConvertUtils.isEmpty(equipmentLedgerId) || oConvertUtils.isEmpty(recordType)) {
|
||||
return List.of();
|
||||
}
|
||||
String type = recordType.trim();
|
||||
MesXslEquipInspectConfig config = findEquipInspectConfig(equipmentLedgerId.trim(), type);
|
||||
if (config == null) {
|
||||
return List.of();
|
||||
}
|
||||
List<MesXslEquipInspectConfigLine> configLines =
|
||||
mesXslEquipInspectConfigService.selectLinesByConfigId(config.getId());
|
||||
if (CollectionUtils.isEmpty(configLines)) {
|
||||
return List.of();
|
||||
}
|
||||
return buildRecordLinesFromConfigLines(configLines);
|
||||
}
|
||||
|
||||
private MesXslEquipInspectConfig findEquipInspectConfig(String equipmentLedgerId, String configType) {
|
||||
LambdaQueryWrapper<MesXslEquipInspectConfig> cw = new LambdaQueryWrapper<>();
|
||||
cw.eq(MesXslEquipInspectConfig::getEquipmentLedgerId, equipmentLedgerId);
|
||||
cw.eq(MesXslEquipInspectConfig::getConfigType, configType);
|
||||
cw.and(
|
||||
q ->
|
||||
q.eq(MesXslEquipInspectConfig::getDelFlag, CommonConstant.DEL_FLAG_0)
|
||||
.or()
|
||||
.isNull(MesXslEquipInspectConfig::getDelFlag));
|
||||
return mesXslEquipInspectConfigService.getOne(cw, false);
|
||||
}
|
||||
|
||||
private List<MesXslEquipInspectRecordLine> buildRecordLinesFromConfigLines(
|
||||
List<MesXslEquipInspectConfigLine> configLines) {
|
||||
List<MesXslEquipInspectRecordLine> result = new ArrayList<>(configLines.size());
|
||||
for (MesXslEquipInspectConfigLine cl : configLines) {
|
||||
MesXslEquipInspectRecordLine line = new MesXslEquipInspectRecordLine();
|
||||
line.setEquipInspectConfigLineId(cl.getId());
|
||||
line.setInspectMaintainItemId(cl.getInspectMaintainItemId());
|
||||
line.setItemCode(cl.getItemCode());
|
||||
line.setItemName(cl.getItemName());
|
||||
line.setItemCategory(cl.getItemCategory());
|
||||
line.setItemType(cl.getItemType());
|
||||
line.setEquipmentPartName(cl.getEquipmentPartName());
|
||||
line.setEquipmentSubPartName(cl.getEquipmentSubPartName());
|
||||
line.setInspectMethod(cl.getInspectMethod());
|
||||
line.setJudgmentCriteria(cl.getJudgmentCriteria());
|
||||
result.add(line);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
//update-end---author:jiangxh ---date:20260520 for：【MES】点检保养记录从设备点检配置带出明细-----------
|
||||
|
||||
//update-begin---author:jiangxh ---date:20260520 for：【MES】设备台账多选批量生成点检保养记录（待点检）-----------
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public MesXslEquipInspectRecordBatchCreateResult batchCreateFromEquipment(
|
||||
List<String> equipmentLedgerIds, String recordType, MesXslEquipInspectRecord inspectorContext) {
|
||||
MesXslEquipInspectRecordBatchCreateResult result = new MesXslEquipInspectRecordBatchCreateResult();
|
||||
if (CollectionUtils.isEmpty(equipmentLedgerIds) || oConvertUtils.isEmpty(recordType)) {
|
||||
result.getFailMessages().add("请选择设备并指定点检或保养类型");
|
||||
return result;
|
||||
}
|
||||
String type = recordType.trim();
|
||||
for (String equipmentLedgerId : equipmentLedgerIds) {
|
||||
if (oConvertUtils.isEmpty(equipmentLedgerId)) {
|
||||
continue;
|
||||
}
|
||||
String equipId = equipmentLedgerId.trim();
|
||||
MesXslEquipmentLedger ledger = mesXslEquipmentLedgerService.getById(equipId);
|
||||
String equipName =
|
||||
ledger != null
|
||||
? (oConvertUtils.isNotEmpty(ledger.getEquipmentName())
|
||||
? ledger.getEquipmentName()
|
||||
: ledger.getEquipmentCode())
|
||||
: equipId;
|
||||
if (ledger == null
|
||||
|| (ledger.getDelFlag() != null && ledger.getDelFlag().equals(CommonConstant.DEL_FLAG_1))) {
|
||||
result.getFailMessages().add("设备【" + equipName + "】不存在或已删除");
|
||||
continue;
|
||||
}
|
||||
//update-begin---author:jiangxh ---date:20260520 for：【MES】未维护对应类型设备点检配置则不生成记录并提示设备名称-----------
|
||||
MesXslEquipInspectConfig config = findEquipInspectConfig(equipId, type);
|
||||
if (config == null) {
|
||||
result.getFailMessages().add(MesXslEquipInspectBizMsg.noConfigMessage(equipName, type));
|
||||
continue;
|
||||
}
|
||||
List<MesXslEquipInspectConfigLine> configLines =
|
||||
mesXslEquipInspectConfigService.selectLinesByConfigId(config.getId());
|
||||
if (CollectionUtils.isEmpty(configLines)) {
|
||||
result.getFailMessages().add(MesXslEquipInspectBizMsg.noConfigLineMessage(equipName, type));
|
||||
continue;
|
||||
}
|
||||
List<MesXslEquipInspectRecordLine> lines = buildRecordLinesFromConfigLines(configLines);
|
||||
//update-end---author:jiangxh ---date:20260520 for：【MES】未维护对应类型设备点检配置则不生成记录并提示设备名称-----------
|
||||
|
||||
MesXslEquipInspectRecord main = new MesXslEquipInspectRecord();
|
||||
main.setEquipmentLedgerId(equipId);
|
||||
main.setEquipmentCode(ledger.getEquipmentCode());
|
||||
main.setEquipmentName(ledger.getEquipmentName());
|
||||
main.setEquipInspectConfigId(config.getId());
|
||||
main.setRecordType(type);
|
||||
main.setRecordNo(generateRecordNo(main));
|
||||
main.setRecordStatus("pending");
|
||||
main.setInspectResult("");
|
||||
main.setInspectDate(new Date());
|
||||
if (inspectorContext != null) {
|
||||
main.setInspectorUserId(inspectorContext.getInspectorUserId());
|
||||
main.setInspectorUsername(inspectorContext.getInspectorUsername());
|
||||
main.setInspectorRealname(inspectorContext.getInspectorRealname());
|
||||
}
|
||||
saveMain(main, lines);
|
||||
result.setSuccessCount(result.getSuccessCount() + 1);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
//update-end---author:jiangxh ---date:20260520 for：【MES】设备台账多选批量生成点检保养记录（待点检）-----------
|
||||
|
||||
//update-begin---author:jiangxh ---date:20260521 for：【MES】不合格点检记录登记处理人及处理时间-----------
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void handleFailRecord(MesXslEquipInspectRecordHandleDTO dto) {
|
||||
if (dto == null || oConvertUtils.isEmpty(dto.getId())) {
|
||||
throw new IllegalArgumentException("记录主键不能为空");
|
||||
}
|
||||
MesXslEquipInspectRecord existing = this.getById(dto.getId().trim());
|
||||
if (existing == null) {
|
||||
throw new IllegalArgumentException("未找到对应数据");
|
||||
}
|
||||
if (!"fail".equals(existing.getInspectResult())) {
|
||||
throw new IllegalArgumentException("仅不合格记录可处理");
|
||||
}
|
||||
if (!"done".equals(existing.getRecordStatus())) {
|
||||
throw new IllegalArgumentException("请先完成点检录入");
|
||||
}
|
||||
if ("1".equals(existing.getHandledFlag())) {
|
||||
throw new IllegalArgumentException("该记录已处理");
|
||||
}
|
||||
if (oConvertUtils.isEmpty(dto.getHandlerUserId())
|
||||
&& oConvertUtils.isEmpty(dto.getHandlerUsername())
|
||||
&& oConvertUtils.isEmpty(dto.getHandlerRealname())) {
|
||||
throw new IllegalArgumentException("请选择处理人");
|
||||
}
|
||||
Date handleTime = dto.getHandleTime() != null ? dto.getHandleTime() : new Date();
|
||||
MesXslEquipInspectRecord patch = new MesXslEquipInspectRecord();
|
||||
patch.setId(existing.getId());
|
||||
patch.setHandledFlag("1");
|
||||
patch.setHandlerUserId(dto.getHandlerUserId());
|
||||
patch.setHandlerUsername(dto.getHandlerUsername());
|
||||
patch.setHandlerRealname(dto.getHandlerRealname());
|
||||
patch.setHandleTime(handleTime);
|
||||
this.updateById(patch);
|
||||
}
|
||||
//update-end---author:jiangxh ---date:20260521 for：【MES】不合格点检记录登记处理人及处理时间-----------
|
||||
|
||||
private static Integer resolveTenantId(MesXslEquipInspectRecord context) {
|
||||
if (context != null && context.getTenantId() != null) {
|
||||
return context.getTenantId();
|
||||
}
|
||||
String ts = TenantContext.getTenant();
|
||||
if (oConvertUtils.isEmpty(ts)) {
|
||||
try {
|
||||
ts = TokenUtils.getTenantIdByRequest(SpringContextUtils.getHttpServletRequest());
|
||||
} catch (Exception ignored) {
|
||||
// ignore
|
||||
}
|
||||
}
|
||||
if (oConvertUtils.isEmpty(ts)) {
|
||||
return null;
|
||||
}
|
||||
try {
|
||||
return Integer.parseInt(ts);
|
||||
} catch (NumberFormatException e) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,403 @@
|
||||
package org.jeecg.modules.xslmes.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import jakarta.annotation.Resource;
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import java.math.RoundingMode;
|
||||
import java.util.Collection;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.jeecg.modules.mes.material.entity.MesMaterial;
|
||||
import org.jeecg.modules.mes.material.entity.MesMixerMaterial;
|
||||
import org.jeecg.modules.mes.material.service.IMesMaterialService;
|
||||
import org.jeecg.modules.mes.material.service.IMesMixerMaterialService;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslFormulaSpec;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslFormulaSpecLine;
|
||||
import org.jeecg.modules.xslmes.mapper.MesXslFormulaSpecLineMapper;
|
||||
import org.jeecg.modules.xslmes.mapper.MesXslFormulaSpecMapper;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslFormulaSpecService;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslFormulaSpecSettingService;
|
||||
import org.jeecg.modules.system.entity.SysUser;
|
||||
import org.jeecg.modules.system.service.ISysUserService;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
|
||||
@Service
|
||||
public class MesXslFormulaSpecServiceImpl extends ServiceImpl<MesXslFormulaSpecMapper, MesXslFormulaSpec>
|
||||
implements IMesXslFormulaSpecService {
|
||||
|
||||
private static final Set<String> RUBBER_CATEGORY_KEYS = Set.of("S", "P", "T", "C");
|
||||
private static final Pattern RUBBER_CODE_VERSION_PATTERN = Pattern.compile("([A-Z])01$");
|
||||
|
||||
@Resource
|
||||
private MesXslFormulaSpecLineMapper lineMapper;
|
||||
|
||||
@Resource
|
||||
private IMesMixerMaterialService mesMixerMaterialService;
|
||||
|
||||
@Resource
|
||||
private IMesMaterialService mesMaterialService;
|
||||
|
||||
@Resource
|
||||
private IMesXslFormulaSpecSettingService mesXslFormulaSpecSettingService;
|
||||
|
||||
@Resource
|
||||
private ISysUserService sysUserService;
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void saveMain(MesXslFormulaSpec main, List<MesXslFormulaSpecLine> lineList) {
|
||||
fillMainDefaults(main);
|
||||
//update-begin---author:cursor ---date:20260521 for：配合示方新增时服务端生成胶料代号-----------
|
||||
fillRubberCodeOnCreate(main);
|
||||
//update-end---author:cursor ---date:20260521 for：配合示方新增时服务端生成胶料代号-----------
|
||||
this.save(main);
|
||||
insertLines(main, lineList);
|
||||
refreshMainSummary(main.getId());
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void updateMain(MesXslFormulaSpec main, List<MesXslFormulaSpecLine> lineList) {
|
||||
fillMainDefaults(main);
|
||||
this.updateById(main);
|
||||
lineMapper.delete(new LambdaQueryWrapper<MesXslFormulaSpecLine>().eq(MesXslFormulaSpecLine::getFormulaSpecId, main.getId()));
|
||||
insertLines(main, lineList);
|
||||
refreshMainSummary(main.getId());
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void delMain(String id) {
|
||||
lineMapper.delete(new LambdaQueryWrapper<MesXslFormulaSpecLine>().eq(MesXslFormulaSpecLine::getFormulaSpecId, id));
|
||||
this.removeById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void delBatchMain(Collection<? extends Serializable> idList) {
|
||||
if (idList == null || idList.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
for (Serializable id : idList) {
|
||||
if (id != null) {
|
||||
delMain(id.toString());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<MesXslFormulaSpecLine> selectLinesByMainId(String mainId) {
|
||||
return lineMapper.selectList(
|
||||
new LambdaQueryWrapper<MesXslFormulaSpecLine>()
|
||||
.eq(MesXslFormulaSpecLine::getFormulaSpecId, mainId)
|
||||
.orderByAsc(MesXslFormulaSpecLine::getSortNo)
|
||||
.orderByAsc(MesXslFormulaSpecLine::getId));
|
||||
}
|
||||
|
||||
@Override
|
||||
public MesXslFormulaSpec getByIdWithLines(String id) {
|
||||
MesXslFormulaSpec main = this.getById(id);
|
||||
if (main == null) {
|
||||
return null;
|
||||
}
|
||||
main.setLineList(selectLinesByMainId(id));
|
||||
//update-begin---author:cursor ---date:20260521 for：【配合示方】queryById补充创建人姓名供审批进度展示-----------
|
||||
fillCreateByDictText(main);
|
||||
//update-end---author:cursor ---date:20260521 for：【配合示方】queryById补充创建人姓名供审批进度展示-----------
|
||||
return main;
|
||||
}
|
||||
|
||||
private void fillCreateByDictText(MesXslFormulaSpec main) {
|
||||
if (main == null || StringUtils.isBlank(main.getCreateBy())) {
|
||||
return;
|
||||
}
|
||||
SysUser user = sysUserService.getUserByName(main.getCreateBy());
|
||||
if (user != null && StringUtils.isNotBlank(user.getRealname())) {
|
||||
main.setCreateBy_dictText(user.getRealname());
|
||||
}
|
||||
}
|
||||
|
||||
//update-begin---author:cursor ---date:20260521 for：配合示方胶料代号自动生成 D+胶料名称+分类+版本号-----------
|
||||
@Override
|
||||
public String generateRubberCode(String rubberMaterialId, String category, String excludeSpecId) {
|
||||
if (StringUtils.isBlank(rubberMaterialId)) {
|
||||
throw new IllegalArgumentException("请选择胶料信息");
|
||||
}
|
||||
if (StringUtils.isBlank(category) || !RUBBER_CATEGORY_KEYS.contains(category)) {
|
||||
throw new IllegalArgumentException("请选择有效的示方分类");
|
||||
}
|
||||
MesMaterial material = mesMaterialService.getById(rubberMaterialId);
|
||||
if (material == null || StringUtils.isBlank(material.getMaterialName())) {
|
||||
throw new IllegalArgumentException("所选胶料不存在或未维护胶料名称");
|
||||
}
|
||||
String basePrefix = buildRubberCodePrefix(material.getMaterialName(), category);
|
||||
Set<Character> usedLetters = loadUsedRubberCodeLetters(rubberMaterialId, category, basePrefix, excludeSpecId);
|
||||
for (char letter = 'A'; letter <= 'Z'; letter++) {
|
||||
if (!usedLetters.contains(letter)) {
|
||||
return basePrefix + letter + "01";
|
||||
}
|
||||
}
|
||||
throw new IllegalArgumentException("该胶料在当前分类下的代号版本已用尽(A01-Z01)");
|
||||
}
|
||||
|
||||
private void fillRubberCodeOnCreate(MesXslFormulaSpec main) {
|
||||
if (StringUtils.isBlank(main.getRubberMaterialId()) || StringUtils.isBlank(main.getCategory())) {
|
||||
return;
|
||||
}
|
||||
main.setRubberCode(generateRubberCode(main.getRubberMaterialId(), main.getCategory(), null));
|
||||
main.setSpecCode(main.getRubberCode());
|
||||
}
|
||||
|
||||
private String buildRubberCodePrefix(String materialName, String category) {
|
||||
return "D" + materialName.trim() + category;
|
||||
}
|
||||
|
||||
private Set<Character> loadUsedRubberCodeLetters(
|
||||
String rubberMaterialId, String category, String basePrefix, String excludeSpecId) {
|
||||
LambdaQueryWrapper<MesXslFormulaSpec> queryWrapper = new LambdaQueryWrapper<MesXslFormulaSpec>()
|
||||
.eq(MesXslFormulaSpec::getRubberMaterialId, rubberMaterialId)
|
||||
.eq(MesXslFormulaSpec::getCategory, category)
|
||||
.likeRight(MesXslFormulaSpec::getRubberCode, basePrefix);
|
||||
if (StringUtils.isNotBlank(excludeSpecId)) {
|
||||
queryWrapper.ne(MesXslFormulaSpec::getId, excludeSpecId);
|
||||
}
|
||||
List<MesXslFormulaSpec> existingList = this.list(queryWrapper);
|
||||
Set<Character> usedLetters = new HashSet<>();
|
||||
for (MesXslFormulaSpec item : existingList) {
|
||||
if (item == null || StringUtils.isBlank(item.getRubberCode())) {
|
||||
continue;
|
||||
}
|
||||
if (!item.getRubberCode().startsWith(basePrefix) || item.getRubberCode().length() <= basePrefix.length()) {
|
||||
continue;
|
||||
}
|
||||
String suffix = item.getRubberCode().substring(basePrefix.length());
|
||||
Matcher matcher = RUBBER_CODE_VERSION_PATTERN.matcher(suffix);
|
||||
if (matcher.matches()) {
|
||||
usedLetters.add(matcher.group(1).charAt(0));
|
||||
}
|
||||
}
|
||||
return usedLetters;
|
||||
}
|
||||
//update-end---author:cursor ---date:20260521 for：配合示方胶料代号自动生成 D+胶料名称+分类+版本号-----------
|
||||
|
||||
private void fillMainDefaults(MesXslFormulaSpec main) {
|
||||
if (StringUtils.isBlank(main.getCategory())) {
|
||||
//update-begin---author:cursor ---date:20260521 for：配合示方分类字典默认值改为 S-----------
|
||||
main.setCategory("S");
|
||||
//update-end---author:cursor ---date:20260521 for：配合示方分类字典默认值改为 S-----------
|
||||
}
|
||||
if (StringUtils.isBlank(main.getStatus())) {
|
||||
main.setStatus("compile");
|
||||
}
|
||||
if (main.getHasManualBatch() == null) {
|
||||
main.setHasManualBatch(0);
|
||||
}
|
||||
}
|
||||
|
||||
private void insertLines(MesXslFormulaSpec main, List<MesXslFormulaSpecLine> lineList) {
|
||||
if (CollectionUtils.isEmpty(lineList)) {
|
||||
return;
|
||||
}
|
||||
Date now = new Date();
|
||||
int sort = 0;
|
||||
//update-begin---author:cursor ---date:20260521 for：配合示方明细重量%按PHR/总PHR自动计算-----------
|
||||
BigDecimal totalPhr = BigDecimal.ZERO;
|
||||
for (MesXslFormulaSpecLine line : lineList) {
|
||||
if (line == null || StringUtils.isBlank(line.getMixerMaterialId()) || line.getPhr() == null) {
|
||||
continue;
|
||||
}
|
||||
totalPhr = totalPhr.add(line.getPhr());
|
||||
}
|
||||
if (main.getTotalPhr() == null) {
|
||||
main.setTotalPhr(totalPhr);
|
||||
}
|
||||
BigDecimal weightBase = main.getTotalPhr() != null && main.getTotalPhr().compareTo(BigDecimal.ZERO) > 0
|
||||
? main.getTotalPhr()
|
||||
: totalPhr;
|
||||
//update-end---author:cursor ---date:20260521 for：配合示方明细重量%按PHR/总PHR自动计算-----------
|
||||
boolean hasManual = false;
|
||||
for (MesXslFormulaSpecLine line : lineList) {
|
||||
if (line == null || StringUtils.isBlank(line.getMixerMaterialId())) {
|
||||
continue;
|
||||
}
|
||||
line.setId(null);
|
||||
line.setFormulaSpecId(main.getId());
|
||||
line.setSortNo(sort++);
|
||||
fillMaterialInfo(line);
|
||||
fillVolumeIfBlank(line);
|
||||
//update-begin---author:cursor ---date:20260521 for：配合示方明细重量%按PHR/总PHR自动计算-----------
|
||||
fillWeightPercent(line, weightBase);
|
||||
//update-end---author:cursor ---date:20260521 for：配合示方明细重量%按PHR/总PHR自动计算-----------
|
||||
if (line.getCreateTime() == null) {
|
||||
line.setCreateTime(now);
|
||||
}
|
||||
if (line.getUpdateTime() == null) {
|
||||
line.setUpdateTime(now);
|
||||
}
|
||||
if ("manual".equals(line.getWeighMode())) {
|
||||
hasManual = true;
|
||||
}
|
||||
lineMapper.insert(line);
|
||||
}
|
||||
if (main.getTotalPhr() == null) {
|
||||
main.setTotalPhr(totalPhr);
|
||||
}
|
||||
if (main.getHasManualBatch() == null || main.getHasManualBatch() == 0) {
|
||||
main.setHasManualBatch(hasManual ? 1 : 0);
|
||||
}
|
||||
}
|
||||
|
||||
private void fillMaterialInfo(MesXslFormulaSpecLine line) {
|
||||
MesMixerMaterial material = mesMixerMaterialService.getById(line.getMixerMaterialId());
|
||||
if (material == null) {
|
||||
return;
|
||||
}
|
||||
line.setMixerMaterialCode(material.getMaterialCode());
|
||||
line.setMixerMaterialName(material.getMaterialName());
|
||||
if (StringUtils.isBlank(line.getMaterialDesc())) {
|
||||
line.setMaterialDesc(StringUtils.defaultIfBlank(material.getMaterialDesc(), material.getMaterialName()));
|
||||
}
|
||||
}
|
||||
|
||||
private void fillVolumeIfBlank(MesXslFormulaSpecLine line) {
|
||||
if (line.getVolume() != null || line.getPhr() == null || StringUtils.isBlank(line.getMixerMaterialId())) {
|
||||
return;
|
||||
}
|
||||
MesMixerMaterial material = mesMixerMaterialService.getById(line.getMixerMaterialId());
|
||||
if (material == null || material.getSpecificGravity() == null || material.getSpecificGravity().compareTo(BigDecimal.ZERO) <= 0) {
|
||||
return;
|
||||
}
|
||||
line.setVolume(line.getPhr().divide(material.getSpecificGravity(), 6, RoundingMode.HALF_UP));
|
||||
}
|
||||
|
||||
private void fillWeightPercent(MesXslFormulaSpecLine line, BigDecimal totalPhr) {
|
||||
//update-begin---author:cursor ---date:20260521 for：配合示方明细重量%按PHR/总PHR自动计算（可手工覆盖）-----------
|
||||
if (line.getWeightPercent() != null || line.getPhr() == null || totalPhr == null || totalPhr.compareTo(BigDecimal.ZERO) <= 0) {
|
||||
return;
|
||||
}
|
||||
line.setWeightPercent(line.getPhr().multiply(BigDecimal.valueOf(100)).divide(totalPhr, 4, RoundingMode.HALF_UP));
|
||||
//update-end---author:cursor ---date:20260521 for：配合示方明细重量%按PHR/总PHR自动计算（可手工覆盖）-----------
|
||||
}
|
||||
|
||||
//update-begin---author:cursor ---date:20260521 for：【配合示方】保存后汇总A/Q胶比重写入数据库-----------
|
||||
/** 根据明细重新汇总主表 TOTAL PHR、A胶TOTAL PHR、比重与人工配料标记 */
|
||||
private void refreshMainSummary(String mainId) {
|
||||
List<MesXslFormulaSpecLine> lines = selectLinesByMainId(mainId);
|
||||
if (CollectionUtils.isEmpty(lines)) {
|
||||
return;
|
||||
}
|
||||
BigDecimal totalPhr = BigDecimal.ZERO;
|
||||
BigDecimal aRubberPhr = BigDecimal.ZERO;
|
||||
BigDecimal aRubberVolume = BigDecimal.ZERO;
|
||||
BigDecimal qRubberPhr = BigDecimal.ZERO;
|
||||
BigDecimal qRubberVolume = BigDecimal.ZERO;
|
||||
BigDecimal naturalRubber = BigDecimal.ZERO;
|
||||
BigDecimal syntheticRubber = BigDecimal.ZERO;
|
||||
boolean hasManual = false;
|
||||
Map<String, MesMixerMaterial> materialCache = new HashMap<>();
|
||||
Set<String> naturalCategoryIds = mesXslFormulaSpecSettingService.getNaturalMinorCategoryIds();
|
||||
Set<String> syntheticCategoryIds = mesXslFormulaSpecSettingService.getSyntheticMinorCategoryIds();
|
||||
for (MesXslFormulaSpecLine line : lines) {
|
||||
if (line == null) {
|
||||
continue;
|
||||
}
|
||||
if (line.getPhr() != null) {
|
||||
totalPhr = totalPhr.add(line.getPhr());
|
||||
if ("A".equals(line.getStep())) {
|
||||
aRubberPhr = aRubberPhr.add(line.getPhr());
|
||||
} else if ("Q".equals(line.getStep())) {
|
||||
qRubberPhr = qRubberPhr.add(line.getPhr());
|
||||
}
|
||||
}
|
||||
if ("manual".equals(line.getWeighMode())) {
|
||||
hasManual = true;
|
||||
}
|
||||
BigDecimal volume = resolveLineVolume(line);
|
||||
if (volume == null) {
|
||||
continue;
|
||||
}
|
||||
if ("A".equals(line.getStep())) {
|
||||
aRubberVolume = aRubberVolume.add(volume);
|
||||
} else if ("Q".equals(line.getStep())) {
|
||||
qRubberVolume = qRubberVolume.add(volume);
|
||||
}
|
||||
//update-begin---author:cursor ---date:20260521 for：【配合示方】含胶率按密炼物料小类汇总重量%-----------
|
||||
if (line.getWeightPercent() != null && StringUtils.isNotBlank(line.getMixerMaterialId())) {
|
||||
MesMixerMaterial mixerMaterial = materialCache.computeIfAbsent(
|
||||
line.getMixerMaterialId(), mesMixerMaterialService::getById);
|
||||
if (mixerMaterial != null && StringUtils.isNotBlank(mixerMaterial.getMinorCategoryId())) {
|
||||
String minorCategoryId = mixerMaterial.getMinorCategoryId();
|
||||
if (!naturalCategoryIds.isEmpty() && naturalCategoryIds.contains(minorCategoryId)) {
|
||||
naturalRubber = naturalRubber.add(line.getWeightPercent());
|
||||
} else if (!syntheticCategoryIds.isEmpty() && syntheticCategoryIds.contains(minorCategoryId)) {
|
||||
syntheticRubber = syntheticRubber.add(line.getWeightPercent());
|
||||
}
|
||||
}
|
||||
}
|
||||
//update-end---author:cursor ---date:20260521 for：【配合示方】含胶率按密炼物料小类汇总重量%-----------
|
||||
}
|
||||
//update-begin---author:cursor ---date:20260521 for：【配合示方】STEP全为A/Q时对应胶比重清零并写库-----------
|
||||
BigDecimal aRubberSg = aRubberVolume.compareTo(BigDecimal.ZERO) > 0
|
||||
? aRubberPhr.divide(aRubberVolume, 6, RoundingMode.HALF_UP)
|
||||
: null;
|
||||
BigDecimal qRubberSg = qRubberVolume.compareTo(BigDecimal.ZERO) > 0
|
||||
? qRubberPhr.divide(qRubberVolume, 6, RoundingMode.HALF_UP)
|
||||
: null;
|
||||
BigDecimal aRubberTotalPhr = aRubberPhr.compareTo(BigDecimal.ZERO) > 0 ? aRubberPhr : null;
|
||||
BigDecimal naturalRubberValue = naturalRubber.compareTo(BigDecimal.ZERO) > 0
|
||||
? naturalRubber.setScale(4, RoundingMode.HALF_UP)
|
||||
: null;
|
||||
BigDecimal syntheticRubberValue = syntheticRubber.compareTo(BigDecimal.ZERO) > 0
|
||||
? syntheticRubber.setScale(4, RoundingMode.HALF_UP)
|
||||
: null;
|
||||
BigDecimal totalAmount = null;
|
||||
if (naturalRubberValue != null || syntheticRubberValue != null) {
|
||||
totalAmount = (naturalRubberValue != null ? naturalRubberValue : BigDecimal.ZERO)
|
||||
.add(syntheticRubberValue != null ? syntheticRubberValue : BigDecimal.ZERO)
|
||||
.setScale(4, RoundingMode.HALF_UP);
|
||||
}
|
||||
LambdaUpdateWrapper<MesXslFormulaSpec> updateWrapper = new LambdaUpdateWrapper<MesXslFormulaSpec>()
|
||||
.eq(MesXslFormulaSpec::getId, mainId)
|
||||
.set(MesXslFormulaSpec::getTotalPhr, totalPhr)
|
||||
.set(MesXslFormulaSpec::getHasManualBatch, hasManual ? 1 : 0)
|
||||
.set(MesXslFormulaSpec::getARubberTotalPhr, aRubberTotalPhr)
|
||||
.set(MesXslFormulaSpec::getARubberSg, aRubberSg)
|
||||
.set(MesXslFormulaSpec::getQRubberSg, qRubberSg)
|
||||
.set(MesXslFormulaSpec::getNaturalRubber, naturalRubberValue)
|
||||
.set(MesXslFormulaSpec::getSyntheticRubber, syntheticRubberValue)
|
||||
.set(MesXslFormulaSpec::getTotalAmount, totalAmount);
|
||||
this.update(updateWrapper);
|
||||
//update-end---author:cursor ---date:20260521 for：【配合示方】STEP全为A/Q时对应胶比重清零并写库-----------
|
||||
}
|
||||
|
||||
/** 优先取明细已保存体积，缺失时按 PHR/物料比重补算 */
|
||||
private BigDecimal resolveLineVolume(MesXslFormulaSpecLine line) {
|
||||
if (line == null) {
|
||||
return null;
|
||||
}
|
||||
if (line.getVolume() != null && line.getVolume().compareTo(BigDecimal.ZERO) > 0) {
|
||||
return line.getVolume();
|
||||
}
|
||||
if (line.getPhr() == null || StringUtils.isBlank(line.getMixerMaterialId())) {
|
||||
return null;
|
||||
}
|
||||
MesMixerMaterial material = mesMixerMaterialService.getById(line.getMixerMaterialId());
|
||||
if (material == null || material.getSpecificGravity() == null || material.getSpecificGravity().compareTo(BigDecimal.ZERO) <= 0) {
|
||||
return null;
|
||||
}
|
||||
return line.getPhr().divide(material.getSpecificGravity(), 6, RoundingMode.HALF_UP);
|
||||
}
|
||||
//update-end---author:cursor ---date:20260521 for：【配合示方】保存后汇总A/Q胶比重写入数据库-----------
|
||||
}
|
||||
@@ -0,0 +1,104 @@
|
||||
package org.jeecg.modules.xslmes.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.Date;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.jeecg.modules.system.entity.SysCategory;
|
||||
import org.jeecg.modules.system.service.ISysCategoryService;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslFormulaSpecSetting;
|
||||
import org.jeecg.modules.xslmes.mapper.MesXslFormulaSpecSettingMapper;
|
||||
import org.jeecg.modules.xslmes.service.IMesXslFormulaSpecSettingService;
|
||||
import org.jeecg.modules.xslmes.vo.MesXslFormulaRubberContentSettingVO;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
@Service
|
||||
public class MesXslFormulaSpecSettingServiceImpl extends ServiceImpl<MesXslFormulaSpecSettingMapper, MesXslFormulaSpecSetting>
|
||||
implements IMesXslFormulaSpecSettingService {
|
||||
|
||||
private static final String DEFAULT_NATURAL_CATEGORY_CODE = "XSLMES_MATERIAL_RAW_AUX_TRJ";
|
||||
private static final String DEFAULT_SYNTHETIC_CATEGORY_CODE = "XSLMES_MATERIAL_RAW_AUX_HCJ";
|
||||
|
||||
private final ISysCategoryService sysCategoryService;
|
||||
|
||||
public MesXslFormulaSpecSettingServiceImpl(ISysCategoryService sysCategoryService) {
|
||||
this.sysCategoryService = sysCategoryService;
|
||||
}
|
||||
|
||||
@Override
|
||||
public MesXslFormulaRubberContentSettingVO getRubberContentSetting() {
|
||||
MesXslFormulaSpecSetting setting = loadOrInitSetting();
|
||||
MesXslFormulaRubberContentSettingVO vo = new MesXslFormulaRubberContentSettingVO();
|
||||
vo.setNaturalMinorCategoryIds(parseIdList(setting.getNaturalMinorCategoryIds()));
|
||||
vo.setSyntheticMinorCategoryIds(parseIdList(setting.getSyntheticMinorCategoryIds()));
|
||||
return vo;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void saveRubberContentSetting(MesXslFormulaRubberContentSettingVO settingVo) {
|
||||
MesXslFormulaSpecSetting setting = loadOrInitSetting();
|
||||
setting.setNaturalMinorCategoryIds(joinIdList(settingVo != null ? settingVo.getNaturalMinorCategoryIds() : null));
|
||||
setting.setSyntheticMinorCategoryIds(joinIdList(settingVo != null ? settingVo.getSyntheticMinorCategoryIds() : null));
|
||||
setting.setUpdateTime(new Date());
|
||||
this.updateById(setting);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Set<String> getNaturalMinorCategoryIds() {
|
||||
return new LinkedHashSet<>(parseIdList(loadOrInitSetting().getNaturalMinorCategoryIds()));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Set<String> getSyntheticMinorCategoryIds() {
|
||||
return new LinkedHashSet<>(parseIdList(loadOrInitSetting().getSyntheticMinorCategoryIds()));
|
||||
}
|
||||
|
||||
private MesXslFormulaSpecSetting loadOrInitSetting() {
|
||||
MesXslFormulaSpecSetting setting = this.getById(MesXslFormulaSpecSetting.DEFAULT_ID);
|
||||
if (setting != null) {
|
||||
return setting;
|
||||
}
|
||||
setting = new MesXslFormulaSpecSetting();
|
||||
setting.setId(MesXslFormulaSpecSetting.DEFAULT_ID);
|
||||
setting.setNaturalMinorCategoryIds(resolveCategoryIdByCode(DEFAULT_NATURAL_CATEGORY_CODE));
|
||||
setting.setSyntheticMinorCategoryIds(resolveCategoryIdByCode(DEFAULT_SYNTHETIC_CATEGORY_CODE));
|
||||
setting.setCreateTime(new Date());
|
||||
this.save(setting);
|
||||
return setting;
|
||||
}
|
||||
|
||||
private String resolveCategoryIdByCode(String categoryCode) {
|
||||
if (StringUtils.isBlank(categoryCode)) {
|
||||
return null;
|
||||
}
|
||||
SysCategory category = sysCategoryService.getOne(
|
||||
new LambdaQueryWrapper<SysCategory>().eq(SysCategory::getCode, categoryCode).last("LIMIT 1"));
|
||||
return category != null ? category.getId() : null;
|
||||
}
|
||||
|
||||
private List<String> parseIdList(String raw) {
|
||||
if (StringUtils.isBlank(raw)) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
return Arrays.stream(raw.split(","))
|
||||
.map(String::trim)
|
||||
.filter(StringUtils::isNotBlank)
|
||||
.distinct()
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
private String joinIdList(List<String> ids) {
|
||||
if (ids == null || ids.isEmpty()) {
|
||||
return null;
|
||||
}
|
||||
return ids.stream().filter(StringUtils::isNotBlank).map(String::trim).distinct().collect(Collectors.joining(","));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package org.jeecg.modules.xslmes.util;
|
||||
|
||||
import org.jeecg.common.util.oConvertUtils;
|
||||
|
||||
/**
|
||||
* 设备点检/保养业务提示文案
|
||||
*/
|
||||
public final class MesXslEquipInspectBizMsg {
|
||||
|
||||
private MesXslEquipInspectBizMsg() {}
|
||||
|
||||
public static String recordTypeLabel(String recordType) {
|
||||
return "inspect".equals(recordType) ? "点检" : "保养";
|
||||
}
|
||||
|
||||
/** 未维护该类型设备点检配置（不生成记录） */
|
||||
public static String noConfigMessage(String equipmentName, String recordType) {
|
||||
String name = oConvertUtils.isNotEmpty(equipmentName) ? equipmentName.trim() : "该设备";
|
||||
return name + " 未维护" + recordTypeLabel(recordType) + "类型的设备点检配置";
|
||||
}
|
||||
|
||||
/** 已有点检配置主表但无明细行 */
|
||||
public static String noConfigLineMessage(String equipmentName, String recordType) {
|
||||
String name = oConvertUtils.isNotEmpty(equipmentName) ? equipmentName.trim() : "该设备";
|
||||
return name + " 的" + recordTypeLabel(recordType) + "类型设备点检配置未维护明细项";
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package org.jeecg.modules.xslmes.vo;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipInspectConfig;
|
||||
|
||||
/**
|
||||
* 设备点检配置主子保存页 VO，继承主表实体（含 {@link MesXslEquipInspectConfig#lineList} 明细）。
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class MesXslEquipInspectConfigPage extends MesXslEquipInspectConfig {}
|
||||
@@ -0,0 +1,19 @@
|
||||
package org.jeecg.modules.xslmes.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import java.util.List;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 从设备台账批量生成点检/保养记录
|
||||
*/
|
||||
@Data
|
||||
@Schema(description = "批量生成点检保养记录请求")
|
||||
public class MesXslEquipInspectRecordBatchCreateDTO {
|
||||
|
||||
@Schema(description = "设备台账主键列表")
|
||||
private List<String> equipmentLedgerIds;
|
||||
|
||||
@Schema(description = "记录类型 inspect点检/maintain保养")
|
||||
private String recordType;
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package org.jeecg.modules.xslmes.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 批量生成点检/保养记录结果
|
||||
*/
|
||||
@Data
|
||||
@Schema(description = "批量生成点检保养记录结果")
|
||||
public class MesXslEquipInspectRecordBatchCreateResult {
|
||||
|
||||
@Schema(description = "成功条数")
|
||||
private int successCount;
|
||||
|
||||
@Schema(description = "失败说明（按设备）")
|
||||
private List<String> failMessages = new ArrayList<>();
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
package org.jeecg.modules.xslmes.vo;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import java.util.Date;
|
||||
import lombok.Data;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
/**
|
||||
* 不合格点检记录处理入参
|
||||
*/
|
||||
@Data
|
||||
@Schema(description = "点检保养记录-不合格处理")
|
||||
public class MesXslEquipInspectRecordHandleDTO {
|
||||
|
||||
@Schema(description = "记录主键", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
private String id;
|
||||
|
||||
@Schema(description = "处理人用户ID")
|
||||
private String handlerUserId;
|
||||
|
||||
@Schema(description = "处理人账号")
|
||||
private String handlerUsername;
|
||||
|
||||
@Schema(description = "处理人姓名")
|
||||
private String handlerRealname;
|
||||
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "处理时间")
|
||||
private Date handleTime;
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package org.jeecg.modules.xslmes.vo;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslEquipInspectRecord;
|
||||
|
||||
/**
|
||||
* 点检/保养记录主子保存 VO
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class MesXslEquipInspectRecordPage extends MesXslEquipInspectRecord {}
|
||||
@@ -0,0 +1,22 @@
|
||||
package org.jeecg.modules.xslmes.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import java.io.Serializable;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 配合示方含胶率物料小类配置
|
||||
*/
|
||||
@Data
|
||||
@Schema(description = "配合示方含胶率物料小类配置")
|
||||
public class MesXslFormulaRubberContentSettingVO implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@Schema(description = "天然橡胶物料小类ID列表")
|
||||
private List<String> naturalMinorCategoryIds = new ArrayList<>();
|
||||
|
||||
@Schema(description = "合成橡胶物料小类ID列表")
|
||||
private List<String> syntheticMinorCategoryIds = new ArrayList<>();
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
package org.jeecg.modules.xslmes.vo;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.jeecg.modules.xslmes.entity.MesXslFormulaSpec;
|
||||
|
||||
/** 配合示方主子保存 VO */
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class MesXslFormulaSpecPage extends MesXslFormulaSpec {}
|
||||
@@ -339,3 +339,82 @@ jeecgboot-vue3/src/views/xslmes/mesXslInspectMaintainItem/MesXslInspectMaintainI
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslInspectMaintainItem/components/MesXslInspectMaintainItemModal.vue
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslInspectMaintainItem/components/MesXslEquipmentTypeFilterSelectModal.vue
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslInspectMaintainItem/components/MesXslEquipmentSubPartFilterSelectModal.vue
|
||||
-- author:jiangxh---date:20260519--for: 【MES】设备点检配置主子表（设备台账+类型唯一、明细从点检保养项目带出）---
|
||||
jeecg-boot/db/mes-xsl-equip-inspect-config-menu-permission.sql
|
||||
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_78__mes_xsl_equip_inspect_config.sql
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslEquipInspectConfig.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslEquipInspectConfigLine.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/vo/MesXslEquipInspectConfigPage.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslEquipInspectConfigMapper.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslEquipInspectConfigLineMapper.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslEquipInspectConfigService.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslEquipInspectConfigServiceImpl.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslEquipInspectConfigController.java
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/MesXslEquipInspectConfigList.vue
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/MesXslEquipInspectConfig.data.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/MesXslEquipInspectConfig.api.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/components/MesXslEquipInspectConfigModal.vue
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/components/MesXslEquipmentLedgerSelectModal.vue
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/components/MesXslInspectMaintainItemSelectModal.vue
|
||||
-- author:jiangxh---date:20260519--for: 【MES】修复设备点检配置保存失败（Page VO 与主实体重复 lineList 导致编译错误）---
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/vo/MesXslEquipInspectConfigPage.java
|
||||
-- author:jiangxh---date:20260519--for: 【MES】设备点检配置明细改为多选点检保养项目、禁用JVxe新增---
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/components/MesXslEquipInspectConfigModal.vue
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/components/MesXslInspectMaintainItemSelectModal.vue
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectConfig/MesXslEquipInspectConfig.data.ts
|
||||
-- author:jiangxh---date:20260520--for: 【MES】点检保养记录主子表（EC编号、设备配置带出明细、字典与菜单）---
|
||||
jeecg-boot/db/mes-xsl-equip-inspect-record-menu-permission.sql
|
||||
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_79__mes_xsl_equip_inspect_record.sql
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslEquipInspectRecord.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslEquipInspectRecordLine.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/vo/MesXslEquipInspectRecordPage.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslEquipInspectRecordMapper.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslEquipInspectRecordLineMapper.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslEquipInspectRecordService.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslEquipInspectRecordServiceImpl.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslEquipInspectRecordController.java
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/MesXslEquipInspectRecordList.vue
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/MesXslEquipInspectRecord.data.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/MesXslEquipInspectRecord.api.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/components/MesXslEquipInspectRecordModal.vue
|
||||
-- author:jiangxh---date:20260520--for: 【MES】点检记录改由设备台账批量生成，去掉记录列表新增与表单选设备---
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/vo/MesXslEquipInspectRecordBatchCreateDTO.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/vo/MesXslEquipInspectRecordBatchCreateResult.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslEquipInspectRecordService.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslEquipInspectRecordServiceImpl.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslEquipInspectRecordController.java
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/MesXslEquipInspectRecordList.vue
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/MesXslEquipInspectRecord.data.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/MesXslEquipInspectRecord.api.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/components/MesXslEquipInspectRecordModal.vue
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipmentLedger/MesXslEquipmentLedgerList.vue
|
||||
-- author:jiangxh---date:20260520--for: 【MES】点检记录录入流程：去导入、待点检录入、保存变已点检---
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslEquipInspectRecordController.java
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/MesXslEquipInspectRecordList.vue
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/MesXslEquipInspectRecord.data.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/components/MesXslEquipInspectRecordModal.vue
|
||||
-- author:jiangxh---date:20260520--for: 【MES】修复点检记录明细图片上传一直转圈（uploadUrl 补全 jeecg-boot 上下文）---
|
||||
jeecgboot-vue3/src/api/common/api.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/MesXslEquipInspectRecord.data.ts
|
||||
-- author:jiangxh---date:20260520--for: 【MES】修复点检明细图片上传后预览「图片错误」（getFileAccessHttpUrl 补全 context-path）---
|
||||
jeecgboot-vue3/src/utils/env/apiBaseUrl.ts
|
||||
jeecgboot-vue3/src/utils/common/compUtils.ts
|
||||
jeecgboot-vue3/src/api/common/api.ts
|
||||
-- author:jiangxh---date:20260520--for: 【MES】设备台账批量点检/保养：未维护对应类型点检配置不生成并提示设备名称---
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/util/MesXslEquipInspectBizMsg.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslEquipInspectRecordServiceImpl.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslEquipInspectRecordController.java
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipmentLedger/MesXslEquipmentLedgerList.vue
|
||||
-- author:jiangxh---date:20260521--for: 【MES】点检保养记录不合格处理：是否已处理/处理人/处理时间字段与处理按钮---
|
||||
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_80__mes_xsl_equip_inspect_record_handle.sql
|
||||
jeecg-boot/db/mes-xsl-equip-inspect-record-menu-permission.sql
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslEquipInspectRecord.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/vo/MesXslEquipInspectRecordHandleDTO.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslEquipInspectRecordService.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslEquipInspectRecordServiceImpl.java
|
||||
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslEquipInspectRecordController.java
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/MesXslEquipInspectRecord.data.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/MesXslEquipInspectRecord.api.ts
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/MesXslEquipInspectRecordList.vue
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/components/MesXslEquipInspectRecordModal.vue
|
||||
jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/components/MesXslEquipInspectRecordHandleModal.vue
|
||||
|
||||
@@ -0,0 +1,88 @@
|
||||
-- MES 设备点检配置（主子表）：与 jeecg-boot/db/mes-xsl-equip-inspect-config-menu-permission.sql 一致
|
||||
SET NAMES utf8mb4;
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `mes_xsl_equip_inspect_config` (
|
||||
`id` varchar(32) NOT NULL COMMENT '主键',
|
||||
`equipment_ledger_id` varchar(32) NOT NULL COMMENT '设备台账主键 mes_xsl_equipment_ledger.id',
|
||||
`equipment_name` varchar(500) DEFAULT NULL COMMENT '设备名称冗余',
|
||||
`equipment_code` varchar(500) DEFAULT NULL COMMENT '设备编号冗余',
|
||||
`config_type` varchar(500) NOT NULL COMMENT '配置类型（字典xslmes_im_item_category：inspect点检/maintain保养；同设备同类型唯一）',
|
||||
`tenant_id` int DEFAULT NULL COMMENT '租户',
|
||||
`sys_org_code` varchar(500) DEFAULT NULL COMMENT '部门',
|
||||
`create_by` varchar(500) DEFAULT NULL COMMENT '创建人',
|
||||
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
|
||||
`update_by` varchar(500) DEFAULT NULL COMMENT '更新人',
|
||||
`update_time` datetime DEFAULT NULL COMMENT '更新时间',
|
||||
`del_flag` int DEFAULT '0' COMMENT '删除标记（0正常1删除）',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `idx_meic_tenant_equip_type` (`tenant_id`, `equipment_ledger_id`, `config_type`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES设备点检配置';
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `mes_xsl_equip_inspect_config_line` (
|
||||
`id` varchar(32) NOT NULL COMMENT '主键',
|
||||
`config_id` varchar(32) NOT NULL COMMENT '主表主键 mes_xsl_equip_inspect_config.id',
|
||||
`inspect_maintain_item_id` varchar(32) NOT NULL COMMENT '点检及保养项目主键 mes_xsl_inspect_maintain_item.id',
|
||||
`item_code` varchar(500) DEFAULT NULL COMMENT '点检项目编号冗余',
|
||||
`item_name` varchar(500) DEFAULT NULL COMMENT '项目名称冗余',
|
||||
`item_category` varchar(500) DEFAULT NULL COMMENT '项目类别冗余',
|
||||
`item_type` varchar(500) DEFAULT NULL COMMENT '项目类型冗余',
|
||||
`equipment_part_name` varchar(500) DEFAULT NULL COMMENT '设备部位名称冗余',
|
||||
`equipment_sub_part_name` varchar(500) DEFAULT NULL COMMENT '设备小部位名称冗余',
|
||||
`inspect_method` varchar(500) DEFAULT NULL COMMENT '点检方式冗余',
|
||||
`judgment_criteria` varchar(500) DEFAULT NULL COMMENT '判断基准冗余',
|
||||
`sort_no` int DEFAULT '0' COMMENT '排序号',
|
||||
`create_by` varchar(500) DEFAULT NULL COMMENT '创建人',
|
||||
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
|
||||
`update_by` varchar(500) DEFAULT NULL COMMENT '更新人',
|
||||
`update_time` datetime DEFAULT NULL COMMENT '更新时间',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `idx_meicl_config` (`config_id`),
|
||||
KEY `idx_meicl_item` (`inspect_maintain_item_id`),
|
||||
UNIQUE KEY `uk_meicl_config_item` (`config_id`, `inspect_maintain_item_id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES设备点检配置明细';
|
||||
|
||||
SET @mes_tenant_id = 1002;
|
||||
|
||||
SET @mes_equip_pid = (
|
||||
SELECT `id` FROM `sys_permission`
|
||||
WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` = '设备管理'
|
||||
LIMIT 1
|
||||
);
|
||||
SET @mes_equip_pid = IFNULL(@mes_equip_pid, '1860000000000000133');
|
||||
|
||||
INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `keep_alive`, `internal_or_external`, `create_by`, `create_time`)
|
||||
VALUES ('1860000000000000148', @mes_equip_pid, '设备点检配置', '/xslmes/mesXslEquipInspectConfig', 'xslmes/mesXslEquipInspectConfig/MesXslEquipInspectConfigList', NULL, 1, NULL, '1', 12, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW())
|
||||
ON DUPLICATE KEY UPDATE
|
||||
`parent_id` = VALUES(`parent_id`), `name` = VALUES(`name`), `url` = VALUES(`url`), `component` = VALUES(`component`), `component_name` = VALUES(`component_name`),
|
||||
`menu_type` = VALUES(`menu_type`), `perms` = VALUES(`perms`), `perms_type` = VALUES(`perms_type`), `sort_no` = VALUES(`sort_no`),
|
||||
`is_route` = VALUES(`is_route`), `is_leaf` = VALUES(`is_leaf`), `hidden` = VALUES(`hidden`), `status` = VALUES(`status`), `del_flag` = VALUES(`del_flag`),
|
||||
`keep_alive` = VALUES(`keep_alive`), `internal_or_external` = VALUES(`internal_or_external`), `icon` = 'ant-design:control-outlined';
|
||||
|
||||
UPDATE `sys_permission` SET `icon` = 'ant-design:control-outlined' WHERE `id` = '1860000000000000148' AND `del_flag` = 0;
|
||||
|
||||
INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `status`, `del_flag`, `create_by`, `create_time`) VALUES
|
||||
('1860000000000000149', '1860000000000000148', '新增', 2, 'mes:mes_xsl_equip_inspect_config:add', '1', '1', 0, 'admin', NOW()),
|
||||
('1860000000000000150', '1860000000000000148', '编辑', 2, 'mes:mes_xsl_equip_inspect_config:edit', '1', '1', 0, 'admin', NOW()),
|
||||
('1860000000000000151', '1860000000000000148', '删除', 2, 'mes:mes_xsl_equip_inspect_config:delete', '1', '1', 0, 'admin', NOW()),
|
||||
('1860000000000000152', '1860000000000000148', '批量删除', 2, 'mes:mes_xsl_equip_inspect_config:deleteBatch', '1', '1', 0, 'admin', NOW()),
|
||||
('1860000000000000153', '1860000000000000148', '导出', 2, 'mes:mes_xsl_equip_inspect_config:exportXls', '1', '1', 0, 'admin', NOW()),
|
||||
('1860000000000000154', '1860000000000000148', '导入', 2, 'mes:mes_xsl_equip_inspect_config:importExcel', '1', '1', 0, 'admin', NOW())
|
||||
ON DUPLICATE KEY UPDATE
|
||||
`parent_id` = VALUES(`parent_id`), `name` = VALUES(`name`), `menu_type` = VALUES(`menu_type`), `perms` = VALUES(`perms`), `perms_type` = VALUES(`perms_type`),
|
||||
`status` = VALUES(`status`), `del_flag` = VALUES(`del_flag`);
|
||||
|
||||
INSERT INTO `sys_role_permission`(`id`, `role_id`, `permission_id`, `operate_date`, `operate_ip`)
|
||||
SELECT REPLACE(UUID(), '-', ''), r.`id`, p.`id`, NOW(), '127.0.0.1'
|
||||
FROM `sys_role` r
|
||||
CROSS JOIN `sys_permission` p
|
||||
WHERE r.`tenant_id` = @mes_tenant_id
|
||||
AND r.`role_code` = 'admin'
|
||||
AND p.`id` IN (
|
||||
'1860000000000000148',
|
||||
'1860000000000000149', '1860000000000000150', '1860000000000000151', '1860000000000000152',
|
||||
'1860000000000000153', '1860000000000000154'
|
||||
)
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM `sys_role_permission` rp
|
||||
WHERE rp.`role_id` = r.`id` AND rp.`permission_id` = p.`id`
|
||||
);
|
||||
@@ -0,0 +1,133 @@
|
||||
-- MES 点检/保养记录（主子表）：建表 + 字典 + 菜单 + 按钮 + 租户 admin 授权
|
||||
-- 权限前缀：mes:mes_xsl_equip_inspect_record:*
|
||||
-- 父菜单：设备管理；依赖设备点检配置、设备台账
|
||||
-- Flyway：V3.9.2_79__mes_xsl_equip_inspect_record.sql
|
||||
SET NAMES utf8mb4;
|
||||
|
||||
INSERT INTO `sys_dict`(`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `type`, `tenant_id`)
|
||||
SELECT REPLACE(UUID(), '-', ''), 'MES点检记录结果', 'xslmes_im_inspect_result', '合格/不合格', 0, 'admin', NOW(), 0, 0
|
||||
WHERE NOT EXISTS (SELECT 1 FROM `sys_dict` WHERE `dict_code` = 'xslmes_im_inspect_result' AND `del_flag` = 0);
|
||||
|
||||
INSERT INTO `sys_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`)
|
||||
SELECT REPLACE(UUID(), '-', ''), d.`id`, '合格', 'pass', '', 1, 1, 'admin', NOW()
|
||||
FROM `sys_dict` d
|
||||
WHERE d.`dict_code` = 'xslmes_im_inspect_result' AND NOT EXISTS (SELECT 1 FROM `sys_dict_item` i WHERE i.`dict_id` = d.`id` AND i.`item_value` = 'pass');
|
||||
|
||||
INSERT INTO `sys_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`)
|
||||
SELECT REPLACE(UUID(), '-', ''), d.`id`, '不合格', 'fail', '', 2, 1, 'admin', NOW()
|
||||
FROM `sys_dict` d
|
||||
WHERE d.`dict_code` = 'xslmes_im_inspect_result' AND NOT EXISTS (SELECT 1 FROM `sys_dict_item` i WHERE i.`dict_id` = d.`id` AND i.`item_value` = 'fail');
|
||||
|
||||
INSERT INTO `sys_dict`(`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `type`, `tenant_id`)
|
||||
SELECT REPLACE(UUID(), '-', ''), 'MES点检记录状态', 'xslmes_im_record_status', '待点检/已点检', 0, 'admin', NOW(), 0, 0
|
||||
WHERE NOT EXISTS (SELECT 1 FROM `sys_dict` WHERE `dict_code` = 'xslmes_im_record_status' AND `del_flag` = 0);
|
||||
|
||||
INSERT INTO `sys_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`)
|
||||
SELECT REPLACE(UUID(), '-', ''), d.`id`, '待点检', 'pending', '', 1, 1, 'admin', NOW()
|
||||
FROM `sys_dict` d
|
||||
WHERE d.`dict_code` = 'xslmes_im_record_status' AND NOT EXISTS (SELECT 1 FROM `sys_dict_item` i WHERE i.`dict_id` = d.`id` AND i.`item_value` = 'pending');
|
||||
|
||||
INSERT INTO `sys_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`)
|
||||
SELECT REPLACE(UUID(), '-', ''), d.`id`, '已点检', 'done', '', 2, 1, 'admin', NOW()
|
||||
FROM `sys_dict` d
|
||||
WHERE d.`dict_code` = 'xslmes_im_record_status' AND NOT EXISTS (SELECT 1 FROM `sys_dict_item` i WHERE i.`dict_id` = d.`id` AND i.`item_value` = 'done');
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `mes_xsl_equip_inspect_record` (
|
||||
`id` varchar(32) NOT NULL COMMENT '主键',
|
||||
`record_no` varchar(32) NOT NULL COMMENT '记录编号（EC+yyyyMMdd+4位流水，租户内按日递增）',
|
||||
`plan_no` varchar(500) DEFAULT NULL COMMENT '计划单号',
|
||||
`plan_id` varchar(32) DEFAULT NULL COMMENT '计划主键（隐藏）',
|
||||
`equipment_ledger_id` varchar(32) NOT NULL COMMENT '设备台账主键 mes_xsl_equipment_ledger.id',
|
||||
`equipment_code` varchar(500) DEFAULT NULL COMMENT '设备编码冗余',
|
||||
`equipment_name` varchar(500) DEFAULT NULL COMMENT '设备名称冗余',
|
||||
`equip_inspect_config_id` varchar(32) DEFAULT NULL COMMENT '设备点检配置主键 mes_xsl_equip_inspect_config.id',
|
||||
`record_type` varchar(500) NOT NULL COMMENT '类型（字典xslmes_im_item_category：inspect点检/maintain保养）',
|
||||
`inspect_date` date DEFAULT NULL COMMENT '点检日期',
|
||||
`inspector_user_id` varchar(32) DEFAULT NULL COMMENT '点检人用户ID',
|
||||
`inspector_username` varchar(500) DEFAULT NULL COMMENT '点检人账号',
|
||||
`inspector_realname` varchar(500) DEFAULT NULL COMMENT '点检人姓名',
|
||||
`inspect_result` varchar(500) NOT NULL COMMENT '点检结果（字典xslmes_im_inspect_result：pass合格/fail不合格）',
|
||||
`record_status` varchar(500) NOT NULL COMMENT '状态（字典xslmes_im_record_status：pending待点检/done已点检）',
|
||||
`tenant_id` int DEFAULT NULL COMMENT '租户',
|
||||
`sys_org_code` varchar(500) DEFAULT NULL COMMENT '部门',
|
||||
`create_by` varchar(500) DEFAULT NULL COMMENT '创建人',
|
||||
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
|
||||
`update_by` varchar(500) DEFAULT NULL COMMENT '更新人',
|
||||
`update_time` datetime DEFAULT NULL COMMENT '更新时间',
|
||||
`del_flag` int DEFAULT '0' COMMENT '删除标记（0正常1删除）',
|
||||
PRIMARY KEY (`id`),
|
||||
UNIQUE KEY `uk_meir_tenant_record_no` (`tenant_id`, `record_no`),
|
||||
KEY `idx_meir_equip_type` (`equipment_ledger_id`, `record_type`),
|
||||
KEY `idx_meir_inspect_date` (`inspect_date`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES点检保养记录';
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `mes_xsl_equip_inspect_record_line` (
|
||||
`id` varchar(32) NOT NULL COMMENT '主键',
|
||||
`record_id` varchar(32) NOT NULL COMMENT '主表主键 mes_xsl_equip_inspect_record.id',
|
||||
`equip_inspect_config_line_id` varchar(32) NOT NULL COMMENT '设备点检配置明细主键 mes_xsl_equip_inspect_config_line.id',
|
||||
`inspect_maintain_item_id` varchar(32) DEFAULT NULL COMMENT '点检及保养项目主键冗余',
|
||||
`item_code` varchar(500) DEFAULT NULL COMMENT '点检项目编号冗余',
|
||||
`item_name` varchar(500) DEFAULT NULL COMMENT '项目名称冗余',
|
||||
`item_category` varchar(500) DEFAULT NULL COMMENT '项目类别冗余',
|
||||
`item_type` varchar(500) DEFAULT NULL COMMENT '项目类型冗余',
|
||||
`equipment_part_name` varchar(500) DEFAULT NULL COMMENT '设备部位冗余',
|
||||
`equipment_sub_part_name` varchar(500) DEFAULT NULL COMMENT '设备小部位冗余',
|
||||
`inspect_method` varchar(500) DEFAULT NULL COMMENT '点检方式冗余',
|
||||
`judgment_criteria` varchar(500) DEFAULT NULL COMMENT '判断基准冗余',
|
||||
`line_inspect_result` varchar(500) DEFAULT NULL COMMENT '明细点检结果（文本）',
|
||||
`picture_files` varchar(2000) DEFAULT NULL COMMENT '图片（上传路径，逗号分隔）',
|
||||
`sort_no` int DEFAULT '0' COMMENT '排序号',
|
||||
`create_by` varchar(500) DEFAULT NULL COMMENT '创建人',
|
||||
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
|
||||
`update_by` varchar(500) DEFAULT NULL COMMENT '更新人',
|
||||
`update_time` datetime DEFAULT NULL COMMENT '更新时间',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `idx_meirl_record` (`record_id`),
|
||||
KEY `idx_meirl_config_line` (`equip_inspect_config_line_id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES点检保养记录明细';
|
||||
|
||||
SET @mes_tenant_id = 1002;
|
||||
|
||||
SET @mes_equip_pid = (
|
||||
SELECT `id` FROM `sys_permission`
|
||||
WHERE `del_flag` = 0 AND `menu_type` = 0 AND `name` = '设备管理'
|
||||
LIMIT 1
|
||||
);
|
||||
SET @mes_equip_pid = IFNULL(@mes_equip_pid, '1860000000000000133');
|
||||
|
||||
INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `keep_alive`, `internal_or_external`, `create_by`, `create_time`)
|
||||
VALUES ('1860000000000000155', @mes_equip_pid, '点检保养记录', '/xslmes/mesXslEquipInspectRecord', 'xslmes/mesXslEquipInspectRecord/MesXslEquipInspectRecordList', 'MesXslEquipInspectRecordList', 1, NULL, '1', 13, 1, 0, 0, '1', 0, 1, 0, 'admin', NOW())
|
||||
ON DUPLICATE KEY UPDATE
|
||||
`parent_id` = VALUES(`parent_id`), `name` = VALUES(`name`), `url` = VALUES(`url`), `component` = VALUES(`component`), `component_name` = VALUES(`component_name`),
|
||||
`menu_type` = VALUES(`menu_type`), `perms` = VALUES(`perms`), `perms_type` = VALUES(`perms_type`), `sort_no` = VALUES(`sort_no`),
|
||||
`is_route` = VALUES(`is_route`), `is_leaf` = VALUES(`is_leaf`), `hidden` = VALUES(`hidden`), `status` = VALUES(`status`), `del_flag` = VALUES(`del_flag`),
|
||||
`keep_alive` = VALUES(`keep_alive`), `internal_or_external` = VALUES(`internal_or_external`), `icon` = 'ant-design:file-done-outlined';
|
||||
|
||||
UPDATE `sys_permission` SET `icon` = 'ant-design:file-done-outlined' WHERE `id` = '1860000000000000155' AND `del_flag` = 0;
|
||||
|
||||
INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `status`, `del_flag`, `create_by`, `create_time`) VALUES
|
||||
('1860000000000000156', '1860000000000000155', '新增', 2, 'mes:mes_xsl_equip_inspect_record:add', '1', '1', 0, 'admin', NOW()),
|
||||
('1860000000000000157', '1860000000000000155', '编辑', 2, 'mes:mes_xsl_equip_inspect_record:edit', '1', '1', 0, 'admin', NOW()),
|
||||
('1860000000000000158', '1860000000000000155', '删除', 2, 'mes:mes_xsl_equip_inspect_record:delete', '1', '1', 0, 'admin', NOW()),
|
||||
('1860000000000000159', '1860000000000000155', '批量删除', 2, 'mes:mes_xsl_equip_inspect_record:deleteBatch', '1', '1', 0, 'admin', NOW()),
|
||||
('1860000000000000160', '1860000000000000155', '导出', 2, 'mes:mes_xsl_equip_inspect_record:exportXls', '1', '1', 0, 'admin', NOW()),
|
||||
('1860000000000000161', '1860000000000000155', '导入', 2, 'mes:mes_xsl_equip_inspect_record:importExcel', '1', '1', 0, 'admin', NOW())
|
||||
ON DUPLICATE KEY UPDATE
|
||||
`parent_id` = VALUES(`parent_id`), `name` = VALUES(`name`), `menu_type` = VALUES(`menu_type`), `perms` = VALUES(`perms`), `perms_type` = VALUES(`perms_type`),
|
||||
`status` = VALUES(`status`), `del_flag` = VALUES(`del_flag`);
|
||||
|
||||
INSERT INTO `sys_role_permission`(`id`, `role_id`, `permission_id`, `operate_date`, `operate_ip`)
|
||||
SELECT REPLACE(UUID(), '-', ''), r.`id`, p.`id`, NOW(), '127.0.0.1'
|
||||
FROM `sys_role` r
|
||||
CROSS JOIN `sys_permission` p
|
||||
WHERE r.`tenant_id` = @mes_tenant_id
|
||||
AND r.`role_code` = 'admin'
|
||||
AND p.`id` IN (
|
||||
'1860000000000000155',
|
||||
'1860000000000000156', '1860000000000000157', '1860000000000000158', '1860000000000000159',
|
||||
'1860000000000000160', '1860000000000000161'
|
||||
)
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM `sys_role_permission` rp
|
||||
WHERE rp.`role_id` = r.`id` AND rp.`permission_id` = p.`id`
|
||||
);
|
||||
@@ -0,0 +1,9 @@
|
||||
-- MES 点检保养记录：不合格处理字段（是否已处理/处理人/处理时间）
|
||||
SET NAMES utf8mb4;
|
||||
|
||||
ALTER TABLE `mes_xsl_equip_inspect_record`
|
||||
ADD COLUMN `handled_flag` varchar(1) DEFAULT NULL COMMENT '是否已处理（字典yn：1是0否，仅不合格记录使用）' AFTER `record_status`,
|
||||
ADD COLUMN `handler_user_id` varchar(32) DEFAULT NULL COMMENT '处理人用户ID' AFTER `handled_flag`,
|
||||
ADD COLUMN `handler_username` varchar(500) DEFAULT NULL COMMENT '处理人账号' AFTER `handler_user_id`,
|
||||
ADD COLUMN `handler_realname` varchar(500) DEFAULT NULL COMMENT '处理人姓名' AFTER `handler_username`,
|
||||
ADD COLUMN `handle_time` datetime DEFAULT NULL COMMENT '处理时间' AFTER `handler_realname`;
|
||||
@@ -0,0 +1,186 @@
|
||||
-- 配合示方：分类/STEP/称量方式/状态字典 + 主/子表 + 菜单（挂 MES技术管理）+ admin 授权
|
||||
SET NAMES utf8mb4;
|
||||
|
||||
INSERT IGNORE INTO `sys_dict` (`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `type`, `tenant_id`)
|
||||
VALUES ('1995000000000000010', '配合示方分类', 'xslmes_formula_spec_category', 'MES配合示方分类', 0, 'admin', NOW(), 0, 1002);
|
||||
|
||||
INSERT IGNORE INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `sort_order`, `status`, `create_by`, `create_time`)
|
||||
VALUES ('1995000000000001001', '1995000000000000010', '标准', 'standard', 1, 1, 'admin', NOW());
|
||||
|
||||
INSERT IGNORE INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `sort_order`, `status`, `create_by`, `create_time`)
|
||||
VALUES ('1995000000000001002', '1995000000000000010', '临时', 'temporary', 2, 1, 'admin', NOW());
|
||||
|
||||
INSERT IGNORE INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `sort_order`, `status`, `create_by`, `create_time`)
|
||||
VALUES ('1995000000000001003', '1995000000000000010', '实验', 'trial', 3, 1, 'admin', NOW());
|
||||
|
||||
INSERT IGNORE INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `sort_order`, `status`, `create_by`, `create_time`)
|
||||
VALUES ('1995000000000001004', '1995000000000000010', '消费', 'consumption', 4, 1, 'admin', NOW());
|
||||
|
||||
INSERT IGNORE INTO `sys_dict` (`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `type`, `tenant_id`)
|
||||
VALUES ('1995000000000000011', '配合示方STEP', 'xslmes_formula_spec_step', 'MES配合示方STEP', 0, 'admin', NOW(), 0, 1002);
|
||||
|
||||
INSERT IGNORE INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `sort_order`, `status`, `create_by`, `create_time`)
|
||||
VALUES ('1995000000000001011', '1995000000000000011', 'A', 'A', 1, 1, 'admin', NOW());
|
||||
|
||||
INSERT IGNORE INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `sort_order`, `status`, `create_by`, `create_time`)
|
||||
VALUES ('1995000000000001012', '1995000000000000011', 'B', 'B', 2, 1, 'admin', NOW());
|
||||
|
||||
INSERT IGNORE INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `sort_order`, `status`, `create_by`, `create_time`)
|
||||
VALUES ('1995000000000001013', '1995000000000000011', 'Q', 'Q', 3, 1, 'admin', NOW());
|
||||
|
||||
INSERT IGNORE INTO `sys_dict` (`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `type`, `tenant_id`)
|
||||
VALUES ('1995000000000000012', '配合示方称量方式', 'xslmes_formula_spec_weigh_mode', 'MES配合示方自动/人工称量', 0, 'admin', NOW(), 0, 1002);
|
||||
|
||||
INSERT IGNORE INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `sort_order`, `status`, `create_by`, `create_time`)
|
||||
VALUES ('1995000000000001021', '1995000000000000012', '自动称量1', 'auto1', 1, 1, 'admin', NOW());
|
||||
|
||||
INSERT IGNORE INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `sort_order`, `status`, `create_by`, `create_time`)
|
||||
VALUES ('1995000000000001022', '1995000000000000012', '人工称量', 'manual', 2, 1, 'admin', NOW());
|
||||
|
||||
INSERT IGNORE INTO `sys_dict` (`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `type`, `tenant_id`)
|
||||
VALUES ('1995000000000000013', '配合示方状态', 'xslmes_formula_spec_status', 'MES配合示方状态', 0, 'admin', NOW(), 0, 1002);
|
||||
|
||||
INSERT IGNORE INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `sort_order`, `status`, `create_by`, `create_time`)
|
||||
VALUES ('1995000000000001031', '1995000000000000013', '编制', 'compile', 1, 1, 'admin', NOW());
|
||||
|
||||
INSERT IGNORE INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `sort_order`, `status`, `create_by`, `create_time`)
|
||||
VALUES ('1995000000000001032', '1995000000000000013', '校对', 'proofread', 2, 1, 'admin', NOW());
|
||||
|
||||
INSERT IGNORE INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `sort_order`, `status`, `create_by`, `create_time`)
|
||||
VALUES ('1995000000000001033', '1995000000000000013', '审核', 'audit', 3, 1, 'admin', NOW());
|
||||
|
||||
INSERT IGNORE INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `sort_order`, `status`, `create_by`, `create_time`)
|
||||
VALUES ('1995000000000001034', '1995000000000000013', '批准', 'approve', 4, 1, 'admin', NOW());
|
||||
|
||||
INSERT IGNORE INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `sort_order`, `status`, `create_by`, `create_time`)
|
||||
VALUES ('1995000000000001035', '1995000000000000013', '正式发布', 'released', 5, 1, 'admin', NOW());
|
||||
|
||||
INSERT IGNORE INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `sort_order`, `status`, `create_by`, `create_time`)
|
||||
VALUES ('1995000000000001036', '1995000000000000013', '作废', 'obsolete', 6, 1, 'admin', NOW());
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `mes_xsl_formula_spec` (
|
||||
`id` varchar(32) NOT NULL COMMENT '主键',
|
||||
`category` varchar(32) DEFAULT 'standard' COMMENT '分类（字典xslmes_formula_spec_category：standard标准 temporary临时 trial实验 consumption消费）',
|
||||
`spec_code` varchar(100) DEFAULT NULL COMMENT '示方编号',
|
||||
`rubber_code` varchar(100) DEFAULT NULL COMMENT '胶料代号',
|
||||
`basic_formula` varchar(100) DEFAULT NULL COMMENT '基本配合',
|
||||
`issue_date` date DEFAULT NULL COMMENT '发行日期',
|
||||
`purpose` varchar(500) DEFAULT NULL COMMENT '用途',
|
||||
`issue_number` varchar(100) DEFAULT NULL COMMENT '发行编号',
|
||||
`mixing_stages` int DEFAULT NULL COMMENT '混合段数（1-7）',
|
||||
`mixing_machine` varchar(200) DEFAULT NULL COMMENT '混合机器',
|
||||
`issue_dept_id` varchar(32) DEFAULT NULL COMMENT '发行部门ID',
|
||||
`issue_dept_name` varchar(200) DEFAULT NULL COMMENT '发行部门名称冗余',
|
||||
`a_rubber_total_phr` decimal(18,4) DEFAULT NULL COMMENT 'A胶TOTAL PHR',
|
||||
`total_phr` decimal(18,4) DEFAULT NULL COMMENT 'TOTAL PHR',
|
||||
`issue_reason` text COMMENT '发行理由',
|
||||
`natural_rubber` decimal(18,4) DEFAULT NULL COMMENT '天然橡胶',
|
||||
`synthetic_rubber` decimal(18,4) DEFAULT NULL COMMENT '合成橡胶',
|
||||
`total_amount` decimal(18,4) DEFAULT NULL COMMENT '合计',
|
||||
`weight_unit_price` decimal(18,4) DEFAULT NULL COMMENT '重量单价',
|
||||
`volume_unit_price` decimal(18,4) DEFAULT NULL COMMENT '体积单价',
|
||||
`q_rubber_sg` decimal(18,6) DEFAULT NULL COMMENT 'Q胶比重',
|
||||
`a_rubber_sg` decimal(18,6) DEFAULT NULL COMMENT 'A胶比重',
|
||||
`has_manual_batch` int DEFAULT 0 COMMENT '是否有人工配料（0否 1是）',
|
||||
`status` varchar(32) DEFAULT 'compile' COMMENT '状态（字典xslmes_formula_spec_status）',
|
||||
`proofread_by` varchar(50) DEFAULT NULL COMMENT '校对人',
|
||||
`proofread_time` datetime DEFAULT NULL COMMENT '校对时间',
|
||||
`audit_by` varchar(50) DEFAULT NULL COMMENT '审核人',
|
||||
`audit_time` datetime DEFAULT NULL COMMENT '审核时间',
|
||||
`approve_by` varchar(50) DEFAULT NULL COMMENT '批准人',
|
||||
`approve_time` datetime DEFAULT NULL COMMENT '批准时间',
|
||||
`tenant_id` int DEFAULT NULL COMMENT '租户ID',
|
||||
`sys_org_code` varchar(64) DEFAULT NULL COMMENT '所属部门',
|
||||
`create_by` varchar(50) DEFAULT NULL COMMENT '创建人',
|
||||
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
|
||||
`update_by` varchar(50) DEFAULT NULL COMMENT '修改人',
|
||||
`update_time` datetime DEFAULT NULL COMMENT '修改时间',
|
||||
`del_flag` int NOT NULL DEFAULT 0 COMMENT '逻辑删除（0正常 1已删除）',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `idx_mxfs_spec_code` (`spec_code`),
|
||||
KEY `idx_mxfs_rubber_code` (`rubber_code`),
|
||||
KEY `idx_mxfs_issue_number` (`issue_number`),
|
||||
KEY `idx_mxfs_category` (`category`),
|
||||
KEY `idx_mxfs_status` (`status`),
|
||||
KEY `idx_mxfs_issue_date` (`issue_date`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES配合示方';
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `mes_xsl_formula_spec_line` (
|
||||
`id` varchar(32) NOT NULL COMMENT '主键',
|
||||
`formula_spec_id` varchar(32) NOT NULL COMMENT '配合示方主表ID',
|
||||
`sort_no` int DEFAULT NULL COMMENT '行序号',
|
||||
`phr` decimal(18,4) DEFAULT NULL COMMENT 'PHR',
|
||||
`mixer_material_id` varchar(32) DEFAULT NULL COMMENT '密炼物料ID',
|
||||
`mixer_material_code` varchar(100) DEFAULT NULL COMMENT '密炼物料编码冗余',
|
||||
`mixer_material_name` varchar(200) DEFAULT NULL COMMENT '密炼物料名称冗余',
|
||||
`material_desc` varchar(500) DEFAULT NULL COMMENT '物料描述',
|
||||
`step` varchar(8) DEFAULT NULL COMMENT 'STEP（字典xslmes_formula_spec_step：A/B/Q）',
|
||||
`weigh_mode` varchar(32) DEFAULT NULL COMMENT '称量方式（字典xslmes_formula_spec_weigh_mode）',
|
||||
`weight_percent` decimal(18,4) DEFAULT NULL COMMENT '重量%',
|
||||
`volume` decimal(18,6) DEFAULT NULL COMMENT '体积',
|
||||
`remark` varchar(500) DEFAULT NULL COMMENT '备注',
|
||||
`stage1` decimal(18,4) DEFAULT NULL COMMENT '混合段1',
|
||||
`stage2` decimal(18,4) DEFAULT NULL COMMENT '混合段2',
|
||||
`stage3` decimal(18,4) DEFAULT NULL COMMENT '混合段3',
|
||||
`stage4` decimal(18,4) DEFAULT NULL COMMENT '混合段4',
|
||||
`stage5` decimal(18,4) DEFAULT NULL COMMENT '混合段5',
|
||||
`stage6` decimal(18,4) DEFAULT NULL COMMENT '混合段6',
|
||||
`stage7` decimal(18,4) DEFAULT NULL COMMENT '混合段7',
|
||||
`tenant_id` int DEFAULT NULL COMMENT '租户ID',
|
||||
`create_by` varchar(50) DEFAULT NULL COMMENT '创建人',
|
||||
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
|
||||
`update_by` varchar(50) DEFAULT NULL COMMENT '修改人',
|
||||
`update_time` datetime DEFAULT NULL COMMENT '修改时间',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `idx_mxfsl_formula_spec_id` (`formula_spec_id`),
|
||||
KEY `idx_mxfsl_mixer_material_id` (`mixer_material_id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES配合示方明细';
|
||||
|
||||
UPDATE `sys_permission`
|
||||
SET `is_leaf` = 0, `update_time` = NOW()
|
||||
WHERE `id` = '1900000000000000810' AND `is_leaf` = 1;
|
||||
|
||||
INSERT IGNORE INTO `sys_permission` (
|
||||
`id`, `parent_id`, `name`, `url`, `component`, `is_route`, `component_name`, `redirect`,
|
||||
`menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_leaf`, `keep_alive`,
|
||||
`hidden`, `hide_tab`, `description`, `create_by`, `create_time`, `update_by`, `update_time`,
|
||||
`del_flag`, `rule_flag`, `status`, `internal_or_external`
|
||||
) VALUES (
|
||||
'177925970995530', '1900000000000000810', '配合示方', '/xslmes/mesXslFormulaSpec',
|
||||
'xslmes/mesXslFormulaSpec/MesXslFormulaSpecList', 1, 'MesXslFormulaSpecList', NULL,
|
||||
1, NULL, '0', 1.00, 0, 'ant-design:experiment-outlined', 0, 1,
|
||||
0, 0, 'MES配合示方', 'admin', NOW(), 'admin', NOW(),
|
||||
0, 0, '1', 0
|
||||
);
|
||||
|
||||
INSERT IGNORE INTO `sys_permission` (`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `create_by`, `create_time`)
|
||||
VALUES ('177925970995531', '177925970995530', '新增', 2, 'xslmes:mes_xsl_formula_spec:add', '1', 1.00, 0, 1, 0, '1', 0, 'admin', NOW());
|
||||
|
||||
INSERT IGNORE INTO `sys_permission` (`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `create_by`, `create_time`)
|
||||
VALUES ('177925970995532', '177925970995530', '编辑', 2, 'xslmes:mes_xsl_formula_spec:edit', '1', 2.00, 0, 1, 0, '1', 0, 'admin', NOW());
|
||||
|
||||
INSERT IGNORE INTO `sys_permission` (`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `create_by`, `create_time`)
|
||||
VALUES ('177925970995533', '177925970995530', '删除', 2, 'xslmes:mes_xsl_formula_spec:delete', '1', 3.00, 0, 1, 0, '1', 0, 'admin', NOW());
|
||||
|
||||
INSERT IGNORE INTO `sys_permission` (`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `create_by`, `create_time`)
|
||||
VALUES ('177925970995534', '177925970995530', '批量删除', 2, 'xslmes:mes_xsl_formula_spec:deleteBatch', '1', 4.00, 0, 1, 0, '1', 0, 'admin', NOW());
|
||||
|
||||
INSERT IGNORE INTO `sys_permission` (`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `create_by`, `create_time`)
|
||||
VALUES ('177925970995535', '177925970995530', '导出', 2, 'xslmes:mes_xsl_formula_spec:exportXls', '1', 5.00, 0, 1, 0, '1', 0, 'admin', NOW());
|
||||
|
||||
INSERT IGNORE INTO `sys_permission` (`id`, `parent_id`, `name`, `menu_type`, `perms`, `perms_type`, `sort_no`, `is_route`, `is_leaf`, `hidden`, `status`, `del_flag`, `create_by`, `create_time`)
|
||||
VALUES ('177925970995536', '177925970995530', '导入', 2, 'xslmes:mes_xsl_formula_spec:importExcel', '1', 6.00, 0, 1, 0, '1', 0, 'admin', NOW());
|
||||
|
||||
INSERT INTO `sys_role_permission` (`id`, `role_id`, `permission_id`, `data_rule_ids`, `operate_date`, `operate_ip`)
|
||||
SELECT REPLACE(UUID(), '-', ''), r.id, p.id, NULL, NOW(), '127.0.0.1'
|
||||
FROM `sys_role` r
|
||||
CROSS JOIN `sys_permission` p
|
||||
WHERE r.`role_code` = 'admin'
|
||||
AND p.`id` IN (
|
||||
'177925970995530', '177925970995531', '177925970995532',
|
||||
'177925970995533', '177925970995534', '177925970995535', '177925970995536'
|
||||
)
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM `sys_role_permission` rp
|
||||
WHERE rp.`role_id` = r.id AND rp.`permission_id` = p.id
|
||||
);
|
||||
@@ -0,0 +1,9 @@
|
||||
-- 配合示方：主表新增混合段1-7合计字段
|
||||
ALTER TABLE `mes_xsl_formula_spec`
|
||||
ADD COLUMN `stage1_total` decimal(18,4) DEFAULT NULL COMMENT '混合段1合计' AFTER `total_phr`,
|
||||
ADD COLUMN `stage2_total` decimal(18,4) DEFAULT NULL COMMENT '混合段2合计' AFTER `stage1_total`,
|
||||
ADD COLUMN `stage3_total` decimal(18,4) DEFAULT NULL COMMENT '混合段3合计' AFTER `stage2_total`,
|
||||
ADD COLUMN `stage4_total` decimal(18,4) DEFAULT NULL COMMENT '混合段4合计' AFTER `stage3_total`,
|
||||
ADD COLUMN `stage5_total` decimal(18,4) DEFAULT NULL COMMENT '混合段5合计' AFTER `stage4_total`,
|
||||
ADD COLUMN `stage6_total` decimal(18,4) DEFAULT NULL COMMENT '混合段6合计' AFTER `stage5_total`,
|
||||
ADD COLUMN `stage7_total` decimal(18,4) DEFAULT NULL COMMENT '混合段7合计' AFTER `stage6_total`;
|
||||
@@ -0,0 +1,15 @@
|
||||
-- 配合示方分类字典：标准示方 S / 临时示方 P / 试验示方 T / 消费示方 C
|
||||
SET NAMES utf8mb4;
|
||||
|
||||
UPDATE `sys_dict_item` SET `item_text` = '标准示方', `item_value` = 'S' WHERE `id` = '1995000000000001001';
|
||||
UPDATE `sys_dict_item` SET `item_text` = '临时示方', `item_value` = 'P' WHERE `id` = '1995000000000001002';
|
||||
UPDATE `sys_dict_item` SET `item_text` = '试验示方', `item_value` = 'T' WHERE `id` = '1995000000000001003';
|
||||
UPDATE `sys_dict_item` SET `item_text` = '消费示方', `item_value` = 'C' WHERE `id` = '1995000000000001004';
|
||||
|
||||
UPDATE `mes_xsl_formula_spec` SET `category` = 'S' WHERE `category` = 'standard';
|
||||
UPDATE `mes_xsl_formula_spec` SET `category` = 'P' WHERE `category` = 'temporary';
|
||||
UPDATE `mes_xsl_formula_spec` SET `category` = 'T' WHERE `category` = 'trial';
|
||||
UPDATE `mes_xsl_formula_spec` SET `category` = 'C' WHERE `category` = 'consumption';
|
||||
|
||||
ALTER TABLE `mes_xsl_formula_spec`
|
||||
MODIFY COLUMN `category` varchar(32) DEFAULT 'S' COMMENT '分类（字典xslmes_formula_spec_category：S标准示方 P临时示方 T试验示方 C消费示方）';
|
||||
@@ -0,0 +1,7 @@
|
||||
-- 配合示方：关联胶料主数据，支持胶料代号自动生成
|
||||
SET NAMES utf8mb4;
|
||||
|
||||
ALTER TABLE `mes_xsl_formula_spec`
|
||||
ADD COLUMN `rubber_material_id` varchar(32) DEFAULT NULL COMMENT '胶料ID（关联mes_material.id）' AFTER `rubber_code`;
|
||||
|
||||
CREATE INDEX `idx_mxfs_rubber_material_id` ON `mes_xsl_formula_spec` (`rubber_material_id`);
|
||||
@@ -0,0 +1,10 @@
|
||||
-- 配合示方 STEP 字典：删除字典值 B
|
||||
SET NAMES utf8mb4;
|
||||
|
||||
-- 已有业务数据若使用 B，清空以便重新选择
|
||||
UPDATE `mes_xsl_formula_spec_line` SET `step` = NULL WHERE `step` = 'B';
|
||||
|
||||
DELETE FROM `sys_dict_item` WHERE `id` = '1995000000000001012';
|
||||
|
||||
ALTER TABLE `mes_xsl_formula_spec_line`
|
||||
MODIFY COLUMN `step` varchar(8) DEFAULT NULL COMMENT 'STEP（字典xslmes_formula_spec_step：A/Q）';
|
||||
@@ -0,0 +1,20 @@
|
||||
-- 配合示方：含胶率物料小类配置（天然橡胶 / 合成橡胶）
|
||||
DROP TABLE IF EXISTS `mes_xsl_formula_spec_setting`;
|
||||
CREATE TABLE `mes_xsl_formula_spec_setting` (
|
||||
`id` varchar(32) NOT NULL COMMENT '主键',
|
||||
`natural_minor_category_ids` varchar(2000) DEFAULT NULL COMMENT '天然橡胶物料小类ID，逗号分隔',
|
||||
`synthetic_minor_category_ids` varchar(2000) DEFAULT NULL COMMENT '合成橡胶物料小类ID，逗号分隔',
|
||||
`create_by` varchar(50) DEFAULT NULL COMMENT '创建人',
|
||||
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
|
||||
`update_by` varchar(50) DEFAULT NULL COMMENT '更新人',
|
||||
`update_time` datetime DEFAULT NULL COMMENT '更新时间',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='配合示方模块配置';
|
||||
|
||||
INSERT INTO `mes_xsl_formula_spec_setting` (`id`, `natural_minor_category_ids`, `synthetic_minor_category_ids`, `create_time`)
|
||||
SELECT
|
||||
'1993000000000000991',
|
||||
(SELECT `id` FROM `sys_category` WHERE `code` = 'XSLMES_MATERIAL_RAW_AUX_TRJ' LIMIT 1),
|
||||
(SELECT `id` FROM `sys_category` WHERE `code` = 'XSLMES_MATERIAL_RAW_AUX_HCJ' LIMIT 1),
|
||||
NOW()
|
||||
WHERE NOT EXISTS (SELECT 1 FROM `mes_xsl_formula_spec_setting` WHERE `id` = '1993000000000000991');
|
||||
@@ -1,5 +1,9 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<configuration debug="false">
|
||||
<!-- 与 application-*.yml 中 logging.charset 对齐；Windows 集成终端默认 GBK -->
|
||||
<springProperty scope="context" name="CONSOLE_LOG_CHARSET" source="logging.charset.console" defaultValue="GBK"/>
|
||||
<springProperty scope="context" name="FILE_LOG_CHARSET" source="logging.charset.file" defaultValue="UTF-8"/>
|
||||
|
||||
<!--定义日志文件的存储地址 -->
|
||||
<property name="LOG_HOME" value="../logs" />
|
||||
|
||||
@@ -10,6 +14,7 @@
|
||||
<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符
|
||||
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n</pattern>-->
|
||||
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %highlight(%-5level) %cyan(%logger{50}:%L) - %msg%n</pattern>
|
||||
<charset>${CONSOLE_LOG_CHARSET}</charset>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
@@ -25,6 +30,7 @@
|
||||
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
|
||||
<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
|
||||
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n</pattern>
|
||||
<charset>${FILE_LOG_CHARSET}</charset>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
import { defHttp } from '/@/utils/http/axios';
|
||||
import { message } from 'ant-design-vue';
|
||||
import { useGlobSetting } from '/@/hooks/setting';
|
||||
const globSetting = useGlobSetting();
|
||||
const baseUploadUrl = globSetting.uploadUrl;
|
||||
import { resolveApiBaseUrl } from '/@/utils/env/apiBaseUrl';
|
||||
|
||||
enum Api {
|
||||
positionList = '/sys/position/list',
|
||||
userList = '/sys/user/list',
|
||||
@@ -25,9 +24,9 @@ enum Api {
|
||||
}
|
||||
|
||||
/**
|
||||
* 上传父路径
|
||||
* 上传地址（须含 context-path；开发环境 domain 仅为 host 时需拼 apiUrl）
|
||||
*/
|
||||
export const uploadUrl = `${baseUploadUrl}/sys/common/upload`;
|
||||
export const uploadUrl = `${resolveApiBaseUrl()}/sys/common/upload`;
|
||||
|
||||
/**
|
||||
* 职务列表
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
import { useGlobSetting } from '/@/hooks/setting';
|
||||
import { merge, random } from 'lodash-es';
|
||||
import { isArray } from '/@/utils/is';
|
||||
import { FormSchema } from '/@/components/Form';
|
||||
@@ -14,11 +13,10 @@ import { useI18n } from "@/hooks/web/useI18n";
|
||||
import {$electron} from "@/electron";
|
||||
import {router} from "@/router";
|
||||
import {encryptByBase64} from "@/utils/cipher";
|
||||
import { resolveApiBaseUrl } from '/@/utils/env/apiBaseUrl';
|
||||
//存放部门路径的数组
|
||||
const departNamePath = ref<Record<string, string>>({});
|
||||
|
||||
const globSetting = useGlobSetting();
|
||||
const baseApiUrl = globSetting.domainUrl;
|
||||
/**
|
||||
* 获取文件服务访问路径
|
||||
* @param fileUrl 文件路径
|
||||
@@ -31,10 +29,10 @@ export const getFileAccessHttpUrl = (fileUrl, prefix = 'http') => {
|
||||
//判断是否是数组格式
|
||||
let isArray = fileUrl.indexOf('[') != -1;
|
||||
if (!isArray) {
|
||||
let prefix = `${baseApiUrl}/sys/common/static/`;
|
||||
const staticPrefix = `${resolveApiBaseUrl()}/sys/common/static/`;
|
||||
// 判断是否已包含前缀
|
||||
if (!fileUrl.startsWith(prefix)) {
|
||||
result = `${prefix}${fileUrl}`;
|
||||
if (!fileUrl.startsWith(staticPrefix)) {
|
||||
result = `${staticPrefix}${fileUrl}`;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
18
jeecgboot-vue3/src/utils/env/apiBaseUrl.ts
vendored
Normal file
18
jeecgboot-vue3/src/utils/env/apiBaseUrl.ts
vendored
Normal file
@@ -0,0 +1,18 @@
|
||||
import { useGlobSetting } from '/@/hooks/setting';
|
||||
|
||||
/**
|
||||
* 后端 API 根地址（含 servlet.context-path，如 /jeecg-boot）
|
||||
* 开发环境 VITE_GLOB_DOMAIN_URL 常为 http://host:port，需与 VITE_GLOB_API_URL 拼接
|
||||
*/
|
||||
export function resolveApiBaseUrl(): string {
|
||||
const { domainUrl, apiUrl } = useGlobSetting();
|
||||
const domain = (domainUrl || '').replace(/\/$/, '');
|
||||
const api = apiUrl || '';
|
||||
if (!domain) {
|
||||
return api;
|
||||
}
|
||||
if (!api || domain.endsWith(api) || domain.includes(`${api}/`)) {
|
||||
return domain;
|
||||
}
|
||||
return `${domain}${api}`;
|
||||
}
|
||||
@@ -9,11 +9,13 @@ enum Api {
|
||||
deleteBatch = '/mes/material/material/deleteBatch',
|
||||
importExcel = '/mes/material/material/importExcel',
|
||||
exportXls = '/mes/material/material/exportXls',
|
||||
queryById = '/mes/material/material/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) => defHttp.get({ url: Api.queryById, params }, { successMessageMode: 'none' });
|
||||
|
||||
export const deleteOne = (params, handleSuccess) =>
|
||||
defHttp.delete({ url: Api.deleteOne, params }, { joinParamsToUrl: true }).then(() => handleSuccess());
|
||||
|
||||
@@ -0,0 +1,90 @@
|
||||
<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 as materialList, queryById as queryMaterialById } from '../MesMaterial.api';
|
||||
import { columns as materialColumns, searchFormSchema as materialSearch } from '../MesMaterial.data';
|
||||
import { useMessage } from '/@/hooks/web/useMessage';
|
||||
|
||||
const emit = defineEmits(['register', 'select']);
|
||||
const { createMessage } = useMessage();
|
||||
|
||||
const selectedRow = ref<Recordable | null>(null);
|
||||
|
||||
const [registerTable, { reload, getSelectRowKeys, getSelectRows, setSelectedRowKeys, clearSelectedRowKeys }] = useTable({
|
||||
api: materialList,
|
||||
columns: materialColumns.slice(0, 6),
|
||||
rowKey: 'id',
|
||||
useSearchForm: true,
|
||||
formConfig: {
|
||||
labelWidth: 90,
|
||||
schemas: materialSearch,
|
||||
},
|
||||
pagination: { pageSize: 10 },
|
||||
canResize: false,
|
||||
showIndexColumn: false,
|
||||
immediate: true,
|
||||
beforeFetch: (params) => ({
|
||||
...params,
|
||||
enableFlag: params.enableFlag ?? 1,
|
||||
}),
|
||||
rowSelection: {
|
||||
type: 'radio',
|
||||
columnWidth: 48,
|
||||
onChange: (_keys, rows) => {
|
||||
selectedRow.value = rows?.[0] ?? null;
|
||||
},
|
||||
},
|
||||
clickToRowSelect: true,
|
||||
});
|
||||
|
||||
const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
|
||||
selectedRow.value = null;
|
||||
clearSelectedRowKeys?.();
|
||||
setModalProps({ confirmLoading: false });
|
||||
const materialId = data?.materialId as string | undefined;
|
||||
if (materialId) {
|
||||
setSelectedRowKeys?.([materialId]);
|
||||
try {
|
||||
const raw = await queryMaterialById({ id: materialId });
|
||||
const row = (raw as Recordable)?.materialName != null ? raw : (raw as Recordable)?.result;
|
||||
if (row) {
|
||||
selectedRow.value = row;
|
||||
}
|
||||
} catch {
|
||||
// ignore
|
||||
}
|
||||
}
|
||||
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 queryMaterialById({ id: keys[0] });
|
||||
row = (raw as Recordable)?.materialName != null ? raw : (raw as Recordable)?.result;
|
||||
} catch {
|
||||
// ignore
|
||||
}
|
||||
}
|
||||
if (!row?.id) {
|
||||
createMessage.warning('请选择一条胶料信息');
|
||||
return;
|
||||
}
|
||||
emit('select', {
|
||||
materialId: row.id,
|
||||
materialName: row.materialName || '',
|
||||
aliasName: row.aliasName || '',
|
||||
materialCode: row.materialCode || '',
|
||||
});
|
||||
closeModal();
|
||||
}
|
||||
</script>
|
||||
@@ -85,8 +85,12 @@
|
||||
emit('select', {
|
||||
mixerMaterialId: row.id,
|
||||
materialName: row.materialName || '',
|
||||
materialCode: row.materialCode || '',
|
||||
materialDesc: row.materialDesc || '',
|
||||
materialKind: buildKind(row),
|
||||
minorCategoryId: row.minorCategoryId || '',
|
||||
majorCategoryText: row.majorCategoryId_dictText || '',
|
||||
minorCategoryText: row.minorCategoryId_dictText || '',
|
||||
});
|
||||
closeModal();
|
||||
}
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
import { defHttp } from '/@/utils/http/axios';
|
||||
import { useMessage } from '/@/hooks/web/useMessage';
|
||||
|
||||
const { createConfirm } = useMessage();
|
||||
|
||||
enum Api {
|
||||
list = '/xslmes/mesXslEquipInspectConfig/list',
|
||||
save = '/xslmes/mesXslEquipInspectConfig/add',
|
||||
edit = '/xslmes/mesXslEquipInspectConfig/edit',
|
||||
deleteOne = '/xslmes/mesXslEquipInspectConfig/delete',
|
||||
deleteBatch = '/xslmes/mesXslEquipInspectConfig/deleteBatch',
|
||||
importExcel = '/xslmes/mesXslEquipInspectConfig/importExcel',
|
||||
exportXls = '/xslmes/mesXslEquipInspectConfig/exportXls',
|
||||
queryById = '/xslmes/mesXslEquipInspectConfig/queryById',
|
||||
queryLineList = '/xslmes/mesXslEquipInspectConfig/queryLineListByConfigId',
|
||||
}
|
||||
|
||||
export const getExportUrl = Api.exportXls;
|
||||
export const getImportUrl = Api.importExcel;
|
||||
|
||||
export const list = (params) => defHttp.get({ url: Api.list, params });
|
||||
|
||||
export const queryById = (params: { id: string }) => defHttp.get({ url: Api.queryById, params });
|
||||
|
||||
export const queryLineListByConfigId = (params: { id: string }) => defHttp.get({ url: Api.queryLineList, params });
|
||||
|
||||
export const deleteOne = (params, handleSuccess) => {
|
||||
return defHttp.delete({ url: Api.deleteOne, params }, { joinParamsToUrl: true }).then(() => {
|
||||
handleSuccess();
|
||||
});
|
||||
};
|
||||
|
||||
export const batchDelete = (params, handleSuccess) => {
|
||||
createConfirm({
|
||||
iconType: 'warning',
|
||||
title: '确认删除',
|
||||
content: '是否删除选中数据',
|
||||
okText: '确认',
|
||||
cancelText: '取消',
|
||||
onOk: () => {
|
||||
return defHttp.delete({ url: Api.deleteBatch, data: params }, { joinParamsToUrl: true }).then(() => {
|
||||
handleSuccess();
|
||||
});
|
||||
},
|
||||
});
|
||||
};
|
||||
|
||||
export const saveOrUpdate = (params, isUpdate) => {
|
||||
const url = isUpdate ? Api.edit : Api.save;
|
||||
return defHttp.post({ url, params });
|
||||
};
|
||||
@@ -0,0 +1,86 @@
|
||||
import { BasicColumn, FormSchema } from '/@/components/Table';
|
||||
import { JVxeColumn, JVxeTypes } from '/@/components/jeecg/JVxeTable/types';
|
||||
|
||||
export const columns: BasicColumn[] = [
|
||||
{ title: '设备名称', align: 'center', dataIndex: 'equipmentName', width: 160 },
|
||||
{ title: '设备编号', align: 'center', dataIndex: 'equipmentCode', width: 140 },
|
||||
{ title: '类型', align: 'center', dataIndex: 'configType_dictText', width: 90 },
|
||||
{ title: '创建人', align: 'center', dataIndex: 'createBy', width: 100 },
|
||||
{
|
||||
title: '创建时间',
|
||||
align: 'center',
|
||||
dataIndex: 'createTime',
|
||||
width: 165,
|
||||
customRender: ({ text }) => (!text ? '' : String(text).length > 19 ? String(text).substring(0, 19) : text),
|
||||
},
|
||||
];
|
||||
|
||||
export const searchFormSchema: FormSchema[] = [
|
||||
{ label: '设备名称', field: 'equipmentName', component: 'Input', colProps: { span: 6 } },
|
||||
{ label: '设备编号', field: 'equipmentCode', component: 'Input', colProps: { span: 6 } },
|
||||
{
|
||||
label: '类型',
|
||||
field: 'configType',
|
||||
component: 'JDictSelectTag',
|
||||
componentProps: { dictCode: 'xslmes_im_item_category' },
|
||||
colProps: { span: 6 },
|
||||
},
|
||||
];
|
||||
|
||||
export const formSchema: FormSchema[] = [
|
||||
{ label: '', field: 'id', component: 'Input', show: false },
|
||||
{ label: '', field: 'equipmentLedgerId', component: 'Input', show: false },
|
||||
{
|
||||
label: '设备名称',
|
||||
field: 'equipmentName',
|
||||
component: 'Input',
|
||||
slot: 'equipmentLedgerPicker',
|
||||
dynamicRules: () => [{ required: true, message: '请选择设备台账' }],
|
||||
},
|
||||
{
|
||||
label: '设备编号',
|
||||
field: 'equipmentCode',
|
||||
component: 'Input',
|
||||
componentProps: { readonly: true, placeholder: '选择设备后自动带出' },
|
||||
},
|
||||
{
|
||||
label: '类型',
|
||||
field: 'configType',
|
||||
component: 'JDictSelectTag',
|
||||
required: true,
|
||||
componentProps: { dictCode: 'xslmes_im_item_category', placeholder: '点检/保养' },
|
||||
},
|
||||
];
|
||||
|
||||
export const lineJVxeColumns: JVxeColumn[] = [
|
||||
{ title: '', key: 'inspectMaintainItemId', type: JVxeTypes.hidden },
|
||||
{ title: '点检项目编号', key: 'itemCode', type: JVxeTypes.normal, width: 130, disabled: true },
|
||||
{ title: '项目名称', key: 'itemName', type: JVxeTypes.normal, width: 140, disabled: true },
|
||||
{
|
||||
title: '项目类别',
|
||||
key: 'itemCategory',
|
||||
type: JVxeTypes.select,
|
||||
width: 100,
|
||||
disabled: true,
|
||||
dictCode: 'xslmes_im_item_category',
|
||||
},
|
||||
{
|
||||
title: '项目类型',
|
||||
key: 'itemType',
|
||||
type: JVxeTypes.select,
|
||||
width: 100,
|
||||
disabled: true,
|
||||
dictCode: 'xslmes_im_item_type',
|
||||
},
|
||||
{ title: '设备部位', key: 'equipmentPartName', type: JVxeTypes.normal, width: 120, disabled: true },
|
||||
{ title: '设备小部位', key: 'equipmentSubPartName', type: JVxeTypes.normal, width: 120, disabled: true },
|
||||
{
|
||||
title: '点检方式',
|
||||
key: 'inspectMethod',
|
||||
type: JVxeTypes.select,
|
||||
width: 100,
|
||||
disabled: true,
|
||||
dictCode: 'xslmes_im_inspect_method',
|
||||
},
|
||||
{ title: '判断基准', key: 'judgmentCriteria', type: JVxeTypes.normal, width: 180, disabled: true },
|
||||
];
|
||||
@@ -0,0 +1,132 @@
|
||||
<template>
|
||||
<div>
|
||||
<BasicTable @register="registerTable" :rowSelection="rowSelection">
|
||||
<template #tableTitle>
|
||||
<a-button
|
||||
type="primary"
|
||||
v-auth="'mes:mes_xsl_equip_inspect_config:add'"
|
||||
@click="handleAdd"
|
||||
preIcon="ant-design:plus-outlined"
|
||||
>
|
||||
新增
|
||||
</a-button>
|
||||
<a-button
|
||||
type="primary"
|
||||
v-auth="'mes:mes_xsl_equip_inspect_config:exportXls'"
|
||||
preIcon="ant-design:export-outlined"
|
||||
@click="onExportXls"
|
||||
>
|
||||
导出
|
||||
</a-button>
|
||||
<j-upload-button
|
||||
type="primary"
|
||||
v-auth="'mes:mes_xsl_equip_inspect_config:importExcel'"
|
||||
preIcon="ant-design:import-outlined"
|
||||
@click="onImportXls"
|
||||
>
|
||||
导入
|
||||
</j-upload-button>
|
||||
<a-dropdown v-if="selectedRowKeys.length > 0">
|
||||
<template #overlay>
|
||||
<a-menu>
|
||||
<a-menu-item key="1" @click="batchHandleDelete">
|
||||
<Icon icon="ant-design:delete-outlined" />
|
||||
删除
|
||||
</a-menu-item>
|
||||
</a-menu>
|
||||
</template>
|
||||
<a-button v-auth="'mes:mes_xsl_equip_inspect_config:deleteBatch'">
|
||||
批量操作
|
||||
<Icon icon="mdi:chevron-down" />
|
||||
</a-button>
|
||||
</a-dropdown>
|
||||
</template>
|
||||
<template #action="{ record }">
|
||||
<TableAction
|
||||
:actions="[
|
||||
{ label: '编辑', onClick: handleEdit.bind(null, record), auth: 'mes:mes_xsl_equip_inspect_config:edit' },
|
||||
]"
|
||||
:dropDownActions="getDropDownAction(record)"
|
||||
/>
|
||||
</template>
|
||||
</BasicTable>
|
||||
<MesXslEquipInspectConfigModal @register="registerModal" @success="handleSuccess" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script lang="ts" name="xslmes-mesXslEquipInspectConfig" setup>
|
||||
import { BasicTable, TableAction } from '/@/components/Table';
|
||||
import { useModal } from '/@/components/Modal';
|
||||
import { useListPage } from '/@/hooks/system/useListPage';
|
||||
import Icon from '/@/components/Icon';
|
||||
import MesXslEquipInspectConfigModal from './components/MesXslEquipInspectConfigModal.vue';
|
||||
import { columns, searchFormSchema } from './MesXslEquipInspectConfig.data';
|
||||
import { list, deleteOne, batchDelete, getExportUrl, getImportUrl } from './MesXslEquipInspectConfig.api';
|
||||
|
||||
const [registerModal, { openModal }] = useModal();
|
||||
|
||||
const { tableContext, onExportXls, onImportXls } = useListPage({
|
||||
tableProps: {
|
||||
title: '设备点检配置',
|
||||
api: list,
|
||||
columns,
|
||||
canResize: true,
|
||||
formConfig: {
|
||||
schemas: searchFormSchema,
|
||||
labelWidth: 100,
|
||||
autoSubmitOnEnter: true,
|
||||
showAdvancedButton: true,
|
||||
},
|
||||
actionColumn: {
|
||||
width: 200,
|
||||
fixed: 'right',
|
||||
},
|
||||
},
|
||||
exportConfig: {
|
||||
name: '设备点检配置',
|
||||
url: getExportUrl,
|
||||
},
|
||||
importConfig: {
|
||||
url: getImportUrl,
|
||||
success: handleSuccess,
|
||||
},
|
||||
});
|
||||
|
||||
const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
|
||||
|
||||
function handleAdd() {
|
||||
openModal(true, { isUpdate: false, showFooter: true });
|
||||
}
|
||||
|
||||
function handleEdit(record: Recordable) {
|
||||
openModal(true, { record, isUpdate: true, showFooter: true });
|
||||
}
|
||||
|
||||
function handleDetail(record: Recordable) {
|
||||
openModal(true, { record, isUpdate: true, showFooter: false });
|
||||
}
|
||||
|
||||
async function handleDelete(record) {
|
||||
await deleteOne({ id: record.id }, handleSuccess);
|
||||
}
|
||||
|
||||
async function batchHandleDelete() {
|
||||
await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
|
||||
}
|
||||
|
||||
function handleSuccess() {
|
||||
selectedRowKeys.value = [];
|
||||
reload();
|
||||
}
|
||||
|
||||
function getDropDownAction(record) {
|
||||
return [
|
||||
{ label: '详情', onClick: handleDetail.bind(null, record) },
|
||||
{
|
||||
label: '删除',
|
||||
popConfirm: { title: '是否确认删除', confirm: handleDelete.bind(null, record) },
|
||||
auth: 'mes:mes_xsl_equip_inspect_config:delete',
|
||||
},
|
||||
];
|
||||
}
|
||||
</script>
|
||||
@@ -0,0 +1,239 @@
|
||||
<template>
|
||||
<BasicModal
|
||||
v-bind="$attrs"
|
||||
destroyOnClose
|
||||
:title="title"
|
||||
width="1100px"
|
||||
@register="registerModal"
|
||||
@ok="handleSubmit"
|
||||
>
|
||||
<BasicForm @register="registerForm">
|
||||
<template #equipmentLedgerPicker="{ model, field }">
|
||||
<a-input-group compact style="display: flex; width: 100%">
|
||||
<a-input v-model:value="model[field]" read-only placeholder="请选择设备台账" style="flex: 1" />
|
||||
<a-button type="primary" :disabled="isDetail" @click="openLedgerSelect">选择</a-button>
|
||||
<a-button v-if="model.equipmentLedgerId && !isDetail" @click="clearLedger">清除</a-button>
|
||||
</a-input-group>
|
||||
</template>
|
||||
</BasicForm>
|
||||
<a-divider orientation="left">点检项目明细</a-divider>
|
||||
<JVxeTable
|
||||
v-if="tableReady"
|
||||
ref="lineTableRef"
|
||||
toolbar
|
||||
row-number
|
||||
rowSelection
|
||||
keep-source
|
||||
:insert-row="false"
|
||||
:max-height="380"
|
||||
:loading="lineLoading"
|
||||
:columns="lineJVxeColumns"
|
||||
:dataSource="lineDataSource"
|
||||
:disabled="!showFooterFlag"
|
||||
:toolbar-config="{ btn: ['remove'], slots: ['suffix'] }"
|
||||
:add-btn-cfg="{ enabled: false }"
|
||||
>
|
||||
<template #toolbarSuffix>
|
||||
<a-button
|
||||
v-if="showFooterFlag"
|
||||
type="primary"
|
||||
preIcon="ant-design:plus-outlined"
|
||||
@click="openBatchItemSelect"
|
||||
>
|
||||
选择点检及保养项目
|
||||
</a-button>
|
||||
</template>
|
||||
</JVxeTable>
|
||||
<MesXslEquipmentLedgerSelectModal @register="registerLedgerModal" @select="onLedgerSelect" />
|
||||
<MesXslInspectMaintainItemSelectModal @register="registerItemModal" @select="onItemsSelect" />
|
||||
</BasicModal>
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { computed, ref, unref } from 'vue';
|
||||
import { BasicModal, useModalInner, useModal } from '/@/components/Modal';
|
||||
import { BasicForm, useForm } from '/@/components/Form/index';
|
||||
import type { JVxeTableInstance } from '/@/components/jeecg/JVxeTable/types';
|
||||
import { useMessage } from '/@/hooks/web/useMessage';
|
||||
import { formSchema, lineJVxeColumns } from '../MesXslEquipInspectConfig.data';
|
||||
import { saveOrUpdate, queryById, queryLineListByConfigId } from '../MesXslEquipInspectConfig.api';
|
||||
import MesXslEquipmentLedgerSelectModal from './MesXslEquipmentLedgerSelectModal.vue';
|
||||
import MesXslInspectMaintainItemSelectModal from './MesXslInspectMaintainItemSelectModal.vue';
|
||||
|
||||
const emit = defineEmits(['register', 'success']);
|
||||
const { createMessage } = useMessage();
|
||||
const isUpdate = ref(false);
|
||||
const isDetail = ref(false);
|
||||
const showFooterFlag = ref(true);
|
||||
const tableReady = ref(false);
|
||||
const lineLoading = ref(false);
|
||||
const lineDataSource = ref<Recordable[]>([]);
|
||||
const lineTableRef = ref<JVxeTableInstance>();
|
||||
|
||||
const [registerForm, { resetFields, setFieldsValue, validate, setProps, getFieldsValue }] = useForm({
|
||||
labelWidth: 110,
|
||||
schemas: formSchema,
|
||||
showActionButtonGroup: false,
|
||||
baseColProps: { span: 12 },
|
||||
});
|
||||
|
||||
const [registerLedgerModal, { openModal: openLedgerModal }] = useModal();
|
||||
const [registerItemModal, { openModal: openItemModal }] = useModal();
|
||||
|
||||
const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
|
||||
tableReady.value = false;
|
||||
lineDataSource.value = [];
|
||||
await resetFields();
|
||||
setModalProps({ confirmLoading: false, showCancelBtn: data?.showFooter, showOkBtn: data?.showFooter });
|
||||
isUpdate.value = !!data?.isUpdate;
|
||||
isDetail.value = !data?.showFooter;
|
||||
showFooterFlag.value = !!data?.showFooter;
|
||||
setProps({ disabled: !data?.showFooter });
|
||||
if (unref(isUpdate) && data?.record?.id) {
|
||||
lineLoading.value = true;
|
||||
try {
|
||||
const mainRaw = await queryById({ id: data.record.id });
|
||||
const m = (mainRaw as any)?.id != null ? mainRaw : (mainRaw as any)?.result ?? mainRaw;
|
||||
const linesRaw = await queryLineListByConfigId({ id: data.record.id });
|
||||
const list = Array.isArray(linesRaw) ? linesRaw : (linesRaw as any)?.result ?? [];
|
||||
await setFieldsValue({ ...m });
|
||||
lineDataSource.value = [...(list || [])];
|
||||
} finally {
|
||||
lineLoading.value = false;
|
||||
}
|
||||
}
|
||||
tableReady.value = true;
|
||||
});
|
||||
|
||||
const title = computed(() =>
|
||||
!unref(isUpdate) ? '新增设备点检配置' : unref(isDetail) ? '设备点检配置详情' : '编辑设备点检配置',
|
||||
);
|
||||
|
||||
function itemToLineRow(item: Recordable) {
|
||||
return {
|
||||
inspectMaintainItemId: item.id,
|
||||
itemCode: item.itemCode,
|
||||
itemName: item.itemName,
|
||||
itemCategory: item.itemCategory,
|
||||
itemType: item.itemType,
|
||||
equipmentPartName: item.equipmentPartName,
|
||||
equipmentSubPartName: item.equipmentSubPartName,
|
||||
inspectMethod: item.inspectMethod,
|
||||
judgmentCriteria: item.judgmentCriteria,
|
||||
};
|
||||
}
|
||||
|
||||
function getExistingItemIds(): Set<string> {
|
||||
const lineRef = lineTableRef.value as any;
|
||||
const tableData = (lineRef?.getTableData?.() || lineDataSource.value || []) as Recordable[];
|
||||
const ids = new Set<string>();
|
||||
for (const r of tableData) {
|
||||
if (r?.inspectMaintainItemId) {
|
||||
ids.add(String(r.inspectMaintainItemId));
|
||||
}
|
||||
}
|
||||
return ids;
|
||||
}
|
||||
|
||||
function openLedgerSelect() {
|
||||
const vals = getFieldsValue();
|
||||
openLedgerModal(true, { equipmentLedgerId: vals.equipmentLedgerId });
|
||||
}
|
||||
|
||||
function clearLedger() {
|
||||
setFieldsValue({ equipmentLedgerId: '', equipmentName: '', equipmentCode: '' });
|
||||
}
|
||||
|
||||
function onLedgerSelect(payload: { equipmentLedgerId?: string; equipmentName?: string; equipmentCode?: string }) {
|
||||
setFieldsValue({
|
||||
equipmentLedgerId: payload.equipmentLedgerId || '',
|
||||
equipmentName: payload.equipmentName || '',
|
||||
equipmentCode: payload.equipmentCode || '',
|
||||
});
|
||||
}
|
||||
|
||||
function openBatchItemSelect() {
|
||||
const configType = getFieldsValue()?.configType;
|
||||
if (!configType) {
|
||||
createMessage.warning('请先选择类型（点检/保养）');
|
||||
return;
|
||||
}
|
||||
openItemModal(true, { itemCategory: configType, multiple: true });
|
||||
}
|
||||
|
||||
function onItemsSelect(payload: Recordable | Recordable[]) {
|
||||
const items = Array.isArray(payload) ? payload : payload ? [payload] : [];
|
||||
if (!items.length) {
|
||||
return;
|
||||
}
|
||||
const existing = getExistingItemIds();
|
||||
const toAdd: Recordable[] = [];
|
||||
const skipped: string[] = [];
|
||||
for (const item of items) {
|
||||
if (!item?.id) {
|
||||
continue;
|
||||
}
|
||||
const id = String(item.id);
|
||||
if (existing.has(id)) {
|
||||
skipped.push(item.itemName || item.itemCode || id);
|
||||
continue;
|
||||
}
|
||||
existing.add(id);
|
||||
toAdd.push(itemToLineRow(item));
|
||||
}
|
||||
if (!toAdd.length) {
|
||||
if (skipped.length) {
|
||||
createMessage.warning('所选项目均已在明细中，未添加新行');
|
||||
}
|
||||
return;
|
||||
}
|
||||
const lineRef = lineTableRef.value as any;
|
||||
if (lineRef?.pushRows) {
|
||||
lineRef.pushRows(toAdd);
|
||||
} else {
|
||||
lineDataSource.value = [...lineDataSource.value, ...toAdd];
|
||||
}
|
||||
if (skipped.length) {
|
||||
createMessage.warning(`已添加 ${toAdd.length} 项，跳过 ${skipped.length} 项重复项目`);
|
||||
}
|
||||
}
|
||||
|
||||
async function handleSubmit() {
|
||||
try {
|
||||
const values = await validate();
|
||||
const lineRef = lineTableRef.value as any;
|
||||
const tableData = (lineRef?.getTableData?.() || []) as Recordable[];
|
||||
const lineList = tableData
|
||||
.filter((r) => r && r.inspectMaintainItemId)
|
||||
.map((r) => ({
|
||||
inspectMaintainItemId: r.inspectMaintainItemId,
|
||||
itemCode: r.itemCode,
|
||||
itemName: r.itemName,
|
||||
itemCategory: r.itemCategory,
|
||||
itemType: r.itemType,
|
||||
equipmentPartName: r.equipmentPartName,
|
||||
equipmentSubPartName: r.equipmentSubPartName,
|
||||
inspectMethod: r.inspectMethod,
|
||||
judgmentCriteria: r.judgmentCriteria,
|
||||
}));
|
||||
if (!lineList.length) {
|
||||
createMessage.warning('请通过「选择点检及保养项目」至少添加一条明细');
|
||||
return;
|
||||
}
|
||||
const ids = new Set<string>();
|
||||
for (const line of lineList) {
|
||||
if (ids.has(line.inspectMaintainItemId)) {
|
||||
createMessage.warning('明细中点检项目不能重复');
|
||||
return;
|
||||
}
|
||||
ids.add(line.inspectMaintainItemId);
|
||||
}
|
||||
setModalProps({ confirmLoading: true });
|
||||
await saveOrUpdate({ ...values, lineList }, unref(isUpdate));
|
||||
closeModal();
|
||||
emit('success');
|
||||
} finally {
|
||||
setModalProps({ confirmLoading: false });
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@@ -0,0 +1,93 @@
|
||||
<template>
|
||||
<BasicModal v-bind="$attrs" title="选择设备台账" :width="1000" @register="registerModal" @ok="handleOk">
|
||||
<BasicTable @register="registerTable" />
|
||||
</BasicModal>
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { ref } from 'vue';
|
||||
import { BasicModal, useModalInner } from '/@/components/Modal';
|
||||
import { BasicTable, useTable } from '/@/components/Table';
|
||||
import { list, queryById } from '/@/views/xslmes/mesXslEquipmentLedger/MesXslEquipmentLedger.api';
|
||||
|
||||
const emit = defineEmits(['register', 'select']);
|
||||
|
||||
const selectedRow = ref<Recordable | null>(null);
|
||||
|
||||
function handleSelectionChange(_keys: string[], rows: Recordable[]) {
|
||||
selectedRow.value = rows?.[0] ?? null;
|
||||
}
|
||||
|
||||
const [registerTable, { reload, getSelectRowKeys, getSelectRows, setSelectedRowKeys, clearSelectedRowKeys }] = useTable({
|
||||
api: list,
|
||||
columns: [
|
||||
{ title: '设备名称', dataIndex: 'equipmentName', width: 160 },
|
||||
{ title: '设备编号', dataIndex: 'equipmentCode', width: 140 },
|
||||
{ title: '设备类别', dataIndex: 'equipmentCategoryName', width: 120 },
|
||||
{ title: '设备类型', dataIndex: 'equipmentTypeName', width: 120 },
|
||||
],
|
||||
rowKey: 'id',
|
||||
useSearchForm: true,
|
||||
formConfig: {
|
||||
labelWidth: 90,
|
||||
schemas: [
|
||||
{ label: '设备名称', field: 'equipmentName', component: 'Input', colProps: { span: 8 } },
|
||||
{ label: '设备编号', field: 'equipmentCode', component: 'Input', colProps: { span: 8 } },
|
||||
],
|
||||
},
|
||||
pagination: { pageSize: 10 },
|
||||
canResize: false,
|
||||
showIndexColumn: false,
|
||||
immediate: true,
|
||||
rowSelection: {
|
||||
type: 'radio',
|
||||
columnWidth: 48,
|
||||
onChange: handleSelectionChange,
|
||||
},
|
||||
clickToRowSelect: true,
|
||||
});
|
||||
|
||||
const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
|
||||
selectedRow.value = null;
|
||||
clearSelectedRowKeys?.();
|
||||
setModalProps({ confirmLoading: false });
|
||||
const lid = data?.equipmentLedgerId as string | undefined;
|
||||
if (lid) {
|
||||
setSelectedRowKeys?.([lid]);
|
||||
try {
|
||||
const raw = await queryById({ id: lid });
|
||||
const row = (raw as any)?.id != null ? raw : (raw as any)?.result;
|
||||
if (row) {
|
||||
selectedRow.value = row;
|
||||
}
|
||||
} catch {
|
||||
// 忽略
|
||||
}
|
||||
}
|
||||
reload();
|
||||
});
|
||||
|
||||
async function handleOk() {
|
||||
const keys = (getSelectRowKeys?.() || []) as string[];
|
||||
let row = selectedRow.value || ((getSelectRows?.() || []) as Recordable[])[0];
|
||||
if (!row && keys.length) {
|
||||
try {
|
||||
const raw = await queryById({ id: keys[0] });
|
||||
row = (raw as any)?.id != null ? raw : (raw as any)?.result;
|
||||
} catch {
|
||||
// 忽略
|
||||
}
|
||||
}
|
||||
if (!row?.id) {
|
||||
emit('select', { equipmentLedgerId: '', equipmentName: '', equipmentCode: '' });
|
||||
closeModal();
|
||||
return;
|
||||
}
|
||||
emit('select', {
|
||||
equipmentLedgerId: row.id,
|
||||
equipmentName: row.equipmentName || '',
|
||||
equipmentCode: row.equipmentCode || '',
|
||||
});
|
||||
closeModal();
|
||||
}
|
||||
</script>
|
||||
@@ -0,0 +1,89 @@
|
||||
<template>
|
||||
<BasicModal v-bind="$attrs" :title="modalTitle" :width="1100" @register="registerModal" @ok="handleOk">
|
||||
<BasicTable @register="registerTable" />
|
||||
</BasicModal>
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { computed, ref } from 'vue';
|
||||
import { BasicModal, useModalInner } from '/@/components/Modal';
|
||||
import { BasicTable, useTable } from '/@/components/Table';
|
||||
import { list } from '/@/views/xslmes/mesXslInspectMaintainItem/MesXslInspectMaintainItem.api';
|
||||
|
||||
const emit = defineEmits(['register', 'select']);
|
||||
|
||||
const multipleMode = ref(true);
|
||||
const filterItemCategory = ref('');
|
||||
const selectedRows = ref<Recordable[]>([]);
|
||||
|
||||
const modalTitle = computed(() => (multipleMode.value ? '选择点检及保养项目（可多选）' : '选择点检及保养项目'));
|
||||
|
||||
function handleSelectionChange(_keys: string[], rows: Recordable[]) {
|
||||
selectedRows.value = rows || [];
|
||||
}
|
||||
|
||||
function fetchItemPage(params: Recordable) {
|
||||
const p = { ...params };
|
||||
if (filterItemCategory.value) {
|
||||
p.itemCategory = filterItemCategory.value;
|
||||
}
|
||||
return list(p);
|
||||
}
|
||||
|
||||
const [registerTable, { reload, getSelectRows, clearSelectedRowKeys }] = useTable({
|
||||
api: fetchItemPage,
|
||||
columns: [
|
||||
{ title: '项目编号', dataIndex: 'itemCode', width: 120 },
|
||||
{ title: '项目名称', dataIndex: 'itemName', width: 140 },
|
||||
{ title: '项目类别', dataIndex: 'itemCategory_dictText', width: 90 },
|
||||
{ title: '项目类型', dataIndex: 'itemType_dictText', width: 90 },
|
||||
{ title: '设备部位', dataIndex: 'equipmentPartName', width: 110 },
|
||||
{ title: '设备小部位', dataIndex: 'equipmentSubPartName', width: 110 },
|
||||
{ title: '点检方式', dataIndex: 'inspectMethod_dictText', width: 90 },
|
||||
{ title: '判断基准', dataIndex: 'judgmentCriteria', width: 160, ellipsis: true },
|
||||
],
|
||||
rowKey: 'id',
|
||||
useSearchForm: true,
|
||||
formConfig: {
|
||||
labelWidth: 90,
|
||||
schemas: [
|
||||
{ label: '项目编号', field: 'itemCode', component: 'Input', colProps: { span: 8 } },
|
||||
{ label: '项目名称', field: 'itemName', component: 'Input', colProps: { span: 8 } },
|
||||
],
|
||||
},
|
||||
pagination: { pageSize: 10 },
|
||||
canResize: false,
|
||||
showIndexColumn: false,
|
||||
immediate: true,
|
||||
rowSelection: {
|
||||
type: 'checkbox',
|
||||
columnWidth: 48,
|
||||
onChange: handleSelectionChange,
|
||||
},
|
||||
clickToRowSelect: true,
|
||||
});
|
||||
|
||||
const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
|
||||
multipleMode.value = data?.multiple !== false;
|
||||
filterItemCategory.value = data?.itemCategory ? String(data.itemCategory) : '';
|
||||
selectedRows.value = [];
|
||||
clearSelectedRowKeys?.();
|
||||
setModalProps({ confirmLoading: false });
|
||||
reload();
|
||||
});
|
||||
|
||||
async function handleOk() {
|
||||
let rows = selectedRows.value?.length ? [...selectedRows.value] : ((getSelectRows?.() || []) as Recordable[]);
|
||||
const valid = rows.filter((r) => r?.id && (r.itemCode != null || r.itemName != null));
|
||||
if (!valid.length) {
|
||||
closeModal();
|
||||
return;
|
||||
}
|
||||
if (multipleMode.value) {
|
||||
emit('select', valid);
|
||||
} else {
|
||||
emit('select', valid[0]);
|
||||
}
|
||||
closeModal();
|
||||
}
|
||||
</script>
|
||||
@@ -0,0 +1,65 @@
|
||||
import { defHttp } from '/@/utils/http/axios';
|
||||
import { useMessage } from '/@/hooks/web/useMessage';
|
||||
|
||||
const { createConfirm } = useMessage();
|
||||
|
||||
enum Api {
|
||||
list = '/xslmes/mesXslEquipInspectRecord/list',
|
||||
save = '/xslmes/mesXslEquipInspectRecord/add',
|
||||
edit = '/xslmes/mesXslEquipInspectRecord/edit',
|
||||
deleteOne = '/xslmes/mesXslEquipInspectRecord/delete',
|
||||
deleteBatch = '/xslmes/mesXslEquipInspectRecord/deleteBatch',
|
||||
importExcel = '/xslmes/mesXslEquipInspectRecord/importExcel',
|
||||
exportXls = '/xslmes/mesXslEquipInspectRecord/exportXls',
|
||||
queryById = '/xslmes/mesXslEquipInspectRecord/queryById',
|
||||
queryLineList = '/xslmes/mesXslEquipInspectRecord/queryLineListByRecordId',
|
||||
generateRecordNo = '/xslmes/mesXslEquipInspectRecord/generateRecordNo',
|
||||
loadLinesByEquipment = '/xslmes/mesXslEquipInspectRecord/loadLinesByEquipment',
|
||||
batchCreateFromEquipment = '/xslmes/mesXslEquipInspectRecord/batchCreateFromEquipment',
|
||||
handleFail = '/xslmes/mesXslEquipInspectRecord/handleFail',
|
||||
}
|
||||
|
||||
export const getExportUrl = Api.exportXls;
|
||||
export const getImportUrl = Api.importExcel;
|
||||
|
||||
export const list = (params) => defHttp.get({ url: Api.list, params });
|
||||
|
||||
export const queryById = (params: { id: string }) => defHttp.get({ url: Api.queryById, params });
|
||||
|
||||
export const queryLineListByRecordId = (params: { id: string }) => defHttp.get({ url: Api.queryLineList, params });
|
||||
|
||||
export const generateRecordNo = () => defHttp.get({ url: Api.generateRecordNo });
|
||||
|
||||
export const loadLinesByEquipment = (params: { equipmentLedgerId: string; recordType: string }) =>
|
||||
defHttp.get({ url: Api.loadLinesByEquipment, params });
|
||||
|
||||
export const batchCreateFromEquipment = (params: { equipmentLedgerIds: string[]; recordType: string }) =>
|
||||
defHttp.post({ url: Api.batchCreateFromEquipment, params });
|
||||
|
||||
export const deleteOne = (params, handleSuccess) => {
|
||||
return defHttp.delete({ url: Api.deleteOne, params }, { joinParamsToUrl: true }).then(() => {
|
||||
handleSuccess();
|
||||
});
|
||||
};
|
||||
|
||||
export const batchDelete = (params, handleSuccess) => {
|
||||
createConfirm({
|
||||
iconType: 'warning',
|
||||
title: '确认删除',
|
||||
content: '是否删除选中数据',
|
||||
okText: '确认',
|
||||
cancelText: '取消',
|
||||
onOk: () => {
|
||||
return defHttp.delete({ url: Api.deleteBatch, data: params }, { joinParamsToUrl: true }).then(() => {
|
||||
handleSuccess();
|
||||
});
|
||||
},
|
||||
});
|
||||
};
|
||||
|
||||
export const saveOrUpdate = (params, isUpdate) => {
|
||||
const url = isUpdate ? Api.edit : Api.save;
|
||||
return defHttp.post({ url, params });
|
||||
};
|
||||
|
||||
export const handleFailRecord = (params: Recordable) => defHttp.post({ url: Api.handleFail, params });
|
||||
@@ -0,0 +1,222 @@
|
||||
import { BasicColumn, FormSchema } from '/@/components/Table';
|
||||
import { JVxeColumn, JVxeTypes } from '/@/components/jeecg/JVxeTable/types';
|
||||
import { uploadUrl } from '/@/api/common/api';
|
||||
|
||||
export const columns: BasicColumn[] = [
|
||||
{ title: '记录编号', align: 'center', dataIndex: 'recordNo', width: 150 },
|
||||
{ title: '计划单号', align: 'center', dataIndex: 'planNo', width: 130 },
|
||||
{ title: '设备名称', align: 'center', dataIndex: 'equipmentName', width: 150 },
|
||||
{ title: '设备编码', align: 'center', dataIndex: 'equipmentCode', width: 130 },
|
||||
{ title: '类型', align: 'center', dataIndex: 'recordType_dictText', width: 80 },
|
||||
{ title: '点检日期', align: 'center', dataIndex: 'inspectDate', width: 110 },
|
||||
{ title: '点检人', align: 'center', dataIndex: 'inspectorRealname', width: 100 },
|
||||
{ title: '点检结果', align: 'center', dataIndex: 'inspectResult_dictText', width: 90 },
|
||||
{ title: '是否已处理', align: 'center', dataIndex: 'handledFlag_dictText', width: 90 },
|
||||
{ title: '状态', align: 'center', dataIndex: 'recordStatus_dictText', width: 90 },
|
||||
{
|
||||
title: '创建时间',
|
||||
align: 'center',
|
||||
dataIndex: 'createTime',
|
||||
width: 165,
|
||||
customRender: ({ text }) => (!text ? '' : String(text).length > 19 ? String(text).substring(0, 19) : text),
|
||||
},
|
||||
];
|
||||
|
||||
export const searchFormSchema: FormSchema[] = [
|
||||
{ label: '记录编号', field: 'recordNo', component: 'Input', colProps: { span: 6 } },
|
||||
{ label: '计划单号', field: 'planNo', component: 'Input', colProps: { span: 6 } },
|
||||
{ label: '设备名称', field: 'equipmentName', component: 'Input', colProps: { span: 6 } },
|
||||
{
|
||||
label: '类型',
|
||||
field: 'recordType',
|
||||
component: 'JDictSelectTag',
|
||||
componentProps: { dictCode: 'xslmes_im_item_category' },
|
||||
colProps: { span: 6 },
|
||||
},
|
||||
{
|
||||
label: '状态',
|
||||
field: 'recordStatus',
|
||||
component: 'JDictSelectTag',
|
||||
componentProps: { dictCode: 'xslmes_im_record_status' },
|
||||
colProps: { span: 6 },
|
||||
},
|
||||
];
|
||||
|
||||
export const formSchema: FormSchema[] = [
|
||||
{ label: '', field: 'id', component: 'Input', show: false },
|
||||
{ label: '', field: 'equipmentLedgerId', component: 'Input', show: false },
|
||||
{ label: '', field: 'planId', component: 'Input', show: false },
|
||||
{ label: '', field: 'equipInspectConfigId', component: 'Input', show: false },
|
||||
{ label: '', field: 'inspectorUserId', component: 'Input', show: false },
|
||||
{ label: '', field: 'inspectorUsername', component: 'Input', show: false },
|
||||
{
|
||||
label: '记录编号',
|
||||
field: 'recordNo',
|
||||
component: 'Input',
|
||||
componentProps: { readonly: true, placeholder: '保存时自动生成' },
|
||||
dynamicRules: () => [{ required: true, message: '记录编号不能为空' }],
|
||||
},
|
||||
{ label: '计划单号', field: 'planNo', component: 'Input' },
|
||||
{
|
||||
label: '设备名称',
|
||||
field: 'equipmentName',
|
||||
component: 'Input',
|
||||
componentProps: { readonly: true },
|
||||
},
|
||||
{
|
||||
label: '设备编码',
|
||||
field: 'equipmentCode',
|
||||
component: 'Input',
|
||||
componentProps: { readonly: true },
|
||||
},
|
||||
{
|
||||
label: '类型',
|
||||
field: 'recordType',
|
||||
component: 'JDictSelectTag',
|
||||
componentProps: { dictCode: 'xslmes_im_item_category', disabled: true },
|
||||
},
|
||||
{
|
||||
label: '点检日期',
|
||||
field: 'inspectDate',
|
||||
component: 'DatePicker',
|
||||
required: true,
|
||||
componentProps: { valueFormat: 'YYYY-MM-DD', style: { width: '100%' } },
|
||||
},
|
||||
{
|
||||
label: '点检人',
|
||||
field: 'inspectorRealname',
|
||||
component: 'Input',
|
||||
componentProps: { readonly: true, placeholder: '当前登录用户' },
|
||||
dynamicRules: () => [{ required: true, message: '点检人不能为空' }],
|
||||
},
|
||||
{
|
||||
label: '点检结果',
|
||||
field: 'inspectResult',
|
||||
component: 'JDictSelectTag',
|
||||
required: true,
|
||||
componentProps: { dictCode: 'xslmes_im_inspect_result', placeholder: '合格/不合格' },
|
||||
},
|
||||
{
|
||||
label: '状态',
|
||||
field: 'recordStatus',
|
||||
component: 'JDictSelectTag',
|
||||
componentProps: { dictCode: 'xslmes_im_record_status', disabled: true },
|
||||
},
|
||||
];
|
||||
|
||||
/** 详情页：仅不合格记录展示的处理信息（只读） */
|
||||
export const processDisplayFormSchema: FormSchema[] = [
|
||||
{
|
||||
label: '是否已处理',
|
||||
field: 'handledFlag',
|
||||
component: 'JDictSelectTag',
|
||||
componentProps: { dictCode: 'yn', disabled: true },
|
||||
},
|
||||
{
|
||||
label: '处理人',
|
||||
field: 'handlerRealname',
|
||||
component: 'Input',
|
||||
componentProps: { readonly: true },
|
||||
},
|
||||
{
|
||||
label: '处理时间',
|
||||
field: 'handleTime',
|
||||
component: 'DatePicker',
|
||||
componentProps: {
|
||||
showTime: true,
|
||||
valueFormat: 'YYYY-MM-DD HH:mm:ss',
|
||||
style: { width: '100%' },
|
||||
disabled: true,
|
||||
},
|
||||
},
|
||||
];
|
||||
|
||||
/** 不合格记录处理弹窗 */
|
||||
export const handleFormSchema: FormSchema[] = [
|
||||
{ label: '', field: 'id', component: 'Input', show: false },
|
||||
{ label: '', field: 'handlerUsername', component: 'Input', show: false },
|
||||
{ label: '', field: 'handlerRealname', component: 'Input', show: false },
|
||||
{
|
||||
label: '处理人',
|
||||
field: 'handlerUserId',
|
||||
component: 'JSelectUser',
|
||||
required: true,
|
||||
componentProps: ({ formActionType }) => ({
|
||||
rowKey: 'id',
|
||||
labelKey: 'realname',
|
||||
isRadioSelection: true,
|
||||
maxSelectCount: 1,
|
||||
onOptionsChange: (options) => {
|
||||
const row = options?.[0];
|
||||
if (row && formActionType) {
|
||||
formActionType.setFieldsValue({
|
||||
handlerUsername: row.username,
|
||||
handlerRealname: row.realname,
|
||||
});
|
||||
}
|
||||
},
|
||||
}),
|
||||
},
|
||||
{
|
||||
label: '处理时间',
|
||||
field: 'handleTime',
|
||||
component: 'DatePicker',
|
||||
required: true,
|
||||
componentProps: {
|
||||
showTime: true,
|
||||
valueFormat: 'YYYY-MM-DD HH:mm:ss',
|
||||
style: { width: '100%' },
|
||||
},
|
||||
},
|
||||
];
|
||||
|
||||
export const lineJVxeColumns: JVxeColumn[] = [
|
||||
{ title: '', key: 'equipInspectConfigLineId', type: JVxeTypes.hidden },
|
||||
{ title: '', key: 'inspectMaintainItemId', type: JVxeTypes.hidden },
|
||||
{ title: '点检项目编号', key: 'itemCode', type: JVxeTypes.normal, width: 120, disabled: true },
|
||||
{ title: '点检项目', key: 'itemName', type: JVxeTypes.normal, width: 130, disabled: true },
|
||||
{
|
||||
title: '项目类别',
|
||||
key: 'itemCategory',
|
||||
type: JVxeTypes.select,
|
||||
width: 90,
|
||||
disabled: true,
|
||||
dictCode: 'xslmes_im_item_category',
|
||||
filters: false,
|
||||
sortable: false,
|
||||
},
|
||||
{
|
||||
title: '项目类型',
|
||||
key: 'itemType',
|
||||
type: JVxeTypes.select,
|
||||
width: 90,
|
||||
disabled: true,
|
||||
dictCode: 'xslmes_im_item_type',
|
||||
filters: false,
|
||||
sortable: false,
|
||||
},
|
||||
{ title: '设备部位', key: 'equipmentPartName', type: JVxeTypes.normal, width: 100, disabled: true },
|
||||
{ title: '设备小部位', key: 'equipmentSubPartName', type: JVxeTypes.normal, width: 100, disabled: true },
|
||||
{
|
||||
title: '点检方式',
|
||||
key: 'inspectMethod',
|
||||
type: JVxeTypes.select,
|
||||
width: 90,
|
||||
disabled: true,
|
||||
dictCode: 'xslmes_im_inspect_method',
|
||||
filters: false,
|
||||
sortable: false,
|
||||
},
|
||||
{ title: '判断基准', key: 'judgmentCriteria', type: JVxeTypes.normal, width: 150, disabled: true },
|
||||
{ title: '点检描述', key: 'lineInspectResult', type: JVxeTypes.input, width: 140 },
|
||||
{
|
||||
title: '图片',
|
||||
key: 'pictureFiles',
|
||||
type: JVxeTypes.image,
|
||||
width: 160,
|
||||
maxCount: 3,
|
||||
token: true,
|
||||
action: uploadUrl,
|
||||
responseName: 'message',
|
||||
},
|
||||
];
|
||||
@@ -0,0 +1,153 @@
|
||||
<template>
|
||||
<div>
|
||||
<BasicTable @register="registerTable" :rowSelection="rowSelection">
|
||||
<template #tableTitle>
|
||||
<a-button
|
||||
type="primary"
|
||||
v-auth="'mes:mes_xsl_equip_inspect_record:exportXls'"
|
||||
preIcon="ant-design:export-outlined"
|
||||
@click="onExportXls"
|
||||
>
|
||||
导出
|
||||
</a-button>
|
||||
<a-dropdown v-if="selectedRowKeys.length > 0">
|
||||
<template #overlay>
|
||||
<a-menu>
|
||||
<a-menu-item key="1" @click="batchHandleDelete">
|
||||
<Icon icon="ant-design:delete-outlined" />
|
||||
删除
|
||||
</a-menu-item>
|
||||
</a-menu>
|
||||
</template>
|
||||
<a-button v-auth="'mes:mes_xsl_equip_inspect_record:deleteBatch'">
|
||||
批量操作
|
||||
<Icon icon="mdi:chevron-down" />
|
||||
</a-button>
|
||||
</a-dropdown>
|
||||
</template>
|
||||
<template #action="{ record }">
|
||||
<TableAction :actions="getTableActions(record)" :dropDownActions="getDropDownAction(record)" />
|
||||
</template>
|
||||
</BasicTable>
|
||||
<MesXslEquipInspectRecordModal @register="registerModal" @success="handleSuccess" />
|
||||
<MesXslEquipInspectRecordHandleModal @register="registerHandleModal" @success="handleSuccess" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script lang="ts" name="xslmes-mesXslEquipInspectRecord" setup>
|
||||
import { BasicTable, TableAction } from '/@/components/Table';
|
||||
import { useModal } from '/@/components/Modal';
|
||||
import { useListPage } from '/@/hooks/system/useListPage';
|
||||
import { useMessage } from '/@/hooks/web/useMessage';
|
||||
import Icon from '/@/components/Icon';
|
||||
import MesXslEquipInspectRecordModal from './components/MesXslEquipInspectRecordModal.vue';
|
||||
import MesXslEquipInspectRecordHandleModal from './components/MesXslEquipInspectRecordHandleModal.vue';
|
||||
import { columns, searchFormSchema } from './MesXslEquipInspectRecord.data';
|
||||
import { list, deleteOne, batchDelete, getExportUrl } from './MesXslEquipInspectRecord.api';
|
||||
|
||||
const { createMessage } = useMessage();
|
||||
|
||||
const [registerModal, { openModal }] = useModal();
|
||||
const [registerHandleModal, { openModal: openHandleModal }] = useModal();
|
||||
|
||||
const { tableContext, onExportXls } = useListPage({
|
||||
tableProps: {
|
||||
title: '点检保养记录',
|
||||
api: list,
|
||||
columns,
|
||||
canResize: true,
|
||||
formConfig: {
|
||||
schemas: searchFormSchema,
|
||||
labelWidth: 100,
|
||||
autoSubmitOnEnter: true,
|
||||
showAdvancedButton: true,
|
||||
},
|
||||
actionColumn: {
|
||||
width: 240,
|
||||
fixed: 'right',
|
||||
},
|
||||
},
|
||||
exportConfig: {
|
||||
name: '点检保养记录',
|
||||
url: getExportUrl,
|
||||
},
|
||||
});
|
||||
|
||||
const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
|
||||
|
||||
function handleEnterResult(record: Recordable) {
|
||||
if (record.recordStatus !== 'pending') {
|
||||
createMessage.warning('仅待点检记录可录入点检结果');
|
||||
return;
|
||||
}
|
||||
openModal(true, { record, showFooter: true });
|
||||
}
|
||||
|
||||
function handleDetail(record: Recordable) {
|
||||
openModal(true, { record, showFooter: false });
|
||||
}
|
||||
|
||||
function canHandleFail(record: Recordable) {
|
||||
return (
|
||||
record.inspectResult === 'fail' &&
|
||||
record.recordStatus === 'done' &&
|
||||
record.handledFlag !== '1'
|
||||
);
|
||||
}
|
||||
|
||||
function handleProcess(record: Recordable) {
|
||||
if (!canHandleFail(record)) {
|
||||
createMessage.warning('仅未处理的不合格记录可登记处理');
|
||||
return;
|
||||
}
|
||||
openHandleModal(true, { record });
|
||||
}
|
||||
|
||||
function getTableActions(record: Recordable) {
|
||||
if (record.recordStatus === 'pending') {
|
||||
return [
|
||||
{
|
||||
label: '录入点检结果',
|
||||
onClick: handleEnterResult.bind(null, record),
|
||||
auth: 'mes:mes_xsl_equip_inspect_record:edit',
|
||||
},
|
||||
];
|
||||
}
|
||||
const actions: Recordable[] = [{ label: '详情', onClick: handleDetail.bind(null, record) }];
|
||||
if (canHandleFail(record)) {
|
||||
actions.push({
|
||||
label: '处理',
|
||||
onClick: handleProcess.bind(null, record),
|
||||
auth: 'mes:mes_xsl_equip_inspect_record:edit',
|
||||
});
|
||||
}
|
||||
return actions;
|
||||
}
|
||||
|
||||
async function handleDelete(record) {
|
||||
await deleteOne({ id: record.id }, handleSuccess);
|
||||
}
|
||||
|
||||
async function batchHandleDelete() {
|
||||
await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
|
||||
}
|
||||
|
||||
function handleSuccess() {
|
||||
selectedRowKeys.value = [];
|
||||
reload();
|
||||
}
|
||||
|
||||
function getDropDownAction(record: Recordable) {
|
||||
if (record.recordStatus === 'pending') {
|
||||
return [
|
||||
{ label: '详情', onClick: handleDetail.bind(null, record) },
|
||||
{
|
||||
label: '删除',
|
||||
popConfirm: { title: '是否确认删除', confirm: handleDelete.bind(null, record) },
|
||||
auth: 'mes:mes_xsl_equip_inspect_record:delete',
|
||||
},
|
||||
];
|
||||
}
|
||||
return [];
|
||||
}
|
||||
</script>
|
||||
@@ -0,0 +1,63 @@
|
||||
<template>
|
||||
<BasicModal v-bind="$attrs" destroyOnClose title="不合格记录处理" width="520px" @register="registerModal" @ok="handleSubmit">
|
||||
<BasicForm @register="registerForm" />
|
||||
</BasicModal>
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import dayjs from 'dayjs';
|
||||
import { BasicModal, useModalInner } from '/@/components/Modal';
|
||||
import { BasicForm, useForm } from '/@/components/Form/index';
|
||||
import { useMessage } from '/@/hooks/web/useMessage';
|
||||
import { useUserStore } from '/@/store/modules/user';
|
||||
import { handleFormSchema } from '../MesXslEquipInspectRecord.data';
|
||||
import { handleFailRecord } from '../MesXslEquipInspectRecord.api';
|
||||
|
||||
const emit = defineEmits(['register', 'success']);
|
||||
const { createMessage } = useMessage();
|
||||
const userStore = useUserStore();
|
||||
|
||||
const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
|
||||
labelWidth: 100,
|
||||
schemas: handleFormSchema,
|
||||
showActionButtonGroup: false,
|
||||
baseColProps: { span: 24 },
|
||||
});
|
||||
|
||||
const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
|
||||
await resetFields();
|
||||
setModalProps({ confirmLoading: false });
|
||||
const record = data?.record;
|
||||
if (!record?.id) {
|
||||
return;
|
||||
}
|
||||
const user = userStore.getUserInfo || {};
|
||||
await setFieldsValue({
|
||||
id: record.id,
|
||||
handlerUserId: user.id,
|
||||
handlerUsername: user.username,
|
||||
handlerRealname: user.realname,
|
||||
handleTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
|
||||
});
|
||||
});
|
||||
|
||||
async function handleSubmit() {
|
||||
try {
|
||||
const values = await validate();
|
||||
if (!values.handlerUserId) {
|
||||
createMessage.warning('请选择处理人');
|
||||
return;
|
||||
}
|
||||
if (!values.handleTime) {
|
||||
createMessage.warning('请选择处理时间');
|
||||
return;
|
||||
}
|
||||
setModalProps({ confirmLoading: true });
|
||||
await handleFailRecord(values);
|
||||
closeModal();
|
||||
emit('success');
|
||||
} finally {
|
||||
setModalProps({ confirmLoading: false });
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@@ -0,0 +1,173 @@
|
||||
<template>
|
||||
<BasicModal
|
||||
v-bind="$attrs"
|
||||
destroyOnClose
|
||||
:title="title"
|
||||
width="1150px"
|
||||
@register="registerModal"
|
||||
@ok="handleSubmit"
|
||||
>
|
||||
<BasicForm @register="registerForm" />
|
||||
<a-divider orientation="left">点检项目明细（来自设备点检配置，只读）</a-divider>
|
||||
<JVxeTable
|
||||
v-if="tableReady"
|
||||
ref="lineTableRef"
|
||||
row-number
|
||||
keep-source
|
||||
:insert-row="false"
|
||||
:toolbar="false"
|
||||
:row-selection="false"
|
||||
:max-height="400"
|
||||
:loading="lineLoading"
|
||||
:columns="lineColumns"
|
||||
:dataSource="lineDataSource"
|
||||
/>
|
||||
</BasicModal>
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { computed, ref, unref } from 'vue';
|
||||
import dayjs from 'dayjs';
|
||||
import { BasicModal, useModalInner } from '/@/components/Modal';
|
||||
import { BasicForm, useForm } from '/@/components/Form/index';
|
||||
import type { JVxeColumn, JVxeTableInstance } from '/@/components/jeecg/JVxeTable/types';
|
||||
import { useMessage } from '/@/hooks/web/useMessage';
|
||||
import { useUserStore } from '/@/store/modules/user';
|
||||
import { formSchema, lineJVxeColumns, processDisplayFormSchema } from '../MesXslEquipInspectRecord.data';
|
||||
import { saveOrUpdate, queryById, queryLineListByRecordId } from '../MesXslEquipInspectRecord.api';
|
||||
|
||||
const emit = defineEmits(['register', 'success']);
|
||||
const { createMessage } = useMessage();
|
||||
const userStore = useUserStore();
|
||||
const isDetail = ref(false);
|
||||
const showFooterFlag = ref(true);
|
||||
const tableReady = ref(false);
|
||||
const lineLoading = ref(false);
|
||||
const lineDataSource = ref<Recordable[]>([]);
|
||||
const lineTableRef = ref<JVxeTableInstance>();
|
||||
|
||||
const lineColumns = computed<JVxeColumn[]>(() =>
|
||||
lineJVxeColumns.map((col) => {
|
||||
const editable = col.key === 'lineInspectResult' || col.key === 'pictureFiles';
|
||||
if (editable) {
|
||||
return { ...col, disabled: !showFooterFlag.value };
|
||||
}
|
||||
return { ...col, disabled: true };
|
||||
}),
|
||||
);
|
||||
|
||||
const showProcessFields = ref(false);
|
||||
|
||||
const [registerForm, { resetFields, setFieldsValue, validate, setProps, resetSchema }] = useForm({
|
||||
labelWidth: 110,
|
||||
schemas: formSchema,
|
||||
showActionButtonGroup: false,
|
||||
baseColProps: { span: 12 },
|
||||
});
|
||||
|
||||
const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
|
||||
tableReady.value = false;
|
||||
lineDataSource.value = [];
|
||||
await resetFields();
|
||||
const editable = !!data?.showFooter;
|
||||
setModalProps({ confirmLoading: false, showCancelBtn: editable, showOkBtn: editable });
|
||||
isDetail.value = !editable;
|
||||
showFooterFlag.value = editable;
|
||||
setProps({ disabled: !editable });
|
||||
showProcessFields.value = false;
|
||||
await resetSchema(formSchema);
|
||||
|
||||
if (data?.record?.id) {
|
||||
lineLoading.value = true;
|
||||
try {
|
||||
const mainRaw = await queryById({ id: data.record.id });
|
||||
const m = (mainRaw as any)?.id != null ? mainRaw : (mainRaw as any)?.result ?? mainRaw;
|
||||
if (editable && m.recordStatus !== 'pending') {
|
||||
createMessage.warning('仅待点检记录可录入点检结果');
|
||||
setModalProps({ showOkBtn: false, showCancelBtn: true });
|
||||
isDetail.value = true;
|
||||
showFooterFlag.value = false;
|
||||
setProps({ disabled: true });
|
||||
}
|
||||
const linesRaw = await queryLineListByRecordId({ id: data.record.id });
|
||||
const list = Array.isArray(linesRaw) ? linesRaw : (linesRaw as any)?.result ?? [];
|
||||
const user = userStore.getUserInfo || {};
|
||||
const patch: Recordable = { ...m };
|
||||
if (editable && showFooterFlag.value) {
|
||||
if (!patch.inspectDate) {
|
||||
patch.inspectDate = dayjs().format('YYYY-MM-DD');
|
||||
}
|
||||
if (!patch.inspectorRealname) {
|
||||
patch.inspectorUserId = user.id;
|
||||
patch.inspectorUsername = user.username;
|
||||
patch.inspectorRealname = user.realname;
|
||||
}
|
||||
}
|
||||
await setFieldsValue(patch);
|
||||
if (!editable && m.inspectResult === 'fail') {
|
||||
showProcessFields.value = true;
|
||||
await resetSchema([...formSchema, ...processDisplayFormSchema]);
|
||||
await setFieldsValue(patch);
|
||||
}
|
||||
lineDataSource.value = [...(list || [])];
|
||||
} finally {
|
||||
lineLoading.value = false;
|
||||
}
|
||||
}
|
||||
tableReady.value = true;
|
||||
});
|
||||
|
||||
const title = computed(() =>
|
||||
unref(isDetail) ? '点检保养记录详情' : '录入点检结果',
|
||||
);
|
||||
|
||||
async function handleSubmit() {
|
||||
if (!showFooterFlag.value) {
|
||||
return;
|
||||
}
|
||||
try {
|
||||
const values = await validate();
|
||||
const lineRef = lineTableRef.value as any;
|
||||
const tableData = (lineRef?.getTableData?.() || lineDataSource.value || []) as Recordable[];
|
||||
const lineList = tableData
|
||||
.filter((r) => r && r.equipInspectConfigLineId)
|
||||
.map((r) => ({
|
||||
id: r.id,
|
||||
equipInspectConfigLineId: r.equipInspectConfigLineId,
|
||||
inspectMaintainItemId: r.inspectMaintainItemId,
|
||||
itemCode: r.itemCode,
|
||||
itemName: r.itemName,
|
||||
itemCategory: r.itemCategory,
|
||||
itemType: r.itemType,
|
||||
equipmentPartName: r.equipmentPartName,
|
||||
equipmentSubPartName: r.equipmentSubPartName,
|
||||
inspectMethod: r.inspectMethod,
|
||||
judgmentCriteria: r.judgmentCriteria,
|
||||
lineInspectResult: r.lineInspectResult,
|
||||
pictureFiles: r.pictureFiles,
|
||||
}));
|
||||
if (!lineList.length) {
|
||||
createMessage.warning('点检明细不能为空');
|
||||
return;
|
||||
}
|
||||
if (!values.inspectResult) {
|
||||
createMessage.warning('请选择点检结果');
|
||||
return;
|
||||
}
|
||||
if (!values.inspectDate) {
|
||||
createMessage.warning('请选择点检日期');
|
||||
return;
|
||||
}
|
||||
if (!values.inspectorRealname) {
|
||||
createMessage.warning('点检人不能为空');
|
||||
return;
|
||||
}
|
||||
setModalProps({ confirmLoading: true });
|
||||
await saveOrUpdate({ ...values, recordStatus: 'done', lineList }, true);
|
||||
closeModal();
|
||||
emit('success');
|
||||
} finally {
|
||||
setModalProps({ confirmLoading: false });
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@@ -5,6 +5,24 @@
|
||||
<a-button type="primary" v-auth="'mes:mes_xsl_equipment_ledger:add'" @click="handleAdd" preIcon="ant-design:plus-outlined">
|
||||
新增
|
||||
</a-button>
|
||||
<a-button
|
||||
type="primary"
|
||||
v-auth="'mes:mes_xsl_equip_inspect_record:add'"
|
||||
:disabled="selectedRowKeys.length === 0"
|
||||
preIcon="ant-design:audit-outlined"
|
||||
@click="handleBatchCreateRecord('inspect')"
|
||||
>
|
||||
点检
|
||||
</a-button>
|
||||
<a-button
|
||||
type="primary"
|
||||
v-auth="'mes:mes_xsl_equip_inspect_record:add'"
|
||||
:disabled="selectedRowKeys.length === 0"
|
||||
preIcon="ant-design:tool-outlined"
|
||||
@click="handleBatchCreateRecord('maintain')"
|
||||
>
|
||||
保养
|
||||
</a-button>
|
||||
<a-button
|
||||
type="primary"
|
||||
v-auth="'mes:mes_xsl_equipment_ledger:exportXls'"
|
||||
@@ -53,10 +71,14 @@
|
||||
import { BasicTable, TableAction } from '/@/components/Table';
|
||||
import { useModal } from '/@/components/Modal';
|
||||
import { useListPage } from '/@/hooks/system/useListPage';
|
||||
import { useMessage } from '/@/hooks/web/useMessage';
|
||||
import Icon from '/@/components/Icon';
|
||||
import MesXslEquipmentLedgerModal from './components/MesXslEquipmentLedgerModal.vue';
|
||||
import { columns, searchFormSchema } from './MesXslEquipmentLedger.data';
|
||||
import { list, deleteOne, batchDelete, getExportUrl, getImportUrl } from './MesXslEquipmentLedger.api';
|
||||
import { batchCreateFromEquipment } from '../mesXslEquipInspectRecord/MesXslEquipInspectRecord.api';
|
||||
|
||||
const { createMessage, createConfirm } = useMessage();
|
||||
|
||||
const [registerModal, { openModal }] = useModal();
|
||||
|
||||
@@ -87,7 +109,7 @@
|
||||
},
|
||||
});
|
||||
|
||||
const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
|
||||
const [registerTable, { reload, getSelectRows }, { rowSelection, selectedRowKeys }] = tableContext;
|
||||
|
||||
function handleAdd() {
|
||||
openModal(true, { isUpdate: false, showFooter: true });
|
||||
@@ -114,6 +136,46 @@
|
||||
selectedRowKeys.value = [];
|
||||
}
|
||||
|
||||
function handleBatchCreateRecord(recordType: 'inspect' | 'maintain') {
|
||||
const rows = (getSelectRows?.() || []) as Recordable[];
|
||||
if (!rows.length) {
|
||||
createMessage.warning('请先勾选设备');
|
||||
return;
|
||||
}
|
||||
const ids = rows.map((r) => r.id).filter(Boolean);
|
||||
const typeLabel = recordType === 'inspect' ? '点检' : '保养';
|
||||
createConfirm({
|
||||
iconType: 'info',
|
||||
title: `生成${typeLabel}记录`,
|
||||
content: `确定为选中的 ${ids.length} 台设备各生成一条${typeLabel}记录？`,
|
||||
okText: '确定',
|
||||
cancelText: '取消',
|
||||
onOk: async () => {
|
||||
try {
|
||||
const res = await batchCreateFromEquipment({ equipmentLedgerIds: ids, recordType });
|
||||
const data = (res as any)?.result ?? res;
|
||||
const failList: string[] = data?.failMessages || [];
|
||||
const successCount = data?.successCount ?? 0;
|
||||
if (successCount > 0 && !failList.length) {
|
||||
createMessage.success(`成功生成 ${successCount} 条${typeLabel}记录`);
|
||||
handleSuccess();
|
||||
} else if (successCount > 0 && failList.length) {
|
||||
createMessage.warning(`成功生成 ${successCount} 条；未生成：${failList.join('；')}`);
|
||||
handleSuccess();
|
||||
} else if (failList.length) {
|
||||
createMessage.warning(failList.join('；'));
|
||||
} else {
|
||||
createMessage.warning((res as any)?.message || `未生成任何${typeLabel}记录`);
|
||||
}
|
||||
} catch (e: any) {
|
||||
const errMsg =
|
||||
e?.response?.data?.message || e?.message || `生成${typeLabel}记录失败`;
|
||||
createMessage.warning(errMsg);
|
||||
}
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
function getDropDownAction(record: Recordable) {
|
||||
return [
|
||||
{ label: '详情', onClick: handleDetail.bind(null, record) },
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
import { defHttp } from '/@/utils/http/axios';
|
||||
import { Modal } from 'ant-design-vue';
|
||||
|
||||
enum Api {
|
||||
list = '/xslmes/mesXslFormulaSpec/list',
|
||||
save = '/xslmes/mesXslFormulaSpec/add',
|
||||
edit = '/xslmes/mesXslFormulaSpec/edit',
|
||||
deleteOne = '/xslmes/mesXslFormulaSpec/delete',
|
||||
deleteBatch = '/xslmes/mesXslFormulaSpec/deleteBatch',
|
||||
importExcel = '/xslmes/mesXslFormulaSpec/importExcel',
|
||||
exportXls = '/xslmes/mesXslFormulaSpec/exportXls',
|
||||
queryById = '/xslmes/mesXslFormulaSpec/queryById',
|
||||
queryLineList = '/xslmes/mesXslFormulaSpec/queryLineListByMainId',
|
||||
generateRubberCode = '/xslmes/mesXslFormulaSpec/generateRubberCode',
|
||||
getRubberContentSetting = '/xslmes/mesXslFormulaSpec/getRubberContentSetting',
|
||||
saveRubberContentSetting = '/xslmes/mesXslFormulaSpec/saveRubberContentSetting',
|
||||
}
|
||||
|
||||
export const getExportUrl = Api.exportXls;
|
||||
export const getImportUrl = Api.importExcel;
|
||||
export const list = (params) => defHttp.get({ url: Api.list, params });
|
||||
export const queryById = (params) => defHttp.get({ url: Api.queryById, params });
|
||||
export const queryLineListByMainId = (params) => defHttp.get({ url: Api.queryLineList, params });
|
||||
export const generateRubberCode = (params) =>
|
||||
defHttp.get({ url: Api.generateRubberCode, params }, { successMessageMode: 'none' });
|
||||
export const getRubberContentSetting = () => defHttp.get({ url: Api.getRubberContentSetting });
|
||||
export const saveRubberContentSetting = (params) => defHttp.post({ url: Api.saveRubberContentSetting, params });
|
||||
|
||||
export const deleteOne = (params, handleSuccess) =>
|
||||
defHttp.delete({ url: Api.deleteOne, params }, { joinParamsToUrl: true }).then(() => handleSuccess());
|
||||
|
||||
export const batchDelete = (params, handleSuccess) => {
|
||||
Modal.confirm({
|
||||
title: '确认删除',
|
||||
content: '是否删除选中数据',
|
||||
okText: '确认',
|
||||
cancelText: '取消',
|
||||
onOk: () =>
|
||||
defHttp.delete({ url: Api.deleteBatch, data: params }, { joinParamsToUrl: true }).then(() => handleSuccess()),
|
||||
});
|
||||
};
|
||||
|
||||
export const saveOrUpdate = (params, isUpdate) => defHttp.post({ url: isUpdate ? Api.edit : Api.save, params });
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,168 @@
|
||||
<template>
|
||||
<div>
|
||||
<BasicTable @register="registerTable" :rowSelection="rowSelection">
|
||||
<template #tableTitle>
|
||||
<a-button type="primary" v-auth="'xslmes:mes_xsl_formula_spec:add'" @click="handleAdd" preIcon="ant-design:plus-outlined">
|
||||
新增
|
||||
</a-button>
|
||||
<a-button
|
||||
type="primary"
|
||||
v-auth="'xslmes:mes_xsl_formula_spec:exportXls'"
|
||||
preIcon="ant-design:export-outlined"
|
||||
@click="onExportXls"
|
||||
>
|
||||
导出
|
||||
</a-button>
|
||||
<j-upload-button
|
||||
type="primary"
|
||||
v-auth="'xslmes:mes_xsl_formula_spec: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="'xslmes:mes_xsl_formula_spec:deleteBatch'">
|
||||
批量操作
|
||||
<Icon icon="mdi:chevron-down" />
|
||||
</a-button>
|
||||
</a-dropdown>
|
||||
<super-query :config="superQueryConfig" @search="handleSuperQuery" />
|
||||
</template>
|
||||
<template #action="{ record }">
|
||||
<TableAction :actions="getTableActions(record)" :dropDownActions="getDropDownAction(record)" />
|
||||
</template>
|
||||
</BasicTable>
|
||||
<MesXslFormulaSpecModal @register="registerModal" @success="handleSuccess" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script lang="ts" name="xslmes-mesXslFormulaSpec" setup>
|
||||
import { reactive } from 'vue';
|
||||
import { BasicTable, TableAction } from '/@/components/Table';
|
||||
import { useModal } from '/@/components/Modal';
|
||||
import { useListPage } from '/@/hooks/system/useListPage';
|
||||
import Icon from '/@/components/Icon';
|
||||
import MesXslFormulaSpecModal from './components/MesXslFormulaSpecModal.vue';
|
||||
import { columns, searchFormSchema, superQuerySchema } from './MesXslFormulaSpec.data';
|
||||
import { list, deleteOne, batchDelete, getExportUrl, getImportUrl } from './MesXslFormulaSpec.api';
|
||||
|
||||
const queryParam = reactive<any>({});
|
||||
const [registerModal, { openModal }] = useModal();
|
||||
|
||||
const { tableContext, onExportXls, onImportXls } = useListPage({
|
||||
tableProps: {
|
||||
title: '配合示方',
|
||||
api: list,
|
||||
columns,
|
||||
canResize: true,
|
||||
formConfig: {
|
||||
schemas: searchFormSchema,
|
||||
labelWidth: 90,
|
||||
autoSubmitOnEnter: true,
|
||||
showAdvancedButton: true,
|
||||
},
|
||||
actionColumn: {
|
||||
title: '操作',
|
||||
dataIndex: 'action',
|
||||
width: 160,
|
||||
fixed: 'right',
|
||||
slots: { customRender: 'action' },
|
||||
},
|
||||
beforeFetch: (params) => Object.assign(params, queryParam),
|
||||
},
|
||||
exportConfig: {
|
||||
name: '配合示方',
|
||||
url: getExportUrl,
|
||||
params: queryParam,
|
||||
},
|
||||
importConfig: {
|
||||
url: getImportUrl,
|
||||
success: handleSuccess,
|
||||
},
|
||||
});
|
||||
|
||||
const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
|
||||
const superQueryConfig = reactive(superQuerySchema);
|
||||
|
||||
function handleSuperQuery(params) {
|
||||
Object.keys(params).forEach((k) => {
|
||||
queryParam[k] = params[k];
|
||||
});
|
||||
reload();
|
||||
}
|
||||
|
||||
function handleAdd() {
|
||||
openModal(true, { isUpdate: false, showFooter: true });
|
||||
}
|
||||
|
||||
function handleEdit(record: Recordable) {
|
||||
openModal(true, { record, isUpdate: true, showFooter: true });
|
||||
}
|
||||
|
||||
function handleDetail(record: Recordable) {
|
||||
openModal(true, { record, isUpdate: true, showFooter: false });
|
||||
}
|
||||
|
||||
function handleDelete(record: Recordable) {
|
||||
deleteOne({ id: record.id }, handleSuccess);
|
||||
}
|
||||
|
||||
function batchHandleDelete() {
|
||||
batchDelete({ ids: selectedRowKeys.value.join(',') }, handleSuccess);
|
||||
}
|
||||
|
||||
function handleSuccess() {
|
||||
reload();
|
||||
selectedRowKeys.value = [];
|
||||
}
|
||||
|
||||
function canEdit(record: Recordable) {
|
||||
return !record?.status || record.status === 'compile';
|
||||
}
|
||||
|
||||
function getTableActions(record: Recordable) {
|
||||
return [
|
||||
{
|
||||
label: '编辑',
|
||||
onClick: handleEdit.bind(null, record),
|
||||
auth: 'xslmes:mes_xsl_formula_spec:edit',
|
||||
ifShow: canEdit(record),
|
||||
},
|
||||
{
|
||||
label: '详情',
|
||||
onClick: handleDetail.bind(null, record),
|
||||
ifShow: !canEdit(record),
|
||||
},
|
||||
];
|
||||
}
|
||||
|
||||
function getDropDownAction(record: Recordable) {
|
||||
return [
|
||||
{ label: '详情', onClick: handleDetail.bind(null, record), ifShow: canEdit(record) },
|
||||
{
|
||||
label: '删除',
|
||||
popConfirm: { title: '是否确认删除', confirm: handleDelete.bind(null, record) },
|
||||
auth: 'xslmes:mes_xsl_formula_spec:delete',
|
||||
ifShow: canEdit(record),
|
||||
},
|
||||
];
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="less" scoped>
|
||||
:deep(.ant-table) {
|
||||
.ant-table-thead > tr > th {
|
||||
background: #fafafa;
|
||||
font-weight: 600;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,168 @@
|
||||
<template>
|
||||
<Popover
|
||||
v-model:open="popoverOpen"
|
||||
trigger="click"
|
||||
placement="bottomRight"
|
||||
:overlayClassName="`${prefixCls}__popover`"
|
||||
@open-change="handleOpenChange"
|
||||
>
|
||||
<template #title>
|
||||
<div :class="`${prefixCls}__title`">
|
||||
<Checkbox :indeterminate="indeterminate" :checked="checkAll" @change="onCheckAllChange">列展示</Checkbox>
|
||||
</div>
|
||||
</template>
|
||||
<template #content>
|
||||
<div :class="`${prefixCls}__list`">
|
||||
<CheckboxGroup v-model:value="draftCheckedList" :options="columnOptions" />
|
||||
</div>
|
||||
<div :class="`${prefixCls}__footer`">
|
||||
<a-button size="small" @click="handleReset">重置</a-button>
|
||||
<a-button size="small" type="primary" @click="handleSave">保存</a-button>
|
||||
</div>
|
||||
</template>
|
||||
<a-tooltip title="列设置">
|
||||
<a-button size="small" class="formula-line-column-setting-btn" @click.stop>
|
||||
<Icon icon="ant-design:setting-outlined" />
|
||||
</a-button>
|
||||
</a-tooltip>
|
||||
</Popover>
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { computed, ref, type PropType } from 'vue';
|
||||
import { Popover, Checkbox } from 'ant-design-vue';
|
||||
import type { CheckboxChangeEvent } from 'ant-design-vue/lib/checkbox/interface';
|
||||
import { Icon } from '/@/components/Icon';
|
||||
import { useMessage } from '/@/hooks/web/useMessage';
|
||||
import {
|
||||
FORMULA_LINE_LOCKED_COLUMN_KEYS,
|
||||
getFormulaLineColumnSettingItems,
|
||||
saveFormulaLineHiddenColumnKeys,
|
||||
type FormulaLineColumnSettingItem,
|
||||
} from '../MesXslFormulaSpec.data';
|
||||
|
||||
const CheckboxGroup = Checkbox.Group;
|
||||
const prefixCls = 'formula-line-column-setting';
|
||||
const { createMessage } = useMessage();
|
||||
|
||||
const props = defineProps({
|
||||
hiddenKeys: {
|
||||
type: Array as PropType<string[]>,
|
||||
default: () => [],
|
||||
},
|
||||
});
|
||||
|
||||
const emit = defineEmits<{
|
||||
(e: 'update:hiddenKeys', value: string[]): void;
|
||||
(e: 'change', value: string[]): void;
|
||||
}>();
|
||||
|
||||
const popoverOpen = ref(false);
|
||||
const columnItems = ref<FormulaLineColumnSettingItem[]>(getFormulaLineColumnSettingItems());
|
||||
const allKeys = computed(() => columnItems.value.map((item) => item.key));
|
||||
const lockableKeys = computed(() => columnItems.value.filter((item) => !item.locked).map((item) => item.key));
|
||||
|
||||
/** 弹窗内草稿勾选状态，保存后才应用到表格 */
|
||||
const draftCheckedList = ref<string[]>([]);
|
||||
|
||||
const columnOptions = computed(() =>
|
||||
columnItems.value.map((item) => ({
|
||||
label: item.title,
|
||||
value: item.key,
|
||||
disabled: item.locked,
|
||||
})),
|
||||
);
|
||||
|
||||
const checkAll = computed(() => {
|
||||
const keys = lockableKeys.value;
|
||||
return keys.length > 0 && keys.every((key) => draftCheckedList.value.includes(key));
|
||||
});
|
||||
|
||||
const indeterminate = computed(() => {
|
||||
const keys = lockableKeys.value;
|
||||
const checkedCount = keys.filter((key) => draftCheckedList.value.includes(key)).length;
|
||||
return checkedCount > 0 && checkedCount < keys.length;
|
||||
});
|
||||
|
||||
function ensureLockedChecked() {
|
||||
const next = new Set(draftCheckedList.value);
|
||||
FORMULA_LINE_LOCKED_COLUMN_KEYS.forEach((key) => next.add(key));
|
||||
draftCheckedList.value = Array.from(next);
|
||||
}
|
||||
|
||||
function syncDraftFromHidden(hiddenKeys: string[]) {
|
||||
const hiddenSet = new Set(hiddenKeys || []);
|
||||
draftCheckedList.value = allKeys.value.filter((key) => !hiddenSet.has(key));
|
||||
ensureLockedChecked();
|
||||
}
|
||||
|
||||
function buildHiddenKeysFromDraft() {
|
||||
ensureLockedChecked();
|
||||
return allKeys.value.filter((key) => !draftCheckedList.value.includes(key));
|
||||
}
|
||||
|
||||
function handleOpenChange(open: boolean) {
|
||||
if (open) {
|
||||
syncDraftFromHidden(props.hiddenKeys);
|
||||
}
|
||||
}
|
||||
|
||||
function onCheckAllChange(e: CheckboxChangeEvent) {
|
||||
draftCheckedList.value = e.target.checked ? [...allKeys.value] : [...FORMULA_LINE_LOCKED_COLUMN_KEYS];
|
||||
}
|
||||
|
||||
function handleReset() {
|
||||
draftCheckedList.value = [...allKeys.value];
|
||||
}
|
||||
|
||||
function handleSave() {
|
||||
const hiddenKeys = buildHiddenKeysFromDraft();
|
||||
saveFormulaLineHiddenColumnKeys(hiddenKeys);
|
||||
emit('update:hiddenKeys', hiddenKeys);
|
||||
emit('change', hiddenKeys);
|
||||
createMessage.success('保存成功');
|
||||
popoverOpen.value = false;
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="less" scoped>
|
||||
.formula-line-column-setting-btn {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
padding-inline: 8px;
|
||||
}
|
||||
</style>
|
||||
|
||||
<style lang="less">
|
||||
.formula-line-column-setting__popover {
|
||||
.formula-line-column-setting__title {
|
||||
min-width: 180px;
|
||||
}
|
||||
|
||||
.formula-line-column-setting__list {
|
||||
max-height: 320px;
|
||||
overflow-y: auto;
|
||||
margin-bottom: 8px;
|
||||
|
||||
.ant-checkbox-group {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 4px;
|
||||
}
|
||||
|
||||
.ant-checkbox-group-item {
|
||||
margin-inline-start: 0;
|
||||
white-space: nowrap;
|
||||
}
|
||||
}
|
||||
|
||||
.formula-line-column-setting__footer {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
gap: 8px;
|
||||
padding-top: 4px;
|
||||
border-top: 1px solid #f0f0f0;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,240 @@
|
||||
<template>
|
||||
|
||||
<BasicModal
|
||||
|
||||
v-bind="$attrs"
|
||||
|
||||
title="含胶率物料小类设置"
|
||||
|
||||
:width="640"
|
||||
|
||||
@register="registerModal"
|
||||
|
||||
@ok="handleSubmit"
|
||||
|
||||
>
|
||||
|
||||
<a-form layout="vertical" class="rubber-content-setting-form">
|
||||
|
||||
<a-form-item label="天然橡胶">
|
||||
|
||||
<a-select
|
||||
|
||||
v-model:value="formState.naturalMinorCategoryIds"
|
||||
|
||||
mode="multiple"
|
||||
|
||||
allowClear
|
||||
|
||||
showSearch
|
||||
|
||||
optionFilterProp="label"
|
||||
|
||||
placeholder="请选择计入天然橡胶的物料分类"
|
||||
|
||||
:options="minorCategoryOptions"
|
||||
|
||||
:loading="optionsLoading"
|
||||
|
||||
/>
|
||||
|
||||
</a-form-item>
|
||||
|
||||
<a-form-item label="合成橡胶">
|
||||
|
||||
<a-select
|
||||
|
||||
v-model:value="formState.syntheticMinorCategoryIds"
|
||||
|
||||
mode="multiple"
|
||||
|
||||
allowClear
|
||||
|
||||
showSearch
|
||||
|
||||
optionFilterProp="label"
|
||||
|
||||
placeholder="请选择计入合成橡胶的物料分类"
|
||||
|
||||
:options="minorCategoryOptions"
|
||||
|
||||
:loading="optionsLoading"
|
||||
|
||||
/>
|
||||
|
||||
</a-form-item>
|
||||
|
||||
<div class="setting-tip">选项来自系统分类字典「MES物料分类」全部节点，保存后含胶率将按所选分类汇总明细行重量%。</div>
|
||||
|
||||
</a-form>
|
||||
|
||||
</BasicModal>
|
||||
|
||||
</template>
|
||||
|
||||
|
||||
|
||||
<script lang="ts" setup>
|
||||
|
||||
import { reactive, ref, watch } from 'vue';
|
||||
|
||||
import { BasicModal, useModalInner } from '/@/components/Modal';
|
||||
|
||||
import { getRubberContentSetting, saveRubberContentSetting } from '../MesXslFormulaSpec.api';
|
||||
|
||||
import { fetchMaterialCategoryOptions } from '../MesXslFormulaSpec.data';
|
||||
|
||||
import { useMessage } from '/@/hooks/web/useMessage';
|
||||
|
||||
|
||||
|
||||
const emit = defineEmits(['register', 'success']);
|
||||
|
||||
const { createMessage } = useMessage();
|
||||
|
||||
|
||||
|
||||
const optionsLoading = ref(false);
|
||||
|
||||
const minorCategoryOptions = ref<Array<{ label: string; value: string }>>([]);
|
||||
|
||||
const formState = reactive({
|
||||
|
||||
naturalMinorCategoryIds: [] as string[],
|
||||
|
||||
syntheticMinorCategoryIds: [] as string[],
|
||||
|
||||
});
|
||||
|
||||
|
||||
|
||||
const [registerModal, { setModalProps, closeModal, getOpen }] = useModalInner();
|
||||
|
||||
watch(
|
||||
() => getOpen.value,
|
||||
async (open) => {
|
||||
if (!open) {
|
||||
return;
|
||||
}
|
||||
setModalProps({ confirmLoading: false });
|
||||
await Promise.all([loadMinorCategoryOptions(), loadSetting()]);
|
||||
},
|
||||
);
|
||||
|
||||
|
||||
|
||||
async function loadMinorCategoryOptions() {
|
||||
|
||||
optionsLoading.value = true;
|
||||
|
||||
try {
|
||||
|
||||
minorCategoryOptions.value = await fetchMaterialCategoryOptions();
|
||||
|
||||
if (!minorCategoryOptions.value.length) {
|
||||
|
||||
createMessage.warning('未加载到 MES物料分类，请先在分类字典中维护。');
|
||||
|
||||
}
|
||||
|
||||
} catch {
|
||||
|
||||
minorCategoryOptions.value = [];
|
||||
|
||||
createMessage.warning('加载 MES物料分类 失败，请检查分类字典是否已配置。');
|
||||
|
||||
} finally {
|
||||
|
||||
optionsLoading.value = false;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
async function loadSetting() {
|
||||
|
||||
try {
|
||||
|
||||
const raw = await getRubberContentSetting();
|
||||
|
||||
const setting = (raw as Recordable)?.naturalMinorCategoryIds != null ? raw : (raw as Recordable)?.result ?? raw;
|
||||
|
||||
formState.naturalMinorCategoryIds = [...((setting as Recordable)?.naturalMinorCategoryIds || [])];
|
||||
|
||||
formState.syntheticMinorCategoryIds = [...((setting as Recordable)?.syntheticMinorCategoryIds || [])];
|
||||
|
||||
} catch {
|
||||
|
||||
formState.naturalMinorCategoryIds = [];
|
||||
|
||||
formState.syntheticMinorCategoryIds = [];
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
async function handleSubmit() {
|
||||
|
||||
try {
|
||||
|
||||
setModalProps({ confirmLoading: true });
|
||||
|
||||
await saveRubberContentSetting({
|
||||
|
||||
naturalMinorCategoryIds: formState.naturalMinorCategoryIds,
|
||||
|
||||
syntheticMinorCategoryIds: formState.syntheticMinorCategoryIds,
|
||||
|
||||
});
|
||||
|
||||
createMessage.success('保存成功');
|
||||
|
||||
closeModal();
|
||||
|
||||
emit('success', {
|
||||
|
||||
naturalMinorCategoryIds: [...formState.naturalMinorCategoryIds],
|
||||
|
||||
syntheticMinorCategoryIds: [...formState.syntheticMinorCategoryIds],
|
||||
|
||||
});
|
||||
|
||||
} finally {
|
||||
|
||||
setModalProps({ confirmLoading: false });
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
</script>
|
||||
|
||||
|
||||
|
||||
<style scoped lang="less">
|
||||
|
||||
.rubber-content-setting-form {
|
||||
|
||||
padding-top: 8px;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
.setting-tip {
|
||||
|
||||
color: rgba(0, 0, 0, 0.45);
|
||||
|
||||
font-size: 12px;
|
||||
|
||||
line-height: 1.6;
|
||||
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -145,7 +145,6 @@ export const formSchema: FormSchema[] = [
|
||||
component: 'Input',
|
||||
componentProps: { disabled: true, bordered: false, placeholder: '保存后按创建人显示' },
|
||||
colProps: colHalf,
|
||||
itemProps: { class: 'ps-workflow-item' },
|
||||
},
|
||||
{
|
||||
label: '担当',
|
||||
@@ -225,7 +224,6 @@ export const formSchema: FormSchema[] = [
|
||||
component: 'Input',
|
||||
componentProps: { disabled: true, bordered: false },
|
||||
colProps: colHalf,
|
||||
itemProps: { class: 'ps-workflow-item' },
|
||||
ifShow: ({ values }) => !!values.proofreadBy,
|
||||
},
|
||||
{
|
||||
@@ -234,7 +232,6 @@ export const formSchema: FormSchema[] = [
|
||||
component: 'Input',
|
||||
componentProps: { disabled: true, bordered: false },
|
||||
colProps: colHalf,
|
||||
itemProps: { class: 'ps-workflow-item' },
|
||||
ifShow: ({ values }) => !!values.proofreadTime,
|
||||
},
|
||||
{
|
||||
@@ -243,7 +240,6 @@ export const formSchema: FormSchema[] = [
|
||||
component: 'Input',
|
||||
componentProps: { disabled: true, bordered: false },
|
||||
colProps: colHalf,
|
||||
itemProps: { class: 'ps-workflow-item' },
|
||||
ifShow: ({ values }) => !!values.auditBy,
|
||||
},
|
||||
{
|
||||
@@ -252,7 +248,6 @@ export const formSchema: FormSchema[] = [
|
||||
component: 'Input',
|
||||
componentProps: { disabled: true, bordered: false },
|
||||
colProps: colHalf,
|
||||
itemProps: { class: 'ps-workflow-item' },
|
||||
ifShow: ({ values }) => !!values.auditTime,
|
||||
},
|
||||
{
|
||||
@@ -261,7 +256,6 @@ export const formSchema: FormSchema[] = [
|
||||
component: 'Input',
|
||||
componentProps: { disabled: true, bordered: false },
|
||||
colProps: colHalf,
|
||||
itemProps: { class: 'ps-workflow-item' },
|
||||
ifShow: ({ values }) => !!values.approveBy,
|
||||
},
|
||||
{
|
||||
@@ -270,7 +264,6 @@ export const formSchema: FormSchema[] = [
|
||||
component: 'Input',
|
||||
componentProps: { disabled: true, bordered: false },
|
||||
colProps: colHalf,
|
||||
itemProps: { class: 'ps-workflow-item' },
|
||||
ifShow: ({ values }) => !!values.approveTime,
|
||||
},
|
||||
];
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
@ok="handleSubmit"
|
||||
>
|
||||
<div class="ps-compile-modal-body">
|
||||
<BasicForm @register="registerForm" />
|
||||
<BasicForm @register="registerForm" name="MesXslMixerPsCompileForm" />
|
||||
</div>
|
||||
</BasicModal>
|
||||
</template>
|
||||
@@ -166,7 +166,13 @@
|
||||
margin-bottom: 14px;
|
||||
}
|
||||
|
||||
:deep(.ps-workflow-item) {
|
||||
:deep(#MesXslMixerPsCompileForm_compileBy),
|
||||
:deep(#MesXslMixerPsCompileForm_proofreadBy),
|
||||
:deep(#MesXslMixerPsCompileForm_proofreadTime),
|
||||
:deep(#MesXslMixerPsCompileForm_auditBy),
|
||||
:deep(#MesXslMixerPsCompileForm_auditTime),
|
||||
:deep(#MesXslMixerPsCompileForm_approveBy),
|
||||
:deep(#MesXslMixerPsCompileForm_approveTime) {
|
||||
margin-bottom: 8px;
|
||||
|
||||
.ant-form-item-label > label {
|
||||
|
||||
@@ -0,0 +1,101 @@
|
||||
<template>
|
||||
<BasicModal v-bind="$attrs" title="选择密炼PS" :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 type { FormSchema } from '/@/components/Table';
|
||||
import { list as mixerPsList, queryById as queryMixerPsById } from '../MesXslMixerPsCompile.api';
|
||||
import { columns as mixerPsColumns } from '../MesXslMixerPsCompile.data';
|
||||
import { useMessage } from '/@/hooks/web/useMessage';
|
||||
|
||||
const emit = defineEmits(['register', 'select']);
|
||||
const { createMessage } = useMessage();
|
||||
|
||||
const COMPILE_STATUS = 'compile';
|
||||
|
||||
const selectSearchSchema: FormSchema[] = [
|
||||
{ label: 'PS编码', field: 'psCode', component: 'JInput', colProps: { span: 8 } },
|
||||
{ label: '标题', field: 'title', component: 'JInput', colProps: { span: 8 } },
|
||||
];
|
||||
|
||||
const selectedRow = ref<Recordable | null>(null);
|
||||
|
||||
const [registerTable, { reload, getSelectRowKeys, getSelectRows, setSelectedRowKeys, clearSelectedRowKeys }] = useTable({
|
||||
api: mixerPsList,
|
||||
columns: mixerPsColumns.slice(0, 7),
|
||||
rowKey: 'id',
|
||||
useSearchForm: true,
|
||||
formConfig: {
|
||||
labelWidth: 90,
|
||||
schemas: selectSearchSchema,
|
||||
},
|
||||
pagination: { pageSize: 10 },
|
||||
canResize: false,
|
||||
showIndexColumn: false,
|
||||
immediate: true,
|
||||
beforeFetch: (params) => ({
|
||||
...params,
|
||||
status: COMPILE_STATUS,
|
||||
}),
|
||||
rowSelection: {
|
||||
type: 'radio',
|
||||
columnWidth: 48,
|
||||
onChange: (_keys, rows) => {
|
||||
selectedRow.value = rows?.[0] ?? null;
|
||||
},
|
||||
},
|
||||
clickToRowSelect: true,
|
||||
});
|
||||
|
||||
const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
|
||||
selectedRow.value = null;
|
||||
clearSelectedRowKeys?.();
|
||||
setModalProps({ confirmLoading: false });
|
||||
const psId = data?.psCompileId as string | undefined;
|
||||
if (psId) {
|
||||
setSelectedRowKeys?.([psId]);
|
||||
try {
|
||||
const raw = await queryMixerPsById({ id: psId });
|
||||
const row = (raw as Recordable)?.psCode != null ? raw : (raw as Recordable)?.result;
|
||||
if (row) {
|
||||
selectedRow.value = row;
|
||||
}
|
||||
} catch {
|
||||
// ignore
|
||||
}
|
||||
}
|
||||
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 queryMixerPsById({ id: keys[0] });
|
||||
row = (raw as Recordable)?.psCode != null ? raw : (raw as Recordable)?.result;
|
||||
} catch {
|
||||
// ignore
|
||||
}
|
||||
}
|
||||
if (!row?.id) {
|
||||
createMessage.warning('请选择一条编制状态的密炼PS');
|
||||
return;
|
||||
}
|
||||
if (row.status && row.status !== COMPILE_STATUS) {
|
||||
createMessage.warning('仅可选择编制状态的密炼PS');
|
||||
return;
|
||||
}
|
||||
emit('select', {
|
||||
psCompileId: row.id,
|
||||
psCode: row.psCode || '',
|
||||
title: row.title || '',
|
||||
});
|
||||
closeModal();
|
||||
}
|
||||
</script>
|
||||
Reference in New Issue
Block a user