From bc71103d4a5feb751c4f170f21c8fac2a4235ff6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=94=A6=E9=BA=9F=20=E7=8E=8B?= <2452821485@qq.com> Date: Tue, 22 Apr 2025 14:22:00 +0800 Subject: [PATCH] =?UTF-8?q?doc=E4=B8=8D=E8=BD=AC=E6=88=90pdf=E5=92=8C?= =?UTF-8?q?=E5=A4=9A=E7=A9=BA=E8=8E=B7=E5=8F=96=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DocGenerateModule/ConfirmationGenerateContext.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/YLErpDAL/Modules/TradeModule/DocGenerateModule/ConfirmationGenerateContext.cs b/YLErpDAL/Modules/TradeModule/DocGenerateModule/ConfirmationGenerateContext.cs index acc3b1cc..9f329180 100644 --- a/YLErpDAL/Modules/TradeModule/DocGenerateModule/ConfirmationGenerateContext.cs +++ b/YLErpDAL/Modules/TradeModule/DocGenerateModule/ConfirmationGenerateContext.cs @@ -305,9 +305,9 @@ namespace YLErp.Modules.TradeModule.DocGenerateModule var varDic = new JsonVarDic(modelDic); var _outputFilePath = outputFilePath.Replace(".pdf", ".docx"); OfficeFileConverter.ConvertByUsingDocTemplate(templatePath, _outputFilePath, varDic, false); - if (genPdf) + var toPDF = outputFilePath.EndsWith(".pdf", StringComparison.OrdinalIgnoreCase); + if (genPdf && toPDF) { - LogFactory.GetLogger("PDF转换").Info("PDF转换开始" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")); ConvertToPdfHelper.ConvertPDFByApi(HttpUtility.UrlEncode(_outputFilePath), HttpUtility.UrlEncode(outputFilePath)); } } @@ -1326,7 +1326,7 @@ namespace YLErp.Modules.TradeModule.DocGenerateModule } if (Trade.TradeType == "收益互换") { - var posi = GetSwapPositions(Trade.id, true).FirstOrDefault(); + var posi = GetSwapPositions(Trade.id, true).FirstOrDefault(p => p.PositionType > 0); var isLong = posi?.PositionType == (int)PositionTypeFlag.Short ? false : true; return "ZSZQ-" + _client.Number + "-" + Trade.TradeDate?.ToString("yyyyMMdd") + (isLong ? "-L" : "-S");