Commit 846f8ab2 by Neo Turing

优化

parent c87b76d5
...@@ -597,8 +597,8 @@ namespace Kivii.Lims.ExcelToPdf ...@@ -597,8 +597,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.IssuerName;//签发人 printPool.Item.OperatorName = reportMqRequest.PreparerName;
printPool.Item.OperatorKvid = reportMqRequest.IssuerKvid; printPool.Item.OperatorKvid = 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 中检验结论
......
...@@ -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.4020")] [assembly: AssemblyVersion("5.4.2024.7150")]
[assembly: AssemblyFileVersion("5.4.2024.4020")] [assembly: AssemblyFileVersion("5.4.2024.7150")]
...@@ -71,6 +71,17 @@ namespace Kivii.Lims.RabbitMq.Entities ...@@ -71,6 +71,17 @@ namespace Kivii.Lims.RabbitMq.Entities
public DateTime DeadDate { get; set; } public DateTime DeadDate { get; set; }
/// <summary> /// <summary>
/// 编制人Kvid
/// </summary>
public Guid PreparerKvid { get; set; }
/// <summary>
/// 编制人姓名
/// </summary>
[ApiMember(Description = "编制人")]
public string PreparerName { get; set; }
/// <summary>
/// 签发人Kvid /// 签发人Kvid
/// </summary> /// </summary>
public Guid IssuerKvid { get; set; } public Guid IssuerKvid { get; set; }
...@@ -80,7 +91,6 @@ namespace Kivii.Lims.RabbitMq.Entities ...@@ -80,7 +91,6 @@ namespace Kivii.Lims.RabbitMq.Entities
/// </summary> /// </summary>
[ApiMember(Description = "签发人")] [ApiMember(Description = "签发人")]
public string IssuerName { get; set; } public string IssuerName { get; set; }
/// <summary> /// <summary>
/// 产品质量综合判定 /// 产品质量综合判定
/// </summary> /// </summary>
......
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