@dazitech/cli 3.0.8 → 3.1.0

package/dist/examples/onto//345/210/251/346/266/246/347/244/272/344/276/213/functions/profit_fn_yoy_analysis.py

@@ -0,0 +1,79 @@
+"""同比分析函数
+
+功能：对比当期与去年同期的利润指标变化
+参数：start_date, end_date
+
+放置：项目/DAZI_TEST/本体/ontos/利润分析示例/functions/profit_fn_yoy_analysis.py
+发布：dazi onto script publish 项目/DAZI_TEST/本体/ontos/利润分析示例/functions/profit_fn_yoy_analysis.py --space space__misc_01 --register-function-id profit.fn.yoy_analysis
+"""
+
+from datetime import datetime, timedelta
+import json
+
+
+def _ontology_fn_body(p):
+    start_date = p.get("start_date", "2025-01-01")
+    end_date = p.get("end_date", datetime.now().strftime("%Y-%m-%d"))
+    
+    start_dt = datetime.strptime(start_date, "%Y-%m-%d")
+    end_dt = datetime.strptime(end_date, "%Y-%m-%d")
+    
+    last_year_start = (start_dt - timedelta(days=365)).strftime("%Y-%m-%d")
+    last_year_end = (end_dt - timedelta(days=365)).strftime("%Y-%m-%d")
+    
+    output.print(f"当期: {start_date} ~ {end_date}")
+    output.print(f"去年同期: {last_year_start} ~ {last_year_end}")
+    
+    def get_period_data(sd, ed):
+        sql = """
+            SELECT 
+                sumIf(amount_signed, account_type='收入') as revenue,
+                sumIf(amount_signed, account_type='成本') as cost,
+                sumIf(amount_signed, account_type='费用') as expense
+            FROM fact_gl_journal_entry
+            WHERE posting_date >= '{sd}' AND posting_date <= '{ed}'
+        """.format(sd=sd, ed=ed)
+        result = p.space.sql.query_one(sql)
+        return {
+            "revenue": result.get("revenue", 0) or 0,
+            "cost": result.get("cost", 0) or 0,
+            "expense": result.get("expense", 0) or 0,
+        }
+    
+    current = get_period_data(start_date, end_date)
+    last_year = get_period_data(last_year_start, last_year_end)
+    
+    current_profit = current["revenue"] - current["cost"] - current["expense"]
+    last_year_profit = last_year["revenue"] - last_year["cost"] - last_year["expense"]
+    
+    def calc_yoy(current, last):
+        if last == 0:
+            return 0 if current == 0 else None
+        return (current - last) / last
+    
+    result = {
+        "period": f"{start_date} ~ {end_date}",
+        "last_year_period": f"{last_year_start} ~ {last_year_end}",
+        "current": {
+            "revenue": round(current["revenue"], 2),
+            "cost": round(current["cost"], 2),
+            "expense": round(current["expense"], 2),
+            "operating_profit": round(current_profit, 2),
+        },
+        "last_year": {
+            "revenue": round(last_year["revenue"], 2),
+            "cost": round(last_year["cost"], 2),
+            "expense": round(last_year["expense"], 2),
+            "operating_profit": round(last_year_profit, 2),
+        },
+        "yoy": {
+            "revenue": round(calc_yoy(current["revenue"], last_year["revenue"]), 4) if calc_yoy(current["revenue"], last_year["revenue"]) is not None else None,
+            "cost": round(calc_yoy(current["cost"], last_year["cost"]), 4) if calc_yoy(current["cost"], last_year["cost"]) is not None else None,
+            "expense": round(calc_yoy(current["expense"], last_year["expense"]), 4) if calc_yoy(current["expense"], last_year["expense"]) is not None else None,
+            "operating_profit": round(calc_yoy(current_profit, last_year_profit), 4) if calc_yoy(current_profit, last_year_profit) is not None else None,
+        },
+    }
+    
+    p.function_result(result)
+
+

package/dist/examples/onto//345/210/251/346/266/246/347/244/272/344/276/213/functions/save_test_arguments.ps1

