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

去除warn

Browse Source
This commit is contained in:
周科达
2023-06-19 16:27:13 +08:00
parent 0b492898af
commit aea9e3a9d5
69 changed files with 512 additions and 483 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,8 +48,8 @@ namespace Tnb.BasicData
public async Task<dynamic> GetList(VisualDevModelListQueryInput input)
{
var db = _repository.AsSugarClient();
Dictionary<string, object> queryJson = string.IsNullOrEmpty(input.queryJson) ? null : input.queryJson.ToObject<Dictionary<string, object>>();
string materialInfo = queryJson?["query_info"]?.ToString();
Dictionary<string, object>? queryJson = (input==null || string.IsNullOrEmpty(input.queryJson)) ? null : input.queryJson.ToObject<Dictionary<string, object>>();
string materialInfo = queryJson?["query_info"]?.ToString() ?? "";
var list = await db.Queryable<BasEbomH, BasMaterial, BasRouteH>((a, b, c) => new object[]
{
JoinType.Left, a.material_id == b.id,
@@ -67,7 +67,7 @@ namespace Tnb.BasicData
route_id = c.name,
route_id_id = c.id,
}).ToPagedListAsync(input.currentPage, input.pageSize);
}).ToPagedListAsync((input?.currentPage ?? 1), (input?.pageSize ?? 50));
return PageResult<EbomListOutput>.SqlSugarPageResult(list);
}
@@ -75,7 +75,6 @@ namespace Tnb.BasicData
/// <summary>
/// 获取物料清单树.
/// </summary>
/// <param name="input">获取物料清单树.</param>
/// <returns></returns>
[HttpPost]
public async Task<dynamic> GetTree(EbomTreeQueryInput queryInput)
@@ -115,7 +114,7 @@ namespace Tnb.BasicData
hasChildren = SqlFunc.Subqueryable<BasEbomH>().Where(x=>x.material_id==a.material_id).Any(),
}).Mapper(it =>
{
it.material_id_unit_id = dic[it.material_id_unit_id].ToString();
it.material_id_unit_id = !string.IsNullOrEmpty(it.material_id_unit_id) ? dic[it.material_id_unit_id].ToString() : "";
}).ToListAsync();
return data;
}
@@ -145,7 +144,7 @@ namespace Tnb.BasicData
hasChildren = SqlFunc.Subqueryable<BasEbomH>().Where(x=>x.material_id==a.material_id).Any(),
}).Mapper(it =>
{
it.material_id_unit_id = dic[it.material_id_unit_id].ToString();
it.material_id_unit_id = !string.IsNullOrEmpty(it.material_id_unit_id) ? dic[it.material_id_unit_id].ToString() : "";
}).ToListAsync();
return data;
}
@@ -182,9 +181,9 @@ namespace Tnb.BasicData
}).FirstAsync();
return new Dictionary<string,string>()
{
["version"] = ebom?.version,
["routeName"] = ebom?.name,
["routeId"] = ebom?.id
["version"] = ebom?.version ?? "",
["routeName"] = ebom?.name ?? "",
["routeId"] = ebom?.id ?? ""
,
};
}