KICT/ECO2
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

형별성능내역 삭제 오류 해결

Browse Source 
대지외 신재생 계산 오류 해결
순생산량, 총소요량 문구 수정
This commit is contained in:
ykh
2025-08-01 00:02:46 +09:00
parent c6bc4676d3
commit 52a7c0f1f7
7 changed files with 76 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ArinWarev1/Calculator/CRenewable.vb
View File

@@ -498,11 +498,8 @@
P_pk = K_pk * a
If Dr신재생.대지외설치여부 Then
E_el_pv_out_offsite = E_el_pv_out_offsite + E_sol * P_pk * f_perf
E_el_pv_out_offsite += E_sol * P_pk * f_perf
Else
E_el_pv_out += E_sol * P_pk * f_perf
End If

7
ArinWarev1/Forms_Input/Frm_YK.vb
View File

@@ -27,14 +27,16 @@
'// 입력면데이터중에 열관류율을 사용한 데이터 업데이트(131009)
For Each dr As DS.tbl_myounRow In DSET1.tbl_myoun.Select("열관류율2 <> '0'")
If dr.RowState = DataRowState.Deleted Then Continue For
Dim ykcode As String = dr.열관류율2
Dim ykrow() As DS.tbl_ykRow = DSET1.tbl_yk.Select("code='" + ykcode + "'")
If ykrow.Length = 1 Then
dr.투과율 = ykrow(0).투과율
End If
dr.AcceptChanges()
dr.EndEdit()
Next
BaseDT.AcceptChanges()
BaseDS.AcceptChanges()
Update_열관류율_140409()
Return True
@@ -903,6 +905,7 @@
Next
End If
Me.bs.RemoveCurrent()
Me.bs.EndEdit()
End Sub

3
ArinWarev1/Forms_Report/Report_그래프.vb
View File

@@ -256,6 +256,9 @@
단위면적당1차에너소비량합 = 난방에너지 + 냉방에너지 + 급탕에너지 + 조명에너지 + 환기에너지 + Math.Round(단위면적당신재생1차에너지합, 1)
단위면적당1차에너소비량합 += -신재생에너지_offsite
If 단위면적당1차에너소비량합 <> 0 Then
에너지자립률 = (Math.Round(단위면적당신재생1차에너지합, 1) / 단위면적당1차에너소비량합) * 100

106
ArinWarev1/Forms_Report/그래프.rdlc
View File

