Commit e74a1309 by Neo Turing

优化

parent eb98a70a
...@@ -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.2"; this.Text = "Office转PDF V4.3";
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);
......
...@@ -605,8 +605,8 @@ namespace Kivii.Lims.ExcelToPdf ...@@ -605,8 +605,8 @@ namespace Kivii.Lims.ExcelToPdf
printPool.Item.Result = "标记为已打印"; printPool.Item.Result = "标记为已打印";
} }
printPool.Item.OperateTime = reportMqRequest.IssueDate == null ? DateTime.Now : reportMqRequest.IssueDate.Value;//签发日期 printPool.Item.OperateTime = reportMqRequest.IssueDate == null ? DateTime.Now : reportMqRequest.IssueDate.Value;//签发日期
printPool.Item.OperatorName = reportMqRequest.PreparerName; printPool.Item.OperatorName = reportMqRequest.PreparerName.IsNullOrEmpty() ? reportMqRequest.IssuerName : reportMqRequest.PreparerName;
printPool.Item.OperatorKvid = reportMqRequest.PreparerKvid; printPool.Item.OperatorKvid = reportMqRequest.PreparerKvid == Guid.Empty ? reportMqRequest.IssuerKvid : reportMqRequest.PreparerKvid;
printPool.Item.FilePath = $"{_config.QrCodeUrl}/Lims/Report/{internalCode}"; printPool.Item.FilePath = $"{_config.QrCodeUrl}/Lims/Report/{internalCode}";
printPool.Item.Summary = reportMqRequest.TestJudgement;//判定 printPool.Item.Summary = reportMqRequest.TestJudgement;//判定
printPool.Item.Remark = reportMqRequest.Conclusion;//新lims 中检验结论 printPool.Item.Remark = reportMqRequest.Conclusion;//新lims 中检验结论
......
...@@ -35,8 +35,8 @@ ...@@ -35,8 +35,8 @@
<ApplicationIcon>F.ico</ApplicationIcon> <ApplicationIcon>F.ico</ApplicationIcon>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Kivii.Common.V4.5, Version=5.6.2024.10000, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Kivii.Common.V4.5, Version=5.6.2024.10240, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Kivii.Common.5.6.2024.10000\lib\net45\Kivii.Common.V4.5.dll</HintPath> <HintPath>..\..\packages\Kivii.Common.5.6.2024.10240\lib\net45\Kivii.Common.V4.5.dll</HintPath>
</Reference> </Reference>
<Reference Include="Kivii.Core.V4.5, Version=5.6.2024.10000, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Kivii.Core.V4.5, Version=5.6.2024.10000, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Kivii.Core.5.6.2024.10000\lib\net45\Kivii.Core.V4.5.dll</HintPath> <HintPath>..\..\packages\Kivii.Core.5.6.2024.10000\lib\net45\Kivii.Core.V4.5.dll</HintPath>
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="Kivii.Common" version="5.6.2024.10000" targetFramework="net45" /> <package id="Kivii.Common" version="5.6.2024.10240" targetFramework="net45" />
<package id="Kivii.Core" version="5.6.2024.10000" targetFramework="net45" /> <package id="Kivii.Core" version="5.6.2024.10000" targetFramework="net45" />
<package id="Kivii.Linq" version="5.6.2024.10000" targetFramework="net45" /> <package id="Kivii.Linq" version="5.6.2024.10000" targetFramework="net45" />
<package id="Kivii.Office" version="5.6.2023.12000" targetFramework="net45" /> <package id="Kivii.Office" version="5.6.2023.12000" targetFramework="net45" />
......
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