2024y .

2024-12-30 23:04:30 +09:00
parent c01051f024
commit 8f89991a09
45 changed files with 7567 additions and 1033 deletions
--- a/ArinWarev1/Forms_Input/Frm_New.Designer.vb
+++ b/ArinWarev1/Forms_Input/Frm_New.Designer.vb
@@ -75,6 +75,7 @@ Partial Class Frm_New
        Dim Label2 As System.Windows.Forms.Label
        Dim Label46 As System.Windows.Forms.Label
        Dim Label47 As System.Windows.Forms.Label
+        Dim Label48 As System.Windows.Forms.Label
        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
        Me.NTb1 = New Eco2Ar.MyTb()
@@ -82,6 +83,8 @@ Partial Class Frm_New
        Me.Panel6 = New System.Windows.Forms.Panel()
        Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
        Me.dv = New CEnergy.arindv()
+        Me.sortkey = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.bs = New System.Windows.Forms.BindingSource(Me.components)
        Me.DS = New Eco2Ar.DS()
        Me.bn = New System.Windows.Forms.BindingNavigator(Me.components)
@@ -128,6 +131,7 @@ Partial Class Frm_New
        Me.tb_모듈효율 = New Eco2Ar.MyTb()
        Me.tb_모듈면적 = New Eco2Ar.MyTb()
        Me.열병합Panel = New System.Windows.Forms.Panel()
+        Me.MyTb9 = New Eco2Ar.MyTb()
        Me.chk_개별기기적용 = New System.Windows.Forms.CheckBox()
        Me.tb_열생산능력 = New Eco2Ar.MyTb()
        Me.tb_열생산효율 = New Eco2Ar.MyTb()
@@ -158,8 +162,6 @@ Partial Class Frm_New
        Me.Label164 = New System.Windows.Forms.Label()
        Me.cmb_가동연료 = New Eco2Ar.MyCmb()
        Me.NTb3 = New Eco2Ar.MyTb()
-        Me.sortkey = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Label33 = New System.Windows.Forms.Label()
        Label25 = New System.Windows.Forms.Label()
        Label26 = New System.Windows.Forms.Label()
@@ -213,6 +215,7 @@ Partial Class Frm_New
        Label2 = New System.Windows.Forms.Label()
        Label46 = New System.Windows.Forms.Label()
        Label47 = New System.Windows.Forms.Label()
+        Label48 = New System.Windows.Forms.Label()
        Me.TableLayoutPanel1.SuspendLayout()
        Me.Panel6.SuspendLayout()
        CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -512,17 +515,17 @@ Partial Class Frm_New
        '
        Label459.AutoSize = True
        Label459.ForeColor = System.Drawing.SystemColors.ControlDarkDark
-        Label459.Location = New System.Drawing.Point(10, 50)
+        Label459.Location = New System.Drawing.Point(4, 50)
        Label459.Name = "Label459"
-        Label459.Size = New System.Drawing.Size(106, 12)
+        Label459.Size = New System.Drawing.Size(101, 12)
        Label459.TabIndex = 74
-        Label459.Text = "열생산 효율[%]:"
+        Label459.Text = "열생산효율[%]:"
        '
        'Label457
        '
        Label457.AutoSize = True
        Label457.ForeColor = System.Drawing.SystemColors.ControlDarkDark
-        Label457.Location = New System.Drawing.Point(10, 73)
+        Label457.Location = New System.Drawing.Point(4, 73)
        Label457.Name = "Label457"
        Label457.Size = New System.Drawing.Size(93, 12)
        Label457.TabIndex = 75
@@ -548,11 +551,11 @@ Partial Class Frm_New
        '
        Label458.AutoSize = True
        Label458.ForeColor = System.Drawing.SystemColors.ControlDarkDark
-        Label458.Location = New System.Drawing.Point(10, 28)
+        Label458.Location = New System.Drawing.Point(4, 28)
        Label458.Name = "Label458"
-        Label458.Size = New System.Drawing.Size(112, 12)
+        Label458.Size = New System.Drawing.Size(107, 12)
        Label458.TabIndex = 73
-        Label458.Text = "열생산 능력[kW]:"
+        Label458.Text = "열생산능력[kW]:"
        '
        'Label35
        '
@@ -764,6 +767,16 @@ Partial Class Frm_New
        Label47.TabIndex = 158
        Label47.Text = "35도:"
        '
