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

fix bug

Browse Source
This commit is contained in:
b2894lxlx
2026-08-31 10:38:14 +08:00
parent a2b604f3a3
commit 12996eb739
23 changed files with 602 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/sql/transport/blade_receivable_payable_cargo_fee_billing_rules_20260830.sql
+28
View File
@@ -0,0 +1,28 @@
-- MySQL 5.7+ 兼容：保存应收应付费用生成时实际命中的计费规则。
-- 请在 transport 数据库执行。本脚本使用 information_schema 判断，可重复执行。
DELIMITER $$
DROP PROCEDURE IF EXISTS `upgrade_receivable_payable_cargo_fee_billing_rules_20260830`$$
CREATE PROCEDURE `upgrade_receivable_payable_cargo_fee_billing_rules_20260830`()
BEGIN
DECLARE db_name varchar(128);
SET db_name = DATABASE();
IF NOT EXISTS (
SELECT 1
FROM information_schema.columns
WHERE table_schema = db_name
AND table_name = 'blade_receivable_payable_cargo_fee'
AND column_name = 'billing_rules_json'
) THEN
ALTER TABLE `blade_receivable_payable_cargo_fee`
ADD COLUMN `billing_rules_json` text COLLATE utf8mb4_general_ci DEFAULT NULL
COMMENT '命中计费规则JSON' AFTER `billing_type`;
END IF;
END$$
CALL `upgrade_receivable_payable_cargo_fee_billing_rules_20260830`()$$
DROP PROCEDURE `upgrade_receivable_payable_cargo_fee_billing_rules_20260830`$$
DELIMITER ;
doc/sql/transport/blade_receivable_payable_detail_20260812.sql
+2 -1
View File
@@ -64,13 +64,14 @@ CREATE TABLE IF NOT EXISTS `blade_receivable_payable_cargo_fee` (
`detail_id` bigint(20) NOT NULL COMMENT '应收应付明细ID',
`waybill_id` bigint(20) DEFAULT NULL COMMENT '运单ID',
`line_no` varchar(30) DEFAULT NULL COMMENT '行号',
`data_source` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '自动生成' COMMENT '来源：自动生成/手工录入',
`data_source` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '自动生成' 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 '计费类型',
`billing_rules_json` text COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '命中计费规则JSON',
`transport_quantity` decimal(18,6) DEFAULT NULL COMMENT '运输量',
`quantity_unit` varchar(50) DEFAULT NULL COMMENT '数量单位',
`price_unit` varchar(50) DEFAULT NULL COMMENT '运费计算单位',
doc/sql/transport/blade_settlement_adjustment_20260818.sql
+3 -3
View File
@@ -3,8 +3,8 @@ CREATE TABLE IF NOT EXISTS `blade_settlement_adjustment` (
`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, `update_time` datetime DEFAULT NULL, `status` int(11) DEFAULT '1', `is_deleted` int(11) DEFAULT '0',
`adjustment_no` varchar(100) NOT NULL COMMENT '结算调整单号', `formal_settlement_id` bigint(20) NOT NULL COMMENT '关联正式结算单ID',
`formal_settlement_no` varchar(100) NOT NULL COMMENT '关联正式结算单号', `settlement_type` varchar(30) NOT NULL,
`adjustment_no` varchar(100) NOT NULL COMMENT '结算调整单号', `formal_settlement_id` bigint(20) DEFAULT NULL COMMENT '关联正式结算单ID',
`formal_settlement_no` varchar(100) DEFAULT NULL COMMENT '关联正式结算单号', `settlement_type` varchar(30) DEFAULT NULL,
`project_name` varchar(100) DEFAULT NULL, `dept_name` varchar(100) DEFAULT NULL, `customer_name` varchar(200) DEFAULT NULL,
`contract_no` varchar(100) DEFAULT NULL, `contract_name` varchar(100) DEFAULT NULL,
`adjustment_amount` decimal(18,2) NOT NULL DEFAULT '0.00' COMMENT '调整金额',
@@ -21,7 +21,7 @@ CREATE TABLE IF NOT EXISTS `blade_settlement_adjustment_detail` (
`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, `update_time` datetime DEFAULT NULL, `status` int(11) DEFAULT '1', `is_deleted` int(11) DEFAULT '0',
`adjustment_id` bigint(20) NOT NULL, `formal_settlement_detail_id` bigint(20) NOT NULL, `formal_settlement_detail_fee_id` bigint(20) NOT NULL,
`adjustment_id` bigint(20) NOT NULL, `formal_settlement_detail_id` bigint(20) DEFAULT NULL, `formal_settlement_detail_fee_id` bigint(20) DEFAULT NULL,
`fee_type` varchar(100) DEFAULT NULL, `fee_item` varchar(200) DEFAULT NULL, `original_amount_tax` decimal(18,2) DEFAULT NULL,
`adjustment_amount_tax` decimal(18,2) NOT NULL DEFAULT '0.00', `adjustment_amount_no_tax` decimal(18,2) DEFAULT NULL,
`remark` varchar(200) DEFAULT NULL, PRIMARY KEY (`id`), KEY `idx_adjustment_detail_bill` (`adjustment_id`),
doc/sql/transport/blade_settlement_adjustment_draft_nullable_20260831.sql
+5
View File
@@ -0,0 +1,5 @@
-- 结算调整单草稿允许暂不完善关联正式结算信息
ALTER TABLE `blade_settlement_adjustment`
MODIFY COLUMN `formal_settlement_id` bigint(20) DEFAULT NULL COMMENT '关联正式结算单ID',
MODIFY COLUMN `formal_settlement_no` varchar(100) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '关联正式结算单号',
MODIFY COLUMN `settlement_type` varchar(30) COLLATE utf8mb4_general_ci DEFAULT NULL;
doc/sql/transport/blade_settlement_adjustment_manual_fee_20260830.sql
+5
View File
@@ -0,0 +1,5 @@
-- 结算调整单支持手工新增费用
ALTER TABLE `blade_settlement_adjustment_detail`
MODIFY COLUMN `formal_settlement_detail_id` bigint(20) DEFAULT NULL COMMENT '正式结算明细ID，手工费用为空',
MODIFY COLUMN `formal_settlement_detail_fee_id` bigint(20) DEFAULT NULL COMMENT '正式结算明细费用ID，手工费用为空';
doc/sql/transport/blade_tms_business.sql
+2
View File
@@ -262,6 +262,7 @@ CREATE TABLE `blade_waybill` (
`escort_name` varchar(100) DEFAULT NULL COMMENT '押运人',
`escort_phone` varchar(50) DEFAULT NULL COMMENT '押运人手机号',
`mileage` decimal(18,2) DEFAULT NULL COMMENT '里程',
`mileage_remark` varchar(200) DEFAULT NULL COMMENT '里程维护备注',
`estimated_start_time` date DEFAULT NULL COMMENT '预计发货日期',
`estimated_end_time` date DEFAULT NULL COMMENT '预计完成日期',
`unit_price` decimal(18,2) DEFAULT NULL COMMENT '单价',
@@ -415,6 +416,7 @@ INSERT IGNORE INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `pa
(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),
(2090000000000000614, 2090000000000000600, 'waybill_manage_mileage', '维护里程', 'waybill_manage_mileage', '', '', 14, 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),
doc/sql/transport/blade_waybill_mileage_remark_20260831.sql
+8
View File
@@ -0,0 +1,8 @@
ALTER TABLE `blade_waybill`
ADD COLUMN `mileage_remark` varchar(200) DEFAULT NULL COMMENT '里程维护备注' AFTER `mileage`;
INSERT INTO `blade_menu`
(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`)
VALUES
(2090000000000000614, 2090000000000000600, 'waybill_manage_mileage', '维护里程', 'waybill_manage_mileage', '', '', 14, 2, 0, 1, NULL, '', 0)
ON DUPLICATE KEY UPDATE `name` = VALUES(`name`), `alias` = VALUES(`alias`), `sort` = VALUES(`sort`), `is_deleted` = 0;