From ab8ba9bae0ebbb33b4bc41b512ed6ce2fca0d94f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=94=A6=E9=BA=9F=20=E7=8E=8B?= <Jinlin.Wang@cicc.com.cn>
Date: Fri, 27 Mar 2026 09:43:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97=EF=BC=8C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BC=95=E7=94=A8=20=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E4=B9=A6=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BatchConfirmationGenerateService.cs          | 16 ++++++++++++++++
 .../ConfirmationGenerateContext.cs               |  1 +
 YLErpWeb/YLErpWeb.csproj                         |  2 ++
 3 files changed, 19 insertions(+)

diff --git a/YLErpDAL/Modules/TradeModule/DocGenerateModule/BatchConfirmationGenerateService.cs b/YLErpDAL/Modules/TradeModule/DocGenerateModule/BatchConfirmationGenerateService.cs
index 71c87b18..a0caffbd 100644
--- a/YLErpDAL/Modules/TradeModule/DocGenerateModule/BatchConfirmationGenerateService.cs
+++ b/YLErpDAL/Modules/TradeModule/DocGenerateModule/BatchConfirmationGenerateService.cs
@@ -450,6 +450,22 @@ namespace YLErp.Modules.TradeModule.DocGenerateModule
                     Directory.CreateDirectory(templateDir);
                 }
 
+                // --- 添加详细诊断日志 ---
+                batchLogger.Info($"[BatchGenerateSingleV1] 诊断信息 - dic 键数量: {dic?.Count ?? 0}");
+                if (dic != null)
+                {
+                    foreach (var key in dic.Keys.Take(10))
+                    {
+                        var value = dic[key];
+                        batchLogger.Info($"[BatchGenerateSingleV1] 模板变量 - {key}: {(value == null ? "null" : value.GetType().Name)} = {value}");
+                    }
+                }
+                batchLogger.Info($"[BatchGenerateSingleV1] 诊断信息 - templatePath: {templatePath}");
+                batchLogger.Info($"[BatchGenerateSingleV1] 诊断信息 - outPutFilePath: {outPutFilePath}");
+                batchLogger.Info($"[BatchGenerateSingleV1] 诊断信息 - MsWordTempalteHelper 类型: {typeof(MsWordTempalteHelper).FullName}");
+                batchLogger.Info($"[BatchGenerateSingleV1] 诊断信息 - MsWordTempalteHelper 程序集: {typeof(MsWordTempalteHelper).Assembly?.FullName}");
+                // --- 诊断日志结束 ---
+
                 batchLogger.Info($"[BatchGenerateSingleV1] 调用 MsWordTempalteHelper.GenerateFromTemplate");
                 MsWordTempalteHelper.GenerateFromTemplate(templatePath, dic, outPutFilePath);
                 batchLogger.Info($"[BatchGenerateSingleV1] MsWordTempalteHelper.GenerateFromTemplate 完成");
diff --git a/YLErpDAL/Modules/TradeModule/DocGenerateModule/ConfirmationGenerateContext.cs b/YLErpDAL/Modules/TradeModule/DocGenerateModule/ConfirmationGenerateContext.cs
index f96b950a..ee180d74 100644
--- a/YLErpDAL/Modules/TradeModule/DocGenerateModule/ConfirmationGenerateContext.cs
+++ b/YLErpDAL/Modules/TradeModule/DocGenerateModule/ConfirmationGenerateContext.cs
@@ -1278,6 +1278,7 @@ namespace YLErp.Modules.TradeModule.DocGenerateModule
                     contractNo = GenerateShanXiGuShouContractNo();
                     break;
                 case CompanyEnum.浙商:
+                case CompanyEnum.国联:
                     contractNo = GenerateZheShangContractNo();
                     break;
                 default:
diff --git a/YLErpWeb/YLErpWeb.csproj b/YLErpWeb/YLErpWeb.csproj
index 77a2c29a..89047f20 100644
--- a/YLErpWeb/YLErpWeb.csproj
+++ b/YLErpWeb/YLErpWeb.csproj
@@ -31,6 +31,8 @@
 		<PackageReference Include="RazorLight-rpm" Version="3.0.0" />
 		<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.6" />
 		<PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.1" />
+		<PackageReference Include="DocumentFormat.OpenXml" Version="2.7.2" />
+		<PackageReference Include="System.IO.Packaging" Version="4.5.0" />
 	</ItemGroup>
 
 	<ItemGroup>