1

BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs

@@ -61,7 +61,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
                         RawMaterials.Clear();
                         for (int i = 0; i < 15; i++)
                         {
-                            if (RawMaterialsNamePos.ContainsKey(res.RecipeName)
+                            if (RawMaterialsNamePos.ContainsKey(res.RecipeName))
                             {
                                 RawMaterials.Add(new RemoteRecipeRawMaterial()
                                 {

BeDesignerSCADA/Controls/MainCanvasPanel.xaml

@@ -333,7 +333,7 @@
                                 <mypro:EditorTemplateDefinition.EditingTemplate>
                                     <DataTemplate>
                                         <ComboBox  Grid.Column="1" Height="25"   Width="{Binding Width, ElementName=com}"  Text="{Binding Value,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
-                                                      ItemsSource="{Binding RelativeSource={RelativeSource Self},Path=DataContext.DevNameList}"
+                                                      ItemsSource="{Binding RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UserControl},Path=DataContext.DevNameList}"
                                                       ></ComboBox>
                                     </DataTemplate>
                                 </mypro:EditorTemplateDefinition.EditingTemplate>
@@ -356,10 +356,10 @@
                                                 </Grid.ColumnDefinitions>
                                                 <TextBlock>绑定：</TextBlock>
                                                 <ComboBox x:Name="namebox" DropDownOpened="namebox_DropDownOpened"  Grid.Column="1" Height="25" IsTextSearchEnabled="True" IsEditable="True"  Tag="{Binding Text, ElementName=valuebox}"  TextBoxBase.TextChanged="ComboBoxName_TextChanged"
-                                                      ItemsSource="{Binding RelativeSource={RelativeSource Self},Path=DataContext.DevNameList}">
+                                                      ItemsSource="{Binding RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UserControl},Path=DataContext.DevNameList}">
                                                 </ComboBox>
                                                 <ComboBox x:Name="valuebox" DropDownOpened="valuebox_DropDownOpened" Grid.Column="2" Height="25" IsTextSearchEnabled="True" IsEditable="True" Tag="{Binding Text, ElementName=namebox}"  TextBoxBase.TextChanged="ComboBoxValue_TextChanged"
-                                                      ItemsSource="{Binding RelativeSource={RelativeSource Self},Path=DataContext.DevValueList}"/>
+                                                      ItemsSource="{Binding RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UserControl},Path=DataContext.DevValueList}"/>
                                             </Grid>
                                             <TextBox Grid.Row="2" x:Name="wenben"   Padding="5" Text="{Binding Value,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" TextWrapping="Wrap"></TextBox>
 

BeDesignerSCADA/ViewModel/MainViewModelNew.cs

@@ -37,7 +37,7 @@ namespace BeDesignerSCADA.ViewModel
             {
                 IsRunning = !IsRunning;
             });
-            //DevNameList = new ObservableCollection<string>() {"qqqq","wewew" };
+            DevNameList = new ObservableCollection<string>() { "qqqq", "wewew" };
             //DataBusModel.GetInstance().RefreshTheVariableManagerAction += RefreshTheVariableManagerActionHader;
         }