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

# Conflicts:
#	M01_MasterData/M01_MasterData_Router.py

B09_Estimation/B09_Estimation_Sangeun.py

@@ -242,7 +242,7 @@ def call_of(whole: Any, item: dict, env: dict) -> dict[str, Any] | None:
         target = None
     if not target:
         return None
-    if any(s.get("이름") == "기계" for s in target.get("입력", [])):
+    if mf.mb.is_machine(target):  # 기계경비 판별 한 곳(712-1)
         keys = _captured(whole, node, env)
         return {"machine": keys[0] if keys else None}
     given = {name: mf.evaluate(expr, env, whole, 1) for name, expr in node[2]}

B09_Estimation/B09_Estimation_Sangeun_Text.py

@@ -276,7 +276,7 @@ def _logic_lines(whole, item, env, qty_text, q, price_of) -> list[tuple[str, dic
     except mf.FormulaError:
         target = None
     name = item.get("이름", "")
-    if target and any(s.get("이름") == "기계" for s in target.get("입력", [])):
+    if mf.mb.is_machine(target):  # 기계경비 판별 한 곳(712-1)
         keys = sg._captured(whole, node, env)
         got = price_of(keys[0]) if keys else None
         if not got: