chenx/qhmes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '20260519-3.9.2版本-葛昊天分支'

Browse Source
This commit is contained in:
geht
2026-05-26 11:09:41 +08:00
parent 589961397c e6241c16c7
commit 7786369a63
76 changed files with 10613 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_100__mes_xsl_mixing_spec_stage_count_total.sql Normal file
View File

@@ -0,0 +1,3 @@
-- 段数存「当前段/总段数」文本，如 2/3（不新增字段）
ALTER TABLE `mes_xsl_mixing_spec`
MODIFY COLUMN `stage_count` varchar(20) DEFAULT NULL COMMENT '段数(当前/总)';

4
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_101__mes_xsl_mixing_spec_stage_count_revert_total.sql Normal file
View File

@@ -0,0 +1,4 @@
-- 回退误加的 stage_count_total，并确保 stage_count 为 varchar
ALTER TABLE `mes_xsl_mixing_spec` DROP COLUMN IF EXISTS `stage_count_total`;
ALTER TABLE `mes_xsl_mixing_spec`
MODIFY COLUMN `stage_count` varchar(20) DEFAULT NULL COMMENT '段数(当前/总)';

91
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_102__mes_xsl_mixer_material_kind_cfg.sql Normal file
View File

@@ -0,0 +1,91 @@
-- 密炼物料种类配置：建表 + 菜单（挂 MES技术管理）+ admin 授权
SET NAMES utf8mb4;
CREATE TABLE IF NOT EXISTS `mes_xsl_mixer_material_kind_cfg` (
`id` varchar(32) NOT NULL COMMENT '主键',
`kind_key` varchar(100) NOT NULL COMMENT '种类键值',
`kind_name` varchar(200) NOT NULL COMMENT '种类名称',
`source_type` varchar(20) NOT NULL COMMENT '数据源类型：dict数据字典/category分类字典',
`source_root_code` varchar(100) DEFAULT NULL COMMENT '根字典编码或分类pcode',
`source_root_name` varchar(200) DEFAULT NULL COMMENT '根名称冗余',
`category_ref_id` varchar(32) DEFAULT NULL COMMENT '对应分类/字典项ID',
`category_ref_code` varchar(100) DEFAULT NULL COMMENT '对应分类编码/字典项值',
`category_ref_name` varchar(200) DEFAULT NULL COMMENT '对应分类名称冗余',
`tenant_id` int DEFAULT NULL COMMENT '租户ID',
`priority` int DEFAULT '0' COMMENT '优先级（数字越小越优先）',
`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_mxmmkc_tenant_priority` (`tenant_id`, `priority`),
KEY `idx_mxmmkc_source_root` (`source_type`, `source_root_code`),
KEY `idx_mxmmkc_category_ref` (`category_ref_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 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`
)
SELECT
'177925970995550', '1900000000000000810', '密炼物料种类配置', '/xslmes/mesXslMixerMaterialKindCfg',
'xslmes/mesXslMixerMaterialKindCfg/MesXslMixerMaterialKindCfgList', 1, 'MesXslMixerMaterialKindCfgList', NULL,
1, NULL, '0', 3.00, 0, 'ant-design:tags-outlined', 0, 1,
0, 0, 'MES密炼物料种类配置', 'admin', NOW(), 'admin', NOW(),
0, 0, '1', 0
FROM DUAL
WHERE NOT EXISTS (
SELECT 1 FROM `sys_permission`
WHERE `id` = '177925970995550'
OR (`del_flag` = 0 AND `menu_type` = 1 AND `name` = '密炼物料种类配置' AND `parent_id` = '1900000000000000810')
);
INSERT 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`)
SELECT '177925970995551', '177925970995550', '新增', 2, 'xslmes:mes_xsl_mixer_material_kind_cfg:add', '1', 1.00, 0, 1, 0, '1', 0, 'admin', NOW()
FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `sys_permission` WHERE `id` = '177925970995551');
INSERT 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`)
SELECT '177925970995552', '177925970995550', '编辑', 2, 'xslmes:mes_xsl_mixer_material_kind_cfg:edit', '1', 2.00, 0, 1, 0, '1', 0, 'admin', NOW()
FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `sys_permission` WHERE `id` = '177925970995552');
INSERT 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`)
SELECT '177925970995553', '177925970995550', '删除', 2, 'xslmes:mes_xsl_mixer_material_kind_cfg:delete', '1', 3.00, 0, 1, 0, '1', 0, 'admin', NOW()
FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `sys_permission` WHERE `id` = '177925970995553');
INSERT 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`)
SELECT '177925970995554', '177925970995550', '批量删除', 2, 'xslmes:mes_xsl_mixer_material_kind_cfg:deleteBatch', '1', 4.00, 0, 1, 0, '1', 0, 'admin', NOW()
FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `sys_permission` WHERE `id` = '177925970995554');
INSERT 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`)
SELECT '177925970995555', '177925970995550', '导出', 2, 'xslmes:mes_xsl_mixer_material_kind_cfg:exportXls', '1', 5.00, 0, 1, 0, '1', 0, 'admin', NOW()
FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `sys_permission` WHERE `id` = '177925970995555');
INSERT 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`)
SELECT '177925970995556', '177925970995550', '导入', 2, 'xslmes:mes_xsl_mixer_material_kind_cfg:importExcel', '1', 6.00, 0, 1, 0, '1', 0, 'admin', NOW()
FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `sys_permission` WHERE `id` = '177925970995556');
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 (
'177925970995550',
'177925970995551',
'177925970995552',
'177925970995553',
'177925970995554',
'177925970995555',
'177925970995556'
)
AND NOT EXISTS (
SELECT 1 FROM `sys_role_permission` rp WHERE rp.`role_id` = r.`id` AND rp.`permission_id` = p.`id`
);

