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

BPASmartClient.JXJFoodBigStation/Model/RawMaterial/RawMaterial.cs

@@ -15,7 +15,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
         /// <summary>
         /// 原料名称
         /// </summary>
-        public string RawMaterialName { get { return _mRawMaterialName; } set { _mRawMaterialName = value; } }
+        public string RawMaterialName { get { return _mRawMaterialName; } set { _mRawMaterialName = value; OnPropertyChanged(); } }
         private string _mRawMaterialName;
 
         /// <summary>

BPASmartClient.JXJFoodBigStation/Model/RawMaterial/RecipeData.cs

@@ -19,7 +19,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
         /// <summary>
         /// 配方ID
         /// </summary>
-        public string RecipeCode { get { return _mRecipeCode; } set { _mRecipeCode = value; } }
+        public string RecipeCode { get { return _mRecipeCode; } set { _mRecipeCode = value;OnPropertyChanged(); } }
         private string _mRecipeCode;
  
         /// <summary>

BPASmartClient.JXJFoodBigStation/View/RecipeReceiveView.xaml

@@ -11,11 +11,13 @@
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
-
+    <UserControl.DataContext>
+        <vm:RecipeReceiveViewModel/>
+    </UserControl.DataContext>
     <UserControl.Resources>
 
 
-       
+
         <SolidColorBrush x:Key="BorderSolid" Color="#5523CACA" />
         <SolidColorBrush x:Key="FontColor" Color="#FF2AB2E7" />
         <SolidColorBrush x:Key="TitleFontColor" Color="#ddd" />
@@ -145,12 +147,8 @@
             </Setter>
         </Style>
         <!--#endregion-->
-       
-    </UserControl.Resources>
 
-    <UserControl.DataContext>
-        <vm:RecipeReceiveViewModel/>
-    </UserControl.DataContext>
+    </UserControl.Resources>
 
     <Grid>
         <Grid.RowDefinitions>
@@ -194,6 +192,7 @@
         </StackPanel>
         <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Hidden">
             <ListBox
+             
             Grid.Row="2"
             Margin="5"
             VerticalAlignment="Top"

BPASmartClient.JXJFoodBigStation/ViewModel/RecipeReceiveViewModel.cs

@@ -102,13 +102,13 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
         }
 
         public RelayCommand<object> DetailsCommand { get; set; }
-        public RelayCommand NewSimulateRecipe { get; set; }
+      //  public RelayCommand NewSimulateRecipe { get; set; }
         public RelayCommand ClearAllRecipe { get; set; }
 
         public RelayCommand NewRecipe { get; set; }
 
         public RelayCommand<string> RemoveCommand { get; set; }
-
+        
         public ObservableCollection<RecipeData> Recipes { get; set; } = new ObservableCollection<RecipeData>();
     }
 }

BPASmartClient.JXJFoodSmallStation/App.xaml.cs

@@ -29,7 +29,7 @@ namespace BPASmartClient.JXJFoodSmallStation
             MenuInit();
             DataInit();
             DeviceInquire.GetInstance.Init();//配料机设备上线监听，设备列表初始化
-            ProcessControl.GetInstance.Init();
+          //  ProcessControl.GetInstance.Init();
             MainView mv = new MainView();
             LoginView lv = new LoginView();
             var res = lv.ShowDialog();

BPASmartClient.JXJFoodSmallStation/View/NewLocalRecipeView.xaml

@@ -11,7 +11,7 @@
     Height="520"
     AllowsTransparency="True"
     Background="{x:Null}"
-    Topmost="True"
+    Topmost="false"
     WindowStartupLocation="CenterScreen"
     WindowStyle="None"
     mc:Ignorable="d">

BPASmartClient.JXJFoodSmallStation/View/NewLocalRecipeView.xaml.cs

@@ -29,5 +29,7 @@ namespace BPASmartClient.JXJFoodSmallStation.View
             ActionManage.GetInstance.CancelRegister("CloseNewRemoteRecipeView");
             ActionManage.GetInstance.Register(new Action(() => { this.Close(); }), "CloseNewRemoteRecipeView");
         }
+
+     
     }
 }

BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeReceiveViewModel.cs

@@ -31,7 +31,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
             IsUseWindSendDosing = GVL_SmallStation.GetInstance.IsUseWindSend;
             //Json<LocaPar>.Read();
             Recipes = Json<LocalRecipeDataColl>.Data.Recipes;
-           
+            
             NewRecipe = new RelayCommand(() =>
             {
                 NewLocalRecipeView NewLocalRecipe = new NewLocalRecipeView();