diff --git a/Audit.csproj b/Audit.csproj index cdcf799..239091b 100644 --- a/Audit.csproj +++ b/Audit.csproj @@ -142,7 +142,7 @@ Designer - + diff --git a/Convert/ColorSQLConvert.cs b/ConvertMoels/ColorSQLConvert.cs similarity index 88% rename from Convert/ColorSQLConvert.cs rename to ConvertMoels/ColorSQLConvert.cs index b52f9a3..4a68a5b 100644 --- a/Convert/ColorSQLConvert.cs +++ b/ConvertMoels/ColorSQLConvert.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; using System.Windows.Data; using System.Windows; -namespace Audit.ColorSQLConvert +namespace Audit.ConvertModels { [ValueConversion(typeof(string), typeof(string))] @@ -15,7 +15,7 @@ namespace Audit.ColorSQLConvert { public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { - int colorValue = (int)value; + //int colorValue = (int)value; return ""; } diff --git a/View/StuffView.xaml b/View/StuffView.xaml index 15bebab..d592631 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:ColorSQLConvert="clr-namespace:Audit.ColorSQLConvert" + xmlns:Convert="clr-namespace:Audit.ConvertModels" 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" @@ -52,7 +52,7 @@ - + @@ -101,7 +101,7 @@ - + diff --git a/View/StuffView.xaml.cs b/View/StuffView.xaml.cs index 15e0081..f7f914a 100644 --- a/View/StuffView.xaml.cs +++ b/View/StuffView.xaml.cs @@ -48,7 +48,7 @@ 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();//填入原料代码