Merge remote-tracking branch 'origin/main_laptop_1' into sub_laptop_7

M02_MasterTemplete/DataFlow/M02_DF_Compute.py

@@ -23,8 +23,10 @@ from decimal import ROUND_DOWN, ROUND_HALF_UP, ROUND_UP, Decimal
 from typing import Any, Callable
 
 from common_util import common_util_spreadsheet as spreadsheet
+from M01_MasterData import (
+    M01_MasterData_Router as m01,
+)  # _num — M01 Router 가 이 파일을 부름(서로 부름)
 from M01_MasterData import M01_MasterData_Store as store
-from M01_MasterData.M01_MasterData_Router import _num
 from M02_MasterTemplete.DataFlow import M02_DF_Values as dv
 
 _CELL = re.compile(r"^([A-Z]+)(\d+)$")
@@ -130,6 +132,15 @@ def _element_value(
                 f"「{box.get('name')} · {el.get('name')}」 {got['reason']} — 기본 품목으로 셈"
             )
             got = dv.slot_price({"mode": "fixed", "ref": el["default"]})
+    elif group in dv.GROUP_RULE and mode == "rule":  # 인력 · 기계 · 유가전력 조건 찾기
+        rule = el.get("rule") or {}
+        src = rule.get("from") or {}
+        slot = {"field": rule.get("field"), "op": rule.get("op"), "scope": el.get("scope"),
+                "ref": el.get("ref"), "unit": el.get("unit")}  # fmt: skip
+        got = dv.group_find(group, slot, ports.get(src.get("box"), {}).get(src.get("name")))
+        if not got["ok"] and el.get("default"):
+            errors.append(f"「{box.get('name')} · {el.get('name')}」 {got['reason']} — 기본으로 셈")
+            got = dv.one_value({"group": group, "ref": el["default"], "unit": el.get("unit")})
     elif given is not None:
         return given
     else:
@@ -188,6 +199,12 @@ def _logic_ports(lg: dict, box: dict, given: dict, ports: dict, errors: list, ct
         if link.get("to", {}).get("box") == box["id"]:
             src = link.get("from") or {}
             designs[link["to"].get("name")] = ports.get(src.get("box"), {}).get(src.get("name"))
+    if callable(
+        other.get("calc")
+    ):  # 옛 마스터 로직(흐름 없음) — 옛 셈 · 노무비 · 재료비 · 경비 · 계
+        result = other["calc"](designs)
+        errors += [f"「{box.get('name')}」 {x}" for x in result["errors"]]
+        return result["outputs"]
     stack = [*ctx["stack"], key]
     result = run(other, _design_values(other, designs), ctx["load"], ctx["local"], stack)
     errors += [f"「{box.get('name')}」 {x}" for x in result["errors"]]
@@ -565,7 +582,9 @@ def run(lg: dict, values: dict, load: Loader, local: list[dict], stack: list | N
                 outputs[b["id"]] = arrive(b).get(OUTPUT_PORT)
         if funcs:  # 이 물결의 함수 시트를 한 번에(시트마다 통합문서 하나 — Eval 과 같음)
             books = [
-                _num({"종류": "통합문서", "판": 1, "서식": [{}] * 64, "시트": [sheets[f["id"]]]})
+                m01._num(
+                    {"종류": "통합문서", "판": 1, "서식": [{}] * 64, "시트": [sheets[f["id"]]]}
+                )
                 for f in funcs
             ]
             try: