From c97d7e79959e39f370679bec04414976bbba96a5 Mon Sep 17 00:00:00 2001
From: hjhan <hongjun.han@yieldchain.com>
Date: Thu, 30 Jul 2026 10:06:21 +0800
Subject: [PATCH] =?UTF-8?q?feat(diag):=20=E5=8F=AF=E4=BF=9D=E7=95=99?=
 =?UTF-8?q?=E8=B0=83=E8=AF=95=E6=97=A5=E5=BF=97+=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=AF=E8=BF=BD=E6=BA=AF=E6=9C=BA=E5=88=B6=EF=BC=88=E9=98=B6?=
 =?UTF-8?q?=E6=AE=B50.5=E6=AD=A2=E8=A1=80=E5=A2=9E=E5=BC=BA=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

解决 EQD-6838 排查时硬编码版本号 v20260729a 散落3处、无法按需开关、
看不到实际加载缓存戳的问题。

层1 运行时开关（核心）：
- HtmlUtil.cs 新增 GitCommit（读 AssemblyInformationalVersion，零新依赖）
- _MainLayout.cshtml 注入 window.ylotc.__diag（jsVersion+git+built）
- main.js 顶部新增 otcDebug 工具（banner+log），debug 默认 false 生产零输出
- swapTradeEdit.js / fastVue.base.js 硬编码标记改为 otcDebug.banner
- 开启方式：URL ?otcdebug=1（会话）或 localStorage.setItem('otcdebug','1')（持久）

层2 构建守卫：
- pre-commit 新增第三块 bundle 版本一致性检查（rebuild-bundles.py --verify）
- 修复 Windows python3 Store stub 不可用问题（优先用 python）
- 注：bundle 头部不注入 git sha（会随 commit 变化导致 verify 永久失败），
  版本可追溯完全由运行时 __diag（后端注入）覆盖

层3 单测预防：
- 新增 diag.test.js（213测试之一），用 console spy 守卫开关行为
- 断言不再含硬编码 v20260729a + 防止第二套调试开关回归

验证：11 suites/213 tests 全绿，--verify 通过，C# 编译0错误
---
 YLErpWeb/Common/HtmlUtil.cs                   |  15 +-
 YLErpWeb/Views/Shared/_MainLayout.cshtml      |  12 ++
 YLErpWeb/fe-tests/diag.test.js                | 177 ++++++++++++++++++
 YLErpWeb/fe-tests/hooks/pre-commit            |  35 +++-
 .../Scripts/app/swaptrade/swapTradeEdit.js    |   5 +-
 YLErpWeb/wwwroot/Scripts/base/main.js         |  20 ++
 YLErpWeb/wwwroot/Scripts/fast/fastVue.base.js |  10 +-
 YLErpWeb/wwwroot/Statics/bundles/bundle.js    |  30 ++-
 YLErpWeb/wwwroot/Statics/bundles/bundleV2.js  |  20 ++
 9 files changed, 316 insertions(+), 8 deletions(-)
 create mode 100644 YLErpWeb/fe-tests/diag.test.js

diff --git a/YLErpWeb/Common/HtmlUtil.cs b/YLErpWeb/Common/HtmlUtil.cs
index cc3e6247..1292f24e 100644
--- a/YLErpWeb/Common/HtmlUtil.cs
+++ b/YLErpWeb/Common/HtmlUtil.cs
@@ -1,5 +1,5 @@
 using Microsoft.AspNetCore.Html;
-using System.Collections;
+using System.Reflection;
 using YLErp.Events;
 
 namespace YLErp
@@ -17,6 +17,12 @@ namespace YLErp
         //bin目录文件版本
         public static readonly DateTime BinFileVersion;
 
+        /// <summary>
+        /// Git提交哈希（取自程序集 AssemblyInformationalVersion，由.NET SDK在编译时自动生成，
+        /// 格式 "1.0.0+&lt;sha&gt;"；前端诊断信息用它精确定位是哪次提交的部署）。
+        /// </summary>
+        public static readonly string GitCommit;
+
         static long _dataCacheUpdateTime;
 
         static HtmlUtil()
@@ -27,6 +33,13 @@ namespace YLErp
             BinFileVersion = files.Any() ? files.Max(n => n.LastWriteTime) : DateTime.MinValue;
             JsVersion = BinFileVersion.ToString("yyMMddHHmmss");
 
