user id DB로그인 안되게 수정

디버깅이안되는 현상 있음

ArinWareT4.sln

@@ -15,6 +15,8 @@ Project("{6141683F-8A12-4E36-9623-2EB02B2C2303}") = "SetupIS", "SetupIS\SetupIS.
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ArinLog", "ArinLog\ArinLog.vbproj", "{E9E16A98-8F8D-4848-A27E-4571C184FB1A}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utility", "Utility\Utility.csproj", "{B1FDE30A-B142-42D5-A6B8-5428D2F2E62A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		CD_ROM|Any CPU = CD_ROM|Any CPU
@@ -185,6 +187,31 @@ Global
 		{E9E16A98-8F8D-4848-A27E-4571C184FB1A}.SingleImage|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E9E16A98-8F8D-4848-A27E-4571C184FB1A}.SingleImage|Mixed Platforms.Build.0 = Release|Any CPU
 		{E9E16A98-8F8D-4848-A27E-4571C184FB1A}.SingleImage|x86.ActiveCfg = Release|Any CPU
+		{B1FDE30A-B142-42D5-A6B8-5428D2F2E62A}.CD_ROM|Any CPU.ActiveCfg = Release|Any CPU
+		{B1FDE30A-B142-42D5-A6B8-5428D2F2E62A}.CD_ROM|Any CPU.Build.0 = Release|Any CPU
+		{B1FDE30A-B142-42D5-A6B8-5428D2F2E62A}.CD_ROM|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{B1FDE30A-B142-42D5-A6B8-5428D2F2E62A}.CD_ROM|Mixed Platforms.Build.0 = Release|Any CPU
+		{B1FDE30A-B142-42D5-A6B8-5428D2F2E62A}.CD_ROM|x86.ActiveCfg = Release|Any CPU
+		{B1FDE30A-B142-42D5-A6B8-5428D2F2E62A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B1FDE30A-B142-42D5-A6B8-5428D2F2E62A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B1FDE30A-B142-42D5-A6B8-5428D2F2E62A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B1FDE30A-B142-42D5-A6B8-5428D2F2E62A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B1FDE30A-B142-42D5-A6B8-5428D2F2E62A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B1FDE30A-B142-42D5-A6B8-5428D2F2E62A}.DVD-5|Any CPU.ActiveCfg = Debug|Any CPU
+		{B1FDE30A-B142-42D5-A6B8-5428D2F2E62A}.DVD-5|Any CPU.Build.0 = Debug|Any CPU
+		{B1FDE30A-B142-42D5-A6B8-5428D2F2E62A}.DVD-5|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B1FDE30A-B142-42D5-A6B8-5428D2F2E62A}.DVD-5|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B1FDE30A-B142-42D5-A6B8-5428D2F2E62A}.DVD-5|x86.ActiveCfg = Debug|Any CPU
+		{B1FDE30A-B142-42D5-A6B8-5428D2F2E62A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B1FDE30A-B142-42D5-A6B8-5428D2F2E62A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B1FDE30A-B142-42D5-A6B8-5428D2F2E62A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{B1FDE30A-B142-42D5-A6B8-5428D2F2E62A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{B1FDE30A-B142-42D5-A6B8-5428D2F2E62A}.Release|x86.ActiveCfg = Release|Any CPU
+		{B1FDE30A-B142-42D5-A6B8-5428D2F2E62A}.SingleImage|Any CPU.ActiveCfg = Release|Any CPU
+		{B1FDE30A-B142-42D5-A6B8-5428D2F2E62A}.SingleImage|Any CPU.Build.0 = Release|Any CPU
+		{B1FDE30A-B142-42D5-A6B8-5428D2F2E62A}.SingleImage|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{B1FDE30A-B142-42D5-A6B8-5428D2F2E62A}.SingleImage|Mixed Platforms.Build.0 = Release|Any CPU
+		{B1FDE30A-B142-42D5-A6B8-5428D2F2E62A}.SingleImage|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -194,5 +221,6 @@ Global
 		{2AF28E8C-84F1-4D56-9592-3B0EBDE8DF14} = {4D184935-DE50-4DBA-9EBF-8C66C579B7DC}
 		{8B6E4D7F-B484-471A-A419-2FE3451D26A3} = {4D184935-DE50-4DBA-9EBF-8C66C579B7DC}
 		{E9E16A98-8F8D-4848-A27E-4571C184FB1A} = {4D184935-DE50-4DBA-9EBF-8C66C579B7DC}
+		{B1FDE30A-B142-42D5-A6B8-5428D2F2E62A} = {4D184935-DE50-4DBA-9EBF-8C66C579B7DC}
 	EndGlobalSection
 EndGlobal

ArinWarev1/Calculator/CAirHandling.vb

@@ -194,9 +194,9 @@
 
     End Sub
 
-    Public Overridable Sub Calc_AirHandling(ByVal i_count_month As Integer, ByVal theta_e As Decimal, Optional p_난방온도 As Decimal = 20, Optional p_냉방온도 As Decimal = 26) ' ByVal d_mth As Integer,
+    Public Overridable Sub Calc_AirHandling(ByVal i_count_month As Integer, ByVal i_d_full_month As Decimal, ByVal theta_e As Decimal, Optional p_난방온도 As Decimal = 20, Optional p_냉방온도 As Decimal = 26) ' ByVal d_mth As Integer,
 
-        pLog.Add(String.Format(">>Calc_AirHandling 진입 : i_count_month={0},theta_e={1},p_난방온도={2},p_냉방온도={3}", i_count_month, theta_e, p_난방온도, p_냉방온도))
+        pLog.Add(String.Format(">>Calc_AirHandling 진입 : i_count_month={0},i_d_full_month={1},p_난방온도={2},p_냉방온도={3}", i_count_month, i_d_full_month, p_난방온도, p_냉방온도))
 
         Dim A_B As Decimal
         Dim x_ABL_wi As Decimal, h_ABL_wi As Decimal, x_ABL_so As Decimal, h_ABL_so As Decimal, x_AUL_wi As Decimal, h_AUL_wi As Decimal, x_AUL_so As Decimal, h_AUL_so As Decimal
@@ -219,6 +219,8 @@
         Dim c_p_Lrho_L As Decimal, theta_ZUL_so As Decimal, p_S_theta_ZUL_so As Decimal, p_95_theta_ZUL_so As Decimal, x_95_ZUL_so As Decimal
         Dim h_95_ZUL_so As Decimal, i_count_air As Integer, i_count_start_time As Integer, i_count_end_time As Integer ', i_profile As Integer
         Dim P_D_j_theta_AUL_j As Decimal
+        Dim Delta_theta_AUL, V_dot_A_AHU As Decimal
+
 
         ' 공조처리
         theta_i_h_soll = p_난방온도
@@ -277,6 +279,33 @@
                     'If Dr존.냉난방공조처리시스템 <> "" Then ' Worksheets("입력존").Range("입력난방공급기기1").Offset(2, i_count_zone - 1) <> "" Then
                     'If Worksheets("입력존").Range("입력난방공급기기1").Offset(2, i_count_zone - 1) = Worksheets("공조처리시스템").Range("공조기기1").Offset(0, i_count_AHU - 1) Then
                     'If Dr존.냉난방공조처리시스템 = Dr공조.code Then ' Worksheets("공조처리시스템").Range("공조기기1").Offset(0, i_count_AHU - 1) Then
+
+                    '/// 공기식 태양열 적용여부 확인
+                    Delta_theta_AUL = 0
+                    V_dot_A_AHU = 0
+                    If Dr공조.공기식태양열적용.Trim = "예" Then
+
+                        'Dim ZoneListKongjo() As DS.tbl_zoneRow = DSET.tbl_zone.Select("code<>'0' and 냉난방공조처리시스템 = '" + Dr공조.code + "'", "code")
+                        V_dot_A_AHU = Get_V_dot_A_AHU(DSET.tbl_profile, DSET.tbl_zone, Dr공조.code)
+                        'For Each DrZonbyKongjo As DS.tbl_zoneRow In ZoneListKongjo
+
+                        '    'Dim Dr프로필2 As DS.tbl_profileRow = CType(DSET.tbl_profile.Select("code='" & DrZonbyKongjo.프로필 & "'")(0), DS.tbl_profileRow)
+                        '    V_dot_A_AHU += Get_V_dot_A_AHU(DSET.tbl_profile, DSET.tbl_zone, Dr공조.code) '  TOSG(DrZonbyKongjo.면적) * TOSG(DrZonbyKongjo.입력존의수) * TOSG(Dr프로필2.최소도입외기량)
+                        'Next
+
+                        '공조기에 연결된 입력존면적*입력존수*최소외기도입량 의 합계 산출(V_dot_A_AHU)
+                        '/////////////
+                        '/////////////
+                        '/////////////
+                        '/////////////
+                        '/////////////
+                        '/////////////
+                        '/////////////
+                        Delta_theta_AUL = SolarAirHeatingSystem(DSET, i_count_month, i_d_full_month, Dr공조, V_dot_A_AHU, theta_e, Delta_theta_AUL)
+                    End If
+
+
+
                     Q_vh_b = 0
                     Q_vc_b = 0
                     Q_vm_b = 0
@@ -324,7 +353,7 @@
 
                     End If
 
-                    theta_AUL = theta_AUL / t_V_mech_m
+                    theta_AUL = (theta_AUL / t_V_mech_m) + Delta_theta_AUL
                     x_AUL = x_AUL / t_V_mech_m
                     h_AUL = c_p_L * theta_AUL + x_AUL * (r_0 + c_p_L * theta_AUL)
 
@@ -501,6 +530,7 @@
                         '냉방공조처리에너지(냉각,리턴공기혼합유무(리턴공기혼합율 계산, 열회수유무(현열 또는 전열, 열회수율 입력)
 
                         Q_c_b = TOSG(Drow분석(0).냉방요구량공조) 'Sheets("" & i_count_month & "").Cells(11, 7 + i_count_zone)
+                        theta_AUL = theta_AUL - Delta_theta_AUL
                         Select Case Dr공조.공조방식.Trim 'Worksheets("공조처리시스템").Range("공조방식1").Offset(0, i_count_AHU - 1)
                             Case "정풍량" '정풍량"
                                 If Dr공조.외기냉방제어유무 = "유" Then ' Worksheets("공조처리시스템").Range("공조방식1").Offset(6, i_count_AHU - 1) = "유" Then
@@ -747,6 +777,7 @@
 
                 '==========================================================================2010.02.04 추가부분 시작
                 If Dr존.냉난방공조 = "환기" OrElse (Dr존.냉난방공조 = "난방" AndAlso Dr존.외기부하처리여부 = "예") Then   '//환기
+
                     Dim DR프로필() As DS.tbl_profileRow = CType(DSET.tbl_profile.Select("code='" & Dr존.프로필.ToString & "' and code <> '0'"), DS.tbl_profileRow())
                     If DR프로필.GetUpperBound(0) = 0 Then
                         t_V_mech_m = TOSG(DR프로필(0).운전시간난방) ' Worksheets("설정조건").Range("사용시작시간1").Offset(5, i_count_profile)
@@ -774,9 +805,38 @@
                     End If
 
                     Dim DR공조() As DS.tbl_kongjoRow = CType(DSET.tbl_kongjo.Select("code='" & Dr존.냉난방공조처리시스템 & "' and code <> '0'"), DS.tbl_kongjoRow())
+
+
                     If DR공조.GetUpperBound(0) = 0 Then
 
                         '------------------------------------------------------------------------------------------------------------------------------------------------------------------------------2010.05.26 추가
+
+
+                        '/// 공기식 태양열 적용여부 확인
+                        Delta_theta_AUL = 0
+                        V_dot_A_AHU = 0
+                        If DR공조(0).공기식태양열적용.Trim = "예" Then
+
+                            'Dim ZoneListKongjo() As DS.tbl_zoneRow = DSET.tbl_zone.Select("code<>'0' and 냉난방공조처리시스템 = '" + Dr공조.code + "'", "code")
+                            V_dot_A_AHU = Get_V_dot_A_AHU(DSET.tbl_profile, DSET.tbl_zone, DR공조(0).code)
+                            'For Each DrZonbyKongjo As DS.tbl_zoneRow In ZoneListKongjo
+
+                            '    'Dim Dr프로필2 As DS.tbl_profileRow = CType(DSET.tbl_profile.Select("code='" & DrZonbyKongjo.프로필 & "'")(0), DS.tbl_profileRow)
+                            '    V_dot_A_AHU += Get_V_dot_A_AHU(DSET.tbl_profile, DSET.tbl_zone, Dr공조.code) '  TOSG(DrZonbyKongjo.면적) * TOSG(DrZonbyKongjo.입력존의수) * TOSG(Dr프로필2.최소도입외기량)
+                            'Next
+
+                            '공조기에 연결된 입력존면적*입력존수*최소외기도입량 의 합계 산출(V_dot_A_AHU)
+                            '/////////////
+                            '/////////////
+                            '/////////////
+                            '/////////////
+                            '/////////////
+                            '/////////////
+                            '/////////////
+                            Delta_theta_AUL = SolarAirHeatingSystem(DSET, i_count_month, i_d_full_month, DR공조(0), V_dot_A_AHU, theta_e, Delta_theta_AUL)
+                        End If
+
+
                         If DR공조(0).열교환기유형.Trim = "현열교환" OrElse DR공조(0).열교환기유형.Trim = "전열교환" Then
                             Phi_h = TOSG(DR공조(0).열회수율) 'Worksheets("공조처리시스템").Range("열교환기1").Offset(1, i_count_AHU - 1)
                             Phi_c = TOSG(DR공조(0).열회수율냉) 'Worksheets("공조처리시스템").Range("열교환기1").Offset(2, i_count_AHU - 1)
@@ -787,10 +847,16 @@
                         '// 여기 i_count_month 에 0 이 오지는 않나요? 예.. 1 부터 시작해요
                         '// If CSng(Drow분석(0).난방요구량공조) > 0 Then 'Sheets("" & i_count_month & "").Cells(8, 7 + i_count_zone) > 0 Then
 
-                        If TOSG(Drow분석(0).난방요구량공조) > 0 Then
+                        If TOSG(Drow분석(0).난방요구량공조) > 0 And theta_e <> 20 Then
+                            Drow분석(0).난방요구량공조 = TOSG(Drow분석(0).난방요구량공조) * (20 - theta_e + Delta_theta_AUL) / (20 - theta_e)
+                            If TOSG(Drow분석(0).난방요구량공조) < 0 Then
+                                Drow분석(0).난방요구량공조 = 0
+                            Else
                                 Drow분석(0).난방요구량공조 = (1 - Phi_h) * TOSG(Drow분석(0).난방요구량공조)
                             End If
 
+                        End If
+
                         If TOSG(Drow분석(0).냉방요구량공조) > 0 Then
                             Drow분석(0).냉방요구량공조 = (1 - Phi_c) * TOSG(Drow분석(0).냉방요구량공조)
                         End If
@@ -839,6 +905,85 @@
 
     End Sub
 
+    'Public Overridable Sub SolarAirHeatingSystem(ByVal i_count_month As Integer, ByVal i_count_d_mth As Integer, ByVal Dr공조 As DS.tbl_kongjoRow, ByVal V_dot_A_AHU As Decimal, ByVal T_amb As Decimal, ByVal Delta_T_act As Decimal) ' ByVal d_mth As Integer,
+
+    '    pLog.Add(String.Format(">>SolarAirHeatingSystem 진입 : i_count_month={0}, i_count_d_mth={1}, Dr공조={2}, 외기도입량={3}, theta_e={4}, Delta_T_act={5}", i_count_month, i_count_d_mth, Dr공조.code, V_dot_A_AHU, T_amb, Delta_T_act))
+
+    '    Dim G_coll, G_tilt, A_coll As Decimal
+    '    Dim e_HX, h_c, v_wind, t, alpha, h_dot_r, eta As Decimal
+    '    Dim Q_dot_coll, Delta_T_avl, T_del_avl, T_del_act, T_del_max As Decimal
+    '    Dim rho As Decimal = 1.225
+    '    Dim C_p As Decimal = 1005 '// [J/kg'C]
+    '    Dim Delta_T_offset As Decimal = 3
+    '    Dim h_sunlight As Decimal = 24
+    '    Dim sigma_s As Decimal = 0.000000056703 '스테판볼츠만 상수
+
+
+    '    '// 사용자 입력항목 : 집열기 면적(A_coll), 단면적, 집열기 표면방사율(e) 
+    '    '// Q_dot_coll 은 외기도입풍량을 집열기 면적으로 나눈 값
+    '    '// h_sunlight 는 주간 운전시간 적용 
+
+    '    Dim Drow풍속 As DS.weather_windRow = CType(DSET.weather_wind.Select("pcode='" & Calc.Pub.기상데이터.code & "'")(0), DS.weather_windRow)
+    '    v_wind = TOSG(Drow풍속("M" + i_count_month.ToString("00")))
+
+    '    Dim Dr일사 As DS.weather_ilsaRow
+
+    '    Select Case Dr공조.집열기방위.Trim
+    '        Case "남" '"남"
+    '            Dr일사 = CType(DSET.weather_ilsa.Select("pcode='" & Calc.Pub.기상데이터.code & "' and code='" & Format(1 + 1, "0000") & "'")(0), DS.weather_ilsaRow)
+    '            G_tilt = TOSG(Dr일사("M" & Format(i_count_month, "00"))) * i_count_d_mth * 24 / 1000
+    '        Case "남동" '"남동"
+    '            Dr일사 = CType(DSET.weather_ilsa.Select("pcode='" & Calc.Pub.기상데이터.code & "' and code='" & Format(1 + 2, "0000") & "'")(0), DS.weather_ilsaRow)
+    '            G_tilt = TOSG(Dr일사("M" & Format(i_count_month, "00"))) * i_count_d_mth * 24 / 1000
+    '        Case "남서" '"남서"
+    '            Dr일사 = CType(DSET.weather_ilsa.Select("pcode='" & Calc.Pub.기상데이터.code & "' and code='" & Format(1 + 3, "0000") & "'")(0), DS.weather_ilsaRow)
+    '            G_tilt = TOSG(Dr일사("M" & Format(i_count_month, "00"))) * i_count_d_mth * 24 / 1000
+    '        Case "동" '"동"
+    '            Dr일사 = CType(DSET.weather_ilsa.Select("pcode='" & Calc.Pub.기상데이터.code & "' and code='" & Format(1 + 4, "0000") & "'")(0), DS.weather_ilsaRow)
+    '            G_tilt = TOSG(Dr일사("M" & Format(i_count_month, "00"))) * i_count_d_mth * 24 / 1000
+    '        Case "서" '"서"
+    '            Dr일사 = CType(DSET.weather_ilsa.Select("pcode='" & Calc.Pub.기상데이터.code & "' and code='" & Format(1 + 5, "0000") & "'")(0), DS.weather_ilsaRow)
+    '            G_tilt = TOSG(Dr일사("M" & Format(i_count_month, "00"))) * i_count_d_mth * 24 / 1000
+    '        Case "북동" '"북동"
+    '            Dr일사 = CType(DSET.weather_ilsa.Select("pcode='" & Calc.Pub.기상데이터.code & "' and code='" & Format(1 + 6, "0000") & "'")(0), DS.weather_ilsaRow)
+    '            G_tilt = TOSG(Dr일사("M" & Format(i_count_month, "00"))) * i_count_d_mth * 24 / 1000
+    '        Case "북서" '"북서"
+    '            Dr일사 = CType(DSET.weather_ilsa.Select("pcode='" & Calc.Pub.기상데이터.code & "' and code='" & Format(1 + 7, "0000") & "'")(0), DS.weather_ilsaRow)
+    '            G_tilt = TOSG(Dr일사("M" & Format(i_count_month, "00"))) * i_count_d_mth * 24 / 1000
+    '        Case "북" '"북"
+    '            Dr일사 = CType(DSET.weather_ilsa.Select("pcode='" & Calc.Pub.기상데이터.code & "' and code='" & Format(1 + 8, "0000") & "'")(0), DS.weather_ilsaRow)
+    '            G_tilt = TOSG(Dr일사("M" & Format(i_count_month, "00"))) * i_count_d_mth * 24 / 1000
+
+    '    End Select
+
+
+    '    A_coll = TOSG(Dr공조.집열기면적)
+    '    alpha = TOSG(Dr공조.집열기방사율)
+    '    Q_dot_coll = V_dot_A_AHU / A_coll
+    '    G_coll = G_tilt * A_coll '// * f_op 집열기 가동계수는 G_tilt 에 포함
+
+    '    e_HX = 1 - 5 * Q_dot_coll
+    '    h_c = 6.0 + 4.0 * v_wind - 76 * Q_dot_coll
+    '    t = alpha * G_tilt / (rho * C_p * Q_dot_coll * e_HX + 4 * alpha * sigma_s * T_amb ^ 3 + h_c)  ' e는 alpha 로 공유
+    '    h_dot_r = 4 * alpha * sigma_s * T_amb ^ 2 * (T_amb + 1.6 * t) ' e는 alpha 로 공유
+    '    eta = alpha / (1 + (h_dot_r + h_c) / (rho * C_p * Q_dot_coll * e_HX))
+
+
+    '    Delta_T_avl = (eta * G_tilt) / (Q_dot_coll * rho * C_p * h_sunlight)
+    '    T_del_avl = (T_amb + Delta_T_offset) + Delta_T_avl
+    '    T_del_act = Math.Min(T_del_max, T_del_avl)
+    '    Delta_T_act = Math.Max(T_del_act - (T_amb + Delta_T_offset), 0)
+
+    '    'f_util = Delta_T_act / Delta_T_avl
+
+    '    'Q_sol = Sigma(eta * G_coll * f_util)
+
+
+
+    'End Sub
+
+
+
     Private DSET As DS
     Private DSETR As DSR
     Private Result As CResult

ArinWarev1/Calculator/CCooling.vb

@@ -421,6 +421,7 @@
                 Select Case Dr신재생.기기종류.Trim
                     Case "태양열" '//태양열
                     Case "태양광" '//태양광
+                    Case "풍력" '//풍력
                     Case "지열" '//지열
                         Select Case Dr신재생.가동연료.Trim
                             Case "전기" '전기"
@@ -441,6 +442,27 @@
                                 use_LPG = use_LPG + Q_c_f_hp
                                 use_Elec = use_Elec + Q_c_g_hp_aux
                         End Select
+                    Case "수열" '//수열
+                        Select Case Dr신재생.가동연료.Trim
+                            Case "전기" '전기"
+                                CRenew.Calc_HydroHeatpumpSystem(system_type, i_HeatCool, Dr신재생, Q_c_outg_total, i_count_month, d_op_max_mth, t_h_max, theta_VA, theta_i, Q_hp_outg, Q_c_f_hp, Q_c_g_hp_aux)
+                                Q_c_outg_total = Q_c_outg_total - Q_hp_outg
+                                Q_c_f = Q_c_f + Q_c_f_hp + Q_c_g_hp_aux
+                                use_Elec = use_Elec + Q_c_f_hp + Q_c_g_hp_aux
+                            Case "천연가스" '천연가스"
+                                CRenew.Calc_HydroHeatpumpSystem(system_type, i_HeatCool, Dr신재생, Q_c_outg_total, i_count_month, d_op_max_mth, t_h_max, theta_VA, theta_i, Q_hp_outg, Q_c_f_hp, Q_c_g_hp_aux)
+                                Q_c_outg_total = Q_c_outg_total - Q_hp_outg
+                                Q_c_f = Q_c_f + Q_c_f_hp + Q_c_g_hp_aux
+                                use_LNG = use_LNG + Q_c_f_hp
+                                use_Elec = use_Elec + Q_c_g_hp_aux
+                            Case "액화가스" '액화가스"
+                                CRenew.Calc_HydroHeatpumpSystem(system_type, i_HeatCool, Dr신재생, Q_c_outg_total, i_count_month, d_op_max_mth, t_h_max, theta_VA, theta_i, Q_hp_outg, Q_c_f_hp, Q_c_g_hp_aux)
+                                Q_c_outg_total = Q_c_outg_total - Q_hp_outg
+                                Q_c_f = Q_c_f + Q_c_f_hp + Q_c_g_hp_aux
+                                use_LPG = use_LPG + Q_c_f_hp
+                                use_Elec = use_Elec + Q_c_g_hp_aux
+                        End Select
+                    Case "풍력" '//풍력
                     Case "열병합" '//열병합
                 End Select
             End If
@@ -758,6 +780,7 @@
                                         End If
                                         '========================================================================================2010.04.02 추가
                                     Case "태양광" '//태양광
+                                    Case "풍력" '//풍력
                                     Case "지열" '//지열                                           
                                     Case "열병합" '//열병합
                                         If Q_c_outg_therm > 0 Then '===========================2010.04.02  And Q_c_outg_therm > 0 추가
@@ -1205,6 +1228,7 @@
             Select Case Dr신재생.기기종류.Trim
                 Case "태양열" '//태양열
                 Case "태양광" '//태양광
+                Case "풍력" '//풍력
                 Case "지열" '//지열
                     Select Case Dr신재생.가동연료.Trim
                         Case "전기" '전기"
@@ -1225,6 +1249,26 @@
                             use_LPG = use_LPG + Q_c_f_hp
                             use_Elec = use_Elec + Q_c_g_hp_aux
                     End Select
+                Case "수열" '//수열
+                    Select Case Dr신재생.가동연료.Trim
+                        Case "전기" '전기"
+                            CRenew.Calc_HydroHeatpumpSystem(system_type, i_HeatCool, Dr신재생, Q_c_outg_total, i_count_month, d_op_max_mth, t_h_max, theta_VA, theta_i, Q_hp_outg, Q_c_f_hp, Q_c_g_hp_aux)
+                            Q_c_outg_total = Q_c_outg_total - Q_hp_outg
+                            Q_c_f = Q_c_f + Q_c_f_hp + Q_c_g_hp_aux
+                            use_Elec = use_Elec + Q_c_f_hp + Q_c_g_hp_aux
+                        Case "천연가스" '천연가스"
+                            CRenew.Calc_HydroHeatpumpSystem(system_type, i_HeatCool, Dr신재생, Q_c_outg_total, i_count_month, d_op_max_mth, t_h_max, theta_VA, theta_i, Q_hp_outg, Q_c_f_hp, Q_c_g_hp_aux)
+                            Q_c_outg_total = Q_c_outg_total - Q_hp_outg
+                            Q_c_f = Q_c_f + Q_c_f_hp + Q_c_g_hp_aux
+                            use_LNG = use_LNG + Q_c_f_hp
+                            use_Elec = use_Elec + Q_c_g_hp_aux
+                        Case "액화가스" '액화가스"
+                            CRenew.Calc_HydroHeatpumpSystem(system_type, i_HeatCool, Dr신재생, Q_c_outg_total, i_count_month, d_op_max_mth, t_h_max, theta_VA, theta_i, Q_hp_outg, Q_c_f_hp, Q_c_g_hp_aux)
+                            Q_c_outg_total = Q_c_outg_total - Q_hp_outg
+                            Q_c_f = Q_c_f + Q_c_f_hp + Q_c_g_hp_aux
+                            use_LPG = use_LPG + Q_c_f_hp
+                            use_Elec = use_Elec + Q_c_g_hp_aux
+                    End Select
                 Case "열병합" '//열병합
             End Select
         End If
@@ -1540,6 +1584,7 @@
                                     End If
                                     '========================================================================================2010.04.02 추가
                                 Case "태양광" '//태양광
+                                Case "풍력" '//풍력
                                 Case "지열" '//지열                                           
                                 Case "열병합" '//열병합
                                     If Q_c_outg_therm > 0 Then '===========================2010.04.02  And Q_c_outg_therm > 0 추가

ArinWarev1/Calculator/CHeating.vb

@@ -102,7 +102,8 @@
 
         '태양광 시스템
         Dim Calc_태양 As New CRenewable(DSET, Result) : Calc_태양.Calc_PhotovoltaicSystem_EN(i_count_month, d_mth)
-
+        '풍력 시스템
+        Dim Calc_풍력 As New CRenewable(DSET, Result) : Calc_풍력.Calc_WindPowerGenerationSystem(i_count_month, d_mth)
 
         Dim 급탕용량합 As Decimal = 0
         For Each Dr난방 As DS.tbl_nanbangkikiRow In DSET.tbl_nanbangkiki.Select("code<>'0' and 헤더적용=true", "code")
@@ -460,6 +461,31 @@
                                 use_Elec = use_Elec + Q_w_g_hp_aux * system_count '===========2013.08.18 수정
                                 Q_w_f = Q_w_f + (Q_w_f_hp + Q_w_g_hp_aux) * system_count '============================2010.04.17 추가, 2013.08.18 수정
                         End Select
+                    Case "수열" '//수열
+                        Select Case dr신재생.가동연료.Trim
+                            Case "전기" '전기"
+                                CRenew.Calc_HydroHeatpumpSystem(system_type, 3, dr신재생, Q_w_outg_i, i_count_month, d_op_max_mth, t_h, theta_g_m, theta_i, Q_wp_outg, Q_w_f_hp, Q_w_g_hp_aux) '=============2010.04.01 수정 Q_h_outg 를 Q_h_outg_i 로 수정
+                                Q_w_outg = Q_w_outg - Q_wp_outg
+                                Q_w_outg_i = Q_w_outg_i - Q_wp_outg
+                                use_Elec = use_Elec + (Q_w_f_hp + Q_w_g_hp_aux) * system_count '===========2013.08.18 수정
+                                Q_w_f = Q_w_f + (Q_w_f_hp + Q_w_g_hp_aux) * system_count '============================2010.04.17 추가, 2013.08.18 수정
+                            Case "천연가스" '천연가스"
+                                CRenew.Calc_HydroHeatpumpSystem(system_type, 3, dr신재생, Q_w_outg_i, i_count_month, d_op_max_mth, t_h, theta_g_m, theta_i, Q_wp_outg, Q_w_f_hp, Q_w_g_hp_aux) '=============2010.04.01 수정 Q_h_outg 를 Q_h_outg_i 로 수정
+                                Q_w_outg = Q_w_outg - Q_wp_outg
+                                Q_w_outg_i = Q_w_outg_i - Q_wp_outg
+                                use_LNG = use_LNG + Q_w_f_hp * system_count '===========2013.08.18 수정
+                                use_Elec = use_Elec + Q_w_g_hp_aux * system_count '===========2013.08.18 수정
+                                Q_w_f = Q_w_f + (Q_w_f_hp + Q_w_g_hp_aux) * system_count '============================2010.04.17 추가, 2013.08.18 수정
+                                '//요기맞죠 ^^?
+                            Case "액화가스" '액화가스"
+                                CRenew.Calc_HydroHeatpumpSystem(system_type, 3, dr신재생, Q_w_outg_i, i_count_month, d_op_max_mth, t_h, theta_g_m, theta_i, Q_wp_outg, Q_w_f_hp, Q_w_g_hp_aux) '=============2010.04.01 수정 Q_h_outg 를 Q_h_outg_i 로 수정
+                                Q_w_outg = Q_w_outg - Q_wp_outg
+                                Q_w_outg_i = Q_w_outg_i - Q_wp_outg
+                                use_LPG = use_LPG + Q_w_f_hp * system_count '===========2013.08.18 수정
+                                use_Elec = use_Elec + Q_w_g_hp_aux * system_count '===========2013.08.18 수정
+                                Q_w_f = Q_w_f + (Q_w_f_hp + Q_w_g_hp_aux) * system_count '============================2010.04.17 추가, 2013.08.18 수정
+                        End Select
+
                     Case Else
                         '//160428
                         If MsgBox("알수없는 기기종류" + vbCrLf + dr신재생.기기종류 + vbCrLf + _
@@ -1038,9 +1064,30 @@
                                 use_Elec = use_Elec + Q_w_g_hp_aux * system_count '===========2013.08.18 수정
                                 Q_w_f = Q_w_f + (Q_w_f_hp + Q_w_g_hp_aux) * system_count '============================2010.04.17 추가, 2013.08.18 수정
                         End Select
-
+                    Case "수열" '//수열
-
+                        Select Case dr신재생.가동연료.Trim
-
+                            Case "전기" '전기"
+                                CRenew.Calc_HydroHeatpumpSystem(system_type, 3, dr신재생, Q_w_outg_i, i_count_month, d_op_max_mth, t_h, theta_g_m, theta_i, Q_wp_outg, Q_w_f_hp, Q_w_g_hp_aux) '=============2010.04.01 수정 Q_h_outg 를 Q_h_outg_i 로 수정
+                                Q_w_outg = Q_w_outg - Q_wp_outg
+                                Q_w_outg_i = Q_w_outg_i - Q_wp_outg
+                                use_Elec = use_Elec + (Q_w_f_hp + Q_w_g_hp_aux) * system_count '===========2013.08.18 수정
+                                Q_w_f = Q_w_f + (Q_w_f_hp + Q_w_g_hp_aux) * system_count '============================2010.04.17 추가, 2013.08.18 수정
+                            Case "천연가스" '천연가스"
+                                CRenew.Calc_HydroHeatpumpSystem(system_type, 3, dr신재생, Q_w_outg_i, i_count_month, d_op_max_mth, t_h, theta_g_m, theta_i, Q_wp_outg, Q_w_f_hp, Q_w_g_hp_aux) '=============2010.04.01 수정 Q_h_outg 를 Q_h_outg_i 로 수정
+                                Q_w_outg = Q_w_outg - Q_wp_outg
+                                Q_w_outg_i = Q_w_outg_i - Q_wp_outg
+                                use_LNG = use_LNG + Q_w_f_hp * system_count '===========2013.08.18 수정
+                                use_Elec = use_Elec + Q_w_g_hp_aux * system_count '===========2013.08.18 수정
+                                Q_w_f = Q_w_f + (Q_w_f_hp + Q_w_g_hp_aux) * system_count '============================2010.04.17 추가, 2013.08.18 수정
+                                '//요기맞죠 ^^?
+                            Case "액화가스" '액화가스"
+                                CRenew.Calc_HydroHeatpumpSystem(system_type, 3, dr신재생, Q_w_outg_i, i_count_month, d_op_max_mth, t_h, theta_g_m, theta_i, Q_wp_outg, Q_w_f_hp, Q_w_g_hp_aux) '=============2010.04.01 수정 Q_h_outg 를 Q_h_outg_i 로 수정
+                                Q_w_outg = Q_w_outg - Q_wp_outg
+                                Q_w_outg_i = Q_w_outg_i - Q_wp_outg
+                                use_LPG = use_LPG + Q_w_f_hp * system_count '===========2013.08.18 수정
+                                use_Elec = use_Elec + Q_w_g_hp_aux * system_count '===========2013.08.18 수정
+                                Q_w_f = Q_w_f + (Q_w_f_hp + Q_w_g_hp_aux) * system_count '============================2010.04.17 추가, 2013.08.18 수정
+                        End Select
                 End Select
                 'End If
             End If
@@ -1731,6 +1778,8 @@
                 If DR존.열생산난방생산기기 = dr난방.code Then 판단1 = True
                 If DR존.공조난방생산기기 = dr난방.code Then 판단2 = True
 
+                Q_h_ce_i = 0 '//20220525 수정
+
                 '//다시 생각을...
 
                 'If Worksheets("입력존").Range("입력난방생산기기1").Offset(0, i_count_zone - 1) <> "" And Worksheets("입력존").Range("입력난방생산기기1").Offset(0, i_count_zone - 1) = Worksheets("난방기기").Range("난방생산기기1").Offset(0, i_count_boiler - 1) Then
@@ -2286,6 +2335,31 @@
                                 use_Elec = use_Elec + Q_h_g_hp_aux * system_count '=============2013.08.18 수정
                                 Q_h_f = Q_h_f + (Q_h_f_hp + Q_h_g_hp_aux) * system_count '=============2013.08.18 수정 '============================2010.04.17 추가
                         End Select
+                    Case "수열" '//수열
+                        Select Case Dr신재생.가동연료.Trim
+                            Case "전기" '전기"
+                                CRenew.Calc_HydroHeatpumpSystem(system_type, i_HeatCool, Dr신재생, Q_h_outg_i, i_count_month, d_op_max_mth, t_h, theta_VA, theta_i, Q_hp_outg, Q_h_f_hp, Q_h_g_hp_aux) '=============2010.04.01 수정 Q_h_outg 를 Q_h_outg_i 로 수정
+                                Q_h_outg = Q_h_outg - Q_hp_outg
+                                Q_h_outg_i = Q_h_outg_i - Q_hp_outg
+                                use_Elec = use_Elec + (Q_h_f_hp + Q_h_g_hp_aux) * system_count '=============2013.08.18 수정
+                                Q_h_f = Q_h_f + (Q_h_f_hp + Q_h_g_hp_aux) * system_count '=============2013.08.18 수정  '============================2010.04.17 추가
+                            Case "천연가스" '천연가스"
+                                CRenew.Calc_HydroHeatpumpSystem(system_type, i_HeatCool, Dr신재생, Q_h_outg_i, i_count_month, d_op_max_mth, t_h, theta_VA, theta_i, Q_hp_outg, Q_h_f_hp, Q_h_g_hp_aux) '=============2010.04.01 수정 Q_h_outg 를 Q_h_outg_i 로 수정
+                                Q_h_outg = Q_h_outg - Q_hp_outg
+                                Q_h_outg_i = Q_h_outg_i - Q_hp_outg
+                                use_LNG = use_LNG + Q_h_f_hp * system_count '=============2013.08.18 수정
+                                use_Elec = use_Elec + Q_h_g_hp_aux * system_count '=============2013.08.18 수정
+                                Q_h_f = Q_h_f + (Q_h_f_hp + Q_h_g_hp_aux) * system_count '=============2013.08.18 수정 '============================2010.04.17 추가
+                                '//요기맞죠 ^^?
+                            Case "액화가스" '액화가스"
+                                CRenew.Calc_HydroHeatpumpSystem(system_type, i_HeatCool, Dr신재생, Q_h_outg_i, i_count_month, d_op_max_mth, t_h, theta_VA, theta_i, Q_hp_outg, Q_h_f_hp, Q_h_g_hp_aux) '=============2010.04.01 수정 Q_h_outg 를 Q_h_outg_i 로 수정
+                                Q_h_outg = Q_h_outg - Q_hp_outg
+                                Q_h_outg_i = Q_h_outg_i - Q_hp_outg
+                                use_LPG = use_LPG + Q_h_f_hp * system_count '=============2013.08.18 수정
+                                use_Elec = use_Elec + Q_h_g_hp_aux * system_count '=============2013.08.18 수정
+                                Q_h_f = Q_h_f + (Q_h_f_hp + Q_h_g_hp_aux) * system_count '=============2013.08.18 수정 '============================2010.04.17 추가
+                        End Select
+
                     Case "열병합" '//열병합
                         Select Case Dr신재생.가동연료.Trim
                             Case "난방유" '난방유"
@@ -2854,6 +2928,8 @@
             If DR존.열생산난방생산기기 = dr난방.code Then 판단1 = True
             If DR존.공조난방생산기기 = dr난방.code Then 판단2 = True
 
+            Q_h_ce_i = 0 '//20220525 수정
+
             '//다시 생각을...
 
             'If Worksheets("입력존").Range("입력난방생산기기1").Offset(0, i_count_zone - 1) <> "" And Worksheets("입력존").Range("입력난방생산기기1").Offset(0, i_count_zone - 1) = Worksheets("난방기기").Range("난방생산기기1").Offset(0, i_count_boiler - 1) Then
@@ -3391,6 +3467,31 @@
                                 use_Elec = use_Elec + Q_h_g_hp_aux * system_count '=============2013.08.18 수정
                                 Q_h_f = Q_h_f + (Q_h_f_hp + Q_h_g_hp_aux) * system_count '=============2013.08.18 수정 '============================2010.04.17 추가
                         End Select
+                    Case "수열" '//수열
+                        Select Case Dr신재생.가동연료.Trim
+                            Case "전기" '전기"
+                                CRenew.Calc_HydroHeatpumpSystem(system_type, i_HeatCool, Dr신재생, Q_h_outg_i, i_count_month, d_op_max_mth, t_h, theta_VA, theta_i, Q_hp_outg, Q_h_f_hp, Q_h_g_hp_aux) '=============2010.04.01 수정 Q_h_outg 를 Q_h_outg_i 로 수정
+                                Q_h_outg = Q_h_outg - Q_hp_outg
+                                Q_h_outg_i = Q_h_outg_i - Q_hp_outg
+                                use_Elec = use_Elec + (Q_h_f_hp + Q_h_g_hp_aux) * system_count '=============2013.08.18 수정
+                                Q_h_f = Q_h_f + (Q_h_f_hp + Q_h_g_hp_aux) * system_count '=============2013.08.18 수정  '============================2010.04.17 추가
+                            Case "천연가스" '천연가스"
+                                CRenew.Calc_HydroHeatpumpSystem(system_type, i_HeatCool, Dr신재생, Q_h_outg_i, i_count_month, d_op_max_mth, t_h, theta_VA, theta_i, Q_hp_outg, Q_h_f_hp, Q_h_g_hp_aux) '=============2010.04.01 수정 Q_h_outg 를 Q_h_outg_i 로 수정
+                                Q_h_outg = Q_h_outg - Q_hp_outg
+                                Q_h_outg_i = Q_h_outg_i - Q_hp_outg
+                                use_LNG = use_LNG + Q_h_f_hp * system_count '=============2013.08.18 수정
+                                use_Elec = use_Elec + Q_h_g_hp_aux * system_count '=============2013.08.18 수정
+                                Q_h_f = Q_h_f + (Q_h_f_hp + Q_h_g_hp_aux) * system_count '=============2013.08.18 수정 '============================2010.04.17 추가
+                                '//요기맞죠 ^^?
+                            Case "액화가스" '액화가스"
+                                CRenew.Calc_HydroHeatpumpSystem(system_type, i_HeatCool, Dr신재생, Q_h_outg_i, i_count_month, d_op_max_mth, t_h, theta_VA, theta_i, Q_hp_outg, Q_h_f_hp, Q_h_g_hp_aux) '=============2010.04.01 수정 Q_h_outg 를 Q_h_outg_i 로 수정
+                                Q_h_outg = Q_h_outg - Q_hp_outg
+                                Q_h_outg_i = Q_h_outg_i - Q_hp_outg
+                                use_LPG = use_LPG + Q_h_f_hp * system_count '=============2013.08.18 수정
+                                use_Elec = use_Elec + Q_h_g_hp_aux * system_count '=============2013.08.18 수정
+                                Q_h_f = Q_h_f + (Q_h_f_hp + Q_h_g_hp_aux) * system_count '=============2013.08.18 수정 '============================2010.04.17 추가
+                        End Select
+
                     Case "열병합" '//열병합
                         Select Case Dr신재생.가동연료.Trim
                             Case "난방유" '난방유"

ArinWarev1/Calculator/CRenewable.vb

@@ -665,6 +665,168 @@
 
     End Sub
 
+
+    Public Overridable Sub Calc_HydroHeatpumpSystem(ByVal i_system_hp As Integer, ByVal i_HeatCool As Integer, ByVal Dr신재생 As DS.tbl_newRow, ByVal Q_hp_outg As Decimal, ByVal i_hp_month As Integer, _
+                                           ByVal d_h_mth As Integer, ByVal t_hp As Integer, ByVal theta_VA As Decimal, ByVal theta_i As Decimal, ByRef Q_h_outg As Decimal, ByRef Q_h_f_hp As Decimal, ByRef Q_h_g_aux As Decimal)
+
+        pLog.Add(String.Format(">>HydroCalc_HeatpumpSystem 진입 : i_system_hp={0}, i_HeatCool={1},dr신재생={2},Q_hp_outg={3},i_hp_month={4},d_h_mth={5},t_hp={6},theta_VA={7},theta_i={8},Q_h_outg={9},Q_h_f_hp={10},Q_h_g_aux={11}", _
+                          i_system_hp, i_HeatCool, Dr신재생.code, Q_hp_outg, i_hp_month, d_h_mth, t_hp, theta_VA, theta_i, Q_h_outg, Q_h_f_hp, Q_h_g_aux))
+
+
+
+        Dim f_Verwindung As Decimal, V As Decimal, q_B_S As Decimal, Phi_g As Decimal
+        Dim Q_h_g As Decimal, Q_h_g_s As Decimal, Q_h_g_WP As Decimal
+        Dim P_rd_mot As Decimal
+        'Dim Q_h_f_hp as decimal 'DIN 에서는 Q_h_f로 표기
+        'Dim Delta_p_prim as decimal, Delta_p_sek as decimal
+        Dim Phi_prim_aux As Decimal, Phi_sek_aux As Decimal, t_ON_aux As Decimal
+        Dim theta_h_s As Decimal
+        Dim COP, COP_L, COP_H, COP_b As Decimal
+        Dim Q_h_outg_net As Decimal
+
+
+        Q_h_g_s = 0
+        Q_h_g_WP = 0 '전기히트펌프인 경우 0  가스히트펌프는 ?
+        P_rd_mot = 0
+        Q_h_f_hp = 0
+        Q_h_outg_net = 0
+
+
+        Dim water_temp As Single = 0.0F ' i_hp_month
+        If Dr신재생.수열_수열원 = "하천수" Then
+
+            Dim Dr수온 As DS.weather_riverRow = CType(DSET.weather_river.Select("pcode='" & Calc.Pub.기상데이터.code + "'")(0), DS.weather_riverRow)
+            water_temp = TOSG(Dr수온("M" + i_hp_month.ToString("00")))
+        Else
+            Dim Dr수온 As DS.weather_waterRow = CType(DSET.weather_water.Rows(0), DS.weather_waterRow)
+            water_temp = TOSG(Dr수온("M" + i_hp_month.ToString("00")))
+        End If
+
+
+        'eta_aux = 0.3
+        'Delta_p_prim = 40 'kPa 1차측
+        'Delta_p_sek = 10 'kPa 2차측
+
+        'MsgBox(i_count_hp)
+
+        'i_count_hp = 0  '//신재생 줄번호는 무조건 0이된다. 20100127 '//연습용데이터 문제있음
+        ' Dim Dr신재생 As DS.tbl_newRow = CType(DSET.tbl_new.Rows(0), DS.tbl_newRow)
+
+        Phi_g = TOSG(Dr신재생.수열_수열히트펌프용량) '  Worksheets("신재생기기").Range("지열히트펌프용량1").Offset(0, i_count_hp - 1)
+
+        If Dr신재생.가동연료 <> "전기" And i_HeatCool = 1 And Dr신재생.수열_열교환기설치여부 = "예" Then ' Worksheets("신재생기기").Range("지열히트펌프용량1").Offset(5, i_count_hp - 1) = "예" Then
+            P_rd_mot = 0.4
+        End If
+
+        If Q_hp_outg < (Phi_g * t_hp) * (1 + P_rd_mot) Then
+            Q_h_outg = Q_hp_outg
+        Else
+            Q_h_outg = Phi_g * t_hp * (1 + P_rd_mot)
+        End If
+
+        If i_HeatCool = 1 Or i_HeatCool = 3 Then '난방 1 , 냉방 2, 급탕 3
+            '난방, 급탕
+            If Dr신재생.수열_수열팽창탱크설치여부 = "예" Then ' Worksheets("신재생기기").Range("지열히트펌프용량1").Offset(6, i_count_hp - 1) = "예" Then
+                f_Verwindung = 1.2
+                V = TOSG(Dr신재생.수열_수열팽창탱크체적) ' Worksheets("신재생기기").Range("지열히트펌프용량1").Offset(7, i_count_hp - 1)
+                q_B_S = TOSG(0.4 + 0.14 * V ^ 0.45) '(51)
+                theta_h_s = theta_VA '급수온도로 적용
+                Q_h_g_s = f_Verwindung * (theta_h_s - theta_i) / 45 * d_h_mth * q_B_S '(49) 외부완충(팽창탱크 유무)
+
+            End If
+
+            Q_h_g = Q_h_g_s + Q_h_g_WP
+            COP_L = TOSG(Dr신재생.수열_열성능비_난방5도) ' Worksheets("신재생기기").Range("지열히트펌프용량1").Offset(1, i_count_hp - 1)
+            COP_H = TOSG(Dr신재생.수열_열성능비_난방15도) ' Worksheets("신재생기기").Range("지열히트펌프용량1").Offset(1, i_count_hp - 1)
+            COP_b = COP_L - ((COP_H - COP_L) / 10 * 5)
+            COP = (COP_H - COP_L) / 10 * (water_temp - 5) + COP_b  '// 최저 최고 수열온도는 평균온도 대비 +- 5도로 변동되며, 지열과 형평성을 맞추기 위하여 보수적으로 5도 낮춤
+
+        Else
+            '냉방
+
+            COP_L = TOSG(Dr신재생.수열_열성능비_냉방25도) ' Worksheets("신재생기기").Range("지열히트펌프용량1").Offset(1, i_count_hp - 1)
+            COP_H = TOSG(Dr신재생.수열_열성능비_냉방35도) ' Worksheets("신재생기기").Range("지열히트펌프용량1").Offset(1, i_count_hp - 1)
+            COP_b = COP_L - ((COP_H - COP_L) / 10 * 25)
+            COP = (COP_H - COP_L) / 10 * (water_temp + 5) + COP_b '// 최저 최고 수열온도는 평균온도 대비 +- 5도로 변동되며, 지열과 형평성을 맞추기 위하여 보수적으로 5도 높임
+
+        End If
+
+
+        If Dr신재생.가동연료 = "전기" Then ' Worksheets("신재생기기").Range("신재생및열병합기기종류1").Offset(1, i_count_hp - 1) = "전기" Then
+            Q_h_f_hp = (Q_h_outg + Q_h_g) / COP
+            '    Q_h_in = Q_h_outg + Q_h_g - Q_h_f_hp '월간 전기히트펌프(재생에너지유입량)
+        Else
+            Q_h_f_hp = Q_h_outg / COP
+            '    If i_HeatCool = 1 And Worksheets("신재생기기").Range("지열히트펌프용량1").Offset(5, i_count_hp - 1) = "예" Then
+            '        P_rd_mot = 0.4
+            '    End If
+            '    Q_h_in = Q_h_outg + Q_h_g - Q_h_f_hp * (1 + P_rd_mot) '월간 가스히트펌프(재생에너지유입량)
+        End If
+
+        'Q_h_f = Q_h_outg + Q_h_g - k_rd_g * Q_h_g_aux - Q_h_in '월간(A.1) 전기히트펌프(난방요구량 충당)
+        'Q_h_f = (Q_h_outg + Q_h_g - k_rd_g * Q_h_g_aux - Q_h_in) / (1 + P_rd_mot) '월간(A.2) 가스히트펌프(난방요구량 충당)
+
+
+        '보조에너지
+
+
+        'Phi_prim_aux = Delta_p_prim * V_dot / (eta_aux * 3600) '(89) 사용자 입력항목이므로 확인 요망
+        'Phi_sek_aux = Delta_p_sek * V_dot / (eta_aux * 3600) '(89) 사용자 입력항목이므로 확인 요망
+
+        t_ON_aux = Q_h_outg / (Phi_g) '(81)
+        Phi_prim_aux = TOSG(Dr신재생.수열_1차펌프동력) ' Worksheets("신재생기기").Range("지열히트펌프용량1").Offset(3, i_count_hp - 1)
+        Phi_sek_aux = TOSG(Dr신재생.수열_2차펌프동력) ' Worksheets("신재생기기").Range("지열히트펌프용량1").Offset(4, i_count_hp - 1)
+
+        Q_h_g_aux = TOSG((Phi_prim_aux + Phi_sek_aux) * 0.001 * t_ON_aux) '(88)
+
+
+        '// 신재생에너지 자립률 추가(2017.01.20)
+
+        If Dr신재생.가동연료 = "전기" Then
+            Q_h_outg_net = Q_h_outg - ((Q_h_f_hp + Q_h_g_aux) * 2.75)  '전기 1차에너지계수 적용
+            If Q_h_outg_net < 0 Then Q_h_outg_net = 0
+
+        Else
+            Q_h_outg_net = Q_h_outg - (Q_h_f_hp * 1.1 + Q_h_g_aux * 2.75)  '가스 1차에너지계수 적용
+            If Q_h_outg_net < 0 Then Q_h_outg_net = 0
+        End If
+
+
+
+        '// 신재생에너지 자립률 추가
+
+
+        '//열에너지생산량 (수열)
+        Result.생산E(i_hp_month).수열생산량 += Q_h_outg_net '//20170120 추가
+        '// Result.생산E(i_hp_month).지열생산량 += Q_h_f_hp  '20170120 지열생산량을 수정
+        'DSETR.TReqUse.Rows(79)("M" & Format(i_hp_month, "00")) = CSng(DSETR.TReqUse.Rows(79)("M" & Format(i_hp_month, "00"))) + Q_h_f_hp 'DrT생산.열생산량지열 += Q_h_f_hp
+
+        pLog.Add(String.Format(">>Calc_HydroHeatpumpSystem 결과0 Q_h_f_hp={0},t_ON_aux={1},Q_h_g_aux={2}", _
+                      Q_h_f_hp, t_ON_aux, Q_h_g_aux))
+
+        pLog.Add(String.Format(">>Calc_HydroHeatpumpSystem 결과1 수열생산량={0}", _
+                       Result.생산E(i_hp_month).수열생산량))
+
+        '100 : Total >> DrT생산.단위면적당생산량지열
+        Select Case i_system_hp
+            Case 1
+                Result.생산E(i_hp_month).면적당생산량수열 += (Q_h_outg_net / Result.사용면적.H)  '//20170120 추가
+                '//Result.생산E(i_hp_month).면적당생산량지열 += (Q_h_f_hp / Result.사용면적.H) '20170120 지열생산량을 수정
+                'DSETR.TReqUse.Rows(100)("M00") = CSng(DSETR.TReqUse.Rows(100)("M00")) + Q_h_f_hp / CSng(DSETR.TReqUse.Rows(10)("M00")) ' DrT요구량.난방사용면적 ' Sheets("계산결과").Cells(15, 7)
+            Case 2
+                Result.생산E(i_hp_month).면적당생산량수열 += (Q_h_outg_net / Result.사용면적.C)  '//20170120 추가
+                '//Result.생산E(i_hp_month).면적당생산량지열 += (Q_h_f_hp / Result.사용면적.C) '20170120 지열생산량을 수정
+                'DSETR.TReqUse.Rows(100)("M00") = CSng(DSETR.TReqUse.Rows(100)("M00")) + Q_h_f_hp / CSng(DSETR.TReqUse.Rows(15)("M00")) 'DrT요구량.냉방사용면적 '("계산결과").Cells(20, 7)
+            Case 3
+                Result.생산E(i_hp_month).면적당생산량수열 += (Q_h_outg_net / Result.사용면적.W)  '//20170120 추가
+                '//Result.생산E(i_hp_month).면적당생산량지열 += (Q_h_f_hp / Result.사용면적.W) '20170120 지열생산량을 수정
+        End Select
+
+        pLog.Add(String.Format(">>Calc_HydroHeatpumpSystem 결과2 면적당생산량수열={0}", _
+                       Result.생산E(i_hp_month).면적당생산량수열))
+
+    End Sub
+
     Public Overridable Sub Calc_CogenerationSystemEN(ByVal Dr신재생 As DS.tbl_newRow, i_system_chp As Integer, ByVal i_chp_month As Integer, ByVal Q_h_outg As Decimal, ByVal t_chp As Integer, _
                                                      ByRef Q_chp_gen_out As Decimal, ByRef E_chp_gen_in As Decimal)
 
@@ -753,4 +915,70 @@
         End If
         'DSETR.TReqUse.Rows(77)("M" & Format(i_chp_month, "00")) = CSng(DSETR.TReqUse.Rows(77)("M" & Format(i_chp_month, "00"))) + E_el_chp_out ' Sheets("계산결과").Cells(96, 7 + i_chp_month) = E_el_chp_out
     End Sub
+
+    Public Overridable Sub Calc_WindPowerGenerationSystem(ByVal i_count_wp_month As Integer, ByVal i_wp_d_mth As Integer)
+
+        pLog.Add(String.Format(">>Calc_WindPowerGenerationSystem 진입 : i_count_wp_month={0}, i_wp_d_mth={1}", _
+                          i_count_wp_month, i_wp_d_mth))
+
+        Dim f_v_WK, P_WEA_WK, P_Wind_WK, t_WK, A, A_Rotor, v_1, v_2, h_1, h_2 As Decimal
+        Dim alpha, Q_f_prod_WEA, rho As Decimal
+        Dim k As Integer
+        Dim Q_f_prod_out, Q_f_prod_out_offsite As Decimal
+
+        k = 2
+        alpha = 0.14 '표준조건
+        Q_f_prod_WEA = 0
+        Q_f_prod_out = 0
+        Q_f_prod_out_offsite = 0
+        rho = 1.225
+        h_1 = 10
+
+
+
+
+        For Each Dr신재생 As DS.tbl_newRow In DSET.tbl_new.Select("code <> '0'", "code")
+
+            If Dr신재생.기기종류 = "풍력" Then
+
+                Dim Drow풍속 As DS.weather_windRow = CType(DSET.weather_wind.Select("pcode='" & Calc.Pub.기상데이터.code & "'")(0), DS.weather_windRow)
+                A_Rotor = TOSG(Dr신재생.풍력로우터회전면적)
+                h_2 = TOSG(Dr신재생.풍력허브높이)
+
+                v_1 = TOSG(Drow풍속("M" + i_count_wp_month.ToString("00"))) '  값을 정의하기 위해서 해당 지역 월 평균 풍속 데이터 필요
+                v_2 = v_1 * Math.Pow((h_2 / h_1), alpha)
+
+                A = 2 * v_2 / Math.Sqrt(Math.PI)
+
+                For v_WK As Integer = 4 To 16
+
+                    f_v_WK = k / A * Math.Pow((v_WK - 0.5) / A, k - 1) * Math.Exp(-Math.Pow(((v_WK - 0.5) / A), k))
+                    t_WK = 24 * i_wp_d_mth * f_v_WK
+                    P_Wind_WK = 1 / 2 * rho * A_Rotor * Math.Pow(v_WK, 3)
+                    P_WEA_WK = 0.2 * P_Wind_WK
+                    Q_f_prod_WEA += (P_WEA_WK * t_WK) / 1000
+
+                Next
+                If Dr신재생.대지외설치여부_풍력 Then
+                    Q_f_prod_out_offsite += Q_f_prod_WEA
+                Else
+                    Q_f_prod_out += Q_f_prod_WEA
+                End If
+
+            End If
+        Next
+
+
+
+        Result.생산E(i_count_wp_month).풍력전력생산량 += Q_f_prod_out
+        Result.생산E(i_count_wp_month).풍력전력생산량_offsite += Q_f_prod_out_offsite
+
+
+        pLog.Add(String.Format(">>Calc_WindPowerGenerationSystem 진입 : Q_f+prod_out={0}, 풍력전력생산량={1}", _
+                       Q_f_prod_out, Result.생산E(i_count_wp_month).풍력전력생산량))
+
+    End Sub
+
+
+
 End Class

ArinWarev1/Calculator/CSummary.vb

@@ -616,6 +616,11 @@
         Next
         Set_ReqUseRow("310", "전기에너지 생산량(태양광)", "[kWh]", CStr(Result.E변환계수.전력), "=", Array)    '//67
         Array.Clear()
+        For i As Integer = 0 To 12
+            Array.Add(Result.생산E(i).풍력전력생산량)
+        Next
+        Set_ReqUseRow("310", "전기에너지 생산량(풍력)", "[kWh]", CStr(Result.E변환계수.전력), "=", Array)    '//67
+        Array.Clear()
         For i As Integer = 0 To 12
             Array.Add(Result.생산E(i).열병합전력생산량)
         Next
@@ -631,6 +636,12 @@
         Next
         Set_ReqUseRow("310", "열에너지 생산량(지열)", "[kWh]", "", "=", Array)
         Array.Clear()
+        For i As Integer = 0 To 12
+            Array.Add(Result.생산E(i).수열생산량)
+        Next
+        Set_ReqUseRow("310", "열에너지 생산량(수열)", "[kWh]", "", "=", Array)
+        Array.Clear()
+
         For i As Integer = 0 To 12
             Array.Add(Result.생산E(i).면적당생산량태양열)
         Next
@@ -643,6 +654,12 @@
 
         Set_ReqUseRow("310", "단위면적당 생산량(지열)", "[kWh]", "", "=", Array, "N1")  '//72
 
+        For i As Integer = 0 To 12
+            Array.Add(Result.생산E(i).면적당생산량수열)
+        Next
+
+        Set_ReqUseRow("310", "단위면적당 생산량(수열)", "[kWh]", "", "=", Array, "N1")  '//72
+
 
         '//CO2배출량
         Array.Clear()
@@ -830,6 +847,11 @@
         Next
         Set_ReqUseRow("410", "전력 CO2 저감량(태양광)", "[kg CO2]", CStr(Result.Co2배출계수.전력), "=", Array) '//102
         Array.Clear()
+        For i As Integer = 0 To 12
+            Array.Add(Result.Co2발생량(i).저감량풍력)
+        Next
+        Set_ReqUseRow("410", "전력 CO2 저감량(풍력)", "[kg CO2]", CStr(Result.Co2배출계수.전력), "=", Array) '//102
+        Array.Clear()
         For i As Integer = 0 To 12
             Array.Add(Result.Co2발생량(i).저감량열병합)
         Next

ArinWarev1/Calculator/CZone.vb

@@ -50,6 +50,8 @@
         Dim Q_V_win_sink As Decimal, Q_V_win_source As Decimal, H_V_win As Decimal, n_win As Decimal
         Dim zone_count As Decimal '//2012.07.08 추가  입력존의 수
 
+        Dim Delta_theta_AUL, V_dot_A_AHU As Decimal
+
         'Dim priod_value As Single = 0
         Dim age As Decimal = 1 '//준공연도에 의한 경년변화값
         'For Each DRpriod As DS.tbl_DescRow In DSET.tbl_Desc.Select("cname<>'0'", "cname")
@@ -190,15 +192,90 @@
                             'Q_I_L = 0 'mu_L*Q_I_L_elektr (2-123)추후 추가
                         End If
 
+                        ''/// 공기식 태양열 적용여부 확인
+                        'Delta_theta_AUL = 0
+                        'V_dot_A_AHU = 0
+
+                        'If DR존.냉난방공조처리시스템 <> "0" Then
+                        '    Dim Dr공조() As DS.tbl_kongjoRow = DSET.tbl_kongjo.Select("code='" & DR존.냉난방공조처리시스템 & "' and code <> '0'", "code")
+                        '    If Dr공조.Length = 1 AndAlso i_count_month > 0 Then
+                        '        If Dr공조(0).공기식태양열적용 = "예" Then
+
+                        '            V_dot_A_AHU = Get_V_dot_A_AHU(DSET.tbl_profile, DSET.tbl_zone, Dr공조(0).code)
+
+                        '            '해당 존에 연결된 공조기에 연결된 입력존*입력존수*최소외기도입량 의 합계 산출(V_dot_A_AHU)
+                        '            '/////////////
+                        '            '/////////////
+                        '            '/////////////
+                        '            '/////////////
+                        '            '/////////////
+                        '            '/////////////
+                        '            '/////////////
+                        '            Delta_theta_AUL = SolarAirHeatingSystem(DSET, i_count_month, d_op_mth, Dr공조(0), V_dot_A_AHU, Calc.Pub.theta_e(i_count_month), Delta_theta_AUL)
+
+
+                        '        End If
+                        '    End If
+                        'End If
+                    
+
+
+
+
                         V_mech_outdoor = 1 '외기처리 관련 (ZZ=사용안함 Y=예)
                         If DR존.냉난방방식 <> "기능없음" And DR존.냉난방공조 <> "기능없음" And DR존.외기부하처리여부 = "예" Then
                             If i_count_HeatCool = 1 Then    '//난방이라면
                                 If DR존.냉난방공조 <> "난방" AndAlso DR존.냉난방공조 <> "냉난방" Then '난방/냉난방 이 아니면!
-                                    If theta_i_h_soll > Calc.Pub.theta_e(i_count_month) Then    '//난방설정온도 > 외기온도(난방기)
+                                    'If theta_i_h_soll > (Calc.Pub.theta_e(i_count_month) + Delta_theta_AUL) Then    '//난방설정온도 > 외기온도(난방기)
-                                        Q_vh_b_op = V_mech * (theta_i_h_soll - Calc.Pub.theta_e(i_count_month)) * t_h_op_d * c_p_arhoa * d_op_mth * zone_count '===============d_op(i_count_month) 2010.2.21 수정
+                                    '    Q_vh_b_op = V_mech * (theta_i_h_soll - (Calc.Pub.theta_e(i_count_month) + Delta_theta_AUL)) * t_h_op_d * c_p_arhoa * d_op_mth * zone_count '===============d_op(i_count_month) 2010.2.21 수정
-                                        V_mech_outdoor = 0 ' 외기처리된 상태인 경우
+                                    '    V_mech_outdoor = 0 ' 외기처리된 상태인 경우
-                                        'Log.AppendLine("               >>  외기처리됨")
+                                    '    'Log.AppendLine("               >>  외기처리됨")
-                                    End If
+                                    'End If
+
+                                    'If theta_i_h_soll > Calc.Pub.theta_e(i_count_month) Then    '//난방설정온도 > 외기온도(난방기)
+                                    '    Q_vh_b_op = V_mech * (theta_i_h_soll - Calc.Pub.theta_e(i_count_month)) * t_h_op_d * c_p_arhoa * d_op_mth * zone_count '===============d_op(i_count_month) 2010.2.21 수정
+                                    '    V_mech_outdoor = 0 ' 외기처리된 상태인 경우
+                                    '    'Log.AppendLine("               >>  외기처리됨")
+
+                                    'End If
+
+
+
+                                    'If DR존.냉난방공조처리시스템 <> "0" Then
+
+                                    '    Dim Dr공조 As DS.tbl_kongjoRow = DSET.tbl_kongjo.Select("code='" & DR존.냉난방공조처리시스템 & "' and code <> '0'", "code")(0)
+                                    '    If DR공조.공기식태양열적용 = "예" Then
+
+                                    '        V_dot_A_AHU = Get_V_dot_A_AHU(DSET.tbl_profile, DSET.tbl_zone, Dr공조.code)
+
+
+                                    '        '해당 존에 연결된 공조기에 연결된 입력존*입력존수*최소외기도입량 의 합계 산출(V_dot_A_AHU)
+                                    '        '/////////////
+                                    '        '/////////////
+                                    '        '/////////////
+                                    '        '/////////////
+                                    '        '/////////////
+                                    '        '/////////////
+                                    '        '/////////////
+                                    '        Delta_theta_AUL = SolarAirHeatingSystem(DSET, i_count_month, d_op_mth, Dr공조, V_dot_A_AHU, Calc.Pub.theta_e(i_count_month), Delta_theta_AUL)
+
+                                    '        If theta_i_h_soll > (Calc.Pub.theta_e(i_count_month) + Delta_theta_AUL) Then    '//난방설정온도 > 외기온도(난방기)
+                                    '            Q_vh_b_op = V_mech * (theta_i_h_soll - (Calc.Pub.theta_e(i_count_month) + Delta_theta_AUL)) * t_h_op_d * c_p_arhoa * d_op_mth * zone_count '===============d_op(i_count_month) 2010.2.21 수정
+                                    '            V_mech_outdoor = 0 ' 외기처리된 상태인 경우
+                                    '            'Log.AppendLine("               >>  외기처리됨")
+                                    '        End If
+                                    '    Else
+
+
+                                    '    End If
+                                    'Else
+                                    '    '//ㄱ
+                                    'End If
+                                    ''For Each Dr공조 As DS.tbl_kongjoRow In DSET.tbl_kongjo.Select("code='" & DR존.냉난방공조처리시스템 & "' and code <> '0'", "code")
+
+                                    ''Next
+
+
                                 End If
                             Else
                                 If DR존.냉난방공조 <> "냉방" AndAlso DR존.냉난방공조 <> "냉난방" Then '냉방/냉난방이 아닐경우
@@ -391,23 +468,58 @@
                         'theta_V_mech = theta_e(i_count_month) + eta_V_mech * (theta_i - theta_e(i_count_month)) '(2-91) 비제어적 열교환 eta_V_mech은 사용자입력
                         theta_V_mech_RLT = TOSG(IIf(i_count_HeatCool = 1, 27, 16))
 
+
+
+
+
                         theta_V_mech = Calc.Pub.theta_e(i_count_month) 'theta_V_mech_RLT '(2-92) 공조처리된 급기온도(도표 3-3, 3-4, 7-5) 난방 27, 냉방 16으로 설정
 
                         pLog.Add(String.Format("theta_i:{0},theta_z:{1},theta_u:{2},theta_V_mech_RLT:{3},theta_V_mech:{4}", theta_i, theta_z, theta_u, theta_V_mech_RLT, theta_V_mech))
 
 
+
+
                         '=======================================================================2010.02.04 추가부분 시작
                         If DR존.냉난방공조처리시스템 <> "0" And DR존.냉난방공조 = "환기" Then   '//냉난방공조처리시스템이 선택되어있고 공조가 환기라면
                             '//공조처리스템과 일치하는 공조기기(tbl_kongjo) 를 찾아서 계산한다.
                             Dim DR() As DS.tbl_kongjoRow = CType(DSET.tbl_kongjo.Select("code='" & DR존.냉난방공조처리시스템 & "' and code <> '0'"), DS.tbl_kongjoRow())
+
+                            '/// 공기식 태양열 적용여부 확인
+                            Delta_theta_AUL = 0
+                            V_dot_A_AHU = 0
+
+
+                            If i_count_month > 0 Then
+                                If DR(0).공기식태양열적용 = "예" Then
+
+                                    V_dot_A_AHU = Get_V_dot_A_AHU(DSET.tbl_profile, DSET.tbl_zone, DR(0).code)
+
+                                    '해당 존에 연결된 공조기에 연결된 입력존*입력존수*최소외기도입량 의 합계 산출(V_dot_A_AHU)
+                                    '/////////////
+                                    '/////////////
+                                    '/////////////
+                                    '/////////////
+                                    '/////////////
+                                    '/////////////
+                                    '/////////////
+                                    Delta_theta_AUL = SolarAirHeatingSystem(DSET, i_count_month, d_op_mth, DR(0), V_dot_A_AHU, Calc.Pub.theta_e(i_count_month), Delta_theta_AUL)
+
+
+                                End If
+                            End If
+
+
+
                             If DR.GetUpperBound(0) = 0 Then
                                 Select Case DR(0).열교환기유형.Trim
                                     Case "현열교환", "전열교환" '//현열교환,전열교환
                                         Phi = TOSG(DR(0).열회수율) ' Worksheets("공조처리시스템").Range("열교환기1").Offset(1, i_count_AHU - 1)
+                                        theta_V_mech = Calc.Pub.theta_e(i_count_month) + Phi * (theta_i - Calc.Pub.theta_e(i_count_month) + Delta_theta_AUL)
                                     Case Else
                                         Phi = 0
+                                        theta_V_mech = Calc.Pub.theta_e(i_count_month) + Delta_theta_AUL
                                 End Select
-                                theta_V_mech = Calc.Pub.theta_e(i_count_month) + Phi * (theta_i - Calc.Pub.theta_e(i_count_month))
+
                             Else
                                 MsgBox(DR존.설명 & "존의 냉난방공조처리스템(" & DR존.냉난방공조처리시스템 & ") 의값이 일치하지않습니다", MsgBoxStyle.Critical, "확인")
                             End If
@@ -874,7 +986,7 @@
 
 
             pLog.Add("환기소요량 시작")
-            Calc.AirHandling.Calc_AirHandling(i_count_month, d_full_mth) '//환기? '========2010.2.21 수정
+            Calc.AirHandling.Calc_AirHandling(i_count_month, d_full_mth, theta_e_month) '//환기? '========2010.2.21 수정
 
             '//
             If Result.E분석(i_count_month).난방에너지요구량 <> 0 Then

ArinWarev1/Calculator/Calculator.vb

@@ -346,6 +346,8 @@
             'log.AppendLine(">>주계산시작")
         End If
 
+
+
         '//사용자가입력한 1차에너지사용량(=월별에너지사용량)을 변환계수를 이용해 값을 생성한다.
         DSETR1.월별1차에너지사용량.Rows.Clear() : DSETR2.월별1차에너지사용량.Rows.Clear()
         DSETR1.월별1차에너지사용량.AcceptChanges() : DSETR2.월별1차에너지사용량.AcceptChanges()
@@ -356,6 +358,8 @@
         DSETR2.월별1차에너지사용량.Merge(DSETR1.월별1차에너지사용량)
         DSETR2.월별1차에너지사용량.AcceptChanges()
 
+
+
         Dim Retval As Boolean
         Select Case CalcType
             Case ECalc.All
@@ -527,6 +531,15 @@
         'DSET.tbl_kongjo.AcceptChanges()
         DSET.AcceptChanges()
 
+        '
+        Dim waterok As Boolean = True
+        For Each dr As DS.tbl_newRow In DSET1.tbl_new.Rows
+            If dr.기기종류 = "수열" AndAlso dr.가동연료.Contains("없음") Then '//
+                MsgBox("수열시스템의 가동연료가 정의되어 있지 않습니다.")
+                Return False
+            End If
+        Next
+
 
         '//그값이 존에잇어요?cnrkehlsrp?추가된게?공조기기요
         For Each Dr As DS.tbl_zoneRow In DSET.tbl_zone.Select("code <> '0'") '//모든존을 검사 없음(0)은 빼고

ArinWarev1/Calculator/Result/C1차소요량.vb

@@ -79,7 +79,7 @@
                 Next
                 Return R
             Else
-                Return Me.난방소요량 + Me.냉방소요량 + Me.급탕소요량 + Me.조명소요량 + Me.환기소요량 - (Result.생산E(MIdx).태양광전력생산량 * Result.E변환계수.전력) - (Result.생산E(MIdx).열병합전력생산량 * Result.E변환계수.전력)
+                Return Me.난방소요량 + Me.냉방소요량 + Me.급탕소요량 + Me.조명소요량 + Me.환기소요량 - ((Result.생산E(MIdx).태양광전력생산량 + Result.생산E(MIdx).풍력전력생산량) * Result.E변환계수.전력) - (Result.생산E(MIdx).열병합전력생산량 * Result.E변환계수.전력)
             End If
         End Get
     End Property
@@ -103,7 +103,7 @@
                 Me.난방LPG * Result.E변환계수.LPG + Me.난방지역 * Result.E변환계수.지역난방 + _
                 Me.난방전력 * Result.E변환계수.전력
                 Try
-                    Return R - (Result.생산E(0).태양광전력생산량 + Result.생산E(0).열병합전력생산량) / _
+                    Return R - (Result.생산E(0).태양광전력생산량 + Result.생산E(0).풍력전력생산량 + Result.생산E(0).열병합전력생산량) / _
                     (Me.난방전력 + Me.냉방전력 + Me.급탕전력 + Me.조명전력 + Me.환기전력) * Me.난방전력 * Result.E변환계수.전력
                 Catch ex As Exception
 
@@ -129,7 +129,7 @@
                     Me.난방LPG * Result.E변환계수.지역난방 + Me.난방지역 * Result.E변환계수.지역난방 + _
                     Me.난방전력 * Result.E변환계수.전력
                     Try
-                        Return R - (Result.생산E(0).태양광전력생산량 + Result.생산E(0).열병합전력생산량) / _
+                        Return R - (Result.생산E(0).태양광전력생산량 + Result.생산E(0).풍력전력생산량 + Result.생산E(0).열병합전력생산량) / _
                         (Me.난방전력 + Me.냉방전력 + Me.급탕전력 + Me.조명전력 + Me.환기전력) * Me.난방전력 * Result.E변환계수.전력
                     Catch ex As Exception
 
@@ -140,7 +140,7 @@
                     Me.난방LPG * Result.E변환계수.LPG + Me.난방지역 * Result.E변환계수.지역난방 + _
                     Me.난방전력 * Result.E변환계수.전력
                     Try
-                        Return R - (Result.생산E(0).태양광전력생산량 + Result.생산E(0).열병합전력생산량) / _
+                        Return R - (Result.생산E(0).태양광전력생산량 + Result.생산E(0).풍력전력생산량 + Result.생산E(0).열병합전력생산량) / _
                         (Me.난방전력 + Me.냉방전력 + Me.급탕전력 + Me.조명전력 + Me.환기전력) * Me.난방전력 * Result.E변환계수.전력
                     Catch ex As Exception
 
@@ -312,7 +312,7 @@
                 Me.냉방LPG * Result.E변환계수.LPG + Me.냉방지역난방열 * Result.E변환계수.지역난방 + _
                 Me.냉방지역냉방열 * Result.E변환계수.지역냉방 + Me.냉방전력 * Result.E변환계수.전력
                 Try
-                    Return R - (Result.생산E(0).태양광전력생산량 + Result.생산E(0).열병합전력생산량) / _
+                    Return R - (Result.생산E(0).태양광전력생산량 + Result.생산E(0).풍력전력생산량 + Result.생산E(0).열병합전력생산량) / _
                     (Me.난방전력 + Me.냉방전력 + Me.급탕전력 + Me.조명전력 + Me.환기전력) * Me.냉방전력 * Result.E변환계수.전력
                 Catch ex As Exception
 
@@ -488,7 +488,7 @@
                 '                My.Computer.FileSystem.WriteAllText(f, b.ToString, True)
                 '#End If
                 Try
-                    Return R - (Result.생산E(0).태양광전력생산량 + Result.생산E(0).열병합전력생산량) / _
+                    Return R - (Result.생산E(0).태양광전력생산량 + Result.생산E(0).풍력전력생산량 + Result.생산E(0).열병합전력생산량) / _
                     (Me.난방전력 + Me.냉방전력 + Me.급탕전력 + Me.조명전력 + Me.환기전력) * Me.급탕전력 * Result.E변환계수.전력
                 Catch ex As Exception
 
@@ -522,7 +522,7 @@
                       Me.급탕LPG * Result.E변환계수.지역난방 + Me.급탕지역 * Result.E변환계수.지역난방 + _
                       Me.급탕전력 * Result.E변환계수.전력
                     Try
-                        Return R - (Result.생산E(0).태양광전력생산량 + Result.생산E(0).열병합전력생산량) / _
+                        Return R - (Result.생산E(0).태양광전력생산량 + Result.생산E(0).풍력전력생산량 + Result.생산E(0).열병합전력생산량) / _
                         (Me.난방전력 + Me.냉방전력 + Me.급탕전력 + Me.조명전력 + Me.환기전력) * Me.급탕전력 * Result.E변환계수.전력
                     Catch ex As Exception
 
@@ -532,7 +532,7 @@
                     Me.급탕LPG * Result.E변환계수.LPG + Me.급탕지역 * Result.E변환계수.지역난방 + _
                     Me.급탕전력 * Result.E변환계수.전력
                     Try
-                        Return R - (Result.생산E(0).태양광전력생산량 + Result.생산E(0).열병합전력생산량) / _
+                        Return R - (Result.생산E(0).태양광전력생산량 + Result.생산E(0).풍력전력생산량 + Result.생산E(0).열병합전력생산량) / _
                         (Me.난방전력 + Me.냉방전력 + Me.급탕전력 + Me.조명전력 + Me.환기전력) * Me.급탕전력 * Result.E변환계수.전력
                     Catch ex As Exception
 
@@ -700,7 +700,11 @@
                 Dim R As Decimal = 조명전력 * Result.E변환계수.전력
 
                 Try
-                    Return R - (Result.생산E(0).태양광전력생산량 + Result.생산E(0).열병합전력생산량) / _
+                    Dim a As Decimal = Result.생산E(0).태양광전력생산량
+                    Dim b As Decimal = Result.생산E(0).풍력전력생산량
+                    Dim c As Decimal = Result.생산E(0).열병합전력생산량
+                    Dim sumdata As Decimal = a + b + c
+                    Return R - (sumdata) / _
                     (Me.난방전력 + Me.냉방전력 + Me.급탕전력 + Me.조명전력 + Me.환기전력) * Me.조명전력 * Result.E변환계수.전력
                 Catch ex As Exception
 
@@ -742,7 +746,7 @@
             If MIdx = 0 Then
                 Dim R As Decimal = 환기전력 * Result.E변환계수.전력
                 Try
-                    Return R - (Result.생산E(0).태양광전력생산량 + Result.생산E(0).열병합전력생산량) / _
+                    Return R - (Result.생산E(0).태양광전력생산량 + Result.생산E(0).풍력전력생산량 + Result.생산E(0).열병합전력생산량) / _
                     (Me.난방전력 + Me.냉방전력 + Me.급탕전력 + Me.조명전력 + Me.환기전력) * Me.환기전력 * Result.E변환계수.전력
                 Catch ex As Exception
 

ArinWarev1/Calculator/Result/CCo2발생량.vb

@@ -13,7 +13,7 @@
             If MIdx = 0 Then   '//최종합계는 저람량을 제하지않는다?
                 Return Me.난방발생량 + Me.냉방발생량 + Me.급탕발생량 + Me.조명발생량 + Me.환기발생량
             Else
-                Return Me.난방발생량 + Me.냉방발생량 + Me.급탕발생량 + Me.조명발생량 + Me.환기발생량 - Me.저감량태양광 - Me.저감량열병합
+                Return Me.난방발생량 + Me.냉방발생량 + Me.급탕발생량 + Me.조명발생량 + Me.환기발생량 - Me.저감량태양광 - Me.저감량풍력 - Me.저감량열병합
             End If
         End Get
     End Property
@@ -29,7 +29,7 @@
             If MIdx = 0 Then
                 Dim R As Decimal = Me.난방등유 + Me.난방LNG + Me.난방LPG + Me.난방지역 + Me.난방전력
                 Try
-                    Return R - (Me.저감량열병합 + Me.저감량태양광) / (Me.난방전력 + Me.냉방전력 + Me.조명전력 + Me.환기전력 + Me.급탕전력) * Me.난방전력
+                    Return R - (Me.저감량열병합 + Me.저감량태양광 + Me.저감량풍력) / (Me.난방전력 + Me.냉방전력 + Me.조명전력 + Me.환기전력 + Me.급탕전력) * Me.난방전력
                 Catch ex As Exception
 
                 End Try
@@ -133,7 +133,7 @@
             Dim R As Decimal = Me.냉방등유 + Me.냉방LNG + Me.냉방LPG + Me.냉방지역난방열 + Me.냉방지역냉방열 + Me.냉방전력
             If MIdx = 0 Then
                 Try
-                    Return R - (Me.저감량열병합 + Me.저감량태양광) / (Me.난방전력 + Me.냉방전력 + Me.조명전력 + Me.환기전력 + Me.급탕전력) * Me.냉방전력
+                    Return R - (Me.저감량열병합 + Me.저감량태양광 + Me.저감량풍력) / (Me.난방전력 + Me.냉방전력 + Me.조명전력 + Me.환기전력 + Me.급탕전력) * Me.냉방전력
                 Catch ex As Exception
 
                 End Try
@@ -249,7 +249,7 @@
             If MIdx = 0 Then
                 Dim R As Decimal = Me.급탕등유 + Me.급탕LNG + Me.급탕LPG + Me.급탕지역 + Me.급탕전력
                 Try
-                    Return R - (Me.저감량열병합 + Me.저감량태양광) / (Me.난방전력 + Me.냉방전력 + Me.조명전력 + Me.환기전력 + Me.급탕전력) * Me.급탕전력
+                    Return R - (Me.저감량열병합 + Me.저감량태양광 + Me.저감량풍력) / (Me.난방전력 + Me.냉방전력 + Me.조명전력 + Me.환기전력 + Me.급탕전력) * Me.급탕전력
                 Catch ex As Exception
 
                 End Try
@@ -352,7 +352,7 @@
             If MIdx = 0 Then
                 Dim R As Decimal = Me.조명전력
                 Try
-                    Return R - (Me.저감량열병합 + Me.저감량태양광) / (Me.난방전력 + Me.냉방전력 + Me.조명전력 + Me.환기전력 + Me.급탕전력) * Me.조명전력
+                    Return R - (Me.저감량열병합 + Me.저감량태양광 + Me.저감량풍력) / (Me.난방전력 + Me.냉방전력 + Me.조명전력 + Me.환기전력 + Me.급탕전력) * Me.조명전력
                 Catch ex As Exception
 
                 End Try
@@ -390,7 +390,7 @@
             If MIdx = 0 Then
                 Dim R As Decimal = Me.환기전력
                 Try
-                    Return R - (Me.저감량열병합 + Me.저감량태양광) / (Me.난방전력 + Me.냉방전력 + Me.조명전력 + Me.환기전력 + Me.급탕전력) * Me.환기전력
+                    Return R - (Me.저감량열병합 + Me.저감량태양광 + Me.저감량풍력) / (Me.난방전력 + Me.냉방전력 + Me.조명전력 + Me.환기전력 + Me.급탕전력) * Me.환기전력
                 Catch ex As Exception
 
                 End Try
@@ -436,6 +436,20 @@
             End If
         End Get
     End Property
+    ReadOnly Property 저감량풍력() As Decimal
+        Get
+            If Me.MIdx = 0 Then
+                Dim Res As Decimal = 0
+                For i As Short = 1 To 12
+                    Res += Result.Co2발생량(i).저감량풍력
+                Next
+                Return Res
+            Else
+                Return Result.생산E(MIdx).풍력전력생산량 * Result.Co2배출계수.전력
+            End If
+        End Get
+    End Property
+
     ReadOnly Property 저감량열병합() As Decimal
         Get
             If Me.MIdx = 0 Then

ArinWarev1/Calculator/Result/C생산에너지.vb

@@ -100,6 +100,63 @@ Public Class C생산에너지
             End If
         End Set
     End Property
+    Property 풍력전력생산량() As Decimal
+        Get
+            Dim DR() As DSR.생산에너지Row = CType(DSETR.생산에너지.Select("mon='" & Mon & "'"), DSR.생산에너지Row())
+            If DR.GetUpperBound(0) = -1 Then
+                'MsgBox(ErrMsg)
+                Return 0
+            Else
+                If MIdx = 0 Then   '//0월이면 모든월의 합계를 반환한다.
+                    Dim Res As Decimal = 0
+                    For i As Short = 1 To 12
+                        Res += Result.생산E(i).풍력전력생산량
+                    Next
+                    Return Res
+                Else
+                    Return TOSG(DR(0)("전력풍력"))
+                End If
+            End If
+        End Get
+        Set(ByVal value As Decimal)
+            Dim DR() As DSR.생산에너지Row = CType(DSETR.생산에너지.Select("mon='" & Mon & "'"), DSR.생산에너지Row())
+            If DR.GetUpperBound(0) = -1 Then
+                MsgBox(ErrMsg)
+            Else
+                '    MsgBox("풍력기록(" & Mon & ")")
+                DR(0)("전력풍력") = value
+            End If
+        End Set
+    End Property
+    Property 풍력전력생산량_offsite() As Decimal
+        Get
+            Dim DR() As DSR.생산에너지Row = CType(DSETR.생산에너지.Select("mon='" & Mon & "'"), DSR.생산에너지Row())
+            If DR.GetUpperBound(0) = -1 Then
+                'MsgBox(ErrMsg)
+                Return 0
+            Else
+                If MIdx = 0 Then   '//0월이면 모든월의 합계를 반환한다.
+                    Dim Res As Decimal = 0
+                    For i As Short = 1 To 12
+                        Res += Result.생산E(i).풍력전력생산량_offsite
+                    Next
+                    Return Res
+                Else
+                    Return TOSG(DR(0)("전력풍력offsite"))
+                End If
+            End If
+        End Get
+        Set(ByVal value As Decimal)
+            Dim DR() As DSR.생산에너지Row = CType(DSETR.생산에너지.Select("mon='" & Mon & "'"), DSR.생산에너지Row())
+            If DR.GetUpperBound(0) = -1 Then
+                MsgBox(ErrMsg)
+            Else
+                '    MsgBox("풍력기록(" & Mon & ")")
+                DR(0)("전력풍력offsite") = value
+            End If
+        End Set
+    End Property
+
     Property 열병합전력생산량() As Decimal
         Get
             Dim DR() As DSR.생산에너지Row = CType(DSETR.생산에너지.Select("mon='" & Mon & "'"), DSR.생산에너지Row())
@@ -241,6 +298,35 @@ Public Class C생산에너지
             End If
         End Set
     End Property
+    Property 수열생산량() As Decimal
+        Get
+            Dim DR() As DSR.생산에너지Row = CType(DSETR.생산에너지.Select("mon='" & Mon & "'"), DSR.생산에너지Row())
+            If DR.GetUpperBound(0) = -1 Then
+                'MsgBox(ErrMsg)
+                Return 0
+            Else
+                If MIdx = 0 Then   '//0월이면 모든월의 합계를 반환한다.
+                    Dim Res As Decimal = 0
+                    For i As Short = 1 To 12
+                        Res += Result.생산E(i).수열생산량
+                    Next
+                    Return Res
+                Else
+                    Return TOSG(DR(0)("생산량수열"))
+
+                End If
+
+            End If
+        End Get
+        Set(ByVal value As Decimal)
+            Dim DR() As DSR.생산에너지Row = CType(DSETR.생산에너지.Select("mon='" & Mon & "'"), DSR.생산에너지Row())
+            If DR.GetUpperBound(0) = -1 Then
+                MsgBox(ErrMsg)
+            Else
+                DR(0)("생산량수열") = value
+            End If
+        End Set
+    End Property
     Property 면적당생산량태양열() As Decimal
         Get
             Dim DR() As DSR.생산에너지Row = CType(DSETR.생산에너지.Select("mon='" & Mon & "'"), DSR.생산에너지Row())
@@ -269,6 +355,34 @@ Public Class C생산에너지
             End If
         End Set
     End Property
+    Property 면적당생산량수열() As Decimal
+        Get
+            Dim DR() As DSR.생산에너지Row = CType(DSETR.생산에너지.Select("mon='" & Mon & "'"), DSR.생산에너지Row())
+            If DR.GetUpperBound(0) = -1 Then
+                'MsgBox(ErrMsg)
+                Return 0
+            Else
+                If MIdx = 0 Then   '//0월이면 모든월의 합계를 반환한다.
+                    Dim Res As Decimal = 0
+                    For i As Short = 1 To 12
+                        Res += Result.생산E(i).면적당생산량수열
+                    Next
+                    Return Res
+                Else
+                    Return TOSG(DR(0)("면적당생산량수열"))
+                End If
+            End If
+        End Get
+        Set(ByVal value As Decimal)
+            Dim DR() As DSR.생산에너지Row = CType(DSETR.생산에너지.Select("mon='" & Mon & "'"), DSR.생산에너지Row())
+            If DR.GetUpperBound(0) = -1 Then
+                MsgBox(ErrMsg)
+            Else
+                DR(0)("면적당생산량수열") = value
+            End If
+        End Set
+    End Property
+
     Property 면적당생산량지열() As Decimal
         Get
             Dim DR() As DSR.생산에너지Row = CType(DSETR.생산에너지.Select("mon='" & Mon & "'"), DSR.생산에너지Row())
@@ -296,5 +410,6 @@ Public Class C생산에너지
             End If
         End Set
     End Property
+
 End Class
 

ArinWarev1/Calculator/Result/C에너지소요량.vb

@@ -67,11 +67,11 @@
         Me.급탕보조 = I60
 
         If (I4 + I5 + I6 + I7 + I8 <> 0) Then
-            Me.난방S = IH - (Result.생산E(0).태양광전력생산량 + Result.생산E(0).열병합전력생산량) / (I4 + I5 + I6 + I7 + I8) * I4
+            Me.난방S = IH - (Result.생산E(0).태양광전력생산량 + Result.생산E(0).풍력전력생산량 + Result.생산E(0).열병합전력생산량) / (I4 + I5 + I6 + I7 + I8) * I4
-            Me.냉방S = IC - (Result.생산E(0).태양광전력생산량 + Result.생산E(0).열병합전력생산량) / (I4 + I5 + I6 + I7 + I8) * I5
+            Me.냉방S = IC - (Result.생산E(0).태양광전력생산량 + Result.생산E(0).풍력전력생산량 + Result.생산E(0).열병합전력생산량) / (I4 + I5 + I6 + I7 + I8) * I5
-            Me.조명S = IL - (Result.생산E(0).태양광전력생산량 + Result.생산E(0).열병합전력생산량) / (I4 + I5 + I6 + I7 + I8) * I6
+            Me.조명S = IL - (Result.생산E(0).태양광전력생산량 + Result.생산E(0).풍력전력생산량 + Result.생산E(0).열병합전력생산량) / (I4 + I5 + I6 + I7 + I8) * I6
-            Me.급탕S = IW - (Result.생산E(0).태양광전력생산량 + Result.생산E(0).열병합전력생산량) / (I4 + I5 + I6 + I7 + I8) * I7
+            Me.급탕S = IW - (Result.생산E(0).태양광전력생산량 + Result.생산E(0).풍력전력생산량 + Result.생산E(0).열병합전력생산량) / (I4 + I5 + I6 + I7 + I8) * I7
-            Me.환기S = IV - (Result.생산E(0).태양광전력생산량 + Result.생산E(0).열병합전력생산량) / (I4 + I5 + I6 + I7 + I8) * I8
+            Me.환기S = IV - (Result.생산E(0).태양광전력생산량 + Result.생산E(0).풍력전력생산량 + Result.생산E(0).열병합전력생산량) / (I4 + I5 + I6 + I7 + I8) * I8
         End If
         
     End Sub

ArinWarev1/DataSet/DS.xsd

@@ -1386,7 +1386,7 @@ SELECT code, name FROM weather_group WHERE (code = @code) ORDER BY code</Command
   <xs:element name="DS" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DS" msprop:Generator_UserDSName="DS">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="tbl_pic" msprop:Generator_TableClassName="tbl_picDataTable" msprop:Generator_TableVarName="tabletbl_pic" msprop:Generator_TablePropName="tbl_pic" msprop:Generator_RowDeletingName="tbl_picRowDeleting" msprop:Generator_RowChangingName="tbl_picRowChanging" msprop:Generator_RowEvHandlerName="tbl_picRowChangeEventHandler" msprop:Generator_RowDeletedName="tbl_picRowDeleted" msprop:Generator_UserTableName="tbl_pic" msprop:Generator_RowChangedName="tbl_picRowChanged" msprop:Generator_RowEvArgName="tbl_picRowChangeEvent" msprop:Generator_RowClassName="tbl_picRow">
+        <xs:element name="tbl_pic" msprop:Generator_TableClassName="tbl_picDataTable" msprop:Generator_TableVarName="tabletbl_pic" msprop:Generator_RowChangedName="tbl_picRowChanged" msprop:Generator_TablePropName="tbl_pic" msprop:Generator_RowDeletingName="tbl_picRowDeleting" msprop:Generator_RowChangingName="tbl_picRowChanging" msprop:Generator_RowEvHandlerName="tbl_picRowChangeEventHandler" msprop:Generator_RowDeletedName="tbl_picRowDeleted" msprop:Generator_RowClassName="tbl_picRow" msprop:Generator_UserTableName="tbl_pic" msprop:Generator_RowEvArgName="tbl_picRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="code" msprop:Generator_ColumnVarNameInTable="columncode" msprop:Generator_ColumnPropNameInRow="code" msprop:Generator_ColumnPropNameInTable="codeColumn" msprop:Generator_UserColumnName="code" type="xs:string" minOccurs="0" />
@@ -1394,7 +1394,7 @@ SELECT code, name FROM weather_group WHERE (code = @code) ORDER BY code</Command
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="tbl_nanbangkiki" msprop:Generator_TableClassName="tbl_nanbangkikiDataTable" msprop:Generator_TableVarName="tabletbl_nanbangkiki" msprop:Generator_TablePropName="tbl_nanbangkiki" msprop:Generator_RowDeletingName="tbl_nanbangkikiRowDeleting" msprop:Generator_RowChangingName="tbl_nanbangkikiRowChanging" msprop:Generator_RowEvHandlerName="tbl_nanbangkikiRowChangeEventHandler" msprop:Generator_RowDeletedName="tbl_nanbangkikiRowDeleted" msprop:Generator_UserTableName="tbl_nanbangkiki" msprop:Generator_RowChangedName="tbl_nanbangkikiRowChanged" msprop:Generator_RowEvArgName="tbl_nanbangkikiRowChangeEvent" msprop:Generator_RowClassName="tbl_nanbangkikiRow">
+        <xs:element name="tbl_nanbangkiki" msprop:Generator_TableClassName="tbl_nanbangkikiDataTable" msprop:Generator_TableVarName="tabletbl_nanbangkiki" msprop:Generator_RowChangedName="tbl_nanbangkikiRowChanged" msprop:Generator_TablePropName="tbl_nanbangkiki" msprop:Generator_RowDeletingName="tbl_nanbangkikiRowDeleting" msprop:Generator_RowChangingName="tbl_nanbangkikiRowChanging" msprop:Generator_RowEvHandlerName="tbl_nanbangkikiRowChangeEventHandler" msprop:Generator_RowDeletedName="tbl_nanbangkikiRowDeleted" msprop:Generator_RowClassName="tbl_nanbangkikiRow" msprop:Generator_UserTableName="tbl_nanbangkiki" msprop:Generator_RowEvArgName="tbl_nanbangkikiRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="code" msprop:Generator_ColumnVarNameInTable="columncode" msprop:Generator_ColumnPropNameInRow="code" msprop:Generator_ColumnPropNameInTable="codeColumn" msprop:Generator_UserColumnName="code">
@@ -1476,7 +1476,7 @@ SELECT code, name FROM weather_group WHERE (code = @code) ORDER BY code</Command
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="tbl_nangbangkiki" msprop:Generator_TableClassName="tbl_nangbangkikiDataTable" msprop:Generator_TableVarName="tabletbl_nangbangkiki" msprop:Generator_TablePropName="tbl_nangbangkiki" msprop:Generator_RowDeletingName="tbl_nangbangkikiRowDeleting" msprop:Generator_RowChangingName="tbl_nangbangkikiRowChanging" msprop:Generator_RowEvHandlerName="tbl_nangbangkikiRowChangeEventHandler" msprop:Generator_RowDeletedName="tbl_nangbangkikiRowDeleted" msprop:Generator_UserTableName="tbl_nangbangkiki" msprop:Generator_RowChangedName="tbl_nangbangkikiRowChanged" msprop:Generator_RowEvArgName="tbl_nangbangkikiRowChangeEvent" msprop:Generator_RowClassName="tbl_nangbangkikiRow">
+        <xs:element name="tbl_nangbangkiki" msprop:Generator_TableClassName="tbl_nangbangkikiDataTable" msprop:Generator_TableVarName="tabletbl_nangbangkiki" msprop:Generator_RowChangedName="tbl_nangbangkikiRowChanged" msprop:Generator_TablePropName="tbl_nangbangkiki" msprop:Generator_RowDeletingName="tbl_nangbangkikiRowDeleting" msprop:Generator_RowChangingName="tbl_nangbangkikiRowChanging" msprop:Generator_RowEvHandlerName="tbl_nangbangkikiRowChangeEventHandler" msprop:Generator_RowDeletedName="tbl_nangbangkikiRowDeleted" msprop:Generator_RowClassName="tbl_nangbangkikiRow" msprop:Generator_UserTableName="tbl_nangbangkiki" msprop:Generator_RowEvArgName="tbl_nangbangkikiRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="code" msprop:Generator_ColumnVarNameInTable="columncode" msprop:Generator_ColumnPropNameInRow="code" msprop:Generator_ColumnPropNameInTable="codeColumn" msprop:Generator_UserColumnName="code">
@@ -1539,7 +1539,7 @@ SELECT code, name FROM weather_group WHERE (code = @code) ORDER BY code</Command
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="tbl_bunbae" msprop:Generator_TableClassName="tbl_bunbaeDataTable" msprop:Generator_TableVarName="tabletbl_bunbae" msprop:Generator_TablePropName="tbl_bunbae" msprop:Generator_RowDeletingName="tbl_bunbaeRowDeleting" msprop:Generator_RowChangingName="tbl_bunbaeRowChanging" msprop:Generator_RowEvHandlerName="tbl_bunbaeRowChangeEventHandler" msprop:Generator_RowDeletedName="tbl_bunbaeRowDeleted" msprop:Generator_UserTableName="tbl_bunbae" msprop:Generator_RowChangedName="tbl_bunbaeRowChanged" msprop:Generator_RowEvArgName="tbl_bunbaeRowChangeEvent" msprop:Generator_RowClassName="tbl_bunbaeRow">
+        <xs:element name="tbl_bunbae" msprop:Generator_TableClassName="tbl_bunbaeDataTable" msprop:Generator_TableVarName="tabletbl_bunbae" msprop:Generator_RowChangedName="tbl_bunbaeRowChanged" msprop:Generator_TablePropName="tbl_bunbae" msprop:Generator_RowDeletingName="tbl_bunbaeRowDeleting" msprop:Generator_RowChangingName="tbl_bunbaeRowChanging" msprop:Generator_RowEvHandlerName="tbl_bunbaeRowChangeEventHandler" msprop:Generator_RowDeletedName="tbl_bunbaeRowDeleted" msprop:Generator_RowClassName="tbl_bunbaeRow" msprop:Generator_UserTableName="tbl_bunbae" msprop:Generator_RowEvArgName="tbl_bunbaeRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="code" msprop:Generator_ColumnVarNameInTable="columncode" msprop:Generator_ColumnPropNameInRow="code" msprop:Generator_ColumnPropNameInTable="codeColumn" msprop:Generator_UserColumnName="code">
@@ -1584,7 +1584,7 @@ SELECT code, name FROM weather_group WHERE (code = @code) ORDER BY code</Command
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="tbl_new" msprop:Generator_TableClassName="tbl_newDataTable" msprop:Generator_TableVarName="tabletbl_new" msprop:Generator_TablePropName="tbl_new" msprop:Generator_RowDeletingName="tbl_newRowDeleting" msprop:Generator_RowChangingName="tbl_newRowChanging" msprop:Generator_RowEvHandlerName="tbl_newRowChangeEventHandler" msprop:Generator_RowDeletedName="tbl_newRowDeleted" msprop:Generator_UserTableName="tbl_new" msprop:Generator_RowChangedName="tbl_newRowChanged" msprop:Generator_RowEvArgName="tbl_newRowChangeEvent" msprop:Generator_RowClassName="tbl_newRow">
+        <xs:element name="tbl_new" msprop:Generator_TableClassName="tbl_newDataTable" msprop:Generator_TableVarName="tabletbl_new" msprop:Generator_RowChangedName="tbl_newRowChanged" msprop:Generator_TablePropName="tbl_new" msprop:Generator_RowDeletingName="tbl_newRowDeleting" msprop:Generator_RowChangingName="tbl_newRowChanging" msprop:Generator_RowEvHandlerName="tbl_newRowChangeEventHandler" msprop:Generator_RowDeletedName="tbl_newRowDeleted" msprop:Generator_RowClassName="tbl_newRow" msprop:Generator_UserTableName="tbl_new" msprop:Generator_RowEvArgName="tbl_newRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="code" msprop:Generator_ColumnVarNameInTable="columncode" msprop:Generator_ColumnPropNameInRow="code" msprop:Generator_ColumnPropNameInTable="codeColumn" msprop:Generator_UserColumnName="code">
@@ -1636,10 +1636,24 @@ SELECT code, name FROM weather_group WHERE (code = @code) ORDER BY code</Command
               <xs:element name="열병합신재생여부" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="열병합신재생여부" msprop:Generator_ColumnVarNameInTable="column열병합신재생여부" msprop:Generator_ColumnPropNameInTable="열병합신재생여부Column" msprop:Generator_UserColumnName="열병합신재생여부" type="xs:boolean" default="false" minOccurs="0" />
               <xs:element name="태양광용량" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="태양광용량" msprop:Generator_ColumnVarNameInTable="column태양광용량" msprop:Generator_ColumnPropNameInTable="태양광용량Column" msprop:Generator_UserColumnName="태양광용량" type="xs:string" default="0" minOccurs="0" />
               <xs:element name="대지외설치여부" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="대지외설치여부" msprop:Generator_ColumnVarNameInTable="column대지외설치여부" msprop:Generator_ColumnPropNameInTable="대지외설치여부Column" msprop:Generator_UserColumnName="대지외설치여부" type="xs:boolean" minOccurs="0" />
+              <xs:element name="풍력로우터회전면적" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="풍력로우터회전면적" msprop:Generator_ColumnVarNameInTable="column풍력로우터회전면적" msprop:Generator_ColumnPropNameInTable="풍력로우터회전면적Column" msprop:Generator_UserColumnName="풍력로우터회전면적" type="xs:string" minOccurs="0" />
+              <xs:element name="풍력허브높이" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="풍력허브높이" msprop:Generator_ColumnVarNameInTable="column풍력허브높이" msprop:Generator_ColumnPropNameInTable="풍력허브높이Column" msprop:Generator_UserColumnName="풍력허브높이" type="xs:string" minOccurs="0" />
+              <xs:element name="수열_수열원" msprop:nullValue="하천수" msprop:Generator_ColumnPropNameInRow="수열_수열원" msprop:Generator_ColumnVarNameInTable="column수열_수열원" msprop:Generator_ColumnPropNameInTable="수열_수열원Column" msprop:Generator_UserColumnName="수열_수열원" type="xs:string" default="하천수" minOccurs="0" />
+              <xs:element name="수열_수열히트펌프용량" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="수열_수열히트펌프용량" msprop:Generator_ColumnVarNameInTable="column수열_수열히트펌프용량" msprop:Generator_ColumnPropNameInTable="수열_수열히트펌프용량Column" msprop:Generator_UserColumnName="수열_수열히트펌프용량" type="xs:string" minOccurs="0" />
+              <xs:element name="수열_열성능비_난방5도" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="수열_열성능비_난방5도" msprop:Generator_ColumnVarNameInTable="column수열_열성능비_난방5도" msprop:Generator_ColumnPropNameInTable="수열_열성능비_난방5도Column" msprop:Generator_UserColumnName="수열_열성능비_난방5도" type="xs:string" minOccurs="0" />
+              <xs:element name="수열_열성능비_난방15도" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="수열_열성능비_난방15도" msprop:Generator_ColumnVarNameInTable="column수열_열성능비_난방15도" msprop:Generator_ColumnPropNameInTable="수열_열성능비_난방15도Column" msprop:Generator_UserColumnName="수열_열성능비_난방15도" type="xs:string" minOccurs="0" />
+              <xs:element name="수열_1차펌프동력" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="수열_1차펌프동력" msprop:Generator_ColumnVarNameInTable="column수열_1차펌프동력" msprop:Generator_ColumnPropNameInTable="수열_1차펌프동력Column" msprop:Generator_UserColumnName="수열_1차펌프동력" type="xs:string" minOccurs="0" />
+              <xs:element name="수열_2차펌프동력" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="수열_2차펌프동력" msprop:Generator_ColumnVarNameInTable="column수열_2차펌프동력" msprop:Generator_ColumnPropNameInTable="수열_2차펌프동력Column" msprop:Generator_UserColumnName="수열_2차펌프동력" type="xs:string" minOccurs="0" />
+              <xs:element name="수열_열교환기설치여부" msprop:nullValue="예" msprop:Generator_ColumnPropNameInRow="수열_열교환기설치여부" msprop:Generator_ColumnVarNameInTable="column수열_열교환기설치여부" msprop:Generator_ColumnPropNameInTable="수열_열교환기설치여부Column" msprop:Generator_UserColumnName="수열_열교환기설치여부" type="xs:string" default="예" minOccurs="0" />
+              <xs:element name="수열_수열팽창탱크설치여부" msprop:nullValue="예" msprop:Generator_ColumnPropNameInRow="수열_수열팽창탱크설치여부" msprop:Generator_ColumnVarNameInTable="column수열_수열팽창탱크설치여부" msprop:Generator_ColumnPropNameInTable="수열_수열팽창탱크설치여부Column" msprop:Generator_UserColumnName="수열_수열팽창탱크설치여부" type="xs:string" default="예" minOccurs="0" />
+              <xs:element name="수열_수열팽창탱크체적" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="수열_수열팽창탱크체적" msprop:Generator_ColumnVarNameInTable="column수열_수열팽창탱크체적" msprop:Generator_ColumnPropNameInTable="수열_수열팽창탱크체적Column" msprop:Generator_UserColumnName="수열_수열팽창탱크체적" type="xs:string" minOccurs="0" />
+              <xs:element name="수열_열성능비_냉방25도" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="수열_열성능비_냉방25도" msprop:Generator_ColumnVarNameInTable="column수열_열성능비_냉방25도" msprop:Generator_ColumnPropNameInTable="수열_열성능비_냉방25도Column" msprop:Generator_UserColumnName="수열_열성능비_냉방25도" type="xs:string" minOccurs="0" />
+              <xs:element name="수열_열성능비_냉방35도" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="수열_열성능비_냉방35도" msprop:Generator_ColumnVarNameInTable="column수열_열성능비_냉방35도" msprop:Generator_ColumnPropNameInTable="수열_열성능비_냉방35도Column" msprop:Generator_UserColumnName="수열_열성능비_냉방35도" type="xs:string" minOccurs="0" />
+              <xs:element name="대지외설치여부_풍력" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="대지외설치여부_풍력" msprop:Generator_ColumnVarNameInTable="column대지외설치여부_풍력" msprop:Generator_ColumnPropNameInTable="대지외설치여부_풍력Column" msprop:Generator_UserColumnName="대지외설치여부_풍력" type="xs:boolean" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="tbl_myoun" msprop:Generator_TableClassName="tbl_myounDataTable" msprop:Generator_TableVarName="tabletbl_myoun" msprop:Generator_TablePropName="tbl_myoun" msprop:Generator_RowDeletingName="tbl_myounRowDeleting" msprop:Generator_RowChangingName="tbl_myounRowChanging" msprop:Generator_RowEvHandlerName="tbl_myounRowChangeEventHandler" msprop:Generator_RowDeletedName="tbl_myounRowDeleted" msprop:Generator_UserTableName="tbl_myoun" msprop:Generator_RowChangedName="tbl_myounRowChanged" msprop:Generator_RowEvArgName="tbl_myounRowChangeEvent" msprop:Generator_RowClassName="tbl_myounRow">
+        <xs:element name="tbl_myoun" msprop:Generator_TableClassName="tbl_myounDataTable" msprop:Generator_TableVarName="tabletbl_myoun" msprop:Generator_RowChangedName="tbl_myounRowChanged" msprop:Generator_TablePropName="tbl_myoun" msprop:Generator_RowDeletingName="tbl_myounRowDeleting" msprop:Generator_RowChangingName="tbl_myounRowChanging" msprop:Generator_RowEvHandlerName="tbl_myounRowChangeEventHandler" msprop:Generator_RowDeletedName="tbl_myounRowDeleted" msprop:Generator_RowClassName="tbl_myounRow" msprop:Generator_UserTableName="tbl_myoun" msprop:Generator_RowEvArgName="tbl_myounRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="code" msprop:Generator_ColumnVarNameInTable="columncode" msprop:Generator_ColumnPropNameInRow="code" msprop:Generator_ColumnPropNameInTable="codeColumn" msprop:Generator_UserColumnName="code" default="">
@@ -1682,7 +1696,7 @@ SELECT code, name FROM weather_group WHERE (code = @code) ORDER BY code</Command
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="tbl_buha" msprop:Generator_TableClassName="tbl_buhaDataTable" msprop:Generator_TableVarName="tabletbl_buha" msprop:Generator_TablePropName="tbl_buha" msprop:Generator_RowDeletingName="tbl_buhaRowDeleting" msprop:Generator_RowChangingName="tbl_buhaRowChanging" msprop:Generator_RowEvHandlerName="tbl_buhaRowChangeEventHandler" msprop:Generator_RowDeletedName="tbl_buhaRowDeleted" msprop:Generator_UserTableName="tbl_buha" msprop:Generator_RowChangedName="tbl_buhaRowChanged" msprop:Generator_RowEvArgName="tbl_buhaRowChangeEvent" msprop:Generator_RowClassName="tbl_buhaRow">
+        <xs:element name="tbl_buha" msprop:Generator_TableClassName="tbl_buhaDataTable" msprop:Generator_TableVarName="tabletbl_buha" msprop:Generator_RowChangedName="tbl_buhaRowChanged" msprop:Generator_TablePropName="tbl_buha" msprop:Generator_RowDeletingName="tbl_buhaRowDeleting" msprop:Generator_RowChangingName="tbl_buhaRowChanging" msprop:Generator_RowEvHandlerName="tbl_buhaRowChangeEventHandler" msprop:Generator_RowDeletedName="tbl_buhaRowDeleted" msprop:Generator_RowClassName="tbl_buhaRow" msprop:Generator_UserTableName="tbl_buha" msprop:Generator_RowEvArgName="tbl_buhaRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="code" msprop:Generator_ColumnVarNameInTable="columncode" msprop:Generator_ColumnPropNameInRow="code" msprop:Generator_ColumnPropNameInTable="codeColumn" msprop:Generator_UserColumnName="code" type="xs:string" default="" />
@@ -1700,7 +1714,7 @@ SELECT code, name FROM weather_group WHERE (code = @code) ORDER BY code</Command
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="tbl_nbunbae" msprop:Generator_TableClassName="tbl_nbunbaeDataTable" msprop:Generator_TableVarName="tabletbl_nbunbae" msprop:Generator_TablePropName="tbl_nbunbae" msprop:Generator_RowDeletingName="tbl_nbunbaeRowDeleting" msprop:Generator_RowChangingName="tbl_nbunbaeRowChanging" msprop:Generator_RowEvHandlerName="tbl_nbunbaeRowChangeEventHandler" msprop:Generator_RowDeletedName="tbl_nbunbaeRowDeleted" msprop:Generator_UserTableName="tbl_nbunbae" msprop:Generator_RowChangedName="tbl_nbunbaeRowChanged" msprop:Generator_RowEvArgName="tbl_nbunbaeRowChangeEvent" msprop:Generator_RowClassName="tbl_nbunbaeRow">
+        <xs:element name="tbl_nbunbae" msprop:Generator_TableClassName="tbl_nbunbaeDataTable" msprop:Generator_TableVarName="tabletbl_nbunbae" msprop:Generator_RowChangedName="tbl_nbunbaeRowChanged" msprop:Generator_TablePropName="tbl_nbunbae" msprop:Generator_RowDeletingName="tbl_nbunbaeRowDeleting" msprop:Generator_RowChangingName="tbl_nbunbaeRowChanging" msprop:Generator_RowEvHandlerName="tbl_nbunbaeRowChangeEventHandler" msprop:Generator_RowDeletedName="tbl_nbunbaeRowDeleted" msprop:Generator_RowClassName="tbl_nbunbaeRow" msprop:Generator_UserTableName="tbl_nbunbae" msprop:Generator_RowEvArgName="tbl_nbunbaeRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="code" msprop:Generator_ColumnVarNameInTable="columncode" msprop:Generator_ColumnPropNameInRow="code" msprop:Generator_ColumnPropNameInTable="codeColumn" msprop:Generator_UserColumnName="code" type="xs:string" default="" />
@@ -1720,7 +1734,7 @@ SELECT code, name FROM weather_group WHERE (code = @code) ORDER BY code</Command
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="weather_cha" msprop:Generator_TableClassName="weather_chaDataTable" msprop:Generator_TableVarName="tableweather_cha" msprop:Generator_TablePropName="weather_cha" msprop:Generator_RowDeletingName="weather_chaRowDeleting" msprop:Generator_RowChangingName="weather_chaRowChanging" msprop:Generator_RowEvHandlerName="weather_chaRowChangeEventHandler" msprop:Generator_RowDeletedName="weather_chaRowDeleted" msprop:Generator_UserTableName="weather_cha" msprop:Generator_RowChangedName="weather_chaRowChanged" msprop:Generator_RowEvArgName="weather_chaRowChangeEvent" msprop:Generator_RowClassName="weather_chaRow">
+        <xs:element name="weather_cha" msprop:Generator_TableClassName="weather_chaDataTable" msprop:Generator_TableVarName="tableweather_cha" msprop:Generator_RowChangedName="weather_chaRowChanged" msprop:Generator_TablePropName="weather_cha" msprop:Generator_RowDeletingName="weather_chaRowDeleting" msprop:Generator_RowChangingName="weather_chaRowChanging" msprop:Generator_RowEvHandlerName="weather_chaRowChangeEventHandler" msprop:Generator_RowDeletedName="weather_chaRowDeleted" msprop:Generator_RowClassName="weather_chaRow" msprop:Generator_UserTableName="weather_cha" msprop:Generator_RowEvArgName="weather_chaRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="pcode" msprop:nullValue="" msprop:Generator_ColumnPropNameInRow="pcode" msprop:Generator_ColumnVarNameInTable="columnpcode" msprop:Generator_ColumnPropNameInTable="pcodeColumn" msprop:Generator_UserColumnName="pcode" default="">
@@ -1831,7 +1845,7 @@ SELECT code, name FROM weather_group WHERE (code = @code) ORDER BY code</Command
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="weather_temp" msprop:Generator_TableClassName="weather_tempDataTable" msprop:Generator_TableVarName="tableweather_temp" msprop:Generator_TablePropName="weather_temp" msprop:Generator_RowDeletingName="weather_tempRowDeleting" msprop:Generator_RowChangingName="weather_tempRowChanging" msprop:Generator_RowEvHandlerName="weather_tempRowChangeEventHandler" msprop:Generator_RowDeletedName="weather_tempRowDeleted" msprop:Generator_UserTableName="weather_temp" msprop:Generator_RowChangedName="weather_tempRowChanged" msprop:Generator_RowEvArgName="weather_tempRowChangeEvent" msprop:Generator_RowClassName="weather_tempRow">
+        <xs:element name="weather_temp" msprop:Generator_TableClassName="weather_tempDataTable" msprop:Generator_TableVarName="tableweather_temp" msprop:Generator_RowChangedName="weather_tempRowChanged" msprop:Generator_TablePropName="weather_temp" msprop:Generator_RowDeletingName="weather_tempRowDeleting" msprop:Generator_RowChangingName="weather_tempRowChanging" msprop:Generator_RowEvHandlerName="weather_tempRowChangeEventHandler" msprop:Generator_RowDeletedName="weather_tempRowDeleted" msprop:Generator_RowClassName="weather_tempRow" msprop:Generator_UserTableName="weather_temp" msprop:Generator_RowEvArgName="weather_tempRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="pcode" msprop:nullValue="" msprop:Generator_ColumnPropNameInRow="pcode" msprop:Generator_ColumnVarNameInTable="columnpcode" msprop:Generator_ColumnPropNameInTable="pcodeColumn" msprop:Generator_UserColumnName="pcode" default="">
@@ -2026,7 +2040,7 @@ SELECT code, name FROM weather_group WHERE (code = @code) ORDER BY code</Command
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="tbl_kongjo" msprop:Generator_TableClassName="tbl_kongjoDataTable" msprop:Generator_TableVarName="tabletbl_kongjo" msprop:Generator_TablePropName="tbl_kongjo" msprop:Generator_RowDeletingName="tbl_kongjoRowDeleting" msprop:Generator_RowChangingName="tbl_kongjoRowChanging" msprop:Generator_RowEvHandlerName="tbl_kongjoRowChangeEventHandler" msprop:Generator_RowDeletedName="tbl_kongjoRowDeleted" msprop:Generator_UserTableName="tbl_kongjo" msprop:Generator_RowChangedName="tbl_kongjoRowChanged" msprop:Generator_RowEvArgName="tbl_kongjoRowChangeEvent" msprop:Generator_RowClassName="tbl_kongjoRow">
+        <xs:element name="tbl_kongjo" msprop:Generator_TableClassName="tbl_kongjoDataTable" msprop:Generator_TableVarName="tabletbl_kongjo" msprop:Generator_RowChangedName="tbl_kongjoRowChanged" msprop:Generator_TablePropName="tbl_kongjo" msprop:Generator_RowDeletingName="tbl_kongjoRowDeleting" msprop:Generator_RowChangingName="tbl_kongjoRowChanging" msprop:Generator_RowEvHandlerName="tbl_kongjoRowChangeEventHandler" msprop:Generator_RowDeletedName="tbl_kongjoRowDeleted" msprop:Generator_RowClassName="tbl_kongjoRow" msprop:Generator_UserTableName="tbl_kongjo" msprop:Generator_RowEvArgName="tbl_kongjoRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="code" msprop:Generator_ColumnVarNameInTable="columncode" msprop:Generator_ColumnPropNameInRow="code" msprop:Generator_ColumnPropNameInTable="codeColumn" msprop:Generator_UserColumnName="code">
@@ -2086,10 +2100,14 @@ SELECT code, name FROM weather_group WHERE (code = @code) ORDER BY code</Command
               <xs:element name="배기풍량" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="배기풍량" msprop:Generator_ColumnVarNameInTable="column배기풍량" msprop:Generator_ColumnPropNameInTable="배기풍량Column" msprop:Generator_UserColumnName="배기풍량" type="xs:string" default="" minOccurs="0" />
               <xs:element name="급기팬동력" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="급기팬동력" msprop:Generator_ColumnVarNameInTable="column급기팬동력" msprop:Generator_ColumnPropNameInTable="급기팬동력Column" msprop:Generator_UserColumnName="급기팬동력" type="xs:string" default="" minOccurs="0" />
               <xs:element name="배기팬동력" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="배기팬동력" msprop:Generator_ColumnVarNameInTable="column배기팬동력" msprop:Generator_ColumnPropNameInTable="배기팬동력Column" msprop:Generator_UserColumnName="배기팬동력" type="xs:string" default="" minOccurs="0" />
+              <xs:element name="공기식태양열적용" msprop:nullValue="아니오" msprop:Generator_ColumnPropNameInRow="공기식태양열적용" msprop:Generator_ColumnVarNameInTable="column공기식태양열적용" msprop:Generator_ColumnPropNameInTable="공기식태양열적용Column" msprop:Generator_UserColumnName="공기식태양열적용" type="xs:string" default="아니오" minOccurs="0" />
+              <xs:element name="집열기방위" msprop:nullValue="없음" msprop:Generator_ColumnPropNameInRow="집열기방위" msprop:Generator_ColumnVarNameInTable="column집열기방위" msprop:Generator_ColumnPropNameInTable="집열기방위Column" msprop:Generator_UserColumnName="집열기방위" type="xs:string" default="없음" minOccurs="0" />
+              <xs:element name="집열기면적" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="집열기면적" msprop:Generator_ColumnVarNameInTable="column집열기면적" msprop:Generator_ColumnPropNameInTable="집열기면적Column" msprop:Generator_UserColumnName="집열기면적" type="xs:string" minOccurs="0" />
+              <xs:element name="집열기방사율" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="집열기방사율" msprop:Generator_ColumnVarNameInTable="column집열기방사율" msprop:Generator_ColumnPropNameInTable="집열기방사율Column" msprop:Generator_UserColumnName="집열기방사율" type="xs:string" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="tbl_kongkub" msprop:Generator_TableClassName="tbl_kongkubDataTable" msprop:Generator_TableVarName="tabletbl_kongkub" msprop:Generator_TablePropName="tbl_kongkub" msprop:Generator_RowDeletingName="tbl_kongkubRowDeleting" msprop:Generator_RowChangingName="tbl_kongkubRowChanging" msprop:Generator_RowEvHandlerName="tbl_kongkubRowChangeEventHandler" msprop:Generator_RowDeletedName="tbl_kongkubRowDeleted" msprop:Generator_UserTableName="tbl_kongkub" msprop:Generator_RowChangedName="tbl_kongkubRowChanged" msprop:Generator_RowEvArgName="tbl_kongkubRowChangeEvent" msprop:Generator_RowClassName="tbl_kongkubRow">
+        <xs:element name="tbl_kongkub" msprop:Generator_TableClassName="tbl_kongkubDataTable" msprop:Generator_TableVarName="tabletbl_kongkub" msprop:Generator_RowChangedName="tbl_kongkubRowChanged" msprop:Generator_TablePropName="tbl_kongkub" msprop:Generator_RowDeletingName="tbl_kongkubRowDeleting" msprop:Generator_RowChangingName="tbl_kongkubRowChanging" msprop:Generator_RowEvHandlerName="tbl_kongkubRowChangeEventHandler" msprop:Generator_RowDeletedName="tbl_kongkubRowDeleted" msprop:Generator_RowClassName="tbl_kongkubRow" msprop:Generator_UserTableName="tbl_kongkub" msprop:Generator_RowEvArgName="tbl_kongkubRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="code" msprop:Generator_ColumnVarNameInTable="columncode" msprop:Generator_ColumnPropNameInRow="code" msprop:Generator_ColumnPropNameInTable="codeColumn" msprop:Generator_UserColumnName="code">
@@ -2146,7 +2164,7 @@ SELECT code, name FROM weather_group WHERE (code = @code) ORDER BY code</Command
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="tbl_yk" msprop:Generator_TableClassName="tbl_ykDataTable" msprop:Generator_TableVarName="tabletbl_yk" msprop:Generator_TablePropName="tbl_yk" msprop:Generator_RowDeletingName="tbl_ykRowDeleting" msprop:Generator_RowChangingName="tbl_ykRowChanging" msprop:Generator_RowEvHandlerName="tbl_ykRowChangeEventHandler" msprop:Generator_RowDeletedName="tbl_ykRowDeleted" msprop:Generator_UserTableName="tbl_yk" msprop:Generator_RowChangedName="tbl_ykRowChanged" msprop:Generator_RowEvArgName="tbl_ykRowChangeEvent" msprop:Generator_RowClassName="tbl_ykRow">
+        <xs:element name="tbl_yk" msprop:Generator_TableClassName="tbl_ykDataTable" msprop:Generator_TableVarName="tabletbl_yk" msprop:Generator_RowChangedName="tbl_ykRowChanged" msprop:Generator_TablePropName="tbl_yk" msprop:Generator_RowDeletingName="tbl_ykRowDeleting" msprop:Generator_RowChangingName="tbl_ykRowChanging" msprop:Generator_RowEvHandlerName="tbl_ykRowChangeEventHandler" msprop:Generator_RowDeletedName="tbl_ykRowDeleted" msprop:Generator_RowClassName="tbl_ykRow" msprop:Generator_UserTableName="tbl_yk" msprop:Generator_RowEvArgName="tbl_ykRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="code" msprop:Generator_ColumnVarNameInTable="columncode" msprop:Generator_ColumnPropNameInRow="code" msprop:Generator_ColumnPropNameInTable="codeColumn" msprop:Generator_UserColumnName="code">
@@ -2169,7 +2187,7 @@ SELECT code, name FROM weather_group WHERE (code = @code) ORDER BY code</Command
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="tbl_ykdetail" msprop:Generator_TableClassName="tbl_ykdetailDataTable" msprop:Generator_TableVarName="tabletbl_ykdetail" msprop:Generator_TablePropName="tbl_ykdetail" msprop:Generator_RowDeletingName="tbl_ykdetailRowDeleting" msprop:Generator_RowChangingName="tbl_ykdetailRowChanging" msprop:Generator_RowEvHandlerName="tbl_ykdetailRowChangeEventHandler" msprop:Generator_RowDeletedName="tbl_ykdetailRowDeleted" msprop:Generator_UserTableName="tbl_ykdetail" msprop:Generator_RowChangedName="tbl_ykdetailRowChanged" msprop:Generator_RowEvArgName="tbl_ykdetailRowChangeEvent" msprop:Generator_RowClassName="tbl_ykdetailRow">
+        <xs:element name="tbl_ykdetail" msprop:Generator_TableClassName="tbl_ykdetailDataTable" msprop:Generator_TableVarName="tabletbl_ykdetail" msprop:Generator_RowChangedName="tbl_ykdetailRowChanged" msprop:Generator_TablePropName="tbl_ykdetail" msprop:Generator_RowDeletingName="tbl_ykdetailRowDeleting" msprop:Generator_RowChangingName="tbl_ykdetailRowChanging" msprop:Generator_RowEvHandlerName="tbl_ykdetailRowChangeEventHandler" msprop:Generator_RowDeletedName="tbl_ykdetailRowDeleted" msprop:Generator_RowClassName="tbl_ykdetailRow" msprop:Generator_UserTableName="tbl_ykdetail" msprop:Generator_RowEvArgName="tbl_ykdetailRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="pcode" msprop:nullValue="" msprop:Generator_ColumnPropNameInRow="pcode" msprop:Generator_ColumnVarNameInTable="columnpcode" msprop:Generator_ColumnPropNameInTable="pcodeColumn" msprop:Generator_UserColumnName="pcode" default="">
@@ -2203,7 +2221,7 @@ SELECT code, name FROM weather_group WHERE (code = @code) ORDER BY code</Command
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="tbl_weather" msprop:Generator_TableClassName="tbl_weatherDataTable" msprop:Generator_TableVarName="tabletbl_weather" msprop:Generator_TablePropName="tbl_weather" msprop:Generator_RowDeletingName="tbl_weatherRowDeleting" msprop:Generator_RowChangingName="tbl_weatherRowChanging" msprop:Generator_RowEvHandlerName="tbl_weatherRowChangeEventHandler" msprop:Generator_RowDeletedName="tbl_weatherRowDeleted" msprop:Generator_UserTableName="tbl_weather" msprop:Generator_RowChangedName="tbl_weatherRowChanged" msprop:Generator_RowEvArgName="tbl_weatherRowChangeEvent" msprop:Generator_RowClassName="tbl_weatherRow">
+        <xs:element name="tbl_weather" msprop:Generator_TableClassName="tbl_weatherDataTable" msprop:Generator_TableVarName="tabletbl_weather" msprop:Generator_RowChangedName="tbl_weatherRowChanged" msprop:Generator_TablePropName="tbl_weather" msprop:Generator_RowDeletingName="tbl_weatherRowDeleting" msprop:Generator_RowChangingName="tbl_weatherRowChanging" msprop:Generator_RowEvHandlerName="tbl_weatherRowChangeEventHandler" msprop:Generator_RowDeletedName="tbl_weatherRowDeleted" msprop:Generator_RowClassName="tbl_weatherRow" msprop:Generator_UserTableName="tbl_weather" msprop:Generator_RowEvArgName="tbl_weatherRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="code" msprop:nullValue="" msprop:Generator_ColumnPropNameInRow="code" msprop:Generator_ColumnVarNameInTable="columncode" msprop:Generator_ColumnPropNameInTable="codeColumn" msprop:Generator_UserColumnName="code" default="">
@@ -2321,7 +2339,7 @@ SELECT code, name FROM weather_group WHERE (code = @code) ORDER BY code</Command
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="weather_ilsa" msprop:Generator_TableClassName="weather_ilsaDataTable" msprop:Generator_TableVarName="tableweather_ilsa" msprop:Generator_TablePropName="weather_ilsa" msprop:Generator_RowDeletingName="weather_ilsaRowDeleting" msprop:Generator_RowChangingName="weather_ilsaRowChanging" msprop:Generator_RowEvHandlerName="weather_ilsaRowChangeEventHandler" msprop:Generator_RowDeletedName="weather_ilsaRowDeleted" msprop:Generator_UserTableName="weather_ilsa" msprop:Generator_RowChangedName="weather_ilsaRowChanged" msprop:Generator_RowEvArgName="weather_ilsaRowChangeEvent" msprop:Generator_RowClassName="weather_ilsaRow">
+        <xs:element name="weather_ilsa" msprop:Generator_TableClassName="weather_ilsaDataTable" msprop:Generator_TableVarName="tableweather_ilsa" msprop:Generator_RowChangedName="weather_ilsaRowChanged" msprop:Generator_TablePropName="weather_ilsa" msprop:Generator_RowDeletingName="weather_ilsaRowDeleting" msprop:Generator_RowChangingName="weather_ilsaRowChanging" msprop:Generator_RowEvHandlerName="weather_ilsaRowChangeEventHandler" msprop:Generator_RowDeletedName="weather_ilsaRowDeleted" msprop:Generator_RowClassName="weather_ilsaRow" msprop:Generator_UserTableName="weather_ilsa" msprop:Generator_RowEvArgName="weather_ilsaRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="pcode" msprop:nullValue="" msprop:Generator_ColumnPropNameInRow="pcode" msprop:Generator_ColumnVarNameInTable="columnpcode" msprop:Generator_ColumnPropNameInTable="pcodeColumn" msprop:Generator_UserColumnName="pcode" default="">
@@ -2439,7 +2457,7 @@ SELECT code, name FROM weather_group WHERE (code = @code) ORDER BY code</Command
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="weather_supdo" msprop:Generator_TableClassName="weather_supdoDataTable" msprop:Generator_TableVarName="tableweather_supdo" msprop:Generator_TablePropName="weather_supdo" msprop:Generator_RowDeletingName="weather_supdoRowDeleting" msprop:Generator_RowChangingName="weather_supdoRowChanging" msprop:Generator_RowEvHandlerName="weather_supdoRowChangeEventHandler" msprop:Generator_RowDeletedName="weather_supdoRowDeleted" msprop:Generator_UserTableName="weather_supdo" msprop:Generator_RowChangedName="weather_supdoRowChanged" msprop:Generator_RowEvArgName="weather_supdoRowChangeEvent" msprop:Generator_RowClassName="weather_supdoRow">
+        <xs:element name="weather_supdo" msprop:Generator_TableClassName="weather_supdoDataTable" msprop:Generator_TableVarName="tableweather_supdo" msprop:Generator_RowChangedName="weather_supdoRowChanged" msprop:Generator_TablePropName="weather_supdo" msprop:Generator_RowDeletingName="weather_supdoRowDeleting" msprop:Generator_RowChangingName="weather_supdoRowChanging" msprop:Generator_RowEvHandlerName="weather_supdoRowChangeEventHandler" msprop:Generator_RowDeletedName="weather_supdoRowDeleted" msprop:Generator_RowClassName="weather_supdoRow" msprop:Generator_UserTableName="weather_supdo" msprop:Generator_RowEvArgName="weather_supdoRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="pcode" msprop:nullValue="" msprop:Generator_ColumnPropNameInRow="pcode" msprop:Generator_ColumnVarNameInTable="columnpcode" msprop:Generator_ColumnPropNameInTable="pcodeColumn" msprop:Generator_UserColumnName="pcode" default="">
@@ -2634,7 +2652,7 @@ SELECT code, name FROM weather_group WHERE (code = @code) ORDER BY code</Command
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="tbl_profile" msprop:Generator_TableClassName="tbl_profileDataTable" msprop:Generator_TableVarName="tabletbl_profile" msprop:Generator_TablePropName="tbl_profile" msprop:Generator_RowDeletingName="tbl_profileRowDeleting" msprop:Generator_RowChangingName="tbl_profileRowChanging" msprop:Generator_RowEvHandlerName="tbl_profileRowChangeEventHandler" msprop:Generator_RowDeletedName="tbl_profileRowDeleted" msprop:Generator_UserTableName="tbl_profile" msprop:Generator_RowChangedName="tbl_profileRowChanged" msprop:Generator_RowEvArgName="tbl_profileRowChangeEvent" msprop:Generator_RowClassName="tbl_profileRow">
+        <xs:element name="tbl_profile" msprop:Generator_TableClassName="tbl_profileDataTable" msprop:Generator_TableVarName="tabletbl_profile" msprop:Generator_RowChangedName="tbl_profileRowChanged" msprop:Generator_TablePropName="tbl_profile" msprop:Generator_RowDeletingName="tbl_profileRowDeleting" msprop:Generator_RowChangingName="tbl_profileRowChanging" msprop:Generator_RowEvHandlerName="tbl_profileRowChangeEventHandler" msprop:Generator_RowDeletedName="tbl_profileRowDeleted" msprop:Generator_RowClassName="tbl_profileRow" msprop:Generator_UserTableName="tbl_profile" msprop:Generator_RowEvArgName="tbl_profileRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="code" msprop:Generator_ColumnVarNameInTable="columncode" msprop:Generator_ColumnPropNameInRow="code" msprop:Generator_ColumnPropNameInTable="codeColumn" msprop:Generator_UserColumnName="code">
@@ -2969,7 +2987,7 @@ SELECT code, name FROM weather_group WHERE (code = @code) ORDER BY code</Command
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="tbl_zone" msprop:Generator_TableClassName="tbl_zoneDataTable" msprop:Generator_TableVarName="tabletbl_zone" msprop:Generator_TablePropName="tbl_zone" msprop:Generator_RowDeletingName="tbl_zoneRowDeleting" msprop:Generator_RowChangingName="tbl_zoneRowChanging" msprop:Generator_RowEvHandlerName="tbl_zoneRowChangeEventHandler" msprop:Generator_RowDeletedName="tbl_zoneRowDeleted" msprop:Generator_UserTableName="tbl_zone" msprop:Generator_RowChangedName="tbl_zoneRowChanged" msprop:Generator_RowEvArgName="tbl_zoneRowChangeEvent" msprop:Generator_RowClassName="tbl_zoneRow">
+        <xs:element name="tbl_zone" msprop:Generator_TableClassName="tbl_zoneDataTable" msprop:Generator_TableVarName="tabletbl_zone" msprop:Generator_RowChangedName="tbl_zoneRowChanged" msprop:Generator_TablePropName="tbl_zone" msprop:Generator_RowDeletingName="tbl_zoneRowDeleting" msprop:Generator_RowChangingName="tbl_zoneRowChanging" msprop:Generator_RowEvHandlerName="tbl_zoneRowChangeEventHandler" msprop:Generator_RowDeletedName="tbl_zoneRowDeleted" msprop:Generator_RowClassName="tbl_zoneRow" msprop:Generator_UserTableName="tbl_zone" msprop:Generator_RowEvArgName="tbl_zoneRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="code" msprop:Generator_ColumnVarNameInTable="columncode" msprop:Generator_ColumnPropNameInRow="code" msprop:Generator_ColumnPropNameInTable="codeColumn" msprop:Generator_UserColumnName="code">
@@ -3139,7 +3157,7 @@ SELECT code, name FROM weather_group WHERE (code = @code) ORDER BY code</Command
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="tbl_monuse" msprop:Generator_TableClassName="tbl_monuseDataTable" msprop:Generator_TableVarName="tabletbl_monuse" msprop:Generator_TablePropName="tbl_monuse" msprop:Generator_RowDeletingName="tbl_monuseRowDeleting" msprop:Generator_RowChangingName="tbl_monuseRowChanging" msprop:Generator_RowEvHandlerName="tbl_monuseRowChangeEventHandler" msprop:Generator_RowDeletedName="tbl_monuseRowDeleted" msprop:Generator_UserTableName="tbl_monuse" msprop:Generator_RowChangedName="tbl_monuseRowChanged" msprop:Generator_RowEvArgName="tbl_monuseRowChangeEvent" msprop:Generator_RowClassName="tbl_monuseRow">
+        <xs:element name="tbl_monuse" msprop:Generator_TableClassName="tbl_monuseDataTable" msprop:Generator_TableVarName="tabletbl_monuse" msprop:Generator_RowChangedName="tbl_monuseRowChanged" msprop:Generator_TablePropName="tbl_monuse" msprop:Generator_RowDeletingName="tbl_monuseRowDeleting" msprop:Generator_RowChangingName="tbl_monuseRowChanging" msprop:Generator_RowEvHandlerName="tbl_monuseRowChangeEventHandler" msprop:Generator_RowDeletedName="tbl_monuseRowDeleted" msprop:Generator_RowClassName="tbl_monuseRow" msprop:Generator_UserTableName="tbl_monuse" msprop:Generator_RowEvArgName="tbl_monuseRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="년" msprop:nullValue="" msprop:Generator_ColumnPropNameInRow="년" msprop:Generator_ColumnVarNameInTable="column년" msprop:Generator_ColumnPropNameInTable="년Column" msprop:Generator_UserColumnName="년" type="xs:string" default="" />
@@ -3151,7 +3169,7 @@ SELECT code, name FROM weather_group WHERE (code = @code) ORDER BY code</Command
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="tbl_common" msprop:Generator_TableClassName="tbl_commonDataTable" msprop:Generator_TableVarName="tabletbl_common" msprop:Generator_TablePropName="tbl_common" msprop:Generator_RowDeletingName="tbl_commonRowDeleting" msprop:Generator_RowChangingName="tbl_commonRowChanging" msprop:Generator_RowEvHandlerName="tbl_commonRowChangeEventHandler" msprop:Generator_RowDeletedName="tbl_commonRowDeleted" msprop:Generator_UserTableName="tbl_common" msprop:Generator_RowChangedName="tbl_commonRowChanged" msprop:Generator_RowEvArgName="tbl_commonRowChangeEvent" msprop:Generator_RowClassName="tbl_commonRow">
+        <xs:element name="tbl_common" msprop:Generator_TableClassName="tbl_commonDataTable" msprop:Generator_TableVarName="tabletbl_common" msprop:Generator_RowChangedName="tbl_commonRowChanged" msprop:Generator_TablePropName="tbl_common" msprop:Generator_RowDeletingName="tbl_commonRowDeleting" msprop:Generator_RowChangingName="tbl_commonRowChanging" msprop:Generator_RowEvHandlerName="tbl_commonRowChangeEventHandler" msprop:Generator_RowDeletedName="tbl_commonRowDeleted" msprop:Generator_RowClassName="tbl_commonRow" msprop:Generator_UserTableName="tbl_common" msprop:Generator_RowEvArgName="tbl_commonRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="gubun" msprop:nullValue="" msprop:Generator_ColumnPropNameInRow="gubun" msprop:Generator_ColumnVarNameInTable="columngubun" msprop:Generator_ColumnPropNameInTable="gubunColumn" msprop:Generator_UserColumnName="gubun" default="">
@@ -3180,7 +3198,7 @@ SELECT code, name FROM weather_group WHERE (code = @code) ORDER BY code</Command
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="tbl_Desc" msprop:Generator_TableClassName="tbl_DescDataTable" msprop:Generator_TableVarName="tabletbl_Desc" msprop:Generator_TablePropName="tbl_Desc" msprop:Generator_RowDeletingName="tbl_DescRowDeleting" msprop:Generator_RowChangingName="tbl_DescRowChanging" msprop:Generator_RowEvHandlerName="tbl_DescRowChangeEventHandler" msprop:Generator_RowDeletedName="tbl_DescRowDeleted" msprop:Generator_UserTableName="tbl_Desc" msprop:Generator_RowChangedName="tbl_DescRowChanged" msprop:Generator_RowEvArgName="tbl_DescRowChangeEvent" msprop:Generator_RowClassName="tbl_DescRow">
+        <xs:element name="tbl_Desc" msprop:Generator_TableClassName="tbl_DescDataTable" msprop:Generator_TableVarName="tabletbl_Desc" msprop:Generator_RowChangedName="tbl_DescRowChanged" msprop:Generator_TablePropName="tbl_Desc" msprop:Generator_RowDeletingName="tbl_DescRowDeleting" msprop:Generator_RowChangingName="tbl_DescRowChanging" msprop:Generator_RowEvHandlerName="tbl_DescRowChangeEventHandler" msprop:Generator_RowDeletedName="tbl_DescRowDeleted" msprop:Generator_RowClassName="tbl_DescRow" msprop:Generator_UserTableName="tbl_Desc" msprop:Generator_RowEvArgName="tbl_DescRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="cname" msprop:nullValue="" msprop:Generator_ColumnPropNameInRow="cname" msprop:Generator_ColumnVarNameInTable="columncname" msprop:Generator_ColumnPropNameInTable="cnameColumn" msprop:Generator_UserColumnName="cname" type="xs:string" default="" minOccurs="0" />
@@ -3219,7 +3237,7 @@ SELECT code, name FROM weather_group WHERE (code = @code) ORDER BY code</Command
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="weather_group" msprop:Generator_TableClassName="weather_groupDataTable" msprop:Generator_TableVarName="tableweather_group" msprop:Generator_RowChangedName="weather_groupRowChanged" msprop:Generator_TablePropName="weather_group" msprop:Generator_RowDeletingName="weather_groupRowDeleting" msprop:Generator_RowChangingName="weather_groupRowChanging" msprop:Generator_RowEvHandlerName="weather_groupRowChangeEventHandler" msprop:Generator_RowDeletedName="weather_groupRowDeleted" msprop:Generator_RowClassName="weather_groupRow" msprop:Generator_UserTableName="weather_group" msprop:Generator_RowEvArgName="weather_groupRowChangeEvent">
+        <xs:element name="weather_group" msprop:Generator_TableClassName="weather_groupDataTable" msprop:Generator_TableVarName="tableweather_group" msprop:Generator_TablePropName="weather_group" msprop:Generator_RowDeletingName="weather_groupRowDeleting" msprop:Generator_RowChangingName="weather_groupRowChanging" msprop:Generator_RowEvHandlerName="weather_groupRowChangeEventHandler" msprop:Generator_RowDeletedName="weather_groupRowDeleted" msprop:Generator_UserTableName="weather_group" msprop:Generator_RowChangedName="weather_groupRowChanged" msprop:Generator_RowEvArgName="weather_groupRowChangeEvent" msprop:Generator_RowClassName="weather_groupRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="code" msprop:Generator_ColumnVarNameInTable="columncode" msprop:Generator_ColumnPropNameInRow="code" msprop:Generator_ColumnPropNameInTable="codeColumn" msprop:Generator_UserColumnName="code">
@@ -3242,6 +3260,339 @@ SELECT code, name FROM weather_group WHERE (code = @code) ORDER BY code</Command
             </xs:sequence>
           </xs:complexType>
         </xs:element>
+        <xs:element name="weather_wind" msprop:Generator_TableClassName="weather_windDataTable" msprop:Generator_TableVarName="tableweather_wind" msprop:Generator_TablePropName="weather_wind" msprop:Generator_RowDeletingName="weather_windRowDeleting" msprop:Generator_RowChangingName="weather_windRowChanging" msprop:Generator_RowEvHandlerName="weather_windRowChangeEventHandler" msprop:Generator_RowDeletedName="weather_windRowDeleted" msprop:Generator_UserTableName="weather_wind" msprop:Generator_RowChangedName="weather_windRowChanged" msprop:Generator_RowEvArgName="weather_windRowChangeEvent" msprop:Generator_RowClassName="weather_windRow">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="pcode" msprop:nullValue="" msprop:Generator_ColumnPropNameInRow="pcode" msprop:Generator_ColumnVarNameInTable="columnpcode" msprop:Generator_ColumnPropNameInTable="pcodeColumn" msprop:Generator_UserColumnName="pcode" default="">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="10" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="code" msprop:nullValue="" msprop:Generator_ColumnPropNameInRow="code" msprop:Generator_ColumnVarNameInTable="columncode" msprop:Generator_ColumnPropNameInTable="codeColumn" msprop:Generator_UserColumnName="code" default="">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="10" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="설명" msprop:nullValue="" msprop:Generator_ColumnPropNameInRow="설명" msprop:Generator_ColumnVarNameInTable="column설명" msprop:Generator_ColumnPropNameInTable="설명Column" msprop:Generator_UserColumnName="설명" default="" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="255" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="m01" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="m01" msprop:Generator_ColumnVarNameInTable="columnm01" msprop:Generator_ColumnPropNameInTable="m01Column" msprop:Generator_UserColumnName="m01" default="0" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="m02" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="m02" msprop:Generator_ColumnVarNameInTable="columnm02" msprop:Generator_ColumnPropNameInTable="m02Column" msprop:Generator_UserColumnName="m02" default="0" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="m03" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="m03" msprop:Generator_ColumnVarNameInTable="columnm03" msprop:Generator_ColumnPropNameInTable="m03Column" msprop:Generator_UserColumnName="m03" default="0" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="m04" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="m04" msprop:Generator_ColumnVarNameInTable="columnm04" msprop:Generator_ColumnPropNameInTable="m04Column" msprop:Generator_UserColumnName="m04" default="0" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="m05" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="m05" msprop:Generator_ColumnVarNameInTable="columnm05" msprop:Generator_ColumnPropNameInTable="m05Column" msprop:Generator_UserColumnName="m05" default="0" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="m06" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="m06" msprop:Generator_ColumnVarNameInTable="columnm06" msprop:Generator_ColumnPropNameInTable="m06Column" msprop:Generator_UserColumnName="m06" default="0" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="m07" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="m07" msprop:Generator_ColumnVarNameInTable="columnm07" msprop:Generator_ColumnPropNameInTable="m07Column" msprop:Generator_UserColumnName="m07" default="0" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="m08" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="m08" msprop:Generator_ColumnVarNameInTable="columnm08" msprop:Generator_ColumnPropNameInTable="m08Column" msprop:Generator_UserColumnName="m08" default="0" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="m09" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="m09" msprop:Generator_ColumnVarNameInTable="columnm09" msprop:Generator_ColumnPropNameInTable="m09Column" msprop:Generator_UserColumnName="m09" default="0" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="m10" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="m10" msprop:Generator_ColumnVarNameInTable="columnm10" msprop:Generator_ColumnPropNameInTable="m10Column" msprop:Generator_UserColumnName="m10" default="0" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="m11" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="m11" msprop:Generator_ColumnVarNameInTable="columnm11" msprop:Generator_ColumnPropNameInTable="m11Column" msprop:Generator_UserColumnName="m11" default="0" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="m12" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="m12" msprop:Generator_ColumnVarNameInTable="columnm12" msprop:Generator_ColumnPropNameInTable="m12Column" msprop:Generator_UserColumnName="m12" default="0" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="weather_river" msprop:Generator_TableClassName="weather_riverDataTable" msprop:Generator_TableVarName="tableweather_river" msprop:Generator_TablePropName="weather_river" msprop:Generator_RowDeletingName="weather_riverRowDeleting" msprop:Generator_RowChangingName="weather_riverRowChanging" msprop:Generator_RowEvHandlerName="weather_riverRowChangeEventHandler" msprop:Generator_RowDeletedName="weather_riverRowDeleted" msprop:Generator_UserTableName="weather_river" msprop:Generator_RowChangedName="weather_riverRowChanged" msprop:Generator_RowEvArgName="weather_riverRowChangeEvent" msprop:Generator_RowClassName="weather_riverRow">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="pcode" msprop:nullValue="" msprop:Generator_ColumnPropNameInRow="pcode" msprop:Generator_ColumnVarNameInTable="columnpcode" msprop:Generator_ColumnPropNameInTable="pcodeColumn" msprop:Generator_UserColumnName="pcode" default="">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="10" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="code" msprop:nullValue="" msprop:Generator_ColumnPropNameInRow="code" msprop:Generator_ColumnVarNameInTable="columncode" msprop:Generator_ColumnPropNameInTable="codeColumn" msprop:Generator_UserColumnName="code" default="">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="10" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="설명" msprop:nullValue="" msprop:Generator_ColumnPropNameInRow="설명" msprop:Generator_ColumnVarNameInTable="column설명" msprop:Generator_ColumnPropNameInTable="설명Column" msprop:Generator_UserColumnName="설명" default="" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="255" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="m01" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="m01" msprop:Generator_ColumnVarNameInTable="columnm01" msprop:Generator_ColumnPropNameInTable="m01Column" msprop:Generator_UserColumnName="m01" default="0" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="m02" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="m02" msprop:Generator_ColumnVarNameInTable="columnm02" msprop:Generator_ColumnPropNameInTable="m02Column" msprop:Generator_UserColumnName="m02" default="0" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="m03" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="m03" msprop:Generator_ColumnVarNameInTable="columnm03" msprop:Generator_ColumnPropNameInTable="m03Column" msprop:Generator_UserColumnName="m03" default="0" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="m04" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="m04" msprop:Generator_ColumnVarNameInTable="columnm04" msprop:Generator_ColumnPropNameInTable="m04Column" msprop:Generator_UserColumnName="m04" default="0" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="m05" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="m05" msprop:Generator_ColumnVarNameInTable="columnm05" msprop:Generator_ColumnPropNameInTable="m05Column" msprop:Generator_UserColumnName="m05" default="0" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="m06" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="m06" msprop:Generator_ColumnVarNameInTable="columnm06" msprop:Generator_ColumnPropNameInTable="m06Column" msprop:Generator_UserColumnName="m06" default="0" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="m07" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="m07" msprop:Generator_ColumnVarNameInTable="columnm07" msprop:Generator_ColumnPropNameInTable="m07Column" msprop:Generator_UserColumnName="m07" default="0" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="m08" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="m08" msprop:Generator_ColumnVarNameInTable="columnm08" msprop:Generator_ColumnPropNameInTable="m08Column" msprop:Generator_UserColumnName="m08" default="0" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="m09" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="m09" msprop:Generator_ColumnVarNameInTable="columnm09" msprop:Generator_ColumnPropNameInTable="m09Column" msprop:Generator_UserColumnName="m09" default="0" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="m10" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="m10" msprop:Generator_ColumnVarNameInTable="columnm10" msprop:Generator_ColumnPropNameInTable="m10Column" msprop:Generator_UserColumnName="m10" default="0" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="m11" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="m11" msprop:Generator_ColumnVarNameInTable="columnm11" msprop:Generator_ColumnPropNameInTable="m11Column" msprop:Generator_UserColumnName="m11" default="0" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="m12" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="m12" msprop:Generator_ColumnVarNameInTable="columnm12" msprop:Generator_ColumnPropNameInTable="m12Column" msprop:Generator_UserColumnName="m12" default="0" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="weather_water" msprop:Generator_TableClassName="weather_waterDataTable" msprop:Generator_TableVarName="tableweather_water" msprop:Generator_TablePropName="weather_water" msprop:Generator_RowDeletingName="weather_waterRowDeleting" msprop:Generator_RowChangingName="weather_waterRowChanging" msprop:Generator_RowEvHandlerName="weather_waterRowChangeEventHandler" msprop:Generator_RowDeletedName="weather_waterRowDeleted" msprop:Generator_UserTableName="weather_water" msprop:Generator_RowChangedName="weather_waterRowChanged" msprop:Generator_RowEvArgName="weather_waterRowChangeEvent" msprop:Generator_RowClassName="weather_waterRow">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="pcode" msprop:nullValue="" msprop:Generator_ColumnPropNameInRow="pcode" msprop:Generator_ColumnVarNameInTable="columnpcode" msprop:Generator_ColumnPropNameInTable="pcodeColumn" msprop:Generator_UserColumnName="pcode" default="">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="10" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="code" msprop:nullValue="" msprop:Generator_ColumnPropNameInRow="code" msprop:Generator_ColumnVarNameInTable="columncode" msprop:Generator_ColumnPropNameInTable="codeColumn" msprop:Generator_UserColumnName="code" default="">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="10" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="설명" msprop:nullValue="" msprop:Generator_ColumnPropNameInRow="설명" msprop:Generator_ColumnVarNameInTable="column설명" msprop:Generator_ColumnPropNameInTable="설명Column" msprop:Generator_UserColumnName="설명" default="" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="255" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="m01" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="m01" msprop:Generator_ColumnVarNameInTable="columnm01" msprop:Generator_ColumnPropNameInTable="m01Column" msprop:Generator_UserColumnName="m01" default="0" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="m02" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="m02" msprop:Generator_ColumnVarNameInTable="columnm02" msprop:Generator_ColumnPropNameInTable="m02Column" msprop:Generator_UserColumnName="m02" default="0" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="m03" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="m03" msprop:Generator_ColumnVarNameInTable="columnm03" msprop:Generator_ColumnPropNameInTable="m03Column" msprop:Generator_UserColumnName="m03" default="0" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="m04" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="m04" msprop:Generator_ColumnVarNameInTable="columnm04" msprop:Generator_ColumnPropNameInTable="m04Column" msprop:Generator_UserColumnName="m04" default="0" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="m05" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="m05" msprop:Generator_ColumnVarNameInTable="columnm05" msprop:Generator_ColumnPropNameInTable="m05Column" msprop:Generator_UserColumnName="m05" default="0" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="m06" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="m06" msprop:Generator_ColumnVarNameInTable="columnm06" msprop:Generator_ColumnPropNameInTable="m06Column" msprop:Generator_UserColumnName="m06" default="0" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="m07" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="m07" msprop:Generator_ColumnVarNameInTable="columnm07" msprop:Generator_ColumnPropNameInTable="m07Column" msprop:Generator_UserColumnName="m07" default="0" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="m08" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="m08" msprop:Generator_ColumnVarNameInTable="columnm08" msprop:Generator_ColumnPropNameInTable="m08Column" msprop:Generator_UserColumnName="m08" default="0" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="m09" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="m09" msprop:Generator_ColumnVarNameInTable="columnm09" msprop:Generator_ColumnPropNameInTable="m09Column" msprop:Generator_UserColumnName="m09" default="0" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="m10" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="m10" msprop:Generator_ColumnVarNameInTable="columnm10" msprop:Generator_ColumnPropNameInTable="m10Column" msprop:Generator_UserColumnName="m10" default="0" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="m11" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="m11" msprop:Generator_ColumnVarNameInTable="columnm11" msprop:Generator_ColumnPropNameInTable="m11Column" msprop:Generator_UserColumnName="m11" default="0" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="m12" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="m12" msprop:Generator_ColumnVarNameInTable="columnm12" msprop:Generator_ColumnPropNameInTable="m12Column" msprop:Generator_UserColumnName="m12" default="0" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
       </xs:choice>
     </xs:complexType>
     <xs:unique name="Constraint1" msdata:PrimaryKey="true">
@@ -3335,5 +3686,20 @@ SELECT code, name FROM weather_group WHERE (code = @code) ORDER BY code</Command
       <xs:selector xpath=".//mstns:weather_group" />
       <xs:field xpath="mstns:code" />
     </xs:unique>
+    <xs:unique name="weather_wind_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
+      <xs:selector xpath=".//mstns:weather_wind" />
+      <xs:field xpath="mstns:pcode" />
+      <xs:field xpath="mstns:code" />
+    </xs:unique>
+    <xs:unique name="weather_river_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
+      <xs:selector xpath=".//mstns:weather_river" />
+      <xs:field xpath="mstns:pcode" />
+      <xs:field xpath="mstns:code" />
+    </xs:unique>
+    <xs:unique name="weather_water_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
+      <xs:selector xpath=".//mstns:weather_water" />
+      <xs:field xpath="mstns:pcode" />
+      <xs:field xpath="mstns:code" />
+    </xs:unique>
   </xs:element>
 </xs:schema>

ArinWarev1/DataSet/DS.xss

@@ -4,31 +4,34 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="40" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="True" ViewPortX="-10" ViewPortY="-15" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:weather_cha" ZOrder="2" X="944" Y="359" Height="305" Width="217" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:weather_cha" ZOrder="7" X="944" Y="359" Height="305" Width="217" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:weather_temp" ZOrder="14" X="162" Y="330" Height="305" Width="228" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:weather_temp" ZOrder="18" X="162" Y="330" Height="305" Width="228" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:tbl_weather" ZOrder="20" X="562" Y="474" Height="376" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="308" />
+    <Shape ID="DesignTable:tbl_weather" ZOrder="3" X="562" Y="474" Height="376" Width="211" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="308" />
-    <Shape ID="DesignTable:weather_ilsa" ZOrder="19" X="192" Y="676" Height="153" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:weather_ilsa" ZOrder="23" X="192" Y="676" Height="153" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:weather_supdo" ZOrder="17" X="25" Y="665" Height="149" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="59" />
+    <Shape ID="DesignTable:weather_supdo" ZOrder="21" X="25" Y="665" Height="149" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="59" />
-    <Shape ID="DesignTable:tbl_profile" ZOrder="3" X="784" Y="474" Height="187" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="97" />
+    <Shape ID="DesignTable:tbl_profile" ZOrder="8" X="784" Y="474" Height="187" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="97" />
-    <Shape ID="DesignTable:tbl_common" ZOrder="7" X="371" Y="417" Height="168" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="78" />
+    <Shape ID="DesignTable:tbl_common" ZOrder="12" X="1188" Y="569" Height="168" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="78" />
-    <Shape ID="DesignTable:tbl_pic" ZOrder="6" X="588" Y="45" Height="67" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="63" />
+    <Shape ID="DesignTable:weather_group" ZOrder="6" X="1167" Y="383" Height="172" Width="233" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
-    <Shape ID="DesignTable:tbl_nanbangkiki" ZOrder="23" X="14" Y="81" Height="257" Width="159" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
+    <Shape ID="DesignTable:tbl_pic" ZOrder="11" X="588" Y="45" Height="67" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="63" />
-    <Shape ID="DesignTable:tbl_nangbangkiki" ZOrder="22" X="182" Y="81" Height="257" Width="166" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
+    <Shape ID="DesignTable:tbl_nanbangkiki" ZOrder="26" X="14" Y="81" Height="257" Width="159" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
-    <Shape ID="DesignTable:tbl_bunbae" ZOrder="15" X="252" Y="98" Height="257" Width="153" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
+    <Shape ID="DesignTable:tbl_nangbangkiki" ZOrder="25" X="182" Y="81" Height="257" Width="166" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
-    <Shape ID="DesignTable:tbl_new" ZOrder="11" X="524" Y="124" Height="257" Width="153" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
+    <Shape ID="DesignTable:tbl_bunbae" ZOrder="19" X="252" Y="98" Height="257" Width="153" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
-    <Shape ID="DesignTable:tbl_myoun" ZOrder="5" X="1590" Y="60" Height="828" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="824" />
+    <Shape ID="DesignTable:tbl_new" ZOrder="15" X="524" Y="124" Height="257" Width="194" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
-    <Shape ID="DesignTable:tbl_buha" ZOrder="21" X="854" Y="81" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
+    <Shape ID="DesignTable:tbl_myoun" ZOrder="10" X="1590" Y="60" Height="828" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="824" />
-    <Shape ID="DesignTable:tbl_nbunbae" ZOrder="9" X="1022" Y="81" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
+    <Shape ID="DesignTable:tbl_buha" ZOrder="24" X="854" Y="81" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
-    <Shape ID="DesignTable:tbl_kongjo" ZOrder="8" X="373" Y="266" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
+    <Shape ID="DesignTable:tbl_nbunbae" ZOrder="13" X="1022" Y="81" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
-    <Shape ID="DesignTable:tbl_kongkub" ZOrder="10" X="202" Y="185" Height="257" Width="165" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
+    <Shape ID="DesignTable:tbl_kongjo" ZOrder="4" X="1190" Y="86" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
-    <Shape ID="DesignTable:tbl_yk" ZOrder="12" X="412" Y="382" Height="238" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="234" />
+    <Shape ID="DesignTable:tbl_kongkub" ZOrder="14" X="735" Y="114" Height="257" Width="165" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
-    <Shape ID="DesignTable:tbl_ykdetail" ZOrder="16" X="573" Y="385" Height="219" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="215" />
+    <Shape ID="DesignTable:tbl_yk" ZOrder="16" X="1021" Y="609" Height="238" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="234" />
-    <Shape ID="DesignTable:tbl_zone" ZOrder="4" X="1414" Y="58" Height="847" Width="177" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="843" />
+    <Shape ID="DesignTable:tbl_ykdetail" ZOrder="20" X="573" Y="385" Height="219" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="215" />
-    <Shape ID="DesignTable:tbl_monuse" ZOrder="18" X="481" Y="21" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="86" />
+    <Shape ID="DesignTable:tbl_zone" ZOrder="9" X="1414" Y="58" Height="847" Width="177" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="843" />
-    <Shape ID="DesignTable:tbl_Desc" ZOrder="13" X="392" Y="357" Height="466" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="462" />
+    <Shape ID="DesignTable:tbl_monuse" ZOrder="22" X="481" Y="21" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="86" />
-    <Shape ID="DesignTable:weather_group" ZOrder="1" X="1020" Y="373" Height="172" Width="233" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:tbl_Desc" ZOrder="17" X="392" Y="357" Height="466" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="462" />
+    <Shape ID="DesignTable:weather_wind" ZOrder="1" X="-7" Y="-5" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="86" />
+    <Shape ID="DesignTable:weather_river" ZOrder="5" X="347" Y="-3" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="86" />
+    <Shape ID="DesignTable:weather_water" ZOrder="2" X="177" Y="-5" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="24" SplitterPosition="86" />
   </Shapes>
   <Connectors />
 </DiagramLayout>

ArinWarev1/DataSet/DSR.Designer.vb

@@ -4557,6 +4557,14 @@ Partial Public Class DSR
         
         Private column신재생면적당열생산량 As Global.System.Data.DataColumn
         
+        Private column전력풍력 As Global.System.Data.DataColumn
+        
+        Private column생산량수열 As Global.System.Data.DataColumn
+        
+        Private column면적당생산량수열 As Global.System.Data.DataColumn
+        
+        Private column전력풍력offsite As Global.System.Data.DataColumn
+        
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
         Public Sub New()
@@ -4672,6 +4680,38 @@ Partial Public Class DSR
             End Get
         End Property
         
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
+        Public ReadOnly Property 전력풍력Column() As Global.System.Data.DataColumn
+            Get
+                Return Me.column전력풍력
+            End Get
+        End Property
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
+        Public ReadOnly Property 생산량수열Column() As Global.System.Data.DataColumn
+            Get
+                Return Me.column생산량수열
+            End Get
+        End Property
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
+        Public ReadOnly Property 면적당생산량수열Column() As Global.System.Data.DataColumn
+            Get
+                Return Me.column면적당생산량수열
+            End Get
+        End Property
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
+        Public ReadOnly Property 전력풍력offsiteColumn() As Global.System.Data.DataColumn
+            Get
+                Return Me.column전력풍력offsite
+            End Get
+        End Property
+        
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0"),  _
          Global.System.ComponentModel.Browsable(false)>  _
@@ -4709,9 +4749,9 @@ Partial Public Class DSR
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
-        Public Overloads Function Add생산에너지Row(ByVal mon As String, ByVal 전력태양광 As String, ByVal 전력태양광offsite As String, ByVal 전력열병합 As String, ByVal 생산량태양열 As String, ByVal 생산량지열 As String, ByVal 면적당생산량태양열 As Decimal, ByVal 면적당생산량지열 As Decimal, ByVal 신재생열병합전력생산량 As String, ByVal 신재생면적당열생산량 As String) As 생산에너지Row
+        Public Overloads Function Add생산에너지Row(ByVal mon As String, ByVal 전력태양광 As String, ByVal 전력태양광offsite As String, ByVal 전력열병합 As String, ByVal 생산량태양열 As String, ByVal 생산량지열 As String, ByVal 면적당생산량태양열 As Decimal, ByVal 면적당생산량지열 As Decimal, ByVal 신재생열병합전력생산량 As String, ByVal 신재생면적당열생산량 As String, ByVal 전력풍력 As String, ByVal 생산량수열 As String, ByVal 면적당생산량수열 As String, ByVal 전력풍력offsite As String) As 생산에너지Row
             Dim row생산에너지Row As 생산에너지Row = CType(Me.NewRow,생산에너지Row)
-            Dim columnValuesArray() As Object = New Object() {mon, 전력태양광, 전력태양광offsite, 전력열병합, 생산량태양열, 생산량지열, 면적당생산량태양열, 면적당생산량지열, 신재생열병합전력생산량, 신재생면적당열생산량}
+            Dim columnValuesArray() As Object = New Object() {mon, 전력태양광, 전력태양광offsite, 전력열병합, 생산량태양열, 생산량지열, 면적당생산량태양열, 면적당생산량지열, 신재생열병합전력생산량, 신재생면적당열생산량, 전력풍력, 생산량수열, 면적당생산량수열, 전력풍력offsite}
             row생산에너지Row.ItemArray = columnValuesArray
             Me.Rows.Add(row생산에너지Row)
             Return row생산에너지Row
@@ -4744,6 +4784,10 @@ Partial Public Class DSR
             Me.column면적당생산량지열 = MyBase.Columns("면적당생산량지열")
             Me.column신재생열병합전력생산량 = MyBase.Columns("신재생열병합전력생산량")
             Me.column신재생면적당열생산량 = MyBase.Columns("신재생면적당열생산량")
+            Me.column전력풍력 = MyBase.Columns("전력풍력")
+            Me.column생산량수열 = MyBase.Columns("생산량수열")
+            Me.column면적당생산량수열 = MyBase.Columns("면적당생산량수열")
+            Me.column전력풍력offsite = MyBase.Columns("전력풍력offsite")
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -4769,6 +4813,14 @@ Partial Public Class DSR
             MyBase.Columns.Add(Me.column신재생열병합전력생산량)
             Me.column신재생면적당열생산량 = New Global.System.Data.DataColumn("신재생면적당열생산량", GetType(String), Nothing, Global.System.Data.MappingType.Element)
             MyBase.Columns.Add(Me.column신재생면적당열생산량)
+            Me.column전력풍력 = New Global.System.Data.DataColumn("전력풍력", GetType(String), Nothing, Global.System.Data.MappingType.Element)
+            MyBase.Columns.Add(Me.column전력풍력)
+            Me.column생산량수열 = New Global.System.Data.DataColumn("생산량수열", GetType(String), Nothing, Global.System.Data.MappingType.Element)
+            MyBase.Columns.Add(Me.column생산량수열)
+            Me.column면적당생산량수열 = New Global.System.Data.DataColumn("면적당생산량수열", GetType(String), Nothing, Global.System.Data.MappingType.Element)
+            MyBase.Columns.Add(Me.column면적당생산량수열)
+            Me.column전력풍력offsite = New Global.System.Data.DataColumn("전력풍력offsite", GetType(String), Nothing, Global.System.Data.MappingType.Element)
+            MyBase.Columns.Add(Me.column전력풍력offsite)
             Me.column전력태양광.Caption = "에너지요구량"
             Me.column전력태양광.DefaultValue = CType("0",String)
             Me.column전력태양광offsite.DefaultValue = CType("0",String)
@@ -4782,6 +4834,7 @@ Partial Public Class DSR
             Me.column면적당생산량지열.DefaultValue = CType(0D,Decimal)
             Me.column신재생열병합전력생산량.DefaultValue = CType("0",String)
             Me.column신재생면적당열생산량.DefaultValue = CType("0",String)
+            Me.column전력풍력offsite.DefaultValue = CType("0",String)
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -11047,6 +11100,66 @@ Partial Public Class DSR
             End Set
         End Property
         
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
+        Public Property 전력풍력() As String
+            Get
+                If Me.Is전력풍력Null Then
+                    Return "0"
+                Else
+                    Return CType(Me(Me.table생산에너지.전력풍력Column),String)
+                End If
+            End Get
+            Set
+                Me(Me.table생산에너지.전력풍력Column) = value
+            End Set
+        End Property
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
+        Public Property 생산량수열() As String
+            Get
+                If Me.Is생산량수열Null Then
+                    Return "0"
+                Else
+                    Return CType(Me(Me.table생산에너지.생산량수열Column),String)
+                End If
+            End Get
+            Set
+                Me(Me.table생산에너지.생산량수열Column) = value
+            End Set
+        End Property
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
+        Public Property 면적당생산량수열() As String
+            Get
+                If Me.Is면적당생산량수열Null Then
+                    Return "0"
+                Else
+                    Return CType(Me(Me.table생산에너지.면적당생산량수열Column),String)
+                End If
+            End Get
+            Set
+                Me(Me.table생산에너지.면적당생산량수열Column) = value
+            End Set
+        End Property
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
+        Public Property 전력풍력offsite() As String
+            Get
+                If Me.Is전력풍력offsiteNull Then
+                    Return "0"
+                Else
+                    Return CType(Me(Me.table생산에너지.전력풍력offsiteColumn),String)
+                End If
+            End Get
+            Set
+                Me(Me.table생산에너지.전력풍력offsiteColumn) = value
+            End Set
+        End Property
+        
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
         Public Function IsmonNull() As Boolean
@@ -11166,6 +11279,54 @@ Partial Public Class DSR
         Public Sub Set신재생면적당열생산량Null()
             Me(Me.table생산에너지.신재생면적당열생산량Column) = Global.System.Convert.DBNull
         End Sub
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
+        Public Function Is전력풍력Null() As Boolean
+            Return Me.IsNull(Me.table생산에너지.전력풍력Column)
+        End Function
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
+        Public Sub Set전력풍력Null()
+            Me(Me.table생산에너지.전력풍력Column) = Global.System.Convert.DBNull
+        End Sub
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
+        Public Function Is생산량수열Null() As Boolean
+            Return Me.IsNull(Me.table생산에너지.생산량수열Column)
+        End Function
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
+        Public Sub Set생산량수열Null()
+            Me(Me.table생산에너지.생산량수열Column) = Global.System.Convert.DBNull
+        End Sub
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
+        Public Function Is면적당생산량수열Null() As Boolean
+            Return Me.IsNull(Me.table생산에너지.면적당생산량수열Column)
+        End Function
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
+        Public Sub Set면적당생산량수열Null()
+            Me(Me.table생산에너지.면적당생산량수열Column) = Global.System.Convert.DBNull
+        End Sub
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
+        Public Function Is전력풍력offsiteNull() As Boolean
+            Return Me.IsNull(Me.table생산에너지.전력풍력offsiteColumn)
+        End Function
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
+        Public Sub Set전력풍력offsiteNull()
+            Me(Me.table생산에너지.전력풍력offsiteColumn) = Global.System.Convert.DBNull
+        End Sub
     End Class
     
     '''<summary>

ArinWarev1/DataSet/DSR.xsd

@@ -182,6 +182,10 @@
               <xs:element name="면적당생산량지열" msprop:Generator_ColumnVarNameInTable="column면적당생산량지열" msprop:Generator_ColumnPropNameInRow="면적당생산량지열" msprop:Generator_ColumnPropNameInTable="면적당생산량지열Column" msprop:Generator_UserColumnName="면적당생산량지열" type="xs:decimal" default="0" minOccurs="0" />
               <xs:element name="신재생열병합전력생산량" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="신재생열병합전력생산량" msprop:Generator_ColumnVarNameInTable="column신재생열병합전력생산량" msprop:Generator_ColumnPropNameInTable="신재생열병합전력생산량Column" msprop:Generator_UserColumnName="신재생열병합전력생산량" type="xs:string" default="0" minOccurs="0" />
               <xs:element name="신재생면적당열생산량" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="신재생면적당열생산량" msprop:Generator_ColumnVarNameInTable="column신재생면적당열생산량" msprop:Generator_ColumnPropNameInTable="신재생면적당열생산량Column" msprop:Generator_UserColumnName="신재생면적당열생산량" type="xs:string" default="0" minOccurs="0" />
+              <xs:element name="전력풍력" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="전력풍력" msprop:Generator_ColumnVarNameInTable="column전력풍력" msprop:Generator_ColumnPropNameInTable="전력풍력Column" msprop:Generator_UserColumnName="전력풍력" type="xs:string" minOccurs="0" />
+              <xs:element name="생산량수열" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="생산량수열" msprop:Generator_ColumnVarNameInTable="column생산량수열" msprop:Generator_ColumnPropNameInTable="생산량수열Column" msprop:Generator_UserColumnName="생산량수열" type="xs:string" minOccurs="0" />
+              <xs:element name="면적당생산량수열" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="면적당생산량수열" msprop:Generator_ColumnVarNameInTable="column면적당생산량수열" msprop:Generator_ColumnPropNameInTable="면적당생산량수열Column" msprop:Generator_UserColumnName="면적당생산량수열" type="xs:string" minOccurs="0" />
+              <xs:element name="전력풍력offsite" msprop:Generator_ColumnVarNameInTable="column전력풍력offsite" msprop:Generator_ColumnPropNameInRow="전력풍력offsite" msprop:nullValue="0" msprop:Generator_ColumnPropNameInTable="전력풍력offsiteColumn" msprop:Generator_UserColumnName="전력풍력offsite" type="xs:string" default="0" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>

ArinWarev1/DataSet/DSR.xss

@@ -4,26 +4,26 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="9" ViewPortY="226" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="9" ViewPortY="4" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
     <Shape ID="DesignTable:최대냉난방부하" ZOrder="14" X="1088" Y="435" Height="257" Width="152" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
     <Shape ID="DesignTable:월별에너지분석" ZOrder="18" X="891" Y="316" Height="562" Width="156" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="558" />
-    <Shape ID="DesignTable:TReqUse" ZOrder="8" X="725" Y="64" Height="428" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="424" />
+    <Shape ID="DesignTable:TReqUse" ZOrder="9" X="725" Y="64" Height="428" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="424" />
     <Shape ID="DesignTable:Graph_Req" ZOrder="17" X="1079" Y="347" Height="86" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="82" />
     <Shape ID="DesignTable:Graph_ReqUse" ZOrder="16" X="1078" Y="19" Height="86" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="82" />
     <Shape ID="DesignTable:Graph_Info" ZOrder="15" X="1079" Y="108" Height="238" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="234" />
     <Shape ID="DesignTable:사용면적" ZOrder="13" X="872" Y="174" Height="124" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="120" />
-    <Shape ID="DesignTable:에너지소요량" ZOrder="10" X="187" Y="58" Height="410" Width="187" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="406" />
+    <Shape ID="DesignTable:에너지소요량" ZOrder="11" X="187" Y="58" Height="410" Width="187" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="406" />
     <Shape ID="DesignTable:에너지소요량1" ZOrder="12" X="376" Y="56" Height="695" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="691" />
-    <Shape ID="DesignTable:생산에너지" ZOrder="11" X="536" Y="58" Height="162" Width="153" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="158" />
+    <Shape ID="DesignTable:생산에너지" ZOrder="1" X="536" Y="58" Height="257" Width="177" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
-    <Shape ID="DesignTable:Graph_Info_data" ZOrder="9" X="20" Y="52" Height="410" Width="161" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="406" />
+    <Shape ID="DesignTable:Graph_Info_data" ZOrder="10" X="20" Y="52" Height="410" Width="161" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="406" />
-    <Shape ID="DesignTable:Pyonga_REQ" ZOrder="7" X="551" Y="230" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="86" />
+    <Shape ID="DesignTable:Pyonga_REQ" ZOrder="8" X="551" Y="230" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="86" />
-    <Shape ID="DesignTable:Pyonga_USE" ZOrder="5" X="547" Y="419" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="86" />
+    <Shape ID="DesignTable:Pyonga_USE" ZOrder="6" X="547" Y="419" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="86" />
-    <Shape ID="DesignTable:Pyonga_1USE" ZOrder="6" X="547" Y="330" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="86" />
+    <Shape ID="DesignTable:Pyonga_1USE" ZOrder="7" X="547" Y="330" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="86" />
-    <Shape ID="DesignTable:Pyonga_YK" ZOrder="1" X="69" Y="476" Height="543" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="539" />
+    <Shape ID="DesignTable:Pyonga_YK" ZOrder="2" X="69" Y="476" Height="543" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="539" />
-    <Shape ID="DesignTable:월별1차에너지사용량" ZOrder="4" X="877" Y="14" Height="143" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="139" />
+    <Shape ID="DesignTable:월별1차에너지사용량" ZOrder="5" X="877" Y="14" Height="143" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="139" />
-    <Shape ID="DesignTable:설계계산결과" ZOrder="2" X="613" Y="530" Height="238" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="234" />
+    <Shape ID="DesignTable:설계계산결과" ZOrder="3" X="613" Y="530" Height="238" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="234" />
-    <Shape ID="DesignTable:설계계산파라미터" ZOrder="3" X="561" Y="696" Height="86" Width="164" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="82" />
+    <Shape ID="DesignTable:설계계산파라미터" ZOrder="4" X="561" Y="696" Height="86" Width="164" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="82" />
   </Shapes>
   <Connectors />
 </DiagramLayout>

ArinWarev1/ECO2_2020.vbproj

@@ -81,6 +81,13 @@
     <DefineConstants>MDI=true</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="C1.C1Pdf.4, Version=4.0.20171.248, Culture=neutral, PublicKeyToken=79882d576c6336da" />
+    <Reference Include="C1.DataEngine.4, Version=4.0.20171.248, Culture=neutral, PublicKeyToken=79882d576c6336da" />
+    <Reference Include="C1.Win.C1Chart.4, Version=4.0.20171.248, Culture=neutral, PublicKeyToken=a22e16972c085838" />
+    <Reference Include="C1.Win.C1Command.4, Version=4.0.20171.248, Culture=neutral, PublicKeyToken=e808566f358766d8" />
+    <Reference Include="C1.Win.C1FlexGrid.4, Version=4.0.20171.248, Culture=neutral, PublicKeyToken=79882d576c6336da" />
+    <Reference Include="C1.Win.C1Input.4, Version=4.0.20171.248, Culture=neutral, PublicKeyToken=7e7ff60f0c214f9a" />
+    <Reference Include="C1.Win.FlexPivot.4, Version=4.0.20171.248, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL" />
     <Reference Include="FarPoint.CalcEngine, Version=5.0.3505.2008, Culture=neutral, PublicKeyToken=327c3516b1b18457">
       <Private>True</Private>
     </Reference>
@@ -813,6 +820,10 @@
       <Project>{2AF28E8C-84F1-4D56-9592-3B0EBDE8DF14}</Project>
       <Name>CEnergy</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Utility\Utility.csproj">
+      <Project>{B1FDE30A-B142-42D5-A6B8-5428D2F2E62A}</Project>
+      <Name>Utility</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" />

ArinWarev1/Forms_Basic/Frm_Intro.vb

@@ -112,7 +112,7 @@
         Select Case UseriNfo.authtype
             Case "IP"
                 If Me.tb_id.Text.ToLower() <> "guest" AndAlso Not Me.tb_id.Text.ToLower().StartsWith("user") Then
-                    If Prj.CUrIP.ToUpper <> UseriNfo.authip.ToUpper Then
+                    If Prj.CUrIP.ToUpper <> UseriNfo.authip.ToUpper AndAlso UseriNfo.authip <> "0.0.0.0" Then
                         MsgBox("로그인사용자와 현재컴퓨터의 IP가 일치하지않습니다", MsgBoxStyle.Critical, "확인")
                         Return
                     End If

ArinWarev1/Forms_Basic/Frm_RepResult_Admin.Designer.vb

@@ -146,14 +146,18 @@ Partial Class Frm_RepResult_Admin
         Me.DataGridView19 = New Eco2Ar.ArinDv()
         Me.TabPage8 = New System.Windows.Forms.TabPage()
         Me.DataGridView8 = New Eco2Ar.ArinDv()
+        Me.bs_생산E = New System.Windows.Forms.BindingSource(Me.components)
         Me.MonDataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.전력풍력 = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.생산량수열 = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.면적당생산량수열 = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.전력풍력offsite = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.전력태양광DataGridViewTextBoxColumn = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.전력열병합DataGridViewTextBoxColumn = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.생산량태양열DataGridViewTextBoxColumn = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.생산량지열DataGridViewTextBoxColumn = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.면적당생산량태양열DataGridViewTextBoxColumn = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.면적당생산량지열DataGridViewTextBoxColumn = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.bs_생산E = New System.Windows.Forms.BindingSource(Me.components)
         CType(Me.DSR, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.bn_all, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.bn_all.SuspendLayout()
@@ -296,14 +300,14 @@ Partial Class Frm_RepResult_Admin
         Me.bn_all.Dock = System.Windows.Forms.DockStyle.Bottom
         Me.bn_all.Font = New System.Drawing.Font("돋움", 8.999999!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(129, Byte))
         Me.bn_all.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton44, Me.ToolStripButton45, Me.ToolStripSeparator25, Me.ToolStripTextBox6, Me.ToolStripLabel6, Me.ToolStripSeparator26, Me.ToolStripButton46, Me.ToolStripButton47, Me.ToolStripSeparator27, Me.ToolStripButton48, Me.ToolStripButton49, Me.ToolStripSeparator28, Me.ToolStripButton50, Me.ToolStripButton51})
-        Me.bn_all.Location = New System.Drawing.Point(0, 446)
+        Me.bn_all.Location = New System.Drawing.Point(0, 603)
         Me.bn_all.MoveFirstItem = Me.ToolStripButton44
         Me.bn_all.MoveLastItem = Me.ToolStripButton47
         Me.bn_all.MoveNextItem = Me.ToolStripButton46
         Me.bn_all.MovePreviousItem = Me.ToolStripButton45
         Me.bn_all.Name = "bn_all"
         Me.bn_all.PositionItem = Me.ToolStripTextBox6
-        Me.bn_all.Size = New System.Drawing.Size(827, 25)
+        Me.bn_all.Size = New System.Drawing.Size(1149, 25)
         Me.bn_all.TabIndex = 13
         Me.bn_all.Text = "BindingNavigator1"
         '
@@ -336,10 +340,10 @@ Partial Class Frm_RepResult_Admin
         '
         Me.StatusStrip1.Font = New System.Drawing.Font("돋움", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(129, Byte))
         Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.lb_msg})
-        Me.StatusStrip1.Location = New System.Drawing.Point(0, 471)
+        Me.StatusStrip1.Location = New System.Drawing.Point(0, 628)
         Me.StatusStrip1.Name = "StatusStrip1"
         Me.StatusStrip1.Padding = New System.Windows.Forms.Padding(1, 0, 16, 0)
-        Me.StatusStrip1.Size = New System.Drawing.Size(827, 22)
+        Me.StatusStrip1.Size = New System.Drawing.Size(1149, 22)
         Me.StatusStrip1.TabIndex = 14
         Me.StatusStrip1.Text = "StatusStrip1"
         '
@@ -404,7 +408,7 @@ Partial Class Frm_RepResult_Admin
         Me.UNITDataGridViewTextBoxColumn.HeaderText = "UNIT"
         Me.UNITDataGridViewTextBoxColumn.Name = "UNITDataGridViewTextBoxColumn"
         Me.UNITDataGridViewTextBoxColumn.ReadOnly = True
-        Me.UNITDataGridViewTextBoxColumn.Width = 62
+        Me.UNITDataGridViewTextBoxColumn.Width = 60
         '
         'SIGNDataGridViewTextBoxColumn
         '
@@ -412,7 +416,7 @@ Partial Class Frm_RepResult_Admin
         Me.SIGNDataGridViewTextBoxColumn.HeaderText = "SIGN"
         Me.SIGNDataGridViewTextBoxColumn.Name = "SIGNDataGridViewTextBoxColumn"
         Me.SIGNDataGridViewTextBoxColumn.ReadOnly = True
-        Me.SIGNDataGridViewTextBoxColumn.Width = 63
+        Me.SIGNDataGridViewTextBoxColumn.Width = 62
         '
         'EQDataGridViewTextBoxColumn
         '
@@ -436,7 +440,7 @@ Partial Class Frm_RepResult_Admin
         Me.M00.HeaderText = "TOTAL"
         Me.M00.Name = "M00"
         Me.M00.ReadOnly = True
-        Me.M00.Width = 75
+        Me.M00.Width = 73
         '
         'M01DataGridViewTextBoxColumn
         '
@@ -547,7 +551,7 @@ Partial Class Frm_RepResult_Admin
         Me.TabControl1.Location = New System.Drawing.Point(0, 0)
         Me.TabControl1.Name = "TabControl1"
         Me.TabControl1.SelectedIndex = 0
-        Me.TabControl1.Size = New System.Drawing.Size(827, 446)
+        Me.TabControl1.Size = New System.Drawing.Size(1149, 603)
         Me.TabControl1.TabIndex = 16
         '
         'TabPage1
@@ -796,7 +800,7 @@ Partial Class Frm_RepResult_Admin
         Me.MonDataGridViewTextBoxColumn1.HeaderText = "mon"
         Me.MonDataGridViewTextBoxColumn1.Name = "MonDataGridViewTextBoxColumn1"
         Me.MonDataGridViewTextBoxColumn1.ReadOnly = True
-        Me.MonDataGridViewTextBoxColumn1.Width = 58
+        Me.MonDataGridViewTextBoxColumn1.Width = 56
         '
         '난방에너지소요량DataGridViewTextBoxColumn
         '
@@ -887,7 +891,7 @@ Partial Class Frm_RepResult_Admin
         Me.MonDataGridViewTextBoxColumn2.HeaderText = "mon"
         Me.MonDataGridViewTextBoxColumn2.Name = "MonDataGridViewTextBoxColumn2"
         Me.MonDataGridViewTextBoxColumn2.ReadOnly = True
-        Me.MonDataGridViewTextBoxColumn2.Width = 58
+        Me.MonDataGridViewTextBoxColumn2.Width = 56
         '
         '난방등유DataGridViewTextBoxColumn1
         '
@@ -903,7 +907,7 @@ Partial Class Frm_RepResult_Admin
         Me.난방LNGDataGridViewTextBoxColumn1.HeaderText = "난방LNG"
         Me.난방LNGDataGridViewTextBoxColumn1.Name = "난방LNGDataGridViewTextBoxColumn1"
         Me.난방LNGDataGridViewTextBoxColumn1.ReadOnly = True
-        Me.난방LNGDataGridViewTextBoxColumn1.Width = 84
+        Me.난방LNGDataGridViewTextBoxColumn1.Width = 83
         '
         '난방LPGDataGridViewTextBoxColumn1
         '
@@ -943,7 +947,7 @@ Partial Class Frm_RepResult_Admin
         Me.냉방LNGDataGridViewTextBoxColumn1.HeaderText = "냉방LNG"
         Me.냉방LNGDataGridViewTextBoxColumn1.Name = "냉방LNGDataGridViewTextBoxColumn1"
         Me.냉방LNGDataGridViewTextBoxColumn1.ReadOnly = True
-        Me.냉방LNGDataGridViewTextBoxColumn1.Width = 84
+        Me.냉방LNGDataGridViewTextBoxColumn1.Width = 83
         '
         '냉방LPGDataGridViewTextBoxColumn1
         '
@@ -991,7 +995,7 @@ Partial Class Frm_RepResult_Admin
         Me.급탕LNGDataGridViewTextBoxColumn1.HeaderText = "급탕LNG"
         Me.급탕LNGDataGridViewTextBoxColumn1.Name = "급탕LNGDataGridViewTextBoxColumn1"
         Me.급탕LNGDataGridViewTextBoxColumn1.ReadOnly = True
-        Me.급탕LNGDataGridViewTextBoxColumn1.Width = 84
+        Me.급탕LNGDataGridViewTextBoxColumn1.Width = 83
         '
         '급탕LPGDataGridViewTextBoxColumn1
         '
@@ -1081,7 +1085,7 @@ Partial Class Frm_RepResult_Admin
         Me.TabPage10.Location = New System.Drawing.Point(4, 25)
         Me.TabPage10.Name = "TabPage10"
         Me.TabPage10.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage10.Size = New System.Drawing.Size(1010, 336)
+        Me.TabPage10.Size = New System.Drawing.Size(811, 391)
         Me.TabPage10.TabIndex = 1
         Me.TabPage10.Text = "02"
         Me.TabPage10.UseVisualStyleBackColor = True
@@ -1093,7 +1097,7 @@ Partial Class Frm_RepResult_Admin
         Me.DataGridView9.Location = New System.Drawing.Point(3, 3)
         Me.DataGridView9.Name = "DataGridView9"
         Me.DataGridView9.RowTemplate.Height = 23
-        Me.DataGridView9.Size = New System.Drawing.Size(1004, 330)
+        Me.DataGridView9.Size = New System.Drawing.Size(805, 385)
         Me.DataGridView9.TabIndex = 1
         '
         'TabPage11
@@ -1101,7 +1105,7 @@ Partial Class Frm_RepResult_Admin
         Me.TabPage11.Controls.Add(Me.DataGridView10)
         Me.TabPage11.Location = New System.Drawing.Point(4, 25)
         Me.TabPage11.Name = "TabPage11"
-        Me.TabPage11.Size = New System.Drawing.Size(1010, 336)
+        Me.TabPage11.Size = New System.Drawing.Size(811, 391)
         Me.TabPage11.TabIndex = 2
         Me.TabPage11.Text = "03"
         Me.TabPage11.UseVisualStyleBackColor = True
@@ -1113,7 +1117,7 @@ Partial Class Frm_RepResult_Admin
         Me.DataGridView10.Location = New System.Drawing.Point(0, 0)
         Me.DataGridView10.Name = "DataGridView10"
         Me.DataGridView10.RowTemplate.Height = 23
-        Me.DataGridView10.Size = New System.Drawing.Size(1010, 336)
+        Me.DataGridView10.Size = New System.Drawing.Size(811, 391)
         Me.DataGridView10.TabIndex = 1
         '
         'TabPage12
@@ -1121,7 +1125,7 @@ Partial Class Frm_RepResult_Admin
         Me.TabPage12.Controls.Add(Me.DataGridView11)
         Me.TabPage12.Location = New System.Drawing.Point(4, 25)
         Me.TabPage12.Name = "TabPage12"
-        Me.TabPage12.Size = New System.Drawing.Size(1010, 336)
+        Me.TabPage12.Size = New System.Drawing.Size(811, 391)
         Me.TabPage12.TabIndex = 3
         Me.TabPage12.Text = "04"
         Me.TabPage12.UseVisualStyleBackColor = True
@@ -1133,7 +1137,7 @@ Partial Class Frm_RepResult_Admin
         Me.DataGridView11.Location = New System.Drawing.Point(0, 0)
         Me.DataGridView11.Name = "DataGridView11"
         Me.DataGridView11.RowTemplate.Height = 23
-        Me.DataGridView11.Size = New System.Drawing.Size(1010, 336)
+        Me.DataGridView11.Size = New System.Drawing.Size(811, 391)
         Me.DataGridView11.TabIndex = 1
         '
         'TabPage13
@@ -1141,7 +1145,7 @@ Partial Class Frm_RepResult_Admin
         Me.TabPage13.Controls.Add(Me.DataGridView12)
         Me.TabPage13.Location = New System.Drawing.Point(4, 25)
         Me.TabPage13.Name = "TabPage13"
-        Me.TabPage13.Size = New System.Drawing.Size(1010, 336)
+        Me.TabPage13.Size = New System.Drawing.Size(811, 391)
         Me.TabPage13.TabIndex = 4
         Me.TabPage13.Text = "05"
         Me.TabPage13.UseVisualStyleBackColor = True
@@ -1153,7 +1157,7 @@ Partial Class Frm_RepResult_Admin
         Me.DataGridView12.Location = New System.Drawing.Point(0, 0)
         Me.DataGridView12.Name = "DataGridView12"
         Me.DataGridView12.RowTemplate.Height = 23
-        Me.DataGridView12.Size = New System.Drawing.Size(1010, 336)
+        Me.DataGridView12.Size = New System.Drawing.Size(811, 391)
         Me.DataGridView12.TabIndex = 1
         '
         'TabPage14
@@ -1161,7 +1165,7 @@ Partial Class Frm_RepResult_Admin
         Me.TabPage14.Controls.Add(Me.DataGridView13)
         Me.TabPage14.Location = New System.Drawing.Point(4, 25)
         Me.TabPage14.Name = "TabPage14"
-        Me.TabPage14.Size = New System.Drawing.Size(1010, 336)
+        Me.TabPage14.Size = New System.Drawing.Size(811, 391)
         Me.TabPage14.TabIndex = 5
         Me.TabPage14.Text = "06"
         Me.TabPage14.UseVisualStyleBackColor = True
@@ -1173,7 +1177,7 @@ Partial Class Frm_RepResult_Admin
         Me.DataGridView13.Location = New System.Drawing.Point(0, 0)
         Me.DataGridView13.Name = "DataGridView13"
         Me.DataGridView13.RowTemplate.Height = 23
-        Me.DataGridView13.Size = New System.Drawing.Size(1010, 336)
+        Me.DataGridView13.Size = New System.Drawing.Size(811, 391)
         Me.DataGridView13.TabIndex = 1
         '
         'TabPage15
@@ -1181,7 +1185,7 @@ Partial Class Frm_RepResult_Admin
         Me.TabPage15.Controls.Add(Me.DataGridView14)
         Me.TabPage15.Location = New System.Drawing.Point(4, 25)
         Me.TabPage15.Name = "TabPage15"
-        Me.TabPage15.Size = New System.Drawing.Size(1010, 336)
+        Me.TabPage15.Size = New System.Drawing.Size(811, 391)
         Me.TabPage15.TabIndex = 6
         Me.TabPage15.Text = "07"
         Me.TabPage15.UseVisualStyleBackColor = True
@@ -1193,7 +1197,7 @@ Partial Class Frm_RepResult_Admin
         Me.DataGridView14.Location = New System.Drawing.Point(0, 0)
         Me.DataGridView14.Name = "DataGridView14"
         Me.DataGridView14.RowTemplate.Height = 23
-        Me.DataGridView14.Size = New System.Drawing.Size(1010, 336)
+        Me.DataGridView14.Size = New System.Drawing.Size(811, 391)
         Me.DataGridView14.TabIndex = 1
         '
         'TabPage16
@@ -1201,7 +1205,7 @@ Partial Class Frm_RepResult_Admin
         Me.TabPage16.Controls.Add(Me.DataGridView15)
         Me.TabPage16.Location = New System.Drawing.Point(4, 25)
         Me.TabPage16.Name = "TabPage16"
-        Me.TabPage16.Size = New System.Drawing.Size(1010, 336)
+        Me.TabPage16.Size = New System.Drawing.Size(811, 391)
         Me.TabPage16.TabIndex = 7
         Me.TabPage16.Text = "08"
         Me.TabPage16.UseVisualStyleBackColor = True
@@ -1213,7 +1217,7 @@ Partial Class Frm_RepResult_Admin
         Me.DataGridView15.Location = New System.Drawing.Point(0, 0)
         Me.DataGridView15.Name = "DataGridView15"
         Me.DataGridView15.RowTemplate.Height = 23
-        Me.DataGridView15.Size = New System.Drawing.Size(1010, 336)
+        Me.DataGridView15.Size = New System.Drawing.Size(811, 391)
         Me.DataGridView15.TabIndex = 1
         '
         'TabPage17
@@ -1221,7 +1225,7 @@ Partial Class Frm_RepResult_Admin
         Me.TabPage17.Controls.Add(Me.DataGridView16)
         Me.TabPage17.Location = New System.Drawing.Point(4, 25)
         Me.TabPage17.Name = "TabPage17"
-        Me.TabPage17.Size = New System.Drawing.Size(1010, 336)
+        Me.TabPage17.Size = New System.Drawing.Size(811, 391)
         Me.TabPage17.TabIndex = 8
         Me.TabPage17.Text = "09"
         Me.TabPage17.UseVisualStyleBackColor = True
@@ -1233,7 +1237,7 @@ Partial Class Frm_RepResult_Admin
         Me.DataGridView16.Location = New System.Drawing.Point(0, 0)
         Me.DataGridView16.Name = "DataGridView16"
         Me.DataGridView16.RowTemplate.Height = 23
-        Me.DataGridView16.Size = New System.Drawing.Size(1010, 336)
+        Me.DataGridView16.Size = New System.Drawing.Size(811, 391)
         Me.DataGridView16.TabIndex = 1
         '
         'TabPage18
@@ -1241,7 +1245,7 @@ Partial Class Frm_RepResult_Admin
         Me.TabPage18.Controls.Add(Me.DataGridView17)
         Me.TabPage18.Location = New System.Drawing.Point(4, 25)
         Me.TabPage18.Name = "TabPage18"
-        Me.TabPage18.Size = New System.Drawing.Size(1010, 336)
+        Me.TabPage18.Size = New System.Drawing.Size(811, 391)
         Me.TabPage18.TabIndex = 9
         Me.TabPage18.Text = "10"
         Me.TabPage18.UseVisualStyleBackColor = True
@@ -1253,7 +1257,7 @@ Partial Class Frm_RepResult_Admin
         Me.DataGridView17.Location = New System.Drawing.Point(0, 0)
         Me.DataGridView17.Name = "DataGridView17"
         Me.DataGridView17.RowTemplate.Height = 23
-        Me.DataGridView17.Size = New System.Drawing.Size(1010, 336)
+        Me.DataGridView17.Size = New System.Drawing.Size(811, 391)
         Me.DataGridView17.TabIndex = 1
         '
         'TabPage19
@@ -1261,7 +1265,7 @@ Partial Class Frm_RepResult_Admin
         Me.TabPage19.Controls.Add(Me.DataGridView18)
         Me.TabPage19.Location = New System.Drawing.Point(4, 25)
         Me.TabPage19.Name = "TabPage19"
-        Me.TabPage19.Size = New System.Drawing.Size(1010, 336)
+        Me.TabPage19.Size = New System.Drawing.Size(811, 391)
         Me.TabPage19.TabIndex = 10
         Me.TabPage19.Text = "11"
         Me.TabPage19.UseVisualStyleBackColor = True
@@ -1273,7 +1277,7 @@ Partial Class Frm_RepResult_Admin
         Me.DataGridView18.Location = New System.Drawing.Point(0, 0)
         Me.DataGridView18.Name = "DataGridView18"
         Me.DataGridView18.RowTemplate.Height = 23
-        Me.DataGridView18.Size = New System.Drawing.Size(1010, 336)
+        Me.DataGridView18.Size = New System.Drawing.Size(811, 391)
         Me.DataGridView18.TabIndex = 1
         '
         'TabPage20
@@ -1281,7 +1285,7 @@ Partial Class Frm_RepResult_Admin
         Me.TabPage20.Controls.Add(Me.DataGridView19)
         Me.TabPage20.Location = New System.Drawing.Point(4, 25)
         Me.TabPage20.Name = "TabPage20"
-        Me.TabPage20.Size = New System.Drawing.Size(1010, 336)
+        Me.TabPage20.Size = New System.Drawing.Size(811, 391)
         Me.TabPage20.TabIndex = 11
         Me.TabPage20.Text = "12"
         Me.TabPage20.UseVisualStyleBackColor = True
@@ -1293,7 +1297,7 @@ Partial Class Frm_RepResult_Admin
         Me.DataGridView19.Location = New System.Drawing.Point(0, 0)
         Me.DataGridView19.Name = "DataGridView19"
         Me.DataGridView19.RowTemplate.Height = 23
-        Me.DataGridView19.Size = New System.Drawing.Size(1010, 336)
+        Me.DataGridView19.Size = New System.Drawing.Size(811, 391)
         Me.DataGridView19.TabIndex = 1
         '
         'TabPage8
@@ -1301,7 +1305,7 @@ Partial Class Frm_RepResult_Admin
         Me.TabPage8.Controls.Add(Me.DataGridView8)
         Me.TabPage8.Location = New System.Drawing.Point(4, 22)
         Me.TabPage8.Name = "TabPage8"
-        Me.TabPage8.Size = New System.Drawing.Size(819, 420)
+        Me.TabPage8.Size = New System.Drawing.Size(1141, 577)
         Me.TabPage8.TabIndex = 7
         Me.TabPage8.Text = "생산에너지"
         Me.TabPage8.UseVisualStyleBackColor = True
@@ -1314,7 +1318,7 @@ Partial Class Frm_RepResult_Admin
         Me.DataGridView8.AutoGenerateColumns = False
         Me.DataGridView8.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells
         Me.DataGridView8.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.DataGridView8.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.MonDataGridViewTextBoxColumn3, Me.전력태양광DataGridViewTextBoxColumn, Me.전력열병합DataGridViewTextBoxColumn, Me.생산량태양열DataGridViewTextBoxColumn, Me.생산량지열DataGridViewTextBoxColumn, Me.면적당생산량태양열DataGridViewTextBoxColumn, Me.면적당생산량지열DataGridViewTextBoxColumn})
+        Me.DataGridView8.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.MonDataGridViewTextBoxColumn3, Me.전력풍력, Me.생산량수열, Me.면적당생산량수열, Me.전력풍력offsite, Me.전력태양광DataGridViewTextBoxColumn, Me.전력열병합DataGridViewTextBoxColumn, Me.생산량태양열DataGridViewTextBoxColumn, Me.생산량지열DataGridViewTextBoxColumn, Me.면적당생산량태양열DataGridViewTextBoxColumn, Me.면적당생산량지열DataGridViewTextBoxColumn})
         Me.DataGridView8.DataSource = Me.bs_생산E
         Me.DataGridView8.Dock = System.Windows.Forms.DockStyle.Fill
         Me.DataGridView8.Location = New System.Drawing.Point(0, 0)
@@ -1323,16 +1327,53 @@ Partial Class Frm_RepResult_Admin
         Me.DataGridView8.RowHeadersVisible = False
         Me.DataGridView8.RowTemplate.Height = 23
         Me.DataGridView8.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.DataGridView8.Size = New System.Drawing.Size(819, 420)
+        Me.DataGridView8.Size = New System.Drawing.Size(1141, 577)
         Me.DataGridView8.TabIndex = 16
         '
+        'bs_생산E
+        '
+        Me.bs_생산E.DataMember = "생산에너지"
+        Me.bs_생산E.DataSource = Me.DSR
+        '
         'MonDataGridViewTextBoxColumn3
         '
         Me.MonDataGridViewTextBoxColumn3.DataPropertyName = "mon"
         Me.MonDataGridViewTextBoxColumn3.HeaderText = "mon"
         Me.MonDataGridViewTextBoxColumn3.Name = "MonDataGridViewTextBoxColumn3"
         Me.MonDataGridViewTextBoxColumn3.ReadOnly = True
-        Me.MonDataGridViewTextBoxColumn3.Width = 58
+        Me.MonDataGridViewTextBoxColumn3.Width = 56
+        '
+        '전력풍력
+        '
+        Me.전력풍력.DataPropertyName = "전력풍력"
+        Me.전력풍력.HeaderText = "전력풍력"
+        Me.전력풍력.Name = "전력풍력"
+        Me.전력풍력.ReadOnly = True
+        Me.전력풍력.Width = 82
+        '
+        '생산량수열
+        '
+        Me.생산량수열.DataPropertyName = "생산량수열"
+        Me.생산량수열.HeaderText = "생산량수열"
+        Me.생산량수열.Name = "생산량수열"
+        Me.생산량수열.ReadOnly = True
+        Me.생산량수열.Width = 95
+        '
+        '면적당생산량수열
+        '
+        Me.면적당생산량수열.DataPropertyName = "면적당생산량수열"
+        Me.면적당생산량수열.HeaderText = "면적당생산량수열"
+        Me.면적당생산량수열.Name = "면적당생산량수열"
+        Me.면적당생산량수열.ReadOnly = True
+        Me.면적당생산량수열.Width = 87
+        '
+        '전력풍력offsite
+        '
+        Me.전력풍력offsite.DataPropertyName = "전력풍력offsite"
+        Me.전력풍력offsite.HeaderText = "전력풍력offsite"
+        Me.전력풍력offsite.Name = "전력풍력offsite"
+        Me.전력풍력offsite.ReadOnly = True
+        Me.전력풍력offsite.Width = 112
         '
         '전력태양광DataGridViewTextBoxColumn
         '
@@ -1382,16 +1423,11 @@ Partial Class Frm_RepResult_Admin
         Me.면적당생산량지열DataGridViewTextBoxColumn.ReadOnly = True
         Me.면적당생산량지열DataGridViewTextBoxColumn.Width = 87
         '
-        'bs_생산E
-        '
-        Me.bs_생산E.DataMember = "생산에너지"
-        Me.bs_생산E.DataSource = Me.DSR
-        '
         'Frm_RepResult_Admin
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 12.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(827, 493)
+        Me.ClientSize = New System.Drawing.Size(1149, 650)
         Me.Controls.Add(Me.TabControl1)
         Me.Controls.Add(Me.bn_all)
         Me.Controls.Add(Me.StatusStrip1)
@@ -1549,13 +1585,6 @@ Partial Class Frm_RepResult_Admin
     Friend WithEvents 냉방보조에너지소요량DataGridViewTextBoxColumn As System.Windows.Forms.DataGridViewTextBoxColumn
     Friend WithEvents 급탕에너지소요량DataGridViewTextBoxColumn As System.Windows.Forms.DataGridViewTextBoxColumn
     Friend WithEvents 급탕보조에너지소요량DataGridViewTextBoxColumn As System.Windows.Forms.DataGridViewTextBoxColumn
-    Friend WithEvents MonDataGridViewTextBoxColumn3 As System.Windows.Forms.DataGridViewTextBoxColumn
-    Friend WithEvents 전력태양광DataGridViewTextBoxColumn As System.Windows.Forms.DataGridViewTextBoxColumn
-    Friend WithEvents 전력열병합DataGridViewTextBoxColumn As System.Windows.Forms.DataGridViewTextBoxColumn
-    Friend WithEvents 생산량태양열DataGridViewTextBoxColumn As System.Windows.Forms.DataGridViewTextBoxColumn
-    Friend WithEvents 생산량지열DataGridViewTextBoxColumn As System.Windows.Forms.DataGridViewTextBoxColumn
-    Friend WithEvents 면적당생산량태양열DataGridViewTextBoxColumn As System.Windows.Forms.DataGridViewTextBoxColumn
-    Friend WithEvents 면적당생산량지열DataGridViewTextBoxColumn As System.Windows.Forms.DataGridViewTextBoxColumn
     Friend WithEvents 에너지소요량DataGridViewTextBoxColumn As System.Windows.Forms.DataGridViewTextBoxColumn
     Friend WithEvents 단위면적당소요량DataGridViewTextBoxColumn As System.Windows.Forms.DataGridViewTextBoxColumn
     Friend WithEvents 난방면적DataGridViewTextBoxColumn1 As System.Windows.Forms.DataGridViewTextBoxColumn
@@ -1604,4 +1633,15 @@ Partial Class Frm_RepResult_Admin
     Friend WithEvents M10DataGridViewTextBoxColumn As System.Windows.Forms.DataGridViewTextBoxColumn
     Friend WithEvents M11DataGridViewTextBoxColumn As System.Windows.Forms.DataGridViewTextBoxColumn
     Friend WithEvents M12DataGridViewTextBoxColumn As System.Windows.Forms.DataGridViewTextBoxColumn
+    Friend WithEvents MonDataGridViewTextBoxColumn3 As System.Windows.Forms.DataGridViewTextBoxColumn
+    Friend WithEvents 전력풍력 As System.Windows.Forms.DataGridViewTextBoxColumn
+    Friend WithEvents 생산량수열 As System.Windows.Forms.DataGridViewTextBoxColumn
+    Friend WithEvents 면적당생산량수열 As System.Windows.Forms.DataGridViewTextBoxColumn
+    Friend WithEvents 전력풍력offsite As System.Windows.Forms.DataGridViewTextBoxColumn
+    Friend WithEvents 전력태양광DataGridViewTextBoxColumn As System.Windows.Forms.DataGridViewTextBoxColumn
+    Friend WithEvents 전력열병합DataGridViewTextBoxColumn As System.Windows.Forms.DataGridViewTextBoxColumn
+    Friend WithEvents 생산량태양열DataGridViewTextBoxColumn As System.Windows.Forms.DataGridViewTextBoxColumn
+    Friend WithEvents 생산량지열DataGridViewTextBoxColumn As System.Windows.Forms.DataGridViewTextBoxColumn
+    Friend WithEvents 면적당생산량태양열DataGridViewTextBoxColumn As System.Windows.Forms.DataGridViewTextBoxColumn
+    Friend WithEvents 면적당생산량지열DataGridViewTextBoxColumn As System.Windows.Forms.DataGridViewTextBoxColumn
 End Class

ArinWarev1/Forms_Basic/Frm_RepResult_Admin.resx

@@ -112,15 +112,15 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="DSR.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="DSR.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>647, 17</value>
   </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="ToolStripButton49.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
@@ -206,7 +206,7 @@
         gg==
 </value>
   </data>
-  <metadata name="bn_all.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="bn_all.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>445, 17</value>
   </metadata>
   <data name="ToolStripButton51.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -226,31 +226,61 @@
         RlfZIFMAAAAASUVORK5CYII=
 </value>
   </data>
-  <metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>529, 17</value>
   </metadata>
-  <metadata name="bsmain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="bsmain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>722, 17</value>
   </metadata>
-  <metadata name="F.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="F.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="M00.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="M00.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="bs_max.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="F.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>17, 56</value>
+    <value>True</value>
   </metadata>
-  <metadata name="bs_면적.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="M00.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>17, 17</value>
+    <value>True</value>
   </metadata>
-  <metadata name="bs_소요량.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="전력풍력.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>111, 17</value>
+    <value>True</value>
   </metadata>
-  <metadata name="bs_1차소요량.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="생산량수열.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>218, 17</value>
+    <value>True</value>
   </metadata>
-  <metadata name="bs_생산E.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="면적당생산량수열.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="전력풍력offsite.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="bs_생산E.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>344, 17</value>
   </metadata>
+  <metadata name="bs_max.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 56</value>
+  </metadata>
+  <metadata name="bs_max.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 56</value>
+  </metadata>
+  <metadata name="bs_면적.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="bs_면적.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="bs_소요량.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>111, 17</value>
+  </metadata>
+  <metadata name="bs_소요량.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>111, 17</value>
+  </metadata>
+  <metadata name="bs_1차소요량.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>218, 17</value>
+  </metadata>
+  <metadata name="bs_1차소요량.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>218, 17</value>
+  </metadata>
 </root>

ArinWarev1/Forms_Input/Frm_New.resx

@@ -117,46 +117,64 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="Label456.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="Label33.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="Label455.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="Label25.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="Label4.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="Label26.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="Label6.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="Label27.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="Label7.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="Label24.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="Label8.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="Label28.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="Label9.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="Label29.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="Label10.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="Label23.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="Label11.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="Label22.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="Label12.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="Label37.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="Label13.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="Label45.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="Label14.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="Label39.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="Label15.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="Label40.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="Label16.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="Label41.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="Label44.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="Label1.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="Label42.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="Label43.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="Label34.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="Label3.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
   <metadata name="Label17.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -168,80 +186,104 @@
   <metadata name="Label19.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="Label20.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="Label32.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
   <metadata name="Label21.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="Label465.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="Label20.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
-  <metadata name="Label23.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
-  <metadata name="Label24.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
-  <metadata name="Label25.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
-  <metadata name="Label457.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
-  <metadata name="Label458.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
-  <metadata name="Label459.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
-  <metadata name="Label30.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
-  <metadata name="Label31.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
-  <metadata name="Label3.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
-  <metadata name="Label2.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
   <metadata name="Label5.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="Label22.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="Label459.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="Label27.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="Label457.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="Label29.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="Label31.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="Label28.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="Label30.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="Label26.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="Label458.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="Label32.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="Label35.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="Label33.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="Label36.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="Label34.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="Label38.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="Label4.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="Label456.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="Label7.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="Label6.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="Label455.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="Label16.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="Label8.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="Label9.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="Label15.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="Label10.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="Label14.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="Label13.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="Label11.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="Label12.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="Label465.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="Label2.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="Label46.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="Label47.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
   <metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>222, 17</value>
+    <value>17, 17</value>
   </metadata>
   <metadata name="DS.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>286, 17</value>
+    <value>81, 17</value>
   </metadata>
   <metadata name="bn.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>353, 17</value>
+    <value>148, 17</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>40</value>

ArinWarev1/Forms_Input/Frm_New.vb

@@ -184,15 +184,15 @@
 
     Private Sub Binding_Zone()
 
-        '//신재생
+        ''//신재생
-        Dim bs_기기종류ComboBox As New BindingSource(DSET1, "tbl_common")
+        'Dim bs_기기종류ComboBox As New BindingSource(DSET1, "tbl_common")
-        bs_기기종류ComboBox.Filter = "gubun='1028'"
+        'bs_기기종류ComboBox.Filter = "gubun='1028'"
-        bs_기기종류ComboBox.Sort = "code"
+        'bs_기기종류ComboBox.Sort = "code"
-        Me.기기종류ComboBox.DataSource = bs_기기종류ComboBox
+        'Me.기기종류ComboBox.DataSource = bs_기기종류ComboBox
-        기기종류ComboBox.DisplayMember = "name"
+        '기기종류ComboBox.DisplayMember = "name"
-        기기종류ComboBox.ValueMember = "name"
+        '기기종류ComboBox.ValueMember = "name"
-        Me.기기종류ComboBox.DataBindings.Add("selectedvalue", Me.bs, "기기종류")
+        'Me.기기종류ComboBox.DataBindings.Add("selectedvalue", Me.bs, "기기종류")
-        AddHandler 기기종류ComboBox.KeyDown, AddressOf Cmb_DeleteVal
+        'AddHandler 기기종류ComboBox.KeyDown, AddressOf Cmb_DeleteVal
 
         Dim bs_가동연료ComboBox As New BindingSource(DSET1, "tbl_common")
         bs_가동연료ComboBox.Filter = "gubun='1066'"
@@ -682,30 +682,52 @@
                 열병합Panel.Enabled = False
                 태양광Panel.Enabled = False
                 지열Panel.Enabled = False
+                panWind.Enabled = False
+
             ElseIf 기기종류ComboBox.Text = "열병합" Then
                 태양열Panel.Enabled = False
                 축열탱크Panel.Enabled = False
                 열병합Panel.Enabled = True
                 태양광Panel.Enabled = False
                 지열Panel.Enabled = False
+                panWind.Enabled = False
             ElseIf 기기종류ComboBox.Text = "태양광" Then
                 태양열Panel.Enabled = False
                 축열탱크Panel.Enabled = False
                 열병합Panel.Enabled = False
                 태양광Panel.Enabled = True
                 지열Panel.Enabled = False
+                panWind.Enabled = False
             ElseIf 기기종류ComboBox.Text = "지열" Then
                 태양열Panel.Enabled = False
                 축열탱크Panel.Enabled = False
                 열병합Panel.Enabled = False
                 태양광Panel.Enabled = False
                 지열Panel.Enabled = True
+                panWind.Enabled = False
+                Me.tabcontrol1.SelectedIndex = 0
+            ElseIf 기기종류ComboBox.Text = "수열" Then
+                태양열Panel.Enabled = False
+                축열탱크Panel.Enabled = False
+                열병합Panel.Enabled = False
+                태양광Panel.Enabled = False
+                지열Panel.Enabled = True
+                panWind.Enabled = False
+                Me.tabcontrol1.SelectedIndex = 1
+            ElseIf 기기종류ComboBox.Text = "풍력" Then
+                태양열Panel.Enabled = False
+                축열탱크Panel.Enabled = False
+                열병합Panel.Enabled = False
+                태양광Panel.Enabled = False
+                지열Panel.Enabled = False
+                panWind.Enabled = True
             Else
                 태양열Panel.Enabled = False
                 축열탱크Panel.Enabled = False
                 열병합Panel.Enabled = False
                 태양광Panel.Enabled = False
                 지열Panel.Enabled = False
+                panWind.Enabled = False
             End If
         Catch ex As Exception
 
@@ -868,6 +890,21 @@
         End Try
 
 
+    End Sub
+    Private Sub cmb_수열팽창설치여부_SelectedValueChanged(ByVal sender As Object, ByVal e As System.EventArgs) Handles cmb_수열팽창설치여부.SelectedValueChanged
+
+        Try
+            Select Case Me.cmb_수열팽창설치여부.Text
+                Case "예"
+                    Me.tb_수열팽창탱크체적.Enabled = True
+                Case Else
+                    Me.tb_수열팽창탱크체적.Enabled = False
+            End Select
+        Catch ex As Exception
+
+        End Try
+
+
     End Sub
 
     Private Sub cmb_모듈기울기_SelectedValueChanged(ByVal sender As Object, ByVal e As System.EventArgs) Handles cmb_모듈기울기.SelectedValueChanged

ArinWarev1/Forms_Input/Frm_kongjo.Designer.vb

@@ -23,28 +23,30 @@ Partial Class Frm_kongjo
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
-        Dim Label169 As System.Windows.Forms.Label
+        Dim Label7 As System.Windows.Forms.Label
-        Dim Label170 As System.Windows.Forms.Label
-        Dim Label171 As System.Windows.Forms.Label
-        Dim Label172 As System.Windows.Forms.Label
-        Dim Label173 As System.Windows.Forms.Label
-        Dim Label174 As System.Windows.Forms.Label
-        Dim Label175 As System.Windows.Forms.Label
-        Dim Label179 As System.Windows.Forms.Label
-        Dim Label178 As System.Windows.Forms.Label
-        Dim Label177 As System.Windows.Forms.Label
         Dim Label176 As System.Windows.Forms.Label
-        Dim Label167 As System.Windows.Forms.Label
+        Dim Label6 As System.Windows.Forms.Label
-        Dim Label168 As System.Windows.Forms.Label
+        Dim Label177 As System.Windows.Forms.Label
-        Dim Label1 As System.Windows.Forms.Label
+        Dim Label5 As System.Windows.Forms.Label
         Dim Label3 As System.Windows.Forms.Label
         Dim Label4 As System.Windows.Forms.Label
-        Dim Label5 As System.Windows.Forms.Label
+        Dim Label178 As System.Windows.Forms.Label
-        Dim Label6 As System.Windows.Forms.Label
+        Dim Label179 As System.Windows.Forms.Label
-        Dim Label7 As System.Windows.Forms.Label
+        Dim Label11 As System.Windows.Forms.Label
+        Dim Label1 As System.Windows.Forms.Label
+        Dim Label174 As System.Windows.Forms.Label
+        Dim Label169 As System.Windows.Forms.Label
+        Dim Label9 As System.Windows.Forms.Label
+        Dim Label8 As System.Windows.Forms.Label
+        Dim Label175 As System.Windows.Forms.Label
+        Dim Label170 As System.Windows.Forms.Label
+        Dim Label168 As System.Windows.Forms.Label
+        Dim Label173 As System.Windows.Forms.Label
+        Dim Label10 As System.Windows.Forms.Label
+        Dim Label172 As System.Windows.Forms.Label
+        Dim Label167 As System.Windows.Forms.Label
+        Dim Label171 As System.Windows.Forms.Label
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(Frm_kongjo))
-        Me.tb_zone_cnt = New System.Windows.Forms.TextBox()
-        Me.Label48 = New System.Windows.Forms.Label()
         Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
         Me.dv = New CEnergy.arindv()
         Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn()
@@ -77,35 +79,45 @@ Partial Class Frm_kongjo
         Me.tb_01 = New Eco2Ar.MyTb()
         Me.tb_02 = New Eco2Ar.MyTb()
         Me.tb_03 = New Eco2Ar.MyTb()
+        Me.Tb_집열기방사율 = New Eco2Ar.MyTb()
         Me.tb_13 = New Eco2Ar.MyTb()
         Me.열교환기유형ComboBox = New Eco2Ar.MyCmb()
         Me.리턴공기혼합여부ComboBox = New Eco2Ar.MyCmb()
+        Me.집열기방위ComboBox = New Eco2Ar.MyCmb()
         Me.가습기유형ComboBox = New Eco2Ar.MyCmb()
+        Me.Tb_집열기면적 = New Eco2Ar.MyTb()
+        Me.공기식태양열적용ComboBox = New Eco2Ar.MyCmb()
         Me.tb_08 = New Eco2Ar.MyTb()
         Me.외기냉방제어유무ComboBox = New Eco2Ar.MyCmb()
         Me.PictureBox1 = New System.Windows.Forms.PictureBox()
         Me.Panel1 = New System.Windows.Forms.Panel()
         Me.TextBox1 = New System.Windows.Forms.TextBox()
+        Me.tb_zone_cnt = New System.Windows.Forms.TextBox()
         Me.Label2 = New System.Windows.Forms.Label()
-        Label169 = New System.Windows.Forms.Label()
+        Me.Label48 = New System.Windows.Forms.Label()
-        Label170 = New System.Windows.Forms.Label()
+        Label7 = New System.Windows.Forms.Label()
-        Label171 = New System.Windows.Forms.Label()
-        Label172 = New System.Windows.Forms.Label()
-        Label173 = New System.Windows.Forms.Label()
-        Label174 = New System.Windows.Forms.Label()
-        Label175 = New System.Windows.Forms.Label()
-        Label179 = New System.Windows.Forms.Label()
-        Label178 = New System.Windows.Forms.Label()
-        Label177 = New System.Windows.Forms.Label()
         Label176 = New System.Windows.Forms.Label()
-        Label167 = New System.Windows.Forms.Label()
+        Label6 = New System.Windows.Forms.Label()
-        Label168 = New System.Windows.Forms.Label()
+        Label177 = New System.Windows.Forms.Label()
-        Label1 = New System.Windows.Forms.Label()
+        Label5 = New System.Windows.Forms.Label()
         Label3 = New System.Windows.Forms.Label()
         Label4 = New System.Windows.Forms.Label()
-        Label5 = New System.Windows.Forms.Label()
+        Label178 = New System.Windows.Forms.Label()
-        Label6 = New System.Windows.Forms.Label()
+        Label179 = New System.Windows.Forms.Label()
-        Label7 = New System.Windows.Forms.Label()
+        Label11 = New System.Windows.Forms.Label()
+        Label1 = New System.Windows.Forms.Label()
+        Label174 = New System.Windows.Forms.Label()
+        Label169 = New System.Windows.Forms.Label()
+        Label9 = New System.Windows.Forms.Label()
+        Label8 = New System.Windows.Forms.Label()
+        Label175 = New System.Windows.Forms.Label()
+        Label170 = New System.Windows.Forms.Label()
+        Label168 = New System.Windows.Forms.Label()
+        Label173 = New System.Windows.Forms.Label()
+        Label10 = New System.Windows.Forms.Label()
+        Label172 = New System.Windows.Forms.Label()
+        Label167 = New System.Windows.Forms.Label()
+        Label171 = New System.Windows.Forms.Label()
         CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SplitContainer1.Panel1.SuspendLayout()
         Me.SplitContainer1.Panel2.SuspendLayout()
@@ -123,121 +135,17 @@ Partial Class Frm_kongjo
         Me.Panel1.SuspendLayout()
         Me.SuspendLayout()
         '
-        'Label169
+        'Label7
         '
-        Label169.AutoSize = True
+        Label7.AutoSize = True
-        Label169.BackColor = System.Drawing.Color.FromArgb(CType(CType(219, Byte), Integer), CType(CType(221, Byte), Integer), CType(CType(223, Byte), Integer))
+        Label7.BackColor = System.Drawing.Color.FromArgb(CType(CType(243, Byte), Integer), CType(CType(244, Byte), Integer), CType(CType(246, Byte), Integer))
-        Label169.ForeColor = System.Drawing.SystemColors.ControlDarkDark
+        Label7.ForeColor = System.Drawing.SystemColors.ControlDarkDark
-        Label169.Location = New System.Drawing.Point(6, 46)
+        Label7.Location = New System.Drawing.Point(7, 68)
-        Label169.Name = "Label169"
+        Label7.Name = "Label7"
-        Label169.Size = New System.Drawing.Size(140, 24)
+        Label7.Size = New System.Drawing.Size(112, 12)
-        Label169.TabIndex = 10
+        Label7.TabIndex = 10
-        Label169.Text = "공조급기온도의 설정치" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & " (난방)[C]:"
+        Label7.Text = "급기 풍량[CMH]:"
-        Label169.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
-        '
-        'Label170
-        '
-        Label170.AutoSize = True
-        Label170.BackColor = System.Drawing.Color.FromArgb(CType(CType(219, Byte), Integer), CType(CType(221, Byte), Integer), CType(CType(223, Byte), Integer))
-        Label170.ForeColor = System.Drawing.SystemColors.ControlDarkDark
-        Label170.Location = New System.Drawing.Point(6, 24)
-        Label170.Name = "Label170"
-        Label170.Size = New System.Drawing.Size(62, 12)
-        Label170.TabIndex = 8
-        Label170.Text = "공조방식:"
-        Label170.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        '
-        'Label171
-        '
-        Label171.AutoSize = True
-        Label171.BackColor = System.Drawing.Color.FromArgb(CType(CType(219, Byte), Integer), CType(CType(221, Byte), Integer), CType(CType(223, Byte), Integer))
-        Label171.ForeColor = System.Drawing.SystemColors.ControlDarkDark
-        Label171.Location = New System.Drawing.Point(6, 75)
-        Label171.Name = "Label171"
-        Label171.Size = New System.Drawing.Size(140, 24)
-        Label171.TabIndex = 8
-        Label171.Text = "공조급기온도의 설정치" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & " (냉방)[C]:"
-        Label171.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
-        '
-        'Label172
-        '
-        Label172.AutoSize = True
-        Label172.BackColor = System.Drawing.Color.FromArgb(CType(CType(219, Byte), Integer), CType(CType(221, Byte), Integer), CType(CType(223, Byte), Integer))
-        Label172.ForeColor = System.Drawing.SystemColors.ControlDarkDark
-        Label172.Location = New System.Drawing.Point(6, 108)
-        Label172.Name = "Label172"
-        Label172.Size = New System.Drawing.Size(151, 12)
-        Label172.TabIndex = 10
-        Label172.Text = "공조기 최대풍량[CMH]:"
-        '
-        'Label173
-        '
-        Label173.AutoSize = True
-        Label173.BackColor = System.Drawing.Color.FromArgb(CType(CType(219, Byte), Integer), CType(CType(221, Byte), Integer), CType(CType(223, Byte), Integer))
-        Label173.ForeColor = System.Drawing.SystemColors.ControlDarkDark
-        Label173.Location = New System.Drawing.Point(6, 139)
-        Label173.Name = "Label173"
-        Label173.Size = New System.Drawing.Size(124, 12)
-        Label173.TabIndex = 10
-        Label173.Text = "리턴공기 혼합 여부:"
-        '
-        'Label174
-        '
-        Label174.AutoSize = True
-        Label174.BackColor = System.Drawing.Color.FromArgb(CType(CType(219, Byte), Integer), CType(CType(221, Byte), Integer), CType(CType(223, Byte), Integer))
-        Label174.ForeColor = System.Drawing.SystemColors.ControlDarkDark
-        Label174.Location = New System.Drawing.Point(6, 168)
-        Label174.Name = "Label174"
-        Label174.Size = New System.Drawing.Size(80, 12)
-        Label174.TabIndex = 10
-        Label174.Text = "가습기 유형:"
-        '
-        'Label175
-        '
-        Label175.AutoSize = True
-        Label175.BackColor = System.Drawing.Color.FromArgb(CType(CType(219, Byte), Integer), CType(CType(221, Byte), Integer), CType(CType(223, Byte), Integer))
-        Label175.ForeColor = System.Drawing.SystemColors.ControlDarkDark
-        Label175.Location = New System.Drawing.Point(6, 198)
-        Label175.Name = "Label175"
-        Label175.Size = New System.Drawing.Size(124, 12)
-        Label175.TabIndex = 10
-        Label175.Text = "외기냉방 제어 유무:"
-        '
-        'Label179
-        '
-        Label179.AutoSize = True
-        Label179.BackColor = System.Drawing.Color.FromArgb(CType(CType(243, Byte), Integer), CType(CType(244, Byte), Integer), CType(CType(246, Byte), Integer))
-        Label179.ForeColor = System.Drawing.SystemColors.ControlDarkDark
-        Label179.Location = New System.Drawing.Point(7, 267)
-        Label179.Name = "Label179"
-        Label179.Size = New System.Drawing.Size(101, 12)
-        Label179.TabIndex = 10
-        Label179.Text = "배기팬 효율[-]:"
-        Label179.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
-        '
-        'Label178
-        '
-        Label178.AutoSize = True
-        Label178.BackColor = System.Drawing.Color.FromArgb(CType(CType(243, Byte), Integer), CType(CType(244, Byte), Integer), CType(CType(246, Byte), Integer))
-        Label178.ForeColor = System.Drawing.SystemColors.ControlDarkDark
-        Label178.Location = New System.Drawing.Point(7, 239)
-        Label178.Name = "Label178"
-        Label178.Size = New System.Drawing.Size(101, 12)
-        Label178.TabIndex = 10
-        Label178.Text = "급기팬 효율[-]:"
-        Label178.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
-        '
-        'Label177
-        '
-        Label177.AutoSize = True
-        Label177.BackColor = System.Drawing.Color.FromArgb(CType(CType(243, Byte), Integer), CType(CType(244, Byte), Integer), CType(CType(246, Byte), Integer))
-        Label177.ForeColor = System.Drawing.SystemColors.ControlDarkDark
-        Label177.Location = New System.Drawing.Point(7, 210)
-        Label177.Name = "Label177"
-        Label177.Size = New System.Drawing.Size(137, 12)
-        Label177.TabIndex = 10
-        Label177.Text = "배기팬 압력손실[Pa]:"
-        Label177.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
         '
         'Label176
         '
@@ -251,38 +159,41 @@ Partial Class Frm_kongjo
         Label176.Text = "급기팬 압력손실[Pa]:"
         Label176.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
         '
-        'Label167
+        'Label6
         '
-        Label167.AutoSize = True
+        Label6.AutoSize = True
-        Label167.BackColor = System.Drawing.Color.FromArgb(CType(CType(219, Byte), Integer), CType(CType(221, Byte), Integer), CType(CType(223, Byte), Integer))
+        Label6.BackColor = System.Drawing.Color.FromArgb(CType(CType(243, Byte), Integer), CType(CType(244, Byte), Integer), CType(CType(246, Byte), Integer))
-        Label167.ForeColor = System.Drawing.SystemColors.ControlDarkDark
+        Label6.ForeColor = System.Drawing.SystemColors.ControlDarkDark
-        Label167.Location = New System.Drawing.Point(6, 253)
+        Label6.Location = New System.Drawing.Point(7, 96)
-        Label167.Name = "Label167"
+        Label6.Name = "Label6"
-        Label167.Size = New System.Drawing.Size(116, 12)
+        Label6.Size = New System.Drawing.Size(112, 12)
-        Label167.TabIndex = 10
+        Label6.TabIndex = 10
-        Label167.Text = "열회수율(난방)[-]"
+        Label6.Text = "배기 풍량[CMH]:"
+        Label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
         '
-        'Label168
+        'Label177
         '
-        Label168.AutoSize = True
+        Label177.AutoSize = True
-        Label168.BackColor = System.Drawing.Color.FromArgb(CType(CType(219, Byte), Integer), CType(CType(221, Byte), Integer), CType(CType(223, Byte), Integer))
+        Label177.BackColor = System.Drawing.Color.FromArgb(CType(CType(243, Byte), Integer), CType(CType(244, Byte), Integer), CType(CType(246, Byte), Integer))
-        Label168.ForeColor = System.Drawing.SystemColors.ControlDarkDark
+        Label177.ForeColor = System.Drawing.SystemColors.ControlDarkDark
-        Label168.Location = New System.Drawing.Point(6, 226)
+        Label177.Location = New System.Drawing.Point(7, 210)
-        Label168.Name = "Label168"
+        Label177.Name = "Label177"
-        Label168.Size = New System.Drawing.Size(93, 12)
+        Label177.Size = New System.Drawing.Size(137, 12)
-        Label168.TabIndex = 10
+        Label177.TabIndex = 10
-        Label168.Text = "열교환기 유형:"
+        Label177.Text = "배기팬 압력손실[Pa]:"
+        Label177.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
         '
-        'Label1
+        'Label5
         '
-        Label1.AutoSize = True
+        Label5.AutoSize = True
-        Label1.BackColor = System.Drawing.Color.FromArgb(CType(CType(219, Byte), Integer), CType(CType(221, Byte), Integer), CType(CType(223, Byte), Integer))
+        Label5.BackColor = System.Drawing.Color.FromArgb(CType(CType(243, Byte), Integer), CType(CType(244, Byte), Integer), CType(CType(246, Byte), Integer))
-        Label1.ForeColor = System.Drawing.SystemColors.ControlDarkDark
+        Label5.ForeColor = System.Drawing.SystemColors.ControlDarkDark
-        Label1.Location = New System.Drawing.Point(6, 279)
+        Label5.Location = New System.Drawing.Point(7, 125)
-        Label1.Name = "Label1"
+        Label5.Name = "Label5"
-        Label1.Size = New System.Drawing.Size(116, 12)
+        Label5.Size = New System.Drawing.Size(112, 12)
-        Label1.TabIndex = 14
+        Label5.TabIndex = 10
-        Label1.Text = "열회수율(냉방)[-]"
+        Label5.Text = "급기팬 동력[kW]:"
+        Label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
         '
         'Label3
         '
@@ -308,65 +219,186 @@ Partial Class Frm_kongjo
         Label4.Text = "배기팬 동력[kW]:"
         Label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
         '
-        'Label5
+        'Label178
         '
-        Label5.AutoSize = True
+        Label178.AutoSize = True
-        Label5.BackColor = System.Drawing.Color.FromArgb(CType(CType(243, Byte), Integer), CType(CType(244, Byte), Integer), CType(CType(246, Byte), Integer))
+        Label178.BackColor = System.Drawing.Color.FromArgb(CType(CType(243, Byte), Integer), CType(CType(244, Byte), Integer), CType(CType(246, Byte), Integer))
-        Label5.ForeColor = System.Drawing.SystemColors.ControlDarkDark
+        Label178.ForeColor = System.Drawing.SystemColors.ControlDarkDark
-        Label5.Location = New System.Drawing.Point(7, 125)
+        Label178.Location = New System.Drawing.Point(7, 239)
-        Label5.Name = "Label5"
+        Label178.Name = "Label178"
-        Label5.Size = New System.Drawing.Size(112, 12)
+        Label178.Size = New System.Drawing.Size(101, 12)
-        Label5.TabIndex = 10
+        Label178.TabIndex = 10
-        Label5.Text = "급기팬 동력[kW]:"
+        Label178.Text = "급기팬 효율[-]:"
-        Label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
+        Label178.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
         '
-        'Label6
+        'Label179
         '
-        Label6.AutoSize = True
+        Label179.AutoSize = True
-        Label6.BackColor = System.Drawing.Color.FromArgb(CType(CType(243, Byte), Integer), CType(CType(244, Byte), Integer), CType(CType(246, Byte), Integer))
+        Label179.BackColor = System.Drawing.Color.FromArgb(CType(CType(243, Byte), Integer), CType(CType(244, Byte), Integer), CType(CType(246, Byte), Integer))
-        Label6.ForeColor = System.Drawing.SystemColors.ControlDarkDark
+        Label179.ForeColor = System.Drawing.SystemColors.ControlDarkDark
-        Label6.Location = New System.Drawing.Point(7, 96)
+        Label179.Location = New System.Drawing.Point(7, 267)
-        Label6.Name = "Label6"
+        Label179.Name = "Label179"
-        Label6.Size = New System.Drawing.Size(112, 12)
+        Label179.Size = New System.Drawing.Size(101, 12)
-        Label6.TabIndex = 10
+        Label179.TabIndex = 10
-        Label6.Text = "배기 풍량[CMH]:"
+        Label179.Text = "배기팬 효율[-]:"
-        Label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
+        Label179.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
         '
-        'Label7
+        'Label11
         '
-        Label7.AutoSize = True
+        Label11.AutoSize = True
-        Label7.BackColor = System.Drawing.Color.FromArgb(CType(CType(243, Byte), Integer), CType(CType(244, Byte), Integer), CType(CType(246, Byte), Integer))
+        Label11.BackColor = System.Drawing.Color.FromArgb(CType(CType(219, Byte), Integer), CType(CType(221, Byte), Integer), CType(CType(223, Byte), Integer))
-        Label7.ForeColor = System.Drawing.SystemColors.ControlDarkDark
+        Label11.ForeColor = System.Drawing.SystemColors.ControlDarkDark
-        Label7.Location = New System.Drawing.Point(7, 68)
+        Label11.Location = New System.Drawing.Point(6, 392)
-        Label7.Name = "Label7"
+        Label11.Name = "Label11"
-        Label7.Size = New System.Drawing.Size(112, 12)
+        Label11.Size = New System.Drawing.Size(114, 12)
-        Label7.TabIndex = 10
+        Label11.TabIndex = 14
-        Label7.Text = "급기 풍량[CMH]:"
+        Label11.Text = "집열기 방사율[-]:"
-        Label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
         '
-        'tb_zone_cnt
+        'Label1
         '
-        Me.tb_zone_cnt.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Label1.AutoSize = True
-        Me.tb_zone_cnt.BackColor = System.Drawing.SystemColors.GrayText
+        Label1.BackColor = System.Drawing.Color.FromArgb(CType(CType(219, Byte), Integer), CType(CType(221, Byte), Integer), CType(CType(223, Byte), Integer))
-        Me.tb_zone_cnt.ForeColor = System.Drawing.Color.White
+        Label1.ForeColor = System.Drawing.SystemColors.ControlDarkDark
-        Me.tb_zone_cnt.Location = New System.Drawing.Point(290, 5)
+        Label1.Location = New System.Drawing.Point(6, 279)
-        Me.tb_zone_cnt.Name = "tb_zone_cnt"
+        Label1.Name = "Label1"
-        Me.tb_zone_cnt.Size = New System.Drawing.Size(58, 21)
+        Label1.Size = New System.Drawing.Size(116, 12)
-        Me.tb_zone_cnt.TabIndex = 1
+        Label1.TabIndex = 14
-        Me.tb_zone_cnt.Text = "0"
+        Label1.Text = "열회수율(냉방)[-]"
-        Me.tb_zone_cnt.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
         '
-        'Label48
+        'Label174
         '
-        Me.Label48.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Label174.AutoSize = True
-        Me.Label48.AutoSize = True
+        Label174.BackColor = System.Drawing.Color.FromArgb(CType(CType(219, Byte), Integer), CType(CType(221, Byte), Integer), CType(CType(223, Byte), Integer))
-        Me.Label48.ForeColor = System.Drawing.Color.DarkCyan
+        Label174.ForeColor = System.Drawing.SystemColors.ControlDarkDark
-        Me.Label48.Location = New System.Drawing.Point(172, 9)
+        Label174.Location = New System.Drawing.Point(6, 168)
-        Me.Label48.Name = "Label48"
+        Label174.Name = "Label174"
-        Me.Label48.Size = New System.Drawing.Size(111, 12)
+        Label174.Size = New System.Drawing.Size(80, 12)
-        Me.Label48.TabIndex = 0
+        Label174.TabIndex = 10
-        Me.Label48.Text = "적용된 입력존 수:"
+        Label174.Text = "가습기 유형:"
-        Me.Label48.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        '
+        'Label169
+        '
+        Label169.AutoSize = True
+        Label169.BackColor = System.Drawing.Color.FromArgb(CType(CType(219, Byte), Integer), CType(CType(221, Byte), Integer), CType(CType(223, Byte), Integer))
+        Label169.ForeColor = System.Drawing.SystemColors.ControlDarkDark
+        Label169.Location = New System.Drawing.Point(6, 46)
+        Label169.Name = "Label169"
+        Label169.Size = New System.Drawing.Size(140, 24)
+        Label169.TabIndex = 10
+        Label169.Text = "공조급기온도의 설정치" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & " (난방)[C]:"
+        Label169.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        '
+        'Label9
+        '
+        Label9.AutoSize = True
+        Label9.BackColor = System.Drawing.Color.FromArgb(CType(CType(219, Byte), Integer), CType(CType(221, Byte), Integer), CType(CType(223, Byte), Integer))
+        Label9.ForeColor = System.Drawing.SystemColors.ControlDarkDark
+        Label9.Location = New System.Drawing.Point(6, 344)
+        Label9.Name = "Label9"
+        Label9.Size = New System.Drawing.Size(80, 12)
+        Label9.TabIndex = 10
+        Label9.Text = "집열기 방위:"
+        '
+        'Label8
+        '
+        Label8.AutoSize = True
+        Label8.BackColor = System.Drawing.Color.FromArgb(CType(CType(219, Byte), Integer), CType(CType(221, Byte), Integer), CType(CType(223, Byte), Integer))
+        Label8.ForeColor = System.Drawing.SystemColors.ControlDarkDark
+        Label8.Location = New System.Drawing.Point(6, 320)
+        Label8.Name = "Label8"
+        Label8.Size = New System.Drawing.Size(119, 12)
+        Label8.TabIndex = 10
+        Label8.Text = "공기식태양열 적용:"
+        '
+        'Label175
+        '
+        Label175.AutoSize = True
+        Label175.BackColor = System.Drawing.Color.FromArgb(CType(CType(219, Byte), Integer), CType(CType(221, Byte), Integer), CType(CType(223, Byte), Integer))
+        Label175.ForeColor = System.Drawing.SystemColors.ControlDarkDark
+        Label175.Location = New System.Drawing.Point(6, 198)
+        Label175.Name = "Label175"
+        Label175.Size = New System.Drawing.Size(124, 12)
+        Label175.TabIndex = 10
+        Label175.Text = "외기냉방 제어 유무:"
+        '
+        'Label170
+        '
+        Label170.AutoSize = True
+        Label170.BackColor = System.Drawing.Color.FromArgb(CType(CType(219, Byte), Integer), CType(CType(221, Byte), Integer), CType(CType(223, Byte), Integer))
+        Label170.ForeColor = System.Drawing.SystemColors.ControlDarkDark
+        Label170.Location = New System.Drawing.Point(6, 24)
+        Label170.Name = "Label170"
+        Label170.Size = New System.Drawing.Size(62, 12)
+        Label170.TabIndex = 8
+        Label170.Text = "공조방식:"
+        Label170.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        '
+        'Label168
+        '
+        Label168.AutoSize = True
+        Label168.BackColor = System.Drawing.Color.FromArgb(CType(CType(219, Byte), Integer), CType(CType(221, Byte), Integer), CType(CType(223, Byte), Integer))
+        Label168.ForeColor = System.Drawing.SystemColors.ControlDarkDark
+        Label168.Location = New System.Drawing.Point(6, 226)
+        Label168.Name = "Label168"
+        Label168.Size = New System.Drawing.Size(93, 12)
+        Label168.TabIndex = 10
+        Label168.Text = "열교환기 유형:"
+        '
+        'Label173
+        '
+        Label173.AutoSize = True
+        Label173.BackColor = System.Drawing.Color.FromArgb(CType(CType(219, Byte), Integer), CType(CType(221, Byte), Integer), CType(CType(223, Byte), Integer))
+        Label173.ForeColor = System.Drawing.SystemColors.ControlDarkDark
+        Label173.Location = New System.Drawing.Point(6, 139)
+        Label173.Name = "Label173"
+        Label173.Size = New System.Drawing.Size(124, 12)
+        Label173.TabIndex = 10
+        Label173.Text = "리턴공기 혼합 여부:"
+        '
+        'Label10
+        '
+        Label10.AutoSize = True
+        Label10.BackColor = System.Drawing.Color.FromArgb(CType(CType(219, Byte), Integer), CType(CType(221, Byte), Integer), CType(CType(223, Byte), Integer))
+        Label10.ForeColor = System.Drawing.SystemColors.ControlDarkDark
+        Label10.Location = New System.Drawing.Point(6, 367)
+        Label10.Name = "Label10"
+        Label10.Size = New System.Drawing.Size(107, 12)
+        Label10.TabIndex = 10
+        Label10.Text = "집열기 면적[㎡]:"
+        '
+        'Label172
+        '
+        Label172.AutoSize = True
+        Label172.BackColor = System.Drawing.Color.FromArgb(CType(CType(219, Byte), Integer), CType(CType(221, Byte), Integer), CType(CType(223, Byte), Integer))
+        Label172.ForeColor = System.Drawing.SystemColors.ControlDarkDark
+        Label172.Location = New System.Drawing.Point(6, 108)
+        Label172.Name = "Label172"
+        Label172.Size = New System.Drawing.Size(151, 12)
+        Label172.TabIndex = 10
+        Label172.Text = "공조기 최대풍량[CMH]:"
+        '
+        'Label167
+        '
+        Label167.AutoSize = True
+        Label167.BackColor = System.Drawing.Color.FromArgb(CType(CType(219, Byte), Integer), CType(CType(221, Byte), Integer), CType(CType(223, Byte), Integer))
+        Label167.ForeColor = System.Drawing.SystemColors.ControlDarkDark
+        Label167.Location = New System.Drawing.Point(6, 253)
+        Label167.Name = "Label167"
+        Label167.Size = New System.Drawing.Size(116, 12)
+        Label167.TabIndex = 10
+        Label167.Text = "열회수율(난방)[-]"
+        '
+        'Label171
+        '
+        Label171.AutoSize = True
+        Label171.BackColor = System.Drawing.Color.FromArgb(CType(CType(219, Byte), Integer), CType(CType(221, Byte), Integer), CType(CType(223, Byte), Integer))
+        Label171.ForeColor = System.Drawing.SystemColors.ControlDarkDark
+        Label171.Location = New System.Drawing.Point(6, 75)
+        Label171.Name = "Label171"
+        Label171.Size = New System.Drawing.Size(140, 24)
+        Label171.TabIndex = 8
+        Label171.Text = "공조급기온도의 설정치" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & " (냉방)[C]:"
+        Label171.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         '
         'SplitContainer1
         '
@@ -574,7 +606,7 @@ Partial Class Frm_kongjo
         Me.Tb_배기팬동력.Name = "Tb_배기팬동력"
         Me.Tb_배기팬동력.NectControl = Nothing
         Me.Tb_배기팬동력.Size = New System.Drawing.Size(119, 21)
-        Me.Tb_배기팬동력.TabIndex = 14
+        Me.Tb_배기팬동력.TabIndex = 18
         Me.Tb_배기팬동력.TextFormat = Eco2Ar.MyTb.ETFormat.Normal
         '
         'Tb_급기팬동력
@@ -584,7 +616,7 @@ Partial Class Frm_kongjo
         Me.Tb_급기팬동력.Name = "Tb_급기팬동력"
         Me.Tb_급기팬동력.NectControl = Nothing
         Me.Tb_급기팬동력.Size = New System.Drawing.Size(119, 21)
-        Me.Tb_급기팬동력.TabIndex = 13
+        Me.Tb_급기팬동력.TabIndex = 17
         Me.Tb_급기팬동력.TextFormat = Eco2Ar.MyTb.ETFormat.Normal
         '
         'Tb_배기팬효율
@@ -594,7 +626,7 @@ Partial Class Frm_kongjo
         Me.Tb_배기팬효율.Name = "Tb_배기팬효율"
         Me.Tb_배기팬효율.NectControl = Nothing
         Me.Tb_배기팬효율.Size = New System.Drawing.Size(119, 21)
-        Me.Tb_배기팬효율.TabIndex = 18
+        Me.Tb_배기팬효율.TabIndex = 22
         Me.Tb_배기팬효율.TextFormat = Eco2Ar.MyTb.ETFormat.Normal
         '
         'Tb_배기풍량
@@ -604,7 +636,7 @@ Partial Class Frm_kongjo
         Me.Tb_배기풍량.Name = "Tb_배기풍량"
         Me.Tb_배기풍량.NectControl = Nothing
         Me.Tb_배기풍량.Size = New System.Drawing.Size(119, 21)
-        Me.Tb_배기풍량.TabIndex = 12
+        Me.Tb_배기풍량.TabIndex = 16
         Me.Tb_배기풍량.TextFormat = Eco2Ar.MyTb.ETFormat.Normal
         '
         'Tb_급기팬효율
@@ -614,7 +646,7 @@ Partial Class Frm_kongjo
         Me.Tb_급기팬효율.Name = "Tb_급기팬효율"
         Me.Tb_급기팬효율.NectControl = Nothing
         Me.Tb_급기팬효율.Size = New System.Drawing.Size(119, 21)
-        Me.Tb_급기팬효율.TabIndex = 17
+        Me.Tb_급기팬효율.TabIndex = 21
         Me.Tb_급기팬효율.TextFormat = Eco2Ar.MyTb.ETFormat.Normal
         '
         'Tb_배기팬압력손실
@@ -624,7 +656,7 @@ Partial Class Frm_kongjo
         Me.Tb_배기팬압력손실.Name = "Tb_배기팬압력손실"
         Me.Tb_배기팬압력손실.NectControl = Nothing
         Me.Tb_배기팬압력손실.Size = New System.Drawing.Size(119, 21)
-        Me.Tb_배기팬압력손실.TabIndex = 16
+        Me.Tb_배기팬압력손실.TabIndex = 20
         Me.Tb_배기팬압력손실.TextFormat = Eco2Ar.MyTb.ETFormat.Normal
         '
         'Tb_급기풍량
@@ -634,7 +666,7 @@ Partial Class Frm_kongjo
         Me.Tb_급기풍량.Name = "Tb_급기풍량"
         Me.Tb_급기풍량.NectControl = Nothing
         Me.Tb_급기풍량.Size = New System.Drawing.Size(119, 21)
-        Me.Tb_급기풍량.TabIndex = 11
+        Me.Tb_급기풍량.TabIndex = 15
         Me.Tb_급기풍량.TextFormat = Eco2Ar.MyTb.ETFormat.Normal
         '
         'Tb_급기팬압력손실
@@ -644,7 +676,7 @@ Partial Class Frm_kongjo
         Me.Tb_급기팬압력손실.Name = "Tb_급기팬압력손실"
         Me.Tb_급기팬압력손실.NectControl = Nothing
         Me.Tb_급기팬압력손실.Size = New System.Drawing.Size(119, 21)
-        Me.Tb_급기팬압력손실.TabIndex = 15
+        Me.Tb_급기팬압력손실.TabIndex = 19
         Me.Tb_급기팬압력손실.TextFormat = Eco2Ar.MyTb.ETFormat.Normal
         '
         'Cmb_팬효율산출방식
@@ -656,7 +688,7 @@ Partial Class Frm_kongjo
         Me.Cmb_팬효율산출방식.Name = "Cmb_팬효율산출방식"
         Me.Cmb_팬효율산출방식.NectControl = Nothing
         Me.Cmb_팬효율산출방식.Size = New System.Drawing.Size(119, 20)
-        Me.Cmb_팬효율산출방식.TabIndex = 10
+        Me.Cmb_팬효율산출방식.TabIndex = 14
         '
         'PictureBox2
         '
@@ -673,26 +705,34 @@ Partial Class Frm_kongjo
         Me.GroupBox1.Controls.Add(Me.tb_01)
         Me.GroupBox1.Controls.Add(Me.tb_02)
         Me.GroupBox1.Controls.Add(Me.tb_03)
+        Me.GroupBox1.Controls.Add(Label11)
+        Me.GroupBox1.Controls.Add(Me.Tb_집열기방사율)
         Me.GroupBox1.Controls.Add(Label1)
         Me.GroupBox1.Controls.Add(Me.tb_13)
         Me.GroupBox1.Controls.Add(Label174)
         Me.GroupBox1.Controls.Add(Label169)
         Me.GroupBox1.Controls.Add(Me.열교환기유형ComboBox)
+        Me.GroupBox1.Controls.Add(Label9)
+        Me.GroupBox1.Controls.Add(Label8)
         Me.GroupBox1.Controls.Add(Label175)
         Me.GroupBox1.Controls.Add(Label170)
         Me.GroupBox1.Controls.Add(Label168)
         Me.GroupBox1.Controls.Add(Label173)
+        Me.GroupBox1.Controls.Add(Label10)
         Me.GroupBox1.Controls.Add(Label172)
         Me.GroupBox1.Controls.Add(Label167)
         Me.GroupBox1.Controls.Add(Label171)
         Me.GroupBox1.Controls.Add(Me.리턴공기혼합여부ComboBox)
+        Me.GroupBox1.Controls.Add(Me.집열기방위ComboBox)
         Me.GroupBox1.Controls.Add(Me.가습기유형ComboBox)
+        Me.GroupBox1.Controls.Add(Me.Tb_집열기면적)
+        Me.GroupBox1.Controls.Add(Me.공기식태양열적용ComboBox)
         Me.GroupBox1.Controls.Add(Me.tb_08)
         Me.GroupBox1.Controls.Add(Me.외기냉방제어유무ComboBox)
         Me.GroupBox1.Controls.Add(Me.PictureBox1)
         Me.GroupBox1.Location = New System.Drawing.Point(20, 83)
         Me.GroupBox1.Name = "GroupBox1"
-        Me.GroupBox1.Size = New System.Drawing.Size(277, 322)
+        Me.GroupBox1.Size = New System.Drawing.Size(277, 434)
         Me.GroupBox1.TabIndex = 5
         Me.GroupBox1.TabStop = False
         '
@@ -736,6 +776,16 @@ Partial Class Frm_kongjo
         Me.tb_03.TabIndex = 3
         Me.tb_03.TextFormat = Eco2Ar.MyTb.ETFormat.Normal
         '
+        'Tb_집열기방사율
+        '
+        Me.Tb_집열기방사율.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.bs, "집열기방사율", True))
+        Me.Tb_집열기방사율.Location = New System.Drawing.Point(150, 389)
+        Me.Tb_집열기방사율.Name = "Tb_집열기방사율"
+        Me.Tb_집열기방사율.NectControl = Nothing
+        Me.Tb_집열기방사율.Size = New System.Drawing.Size(119, 21)
+        Me.Tb_집열기방사율.TabIndex = 13
+        Me.Tb_집열기방사율.TextFormat = Eco2Ar.MyTb.ETFormat.Normal
+        '
         'tb_13
         '
         Me.tb_13.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.bs, "열회수율냉", True))
@@ -766,6 +816,17 @@ Partial Class Frm_kongjo
         Me.리턴공기혼합여부ComboBox.Size = New System.Drawing.Size(119, 20)
         Me.리턴공기혼합여부ComboBox.TabIndex = 4
         '
+        '집열기방위ComboBox
+        '
+        Me.집열기방위ComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.집열기방위ComboBox.FormattingEnabled = True
+        Me.집열기방위ComboBox.Items.AddRange(New Object() {"없음", "남", "남동", "남서", "동", "서", "북동", "북서", "북"})
+        Me.집열기방위ComboBox.Location = New System.Drawing.Point(150, 340)
+        Me.집열기방위ComboBox.Name = "집열기방위ComboBox"
+        Me.집열기방위ComboBox.NectControl = Nothing
+        Me.집열기방위ComboBox.Size = New System.Drawing.Size(119, 20)
+        Me.집열기방위ComboBox.TabIndex = 11
+        '
         '가습기유형ComboBox
         '
         Me.가습기유형ComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
@@ -776,6 +837,27 @@ Partial Class Frm_kongjo
         Me.가습기유형ComboBox.Size = New System.Drawing.Size(119, 20)
         Me.가습기유형ComboBox.TabIndex = 5
         '
+        'Tb_집열기면적
+        '
+        Me.Tb_집열기면적.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.bs, "집열기면적", True))
+        Me.Tb_집열기면적.Location = New System.Drawing.Point(150, 364)
+        Me.Tb_집열기면적.Name = "Tb_집열기면적"
+        Me.Tb_집열기면적.NectControl = Nothing
+        Me.Tb_집열기면적.Size = New System.Drawing.Size(119, 21)
+        Me.Tb_집열기면적.TabIndex = 12
+        Me.Tb_집열기면적.TextFormat = Eco2Ar.MyTb.ETFormat.Normal
+        '
+        '공기식태양열적용ComboBox
+        '
+        Me.공기식태양열적용ComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.공기식태양열적용ComboBox.FormattingEnabled = True
+        Me.공기식태양열적용ComboBox.Items.AddRange(New Object() {"예", "아니오"})
+        Me.공기식태양열적용ComboBox.Location = New System.Drawing.Point(150, 316)
+        Me.공기식태양열적용ComboBox.Name = "공기식태양열적용ComboBox"
+        Me.공기식태양열적용ComboBox.NectControl = Nothing
+        Me.공기식태양열적용ComboBox.Size = New System.Drawing.Size(119, 20)
+        Me.공기식태양열적용ComboBox.TabIndex = 10
+        '
         'tb_08
         '
         Me.tb_08.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.bs, "열회수율", True))
@@ -801,7 +883,7 @@ Partial Class Frm_kongjo
         Me.PictureBox1.BackColor = System.Drawing.Color.FromArgb(CType(CType(219, Byte), Integer), CType(CType(221, Byte), Integer), CType(CType(223, Byte), Integer))
         Me.PictureBox1.Location = New System.Drawing.Point(1, 9)
         Me.PictureBox1.Name = "PictureBox1"
-        Me.PictureBox1.Size = New System.Drawing.Size(273, 309)
+        Me.PictureBox1.Size = New System.Drawing.Size(273, 419)
         Me.PictureBox1.TabIndex = 11
         Me.PictureBox1.TabStop = False
         '
@@ -830,6 +912,18 @@ Partial Class Frm_kongjo
         Me.TextBox1.Text = "0"
         Me.TextBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
         '
+        'tb_zone_cnt
+        '
+        Me.tb_zone_cnt.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.tb_zone_cnt.BackColor = System.Drawing.SystemColors.GrayText
+        Me.tb_zone_cnt.ForeColor = System.Drawing.Color.White
+        Me.tb_zone_cnt.Location = New System.Drawing.Point(290, 5)
+        Me.tb_zone_cnt.Name = "tb_zone_cnt"
+        Me.tb_zone_cnt.Size = New System.Drawing.Size(58, 21)
+        Me.tb_zone_cnt.TabIndex = 1
+        Me.tb_zone_cnt.Text = "0"
+        Me.tb_zone_cnt.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
+        '
         'Label2
         '
         Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -842,6 +936,18 @@ Partial Class Frm_kongjo
         Me.Label2.Text = "적용된 면적합(㎡):"
         Me.Label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight
         '
+        'Label48
+        '
+        Me.Label48.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label48.AutoSize = True
+        Me.Label48.ForeColor = System.Drawing.Color.DarkCyan
+        Me.Label48.Location = New System.Drawing.Point(172, 9)
+        Me.Label48.Name = "Label48"
+        Me.Label48.Size = New System.Drawing.Size(111, 12)
+        Me.Label48.TabIndex = 0
+        Me.Label48.Text = "적용된 입력존 수:"
+        Me.Label48.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        '
         'Frm_kongjo
         '
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None
@@ -921,4 +1027,8 @@ Partial Class Frm_kongjo
     Friend WithEvents ToolStripSeparator2 As System.Windows.Forms.ToolStripSeparator
     Friend WithEvents lb_code As System.Windows.Forms.ToolStripLabel
     Friend WithEvents DataGridViewTextBoxColumn1 As System.Windows.Forms.DataGridViewTextBoxColumn
+    Friend WithEvents Tb_집열기방사율 As Eco2Ar.MyTb
+    Friend WithEvents 집열기방위ComboBox As Eco2Ar.MyCmb
+    Friend WithEvents Tb_집열기면적 As Eco2Ar.MyTb
+    Friend WithEvents 공기식태양열적용ComboBox As Eco2Ar.MyCmb
 End Class

ArinWarev1/Forms_Input/Frm_kongjo.resx

@@ -117,46 +117,19 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="Label169.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="Label7.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
-  <metadata name="Label170.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
-  <metadata name="Label171.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
-  <metadata name="Label172.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
-  <metadata name="Label173.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
-  <metadata name="Label174.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
-  <metadata name="Label175.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
-  <metadata name="Label179.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
-  <metadata name="Label178.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
-  <metadata name="Label177.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
   <metadata name="Label176.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="Label167.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="Label6.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="Label168.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="Label177.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="Label1.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="Label5.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
   <metadata name="Label3.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -165,13 +138,52 @@
   <metadata name="Label4.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="Label5.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="Label178.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="Label6.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="Label179.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="Label7.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="Label11.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="Label1.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="Label174.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="Label169.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="Label9.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="Label8.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="Label175.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="Label170.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="Label168.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="Label173.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="Label10.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="Label172.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="Label167.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="Label171.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
   <metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

ArinWarev1/Forms_Input/Frm_kongjo.vb

@@ -272,6 +272,9 @@
         Cmb_팬효율산출방식.ValueMember = "name"
         Me.Cmb_팬효율산출방식.DataBindings.Add("selectedvalue", Me.bs, "팬효율산출방식")
 
+        Me.공기식태양열적용ComboBox.DataBindings.Add("Text", Me.bs, "공기식태양열적용")
+        Me.집열기방위ComboBox.DataBindings.Add("Text", Me.bs, "집열기방위")
+
     End Sub
     Private Sub Frm_V20091231_Zone_MouseWheel(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles Me.MouseWheel
         If e.Delta < 0 Then
@@ -314,7 +317,19 @@
                 Me.Tb_배기팬동력.Enabled = False
             End If
         Catch ex As Exception
+        End Try
 
+        Try
+            If Me.공기식태양열적용ComboBox.SelectedIndex = 0 Then
+                Me.집열기방위ComboBox.Enabled = True
+                Me.Tb_집열기면적.Enabled = True
+                Me.Tb_집열기방사율.Enabled = True
+            Else
+                Me.집열기방위ComboBox.Enabled = False
+                Me.Tb_집열기면적.Enabled = False
+                Me.Tb_집열기방사율.Enabled = False
+            End If
+        Catch ex As Exception
         End Try
 
     End Sub
@@ -325,8 +340,12 @@
         Try
             Dim drv As DataRowView = Me.bs.Current
             If drv Is Nothing Then Return
+            Dim drKongjo As DS.tbl_kongjoRow = CType(drv.Row, DS.tbl_kongjoRow)
             Me.lb_code.Text = "[" + drv("code").ToString + "]"
 
+            공기식태양열적용ComboBox.Text = drKongjo.공기식태양열적용
+            집열기방위ComboBox.Text = drKongjo.집열기방위
+
             Dim DR() As DS.tbl_zoneRow = DSET1.tbl_zone.Select("냉난방공조처리시스템='" & Drv("code").ToString & "'")
             If DR.GetUpperBound(0) = -1 Then   '//해당되는 데이터가없을경우
                 Me.tb_zone_cnt.Text = "0"
@@ -578,4 +597,8 @@
     Private Sub 공조방식NCMB_SelectionChangeCommitted(sender As Object, e As System.EventArgs) Handles 공조방식NCMB.SelectionChangeCommitted
 
     End Sub
+
+    Private Sub 공기식태양열적용ComboBox_SelectedIndexChanged(sender As System.Object, e As System.EventArgs) Handles 공기식태양열적용ComboBox.SelectedIndexChanged
+        Validate_Control()
+    End Sub
 End Class

ArinWarev1/Forms_Input/Frm_v20091231_Weather.vb

@@ -76,6 +76,12 @@ Public Class Frm_V20091231_Weather
         AddHandler DSET1.weather_supdo.TableNewRow, AddressOf AddNewDataRow_Weathersupdo
         AddHandler DSET1.weather_cha.TableNewRow, AddressOf AddNewDataRow_WeatherCha
 
+        AddHandler DSET1.weather_wind.TableNewRow, AddressOf AddNewDataRow_WeatherWind
+        AddHandler DSET1.weather_river.TableNewRow, AddressOf AddNewDataRow_WeatherRiver
+        AddHandler DSET1.weather_water.TableNewRow, AddressOf AddNewDataRow_WeatherWater
+
+
+
         AddHandler DSET1.weather_group.TableNewRow, AddressOf AddNewDataRow_WeatherGrp
 
         AddHandler dvArea1.CellContentClick, AddressOf dv_cellcontclick
@@ -88,11 +94,22 @@ Public Class Frm_V20091231_Weather
         Me.bsw_supdo.DataSource = DSET1
         Me.bsw_temp.DataSource = DSET1
         Me.bsw_cha.DataSource = DSET1
+        Me.bsw_river.DataSource = DSET1
+        Me.bsw_water.DataSource = DSET1
+        Me.bsw_wind.DataSource = DSET1
 
         Me.bsWGDep1.DataSource = DSET1
         Me.bsWGDep2.DataSource = DSET1
         Me.bsWGDep3.DataSource = DSET1
 
+        If bsw_water.Count = 0 Then
+            Dim newdr As DS.weather_waterRow = DSET1.weather_water.Newweather_waterRow()
+            newdr.pcode = "0"
+            newdr.code = "0000"
+            DSET1.weather_water.Addweather_waterRow(newdr)
+            DSET1.weather_water.AcceptChanges()
+        End If
+
         '//콤보컨트롤 바인딩
         Me.bn_all.BindingSource = Me.bs
         Me.bs = Me.bs
@@ -124,6 +141,7 @@ Public Class Frm_V20091231_Weather
         e.Row.Item("code") = GetMaxCode(DSET1.tbl_weather)
     End Sub
     Private Sub AddNewDataRow_Weatherilsa(ByVal sender As Object, ByVal e As System.Data.DataTableNewRowEventArgs)
+        If bs.Current Is Nothing Then Return
         e.Row.Item("pcode") = CType(bs.Current, DataRowView)("code")
 
         '//일사데이터는 0001로부터하게한다
@@ -138,17 +156,39 @@ Public Class Frm_V20091231_Weather
         e.Row.Item("code") = Newcode
     End Sub
     Private Sub AddNewDataRow_Weathertemp(ByVal sender As Object, ByVal e As System.Data.DataTableNewRowEventArgs)
+        If bs.Current Is Nothing Then Return
         e.Row.Item("pcode") = CType(bs.Current, DataRowView)("code")
         e.Row.Item("code") = GetMaxCode(DSET1.weather_temp)
     End Sub
     Private Sub AddNewDataRow_Weathersupdo(ByVal sender As Object, ByVal e As System.Data.DataTableNewRowEventArgs)
+        If bs.Current Is Nothing Then Return
         e.Row.Item("pcode") = CType(bs.Current, DataRowView)("code")
         e.Row.Item("code") = GetMaxCode(DSET1.weather_supdo)
     End Sub
     Private Sub AddNewDataRow_WeatherCha(ByVal sender As Object, ByVal e As System.Data.DataTableNewRowEventArgs)
+        If bs.Current Is Nothing Then Return
         e.Row.Item("pcode") = CType(bs.Current, DataRowView)("code")
         e.Row.Item("code") = GetMaxCode(DSET1.weather_cha)
     End Sub
+
+    Private Sub AddNewDataRow_WeatherWind(ByVal sender As Object, ByVal e As System.Data.DataTableNewRowEventArgs)
+        If bs.Current Is Nothing Then Return
+        e.Row.Item("pcode") = CType(bs.Current, DataRowView)("code")
+        e.Row.Item("code") = GetMaxCode(DSET1.weather_wind)
+    End Sub
+
+    Private Sub AddNewDataRow_WeatherRiver(ByVal sender As Object, ByVal e As System.Data.DataTableNewRowEventArgs)
+        If bs.Current Is Nothing Then Return
+        e.Row.Item("pcode") = CType(bs.Current, DataRowView)("code")
+        e.Row.Item("code") = GetMaxCode(DSET1.weather_river)
+    End Sub
+
+    Private Sub AddNewDataRow_WeatherWater(ByVal sender As Object, ByVal e As System.Data.DataTableNewRowEventArgs)
+        e.Row.Item("pcode") = "0" ' CType(bs.Current, DataRowView)("code")
+        e.Row.Item("code") = GetMaxCode(DSET1.weather_water)
+    End Sub
+
+
     Private Function GetMaxCode(ByVal dt As DataTable) As String
         Try
             Dim Dr As DataRow = dt.Select("", "code desc")(0)
@@ -168,17 +208,28 @@ Public Class Frm_V20091231_Weather
     End Sub
 
     Private Sub bt_save_weather_Click(ByVal sender As System.Object, ByVal e As System.EventArgs)
+
         If Not EndEdit(Me.bs) Then Return
         If Not EndEdit(Me.bsw_supdo) Then Return
         If Not EndEdit(Me.bsw_ilsa) Then Return
         If Not EndEdit(Me.bsw_temp) Then Return
         If Not EndEdit(Me.bsw_cha) Then Return
+
+        If Not EndEdit(Me.bsw_wind) Then Return
+        If Not EndEdit(Me.bsw_river) Then Return
+        If Not EndEdit(Me.bsw_water) Then Return
+
+
         Check_Modify(Me.DS1.tbl_weather)
         Check_Modify(Me.DS1.weather_ilsa, False)
         Check_Modify(Me.DS1.weather_supdo, False)
         Check_Modify(Me.DS1.weather_temp, False)
         Check_Modify(Me.DS1.weather_cha, False)
 
+        Check_Modify(Me.DS1.weather_wind, False)
+        Check_Modify(Me.DS1.weather_river, False)
+        Check_Modify(Me.DS1.weather_water, False)
+
     End Sub
 
     Private Sub bs_CurrentChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles bs.CurrentChanged
@@ -190,6 +241,9 @@ Public Class Frm_V20091231_Weather
         Me.bsw_temp.Filter = "pcode='" & pcode & "'"
         Me.bsw_supdo.Filter = "pcode='" & pcode & "'"
         Me.bsw_cha.Filter = "pcode='" & pcode & "'"
+        Me.bsw_wind.Filter = "pcode='" & pcode & "'"
+        Me.bsw_river.Filter = "pcode='" & pcode & "'"
+        Me.bsw_water.Filter = ""
 
         If DSET1.weather_temp.Select("pcode='" & pcode & "'").GetUpperBound(0) = -1 Then
             For i As Integer = 1 To 12
@@ -212,8 +266,30 @@ Public Class Frm_V20091231_Weather
         Else
             'MsgBox(Me.bsw_supdo.Count)
         End If
+
+        If DSET1.weather_wind.Select("pcode='" & pcode & "'").GetUpperBound(0) = -1 Then
+            Dim Dr As DS.weather_windRow = DSET1.weather_wind.Newweather_windRow()
+            Dr.code = "0"
+            Dr.설명 = ""
+            DSET1.weather_wind.Addweather_windRow(Dr)
+        Else
+            'MsgBox(Me.bsw_supdo.Count)
+        End If
+
+        If DSET1.weather_river.Select("pcode='" & pcode & "'").GetUpperBound(0) = -1 Then
+            Dim Dr As DS.weather_riverRow = DSET1.weather_river.Newweather_riverRow()
+            Dr.code = "0"
+            Dr.설명 = ""
+            DSET1.weather_river.Addweather_riverRow(Dr)
+        Else
+            'MsgBox(Me.bsw_supdo.Count)
+        End If
+
         Me.DS1.weather_temp.AcceptChanges()
         Me.DS1.weather_supdo.AcceptChanges()
+        Me.DS1.weather_river.AcceptChanges()
+        Me.DS1.weather_wind.AcceptChanges()
+        Me.DS1.weather_water.AcceptChanges()
     End Sub
 
 
@@ -288,6 +364,11 @@ Public Class Frm_V20091231_Weather
         DSET1.weather_supdo.RejectChanges()
         DSET1.weather_temp.RejectChanges()
 
+        DSET1.weather_wind.RejectChanges()
+        DSET1.weather_river.RejectChanges()
+        DSET1.weather_water.RejectChanges()
+
+
     End Sub
 
     Private Sub tb_t1_KeyDown(ByVal sender As Object, ByVal e As System.Windows.Forms.KeyEventArgs) Handles tb_t1.KeyDown
@@ -566,7 +647,7 @@ Public Class Frm_V20091231_Weather
             e.SuppressKeyPress = False
             '//클립보드붙여넣기
             Dim CB() As String = My.Computer.Clipboard.GetText.Split(CChar(vbCrLf))
-            If CB.GetUpperBound(0) < 11 Then
+            If CB.GetUpperBound(0) < 12 Then
                 MsgBox("붙여넣기가 호환되는 데이터가 아닙니다.", MsgBoxStyle.Information, "확인")
                 Return
             End If
@@ -578,10 +659,10 @@ Public Class Frm_V20091231_Weather
                 'MsgBox(CB.GetUpperBound(0))
 
                 Dim Cnt As Short = 0
-                For i As Integer = 0 To CB.GetUpperBound(0)
+                For i As Integer = 1 To CB.GetUpperBound(0)
                     Select Case i
                         Case 0  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
-                            '//Me.tb_c01.Text = CB(i).Split(CChar(vbTab))(ii).Trim
+                            Me.tb_c01.Text = CB(i).Split(CChar(vbTab))(ii).Trim
                         Case 1  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
                             Me.tb_c02.Text = CB(i).Split(CChar(vbTab))(ii).Trim
                         Case 2  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
@@ -654,35 +735,33 @@ Public Class Frm_V20091231_Weather
                         Case 1  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
                             Me.tb_wnaen.Text = CB(i).Split(CChar(vbTab))(ii).Trim
                         Case 2  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
-                            'Me.tb_c03.Text = CB(i).Split(CChar(vbTab))(ii).Trim
-                        Case 3  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
                             Me.tb_w01.Text = CB(i).Split(CChar(vbTab))(ii).Trim
-                        Case 4  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                        Case 3  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
                             Me.tb_w02.Text = CB(i).Split(CChar(vbTab))(ii).Trim
-                        Case 5  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                        Case 4  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
                             Me.tb_w03.Text = CB(i).Split(CChar(vbTab))(ii).Trim
-                        Case 6  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                        Case 5  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
                             Me.tb_w04.Text = CB(i).Split(CChar(vbTab))(ii).Trim
-                        Case 7  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                        Case 6  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
                             Me.tb_w05.Text = CB(i).Split(CChar(vbTab))(ii).Trim
-                        Case 8  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                        Case 7  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
                             Me.tb_w06.Text = CB(i).Split(CChar(vbTab))(ii).Trim
-                        Case 9  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                        Case 8  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
                             Me.tb_w07.Text = CB(i).Split(CChar(vbTab))(ii).Trim
-                        Case 10  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                        Case 9  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
                             Me.tb_w08.Text = CB(i).Split(CChar(vbTab))(ii).Trim
-                        Case 11 '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                        Case 10 '///조명은 신규기록하지않으므로.. 쓰지않게한다.
                             Me.tb_w09.Text = CB(i).Split(CChar(vbTab))(ii).Trim
-                        Case 12 '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                        Case 11 '///조명은 신규기록하지않으므로.. 쓰지않게한다.
                             Me.tb_w10.Text = CB(i).Split(CChar(vbTab))(ii).Trim
-                        Case 13 '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                        Case 12 '///조명은 신규기록하지않으므로.. 쓰지않게한다.
                             Me.tb_w11.Text = CB(i).Split(CChar(vbTab))(ii).Trim
-                        Case 14 '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                        Case 13 '///조명은 신규기록하지않으므로.. 쓰지않게한다.
                             Me.tb_w12.Text = CB(i).Split(CChar(vbTab))(ii).Trim
 
                     End Select
                 Next
-                If bsw_cha.Position < bsw_cha.Count Then bsw_cha.Position += 1 '//위치이동
+                'If bsw_cha.Position < bsw_cha.Count Then bsw_cha.Position += 1 '//위치이동
             Next
             Me.bsw_cha.EndEdit()
         End If
@@ -753,6 +832,10 @@ Public Class Frm_V20091231_Weather
         DSET1.weather_temp.Clear()
         DSET1.weather_supdo.Clear()
 
+        DSET1.weather_wind.Clear()
+        DSET1.weather_river.Clear()
+        DSET1.weather_water.Clear()
+
         Dim Rng As Excel.Range = xlSheet1.Range("B3")   '//Offset으로사용할것이므로 0,0셀을 선택한다
 
         Dim newdr0 As DS.tbl_weatherRow = DSET1.tbl_weather.NewRow
@@ -1173,6 +1256,11 @@ Public Class Frm_V20091231_Weather
         'DSET1.weather_ilsa.Merge(DSET1.weather_ilsa)
         'DSET1.weather_supdo.Merge(DSET1.weather_supdo)
         'DSET1.weather_temp.Merge(DSET1.weather_temp)
+        Me.Validate()
+        Me.bsw_river.EndEdit()
+        Me.bsw_water.EndEdit()
+        Me.bsw_wind.EndEdit()
+
 
         '모든파일을 저장한다.
         Dim SelectedPath As String = AppDomain.CurrentDomain.BaseDirectory + "Data"
@@ -1182,6 +1270,9 @@ Public Class Frm_V20091231_Weather
         Dim file4 As String = System.IO.Path.Combine(SelectedPath, DSET1.weather_temp.TableName + ".xml")
         Dim file5 As String = System.IO.Path.Combine(SelectedPath, DSET1.tbl_weather.TableName + ".xml")
         Dim file6 As String = System.IO.Path.Combine(SelectedPath, DSET1.weather_group.TableName + ".xml")
+        Dim file7 As String = System.IO.Path.Combine(SelectedPath, DSET1.weather_wind.TableName + ".xml")
+        Dim file8 As String = System.IO.Path.Combine(SelectedPath, DSET1.weather_river.TableName + ".xml")
+        Dim file9 As String = System.IO.Path.Combine(SelectedPath, DSET1.weather_water.TableName + ".xml")
 
         DSET1.weather_cha.WriteXml(file1)
         DSET1.weather_ilsa.WriteXml(file2)
@@ -1189,7 +1280,9 @@ Public Class Frm_V20091231_Weather
         DSET1.weather_temp.WriteXml(file4)
         DSET1.tbl_weather.WriteXml(file5)
         DSET1.weather_group.WriteXml(file6)
-
+        DSET1.weather_wind.WriteXml(file7)
+        DSET1.weather_river.WriteXml(file8)
+        DSET1.weather_water.WriteXml(file9)
 
         file1 = System.IO.Path.Combine(SelectedPath, DSET1.weather_cha.TableName + ".dat")
         file2 = System.IO.Path.Combine(SelectedPath, DSET1.weather_ilsa.TableName + ".dat")
@@ -1197,6 +1290,9 @@ Public Class Frm_V20091231_Weather
         file4 = System.IO.Path.Combine(SelectedPath, DSET1.weather_temp.TableName + ".dat")
         file5 = System.IO.Path.Combine(SelectedPath, DSET1.tbl_weather.TableName + ".dat")
         file6 = System.IO.Path.Combine(SelectedPath, DSET1.weather_group.TableName + ".dat")
+        file7 = System.IO.Path.Combine(SelectedPath, DSET1.weather_wind.TableName + ".dat")
+        file8 = System.IO.Path.Combine(SelectedPath, DSET1.weather_river.TableName + ".dat")
+        file9 = System.IO.Path.Combine(SelectedPath, DSET1.weather_water.TableName + ".dat")
 
 
         '//암호화
@@ -1205,11 +1301,15 @@ Public Class Frm_V20091231_Weather
         Serialize(file3, DSET1.weather_supdo)
         Serialize(file4, DSET1.weather_temp)
         Serialize(file5, DSET1.tbl_weather)
+        Serialize(file6, DSET1.weather_group)
+        Serialize(file7, DSET1.weather_wind)
+        Serialize(file8, DSET1.weather_river)
+        Serialize(file9, DSET1.weather_water)
 
-        Using stm As System.IO.Stream = System.IO.File.Open(file6, System.IO.FileMode.Create, System.IO.FileAccess.Write)
+        'Using stm As System.IO.Stream = System.IO.File.Open(file6, System.IO.FileMode.Create, System.IO.FileAccess.Write)
-            Dim bf As System.Runtime.Serialization.Formatters.Binary.BinaryFormatter = New System.Runtime.Serialization.Formatters.Binary.BinaryFormatter '역직렬화 후 객체 클래스로 형변환... Dim a As clsTEST = CType(bf.Deserialize(stm), clsTEST) stm.Close()
+        '    Dim bf As System.Runtime.Serialization.Formatters.Binary.BinaryFormatter = New System.Runtime.Serialization.Formatters.Binary.BinaryFormatter '역직렬화 후 객체 클래스로 형변환... Dim a As clsTEST = CType(bf.Deserialize(stm), clsTEST) stm.Close()
-            bf.Serialize(stm, DSET1.weather_group)
+        '    bf.Serialize(stm, DSET1.weather_group)
-        End Using
+        'End Using
 
 
         'Serialize(file6, DSET1.weather_group)
@@ -1219,16 +1319,34 @@ Public Class Frm_V20091231_Weather
 
     Sub Serialize(filename As String, data As Object)
 
-        Using stm As System.IO.Stream = System.IO.File.Open(filename, System.IO.FileMode.Create, System.IO.FileAccess.Write)
+        Dim ms As New System.IO.MemoryStream()
+        ' Using stm As System.IO.Stream = System.IO.File.Open(filename, System.IO.FileMode.Create, System.IO.FileAccess.Write)
         Dim bf As System.Runtime.Serialization.Formatters.Binary.BinaryFormatter = New System.Runtime.Serialization.Formatters.Binary.BinaryFormatter '역직렬화 후 객체 클래스로 형변환... Dim a As clsTEST = CType(bf.Deserialize(stm), clsTEST) stm.Close()
-            bf.Serialize(stm, data)
+        bf.Serialize(ms, data)
-        End Using
+        ' End Using
+        Dim len As UInt32 = ms.Length
+        Dim bodybuf(len - 1) As Byte
+        Array.Copy(ms.GetBuffer(), bodybuf, len)
+        Dim compbuf() As Byte
+        Utility.MiniLZO.Compress(bodybuf, compbuf)
 
+        'Dim decombuf(bodybuf.Length - 1) As Byte
+        'Utility.MiniLZO.Decompress(compbuf, decombuf)
+        '67682 -> 304964
 
+        Dim complen As UInt32 = compbuf.Length
 
+        Dim fs As New System.IO.FileStream(filename, IO.FileMode.Create)
+        Dim lenbuf() As Byte = BitConverter.GetBytes(bodybuf.Length) '//read body data
+        fs.Write(lenbuf, 0, lenbuf.Length) 'write file length
+
+        'Dim body() As Byte = ms.GetBuffer()
+        fs.Write(compbuf, 0, complen)  'write body
+        fs.Flush()
+        fs.Dispose()
+        ms.Dispose()
     End Sub
 
-
     Private Sub ToolStripButton13_Click(sender As Object, e As EventArgs) Handles ToolStripButton13.Click
         Dim sd As New FolderBrowserDialog()
         If sd.ShowDialog() = DialogResult.OK Then
@@ -1238,6 +1356,9 @@ Public Class Frm_V20091231_Weather
             DSET1.weather_supdo.Clear()
             DSET1.weather_temp.Clear()
             DSET1.weather_group.Clear()
+            DSET1.weather_wind.Clear()
+            DSET1.weather_river.Clear()
+            DSET1.weather_water.Clear()
             DSET1.tbl_weather.Clear()
 
             DSET1.weather_cha.ReadXml(System.IO.Path.Combine(sd.SelectedPath, DSET1.weather_cha.TableName + ".xml"))
@@ -1248,6 +1369,10 @@ Public Class Frm_V20091231_Weather
 
             DSET1.weather_group.ReadXml(System.IO.Path.Combine(sd.SelectedPath, DSET1.weather_group.TableName + ".xml"))
 
+            DSET1.weather_wind.ReadXml(System.IO.Path.Combine(sd.SelectedPath, DSET1.weather_wind.TableName + ".xml"))
+            DSET1.weather_river.ReadXml(System.IO.Path.Combine(sd.SelectedPath, DSET1.weather_river.TableName + ".xml"))
+            DSET1.weather_water.ReadXml(System.IO.Path.Combine(sd.SelectedPath, DSET1.weather_water.TableName + ".xml"))
+
 
             '//od는 od 데이터에 다시 옴겨야한다
             DSET1.weather_cha.AcceptChanges()
@@ -1258,8 +1383,177 @@ Public Class Frm_V20091231_Weather
 
             DSET1.weather_group.AcceptChanges()
 
+            DSET1.weather_wind.AcceptChanges()
+            DSET1.weather_river.AcceptChanges()
+            DSET1.weather_water.AcceptChanges()
+
 
 
         End If
     End Sub
+
+    Private Sub MyTb33_KeyDown(sender As System.Object, e As System.Windows.Forms.KeyEventArgs) Handles tbw01.KeyDown
+        If e.KeyCode = Keys.V And e.Control Then
+
+            e.Handled = True
+            e.SuppressKeyPress = False
+            '//클립보드붙여넣기
+            Dim CB() As String = My.Computer.Clipboard.GetText.Split(CChar(vbCrLf))
+            If CB.GetUpperBound(0) < 12 Then
+                MsgBox("붙여넣기가 호환되는 데이터가 아닙니다.", MsgBoxStyle.Information, "확인")
+                Return
+            End If
+
+
+            For ii As Integer = 0 To CType(CB(0).Split(CChar(vbTab)), String()).GetUpperBound(0)
+                'If Me.bs.Count = 0 OrElse ii > 0 Then Me.bt_Add.PerformClick() '//한줄추가
+
+                'MsgBox(CB.GetUpperBound(0))
+
+                Dim Cnt As Short = 0
+                For i As Integer = 1 To CB.GetUpperBound(0)
+                    Select Case i
+                        Case 1  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                            Me.tbw01.Text = CB(i).Split(CChar(vbTab))(ii).Trim
+                        Case 2  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                            Me.tbw02.Text = CB(i).Split(CChar(vbTab))(ii).Trim
+                        Case 3  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                            Me.tbw03.Text = CB(i).Split(CChar(vbTab))(ii).Trim
+                        Case 4  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                            Me.tbw04.Text = CB(i).Split(CChar(vbTab))(ii).Trim
+                        Case 5  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                            Me.tbw05.Text = CB(i).Split(CChar(vbTab))(ii).Trim
+                        Case 6  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                            Me.tbw06.Text = CB(i).Split(CChar(vbTab))(ii).Trim
+                        Case 7  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                            Me.tbw07.Text = CB(i).Split(CChar(vbTab))(ii).Trim
+                        Case 8  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                            Me.tbw08.Text = CB(i).Split(CChar(vbTab))(ii).Trim
+                        Case 9  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                            Me.tbw09.Text = CB(i).Split(CChar(vbTab))(ii).Trim
+                        Case 10  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                            Me.tbw10.Text = CB(i).Split(CChar(vbTab))(ii).Trim
+                        Case 11  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                            Me.tbw11.Text = CB(i).Split(CChar(vbTab))(ii).Trim
+                        Case 12 '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                            Me.tbw12.Text = CB(i).Split(CChar(vbTab))(ii).Trim
+
+                    End Select
+                Next
+                '//If bsw_cha.Position < bsw_cha.Count Then bsw_cha.Position += 1 '//위치이동
+            Next
+            Me.bsw_water.EndEdit()
+        End If
+    End Sub
+
+    Private Sub MyTb21_KeyDown(sender As System.Object, e As System.Windows.Forms.KeyEventArgs) Handles tbr01.KeyDown
+        ''river
+        If e.KeyCode = Keys.V And e.Control Then
+
+            e.Handled = True
+            e.SuppressKeyPress = False
+            '//클립보드붙여넣기
+            Dim CB() As String = My.Computer.Clipboard.GetText.Split(CChar(vbCrLf))
+            If CB.GetUpperBound(0) < 12 Then
+                MsgBox("붙여넣기가 호환되는 데이터가 아닙니다.", MsgBoxStyle.Information, "확인")
+                Return
+            End If
+
+
+            For ii As Integer = 0 To CType(CB(0).Split(CChar(vbTab)), String()).GetUpperBound(0)
+                'If Me.bs.Count = 0 OrElse ii > 0 Then Me.bt_Add.PerformClick() '//한줄추가
+
+                'MsgBox(CB.GetUpperBound(0))
+
+                Dim Cnt As Short = 0
+                For i As Integer = 1 To CB.GetUpperBound(0)
+                    Select Case i
+                        Case 1  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                            Me.tbr01.Text = CB(i).Split(CChar(vbTab))(ii).Trim
+                        Case 2  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                            Me.tbr02.Text = CB(i).Split(CChar(vbTab))(ii).Trim
+                        Case 3  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                            Me.tbr03.Text = CB(i).Split(CChar(vbTab))(ii).Trim
+                        Case 4  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                            Me.tbr04.Text = CB(i).Split(CChar(vbTab))(ii).Trim
+                        Case 5  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                            Me.tbr05.Text = CB(i).Split(CChar(vbTab))(ii).Trim
+                        Case 6  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                            Me.tbr06.Text = CB(i).Split(CChar(vbTab))(ii).Trim
+                        Case 7  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                            Me.tbr07.Text = CB(i).Split(CChar(vbTab))(ii).Trim
+                        Case 8  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                            Me.tbr08.Text = CB(i).Split(CChar(vbTab))(ii).Trim
+                        Case 9  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                            Me.tbr09.Text = CB(i).Split(CChar(vbTab))(ii).Trim
+                        Case 10  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                            Me.tbr10.Text = CB(i).Split(CChar(vbTab))(ii).Trim
+                        Case 11  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                            Me.tbr11.Text = CB(i).Split(CChar(vbTab))(ii).Trim
+                        Case 12 '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                            Me.tbr12.Text = CB(i).Split(CChar(vbTab))(ii).Trim
+
+                    End Select
+                Next
+                '//If bsw_cha.Position < bsw_cha.Count Then bsw_cha.Position += 1 '//위치이동
+            Next
+            Me.bsw_river.EndEdit()
+        End If
+    End Sub
+
+    Private Sub MyTb9_KeyDown(sender As System.Object, e As System.Windows.Forms.KeyEventArgs) Handles tbwi01.KeyDown
+        ''wind\
+        If e.KeyCode = Keys.V And e.Control Then
+
+            e.Handled = True
+            e.SuppressKeyPress = False
+            '//클립보드붙여넣기
+            Dim CB() As String = My.Computer.Clipboard.GetText.Split(CChar(vbCrLf))
+            If CB.GetUpperBound(0) < 12 Then
+                MsgBox("붙여넣기가 호환되는 데이터가 아닙니다.", MsgBoxStyle.Information, "확인")
+                Return
+            End If
+
+
+            For ii As Integer = 0 To CType(CB(0).Split(CChar(vbTab)), String()).GetUpperBound(0)
+                'If Me.bs.Count = 0 OrElse ii > 0 Then Me.bt_Add.PerformClick() '//한줄추가
+
+                'MsgBox(CB.GetUpperBound(0))
+
+                Dim Cnt As Short = 0
+                For i As Integer = 1 To CB.GetUpperBound(0)
+                    Select Case i
+                        Case 1  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                            Me.tbwi01.Text = CB(i).Split(CChar(vbTab))(ii).Trim
+                        Case 2  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                            Me.tbwi02.Text = CB(i).Split(CChar(vbTab))(ii).Trim
+                        Case 3  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                            Me.tbwi03.Text = CB(i).Split(CChar(vbTab))(ii).Trim
+                        Case 4  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                            Me.tbwi04.Text = CB(i).Split(CChar(vbTab))(ii).Trim
+                        Case 5  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                            Me.tbwi05.Text = CB(i).Split(CChar(vbTab))(ii).Trim
+                        Case 6  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                            Me.tbwi06.Text = CB(i).Split(CChar(vbTab))(ii).Trim
+                        Case 7  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                            Me.tbwi07.Text = CB(i).Split(CChar(vbTab))(ii).Trim
+                        Case 8  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                            Me.tbwi08.Text = CB(i).Split(CChar(vbTab))(ii).Trim
+                        Case 9  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                            Me.tbwi09.Text = CB(i).Split(CChar(vbTab))(ii).Trim
+                        Case 10  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                            Me.tbwi10.Text = CB(i).Split(CChar(vbTab))(ii).Trim
+                        Case 11  '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                            Me.tbwi11.Text = CB(i).Split(CChar(vbTab))(ii).Trim
+                        Case 12 '///조명은 신규기록하지않으므로.. 쓰지않게한다.
+                            Me.tbwi12.Text = CB(i).Split(CChar(vbTab))(ii).Trim
+                    End Select
+                Next
+                '//If bsw_cha.Position < bsw_cha.Count Then bsw_cha.Position += 1 '//위치이동
+            Next
+            Me.bsw_wind.EndEdit()
+        End If
+    End Sub
+
+  
 End Class

ArinWarev1/Forms_Input/Frm_v20091231_profile.vb

@@ -97,6 +97,12 @@
             Me.SplitContainer1.Panel2.Enabled = False
             Me.bn_all.Visible = False
         End If
+
+        If System.Diagnostics.Debugger.IsAttached Then
+            Me.bn_all.Visible = True
+            Me.SplitContainer1.Panel2.Enabled = True
+        End If
+
         AddDebug("▲ Form Load")
     End Sub
 

ArinWarev1/Forms_Report/Frm_Upload.vb

@@ -946,8 +946,8 @@
         Dim 에너지자립률 As Double = 0
         Dim 에너지자립률_offsite As Double = 0
 
-        Dim Sum As Decimal = (Result1.생산E(0).태양광전력생산량 + Result1.생산E(0).신재생열병합전력생산량) / (Result1.일차E소요량(0).난방전력 + Result1.일차E소요량(0).냉방전력 + Result1.일차E소요량(0).급탕전력 + Result1.일차E소요량(0).조명전력 + Result1.일차E소요량(0).환기전력)
+        Dim Sum As Decimal = (Result1.생산E(0).태양광전력생산량 + Result1.생산E(0).풍력전력생산량 + Result1.생산E(0).신재생열병합전력생산량) / (Result1.일차E소요량(0).난방전력 + Result1.일차E소요량(0).냉방전력 + Result1.일차E소요량(0).급탕전력 + Result1.일차E소요량(0).조명전력 + Result1.일차E소요량(0).환기전력)
-        Dim Sum_offsite As Decimal = (Result1.생산E(0).태양광전력생산량_offsite) / (Result1.일차E소요량(0).난방전력 + Result1.일차E소요량(0).냉방전력 + Result1.일차E소요량(0).급탕전력 + Result1.일차E소요량(0).조명전력 + Result1.일차E소요량(0).환기전력)
+        Dim Sum_offsite As Decimal = (Result1.생산E(0).태양광전력생산량_offsite + Result1.생산E(0).풍력전력생산량_offsite) / (Result1.일차E소요량(0).난방전력 + Result1.일차E소요량(0).냉방전력 + Result1.일차E소요량(0).급탕전력 + Result1.일차E소요량(0).조명전력 + Result1.일차E소요량(0).환기전력)
         Dim 난방 As Decimal = Sum * Result1.일차E소요량(0).난방전력  '//아마게산이안도잇으니 여기값들이 0이잇을거에요.
         Dim 냉방 As Decimal = Sum * Result1.일차E소요량(0).냉방전력
         Dim 조명 As Decimal = Sum * Result1.일차E소요량(0).조명전력

ArinWarev1/Forms_Report/Report_pyonga.vb

@@ -932,7 +932,7 @@
 
 
 
-        Dim Sum As Decimal = (Result1.생산E(0).태양광전력생산량 + Result1.생산E(0).신재생열병합전력생산량) / (Result1.일차E소요량(0).난방전력 + Result1.일차E소요량(0).냉방전력 + Result1.일차E소요량(0).급탕전력 + Result1.일차E소요량(0).조명전력 + Result1.일차E소요량(0).환기전력)
+        Dim Sum As Decimal = (Result1.생산E(0).태양광전력생산량 + Result1.생산E(0).풍력전력생산량 + Result1.생산E(0).신재생열병합전력생산량) / (Result1.일차E소요량(0).난방전력 + Result1.일차E소요량(0).냉방전력 + Result1.일차E소요량(0).급탕전력 + Result1.일차E소요량(0).조명전력 + Result1.일차E소요량(0).환기전력)
 
         Dim 난방 As Decimal = Sum * Result1.일차E소요량(0).난방전력  '//아마게산이안도잇으니 여기값들이 0이잇을거에요.
         Dim 냉방 As Decimal = Sum * Result1.일차E소요량(0).냉방전력
@@ -966,7 +966,7 @@
         'g20=냉방면적
 
 
-        신재생에너지 = -1 * (Result1.생산E(0).면적당생산량태양열 + Result1.생산E(0).면적당생산량지열 + Result1.생산E(0).신재생면적당열생산량) - 면적
+        신재생에너지 = -1 * (Result1.생산E(0).면적당생산량태양열 + Result1.생산E(0).면적당생산량수열 + Result1.생산E(0).면적당생산량지열 + Result1.생산E(0).신재생면적당열생산량) - 면적
         Return 신재생에너지
     End Function
 

ArinWarev1/Forms_Report/Report_그래프.vb

@@ -122,9 +122,9 @@
                 Case 0  '//1차에너지소요량
 
 
-                    Dim Sum As Decimal = (Result1.생산E(0).태양광전력생산량 + Result1.생산E(0).신재생열병합전력생산량) / (Result1.일차E소요량(0).난방전력 + Result1.일차E소요량(0).냉방전력 + Result1.일차E소요량(0).급탕전력 + Result1.일차E소요량(0).조명전력 + Result1.일차E소요량(0).환기전력)
+                    Dim Sum As Decimal = (Result1.생산E(0).태양광전력생산량 + Result1.생산E(0).풍력전력생산량 + Result1.생산E(0).신재생열병합전력생산량) / (Result1.일차E소요량(0).난방전력 + Result1.일차E소요량(0).냉방전력 + Result1.일차E소요량(0).급탕전력 + Result1.일차E소요량(0).조명전력 + Result1.일차E소요량(0).환기전력)
 
-                    Dim Sum_offsite As Decimal = (Result1.생산E(0).태양광전력생산량_offsite) / (Result1.일차E소요량(0).난방전력 + Result1.일차E소요량(0).냉방전력 + Result1.일차E소요량(0).급탕전력 + Result1.일차E소요량(0).조명전력 + Result1.일차E소요량(0).환기전력)
+                    Dim Sum_offsite As Decimal = (Result1.생산E(0).태양광전력생산량_offsite + Result1.생산E(0).풍력전력생산량_offsite) / (Result1.일차E소요량(0).난방전력 + Result1.일차E소요량(0).냉방전력 + Result1.일차E소요량(0).급탕전력 + Result1.일차E소요량(0).조명전력 + Result1.일차E소요량(0).환기전력)
 
                     Dim 난방 As Decimal = Sum * Result1.일차E소요량(0).난방전력  '//아마게산이안도잇으니 여기값들이 0이잇을거에요.
                     Dim 냉방 As Decimal = Sum * Result1.일차E소요량(0).냉방전력
@@ -190,7 +190,7 @@
 
 
                     '//열병합신재생에너지추가 130831 arin
-                    신재생에너지 = Math.Round(-1 * (Result1.생산E(0).면적당생산량태양열 + Result1.생산E(0).신재생면적당열생산량 + Result1.생산E(0).면적당생산량지열 + 전기 * 2.75), 1)
+                    신재생에너지 = Math.Round(-1 * (Result1.생산E(0).면적당생산량태양열 + Result1.생산E(0).신재생면적당열생산량 + Result1.생산E(0).면적당생산량지열 + Result1.생산E(0).면적당생산량수열 + 전기 * 2.75), 1)
                     Dim 신재생에너지_offsite As Decimal = Math.Round(-1 * (전기_offsite * 2.75), 1)
 
                     단위면적당신재생1차에너지합 = -1 * 신재생에너지
@@ -279,7 +279,7 @@
 
 
 
-                    Dim Sum As Decimal = (Result1.생산E(0).태양광전력생산량 + Result1.생산E(0).신재생열병합전력생산량) / (Result1.일차E소요량(0).난방전력 + Result1.일차E소요량(0).냉방전력 + Result1.일차E소요량(0).급탕전력 + Result1.일차E소요량(0).조명전력 + Result1.일차E소요량(0).환기전력)
+                    Dim Sum As Decimal = (Result1.생산E(0).태양광전력생산량 + Result1.생산E(0).풍력전력생산량 + Result1.생산E(0).신재생열병합전력생산량) / (Result1.일차E소요량(0).난방전력 + Result1.일차E소요량(0).냉방전력 + Result1.일차E소요량(0).급탕전력 + Result1.일차E소요량(0).조명전력 + Result1.일차E소요량(0).환기전력)
 
                     Dim 난방 As Decimal = Sum * Result1.일차E소요량(0).난방전력  '//아마게산이안도잇으니 여기값들이 0이잇을거에요.
                     Dim 냉방 As Decimal = Sum * Result1.일차E소요량(0).냉방전력
@@ -327,7 +327,7 @@
 
 
                     '//열병합신재생에너지추가 130831 arin
-                    신재생에너지 = Math.Round(-1 * (Result1.생산E(0).면적당생산량태양열 + Result1.생산E(0).신재생면적당열생산량 + Result1.생산E(0).면적당생산량지열) - 면적, 1)
+                    신재생에너지 = Math.Round(-1 * (Result1.생산E(0).면적당생산량태양열 + Result1.생산E(0).신재생면적당열생산량 + Result1.생산E(0).면적당생산량지열 + Result1.생산E(0).면적당생산량수열) - 면적, 1)
                     Dr2 = Me.DSR.Graph_ReqUse.NewGraph_ReqUseRow
                     Dr2.Gubun = "소요량"
                     Dr2.type = "신재생에너지"

ArinWarev1/MdiMain.Designer.vb

@@ -35,12 +35,12 @@ Partial Class MdiMain
         Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
         Me.MenuStrip1 = New System.Windows.Forms.MenuStrip()
         Me.ReportToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.신규ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.btNew = New System.Windows.Forms.ToolStripMenuItem()
         Me.신규코드업로드ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem7 = New System.Windows.Forms.ToolStripSeparator()
-        Me.열기ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.btOpen = New System.Windows.Forms.ToolStripMenuItem()
         Me.bt_filesave = New System.Windows.Forms.ToolStripMenuItem()
-        Me.다른이름으로저장ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.btSaveNew = New System.Windows.Forms.ToolStripMenuItem()
         Me.정보ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.bt_데이터관리 = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem5 = New System.Windows.Forms.ToolStripSeparator()
@@ -73,6 +73,8 @@ Partial Class MdiMain
         Me.ToolStripMenuItem13 = New System.Windows.Forms.ToolStripMenuItem()
         Me.설정프로필ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ExportToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripSeparator()
+        Me.파일로부터기상데이터가져오기ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.WindowsMenu = New System.Windows.Forms.ToolStripMenuItem()
         Me.NewWindowToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.CascadeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -98,8 +100,6 @@ Partial Class MdiMain
         Me.비교데이터백업ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.데이터비교ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.순실체적ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripSeparator()
-        Me.파일로부터기상데이터가져오기ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.StatusStrip1.SuspendLayout()
         Me.MenuStrip1.SuspendLayout()
         Me.ContextMenuStrip1.SuspendLayout()
@@ -174,18 +174,18 @@ Partial Class MdiMain
         '
         'ReportToolStripMenuItem
         '
-        Me.ReportToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.신규ToolStripMenuItem, Me.신규코드업로드ToolStripMenuItem, Me.ToolStripMenuItem7, Me.열기ToolStripMenuItem, Me.bt_filesave, Me.다른이름으로저장ToolStripMenuItem, Me.정보ToolStripMenuItem, Me.bt_데이터관리, Me.ToolStripMenuItem5, Me.lbl_p1, Me.lbl_p2, Me.lbl_p3, Me.lbl_p4, Me.lbl_p5, Me.ToolStripMenuItem6, Me.종료ToolStripMenuItem})
+        Me.ReportToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.btNew, Me.신규코드업로드ToolStripMenuItem, Me.ToolStripMenuItem7, Me.btOpen, Me.bt_filesave, Me.btSaveNew, Me.정보ToolStripMenuItem, Me.bt_데이터관리, Me.ToolStripMenuItem5, Me.lbl_p1, Me.lbl_p2, Me.lbl_p3, Me.lbl_p4, Me.lbl_p5, Me.ToolStripMenuItem6, Me.종료ToolStripMenuItem})
         Me.ReportToolStripMenuItem.Image = CType(resources.GetObject("ReportToolStripMenuItem.Image"), System.Drawing.Image)
         Me.ReportToolStripMenuItem.Name = "ReportToolStripMenuItem"
         Me.ReportToolStripMenuItem.Size = New System.Drawing.Size(57, 20)
         Me.ReportToolStripMenuItem.Text = "파일"
         '
-        '신규ToolStripMenuItem
+        'btNew
         '
-        Me.신규ToolStripMenuItem.Name = "신규ToolStripMenuItem"
+        Me.btNew.Name = "btNew"
-        Me.신규ToolStripMenuItem.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.N), System.Windows.Forms.Keys)
+        Me.btNew.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.N), System.Windows.Forms.Keys)
-        Me.신규ToolStripMenuItem.Size = New System.Drawing.Size(244, 22)
+        Me.btNew.Size = New System.Drawing.Size(244, 22)
-        Me.신규ToolStripMenuItem.Text = "신규"
+        Me.btNew.Text = "신규"
         '
         '신규코드업로드ToolStripMenuItem
         '
@@ -200,12 +200,12 @@ Partial Class MdiMain
         Me.ToolStripMenuItem7.Name = "ToolStripMenuItem7"
         Me.ToolStripMenuItem7.Size = New System.Drawing.Size(241, 6)
         '
-        '열기ToolStripMenuItem
+        'btOpen
         '
-        Me.열기ToolStripMenuItem.Name = "열기ToolStripMenuItem"
+        Me.btOpen.Name = "btOpen"
-        Me.열기ToolStripMenuItem.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.O), System.Windows.Forms.Keys)
+        Me.btOpen.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.O), System.Windows.Forms.Keys)
-        Me.열기ToolStripMenuItem.Size = New System.Drawing.Size(244, 22)
+        Me.btOpen.Size = New System.Drawing.Size(244, 22)
-        Me.열기ToolStripMenuItem.Text = "열기"
+        Me.btOpen.Text = "열기"
         '
         'bt_filesave
         '
@@ -215,13 +215,13 @@ Partial Class MdiMain
         Me.bt_filesave.Size = New System.Drawing.Size(244, 22)
         Me.bt_filesave.Text = "저장"
         '
-        '다른이름으로저장ToolStripMenuItem
+        'btSaveNew
         '
-        Me.다른이름으로저장ToolStripMenuItem.Name = "다른이름으로저장ToolStripMenuItem"
+        Me.btSaveNew.Name = "btSaveNew"
-        Me.다른이름으로저장ToolStripMenuItem.ShortcutKeys = CType(((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Shift) _
+        Me.btSaveNew.ShortcutKeys = CType(((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Shift) _
             Or System.Windows.Forms.Keys.A), System.Windows.Forms.Keys)
-        Me.다른이름으로저장ToolStripMenuItem.Size = New System.Drawing.Size(244, 22)
+        Me.btSaveNew.Size = New System.Drawing.Size(244, 22)
-        Me.다른이름으로저장ToolStripMenuItem.Text = "다른이름으로 저장"
+        Me.btSaveNew.Text = "다른이름으로 저장"
         '
         '정보ToolStripMenuItem
         '
@@ -301,7 +301,7 @@ Partial Class MdiMain
         '실행ToolStripMenuItem1
         '
         Me.실행ToolStripMenuItem1.Name = "실행ToolStripMenuItem1"
-        Me.실행ToolStripMenuItem1.Size = New System.Drawing.Size(152, 22)
+        Me.실행ToolStripMenuItem1.Size = New System.Drawing.Size(124, 22)
         Me.실행ToolStripMenuItem1.Text = "화면보기"
         '
         '환경설정ToolStripMenuItem
@@ -434,6 +434,17 @@ Partial Class MdiMain
         Me.ExportToolStripMenuItem.Size = New System.Drawing.Size(262, 22)
         Me.ExportToolStripMenuItem.Text = "Export"
         '
+        'ToolStripMenuItem1
+        '
+        Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1"
+        Me.ToolStripMenuItem1.Size = New System.Drawing.Size(259, 6)
+        '
+        '파일로부터기상데이터가져오기ToolStripMenuItem
+        '
+        Me.파일로부터기상데이터가져오기ToolStripMenuItem.Name = "파일로부터기상데이터가져오기ToolStripMenuItem"
+        Me.파일로부터기상데이터가져오기ToolStripMenuItem.Size = New System.Drawing.Size(262, 22)
+        Me.파일로부터기상데이터가져오기ToolStripMenuItem.Text = "파일로부터 기상+프로필  가져오기"
+        '
         'WindowsMenu
         '
         Me.WindowsMenu.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.NewWindowToolStripMenuItem, Me.CascadeToolStripMenuItem, Me.TileVerticalToolStripMenuItem, Me.TileHorizontalToolStripMenuItem, Me.CloseAllToolStripMenuItem, Me.ArrangeIconsToolStripMenuItem})
@@ -621,17 +632,6 @@ Partial Class MdiMain
         Me.순실체적ToolStripMenuItem.Size = New System.Drawing.Size(170, 22)
         Me.순실체적ToolStripMenuItem.Text = "3.순실체적"
         '
-        'ToolStripMenuItem1
-        '
-        Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1"
-        Me.ToolStripMenuItem1.Size = New System.Drawing.Size(259, 6)
-        '
-        '파일로부터기상데이터가져오기ToolStripMenuItem
-        '
-        Me.파일로부터기상데이터가져오기ToolStripMenuItem.Name = "파일로부터기상데이터가져오기ToolStripMenuItem"
-        Me.파일로부터기상데이터가져오기ToolStripMenuItem.Size = New System.Drawing.Size(262, 22)
-        Me.파일로부터기상데이터가져오기ToolStripMenuItem.Text = "파일로부터 기상+프로필  가져오기"
-        '
         'MdiMain
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 12.0!)
@@ -687,7 +687,7 @@ Partial Class MdiMain
     Friend WithEvents 환경설정ToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents bt_계산결과 As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents 결과그래프ToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents 열기ToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents btOpen As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents bt_filesave As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents 정보ToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents ToolStripMenuItem5 As System.Windows.Forms.ToolStripSeparator
@@ -698,7 +698,7 @@ Partial Class MdiMain
     Friend WithEvents lbl_p2 As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents lbl_p3 As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents lbl_p4 As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents 신규ToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents btNew As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents ToolStripMenuItem7 As System.Windows.Forms.ToolStripSeparator
     Friend WithEvents TreeView1 As System.Windows.Forms.TreeView
     Friend WithEvents bt_etc As System.Windows.Forms.ToolStripMenuItem
@@ -727,7 +727,7 @@ Partial Class MdiMain
     Friend WithEvents 실행ToolStripMenuItem1 As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents 계산결과ToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents bt_인증평가서 As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents 다른이름으로저장ToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents btSaveNew As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents ToolStripButton5 As System.Windows.Forms.ToolStripButton
     Friend WithEvents ToolStripButton6 As System.Windows.Forms.ToolStripButton
     Friend WithEvents ToolStripButton7 As System.Windows.Forms.ToolStripButton

ArinWarev1/MdiMain.resx

@@ -331,72 +331,72 @@
   <data name="ToolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        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
-        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
+        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
-        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
+        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
-        18+epKwdzT+2l/p+jbiChgWJJSdvZ635Qr6u0orO30uYf+TA0LKy5+zlv/tj5PxDfafaHsq9hyLHmx/K
+        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
-        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
+        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
-        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
+        +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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        m9pN0nphE3ODH8btc3Mo4rgn/0PpOcHz7ZxRX0sFztXX2+idg+Peue4cd54Vz/1GABIB4L1PeyV1fYuk
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        7dacvyPt1wflRHtYjl41OtJm9Bl0uBVqCUsjdAhqoK6EpQ6qvRyWGqj6q7AchA40h+XTS2HZD1VB+y6G
-        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
+        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
-        QOtuOHpXwv0inzc9kLwdfZILMeZ91if5O29JHsRYwLjrthTswlyj0fzdt6UQmr/njhQGVFSJWHlX4wKN
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        KRUfhnHG0Ek75aKBx+XVX7Spm6EAKjtlbMERrKSOAsQxgIAbFtENAAE3ZG1vkRKsFudu6lYAmR/1Qf2y
-        zQEQcANdwajOsO54FIRxRR4gaM/Y6Tsj6IYCVxqeKyJhMOlCOMLNfZmEWTJBAInLzt8cnVP7nk3djGEl
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        hICoIALOIATPGQaGa6DOGXzqc7dVdzv1SsQ5wwMCCA4IALjo5DdQSF1xW8blN3THDfS3Cgfg3cwa+d+8
+        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
-        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
+        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
-        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
+        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
-        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
+        q3fhqY69gOoBDCuFQWfQFQ4IYfQhmp6h5eGia54eCMi6wd1NtF8oEAvDAxEA4pxhXaErTwXCYwMKiWAS
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        E/8Q4+KSM6ok1VlJWjq0pkBTlzmdkyS8fnzo0L0/j5o/D2n9Bhrev8u98NsXX/rDP94ejelfvkP9dYh9
-        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
+        X6dHOXc4YvKxERuxERuxERuxERux8eAxYsT/Ab9WXDw8xLCPAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="ToolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -509,224 +509,224 @@
   <data name="ToolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        +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
+        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
-        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
+        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
-        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
+        Z5l8FRM/R/X19XSeAb+aY2f5mFwOSoRVMwwRvnonkM5Mv9NOBOVDhI+Gdeqpt3d9hylwSO+0ft4/OCJv
-        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
+        WT2S/vm3QIN89CML7MifLbCSr6urYwE01IkItXysspEIkWtmUd1zmghf/iWATvvfYRC3RUzfDj+cGOLd
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        n0inJvg0EoDPAtJpNX00FADkL7w4ySC/d8tKK/mjR5l8rjRYKeSr7RB3dr3kWPlWf4Nw/Mdt7awSISRn
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        zBDLMQ29JAZ7FGA/PpjXsq8EUMS0Go4hwjPQZyn3iS9Nb9/1kZSUJOSL5SzgghBCQeZcFJbPkFIGLOJK
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        Pp4Msr+3Axq2ChC7qDu9Oe5WsbGLuum2od+dtg5sJVBrlQBSBzlRSwRQNTTiqh78zKxM8a+LABkZGfLL
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        +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
-        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
+        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
-        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
+        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
-        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
+        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
-        COmpNhDSHflxx1bmNuD5LrFWAVwFuOic8GfKroyrDiz0dxfatv797ObAUS4X8NP8k/S30eJGq1b/A7bD
+        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
-        5d7AigT4AAAAAElFTkSuQmCC
+        5dh36JZsAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="ToolStripButton6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        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
-        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
+        SyBSEBsiQAiUH1HEIlGEdkn22yl37p12+73Te+/j6b17xvZ47Fn3Xte7trfZG6/XbebwPO8557vfHV+P
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        Ob7ce9yswtVVG/nxePHD1mtmMPgvLYMD2kgX1gHeui53j46oaG3Nghn+wJQTCf5lQSDwPnXZ5S9KlLc2
+        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
-        vWC6nk0S4/N8945cvqRm9yyr195/T7UND6nCaPRCZrTglwyZmzg1MwOBP8gvjh/tmRhXM66xxLLO9yTb
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        p956QyUbG9YKS0oOOuW+20M75tXpt99Ul2/fFCfxipvetQRgXBoPA/SleC+pvceO6bHAnpPHVSCZWPeX
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        TdAg4beRfwqufAO2BWLRdVyXlcacx0v5yXhxSUP92gRO3nEy3qGZp8pQ0K2jzDbkw7PTqrShXr2IGX6x
-        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
+        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
-        +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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        /skpLPzZnFDo73LC4RfyE4m2gkRiNT+ZuOLHe57Gh6sq1nnoDE5Pi6EClGkEZ78RgcoghOp+5obG0A2h
-        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
+        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
-        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
+        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
-        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
+        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
-        zVcmHJu9mHk92B+aMHvoGAR5+imvsr31BWwaidWTJ9XSkUNq/sB+jbX9avfBNZli/WQOBloQcgBj5HJD
+        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
-        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
+        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
-        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
+        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
-        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
+        7hjhM6G2T2I5Ytnfb+Y3Jn88+l94QIk+fcLH8mNuoesRTEKyvg5yPe2WFtDjbZ19mo7b24hLOUAMILCk
-        wxpy6yntusyrbRyXndbBgdR+GKth2gA6KQf3CSPuoYkXGMyUdV6MUnnfj9LGBhWjA9w2yPbSujqltqV1
+        +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
-        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
+        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
-        SeOAeH3tBi8aPUDvRDLvHR+XMp+1e6TO8pg4oAbrumt0VBj3kI7MDQ8L1hG6JiDjn424R0q58dgqN0PL
+        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
-        w+WZImNcZlcpNmOhs33MBan0zHX/WBoH1NVudKOTYMzdjenn1gWjkncjJzqGh1UjjkFuRNIPetLoMaAF
+        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
-        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
+        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
-        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
+        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
-        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
+        AOUhhMF4KK35YpF/NSI3TYFYbE8tZ/W++qTauUqIlDzbd7+xRCYH1NWu8UAT4NVHaGKWR3QbXn2aRtcH
-        +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
+        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
-        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
+        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
-        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
+        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
-        +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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        yfv48GjHaS7GAcyJMTw4dh85jEBpwm2js9qxfWyZWylVH5Rtw5lePnpU7Tl2FIYfEGPEaUJLOVqWrus2
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        UWQZ0/Lg+XNqdPdCkuaxQf5Ghoc/Z8Q8jN+Pmcbj17ZvRgUuaNj8jhu1tydlh0I/A6/eYMzdBKV4XDHn
+        bhTZiWW5/+wZNbpjIUXzyCB/I8PDnytiHsbvxUrj9WvbN6ISDzQcfkeN2luTfJHIz8Cr1xhzN0MpXlfM
-        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
+        +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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        BI3XZRpvysYpbCttbJTHDDP8gWlXIPD7Vhfkt3cFg39kup5t4g+YiBMOZvn9nzVNW6askP+v+dZnHVDd
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        BiBf8qccyvM6gfpQL+r3VBxBZl5HeJ3BGbAO+ThApX7Ciy8/++xnvvHNbz7zMCCtZyyNJLglyJf8rcGU
-        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
+        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
 </value>
   </data>
   <data name="ToolStripButton7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        1pkDKN7Aoh0pvgHLb5FlRwdIDQRYhLdHktbGk/P5UI3WwO2DzzkvHfuqjIWw+gi/BuL6lm6EAEqqEG/Z
+        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
-        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
+        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
-        EjdCgKx7w04AI4iKYkRiHyzF4wwdl5qV/2ovaTjcX+bvBoEDGbIgDCXlYtYv1OP65u/BP1McvkPGLO+d
+        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
-        dNBMHH7O+vYQeULfMoVwOX3zPgZYL3kDAqT6S3DMq72l/uBtMn9XArEQapzF9TY5tS6/4EC6t5yz5FB/
+        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
-        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
+        wXRvOWfZ4YHCufoIvzLx+Z27DgLEkQsRvyhsD8XjDB2XmjXuzX5S+2lfqdwVMwQNSM75cUhXxOcpiKtz
-        SAFmrg4EGNeo5BtDMGQB9cd5AVqNeCkXYPQrt8riA7dIxXZ8fvdZ1OxLt74So63WnKv5HuNbS1Rs5y9F
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        +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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        fzcYMA9L6B47J11G1t4bIcAeS7i2JSBZ64i2eMKmJ8HnHtooAQ6B1Lkl9xuSnQmkwzhf97CwV7fZ9fLS
-        UVK0c2jftYRfhGXsaiYXqptek7Nz2M+5+gi/eHgSHl17WolZUlYE+qHYAzlgtLHRArz/VH/5sKq/dM4A
+        e83hZ74Xk3lKinYe7ceW8OuwjF3N5EJ102tydg77OVcf4RcPT8Jja88oMUvKikA/FHsgB4w1NlqAT18Y
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        qCHYInlGBI0Vec43fRBtEfe0yVDM0HF+7X9ugHTNSZPOGSBLKOFwTHSX3Cr7n0sUYNH99uAQYI6SCIM5
-        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
+        l3e+7/uzy9/k+90cztVH+DV01l5DbEzNqTiStBb8eMTnnc3FnjwKEHED9kKAzlk3WLJFPaRDiXc4X23X
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        OL+2ZX1B2idbgrSObJR9L+vWBAGqvmKITNaDG2y15Iw1vtqtmnN9rifkmzmwnKuP8MvcgPpOyZl3DKRO
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        /rsKkP9pcwvoe6t+S56tbUGvbrPLCTCpqYexPLwRwBAK/Pi85jbF19wcxo/PS74BfHu5DedkeNlhL0Ak
+        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
-        nAAhcA/Fi7oBmx6FACDXnKsChFFocXrkZ0y86dGE/3HjcQhQpAcv2nS98WlJgr6xmjeEtWbrNrY12+cF
+        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
-        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
+        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
-        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
+        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
-        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
+        QJIvWwEcjBDqn3oRNwB2wx8T/u+14U4AHJy/4Z7MpoBU4N8k0xVR8TT8Gcw53DO84gcRAuyXvKYv5GWQ
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
 </value>
   </data>
   <data name="bt_test.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

ArinWarev1/MdiMain.vb

@@ -1,3 +1,5 @@
+Imports System.IO
+
 Public Class MdiMain
 
     Enum E_MenuIdx
@@ -213,6 +215,11 @@ Public Class MdiMain
 
         pLog.Add("Program Start")
 
+        If System.Diagnostics.Debugger.IsAttached Then
+            Me.bt_etc.Visible = True
+        End If
+
+
     End Sub
 
     Public Sub Refresh_info()
@@ -255,8 +262,41 @@ Public Class MdiMain
 
     End Sub
 
+
+    Sub ClearData()
+        '//<2F><><EFBFBD>翭<EFBFBD><E7BFAD><EFBFBD>ִ<EFBFBD><D6B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ʈ<EFBFBD><C6AE> <20>ݴ´<DDB4>.
+        DSET1.Clear()
+        DSET2.Clear()
+        DSETR1.Clear()
+        DSETR2.Clear()
+
+        DSET1.AcceptChanges()
+        DSET2.AcceptChanges()
+        DSETR1.AcceptChanges()
+        DSETR2.AcceptChanges()
+
+        'DSET1 = New DS()
+        'DSET2 = New DS()
+
+        'DSETR1 = New DSR()
+        'DSETR2 = New DSR()
+
+        'DSET1.AcceptChanges()
+        'DSET2.AcceptChanges()
+        'DSETR1.AcceptChanges()
+        'DSETR2.AcceptChanges()
+    End Sub
+
+
+
     Public Sub Open_File(ByVal FileName As String, Optional ByVal SyncServer As Boolean = False, Optional checkVersion As Boolean = True, Optional silent As Boolean = False, Optional isNew As Boolean = False)
 
+        If SyncServer Then
+            If Prj.UserId.ToLower().StartsWith("user") Then
+                SyncServer = False
+            End If
+        End If
+
         If Prj.Opened Then
 
             If silent Then
@@ -271,20 +311,20 @@ Public Class MdiMain
                 Next
 
                 '//<2F><><EFBFBD>翭<EFBFBD><E7BFAD><EFBFBD>ִ<EFBFBD><D6B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ʈ<EFBFBD><C6AE> <20>ݴ´<DDB4>.
-                DSET1.Clear()
+                ClearData()
-                DSET2.Clear()
-                DSETR1.Clear()
-                DSETR2.Clear()
-                DSET1.AcceptChanges()
-                DSET2.AcceptChanges()
-                DSETR1.AcceptChanges()
-                DSETR2.AcceptChanges()
 
             Else
                 Dim quitmsg As String = "<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ִ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ʈ<EFBFBD><C6AE> <20><><EFBFBD><EFBFBD><EFBFBD>Ͻðڽ<C3B0><DABD>ϱ<EFBFBD>?"
                 Dim dlg As DialogResult = MsgBox(quitmsg, MsgBoxStyle.Question Or MsgBoxStyle.YesNoCancel, "Ȯ<EFBFBD><EFBFBD>")
                 If dlg = Windows.Forms.DialogResult.Yes Then
+
+                    If bt_filesave.Enabled = False Then
+                        If Save_New() = False Then Return '//<2F><><EFBFBD>Ҹ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ó<><C3B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
+
+                    Else
                         Me.Save_File(Prj.FileName, False)
+                    End If
+
 
                     For Each fChild As CForm In Me.MdiChildren
                         If fChild.HasChanged Then
@@ -295,14 +335,7 @@ Public Class MdiMain
                     Next
 
                     '//<2F><><EFBFBD>翭<EFBFBD><E7BFAD><EFBFBD>ִ<EFBFBD><D6B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ʈ<EFBFBD><C6AE> <20>ݴ´<DDB4>.
-                    DSET1.Clear()
+                    ClearData()
-                    DSET2.Clear()
-                    DSETR1.Clear()
-                    DSETR2.Clear()
-                    DSET1.AcceptChanges()
-                    DSET2.AcceptChanges()
-                    DSETR1.AcceptChanges()
-                    DSETR2.AcceptChanges()
                     '//<2F><><EFBFBD><EFBFBD>
                 ElseIf dlg = Windows.Forms.DialogResult.No Then
                     For Each fChild As CForm In Me.MdiChildren
@@ -314,14 +347,7 @@ Public Class MdiMain
                     Next
 
                     '//<2F><><EFBFBD>翭<EFBFBD><E7BFAD><EFBFBD>ִ<EFBFBD><D6B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ʈ<EFBFBD><C6AE> <20>ݴ´<DDB4>.
-                    DSET1.Clear()
+                    ClearData()
-                    DSET2.Clear()
-                    DSETR1.Clear()
-                    DSETR2.Clear()
-                    DSET1.AcceptChanges()
-                    DSET2.AcceptChanges()
-                    DSETR1.AcceptChanges()
-                    DSETR2.AcceptChanges()
                     '//quit
                 ElseIf dlg = Windows.Forms.DialogResult.Cancel Then
                     Return
@@ -339,24 +365,46 @@ Public Class MdiMain
         Prj.IsError = False '//160509
 
         '//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD>ø<EFBFBD><C3B8≯<EFBFBD><CCB8><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>´<EFBFBD>
+        Dim FI As New System.IO.FileInfo(FileName)
+        Dim Desbuf() As Byte = {}
         Dim FS As System.IO.Stream
         '///////////////////////////////////////////////////////////////////////////////////////////////////2011.03.16 <20>Է<EFBFBD><D4B7><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
         If Not (Prj.UserAuthType = "ADMIN" OrElse Prj.UserAuthType = "BOTH" OrElse Prj.UserAuthType = "BOTH2" OrElse Prj.UserAuthType = "BOTH1") Then  '//2011.03.16 <20>߰<EFBFBD> //eco <20><><EFBFBD><EFBFBD> <20>ҷ<EFBFBD><D2B7>ö<EFBFBD> ADMIN <20><><EFBFBD><EFBFBD> 'Prj.UserAuthType = "ADMIN" OrElse 
-            Dim Source() As Byte = My.Computer.FileSystem.ReadAllBytes(FileName)
+            Dim Source() As Byte = My.Computer.FileSystem.ReadAllBytes(FI.FullName)
-            Dim Desbuf() As Byte = {}
+
             If Source.Length < 4 Then
                 Prj.IsError = True
-                MsgboxE("<EFBFBD>˼<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ų<EFBFBD> <20>ջ<EFBFBD><D5BB><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>Դϴ<D4B4>" + vbCrLf + FileName, True)
+                MsgboxE("<EFBFBD>˼<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ų<EFBFBD> <20>ջ<EFBFBD><D5BB><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>Դϴ<D4B4>" + vbCrLf + FI.FullName, True)
                 Return
             End If
             pLog.Add("<EFBFBD><EFBFBD>ȣȭ <20><><EFBFBD><EFBFBD>")
             Desbuf = DeCryptArea(Source, New Byte() {&HAC, &H29, &H55, &H42})
-            FS = New IO.MemoryStream(Desbuf, True)
+
         Else
-            FS = New IO.FileStream(FileName, IO.FileMode.Open)
+            Desbuf = System.IO.File.ReadAllBytes(FileName)
+            ' FS = New IO.FileStream(FileName, IO.FileMode.Open)
         End If
+
+        If FI.Extension.ToLower().EndsWith("x") Then    '//Ȯ<><C8AE><EFBFBD>ڰ<EFBFBD> x<>γ<EFBFBD><CEB3><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
+            Dim datalen As Integer = BitConverter.ToInt32(Desbuf, 0)
+            Dim RealData(Desbuf.Length - 4 - 1) As Byte
+            Array.Copy(Desbuf, 4, RealData, 0, RealData.Length)
+            Dim DeCompress(datalen - 1) As Byte
+            Array.Clear(DeCompress, 0, DeCompress.Length)
+            Utility.MiniLZO.Decompress(RealData, DeCompress)
+            Array.Resize(Desbuf, DeCompress.Length)
+            Array.Clear(Desbuf, 0, Desbuf.Length)
+            Array.Copy(DeCompress, Desbuf, Desbuf.Length)
+        End If
+
+
+
+        FS = New IO.MemoryStream(Desbuf, True)
+
         '///////////////////////////////////////////////////////////////////////////////////////////////////2011.03.16 <20>Է<EFBFBD><D4B7><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
 
+
+
         Dim Br As New IO.BinaryReader(FS, System.Text.Encoding.Default)
         Prj.FileName = FileName : Myini.Write("presetting", "filename", Prj.FileName)
         Prj.Opened = False
@@ -389,7 +437,10 @@ Public Class MdiMain
                     ' MsgBox(Br.BaseStream.Position)
 
                     '//DS1 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD>ȭ <20><> <20><><EFBFBD><EFBFBD>
-                    DSET1.Clear() : DSET1.AcceptChanges()
+                    DSET1.Clear()
+                    DSET1.AcceptChanges()
+
+
                     Dim DS1Len As Int64 = Br.ReadInt64
                     If DS1Len = 0 Then
                         DS1Len = FS.Length - Br.BaseStream.Position - 2
@@ -407,9 +458,17 @@ Public Class MdiMain
                     If Not Prj.IsError Then
                         Dim Ms As New IO.MemoryStream(DS1)
                         Try
-                            DSET1.ReadXml(Ms)
+                            Ms.Position = 0
+
+                            Dim tempds As New DS()
+                            tempds.ReadXml(Ms)
+
+                            DSET1.Clear()
+                            DSET1.Merge(tempds) '   DSET1.ReadXml(Ms)
                             DSET1.AcceptChanges()
                             Ms.Close()
+
+                            tempds.Dispose()
                         Catch ex As Exception
                             Prj.IsError = True
                             MsgBox("<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ջ<EFBFBD><D5BB>Ǿ<EFBFBD><C7BE><EFBFBD><EFBFBD>ϴ<EFBFBD>(Read DataSet)" & vbCrLf & ex.Message.ToString, MsgBoxStyle.Information, "Ds1 Open Error")
@@ -496,9 +555,17 @@ Public Class MdiMain
                             DS1 = Br.ReadBytes(CInt(DS1Len))
                             Ms = New IO.MemoryStream(DS1)
                             Try
-                                DSETR1.ReadXml(Ms)
+
+                                Dim tempds As New DS()
+                                tempds.ReadXml(Ms)
+
+
+                                DSETR1.Clear()
+                                DSETR1.Merge(tempds) ' DSETR1.ReadXml(Ms)
                                 DSETR1.AcceptChanges()
                                 Ms.Close()
+
+                                tempds.Dispose()
                             Catch ex As Exception
                                 MsgBox("<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>." & vbCrLf & ex.Message.ToString, MsgBoxStyle.Information, "Ds2 Open Error")
                             End Try
@@ -536,9 +603,16 @@ Public Class MdiMain
                     'MsgBox("pos=" & Br.BaseStream.Position & vbCrLf & DS1.Length, MsgBoxStyle.Information, DS1Len)
                     Dim Ms As New IO.MemoryStream(DS1)
                     Try
-                        DSET1.ReadXml(Ms)
+
+                        Dim tempds As New DS()
+                        tempds.ReadXml(Ms)
+
+                        DSET1.Clear()
+                        DSET1.Merge(tempds) '  DSET1.ReadXml(Ms)
                         DSET1.AcceptChanges()
                         Ms.Close()
+
+                        tempds.Dispose()
                     Catch ex As Exception
                         MsgBox("<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ջ<EFBFBD><D5BB>Ǿ<EFBFBD><C7BE><EFBFBD><EFBFBD>ϴ<EFBFBD>." & vbCrLf & ex.Message.ToString, MsgBoxStyle.Information, "Ds1 Open Error")
                     End Try
@@ -549,8 +623,16 @@ Public Class MdiMain
                     DS1 = Br.ReadBytes(CInt(DS1Len))
                     Ms = New IO.MemoryStream(DS1)
                     Try
-                        DSETR1.ReadXml(Ms)
+
+                        Dim tempds As New DS()
+                        tempds.ReadXml(Ms)
+
+                        DSETR1.Clear()
+                        DSETR1.Merge(tempds) '  DSETR1.ReadXml(Ms)
                         DSETR1.AcceptChanges()
+
+                        tempds.Dispose()
+
                         Ms.Close()
                     Catch ex As Exception
                         MsgBox("<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>." & vbCrLf & ex.Message.ToString, MsgBoxStyle.Information, "Ds2 Open Error")
@@ -594,9 +676,16 @@ Public Class MdiMain
                     'MsgBox("pos=" & Br.BaseStream.Position & vbCrLf & DS1.Length, MsgBoxStyle.Information, DS1Len)
                     Dim Ms As New IO.MemoryStream(DS1)
                     Try
-                        DSET1.ReadXml(Ms)
+                        Dim tempds As New DS()
+                        tempds.ReadXml(Ms)
+
+                        DSET1.Clear()
+                        DSET1.Merge(tempds) ' DSET1.ReadXml(Ms)
                         DSET1.AcceptChanges()
                         Ms.Close()
+
+                        tempds.Dispose()
+
                     Catch ex As Exception
                         MsgBox("<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ջ<EFBFBD><D5BB>Ǿ<EFBFBD><C7BE><EFBFBD><EFBFBD>ϴ<EFBFBD>." & vbCrLf & ex.Message.ToString, MsgBoxStyle.Information, "Ds1 Open Error")
                     End Try
@@ -830,11 +919,18 @@ Public Class MdiMain
             '//<2F>θ<EFBFBD><CEB8><EFBFBD><EFBFBD><EFBFBD> <20>ʹ<EFBFBD><CAB9><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȵǴ<C8B5> <20><><EFBFBD>θ<EFBFBD> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD>ϸ<EFBFBD><CFB8><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ݴϴ<DDB4>.
             Me.lbl_filename.Text = Prj.FileName.Substring(Prj.FileName.LastIndexOf("\") + 1)
 
+           
+
+            If Prj.UserId.ToLower() <> "guest" AndAlso Not Prj.UserId.ToLower().StartsWith("user") Then '//191020
+
                 '//Version <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Ȯ<><C8AE>
-            Work_msg("<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>Ȯ<EFBFBD><C8AE><EFBFBD><EFBFBD>")
+                Dim MyVersion As String = ""
-            Dim MyVersion As String '= Format(My.Application.Info.Version.Minor, "0000") & Format(My.Application.Info.Version.Build, "0000")
-            Dim L As New ArinLogin.ArinLOgin
                 Dim VersionInfo As ArinLogin.ArinLOgin.sVersionInfo = Nothing
+
+                Work_msg("<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>Ȯ<EFBFBD><C8AE><EFBFBD><EFBFBD>")
+                '= Format(My.Application.Info.Version.Minor, "0000") & Format(My.Application.Info.Version.Build, "0000")
+                Dim L As New ArinLogin.ArinLOgin
+
                 '/<2F><><EFBFBD><EFBFBD><EFBFBD>ڵ<EFBFBD><DAB5><EFBFBD><EFBFBD><EFBFBD>Ȯ<EFBFBD><C8AE>
                 Try
                     MyVersion = DSET1.tbl_Desc.Rows(0)("versionc").ToString
@@ -844,7 +940,7 @@ Public Class MdiMain
                 End Try
 
                 pLog.Add(String.Format("<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> = {0}", MyVersion))
-            If Prj.UserId.ToLower() <> "guest" AndAlso Not Prj.UserId.ToLower().StartsWith("user") Then '//191020
+
                 Try
 
                     VersionInfo = L.Get_LastVersion("C2")   '//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>µ<EFBFBD>  eco <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ٲ<EFBFBD><D9B2>߰<EFBFBD><DFB0><EFBFBD> ^^ <20><><EFBFBD><EFBFBD><EFBFBD>ڸ<EFBFBD> <20>ֵ<EFBFBD><D6B5><EFBFBD> <20>սô<D5BD>!
@@ -867,8 +963,6 @@ Public Class MdiMain
                 Catch ex As Exception
                     MsgBox("<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڵ<EFBFBD> <20><><EFBFBD><EFBFBD>" & ex.Message.ToString)
                 End Try
-            End If
-
 
                 '/ǥ<><C7A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϲ<EFBFBD><CFB9><EFBFBD>Ȯ<EFBFBD><C8AE> '//2010.12.06 <20>߰<EFBFBD>
                 Try
@@ -880,7 +974,6 @@ Public Class MdiMain
 
                 pLog.Add(String.Format("ǥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϲ<EFBFBD><EFBFBD><EFBFBD> = {0}", MyVersion))
 
-            If Prj.UserId.ToLower() <> "guest" AndAlso Not Prj.UserId.ToLower().StartsWith("user") Then '//191020
                 Try
                     VersionInfo = L.Get_LastVersion("P2")   '//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>µ<EFBFBD>  eco <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ٲ<EFBFBD><D9B2>߰<EFBFBD><DFB0><EFBFBD> ^^ <20><><EFBFBD><EFBFBD><EFBFBD>ڸ<EFBFBD> <20>ֵ<EFBFBD><D6B5><EFBFBD> <20>սô<D5BD>!
                     If VersionInfo.Ver <> "0" AndAlso (CInt(VersionInfo.Ver) > CInt(MyVersion)) Then   '//0<><30> <20><><EFBFBD>ų<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>̹Ƿ<CCB9> <20>Ѿ<D1BE><EEB0A3>.
@@ -902,10 +995,13 @@ Public Class MdiMain
                 Catch ex As Exception
                     MsgBox("ǥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>" & ex.Message.ToString)
                 End Try
+
             End If
 
 
             
+
+
             Read_WeatherFile()
 
             Menu_<EFBFBD>ǹ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>()
@@ -991,22 +1087,42 @@ Public Class MdiMain
         Prj_test.IsError = False '//160509
 
         '//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD>ø<EFBFBD><C3B8≯<EFBFBD><CCB8><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>´<EFBFBD>
+        Dim FI As New System.IO.FileInfo(FileName)
+        Dim Desbuf() As Byte = {}
         Dim FS As System.IO.Stream
         '///////////////////////////////////////////////////////////////////////////////////////////////////2011.03.16 <20>Է<EFBFBD><D4B7><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
         If Not (Prj.UserAuthType = "ADMIN" OrElse Prj.UserAuthType = "BOTH" OrElse Prj.UserAuthType = "BOTH2" OrElse Prj.UserAuthType = "BOTH1") Then  '//2011.03.16 <20>߰<EFBFBD> //eco <20><><EFBFBD><EFBFBD> <20>ҷ<EFBFBD><D2B7>ö<EFBFBD> ADMIN <20><><EFBFBD><EFBFBD> 'Prj.UserAuthType = "ADMIN" OrElse 
-            Dim Source() As Byte = My.Computer.FileSystem.ReadAllBytes(FileName)
+            Dim Source() As Byte = My.Computer.FileSystem.ReadAllBytes(FI.FullName)
-            Dim Desbuf() As Byte = {}
+
             If Source.Length < 4 Then
-                Prj_test.IsError = True
+                Prj.IsError = True
-                MsgboxE("<EFBFBD>˼<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ų<EFBFBD> <20>ջ<EFBFBD><D5BB><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>Դϴ<D4B4>" + vbCrLf + FileName, True)
+                MsgboxE("<EFBFBD>˼<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ų<EFBFBD> <20>ջ<EFBFBD><D5BB><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>Դϴ<D4B4>" + vbCrLf + FI.FullName, True)
                 Return
             End If
             pLog.Add("<EFBFBD><EFBFBD>ȣȭ <20><><EFBFBD><EFBFBD>")
             Desbuf = DeCryptArea(Source, New Byte() {&HAC, &H29, &H55, &H42})
-            FS = New IO.MemoryStream(Desbuf, True)
+
         Else
-            FS = New IO.FileStream(FileName, IO.FileMode.Open)
+            Desbuf = System.IO.File.ReadAllBytes(FileName)
+            ' FS = New IO.FileStream(FileName, IO.FileMode.Open)
         End If
+
+        If FI.Extension.ToLower().EndsWith("x") Then    '//Ȯ<><C8AE><EFBFBD>ڰ<EFBFBD> x<>γ<EFBFBD><CEB3><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
+            Dim datalen As Integer = BitConverter.ToInt32(Desbuf, 0)
+            Dim RealData(Desbuf.Length - 4 - 1) As Byte
+            Array.Copy(Desbuf, 4, RealData, 0, RealData.Length)
+            Dim DeCompress(datalen - 1) As Byte
+            Array.Clear(DeCompress, 0, DeCompress.Length)
+            Utility.MiniLZO.Decompress(RealData, DeCompress)
+            Array.Resize(Desbuf, DeCompress.Length)
+            Array.Clear(Desbuf, 0, Desbuf.Length)
+            Array.Copy(DeCompress, Desbuf, Desbuf.Length)
+        End If
+
+
+
+        FS = New IO.MemoryStream(Desbuf, True)
+
         '///////////////////////////////////////////////////////////////////////////////////////////////////2011.03.16 <20>Է<EFBFBD><D4B7><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
 
         Dim Br As New IO.BinaryReader(FS, System.Text.Encoding.Default)
@@ -1146,10 +1262,24 @@ Public Class MdiMain
     Private GroupList_Bunbae As ArrayList
 
 
+    Sub DeSerialize(buffer As Byte(), ByRef data As DataTable)
 
+        'If System.IO.File.Exists(filename) = False Then Return
+        'Dim ms As New MemoryStream()
+
+        Using stm As System.IO.Stream = New System.IO.MemoryStream(buffer)
+            Dim bf As System.Runtime.Serialization.Formatters.Binary.BinaryFormatter = New System.Runtime.Serialization.Formatters.Binary.BinaryFormatter '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȭ <20><> <20><>ü Ŭ<><C5AC><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>ȯ... Dim a As clsTEST = CType(bf.Deserialize(stm), clsTEST) stm.Close()
+            Dim dt As DataTable = bf.Deserialize(stm)
+            data.Clear()
+            data.Merge(dt)
+        End Using
+
+    End Sub
 
     Sub DeSerialize(filename As String, ByRef data As DataTable)
 
+        If System.IO.File.Exists(filename) = False Then Return
+
         Using stm As System.IO.Stream = System.IO.File.Open(filename, System.IO.FileMode.Open, System.IO.FileAccess.Read)
             Dim bf As System.Runtime.Serialization.Formatters.Binary.BinaryFormatter = New System.Runtime.Serialization.Formatters.Binary.BinaryFormatter '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȭ <20><> <20><>ü Ŭ<><C5AC><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>ȯ... Dim a As clsTEST = CType(bf.Deserialize(stm), clsTEST) stm.Close()
             Dim dt As DataTable = bf.Deserialize(stm)
@@ -1165,6 +1295,11 @@ Public Class MdiMain
         DSET1.weather_supdo.Clear()
         DSET1.weather_temp.Clear()
         DSET1.weather_group.Clear()
+
+        DSET1.weather_wind.Clear()
+        DSET1.weather_river.Clear()
+        DSET1.weather_water.Clear()
+
         DSET1.tbl_weather.Clear()
 
         Dim DataPath As String = AppDomain.CurrentDomain.BaseDirectory + "Data"
@@ -1174,19 +1309,112 @@ Public Class MdiMain
         Dim fi4d As String = System.IO.Path.Combine(DataPath, DSET1.weather_temp.TableName + ".dat")
         Dim fi5d As String = System.IO.Path.Combine(DataPath, DSET1.tbl_weather.TableName + ".dat")
         Dim fi6d As String = System.IO.Path.Combine(DataPath, DSET1.weather_group.TableName + ".dat")
+
+        Dim fi7d As String = System.IO.Path.Combine(DataPath, DSET1.weather_wind.TableName + ".dat")
+        Dim fi8d As String = System.IO.Path.Combine(DataPath, DSET1.weather_river.TableName + ".dat")
+        Dim fi9d As String = System.IO.Path.Combine(DataPath, DSET1.weather_water.TableName + ".dat")
+
         If System.IO.File.Exists(fi1d) Then
+
+            '//check contents
+            Dim buffer As String = System.IO.File.ReadAllText(fi1d, System.Text.Encoding.Default)
+
+            Dim commpressed As Boolean
+            Try
+                DeSerialize(fi1d, CType(DSET1.weather_cha, DS.weather_chaDataTable))
+                commpressed = False
+            Catch ex As Exception
+                commpressed = True
+            End Try
+
+            If commpressed = False Then
+                '//class data
                 DeSerialize(fi1d, CType(DSET1.weather_cha, DS.weather_chaDataTable))
                 DeSerialize(fi2d, CType(DSET1.weather_ilsa, DS.weather_ilsaDataTable))
                 DeSerialize(fi3d, CType(DSET1.weather_supdo, DS.weather_supdoDataTable))
                 DeSerialize(fi4d, CType(DSET1.weather_temp, DS.weather_tempDataTable))
                 DeSerialize(fi5d, CType(DSET1.tbl_weather, DS.tbl_weatherDataTable))
-
-            'Using stm As System.IO.Stream = System.IO.File.Open(fi6d, System.IO.FileMode.Open, System.IO.FileAccess.Read)
-            '    Dim bf As System.Runtime.Serialization.Formatters.Binary.BinaryFormatter = New System.Runtime.Serialization.Formatters.Binary.BinaryFormatter '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȭ <20><> <20><>ü Ŭ<><C5AC><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>ȯ... Dim a As clsTEST = CType(bf.Deserialize(stm), clsTEST) stm.Close()
-            '    DSET1.weather_group = CType(bf.Deserialize(stm), DS.weather_groupDataTable))
-            'End Using
-
                 DeSerialize(fi6d, CType(DSET1.weather_group, DS.weather_groupDataTable))
+                DeSerialize(fi7d, CType(DSET1.weather_wind, DS.weather_windDataTable))
+                DeSerialize(fi8d, CType(DSET1.weather_river, DS.weather_riverDataTable))
+                DeSerialize(fi9d, CType(DSET1.weather_water, DS.weather_waterDataTable))
+            Else
+                '//lzo data
+                Dim buffer1 As Byte() = System.IO.File.ReadAllBytes(fi1d)
+                Dim buffer2 As Byte() = System.IO.File.ReadAllBytes(fi2d)
+                Dim buffer3 As Byte() = System.IO.File.ReadAllBytes(fi3d)
+                Dim buffer4 As Byte() = System.IO.File.ReadAllBytes(fi4d)
+                Dim buffer5 As Byte() = System.IO.File.ReadAllBytes(fi5d)
+                Dim buffer6 As Byte() = System.IO.File.ReadAllBytes(fi6d)
+                Dim buffer7 As Byte() = System.IO.File.ReadAllBytes(fi7d)
+                Dim buffer8 As Byte() = System.IO.File.ReadAllBytes(fi8d)
+                Dim buffer9 As Byte() = System.IO.File.ReadAllBytes(fi9d)
+
+                '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ó<><C3B3>4<EFBFBD><34><EFBFBD><EFBFBD>Ʈ<EFBFBD><C6AE><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> ũ<>Ⱑ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+                Dim len1 As UInt32 = BitConverter.ToUInt32(buffer1, 0)
+                Dim len2 As UInt32 = BitConverter.ToUInt32(buffer2, 0)
+                Dim len3 As UInt32 = BitConverter.ToUInt32(buffer3, 0)
+                Dim len4 As UInt32 = BitConverter.ToUInt32(buffer4, 0)
+                Dim len5 As UInt32 = BitConverter.ToUInt32(buffer5, 0)
+                Dim len6 As UInt32 = BitConverter.ToUInt32(buffer6, 0)
+                Dim len7 As UInt32 = BitConverter.ToUInt32(buffer7, 0)
+                Dim len8 As UInt32 = BitConverter.ToUInt32(buffer8, 0)
+                Dim len9 As UInt32 = BitConverter.ToUInt32(buffer9, 0)
+
+                Dim dbuffer1(len1 - 1) As Byte
+                Dim dbuffer2(len2 - 1) As Byte
+                Dim dbuffer3(len3 - 1) As Byte
+                Dim dbuffer4(len4 - 1) As Byte
+                Dim dbuffer5(len5 - 1) As Byte
+                Dim dbuffer6(len6 - 1) As Byte
+                Dim dbuffer7(len7 - 1) As Byte
+                Dim dbuffer8(len8 - 1) As Byte
+                Dim dbuffer9(len9 - 1) As Byte
+
+                Dim body1(buffer1.Length - 4 - 1) As Byte
+                Dim body2(buffer2.Length - 4 - 1) As Byte
+                Dim body3(buffer3.Length - 4 - 1) As Byte
+                Dim body4(buffer4.Length - 4 - 1) As Byte
+                Dim body5(buffer5.Length - 4 - 1) As Byte
+                Dim body6(buffer6.Length - 4 - 1) As Byte
+                Dim body7(buffer7.Length - 4 - 1) As Byte
+                Dim body8(buffer8.Length - 4 - 1) As Byte
+                Dim body9(buffer9.Length - 4 - 1) As Byte
+
+                Array.Copy(buffer1, 4, body1, 0, body1.Length)
+                Array.Copy(buffer2, 4, body2, 0, body2.Length)
+                Array.Copy(buffer3, 4, body3, 0, body3.Length)
+                Array.Copy(buffer4, 4, body4, 0, body4.Length)
+                Array.Copy(buffer5, 4, body5, 0, body5.Length)
+                Array.Copy(buffer6, 4, body6, 0, body6.Length)
+                Array.Copy(buffer7, 4, body7, 0, body7.Length)
+                Array.Copy(buffer8, 4, body8, 0, body8.Length)
+                Array.Copy(buffer9, 4, body9, 0, body9.Length)
+
+
+                Utility.MiniLZO.Decompress(body1, dbuffer1) '67682 -> 304964
+                Utility.MiniLZO.Decompress(body2, dbuffer2)
+                Utility.MiniLZO.Decompress(body3, dbuffer3)
+                Utility.MiniLZO.Decompress(body4, dbuffer4)
+                Utility.MiniLZO.Decompress(body5, dbuffer5)
+                Utility.MiniLZO.Decompress(body6, dbuffer6)
+                Utility.MiniLZO.Decompress(body7, dbuffer7)
+                Utility.MiniLZO.Decompress(body8, dbuffer8)
+                Utility.MiniLZO.Decompress(body9, dbuffer9)
+
+
+                DeSerialize(dbuffer1, CType(DSET1.weather_cha, DS.weather_chaDataTable))
+                DeSerialize(dbuffer2, CType(DSET1.weather_ilsa, DS.weather_ilsaDataTable))
+                DeSerialize(dbuffer3, CType(DSET1.weather_supdo, DS.weather_supdoDataTable))
+                DeSerialize(dbuffer4, CType(DSET1.weather_temp, DS.weather_tempDataTable))
+                DeSerialize(dbuffer5, CType(DSET1.tbl_weather, DS.tbl_weatherDataTable))
+                DeSerialize(dbuffer6, CType(DSET1.weather_group, DS.weather_groupDataTable))
+                DeSerialize(dbuffer7, CType(DSET1.weather_wind, DS.weather_windDataTable))
+                DeSerialize(dbuffer8, CType(DSET1.weather_river, DS.weather_riverDataTable))
+                DeSerialize(dbuffer9, CType(DSET1.weather_water, DS.weather_waterDataTable))
+            End If
+
+
 
         Else
             '//<2F><>ȣȭ<C8A3><C8AD><EFBFBD≯<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20>ҷ<EFBFBD><D2B7><EFBFBD><EFBFBD><EFBFBD>
@@ -1197,6 +1425,10 @@ Public Class MdiMain
             Dim fi5 As String = System.IO.Path.Combine(DataPath, DSET1.tbl_weather.TableName + ".xml")
             Dim fi6 As String = System.IO.Path.Combine(DataPath, DSET1.weather_group.TableName + ".xml")
 
+            Dim fi7 As String = System.IO.Path.Combine(DataPath, DSET1.weather_wind.TableName + ".xml")
+            Dim fi8 As String = System.IO.Path.Combine(DataPath, DSET1.weather_river.TableName + ".xml")
+            Dim fi9 As String = System.IO.Path.Combine(DataPath, DSET1.weather_water.TableName + ".xml")
+
 
 
             If System.IO.File.Exists(fi1) Then
@@ -1229,6 +1461,21 @@ Public Class MdiMain
             Else
                 MsgBox("<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>#6 <20><> <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>\r\n<><6E><EFBFBD>α׷<CEB1><D7B7><EFBFBD> <20>ٽ<EFBFBD> <20><>ġ<EFBFBD>ϼ<EFBFBD><CFBC><EFBFBD>")
             End If
+            If System.IO.File.Exists(fi7) Then
+                DSET1.weather_wind.ReadXml(fi7)
+            Else
+                MsgBox("<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>#7 <20><> <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>\r\n<><6E><EFBFBD>α׷<CEB1><D7B7><EFBFBD> <20>ٽ<EFBFBD> <20><>ġ<EFBFBD>ϼ<EFBFBD><CFBC><EFBFBD>")
+            End If
+            If System.IO.File.Exists(fi8) Then
+                DSET1.weather_river.ReadXml(fi8)
+            Else
+                MsgBox("<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>#8 <20><> <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>\r\n<><6E><EFBFBD>α׷<CEB1><D7B7><EFBFBD> <20>ٽ<EFBFBD> <20><>ġ<EFBFBD>ϼ<EFBFBD><CFBC><EFBFBD>")
+            End If
+            If System.IO.File.Exists(fi9) Then
+                DSET1.weather_water.ReadXml(fi9)
+            Else
+                MsgBox("<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>#9 <20><> <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>\r\n<><6E><EFBFBD>α׷<CEB1><D7B7><EFBFBD> <20>ٽ<EFBFBD> <20><>ġ<EFBFBD>ϼ<EFBFBD><CFBC><EFBFBD>")
+            End If
 
         End If
 
@@ -1240,6 +1487,11 @@ Public Class MdiMain
         DSET1.weather_temp.AcceptChanges()
         DSET1.tbl_weather.AcceptChanges()
 
+        DSET1.weather_wind.AcceptChanges()
+        DSET1.weather_river.AcceptChanges()
+        DSET1.weather_water.AcceptChanges()
+
+
         DSET1.weather_group.AcceptChanges()
     End Sub
 
@@ -1542,17 +1794,37 @@ ENDSTAT:  '//
         Fs.Close()
 
         '//<2F><><EFBFBD>Ͽ<EFBFBD><CFBF><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>Ҷ<EFBFBD>(<28><><EFBFBD≯<EFBFBD><CCB8><EFBFBD><EFBFBD><EFBFBD>) <20≯<EFBFBD><CCB8><EFBFBD> <20>ٲ<EFBFBD><D9B2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƿ<EFBFBD> <20>ش<EFBFBD> <20>̺<EFBFBD>Ʈ<EFBFBD><C6AE><EFBFBD><EFBFBD> ȭ<><C8AD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>Ұſ<D2B0><C5BF><EFBFBD>~
-        Me.lbl_filename.Text = Prj.FileName.Substring(Prj.FileName.LastIndexOf("\") + 1)
+        Dim fi As New System.IO.FileInfo(FileName)
+        Me.lbl_filename.Text = fi.Name ' Prj.FileName.Substring(Prj.FileName.LastIndexOf("\") + 1)
+
+
+        '//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ѵ<EFBFBD> 220919
+        Dim Source() As Byte = My.Computer.FileSystem.ReadAllBytes(FileName)
+        Dim Desbuf() As Byte = {}
+
+        If FileName.ToLower().EndsWith("x") Then  '//compressed 
+            Utility.MiniLZO.Compress(Source, Desbuf)
+            Dim OrgLength As Integer = Source.Length
+            Dim NewLength As Integer = Desbuf.Length
+            Array.Clear(Source, 0, Source.Length)
+            Array.Resize(Source, Desbuf.Length + 4)
+            Dim datalen() As Byte = BitConverter.GetBytes(OrgLength)
+            Array.Copy(datalen, Source, datalen.Length)
+            Array.Copy(Desbuf, 0, Source, 4, Desbuf.Length)
+        End If
 
         '/////////////////////////////////////////////////////////////////////////////////////////////////////////////<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>2011.03.16<EFBFBD>߰<EFBFBD>
         '//Encoding
         If Not (Prj.UserAuthType = "ADMIN" OrElse Prj.UserAuthType = "BOTH" OrElse Prj.UserAuthType = "BOTH2" OrElse Prj.UserAuthType = "BOTH1") Then  '//2011.03.09 <20>߰<EFBFBD> eco <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> admin <20><><EFBFBD><EFBFBD> Prj.UserAuthType = "ADMIN" OrElse 
-            Dim Desbuf() As Byte = {}
+            'Dim Source() As Byte = My.Computer.FileSystem.ReadAllBytes(FileName)
-            Dim Source() As Byte = My.Computer.FileSystem.ReadAllBytes(Prj.FileName)
             Desbuf = DeCryptArea(Source, New Byte() {&HAC, &H29, &H55, &H42})
-            My.Computer.FileSystem.WriteAllBytes(Prj.FileName, Desbuf, False)
+            My.Computer.FileSystem.WriteAllBytes(FileName, Desbuf, False)
+        Else
+            My.Computer.FileSystem.WriteAllBytes(FileName, Source, False)
         End If
 
+
+
         '/////////////////////////////////////////////////////////////////////////////////////////////////////////////<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>2011.03.16<EFBFBD>߰<EFBFBD>
 
         If prompt Then MsgBox("<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>Ǿ<EFBFBD><C7BE><EFBFBD><EFBFBD>ϴ<EFBFBD>", MsgBoxStyle.Information, "Ȯ<EFBFBD><EFBFBD>")
@@ -1658,14 +1930,14 @@ ENDSTAT:  '//
         Read_PreFile(idx)
     End Sub
 
-    Private Sub <EFBFBD>ű<EFBFBD>ToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles <EFBFBD>ű<EFBFBD>ToolStripMenuItem.Click
+    Private Sub <EFBFBD>ű<EFBFBD>ToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles btNew.Click
         '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD> if
         If MsgBox("<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ۼ<EFBFBD><DBBC>Ͻðڽ<C3B0><DABD>ϱ<EFBFBD>?", MsgBoxStyle.Information Or MsgBoxStyle.OkCancel, "Ȯ<EFBFBD><EFBFBD>") <> MsgBoxResult.Ok Then Return '//ok <20><><EFBFBD>ϸ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
         Dim new_string As String
         If Prj.UserAuthType = "ADMIN" OrElse Prj.UserAuthType = "BOTH" OrElse Prj.UserAuthType = "BOTH2" OrElse Prj.UserAuthType = "BOTH1" Then  '//2011.03.09 <20>߰<EFBFBD>
-            new_string = "\new"
+            new_string = "\newx.tplx"
         Else
-            new_string = "\new1"
+            new_string = "\newx.ecox"
         End If
         Dim Srcfile As New System.IO.FileInfo(My.Application.Info.DirectoryPath & new_string)
         If Srcfile.Exists = False Then
@@ -1673,20 +1945,20 @@ ENDSTAT:  '//
             Return '//<2F><><EFBFBD><EFBFBD><EFBFBD>ҿ<EFBFBD><D2BF><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
         End If
 
-        Dim SD As New SaveFileDialog
+        'Dim SD As New SaveFileDialog
-        If Prj.UserAuthType = "ADMIN" OrElse Prj.UserAuthType = "BOTH" OrElse Prj.UserAuthType = "BOTH2" OrElse Prj.UserAuthType = "BOTH1" Then  '//2011.03.09 <20>߰<EFBFBD>
+        'If Prj.UserAuthType = "ADMIN" OrElse Prj.UserAuthType = "BOTH" OrElse Prj.UserAuthType = "BOTH2" OrElse Prj.UserAuthType = "BOTH1" Then  '//2011.03.09 <20>߰<EFBFBD>
-            SD.FileName = "new" & Format(Now, "mmdd") & ".tpl"
+        '    SD.FileName = "new" & Format(Now, "mmdd") & ".tpl"
-            SD.Filter = "<EFBFBD><EFBFBD><EFBFBD>ø<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(*.TPL)|*.tpl|<7C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(*.*)|*.*"
+        '    SD.Filter = "<EFBFBD><EFBFBD><EFBFBD>ø<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(*.tplx)|*.tplx|<7C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(*.*)|*.*"
-        Else
+        'Else
-            SD.FileName = "new" & Format(Now, "mmdd") & ".eco"
+        '    SD.FileName = "new" & Format(Now, "mmdd") & ".eco"
-            SD.Filter = "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(*.ECO)|*.eco|<7C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(*.*)|*.*"
+        '    SD.Filter = "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(*.ecox)|*.ecox|<7C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(*.*)|*.*"
-        End If
+        'End If
 
-        If SD.ShowDialog <> Windows.Forms.DialogResult.OK Then Return '//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>ϸ<EFBFBD><CFB8><EFBFBD> <20>Է¾<D4B7><C2BE>ϸ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+        'If SD.ShowDialog <> Windows.Forms.DialogResult.OK Then Return '//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>ϸ<EFBFBD><CFB8><EFBFBD> <20>Է¾<D4B7><C2BE>ϸ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 
-        '//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ؼ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ֱ<EFBFBD>
+        ''//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ؼ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ֱ<EFBFBD>
-        If System.IO.File.Exists(SD.FileName) Then System.IO.File.Delete(SD.FileName)
+        'If System.IO.File.Exists(SD.FileName) Then System.IO.File.Delete(SD.FileName)
-        Srcfile.CopyTo(SD.FileName)
+        'Srcfile.CopyTo(SD.FileName)
 
         '/////////////////////////////////////////////////////////////////////////////////////////////////////////////<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>2011.03.16<EFBFBD>߰<EFBFBD>
         'If Not (Prj.UserAuthType = "ADMIN" OrElse Prj.UserAuthType = "BOTH" OrElse Prj.UserAuthType = "BOTH2" OrElse Prj.UserAuthType = "BOTH1") Then  '//2011.03.09 <20>߰<EFBFBD>
@@ -1696,10 +1968,12 @@ ENDSTAT:  '//
         '    My.Computer.FileSystem.WriteAllBytes(SD.FileName, Desbuf, False)   
         'End If
         '/////////////////////////////////////////////////////////////////////////////////////////////////////////////<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>2011.03.16<EFBFBD>߰<EFBFBD>
-        Me.Open_File(SD.FileName, True, False, False, True)
+        Me.Open_File(Srcfile.FullName, True, False, False, True)
         Prj.UIVersion = CurrentUIVersion()  '//<2F>׻<EFBFBD><D7BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 160327
         Refresh_info()
-        Me.Save_File(Prj.FileName, False)
+        ToolStripButton3.Enabled = False
+        bt_filesave.Enabled = False
+        'Me.Save_File(Prj.FileName, False)
     End Sub
 
     Public PreNode As TreeNode = Nothing
@@ -1963,7 +2237,7 @@ ENDSTAT:  '//
 
     End Sub
 
-    Private Sub <EFBFBD><EFBFBD><EFBFBD><EFBFBD>ToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles <EFBFBD><EFBFBD><EFBFBD><EFBFBD>ToolStripMenuItem.Click
+    Private Sub <EFBFBD><EFBFBD><EFBFBD><EFBFBD>ToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles btOpen.Click
         If Prj.LoginTime = "" Then
             MsgBox("<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>α<EFBFBD><CEB1><EFBFBD><EFBFBD><EFBFBD> <20>ϼ<EFBFBD><CFBC><EFBFBD>", MsgBoxStyle.Information, "Ȯ<EFBFBD><EFBFBD>")
             Frm_Intro.Activate()
@@ -1975,13 +2249,15 @@ ENDSTAT:  '//
         'Od.InitialDirectory = TemplateDir.FullName
         Od.FileName = Prj.FileName
         If Prj.UserAuthType = "ADMIN" OrElse Prj.UserAuthType = "BOTH" OrElse Prj.UserAuthType = "BOTH2" OrElse Prj.UserAuthType = "BOTH1" Then  '//2011.03.09 <20>߰<EFBFBD>
-            Od.Filter = "<EFBFBD><EFBFBD><EFBFBD>ø<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(*.TPL)|*.tpl|<7C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(*.*)|*.*"
+            Od.Filter = "<EFBFBD><EFBFBD><EFBFBD>ø<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(*.TPL,*.TPLX)|*.tpl;*.tplx|<7C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(*.*)|*.*"
         Else
-            Od.Filter = "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(*.ECO)|*.eco|<7C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(*.*)|*.*"
+            Od.Filter = "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(*.ECO,*.ECOX)|*.eco;*.ecox|<7C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(*.*)|*.*"
         End If
         Od.FilterIndex = 0
         If Od.ShowDialog <> Windows.Forms.DialogResult.OK Then Return
         Open_File(Od.FileName)
+        ToolStripButton3.Enabled = True
+        bt_filesave.Enabled = True
     End Sub
 
     Private Sub <EFBFBD><EFBFBD><EFBFBD><EFBFBD>ToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles bt_filesave.Click
@@ -1998,6 +2274,12 @@ ENDSTAT:  '//
             Return
         End If
 
+        Dim fi As New System.IO.FileInfo(Prj.FileName)
+        If fi.Extension.ToLower().EndsWith("x") = False Then
+            MsgBox("<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>Դϴ<D4B4>. [<5B>ٸ<EFBFBD> <20≯<EFBFBD>]<5D><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20>ϼ<EFBFBD><CFBC><EFBFBD>", MsgBoxStyle.Information, "Ȯ<EFBFBD><EFBFBD>")
+            Return
+        End If
+
         ' Dim lastmenu As String = ""
         If Me.OpenedForm <> E_MenuIdx.NONE Then '//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ִ<EFBFBD>.
             '  lastmenu = Me.OpenedForm.ToString
@@ -2257,7 +2539,7 @@ ENDSTAT:  '//
     End Sub
 
     Private Sub ToolStripButton1_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ToolStripButton1.Click
-        <EFBFBD>ű<EFBFBD>ToolStripMenuItem.PerformClick()
+        btNew.PerformClick()
     End Sub
 
     Private Sub <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>뷮<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ToolStripMenuItem1_Click(ByVal sender As System.Object, ByVal e As System.EventArgs)
@@ -2272,7 +2554,7 @@ ENDSTAT:  '//
     End Sub
 
     Private Sub ToolStripButton2_Click(sender As System.Object, e As System.EventArgs) Handles ToolStripButton2.Click
-        <EFBFBD><EFBFBD><EFBFBD><EFBFBD>ToolStripMenuItem.PerformClick()
+        btOpen.PerformClick()
     End Sub
 
 
@@ -2280,7 +2562,7 @@ ENDSTAT:  '//
         bt_filesave.PerformClick()
     End Sub
     Private Sub ToolStripButton4_Click(sender As System.Object, e As System.EventArgs) Handles ToolStripButton4.Click
-        <EFBFBD>ٸ<EFBFBD><EFBFBD≯<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ToolStripMenuItem.PerformClick()
+        btSaveNew.PerformClick()
     End Sub
     Private Sub ToolStripButton5_Click(sender As System.Object, e As System.EventArgs) Handles ToolStripButton5.Click
         <EFBFBD><EFBFBD><EFBFBD><EFBFBD>ToolStripMenuItem1.PerformClick()
@@ -2431,30 +2713,43 @@ ENDSTAT:  '//
         Next
     End Sub
 
-    Private Sub <EFBFBD>ٸ<EFBFBD><EFBFBD≯<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles <EFBFBD>ٸ<EFBFBD><EFBFBD≯<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ToolStripMenuItem.Click
+    Private Sub <EFBFBD>ٸ<EFBFBD><EFBFBD≯<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles btSaveNew.Click
+        
+        Save_New()
+    End Sub
+
+
+    Function Save_New() As Boolean
         If Prj.LoginTime = "" Then
             MsgBox("<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>α<EFBFBD><CEB1><EFBFBD><EFBFBD><EFBFBD> <20>ϼ<EFBFBD><CFBC><EFBFBD>", MsgBoxStyle.Information, "Ȯ<EFBFBD><EFBFBD>")
             Frm_Intro.Activate()
             Frm_Intro.tb_id.Focus()
-            Return
+            Return False
         End If
 
         If Prj.FileName = "" Then
             MsgBox(CLang.<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ͼ<EFBFBD><EFBFBD><EFBFBD>, MsgBoxStyle.Information, "Ȯ<EFBFBD><EFBFBD>")
-            Return
+            Return False
         End If
 
 
+        Dim newfilename As String = Prj.FileName
+        If newfilename.ToLower().EndsWith("x") = False Then
+            newfilename = newfilename + "x"
+        End If
+
+
+
         Dim SD As New SaveFileDialog
-        SD.FileName = Prj.FileName
+        SD.FileName = newfilename
         If Prj.UserAuthType = "ADMIN" OrElse Prj.UserAuthType = "BOTH" OrElse Prj.UserAuthType = "BOTH2" OrElse Prj.UserAuthType = "BOTH1" Then  '//2011.03.09 <20>߰<EFBFBD>
-            SD.Filter = "<EFBFBD><EFBFBD><EFBFBD>ø<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(*.TPL)|*.tpl|<7C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(*.*)|*.*"
+            SD.Filter = "<EFBFBD><EFBFBD><EFBFBD>ø<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(*.tplx)|*.tplx|<7C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(*.*)|*.*"
         Else
-            SD.Filter = "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(*.eco)|*.eco|<7C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(*.*)|*.*"
+            SD.Filter = "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(*.ecox)|*.ecox|<7C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(*.*)|*.*"
         End If
 
         SD.FilterIndex = 0
-        If SD.ShowDialog <> Windows.Forms.DialogResult.OK Then Return
+        If SD.ShowDialog <> Windows.Forms.DialogResult.OK Then Return False
         Prj.FileName = SD.FileName
 
         '    Dim lastmenu As String = ""
@@ -2465,16 +2760,14 @@ ENDSTAT:  '//
             curf.Close()
         End If
 
-
         Me.Save_File(Prj.FileName)
 
         If lastmenutag <> "" Then
             Me.show_menu(lastmenutag)
         End If
 
-    End Sub
+        Return True
-
+    End Function
-    
 
 
 
@@ -2780,7 +3073,7 @@ ENDSTAT:  '//
         End If
         Od.FilterIndex = 0
         If Od.ShowDialog <> Windows.Forms.DialogResult.OK Then Return
-        Open_File_only_weather(Od.FileName)
+        Open_File_Only_weather(Od.FileName)
 
 
     End Sub
@@ -2806,7 +3099,7 @@ ENDSTAT:  '//
         End If
         Od.FilterIndex = 0
         If Od.ShowDialog <> Windows.Forms.DialogResult.OK Then Return
-        Open_File_Only_profile(Od.FileName)
+        'Open_File_Only_profile(Od.FileName)
 
     End Sub
 End Class

ArinWarev1/Module/Pub.vb

@@ -486,6 +486,9 @@
         DSET1.weather_temp.Clear()
         DSET1.weather_supdo.Clear()
         DSET1.weather_group.Clear()
+        DSET1.weather_water.Clear()
+        DSET1.weather_river.Clear()
+        DSET1.weather_wind.Clear()
         DSET1.AcceptChanges()
 
         DSET2.tbl_weather.Clear()
@@ -494,6 +497,9 @@
         DSET2.weather_temp.Clear()
         DSET2.weather_supdo.Clear()
         DSET2.weather_group.Clear()
+        DSET2.weather_water.Clear()
+        DSET2.weather_river.Clear()
+        DSET2.weather_wind.Clear()
         DSET2.AcceptChanges()
 
         Try
@@ -570,6 +576,99 @@
 
         End If
     End Function
+
+    Public Function SolarAirHeatingSystem(DSET As DS, ByVal i_count_month As Integer, ByVal i_count_d_mth As Integer, ByVal Dr공조 As DS.tbl_kongjoRow, ByVal V_dot_A_AHU As Decimal, ByVal T_amb As Decimal, ByVal Delta_T_act As Decimal) ' ByVal d_mth As Integer,
+
+        pLog.Add(String.Format(">>SolarAirHeatingSystem 진입 : i_count_month={0}, i_count_d_mth={1}, Dr공조={2}, 외기도입량={3}, theta_e={4}, Delta_T_act={5}", i_count_month, i_count_d_mth, Dr공조.code, V_dot_A_AHU, T_amb, Delta_T_act))
+
+        Dim G_coll, G_tilt, A_coll As Decimal
+        Dim e_HX, h_c, v_wind, t, alpha, h_dot_r, eta As Decimal
+        Dim Q_dot_coll, Delta_T_avl, T_del_avl, T_del_act, T_del_max As Decimal
+        Dim rho As Decimal = 1.225
+        Dim C_p As Decimal = 1005 / 3600 '// [J/kg'C] 3600으로 나누어 Wh로 변환 [Wh/kg'C]
+        Dim Delta_T_offset As Decimal = 3
+        Dim h_sunlight As Decimal = 24
+        Dim sigma_s As Decimal = 0.000000056703 '스테판볼츠만 상수
+        T_del_max = 20
+
+
+        '// 사용자 입력항목 : 집열기 면적(A_coll), 단면적, 집열기 표면방사율(e) 
+        '// Q_dot_coll 은 외기도입풍량을 집열기 면적으로 나눈 값
+        '// h_sunlight 는 주간 운전시간 적용 
+
+        Dim Drow풍속 As DS.weather_windRow = CType(DSET.weather_wind.Select("pcode='" & Calc.Pub.기상데이터.code & "'")(0), DS.weather_windRow)
+        v_wind = TOSG(Drow풍속("M" + i_count_month.ToString("00")))
+
+        Dim Dr일사 As DS.weather_ilsaRow
+
+        Select Case Dr공조.집열기방위.Trim
+            Case "남" '"남"
+                Dr일사 = CType(DSET.weather_ilsa.Select("pcode='" & Calc.Pub.기상데이터.code & "' and code='" & Format(1 + 1, "0000") & "'")(0), DS.weather_ilsaRow)
+                G_tilt = TOSG(Dr일사("M" & Format(i_count_month, "00"))) * 24
+            Case "남동" '"남동"
+                Dr일사 = CType(DSET.weather_ilsa.Select("pcode='" & Calc.Pub.기상데이터.code & "' and code='" & Format(1 + 2, "0000") & "'")(0), DS.weather_ilsaRow)
+                G_tilt = TOSG(Dr일사("M" & Format(i_count_month, "00"))) * 24
+            Case "남서" '"남서"
+                Dr일사 = CType(DSET.weather_ilsa.Select("pcode='" & Calc.Pub.기상데이터.code & "' and code='" & Format(1 + 3, "0000") & "'")(0), DS.weather_ilsaRow)
+                G_tilt = TOSG(Dr일사("M" & Format(i_count_month, "00"))) * 24
+            Case "동" '"동"
+                Dr일사 = CType(DSET.weather_ilsa.Select("pcode='" & Calc.Pub.기상데이터.code & "' and code='" & Format(1 + 4, "0000") & "'")(0), DS.weather_ilsaRow)
+                G_tilt = TOSG(Dr일사("M" & Format(i_count_month, "00"))) * 24
+            Case "서" '"서"
+                Dr일사 = CType(DSET.weather_ilsa.Select("pcode='" & Calc.Pub.기상데이터.code & "' and code='" & Format(1 + 5, "0000") & "'")(0), DS.weather_ilsaRow)
+                G_tilt = TOSG(Dr일사("M" & Format(i_count_month, "00"))) * 24
+            Case "북동" '"북동"
+                Dr일사 = CType(DSET.weather_ilsa.Select("pcode='" & Calc.Pub.기상데이터.code & "' and code='" & Format(1 + 6, "0000") & "'")(0), DS.weather_ilsaRow)
+                G_tilt = TOSG(Dr일사("M" & Format(i_count_month, "00"))) * 24
+            Case "북서" '"북서"
+                Dr일사 = CType(DSET.weather_ilsa.Select("pcode='" & Calc.Pub.기상데이터.code & "' and code='" & Format(1 + 7, "0000") & "'")(0), DS.weather_ilsaRow)
+                G_tilt = TOSG(Dr일사("M" & Format(i_count_month, "00"))) * 24
+            Case "북" '"북"
+                Dr일사 = CType(DSET.weather_ilsa.Select("pcode='" & Calc.Pub.기상데이터.code & "' and code='" & Format(1 + 8, "0000") & "'")(0), DS.weather_ilsaRow)
+                G_tilt = TOSG(Dr일사("M" & Format(i_count_month, "00"))) * 24
+
+        End Select
+
+
+        A_coll = TOSG(Dr공조.집열기면적)
+        alpha = TOSG(Dr공조.집열기방사율)
+        Q_dot_coll = V_dot_A_AHU / A_coll
+        G_coll = G_tilt * A_coll '// * f_op 집열기 가동계수는 G_tilt 에 포함
+
+        e_HX = 1 - 5 * Q_dot_coll
+        h_c = 6.0 + 4.0 * v_wind - 76 * Q_dot_coll
+        t = alpha * G_tilt / (rho * C_p * Q_dot_coll * e_HX + 4 * alpha * sigma_s * T_amb ^ 3 + h_c)  ' e는 alpha 로 공유
+        h_dot_r = 4 * alpha * sigma_s * T_amb ^ 2 * (T_amb + 1.6 * t) ' e는 alpha 로 공유
+        eta = alpha / (1 + (h_dot_r + h_c) / (rho * C_p * Q_dot_coll * e_HX))
+
+
+        Delta_T_avl = (eta * G_tilt) / (Q_dot_coll * rho * C_p * h_sunlight)
+        T_del_avl = (T_amb + Delta_T_offset) + Delta_T_avl
+        T_del_act = Math.Min(T_del_max, T_del_avl)
+        Delta_T_act = Math.Max(T_del_act - (T_amb + Delta_T_offset), 0)
+
+        'f_util = Delta_T_act / Delta_T_avl
+
+        'Q_sol = Sigma(eta * G_coll * f_util)
+
+        Return Delta_T_act
+
+    End Function
+
+
+
+    Public Function Get_V_dot_A_AHU(tbl_profile As DS.tbl_profileDataTable, tbl_zone As DS.tbl_zoneDataTable, Dr공조Code As String) As Decimal
+
+
+        Dim ZoneListKongjo() As DS.tbl_zoneRow = tbl_zone.Select("code<>'0' and 냉난방공조처리시스템 = '" + Dr공조Code + "'", "code")
+        Dim V_dot_A_AHU As Decimal = 0
+        For Each DrZonbyKongjo As DS.tbl_zoneRow In ZoneListKongjo
+
+            Dim Dr프로필2 As DS.tbl_profileRow = CType(tbl_profile.Select("code='" & DrZonbyKongjo.프로필 & "'")(0), DS.tbl_profileRow)
+            V_dot_A_AHU += TOSG(DrZonbyKongjo.면적) * TOSG(DrZonbyKongjo.입력존의수) * TOSG(Dr프로필2.최소도입외기량)
+        Next
+        Return V_dot_A_AHU
+    End Function
     Public Function TOSG(ByVal obj As Object) As Decimal
         If obj Is DBNull.Value Then
             Return 0

ArinWarev1/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' 지정되도록 할 수 있습니다.
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.2017.0122.0011")> 
+<Assembly: AssemblyVersion("1.2017.0122.1000")> 
-<Assembly: AssemblyFileVersion("1.2017.0122.0011")> 
+<Assembly: AssemblyFileVersion("1.2017.0122.1000")> 

ArinWarev1/My Project/Settings.Designer.vb

@@ -1,7 +1,7 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
 '     이 코드는 도구를 사용하여 생성되었습니다.
-'     런타임 버전:4.0.30319.18051
+'     런타임 버전:4.0.30319.42000
 '
 '     파일 내용을 변경하면 잘못된 동작이 발생할 수 있으며, 코드를 다시 생성하면
 '     이러한 변경 내용이 손실됩니다.
@@ -57,8 +57,8 @@ Namespace My
         <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.Configuration.SpecialSettingAttribute(Global.System.Configuration.SpecialSetting.ConnectionString),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("Data Source=ms0501.gabiadb.com;Initial Catalog=eco2;Persist Security Info=True;Us"& _ 
+         Global.System.Configuration.DefaultSettingValueAttribute("Data Source=ms0501.gabiadb.com;Initial Catalog=eco2;User ID=raytrace;Password=ari"& _ 
-            "er ID=raytrace;Password=arin")>  _
+            "n")>  _
         Public ReadOnly Property cs() As String
             Get
                 Return CType(Me("cs"),String)

ArinWarev1/My Project/Settings.settings

@@ -5,10 +5,10 @@
     <Setting Name="cs" Type="(Connection string)" Scope="Application">
       <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=ms0501.gabiadb.com;Initial Catalog=eco2;Persist Security Info=True;User ID=raytrace;Password=arin&lt;/ConnectionString&gt;
+  &lt;ConnectionString&gt;Data Source=ms0501.gabiadb.com;Initial Catalog=eco2;User ID=raytrace;Password=arin&lt;/ConnectionString&gt;
   &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=ms0501.gabiadb.com;Initial Catalog=eco2;Persist Security Info=True;User ID=raytrace;Password=arin</Value>
+      <Value Profile="(Default)">Data Source=ms0501.gabiadb.com;Initial Catalog=eco2;User ID=raytrace;Password=arin</Value>
     </Setting>
   </Settings>
 </SettingsFile>

ArinWarev1/My Project/licenses.licx

@@ -1 +1,2 @@
 FarPoint.Win.Spread.FpSpread, FarPoint.Win.Spread, Version=5.0.3505.2008, Culture=neutral, PublicKeyToken=327c3516b1b18457
+C1.Win.FlexPivot.C1FlexPivotPage, C1.Win.FlexPivot.4, Version=4.0.20171.248, Culture=neutral, PublicKeyToken=79882d576c6336da

ArinWarev1/app.config

@@ -3,7 +3,8 @@
 	<configSections>
 	</configSections>
 	<connectionStrings>
-		<add name="Eco2Ar.My.MySettings.cs" connectionString="Data Source=ms0501.gabiadb.com;Initial Catalog=eco2;Persist Security Info=True;User ID=raytrace;Password=arin" providerName="System.Data.SqlClient"/>
+  <add name="Eco2Ar.My.MySettings.cs" connectionString="Data Source=ms0501.gabiadb.com;Initial Catalog=eco2;User ID=raytrace;Password=arin"
+   providerName="System.Data.SqlClient" />
  </connectionStrings>
 	<system.diagnostics>
 		<sources>

Dotfuscator1_v2010.xml

@@ -33,6 +33,12 @@
         <option>library</option>
         <file dir="C:\ECO2\debug_2016" name="ArinLog.Net4.dll" />
       </inputassembly>
+      <inputassembly>
+        <option>honoroas</option>
+        <option>stripoa</option>
+        <option>library</option>
+        <file dir="C:\ECO2\debug_2016" name="Utility.dll" />
+      </inputassembly>
     </asmlist>
   </input>
   <output>
@@ -1286,11 +1292,11 @@
       </mapoutput>
     </mapping>
     <referencerulelist>
-      <referencerule rulekey="{7D9C8B02-2383-420f-8740-A9760394C2C1}" />
-      <referencerule rulekey="{229FD6F8-5BCC-427b-8F72-A7A413ECDF1A}" />
       <referencerule rulekey="{2B7E7C8C-A39A-4db8-9DFC-6AFD38509061}" />
+      <referencerule rulekey="{7D9C8B02-2383-420f-8740-A9760394C2C1}" />
       <referencerule rulekey="{89769974-93E9-4e71-8D92-BE70E855ACFC}" />
       <referencerule rulekey="{6655B10A-FD58-462d-8D4F-5B1316DFF0FF}" />
+      <referencerule rulekey="{229FD6F8-5BCC-427b-8F72-A7A413ECDF1A}" />
     </referencerulelist>
   </renaming>
   <sos mergeruntime="true">

SetupIS/SetupIS.isl

@@ -357,6 +357,7 @@
 		<row><td>ISX_DEFAULTCOMPONENT2</td><td>{191F8870-089E-425A-A6CE-CCEF27CFD27D}</td><td>DATA</td><td>2</td><td/><td/><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
 		<row><td>Interop.Excel.dll</td><td>{442AB981-7381-4FE3-AE3A-BE5CB3DDF5FA}</td><td>INSTALLDIR</td><td>2</td><td/><td>interop.excel.dll</td><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
 		<row><td>Interop.VBIDE.dll</td><td>{009DF212-3CED-4C28-A2C8-2335932AC2F9}</td><td>INSTALLDIR</td><td>2</td><td/><td>interop.vbide.dll</td><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
+		<row><td>Utility.dll</td><td>{8CF8ED1D-86D7-4E28-B255-0FF4EDD6C6CC}</td><td>INSTALLDIR</td><td>2</td><td/><td>utility.dll</td><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
 	</table>
 
 	<table name="Condition">
@@ -1082,6 +1083,7 @@
 		<row><td>INSTALLDIR</td><td>ISX_DEFAULTCOMPONENT2</td></row>
 		<row><td>INSTALLDIR</td><td>Interop.Excel.dll</td></row>
 		<row><td>INSTALLDIR</td><td>Interop.VBIDE.dll</td></row>
+		<row><td>INSTALLDIR</td><td>Utility.dll</td></row>
 		<row><td>ProgramFilesFolder</td><td>ISX_DEFAULTCOMPONENT1</td></row>
 	</table>
 
@@ -1919,6 +1921,7 @@
 		<row><td>AlwaysInstall</td><td>ISX_DEFAULTCOMPONENT2</td></row>
 		<row><td>AlwaysInstall</td><td>Interop.Excel.dll</td></row>
 		<row><td>AlwaysInstall</td><td>Interop.VBIDE.dll</td></row>
+		<row><td>AlwaysInstall</td><td>Utility.dll</td></row>
 	</table>
 
 	<table name="File">
@@ -1948,15 +1951,19 @@
 		<row><td>interop.excel.dll</td><td>Interop.Excel.dll</td><td>INTERO~1.DLL|Interop.Excel.dll</td><td>0</td><td/><td/><td/><td>1</td><td>C:\eco2\debug_2016\Interop.Excel.dll</td><td>1</td><td/></row>
 		<row><td>interop.vbide.dll</td><td>Interop.VBIDE.dll</td><td>INTERO~1.DLL|Interop.VBIDE.dll</td><td>0</td><td/><td/><td/><td>1</td><td>C:\eco2\debug_2016\Interop.VBIDE.dll</td><td>1</td><td/></row>
 		<row><td>login.dat</td><td>ISX_DEFAULTCOMPONENT</td><td>login.dat</td><td>0</td><td/><td/><td/><td>1</td><td>C:\eco2\debug_2016\login.dat</td><td>1</td><td/></row>
-		<row><td>new</td><td>ISX_DEFAULTCOMPONENT</td><td>new</td><td>0</td><td/><td/><td/><td>1</td><td>C:\eco2\debug_2016\new</td><td>1</td><td/></row>
+		<row><td>newx.ecox</td><td>ISX_DEFAULTCOMPONENT</td><td>NEWX~1.ECO|newx.ecox</td><td>0</td><td/><td/><td/><td>1</td><td>C:\ECO2\debug_2016\newx.ecox</td><td>1</td><td/></row>
-		<row><td>new1</td><td>ISX_DEFAULTCOMPONENT</td><td>new1</td><td>0</td><td/><td/><td/><td>1</td><td>C:\eco2\debug_2016\new1</td><td>1</td><td/></row>
+		<row><td>newx.tplx</td><td>ISX_DEFAULTCOMPONENT</td><td>NEWX~1.TPL|newx.tplx</td><td>0</td><td/><td/><td/><td>1</td><td>C:\ECO2\debug_2016\newx.tplx</td><td>1</td><td/></row>
 		<row><td>tbl_weather.dat</td><td>ISX_DEFAULTCOMPONENT2</td><td>TBL_WE~1.DAT|tbl_weather.dat</td><td>0</td><td/><td/><td/><td>1</td><td>C:\ECO2\debug_2016\Data\tbl_weather.dat</td><td>1</td><td/></row>
 		<row><td>upload.xlsx</td><td>ISX_DEFAULTCOMPONENT</td><td>UPLOAD~1.XLS|upload.xlsx</td><td>0</td><td/><td/><td/><td>1</td><td>C:\eco2\debug_2016\upload.xlsx</td><td>1</td><td/></row>
+		<row><td>utility.dll</td><td>Utility.dll</td><td>Utility.dll</td><td>0</td><td/><td/><td/><td>1</td><td>C:\ECO2\dotfus_2016\Utility.dll</td><td>1</td><td/></row>
 		<row><td>weather_cha.dat</td><td>ISX_DEFAULTCOMPONENT2</td><td>WEATHE~1.DAT|weather_cha.dat</td><td>0</td><td/><td/><td/><td>1</td><td>C:\ECO2\debug_2016\Data\weather_cha.dat</td><td>1</td><td/></row>
 		<row><td>weather_group.dat</td><td>ISX_DEFAULTCOMPONENT2</td><td>WEATHE~1.DAT|weather_group.dat</td><td>0</td><td/><td/><td/><td>1</td><td>C:\ECO2\debug_2016\Data\weather_group.dat</td><td>1</td><td/></row>
 		<row><td>weather_ilsa.dat</td><td>ISX_DEFAULTCOMPONENT2</td><td>WEATHE~1.DAT|weather_ilsa.dat</td><td>0</td><td/><td/><td/><td>1</td><td>C:\ECO2\debug_2016\Data\weather_ilsa.dat</td><td>1</td><td/></row>
+		<row><td>weather_river.dat</td><td>ISX_DEFAULTCOMPONENT2</td><td>WEATHE~1.DAT|weather_river.dat</td><td>0</td><td/><td/><td/><td>1</td><td>C:\ECO2\debug_2016\Data\weather_river.dat</td><td>1</td><td/></row>
 		<row><td>weather_supdo.dat</td><td>ISX_DEFAULTCOMPONENT2</td><td>WEATHE~1.DAT|weather_supdo.dat</td><td>0</td><td/><td/><td/><td>1</td><td>C:\ECO2\debug_2016\Data\weather_supdo.dat</td><td>1</td><td/></row>
 		<row><td>weather_temp.dat</td><td>ISX_DEFAULTCOMPONENT2</td><td>WEATHE~1.DAT|weather_temp.dat</td><td>0</td><td/><td/><td/><td>1</td><td>C:\ECO2\debug_2016\Data\weather_temp.dat</td><td>1</td><td/></row>
+		<row><td>weather_water.dat</td><td>ISX_DEFAULTCOMPONENT2</td><td>WEATHE~1.DAT|weather_water.dat</td><td>0</td><td/><td/><td/><td>1</td><td>C:\ECO2\debug_2016\Data\weather_water.dat</td><td>1</td><td/></row>
+		<row><td>weather_wind.dat</td><td>ISX_DEFAULTCOMPONENT2</td><td>WEATHE~1.DAT|weather_wind.dat</td><td>0</td><td/><td/><td/><td>1</td><td>C:\ECO2\debug_2016\Data\weather_wind.dat</td><td>1</td><td/></row>
 	</table>
 
 	<table name="FileSFPCatalog">
@@ -2115,6 +2122,7 @@
 		<row><td>ISX_DEFAULTCOMPONENT2</td><td/><td/><td>_C8066680_0133_46DA_A065_30ED5E4B481D_FILTER</td><td/><td/><td/><td/></row>
 		<row><td>Interop.Excel.dll</td><td/><td/><td>_C32F34DE_6A30_439A_8E1C_A91DC35CD3A9_FILTER</td><td/><td/><td/><td/></row>
 		<row><td>Interop.VBIDE.dll</td><td/><td/><td>_0E888B79_F620_40E8_90D4_576DA59CC9EA_FILTER</td><td/><td/><td/><td/></row>
+		<row><td>Utility.dll</td><td/><td/><td>_5F9E6B50_5266_40ED_A3AD_AED5A51A5942_FILTER</td><td/><td/><td/><td/></row>
 	</table>
 
 	<table name="ISCustomActionReference">
@@ -2481,7 +2489,7 @@
 		<row><td>Custom</td><td>Express</td><td>&lt;ISProjectDataFolder&gt;</td><td>Default</td><td>2</td><td>1033</td><td>0</td><td>2</td><td>Intel</td><td/><td>1033</td><td>0</td><td>100</td><td>0</td><td>1024</td><td/><td>0</td><td/><td>MediaLocation</td><td/><td>http://</td><td/><td/><td/><td/><td>75805</td><td/><td/><td/><td>3</td></row>
 		<row><td>DVD-10</td><td>Express</td><td>&lt;ISProjectDataFolder&gt;</td><td>Default</td><td>3</td><td>1033</td><td>0</td><td>2</td><td>Intel</td><td/><td>1033</td><td>0</td><td>8.75</td><td>1</td><td>2048</td><td/><td>0</td><td/><td>MediaLocation</td><td/><td>http://</td><td/><td/><td/><td/><td>75805</td><td/><td/><td/><td>3</td></row>
 		<row><td>DVD-18</td><td>Express</td><td>&lt;ISProjectDataFolder&gt;</td><td>Default</td><td>3</td><td>1033</td><td>0</td><td>2</td><td>Intel</td><td/><td>1033</td><td>0</td><td>15.83</td><td>1</td><td>2048</td><td/><td>0</td><td/><td>MediaLocation</td><td/><td>http://</td><td/><td/><td/><td/><td>75805</td><td/><td/><td/><td>3</td></row>
-		<row><td>DVD-5</td><td>Express</td><td>C:\eco2\Setup_ECO2_2020_20170122_10</td><td>Default</td><td>3</td><td>1042</td><td>0</td><td>1</td><td>Intel</td><td/><td>1042</td><td>0</td><td>4.38</td><td>1</td><td>2048</td><td/><td>0</td><td/><td>MediaLocation</td><td/><td>http://</td><td/><td/><td/><td/><td>75805</td><td/><td/><td/><td>3</td></row>
+		<row><td>DVD-5</td><td>Express</td><td>C:\eco2\Setup_ECO2_2022_20170122_1000</td><td>Default</td><td>3</td><td>1042</td><td>0</td><td>1</td><td>Intel</td><td/><td>1042</td><td>0</td><td>4.38</td><td>1</td><td>2048</td><td/><td>0</td><td/><td>MediaLocation</td><td/><td>http://</td><td/><td/><td/><td/><td>75805</td><td/><td/><td/><td>3</td></row>
 		<row><td>DVD-9</td><td>Express</td><td>&lt;ISProjectDataFolder&gt;</td><td>Default</td><td>3</td><td>1033</td><td>0</td><td>2</td><td>Intel</td><td/><td>1033</td><td>0</td><td>7.95</td><td>1</td><td>2048</td><td/><td>0</td><td/><td>MediaLocation</td><td/><td>http://</td><td/><td/><td/><td/><td>75805</td><td/><td/><td/><td>3</td></row>
 		<row><td>SingleImage</td><td>Express</td><td>C:\eco2\Setup_2016_191020_guest_patch</td><td>PackageName</td><td>1</td><td>1042</td><td>0</td><td>1</td><td>Intel</td><td/><td>1042</td><td>0</td><td>0</td><td>0</td><td>0</td><td/><td>0</td><td/><td>MediaLocation</td><td/><td>http://</td><td/><td/><td/><td/><td>108701</td><td/><td/><td/><td>3</td></row>
 		<row><td>WebDeployment</td><td>Express</td><td>&lt;ISProjectDataFolder&gt;</td><td>PackageName</td><td>4</td><td>1033</td><td>2</td><td>1</td><td>Intel</td><td/><td>1033</td><td>0</td><td>0</td><td>0</td><td>0</td><td/><td>0</td><td/><td>MediaLocation</td><td/><td>http://</td><td/><td/><td/><td/><td>124941</td><td/><td/><td/><td>3</td></row>