diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user index 72b6a27..a1d9585 100644 --- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -2,7 +2,7 @@ true - Debug|Any CPU + Release|Any CPU diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointReportUpdate.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointReportUpdate.aspx.cs index ebe161c..a1207c5 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointReportUpdate.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointReportUpdate.aspx.cs @@ -240,7 +240,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage if (!string.IsNullOrEmpty(wmeCode)) //焊接方法 { - if (wmeCode.Contains(welderQualify.WeldingMethodId)) + if (welderQualify.WeldingMethodId.Contains(wmeCode)) { okNum++; } @@ -373,14 +373,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/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config index 93f82b5..5c46a5b 100644 --- a/HJGL_DS/FineUIPro.Web/Web.config +++ b/HJGL_DS/FineUIPro.Web/Web.config @@ -67,7 +67,7 @@ - +