shangchaun

DosingSystem/ExcuteControl .cs

@@ -631,14 +631,15 @@ namespace BPASmartClient.DosingSystem
                                             {
                                                 App.Current.Dispatcher.Invoke(() =>
                                                 {
-                                                    RecipeModel recipe = recipeProcesses?.ToList().Find(a => a.RecipeName == RecipeNames.ElementAt(recipeNameNum));
-                                                    if (recipe.RecipStatus != "制作完成")
+
+                                                    RecipeModel recipe = recipeProcesses?.ToList().Find(a => a.RecipeName == RecipeNames.ElementAt(recipeNameNum-1));
+                                                    if (recipe!=null&& recipe.RecipStatus != "制作完成")
                                                     {
                                                         /*Json<OnRecipe>.Data.Recipes.RemoveAt(recipeProcesses.ToList().FindIndex(a => a.RecipeName == RecipeNames.ElementAt(recipeNameNum)));
                                                         Json<OnRecipe>.Save();*/
                                                         recipe.RecipStatus = "制作完成";
                                                         UserTreeCompelete.Insert(0, recipe);
-                                                        recipeProcesses.RemoveAt(recipeProcesses.ToList().FindIndex(a => a.RecipeName == RecipeNames.ElementAt(recipeNameNum)));
+                                                        recipeProcesses.RemoveAt(recipeProcesses.ToList().FindIndex(a => a.RecipeName == RecipeNames.ElementAt(recipeNameNum-1)));
                                                     }
                                                 });
                                             }
@@ -675,11 +676,15 @@ namespace BPASmartClient.DosingSystem
                                                     App.Current.Dispatcher.Invoke(() =>
                                                     {
                                                         RecipeModel recipe = UserTreeWait?.ToList().Find(a => a.RecipeName == RecipeNames.ElementAt(recipeNameNum-1));
-                                                        recipe.RecipStatus = "正在配料";
-                                                        recipeProcesses.Insert(0, recipe);
-                                                       /* Json<OnRecipe>.Data.Recipes.Insert(0, recipe);
-                                                        Json<OnRecipe>.Save();*/
-                                                        UserTreeWait.RemoveAt(UserTreeWait.ToList().FindIndex(a => a.RecipeName == RecipeNames.ElementAt(recipeNameNum-1)));
+                                                        if (recipe!=null)
+                                                        {
+                                                            recipe.RecipStatus = "正在配料";
+                                                            recipeProcesses.Insert(0, recipe);
+                                                            /* Json<OnRecipe>.Data.Recipes.Insert(0, recipe);
+                                                             Json<OnRecipe>.Save();*/
+                                                            UserTreeWait.RemoveAt(UserTreeWait.ToList().FindIndex(a => a.RecipeName == RecipeNames.ElementAt(recipeNameNum - 1)));
+                                                        }
+                                                       
                                                     });
                                                 }
                                             }