개정판 72775f2e
issue #000: PSN DB Type 수정, Keyword 데이터 변경 및 로직 수정, Setting image size combobox 사이즈 수정, wating form 적용
Change-Id: I017c4a9b9f309f01c167da8c9c12fc1822e5eeb4
| DTI_PID/ID2PSN/DB.cs | ||
|---|---|---|
| 121 | 121 |
SaveTopologyRule(topologyRule); |
| 122 | 122 |
} |
| 123 | 123 | |
| 124 |
matched = names.FirstOrDefault(param => param == PSN_PATHITEMS); |
|
| 124 | ||
| 125 |
matched = names.FirstOrDefault(param => param == PSN_PIPESYSTEMNETWORK); |
|
| 125 | 126 |
if (matched == null) |
| 126 | 127 |
{
|
| 127 |
var query = $"CREATE TABLE {PSN_PATHITEMS} (OID NVARCHAR(50), SequenceData_OID NVARCHAR(125), " +
|
|
| 128 |
"TopologySet_OID NVARCHAR(125), BranchTopologySet_OID NVARCHAR(125), PipeLine_OID NVARCHAR(125), ITEMNAME NVARCHAR(50), ITEMTAG NVARCHAR(125), " + |
|
| 129 |
"Class NVARCHAR(80), SubClass NVARCHAR(80), TYPE NVARCHAR(80), PIDNAME NVARCHAR(10), NPD NVARCHAR(20), PipeSystemNetwork_OID NVARCHAR(20), " + |
|
| 130 |
"ViewPipeSystemNetwork_OID NVARCHAR(255), PipeRun_OID NVARCHAR(255))"; |
|
| 128 |
var query = $"CREATE TABLE {PSN_PIPESYSTEMNETWORK} (OID NVARCHAR(50), Type NVARCHAR(20), OrderNumber NVARCHAR(20), Pipeline_OID NVARCHAR(125), FROM_DATA NVARCHAR(255), " +
|
|
| 129 |
"TO_DATA NVARCHAR(255), TopologySet_OID_Key NVARCHAR(125), PSNRevisionNumber NVARCHAR(255), IsValid INTEGER, Status NVARCHAR(255), PBS NVARCHAR(255), Drawings NVARCHAR(255), " + |
|
| 130 |
"IncludingVirtualData NVARCHAR(10), PSNAccuracy REAL)"; |
|
| 131 | 131 |
using (var cmd = connection.GetSqlStringCommand(query)) |
| 132 | 132 |
{
|
| 133 | 133 |
cmd.ExecuteNonQuery(); |
| 134 | 134 |
} |
| 135 | 135 |
} |
| 136 | 136 | |
| 137 |
matched = names.FirstOrDefault(param => param == PSN_SEQUENCEDATA);
|
|
| 137 |
matched = names.FirstOrDefault(param => param == PSN_EQUIPMENT);
|
|
| 138 | 138 |
if (matched == null) |
| 139 | 139 |
{
|
| 140 |
var query = $"CREATE TABLE {PSN_SEQUENCEDATA} (OID NVARCHAR(125), SERIALNUMBER NVARCHAR(10), PathItem_OID NVARCHAR(50), TopologySet_OID_Key NVARCHAR(125))";
|
|
| 140 |
var query = $"CREATE TABLE {PSN_EQUIPMENT} (OID NVARCHAR(50), ITEMTAG NVARCHAR(50), XCOORDS REAL, YCOORDS REAL)";
|
|
| 141 | 141 |
using (var cmd = connection.GetSqlStringCommand(query)) |
| 142 | 142 |
{
|
| 143 | 143 |
cmd.ExecuteNonQuery(); |
| 144 | 144 |
} |
| 145 | 145 |
} |
| 146 | 146 | |
| 147 |
matched = names.FirstOrDefault(param => param == PSN_PIPESYSTEMNETWORK);
|
|
| 147 |
matched = names.FirstOrDefault(param => param == PSN_NOZZLE);
|
|
| 148 | 148 |
if (matched == null) |
| 149 | 149 |
{
|
| 150 |
var query = $"CREATE TABLE {PSN_PIPESYSTEMNETWORK} (OID NVARCHAR(50), Type NVARCHAR(20), OrderNumber NVARCHAR(20), Pipeline_OID NVARCHAR(125), FROM_DATA NVARCHAR(255), " +
|
|
| 151 |
"TO_DATA NVARCHAR(255), TopologySet_OID_Key NVARCHAR(125), PSNRevisionNumber NVARCHAR(255), PBS NVARCHAR(255), PIDDrawings NVARCHAR(255), " + |
|
| 152 |
"Validity INTEGER, Status NVARCHAR(255), IncludingVirtualData NVARCHAR(10), PSNAccuracy REAL)"; |
|
| 150 |
var query = $"CREATE TABLE {PSN_NOZZLE} (OID NVARCHAR(50), ITEMTAG NVARCHAR(255), XCOORDS REAL, YCOORDS REAL, Equipment_OID NVARCHAR(255), " +
|
|
| 151 |
"FLUID NVARCHAR(255), NPD NVARCHAR(255), ROTATION REAL, FlowDirection NVARCHAR(255))"; |
|
| 153 | 152 |
using (var cmd = connection.GetSqlStringCommand(query)) |
| 154 | 153 |
{
|
| 155 | 154 |
cmd.ExecuteNonQuery(); |
| 156 | 155 |
} |
| 157 | 156 |
} |
| 158 | 157 | |
| 159 |
matched = names.FirstOrDefault(param => param == PSN_EQUIPMENT);
|
|
| 158 |
matched = names.FirstOrDefault(param => param == PSN_FLUIDCODE);
|
|
| 160 | 159 |
if (matched == null) |
| 161 | 160 |
{
|
| 162 |
var query = $"CREATE TABLE {PSN_EQUIPMENT} (OID NVARCHAR(50), ITEMTAG NVARCHAR(50), XCOORDS REAL, YCOORDS REAL)";
|
|
| 161 |
var query = $"CREATE TABLE {PSN_FLUIDCODE} (UID NVARCHAR(50), Code NVARCHAR(255), Description NVARCHAR(255), Condition NVARCHAR(255), Remarks NVARCHAR(255), GroundLevel NVARCHAR(20))";
|
|
| 163 | 162 |
using (var cmd = connection.GetSqlStringCommand(query)) |
| 164 | 163 |
{
|
| 165 | 164 |
cmd.ExecuteNonQuery(); |
| 166 | 165 |
} |
| 167 | 166 |
} |
| 168 | 167 | |
| 169 |
matched = names.FirstOrDefault(param => param == PSN_NOZZLE); |
|
| 168 | ||
| 169 |
matched = names.FirstOrDefault(param => param == PSN_PIPINGMATLCLASS); |
|
| 170 | 170 |
if (matched == null) |
| 171 | 171 |
{
|
| 172 |
var query = $"CREATE TABLE {PSN_NOZZLE} (OID NVARCHAR(50), ITEMTAG NVARCHAR(50), XCOORDS REAL, YCOORDS REAL, Equipment_OID NVARCHAR(50), " +
|
|
| 173 |
"FLUID NVARCHAR(50), NPD NVARCHAR(20), ROTATION REAL, FlowDirection NVARCHAR(10))"; |
|
| 172 |
var query = $"CREATE TABLE {PSN_PIPINGMATLCLASS} (UID NVARCHAR(50), Priority INTEGER, Code NVARCHAR(255), Description NVARCHAR(255), Condition NVARCHAR(255), Remarks NVARCHAR(255), GroundLevel NVARCHAR(20))";
|
|
| 174 | 173 |
using (var cmd = connection.GetSqlStringCommand(query)) |
| 175 | 174 |
{
|
| 176 | 175 |
cmd.ExecuteNonQuery(); |
| 177 | 176 |
} |
| 178 | 177 |
} |
| 179 | 178 | |
| 180 |
matched = names.FirstOrDefault(param => param == PSN_FLUIDCODE);
|
|
| 179 |
matched = names.FirstOrDefault(param => param == PSN_SEQUENCEDATA);
|
|
| 181 | 180 |
if (matched == null) |
| 182 | 181 |
{
|
| 183 |
var query = $"CREATE TABLE {PSN_FLUIDCODE} (UID NVARCHAR(50), Code NVARCHAR(50), Description NVARCHAR(255), Condition NVARCHAR(50), Remarks NVARCHAR(255), GroundLevel NVARCHAR(50))";
|
|
| 182 |
var query = $"CREATE TABLE {PSN_SEQUENCEDATA} (OID NVARCHAR(125), SERIALNUMBER NVARCHAR(255), PathItem_OID NVARCHAR(255), TopologySet_OID_Key NVARCHAR(255))";
|
|
| 184 | 183 |
using (var cmd = connection.GetSqlStringCommand(query)) |
| 185 | 184 |
{
|
| 186 | 185 |
cmd.ExecuteNonQuery(); |
| 187 | 186 |
} |
| 188 | 187 |
} |
| 189 | 188 | |
| 190 |
matched = names.FirstOrDefault(param => param == PSN_PIPINGMATLCLASS);
|
|
| 189 |
matched = names.FirstOrDefault(param => param == PSN_PATHITEMS);
|
|
| 191 | 190 |
if (matched == null) |
| 192 | 191 |
{
|
| 193 |
var query = $"CREATE TABLE {PSN_PIPINGMATLCLASS} (UID NVARCHAR(50), Priority INTEGER, Code NVARCHAR(255), Description NVARCHAR(50), Condition NVARCHAR(255), Remarks NVARCHAR(80), GroundLevel NVARCHAR(50))";
|
|
| 192 |
var query = $"CREATE TABLE {PSN_PATHITEMS} (OID NVARCHAR(50), SequenceData_OID NVARCHAR(125), " +
|
|
| 193 |
"TopologySet_OID NVARCHAR(125), BranchTopologySet_OID NVARCHAR(125), PipeLine_OID NVARCHAR(125), ITEMNAME NVARCHAR(50), ITEMTAG NVARCHAR(125), " + |
|
| 194 |
"Class NVARCHAR(80), SubClass NVARCHAR(80), TYPE NVARCHAR(80), PIDNAME NVARCHAR(10), NPD NVARCHAR(20), PipeSystemNetwork_OID NVARCHAR(20), PipeRun_OID NVARCHAR(255), " + |
|
| 195 |
"ViewPipeSystemNetwork_OID NVARCHAR(255))"; |
|
| 194 | 196 |
using (var cmd = connection.GetSqlStringCommand(query)) |
| 195 | 197 |
{
|
| 196 | 198 |
cmd.ExecuteNonQuery(); |
| 197 | 199 |
} |
| 198 | 200 |
} |
| 199 | ||
| 201 |
|
|
| 200 | 202 |
matched = names.FirstOrDefault(param => param == PSN_VIEW); |
| 201 | 203 |
if (matched == null) |
| 202 | 204 |
{
|
| ... | ... | |
| 210 | 212 |
matched = names.FirstOrDefault(param => param == PSN_TOPOLOGYSET); |
| 211 | 213 |
if (matched == null) |
| 212 | 214 |
{
|
| 213 |
var query = $"CREATE TABLE {PSN_TOPOLOGYSET} (OID NVARCHAR(125), Type NVARCHAR(30), SubType NVARCHAR(30), HeadItemTag NVARCHAR(50), TailItemTag NVARCHAR(50), HeadItemID NVARCHAR(50), TailItemID NVARCHAR(50))";
|
|
| 215 |
var query = $"CREATE TABLE { PSN_TOPOLOGYSET} (OID NVARCHAR(125), Type NVARCHAR(30), SubType NVARCHAR(30), HeadItemTag NVARCHAR(50), TailItemTag NVARCHAR(50), HeadItemSPID NVARCHAR(50), TailItemSPID NVARCHAR(50))";
|
|
| 214 | 216 |
using (var cmd = connection.GetSqlStringCommand(query)) |
| 215 | 217 |
{
|
| 216 | 218 |
cmd.ExecuteNonQuery(); |
| ... | ... | |
| 960 | 962 |
connection.ExecuteNonQuery(connection.GetSqlStringCommand(query), txn); |
| 961 | 963 |
foreach (DataRow row in item.TopologySet.Rows) |
| 962 | 964 |
{
|
| 963 |
query = $"INSERT INTO {PSN_TOPOLOGYSET} VALUES (@OID, @Type, @SubType, @HeadItemTag, @TailItemTag, @HeadItemID, @TailItemID)";
|
|
| 965 |
query = $"INSERT INTO {PSN_TOPOLOGYSET} VALUES (@OID, @Type, @SubType, @HeadItemTag, @TailItemTag, @HeadItemSPID, @TailItemSPID)";
|
|
| 964 | 966 |
var cmd = connection.GetSqlStringCommand(query); |
| 965 | 967 |
AddWithValue(cmd, "@OID", row["OID"].ToString()); |
| 966 | 968 |
AddWithValue(cmd, "@Type", row["Type"].ToString()); |
| 967 | 969 |
AddWithValue(cmd, "@SubType", row["SubType"].ToString()); |
| 968 | 970 |
AddWithValue(cmd, "@HeadItemTag", row["HeadItemTag"].ToString()); |
| 969 | 971 |
AddWithValue(cmd, "@TailItemTag", row["TailItemTag"].ToString()); |
| 970 |
AddWithValue(cmd, "@HeadItemID", row["HeadItemID"].ToString());
|
|
| 971 |
AddWithValue(cmd, "@TailItemID", row["TailItemID"].ToString());
|
|
| 972 |
AddWithValue(cmd, "@HeadItemSPID", row["HeadItemSPID"].ToString());
|
|
| 973 |
AddWithValue(cmd, "@TailItemSPID", row["TailItemSPID"].ToString());
|
|
| 972 | 974 |
connection.ExecuteNonQuery(cmd, txn); |
| 973 | 975 |
} |
| 974 | 976 | |
| ... | ... | |
| 978 | 980 |
foreach (DataRow row in item.PipeSystemNetwork.Rows) |
| 979 | 981 |
{
|
| 980 | 982 |
query = $"INSERT INTO {PSN_PIPESYSTEMNETWORK} VALUES (@OID, @Type, @OrderNumber, @Pipeline_OID, @FROM_DATA, @TO_DATA, @TopologySet_OID_Key, @PSNRevisionNumber, " +
|
| 981 |
$"@PBS, @PIDDrawings, @Validity, @Status, @IncludingVirtualData, @PSNAccuracy)";
|
|
| 983 |
$"@PBS, @Drawings, @IsValid, @Status, @IncludingVirtualData, @PSNAccuracy)";
|
|
| 982 | 984 |
var cmd = connection.GetSqlStringCommand(query); |
| 983 | 985 |
AddWithValue(cmd, "@OID", row["OID"].ToString()); |
| 984 | 986 |
AddWithValue(cmd, "@Type", row["Type"].ToString()); |
| ... | ... | |
| 989 | 991 |
AddWithValue(cmd, "@TopologySet_OID_Key", row["TopologySet_OID_Key"].ToString()); |
| 990 | 992 |
AddWithValue(cmd, "@PSNRevisionNumber", row["PSNRevisionNumber"].ToString()); |
| 991 | 993 |
AddWithValue(cmd, "@PBS", row["PBS"].ToString()); |
| 992 |
AddWithValue(cmd, "@PIDDrawings", row["PIDDrawings"].ToString());
|
|
| 993 |
int Validity = 0;
|
|
| 994 |
if (row["Validity"].ToString() == "OK")
|
|
| 995 |
Validity = 0;
|
|
| 996 |
else if (row["Validity"].ToString() == "InValid")
|
|
| 997 |
Validity = 1;
|
|
| 998 |
else if (row["Validity"].ToString() == "Error")
|
|
| 999 |
Validity = -1;
|
|
| 1000 |
AddWithValue(cmd, "@Validity", Validity);
|
|
| 994 |
AddWithValue(cmd, "@Drawings", row["Drawings"].ToString());
|
|
| 995 |
int IsValid = 0;
|
|
| 996 |
if (row["IsValid"].ToString() == "OK")
|
|
| 997 |
IsValid = 0;
|
|
| 998 |
else if (row["IsValid"].ToString() == "InValid")
|
|
| 999 |
IsValid = 1;
|
|
| 1000 |
else if (row["IsValid"].ToString() == "Error")
|
|
| 1001 |
IsValid = -1;
|
|
| 1002 |
AddWithValue(cmd, "@IsValid", IsValid);
|
|
| 1001 | 1003 |
AddWithValue(cmd, "@Status", row["Status"].ToString()); |
| 1002 | 1004 |
AddWithValue(cmd, "@IncludingVirtualData", row["IncludingVirtualData"].ToString()); |
| 1003 | 1005 |
AddWithValue(cmd, "@PSNAccuracy", row["PSNAccuracy"].ToString()); |
| ... | ... | |
| 1238 | 1240 |
using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query))) |
| 1239 | 1241 |
{
|
| 1240 | 1242 |
result.PipeSystemNetwork = ds.Tables[0].Clone(); |
| 1241 |
result.PipeSystemNetwork.Columns["Validity"].DataType = typeof(string);
|
|
| 1243 |
result.PipeSystemNetwork.Columns["IsValid"].DataType = typeof(string);
|
|
| 1242 | 1244 | |
| 1243 | 1245 |
foreach (DataRow row in ds.Tables[0].Rows) |
| 1244 | 1246 |
{
|
| ... | ... | |
| 1252 | 1254 |
newRow["TopologySet_OID_Key"] = row["TopologySet_OID_Key"].ToString(); |
| 1253 | 1255 |
newRow["PSNRevisionNumber"] = row["PSNRevisionNumber"].ToString(); |
| 1254 | 1256 |
newRow["PBS"] = row["PBS"].ToString(); |
| 1255 |
newRow["PIDDrawings"] = row["PIDDrawings"].ToString();
|
|
| 1256 |
string Validity = string.Empty;
|
|
| 1257 |
newRow["Drawings"] = row["Drawings"].ToString();
|
|
| 1258 |
string IsValid = string.Empty;
|
|
| 1257 | 1259 | |
| 1258 |
if (Convert.ToInt32(row["Validity"].ToString()) == 0)
|
|
| 1259 |
Validity = string.Empty;//"OK";
|
|
| 1260 |
else if (Convert.ToInt32(row["Validity"].ToString()) == 1)
|
|
| 1261 |
Validity = "InValid";
|
|
| 1262 |
else if (Convert.ToInt32(row["Validity"].ToString()) == -1)
|
|
| 1263 |
Validity = "Error";
|
|
| 1260 |
if (Convert.ToInt32(row["IsValid"].ToString()) == 0)
|
|
| 1261 |
IsValid = string.Empty;//"OK";
|
|
| 1262 |
else if (Convert.ToInt32(row["IsValid"].ToString()) == 1)
|
|
| 1263 |
IsValid = "InValid";
|
|
| 1264 |
else if (Convert.ToInt32(row["IsValid"].ToString()) == -1)
|
|
| 1265 |
IsValid = "Error";
|
|
| 1264 | 1266 | |
| 1265 |
newRow["Validity"] = Validity;
|
|
| 1267 |
newRow["IsValid"] = IsValid;
|
|
| 1266 | 1268 | |
| 1267 | 1269 |
newRow["Status"] = row["Status"].ToString(); |
| 1268 | 1270 |
newRow["IncludingVirtualData"] = row["IncludingVirtualData"].ToString(); |
| ... | ... | |
| 1392 | 1394 |
newRow["SubType"] = row["SubType"].ToString(); |
| 1393 | 1395 |
newRow["HeadItemTag"] = row["HeadItemTag"].ToString(); |
| 1394 | 1396 |
newRow["TailItemTag"] = row["TailItemTag"].ToString(); |
| 1395 |
newRow["HeadItemID"] = row["HeadItemID"].ToString();
|
|
| 1396 |
newRow["TailItemID"] = row["TailItemID"].ToString();
|
|
| 1397 |
newRow["HeadItemSPID"] = row["HeadItemSPID"].ToString();
|
|
| 1398 |
newRow["TailItemSPID"] = row["TailItemSPID"].ToString();
|
|
| 1397 | 1399 |
dt.Rows.Add(newRow); |
| 1398 | 1400 |
} |
| 1399 | 1401 |
} |
| ... | ... | |
| 1420 | 1422 |
using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query))) |
| 1421 | 1423 |
{
|
| 1422 | 1424 |
dt = ds.Tables[0].Clone(); |
| 1423 |
dt.Columns["Validity"].DataType = typeof(string);
|
|
| 1425 |
dt.Columns["IsValid"].DataType = typeof(string);
|
|
| 1424 | 1426 |
foreach (DataRow row in ds.Tables[0].Rows) |
| 1425 | 1427 |
{
|
| 1426 | 1428 |
DataRow newRow = dt.NewRow(); |
| ... | ... | |
| 1433 | 1435 |
newRow["TopologySet_OID_Key"] = row["TopologySet_OID_Key"].ToString(); |
| 1434 | 1436 |
newRow["PSNRevisionNumber"] = row["PSNRevisionNumber"].ToString(); |
| 1435 | 1437 |
newRow["PBS"] = row["PBS"].ToString(); |
| 1436 |
newRow["PIDDrawings"] = row["PIDDrawings"].ToString();
|
|
| 1437 |
string Validity = string.Empty;
|
|
| 1438 |
newRow["Drawings"] = row["Drawings"].ToString();
|
|
| 1439 |
string IsValid = string.Empty;
|
|
| 1438 | 1440 | |
| 1439 |
if (Convert.ToInt32(row["Validity"].ToString()) == 0)
|
|
| 1440 |
Validity = string.Empty;//"OK";
|
|
| 1441 |
else if (Convert.ToInt32(row["Validity"].ToString()) == 1)
|
|
| 1442 |
Validity = "InValid";
|
|
| 1443 |
else if (Convert.ToInt32(row["Validity"].ToString()) == -1)
|
|
| 1444 |
Validity = "Error";
|
|
| 1441 |
if (Convert.ToInt32(row["IsValid"].ToString()) == 0)
|
|
| 1442 |
IsValid = string.Empty;//"OK";
|
|
| 1443 |
else if (Convert.ToInt32(row["IsValid"].ToString()) == 1)
|
|
| 1444 |
IsValid = "InValid";
|
|
| 1445 |
else if (Convert.ToInt32(row["IsValid"].ToString()) == -1)
|
|
| 1446 |
IsValid = "Error";
|
|
| 1445 | 1447 | |
| 1446 |
newRow["Validity"] = Validity;
|
|
| 1448 |
newRow["IsValid"] = IsValid;
|
|
| 1447 | 1449 | |
| 1448 | 1450 |
newRow["Status"] = row["Status"].ToString(); |
| 1449 | 1451 |
newRow["IncludingVirtualData"] = row["IncludingVirtualData"].ToString(); |
내보내기 Unified diff