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

1、修复菜单无法编辑

Browse Source 
2、完善运输计划
3、完善运单管理
4、新增配置管理
This commit is contained in:
b2894lxlx
2026-08-04 20:53:57 +08:00
parent 30c51ba271
commit 62a110b6de
23 changed files with 2081 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
doc/sql/transport/blade_loading_manage_20260804.sql Normal file
View File

@@ -0,0 +1,65 @@
CREATE TABLE IF NOT EXISTS `blade_loading_manage` (
`id` bigint(20) NOT NULL COMMENT '主键',
`tenant_id` varchar(12) DEFAULT '000000' COMMENT '租户ID',
`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 '是否已删除',
`loading_no` varchar(100) DEFAULT NULL COMMENT '配载单号',
`loading_sub_nos` varchar(200) DEFAULT NULL COMMENT '配载子单号',
`waybill_ids_json` varchar(4000) DEFAULT NULL COMMENT '运单ID集合',
`project_id` bigint(20) DEFAULT NULL COMMENT '项目ID',
`project_name` varchar(100) DEFAULT NULL COMMENT '项目名称',
`customer_name` varchar(100) DEFAULT NULL COMMENT '客户名称',
`transport_type` varchar(100) DEFAULT NULL COMMENT '运输类型',
`cargo_type` varchar(100) DEFAULT NULL COMMENT '货物类型',
`cargo_name` varchar(100) DEFAULT NULL COMMENT '货物名称',
`vehicle_no` varchar(100) DEFAULT NULL COMMENT '车/船/航班/班列',
`trailer_vehicle_no` varchar(100) DEFAULT NULL COMMENT '挂车车牌号',
`driver_name` varchar(100) DEFAULT NULL COMMENT '司机',
`driver_phone` varchar(50) DEFAULT NULL COMMENT '联系电话',
`escort_name` varchar(100) DEFAULT NULL COMMENT '押运人',
`escort_phone` varchar(50) DEFAULT NULL COMMENT '押运人手机号',
`carrier_type` varchar(50) DEFAULT NULL COMMENT '承运类型',
`carrier_name` varchar(100) DEFAULT NULL COMMENT '承运商',
`departure_address` varchar(100) DEFAULT NULL COMMENT '发货地',
`transit_address` varchar(200) DEFAULT NULL COMMENT '途经地',
`arrival_address` varchar(100) DEFAULT NULL COMMENT '到货地',
`original_no` varchar(100) DEFAULT NULL COMMENT '原始单号',
`data_source` varchar(100) DEFAULT NULL COMMENT '数据来源',
`start_date` date DEFAULT NULL COMMENT '开始日期',
`end_date` date DEFAULT NULL COMMENT '结束日期',
`plan_name` varchar(100) DEFAULT NULL COMMENT '计划名称',
`batch_no` varchar(100) DEFAULT NULL COMMENT '运单批次号',
`current_process_node` varchar(100) DEFAULT NULL COMMENT '当前过程节点',
`mileage` decimal(18,2) DEFAULT NULL COMMENT '里程',
`estimated_start_date` date DEFAULT NULL COMMENT '预计发货日期',
`estimated_end_date` date DEFAULT NULL COMMENT '预计完成日期',
`task_remark` varchar(500) DEFAULT NULL COMMENT '任务备注',
`goods_json` text DEFAULT NULL COMMENT '货物信息',
`route_json` text DEFAULT NULL COMMENT '路线信息',
`task_info_json` text DEFAULT NULL COMMENT '任务信息',
`dept_id` bigint(20) DEFAULT NULL COMMENT '所属组织ID',
`dept_name` varchar(100) DEFAULT NULL COMMENT '所属组织',
`business_status` varchar(100) DEFAULT NULL COMMENT '业务状态',
PRIMARY KEY (`id`) USING BTREE,
UNIQUE KEY `uk_loading_manage_no` (`loading_no`) USING BTREE,
KEY `idx_loading_manage_dept` (`dept_id`) USING BTREE,
KEY `idx_loading_manage_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
(2090000000000000700, 2090000000000000000, 'loading_manage', '配载管理', 'loading_manage', '/business/loading-manage', 'iconfont icon-caidanguanli', 70, 1, 0, 1, NULL, '', 0),
(2090000000000000701, 2090000000000000700, 'loading_manage_view', '查看', 'loading_manage_view', '', '', 1, 2, 0, 1, NULL, '', 0),
(2090000000000000702, 2090000000000000700, 'loading_manage_add', '新增', 'loading_manage_add', '', '', 2, 2, 0, 1, NULL, '', 0),
(2090000000000000703, 2090000000000000700, 'loading_manage_edit', '编辑', 'loading_manage_edit', '', '', 3, 2, 0, 1, NULL, '', 0),
(2090000000000000704, 2090000000000000700, 'loading_manage_delete', '删除', 'loading_manage_delete', '', '', 4, 2, 0, 1, NULL, '', 0),
(2090000000000000705, 2090000000000000700, 'loading_manage_export', '批量导出', 'loading_manage_export', '', '', 5, 2, 0, 1, NULL, '', 0),
(2090000000000000706, 2090000000000000700, 'loading_manage_copy', '复制', 'loading_manage_copy', '', '', 6, 2, 0, 1, NULL, '', 0),
(2090000000000000707, 2090000000000000700, 'loading_manage_reassign', '重新派单', 'loading_manage_reassign', '', '', 7, 2, 0, 1, NULL, '', 0),
(2090000000000000708, 2090000000000000700, 'loading_manage_cancel', '取消', 'loading_manage_cancel', '', '', 8, 2, 0, 1, NULL, '', 0),
(2090000000000000709, 2090000000000000700, 'loading_manage_complete', '完成', 'loading_manage_complete', '', '', 9, 2, 0, 1, NULL, '', 0),
(2090000000000000710, 2090000000000000700, 'loading_manage_batch_complete', '批量完成', 'loading_manage_batch_complete', '', '', 10, 2, 0, 1, NULL, '', 0);

103
doc/sql/transport/blade_tms_business.sql
View File

@@ -219,11 +219,38 @@ CREATE TABLE `blade_waybill` (
`transport_type` varchar(100) DEFAULT NULL COMMENT '运输类型',
`cargo_name` varchar(100) DEFAULT NULL COMMENT '货物名称',
`cargo_type` varchar(100) DEFAULT NULL COMMENT '货物类型',
`specification` varchar(255) DEFAULT NULL COMMENT '规格',
`model` varchar(255) DEFAULT NULL COMMENT '型号',
`quantity` decimal(18,2) DEFAULT NULL COMMENT '数量',
`quantity_unit` varchar(50) DEFAULT NULL COMMENT '数量单位',
`departure_address_id` bigint(20) DEFAULT NULL COMMENT '发货地址ID',
`departure_name` varchar(100) DEFAULT NULL COMMENT '发货地',
`departure_address` varchar(255) DEFAULT NULL COMMENT '发货地址',
`departure_contact` varchar(100) DEFAULT NULL COMMENT '发货联系人',
`departure_phone` varchar(50) DEFAULT NULL COMMENT '发货联系方式',
`arrival_address_id` bigint(20) DEFAULT NULL COMMENT '收货地址ID',
`arrival_name` varchar(100) DEFAULT NULL COMMENT '收货地',
`arrival_address` varchar(255) DEFAULT NULL COMMENT '收货地址',
`arrival_contact` varchar(100) DEFAULT NULL COMMENT '收货联系人',
`arrival_phone` varchar(50) DEFAULT NULL COMMENT '收货联系方式',
`task_entry_mode` varchar(50) DEFAULT NULL COMMENT '任务录入模式',
`carrier_type` varchar(50) DEFAULT NULL COMMENT '承运类型',
`carrier_id` bigint(20) DEFAULT NULL COMMENT '承运商ID',
`carrier_name` varchar(100) DEFAULT NULL COMMENT '承运商名称',
`driver_id` bigint(20) DEFAULT NULL COMMENT '司机ID',
`driver_name` varchar(100) DEFAULT NULL COMMENT '司机姓名',
`driver_phone` varchar(50) DEFAULT NULL COMMENT '司机手机号',
`vehicle_no` varchar(100) DEFAULT NULL COMMENT '车/船/航班/班列号',
`trailer_vehicle_no` varchar(100) DEFAULT NULL COMMENT '挂车车牌号',
`escort_name` varchar(100) DEFAULT NULL COMMENT '押运人',
`escort_phone` varchar(50) DEFAULT NULL COMMENT '押运人手机号',
`mileage` decimal(18,2) DEFAULT NULL COMMENT '里程',
`estimated_start_time` datetime DEFAULT NULL COMMENT '预计发货时间',
`estimated_end_time` datetime DEFAULT NULL COMMENT '预计完成时间',
`unit_price` decimal(18,2) DEFAULT NULL COMMENT '单价',
`price_unit` varchar(50) DEFAULT NULL COMMENT '计价单位',
`other_fee_total` decimal(18,2) DEFAULT NULL COMMENT '其他费用合计',
`task_remark` varchar(200) DEFAULT NULL COMMENT '任务备注',
`original_no` varchar(100) DEFAULT NULL COMMENT '原始单号',
`business_status` varchar(100) DEFAULT NULL COMMENT '业务状态',
`data_source` varchar(100) DEFAULT NULL COMMENT '数据来源',
@@ -238,17 +265,75 @@ CREATE TABLE `blade_waybill` (
`current_process_node` varchar(100) DEFAULT NULL COMMENT '当前过程节点',
`goods_json` text DEFAULT NULL COMMENT '货物信息',
`carrier_json` text DEFAULT NULL COMMENT '承运信息',
`task_info_json` text DEFAULT NULL COMMENT '任务信息',
`process_json` text DEFAULT NULL COMMENT '过程节点',
`freight_json` text DEFAULT NULL COMMENT '费用信息',
`attachments_json` text DEFAULT NULL COMMENT '附件',
`dept_id` bigint(20) DEFAULT NULL COMMENT '所属组织ID',
`dept_name` varchar(100) DEFAULT NULL COMMENT '所属组织',
`remark` varchar(500) DEFAULT NULL COMMENT '备注',
`remark` varchar(200) DEFAULT NULL COMMENT '备注',
PRIMARY KEY (`id`) USING BTREE,
KEY `idx_waybill_dept` (`dept_id`) USING BTREE,
KEY `idx_waybill_create_time` (`create_time`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='运单管理';
-- ----------------------------
-- Table structure for blade_loading_manage
-- ----------------------------
DROP TABLE IF EXISTS `blade_loading_manage`;
CREATE TABLE `blade_loading_manage` (
`id` bigint(20) NOT NULL COMMENT '主键',
`tenant_id` varchar(12) DEFAULT '000000' COMMENT '租户ID',
`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 '是否已删除',
`loading_no` varchar(100) DEFAULT NULL COMMENT '配载单号',
`loading_sub_nos` varchar(200) DEFAULT NULL COMMENT '配载子单号',
`waybill_ids_json` varchar(4000) DEFAULT NULL COMMENT '运单ID集合',
`project_id` bigint(20) DEFAULT NULL COMMENT '项目ID',
`project_name` varchar(100) DEFAULT NULL COMMENT '项目名称',
`customer_name` varchar(100) DEFAULT NULL COMMENT '客户名称',
`transport_type` varchar(100) DEFAULT NULL COMMENT '运输类型',
`cargo_type` varchar(100) DEFAULT NULL COMMENT '货物类型',
`cargo_name` varchar(100) DEFAULT NULL COMMENT '货物名称',
`vehicle_no` varchar(100) DEFAULT NULL COMMENT '车/船/航班/班列',
`trailer_vehicle_no` varchar(100) DEFAULT NULL COMMENT '挂车车牌号',
`driver_name` varchar(100) DEFAULT NULL COMMENT '司机',
`driver_phone` varchar(50) DEFAULT NULL COMMENT '联系电话',
`escort_name` varchar(100) DEFAULT NULL COMMENT '押运人',
`escort_phone` varchar(50) DEFAULT NULL COMMENT '押运人手机号',
`carrier_type` varchar(50) DEFAULT NULL COMMENT '承运类型',
`carrier_name` varchar(100) DEFAULT NULL COMMENT '承运商',
`departure_address` varchar(100) DEFAULT NULL COMMENT '发货地',
`transit_address` varchar(200) DEFAULT NULL COMMENT '途经地',
`arrival_address` varchar(100) DEFAULT NULL COMMENT '到货地',
`original_no` varchar(100) DEFAULT NULL COMMENT '原始单号',
`data_source` varchar(100) DEFAULT NULL COMMENT '数据来源',
`start_date` date DEFAULT NULL COMMENT '开始日期',
`end_date` date DEFAULT NULL COMMENT '结束日期',
`plan_name` varchar(100) DEFAULT NULL COMMENT '计划名称',
`batch_no` varchar(100) DEFAULT NULL COMMENT '运单批次号',
`current_process_node` varchar(100) DEFAULT NULL COMMENT '当前过程节点',
`mileage` decimal(18,2) DEFAULT NULL COMMENT '里程',
`estimated_start_date` date DEFAULT NULL COMMENT '预计发货日期',
`estimated_end_date` date DEFAULT NULL COMMENT '预计完成日期',
`task_remark` varchar(500) DEFAULT NULL COMMENT '任务备注',
`goods_json` text DEFAULT NULL COMMENT '货物信息',
`route_json` text DEFAULT NULL COMMENT '路线信息',
`task_info_json` text DEFAULT NULL COMMENT '任务信息',
`dept_id` bigint(20) DEFAULT NULL COMMENT '所属组织ID',
`dept_name` varchar(100) DEFAULT NULL COMMENT '所属组织',
`business_status` varchar(100) DEFAULT NULL COMMENT '业务状态',
PRIMARY KEY (`id`) USING BTREE,
UNIQUE KEY `uk_loading_manage_no` (`loading_no`) USING BTREE,
KEY `idx_loading_manage_dept` (`dept_id`) USING BTREE,
KEY `idx_loading_manage_create_time` (`create_time`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='配载管理';
-- ----------------------------
-- Menu data for business management
-- ----------------------------
@@ -303,4 +388,18 @@ INSERT IGNORE INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `pa
(2090000000000000607, 2090000000000000600, 'waybill_manage_cancel', '取消', 'waybill_manage_cancel', '', '', 7, 2, 0, 1, NULL, '', 0),
(2090000000000000608, 2090000000000000600, 'waybill_manage_reassign', '重新派单', 'waybill_manage_reassign', '', '', 8, 2, 0, 1, NULL, '', 0),
(2090000000000000609, 2090000000000000600, 'waybill_manage_complete', '完成', 'waybill_manage_complete', '', '', 9, 2, 0, 1, NULL, '', 0),
(2090000000000000610, 2090000000000000600, 'waybill_manage_batch_complete', '批量完成', 'waybill_manage_batch_complete', '', '', 10, 2, 0, 1, NULL, '', 0);
(2090000000000000610, 2090000000000000600, 'waybill_manage_batch_complete', '批量完成', 'waybill_manage_batch_complete', '', '', 10, 2, 0, 1, NULL, '', 0),
(2090000000000000611, 2090000000000000600, 'waybill_manage_import', '导入运单', 'waybill_manage_import', '', '', 11, 2, 0, 1, NULL, '', 0),
(2090000000000000612, 2090000000000000600, 'waybill_manage_template', '下载模板', 'waybill_manage_template', '', '', 12, 2, 0, 1, NULL, '', 0),
(2090000000000000613, 2090000000000000600, 'waybill_manage_road_loading', '公路配载', 'waybill_manage_road_loading', '', '', 13, 2, 0, 1, NULL, '', 0),
(2090000000000000700, 2090000000000000000, 'loading_manage', '配载管理', 'loading_manage', '/business/loading-manage', 'iconfont icon-caidanguanli', 70, 1, 0, 1, NULL, '', 0),
(2090000000000000701, 2090000000000000700, 'loading_manage_view', '查看', 'loading_manage_view', '', '', 1, 2, 0, 1, NULL, '', 0),
(2090000000000000702, 2090000000000000700, 'loading_manage_add', '新增', 'loading_manage_add', '', '', 2, 2, 0, 1, NULL, '', 0),
(2090000000000000703, 2090000000000000700, 'loading_manage_edit', '编辑', 'loading_manage_edit', '', '', 3, 2, 0, 1, NULL, '', 0),
(2090000000000000704, 2090000000000000700, 'loading_manage_delete', '删除', 'loading_manage_delete', '', '', 4, 2, 0, 1, NULL, '', 0),
(2090000000000000705, 2090000000000000700, 'loading_manage_export', '批量导出', 'loading_manage_export', '', '', 5, 2, 0, 1, NULL, '', 0),
(2090000000000000706, 2090000000000000700, 'loading_manage_copy', '复制', 'loading_manage_copy', '', '', 6, 2, 0, 1, NULL, '', 0),
(2090000000000000707, 2090000000000000700, 'loading_manage_reassign', '重新派单', 'loading_manage_reassign', '', '', 7, 2, 0, 1, NULL, '', 0),
(2090000000000000708, 2090000000000000700, 'loading_manage_cancel', '取消', 'loading_manage_cancel', '', '', 8, 2, 0, 1, NULL, '', 0),
(2090000000000000709, 2090000000000000700, 'loading_manage_complete', '完成', 'loading_manage_complete', '', '', 9, 2, 0, 1, NULL, '', 0),
(2090000000000000710, 2090000000000000700, 'loading_manage_batch_complete', '批量完成', 'loading_manage_batch_complete', '', '', 10, 2, 0, 1, NULL, '', 0);

30
doc/sql/transport/blade_waybill_patch_20260804.sql Normal file
View File

@@ -0,0 +1,30 @@
ALTER TABLE `blade_waybill`
ADD COLUMN `specification` varchar(255) DEFAULT NULL COMMENT '规格' AFTER `cargo_type`,
ADD COLUMN `model` varchar(255) DEFAULT NULL COMMENT '型号' AFTER `specification`,
ADD COLUMN `quantity` decimal(18,2) DEFAULT NULL COMMENT '数量' AFTER `model`,
ADD COLUMN `quantity_unit` varchar(50) DEFAULT NULL COMMENT '数量单位' AFTER `quantity`,
ADD COLUMN `departure_address_id` bigint(20) DEFAULT NULL COMMENT '发货地址ID' AFTER `quantity_unit`,
ADD COLUMN `departure_name` varchar(100) DEFAULT NULL COMMENT '发货地' AFTER `departure_address_id`,
ADD COLUMN `departure_contact` varchar(100) DEFAULT NULL COMMENT '发货联系人' AFTER `departure_address`,
ADD COLUMN `departure_phone` varchar(50) DEFAULT NULL COMMENT '发货联系方式' AFTER `departure_contact`,
ADD COLUMN `arrival_address_id` bigint(20) DEFAULT NULL COMMENT '收货地址ID' AFTER `departure_phone`,
ADD COLUMN `arrival_name` varchar(100) DEFAULT NULL COMMENT '收货地' AFTER `arrival_address_id`,
ADD COLUMN `arrival_contact` varchar(100) DEFAULT NULL COMMENT '收货联系人' AFTER `arrival_address`,
ADD COLUMN `arrival_phone` varchar(50) DEFAULT NULL COMMENT '收货联系方式' AFTER `arrival_contact`,
ADD COLUMN `task_entry_mode` varchar(50) DEFAULT NULL COMMENT '任务录入模式' AFTER `arrival_phone`,
ADD COLUMN `carrier_type` varchar(50) DEFAULT NULL COMMENT '承运类型' AFTER `task_entry_mode`,
ADD COLUMN `carrier_id` bigint(20) DEFAULT NULL COMMENT '承运商ID' AFTER `carrier_type`,
ADD COLUMN `driver_id` bigint(20) DEFAULT NULL COMMENT '司机ID' AFTER `carrier_name`,
ADD COLUMN `driver_phone` varchar(50) DEFAULT NULL COMMENT '司机手机号' AFTER `driver_name`,
ADD COLUMN `trailer_vehicle_no` varchar(100) DEFAULT NULL COMMENT '挂车车牌号' AFTER `vehicle_no`,
ADD COLUMN `escort_name` varchar(100) DEFAULT NULL COMMENT '押运人' AFTER `trailer_vehicle_no`,
ADD COLUMN `escort_phone` varchar(50) DEFAULT NULL COMMENT '押运人手机号' AFTER `escort_name`,
ADD COLUMN `mileage` decimal(18,2) DEFAULT NULL COMMENT '里程' AFTER `escort_phone`,
ADD COLUMN `estimated_start_time` datetime DEFAULT NULL COMMENT '预计发货时间' AFTER `mileage`,
ADD COLUMN `estimated_end_time` datetime DEFAULT NULL COMMENT '预计完成时间' AFTER `estimated_start_time`,
ADD COLUMN `unit_price` decimal(18,2) DEFAULT NULL COMMENT '单价' AFTER `estimated_end_time`,
ADD COLUMN `price_unit` varchar(50) DEFAULT NULL COMMENT '计价单位' AFTER `unit_price`,
ADD COLUMN `other_fee_total` decimal(18,2) DEFAULT NULL COMMENT '其他费用合计' AFTER `price_unit`,
ADD COLUMN `task_remark` varchar(200) DEFAULT NULL COMMENT '任务备注' AFTER `other_fee_total`,
ADD COLUMN `task_info_json` text DEFAULT NULL COMMENT '任务信息' AFTER `carrier_json`,
MODIFY COLUMN `remark` varchar(200) DEFAULT NULL COMMENT '备注';