1

HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx.cs

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