Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient

BPASmartClient.JXJFoodSmallStation/View/NewLocalRecipeView.xaml

@@ -357,7 +357,7 @@
                                                 Grid.Column="5"
                                                 Height="25"
                                                 Command="{Binding DataContext.RemoveCommand, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
-                                                CommandParameter="{Binding RawMaterialLocation}"
+                                                CommandParameter="{Binding RawMaterialName}"
                                                 Content="删除"
                                                 FontSize="16"
                                                 Style="{StaticResource ControlButtonStyle}" />

BPASmartClient.JXJFoodSmallStation/ViewModel/NewLocalRecipeViewModel.cs

@@ -67,7 +67,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
 
             RemoveCommand = new RelayCommand<object>((o) =>
             {
-                var res = AllRawMaterial.FirstOrDefault(p => p.RawMaterialLocation == (int)o);
+                var res = AllRawMaterial.FirstOrDefault(p => p.RawMaterialName == o.ToString());
                 if (res != null) AllRawMaterial.Remove(res);
                 //NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"{o.ToString()}：原料删除成功!");
             });