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) {