From 88941072d962f8d37e89bbd818adad8f12d07c8e Mon Sep 17 00:00:00 2001 From: zhou keda <1315948824@qq.com> Date: Sat, 14 Sep 2024 21:42:54 +0800 Subject: [PATCH] bug --- ProductionMgr/Tnb.ProductionMgr/PrdMaterialReceiptService.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMaterialReceiptService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMaterialReceiptService.cs index ac10c04c..a33cfc93 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMaterialReceiptService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMaterialReceiptService.cs @@ -129,6 +129,7 @@ namespace Tnb.ProductionMgr PrdMoTask prdMoTask = await db.Queryable(). LeftJoin((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.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) @@ -154,6 +155,7 @@ namespace Tnb.ProductionMgr List inPrdMoTask = await db.Queryable(). LeftJoin((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.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)