개정판 e552da48
issue #000: Keyword From/To order item 수정
Change-Id: I6e0414aa17941cb37c82e3753f1f2bae376b484c
DTI_PID/ID2PSN/PSN.cs | ||
---|---|---|
1294 | 1294 |
string FromType = string.Empty; |
1295 | 1295 |
Item From_item = new Item(); |
1296 | 1296 |
string FROM_DATA = PSNItem.GetFromData(ref FromType, ref From_item); |
1297 |
newRow["FROM_DATA"] = FROM_DATA; |
|
1298 |
|
|
1299 | 1297 |
if (PSNItem.IsKeyword) |
1300 |
{ |
|
1301 |
PSNItem.StartType = PSNType.Equipment; |
|
1302 |
// UpdatePathItemsKeywordDataRow(From_item.UID, FROM_DATA, FromType); |
|
1303 |
} |
|
1304 |
else if (FROM_DATA == "ENDOFHEADER") |
|
1305 | 1298 |
{ |
1306 |
// UpdatePathItemsDataRow(From_item.UID, From_item.ID2DBName, FROM_DATA);
|
|
1299 |
PSNItem.StartType = PSNType.Equipment;
|
|
1307 | 1300 |
} |
1308 |
|
|
1309 | 1301 |
string ToType = string.Empty; |
1310 | 1302 |
Item To_item = new Item(); |
1311 |
|
|
1312 | 1303 |
string TO_DATA = PSNItem.GetToData(ref ToType, ref To_item); |
1313 |
newRow["TO_DATA"] = TO_DATA; |
|
1314 |
|
|
1315 | 1304 |
if (PSNItem.IsKeyword) |
1316 | 1305 |
{ |
1317 |
PSNItem.EndType = PSNType.Equipment; |
|
1318 |
// UpdatePathItemsKeywordDataRow(To_item.UID, TO_DATA, ToType); |
|
1319 |
} |
|
1320 |
else if (TO_DATA == "ENDOFHEADER") |
|
1321 |
{ |
|
1322 |
// UpdatePathItemsDataRow(To_item.UID, To_item.ID2DBName, TO_DATA); |
|
1306 |
PSNItem.EndType = PSNType.Equipment; |
|
1323 | 1307 |
} |
1324 | 1308 |
|
1309 |
newRow["FROM_DATA"] = FROM_DATA; |
|
1310 |
newRow["TO_DATA"] = TO_DATA; |
|
1325 | 1311 |
newRow["Type"] = PSNItem.GetPSNType(); |
1326 |
|
|
1312 |
|
|
1313 |
if (psnOrder > 0) |
|
1314 |
{ |
|
1315 |
DataRow dr = pipeSystemNetworkDT.Select(string.Format("OID = '{0}' AND OrderNumber = 0", PSNItem.PSN_OID())).FirstOrDefault(); |
|
1316 |
if(dr != null) |
|
1317 |
{ |
|
1318 |
newRow["FROM_DATA"] = dr.Field<string>("FROM_DATA"); |
|
1319 |
newRow["TO_DATA"] = dr.Field<string>("TO_DATA"); |
|
1320 |
newRow["Type"] = dr.Field<string>("Type"); |
|
1321 |
} |
|
1322 |
} |
|
1327 | 1323 |
|
1328 | 1324 |
newRow["TopologySet_OID_Key"] = item.Topology.FullName; |
1329 | 1325 |
newRow["PSNRevisionNumber"] = string.Format("V{0:D4}", Revision); |
내보내기 Unified diff