From c3b363f06bcb42fa3713454a0658e6c7766cbe30 Mon Sep 17 00:00:00 2001
From: alex <whitebig@126.com>
Date: Mon, 21 Aug 2023 15:27:33 +0800
Subject: [PATCH] 1

---
 .../Dto/Outputs/CarryQueryOutput.cs               |  2 +-
 .../Entity/WmsCarryH.part.cs                      | 15 ++++++++++-----
 .../Tnb.WarehouseMgr/WmsCarryQueryService.cs      |  1 +
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Outputs/CarryQueryOutput.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Outputs/CarryQueryOutput.cs
index 99936dc3..483384e6 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Outputs/CarryQueryOutput.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Outputs/CarryQueryOutput.cs
@@ -74,7 +74,7 @@ namespace Tnb.WarehouseMgr.Entities.Dto.Outputs
         /// <summary>
         /// 检验结论
         /// </summary>
-        public int is_check { get; set; }
+        public string check_conclusion { get; set; }
         /// <summary>
         /// 载具条码明细输出
         /// </summary>
diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryH.part.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryH.part.cs
index 20a8da90..1035e3da 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryH.part.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryH.part.cs
@@ -9,11 +9,11 @@ namespace Tnb.WarehouseMgr.Entities;
 /// </summary>
 public partial class WmsCarryH
 {
-	/// <summary>
-	/// 是否签收
-	/// </summary>
-	[SugarColumn(IsIgnore = true)]
-	public int is_sign { get; set; }
+    /// <summary>
+    /// 是否签收
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+    public int is_sign { get; set; }
 
     /// <summary>
     /// 供应商
@@ -25,5 +25,10 @@ public partial class WmsCarryH
     /// </summary>
     [SugarColumn(IsIgnore = true)]
     public DateTime instock_time { get; set; }
+    /// <summary>
+    /// 检验结论
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+    public string check_conclusion { get; set; }
 
 }
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs
index 5819fcc1..645258de 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs
@@ -74,6 +74,7 @@ namespace Tnb.WarehouseMgr
                                                             {
                                                                 instock_time = b.create_time
                                                             }, true)
+                                                            .Mapper(a => a.check_conclusion = a.is_check == 1 ? "合格" : "不合格")
                                                             .FirstAsync();
                 if (carry.IsNull()) throw new AppFriendlyException($"编号{input.carry_code},对应载具不存在或被禁用", 500);
                 List<WmsCarryCode> carryCodes = new();