|
|
@ -693,11 +693,11 @@ namespace formula_manage |
|
|
Name_ = r[0].ItemArray[1].ToString(); |
|
|
Name_ = r[0].ItemArray[1].ToString(); |
|
|
Type_ = r[0].ItemArray[2].ToString(); |
|
|
Type_ = r[0].ItemArray[2].ToString(); |
|
|
Conc_ = r[0].ItemArray[3].ToString(); |
|
|
Conc_ = r[0].ItemArray[3].ToString(); |
|
|
|
|
|
Conc_ = (double.Parse(Conc_)/100).ToString(); |
|
|
if (double.TryParse(list_Weight.Text, out ang)) |
|
|
// if (double.TryParse(list_Weight.Text, out ang))
|
|
|
{ |
|
|
// {
|
|
|
Weight_ = double.Parse(list_Weight.Text) * double.Parse(Conc_) / 100; |
|
|
// Weight_ = double.Parse(list_Weight.Text) * double.Parse(Conc_) / 100;
|
|
|
} |
|
|
// }
|
|
|
|
|
|
|
|
|
if ((Type_ == "0") || (Type_ == "3")) |
|
|
if ((Type_ == "0") || (Type_ == "3")) |
|
|
{ |
|
|
{ |
|
|
@ -860,6 +860,7 @@ namespace formula_manage |
|
|
Name_ = r[0].ItemArray[1].ToString(); |
|
|
Name_ = r[0].ItemArray[1].ToString(); |
|
|
Type_ = r[0].ItemArray[2].ToString(); |
|
|
Type_ = r[0].ItemArray[2].ToString(); |
|
|
Conc_ = r[0].ItemArray[3].ToString(); |
|
|
Conc_ = r[0].ItemArray[3].ToString(); |
|
|
|
|
|
Conc_ = (double.Parse(Conc_)/100).ToString(); |
|
|
|
|
|
|
|
|
if (double.TryParse(list_Weight.Text, out ang)) |
|
|
if (double.TryParse(list_Weight.Text, out ang)) |
|
|
{ |
|
|
{ |
|
|
@ -927,6 +928,7 @@ namespace formula_manage |
|
|
Code_ = r[0].ItemArray[0].ToString(); |
|
|
Code_ = r[0].ItemArray[0].ToString(); |
|
|
Type_ = r[0].ItemArray[2].ToString(); |
|
|
Type_ = r[0].ItemArray[2].ToString(); |
|
|
Conc_ = r[0].ItemArray[3].ToString(); |
|
|
Conc_ = r[0].ItemArray[3].ToString(); |
|
|
|
|
|
Conc_ = (double.Parse(Conc_) / 100).ToString(); |
|
|
|
|
|
|
|
|
if (double.TryParse(list_Weight.Text, out ang)) |
|
|
if (double.TryParse(list_Weight.Text, out ang)) |
|
|
{ |
|
|
{ |
|
|
|