@@ -1211,7 +1211,7 @@ iif(Fields!type.Value="조명에너지","#765e00","#475e76")))))</Color>
<Paragraph>
<TextRuns>
<TextRun>
<Value>단위면적당 1차에너지생산량(대지내):</Value>
<Value>단위면적당 1차에너지순생산량(대지내):</Value>
<Style>
<FontFamily>맑은 고딕</FontFamily>
<FontSize>8pt</FontSize>
@@ -1225,9 +1225,9 @@ iif(Fields!type.Value="조명에너지","#765e00","#475e76")))))</Color>
</Paragraphs>
<rd:DefaultName>Textbox2</rd:DefaultName>
<Top>0.09525cm</Top>
<Left>5.03112cm</Left>
<Left>4.92169cm</Left>
<Height>0.56825cm</Height>
<Width>5.042cm</Width>
<Width>5.50068cm</Width>
<ZIndex>1</ZIndex>
<Style>
<Border>
@@ -1245,7 +1245,7 @@ iif(Fields!type.Value="조명에너지","#765e00","#475e76")))))</Color>
<Paragraph>
<TextRuns>
<TextRun>
<Value>단위면적당 1차에너지소비량 : </Value>
<Value>단위면적당 1차에너지총소요량 : </Value>
<Style>
<FontFamily>맑은 고딕</FontFamily>
<FontSize>8pt</FontSize>
@@ -1259,9 +1259,9 @@ iif(Fields!type.Value="조명에너지","#765e00","#475e76")))))</Color>
</Paragraphs>
<rd:DefaultName>Textbox2</rd:DefaultName>
<Top>0.09525cm</Top>
<Left>11.5652cm</Left>
<Left>11.45937cm</Left>
<Height>0.56825cm</Height>
<Width>4.14242cm</Width>
<Width>4.88325cm</Width>
<ZIndex>2</ZIndex>
<Style>
<Border>
@@ -1329,7 +1329,7 @@ iif(Fields!type.Value="조명에너지","#765e00","#475e76")))))</Color>
</Paragraphs>
<rd:DefaultName>Textbox2</rd:DefaultName>
<Top>0.0635cm</Top>
<Left>9.99727cm</Left>
<Left>10.31477cm</Left>
<Height>0.56825cm</Height>
<Width>0.96366cm</Width>
<ZIndex>4</ZIndex>
@@ -1365,7 +1365,7 @@ iif(Fields!type.Value="조명에너지","#765e00","#475e76")))))</Color>
</Paragraphs>
<rd:DefaultName>Textbox2</rd:DefaultName>
<Top>0.0635cm</Top>
<Left>15.64413cm</Left>
<Left>16.27913cm</Left>
<Height>0.56825cm</Height>
<Width>1.15416cm</Width>
<ZIndex>5</ZIndex>
@@ -1436,7 +1436,7 @@ iif(Fields!type.Value="조명에너지","#765e00","#475e76")))))</Color>
<rd:DefaultName>Textbox2</rd:DefaultName>
<Top>0.58837cm</Top>
<Left>0.12253cm</Left>
<Height>0.56825cm</Height>
<Height>0.45cm</Height>
<Width>3.33808cm</Width>
<ZIndex>7</ZIndex>
<Style>
@@ -1455,7 +1455,7 @@ iif(Fields!type.Value="조명에너지","#765e00","#475e76")))))</Color>
<Paragraph>
<TextRuns>
<TextRun>
<Value>단위면적당 1차에너지생산량(대지외):</Value>
<Value>단위면적당 1차에너지순생산량(대지외):</Value>
<Style>
<FontFamily>맑은 고딕</FontFamily>
<FontSize>8pt</FontSize>
@@ -1469,9 +1469,9 @@ iif(Fields!type.Value="조명에너지","#765e00","#475e76")))))</Color>
</Paragraphs>
<rd:DefaultName>Textbox2</rd:DefaultName>
<Top>0.58837cm</Top>
<Left>5.03112cm</Left>
<Height>0.56825cm</Height>
<Width>5.042cm</Width>
<Left>4.92169cm</Left>
<Height>0.45cm</Height>
<Width>5.50068cm</Width>
<ZIndex>8</ZIndex>
<Style>
<Border>
@@ -1539,7 +1539,7 @@ iif(Fields!type.Value="조명에너지","#765e00","#475e76")))))</Color>
</Paragraphs>
<rd:DefaultName>Textbox2</rd:DefaultName>
<Top>0.46137cm</Top>
<Left>9.99727cm</Left>
<Left>10.3546cm</Left>
<Height>0.56825cm</Height>
<Width>0.96366cm</Width>
<ZIndex>10</ZIndex>
@@ -1589,11 +1589,49 @@ iif(Fields!type.Value="조명에너지","#765e00","#475e76")))))</Color>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<Textbox Name="Textbox14">
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>단위면적당 1차에너지생산량(대지외):</Value>
<Style>
<FontFamily>맑은 고딕</FontFamily>
<FontSize>8pt</FontSize>
<Color>Red</Color>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Right</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox2</rd:DefaultName>
<Top>0.55662cm</Top>
<Left>11.75629cm</Left>
<Height>0.44125cm</Height>
<Width>5.042cm</Width>
<ZIndex>12</ZIndex>
<Visibility>
<Hidden>=iif(Parameters!bcustomprofile.Value = "1",false,true)</Hidden>
</Visibility>
<Style>
<Border>
<Style>None</Style>
</Border>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</ReportItems>
<KeepTogether>true</KeepTogether>
<Top>19.37185cm</Top>
<Height>1.18837cm</Height>
<Width>17.87958cm</Width>
<Width>18.5cm</Width>
<ZIndex>4</ZIndex>
<Style>
<Border>
@@ -1601,44 +1639,6 @@ iif(Fields!type.Value="조명에너지","#765e00","#475e76")))))</Color>
</Border>
</Style>
</Rectangle>
<Textbox Name="Textbox14">
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>단위면적당 1차에너지생산량(대지외):</Value>
<Style>
<FontFamily>맑은 고딕</FontFamily>
<FontSize>8pt</FontSize>
<Color>Red</Color>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Right</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox2</rd:DefaultName>
<Top>19.92847cm</Top>
<Left>11.21595cm</Left>
<Height>0.44125cm</Height>
<Width>5.042cm</Width>
<ZIndex>5</ZIndex>
<Visibility>
<Hidden>=iif(Parameters!bcustomprofile.Value = "1",false,true)</Hidden>
</Visibility>
<Style>
<Border>
<Style>None</Style>
</Border>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</ReportItems>
<Height>20.56022cm</Height>
<Style />

