/DTI_PID/ID2PSN/DB.cs - 이력해설 - HYTOS - 일정관리

hytos / DTI_PID / ID2PSN / DB.cs @ 4f02de16

-dae5645
+using System;
 using System.Collections.Generic;
-b9e7a56
+using System.Data;
-ab2f2
+using System.Data.Common;
-d46fca7
+using System.Data.SqlClient;
-c16
+using System.Data.SQLite;
 using System.Linq;
 using System.Text.RegularExpressions;
-dae5645
+            gaqhf
 namespace ID2PSN
+{
-c16
+    public class DB
-dae5645
+            gaqhf
-b9e7a56
+        const string PSN_TOPOLOGY_RULE = "T_PSN_TOPOLOGY_RULE";
         const string PSN_HEADER_SETTING = "T_PSN_HEADER_SETTING";
-a45f13
+        const string PSN_VENTDRAIN_SETTING = "T_PSN_VENTDRAIN_SETTING";
-dfc785c
+        const string PSN_VIEW = "T_PSN_VIEW";
-fd3f
+        const string PSN_TRANSFORMKEYWORD_SETTING = "T_PSN_TRANSFORMKEYWORD_SETTING";
         const string PSN_VALVEGROUP_SETTING = "SPPIDValveGroup";
-            a2ab8a90
+        const string PSN_MULTIWAY_SETTING = "T_PSN_MULTIWAY_SETTING";
-f24b438
+        const string PSN_PATHITEMS = "SPPIDPathItem";
         const string PSN_SEQUENCEDATA = "SPPIDSequenceData";
         const string PSN_PIPESYSTEMNETWORK = "SPPIDPipeSystemNetwork";
         const string PSN_EQUIPMENT = "SPPIDEquipment";
         const string PSN_NOZZLE = "SPPIDNozzle";
         const string PSN_FLUIDCODE = "SPPIDFluidCode";
-be0
+        const string PSN_PIPINGMATLCLASS = "SPPIDPipingMatlClass";
-a45f13
+        const string PSN_TOPOLOGYSET = "SPPIDTopologySet";
-            a36541fb
+        //2021.11.17 추가
         const string PSN_PIPELINE = "SPPIDPipeLine";
-c6
+        //2021.11.26 추가
         const string PSN_INSULATIONPURPOSE = "SPPIDInsulationPurpose";
-fd3f
+        //2022.01.12 추가 //ARS_COMMON DB
         const string PSN_REVISION = "PSNRevision";
         const string PSN_COMMON = "ARS_COMMON";
-fb158
+        //2022.01.19 추가
         const string PSN_PIPESYSTEM = "SPPIDPipeSystem";
-c1965b
+            gaqhf
         //2022.02.03 추가
         const string PSN_NOPOCKETSETTING = "T_PSN_NOPOCKET_SETTING";
-            f2a63376
+        const string PSN_AIRFINCOOLERSETTING = "T_PSN_AIRFINCOOLER_SETTING";
-ae1a1c6
+        /// <summary>
         ///  ID2 Project.db 데이터를 가져온다.
         ///  DB 접속 정보 및 DBType (Sqlite, Mssql) 정보를 가져옴
         ///  - JY
         /// </summary>
         /// <returns></returns>
         public static DataTable GetProject()
-ab2f2
+            LJIYEON
-ae1a1c6
+            DataTable dt = new DataTable();
             ID2Info id2Info = ID2Info.GetInstance();
             try
+            {
                 using (SQLiteConnection connection = new SQLiteConnection(@"Data Source = C:\ProgramData\Digital PID\Project.db", true))
+                {
                     connection.Open();
                     if (connection.State.Equals(ConnectionState.Open))
+                    {
                         using (SQLiteCommand cmd = connection.CreateCommand())
+                        {
                             cmd.CommandText = "SELECT p.[Id], p.Name, p.Path, s.DBTypes_UID, s.Host, s.[User], s.[Password], s.FilePath FROM DBSettings s, Projects p WHERE s.Projects_UID = p.[Id]";
                             using (SQLiteDataReader dr = cmd.ExecuteReader())
                                 dt.Load(dr);
+                        }
+                    }
                     connection.Close();
+                }
+            }
             catch (Exception ex)
+            {
                 System.Windows.Forms.MessageBox.Show(ex.Message);
+            }
             dt.AcceptChanges();
             dt.DefaultView.Sort = "Name";
             dt = dt.DefaultView.ToTable();
-ab2f2
+            LJIYEON
-ae1a1c6
+            return dt;
+        }
-ab2f2
+            LJIYEON
-ae1a1c6
+        /// <summary>
-            c4a35107
+        ///  SQLite에 초기 DB 생성
-ae1a1c6
+        ///  - JY
         /// </summary>
         /// <returns></returns>
-b9e7a56
+        public static bool ConnTestAndCreateTable()
+        {
             bool result = false;
             ID2Info id2Info = ID2Info.GetInstance();
-ae1a1c6
+            LJIYEON
-ff2a9f1
+            using (IAbstractDatabase connection = id2Info.CreateConnection())
-b9e7a56
+            gaqhf
-fe04b33
+                try
-b9e7a56
+            gaqhf
-a96301
+                    var names = connection.GetTableNames();
                     var matched = names.FirstOrDefault(param => param == PSN_HEADER_SETTING);
-ff2a9f1
+                    Dictionary<string, string> dicColCheck = new Dictionary<string, string>();
                     dicColCheck.Add("GROUP_ID", "TEXT");
                     dicColCheck.Add("DESCRIPTION", "TEXT");
                     dicColCheck.Add("INDEX", "INTEGER");
                     dicColCheck.Add("NAME", "TEXT");
-a96301
+                    if (matched == null)
-b9e7a56
+            gaqhf
-a96301
+                        var query = $"CREATE TABLE {PSN_HEADER_SETTING} (GROUP_ID TEXT, DESCRIPTION TEXT, [INDEX] INTEGER, NAME TEXT)";
                         using (var cmd = connection.GetSqlStringCommand(query))
-b9e7a56
+            gaqhf
-a96301
+                            cmd.ExecuteNonQuery();
+                        }
+                    }
-ff2a9f1
+                    else
+                    {
                         AddColumn(PSN_HEADER_SETTING, dicColCheck);
+                    }
-ab2f2
+            LJIYEON
-a96301
+                    matched = names.FirstOrDefault(param => param == PSN_VENTDRAIN_SETTING);
-ff2a9f1
+                    dicColCheck.Clear();
                     dicColCheck.Add("GROUP_ID", "TEXT");
                     dicColCheck.Add("DESCRIPTION", "TEXT");
                     dicColCheck.Add("INDEX", "INTEGER");
                     dicColCheck.Add("NAME", "TEXT");
-a96301
+                    if (matched == null)
+                    {
                         var query = $"CREATE TABLE {PSN_VENTDRAIN_SETTING} (GROUP_ID TEXT, DESCRIPTION TEXT, [INDEX] INTEGER, NAME TEXT)";
                         using (var cmd = connection.GetSqlStringCommand(query))
+                        {
                             cmd.ExecuteNonQuery();
+                        }
+                    }
-ff2a9f1
+                    else
+                    {
                         AddColumn(PSN_VENTDRAIN_SETTING, dicColCheck);
+                    }
-ab2f2
+            LJIYEON
-a96301
+                    matched = names.FirstOrDefault(param => param == PSN_TOPOLOGY_RULE);
-ff2a9f1
+                    dicColCheck.Clear();
                     dicColCheck.Add("UID", "TEXT");
-a96301
+                    if (matched == null)
+                    {
                         var query = $"CREATE TABLE {PSN_TOPOLOGY_RULE} (UID TEXT)";
                         using (var cmd = connection.GetSqlStringCommand(query))
+                        {
                             cmd.ExecuteNonQuery();
+                        }
-ab2f2
+            LJIYEON
-a96301
+                        DataTable topologyRule = new DataTable();
                         topologyRule.Columns.Add("NAME", typeof(string));
-ab2f2
+            LJIYEON
-a96301
+                        topologyRule.Rows.Add("FluidCode");
                         topologyRule.Rows.Add("-");
                         topologyRule.Rows.Add("PipingMaterialsClass");
                         topologyRule.Rows.Add("-");
                         topologyRule.Rows.Add("Tag Seq No");
                         SaveTopologyRule(topologyRule);
+                    }
-ff2a9f1
+                    //else
                     //{
                     //    AddColumn(PSN_TOPOLOGY_RULE, dicColCheck);
                     //}
-f2e
+            LJIYEON
                     matched = names.FirstOrDefault(param => param == PSN_PIPESYSTEMNETWORK);
-ff2a9f1
+                    dicColCheck.Clear();
-            d1afd412
+                    dicColCheck.Add("OID", "NVARCHAR(255)");
                     dicColCheck.Add("Type", "NVARCHAR(255)");
                     dicColCheck.Add("OrderNumber", "NVARCHAR(255)");
                     dicColCheck.Add("Pipeline_OID", "NVARCHAR(255)");
                     dicColCheck.Add("From_Data", "NVARCHAR(255)");
-ff2a9f1
+                    dicColCheck.Add("To_Data", "NVARCHAR(255)");
                     dicColCheck.Add("TopologySet_OID_Key", "NVARCHAR(125)");
                     dicColCheck.Add("PSNRevisionNumber", "NVARCHAR(255)");
                     dicColCheck.Add("IsValid", "INT");
                     dicColCheck.Add("Status", "NVARCHAR(255)");
                     dicColCheck.Add("PBS", "NVARCHAR(255)");
                     dicColCheck.Add("Drawings", "NVARCHAR(255)");
                     dicColCheck.Add("IncludingVirtualData", "NVARCHAR(10)");
-b33e44
+                    dicColCheck.Add("PSNAccuracy", "REAL");
                     dicColCheck.Add("Pocket", "NVARCHAR(10)");
-            d1afd412
+                    dicColCheck.Add("EGTag", "NVARCHAR(255)");
                     dicColCheck.Add("HasMLTags", "NVARCHAR(50)");
-b66a
+                    dicColCheck.Add("GroundLevel", "NVARCHAR(20)");
-            d1afd412
+            이지연
-a96301
+                    if (matched == null)
+                    {
-            f9f2787b
+                        var query = $"CREATE TABLE {PSN_PIPESYSTEMNETWORK} (OID NVARCHAR(255), Type NVARCHAR(255), OrderNumber NVARCHAR(255), Pipeline_OID NVARCHAR(255), From_Data NVARCHAR(255), " +
                             "To_Data NVARCHAR(255), TopologySet_OID_Key NVARCHAR(125), PSNRevisionNumber NVARCHAR(255), IsValid INTEGER, Status NVARCHAR(255), PBS NVARCHAR(255), Drawings NVARCHAR(255), " +
-b66a
+                            "IncludingVirtualData NVARCHAR(10), PSNAccuracy REAL, Pocket NVARCHAR(10), EGTag NVARCHAR(255), HasMLTags NVARCHAR(50), GroundLevel NVARCHAR(50))";
-a96301
+                        using (var cmd = connection.GetSqlStringCommand(query))
+                        {
                             cmd.ExecuteNonQuery();
-ab2f2
+            LJIYEON
+                    }
-ff2a9f1
+                    else
+                    {
                         AddColumn(PSN_PIPESYSTEMNETWORK, dicColCheck);
+                    }
-a96301
+            humkyung
-f2e
+                    matched = names.FirstOrDefault(param => param == PSN_EQUIPMENT);
-ff2a9f1
+                    dicColCheck.Clear();
                     dicColCheck.Add("OID", "NVARCHAR(255)");
                     dicColCheck.Add("ItemTag", "NVARCHAR(255)");
                     dicColCheck.Add("Xcoords", "REAL");
                     dicColCheck.Add("Ycoords", "REAL");
-a96301
+                    if (matched == null)
+                    {
-            f9f2787b
+                        var query = $"CREATE TABLE {PSN_EQUIPMENT} (OID NVARCHAR(255), ItemTag NVARCHAR(255), Xcoords REAL, Ycoords REAL)";
-a96301
+                        using (var cmd = connection.GetSqlStringCommand(query))
+                        {
                             cmd.ExecuteNonQuery();
+                        }
+                    }
-ff2a9f1
+                    else
+                    {
                         AddColumn(PSN_EQUIPMENT, dicColCheck);
+                    }
                     dicColCheck.Clear();
                     dicColCheck.Add("OID", "NVARCHAR(255)");
                     dicColCheck.Add("ItemTag", "NVARCHAR(255)");
                     dicColCheck.Add("Xcoords", "REAL");
                     dicColCheck.Add("Ycoords", "REAL");
                     dicColCheck.Add("Equipment_OID", "NVARCHAR(255)");
                     dicColCheck.Add("Fluid", "NVARCHAR(255)");
                     dicColCheck.Add("NPD", "NVARCHAR(255)");
                     dicColCheck.Add("PMC", "NVARCHAR(255)");
                     dicColCheck.Add("Rotation", "REAL");
                     dicColCheck.Add("FlowDirection", "NVARCHAR(255)");
-a96301
+            humkyung
-f2e
+                    matched = names.FirstOrDefault(param => param == PSN_NOZZLE);
-a96301
+                    if (matched == null)
+                    {
-            f9f2787b
+                        var query = $"CREATE TABLE {PSN_NOZZLE} (OID NVARCHAR(255), ItemTag NVARCHAR(255), Xcoords REAL, Ycoords REAL, Equipment_OID NVARCHAR(255), " +
-cee849
+                            "Fluid NVARCHAR(255), NPD NVARCHAR(255), PMC NVARCHAR(255), Rotation REAL, FlowDirection NVARCHAR(255))";
-a96301
+                        using (var cmd = connection.GetSqlStringCommand(query))
+                        {
                             cmd.ExecuteNonQuery();
+                        }
+                    }
-ff2a9f1
+                    else
+                    {
                         AddColumn(PSN_NOZZLE, dicColCheck);
+                    }
-a96301
+            humkyung
-f2e
+                    matched = names.FirstOrDefault(param => param == PSN_FLUIDCODE);
-ff2a9f1
+                    dicColCheck.Clear();
                     dicColCheck.Add("UID", "NVARCHAR(50)");
                     dicColCheck.Add("Code", "NVARCHAR(255)");
                     dicColCheck.Add("Description", "NVARCHAR(255)");
                     dicColCheck.Add("Condition", "NVARCHAR(255)");
                     dicColCheck.Add("Remarks", "NVARCHAR(255)");
                     dicColCheck.Add("GroundLevel", "NVARCHAR(20)");
-a96301
+                    if (matched == null)
+                    {
-f2e
+                        var query = $"CREATE TABLE {PSN_FLUIDCODE} (UID NVARCHAR(50), Code NVARCHAR(255), Description NVARCHAR(255), Condition NVARCHAR(255), Remarks NVARCHAR(255), GroundLevel NVARCHAR(20))";
-a96301
+                        using (var cmd = connection.GetSqlStringCommand(query))
+                        {
                             cmd.ExecuteNonQuery();
+                        }
+                    }
-ff2a9f1
+                    else
+                    {
                         AddColumn(PSN_FLUIDCODE, dicColCheck);
+                    }
-f2e
+            LJIYEON
                     matched = names.FirstOrDefault(param => param == PSN_PIPINGMATLCLASS);
-ff2a9f1
+                    dicColCheck.Clear();
                     dicColCheck.Add("UID", "NVARCHAR(50)");
                     dicColCheck.Add("Priority", "INTEGER");
                     dicColCheck.Add("Code", "NVARCHAR(255)");
                     dicColCheck.Add("Description", "NVARCHAR(255)");
                     dicColCheck.Add("Condition", "NVARCHAR(255)");
                     dicColCheck.Add("Remarks", "NVARCHAR(255)");
                     dicColCheck.Add("GroundLevel", "NVARCHAR(20)");
-a96301
+                    if (matched == null)
+                    {
-f2e
+                        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))";
-a96301
+                        using (var cmd = connection.GetSqlStringCommand(query))
+                        {
                             cmd.ExecuteNonQuery();
+                        }
+                    }
-ff2a9f1
+                    else
+                    {
                         AddColumn(PSN_PIPINGMATLCLASS, dicColCheck);
+                    }
-a96301
+            humkyung
-f2e
+                    matched = names.FirstOrDefault(param => param == PSN_SEQUENCEDATA);
-ff2a9f1
+                    dicColCheck.Clear();
                     dicColCheck.Add("OID", "NVARCHAR(255)");
                     dicColCheck.Add("SERIALNUMBER", "NVARCHAR(255)");
                     dicColCheck.Add("PathItem_OID", "NVARCHAR(255)");
                     dicColCheck.Add("TopologySet_OID_Key", "NVARCHAR(255)");
-a96301
+                    if (matched == null)
+                    {
-            f9f2787b
+                        var query = $"CREATE TABLE {PSN_SEQUENCEDATA} (OID NVARCHAR(255), SERIALNUMBER NVARCHAR(255), PathItem_OID NVARCHAR(255), TopologySet_OID_Key NVARCHAR(255))";
-a96301
+                        using (var cmd = connection.GetSqlStringCommand(query))
+                        {
                             cmd.ExecuteNonQuery();
+                        }
+                    }
-ff2a9f1
+                    else
+                    {
                         AddColumn(PSN_SEQUENCEDATA, dicColCheck);
+                    }
-a96301
+            humkyung
-f2e
+                    matched = names.FirstOrDefault(param => param == PSN_PATHITEMS);
-ff2a9f1
+                    dicColCheck.Clear();
                     dicColCheck.Add("OID", "NVARCHAR(255)");
                     dicColCheck.Add("SequenceData_OID", "NVARCHAR(255)");
                     dicColCheck.Add("TopologySet_OID", "NVARCHAR(255)");
                     dicColCheck.Add("BranchTopologySet_OID", "NVARCHAR(255)");
                     dicColCheck.Add("PipeLine_OID", "NVARCHAR(255)");
                     dicColCheck.Add("ItemName", "NVARCHAR(255)");
                     dicColCheck.Add("ItemTag", "NVARCHAR(255)");
                     dicColCheck.Add("DESCRIPTION", "NVARCHAR(255)");
                     dicColCheck.Add("CLASS", "NVARCHAR(255)");
                     dicColCheck.Add("SUBCLASS", "NVARCHAR(255)");
                     dicColCheck.Add("TYPE", "NVARCHAR(255)");
                     dicColCheck.Add("PIDNAME", "NVARCHAR(255)");
                     dicColCheck.Add("Equipment_OID", "NVARCHAR(255)");
                     dicColCheck.Add("NPD", "NVARCHAR(255)");
-d7949
+                    dicColCheck.Add("GROUPTAG", "NVARCHAR(255)");
-ff2a9f1
+                    dicColCheck.Add("PipeSystemNetwork_OID", "NVARCHAR(255)");
                     dicColCheck.Add("PipeRun_OID", "NVARCHAR(255)");
                     dicColCheck.Add("ViewPipeSystemNetwork_OID", "NVARCHAR(255)");
-e181
+            LJIYEON
-            bf9e8432
+                    dicColCheck.Add("EqpGroupTag", "NVARCHAR(255)");
                     dicColCheck.Add("MainLineTag", "NVARCHAR(255)");
                     dicColCheck.Add("EGTConnectedPoint", "INT");
                     dicColCheck.Add("EGFlowDirection", "NVARCHAR(10)");
-a96301
+                    if (matched == null)
+                    {
-            f9f2787b
+                        var query = $"CREATE TABLE {PSN_PATHITEMS} (OID NVARCHAR(255), SequenceData_OID NVARCHAR(255), " +
                             "TopologySet_OID NVARCHAR(255), BranchTopologySet_OID NVARCHAR(255), PipeLine_OID NVARCHAR(255), ItemName NVARCHAR(255), ItemTag NVARCHAR(255), DESCRIPTION NVARCHAR(255), " +
-d7949
+                            "CLASS NVARCHAR(255), SUBCLASS NVARCHAR(255), TYPE NVARCHAR(255), PIDNAME NVARCHAR(255), Equipment_OID NVARCHAR(255), NPD NVARCHAR(255), GROUPTAG NVARCHAR(255), PipeSystemNetwork_OID NVARCHAR(255), PipeRun_OID NVARCHAR(255), " +
-            bf9e8432
+                            "ViewPipeSystemNetwork_OID NVARCHAR(255), EqpGroupTag NVARCHAR(255), MainLineTag NVARCHAR(255), EGTConnectedPoint INT, EGFlowDirection NVARCHAR(10))";
-a96301
+                        using (var cmd = connection.GetSqlStringCommand(query))
+                        {
                             cmd.ExecuteNonQuery();
+                        }
+                    }
-ff2a9f1
+                    else
+                    {
                         AddColumn(PSN_PATHITEMS, dicColCheck);
+                    }
-a96301
+                    matched = names.FirstOrDefault(param => param == PSN_VIEW);
-ff2a9f1
+                    dicColCheck.Clear();
                     dicColCheck.Add("OID", "TEXT");
-a96301
+                    if (matched == null)
+                    {
                         var query = $"CREATE TABLE {PSN_VIEW} (OID TEXT)";
                         using (var cmd = connection.GetSqlStringCommand(query))
+                        {
                             cmd.ExecuteNonQuery();
+                        }
+                    }
                     matched = names.FirstOrDefault(param => param == PSN_TOPOLOGYSET);
-ff2a9f1
+                    dicColCheck.Clear();
                     dicColCheck.Add("OID", "NVARCHAR(255)");
                     dicColCheck.Add("Type", "NVARCHAR(255)");
                     dicColCheck.Add("SubType", "NVARCHAR(255)");
                     dicColCheck.Add("HeadItemTag", "NVARCHAR(255)");
                     dicColCheck.Add("TailItemTag", "NVARCHAR(255)");
                     dicColCheck.Add("HeadItemSPID", "NVARCHAR(255)");
                     dicColCheck.Add("TailItemSPID", "NVARCHAR(255)");
-a96301
+                    if (matched == null)
+                    {
-c1965b
+                        var query = $"CREATE TABLE {PSN_TOPOLOGYSET} (OID NVARCHAR(255), Type NVARCHAR(255), SubType NVARCHAR(255), HeadItemTag NVARCHAR(255), TailItemTag NVARCHAR(255), HeadItemSPID NVARCHAR(255), TailItemSPID NVARCHAR(255))";
-a96301
+                        using (var cmd = connection.GetSqlStringCommand(query))
+                        {
                             cmd.ExecuteNonQuery();
+                        }
+                    }
-ff2a9f1
+                    else
+                    {
                         AddColumn(PSN_TOPOLOGYSET, dicColCheck);
+                    }
-            ddc1c369
+                    matched = names.FirstOrDefault(param => param == PSN_TRANSFORMKEYWORD_SETTING);
-ff2a9f1
+                    dicColCheck.Clear();
-fa2c9
+                    dicColCheck.Add("INDEX", "INTEGER");
                     dicColCheck.Add("NAME", "TEXT");
                     dicColCheck.Add("KEYWORD", "TEXT");
-            ddc1c369
+                    if (matched == null)
+                    {
-            d4b1ab29
+                        var query = $"CREATE TABLE {PSN_TRANSFORMKEYWORD_SETTING} ([INDEX] INTEGER, [NAME] TEXT, [KEYWORD] TEXT)";
-            ddc1c369
+                        using (var cmd = connection.GetSqlStringCommand(query))
+                        {
                             cmd.ExecuteNonQuery();
+                        }
+                    }
-ff2a9f1
+                    else
+                    {
                         AddColumn(PSN_TRANSFORMKEYWORD_SETTING, dicColCheck);
+                    }
-            ddc1c369
+            LJIYEON
-            a2ab8a90
+                    matched = names.FirstOrDefault(param => param == PSN_MULTIWAY_SETTING);
                     dicColCheck.Clear();
                     dicColCheck.Add("INDEX", "INTEGER");
                     dicColCheck.Add("NAME", "TEXT");
                     if (matched == null)
+                    {
-f02de16
+                        var query = $"CREATE TABLE {PSN_MULTIWAY_SETTING} ([INDEX] INTEGER, [NAME] TEXT)";
-            a2ab8a90
+                        using (var cmd = connection.GetSqlStringCommand(query))
+                        {
                             cmd.ExecuteNonQuery();
+                        }
+                    }
                     else
+                    {
                         AddColumn(PSN_MULTIWAY_SETTING, dicColCheck);
+                    }
-            a36541fb
+                    matched = names.FirstOrDefault(param => param == PSN_PIPELINE);
-ff2a9f1
+                    dicColCheck.Clear();
                     dicColCheck.Add("OID", "NVARCHAR(255)");
                     dicColCheck.Add("PipeSystem_OID", "NVARCHAR(255)");
                     dicColCheck.Add("FLUID", "NVARCHAR(255)");
                     dicColCheck.Add("PMC", "NVARCHAR(255)");
                     dicColCheck.Add("SEQNUMBER", "NVARCHAR(255)");
                     dicColCheck.Add("INSULATION", "NVARCHAR(255)");
                     dicColCheck.Add("FROM_DATA", "NVARCHAR(255)");
                     dicColCheck.Add("TO_DATA", "NVARCHAR(255)");
                     dicColCheck.Add("Unit", "NVARCHAR(100)");
