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

调整预结算、正式结算

Browse Source
This commit is contained in:
b2894lxlx
2026-08-24 00:58:54 +08:00
parent 79f4c35235
commit 8c5704caba
15 changed files with 530 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/sql/transport/blade_common_route_region_id_patch_20260823.sql
+7
View File
@@ -0,0 +1,7 @@
ALTER TABLE `blade_common_route`
ADD COLUMN `departure_province_id` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '发货省ID' AFTER `departure_name`,
ADD COLUMN `departure_city_id` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '发货市ID' AFTER `departure_province_id`,
ADD COLUMN `departure_district_id` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '发货区ID' AFTER `departure_city_id`,
ADD COLUMN `arrival_province_id` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '收货省ID' AFTER `arrival_name`,
ADD COLUMN `arrival_city_id` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '收货市ID' AFTER `arrival_province_id`,
ADD COLUMN `arrival_district_id` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '收货区ID' AFTER `arrival_city_id`;
doc/sql/transport/blade_formal_settlement_20260818.sql
+16
View File
@@ -62,6 +62,22 @@ CREATE TABLE IF NOT EXISTS `blade_formal_settlement_detail_fee` (
KEY `idx_formal_detail_fee_detail` (`formal_settlement_detail_id`), KEY `idx_formal_detail_fee_source` (`source_fee_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='正式结算货物费用快照';
CREATE TABLE IF NOT EXISTS `blade_formal_settlement_summary_fee` (
`id` bigint(20) NOT NULL COMMENT '主键', `tenant_id` varchar(12) COLLATE utf8mb4_general_ci 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 '是否已删除', `formal_settlement_id` bigint(20) NOT NULL COMMENT '正式结算单ID',
`line_no` int(11) NOT NULL COMMENT '行号', `fee_type` varchar(100) COLLATE utf8mb4_general_ci NOT NULL COMMENT '费用类型',
`fee_item` varchar(100) COLLATE utf8mb4_general_ci NOT NULL COMMENT '费用项',
`original_amount` decimal(18,2) NOT NULL DEFAULT '0.00' COMMENT '原金额',
`adjust_amount` decimal(18,2) NOT NULL DEFAULT '0.00' COMMENT '调整金额',
`settlement_amount` decimal(18,2) NOT NULL DEFAULT '0.00' COMMENT '结算金额',
`remark` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '备注',
`manual_flag` int(11) NOT NULL DEFAULT '0' COMMENT '是否手工添加', PRIMARY KEY (`id`) USING BTREE,
KEY `idx_formal_settlement_summary_bill` (`formal_settlement_id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='正式结算合计费用';
CREATE TABLE IF NOT EXISTS `blade_formal_settlement_payment` (
`id` bigint(20) NOT NULL, `tenant_id` varchar(12) NOT NULL DEFAULT '000000', `create_user` bigint(20) DEFAULT NULL,
`create_dept` bigint(20) DEFAULT NULL, `create_time` datetime DEFAULT NULL, `update_user` bigint(20) DEFAULT NULL,
doc/sql/transport/blade_formal_settlement_summary_fee_20260823.sql
+24
View File
@@ -0,0 +1,24 @@
-- 正式结算新增结算合计费用表
CREATE TABLE IF NOT EXISTS `blade_formal_settlement_summary_fee` (
`id` bigint(20) NOT NULL COMMENT '主键',
`tenant_id` varchar(12) COLLATE utf8mb4_general_ci 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 '是否已删除',
`formal_settlement_id` bigint(20) NOT NULL COMMENT '正式结算单ID',
`line_no` int(11) NOT NULL COMMENT '行号',
`fee_type` varchar(100) COLLATE utf8mb4_general_ci NOT NULL COMMENT '费用类型',
`fee_item` varchar(100) COLLATE utf8mb4_general_ci NOT NULL COMMENT '费用项',
`original_amount` decimal(18,2) NOT NULL DEFAULT '0.00' COMMENT '原金额',
`adjust_amount` decimal(18,2) NOT NULL DEFAULT '0.00' COMMENT '调整金额',
`settlement_amount` decimal(18,2) NOT NULL DEFAULT '0.00' COMMENT '结算金额',
`remark` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '备注',
`manual_flag` int(11) NOT NULL DEFAULT '0' COMMENT '是否手工添加',
PRIMARY KEY (`id`) USING BTREE,
KEY `idx_formal_settlement_summary_bill` (`formal_settlement_id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='正式结算合计费用';
doc/sql/transport/blade_tms_business.sql
+6
View File
@@ -18,6 +18,9 @@ CREATE TABLE `blade_common_route` (
`route_name` varchar(100) DEFAULT NULL COMMENT '线路名称',
`departure_address_id` bigint(20) DEFAULT NULL COMMENT '发货地址ID',
`departure_name` varchar(100) DEFAULT NULL COMMENT '发货地',
`departure_province_id` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '发货省ID',
`departure_city_id` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '发货市ID',
`departure_district_id` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '发货区ID',
`departure_address` varchar(255) DEFAULT NULL COMMENT '发货地址',
`departure_longitude` decimal(18,6) DEFAULT NULL COMMENT '发货经度',
`departure_latitude` decimal(18,6) DEFAULT NULL COMMENT '发货纬度',
@@ -25,6 +28,9 @@ CREATE TABLE `blade_common_route` (
`departure_phone` varchar(100) DEFAULT NULL COMMENT '发货联系方式',
`arrival_address_id` bigint(20) DEFAULT NULL COMMENT '收货地址ID',
`arrival_name` varchar(100) DEFAULT NULL COMMENT '收货地',
`arrival_province_id` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '收货省ID',
`arrival_city_id` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '收货市ID',
`arrival_district_id` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '收货区ID',
`arrival_address` varchar(255) DEFAULT NULL COMMENT '收货地址',
`arrival_longitude` decimal(18,6) DEFAULT NULL COMMENT '收货经度',
`arrival_latitude` decimal(18,6) DEFAULT NULL COMMENT '收货纬度',