wwt-certificate-tool 1.2.58 → 1.2.59

package/dist/app.html

@@ -3,7 +3,7 @@
 <head>
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width,initial-scale=1">
-<title>WWT 金蝶凭证工具 · 纯前端版 P1.2.58</title>
+<title>WWT 金蝶凭证工具 · 纯前端版 P1.2.59</title>
 <style>*{box-sizing:border-box;margin:0;padding:0}
 body{font-family:"Microsoft YaHei","PingFang SC",-apple-system,Segoe UI,sans-serif;font-size:13px;color:#1f2328;background:#f4f6f9;line-height:1.6}
 h1{font-size:17px;font-weight:600}
@@ -320,7 +320,7 @@ input[data-f="field"][list^="dlGe_"]::placeholder{color:#a8861f;font-style:itali
   <div class="brand">
     <span class="logo">WWT</span>
     <div>
-      <h1>金蝶凭证工具 <span class="ver">P1.2.58</span></h1>
+      <h1>金蝶凭证工具 <span class="ver">P1.2.59</span></h1>
       <div class="sub">纯前端离线版 · 双击即用 · 数据只存在本机，不上传任何服务器</div>
     </div>
   </div>
@@ -1627,7 +1627,10 @@ window.WWT_ENGINE = (function () {
     ctx["来源"] = curSrc;
     ctx["单据类型"] = danlei; ctx["单类"] = danlei;
     ctx["对方"] = uniqJoin(items, partyFields, "/", curSrc);
-    ctx["单位名称"] = ctx["对方"]; ctx["供应商名称"] = ctx["对方"];
+    // P1.2.59：{单位名称}/{供应商名称} 必须各自取对应字段，不能等价于 {对方}，
+    // 否则全部汇总按单位名称分组后，同一单位下多个供应商会被 / 拼接进摘要。
+    ctx["单位名称"] = uniqJoin(items, ["单位名称"], "/", curSrc) || ctx["对方"];
+    ctx["供应商名称"] = uniqJoin(items, ["供应商名称"], "/", curSrc) || ctx["对方"];
     ctx["厂牌"] = uniqJoin(items, ["厂牌"], "/", curSrc);
     ctx["收入板块"] = uniqJoin(items, ["收入板块"], "/", curSrc);
     ctx["原单号"] = truncateBiz(orig, ",");
@@ -1825,7 +1828,7 @@ window.WWT_ENGINE = (function () {
         }
 
         for (const sub of subMap.values()) {
-          const sumCtx = buildSummaryCtx(sub.items, rule, curSrc);
+          const subCtx = buildSummaryCtx(sub.items, rule, curSrc);
           // 业务日期取组内最早
           const meta = C.SOURCE_META[curSrc] || {};
           let bizDate = "";
@@ -1857,9 +1860,10 @@ window.WWT_ENGINE = (function () {
               const dimKey = Object.keys(dv).sort().map(d => [d, dv[d].name]);
               const gkey = JSON.stringify([subj, dimKey, splitT]);
               if (!groups.has(gkey)) {
-                groups.set(gkey, { subj: subj, dv: dv, sgn: 0, vals: {}, first: it });
+                groups.set(gkey, { subj: subj, dv: dv, sgn: 0, vals: {}, first: it, items: [] });
               }
               const g = groups.get(gkey);
+              g.items.push(it);
               g.sgn += sumAmtExpr(it.row, line.amountField);
               lineSplitFs.forEach((f, fi) => {
                 const v = splitT[fi];
@@ -1872,6 +1876,8 @@ window.WWT_ENGINE = (function () {
               const amt = Math.abs(signed);
               if (amt <= 0) continue;                 // 净额 ≤ 0 跳过
               eidx++;
+              // P1.2.59 摘要上下文按最终分录小组构建，避免全组供应商拼接
+              const sumCtx = buildSummaryCtx(g.items, rule, curSrc);
               const splitVals = {};
               for (const f in g.vals) splitVals[f] = truncateBiz(g.vals[f].join(","), ",");
               const metaNo = meta.no || "原单号";
@@ -1914,7 +1920,7 @@ window.WWT_ENGINE = (function () {
                 const metaNo = meta.no || "原单号";
                 entries.push(makeEntry({
                   vno: curVno, eidx: eidx, acctDate: acctDate, bizDate: useBizDate,
-                  summary: fillSummary(line.summary || rule.name, sumCtx, {}, rule),
+                  summary: fillSummary(line.summary || rule.name, subCtx, {}, rule),
                   subj: subj, subjName: idx.subjectName(subj),
                   debit: side === "借" ? amt : 0, credit: side === "贷" ? amt : 0,
                   settleBiz: payRaw, settleCode: settleCode, settleName: settleName,
@@ -2187,7 +2193,6 @@ window.WWT_ENGINE = (function () {
             subMap.get(k).items.push(it);
           }
           for (const sub of subMap.values()) {
-            const sumCtx = buildSummaryCtx(sub.items, r, curSrc);
             const meta = C.SOURCE_META[curSrc] || {};
             let bizDate = "";
             if (meta.datecol) {
@@ -2214,8 +2219,9 @@ window.WWT_ENGINE = (function () {
                 const splitT = lineSplitFs.map(f => clean(it.row[f]));
                 const dimKey = Object.keys(dv).sort().map(d => [d, dv[d].name]);
                 const gkey = JSON.stringify([subj, dimKey, splitT]);
-                if (!groups.has(gkey)) groups.set(gkey, { subj: subj, dv: dv, sgn: 0, vals: {}, first: it });
+                if (!groups.has(gkey)) groups.set(gkey, { subj: subj, dv: dv, sgn: 0, vals: {}, first: it, items: [] });
                 const g = groups.get(gkey);
+                g.items.push(it);
                 g.sgn += sumAmtExpr(it.row, line.amountField);
                 lineSplitFs.forEach((f, fi) => {
                   const v = splitT[fi];
@@ -2227,6 +2233,8 @@ window.WWT_ENGINE = (function () {
                 const amt = Math.abs(signed);
                 if (amt <= 0) continue;
                 eidx++;
+                // P1.2.59 摘要上下文按最终分录小组构建，避免全组供应商拼接
+                const sumCtx = buildSummaryCtx(g.items, r, curSrc);
                 const splitVals = {};
                 for (const f in g.vals) splitVals[f] = truncateBiz(g.vals[f].join(","), ",");
                 const metaNo = meta.no || "原单号";
@@ -2579,7 +2587,7 @@ const S = window.__STATE__ = {
 };
 
 /* ---------------- 版本 & 框架自动更新（只更新程序本身，本地数据/规则不动） ---------------- */
-const WWT_VER=(function(){const raw='P1.2.58';return raw.indexOf('__WVER__')>=0?'P1.2.10':raw;})();
+const WWT_VER=(function(){const raw='P1.2.59';return raw.indexOf('__WVER__')>=0?'P1.2.10':raw;})();
 const UPD_URL_KEY='wwt_fe_updurl';
 // 默认更新源：Gitee 上本项目的 version.json（API 接口，浏览器可直接跨域读）
 const DEFAULT_UPD_URL='https://gitee.com/api/v5/repos/wwtmrhu/certificate-generation/contents/dist/version.json';

package/dist/version.json

@@ -1,8 +1,8 @@
 {
-  "ver": "P1.2.58",
-  "npm": "1.2.58",
-  "url": "https://cdn.jsdelivr.net/npm/wwt-certificate-tool@1.2.58/dist/app.html",
-  "url_unpkg": "https://unpkg.com/wwt-certificate-tool@1.2.58/dist/app.html",
-  "url_gh": "https://api.github.com/repos/huweipei745839/certificate-generation/contents/dist/WWT%E5%87%AD%E8%AF%81%E5%B7%A5%E5%85%B7_P1.2.58.html",
-  "note": "① 内置默认基础表/规则/映射：新安装或分享打开即自带当前这套标准配置。② 生成凭证后实际生成了凭证的规则自动变绿并显示「已生成」徽章，状态持久化。③ 新增「清空已生成」按钮。④ 凭证起始号放到「④ 生成凭证」页生成栏。⑤ 对碰检测跳过未结算单据，缺失清单增加「单号」与「付款方式/结算方式」列。⑥ 凭证审核表「核算维度」列移到「科目名称」后。⑦ 分录级拆分字段：每条分录可单独设置拆分字段，实现一张凭证内借方按单号拆、贷方汇总等混合拆分。⑧ 【P1.2.55】顶部工具栏增加「清空业务数据」按钮，只清本月业务数据表，保留基础数据、规则、映射和配置。⑨ 【P1.2.56】生成/审核自动跳过 Excel 底部的「合计/小计/总计」行，避免汇总金额被重复累加（如 人进价 145万 翻倍的翻倍问题）；合计行在编辑器内仍可见、只是不参与凭证生成。⑩ 【P1.2.57】修复合计行识别：扫描行内所有字段，避免「合计」写在摘要/备注/行类型等非标识列时仍被误当作数据行累加。⑪ 【P1.2.58】合计行兜底识别：若某行「单位名称/供应商名称/单号等标识列全空 + 有非零金额」（即合计行无合计字样），也判定为合计行跳过，彻底杜绝金额翻倍。"
+  "ver": "P1.2.59",
+  "npm": "1.2.59",
+  "url": "https://cdn.jsdelivr.net/npm/wwt-certificate-tool@1.2.59/dist/app.html",
+  "url_unpkg": "https://unpkg.com/wwt-certificate-tool@1.2.59/dist/app.html",
+  "url_gh": "https://api.github.com/repos/huweipei745839/certificate-generation/contents/dist/WWT%E5%87%AD%E8%AF%81%E5%B7%A5%E5%85%B7_P1.2.59.html",
+  "note": "① 内置默认基础表/规则/映射：新安装或分享打开即自带当前这套标准配置。② 生成凭证后实际生成了凭证的规则自动变绿并显示「已生成」徽章，状态持久化。③ 新增「清空已生成」按钮。④ 凭证起始号放到「④ 生成凭证」页生成栏。⑤ 对碰检测跳过未结算单据，缺失清单增加「单号」与「付款方式/结算方式」列。⑥ 凭证审核表「核算维度」列移到「科目名称」后。⑦ 分录级拆分字段：每条分录可单独设置拆分字段，实现一张凭证内借方按单号拆、贷方汇总等混合拆分。⑧ 【P1.2.55】顶部工具栏增加「清空业务数据」按钮，只清本月业务数据表，保留基础数据、规则、映射和配置。⑨ 【P1.2.56】生成/审核自动跳过 Excel 底部的「合计/小计/总计」行，避免汇总金额被重复累加（如 人进价 145万 翻倍的翻倍问题）；合计行在编辑器内仍可见、只是不参与凭证生成。⑩ 【P1.2.57】修复合计行识别：扫描行内所有字段，避免「合计」写在摘要/备注/行类型等非标识列时仍被误当作数据行累加。⑪ 【P1.2.58】合计行兜底识别：若某行「单位名称/供应商名称/单号等标识列全空 + 有非零金额」（即合计行无合计字样），也判定为合计行跳过，彻底杜绝金额翻倍。⑫ 【P1.2.59】修复全部汇总模式下摘要把全组供应商拼接的问题：{供应商名称}/{单位名称} 各自读取对应字段，且摘要上下文按最终分录小组构建，同一凭证内多个供应商不再互相串到摘要里。"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wwt-certificate-tool",
-  "version": "1.2.58",
+  "version": "1.2.59",
   "description": "WWT 金蝶凭证工具 · 纯前端版（离线单文件 HTML，双击即用）",
   "keywords": [
     "WWT",