b2894lxlx/tms-erp-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、车船模块fix bug

Browse Source 
2、运力模块fix bug
3、新增设备台账
4、其他bug 修复
5、调整组织、人员模块
This commit is contained in:
b2894lxlx
2026-08-07 08:27:47 +08:00
parent a1eea5075b
commit f716b3fc63
107 changed files with 2269 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
doc/sql/bladex/bladex.mysql.all.create.sql
View File

@@ -268,6 +268,10 @@ CREATE TABLE `blade_datasource` (
`password` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '密码',
`sharding_config` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '分库分表配置',
`remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
`person_category` tinyint NOT NULL DEFAULT 1 COMMENT '人员类别：1内部员工，2承运商',
`data_scope_range` tinyint NOT NULL DEFAULT 1 COMMENT '数据权限范围：1所属组织，2全部组织，3自定义',
`data_level_range` tinyint NOT NULL DEFAULT 1 COMMENT '数据层级范围：1包含下级，2仅本级',
`include_new_customer` tinyint NOT NULL DEFAULT 0 COMMENT '包含新增客商：0否，1是',
`create_user` bigint NULL DEFAULT NULL COMMENT '创建人',
`create_dept` bigint NULL DEFAULT NULL COMMENT '创建部门',
`create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
@@ -298,11 +302,17 @@ CREATE TABLE `blade_dept` (
`dept_category` int NULL DEFAULT NULL COMMENT '部门类型',
`dept_name` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '部门名',
`full_name` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '部门全称',
`dept_code` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '组织编码',
`short_name` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '组织简称',
`pinyin_mnemonic` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '拼音助记码',
`mnemonic_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '助记码',
`carrier_customer_id` bigint NULL DEFAULT NULL COMMENT '承运商客商档案主键',
`sort` int NULL DEFAULT NULL COMMENT '排序',
`remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
`status` int NULL DEFAULT 1 COMMENT '状态',
`is_deleted` int NULL DEFAULT 0 COMMENT '是否已删除',
PRIMARY KEY (`id`) USING BTREE
PRIMARY KEY (`id`) USING BTREE,
UNIQUE KEY `uk_blade_dept_dept_code` (`dept_code`)
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '机构表';
-- ----------------------------
@@ -1253,6 +1263,7 @@ CREATE TABLE `blade_user` (
`post_id` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '岗位id',
`leader_id` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '主管id',
`is_leader` int NULL DEFAULT 0 COMMENT '是否主管',
`remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
`create_user` bigint NULL DEFAULT NULL COMMENT '创建人',
`create_dept` bigint NULL DEFAULT NULL COMMENT '创建部门',
`create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
@@ -1299,6 +1310,14 @@ CREATE TABLE `blade_user_dept` (
`dept_id` bigint NULL DEFAULT 0 COMMENT '部门ID',
`status` int NULL DEFAULT 1 COMMENT '状态',
`is_deleted` int NULL DEFAULT 0 COMMENT '是否已删除',
`company_code` varchar(64) NULL DEFAULT NULL COMMENT 'OA公司编码',
`company_name` varchar(255) NULL DEFAULT NULL COMMENT 'OA公司名称',
`dept_code` varchar(64) NULL DEFAULT NULL COMMENT 'OA部门编码',
`dept_name` varchar(255) NULL DEFAULT NULL COMMENT 'OA部门名称',
`sort` int NULL DEFAULT NULL COMMENT '排序',
`oa_id` varchar(64) NULL DEFAULT NULL COMMENT 'OA人员ID',
`oa_login_id` varchar(128) NULL DEFAULT NULL COMMENT 'OA登录账号',
`sync_time` datetime NULL DEFAULT NULL COMMENT '同步时间',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户部门表';

7
doc/sql/transport/blade_dept_org_fields_patch_20260806.sql Normal file
View File

@@ -0,0 +1,7 @@
ALTER TABLE `blade_dept`
ADD COLUMN `dept_code` varchar(30) NULL DEFAULT NULL COMMENT '组织编码' AFTER `full_name`,
ADD COLUMN `short_name` varchar(45) NULL DEFAULT NULL COMMENT '组织简称' AFTER `dept_name`,
ADD COLUMN `pinyin_mnemonic` varchar(100) NULL DEFAULT NULL COMMENT '拼音助记码' AFTER `short_name`,
ADD COLUMN `mnemonic_code` varchar(100) NULL DEFAULT NULL COMMENT '助记码' AFTER `pinyin_mnemonic`,
ADD COLUMN `carrier_customer_id` bigint NULL DEFAULT NULL COMMENT '承运商客商档案主键' AFTER `mnemonic_code`,
ADD UNIQUE KEY `uk_blade_dept_dept_code` (`dept_code`);

42
doc/sql/transport/blade_equipment_ledger.sql Normal file
View File

@@ -0,0 +1,42 @@
-- 设备台账
DROP TABLE IF EXISTS `blade_equipment_ledger`;
CREATE TABLE `blade_equipment_ledger` (
`id` bigint(20) NOT NULL COMMENT '主键',
`tenant_id` varchar(12) DEFAULT '000000' COMMENT '租户ID',
`vehicle_type` varchar(20) NOT NULL COMMENT '车船类型',
`vehicle_no` varchar(30) NOT NULL COMMENT '车牌号/船号',
`equipment_code` varchar(12) NOT NULL COMMENT '设备编号',
`equipment_name` varchar(100) NOT NULL COMMENT '设备名称',
`factory_date` date DEFAULT NULL COMMENT '出厂日期',
`equipment_brand` varchar(50) DEFAULT NULL COMMENT '设备品牌',
`equipment_type` varchar(50) DEFAULT NULL COMMENT '设备类型',
`specification_model` varchar(100) DEFAULT NULL COMMENT '规格型号',
`original_equipment_no` varchar(100) DEFAULT NULL COMMENT '原厂设备号',
`remark` varchar(200) DEFAULT NULL COMMENT '备注',
`attachments` varchar(1000) DEFAULT NULL COMMENT '附件',
`online_status` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否在线：0否，1是',
`create_user` bigint(20) DEFAULT NULL COMMENT '创建人',
`create_dept` bigint(20) DEFAULT NULL COMMENT '创建部门',
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
`update_user` bigint(20) DEFAULT NULL COMMENT '修改人',
`update_time` datetime DEFAULT NULL COMMENT '修改时间',
`status` int(11) DEFAULT '1' COMMENT '状态',
`is_deleted` int(11) DEFAULT '0' COMMENT '是否已删除',
PRIMARY KEY (`id`) USING BTREE,
UNIQUE KEY `uk_equipment_ledger_code` (`equipment_code`) USING BTREE,
KEY `idx_equipment_ledger_vehicle` (`vehicle_type`, `vehicle_no`) USING BTREE,
KEY `idx_equipment_ledger_dept` (`create_dept`) USING BTREE,
KEY `idx_equipment_ledger_create_time` (`create_time`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='设备台账';
-- 菜单父级为车/船务管理
INSERT IGNORE INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES
(2077670000000000101, 2075436235826896898, 'equipment_ledger', '设备台账', 'equipment_ledger', '/vehicle/equipment-ledger', 'iconfont iconicon_doc', 130, 1, 0, 1, '', '', 0),
(2077670000000000102, 2077670000000000101, 'equipment_ledger_add', '新增', 'equipment_ledger_add', '', '', 1, 2, 0, 1, NULL, '', 0),
(2077670000000000103, 2077670000000000101, 'equipment_ledger_edit', '编辑', 'equipment_ledger_edit', '', '', 2, 2, 0, 1, NULL, '', 0),
(2077670000000000104, 2077670000000000101, 'equipment_ledger_delete', '删除', 'equipment_ledger_delete', '', '', 3, 2, 0, 1, NULL, '', 0),
(2077670000000000105, 2077670000000000101, 'equipment_ledger_view', '查看', 'equipment_ledger_view', '', '', 4, 2, 0, 1, NULL, '', 0),
(2077670000000000106, 2077670000000000101, 'equipment_ledger_import', '批量导入', 'equipment_ledger_import', '', '', 5, 2, 0, 1, NULL, '', 0),
(2077670000000000107, 2077670000000000101, 'equipment_ledger_template', '下载模板', 'equipment_ledger_template', '', '', 6, 2, 0, 1, NULL, '', 0),
(2077670000000000108, 2077670000000000101, 'equipment_ledger_export', '批量导出', 'equipment_ledger_export', '', '', 7, 2, 0, 1, NULL, '', 0),
(2077670000000000109, 2077670000000000101, 'equipment_ledger_list', '列表', 'equipment_ledger_list', '/blade-transport/equipment-ledger/list', '', 8, 2, 0, 1, NULL, '', 0);

2
doc/sql/transport/blade_transport_vehicle.sql
View File

@@ -38,6 +38,8 @@ CREATE TABLE `blade_transport_vehicle` (
`registration_date` date DEFAULT NULL COMMENT '机动车登记日期',
`registration_image` varchar(1000) DEFAULT NULL COMMENT '机动车登记本图片',
`remark` varchar(200) DEFAULT NULL COMMENT '备注',
`certification_status` int(11) DEFAULT '0' COMMENT '认证状态：0认证中 1认证通过 2认证驳回',
`certification_reject_reason` varchar(200) DEFAULT NULL COMMENT '认证驳回原因',
`create_user` bigint(20) DEFAULT NULL COMMENT '创建人',
`create_dept` bigint(20) DEFAULT NULL COMMENT '创建部门',
`create_time` datetime DEFAULT NULL COMMENT '创建时间',

4
doc/sql/transport/blade_transport_vehicle_patch_20260730.sql
View File

@@ -4,3 +4,7 @@ ALTER TABLE `blade_transport_vehicle`
ADD COLUMN `driving_license_main_back` varchar(1000) DEFAULT NULL COMMENT '行驶证主页反面' AFTER `driving_license_image`,
ADD COLUMN `driving_license_vice_front` varchar(1000) DEFAULT NULL COMMENT '行驶证副页正面' AFTER `driving_license_main_back`,
ADD COLUMN `driving_license_vice_back` varchar(1000) DEFAULT NULL COMMENT '行驶证副页反面' AFTER `driving_license_vice_front`;
ALTER TABLE `blade_transport_vehicle`
ADD COLUMN `certification_status` int(11) DEFAULT '0' COMMENT '认证状态：0认证中 1认证通过 2认证驳回' AFTER `remark`,
ADD COLUMN `certification_reject_reason` varchar(200) DEFAULT NULL COMMENT '认证驳回原因' AFTER `certification_status`;

2
doc/sql/transport/blade_user_customer_create_time_patch_20260806.sql Normal file
View File

@@ -0,0 +1,2 @@
ALTER TABLE `blade_user`
ADD COLUMN `customer_create_time` datetime NULL DEFAULT NULL COMMENT '包含新增客商权限的新增时间快照' AFTER `include_new_customer`;

32
doc/sql/transport/blade_user_remark_patch_20260806.sql Normal file
View File

@@ -0,0 +1,32 @@
ALTER TABLE `blade_user`
ADD COLUMN `remark` varchar(255) NULL DEFAULT NULL COMMENT '备注' AFTER `is_leader`,
ADD COLUMN `person_category` tinyint NOT NULL DEFAULT 1 COMMENT '人员类别：1内部员工，2承运商' AFTER `remark`,
ADD COLUMN `data_scope_range` tinyint NOT NULL DEFAULT 1 COMMENT '数据权限范围：1所属组织，2全部组织，3自定义' AFTER `person_category`,
ADD COLUMN `data_level_range` tinyint NOT NULL DEFAULT 1 COMMENT '数据层级范围：1包含下级，2仅本级' AFTER `data_scope_range`,
ADD COLUMN `include_new_customer` tinyint NOT NULL DEFAULT 0 COMMENT '包含新增客商：0否，1是' AFTER `data_level_range`;
CREATE TABLE `blade_user_data_scope` (
`id` bigint NOT NULL COMMENT '主键',
`user_id` bigint NOT NULL COMMENT '用户主键',
`dept_id` bigint NOT NULL COMMENT '组织主键',
PRIMARY KEY (`id`),
UNIQUE KEY `uk_blade_user_data_scope_user_dept` (`user_id`, `dept_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户组织数据权限';
CREATE TABLE `blade_user_customer_scope` (
`id` bigint NOT NULL COMMENT '主键',
`user_id` bigint NOT NULL COMMENT '用户主键',
`customer_id` bigint NOT NULL COMMENT '客商档案主键',
PRIMARY KEY (`id`),
UNIQUE KEY `uk_blade_user_customer_scope_user_customer` (`user_id`, `customer_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户客商权限';
ALTER TABLE `blade_user_dept`
ADD COLUMN `company_code` varchar(64) NULL DEFAULT NULL COMMENT 'OA公司编码',
ADD COLUMN `company_name` varchar(255) NULL DEFAULT NULL COMMENT 'OA公司名称',
ADD COLUMN `dept_code` varchar(64) NULL DEFAULT NULL COMMENT 'OA部门编码',
ADD COLUMN `dept_name` varchar(255) NULL DEFAULT NULL COMMENT 'OA部门名称',
ADD COLUMN `sort` int NULL DEFAULT NULL COMMENT '排序',
ADD COLUMN `oa_id` varchar(64) NULL DEFAULT NULL COMMENT 'OA人员ID',
ADD COLUMN `oa_login_id` varchar(128) NULL DEFAULT NULL COMMENT 'OA登录账号',
ADD COLUMN `sync_time` datetime NULL DEFAULT NULL COMMENT '同步时间';

52
doc/sql/transport/transport.sql
View File

@@ -5472,6 +5472,14 @@ CREATE TABLE `blade_user_dept` (
`dept_id` bigint(20) DEFAULT '0' COMMENT '部门ID',
`status` int(11) DEFAULT '1' COMMENT '状态',
`is_deleted` int(11) DEFAULT '0' COMMENT '是否已删除',
`company_code` varchar(64) DEFAULT NULL COMMENT 'OA公司编码',
`company_name` varchar(255) DEFAULT NULL COMMENT 'OA公司名称',
`dept_code` varchar(64) DEFAULT NULL COMMENT 'OA部门编码',
`dept_name` varchar(255) DEFAULT NULL COMMENT 'OA部门名称',
`sort` int DEFAULT NULL COMMENT '排序',
`oa_id` varchar(64) DEFAULT NULL COMMENT 'OA人员ID',
`oa_login_id` varchar(128) DEFAULT NULL COMMENT 'OA登录账号',
`sync_time` datetime DEFAULT NULL COMMENT '同步时间',
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户部门表';
@@ -6062,4 +6070,48 @@ INSERT IGNORE INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `pa
(2080000000000000014, 2080000000000000010, 'common_address_delete', '删除', 'common_address_delete', '', '', 4, 2, 0, 1, NULL, '', 0),
(2080000000000000015, 2080000000000000010, 'common_address_export', '批量导出', 'common_address_export', '', '', 5, 2, 0, 1, NULL, '', 0);
-- ----------------------------
-- Table structure for blade_equipment_ledger
-- ----------------------------
DROP TABLE IF EXISTS `blade_equipment_ledger`;
CREATE TABLE `blade_equipment_ledger` (
`id` bigint(20) NOT NULL COMMENT '主键',
`tenant_id` varchar(12) DEFAULT '000000' COMMENT '租户ID',
`vehicle_type` varchar(20) NOT NULL COMMENT '车船类型',
`vehicle_no` varchar(30) NOT NULL COMMENT '车牌号/船号',
`equipment_code` varchar(12) NOT NULL COMMENT '设备编号',
`equipment_name` varchar(100) NOT NULL COMMENT '设备名称',
`factory_date` date DEFAULT NULL COMMENT '出厂日期',
`equipment_brand` varchar(50) DEFAULT NULL COMMENT '设备品牌',
`equipment_type` varchar(50) DEFAULT NULL COMMENT '设备类型',
`specification_model` varchar(100) DEFAULT NULL COMMENT '规格型号',
`original_equipment_no` varchar(100) DEFAULT NULL COMMENT '原厂设备号',
`remark` varchar(200) DEFAULT NULL COMMENT '备注',
`attachments` varchar(1000) DEFAULT NULL COMMENT '附件',
`online_status` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否在线：0否，1是',
`create_user` bigint(20) DEFAULT NULL COMMENT '创建人',
`create_dept` bigint(20) DEFAULT NULL COMMENT '创建部门',
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
`update_user` bigint(20) DEFAULT NULL COMMENT '修改人',
`update_time` datetime DEFAULT NULL COMMENT '修改时间',
`status` int(11) DEFAULT '1' COMMENT '状态',
`is_deleted` int(11) DEFAULT '0' COMMENT '是否已删除',
PRIMARY KEY (`id`) USING BTREE,
UNIQUE KEY `uk_equipment_ledger_code` (`equipment_code`) USING BTREE,
KEY `idx_equipment_ledger_vehicle` (`vehicle_type`, `vehicle_no`) USING BTREE,
KEY `idx_equipment_ledger_dept` (`create_dept`) USING BTREE,
KEY `idx_equipment_ledger_create_time` (`create_time`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='设备台账';
INSERT IGNORE INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES
(2077670000000000101, 2075436235826896898, 'equipment_ledger', '设备台账', 'equipment_ledger', '/vehicle/equipment-ledger', 'iconfont iconicon_doc', 130, 1, 0, 1, '', '', 0),
(2077670000000000102, 2077670000000000101, 'equipment_ledger_add', '新增', 'equipment_ledger_add', '', '', 1, 2, 0, 1, NULL, '', 0),
(2077670000000000103, 2077670000000000101, 'equipment_ledger_edit', '编辑', 'equipment_ledger_edit', '', '', 2, 2, 0, 1, NULL, '', 0),
(2077670000000000104, 2077670000000000101, 'equipment_ledger_delete', '删除', 'equipment_ledger_delete', '', '', 3, 2, 0, 1, NULL, '', 0),
(2077670000000000105, 2077670000000000101, 'equipment_ledger_view', '查看', 'equipment_ledger_view', '', '', 4, 2, 0, 1, NULL, '', 0),
(2077670000000000106, 2077670000000000101, 'equipment_ledger_import', '批量导入', 'equipment_ledger_import', '', '', 5, 2, 0, 1, NULL, '', 0),
(2077670000000000107, 2077670000000000101, 'equipment_ledger_template', '下载模板', 'equipment_ledger_template', '', '', 6, 2, 0, 1, NULL, '', 0),
(2077670000000000108, 2077670000000000101, 'equipment_ledger_export', '批量导出', 'equipment_ledger_export', '', '', 7, 2, 0, 1, NULL, '', 0),
(2077670000000000109, 2077670000000000101, 'equipment_ledger_list', '列表', 'equipment_ledger_list', '/blade-transport/equipment-ledger/list', '', 8, 2, 0, 1, NULL, '', 0);
SET FOREIGN_KEY_CHECKS = 1;