개정판 a3390f45
Excluding validation when connecting equipment without nozzle
Change-Id: Ib580820327e6de4b1d51fd630b04508212d41269
| DTI_PID/SPPIDConverter/BaseModel/Document.cs | ||
|---|---|---|
| 972 | 972 |
Line connLine = connector.ConnectedObject as Line; |
| 973 | 973 |
string connUID = string.Empty; |
| 974 | 974 |
bool result = false; |
| 975 |
if (connSymbol != null && connSymbol.CONNECTORS.Find(x => x.ConnectedObject == item) == null) |
|
| 975 |
if (connSymbol != null && connSymbol.GetType() != typeof(Equipment) && connSymbol.CONNECTORS.Find(x => x.ConnectedObject == item) == null)
|
|
| 976 | 976 |
{
|
| 977 | 977 |
result = true; |
| 978 | 978 |
connUID = connSymbol.UID; |
| ... | ... | |
| 995 | 995 |
|
| 996 | 996 |
if (!connectedItem.Contains(connector.CONNECTEDITEM)) |
| 997 | 997 |
connectedItem.Add(connector.CONNECTEDITEM); |
| 998 |
else |
|
| 998 |
else if (connSymbol == null || (connSymbol != null && connSymbol.GetType() != typeof(Equipment)))
|
|
| 999 | 999 |
{
|
| 1000 | 1000 |
validationStringBuilder.AppendLine("Check connection!");
|
| 1001 | 1001 |
validationStringBuilder.AppendLine("UID : " + item.UID);
|
| ... | ... | |
| 1004 | 1004 |
} |
| 1005 | 1005 |
} |
| 1006 | 1006 |
|
| 1007 |
if (item.CONNECTORS.Find(x => x.CONNECTEDITEM == item.UID) != null) |
|
| 1007 |
if (item.CONNECTORS.Find(x => !(x.ConnectedObject != null && x.ConnectedObject.GetType() == typeof(Equipment)) && x.CONNECTEDITEM == item.UID) != null)
|
|
| 1008 | 1008 |
{
|
| 1009 | 1009 |
validationStringBuilder.AppendLine("Check connection!");
|
| 1010 | 1010 |
validationStringBuilder.AppendLine("UID : " + item.UID);
|
내보내기 Unified diff
