配方

BPASmart.Model/BPASmart.Model.csproj

@@ -12,4 +12,8 @@
     <PackageReference Include="System.IO.Ports" Version="6.0.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="权限\" />
+  </ItemGroup>
+
 </Project>

BPASmart.Model/配方/LocalMaterails.cs

@@ -9,6 +9,14 @@ namespace BPASmart.Model.配方
 {
     public class LocalMaterails
     {
+        /// <summary>
+        /// 本地物料
+        /// </summary>
         public ObservableCollection<RecipeMaterials> locaMaterails { get; set; } = new ObservableCollection<RecipeMaterials>();
+
+        /// <summary>
+        /// 自定义属性
+        /// </summary>
+        public ObservableCollection<Property> PorpertyCollections = new ObservableCollection<Property>();
     }
 }

BPASmart.Model/配方/Property.cs

@@ -0,0 +1,30 @@
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmart.Model.配方
+{
+    public class Property:ObservableObject
+    {
+        public string PropertyId { get { return _propertyId; } set { _propertyId = value; OnPropertyChanged(); } }
+        private string _propertyId;
+        /// <summary>
+        /// 属性名称
+        /// </summary>
+        public string PropertyName { get { return _propertyName; } set { _propertyName = value; OnPropertyChanged(); } }
+        private string _propertyName;
+        /// <summary>
+        /// 属性值
+        /// </summary>
+        public string PropertyValue { get { return _propertyValue; } set { _propertyValue = value; OnPropertyChanged(); } }
+        private string _propertyValue;
+        /// <summary>
+        /// 属性说明
+        /// </summary>
+        public string PropertyDescription { get { return _propertyDsecription; } set { _propertyDsecription = value; OnPropertyChanged(); } }
+        public string _propertyDsecription;
+    }
+}

BPASmart.Model/配方/RecipeMaterials.cs

@@ -1,6 +1,7 @@
 using Microsoft.Toolkit.Mvvm.ComponentModel;
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -33,7 +34,12 @@ namespace BPASmart.Model.配方
         /// 原料位置
         /// </summary>
         public string MaterialPosion { get { return _materialPosion; } set { _materialPosion = value;OnPropertyChanged(); } } 
-        private string _materialPosion; 
+        private string _materialPosion;
+
+        /// <summary>
+        /// 自定义原料属性集合
+        /// </summary>
+        public ObservableCollection<Property> PropertyCollections = new ObservableCollection<Property>();
     }
 
     public enum MaterialType

BPASmart.RecipeManagement/App.xaml

@@ -1,9 +1,11 @@
 <Application x:Class="BPASmart.RecipeManagement.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:BPASmart.RecipeManagement"
+             xmlns:local="clr-namespace:BPASmart.RecipeManagement" xmlns:Themes1="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Classic"
              StartupUri="MainWindow.xaml">
     <Application.Resources>
+       
+
         <Style TargetType="{x:Type ContextMenu}">
             <Setter Property="Template">
                 <Setter.Value>
@@ -86,7 +88,42 @@
             </Setter>
         </Style>
         
+        <!--#region -->
+        <ControlTemplate x:Key="MyScrollViewer" TargetType="{x:Type ScrollViewer}">
+            <!--View区域背景色-->
+            <Grid x:Name="Grid" Background="{TemplateBinding Background}">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="Auto"/>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*"/>
+                    <RowDefinition Height="Auto"/>
+                </Grid.RowDefinitions>
+                <Rectangle x:Name="Corner" Grid.Column="1" Fill="White" Grid.Row="1"/>
+                <ScrollContentPresenter x:Name="PART_ScrollContentPresenter" CanContentScroll="{TemplateBinding CanContentScroll}" CanHorizontallyScroll="False" CanVerticallyScroll="False" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" Grid.Column="0" Margin="{TemplateBinding Padding}" Grid.Row="0"/>
+                <ScrollBar x:Name="PART_VerticalScrollBar" AutomationProperties.AutomationId="VerticalScrollBar" Cursor="Arrow" Grid.Column="1" Maximum="{TemplateBinding ScrollableHeight}" Minimum="0" Grid.Row="0" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}" Style="{DynamicResource MyScrollBarStyle}"/>
+                <ScrollBar x:Name="PART_HorizontalScrollBar" AutomationProperties.AutomationId="HorizontalScrollBar" Cursor="Arrow" Grid.Column="0" Maximum="{TemplateBinding ScrollableWidth}" Minimum="0" Orientation="Horizontal" Grid.Row="1" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}" Style="{DynamicResource MyScrollBarStyle}"/>
+            </Grid>
+        </ControlTemplate>
+        <SolidColorBrush x:Key="ScrollBarDisabledBackground" Color="#F4F4F4"/>
 
+        <Style x:Key="VerticalScrollBarPageButton" TargetType="{x:Type RepeatButton}">
+            <Setter Property="OverridesDefaultStyle" Value="true"/>
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="Focusable" Value="false"/>
+            <Setter Property="IsTabStop" Value="false"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type RepeatButton}">
+                        <Rectangle Fill="{TemplateBinding Background}" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}"/>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+        <!--#endregion-->
+        
+    <!--#region Combox-->
         <ControlTemplate x:Key="ComboBoxToggleButton" TargetType="{x:Type ToggleButton}">
             <Grid Height="25" HorizontalAlignment="Stretch" Background="Transparent">
                 <Grid.ColumnDefinitions>
@@ -129,9 +166,12 @@
             </ControlTemplate.Triggers>
         </ControlTemplate>
 
-        <Style  TargetType="{x:Type ComboBox}">
+
+        <Style   TargetType="{x:Type ComboBox}">
             <Setter Property="BorderThickness" Value="1" />
-            <Setter Property="Background" Value="White"/>
+            <Setter Property="Background" Value="	#041039"/>
+            <Setter Property="BorderBrush" Value="#FF2AB2E7"/>
+            <Setter Property="BorderThickness" Value="1"/>
             <Setter Property="ItemContainerStyle">
                 <Setter.Value>
                     <Style TargetType="ComboBoxItem">
@@ -139,21 +179,19 @@
                         <Setter Property="Template">
                             <Setter.Value>
                                 <ControlTemplate TargetType="{x:Type ComboBoxItem}">
-                                    <Grid Width="{TemplateBinding Width}" Height="{TemplateBinding Height}">
-                                        <Border x:Name="_borderbg" Background="White" />
-
+                                    <Grid Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" >
+                                        <Border x:Name="_borderbg" Background="	#041039" BorderBrush="#FF2AB2E7" BorderThickness="0"/>
                                         <TextBlock
                                         x:Name="_txt"
                                         Margin="5,0,3,0"
-                                            FontWeight="Black"
                                         HorizontalAlignment="Left"
                                         VerticalAlignment="Center"
-                                        Foreground="Black"
+                                        Foreground="#FF2AB2E7"
                                         Text="{Binding Content, RelativeSource={RelativeSource TemplatedParent}}" />
 
                                         <Border
                                         x:Name="_border"
-                                        Background="White"
+                                        Background="Transparent"
                                         Opacity="0" />
                                     </Grid>
                                     <ControlTemplate.Triggers>
@@ -162,8 +200,19 @@
                                                 <Condition Property="IsSelected" Value="false" />
                                                 <Condition Property="IsMouseOver" Value="true" />
                                             </MultiTrigger.Conditions>
-                                            <Setter TargetName="_borderbg" Property="Background" Value="#AFEEEE" />
-                                            <Setter TargetName="_txt" Property="Foreground" Value="black" />
+                                            <Setter TargetName="_borderbg" Property="Background" Value="#37405E" />
+                                            <Setter TargetName="_borderbg" Property="BorderBrush" Value="white" />
+                                            <Setter TargetName="_borderbg" Property="BorderThickness" Value="1" />
+                                            <Setter TargetName="_txt" Property="Foreground" Value="white" />
+                                        </MultiTrigger>
+                                        <MultiTrigger>
+                                            <MultiTrigger.Conditions>
+                                                <Condition Property="IsSelected" Value="true" />
+                                            </MultiTrigger.Conditions>
+                                            <Setter TargetName="_borderbg" Property="Background" Value="#022352" />
+                                            <Setter TargetName="_borderbg" Property="BorderBrush" Value="	#00BFFF" />
+                                            <Setter TargetName="_borderbg" Property="BorderThickness" Value="1" />
+                                            <Setter TargetName="_txt" Property="Foreground" Value="white" />
                                         </MultiTrigger>
                                     </ControlTemplate.Triggers>
                                 </ControlTemplate>
@@ -202,6 +251,7 @@
 
                             <!--  ToggleButton 已数据绑定到 ComboBox 本身以切换 IsDropDownOpen  -->
                             <ToggleButton
+                            Background="Transparent"
                             x:Name="ToggleButton"
                             Grid.Column="0"
                             Grid.ColumnSpan="2"
@@ -214,13 +264,13 @@
                             x:Name="PART_EditableTextBox"
                             Margin="2,0,0,0"
                             VerticalAlignment="Center"
-                            Background="White"
+                            Background="Transparent"
                             BorderThickness="0"
                             CaretBrush="{TemplateBinding Foreground}"
                             Focusable="True"
                             Foreground="{TemplateBinding Foreground}"
                             IsReadOnly="{TemplateBinding IsReadOnly}"
-                            Visibility="Hidden" />
+                            Visibility="Hidden"  />
 
                             <!--  Popup 可显示 ComboBox 中的项列表。IsOpen 已数据绑定到通过 ComboBoxToggleButton 来切换的 IsDropDownOpen  -->
                             <Popup
@@ -231,26 +281,27 @@
                             Placement="Bottom"
                             PopupAnimation="Slide">
                                 <Grid
-                                x:Name="DropDown"
-                                MinWidth="{TemplateBinding ActualWidth}"
-                                MaxHeight="150"
-                                SnapsToDevicePixels="True">
+                                    x:Name="DropDown"
+                                    MinWidth="{TemplateBinding ActualWidth}"
+                                    MaxHeight="150"
+                                    SnapsToDevicePixels="True">
                                     <Border
                                     x:Name="DropDownBorder"
                                     BorderBrush="Black"
                                     BorderThickness="0" />
                                     <ScrollViewer
-                                    Margin="1"
-                                    CanContentScroll="True"
-                                    HorizontalScrollBarVisibility="Auto"
-                                    SnapsToDevicePixels="True"
-                                    VerticalScrollBarVisibility="Auto">
+                                        Margin="1"
+                                        CanContentScroll="True"
+                                        HorizontalScrollBarVisibility="Hidden"
+                                        SnapsToDevicePixels="True"
+                                        VerticalScrollBarVisibility="Auto"
+                                        Template="{DynamicResource MyScrollViewer }">
                                         <!--  StackPanel 用于显示子级，方法是将 IsItemsHost 设置为 True  -->
                                         <!--  一下可以设置列表背景色  -->
                                         <StackPanel
-                                        Background="White"
-                                        IsItemsHost="True"
-                                        KeyboardNavigation.DirectionalNavigation="Contained" />
+                                        Background="{TemplateBinding Background}"  
+                                        IsItemsHost="True" 
+                                        KeyboardNavigation.DirectionalNavigation="Contained"/>
                                     </ScrollViewer>
                                 </Grid>
                             </Popup>
@@ -271,5 +322,206 @@
                 </Setter.Value>
             </Setter>
         </Style>
