diff --git a/FourComponentWeightClient/BL/FourComponentWeightBL.cs b/FourComponentWeightClient/BL/FourComponentWeightBL.cs
index 473367c..3dea3da 100644
--- a/FourComponentWeightClient/BL/FourComponentWeightBL.cs
+++ b/FourComponentWeightClient/BL/FourComponentWeightBL.cs
@@ -12,9 +12,9 @@ namespace FourComponentWeightClient.BL
 {
   public static class FourComponentWeightBL
   {
-    public static ObservableCollection<FourComponentWeight> LoadList(DateTime date)
+    public static ObservableCollection<FourComponentWeight> LoadList(DateTime date, int? minDiaoPai, int? maxDiaoPai)
     {
-      var json = RpcFacade.Call<string>("/MainSystem/B3DaHongMen/Rpcs/FourComponentWeightRpc/GetList", date);
+      var json = RpcFacade.Call<string>("/MainSystem/B3DaHongMen/Rpcs/FourComponentWeightRpc/GetList", date, minDiaoPai, maxDiaoPai);
       var list = JsonConvert.DeserializeObject<List<FourComponentWeight>>(json);
       var idx = list.Count;
       foreach (var item in list)
diff --git a/FourComponentWeightClient/FCWeightForm.xaml b/FourComponentWeightClient/FCWeightForm.xaml
index ddbface..e3bf9be 100644
--- a/FourComponentWeightClient/FCWeightForm.xaml
+++ b/FourComponentWeightClient/FCWeightForm.xaml
@@ -1,11 +1,585 @@
 <Window xmlns:FourComponentWeightClient="clr-namespace:FourComponentWeightClient"  x:Class="FourComponentWeightClient.FCWeightForm"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="四分体称重" Height="700" Width="900" WindowState="Maximized" FontSize="15" >
+        Title="四分体称重" Height="700" Width="920" WindowState="Maximized" FontSize="15" >
+  <Window.Resources>
+    <Style x:Key="CalendarDayButtonStyle" TargetType="{x:Type CalendarDayButton}">
+      <Setter Property="MinWidth" Value="5"/>
+      <Setter Property="MinHeight" Value="5"/>
+      <Setter Property="FontSize" Value="10"/>
+      <Setter Property="HorizontalContentAlignment" Value="Center"/>
+      <Setter Property="VerticalContentAlignment" Value="Center"/>
+      <Setter Property="Template">
+        <Setter.Value>
+          <ControlTemplate TargetType="{x:Type CalendarDayButton}">
+            <Grid Width="60" Height="60">
+              <VisualStateManager.VisualStateGroups>
+                <VisualStateGroup x:Name="CommonStates">
+                  <VisualStateGroup.Transitions>
+                    <VisualTransition GeneratedDuration="0:0:0.1"/>
+                  </VisualStateGroup.Transitions>
+                  <VisualState x:Name="Normal"/>
+                  <VisualState x:Name="MouseOver">
+                    <Storyboard>
+                      <DoubleAnimation Duration="0" To="0.5" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="HighlightBackground"/>
+                    </Storyboard>
+                  </VisualState>
+                  <VisualState x:Name="Pressed">
+                    <Storyboard>
+                      <DoubleAnimation Duration="0" To="0.5" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="HighlightBackground"/>
+                    </Storyboard>
+                  </VisualState>
+                  <VisualState x:Name="Disabled">
+                    <Storyboard>
+                      <DoubleAnimation Duration="0" To="0" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="HighlightBackground"/>
+                      <DoubleAnimation Duration="0" To=".35" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="NormalText"/>
+                    </Storyboard>
+                  </VisualState>
+                </VisualStateGroup>
+                <VisualStateGroup x:Name="SelectionStates">
+                  <VisualStateGroup.Transitions>
+                    <VisualTransition GeneratedDuration="0"/>
+                  </VisualStateGroup.Transitions>
+                  <VisualState x:Name="Unselected"/>
+                  <VisualState x:Name="Selected">
+                    <Storyboard>
+                      <DoubleAnimation Duration="0" To=".75" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="SelectedBackground"/>
+                    </Storyboard>
+                  </VisualState>
+                </VisualStateGroup>
+                <VisualStateGroup x:Name="CalendarButtonFocusStates">
+                  <VisualStateGroup.Transitions>
+                    <VisualTransition GeneratedDuration="0"/>
+                  </VisualStateGroup.Transitions>
+                  <VisualState x:Name="CalendarButtonFocused">
+                    <Storyboard>
+                      <ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetProperty="Visibility" Storyboard.TargetName="DayButtonFocusVisual">
+                        <DiscreteObjectKeyFrame KeyTime="0">
+                          <DiscreteObjectKeyFrame.Value>
+                            <Visibility>Visible</Visibility>
+                          </DiscreteObjectKeyFrame.Value>
+                        </DiscreteObjectKeyFrame>
+                      </ObjectAnimationUsingKeyFrames>
+                    </Storyboard>
+                  </VisualState>
+                  <VisualState x:Name="CalendarButtonUnfocused">
+                    <Storyboard>
+                      <ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetProperty="Visibility" Storyboard.TargetName="DayButtonFocusVisual">
+                        <DiscreteObjectKeyFrame KeyTime="0">
+                          <DiscreteObjectKeyFrame.Value>
+                            <Visibility>Collapsed</Visibility>
+                          </DiscreteObjectKeyFrame.Value>
+                        </DiscreteObjectKeyFrame>
+                      </ObjectAnimationUsingKeyFrames>
+                    </Storyboard>
+                  </VisualState>
+                </VisualStateGroup>
+                <VisualStateGroup x:Name="ActiveStates">
+                  <VisualStateGroup.Transitions>
+                    <VisualTransition GeneratedDuration="0"/>
+                  </VisualStateGroup.Transitions>
+                  <VisualState x:Name="Active"/>
+                  <VisualState x:Name="Inactive">
+                    <Storyboard>
+                      <ColorAnimation Duration="0" To="#FF777777" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)" Storyboard.TargetName="NormalText"/>
+                    </Storyboard>
+                  </VisualState>
+                </VisualStateGroup>
+                <VisualStateGroup x:Name="DayStates">
+                  <VisualStateGroup.Transitions>
+                    <VisualTransition GeneratedDuration="0"/>
+                  </VisualStateGroup.Transitions>
+                  <VisualState x:Name="RegularDay"/>
+                  <VisualState x:Name="Today">
+                    <Storyboard>
+                      <DoubleAnimation Duration="0" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="TodayBackground"/>
+                      <ColorAnimation Duration="0" To="#FFFFFFFF" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)" Storyboard.TargetName="NormalText"/>
+                    </Storyboard>
+                  </VisualState>
+                </VisualStateGroup>
+                <VisualStateGroup x:Name="BlackoutDayStates">
+                  <VisualStateGroup.Transitions>
+                    <VisualTransition GeneratedDuration="0"/>
+                  </VisualStateGroup.Transitions>
+                  <VisualState x:Name="NormalDay"/>
+                  <VisualState x:Name="BlackoutDay">
+                    <Storyboard>
+                      <DoubleAnimation Duration="0" To=".2" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="Blackout"/>
+                    </Storyboard>
+                  </VisualState>
+                </VisualStateGroup>
+              </VisualStateManager.VisualStateGroups>
+              <Rectangle x:Name="TodayBackground" Fill="#FFAAAAAA" Opacity="0" RadiusY="1" RadiusX="1"/>
+              <Rectangle x:Name="SelectedBackground" Fill="#FFBADDE9" Opacity="0" RadiusY="1" RadiusX="1"/>
+              <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}"/>
+              <Rectangle x:Name="HighlightBackground" Fill="#FFBADDE9" Opacity="0" RadiusY="1" RadiusX="1"/>
+              <ContentPresenter x:Name="NormalText" TextElement.FontSize="16" TextElement.Foreground="#FF333333" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="5,1,5,1" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+              <Path x:Name="Blackout" Data="M8.1772461,11.029181 L10.433105,11.029181 L11.700684,12.801641 L12.973633,11.029181 L15.191895,11.029181 L12.844727,13.999395 L15.21875,17.060919 L12.962891,17.060919 L11.673828,15.256231 L10.352539,17.060919 L8.1396484,17.060919 L10.519043,14.042364 z" Fill="#FF000000" HorizontalAlignment="Stretch" Margin="3" Opacity="0" RenderTransformOrigin="0.5,0.5" Stretch="Fill" VerticalAlignment="Stretch"/>
+              <Rectangle x:Name="DayButtonFocusVisual" IsHitTestVisible="false" RadiusY="1" RadiusX="1" Stroke="#FF45D6FA" Visibility="Collapsed"/>
+            </Grid>
+          </ControlTemplate>
+        </Setter.Value>
+      </Setter>
+    </Style>
+
+    <Style x:Key="CalendarItemStyle1" TargetType="{x:Type CalendarItem}">
+      <Setter Property="Margin" Value="0,3,0,3"/>
+      <Setter Property="Template">
+        <Setter.Value>
+          <ControlTemplate TargetType="{x:Type CalendarItem}">
+            <ControlTemplate.Resources>
+              <DataTemplate x:Key="{x:Static CalendarItem.DayTitleTemplateResourceKey}">
+                <TextBlock Foreground="#FF333333" FontWeight="Bold" FontSize="11" FontFamily="Verdana" HorizontalAlignment="Center" Margin="0,6,0,6" Text="{Binding}" VerticalAlignment="Center"/>
+              </DataTemplate>
+            </ControlTemplate.Resources>
+            <Grid x:Name="PART_Root">
+              <Grid.Resources>
+                <SolidColorBrush x:Key="DisabledColor" Color="#A5FFFFFF"/>
+              </Grid.Resources>
+              <VisualStateManager.VisualStateGroups>
+                <VisualStateGroup x:Name="CommonStates">
+                  <VisualState x:Name="Normal"/>
+                  <VisualState x:Name="Disabled">
+                    <Storyboard>
+                      <DoubleAnimation Duration="0" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_DisabledVisual"/>
+                    </Storyboard>
+                  </VisualState>
+                </VisualStateGroup>
+              </VisualStateManager.VisualStateGroups>
+              <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="1">
+                <Border BorderBrush="#FFFFFFFF" BorderThickness="2" CornerRadius="1">
+                  <Grid>
+                    <Grid.Resources>
+                      <ControlTemplate x:Key="PreviousButtonTemplate" TargetType="{x:Type Button}">
+                        <Grid Cursor="Hand">
+                          <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                              <VisualState x:Name="Normal"/>
+                              <VisualState x:Name="MouseOver">
+                                <Storyboard>
+                                  <ColorAnimation Duration="0" To="#FF73A9D8" Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)" Storyboard.TargetName="path"/>
+                                </Storyboard>
+                              </VisualState>
+                              <VisualState x:Name="Disabled">
+                                <Storyboard>
+                                  <DoubleAnimation Duration="0" To=".5" Storyboard.TargetProperty="(Shape.Fill).(Brush.Opacity)" Storyboard.TargetName="path"/>
+                                </Storyboard>
+                              </VisualState>
+                            </VisualStateGroup>
+                          </VisualStateManager.VisualStateGroups>
+                          <Rectangle Fill="#11E5EBF1" Opacity="1" Stretch="Fill"/>
+                          <Grid>
+                            <Path x:Name="path" Data="M288.75,232.25 L288.75,240.625 L283,236.625 z" Fill="#FF333333" HorizontalAlignment="Left" Height="20" Margin="14,-6,0,0" Stretch="Fill" VerticalAlignment="Center" Width="12"/>
+                          </Grid>
+                        </Grid>
+                      </ControlTemplate>
+                      <ControlTemplate x:Key="NextButtonTemplate" TargetType="{x:Type Button}">
+                        <Grid Cursor="Hand">
+                          <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                              <VisualState x:Name="Normal"/>
+                              <VisualState x:Name="MouseOver">
+                                <Storyboard>
+                                  <ColorAnimation Duration="0" To="#FF73A9D8" Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)" Storyboard.TargetName="path"/>
+                                </Storyboard>
+                              </VisualState>
+                              <VisualState x:Name="Disabled">
+                                <Storyboard>
+                                  <DoubleAnimation Duration="0" To=".5" Storyboard.TargetProperty="(Shape.Fill).(Brush.Opacity)" Storyboard.TargetName="path"/>
+                                </Storyboard>
+                              </VisualState>
+                            </VisualStateGroup>
+                          </VisualStateManager.VisualStateGroups>
+                          <Rectangle Fill="#11E5EBF1" Opacity="1" Stretch="Fill"/>
+                          <Grid>
+                            <Path x:Name="path" Data="M282.875,231.875 L282.875,240.375 L288.625,236 z" Fill="#FF333333" HorizontalAlignment="Right" Height="20" Margin="0,-6,14,0" Stretch="Fill" VerticalAlignment="Center" Width="12"/>
+                          </Grid>
+                        </Grid>
+                      </ControlTemplate>
+                      <ControlTemplate x:Key="HeaderButtonTemplate" TargetType="{x:Type Button}">
+                        <Grid Cursor="Hand">
+                          <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                              <VisualState x:Name="Normal"/>
+                              <VisualState x:Name="MouseOver">
+                                <Storyboard>
+                                  <ColorAnimation Duration="0" To="#FF73A9D8" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)" Storyboard.TargetName="buttonContent"/>
+                                </Storyboard>
+                              </VisualState>
+                              <VisualState x:Name="Disabled">
+                                <Storyboard>
+                                  <DoubleAnimation Duration="0" To=".5" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="buttonContent"/>
+                                </Storyboard>
+                              </VisualState>
+                            </VisualStateGroup>
+                          </VisualStateManager.VisualStateGroups>
+                          <ContentPresenter x:Name="buttonContent" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" TextElement.Foreground="#FF333333" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="1,4,1,9" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                        </Grid>
+                      </ControlTemplate>
+                    </Grid.Resources>
+                    <Grid.ColumnDefinitions>
+                      <ColumnDefinition Width="Auto"/>
+                      <ColumnDefinition Width="Auto"/>
+                      <ColumnDefinition Width="Auto"/>
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                      <RowDefinition Height="Auto"/>
+                      <RowDefinition Height="*"/>
+                    </Grid.RowDefinitions>
+                    <Button x:Name="PART_PreviousButton" Grid.Column="0" Focusable="False" HorizontalAlignment="Left" Height="20" Grid.Row="0" Template="{StaticResource PreviousButtonTemplate}" Width="30"/>
+                    <Button x:Name="PART_HeaderButton" Grid.Column="1" FontWeight="Bold" Focusable="False" FontSize="16" HorizontalAlignment="Center" Grid.Row="0" Template="{StaticResource HeaderButtonTemplate}" VerticalAlignment="Center"/>
+                    <Button x:Name="PART_NextButton" Grid.Column="2" Focusable="False" HorizontalAlignment="Right" Height="20" Grid.Row="0" Template="{StaticResource NextButtonTemplate}" Width="30"/>
+                    <Grid x:Name="PART_MonthView" Grid.ColumnSpan="3" HorizontalAlignment="Center" Margin="6,10,6,6" Grid.Row="1" Visibility="Visible">
+                      <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="Auto"/>
+                      </Grid.ColumnDefinitions>
+                      <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto"/>
+                      </Grid.RowDefinitions>
+                    </Grid>
+                    <Grid x:Name="PART_YearView" Grid.ColumnSpan="3" HorizontalAlignment="Center" Margin="6,35,6,6" Grid.Row="1" Visibility="Hidden">
+                      <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="Auto"/>
+                      </Grid.ColumnDefinitions>
+                      <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto"/>
+                      </Grid.RowDefinitions>
+                    </Grid>
+                  </Grid>
+                </Border>
+              </Border>
+              <Rectangle x:Name="PART_DisabledVisual" Fill="{StaticResource DisabledColor}" Opacity="0" RadiusY="2" RadiusX="2" Stretch="Fill" Stroke="{StaticResource DisabledColor}" StrokeThickness="1" Visibility="Collapsed"/>
+            </Grid>
+            <ControlTemplate.Triggers>
+              <Trigger Property="IsEnabled" Value="False">
+                <Setter Property="Visibility" TargetName="PART_DisabledVisual" Value="Visible"/>
+              </Trigger>
+              <DataTrigger Binding="{Binding DisplayMode, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Calendar}}}" Value="Year">
+                <Setter Property="Visibility" TargetName="PART_MonthView" Value="Hidden"/>
+                <Setter Property="Visibility" TargetName="PART_YearView" Value="Visible"/>
+              </DataTrigger>
+              <DataTrigger Binding="{Binding DisplayMode, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Calendar}}}" Value="Decade">
+                <Setter Property="Visibility" TargetName="PART_MonthView" Value="Hidden"/>
+                <Setter Property="Visibility" TargetName="PART_YearView" Value="Visible"/>
+              </DataTrigger>
+            </ControlTemplate.Triggers>
+          </ControlTemplate>
+        </Setter.Value>
+      </Setter>
+    </Style>
+
+    <Style x:Key="CalendarButtonStyle1" TargetType="{x:Type CalendarButton}">
+      <Setter Property="Background" Value="#FFBADDE9"/>
+      <Setter Property="MinWidth" Value="40"/>
+      <Setter Property="MinHeight" Value="42"/>
+      <Setter Property="FontSize" Value="10"/>
+      <Setter Property="HorizontalContentAlignment" Value="Center"/>
+      <Setter Property="VerticalContentAlignment" Value="Center"/>
+      <Setter Property="Template">
+        <Setter.Value>
+          <ControlTemplate TargetType="{x:Type CalendarButton}">
+            <Grid Width="105" Height="105">
+              <VisualStateManager.VisualStateGroups>
+                <VisualStateGroup x:Name="CommonStates">
+                  <VisualStateGroup.Transitions>
+                    <VisualTransition GeneratedDuration="0:0:0.1"/>
+                  </VisualStateGroup.Transitions>
+                  <VisualState x:Name="Normal"/>
+                  <VisualState x:Name="MouseOver">
+                    <Storyboard>
+                      <DoubleAnimation Duration="0" To=".5" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="Background"/>
+                    </Storyboard>
+                  </VisualState>
+                  <VisualState x:Name="Pressed">
+                    <Storyboard>
+                      <DoubleAnimation Duration="0" To=".5" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="Background"/>
+                    </Storyboard>
+                  </VisualState>
+                </VisualStateGroup>
+                <VisualStateGroup x:Name="SelectionStates">
+                  <VisualStateGroup.Transitions>
+                    <VisualTransition GeneratedDuration="0"/>
+                  </VisualStateGroup.Transitions>
+                  <VisualState x:Name="Unselected"/>
+                  <VisualState x:Name="Selected">
+                    <Storyboard>
+                      <DoubleAnimation Duration="0" To=".75" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="SelectedBackground"/>
+                    </Storyboard>
+                  </VisualState>
+                </VisualStateGroup>
+                <VisualStateGroup x:Name="ActiveStates">
+                  <VisualStateGroup.Transitions>
+                    <VisualTransition GeneratedDuration="0"/>
+                  </VisualStateGroup.Transitions>
+                  <VisualState x:Name="Active"/>
+                  <VisualState x:Name="Inactive">
+                    <Storyboard>
+                      <ColorAnimation Duration="0" To="#FF777777" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)" Storyboard.TargetName="NormalText"/>
+                    </Storyboard>
+                  </VisualState>
+                </VisualStateGroup>
+                <VisualStateGroup x:Name="CalendarButtonFocusStates">
+                  <VisualStateGroup.Transitions>
+                    <VisualTransition GeneratedDuration="0"/>
+                  </VisualStateGroup.Transitions>
+                  <VisualState x:Name="CalendarButtonFocused">
+                    <Storyboard>
+                      <ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetProperty="Visibility" Storyboard.TargetName="CalendarButtonFocusVisual">
+                        <DiscreteObjectKeyFrame KeyTime="0">
+                          <DiscreteObjectKeyFrame.Value>
+                            <Visibility>Visible</Visibility>
+                          </DiscreteObjectKeyFrame.Value>
+                        </DiscreteObjectKeyFrame>
+                      </ObjectAnimationUsingKeyFrames>
+                    </Storyboard>
+                  </VisualState>
+                  <VisualState x:Name="CalendarButtonUnfocused">
+                    <Storyboard>
+                      <ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetProperty="Visibility" Storyboard.TargetName="CalendarButtonFocusVisual">
+                        <DiscreteObjectKeyFrame KeyTime="0">
+                          <DiscreteObjectKeyFrame.Value>
+                            <Visibility>Collapsed</Visibility>
+                          </DiscreteObjectKeyFrame.Value>
+                        </DiscreteObjectKeyFrame>
+                      </ObjectAnimationUsingKeyFrames>
+                    </Storyboard>
+                  </VisualState>
+                </VisualStateGroup>
+              </VisualStateManager.VisualStateGroups>
+              <Rectangle x:Name="SelectedBackground" Fill="{TemplateBinding Background}" Opacity="0" RadiusY="1" RadiusX="1"/>
+              <Rectangle x:Name="Background" Fill="{TemplateBinding Background}" Opacity="0" RadiusY="1" RadiusX="1"/>
+              <ContentPresenter x:Name="NormalText" TextElement.Foreground="#FF333333" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="1,0,1,1" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" TextElement.FontSize="20"/>
+              <Rectangle x:Name="CalendarButtonFocusVisual" IsHitTestVisible="false" RadiusY="1" RadiusX="1" Stroke="#FF45D6FA" Visibility="Collapsed"/>
+            </Grid>
+            <ControlTemplate.Triggers>
+              <Trigger Property="IsFocused" Value="True">
+                <Setter Property="Visibility" TargetName="CalendarButtonFocusVisual" Value="Visible"/>
+              </Trigger>
+            </ControlTemplate.Triggers>
+          </ControlTemplate>
+        </Setter.Value>
+      </Setter>
+    </Style>
+
+    <Style x:Key="CalendarStyle1" TargetType="{x:Type Calendar}">
+      <Setter Property="Foreground" Value="#FF333333"/>
+      <Setter Property="CalendarDayButtonStyle" Value="{StaticResource CalendarDayButtonStyle}" />
+      <Setter Property="CalendarItemStyle" Value="{StaticResource CalendarItemStyle1}"/>
+      <Setter Property="CalendarButtonStyle" Value="{StaticResource CalendarButtonStyle1}"/>
+      <Setter Property="Background">
+        <Setter.Value>
+          <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+            <GradientStop Color="#FFE4EAF0" Offset="0"/>
+            <GradientStop Color="#FFECF0F4" Offset="0.16"/>
+            <GradientStop Color="#FFFCFCFD" Offset="0.16"/>
+            <GradientStop Color="#FFFFFFFF" Offset="1"/>
+          </LinearGradientBrush>
+        </Setter.Value>
+      </Setter>
+      <Setter Property="BorderBrush">
+        <Setter.Value>
+          <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+            <GradientStop Color="#FFA3AEB9" Offset="0"/>
+            <GradientStop Color="#FF8399A9" Offset="0.375"/>
+            <GradientStop Color="#FF718597" Offset="0.375"/>
+            <GradientStop Color="#FF617584" Offset="1"/>
+          </LinearGradientBrush>
+        </Setter.Value>
+      </Setter>
+      <Setter Property="BorderThickness" Value="1"/>
+      <Setter Property="Template">
+        <Setter.Value>
+          <ControlTemplate TargetType="{x:Type Calendar}">
+            <StackPanel x:Name="PART_Root" HorizontalAlignment="Center">
+              <CalendarItem x:Name="PART_CalendarItem" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Style="{TemplateBinding CalendarItemStyle}"/>
+            </StackPanel>
+          </ControlTemplate>
+        </Setter.Value>
+      </Setter>
+    </Style>
+
+    <Style x:Key="DatePickerStyle1" TargetType="{x:Type DatePicker}">
+      <Setter Property="Foreground" Value="#FF333333"/>
+      <Setter Property="IsTodayHighlighted" Value="True"/>
+      <Setter Property="SelectedDateFormat" Value="Short"/>
+      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="Padding" Value="2"/>
+      <Setter Property="Margin" Value="3"/>
+      <Setter Property="CalendarStyle" Value="{StaticResource CalendarStyle1}" />
+      <Setter Property="BorderBrush">
+        <Setter.Value>
+          <LinearGradientBrush EndPoint=".5,0" StartPoint=".5,1">
+            <GradientStop Color="#FFA3AEB9" Offset="0"/>
+            <GradientStop Color="#FF8399A9" Offset="0.375"/>
+            <GradientStop Color="#FF718597" Offset="0.375"/>
+            <GradientStop Color="#FF617584" Offset="1"/>
+          </LinearGradientBrush>
+        </Setter.Value>
+      </Setter>
+      <Setter Property="BorderThickness" Value="1"/>
+      <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+      <Setter Property="Template">
+        <Setter.Value>
+          <ControlTemplate TargetType="{x:Type DatePicker}">
+            <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}">
+              <VisualStateManager.VisualStateGroups>
+                <VisualStateGroup x:Name="CommonStates">
+                  <VisualState x:Name="Normal"/>
+                  <VisualState x:Name="Disabled">
+                    <Storyboard>
+                      <DoubleAnimation Duration="0" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_DisabledVisual"/>
+                    </Storyboard>
+                  </VisualState>
+                </VisualStateGroup>
+              </VisualStateManager.VisualStateGroups>
+              <Grid x:Name="PART_Root" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                <Grid.Resources>
+                  <SolidColorBrush x:Key="DisabledBrush" Color="#A5FFFFFF"/>
+                  <ControlTemplate x:Key="DropDownButtonTemplate" TargetType="{x:Type Button}">
+                    <Grid>
+                      <VisualStateManager.VisualStateGroups>
+                        <VisualStateGroup x:Name="CommonStates">
+                          <VisualStateGroup.Transitions>
+                            <VisualTransition GeneratedDuration="0"/>
+                            <VisualTransition GeneratedDuration="0:0:0.1" To="MouseOver"/>
+                            <VisualTransition GeneratedDuration="0:0:0.1" To="Pressed"/>
+                          </VisualStateGroup.Transitions>
+                          <VisualState x:Name="Normal"/>
+                          <VisualState x:Name="MouseOver">
+                            <Storyboard>
+                              <ColorAnimation Duration="0" To="#FF448DCA" Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)" Storyboard.TargetName="Background"/>
+                              <ColorAnimationUsingKeyFrames BeginTime="0" Duration="00:00:00.001" Storyboard.TargetProperty="(Border.Background).(GradientBrush.GradientStops)[3].(GradientStop.Color)" Storyboard.TargetName="BackgroundGradient">
+                                <SplineColorKeyFrame KeyTime="0" Value="#7FFFFFFF"/>
+                              </ColorAnimationUsingKeyFrames>
+                              <ColorAnimationUsingKeyFrames BeginTime="0" Duration="00:00:00.001" Storyboard.TargetProperty="(Border.Background).(GradientBrush.GradientStops)[2].(GradientStop.Color)" Storyboard.TargetName="BackgroundGradient">
+                                <SplineColorKeyFrame KeyTime="0" Value="#CCFFFFFF"/>
+                              </ColorAnimationUsingKeyFrames>
+                              <ColorAnimationUsingKeyFrames BeginTime="0" Duration="00:00:00.001" Storyboard.TargetProperty="(Border.Background).(GradientBrush.GradientStops)[1].(GradientStop.Color)" Storyboard.TargetName="BackgroundGradient">
+                                <SplineColorKeyFrame KeyTime="0" Value="#F2FFFFFF"/>
+                              </ColorAnimationUsingKeyFrames>
+                            </Storyboard>
+                          </VisualState>
+                          <VisualState x:Name="Pressed">
+                            <Storyboard>
+                              <ColorAnimationUsingKeyFrames BeginTime="0" Duration="00:00:00.001" Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)" Storyboard.TargetName="Background">
+                                <SplineColorKeyFrame KeyTime="0" Value="#FF448DCA"/>
+                              </ColorAnimationUsingKeyFrames>
+                              <DoubleAnimationUsingKeyFrames BeginTime="0" Duration="00:00:00.001" Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="Highlight">
+                                <SplineDoubleKeyFrame KeyTime="0" Value="1"/>
+                              </DoubleAnimationUsingKeyFrames>
+                              <ColorAnimationUsingKeyFrames BeginTime="0" Duration="00:00:00.001" Storyboard.TargetProperty="(Border.Background).(GradientBrush.GradientStops)[1].(GradientStop.Color)" Storyboard.TargetName="BackgroundGradient">
+                                <SplineColorKeyFrame KeyTime="0" Value="#EAFFFFFF"/>
+                              </ColorAnimationUsingKeyFrames>
+                              <ColorAnimationUsingKeyFrames BeginTime="0" Duration="00:00:00.001" Storyboard.TargetProperty="(Border.Background).(GradientBrush.GradientStops)[2].(GradientStop.Color)" Storyboard.TargetName="BackgroundGradient">
+                                <SplineColorKeyFrame KeyTime="0" Value="#C6FFFFFF"/>
+                              </ColorAnimationUsingKeyFrames>
+                              <ColorAnimationUsingKeyFrames BeginTime="0" Duration="00:00:00.001" Storyboard.TargetProperty="(Border.Background).(GradientBrush.GradientStops)[3].(GradientStop.Color)" Storyboard.TargetName="BackgroundGradient">
+                                <SplineColorKeyFrame KeyTime="0" Value="#6BFFFFFF"/>
+                              </ColorAnimationUsingKeyFrames>
+                              <ColorAnimationUsingKeyFrames BeginTime="0" Duration="00:00:00.001" Storyboard.TargetProperty="(Border.Background).(GradientBrush.GradientStops)[0].(GradientStop.Color)" Storyboard.TargetName="BackgroundGradient">
+                                <SplineColorKeyFrame KeyTime="0" Value="#F4FFFFFF"/>
+                              </ColorAnimationUsingKeyFrames>
+                            </Storyboard>
+                          </VisualState>
+                          <VisualState x:Name="Disabled"/>
+                        </VisualStateGroup>
+                      </VisualStateManager.VisualStateGroups>
+                      <Grid Background="#11FFFFFF" FlowDirection="LeftToRight" HorizontalAlignment="Center" Height="30" Margin="0" VerticalAlignment="Center" Width="30">
+                        <Grid.ColumnDefinitions>
+                          <ColumnDefinition Width="20*"/>
+                          <ColumnDefinition Width="20*"/>
+                          <ColumnDefinition Width="20*"/>
+                          <ColumnDefinition Width="20*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                          <RowDefinition Height="23*"/>
+                          <RowDefinition Height="19*"/>
+                          <RowDefinition Height="19*"/>
+                          <RowDefinition Height="19*"/>
+                        </Grid.RowDefinitions>
+                        <Border x:Name="Highlight" BorderBrush="#FF45D6FA" BorderThickness="1" Grid.ColumnSpan="4" CornerRadius="0,0,1,1" Margin="-1" Opacity="0" Grid.Row="0" Grid.RowSpan="4"/>
+                        <Border x:Name="Background" BorderBrush="#FFFFFFFF" BorderThickness="1" Background="#FF1F3B53" Grid.ColumnSpan="4" CornerRadius=".5" Margin="0,-1,0,0" Opacity="1" Grid.Row="1" Grid.RowSpan="3"/>
+                        <Border x:Name="BackgroundGradient" BorderBrush="#BF000000" BorderThickness="1" Grid.ColumnSpan="4" CornerRadius=".5" Margin="0,-1,0,0" Opacity="1" Grid.Row="1" Grid.RowSpan="3">
+                          <Border.Background>
+                            <LinearGradientBrush EndPoint=".7,1" StartPoint=".7,0">
+                              <GradientStop Color="#FFFFFFFF" Offset="0"/>
+                              <GradientStop Color="#F9FFFFFF" Offset="0.375"/>
+                              <GradientStop Color="#E5FFFFFF" Offset="0.625"/>
+                              <GradientStop Color="#C6FFFFFF" Offset="1"/>
+                            </LinearGradientBrush>
+                          </Border.Background>
+                        </Border>
+                        <Rectangle Grid.ColumnSpan="4" Grid.RowSpan="1" StrokeThickness="1">
+                          <Rectangle.Fill>
+                            <LinearGradientBrush EndPoint="0.3,-1.1" StartPoint="0.46,1.6">
+                              <GradientStop Color="#FF4084BD"/>
+                              <GradientStop Color="#FFAFCFEA" Offset="1"/>
+                            </LinearGradientBrush>
+                          </Rectangle.Fill>
+                          <Rectangle.Stroke>
+                            <LinearGradientBrush EndPoint="0.48,-1" StartPoint="0.48,1.25">
+                              <GradientStop Color="#FF494949"/>
+                              <GradientStop Color="#FF9F9F9F" Offset="1"/>
+                            </LinearGradientBrush>
+                          </Rectangle.Stroke>
+                        </Rectangle>
+                        <Path Grid.ColumnSpan="4" Grid.Column="0" Data="M11.426758,8.4305077 L11.749023,8.4305077 L11.749023,16.331387 L10.674805,16.331387 L10.674805,10.299648 L9.0742188,11.298672 L9.0742188,10.294277 C9.4788408,10.090176 9.9094238,9.8090878 10.365967,9.4510155 C10.82251,9.0929432 11.176106,8.7527733 11.426758,8.4305077 z M14.65086,8.4305077 L18.566387,8.4305077 L18.566387,9.3435936 L15.671368,9.3435936 L15.671368,11.255703 C15.936341,11.058764 16.27293,10.960293 16.681133,10.960293 C17.411602,10.960293 17.969301,11.178717 18.354229,11.615566 C18.739157,12.052416 18.931622,12.673672 18.931622,13.479336 C18.931622,15.452317 18.052553,16.438808 16.294415,16.438808 C15.560365,16.438808 14.951641,16.234707 14.468243,15.826504 L14.881817,14.929531 C15.368796,15.326992 15.837872,15.525723 16.289043,15.525723 C17.298809,15.525723 17.803692,14.895514 17.803692,13.635098 C17.803692,12.460618 17.305971,11.873379 16.310528,11.873379 C15.83071,11.873379 15.399232,12.079271 15.016094,12.491055 L14.65086,12.238613 z" Fill="#FF2F2F2F" HorizontalAlignment="Center" Margin="4,3,4,3" Grid.Row="1" Grid.RowSpan="3" RenderTransformOrigin="0.5,0.5" Stretch="Fill" VerticalAlignment="Center"/>
+                        <Ellipse Grid.ColumnSpan="4" Fill="#FFFFFFFF" HorizontalAlignment="Center" Height="3" StrokeThickness="0" VerticalAlignment="Center" Width="3"/>
+                        <Border x:Name="DisabledVisual" BorderBrush="#B2FFFFFF" BorderThickness="1" Grid.ColumnSpan="4" CornerRadius="0,0,.5,.5" Opacity="0" Grid.Row="0" Grid.RowSpan="4"/>
+                      </Grid>
+                    </Grid>
+                  </ControlTemplate>
+                </Grid.Resources>
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="*"/>
+                  <ColumnDefinition Width="Auto"/>
+                </Grid.ColumnDefinitions>
+                <Button x:Name="PART_Button" Grid.Column="1" Foreground="{TemplateBinding Foreground}" Focusable="False" HorizontalAlignment="Left" Margin="3,0,3,0" Grid.Row="0" Template="{StaticResource DropDownButtonTemplate}" VerticalAlignment="Top" Width="30" Height="30"/>
+                <DatePickerTextBox x:Name="PART_TextBox" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="Stretch" Grid.Row="0" VerticalContentAlignment="Stretch"/>
+                <Grid x:Name="PART_DisabledVisual" Grid.ColumnSpan="2" Grid.Column="0" IsHitTestVisible="False" Opacity="0" Grid.Row="0">
+                  <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="Auto"/>
+                  </Grid.ColumnDefinitions>
+                  <Rectangle Grid.Column="0" Fill="#A5FFFFFF" RadiusY="1" Grid.Row="0" RadiusX="1" Width="100"/>
+                  <Rectangle Grid.Column="1" Fill="#A5FFFFFF" Height="30" Margin="3,0,3,0" RadiusY="1" Grid.Row="0" RadiusX="1" Width="30"/>
+                  <Popup x:Name="PART_Popup" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=PART_TextBox}" StaysOpen="False"/>
+                </Grid>
+              </Grid>
+            </Border>
+            <ControlTemplate.Triggers>
+              <DataTrigger Binding="{Binding Source={x:Static SystemParameters.HighContrast}}" Value="false">
+                <Setter Property="Foreground" TargetName="PART_TextBox" Value="{Binding Foreground, RelativeSource={RelativeSource TemplatedParent}}"/>
+              </DataTrigger>
+            </ControlTemplate.Triggers>
+          </ControlTemplate>
+        </Setter.Value>
+      </Setter>
+    </Style>
+
+  </Window.Resources>
+
   <Grid Margin="5">
     <Grid.RowDefinitions>
       <RowDefinition Height="90"/>
