통합본 작성

ArinWarev1/FORM-OD/Frm_3_Mach.Designer.vb

@@ -32,44 +32,44 @@ Partial Class Frm_3_Mach
         Me.C1DockingTab1 = New C1.Win.C1Command.C1DockingTab()
         Me.C1DockingTabPage1 = New C1.Win.C1Command.C1DockingTabPage()
         Me.fxNanBang = New C1.Win.C1FlexGrid.C1FlexGrid()
-        Me.bs_난방기기 = New System.Windows.Forms.BindingSource(Me.components)
-        Me.DataSet1 = New Eco2OD.DS()
         Me.C1DockingTabPage2 = New C1.Win.C1Command.C1DockingTabPage()
         Me.fxNaengBang = New C1.Win.C1FlexGrid.C1FlexGrid()
-        Me.bs_냉방기기 = New System.Windows.Forms.BindingSource(Me.components)
         Me.C1DockingTabPage3 = New C1.Win.C1Command.C1DockingTabPage()
         Me.fxKogjo = New C1.Win.C1FlexGrid.C1FlexGrid()
-        Me.bs_공조기기 = New System.Windows.Forms.BindingSource(Me.components)
         Me.C1DockingTabPage4 = New C1.Win.C1Command.C1DockingTabPage()
         Me.fxLight = New C1.Win.C1FlexGrid.C1FlexGrid()
-        Me.bs_조명기기 = New System.Windows.Forms.BindingSource(Me.components)
         Me.C1DockingTabPage5 = New C1.Win.C1Command.C1DockingTabPage()
         Me.fxDanMal = New C1.Win.C1FlexGrid.C1FlexGrid()
-        Me.bS_실내단말기 = New System.Windows.Forms.BindingSource(Me.components)
         Me.C1StatusBar1 = New C1.Win.C1Ribbon.C1StatusBar()
         Me.btAdd = New C1.Win.C1Ribbon.RibbonButton()
         Me.btDel = New C1.Win.C1Ribbon.RibbonButton()
         Me.RibbonButton1 = New C1.Win.C1Ribbon.RibbonButton()
