개정판 f2a63376
issue #000: No Pocket, Air Fin Cooler Setting 창 요구사항 대로 재구성
Change-Id: I6de10a1d28fa35ddc15935d9b1118148bbbb2ef1
| DTI_PID/ID2PSN/PSN.cs | ||
|---|---|---|
| 296 | 296 |
List<Item> valveGroupingItem = new List<Item>(); |
| 297 | 297 |
int bCnt = 0; |
| 298 | 298 |
|
| 299 |
bool bCheck = false; |
|
| 299 |
//bool bCheck = false;
|
|
| 300 | 300 |
List<DataRow> lstitem = new List<DataRow>(); |
| 301 | 301 |
foreach (DataRow dr in pathItemRows) |
| 302 | 302 |
{
|
| 303 | 303 |
//if (!string.IsNullOrEmpty(dr["GROUPTAG"].ToString())) |
| 304 | 304 |
// break; |
| 305 | 305 |
|
| 306 |
if (!string.IsNullOrEmpty(dr["BranchTopologySet_OID"].ToString()))
|
|
| 306 |
if (!string.IsNullOrEmpty(dr["BranchTopologySet_OID"].ToString())) |
|
| 307 | 307 |
{
|
| 308 | 308 |
DataRow[] rows = TopologySet.Select(string.Format("OID = '{0}'", dr["BranchTopologySet_OID"].ToString()));
|
| 309 | 309 |
if (dr["GROUPTAG"].ToString() == "Scope Break") |
| ... | ... | |
| 312 | 312 |
break; |
| 313 | 313 |
} |
| 314 | 314 |
|
| 315 |
if (rows.First()["SubType"].ToString() != "Bypass")//|| rows.First()["SubType"].ToString() != "Vent_Drain"
|
|
| 315 |
if (rows.First()["SubType"].ToString() != "Bypass" && rows.First()["SubType"].ToString() != "Vent_Drain")
|
|
| 316 | 316 |
{
|
| 317 |
bCheck = true; |
|
| 317 |
// bCheck = true;
|
|
| 318 | 318 |
lstitem.Add(dr); |
| 319 | 319 |
keyValuePairs.Add(bCnt, lstitem.ToList()); |
| 320 | 320 |
bCnt++; |
| ... | ... | |
| 330 | 330 |
if (lstitem.Count > 0) |
| 331 | 331 |
{
|
| 332 | 332 |
keyValuePairs.Add(bCnt, lstitem); |
| 333 |
bCnt++; |
|
| 333 |
//bCnt++;
|
|
| 334 | 334 |
} |
| 335 | 335 |
|
| 336 | 336 |
if (keyValuePairs.Count() == 0) |
| ... | ... | |
| 363 | 363 |
DataRow[] psnRows = PipeSystemNetwork.Select(string.Format("OID = '{0}'", drPathitem["PipeSystemNetwork_OID"].ToString()));
|
| 364 | 364 |
foreach (DataRow row in psnRows) |
| 365 | 365 |
row["Pocket"] = "Yes"; |
| 366 |
} |
|
| 366 |
}
|
|
| 367 | 367 |
} |
| 368 | 368 |
} |
| 369 | 369 |
catch (Exception ex) |
| ... | ... | |
| 2570 | 2570 |
else if (StartType == PSNType.Branch) |
| 2571 | 2571 |
{
|
| 2572 | 2572 |
//if (!item.MissingLineNumber && item.Relations.First().Item.LineNumber != null && !string.IsNullOrEmpty(item.Relations.First().Item.LineNumber.Name)) |
| 2573 |
if (!item.MissingLineNumber2) |
|
| 2573 |
if (!item.MissingLineNumber2 && item.Relations.First().Item.LineNumber != null && !string.IsNullOrEmpty(item.Relations.First().Item.LineNumber.Name))
|
|
| 2574 | 2574 |
result = item.Relations.First().Item.LineNumber.Name; |
| 2575 | 2575 |
else |
| 2576 | 2576 |
{
|
| ... | ... | |
| 2695 | 2695 |
|
| 2696 | 2696 |
|
| 2697 | 2697 |
//if (!item.MissingLineNumber && item.Relations.Last().Item.LineNumber != null && !string.IsNullOrEmpty(item.Relations.Last().Item.LineNumber.Name)) |
| 2698 |
if (!item.MissingLineNumber2) |
|
| 2698 |
if (!item.MissingLineNumber2 && item.Relations.Last().Item.LineNumber != null && !string.IsNullOrEmpty(item.Relations.Last().Item.LineNumber.Name))
|
|
| 2699 | 2699 |
result = item.Relations.Last().Item.LineNumber.Name; |
| 2700 | 2700 |
else |
| 2701 | 2701 |
{
|
내보내기 Unified diff
