From 7a681887e5a8e1aab49acc886974d354c69a280e Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 17 九月 2026 13:10:38 +0800
Subject: [PATCH] feat(mes): 新增质检指标分组树和平行测量功能

---
 docs/sql/config_export_all_20260904.sql |   37 ++++++++++++++++++++++++++++++++++---
 1 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/docs/sql/config_export_all_20260904.sql b/docs/sql/config_export_all_20260904.sql
index beb004f..4d9788a 100644
--- a/docs/sql/config_export_all_20260904.sql
+++ b/docs/sql/config_export_all_20260904.sql
@@ -7928,6 +7928,11 @@
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '缂栧彿',
   `code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '妫�娴嬮」缂栫爜',
   `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '妫�娴嬮」鍚嶇О',
+  `parent_id` bigint NOT NULL DEFAULT '0' COMMENT '莽藛露忙艗鈥∶β犫�∶尖�撁ヂ徛访妓�0=茅隆露莽潞搂茂录鈥�',
+  `item_type` tinyint NOT NULL DEFAULT '1' COMMENT '忙聺隆莽鈥郝甭幻ヅ锯�姑寂�1=氓陆鈥⒚モ�βッ┞÷姑寂�2=氓藛鈥犆烩�灻┞÷�',
+  `formula_text` varchar(500) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '氓鈥βヂ悸徝ヂ扁�⒚ぢ好︹�撯�∶ε撀妓喢︹�扳�溍ヂ嵚懊ε犅ッモ�樑犆р�澛寂捗ぢ嘎嵜ヂ忊�毭ぢ概矫∶�斆尖��',
+  `unit_text` varchar(50) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '氓聧鈥⒚ぢ铰嵜︹�撯�∶ε撀妓喢ヂ︹�� kg/m脗鲁茫鈧�/%茂录艗忙鈥扳�溍ヂ嵚懊ヂ扁�⒚ぢ好р�澛尖��',
+  `sort_order` int NOT NULL DEFAULT '0' COMMENT '氓聬艗莽潞搂忙沤鈥櫭ヂ郝徝ヂ徛�',
   `type` int DEFAULT NULL COMMENT '妫�娴嬮」绫诲瀷',
   `tool` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '妫�娴嬪伐鍏�',
   `result_type` int DEFAULT NULL COMMENT '缁撴灉鍊肩被鍨�',
