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 @@
+
+