-            a36541fb
+                    if (matched == null)
+                    {
                         var query = $"CREATE TABLE {PSN_PIPELINE} (OID NVARCHAR(255), PipeSystem_OID NVARCHAR(255), FLUID NVARCHAR(255), PMC NVARCHAR(255), SEQNUMBER NVARCHAR(255), INSULATION NVARCHAR(255), " +
                             $"FROM_DATA NVARCHAR(255), TO_DATA NVARCHAR(255), Unit NVARCHAR(100))";
                         using (var cmd = connection.GetSqlStringCommand(query))
+                        {
                             cmd.ExecuteNonQuery();
+                        }
+                    }
-ff2a9f1
+                    else
+                    {
                         AddColumn(PSN_PIPELINE, dicColCheck);
+                    }
-            a36541fb
+            LJIYEON
-c6
+                    matched = names.FirstOrDefault(param => param == PSN_INSULATIONPURPOSE);
-ff2a9f1
+                    dicColCheck.Clear();
                     dicColCheck.Add("UID", "NVARCHAR(50)");
                     dicColCheck.Add("Code", "NVARCHAR(255)");
                     dicColCheck.Add("Description", "NVARCHAR(255)");
                     dicColCheck.Add("Remarks", "NVARCHAR(255)");
-c6
+                    if (matched == null)
+                    {
                         var query = $"CREATE TABLE {PSN_INSULATIONPURPOSE} (UID NVARCHAR(50), Code NVARCHAR(255), Description NVARCHAR(255), Remarks NVARCHAR(255))";
                         using (var cmd = connection.GetSqlStringCommand(query))
+                        {
                             cmd.ExecuteNonQuery();
+                        }
+                    }
-ff2a9f1
+                    else
+                    {
                         AddColumn(PSN_INSULATIONPURPOSE, dicColCheck);
+                    }
-fd3f
+                    matched = names.FirstOrDefault(param => param == PSN_VALVEGROUP_SETTING);
                     dicColCheck.Clear();
                     dicColCheck.Add("OID", "NVARCHAR(255)");
                     dicColCheck.Add("GroupType", "NVARCHAR(255)");
                     dicColCheck.Add("TagIdentifier", "NVARCHAR(50)");
                     dicColCheck.Add("AttributeName", "NVARCHAR(255)");
                     dicColCheck.Add("SppidSymbolName", "NVARCHAR(255)");
                     if (matched == null)
+                    {
-fb158
+                        var query = $"CREATE TABLE {PSN_VALVEGROUP_SETTING} (OID NVARCHAR(255), GroupType NVARCHAR(255), TagIdentifier NVARCHAR(50), AttributeName NVARCHAR(255), SppidSymbolName NVARCHAR(255))";
-fd3f
+                        using (var cmd = connection.GetSqlStringCommand(query))
+                        {
                             cmd.ExecuteNonQuery();
+                        }
+                    }
                     else
+                    {
                         AddColumn(PSN_VALVEGROUP_SETTING, dicColCheck);
+                    }
-fb158
+                    matched = names.FirstOrDefault(param => param == PSN_PIPESYSTEM);
                     dicColCheck.Clear();
                     dicColCheck.Add("OID", "NVARCHAR(255)");
                     dicColCheck.Add("DESCRIPTION", "NVARCHAR(255)");
                     dicColCheck.Add("FLUID", "NVARCHAR(255)");
                     dicColCheck.Add("PMC", "NVARCHAR(255)");
                     dicColCheck.Add("PipeLineQty", "NVARCHAR(255)");
                     dicColCheck.Add("GroundLevel", "NVARCHAR(20)");
                     if (matched == null)
+                    {
                         var query = $"CREATE TABLE {PSN_PIPESYSTEM} (OID NVARCHAR(255), DESCRIPTION NVARCHAR(255), FLUID NVARCHAR(255), PMC NVARCHAR(255), PipeLineQty NVARCHAR(255), GroundLevel NVARCHAR(20))";
                         using (var cmd = connection.GetSqlStringCommand(query))
+                        {
                             cmd.ExecuteNonQuery();
+                        }
+                    }
                     else
+                    {
                         AddColumn(PSN_PIPESYSTEM, dicColCheck);
+                    }
-c1965b
+            gaqhf
                     matched = names.FirstOrDefault(param => param == PSN_NOPOCKETSETTING);
                     dicColCheck.Clear();
-fa2c9
+                    dicColCheck.Add("INDEX", "INTEGER");
                     dicColCheck.Add("TYPE", "TEXT");
                     dicColCheck.Add("NAME", "TEXT");
-c1965b
+                    if (matched == null)
+                    {
                         var query = $"CREATE TABLE {PSN_NOPOCKETSETTING} ([INDEX] INTEGER, [TYPE] TEXT, [NAME] TEXT)";
                         using (var cmd = connection.GetSqlStringCommand(query))
+                        {
                             cmd.ExecuteNonQuery();
+                        }
+                    }
                     else
+                    {
                         AddColumn(PSN_NOPOCKETSETTING, dicColCheck);
+                    }
-            f2a63376
+                    matched = names.FirstOrDefault(param => param == PSN_AIRFINCOOLERSETTING);
-fa2c9
+            이지연
-            f2a63376
+                    dicColCheck.Clear();
-fa2c9
+                    dicColCheck.Add("INDEX", "INTEGER");
                     dicColCheck.Add("TYPE", "TEXT");
                     dicColCheck.Add("TagIdentifier", "TEXT");
                     dicColCheck.Add("AttributeName", "TEXT");
                     dicColCheck.Add("NAME", "TEXT");
-            f2a63376
+                    if (matched == null)
+                    {
-fa2c9
+                        var query = $"CREATE TABLE {PSN_AIRFINCOOLERSETTING} ([INDEX] INTEGER, [TYPE] TEXT, [TagIdentifier] TEXT, [AttributeName] TEXT, [NAME] TEXT)";
-            f2a63376
+                        using (var cmd = connection.GetSqlStringCommand(query))
+                        {
                             cmd.ExecuteNonQuery();
+                        }
+                    }
                     else
+                    {
                         AddColumn(PSN_AIRFINCOOLERSETTING, dicColCheck);
+                    }
-fd3f
+            LJIYEON
-ff2a9f1
+                    void AddColumn(string TableName, Dictionary<string, string> dicCol)
+                    {
                         var colnames = connection.GetColumnNames(TableName);
                         bool check = false;
                         if (colnames != null)
+                        {
                             foreach (KeyValuePair<string, string> col in dicCol)
+                            {
                                 check = false;
                                 foreach (string c in colnames)
+                                {
                                     if (col.Key.Contains(c))
+                                    {
                                         check = true;
                                         break;
+                                    }
+                                }
                                 if (!check) //없으면 추가
+                                {
                                     string i = string.Empty;
                                     if (col.Value.ToString().ToUpper().Contains("INT") || col.Value.ToString().ToUpper().Contains("REAL"))
                                         i = "DEFAULT 0";
                                     var query = $"ALTER TABLE " + TableName + " ADD [" + col.Key + "] " + col.Value + " " + i + ";";
                                     using (var cmd = connection.GetSqlStringCommand(query))
+                                    {
                                         cmd.ExecuteNonQuery();
+                                    }
+                                }
+                            }
+                        }
+                    }
-c6
+            LJIYEON
-a96301
+                    result = true;
-fe04b33
+            LJIYEON
                 catch (Exception ex)
+                {
                     Log.Write(ex.Message + "\r\n" + ex.StackTrace);
+                }
-b9e7a56
+            gaqhf
-c16
+            LJIYEON
-b9e7a56
+            return result;
+        }
-ae1a1c6
+        // ID2 DB 데이터
-            c4a35107
+        /// <summary>
         /// ID2 데이타베이스에서 OPC 데이터를 조회
         /// </summary>
         /// <returns></returns>
-ae1a1c6
+        public static DataTable SelectOPCRelations()
-b9e7a56
+            gaqhf
-a96301
+            DataTable dt = null;
-b9e7a56
+            ID2Info id2Info = ID2Info.GetInstance();
-fe04b33
+            LJIYEON
-a96301
+            using (IAbstractDatabase connection = id2Info.CreateConnection())
-b9e7a56
+            gaqhf
-fe04b33
+                try
-b9e7a56
+            gaqhf
-a96301
+                    var query = "SELECT * FROM OPCRelations;";
                     using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query)))
-ab2f2
+            LJIYEON
-a96301
+                        dt = ds.Tables[0].Copy();
-b9e7a56
+            gaqhf
+                }
-fe04b33
+                catch (Exception ex)
-a45f13
+            gaqhf
-fe04b33
+                    Log.Write(ex.Message + "\r\n" + ex.StackTrace);
+                }
-a45f13
+            gaqhf
-ae1a1c6
+            LJIYEON
-a45f13
+            return dt;
+        }
-b9e7a56
+            gaqhf
-            c4a35107
+        /// <summary>
         /// ID2 데이타베이스에서 도면 데이터를 조회
         /// </summary>
         /// <returns></returns>
-ae1a1c6
+        public static DataTable SelectDrawings()
-b9e7a56
+            gaqhf
-a96301
+            DataTable dt = null;
-b9e7a56
+            ID2Info id2Info = ID2Info.GetInstance();
-fe04b33
+            LJIYEON
-a96301
+            using (IAbstractDatabase connection = id2Info.CreateConnection())
-b9e7a56
+            gaqhf
-fe04b33
+                try
-b9e7a56
+            gaqhf
-            c3b48db0
+                    var query = "SELECT DISTINCT NAME FROM [Drawings] order by Name";
-a96301
+                    using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query)))
-ae1a1c6
+            LJIYEON
-a96301
+                        dt = ds.Tables[0].Copy();
-b9e7a56
+            gaqhf
+                }
-fe04b33
+                catch (Exception ex)
-a45f13
+            gaqhf
-fe04b33
+                    Log.Write(ex.Message + "\r\n" + ex.StackTrace);
+                }
-a45f13
+            gaqhf
-ae1a1c6
+            LJIYEON
             return dt;
-a45f13
+            gaqhf
-            abee404a
+            LJIYEON
-            ec1cc293
+        public static DataTable AllDrawings()
+        {
             DataTable dt = null;
             ID2Info id2Info = ID2Info.GetInstance();
             using (IAbstractDatabase connection = id2Info.CreateConnection())
+            {
                 try
+                {
                     var query = "SELECT * FROM [Drawings]";
                     using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query)))
+                    {
                         dt = ds.Tables[0].Copy();
+                    }
+                }
                 catch (Exception ex)
+                {
                     Log.Write(ex.Message + "\r\n" + ex.StackTrace);
+                }
+            }
             return dt;
+        }
-ae1a1c6
+        public static DataTable SelectLineProperties()
-b9e7a56
+            gaqhf
-a96301
+            DataTable dt = null;
-b9e7a56
+            ID2Info id2Info = ID2Info.GetInstance();
-a96301
+            humkyung
             using (IAbstractDatabase connection = id2Info.CreateConnection())
-b9e7a56
+            gaqhf
-fe04b33
+                try
-b9e7a56
+            gaqhf
-a96301
+                    var query = "SELECT * FROM LineProperties";
                     using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query)))
-ae1a1c6
+            LJIYEON
-a96301
+                        dt = ds.Tables[0].Copy();
-b9e7a56
+            gaqhf
+                }
-fe04b33
+                catch (Exception ex)
-b9e7a56
+            gaqhf
-fe04b33
+                    Log.Write(ex.Message + "\r\n" + ex.StackTrace);
+                }
-b9e7a56
+            gaqhf
-fe04b33
+            LJIYEON
-b9e7a56
+            return dt;
+        }
-c16
+            LJIYEON
-ae1a1c6
+        public static DataTable SelectFluidCode()
-b9e7a56
+            gaqhf
-a96301
+            DataTable dt = null;
-b9e7a56
+            ID2Info id2Info = ID2Info.GetInstance();
-fe04b33
+            LJIYEON
-a96301
+            using (IAbstractDatabase connection = id2Info.CreateConnection())
-b9e7a56
+            gaqhf
-fe04b33
+                try
-b9e7a56
+            gaqhf
-a96301
+                    var query = "SELECT * FROM FluidCode";
-c16
+                    using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query)))
-ae1a1c6
+            LJIYEON
-a96301
+                        dt = ds.Tables[0].Copy();
-b9e7a56
+            gaqhf
+                }
-fe04b33
+                catch (Exception ex)
-b9e7a56
+            gaqhf
-fe04b33
+                    Log.Write(ex.Message + "\r\n" + ex.StackTrace);
+                }
-ae1a1c6
+            LJIYEON
             return dt;
+        }
         public static DataTable SelectPipingMaterialsClass()
+        {
-a96301
+            DataTable dt = null;
-ae1a1c6
+            ID2Info id2Info = ID2Info.GetInstance();
-fe04b33
+            LJIYEON
-a96301
+            using (IAbstractDatabase connection = id2Info.CreateConnection())
-ae1a1c6
+            LJIYEON
-fe04b33
+                try
-b9e7a56
+            gaqhf
-a96301
+                    var query = "SELECT * FROM PipingMaterialsClass";
                     using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query)))
-ae1a1c6
+            LJIYEON
-a96301
+                        dt = ds.Tables[0].Copy();
-ae1a1c6
+            LJIYEON
+                }
-fe04b33
+                catch (Exception ex)
-ae1a1c6
+            LJIYEON
-fe04b33
+                    Log.Write(ex.Message + "\r\n" + ex.StackTrace);
+                }
-b9e7a56
+            gaqhf
-ae1a1c6
+            LJIYEON
-b9e7a56
+            return dt;
+        }
-ae1a1c6
+        public static DataTable SelectPSNPIPINGMATLCLASS()
-b9e7a56
+            gaqhf
-a96301
+            DataTable dt = null;
-b9e7a56
+            ID2Info id2Info = ID2Info.GetInstance();
-fe04b33
+            LJIYEON
-ff2a9f1
+            using (IAbstractDatabase connection = id2Info.CreateConnection())
-ae1a1c6
+            LJIYEON
-fe04b33
+                try
+                {
-a96301
+                    var query = $"SELECT * FROM {PSN_PIPINGMATLCLASS}";
                     using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query)))
-ae1a1c6
+            LJIYEON
-a96301
+                        dt = ds.Tables[0].Copy();
-ae1a1c6
+            LJIYEON
-fe04b33
+            LJIYEON
                 catch (Exception ex)
+                {
                     Log.Write(ex.Message + "\r\n" + ex.StackTrace);
+                }
-ae1a1c6
+            LJIYEON
             return dt;
+        }
-            d1afd412
+            이지연
-c6
+        public static DataTable SelectInsulationPurpose()
+        {
             DataTable dt = null;
             ID2Info id2Info = ID2Info.GetInstance();
             using (IAbstractDatabase connection = id2Info.CreateConnection())
+            {
                 try
+                {
                     var query = "SELECT * FROM InsulationPurpose";
                     using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query)))
+                    {
                         dt = ds.Tables[0].Copy();
+                    }
+                }
                 catch (Exception ex)
+                {
                     Log.Write(ex.Message + "\r\n" + ex.StackTrace);
+                }
+            }
             return dt;
+        }
         public static DataTable SelectPSNINSULATIONPURPOSE()
+        {
             DataTable dt = null;
             ID2Info id2Info = ID2Info.GetInstance();
-ff2a9f1
+            using (IAbstractDatabase connection = id2Info.CreateConnection())
-c6
+            LJIYEON
                 try
+                {
                     var query = $"SELECT * FROM {PSN_INSULATIONPURPOSE}";
                     using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query)))
+                    {
                         dt = ds.Tables[0].Copy();
+                    }
+                }
                 catch (Exception ex)
+                {
                     Log.Write(ex.Message + "\r\n" + ex.StackTrace);
+                }
+            }
             return dt;
+        }
-ae1a1c6
+        public static DataTable SelectNominalDiameter()
+        {
-a96301
+            DataTable dt = null;
-ae1a1c6
+            ID2Info id2Info = ID2Info.GetInstance();
-fe04b33
+            LJIYEON
-a96301
+            using (IAbstractDatabase connection = id2Info.CreateConnection())
-ae1a1c6
+            LJIYEON
-fe04b33
+                try
-b9e7a56
+            gaqhf
-a96301
+                    var query = "SELECT * FROM NominalDiameter ORDER BY Metric DESC";
                     using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query)))
-ae1a1c6
+            LJIYEON
-a96301
+                        dt = ds.Tables[0].Copy();
-ae1a1c6
+            LJIYEON
-b9e7a56
+            gaqhf
-fe04b33
+                catch (Exception ex)
-ae1a1c6
+            LJIYEON
-fe04b33
+                    Log.Write(ex.Message + "\r\n" + ex.StackTrace);
+                }
-ae1a1c6
+            LJIYEON
-            c4a35107
+            ///TODO: need to check below code
-ae1a1c6
+            dt.Rows.RemoveAt(0);
             dt.Rows.RemoveAt(0);
             dt.Rows.RemoveAt(0);
             dt.Rows.RemoveAt(0);
-b9e7a56
+            return dt;
+        }
-            abee404a
+            LJIYEON
-            b267209c
+        public static DataTable SelectAllSymbolAttribute()
+        {
             DataTable dt = null;
             ID2Info id2Info = ID2Info.GetInstance();
             using (IAbstractDatabase connection = id2Info.CreateConnection())
+            {
                 try
+                {
-c2919
+                    var query = "SELECT B.Name AS SymbolName, Attribute AS SymbolAttribute, A.SymbolType_UID ,Attribute ,DisplayAttribute ,AttributeType, Expression FROM SymbolAttribute A INNER JOIN Symbol B ON A.SymbolType_UID = B.SymbolType_UID; ";
-            b267209c
+                    using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query)))
+                    {
                         dt = ds.Tables[0].Copy();
+                    }
+                }
                 catch (Exception ex)
+                {
                     Log.Write(ex.Message + "\r\n" + ex.StackTrace);
+                }
+            }
             return dt;
+        }
-ae1a1c6
+        public static DataTable SelectSymbolAttribute()
-b9e7a56
+            gaqhf
-b86f8b
+            DataTable dt = null;
-b9e7a56
+            ID2Info id2Info = ID2Info.GetInstance();
-fe04b33
+            LJIYEON
-a96301
+            using (IAbstractDatabase connection = id2Info.CreateConnection())
-b9e7a56
+            gaqhf
-fe04b33
+                try
-b9e7a56
+            gaqhf
-            d1afd412
+                    // var query = "SELECT DISTINCT Attribute, DisplayAttribute FROM SymbolAttribute;";
-d1d50
+                    var query = "SELECT DISTINCT Attribute FROM SymbolAttribute;";
-a96301
+                    using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query)))
-ae1a1c6
+            LJIYEON
-a96301
+                        dt = ds.Tables[0].Copy();
-ae1a1c6
+            LJIYEON
+                }
-fe04b33
+                catch (Exception ex)
-ae1a1c6
+            LJIYEON
-fe04b33
+                    Log.Write(ex.Message + "\r\n" + ex.StackTrace);
+                }
-ae1a1c6
+            LJIYEON
-fe04b33
+            LJIYEON
-ae1a1c6
+            return dt;
+        }
-            bd86dd48
+        public static DataTable SelectTieInSymbolAttribute()
+        {
             DataTable dt = null;
             ID2Info id2Info = ID2Info.GetInstance();
             using (IAbstractDatabase connection = id2Info.CreateConnection())
+            {
                 try
+                {
                     // var query = "SELECT DISTINCT Attribute, DisplayAttribute FROM SymbolAttribute;";
                     var query = string.Empty;
                     if (id2Info.ID2DBType == ID2DB_Type.MSSQL)
-            ecdd26cc
+                        query = "SELECT DISTINCT Attribute FROM SymbolAttribute WHERE SymbolType_UID IN(SELECT SymbolType_UID FROM Symbol WHERE CONVERT(varchar(Max), isnull([Name], '')) = 'TIEINPOINT');"; //얘는 UPPER안해줘도 나옴
-            bd86dd48
+                    else
-            ecdd26cc
+                        query = "SELECT DISTINCT Attribute FROM SymbolAttribute WHERE SymbolType_UID IN(SELECT SymbolType_UID FROM Symbol WHERE ifnull(UPPER([Name]), '') = 'TIEINPOINT');";
-            bd86dd48
+            이지연
                     using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query)))
+                    {
                         dt = ds.Tables[0].Copy();
+                    }
+                }
                 catch (Exception ex)
+                {
                     Log.Write(ex.Message + "\r\n" + ex.StackTrace);
+                }
+            }
             return dt;
+        }
-ae1a1c6
+        public static DataTable SelectSymbolName()
+        {
-a96301
+            DataTable dt = null;
-ae1a1c6
+            ID2Info id2Info = ID2Info.GetInstance();
-fe04b33
+            LJIYEON
-a96301
+            using (IAbstractDatabase connection = id2Info.CreateConnection())
-ae1a1c6
+            LJIYEON
-fe04b33
+                try
-ae1a1c6
+            LJIYEON
-a96301
+                    var query = "SELECT * FROM SymbolName;";
                     using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query)))
-ae1a1c6
+            LJIYEON
-a96301
+                        dt = ds.Tables[0].Copy();
-ae1a1c6
+            LJIYEON
+                }
-fe04b33
+                catch (Exception ex)
-ae1a1c6
+            LJIYEON
-fe04b33
+                    Log.Write(ex.Message + "\r\n" + ex.StackTrace);
+                }
-ae1a1c6
+            LJIYEON
-fe04b33
+            LJIYEON
-ae1a1c6
+            return dt;
-c16
+            LJIYEON
-ae1a1c6
+            LJIYEON
         public static double[] GetDrawingSize()
+        {
             double[] result = null;
             ID2Info id2Info = ID2Info.GetInstance();
-a96301
+            using (IAbstractDatabase connection = id2Info.CreateConnection())
-ae1a1c6
+            LJIYEON
-fe04b33
+                try
-ae1a1c6
+            LJIYEON
-            d36e2fe0
+                    var query = "SELECT value FROM Configuration WHERE Section = 'Area' AND [Key] = 'Drawing';";
-a96301
+                    using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query)))
-ae1a1c6
+            LJIYEON
-a96301
+                        if (ds.Tables[0].Rows.Count == 1)
-fe04b33
+            LJIYEON
-a96301
+                            string value = ds.Tables[0].Rows[0][0].ToString();
-fe04b33
+                            string[] split = value.Split(new char[] { ',' });
                             result = new double[] {
-c16
+                                Convert.ToDouble(Regex.Replace(split[0], @"[^0-9]", string.Empty)),
                                 Convert.ToDouble(Regex.Replace(split[1], @"[^0-9]", string.Empty)),
                                 Convert.ToDouble(Regex.Replace(split[2], @"[^0-9]", string.Empty)),
                                 Convert.ToDouble(Regex.Replace(split[3], @"[^0-9]", string.Empty))
-ae1a1c6
+                                };
-fe04b33
+                            result = new double[] {
-ae1a1c6
+                                Math.Min(result[0], result[2]),
                                 Math.Min(result[1], result[3]),
                                 Math.Max(result[0], result[2]),
                                 Math.Max(result[1], result[3])
                                 };
+                        }
+                    }
+                }
-fe04b33
+                catch (Exception ex)
-ae1a1c6
+            LJIYEON
-fe04b33
+                    Log.Write(ex.Message + "\r\n" + ex.StackTrace);
+                }
-ae1a1c6
+            LJIYEON
             return result;
+        }
         public static DataTable GetEquipmentType()
+        {
-a96301
+            DataTable dt = null;
-ae1a1c6
+            ID2Info id2Info = ID2Info.GetInstance();
-fe04b33
+            LJIYEON
-a96301
+            using (IAbstractDatabase connection = id2Info.CreateConnection())
-ae1a1c6
+            LJIYEON
-fe04b33
+                try
-ae1a1c6
+            LJIYEON
-a96301
+                    var query = "SELECT Type FROM SymbolType WHERE Category = 'Equipment';";
                     using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query)))
-ae1a1c6
+            LJIYEON
-a96301
+                        dt = ds.Tables[0].Copy();
-ae1a1c6
+            LJIYEON
+                }
-fe04b33
+                catch (Exception ex)
-ae1a1c6
+            LJIYEON
-fe04b33
+                    Log.Write(ex.Message + "\r\n" + ex.StackTrace);
+                }
-b9e7a56
+            gaqhf
-fe04b33
+            LJIYEON
-b9e7a56
+            return dt;
+        }
-            abee404a
+            LJIYEON
-ae1a1c6
+        /// <summary>
         ///  Zoom 을 위하여 저장 T_PSN_VIEW 데이터로 PSN 데이터지만 Msqql 과 Sqlite 둘다 저장되어 있음
         ///  => ID2 가 DB 타입에 따라서 바라보는 DB가 mssql이냐 sqlite냐로 지정되기 때문에 zoom 기능을 그대로 사용하려면 해당 데이터는 psn도 id2 dbtype에 맞춰서 저장 및 로드해야함
-            c4a35107
+        ///  => 더 이상 사용하지 않음
-ae1a1c6
+        /// </summary>
         /// <param name="values"></param>
         /// <returns></returns>
         public static bool SaveView(List<string> values)
-b9e7a56
+            gaqhf
             ID2Info id2Info = ID2Info.GetInstance();
-ae1a1c6
+            LJIYEON
             bool result = true;
-a96301
+            using (IAbstractDatabase connection = id2Info.CreateConnection())
+            {
                 try
-b9e7a56
+            gaqhf
-a96301
+                    using (var txn = connection.BeginTransaction())
-b9e7a56
+            gaqhf
-a96301
+                        try
-b9e7a56
+            gaqhf
-a96301
+                            var query = $"DELETE FROM {PSN_VIEW}";
                             connection.ExecuteNonQuery(connection.GetSqlStringCommand(query), txn);
                             foreach (string value in values)
-ae1a1c6
+            LJIYEON
-ff2a9f1
+                                query = $"INSERT INTO {PSN_VIEW} (OID) VALUES (@OID)";
-a96301
+                                var cmd = connection.GetSqlStringCommand(query);
                                 AddWithValue(cmd, "@OID", value);
                                 connection.ExecuteNonQuery(cmd, txn);
-ae1a1c6
+            LJIYEON
-a96301
+                            txn.Commit();
+                        }
                         catch (Exception ex)
