From fa7c158b3912a9d5b2180cb53c2d6e075b9a2e6d Mon Sep 17 00:00:00 2001 From: zhou keda <1315948824@qq.com> Date: Fri, 16 Aug 2024 16:56:30 +0800 Subject: [PATCH 1/2] bug --- QcMgr/Tnb.QcMgr.Entities/Dto/CheckTask.cs | 5 +++++ 1 file changed, 5 insertions(+) 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; } } From 3b0f38cb631e2fa2a4732268bbb71ac8e949573f Mon Sep 17 00:00:00 2001 From: zhou keda <1315948824@qq.com> Date: Fri, 16 Aug 2024 16:56:58 +0800 Subject: [PATCH 2/2] bug --- BasicData/Tnb.BasicData/BasEbomService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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,