wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
马健
2024-08-16 18:50:40 +08:00
parent ea222f0baa 3b0f38cb63
commit 4cc672766b
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BasicData/Tnb.BasicData/BasEbomService.cs
View File

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

5
QcMgr/Tnb.QcMgr.Entities/Dto/CheckTask.cs
View File

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