-      <RowDefinition Height="170"/>
+      <RowDefinition Height="200"/>
       <RowDefinition Height="1*"/>
     </Grid.RowDefinitions>
     <Grid.ColumnDefinitions>
@@ -14,22 +588,25 @@
     </Grid.ColumnDefinitions>
     <Border Grid.Row="0"
             Grid.Column="0" Grid.ColumnSpan="2" BorderThickness="1" BorderBrush="LightGray">
-      <FourComponentWeightClient:WeightControl x:Name="weightCtl" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="2"/>
+      <Canvas>
+        <FourComponentWeightClient:WeightControl x:Name="weightCtl" Margin="2"/>
+        <Button  x:Name="goodsSetBtn" Width="80" Height="35" Content="产品设置" Canvas.Left="250" VerticalAlignment="Top" Margin="4" Click="goodsSetBtn_Click"/>
+        <Button x:Name="discontSetBtn" Width="80" Height="35" Content="扣重设置"  Canvas.Left="250" Canvas.Top="40" Margin="5" Click="discontSetBtn_Click"/>
+      </Canvas>
     </Border>
     <Border Grid.Row="1"
             Grid.Column="0"  BorderThickness="1" Margin="0,5,0,0" BorderBrush="LightGray">
       <DockPanel LastChildFill="True">
