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

Compare commits

base: gaofei:446f2899bd156a25bf7821cb545675452cc2da90
Branches Tags
gaofei:master
..
compare: gaofei:e6b5e149780fc1a231c55e7fee1fab279b2878a7
Branches Tags
gaofei:master

No commits in common. "446f2899bd156a25bf7821cb545675452cc2da90" and "e6b5e149780fc1a231c55e7fee1fab279b2878a7" have entirely different histories.
446f2899bd ... e6b5e14978

1 changed files with 1 additions and 9 deletions
Show Stats Expand all files Collapse all files

8
HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx.cs
View File

@ -676,13 +676,6 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
foreach (var q in qualifys)
{
if (q.QualifiedProjectCode.Split('-').Length == 3) //该种合格项目只能领盘状焊丝
{
if (q.QualifiedProjectCode.Contains("SAW")) //SAW可以领焊剂
{
isPass = true;
break;
}
else
{
if (weldTypeId == "23900d2f-f0e6-4d76-a44d-eb47eede3914") //盘状焊丝
{
@ -690,7 +683,6 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
break;
}
}
}
else
{
if (weldTypeId == "7f4261ef-70b4-4e5a-a5bb-623fc2eb190f" || weldTypeId == "56d933f6-8e6a-4761-80f4-c285662947cb") //焊条和焊丝