프로젝트

일반

사용자정보

개정판 08b33e44

ID08b33e449252adf75c32c4b707a166884581a271
상위 6f404d45
하위 8d4723aa

gaqhf 이(가) 약 3년 전에 추가함

issue #000: No Pocket 기능 추가

Change-Id: Ia571ce289d700882397361a8a2040d631ea2d7a4

차이점 보기:

DTI_PID/ID2PSN/DB.cs
174 174
                    dicColCheck.Add("PBS", "NVARCHAR(255)");
175 175
                    dicColCheck.Add("Drawings", "NVARCHAR(255)");
176 176
                    dicColCheck.Add("IncludingVirtualData", "NVARCHAR(10)");
177
                    dicColCheck.Add("PSNAccuracy", "REAL"); 
178

  
177
                    dicColCheck.Add("PSNAccuracy", "REAL");
178
                    dicColCheck.Add("Pocket", "NVARCHAR(10)");
179
                    
179 180
                    if (matched == null)
180 181
                    {
181 182
                        var query = $"CREATE TABLE {PSN_PIPESYSTEMNETWORK} (OID NVARCHAR(255), Type NVARCHAR(255), OrderNumber NVARCHAR(255), Pipeline_OID NVARCHAR(255), From_Data NVARCHAR(255), " +
182 183
                            "To_Data NVARCHAR(255), TopologySet_OID_Key NVARCHAR(125), PSNRevisionNumber NVARCHAR(255), IsValid INTEGER, Status NVARCHAR(255), PBS NVARCHAR(255), Drawings NVARCHAR(255), " +
183
                            "IncludingVirtualData NVARCHAR(10),  PSNAccuracy REAL)";
184
                            "IncludingVirtualData NVARCHAR(10), PSNAccuracy REAL, Pocket NVARCHAR(10))";
184 185
                        using (var cmd = connection.GetSqlStringCommand(query))
185 186
                        {
186 187
                            cmd.ExecuteNonQuery();
......
1111 1112
            return dt;
1112 1113
        }
1113 1114

  
1115
  
1114 1116
        public static DataTable SelectEquipmentNoPocketSetting()
1115 1117
        {
1116 1118
            DataTable dt = null;
......
1794 1796
                            foreach (DataRow row in item.PipeSystemNetwork.Rows)
1795 1797
                            {
1796 1798
                                query = $"INSERT INTO {PSN_PIPESYSTEMNETWORK} " +
1797
                                    $"(OID, Type, OrderNumber, Pipeline_OID, FROM_DATA, TO_DATA, TopologySet_OID_Key, PSNRevisionNumber, PBS, Drawings, IsValid, Status, IncludingVirtualData, PSNAccuracy) VALUES " +
1798
                                    $"(@OID, @Type, @OrderNumber, @Pipeline_OID, @FROM_DATA, @TO_DATA, @TopologySet_OID_Key, @PSNRevisionNumber,  @PBS, @Drawings, @IsValid, @Status, @IncludingVirtualData, @PSNAccuracy)";
1799
                                    $"(OID, Type, OrderNumber, Pipeline_OID, FROM_DATA, TO_DATA, TopologySet_OID_Key, PSNRevisionNumber, PBS, Drawings, IsValid, Status, IncludingVirtualData, PSNAccuracy, Pocket) VALUES " +
1800
                                    $"(@OID, @Type, @OrderNumber, @Pipeline_OID, @FROM_DATA, @TO_DATA, @TopologySet_OID_Key, @PSNRevisionNumber,  @PBS, @Drawings, @IsValid, @Status, @IncludingVirtualData, @PSNAccuracy, @Pocket)";
1799 1801
                                var cmd = connection.GetSqlStringCommand(query);
1800 1802
                                AddWithValue(cmd, "@OID", string.IsNullOrEmpty(row["OID"].ToString()) ? "" : row["OID"].ToString());
1801 1803
                                AddWithValue(cmd, "@Type", string.IsNullOrEmpty(row["Type"].ToString()) ? "" : row["Type"].ToString());
......
1826 1828
                                else
1827 1829
                                    AddWithValue(cmd, "@PSNAccuracy", row["PSNAccuracy"].ToString().Replace("%", ""));
1828 1830

  
1831
                                AddWithValue(cmd, "@Pocket", string.IsNullOrEmpty(row["Pocket"].ToString()) ? "Yes" : row["Pocket"].ToString());
1832

  
1829 1833
                                connection.ExecuteNonQuery(cmd, txn);
1830 1834
                            }
1831 1835

  
......
2248 2252
                            newRow["IncludingVirtualData"] = row["IncludingVirtualData"].ToString();
2249 2253
                            newRow["PSNAccuracy"] = row["PSNAccuracy"].ToString();
2250 2254

  
2255
                            newRow["Pocket"] = row["Pocket"].ToString();
2256
                            
2251 2257
                            result.PipeSystemNetwork.Rows.Add(newRow);
2252 2258
                        }
2253 2259
                    }