+        'Label48
+        '
+        Label48.AutoSize = True
+        Label48.ForeColor = System.Drawing.SystemColors.ControlDarkDark
+        Label48.Location = New System.Drawing.Point(168, 50)
+        Label48.Name = "Label48"
+        Label48.Size = New System.Drawing.Size(109, 12)
+        Label48.TabIndex = 174
+        Label48.Text = "외부공급비율[%]"
+        '
        'TableLayoutPanel1
        '
        Me.TableLayoutPanel1.AutoScroll = True
@@ -873,6 +886,24 @@ Partial Class Frm_New
        Me.dv.Size = New System.Drawing.Size(210, 535)
        Me.dv.TabIndex = 0
        '
+        'sortkey
+        '
+        Me.sortkey.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None
+        Me.sortkey.DataPropertyName = "sortkey"
+        DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter
+        Me.sortkey.DefaultCellStyle = DataGridViewCellStyle1
+        Me.sortkey.HeaderText = "▼"
+        Me.sortkey.Name = "sortkey"
+        Me.sortkey.Width = 30
+        '
+        'DataGridViewTextBoxColumn1
+        '
+        Me.DataGridViewTextBoxColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
+        Me.DataGridViewTextBoxColumn1.DataPropertyName = "설명"
+        Me.DataGridViewTextBoxColumn1.HeaderText = "설명"
+        Me.DataGridViewTextBoxColumn1.Name = "DataGridViewTextBoxColumn1"
+        Me.DataGridViewTextBoxColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Programmatic
+        '
        'bs
        '
        Me.bs.DataMember = "tbl_new"
@@ -1393,6 +1424,8 @@ Partial Class Frm_New
        '
        Me.열병합Panel.BackColor = System.Drawing.Color.FromArgb(CType(CType(243, Byte), Integer), CType(CType(244, Byte), Integer), CType(CType(246, Byte), Integer))
        Me.열병합Panel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.열병합Panel.Controls.Add(Label48)
+        Me.열병합Panel.Controls.Add(Me.MyTb9)
        Me.열병합Panel.Controls.Add(Me.chk_개별기기적용)
        Me.열병합Panel.Controls.Add(Label5)
        Me.열병합Panel.Controls.Add(Label459)
@@ -1408,12 +1441,23 @@ Partial Class Frm_New
        Me.열병합Panel.Size = New System.Drawing.Size(279, 96)
        Me.열병합Panel.TabIndex = 145
        '
+        'MyTb9
+        '
+        Me.MyTb9.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.bs, "외부공급비율", True))
+        Me.MyTb9.Location = New System.Drawing.Point(194, 70)
+        Me.MyTb9.Name = "MyTb9"
+        Me.MyTb9.NectControl = Nothing
+        Me.MyTb9.Size = New System.Drawing.Size(55, 21)
+        Me.MyTb9.TabIndex = 173
+        Me.MyTb9.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
+        Me.MyTb9.TextFormat = Eco2Ar.MyTb.ETFormat.Normal
+        '
        'chk_개별기기적용
        '
        Me.chk_개별기기적용.AutoSize = True
        Me.chk_개별기기적용.DataBindings.Add(New System.Windows.Forms.Binding("Checked", Me.bs, "열병합신재생여부", True))
        Me.chk_개별기기적용.ForeColor = System.Drawing.SystemColors.ControlDarkDark
-        Me.chk_개별기기적용.Location = New System.Drawing.Point(150, 4)
+        Me.chk_개별기기적용.Location = New System.Drawing.Point(162, 5)
        Me.chk_개별기기적용.Name = "chk_개별기기적용"
        Me.chk_개별기기적용.Size = New System.Drawing.Size(120, 16)
        Me.chk_개별기기적용.TabIndex = 172
@@ -1424,10 +1468,10 @@ Partial Class Frm_New
        'tb_열생산능력
        '
        Me.tb_열생산능력.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.bs, "열생산능력", True))
-        Me.tb_열생산능력.Location = New System.Drawing.Point(165, 25)
+        Me.tb_열생산능력.Location = New System.Drawing.Point(108, 25)
        Me.tb_열생산능력.Name = "tb_열생산능력"
        Me.tb_열생산능력.NectControl = Nothing
-        Me.tb_열생산능력.Size = New System.Drawing.Size(94, 21)
+        Me.tb_열생산능력.Size = New System.Drawing.Size(60, 21)
        Me.tb_열생산능력.TabIndex = 13
        Me.tb_열생산능력.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
        Me.tb_열생산능력.TextFormat = Eco2Ar.MyTb.ETFormat.Normal
@@ -1435,10 +1479,10 @@ Partial Class Frm_New
        'tb_열생산효율
        '
        Me.tb_열생산효율.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.bs, "열생산효율", True))
-        Me.tb_열생산효율.Location = New System.Drawing.Point(165, 47)
+        Me.tb_열생산효율.Location = New System.Drawing.Point(108, 47)
        Me.tb_열생산효율.Name = "tb_열생산효율"
        Me.tb_열생산효율.NectControl = Nothing
-        Me.tb_열생산효율.Size = New System.Drawing.Size(94, 21)
+        Me.tb_열생산효율.Size = New System.Drawing.Size(60, 21)
        Me.tb_열생산효율.TabIndex = 14
        Me.tb_열생산효율.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
        Me.tb_열생산효율.TextFormat = Eco2Ar.MyTb.ETFormat.Normal
@@ -1446,10 +1490,10 @@ Partial Class Frm_New
        'tb_발전효율
        '
        Me.tb_발전효율.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.bs, "발전효율", True))
-        Me.tb_발전효율.Location = New System.Drawing.Point(165, 70)
+        Me.tb_발전효율.Location = New System.Drawing.Point(108, 70)
        Me.tb_발전효율.Name = "tb_발전효율"
        Me.tb_발전효율.NectControl = Nothing
-        Me.tb_발전효율.Size = New System.Drawing.Size(94, 21)
+        Me.tb_발전효율.Size = New System.Drawing.Size(60, 21)
        Me.tb_발전효율.TabIndex = 15
        Me.tb_발전효율.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
        Me.tb_발전효율.TextFormat = Eco2Ar.MyTb.ETFormat.Normal
@@ -1702,7 +1746,7 @@ Partial Class Frm_New
        Me.기기종류ComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.bs, "기기종류", True))
        Me.기기종류ComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
        Me.기기종류ComboBox.FormattingEnabled = True
-        Me.기기종류ComboBox.Items.AddRange(New Object() {"(없음)", "태양열", "태양광", "지열", "열병합", "풍력", "수열"})
+        Me.기기종류ComboBox.Items.AddRange(New Object() {"(없음)", "태양열", "태양광", "지열", "열병합", "풍력", "수열", "외부신재생"})
        Me.기기종류ComboBox.Location = New System.Drawing.Point(146, 10)
        Me.기기종류ComboBox.Name = "기기종류ComboBox"
        Me.기기종류ComboBox.NectControl = Nothing
@@ -1763,24 +1807,6 @@ Partial Class Frm_New
        Me.NTb3.TabIndex = 59
        Me.NTb3.TextFormat = Eco2Ar.MyTb.ETFormat.Normal
        '
-        'sortkey
-        '
-        Me.sortkey.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None
-        Me.sortkey.DataPropertyName = "sortkey"
-        DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter
-        Me.sortkey.DefaultCellStyle = DataGridViewCellStyle1
-        Me.sortkey.HeaderText = "▼"
-        Me.sortkey.Name = "sortkey"
-        Me.sortkey.Width = 30
-        '
-        'DataGridViewTextBoxColumn1
-        '
-        Me.DataGridViewTextBoxColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
-        Me.DataGridViewTextBoxColumn1.DataPropertyName = "설명"
-        Me.DataGridViewTextBoxColumn1.HeaderText = "설명"
-        Me.DataGridViewTextBoxColumn1.Name = "DataGridViewTextBoxColumn1"
-        Me.DataGridViewTextBoxColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Programmatic
-        '
        'Frm_New
        '
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None
@@ -1912,4 +1938,5 @@ Partial Class Frm_New
    Friend WithEvents CheckBox2 As System.Windows.Forms.CheckBox
    Friend WithEvents sortkey As System.Windows.Forms.DataGridViewTextBoxColumn
    Friend WithEvents DataGridViewTextBoxColumn1 As System.Windows.Forms.DataGridViewTextBoxColumn
+    Friend WithEvents MyTb9 As Eco2Ar.MyTb
 End Class