feat(859-3): B09 산출근거 글 자릿수 = 줄 쌓기 화면과 같은 규칙(수 꼴 자리만)

- B09_Estimation_Sangeun_Text 의 값 · 공식 줄 값식 · 수량 · 율 덧줄 밑수 글을 master_doc_text.shown(보이는 자리 규칙)으로
- 금액 · 값 갈래 그대로 · golden_855_b09 글 갈래만 다시 뜸(산근 글 · 산근 관급 글 · 미리보기 hand:pick 글):
  견본 「공구손료 및 경장비 (인건비의 %) : 11,301.44 × 4 % = 452.0 원」 → 「11,301.4 × 4 %」
- 관련 시험 119 통과

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
2026-11-18 22:04:50 +09:00
co-authored by Claude Opus 5.5
parent 6718550c94
commit 66c52691aa
2 changed files with 39 additions and 15 deletions
+36 -12
View File
@@ -41,11 +41,14 @@ def _won(v: Any) -> str:
return GAP if v is None else f"{v:,.0f}"
def _word(whole: Any, name: str, value: Any) -> str:
"""값 글 — 수 = 화면 수 꼴 · 기계 · 직종 원문번호 = 「이름 규격」(157-3 · 85-1 도우미)."""
def _word(whole: Any, name: str, value: Any, answer: Any = None, key: str = "") -> str:
"""값 글 — 수 = 화면 수 꼴(859-3 보이는 자리 · 기호 `key`) ·
기계 · 직종 원문번호 = 「이름 규격」(157-3 · 85-1 도우미)."""
if isinstance(value, str):
return labor_inputs._labels(whole, {"이름": name, "고르기": [value]}).get(value, value)
return mdt.eq_text(value) if _dec(value) is not None else str(value)
if _dec(value) is None:
return str(value)
return mdt.eq_text(value) if answer is None else _show(answer, key, value)
# ── 머리(입력 · 공식) ────────────────────────────────────────────────
@@ -90,7 +93,8 @@ class _Head:
return "값 없음"
if isinstance(v, dict):
return " · ".join(f"{c} {mdt.eq_text(v.get(c))}" for c in mdt.COSTS)
return " ".join(x for x in (_word(self.whole, self.names.get(i, i), v), self.unit(i)) if x)
word = _word(self.whole, self.names.get(i, i), v, self.answer, i)
return " ".join(x for x in (word, self.unit(i)) if x)
def formula(self, i: str, text: str) -> str:
"""「이름 = 이름식 = 값식 = 값 단위」 — 같은 글이 이어지면 한 번만."""
@@ -104,7 +108,9 @@ class _Head:
valued = md.text_of(_swap(node, self._num))
parts += [named, valued]
v = self.values.get(i)
bare = mdt.eq_text(v) if _dec(v) is not None else f"'{v}'" if isinstance(v, str) else None
bare = f"'{v}'" if isinstance(v, str) else None
if _dec(v) is not None:
bare = _show(self.answer, i, v)
out = [parts[0]]
for p in parts[1:]: # 같은 글 · 값 그대로인 식 = 한 번만(화면 공식 줄)
if p and p != out[-1] and p != bare:
@@ -115,7 +121,7 @@ class _Head:
def _num(self, name: str):
v = self.values.get(name)
d = _dec(v)
return ("var", mdt.eq_text(d)) if d is not None else None
return ("var", _show(self.answer, name, v)) if d is not None else None
def lines(self, times: Decimal) -> list[str]:
doc = self.doc
@@ -180,9 +186,14 @@ def _qty(answer: Any, n: int, units: dict, times: Decimal, rate: Decimal | None)
raw = (answer.ans.get("줄") or [{}] * (n + 1))[n].get("수량")
node = _decide(mdt.node_of(((answer.doc.get("금액") or [])[n]).get("수량")), answer)
values = answer.ans.get("값") or {}
shown = mdt.eq_text(raw)
line = (answer.doc.get("금액") or [])[n]
look = _look(answer)
shown = mdt.shown(answer.doc, mdt.node_of(line.get("수량")), raw, look, look.run.links)
if node is not None and not mdt.is_atom(node):
put = lambda s: ("var", mdt.eq_text(values[s])) if _dec(values.get(s)) is not None else None # noqa: E731
def put(s: str):
return ("var", _show(answer, s, values[s])) if _dec(values.get(s)) is not None else None
shown = f"({md.text_of(_swap(_bare(node), put))})"
text = mdt._u(shown, units["qty"])
if times != 1:
@@ -192,13 +203,25 @@ def _qty(answer: Any, n: int, units: dict, times: Decimal, rate: Decimal | None)
return text
def _look(answer: Any) -> Any:
"""셈 답 값 읽개(`master_doc_text._Look`) — 답마다 한 번."""
look = getattr(answer, "_look", None)
if look is None:
look = answer._look = mdt._Look(answer.doc, answer.ans, ml.Links(answer.whole, answer.docs))
return look
def _show(answer: Any, name: str, v: Any) -> str:
"""기호 값 글 — 859-3 보이는 자리 규칙(화면 줄 쌓기와 같음 · `master_doc_text.shown`)."""
look = _look(answer)
return mdt.shown(answer.doc, ("var", name), v, look, look.run.links)
def _decide(node: Any, answer: Any) -> Any:
"""만약 = 걸린 갈래만(화면 `decide` · 조건 = 셈 답 값 · `master_doc_text._Look`)."""
if node is None:
return None
look = getattr(answer, "_look", None)
if look is None:
look = answer._look = mdt._Look(answer.doc, answer.ans, ml.Links(answer.whole, answer.docs))
look = _look(answer)
def walk(n: Any) -> Any:
if not isinstance(n, tuple):
@@ -259,7 +282,8 @@ def _extra_text(ln: dict) -> str:
value, money = ln["price"][part], ln[part]
if ln.get("unit") == "%" and ln.get("qty"):
base = Decimal(str(value)) * 100 / Decimal(str(ln["qty"]))
return f"{head}{mdt.eq_text(base)} × {mdt.eq_text(ln['qty'])} % = {_amount(money)}"
base_text = mdt.mdd.show(base, "식", "", "원") # 859-3 원 단위 중간 값
return f"{head}{base_text} × {mdt.eq_text(ln['qty'])} % = {_amount(money)}"
return f"{head}{mdt.eq_text(value)} = {_amount(money)}"
+3 -3
View File
@@ -6,13 +6,13 @@
"daega_inputs": "8b605fa95c5b9db4",
"수요": "23b0132a8a7f46f7",
"산근 값": "6072e1180a1b81e7",
"산근 글": "f5b884a2c49c91c6",
"산근 글": "82f35a5c891bab99",
"산근 관급 값": "6568e5cf9322b81c",
"산근 관급 글": "9397c1d1a5fe0dcd",
"산근 관급 글": "534a307c49079bfd",
"미리보기 hand:rate 값": "091690571b7dc54b",
"미리보기 hand:rate 글": "d17615784f25e4f5",
"미리보기 hand:pick 값": "6c7f426d37e31998",
"미리보기 hand:pick 글": "7836022de46b3072",
"미리보기 hand:pick 글": "ab9a393d7a550b0a",
"미리보기 hand:net 값": "e2809bd3259438b0",
"미리보기 hand:net 글": "0254ea22d7a23e43",
"B08 단위수량": "896710398b04b4fd"