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

BasicData/Tnb.BasicData/BasEbomService.cs

@@ -46,7 +46,7 @@ namespace Tnb.BasicData
         {
             ISqlSugarClient db = _repository.AsSugarClient();
             Dictionary<string, object>? queryJson = (input == null || string.IsNullOrEmpty(input.queryJson)) ? null : input.queryJson.ToObject<Dictionary<string, object>>();
-            string materialInfo = queryJson?["query_info"]?.ToString() ?? "";
+            string materialInfo = queryJson.ContainsKey("query_info") ? queryJson["query_info"].ToString() : "";
             SqlSugarPagedList<EbomListOutput> list = await db.Queryable<BasEbomH, BasMaterial, BasRouteH>((a, b, c) => new object[]
                 {
                     JoinType.Left, a.material_id == b.id,

QcMgr/Tnb.QcMgr.Entities/Dto/CheckTask.cs

@@ -113,6 +113,10 @@
         public string? checknum { get; set; }
         public string? status { get; set; }
         public string? result { get; set; }
+        
+        public string check_type { get; set; }
+        
+        public string remark { get; set; }
 
         public List<List<Exextype>>? checktypes { get; set; }
     }
@@ -132,6 +136,7 @@
         public ExecItemShow? setShow { get; set; }
         public string? postItemForm { get; set; }
         public string? result { get; set; }
+        public int qty { get; set; }
     }