gaofei
/
HJGL_DS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

This commit is contained in:
高飞 2025-11-18 11:28:29 +08:00
parent 65ec5eaf2f
commit e552eb1f4d
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HJGL_DS/FineUIPro.Web/HJGL/DataIn/WeldReportIn.aspx.cs
View File

@ -781,14 +781,14 @@ namespace FineUIPro.Web.HJGL.DataIn
var steel = BLL.HJGL_MaterialService.GetSteelBySteID(ste); var steel = BLL.HJGL_MaterialService.GetSteelBySteID(ste);
var floorQ = from x in floorWelderQualifys 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))) && (x.WeldingLocationId == "ALL" || (location == null || location == "" || x.WeldingLocationId.Contains(location)))
&& (steel == null || x.MaterialType.Contains(steel.STE_SteelType ?? "")) && (steel == null || x.MaterialType.Contains(steel.STE_SteelType ?? ""))
&& x.WeldType.Contains(weldType) && x.WeldType.Contains(weldType)
// && (dia == null || x.SizesMin<=dia) // && (dia == null || x.SizesMin<=dia)
select x; select x;
var cellQ = from x in cellWelderQualifys 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))) && (x.WeldingLocationId == "ALL" || (location == null || location == "" || x.WeldingLocationId.Contains(location)))
&& (steel == null || x.MaterialType.Contains(steel.STE_SteelType ?? "")) && (steel == null || x.MaterialType.Contains(steel.STE_SteelType ?? ""))
&& x.WeldType.Contains(weldType) && x.WeldType.Contains(weldType)

4
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
View File

@ -613,14 +613,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage
var steel = BLL.HJGL_MaterialService.GetSteelBySteID(ste); var steel = BLL.HJGL_MaterialService.GetSteelBySteID(ste);
var floorQ = from x in floorWelderQualifys 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))) && (x.WeldingLocationId == "ALL" || (location == null || location == "" || x.WeldingLocationId.Contains(location)))
&& (steel == null || x.MaterialType.Contains(steel.STE_SteelType ?? "")) && (steel == null || x.MaterialType.Contains(steel.STE_SteelType ?? ""))
&& x.WeldType.Contains(weldType) && x.WeldType.Contains(weldType)
// && (dia == null || x.SizesMin<=dia) // && (dia == null || x.SizesMin<=dia)
select x; select x;
var cellQ = from x in cellWelderQualifys 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))) && (x.WeldingLocationId == "ALL" || (location == null || location == "" || x.WeldingLocationId.Contains(location)))
&& (steel == null || x.MaterialType.Contains(steel.STE_SteelType ?? "")) && (steel == null || x.MaterialType.Contains(steel.STE_SteelType ?? ""))
&& x.WeldType.Contains(weldType) && x.WeldType.Contains(weldType)

4
HJGL_DS/WebAPI/Controllers/JointInfoController.cs
View File

@ -370,14 +370,14 @@ namespace WebAPI.Controllers
var steel = BLL.HJGL_MaterialService.GetSteelBySteID(ste); var steel = BLL.HJGL_MaterialService.GetSteelBySteID(ste);
var floorQ = from x in floorWelderQualifys 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))) && (x.WeldingLocationId == "ALL" || (location == null || location == "" || x.WeldingLocationId.Contains(location)))
&& (steel == null || x.MaterialType.Contains(steel.STE_SteelType ?? "")) && (steel == null || x.MaterialType.Contains(steel.STE_SteelType ?? ""))
&& x.WeldType.Contains(weldType) && x.WeldType.Contains(weldType)
// && (dia == null || x.SizesMin<=dia) // && (dia == null || x.SizesMin<=dia)
select x; select x;
var cellQ = from x in cellWelderQualifys 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))) && (x.WeldingLocationId == "ALL" || (location == null || location == "" || x.WeldingLocationId.Contains(location)))
&& (steel == null || x.MaterialType.Contains(steel.STE_SteelType ?? "")) && (steel == null || x.MaterialType.Contains(steel.STE_SteelType ?? ""))
&& x.WeldType.Contains(weldType) && x.WeldType.Contains(weldType)