+                        {
                             txn.Rollback();
                             result = false;
-b9e7a56
+            gaqhf
-ae1a1c6
+            LJIYEON
-b9e7a56
+            gaqhf
-a96301
+                catch (Exception ex)
+                {
                     System.Windows.Forms.MessageBox.Show(ex.Message);
                     result = false;
+                }
+            }
-ae1a1c6
+            return result;
-b9e7a56
+            gaqhf
-ae1a1c6
+        public static bool DeleteView()
-b9e7a56
+            gaqhf
             ID2Info id2Info = ID2Info.GetInstance();
-ae1a1c6
+            LJIYEON
             bool result = true;
-a96301
+            using (IAbstractDatabase connection = id2Info.CreateConnection())
+            {
                 try
-b9e7a56
+            gaqhf
-a96301
+                    using (var txn = connection.BeginTransaction())
-b9e7a56
+            gaqhf
-a96301
+                        try
-ae1a1c6
+            LJIYEON
-a96301
+                            var query = $"DELETE FROM {PSN_VIEW}";
                             connection.ExecuteNonQuery(connection.GetSqlStringCommand(query), txn);
                             txn.Commit();
+                        }
                         catch (Exception ex)
+                        {
                             txn.Rollback();
                             result = false;
-ae1a1c6
+            LJIYEON
-b9e7a56
+            gaqhf
+                }
-a96301
+                catch (Exception ex)
+                {
                     System.Windows.Forms.MessageBox.Show(ex.Message);
                     result = false;
+                }
+            }
-ae1a1c6
+            LJIYEON
             return result;
-b9e7a56
+            gaqhf
-            abee404a
+            LJIYEON
-ae1a1c6
+        //PSN Sqlite
         public static DataTable SelectHeaderSetting()
-b9e7a56
+            gaqhf
-a96301
+            DataTable dt = null;
-b9e7a56
+            ID2Info id2Info = ID2Info.GetInstance();
-ae1a1c6
+            LJIYEON
-ff2a9f1
+            using (IAbstractDatabase connection = id2Info.CreateConnection())
-b9e7a56
+            gaqhf
                 try
+                {
-a96301
+                    var query = $@"SELECT GROUP_ID, DESCRIPTION, [INDEX], NAME FROM {PSN_HEADER_SETTING};";
                     using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query)))
-b9e7a56
+            gaqhf
-a96301
+                        dt = ds.Tables[0].Copy();
-b9e7a56
+            gaqhf
+                }
                 catch (Exception ex)
+                {
                     Log.Write(ex.Message + "\r\n" + ex.StackTrace);
+                }
+            }
-ae1a1c6
+            LJIYEON
-b9e7a56
+            return dt;
+        }
-ae1a1c6
+        public static DataTable SelectVentDrainSetting()
-b9e7a56
+            gaqhf
-a96301
+            DataTable dt = null;
-b9e7a56
+            ID2Info id2Info = ID2Info.GetInstance();
-a96301
+            humkyung
-ff2a9f1
+            using (IAbstractDatabase connection = id2Info.CreateConnection())
-b9e7a56
+            gaqhf
                 try
+                {
-a96301
+                    var query = $@"SELECT GROUP_ID, DESCRIPTION, [INDEX], NAME FROM {PSN_VENTDRAIN_SETTING};";
                     using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query)))
-b9e7a56
+            gaqhf
-a96301
+                        dt = ds.Tables[0].Copy();
-b9e7a56
+            gaqhf
+                }
                 catch (Exception ex)
+                {
                     Log.Write(ex.Message + "\r\n" + ex.StackTrace);
+                }
+            }
-a96301
+            humkyung
-b9e7a56
+            return dt;
+        }
-            abee404a
+            LJIYEON
-            ddc1c369
+        public static DataTable SelectKeywordsSetting()
+        {
             DataTable dt = null;
             ID2Info id2Info = ID2Info.GetInstance();
-ff2a9f1
+            using (IAbstractDatabase connection = id2Info.CreateConnection())
-            ddc1c369
+            LJIYEON
                 try
+                {
-            d4b1ab29
+                    var query = $@"SELECT [KEYWORD], [INDEX], [NAME] FROM {PSN_TRANSFORMKEYWORD_SETTING};";
-            ddc1c369
+                    using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query)))
+                    {
                         dt = ds.Tables[0].Copy();
+                    }
+                }
                 catch (Exception ex)
+                {
                     Log.Write(ex.Message + "\r\n" + ex.StackTrace);
+                }
+            }
             return dt;
+        }
-            a2ab8a90
+        public static DataTable SelectMultiwaysSetting()
+        {
             DataTable dt = null;
             ID2Info id2Info = ID2Info.GetInstance();
             using (IAbstractDatabase connection = id2Info.CreateConnection())
+            {
                 try
+                {
-f02de16
+                    var query = $@"SELECT [INDEX], [NAME] FROM {PSN_MULTIWAY_SETTING};";
-            a2ab8a90
+                    using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query)))
+                    {
                         dt = ds.Tables[0].Copy();
+                    }
+                }
                 catch (Exception ex)
+                {
                     Log.Write(ex.Message + "\r\n" + ex.StackTrace);
+                }
+            }
             return dt;
+        }
-fd3f
+        public static DataTable SelectValveGroupItemsSetting()
+        {
             DataTable dt = null;
             ID2Info id2Info = ID2Info.GetInstance();
             using (IAbstractDatabase connection = id2Info.CreateConnection())
+            {
                 try
+                {
                     var query = $@"SELECT OID, GroupType, TagIdentifier, AttributeName, SppidSymbolName FROM {PSN_VALVEGROUP_SETTING};";
                     using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query)))
+                    {
                         dt = ds.Tables[0].Copy();
+                    }
+                }
                 catch (Exception ex)
+                {
                     Log.Write(ex.Message + "\r\n" + ex.StackTrace);
+                }
+            }
             return dt;
+        }
-            d1afd412
+            이지연
-c1965b
+        public static DataTable SelectEquipmentNoPocketSetting()
+        {
             DataTable dt = null;
             ID2Info id2Info = ID2Info.GetInstance();
             using (IAbstractDatabase connection = id2Info.CreateConnection())
+            {
                 try
+                {
                     var query = $@"SELECT [INDEX], [TYPE], [NAME] FROM {PSN_NOPOCKETSETTING};";
                     using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query)))
+                    {
                         dt = ds.Tables[0].Copy();
+                    }
+                }
                 catch (Exception ex)
+                {
                     Log.Write(ex.Message + "\r\n" + ex.StackTrace);
+                }
+            }
             return dt;
+        }
-            f2a63376
+        public static DataTable SelectAirFinCoolerSetting()
+        {
             DataTable dt = null;
             ID2Info id2Info = ID2Info.GetInstance();
             using (IAbstractDatabase connection = id2Info.CreateConnection())
+            {
                 try
+                {
-fa2c9
+                    var query = $@"SELECT [INDEX], [TYPE], [TagIdentifier], [AttributeName], [NAME] FROM {PSN_AIRFINCOOLERSETTING};";
-            f2a63376
+                    using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query)))
+                    {
                         dt = ds.Tables[0].Copy();
+                    }
+                }
                 catch (Exception ex)
+                {
                     Log.Write(ex.Message + "\r\n" + ex.StackTrace);
+                }
+            }
-            d1afd412
+            return dt;
-            f2a63376
+            이지연
-ae1a1c6
+        public static bool SaveHeaderSetting(List<HeaderInfo> headerInfos)
-b9e7a56
+            gaqhf
             ID2Info id2Info = ID2Info.GetInstance();
-ff2a9f1
+            using (IAbstractDatabase connection = id2Info.CreateConnection())
-b9e7a56
+            gaqhf
                 try
+                {
-a96301
+                    using (var txn = connection.BeginTransaction())
-b9e7a56
+            gaqhf
-a96301
+                        var query = $"DELETE FROM {PSN_HEADER_SETTING}";
                         connection.ExecuteNonQuery(connection.GetSqlStringCommand(query), txn);
-ae1a1c6
+            LJIYEON
                         foreach (HeaderInfo headerInfo in headerInfos)
+                        {
                             foreach (HeaderItem item in headerInfo.HeaderItems)
+                            {
-ff2a9f1
+                                query = $"INSERT INTO {PSN_HEADER_SETTING} (GROUP_ID, DESCRIPTION, [INDEX], NAME) VALUES (@GROUP_ID, @DESCRIPTION, @INDEX, @NAME)";
-a96301
+                                var cmd = connection.GetSqlStringCommand(query);
                                 AddWithValue(cmd, "@GROUP_ID", headerInfo.UID);
                                 AddWithValue(cmd, "@DESCRIPTION", headerInfo.Description);
                                 AddWithValue(cmd, "@INDEX", item.Index);
                                 AddWithValue(cmd, "@NAME", item.Name);
                                 connection.ExecuteNonQuery(cmd, txn);
-ae1a1c6
+            LJIYEON
+                        }
-bdaeed
+                        txn.Commit();
-b9e7a56
+            gaqhf
-            d1afd412
+            이지연
-b9e7a56
+            gaqhf
                 catch (Exception ex)
+                {
                     Log.Write(ex.Message + "\r\n" + ex.StackTrace);
-ae1a1c6
+                    return false;
-b9e7a56
+            gaqhf
+            }
-ae1a1c6
+            return true;
-b9e7a56
+            gaqhf
-            abee404a
+            LJIYEON
-ae1a1c6
+        public static bool SaveVentDrainSetting(List<VentDrainInfo> ventDrainInfos)
-b9e7a56
+            gaqhf
             ID2Info id2Info = ID2Info.GetInstance();
-ff2a9f1
+            using (IAbstractDatabase connection = id2Info.CreateConnection())
-b9e7a56
+            gaqhf
-a96301
+                using (var txn = connection.BeginTransaction())
-b9e7a56
+            gaqhf
-a96301
+                    try
-b9e7a56
+            gaqhf
-a96301
+                        var query = $"DELETE FROM {PSN_VENTDRAIN_SETTING}";
                         connection.ExecuteNonQuery(connection.GetSqlStringCommand(query), txn);
-ae1a1c6
+            LJIYEON
                         foreach (VentDrainInfo ventDrainInfo in ventDrainInfos)
+                        {
                             foreach (VentDrainItem item in ventDrainInfo.VentDrainItems)
+                            {
-ff2a9f1
+                                query = $"INSERT INTO {PSN_VENTDRAIN_SETTING} (GROUP_ID, DESCRIPTION, [INDEX], NAME) VALUES (@GROUP_ID, @DESCRIPTION, @INDEX, @NAME)";
-a96301
+                                var cmd = connection.GetSqlStringCommand(query);
                                 AddWithValue(cmd, "@GROUP_ID", ventDrainInfo.UID);
                                 AddWithValue(cmd, "@DESCRIPTION", ventDrainInfo.Description);
                                 AddWithValue(cmd, "@INDEX", item.Index);
                                 AddWithValue(cmd, "@NAME", item.Name);
                                 connection.ExecuteNonQuery(cmd, txn);
-ae1a1c6
+            LJIYEON
+                        }
-bdaeed
+            LJIYEON
                         txn.Commit();
-b9e7a56
+            gaqhf
-a96301
+                    catch (Exception ex)
+                    {
                         Log.Write(ex.Message + "\r\n" + ex.StackTrace);
                         return false;
+                    }
-b9e7a56
+            gaqhf
+            }
-a96301
+            humkyung
-ae1a1c6
+            return true;
-b9e7a56
+            gaqhf
-            abee404a
+            LJIYEON
-fd3f
+        public static bool SaveValveGroupItemsSetting(List<ValveGroupItem> valveGroupItems)
+        {
             ID2Info id2Info = ID2Info.GetInstance();
             using (IAbstractDatabase connection = id2Info.CreateConnection())
+            {
                 using (var txn = connection.BeginTransaction())
+                {
                     try
+                    {
                         var query = $"DELETE FROM {PSN_VALVEGROUP_SETTING}";
                         connection.ExecuteNonQuery(connection.GetSqlStringCommand(query), txn);
                         foreach (ValveGroupItem item in valveGroupItems)
+                        {
                             query = $"INSERT INTO {PSN_VALVEGROUP_SETTING} (OID, GroupType, TagIdentifier, AttributeName, SppidSymbolName) " +
                                 $"VALUES (@OID, @GroupType, @TagIdentifier, @AttributeName, @SppidSymbolName)";
                             var cmd = connection.GetSqlStringCommand(query);
                             AddWithValue(cmd, "@OID", item.OID);
                             AddWithValue(cmd, "@GroupType", item.GroupType);
                             AddWithValue(cmd, "@TagIdentifier", item.TagIdentifier);
                             AddWithValue(cmd, "@AttributeName", item.AttributeName);
                             AddWithValue(cmd, "@SppidSymbolName", item.SppidSymbolName);
                             connection.ExecuteNonQuery(cmd, txn);
+                        }
                         txn.Commit();
+                    }
                     catch (Exception ex)
+                    {
                         Log.Write(ex.Message + "\r\n" + ex.StackTrace);
                         return false;
+                    }
+                }
+            }
             return true;
+        }
-ab98ea3
+        public static bool SaveKeywordsSetting(List<KeywordItem> keywordItems)
-            ddc1c369
+            LJIYEON
             ID2Info id2Info = ID2Info.GetInstance();
-ff2a9f1
+            using (IAbstractDatabase connection = id2Info.CreateConnection())
-            ddc1c369
+            LJIYEON
                 using (var txn = connection.BeginTransaction())
+                {
                     try
+                    {
-bdaeed
+                        var query = $"DELETE FROM {PSN_TRANSFORMKEYWORD_SETTING}";
-            ddc1c369
+                        connection.ExecuteNonQuery(connection.GetSqlStringCommand(query), txn);
-            d1afd412
+            이지연
-ab98ea3
+                        foreach (KeywordItem item in keywordItems)
-            ddc1c369
+            LJIYEON
-ff2a9f1
+                            query = $"INSERT INTO {PSN_TRANSFORMKEYWORD_SETTING} ([INDEX], NAME, KEYWORD) VALUES (@INDEX, @NAME, @KEYWORD)";
-ab98ea3
+                            var cmd = connection.GetSqlStringCommand(query);
                             AddWithValue(cmd, "@INDEX", item.Index);
                             AddWithValue(cmd, "@NAME", item.Name);
-            d1afd412
+                            AddWithValue(cmd, "@KEYWORD", item.Keyword);
-ab98ea3
+                            connection.ExecuteNonQuery(cmd, txn);
-            ddc1c369
+            LJIYEON
-            d1afd412
+            이지연
-bdaeed
+                        txn.Commit();
-            ddc1c369
+            LJIYEON
                     catch (Exception ex)
+                    {
                         Log.Write(ex.Message + "\r\n" + ex.StackTrace);
                         return false;
+                    }
+                }
+            }
             return true;
+        }
-            a2ab8a90
+        public static bool SaveMultiwaysSetting(List<MultiwayItem> multiwayItems)
+        {
             ID2Info id2Info = ID2Info.GetInstance();
             using (IAbstractDatabase connection = id2Info.CreateConnection())
+            {
                 using (var txn = connection.BeginTransaction())
+                {
                     try
+                    {
                         var query = $"DELETE FROM {PSN_MULTIWAY_SETTING}";
                         connection.ExecuteNonQuery(connection.GetSqlStringCommand(query), txn);
                         foreach (MultiwayItem item in multiwayItems)
+                        {
-f02de16
+                            query = $"INSERT INTO {PSN_MULTIWAY_SETTING} ([INDEX], NAME) VALUES (@INDEX, @NAME)";
-            a2ab8a90
+                            var cmd = connection.GetSqlStringCommand(query);
                             AddWithValue(cmd, "@INDEX", item.Index);
                             AddWithValue(cmd, "@NAME", item.Name);
                             connection.ExecuteNonQuery(cmd, txn);
+                        }
                         txn.Commit();
+                    }
                     catch (Exception ex)
+                    {
                         Log.Write(ex.Message + "\r\n" + ex.StackTrace);
                         return false;
+                    }
+                }
+            }
             return true;
+        }
-c1965b
+        public static bool SaveEquipmentNopocketSetting(List<EquipmentNoPocketItem> keywordItems)
+        {
             ID2Info id2Info = ID2Info.GetInstance();
             using (IAbstractDatabase connection = id2Info.CreateConnection())
+            {
                 using (var txn = connection.BeginTransaction())
+                {
                     try
+                    {
                         var query = $"DELETE FROM {PSN_NOPOCKETSETTING}";
                         connection.ExecuteNonQuery(connection.GetSqlStringCommand(query), txn);
                         foreach (EquipmentNoPocketItem item in keywordItems)
+                        {
                             query = $"INSERT INTO {PSN_NOPOCKETSETTING} ([INDEX], [TYPE], [NAME]) VALUES (@INDEX, @TYPE, @NAME)";
                             var cmd = connection.GetSqlStringCommand(query);
                             AddWithValue(cmd, "@INDEX", item.Index);
                             AddWithValue(cmd, "@TYPE", item.Type);
                             AddWithValue(cmd, "@NAME", item.Name);
                             connection.ExecuteNonQuery(cmd, txn);
+                        }
                         txn.Commit();
+                    }
                     catch (Exception ex)
+                    {
                         Log.Write(ex.Message + "\r\n" + ex.StackTrace);
                         return false;
+                    }
+                }
+            }
             return true;
+        }
-            f2a63376
+        public static bool SaveAirFinCoolerSetting(List<EquipmentAirFinCoolerItem> keywordItems)
+        {
             ID2Info id2Info = ID2Info.GetInstance();
             using (IAbstractDatabase connection = id2Info.CreateConnection())
+            {
                 using (var txn = connection.BeginTransaction())
+                {
                     try
+                    {
                         var query = $"DELETE FROM {PSN_AIRFINCOOLERSETTING}";
                         connection.ExecuteNonQuery(connection.GetSqlStringCommand(query), txn);
                         foreach (EquipmentAirFinCoolerItem item in keywordItems)
+                        {
-fa2c9
+                            query = $"INSERT INTO {PSN_AIRFINCOOLERSETTING} ([INDEX], [TYPE], [TagIdentifier], [AttributeName], [NAME]) VALUES (@INDEX, @TYPE, @TagIdentifier, @AttributeName, @NAME)";
-            f2a63376
+                            var cmd = connection.GetSqlStringCommand(query);
                             AddWithValue(cmd, "@INDEX", item.Index);
                             AddWithValue(cmd, "@TYPE", item.Type);
-fa2c9
+                            AddWithValue(cmd, "@TagIdentifier", item.TagIdentifier);
                             AddWithValue(cmd, "@AttributeName", item.AttributeName);
-            f2a63376
+                            AddWithValue(cmd, "@NAME", item.Name);
                             connection.ExecuteNonQuery(cmd, txn);
-fa2c9
+            이지연
-            f2a63376
+            이지연
                         txn.Commit();
+                    }
                     catch (Exception ex)
+                    {
                         Log.Write(ex.Message + "\r\n" + ex.StackTrace);
                         return false;
+                    }
+                }
+            }
             return true;
+        }
-ae1a1c6
+        public static bool SaveTopologyRule(DataTable dt)
-            c6503eaa
+            gaqhf
             ID2Info id2Info = ID2Info.GetInstance();
-ff2a9f1
+            using (IAbstractDatabase connection = id2Info.CreateConnection())
-            c6503eaa
+            gaqhf
-a96301
+                using (var txn = connection.BeginTransaction())
-            c6503eaa
+            gaqhf
-a96301
+                    try
-            c6503eaa
+            gaqhf
-a96301
+                        var query = $"DELETE FROM {PSN_TOPOLOGY_RULE}";
                         var cmd = connection.GetSqlStringCommand(query);
-ff2a9f1
+                        //connection.ExecuteNonQuery(connection.GetSqlStringCommand(query), txn);
                         connection.ExecuteNonQuery(cmd, txn);
-ae1a1c6
+            LJIYEON
                         foreach (DataRow row in dt.Rows)
+                        {
-ff2a9f1
+                            query = $"INSERT INTO {PSN_TOPOLOGY_RULE} (UID) VALUES (@UID)";
-a96301
+                            cmd = connection.GetSqlStringCommand(query);
                             AddWithValue(cmd, "@UID", row["NAME"].ToString());
                             connection.ExecuteNonQuery(cmd, txn);
-ae1a1c6
+            LJIYEON
-a96301
+            humkyung
                         txn.Commit();
+                    }
                     catch (Exception ex)
+                    {
                         txn.Rollback();
                         Log.Write(ex.Message + "\r\n" + ex.StackTrace);
                         return false;
-            c6503eaa
+            gaqhf
+                }
+            }
-a96301
+            humkyung
-ae1a1c6
+            return true;
-            c6503eaa
+            gaqhf
-            abee404a
+            LJIYEON
-ae1a1c6
+        public static DataTable SelectTopologyRule()
-ec8f
+            gaqhf
-a96301
+            DataTable dt = null;
-ec8f
+            ID2Info id2Info = ID2Info.GetInstance();
-ff2a9f1
+            using (IAbstractDatabase connection = id2Info.CreateConnection())
-ec8f
+            gaqhf
                 try
+                {
-a96301
+                    var query = $"SELECT * FROM {PSN_TOPOLOGY_RULE}";
                     using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query)))
-ec8f
+            gaqhf
-a96301
+                        dt = ds.Tables[0].Copy();
-ec8f
+            gaqhf
+                }
                 catch (Exception ex)
+                {
                     Log.Write(ex.Message + "\r\n" + ex.StackTrace);
+                }
+            }
-a96301
+            humkyung
-ec8f
+            return dt;
+        }
-c16
+            LJIYEON
-a96301
+        private static void AddWithValue(DbCommand cmd, string PropName, object Value)
+        {
             var param = cmd.CreateParameter();
             param.ParameterName = PropName;
             param.Value = Value;
             cmd.Parameters.Add(param);
+        }
-fd3f
+            LJIYEON
-d46fca7
+        public static DataTable SelectRevisionTable()
-fd3f
+            LJIYEON
-d46fca7
+            DataTable dt = null;
-fd3f
+            ID2Info id2Info = ID2Info.GetInstance();
-d46fca7
+            LJIYEON
             using (IAbstractDatabase connection = id2Info.CreateConnection())
-fd3f
+            LJIYEON
                 try
+                {
-e181
+                    var query = $"SELECT T.name AS table_name, C.name AS column_name FROM ARS_COMMON.sys.tables AS T INNER JOIN ARS_COMMON.sys.columns AS C ON T.object_id = C.object_id WHERE T.name = 'PSNREVISION'";
                     using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query)))
+                    {
                         dt = ds.Tables[0].Copy();
+                    }
+                }
                 catch (Exception ex)
+                {
                     Log.Write(ex.Message + "\r\n" + ex.StackTrace);
+                }
+            }
             return dt;
+        }
         public static DataTable SelectRevision()
+        {
             DataTable dt = null;
             ID2Info id2Info = ID2Info.GetInstance();
             using (IAbstractDatabase connection = id2Info.CreateConnection())
+            {
                 try
+                {
                     var query = $"SELECT * FROM ARS_COMMON.dbo.PSNREVISION";
-d46fca7
+                    using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query)))
-fd3f
+            LJIYEON
-d46fca7
+                        dt = ds.Tables[0].Copy();
+                    }
+                }
                 catch (Exception ex)
