diff --git a/View/StuffView.xaml b/View/StuffView.xaml index 3c66de1..070e556 100644 --- a/View/StuffView.xaml +++ b/View/StuffView.xaml @@ -115,7 +115,7 @@ - + diff --git a/View/StuffView.xaml.cs b/View/StuffView.xaml.cs index cefbf2d..79e628a 100644 --- a/View/StuffView.xaml.cs +++ b/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转存储数值 + } + + } } }