From 086b2186789ea04362db4bce71c6112686c43caa Mon Sep 17 00:00:00 2001 From: 云 <2163098428@qq.com> Date: 星期一, 21 九月 2026 15:33:26 +0800 Subject: [PATCH] feat(crm): 支持合同编号自定义配置 --- docs/sql/config_export_all_20260904.sql | 75 +++++++++++++++++++++++++++++-------- 1 files changed, 58 insertions(+), 17 deletions(-) diff --git a/docs/sql/config_export_all_20260904.sql b/docs/sql/config_export_all_20260904.sql index 5591b57..d91386f 100644 --- a/docs/sql/config_export_all_20260904.sql +++ b/docs/sql/config_export_all_20260904.sql @@ -10,6 +10,7 @@ -- 鈶� BI 鍐崇瓥澶у睆 / go-view锛歜i_dashboard銆乥i_chart_config銆乥i_data_source_config銆乥i_warehouse_coordinate銆乺eport_go_view_project -- 鈶� MES 缂栫爜瑙勫垯锛堝墧娴佹按璁板綍锛夛細mes_md_auto_code_rule銆乵es_md_auto_code_part -- 鈶� 绯荤粺閰嶇疆涓绘暟鎹紙瀛楀吀/绉熸埛/鍏徃閰嶇疆锛涘墧韬唤/鑿滃崟/鏃ュ織锛夛細system_dict_type銆乻ystem_dict_data銆乻ystem_tenant銆乻ystem_tenant_package銆乻ystem_company_config +-- 鈿� 韬唤/鏉冮檺绫昏〃锛坰ystem_users/role/menu/role_menu/user_role/dept/post/oauth2_client锛夋澶勪粎寤虹┖琛ㄧ粨鏋勶紝鏁版嵁鐢辨枃浠舵湯灏�"闃舵浜�"璺ㄥ簱琛ュ銆� -- 鈶� AI 閰嶇疆锛堜粎妯″瀷+key锛�+ 鍩虹璁炬柦閰嶇疆绠＄悊锛歛i_model銆乤i_api_key銆乮nfra_config銆乮nfra_job銆乮nfra_file_config銆乮nfra_data_source_config銆乮nfra_codegen_table銆乮nfra_codegen_column -- 杩囨护锛氬崗鍚屾祦绋嬩粎淇濈暀婵�娲�(SUSPENSION_STATE_=1)瀹氫箟鍙婂叾閮ㄧ讲/瀛楄妭/妯″瀷/鎵╁睍淇℃伅锛� -- 缂栫爜瑙勫垯鍓旈櫎娴佹按璁板綍 mes_md_auto_code_record锛涜蒋鍒犻櫎琛ㄤ粎瀵� deleted=0銆� @@ -7927,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 '缁撴灉鍊肩被鍨�', @@ -7937,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`; @@ -7964,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 '鍒涘缓鑰�', @@ -7971,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锛屾棤鏁版嵁锛� ============ @@ -8007,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 '鍒涘缓鏃堕棿', @@ -8069,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 '鍒涘缓鏃堕棿', @@ -8174,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 '鍒涘缓鏃堕棿', @@ -8234,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 '鍒涘缓鏃堕棿', @@ -8274,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 '鍒涘缓鑰�', @@ -8290,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 '璁￠噺鍗曚綅缂栧彿', @@ -11184,21 +11216,22 @@ -- ======================================================================= -- ======================================================================= --- 鏂囦欢锛歵est_identity_seed_20260904.sql --- 鐢ㄩ�旓細缁� test 搴撹ˉ榻�"韬唤 + 鑿滃崟"鏈�灏忓彲鐧诲綍鏁版嵁锛堣秴绠★級锛屾暟鎹簮锛歳uoyi-vue-pro +-- 鏂囦欢锛歵est_identity_seed_20260904.sql锛坅dmin 鍗曡处鍙疯韩浠�/鏉冮檺琛ュ锛� +-- 鐢ㄩ�旓細缁� test 搴撹ˉ榻�"admin 璐﹀彿 + 鑿滃崟 + 鏉冮檺"鏁版嵁锛屾暟鎹簮锛歳uoyi-vue-pro -- 鍓嶆彁锛歵est 搴撳凡鎵ц杩� config_export_20260904.sql锛堝叏琛ㄧ粨鏋勫凡瀛樺湪锛屽瓧鍏稿凡瀵硷級锛� -- 鏈剼鏈』鍦ㄢ�滃悓鏃跺瓨鍦� ruoyi-vue-pro 涓� test鈥濈殑鍚屼竴 MySQL 瀹炰緥涓婃墽琛屻�� --- 瑕嗙洊锛� --- 鈶� system_menu 鍏ㄩ儴鏈夋晥鑿滃崟锛堣秴绠＄櫥褰曞悗鐢变唬鐮佺洿鎺ヨ繑鍥炲叏閮ㄨ彍鍗曪紝鏁呬笉闇�瑕� role_menu 琛岋級 --- 鈶� system_dept / post 婧愬簱鏈垹闄ょ殑鏈夋晥閮ㄩ棬/宀椾綅琛� --- 鈶� system_role 瓒呯瑙掕壊 super_admin --- 鈶� system_users admin 瓒呯璐﹀彿锛堝瘑鐮佸搱甯屼竴骞舵嫹璐濓紝鐧诲綍瀵嗙爜鍚屾簮搴擄級 --- 鈶� system_user_role admin 鈫� super_admin 鍏宠仈 --- 鈶� system_oauth2_client 榛樿 OAuth2 瀹㈡埛绔紙鐧诲綍/鍒锋柊浠ょ墝蹇呴渶锛宑lient_id='default'锛� +-- 瑕嗙洊锛堜粎 admin 涓�涓处鍙凤紝鍙婂叾鎷ユ湁鐨勮鑹蹭笌鏉冮檺锛夛細 +-- 鈶� system_menu 鍏ㄩ儴鏈夋晥鑿滃崟锛堣秴绠＄敱浠ｇ爜杩斿洖鍏ㄩ儴鑿滃崟锛屾櫘閫氳鑹蹭緷璧� role_menu锛� +-- 鈶� system_dept / post 婧愬簱鏈垹闄ょ殑鏈夋晥閮ㄩ棬/宀椾綅琛岋紙admin 鐨� dept_id 钀藉湪鍏朵腑锛� +-- 鈶� system_role 浠� admin 鎷ユ湁鐨勮鑹诧紙super_admin銆乧ommon銆�001銆乧rm_admin 绛夛級 +-- 鈶� system_users 浠� admin 璐﹀彿锛堝瘑鐮佸搱甯屼竴骞舵嫹璐濓紝鐧诲綍瀵嗙爜鍚屾簮搴擄級 +-- 鈶� system_user_role admin 涓庡叾瑙掕壊鐨勫叧鑱� +-- 鈶� system_role_menu admin 鍚勮鑹茬殑鑿滃崟鍏宠仈锛堜繚璇佹櫘閫氳鑹叉潈闄愭甯革級 +-- 鈶� system_oauth2_client 榛樿 OAuth2 瀹㈡埛绔紙鐧诲綍/鍒锋柊浠ょ墝蹇呴渶锛宑lient_id='default'锛� -- 瀛楀吀 system_dict_type / system_dict_data锛歝onfig_export 宸插鍏ワ紙test 鐜颁负 241/1157锛夛紝姝ゅ涓嶉噸澶嶅鐞嗐�� -- 骞傜瓑锛氭瘡寮犺〃鍏� DELETE 鍐� INSERT锛屽彲閲嶅鎵ц锛涗笉褰卞搷鍏跺畠琛ㄣ�� -- 鈿� 浠呬綔鐢ㄤ簬涓婅堪鍒楀嚭鐨勮〃锛屼笉浼氭竻绌哄叾瀹冭〃鏁版嵁銆� --- 鈿� 婧愬簱 ruoyi-vue-pro 鐨� system_dept / system_post 鍚緝澶氳蒋鍒犻櫎琛岋紝姝ゅ浠呮嫹璐濇湭鍒犻櫎(deleted=0)鐨勩�� +-- 鈿� 婧愬簱 system_dept / system_post / system_users / system_role 鍚蒋鍒犻櫎琛岋紝浠呮嫹璐濇湭鍒犻櫎(deleted=0)鐨勩�� -- ======================================================================= SET NAMES utf8mb4; @@ -11228,22 +11261,30 @@ SELECT * FROM `ruoyi-vue-pro`.`system_post` WHERE `deleted` = b'0'; --- 鈶� 瓒呯瑙掕壊锛坰uper_admin锛� +-- 鈶� admin 鎷ユ湁鐨勮鑹� DELETE FROM `system_role`; INSERT INTO `system_role` SELECT * FROM `ruoyi-vue-pro`.`system_role` -WHERE `code` = 'super_admin' AND `deleted` = b'0'; +WHERE `deleted` = b'0' + AND `id` IN (SELECT `role_id` FROM `ruoyi-vue-pro`.`system_user_role` + WHERE `user_id` = (SELECT `id` FROM `ruoyi-vue-pro`.`system_users` WHERE `username` = 'admin' LIMIT 1)); --- 鈶� 瓒呯璐﹀彿 admin +-- 鈶� admin 璐﹀彿 DELETE FROM `system_users`; INSERT INTO `system_users` SELECT * FROM `ruoyi-vue-pro`.`system_users` WHERE `username` = 'admin' AND `deleted` = b'0'; --- 鈶� 鐢ㄦ埛-瑙掕壊鍏宠仈锛坅dmin 鎷ユ湁鐨勮鑹诧級 +-- 鈶� 鐢ㄦ埛-瑙掕壊鍏宠仈锛坅dmin锛� DELETE FROM `system_user_role`; INSERT INTO `system_user_role` SELECT * FROM `ruoyi-vue-pro`.`system_user_role` WHERE `user_id` = (SELECT `id` FROM `system_users` WHERE `username` = 'admin' LIMIT 1); +-- 鈶� 瑙掕壊-鑿滃崟鍏宠仈锛坅dmin 鍚勮鑹诧紝淇濊瘉鏅�氳鑹叉潈闄愭甯革級 +DELETE FROM `system_role_menu`; +INSERT INTO `system_role_menu` +SELECT rm.* FROM `ruoyi-vue-pro`.`system_role_menu` rm +INNER JOIN `system_user_role` ur ON ur.`role_id` = rm.`role_id`; + SET FOREIGN_KEY_CHECKS = 1; -- Gitblit v1.9.3