-        <Button DockPanel.Dock="Top" x:Name="goodsSetBtn" Width="120" Height="40" Content="产品设置" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,2,2,0" Click="goodsSetBtn_Click"/>
-        <WrapPanel x:Name="goodsPanel" Orientation="Horizontal" Margin="0,2,2,0"></WrapPanel>
+        <WrapPanel x:Name="goodsPanel" Orientation="Horizontal" Margin="0,2,2,0">
+        </WrapPanel>
       </DockPanel>
     </Border>
 
     <Border Grid.Row="2" Grid.Column="0" BorderThickness="1" Margin="0,5,0,0" BorderBrush="LightGray">
       <DockPanel LastChildFill="True">
         <StackPanel DockPanel.Dock="Top" Orientation="Horizontal" HorizontalAlignment="Right" >
-          <TextBlock Margin="0,10,10,0" Text="总扣重"/>
-          <TextBlock x:Name="totalDiscontLbl" Margin="10,10,10,0" Width="50" Foreground ="Red" Text="0"/>
-          <Button x:Name="discontSetBtn" Width="120" Height="40" Content="扣重设置" Margin="0,2,2,0" Click="discontSetBtn_Click"/>
+          <TextBlock Margin="0,5,10,0" Text="总扣重"/>
+          <TextBlock x:Name="totalDiscontLbl" Margin="10,5,10,0" Width="50" Foreground ="Red" Text="0"/>
         </StackPanel>
         <DataGrid HorizontalAlignment="Stretch" HeadersVisibility="Column" x:Name="discontGrid" EnableColumnVirtualization="True" EnableRowVirtualization="True" AutoGenerateColumns="False" CanUserAddRows="False" Margin="5" RowHeight="50">
           <DataGrid.Columns>
