Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

BasicData/Tnb.BasicData/BasMbomService.cs

@@ -756,6 +756,7 @@ namespace Tnb.BasicData
                                 .SetColumns(x => x.station == process!.station)
                                 .SetColumns(x => x.byproduct_status == process!.byproduct_status)
                                 .SetColumns(x => x.production_method == process!.production_method)
+                                .SetColumns(x => x.process_id == process!.id)
                                 .Where(x => x.id == process!.id).ExecuteCommandAsync();
 
                             if (process!.inputs != null)

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>

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;

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)