+
+       
+        <!--滚动条颜色、圆角等设置-->
+        <Style x:Key="ScrollBarThumb" TargetType="{x:Type Thumb}">
+            <Setter Property="OverridesDefaultStyle" Value="true"/>
+            <Setter Property="IsTabStop" Value="false"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type Thumb}">
+                        <!--滚动条颜色和圆角设置-->
+                        <Rectangle Name="thumbRect" Fill="#03ffea" RadiusX="3" RadiusY="3"/>
+                        <!--鼠标拉动滚动条时的颜色-->
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter Property="Fill" Value="CornflowerBlue" TargetName="thumbRect" />
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+        <Style x:Key="HorizontalScrollBarPageButton" TargetType="{x:Type RepeatButton}">
+            <Setter Property="OverridesDefaultStyle" Value="true"/>
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="Focusable" Value="false"/>
+            <Setter Property="IsTabStop" Value="false"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type RepeatButton}">
+                        <Rectangle Fill="{TemplateBinding Background}" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}"/>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+        <Style x:Key="MyScrollBarStyle" TargetType="{x:Type ScrollBar}">
+            <Setter Property="Background" Value="AliceBlue"/>
+            <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false"/>
+            <Setter Property="Stylus.IsFlicksEnabled" Value="false"/>
+            <!--滚动条宽度-->
+            <Setter Property="Width" Value="8"/>
+            <Setter Property="MinWidth" Value="6"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type ScrollBar}">
+                        <!--滚动条背景色-->
+                        <Grid x:Name="Bg" Background="#001f55" SnapsToDevicePixels="true" Width="8">
+                            <Grid.RowDefinitions>
+                                <RowDefinition />
+                            </Grid.RowDefinitions>
+                            <Track x:Name="PART_Track" IsDirectionReversed="true" IsEnabled="{TemplateBinding IsMouseOver}">
+                                <Track.DecreaseRepeatButton>
+                                    <RepeatButton Command="{x:Static ScrollBar.PageUpCommand}" Style="{StaticResource VerticalScrollBarPageButton}"/>
+                                </Track.DecreaseRepeatButton>
+                                <Track.IncreaseRepeatButton>
+                                    <RepeatButton Command="{x:Static ScrollBar.PageDownCommand}" Style="{StaticResource VerticalScrollBarPageButton}"/>
+                                </Track.IncreaseRepeatButton>
+                                <Track.Thumb>
+                                    <Thumb Style="{StaticResource ScrollBarThumb}"/>
+                                </Track.Thumb>
+                            </Track>
+                        </Grid>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsEnabled" Value="false">
+                                <Setter Property="Background" TargetName="Bg" Value="{StaticResource ScrollBarDisabledBackground}"/>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+            <Style.Triggers>
+                <Trigger Property="Orientation" Value="Horizontal">
+                    <Setter Property="Width" Value="Auto"/>
+                    <Setter Property="MinWidth" Value="0"/>
+                    <Setter Property="Height" Value="6"/>
+                    <Setter Property="MinHeight" Value="6"/>
+                    <Setter Property="Background" Value="AliceBlue"/>
+                    <Setter Property="Template">
+                        <Setter.Value>
+                            <ControlTemplate TargetType="{x:Type ScrollBar}">
+                                <Grid x:Name="Bg" Background="Red" SnapsToDevicePixels="true">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition />
+                                    </Grid.ColumnDefinitions>
+                                    <Track x:Name="PART_Track" IsEnabled="{TemplateBinding IsMouseOver}">
+                                        <Track.DecreaseRepeatButton>
+                                            <RepeatButton Command="{x:Static ScrollBar.PageLeftCommand}" Style="{StaticResource HorizontalScrollBarPageButton}"/>
+                                        </Track.DecreaseRepeatButton>
+                                        <Track.IncreaseRepeatButton>
+                                            <RepeatButton Command="{x:Static ScrollBar.PageRightCommand}" Style="{StaticResource HorizontalScrollBarPageButton}"/>
+                                        </Track.IncreaseRepeatButton>
+                                        <Track.Thumb>
+                                            <Thumb Style="{StaticResource ScrollBarThumb}" />
+                                        </Track.Thumb>
+                                    </Track>
+                                </Grid>
+                                <ControlTemplate.Triggers>
+                                    <Trigger Property="IsEnabled" Value="false">
+                                        <Setter Property="Background" TargetName="Bg" Value="{StaticResource ScrollBarDisabledBackground}"/>
+                                    </Trigger>
+                                </ControlTemplate.Triggers>
+                            </ControlTemplate>
+                        </Setter.Value>
+                    </Setter>
+                </Trigger>
+            </Style.Triggers>
+        </Style>
+
+
+
+        <!--#endregion-->
+        <Style x:Key="ButtonStyle" TargetType="Button">
+            <Setter Property="Background" Value="#2219b7ec" />
+            <Setter Property="BorderBrush" Value="#ff19b7ec" />
+            <Setter Property="BorderThickness" Value="2" />
+            <Setter Property="Foreground" Value="Aqua"/>
+            <Style.Triggers>
+                <Trigger Property="IsMouseOver" Value="True">
+                    <Setter Property="Background" Value="#0041D4"/>
+                </Trigger>
+            </Style.Triggers>
+        </Style>
+
+        <Style x:Key="TextBoxStyle" TargetType="{x:Type TextBox}">
+            <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"/>
+            <Setter Property="BorderBrush" Value="#FFABAdB3"/>
+            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
+            <Setter Property="BorderThickness" Value="1"/>
+            <Setter Property="KeyboardNavigation.TabNavigation" Value="None"/>
+            <Setter Property="HorizontalContentAlignment" Value="Left"/>
+            <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+            <Setter Property="AllowDrop" Value="true"/>
+            <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
+            <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type TextBox}">
+                        <Border x:Name="border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True">
+                            <ScrollViewer x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsEnabled" Value="false">
+                                <Setter Property="Opacity" TargetName="border" Value="0.56"/>
+                            </Trigger>
+                            <Trigger Property="IsMouseOver" Value="true">
+                                <Setter Property="BorderBrush" TargetName="border" Value="#FF7EB4EA"/>
+                            </Trigger>
+                            <Trigger Property="IsKeyboardFocused" Value="true">
+                                <Setter Property="BorderBrush" TargetName="border" Value="#FF569DE5"/>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+            <Style.Triggers>
+                <MultiTrigger>
+                    <MultiTrigger.Conditions>
+                        <Condition Property="IsInactiveSelectionHighlightEnabled" Value="true"/>
+                        <Condition Property="IsSelectionActive" Value="false"/>
+                    </MultiTrigger.Conditions>
+                    <Setter Property="SelectionBrush" Value="{DynamicResource {x:Static SystemColors.InactiveSelectionHighlightBrushKey}}"/>
+                </MultiTrigger>
+            </Style.Triggers>
+        </Style>
+
+        <Style x:Key="ComboBoxEditableTextBox" TargetType="{x:Type TextBox}">
+            <Setter Property="OverridesDefaultStyle" Value="true" />
+            <Setter Property="AllowDrop" Value="true" />
+            <Setter Property="MinWidth" Value="0" />
+            <Setter Property="Foreground" Value="#a2c2e8" />
+            <Setter Property="MinHeight" Value="0" />
+            <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+            <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
+            <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type TextBox}">
+                        <ScrollViewer
+                        x:Name="PART_ContentHost"
+                        Background="Transparent"
+                        Focusable="false"
+                        HorizontalScrollBarVisibility="Hidden"
+                        VerticalScrollBarVisibility="Hidden" />
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+
+        <Style x:Key="CommonButton" TargetType="{x:Type Button}">
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="Foreground" Value="#FF2AB2E7"/>
+            <Setter Property="BorderBrush" Value="#FF2AB2E7"/>
+        </Style>
+
+        <Style x:Key="CommonTextBox" TargetType="{x:Type TextBox}">
+            <Setter Property="Foreground" Value="Orange"/>
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="BorderBrush" Value="#FF2AB2E7"/>
+            <Setter Property="VerticalContentAlignment" Value="Center"/>
+        </Style>
+
+
     </Application.Resources>
 </Application>

BPASmart.RecipeManagement/BPASmart.RecipeManagement.csproj

@@ -17,7 +17,11 @@
 
   <ItemGroup>
     <None Remove="Image\AddGreen.png" />
+    <None Remove="Image\Close.png" />
     <None Remove="Image\Delete.png" />
+    <None Remove="Image\left.png" />
+    <None Remove="Image\recipe.png" />
+    <None Remove="Image\right.png" />
   </ItemGroup>
 
   <ItemGroup>
@@ -39,6 +43,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Resource Include="Image\Close.png" />
     <Resource Include="Image\Delete.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
@@ -46,6 +51,9 @@
 
   <ItemGroup>
     <Resource Include="Image\AddGreen.png" />
+    <Resource Include="Image\left.png" />
+    <Resource Include="Image\recipe.png" />
+    <Resource Include="Image\right.png" />
   </ItemGroup>
 
 </Project>

BPASmart.RecipeManagement/MainWindow.xaml

@@ -7,7 +7,7 @@
         xmlns:view="clr-namespace:BPASmart.RecipeManagement.View"
         xmlns:vm="clr-namespace:BPASmart.RecipeManagement.ViewModel"
         mc:Ignorable="d"
-        Title="MainWindow" Height="900" Width="1400" WindowStyle="None" WindowStartupLocation="CenterScreen">
+        Title="MainWindow" Height="800" Width="1400" WindowStyle="None" WindowStartupLocation="CenterScreen" Background="#01003B" AllowsTransparency="True">
     <Window.DataContext>
         <vm:MainWindowViewModel/>
     </Window.DataContext>
@@ -21,19 +21,21 @@
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="RadioButton">
-                        <Grid Background="{TemplateBinding Background}" Margin="{TemplateBinding Margin}">
-                            <Border x:Name="_borderOver" Background="Transparent" Width="200"   BorderBrush="Transparent" BorderThickness="0,1">
+                        <Border x:Name="_borderOver" Background="Transparent" Width="200"   BorderBrush="Transparent" BorderThickness="0,1">
+                            <Grid Background="{TemplateBinding Background}" Margin="{TemplateBinding Margin}">
+                           
                                 <TextBlock Foreground="White" Text="{TemplateBinding Content}" FontSize="24" Background="Transparent"
                                            VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                            </Border>
-                        </Grid>
+                           
+                            </Grid>
+                        </Border>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsMouseOver" Value="True">
-                                <Setter Property="Background" TargetName="_borderOver" Value="#1971B6"/>
+                                <Setter Property="BorderBrush" TargetName="_borderOver" Value="#1971B6"/>
                             </Trigger>
                             <Trigger Property="IsChecked" Value="True">
-                                <Setter Property="BorderBrush" TargetName="_borderOver" Value="White"/>
-                                <Setter Property="BorderThickness" TargetName="_borderOver" Value="0,1"/>
+                               
+                                <Setter Property="Background" TargetName="_borderOver" Value="#1E90FF"/>
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
@@ -65,43 +67,53 @@
             </Setter>
         </Style>
     </Window.Resources>
-    <Border Background="Transparent">
-        <Grid>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="200"/>
-                <ColumnDefinition Width="*"/>
-                <ColumnDefinition Width="2"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="10"/>
-                <RowDefinition Height="*"/>
-                <RowDefinition Height="60"/>
-            </Grid.RowDefinitions>
+    <Grid >
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="200"/>
+            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="2"/>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="40"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="10"/>
+        </Grid.RowDefinitions>
+        <Border Background="#02255E" Grid.ColumnSpan="3 " MouseLeftButtonDown="Border_MouseLeftButtonDown" BorderBrush="#4682B4" BorderThickness="0,0,0,1">
+            <StackPanel Orientation="Horizontal" Margin="60,0,0,0"> 
+                <Image Source="../image/recipe.png" Width="20" Height="20"/>
+                <TextBlock Text="配方集成管理" Foreground="#E8E8E8" FontSize="28" FontFamily="楷体"
+                           HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5,0"/>
+                
+            </StackPanel>
             
-            <StackPanel x:Name="mylistview" Background="#2196F3"  Grid.RowSpan="2"
+        </Border>
+        <Button  FontSize="28 "  HorizontalAlignment="Right" VerticalAlignment="Top" 
+                 HorizontalContentAlignment="Right" 
+                 Grid.Column="1" 
+                 Background="Red" Height="30" 
+                 Click="Button_Click">
+            <Image Source="../Image/Close.png"  HorizontalAlignment="Stretch"/>
+        </Button>
+        <Border Grid.Row="1" Grid.RowSpan="2" Background="Transparent" BorderBrush="#1E90FF" BorderThickness="0,0,2,0"/>
+        <StackPanel x:Name="mylistview" Background="Transparent"  Grid.RowSpan="1" Grid.Row="1"
                       ScrollViewer.VerticalScrollBarVisibility="Hidden" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
                       MouseDown="mylistview_MouseDown" >
-                <RadioButton Content="订单管理" Style="{DynamicResource RadioNavigation}" IsChecked="True"  
+            <RadioButton Content="订单管理" Style="{DynamicResource RadioNavigation}" IsChecked="True"  
                              Click="NavButton_Click" Tag="OrderManager"/>