+                {
                     Log.Write(ex.Message + "\r\n" + ex.StackTrace);
+                }
+            }
-fd3f
+            LJIYEON
-d46fca7
+            return dt;
+        }
-b6df95
+            LJIYEON
-d46fca7
+        public static bool ConnCreateRevisionTable(Dictionary<string, string> dicColCheck, List<string> names)
+        {
             bool result = false;
             ID2Info id2Info = ID2Info.GetInstance();
             using (IAbstractDatabase connection = id2Info.CreateConnection())
+            {
                 try
+                {
                     if (names.Count == 0)
+                    {
-            d1afd412
+            이지연
-d46fca7
+                        var query = $"CREATE TABLE ARS_COMMON.dbo.PSNRevision ([OID] [uniqueidentifier] ,[Project_OID] [uniqueidentifier] ," +
                             $"[ProjectCode] nvarchar(255), [RevNumber] int ,[UserName] nvarchar(255) ,[TimeData] nvarchar(255) ," +
                             $"[PSNDatabasePath] nvarchar(255) ,	[PsnByPBSFilter] varchar(20) ,[PsnByNPDFilter] varchar(20) ,[PidDrawings] int ,	" +
                             $"[PipeSystems] int ,[PipeLines] int ,[Topologies] int ,[PipeSystemNetworks] int ,[InValidPSNs] int ,[E2E] int ," +
-c75c0b
+                            $"[E2B] int ,[B2E] int ,[HDE] int ,[HD2] int ,[HDB] int ,[B2B] int, [LastModificationdate] nvarchar(255), [ID2_PSN] nvarchar(10))";
-d46fca7
+                        using (var cmd = connection.GetSqlStringCommand(query))
-fd3f
+            LJIYEON
-d46fca7
+                            cmd.ExecuteNonQuery();
-fd3f
+            LJIYEON
-d46fca7
+            LJIYEON
                     else
+                    {
                         AddColumn(PSN_REVISION, dicColCheck, names);
-fd3f
+            LJIYEON
-d46fca7
+                    void AddColumn(string TableName, Dictionary<string, string> dicCol, List<string> colnames)
-fd3f
+            LJIYEON
                         bool check = false;
                         if (colnames != null)
+                        {
                             foreach (KeyValuePair<string, string> col in dicCol)
+                            {
                                 check = false;
                                 foreach (string c in colnames)
+                                {
                                     if (col.Key.Contains(c))
+                                    {
                                         check = true;
                                         break;
+                                    }
+                                }
                                 if (!check) //없으면 추가
+                                {
                                     string i = string.Empty;
                                     if (col.Value.ToString().ToUpper().Contains("INT") || col.Value.ToString().ToUpper().Contains("REAL"))
                                         i = "DEFAULT 0";
-d46fca7
+                                    var queryalter = $"ALTER TABLE ARS_COMMON.dbo.PSNRevision ADD [" + col.Key + "] " + col.Value + " " + i + ";";
                                     using (var cmd = connection.GetSqlStringCommand(queryalter))
-fd3f
+            LJIYEON
                                         cmd.ExecuteNonQuery();
+                                    }
+                                }
+                            }
+                        }
+                    }
-d46fca7
+            LJIYEON
                     result = true;
-fd3f
+            LJIYEON
                 catch (Exception ex)
+                {
-d46fca7
+                    Log.Write(ex.Message + "\r\n" + ex.StackTrace);
-fd3f
+            LJIYEON
+            }
-d46fca7
+            LJIYEON
             return result;
-fd3f
+            LJIYEON
-d46fca7
+            LJIYEON
-e181
+        public static bool UpdateRevision(string TimeData, string ProjectCode, int RevNumber, string UserName, string PSNDatabasePath, string PsnByPBSFilter, string PsnByNPDFilter,
            int PidDrawings, int PipeSystems, int PipeLines, int Topologies, int PipeSystemNetworks, int InValidPSNs, int E2E, int E2B, int B2E, int HDE, int HD2, int HDB, int B2B)
+        {
             ID2Info id2Info = ID2Info.GetInstance();
             bool result = true;
             using (IAbstractDatabase connection = id2Info.CreateConnection())
+            {
                 try
+                {
                     using (var txn = connection.BeginTransaction())
+                    {
                         try
+                        {
                             string where = string.Format("DELETE FROM ARS_COMMON.dbo.PSNRevision WHERE ProjectCode = '{0}' AND PSNDatabasePath = '{1}' AND RevNumber = {2}", ProjectCode, PSNDatabasePath, RevNumber);
                             connection.ExecuteNonQuery(connection.GetSqlStringCommand(where), txn);
                             var query = $"INSERT INTO ARS_COMMON.dbo.PSNRevision (OID, Project_OID, ProjectCode, RevNumber, UserName, TimeData, PSNDatabasePath, " +
                                 $"PsnByPBSFilter, PsnByNPDFilter, PidDrawings, PipeSystems, PipeLines, Topologies, PipeSystemNetworks, InValidPSNs, E2E, E2B, B2E, HDE, " +
-c75c0b
+                                $"HD2, HDB, B2B, LastModificationdate, ID2_PSN) VALUES (NEWID(), NEWID(), @ProjectCode, @RevNumber, @UserName, @TimeData, @PSNDatabasePath" +
-e181
+                                $", @PsnByPBSFilter, @PsnByNPDFilter, @PidDrawings, @PipeSystems, @PipeLines, @Topologies, @PipeSystemNetworks, @InValidPSNs, " +
-c75c0b
+                                $"@E2E, @E2B, @B2E, @HDE, @HD2, @HDB, @B2B, @LastModificationdate, @ID2_PSN)";
-e181
+                            var cmd = connection.GetSqlStringCommand(query);
-            d1afd412
+            이지연
-e181
+                            AddWithValue(cmd, "@ProjectCode", ProjectCode);
                             AddWithValue(cmd, "@RevNumber", RevNumber);
                             AddWithValue(cmd, "@UserName", UserName);
                             AddWithValue(cmd, "@TimeData", TimeData); //String.Format("{0:G}", dt) // DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")
                             AddWithValue(cmd, "@PSNDatabasePath", PSNDatabasePath);
                             AddWithValue(cmd, "@PsnByPBSFilter", PsnByPBSFilter);
                             AddWithValue(cmd, "@PsnByNPDFilter", PsnByNPDFilter);
                             AddWithValue(cmd, "@PidDrawings", PidDrawings);
                             AddWithValue(cmd, "@PipeSystems", PipeSystems);
                             AddWithValue(cmd, "@PipeLines", PipeLines);
                             AddWithValue(cmd, "@Topologies", Topologies);
                             AddWithValue(cmd, "@PipeSystemNetworks", PipeSystemNetworks);
                             AddWithValue(cmd, "@InValidPSNs", InValidPSNs);
                             AddWithValue(cmd, "@E2E", E2E);
                             AddWithValue(cmd, "@E2B", E2B);
                             AddWithValue(cmd, "@B2E", B2E);
                             AddWithValue(cmd, "@HDE", HDE);
                             AddWithValue(cmd, "@HD2", HD2);
                             AddWithValue(cmd, "@HDB", HDB);
                             AddWithValue(cmd, "@B2B", B2B);
                             System.Globalization.CultureInfo ci = new System.Globalization.CultureInfo("en-US");
                             DateTime oDateTime = DateTime.Now;
                             AddWithValue(cmd, "@LastModificationdate", oDateTime.ToString(ci));
-c75c0b
+                            AddWithValue(cmd, "@ID2_PSN", "Y");
-e181
+                            connection.ExecuteNonQuery(cmd, txn);
                             txn.Commit();
+                        }
                         catch (Exception ex)
+                        {
                             txn.Rollback();
                             result = false;
+                        }
+                    }
+                }
                 catch (Exception ex)
+                {
                     System.Windows.Forms.MessageBox.Show(ex.Message);
                     result = false;
+                }
+            }
             return result;
+        }
-e1e9
+        public static bool SaveRevision(string ProjectCode, int RevNumber, string UserName, string PSNDatabasePath, string PsnByPBSFilter, string PsnByNPDFilter,
             int PidDrawings, int PipeSystems, int PipeLines, int Topologies, int PipeSystemNetworks, int InValidPSNs, int E2E, int E2B, int B2E, int HDE, int HD2, int HDB, int B2B)
+        {
             ID2Info id2Info = ID2Info.GetInstance();
             bool result = true;
             using (IAbstractDatabase connection = id2Info.CreateConnection())
+            {
                 try
+                {
                     using (var txn = connection.BeginTransaction())
+                    {
                         try
-            d1afd412
+            이지연
-e1e9
+                            var query = $"INSERT INTO ARS_COMMON.dbo.PSNRevision (OID, Project_OID, ProjectCode, RevNumber, UserName, TimeData, PSNDatabasePath, " +
                                 $"PsnByPBSFilter, PsnByNPDFilter, PidDrawings, PipeSystems, PipeLines, Topologies, PipeSystemNetworks, InValidPSNs, E2E, E2B, B2E, HDE, " +
-c75c0b
+                                $"HD2, HDB, B2B, LastModificationdate, ID2_PSN) VALUES (NEWID(), NEWID(), @ProjectCode, @RevNumber, @UserName, @TimeData, @PSNDatabasePath" +
-e1e9
+                                $", @PsnByPBSFilter, @PsnByNPDFilter, @PidDrawings, @PipeSystems, @PipeLines, @Topologies, @PipeSystemNetworks, @InValidPSNs, " +
-c75c0b
+                                $"@E2E, @E2B, @B2E, @HDE, @HD2, @HDB, @B2B, @LastModificationdate, @ID2_PSN)";
-e1e9
+                            var cmd = connection.GetSqlStringCommand(query);
                             AddWithValue(cmd, "@OID", Guid.NewGuid().ToString());
                             AddWithValue(cmd, "@Project_OID", Guid.NewGuid().ToString());
                             AddWithValue(cmd, "@ProjectCode", ProjectCode);
                             AddWithValue(cmd, "@RevNumber", RevNumber);
                             AddWithValue(cmd, "@UserName", UserName);
-b6df95
+            LJIYEON
                             System.Globalization.CultureInfo ci = new System.Globalization.CultureInfo("en-US");
                             DateTime oDateTime = DateTime.Now;
                             AddWithValue(cmd, "@TimeData", oDateTime.ToString(ci)); //String.Format("{0:G}", dt) // DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")
-e1e9
+                            AddWithValue(cmd, "@PSNDatabasePath", PSNDatabasePath);
                             AddWithValue(cmd, "@PsnByPBSFilter", PsnByPBSFilter);
                             AddWithValue(cmd, "@PsnByNPDFilter", PsnByNPDFilter);
                             AddWithValue(cmd, "@PidDrawings", PidDrawings);
                             AddWithValue(cmd, "@PipeSystems", PipeSystems);
                             AddWithValue(cmd, "@PipeLines", PipeLines);
                             AddWithValue(cmd, "@Topologies", Topologies);
                             AddWithValue(cmd, "@PipeSystemNetworks", PipeSystemNetworks);
                             AddWithValue(cmd, "@InValidPSNs", InValidPSNs);
                             AddWithValue(cmd, "@E2E", E2E);
                             AddWithValue(cmd, "@E2B", E2B);
                             AddWithValue(cmd, "@B2E", B2E);
                             AddWithValue(cmd, "@HDE", HDE);
                             AddWithValue(cmd, "@HD2", HD2);
                             AddWithValue(cmd, "@HDB", HDB);
                             AddWithValue(cmd, "@B2B", B2B);
-b253d62
+                            // AddWithValue(cmd, "@LastModificationdate", oDateTime.ToString(ci));
                             AddWithValue(cmd, "@LastModificationdate", "");
-c75c0b
+                            AddWithValue(cmd, "@ID2_PSN", "Y");
-            d1afd412
+            이지연
-e1e9
+                            connection.ExecuteNonQuery(cmd, txn);
-            d1afd412
+            이지연
-e1e9
+                            txn.Commit();
+                        }
                         catch (Exception ex)
+                        {
                             txn.Rollback();
                             result = false;
+                        }
+                    }
+                }
                 catch (Exception ex)
+                {
                     System.Windows.Forms.MessageBox.Show(ex.Message);
                     result = false;
+                }
+            }
             return result;
+        }
-c248ee3
+        public static bool SavePSNData(PSN item)
-b9e7a56
+            gaqhf
             ID2Info id2Info = ID2Info.GetInstance();
-            d1afd412
+            bool result = true;
-fd3f
+            LJIYEON
-ff2a9f1
+            using (IAbstractDatabase connection = id2Info.CreateConnection())
-b9e7a56
+            gaqhf
                 try
+                {
-a96301
+                    using (var txn = connection.BeginTransaction())
-b9e7a56
+            gaqhf
                         try
+                        {
-a96301
+                            // Path Items
                             var query = $"DELETE FROM {PSN_PATHITEMS}";
                             connection.ExecuteNonQuery(connection.GetSqlStringCommand(query), txn);
-c151350
+                            for (int i = 0; i < item.PathItems.Rows.Count; i++)
-b9e7a56
+            gaqhf
-c151350
+                                DataRow row = item.PathItems.Rows[i];
-ff2a9f1
+                                query = $"INSERT INTO {PSN_PATHITEMS} " +
                                     $"(OID, SequenceData_OID, TopologySet_OID, BranchTopologySet_OID, PipeLine_OID, ItemName, ItemTag, DESCRIPTION, CLASS, SUBCLASS, TYPE, " +
-            bf9e8432
+                                    $"PIDNAME, Equipment_OID, NPD, GROUPTAG, PipeSystemNetwork_OID, PipeRun_OID, ViewPipeSystemNetwork_OID, EqpGroupTag, MainLineTag, EGTConnectedPoint, EGFlowDirection) VALUES " +
-d7949
+                                    $"(@OID, @SequenceData_OID, @TopologySet_OID, @BranchTopologySet_OID, @PipeLine_OID, @ITEMNAME, @ITEMTAG, @DESCRIPTION, @Class, @SubClass, @TYPE, @PIDNAME, " +
-            bf9e8432
+                                    $"@Equipment_OID, @NPD, @GROUPTAG, @PipeSystemNetwork_OID,@PipeRun_OID, @ViewPipeSystemNetwork_OID, @EqpGroupTag , @MainLineTag, @EGTConnectedPoint, @EGFlowDirection)";
-a96301
+                                var cmd = connection.GetSqlStringCommand(query);
-            f9f2787b
+                                AddWithValue(cmd, "@OID", string.IsNullOrEmpty(row["OID"].ToString()) ? "" : row["OID"].ToString());
                                 AddWithValue(cmd, "@SequenceData_OID", string.IsNullOrEmpty(row["SequenceData_OID"].ToString()) ? "" : row["SequenceData_OID"].ToString());
                                 AddWithValue(cmd, "@TopologySet_OID", string.IsNullOrEmpty(row["TopologySet_OID"].ToString()) ? "" : row["TopologySet_OID"].ToString());
                                 AddWithValue(cmd, "@BranchTopologySet_OID", string.IsNullOrEmpty(row["BranchTopologySet_OID"].ToString()) ? "" : row["BranchTopologySet_OID"].ToString());
                                 AddWithValue(cmd, "@PipeLine_OID", string.IsNullOrEmpty(row["PipeLine_OID"].ToString()) ? "" : row["PipeLine_OID"].ToString());
                                 AddWithValue(cmd, "@ITEMNAME", string.IsNullOrEmpty(row["ITEMNAME"].ToString()) ? "" : row["ITEMNAME"].ToString());
                                 AddWithValue(cmd, "@ITEMTAG", string.IsNullOrEmpty(row["ITEMTAG"].ToString()) ? "" : row["ITEMTAG"].ToString());
-fd3f
+                                AddWithValue(cmd, "@DESCRIPTION", string.IsNullOrEmpty(row["DESCRIPTION"].ToString()) ? "" : row["DESCRIPTION"].ToString());
-            f9f2787b
+                                AddWithValue(cmd, "@Class", string.IsNullOrEmpty(row["Class"].ToString()) ? "" : row["Class"].ToString());
                                 AddWithValue(cmd, "@SubClass", string.IsNullOrEmpty(row["SubClass"].ToString()) ? "" : row["SubClass"].ToString());
                                 AddWithValue(cmd, "@TYPE", string.IsNullOrEmpty(row["TYPE"].ToString()) ? "" : row["TYPE"].ToString());
                                 AddWithValue(cmd, "@PIDNAME", string.IsNullOrEmpty(row["PIDNAME"].ToString()) ? "" : row["PIDNAME"].ToString());
-fd3f
+                                AddWithValue(cmd, "@Equipment_OID", string.IsNullOrEmpty(row["Equipment_OID"].ToString()) ? "" : row["Equipment_OID"].ToString());
-            f9f2787b
+                                AddWithValue(cmd, "@NPD", string.IsNullOrEmpty(row["NPD"].ToString()) ? "" : row["NPD"].ToString());
-d7949
+                                AddWithValue(cmd, "@GROUPTAG", string.IsNullOrEmpty(row["GROUPTAG"].ToString()) ? "" : row["GROUPTAG"].ToString());
-            f9f2787b
+                                AddWithValue(cmd, "@PipeSystemNetwork_OID", string.IsNullOrEmpty(row["PipeSystemNetwork_OID"].ToString()) ? "" : row["PipeSystemNetwork_OID"].ToString());
                                 AddWithValue(cmd, "@ViewPipeSystemNetwork_OID", string.IsNullOrEmpty(row["ViewPipeSystemNetwork_OID"].ToString()) ? "" : row["ViewPipeSystemNetwork_OID"].ToString());
                                 AddWithValue(cmd, "@PipeRun_OID", string.IsNullOrEmpty(row["PipeRun_OID"].ToString()) ? "" : row["PipeRun_OID"].ToString());
-            bf9e8432
+                                AddWithValue(cmd, "@EqpGroupTag", string.IsNullOrEmpty(row["EqpGroupTag"].ToString()) ? "" : row["EqpGroupTag"].ToString());
                                 AddWithValue(cmd, "@MainLineTag", string.IsNullOrEmpty(row["MainLineTag"].ToString()) ? "" : row["MainLineTag"].ToString());
                                 AddWithValue(cmd, "@EGTConnectedPoint", string.IsNullOrEmpty(row["EGTConnectedPoint"].ToString()) ? "0" : row["EGTConnectedPoint"].ToString());
                                 AddWithValue(cmd, "@EGFlowDirection", string.IsNullOrEmpty(row["EGFlowDirection"].ToString()) ? "" : row["EGFlowDirection"].ToString());
-a96301
+                                connection.ExecuteNonQuery(cmd, txn);
+                            }
-b9e7a56
+            gaqhf
-a96301
+                            // Sequence
                             query = $"DELETE FROM {PSN_SEQUENCEDATA}";
                             connection.ExecuteNonQuery(connection.GetSqlStringCommand(query), txn);
                             foreach (DataRow row in item.SequenceData.Rows)
+                            {
-ff2a9f1
+                                query = $"INSERT INTO {PSN_SEQUENCEDATA} (OID, SERIALNUMBER, PathItem_OID, TopologySet_OID_Key) VALUES (@OID, @SERIALNUMBER, @PathItem_OID, @TopologySet_OID_Key)";
-a96301
+                                var cmd = connection.GetSqlStringCommand(query);
-            f9f2787b
+                                AddWithValue(cmd, "@OID", string.IsNullOrEmpty(row["OID"].ToString()) ? "" : row["OID"].ToString());
                                 AddWithValue(cmd, "@SERIALNUMBER", string.IsNullOrEmpty(row["SERIALNUMBER"].ToString()) ? "" : row["SERIALNUMBER"].ToString());
                                 AddWithValue(cmd, "@PathItem_OID", string.IsNullOrEmpty(row["PathItem_OID"].ToString()) ? "" : row["PathItem_OID"].ToString());
                                 AddWithValue(cmd, "@TopologySet_OID_Key", string.IsNullOrEmpty(row["TopologySet_OID_Key"].ToString()) ? "" : row["TopologySet_OID_Key"].ToString());
-a96301
+                                connection.ExecuteNonQuery(cmd, txn);
+                            }
-c248ee3
+            gaqhf
-a96301
+                            // Nozzle
                             query = $"DELETE FROM {PSN_NOZZLE}";
                             connection.ExecuteNonQuery(connection.GetSqlStringCommand(query), txn);
                             foreach (DataRow row in item.Nozzle.Rows)
+                            {
-ff2a9f1
+                                query = $"INSERT INTO {PSN_NOZZLE} (OID, ItemTag, Xcoords, Ycoords, Equipment_OID, Fluid, NPD, PMC, Rotation, FlowDirection) VALUES (@OID, @ITEMTAG, @XCOORDS, @YCOORDS, @Equipment_OID, @FLUID, @NPD, @PMC, @ROTATION, @FlowDirection)";
-a96301
+                                var cmd = connection.GetSqlStringCommand(query);
-            f9f2787b
+                                AddWithValue(cmd, "@OID", string.IsNullOrEmpty(row["OID"].ToString()) ? "" : row["OID"].ToString());
                                 AddWithValue(cmd, "@ITEMTAG", string.IsNullOrEmpty(row["ITEMTAG"].ToString()) ? "" : row["ITEMTAG"].ToString());
                                 if (string.IsNullOrEmpty(row["XCOORDS"].ToString()))
                                     AddWithValue(cmd, "@XCOORDS", DBNull.Value);
                                 else
                                     AddWithValue(cmd, "@XCOORDS", row["XCOORDS"].ToString());
                                 if (string.IsNullOrEmpty(row["YCOORDS"].ToString()))
                                     AddWithValue(cmd, "@YCOORDS", DBNull.Value);
                                 else
                                     AddWithValue(cmd, "@YCOORDS", row["YCOORDS"].ToString());
                                 AddWithValue(cmd, "@Equipment_OID", string.IsNullOrEmpty(row["Equipment_OID"].ToString()) ? "" : row["Equipment_OID"].ToString());
                                 AddWithValue(cmd, "@FLUID", string.IsNullOrEmpty(row["FLUID"].ToString()) ? "" : row["FLUID"].ToString());
                                 AddWithValue(cmd, "@NPD", string.IsNullOrEmpty(row["NPD"].ToString()) ? "" : row["NPD"].ToString());
-cee849
+                                AddWithValue(cmd, "@PMC", string.IsNullOrEmpty(row["PMC"].ToString()) ? "" : row["PMC"].ToString());
-            f9f2787b
+            LJIYEON
                                 if (string.IsNullOrEmpty(row["ROTATION"].ToString()))
                                     AddWithValue(cmd, "@ROTATION", DBNull.Value);
                                 else
                                     AddWithValue(cmd, "@ROTATION", row["ROTATION"].ToString());
-fd3f
+            LJIYEON
-            f9f2787b
+                                AddWithValue(cmd, "@FlowDirection", string.IsNullOrEmpty(row["FlowDirection"].ToString()) ? "" : row["FlowDirection"].ToString());
-a96301
+                                connection.ExecuteNonQuery(cmd, txn);
+                            }
-c248ee3
+            gaqhf
-a96301
+                            //Equipment
                             query = $"DELETE FROM {PSN_EQUIPMENT}";
                             connection.ExecuteNonQuery(connection.GetSqlStringCommand(query), txn);
                             foreach (DataRow row in item.Equipment.Rows)
+                            {
-ff2a9f1
+                                query = $"INSERT INTO {PSN_EQUIPMENT} (OID, ItemTag, Xcoords, Ycoords) VALUES (@OID, @ITEMTAG, @XCOORDS, @YCOORDS)";
-a96301
+                                var cmd = connection.GetSqlStringCommand(query);
-            f9f2787b
+                                AddWithValue(cmd, "@OID", string.IsNullOrEmpty(row["OID"].ToString()) ? "" : row["OID"].ToString());
                                 AddWithValue(cmd, "@ITEMTAG", string.IsNullOrEmpty(row["ITEMTAG"].ToString()) ? "" : row["ITEMTAG"].ToString());
                                 if (string.IsNullOrEmpty(row["XCOORDS"].ToString()))
                                     AddWithValue(cmd, "@XCOORDS", DBNull.Value);
                                 else
                                     AddWithValue(cmd, "@XCOORDS", row["XCOORDS"].ToString());
                                 if (string.IsNullOrEmpty(row["YCOORDS"].ToString()))
                                     AddWithValue(cmd, "@YCOORDS", DBNull.Value);
                                 else
                                     AddWithValue(cmd, "@YCOORDS", row["YCOORDS"].ToString());
-a96301
+                                connection.ExecuteNonQuery(cmd, txn);
+                            }
-c248ee3
+            gaqhf
-a96301
+                            // TopologySet
                             query = $"DELETE FROM {PSN_TOPOLOGYSET}";
                             connection.ExecuteNonQuery(connection.GetSqlStringCommand(query), txn);
                             foreach (DataRow row in item.TopologySet.Rows)
+                            {
-ff2a9f1
+                                query = $"INSERT INTO {PSN_TOPOLOGYSET} (OID, Type, SubType, HeadItemTag, TailItemTag, HeadItemSPID, TailItemSPID) VALUES (@OID, @Type, @SubType, @HeadItemTag, @TailItemTag, @HeadItemSPID, @TailItemSPID)";
-a96301
+                                var cmd = connection.GetSqlStringCommand(query);
-            f9f2787b
+                                AddWithValue(cmd, "@OID", string.IsNullOrEmpty(row["OID"].ToString()) ? "" : row["OID"].ToString());
                                 AddWithValue(cmd, "@Type", string.IsNullOrEmpty(row["Type"].ToString()) ? "" : row["Type"].ToString());
                                 AddWithValue(cmd, "@SubType", string.IsNullOrEmpty(row["SubType"].ToString()) ? "" : row["SubType"].ToString());
                                 AddWithValue(cmd, "@HeadItemTag", string.IsNullOrEmpty(row["HeadItemTag"].ToString()) ? "" : row["HeadItemTag"].ToString());
                                 AddWithValue(cmd, "@TailItemTag", string.IsNullOrEmpty(row["TailItemTag"].ToString()) ? "" : row["TailItemTag"].ToString());
                                 AddWithValue(cmd, "@HeadItemSPID", string.IsNullOrEmpty(row["HeadItemSPID"].ToString()) ? "" : row["HeadItemSPID"].ToString());
                                 AddWithValue(cmd, "@TailItemSPID", string.IsNullOrEmpty(row["TailItemSPID"].ToString()) ? "" : row["TailItemSPID"].ToString());
-a96301
+                                connection.ExecuteNonQuery(cmd, txn);
+                            }
-a45f13
+            gaqhf
-a96301
+                            // PSN
                             query = $"DELETE FROM {PSN_PIPESYSTEMNETWORK} WHERE PSNRevisionNumber = '{string.Format("V{0:D4}", item.Revision)}'";
                             connection.ExecuteNonQuery(connection.GetSqlStringCommand(query), txn);
                             foreach (DataRow row in item.PipeSystemNetwork.Rows)
+                            {
-            eb44d82c
+                                query = $"INSERT INTO {PSN_PIPESYSTEMNETWORK} " +
-b66a
+                                    $"(OID, Type, OrderNumber, Pipeline_OID, FROM_DATA, TO_DATA, TopologySet_OID_Key, PSNRevisionNumber, PBS, Drawings, IsValid, Status, IncludingVirtualData, PSNAccuracy, Pocket, EGTag, HasMLTags, GroundLevel) VALUES " +
                                     $"(@OID, @Type, @OrderNumber, @Pipeline_OID, @FROM_DATA, @TO_DATA, @TopologySet_OID_Key, @PSNRevisionNumber,  @PBS, @Drawings, @IsValid, @Status, @IncludingVirtualData, @PSNAccuracy, @Pocket, @EGTag, @HasMLTags, @GroundLevel)";
-a96301
+                                var cmd = connection.GetSqlStringCommand(query);
-            f9f2787b
+                                AddWithValue(cmd, "@OID", string.IsNullOrEmpty(row["OID"].ToString()) ? "" : row["OID"].ToString());
                                 AddWithValue(cmd, "@Type", string.IsNullOrEmpty(row["Type"].ToString()) ? "" : row["Type"].ToString());
                                 AddWithValue(cmd, "@OrderNumber", string.IsNullOrEmpty(row["OrderNumber"].ToString()) ? "" : row["OrderNumber"].ToString());
                                 AddWithValue(cmd, "@Pipeline_OID", string.IsNullOrEmpty(row["Pipeline_OID"].ToString()) ? "" : row["Pipeline_OID"].ToString());
                                 AddWithValue(cmd, "@FROM_DATA", string.IsNullOrEmpty(row["FROM_DATA"].ToString()) ? "" : row["FROM_DATA"].ToString());
                                 AddWithValue(cmd, "@TO_DATA", string.IsNullOrEmpty(row["TO_DATA"].ToString()) ? "" : row["TO_DATA"].ToString());
                                 AddWithValue(cmd, "@TopologySet_OID_Key", string.IsNullOrEmpty(row["TopologySet_OID_Key"].ToString()) ? "" : row["TopologySet_OID_Key"].ToString());
                                 AddWithValue(cmd, "@PSNRevisionNumber", string.IsNullOrEmpty(row["PSNRevisionNumber"].ToString()) ? "" : row["PSNRevisionNumber"].ToString());
-            eb44d82c
+            LJIYEON
-f2e
+                                int IsValid = 0;
-            eb44d82c
+                                if (row["IsValid"].ToString() == string.Empty || row["IsValid"].ToString() == "OK")
-f2e
+                                    IsValid = 0;
                                 else if (row["IsValid"].ToString() == "InValid")
                                     IsValid = 1;
                                 else if (row["IsValid"].ToString() == "Error")
                                     IsValid = -1;
-            f9f2787b
+            LJIYEON
-f2e
+                                AddWithValue(cmd, "@IsValid", IsValid);
-            f9f2787b
+                                AddWithValue(cmd, "@Status", string.IsNullOrEmpty(row["Status"].ToString()) ? "" : row["Status"].ToString());
                                 AddWithValue(cmd, "@PBS", string.IsNullOrEmpty(row["PBS"].ToString()) ? "" : row["PBS"].ToString());
                                 AddWithValue(cmd, "@Drawings", string.IsNullOrEmpty(row["Drawings"].ToString()) ? "" : row["Drawings"].ToString());
                                 AddWithValue(cmd, "@IncludingVirtualData", string.IsNullOrEmpty(row["IncludingVirtualData"].ToString()) ? "" : row["IncludingVirtualData"].ToString());
                                 if (string.IsNullOrEmpty(row["PSNAccuracy"].ToString()))
                                     AddWithValue(cmd, "@PSNAccuracy", DBNull.Value);
                                 else
-            d3fbf0c0
+                                    AddWithValue(cmd, "@PSNAccuracy", row["PSNAccuracy"].ToString().Replace("%", ""));
-            eb44d82c
+            LJIYEON
-b33e44
+                                AddWithValue(cmd, "@Pocket", string.IsNullOrEmpty(row["Pocket"].ToString()) ? "Yes" : row["Pocket"].ToString());
-            d1afd412
+                                AddWithValue(cmd, "@EGTag", string.IsNullOrEmpty(row["EGTag"].ToString()) ? "" : row["EGTag"].ToString());
                                 AddWithValue(cmd, "@HasMLTags", string.IsNullOrEmpty(row["HasMLTags"].ToString()) ? "False" : row["HasMLTags"].ToString());
-b66a
+                                AddWithValue(cmd, "@GroundLevel", string.IsNullOrEmpty(row["GroundLevel"].ToString()) ? "" : row["GroundLevel"].ToString());
-a96301
+                                connection.ExecuteNonQuery(cmd, txn);
-b9e7a56
+            gaqhf
-a96301
+            humkyung
-            f9f2787b
+                            //Pipeline
                             query = $"DELETE FROM {PSN_PIPELINE}";
                             connection.ExecuteNonQuery(connection.GetSqlStringCommand(query), txn);
                             foreach (DataRow row in item.PipeLine.Rows)
+                            {
-ff2a9f1
+                                query = $"INSERT INTO {PSN_PIPELINE} (OID, PipeSystem_OID, FLUID, PMC, SEQNUMBER, INSULATION, FROM_DATA, TO_DATA, Unit) VALUES (@OID, @PipeSystem_OID, @FLUID, @PMC, @SEQNUMBER, @INSULATION, @FROM_DATA, @TO_DATA, @Unit)";
-            f9f2787b
+                                var cmd = connection.GetSqlStringCommand(query);
                                 AddWithValue(cmd, "@OID", row["OID"].ToString());
                                 AddWithValue(cmd, "@PipeSystem_OID", row["PipeSystem_OID"].ToString());
                                 AddWithValue(cmd, "@FLUID", row["FLUID"].ToString());
                                 AddWithValue(cmd, "@PMC", row["PMC"].ToString());
                                 AddWithValue(cmd, "@SEQNUMBER", row["SEQNUMBER"].ToString());
                                 AddWithValue(cmd, "@INSULATION", row["INSULATION"].ToString());
                                 AddWithValue(cmd, "@FROM_DATA", row["FROM_DATA"].ToString());
                                 AddWithValue(cmd, "@TO_DATA", row["TO_DATA"].ToString());
                                 AddWithValue(cmd, "@Unit", row["Unit"].ToString());
                                 connection.ExecuteNonQuery(cmd, txn);
+                            }
-            a36541fb
+            LJIYEON
-fb158
+                            //PipeSystem
                             query = $"DELETE FROM {PSN_PIPESYSTEM}";
                             connection.ExecuteNonQuery(connection.GetSqlStringCommand(query), txn);
                             foreach (DataRow row in item.PipeSystem.Rows)
+                            {
                                 query = $"INSERT INTO {PSN_PIPESYSTEM} (OID, DESCRIPTION, FLUID, PMC, PipeLineQty, GroundLevel) VALUES (@OID, @DESCRIPTION, @FLUID, @PMC, @PipeLineQty, @GroundLevel)";
                                 var cmd = connection.GetSqlStringCommand(query);
                                 AddWithValue(cmd, "@OID", row["OID"].ToString());
                                 AddWithValue(cmd, "@DESCRIPTION", row["DESCRIPTION"].ToString());
                                 AddWithValue(cmd, "@FLUID", row["FLUID"].ToString());
                                 AddWithValue(cmd, "@PMC", row["PMC"].ToString());
                                 AddWithValue(cmd, "@PipeLineQty", row["PipeLineQty"].ToString());
                                 AddWithValue(cmd, "@GroundLevel", row["GroundLevel"].ToString());
                                 connection.ExecuteNonQuery(cmd, txn);
+                            }
-            d1afd412
+                            if (id2Info.ID2DBType == ID2DB_Type.MSSQL)
-            ad39d1ee
+            LJIYEON
                                 query = $"If(db_id(N'" + PSN_COMMON + "') IS NULL) CREATE DATABASE [" + PSN_COMMON + "]";
                                 connection.ExecuteNonQuery(connection.GetSqlStringCommand(query), txn);
+                            }
-            d1afd412
+            이지연
-fd3f
+            LJIYEON
-a96301
+                            txn.Commit();
-b9e7a56
+            gaqhf
                         catch (Exception ex)
+                        {
-a96301
+                            txn.Rollback();
-b9e7a56
+                            result = false;
+                        }
-d46fca7
+            LJIYEON
+                    }
                     void AddColumn(string TableName, Dictionary<string, string> dicCol, List<string> colnames)
-            d1afd412
+            이지연
-d46fca7
+                        bool check = false;
                         if (colnames != null)
+                        {
                             foreach (KeyValuePair<string, string> col in dicCol)
+                            {
                                 check = false;
                                 foreach (string c in colnames)
+                                {
                                     if (col.Key.Contains(c))
+                                    {
                                         check = true;
                                         break;
+                                    }
+                                }
                                 if (!check) //없으면 추가
+                                {
                                     string i = string.Empty;
                                     if (col.Value.ToString().ToUpper().Contains("INT") || col.Value.ToString().ToUpper().Contains("REAL"))
                                         i = "DEFAULT 0";
                                     var queryalter = $"ALTER TABLE " + TableName + " ADD [" + col.Key + "] " + col.Value + " " + i + ";";
                                     using (var cmd = connection.GetSqlStringCommand(queryalter))
+                                    {
                                         cmd.ExecuteNonQuery();
+                                    }
+                                }
+                            }
+                        }
-b9e7a56
+            gaqhf
+                }
                 catch (Exception ex)
+                {
                     System.Windows.Forms.MessageBox.Show(ex.Message);
                     result = false;
+                }
+            }
             return result;
