java-project/baiyue-firstleg
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source 
# Conflicts:
#	deploy/sql/头程数据库统一增量-MySQL8.sql
This commit is contained in:
liuyihe
2026-08-13 09:51:02 +08:00
parent 74edf76e72 95849f248f
commit 43bbd9c1e8
69 changed files with 1224 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deploy/sql/头程数据库统一增量-MySQL8.sql
+21 -4
View File
@@ -847,6 +847,22 @@ CREATE TABLE IF NOT EXISTS wh_express_company (
KEY idx_wh_express_tenant_status (tenant_id, status, deleted)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='平台公共快递公司主数据，固定归属 tenant_id=0';
-- 开发/测试环境公共快递基线：供订单履约快递选择和人工验收使用。
INSERT INTO wh_express_company (
id, tenant_id, company_code, company_name, service_phone, website,
tracking_url_template, status, remark, created_by, updated_by, deleted, version
) VALUES (
191000000000000101, 0, 'EXP-TEST', 'IT 测试快递', '400-000-0000', NULL,
NULL, 'ACTIVE', '统一初始化测试基线', 1000001, 1000001, 0, 0
)
ON DUPLICATE KEY UPDATE
tenant_id = VALUES(tenant_id),
company_name = VALUES(company_name),
service_phone = VALUES(service_phone),
status = 'ACTIVE',
remark = VALUES(remark),
deleted = 0;
-- ============================================================================
-- 来源：firstleg\src\main\resources\db\firstleg.sql
-- ============================================================================
@@ -5132,8 +5148,7 @@ BEGIN
DECLARE current_plan_status VARCHAR(24);
SELECT MAX(plan_status) INTO current_plan_status
FROM fl_loading_plan WHERE container_booking_id = OLD.id;
IF current_plan_status = 'COMPLETED'
AND NEW.document_type NOT IN ('DESTINATION_CLEARANCE', 'CUSTOMS_DECLARATION') THEN
IF current_plan_status = 'COMPLETED' THEN
SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = '装柜完成后货柜全部只读，不允许修改';
END IF;
IF current_plan_status = 'LOADING' AND (
@@ -5483,7 +5498,7 @@ BEGIN
SELECT MAX(plan_status) INTO current_plan_status FROM fl_loading_plan
WHERE container_booking_id = NEW.container_booking_id;
IF current_plan_status = 'COMPLETED'
AND OLD.document_type NOT IN ('DESTINATION_CLEARANCE', 'CUSTOMS_DECLARATION') THEN
AND NEW.document_type NOT IN ('DESTINATION_CLEARANCE', 'CUSTOMS_DECLARATION') THEN
SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = '装柜完成后货柜文件不可新增';
END IF;
END$$
@@ -5498,7 +5513,8 @@ BEGIN
DECLARE current_plan_status VARCHAR(24);
SELECT MAX(plan_status) INTO current_plan_status FROM fl_loading_plan
WHERE container_booking_id = OLD.container_booking_id;
IF current_plan_status = 'COMPLETED' THEN
IF current_plan_status = 'COMPLETED'
AND OLD.document_type NOT IN ('DESTINATION_CLEARANCE', 'CUSTOMS_DECLARATION') THEN
SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = '装柜完成后货柜文件不可修改';
END IF;
END$$
@@ -14435,5 +14451,6 @@ ALTER TABLE baiyue_order.ord_order_cargo
MODIFY COLUMN gross_weight_kg DECIMAL(18,3) NULL COMMENT '毛重（千克）；草稿可空，提交前必须大于0',
MODIFY COLUMN volume_cbm DECIMAL(18,4) NULL COMMENT '体积（立方米）；草稿可空，提交前必须大于0';
-- 新完成入库记录使用 WAIT_SPLIT；存量 INBOUNDED 继续作为可分柜兼容状态，统一迁移不改写主表或历史状态。
SELECT 'PASS' AS migration_status,
'统一增量全部执行完成；父子订单、履约分片、装柜门禁、订舱拖车、报关船期、船司查询、仓库角色、费用、Finance人工财务、公共资源及可靠审计结构校验通过' AS message;