-                <RadioButton Content="配方管理" Style="{DynamicResource RadioNavigation}" 
+            <RadioButton Content="配方管理" Style="{DynamicResource RadioNavigation}" 
                              Click="NavButton_Click" Tag="RecipeManager"/>
-                <RadioButton Content="原料管理" Style="{DynamicResource RadioNavigation}" 
+            <RadioButton Content="原料管理" Style="{DynamicResource RadioNavigation}" 
                              Click="NavButton_Click" Tag="MaterialManager"/>
-                <RadioButton Content="工艺参数" Style="{DynamicResource RadioNavigation}" 
+            <RadioButton Content="工艺参数" Style="{DynamicResource RadioNavigation}" 
                              Click="NavButton_Click" Tag="TechnologySetting"/>
-                <RadioButton Content="权限分配" Style="{DynamicResource RadioNavigation}" 
+            <RadioButton Content="权限分配" Style="{DynamicResource RadioNavigation}" 
                              Click="NavButton_Click" Tag="PowerManager"/>
-            </StackPanel>
-            <Border Background="#2196F3" Grid.Row="2">
-                <Button Content="退出" 
-                        Style="{DynamicResource ButtonNavigation}"
-                        Click="Button_Click">
-                   
-                </Button>
-            </Border>
-            <ContentControl x:Name="contentRegion" Grid.Column="1" Grid.Row="1"  >
-                <view:PowerManager/>
-            </ContentControl>
-        </Grid>
-    </Border>
+        </StackPanel>
+       
+        
+
+        <ContentControl x:Name="contentRegion" Grid.Column="1" Grid.Row="1" Background="#01003B" BorderBrush="Transparent">
+            <view:OrderManager/>
+        </ContentControl>
+    </Grid>
 </Window>

BPASmart.RecipeManagement/MainWindow.xaml.cs

@@ -54,5 +54,10 @@ namespace BPASmart.RecipeManagement
                 
             }
         }
+
+        private void Border_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            this.DragMove();
+        }
     }
 }

BPASmart.RecipeManagement/View/CreateOrder.xaml

@@ -6,21 +6,22 @@
         xmlns:local="clr-namespace:BPASmart.RecipeManagement.View"
         xmlns:vm="clr-namespace:BPASmart.RecipeManagement.ViewModel"
         mc:Ignorable="d"
-        Title="CreateOrder" Height="250" Width="400" WindowStartupLocation="CenterScreen" WindowStyle="None" Background="White" MouseLeftButtonDown="Window_MouseLeftButtonDown">
+        Title="CreateOrder" Height="250" Width="400" WindowStartupLocation="CenterScreen" WindowStyle="None" Background="White" MouseLeftButtonDown="Window_MouseLeftButtonDown"
+        AllowsTransparency="True" Foreground="#FF2AB2E7">
     <Window.DataContext>
         <vm:CreateOrderViewModel/>
     </Window.DataContext>
     <Window.Resources>
        
     </Window.Resources>
-    <Grid>
+    <Grid Background="#264c73">
         <Grid.RowDefinitions>
             <RowDefinition Height="40"/>
             <RowDefinition Height="*"/>
             <RowDefinition Height="40"/>
         </Grid.RowDefinitions>
-        <Button Content="增加配方" Width="100" Height="30" HorizontalAlignment="Right" Margin="10,0"
-                Background="#58B0ED" Foreground="White" Command="{Binding AddRecipeCommand}"/>
+        <Button Content="增加配方" Width="100" Height="30" HorizontalAlignment="Right" Margin="10,0" Style="{DynamicResource ButtonStyle}"
+                  Command="{Binding AddRecipeCommand}"/>
 
         <Border  Grid.Row="1" BorderBrush="#B0E2FF" BorderThickness="0,1">
             <ItemsControl ItemsSource="{Binding recipes}" Grid.Row="1" HorizontalAlignment="Center">
@@ -29,35 +30,36 @@
                         <RadioButton GroupName="all">
                             <RadioButton.Template>
                                 <ControlTemplate TargetType="RadioButton">
-                                    <Grid Name="gr" Height="40">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="150"/>
-                                            <ColumnDefinition Width="100"  />
-                                            <ColumnDefinition Width="60" />
-                                        </Grid.ColumnDefinitions>
+                                    <Border Background="Transparent" BorderBrush="Transparent" BorderThickness="1">
+                                        <Grid Name="gr" Height="40">
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="150"/>
+                                                <ColumnDefinition Width="100"  />
+                                                <ColumnDefinition Width="60" />
+                                            </Grid.ColumnDefinitions>
 
-                                        <ComboBox
+                                            <ComboBox
                                                     Name="cb"
                                                     Grid.Column="0"
                                                     Margin="3,1"
                                                     VerticalAlignment="Center"
-                                                    BorderBrush="Black"
-                                                    BorderThickness="1"
                                                     FontFamily="楷体"
                                                     FontSize="20"
-                                                    Foreground="Black"
+                                                    Foreground="#FF2AB2E7"
                                                     IsEditable="False"
                                                     ItemsSource="{Binding DataContext.recipesName, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
                                                     SelectedItem="{Binding Name}"
                                                     />
 
 
-                                        <StackPanel
+                                            <StackPanel
                                                     Grid.Column="1"
                                                     VerticalAlignment="Center"
                                                     Orientation="Horizontal">
-                                            <TextBox
+                                                <TextBox
                                                         Name="tb"
+                                                        Foreground="Orange"
+                                                        Background="Transparent"
                                                         Grid.Column="1"
                                                         Width="60"
                                                         Height="29"
@@ -66,30 +68,29 @@
                                                         FontSize="20"
                                                         Text="{Binding RecipeCount}" />
 
-                                            <TextBlock
+                                                <TextBlock
                                                         Grid.Column="1"
+                                                        Foreground="#FF2AB2E7"
                                                         Margin="0,0,8,4"
                                                         HorizontalAlignment="Right"
                                                         VerticalAlignment="Center"
                                                         FontSize="20"
                                                         Text="单" />
 
-                                        </StackPanel>
+                                            </StackPanel>
 
-                                        <Button
+                                            <Button
                                                     Grid.Column="2"
                                                     Width="50"
-                                                    Height="24"
-                                                   
-                                                    Foreground="White"
+                                                    Height="24" BorderBrush="#FF2AB2E7" Foreground="#FF2AB2E7"
                                                     FontSize="14"
-                                                    Background="#58B0ED"
+                                                    Background="Transparent"
                                                     Command="{Binding DataContext.DeleteCommand, RelativeSource={RelativeSource AncestorType=Window, Mode=FindAncestor}}"
                                                     CommandParameter="{Binding ID}"
                                                     Content="删 除" />
 
-                                    </Grid>
-
+                                        </Grid>
+                                    </Border>
 
                                 </ControlTemplate>
                             </RadioButton.Template>
@@ -101,12 +102,12 @@
 
         <StackPanel Grid.Row="4" Grid.ColumnSpan="3" Orientation="Horizontal"
                     HorizontalAlignment="Center" VerticalAlignment="Center">
-            <Button Content="保存" Foreground="White" FontSize="22" Width="120" Height="30" Margin="10,2" Background="#58B0ED"
+            <Button Content="保存"  FontSize="22" Width="120" Height="30" Margin="10,2" Background="Transparent"
+                    BorderBrush="#FF2AB2E7" Foreground="#FF2AB2E7"
                         Command="{Binding SaveCommand}"/>
-            <Button Content="取消" Foreground="White" FontSize="22" Width="120" Height="30"  Margin="10,2" Background="#58B0ED"
+            <Button Content="取消"  FontSize="22" Width="120" Height="30"  Margin="10,2" Background="Transparent"
+                    BorderBrush="#FF2AB2E7" Foreground="#FF2AB2E7"
                         Click="Button_Click"/>
-
-
         </StackPanel>
     </Grid>
 </Window>

BPASmart.RecipeManagement/View/CreateOrder.xaml.cs

@@ -1,4 +1,5 @@
-using System;
+using BPASmartClient.Helper;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -22,6 +23,8 @@ namespace BPASmart.RecipeManagement.View
         public CreateOrder()
         {
             InitializeComponent();
+            ActionManage.GetInstance.CancelRegister("CloseCreateOrderView");
+            ActionManage.GetInstance.Register(new Action(() => { this.Close(); }), "CloseCreateOrderView");
         }
 
         private void Window_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)

BPASmart.RecipeManagement/View/MaterialConfigure.xaml

@@ -6,18 +6,21 @@
         xmlns:local="clr-namespace:BPASmart.RecipeManagement.View"
         xmlns:vm="clr-namespace:BPASmart.RecipeManagement.ViewModel"
         mc:Ignorable="d"
-        Title="MaterialConfigure" Height="300" Width="500" WindowStartupLocation="CenterScreen" WindowStyle="None" Background="White" MouseLeftButtonDown="Window_MouseLeftButtonDown">
+        Title="MaterialConfigure" Height="300" Width="500" WindowStartupLocation="CenterScreen" WindowStyle="None" Background="Transparent" MouseLeftButtonDown="Window_MouseLeftButtonDown"
+        Foreground="#FF2AB2E7" AllowsTransparency="True">
     <Window.DataContext>
         <vm:MaterialConfigureViewModel/>
     </Window.DataContext>
     <Window.Resources>
        
     </Window.Resources>
-    <Border CornerRadius="20" Background="White">
-        <Grid>
+    <Border CornerRadius="20" Background="#264c73"  >
+        <Grid Width="900">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="17*"/>
                 <ColumnDefinition Width="33*"/>
+                <ColumnDefinition Width="40"/>
+                <ColumnDefinition Width="400"/>
             </Grid.ColumnDefinitions>
             <Grid.RowDefinitions>
                 <RowDefinition/>
@@ -32,27 +35,73 @@
                    HorizontalAlignment="Center" VerticalAlignment="Center" Height="28" Width="92"/>
             <TextBlock Text="原料位置:" FontSize="22" Grid.Row="2"
                    HorizontalAlignment="Center" VerticalAlignment="Center" Height="28" Width="92"/>
-            <TextBox Text="{Binding MaterialName}" FontSize="22" Grid.Column="1" Width="200" Height="40"
-                 VerticalAlignment="Center" HorizontalAlignment="Center" 
-                    VerticalContentAlignment="Center"/>
+            <TextBox Text="{Binding MaterialName}" FontSize="22" Grid.Column="1" Width="200" Height="40" Background="Transparent" Foreground="Orange"
+                 VerticalAlignment="Center" HorizontalAlignment="Center"   BorderBrush="#FF2AB2E7"
+                    VerticalContentAlignment="Center" HorizontalContentAlignment="Center"/>
             <ComboBox ItemsSource="{Binding MaterialTypes}"  
-                      FontSize="18"
-                      Grid.Column="1" Grid.Row="1" Width="200" Height="40"
-                      SelectedItem="{Binding MaterialType}"/>
+                      FontSize="18" Foreground="#FF2AB2E7"
+                      Grid.Column="1" Grid.Row="1" Width="200" Height="40" 
+                      SelectedItem="{Binding MaterialType}" />
             <TextBox Text="{Binding MaterialPosion}" FontSize="22" Grid.Column="1" Grid.Row="2"
-                     Width="100" Height="40"
-                 VerticalAlignment="Center" HorizontalAlignment="Center" 
-                    VerticalContentAlignment="Center"/>
+                     Width="100" Height="40"  Background="Transparent" Foreground="Orange"
+                     HorizontalContentAlignment="Center" VerticalContentAlignment="Center"
+                 VerticalAlignment="Center" HorizontalAlignment="Center"   BorderBrush="#FF2AB2E7"/>
             <TextBlock Text="{Binding ErrorMessage}" Grid.Row="3" Grid.ColumnSpan=" 2"
                        Foreground="Red" VerticalAlignment="Center" HorizontalAlignment="Center"/>
             <StackPanel Grid.Row="4" Grid.ColumnSpan="2" Orientation="Horizontal"
                     HorizontalAlignment="Center" VerticalAlignment="Center">
-                <Button Content="保存" Foreground="White" FontSize="22" Width="120" Height="40" Margin="10" Background="#58B0ED"
+                <Button Content="保存"  FontSize="22" Width="120" Height="36" Margin="10" Background="Transparent" BorderBrush="#FF2AB2E7" Foreground="#FF2AB2E7"
                         Command="{Binding SaveCommand}"/>
