diff --git a/Windows/Dissolve.xaml.cs b/Windows/Dissolve.xaml.cs index daa8a62..c7882b7 100644 --- a/Windows/Dissolve.xaml.cs +++ b/Windows/Dissolve.xaml.cs @@ -104,12 +104,12 @@ namespace formula_manage.Windows if (rownum != -1)//判断鼠标定位是否有效 { /*定位选中行及指定列单元格文本信息*/ - Code.Text = (DatagridDissolve.Columns[1].GetCellContent(DatagridDissolve.Items[rownum]) as TextBlock).Text.Trim();//定位第列 - name.Text = (DatagridDissolve.Columns[2].GetCellContent(DatagridDissolve.Items[rownum]) as TextBlock).Text.Trim();// - ion.Text = (DatagridDissolve.Columns[3].GetCellContent(DatagridDissolve.Items[rownum]) as TextBlock).Text.Trim();// - min.Text = (DatagridDissolve.Columns[4].GetCellContent(DatagridDissolve.Items[rownum]) as TextBlock).Text.Trim();// - max.Text = (DatagridDissolve.Columns[5].GetCellContent(DatagridDissolve.Items[rownum]) as TextBlock).Text.Trim();// - Remark.Text = (DatagridDissolve.Columns[6].GetCellContent(DatagridDissolve.Items[rownum]) as TextBlock).Text.Trim();// + Code.Text = (DatagridDissolve.Columns[1].GetCellContent(DatagridDissolve.Items[rownum]) as TextBlock).Text.TrimEnd();//定位第列 + name.Text = (DatagridDissolve.Columns[2].GetCellContent(DatagridDissolve.Items[rownum]) as TextBlock).Text.TrimEnd();// + ion.Text = (DatagridDissolve.Columns[3].GetCellContent(DatagridDissolve.Items[rownum]) as TextBlock).Text.TrimEnd();// + min.Text = (DatagridDissolve.Columns[4].GetCellContent(DatagridDissolve.Items[rownum]) as TextBlock).Text.TrimEnd();// + max.Text = (DatagridDissolve.Columns[5].GetCellContent(DatagridDissolve.Items[rownum]) as TextBlock).Text.TrimEnd();// + Remark.Text = (DatagridDissolve.Columns[6].GetCellContent(DatagridDissolve.Items[rownum]) as TextBlock).Text.TrimEnd();// } } diff --git a/Windows/Machine.xaml.cs b/Windows/Machine.xaml.cs index a363b77..aba9f92 100644 --- a/Windows/Machine.xaml.cs +++ b/Windows/Machine.xaml.cs @@ -130,13 +130,13 @@ namespace formula_manage.Windows if (rownum != -1)//判断鼠标定位是否有效 { /*定位选中行及指定列单元格文本信息*/ - mac_Name.Text = (DataGridMac.Columns[1].GetCellContent(DataGridMac.Items[rownum]) as TextBlock).Text.Trim();//定位第列 - mac_MacGroup.Text = (DataGridMac.Columns[2].GetCellContent(DataGridMac.Items[rownum]) as TextBlock).Text.Trim();// - mac_Capacity.Text = (DataGridMac.Columns[3].GetCellContent(DataGridMac .Items[rownum]) as TextBlock).Text.Trim();// - mac_Volume.Text = (DataGridMac.Columns[4].GetCellContent(DataGridMac.Items[rownum]) as TextBlock).Text.Trim();// - mac_Industry.Text = (DataGridMac.Columns[5].GetCellContent(DataGridMac.Items[rownum]) as TextBlock).Text.Trim();// - mac_Categories.Text = (DataGridMac.Columns[6].GetCellContent(DataGridMac.Items[rownum]) as TextBlock).Text.Trim();// - mac_Note.Text = (DataGridMac.Columns[7].GetCellContent(DataGridMac.Items[rownum]) as TextBlock).Text.Trim();// + mac_Name.Text = (DataGridMac.Columns[1].GetCellContent(DataGridMac.Items[rownum]) as TextBlock).Text.TrimEnd();//定位第列 + mac_MacGroup.Text = (DataGridMac.Columns[2].GetCellContent(DataGridMac.Items[rownum]) as TextBlock).Text.TrimEnd();// + mac_Capacity.Text = (DataGridMac.Columns[3].GetCellContent(DataGridMac .Items[rownum]) as TextBlock).Text.TrimEnd();// + mac_Volume.Text = (DataGridMac.Columns[4].GetCellContent(DataGridMac.Items[rownum]) as TextBlock).Text.TrimEnd();// + mac_Industry.Text = (DataGridMac.Columns[5].GetCellContent(DataGridMac.Items[rownum]) as TextBlock).Text.TrimEnd();// + mac_Categories.Text = (DataGridMac.Columns[6].GetCellContent(DataGridMac.Items[rownum]) as TextBlock).Text.TrimEnd();// + mac_Note.Text = (DataGridMac.Columns[7].GetCellContent(DataGridMac.Items[rownum]) as TextBlock).Text.TrimEnd();// } } diff --git a/Windows/Stuff.xaml.cs b/Windows/Stuff.xaml.cs index 38bdc28..fae317f 100644 --- a/Windows/Stuff.xaml.cs +++ b/Windows/Stuff.xaml.cs @@ -347,14 +347,14 @@ namespace formula_manage.Windows if (rownum != -1)//判断鼠标定位是否有效 { /*定位选中行及指定列单元格文本信息*/ - string DataGridStuff_ProductCode = (DataGridStuff.Columns[1].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位第0列，原料代码 - string DataGridStuff_ProductName = (DataGridStuff.Columns[2].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位第1列，原料名称 - string DataGridStuff_Price = (DataGridStuff.Columns[8].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位，价格 - string DataGridstuff_SUPPLIER = (DataGridStuff.Columns[9].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位，供应商 - string DataGridStuff_ProductType = (DataGridStuff.Columns[3].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位，类型 //string DataGridStuff_Color = (DataGridStuff.Columns[6].GetCellContent(DataGridStuff.Items[rownum])as TextBlock).Text;//定位，色彩 - string DataGridStuff_Concentration = (DataGridStuff.Columns[6].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位选中行单元格文本信息 - string DataGridStuff_stuff_ion = (DataGridStuff.Columns[4].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位选中行单元格文本信息并去除空白字符，浓度 - string DataGridStuff_GRAVITY = (DataGridStuff.Columns[7].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text;//定位，比重 + string DataGridStuff_ProductCode = (DataGridStuff.Columns[1].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text.TrimEnd();//定位第0列，原料代码 + string DataGridStuff_ProductName = (DataGridStuff.Columns[2].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text.TrimEnd();//定位第1列，原料名称 + string DataGridStuff_Price = (DataGridStuff.Columns[8].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text.TrimEnd();//定位，价格 + string DataGridstuff_SUPPLIER = (DataGridStuff.Columns[9].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text.TrimEnd();//定位，供应商 + string DataGridStuff_ProductType = (DataGridStuff.Columns[3].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text.TrimEnd();//定位，类型 //string DataGridStuff_Color = (DataGridStuff.Columns[6].GetCellContent(DataGridStuff.Items[rownum])as TextBlock).Text;//定位，色彩 + string DataGridStuff_Concentration = (DataGridStuff.Columns[6].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text.TrimEnd();//定位选中行单元格文本信息 + string DataGridStuff_stuff_ion = (DataGridStuff.Columns[4].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text.TrimEnd();//定位选中行单元格文本信息并去除空白字符，浓度 + string DataGridStuff_GRAVITY = (DataGridStuff.Columns[7].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Text.TrimEnd();//定位，比重 /*stuff_Color.Background = (DataGridStuff.Columns[6].GetCellContent(DataGridStuff.Items[rownum]) as TextBlock).Background;//定位，色彩，背景色传递至色彩框背景色*/ /*填写信息至指定文本框*/ //product_temp.ProductCode = DataGridStuff_ProductCode;//写入sql实体缓存 diff --git a/Windows/fabric.xaml.cs b/Windows/fabric.xaml.cs index 8894f34..4ab64f7 100644 --- a/Windows/fabric.xaml.cs +++ b/Windows/fabric.xaml.cs @@ -230,10 +230,10 @@ namespace formula_manage.Windows if (rownum != -1)//判断鼠标定位是否有效 { /*定位选中行及指定列单元格文本信息*/ - fabric_code.Text = (DataGridfabric.Columns[1].GetCellContent(DataGridfabric.Items[rownum]) as TextBlock).Text;//定位第0列，代码 - fabric_name.Text = (DataGridfabric.Columns[2].GetCellContent(DataGridfabric.Items[rownum]) as TextBlock).Text;//定位第1列，名称 - fabric_Remark.Text = (DataGridfabric.Columns[4].GetCellContent(DataGridfabric.Items[rownum]) as TextBlock).Text;//定位， - fabric_GYard.Text = (DataGridfabric.Columns[3].GetCellContent(DataGridfabric.Items[rownum]) as TextBlock).Text;//定位， + fabric_code.Text = (DataGridfabric.Columns[1].GetCellContent(DataGridfabric.Items[rownum]) as TextBlock).Text.TrimEnd();//定位第0列，代码 + fabric_name.Text = (DataGridfabric.Columns[2].GetCellContent(DataGridfabric.Items[rownum]) as TextBlock).Text.TrimEnd();//定位第1列，名称 + fabric_Remark.Text = (DataGridfabric.Columns[4].GetCellContent(DataGridfabric.Items[rownum]) as TextBlock).Text.TrimEnd();//定位， + fabric_GYard.Text = (DataGridfabric.Columns[3].GetCellContent(DataGridfabric.Items[rownum]) as TextBlock).Text.TrimEnd();//定位， } }