diff --git a/ConvertMoels/ColorSQLConvert.cs b/ConvertMoels/ColorSQLConvert.cs
index 4a68a5b..abf02e0 100644
--- a/ConvertMoels/ColorSQLConvert.cs
+++ b/ConvertMoels/ColorSQLConvert.cs
@@ -7,18 +7,37 @@ using System.Threading.Tasks;
using System.Windows.Data;
using System.Windows;
-namespace Audit.ConvertModels
+namespace Audit.ConvertMoels
{
- [ValueConversion(typeof(string), typeof(string))]
- internal class ColorSQLConvert : IValueConverter
+ ///
+ ///
+ ///
+ public class ColorSQLConvert : IValueConverter
{
+ ///
+ ///
+ ///
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
- //int colorValue = (int)value;
- return "";
+ if (value != null)
+ {
+ string colorValue = string.Format("{0:X6}", (int)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);//获取绿色参数
+ string StuffColor_R = colorValue.Substring(4, 2);//获取红色参数
+ string StuffColor = "#FF" + StuffColor_R + StuffColor_G + StuffColor_B;//RGB数值拼接为ARGB数值
+ return StuffColor;//返回RGB数值例“#FFC0C0C0”
+ }
+ else
+ {
+ return "";//返回白色RGB数值
+ }
}
-
+ ///
+ ///
+ ///
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{
return "";
diff --git a/View/StuffView.xaml b/View/StuffView.xaml
index d592631..20ec37e 100644
--- a/View/StuffView.xaml
+++ b/View/StuffView.xaml
@@ -4,7 +4,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Audit.View"
- xmlns:Convert="clr-namespace:Audit.ConvertModels"
+ xmlns:Convert="clr-namespace:Audit.ConvertMoels"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
mc:Ignorable="d" DataContext="{Binding Source={StaticResource Locator},Path=Stuff}"
d:DesignHeight="900" d:DesignWidth="1140"
@@ -101,7 +101,7 @@
-
+
diff --git a/View/StuffView.xaml.cs b/View/StuffView.xaml.cs
index f7f914a..679e012 100644
--- a/View/StuffView.xaml.cs
+++ b/View/StuffView.xaml.cs
@@ -48,14 +48,14 @@ namespace Audit.View
string DataGridStuff_Price = (DataGridStuff.Columns[3].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位第2列选中行单元格,价格
string DataGridStuff_ProductUnit = (DataGridStuff.Columns[4].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位第3列选中行单元格,供应商
string DataGridStuff_ProductType = (DataGridStuff.Columns[5].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位第4列选中行单元格,类型
- // string DataGridStuff_Color = (DataGridStuff.Columns[6].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位第5列选中行单元格,色彩
+ //string DataGridStuff_Color = (DataGridStuff.Columns[6].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位第5列选中行单元格,色彩
string DataGridStuff_Concentration = (DataGridStuff.Columns[7].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位第6列选中行单元格,浓度
string DataGridStuff_GRAVITY = (DataGridStuff.Columns[8].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位第7列选中行单元格,比重
stuff_ProductCode.Text = DataGridStuff_ProductCode.ToString();//填入原料代码
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-粉体助剂。冰填入