......
2441 2447
                            newRow["Drawings"] = row["Drawings"].ToString();
2442 2448
                            
2443 2449
                            newRow["IncludingVirtualData"] = row["IncludingVirtualData"].ToString();
2444
                            newRow["PSNAccuracy"] = row["PSNAccuracy"].ToString();                                           
2445
                                                        
2450
                            newRow["PSNAccuracy"] = row["PSNAccuracy"].ToString();
2451

  
2452
                            newRow["Pocket"] = row["Pocket"].ToString();
2453
                            
2446 2454
                            dt.Rows.Add(newRow);
2447 2455
                        }
2448 2456
                    }
......
2574 2582
                    dicColCheck.Add("Drawings", "NVARCHAR(255)");
2575 2583
                    dicColCheck.Add("IncludingVirtualData", "NVARCHAR(10)");
2576 2584
                    dicColCheck.Add("PSNAccuracy", "REAL");
2577

  
2585
                    dicColCheck.Add("Pocket", "NVARCHAR(10)");
2586
                    
2578 2587
                    if (matched == null)
2579 2588
                    {
2580 2589
                        var query = $"CREATE TABLE {PSN_PIPESYSTEMNETWORK} (OID NVARCHAR(255), Type NVARCHAR(255), OrderNumber NVARCHAR(255), Pipeline_OID NVARCHAR(255), From_Data NVARCHAR(255), " +
2581 2590
                            "To_Data NVARCHAR(255), TopologySet_OID_Key NVARCHAR(125), PSNRevisionNumber NVARCHAR(255), IsValid INTEGER, Status NVARCHAR(255), PBS NVARCHAR(255), Drawings NVARCHAR(255), " +
2582
                            "IncludingVirtualData NVARCHAR(10),  PSNAccuracy REAL)";
2591
                            "IncludingVirtualData NVARCHAR(10),  PSNAccuracy REAL, Pocket NVARCHAR(10))";
2583 2592
                        using (var cmd = connection.GetSqlStringCommand(query))
2584 2593
                        {
2585 2594
                            cmd.ExecuteNonQuery();
......
3280 3289
                            foreach (DataRow row in item.PipeSystemNetwork.Rows)
3281 3290
                            {
3282 3291
                                query = $"INSERT INTO {PSN_PIPESYSTEMNETWORK} " +
3283
                                    $"(OID, Type, OrderNumber, Pipeline_OID, FROM_DATA, TO_DATA, TopologySet_OID_Key, PSNRevisionNumber, PBS, Drawings, IsValid, Status, IncludingVirtualData, PSNAccuracy) VALUES " +
3284
                                    $"(@OID, @Type, @OrderNumber, @Pipeline_OID, @FROM_DATA, @TO_DATA, @TopologySet_OID_Key, @PSNRevisionNumber,  @PBS, @Drawings, @IsValid, @Status, @IncludingVirtualData, @PSNAccuracy)";
3292
                                    $"(OID, Type, OrderNumber, Pipeline_OID, FROM_DATA, TO_DATA, TopologySet_OID_Key, PSNRevisionNumber, PBS, Drawings, IsValid, Status, IncludingVirtualData, PSNAccuracy, Pocket) VALUES " +
3293
                                    $"(@OID, @Type, @OrderNumber, @Pipeline_OID, @FROM_DATA, @TO_DATA, @TopologySet_OID_Key, @PSNRevisionNumber,  @PBS, @Drawings, @IsValid, @Status, @IncludingVirtualData, @PSNAccuracy, @Pocket)";
3285 3294
                                var cmd = connection.GetSqlStringCommand(query);
3286 3295
                                AddWithValue(cmd, "@OID", string.IsNullOrEmpty(row["OID"].ToString()) ? "" : row["OID"].ToString());
3287 3296
                                AddWithValue(cmd, "@Type", string.IsNullOrEmpty(row["Type"].ToString()) ? "" : row["Type"].ToString());
......
3312 3321
                                else
3313 3322
                                    AddWithValue(cmd, "@PSNAccuracy", row["PSNAccuracy"].ToString().Replace("%", ""));
3314 3323

  
3324
                                AddWithValue(cmd, "@Pocket", string.IsNullOrEmpty(row["Pocket"].ToString()) ? "Yes" : row["Pocket"].ToString());
3315 3325
                                connection.ExecuteNonQuery(cmd, txn);
3316 3326
                            }
3317 3327

  

내보내기 Unified diff

클립보드 이미지 추가 (최대 크기: 500 MB)