@@ -0,0 +1,38 @@
+# save_test_arguments.ps1
+# 批量保存各函数的 test_arguments
+# 用法：在 dazi-work 根目录执行 .\项目\DAZI_TEST\本体\ontos\利润分析示例\functions\save_test_arguments.ps1
+
+$spaceId = "space__misc_01"
+$itemPath = "项目/DAZI_TEST/本体/ontos/利润分析示例/functions"
+
+$functions = @(
+    @{fn_id="profit.fn.get_summary"; file="profit.fn.get_summary.json"},
+    @{fn_id="profit.fn.yoy_analysis"; file="profit.fn.yoy_analysis.json"},
+    @{fn_id="profit.fn.mom_analysis"; file="profit.fn.mom_analysis.json"},
+    @{fn_id="profit.fn.budget_vs_actual"; file="profit.fn.budget_vs_actual.json"},
+    @{fn_id="profit.fn.account_breakdown"; file="profit.fn.account_breakdown.json"},
+    @{fn_id="profit.fn.cost_center_profit"; file="profit.fn.cost_center_profit.json"},
+    @{fn_id="profit.fn.top_accounts"; file="profit.fn.top_accounts.json"}
+)
+
+Write-Host "获取函数列表..."
+$fnList = & dazi onto function list --space $spaceId 2>$null
+
+foreach ($fn in $functions) {
+    $fnId = $fn.fn_id
+    $fileName = $fn.file
+    $jsonPath = "$PSScriptRoot/test_arguments/$fileName"
+
+    $ofnId = $fnList | Where-Object { $_ -match $fnId } | ForEach-Object {
+        if ($_ -match 'id:\s*(\S+)') { $matches[1] }
+    }
+    
+    if ($ofnId) {
+        Write-Host "保存 $fnId (ofnId=$ofnId)..."
+        & dazi onto function save-test-arguments $ofnId --space $spaceId --arguments-json-file $jsonPath
+    } else {
+        Write-Host "函数 $fnId 未找到，请先发布函数"
+    }
+}
+
+Write-Host "完成"

package/dist/examples/onto//345/210/251/346/266/246/347/244/272/344/276/213/functions/test_arguments/profit.fn.account_breakdown.json

@@ -0,0 +1 @@
+{"v":1,"meta":{"last_source":"admin_panel","last_saved_at":"2026-06-06T01:00:00.000000+00:00","last_input_shape":"json"},"arguments":{"start_date":"2025-01-01","end_date":"2026-06-30","account_type":"收入"},"object_type_code":"Account"}

package/dist/examples/onto//345/210/251/346/266/246/347/244/272/344/276/213/functions/test_arguments/profit.fn.budget_vs_actual.json

@@ -0,0 +1 @@
+{"v":1,"meta":{"last_source":"admin_panel","last_saved_at":"2026-06-06T01:00:00.000000+00:00","last_input_shape":"json"},"arguments":{"start_date":"2025-01-01","end_date":"2026-06-30"},"object_type_code":"BudgetAnalysis"}

package/dist/examples/onto//345/210/251/346/266/246/347/244/272/344/276/213/functions/test_arguments/profit.fn.cost_center_profit.json

@@ -0,0 +1 @@
+{"v":1,"meta":{"last_source":"admin_panel","last_saved_at":"2026-06-06T01:00:00.000000+00:00","last_input_shape":"json"},"arguments":{"start_date":"2025-01-01","end_date":"2026-06-30"},"object_type_code":"CostCenter"}

package/dist/examples/onto//345/210/251/346/266/246/347/244/272/344/276/213/functions/test_arguments/profit.fn.get_summary.json

@@ -0,0 +1 @@
+{"v":1,"meta":{"last_source":"admin_panel","last_saved_at":"2026-06-06T01:00:00.000000+00:00","last_input_shape":"json"},"arguments":{"start_date":"2025-01-01","end_date":"2026-06-30"},"object_type_code":"ProfitAnalysis"}

