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

This commit is contained in:
2026-11-18 08:21:41 +09:00
10 changed files with 98 additions and 59 deletions
+4 -2
View File
@@ -131,8 +131,10 @@ def hourly_link(eq: str, part: str) -> dict | None:
if not logic:
return None
given = {"기계": _lit(code)} if machine.takes_machine(logic) else {}
for spec in logic.get("입력") or []:
if spec.get("이름") != "기계":
from M02_MasterTemplete import M02_Labor_Inputs as li
for spec in li.specs(logic): # 문서 입력 변수(855 L2 ⓑ)
if spec["이름"] != "기계":
given[spec["이름"]] = _lit((spec.get("고르기") or [""])[0])
return {"갈래": "단가산출", "키": str(logic["키"]), "입력": given, "칸": part}
+10 -4
View File
@@ -33,15 +33,19 @@ def logic_doc(one: dict, doc: dict, whole: Any) -> dict[str, Any]:
from M02_MasterTemplete import M02_Labor_Patch as patch
from M02_MasterTemplete import M02_Sangeun_Calc as calc
from M01_MasterData import M01_MasterData_Doc as m01doc
code = str(one["로직"])
row = whole.logic(code)
m01doc.head(code) # 없는 기초 = 옛 `Master.logic` 과 같은 까닭
doc_ = m01doc.docs()[code]
row = whole.logic(code) # 호표 재료 차례 = 옛 자재표시 칸 몫(남김)
shown = dict(one.get("자재표시") or {})
for n, item in enumerate(row.get("호표") or []):
if item.get("종류") == "재료":
mine = shown.get(str(n))
shown[str(n)] = {**labor.marks(mine), "별도계상": labor.mark_of(mine, "별도계상")}
unit = calc.base_unit(row)
name = str(one.get("별칭") or row.get("이름") or code)
unit = calc.base_unit(doc_)
name = str(one.get("별칭") or doc_.get("이름") or code)
sk = patch.to_sangeun({**one, "자재표시": shown}, name, unit[1] if unit else "식", whole)
return {**sk, **{k: doc[k] for k in CARRY if doc.get(k)}}
@@ -50,9 +54,11 @@ def from_logic(code: Any, new: bool = False, use: str | None = None) -> dict[str
"""[+ 줄] M01 기초 고름 — 지금 층에 SK 사본(같은 내용 = 409 물음 · 733-2) → `{이름: SK 키, 참조}`."""
from M02_MasterTemplete import M02_Library_Ask as ask
from M01_MasterData import M01_MasterData_Doc as m01doc
whole = _whole()
try:
whole.logic(str(code))
m01doc.head(str(code))
except Exception as e: # noqa: BLE001 — 없는 로직
raise store.StoreError(400, f"없는 기초 「{code}」") from e
sk = logic_doc({"로직": str(code), "입력값": {}}, {}, whole)
+22 -7
View File
@@ -23,6 +23,8 @@
단가 = M01 기계 한 시간 값 다시 받음(736-3) · 항목 · 수량 · 입력값 · 고름 · 자재표시 · 켜쌓기율 ·
기본정보 남김 → 값 = 연결된 M01 키 값.
한 번용 옮기기(`migrate`)는 끝나 걷음(894).
기초 이름 · 결과단위 · 입력 이름 = M01 수식 문서(855 L2 ⓑ · `_doc`) · 줄 정체(cid) · 호표 재료 차례는
옛 패치 칸(덮개 · 뺀줄 · 고름 · 자재표시) 몫이라 아직 로직 줄(`compose` · `sk_line` · 옛 패치 칸 걷기 때 같이).
"""
from __future__ import annotations
@@ -33,7 +35,9 @@ import time
from decimal import Decimal
from typing import Any
from M01_MasterData import M01_MasterData_Doc as m01doc
from M02_MasterTemplete import M02_Labor_Fixed as fixed
from M02_MasterTemplete import M02_Labor_Inputs as labor_inputs
from M02_MasterTemplete import M02_Labor_Ref as refs
from M02_MasterTemplete import M02_Sangeun_Const as const
from M02_MasterTemplete import M02_Sangeun_Doc as sd
@@ -50,6 +54,16 @@ def _whole() -> Any:
return m01.loaded()[1]
def _doc(code: Any) -> dict:
"""기초 키 → 수식 문서 · 없거나 로직 아닌 키 = 옛 `Master.logic` 과 같은 `FormulaError`."""
m01doc.head(str(code))
return m01doc.docs()[str(code)]
def _names(doc: dict) -> set[str]:
return {s["이름"] for s in labor_inputs.specs(doc)}
def _d(value: Any) -> Decimal:
return Decimal(str(value))
@@ -124,7 +138,7 @@ def filled_adds(doc: dict, whole: Any) -> list[dict]:
for one in doc.get("더한줄") or []:
if one.get("종류") == "로직":
try:
names = [str(s.get("이름")) for s in whole.logic(one["로직"]).get("입력") or []]
names = list(_names(_doc(one["로직"])))
except Exception: # noqa: BLE001 — 없는 로직 = 검사 · 셈이 까닭
names = []
mine = dict(one.get("입력값") or {})
@@ -150,8 +164,8 @@ def sk_adds(y: dict, q: Decimal, whole: Any, tag: dict) -> list[dict]:
raise sd.DocError("율 줄 있는 바탕 없는 단가산출은 펼쳐 넣지 못함 — 참조로 둠")
if not code:
return [_scaled(one, q, tag) for one in adds]
row = whole.logic(code)
names = {str(s.get("이름")) for s in row.get("입력") or []}
row = _doc(code)
names = _names(row)
unit = calc.base_unit(row)
entry: dict[str, Any] = {
"종류": "로직",
@@ -185,7 +199,7 @@ def sc_adds(z: dict, q: Decimal, whole: Any, tag: dict) -> list[dict]:
for at, one in enumerate(z.get("담은로직") or []):
n = q * _hand(one, lines.get(str(at)))
if one.get("로직"):
row = whole.logic(one["로직"])
row = _doc(one["로직"])
body = patch.as_doc(one, whole)
entry = {
"종류": "로직",
@@ -345,11 +359,12 @@ def sk_line(y: dict, one: dict, whole: Any, tag: dict) -> dict:
code = (y.get("바탕") or {}).get("로직")
if not code:
raise sd.DocError("바탕 기초 없는 단가산출은 일위대가 줄로 못 담음 — 그 안 줄을 따로 넣음")
row = whole.logic(code)
if calc.ratio_of(y, row, whole) != calc.times_of(row):
doc = _doc(code)
if calc.ratio_of(y, doc, whole) != calc.times_of(doc):
raise sd.DocError("단위 환산 단가산출은 일위대가 줄로 못 담음(값 단위가 바뀜)")
row = whole.logic(code) # 줄 정체 · 호표 재료 차례 = 옛 패치 칸 몫(남김)
ids = sd.line_ids(row)
names = {str(s.get("이름")) for s in row.get("입력") or []}
names = _names(doc)
at = {c: str(n) for n, c in enumerate(ids)}
body = {k: y[k] for k in ("덮개", "뺀줄") if y.get(k) not in EMPTY}
body |= {"더한줄": adds} if (adds := filled_adds(y, whole)) else {}
+35 -32
View File
@@ -12,16 +12,19 @@
식 고름 한 곳(822-2 · `pick`) = ㉠ 원문번호가 식 「기계」 목록에 있으면 그 식(짝 차례) ㉡ 그 기계만의 식
(`_own`) ㉢ 없으면 꼴(채운 칸 · `M02_MyMachine.logic_key`) — M01 [새 기계] · 불러오기 · 데이터 흐름 ·
줄 쌓기 · 단가산출 기초가 다 이것을 씀 · 못 고름 · 값 모자람 = 까닭 글(`why`).
식 = M01 수식 문서(`M01_MasterData_Doc` · 입력 = 문서 입력 변수 · 기계 칸 = 문서 요소 연결 · 855 L2 ⓑ) —
`pick` · `logic_of` 는 문서를 돌려줌 · `why` · `takes_machine` 은 로직 줄을 받아도 키로 문서를 읽음.
"""
from __future__ import annotations
import re
from typing import Any
import master_machine_crew as mcrew
from M01_MasterData import M01_MasterData_Doc as m01doc
from M01_MasterData import M01_MasterData_Store as store
from M02_MasterTemplete import M02_Labor_Inputs as li
from M02_MasterTemplete import M02_MyMachine as mym
cm = store.cm
@@ -33,19 +36,24 @@ _PLAIN = {
"전력 계약종별",
} # 이 밖의 입력 = 부착 장비 전용
_TEXT = {"주연료종류", "조종원직종"} # 글 칸 — 나머지 기계 줄 값 칸은 수
_FIELD = re.compile(r"EQ:\{기계\}\.([^\s*/+()\-,]+)")
_MACHINE = "EQ:{" # 문서 요소 연결 키 「EQ:{S_기계}」 = 고른 기계 줄
HOUR_UNIT = "10^-7/시간"
def _doc(logic: dict | None) -> dict:
"""로직 키 → 수식 문서(문서 · 로직 줄 무엇을 받아도 키로) · 없음 = 빈 묶음."""
return m01doc.docs().get(str((logic or {}).get("키"))) or {}
def _rows() -> list[dict]:
"""「건설기계」 장 파일 안 · 입력 「기계」 고르기가 있는 돈 로직(부착 조합 식 포함)."""
"""「건설기계」 장 문서 파일 안 · 입력 「기계」 고르기가 있는 돈 문서(부착 조합 식 포함)."""
return [
row
for name, data in store.loaded()[0].items()
if data.get("그룹") == "로직" and "건설기계" in name
for row in data.get("줄") or []
if str(row.get("결과단위") or "").startswith("원")
and any(i.get("이름") == "기계" and i.get("고르기") for i in row.get("입력") or [])
doc
for name, data in m01doc.logic_files().items()
if "건설기계" in name
for doc in data["줄"]
if str(doc.get("결과단위") or "").startswith("원")
and any(i["이름"] == "기계" and i.get("고르기") for i in li.specs(doc))
]
@@ -55,12 +63,12 @@ def _family() -> list[dict]:
def _codes(row: dict) -> list:
return next(i["고르기"] for i in row["입력"] if i.get("이름") == "기계")
return next(i["고르기"] for i in li.specs(row) if i["이름"] == "기계")
def _rank(row: dict) -> tuple:
"""부착 전용 · 손료만 · 보정 · 기종 수 · 키 — 작을수록 먼저."""
names = [i.get("이름") for i in row.get("입력") or []]
names = [i["이름"] for i in li.specs(row)]
attach = any(n not in _PLAIN for n in names)
loss = "지역" not in names
return (attach, loss, loss and "보정작업" in names, len(_codes(row)), str(row.get("키")))
@@ -100,11 +108,11 @@ def pick(row: dict) -> dict | None:
if got := _own(code):
return got
key = None if _day_loss(row) else mym.logic_key(row)
return mym.whole().logic(key) if key else None
return m01doc.docs().get(key) if key else None
op = float(_vals(row).get("조종원") or 0) > 0 or _operated(code) # 그 줄 인력도(842-3)
def order(row: dict) -> tuple:
has = any(x.get("이름") == "조종원" for x in row.get("호표") or [])
has = any(x.get("이름") == "조종원" for x in row.get("금액") or [] if "수량" in x)
rank = _rank(row)
return (*rank[:3], op and not has, *rank[3:])
@@ -113,15 +121,16 @@ def pick(row: dict) -> dict | None:
def _own(code: str) -> dict | None:
"""그 기계만의 시간당 경비 식(816-1 · 4륜구동 1톤 덤프트럭 = GF000145 · 816-3 체인톱 = GF000337) —
「기계」 입력 없는 기계경비식이 그 원문번호 기계 줄 값(`EQ….가격` · `EQ….손료계수`)을 읽으면 그 식."""
「기계」 입력 없는 기계경비식 문서가 그 원문번호 기계 줄 값(요소 연결 `EQ…` 칸)을 읽으면 그 식."""
rows = mym.whole().index.get("EQ", {}).values()
keys = [f"{r.get('키')}." for r in rows if code and str(r.get("원문번호")) == code]
for data in store.loaded()[0].values():
for row in data.get("줄") or [] if data.get("그룹") == "로직" else []:
if (row.get("부품") or {}).get("갈래") != "기계경비식" or takes_machine(row):
keys = {r.get("키") for r in rows if code and str(r.get("원문번호")) == code}
for data in m01doc.logic_files().values():
for doc in data["줄"]:
if (doc.get("부품") or {}).get("갈래") != "기계경비식" or takes_machine(doc):
continue
if any(k in str(row.get("중간")) + str(row.get("호표")) for k in keys):
return row
links = [v.get("연결") or {} for v in doc.get("변수") or []]
if any(x.get("갈래") == "요소" and x.get("키") in keys for x in links):
return doc
return None
@@ -150,10 +159,10 @@ def why(row: dict, logic: dict | None) -> str:
if float(vals.get("조종원") or 0) > 0 and not vals.get("조종원직종"):
return "조종원직종 없음"
return "손료 계수 셋(상각 · 정비 · 관리) 없음"
text = " ".join(str(x.get(k)) for k in ("식", "수량") for p in ("중간", "호표", "덧줄")
for x in logic.get(p) or []) # fmt: skip
links = [v.get("연결") or {} for v in _doc(logic).get("변수") or []]
fields = [x["칸"] for x in links if x.get("갈래") == "요소" and str(x.get("키") or "").startswith(_MACHINE) and x.get("칸")] # fmt: skip
lost, odd = [], []
for name in dict.fromkeys(_FIELD.findall(text)):
for name in dict.fromkeys(fields):
v = vals.get(name)
if v in (None, ""):
lost.append(name)
@@ -166,7 +175,7 @@ def why(row: dict, logic: dict | None) -> str:
def takes_machine(logic: dict) -> bool:
"""식이 「기계」 입력(원문번호 고르기)을 받는지 — 안 받는 식(GF000145)엔 기계='…' 를 안 넘김."""
return any(i.get("이름") == "기계" for i in logic.get("입력") or [])
return any(i["이름"] == "기계" for i in li.specs(_doc(logic)))
def hourly(key: str) -> dict[str, Any]:
@@ -268,11 +277,7 @@ def combo(main: str, part: str) -> tuple[str, str] | None:
return None
rows = _rows()
fits = any(
len(
attach := [
i for i in r.get("입력") or [] if i.get("이름") not in _PLAIN and i.get("고르기")
]
)
len(attach := [i for i in li.specs(r) if i["이름"] not in _PLAIN and i.get("고르기")])
== 1 # fmt: skip
and codes[0] in [str(c) for c in _codes(r)]
and codes[1] in [str(c) for c in attach[0]["고르기"]]
@@ -289,9 +294,7 @@ def combo(main: str, part: str) -> tuple[str, str] | None:
if not fits or row is None:
return None
given = {"기계": codes[0]} | {
i["이름"]: (i.get("고르기") or [""])[0]
for i in row.get("입력") or []
if i["이름"] != "기계"
i["이름"]: (i.get("고르기") or [""])[0] for i in li.specs(row) if i["이름"] != "기계"
}
args = "".join(f", {k}='{v}'" for k, v in given.items())
return str(row["키"]), f"로직({row['키']}{args})"
+13 -4
View File
@@ -86,9 +86,10 @@ def test_구조물_사본_수식_사본_값_같음_원본_지우고_고쳐도(wo
assert not [r for r in _rows(bundle) if str(r.get("키")).startswith("GX9")]
json.dumps(rows["참조사본"], ensure_ascii=False) # 사본 파일로 쓸 수 있는 꼴(Decimal 없음)
saved = json.loads(json.dumps(bundle, ensure_ascii=False))
formula = {"문서": source.formula_docs(rows)} # 사본 수식.json(855-F B9-6 · 로직 몫)
edit(world["personal"], key, 3) # M02 에서 다시 고침 → 사본 그대로
(world["personal"] / "sangeun" / f"{key}.json").unlink() # 원본이 사라져도 사본만 봄
got = prices.calc(rows, saved, {}, {}, None)
got = prices.calc(rows, saved, {}, {}, None, formula)
line = got["줄"][0]
assert not line["까닭"]
for part in ("노무비", "재료비", "경비", "계"):
@@ -104,7 +105,10 @@ def test_재생성은_M02_새_값(world):
_, live = _top(ref)
again = source.labor_doc_rows(doc)
bundle = source.price_bundle(again, world["personal"])
got = prices.calc(again, json.loads(json.dumps(bundle, ensure_ascii=False)), {}, {}, None)
formula = {"문서": source.formula_docs(again)}
got = prices.calc(
again, json.loads(json.dumps(bundle, ensure_ascii=False)), {}, {}, None, formula
)
assert got["줄"][0]["기준"]["계"] == pytest.approx(live["기준"]["계"], rel=1e-9)
rid = refs.ref_id(ref["ref"])
assert first["참조사본"][rid]["수식"]["문서"] != again["참조사본"][rid]["수식"]["문서"]
@@ -131,11 +135,16 @@ def test_B09_서고_사본_값_같음_원본판(world, tmp_path):
assert made["만듦"] and _print(world["personal"]) == before
folder = library.library_dir(root) / made["폴더"]
read = {p.name: json.loads(p.read_text(encoding="utf-8")) for p in folder.glob("*.json")}
bare = prices.calc(read[source.LABOR_FILE], read[source.PRICE_FILE], {}, {}, None)["줄"][0]
labor_file, price_file, formula = (
read[source.LABOR_FILE],
read[source.PRICE_FILE],
read["수식.json"],
)
bare = prices.calc(labor_file, price_file, {}, {}, None, formula)["줄"][0]
assert bare["기준"]["계"] == pytest.approx(
live["기준"]["계"], rel=1e-9
) # 이은 값 없음 = 저장 2
got = prices.calc(read[source.LABOR_FILE], read[source.PRICE_FILE], {}, {}, area)["줄"][0]
got = prices.calc(labor_file, price_file, {}, {}, area, formula)["줄"][0]
assert not got["까닭"] and not live["까닭"]
assert got["기준"]["계"] == pytest.approx(live["기준"]["계"], rel=1e-9)
mark = read["manifest.json"]["원본판"]
+3 -4
View File
@@ -31,6 +31,7 @@ from M01_MasterData import M01_MasterData_Doc as doc_screen
from M01_MasterData import M01_MasterData_Router as router_module
from M01_MasterData import M01_MasterData_Store as m01
from M02_MasterTemplete import M02_Doc_Copy as dc
from M02_MasterTemplete import M02_Labor_Inputs as li
from M02_MasterTemplete import M02_Machine_Hourly as mh
mr = importlib.import_module("master_doc_record") # M01 store 가 scripts 길을 둔 뒤
@@ -109,15 +110,13 @@ def _hourly_inputs(logic_key: str) -> dict:
if not row:
return {}
return {
i["이름"]: str((i.get("고르기") or [""])[0])
for i in row.get("입력") or []
if i.get("이름") != "기계"
i["이름"]: str((i.get("고르기") or [""])[0]) for i in li.specs(row) if i["이름"] != "기계"
}
def _kind(row: dict) -> tuple:
"""갈래 = 부착 · 손료만 · 보정 · 조종원 줄 · 전력 줄(822-2 전력 기종 식 — 손료만 식과 갈림)."""
lines = {x.get("이름") for x in row.get("호표") or []}
lines = {x.get("이름") for x in row.get("금액") or [] if "수량" in x} # 문서 금액 줄(855 L2 ⓑ)
return (*mh._rank(row)[:3], "조종원" in lines, "전력" in lines)
@@ -24,6 +24,7 @@ from common_util import common_util_auth as auth
from M01_MasterData import M01_MasterData_Router as router_module
from M01_MasterData import M01_MasterData_Store as m01
import helper_855_old_engine_routes as old_engine # noqa: E402 — 옛 셈 몸(855 2-E1 · 시험 전용)
from M02_MasterTemplete import M02_Labor_Inputs as li
from M02_MasterTemplete import M02_Labor_Ref as refs
from M02_MasterTemplete import M02_Machine_Hourly as mh
from M02_MasterTemplete import M02_MasterTemplete_Store as store
@@ -254,9 +255,8 @@ def test_moved_samples():
tower = mh.hourly("EQ000165") # 타워크레인 — 건설기계운전사 조종원 줄(요구 799)
assert tower["로직"] == "GC000276" and tower["노무비"] == int(_wage("1048") * 5 / 24)
spray = m01.loaded()[1].get("EQ000198") # 아스팔트 스프레어 — 직종 빈 칸 = 직종 입력 식
assert mh.pick(spray)["키"] == "GC000275" and "조종원직종" in json.dumps(
mh.pick(spray)["입력"], ensure_ascii=False
)
got = mh.pick(spray) # 수식 문서(855 L2 ⓑ) — 입력 = 문서 입력 변수
assert got["키"] == "GC000275" and "조종원직종" in [i["이름"] for i in li.specs(got)]
assert "가격" in mh.hourly("EQ000198")["reason"]
assert "3450-0642" not in _codes("GC000273") # 손료만 식에서 뺌
for key, logic in (
@@ -49,6 +49,7 @@ def world():
def _logic(index, row, logic):
logic = index.logic(logic["키"]) # 옛 엔진 거울 = 로직 줄(`pick` 은 문서 · 855 L2 ⓑ)
given = {i["이름"]: (i.get("고르기") or [""])[0] for i in logic.get("입력") or []}
if mh.takes_machine(logic):
given["기계"] = str(row.get("원문번호"))
+2 -1
View File
@@ -177,7 +177,8 @@ def _freeze(me, key):
{"이름": "t", "단위": "m", "담은로직": [{"참조": ref, "수량": {"손": 1}}]}
)
bundle = source.price_bundle(rows, me)
return lambda: float(item_prices.calc(rows, bundle, {}, {})["반영합"]["계"])
formula = {"문서": source.formula_docs(rows)} # 사본 수식.json(855-F B9-6)
return lambda: float(item_prices.calc(rows, bundle, {}, {}, None, formula)["반영합"]["계"])
def test_프로젝트_사본(world, docs_tmp):
+5 -2
View File
@@ -318,14 +318,17 @@ def test_SK_위덮음_내고침_되돌림_옵션_굳힘(docs_tmp, world):
{"이름": "t", "단위": "m", "담은로직": [{"참조": ref, "수량": {"손": 1}}]}
)
bundle = source.price_bundle(rows, me)
formula = {"문서": source.formula_docs(rows)} # 사본 수식.json(855-F B9-6)
frozen = rows["참조사본"][refs.ref_id(ref)]["수식"]
assert _norm(frozen[mcv.UPPER]) == _norm(upper)
was = float(item_prices.calc(rows, bundle, {}, {})["반영합"]["계"])
was = float(item_prices.calc(rows, bundle, {}, {}, None, formula)["반영합"]["계"])
assert was == float(after["셈"]["계"])
_save_m01(_upper(d, D(2))) # 기초 고침이 바뀜
now = _at(me, path.read, key)
assert float(now["셈"]["계"]) != was # 프로젝트 밖 = 지금 기초 것
assert float(item_prices.calc(rows, bundle, {}, {})["반영합"]["계"]) == was # 사본 = 굳은 것
assert (
float(item_prices.calc(rows, bundle, {}, {}, None, formula)["반영합"]["계"]) == was
) # 사본 = 굳은 것
_save_m01(upper)
# ㉢ ② 를 위 층 값으로 = ② 0
now = _at(me, path.read, key)