From 95958a96ed230d6894f96c85ea03ca3d9fff65d7 Mon Sep 17 00:00:00 2001
From: zhou keda <1315948824@qq.com>
Date: Tue, 10 Sep 2024 17:55:24 +0800
Subject: [PATCH] bug

---
 EquipMgr/Tnb.EquipMgr.Entities/Dto/MaterialListOutput.cs | 9 +++++++++
 EquipMgr/Tnb.EquipMgr/ToolMoldMaterialService.cs         | 2 ++
 QcMgr/Tnb.QcMgr/QcCheckTaskService.cs                    | 2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/MaterialListOutput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/MaterialListOutput.cs
index 62cdf0a7..7962dab1 100644
--- a/EquipMgr/Tnb.EquipMgr.Entities/Dto/MaterialListOutput.cs
+++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/MaterialListOutput.cs
@@ -9,6 +9,15 @@
         public string code { get; set; }
         public string name { get; set; }
         public string material_group { get; set; }
+        /// <summary>
+        /// 物料规格
+        /// </summary>
+        public string? material_specification { get; set; }
+    
+        /// <summary>
+        /// 物料型号
+        /// </summary>
+        public string? material_standard { get; set; }
         public int real_cavity_qty { get; set; }
     }
     /// <summary>
diff --git a/EquipMgr/Tnb.EquipMgr/ToolMoldMaterialService.cs b/EquipMgr/Tnb.EquipMgr/ToolMoldMaterialService.cs
index c74f2413..0c0fe7a9 100644
--- a/EquipMgr/Tnb.EquipMgr/ToolMoldMaterialService.cs
+++ b/EquipMgr/Tnb.EquipMgr/ToolMoldMaterialService.cs
@@ -43,6 +43,8 @@ namespace Tnb.EquipMgr
                 code = a.code,
                 name = a.name,
                 material_group = b.material_group,
+                material_specification = a.material_specification,
+                material_standard = a.material_standard,
                 real_cavity_qty = b.real_cavity_qty.HasValue ? b.real_cavity_qty.Value : 0
             }).ToListAsync();
             return list;
diff --git a/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs b/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs
index cbd52dc2..1cb116df 100644
--- a/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs
+++ b/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs
@@ -350,7 +350,7 @@ namespace Tnb.QcMgr
                 await db.Ado.BeginTranAsync();
                 QcCheckExecH.qty = int.Parse(CheckTaskInput.checknum) - rqty;
                 QcCheckExecH.rqty = rqty;
-                _ = await db.Updateable(QcCheckExecH).ExecuteCommandAsync();
+                //_ = await db.Updateable(QcCheckExecH).ExecuteCommandAsync();
                 await db.Updateable<QcCheckExecH>()
                     .SetColumns(x => x.checknum == QcCheckExecH.checknum)
                     .SetColumns(x => x.status == QcCheckExecH.status)