日计划判断领料单前处理状态字段调整为PretreatmentState

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

@@ -290,14 +290,14 @@ namespace Business.ResourceExamineManagement
                 }
                 var curNbrs = nbrMasterList.Where(p => p.WorkOrd == workOrds[i].WorkOrd).ToList();
                 //存在领料单：不需要前处理-领料单已关闭，需要前处理-状态为部分完成或者全部完成
-                if (curNbrs.Any() && !curNbrs.Exists(p => (p.TransType != "PrevProcess" && p.Status.ToUpper() != "C") || (p.TransType == "PrevProcess" && p.Ufld1 != "completed" && p.Ufld1 != "50")))
+                if (curNbrs.Any() && !curNbrs.Exists(p => (p.TransType != "PrevProcess" && p.Status.ToUpper() != "C") || (p.TransType == "PrevProcess" && p.PretreatmentState != "completed" && p.PretreatmentState != "50")))
                 {
                     workOrds[i].Priority = ktc;
                     ktc++;
                     continue;
                 }
                 //不存在领料单或者领料单未关闭或者前处理状态不为部分完成/全部完成
-                if (!curNbrs.Any() || curNbrs.Exists(p => (p.TransType != "PrevProcess" && p.Status.ToUpper() != "C") || (p.TransType == "PrevProcess" && p.Ufld1 != "completed" && p.Ufld1 != "50")))
+                if (!curNbrs.Any() || curNbrs.Exists(p => (p.TransType != "PrevProcess" && p.Status.ToUpper() != "C") || (p.TransType == "PrevProcess" && p.PretreatmentState != "completed" && p.PretreatmentState != "50")))
                 {
                     workOrds[i].Priority = bktc;
                     bktc++;