diff --git a/ConvertMoels/ColorSQLConvert.cs b/ConvertMoels/ColorSQLConvert.cs index d71244c..a44f757 100644 --- a/ConvertMoels/ColorSQLConvert.cs +++ b/ConvertMoels/ColorSQLConvert.cs @@ -14,12 +14,12 @@ namespace Audit.ConvertMoels /// public class ColorSQLConvert : IValueConverter { - /// - /// + /// + /// public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { if (value != null) - { + { string colorValue = string.Format("{0:X6}", value);//十进制RGB数值转十六进制六位RGB并补0位例“C0C0C0” /*string StuffColor = "#FF" + colorValue;//RGB数值拼接为ARGB数值(正向)*/ string StuffColor_B = colorValue.Substring(0, 2);//获取蓝色参数 diff --git a/View/StuffView.xaml.cs b/View/StuffView.xaml.cs index d6edd17..052fc12 100644 --- a/View/StuffView.xaml.cs +++ b/View/StuffView.xaml.cs @@ -18,6 +18,7 @@ using System.Drawing; using System.Text.RegularExpressions; using Models; using Audit.ViewModel; +using Audit.ConvertMoels; namespace Audit.View { @@ -63,7 +64,7 @@ namespace Audit.View else { if (int_stuff_ProductType == 0)//判断是否为染料,非染料写空 - { + { if (ColorCode_SQL >= 0) product.Color = ColorCode_SQL;//判断色彩数据是否有效,有效写入 } else