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-23 17:49:34 +08:00
parent 0492407182 b9fb870484
commit 2dbede6d66
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
QcMgr/Tnb.QcMgr/QcCheckPlanService.cs
View File

@@ -417,9 +417,9 @@ namespace Tnb.QcMgr
ISugarQueryable<QcCheckPlanH, QcCheckPlanAdd, QcCheckPlanMaterial, QcCheckPlanProcess, QcCheckPlanWork> Query = _repository.AsSugarClient().Queryable<QcCheckPlanH, QcCheckPlanAdd, QcCheckPlanMaterial, QcCheckPlanProcess, QcCheckPlanWork> ISugarQueryable<QcCheckPlanH, QcCheckPlanAdd, QcCheckPlanMaterial, QcCheckPlanProcess, QcCheckPlanWork> Query = _repository.AsSugarClient().Queryable<QcCheckPlanH, QcCheckPlanAdd, QcCheckPlanMaterial, QcCheckPlanProcess, QcCheckPlanWork>
((a, b, c, d, e) => new object[] { ((a, b, c, d, e) => new object[] {
JoinType.Inner,a.id== b.mainid, JoinType.Inner,a.id== b.mainid,
JoinType.Left,a.id == c.planid, JoinType.Left,a.id == c.planid && c.materialid==entity.materialid,
JoinType.Left,a.id == d.planid, JoinType.Left,a.id == d.planid && d.processid==entity.processid,
JoinType.Left,a.id == e.planid, JoinType.Left,a.id == e.planid && e.workid==entity.workid,
}); });
GetQuery(Query, entity); GetQuery(Query, entity);
// if (!string.IsNullOrEmpty(entity.materialid)) // if (!string.IsNullOrEmpty(entity.materialid))
@@ -434,7 +434,7 @@ namespace Tnb.QcMgr
// { // {
// Query = Query.Where((a, b, c, d, e) => e.workid==entity.workid); // Query = Query.Where((a, b, c, d, e) => e.workid==entity.workid);
// } // }
Query = Query.Where((a, b, c, d, e)=>c.materialid==entity.materialid || d.processid==entity.processid || e.workid==entity.workid); //Query = Query.Where((a, b, c, d, e)=>c.materialid==entity.materialid || d.processid==entity.processid || e.workid==entity.workid);
List<QcCheckPlanH> list = await Query.ToListAsync(); List<QcCheckPlanH> list = await Query.ToListAsync();
if (list.IsEmpty()) if (list.IsEmpty())