From 0641dcf9634a2b421a17eb166c9f153ae1f3c3f3 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期四, 29 十月 2026 12:03:34 +0800
Subject: [PATCH] fix(safety): 修复 uk_code 唯一索引导致同编码二次软删除报 500
---
.gitignore | 7 +++
sql/mysql/safety_fix_code_index_20261029.sql | 54 +++++++++++++++++++++++++++
2 files changed, 61 insertions(+), 0 deletions(-)
diff --git a/.gitignore b/.gitignore
index 44a20f9..2c46605 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,3 +76,10 @@
# 鏁版嵁搴撳彉鏇磋剼鏈紙鎵嬪姩鎵ц锛屼笉鍏ュ簱锛�
sql/sale_order_bpm_approval.sql
.export_tmp/
+
+# SSH MCP锛氫緷璧栦笌鏈湴閰嶇疆锛堝惈鍑嵁锛岀粷涓嶅叆搴擄級
+scripts/mcp-ssh/node_modules/
+scripts/mcp-ssh/package-lock.json
+
+# 鏈湴楠岃瘉鐢細鐢熶骇搴撳揩鐓� + 鏈湴瑕嗙洊閰嶇疆锛岀粷涓嶅叆搴�
+.local-test/
diff --git a/sql/mysql/safety_fix_code_index_20261029.sql b/sql/mysql/safety_fix_code_index_20261029.sql
new file mode 100644
index 0000000..c6bddfa
--- /dev/null
+++ b/sql/mysql/safety_fix_code_index_20261029.sql
@@ -0,0 +1,54 @@
+-- ============================================================
+-- 瀹夊叏鐢熶骇 - 淇 uk_code 鍞竴绱㈠紩瀵艰嚧銆岀浜屾杞垹闄ゅ悓缂栫爜銆嶆姤閿�
+-- 鐢熸垚鏃堕棿锛�2026-10-29
+--
+-- 鐜拌薄锛氬贰妫�鐐逛綅 PD-001 鍏堣杞垹涓�娆★紝涔嬪悗鏂板缓鍚岀紪鐮� PD-001 鍐嶅垹闄ゆ椂鎶�
+-- Duplicate entry 'PD-001-\x01' for key 'safety_inspection_point.uk_code'
+-- 鎺ュ彛杩斿洖銆岀郴缁熷紓甯搞��(500)
+--
+-- 鍘熷洜锛歶k_code 寤哄湪 (code, deleted) 涓婏紝deleted 鏄� bit(1)銆�
+-- 杞垹闄ゅ悗 deleted=b'1'锛岃嫢鍘嗗彶涓婂凡鏈変竴鏉″悓缂栫爜涓斿凡杞垹鐨勮褰曪紝
+-- 绗簩娆¤蒋鍒犻櫎灏变細鎻掑叆閲嶅鐨� (code, b'1') 缁勫悎锛屾挒鍞竴閿��
+--
+-- 淇锛氬幓鎺� (code, deleted) 鍞竴绾︽潫锛屾敼鎴愭櫘閫氱储寮� idx_code 鐢ㄤ簬鏌ヨ锛�
+-- 缂栫爜鍞竴鎬х敱 Service 灞備繚璇侊紙鏂板/淇敼鏃� selectByCode 鏌ユ椿璺冭褰曞垽閲嶏紝
+-- 涓� yudao 鍏跺畠涓氬姟琛ㄤ竴鑷达紝渚嬪 mes_dv_machinery 灏辨病鏈� code 鍞竴閿級銆�
+--
+-- 骞傜瓑锛氬厛鍒ゆ柇绱㈠紩鏄惁瀛樺湪鍐嶆搷浣滐紝鍙噸澶嶆墽琛�
+-- ============================================================
+
+DROP PROCEDURE IF EXISTS sp_safety_fix_code_index;
+DELIMITER $$
+CREATE PROCEDURE sp_safety_fix_code_index(IN p_table VARCHAR(64))
+BEGIN
+ -- 1. 鍒犳帀鏃х殑 (code, deleted) 鍞竴閿�
+ IF EXISTS (SELECT 1 FROM information_schema.statistics
+ WHERE table_schema = DATABASE() AND table_name = p_table AND index_name = 'uk_code') THEN
+ SET @s = CONCAT('ALTER TABLE `', p_table, '` DROP INDEX `uk_code`');
+ PREPARE st FROM @s; EXECUTE st; DEALLOCATE PREPARE st;
+ END IF;
+ -- 2. 琛ヤ竴涓櫘閫氱储寮曪紝淇濊瘉鎸夌紪鐮佹煡璇㈢殑鎬ц兘
+ IF NOT EXISTS (SELECT 1 FROM information_schema.statistics
+ WHERE table_schema = DATABASE() AND table_name = p_table AND index_name = 'idx_code') THEN
+ SET @s2 = CONCAT('CREATE INDEX `idx_code` ON `', p_table, '` (`code`)');
+ PREPARE st2 FROM @s2; EXECUTE st2; DEALLOCATE PREPARE st2;
+ END IF;
+END$$
+DELIMITER ;
+
+CALL sp_safety_fix_code_index('safety_inspection_point');
+CALL sp_safety_fix_code_index('safety_hazard');
+CALL sp_safety_fix_code_index('safety_material');
+CALL sp_safety_fix_code_index('safety_work_permit');
+CALL sp_safety_fix_code_index('safety_accident');
+
+DROP PROCEDURE IF EXISTS sp_safety_fix_code_index;
+
+-- ---------- 鏍¢獙锛氱‘璁ゅ凡鏃� uk_code锛屼笖鏈� idx_code ----------
+SELECT TABLE_NAME, INDEX_NAME, NON_UNIQUE,
+ GROUP_CONCAT(COLUMN_NAME ORDER BY SEQ_IN_INDEX) AS cols
+ FROM information_schema.statistics
+ WHERE table_schema = DATABASE() AND TABLE_NAME LIKE 'safety%'
+ AND INDEX_NAME IN ('uk_code', 'idx_code')
+ GROUP BY TABLE_NAME, INDEX_NAME, NON_UNIQUE
+ ORDER BY TABLE_NAME;
--
Gitblit v1.9.3