From 7b6a0523ddfc8f96eeabcc03826c72078bb5cc49 Mon Sep 17 00:00:00 2001
From: zlwu <704541015@qq.com>
Date: Fri, 13 Nov 2026 13:27:43 +0800
Subject: [PATCH] =?UTF-8?q?fix(sql):=20=E5=85=BC=E5=AE=B9=20UC=20MSC=20?=
 =?UTF-8?q?=E5=9B=9E=E8=A1=A5=E8=84=9A=E6=9C=AC=E7=9A=84=20collation=20?=
 =?UTF-8?q?=E4=B8=8E=E7=A1=AE=E5=AE=9A=E6=80=A7=20ID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

跨表比较统一 COLLATE，避免 unicode_ci/general_ci 混用失败；回补 ID 改 MD5 业务键并修正 task_no 序号，避免 UUID 撞主键与浮点序号。

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../2026-11-13-uc-msc-builtin-task-set.sql    | 30 +++++---
 ...-11-13-uc-msc-production-task-backfill.sql | 77 +++++++++++--------
 2 files changed, 67 insertions(+), 40 deletions(-)

diff --git a/docs/sql/migrations/2026-11-13-uc-msc-builtin-task-set.sql b/docs/sql/migrations/2026-11-13-uc-msc-builtin-task-set.sql
index 3d210435..9cf4fea9 100644
--- a/docs/sql/migrations/2026-11-13-uc-msc-builtin-task-set.sql
+++ b/docs/sql/migrations/2026-11-13-uc-msc-builtin-task-set.sql
@@ -1,7 +1,8 @@
 -- UC 入库编码自动派发：脐带MSC原代培养（内置模版）5 步
 -- 步骤：原代培养 → 半换液 → 二次贴壁 → 重铺 → 冻存（不含传代）
 -- 内容从既有「干细胞培养（内置模版）」/ 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
 --   或 Python：
 --     cd backend && python -m scripts.backfill_uc_msc_production_tasks