package/dist/examples/onto//345/210/251/346/266/246/347/244/272/344/276/213/functions/test_arguments/profit.fn.mom_analysis.json

@@ -0,0 +1 @@
+{"v":1,"meta":{"last_source":"admin_panel","last_saved_at":"2026-06-06T01:00:00.000000+00:00","last_input_shape":"json"},"arguments":{"start_date":"2025-01-01","end_date":"2026-06-30"},"object_type_code":"ProfitAnalysis"}

package/dist/examples/onto//345/210/251/346/266/246/347/244/272/344/276/213/functions/test_arguments/profit.fn.top_accounts.json

@@ -0,0 +1 @@
+{"v":1,"meta":{"last_source":"admin_panel","last_saved_at":"2026-06-06T01:00:00.000000+00:00","last_input_shape":"json"},"arguments":{"start_date":"2025-01-01","end_date":"2026-06-30","limit":10},"object_type_code":"Account"}

package/dist/examples/onto//345/210/251/346/266/246/347/244/272/344/276/213/functions/test_arguments/profit.fn.yoy_analysis.json

@@ -0,0 +1 @@
+{"v":1,"meta":{"last_source":"admin_panel","last_saved_at":"2026-06-06T01:00:00.000000+00:00","last_input_shape":"json"},"arguments":{"start_date":"2025-01-01","end_date":"2026-06-30"},"object_type_code":"ProfitAnalysis"}

package/dist/examples/onto//345/210/251/346/266/246/347/244/272/344/276/213/setup/profit_category_mount.py

@@ -0,0 +1,85 @@
+"""利润分析本体 — 平台分类挂载（CATEGORY_REGISTRY）
+
+与灌数脚本类似，**独立步骤、放在实施流程最后**：
+init → seed → 发布全部函数 → **本脚本**。
+
+放置：资源/examples/onto/利润示例/setup/profit_category_mount.py
+发布：dazi onto script publish <item-path>/setup/profit_category_mount.py --space <space-id> --type setup
+规划对照：资源/docs/onto/规划示例_利润分析本体方案.md 附录 B
+"""
+
+import json
+
+# 与规划附录 B 一一对应；category 值必须是平台标准分类中文名
+CATEGORY_REGISTRY = {
+    "table": {
+        "维度表": ["dim_account", "dim_cost_center"],
+        "事实表": ["fact_gl_journal_entry", "fact_budget_entry"],
+    },
+    "cube": {
+        "流程型": ["ActualCube", "BudgetCube"],
+        "主体型": ["AccountActualCube", "CostCenterActualCube", "TimeActualCube"],
+    },
+    "object": {
+        "主数据": ["Account", "CostCenter"],
+        "事务": ["JournalEntry", "BudgetLine"],
+        "分析": ["ProfitAnalysis", "BudgetAnalysis"],
+    },
+    "relation": {
+        "时间关联": [
+            ("fact_gl_journal_entry", "dim_date"),
+            ("fact_budget_entry", "dim_date"),
+        ],
+        "主数据关联": [
+            ("fact_gl_journal_entry", "dim_account"),
+            ("fact_gl_journal_entry", "dim_cost_center"),
+            ("fact_budget_entry", "dim_account"),
+            ("fact_budget_entry", "dim_cost_center"),
+        ],
+        "层级自关联": [("dim_account", "dim_account")],
+    },
+    "link": {
+        "归属关系": [
+            "entry_belongs_account",
+            "entry_belongs_cost_center",
+            "budget_for_account",
+            "budget_for_cost_center",
+        ],
+        "分析归因": [
+            "analysis_by_account",
+            "analysis_by_cost_center",
+            "account_contributes_profit",
+            "cost_center_contributes_profit",
+        ],
+        "层级关系": ["account_has_parent"],
+        "对比关系": ["budget_compared_to_actual"],
+    },
+    "function": {
+        "总览分析": ["profit.fn.get_summary"],
+        "趋势分析": ["profit.fn.yoy_analysis", "profit.fn.mom_analysis"],
+        "结构分析": ["profit.fn.account_breakdown", "profit.fn.top_accounts"],
+        "预实分析": ["profit.fn.budget_vs_actual"],
+        "组织分析": ["profit.fn.cost_center_profit"],
+    },
+}
+
+
+def main():
+    space_id = "space__misc_01"
+    s = space.get(space_id)
+
+    output.print("=== 利润分析 — 平台分类挂载 ===")
+    output.print(f"空间: {space_id}")
+
+    cat_counts = s.categories.apply_registry(CATEGORY_REGISTRY, skip_missing=True)
+    for kind, cnt in cat_counts.items():
+        if cnt:
+            output.print(f"OK 分类[{kind}] 挂载 {cnt} 项")
+
+    summary = {
+        "ok": True,
+        "space_id": space_id,
+        "category_mounts": cat_counts,
+    }
+    output.success("平台分类挂载完成")
+    output.print("__JSON_SUMMARY__" + json.dumps(summary, ensure_ascii=True, default=str))