@@ -7938,8 +7943,9 @@
   `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '鏇存柊鑰�',
   `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿',
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '鏄惁鍒犻櫎',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='MES 璐ㄦ鎸囨爣';
+  PRIMARY KEY (`id`) USING BTREE,
+  KEY `idx_qc_indicator_parent_id` (`parent_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=35 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='MES 璐ㄦ鎸囨爣';
 
 -- ============ 琛細mes_qc_indicator_result锛堜粎 DDL锛屾棤鏁版嵁锛� ============
 DROP TABLE IF EXISTS `mes_qc_indicator_result`;
@@ -7965,6 +7971,7 @@
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '缂栧彿',
   `result_id` bigint DEFAULT NULL COMMENT '鍏宠仈妫�楠岀粨鏋滅紪鍙�',
   `indicator_id` bigint DEFAULT NULL COMMENT '妫�娴嬫寚鏍囩紪鍙�',
+  `measure_no` int NOT NULL DEFAULT '1' COMMENT '忙碌鈥姑┾�÷徝︹�奥姑β∶ヂ徛访妓喢ぢ慌� 1 氓录鈧ヂр�姑寂捗┞凰溍� 1茂录鈥�',
   `value` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '妫�娴嬪��',
   `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '澶囨敞',
   `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '鍒涘缓鑰�',
@@ -7972,7 +7979,8 @@
   `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '鏇存柊鑰�',
   `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿',
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '鏄惁鍒犻櫎',
-  PRIMARY KEY (`id`) USING BTREE
+  PRIMARY KEY (`id`) USING BTREE,
+  KEY `idx_qc_result_detail_measure` (`result_id`,`indicator_id`,`measure_no`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='MES 妫�楠岀粨鏋滄槑缁嗚褰�';
 
 -- ============ 琛細mes_qc_ipqc锛堜粎 DDL锛屾棤鏁版嵁锛� ============
@@ -8008,6 +8016,11 @@
   `inspect_date` datetime DEFAULT NULL COMMENT '妫�娴嬫棩鏈�',
   `inspector_user_id` bigint DEFAULT NULL COMMENT '妫�娴嬩汉鍛樼敤鎴风紪鍙�',
   `status` int DEFAULT NULL COMMENT '鐘舵��',
+  `sampling_location` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '茅鈥♀�∶β犅访ヅ撀懊р�毬�',
+  `certificate_no` varchar(50) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '猫炉聛盲鹿娄莽录鈥撁ヂ徛�/氓聬藛忙聽录猫炉聛氓聫路',
+  `execute_standard` varchar(50) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '忙鈥奥∨捗β犫�∶モ�♀��',
+  `audit_user_id` bigint DEFAULT NULL COMMENT '氓陇聧忙聽赂盲潞潞莽鈥澛λ喡访尖�撁ヂ徛�',
+  `approve_user_id` bigint DEFAULT NULL COMMENT '氓庐隆忙聽赂盲潞潞莽鈥澛λ喡访尖�撁ヂ徛�',
   `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '澶囨敞',
   `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '鍒涘缓鑰�',
   `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
@@ -8070,6 +8083,11 @@
   `inspect_date` datetime DEFAULT NULL COMMENT '妫�娴嬫棩鏈�',
   `inspector_user_id` bigint DEFAULT NULL COMMENT '妫�娴嬩汉鍛樼敤鎴风紪鍙�',
   `status` int DEFAULT NULL COMMENT '鐘舵��',
+  `sampling_location` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '茅鈥♀�∶β犅访ヅ撀懊р�毬�',
+  `certificate_no` varchar(50) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '猫炉聛盲鹿娄莽录鈥撁ヂ徛�/氓聬藛忙聽录猫炉聛氓聫路',
+  `execute_standard` varchar(50) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '忙鈥奥∨捗β犫�∶モ�♀��',
+  `audit_user_id` bigint DEFAULT NULL COMMENT '氓陇聧忙聽赂盲潞潞莽鈥澛λ喡访尖�撁ヂ徛�',
+  `approve_user_id` bigint DEFAULT NULL COMMENT '氓庐隆忙聽赂盲潞潞莽鈥澛λ喡访尖�撁ヂ徛�',
   `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '澶囨敞',
   `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '鍒涘缓鑰�',
   `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
@@ -8175,6 +8193,11 @@
   `inspect_date` datetime DEFAULT NULL COMMENT '妫�娴嬫棩鏈�',
   `inspector_user_id` bigint DEFAULT NULL COMMENT '妫�娴嬩汉鍛樼敤鎴风紪鍙�',
   `status` int DEFAULT NULL COMMENT '鐘舵��',
+  `sampling_location` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '茅鈥♀�∶β犅访ヅ撀懊р�毬�',
+  `certificate_no` varchar(50) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '猫炉聛盲鹿娄莽录鈥撁ヂ徛�/氓聬藛忙聽录猫炉聛氓聫路',
+  `execute_standard` varchar(50) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '忙鈥奥∨捗β犫�∶モ�♀��',
+  `audit_user_id` bigint DEFAULT NULL COMMENT '氓陇聧忙聽赂盲潞潞莽鈥澛λ喡访尖�撁ヂ徛�',
+  `approve_user_id` bigint DEFAULT NULL COMMENT '氓庐隆忙聽赂盲潞潞莽鈥澛λ喡访尖�撁ヂ徛�',
   `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '澶囨敞',
   `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '鍒涘缓鑰�',
   `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
@@ -8235,6 +8258,11 @@
   `inspect_date` datetime DEFAULT NULL COMMENT '妫�娴嬫棩鏈�',
   `inspector_user_id` bigint DEFAULT NULL COMMENT '妫�娴嬩汉鍛樼敤鎴风紪鍙�',
   `status` int DEFAULT NULL COMMENT '鐘舵��',
+  `sampling_location` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '茅鈥♀�∶β犅访ヅ撀懊р�毬�',
+  `certificate_no` varchar(50) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '猫炉聛盲鹿娄莽录鈥撁ヂ徛�/氓聬藛忙聽录猫炉聛氓聫路',
+  `execute_standard` varchar(50) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '忙鈥奥∨捗β犫�∶モ�♀��',
+  `audit_user_id` bigint DEFAULT NULL COMMENT '氓陇聧忙聽赂盲潞潞莽鈥澛λ喡访尖�撁ヂ徛�',
+  `approve_user_id` bigint DEFAULT NULL COMMENT '氓庐隆忙聽赂盲潞潞莽鈥澛λ喡访尖�撁ヂ徛�',
   `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '澶囨敞',
   `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '鍒涘缓鑰�',
   `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
@@ -8275,6 +8303,7 @@
   `code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '鏂规缂栧彿',
   `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '鏂规鍚嶇О',
   `types` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '妫�娴嬬绫�',
+  `default_execute_standard` varchar(50) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '茅禄藴猫庐陇忙鈥奥∨捗β犫�∶モ�♀�犆妓喢ヂ︹�� GB/T6027茂录鈥�',
   `status` int DEFAULT NULL COMMENT '鐘舵��',
   `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '澶囨敞',
   `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '鍒涘缓鑰�',
@@ -8291,6 +8320,8 @@
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '缂栧彿',
   `template_id` bigint DEFAULT NULL COMMENT '璐ㄦ鏂规缂栧彿',
   `indicator_id` bigint DEFAULT NULL COMMENT '璐ㄦ鎸囨爣缂栧彿',
+  `sort_order` int NOT NULL DEFAULT '0' COMMENT '氓卤鈥⒚ぢ好ε解�櫭ヂ郝徝ヂ徛�',
+  `judge_flag` tinyint NOT NULL DEFAULT '1' COMMENT '忙藴炉氓聬娄氓聫鈥毭ぢ概矫ヂ愃喢β犅济ニ喡っヂ∶寂�1=忙藴炉茂录艗0=氓聬娄',
   `check_method` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '妫�娴嬫柟娉�',
   `standard_value` decimal(24,6) DEFAULT NULL COMMENT '鏍囧噯鍊�',
   `unit_measure_id` bigint DEFAULT NULL COMMENT '璁￠噺鍗曚綅缂栧彿',

--
Gitblit v1.9.3