taoye
2 years ago
3 changed files with 5 additions and 5 deletions
Unified View
Diff Options
-
+2 -2BPASmartClient.CustomResource/UserControls/Cylinder.xaml
-
+1 -1BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
-
+2 -2BPASmartClient.JXJFoodBigStation/View/RecipeReceiveView.xaml
+ 2
- 2
BPASmartClient.CustomResource/UserControls/Cylinder.xaml
View File
| @@ -66,9 +66,9 @@ | |||||
| <Trigger Property="IsChecked" Value="True"> | <Trigger Property="IsChecked" Value="True"> | ||||
| <Setter TargetName="el" Property="Fill" Value="Green" /> | <Setter TargetName="el" Property="Fill" Value="Green" /> | ||||
| </Trigger> | </Trigger> | ||||
| <Trigger Property="IsChecked" Value="False"> | |||||
| <!--<Trigger Property="IsChecked" Value="False"> | |||||
| <Setter TargetName="el" Property="Fill" Value="red" /> | <Setter TargetName="el" Property="Fill" Value="red" /> | ||||
| </Trigger> | |||||
| </Trigger>--> | |||||
| </ControlTemplate.Triggers> | </ControlTemplate.Triggers> | ||||
| </ControlTemplate> | </ControlTemplate> | ||||
| </Setter.Value> | </Setter.Value> | ||||
+ 1
- 1
BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
View File
| @@ -61,7 +61,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model | |||||
| RawMaterials.Clear(); | RawMaterials.Clear(); | ||||
| for (int i = 0; i < 15; i++) | for (int i = 0; i < 15; i++) | ||||
| { | { | ||||
| if (RawMaterialsNamePos.ContainsKey(res.RecipeName) | |||||
| if (RawMaterialsNamePos.ContainsKey(res.RecipeName)) | |||||
| { | { | ||||
| RawMaterials.Add(new RemoteRecipeRawMaterial() | RawMaterials.Add(new RemoteRecipeRawMaterial() | ||||
| { | { | ||||
+ 2
- 2
BPASmartClient.JXJFoodBigStation/View/RecipeReceiveView.xaml
View File
| @@ -149,7 +149,7 @@ | |||||
| </UserControl.Resources> | </UserControl.Resources> | ||||
| <UserControl.DataContext> | <UserControl.DataContext> | ||||
| <vm:RecipeReceiveViewModel /> | |||||
| <vm:RecipeReceiveViewModel/> | |||||
| </UserControl.DataContext> | </UserControl.DataContext> | ||||
| <Grid> | <Grid> | ||||
| @@ -192,7 +192,7 @@ | |||||
| IsEnabled="True" | IsEnabled="True" | ||||
| Style="{StaticResource IcoButtonStyle}" /> | Style="{StaticResource IcoButtonStyle}" /> | ||||
| </StackPanel> | </StackPanel> | ||||
| <ScrollViewer Grid.Row="1"> | |||||
| <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Hidden"> | |||||
| <ListBox | <ListBox | ||||
| Grid.Row="2" | Grid.Row="2" | ||||
| Margin="5" | Margin="5" | ||||