package/dist/examples/onto//345/210/251/346/266/246/347/244/272/344/276/213/setup/profit_ontology_init.py

@@ -1,32 +1,122 @@
-"""利润分析本体初始化脚本 — space__zlj
+"""利润分析本体初始化脚本 — space__misc_01
 
 初始化内容：
-1. 创建物理表（4 张：科目表、成本中心维表、实际分录表、预算表）
-2. 注册表到空间
-3. 注册表间关系（6 条）
-4. 注册 Cube（5 个）及派生度量
-5. 定义对象类型（6 种）、绑定数据源、属性、链接
+1. 创建物理表（科目表、成本中心维表、实际分录表、预算表）
+2. 注册表到空间（含 display_name / description）
+3. 注册表间关系（7条）
+4. 注册Cube（5个）及派生度量
+5. 定义对象类型（6种）、绑定数据源、属性、链接
 6. 同步指标引用
+7. 平台分类挂载见 profit_category_mount.py（init/seed/函数 publish 之后执行）
 
-放置：项目/潘达石化/本体/ontos/利润分析本体方案/setup/profit_ontology_init.py
-发布：dazi onto script publish 项目/潘达石化/本体/ontos/利润分析本体方案/setup/profit_ontology_init.py --space space__zlj --type setup
+放置：资源/examples/onto/利润示例/setup/profit_ontology_init.py（复制到项目 ontos/<实现名>/setup/）
+发布：dazi onto script publish <item-path>/setup/profit_ontology_init.py --space <space-id> --type setup
+规划对照：资源/docs/onto/规划示例_利润分析本体方案.md
 """
 
 import json
 
+# 与 规划示例_利润分析本体方案.md §2.3、§3.x 对齐：display_name=侧栏显示名，description=业务说明
+TABLE_REGISTRY = {
+    "dim_account": {
+        "display_name": "科目维表",
+        "description": "会计科目主数据",
+        "columns": [
+            {"name": "account_id", "display_name": "科目 ID", "description": "主键"},
+            {"name": "account_code", "display_name": "科目编码"},
+            {"name": "account_name", "display_name": "科目名称"},
+            {"name": "account_type", "display_name": "科目类型", "description": "资产/负债/权益/收入/成本/费用"},
+            {"name": "pl_category", "display_name": "损益大类"},
+            {"name": "parent_account_id", "display_name": "上级科目"},
+            {"name": "account_level", "display_name": "层级"},
+            {"name": "is_leaf", "display_name": "末级"},
+            {"name": "normal_balance", "display_name": "余额方向", "description": "借/贷"},
+            {"name": "status", "display_name": "状态", "description": "启用/停用"},
+            {"name": "created_at", "display_name": "创建时间"},
+        ],
+    },
+    "dim_cost_center": {
+        "display_name": "成本中心维表",
+        "description": "组织/利润中心主数据",
+        "columns": [
+            {"name": "cost_center_id", "display_name": "成本中心 ID", "description": "主键"},
+            {"name": "cost_center_code", "display_name": "编码"},
+            {"name": "cost_center_name", "display_name": "名称"},
+            {"name": "department", "display_name": "部门"},
+            {"name": "company_code", "display_name": "公司代码"},
+            {"name": "profit_center", "display_name": "利润中心"},
+            {"name": "status", "display_name": "状态"},
+            {"name": "created_at", "display_name": "创建时间"},
+        ],
+    },
+    "fact_gl_journal_entry": {
+        "display_name": "总账实际分录",
+        "description": "凭证行粒度损益流水",
+        "columns": [
+            {"name": "entry_id", "display_name": "凭证 ID"},
+            {"name": "line_id", "display_name": "凭证行 ID"},
+            {"name": "date_key", "display_name": "日期键", "description": "关联 dim_date，YYYYMMDD"},
+            {"name": "posting_date", "display_name": "记账日期"},
+            {"name": "fiscal_year", "display_name": "会计年度"},
+            {"name": "fiscal_period", "display_name": "会计期间"},
+            {"name": "account_id", "display_name": "科目 ID", "description": "关联 dim_account"},
+            {"name": "account_code", "display_name": "科目编码", "description": "冗余"},
+            {"name": "account_name", "display_name": "科目名称", "description": "冗余"},
+            {"name": "account_type", "display_name": "科目类型", "description": "冗余"},
+            {"name": "pl_category", "display_name": "损益大类", "description": "冗余"},
+            {"name": "account_level", "display_name": "科目层级", "description": "冗余"},
+            {"name": "cost_center_id", "display_name": "成本中心 ID", "description": "关联 dim_cost_center"},
+            {"name": "cost_center_name", "display_name": "成本中心", "description": "冗余"},
+            {"name": "department", "display_name": "部门", "description": "冗余"},
+            {"name": "profit_center", "display_name": "利润中心", "description": "冗余"},
+            {"name": "debit_amount", "display_name": "借方"},
+            {"name": "credit_amount", "display_name": "贷方"},
+            {"name": "amount_signed", "display_name": "损益金额", "description": "收入为正、成本费用为负"},
+            {"name": "currency", "display_name": "币种"},
+            {"name": "voucher_no", "display_name": "凭证号"},
+            {"name": "source_system", "display_name": "来源系统"},
+            {"name": "description", "display_name": "摘要", "description": "凭证行摘要文本"},
+            {"name": "created_at", "display_name": "创建时间"},
+        ],
+    },
+    "fact_budget_entry": {
+        "display_name": "预算明细",
+        "description": "预算行粒度编制数据",
+        "columns": [
+            {"name": "budget_id", "display_name": "预算批次"},
+            {"name": "line_id", "display_name": "预算行 ID"},
+            {"name": "date_key", "display_name": "日期键", "description": "关联 dim_date"},
+            {"name": "budget_version", "display_name": "预算版本"},
+            {"name": "fiscal_year", "display_name": "预算年度"},
+            {"name": "fiscal_period", "display_name": "预算期间", "description": "1-12"},
+            {"name": "account_id", "display_name": "科目 ID", "description": "关联 dim_account"},
+            {"name": "account_code", "display_name": "科目编码", "description": "冗余"},
+            {"name": "account_name", "display_name": "科目名称", "description": "冗余"},
+            {"name": "account_type", "display_name": "科目类型", "description": "冗余"},
+            {"name": "pl_category", "display_name": "损益大类", "description": "冗余"},
+            {"name": "cost_center_id", "display_name": "成本中心 ID", "description": "关联 dim_cost_center"},
+            {"name": "cost_center_name", "display_name": "成本中心", "description": "冗余"},
+            {"name": "department", "display_name": "部门", "description": "冗余"},
+            {"name": "budget_amount", "display_name": "预算金额"},
+            {"name": "currency", "display_name": "币种"},
+            {"name": "status", "display_name": "状态", "description": "草稿/已发布"},
+            {"name": "created_at", "display_name": "创建时间"},
+        ],
+    },
+}
 
 def main():
-    space_id = "space__zlj"
+    space_id = "space__misc_01"
     s = space.get(space_id)
 
     output.print("=== 利润分析本体初始化 ===")
     output.print(f"空间: {space_id}")
 
     # 1. 创建物理表
-    output.print("\n[1/9] 创建物理表...")
+    output.print("\n[1/10] 创建物理表...")
 
     s.sql.execute("""