@@ -58,9 +635,13 @@
     <Border Grid.Row="1" Grid.Column="2" Grid.RowSpan="2" BorderThickness="1" Margin="5,5,0,0" BorderBrush="LightGray">
       <DockPanel LastChildFill="True">
         <StackPanel DockPanel.Dock="Top" Orientation="Horizontal" HorizontalAlignment="Right" >
-          <TextBlock Margin="10,10,10,0" Width="65" Text="宰杀日期"/>
-          <DatePicker x:Name="datePicker"/>
-          <Button x:Name="queryBtn" Width="120" Height="40" Content="刷新" Margin="0,2,2,0" Click="queryBtn_Click"/>
+          <TextBlock Margin="0,10,5,0" Text="吊牌号"/>
+          <TextBox x:Name="MinInput" Width="50" Height="30" PreviewMouseDown="DiaoPaiBox_PreviewMouseDown"/>
+          <TextBlock Margin="0,10,0,0" Text="~"/>
+          <TextBox x:Name="MaxInput" Width="50" Height="30" PreviewMouseDown="DiaoPaiBox_PreviewMouseDown"/>
+          <TextBlock Margin="10,10,5,0" Text="宰杀日期"/>
+          <DatePicker x:Name="datePicker" Style="{DynamicResource DatePickerStyle1}"/>
+          <Button x:Name="queryBtn" Width="120" Height="40" Content="刷新" Margin="20,2,5,0" Click="queryBtn_Click"/>
         </StackPanel>
         <DataGrid HorizontalAlignment="Stretch" HeadersVisibility="Column" x:Name="weightGrid" EnableColumnVirtualization="True" EnableRowVirtualization="True" AutoGenerateColumns="False" CanUserAddRows="False" Margin="5" RowHeight="50">
           <DataGrid.RowStyle>
