From 90d7c413a011abb2fa2e43133b8603461dbcf2f6 Mon Sep 17 00:00:00 2001
From: gaofei <181547018@qq.com>
Date: Wed, 14 Dec 2022 14:53:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=84=8A=E6=8E=A5=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=8D=95=E5=8F=AF=E7=84=8A=E7=84=8A=E5=B7=A5=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HJGL/WeldingManage/WeldTask.aspx.cs          | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
index eb171993..20f4eab2 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
@@ -632,17 +632,25 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             decimal? cThicknessMax = 0;
 
             var mat = BLL.Base_MaterialService.GetMaterialByMaterialId(ste);
+            //var floorQ = from x in welderQualifys
+            //             where wmeCode1.Contains(x.WeldingMethod)
+            //             && (mat == null || x.MaterialType.Contains(mat.MetalType ?? ""))
+            //             && x.WeldType.Contains(weldType)
+            //             select x;
+            //var cellQ = from x in welderQualifys
+            //            where wmeCode2.Contains(x.WeldingMethod)
+            //             && (mat == null || x.MaterialType.Contains(mat.MetalType ?? ""))
+            //             && x.WeldType.Contains(weldType)
+            //            select x;
             var floorQ = from x in welderQualifys
-                         where wmeCode1.Contains(x.WeldingMethod)
+                         where x.WeldingMethod.Contains(wmeCode1)
                          && (mat == null || x.MaterialType.Contains(mat.MetalType ?? ""))
                          && x.WeldType.Contains(weldType)
-                         // && (dia == null || x.SizesMin<=dia)
                          select x;
             var cellQ = from x in welderQualifys
-                        where wmeCode2.Contains(x.WeldingMethod)
+                        where x.WeldingMethod.Contains(wmeCode2)
                          && (mat == null || x.MaterialType.Contains(mat.MetalType ?? ""))
                          && x.WeldType.Contains(weldType)
-                        // && (dia == null || x.SizesMin <= dia)
                         select x;
             if (floorQ.Count() > 0 && cellQ.Count() > 0)
             {