14
ArinWarev1/MdiMain.resx
View File

@@ -335,10 +335,10 @@
T33fOefe0xewpLGnalzFV/Wvc/v25d77/fr/fef0bWy27diO7diO7diO7dgOm81mb574flrz4t8nNiz8
gJTe6v27pPPevyVlNs7/zZuUemnqL63n/LOIoOz+/NDCByupZ77CH6vYvKEXITl3buyoqXnfep1vbezK
ubU84H6NF6+Be1Ov0fTFy6+lsw9f4tLIa6TUO33B2f2R1ut8a+NQaffahYfLuDW4hqyLC0i78C5a5DGd
tluETvc+R3DmndWg5O5/tF7rWxnBmZ+vlnR5RQIqsRaZlJak3/v6a3msefwC7Pb89f35/Tet1/pWhgLA
tluETvc+R3DmndWg5O5/tF7rWxnBmZ+vlnR5RQIqsRaZlJak3/v6a3msefwC7Pa89f35/Tet1/pWhgLA
SXBSi0hrIVkAcLL++9NbSArColDLAgqcS3Cc+OrV3qzekj25PT8IyHP+1TepT4v6PrDm9dZxsGRgpbhT
JKUgUCLGpyyTFMmqbQlDsz+/p4C1LKDt0QvY7Vnr1kb5TSkoq69nZ3rnD635vTEUAJG8lqD8RFVtKwCc
tEpWukEc7//3ZdeWMLngg2cVuDm9/o2qywXY7XnrezJ7u6z5vTHCCMAtlZRua1EK/p+8AGK6QN+nlYM2
JKUgUCLGpyyTFMmqbQlDsz+/p4C1LKDt0QvY7Znr1kb5TSkoq69nZ3rnD635vTEUAJG8lqD8RFVtKwCc
tEpWukEc7//3ZdeWMLngg2cVuDm9/o2qywXY7bnrezJ7u6z5vTHCCMAtlZRua1EK/p+8AGK6QN+nlYM2
mn+vSks7vyy3jeeSzjNgb/x7U4vIbVtEy9Ar7MnuW7Tbnd+x5rhl7NhR8z71gKKbXqRe8FpOrG5Iv6gO
RAdkfc8Eop/LEM022rGbgd7wN2rfRev90L4FZF1eQvDRnqV96Z3fs+a5ZfzY7vwOASi86UVig1uzsVCG
vFm6qLhxKXkj/kltcsxWiRjHvOFcbyO6P3mOPTn9i+8E4NNP+z4IK+5eK7jhRVztNBIaXCJp7SYy9JtR
@@ -382,7 +382,7 @@
SvM8z0SZrcsIyBulqS/RmrNf7C+4y+v8X8Y48Ut7B4PIc87yk56DJ54iptrNsmtiEDVunhkMIHqJyDIR
paKVSb2AwKVilIhXm01kA9XWFzylUnnIfqGAmCtPc0olSPENHvH64hKCsvq9e7O6/sGas18oAB9GX8Uv
op38nSCnfQ7hZU8QeWoK0VUuxFS5Ddlp9IOhgAgQYqRSEUAYigFDgDBLRPUM/wa6afNUrtDdQY1TW1/E
N84yAIJht2evB2X1Nlrz3RACgAs/j7yCD6OuIKOVVn2TCC2lp0AuoUqXAMGjCYNlwCA3mDCOGBDIHZ4N
N84yAIJht2etB2X1Nlrz3RACgAs/j7yCD6OuIKOVVn2TCC2lp0AuoUqXAMGjCYNlwCA3mDCOGBDIHZ4N
zoiVztCnVZpJ9MapesUGZ/hNqcIRZHtHzQwfS2USktE7tyej81+s+W4IApDf4cLPDrfj98ldyLq8iPCy
MRz87BmiKlyIqnQhqmKGRwahxM5wIaaapIHgPkGjKBGH5g7DFZojRM/QplbVM6QjjJ5hmUXEMlw0T4IQ
V0fXn2EY9BQ6KKtvwJrrpqEA7Iho42f+cbUuHCihx2AznHgkQWDRa7ltBWE4Q5aLtTyUDGeo5mlxxabr
@@ -392,11 +392,11 @@
gIzb0dY8t4wDhXdx7otlTC34EF46guBjQwxhX9FjhB4fs+gJK6xUaRzhpeNiLCM9RfgJU9RHDpHKJ3Co
/BkiyieETk7iMOnUlNDpKUSSKqYQVUFLb3IVjdOIqZxBTNWMAHhmRpaVi0fqL5GnJxFWNgZHrZubaGBW
n5f+L8ma55YRWvyAHxjQD6EhBUMIPjaoiV5rovctor/xU+EwQgqGxSi1z6qix6z92ri/WGkEB0pGcIDH
UbEtFXp81F+lowgrHUNE+TN2RqQ9fT0ws6/KmuOWUdSHDw4e/5IfGCQ1zPInSDf8LgCssiZvlQ7AAEGJ
UbEtFXp81F+lowgrHUNE+TN2RqQ9bT0ws6/KmuOWUdSHDw4e/5IfGCQ1zPInSDf8LgCssiZvlQ7AAEGJ
WyAwCCUNAkuDQOsVKh0qkWD73Zd70jt/ZM1zy8h1vvgwJO8uPyyMrJn7s1ZElQu7MszfBt8qDpf11R6p
dvp2pXYjKPcB9hc+woGiwW9OxYMILRpEKI1K9EOMGkuGWGGsYYQd31zhx4dxsFTpMcKKBxFov/36Pz5K
TrDZbP9ks9ne7t/lfvjPP/rpv/3PJzttNtt//gn1X5vs20rvcuzbiJLfju3Yju3Yju3Yju3YjjfF/wNr
fljI3XdnbQAAAABJRU5ErkJggg==
TrDZbP9ks9ne7t/lfvjPP/rpv/3PJzttNtt//gn1X5vs20rvcuzbiJLfju3Yju3Yju3Yju3YjjfF/wOY
w1jCKMj0CgAAAABJRU5ErkJggg==
</value>
</data>
<data name="ToolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

7
ArinWarev1/Module/Pub.vb
View File

@@ -58,9 +58,12 @@
Public Importsameaddress As Boolean = False
Public Sub Update_열관류율_140409()
DSET1.tbl_yk.AcceptChanges()
For Each DrowYK As DS.tbl_ykRow In DSET1.tbl_yk
If DrowYK.RowState = DataRowState.Deleted OrElse DrowYK.RowState = DataRowState.Detached Then Continue For
Dim R_value As Decimal = 0
Dim width As Decimal = 0
Dim filter As String = "pcode='" + DrowYK.code + "'"
@@ -145,7 +148,7 @@
DrowYK.투과율 = ""
End If
End If
Catch ex As Exception
DrowYK.열관류율 = ""
DrowYK.투과율 = ""

4
ArinWarev1/My Project/AssemblyInfo.vb
View File

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