refactor(841-1): B09 재료 관급 · 별도 = M02 자재표시 — A 걸음 이어서

- 대가 · 산근 재료 줄 = M02 자재표시(기본 별도계상 · 관급) → 대가 · 산근 안 0 원(M02 셈과 같음) · % 덧줄 밑수는 엔진 값 그대로
- 자재단가대비표 기본 표시 = M02 자재표시(사용자 표시가 앞섬 · 「사급」 = 기본 끔 · 칸 누름 차례 관급 → 별도 → 사급)
- 4 자재대 · 관급자재대 수량 = 대가 · 산근 밖 재료 역전개 수량(aside_qty) · 집계표에서 겹침 0
- 새 파일 B09_Estimation_Supply.py(표시 함수 · Router 700 줄 막음)
- 견본 대가 = M02 반영합(1,527,221 · 1,267,314) · 전후 표 tmp/841_1/전후표.md

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
2026-11-15 15:50:56 +09:00
co-authored by Claude Opus 5.5
parent f2d51252a0
commit 30c062bd48
13 changed files with 131 additions and 23 deletions
+10 -2
View File
@@ -93,7 +93,13 @@ from B09_Estimation.B09_Estimation_Rates import rate_candidates, rate_table
from B09_Estimation.B09_Estimation_Router_Import import router as import_router
from B09_Estimation.B09_Estimation_Router_Link import router as link_router
from B09_Estimation.B09_Estimation_Router_Quotes import router as quotes_router
from B09_Estimation.B09_Estimation_Summary import compute_summary, hopyo_lines, used_materials
from B09_Estimation.B09_Estimation_Summary import (
compute_summary,
hopyo_lines,
totals,
used_materials,
)
from B09_Estimation.B09_Estimation_Supply import supply_defaults
from common_util.common_util_auth import verify_session
from common_util.common_util_project_settings import reset_section
from common_util.common_util_storage import resolve_stored_project_path
@@ -159,8 +165,9 @@ def compute_sheets(
화면 짝 = `B09_Estimation_UI_Shell.computeSheets`(산근만 서버 답 그대로) ·
memo = 두 번 셈의 앞 산근 풀이(`Sangeun.collect`)."""
supply = supply_defaults(inputs, user)
base = compute_base(inputs, user)
sg = sangeun.build(root, user, memo) # 145-1 — M02 엔진 값으로 풀이(841-1 · + 166-2 손 줄 로직)
sg = sangeun.build(root, user, memo, supply) # 145-1 M02 엔진 값으로 풀이(841-1 · 166-2 손 줄)
sg = sg_cover.cover_sangeun(sg, user.get("sg_cover")) # 719-3 이 공사 산근 고친 칸
by_key = {row["key"]: row for row in sg["sg_list"]}
labor = compute_labor(
@@ -189,6 +196,7 @@ def compute_twice(root: Path, inputs: dict[str, Any], user: dict[str, Any]) -> t
keep = used_materials(first, inputs, user)
inputs["materials"] = [m for m in inputs.get("materials") or [] if m["key"] in keep]
inputs["material_qty"] = {row["key"]: row["qty"] for row in summary["sum_material"]}
inputs["aside_qty"] = totals(first, hopyo_lines(first))[0].get("aside") or {} # 841-1 자재대
sheets = compute_sheets(root, inputs, user, memo)
return sheets, compute_summary(sheets, hopyo_lines(sheets))