diff --git a/BasicData/Tnb.BasicData/BasEbomService.cs b/BasicData/Tnb.BasicData/BasEbomService.cs index 72dc9960..0a024b6f 100644 --- a/BasicData/Tnb.BasicData/BasEbomService.cs +++ b/BasicData/Tnb.BasicData/BasEbomService.cs @@ -46,7 +46,7 @@ namespace Tnb.BasicData { ISqlSugarClient db = _repository.AsSugarClient(); Dictionary? queryJson = (input == null || string.IsNullOrEmpty(input.queryJson)) ? null : input.queryJson.ToObject>(); - string materialInfo = queryJson?["query_info"]?.ToString() ?? ""; + string materialInfo = queryJson.ContainsKey("query_info") ? queryJson["query_info"].ToString() : ""; SqlSugarPagedList list = await db.Queryable((a, b, c) => new object[] { JoinType.Left, a.material_id == b.id, diff --git a/QcMgr/Tnb.QcMgr.Entities/Dto/CheckTask.cs b/QcMgr/Tnb.QcMgr.Entities/Dto/CheckTask.cs index ffc907f0..e575ead8 100644 --- a/QcMgr/Tnb.QcMgr.Entities/Dto/CheckTask.cs +++ b/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>? 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; } }