diff --git a/FourComponentWeightClient/FCWeightForm.xaml.cs b/FourComponentWeightClient/FCWeightForm.xaml.cs
index f183821..0ba714b 100644
--- a/FourComponentWeightClient/FCWeightForm.xaml.cs
+++ b/FourComponentWeightClient/FCWeightForm.xaml.cs
@@ -26,6 +26,8 @@ namespace FourComponentWeightClient
 
     ObservableCollection<DiscontSetting> discontList;
     ObservableCollection<FourComponentWeight> weightList;
+    int? minDiaoPai = null;
+    int? maxDiaoPai = null;
     public FCWeightForm()
     {
       InitializeComponent();
@@ -59,19 +61,16 @@ namespace FourComponentWeightClient
       }
     }
 
-    string[] gNames = new string[] { "牛肩", "牛前", "牛后" };
+    string[] gNames = new string[] { "牛肩", "牛前", "牛后", "带骨牛前" };
     void BindGoodsBtns()
     {
       goodsPanel.Children.Clear();
-      var list = GoodsSetting.Load();
-      if (list.Any(x => x.Goods_ID != 0))
+      var list = GoodsSetting.Load().Where(x => x.Goods_ID > 0);
+      foreach (var item in list)
       {
-        for (var i = 0; i < gNames.Length; i++)
-        {
-          var btn = new Button { Content = gNames[i], Tag = list[i], Margin = new Thickness(25), Width = 115, Height = 60 };
-          btn.Click += btn_Click;
-          goodsPanel.Children.Add(btn);
-        }
+        var btn = new Button { Content = gNames[item.Type], Tag = item, Margin = new Thickness(25, 15, 25, 15), Width = 115, Height = 60 };
+        btn.Click += btn_Click;
+        goodsPanel.Children.Add(btn);
       }
     }
 
