This commit is contained in:
2024-09-18 16:31:41 +08:00
parent 1aac1c131f
commit 453eadde2c

View File

@@ -155,7 +155,7 @@ namespace Tnb.ProductionMgr
List<PrdMoTask> inPrdMoTask = await db.Queryable<PrdMoTask>().
LeftJoin<PrdMo>((x,y)=>x.mo_id==y.id)
.Where(x => x.mo_task_status==DictConst.InProgressEnCode)
.Where((x, y) => x.schedule_type==1 || (x.schedule_type==2 && x.parent_id!=null))
.Where((x, y) => x.schedule_type==2 && x.parent_id!=null)
.Where((x,y)=>(x.scheduling_class_type=="1" && twoDayFlag && x.dayshift_worker_id==userId)
|| (y.mo_type==DictConst.PrdMoTypeBZ && !SqlFunc.IsNullOrEmpty(userWorklineId) && x.workline_id==userWorklineId)
|| (x.scheduling_class_type=="1" && twoNightFlag && x.nightshift_worker_id==userId)