Merge branch 'master' of http://192.168.0.12:13000/sc/Audit_APP
This commit is contained in:
commit
46c75813dc
3 files changed
+26
-24
No files matched your search
+2
-2
@@ -93,7 +93,7 @@
|
||||
<!--原料代码-->
|
||||
<TextBox x:Name="stuff_ProductCode" HorizontalAlignment="Left" Height="30" Margin="105,0,0,100" Text=""
|
||||
VerticalAlignment="Bottom" Width="130" FontSize="16" MaxLines="1" MaxLength="25"
|
||||
InputMethod.IsInputMethodEnabled="False" xml:space="preserve"/>
|
||||
InputMethod.IsInputMethodEnabled="False"/>
|
||||
<TextBlock HorizontalAlignment="Left" Height="30" Margin="15,0,0,100" TextWrapping="Wrap" Text="原料代码"
|
||||
VerticalAlignment="Bottom" Width="100" FontSize="20"/>
|
||||
<!--原料名称-->
|
||||
@@ -111,7 +111,7 @@
|
||||
<TextBlock HorizontalAlignment="Left" Height="30" Margin="560,0,0,100" TextWrapping="Wrap" Text="原料类型"
|
||||
VerticalAlignment="Bottom" Width="100" FontSize="20"/>
|
||||
<!--色彩-->
|
||||
<TextBox x:Name="stuff_Color" HorizontalAlignment="Left" Height="30" Margin="445,0,0,50" Text=""
|
||||
<TextBox x:Name="stuff_Color" HorizontalAlignment="Left" Height="30" Margin="445,0,0,50"
|
||||
VerticalAlignment="Bottom" Width="80" MaxLines="1" IsReadOnly="True" Cursor="Arrow"
|
||||
MouseDoubleClick="Stuff_Color_MouseDoubleClick"/>
|
||||
<TextBlock HorizontalAlignment="Left" Height="30" Margin="400,0,0,50" TextWrapping="Wrap" Text="色彩"
|
||||
|
||||
+23
-21
@@ -34,8 +34,8 @@ namespace Audit.View
|
||||
InitializeComponent();
|
||||
}
|
||||
|
||||
private Product product = new Product();
|
||||
private Product product_Codetemp = new Product();
|
||||
private Product product = new Product();//最终存入sql的实体
|
||||
private Product product_temp = new Product();//取出自sql的实体缓存
|
||||
|
||||
private void Button_Preservation(object sender, RoutedEventArgs e)//保存按钮事件
|
||||
{
|
||||
@@ -77,7 +77,7 @@ namespace Audit.View
|
||||
product.GRAVITY = Double.Parse(this.stuff_GRAVITY.Text);//写入原料比重
|
||||
product.Concentration = Double.Parse(this.stuff_Concentration.Text);//写入原料浓度
|
||||
product.ProductType = int_stuff_ProductType;//写入原料类型
|
||||
var countwd = new ProductProvider().Delete(product_Codetemp);//删除数据库原目标信息。
|
||||
var countwd = new ProductProvider().Delete(product_temp);//删除数据库原目标信息。
|
||||
var count = new ProductProvider().Insert(product);//添加数据库信息。
|
||||
if (count == 0)//判断执行是否成功
|
||||
{
|
||||
@@ -107,23 +107,25 @@ namespace Audit.View
|
||||
int rownum = DataGridStuff.SelectedIndex;//获取鼠标选中行并定义变量
|
||||
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[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_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_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_Concentration.Text = DataGridStuff_Concentration.ToString();//填入浓度
|
||||
stuff_GRAVITY.Text = DataGridStuff_GRAVITY.ToString();//填入比重
|
||||
/*定位选中行及指定列单元格文本信息*/
|
||||
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[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_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_ProductCode.Text = DataGridStuff_ProductCode.Trim();//原料代码,去除空白字符
|
||||
stuff_ProductName.Text = DataGridStuff_ProductName.Trim();//原料名称,去除空白字符
|
||||
stuff_Price.Text = DataGridStuff_Price;//价格
|
||||
stuff_ProductType.Text = DataGridStuff_ProductType;//类型
|
||||
stuff_ProductUnit.Text = DataGridStuff_ProductUnit;//供应商
|
||||
/*stuff_Color.Text = DataGridStuff_Color;//色彩数据*/
|
||||
stuff_Concentration.Text = DataGridStuff_Concentration;//浓度
|
||||
stuff_GRAVITY.Text = DataGridStuff_GRAVITY;//比重
|
||||
/*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 = "粉体助剂";*/
|
||||
@@ -135,7 +137,7 @@ namespace Audit.View
|
||||
{
|
||||
stuff_Color.Background = new SolidColorBrush(System.Windows.Media.Color.FromArgb(255, 255, 255, 255));//白色传递至色彩框背景色
|
||||
}
|
||||
product_Codetemp.ProductCode = stuff_ProductCode.Text;
|
||||
product_temp.ProductCode = DataGridStuff_ProductCode;//写入sql实体缓存
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -43,7 +43,7 @@ namespace Audit.ViewModel
|
||||
{
|
||||
products = new ProductProvider().Select();
|
||||
DispatcherTimer timer = new DispatcherTimer();//每5秒调用一次Tick_Event
|
||||
timer.Interval = TimeSpan.FromSeconds(1);
|
||||
timer.Interval = TimeSpan.FromSeconds(5);
|
||||
timer.Tick += Tick_Event;
|
||||
timer.Start();
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user