개정판 ad983925
dev issue #000 : fix
Change-Id: I96d32e5a0804e36ac6fb5eca1a4e855608a77e8a
| DTI_PID/APIDConverter/AutoModeling.cs | ||
|---|---|---|
| 1040 | 1040 |
private Model.Line FindOtherLineByRun(Model.Line line, Symbol symbol) |
| 1041 | 1041 |
{
|
| 1042 | 1042 |
Model.Line result = null; |
| 1043 |
LineRun run = FindLineRun(line); |
|
| 1044 |
Connector connector = symbol.CONNECTORS.Find(x => |
|
| 1045 |
x.ConnectedObject != null && |
|
| 1046 |
x.ConnectedObject != line && |
|
| 1047 |
run.RUNITEMS.Contains(x.ConnectedObject) && |
|
| 1048 |
x.ConnectedObject.GetType() == typeof(Model.Line)); |
|
| 1049 |
|
|
| 1050 |
if (connector != null) |
|
| 1051 |
result = connector.ConnectedObject as Model.Line; |
|
| 1043 |
|
|
| 1044 |
try |
|
| 1045 |
{
|
|
| 1046 |
LineRun run = FindLineRun(line); |
|
| 1047 |
Connector connector = symbol.CONNECTORS.Find(x => |
|
| 1048 |
x.ConnectedObject != null && |
|
| 1049 |
x.ConnectedObject != line && |
|
| 1050 |
run.RUNITEMS.Contains(x.ConnectedObject) && |
|
| 1051 |
x.ConnectedObject.GetType() == typeof(Model.Line)); |
|
| 1052 |
|
|
| 1053 |
if (connector != null) |
|
| 1054 |
result = connector.ConnectedObject as Model.Line; |
|
| 1055 |
} |
|
| 1056 |
catch (System.Exception ex) |
|
| 1057 |
{
|
|
| 1058 |
throw new System.Exception("Error", ex);
|
|
| 1059 |
} |
|
| 1052 | 1060 |
|
| 1053 | 1061 |
return result; |
| 1054 | 1062 |
} |
| DTI_PID/APIDConverter/DB/Project_DB.cs | ||
|---|---|---|
| 93 | 93 |
} |
| 94 | 94 |
if (dt.Select(string.Format("NAME = '{0}'", APID_ATTRIBUTE_TABLE)).Length == 0)
|
| 95 | 95 |
{
|
| 96 |
cmd.CommandText = string.Format("CREATE TABLE {0} (LEVEL1 TEXT PRIMARY KEY, LEVEL2 TEXT, ATTRIBUTE_KEY TEXT, ATTRIBUTE_NAME TEXT)", APID_ATTRIBUTE_TABLE);
|
|
| 96 |
cmd.CommandText = string.Format("CREATE TABLE {0} (LEVEL1 TEXT, LEVEL2 TEXT, ATTRIBUTE_KEY TEXT, ATTRIBUTE_NAME TEXT)", APID_ATTRIBUTE_TABLE);
|
|
| 97 | 97 |
cmd.ExecuteNonQuery(); |
| 98 | 98 |
} |
| 99 | 99 |
} |
| ... | ... | |
| 894 | 894 |
{
|
| 895 | 895 |
cmd.Parameters.Clear(); |
| 896 | 896 |
cmd.CommandText = string.Format(@" |
| 897 |
DELETE FROM {0} WHERE LEVEL1 = @LEVEL1 AND LEVEL2 = @LEVEL2 AND ATTRIBUTE_KEY = @ATTRIBUTE_KEY",
|
|
| 898 |
APID_ATTRIBUTE_TABLE, item.Item1, item.Item2, item.Item3); |
|
| 899 |
cmd.Parameters.AddWithValue("@LEVEL1", item.Item1);
|
|
| 900 |
cmd.Parameters.AddWithValue("@LEVEL2", item.Item2);
|
|
| 901 |
cmd.Parameters.AddWithValue("@ATTRIBUTE_KEY", item.Item3);
|
|
| 902 |
cmd.ExecuteNonQuery(); |
|
| 903 |
|
|
| 904 |
cmd.Parameters.Clear(); |
|
| 905 |
cmd.CommandText = string.Format(@" |
|
| 897 | 906 |
INSERT OR REPLACE INTO {0} (LEVEL1, LEVEL2, ATTRIBUTE_KEY, ATTRIBUTE_NAME) VALUES (@LEVEL1, @LEVEL2, @ATTRIBUTE_KEY, @ATTRIBUTE_NAME)",
|
| 898 | 907 |
APID_ATTRIBUTE_TABLE, item.Item1, item.Item2, item.Item3); |
| 899 | 908 |
cmd.Parameters.AddWithValue("@LEVEL1", item.Item1);
|
| DTI_PID/APIDConverter/Model/PlantItem/Document.cs | ||
|---|---|---|
| 478 | 478 |
{
|
| 479 | 479 |
Symbol symbol = GetSymbolByUID(element.Element("UID").Value);
|
| 480 | 480 |
Equipment equipment = GetEquipmentByUID(element.Element("UID").Value);
|
| 481 |
if (symbol == null && equipment == null) |
|
| 481 |
OPC opc = GetOPCByUID(element.Element("UID").Value);
|
|
| 482 |
if (symbol == null && equipment == null && opc == null) |
|
| 482 | 483 |
{
|
| 483 | 484 |
validationStringBuilder.AppendLine("Missing Item!" + "\r\nUID : " + element.Element("UID").Value);
|
| 484 | 485 |
validationStringBuilder.AppendLine(); |
| ... | ... | |
| 488 | 489 |
run.RUNITEMS.Add(symbol); |
| 489 | 490 |
else if (equipment != null) |
| 490 | 491 |
run.RUNITEMS.Add(equipment); |
| 492 |
else if (opc != null) |
|
| 493 |
run.RUNITEMS.Add(opc); |
|
| 491 | 494 |
} |
| 492 | 495 |
else if (element.Name == "LINE") |
| 493 | 496 |
{
|
| ... | ... | |
| 619 | 622 |
return SYMBOLS.Find(x => x.UID == uid); |
| 620 | 623 |
} |
| 621 | 624 |
|
| 625 |
public OPC GetOPCByUID(string uid) |
|
| 626 |
{
|
|
| 627 |
return OPCs.Find(x => x.UID == uid); |
|
| 628 |
} |
|
| 629 |
|
|
| 622 | 630 |
public Equipment GetEquipmentByUID(string uid) |
| 623 | 631 |
{
|
| 624 | 632 |
return Equipments.Find(x => x.UID == uid); |
내보내기 Unified diff