-                <Button Content="取消" Foreground="White" FontSize="22" Width="120" Height="40" Margin="10" Background="#58B0ED"
+                <Button Content="取消"  FontSize="22" Width="120" Height="36" Margin="10" Background="Transparent" BorderBrush="#FF2AB2E7" Foreground="#FF2AB2E7"
                         Click="Button_Click"/>
                 
             </StackPanel>
+            <Button x:Name="expand"  Grid.Column="2" Grid.RowSpan="5" HorizontalAlignment="Center" VerticalAlignment="Center" Style="{DynamicResource ButtonStyle}"
+                     Click="expand_Click"   >
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition />
+                        <RowDefinition/>
+                    </Grid.RowDefinitions>
+                    <TextBlock Text="拓展属性" TextWrapping="Wrap" FontSize="18" HorizontalAlignment="Center" />
+                    <Image x:Name="expandImage" Source="../image/right.png" Grid.Row="1" Width="22" Margin="0,5"/>
+                </Grid>
+            </Button>
+            <ScrollViewer Grid.Column="3" 
+                    Grid.RowSpan="5"
+                    HorizontalScrollBarVisibility="Hidden"
+                    VerticalScrollBarVisibility="Hidden" Margin="10,5">
+                <Border Background="Transparent" BorderBrush="White" BorderThickness="1,0,0,0">
+                    <ListBox   Margin="5,20" Background="Transparent" BorderBrush="Transparent" Foreground="#FF2AB2E7" FontSize="20" HorizontalAlignment="Left"
+                           VerticalAlignment="Top" 
+                         ItemsSource="{Binding currentProperty}">
+                        <ListBox.ItemTemplate>
+                            <DataTemplate>
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="auto"/>
+                                        <ColumnDefinition Width="auto"/>
+                                        <ColumnDefinition Width="*"/>
+                                    </Grid.ColumnDefinitions>
+                                    <TextBlock Text="{Binding PropertyName}"  Margin="0,5,2,0" >
+                                        <TextBlock.ToolTip   >
+                                            <TextBlock Text="{Binding PropertyDescription}"/>
+                                        </TextBlock.ToolTip>
+                                </TextBlock>
+                                    <TextBlock Grid.Column="1" Text=":" Margin="0,5,0,0"/>
+                                    <TextBox Grid.Column="2" Text="{Binding PropertyValue}" Background="Transparent" Foreground="Orange"
+                                          BorderBrush="#FF2AB2E7" VerticalAlignment="Center" HorizontalContentAlignment="Center" 
+                                         Width="150" Margin="20,5"/>
+                                </Grid>
+                           
+                        </DataTemplate>
+                
+                    </ListBox.ItemTemplate>
+
+                    </ListBox>
+                </Border>
+            </ScrollViewer>
+
 
         </Grid>
     </Border>

BPASmart.RecipeManagement/View/MaterialConfigure.xaml.cs

@@ -1,4 +1,5 @@
-using System;
+using BPASmartClient.Helper;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -19,10 +20,13 @@ namespace BPASmart.RecipeManagement.View
     /// </summary>
     public partial class MaterialConfigure : Window
     {
+        bool isExpend = false;
         public MaterialConfigure()
         {
             InitializeComponent();
-            
+            ActionManage.GetInstance.CancelRegister("CloseMaterialConfigureView");
+            ActionManage.GetInstance.Register(new Action(() => { this.Close(); }), "CloseMaterialConfigureView");
+
         }
 
         private void Button_Click(object sender, RoutedEventArgs e)
@@ -35,5 +39,22 @@ namespace BPASmart.RecipeManagement.View
         {
             this.DragMove();
         }
+
+        private void expand_Click(object sender, RoutedEventArgs e)
+        {
+            if(isExpend)
+            {
+                this.Width = 500;
+                isExpend = false;
+                expandImage.Source = new BitmapImage(new Uri("pack://application:,,,/Image/right.png"));
+            }
+            else
+            {
+                this.Width = 900;
+                isExpend = true;
+                expandImage.Source = new BitmapImage(new Uri("pack://application:,,,/Image/left.png"));
+            }
+            
+        }
     }
 }

BPASmart.RecipeManagement/View/MaterialManager.xaml

@@ -6,7 +6,7 @@
              xmlns:local="clr-namespace:BPASmart.RecipeManagement.View"
              xmlns:vm="clr-namespace:BPASmart.RecipeManagement.ViewModel"
              mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800" >
+             d:DesignHeight="450" d:DesignWidth="800" Foreground="#FF2AB2E7" >
     <UserControl.DataContext>
         <vm:MaterialManagerViewModel/>
     </UserControl.DataContext>
@@ -17,17 +17,17 @@
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="ListViewItem">
-                        <Border x:Name="mborder" BorderBrush="#009AC0" BorderThickness="1,5" CornerRadius="10">
-                            
+                        <Border x:Name="mborder" BorderBrush="#009AC0" BorderThickness="2,5 " CornerRadius="10">
+                            <Border.Background>
+                                <LinearGradientBrush  StartPoint="0,0" EndPoint="1,0">
+                                    <GradientStop  Color="#4F94CD" Offset="0"/>
+                                    <GradientStop Color="White" Offset="0.3"/>
+                                    <GradientStop Color="White" Offset="0.7"/>
+                                    <GradientStop Color="#4F94CD" Offset="1" />
+                                </LinearGradientBrush>
+                            </Border.Background>
                             <Grid Width="100" >
-                                <Grid.Background>
-                                    <LinearGradientBrush  StartPoint="0,0" EndPoint="1,0">
-                                        <GradientStop  Color="#4F94CD" Offset="0"/>
-                                        <GradientStop Color="Transparent" Offset="0.3"/>
-                                        <GradientStop Color="Transparent" Offset="0.7"/>
-                                        <GradientStop Color="#4F94CD" Offset="1" />
-                                    </LinearGradientBrush>
-                                </Grid.Background>
+                              
                                 <Grid.RowDefinitions>
                                     <RowDefinition Height="60"/>
                                     <RowDefinition Height="25"/>
@@ -50,7 +50,7 @@
                         </Border>
                         <ControlTemplate.Triggers>
                             <Trigger  Property="IsMouseOver" Value="True">
-                                <Setter Property="BorderBrush" Value="#D2B48C" TargetName="mborder"/>
+                                <Setter Property="BorderBrush" Value="orange" TargetName="mborder"/>
                  
                             </Trigger>
                             <Trigger Property="IsFocused" Value="True">
@@ -144,7 +144,7 @@
             </Setter>
         </Style>
     </UserControl.Resources>
-    <Grid Background="White">
+    <Grid Background="Transparent">
         <Grid.ColumnDefinitions>
             <ColumnDefinition />
         </Grid.ColumnDefinitions>
@@ -157,9 +157,13 @@
                 <RowDefinition Height="40"/>
                 <RowDefinition Height="*"/>
             </Grid.RowDefinitions>
-            <TextBlock Text="原料清单" FontSize="28" Foreground="DarkSlateGray" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+            <TextBlock Text="原料清单" FontSize="28"  VerticalAlignment="Center" HorizontalAlignment="Center"/>
+            <Button x:Name="MateraisProperty" Style="{DynamicResource ButtonStyle}" Content="原料扩展属性" 
+                    VerticalAlignment="Center" HorizontalAlignment="Right"
+                    FontSize="16" Margin="0,7,20,0" Height="34"  Width="150"
+                    Click="MateraisProperty_Click"/>
             <ListView x:Name="mylistview" Grid.Row="1" 
-                      ScrollViewer.HorizontalScrollBarVisibility="Disabled" ItemsSource="{Binding MaterialList}" Margin=" 10" Background="#FFFAFA" >
+                      ScrollViewer.HorizontalScrollBarVisibility="Disabled" ItemsSource="{Binding MaterialList}" Margin=" 10" Background="Transparent" >
                 <ListView.ContextMenu>
                     <ContextMenu FontSize="16" Foreground="White">
                         <MenuItem Header="新建原料" Name="MenuAdd" Command="{Binding CreateMaterailCommand}"></MenuItem>

BPASmart.RecipeManagement/View/MaterialManager.xaml.cs

@@ -25,9 +25,10 @@ namespace BPASmart.RecipeManagement.View
             InitializeComponent();
         }
 
-       
-
-       
-
+        private void MateraisProperty_Click(object sender, RoutedEventArgs e)
+        {
+            PropertySetting propertySetting = new PropertySetting();
+            propertySetting.ShowDialog();
+        }
     }
 }

BPASmart.RecipeManagement/View/OrderManager.xaml

@@ -6,7 +6,7 @@
              xmlns:local="clr-namespace:BPASmart.RecipeManagement.View"
              xmlns:vm ="clr-namespace:BPASmart.RecipeManagement.ViewModel"
              mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
+             d:DesignHeight="450" d:DesignWidth="800" Background="Transparent">
     <UserControl.DataContext>
         <vm:OrderManagerViewModel/>
     </UserControl.DataContext>
@@ -14,10 +14,12 @@
         <Style TargetType="ListBoxItem">
             <Setter Property="Margin" Value="2"/>
             <Setter Property="FontSize" Value="22"/>
+            <Setter Property="FontWeight" Value="Black"/>
+            <Setter Property="Background" Value="#104E8B"/>
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate  TargetType="ListBoxItem">
-                        <Border BorderBrush="Black" BorderThickness="1">
+                        <Border BorderBrush="Black" BorderThickness="0" Background="{TemplateBinding Background}">
                             <Grid HorizontalAlignment="Center" Margin="10 ">
                                 <Grid.RowDefinitions>
                                     <RowDefinition/>
@@ -33,21 +35,21 @@
                                Margin="5,0,0,0"
                                HorizontalAlignment="Right"
                                VerticalAlignment="Center"
-                               Foreground="Black"
+                               Foreground="Orange"
                                Text="配方：" />
                                 <TextBlock
                                Grid.Row="1"
                                Margin="5,0,0,0"
                                HorizontalAlignment="Right"
                                VerticalAlignment="Center"
-                               Foreground="Black"
+                               Foreground="Orange"
                                Text="数量：" />
                                 <TextBlock
                                Grid.Row="2"
                                Margin="5,0,0,0"
                                HorizontalAlignment="Right"
                                VerticalAlignment="Center"
-                               Foreground="Black"
+                               Foreground="Orange"
                                Text="已完成：" />
                                 <TextBlock
                                Grid.Row="0"
@@ -55,7 +57,7 @@
                                Margin="5,0,0,0"
                                HorizontalAlignment="Right"
                                VerticalAlignment="Center"
-                               Foreground="Black"
+                               Foreground="Orange"
                                Text="{Binding Name}" />
                                 <TextBlock
                                Grid.Row="1"
@@ -64,7 +66,7 @@
                                
                                HorizontalAlignment="Right"
                                VerticalAlignment="Center"
-                               Foreground="Black"
+                               Foreground="Orange"
                                Text="{Binding RecipeCount}" />
                                 <TextBlock
                                Grid.Row="2"
@@ -72,7 +74,7 @@
                                Margin="5,0,0,0"
                                HorizontalAlignment="Right"
                                VerticalAlignment="Center"
-                               Foreground="Black"
+                               Foreground="Orange"
                                Text="" />
                             </Grid>
                         </Border>
@@ -82,16 +84,14 @@
         </Style>
         <Style TargetType="ListViewItem" >
             <Setter Property="Margin" Value="10"/>
+            <Setter Property="Background" Value="#104E8B"/>
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="ListViewItem">
-                        <Border x:Name="mborder" BorderBrush="#009AC0" BorderThickness="3,3,3,10"  CornerRadius="10" Margin="10"
-                                Background="White">
-                         
-                            <Border.Effect>
-                                <DropShadowEffect Color="#696969" Direction="215" ShadowDepth="10" Opacity="0.8"/>
-                            </Border.Effect>
+                        <Border x:Name="mborder" BorderBrush="#009AC0" BorderThickness="5,5,5,5"  CornerRadius="5,5,5,5" Margin="10"
+                                Background="#104E8B">
                             <Grid
+                                Background="Transparent"
                                 Name="tt"
                                 Height="250"
                                 Width="300"
@@ -109,7 +109,7 @@
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Top"
                                         FontSize="18"
-                                        Foreground="Black"
+                                        Foreground="White"
                                         Text="下单时间: " />
                                     <TextBlock
                                         Grid.Row="0"
