Merge remote-tracking branch 'origin/sub_laptop_4' into sub_desktop_1

B09_Estimation/B09_Estimation_Router.py

@@ -35,7 +35,7 @@ from B09_Estimation.B09_Estimation_Calc_Labor import compute_labor, daega_price
 from B09_Estimation.B09_Estimation_Calc_Total import compute_total
 from B09_Estimation.B09_Estimation_Labor_Source import daega_inputs
 from B09_Estimation.B09_Estimation_Linked import linked_resource_keys
-from B09_Estimation.B09_Estimation_Rates import rate_candidates
+from B09_Estimation.B09_Estimation_Rates import rate_candidates, rate_table
 from B09_Estimation.B09_Estimation_Summary import compute_summary, hopyo_lines
 
 router = APIRouter(prefix="/api/projects", tags=["B09 Estimation"])
@@ -71,8 +71,10 @@ def compute_sheets(root: Path, inputs: dict[str, Any], user: dict[str, Any]) ->
     sheets.update(sg)
     sheets.update({k: v for k, v in labor.items() if k != "gaps"})
     sheets["gaps"] = [*sheets["gaps"], *sg["sg_gaps"], *labor["gaps"]]
-    # 145-4 총괄 · 원가계산서 = 설계내역서 비목 합(145-3 `bill.sums`) + 사용자 요율 · 손입력
-    sheets["total"] = compute_total((sheets.get("bill") or {}).get("sums"), user.get("estimate"))
+    # 145-4 총괄 · 원가계산서 = 설계내역서 비목 합(145-3 `bill.sums`) + 요율(사용자 ?? 자동 166-1) · 손입력
+    sheets["total"] = compute_total(
+        (sheets.get("bill") or {}).get("sums"), user.get("estimate"), rate_table()
+    )
     return sheets
 
 
@@ -105,6 +107,7 @@ async def payload(project_id: UUID, root: Path) -> dict[str, Any]:
         "book": {"made": book.get("made")} if book else None,
         "sheets": sheets,
         "rate_candidates": rate_candidates(),
+        "rate_table": rate_table(),
         "notes": notes,
         # 집계표 넷 = 서버 단독(145-5) — 짝 셈 결과를 역전개 · 조작 중엔 안 바뀜
         "summary": compute_summary(sheets, hopyo_lines(sheets)),