wwt-certificate-tool 1.2.58 → 1.2.60

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.60</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}
@@ -183,6 +183,7 @@ tr.bad:hover td{background:#fbe9e9}
 .chkbox.generated{background:#dcfce7;border-color:#86efac;color:#166534}
 .chkbox.generated:hover{background:#bbf7d0}
 .genbadge{margin-left:4px;background:#22c55e;color:#fff;font-size:10px;font-weight:600;border-radius:4px;padding:1px 5px}
+.vnobadge{margin-left:4px;background:#f43f5e;color:#fff;font-size:10px;font-weight:600;border-radius:4px;padding:1px 5px}
 .rulecard{background:#fff;border:1px solid #dde2e8;border-radius:7px;padding:11px 13px;margin-bottom:9px}
 .rulecard.off{opacity:.55}
 .rulehead{display:flex;justify-content:space-between;align-items:center;gap:10px;flex-wrap:wrap}
@@ -320,7 +321,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.60</span></h1>
       <div class="sub">纯前端离线版 · 双击即用 · 数据只存在本机，不上传任何服务器</div>
     </div>
   </div>
@@ -1627,7 +1628,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, ",");
@@ -1737,6 +1741,7 @@ window.WWT_ENGINE = (function () {
     const usedRows = {};        // src -> Set(index)
     const globalExcludedUsed = {};  // 【P1.2.35】src -> Set(index)，全局排除行不进任何规则 rowsIn
     const stats = { rules: 0, rows: 0, vouchers: 0, entries: 0, skipped: [], totalRows: 0 };
+    const ruleVnos = {};        // rule.id -> {min,max} 每张凭证号范围
 
     for (const rule of (opts.rules || [])) {
       if (rule.enabled === false) continue;
@@ -1806,6 +1811,8 @@ window.WWT_ENGINE = (function () {
 
       for (const bucket of buckets) {
         const curVno = vno++;
+        if (!ruleVnos[rule.id]) ruleVnos[rule.id] = { min: curVno, max: curVno };
+        else ruleVnos[rule.id].max = Math.max(ruleVnos[rule.id].max, curVno);
         const curBill = billHead++;
         let eidx = 0;
         stats.vouchers++;
@@ -1825,7 +1832,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 +1864,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 +1880,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 +1924,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,
@@ -1995,7 +2005,7 @@ window.WWT_ENGINE = (function () {
         never_matched_rows: exclRows,
       });
     }
-    return { rows: out, missing: missing, stats: stats, index: idx, audit: { by_source: bySource } };
+    return { rows: out, missing: missing, stats: stats, index: idx, audit: { by_source: bySource }, ruleVnos: ruleVnos };
   }
 
   /* ---------------- 借贷平衡校验（按凭证号分组，容差 0.005） ---------------- */
@@ -2187,7 +2197,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 +2223,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 +2237,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 || "原单号";
@@ -2576,10 +2588,11 @@ const S = window.__STATE__ = {
   base:{}, biz:{}, draft:[], missing:[], balance:null,
   selRules:new Set(), cvOut:null, checkRows:null,
   genRules:new Set(),   // 【P1.2.50】已生成过凭证的规则 id，持久化到 localStorage
+  ruleVnos:{},          // 【P1.2.60】每条规则上次生成的凭证号范围
 };
 
 /* ---------------- 版本 & 框架自动更新（只更新程序本身，本地数据/规则不动） ---------------- */
-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.60';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';
@@ -2910,7 +2923,7 @@ function uid(){return 'VR'+Date.now().toString(36)+Math.random().toString(36).sl
 const LS='wwt_fe_cfg_v1';
 function saveCfg(){
   localStorage.setItem(LS,JSON.stringify({monthly:S.monthly,maps:S.maps,rules:S.rules,globalExcludes:S.globalExcludes||{},
-    generatedRuleIds:Array.from(S.genRules||[])}));
+    generatedRuleIds:Array.from(S.genRules||[]), ruleVnos:S.ruleVnos||{}}));
   toast('配置已保存到本机');
 }
 function loadCfg(){
@@ -2926,6 +2939,8 @@ function loadCfg(){
       S.globalExcludes=(o.globalExcludes&&typeof o.globalExcludes==='object')?o.globalExcludes:{};
       // 【P1.2.50】已生成凭证的规则状态持久化
       S.genRules=new Set(o.generatedRuleIds||[]);
+      // 【P1.2.60】规则生成的凭证号范围持久化
+      S.ruleVnos=(o.ruleVnos&&typeof o.ruleVnos==='object')?o.ruleVnos:{};
       return;
     }catch(e){}
   }
@@ -2934,6 +2949,7 @@ function loadCfg(){
   S.rules=deepCopy(P.rules||[]);
   S.globalExcludes={};
   S.genRules=new Set();
+  S.ruleVnos={};
 }
 
 /* ---------------- Excel 读取（SheetJS，失败自动走兜底） ---------------- */
@@ -3907,9 +3923,15 @@ function renderRuleChecks(){
   const list=filter==='all'?S.rules:S.rules.filter(r=>r.source===filter);
   $('ruleChecks').innerHTML=list.length?list.map(r=>{
     const generated=S.genRules.has(r.id);
+    const vnoInfo=S.ruleVnos[r.id];
+    let vnoBadge='';
+    if(vnoInfo){
+      const vtxt=vnoInfo.min===vnoInfo.max?String(vnoInfo.min):vnoInfo.min+'-'+vnoInfo.max;
+      vnoBadge='<span class="vnobadge" title="本规则生成的凭证号">凭证 '+esc(vtxt)+'</span>';
+    }
     return '<label class="chkbox'+(generated?' generated':'')+'"><input type="checkbox" data-rid="'+esc(r.id)+'" '+
     (S.selRules.has(r.id)?'checked':'')+' onchange="UI.toggleRuleSel(this)">'+
-    esc(r.name||r.id)+(generated?'<span class="genbadge">已生成</span>':'')+
+    esc(r.name||r.id)+(generated?'<span class="genbadge">已生成</span>':'')+vnoBadge+
     '<span style="color:#8b949e;font-size:11px">'+esc(r.source)+'</span></label>';
   }).join('')
     :'<div style="color:#8b949e;font-size:12px;padding:8px">当前来源「'+esc(filter)+'」没规则可勾选。切到「全部」或在「③ 规则配置」加规则。</div>';
@@ -4259,6 +4281,41 @@ function redrawRuleForm(){
 /* ============================================================
  * ④ 生成凭证
  * ============================================================ */
+
+// 【P1.2.60】多规则全选生成时，按以下优先级排序，让同类/同付款方式规则的凭证号相邻
+const GEN_PRIORITY_SOURCES = ['入库未确认','出库未确认','调拨未确认','在修车','已完工未结算'];
+const GEN_PRIORITY_PAYMENTS = ['对冲F','对账S','对账F','还件F','入库F','冲转S','冲转F','挂账','冲预收','冲预付','现金S','银行S','现金F','银行F'];
+function _uClean(s){ return String(s==null?'':s).trim(); }
+function detectRulePayment(r){
+  const conds=r.conditions||[];
+  for(const c of conds){
+    const f=_uClean(c.field||'');
+    if(/付款方式|支付方式|结算方式/.test(f)){
+      const v=_uClean(c.value||'');
+      for(const p of GEN_PRIORITY_PAYMENTS) if(v.indexOf(p)>=0) return p;
+    }
+  }
+  const name=_uClean(r.name||'');
+  for(const p of GEN_PRIORITY_PAYMENTS) if(name.indexOf(p)>=0) return p;
+  return '';
+}
+function rulePriorityKey(r){
+  const src=_uClean(r.source||'');
+  for(let i=0;i<GEN_PRIORITY_SOURCES.length;i++) if(src.indexOf(GEN_PRIORITY_SOURCES[i])>=0) return [0,i];
+  const pay=detectRulePayment(r);
+  const pi=GEN_PRIORITY_PAYMENTS.indexOf(pay);
+  if(pi>=0) return [1,pi];
+  return [2,0];
+}
+function sortRulesForGen(rules){
+  return rules.slice().sort((a,b)=>{
+    const ka=rulePriorityKey(a), kb=rulePriorityKey(b);
+    for(let i=0;i<ka.length;i++){ if(ka[i]!==kb[i]) return ka[i]-kb[i]; }
+    return 0;
+  });
+}
+window.WWT_RULE_PRIO={detectRulePayment, rulePriorityKey, sortRulesForGen};
+
 function doGenerate(){
   // 【P1.2.51】生成栏里的「凭证起始号」优先级最高：生成前把它写回 S.monthly，并同步到②映射页的输入框
   const vsInp=$('genVStart');
@@ -4276,11 +4333,15 @@ function doGenerate(){
   const date=$('genDate').value || S.monthly.date;
   if(!date){ toast('先填凭证日期（或在月度参数里填记账日期）'); return; }
   const sel=S.selRules.size?S.selRules:null;
+  // 【P1.2.60】多规则生成时按优先级排序；单条生成时保持原顺序
+  let genRules=S.rules.slice();
+  if(sel) genRules=genRules.filter(r=>sel.has(r.id));
+  if(genRules.length>1) genRules=sortRulesForGen(genRules);
   const t0=performance.now();
   let res;
   try{
     res=E.generate({
-      rules:S.rules, biz:S.biz, monthly:S.monthly, maps:S.maps, base:S.base,
+      rules:genRules, biz:S.biz, monthly:S.monthly, maps:S.maps, base:S.base,
       selectedIds:sel, modeOverride:$('genMode').value||'',
       groupByOverride:$('genGroupBy').value.trim()||'',
       voucherDate:date, syncBizDate:$('genSyncBiz').checked,
@@ -4291,6 +4352,8 @@ function doGenerate(){
   S.balance=E.balanceCheck(S.draft);
   // 【P1.2.50】标记实际生成了凭证的规则为「已生成」，持久化到 localStorage
   (res.rows||[]).forEach(r=>{ const rid=r['规则编号']; if(rid) S.genRules.add(String(rid)); });
+  // 【P1.2.60】记录每条规则本次生成的凭证号范围，回显到规则卡片上
+  S.ruleVnos=res.ruleVnos||{};
   DB.put('misc','draft',S.draft); DB.put('misc','missing',S.missing);
   saveCfg();
   renderRuleChecks();
@@ -5953,8 +6016,9 @@ window.UI={
   toggleRuleBody:i=>{const b=$('rb'+i);if(b)b.classList.toggle('on');},
   toggleRuleSel:cb=>{cb.checked?S.selRules.add(cb.dataset.rid):S.selRules['delete'](cb.dataset.rid);},
   selAllRules:v=>{S.selRules.clear();if(v)S.rules.forEach(r=>S.selRules.add(r.id));renderRuleChecks();},
+  renderRuleChecks:renderRuleChecks,
   // 【P1.2.50】清空「已生成」绿色标记（规则删除时也会同步清理）
-  clearGenerated:()=>{ if(!S.genRules.size){ toast('没有已生成标记可清空'); return; } if(!confirm('确定清空全部「已生成」绿色标记？已生成的凭证草稿不会受影响。'))return; S.genRules.clear(); saveCfg(); renderRuleChecks(); toast('已清空生成标记'); },
+  clearGenerated:()=>{ if(!S.genRules.size){ toast('没有已生成标记可清空'); return; } if(!confirm('确定清空全部「已生成」绿色标记？已生成的凭证草稿不会受影响。'))return; S.genRules.clear(); S.ruleVnos={}; saveCfg(); renderRuleChecks(); toast('已清空生成标记'); },
   // 【P1.2.35】全局排除弹窗：按业务源分组的总开关（在外面，不嵌在每条规则里）
   openGlobalExcludes:()=>{
     const ge = S.globalExcludes || (S.globalExcludes = {});

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

package/package.json

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