Commit d7f0f20d by Neo Turing

优化

parent 00c3e878
...@@ -10,3 +10,4 @@ ...@@ -10,3 +10,4 @@
/Src/.vs/Kivii.Client.Lims.ExcelToPdf.V4.5 /Src/.vs/Kivii.Client.Lims.ExcelToPdf.V4.5
/Src/bin/x86/Debug /Src/bin/x86/Debug
/Src/obj/x86/Debug /Src/obj/x86/Debug
/Src/.vs/Kivii.Client.Lims.ExcelToPdf.V4.0
...@@ -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_2024.11110"; this.Text = "Office转PDF V4.0_2025.1220";
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);
......
...@@ -518,9 +518,11 @@ namespace Kivii.Lims.ExcelToPdf ...@@ -518,9 +518,11 @@ namespace Kivii.Lims.ExcelToPdf
var stampInternalCode = "新中文印章";// reportMqRequest.Stamp; var stampInternalCode = "新中文印章";// reportMqRequest.Stamp;
if(_stampers.Exists(o => o.InternalCode == reportMqRequest.Stamp)) stampInternalCode = reportMqRequest.Stamp; if(_stampers.Exists(o => o.InternalCode == reportMqRequest.Stamp)) stampInternalCode = reportMqRequest.Stamp;
else if (_stampers.Exists(o => o.Name.Contains(reportMqRequest.Stamp))) //else if (_stampers.Exists(o => o.Name.Contains(reportMqRequest.Stamp)))
{ else if (_stampers.Exists(o => reportMqRequest.Stamp.Contains(o.Name)))
var _currentStamp = _stampers.FirstOrDefault(o=>o.Name.Contains(reportMqRequest.Stamp)); {
//var _currentStamp = _stampers.FirstOrDefault(o=>o.Name.Contains(reportMqRequest.Stamp));
var _currentStamp = _stampers.FirstOrDefault(o => reportMqRequest.Stamp.Contains(o.Name));
if (_currentStamp != null) if (_currentStamp != null)
{ {
stampInternalCode = _currentStamp.InternalCode; stampInternalCode = _currentStamp.InternalCode;
......
...@@ -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.11110")] [assembly: AssemblyVersion("5.4.2025.1220")]
[assembly: AssemblyFileVersion("5.4.2024.11110")] [assembly: AssemblyFileVersion("5.4.2025.1220")]
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