@@ -117,29 +117,29 @@
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Top"
                                         FontSize="18"
-                                        Foreground="Black"
+                                        Foreground="White"
                                         Text="{Binding OrderdateTime}" />
                                 </StackPanel>
                                 
                                 <ScrollViewer
-                                Grid.Row="1"
-                                    Margin="20,10"
-                                VerticalAlignment="Top"
-                                Background="Transparent"
-                                HorizontalScrollBarVisibility="Hidden"
-                                VerticalScrollBarVisibility="Auto">
-                                    <ListBox  ItemsSource="{Binding Recipes}" FontFamily="楷体">
+                                        Grid.Row="1"
+                                        Margin="20,10"
+                                        VerticalAlignment="Top"
+                                        Background="#104E8B"
+                                        HorizontalScrollBarVisibility="Hidden"
+                                        VerticalScrollBarVisibility="Auto">
+                                    <ListBox  ItemsSource="{Binding Recipes}" FontFamily="楷体" Background="#104E8B" >
                                         
                                     </ListBox>
 
                                 </ScrollViewer>
                                 <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
                                     <Button Content="执行订单" Width="100" Height="24" HorizontalAlignment="Right" Margin="10,0"
-                                     Background="#58B0ED" Foreground="White" 
+                                     Style="{DynamicResource ButtonStyle}"
                                         Command="{Binding }"
                                         />
                                     <Button Content="删除订单" Width="100" Height="24" HorizontalAlignment="Right" Margin="10,0"
-                                     Background="#58B0ED" Foreground="White" 
+                                     Style="{DynamicResource ButtonStyle}"  
                                         Command="{Binding }"
                                         CommandParameter="{Binding}"/>
                                 </StackPanel>
@@ -164,10 +164,10 @@
             <RowDefinition Height="40"/>
             <RowDefinition />
         </Grid.RowDefinitions>
-        <Button Content="创建订单" Width="100" Height="30" HorizontalAlignment="Right" Margin="10,0"
-                Background="#58B0ED" Foreground="White" Command="{Binding CreateOrderCommand}"/>
-        <ListView Grid.Row="1"  
-                  ScrollViewer.HorizontalScrollBarVisibility="Disabled" ItemsSource="{Binding orders}"  Background="#FFFAFA" >
+        <Button Content="创建订单" Width="100" Height="30" HorizontalAlignment="Right" Margin="10,0" Style="{DynamicResource ButtonStyle}"
+                 Command="{Binding CreateOrderCommand}"/>
+        <ListView Grid.Row="1"  Background="Transparent"    Margin="10"
+                  ScrollViewer.HorizontalScrollBarVisibility="Disabled" ItemsSource="{Binding orders}"  >
           
             <ListBox.ItemsPanel>
                 <ItemsPanelTemplate>

BPASmart.RecipeManagement/View/PowerManager.xaml

@@ -6,7 +6,7 @@
              xmlns:local="clr-namespace:BPASmart.RecipeManagement.View"
              xmlns:vm="clr-namespace:BPASmart.RecipeManagement.ViewModel"
              mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
+             d:DesignHeight="450" d:DesignWidth="800"  Foreground="#FF2AB2E7">
     <UserControl.DataContext>
         <vm:PowerManagerViewModel/>
     </UserControl.DataContext>
@@ -108,9 +108,9 @@
         </Grid.RowDefinitions>
         
         <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
-            <TextBlock Text="选择用户"  FontSize="22" Foreground="DarkSlateGray" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="20,0"/>
-            <ComboBox Width="120" Margin="20,0" ItemsSource="{Binding UserName  }" FontSize="16"/>
-            <Button Foreground="White" Background="#009DFF" Margin="20,0"
+            <TextBlock Text="选择用户"  FontSize="22"  VerticalAlignment="Center" HorizontalAlignment="Center" Margin="20,0"/>
+            <ComboBox Width="120" Margin="20,0" ItemsSource="{Binding UserName  }" FontSize="16" Foreground="#FF2AB2E7"/>
+            <Button Style="{DynamicResource CommonButton}" Margin="20,0"
                                 FontSize="18" Height="30" Width="120" 
                                 Command="{Binding SaveCommand}" CommandParameter="Materials">
             <TextBlock Text="保存" TextWrapping="Wrap"/>
@@ -123,8 +123,8 @@
                 <ColumnDefinition/>
                 <ColumnDefinition/>
             </Grid.ColumnDefinitions>
-            <TextBlock Text="原料权限"  FontSize="22" Foreground="DarkSlateGray" VerticalAlignment="Bottom" HorizontalAlignment="Center" />
-            <TextBlock Grid.Column="1" Text="配方权限"  FontSize="22" Foreground="DarkSlateGray" VerticalAlignment="Bottom" HorizontalAlignment="Center" />
+            <TextBlock Text="原料权限"  FontSize="22"  VerticalAlignment="Bottom" HorizontalAlignment="Center" />
+            <TextBlock Grid.Column="1" Text="配方权限"  FontSize="22"  VerticalAlignment="Bottom" HorizontalAlignment="Center" />
         </Grid>
         <Grid Grid.Row="3" Margin="5,10,5,50">
             <Grid.ColumnDefinitions>
@@ -155,7 +155,7 @@
                                     <ColumnDefinition Width="*"></ColumnDefinition>
                                     <ColumnDefinition Width="60"></ColumnDefinition>
                                 </Grid.ColumnDefinitions>
-                                <TextBlock x:Name="tb_Name"  Text="{Binding Name}" Foreground="Black" FontSize="18" VerticalAlignment="Center" HorizontalAlignment="Left" />
+                                <TextBlock x:Name="tb_Name"  Text="{Binding Name}" Foreground="White" FontSize="18" VerticalAlignment="Center" HorizontalAlignment="Left" />
                                 <Button x:Name="BtnDelete" Grid.Column="1" Background="Transparent" ToolTip="移除" VerticalAlignment="Center" HorizontalAlignment="Left" 
                                                Command="{Binding DataContext.AddMaterialCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ListBox}}"
                                                CommandParameter="{Binding Path=Text,ElementName=tb_Name}">
@@ -185,13 +185,13 @@
             </ScrollViewer>
 
             <StackPanel Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center">
-                <Button Foreground="White" Background="#009DFF"
+                <Button Style="{DynamicResource ButtonStyle}"
                                 FontSize="18" Height="60" Width="60" Margin="0,20"
                                 Command="{Binding AddAllCommand}" CommandParameter="Materials">
                     <TextBlock Text="全部
                                        添加" TextWrapping="Wrap"/>
                 </Button>
-                <Button Foreground="White" Background="#009DFF"
+                <Button Style="{DynamicResource ButtonStyle}"
                                 FontSize="18" Height="60" Width="60" Margin="0,20"
                                 Command="{Binding DeleteAllCommand}" CommandParameter="Materials">
                     <TextBlock Text="全部
@@ -215,7 +215,7 @@
                                     <ColumnDefinition Width="*"></ColumnDefinition>
                                     <ColumnDefinition Width="60"></ColumnDefinition>
                                 </Grid.ColumnDefinitions>
-                                <TextBlock x:Name="tb_Name"  Text="{Binding Name}" Foreground="Black" FontSize="18" VerticalAlignment="Center" HorizontalAlignment="Left" />
+                                <TextBlock x:Name="tb_Name"  Text="{Binding Name}" Foreground="White" FontSize="18" VerticalAlignment="Center" HorizontalAlignment="Left" />
                                 <Button x:Name="BtnDelete" Grid.Column="1" Background="Transparent" ToolTip="移除" VerticalAlignment="Center" HorizontalAlignment="Left" 
                                                Command="{Binding DataContext.DeleteMaterialCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ListBox}}"
                                                CommandParameter="{Binding Path=Text,ElementName=tb_Name}">
@@ -262,7 +262,7 @@
                                     <ColumnDefinition Width="*"></ColumnDefinition>
                                     <ColumnDefinition Width="60"></ColumnDefinition>
                                 </Grid.ColumnDefinitions>
-                                <TextBlock x:Name="tb_Name"  Text="{Binding Name}" Foreground="Black" FontSize="18" VerticalAlignment="Center" HorizontalAlignment="Left" />
+                                <TextBlock x:Name="tb_Name"  Text="{Binding Name}" Foreground="White" FontSize="18" VerticalAlignment="Center" HorizontalAlignment="Left" />
                                 <Button x:Name="BtnDelete" Grid.Column="1" Background="Transparent" ToolTip="移除" VerticalAlignment="Center" HorizontalAlignment="Left" 
                                                Command="{Binding DataContext.AddRecipeCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ListBox}}"
                                                CommandParameter="{Binding Path=Text,ElementName=tb_Name}">
@@ -292,13 +292,13 @@
             </ScrollViewer>
 
             <StackPanel Grid.Column="5" HorizontalAlignment="Center" VerticalAlignment="Center">
-                <Button Foreground="White" Background="#009DFF"
+                <Button Style="{DynamicResource ButtonStyle}"
                                 FontSize="18" Height="60" Width="60" Margin="0,20"
                                 Command="{Binding AddAllCommand}" CommandParameter="Recipes">
                     <TextBlock Text="全部
                                        添加" TextWrapping="Wrap"/>
                 </Button>
-                <Button Foreground="White" Background="#009DFF"
+                <Button Style="{DynamicResource ButtonStyle}"
                                 FontSize="18" Height="60" Width="60" Margin="0,20"
                                 Command="{Binding DeleteAllCommand}" CommandParameter="Recipes">
                     <TextBlock Text="全部
@@ -323,7 +323,7 @@
                                     <ColumnDefinition Width="*"></ColumnDefinition>
                                     <ColumnDefinition Width="60"></ColumnDefinition>
                                 </Grid.ColumnDefinitions>
-                                <TextBlock x:Name="tb_Name"  Text="{Binding Name}" Foreground="Black" FontSize="18" VerticalAlignment="Center" HorizontalAlignment="Left" />
+                                <TextBlock x:Name="tb_Name"  Text="{Binding Name}" Foreground="White" FontSize="18" VerticalAlignment="Center" HorizontalAlignment="Left" />
                                 <Button x:Name="BtnDelete" Grid.Column="1" Background="Transparent" ToolTip="移除" VerticalAlignment="Center" HorizontalAlignment="Left" 
                                                Command="{Binding DataContext.DeleteRecipeCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ListBox}}"
                                                CommandParameter="{Binding Path=Text,ElementName=tb_Name}">

BPASmart.RecipeManagement/View/PropertySetting.xaml

