mom-pro2-after.git

			@@ -7928,11 +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 'åŒçº§æŽ’åºå·',
			`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 '结果值类型',
			@@ -7971,7 +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ï¼‰',
			`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 '创建者',
			@@ -8016,11 +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 'å®¡æ ¸äººç”¨æˆ·ç¼–å·',
			`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 '创建时间',
			@@ -8083,11 +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 'å®¡æ ¸äººç”¨æˆ·ç¼–å·',
			`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 '创建时间',
			@@ -8193,11 +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 'å®¡æ ¸äººç”¨æˆ·ç¼–å·',
			`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 '创建时间',
			@@ -8258,11 +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 'å®¡æ ¸äººç”¨æˆ·ç¼–å·',
			`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 '创建时间',
			@@ -8303,7 +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ï¼‰',
			`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 '创建者',
			@@ -8320,8 +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=å¦',
			`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 '计量单位编号',