1、完善发货模板

2、完善运输计划
3、完善运单管理
This commit is contained in:
2026-08-05 15:51:44 +08:00
parent d47d6b4b23
commit 58726a675e
18 changed files with 544 additions and 35 deletions

View File

@@ -245,8 +245,8 @@ 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 '里程',
`estimated_start_time` datetime DEFAULT NULL COMMENT '预计发货时间',
`estimated_end_time` datetime 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 '单价',
`price_unit` varchar(50) DEFAULT NULL COMMENT '计价单位',
`other_fee_total` decimal(18,2) DEFAULT NULL COMMENT '其他费用合计',

View File

@@ -0,0 +1,3 @@
ALTER TABLE `blade_waybill`
MODIFY COLUMN `estimated_start_time` date DEFAULT NULL COMMENT '预计发货日期',
MODIFY COLUMN `estimated_end_time` date DEFAULT NULL COMMENT '预计完成日期';

View File

@@ -0,0 +1,33 @@
CREATE TABLE IF NOT EXISTS `blade_waybill_import_batch` (
`id` bigint NOT NULL,
`tenant_id` varchar(12) NOT NULL DEFAULT '000000',
`batch_no` varchar(64) NOT NULL COMMENT '运单批次号',
`project_id` bigint DEFAULT NULL,
`project_name` varchar(200) DEFAULT NULL,
`customer_name` varchar(200) DEFAULT NULL,
`contract_id` bigint DEFAULT NULL,
`contract_name` varchar(200) DEFAULT NULL,
`carrier_type` varchar(32) DEFAULT NULL,
`carrier_ids` varchar(1000) DEFAULT NULL,
`carrier_name` varchar(500) DEFAULT NULL,
`import_type` varchar(32) NOT NULL COMMENT 'waybill/settlement',
`import_status` varchar(32) NOT NULL COMMENT 'draft/processing/completed',
`plan_id` bigint DEFAULT NULL,
`plan_name` varchar(200) DEFAULT NULL,
`waybill_count` int NOT NULL DEFAULT 0,
`remark` varchar(500) DEFAULT NULL,
`create_user` bigint DEFAULT NULL,
`create_dept` bigint DEFAULT NULL,
`create_time` datetime DEFAULT NULL,
`update_user` bigint DEFAULT NULL,
`update_time` datetime DEFAULT NULL,
`status` tinyint NOT NULL DEFAULT 1,
`is_deleted` tinyint NOT NULL DEFAULT 0,
PRIMARY KEY (`id`),
UNIQUE KEY `uk_waybill_import_batch_no` (`tenant_id`,`batch_no`),
KEY `idx_waybill_import_batch_project` (`project_id`),
KEY `idx_waybill_import_batch_create_time` (`create_time`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='运单批量导入批次记录';
ALTER TABLE `blade_waybill` ADD COLUMN `import_batch_id` bigint DEFAULT NULL COMMENT '运单导入批次ID';
ALTER TABLE `blade_waybill` ADD KEY `idx_waybill_import_batch_id` (`import_batch_id`);

View File

@@ -20,8 +20,8 @@ ALTER TABLE `blade_waybill`
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 `estimated_start_time` date DEFAULT NULL COMMENT '预计发货日期' AFTER `mileage`,
ADD COLUMN `estimated_end_time` date 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`,