@@ -0,0 +1,141 @@
+<Window x:Class="BPASmart.RecipeManagement.View.PropertySetting"
+        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:BPASmart.RecipeManagement.View"
+        xmlns:vm="clr-namespace:BPASmart.RecipeManagement.ViewModel"
+        mc:Ignorable="d"
+        Title="ProperlySetting" Height="500" Width="600" WindowStyle="None" AllowsTransparency="True" Background="#264c73" Foreground="#FF2AB2E7"
+        WindowStartupLocation="CenterScreen" MouseLeftButtonDown="Window_MouseLeftButtonDown">
+    <Window.DataContext>
+        <vm:PropertySettingViewModel/>
+    </Window.DataContext>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="200"/>
+            <RowDefinition/>
+        </Grid.RowDefinitions>
+        <Grid Margin="0,0,0,10">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="49*"/>
+                <RowDefinition Height="30"/>
+                <RowDefinition Height="120*"/>
+                
+            </Grid.RowDefinitions>
+            <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Height="29" Width="586">
+                <TextBlock Text="属性名称:" FontSize="18" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="10,0,0,0"/>
+                <TextBox Text="{Binding PropertyName }" FontSize="18" Width="150" Margin="20,0" Style="{DynamicResource CommonTextBox}"/>
+                <Button Content="保存" Style="{DynamicResource ButtonStyle}" FontSize="18" Width="120" Margin="20,0" Command="{Binding SaveCommand}"/>
+                <Button Content="关闭" Style="{DynamicResource ButtonStyle}" FontSize="18" Width="120" Margin="20,0,0,0" Click="Button_Click"/>
+            </StackPanel>
+
+            <TextBlock Grid.Row="1" Text="{Binding ErrorName}" Foreground="Red" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+            <StackPanel Grid.Row="2" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Height="100" Width="506">
+                <TextBlock Text="属性说明:" FontSize="18" Margin="0,0,30,0"/>
+                <TextBox Text="{Binding PropertyDescription}" FontSize="18" Width="400" Height="100" TextWrapping="Wrap" Style="{DynamicResource CommonTextBox}"
+                         VerticalContentAlignment="Top"/>
+            </StackPanel>
+        </Grid>
+        <Grid Grid.Row="1">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="30"/>
+                <RowDefinition />
+            </Grid.RowDefinitions>
+          
+            <Grid Background="#dd2AB2E7" x:Name="grid">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="120" />
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="120"/>
+                </Grid.ColumnDefinitions>
+                <TextBlock
+                    Grid.Column="0"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="16"
+                    Foreground="White"
+                    Text="属性名" />
+
+                <Grid Grid.Column="1">
+                    <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="16"
+                    Foreground="White"
+                    Text="属性说明" />
+                    <Border
+                    BorderBrush="white"
+                    BorderThickness="1,0,1,0"
+                    Cursor="SizeWE" />
+                </Grid>
+
+                <TextBlock
+                Grid.Column="2"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                FontSize="16"
+                Foreground="white"
+                Text="删除" />
+            </Grid>
+            <ScrollViewer
+                    Grid.Row="1"
+                    HorizontalScrollBarVisibility="Hidden"
+                    VerticalScrollBarVisibility="Hidden">
+                <ListBox ItemsSource="{Binding properties}" x:Name="lb"
+                         ScrollViewer.HorizontalScrollBarVisibility="Hidden" ScrollViewer.VerticalScrollBarVisibility="Hidden"
+                         Background="Transparent" Foreground="#FF2AB2E7" >
+                    <ListBox.ItemTemplate>
+                        <DataTemplate>
+                            <Grid x:Name="gr" Height="30" Width="600" >
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="120"/>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="120"/>
+                                </Grid.ColumnDefinitions>
+
+                                <TextBlock
+                                    Grid.Column="0"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Background="Transparent"
+                                    FontSize="14"
+                                    Text="{Binding PropertyName}" />
+
+                                <Grid Grid.Column="1">
+                                    <TextBlock
+                                    Margin="5,0,0,0"
+                                    VerticalAlignment="Center"
+                                    HorizontalAlignment="Center"
+                                    Background="Transparent"
+                                    FontSize="14"
+                                    Text="{Binding PropertyDescription}" />
+                                </Grid>
+
+
+                                <Button
+                                Grid.Column="2"
+                                Margin="5,0,0,0"
+                                VerticalAlignment="Center"
+                                Width="80"
+                                Style="{DynamicResource CommonButton}"
+                                Command="{Binding DataContext.DeleteCommand, RelativeSource={RelativeSource AncestorType=Window,Mode=FindAncestor}}"
+                                CommandParameter="{Binding DataContext.PropertyId, RelativeSource={RelativeSource AncestorType=ListBoxItem,Mode=FindAncestor}}"
+                                Content="删除" />
+
+
+                            </Grid>
+
+                            <DataTemplate.Triggers>
+                                <Trigger Property="IsMouseOver" Value="true">
+                                    <Setter TargetName="gr" Property="Background" Value="#112AB2E7" />
+                                </Trigger>
+                            </DataTemplate.Triggers>
+
+                        </DataTemplate>
+                    </ListBox.ItemTemplate>
+                </ListBox>
+            </ScrollViewer>
+        </Grid>
+    </Grid>
+</Window>

BPASmart.RecipeManagement/View/PropertySetting.xaml.cs

@@ -0,0 +1,39 @@
+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.Shapes;
+
+namespace BPASmart.RecipeManagement.View
+{
+    /// <summary>
+    /// ProperlySetting.xaml 的交互逻辑
+    /// </summary>
+    public partial class PropertySetting : Window
+    {
+        public PropertySetting()
+        {
+            InitializeComponent();
+            
+        }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            
+            this.Close();
+        }
+
+        private void Window_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            this.DragMove();
+        }
+    }
+}

BPASmart.RecipeManagement/View/RecipeManager.xaml

@@ -6,7 +6,7 @@
              xmlns:local="clr-namespace:BPASmart.RecipeManagement.View"
              xmlns:vm="clr-namespace:BPASmart.RecipeManagement.ViewModel"
              mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
+             d:DesignHeight="450" d:DesignWidth="800" Foreground="#FF2AB2E7">
     <UserControl.DataContext>
         <vm:RecipeManagerViewModel/>
     </UserControl.DataContext>
@@ -18,12 +18,12 @@
                 <Setter.Value>
                     <ControlTemplate TargetType="ListViewItem">
                         <Border x:Name="mborder" BorderBrush="#009AC0" BorderThickness="1,5" CornerRadius="10" Margin="10"
-                                Background="Transparent">
+                                Background="#104E8B">
                             <Grid
-                            Name="tt"
-                            Height="200"
-                                Width="150"
-                            Margin="5">
+                                    Name="tt"
+                                    Height="200"
+                                    Width="150"
+                                    Margin="5">
                                 <Grid.RowDefinitions>
                                     <RowDefinition Height="30" />
                                     <RowDefinition Height="20" />
@@ -37,14 +37,14 @@
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Top"
                                 FontSize="18"
-                                Foreground="Black"
+                                Foreground="Orange"
                                 Text="{Binding Name}" />
 
                                 <TextBlock
                                 Grid.Row="1"
                                 Margin="5,0,0,0"
                                 VerticalAlignment="Top"
-                                Foreground="Black"
+                                Foreground="White"
                                 Text="配方信息：" />
 
                                 <ScrollViewer
@@ -111,12 +111,17 @@
                                     </Grid>
 
                                 </ScrollViewer>
+
+                                <Button Grid.Row="4" Content="配方工艺" Style="{DynamicResource ButtonStyle}"
+                                        Height="20" Width="80" HorizontalAlignment="Right" VerticalAlignment="Top"
+                                        Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl,Mode=FindAncestor},Path=DataContext.PecipeSettingCommand}"
+                                        CommandParameter="{Binding ID}"/>
                             </Grid>
                           
                         </Border>
                         <ControlTemplate.Triggers>
                             <Trigger  Property="IsMouseOver" Value="True">
-                                <Setter Property="BorderBrush" Value="#D2B48C" TargetName="mborder"/>
+                                <Setter Property="BorderBrush" Value="#CD8500" TargetName="mborder"/>
 
                             </Trigger>
                             <Trigger Property="IsFocused" Value="True">
@@ -134,9 +139,9 @@
             <RowDefinition Height="40"/>
             <RowDefinition/>
         </Grid.RowDefinitions>
-        <TextBlock Text="配方清单" FontSize="28" Foreground="DarkSlateGray" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+        <TextBlock Text="配方清单" FontSize="28"  VerticalAlignment="Center" HorizontalAlignment="Center"/>
         <ListView Grid.Row="1"  
-                  ScrollViewer.HorizontalScrollBarVisibility="Disabled" ItemsSource="{Binding RecipeList}" Margin=" 10" Background="#FFFAFA" >
+                  ScrollViewer.HorizontalScrollBarVisibility="Disabled" ItemsSource="{Binding RecipeList}" Margin=" 10" Background="Transparent" >
             <ListView.ContextMenu>
                 <ContextMenu FontSize="16" Foreground="White">
                     <MenuItem Header="新建配方" Name="MenuAdd" Command="{Binding CreateRecipeCommand}"></MenuItem>

BPASmart.RecipeManagement/View/RecipesConfigure.xaml

@@ -6,156 +6,17 @@
         xmlns:local="clr-namespace:BPASmartClient.RecipeManagement.View"
         xmlns:vm="clr-namespace:BPASmart.RecipeManagement.ViewModel"
         mc:Ignorable="d"
-        Title="RecipesConfigure" Height="600" Width="400" WindowStartupLocation="CenterScreen" WindowStyle="None" Background="White" MouseLeftButtonDown="Window_MouseLeftButtonDown">
+        Title="RecipesConfigure" Height="600" Width="400" WindowStartupLocation="CenterScreen" WindowStyle="None" Background="White" MouseLeftButtonDown="Window_MouseLeftButtonDown"
+        AllowsTransparency="True" Foreground="#FF2AB2E7">
     <Window.DataContext>
         <vm:RecipesConfigureViewModel/>
     </Window.DataContext>
     <Window.Resources>
        
 
-        <Style x:Key="ComboBoxStyle" TargetType="{x:Type ComboBox}">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="ItemContainerStyle">
-                <Setter.Value>
-                    <Style TargetType="ComboBoxItem">
-                        <Setter Property="Height" Value="25" />
-                        <Setter Property="Template">
-                            <Setter.Value>
-                                <ControlTemplate TargetType="{x:Type ComboBoxItem}">
-                                    <Grid Width="{TemplateBinding Width}" Height="{TemplateBinding Height}">
-                                        <Border x:Name="_borderbg" Background="White" />
-
-                                        <TextBlock
-                                        x:Name="_txt"
-                                        Margin="5,0,3,0"
-                                            FontWeight="Black"
-                                        HorizontalAlignment="Left"
-                                        VerticalAlignment="Center"
-                                        Foreground="Black"
-                                        Text="{Binding Content, RelativeSource={RelativeSource TemplatedParent}}" />
-
-                                        <Border
-                                        x:Name="_border"
-                                        Background="White"
-                                        Opacity="0" />
-                                    </Grid>
-                                    <ControlTemplate.Triggers>
-                                        <MultiTrigger>
-                                            <MultiTrigger.Conditions>
-                                                <Condition Property="IsSelected" Value="false" />
-                                                <Condition Property="IsMouseOver" Value="true" />
-                                            </MultiTrigger.Conditions>
-                                            <Setter TargetName="_borderbg" Property="Background" Value="#AFEEEE" />
-                                            <Setter TargetName="_txt" Property="Foreground" Value="black" />
-                                        </MultiTrigger>
-                                    </ControlTemplate.Triggers>
-                                </ControlTemplate>
-                            </Setter.Value>
-                        </Setter>
-                    </Style>
-                </Setter.Value>
-            </Setter>
-            
-            
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="{x:Type ComboBox}">
-                        <Grid>
-
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="0.7*" />
-                                <ColumnDefinition Width="0.3*" MaxWidth="30" />
-                            </Grid.ColumnDefinitions>
-                            <Border
-                            x:Name="_prybr"
-                            Grid.Column="0"
-                            Grid.ColumnSpan="2"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="0" />
-                            <ContentPresenter
-                            x:Name="ContentSite"
-                            Margin="3,3,0,3"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            Content="{TemplateBinding SelectionBoxItem}"
-                            ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
-                            ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
-                            IsHitTestVisible="False" />
-
-                            <!--  ToggleButton 已数据绑定到 ComboBox 本身以切换 IsDropDownOpen  -->
-                            <ToggleButton
-                            x:Name="ToggleButton"
-                            Grid.Column="0"
-                            Grid.ColumnSpan="2"
-                            ClickMode="Press"
-                            Focusable="false"
-                            IsChecked="{Binding Path=IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                            Template="{StaticResource ComboBoxToggleButton}" />
-                            <!--  必须将 TextBox 命名为 PART_EditableTextBox，否则 ComboBox 将无法识别它  -->
-                            <TextBox
-                            x:Name="PART_EditableTextBox"
-                            Margin="2,0,0,0"
-                            VerticalAlignment="Center"
-                            Background="Transparent"
-                            BorderThickness="0"
-                            CaretBrush="{TemplateBinding Foreground}"
-                            Focusable="True"
-                            Foreground="{TemplateBinding Foreground}"
-                            IsReadOnly="{TemplateBinding IsReadOnly}"
-                            Visibility="Hidden" />
-
-                            <!--  Popup 可显示 ComboBox 中的项列表。IsOpen 已数据绑定到通过 ComboBoxToggleButton 来切换的 IsDropDownOpen  -->
-                            <Popup
-                            x:Name="Popup"
-                            AllowsTransparency="True"
-                            Focusable="False"
-                            IsOpen="{TemplateBinding IsDropDownOpen}"
-                            Placement="Bottom"
-                            PopupAnimation="Slide">
-                                <Grid
-                                x:Name="DropDown"
-                                MinWidth="{TemplateBinding ActualWidth}"
-                                MaxHeight="150"
-                                SnapsToDevicePixels="True">
-                                    <Border
-                                    x:Name="DropDownBorder"
-                                    BorderBrush="Black"
-                                    BorderThickness="0" />
-                                    <ScrollViewer
-                                    Margin="1"
-                                    CanContentScroll="True"
-                                    HorizontalScrollBarVisibility="Auto"
-                                    SnapsToDevicePixels="True"
-                                    VerticalScrollBarVisibility="Auto">
-                                        <!--  StackPanel 用于显示子级，方法是将 IsItemsHost 设置为 True  -->
-                                        <!--  一下可以设置列表背景色  -->
-                                        <StackPanel
-                                        Background="White"
-                                        IsItemsHost="True"
-                                        KeyboardNavigation.DirectionalNavigation="Contained" />
-                                    </ScrollViewer>
-                                </Grid>
-                            </Popup>
-                        </Grid>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsEditable" Value="true">
-                                <Setter TargetName="PART_EditableTextBox" Property="Visibility" Value="Visible" />
-                            </Trigger>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter TargetName="_prybr" Property="BorderBrush" Value="#aa3ba7f2" />
-                               
-                            </Trigger>
-                            <Trigger Property="IsEnabled" Value="False">
-                                <Setter TargetName="ContentSite" Property="Opacity" Value="0.6" />
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
+        
     </Window.Resources>
