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

2026-10-10 00:09:53 +09:00
parent b868d80bb3 58283a578f
commit b584d52e25
9 changed files with 647 additions and 43 deletions
@@ -137,8 +137,8 @@ export function computeSheets(payload: Row, user: Row): Row {
    ...kept,
    ...daega,
    gaps: [...base.gaps, ...(server.sg_gaps || []), ...daegaGaps],
-    // 145-4 총괄 · 원가계산서 = 설계내역서 비목 합(145-3 `bill.sums`) + 사용자 요율 · 손입력
-    total: computeTotal(base.bill?.sums, user.estimate),
+    // 145-4 총괄 · 원가계산서 = 설계내역서 비목 합(145-3 `bill.sums`) + 요율(사용자 ?? 자동 166-1) · 손입력
+    total: computeTotal(base.bill?.sums, user.estimate, payload.rate_table),
  };
 }