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