diff --git a/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj b/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj
index b5146049..566cd517 100644
--- a/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj
+++ b/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj
@@ -114,6 +114,7 @@
     <None Remove="Image\工艺流程.jpg" />
     <None Remove="Image\工艺流程.png" />
     <None Remove="Image\底部背景.png" />
+    <None Remove="Image\弹窗2.png" />
     <None Remove="Image\按钮\AddGreen.png" />
     <None Remove="Image\按钮\Delete.png" />
     <None Remove="Image\按钮\停用.png" />
@@ -277,6 +278,7 @@
     <Resource Include="Image\告警\轻微告警.png" />
     <Resource Include="Image\工艺流程.jpg" />
     <Resource Include="Image\工艺流程.png" />
+    <Resource Include="Image\弹窗2.png" />
     <Resource Include="Image\按钮\AddGreen.png" />
     <Resource Include="Image\按钮\Delete.png" />
     <Resource Include="Image\按钮\停用.png" />
diff --git a/BPASmartClient.CustomResource/Image/弹窗2.png b/BPASmartClient.CustomResource/Image/弹窗2.png
new file mode 100644
index 00000000..6f69f62a
Binary files /dev/null and b/BPASmartClient.CustomResource/Image/弹窗2.png differ
diff --git a/BPASmartClient.CustomResource/UserControls/BatchingMachine.xaml b/BPASmartClient.CustomResource/UserControls/BatchingMachine.xaml
new file mode 100644
index 00000000..994077f8
--- /dev/null
+++ b/BPASmartClient.CustomResource/UserControls/BatchingMachine.xaml
@@ -0,0 +1,47 @@
+<UserControl
+    x:Class="BPASmartClient.CustomResource.UserControls.BatchingMachine"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.CustomResource.UserControls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="235"
+    d:DesignWidth="390"
+    mc:Ignorable="d">
+
+    <UserControl.Resources>
+        <SolidColorBrush x:Key="fillColor" Color="#443FADFF" />
+        <SolidColorBrush x:Key="BorderColor" Color="Blue" />
+    </UserControl.Resources>
+    <Grid Name="gr">
+        <Viewbox Width="auto" Height="auto">
+            <Canvas Width="{Binding ElementName=gr, Path=ActualWidth}" Height="{Binding ElementName=gr, Path=ActualHeight}">
+                <Path
+                    Data="M100,0 L350,60 250,120 0,60 100,0"
+                    Fill="{StaticResource fillColor}"
+                    Stroke="{StaticResource BorderColor}" />
+                <Path
+                    Data="M0,60 L0,170 250,230 250,120"
+                    Fill="{StaticResource fillColor}"
+                    Stroke="{StaticResource BorderColor}" />
+                <Path
+                    Data="M250,230 L350,170 350,60 250,120"
+                    Fill="{StaticResource fillColor}"
+                    Stroke="{StaticResource BorderColor}" />
+                <Path
+                    Data="M350,60 L390,100 290,160 250,120"
+                    Fill="{StaticResource fillColor}"
+                    Stroke="{StaticResource BorderColor}" />
+                <Path
+                    Data="M290,160 L250,150"
+                    Fill="{StaticResource fillColor}"
+                    Stroke="{StaticResource BorderColor}" />
+                <Path
+                    Data="M390,100 L350,90"
+                    Fill="{StaticResource fillColor}"
+                    Stroke="{StaticResource BorderColor}" />
+            </Canvas>
+        </Viewbox>
+
+    </Grid>
+</UserControl>
diff --git a/BPASmartClient.CustomResource/UserControls/BatchingMachine.xaml.cs b/BPASmartClient.CustomResource/UserControls/BatchingMachine.xaml.cs
new file mode 100644
index 00000000..f4651dac
--- /dev/null
+++ b/BPASmartClient.CustomResource/UserControls/BatchingMachine.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace BPASmartClient.CustomResource.UserControls
+{
+    /// <summary>
+    /// BatchingMachine.xaml 的交互逻辑
+    /// </summary>
+    public partial class BatchingMachine : UserControl
+    {
+        public BatchingMachine()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/BPASmartClient.CustomResource/UserControls/Cylinder.xaml b/BPASmartClient.CustomResource/UserControls/Cylinder.xaml
new file mode 100644
index 00000000..97f5d6f8
--- /dev/null
+++ b/BPASmartClient.CustomResource/UserControls/Cylinder.xaml
@@ -0,0 +1,249 @@
+<UserControl
+    x:Class="BPASmartClient.CustomResource.UserControls.Cylinder"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.CustomResource.UserControls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="100"
+    d:DesignWidth="389"
+    mc:Ignorable="d">
+
+    <UserControl.Resources>
+        <SolidColorBrush x:Key="scb" Color="#FFB1B1B9" />
+        <SolidColorBrush x:Key="scbs" Color="#FF6d6666" />
+
+    </UserControl.Resources>
+
+    <Grid Name="cav">
+        <Viewbox Width="auto" Height="auto">
+            <Canvas
+                Name="cv"
+                Width="{Binding ElementName=cav, Path=ActualWidth}"
+                Height="{Binding ElementName=cav, Path=ActualHeight}">
+                <Path
+                    Data="M2 30 L2 70"
+                    Stroke="{StaticResource scb}"
+                    StrokeThickness="4" />
+                <Path
+                    Data="M6 30 L6 70"
+                    Stroke="{StaticResource scbs}"
+                    StrokeThickness="4" />
+                <Path
+                    Data="M10 30 L10 70"
+                    Stroke="{StaticResource scb}"
+                    StrokeThickness="4" />
+                <Path
+                    Data="M14 30 L14 70"
+                    Stroke="{StaticResource scbs}"
+                    StrokeThickness="4" />
+                <Path
+                    Data="M18 30 L18 70"
+                    Stroke="{StaticResource scb}"
+                    StrokeThickness="4" />
+                <Path
+                    Data="M22 30 L22 70"
+                    Stroke="{StaticResource scbs}"
+                    StrokeThickness="4" />
+                <Path
+                    Data="M26 30 L26 70"
+                    Stroke="{StaticResource scb}"
+                    StrokeThickness="4" />
+                <Path
+                    Data="M30 30 L30 70"
+                    Stroke="{StaticResource scbs}"
+                    StrokeThickness="4" />
+                <Path
+                    Data="M34 30 L34 70"
+                    Stroke="{StaticResource scb}"
+                    StrokeThickness="4" />
+                <Path
+                    Data="M38 30 L38 70"
+                    Stroke="{StaticResource scbs}"
+                    StrokeThickness="4" />
+                <Path
+                    Data="M42 30 L42 70"
+                    Stroke="{StaticResource scb}"
+                    StrokeThickness="4" />
+                <Path
+                    Data="M46 30 L46 70"
+                    Stroke="{StaticResource scbs}"
+                    StrokeThickness="4" />
+                <Path
+                    Data="M50 30 L50 70"
+                    Stroke="{StaticResource scb}"
+                    StrokeThickness="4" />
+                <Path
+                    Data="M54 30 L54 70"
+                    Stroke="{StaticResource scbs}"
+                    StrokeThickness="4" />
+                <Path
+                    Data="M58 30 L58 70"
+                    Stroke="{StaticResource scb}"
+                    StrokeThickness="4" />
+                <Path
+                    Data="M62 30 L62 70"
+                    Stroke="{StaticResource scbs}"
+                    StrokeThickness="4" />
+                <Path
+                    Data="M64 30 L64 70"
+                    Stroke="{StaticResource scb}"
+                    StrokeThickness="4" />
+                <Path
+                    Data="M68 30 L68 70"
+                    Stroke="{StaticResource scbs}"
+                    StrokeThickness="4" />
+                <Path
+                    Data="M72 30 L72 70"
+                    Stroke="{StaticResource scb}"
+                    StrokeThickness="4" />
+                <Path
+                    Data="M76 30 L76 70"
+                    Stroke="{StaticResource scbs}"
+                    StrokeThickness="4" />
+                <Path
+                    Data="M80 30 L80 70"
+                    Stroke="{StaticResource scb}"
+                    StrokeThickness="4" />
+                <Path
+                    Data="M84 30 L84 70"
+                    Stroke="{StaticResource scbs}"
+                    StrokeThickness="4" />
+                <Path
+                    Data="M88 30 L88 70"
+                    Stroke="{StaticResource scb}"
+                    StrokeThickness="4" />
+                <Path
+                    Data="M92 30 L92 70"
+                    Stroke="{StaticResource scbs}"
+                    StrokeThickness="4" />
+                <Path
+                    Data="M102 30 L102 70"
+                    Stroke="{StaticResource scbs}"
+                    StrokeThickness="16" />
+                <Path
+                    Data="M50 20 L50 80"
+                    Stroke="{StaticResource scb}"
+                    StrokeThickness="20" />
+                <Path
+                    Data="M42,25 L58,25 60,30 60,45 58,50 60,55 60,70 58,75 42,75 40,70 40,55 42,50 40,45 40,30 42,25"
+                    Stroke="{StaticResource scbs}"
+                    StrokeThickness="1" />
+                <Path
+                    Data="M42 50 L58 50"
+                    Stroke="{StaticResource scbs}"
+                    StrokeThickness="1" />
+
+
+                <Path Data="M110 0 L110,100 160,100 175,80 300 ,80 315,100 365,100 365,0 315,0 300,20 175,20 160,0 110,0">
+                    <Path.Fill>
+                        <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
+                            <GradientStop Color="#FF1EDEDA" />
+                            <GradientStop Offset="1" Color="#FF1EDEDA" />
+                            <GradientStop Offset="0.5" Color="#FFDDEAE9" />
+                        </LinearGradientBrush>
+                    </Path.Fill>
+                </Path>
+
+                <Path
+                    Data="M110 30 L160,30 A2,5 0 1 1 160,70 L110,70"
+                    Stroke="{StaticResource scb}"
+                    StrokeThickness="2" />
+                <Path
+                    Data="M160 0 L160,30"
+                    Stroke="{StaticResource scb}"
+                    StrokeThickness="2" />
+                <Path
+                    Data="M160 70 L160,100"
+                    Stroke="{StaticResource scb}"
+                    StrokeThickness="2" />
+                <Path
+                    Data="M175 20 L175,80"
+                    Stroke="{StaticResource scb}"
+                    StrokeThickness="2" />
+                <Path
+                    Data="M179 20 L179,80"
+                    Stroke="{StaticResource scb}"
+                    StrokeThickness="2" />
+                <Path
+                    Data="M183 20 L183,80"
+                    Stroke="{StaticResource scb}"
+                    StrokeThickness="2" />
+                <Path
+                    Data="M187 20 L187,80"
+                    Stroke="{StaticResource scb}"
+                    StrokeThickness="2" />
+
+                <Path
+                    Data="M365 30 L315,30 A2,5 0 1 0 315,70 L365,70"
+                    Stroke="{StaticResource scb}"
+                    StrokeThickness="2" />
+                <Path
+                    Data="M315 0 L315,30"
+                    Stroke="{StaticResource scb}"
+                    StrokeThickness="2" />
+                <Path
+                    Data="M315 70 L315,100"
+                    Stroke="{StaticResource scb}"
+                    StrokeThickness="2" />
+                <Path
+                    Data="M300 20 L300,80"
+                    Stroke="{StaticResource scb}"
+                    StrokeThickness="2" />
+                <Path
+                    Data="M296 20 L296,80"
+                    Stroke="{StaticResource scb}"
+                    StrokeThickness="2" />
+                <Path
+                    Data="M292 20 L292,80"
+                    Stroke="{StaticResource scb}"
+                    StrokeThickness="2" />
+                <Path
+                    Data="M288 20 L288,80"
+                    Stroke="{StaticResource scb}"
+                    StrokeThickness="2" />
+
+
+                <Path
+                    Data="M367 20 L367 80"
+                    Stroke="{StaticResource scb}"
+                    StrokeThickness="4" />
+                <Path
+                    Data="M371 20 L371 80"
+                    Stroke="{StaticResource scbs}"
+                    StrokeThickness="4" />
+                <Path
+                    Data="M375 20 L375 80"
+                    Stroke="{StaticResource scb}"
+                    StrokeThickness="4" />
+                <Path
+                    Data="M379 20 L379 80"
+                    Stroke="{StaticResource scbs}"
+                    StrokeThickness="4" />
+                <Path
+                    Data="M383 20 L383 80"
+                    Stroke="{StaticResource scb}"
+                    StrokeThickness="4" />
+                <Path
+                    Data="M387 20 L387 80"
+                    Stroke="{StaticResource scbs}"
+                    StrokeThickness="4" />
+
+                <Ellipse
+                    Width="30"
+                    Height="30"
+                    Margin="120,35,0,0"
+                    HorizontalAlignment="Left"
+                    Fill="Red" />
+                <Ellipse
+                    Width="30"
+                    Height="30"
+                    Margin="325,35,0,0"
+                    HorizontalAlignment="Left"
+                    Fill="Red" />
+
+            </Canvas>
+        </Viewbox>
+    </Grid>
+
+</UserControl>
diff --git a/BPASmartClient.CustomResource/UserControls/Cylinder.xaml.cs b/BPASmartClient.CustomResource/UserControls/Cylinder.xaml.cs
new file mode 100644
index 00000000..b115ba13
--- /dev/null
+++ b/BPASmartClient.CustomResource/UserControls/Cylinder.xaml.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace BPASmartClient.CustomResource.UserControls
+{
+    /// <summary>
+    /// Cylinder.xaml 的交互逻辑
+    /// </summary>
+    public partial class Cylinder : UserControl
+    {
+        public Cylinder()
+        {
+            InitializeComponent();
+
+        }
+
+
+    }
+}
diff --git a/DosingSystem/View/HardwareStatusView.xaml b/DosingSystem/View/HardwareStatusView.xaml
index de95a26d..02e3b926 100644
--- a/DosingSystem/View/HardwareStatusView.xaml
+++ b/DosingSystem/View/HardwareStatusView.xaml
@@ -187,6 +187,10 @@
                 StrokeDashArray="1.5 1.5"
                 StrokeFillBrush="#00BEFA"
                 StrokeThickness="2" />
+
+
+            <!--<pry:Pipeline CapRadius="30" Height="30"/>-->
+
         </Grid>
 
         <UniformGrid Grid.Row="2" Columns="10">
diff --git a/DosingSystem/View/NewMaterialView.xaml b/DosingSystem/View/NewMaterialView.xaml
index 1158e4ed..a7b70333 100644
--- a/DosingSystem/View/NewMaterialView.xaml
+++ b/DosingSystem/View/NewMaterialView.xaml
@@ -1,21 +1,22 @@
-<Window x:Class="BPASmartClient.DosingSystem.View.NewMaterialView"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:BPASmartClient.DosingSystem.View"
-        xmlns:vm="clr-namespace:BPASmartClient.DosingSystem.ViewModel"
-        mc:Ignorable="d"
-        Title="NewMateritalView" 
-        Width="600"
-        Height="600"
-        AllowsTransparency="True"
-        Background="{x:Null}"
-        Topmost="True"
-        WindowStartupLocation="CenterScreen"
-        WindowStyle="None">
+<Window
+    x:Class="BPASmartClient.DosingSystem.View.NewMaterialView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.DosingSystem.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vm="clr-namespace:BPASmartClient.DosingSystem.ViewModel"
+    Title="NewMateritalView"
+    Width="600"
+    Height="600"
+    AllowsTransparency="True"
+    Background="{x:Null}"
+    Topmost="True"
+    WindowStartupLocation="CenterScreen"
+    WindowStyle="None"
+    mc:Ignorable="d">
     <Window.DataContext>
-        <vm:NewMaterialViewModel/>
+        <vm:NewMaterialViewModel />
     </Window.DataContext>
     <Window.Resources>
         <ResourceDictionary>
@@ -24,7 +25,7 @@
                 <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/MyStyle.xaml" />
 
                 <ResourceDictionary>
-                    
+
                     <!--#region ListBox样式-->
                     <Style x:Key="ListBoxItemStyle1" TargetType="{x:Type ListBoxItem}">
                         <Setter Property="OverridesDefaultStyle" Value="True" />
@@ -57,12 +58,16 @@
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="5" />
-                <RowDefinition Height="*"/>
-                <RowDefinition Height="40"/>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="40" />
                 <RowDefinition Height="5" />
                 <RowDefinition Height="5*" />
             </Grid.RowDefinitions>
-            <StackPanel Orientation="Horizontal" Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center">
+            <StackPanel
+                Grid.Row="1"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Orientation="Horizontal">
                 <TextBlock
                     Margin="10,0,0,0"
                     Background="Transparent"
@@ -70,47 +75,60 @@
                     Foreground="#FF2AB2E7"
                     Text="请输入原料名称：" />
 
-                
 
-                    <TextBox
-                        Grid.Column="1"
-                        Width="200"
-                        Height="30"
-                        Margin="10"
-                        FontSize="16"
-                        Text="{Binding MaterialName}" />
+
+                <TextBox
+                    Grid.Column="1"
+                    Width="200"
+                    Height="30"
+                    Margin="10"
+                    FontSize="16"
+                    Text="{Binding MaterialName}" />
 
                 <Button
-                        Width="80"
-                        Height="30"
-                        Margin="10"
-                        Command="{Binding SaveCommand}"
-                        Content="保存" Cursor="Hand" />
+                    Width="80"
+                    Height="30"
+                    Margin="10"
+                    Command="{Binding SaveCommand}"
+                    Content="保存"
+                    Cursor="Hand" />
                 <Button
-                        Name="btClose"
-                        Width="80"
-                        Height="30"
-                        Margin="10"
-                        Click="btClose_Click"
-                        Content="取消" />
+                    Name="btClose"
+                    Width="80"
+                    Height="30"
+                    Margin="10"
+                    Click="btClose_Click"
+                    Content="取消" />
 
-                </StackPanel>
-            <TextBlock  Grid.Row="2"
-                    Margin="0,0,5,0"
-                    HorizontalAlignment="Center"
-                    Background="Transparent"
-                    FontSize="16"
-                    Foreground="Red"
-                    Text="{Binding ErrorInfo}"></TextBlock>
+            </StackPanel>
+            <TextBlock
+                Grid.Row="2"
+                Margin="0,0,5,0"
+                HorizontalAlignment="Center"
+                Background="Transparent"
+                FontSize="16"
+                Foreground="Red"
+                Text="{Binding ErrorInfo}" />
             <Grid Grid.Row="4">
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="40"/>
-                    <RowDefinition Height="*"/>
+                    <RowDefinition Height="40" />
+                    <RowDefinition Height="*" />
                 </Grid.RowDefinitions>
-                <TextBlock Text="本地原料" HorizontalAlignment="Center" FontSize="25" Foreground="#FF2AB2E7"/>
-                <Border Grid.Row="1" BorderBrush="#FF2AB2E7" BorderThickness="1" Margin="100,10">
-                    <ScrollViewer Grid.Row="1"  BorderBrush="#FF2AB2E7" BorderThickness="1">
-                        <ItemsControl ItemsSource="{Binding Materials}" Margin="10">
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    FontSize="25"
+                    Foreground="#FF2AB2E7"
+                    Text="本地原料" />
+                <Border
+                    Grid.Row="1"
+                    Margin="100,10"
+                    BorderBrush="#FF2AB2E7"
+                    BorderThickness="1">
+                    <ScrollViewer
+                        Grid.Row="1"
+                        BorderBrush="#FF2AB2E7"
+                        BorderThickness="1">
+                        <ItemsControl Margin="10" ItemsSource="{Binding Materials}">
                             <ItemsControl.ItemTemplate>
                                 <DataTemplate>
                                     <RadioButton GroupName="all">
@@ -118,7 +136,7 @@
                                             <ControlTemplate TargetType="RadioButton">
                                                 <Grid Name="gr" Height="40">
                                                     <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition Width="2*"/>
+                                                        <ColumnDefinition Width="2*" />
                                                         <ColumnDefinition Width="*" />
                                                     </Grid.ColumnDefinitions>
                                                     <TextBlock
@@ -127,16 +145,17 @@
                                                         Width="150"
                                                         Height="29"
                                                         Margin="3,1"
-                                                        VerticalAlignment="Center" HorizontalAlignment="Center"
+                                                        HorizontalAlignment="Center"
+                                                        VerticalAlignment="Center"
                                                         FontSize="20"
                                                         Text="{Binding RawMaterialName}" />
 
                                                     <Button
-                                                    Grid.Column="1"
-                                                    Margin="10,0,10,0"
-                                                    Command="{Binding DataContext.RemoveCommand, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
-                                                    CommandParameter="{Binding RawMaterialId}"
-                                                    Content="删除" />
+                                                        Grid.Column="1"
+                                                        Margin="10,0,10,0"
+                                                        Command="{Binding DataContext.RemoveCommand, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
+                                                        CommandParameter="{Binding RawMaterialId}"
+                                                        Content="删除" />
                                                 </Grid>
 
 
diff --git a/DosingSystem/View/NewRecipeView.xaml b/DosingSystem/View/NewRecipeView.xaml
index b7f3f622..bd04e1ed 100644
--- a/DosingSystem/View/NewRecipeView.xaml
+++ b/DosingSystem/View/NewRecipeView.xaml
@@ -52,11 +52,20 @@
         </ResourceDictionary>
     </Window.Resources>
 
-    <Border Name="br" BorderThickness="1">
+    <Border
+        Name="br"
+        BorderBrush="#0CADF5"
+        BorderThickness="2">
         <Border.Background>
             <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/bg.png" />
+            <!--<ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/弹窗2.png" />-->
         </Border.Background>
         <Grid>
+
+            <!--<Grid.Background>
+                <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/弹窗.png" />
+            </Grid.Background>-->
+
             <Grid.RowDefinitions>
                 <RowDefinition Height="5" />
                 <RowDefinition />
@@ -134,7 +143,11 @@
 
                 </StackPanel>
 
-                <ScrollViewer Grid.Row="2" Margin="5">
+                <ScrollViewer
+                    Grid.Row="2"
+                    Margin="5"
+                    HorizontalScrollBarVisibility="Hidden"
+                    VerticalScrollBarVisibility="Hidden">
                     <ItemsControl ItemsSource="{Binding RawMaterials}">
                         <ItemsControl.ItemTemplate>
                             <DataTemplate>
@@ -201,7 +214,8 @@
 
                                                 <Button
                                                     Grid.Column="2"
-                                                    Margin="10,0,10,0"
+                                                    Width="80"
+                                                    Margin="25,0,0,0"
                                                     Command="{Binding DataContext.RemoveCommand, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
                                                     CommandParameter="{Binding RawMaterialId}"
                                                     Content="删除" />
diff --git a/SmartClient.sln b/SmartClient.sln
index 408ebd9b..f2ae20db 100644
--- a/SmartClient.sln
+++ b/SmartClient.sln
@@ -121,17 +121,16 @@ EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.KHKJ", "BPASmartClient.KHKJ\BPASmartClient.KHKJ.csproj", "{C0060FB3-7AEA-4D14-ADCE-DB78D3665D5B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.MorkTM", "BPASmartClient.MorkTM\BPASmartClient.MorkTM.csproj", "{1612F583-D328-45C6-8BB1-5D41B8F1D216}"
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.KHKJ", "BPASmartClient.KHKJ\BPASmartClient.KHKJ.csproj", "{C0060FB3-7AEA-4D14-ADCE-DB78D3665D5B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.Nfc", "BPASmartClient.Nfc\BPASmartClient.Nfc.csproj", "{42D35B7C-764C-4692-AA85-9B343A0F5B7F}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.Argox", "BPASmartClient.Argox\BPASmartClient.Argox.csproj", "{B8D499BA-A18A-4FD6-B036-44F02B4D164B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BPASmartClient.S7Net", "BPASmartClient.S7Net\BPASmartClient.S7Net.csproj", "{D1F2379E-1755-4B50-9D67-15C960C33FFA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.S7Net", "BPASmartClient.S7Net\BPASmartClient.S7Net.csproj", "{D1F2379E-1755-4B50-9D67-15C960C33FFA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BPASmartClient.JXJFoodBigStation", "BPASmartClient.JXJFoodBigStation\BPASmartClient.JXJFoodBigStation.csproj", "{FA695D7E-6F12-4483-A16D-8494609FAE68}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.JXJFoodBigStation", "BPASmartClient.JXJFoodBigStation\BPASmartClient.JXJFoodBigStation.csproj", "{FA695D7E-6F12-4483-A16D-8494609FAE68}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BPASmartClient.JXJFoodSmallStation", "BPASmartClient.JXJFoodSmallStation\BPASmartClient.JXJFoodSmallStation.csproj", "{D609C4CF-FA5C-4D39-B12F-07A60FFE5E40}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.JXJFoodSmallStation", "BPASmartClient.JXJFoodSmallStation\BPASmartClient.JXJFoodSmallStation.csproj", "{D609C4CF-FA5C-4D39-B12F-07A60FFE5E40}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution