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

2022-12-09 焊接任务单树修改

Browse Source
This commit is contained in:
李鹏飞
2022-12-09 18:08:25 +08:00
parent 832d945a1d
commit fe4a0933ec
2 changed files with 149 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/HJGL/WPQ/WPQListService.cs
+79 -70
View File
@@ -230,20 +230,84 @@ namespace BLL
var wpq1 = from x in wpq where x.Material1Class == x.Material2Class select x;
foreach (var item in wpq1)
{
// 满足WPS第一个条件：焊接方法为“PAW、SMAW、SAW、GMAW、FCAW、GTAW”且材质类别属于Fe-1~Fe-5A
if ((item.WeldingMethodCode == "PAW" || item.WeldingMethodCode == "SMAW" || item.WeldingMethodCode == "SAW" || item.WeldingMethodCode == "GMAW" || item.WeldingMethodCode == "FCAW" || item.WeldingMethodCode == "GTAW")
&& (item.SNClass1 == "1" || item.SNClass1 == "2" || item.SNClass1 == "3" || item.SNClass1 == "4" || item.SNClass1 == "5A"))
try
{
// 满足:焊口材质1”等于且“焊口材质2”小于WPS材质类别
if (item.Material1Class == mat1.MaterialClass && Convert.ToInt32(item.SNClass2) > m2)
// 满足WPS第一个条件：焊接方法为“PAW、SMAW、SAW、GMAW、FCAW、GTAW”且材质类别属于Fe-1~Fe-5A
if ((item.WeldingMethodCode == "PAW" || item.WeldingMethodCode == "SMAW" || item.WeldingMethodCode == "SAW" || item.WeldingMethodCode == "GMAW" || item.WeldingMethodCode == "FCAW" || item.WeldingMethodCode == "GTAW")
&& (item.SNClass1 == "1" || item.SNClass1 == "2" || item.SNClass1 == "3" || item.SNClass1 == "4" || item.SNClass1 == "5A"))
{
list.Add(item);
}
// 满足:焊口“材质2”等于且“焊口材质1”小于WPS材质类别
else if (item.Material2Class == mat2.MaterialClass && Convert.ToInt32(item.SNClass1) > m1)
{
list.Add(item);
// 满足:焊口材质1”等于且“焊口材质2”小于WPS材质类别
if (item.Material1Class == mat1.MaterialClass && Convert.ToInt32(item.SNClass2) > m2)
{
list.Add(item);
}
// 满足:焊口“材质2”等于且“焊口材质1”小于WPS材质类别
else if (item.Material2Class == mat2.MaterialClass && Convert.ToInt32(item.SNClass1) > m1)
{
list.Add(item);
}
else
{
// WPS“材质1”与“材质2”“组别”相等
if (item.Material1Group == item.Material2Group)
{
//≠“Fe-1-2”
if (item.Material1Group != "Fe-1-2")
{
//焊口“材质1”与“材质2”组别关系
//相等且等于WPS材质组别
if (mat1.MaterialGroup == mat2.MaterialGroup && mat1.MaterialGroup == item.Material1Group)
{
list.Add(item);
}
//“材质1”等于且“材质2”小于WPS材质组别
else if (mat1.MaterialGroup == item.Material1Group && item.PreGroup1 == preGroup2 && Convert.ToInt32(item.SNGroup1) > g2)
{
list.Add(item);
}
//“材质2”等于且“材质1”小于WPS材质组别
else if (mat2.MaterialGroup == item.Material1Group && item.PreGroup1 == preGroup1 && Convert.ToInt32(item.SNGroup1) > g1)
{
list.Add(item);
}
}
//＝“Fe-1-2”
else
{
//=“Fe-1-2”
if (mat1.MaterialGroup == "Fe-1-2" && mat2.MaterialGroup == "Fe-1-2")
{
list.Add(item);
}
//=“Fe-1-1”
else if (mat1.MaterialGroup == "Fe-1-1" && mat2.MaterialGroup == "Fe-1-1")
{
list.Add(item);
}
//“材质1”等于且“材质2”小于WPS材质组别
else if (mat1.MaterialGroup == item.Material1Group && item.PreGroup1 == preGroup2 && Convert.ToInt32(item.SNGroup1) > g2)
{
list.Add(item);
}
//“材质2”等于且“材质1”小于WPS材质组别
else if (mat2.MaterialGroup == item.Material1Group && item.PreGroup1 == preGroup1 && Convert.ToInt32(item.SNGroup1) > g1)
{
list.Add(item);
}
}
}
//WPS“材质1”与“材质2”“组别”不相等
else
{
//"与WPS一致（材1 = WPS材1，且材2 = WPS材2或材2 = WPS材1，且材1 = WPS材2）"
if ((mat1.MaterialGroup == item.Material1Group && mat2.MaterialGroup == item.Material2Group) || (mat2.MaterialGroup == item.Material1Group && mat1.MaterialGroup == item.Material2Group))
{
list.Add(item);
}
}
}
}
//其他
else
{
// WPS“材质1”与“材质2”“组别”相等
@@ -305,67 +369,12 @@ namespace BLL
}
}
}
//其他
else
catch (Exception ex )
{
// WPS“材质1”与“材质2”“组别”相等
if (item.Material1Group == item.Material2Group)
{
//≠“Fe-1-2”
if (item.Material1Group != "Fe-1-2")
{
//焊口“材质1”与“材质2”组别关系
//相等且等于WPS材质组别
if (mat1.MaterialGroup == mat2.MaterialGroup && mat1.MaterialGroup == item.Material1Group)
{
list.Add(item);
}
//“材质1”等于且“材质2”小于WPS材质组别
else if (mat1.MaterialGroup == item.Material1Group && item.PreGroup1 == preGroup2 && Convert.ToInt32(item.SNGroup1) > g2)
{
list.Add(item);
}
//“材质2”等于且“材质1”小于WPS材质组别
else if (mat2.MaterialGroup == item.Material1Group && item.PreGroup1 == preGroup1 && Convert.ToInt32(item.SNGroup1) > g1)
{
list.Add(item);
}
}
//＝“Fe-1-2”
else
{
//=“Fe-1-2”
if (mat1.MaterialGroup == "Fe-1-2" && mat2.MaterialGroup == "Fe-1-2")
{
list.Add(item);
}
//=“Fe-1-1”
else if (mat1.MaterialGroup == "Fe-1-1" && mat2.MaterialGroup == "Fe-1-1")
{
list.Add(item);
}
//“材质1”等于且“材质2”小于WPS材质组别
else if (mat1.MaterialGroup == item.Material1Group && item.PreGroup1 == preGroup2 && Convert.ToInt32(item.SNGroup1) > g2)
{
list.Add(item);
}
//“材质2”等于且“材质1”小于WPS材质组别
else if (mat2.MaterialGroup == item.Material1Group && item.PreGroup1 == preGroup1 && Convert.ToInt32(item.SNGroup1) > g1)
{
list.Add(item);
}
}
}
//WPS“材质1”与“材质2”“组别”不相等
else
{
//"与WPS一致（材1 = WPS材1，且材2 = WPS材2或材2 = WPS材1，且材1 = WPS材2）"
if ((mat1.MaterialGroup == item.Material1Group && mat2.MaterialGroup == item.Material2Group) || (mat2.MaterialGroup == item.Material1Group && mat1.MaterialGroup == item.Material2Group))
{
list.Add(item);
}
}
ErrLogInfo.WriteLog(ex.ToString());
continue ;
}
}
// 一、材质类别不相等
var wpq2 = from x in wpq where x.Material1Class != x.Material2Class select x;