Merge remote-tracking branch 'origin/sub_laptop_6' into sub_laptop_8

2026-10-31 15:16:26 +09:00
parent f0be3cd766 2789afb102
commit 47e1d5687d
15 changed files with 825 additions and 51 deletions
@@ -456,6 +456,7 @@ def settle(result: dict, doc: dict, given: dict[str, Any], col: Any = None) -> d
            continue
        bases.append({**zero, "재료비": price, "계": price} if price is not None else None)
        reflects.append({**zero, "재료비": cost, "계": cost} if cost is not None else None)
+    fixed.ratios(lines, reflects, bases)  # 비율 고정 줄(705-3) — 다른 줄 반영합 × 율
    return _json({"줄": lines, "자재": mats, "기준합": _sum(bases), "반영합": _sum(reflects)})