@@ -146,7 +145,7 @@ namespace FourComponentWeightClient
 
     private void queryBtn_Click(object sender, RoutedEventArgs e)
     {
-      weightList = FourComponentWeightBL.LoadList(datePicker.SelectedDate.Value);
+      weightList = FourComponentWeightBL.LoadList(datePicker.SelectedDate.Value, minDiaoPai, maxDiaoPai);
       weightGrid.ItemsSource = weightList;
     }
 
@@ -182,5 +181,30 @@ namespace FourComponentWeightClient
         weightList.Remove(item);
       }
     }
+
+    private void DiaoPaiBox_PreviewMouseDown(object sender, MouseButtonEventArgs e)
+    {
+      var keyPad = new Keypad(this);
+      if (keyPad.ShowDialog() == true)
+      {
+        var box = sender as TextBox;
+        int dp = 0;
+        int? v = null;
+        if (string.IsNullOrEmpty(keyPad.Result))
+        {
+          box.Clear();
+          v = null;
+        }
+        else if (int.TryParse(keyPad.Result, out dp))
+        {
+          box.Text = dp.ToString();
+          v = dp;
+        }
+        if (box.Equals(MinInput))
+          minDiaoPai = v;
+        else
+          maxDiaoPai = v;
+      }
+    }
   }
 }
