diff --git a/Audit.csproj b/Audit.csproj
index 239091b..3f92eb9 100644
--- a/Audit.csproj
+++ b/Audit.csproj
@@ -143,6 +143,7 @@
+
diff --git a/ConvertMoels/ColorSQLConvert.cs b/ConvertMoels/ColorSQLConvert.cs
index 06b9348..469a323 100644
--- a/ConvertMoels/ColorSQLConvert.cs
+++ b/ConvertMoels/ColorSQLConvert.cs
@@ -5,10 +5,8 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Data;
-using System.Windows;
namespace Audit.ConvertMoels
-
{
///
/// RGB色彩数值转换器
@@ -21,19 +19,19 @@ namespace Audit.ConvertMoels
///
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
- 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数值
+ 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数值
}
}
///
diff --git a/ConvertMoels/ProductTypeSQLConvert.cs b/ConvertMoels/ProductTypeSQLConvert.cs
new file mode 100644
index 0000000..3da0f98
--- /dev/null
+++ b/ConvertMoels/ProductTypeSQLConvert.cs
@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace Audit.ConvertMoels
+{
+ ///
+ /// 原料类型数值转换器
+ /// 将类型数值转换为类型名称返回
+ ///
+ internal class ProductTypeSQLConvert : IValueConverter
+ {
+ ///
+ ///
+ ///
+ public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ if ((int)value == 0)
+ {
+ return "染料";
+ }
+ else
+ {
+ if ((int)value == 1)
+ {
+ return "助剂";
+ }
+ else
+ {
+ if ((int)value == 2)
+ {
+ return "粉体助剂";
+ }
+ else
+ {
+ if ((int)value == 3)
+ {
+ return "液体染料";
+ }
+ else
+ {
+ return "未知类型";
+ }
+ }
+ }
+ }
+ }
+ ///
+ ///
+ public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ return "";
+ }
+ }
+}
diff --git a/View/StuffView.xaml b/View/StuffView.xaml
index 6d475f4..11317fc 100644
--- a/View/StuffView.xaml
+++ b/View/StuffView.xaml
@@ -11,6 +11,7 @@
xmlns:mah="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro">
+
@@ -55,7 +56,8 @@
-
+
+