+            //从 AssemblyInformationalVersion 读取 git sha（SDK 编译时已嵌入，零额外依赖）
+            var infoVer = typeof(HtmlUtil).Assembly
+                .GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion;
+            //格式 "1.0.0+<sha>"，取 + 之后部分；无则回退到完整字符串
+            GitCommit = string.IsNullOrEmpty(infoVer) ? "unknown"
+                : (infoVer.Contains('+') ? infoVer.Substring(infoVer.LastIndexOf('+') + 1) : infoVer);
+
             EventBus.Subscribe<DataCacheUpdateEvent>(t =>
             {
                 _dataCacheUpdateTime = DateTimeOffset.Now.ToUnixTimeSeconds();
diff --git a/YLErpWeb/Views/Shared/_MainLayout.cshtml b/YLErpWeb/Views/Shared/_MainLayout.cshtml
index 07b5b054..59716859 100644
--- a/YLErpWeb/Views/Shared/_MainLayout.cshtml
+++ b/YLErpWeb/Views/Shared/_MainLayout.cshtml
@@ -157,6 +157,18 @@
     </script>
 
     <script type="text/javascript">
+        // 运行时诊断信息（排查用）：URL 加 ?otcdebug=1（当前会话）或控制台 localStorage.setItem('otcdebug','1')（持久）开启详细日志
+        // 挂在已存在的 window.ylotc 命名空间上，供后续 bundle.js / fastVue / 业务脚本读取；debug 默认 false，生产零输出
+        window.ylotc = window.ylotc || {};
+        window.ylotc.__diag = {
+            debug: /[?&]otcdebug=1/.test(location.search) || (function () { try { return localStorage.getItem('otcdebug') === '1'; } catch (e) { return false; } })(),
+            jsVersion: '@HtmlUtil.JsVersion',
+            git: '@HtmlUtil.GitCommit',
+            built: '@(HtmlUtil.BinFileVersion.ToString("yyyy-MM-dd HH:mm:ss"))'
+        };
+        if (window.ylotc.__diag.debug && window.console) {
+            console.log('%c[OTC diag] ' + JSON.stringify(window.ylotc.__diag), 'color:#0a0;font-weight:bold');
+        }
         var rootpath = '@Url.Content("~/")';
         var main = main || { version: "1.1" };
         main.rights = main.rights || {};
diff --git a/YLErpWeb/fe-tests/diag.test.js b/YLErpWeb/fe-tests/diag.test.js
new file mode 100644
index 00000000..b47c3ff2
--- /dev/null
+++ b/YLErpWeb/fe-tests/diag.test.js
@@ -0,0 +1,177 @@
+/**
+ * diag.test.js — 运行时诊断机制测试（版本可追溯 + 可控调试日志）
+ * ============================================================================
+ * 目的：守卫"可保留调试日志 + 版本可追溯"机制，让排查 EQD-6838 这类"改了不生效"
+ *       问题时，F12 能一键开启详细日志并看到精确版本（jsVersion + git sha）。
+ *
+ * 覆盖：
+ *   1. 开关解析：URL ?otcdebug=1 / localStorage.otcdebug=1 解析正确
+ *   2. 静默性：debug=false 时 otcDebug 不输出（生产零噪音）
+ *   3. banner 格式：debug=true 时输出含 jsVersion + git（版本可追溯）
+ *   4. 防回归：业务文件不再硬编码 v20260729a 这类易过期的版本串
+ *
+ * 建立 console spy 先例：项目此前零 `jest.spyOn(console)` 用法，本测试建立范式。
+ *
+ * 运行：cd YLErpWeb/fe-tests && npx jest diag
+ */
+
+const { JSDOM } = require('jsdom');
+const fs = require('fs');
+const path = require('path');
+
+// ---- 与 main.js 顶部一致的 otcDebug 实现（行为黄金标准） ----
+// 为什么复制而非 require main.js：main.js 第 5 行 `main.extend = $.extend` 依赖 jQuery+lodash，
+// 完整 require 代价过大；otcDebug 工具是纯函数（不依赖 $），提取出来做行为验证最干净。
+// main.js 源码一致性由下方"源码守卫"用例保证（断言关键片段存在）。
+function createOtcDebug(diag) {
+    var __otcDiag = diag || { debug: false };
+    return {
+        banner: function (name, ver) {
+            if (!__otcDiag.debug || !console) return;
+            var git = (__otcDiag.git || '').slice(0, 7);
+            console.log('%c[' + name + '] v' + ver + ' (bundle=' + __otcDiag.jsVersion + ', git=' + git + ', built=' + __otcDiag.built + ')',
+                'color:#06c;font-weight:bold');
+        },
+        log: function () {
+            if (!__otcDiag.debug || !console) return;
+            console.log.apply(console, arguments);
+        }
+    };
+}
+
+// ---- 与 _MainLayout.cshtml 一致的 diag 开关解析（行为黄金标准） ----
+function parseDebugFlag(search, localStorageValue) {
+    return /[?&]otcdebug=1/.test(search)
+        || (localStorageValue === '1');
+}
+
+describe('diag: 开关解析（URL / localStorage）', () => {
+    test('?otcdebug=1 在 query 中 → 开启', () => {
+        expect(parseDebugFlag('?otcdebug=1', null)).toBe(true);
+        expect(parseDebugFlag('/swap/edit?otcdebug=1&id=5', null)).toBe(true);
+    });
+    test('?otcdebug=1 作为唯一参数 → 开启', () => {
+        expect(parseDebugFlag('?otcdebug=1', null)).toBe(true);
+    });
+    test('URL 无参数 → 关闭', () => {
+        expect(parseDebugFlag('', null)).toBe(false);
+        expect(parseDebugFlag('/swap/edit', null)).toBe(false);
+    });
+    test('localStorage.otcdebug=1 → 持久开启', () => {
+        expect(parseDebugFlag('', '1')).toBe(true);
+    });
+    test('localStorage 其它值 → 关闭', () => {
+        expect(parseDebugFlag('', null)).toBe(false);
+        expect(parseDebugFlag('', '0')).toBe(false);
+        expect(parseDebugFlag('', '')).toBe(false);
+    });
+    test('URL 和 localStorage 任一为真即开启（OR 语义）', () => {
+        expect(parseDebugFlag('?otcdebug=1', '0')).toBe(true);
+        expect(parseDebugFlag('', '1')).toBe(true);
+        expect(parseDebugFlag('?foo=bar', '0')).toBe(false);
+    });
+});
+
+describe('diag: otcDebug 静默性（debug=false 生产零输出）', () => {
+    let logSpy;
+    beforeEach(() => { logSpy = jest.spyOn(console, 'log').mockImplementation(() => {}); });
+    afterEach(() => { logSpy.mockRestore(); });
+
+    test('debug=false 时 banner 不输出', () => {
+        const dbg = createOtcDebug({ debug: false, jsVersion: '2507300000', git: 'abc1234', built: '2026-07-30' });
+        dbg.banner('swapTradeEdit.js', '1.4.2');
+        expect(logSpy).not.toHaveBeenCalled();
+    });
+    test('debug=false 时 log 不输出', () => {
+        const dbg = createOtcDebug({ debug: false });
+        dbg.log('排查信息', { a: 1 });
+        expect(logSpy).not.toHaveBeenCalled();
+    });
+    test('无 diag 对象时默认静默', () => {
+        const dbg = createOtcDebug(undefined);
+        dbg.banner('x', '1'); dbg.log('y');
+        expect(logSpy).not.toHaveBeenCalled();
+    });
+});
+
+describe('diag: banner 输出含完整版本信息（可追溯）', () => {
+    let logSpy;
+    beforeEach(() => { logSpy = jest.spyOn(console, 'log').mockImplementation(() => {}); });
+    afterEach(() => { logSpy.mockRestore(); });
+
+    test('banner 输出包含 模块名 + jsVersion + git sha 前7位 + built', () => {
+        const diag = { debug: true, jsVersion: '2507301200', git: 'f5ed65aac5f93028', built: '2026-07-30 10:00:00' };
+        const dbg = createOtcDebug(diag);
+        dbg.banner('swapTradeEdit.js', '1.4.2');
+        expect(logSpy).toHaveBeenCalledTimes(1);
+        const out = logSpy.mock.calls[0][0];
+        expect(out).toContain('swapTradeEdit.js');
+        expect(out).toContain('1.4.2');
+        expect(out).toContain('2507301200');           // jsVersion
+        expect(out).toContain('f5ed65a');               // git sha 前7位（被 slice 截断）
+        expect(out).not.toContain('f5ed65aac5f93028');  // 不含完整 sha（避免 console 过长）
+        expect(out).toContain('2026-07-30 10:00:00');   // built
+    });
+    test('log 透传所有参数', () => {
+        const dbg = createOtcDebug({ debug: true });
+        dbg.log('事件', 'keydown', { key: 'Enter' });
+        expect(logSpy).toHaveBeenCalledTimes(1);
+        expect(logSpy.mock.calls[0]).toEqual(['事件', 'keydown', { key: 'Enter' }]);
+    });
+    test('git 缺失时 banner 不崩（输出 git= 空）', () => {
+        const dbg = createOtcDebug({ debug: true, jsVersion: '1', git: undefined, built: '' });
+        expect(() => dbg.banner('m', '1')).not.toThrow();
+        expect(logSpy.mock.calls[0][0]).toContain('git=');
+    });
+});
+
+describe('diag: 源码守卫（防回归——不许再硬编码易过期版本串）', () => {
+    const SCRIPTS = path.join(__dirname, '..', 'wwwroot', 'Scripts');
+
+    test('swapTradeEdit.js 顶部 banner 不再硬编码 v20260729a', () => {
+        const src = fs.readFileSync(path.join(SCRIPTS, 'app/swaptrade/swapTradeEdit.js'), 'utf8');
+        expect(src).not.toContain('v20260729a');
+        // 必须改为受开关控制的动态 banner
+        expect(src).toMatch(/otcDebug\.banner|window\.ylotc\.__diag/);
+    });
+
+    test('fastVue.base.js 顶部 banner 不再硬编码 v20260729a', () => {
+        const src = fs.readFileSync(path.join(SCRIPTS, 'fast/fastVue.base.js'), 'utf8');
+        expect(src).not.toContain('v20260729a');
+        expect(src).toMatch(/window\.ylotc\.__diag/);
+    });
+
+    test('main.js 提供 otcDebug 工具且挂在 window', () => {
+        const src = fs.readFileSync(path.join(SCRIPTS, 'base/main.js'), 'utf8');
+        expect(src).toContain('window.otcDebug');
+        expect(src).toContain('window.ylotc.__diag');
+        // 工具必须实现 banner + log 两个方法
+        expect(src).toMatch(/banner\s*[:=]\s*function/);
+        expect(src).toMatch(/log\s*[:=]\s*function/);
+    });
+
+    test('main.js 不存在第二套调试开关（机制 A 防回归）', () => {
+        // 历史教训：曾同时存在两套重叠的调试开关——
+        //   机制A: ?debug=1 / localStorage.__yl_debug__ / main.debugLog/debugBanner
+        //   机制B: ?otcdebug=1 / localStorage.otcdebug / window.otcDebug（统一方案，保留）
+        // 两套并存导致排查者记两套参数、两个前缀、fallback 分支。本守卫确保只有一套。
+        const src = fs.readFileSync(path.join(SCRIPTS, 'base/main.js'), 'utf8');
+        expect(src).not.toContain('main.debugLog');
+        expect(src).not.toContain('main.debugWarn');
+        expect(src).not.toContain('main.debugError');
+        expect(src).not.toContain('main.debugBanner');
+        expect(src).not.toContain('main.setDebug');
+        expect(src).not.toContain('__yl_debug__');
+        expect(src).not.toContain('?debug=1');
+    });
+
+    test('bundle 产物不再含硬编码 v20260729a（源文件已清除，重建产物自然不含）', () => {
+        // 版本可追溯不靠 bundle 头部注释（那会随 commit 变化导致 verify 永久失败），
+        // 而是靠运行时 window.ylotc.__diag（后端 HtmlUtil.GitCommit 注入）+ otcDebug.banner。
+        // 本守卫确保源文件的硬编码清除后，重建产物不会重新带回它。
+        const bundle = path.join(__dirname, '..', 'wwwroot', 'Statics', 'bundles', 'bundle.js');
+        if (!fs.existsSync(bundle)) return; // 产物可能尚未重建，跳过
+        const src = fs.readFileSync(bundle, 'utf8');
+        expect(src).not.toContain('v20260729a');
+    });
+});
diff --git a/YLErpWeb/fe-tests/hooks/pre-commit b/YLErpWeb/fe-tests/hooks/pre-commit
index a7e9f734..1f817380 100755
--- a/YLErpWeb/fe-tests/hooks/pre-commit
+++ b/YLErpWeb/fe-tests/hooks/pre-commit
@@ -2,9 +2,10 @@
 # =============================================================================
 # pre-commit — 提交前自动守卫
 # =============================================================================
-# 做两件事（任一失败即阻断提交）：
+# 做三件事（任一失败即阻断提交）：
 #   1. guard_arch.js   — 扫描新增/修改行，禁止在 Vue 组件里内联金额计算
 #   2. jest             — 跑前端单测，确保不引入回归
+#   3. bundle 校验      — rebuild-bundles.py --verify，拦截"改源文件忘重新打 bundle"
 #
 # 安装方式（开发者只需执行一次）：
 #   cd <repo-root>
@@ -85,5 +86,37 @@ else
     echo -e "${YELLOW}  建议：cd YLErpWeb/fe-tests && npm install${NC}"
 fi
 
+# -----------------------------------------------------------------------------
+# 3. bundle 版本一致性 — 拦截"改了源文件却忘重新打 bundle"
+# -----------------------------------------------------------------------------
+# EQD-6838 踩坑：8 次提交只为解决"改源文件没生效"。本检查在提交前用
+# rebuild-bundles.py --verify 逐字节比对产物与源文件，不同步则阻断。
+# 仅在有 bundle 相关改动时跑（Scripts 源文件 或 bundles 产物 任一改动）。
+if command -v python &>/dev/null || command -v python3 &>/dev/null; then
+    # 选可用的 python：优先 python（Windows 上 python3 可能是微软 Store 的 stub，不可用）
+    if command -v python &>/dev/null && python -c 'print(1)' &>/dev/null; then
+        PY=python
+    else
+        PY=python3
+    fi
+    BUNDLE_SRC_CHANGED=$(git diff --cached --name-only --diff-filter=ACM -- "*.js" | grep "wwwroot/Scripts/" || true)
+    BUNDLE_OUT_CHANGED=$(git diff --cached --name-only --diff-filter=ACM -- "YLErpWeb/wwwroot/Statics/bundles/" || true)
+    if [ -n "$BUNDLE_SRC_CHANGED" ] || [ -n "$BUNDLE_OUT_CHANGED" ]; then
+        echo -e "${YELLOW}[pre-commit] ③ bundle 版本一致性 (rebuild-bundles.py --verify)...${NC}"
+        if ($PY "$REPO_ROOT/YLErpWeb/rebuild-bundles.py" --verify 2>&1); then
+            echo -e "${GREEN}[pre-commit] ✅ bundle 产物与源文件同步${NC}"
+        else
+            echo -e "${RED}[pre-commit] ❌ bundle 产物与源文件不同步，提交被阻断${NC}"
+            echo -e "${YELLOW}  请运行：python YLErpWeb/rebuild-bundles.py 重建并提交产物${NC}"
+            echo -e "${YELLOW}  或用 git commit --no-verify 跳过（不推荐）${NC}"
+            exit 1
+        fi
+    else
+        echo -e "${GREEN}[pre-commit] ⏭️  无 bundle 相关改动，跳过 bundle 校验${NC}"
+    fi
+else
+    echo -e "${YELLOW}[pre-commit] ⚠️  未找到 python，跳过 bundle 校验${NC}"
+fi
+
 echo -e "${GREEN}[pre-commit] ✅ 所有守卫检查通过，继续提交${NC}"
 exit 0
diff --git a/YLErpWeb/wwwroot/Scripts/app/swaptrade/swapTradeEdit.js b/YLErpWeb/wwwroot/Scripts/app/swaptrade/swapTradeEdit.js
index a6b7b519..421dd26b 100644
--- a/YLErpWeb/wwwroot/Scripts/app/swaptrade/swapTradeEdit.js
+++ b/YLErpWeb/wwwroot/Scripts/app/swaptrade/swapTradeEdit.js
@@ -1,7 +1,8 @@
 //otcformat禁止千分位分组
 window.otcformat.options.disableGrouping = true;
-// 版本标记（排查用）：F12 Console 看到 v20260729a 说明加载的是最新版本
-console.log('[swapTradeEdit.js] v20260729a loaded');
+// 模块加载横幅（排查用）：仅在 ?otcdebug=1 或 localStorage.otcdebug=1 开启时打印，含 bundle 版本+git sha。
+// otcDebug 由 main.js 提供（在 bundle.js 内），本文件是独立 <script> 且晚于 bundle.js 加载，故 otcDebug 必已就绪。
+otcDebug.banner('swapTradeEdit.js', '1.4.2');
 
 const consClients = ylotc.clients;
 const consTraders = ylotc.traders;
diff --git a/YLErpWeb/wwwroot/Scripts/base/main.js b/YLErpWeb/wwwroot/Scripts/base/main.js
index 9c703d63..a0f0beeb 100644
--- a/YLErpWeb/wwwroot/Scripts/base/main.js
+++ b/YLErpWeb/wwwroot/Scripts/base/main.js
@@ -1,5 +1,25 @@
 //依赖类库:lodash.js + jquery + jquery.validate + bootstrap.emodal.js
 
+// 统一调试日志工具：仅在 otcdebug 开启时输出，默认静默（生产零噪音）。
+// 开启方式：URL 加 ?otcdebug=1，或控制台 localStorage.setItem('otcdebug','1')。
+// 业务脚本逐步改用 otcDebug.banner / otcDebug.log 替代裸 console.log，
+// 既能在排查时一键全开，又能避免版本标记散落硬编码（见 swapTradeEdit.js / fastVue.base.js 用法）。
+var __otcDiag = (window.ylotc && window.ylotc.__diag) || { debug: false };
+window.otcDebug = {
+    // 模块加载横幅：F12 一眼看到模块名+bundle版本+git sha，用于排查"是不是加载了旧代码/旧缓存"
+    banner: function (name, ver) {
+        if (!__otcDiag.debug || !window.console) return;
+        var git = (__otcDiag.git || '').slice(0, 7);
+        console.log('%c[' + name + '] v' + ver + ' (bundle=' + __otcDiag.jsVersion + ', git=' + git + ', built=' + __otcDiag.built + ')',
+            'color:#06c;font-weight:bold');
+    },
+    // 普通调试日志：透传参数，仅 debug 开启时输出
+    log: function () {
+        if (!__otcDiag.debug || !window.console) return;
+        console.log.apply(console, arguments);
+    }
+};
+
 var main = window.main || { version: "1.0" };
 
 main.extend = $.extend;
diff --git a/YLErpWeb/wwwroot/Scripts/fast/fastVue.base.js b/YLErpWeb/wwwroot/Scripts/fast/fastVue.base.js
index e2ff381f..4a88a869 100644
--- a/YLErpWeb/wwwroot/Scripts/fast/fastVue.base.js
+++ b/YLErpWeb/wwwroot/Scripts/fast/fastVue.base.js
@@ -1,7 +1,13 @@
 
 (function (window, $) {
-    // 版本标记（排查用）：F12 Console 看到 v20260729a 说明 bundle.js 是最新版本
-    if (window.console) console.log('[fastVue.base.js] v20260729a loaded');
+    // 模块加载横幅（排查用）：仅在 ?otcdebug=1 或 localStorage.otcdebug=1 开启时打印，含 bundle 版本+git sha。
+    // 注意：本文件在 bundle.js 中早于 main.js（otcDebug 定义处）加载，故直接读 window.ylotc.__diag，不依赖 otcDebug。
+    var __diag = window.ylotc && window.ylotc.__diag;
+    if (__diag && __diag.debug && window.console) {
+        var git = (__diag.git || '').slice(0, 7);
+        console.log('%c[fastVue.base.js] v1.4.2 (bundle=' + __diag.jsVersion + ', git=' + git + ', built=' + __diag.built + ')',
+            'color:#06c;font-weight:bold');
+    }
 
     function FastVue() {
 
diff --git a/YLErpWeb/wwwroot/Statics/bundles/bundle.js b/YLErpWeb/wwwroot/Statics/bundles/bundle.js
index 4a1820bd..cec1dbb7 100644
--- a/YLErpWeb/wwwroot/Statics/bundles/bundle.js
+++ b/YLErpWeb/wwwroot/Statics/bundles/bundle.js
@@ -14057,8 +14057,14 @@ $.fn.selectpicker.Constructor.DEFAULTS = Object.assign($.fn.selectpicker.Constru
 !function(a){"use strict";"function"==typeof define&&define.amd?define(["jquery"],a):a("object"==typeof exports&&"function"==typeof require?require("jquery"):jQuery)}(function(a){"use strict";function b(c,d){var e=this;e.element=c,e.el=a(c),e.suggestions=[],e.badQueries=[],e.selectedIndex=-1,e.currentValue=e.element.value,e.timeoutId=null,e.cachedResponse={},e.onChangeTimeout=null,e.onChange=null,e.isLocal=!1,e.suggestionsContainer=null,e.noSuggestionsContainer=null,e.options=a.extend(!0,{},b.defaults,d),e.classes={selected:"autocomplete-selected",suggestion:"autocomplete-suggestion"},e.hint=null,e.hintValue="",e.selection=null,e.initialize(),e.setOptions(d)}function c(a,b,c){return a.value.toLowerCase().indexOf(c)!==-1}function d(b){return"string"==typeof b?a.parseJSON(b):b}function e(a,b){if(!b)return a.value;var c="("+g.escapeRegExChars(b)+")";return a.value.replace(new RegExp(c,"gi"),"<strong>$1</strong>").replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/&lt;(\/?strong)&gt;/g,"<$1>")}function f(a,b){return'<div class="autocomplete-group">'+b+"</div>"}var g=function(){return{escapeRegExChars:function(a){return a.replace(/[|\\{}()[\]^$+*?.]/g,"\\$&")},createNode:function(a){var b=document.createElement("div");return b.className=a,b.style.position="absolute",b.style.display="none",b}}}(),h={ESC:27,TAB:9,RETURN:13,LEFT:37,UP:38,RIGHT:39,DOWN:40},i=a.noop;b.utils=g,a.Autocomplete=b,b.defaults={ajaxSettings:{},autoSelectFirst:!1,appendTo:"body",serviceUrl:null,lookup:null,onSelect:null,width:"auto",minChars:1,maxHeight:300,deferRequestBy:0,params:{},formatResult:e,formatGroup:f,delimiter:null,zIndex:9999,type:"GET",noCache:!1,onSearchStart:i,onSearchComplete:i,onSearchError:i,preserveInput:!1,containerClass:"autocomplete-suggestions",tabDisabled:!1,dataType:"text",currentRequest:null,triggerSelectOnValidInput:!0,preventBadQueries:!0,lookupFilter:c,paramName:"query",transformResult:d,showNoSuggestionNotice:!1,noSuggestionNotice:"No results",orientation:"bottom",forceFixPosition:!1},b.prototype={initialize:function(){var c,d=this,e="."+d.classes.suggestion,f=d.classes.selected,g=d.options;d.element.setAttribute("autocomplete","off"),d.noSuggestionsContainer=a('<div class="autocomplete-no-suggestion"></div>').html(this.options.noSuggestionNotice).get(0),d.suggestionsContainer=b.utils.createNode(g.containerClass),c=a(d.suggestionsContainer),c.appendTo(g.appendTo||"body"),"auto"!==g.width&&c.css("width",g.width),c.on("mouseover.autocomplete",e,function(){d.activate(a(this).data("index"))}),c.on("mouseout.autocomplete",function(){d.selectedIndex=-1,c.children("."+f).removeClass(f)}),c.on("click.autocomplete",e,function(){d.select(a(this).data("index"))}),c.on("click.autocomplete",function(){clearTimeout(d.blurTimeoutId)}),d.fixPositionCapture=function(){d.visible&&d.fixPosition()},a(window).on("resize.autocomplete",d.fixPositionCapture),d.el.on("keydown.autocomplete",function(a){d.onKeyPress(a)}),d.el.on("keyup.autocomplete",function(a){d.onKeyUp(a)}),d.el.on("blur.autocomplete",function(){d.onBlur()}),d.el.on("focus.autocomplete",function(){d.onFocus()}),d.el.on("change.autocomplete",function(a){d.onKeyUp(a)}),d.el.on("input.autocomplete",function(a){d.onKeyUp(a)})},onFocus:function(){var a=this;a.fixPosition(),a.el.val().length>=a.options.minChars&&a.onValueChange()},onBlur:function(){var b=this,c=b.options,d=b.el.val(),e=b.getQuery(d);b.blurTimeoutId=setTimeout(function(){b.hide(),b.selection&&b.currentValue!==e&&(c.onInvalidateSelection||a.noop).call(b.element)},200)},abortAjax:function(){var a=this;a.currentRequest&&(a.currentRequest.abort(),a.currentRequest=null)},setOptions:function(b){var c=this,d=a.extend({},c.options,b);c.isLocal=Array.isArray(d.lookup),c.isLocal&&(d.lookup=c.verifySuggestionsFormat(d.lookup)),d.orientation=c.validateOrientation(d.orientation,"bottom"),a(c.suggestionsContainer).css({"max-height":d.maxHeight+"px",width:d.width+"px","z-index":d.zIndex}),this.options=d},clearCache:function(){this.cachedResponse={},this.badQueries=[]},clear:function(){this.clearCache(),this.currentValue="",this.suggestions=[]},disable:function(){var a=this;a.disabled=!0,clearTimeout(a.onChangeTimeout),a.abortAjax()},enable:function(){this.disabled=!1},fixPosition:function(){var b=this,c=a(b.suggestionsContainer),d=c.parent().get(0);if(d===document.body||b.options.forceFixPosition){var e=b.options.orientation,f=c.outerHeight(),g=b.el.outerHeight(),h=b.el.offset(),i={top:h.top,left:h.left};if("auto"===e){var j=a(window).height(),k=a(window).scrollTop(),l=-k+h.top-f,m=k+j-(h.top+g+f);e=Math.max(l,m)===l?"top":"bottom"}if("top"===e?i.top+=-f:i.top+=g,d!==document.body){var n,o=c.css("opacity");b.visible||c.css("opacity",0).show(),n=c.offsetParent().offset(),i.top-=n.top,i.top+=d.scrollTop,i.left-=n.left,b.visible||c.css("opacity",o).hide()}"auto"===b.options.width&&(i.width=b.el.outerWidth()+"px"),c.css(i)}},isCursorAtEnd:function(){var a,b=this,c=b.el.val().length,d=b.element.selectionStart;return"number"==typeof d?d===c:!document.selection||(a=document.selection.createRange(),a.moveStart("character",-c),c===a.text.length)},onKeyPress:function(a){var b=this;if(!b.disabled&&!b.visible&&a.which===h.DOWN&&b.currentValue)return void b.suggest();if(!b.disabled&&b.visible){switch(a.which){case h.ESC:b.el.val(b.currentValue),b.hide();break;case h.RIGHT:if(b.hint&&b.options.onHint&&b.isCursorAtEnd()){b.selectHint();break}return;case h.TAB:if(b.hint&&b.options.onHint)return void b.selectHint();if(b.selectedIndex===-1)return void b.hide();if(b.select(b.selectedIndex),b.options.tabDisabled===!1)return;break;case h.RETURN:if(b.selectedIndex===-1)return void b.hide();b.select(b.selectedIndex);break;case h.UP:b.moveUp();break;case h.DOWN:b.moveDown();break;default:return}a.stopImmediatePropagation(),a.preventDefault()}},onKeyUp:function(a){var b=this;if(!b.disabled){switch(a.which){case h.UP:case h.DOWN:return}clearTimeout(b.onChangeTimeout),b.currentValue!==b.el.val()&&(b.findBestHint(),b.options.deferRequestBy>0?b.onChangeTimeout=setTimeout(function(){b.onValueChange()},b.options.deferRequestBy):b.onValueChange())}},onValueChange:function(){if(this.ignoreValueChange)return void(this.ignoreValueChange=!1);var b=this,c=b.options,d=b.el.val(),e=b.getQuery(d);return b.selection&&b.currentValue!==e&&(b.selection=null,(c.onInvalidateSelection||a.noop).call(b.element)),clearTimeout(b.onChangeTimeout),b.currentValue=d,b.selectedIndex=-1,c.triggerSelectOnValidInput&&b.isExactMatch(e)?void b.select(0):void(e.length<c.minChars?b.hide():b.getSuggestions(e))},isExactMatch:function(a){var b=this.suggestions;return 1===b.length&&b[0].value.toLowerCase()===a.toLowerCase()},getQuery:function(b){var c,d=this.options.delimiter;return d?(c=b.split(d),a.trim(c[c.length-1])):b},getSuggestionsLocal:function(b){var c,d=this,e=d.options,f=b.toLowerCase(),g=e.lookupFilter,h=parseInt(e.lookupLimit,10);return c={suggestions:a.grep(e.lookup,function(a){return g(a,b,f)})},h&&c.suggestions.length>h&&(c.suggestions=c.suggestions.slice(0,h)),c},getSuggestions:function(b){var c,d,e,f,g=this,h=g.options,i=h.serviceUrl;if(h.params[h.paramName]=b,h.onSearchStart.call(g.element,h.params)!==!1){if(d=h.ignoreParams?null:h.params,a.isFunction(h.lookup))return void h.lookup(b,function(a){g.suggestions=a.suggestions,g.suggest(),h.onSearchComplete.call(g.element,b,a.suggestions)});g.isLocal?c=g.getSuggestionsLocal(b):(a.isFunction(i)&&(i=i.call(g.element,b)),e=i+"?"+a.param(d||{}),c=g.cachedResponse[e]),c&&Array.isArray(c.suggestions)?(g.suggestions=c.suggestions,g.suggest(),h.onSearchComplete.call(g.element,b,c.suggestions)):g.isBadQuery(b)?h.onSearchComplete.call(g.element,b,[]):(g.abortAjax(),f={url:i,data:d,type:h.type,dataType:h.dataType},a.extend(f,h.ajaxSettings),g.currentRequest=a.ajax(f).done(function(a){var c;g.currentRequest=null,c=h.transformResult(a,b),g.processResponse(c,b,e),h.onSearchComplete.call(g.element,b,c.suggestions)}).fail(function(a,c,d){h.onSearchError.call(g.element,b,a,c,d)}))}},isBadQuery:function(a){if(!this.options.preventBadQueries)return!1;for(var b=this.badQueries,c=b.length;c--;)if(0===a.indexOf(b[c]))return!0;return!1},hide:function(){var b=this,c=a(b.suggestionsContainer);a.isFunction(b.options.onHide)&&b.visible&&b.options.onHide.call(b.element,c),b.visible=!1,b.selectedIndex=-1,clearTimeout(b.onChangeTimeout),a(b.suggestionsContainer).hide(),b.signalHint(null)},suggest:function(){if(!this.suggestions.length)return void(this.options.showNoSuggestionNotice?this.noSuggestions():this.hide());var b,c=this,d=c.options,e=d.groupBy,f=d.formatResult,g=c.getQuery(c.currentValue),h=c.classes.suggestion,i=c.classes.selected,j=a(c.suggestionsContainer),k=a(c.noSuggestionsContainer),l=d.beforeRender,m="",n=function(a,c){var f=a.data[e];return b===f?"":(b=f,d.formatGroup(a,b))};return d.triggerSelectOnValidInput&&c.isExactMatch(g)?void c.select(0):(a.each(c.suggestions,function(a,b){e&&(m+=n(b,g,a)),m+='<div class="'+h+'" data-index="'+a+'">'+f(b,g,a)+"</div>"}),this.adjustContainerWidth(),k.detach(),j.html(m),a.isFunction(l)&&l.call(c.element,j,c.suggestions),c.fixPosition(),j.show(),d.autoSelectFirst&&(c.selectedIndex=0,j.scrollTop(0),j.children("."+h).first().addClass(i)),c.visible=!0,void c.findBestHint())},noSuggestions:function(){var b=this,c=b.options.beforeRender,d=a(b.suggestionsContainer),e=a(b.noSuggestionsContainer);this.adjustContainerWidth(),e.detach(),d.empty(),d.append(e),a.isFunction(c)&&c.call(b.element,d,b.suggestions),b.fixPosition(),d.show(),b.visible=!0},adjustContainerWidth:function(){var b,c=this,d=c.options,e=a(c.suggestionsContainer);"auto"===d.width?(b=c.el.outerWidth(),e.css("width",b>0?b:300)):"flex"===d.width&&e.css("width","")},findBestHint:function(){var b=this,c=b.el.val().toLowerCase(),d=null;c&&(a.each(b.suggestions,function(a,b){var e=0===b.value.toLowerCase().indexOf(c);return e&&(d=b),!e}),b.signalHint(d))},signalHint:function(b){var c="",d=this;b&&(c=d.currentValue+b.value.substr(d.currentValue.length)),d.hintValue!==c&&(d.hintValue=c,d.hint=b,(this.options.onHint||a.noop)(c))},verifySuggestionsFormat:function(b){return b.length&&"string"==typeof b[0]?a.map(b,function(a){return{value:a,data:null}}):b},validateOrientation:function(b,c){return b=a.trim(b||"").toLowerCase(),a.inArray(b,["auto","bottom","top"])===-1&&(b=c),b},processResponse:function(a,b,c){var d=this,e=d.options;a.suggestions=d.verifySuggestionsFormat(a.suggestions),e.noCache||(d.cachedResponse[c]=a,e.preventBadQueries&&!a.suggestions.length&&d.badQueries.push(b)),b===d.getQuery(d.currentValue)&&(d.suggestions=a.suggestions,d.suggest())},activate:function(b){var c,d=this,e=d.classes.selected,f=a(d.suggestionsContainer),g=f.find("."+d.classes.suggestion);return f.find("."+e).removeClass(e),d.selectedIndex=b,d.selectedIndex!==-1&&g.length>d.selectedIndex?(c=g.get(d.selectedIndex),a(c).addClass(e),c):null},selectHint:function(){var b=this,c=a.inArray(b.hint,b.suggestions);b.select(c)},select:function(a){var b=this;b.hide(),b.onSelect(a)},moveUp:function(){var b=this;if(b.selectedIndex!==-1)return 0===b.selectedIndex?(a(b.suggestionsContainer).children("."+b.classes.suggestion).first().removeClass(b.classes.selected),b.selectedIndex=-1,b.ignoreValueChange=!1,b.el.val(b.currentValue),void b.findBestHint()):void b.adjustScroll(b.selectedIndex-1)},moveDown:function(){var a=this;a.selectedIndex!==a.suggestions.length-1&&a.adjustScroll(a.selectedIndex+1)},adjustScroll:function(b){var c=this,d=c.activate(b);if(d){var e,f,g,h=a(d).outerHeight();e=d.offsetTop,f=a(c.suggestionsContainer).scrollTop(),g=f+c.options.maxHeight-h,e<f?a(c.suggestionsContainer).scrollTop(e):e>g&&a(c.suggestionsContainer).scrollTop(e-c.options.maxHeight+h),c.options.preserveInput||(c.ignoreValueChange=!0,c.el.val(c.getValue(c.suggestions[b].value))),c.signalHint(null)}},onSelect:function(b){var c=this,d=c.options.onSelect,e=c.suggestions[b];c.currentValue=c.getValue(e.value),c.currentValue===c.el.val()||c.options.preserveInput||c.el.val(c.currentValue),c.signalHint(null),c.suggestions=[],c.selection=e,a.isFunction(d)&&d.call(c.element,e)},getValue:function(a){var b,c,d=this,e=d.options.delimiter;return e?(b=d.currentValue,c=b.split(e),1===c.length?a:b.substr(0,b.length-c[c.length-1].length)+a):a},dispose:function(){var b=this;b.el.off(".autocomplete").removeData("autocomplete"),a(window).off("resize.autocomplete",b.fixPositionCapture),a(b.suggestionsContainer).remove()}},a.fn.devbridgeAutocomplete=function(c,d){var e="autocomplete";return arguments.length?this.each(function(){var f=a(this),g=f.data(e);"string"==typeof c?g&&"function"==typeof g[c]&&g[c](d):(g&&g.dispose&&g.dispose(),g=new b(this,c),f.data(e,g))}):this.first().data(e)},a.fn.autocomplete||(a.fn.autocomplete=a.fn.devbridgeAutocomplete)});
 
 (function (window, $) {
-    // 版本标记（排查用）：F12 Console 看到 v20260729a 说明 bundle.js 是最新版本
-    if (window.console) console.log('[fastVue.base.js] v20260729a loaded');
+    // 模块加载横幅（排查用）：仅在 ?otcdebug=1 或 localStorage.otcdebug=1 开启时打印，含 bundle 版本+git sha。
+    // 注意：本文件在 bundle.js 中早于 main.js（otcDebug 定义处）加载，故直接读 window.ylotc.__diag，不依赖 otcDebug。
+    var __diag = window.ylotc && window.ylotc.__diag;
+    if (__diag && __diag.debug && window.console) {
+        var git = (__diag.git || '').slice(0, 7);
+        console.log('%c[fastVue.base.js] v1.4.2 (bundle=' + __diag.jsVersion + ', git=' + git + ', built=' + __diag.built + ')',
+            'color:#06c;font-weight:bold');
+    }
 
     function FastVue() {
 
@@ -15002,6 +15008,26 @@ $.fn.selectpicker.Constructor.DEFAULTS = Object.assign($.fn.selectpicker.Constru
 }(window.FastVue));
 //依赖类库:lodash.js + jquery + jquery.validate + bootstrap.emodal.js
 
+// 统一调试日志工具：仅在 otcdebug 开启时输出，默认静默（生产零噪音）。
+// 开启方式：URL 加 ?otcdebug=1，或控制台 localStorage.setItem('otcdebug','1')。
+// 业务脚本逐步改用 otcDebug.banner / otcDebug.log 替代裸 console.log，
+// 既能在排查时一键全开，又能避免版本标记散落硬编码（见 swapTradeEdit.js / fastVue.base.js 用法）。
+var __otcDiag = (window.ylotc && window.ylotc.__diag) || { debug: false };
+window.otcDebug = {
+    // 模块加载横幅：F12 一眼看到模块名+bundle版本+git sha，用于排查"是不是加载了旧代码/旧缓存"
+    banner: function (name, ver) {
+        if (!__otcDiag.debug || !window.console) return;
+        var git = (__otcDiag.git || '').slice(0, 7);
+        console.log('%c[' + name + '] v' + ver + ' (bundle=' + __otcDiag.jsVersion + ', git=' + git + ', built=' + __otcDiag.built + ')',
+            'color:#06c;font-weight:bold');
+    },
+    // 普通调试日志：透传参数，仅 debug 开启时输出
+    log: function () {
+        if (!__otcDiag.debug || !window.console) return;
+        console.log.apply(console, arguments);
+    }
+};
+
 var main = window.main || { version: "1.0" };
 
 main.extend = $.extend;
diff --git a/YLErpWeb/wwwroot/Statics/bundles/bundleV2.js b/YLErpWeb/wwwroot/Statics/bundles/bundleV2.js
index c63811b3..ed738bb6 100644
--- a/YLErpWeb/wwwroot/Statics/bundles/bundleV2.js
+++ b/YLErpWeb/wwwroot/Statics/bundles/bundleV2.js
@@ -801,6 +801,26 @@ An}();typeof define=="function"&&typeof define.amd=="object"&&define.amd?($n._=r
     }));
 //依赖类库:lodash.js + jquery + jquery.validate + bootstrap.emodal.js
 
+// 统一调试日志工具：仅在 otcdebug 开启时输出，默认静默（生产零噪音）。
+// 开启方式：URL 加 ?otcdebug=1，或控制台 localStorage.setItem('otcdebug','1')。
+// 业务脚本逐步改用 otcDebug.banner / otcDebug.log 替代裸 console.log，
+// 既能在排查时一键全开，又能避免版本标记散落硬编码（见 swapTradeEdit.js / fastVue.base.js 用法）。
+var __otcDiag = (window.ylotc && window.ylotc.__diag) || { debug: false };
+window.otcDebug = {
+    // 模块加载横幅：F12 一眼看到模块名+bundle版本+git sha，用于排查"是不是加载了旧代码/旧缓存"
+    banner: function (name, ver) {
+        if (!__otcDiag.debug || !window.console) return;
+        var git = (__otcDiag.git || '').slice(0, 7);
+        console.log('%c[' + name + '] v' + ver + ' (bundle=' + __otcDiag.jsVersion + ', git=' + git + ', built=' + __otcDiag.built + ')',
+            'color:#06c;font-weight:bold');
+    },
+    // 普通调试日志：透传参数，仅 debug 开启时输出
+    log: function () {
+        if (!__otcDiag.debug || !window.console) return;
+        console.log.apply(console, arguments);
+    }
+};
+
 var main = window.main || { version: "1.0" };
 
 main.extend = $.extend;