+        }
-c248ee3
+        public static bool SavePSNFluidCode(DataTable dt)
-b9e7a56
+            gaqhf
             ID2Info id2Info = ID2Info.GetInstance();
             bool result = true;
-ff2a9f1
+            using (IAbstractDatabase connection = id2Info.CreateConnection())
-b9e7a56
+            gaqhf
-ae1a1c6
+                try
-b9e7a56
+            gaqhf
-a96301
+                    using (var txn = connection.BeginTransaction())
-ae1a1c6
+            LJIYEON
                         try
-ab2f2
+            LJIYEON
-a96301
+                            var query = $"DELETE FROM {PSN_FLUIDCODE}";
                             connection.ExecuteNonQuery(connection.GetSqlStringCommand(query), txn);
                             foreach (DataRow row in dt.Rows)
-ab2f2
+            LJIYEON
-ff2a9f1
+                                query = $"INSERT INTO {PSN_FLUIDCODE} (UID, Code, Description, Condition, Remarks, GroundLevel) VALUES (@UID, @Code, @Description, @Condition, @Remarks, @GroundLevel)";
-a96301
+                                var cmd = connection.GetSqlStringCommand(query);
                                 cmd.Parameters.Clear();
+                                {
                                     var param = cmd.CreateParameter();
                                     param.ParameterName = "@UID";
                                     param.Value = row["UID"].ToString();
                                     cmd.Parameters.Add(param);
+                                }
+                                {
                                     var param = cmd.CreateParameter();
                                     param.ParameterName = "@Code";
                                     param.Value = row["Code"].ToString();
                                     cmd.Parameters.Add(param);
+                                }
+                                {
                                     var param = cmd.CreateParameter();
                                     param.ParameterName = "@Description";
                                     param.Value = row["Description"].ToString();
                                     cmd.Parameters.Add(param);
+                                }
+                                {
                                     var param = cmd.CreateParameter();
                                     param.ParameterName = "@Condition";
                                     param.Value = row["Condition"].ToString();
                                     cmd.Parameters.Add(param);
+                                }
+                                {
                                     var param = cmd.CreateParameter();
                                     param.ParameterName = "@Remarks";
                                     param.Value = row["Remarks"].ToString();
                                     cmd.Parameters.Add(param);
+                                }
-ae1a1c6
+            LJIYEON
-ab2f2
+            LJIYEON
-a96301
+                                    var param = cmd.CreateParameter();
                                     param.ParameterName = "@GroundLevel";
                                     param.Value = row["GroundLevel"].ToString();
                                     cmd.Parameters.Add(param);
-ab2f2
+            LJIYEON
-a96301
+            humkyung
                                 connection.ExecuteNonQuery(cmd, txn);
-ab2f2
+            LJIYEON
-a96301
+                            txn.Commit();
-ab2f2
+            LJIYEON
-ae1a1c6
+                        catch (Exception ex)
-b9e7a56
+            gaqhf
-a96301
+                            txn.Rollback();
-ae1a1c6
+                            result = false;
-b9e7a56
+            gaqhf
+                    }
-ae1a1c6
+            LJIYEON
                 catch (Exception ex)
+                {
                     System.Windows.Forms.MessageBox.Show(ex.Message);
                     result = false;
+                }
-b9e7a56
+            gaqhf
             return result;
+        }
-ae1a1c6
+        public static DataTable SelectPSNFluidCode()
-d37d58
+            LJIYEON
-a96301
+            DataTable dt = null;
-d37d58
+            ID2Info id2Info = ID2Info.GetInstance();
-ae1a1c6
+            LJIYEON
-ff2a9f1
+            using (IAbstractDatabase connection = id2Info.CreateConnection())
-d37d58
+            LJIYEON
-ae1a1c6
+                try
-d37d58
+            LJIYEON
-a96301
+                    var query = $"SELECT * FROM {PSN_FLUIDCODE}";
                     using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query)))
-d37d58
+            LJIYEON
-a96301
+                        dt = ds.Tables[0].Copy();
-d37d58
+            LJIYEON
+                }
-ae1a1c6
+                catch (Exception ex)
+                {
                     Log.Write(ex.Message + "\r\n" + ex.StackTrace);
+                }
-d37d58
+            LJIYEON
-a96301
+            humkyung
-ae1a1c6
+            return dt;
+        }
         public static bool SavePSNPMC(DataTable dt)
+        {
             ID2Info id2Info = ID2Info.GetInstance();
             bool result = true;
-ff2a9f1
+            using (IAbstractDatabase connection = id2Info.CreateConnection())
-d37d58
+            LJIYEON
-ae1a1c6
+                try
+                {
-a96301
+                    using (var txn = connection.BeginTransaction())
-ae1a1c6
+            LJIYEON
                         try
+                        {
-a96301
+                            var query = $"DELETE FROM {PSN_PIPINGMATLCLASS}";
                             connection.ExecuteNonQuery(connection.GetSqlStringCommand(query), txn);
                             foreach (DataRow row in dt.Rows)
-ae1a1c6
+            LJIYEON
-ff2a9f1
+                                query = $"INSERT INTO {PSN_PIPINGMATLCLASS} ( UID, Priority, Code, Description, Condition, Remarks, GroundLevel) VALUES (@UID, @Priority, @Code, @Description, @Condition, @Remarks, @GroundLevel)";
-a96301
+                                var cmd = connection.GetSqlStringCommand(query);
                                 cmd.Parameters.Clear();
+                                {
                                     var param = cmd.CreateParameter();
                                     param.ParameterName = "@UID";
                                     param.Value = row["UID"].ToString();
                                     cmd.Parameters.Add(param);
+                                }
+                                {
                                     var param = cmd.CreateParameter();
                                     param.ParameterName = "@Priority";
                                     param.Value = row["Priority"].ToString();
                                     cmd.Parameters.Add(param);
+                                }
+                                {
                                     var param = cmd.CreateParameter();
                                     param.ParameterName = "@Code";
                                     param.Value = row["Code"].ToString();
                                     cmd.Parameters.Add(param);
+                                }
+                                {
                                     var param = cmd.CreateParameter();
                                     param.ParameterName = "@Description";
                                     param.Value = row["Description"].ToString();
                                     cmd.Parameters.Add(param);
+                                }
-d37d58
+            LJIYEON
-ae1a1c6
+            LJIYEON
-a96301
+                                    var param = cmd.CreateParameter();
                                     param.ParameterName = "@Condition";
                                     param.Value = row["Condition"].ToString();
                                     cmd.Parameters.Add(param);
-ae1a1c6
+            LJIYEON
-a96301
+            humkyung
+                                {
                                     var param = cmd.CreateParameter();
                                     param.ParameterName = "@Remarks";
                                     param.Value = row["Remarks"].ToString();
                                     cmd.Parameters.Add(param);
+                                }
+                                {
                                     var param = cmd.CreateParameter();
                                     param.ParameterName = "@GroundLevel";
                                     param.Value = row["GroundLevel"].ToString();
                                     cmd.Parameters.Add(param);
+                                }
                                 connection.ExecuteNonQuery(cmd, txn);
-ae1a1c6
+            LJIYEON
-a96301
+            humkyung
                             txn.Commit();
-ae1a1c6
+            LJIYEON
                         catch (Exception ex)
+                        {
-a96301
+                            txn.Rollback();
-ae1a1c6
+                            result = false;
+                        }
+                    }
+                }
                 catch (Exception ex)
+                {
                     System.Windows.Forms.MessageBox.Show(ex.Message);
                     result = false;
+                }
+            }
-d37d58
+            LJIYEON
-ae1a1c6
+            return result;
-d37d58
+            LJIYEON
-cee849
+        public static bool SavePSNInsulation(DataTable dt)
+        {
             ID2Info id2Info = ID2Info.GetInstance();
             bool result = true;
-ff2a9f1
+            using (IAbstractDatabase connection = id2Info.CreateConnection())
-cee849
+            LJIYEON
                 try
+                {
                     using (var txn = connection.BeginTransaction())
+                    {
                         try
+                        {
                             var query = $"DELETE FROM {PSN_INSULATIONPURPOSE}";
                             connection.ExecuteNonQuery(connection.GetSqlStringCommand(query), txn);
                             foreach (DataRow row in dt.Rows)
+                            {
-ff2a9f1
+                                query = $"INSERT INTO {PSN_INSULATIONPURPOSE} (UID, Code, Description, Remarks) VALUES (@UID, @Code, @Description, @Remarks)";
-cee849
+                                var cmd = connection.GetSqlStringCommand(query);
                                 cmd.Parameters.Clear();
+                                {
                                     var param = cmd.CreateParameter();
                                     param.ParameterName = "@UID";
                                     param.Value = row["UID"].ToString();
                                     cmd.Parameters.Add(param);
+                                }
-            d1afd412
+            이지연
-cee849
+            LJIYEON
                                     var param = cmd.CreateParameter();
                                     param.ParameterName = "@Code";
                                     param.Value = row["Code"].ToString();
                                     cmd.Parameters.Add(param);
+                                }
+                                {
                                     var param = cmd.CreateParameter();
                                     param.ParameterName = "@Description";
                                     param.Value = row["Description"].ToString();
                                     cmd.Parameters.Add(param);
+                                }
-            d1afd412
+            이지연
-cee849
+            LJIYEON
                                     var param = cmd.CreateParameter();
                                     param.ParameterName = "@Remarks";
                                     param.Value = row["Remarks"].ToString();
                                     cmd.Parameters.Add(param);
+                                }
                                 connection.ExecuteNonQuery(cmd, txn);
+                            }
                             txn.Commit();
+                        }
                         catch (Exception ex)
+                        {
                             txn.Rollback();
                             result = false;
+                        }
+                    }
+                }
                 catch (Exception ex)
+                {
                     System.Windows.Forms.MessageBox.Show(ex.Message);
                     result = false;
+                }
+            }
             return result;
+        }
-f690
+            LJIYEON
-c248ee3
+        public static PSN GetDBPSN()
-b9e7a56
+            gaqhf
-c248ee3
+            PSN result = new PSN();
-b9e7a56
+            ID2Info id2Info = ID2Info.GetInstance();
-ff2a9f1
+            using (IAbstractDatabase connection = id2Info.CreateConnection())
-b9e7a56
+            gaqhf
                 try
+                {
-f690
+                    //query = $"SELECT * FROM {PSN_PIPESYSTEMNETWORK}";
-            eb44d82c
+                    //using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query)))
                     //{
-f690
+                    //    result.PipeSystemNetwork = ds.Tables[0].Copy();
-            eb44d82c
+                    //}
-f690
+                    var query = $"SELECT * FROM {PSN_PIPESYSTEMNETWORK} WHERE PSNRevisionNumber = '{string.Format("V{0:D4}", GetRevision())}'";
                     using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query)))
+                    {
                         result.PipeSystemNetwork = ds.Tables[0].Clone();
                         result.PipeSystemNetwork.Columns["IsValid"].DataType = typeof(string);
                         foreach (DataRow row in ds.Tables[0].Rows)
+                        {
                             DataRow newRow = result.PipeSystemNetwork.NewRow();
                             newRow["OID"] = row["OID"].ToString();
                             newRow["Type"] = row["Type"].ToString();
                             newRow["OrderNumber"] = row["OrderNumber"].ToString();
                             newRow["Pipeline_OID"] = row["Pipeline_OID"].ToString();
                             newRow["FROM_DATA"] = row["FROM_DATA"].ToString();
                             newRow["TO_DATA"] = row["TO_DATA"].ToString();
                             newRow["TopologySet_OID_Key"] = row["TopologySet_OID_Key"].ToString();
                             newRow["PSNRevisionNumber"] = row["PSNRevisionNumber"].ToString();
                             string IsValid = string.Empty;
                             if (Convert.ToInt32(row["IsValid"].ToString()) == 0)
                                 IsValid = string.Empty;//"OK";
                             else if (Convert.ToInt32(row["IsValid"].ToString()) == 1)
                                 IsValid = "InValid";
                             else if (Convert.ToInt32(row["IsValid"].ToString()) == -1)
                                 IsValid = "Error";
                             newRow["IsValid"] = IsValid;
                             newRow["Status"] = row["Status"].ToString();
                             newRow["PBS"] = row["PBS"].ToString();
                             newRow["Drawings"] = row["Drawings"].ToString();
                             newRow["IncludingVirtualData"] = row["IncludingVirtualData"].ToString();
                             newRow["PSNAccuracy"] = row["PSNAccuracy"].ToString();
-b33e44
+                            newRow["Pocket"] = row["Pocket"].ToString();
-            d1afd412
+            이지연
                             newRow["EGTag"] = row["EGTag"].ToString();
                             newRow["HasMLTags"] = row["HasMLTags"].ToString();
-b66a
+                            newRow["GroundLevel"] = row["GroundLevel"].ToString();
-f690
+                            result.PipeSystemNetwork.Rows.Add(newRow);
+                        }
+                    }
                     query = $"SELECT * FROM {PSN_EQUIPMENT}";
-a96301
+                    using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query)))
-b9e7a56
+            gaqhf
-a96301
+                        result.Equipment = ds.Tables[0].Copy();
+                    }
                     query = $"SELECT * FROM {PSN_NOZZLE}";
                     using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query)))
+                    {
                         result.Nozzle = ds.Tables[0].Copy();
-b9e7a56
+            gaqhf
-a96301
+            humkyung
                     query = $"SELECT * FROM {PSN_PATHITEMS}";
                     using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query)))
+                    {
                         result.PathItems = ds.Tables[0].Copy();
+                    }
                     query = $"SELECT * FROM {PSN_SEQUENCEDATA}";
                     using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query)))
+                    {
                         result.SequenceData = ds.Tables[0].Copy();
+                    }
-            aadd8450
+                    query = $"SELECT * FROM {PSN_TOPOLOGYSET}";
                     using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query)))
+                    {
                         result.TopologySet = ds.Tables[0].Copy();
+                    }
-            a36541fb
+                    query = $"SELECT * FROM {PSN_PIPELINE}";
                     using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query)))
+                    {
                         result.PipeLine = ds.Tables[0].Copy();
-fb158
+            LJIYEON
                     query = $"SELECT * FROM {PSN_PIPESYSTEM}";
                     using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query)))
+                    {
                         result.PipeSystem = ds.Tables[0].Copy();
+                    }
-            a36541fb
+            LJIYEON
-a96301
+                    result.Revision = GetRevision();
-b9e7a56
+            gaqhf
                 catch (Exception ex)
+                {
                     System.Windows.Forms.MessageBox.Show(ex.Message);
-c248ee3
+                    result = null;
-b9e7a56
+            gaqhf
+            }
-a96301
+            humkyung
-b9e7a56
+            return result;
+        }
-f24b438
+            gaqhf
         public static int GetRevision()
+        {
             int result = 0;
             ID2Info id2Info = ID2Info.GetInstance();
-a96301
+            humkyung
-ff2a9f1
+            using (IAbstractDatabase connection = id2Info.CreateConnection())
-f24b438
+            gaqhf
                 try
+                {
-a96301
+                    var query = $"SELECT DISTINCT PSNRevisionNumber FROM {PSN_PIPESYSTEMNETWORK};";
                     using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query)))
-f24b438
+            gaqhf
-a96301
+                        foreach (DataRow row in ds.Tables[0].Rows)
-f24b438
+            gaqhf
-            d5637426
+                            string value = row["PSNRevisionNumber"].ToString();
-a45f13
+                            if (value.StartsWith("V"))
-            d5637426
+                                value = value.Remove(0, 1);
                             int revisionNumber = Convert.ToInt32(value);
-f24b438
+                            if (result < revisionNumber)
                                 result = revisionNumber;
+                        }
+                    }
+                }
                 catch (Exception ex)
+                {
                     Log.Write(ex.Message + "\r\n" + ex.StackTrace);
                     result = -1;
+                }
+            }
             return result;
+        }
-c248ee3
+        public static DataTable GetPathItem()
+        {
-a96301
+            DataTable dt = null;
-c248ee3
+            ID2Info id2Info = ID2Info.GetInstance();
-ff2a9f1
+            using (IAbstractDatabase connection = id2Info.CreateConnection())
-c248ee3
+            gaqhf
                 try
+                {
-a96301
+                    var query = $"SELECT * FROM {PSN_PATHITEMS}";
                     using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query)))
-c248ee3
+            gaqhf
-a96301
+                        dt = ds.Tables[0].Copy();
-c248ee3
+            gaqhf
+                }
                 catch (Exception ex)
+                {
                     Log.Write(ex.Message + "\r\n" + ex.StackTrace);
+                }
+            }
-a96301
+            humkyung
-c248ee3
+            return dt;
+        }
-ab2f2
+            LJIYEON
-a45f13
+        public static DataTable GetTopologySet()
-c248ee3
+            gaqhf
-a96301
+            DataTable dt = null;
-c248ee3
+            ID2Info id2Info = ID2Info.GetInstance();
-ff2a9f1
+            using (IAbstractDatabase connection = id2Info.CreateConnection())
-c248ee3
+            gaqhf
                 try
