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

Compare commits

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

2 Commits
e6b5e14978 ... 446f2899bd

Author SHA1 Message Date
高飞 446f2899bd 1 2025-09-11 11:35:10 +08:00
高飞 17ee6e6b23 1 2025-09-11 11:33:03 +08:00
1 changed files with 9 additions and 1 deletions
Show Stats Expand all files Collapse all files

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

@ -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") //焊条和焊丝