lpf
/
SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改焊接任务单可焊焊工验证

This commit is contained in:
高飞 2022-12-14 14:53:43 +08:00
parent 776fbbda68
commit 90d7c413a0
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
View File

@ -632,17 +632,25 @@ namespace FineUIPro.Web.HJGL.WeldingManage
decimal? cThicknessMax = 0; decimal? cThicknessMax = 0;
var mat = BLL.Base_MaterialService.GetMaterialByMaterialId(ste); 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 var floorQ = from x in welderQualifys
where wmeCode1.Contains(x.WeldingMethod) where x.WeldingMethod.Contains(wmeCode1)
&& (mat == null || x.MaterialType.Contains(mat.MetalType ?? "")) && (mat == null || x.MaterialType.Contains(mat.MetalType ?? ""))
&& x.WeldType.Contains(weldType) && x.WeldType.Contains(weldType)
// && (dia == null || x.SizesMin<=dia)
select x; select x;
var cellQ = from x in welderQualifys var cellQ = from x in welderQualifys
where wmeCode2.Contains(x.WeldingMethod) where x.WeldingMethod.Contains(wmeCode2)
&& (mat == null || x.MaterialType.Contains(mat.MetalType ?? "")) && (mat == null || x.MaterialType.Contains(mat.MetalType ?? ""))
&& x.WeldType.Contains(weldType) && x.WeldType.Contains(weldType)
// && (dia == null || x.SizesMin <= dia)
select x; select x;
if (floorQ.Count() > 0 && cellQ.Count() > 0) if (floorQ.Count() > 0 && cellQ.Count() > 0)
{ {