gaofei
/
HJGL_DS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: gaofei:9a4cdcc36a5468da08fc6c5fc18519770907aa75
Branches Tags
gaofei:master
..
compare: gaofei:cb84240b73b3d85b758ba90b76aa3167a8e107f8
Branches Tags
gaofei:master

No commits in common. "9a4cdcc36a5468da08fc6c5fc18519770907aa75" and "cb84240b73b3d85b758ba90b76aa3167a8e107f8" have entirely different histories.
9a4cdcc36a ... cb84240b73

2 changed files with 0 additions and 45 deletions
Show Stats Expand all files Collapse all files

15
HJGL_DS/FineUIPro.Web/Global.asax.cs
View File

@ -563,11 +563,6 @@
materialType = "TiⅡ,TiⅠ"; materialType = "TiⅡ,TiⅠ";
materialTypeName = "钛合金"; materialTypeName = "钛合金";
} }
else if (queProject[1].Trim().Contains("Zr"))
{
materialType = "Zr";
materialTypeName = "其它";
}
else if (queProject[1].Trim().Contains("TiⅠ")) else if (queProject[1].Trim().Contains("TiⅠ"))
{ {
materialType = "TiⅠ"; materialType = "TiⅠ";
@ -617,11 +612,6 @@
materialType = "Zr5"; materialType = "Zr5";
materialTypeName = "其它"; materialTypeName = "其它";
} }
else if (queProject[1].Trim().Contains("Zr"))
{
materialType = "Zr";
materialTypeName = "其它";
}
else if (queProject[1].Trim().Contains("TiⅡ")) else if (queProject[1].Trim().Contains("TiⅡ"))
{ {
materialType = "TiⅡ,TiⅠ"; materialType = "TiⅡ,TiⅠ";
@ -665,11 +655,6 @@
materialType = "TiⅠ"; materialType = "TiⅠ";
materialTypeName = "钛合金"; materialTypeName = "钛合金";
} }
else if (queProject[1].Trim().Contains("Zr"))
{
materialType = "Zr";
materialTypeName = "其它";
}
else else
{ {
materialType = queProject[1].Trim(); materialType = queProject[1].Trim();

30
HJGL_DS/FineUIPro.Web/Welder/QualifiedProject.aspx.cs
View File

@ -469,11 +469,6 @@ namespace FineUIPro.Web.Welder
materialType = "TiⅠ"; materialType = "TiⅠ";
materialTypeName = "钛合金"; materialTypeName = "钛合金";
} }
else if (queProject[1].Trim().Contains("Zr"))
{
materialType = "Zr";
materialTypeName = "其它";
}
else else
{ {
materialType = "FeⅣ,FeⅢ,FeⅡ,FeⅠ"; materialType = "FeⅣ,FeⅢ,FeⅡ,FeⅠ";
@ -528,11 +523,6 @@ namespace FineUIPro.Web.Welder
materialType = "TiⅠ"; materialType = "TiⅠ";
materialTypeName = "钛合金"; materialTypeName = "钛合金";
} }
else if (queProject[1].Trim().Contains("Zr"))
{
materialType = "Zr";
materialTypeName = "其它";
}
else else
{ {
materialType = queProject[1].Trim(); materialType = queProject[1].Trim();
@ -556,11 +546,6 @@ namespace FineUIPro.Web.Welder
materialType = "TiⅠ"; materialType = "TiⅠ";
materialTypeName = "钛合金"; materialTypeName = "钛合金";
} }
else if (queProject[1].Trim().Contains("Zr"))
{
materialType = "Zr";
materialTypeName = "其它";
}
else else
{ {
materialType = queProject[1].Trim(); materialType = queProject[1].Trim();
@ -812,11 +797,6 @@ namespace FineUIPro.Web.Welder
materialType = "Zr5"; materialType = "Zr5";
materialTypeName = "其它"; materialTypeName = "其它";
} }
else if (queProject[1].Trim().Contains("Zr"))
{
materialType = "Zr";
materialTypeName = "其它";
}
else else
{ {
materialType = "FeⅣ,FeⅢ,FeⅡ,FeⅠ"; materialType = "FeⅣ,FeⅢ,FeⅡ,FeⅠ";
@ -861,11 +841,6 @@ namespace FineUIPro.Web.Welder
materialType = "Zr5"; materialType = "Zr5";
materialTypeName = "其它"; materialTypeName = "其它";
} }
else if (queProject[1].Trim().Contains("Zr"))
{
materialType = "Zr";
materialTypeName = "其它";
}
else else
{ {
materialType = queProject[1].Trim(); materialType = queProject[1].Trim();
@ -889,11 +864,6 @@ namespace FineUIPro.Web.Welder
materialType = "Zr5"; materialType = "Zr5";
materialTypeName = "其它"; materialTypeName = "其它";
} }
else if (queProject[1].Trim().Contains("Zr"))
{
materialType = "Zr";
materialTypeName = "其它";
}
else else
{ {
materialType = queProject[1].Trim(); materialType = queProject[1].Trim();