生产排产获取工单工艺路线添加工单编号过滤

MicroServices/Business/Business.Application/ResourceExamineManagement/ProductionScheduleAppService.cs

@@ -304,7 +304,7 @@ namespace Business.ResourceExamineManagement
                 //记录产线占用情况
                 allResults.AddRange(scheduleMasters);
                 //当前工单工艺路线主产线的关键工序
-                var curRoutings = workOrdRoutings.Where(p => p.ItemNum == item.ItemNum && p.ParentOp == 0 && p.MilestoneOp).OrderBy(p=>p.OP).ToList();
+                var curRoutings = workOrdRoutings.Where(p =>p.WorkOrd == item.WorkOrd && p.ItemNum == item.ItemNum && p.ParentOp == 0 && p.MilestoneOp).OrderBy(p=>p.OP).ToList();
                 //当前工单的产线明细
                 var curProdLines = prodLines.Where(p => p.Part == item.ItemNum).ToList();
                 
@@ -425,7 +425,7 @@ namespace Business.ResourceExamineManagement
                 if (!string.IsNullOrEmpty(item.Typed))//特殊工单
                 {
                     //校验有没有维护工艺路线即可
-                    var routings = workOrdRoutings.Where(p=>p.ItemNum == item.ItemNum).ToList();
+                    var routings = workOrdRoutings.Where(p=>p.WorkOrd == item.WorkOrd && p.ItemNum == item.ItemNum).ToList();
                     if (!routings.Any())
                     {
                         entity = new ScheduleExceptionMaster();
@@ -472,7 +472,7 @@ namespace Business.ResourceExamineManagement
                     }
                     continue;
                 }
-                var curRoutings = workOrdRoutings.Where(p => p.ItemNum == item.ItemNum && p.MilestoneOp).OrderBy(p=>p.OP).Select(p=>p.OP).Distinct().ToList();
+                var curRoutings = workOrdRoutings.Where(p => p.WorkOrd == item.WorkOrd && p.ItemNum == item.ItemNum && p.MilestoneOp).OrderBy(p=>p.OP).Select(p=>p.OP).ToList();
                 //判断当前工单主产线是否设置了关键工序
                 if (!curRoutings.Any())//当前工单没有维护关键工序
                 {