1111111

SERVER/ChickenFarmV3/.script/sql/20251128/init.sql

@@ -148,32 +148,33 @@ CREATE TABLE `d_device_order_flow`  (
 -- ----------------------------
 DROP TABLE IF EXISTS `d_device_task`;
 CREATE TABLE `d_device_task`  (
-                                  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '任务ID',
-                                  `task_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '保养任务名称',
-                                  `task_desc` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '保养任务描述',
-                                  `task_type` tinyint(4) NOT NULL COMMENT '任务类型（1:设备保养 2:设备清洁）',
-                                  `device_id` bigint(20) NOT NULL COMMENT '设备ID',
-                                  `cycle` float NOT NULL DEFAULT 0 COMMENT '保养周期(小时)',
-                                  `executor_id` bigint(20) NOT NULL COMMENT '执行责任人ID',
-                                  `acceptor_id` bigint(20) NOT NULL COMMENT '验收责任人ID',
-                                  `status` tinyint(4) NOT NULL DEFAULT 0 COMMENT '状态（0:启用 1:停用）',
-                                  `startTime` datetime NULL DEFAULT NULL COMMENT '开始时间',
-                                  `endTime` datetime NULL DEFAULT NULL COMMENT '结束时间',
-                                  `lastCreateTime` datetime NULL DEFAULT NULL COMMENT '最后创建工单时间',
-                                  `create_org` bigint(20) NULL DEFAULT NULL COMMENT '创建组织',
-                                  `create_by` bigint(20) NULL DEFAULT NULL COMMENT '创建者',
+                                  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '任务ID',
+                                  `task_name` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL COMMENT '保养任务名称',
+                                  `task_desc` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '保养任务描述',
+                                  `task_type` tinyint NOT NULL COMMENT '任务类型（1:设备保养 2:设备清洁 3:设备消毒）',
+                                  `clean_type` tinyint NULL COMMENT '清洁类型（1:清洁 2:消毒）',
+                                  `device_id` bigint NOT NULL COMMENT '设备ID',
+                                  `cycle` float NOT NULL default 0 COMMENT '保养周期(小时)',
+                                  `executor_id` bigint NOT NULL COMMENT '执行责任人ID',
+                                  `acceptor_id` bigint NOT NULL COMMENT '验收责任人ID',
+                                  `status` tinyint NOT NULL DEFAULT 0 COMMENT '状态（0:启用 1:停用）',
+                                  `start_time` datetime NULL DEFAULT NULL COMMENT '开始时间',
+                                  `end_time` datetime NULL DEFAULT NULL COMMENT '结束时间',
+                                  `last_create_time` datetime NULL DEFAULT NULL COMMENT '最后创建工单时间',
+                                  `create_org` bigint NULL DEFAULT NULL COMMENT '创建组织',
+                                  `create_by` bigint NULL DEFAULT NULL COMMENT '创建者',
                                   `create_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-                                  `update_by` bigint(20) NULL DEFAULT NULL COMMENT '更新者',
+                                  `update_by` bigint NULL DEFAULT NULL COMMENT '更新者',
                                   `update_time` datetime NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
-                                  `remark` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
-                                  `del_flag` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '删除标志（0代表存在 1代表删除）',
+                                  `remark` varchar(500) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '备注',
+                                  `del_flag` char(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '0' COMMENT '删除标志（0代表存在 1代表删除）',
                                   PRIMARY KEY (`id`) USING BTREE,
-                                  INDEX `idx_device_id`(`device_id`) USING BTREE,
-                                  INDEX `idx_task_name`(`task_name`) USING BTREE,
-                                  INDEX `idx_task_type`(`task_type`) USING BTREE,
-                                  INDEX `idx_executor_id`(`executor_id`) USING BTREE,
-                                  INDEX `idx_acceptor_id`(`acceptor_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '设备任务表' ROW_FORMAT = Dynamic;
+                                  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_executor_id`(`executor_id` ASC) USING BTREE,
+                                  INDEX `idx_acceptor_id`(`acceptor_id` ASC) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT = '设备任务表';
 
 -- ----------------------------
 -- Table structure for d_inspection_checkin
@@ -1029,6 +1030,7 @@ DROP TABLE IF EXISTS `f_batch`;
 CREATE TABLE `f_batch`  (
                             `batch_num` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '批次号（唯一标识）',
                             `batch_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '批次名称',
+                            `wing_tag_num_scope` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '翅号范围',
                             `chicken_count` int(11) NOT NULL DEFAULT 0 COMMENT '鸡只数量',
                             `hatch_date` date NOT NULL COMMENT '出生日期',
                             `status` tinyint(4) NOT NULL DEFAULT 0 COMMENT '状态（0:新建, 1:育成中, 2:完成）',
@@ -1050,6 +1052,7 @@ CREATE TABLE `f_batch`  (
                             INDEX `batch_number`(`batch_num`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '批次信息表' ROW_FORMAT = Dynamic;
 
+
 -- ----------------------------
 -- Table structure for f_batch_coop
 -- ----------------------------
@@ -2821,7 +2824,7 @@ INSERT INTO `sys_config` VALUES (11, '000000', '维修人员USER_ID', 'sys.repai
 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', '1005,1006,1007', 'Y', 100, 1, '2025-10-15 12:00:00', 1, '2025-11-28 11:12:37', '维修人员ID');
 INSERT INTO `sys_config` VALUES (14, '000000', '实验审核人员USER_ID', 'sys.experiment.review.userIds', '1010', 'Y', 100, 1, '2025-10-15 12:00:00', 1, '2025-11-28 11:13:20', '实验审核人员ID');
-INSERT INTO `sys_config` VALUES (15, '000000', '销售组织结构ID', 'erp:sale:org:id', '104', 'Y', 100, 1, '2025-10-28 16:36:05', 1, '2025-11-28 11:13:45', NULL);
+INSERT INTO `sys_config` VALUES (15, '000000', '销售组织结构ID', 'erp:sale:org:id', '104,211', 'Y', 100, 1, '2025-10-28 16:36:05', 1, '2025-11-28 11:13:45', NULL);
 
 -- ----------------------------
 -- Records of sys_dict_data
@@ -3547,6 +3550,7 @@ INSERT INTO `sys_menu` VALUES (2012, '新增点检规则', 352, 0, '#', NULL, ''
 INSERT INTO `sys_menu` VALUES (2013, '修改点检规则', 352, 0, '#', NULL, '', 1, 0, 'F', '0', '0', 'device:inspection:edit', 'pencil-square', 'btn btn-light-success', 'handleUpdate@1', 100, 1, '2025-10-15 15:02:19', NULL, '2025-10-15 15:02:19', '');
 INSERT INTO `sys_menu` VALUES (2014, '删除点检规则', 352, 0, '#', NULL, '', 1, 0, 'F', '0', '0', 'device:inspection:remove', 'dash-square', 'btn btn-light-danger', 'handleDelete@0', 100, 1, '2025-10-15 15:02:19', NULL, '2025-10-15 15:02:19', '');
 INSERT INTO `sys_menu` VALUES (2015, '启停点检签到', 352, 0, '#', NULL, '', 1, 0, 'F', '1', '0', 'device:inspection:startStop', '', '', '', 100, 1, '2025-10-15 15:02:19', NULL, '2025-10-15 15:02:19', '');
+INSERT INTO `sys_menu` VALUES (2016, '点检签到', 21, 3, '#', NULL, '', 1, 0, 'C', '1', '0', 'device:inspection:checkin', '#', NULL, NULL, 100, 1, '2025-10-15 15:02:19', NULL, '2025-10-15 15:02:19', '');
 INSERT INTO `sys_menu` VALUES (353, '设备维修工单', 21, 3, 'deviceRepairOrder', 'device/deviceRepairOrder/index', '', 1, 0, 'C', '0', '0', 'device:deviceRepairOrder', '#', NULL, NULL, 100, 1, '2025-10-15 15:02:19', NULL, '2025-10-15 15:02:19', '');
 INSERT INTO `sys_menu` VALUES (2021, '查询维修工单', 353, 0, '#', NULL, '', 1, 0, 'F', '0', '0', 'device:deviceRepairOrder:query', 'eye', '', '', 100, 1, '2025-10-15 15:02:19', NULL, '2025-10-15 15:02:19', '');
 INSERT INTO `sys_menu` VALUES (2022, '新增维修工单', 353, 0, '#', NULL, '', 1, 0, 'F', '0', '0', 'device:deviceRepairOrder:add', 'plus-square', 'btn btn-light-primary', 'handleCreate', 100, 1, '2025-10-15 15:02:19', NULL, '2025-10-15 15:02:19', '');
@@ -3764,7 +3768,7 @@ INSERT INTO `sys_menu` VALUES (2701, '查询实时库存', 623, 0, '#', NULL, ''
 -- Records of sys_client
 -- ----------------------------
 INSERT INTO `sys_client` VALUES (1, '9579f8780cf24ae2959d03d11482b18a', 'pc', 'iwb123', 'password,social', 'pc', 1800, 604800, '0', '0', 100, 1, '2025-07-10 14:59:14', 1, '2025-07-10 14:59:14');
-INSERT INTO `sys_client` VALUES (2, '35aee70ae7224eb9a48bc527955ddedc', 'app', 'iwb123', 'password,sms,social', 'android', 1800, 604800, '0', '0', 100, 1, '2025-07-10 14:59:14', 1, '2025-07-10 14:59:14');
+INSERT INTO `sys_client` VALUES (2, '35aee70ae7224eb9a48bc527955ddedc', 'app', 'iwb123', 'password,sms,social', 'android', 864000, 2592000, '0', '0', 100, 1, '2025-07-10 14:59:14', 1, '2025-07-10 14:59:14');
 
 
 

SERVER/ChickenFarmV3/.script/sql/20251128/seed.sql

@@ -282,6 +282,7 @@ INSERT INTO `sys_role_menu` VALUES (1005, 353);
 INSERT INTO `sys_role_menu` VALUES (1005, 355);
 INSERT INTO `sys_role_menu` VALUES (1005, 368);
 INSERT INTO `sys_role_menu` VALUES (1005, 369);
+INSERT INTO `sys_role_menu` VALUES (1005, 2016);
 INSERT INTO `sys_role_menu` VALUES (1005, 2021);
 INSERT INTO `sys_role_menu` VALUES (1005, 2022);
 INSERT INTO `sys_role_menu` VALUES (1005, 2023);