This commit is contained in:
2024-09-18 13:53:02 +08:00
parent 68f9b871fa
commit b40f674641
3 changed files with 6 additions and 1 deletions

View File

@@ -112,6 +112,7 @@ namespace Tnb.ProductionMgr
ISqlSugarClient db = _repository.AsSugarClient();
Dictionary<string, object>? queryJson = !string.IsNullOrEmpty(input.queryJson) ? Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, object>>(input.queryJson) : new Dictionary<string, object>();
string moCode = queryJson.ContainsKey("mo_code") ? queryJson["mo_code"].ToString() : "";
string remark = queryJson.ContainsKey("remark") ? queryJson["remark"].ToString() : "";
string moStatus = queryJson.ContainsKey("mo_status") ? queryJson["mo_status"].ToString() : "";
string combineMoCode = queryJson.ContainsKey("combine_mo_code") ? queryJson["combine_mo_code"].ToString() : "";
string mo_type = queryJson.ContainsKey("mo_type") ? queryJson["mo_type"].ToString() : "";
@@ -142,6 +143,7 @@ namespace Tnb.ProductionMgr
.LeftJoin<DictionaryDataEntity>((a, b, c, d, e) => a.mo_status == e.Id)
.LeftJoin<DictionaryDataEntity>((a, b, c, d, e, f) => a.mo_type == f.Id)
.WhereIF(!string.IsNullOrEmpty(moCode), (a, b, c, d, e) => a.mo_code.Contains(moCode))
.WhereIF(!string.IsNullOrEmpty(remark), (a, b, c, d, e) => b.code.Contains(remark) || b.name.Contains(remark))
.WhereIF(!string.IsNullOrEmpty(combineMoCode),
(a, b, c, d, e) => a.combine_mo_code.Contains(combineMoCode))
.WhereIF(!string.IsNullOrEmpty(moStatus), (a, b, c, d, e) => a.mo_status == moStatus)