Compare commits

...
Author SHA1 Message Date
zlwuandCursor 7b6a0523dd fix(sql): 兼容 UC MSC 回补脚本的 collation 与确定性 ID
跨表比较统一 COLLATE,避免 unicode_ci/general_ci 混用失败;回补 ID 改 MD5 业务键并修正 task_no 序号,避免 UUID 撞主键与浮点序号。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-13 13:27:43 +08:00
cykj 99562ee584 Merge pull request 'chore(sql): 移除旧版实验室样本处理一级菜单相关迁移 (#108)' (#109) from codex/issue-108-remove-old-lab-sql-5302d8a2cc into V2.0
chore(sql): 移除旧版实验室样本处理一级菜单相关迁移 (#108)

Merged from PR #109
2026-11-13 05:21:18 +00:00
zlwuandCursor 96773ae7a3 chore(sql): 移除旧版实验室样本处理一级菜单相关迁移
生产库已无旧菜单与 biz_lab_sample_processing_extra,保留这些脚本易被误执行;一并去掉仅服务该清理流程的恢复说明。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-13 13:20:02 +08:00
zlwuandCursor ef4d687d03 chore: 清理主分支残留删除项
continuous-integration/drone/tag Build is passing
再次移除多余实验室样本处理一级静态路由,并删除弱密码刷新说明 SQL。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-13 12:14:37 +08:00
cykj f5ab0c3167 chore(sql): UC 入库编码生产任务一次性回补 SQL (#106)
一次性回补 SQL,与种子脚本分开。
2026-11-13 03:12:51 +00:00
10 changed files with 67 additions and 379 deletions

No files matched your search

@@ -1,46 +0,0 @@
-- =============================================================================
-- 弱密码刷新说明:111111 → Zkxw@123
-- 日期:2026-10-16
-- =============================================================================
--
-- 重要:sys_user.password 存储 bcrypt 哈希(每次盐随机),
-- 不能用下列语句命中弱密码用户:
-- WHERE password = '111111' -- 无效
-- WHERE password LIKE '%111111%' -- 无效
--
-- 推荐:用 Python 脚本,并通过变量指定目标库(勿依赖本机默认 .env 误连生产)。
--
-- cd backend && source venv/bin/activate
--
-- # 方式 A:完整 URL
-- python scripts/reset_weak_password_111111.py \
-- --database-url 'mysql+pymysql://USER:PASS@HOST:3306/DBNAME' --dry-run
--
-- # 方式 B:分项变量
-- python scripts/reset_weak_password_111111.py \
-- --db-host HOST --db-port 3306 --db-user USER --db-password 'PASS' --db-name DBNAME --dry-run
--
-- # 方式 C:指定环境文件
-- python scripts/reset_weak_password_111111.py --env-file ./.env.test --dry-run
--
-- # 正式写入:去掉 --dry-run
--
-- 脚本行为:校验 del_flag=0 的用户口令是否为明文 111111(含停用账号),
-- 命中则更新为 Zkxw@123 的新 bcrypt 哈希。
--
-- =============================================================================
-- 以下仅为「已知单个用户 id」时的手工 UPDATE 模板。
-- 哈希由本机生成示例(明文 Zkxw@123,bcrypt cost 12),部署前请用 Python 重新生成:
-- python -c "from app.core.security import get_password_hash; print(get_password_hash('Zkxw@123'))"
-- =============================================================================
-- 示例哈希(仅供手工单用户更新参考;批量请用脚本):
-- $2b$12$ULvPCr6g9IUmI8K7nlGU5emk7hupaAz4WgFdEoQBe935Wh1pVYKCK
-- UPDATE sys_user
-- SET password = '$2b$12$ULvPCr6g9IUmI8K7nlGU5emk7hupaAz4WgFdEoQBe935Wh1pVYKCK',
-- update_time = NOW()
-- WHERE id = '<user_id>'
-- AND del_flag = 0;
-- 执行前请备份 sys_user;执行后通知用户使用新密码并建议登录后自行修改。
@@ -1,21 +0,0 @@
-- 实验室样本处理 ACL 归一化(可重复执行)
-- 1) 撤销所有 lab:sample-processing* / menu:lab-sample-processing 角色菜单
-- 2) 仅按下列角色重授:
-- 市场编辑:市场专员/临床销售/销售助理/客服/采集专员
-- 生产编辑:生产专员/实验专员/细胞实验员/研发专员
-- 质检编辑:质检专员/质量安全员
-- 主管:生产主管/质量主管/采集主管/采集经理/研发主管/研发总监/总经理/副总经理/董事长/超级管理员
-- 只读:采集接受人
-- 说明:正式执行请用 Agent 脚本 tmp_normalize_lab_acl.py(含幂等 undelete/insert)。
-- 本文件作为规则记录;勿在未核对角色名时直接全量套用到其他环境。
UPDATE sys_role_menu rm
JOIN sys_menu m ON m.id = rm.menu_id
SET rm.del_flag = 1,
rm.update_by = 'normalize-acl',
rm.update_time = NOW()
WHERE rm.del_flag = 0
AND (
m.perms LIKE 'lab:sample-processing%'
OR m.perms = 'menu:lab-sample-processing'
);
@@ -1,23 +0,0 @@
# 恢复 Excel 补充字段(真菌等)
## 原因
`20261112_lab_sample_processing_retire_excel_demo.sql` 按「补充表 sample_code = 协议样本号」软删演示行。
会议 Excel 实际多用实验室入库编码(`B000*` / `BC*` / `UBMC*`),与协议号不一致,导致真实样本的真菌/内毒素/CD34 等补充字段被误删。
## 处理
运行:
```bash
ENV_FILE=backend/.env python backend/scripts/restore_lab_sample_processing_excel_extras.py
```
脚本会:
1. 找出 `update_by=retire-excel-demo` 且 `del_flag=1` 的补充行
2. 仅恢复仍能关联到当前有效协议/接收编码的行
3. 只写回 `SOURCE_EXTRA` 字段到有效补充表
4. 同步旧台账 `biz_lab_sample_process_supplement`
列表侧同时会从质检完成任务填空(内毒素/真菌/支原体/细菌及母血相关)。
@@ -1,14 +0,0 @@
-- 软删除实验室样本处理 Excel 演示补充行:
-- 仅删除在协议样本表中不存在对应 sample_code 的补充记录。
-- Excel 列结构仍由代码字段目录维护;真实列表只聚合协议/接收/生产源数据。
UPDATE biz_lab_sample_processing_extra e
LEFT JOIN biz_protocol_sample s
ON s.sample_code = e.sample_code
AND s.tenant_no = e.tenant_no
AND s.del_flag = 0
SET e.del_flag = 1,
e.update_by = 'retire-excel-demo',
e.update_time = NOW()
WHERE e.del_flag = 0
AND s.id IS NULL;
@@ -1,12 +0,0 @@
-- 纠正实验室样本处理部门 ACL:
-- 「采集接受人」仅挂在「质检专员」职位上,不应再授予市场字段编辑权,
-- 否则质检人员经职位角色并集会同时可改市场+质检字段。
UPDATE sys_role_menu rm
JOIN sys_role r ON r.id = rm.role_id AND r.del_flag = 0 AND r.role_name = '采集接受人'
JOIN sys_menu m ON m.id = rm.menu_id AND m.del_flag = 0
AND m.perms = 'lab:sample-processing:market:edit'
SET rm.del_flag = 1,
rm.update_by = 'migration',
rm.update_time = NOW()
WHERE rm.del_flag = 0;
@@ -1,120 +0,0 @@
-- 实验室样本处理数据:补充表 + 一级模块菜单/按钮权限(不自动授权角色)
-- MySQL 5.7,可重复执行
CREATE TABLE IF NOT EXISTS biz_lab_sample_processing_extra (
id VARCHAR(64) NOT NULL,
dataset VARCHAR(16) NOT NULL COMMENT 'hsc|ubmc|msc',
sample_code VARCHAR(32) NOT NULL COMMENT '样本编码',
payload_json TEXT NULL COMMENT '补充字段 JSON',
tenant_no VARCHAR(64) NOT NULL,
order_num INT NULL,
remark VARCHAR(512) NULL,
create_by VARCHAR(64) NULL,
create_dept_id VARCHAR(64) NOT NULL DEFAULT '',
create_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
update_by VARCHAR(64) NULL,
update_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
del_flag SMALLINT NOT NULL DEFAULT 0,
PRIMARY KEY (id),
KEY ix_lab_sample_extra_tenant_ds_code (tenant_no, dataset, sample_code, del_flag)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-- 挂到与「质检」同一 Web 虚拟根下(复用 menu:quality 的 parent_id)
INSERT INTO sys_menu (
id, menu_name, parent_id, menu_type, path, component, perms,
is_frame, visible, status, tenant_no, order_num, remark,
create_by, create_dept_id, create_time, update_by, update_time, del_flag
)
SELECT
MD5(CONCAT(quality.tenant_no, ':menu:lab-sample-processing')),
'实验室样本处理数据', quality.parent_id, 'M', '/lab-sample-processing', '/index/index',
'menu:lab-sample-processing', 1, '1', '1', quality.tenant_no,
COALESCE(quality.order_num, 50) + 1,
'20261104 会议:造血/单个核/间充质台账',
'migration', '', NOW(), 'migration', NOW(), 0
FROM sys_menu quality
WHERE quality.perms = 'menu:quality' AND quality.del_flag = 0 AND quality.status = '1'
AND NOT EXISTS (
SELECT 1 FROM sys_menu e
WHERE e.tenant_no = quality.tenant_no AND e.perms = 'menu:lab-sample-processing' AND e.del_flag = 0
);
INSERT INTO sys_menu (
id, menu_name, parent_id, menu_type, path, component, perms,
is_frame, visible, status, tenant_no, order_num, remark,
create_by, create_dept_id, create_time, update_by, update_time, del_flag
)
SELECT
MD5(CONCAT(p.tenant_no, ':lab:sample-processing:list')),
'造血干细胞数据', p.id, 'C', 'lab-sample-processing/hsc',
'/lab-sample-processing/hsc/index', 'lab:sample-processing:list',
1, '1', '1', p.tenant_no, 10, '造血干细胞数据列表',
'migration', '', NOW(), 'migration', NOW(), 0
FROM sys_menu p
WHERE p.perms = 'menu:lab-sample-processing' AND p.del_flag = 0 AND p.status = '1'
AND NOT EXISTS (
SELECT 1 FROM sys_menu e
WHERE e.tenant_no = p.tenant_no AND e.path = 'lab-sample-processing/hsc' AND e.del_flag = 0
);
INSERT INTO sys_menu (
id, menu_name, parent_id, menu_type, path, component, perms,
is_frame, visible, status, tenant_no, order_num, remark,
create_by, create_dept_id, create_time, update_by, update_time, del_flag
)
SELECT
MD5(CONCAT(p.tenant_no, ':lab:sample-processing:ubmc')),
'单个核数据', p.id, 'C', 'lab-sample-processing/ubmc',
'/lab-sample-processing/ubmc/index', 'lab:sample-processing:list',
1, '1', '1', p.tenant_no, 20, '单个核数据列表',
'migration', '', NOW(), 'migration', NOW(), 0
FROM sys_menu p
WHERE p.perms = 'menu:lab-sample-processing' AND p.del_flag = 0 AND p.status = '1'
AND NOT EXISTS (
SELECT 1 FROM sys_menu e
WHERE e.tenant_no = p.tenant_no AND e.path = 'lab-sample-processing/ubmc' AND e.del_flag = 0
);
INSERT INTO sys_menu (
id, menu_name, parent_id, menu_type, path, component, perms,
is_frame, visible, status, tenant_no, order_num, remark,
create_by, create_dept_id, create_time, update_by, update_time, del_flag
)
SELECT
MD5(CONCAT(p.tenant_no, ':lab:sample-processing:msc')),
'脐带间充质干细胞数据', p.id, 'C', 'lab-sample-processing/msc',
'/lab-sample-processing/msc/index', 'lab:sample-processing:list',
1, '1', '1', p.tenant_no, 30, '脐带间充质干细胞数据列表',
'migration', '', NOW(), 'migration', NOW(), 0
FROM sys_menu p
WHERE p.perms = 'menu:lab-sample-processing' AND p.del_flag = 0 AND p.status = '1'
AND NOT EXISTS (
SELECT 1 FROM sys_menu e
WHERE e.tenant_no = p.tenant_no AND e.path = 'lab-sample-processing/msc' AND e.del_flag = 0
);
-- 编辑按钮挂在列表菜单下(三页共用同一 list 权限父节点:造血页)
INSERT INTO sys_menu (
id, menu_name, parent_id, menu_type, path, component, perms,
is_frame, visible, status, tenant_no, order_num, remark,
create_by, create_dept_id, create_time, update_by, update_time, del_flag
)
SELECT
MD5(CONCAT(p.tenant_no, ':', btn.perms)),
btn.menu_name, p.id, 'F', '', NULL, btn.perms,
1, '0', '1', p.tenant_no, btn.order_num, btn.remark,
'migration', '', NOW(), 'migration', NOW(), 0
FROM sys_menu p
JOIN (
SELECT '市场字段编辑' AS menu_name, 'lab:sample-processing:market:edit' AS perms, 1 AS order_num, '仅可编辑市场部门字段' AS remark
UNION ALL SELECT '生产字段编辑', 'lab:sample-processing:production:edit', 2, '仅可编辑生产部门字段'
UNION ALL SELECT '质检字段编辑', 'lab:sample-processing:qc:edit', 3, '仅可编辑质检部门字段'
UNION ALL SELECT '部门主管', 'lab:sample-processing:manager', 4, '可编辑全部部门字段'
) btn
WHERE p.perms = 'lab:sample-processing:list'
AND p.path = 'lab-sample-processing/hsc'
AND p.del_flag = 0 AND p.status = '1'
AND NOT EXISTS (
SELECT 1 FROM sys_menu e
WHERE e.tenant_no = p.tenant_no AND e.perms = btn.perms AND e.del_flag = 0
);
@@ -1,50 +0,0 @@
-- Issue #100:移除多余一级菜单「实验室样本处理数据」及其子菜单/按钮
-- 软删除 sys_menu 与对应 sys_role_menu;不影响质检管理下 lab-sample-process 台账
-- MySQL 5.7,可重复执行
-- 1) 角色菜单授权
UPDATE sys_role_menu rm
JOIN sys_menu m ON m.id = rm.menu_id
SET rm.del_flag = 1,
rm.update_by = 'migration',
rm.update_time = NOW()
WHERE rm.del_flag = 0
AND (
m.perms IN (
'menu:lab-sample-processing',
'lab:sample-processing:list',
'lab:sample-processing:market:edit',
'lab:sample-processing:production:edit',
'lab:sample-processing:qc:edit',
'lab:sample-processing:manager'
)
OR m.path IN (
'/lab-sample-processing',
'lab-sample-processing/hsc',
'lab-sample-processing/ubmc',
'lab-sample-processing/msc'
)
);
-- 2) 按钮 / 子菜单 / 一级菜单(先叶子后父级,同批软删即可)
UPDATE sys_menu
SET del_flag = 1,
update_by = 'migration',
update_time = NOW()
WHERE del_flag = 0
AND (
perms IN (
'menu:lab-sample-processing',
'lab:sample-processing:list',
'lab:sample-processing:market:edit',
'lab:sample-processing:production:edit',
'lab:sample-processing:qc:edit',
'lab:sample-processing:manager'
)
OR path IN (
'/lab-sample-processing',
'lab-sample-processing/hsc',
'lab-sample-processing/ubmc',
'lab-sample-processing/msc'
)
);
@@ -1,7 +1,8 @@
-- UC 入库编码自动派发:脐带MSC原代培养(内置模版)5 步 -- UC 入库编码自动派发:脐带MSC原代培养(内置模版)5 步
-- 步骤:原代培养 → 半换液 → 二次贴壁 → 重铺 → 冻存(不含传代) -- 步骤:原代培养 → 半换液 → 二次贴壁 → 重铺 → 冻存(不含传代)
-- 内容从既有「干细胞培养(内置模版)」/ MSC培养-BUILTIN 按 process_code 拷贝 -- 内容从既有「干细胞培养(内置模版)」/ MSC培养-BUILTIN 按 process_code 拷贝
-- 幂等:已存在同名内置集合则跳过主数据创建-- 生产历史空任务工单回补(二选一,勿重复对同一工单各跑一遍): -- 幂等:已存在同名内置集合则跳过主数据创建-- 兼容:跨表比较统一 COLLATE utf8mb4_unicode_ci,避免 unicode_ci/general_ci 混用失败
-- 生产历史空任务工单回补(二选一,勿重复对同一工单各跑一遍):
-- SQL:docs/sql/migrations/2026-11-13-uc-msc-production-task-backfill.sql -- SQL:docs/sql/migrations/2026-11-13-uc-msc-production-task-backfill.sql
-- 或 Python: -- 或 Python:
-- cd backend && python -m scripts.backfill_uc_msc_production_tasks -- cd backend && python -m scripts.backfill_uc_msc_production_tasks
@@ -46,7 +47,7 @@ WHERE src.del_flag = 0
) )
AND NOT EXISTS ( AND NOT EXISTS (
SELECT 1 FROM biz_process_route x SELECT 1 FROM biz_process_route x
WHERE x.tenant_no = src.tenant_no WHERE x.tenant_no COLLATE utf8mb4_unicode_ci = src.tenant_no COLLATE utf8mb4_unicode_ci
AND x.route_code = 'MSC原代-UC-BUILTIN' AND x.route_code = 'MSC原代-UC-BUILTIN'
AND x.del_flag = 0 AND x.del_flag = 0
) )
@@ -67,7 +68,9 @@ SELECT
s.description, s.equipment_ids, s.equipment_name, s.estimated_duration, s.sop_ids, s.sop_content, s.description, s.equipment_ids, s.equipment_name, s.estimated_duration, s.sop_ids, s.sop_content,
s.tenant_no, 1, s.remark, s.create_by, IFNULL(s.create_dept_id, ''), NOW(), s.update_by, NOW(), 0 s.tenant_no, 1, s.remark, s.create_by, IFNULL(s.create_dept_id, ''), NOW(), s.update_by, NOW(), 0
FROM biz_process_route_step s FROM biz_process_route_step s
JOIN biz_process_route r ON r.id = s.route_id AND r.del_flag = 0 JOIN biz_process_route r
ON r.id COLLATE utf8mb4_unicode_ci = s.route_id COLLATE utf8mb4_unicode_ci
AND r.del_flag = 0
WHERE s.del_flag = 0 WHERE s.del_flag = 0
AND s.process_code = 'SOP-SC-003-E01-01' AND s.process_code = 'SOP-SC-003-E01-01'
AND ( AND (
@@ -97,7 +100,9 @@ SELECT
s.description, s.equipment_ids, s.equipment_name, s.estimated_duration, s.sop_ids, s.sop_content, s.description, s.equipment_ids, s.equipment_name, s.estimated_duration, s.sop_ids, s.sop_content,
s.tenant_no, 2, s.remark, s.create_by, IFNULL(s.create_dept_id, ''), NOW(), s.update_by, NOW(), 0 s.tenant_no, 2, s.remark, s.create_by, IFNULL(s.create_dept_id, ''), NOW(), s.update_by, NOW(), 0
FROM biz_process_route_step s FROM biz_process_route_step s
JOIN biz_process_route r ON r.id = s.route_id AND r.del_flag = 0 JOIN biz_process_route r
ON r.id COLLATE utf8mb4_unicode_ci = s.route_id COLLATE utf8mb4_unicode_ci
AND r.del_flag = 0
WHERE s.del_flag = 0 WHERE s.del_flag = 0
AND s.process_code = 'SOP-SC-004-E01-01' AND s.process_code = 'SOP-SC-004-E01-01'
AND ( AND (
@@ -127,7 +132,9 @@ SELECT
s.description, s.equipment_ids, s.equipment_name, s.estimated_duration, s.sop_ids, s.sop_content, s.description, s.equipment_ids, s.equipment_name, s.estimated_duration, s.sop_ids, s.sop_content,
s.tenant_no, 3, s.remark, s.create_by, IFNULL(s.create_dept_id, ''), NOW(), s.update_by, NOW(), 0 s.tenant_no, 3, s.remark, s.create_by, IFNULL(s.create_dept_id, ''), NOW(), s.update_by, NOW(), 0
FROM biz_process_route_step s FROM biz_process_route_step s
JOIN biz_process_route r ON r.id = s.route_id AND r.del_flag = 0 JOIN biz_process_route r
ON r.id COLLATE utf8mb4_unicode_ci = s.route_id COLLATE utf8mb4_unicode_ci
AND r.del_flag = 0
WHERE s.del_flag = 0 WHERE s.del_flag = 0
AND s.process_code = 'SOP-SC-006-E01-01' AND s.process_code = 'SOP-SC-006-E01-01'
AND ( AND (
@@ -157,7 +164,9 @@ SELECT
s.description, s.equipment_ids, s.equipment_name, s.estimated_duration, s.sop_ids, s.sop_content, s.description, s.equipment_ids, s.equipment_name, s.estimated_duration, s.sop_ids, s.sop_content,
s.tenant_no, 4, s.remark, s.create_by, IFNULL(s.create_dept_id, ''), NOW(), s.update_by, NOW(), 0 s.tenant_no, 4, s.remark, s.create_by, IFNULL(s.create_dept_id, ''), NOW(), s.update_by, NOW(), 0
FROM biz_process_route_step s FROM biz_process_route_step s
JOIN biz_process_route r ON r.id = s.route_id AND r.del_flag = 0 JOIN biz_process_route r
ON r.id COLLATE utf8mb4_unicode_ci = s.route_id COLLATE utf8mb4_unicode_ci
AND r.del_flag = 0
WHERE s.del_flag = 0 WHERE s.del_flag = 0
AND s.process_code = 'SOP-SC-005-E01-01' AND s.process_code = 'SOP-SC-005-E01-01'
AND ( AND (
@@ -187,7 +196,9 @@ SELECT
s.description, s.equipment_ids, s.equipment_name, s.estimated_duration, s.sop_ids, s.sop_content, s.description, s.equipment_ids, s.equipment_name, s.estimated_duration, s.sop_ids, s.sop_content,
s.tenant_no, 5, s.remark, s.create_by, IFNULL(s.create_dept_id, ''), NOW(), s.update_by, NOW(), 0 s.tenant_no, 5, s.remark, s.create_by, IFNULL(s.create_dept_id, ''), NOW(), s.update_by, NOW(), 0
FROM biz_process_route_step s FROM biz_process_route_step s
JOIN biz_process_route r ON r.id = s.route_id AND r.del_flag = 0 JOIN biz_process_route r
ON r.id COLLATE utf8mb4_unicode_ci = s.route_id COLLATE utf8mb4_unicode_ci
AND r.del_flag = 0
WHERE s.del_flag = 0 WHERE s.del_flag = 0
AND s.process_code = 'SOP-SC-008-E01-01' AND s.process_code = 'SOP-SC-008-E01-01'
AND ( AND (
@@ -228,7 +239,7 @@ WHERE r.id = 'UCMSCROUTEA5CC11F194118AC54085447A'
AND r.del_flag = 0 AND r.del_flag = 0
AND NOT EXISTS ( AND NOT EXISTS (
SELECT 1 FROM biz_production_task_set x SELECT 1 FROM biz_production_task_set x
WHERE x.tenant_no = r.tenant_no WHERE x.tenant_no COLLATE utf8mb4_unicode_ci = r.tenant_no COLLATE utf8mb4_unicode_ci
AND x.set_name = '脐带MSC原代培养(内置模版)' AND x.set_name = '脐带MSC原代培养(内置模版)'
AND x.is_builtin = '1' AND x.is_builtin = '1'
AND x.del_flag = 0 AND x.del_flag = 0
@@ -261,5 +272,6 @@ WHERE s.set_name = '脐带MSC原代培养(内置模版)'
AND s.del_flag = 0 AND s.del_flag = 0
AND NOT EXISTS ( AND NOT EXISTS (
SELECT 1 FROM biz_production_task_set_item x SELECT 1 FROM biz_production_task_set_item x
WHERE x.set_id = s.id AND x.del_flag = 0 WHERE x.set_id COLLATE utf8mb4_unicode_ci = s.id COLLATE utf8mb4_unicode_ci
AND x.del_flag = 0
); );
@@ -16,6 +16,10 @@
-- 幂等:已有有效任务的工单不会进入候选;重复执行影响行数应为 0。 -- 幂等:已有有效任务的工单不会进入候选;重复执行影响行数应为 0。
-- 前置:biz_process_route.route_code='MSC原代-UC-BUILTIN'(或固定 id UCMSCROUTE…)及 5 步须已存在。 -- 前置:biz_process_route.route_code='MSC原代-UC-BUILTIN'(或固定 id UCMSCROUTE…)及 5 步须已存在。
-- MySQL 5.7 / utf8mb4。未在生产库执行;执行前请先跑下方「预览」SELECT。 -- MySQL 5.7 / utf8mb4。未在生产库执行;执行前请先跑下方「预览」SELECT。
-- 兼容:
-- 1) 跨表等值统一 COLLATE utf8mb4_general_ci,避免 unicode_ci/general_ci 混用失败
-- 2) 多行 ID 用 MD5(业务键) 生成,避免同语句多行 UUID() 撞主键
-- 3) task_no 序号用 UNSIGNED 整数拼接,避免用户变量浮点变成 RW…2.00
SET NAMES utf8mb4; SET NAMES utf8mb4;
@@ -43,7 +47,7 @@ SET @uc_route_id := (
SET @uc_step_count := ( SET @uc_step_count := (
SELECT COUNT(*) SELECT COUNT(*)
FROM biz_process_route_step s FROM biz_process_route_step s
WHERE s.route_id = @uc_route_id WHERE s.route_id COLLATE utf8mb4_unicode_ci = @uc_route_id COLLATE utf8mb4_unicode_ci
AND s.del_flag = 0 AND s.del_flag = 0
); );
@@ -70,7 +74,7 @@ CREATE TEMPORARY TABLE tmp_uc_wo_backfill (
route_id VARCHAR(64) NULL, route_id VARCHAR(64) NULL,
PRIMARY KEY (seq), PRIMARY KEY (seq),
UNIQUE KEY uk_wo (work_order_id) UNIQUE KEY uk_wo (work_order_id)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
INSERT INTO tmp_uc_wo_backfill ( INSERT INTO tmp_uc_wo_backfill (
work_order_id, reception_id, lab_storage_code, tenant_no, sample_code, route_id work_order_id, reception_id, lab_storage_code, tenant_no, sample_code, route_id
@@ -84,8 +88,8 @@ SELECT
@uc_route_id @uc_route_id
FROM biz_production_work_order wo FROM biz_production_work_order wo
INNER JOIN biz_sample_reception rec INNER JOIN biz_sample_reception rec
ON rec.id = wo.reception_id ON rec.id COLLATE utf8mb4_general_ci = wo.reception_id COLLATE utf8mb4_general_ci
AND rec.tenant_no = wo.tenant_no AND rec.tenant_no COLLATE utf8mb4_general_ci = wo.tenant_no COLLATE utf8mb4_general_ci
AND rec.del_flag = 0 AND rec.del_flag = 0
WHERE @uc_ready = 1 WHERE @uc_ready = 1
AND wo.del_flag = 0 AND wo.del_flag = 0
@@ -101,8 +105,8 @@ WHERE @uc_ready = 1
AND NOT EXISTS ( AND NOT EXISTS (
SELECT 1 SELECT 1
FROM biz_production_task t FROM biz_production_task t
WHERE t.work_order_id = wo.id WHERE t.work_order_id COLLATE utf8mb4_general_ci = wo.id COLLATE utf8mb4_general_ci
AND t.tenant_no = wo.tenant_no AND t.tenant_no COLLATE utf8mb4_general_ci = wo.tenant_no COLLATE utf8mb4_general_ci
AND t.del_flag = 0 AND t.del_flag = 0
) )
ORDER BY rec.reception_time ASC, wo.create_time ASC; ORDER BY rec.reception_time ASC, wo.create_time ASC;
@@ -125,12 +129,13 @@ SET @task_day := DATE_FORMAT(NOW(), '%Y%m%d');
SET @task_no_base := ( SET @task_no_base := (
SELECT IFNULL(MAX(CAST(SUBSTRING(t.task_no, 11) AS UNSIGNED)), 0) SELECT IFNULL(MAX(CAST(SUBSTRING(t.task_no, 11) AS UNSIGNED)), 0)
FROM biz_production_task t FROM biz_production_task t
WHERE t.task_no LIKE CONCAT('RW', @task_day, '%') WHERE t.task_no REGEXP CONCAT('^RW', @task_day, '[0-9]{4}$')
); );
SET @task_no_base := CAST(IFNULL(@task_no_base, 0) AS UNSIGNED);
UPDATE tmp_uc_wo_backfill UPDATE tmp_uc_wo_backfill
SET SET
task_id = UPPER(REPLACE(UUID(), '-', '')), task_id = UPPER(MD5(CONCAT('uc-msc-backfill-task:', work_order_id))),
task_no = CONCAT('RW', @task_day, LPAD(@task_no_base + seq, 4, '0')); task_no = CONCAT('RW', @task_day, LPAD(@task_no_base + seq, 4, '0'));
-- --------------------------------------------------------------------------- -- ---------------------------------------------------------------------------
@@ -170,14 +175,14 @@ SELECT
0 0
FROM tmp_uc_wo_backfill c FROM tmp_uc_wo_backfill c
INNER JOIN biz_process_route r INNER JOIN biz_process_route r
ON r.id = c.route_id ON r.id COLLATE utf8mb4_unicode_ci = c.route_id COLLATE utf8mb4_unicode_ci
AND r.del_flag = 0 AND r.del_flag = 0
WHERE @uc_ready = 1 WHERE @uc_ready = 1
AND c.task_id IS NOT NULL AND c.task_id IS NOT NULL
AND NOT EXISTS ( AND NOT EXISTS (
SELECT 1 FROM biz_production_task t SELECT 1 FROM biz_production_task t
WHERE t.work_order_id = c.work_order_id WHERE t.work_order_id COLLATE utf8mb4_general_ci = c.work_order_id COLLATE utf8mb4_general_ci
AND t.tenant_no = c.tenant_no AND t.tenant_no COLLATE utf8mb4_general_ci = c.tenant_no COLLATE utf8mb4_general_ci
AND t.del_flag = 0 AND t.del_flag = 0
); );
@@ -195,7 +200,7 @@ CREATE TEMPORARY TABLE tmp_uc_step_map (
PRIMARY KEY (task_id, route_step_id), PRIMARY KEY (task_id, route_step_id),
KEY ix_route_step (route_step_id), KEY ix_route_step (route_step_id),
KEY ix_task_step (task_step_id) KEY ix_task_step (task_step_id)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
INSERT INTO tmp_uc_step_map ( INSERT INTO tmp_uc_step_map (
task_id, work_order_id, tenant_no, route_step_id, task_step_id, step_order task_id, work_order_id, tenant_no, route_step_id, task_step_id, step_order
@@ -205,16 +210,17 @@ SELECT
c.work_order_id, c.work_order_id,
c.tenant_no, c.tenant_no,
rs.id, rs.id,
UPPER(REPLACE(UUID(), '-', '')), UPPER(MD5(CONCAT('uc-msc-backfill-step:', c.work_order_id, ':', rs.id))),
rs.step_order rs.step_order
FROM tmp_uc_wo_backfill c FROM tmp_uc_wo_backfill c
INNER JOIN biz_process_route_step rs INNER JOIN biz_process_route_step rs
ON rs.route_id = c.route_id ON rs.route_id COLLATE utf8mb4_unicode_ci = c.route_id COLLATE utf8mb4_unicode_ci
AND rs.del_flag = 0 AND rs.del_flag = 0
WHERE @uc_ready = 1 WHERE @uc_ready = 1
AND EXISTS ( AND EXISTS (
SELECT 1 FROM biz_production_task t SELECT 1 FROM biz_production_task t
WHERE t.id = c.task_id AND t.del_flag = 0 WHERE t.id COLLATE utf8mb4_general_ci = c.task_id COLLATE utf8mb4_general_ci
AND t.del_flag = 0
); );
-- --------------------------------------------------------------------------- -- ---------------------------------------------------------------------------
@@ -257,11 +263,11 @@ SELECT
0 0
FROM tmp_uc_step_map m FROM tmp_uc_step_map m
INNER JOIN biz_process_route_step rs INNER JOIN biz_process_route_step rs
ON rs.id = m.route_step_id ON rs.id COLLATE utf8mb4_unicode_ci = m.route_step_id COLLATE utf8mb4_unicode_ci
AND rs.del_flag = 0 AND rs.del_flag = 0
WHERE NOT EXISTS ( WHERE NOT EXISTS (
SELECT 1 FROM biz_production_task_step x SELECT 1 FROM biz_production_task_step x
WHERE x.id = m.task_step_id WHERE x.id COLLATE utf8mb4_general_ci = m.task_step_id COLLATE utf8mb4_general_ci
); );
-- --------------------------------------------------------------------------- -- ---------------------------------------------------------------------------
@@ -273,7 +279,7 @@ INSERT INTO biz_production_task_step_reagent (
create_by, create_dept_id, create_time, update_by, update_time, del_flag create_by, create_dept_id, create_time, update_by, update_time, del_flag
) )
SELECT SELECT
UPPER(REPLACE(UUID(), '-', '')), UPPER(MD5(CONCAT('uc-msc-backfill-reag:', m.task_step_id, ':', src.id))),
m.task_step_id, m.task_step_id,
src.reagent_code, src.reagent_code,
src.reagent_name, src.reagent_name,
@@ -292,7 +298,7 @@ SELECT
0 0
FROM tmp_uc_step_map m FROM tmp_uc_step_map m
INNER JOIN biz_process_route_step_reagent src INNER JOIN biz_process_route_step_reagent src
ON src.step_id = m.route_step_id ON src.step_id COLLATE utf8mb4_unicode_ci = m.route_step_id COLLATE utf8mb4_unicode_ci
AND src.del_flag = 0; AND src.del_flag = 0;
INSERT INTO biz_production_task_step_consumable ( INSERT INTO biz_production_task_step_consumable (
@@ -301,7 +307,7 @@ INSERT INTO biz_production_task_step_consumable (
create_by, create_dept_id, create_time, update_by, update_time, del_flag create_by, create_dept_id, create_time, update_by, update_time, del_flag
) )
SELECT SELECT
UPPER(REPLACE(UUID(), '-', '')), UPPER(MD5(CONCAT('uc-msc-backfill-cons:', m.task_step_id, ':', src.id))),
m.task_step_id, m.task_step_id,
src.consumable_code, src.consumable_code,
src.consumable_name, src.consumable_name,
@@ -320,7 +326,7 @@ SELECT
0 0
FROM tmp_uc_step_map m FROM tmp_uc_step_map m
INNER JOIN biz_process_route_step_consumable src INNER JOIN biz_process_route_step_consumable src
ON src.step_id = m.route_step_id ON src.step_id COLLATE utf8mb4_unicode_ci = m.route_step_id COLLATE utf8mb4_unicode_ci
AND src.del_flag = 0; AND src.del_flag = 0;
INSERT INTO biz_production_task_step_output ( INSERT INTO biz_production_task_step_output (
@@ -329,7 +335,7 @@ INSERT INTO biz_production_task_step_output (
create_by, create_dept_id, create_time, update_by, update_time, del_flag create_by, create_dept_id, create_time, update_by, update_time, del_flag
) )
SELECT SELECT
UPPER(REPLACE(UUID(), '-', '')), UPPER(MD5(CONCAT('uc-msc-backfill-out:', m.task_step_id, ':', src.id))),
m.task_step_id, m.task_step_id,
src.output_type_id, src.output_type_id,
src.output_name, src.output_name,
@@ -345,7 +351,7 @@ SELECT
0 0
FROM tmp_uc_step_map m FROM tmp_uc_step_map m
INNER JOIN biz_process_route_step_output src INNER JOIN biz_process_route_step_output src
ON src.step_id = m.route_step_id ON src.step_id COLLATE utf8mb4_unicode_ci = m.route_step_id COLLATE utf8mb4_unicode_ci
AND src.del_flag = 0; AND src.del_flag = 0;
INSERT INTO biz_production_task_step_data_collection ( INSERT INTO biz_production_task_step_data_collection (
@@ -353,7 +359,7 @@ INSERT INTO biz_production_task_step_data_collection (
create_by, create_dept_id, create_time, update_by, update_time, del_flag create_by, create_dept_id, create_time, update_by, update_time, del_flag
) )
SELECT SELECT
UPPER(REPLACE(UUID(), '-', '')), UPPER(MD5(CONCAT('uc-msc-backfill-dc:', m.task_step_id, ':', src.id))),
m.task_step_id, m.task_step_id,
src.collection_name, src.collection_name,
src.unit, src.unit,
@@ -368,14 +374,15 @@ SELECT
0 0
FROM tmp_uc_step_map m FROM tmp_uc_step_map m
INNER JOIN biz_process_route_step_data_collection src INNER JOIN biz_process_route_step_data_collection src
ON src.step_id = m.route_step_id ON src.step_id COLLATE utf8mb4_unicode_ci = m.route_step_id COLLATE utf8mb4_unicode_ci
AND src.del_flag = 0; AND src.del_flag = 0;
-- --------------------------------------------------------------------------- -- ---------------------------------------------------------------------------
-- 6. 回写工单状态:有任务则 jxz(不改 ywc) -- 6. 回写工单状态:有任务则 jxz(不改 ywc)
-- --------------------------------------------------------------------------- -- ---------------------------------------------------------------------------
UPDATE biz_production_work_order wo UPDATE biz_production_work_order wo
INNER JOIN tmp_uc_wo_backfill c ON c.work_order_id = wo.id INNER JOIN tmp_uc_wo_backfill c
ON c.work_order_id COLLATE utf8mb4_general_ci = wo.id COLLATE utf8mb4_general_ci
SET SET
wo.work_order_status = 'jxz', wo.work_order_status = 'jxz',
wo.update_time = NOW() wo.update_time = NOW()
@@ -383,8 +390,8 @@ WHERE wo.del_flag = 0
AND wo.work_order_status = 'dpz' AND wo.work_order_status = 'dpz'
AND EXISTS ( AND EXISTS (
SELECT 1 FROM biz_production_task t SELECT 1 FROM biz_production_task t
WHERE t.work_order_id = wo.id WHERE t.work_order_id COLLATE utf8mb4_general_ci = wo.id COLLATE utf8mb4_general_ci
AND t.tenant_no = wo.tenant_no AND t.tenant_no COLLATE utf8mb4_general_ci = wo.tenant_no COLLATE utf8mb4_general_ci
AND t.del_flag = 0 AND t.del_flag = 0
); );
@@ -399,10 +406,18 @@ SELECT
t.id AS task_id, t.id AS task_id,
t.task_no, t.task_no,
t.task_name, t.task_name,
(SELECT COUNT(*) FROM biz_production_task_step s WHERE s.task_id = t.id AND s.del_flag = 0) AS step_count (
SELECT COUNT(*)
FROM biz_production_task_step s
WHERE s.task_id COLLATE utf8mb4_general_ci = t.id COLLATE utf8mb4_general_ci
AND s.del_flag = 0
) AS step_count
FROM tmp_uc_wo_backfill c FROM tmp_uc_wo_backfill c
LEFT JOIN biz_production_work_order wo ON wo.id = c.work_order_id LEFT JOIN biz_production_work_order wo
LEFT JOIN biz_production_task t ON t.id = c.task_id AND t.del_flag = 0 ON wo.id COLLATE utf8mb4_general_ci = c.work_order_id COLLATE utf8mb4_general_ci
LEFT JOIN biz_production_task t
ON t.id COLLATE utf8mb4_general_ci = c.task_id COLLATE utf8mb4_general_ci
AND t.del_flag = 0
ORDER BY c.seq; ORDER BY c.seq;
DROP TEMPORARY TABLE IF EXISTS tmp_uc_step_map; DROP TEMPORARY TABLE IF EXISTS tmp_uc_step_map;
-53
View File
@@ -1335,59 +1335,6 @@ export const sqxpAdminRoutes: AppRouteRecord[] = [
] ]
}, },
// ═══════════════════════════════════════════════════════════════════════════
// 3b. 实验室样本处理数据 (menu:lab-sample-processing)
// ═══════════════════════════════════════════════════════════════════════════
{
id: 'TOP0000000000000000000000000000L1',
name: 'LabSampleProcessing',
path: '/lab-sample-processing',
component: '/index/index',
meta: {
title: '实验室样本处理数据',
icon: 'ri:test-tube-line',
keepAlive: false,
isTopMenu: true,
menuCode: 'menu:lab-sample-processing',
roles: ['admin']
},
children: [
{
id: 'LAB00000000000000000000000000001',
name: 'LabSampleProcessingHsc',
path: 'hsc',
component: '/lab-sample-processing/hsc/index',
meta: {
title: '造血干细胞数据',
keepAlive: true,
menuCode: 'lab:sample-processing:list'
}
},
{
id: 'LAB00000000000000000000000000002',
name: 'LabSampleProcessingUbmc',
path: 'ubmc',
component: '/lab-sample-processing/ubmc/index',
meta: {
title: '单个核数据',
keepAlive: true,
menuCode: 'lab:sample-processing:list'
}
},
{
id: 'LAB00000000000000000000000000003',
name: 'LabSampleProcessingMsc',
path: 'msc',
component: '/lab-sample-processing/msc/index',
meta: {
title: '脐带间充质干细胞数据',
keepAlive: true,
menuCode: 'lab:sample-processing:list'
}
}
]
},
// ═══════════════════════════════════════════════════════════════════════════ // ═══════════════════════════════════════════════════════════════════════════
// 4. 运营支撑 (menu:operations) // 4. 运营支撑 (menu:operations)
// 二级菜单:系统基础信息、运营支撑 // 二级菜单:系统基础信息、运营支撑