-        CREATE TABLE IF NOT EXISTS account_master (
+        CREATE TABLE IF NOT EXISTS dim_account (
             account_id String,
             account_code String,
             account_name String,
@@ -41,10 +131,10 @@ def main():
         ) ENGINE = MergeTree()
         ORDER BY (account_code)
     """)
-    output.print("OK account_master")
+    output.print("OK dim_account")
 
     s.sql.execute("""
-        CREATE TABLE IF NOT EXISTS cost_center_dimension (
+        CREATE TABLE IF NOT EXISTS dim_cost_center (
             cost_center_id String,
             cost_center_code String,
             cost_center_name String,
@@ -56,12 +146,13 @@ def main():
         ) ENGINE = MergeTree()
         ORDER BY (cost_center_id)
     """)
-    output.print("OK cost_center_dimension")
+    output.print("OK dim_cost_center")
 
     s.sql.execute("""
-        CREATE TABLE IF NOT EXISTS actual_journal_entry (
+        CREATE TABLE IF NOT EXISTS fact_gl_journal_entry (
             entry_id String,
             line_id String,
+            date_key Int32,
             posting_date Date,
             fiscal_year Int32,
             fiscal_period Int32,
@@ -84,14 +175,15 @@ def main():
             description String,
             created_at DateTime DEFAULT now()
         ) ENGINE = MergeTree()
-        ORDER BY (posting_date, entry_id, line_id)
+        ORDER BY (date_key, entry_id, line_id)
     """)
-    output.print("OK actual_journal_entry")
+    output.print("OK fact_gl_journal_entry")
 
     s.sql.execute("""
-        CREATE TABLE IF NOT EXISTS budget_entry (
+        CREATE TABLE IF NOT EXISTS fact_budget_entry (
             budget_id String,
             line_id String,
+            date_key Int32,
             budget_version String,
             fiscal_year Int32,
             fiscal_period Int32,
@@ -110,88 +202,91 @@ def main():
         ) ENGINE = MergeTree()
         ORDER BY (fiscal_year, fiscal_period, account_id, line_id)
     """)
-    output.print("OK budget_entry")
-
-    # 2. 注册表
-    output.print("\n[2/9] 注册表到空间...")
-
-    for tbl, label in [
-        ("account_master", "会计科目主数据表"),
-        ("cost_center_dimension", "成本中心维表"),
-        ("actual_journal_entry", "实际分录事实表"),
-        ("budget_entry", "预算事实表"),
-    ]:
-        s.tables.register(tbl, label=label)
-        s.tables.sync_columns(tbl)
-        output.print(f"OK {tbl}")
+    output.print("OK fact_budget_entry")
+
+    # 2. 注册表（含 display_name / description）
+    output.print("\n[2/10] 注册表到空间...")
+
+    for tbl_name, meta in TABLE_REGISTRY.items():
+        s.tables.register_with_meta(
+            table_name=tbl_name,
+            display_name=meta["display_name"],
+            description=meta.get("description"),
+            columns=meta["columns"],
+            force_column_meta=True,
+        )
+        output.print(f"OK {tbl_name} ({meta['display_name']})")
 
     # 3. 注册表间关系
-    output.print("\n[3/9] 注册表间关系...")
+    output.print("\n[3/10] 注册表间关系...")
 
     table_relationships = [
         {
-            "from_table": "actual_journal_entry",
-            "to_table": "account_master",
-            "join_sql": "actual_journal_entry.account_id = account_master.account_id",
+            "from_table": "fact_gl_journal_entry",
+            "to_table": "dim_date",
+            "join_sql": "fact_gl_journal_entry.date_key = dim_date.date_key",
+            "join_keys": [{"from": "date_key", "to": "date_key"}],
+            "relationship_type": "many_to_one",
+            "description": "分录关联日历",
+        },
+        {
+            "from_table": "fact_budget_entry",
+            "to_table": "dim_date",
+            "join_sql": "fact_budget_entry.date_key = dim_date.date_key",
+            "join_keys": [{"from": "date_key", "to": "date_key"}],
+            "relationship_type": "many_to_one",
+            "description": "预算关联日历",
+        },
+        {
+            "from_table": "fact_gl_journal_entry",
+            "to_table": "dim_account",
+            "join_sql": "fact_gl_journal_entry.account_id = dim_account.account_id",
             "join_keys": [{"from": "account_id", "to": "account_id"}],
             "relationship_type": "many_to_one",
             "description": "实际分录关联会计科目",
         },
         {
-            "from_table": "actual_journal_entry",
-            "to_table": "cost_center_dimension",
-            "join_sql": "actual_journal_entry.cost_center_id = cost_center_dimension.cost_center_id",
+            "from_table": "fact_gl_journal_entry",
+            "to_table": "dim_cost_center",
+            "join_sql": "fact_gl_journal_entry.cost_center_id = dim_cost_center.cost_center_id",
             "join_keys": [{"from": "cost_center_id", "to": "cost_center_id"}],
             "relationship_type": "many_to_one",
             "description": "实际分录关联成本中心",
         },
         {
-            "from_table": "budget_entry",
-            "to_table": "account_master",
-            "join_sql": "budget_entry.account_id = account_master.account_id",
+            "from_table": "fact_budget_entry",
+            "to_table": "dim_account",
+            "join_sql": "fact_budget_entry.account_id = dim_account.account_id",
             "join_keys": [{"from": "account_id", "to": "account_id"}],
             "relationship_type": "many_to_one",
             "description": "预算关联会计科目",
         },
         {
-            "from_table": "budget_entry",
-            "to_table": "cost_center_dimension",
-            "join_sql": "budget_entry.cost_center_id = cost_center_dimension.cost_center_id",
+            "from_table": "fact_budget_entry",
+            "to_table": "dim_cost_center",
+            "join_sql": "fact_budget_entry.cost_center_id = dim_cost_center.cost_center_id",
             "join_keys": [{"from": "cost_center_id", "to": "cost_center_id"}],
             "relationship_type": "many_to_one",
             "description": "预算关联成本中心",
         },
         {
-            "from_table": "account_master",
-            "to_table": "account_master",
-            "join_sql": "account_master.parent_account_id = account_master.account_id",
+            "from_table": "dim_account",
+            "to_table": "dim_account",
+            "join_sql": "dim_account.parent_account_id = dim_account.account_id",
             "join_keys": [{"from": "parent_account_id", "to": "account_id"}],
             "relationship_type": "many_to_one",
             "description": "科目上级（树形）",
         },
-        {
-            "from_table": "budget_entry",
-            "to_table": "actual_journal_entry",
-            "join_sql": "budget_entry.account_id = actual_journal_entry.account_id AND budget_entry.cost_center_id = actual_journal_entry.cost_center_id AND budget_entry.fiscal_year = actual_journal_entry.fiscal_year AND budget_entry.fiscal_period = actual_journal_entry.fiscal_period",
-            "join_keys": [
-                {"from": "account_id", "to": "account_id"},
-                {"from": "cost_center_id", "to": "cost_center_id"},
-                {"from": "fiscal_year", "to": "fiscal_year"},
-                {"from": "fiscal_period", "to": "fiscal_period"},
-            ],
-            "relationship_type": "many_to_one",
-            "description": "预算与实际同维对齐",
-        },
     ]
     for rel in table_relationships:
         rid = s.tables.add_relationship(**rel)
-        output.print(f"OK {rel['from_table']} -> {rel['to_table']} ({rid})")
+        output.print(f"OK {rel['from_table']} -> {rel['to_table']}")
 
     # 4. 注册 Cube
-    output.print("\n[4/9] 注册 Cube...")
+    output.print("\n[4/10] 注册 Cube...")
 
-    actual = "actual_journal_entry"
-    budget = "budget_entry"
+    actual = "fact_gl_journal_entry"
+    budget = "fact_budget_entry"
 
     s.register_cube(
         name="ActualCube",
@@ -206,6 +301,7 @@ def main():
         dimensions=[
             {"name": "entry_id", "col": "entry_id", "type": "string", "title": "凭证ID"},
             {"name": "line_id", "col": "line_id", "type": "string", "title": "行ID"},
+            {"name": "date_key", "col": "date_key", "type": "int", "title": "日期键"},
             {"name": "posting_date", "col": "posting_date", "type": "date", "title": "记账日期"},
             {"name": "fiscal_year", "col": "fiscal_year", "type": "int", "title": "会计年度"},
             {"name": "fiscal_period", "col": "fiscal_period", "type": "int", "title": "会计期间"},
@@ -294,17 +390,16 @@ def main():
             {"name": "line_count", "col": "line_id", "agg": "count", "title": "分录行数"},
         ],
         dimensions=[
+            {"name": "date_key", "col": "date_key", "type": "int", "title": "日期键"},
             {"name": "posting_date", "col": "posting_date", "type": "date", "title": "记账日期"},
             {"name": "fiscal_year", "col": "fiscal_year", "type": "int", "title": "会计年度"},
             {"name": "fiscal_period", "col": "fiscal_period", "type": "int", "title": "会计期间"},
-            {"name": "year_month", "col": "posting_date", "type": "string", "title": "年月"},
-            {"name": "quarter", "col": "posting_date", "type": "string", "title": "季度"},
         ],
     )
     output.print("OK TimeActualCube")
 
     # 5. 派生度量
-    output.print("\n[5/9] 配置派生度量...")
+    output.print("\n[5/10] 配置派生度量...")
 
     def _pl_measures(cube_name, full=False):
         base = [
@@ -375,7 +470,7 @@ def main():
     output.print("OK 派生度量")
 
     # 6. 对象类型
-    output.print("\n[6/9] 定义对象类型...")
+    output.print("\n[6/10] 定义对象类型...")
 
     object_types = [
         ("Account", "会计科目", "会计科目业务对象"),
@@ -390,7 +485,7 @@ def main():
         output.print(f"OK {code}")
 
     # 7. 绑定数据源
-    output.print("\n[7/9] 绑定数据源...")
+    output.print("\n[7/10] 绑定数据源...")
 
     bindings = [
         ("Account", "AccountActualCube"),
@@ -405,7 +500,7 @@ def main():
         output.print(f"OK {obj} -> {cube}")
 
     # 8. 属性
-    output.print("\n[8/9] 定义属性...")
+    output.print("\n[8/10] 定义属性...")
 
     def define_props(obj_code, props):
         for code, name, role, qn in props:
@@ -478,7 +573,7 @@ def main():
     output.print("OK BudgetAnalysis 属性 (6)")
 
     # 9. 链接类型
-    output.print("\n[9/9] 定义链接与同步指标...")
+    output.print("\n[9/10] 定义链接与同步指标...")
 
     link_types = [
         ("entry_belongs_account", "分录归属科目", "JournalEntry", "Account", "分录行对应科目"),
@@ -509,7 +604,7 @@ def main():
         "ok": True,
         "space_id": space_id,
         "tables": 4,
-        "table_relationships": 6,
+        "table_relationships": 7,
         "cubes": 5,
         "object_types": 6,
         "properties": 42,
@@ -518,4 +613,4 @@ def main():
 
     output.print("\n=== 利润分析本体初始化完成 ===")
     output.success("初始化成功")
-    output.print("__JSON_SUMMARY__" + json.dumps(summary, ensure_ascii=True, default=str))
+    output.print("__JSON_SUMMARY__" + json.dumps(summary, ensure_ascii=True, default=str))