Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
This commit is contained in:
commit
c884ef0c34
6 files changed
+137
-91
No files matched your search
@@ -78,7 +78,7 @@
|
||||
<TextBlock HorizontalAlignment="Left" Height="30" Margin="15,0,0,100" TextWrapping="Wrap" Text="代码"
|
||||
VerticalAlignment="Bottom" Width="40" FontSize="20"/>
|
||||
<!--名称-->
|
||||
<TextBox x:Name="Name" HorizontalAlignment="Left" Height="30" Margin="255,0,0,100" Text=""
|
||||
<TextBox x:Name="name" HorizontalAlignment="Left" Height="30" Margin="255,0,0,100" Text=""
|
||||
VerticalAlignment="Bottom" Width="120" FontSize="22" MaxLines="1" MaxLength="25"
|
||||
InputMethod.IsInputMethodEnabled="False"/>
|
||||
<TextBlock HorizontalAlignment="Left" Height="30" Margin="205,0,0,100" TextWrapping="Wrap" Text="名称"
|
||||
|
||||
@@ -41,7 +41,7 @@ namespace formula_manage.Windows
|
||||
InitializeComponent();
|
||||
}
|
||||
|
||||
private async void Dissolve_Loaded(object sender, RoutedEventArgs e)//打开页面执行
|
||||
private void Dissolve_Loaded(object sender, RoutedEventArgs e)//打开页面执行
|
||||
{
|
||||
UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);//生效配置读取
|
||||
this.DatagridDissolve.LoadingRow += new EventHandler<DataGridRowEventArgs>(this.DataGridEquipment_LoadingRow);//生成序列号
|
||||
@@ -105,7 +105,7 @@ namespace formula_manage.Windows
|
||||
{
|
||||
/*定位选中行及指定列单元格文本信息*/
|
||||
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();//
|
||||
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();//
|
||||
@@ -127,7 +127,7 @@ namespace formula_manage.Windows
|
||||
string Dissolve_sql;
|
||||
int int_ion = 0;
|
||||
|
||||
if ((Name.Text == "") ||(Code.Text == ""))
|
||||
if ((name.Text == "") ||(Code.Text == ""))
|
||||
{
|
||||
System.Windows.MessageBox.Show("请输入代码或名称");
|
||||
return;
|
||||
@@ -173,7 +173,7 @@ namespace formula_manage.Windows
|
||||
if (count == 0)
|
||||
{
|
||||
Dissolve_sql = string.Format("INSERT INTO[Dispensing].[dbo].[Dissolve](DissolveCode ,DissolveName ,REMARK ,MaterialType ,WeightMIN ,WeightMAX) " +
|
||||
"VALUES ('" + Code.Text + "','" + Name.Text + "','" + Remark.Text + "','" + int_ion + "','"+ min.Text + "','" + max.Text + "')");
|
||||
"VALUES ('" + Code.Text + "','" + name.Text + "','" + Remark.Text + "','" + int_ion + "','"+ min.Text + "','" + max.Text + "')");
|
||||
await conn_SC.OpenAsync(); //打开数据连接
|
||||
SqlCommand INSERT_cmd = new SqlCommand(Dissolve_sql, conn_SC);
|
||||
int sql_in = INSERT_cmd.ExecuteNonQuery(); //执行语句
|
||||
@@ -190,7 +190,7 @@ namespace formula_manage.Windows
|
||||
}
|
||||
else
|
||||
{
|
||||
Dissolve_sql = string.Format("UPDATE [dbo].[Dissolve] SET DissolveName ='" + Name.Text + "',REMARK='" + Remark.Text + "',MaterialType='" + int_ion + "',WeightMIN='" + min.Text + "',WeightMAX='" + max.Text + "' Where DissolveCode ='" + Code.Text + "'");
|
||||
Dissolve_sql = string.Format("UPDATE [dbo].[Dissolve] SET DissolveName ='" + name.Text + "',REMARK='" + Remark.Text + "',MaterialType='" + int_ion + "',WeightMIN='" + min.Text + "',WeightMAX='" + max.Text + "' Where DissolveCode ='" + Code.Text + "'");
|
||||
await conn_SC.OpenAsync(); //打开数据连接
|
||||
SqlCommand INSERT_cmd = new SqlCommand(Dissolve_sql, conn_SC);
|
||||
int sql_in = INSERT_cmd.ExecuteNonQuery(); //执行语句
|
||||
|
||||
Reference in new issue
Block a user