diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx.cs index 34b3b05..8969437 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx.cs @@ -677,10 +677,13 @@ namespace FineUIPro.Web.WeldMat.UsingPlan { if (q.QualifiedProjectCode.Split('-').Length == 3) //该种合格项目只能领盘状焊丝 { - if (q.QualifiedProjectCode.Contains("SAW") && weldTypeId == "9770311b-af69-4b6f-b8ad-161a4df88015") //SAW可以领焊剂 + if (q.QualifiedProjectCode.Contains("SAW")) { - isPass = true; - break; + if (weldTypeId == "9770311b-af69-4b6f-b8ad-161a4df88015" || weldTypeId == "23900d2f-f0e6-4d76-a44d-eb47eede3914") //SAW可以领用焊剂和盘装焊丝没有材质的限制 + { + isPass = true; + break; + } } else {