bonus
/
dbpatch
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
mashuai 2024-10-22 18:04:30 +08:00
parent 034b672c68 e59bd29ba8
commit d19b9e9553
5 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
202410/机具大融合/20241017_material_full.sql
View File

@ -74,13 +74,14 @@ CREATE TABLE `back_check_details` (
`ma_id` int(11) NULL DEFAULT NULL COMMENT '机具ID', `ma_id` int(11) NULL DEFAULT NULL COMMENT '机具ID',
`back_num` int(11) NULL DEFAULT 0 COMMENT '退料数量', `back_num` int(11) NULL DEFAULT 0 COMMENT '退料数量',
`back_status` varchar(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '退料状态(1合格，2维修，3待报废)', `back_status` varchar(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '退料状态(1合格，2维修，3待报废)',
`company_id` int(11) NULL DEFAULT NULL COMMENT '数据所属组织',
`status` int(11) NULL DEFAULT NULL COMMENT '任务状态(定义数据字典)',
`is_finished` tinyint(4) NULL DEFAULT NULL COMMENT '0:未完成退料,可以撤回 1:已完成退料,不能撤回',
`create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '创建者', `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '创建者',
`create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
`update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '更新者', `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '更新者',
`update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
`remark` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注', `remark` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
`company_id` int(11) NULL DEFAULT NULL COMMENT '数据所属组织',
`is_finished` tinyint(4) NULL DEFAULT NULL COMMENT '0:未完成退料,可以撤回 1:已完成退料,不能撤回',
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '退料核查back_check_details' ROW_FORMAT = DYNAMIC; ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '退料核查back_check_details' ROW_FORMAT = DYNAMIC;
@ -994,7 +995,7 @@ CREATE TABLE `purchase_check_details` (
`bind_num` int(11) NULL DEFAULT 0 COMMENT '绑定数量', `bind_num` int(11) NULL DEFAULT 0 COMMENT '绑定数量',
`check_result` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '验收结论', `check_result` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '验收结论',
`supplier_id` int(11) NULL DEFAULT NULL COMMENT '供应商id', `supplier_id` int(11) NULL DEFAULT NULL COMMENT '供应商id',
`status` int(11) NULL DEFAULT NULL COMMENT '0-未验收,1-已验收,2-待通知,3-验收不通过,4-已入库,5-入库驳回,6-综合服务中心审核通过，7-综合服务中心不通过', `status` int(11) NULL DEFAULT NULL COMMENT '任务状态(定义数据字典)',
`create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '创建者', `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '创建者',
`production_time` datetime NULL DEFAULT NULL COMMENT '出厂日期', `production_time` datetime NULL DEFAULT NULL COMMENT '出厂日期',
`create_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `create_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',

20
202410/机具大融合/20241017_sys_full.sql
View File

@ -179,16 +179,6 @@ INSERT INTO `sys_dict_data` VALUES (51, 0, '二维码', '0', 'ma_machine_label_t
INSERT INTO `sys_dict_data` VALUES (52, 1, '二维码标准箱', '1', 'ma_machine_label_type', NULL, 'default', 'N', '0', 'admin', '2024-10-14 15:55:25', '', NULL, NULL); INSERT INTO `sys_dict_data` VALUES (52, 1, '二维码标准箱', '1', 'ma_machine_label_type', NULL, 'default', 'N', '0', 'admin', '2024-10-14 15:55:25', '', NULL, NULL);
INSERT INTO `sys_dict_data` VALUES (53, 2, 'RFID', '2', 'ma_machine_label_type', NULL, 'default', 'N', '0', 'admin', '2024-10-14 15:55:33', '', NULL, NULL); INSERT INTO `sys_dict_data` VALUES (53, 2, 'RFID', '2', 'ma_machine_label_type', NULL, 'default', 'N', '0', 'admin', '2024-10-14 15:55:33', '', NULL, NULL);
INSERT INTO `sys_dict_data` VALUES (54, 3, 'GPS', '3', 'ma_machine_label_type', NULL, 'default', 'N', '0', 'admin', '2024-10-14 15:55:42', '', NULL, NULL); INSERT INTO `sys_dict_data` VALUES (54, 3, 'GPS', '3', 'ma_machine_label_type', NULL, 'default', 'N', '0', 'admin', '2024-10-14 15:55:42', '', NULL, NULL);
INSERT INTO `sys_dict_data` VALUES (55, 0, '待通知', '0', 'purchase_task_status', NULL, 'default', 'N', '0', 'admin', '2024-10-14 15:56:20', '', NULL, NULL);
INSERT INTO `sys_dict_data` VALUES (56, 1, '待验收', '1', 'purchase_task_status', NULL, 'default', 'N', '0', 'admin', '2024-10-14 15:56:28', '', NULL, NULL);
INSERT INTO `sys_dict_data` VALUES (57, 2, '验收合格', '2', 'purchase_task_status', NULL, 'default', 'N', '0', 'admin', '2024-10-14 15:56:37', '', NULL, NULL);
INSERT INTO `sys_dict_data` VALUES (58, 3, '验收未通过', '3', 'purchase_task_status', NULL, 'default', 'N', '0', 'admin', '2024-10-14 15:56:45', '', NULL, NULL);
INSERT INTO `sys_dict_data` VALUES (59, 4, '已全部入库', '4', 'purchase_task_status', NULL, 'default', 'N', '0', 'admin', '2024-10-14 16:02:38', '', NULL, NULL);
INSERT INTO `sys_dict_data` VALUES (60, 5, '入库审核中', '5', 'purchase_task_status', NULL, 'default', 'N', '0', 'admin', '2024-10-14 16:02:48', '', NULL, NULL);
INSERT INTO `sys_dict_data` VALUES (61, 6, '综合服务中心未通过', '6', 'purchase_task_status', NULL, 'default', 'N', '0', 'admin', '2024-10-14 16:03:04', '', NULL, NULL);
INSERT INTO `sys_dict_data` VALUES (62, 7, '入库审核未通过', '7', 'purchase_task_status', NULL, 'default', 'N', '0', 'admin', '2024-10-14 16:03:14', '', NULL, NULL);
INSERT INTO `sys_dict_data` VALUES (63, 8, '综合服务中心审核中', '8', 'purchase_task_status', NULL, 'default', 'N', '0', 'admin', '2024-10-14 16:03:23', '', NULL, NULL);
INSERT INTO `sys_dict_data` VALUES (64, 9, '部分已入库', '9', 'purchase_task_status', NULL, 'default', 'N', '0', 'admin', '2024-10-14 16:03:38', 'admin', '2024-10-14 16:03:44', NULL);
INSERT INTO `sys_dict_data` VALUES (65, 0, '待验收', '0', 'purchase_part_task_status', NULL, 'default', 'N', '0', 'admin', '2024-10-14 16:13:10', '', NULL, NULL); INSERT INTO `sys_dict_data` VALUES (65, 0, '待验收', '0', 'purchase_part_task_status', NULL, 'default', 'N', '0', 'admin', '2024-10-14 16:13:10', '', NULL, NULL);
INSERT INTO `sys_dict_data` VALUES (66, 1, '待审核', '1', 'purchase_part_task_status', NULL, 'default', 'N', '0', 'admin', '2024-10-14 16:13:17', '', NULL, NULL); INSERT INTO `sys_dict_data` VALUES (66, 1, '待审核', '1', 'purchase_part_task_status', NULL, 'default', 'N', '0', 'admin', '2024-10-14 16:13:17', '', NULL, NULL);
INSERT INTO `sys_dict_data` VALUES (67, 2, '已审核', '2', 'purchase_part_task_status', NULL, 'default', 'N', '0', 'admin', '2024-10-14 16:13:25', '', NULL, NULL); INSERT INTO `sys_dict_data` VALUES (67, 2, '已审核', '2', 'purchase_part_task_status', NULL, 'default', 'N', '0', 'admin', '2024-10-14 16:13:25', '', NULL, NULL);
@ -234,6 +224,16 @@ INSERT INTO `sys_dict_data` VALUES (112, 5, '修试后入库任务', '5', 'tm_ta
INSERT INTO `sys_dict_data` VALUES (113, 6, '报废任务', '6', 'tm_task_type', NULL, 'default', 'N', '0', 'admin', '2024-10-17 10:53:28', '', NULL, NULL); INSERT INTO `sys_dict_data` VALUES (113, 6, '报废任务', '6', 'tm_task_type', NULL, 'default', 'N', '0', 'admin', '2024-10-17 10:53:28', '', NULL, NULL);
INSERT INTO `sys_dict_data` VALUES (114, 7, '结算任务', '7', 'tm_task_type', NULL, 'default', 'N', '0', 'admin', '2024-10-17 10:53:37', '', NULL, NULL); INSERT INTO `sys_dict_data` VALUES (114, 7, '结算任务', '7', 'tm_task_type', NULL, 'default', 'N', '0', 'admin', '2024-10-17 10:53:37', '', NULL, NULL);
INSERT INTO `sys_dict_data` VALUES (115, 8, '检验任务', '8', 'tm_task_type', NULL, 'default', 'N', '0', 'admin', '2024-10-17 10:53:46', '', NULL, NULL); INSERT INTO `sys_dict_data` VALUES (115, 8, '检验任务', '8', 'tm_task_type', NULL, 'default', 'N', '0', 'admin', '2024-10-17 10:53:46', '', NULL, NULL);
INSERT INTO `sys_dict_data` VALUES (122, 0, '待提交', '0', 'purchase_task_status', null, 'default', 'N', '0', 'admin', '2024-10-21 19:10:20', '', null, null);
INSERT INTO `sys_dict_data` VALUES (123, 1, '待通知', '1', 'purchase_task_status', null, 'default', 'N', '0', 'admin', '2024-10-21 19:10:33', '', null, null);
INSERT INTO `sys_dict_data` VALUES (124, 2, '待验收', '2', 'purchase_task_status', null, 'default', 'N', '0', 'admin', '2024-10-21 19:10:44', '', null, null);
INSERT INTO `sys_dict_data` VALUES (125, 3, '待绑定', '3', 'purchase_task_status', null, 'default', 'N', '0', 'admin', '2024-10-21 19:10:56', '', null, null);
INSERT INTO `sys_dict_data` VALUES (126, 4, '待入库', '4', 'purchase_task_status', null, 'default', 'N', '0', 'admin', '2024-10-21 19:11:08', '', null, null);
INSERT INTO `sys_dict_data` VALUES (127, 5, '已完成', '5', 'purchase_task_status', null, 'default', 'N', '0', 'admin', '2024-10-21 19:13:12', '', null, null);
INSERT INTO `sys_dict_data` VALUES (128, 6, '待验收(驳回后)', '6', 'purchase_task_status', null, 'default', 'N', '0', 'admin', '2024-10-21 19:25:40', 'admin', '2024-10-21 20:03:02', null);
INSERT INTO `sys_dict_data` VALUES (129, 7, '待绑定(驳回后)', '7', 'purchase_task_status', null, 'default', 'N', '0', 'admin', '2024-10-21 19:25:59', 'admin', '2024-10-21 20:03:06', null);
INSERT INTO `sys_dict_data` VALUES (130, 8, '待入库(驳回后)', '8', 'purchase_task_status', null, 'default', 'N', '0', 'admin', '2024-10-21 20:02:50', 'admin', '2024-10-21 20:03:09', null);
INSERT INTO `sys_dict_data` VALUES (131, 9, '入库进行中', '9', 'purchase_task_status', null, 'default', 'N', '0', 'admin', '2024-10-22 11:03:16', '', null, null);
-- ---------------------------- -- ----------------------------
-- Table structure for sys_dict_type -- Table structure for sys_dict_type

0
202410/机具大融合/20241018_ma_machine表增加字段.sql → 202410/机具大融合/20241017零散备份/20241018_ma_machine表增加字段.sql
View File

0
202410/机具大融合/20241018_tm_task_audit_log.sql → 202410/机具大融合/20241017零散备份/20241018_tm_task_audit_log.sql
View File

0
202410/机具大融合/20241021_add_del_flag.sql → 202410/机具大融合/20241017零散备份/20241021_add_del_flag.sql
View File