-    <Grid>
+    <Grid Background="#264c73">
         <Grid.RowDefinitions>
             <RowDefinition Height="50"/>
             <RowDefinition />
@@ -169,12 +30,13 @@
         </Grid.ColumnDefinitions>
         <TextBlock Text="配方名称:" FontSize="22"
                    HorizontalAlignment="Center" VerticalAlignment="Center" Height="28" Width="92"/>
-        <TextBox Text="{Binding RecipeName}" FontSize="20" Grid.Column="1" Width="160" Height="36"
+        <TextBox Text="{Binding RecipeName}" FontSize="20" Grid.Column="1" Width="160" Height="36" Background="Transparent" Foreground="Orange"
+                 BorderBrush="#FF2AB2E7"
                  VerticalAlignment="Center" HorizontalAlignment="Center" 
-                    VerticalContentAlignment="Center"/>
+                 VerticalContentAlignment="Center"/>
         <Button Grid.Column="2"
                 Content="添加原料" 
-                Foreground="White" FontSize="16" Width="90" Height="30" Margin="10" Background="#58B0ED"
+                FontSize="16" Width="90" Height="30" Margin="10" Style="{DynamicResource ButtonStyle}"
                 Command="{Binding AddMaterailsCommand}"/>
         <ScrollViewer Grid.ColumnSpan="3"
                     Grid.Row="1"
@@ -190,23 +52,20 @@
                                     <Grid Name="gr" Height="40">
                                         <Grid.ColumnDefinitions>
                                             <ColumnDefinition />
-                                            <ColumnDefinition />
-                                            <ColumnDefinition Width="0.5*" />
+                                            <ColumnDefinition Width="0.4*" />
+                                            <ColumnDefinition Width="0.4*" />
                                         </Grid.ColumnDefinitions>
 
                                         <ComboBox
                                                     Name="cb"
                                                     Grid.Column="0"
                                                     Margin="3,1"
+                                                    Foreground="#FF2AB2E7"
                                                     VerticalAlignment="Center"
-                                                    BorderBrush="Black"
-                                                    BorderThickness="1"
                                                     FontFamily="楷体"
                                                     FontSize="20"
-                                                    Foreground="Black"
                                                     IsEditable="False"
                                                     ItemsSource="{Binding DataContext.materialsName, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
-                                                    Style="{StaticResource ComboBoxStyle}"
                                                     SelectedItem="{Binding Name}"
                                                     />
 
@@ -218,16 +77,17 @@
                                             <TextBox
                                                         Name="tb"
                                                         Grid.Column="1"
-                                                        Width="100"
+                                                        Width="50"
                                                         Height="29"
-                                                        Margin="3,1"
+                                                        Margin="10,1"
                                                         VerticalAlignment="Center"
+                                                        Style="{DynamicResource CommonTextBox}"
                                                         FontSize="20"
                                                         Text="{Binding MaterialWeight}" />
 
                                             <TextBlock
                                                         Grid.Column="1"
-                                                        Margin="0,0,8,4"
+                                                        Margin="0,0,5,4"
                                                         HorizontalAlignment="Right"
                                                         VerticalAlignment="Center"
                                                         FontSize="20"
@@ -240,9 +100,9 @@
                                                     Width="70"
                                                     Height="28"
                                                     Margin="25,0,0,0"
-                                                    Foreground="White"
-                                                    FontSize="16"
-                                                    Background="#58B0ED"
+                                                    FontSize="16"    
+                                                    HorizontalAlignment="Left"
+                                                    Style="{DynamicResource CommonButton}"
                                                     Command="{Binding DataContext.DeleteCommand, RelativeSource={RelativeSource AncestorType=Window, Mode=FindAncestor}}"
                                                     CommandParameter="{Binding ID}"
                                                     Content="删 除" />
@@ -262,9 +122,9 @@
                        Foreground="Red" VerticalAlignment="Center" HorizontalAlignment="Center"/>
         <StackPanel Grid.Row="4" Grid.ColumnSpan="3" Orientation="Horizontal"
                     HorizontalAlignment="Center" VerticalAlignment="Center">
-            <Button Content="保存" Foreground="White" FontSize="22" Width="120" Height="40" Margin="10" Background="#58B0ED"
+            <Button Content="保存" FontSize="22" Width="120" Height="40" Margin="10" Style="{DynamicResource CommonButton}"
                         Command="{Binding SaveCommand}"/>
-            <Button Content="取消" Foreground="White" FontSize="22" Width="120" Height="40" Margin="10" Background="#58B0ED"
+            <Button Content="取消"  FontSize="22" Width="120" Height="40" Margin="10" Style="{DynamicResource CommonButton}"
                         Click="Button_Click"/>
             
 

BPASmart.RecipeManagement/View/RecipesConfigure.xaml.cs

@@ -1,4 +1,5 @@
-using System;
+using BPASmartClient.Helper;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -22,6 +23,8 @@ namespace BPASmartClient.RecipeManagement.View
         public RecipesConfigure()
         {
             InitializeComponent();
+            ActionManage.GetInstance.CancelRegister("CloseRecipesConfigureView");
+            ActionManage.GetInstance.Register(new Action(() => { this.Close(); }), "CloseRecipesConfigureView");
         }
 
         private void Button_Click(object sender, RoutedEventArgs e)

BPASmart.RecipeManagement/ViewModel/CreateOrderViewModel.cs

@@ -42,6 +42,7 @@ namespace BPASmart.RecipeManagement.ViewModel
                     OrderdateTime = DateTime.Now.ToString(),
                     Recipes = recipes
                 });
+                ActionManage.GetInstance.Send("CloseCreateOrderView");
             });
    
             DeleteCommand = new RelayCommand<object>(Delete);

BPASmart.RecipeManagement/ViewModel/MaterialConfigureViewModel.cs

@@ -14,7 +14,7 @@ namespace BPASmart.RecipeManagement.ViewModel
 {
     public class MaterialConfigureViewModel:ObservableObject
     {
-         
+        public ObservableCollection<Property> currentProperty { get; set; } = new ObservableCollection<Property>();
 
         public string MaterialName { get { return _materialName; } set { _materialName = value; OnPropertyChanged(); } } 
         private string _materialName;
@@ -32,13 +32,44 @@ namespace BPASmart.RecipeManagement.ViewModel
 
         public RelayCommand SaveCommand { get; set; }
 
+
+        private void AddMaterials()
+        {
+            Json<LocalMaterails>.Data.locaMaterails.Add(new RecipeMaterials
+            {
+                ID = Guid.NewGuid().ToString(),
+                Name = MaterialName,
+                MaterialType = MaterialType,
+                MaterialPosion = MaterialPosion,
+                PropertyCollections = currentProperty,
+            });
+        }
+
         public MaterialConfigureViewModel()
         {
-            if(GlobleData.ChangeMaterail != null)
+            foreach (Property item in Json<LocalMaterails>.Data.PorpertyCollections)
+            {
+                currentProperty.Add(new Property
+                {
+                    PropertyName = item.PropertyName,
+                    PropertyId = item.PropertyId,
+                    _propertyDsecription = item._propertyDsecription
+                });
+            }
+            if (GlobleData.ChangeMaterail != null)
             {
                 MaterialName = GlobleData.ChangeMaterail.Name;
                 MaterialType = GlobleData.ChangeMaterail.MaterialType;
                 MaterialPosion = GlobleData.ChangeMaterail.MaterialPosion;
+                foreach(var item in currentProperty)
+                {
+                    var res = GlobleData.ChangeMaterail.PropertyCollections.FirstOrDefault(p => p.PropertyId == item.PropertyId);
+                    if (res != null)
+                    {
+                        item.PropertyValue = res.PropertyValue;
+                    }
+                    
+                }
             }
 
             foreach(MaterialType item in Enum.GetValues(typeof(MaterialType)))
@@ -46,6 +77,8 @@ namespace BPASmart.RecipeManagement.ViewModel
                 MaterialTypes.Add(item);
             }
 
+          
+
 
             SaveCommand = new RelayCommand(() =>
             {
@@ -55,15 +88,30 @@ namespace BPASmart.RecipeManagement.ViewModel
                     return;
                 }
                 if(GlobleData.ChangeMaterail!=null)//编辑原料
-                {
+                { 
                     var res =  Json<LocalMaterails>.Data.locaMaterails.FirstOrDefault(p=>p.ID == GlobleData.ChangeMaterail.ID);
                     if (res != null) 
                     {
+                        if (MaterialName != res.Name )//修改了原料名称
+                        {
+                            if (Json<LocalMaterails>.Data.locaMaterails.FirstOrDefault(p => p.Name == MaterialName) != null)
+                            {
+                                ErrorMessage = "原料名称已存在";
+                                return ;
+                            }
+                        }
+                        if(MaterialPosion != res.MaterialPosion)//修改了原料位置
+                        {
+                            if (Json<LocalMaterails>.Data.locaMaterails.FirstOrDefault(p => p.MaterialPosion == MaterialPosion) != null)
+                            {
+                                ErrorMessage = "原料位置重复";
+                                return;
+                            }
+                        }
                         res.Name = MaterialName;
                         res.MaterialType = MaterialType;
                         res.MaterialPosion = MaterialPosion;
-                        Json<LocalMaterails>.Save();
-                        ErrorMessage = "保存成功";
+                        res.PropertyCollections = currentProperty;
                     }
                 }
                 else //添加新原料
@@ -76,30 +124,20 @@ namespace BPASmart.RecipeManagement.ViewModel
                             ErrorMessage = "原料名称已存在";
                             return;
                         }
-                        Json<LocalMaterails>.Data.locaMaterails.Add(new RecipeMaterials
+                        var item = Json<LocalMaterails>.Data.locaMaterails.FirstOrDefault(p=>p.MaterialPosion == MaterialPosion);
+                        if (item != null)
                         {
-                            ID = Guid.NewGuid().ToString(),
-                            Name = MaterialName,
-                            MaterialType = MaterialType,
-                            MaterialPosion = MaterialPosion 
-                        });
-                        Json<LocalMaterails>.Save();
-                        ErrorMessage = "保存成功";
+                            ErrorMessage = "原料位置重复";
+                        }
+                        AddMaterials();
                     }
                     else
                     {
-                        Json<LocalMaterails>.Data.locaMaterails.Add(new RecipeMaterials
-                        {
-                            ID = Guid.NewGuid().ToString(),
-                            Name = MaterialName,
-                            MaterialType = MaterialType,
-                            MaterialPosion = MaterialPosion
-                        });
-                        Json<LocalMaterails>.Save();
-                        ErrorMessage = "保存成功";
-                    }
-                   
+                        AddMaterials();
+                    }                   
                 }
+                Json<LocalMaterails>.Save();
+                ActionManage.GetInstance.Send("CloseMaterialConfigureView");
             });
         }
     }

BPASmart.RecipeManagement/ViewModel/PowerManagerViewModel.cs

@@ -143,6 +143,9 @@ namespace BPASmart.RecipeManagement.ViewModel
             UserName.Add("员工1号");
             UserName.Add("员工2号");
             UserName.Add("员工3号");
+            UserName.Add("员工4号");
+            UserName.Add("员工5号");
+            UserName.Add("员工6号");
 
 
         }