67
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_103__mes_xsl_mixer_material_kind_cfg_menu_fix.sql Normal file
View File

@@ -0,0 +1,67 @@
-- 密炼物料种类配置：菜单 ID 与配合示方(177925970995530)冲突，补插正确菜单
SET NAMES utf8mb4;
UPDATE `sys_permission`
SET `is_leaf` = 0, `update_time` = NOW()
WHERE `id` = '1900000000000000810';
INSERT 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`
)
SELECT
'177925970995550', '1900000000000000810', '密炼物料种类配置', '/xslmes/mesXslMixerMaterialKindCfg',
'xslmes/mesXslMixerMaterialKindCfg/MesXslMixerMaterialKindCfgList', 1, 'MesXslMixerMaterialKindCfgList', NULL,
1, NULL, '0', 3.00, 0, 'ant-design:tags-outlined', 0, 1,
0, 0, 'MES密炼物料种类配置', 'admin', NOW(), 'admin', NOW(),
0, 0, '1', 0
FROM DUAL
WHERE NOT EXISTS (
SELECT 1 FROM `sys_permission`
WHERE `id` = '177925970995550'
OR (`del_flag` = 0 AND `menu_type` = 1 AND `name` = '密炼物料种类配置' AND `parent_id` = '1900000000000000810')
);
INSERT 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`)
SELECT '177925970995551', '177925970995550', '新增', 2, 'xslmes:mes_xsl_mixer_material_kind_cfg:add', '1', 1.00, 0, 1, 0, '1', 0, 'admin', NOW()
FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `sys_permission` WHERE `id` = '177925970995551');
INSERT 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`)
SELECT '177925970995552', '177925970995550', '编辑', 2, 'xslmes:mes_xsl_mixer_material_kind_cfg:edit', '1', 2.00, 0, 1, 0, '1', 0, 'admin', NOW()
FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `sys_permission` WHERE `id` = '177925970995552');
INSERT 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`)
SELECT '177925970995553', '177925970995550', '删除', 2, 'xslmes:mes_xsl_mixer_material_kind_cfg:delete', '1', 3.00, 0, 1, 0, '1', 0, 'admin', NOW()
FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `sys_permission` WHERE `id` = '177925970995553');
INSERT 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`)
SELECT '177925970995554', '177925970995550', '批量删除', 2, 'xslmes:mes_xsl_mixer_material_kind_cfg:deleteBatch', '1', 4.00, 0, 1, 0, '1', 0, 'admin', NOW()
FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `sys_permission` WHERE `id` = '177925970995554');
INSERT 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`)
SELECT '177925970995555', '177925970995550', '导出', 2, 'xslmes:mes_xsl_mixer_material_kind_cfg:exportXls', '1', 5.00, 0, 1, 0, '1', 0, 'admin', NOW()
FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `sys_permission` WHERE `id` = '177925970995555');
INSERT 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`)
SELECT '177925970995556', '177925970995550', '导入', 2, 'xslmes:mes_xsl_mixer_material_kind_cfg:importExcel', '1', 6.00, 0, 1, 0, '1', 0, 'admin', NOW()
FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `sys_permission` WHERE `id` = '177925970995556');
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 (
'177925970995550',
'177925970995551',
'177925970995552',
'177925970995553',
'177925970995554',
'177925970995555',
'177925970995556'
)
AND NOT EXISTS (
SELECT 1 FROM `sys_role_permission` rp WHERE rp.`role_id` = r.`id` AND rp.`permission_id` = p.`id`
);

7
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_104__mes_xsl_mixing_spec_material_mixer_material_id.sql Normal file
View File

@@ -0,0 +1,7 @@
-- 混炼示方明细：关联密炼物料主数据 ID
SET NAMES utf8mb4;
ALTER TABLE `mes_xsl_mixing_spec_material`
ADD COLUMN `mixer_material_id` varchar(32) DEFAULT NULL COMMENT '密炼物料ID（关联mes_mixer_material.id）' AFTER `material_kind`;
CREATE INDEX `idx_mxmix_mat_mixer_id` ON `mes_xsl_mixing_spec_material` (`mixer_material_id`);

45
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_97__mes_xsl_formula_spec_status_dict.sql Normal file
View File

@@ -0,0 +1,45 @@
-- 配合示方状态字典：编制/提交审批/检讨审批/承认审批/作废/尚未到生效期
SET NAMES utf8mb4;
UPDATE `sys_dict`
SET `description` = 'MES配合示方状态（编制/提交审批/检讨/承认/作废/生效期）', `update_by` = 'admin', `update_time` = NOW()
WHERE `id` = '1995000000000000013';
UPDATE `sys_dict_item`
SET `item_text` = '编制', `item_value` = 'compile', `sort_order` = 1, `update_by` = 'admin', `update_time` = NOW()
WHERE `id` = '1995000000000001031';
UPDATE `sys_dict_item`
SET `item_text` = '提交审批', `item_value` = 'submit', `sort_order` = 2, `update_by` = 'admin', `update_time` = NOW()
WHERE `id` = '1995000000000001032';
UPDATE `sys_dict_item`
SET `item_text` = '检讨审批通过', `item_value` = 'review_pass', `sort_order` = 3, `update_by` = 'admin', `update_time` = NOW()
WHERE `id` = '1995000000000001033';
INSERT IGNORE INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `sort_order`, `status`, `create_by`, `create_time`)
VALUES ('1995000000000001037', '1995000000000000013', '检讨审批退回', 'review_return', 4, 1, 'admin', NOW());
UPDATE `sys_dict_item`
SET `item_text` = '承认审批通过-即正式发布', `item_value` = 'recognition_pass', `sort_order` = 5, `update_by` = 'admin', `update_time` = NOW()
WHERE `id` = '1995000000000001034';
INSERT IGNORE INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `sort_order`, `status`, `create_by`, `create_time`)
VALUES ('1995000000000001038', '1995000000000000013', '承认审批退回', 'recognition_return', 6, 1, 'admin', NOW());
UPDATE `sys_dict_item`
SET `item_text` = '作废', `item_value` = 'obsolete', `sort_order` = 7, `update_by` = 'admin', `update_time` = NOW()
WHERE `id` = '1995000000000001035';
INSERT IGNORE INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `sort_order`, `status`, `create_by`, `create_time`)
VALUES ('1995000000000001039', '1995000000000000013', '尚未到生效期', 'not_effective', 8, 1, 'admin', NOW());
UPDATE `sys_dict_item` SET `status` = 0, `update_by` = 'admin', `update_time` = NOW()
WHERE `dict_id` = '1995000000000000013' AND `id` = '1995000000000001036';
UPDATE `mes_xsl_formula_spec` SET `status` = 'submit' WHERE `status` = 'proofread';
UPDATE `mes_xsl_formula_spec` SET `status` = 'review_pass' WHERE `status` = 'audit';
UPDATE `mes_xsl_formula_spec` SET `status` = 'recognition_pass' WHERE `status` IN ('approve', 'released');
ALTER TABLE `mes_xsl_formula_spec`
MODIFY COLUMN `status` varchar(32) DEFAULT 'compile' COMMENT '状态（字典xslmes_formula_spec_status：compile编制 submit提交审批 review_pass检讨通过 review_return检讨退回 recognition_pass承认通过 recognition_return承认退回 obsolete作废 not_effective尚未生效）';

195
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_98__mes_xsl_mixing_spec.sql Normal file
View File

@@ -0,0 +1,195 @@
SET NAMES utf8mb4;
INSERT IGNORE INTO `sys_dict` (`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `type`, `tenant_id`)
VALUES ('1995000000000000098', '混炼TCU区分', 'xslmes_mixing_tcu_section', '混炼示方TCU区分', 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 ('1995000000000009801', '1995000000000000098', '上密炼机', 'up_mixer', 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 ('1995000000000009802', '1995000000000000098', '下密炼机', 'down_mixer', 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 ('1995000000000000099', '混炼药品称量位置', 'xslmes_mixing_drug_weigh_pos', '混炼示方药品称量位置', 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 ('1995000000000009901', '1995000000000000099', '药品称', 'drug_scale', 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 ('1995000000000009902', '1995000000000000099', '胶料称', 'rubber_scale', 2, 1, 'admin', NOW());
CREATE TABLE IF NOT EXISTS `mes_xsl_mixing_spec` (
`id` varchar(32) NOT NULL COMMENT '主键',
`tenant_id` int DEFAULT NULL COMMENT '租户ID',
`spec_name` varchar(120) DEFAULT NULL COMMENT '规格',
`purpose` varchar(300) DEFAULT NULL COMMENT '用途',
`machine_id` varchar(32) DEFAULT NULL COMMENT '机台ID',
`machine_name` varchar(120) DEFAULT NULL COMMENT '机台',
`make_date` date DEFAULT NULL COMMENT '制作日期',
`issue_number` varchar(120) DEFAULT NULL COMMENT '发行编号',
`convert_factor` decimal(18,6) DEFAULT NULL COMMENT '换算系数',
`fill_volume` decimal(18,6) DEFAULT NULL COMMENT '填充体积',
`recycle_carbon_sec` int DEFAULT NULL COMMENT '回收炭黑(秒)',
`mother_rubber_sg` decimal(18,6) DEFAULT NULL COMMENT '母胶比重',
`final_rubber_sg` decimal(18,6) DEFAULT NULL COMMENT '终炼胶比重',
`apply_factory` varchar(120) DEFAULT NULL COMMENT '适用工厂',
`stage_count` int DEFAULT NULL COMMENT '段数',
`pure_mix_sec` int DEFAULT NULL COMMENT '纯混炼时间(秒)',
`recycle_carbon_kg` decimal(18,6) DEFAULT NULL COMMENT '回收炭黑(KG)',
`auto_small_print_setting` varchar(200) DEFAULT NULL COMMENT '自动小料打印设定',
`set_train_count` int DEFAULT NULL COMMENT '设定车数',
`side_wall_water_temp` decimal(18,6) DEFAULT NULL COMMENT '侧壁水温',
`overtime_discharge_sec` int DEFAULT NULL COMMENT '超时排胶时间',
`overtemp_discharge_sec` int DEFAULT NULL COMMENT '超温排胶时间',
`overtemp_discharge_temp` decimal(18,6) DEFAULT NULL COMMENT '超温排胶温度',
`door_water_temp` decimal(18,6) DEFAULT NULL COMMENT '卸料门水温',
`rotor_water_temp` decimal(18,6) DEFAULT NULL COMMENT '转子水温',
`max_feed_temp` decimal(18,6) DEFAULT NULL COMMENT '最高进料温度',
`draft_by` varchar(80) DEFAULT NULL COMMENT '起草人',
`draft_time` datetime DEFAULT NULL COMMENT '起草时间',
`proofread_by` varchar(80) DEFAULT NULL COMMENT '校对人',
`proofread_time` datetime DEFAULT NULL COMMENT '校对时间',
`audit_by` varchar(80) DEFAULT NULL COMMENT '审核人',
`audit_time` datetime DEFAULT NULL COMMENT '审核时间',
`approve_by` varchar(80) DEFAULT NULL COMMENT '批准人',
`approve_time` datetime DEFAULT NULL COMMENT '批准时间',
`change_date` date DEFAULT NULL COMMENT '变更日期',
`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 '逻辑删除',
PRIMARY KEY (`id`),
KEY `idx_mxmix_issue_number` (`issue_number`),
KEY `idx_mxmix_spec_name` (`spec_name`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES混炼示方';
CREATE TABLE IF NOT EXISTS `mes_xsl_mixing_spec_material` (
`id` varchar(32) NOT NULL COMMENT '主键',
`mixing_spec_id` varchar(32) NOT NULL COMMENT '混炼示方主表ID',
`sort_no` int DEFAULT NULL COMMENT '行序号',
`material_major` varchar(120) DEFAULT NULL COMMENT '物料大类',
`material_minor` varchar(120) DEFAULT NULL COMMENT '物料小类',
`material_kind` varchar(120) DEFAULT NULL COMMENT '种类',
`mixer_material_name` varchar(200) DEFAULT NULL COMMENT '密炼物料名称',
`mixer_material_desc` varchar(300) DEFAULT NULL COMMENT '密炼物料描述',
`unit_weight` decimal(18,6) DEFAULT NULL COMMENT '单重',
`accum_weight` decimal(18,6) DEFAULT NULL COMMENT '累计',
`seq_no` int DEFAULT NULL COMMENT '顺序',
`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_mxmix_mat_main` (`mixing_spec_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES混炼示方明细-橡胶及配合剂';
CREATE TABLE IF NOT EXISTS `mes_xsl_mixing_spec_step` (
`id` varchar(32) NOT NULL COMMENT '主键',
`mixing_spec_id` varchar(32) NOT NULL COMMENT '混炼示方主表ID',
`sort_no` int DEFAULT NULL COMMENT '行序号',
`action_name` varchar(120) DEFAULT NULL COMMENT '动作',
`action_sec` int DEFAULT NULL COMMENT '时间(秒)',
`protect_sec` int DEFAULT NULL COMMENT '保护时间',
`temp_c` decimal(18,6) DEFAULT NULL COMMENT '温度(℃)',
`power_kw` decimal(18,6) DEFAULT NULL COMMENT '功率(Kw)',
`energy_kwh` decimal(18,6) DEFAULT NULL COMMENT '能量(Kwh)',
`combo_mode` varchar(120) DEFAULT NULL COMMENT '组合',
`speed_rpm` decimal(18,6) DEFAULT NULL COMMENT '转速(rpm)',
`pressure_mpa` decimal(18,6) DEFAULT NULL COMMENT '压力(Mpa)',
`bolt_percent` decimal(18,6) DEFAULT NULL COMMENT '栓(%)',
`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_mxmix_step_main` (`mixing_spec_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES混炼示方明细-混合步骤';
CREATE TABLE IF NOT EXISTS `mes_xsl_mixing_spec_down_step` (
`id` varchar(32) NOT NULL COMMENT '主键',
`mixing_spec_id` varchar(32) NOT NULL COMMENT '混炼示方主表ID',
`sort_no` int DEFAULT NULL COMMENT '行序号',
`action_name` varchar(120) DEFAULT NULL COMMENT '动作',
`action_sec` int DEFAULT NULL COMMENT '时间(秒)',
`protect_sec` int DEFAULT NULL COMMENT '保护时间',
`temp_c` decimal(18,6) DEFAULT NULL COMMENT '温度(℃)',
`power_kw` decimal(18,6) DEFAULT NULL COMMENT '功率(Kw)',
`energy_kwh` decimal(18,6) DEFAULT NULL COMMENT '能量(Kwh)',
`combo_mode` varchar(120) DEFAULT NULL COMMENT '组合',
`speed_rpm` decimal(18,6) DEFAULT NULL COMMENT '转速(rpm)',
`pressure_mpa` decimal(18,6) DEFAULT NULL COMMENT '压力(Mpa)',
`bolt_percent` decimal(18,6) DEFAULT NULL COMMENT '栓(%)',
`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_mxmix_down_step_main` (`mixing_spec_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES混炼示方明细-下密炼机混炼条件';
CREATE TABLE IF NOT EXISTS `mes_xsl_mixing_spec_tcu` (
`id` varchar(32) NOT NULL COMMENT '主键',
`mixing_spec_id` varchar(32) NOT NULL COMMENT '混炼示方主表ID',
`sort_no` int DEFAULT NULL COMMENT '行序号',
`section_type` varchar(32) DEFAULT NULL COMMENT '区分（上密炼机/下密炼机）',
`front_rotor_temp` decimal(18,6) DEFAULT NULL COMMENT '前转子温度',
`rear_rotor_temp` decimal(18,6) DEFAULT NULL COMMENT '后转子温度',
`front_chamber_temp` decimal(18,6) DEFAULT NULL COMMENT '前混炼室温度',
`rear_chamber_temp` decimal(18,6) DEFAULT NULL COMMENT '后混炼室温度',
`top_plug_temp` decimal(18,6) DEFAULT NULL COMMENT '上下顶栓温度',
`drug_weigh_pos` varchar(32) DEFAULT NULL COMMENT '药品称量位置',
`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_mxmix_tcu_main` (`mixing_spec_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='MES混炼示方明细-TCU温度条件';
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 (
'177925970995540', '1900000000000000810', '混炼示方', '/xslmes/mesXslMixingSpec',
'xslmes/mesXslMixingSpec/MesXslMixingSpecList', 1, 'MesXslMixingSpecList', NULL,
1, NULL, '0', 2.00, 0, 'ant-design:table-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 ('177925970995541', '177925970995540', '新增', 2, 'xslmes:mes_xsl_mixing_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 ('177925970995542', '177925970995540', '编辑', 2, 'xslmes:mes_xsl_mixing_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 ('177925970995543', '177925970995540', '删除', 2, 'xslmes:mes_xsl_mixing_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 ('177925970995544', '177925970995540', '批量删除', 2, 'xslmes:mes_xsl_mixing_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 ('177925970995545', '177925970995540', '导出', 2, 'xslmes:mes_xsl_mixing_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 ('177925970995546', '177925970995540', '导入', 2, 'xslmes:mes_xsl_mixing_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 (
'177925970995540', '177925970995541', '177925970995542',
'177925970995543', '177925970995544', '177925970995545', '177925970995546'
)
AND NOT EXISTS (
SELECT 1 FROM `sys_role_permission` rp
WHERE rp.`role_id` = r.id AND rp.`permission_id` = p.id
);

20
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_99__sys_category_is_rubber.sql Normal file
View File

@@ -0,0 +1,20 @@
-- 分类字典：原辅材料子类增加「胶料」标记字段（幂等）
SET NAMES utf8mb4;
SET @db = DATABASE();
SET @sql = IF(
(SELECT COUNT(*) FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = @db AND TABLE_NAME = 'sys_category' AND COLUMN_NAME = 'is_rubber') = 0,
'ALTER TABLE `sys_category` ADD COLUMN `is_rubber` varchar(1) DEFAULT ''0'' COMMENT ''是否胶料 1是/0否'' AFTER `has_child`',
'SELECT 1'
);
PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
-- 天然胶、合成胶、再生胶默认标记为胶料
UPDATE `sys_category`
SET `is_rubber` = '1', `update_by` = 'admin', `update_time` = NOW()
WHERE `code` IN (
'XSLMES_MATERIAL_RAW_AUX_TRJ',
'XSLMES_MATERIAL_RAW_AUX_HCJ',
'XSLMES_MATERIAL_RAW_AUX_ZSJ'
);