diff --git a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/WeldReportIn.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/WeldReportIn.aspx.cs index ab19e6d..a89ff2c 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/WeldReportIn.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/WeldReportIn.aspx.cs @@ -781,14 +781,14 @@ namespace FineUIPro.Web.HJGL.DataIn var steel = BLL.HJGL_MaterialService.GetSteelBySteID(ste); var floorQ = from x in floorWelderQualifys - where wmeCode1.Contains(x.WeldingMethodId) + where x.WeldingMethodId.Contains(wmeCode1) && (x.WeldingLocationId == "ALL" || (location == null || location == "" || x.WeldingLocationId.Contains(location))) && (steel == null || x.MaterialType.Contains(steel.STE_SteelType ?? "")) && x.WeldType.Contains(weldType) // && (dia == null || x.SizesMin<=dia) select x; var cellQ = from x in cellWelderQualifys - where wmeCode2.Contains(x.WeldingMethodId) + where x.WeldingMethodId.Contains(wmeCode2) && (x.WeldingLocationId == "ALL" || (location == null || location == "" || x.WeldingLocationId.Contains(location))) && (steel == null || x.MaterialType.Contains(steel.STE_SteelType ?? "")) && x.WeldType.Contains(weldType) diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs index 1325755..fa64f0e 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs @@ -613,14 +613,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage var steel = BLL.HJGL_MaterialService.GetSteelBySteID(ste); var floorQ = from x in floorWelderQualifys - where wmeCode1.Contains(x.WeldingMethodId) + where x.WeldingMethodId.Contains(wmeCode1) && (x.WeldingLocationId == "ALL" || (location == null || location == "" || x.WeldingLocationId.Contains(location))) && (steel == null || x.MaterialType.Contains(steel.STE_SteelType ?? "")) && x.WeldType.Contains(weldType) // && (dia == null || x.SizesMin<=dia) select x; var cellQ = from x in cellWelderQualifys - where wmeCode2.Contains(x.WeldingMethodId) + where x.WeldingMethodId.Contains(wmeCode2) && (x.WeldingLocationId == "ALL" || (location == null || location == "" || x.WeldingLocationId.Contains(location))) && (steel == null || x.MaterialType.Contains(steel.STE_SteelType ?? "")) && x.WeldType.Contains(weldType) diff --git a/HJGL_DS/WebAPI/Controllers/JointInfoController.cs b/HJGL_DS/WebAPI/Controllers/JointInfoController.cs index 2d8bfee..d4f2bb8 100644 --- a/HJGL_DS/WebAPI/Controllers/JointInfoController.cs +++ b/HJGL_DS/WebAPI/Controllers/JointInfoController.cs @@ -370,14 +370,14 @@ namespace WebAPI.Controllers var steel = BLL.HJGL_MaterialService.GetSteelBySteID(ste); var floorQ = from x in floorWelderQualifys - where wmeCode1.Contains(x.WeldingMethodId) + where x.WeldingMethodId.Contains(wmeCode1) && (x.WeldingLocationId == "ALL" || (location == null || location == "" || x.WeldingLocationId.Contains(location))) && (steel == null || x.MaterialType.Contains(steel.STE_SteelType ?? "")) && x.WeldType.Contains(weldType) // && (dia == null || x.SizesMin<=dia) select x; var cellQ = from x in cellWelderQualifys - where wmeCode2.Contains(x.WeldingMethodId) + where x.WeldingMethodId.Contains(wmeCode2) && (x.WeldingLocationId == "ALL" || (location == null || location == "" || x.WeldingLocationId.Contains(location))) && (steel == null || x.MaterialType.Contains(steel.STE_SteelType ?? "")) && x.WeldType.Contains(weldType)