통합본 작성

ArinWarev1/FORM-OD/Frm_3_Mach.vb

@@ -542,6 +542,16 @@ Public Class Frm_3_Mach
         'ShowSubTotal_Light()
         ' ShowSubTotal_Danmal()
 
+        If Program = EProgram.친환경평가 Then
+            fxNanBang.Cols("펌프제어유형").Visible = False
+            fxNaengBang.Cols("냉수펌프제어").Visible = False
+            fxNaengBang.Cols("냉각수펌프제어").Visible = False
+        Else
+            fxNanBang.Cols("펌프제어유형").Visible = True
+            fxNaengBang.Cols("냉수펌프제어").Visible = True
+            fxNaengBang.Cols("냉각수펌프제어").Visible = True
+        End If
+
         Me.Show()
         Application.DoEvents()
 
@@ -779,6 +789,17 @@ Public Class Frm_3_Mach
         End With
         fxNanBang.Cols("열생산기기방식").Editor = cmd난방방식
 
+        '//230715
+        Dim cmd펌프제어유형 As New ComboBox()
+        With cmd펌프제어유형.Items
+            .Add("(없음)")
+            .Add("비제어")
+            .Add("정압")
+            .Add("변압")
+        End With
+        fxNanBang.Cols("펌프제어유형").Editor = cmd펌프제어유형
+
+
         '//난방기기(신재생)
         Make_난방기기신재생_List(fxNanBang.Cols("연결된시스템").Index)
         'Dim filter As String = "code like '1%' or (code like '2%' and 지열냉난방구분 = '난방급탕용')"
@@ -810,6 +831,19 @@ Public Class Frm_3_Mach
         cmd냉방방식.DropDownStyle = ComboBoxStyle.DropDownList
         fxNaengBang.Cols("냉동기방식").Editor = cmd냉방방식
 
+        Dim cmd냉수펌프제어 As New ComboBox()
+        With cmd냉수펌프제어.Items
+            .Add("(없음)")
+            .Add("제어")
+            .Add("대수제어")
+            .Add("비제어")
+        End With
+        cmd냉수펌프제어.DropDownStyle = ComboBoxStyle.DropDownList
+        fxNaengBang.Cols("냉수펌프제어").Editor = cmd냉수펌프제어
+        fxNaengBang.Cols("냉각수펌프제어").Editor = cmd냉수펌프제어
+
+
+
         Dim cmd냉동기종류 As New ComboBox()
         With cmd냉동기종류.Items
             .Add("(없음)")