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:
15856 2024-11-11 18:24:00 +08:00
parent c798dc8df0 2c90f1da4f
commit d697711a8f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
202411/机具大融合/20241101_material_full.sql
View File

@ -392,7 +392,7 @@ CREATE TABLE `lease_agreement_record` (
DROP TABLE IF EXISTS `lease_apply_details`;
CREATE TABLE `lease_apply_details` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID',
`parennt_id` int(11) NOT NULL COMMENT '任务ID',
`parent_id` int(11) NOT NULL COMMENT '任务ID',
`type_id` int(11) NOT NULL COMMENT '规格ID',
`pre_num` int(11) NULL DEFAULT 0 COMMENT '预领料数',
`audit_num` int(11) NULL DEFAULT 0 COMMENT '审批数量',
@ -1017,7 +1017,8 @@ CREATE TABLE `purchase_check_details` (
`file_url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '验收附件',
`company_id` int(11) NULL DEFAULT NULL COMMENT '数据所属组织',
`is_download` int(11) NULL DEFAULT 0 COMMENT '是否下载二维码（0 否， 1 是）',
`del_flag` char(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '删除标志（0代表存在 2代表删除）',
`fix_code` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '是否是固定资产编号(0 否，1 是)',
`del_flag` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '删除标志（0代表存在 2代表删除）',
PRIMARY KEY (`id`) USING BTREE,
INDEX `idx_task_id`(`task_id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '新购验收任务详细表purchase_check_details' ROW_FORMAT = DYNAMIC;
@ -1055,7 +1056,7 @@ CREATE TABLE `purchase_macode_info` (
`type_id` int(11) NOT NULL COMMENT '类型ID',
`ma_code` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '机具编号',
`qr_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '二维码',
`fix_code` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '是否是固定资产编号(0,是 1,否)',
`fix_code` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '是否是固定资产编号(0 否，1 是)',
`code_type` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '编号类型',
`status` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '状态（0,待入库 1,已入库）',
`create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '创建者',