@@ -46,7 +47,7 @@ WHERE src.del_flag = 0
   )
   AND NOT EXISTS (
     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.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.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
-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
   AND s.process_code = 'SOP-SC-003-E01-01'
   AND (
@@ -97,7 +100,9 @@ SELECT
   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
 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
   AND s.process_code = 'SOP-SC-004-E01-01'
   AND (
@@ -127,7 +132,9 @@ SELECT
   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
 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
   AND s.process_code = 'SOP-SC-006-E01-01'
   AND (
@@ -157,7 +164,9 @@ SELECT
   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
 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
   AND s.process_code = 'SOP-SC-005-E01-01'
   AND (
@@ -187,7 +196,9 @@ SELECT
   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
 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
   AND s.process_code = 'SOP-SC-008-E01-01'
   AND (
@@ -228,7 +239,7 @@ WHERE r.id = 'UCMSCROUTEA5CC11F194118AC54085447A'
   AND r.del_flag = 0
   AND NOT EXISTS (
     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.is_builtin = '1'
       AND x.del_flag = 0
@@ -261,5 +272,6 @@ WHERE s.set_name = '脐带MSC原代培养（内置模版）'
   AND s.del_flag = 0
   AND NOT EXISTS (
     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
   );
diff --git a/docs/sql/migrations/2026-11-13-uc-msc-production-task-backfill.sql b/docs/sql/migrations/2026-11-13-uc-msc-production-task-backfill.sql
index 95211781..388439f2 100644
--- a/docs/sql/migrations/2026-11-13-uc-msc-production-task-backfill.sql
+++ b/docs/sql/migrations/2026-11-13-uc-msc-production-task-backfill.sql
@@ -16,6 +16,10 @@
 -- 幂等：已有有效任务的工单不会进入候选；重复执行影响行数应为 0。
 -- 前置：biz_process_route.route_code='MSC原代-UC-BUILTIN'（或固定 id UCMSCROUTE…）及 5 步须已存在。
 -- 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;
 
@@ -43,7 +47,7 @@ SET @uc_route_id := (
 SET @uc_step_count := (
   SELECT COUNT(*)
   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
 );
 
@@ -70,7 +74,7 @@ CREATE TEMPORARY TABLE tmp_uc_wo_backfill (
   route_id VARCHAR(64) NULL,
   PRIMARY KEY (seq),
   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 (
   work_order_id, reception_id, lab_storage_code, tenant_no, sample_code, route_id
@@ -84,8 +88,8 @@ SELECT
   @uc_route_id
 FROM biz_production_work_order wo
 INNER JOIN biz_sample_reception rec
-  ON rec.id = wo.reception_id
- AND rec.tenant_no = wo.tenant_no
+  ON rec.id COLLATE utf8mb4_general_ci = wo.reception_id COLLATE utf8mb4_general_ci
+ AND rec.tenant_no COLLATE utf8mb4_general_ci = wo.tenant_no COLLATE utf8mb4_general_ci
  AND rec.del_flag = 0
 WHERE @uc_ready = 1
   AND wo.del_flag = 0
@@ -101,8 +105,8 @@ WHERE @uc_ready = 1
   AND NOT EXISTS (
     SELECT 1
     FROM biz_production_task t
-    WHERE t.work_order_id = wo.id
-      AND t.tenant_no = wo.tenant_no
+    WHERE t.work_order_id COLLATE utf8mb4_general_ci = wo.id COLLATE utf8mb4_general_ci
+      AND t.tenant_no COLLATE utf8mb4_general_ci = wo.tenant_no COLLATE utf8mb4_general_ci
       AND t.del_flag = 0
   )
 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 := (
   SELECT IFNULL(MAX(CAST(SUBSTRING(t.task_no, 11) AS UNSIGNED)), 0)
   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
 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'));
 
 -- ---------------------------------------------------------------------------
@@ -170,14 +175,14 @@ SELECT
   0
 FROM tmp_uc_wo_backfill c
 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
 WHERE @uc_ready = 1
   AND c.task_id IS NOT NULL
   AND NOT EXISTS (
     SELECT 1 FROM biz_production_task t
-    WHERE t.work_order_id = c.work_order_id
-      AND t.tenant_no = c.tenant_no
+    WHERE t.work_order_id COLLATE utf8mb4_general_ci = c.work_order_id COLLATE utf8mb4_general_ci
+      AND t.tenant_no COLLATE utf8mb4_general_ci = c.tenant_no COLLATE utf8mb4_general_ci
       AND t.del_flag = 0
   );
 
@@ -195,7 +200,7 @@ CREATE TEMPORARY TABLE tmp_uc_step_map (
   PRIMARY KEY (task_id, route_step_id),
   KEY ix_route_step (route_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 (
   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.tenant_no,
   rs.id,
-  UPPER(REPLACE(UUID(), '-', '')),
+  UPPER(MD5(CONCAT('uc-msc-backfill-step:', c.work_order_id, ':', rs.id))),
   rs.step_order
 FROM tmp_uc_wo_backfill c
 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
 WHERE @uc_ready = 1
   AND EXISTS (
     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
 FROM tmp_uc_step_map m
 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
 WHERE NOT EXISTS (
   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
 )
 SELECT
-  UPPER(REPLACE(UUID(), '-', '')),
+  UPPER(MD5(CONCAT('uc-msc-backfill-reag:', m.task_step_id, ':', src.id))),
   m.task_step_id,
   src.reagent_code,
   src.reagent_name,
@@ -292,7 +298,7 @@ SELECT
   0
 FROM tmp_uc_step_map m
 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;
 
 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
 )
 SELECT
-  UPPER(REPLACE(UUID(), '-', '')),
+  UPPER(MD5(CONCAT('uc-msc-backfill-cons:', m.task_step_id, ':', src.id))),
   m.task_step_id,
   src.consumable_code,
   src.consumable_name,
@@ -320,7 +326,7 @@ SELECT
   0
 FROM tmp_uc_step_map m
 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;
 
 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
 )
 SELECT
-  UPPER(REPLACE(UUID(), '-', '')),
+  UPPER(MD5(CONCAT('uc-msc-backfill-out:', m.task_step_id, ':', src.id))),
   m.task_step_id,
   src.output_type_id,
   src.output_name,
@@ -345,7 +351,7 @@ SELECT
   0
 FROM tmp_uc_step_map m
 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;
 
 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
 )
 SELECT
-  UPPER(REPLACE(UUID(), '-', '')),
+  UPPER(MD5(CONCAT('uc-msc-backfill-dc:', m.task_step_id, ':', src.id))),
   m.task_step_id,
   src.collection_name,
   src.unit,
@@ -368,14 +374,15 @@ SELECT
   0
 FROM tmp_uc_step_map m
 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;
 
 -- ---------------------------------------------------------------------------
 -- 6. 回写工单状态：有任务则 jxz（不改 ywc）
 -- ---------------------------------------------------------------------------
 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
   wo.work_order_status = 'jxz',
   wo.update_time = NOW()
@@ -383,8 +390,8 @@ WHERE wo.del_flag = 0
   AND wo.work_order_status = 'dpz'
   AND EXISTS (
     SELECT 1 FROM biz_production_task t
-    WHERE t.work_order_id = wo.id
-      AND t.tenant_no = wo.tenant_no
+    WHERE t.work_order_id COLLATE utf8mb4_general_ci = wo.id COLLATE utf8mb4_general_ci
+      AND t.tenant_no COLLATE utf8mb4_general_ci = wo.tenant_no COLLATE utf8mb4_general_ci
       AND t.del_flag = 0
   );
 
@@ -399,10 +406,18 @@ SELECT
   t.id AS task_id,
   t.task_no,
   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
-LEFT JOIN biz_production_work_order wo ON wo.id = c.work_order_id
-LEFT JOIN biz_production_task t ON t.id = c.task_id AND t.del_flag = 0
+LEFT JOIN biz_production_work_order wo
+  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;
 
 DROP TEMPORARY TABLE IF EXISTS tmp_uc_step_map;