+                {
-a96301
+                    var query = $"SELECT * FROM {PSN_TOPOLOGYSET}";
                     using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query)))
-c248ee3
+            gaqhf
-            aadd8450
+                        dt = ds.Tables[0].Clone();
                         foreach (DataRow row in ds.Tables[0].Rows)
+                        {
                             DataRow newRow = dt.NewRow();
                             newRow["OID"] = row["OID"].ToString();
                             newRow["Type"] = row["Type"].ToString();
                             newRow["SubType"] = row["SubType"].ToString();
                             newRow["HeadItemTag"] = row["HeadItemTag"].ToString();
                             newRow["TailItemTag"] = row["TailItemTag"].ToString();
-f2e
+                            newRow["HeadItemSPID"] = row["HeadItemSPID"].ToString();
                             newRow["TailItemSPID"] = row["TailItemSPID"].ToString();
-            aadd8450
+                            dt.Rows.Add(newRow);
+                        }
-c248ee3
+            gaqhf
+                }
                 catch (Exception ex)
+                {
                     Log.Write(ex.Message + "\r\n" + ex.StackTrace);
+                }
+            }
-a96301
+            humkyung
-c248ee3
+            return dt;
+        }
-ab2f2
+            LJIYEON
-c248ee3
+        public static DataTable GetPipeSystemNetwork()
+        {
-a96301
+            DataTable dt = null;
-c248ee3
+            ID2Info id2Info = ID2Info.GetInstance();
-ff2a9f1
+            using (IAbstractDatabase connection = id2Info.CreateConnection())
-c248ee3
+            gaqhf
                 try
+                {
-d7949
+                    var query = $"SELECT * FROM {PSN_PIPESYSTEMNETWORK} WHERE PSNRevisionNumber = '{string.Format("V{0:D4}", GetRevision())}' ORDER BY OID, OrderNumber";
-a96301
+                    using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query)))
-c248ee3
+            gaqhf
-c16
+                        dt = ds.Tables[0].Clone();
-f2e
+                        dt.Columns["IsValid"].DataType = typeof(string);
-c16
+                        foreach (DataRow row in ds.Tables[0].Rows)
+                        {
                             DataRow newRow = dt.NewRow();
                             newRow["OID"] = row["OID"].ToString();
                             newRow["Type"] = row["Type"].ToString();
                             newRow["OrderNumber"] = row["OrderNumber"].ToString();
                             newRow["Pipeline_OID"] = row["Pipeline_OID"].ToString();
                             newRow["FROM_DATA"] = row["FROM_DATA"].ToString();
                             newRow["TO_DATA"] = row["TO_DATA"].ToString();
                             newRow["TopologySet_OID_Key"] = row["TopologySet_OID_Key"].ToString();
                             newRow["PSNRevisionNumber"] = row["PSNRevisionNumber"].ToString();
-            eb44d82c
+            LJIYEON
-f2e
+                            string IsValid = string.Empty;
-c16
+            LJIYEON
-f2e
+                            if (Convert.ToInt32(row["IsValid"].ToString()) == 0)
                                 IsValid = string.Empty;//"OK";
                             else if (Convert.ToInt32(row["IsValid"].ToString()) == 1)
                                 IsValid = "InValid";
                             else if (Convert.ToInt32(row["IsValid"].ToString()) == -1)
                                 IsValid = "Error";
-c16
+            LJIYEON
-f2e
+                            newRow["IsValid"] = IsValid;
-c16
+                            newRow["Status"] = row["Status"].ToString();
-            eb44d82c
+            LJIYEON
                             newRow["PBS"] = row["PBS"].ToString();
                             newRow["Drawings"] = row["Drawings"].ToString();
-            d1afd412
+            이지연
-            ddc1c369
+                            newRow["IncludingVirtualData"] = row["IncludingVirtualData"].ToString();
-b33e44
+                            newRow["PSNAccuracy"] = row["PSNAccuracy"].ToString();
                             newRow["Pocket"] = row["Pocket"].ToString();
-            d1afd412
+                            newRow["EGTag"] = row["EGTag"].ToString();
                             newRow["HasMLTags"] = row["HasMLTags"].ToString();
-b66a
+                            newRow["GroundLevel"] = row["GroundLevel"].ToString();
-c16
+                            dt.Rows.Add(newRow);
+                        }
-c248ee3
+            gaqhf
+                }
                 catch (Exception ex)
+                {
                     Log.Write(ex.Message + "\r\n" + ex.StackTrace);
+                }
+            }
-a96301
+            humkyung
-c248ee3
+            return dt;
+        }
-ab2f2
+            LJIYEON
-c248ee3
+        public static DataTable GetSequenceData()
+        {
-a96301
+            DataTable dt = null;
-c248ee3
+            ID2Info id2Info = ID2Info.GetInstance();
-ff2a9f1
+            using (IAbstractDatabase connection = id2Info.CreateConnection())
-c248ee3
+            gaqhf
                 try
+                {
-a96301
+                    var query = $"SELECT * FROM {PSN_SEQUENCEDATA}";
                     using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query)))
-c248ee3
+            gaqhf
-a96301
+                        dt = ds.Tables[0].Copy();
-c248ee3
+            gaqhf
+                }
                 catch (Exception ex)
+                {
                     Log.Write(ex.Message + "\r\n" + ex.StackTrace);
+                }
+            }
-a96301
+            humkyung
-c248ee3
+            return dt;
+        }
-d842083
+            LJIYEON
-            d1afd412
+            이지연
-d842083
+        //Anohter DB
         public static bool ConnTestAndCreateAnotherTable()
+        {
             bool result = false;
             AnotherID2Info id2Info = AnotherID2Info.GetInstance();
             using (IAbstractDatabase connection = id2Info.CreateConnection())
+            {
                 try
+                {
                     var names = connection.GetTableNames();
                     var matched = names.FirstOrDefault(param => param == PSN_HEADER_SETTING);
                     Dictionary<string, string> dicColCheck = new Dictionary<string, string>();
                     dicColCheck.Add("GROUP_ID", "TEXT");
                     dicColCheck.Add("DESCRIPTION", "TEXT");
                     dicColCheck.Add("INDEX", "INTEGER");
                     dicColCheck.Add("NAME", "TEXT");
                     if (matched == null)
+                    {
                         var query = $"CREATE TABLE {PSN_HEADER_SETTING} (GROUP_ID TEXT, DESCRIPTION TEXT, [INDEX] INTEGER, NAME TEXT)";
                         using (var cmd = connection.GetSqlStringCommand(query))
+                        {
                             cmd.ExecuteNonQuery();
+                        }
+                    }
                     else
+                    {
                         AddColumn(PSN_HEADER_SETTING, dicColCheck);
+                    }
                     matched = names.FirstOrDefault(param => param == PSN_VENTDRAIN_SETTING);
                     dicColCheck.Clear();
                     dicColCheck.Add("GROUP_ID", "TEXT");
                     dicColCheck.Add("DESCRIPTION", "TEXT");
                     dicColCheck.Add("INDEX", "INTEGER");
                     dicColCheck.Add("NAME", "TEXT");
                     if (matched == null)
+                    {
                         var query = $"CREATE TABLE {PSN_VENTDRAIN_SETTING} (GROUP_ID TEXT, DESCRIPTION TEXT, [INDEX] INTEGER, NAME TEXT)";
                         using (var cmd = connection.GetSqlStringCommand(query))
+                        {
                             cmd.ExecuteNonQuery();
+                        }
+                    }
                     else
+                    {
                         AddColumn(PSN_VENTDRAIN_SETTING, dicColCheck);
+                    }
                     matched = names.FirstOrDefault(param => param == PSN_TOPOLOGY_RULE);
                     dicColCheck.Clear();
                     dicColCheck.Add("UID", "TEXT");
                     if (matched == null)
+                    {
                         var query = $"CREATE TABLE {PSN_TOPOLOGY_RULE} (UID TEXT)";
                         using (var cmd = connection.GetSqlStringCommand(query))
+                        {
                             cmd.ExecuteNonQuery();
+                        }
                         DataTable topologyRule = new DataTable();
                         topologyRule.Columns.Add("NAME", typeof(string));
                         topologyRule.Rows.Add("FluidCode");
                         topologyRule.Rows.Add("-");
                         topologyRule.Rows.Add("PipingMaterialsClass");
                         topologyRule.Rows.Add("-");
                         topologyRule.Rows.Add("Tag Seq No");
                         SaveTopologyRule(topologyRule);
+                    }
                     //else
                     //{
                     //    AddColumn(PSN_TOPOLOGY_RULE, dicColCheck);
                     //}
                     matched = names.FirstOrDefault(param => param == PSN_PIPESYSTEMNETWORK);
                     dicColCheck.Clear();
                     dicColCheck.Add("OID", "NVARCHAR(255)");
                     dicColCheck.Add("Type", "NVARCHAR(255)");
                     dicColCheck.Add("OrderNumber", "NVARCHAR(255)");
                     dicColCheck.Add("Pipeline_OID", "NVARCHAR(255)");
                     dicColCheck.Add("From_Data", "NVARCHAR(255)");
                     dicColCheck.Add("To_Data", "NVARCHAR(255)");
                     dicColCheck.Add("TopologySet_OID_Key", "NVARCHAR(125)");
                     dicColCheck.Add("PSNRevisionNumber", "NVARCHAR(255)");
                     dicColCheck.Add("IsValid", "INT");
                     dicColCheck.Add("Status", "NVARCHAR(255)");
                     dicColCheck.Add("PBS", "NVARCHAR(255)");
                     dicColCheck.Add("Drawings", "NVARCHAR(255)");
                     dicColCheck.Add("IncludingVirtualData", "NVARCHAR(10)");
                     dicColCheck.Add("PSNAccuracy", "REAL");
-b33e44
+                    dicColCheck.Add("Pocket", "NVARCHAR(10)");
-            d1afd412
+                    dicColCheck.Add("EGTag", "NVARCHAR(255)");
                     dicColCheck.Add("HasMLTags", "NVARCHAR(50)");
-b66a
+                    dicColCheck.Add("GroundLevel", "NVARCHAR(20)");
-d842083
+                    if (matched == null)
+                    {
                         var query = $"CREATE TABLE {PSN_PIPESYSTEMNETWORK} (OID NVARCHAR(255), Type NVARCHAR(255), OrderNumber NVARCHAR(255), Pipeline_OID NVARCHAR(255), From_Data NVARCHAR(255), " +
                             "To_Data NVARCHAR(255), TopologySet_OID_Key NVARCHAR(125), PSNRevisionNumber NVARCHAR(255), IsValid INTEGER, Status NVARCHAR(255), PBS NVARCHAR(255), Drawings NVARCHAR(255), " +
-b66a
+                            "IncludingVirtualData NVARCHAR(10),  PSNAccuracy REAL, Pocket NVARCHAR(10), EGTag NVARCHAR(255), HasMLTags NVARCHAR(50), GroundLevel NVARCHAR(50))";
-d842083
+                        using (var cmd = connection.GetSqlStringCommand(query))
+                        {
                             cmd.ExecuteNonQuery();
+                        }
+                    }
                     else
+                    {
                         AddColumn(PSN_PIPESYSTEMNETWORK, dicColCheck);
+                    }
                     matched = names.FirstOrDefault(param => param == PSN_EQUIPMENT);
                     dicColCheck.Clear();
                     dicColCheck.Add("OID", "NVARCHAR(255)");
                     dicColCheck.Add("ItemTag", "NVARCHAR(255)");
                     dicColCheck.Add("Xcoords", "REAL");
                     dicColCheck.Add("Ycoords", "REAL");
                     if (matched == null)
+                    {
                         var query = $"CREATE TABLE {PSN_EQUIPMENT} (OID NVARCHAR(255), ItemTag NVARCHAR(255), Xcoords REAL, Ycoords REAL)";
                         using (var cmd = connection.GetSqlStringCommand(query))
+                        {
                             cmd.ExecuteNonQuery();
+                        }
+                    }
                     else
+                    {
                         AddColumn(PSN_EQUIPMENT, dicColCheck);
+                    }
                     dicColCheck.Clear();
                     dicColCheck.Add("OID", "NVARCHAR(255)");
                     dicColCheck.Add("ItemTag", "NVARCHAR(255)");
                     dicColCheck.Add("Xcoords", "REAL");
                     dicColCheck.Add("Ycoords", "REAL");
                     dicColCheck.Add("Equipment_OID", "NVARCHAR(255)");
                     dicColCheck.Add("Fluid", "NVARCHAR(255)");
                     dicColCheck.Add("NPD", "NVARCHAR(255)");
                     dicColCheck.Add("PMC", "NVARCHAR(255)");
                     dicColCheck.Add("Rotation", "REAL");
                     dicColCheck.Add("FlowDirection", "NVARCHAR(255)");
                     matched = names.FirstOrDefault(param => param == PSN_NOZZLE);
                     if (matched == null)
+                    {
                         var query = $"CREATE TABLE {PSN_NOZZLE} (OID NVARCHAR(255), ItemTag NVARCHAR(255), Xcoords REAL, Ycoords REAL, Equipment_OID NVARCHAR(255), " +
                             "Fluid NVARCHAR(255), NPD NVARCHAR(255), PMC NVARCHAR(255), Rotation REAL, FlowDirection NVARCHAR(255))";
                         using (var cmd = connection.GetSqlStringCommand(query))
+                        {
                             cmd.ExecuteNonQuery();
+                        }
+                    }
                     else
+                    {
                         AddColumn(PSN_NOZZLE, dicColCheck);
+                    }
                     matched = names.FirstOrDefault(param => param == PSN_FLUIDCODE);
                     dicColCheck.Clear();
                     dicColCheck.Add("UID", "NVARCHAR(50)");
                     dicColCheck.Add("Code", "NVARCHAR(255)");
                     dicColCheck.Add("Description", "NVARCHAR(255)");
                     dicColCheck.Add("Condition", "NVARCHAR(255)");
                     dicColCheck.Add("Remarks", "NVARCHAR(255)");
                     dicColCheck.Add("GroundLevel", "NVARCHAR(20)");
                     if (matched == null)
+                    {
                         var query = $"CREATE TABLE {PSN_FLUIDCODE} (UID NVARCHAR(50), Code NVARCHAR(255), Description NVARCHAR(255), Condition NVARCHAR(255), Remarks NVARCHAR(255), GroundLevel NVARCHAR(20))";
                         using (var cmd = connection.GetSqlStringCommand(query))
+                        {
                             cmd.ExecuteNonQuery();
+                        }
+                    }
                     else
+                    {
                         AddColumn(PSN_FLUIDCODE, dicColCheck);
+                    }
                     matched = names.FirstOrDefault(param => param == PSN_PIPINGMATLCLASS);
                     dicColCheck.Clear();
                     dicColCheck.Add("UID", "NVARCHAR(50)");
                     dicColCheck.Add("Priority", "INTEGER");
                     dicColCheck.Add("Code", "NVARCHAR(255)");
                     dicColCheck.Add("Description", "NVARCHAR(255)");
                     dicColCheck.Add("Condition", "NVARCHAR(255)");
                     dicColCheck.Add("Remarks", "NVARCHAR(255)");
                     dicColCheck.Add("GroundLevel", "NVARCHAR(20)");
                     if (matched == null)
+                    {
                         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))";
                         using (var cmd = connection.GetSqlStringCommand(query))
+                        {
                             cmd.ExecuteNonQuery();
+                        }
+                    }
                     else
+                    {
                         AddColumn(PSN_PIPINGMATLCLASS, dicColCheck);
+                    }
                     matched = names.FirstOrDefault(param => param == PSN_SEQUENCEDATA);
                     dicColCheck.Clear();
                     dicColCheck.Add("OID", "NVARCHAR(255)");
                     dicColCheck.Add("SERIALNUMBER", "NVARCHAR(255)");
                     dicColCheck.Add("PathItem_OID", "NVARCHAR(255)");
                     dicColCheck.Add("TopologySet_OID_Key", "NVARCHAR(255)");
                     if (matched == null)
+                    {
                         var query = $"CREATE TABLE {PSN_SEQUENCEDATA} (OID NVARCHAR(255), SERIALNUMBER NVARCHAR(255), PathItem_OID NVARCHAR(255), TopologySet_OID_Key NVARCHAR(255))";
                         using (var cmd = connection.GetSqlStringCommand(query))
+                        {
                             cmd.ExecuteNonQuery();
+                        }
+                    }
                     else
+                    {
                         AddColumn(PSN_SEQUENCEDATA, dicColCheck);
+                    }
                     matched = names.FirstOrDefault(param => param == PSN_PATHITEMS);
                     dicColCheck.Clear();
                     dicColCheck.Add("OID", "NVARCHAR(255)");
                     dicColCheck.Add("SequenceData_OID", "NVARCHAR(255)");
                     dicColCheck.Add("TopologySet_OID", "NVARCHAR(255)");
                     dicColCheck.Add("BranchTopologySet_OID", "NVARCHAR(255)");
                     dicColCheck.Add("PipeLine_OID", "NVARCHAR(255)");
                     dicColCheck.Add("ItemName", "NVARCHAR(255)");
                     dicColCheck.Add("ItemTag", "NVARCHAR(255)");
                     dicColCheck.Add("DESCRIPTION", "NVARCHAR(255)");
                     dicColCheck.Add("CLASS", "NVARCHAR(255)");
                     dicColCheck.Add("SUBCLASS", "NVARCHAR(255)");
                     dicColCheck.Add("TYPE", "NVARCHAR(255)");
                     dicColCheck.Add("PIDNAME", "NVARCHAR(255)");
                     dicColCheck.Add("Equipment_OID", "NVARCHAR(255)");
                     dicColCheck.Add("NPD", "NVARCHAR(255)");
-d7949
+                    dicColCheck.Add("GROUPTAG", "NVARCHAR(255)");
-d842083
+                    dicColCheck.Add("PipeSystemNetwork_OID", "NVARCHAR(255)");
                     dicColCheck.Add("PipeRun_OID", "NVARCHAR(255)");
                     dicColCheck.Add("ViewPipeSystemNetwork_OID", "NVARCHAR(255)");
-            bf9e8432
+                    dicColCheck.Add("EqpGroupTag", "NVARCHAR(255)");
                     dicColCheck.Add("MainLineTag", "NVARCHAR(255)");
                     dicColCheck.Add("EGTConnectedPoint", "INT");
                     dicColCheck.Add("EGFlowDirection", "NVARCHAR(10)");
-d842083
+                    if (matched == null)
+                    {
                         var query = $"CREATE TABLE {PSN_PATHITEMS} (OID NVARCHAR(255), SequenceData_OID NVARCHAR(255), " +
                             "TopologySet_OID NVARCHAR(255), BranchTopologySet_OID NVARCHAR(255), PipeLine_OID NVARCHAR(255), ItemName NVARCHAR(255), ItemTag NVARCHAR(255), DESCRIPTION NVARCHAR(255), " +
-d7949
+                            "CLASS NVARCHAR(255), SUBCLASS NVARCHAR(255), TYPE NVARCHAR(255), PIDNAME NVARCHAR(255), Equipment_OID NVARCHAR(255), NPD NVARCHAR(255), GROUPTAG NVARCHAR(255), PipeSystemNetwork_OID NVARCHAR(255), PipeRun_OID NVARCHAR(255), " +
-            bf9e8432
+                            "ViewPipeSystemNetwork_OID NVARCHAR(255), EqpGroupTag NVARCHAR(255), MainLineTag NVARCHAR(255), EGTConnectedPoint INT, EGFlowDirection NVARCHAR(10))";
-d842083
+                        using (var cmd = connection.GetSqlStringCommand(query))
+                        {
                             cmd.ExecuteNonQuery();
+                        }
+                    }
                     else
+                    {
                         AddColumn(PSN_PATHITEMS, dicColCheck);
+                    }
                     matched = names.FirstOrDefault(param => param == PSN_VIEW);
                     dicColCheck.Clear();
                     dicColCheck.Add("OID", "TEXT");
                     if (matched == null)
+                    {
                         var query = $"CREATE TABLE {PSN_VIEW} (OID TEXT)";
                         using (var cmd = connection.GetSqlStringCommand(query))
+                        {
                             cmd.ExecuteNonQuery();
+                        }
+                    }
                     matched = names.FirstOrDefault(param => param == PSN_TOPOLOGYSET);
                     dicColCheck.Clear();
                     dicColCheck.Add("OID", "NVARCHAR(255)");
                     dicColCheck.Add("Type", "NVARCHAR(255)");
                     dicColCheck.Add("SubType", "NVARCHAR(255)");
                     dicColCheck.Add("HeadItemTag", "NVARCHAR(255)");
                     dicColCheck.Add("TailItemTag", "NVARCHAR(255)");
                     dicColCheck.Add("HeadItemSPID", "NVARCHAR(255)");
                     dicColCheck.Add("TailItemSPID", "NVARCHAR(255)");
                     if (matched == null)
+                    {
                         var query = $"CREATE TABLE { PSN_TOPOLOGYSET} (OID NVARCHAR(255), Type NVARCHAR(255), SubType NVARCHAR(255), HeadItemTag NVARCHAR(255), TailItemTag NVARCHAR(255), HeadItemSPID NVARCHAR(255), TailItemSPID NVARCHAR(255))";
                         using (var cmd = connection.GetSqlStringCommand(query))
+                        {
                             cmd.ExecuteNonQuery();
+                        }
+                    }
                     else
+                    {
                         AddColumn(PSN_TOPOLOGYSET, dicColCheck);
+                    }
                     matched = names.FirstOrDefault(param => param == PSN_TRANSFORMKEYWORD_SETTING);
                     dicColCheck.Clear();
-            b56d3ccb
+                    dicColCheck.Add("INDEX", "INTEGER");
                     dicColCheck.Add("NAME", "TEXT");
                     dicColCheck.Add("KEYWORD", "TEXT");
-d842083
+                    if (matched == null)
+                    {
                         var query = $"CREATE TABLE {PSN_TRANSFORMKEYWORD_SETTING} ([INDEX] INTEGER, [NAME] TEXT, [KEYWORD] TEXT)";
                         using (var cmd = connection.GetSqlStringCommand(query))
+                        {
                             cmd.ExecuteNonQuery();
+                        }
+                    }
                     else
+                    {
                         AddColumn(PSN_TRANSFORMKEYWORD_SETTING, dicColCheck);
+                    }
-            a2ab8a90
+                    matched = names.FirstOrDefault(param => param == PSN_MULTIWAY_SETTING);
                     dicColCheck.Clear();
                     dicColCheck.Add("INDEX", "INTEGER");
                     dicColCheck.Add("NAME", "TEXT");
                     if (matched == null)
+                    {
-f02de16
+                        var query = $"CREATE TABLE {PSN_MULTIWAY_SETTING} ([INDEX] INTEGER, [NAME] TEXT)";
-            a2ab8a90
+                        using (var cmd = connection.GetSqlStringCommand(query))
+                        {
                             cmd.ExecuteNonQuery();
+                        }
+                    }
                     else
+                    {
                         AddColumn(PSN_MULTIWAY_SETTING, dicColCheck);
+                    }
-d842083
+                    matched = names.FirstOrDefault(param => param == PSN_PIPELINE);
                     dicColCheck.Clear();
                     dicColCheck.Add("OID", "NVARCHAR(255)");
                     dicColCheck.Add("PipeSystem_OID", "NVARCHAR(255)");
                     dicColCheck.Add("FLUID", "NVARCHAR(255)");
                     dicColCheck.Add("PMC", "NVARCHAR(255)");
                     dicColCheck.Add("SEQNUMBER", "NVARCHAR(255)");
                     dicColCheck.Add("INSULATION", "NVARCHAR(255)");
                     dicColCheck.Add("FROM_DATA", "NVARCHAR(255)");
                     dicColCheck.Add("TO_DATA", "NVARCHAR(255)");
                     dicColCheck.Add("Unit", "NVARCHAR(100)");
                     if (matched == null)
+                    {
                         var query = $"CREATE TABLE {PSN_PIPELINE} (OID NVARCHAR(255), PipeSystem_OID NVARCHAR(255), FLUID NVARCHAR(255), PMC NVARCHAR(255), SEQNUMBER NVARCHAR(255), INSULATION NVARCHAR(255), " +
                             $"FROM_DATA NVARCHAR(255), TO_DATA NVARCHAR(255), Unit NVARCHAR(100))";
                         using (var cmd = connection.GetSqlStringCommand(query))
+                        {
                             cmd.ExecuteNonQuery();
+                        }
+                    }
                     else
+                    {
                         AddColumn(PSN_PIPELINE, dicColCheck);
+                    }
                     matched = names.FirstOrDefault(param => param == PSN_INSULATIONPURPOSE);
                     dicColCheck.Clear();
                     dicColCheck.Add("UID", "NVARCHAR(50)");
                     dicColCheck.Add("Code", "NVARCHAR(255)");
                     dicColCheck.Add("Description", "NVARCHAR(255)");
                     dicColCheck.Add("Remarks", "NVARCHAR(255)");
                     if (matched == null)
+                    {
                         var query = $"CREATE TABLE {PSN_INSULATIONPURPOSE} (UID NVARCHAR(50), Code NVARCHAR(255), Description NVARCHAR(255), Remarks NVARCHAR(255))";
                         using (var cmd = connection.GetSqlStringCommand(query))
+                        {
                             cmd.ExecuteNonQuery();
+                        }
+                    }
                     else
+                    {
                         AddColumn(PSN_INSULATIONPURPOSE, dicColCheck);
+                    }
-d7949
+                    matched = names.FirstOrDefault(param => param == PSN_VALVEGROUP_SETTING);
                     dicColCheck.Clear();
                     dicColCheck.Add("OID", "NVARCHAR(255)");
                     dicColCheck.Add("GroupType", "NVARCHAR(255)");
                     dicColCheck.Add("TagIdentifier", "NVARCHAR(50)");
                     dicColCheck.Add("AttributeName", "NVARCHAR(255)");
                     dicColCheck.Add("SppidSymbolName", "NVARCHAR(255)");
                     if (matched == null)
+                    {
                         var query = $"CREATE TABLE {PSN_VALVEGROUP_SETTING} (OID NVARCHAR(50), GroupType NVARCHAR(255), TagIdentifier NVARCHAR(50), AttributeName NVARCHAR(255), SppidSymbolName NVARCHAR(255))";
                         using (var cmd = connection.GetSqlStringCommand(query))
+                        {
                             cmd.ExecuteNonQuery();
+                        }
+                    }
                     else
+                    {
                         AddColumn(PSN_VALVEGROUP_SETTING, dicColCheck);
+                    }
-fb158
+                    matched = names.FirstOrDefault(param => param == PSN_PIPESYSTEM);
                     dicColCheck.Clear();
                     dicColCheck.Add("OID", "NVARCHAR(255)");
                     dicColCheck.Add("DESCRIPTION", "NVARCHAR(255)");
                     dicColCheck.Add("FLUID", "NVARCHAR(255)");
                     dicColCheck.Add("PMC", "NVARCHAR(255)");
                     dicColCheck.Add("PipeLineQty", "NVARCHAR(255)");
                     dicColCheck.Add("GroundLevel", "NVARCHAR(20)");
                     if (matched == null)
+                    {
                         var query = $"CREATE TABLE {PSN_PIPESYSTEM} (OID NVARCHAR(255), DESCRIPTION NVARCHAR(255), FLUID NVARCHAR(255), PMC NVARCHAR(255), PipeLineQty NVARCHAR(255), GroundLevel NVARCHAR(20))";
                         using (var cmd = connection.GetSqlStringCommand(query))
+                        {
                             cmd.ExecuteNonQuery();
+                        }
+                    }
                     else
+                    {
                         AddColumn(PSN_PIPESYSTEM, dicColCheck);
+                    }
-c1965b
+                    matched = names.FirstOrDefault(param => param == PSN_NOPOCKETSETTING);
                     dicColCheck.Clear();
-fa2c9
+                    dicColCheck.Add("INDEX", "INTEGER");
                     dicColCheck.Add("TYPE", "TEXT");
                     dicColCheck.Add("NAME", "TEXT");
-c1965b
+                    if (matched == null)
+                    {
                         var query = $"CREATE TABLE {PSN_NOPOCKETSETTING} ([INDEX] INTEGER, [TYPE] TEXT, [NAME] TEXT)";
                         using (var cmd = connection.GetSqlStringCommand(query))
+                        {
                             cmd.ExecuteNonQuery();
+                        }
+                    }
                     else
+                    {
                         AddColumn(PSN_NOPOCKETSETTING, dicColCheck);
+                    }
-b6df95
+            LJIYEON
-            f2a63376
+                    matched = names.FirstOrDefault(param => param == PSN_AIRFINCOOLERSETTING);
                     dicColCheck.Clear();
-fa2c9
+                    dicColCheck.Add("INDEX", "INTEGER");
                     dicColCheck.Add("TYPE", "TEXT");
                     dicColCheck.Add("TagIdentifier", "NVARCHAR(50)");
                     dicColCheck.Add("AttributeName", "NVARCHAR(255)");
                     dicColCheck.Add("NAME", "TEXT");
-            f2a63376
+                    if (matched == null)
+                    {
-fa2c9
+                        var query = $"CREATE TABLE {PSN_AIRFINCOOLERSETTING} ([INDEX] INTEGER, [TYPE] TEXT, [TagIdentifier] TEXT, [AttributeName] TEXT, [NAME] TEXT)";
-            f2a63376
+                        using (var cmd = connection.GetSqlStringCommand(query))
+                        {
                             cmd.ExecuteNonQuery();
+                        }
+                    }
                     else
+                    {
                         AddColumn(PSN_AIRFINCOOLERSETTING, dicColCheck);
+                    }
-            d1afd412
+            이지연
-            f2a63376
+            이지연
-b6df95
+                    var query2 = $"If(db_id(N'" + PSN_COMMON + "') IS NULL) CREATE DATABASE [" + PSN_COMMON + "]";
                     if (id2Info.ID2DBType == AnotherID2DB_Type.MSSQL)
+                    {
                         //connection.ExecuteNonQuery(connection.GetSqlStringCommand(query), txn);
                         using (var cmd = connection.GetSqlStringCommand(query2))
+                        {
                             cmd.ExecuteNonQuery();
+                        }
+                    }
-d842083
+                    void AddColumn(string TableName, Dictionary<string, string> dicCol)
+                    {
                         var colnames = connection.GetColumnNames(TableName);
                         bool check = false;
                         if (colnames != null)
+                        {
                             foreach (KeyValuePair<string, string> col in dicCol)
+                            {
                                 check = false;
                                 foreach (string c in colnames)
+                                {
-ad289b2
+                                    if (col.Key.ToUpper().Equals(c.ToUpper()))
-d842083
+            LJIYEON
                                         check = true;
                                         break;
+                                    }
+                                }
                                 if (!check) //없으면 추가
+                                {
                                     string i = string.Empty;
                                     if (col.Value.ToString().ToUpper().Contains("INT") || col.Value.ToString().ToUpper().Contains("REAL"))
                                         i = "DEFAULT 0";
                                     var query = $"ALTER TABLE " + TableName + " ADD [" + col.Key + "] " + col.Value + " " + i + ";";
                                     using (var cmd = connection.GetSqlStringCommand(query))
+                                    {
                                         cmd.ExecuteNonQuery();
+                                    }
+                                }
+                            }
+                        }
+                    }
                     result = true;
