sc/formula_manage
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: sc/formula_manage:3c41c2f1508a67a13cb24e75317219aa1f1fce2f
sc/formula_manage:master
...
compare: sc/formula_manage:57b2d5b35697d608c59372034ebe6d84f948da4e
sc/formula_manage:master
2 Commits
3c41c2f150 ... 57b2d5b356
Author SHA1 Message Date
sc 57b2d5b356 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-04-18 15:30:36 +08:00
sc 6471eec033 目标重量换算问题修复 2024-04-18 15:30:34 +08:00
1 changed files with 7 additions and 5 deletions
Expand all files Collapse all files
MainWindow.xaml.cs
+7 -5
View File
@@ -693,11 +693,11 @@ namespace formula_manage
Name_ = r[0].ItemArray[1].ToString();
Type_ = r[0].ItemArray[2].ToString();
Conc_ = r[0].ItemArray[3].ToString();
if (double.TryParse(list_Weight.Text, out ang))
{
Weight_ = double.Parse(list_Weight.Text) * double.Parse(Conc_) / 100;
}
Conc_ = (double.Parse(Conc_)/100).ToString();
// if (double.TryParse(list_Weight.Text, out ang))
// {
// Weight_ = double.Parse(list_Weight.Text) * double.Parse(Conc_) / 100;
// }
if ((Type_ == "0") || (Type_ == "3"))
{
@@ -860,6 +860,7 @@ namespace formula_manage
Name_ = r[0].ItemArray[1].ToString();
Type_ = r[0].ItemArray[2].ToString();
Conc_ = r[0].ItemArray[3].ToString();
Conc_ = (double.Parse(Conc_)/100).ToString();
if (double.TryParse(list_Weight.Text, out ang))
{
@@ -927,6 +928,7 @@ namespace formula_manage
Code_ = r[0].ItemArray[0].ToString();
Type_ = r[0].ItemArray[2].ToString();
Conc_ = r[0].ItemArray[3].ToString();
Conc_ = (double.Parse(Conc_) / 100).ToString();
if (double.TryParse(list_Weight.Text, out ang))
{