Browse Source

init sql 2.0

klzhangweiya 1 month ago
parent
commit
1b4e096eec

File diff suppressed because it is too large
+ 2643 - 1359
SERVER/ChickenFarmV3/.script/sql/ChickenFarmDB_DEV.sql


+ 291 - 92
SERVER/ChickenFarmV3/.script/sql/new/data.sql

@@ -23,9 +23,11 @@ SET FOREIGN_KEY_CHECKS = 0;
 INSERT INTO `sys_config` VALUES (1, '000000', '用户管理-账号初始密码', 'sys.user.initPassword', '123456', 'Y', 100, 1, '2025-07-10 14:59:14', NULL, NULL, '初始化密码 123456');
 INSERT INTO `sys_config` VALUES (2, '000000', '账号自助-是否开启用户注册功能', 'sys.account.registerUser', 'false', 'Y', 100, 1, '2025-07-10 14:59:14', NULL, NULL, '是否开启注册用户功能(true开启,false关闭)');
 INSERT INTO `sys_config` VALUES (3, '000000', 'OSS预览列表资源开关', 'sys.oss.previewListResource', 'true', 'Y', 100, 1, '2025-07-10 14:59:14', NULL, NULL, 'true:开启, false:关闭');
-
+INSERT INTO `sys_config` VALUES (11, '000000', '维修人员USER_ID', 'sys.repair.userIds', '5,6', 'Y', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '维修人员ID');
 INSERT INTO `sys_config` VALUES (12, '000000', '可入孵出库的蛋类型', 'breeding:eggStore:incubation:eggType', '1,2,3', 'Y', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '维修人员ID');
 INSERT INTO `sys_config` VALUES (13, '000000', '仓库管理人员Ids', 'erp:Store:userIds', '1,2,3', 'Y', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '维修人员ID');
+INSERT INTO `sys_config` VALUES (14, '000000', '实验审核人员USER_ID', 'sys.experiment.review.userIds', '8,9', 'Y', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '实验审核人员ID');
+INSERT INTO `sys_config` VALUES (15, '000000', '销售组织结构ID', 'erp:sale:org:id', '1001', 'Y', 100, 1, '2025-10-28 16:36:05', 1, '2025-10-28 16:36:33', NULL);
 
 
 -- ----------------------------
