Merge branch 'master' of http://192.168.0.12:13000/sc/Audit_APP

ConvertMoels/ColorSQLConvert.cs

@@ -21,7 +21,7 @@ namespace Audit.ConvertMoels
         {
             if (value != null)
             {
-                string colorValue = string.Format("{0:X6}", (int)value);//十进制RGB数值转十六进制六位RGB并补0位例“C0C0C0”
+                string colorValue = string.Format("{0:X6}", value);//十进制RGB数值转十六进制六位RGB并补0位例“C0C0C0”
                                                                         //string StuffColor = "#FF" +  colorValue;//RGB数值拼接为ARGB数值（正向）
                 string StuffColor_B = colorValue.Substring(0, 2);//获取蓝色参数
                 string StuffColor_G = colorValue.Substring(2, 2);//获取绿色参数
@@ -31,14 +31,14 @@ namespace Audit.ConvertMoels
             }
             else
             {
-                return "";//返回白色RGB数值
+                return null;//返回白色RGB数值
             }
         }
     /// <summary> 
     /// </summary>
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            return "";
+            return null;
         }
     }
 }

ConvertMoels/ProductTypeSQLConvert.cs

@@ -53,7 +53,7 @@ namespace Audit.ConvertMoels
         /// </summary>
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            return "";
+            return null;
         }
     }
 }

View/StuffView.xaml

@@ -75,10 +75,10 @@
                     <DataGridTextColumn Header="比重" Width="70" FontSize="15" Binding="{Binding GRAVITY}" MaxWidth="200" MinWidth="20" CanUserReorder="False"/>
                 </DataGrid.Columns>
             </DataGrid>
-            <RadioButton Content="染料" x:Name="Button_0" GroupName="button" BindingGroup="{Binding Button_ProductType}" HorizontalAlignment="Left" Height="40" Margin="995,265,0,0" VerticalAlignment="Top" Width="100" FontSize="18" BorderBrush="{x:Null}" Background="{x:Null}" Grid.Column="1"/>
-            <RadioButton Content="助剂" x:Name="Button_1" GroupName="button" BindingGroup="{Binding Button_ProductType}" HorizontalAlignment="Left" Height="40" Margin="995,305,0,0" VerticalAlignment="Top" Width="100" FontSize="18" BorderBrush="{x:Null}" Background="{x:Null}" Grid.Column="1"/>
-            <RadioButton Content="粉体助剂" x:Name="Button_2" GroupName="button" BindingGroup="{Binding Button_ProductType}" HorizontalAlignment="Left" Height="40" Margin="995,345,0,0" VerticalAlignment="Top" Width="100" FontSize="18" BorderBrush="{x:Null}" Background="{x:Null}" Grid.Column="1"/>
-            <RadioButton Content="全部原料" x:Name="Button_all" GroupName="button" BindingGroup="{Binding Button_ProductType}" HorizontalAlignment="Left" Height="40" Margin="995,385,0,0" VerticalAlignment="Top" Width="100" FontSize="18" BorderBrush="{x:Null}" Background="{x:Null}" Grid.Column="1" IsChecked="True"/>
+            <RadioButton Content="染料" x:Name="Button_0" GroupName="button" HorizontalAlignment="Left" Height="40" Margin="995,265,0,0" VerticalAlignment="Top" Width="100" FontSize="18" BorderBrush="{x:Null}" Background="{x:Null}" Grid.Column="1"/>
+            <RadioButton Content="助剂" x:Name="Button_1" GroupName="button" HorizontalAlignment="Left" Height="40" Margin="995,305,0,0" VerticalAlignment="Top" Width="100" FontSize="18" BorderBrush="{x:Null}" Background="{x:Null}" Grid.Column="1"/>
+            <RadioButton Content="粉体助剂" x:Name="Button_2" GroupName="button" HorizontalAlignment="Left" Height="40" Margin="995,345,0,0" VerticalAlignment="Top" Width="100" FontSize="18" BorderBrush="{x:Null}" Background="{x:Null}" Grid.Column="1"/>
+            <RadioButton Content="全部原料" x:Name="Button_all" GroupName="button" HorizontalAlignment="Left" Height="40" Margin="995,385,0,0" VerticalAlignment="Top" Width="100" FontSize="18" BorderBrush="{x:Null}" Background="{x:Null}" Grid.Column="1" IsChecked="True"/>
             <TextBox x:Name="stuff_ProductCode" HorizontalAlignment="Left" Height="30" Margin="105,0,0,100" Text="" VerticalAlignment="Bottom" Width="130" FontSize="16" MaxLines="1" MaxLength="25"/>
             <TextBlock HorizontalAlignment="Left" Height="30" Margin="15,0,0,100" TextWrapping="Wrap" Text="原料代码" VerticalAlignment="Bottom" Width="100" FontSize="20"/>
             <TextBox x:Name="stuff_ProductName" HorizontalAlignment="Left" Height="30" Margin="345,0,0,100" Text="" VerticalAlignment="Bottom" Width="200" FontSize="16" MaxLines="1" MaxLength="25"/>