Merge branch 'master' of http://scddns.f3322.net:13000/sc/Audit_APP

View/StuffView.xaml

@@ -115,7 +115,7 @@
                 <ComboBoxItem Content="粉体助剂"></ComboBoxItem>
             </ComboBox>
             <TextBlock HorizontalAlignment="Left" Height="30" Margin="560,0,0,100" TextWrapping="Wrap" Text="原料类型" VerticalAlignment="Bottom" Width="100" FontSize="20"/>
-            <TextBox x:Name="stuff_Color" MouseDoubleClick="Stuff_Color_MouseDoubleClick"  HorizontalAlignment="Left" Height="30" Margin="445,0,0,50" Text="" VerticalAlignment="Bottom" Width="80" FontSize="16" MaxLines="1" MaxLength="25" IsReadOnly="True"/>
+            <TextBox x:Name="stuff_Color" MouseDoubleClick="Stuff_Color_MouseDoubleClick"  HorizontalAlignment="Left" Height="30" Margin="445,0,0,50" Text="" VerticalAlignment="Bottom" Width="80" MaxLines="1" IsReadOnly="True"/>
             <TextBlock HorizontalAlignment="Left" Height="30" Margin="400,0,0,50" TextWrapping="Wrap" Text="色彩" VerticalAlignment="Bottom" Width="50" FontSize="20"/>
             <TextBox x:Name="stuff_ProductUnit" HorizontalAlignment="Left" Height="30" Margin="105,0,0,50" Text="" VerticalAlignment="Bottom" Width="130" FontSize="16" MaxLines="1" MaxLength="25"/>
             <TextBlock HorizontalAlignment="Left" Height="30" Margin="15,0,0,50" TextWrapping="Wrap" Text="供应商" VerticalAlignment="Bottom" Width="80" FontSize="20"/>

View/StuffView.xaml.cs

@@ -55,7 +55,7 @@ namespace Audit.View
             stuff_ProductName.Text = DataGridStuff_ProductName.ToString();//填入原料名称
             stuff_Price.Text = DataGridStuff_Price.ToString();//填入价格
             stuff_ProductUnit.Text = DataGridStuff_ProductUnit.ToString();//填入供应商           
-            stuff_Color.Text = DataGridStuff_Color.ToString();//填入色彩
+           // stuff_Color.Text = DataGridStuff_Color.ToString();//填入色彩
             stuff_Concentration.Text = DataGridStuff_Concentration.ToString();//填入浓度
             stuff_GRAVITY.Text = DataGridStuff_GRAVITY.ToString();//填入比重
             if (DataGridStuff_ProductType.ToString() == "0") stuff_ProductType.Text = "染料";//判断类型1-染料。2-助剂。3-粉体助剂。冰填入
@@ -72,7 +72,14 @@ namespace Audit.View
                 System.Windows.Media.Color MColor = new System.Windows.Media.Color();//转换
                 MColor = System.Windows.Media.Color.FromArgb(DColor.A, DColor.R, DColor.G, DColor.B);//配置ARGB参数
                 stuff_Color.Background = new SolidColorBrush(MColor);//ARGB参数输出至stuff_Color的背景色
+                stuff_Color.Foreground = new SolidColorBrush(MColor);//ARGB参数输出至stuff_Color的前景色
+                string colorCode = Convert.ToString(DColor.B,16) + Convert.ToString(DColor.G,16) + Convert.ToString(DColor.R,16);//反向十六进制RGB
+                //string colorCode = Convert.ToString(DColor.R,16) + Convert.ToString(DColor.G,16) + Convert.ToString(DColor.B,16);//正向十六进制RGB
+                int ColorCode_SQL = Convert.ToInt32(colorCode, 16);//十六进制RGB转存储数值
+
             }
+
+            
         }
     }
 }