@@ -65,78 +67,80 @@ INSERT INTO `sys_dict_data` VALUES (35, '000000', 0, 'PC', 'pc', 'sys_device_typ
 INSERT INTO `sys_dict_data` VALUES (36, '000000', 0, '安卓', 'android', 'sys_device_type', '', 'primary', 'N', 100, 1, '2025-07-10 14:59:14', NULL, NULL, '安卓');
 INSERT INTO `sys_dict_data` VALUES (37, '000000', 0, 'iOS', 'ios', 'sys_device_type', '', 'primary', 'N', 100, 1, '2025-07-10 14:59:14', NULL, NULL, 'iOS');
 INSERT INTO `sys_dict_data` VALUES (38, '000000', 0, '小程序', 'xcx', 'sys_device_type', '', 'primary', 'N', 100, 1, '2025-07-10 14:59:14', NULL, NULL, '小程序');
-INSERT INTO `sys_dict_data` VALUES (1000, '000000', 1, '灭活疫苗', '0', 'vaccine_type', NULL, NULL, 'Y', 100, 1, '2025-07-14 17:27:06', 1, '2025-07-14 17:27:06', NULL);
-INSERT INTO `sys_dict_data` VALUES (1001, '000000', 1, '活疫苗', '1', 'vaccine_type', NULL, NULL, 'N', 100, 1, '2025-07-14 17:27:23', 1, '2025-07-14 17:27:28', NULL);
-INSERT INTO `sys_dict_data` VALUES (1002, '000000', 2, '重组蛋白疫苗', '2', 'vaccine_type', NULL, NULL, 'Y', 100, 1, '2025-07-14 17:27:54', 1, '2025-07-14 17:27:54', NULL);
-INSERT INTO `sys_dict_data` VALUES (1003, '000000', 1, '可用', '0', 'vaccine_status', NULL, NULL, 'Y', 100, 1, '2025-07-14 17:29:10', 1, '2025-07-14 17:29:10', NULL);
-INSERT INTO `sys_dict_data` VALUES (1004, '000000', 2, '缺货', '1', 'vaccine_status', NULL, 'warning', 'N', 100, 1, '2025-07-14 17:30:14', 1, '2025-07-14 17:30:14', NULL);
-INSERT INTO `sys_dict_data` VALUES (1005, '000000', 3, '过期', '2', 'vaccine_status', NULL, 'danger', 'N', 100, 1, '2025-07-14 21:27:55', 1, '2025-07-14 21:27:55', NULL);
-INSERT INTO `sys_dict_data` VALUES (1006, '000000', 1, '公', '0', 'chicken_gender', NULL, 'primary', 'N', 100, 1, '2025-07-15 10:25:10', 1, '2025-07-15 10:25:10', NULL);
-INSERT INTO `sys_dict_data` VALUES (1007, '000000', 2, '母', '1', 'chicken_gender', NULL, 'success', 'N', 100, 1, '2025-07-15 10:25:33', 1, '2025-07-15 10:25:43', NULL);
-INSERT INTO `sys_dict_data` VALUES (1008, '000000', 1, '启用', '0', 'sop_status', NULL, 'primary', 'N', 100, 1, '2025-07-15 10:26:57', 1, '2025-07-15 10:27:08', NULL);
-INSERT INTO `sys_dict_data` VALUES (1009, '000000', 2, '禁用', '1', 'sop_status', NULL, 'danger', 'N', 100, 1, '2025-07-15 10:27:48', 1, '2025-07-15 10:28:21', NULL);
-INSERT INTO `sys_dict_data` VALUES (1011, '000000', 1, '闲置', '0', 'wing_tag_status', NULL, 'primary', 'Y', 100, 1, '2025-07-16 16:00:34', 1, '2025-07-16 16:00:34', NULL);
-INSERT INTO `sys_dict_data` VALUES (1012, '000000', 2, '绑定中', '1', 'wing_tag_status', NULL, 'success', 'Y', 100, 1, '2025-07-16 16:00:59', 1, '2025-07-24 11:02:37', NULL);
-INSERT INTO `sys_dict_data` VALUES (1014, '000000', 1, '正常', '0', 'chicken_coop_status', NULL, 'success', 'Y', 100, 1, '2025-07-16 17:11:30', 1, '2025-07-16 17:11:30', NULL);
-INSERT INTO `sys_dict_data` VALUES (1015, '000000', 2, '异常', '1', 'chicken_coop_status', NULL, 'warning', 'N', 100, 1, '2025-07-16 17:11:43', 1, '2025-07-16 17:11:43', NULL);
-INSERT INTO `sys_dict_data` VALUES (1016, '000000', 1, '正常', '0', 'chicken_cage_status', NULL, 'primary', 'Y', 100, 1, '2025-07-16 20:17:02', 1, '2025-07-24 11:04:48', NULL);
-INSERT INTO `sys_dict_data` VALUES (1017, '000000', 2, '异常', '1', 'chicken_cage_status', NULL, 'info', 'N', 100, 1, '2025-07-16 20:17:29', 1, '2025-07-24 11:04:37', NULL);
-INSERT INTO `sys_dict_data` VALUES (1019, '000000', 1, 'A系', 'A', 'variety_lineage', NULL, 'primary', 'Y', 100, 1, '2025-07-17 11:57:39', 1, '2025-07-17 11:57:39', NULL);
-INSERT INTO `sys_dict_data` VALUES (1020, '000000', 2, 'B系', 'B', 'variety_lineage', NULL, 'primary', 'N', 100, 1, '2025-07-17 13:20:20', 1, '2025-07-17 13:20:20', NULL);
-INSERT INTO `sys_dict_data` VALUES (1021, '000000', 3, 'C系', 'C', 'variety_lineage', NULL, 'primary', 'N', 100, 1, '2025-07-17 13:20:26', 1, '2025-07-17 13:20:26', NULL);
-INSERT INTO `sys_dict_data` VALUES (1022, '000000', 4, 'D系', 'D', 'variety_lineage', NULL, 'primary', 'N', 100, 1, '2025-07-17 13:20:27', 1, '2025-07-17 13:20:27', NULL);
-INSERT INTO `sys_dict_data` VALUES (1023, '000000', 5, 'E系', 'E', 'variety_lineage', NULL, 'primary', 'N', 100, 1, '2025-07-17 13:20:27', 1, '2025-07-17 13:20:27', NULL);
-INSERT INTO `sys_dict_data` VALUES (1024, '000000', 6, 'F系', 'F', 'variety_lineage', NULL, 'primary', 'N', 100, 1, '2025-07-17 13:20:27', 1, '2025-07-17 13:20:27', NULL);
-INSERT INTO `sys_dict_data` VALUES (1025, '000000', 7, 'G系', 'G', 'variety_lineage', NULL, 'primary', 'N', 100, 1, '2025-07-17 13:20:27', 1, '2025-07-17 13:20:27', NULL);
-INSERT INTO `sys_dict_data` VALUES (1026, '000000', 8, 'H系', 'H', 'variety_lineage', NULL, 'primary', 'N', 100, 1, '2025-07-17 13:20:27', 1, '2025-07-17 13:20:27', NULL);
-INSERT INTO `sys_dict_data` VALUES (1027, '000000', 9, 'I系', 'I', 'variety_lineage', NULL, 'primary', 'N', 100, 1, '2025-07-17 13:20:27', 1, '2025-07-17 13:20:27', NULL);
-INSERT INTO `sys_dict_data` VALUES (1028, '000000', 10, 'J系', 'J', 'variety_lineage', NULL, 'primary', 'N', 100, 1, '2025-07-17 13:20:27', 1, '2025-07-17 13:20:27', NULL);
-INSERT INTO `sys_dict_data` VALUES (1029, '000000', 11, 'K系', 'K', 'variety_lineage', NULL, 'primary', 'N', 100, 1, '2025-07-17 13:20:27', 1, '2025-07-17 13:20:27', NULL);
-INSERT INTO `sys_dict_data` VALUES (1030, '000000', 12, 'L系', 'L', 'variety_lineage', NULL, 'primary', 'N', 100, 1, '2025-07-17 13:20:28', 1, '2025-07-17 13:20:28', NULL);
-INSERT INTO `sys_dict_data` VALUES (1031, '000000', 13, 'M系', 'M', 'variety_lineage', NULL, 'primary', 'N', 100, 1, '2025-07-17 13:20:28', 1, '2025-07-17 13:20:28', NULL);
-INSERT INTO `sys_dict_data` VALUES (1032, '000000', 14, 'N系', 'N', 'variety_lineage', NULL, 'primary', 'N', 100, 1, '2025-07-17 13:20:28', 1, '2025-07-17 13:20:28', NULL);
-INSERT INTO `sys_dict_data` VALUES (1033, '000000', 15, 'O系', 'O', 'variety_lineage', NULL, 'primary', 'N', 100, 1, '2025-07-17 13:20:28', 1, '2025-07-17 13:20:28', NULL);
-INSERT INTO `sys_dict_data` VALUES (1034, '000000', 1, '新建', '0', 'batch_status', NULL, 'primary', 'Y', 100, 1, '2025-07-17 14:23:50', 1, '2025-07-17 14:23:50', NULL);
-INSERT INTO `sys_dict_data` VALUES (1035, '000000', 2, '育成中', '1', 'batch_status', NULL, 'success', 'Y', 100, 1, '2025-07-17 14:24:08', 1, '2025-07-17 14:24:19', NULL);
-INSERT INTO `sys_dict_data` VALUES (1036, '000000', 3, '完成', '2', 'batch_status', NULL, 'info', 'N', 100, 1, '2025-07-17 15:05:34', 1, '2025-07-17 15:05:34', NULL);
-INSERT INTO `sys_dict_data` VALUES (1037, '000000', 1, '在养', '0', 'chicken_status', NULL, 'success', 'Y', 100, 1, '2025-07-17 18:35:51', 1, '2025-07-17 18:35:51', NULL);
-INSERT INTO `sys_dict_data` VALUES (1038, '000000', 2, '已淘汰', '1', 'chicken_status', NULL, 'warning', 'N', 100, 1, '2025-07-17 18:36:20', 1, '2025-07-17 18:36:20', NULL);
-INSERT INTO `sys_dict_data` VALUES (1040, '000000', 1, '腿病', '1', 'chicken_cull_reason', NULL, 'primary', 'Y', 100, 1, '2025-07-17 18:56:40', 1, '2025-08-11 15:52:20', NULL);
-INSERT INTO `sys_dict_data` VALUES (1041, '000000', 2, '腹水', '2', 'chicken_cull_reason', NULL, 'primary', 'N', 100, 1, '2025-07-17 18:57:03', 1, '2025-08-11 15:52:27', NULL);
-INSERT INTO `sys_dict_data` VALUES (1042, '000000', 3, '细菌感染', '3', 'chicken_cull_reason', NULL, 'primary', 'N', 100, 1, '2025-07-17 18:57:15', 1, '2025-07-17 18:57:15', NULL);
-INSERT INTO `sys_dict_data` VALUES (1043, '000000', 4, '外伤', '4', 'chicken_cull_reason', NULL, 'primary', 'N', 100, 1, '2025-07-17 18:57:39', 1, '2025-07-17 18:57:39', NULL);
-INSERT INTO `sys_dict_data` VALUES (1072, '000000', 9, '转群', '5', 'chicken_cull_reason', NULL, 'primary', 'N', 100, 1, '2025-07-17 18:57:39', 1, '2025-07-17 18:57:39', NULL);
-INSERT INTO `sys_dict_data` VALUES (1044, '000000', 1, '无害化', '0', 'chicken_disposal_method', NULL, 'primary', 'Y', 100, 1, '2025-07-17 18:58:01', 1, '2025-07-17 18:58:01', NULL);
-INSERT INTO `sys_dict_data` VALUES (1045, '000000', 2, '食堂', '1', 'chicken_disposal_method', NULL, 'primary', 'N', 100, 1, '2025-07-17 18:58:19', 1, '2025-07-17 18:58:19', NULL);
-INSERT INTO `sys_dict_data` VALUES (1046, '000000', 3, '屠宰场', '2', 'chicken_disposal_method', NULL, 'primary', 'N', 100, 1, '2025-07-17 18:58:31', 1, '2025-07-17 18:58:31', NULL);
-INSERT INTO `sys_dict_data` VALUES (1071, '000000', 9, '转群', '3', 'chicken_disposal_method', NULL, 'primary', 'N', 100, 1, '2025-07-17 18:58:31', 1, '2025-07-17 18:58:31', NULL);
-INSERT INTO `sys_dict_data` VALUES (1047, '000000', 1, '正常', '0', 'family_status', NULL, 'primary', 'Y', 100, 1, '2025-07-18 10:26:25', 1, '2025-07-24 11:00:55', NULL);
-INSERT INTO `sys_dict_data` VALUES (1048, '000000', 2, '异常', '1', 'family_status', NULL, 'info', 'N', 100, 1, '2025-07-18 10:26:48', 1, '2025-07-24 11:07:07', NULL);
-#INSERT INTO `sys_dict_data` VALUES (1050, '000000', 1, '好种蛋', '0', 'breeding_egg_type', NULL, 'primary', 'Y', 100, 1, '2025-07-21 09:53:31', 1, '2025-07-21 09:53:31', NULL);
-#INSERT INTO `sys_dict_data` VALUES (1051, '000000', 2, '好菜蛋', '1', 'breeding_egg_type', NULL, 'primary', 'N', 100, 1, '2025-07-21 09:53:44', 1, '2025-07-21 09:54:30', NULL);
-#INSERT INTO `sys_dict_data` VALUES (1052, '000000', 3, '畸形蛋', '2', 'breeding_egg_type', NULL, 'info', 'N', 100, 1, '2025-07-21 09:54:03', 1, '2025-07-31 13:16:00', NULL);
-#INSERT INTO `sys_dict_data` VALUES (1053, '000000', 4, '破蛋', '3', 'breeding_egg_type', NULL, 'warning', 'N', 100, 1, '2025-07-21 09:54:21', 1, '2025-07-31 13:16:09', NULL);
-INSERT INTO `sys_dict_data` VALUES (1054, '000000', 1, '待确认', '0', 'cage_change_status', NULL, 'primary', 'Y', 100, 1, '2025-07-28 13:53:25', 1, '2025-07-28 16:45:12', NULL);
-INSERT INTO `sys_dict_data` VALUES (1055, '000000', 2, '审核通过', '1', 'cage_change_status', NULL, 'success', 'N', 100, 1, '2025-07-28 13:54:07', 1, '2025-07-28 13:54:07', NULL);
-INSERT INTO `sys_dict_data` VALUES (1056, '000000', 3, '作废', '2', 'cage_change_status', NULL, 'info', 'N', 100, 1, '2025-07-28 13:54:31', 1, '2025-07-28 13:54:31', NULL);
-INSERT INTO `sys_dict_data` VALUES (1057, '000000', 1, '祖代厂孵化', '1', 'pull_out_type', NULL, 'primary', 'Y', 100, 1, '2025-07-30 12:35:30', 1, '2025-07-30 12:35:30', NULL);
-INSERT INTO `sys_dict_data` VALUES (1058, '000000', 2, '食堂', '2', 'pull_out_type', NULL, 'primary', 'N', 100, 1, '2025-07-30 12:35:45', 1, '2025-07-30 12:35:45', NULL);
-INSERT INTO `sys_dict_data` VALUES (1059, '000000', 3, '实验室', '3', 'pull_out_type', NULL, 'primary', 'N', 100, 1, '2025-07-30 12:35:54', 1, '2025-07-30 12:35:54', NULL);
-INSERT INTO `sys_dict_data` VALUES (1060, '000000', 4, '菜蛋销售', '4', 'pull_out_type', NULL, 'primary', 'N', 100, 1, '2025-07-30 12:36:09', 1, '2025-07-30 12:36:09', NULL);
-INSERT INTO `sys_dict_data` VALUES (1061, '000000', 5, '其它', '5', 'chicken_cull_reason', NULL, 'primary', 'N', 100, 1, '2025-07-17 18:57:39', 1, '2025-07-17 18:57:39', NULL);
-INSERT INTO `sys_dict_data` VALUES (1062, '000000', 0, '测定中', '0', 'measure_detail_status', NULL, 'primary', 'Y', 100, 1, '2025-08-12 09:34:50', 1, '2025-08-12 09:34:58', NULL);
-INSERT INTO `sys_dict_data` VALUES (1063, '000000', 1, '结束', '1', 'measure_detail_status', NULL, 'info', 'N', 100, 1, '2025-08-12 09:35:16', 1, '2025-08-12 09:35:16', NULL);
-INSERT INTO `sys_dict_data` VALUES (1064, '000000', 2, '淘汰', '2', 'measure_detail_status', NULL, 'warning', 'N', 100, 1, '2025-08-12 09:35:35', 1, '2025-08-12 09:35:35', NULL);
-INSERT INTO `sys_dict_data` VALUES (1065, '000000', 1, '育成舍', '1', 'chicken_coop_type', NULL, 'primary', 'Y', 100, 1, '2025-08-18 11:55:32', 1, '2025-08-18 11:55:32', NULL);
-INSERT INTO `sys_dict_data` VALUES (1066, '000000', 2, '产蛋舍', '2', 'chicken_coop_type', NULL, 'primary', 'N', 100, 1, '2025-08-18 11:55:44', 1, '2025-08-18 11:55:44', NULL);
-INSERT INTO `sys_dict_data` VALUES (1067, '000000', 1, '育种厂', '0', 'factory_info', NULL, 'primary', 'Y', 100, 1, '2025-08-18 11:58:30', 1, '2025-08-18 11:58:30', NULL);
-INSERT INTO `sys_dict_data` VALUES (1073, '000000', 2, '祖代厂', '1', 'factory_info', NULL, 'primary', 'Y', 100, 1, '2025-08-18 11:58:30', 1, '2025-08-18 11:58:30', NULL);
-INSERT INTO `sys_dict_data` VALUES (1068, '000000', 3, '育雏舍', '3', 'chicken_coop_type', NULL, 'primary', 'N', 100, 1, '2025-08-18 11:55:44', 1, '2025-08-18 11:55:44', NULL);
-INSERT INTO `sys_dict_data` VALUES (1069, '000000', 4, '测定舍', '4', 'chicken_coop_type', NULL, 'primary', 'N', 100, 1, '2025-08-18 11:55:44', 1, '2025-08-18 11:55:44', NULL);
-INSERT INTO `sys_dict_data` VALUES (1070, '000000', 3, '未知', '2', 'chicken_gender', NULL, NULL, 'N', 100, 1, '2025-09-08 09:06:34', 1, '2025-09-08 09:06:34', NULL);
-INSERT INTO `sys_dict_data` VALUES (1074, '000000', 1, '育种厂', '0', 'batch_type', NULL, NULL, 'N', 100, 1, '2025-09-08 09:06:34', 1, '2025-09-08 09:06:34', NULL);
-INSERT INTO `sys_dict_data` VALUES (1075, '000000', 2, '祖代厂', '1', 'batch_type', NULL, NULL, 'N', 100, 1, '2025-09-08 09:06:34', 1, '2025-09-08 09:06:34', NULL);
-INSERT INTO `sys_dict_data` VALUES (1076, '000000', 3, '育种转祖代', '2', 'batch_type', NULL, NULL, 'N', 100, 1, '2025-09-08 09:06:34', 1, '2025-09-08 09:06:34', NULL);
+INSERT INTO `sys_dict_data` VALUES (41, '000000', 0, '未读', '0', 'sys_notice_read_status', '', 'danger', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '未读');
+INSERT INTO `sys_dict_data` VALUES (42, '000000', 0, '已读', '1', 'sys_notice_read_status', '', 'warning', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '已读');
+INSERT INTO `sys_dict_data` VALUES (100, '000000', 1, '灭活疫苗', '0', 'vaccine_type', NULL, NULL, 'Y', 100, 1, '2025-07-14 17:27:06', 1, '2025-07-14 17:27:06', NULL);
+INSERT INTO `sys_dict_data` VALUES (101, '000000', 1, '活疫苗', '1', 'vaccine_type', NULL, NULL, 'N', 100, 1, '2025-07-14 17:27:23', 1, '2025-07-14 17:27:28', NULL);
+INSERT INTO `sys_dict_data` VALUES (102, '000000', 2, '重组蛋白疫苗', '2', 'vaccine_type', NULL, NULL, 'Y', 100, 1, '2025-07-14 17:27:54', 1, '2025-07-14 17:27:54', NULL);
+INSERT INTO `sys_dict_data` VALUES (103, '000000', 1, '可用', '0', 'vaccine_status', NULL, NULL, 'Y', 100, 1, '2025-07-14 17:29:10', 1, '2025-07-14 17:29:10', NULL);
+INSERT INTO `sys_dict_data` VALUES (104, '000000', 2, '缺货', '1', 'vaccine_status', NULL, 'warning', 'N', 100, 1, '2025-07-14 17:30:14', 1, '2025-07-14 17:30:14', NULL);
+INSERT INTO `sys_dict_data` VALUES (105, '000000', 3, '过期', '2', 'vaccine_status', NULL, 'danger', 'N', 100, 1, '2025-07-14 21:27:55', 1, '2025-07-14 21:27:55', NULL);
+INSERT INTO `sys_dict_data` VALUES (106, '000000', 1, '公', '0', 'chicken_gender', NULL, 'primary', 'N', 100, 1, '2025-07-15 10:25:10', 1, '2025-07-15 10:25:10', NULL);
+INSERT INTO `sys_dict_data` VALUES (107, '000000', 2, '母', '1', 'chicken_gender', NULL, 'success', 'N', 100, 1, '2025-07-15 10:25:33', 1, '2025-07-15 10:25:43', NULL);
+INSERT INTO `sys_dict_data` VALUES (108, '000000', 1, '启用', '0', 'sop_status', NULL, 'primary', 'N', 100, 1, '2025-07-15 10:26:57', 1, '2025-07-15 10:27:08', NULL);
+INSERT INTO `sys_dict_data` VALUES (109, '000000', 2, '禁用', '1', 'sop_status', NULL, 'danger', 'N', 100, 1, '2025-07-15 10:27:48', 1, '2025-07-15 10:28:21', NULL);
+INSERT INTO `sys_dict_data` VALUES (111, '000000', 1, '闲置', '0', 'wing_tag_status', NULL, 'primary', 'Y', 100, 1, '2025-07-16 16:00:34', 1, '2025-07-16 16:00:34', NULL);
+INSERT INTO `sys_dict_data` VALUES (112, '000000', 2, '绑定中', '1', 'wing_tag_status', NULL, 'success', 'Y', 100, 1, '2025-07-16 16:00:59', 1, '2025-07-24 11:02:37', NULL);
+INSERT INTO `sys_dict_data` VALUES (114, '000000', 1, '正常', '0', 'chicken_coop_status', NULL, 'success', 'Y', 100, 1, '2025-07-16 17:11:30', 1, '2025-07-16 17:11:30', NULL);
+INSERT INTO `sys_dict_data` VALUES (115, '000000', 2, '异常', '1', 'chicken_coop_status', NULL, 'warning', 'N', 100, 1, '2025-07-16 17:11:43', 1, '2025-07-16 17:11:43', NULL);
+INSERT INTO `sys_dict_data` VALUES (116, '000000', 1, '正常', '0', 'chicken_cage_status', NULL, 'primary', 'Y', 100, 1, '2025-07-16 20:17:02', 1, '2025-07-24 11:04:48', NULL);
+INSERT INTO `sys_dict_data` VALUES (117, '000000', 2, '异常', '1', 'chicken_cage_status', NULL, 'info', 'N', 100, 1, '2025-07-16 20:17:29', 1, '2025-07-24 11:04:37', NULL);
+INSERT INTO `sys_dict_data` VALUES (119, '000000', 1, 'A系', 'A', 'variety_lineage', NULL, 'primary', 'Y', 100, 1, '2025-07-17 11:57:39', 1, '2025-07-17 11:57:39', NULL);
+INSERT INTO `sys_dict_data` VALUES (120, '000000', 2, 'B系', 'B', 'variety_lineage', NULL, 'primary', 'N', 100, 1, '2025-07-17 13:20:20', 1, '2025-07-17 13:20:20', NULL);
+INSERT INTO `sys_dict_data` VALUES (121, '000000', 3, 'C系', 'C', 'variety_lineage', NULL, 'primary', 'N', 100, 1, '2025-07-17 13:20:26', 1, '2025-07-17 13:20:26', NULL);
+INSERT INTO `sys_dict_data` VALUES (122, '000000', 4, 'D系', 'D', 'variety_lineage', NULL, 'primary', 'N', 100, 1, '2025-07-17 13:20:27', 1, '2025-07-17 13:20:27', NULL);
+INSERT INTO `sys_dict_data` VALUES (123, '000000', 5, 'E系', 'E', 'variety_lineage', NULL, 'primary', 'N', 100, 1, '2025-07-17 13:20:27', 1, '2025-07-17 13:20:27', NULL);
+INSERT INTO `sys_dict_data` VALUES (124, '000000', 6, 'F系', 'F', 'variety_lineage', NULL, 'primary', 'N', 100, 1, '2025-07-17 13:20:27', 1, '2025-07-17 13:20:27', NULL);
+INSERT INTO `sys_dict_data` VALUES (125, '000000', 7, 'G系', 'G', 'variety_lineage', NULL, 'primary', 'N', 100, 1, '2025-07-17 13:20:27', 1, '2025-07-17 13:20:27', NULL);
+INSERT INTO `sys_dict_data` VALUES (126, '000000', 8, 'H系', 'H', 'variety_lineage', NULL, 'primary', 'N', 100, 1, '2025-07-17 13:20:27', 1, '2025-07-17 13:20:27', NULL);
+INSERT INTO `sys_dict_data` VALUES (127, '000000', 9, 'I系', 'I', 'variety_lineage', NULL, 'primary', 'N', 100, 1, '2025-07-17 13:20:27', 1, '2025-07-17 13:20:27', NULL);
+INSERT INTO `sys_dict_data` VALUES (128, '000000', 10, 'J系', 'J', 'variety_lineage', NULL, 'primary', 'N', 100, 1, '2025-07-17 13:20:27', 1, '2025-07-17 13:20:27', NULL);
+INSERT INTO `sys_dict_data` VALUES (129, '000000', 11, 'K系', 'K', 'variety_lineage', NULL, 'primary', 'N', 100, 1, '2025-07-17 13:20:27', 1, '2025-07-17 13:20:27', NULL);
+INSERT INTO `sys_dict_data` VALUES (130, '000000', 12, 'L系', 'L', 'variety_lineage', NULL, 'primary', 'N', 100, 1, '2025-07-17 13:20:28', 1, '2025-07-17 13:20:28', NULL);
+INSERT INTO `sys_dict_data` VALUES (131, '000000', 13, 'M系', 'M', 'variety_lineage', NULL, 'primary', 'N', 100, 1, '2025-07-17 13:20:28', 1, '2025-07-17 13:20:28', NULL);
+INSERT INTO `sys_dict_data` VALUES (132, '000000', 14, 'N系', 'N', 'variety_lineage', NULL, 'primary', 'N', 100, 1, '2025-07-17 13:20:28', 1, '2025-07-17 13:20:28', NULL);
+INSERT INTO `sys_dict_data` VALUES (133, '000000', 15, 'O系', 'O', 'variety_lineage', NULL, 'primary', 'N', 100, 1, '2025-07-17 13:20:28', 1, '2025-07-17 13:20:28', NULL);
+INSERT INTO `sys_dict_data` VALUES (134, '000000', 1, '新建', '0', 'batch_status', NULL, 'primary', 'Y', 100, 1, '2025-07-17 14:23:50', 1, '2025-07-17 14:23:50', NULL);
+INSERT INTO `sys_dict_data` VALUES (135, '000000', 2, '育成中', '1', 'batch_status', NULL, 'success', 'Y', 100, 1, '2025-07-17 14:24:08', 1, '2025-07-17 14:24:19', NULL);
+INSERT INTO `sys_dict_data` VALUES (136, '000000', 3, '完成', '2', 'batch_status', NULL, 'info', 'N', 100, 1, '2025-07-17 15:05:34', 1, '2025-07-17 15:05:34', NULL);
+INSERT INTO `sys_dict_data` VALUES (137, '000000', 1, '在养', '0', 'chicken_status', NULL, 'success', 'Y', 100, 1, '2025-07-17 18:35:51', 1, '2025-07-17 18:35:51', NULL);
+INSERT INTO `sys_dict_data` VALUES (138, '000000', 2, '已淘汰', '1', 'chicken_status', NULL, 'warning', 'N', 100, 1, '2025-07-17 18:36:20', 1, '2025-07-17 18:36:20', NULL);
+INSERT INTO `sys_dict_data` VALUES (140, '000000', 1, '腿病', '1', 'chicken_cull_reason', NULL, 'primary', 'Y', 100, 1, '2025-07-17 18:56:40', 1, '2025-08-11 15:52:20', NULL);
+INSERT INTO `sys_dict_data` VALUES (141, '000000', 2, '腹水', '2', 'chicken_cull_reason', NULL, 'primary', 'N', 100, 1, '2025-07-17 18:57:03', 1, '2025-08-11 15:52:27', NULL);
+INSERT INTO `sys_dict_data` VALUES (142, '000000', 3, '细菌感染', '3', 'chicken_cull_reason', NULL, 'primary', 'N', 100, 1, '2025-07-17 18:57:15', 1, '2025-07-17 18:57:15', NULL);
+INSERT INTO `sys_dict_data` VALUES (143, '000000', 4, '外伤', '4', 'chicken_cull_reason', NULL, 'primary', 'N', 100, 1, '2025-07-17 18:57:39', 1, '2025-07-17 18:57:39', NULL);
+INSERT INTO `sys_dict_data` VALUES (172, '000000', 9, '转群', '5', 'chicken_cull_reason', NULL, 'primary', 'N', 100, 1, '2025-07-17 18:57:39', 1, '2025-07-17 18:57:39', NULL);
+INSERT INTO `sys_dict_data` VALUES (144, '000000', 1, '无害化', '0', 'chicken_disposal_method', NULL, 'primary', 'Y', 100, 1, '2025-07-17 18:58:01', 1, '2025-07-17 18:58:01', NULL);
+INSERT INTO `sys_dict_data` VALUES (145, '000000', 2, '食堂', '1', 'chicken_disposal_method', NULL, 'primary', 'N', 100, 1, '2025-07-17 18:58:19', 1, '2025-07-17 18:58:19', NULL);
+INSERT INTO `sys_dict_data` VALUES (146, '000000', 3, '屠宰场', '2', 'chicken_disposal_method', NULL, 'primary', 'N', 100, 1, '2025-07-17 18:58:31', 1, '2025-07-17 18:58:31', NULL);
+INSERT INTO `sys_dict_data` VALUES (171, '000000', 9, '转群', '3', 'chicken_disposal_method', NULL, 'primary', 'N', 100, 1, '2025-07-17 18:58:31', 1, '2025-07-17 18:58:31', NULL);
+INSERT INTO `sys_dict_data` VALUES (147, '000000', 1, '正常', '0', 'family_status', NULL, 'primary', 'Y', 100, 1, '2025-07-18 10:26:25', 1, '2025-07-24 11:00:55', NULL);
+INSERT INTO `sys_dict_data` VALUES (148, '000000', 2, '异常', '1', 'family_status', NULL, 'info', 'N', 100, 1, '2025-07-18 10:26:48', 1, '2025-07-24 11:07:07', NULL);
+#INSERT INTO `sys_dict_data` VALUES (150, '000000', 1, '好种蛋', '0', 'breeding_egg_type', NULL, 'primary', 'Y', 100, 1, '2025-07-21 09:53:31', 1, '2025-07-21 09:53:31', NULL);
+#INSERT INTO `sys_dict_data` VALUES (151, '000000', 2, '好菜蛋', '1', 'breeding_egg_type', NULL, 'primary', 'N', 100, 1, '2025-07-21 09:53:44', 1, '2025-07-21 09:54:30', NULL);
+#INSERT INTO `sys_dict_data` VALUES (152, '000000', 3, '畸形蛋', '2', 'breeding_egg_type', NULL, 'info', 'N', 100, 1, '2025-07-21 09:54:03', 1, '2025-07-31 13:16:00', NULL);
+#INSERT INTO `sys_dict_data` VALUES (153, '000000', 4, '破蛋', '3', 'breeding_egg_type', NULL, 'warning', 'N', 100, 1, '2025-07-21 09:54:21', 1, '2025-07-31 13:16:09', NULL);
+INSERT INTO `sys_dict_data` VALUES (154, '000000', 1, '待确认', '0', 'cage_change_status', NULL, 'primary', 'Y', 100, 1, '2025-07-28 13:53:25', 1, '2025-07-28 16:45:12', NULL);
+INSERT INTO `sys_dict_data` VALUES (155, '000000', 2, '审核通过', '1', 'cage_change_status', NULL, 'success', 'N', 100, 1, '2025-07-28 13:54:07', 1, '2025-07-28 13:54:07', NULL);
+INSERT INTO `sys_dict_data` VALUES (156, '000000', 3, '作废', '2', 'cage_change_status', NULL, 'info', 'N', 100, 1, '2025-07-28 13:54:31', 1, '2025-07-28 13:54:31', NULL);
+INSERT INTO `sys_dict_data` VALUES (157, '000000', 1, '祖代厂孵化', '1', 'pull_out_type', NULL, 'primary', 'Y', 100, 1, '2025-07-30 12:35:30', 1, '2025-07-30 12:35:30', NULL);
+INSERT INTO `sys_dict_data` VALUES (158, '000000', 2, '食堂', '2', 'pull_out_type', NULL, 'primary', 'N', 100, 1, '2025-07-30 12:35:45', 1, '2025-07-30 12:35:45', NULL);
+INSERT INTO `sys_dict_data` VALUES (159, '000000', 3, '实验室', '3', 'pull_out_type', NULL, 'primary', 'N', 100, 1, '2025-07-30 12:35:54', 1, '2025-07-30 12:35:54', NULL);
+INSERT INTO `sys_dict_data` VALUES (160, '000000', 4, '菜蛋销售', '4', 'pull_out_type', NULL, 'primary', 'N', 100, 1, '2025-07-30 12:36:09', 1, '2025-07-30 12:36:09', NULL);
+INSERT INTO `sys_dict_data` VALUES (161, '000000', 5, '其它', '5', 'chicken_cull_reason', NULL, 'primary', 'N', 100, 1, '2025-07-17 18:57:39', 1, '2025-07-17 18:57:39', NULL);
+INSERT INTO `sys_dict_data` VALUES (162, '000000', 0, '测定中', '0', 'measure_detail_status', NULL, 'primary', 'Y', 100, 1, '2025-08-12 09:34:50', 1, '2025-08-12 09:34:58', NULL);
+INSERT INTO `sys_dict_data` VALUES (163, '000000', 1, '结束', '1', 'measure_detail_status', NULL, 'info', 'N', 100, 1, '2025-08-12 09:35:16', 1, '2025-08-12 09:35:16', NULL);
+INSERT INTO `sys_dict_data` VALUES (164, '000000', 2, '淘汰', '2', 'measure_detail_status', NULL, 'warning', 'N', 100, 1, '2025-08-12 09:35:35', 1, '2025-08-12 09:35:35', NULL);
+INSERT INTO `sys_dict_data` VALUES (165, '000000', 1, '育成舍', '1', 'chicken_coop_type', NULL, 'primary', 'Y', 100, 1, '2025-08-18 11:55:32', 1, '2025-08-18 11:55:32', NULL);
+INSERT INTO `sys_dict_data` VALUES (166, '000000', 2, '产蛋舍', '2', 'chicken_coop_type', NULL, 'primary', 'N', 100, 1, '2025-08-18 11:55:44', 1, '2025-08-18 11:55:44', NULL);
+INSERT INTO `sys_dict_data` VALUES (167, '000000', 1, '育种厂', '0', 'factory_info', NULL, 'primary', 'Y', 100, 1, '2025-08-18 11:58:30', 1, '2025-08-18 11:58:30', NULL);
+INSERT INTO `sys_dict_data` VALUES (173, '000000', 2, '祖代厂', '1', 'factory_info', NULL, 'primary', 'Y', 100, 1, '2025-08-18 11:58:30', 1, '2025-08-18 11:58:30', NULL);
+INSERT INTO `sys_dict_data` VALUES (168, '000000', 3, '育雏舍', '3', 'chicken_coop_type', NULL, 'primary', 'N', 100, 1, '2025-08-18 11:55:44', 1, '2025-08-18 11:55:44', NULL);
+INSERT INTO `sys_dict_data` VALUES (169, '000000', 4, '测定舍', '4', 'chicken_coop_type', NULL, 'primary', 'N', 100, 1, '2025-08-18 11:55:44', 1, '2025-08-18 11:55:44', NULL);
+INSERT INTO `sys_dict_data` VALUES (170, '000000', 3, '未知', '2', 'chicken_gender', NULL, NULL, 'N', 100, 1, '2025-09-08 09:06:34', 1, '2025-09-08 09:06:34', NULL);
+INSERT INTO `sys_dict_data` VALUES (174, '000000', 1, '育种厂', '0', 'batch_type', NULL, NULL, 'N', 100, 1, '2025-09-08 09:06:34', 1, '2025-09-08 09:06:34', NULL);
+INSERT INTO `sys_dict_data` VALUES (175, '000000', 2, '祖代厂', '1', 'batch_type', NULL, NULL, 'N', 100, 1, '2025-09-08 09:06:34', 1, '2025-09-08 09:06:34', NULL);
+INSERT INTO `sys_dict_data` VALUES (176, '000000', 3, '育种转祖代', '2', 'batch_type', NULL, NULL, 'N', 100, 1, '2025-09-08 09:06:34', 1, '2025-09-08 09:06:34', NULL);
 
 
 
@@ -154,25 +158,95 @@ INSERT INTO `sys_dict_type` VALUES (9, '000000', '操作类型', 'sys_oper_type'
 INSERT INTO `sys_dict_type` VALUES (10, '000000', '操作状态', 'sys_common_status', 100, 1, '2025-07-10 14:59:14', NULL, NULL, '操作状态列表');
 INSERT INTO `sys_dict_type` VALUES (11, '000000', '授权类型', 'sys_grant_type', 100, 1, '2025-07-10 14:59:14', NULL, NULL, '认证授权类型');
 INSERT INTO `sys_dict_type` VALUES (12, '000000', '设备类型', 'sys_device_type', 100, 1, '2025-07-10 14:59:14', NULL, NULL, '客户端设备类型');
-INSERT INTO `sys_dict_type` VALUES (1000, '000000', '疫苗种类', 'vaccine_type', 100, 1, '2025-07-14 17:26:23', 1, '2025-07-14 17:26:23', '疫苗种类(0:灭活疫苗, 1:活疫苗, 2:重组蛋白疫苗)');
-INSERT INTO `sys_dict_type` VALUES (1001, '000000', '疫苗状态', 'vaccine_status', 100, 1, '2025-07-14 17:28:35', 1, '2025-07-14 17:28:35', '状态(0:可用, 1:缺货, 2:过期)');
-INSERT INTO `sys_dict_type` VALUES (1002, '000000', '家禽性别', 'chicken_gender', 100, 1, '2025-07-15 10:24:17', 1, '2025-09-08 09:06:14', '家禽性别(0:公 1:母  2:未知)');
-INSERT INTO `sys_dict_type` VALUES (1003, '000000', 'sop状态', 'sop_status', 100, 1, '2025-07-15 10:26:34', 1, '2025-07-24 11:01:54', '状态(0:启用, 1:禁用)');
-INSERT INTO `sys_dict_type` VALUES (1004, '000000', '翅号状态', 'wing_tag_status', 100, 1, '2025-07-16 15:58:49', 1, '2025-07-24 11:02:21', '状态(0:闲置, 1:已绑定)');
-INSERT INTO `sys_dict_type` VALUES (1005, '000000', '鸡舍状态', 'chicken_coop_status', 100, 1, '2025-07-16 17:11:05', 1, '2025-07-16 17:11:05', '状态(0:正常 1:异常)');
-INSERT INTO `sys_dict_type` VALUES (1006, '000000', '鸡笼状态', 'chicken_cage_status', 100, 1, '2025-07-16 20:16:21', 1, '2025-07-24 11:04:15', '状态(0:正常, 1:异常)');
-INSERT INTO `sys_dict_type` VALUES (1007, '000000', '品系系别', 'variety_lineage', 100, 1, '2025-07-17 11:56:03', 1, '2025-07-17 11:56:33', 'A~O系,例:A系,B系。。。。O系');
-INSERT INTO `sys_dict_type` VALUES (1008, '000000', '批次状态', 'batch_status', 100, 1, '2025-07-17 14:22:12', 1, '2025-07-17 14:22:12', '状态(0:新建, 1:育成中, 2:完成)');
-INSERT INTO `sys_dict_type` VALUES (1009, '000000', '鸡个体状态', 'chicken_status', 100, 1, '2025-07-17 18:21:26', 1, '2025-07-24 09:38:54', '状态(0:在养, 1:已淘汰)');
-INSERT INTO `sys_dict_type` VALUES (1010, '000000', '鸡个体淘汰原因', 'chicken_cull_reason', 100, 1, '2025-07-17 18:54:19', 1, '2025-08-11 15:55:42', '“腿病”、“腹水”、“细菌感染”、“外伤”,其他');
-INSERT INTO `sys_dict_type` VALUES (1011, '000000', '鸡个体处置方式', 'chicken_disposal_method', 100, 1, '2025-07-17 18:55:31', 1, '2025-07-17 18:55:31', '“无害化”,“食堂”,“屠宰场”');
-INSERT INTO `sys_dict_type` VALUES (1012, '000000', '家系配种状态', 'family_status', 100, 1, '2025-07-18 10:25:34', 1, '2025-07-24 11:06:51', '状态(0:正常, 1:异常)');
-INSERT INTO `sys_dict_type` VALUES (1014, '000000', '换笼状态', 'cage_change_status', 100, 1, '2025-07-28 13:52:49', 1, '2025-07-28 13:52:49', '换笼状态');
-INSERT INTO `sys_dict_type` VALUES (1015, '000000', '外拉类型', 'pull_out_type', 100, 1, '2025-07-30 12:34:45', 1, '2025-07-30 12:34:59', '外拉类型(0:祖代厂 1:食堂 2:实验室 3:菜蛋销售)');
-INSERT INTO `sys_dict_type` VALUES (1016, '000000', '测定记录详情状态', 'measure_detail_status', 100, 1, '2025-08-12 09:34:11', 1, '2025-08-12 09:34:11', '测定中,结束,淘汰');
-INSERT INTO `sys_dict_type` VALUES (1017, '000000', '鸡舍类型', 'chicken_coop_type', 100, 1, '2025-08-18 11:53:36', 1, '2025-08-18 11:55:00', '1:育成舍 2:产蛋舍');
-INSERT INTO `sys_dict_type` VALUES (1018, '000000', '厂区信息', 'factory_info', 100, 1, '2025-08-18 11:57:49', 1, '2025-08-18 11:57:49', '厂区信息');
-INSERT INTO `sys_dict_type` VALUES (1019, '000000', '批次类型', 'batch_type', 100, 1, '2025-07-17 14:22:12', 1, '2025-07-17 14:22:12', '状态(0:新建, 1:育成中, 2:完成)');
+INSERT INTO `sys_dict_type` VALUES (13, '000000', '消息阅读状态', 'sys_notice_read_status', 100, 1, '2025-10-15 12:00:00',  NULL, NULL, '0:未读 1:已读');
+
+INSERT INTO `sys_dict_type` VALUES (100, '000000', '疫苗种类', 'vaccine_type', 100, 1, '2025-07-14 17:26:23', 1, '2025-07-14 17:26:23', '疫苗种类(0:灭活疫苗, 1:活疫苗, 2:重组蛋白疫苗)');
+INSERT INTO `sys_dict_type` VALUES (101, '000000', '疫苗状态', 'vaccine_status', 100, 1, '2025-07-14 17:28:35', 1, '2025-07-14 17:28:35', '状态(0:可用, 1:缺货, 2:过期)');
+INSERT INTO `sys_dict_type` VALUES (102, '000000', '家禽性别', 'chicken_gender', 100, 1, '2025-07-15 10:24:17', 1, '2025-09-08 09:06:14', '家禽性别(0:公 1:母  2:未知)');
+INSERT INTO `sys_dict_type` VALUES (103, '000000', 'sop状态', 'sop_status', 100, 1, '2025-07-15 10:26:34', 1, '2025-07-24 11:01:54', '状态(0:启用, 1:禁用)');
+INSERT INTO `sys_dict_type` VALUES (104, '000000', '翅号状态', 'wing_tag_status', 100, 1, '2025-07-16 15:58:49', 1, '2025-07-24 11:02:21', '状态(0:闲置, 1:已绑定)');
+INSERT INTO `sys_dict_type` VALUES (105, '000000', '鸡舍状态', 'chicken_coop_status', 100, 1, '2025-07-16 17:11:05', 1, '2025-07-16 17:11:05', '状态(0:正常 1:异常)');
+INSERT INTO `sys_dict_type` VALUES (106, '000000', '鸡笼状态', 'chicken_cage_status', 100, 1, '2025-07-16 20:16:21', 1, '2025-07-24 11:04:15', '状态(0:正常, 1:异常)');
+INSERT INTO `sys_dict_type` VALUES (107, '000000', '品系系别', 'variety_lineage', 100, 1, '2025-07-17 11:56:03', 1, '2025-07-17 11:56:33', 'A~O系,例:A系,B系。。。。O系');
+INSERT INTO `sys_dict_type` VALUES (108, '000000', '批次状态', 'batch_status', 100, 1, '2025-07-17 14:22:12', 1, '2025-07-17 14:22:12', '状态(0:新建, 1:育成中, 2:完成)');
+INSERT INTO `sys_dict_type` VALUES (109, '000000', '鸡个体状态', 'chicken_status', 100, 1, '2025-07-17 18:21:26', 1, '2025-07-24 09:38:54', '状态(0:在养, 1:已淘汰)');
+INSERT INTO `sys_dict_type` VALUES (110, '000000', '鸡个体淘汰原因', 'chicken_cull_reason', 100, 1, '2025-07-17 18:54:19', 1, '2025-08-11 15:55:42', '“腿病”、“腹水”、“细菌感染”、“外伤”,其他');
+INSERT INTO `sys_dict_type` VALUES (111, '000000', '鸡个体处置方式', 'chicken_disposal_method', 100, 1, '2025-07-17 18:55:31', 1, '2025-07-17 18:55:31', '“无害化”,“食堂”,“屠宰场”');
+INSERT INTO `sys_dict_type` VALUES (112, '000000', '家系配种状态', 'family_status', 100, 1, '2025-07-18 10:25:34', 1, '2025-07-24 11:06:51', '状态(0:正常, 1:异常)');
+INSERT INTO `sys_dict_type` VALUES (114, '000000', '换笼状态', 'cage_change_status', 100, 1, '2025-07-28 13:52:49', 1, '2025-07-28 13:52:49', '换笼状态');
+INSERT INTO `sys_dict_type` VALUES (115, '000000', '外拉类型', 'pull_out_type', 100, 1, '2025-07-30 12:34:45', 1, '2025-07-30 12:34:59', '外拉类型(0:祖代厂 1:食堂 2:实验室 3:菜蛋销售)');
+INSERT INTO `sys_dict_type` VALUES (116, '000000', '测定记录详情状态', 'measure_detail_status', 100, 1, '2025-08-12 09:34:11', 1, '2025-08-12 09:34:11', '测定中,结束,淘汰');
+INSERT INTO `sys_dict_type` VALUES (117, '000000', '鸡舍类型', 'chicken_coop_type', 100, 1, '2025-08-18 11:53:36', 1, '2025-08-18 11:55:00', '1:育成舍 2:产蛋舍');
+INSERT INTO `sys_dict_type` VALUES (118, '000000', '厂区信息', 'factory_info', 100, 1, '2025-08-18 11:57:49', 1, '2025-08-18 11:57:49', '厂区信息');
+INSERT INTO `sys_dict_type` VALUES (119, '000000', '批次类型', 'batch_type', 100, 1, '2025-07-17 14:22:12', 1, '2025-07-17 14:22:12', '状态(0:新建, 1:育成中, 2:完成)');
+
+INSERT INTO `sys_dict_type` VALUES (301, '000000', '设备状态', 'device_status', 100, 1, '2025-10-15 12:00:00',  NULL, NULL, '0:正常运行 1:维修中 2:带病运行 3:退役');
+INSERT INTO `sys_dict_data` VALUES (301, '000000', 0, '正常运行', '0', 'device_status', '', 'warning', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '维修中');
+INSERT INTO `sys_dict_data` VALUES (302, '000000', 0, '维修中', '1', 'device_status', '', 'warning', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '维修中');
+INSERT INTO `sys_dict_data` VALUES (303, '000000', 0, '带病运行', '2', 'device_status', '', 'danger', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '带病运行');
+INSERT INTO `sys_dict_data` VALUES (304, '000000', 0, '退役', '3', 'device_status', '', 'info', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '退役');
+
+INSERT INTO `sys_dict_type` VALUES (302, '000000', '设备工单类型', 'device_order_type', 100, 1, '2025-10-15 12:00:00',  NULL, NULL, '1:故障报修 2:设备保养 3:清洁 4:消毒');
+INSERT INTO `sys_dict_data` VALUES (307, '000000', 0, '故障报修', '1', 'device_order_type', '', 'primary', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '故障报修');
+INSERT INTO `sys_dict_data` VALUES (308, '000000', 0, '设备保养', '2', 'device_order_type', '', 'warning', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '设备保养');
+INSERT INTO `sys_dict_data` VALUES (309, '000000', 0, '清洁', '3', 'device_order_type', '', 'success', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '清洁');
+INSERT INTO `sys_dict_data` VALUES (310, '000000', 0, '消毒', '4', 'device_order_type', '', 'success', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '消毒');
+
+INSERT INTO `sys_dict_type` VALUES (303, '000000', '设备工单状态', 'device_order_status', 100, 1, '2025-10-15 12:00:00',  NULL, NULL, '0:待处理 1:处理中 2:已暂缓 3:待验收 4:验收未通过 5:已完成');
+INSERT INTO `sys_dict_data` VALUES (311, '000000', 0, '待处理', '0', 'device_order_status', '', 'primary', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '待处理');
+INSERT INTO `sys_dict_data` VALUES (312, '000000', 0, '处理中', '1', 'device_order_status', '', 'warning', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '处理中');
+INSERT INTO `sys_dict_data` VALUES (313, '000000', 0, '已暂缓', '2', 'device_order_status', '', 'danger', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '已暂缓');
+INSERT INTO `sys_dict_data` VALUES (314, '000000', 0, '待验收', '3', 'device_order_status', '', 'success', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '待验收');
+INSERT INTO `sys_dict_data` VALUES (315, '000000', 0, '验收未通过', '4', 'device_order_status', '', 'danger', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '验收未通过');
+INSERT INTO `sys_dict_data` VALUES (316, '000000', 0, '已完成', '5', 'device_order_status', '', 'default', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '已完成');
+
+INSERT INTO `sys_dict_type` VALUES (304, '000000', '工单流转类型', 'device_order_flow_type', 100, 1, '2025-10-15 12:00:00',  NULL, NULL, '1:创建工单 2:修改工单 3:变更协助人 4:接收工单 5:暂缓工单 6:恢复工单 7:提交验收 8:验收通过 9:验收拒绝');
+INSERT INTO `sys_dict_data` VALUES (319, '000000', 0, '创建工单', '1', 'device_order_flow_type', '', 'primary', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '创建工单');
+INSERT INTO `sys_dict_data` VALUES (320, '000000', 0, '修改工单', '2', 'device_order_flow_type', '', 'warning', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '修改工单');
+INSERT INTO `sys_dict_data` VALUES (321, '000000', 0, '变更协助人', '3', 'device_order_flow_type', '', 'success', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '变更协助人');
+INSERT INTO `sys_dict_data` VALUES (322, '000000', 0, '接收工单', '4', 'device_order_flow_type', '', 'success', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '接收工单');
+INSERT INTO `sys_dict_data` VALUES (323, '000000', 0, '暂缓工单', '5', 'device_order_flow_type', '', 'danger', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '暂缓工单');
+INSERT INTO `sys_dict_data` VALUES (324, '000000', 0, '恢复工单', '6', 'device_order_flow_type', '', 'warning', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '恢复工单');
+INSERT INTO `sys_dict_data` VALUES (325, '000000', 0, '提交验收', '7', 'device_order_flow_type', '', 'warning', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '提交验收');
+INSERT INTO `sys_dict_data` VALUES (326, '000000', 0, '验收通过', '8', 'device_order_flow_type', '', 'success', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '验收通过');
+INSERT INTO `sys_dict_data` VALUES (327, '000000', 0, '验收拒绝', '9', 'device_order_flow_type', '', 'danger', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '验收拒绝');
+
+INSERT INTO `sys_dict_type` VALUES (305, '000000', '任务类型', 'device_task_type', 100, 1, '2025-10-15 12:00:00',  NULL, NULL, '1:设备保养 2:设备清洁');
+INSERT INTO `sys_dict_data` VALUES (331, '000000', 0, '设备保养', '1', 'device_task_type', '', 'primary', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '设备保养');
+INSERT INTO `sys_dict_data` VALUES (332, '000000', 0, '设备清洁', '2', 'device_task_type', '', 'warning', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '设备清洁');
+INSERT INTO `sys_dict_data` VALUES (333, '000000', 0, '设备消毒', '3', 'device_task_type', '', 'warning', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '设备消毒');
+
+INSERT INTO `sys_dict_type` VALUES (306, '000000', '清洁类型', 'device_clean_type', 100, 1, '2025-10-15 12:00:00',  NULL, NULL, '1:清洁 2:消毒');
+INSERT INTO `sys_dict_data` VALUES (335, '000000', 0, '清洁', '1', 'device_clean_type', '', 'primary', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '清洁');
+INSERT INTO `sys_dict_data` VALUES (336, '000000', 0, '消毒', '2', 'device_clean_type', '', 'warning', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '消毒');
+
+INSERT INTO `sys_dict_type` VALUES (307, '000000', '点检签到类型', 'device_inspection_type', 100, 1, '2025-10-15 12:00:00',  NULL, NULL, '0:未签到 1:签到');
+INSERT INTO `sys_dict_data` VALUES (341, '000000', 0, '未签到', '0', 'device_inspection_type', '', 'danger', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '未签到');
+INSERT INTO `sys_dict_data` VALUES (342, '000000', 0, '签到', '1', 'device_inspection_type', '', 'primary', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '签到');
+
+INSERT INTO `sys_dict_type` VALUES (311, '000000', '实验样品类型', 'experiment_sample_type', 100, 1, '2025-10-15 12:00:00',  NULL, NULL, '1:血液 2:粪便');
+INSERT INTO `sys_dict_data` VALUES (351, '000000', 0, '血液', '1', 'experiment_sample_type', '', 'primary', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '血液');
+INSERT INTO `sys_dict_data` VALUES (352, '000000', 0, '粪便', '2', 'experiment_sample_type', '', 'warning', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '粪便');
+
+INSERT INTO `sys_dict_type` VALUES (312, '000000', '实验样品状态', 'experiment_sample_status', 100, 1, '2025-10-15 12:00:00',  NULL, NULL, '1:新建 2:已采样 3:实验中 4:已销毁');
+INSERT INTO `sys_dict_data` VALUES (355, '000000', 0, '已创建', '1', 'experiment_sample_status', '', 'primary', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '新建');
+INSERT INTO `sys_dict_data` VALUES (356, '000000', 0, '已采样', '2', 'experiment_sample_status', '', 'success', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '已采样');
+INSERT INTO `sys_dict_data` VALUES (357, '000000', 0, '实验中', '3', 'experiment_sample_status', '', 'warning', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '实验中');
+INSERT INTO `sys_dict_data` VALUES (358, '000000', 0, '已销毁', '4', 'experiment_sample_status', '', 'danger', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '已销毁');
+
+INSERT INTO `sys_dict_type` VALUES (313, '000000', '实验类型', 'experiment_type', 100, 1, '2025-10-15 12:00:00',  NULL, NULL, '1:平板凝集-沙门氏菌 2:ELISA-白血病P27抗原 3:ELISA-抗体 4:荧光定量PCR 5:HI-抗体');
+INSERT INTO `sys_dict_data` VALUES (361, '000000', 0, '平板凝集-沙门氏菌', '1', 'experiment_type', '', 'primary', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '平板凝集-沙门氏菌');
+INSERT INTO `sys_dict_data` VALUES (362, '000000', 0, 'ELISA-白血病P27抗原', '2', 'experiment_type', '', 'primary', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, 'ELISA-白血病P27抗原');
+INSERT INTO `sys_dict_data` VALUES (363, '000000', 0, 'ELISA-抗体', '3', 'experiment_type', '', 'primary', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, 'ELISA-抗体');
+INSERT INTO `sys_dict_data` VALUES (364, '000000', 0, '荧光定量PCR', '4', 'experiment_type', '', 'primary', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '荧光定量PCR');
+INSERT INTO `sys_dict_data` VALUES (365, '000000', 0, 'HI-抗体', '5', 'experiment_type', '', 'primary', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, 'HI-抗体');
+
+INSERT INTO `sys_dict_type` VALUES (314, '000000', '实验状态', 'experiment_status', 100, 1, '2025-10-15 12:00:00',  NULL, NULL, '1:新建 2:进行中 3:审核中 4:发回报告 5:已结束');
+INSERT INTO `sys_dict_data` VALUES (371, '000000', 0, '未开始', '1', 'experiment_status', '', 'primary', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '新建');
+INSERT INTO `sys_dict_data` VALUES (372, '000000', 0, '进行中', '2', 'experiment_status', '', 'success', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '进行中');
+INSERT INTO `sys_dict_data` VALUES (373, '000000', 0, '审核中', '3', 'experiment_status', '', 'warning', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '审核中');
+INSERT INTO `sys_dict_data` VALUES (374, '000000', 0, '发回报告', '4', 'experiment_status', '', 'danger', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '发回报告');
+INSERT INTO `sys_dict_data` VALUES (375, '000000', 0, '已结束', '5', 'experiment_status', '', 'primary', 'N', 100, 1, '2025-10-15 12:00:00', NULL, NULL, '已结束');
 
 
 INSERT INTO `sys_dict_type` VALUES (501, '000000', '仓库类型', 'store_house_type', 100, 1, '2025-10-15 12:00:00',  NULL, NULL, '1:故障报修 2:保养管理');
@@ -270,6 +344,9 @@ INSERT INTO `sys_dict_data` VALUES (665, '000000', 5, '已退订', '5', 'order_i
 
 
 
+
+
+
 -- ----------------------------
 -- Records of sys_client
 -- ----------------------------
@@ -413,4 +490,126 @@ INSERT INTO `xxl_job_user` VALUES (2, 'system', '6b7754cc771284da49d560729e73a9f
 
 
 
+
+
+
+
+-- 一期带来的业务初始数据 --------------------------------
+INSERT INTO `f_chicken_coop` VALUES (11, '02-001', '测定3舍', 1440, 0, 1, '0', NULL, 100, '1', 1, '2025-09-06 11:25:17', 1, '2025-09-07 08:37:41', NULL);
+INSERT INTO `f_chicken_coop` VALUES (12, '02-002', ' 测定4舍', 1440, 0, 1, '0', NULL, 100, '1', 1, '2025-09-06 11:25:43', 1, '2025-09-07 08:38:03', NULL);
+INSERT INTO `f_chicken_coop` VALUES (13, '03-001', '测定1舍', 1920, 0, 1, '0', NULL, 100, '1', 1, '2025-09-06 11:26:00', 1, '2025-09-07 08:38:55', NULL);
+INSERT INTO `f_chicken_coop` VALUES (14, '2-003', '育成3舍', 810, 0, 1, '0', NULL, 100, '1', 1, '2025-09-07 08:31:39', 1, '2025-09-07 08:52:56', NULL);
+INSERT INTO `f_chicken_coop` VALUES (15, '2-004', '育成4舍', 810, 0, 1, '0', NULL, 100, '1', 1, '2025-09-07 08:32:00', 1, '2025-09-07 08:52:59', NULL);
+INSERT INTO `f_chicken_coop` VALUES (16, '2-005', '育成5舍', 810, 0, 1, '0', NULL, 100, '1', 1, '2025-09-07 08:32:16', 1, '2025-09-07 08:53:02', NULL);
+INSERT INTO `f_chicken_coop` VALUES (17, '2-006', '育成6舍', 810, 0, 1, '0', NULL, 100, '1', 1, '2025-09-07 08:32:31', 1, '2025-09-07 08:53:05', NULL);
+INSERT INTO `f_chicken_coop` VALUES (18, '2-006', '育成7舍', 810, 0, 1, '0', NULL, 100, '1', 1, '2025-09-07 08:32:39', 1, '2025-09-07 08:33:38', NULL);
+INSERT INTO `f_chicken_coop` VALUES (19, '2-007', '育成7舍', 810, 0, 1, '0', NULL, 100, '1', 1, '2025-09-07 08:33:58', 1, '2025-09-07 08:53:07', NULL);
+INSERT INTO `f_chicken_coop` VALUES (20, '2-008', '育成8', 810, 0, 1, '0', NULL, 100, '1', 1, '2025-09-07 08:34:19', 1, '2025-09-07 08:53:09', NULL);
+INSERT INTO `f_chicken_coop` VALUES (21, '2-009', '育成9', 810, 0, 1, '0', NULL, 100, '1', 1, '2025-09-07 08:34:28', 1, '2025-09-07 08:53:11', NULL);
+INSERT INTO `f_chicken_coop` VALUES (22, '2-010', '育成10', 810, 0, 1, '0', NULL, 100, '1', 1, '2025-09-07 08:34:45', 1, '2025-09-07 08:53:13', NULL);
+INSERT INTO `f_chicken_coop` VALUES (23, '2-011', '育成11', 810, 0, 1, '0', NULL, 100, '1', 1, '2025-09-07 08:35:10', 1, '2025-09-07 08:53:15', NULL);
+INSERT INTO `f_chicken_coop` VALUES (24, '2-012', '育成12', 810, 0, 1, '0', NULL, 100, '1', 1, '2025-09-07 08:35:18', 1, '2025-09-07 08:53:17', NULL);
+INSERT INTO `f_chicken_coop` VALUES (25, '03-002', '测定2舍', 1920, 0, 1, '0', NULL, 100, '1', 1, '2025-09-07 08:38:37', 1, '2025-09-07 08:39:30', NULL);
+INSERT INTO `f_chicken_coop` VALUES (26, '03-001', '测定1舍', 1920, 0, 1, '0', NULL, 100, '1', 1, '2025-09-07 08:39:12', 1, '2025-09-07 08:53:19', NULL);
+INSERT INTO `f_chicken_coop` VALUES (27, '03-002', '测定2舍', 1920, 0, 1, '0', NULL, 100, '1', 1, '2025-09-07 08:39:44', 1, '2025-09-07 08:53:21', NULL);
+INSERT INTO `f_chicken_coop` VALUES (28, '03-003', '测定3舍', 1440, 0, 1, '0', NULL, 100, '1', 1, '2025-09-07 08:39:58', 1, '2025-09-07 08:53:23', NULL);
+INSERT INTO `f_chicken_coop` VALUES (29, '03-004', '测定4舍', 1440, 0, 1, '0', NULL, 100, '1', 1, '2025-09-07 08:40:10', 1, '2025-09-07 08:53:25', NULL);
+INSERT INTO `f_chicken_coop` VALUES (30, '02-003', '育成3舍', 810, 0, 1, '0', NULL, 100, '0', 1, '2025-09-07 09:02:00', 1, '2025-09-07 09:02:00', NULL);
+INSERT INTO `f_chicken_coop` VALUES (31, '02-004', '育成4舍', 810, 0, 1, '0', NULL, 100, '0', 1, '2025-09-07 09:02:44', 1, '2025-09-07 09:02:44', NULL);
+INSERT INTO `f_chicken_coop` VALUES (32, '02-005', '育成5舍', 810, 0, 1, '0', NULL, 100, '0', 1, '2025-09-07 09:08:01', 1, '2025-09-07 09:08:01', NULL);
+INSERT INTO `f_chicken_coop` VALUES (33, '02-006', '育成6舍', 810, 0, 1, '0', NULL, 100, '0', 1, '2025-09-07 09:08:12', 1, '2025-09-07 09:08:12', NULL);
+INSERT INTO `f_chicken_coop` VALUES (34, '02-007', '育成7舍', 810, 0, 1, '0', NULL, 100, '0', 1, '2025-09-07 09:08:21', 1, '2025-09-07 09:08:21', NULL);
+INSERT INTO `f_chicken_coop` VALUES (35, '02-008', '育成8舍', 810, 0, 1, '0', NULL, 100, '0', 1, '2025-09-07 09:08:31', 1, '2025-09-07 09:08:31', NULL);
+INSERT INTO `f_chicken_coop` VALUES (36, '02-009', '育成9舍', 810, 0, 1, '0', NULL, 100, '0', 1, '2025-09-07 09:08:39', 1, '2025-09-07 09:08:39', NULL);
+INSERT INTO `f_chicken_coop` VALUES (37, '02-010', '育成10舍', 810, 0, 1, '0', NULL, 100, '0', 1, '2025-09-07 09:08:50', 1, '2025-09-07 09:08:50', NULL);
+INSERT INTO `f_chicken_coop` VALUES (38, '02-011', '育成11舍', 810, 0, 1, '0', NULL, 100, '0', 1, '2025-09-07 09:08:56', 1, '2025-09-07 09:09:08', NULL);
+INSERT INTO `f_chicken_coop` VALUES (39, '02-012', '育成12舍', 810, 0, 1, '0', NULL, 100, '0', 1, '2025-09-07 09:09:18', 1, '2025-09-07 09:09:18', NULL);
+INSERT INTO `f_chicken_coop` VALUES (40, '03-001', '测定1舍', 1920, 0, 1, '0', NULL, 100, '0', 1, '2025-09-07 09:10:11', 1, '2025-09-07 09:10:11', NULL);
+INSERT INTO `f_chicken_coop` VALUES (41, '03-002', '测定2舍', 1920, 0, 1, '0', NULL, 100, '0', 1, '2025-09-07 09:12:08', 1, '2025-09-07 09:12:08', NULL);
+INSERT INTO `f_chicken_coop` VALUES (42, '03-003', '测定3舍', 1440, 0, 1, '0', NULL, 100, '0', 1, '2025-09-07 09:12:24', 1, '2025-09-07 09:12:24', NULL);
+INSERT INTO `f_chicken_coop` VALUES (43, '03-004', '测定4舍', 1440, 0, 1, '0', NULL, 100, '0', 1, '2025-09-07 09:12:44', 1, '2025-09-07 09:12:44', NULL);
+
+INSERT INTO `f_chicken_cage` VALUES (24, '02-001-1-810', 11, NULL, 0, 8, 100, 1, '2025-09-06 11:26:37', 1, '2025-09-07 08:37:22', NULL, '1');
+INSERT INTO `f_chicken_cage` VALUES (25, '02-002-1-810', 12, NULL, 0, 8, 100, 1, '2025-09-06 11:26:47', 1, '2025-09-07 08:37:57', NULL, '1');
+INSERT INTO `f_chicken_cage` VALUES (26, '2-003-810', 14, NULL, 0, 8, 100, 1, '2025-09-07 08:42:29', 1, '2025-09-07 08:51:55', NULL, '1');
+INSERT INTO `f_chicken_cage` VALUES (27, '2-004-2-004-810', 15, NULL, 0, 810, 100, 1, '2025-09-07 08:50:53', 1, '2025-09-07 08:51:02', NULL, '1');
+INSERT INTO `f_chicken_cage` VALUES (28, '02-003-810', 30, NULL, 0, 8, 100, 1, '2025-09-07 09:03:26', 1, '2025-09-07 09:04:05', NULL, '1');
+INSERT INTO `f_chicken_cage` VALUES (29, '02-003-1-810', 30, NULL, 0, 8, 100, 1, '2025-09-07 15:10:24', 1, '2025-09-07 15:10:24', NULL, '0');
+INSERT INTO `f_chicken_cage` VALUES (30, '02-004-1-810', 31, NULL, 0, 8, 100, 1, '2025-09-07 15:10:48', 1, '2025-09-07 15:10:48', NULL, '0');
+INSERT INTO `f_chicken_cage` VALUES (31, '02-005-1-810', 32, NULL, 0, 8, 100, 1, '2025-09-07 15:11:00', 1, '2025-09-07 15:11:00', NULL, '0');
+INSERT INTO `f_chicken_cage` VALUES (32, '02-006-1-810', 33, NULL, 0, 8, 100, 1, '2025-09-07 15:11:23', 1, '2025-09-07 15:11:23', NULL, '0');
+INSERT INTO `f_chicken_cage` VALUES (33, '02-007-1-810', 34, NULL, 0, 8, 100, 1, '2025-09-07 15:11:30', 1, '2025-09-07 15:11:30', NULL, '0');
+INSERT INTO `f_chicken_cage` VALUES (34, '02-008-1-810', 35, NULL, 0, 8, 100, 1, '2025-09-07 15:11:42', 1, '2025-09-07 15:11:42', NULL, '0');
+INSERT INTO `f_chicken_cage` VALUES (35, '02-009-1-810', 36, NULL, 0, 8, 100, 1, '2025-09-07 15:11:51', 1, '2025-09-07 15:11:51', NULL, '0');
+INSERT INTO `f_chicken_cage` VALUES (36, '02-010-1-810', 37, NULL, 0, 8, 100, 1, '2025-09-07 15:11:57', 1, '2025-09-07 15:11:57', NULL, '0');
+INSERT INTO `f_chicken_cage` VALUES (37, '02-011-1-810', 38, NULL, 0, 8, 100, 1, '2025-09-07 15:12:04', 1, '2025-09-07 15:12:04', NULL, '0');
+INSERT INTO `f_chicken_cage` VALUES (38, '02-012-1-810', 39, NULL, 0, 8, 100, 1, '2025-09-07 15:12:09', 1, '2025-09-07 15:12:09', NULL, '0');
+INSERT INTO `f_chicken_cage` VALUES (39, '03-001-1-1920', 40, NULL, 0, 1, 100, 1, '2025-09-07 15:12:31', 1, '2025-09-07 15:12:31', NULL, '0');
+INSERT INTO `f_chicken_cage` VALUES (40, '03-002-1-1920', 41, NULL, 0, 1, 100, 1, '2025-09-07 15:12:45', 1, '2025-09-07 15:12:45', NULL, '0');
+INSERT INTO `f_chicken_cage` VALUES (41, '03-003-1-1440', 42, NULL, 0, 1, 100, 1, '2025-09-07 15:12:59', 1, '2025-09-07 15:12:59', NULL, '0');
+INSERT INTO `f_chicken_cage` VALUES (42, '03-004-1-1440', 43, NULL, 0, 1, 100, 1, '2025-09-07 15:13:06', 1, '2025-09-07 15:13:06', NULL, '0');
+
+INSERT INTO `f_feed` VALUES (12, '育雏前期料', NULL, 0, 100, 1, '2025-09-17 11:30:03', 1, '2025-09-17 11:30:03', NULL, '0');
+INSERT INTO `f_feed` VALUES (13, '育雏后期料', NULL, 0, 100, 1, '2025-09-17 11:30:28', 1, '2025-09-17 11:30:28', NULL, '0');
+INSERT INTO `f_feed` VALUES (14, '育成料', NULL, 0, 100, 1, '2025-09-17 11:30:36', 1, '2025-09-17 11:30:36', NULL, '0');
+INSERT INTO `f_feed` VALUES (15, '低能肉鸡料(三段料)', NULL, 0, 100, 1, '2025-09-17 11:31:11', 1, '2025-09-17 11:31:11', NULL, '0');
+INSERT INTO `f_feed` VALUES (16, '预产料', NULL, 0, 100, 1, '2025-09-17 11:31:27', 1, '2025-09-17 11:31:27', NULL, '0');
+INSERT INTO `f_feed` VALUES (17, '产蛋前期料', NULL, 0, 100, 1, '2025-09-17 11:31:40', 1, '2025-09-17 11:31:40', NULL, '0');
+INSERT INTO `f_feed` VALUES (18, '产蛋中期料', NULL, 0, 100, 1, '2025-09-17 11:31:52', 1, '2025-09-17 11:31:52', NULL, '0');
+INSERT INTO `f_feed` VALUES (19, '产蛋后期料', NULL, 0, 100, 1, '2025-09-17 11:31:59', 1, '2025-09-17 11:31:59', NULL, '0');
+INSERT INTO `f_feed` VALUES (20, '种公鸡料', NULL, 0, 100, 1, '2025-09-17 11:32:10', 1, '2025-09-17 11:32:10', NULL, '0');
+
+
+
+INSERT INTO `f_vaccine` VALUES (10, '威支灵', 1, '勃林格', '2025-04-29', '2026-04-28', 0, NULL, 100, 1, '2025-09-17 10:29:20', 1, '2025-09-17 10:29:20', '0');
+INSERT INTO `f_vaccine` VALUES (11, 'IB4-91', 1, '勃林格', '2024-10-01', '2026-09-01', 0, NULL, 100, 1, '2025-09-17 10:30:59', 1, '2025-09-17 10:30:59', '0');
+INSERT INTO `f_vaccine` VALUES (12, 'IB4-91', 1, '勃林格', '2024-10-01', '2026-09-01', 0, NULL, 100, 1, '2025-09-17 10:35:06', 1, '2025-09-17 10:35:06', '0');
+INSERT INTO `f_vaccine` VALUES (13, 'REO1133', 1, '默沙东', '2024-05-01', '2026-04-01', 0, NULL, 100, 1, '2025-09-17 10:37:17', 1, '2025-09-17 10:37:17', '0');
+INSERT INTO `f_vaccine` VALUES (14, 'ND+IB二联油', 1, '默沙东', '2024-10-01', '2026-09-01', 0, NULL, 100, 1, '2025-09-17 11:02:43', 1, '2025-09-17 11:02:43', '0');
+INSERT INTO `f_vaccine` VALUES (15, 'ND+IB二联油', 0, '默沙东', '2024-10-01', '2026-09-01', 0, NULL, 100, 1, '2025-09-17 11:04:54', 1, '2025-09-17 11:04:54', '0');
+INSERT INTO `f_vaccine` VALUES (16, '喉痘', 1, '法国诗华', '2024-02-28', '2026-02-28', 0, NULL, 100, 1, '2025-09-17 11:09:31', 1, '2025-09-17 11:09:31', '0');
+INSERT INTO `f_vaccine` VALUES (17, '沙门氏活苗SE', 1, '美国礼蓝', '2024-09-01', '2026-08-01', 0, NULL, 100, 1, '2025-09-17 11:12:18', 1, '2025-09-17 11:12:18', '0');
+INSERT INTO `f_vaccine` VALUES (18, 'ND+IB+H9三联油苗', 0, '青岛易邦', '2025-06-17', '2026-06-16', 0, NULL, 100, 1, '2025-09-17 11:13:49', 1, '2025-09-17 11:13:49', '0');
+INSERT INTO `f_vaccine` VALUES (19, 'Ma5clone30', 1, '默沙东', '2024-09-01', '2026-09-01', 0, NULL, 100, 1, '2025-09-17 11:15:31', 1, '2025-09-17 11:15:31', '0');
+INSERT INTO `f_vaccine` VALUES (20, '青岛H5+H7', 0, '青岛易邦', '2025-04-20', '2026-04-19', 0, NULL, 100, 1, '2025-09-17 11:16:33', 1, '2025-09-17 11:16:33', '0');
+INSERT INTO `f_vaccine` VALUES (21, 'MG活苗(6/85株)', 1, '默沙东', '2024-01-01', '2026-03-01', 0, NULL, 100, 1, '2025-09-17 11:17:45', 1, '2025-09-17 11:17:45', '0');
+INSERT INTO `f_vaccine` VALUES (22, 'IC铝胶苗', 0, '日本北里', '2025-02-01', '2027-02-06', 0, NULL, 100, 1, '2025-09-17 11:18:37', 1, '2025-09-17 11:18:37', '0');
+INSERT INTO `f_vaccine` VALUES (23, 'ND+H9+FADV三联油苗', 0, '瑞普', '2025-01-02', '2026-07-04', 0, NULL, 100, 1, '2025-09-17 11:19:34', 1, '2025-09-17 11:19:34', '0');
+INSERT INTO `f_vaccine` VALUES (24, 'H5+H7二联油苗', 0, '华南生物', '2025-04-02', '2026-04-01', 0, NULL, 100, 1, '2025-09-17 11:20:25', 1, '2025-09-17 11:20:25', '0');
+INSERT INTO `f_vaccine` VALUES (25, 'CAV', 1, '默沙东', '2024-04-01', '2026-03-01', 0, NULL, 100, 1, '2025-09-17 11:21:17', 1, '2025-09-17 11:21:17', '0');
+INSERT INTO `f_vaccine` VALUES (26, 'REO油苗', 0, '美国礼蓝', '2024-09-01', '2026-02-01', 0, NULL, 100, 1, '2025-09-17 11:22:07', 1, '2025-09-17 11:22:07', '0');
+INSERT INTO `f_vaccine` VALUES (27, 'ILT(爱乐啼)', 0, '默沙东', '2024-01-09', '2027-01-08', 0, NULL, 100, 1, '2025-09-17 11:22:52', 1, '2025-09-17 11:22:52', '0');
+INSERT INTO `f_vaccine` VALUES (28, 'AE+POX', 1, '默沙东', '2024-02-01', '2027-01-01', 0, NULL, 100, 1, '2025-09-17 11:23:46', 1, '2025-09-17 11:23:46', '0');
+INSERT INTO `f_vaccine` VALUES (29, 'ILT(爱乐啼)', 1, '默沙东', '2024-01-09', '2027-01-08', 0, NULL, 100, 1, '2025-09-17 11:24:29', 1, '2025-09-17 11:24:29', '0');
+INSERT INTO `f_vaccine` VALUES (30, 'ND+IB+H9+EDS', 0, '瑞普', '2024-04-01', '2027-04-07', 0, NULL, 100, 1, '2025-09-17 11:25:48', 1, '2025-09-17 11:25:48', '0');
+INSERT INTO `f_vaccine` VALUES (31, 'MG油苗', 0, '瑞普', '2025-01-03', '2026-01-06', 0, NULL, 100, 1, '2025-09-17 11:26:37', 1, '2025-09-17 11:26:37', '0');
+INSERT INTO `f_vaccine` VALUES (32, 'ND+IB+IBD+REO', 0, '默沙东', '2024-12-01', '2026-05-01', 0, NULL, 100, 1, '2025-09-17 11:27:28', 1, '2025-09-17 11:27:28', '0');
+INSERT INTO `f_vaccine` VALUES (33, '沙门氏菌灭活疫苗', 0, '默沙东', '2025-05-01', '2027-11-01', 0, NULL, 100, 1, '2025-09-17 11:28:53', 1, '2025-09-17 11:28:53', '0');
+
+INSERT INTO `f_drug` VALUES (9, '林可大观霉素', '北京康牧生物科技有限公司', '2024-11-07', '2026-11-06', 0, NULL, 100, 1, '2025-09-17 09:25:25', 1, '2025-09-17 09:25:25', '0');
+INSERT INTO `f_drug` VALUES (10, '萜木真', '南京惠环生物科技有限公司', '2024-10-31', '2026-04-30', 0, NULL, 100, 1, '2025-09-17 09:27:01', 1, '2025-09-17 09:27:01', '0');
+INSERT INTO `f_drug` VALUES (11, '枝原净', '礼蓝(上海)动物保健有限公司', '2025-01-01', '2027-12-01', 0, NULL, 100, 1, '2025-09-17 09:29:12', 1, '2025-09-17 09:29:12', '0');
+INSERT INTO `f_drug` VALUES (12, '佳益多', '荷兰鹰凯动物保健集团', '2024-11-19', '2026-11-19', 0, NULL, 100, 1, '2025-09-17 09:30:30', 1, '2025-09-17 09:30:30', '0');
+INSERT INTO `f_drug` VALUES (13, '维金100', '瑞普高科(天津)生物科技有限公司', '2025-03-14', '2027-03-13', 0, NULL, 100, 1, '2025-09-17 09:31:37', 1, '2025-09-17 09:31:37', '0');
+INSERT INTO `f_drug` VALUES (14, '塞可新(有机酸)', '多卫捷(河北)生物科技有限公司', '2025-03-17', '2027-03-16', 0, NULL, 100, 1, '2025-09-17 09:32:40', 1, '2025-09-17 09:32:40', '0');
+INSERT INTO `f_drug` VALUES (15, '磺胺氯吡嗪钠可溶性粉(安球生)', '南京惠牧生物科技有限公司', '2025-01-02', '2027-01-01', 0, NULL, 100, 1, '2025-09-17 09:33:38', 1, '2025-09-17 09:33:38', '0');
+INSERT INTO `f_drug` VALUES (16, '肠治先锋', '南京生物科技有限公司', '2025-05-08', '2027-11-07', 0, NULL, 100, 1, '2025-09-17 09:35:06', 1, '2025-09-17 09:35:06', '0');
+INSERT INTO `f_drug` VALUES (17, '百呼清', '南京生物科技有限公司', '2025-01-13', '2027-07-13', 0, NULL, 100, 1, '2025-09-17 09:36:13', 1, '2025-09-17 09:36:13', '0');
+INSERT INTO `f_drug` VALUES (18, '山字', '礼蓝(上海)动物保健有限公司', '2024-07-01', '2026-06-30', 0, NULL, 100, 1, '2025-09-17 09:37:07', 1, '2025-09-17 09:37:07', '0');
+INSERT INTO `f_drug` VALUES (19, '速服宁', '法国FC有限公司', '2024-07-01', '2026-06-30', 0, NULL, 100, 1, '2025-09-17 09:37:39', 1, '2025-09-17 09:37:39', '0');
+INSERT INTO `f_drug` VALUES (20, '阿莫西林', '四川德成动物保健品有限公司', '2024-10-08', '2026-10-07', 0, NULL, 100, 1, '2025-09-17 09:38:28', 1, '2025-09-17 09:38:28', '0');
+INSERT INTO `f_drug` VALUES (21, '沃尼妙林', '瑞普(天津)生物药业有限公司', '2025-03-04', '2027-03-03', 0, NULL, 100, 1, '2025-09-17 09:51:54', 1, '2025-09-17 09:51:54', '0');
+INSERT INTO `f_drug` VALUES (22, '可安松', '荷兰鹰凯动物保健集团', '2024-11-19', '2026-11-19', 0, NULL, 100, 1, '2025-09-17 09:53:10', 1, '2025-09-17 09:53:10', '0');
+INSERT INTO `f_drug` VALUES (23, '球易安', '南京惠环生物科技有限公司', '2025-08-15', '2027-08-15', 0, NULL, 100, 1, '2025-09-17 09:54:04', 1, '2025-09-17 09:54:04', '0');
+INSERT INTO `f_drug` VALUES (24, '头孢喹肟', '瑞普生物', '2025-02-26', '2027-02-26', 0, NULL, 100, 1, '2025-09-17 09:55:07', 1, '2025-09-17 09:55:07', '0');
+INSERT INTO `f_drug` VALUES (25, '利高', '硕螣动保', '2024-07-01', '2026-06-01', 0, NULL, 100, 1, '2025-09-17 09:56:15', 1, '2025-09-17 09:56:15', '0');
+INSERT INTO `f_drug` VALUES (26, '亚易林', '瑞普生物', '2025-04-08', '2025-10-07', 0, NULL, 100, 1, '2025-09-17 09:56:58', 1, '2025-09-17 09:56:58', '0');
+INSERT INTO `f_drug` VALUES (27, '乐培', '荷兰鹰凯动物保健集团', '2024-10-31', '2026-10-31', 1, NULL, 100, 1, '2025-09-17 09:58:06', 1, '2025-09-17 09:58:06', '0');
+
+INSERT INTO `f_variety` VALUES (1, '白羽鸡', 'M', 6, '父系', 0, 100, 1, '2025-07-17 13:28:06', 1, '2025-09-06 10:20:30', NULL, '0');
+INSERT INTO `f_variety` VALUES (2, '白羽鸡', 'N', 9, '母系', 0, 100, 1, '2025-07-17 13:28:19', 1, '2025-09-06 10:20:39', NULL, '0');
+INSERT INTO `f_variety` VALUES (4, '白羽鸡', 'C', 4, '母系', 0, 100, 1, '2025-08-11 16:39:20', 1, '2025-09-06 10:20:51', NULL, '0');
+INSERT INTO `f_variety` VALUES (6, '白羽鸡', 'D', 3, '母系', 0, 100, 1, '2025-08-21 12:56:01', 1, '2025-09-06 10:21:01', NULL, '0');
+INSERT INTO `f_variety` VALUES (9, '白羽鸡', 'A', 2, '父系', 0, 100, 1, '2025-08-21 13:06:39', 1, '2025-09-06 10:21:15', NULL, '0');
+
 SET FOREIGN_KEY_CHECKS = 1;

+ 1 - 2
SERVER/ChickenFarmV3/.script/sql/new/init_y.sql

@@ -151,7 +151,6 @@ CREATE TABLE `d_device_task`  (
       INDEX `idx_device_id`(`device_id` ASC) USING BTREE,
       INDEX `idx_task_name`(`task_name` ASC) USING BTREE,
       INDEX `idx_task_type`(`task_type` ASC) USING BTREE,
-      INDEX `idx_clean_type`(`clean_type` ASC) USING BTREE,
       INDEX `idx_executor_id`(`executor_id` ASC) USING BTREE,
       INDEX `idx_acceptor_id`(`acceptor_id` ASC) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT = '设备任务表';
@@ -414,7 +413,7 @@ CREATE TABLE `e_sample` (
     `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
     `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT '删除标志(0:未删除, 1:已删除)',
     PRIMARY KEY (`id`),
-    KEY `idx_sample_batch` (`batch_id`),
+    KEY `idx_sample_batch` (`batch_num`),
     KEY `idx_sample_chicken_id` (`chicken_id`),
     KEY `idx_sample_status` (`sample_status`),
     KEY `idx_sample_create_by` (`create_by`)

+ 3 - 0
SERVER/ChickenFarmV3/.script/sql/new/sysmenu.sql

@@ -121,6 +121,9 @@ INSERT INTO `sys_menu` VALUES (201, '批次管理', 10, 1, 'batch', 'breeding/ba
 INSERT INTO `sys_menu` VALUES (202,'翅号管理表', 10, 2, 'wingTag', 'breeding/wingTag/index', '', 1, 0, 'C', '1', '0', 'breeding:wingTag', '#', NULL, NULL, 100, 1, '2025-07-16 17:02:35', NULL, '2025-07-16 17:02:35', '');
 INSERT INTO `sys_menu` VALUES (203, '个体维护', 10, 3, 'chicken', 'breeding/chicken/index', '', 1, 0, 'C', '1', '0', 'breeding:chicken', '#', NULL, NULL, 100, 1, '2025-07-17 19:04:01', NULL, '2025-07-17 19:04:01', '');
 INSERT INTO `sys_menu` VALUES (204, '换笼管理', 10, 4, 'cageChange', 'breeding/cageChange/index', '', 1, 0, 'C', '0', '0', 'breeding:cageChange', '#', NULL, NULL, 100, 1, '2025-07-21 09:42:09', NULL, '2025-07-21 09:42:09', '');
+INSERT INTO `sys_menu` VALUES (205, '育种喂养记录', 10, 5, 'feedRecord1', 'breeding/feedRecord/indexHasChicken', '', 1, 0, 'C', '0', '0', 'breeding:cageChange', '#', NULL, NULL, 100, 1, '2025-07-21 09:42:09', NULL, '2025-07-21 09:42:09', '');
+INSERT INTO `sys_menu` VALUES (206, '育种用药记录', 10, 6, 'drugRecord1', 'breeding/drugRecord/indexHasChicken', '', 1, 0, 'C', '0', '0', 'breeding:cageChange', '#', NULL, NULL, 100, 1, '2025-07-21 09:42:09', NULL, '2025-07-21 09:42:09', '');
+INSERT INTO `sys_menu` VALUES (207, '育种疫苗记录', 10, 7, 'vaccineRecord1', 'breeding/vaccineRecord/indexHasChicken', '', 1, 0, 'C', '0', '0', 'breeding:cageChange', '#', NULL, NULL, 100, 1, '2025-07-21 09:42:09', NULL, '2025-07-21 09:42:09', '');
 INSERT INTO `sys_menu` VALUES (212, '测定管理', 10, 12, 'measure', 'breeding/measure/index', '', 1, 0, 'C', '0', '0', 'breeding:measure', '#', NULL, NULL, 100, 1, '2025-08-12 09:44:38', NULL, '2025-08-12 09:44:38', '');
 INSERT INTO `sys_menu` VALUES (213, '测定记录详情', 10, 13, 'measureDetail', 'breeding/measureDetail/index', '', 1, 0, 'C', '1', '0', 'breeding:measureDetail', '#', NULL, NULL, 100, 1, '2025-08-12 09:44:41', NULL, '2025-08-12 09:44:41', '');
 

+ 1 - 1
SERVER/ChickenFarmV3/vb-admin/src/main/resources/application-dev.yml

@@ -24,7 +24,7 @@ spring:
           # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
           # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
           # url: jdbc:mysql://127.0.0.1:3326/ChickenFarmDB_DEV?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
-          url: jdbc:mysql://192.168.0.104:3316/ChickenFarmDB_DEV2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+          url: jdbc:mysql://192.168.0.104:3316/ChickenFarmDB_TEST?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
           #url: jdbc:mysql://192.168.0.81:3326/ChickenFarmDB_v1?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
           username: root
           # password: root

+ 4 - 0
SERVER/ChickenFarmV3/vb-modules/vb-breeding/src/main/java/cn/vber/breeding/domain/vo/BatchCoopVo.java

@@ -7,6 +7,9 @@ import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
 import cn.vber.common.excel.annotation.ExcelDictFormat;
 import cn.vber.common.excel.convert.ExcelDictConvert;
+import cn.vber.common.translation.annotation.Translation;
+import cn.vber.common.translation.annotation.TranslationType;
+import cn.vber.common.translation.constant.TransConstant;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 
@@ -48,6 +51,7 @@ public class BatchCoopVo implements Serializable {
     @ExcelProperty(value = "")
     private Long coopId;
 
+    @Translation(type = TransConstant.CHICKEN_COOP_ID_TO_NAME, mapper = "coopId", other = "")
     private String coopName;
 
     /**

+ 32 - 4
UI/VB.VUE/src/views/breeding/batch2/index.vue

@@ -395,7 +395,7 @@ function handleCreate() {
 			chickenCount: undefined
 		}
 	]
-	apis.breeding.commonApi.getCoopsByFactory("2").then((res) => {
+	apis.breeding.commonApi.getCoopsByFactory("1").then((res) => {
 		coopOptions.value = res.data
 		// 如果有鸡舍选项,设置默认选择第一个
 		if (res.data && res.data.length > 0) {
@@ -458,6 +458,22 @@ function submitForm() {
 			ElMessage.error("保存失败:" + error.message)
 		})
 }
+const batchCoopRef = ref()
+const batchCoopItems = ref([])
+function handleBatchNumClick(batchNum: string) {
+	apis.breeding.batchApi.queryBatchCoopCount(batchNum).then(({ data }) => {
+		batchCoopItems.value = data.map((item: any) => {
+			return {
+				coopId: item.coopId,
+				coopName: item.coopName,
+				batchNum: item.batchNum,
+				gender: item.gender,
+				chickenCount: item.chickenCount
+			}
+		}).sort((a, b) => a.coopName.localeCompare(b.coopName)) // 按鸡舍名称排序
+		batchCoopRef.value.show()
+	})
+}
 
 function handleQuerySuccess() {
 	// const data = tableRef.value.getFirstRowData()
@@ -701,7 +717,7 @@ function submitPartCullForm() {
 					:reset-search-form-fun="resetQuery"
 					:custom-search-fun="handleQuery"
 					@query-success="handleQuerySuccess">
-					<!-- <template #batchNum="{ row }">
+					<template #batchNum="{ row }">
 						<el-button
 							link
 							type="primary"
@@ -709,7 +725,7 @@ function submitPartCullForm() {
 							class="p-0 fs-7">
 							{{ row.batchNum }}
 						</el-button>
-					</template> -->
+					</template>
 					<template #batchType="{ row }">
 						<DictTag type="batch_type" :value-is-number="1" :value="row.batchType"></DictTag>
 					</template>
@@ -937,7 +953,19 @@ function submitPartCullForm() {
 				</div>
 			</template>
 		</VbModal>
-
+		<VbModal v-model:modal="batchCoopRef" :title="`批次鸡舍详情`" append-to-body>
+			<template #body>
+				<el-table :data="batchCoopItems" border style="width: 100%">
+					<el-table-column prop="coopName" label="鸡舍名称" width="280"></el-table-column>
+					<el-table-column prop="gender" label="性别" width="200">
+						<template #default="{ row }">
+							<span>{{ getGenderName(row.gender) }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column prop="chickenCount" label="数量" width="220"></el-table-column>
+				</el-table>
+			</template>
+		</VbModal>
 		<!-- SOP选择模态框 -->
 		<SopSelectModal ref="sopSelectModalRef" @confirm="handleSopBindConfirm" />
 

+ 79 - 50
UI/VB.VUE/src/views/breeding/coopChange/index.vue

@@ -29,7 +29,6 @@ function getGenderName(gender: number) {
 
 // 辅助函数:根据coopId获取coopName
 function getCoopName(coopId: number) {
-	console.log(coopId, coopOptions.value)
 	const coop = coopOptions.value.find((item: any) => item.value === coopId)
 	return coop ? coop.label : ""
 }
@@ -84,7 +83,7 @@ const opts = reactive({
 			width: "auto",
 			tooltip: true
 		},
-		{ field: "bindTime", name: "", visible: true, isSort: false, width: 185 },
+		{ field: "bindTime", name: "换舍时间", visible: true, isSort: false, width: 185 },
 		{ field: "remark", name: "备注", visible: true, isSort: false, tooltip: true }
 	] as any[],
 	queryParams: {
@@ -180,7 +179,8 @@ const opts = reactive({
 			required: true,
 			placeholder: "请输入",
 			component: "I",
-			appendClickFunc: handleShowBatchModal
+			appendClickFunc: handleShowBatchModal,
+			disabled: true
 		},
 		{
 			field: "changeCoopItems",
@@ -245,15 +245,17 @@ function onBatchConfirm(selectedData: any[]) {
 			.then((res) => {
 				// 初始化changeCoopItems数组中的每个项,添加必要的字段
 				form.value.changeCoopItems = res.data.map((item: any) => {
-					return {
-						batchCoopId: item.id,
-						sourceCoopId: item.coopId,
-						sourceGender: item.gender,
-						targetCoopId: undefined,
-						targetGender: item.gender,
-						maxChickenCount: item.chickenCount, // 默认换舍数量为原数量
-						chickenCount: 0, // 默认换舍数量为原数量
-						bindTime: dayjs().format("YYYY-MM-DD") // 默认换舍时间为今天
+					if (item.chickenCount > 0) {
+						return {
+							batchCoopId: item.id,
+							sourceCoopId: item.coopId,
+							sourceGender: item.gender,
+							targetCoopId: undefined,
+							targetGender: item.gender,
+							maxChickenCount: item.chickenCount, // 默认换舍数量为原数量
+							chickenCount: 0, // 默认换舍数量为原数量
+							bindTime: dayjs().format("YYYY-MM-DD") // 默认换舍时间为今天
+						}
 					}
 				})
 			})
@@ -266,67 +268,94 @@ function submitForm() {
 		message.msgWarning("请先选择批次")
 		return
 	}
+
 	if (!form.value.changeCoopItems || form.value.changeCoopItems.length === 0) {
 		message.msgWarning("换舍明细不能为空")
 		return
 	}
-	// 验证每个换舍项的必填字段
+
+	// 过滤出满足条件的换舍项
+	const validItems = []
+	const errors = []
+
 	for (let i = 0; i < form.value.changeCoopItems.length; i++) {
 		const item = form.value.changeCoopItems[i]
+		let hasError = false
+		let errorMsg = ""
+
 		if (!item.targetCoopId) {
-			message.msgWarning(`第${i + 1}行:请选择目标鸡舍`)
-			return
+			errorMsg = `第${i + 1}行:请选择目标鸡舍`
+			hasError = true
 		}
 		// 验证目标性别字段(只有原性别为未知时才能更改性别)
-		if (
+		else if (
 			item.sourceGender === 2 &&
 			(item.targetGender === null || item.targetGender === undefined)
 		) {
-			message.msgWarning(`第${i + 1}行:请选择目标性别`)
-			return
+			errorMsg = `第${i + 1}行:请选择目标性别`
+			hasError = true
 		}
 		// 如果原性别不是未知,则目标性别必须与原性别相同
-		if (item.sourceGender !== 2 && item.targetGender !== item.sourceGender) {
-			message.msgWarning(`第${i + 1}行:原性别为${getGenderName(item.sourceGender)},不能更改性别`)
-			return
-		}
-		if (!item.chickenCount || item.chickenCount <= 0) {
-			message.msgWarning(`第${i + 1}行:换舍数量必须大于0`)
-			return
-		}
-		if (!item.bindTime) {
-			message.msgWarning(`第${i + 1}行:请选择转出时间`)
-			return
+		else if (item.sourceGender !== 2 && item.targetGender !== item.sourceGender) {
+			errorMsg = `第${i + 1}行:原性别为${getGenderName(item.sourceGender)},不能更改性别`
+			hasError = true
+		} else if (!item.chickenCount || item.chickenCount <= 0) {
+			errorMsg = `第${i + 1}行:换舍数量必须大于0`
+			hasError = true
+		} else if (!item.bindTime) {
+			errorMsg = `第${i + 1}行:请选择转出时间`
+			hasError = true
 		}
 		// 验证换舍数量不能超过原数量
-		if (item.chickenCount > item.maxChickenCount) {
-			message.msgWarning(`第${i + 1}行:换舍数量不能超过原数量`)
-			return
+		else if (item.chickenCount > item.maxChickenCount) {
+			errorMsg = `第${i + 1}行:换舍数量不能超过原数量`
+			hasError = true
+		} else if (item.targetCoopId === item.sourceCoopId) {
+			errorMsg = `第${i + 1}行:目标鸡舍不能与原鸡舍相同`
+			hasError = true
+		}
+
+		if (hasError) {
+			errors.push(errorMsg)
+		} else {
+			// 满足条件的项添加到validItems数组
+			validItems.push(item)
 		}
-		if (item.targetCoopId === item.sourceCoopId && item.targetGender === item.sourceGender) {
-			message.msgWarning(`第${i + 1}行:目标鸡舍不能与原鸡舍相同,且目标性别不能与原性别相同`)
-			return
+	}
+
+	// 如果没有满足条件的项,则显示错误信息并返回
+	if (validItems.length === 0) {
+		if (errors.length > 0) {
+			message.msgWarning(errors[0])
+		} else {
+			message.msgWarning("没有满足条件的换舍项")
 		}
+		return
 	}
 
-	// 重组数据结构,只保留需要提交的字段
-	const submitData = {
-		changeCoopItems: form.value.changeCoopItems.map((item) => ({
-			batchCoopId: item.batchCoopId,
-			sourceCoopId: item.sourceCoopId,
-			sourceGender: item.sourceGender,
-			targetCoopId: item.targetCoopId,
-			targetGender: item.targetGender,
-			chickenCount: item.chickenCount, // 提交换舍数量而不是原数量
-			bindTime: item.bindTime
-		}))
+	// 如果有不满足条件的项,提示用户但继续提交满足条件的项
+	if (errors.length > 0) {
+		message.msgWarning(
+			`${errors.length}个换舍项不满足条件,将只提交满足条件的${validItems.length}个换舍项`
+		)
 	}
 
+	// 重组数据结构,只保留需要提交的字段
+	const submitData = validItems.map((item) => ({
+		batchNum: form.value.batchNum,
+		batchCoopId: item.batchCoopId,
+		sourceCoopId: item.sourceCoopId,
+		sourceGender: item.sourceGender,
+		targetCoopId: item.targetCoopId,
+		targetGender: item.targetGender,
+		chickenCount: item.chickenCount, // 提交换舍数量而不是原数量
+		bindTime: item.bindTime
+	}))
+
 	apis.breeding.coopChangeApi
 		.addOrUpdate(submitData)
 		.then(() => {
 			message.msgSuccess("换舍操作成功")
-			modalRef.value?.close()
 			handleQuery()
 		})
 		.catch((error) => {
@@ -397,14 +426,14 @@ function submitForm() {
 			:title="opts.modalTitle"
 			:form-data="form"
 			:form-items="opts.formItems"
-			modalDialogStyle="max-width:980px;"
+			modalDialogStyle="max-width:1100px;"
 			:label-width="opts.labelWidth"
 			append-to-body
 			@confirm="submitForm">
 			<template #changeCoopItems_form>
 				<div>
 					<el-table :data="form.changeCoopItems" border style="width: 100%">
-						<el-table-column prop="sourceCoopName" label="原鸡舍" width="120">
+						<el-table-column prop="sourceCoopName" label="原鸡舍" width="180">
 							<template #default="{ row }">
 								<span>{{ getCoopName(row.sourceCoopId) }}</span>
 							</template>
@@ -419,7 +448,7 @@ function submitForm() {
 								<span>{{ row.maxChickenCount }}</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="目标鸡舍" width="150" required>
+						<el-table-column label="目标鸡舍" width="200" required>
 							<template #default="{ row }">
 								<el-select
 									v-model="row.targetCoopId"

Some files were not shown because too many files changed in this diff