개정판 7cbebfe9
issue #000:
Change-Id: I3f74e5658a0fa5129f14487e5276b64eefc55047
| DTI_PID/ID2PSN/DB.cs | ||
|---|---|---|
| 556 | 556 |
check = false; |
| 557 | 557 |
foreach (string c in colnames) |
| 558 | 558 |
{
|
| 559 |
if (col.Key.Contains(c))
|
|
| 559 |
if (col.Key.ToUpper().Equals(c.ToUpper()))
|
|
| 560 | 560 |
{
|
| 561 | 561 |
check = true; |
| 562 | 562 |
break; |
| ... | ... | |
| 1677 | 1677 |
check = false; |
| 1678 | 1678 |
foreach (string c in colnames) |
| 1679 | 1679 |
{
|
| 1680 |
if (col.Key.Contains(c))
|
|
| 1680 |
if (col.Key.ToUpper().Equals(c.ToUpper()))
|
|
| 1681 | 1681 |
{
|
| 1682 | 1682 |
check = true; |
| 1683 | 1683 |
break; |
| ... | ... | |
| 2107 | 2107 |
check = false; |
| 2108 | 2108 |
foreach (string c in colnames) |
| 2109 | 2109 |
{
|
| 2110 |
if (col.Key.Contains(c))
|
|
| 2110 |
if (col.Key.ToUpper().Equals(c.ToUpper()))
|
|
| 2111 | 2111 |
{
|
| 2112 | 2112 |
check = true; |
| 2113 | 2113 |
break; |
| ... | ... | |
| 3332 | 3332 |
check = false; |
| 3333 | 3333 |
foreach (string c in colnames) |
| 3334 | 3334 |
{
|
| 3335 |
if (col.Key.Contains(c))
|
|
| 3335 |
if (col.Key.ToUpper().Equals(c.ToUpper()))
|
|
| 3336 | 3336 |
{
|
| 3337 | 3337 |
check = true; |
| 3338 | 3338 |
break; |
| DTI_PID/ID2PSN/Object/Item.cs | ||
|---|---|---|
| 45 | 45 |
public List<Item> BranchItems { get; set; }
|
| 46 | 46 |
public string TopologyData { get; set; }
|
| 47 | 47 |
public string PSNPipeLineID { get; set; }
|
| 48 |
public string PSNPipeSystemID { get; set; }
|
|
| 48 | 49 |
public Topology Topology { get; set; }
|
| 49 | 50 |
public Group Group { get; set; }
|
| 50 | 51 |
public PSNItem PSNItem { get; set; }
|
| DTI_PID/ID2PSN/PSN.cs | ||
|---|---|---|
| 1476 | 1476 |
{
|
| 1477 | 1477 |
item.TopologyData = string.Empty; |
| 1478 | 1478 |
item.PSNPipeLineID = string.Empty; |
| 1479 |
item.PSNPipeSystemID = string.Empty; |
|
| 1479 | 1480 |
List<string> pipeLineID = new List<string>(); |
| 1481 |
List<string> pipesystemID = new List<string>(); |
|
| 1480 | 1482 |
LineNumber lineNumber = document.LineNumbers.Find(x => x.UID == item.Owner); |
| 1481 | 1483 |
|
| 1482 | 1484 |
if (lineNumber != null) |
| ... | ... | |
| 1495 | 1497 |
Attribute attribute = lineNumber.Attributes.Find(x => x.DisplayName == uid); |
| 1496 | 1498 |
if (attribute != null && !string.IsNullOrEmpty(attribute.Value)) |
| 1497 | 1499 |
{
|
| 1498 |
pipeLineID.Add(attribute.Value);//item.TopologyData += attribute.Value; |
|
| 1499 |
//if (uid.Equals("Tag Seq No") && attribute.Value.ToString().Substring(attribute.Value.ToString().Length - 1, 1).Equals("V"))
|
|
| 1500 |
//{
|
|
| 1500 |
pipeLineID.Add(attribute.Value); |
|
| 1501 |
|
|
| 1502 |
string attname = string.Empty; |
|
| 1503 |
if (attribute.Name != null) |
|
| 1504 |
{
|
|
| 1505 |
if (attribute.Name.ToUpper().Equals("FLUIDCODE") || attribute.Name.ToUpper().Equals("PIPINGMATERIALSCLASS"))
|
|
| 1506 |
{
|
|
| 1507 |
pipesystemID.Add(attribute.Value); |
|
| 1508 |
} |
|
| 1509 |
} |
|
| 1510 |
else if (attribute.DisplayName != null) |
|
| 1511 |
{
|
|
| 1512 |
if (attribute.DisplayName.ToUpper().Equals("FLUIDCODE") || attribute.DisplayName.ToUpper().Equals("PIPINGMATERIALSCLASS"))
|
|
| 1513 |
{
|
|
| 1514 |
pipesystemID.Add(attribute.Value); |
|
| 1515 |
} |
|
| 1516 |
} |
|
| 1517 |
|
|
| 1518 |
|
|
| 1501 | 1519 |
if (item.LineNumber.MissingLineNumber1 && item.LineNumber.MissingLineNumber2) |
| 1502 | 1520 |
{
|
| 1503 | 1521 |
|
| ... | ... | |
| 1522 | 1540 |
} |
| 1523 | 1541 |
|
| 1524 | 1542 |
item.PSNPipeLineID = string.Join("-", pipeLineID);
|
| 1543 |
item.PSNPipeSystemID = string.Join("-", pipesystemID);
|
|
| 1525 | 1544 |
item.TopologyData = string.Join("-", pipeLineID);
|
| 1526 | 1545 |
|
| 1527 | 1546 |
} |
| ... | ... | |
| 2716 | 2735 |
if (!string.IsNullOrEmpty(FluidCode)) oid.Add(FluidCode); |
| 2717 | 2736 |
if (!string.IsNullOrEmpty(PMC)) oid.Add(PMC); |
| 2718 | 2737 |
|
| 2719 |
string PipeSystem_OID = string.Join("-", oid);
|
|
| 2720 |
|
|
| 2738 |
//string PipeSystem_OID = string.Join("-", oid);
|
|
| 2739 |
string PipeSystem_OID = string.Join("-", item.PSNPipeSystemID);
|
|
| 2721 | 2740 |
if (!string.IsNullOrEmpty(SEQNUMBER)) oid.Add(SEQNUMBER); |
| 2722 | 2741 |
if (!string.IsNullOrEmpty(INSULATION)) oid.Add(INSULATION); |
| 2723 | 2742 |
|
| 2724 |
string OID = string.Join("-", oid);
|
|
| 2743 |
//string OID = string.Join("-", oid);
|
|
| 2744 |
string OID = item.PSNPipeLineID; |
|
| 2725 | 2745 |
string FluidCodeGL = string.Empty; |
| 2726 | 2746 |
string PMCGL = string.Empty; |
| 2727 | 2747 |
|
내보내기 Unified diff