+                }
                 catch (Exception ex)
+                {
                     Log.Write(ex.Message + "\r\n" + ex.StackTrace);
+                }
+            }
             return result;
+        }
-b6df95
+        public static bool SaveAnotherRevision(string ProjectCode, int RevNumber, string UserName, string PSNDatabasePath, string PsnByPBSFilter, string PsnByNPDFilter,
          int PidDrawings, int PipeSystems, int PipeLines, int Topologies, int PipeSystemNetworks, int InValidPSNs, int E2E, int E2B, int B2E, int HDE, int HD2, int HDB, int B2B)
+        {
             AnotherID2Info id2Info = AnotherID2Info.GetInstance();
             bool result = true;
             using (IAbstractDatabase connection = id2Info.CreateConnection())
+            {
                 try
+                {
                     using (var txn = connection.BeginTransaction())
+                    {
                         try
+                        {
                             var query = $"INSERT INTO ARS_COMMON.dbo.PSNRevision (OID, Project_OID, ProjectCode, RevNumber, UserName, TimeData, PSNDatabasePath, " +
                                 $"PsnByPBSFilter, PsnByNPDFilter, PidDrawings, PipeSystems, PipeLines, Topologies, PipeSystemNetworks, InValidPSNs, E2E, E2B, B2E, HDE, " +
-c75c0b
+                                $"HD2, HDB, B2B, LastModificationdate, ID2_PSN) VALUES (NEWID(), NEWID(), @ProjectCode, @RevNumber, @UserName, @TimeData, @PSNDatabasePath" +
-b6df95
+                                $", @PsnByPBSFilter, @PsnByNPDFilter, @PidDrawings, @PipeSystems, @PipeLines, @Topologies, @PipeSystemNetworks, @InValidPSNs, " +
-c75c0b
+                                $"@E2E, @E2B, @B2E, @HDE, @HD2, @HDB, @B2B, @LastModificationdate, @ID2_PSN)";
-b6df95
+                            var cmd = connection.GetSqlStringCommand(query);
                             AddWithValue(cmd, "@OID", Guid.NewGuid().ToString());
                             AddWithValue(cmd, "@Project_OID", Guid.NewGuid().ToString());
                             AddWithValue(cmd, "@ProjectCode", ProjectCode);
                             AddWithValue(cmd, "@RevNumber", RevNumber);
                             AddWithValue(cmd, "@UserName", UserName);
                             System.Globalization.CultureInfo ci = new System.Globalization.CultureInfo("en-US");
-            d1afd412
+                            DateTime oDateTime = DateTime.Now;
-b6df95
+            LJIYEON
                             AddWithValue(cmd, "@TimeData", oDateTime.ToString(ci)); //String.Format("{0:G}", dt) // DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")
-            d1afd412
+            이지연
-b6df95
+                            AddWithValue(cmd, "@PSNDatabasePath", PSNDatabasePath);
                             AddWithValue(cmd, "@PsnByPBSFilter", PsnByPBSFilter);
                             AddWithValue(cmd, "@PsnByNPDFilter", PsnByNPDFilter);
                             AddWithValue(cmd, "@PidDrawings", PidDrawings);
                             AddWithValue(cmd, "@PipeSystems", PipeSystems);
                             AddWithValue(cmd, "@PipeLines", PipeLines);
                             AddWithValue(cmd, "@Topologies", Topologies);
                             AddWithValue(cmd, "@PipeSystemNetworks", PipeSystemNetworks);
                             AddWithValue(cmd, "@InValidPSNs", InValidPSNs);
                             AddWithValue(cmd, "@E2E", E2E);
                             AddWithValue(cmd, "@E2B", E2B);
                             AddWithValue(cmd, "@B2E", B2E);
                             AddWithValue(cmd, "@HDE", HDE);
                             AddWithValue(cmd, "@HD2", HD2);
                             AddWithValue(cmd, "@HDB", HDB);
                             AddWithValue(cmd, "@B2B", B2B);
-e181
+            LJIYEON
                             AddWithValue(cmd, "@LastModificationdate", oDateTime.ToString(ci));
-c75c0b
+                            AddWithValue(cmd, "@ID2_PSN", "Y");
-            d1afd412
+            이지연
-b6df95
+                            connection.ExecuteNonQuery(cmd, txn);
                             txn.Commit();
+                        }
                         catch (Exception ex)
+                        {
                             txn.Rollback();
                             result = false;
+                        }
+                    }
+                }
                 catch (Exception ex)
+                {
                     System.Windows.Forms.MessageBox.Show(ex.Message);
                     result = false;
+                }
+            }
             return result;
+        }
         public static bool ConnAnotherCreateRevisionTable(Dictionary<string, string> dicColCheck, List<string> names)
+        {
             bool result = false;
             AnotherID2Info id2Info = AnotherID2Info.GetInstance();
             using (IAbstractDatabase connection = id2Info.CreateConnection())
+            {
                 try
+                {
                     if (names.Count == 0)
+                    {
                         var query = $"CREATE TABLE ARS_COMMON.dbo.PSNRevision ([OID] [uniqueidentifier] ,[Project_OID] [uniqueidentifier] ," +
                             $"[ProjectCode] nvarchar(255), [RevNumber] int ,[UserName] nvarchar(255) ,[TimeData] nvarchar(255) ," +
                             $"[PSNDatabasePath] nvarchar(255) ,	[PsnByPBSFilter] varchar(20) ,[PsnByNPDFilter] varchar(20) ,[PidDrawings] int ,	" +
                             $"[PipeSystems] int ,[PipeLines] int ,[Topologies] int ,[PipeSystemNetworks] int ,[InValidPSNs] int ,[E2E] int ," +
-c75c0b
+                            $"[E2B] int ,[B2E] int ,[HDE] int ,[HD2] int ,[HDB] int ,[B2B] int , [LastModificationdate] nvarchar(255), [ID2_PSN] nvarchar(10))";
-b6df95
+                        using (var cmd = connection.GetSqlStringCommand(query))
+                        {
                             cmd.ExecuteNonQuery();
+                        }
+                    }
                     else
+                    {
                         AddColumn(PSN_REVISION, dicColCheck, names);
+                    }
                     void AddColumn(string TableName, Dictionary<string, string> dicCol, List<string> colnames)
+                    {
                         bool check = false;
                         if (colnames != null)
+                        {
                             foreach (KeyValuePair<string, string> col in dicCol)
+                            {
                                 check = false;
                                 foreach (string c in colnames)
+                                {
                                     if (col.Key.Contains(c))
+                                    {
                                         check = true;
                                         break;
+                                    }
+                                }
                                 if (!check) //없으면 추가
+                                {
                                     string i = string.Empty;
                                     if (col.Value.ToString().ToUpper().Contains("INT") || col.Value.ToString().ToUpper().Contains("REAL"))
                                         i = "DEFAULT 0";
                                     var queryalter = $"ALTER TABLE ARS_COMMON.dbo.PSNRevision ADD [" + col.Key + "] " + col.Value + " " + i + ";";
                                     using (var cmd = connection.GetSqlStringCommand(queryalter))
+                                    {
                                         cmd.ExecuteNonQuery();
+                                    }
+                                }
+                            }
+                        }
+                    }
                     result = true;
+                }
                 catch (Exception ex)
+                {
                     Log.Write(ex.Message + "\r\n" + ex.StackTrace);
+                }
+            }
             return result;
+        }
-e181
+        public static DataTable SelectAnotherRevision()
+        {
             DataTable dt = null;
             AnotherID2Info id2Info = AnotherID2Info.GetInstance();
             using (IAbstractDatabase connection = id2Info.CreateConnection())
+            {
                 try
+                {
                     var query = $"SELECT * FROM ARS_COMMON.dbo.PSNREVISION";
                     using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query)))
+                    {
                         dt = ds.Tables[0].Copy();
+                    }
+                }
                 catch (Exception ex)
+                {
                     Log.Write(ex.Message + "\r\n" + ex.StackTrace);
+                }
+            }
             return dt;
+        }
-b6df95
+        public static DataTable SelectAnotherRevisionTable()
+        {
             DataTable dt = null;
             AnotherID2Info id2Info = AnotherID2Info.GetInstance();
             using (IAbstractDatabase connection = id2Info.CreateConnection())
+            {
                 try
+                {
-e181
+                    var query = $"SELECT T.name AS table_name, C.name AS column_name FROM ARS_COMMON.sys.tables AS T INNER JOIN ARS_COMMON.sys.columns AS C ON T.object_id = C.object_id WHERE T.name = 'PSNREVISION'";
-b6df95
+                    using (var ds = connection.ExecuteDataSet(connection.GetSqlStringCommand(query)))
+                    {
                         dt = ds.Tables[0].Copy();
+                    }
+                }
                 catch (Exception ex)
+                {
                     Log.Write(ex.Message + "\r\n" + ex.StackTrace);
+                }
+            }
             return dt;
+        }
-d842083
+        public static bool SaveAnotherPSNData(PSN item, List<HeaderInfo> headerInfos, List<VentDrainInfo> ventDrainInfos,
-            a2ab8a90
+          List<KeywordItem> keywordItems, DataTable dtTopologyRule, DataTable dtFluidCode, DataTable dtPMC, DataTable dtInsulation, DataTable dtvalvegrouping, DataTable dtnopocket, DataTable dtafc,
           List<MultiwayItem> multiwayItems)
-d842083
+            LJIYEON
             AnotherID2Info id2Info = AnotherID2Info.GetInstance();
             bool result = true;
             using (IAbstractDatabase connection = id2Info.CreateConnection())
