diff --git a/Audit.csproj b/Audit.csproj
index f1eee4e..2614377 100644
--- a/Audit.csproj
+++ b/Audit.csproj
@@ -84,6 +84,26 @@
false
+
+ true
+ bin\x86\Debug\
+ DEBUG;TRACE
+ bin\Debug\Audit.xml
+ full
+ x86
+ 7.3
+ prompt
+
+
+ bin\x86\Release\
+ TRACE
+ true
+ pdbonly
+ x86
+ 7.3
+ prompt
+ true
+
packages\CommonServiceLocator.2.0.6\lib\net48\CommonServiceLocator.dll
diff --git a/Audit.sln b/Audit.sln
index c8a536e..76e34f5 100644
--- a/Audit.sln
+++ b/Audit.sln
@@ -11,26 +11,36 @@ Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
+ Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
+ Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{43516CC3-DB11-401F-AC40-94676C508BB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{43516CC3-DB11-401F-AC40-94676C508BB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{43516CC3-DB11-401F-AC40-94676C508BB9}.Debug|x64.ActiveCfg = Debug|Any CPU
{43516CC3-DB11-401F-AC40-94676C508BB9}.Debug|x64.Build.0 = Debug|Any CPU
+ {43516CC3-DB11-401F-AC40-94676C508BB9}.Debug|x86.ActiveCfg = Debug|x86
+ {43516CC3-DB11-401F-AC40-94676C508BB9}.Debug|x86.Build.0 = Debug|x86
{43516CC3-DB11-401F-AC40-94676C508BB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{43516CC3-DB11-401F-AC40-94676C508BB9}.Release|Any CPU.Build.0 = Release|Any CPU
{43516CC3-DB11-401F-AC40-94676C508BB9}.Release|x64.ActiveCfg = Release|x64
{43516CC3-DB11-401F-AC40-94676C508BB9}.Release|x64.Build.0 = Release|x64
+ {43516CC3-DB11-401F-AC40-94676C508BB9}.Release|x86.ActiveCfg = Release|x86
+ {43516CC3-DB11-401F-AC40-94676C508BB9}.Release|x86.Build.0 = Release|x86
{2B23C1BD-0231-4F0C-A142-A220C75FFE5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2B23C1BD-0231-4F0C-A142-A220C75FFE5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2B23C1BD-0231-4F0C-A142-A220C75FFE5B}.Debug|x64.ActiveCfg = Debug|Any CPU
{2B23C1BD-0231-4F0C-A142-A220C75FFE5B}.Debug|x64.Build.0 = Debug|Any CPU
+ {2B23C1BD-0231-4F0C-A142-A220C75FFE5B}.Debug|x86.ActiveCfg = Debug|x86
+ {2B23C1BD-0231-4F0C-A142-A220C75FFE5B}.Debug|x86.Build.0 = Debug|x86
{2B23C1BD-0231-4F0C-A142-A220C75FFE5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2B23C1BD-0231-4F0C-A142-A220C75FFE5B}.Release|Any CPU.Build.0 = Release|Any CPU
{2B23C1BD-0231-4F0C-A142-A220C75FFE5B}.Release|x64.ActiveCfg = Release|x64
{2B23C1BD-0231-4F0C-A142-A220C75FFE5B}.Release|x64.Build.0 = Release|x64
+ {2B23C1BD-0231-4F0C-A142-A220C75FFE5B}.Release|x86.ActiveCfg = Release|x86
+ {2B23C1BD-0231-4F0C-A142-A220C75FFE5B}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/ConvertMoels/ColorSQLConvert.cs b/ConvertMoels/ColorSQLConvert.cs
index 019dd52..848ee02 100644
--- a/ConvertMoels/ColorSQLConvert.cs
+++ b/ConvertMoels/ColorSQLConvert.cs
@@ -22,7 +22,7 @@ namespace Audit.ConvertMoels
if (value != null)
{
string colorValue = string.Format("{0:X6}", value);//十进制RGB数值转十六进制六位RGB并补0位例“C0C0C0”
- //string StuffColor = "#FF" + colorValue;//RGB数值拼接为ARGB数值（正向）
+ /*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);//获取红色参数
@@ -31,7 +31,7 @@ namespace Audit.ConvertMoels
}
else
{
- return null;//返回白色RGB数值
+ return null;//返回空
}
}
///
diff --git a/ConvertMoels/ProductTypeSQLConvert.cs b/ConvertMoels/ProductTypeSQLConvert.cs
index 04a8bf9..d95a9d8 100644
--- a/ConvertMoels/ProductTypeSQLConvert.cs
+++ b/ConvertMoels/ProductTypeSQLConvert.cs
@@ -19,7 +19,7 @@ namespace Audit.ConvertMoels
///
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
- if ((int)value == 0)
+ if ((int)value == 0)//类型0：染料，1：助剂，2：粉体助剂，3：液体染料，其它:未知
{
return "染料";
}
diff --git a/Models/DyelotsBulkedRecipeProvider.cs b/Models/DyelotsBulkedRecipeProvider.cs
index f2ba7db..7b3c931 100644
--- a/Models/DyelotsBulkedRecipeProvider.cs
+++ b/Models/DyelotsBulkedRecipeProvider.cs
@@ -8,7 +8,7 @@ namespace Models
{
public class DyelotsBulkedRecipeProvider : IProvider
{
- private BatchDyeingCentralEntities db = new BatchDyeingCentralEntities();
+ private readonly BatchDyeingCentralEntities db = new BatchDyeingCentralEntities();
public int Delete(DyelotsBulkedRecipe t)
{
diff --git a/Models/Models.csproj b/Models/Models.csproj
index f2cfa26..e1699c0 100644
--- a/Models/Models.csproj
+++ b/Models/Models.csproj
@@ -48,6 +48,24 @@
7.3
prompt
+
+ true
+ bin\x86\Debug\
+ DEBUG;TRACE
+ full
+ x86
+ 7.3
+ prompt
+
+
+ bin\x86\Release\
+ TRACE
+ true
+ pdbonly
+ x86
+ 7.3
+ prompt
+
..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll
diff --git a/View/StuffView.xaml.cs b/View/StuffView.xaml.cs
index a1c99ca..9599b2b 100644
--- a/View/StuffView.xaml.cs
+++ b/View/StuffView.xaml.cs
@@ -50,21 +50,21 @@ 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_Color.Background = (DataGridStuff.Columns[6].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Background;//定位第5列选中行单元格，色彩，背景色传递至色彩框背景色
+ /*stuff_Color.Background = (DataGridStuff.Columns[6].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Background;//定位第5列选中行单元格，色彩，背景色传递至色彩框背景色*/
stuff_ProductCode.Text = DataGridStuff_ProductCode.ToString();//填入原料代码
stuff_ProductName.Text = DataGridStuff_ProductName.ToString();//填入原料名称
stuff_Price.Text = DataGridStuff_Price.ToString();//填入价格
stuff_ProductType.Text = DataGridStuff_ProductType.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-粉体助剂。填入
- //if (DataGridStuff_ProductType.ToString() == "1") stuff_ProductType.Text = "助剂";
- //if (DataGridStuff_ProductType.ToString() == "2") stuff_ProductType.Text = "粉体助剂";
+ /*if (DataGridStuff_ProductType.ToString() == "0") stuff_ProductType.Text = "染料";//判断类型1-染料。2-助剂。3-粉体助剂。填入
+ if (DataGridStuff_ProductType.ToString() == "1") stuff_ProductType.Text = "助剂";
+ if (DataGridStuff_ProductType.ToString() == "2") stuff_ProductType.Text = "粉体助剂";*/
if ((DataGridStuff.Columns[6].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Background != null) //定位第5列选中行单元格，色彩，判断参数是否有效
{
stuff_Color.Background = (DataGridStuff.Columns[6].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Background; //定位第5列选中行单元格，色彩，有效背景色传递至色彩框背景色