lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[add] 添加分包物料管理相关接口 [update] 修改分包包结构，修改知识库部分逻辑

Browse Source
This commit is contained in:
lcj
2025-06-27 20:00:51 +08:00
parent 48fb86cf84
commit 3671f6c81a
123 changed files with 3119 additions and 1009 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
xinnengyuan/script/sql/menuInitValue.sql
View File

@ -837,3 +837,23 @@ values(1938171656673443845, '分包方工器具进场删除', 193817165667344384
insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
values(1938171656673443846, '分包方工器具进场导出', 1938171656673443841, '5', '#', '', 1, 0, 'F', '0', '0', 'contractor:contractorToolEntry:export', '#', 103, 1, sysdate(), null, null, '');
-- 菜单 SQL
insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
values(1938446866786041857, '分包方物料', '1937684147828957185', '1', 'contractorMaterial', 'contractor/contractorMaterial/index', 1, 0, 'C', '0', '0', 'contractor:contractorMaterial:list', '#', 103, 1, sysdate(), null, null, '分包方物料菜单');
-- 按钮 SQL
insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
values(1938446866786041858, '分包方物料查询', 1938446866786041857, '1', '#', '', 1, 0, 'F', '0', '0', 'contractor:contractorMaterial:query', '#', 103, 1, sysdate(), null, null, '');
insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
values(1938446866786041859, '分包方物料新增', 1938446866786041857, '2', '#', '', 1, 0, 'F', '0', '0', 'contractor:contractorMaterial:add', '#', 103, 1, sysdate(), null, null, '');
insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
values(1938446866786041860, '分包方物料修改', 1938446866786041857, '3', '#', '', 1, 0, 'F', '0', '0', 'contractor:contractorMaterial:edit', '#', 103, 1, sysdate(), null, null, '');
insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
values(1938446866786041861, '分包方物料删除', 1938446866786041857, '4', '#', '', 1, 0, 'F', '0', '0', 'contractor:contractorMaterial:remove', '#', 103, 1, sysdate(), null, null, '');
insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
values(1938446866786041862, '分包方物料导出', 1938446866786041857, '5', '#', '', 1, 0, 'F', '0', '0', 'contractor:contractorMaterial:export', '#', 103, 1, sysdate(), null, null, '');

106
xinnengyuan/script/sql/xinnengyuan.sql
View File

@ -155,7 +155,7 @@ CREATE TABLE `bus_contractor`
collate = utf8mb4_general_ci comment = '分包单位'
ROW_FORMAT = DYNAMIC;
DROP TABLE IF EXISTS `bus_construction_user`;
DROP TABLE IF EXISTS sub_construction_user;
CREATE TABLE `bus_construction_user`
(
`id` bigint not null auto_increment,
@ -509,7 +509,7 @@ CREATE TABLE `bus_construction_blacklist`
INDEX `idx_user_id` (`user_id` ASC) USING BTREE comment '用户id'
) comment = '黑名单' collate = utf8mb4_unicode_ci;
DROP TABLE IF EXISTS `bus_construction_user_file`;
DROP TABLE IF EXISTS sub_construction_user_file;
CREATE TABLE `bus_construction_user_file`
(
`id` bigint not null auto_increment comment '主键id',
@ -1176,7 +1176,7 @@ CREATE TABLE `sys_user_file`
unique index `idx_user_file` (`user_id`, `file_id`) using btree comment '用户id_文件id'
) comment = '用户文件关联' collate = utf8mb4_unicode_ci;
DROP TABLE IF EXISTS `bus_subcontract`;
DROP TABLE IF EXISTS sub_subcontract;
CREATE TABLE `bus_subcontract`
(
`id` bigint not null auto_increment comment '主键id',
@ -1242,24 +1242,24 @@ CREATE TABLE `qlt_knowledge_document`
index `idx_project_id` (`project_id` asc) using btree comment '项目id'
) comment '质量知识库' collate = utf8mb4_unicode_ci;
DROP TABLE IF EXISTS `bus_contractor_tool`;
DROP TABLE IF EXISTS sub_contractor_tool;
CREATE TABLE `bus_contractor_tool`
(
`id` bigint not null auto_increment comment '主键id',
`project_id` bigint not null comment '项目id',
`contractor_id` bigint not null comment '分包方id',
`tool_name` varchar(255) null comment '工具名称',
`tool_type` char(2) null comment '工具类型',
`tool_model` varchar(255) null comment '工具型号',
`tool_number` varchar(255) default 0 not null comment '工具数量',
`file` varchar(512) null comment '文件',
`remark` varchar(512) null comment '备注',
`create_by` varchar(64) null comment '创建者',
`update_by` varchar(64) null comment '更新者',
`create_time` datetime default CURRENT_TIMESTAMP null comment '创建时间',
`update_time` datetime default CURRENT_TIMESTAMP null on update CURRENT_TIMESTAMP comment '更新时间',
`deleted_at` datetime null comment '删除时间',
`is_delete` tinyint(4) default 0 not null comment '是否删除（0正常 1删除）',
`id` bigint not null auto_increment comment '主键id',
`project_id` bigint not null comment '项目id',
`contractor_id` bigint not null comment '分包方id',
`tool_name` varchar(255) null comment '工具名称',
`tool_type` char(2) null comment '工具类型',
`tool_model` varchar(255) null comment '工具型号',
`tool_number` decimal(10) default 0 not null comment '工具数量',
`file` varchar(512) null comment '文件',
`remark` varchar(512) null comment '备注',
`create_by` varchar(64) null comment '创建者',
`update_by` varchar(64) null comment '更新者',
`create_time` datetime default CURRENT_TIMESTAMP null comment '创建时间',
`update_time` datetime default CURRENT_TIMESTAMP null on update CURRENT_TIMESTAMP comment '更新时间',
`deleted_at` datetime null comment '删除时间',
`is_delete` tinyint(4) default 0 not null comment '是否删除（0正常 1删除）',
primary key (`id`) using btree,
index `idx_project_id` (`project_id` asc) using btree comment '项目id',
index `idx_contractor_id` (`contractor_id` asc) using btree comment '分包方id'
@ -1273,7 +1273,8 @@ CREATE TABLE `sub_contractor_tool_record`
`contractor_id` bigint not null comment '分包方id',
`contractor_tool_id` bigint not null comment '分包方工器具id',
`record_type` char(1) not null comment '记录类型(1进场 2出场)',
`tool_number` varchar(255) null comment '进场工器具数量',
`record_number` decimal default 0 not null comment '进场工器具数量',
`remaining_number` decimal default 0 not null comment '剩余数量',
`check_num` varchar(255) null comment '检测编号',
`check_dept` varchar(255) null comment '检测部门',
`check_time` datetime null comment '检测时间',
@ -1281,7 +1282,7 @@ CREATE TABLE `sub_contractor_tool_record`
`remark` varchar(512) null comment '备注',
`create_by` varchar(64) null comment '创建者',
`update_by` varchar(64) null comment '更新者',
`entry_time` datetime null comment '进场时间',
`record_time` datetime null comment '记录时间',
`create_time` datetime default CURRENT_TIMESTAMP null comment '创建时间',
`update_time` datetime default CURRENT_TIMESTAMP null on update CURRENT_TIMESTAMP comment '更新时间',
primary key (`id`) using btree,
@ -1293,21 +1294,22 @@ CREATE TABLE `sub_contractor_tool_record`
DROP TABLE IF EXISTS `sub_contractor_material`;
CREATE TABLE `sub_contractor_material`
(
`id` bigint not null auto_increment comment '主键id',
`project_id` bigint not null comment '项目id',
`contractor_id` bigint not null comment '分包方id',
`material_name` varchar(255) null comment '物料名称',
`material_type` char(2) null comment '物料类型',
`material_model` varchar(255) null comment '物料型号',
`material_number` varchar(255) default 0 not null comment '物料数量',
`file` varchar(512) null comment '文件',
`remark` varchar(512) null comment '备注',
`create_by` varchar(64) null comment '创建者',
`update_by` varchar(64) null comment '更新者',
`create_time` datetime default CURRENT_TIMESTAMP null comment '创建时间',
`update_time` datetime default CURRENT_TIMESTAMP null on update CURRENT_TIMESTAMP comment '更新时间',
`deleted_at` datetime null comment '删除时间',
`is_delete` tinyint(4) default 0 not null comment '是否删除（0正常 1删除）',
`id` bigint not null auto_increment comment '主键id',
`project_id` bigint not null comment '项目id',
`contractor_id` bigint not null comment '分包方id',
`material_name` varchar(255) not null comment '物料名称',
`material_type` char(2) null comment '物料类型',
`material_model` varchar(255) null comment '物料型号',
`material_number` decimal(10) default 0 not null comment '物料数量',
`material_unit` varchar(50) not null comment '物料单位',
`file` varchar(512) null comment '文件',
`remark` varchar(512) null comment '备注',
`create_by` varchar(64) null comment '创建者',
`update_by` varchar(64) null comment '更新者',
`create_time` datetime default CURRENT_TIMESTAMP null comment '创建时间',
`update_time` datetime default CURRENT_TIMESTAMP null on update CURRENT_TIMESTAMP comment '更新时间',
`deleted_at` datetime null comment '删除时间',
`is_delete` tinyint(4) default 0 not null comment '是否删除（0正常 1删除）',
primary key (`id`) using btree,
index `idx_project_id` (`project_id` asc) using btree comment '项目id',
index `idx_contractor_id` (`contractor_id` asc) using btree comment '分包方id'
@ -1316,23 +1318,23 @@ CREATE TABLE `sub_contractor_material`
DROP TABLE IF EXISTS `sub_contractor_material_record`;
CREATE TABLE `sub_contractor_material_record`
(
`id` bigint not null auto_increment comment '主键id',
`project_id` bigint not null comment '项目id',
`contractor_id` bigint not null comment '分包方id',
`material_id` bigint not null comment '物料id',
`record_type` char(1) not null comment '记录类型(1到货计划 2使用情况)',
`record_time` datetime not null comment '记录时间',
`material_number` varchar(255) null comment '数量',
`material_unit` varchar(50) null comment '单位',
`used_position` varchar(255) null comment '使用位置或构件部位（使用情况）',
`file` varchar(512) null comment '相关附件',
`remark` varchar(512) null comment '备注',
`create_by` varchar(64) null comment '创建者',
`update_by` varchar(64) null comment '更新者',
`create_time` datetime default CURRENT_TIMESTAMP null comment '创建时间',
`update_time` datetime default CURRENT_TIMESTAMP null on update CURRENT_TIMESTAMP comment '更新时间',
`id` bigint not null auto_increment comment '主键id',
`project_id` bigint not null comment '项目id',
`contractor_id` bigint not null comment '分包方id',
`contractor_material_id` bigint not null comment '物料id',
`record_type` char(1) not null comment '记录类型(1到货计划 2使用情况)',
`record_time` datetime not null comment '记录时间',
`record_number` decimal(10) default 0 not null comment '数量',
`remaining_number` decimal(10) default 0 not null comment '剩余数量(到货 使用)',
`used_position` varchar(255) null comment '使用位置或构件部位(使用情况)',
`file` varchar(512) null comment '相关附件',
`remark` varchar(512) null comment '备注',
`create_by` varchar(64) null comment '创建者',
`update_by` varchar(64) null comment '更新者',
`create_time` datetime default CURRENT_TIMESTAMP null comment '创建时间',
`update_time` datetime default CURRENT_TIMESTAMP null on update CURRENT_TIMESTAMP comment '更新时间',
primary key (`id`) using btree,
index `idx_project_id` (`project_id` asc) using btree comment '项目id',
index `idx_contractor_id` (`contractor_id` asc) using btree comment '分包方id',
index `idx_material_id` (`material_id` asc) using btree comment '物料id'
index `idx_contractor_material_id` (`contractor_material_id` asc) using btree comment '物料id'
) comment = '分包方物料记录' collate = utf8mb4_unicode_ci;