BPASmart.RecipeManagement/ViewModel/PropertySettingViewModel.cs

@@ -0,0 +1,76 @@
+using BPASmart.Model.配方;
+using BPASmartClient.Helper;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmart.RecipeManagement.ViewModel
+{
+    public class PropertySettingViewModel:ObservableObject
+    {
+        public ObservableCollection<Property> properties { get; set; } = Json<LocalMaterails>.Data.PorpertyCollections;
+
+        public string PropertyName { get { return _propertyName; } set { _propertyName = value; OnPropertyChanged(); } }
+        private string _propertyName;
+
+        public string PropertyDescription { get { return _propertyDescription; } set { _propertyDescription = value; OnPropertyChanged(); } }
+        private string _propertyDescription;
+
+        public string ErrorName { get { return _errorName; } set { _errorName = value; OnPropertyChanged(); } }
+        private string _errorName;
+
+        public RelayCommand SaveCommand { get; set; }
+
+        public RelayCommand<object> DeleteCommand { get; set; }
+
+        private void Delete(object o)
+        {
+            if (o == null) return;
+            if(o is string id)
+            {
+                var res = properties.FirstOrDefault(p => p.PropertyId == id);
+                if (res != null)
+                {
+                    properties.Remove(res);
+                }
+            }
+        }
+
+        public PropertySettingViewModel()
+        {
+            SaveCommand = new RelayCommand(() =>
+            {
+                if(PropertyName == null)
+                {
+                    ErrorName = "属性名称不能为空";
+                    return;
+                }
+                if (PropertyDescription == null)
+                {
+                    ErrorName = "请添加属性说明";
+                    return;
+                }
+                if(properties.FirstOrDefault(p=>p.PropertyName == PropertyName) != null)
+                {
+                    ErrorName = "属性名重复";
+                    return;
+                }
+
+                properties.Add(new Property
+                {
+                    PropertyId = Guid.NewGuid().ToString(),
+                    PropertyDescription = PropertyDescription,
+                    PropertyName = PropertyName
+                });
+                Json<LocalMaterails>.Save();
+                ErrorName = String.Empty;
+            });
+            DeleteCommand = new RelayCommand<object>(Delete);
+        }
+    }
+}

BPASmart.RecipeManagement/ViewModel/RecipeManagerViewModel.cs

@@ -20,6 +20,8 @@ namespace BPASmart.RecipeManagement.ViewModel
         public RelayCommand<object> EditRecipeCommand { get; set; }
         public RelayCommand<object> DeleteRecipeCommand { get; set; }
 
+        public RelayCommand<object> PecipeSettingCommand { get; set; }
+
         private void EditRecipe(object o)
         {
             if (o == null) return;
@@ -42,6 +44,19 @@ namespace BPASmart.RecipeManagement.ViewModel
             }
         }
 
+        private void PecipeSetting(object o)
+        {
+            if (o == null) return;
+            if (o is string id )
+            {
+                var res =  Json<LocalRecipes>.Data.locaRecipes.FirstOrDefault(p=>p.ID == id);
+                if (res != null)
+                {
+
+                }
+            }
+        }
+
         public RecipeManagerViewModel()
         {
             CreateRecipeCommand = new RelayCommand(() =>
@@ -55,6 +70,8 @@ namespace BPASmart.RecipeManagement.ViewModel
 
             DeleteRecipeCommand = new RelayCommand<object>(DeleteRecipe);
 
+            PecipeSettingCommand = new RelayCommand<object>(PecipeSetting);
+
         }
     }
 }

BPASmart.RecipeManagement/ViewModel/RecipesConfigureViewModel.cs

@@ -92,6 +92,7 @@ namespace BPASmart.RecipeManagement.ViewModel
                     });
                 }
                 Json<LocalRecipes>.Save();
+                ActionManage.GetInstance.Send("CloseRecipesConfigureView");
             });
 
             DeleteCommand = new RelayCommand<object>(Delete);

BPASmartClient.Business/Plugin/OrderProxy.cs

@@ -73,10 +73,15 @@ namespace BPASmartClient.Business
                 {
                     if (!orders.ContainsKey(morkOrderpush.DeviceId))
                     {
+                        
                         orders.TryAdd(morkOrderpush.DeviceId, new ConcurrentQueue<MorkOrderPush>());
                         StartTargetDeviceOrderJob(morkOrderpush.DeviceId);
                     }
-                    orders[morkOrderpush.DeviceId].Enqueue(morkOrderpush);
+                    if( orders[morkOrderpush.DeviceId].FirstOrDefault(p=>p.SuborderId == morkOrderpush.SuborderId) == null)
+                    {
+                        orders[morkOrderpush.DeviceId].Enqueue(morkOrderpush);
+                    }
+                    
                 }
                 //辅料信息
                 else if (message is RecipeBoms recipe)

BPASmartClient/App.config

@@ -6,20 +6,20 @@
     <!--<add key="ClientId" value="43"/>-->
     <add key="IsEnableTest" value="false"/>
 
-    <!--测试环境-->
+    <!--测试环境--><!--
     <add key="apollouri" value="http://10.2.1.21:28080/"/>
     <add key="AppId" value="test1_HostComputer"/>
-    <add key ="Namespaces" value="DEV.test1.Config"/>
+    <add key ="Namespaces" value="DEV.test1.Config"/>-->
 
     <!--开发环境-->
     <!--<add key="apollouri" value="http://47.108.65.220:28080/"/>
     <add key="AppId" value="HostComputer"/>
     <add key ="Namespaces" value="DEV.Config"/>-->
 
-    <!--正式环境-->
-    <!--<add key="apollouri" value="http://47.108.65.220:28080/"/>
-    <add key="AppId" value="HostComputer"/>
-    <add key ="Namespaces" value="TEST1.Config"/>-->
+	  <!--正式环境-->
+    <add key="apollouri" value="http://47.108.65.220:28080/"/>
+    <add key="appid" value="hostcomputer"/>
+    <add key ="namespaces" value="test1.config"/>
 
     <!--阿里云上报启动方式:API 或者 LOCAL-->
     <!--API  :通过客户端ID,调用接口查询“设备连接信息”-->

FryPot_DosingSystem/View/NewRecipeView.xaml

@@ -202,7 +202,7 @@
                         <TextBlock Text="请输入配方名称：" Foreground="#FF2AB2E7" FontSize="18" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
                         <TextBox Style="{DynamicResource TextBoxStyle}" Text="{Binding RecipeName}" Width="230" Height="30" BorderThickness="1" Background="Transparent" Foreground="Orange"
                              VerticalContentAlignment="Center"
-  BorderBrush="#FF2AB2E7" VerticalAlignment="Center" FontSize="16" ></TextBox>
+                                BorderBrush="#FF2AB2E7" VerticalAlignment="Center" FontSize="16" ></TextBox>
                     </StackPanel>
                     <StackPanel Orientation="Horizontal">
                         <TextBlock Text="请输入桶的数量：" Foreground="#FF2AB2E7" FontSize="18" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>

PermissionManagement/App.xaml

@@ -0,0 +1,11 @@
+<Application x:Class="PermissionManagement.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:PermissionManagement"
+             StartupUri="MainWindow.xaml">
+    <Application.Resources>
+        <SolidColorBrush x:Key="AllBackGround" Color="#01003B"/>
+        <SolidColorBrush x:Key="commonForeground" Color="#FF2AB2E7"/>
+        
+    </Application.Resources>
+</Application>

PermissionManagement/App.xaml.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Data;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace PermissionManagement
+{
+    /// <summary>
+    /// Interaction logic for App.xaml
+    /// </summary>
+    public partial class App : Application
+    {
+    }
+}

PermissionManagement/AssemblyInfo.cs

@@ -0,0 +1,10 @@
+using System.Windows;
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+                                     //(used if a resource is not found in the page,
+                                     // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+                                              //(used if a resource is not found in the page,
+                                              // app, or any theme specific resource dictionaries)
+)]

PermissionManagement/MainWindow.xaml

@@ -0,0 +1,12 @@
+<Window x:Class="PermissionManagement.MainWindow"
+        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:PermissionManagement"
+        mc:Ignorable="d"
+        Title="MainWindow" Height="450" Width="800" WindowStartupLocation="CenterScreen" WindowStyle="None" AllowsTransparency="True" >
+    <Grid Background="">
+
+    </Grid>
+</Window>

PermissionManagement/MainWindow.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 PermissionManagement
+{
+    /// <summary>
+    /// Interaction logic for MainWindow.xaml
+    /// </summary>
+    public partial class MainWindow : Window
+    {
+        public MainWindow()
+        {
+            InitializeComponent();
+        }
+    }
+}

PermissionManagement/PermissionManagement.csproj

@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <Nullable>enable</Nullable>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+
+</Project>

SmartClient.sln

@@ -178,6 +178,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BeDesignerSCADA", "BeDesign
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmart.RecipeManagement", "BPASmart.RecipeManagement\BPASmart.RecipeManagement.csproj", "{28EBFC11-184A-4B88-A7B3-84F3FD768520}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PermissionManagement", "PermissionManagement\PermissionManagement.csproj", "{BE6E7BC1-F250-4D11-8051-1B0F93AD2401}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -1612,6 +1614,26 @@ Global
 		{28EBFC11-184A-4B88-A7B3-84F3FD768520}.Release|x64.Build.0 = Release|Any CPU
 		{28EBFC11-184A-4B88-A7B3-84F3FD768520}.Release|x86.ActiveCfg = Release|Any CPU
 		{28EBFC11-184A-4B88-A7B3-84F3FD768520}.Release|x86.Build.0 = Release|Any CPU
+		{BE6E7BC1-F250-4D11-8051-1B0F93AD2401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BE6E7BC1-F250-4D11-8051-1B0F93AD2401}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BE6E7BC1-F250-4D11-8051-1B0F93AD2401}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{BE6E7BC1-F250-4D11-8051-1B0F93AD2401}.Debug|ARM.Build.0 = Debug|Any CPU
+		{BE6E7BC1-F250-4D11-8051-1B0F93AD2401}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{BE6E7BC1-F250-4D11-8051-1B0F93AD2401}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{BE6E7BC1-F250-4D11-8051-1B0F93AD2401}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BE6E7BC1-F250-4D11-8051-1B0F93AD2401}.Debug|x64.Build.0 = Debug|Any CPU
+		{BE6E7BC1-F250-4D11-8051-1B0F93AD2401}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BE6E7BC1-F250-4D11-8051-1B0F93AD2401}.Debug|x86.Build.0 = Debug|Any CPU
+		{BE6E7BC1-F250-4D11-8051-1B0F93AD2401}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BE6E7BC1-F250-4D11-8051-1B0F93AD2401}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BE6E7BC1-F250-4D11-8051-1B0F93AD2401}.Release|ARM.ActiveCfg = Release|Any CPU
+		{BE6E7BC1-F250-4D11-8051-1B0F93AD2401}.Release|ARM.Build.0 = Release|Any CPU
+		{BE6E7BC1-F250-4D11-8051-1B0F93AD2401}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{BE6E7BC1-F250-4D11-8051-1B0F93AD2401}.Release|ARM64.Build.0 = Release|Any CPU
+		{BE6E7BC1-F250-4D11-8051-1B0F93AD2401}.Release|x64.ActiveCfg = Release|Any CPU
+		{BE6E7BC1-F250-4D11-8051-1B0F93AD2401}.Release|x64.Build.0 = Release|Any CPU
+		{BE6E7BC1-F250-4D11-8051-1B0F93AD2401}.Release|x86.ActiveCfg = Release|Any CPU
+		{BE6E7BC1-F250-4D11-8051-1B0F93AD2401}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1694,6 +1716,7 @@ Global
 		{06F0B369-0483-46DD-82D2-70431FB505C1} = {7B0175AD-BB74-4A98-B9A7-1E289032485E}
 		{DF8B4C38-39DE-4220-AB60-885CAE6D1E47} = {06F0B369-0483-46DD-82D2-70431FB505C1}
 		{28EBFC11-184A-4B88-A7B3-84F3FD768520} = {CDC1E762-5E1D-4AE1-9DF2-B85761539086}
+		{BE6E7BC1-F250-4D11-8051-1B0F93AD2401} = {CDC1E762-5E1D-4AE1-9DF2-B85761539086}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {9AEC9B81-0222-4DE9-B642-D915C29222AC}