修正

2026-01-13 16:29:34 +09:00
parent 59e8e8625d
commit c753e89f49
11 changed files with 1046 additions and 121 deletions
--- a/frontend/js/opening_balance.js
+++ b/frontend/js/opening_balance.js
@@ -2,24 +2,95 @@ let accounts = [];
 let retainedEarnings = null;
 let isLocked = false;

+// 科目グループ定義（小計付き）
+const GROUPS = [
+  {
+    key: "asset",
+    label: "資産",
+    subGroups: [
+      { label: "現金・預金合計", codes: ["101", "102", "103", "104"] },
+      { label: "売上債権合計", codes: ["201"] },
+      {
+        label: "流動資産合計",
+        codes: [
+          "101",
+          "102",
+          "103",
+          "104",
+          "201",
+          "202",
+          "203",
+          "204",
+          "205",
+          "206",
+        ],
+      },
+      {
+        label: "固定資産合計",
+        codes: [
+          "301",
+          "401",
+          "402",
+          "403",
+          "404",
+          "405",
+          "406",
+          "407",
+          "408",
+          "410",
+        ],
+      },
+    ],
+  },
+  {
+    key: "liability",
+    label: "負債",
+    subGroups: [
+      { label: "仕入債務合計", codes: ["501"] },
+      {
+        label: "流動負債合計",
+        codes: ["501", "502", "503", "504", "505", "506", "507", "508"],
+      },
+      { label: "固定負債合計", codes: ["509"] },
+    ],
+  },
+  {
+    key: "equity",
+    label: "純資産",
+    subGroups: [
+      { label: "株主資本合計", codes: ["601", "602"] },
+      { label: "純資産合計", codes: ["601", "602"] },
+    ],
+  },
+];
+
 function formatNumber(n) {
  return Number(n || 0).toLocaleString();
 }

