feat(793-2): 가져온 식 단가산출 SK 담기 — 바탕 갈래 · 원본 메타 · 검산 · 우리 단가로 · 이음 고름 · 우리 기초로 바꾸기 · 만들기 길

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
2026-11-05 17:44:31 +09:00
co-authored by Claude Opus 5.5
parent c0604b917f
commit e393d67d98
6 changed files with 864 additions and 26 deletions
+3 -1
View File
@@ -22,6 +22,7 @@ from typing import Any
from common_util.common_util_derived_store import derived_key
from M02_MasterTemplete import M02_Labor_Ref as refs
from M02_MasterTemplete import M02_Sangeun_Imported as imp
DROP = {"키", "이름", "구분", "상세구분", "본뜬", "메모", "별칭", "바탕판", "원값", "계산값", "열"}
DROP |= {"일위대가번", "종류", "수정일", "출처", "처음수량", "뺀더한줄"} # 744-1 되돌림 기억
@@ -85,7 +86,7 @@ class Same:
doc = flat.flat_doc(kind, doc)
body = self._sk(doc, trail) if kind == "sangeun" else self._sc(doc, trail)
if kind == "sangeun" and not body.get("바탕") and not body.get("더한줄"):
if kind == "sangeun" and not any(body.get(k) for k in ("바탕", "더한줄", "가져온")):
return None
if kind != "sangeun" and not body.get("담은로직") and not body.get("자재"):
return None
@@ -133,6 +134,7 @@ class Same:
"뺀줄": sorted(map(str, doc.get("뺀줄") or [])),
# 값 바꾸는 새 칸(790-2 · 792-1) — 없으면 빠짐 = 옛 지문 그대로
**{k: norm(doc.get(k)) for k in ("상수덮개", "표값덮개", "식덮개", "변수줄")},
"가져온": norm(imp.same_part(doc)), # 가져온 식(793-2) = 로직 · 단가기준
}
return {k: v for k, v in body.items() if v not in EMPTY}