Commit e7bd2a5d by 任天宇

优化

parent 0aae9774
...@@ -561,7 +561,7 @@ ...@@ -561,7 +561,7 @@
this.Controls.Add(this.pnlLeft); this.Controls.Add(this.pnlLeft);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "FrmServer"; this.Name = "FrmServer";
this.Text = "Office转PDF V4.0"; this.Text = "Office转PDF V4.2";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmServer_FormClosing); this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmServer_FormClosing);
this.Load += new System.EventHandler(this.FrmServer_Load); this.Load += new System.EventHandler(this.FrmServer_Load);
this.cmsNotify.ResumeLayout(false); this.cmsNotify.ResumeLayout(false);
......
...@@ -515,9 +515,17 @@ namespace Kivii.Lims.ExcelToPdf ...@@ -515,9 +515,17 @@ namespace Kivii.Lims.ExcelToPdf
var internalCode = $"{code}/{reportMqRequest.ReportId}"; var internalCode = $"{code}/{reportMqRequest.ReportId}";
var redirectUrl = $"{_config.QrCodeUrl}/Url/{internalCode}"; var redirectUrl = $"{_config.QrCodeUrl}/Url/{internalCode}";
var stampInternalCode = reportMqRequest.Stamp; var stampInternalCode = "新中文印章";// reportMqRequest.Stamp;
if (!_stampers.Exists(o => o.InternalCode == reportMqRequest.Stamp)) stampInternalCode = "新中文印章"; if(_stampers.Exists(o => o.InternalCode == reportMqRequest.Stamp)) stampInternalCode = reportMqRequest.Stamp;
else if (_stampers.Exists(o => o.Name.Contains(reportMqRequest.Stamp)))
{
var _currentStamp = _stampers.FirstOrDefault(o=>o.Name.Contains(reportMqRequest.Stamp));
if (_currentStamp != null)
{
stampInternalCode = _currentStamp.InternalCode;
}
}
var request = new StamperRequest(); var request = new StamperRequest();
request.InternalCode = stampInternalCode; request.InternalCode = stampInternalCode;
...@@ -529,7 +537,7 @@ namespace Kivii.Lims.ExcelToPdf ...@@ -529,7 +537,7 @@ namespace Kivii.Lims.ExcelToPdf
files.Add(new UploadFile($"{reportMqRequest.ReportId}.pdf", new FileStream(tempPDFFilePath, FileMode.Open))); files.Add(new UploadFile($"{reportMqRequest.ReportId}.pdf", new FileStream(tempPDFFilePath, FileMode.Open)));
var response = serviceClient.PostFilesWithRequest<StamperResponse>(request, files); var response = serviceClient.PostFilesWithRequest<StamperResponse>(request, files);
outputMessage($"报告({reportMqRequest.ReportId})已调用PDFStamper!"); outputMessage($"报告({reportMqRequest.ReportId})已调用PDFStamper:{stampInternalCode}!");
files.ForEach(o => files.ForEach(o =>
{ {
o.Stream.Close(); o.Stream.Close();
......
...@@ -33,5 +33,5 @@ using System.Runtime.InteropServices; ...@@ -33,5 +33,5 @@ using System.Runtime.InteropServices;
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值 //可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
//通过使用 "*",如下所示: //通过使用 "*",如下所示:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("5.4.2024.8280")] [assembly: AssemblyVersion("5.4.2024.8281")]
[assembly: AssemblyFileVersion("5.4.2024.8280")] [assembly: AssemblyFileVersion("5.4.2024.8281")]
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment