diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx.cs index d4b4603..3a83e1e 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx.cs @@ -677,11 +677,19 @@ namespace FineUIPro.Web.WeldMat.UsingPlan { if (q.QualifiedProjectCode.Split('-').Length == 3) //该种合格项目只能领盘状焊丝 { - if (weldTypeId == "23900d2f-f0e6-4d76-a44d-eb47eede3914") //盘状焊丝 + if (q.QualifiedProjectCode.Contains("SAW")) //SAW可以领焊剂 { isPass = true; break; } + else + { + if (weldTypeId == "23900d2f-f0e6-4d76-a44d-eb47eede3914") //盘状焊丝 + { + isPass = true; + break; + } + } } else {