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

1

This commit is contained in:
高飞 2025-09-05 16:05:56 +08:00
parent 3272bee817
commit ebe6afff64
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -672,12 +672,12 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
&& (x.IsSteelStru == false || x.IsSteelStru == null)
select x).ToList();
}
foreach (var q in qualifys)
{
if (weldTypeId == "7f4261ef-70b4-4e5a-a5bb-623fc2eb190f" || weldTypeId == "56d933f6-8e6a-4761-80f4-c285662947cb") //焊条和焊丝
if (q.QualifiedProjectCode.Split('-').Length == 3) //该种合格项目只能领盘状焊丝
{
if (q.MaterialType.Contains(steelType) || (steelType == "FeⅣ无保护气体" && q.QualifiedProjectCode.Contains("03")))
if (weldTypeId == "23900d2f-f0e6-4d76-a44d-eb47eede3914") //盘状焊丝
{
isPass = true;
break;
@ -685,14 +685,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
}
else
{
//当系统识别为SAW焊接方法时，则所有的焊剂和盘状焊丝都可以领用
//当系统识别为GMAW、FCAW且钢种（FeⅠ、Ⅱ、Ⅲ、Ⅳ）和被领用的盘状焊丝钢种匹配时可以领用(焊剂不可领用)。SMAW、GTAW不可以领用焊剂及盘状焊丝
if (q.QualifiedProjectCode.Contains("SAW") || (steelType == "FeⅣ无保护气体" && q.QualifiedProjectCode.Contains("03")))
{
isPass = true;
break;
}
else if (q.QualifiedProjectCode.Contains("GMAW") || q.QualifiedProjectCode.Contains("FCAW"))
if (weldTypeId == "7f4261ef-70b4-4e5a-a5bb-623fc2eb190f" || weldTypeId == "56d933f6-8e6a-4761-80f4-c285662947cb") //焊条和焊丝
{
if (q.MaterialType.Contains(steelType) || (steelType == "FeⅣ无保护气体" && q.QualifiedProjectCode.Contains("03")))
{
@ -700,6 +693,24 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
break;
}
}
else
{
//当系统识别为SAW焊接方法时，则所有的焊剂和盘状焊丝都可以领用
//当系统识别为GMAW、FCAW且钢种（FeⅠ、Ⅱ、Ⅲ、Ⅳ）和被领用的盘状焊丝钢种匹配时可以领用(焊剂不可领用)。SMAW、GTAW不可以领用焊剂及盘状焊丝
if (q.QualifiedProjectCode.Contains("SAW") || (steelType == "FeⅣ无保护气体" && q.QualifiedProjectCode.Contains("03")))
{
isPass = true;
break;
}
else if (q.QualifiedProjectCode.Contains("GMAW") || q.QualifiedProjectCode.Contains("FCAW"))
{
if (q.MaterialType.Contains(steelType) || (steelType == "FeⅣ无保护气体" && q.QualifiedProjectCode.Contains("03")))
{
isPass = true;
break;
}
}
}
}
}
return isPass;