+function parseNumber(str) {
+  // カンマを除去して数値に変換
+  return Number(String(str).replace(/,/g, "")) || 0;
+}
+
 function recalcTotals() {
  let debit = 0;
  let credit = 0;

-  // 先算：不含繰越利益
+  // 先算：不含繰越利益剰余金
  accounts.forEach((a) => {
-    if (a.account_name === "繰越利益") return;
+    if (a.account_name === "繰越利益剰余金" || a.account_name === "繰越利益")
+      return;
    debit += Number(a.opening_debit || 0);
    credit += Number(a.opening_credit || 0);
  });

  const diff = debit - credit;

-  // 自动计算 繰越利益
+  console.log("Debug: debit=", debit, "credit=", credit, "diff=", diff);
+  console.log("Debug: retainedEarnings=", retainedEarnings);
+
+  // 自动计算 繰越利益剰余金
  if (retainedEarnings) {
    if (diff > 0) {
      retainedEarnings.opening_debit = 0;
@@ -28,6 +99,20 @@ function recalcTotals() {
      retainedEarnings.opening_debit = -diff;
      retainedEarnings.opening_credit = 0;
    }
+    console.log("Debug: retainedEarnings after calc=", retainedEarnings);
+
+    // DOM入力フィールドを更新
+    const retainedIndex = accounts.indexOf(retainedEarnings);
+    const inputs = document.querySelectorAll("#balanceTable tbody input");
+    inputs.forEach((input) => {
+      const match = input
+        .getAttribute("onchange")
+        ?.match(/accounts\[(\d+)\]\.opening_(debit|credit)/);
+      if (match && parseInt(match[1]) === retainedIndex) {
+        const field = match[2]; // "debit" or "credit"
+        input.value = formatNumber(retainedEarnings[`opening_${field}`]);
+      }
+    });
  }

  // 再算一次（包含繰越利益）
@@ -44,6 +129,35 @@ function recalcTotals() {
  document.getElementById("diff").innerText = formatNumber(
    finalDebit - finalCredit
  );
+
+  // 小計行を更新
+  updateSubtotalRows();
+}
+
+function updateSubtotalRows() {
+  GROUPS.forEach((group) => {
+    group.subGroups.forEach((subGroup) => {
+      const subGroupTotal = accounts
+        .filter((acc) => subGroup.codes.includes(acc.account_code))
+        .reduce(
+          (sum, acc) => ({
+            debit: sum.debit + Number(acc.opening_debit || 0),
+            credit: sum.credit + Number(acc.opening_credit || 0),
+          }),
+          { debit: 0, credit: 0 }
+        );
+
+      // 対応する小計行を探して更新
+      const rows = document.querySelectorAll("#balanceTable tbody tr");
+      rows.forEach((row) => {
+        const labelCell = row.cells[1];
+        if (labelCell && labelCell.textContent === subGroup.label) {
+          row.cells[2].textContent = formatNumber(subGroupTotal.debit);
+          row.cells[3].textContent = formatNumber(subGroupTotal.credit);
+        }
+      });
+    });
+  });
 }

 async function loadOpeningBalances() {
@@ -52,7 +166,9 @@ async function loadOpeningBalances() {
  const data = await apiGet("/opening-balances", { fiscal_year: year });

  accounts = data;
-  retainedEarnings = accounts.find((a) => a.account_name === "繰越利益");
+  retainedEarnings = accounts.find(
+    (a) => a.account_name === "繰越利益剰余金" || a.account_name === "繰越利益"
+  );

  const tbody = document.querySelector("#balanceTable tbody");
  tbody.innerHTML = "";
@@ -67,28 +183,62 @@ async function loadOpeningBalances() {
  `;
    tbody.appendChild(headerTr);

-    accounts.forEach((a, i) => {
-      if (a.account_type !== group.key) return;
+    const groupAccounts = accounts.filter((a) => a.account_type === group.key);

-      const isRetained = a.account_name === "繰越利益";
+    groupAccounts.forEach((a, idx) => {
+      const i = accounts.indexOf(a);
+      const isRetained =
+        a.account_name === "繰越利益剰余金" || a.account_name === "繰越利益";
      const tr = document.createElement("tr");

      tr.innerHTML = `
      <td>${a.account_code}</td>
      <td>${a.account_name}</td>
      <td>
-        <input type="number" value="${a.opening_debit}"
+        <input type="text" value="${formatNumber(a.opening_debit)}"
          ${isRetained ? "readonly" : ""}
-          onchange="accounts[${i}].opening_debit=this.value; recalcTotals();">
+          onchange="accounts[${i}].opening_debit=parseNumber(this.value); this.value=formatNumber(accounts[${i}].opening_debit); recalcTotals();">
      </td>
      <td>
-        <input type="number" value="${a.opening_credit}"
+        <input type="text" value="${formatNumber(a.opening_credit)}"
          ${isRetained ? "readonly" : ""}
-          onchange="accounts[${i}].opening_credit=this.value; recalcTotals();">
+          onchange="accounts[${i}].opening_credit=parseNumber(this.value); this.value=formatNumber(accounts[${i}].opening_credit); recalcTotals();">
      </td>
    `;

      tbody.appendChild(tr);
+
+      // 小計行の追加
+      group.subGroups.forEach((subGroup) => {
+        const isLastInSubGroup =
+          subGroup.codes.includes(a.account_code) &&
+          !groupAccounts
+            .slice(idx + 1)
+            .some((nextAcc) => subGroup.codes.includes(nextAcc.account_code));
+
+        if (isLastInSubGroup) {
+          const subGroupTotal = accounts
+            .filter((acc) => subGroup.codes.includes(acc.account_code))
+            .reduce(
+              (sum, acc) => ({
+                debit: sum.debit + Number(acc.opening_debit || 0),
+                credit: sum.credit + Number(acc.opening_credit || 0),
+              }),
+              { debit: 0, credit: 0 }
+            );
+
+          const totalTr = document.createElement("tr");
+          totalTr.style.backgroundColor = "#d0d0d0";
+          totalTr.style.fontWeight = "bold";
+          totalTr.innerHTML = `
+            <td></td>
+            <td>${subGroup.label}</td>
+            <td>${formatNumber(subGroupTotal.debit)}</td>
+            <td>${formatNumber(subGroupTotal.credit)}</td>
+          `;
+          tbody.appendChild(totalTr);
+        }
+      });
    });
  });

@@ -118,9 +268,10 @@ async function saveOpeningBalances() {
  const year = Number(document.getElementById("fiscalYear").value);

  const balances = accounts
-    // ❗ 排除 繰越利益
+    // ❗ 排除 繰越利益剰余金
    .filter(
      (a) =>
+        a.account_name !== "繰越利益剰余金" &&
        a.account_name !== "繰越利益" &&
        (Number(a.opening_debit) !== 0 || Number(a.opening_credit) !== 0)
    )
--- a/frontend/js/trial-balance.js
+++ b/frontend/js/trial-balance.js
@@ -1,32 +1,178 @@
 document.addEventListener("DOMContentLoaded", () => {
  console.log("trial-balance.js 已执行");
+
  const API_URL = "http://127.0.0.1:18080/trial-balance";

-  fetch(API_URL)
-    .then(r => { if (!r.ok) throw new Error("API 返回错误: " + r.status); return r.json(); })
-    .then(data => {
+  // デフォルト期間を計算（5/31決算：6月開始～現在月末）
+  function getDefaultPeriod() {
+    const today = new Date();
+    const currentYear = today.getFullYear();
+    const currentMonth = today.getMonth() + 1; // 1-12

-      console.log("试算表 API 数据:", data);
-      const tbody = document.querySelector("#trialBalanceTable tbody");
-      if (!tbody) { console.error("未找到 #trialBalanceTable tbody"); return; }
+    let fiscalStartYear, fiscalEndYear;

-      let totalDebit = 0, totalCredit = 0;
-      data.accounts.forEach(row => {
-        const debit = Number(row.debit ?? 0);
-        const credit = Number(row.credit ?? 0);
-        totalDebit += debit; totalCredit += credit;
+    // 6月～5月が1会計年度
+    if (currentMonth >= 6) {
+      // 6月以降：当年6月1日から
+      fiscalStartYear = currentYear;
+      fiscalEndYear = currentYear;
+    } else {
+      // 1-5月：前年6月1日から
+      fiscalStartYear = currentYear - 1;
+      fiscalEndYear = currentYear;
+    }

-        const tr = document.createElement("tr");
-        tr.innerHTML = `
-          <td class="left">${row.account_code}</td>
-          <td class="left">${row.account_name}</td>
-          <td>${debit.toLocaleString()}</td>
-          <td>${credit.toLocaleString()}</td>`;
-        tbody.appendChild(tr);
+    const dateFrom = `${fiscalStartYear}-06-01`;
+
+    // 現在月の末日を計算
+    const lastDayOfMonth = new Date(fiscalEndYear, currentMonth, 0).getDate();
+    const dateTo = `${fiscalEndYear}-${String(currentMonth).padStart(
+      2,
+      "0"
+    )}-${String(lastDayOfMonth).padStart(2, "0")}`;
+
+    return { dateFrom, dateTo };
+  }
+
+  // 試算表データを読み込む関数
+  function loadTrialBalance(dateFrom, dateTo) {
+    const url = `${API_URL}?date_from=${dateFrom}&date_to=${dateTo}`;
+    console.log("読み込み URL:", url);
+
+    fetch(url)
+      .then((r) => {
+        if (!r.ok) throw new Error("API 返回错误: " + r.status);
+        return r.json();
+      })
+      .then((data) => {
+        console.log("試算表 API データ:", data);
+
+        // 期間情報を更新
+        updatePeriodInfo(dateFrom, dateTo);
+
+        const tbody = document.querySelector("#trialBalanceTable tbody");
+        if (!tbody) {
+          console.error("未找到 #trialBalanceTable tbody");
+          return;
+        }
+
+        tbody.innerHTML = "";
+
+        let totalOpening = 0;
+        let totalDebit = 0;
+        let totalCredit = 0;
+        let totalClosing = 0;
+
+        data.accounts.forEach((row) => {
+          const debit = Number(row.debit ?? 0);
+          const credit = Number(row.credit ?? 0);
+          const opening = Number(row.opening_balance ?? 0);
+          const closing = Number(row.closing_balance ?? 0);
+
+          // =========================
+          // 行タイプ判定
+          // =========================
+          const isTotalRow = !row.account_code; // null / "" / undefined 全覆盖
+
+          // 明细行だけ合計に含める
+          if (!isTotalRow) {
+            totalOpening += opening;
+            totalDebit += debit;
+            totalCredit += credit;
+            totalClosing += closing;
+          }
+
+          const tr = document.createElement("tr");
+
+          if (isTotalRow) {
+            tr.classList.add("total-row");
+          }
+
+          const ratio = row.ratio ?? "0.00";
+
+          tr.innerHTML = `
+          <td class="left">${row.account_code ?? ""}</td>
+          <td class="left">${row.account_name ?? ""}</td>
+          <td class="right">${opening ? opening.toLocaleString() : ""}</td>
+          <td class="right">${debit ? debit.toLocaleString() : ""}</td>
+          <td class="right">${credit ? credit.toLocaleString() : ""}</td>
+          <td class="right">${closing ? closing.toLocaleString() : ""}</td>
+          <td class="right">${ratio}</td>
+        `;
+
+          tbody.appendChild(tr);
+        });
+
+        // =========================
+        // フッター合計
+        // =========================
+        document.getElementById("totalOpening").textContent =
+          totalOpening.toLocaleString();
+        document.getElementById("totalDebit").textContent =
+          totalDebit.toLocaleString();
+        document.getElementById("totalCredit").textContent =
+          totalCredit.toLocaleString();
+        document.getElementById("totalClosing").textContent =
+          totalClosing.toLocaleString();
+        document.getElementById("totalRatio").textContent =
+          data.totals?.ratio ?? "100.00";
+      })
+      .catch((err) => {
+        console.error("試算表読取失敗:", err);
+        alert("試算表読取失敗、コンソールログを確認してください");
      });
+  }

-      document.getElementById("totalDebit").textContent = totalDebit.toLocaleString();
-      document.getElementById("totalCredit").textContent = totalCredit.toLocaleString();
-    })
-    .catch(err => { console.error("試算表读取失败:", err); alert("試算表读取失败，请查看控制台日志"); });
+  // 期間情報を更新する関数
+  function updatePeriodInfo(dateFrom, dateTo) {
+    const fromDate = new Date(dateFrom);
+    const toDate = new Date(dateTo);
+
+    const fromYear = fromDate.getFullYear() - 2018; // 令和変換（2019年=令和1年）
+    const toYear = toDate.getFullYear() - 2018;
+
+    const periodText = `令和${fromYear}年 ${
+      fromDate.getMonth() + 1
+    }月 ${fromDate.getDate()}日 ～ 令和${toYear}年 ${
+      toDate.getMonth() + 1
+    }月 ${toDate.getDate()}日`;
+    document.getElementById("periodInfo").textContent = periodText;
+  }
+
+  // 検索ボタンのイベント
+  document.getElementById("btnSearch").addEventListener("click", () => {
+    const dateFrom = document.getElementById("dateFrom").value;
+    const dateTo = document.getElementById("dateTo").value;
+
+    if (!dateFrom || !dateTo) {
+      alert("開始年月日と終了年月日を入力してください");
+      return;
+    }
+
+    if (dateFrom > dateTo) {
+      alert("開始年月日は終了年月日より前の日付を指定してください");
+      return;
+    }
+
+    loadTrialBalance(dateFrom, dateTo);
+  });
+
+  // 全年度表示ボタンのイベント
+  document.getElementById("btnFullYear").addEventListener("click", () => {
+    const currentYear = new Date().getFullYear();
+    const dateFrom = `${currentYear}-01-01`;
+    const dateTo = `${currentYear}-12-31`;
+
+    document.getElementById("dateFrom").value = dateFrom;
+    document.getElementById("dateTo").value = dateTo;
+
+    loadTrialBalance(dateFrom, dateTo);
+  });
+
+  // 初期読み込み（5/31決算に対応）
+  const defaultPeriod = getDefaultPeriod();
+  document.getElementById("dateFrom").value = defaultPeriod.dateFrom;
+  document.getElementById("dateTo").value = defaultPeriod.dateTo;
+
+  loadTrialBalance(defaultPeriod.dateFrom, defaultPeriod.dateTo);
 });