diff --git a/FourComponentWeightClient/FourComponentWeightClient.csproj b/FourComponentWeightClient/FourComponentWeightClient.csproj
index 65002c2..858abe6 100644
--- a/FourComponentWeightClient/FourComponentWeightClient.csproj
+++ b/FourComponentWeightClient/FourComponentWeightClient.csproj
@@ -36,6 +36,9 @@
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>logo.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Forks.JsonRpc.Client, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7254430f49d10aae, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -169,7 +172,9 @@
   <ItemGroup>
     <Resource Include="images\setting.png" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Resource Include="logo.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/FourComponentWeightClient/GoodsSettingWindow.xaml b/FourComponentWeightClient/GoodsSettingWindow.xaml
index 898cb6f..7e34e44 100644
--- a/FourComponentWeightClient/GoodsSettingWindow.xaml
+++ b/FourComponentWeightClient/GoodsSettingWindow.xaml
@@ -1,7 +1,7 @@
 <Window x:Class="FourComponentWeightClient.GoodsSettingWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="存货设置" Height="300" Width="300" ShowInTaskbar="False"
+        Title="存货设置" Height="400" Width="300" ShowInTaskbar="False"
         WindowStartupLocation="CenterOwner" ResizeMode="NoResize" FontSize="16">
   <Grid Margin="10">
     <Grid.RowDefinitions>
