From 62654a7aeaaf980c6996d9e6c8127fc217afe320 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Thu, 11 Sep 2025 11:38:31 +0800
Subject: [PATCH] 1

---
 .../WeldMat/UsingPlan/UsingPlanEdit.aspx.cs              | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

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
                     {