|
@@ -24,7 +24,7 @@ namespace SAGA.MBI.ToolsData.ModeCheck
|
|
{
|
|
{
|
|
public EquipReferSystemCheck()
|
|
public EquipReferSystemCheck()
|
|
{
|
|
{
|
|
- Name = "管网及相关设备检查";
|
|
|
|
|
|
+ Name = "管网及相关设备检查 ";
|
|
RSPecificationSheet.Add("参考-管网及相关设备");
|
|
RSPecificationSheet.Add("参考-管网及相关设备");
|
|
}
|
|
}
|
|
[DataCheckProcessAspect]
|
|
[DataCheckProcessAspect]
|
|
@@ -97,12 +97,11 @@ namespace SAGA.MBI.ToolsData.ModeCheck
|
|
|
|
|
|
var tuple = CheckConType(fi, referSystems);
|
|
var tuple = CheckConType(fi, referSystems);
|
|
result.IsRight = !tuple.Item2.Any();
|
|
result.IsRight = !tuple.Item2.Any();
|
|
- result.ConnectorsName += string.Join("、", tuple.Item1.ToArray());
|
|
|
|
|
|
+ result.PassConnectorsName += string.Join("、", tuple.Item1.ToArray());
|
|
|
|
+ result.UnPassConnectorsName += string.Join("、", tuple.Item2.ToArray());
|
|
if (!result.IsRight)
|
|
if (!result.IsRight)
|
|
{
|
|
{
|
|
- result.RMessage = $"连接件所连接的管道系统与规范不一致,包含错误的管道系统:";
|
|
|
|
-
|
|
|
|
- result.RMessage+= string.Join("、", tuple.Item2.ToArray());
|
|
|
|
|
|
+ result.RMessage = $"连接件所连接的管道系统与规范不一致,请检查";
|
|
}
|
|
}
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
@@ -113,7 +112,7 @@ namespace SAGA.MBI.ToolsData.ModeCheck
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
private List<string> GetReferSystems(string code)
|
|
private List<string> GetReferSystems(string code)
|
|
{
|
|
{
|
|
- var item = m_EquipReferSystems.First(t => t.EquipName == code)?.Systems ?? new List<string>();
|
|
|
|
|
|
+ var item = m_EquipReferSystems.FirstOrDefault(t => t.EquipName == code)?.Systems ?? new List<string>();
|
|
|
|
|
|
return item;
|
|
return item;
|
|
}
|
|
}
|
|
@@ -125,7 +124,7 @@ namespace SAGA.MBI.ToolsData.ModeCheck
|
|
/// <param name="domain"></param>
|
|
/// <param name="domain"></param>
|
|
private Tuple<List<string>,List<string>> CheckConType(FamilyInstance fi, List<string> referSystems)
|
|
private Tuple<List<string>,List<string>> CheckConType(FamilyInstance fi, List<string> referSystems)
|
|
{
|
|
{
|
|
- List<string> allList=new List<string>();
|
|
|
|
|
|
+ List<string> passList=new List<string>();
|
|
List<string> unpassList=new List<string>();
|
|
List<string> unpassList=new List<string>();
|
|
|
|
|
|
var connectors = fi.GetAllConnectors();
|
|
var connectors = fi.GetAllConnectors();
|
|
@@ -141,8 +140,10 @@ namespace SAGA.MBI.ToolsData.ModeCheck
|
|
{
|
|
{
|
|
unpassList.Add(mepSystem.Name);
|
|
unpassList.Add(mepSystem.Name);
|
|
}
|
|
}
|
|
-
|
|
|
|
- allList.Add(mepSystem.Name);
|
|
|
|
|
|
+ else
|
|
|
|
+ {
|
|
|
|
+ passList.Add(mepSystem.Name);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
catch (Exception e)
|
|
catch (Exception e)
|
|
{
|
|
{
|
|
@@ -150,7 +151,7 @@ namespace SAGA.MBI.ToolsData.ModeCheck
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- return new Tuple<List<string>, List<string>>(allList, unpassList);
|
|
|
|
|
|
+ return new Tuple<List<string>, List<string>>(passList, unpassList);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -181,16 +182,17 @@ namespace SAGA.MBI.ToolsData.ModeCheck
|
|
index++;
|
|
index++;
|
|
IRow rowN = sheet.CreateRow(index);
|
|
IRow rowN = sheet.CreateRow(index);
|
|
DataCheckNPOIStyle style = result.IsRight ? DataCheckNPOIStyle.Content : DataCheckNPOIStyle.Error;
|
|
DataCheckNPOIStyle style = result.IsRight ? DataCheckNPOIStyle.Content : DataCheckNPOIStyle.Error;
|
|
-
|
|
|
|
- rowN.AddCell(0, rbase.RFloorName, style);
|
|
|
|
- rowN.AddCell(1, rbase.RFileName, style);
|
|
|
|
- rowN.AddCell(2, rbase.RPath, style);
|
|
|
|
- rowN.AddCell(3, result.FamilyName, style);
|
|
|
|
- rowN.AddCell(4, result.Id, style);
|
|
|
|
- rowN.AddCell(5, result.ConnectorsName, style);
|
|
|
|
|
|
+ int i = 0;
|
|
|
|
+ rowN.AddCell(i++, rbase.RFloorName, style);
|
|
|
|
+ rowN.AddCell(i++, rbase.RFileName, style);
|
|
|
|
+ rowN.AddCell(i++, rbase.RPath, style);
|
|
|
|
+ rowN.AddCell(i++, result.FamilyName, style);
|
|
|
|
+ rowN.AddCell(i++, result.Id, style);
|
|
|
|
+ rowN.AddCell(i++, result.PassConnectorsName, style);
|
|
|
|
+ rowN.AddCell(i++, result.UnPassConnectorsName, style);
|
|
string rowN4 = result.IsRight ? "通过" : "不通过";
|
|
string rowN4 = result.IsRight ? "通过" : "不通过";
|
|
- rowN.AddCell(6, rowN4, style);
|
|
|
|
- rowN.AddCell(7, result.RMessage, style);
|
|
|
|
|
|
+ rowN.AddCell(i++, rowN4, style);
|
|
|
|
+ rowN.AddCell(i++, result.RMessage, style);
|
|
}
|
|
}
|
|
#endregion
|
|
#endregion
|
|
|
|
|