From 4eae7261e866853678a2948e10a589f425523be1 Mon Sep 17 00:00:00 2001
From: taoye <kensouterry@163.com>
Date: Fri, 23 Sep 2022 10:13:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.CustomResource/UserControls/Cylinder.xaml     | 4 ++--
 BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs     | 2 +-
 BPASmartClient.JXJFoodBigStation/View/RecipeReceiveView.xaml | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/BPASmartClient.CustomResource/UserControls/Cylinder.xaml b/BPASmartClient.CustomResource/UserControls/Cylinder.xaml
index 3d4b4f27..ce5051aa 100644
--- a/BPASmartClient.CustomResource/UserControls/Cylinder.xaml
+++ b/BPASmartClient.CustomResource/UserControls/Cylinder.xaml
@@ -66,9 +66,9 @@
                             <Trigger Property="IsChecked" Value="True">
                                 <Setter TargetName="el" Property="Fill" Value="Green" />
                             </Trigger>
-                            <Trigger Property="IsChecked" Value="False">
+                            <!--<Trigger Property="IsChecked" Value="False">
                                 <Setter TargetName="el" Property="Fill" Value="red" />
-                            </Trigger>
+                            </Trigger>-->
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
                 </Setter.Value>
diff --git a/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs b/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
index c4591952..ec7af286 100644
--- a/BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
+++ b/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()
                                 {
diff --git a/BPASmartClient.JXJFoodBigStation/View/RecipeReceiveView.xaml b/BPASmartClient.JXJFoodBigStation/View/RecipeReceiveView.xaml
index c752dcda..50d3db53 100644
--- a/BPASmartClient.JXJFoodBigStation/View/RecipeReceiveView.xaml
+++ b/BPASmartClient.JXJFoodBigStation/View/RecipeReceiveView.xaml
@@ -149,7 +149,7 @@
     </UserControl.Resources>
 
     <UserControl.DataContext>
-        <vm:RecipeReceiveViewModel />
+        <vm:RecipeReceiveViewModel/>
     </UserControl.DataContext>
 
     <Grid>
@@ -192,7 +192,7 @@
                 IsEnabled="True"
                 Style="{StaticResource IcoButtonStyle}" />
         </StackPanel>
-        <ScrollViewer Grid.Row="1">
+        <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Hidden">
             <ListBox
             Grid.Row="2"
             Margin="5"