+        Me.bs_난방기기 = New System.Windows.Forms.BindingSource(Me.components)
+        Me.DataSet1 = New Eco2OD.DS()
+        Me.bs_냉방기기 = New System.Windows.Forms.BindingSource(Me.components)
+        Me.bs_공조기기 = New System.Windows.Forms.BindingSource(Me.components)
+        Me.bs_조명기기 = New System.Windows.Forms.BindingSource(Me.components)
+        Me.bS_실내단말기 = New System.Windows.Forms.BindingSource(Me.components)
         Me.cmGrid.SuspendLayout()
         CType(Me.C1DockingTab1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.C1DockingTab1.SuspendLayout()
         Me.C1DockingTabPage1.SuspendLayout()
         CType(Me.fxNanBang, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.bs_난방기기, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.DataSet1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.C1DockingTabPage2.SuspendLayout()
         CType(Me.fxNaengBang, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.bs_냉방기기, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.C1DockingTabPage3.SuspendLayout()
         CType(Me.fxKogjo, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.bs_공조기기, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.C1DockingTabPage4.SuspendLayout()
         CType(Me.fxLight, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.bs_조명기기, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.C1DockingTabPage5.SuspendLayout()
         CType(Me.fxDanMal, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.bS_실내단말기, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.C1StatusBar1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.bs_난방기기, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.DataSet1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.bs_냉방기기, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.bs_공조기기, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.bs_조명기기, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.bS_실내단말기, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         'cmGrid
@@ -148,17 +148,6 @@ Partial Class Frm_3_Mach
         Me.fxNanBang.Tag = "nanbang"
         Me.fxNanBang.VisualStyle = C1.Win.C1FlexGrid.VisualStyle.Office2007Silver
         '
-        'bs_난방기기
-        '
-        Me.bs_난방기기.DataMember = "tbl_nanbangkiki"
-        Me.bs_난방기기.DataSource = Me.DataSet1
-        Me.bs_난방기기.Filter = "code <> '0'"
-        '
-        'DataSet1
-        '
-        Me.DataSet1.DataSetName = "DS"
-        Me.DataSet1.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema
-        '
         'C1DockingTabPage2
         '
         Me.C1DockingTabPage2.Controls.Add(Me.fxNaengBang)
@@ -189,12 +178,6 @@ Partial Class Frm_3_Mach
         Me.fxNaengBang.Tag = "naengbang"
         Me.fxNaengBang.VisualStyle = C1.Win.C1FlexGrid.VisualStyle.Office2007Silver
         '
-        'bs_냉방기기
-        '
-        Me.bs_냉방기기.DataMember = "tbl_nangbangkiki"
-        Me.bs_냉방기기.DataSource = Me.DataSet1
-        Me.bs_냉방기기.Filter = "code <> '0'"
-        '
         'C1DockingTabPage3
         '
         Me.C1DockingTabPage3.Controls.Add(Me.fxKogjo)
@@ -225,12 +208,6 @@ Partial Class Frm_3_Mach
         Me.fxKogjo.Tag = "kongjo"
         Me.fxKogjo.VisualStyle = C1.Win.C1FlexGrid.VisualStyle.Office2007Silver
         '
-        'bs_공조기기
-        '
-        Me.bs_공조기기.DataMember = "tbl_kongjo"
-        Me.bs_공조기기.DataSource = Me.DataSet1
-        Me.bs_공조기기.Filter = "code <> '0'"
-        '
         'C1DockingTabPage4
         '
         Me.C1DockingTabPage4.Controls.Add(Me.fxLight)
@@ -261,13 +238,6 @@ Partial Class Frm_3_Mach
         Me.fxLight.Tag = "light"
         Me.fxLight.VisualStyle = C1.Win.C1FlexGrid.VisualStyle.Office2007Silver
         '
-        'bs_조명기기
-        '
-        Me.bs_조명기기.AllowNew = True
-        Me.bs_조명기기.DataMember = "tbl_light"
-        Me.bs_조명기기.DataSource = Me.DataSet1
-        Me.bs_조명기기.Filter = "code <> '0'"
-        '
         'C1DockingTabPage5
         '
         Me.C1DockingTabPage5.Controls.Add(Me.fxDanMal)
@@ -298,13 +268,6 @@ Partial Class Frm_3_Mach
         Me.fxDanMal.Tag = "danmal"
         Me.fxDanMal.VisualStyle = C1.Win.C1FlexGrid.VisualStyle.Office2007Silver
         '
-        'bS_실내단말기
-        '
-        Me.bS_실내단말기.AllowNew = True
-        Me.bS_실내단말기.DataMember = "tbl_danmal"
-        Me.bS_실내단말기.DataSource = Me.DataSet1
-        Me.bS_실내단말기.Filter = "code <> '0'"
-        '
         'C1StatusBar1
         '
         Me.C1StatusBar1.AutoSizeElement = C1.Framework.AutoSizeElement.Width
@@ -334,6 +297,43 @@ Partial Class Frm_3_Mach
         Me.RibbonButton1.SmallImage = CType(resources.GetObject("RibbonButton1.SmallImage"), System.Drawing.Image)
         Me.RibbonButton1.Text = "적용(&S)"
         '
+        'bs_난방기기
+        '
+        Me.bs_난방기기.DataMember = "tbl_nanbangkiki"
+        Me.bs_난방기기.DataSource = Me.DataSet1
+        Me.bs_난방기기.Filter = "code <> '0'"
+        '
+        'DataSet1
+        '
+        Me.DataSet1.DataSetName = "DS"
+        Me.DataSet1.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema
+        '
+        'bs_냉방기기
+        '
+        Me.bs_냉방기기.DataMember = "tbl_nangbangkiki"
+        Me.bs_냉방기기.DataSource = Me.DataSet1
+        Me.bs_냉방기기.Filter = "code <> '0'"
+        '
+        'bs_공조기기
+        '
+        Me.bs_공조기기.DataMember = "tbl_kongjo"
+        Me.bs_공조기기.DataSource = Me.DataSet1
+        Me.bs_공조기기.Filter = "code <> '0'"
+        '
+        'bs_조명기기
+        '
+        Me.bs_조명기기.AllowNew = True
+        Me.bs_조명기기.DataMember = "tbl_light"
+        Me.bs_조명기기.DataSource = Me.DataSet1
+        Me.bs_조명기기.Filter = "code <> '0'"
+        '
+        'bS_실내단말기
+        '
+        Me.bS_실내단말기.AllowNew = True
+        Me.bS_실내단말기.DataMember = "tbl_danmal"
+        Me.bS_실내단말기.DataSource = Me.DataSet1
+        Me.bS_실내단말기.Filter = "code <> '0'"
+        '
         'Frm_3_Mach
         '
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None
@@ -353,21 +353,21 @@ Partial Class Frm_3_Mach
         Me.C1DockingTab1.ResumeLayout(False)
         Me.C1DockingTabPage1.ResumeLayout(False)
         CType(Me.fxNanBang, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.bs_난방기기, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.DataSet1, System.ComponentModel.ISupportInitialize).EndInit()
         Me.C1DockingTabPage2.ResumeLayout(False)
         CType(Me.fxNaengBang, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.bs_냉방기기, System.ComponentModel.ISupportInitialize).EndInit()
         Me.C1DockingTabPage3.ResumeLayout(False)
         CType(Me.fxKogjo, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.bs_공조기기, System.ComponentModel.ISupportInitialize).EndInit()
         Me.C1DockingTabPage4.ResumeLayout(False)
         CType(Me.fxLight, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.bs_조명기기, System.ComponentModel.ISupportInitialize).EndInit()
         Me.C1DockingTabPage5.ResumeLayout(False)
         CType(Me.fxDanMal, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.bS_실내단말기, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.C1StatusBar1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.bs_난방기기, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.DataSet1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.bs_냉방기기, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.bs_공조기기, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.bs_조명기기, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.bS_실내단말기, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 

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("(없음)")