diff --git a/QcMgr/Tnb.QcMgr/QcCheckPlanService.cs b/QcMgr/Tnb.QcMgr/QcCheckPlanService.cs index d4d3d4a2..55410eee 100644 --- a/QcMgr/Tnb.QcMgr/QcCheckPlanService.cs +++ b/QcMgr/Tnb.QcMgr/QcCheckPlanService.cs @@ -417,9 +417,9 @@ namespace Tnb.QcMgr ISugarQueryable Query = _repository.AsSugarClient().Queryable ((a, b, c, d, e) => new object[] { JoinType.Inner,a.id== b.mainid, - JoinType.Left,a.id == c.planid, - JoinType.Left,a.id == d.planid, - JoinType.Left,a.id == e.planid, + JoinType.Left,a.id == c.planid && c.materialid==entity.materialid, + JoinType.Left,a.id == d.planid && d.processid==entity.processid, + JoinType.Left,a.id == e.planid && e.workid==entity.workid, }); GetQuery(Query, entity); // 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)=>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 list = await Query.ToListAsync(); if (list.IsEmpty())