diff --git a/Analysis/CjlrForm/FileSorter.cs b/Analysis/CjlrForm/FileSorter.cs index 33fbc10..3e650d8 100644 --- a/Analysis/CjlrForm/FileSorter.cs +++ b/Analysis/CjlrForm/FileSorter.cs @@ -524,6 +524,16 @@ namespace NSAnalysis { MyBase.TraceWriteLine("双侧测量结果已完成,开始生成客户报告。"); emitProcessStep($"---> 4、双侧测量结果已完成,开始生成客户报告,车号: {ConfigDfn.strEquipNo}"); + + // 551 MY21 车型 ,跳过报告生成 + + if (ConfigDfn.strCarModel.Contains("MY")) + { + MyBase.TraceWriteLine("车型为 551_MY21,跳过客户报告生成。"); + emitProcessStep($"---> 4、车型为 551_MY21,跳过客户报告生成,车号: {ConfigDfn.strEquipNo}"); + return; + } + // 生成客户报告 GenCustomerReport(ConfigDfn.strEquipNo); } diff --git a/Analysis/bin/x64/Debug/Debug.txt b/Analysis/bin/x64/Debug/Debug.txt index 5cb6b27..afffbab 100644 --- a/Analysis/bin/x64/Debug/Debug.txt +++ b/Analysis/bin/x64/Debug/Debug.txt @@ -1,13 +1,16 @@ -2025-09-01 09:55:17.792----软件Program Main函数开始执行-- -2025-09-01 09:55:17.793--加载配置文件——>开始 -2025-09-01 09:55:17.796--数据库连接 SqlServerName:127.0.0.1 -2025-09-01 09:55:17.797--数据库连接 SqlUserName:sa -2025-09-01 09:55:17.797--数据库连接 SqlPassword:Hexagon123 -2025-09-01 09:55:17.799--数据库连接 SqlDbName:CJLR -2025-09-01 09:55:17.800--加载配置文件——>完成 -2025-09-01 09:55:17.807--数据库连接 SqlServerName:127.0.0.1 -2025-09-01 09:55:17.808--数据库连接 SqlUserName:sa -2025-09-01 09:55:17.809--数据库连接 SqlPassword:Hexagon123 -2025-09-01 09:55:17.809--数据库连接 SqlDbName:CJLR -2025-09-01 09:55:17.810--数据库连接字符串:Data Source=127.0.0.1;initial Catalog=CJLR;User ID=sa;password=Hexagon123; -2025-09-01 09:56:50.027--客户报告已生成: D:\HexagonProjects\2025-01-捷豹路虎改造\code\Analysis\bin\x64\Debug\ReportBackup\K0902906_20250901095646.csv +2025-09-02 11:34:00.723----软件Program Main函数开始执行-- +2025-09-02 11:34:00.725--加载配置文件——>开始 +2025-09-02 11:34:00.744--数据库连接 SqlServerName:127.0.0.1 +2025-09-02 11:34:00.745--数据库连接 SqlUserName:sa +2025-09-02 11:34:00.746--数据库连接 SqlPassword:Hexagon123 +2025-09-02 11:34:00.746--数据库连接 SqlDbName:CJLR +2025-09-02 11:34:00.747--加载配置文件——>完成 +2025-09-02 11:34:00.749--Log in using the original authorization mode. +2025-09-02 11:34:02.356--软件授权成功 +2025-09-02 11:34:03.958--数据库连接 SqlServerName:127.0.0.1 +2025-09-02 11:34:03.959--数据库连接 SqlUserName:sa +2025-09-02 11:34:03.960--数据库连接 SqlPassword:Hexagon123 +2025-09-02 11:34:03.961--数据库连接 SqlDbName:CJLR +2025-09-02 11:34:03.962--数据库连接字符串:Data Source=127.0.0.1;initial Catalog=CJLR;User ID=sa;password=Hexagon123; +2025-09-02 11:34:05.595---------------海克斯康面隙分析软件程序启动--------------------- +2025-09-02 11:34:11.589---------------海克斯康面隙分析软件程序关闭--------------------- diff --git a/Analysis/bin/x64/Debug/NSAnalysis.exe b/Analysis/bin/x64/Debug/NSAnalysis.exe index c9c54ed..e8ba219 100644 Binary files a/Analysis/bin/x64/Debug/NSAnalysis.exe and b/Analysis/bin/x64/Debug/NSAnalysis.exe differ diff --git a/Analysis/bin/x64/Debug/NSAnalysis.pdb b/Analysis/bin/x64/Debug/NSAnalysis.pdb index eddc061..12d0940 100644 Binary files a/Analysis/bin/x64/Debug/NSAnalysis.pdb and b/Analysis/bin/x64/Debug/NSAnalysis.pdb differ