1、新增应付明细
2、新增应收明细 3、新增异常处置 4、新增风险处置 5、新增在途追踪 6、修复业务模块bug
This commit is contained in:
@@ -0,0 +1,67 @@
|
||||
-- 在途管理 / 异常处置
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `blade_exception_disposal` (
|
||||
`id` bigint(20) NOT NULL COMMENT '主键',
|
||||
`tenant_id` varchar(12) NOT NULL 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 '是否已删除',
|
||||
`waybill_id` bigint(20) DEFAULT NULL COMMENT '运单ID',
|
||||
`waybill_no` varchar(100) DEFAULT NULL COMMENT '运单号',
|
||||
`loading_or_master_no` varchar(100) DEFAULT NULL COMMENT '配载单号/总单号',
|
||||
`project_id` bigint(20) DEFAULT NULL COMMENT '项目ID',
|
||||
`project_name` varchar(100) DEFAULT NULL COMMENT '项目',
|
||||
`vehicle_no` varchar(100) DEFAULT NULL COMMENT '车牌号',
|
||||
`reporter_id` bigint(20) DEFAULT NULL COMMENT '上报人ID',
|
||||
`reporter_name` varchar(100) DEFAULT NULL COMMENT '上报人',
|
||||
`report_time` datetime DEFAULT NULL COMMENT '上报时间',
|
||||
`exception_type` varchar(100) DEFAULT NULL COMMENT '异常类型',
|
||||
`exception_reason` varchar(200) DEFAULT NULL COMMENT '异常原因',
|
||||
`report_description` varchar(500) DEFAULT NULL COMMENT '上报说明',
|
||||
`carrier_id` bigint(20) DEFAULT NULL COMMENT '承运商ID',
|
||||
`carrier_name` varchar(100) DEFAULT NULL COMMENT '承运商',
|
||||
`scene_photos` text DEFAULT NULL COMMENT '现场照片',
|
||||
`latest_follow_content` varchar(500) DEFAULT NULL COMMENT '最新跟进说明',
|
||||
`disposal_status` varchar(30) NOT NULL DEFAULT 'pending' COMMENT '处置状态',
|
||||
`dept_id` bigint(20) DEFAULT NULL COMMENT '所属组织ID',
|
||||
`dept_name` varchar(100) DEFAULT NULL COMMENT '所属组织',
|
||||
PRIMARY KEY (`id`) USING BTREE,
|
||||
KEY `idx_exception_disposal_waybill` (`waybill_id`, `waybill_no`) USING BTREE,
|
||||
KEY `idx_exception_disposal_status` (`disposal_status`) USING BTREE,
|
||||
KEY `idx_exception_disposal_report_time` (`report_time`) USING BTREE,
|
||||
KEY `idx_exception_disposal_create_time` (`create_time`) USING BTREE
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='异常处置';
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `blade_exception_disposal_follow_record` (
|
||||
`id` bigint(20) NOT NULL COMMENT '主键',
|
||||
`tenant_id` varchar(12) NOT NULL 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 '是否已删除',
|
||||
`disposal_id` bigint(20) NOT NULL COMMENT '异常处置ID',
|
||||
`follow_content` varchar(500) NOT NULL COMMENT '跟进说明',
|
||||
`follow_user` bigint(20) DEFAULT NULL COMMENT '跟进人',
|
||||
`follow_user_name` varchar(100) DEFAULT NULL COMMENT '跟进人姓名',
|
||||
`follow_time` datetime DEFAULT NULL COMMENT '跟进时间',
|
||||
PRIMARY KEY (`id`) USING BTREE,
|
||||
KEY `idx_exception_follow_disposal` (`disposal_id`) USING BTREE,
|
||||
KEY `idx_exception_follow_time` (`follow_time`) USING BTREE
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='异常处置跟进记录';
|
||||
|
||||
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`)
|
||||
VALUES
|
||||
(2090000000000002000, 0, 'transit_manage', '在途管理', 'transit_manage', '/transit', 'iconfont icon-caidanguanli', 90, 1, 0, 1, NULL, '', 0),
|
||||
(2090000000000002001, 2090000000000002000, 'exception_disposal', '异常处置', 'exception_disposal', '/transit/exception-disposal', 'iconfont icon-caidanguanli', 1, 1, 0, 1, NULL, '', 0),
|
||||
(2090000000000002002, 2090000000000002001, 'exception_disposal_view', '查看', 'exception_disposal_view', '', '', 1, 2, 0, 1, NULL, '', 0),
|
||||
(2090000000000002003, 2090000000000002001, 'exception_disposal_follow', '跟进', 'exception_disposal_follow', '', '', 2, 2, 0, 1, NULL, '', 0),
|
||||
(2090000000000002004, 2090000000000002001, 'exception_disposal_complete', '完成', 'exception_disposal_complete', '', '', 3, 2, 0, 1, NULL, '', 0),
|
||||
(2090000000000002005, 2090000000000002001, 'exception_disposal_batch_complete', '批量完成', 'exception_disposal_batch_complete', '', '', 4, 2, 0, 1, NULL, '', 0)
|
||||
ON DUPLICATE KEY UPDATE `name` = VALUES(`name`), `path` = VALUES(`path`), `is_deleted` = 0;
|
||||
@@ -0,0 +1,127 @@
|
||||
-- 结算管理 / 应收应付明细
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `blade_receivable_payable_detail` (
|
||||
`id` bigint(20) NOT NULL COMMENT '主键',
|
||||
`tenant_id` varchar(12) NOT NULL 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 '是否已删除',
|
||||
`document_no` varchar(100) NOT NULL COMMENT '单据号',
|
||||
`settlement_type` varchar(30) NOT NULL DEFAULT 'receivable' COMMENT '结算明细类型',
|
||||
`project_id` bigint(20) DEFAULT NULL COMMENT '项目ID',
|
||||
`project_name` varchar(100) DEFAULT NULL COMMENT '项目名称',
|
||||
`dept_id` bigint(20) DEFAULT NULL COMMENT '所属组织ID',
|
||||
`dept_name` varchar(100) DEFAULT NULL COMMENT '所属组织',
|
||||
`fee_date` date DEFAULT NULL COMMENT '费用日期',
|
||||
`customer_name` varchar(100) DEFAULT NULL COMMENT '客商名称',
|
||||
`contract_id` bigint(20) DEFAULT NULL COMMENT '合同ID',
|
||||
`contract_no` varchar(100) DEFAULT NULL COMMENT '合同编号',
|
||||
`contract_name` varchar(100) DEFAULT NULL COMMENT '合同名称',
|
||||
`source_type` varchar(30) DEFAULT NULL COMMENT '来源',
|
||||
`pre_settlement_no` varchar(100) DEFAULT NULL COMMENT '预结算单号',
|
||||
`formal_settlement_no` varchar(100) DEFAULT NULL COMMENT '正式结算单号',
|
||||
`waybill_id` bigint(20) DEFAULT NULL COMMENT '运单ID',
|
||||
`waybill_no` varchar(100) DEFAULT NULL COMMENT '运单号',
|
||||
`vehicle_no` varchar(100) DEFAULT NULL COMMENT '车号',
|
||||
`transport_type` varchar(100) DEFAULT NULL COMMENT '运输类型',
|
||||
`cargo_name` varchar(100) DEFAULT NULL COMMENT '货物名称',
|
||||
`cargo_type` varchar(100) DEFAULT NULL COMMENT '货物类型',
|
||||
`transport_quantity` decimal(18,6) DEFAULT NULL COMMENT '运输总量',
|
||||
`quantity_unit` varchar(50) DEFAULT NULL COMMENT '数量单位',
|
||||
`mileage` decimal(18,2) DEFAULT NULL COMMENT '里程',
|
||||
`batch_no` varchar(100) DEFAULT NULL COMMENT '批次号',
|
||||
`unit_price` decimal(18,2) DEFAULT NULL COMMENT '运输单价',
|
||||
`currency` varchar(20) DEFAULT 'RMB' COMMENT '币种',
|
||||
`freight_amount` decimal(18,2) DEFAULT NULL COMMENT '运输费',
|
||||
`other_fee_amount` decimal(18,2) DEFAULT NULL COMMENT '其它费用',
|
||||
`total_amount` decimal(18,2) DEFAULT NULL COMMENT '费用合计',
|
||||
`settlement_status` varchar(30) NOT NULL DEFAULT 'pending' COMMENT '状态',
|
||||
`fee_items_json` text DEFAULT NULL COMMENT '费用项JSON',
|
||||
`remark` varchar(200) DEFAULT NULL COMMENT '备注',
|
||||
PRIMARY KEY (`id`) USING BTREE,
|
||||
UNIQUE KEY `uk_receivable_payable_document_no` (`tenant_id`, `document_no`) USING BTREE,
|
||||
KEY `idx_receivable_payable_create_time` (`create_time`) USING BTREE,
|
||||
KEY `idx_receivable_payable_fee_date` (`fee_date`) USING BTREE,
|
||||
KEY `idx_receivable_payable_contract` (`contract_id`) USING BTREE,
|
||||
KEY `idx_receivable_payable_waybill` (`waybill_id`) USING BTREE,
|
||||
KEY `idx_receivable_payable_status` (`settlement_status`) USING BTREE
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='应收应付明细';
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `blade_receivable_payable_cargo_fee` (
|
||||
`id` bigint(20) NOT NULL COMMENT '主键',
|
||||
`tenant_id` varchar(12) NOT NULL 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 '是否已删除',
|
||||
`detail_id` bigint(20) NOT NULL COMMENT '应收应付明细ID',
|
||||
`waybill_id` bigint(20) DEFAULT NULL COMMENT '运单ID',
|
||||
`line_no` varchar(30) 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 '型号',
|
||||
`billing_factor` varchar(100) DEFAULT NULL COMMENT '运费计费要素',
|
||||
`billing_type` varchar(100) DEFAULT NULL COMMENT '运费计费类型',
|
||||
`transport_quantity` decimal(18,6) DEFAULT NULL COMMENT '运输量',
|
||||
`quantity_unit` varchar(50) DEFAULT NULL COMMENT '数量单位',
|
||||
`price_unit` varchar(50) DEFAULT NULL COMMENT '运费计算单位',
|
||||
`unit_price` decimal(18,2) DEFAULT NULL COMMENT '运输单价',
|
||||
`mileage` decimal(18,2) DEFAULT NULL COMMENT '里程',
|
||||
`freight_amount` decimal(18,2) DEFAULT NULL COMMENT '运输费',
|
||||
`fee_items_json` text DEFAULT NULL COMMENT '费用项JSON',
|
||||
`original_amount` decimal(18,2) DEFAULT NULL COMMENT '原总金额',
|
||||
`adjust_amount` decimal(18,2) DEFAULT NULL COMMENT '调整金额',
|
||||
`after_amount` decimal(18,2) DEFAULT NULL COMMENT '调整后总金额',
|
||||
`remark` varchar(200) DEFAULT NULL COMMENT '备注',
|
||||
PRIMARY KEY (`id`) USING BTREE,
|
||||
KEY `idx_receivable_payable_cargo_detail` (`detail_id`) USING BTREE,
|
||||
KEY `idx_receivable_payable_cargo_waybill` (`waybill_id`) USING BTREE
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='应收应付货物费用明细';
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `blade_receivable_payable_change_record` (
|
||||
`id` bigint(20) NOT NULL COMMENT '主键',
|
||||
`tenant_id` varchar(12) NOT NULL 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 '是否已删除',
|
||||
`detail_id` bigint(20) NOT NULL COMMENT '应收应付明细ID',
|
||||
`line_no` varchar(30) DEFAULT NULL COMMENT '行号',
|
||||
`cargo_name` varchar(100) DEFAULT NULL COMMENT '货物名称',
|
||||
`change_content` varchar(500) DEFAULT NULL COMMENT '变更内容',
|
||||
`adjust_user` bigint(20) DEFAULT NULL COMMENT '调整人',
|
||||
`adjust_user_name` varchar(100) DEFAULT NULL COMMENT '调整人姓名',
|
||||
`adjust_reason` varchar(200) DEFAULT NULL COMMENT '调整原因',
|
||||
`adjust_time` datetime DEFAULT NULL COMMENT '调整时间',
|
||||
PRIMARY KEY (`id`) USING BTREE,
|
||||
KEY `idx_receivable_payable_change_detail` (`detail_id`) USING BTREE,
|
||||
KEY `idx_receivable_payable_change_time` (`adjust_time`) USING BTREE
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='应收应付费用变更记录';
|
||||
|
||||
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`)
|
||||
VALUES
|
||||
(2090000000000001000, 0, 'settlement_manage', '结算管理', 'settlement_manage', '/settlement', 'iconfont icon-caidanguanli', 100, 1, 0, 1, NULL, '', 0),
|
||||
(2090000000000001001, 2090000000000001000, 'receivable_detail', '应收', 'receivable_detail', '/settlement/receivable-detail', 'iconfont icon-caidanguanli', 1, 1, 0, 1, NULL, '', 0),
|
||||
(2090000000000001002, 2090000000000001001, 'receivable_detail_view', '查看', 'receivable_detail_view', '', '', 1, 2, 0, 1, NULL, '', 0),
|
||||
(2090000000000001003, 2090000000000001001, 'receivable_detail_generate', '生成费用', 'receivable_detail_generate', '', '', 2, 2, 0, 1, NULL, '', 0),
|
||||
(2090000000000001004, 2090000000000001001, 'receivable_detail_update_fee', '更新费用', 'receivable_detail_update_fee', '', '', 3, 2, 0, 1, NULL, '', 0),
|
||||
(2090000000000001005, 2090000000000001001, 'receivable_detail_transfer', '批量转结算', 'receivable_detail_transfer', '', '', 4, 2, 0, 1, NULL, '', 0),
|
||||
(2090000000000001006, 2090000000000001001, 'receivable_detail_export', '导出', 'receivable_detail_export', '', '', 5, 2, 0, 1, NULL, '', 0),
|
||||
(2090000000000001007, 2090000000000001000, 'payable_detail', '应付', 'payable_detail', '/settlement/payable-detail', 'iconfont icon-caidanguanli', 2, 1, 0, 1, NULL, '', 0),
|
||||
(2090000000000001008, 2090000000000001007, 'payable_detail_view', '查看', 'payable_detail_view', '', '', 1, 2, 0, 1, NULL, '', 0),
|
||||
(2090000000000001009, 2090000000000001007, 'payable_detail_generate', '生成费用', 'payable_detail_generate', '', '', 2, 2, 0, 1, NULL, '', 0),
|
||||
(2090000000000001010, 2090000000000001007, 'payable_detail_update_fee', '更新费用', 'payable_detail_update_fee', '', '', 3, 2, 0, 1, NULL, '', 0),
|
||||
(2090000000000001011, 2090000000000001007, 'payable_detail_transfer', '批量转结算', 'payable_detail_transfer', '', '', 4, 2, 0, 1, NULL, '', 0),
|
||||
(2090000000000001012, 2090000000000001007, 'payable_detail_export', '导出', 'payable_detail_export', '', '', 5, 2, 0, 1, NULL, '', 0)
|
||||
ON DUPLICATE KEY UPDATE `name` = VALUES(`name`), `path` = VALUES(`path`), `is_deleted` = 0;
|
||||
@@ -0,0 +1,44 @@
|
||||
-- 在途管理 / 风险处置
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `blade_risk_disposal` (
|
||||
`id` bigint(20) NOT NULL COMMENT '主键',
|
||||
`tenant_id` varchar(12) NOT NULL 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 '是否已删除',
|
||||
`risk_no` varchar(100) DEFAULT NULL COMMENT '风险编号',
|
||||
`rule_name` varchar(100) DEFAULT NULL COMMENT '规则名称',
|
||||
`waybill_id` bigint(20) DEFAULT NULL COMMENT '运单ID',
|
||||
`waybill_no` varchar(100) DEFAULT NULL COMMENT '运单号',
|
||||
`project_name` varchar(100) DEFAULT NULL COMMENT '项目名称',
|
||||
`vehicle_no` varchar(100) DEFAULT NULL COMMENT '车牌号',
|
||||
`risk_level` varchar(30) DEFAULT NULL COMMENT '风险等级',
|
||||
`transport_type` varchar(50) DEFAULT NULL COMMENT '运输类型',
|
||||
`risk_description` varchar(500) DEFAULT NULL COMMENT '风险描述',
|
||||
`disposal_status` varchar(30) NOT NULL DEFAULT 'pending' COMMENT '处置状态',
|
||||
`disposal_method` varchar(30) DEFAULT NULL COMMENT '处理方式',
|
||||
`disposal_remark` varchar(500) DEFAULT NULL COMMENT '处置说明',
|
||||
`dept_id` bigint(20) DEFAULT NULL COMMENT '所属组织ID',
|
||||
`dept_name` varchar(100) DEFAULT NULL COMMENT '所属组织',
|
||||
`trigger_time` datetime DEFAULT NULL COMMENT '触发时间',
|
||||
`dispose_time` datetime DEFAULT NULL COMMENT '处理时间',
|
||||
PRIMARY KEY (`id`) USING BTREE,
|
||||
KEY `idx_risk_disposal_waybill` (`waybill_id`, `waybill_no`) USING BTREE,
|
||||
KEY `idx_risk_disposal_status` (`disposal_status`) USING BTREE,
|
||||
KEY `idx_risk_disposal_trigger_time` (`trigger_time`) USING BTREE,
|
||||
KEY `idx_risk_disposal_create_time` (`create_time`) USING BTREE
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='风险处置';
|
||||
|
||||
INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`)
|
||||
VALUES
|
||||
(2090000000000003000, 0, 'transit_manage', '在途管理', 'transit_manage', '/transit', 'iconfont icon-caidanguanli', 90, 1, 0, 1, NULL, '', 0),
|
||||
(2090000000000003001, 2090000000000003000, 'risk_disposal', '风险处置', 'risk_disposal', '/transit/risk-disposal', 'iconfont icon-caidanguanli', 2, 1, 0, 1, NULL, '', 0),
|
||||
(2090000000000003002, 2090000000000003001, 'risk_disposal_view', '查看', 'risk_disposal_view', '', '', 1, 2, 0, 1, NULL, '', 0),
|
||||
(2090000000000003003, 2090000000000003001, 'risk_disposal_follow', '处理', 'risk_disposal_follow', '', '', 2, 2, 0, 1, NULL, '', 0),
|
||||
(2090000000000003004, 2090000000000003001, 'risk_disposal_batch_dispose', '批量处理', 'risk_disposal_batch_dispose', '', '', 3, 2, 0, 1, NULL, '', 0)
|
||||
ON DUPLICATE KEY UPDATE `name` = VALUES(`name`), `path` = VALUES(`path`), `is_deleted` = 0;
|
||||
|
||||
Reference in New Issue
Block a user