+            {
                 try
+                {
                     using (var txn = connection.BeginTransaction())
+                    {
                         try
+                        {
                             // Path Items
                             var query = $"DELETE FROM {PSN_PATHITEMS}";
                             connection.ExecuteNonQuery(connection.GetSqlStringCommand(query), txn);
                             for (int i = 0; i < item.PathItems.Rows.Count; i++)
+                            {
                                 DataRow row = item.PathItems.Rows[i];
                                 query = $"INSERT INTO {PSN_PATHITEMS} " +
                                     $"(OID, SequenceData_OID, TopologySet_OID, BranchTopologySet_OID, PipeLine_OID, ItemName, ItemTag, DESCRIPTION, CLASS, SUBCLASS, TYPE, " +
-            bf9e8432
+                                    $"PIDNAME, Equipment_OID, NPD, GROUPTAG, PipeSystemNetwork_OID, PipeRun_OID, ViewPipeSystemNetwork_OID, EqpGroupTag , MainLineTag, EGTConnectedPoint, EGFlowDirection ) VALUES " +
-d7949
+                                    $"(@OID, @SequenceData_OID, @TopologySet_OID, @BranchTopologySet_OID, @PipeLine_OID, @ITEMNAME, @ITEMTAG, @DESCRIPTION, @Class, @SubClass, @TYPE, @PIDNAME," +
-            bf9e8432
+                                    $" @Equipment_OID, @NPD, @GROUPTAG, @PipeSystemNetwork_OID,@PipeRun_OID, @ViewPipeSystemNetwork_OID, @EqpGroupTag , @MainLineTag, @EGTConnectedPoint, @EGFlowDirection )";
-d842083
+                                var cmd = connection.GetSqlStringCommand(query);
                                 AddWithValue(cmd, "@OID", string.IsNullOrEmpty(row["OID"].ToString()) ? "" : row["OID"].ToString());
                                 AddWithValue(cmd, "@SequenceData_OID", string.IsNullOrEmpty(row["SequenceData_OID"].ToString()) ? "" : row["SequenceData_OID"].ToString());
                                 AddWithValue(cmd, "@TopologySet_OID", string.IsNullOrEmpty(row["TopologySet_OID"].ToString()) ? "" : row["TopologySet_OID"].ToString());
                                 AddWithValue(cmd, "@BranchTopologySet_OID", string.IsNullOrEmpty(row["BranchTopologySet_OID"].ToString()) ? "" : row["BranchTopologySet_OID"].ToString());
                                 AddWithValue(cmd, "@PipeLine_OID", string.IsNullOrEmpty(row["PipeLine_OID"].ToString()) ? "" : row["PipeLine_OID"].ToString());
                                 AddWithValue(cmd, "@ITEMNAME", string.IsNullOrEmpty(row["ITEMNAME"].ToString()) ? "" : row["ITEMNAME"].ToString());
                                 AddWithValue(cmd, "@ITEMTAG", string.IsNullOrEmpty(row["ITEMTAG"].ToString()) ? "" : row["ITEMTAG"].ToString());
                                 AddWithValue(cmd, "@DESCRIPTION", string.IsNullOrEmpty(row["DESCRIPTION"].ToString()) ? "" : row["DESCRIPTION"].ToString());
                                 AddWithValue(cmd, "@Class", string.IsNullOrEmpty(row["Class"].ToString()) ? "" : row["Class"].ToString());
                                 AddWithValue(cmd, "@SubClass", string.IsNullOrEmpty(row["SubClass"].ToString()) ? "" : row["SubClass"].ToString());
                                 AddWithValue(cmd, "@TYPE", string.IsNullOrEmpty(row["TYPE"].ToString()) ? "" : row["TYPE"].ToString());
                                 AddWithValue(cmd, "@PIDNAME", string.IsNullOrEmpty(row["PIDNAME"].ToString()) ? "" : row["PIDNAME"].ToString());
                                 AddWithValue(cmd, "@Equipment_OID", string.IsNullOrEmpty(row["Equipment_OID"].ToString()) ? "" : row["Equipment_OID"].ToString());
                                 AddWithValue(cmd, "@NPD", string.IsNullOrEmpty(row["NPD"].ToString()) ? "" : row["NPD"].ToString());
-d7949
+                                AddWithValue(cmd, "@GROUPTAG", string.IsNullOrEmpty(row["GROUPTAG"].ToString()) ? "" : row["GROUPTAG"].ToString());
-d842083
+                                AddWithValue(cmd, "@PipeSystemNetwork_OID", string.IsNullOrEmpty(row["PipeSystemNetwork_OID"].ToString()) ? "" : row["PipeSystemNetwork_OID"].ToString());
                                 AddWithValue(cmd, "@ViewPipeSystemNetwork_OID", string.IsNullOrEmpty(row["ViewPipeSystemNetwork_OID"].ToString()) ? "" : row["ViewPipeSystemNetwork_OID"].ToString());
                                 AddWithValue(cmd, "@PipeRun_OID", string.IsNullOrEmpty(row["PipeRun_OID"].ToString()) ? "" : row["PipeRun_OID"].ToString());
-            bf9e8432
+                                AddWithValue(cmd, "@EqpGroupTag", string.IsNullOrEmpty(row["EqpGroupTag"].ToString()) ? "" : row["EqpGroupTag"].ToString());
                                 AddWithValue(cmd, "@MainLineTag", string.IsNullOrEmpty(row["MainLineTag"].ToString()) ? "" : row["MainLineTag"].ToString());
                                 AddWithValue(cmd, "@EGTConnectedPoint", string.IsNullOrEmpty(row["EGTConnectedPoint"].ToString()) ? "0" : row["EGTConnectedPoint"].ToString());
                                 AddWithValue(cmd, "@EGFlowDirection", string.IsNullOrEmpty(row["EGFlowDirection"].ToString()) ? "" : row["EGFlowDirection"].ToString());
-d842083
+                                connection.ExecuteNonQuery(cmd, txn);
+                            }
                             // Sequence
                             query = $"DELETE FROM {PSN_SEQUENCEDATA}";
                             connection.ExecuteNonQuery(connection.GetSqlStringCommand(query), txn);
                             foreach (DataRow row in item.SequenceData.Rows)
+                            {
                                 query = $"INSERT INTO {PSN_SEQUENCEDATA} (OID, SERIALNUMBER, PathItem_OID, TopologySet_OID_Key) VALUES (@OID, @SERIALNUMBER, @PathItem_OID, @TopologySet_OID_Key)";
                                 var cmd = connection.GetSqlStringCommand(query);
                                 AddWithValue(cmd, "@OID", string.IsNullOrEmpty(row["OID"].ToString()) ? "" : row["OID"].ToString());
                                 AddWithValue(cmd, "@SERIALNUMBER", string.IsNullOrEmpty(row["SERIALNUMBER"].ToString()) ? "" : row["SERIALNUMBER"].ToString());
                                 AddWithValue(cmd, "@PathItem_OID", string.IsNullOrEmpty(row["PathItem_OID"].ToString()) ? "" : row["PathItem_OID"].ToString());
                                 AddWithValue(cmd, "@TopologySet_OID_Key", string.IsNullOrEmpty(row["TopologySet_OID_Key"].ToString()) ? "" : row["TopologySet_OID_Key"].ToString());
                                 connection.ExecuteNonQuery(cmd, txn);
+                            }
                             // Nozzle
                             query = $"DELETE FROM {PSN_NOZZLE}";
                             connection.ExecuteNonQuery(connection.GetSqlStringCommand(query), txn);
                             foreach (DataRow row in item.Nozzle.Rows)
+                            {
                                 query = $"INSERT INTO {PSN_NOZZLE} (OID, ItemTag, Xcoords, Ycoords, Equipment_OID, Fluid, NPD, PMC, Rotation, FlowDirection) VALUES (@OID, @ITEMTAG, @XCOORDS, @YCOORDS, @Equipment_OID, @FLUID, @NPD, @PMC, @ROTATION, @FlowDirection)";
                                 var cmd = connection.GetSqlStringCommand(query);
                                 AddWithValue(cmd, "@OID", string.IsNullOrEmpty(row["OID"].ToString()) ? "" : row["OID"].ToString());
                                 AddWithValue(cmd, "@ITEMTAG", string.IsNullOrEmpty(row["ITEMTAG"].ToString()) ? "" : row["ITEMTAG"].ToString());
                                 if (string.IsNullOrEmpty(row["XCOORDS"].ToString()))
                                     AddWithValue(cmd, "@XCOORDS", DBNull.Value);
                                 else
                                     AddWithValue(cmd, "@XCOORDS", row["XCOORDS"].ToString());
                                 if (string.IsNullOrEmpty(row["YCOORDS"].ToString()))
                                     AddWithValue(cmd, "@YCOORDS", DBNull.Value);
                                 else
                                     AddWithValue(cmd, "@YCOORDS", row["YCOORDS"].ToString());
                                 AddWithValue(cmd, "@Equipment_OID", string.IsNullOrEmpty(row["Equipment_OID"].ToString()) ? "" : row["Equipment_OID"].ToString());
                                 AddWithValue(cmd, "@FLUID", string.IsNullOrEmpty(row["FLUID"].ToString()) ? "" : row["FLUID"].ToString());
                                 AddWithValue(cmd, "@NPD", string.IsNullOrEmpty(row["NPD"].ToString()) ? "" : row["NPD"].ToString());
                                 AddWithValue(cmd, "@PMC", string.IsNullOrEmpty(row["PMC"].ToString()) ? "" : row["PMC"].ToString());
                                 if (string.IsNullOrEmpty(row["ROTATION"].ToString()))
                                     AddWithValue(cmd, "@ROTATION", DBNull.Value);
                                 else
                                     AddWithValue(cmd, "@ROTATION", row["ROTATION"].ToString());
                                 AddWithValue(cmd, "@FlowDirection", string.IsNullOrEmpty(row["FlowDirection"].ToString()) ? "" : row["FlowDirection"].ToString());
                                 connection.ExecuteNonQuery(cmd, txn);
+                            }
                             //Equipment
                             query = $"DELETE FROM {PSN_EQUIPMENT}";
                             connection.ExecuteNonQuery(connection.GetSqlStringCommand(query), txn);
                             foreach (DataRow row in item.Equipment.Rows)
+                            {
                                 query = $"INSERT INTO {PSN_EQUIPMENT} (OID, ItemTag, Xcoords, Ycoords) VALUES (@OID, @ITEMTAG, @XCOORDS, @YCOORDS)";
                                 var cmd = connection.GetSqlStringCommand(query);
                                 AddWithValue(cmd, "@OID", string.IsNullOrEmpty(row["OID"].ToString()) ? "" : row["OID"].ToString());
                                 AddWithValue(cmd, "@ITEMTAG", string.IsNullOrEmpty(row["ITEMTAG"].ToString()) ? "" : row["ITEMTAG"].ToString());
                                 if (string.IsNullOrEmpty(row["XCOORDS"].ToString()))
                                     AddWithValue(cmd, "@XCOORDS", DBNull.Value);
                                 else
                                     AddWithValue(cmd, "@XCOORDS", row["XCOORDS"].ToString());
                                 if (string.IsNullOrEmpty(row["YCOORDS"].ToString()))
                                     AddWithValue(cmd, "@YCOORDS", DBNull.Value);
                                 else
                                     AddWithValue(cmd, "@YCOORDS", row["YCOORDS"].ToString());
                                 connection.ExecuteNonQuery(cmd, txn);
+                            }
                             // TopologySet
                             query = $"DELETE FROM {PSN_TOPOLOGYSET}";
                             connection.ExecuteNonQuery(connection.GetSqlStringCommand(query), txn);
                             foreach (DataRow row in item.TopologySet.Rows)
+                            {
                                 query = $"INSERT INTO {PSN_TOPOLOGYSET} (OID, Type, SubType, HeadItemTag, TailItemTag, HeadItemSPID, TailItemSPID) VALUES (@OID, @Type, @SubType, @HeadItemTag, @TailItemTag, @HeadItemSPID, @TailItemSPID)";
                                 var cmd = connection.GetSqlStringCommand(query);
                                 AddWithValue(cmd, "@OID", string.IsNullOrEmpty(row["OID"].ToString()) ? "" : row["OID"].ToString());
                                 AddWithValue(cmd, "@Type", string.IsNullOrEmpty(row["Type"].ToString()) ? "" : row["Type"].ToString());
                                 AddWithValue(cmd, "@SubType", string.IsNullOrEmpty(row["SubType"].ToString()) ? "" : row["SubType"].ToString());
                                 AddWithValue(cmd, "@HeadItemTag", string.IsNullOrEmpty(row["HeadItemTag"].ToString()) ? "" : row["HeadItemTag"].ToString());
                                 AddWithValue(cmd, "@TailItemTag", string.IsNullOrEmpty(row["TailItemTag"].ToString()) ? "" : row["TailItemTag"].ToString());
                                 AddWithValue(cmd, "@HeadItemSPID", string.IsNullOrEmpty(row["HeadItemSPID"].ToString()) ? "" : row["HeadItemSPID"].ToString());
                                 AddWithValue(cmd, "@TailItemSPID", string.IsNullOrEmpty(row["TailItemSPID"].ToString()) ? "" : row["TailItemSPID"].ToString());
                                 connection.ExecuteNonQuery(cmd, txn);
+                            }
                             // PSN
                             query = $"DELETE FROM {PSN_PIPESYSTEMNETWORK} WHERE PSNRevisionNumber = '{string.Format("V{0:D4}", item.Revision)}'";
                             connection.ExecuteNonQuery(connection.GetSqlStringCommand(query), txn);
                             foreach (DataRow row in item.PipeSystemNetwork.Rows)
+                            {
                                 query = $"INSERT INTO {PSN_PIPESYSTEMNETWORK} " +
-b66a
+                                    $"(OID, Type, OrderNumber, Pipeline_OID, FROM_DATA, TO_DATA, TopologySet_OID_Key, PSNRevisionNumber, PBS, Drawings, IsValid, Status, IncludingVirtualData, PSNAccuracy, Pocket, EGTag, HasMLTags, GroundLevel) VALUES " +
                                     $"(@OID, @Type, @OrderNumber, @Pipeline_OID, @FROM_DATA, @TO_DATA, @TopologySet_OID_Key, @PSNRevisionNumber,  @PBS, @Drawings, @IsValid, @Status, @IncludingVirtualData, @PSNAccuracy, @Pocket, @EGTag, @HasMLTags, @GroundLevel)";
-d842083
+                                var cmd = connection.GetSqlStringCommand(query);
                                 AddWithValue(cmd, "@OID", string.IsNullOrEmpty(row["OID"].ToString()) ? "" : row["OID"].ToString());
                                 AddWithValue(cmd, "@Type", string.IsNullOrEmpty(row["Type"].ToString()) ? "" : row["Type"].ToString());
                                 AddWithValue(cmd, "@OrderNumber", string.IsNullOrEmpty(row["OrderNumber"].ToString()) ? "" : row["OrderNumber"].ToString());
                                 AddWithValue(cmd, "@Pipeline_OID", string.IsNullOrEmpty(row["Pipeline_OID"].ToString()) ? "" : row["Pipeline_OID"].ToString());
                                 AddWithValue(cmd, "@FROM_DATA", string.IsNullOrEmpty(row["FROM_DATA"].ToString()) ? "" : row["FROM_DATA"].ToString());
                                 AddWithValue(cmd, "@TO_DATA", string.IsNullOrEmpty(row["TO_DATA"].ToString()) ? "" : row["TO_DATA"].ToString());
                                 AddWithValue(cmd, "@TopologySet_OID_Key", string.IsNullOrEmpty(row["TopologySet_OID_Key"].ToString()) ? "" : row["TopologySet_OID_Key"].ToString());
                                 AddWithValue(cmd, "@PSNRevisionNumber", string.IsNullOrEmpty(row["PSNRevisionNumber"].ToString()) ? "" : row["PSNRevisionNumber"].ToString());
                                 int IsValid = 0;
                                 if (row["IsValid"].ToString() == string.Empty || row["IsValid"].ToString() == "OK")
                                     IsValid = 0;
                                 else if (row["IsValid"].ToString() == "InValid")
                                     IsValid = 1;
                                 else if (row["IsValid"].ToString() == "Error")
                                     IsValid = -1;
                                 AddWithValue(cmd, "@IsValid", IsValid);
                                 AddWithValue(cmd, "@Status", string.IsNullOrEmpty(row["Status"].ToString()) ? "" : row["Status"].ToString());
                                 AddWithValue(cmd, "@PBS", string.IsNullOrEmpty(row["PBS"].ToString()) ? "" : row["PBS"].ToString());
                                 AddWithValue(cmd, "@Drawings", string.IsNullOrEmpty(row["Drawings"].ToString()) ? "" : row["Drawings"].ToString());
                                 AddWithValue(cmd, "@IncludingVirtualData", string.IsNullOrEmpty(row["IncludingVirtualData"].ToString()) ? "" : row["IncludingVirtualData"].ToString());
                                 if (string.IsNullOrEmpty(row["PSNAccuracy"].ToString()))
                                     AddWithValue(cmd, "@PSNAccuracy", DBNull.Value);
                                 else
-            d3fbf0c0
+                                    AddWithValue(cmd, "@PSNAccuracy", row["PSNAccuracy"].ToString().Replace("%", ""));
-d842083
+            LJIYEON
-b33e44
+                                AddWithValue(cmd, "@Pocket", string.IsNullOrEmpty(row["Pocket"].ToString()) ? "Yes" : row["Pocket"].ToString());
-            d1afd412
+                                AddWithValue(cmd, "@EGTag", string.IsNullOrEmpty(row["EGTag"].ToString()) ? "" : row["EGTag"].ToString());
                                 AddWithValue(cmd, "@HasMLTags", string.IsNullOrEmpty(row["HasMLTags"].ToString()) ? "False" : row["HasMLTags"].ToString());
-b66a
+                                AddWithValue(cmd, "@GroundLevel", string.IsNullOrEmpty(row["GroundLevel"].ToString()) ? "" : row["GroundLevel"].ToString());
-d842083
+                                connection.ExecuteNonQuery(cmd, txn);
+                            }
                             //Pipeline
                             query = $"DELETE FROM {PSN_PIPELINE}";
                             connection.ExecuteNonQuery(connection.GetSqlStringCommand(query), txn);
                             foreach (DataRow row in item.PipeLine.Rows)
+                            {
                                 query = $"INSERT INTO {PSN_PIPELINE} (OID, PipeSystem_OID, FLUID, PMC, SEQNUMBER, INSULATION, FROM_DATA, TO_DATA, Unit) VALUES (@OID, @PipeSystem_OID, @FLUID, @PMC, @SEQNUMBER, @INSULATION, @FROM_DATA, @TO_DATA, @Unit)";
                                 var cmd = connection.GetSqlStringCommand(query);
                                 AddWithValue(cmd, "@OID", row["OID"].ToString());
                                 AddWithValue(cmd, "@PipeSystem_OID", row["PipeSystem_OID"].ToString());
                                 AddWithValue(cmd, "@FLUID", row["FLUID"].ToString());
                                 AddWithValue(cmd, "@PMC", row["PMC"].ToString());
                                 AddWithValue(cmd, "@SEQNUMBER", row["SEQNUMBER"].ToString());
                                 AddWithValue(cmd, "@INSULATION", row["INSULATION"].ToString());
                                 AddWithValue(cmd, "@FROM_DATA", row["FROM_DATA"].ToString());
                                 AddWithValue(cmd, "@TO_DATA", row["TO_DATA"].ToString());
                                 AddWithValue(cmd, "@Unit", row["Unit"].ToString());
                                 connection.ExecuteNonQuery(cmd, txn);
+                            }
-fb158
+                            //PipeSystem
                             query = $"DELETE FROM {PSN_PIPESYSTEM}";
                             connection.ExecuteNonQuery(connection.GetSqlStringCommand(query), txn);
                             foreach (DataRow row in item.PipeSystem.Rows)
+                            {
                                 query = $"INSERT INTO {PSN_PIPESYSTEM} (OID, DESCRIPTION, FLUID, PMC, PipeLineQty, GroundLevel) VALUES (@OID, @DESCRIPTION, @FLUID, @PMC, @PipeLineQty, @GroundLevel)";
                                 var cmd = connection.GetSqlStringCommand(query);
                                 AddWithValue(cmd, "@OID", row["OID"].ToString());
                                 AddWithValue(cmd, "@DESCRIPTION", row["DESCRIPTION"].ToString());
                                 AddWithValue(cmd, "@FLUID", row["FLUID"].ToString());
                                 AddWithValue(cmd, "@PMC", row["PMC"].ToString());
                                 AddWithValue(cmd, "@PipeLineQty", row["PipeLineQty"].ToString());
                                 AddWithValue(cmd, "@GroundLevel", row["GroundLevel"].ToString());
                                 connection.ExecuteNonQuery(cmd, txn);
+                            }
-d842083
+                            //Header Setting
                             query = $"DELETE FROM {PSN_HEADER_SETTING}";
                             connection.ExecuteNonQuery(connection.GetSqlStringCommand(query), txn);
                             foreach (HeaderInfo headerInfo in headerInfos)
+                            {
                                 foreach (HeaderItem itemheader in headerInfo.HeaderItems)
+                                {
                                     query = $"INSERT INTO {PSN_HEADER_SETTING} (GROUP_ID, DESCRIPTION, [INDEX], NAME) VALUES (@GROUP_ID, @DESCRIPTION, @INDEX, @NAME)";
                                     var cmd = connection.GetSqlStringCommand(query);
                                     AddWithValue(cmd, "@GROUP_ID", headerInfo.UID);
                                     AddWithValue(cmd, "@DESCRIPTION", headerInfo.Description);
                                     AddWithValue(cmd, "@INDEX", itemheader.Index);
                                     AddWithValue(cmd, "@NAME", itemheader.Name);
                                     connection.ExecuteNonQuery(cmd, txn);
+                                }
+                            }
                             //Vent/Drain Setting
                             query = $"DELETE FROM {PSN_VENTDRAIN_SETTING}";
                             connection.ExecuteNonQuery(connection.GetSqlStringCommand(query), txn);
                             foreach (VentDrainInfo ventDrainInfo in ventDrainInfos)
+                            {
                                 foreach (VentDrainItem itemventdrain in ventDrainInfo.VentDrainItems)
+                                {
                                     query = $"INSERT INTO {PSN_VENTDRAIN_SETTING} (GROUP_ID, DESCRIPTION, [INDEX], NAME) VALUES (@GROUP_ID, @DESCRIPTION, @INDEX, @NAME)";
                                     var cmd = connection.GetSqlStringCommand(query);
                                     AddWithValue(cmd, "@GROUP_ID", ventDrainInfo.UID);
                                     AddWithValue(cmd, "@DESCRIPTION", ventDrainInfo.Description);
                                     AddWithValue(cmd, "@INDEX", itemventdrain.Index);
                                     AddWithValue(cmd, "@NAME", itemventdrain.Name);
                                     connection.ExecuteNonQuery(cmd, txn);
+                                }
+                            }
                             //Keyword Setting
                             query = $"DELETE FROM {PSN_TRANSFORMKEYWORD_SETTING}";
                             connection.ExecuteNonQuery(connection.GetSqlStringCommand(query), txn);
                             foreach (KeywordItem itemKeyword in keywordItems)
+                            {
                                 query = $"INSERT INTO {PSN_TRANSFORMKEYWORD_SETTING} ([INDEX], NAME, KEYWORD) VALUES (@INDEX, @NAME, @KEYWORD)";
                                 var cmd = connection.GetSqlStringCommand(query);
                                 AddWithValue(cmd, "@INDEX", itemKeyword.Index);
                                 AddWithValue(cmd, "@NAME", itemKeyword.Name);
                                 AddWithValue(cmd, "@KEYWORD", itemKeyword.Keyword);
                                 connection.ExecuteNonQuery(cmd, txn);
-            a2ab8a90
+            이지연
                             //Multiway Setting
                             query = $"DELETE FROM {PSN_MULTIWAY_SETTING}";
                             connection.ExecuteNonQuery(connection.GetSqlStringCommand(query), txn);
                             foreach (MultiwayItem itemMultiway in multiwayItems)
+                            {
-f02de16
+                                query = $"INSERT INTO {PSN_MULTIWAY_SETTING} ([INDEX], NAME) VALUES (@INDEX, @NAME)";
-            a2ab8a90
+                                var cmd = connection.GetSqlStringCommand(query);
                                 AddWithValue(cmd, "@INDEX", itemMultiway.Index);
                                 AddWithValue(cmd, "@NAME", itemMultiway.Name);
                                 connection.ExecuteNonQuery(cmd, txn);
-d842083
+            LJIYEON
                             //FulidCode
                             query = $"DELETE FROM {PSN_FLUIDCODE}";
                             connection.ExecuteNonQuery(connection.GetSqlStringCommand(query), txn);
                             foreach (DataRow row in dtFluidCode.Rows)
+                            {
                                 query = $"INSERT INTO {PSN_FLUIDCODE} (UID, Code, Description, Condition, Remarks, GroundLevel) VALUES (@UID, @Code, @Description, @Condition, @Remarks, @GroundLevel)";
                                 var cmd = connection.GetSqlStringCommand(query);
                                 cmd.Parameters.Clear();
+                                {
                                     var param = cmd.CreateParameter();
                                     param.ParameterName = "@UID";
                                     param.Value = row["UID"].ToString();
                                     cmd.Parameters.Add(param);
+                                }
+                                {
                                     var param = cmd.CreateParameter();
                                     param.ParameterName = "@Code";
                                     param.Value = row["Code"].ToString();
                                     cmd.Parameters.Add(param);
+                                }
+                                {
                                     var param = cmd.CreateParameter();
                                     param.ParameterName = "@Description";
                                     param.Value = row["Description"].ToString();
                                     cmd.Parameters.Add(param);
+                                }
+                                {
                                     var param = cmd.CreateParameter();
                                     param.ParameterName = "@Condition";
                                     param.Value = row["Condition"].ToString();
                                     cmd.Parameters.Add(param);
+                                }
+                                {
                                     var param = cmd.CreateParameter();
                                     param.ParameterName = "@Remarks";
                                     param.Value = row["Remarks"].ToString();
                                     cmd.Parameters.Add(param);
+                                }
+                                {
                                     var param = cmd.CreateParameter();
                                     param.ParameterName = "@GroundLevel";
                                     param.Value = row["GroundLevel"].ToString();
                                     cmd.Parameters.Add(param);
+                                }
                                 connection.ExecuteNonQuery(cmd, txn);
+                            }
                             //PMC
                             query = $"DELETE FROM {PSN_PIPINGMATLCLASS}";
                             connection.ExecuteNonQuery(connection.GetSqlStringCommand(query), txn);
                             foreach (DataRow row in dtPMC.Rows)
+                            {
                                 query = $"INSERT INTO {PSN_PIPINGMATLCLASS} ( UID, Priority, Code, Description, Condition, Remarks, GroundLevel) VALUES (@UID, @Priority, @Code, @Description, @Condition, @Remarks, @GroundLevel)";
                                 var cmd = connection.GetSqlStringCommand(query);
                                 cmd.Parameters.Clear();
+                                {
                                     var param = cmd.CreateParameter();
                                     param.ParameterName = "@UID";
                                     param.Value = row["UID"].ToString();
                                     cmd.Parameters.Add(param);
+                                }
+                                {
                                     var param = cmd.CreateParameter();
                                     param.ParameterName = "@Priority";
                                     param.Value = row["Priority"].ToString();
                                     cmd.Parameters.Add(param);
+                                }
+                                {
                                     var param = cmd.CreateParameter();
                                     param.ParameterName = "@Code";
                                     param.Value = row["Code"].ToString();
                                     cmd.Parameters.Add(param);
+                                }
+                                {
                                     var param = cmd.CreateParameter();
                                     param.ParameterName = "@Description";
                                     param.Value = row["Description"].ToString();
                                     cmd.Parameters.Add(param);
+                                }
+                                {
                                     var param = cmd.CreateParameter();
                                     param.ParameterName = "@Condition";
                                     param.Value = row["Condition"].ToString();
                                     cmd.Parameters.Add(param);
+                                }
+                                {
                                     var param = cmd.CreateParameter();
                                     param.ParameterName = "@Remarks";
                                     param.Value = row["Remarks"].ToString();
                                     cmd.Parameters.Add(param);
+                                }
+                                {
                                     var param = cmd.CreateParameter();
                                     param.ParameterName = "@GroundLevel";
                                     param.Value = row["GroundLevel"].ToString();
                                     cmd.Parameters.Add(param);
+                                }
                                 connection.ExecuteNonQuery(cmd, txn);
+                            }
                             //Insulation
                             query = $"DELETE FROM {PSN_INSULATIONPURPOSE}";
                             connection.ExecuteNonQuery(connection.GetSqlStringCommand(query), txn);
                             foreach (DataRow row in dtInsulation.Rows)
+                            {
                                 query = $"INSERT INTO {PSN_INSULATIONPURPOSE} (UID, Code, Description, Remarks) VALUES (@UID, @Code, @Description, @Remarks)";
                                 var cmd = connection.GetSqlStringCommand(query);
                                 cmd.Parameters.Clear();
+                                {
                                     var param = cmd.CreateParameter();
                                     param.ParameterName = "@UID";
                                     param.Value = row["UID"].ToString();
                                     cmd.Parameters.Add(param);
+                                }
+                                {
                                     var param = cmd.CreateParameter();
                                     param.ParameterName = "@Code";
                                     param.Value = row["Code"].ToString();
                                     cmd.Parameters.Add(param);
+                                }
+                                {
                                     var param = cmd.CreateParameter();
                                     param.ParameterName = "@Description";
                                     param.Value = row["Description"].ToString();
                                     cmd.Parameters.Add(param);
+                                }
+                                {
                                     var param = cmd.CreateParameter();
                                     param.ParameterName = "@Remarks";
                                     param.Value = row["Remarks"].ToString();
                                     cmd.Parameters.Add(param);
+                                }
                                 connection.ExecuteNonQuery(cmd, txn);
+                            }
                             //Topology Rule
                             query = $"DELETE FROM {PSN_TOPOLOGY_RULE}";
                             var cmdtopology = connection.GetSqlStringCommand(query);
                             //connection.ExecuteNonQuery(connection.GetSqlStringCommand(query), txn);
                             connection.ExecuteNonQuery(cmdtopology, txn);
                             foreach (DataRow row in dtTopologyRule.Rows)
+                            {
                                 query = $"INSERT INTO {PSN_TOPOLOGY_RULE} (UID) VALUES (@UID)";
                                 cmdtopology = connection.GetSqlStringCommand(query);
                                 AddWithValue(cmdtopology, "@UID", row["UID"].ToString());
                                 connection.ExecuteNonQuery(cmdtopology, txn);
+                            }
-d7949
+                            //valve grouping
                             query = $"DELETE FROM {PSN_VALVEGROUP_SETTING}";
                             connection.ExecuteNonQuery(connection.GetSqlStringCommand(query), txn);
                             foreach (DataRow row in dtvalvegrouping.Rows)
+                            {
                                 query = $"INSERT INTO {PSN_VALVEGROUP_SETTING} (OID, GroupType, TagIdentifier, AttributeName, SppidSymbolName) " +
                                     $"VALUES (@OID, @GroupType, @TagIdentifier, @AttributeName, @SppidSymbolName)";
                                 var cmd = connection.GetSqlStringCommand(query);
                                 AddWithValue(cmd, "@OID", row["OID"].ToString());
                                 AddWithValue(cmd, "@GroupType", row["GroupType"].ToString());
                                 AddWithValue(cmd, "@TagIdentifier", row["TagIdentifier"].ToString());
                                 AddWithValue(cmd, "@AttributeName", row["AttributeName"].ToString());
                                 AddWithValue(cmd, "@SppidSymbolName", row["SppidSymbolName"].ToString());
                                 connection.ExecuteNonQuery(cmd, txn);
+                            }
-c1965b
+                            //no pocket Setting
                             query = $"DELETE FROM {PSN_NOPOCKETSETTING}";
                             connection.ExecuteNonQuery(connection.GetSqlStringCommand(query), txn);
                             foreach (DataRow row in dtnopocket.Rows)
+                            {
                                 query = $"INSERT INTO {PSN_NOPOCKETSETTING} ([INDEX], [TYPE], [NAME]) VALUES (@INDEX, @TYPE, @NAME)";
                                 var cmd = connection.GetSqlStringCommand(query);
                                 AddWithValue(cmd, "@INDEX", row["INDEX"].ToString());
                                 AddWithValue(cmd, "@TYPE", row["TYPE"].ToString());
                                 AddWithValue(cmd, "@NAME", row["NAME"].ToString());
                                 connection.ExecuteNonQuery(cmd, txn);
+                            }
-            f2a63376
+                            //air fin cooler Setting
                             query = $"DELETE FROM {PSN_AIRFINCOOLERSETTING}";
                             connection.ExecuteNonQuery(connection.GetSqlStringCommand(query), txn);
-fa2c9
+            이지연
                             foreach (DataRow row in dtafc.Rows)
-            f2a63376
+            이지연
-fa2c9
+                                query = $"INSERT INTO {PSN_AIRFINCOOLERSETTING} ([INDEX], [TYPE], [TagIdentifier], [AttributeName], [NAME]) VALUES (@INDEX, @TYPE, @TagIdentifier, @AttributeName, @NAME)";
-            f2a63376
+                                var cmd = connection.GetSqlStringCommand(query);
                                 AddWithValue(cmd, "@INDEX", row["INDEX"].ToString());
                                 AddWithValue(cmd, "@TYPE", row["TYPE"].ToString());
-fa2c9
+                                AddWithValue(cmd, "@TagIdentifier", row["TagIdentifier"].ToString());
                                 AddWithValue(cmd, "@AttributeName", row["AttributeName"].ToString());
-            f2a63376
+                                AddWithValue(cmd, "@NAME", row["NAME"].ToString());
                                 connection.ExecuteNonQuery(cmd, txn);
+                            }
-            d1afd412
+            이지연
-            f2a63376
+            이지연
-d842083
+                            txn.Commit();
+                        }
                         catch (Exception ex)
+                        {
                             txn.Rollback();
                             result = false;
+                        }
+                    }
+                }
                 catch (Exception ex)
+                {
                     System.Windows.Forms.MessageBox.Show(ex.Message);
                     result = false;
+                }
+            }
             return result;
+        }
-d46fca7
+            LJIYEON
-b6df95
+        public static bool CreatePSN_COMMON()
+        {
             AnotherID2Info id2Info = AnotherID2Info.GetInstance();
             bool result = true;
             using (IAbstractDatabase connection = id2Info.CreateConnection())
+            {
                 try
+                {
                     using (var txn = connection.BeginTransaction())
+                    {
                         try
+                        {
-            d1afd412
+            이지연
-b6df95
+                            var query = $"If(db_id(N'" + PSN_COMMON + "') IS NULL) CREATE DATABASE [" + PSN_COMMON + "]";
                             if (id2Info.ID2DBType == AnotherID2DB_Type.MSSQL)
-            d1afd412
+            이지연
-b6df95
+                                connection.ExecuteNonQuery(connection.GetSqlStringCommand(query), txn);
+                            }
                             txn.Commit();
+                        }
                         catch (Exception ex)
+                        {
                             txn.Rollback();
                             result = false;
+                        }
+                    }
+                }
                 catch (Exception ex)
+                {
                     System.Windows.Forms.MessageBox.Show(ex.Message);
                     result = false;
+                }
+            }
             return result;
+        }
+    }
-dae5645
+            gaqhf
-b6df95
+            LJIYEON

프로젝트

일반

사용자정보

HYTOS

hytos / DTI_PID / ID2PSN / DB.cs @ 4f02de16