@@ -9,6 +9,7 @@
       <RowDefinition/>
       <RowDefinition/>
       <RowDefinition/>
+      <RowDefinition/>
     </Grid.RowDefinitions>
     <Grid.ColumnDefinitions>
       <ColumnDefinition Width="1*"/>
@@ -23,6 +24,9 @@
     <TextBlock Grid.Row="2" Text="牛后" HorizontalAlignment="Center" VerticalAlignment="Center"/>
     <TextBox Grid.Row="2" Grid.Column="1" x:Name="nh" Margin="4,12" Padding="5" VerticalContentAlignment="Center"/>
 
-    <Button Grid.Row="3" Grid.Column="1" Content="保存" Width="120" Height="40" HorizontalAlignment="Left" Click="Button_Click"/>
+    <TextBlock Grid.Row="3" Text="带骨牛前" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+    <TextBox Grid.Row="3" Grid.Column="1" x:Name="dgnq" Margin="4,12" Padding="5" VerticalContentAlignment="Center"/>
+
+    <Button Grid.Row="4" Grid.Column="1" Content="保存" Width="120" Height="40" HorizontalAlignment="Left" Click="Button_Click"/>
   </Grid>
 </Window>
diff --git a/FourComponentWeightClient/GoodsSettingWindow.xaml.cs b/FourComponentWeightClient/GoodsSettingWindow.xaml.cs
index fcc07ff..82553e0 100644
--- a/FourComponentWeightClient/GoodsSettingWindow.xaml.cs
+++ b/FourComponentWeightClient/GoodsSettingWindow.xaml.cs
@@ -26,16 +26,15 @@ namespace FourComponentWeightClient
     public GoodsSettingWindow()
     {
       InitializeComponent();
-      ctls = new List<TextBox> { nj, nq, nh };
+      ctls = new List<TextBox> { nj, nq, nh, dgnq };
       list = GoodsSetting.Load();
-      if (list.Count == 0)
-      {
-        for (var i = 0; i < ctls.Count;i++ )
-          list.Add(new GoodsSetting() { Type = i });
-      }
       for (var i = 0; i < ctls.Count; i++)
       {
-        ctls[i].Text = list[i].Goods_ID.ToString();
+        var f = list.FirstOrDefault(x => x.Type == i);
+        if (f == null)
+          list.Add(new GoodsSetting() { Type = i });
+        else
+          ctls[i].Text = f.Goods_ID.ToString();
         ctls[i].PreviewMouseDown += nj_PreviewMouseDown;
       }
     }
@@ -49,7 +48,7 @@ namespace FourComponentWeightClient
 
     private void Button_Click(object sender, RoutedEventArgs e)
     {
-      for (var i = 0; i < ctls.Count;i++ )
+      for (var i = 0; i < ctls.Count; i++)
         list[i].Goods_ID = long.Parse(ctls[i].Text);
 
       if (list.Any(x => x.Goods_ID == 0))
diff --git a/FourComponentWeightClient/logo.ico b/FourComponentWeightClient/logo.ico
new file mode 100644
index 0000000..532b53b
Binary files /dev/null and b/FourComponentWeightClient/logo.ico differ