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_Report/Frm_Macro.vb
+++ b/ArinWarev1/Forms_Report/Frm_Macro.vb
@@ -598,7 +598,7 @@

        '//에너지생산량
        Sum = (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).풍력전력생산량_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).연료전지전력생산량_offsite) / (Result1.일차E소요량(0).난방전력 + Result1.일차E소요량(0).냉방전력 + Result1.일차E소요량(0).급탕전력 + Result1.일차E소요량(0).조명전력 + Result1.일차E소요량(0).환기전력)
        난방 = Sum * Result1.일차E소요량(0).난방전력  '//아마게산이안도잇으니 여기값들이 0이잇을거에요.
        냉방 = Sum * Result1.일차E소요량(0).냉방전력
        조명 = Sum * Result1.일차E소요량(0).조명전력
@@ -748,7 +748,7 @@
        Dim 에너지자립률_offsite As Double = 0

        Sum = (Result1.생산E(0).태양광전력생산량 + Result1.생산E(0).풍력전력생산량 + Result1.생산E(0).신재생열병합전력생산량) / (Result1.일차E소요량(0).난방전력 + Result1.일차E소요량(0).냉방전력 + Result1.일차E소요량(0).급탕전력 + Result1.일차E소요량(0).조명전력 + Result1.일차E소요량(0).환기전력)
-        Sum_offsite = (Result1.생산E(0).태양광전력생산량_offsite + Result1.생산E(0).풍력전력생산량_offsite) / (Result1.일차E소요량(0).난방전력 + Result1.일차E소요량(0).냉방전력 + Result1.일차E소요량(0).급탕전력 + Result1.일차E소요량(0).조명전력 + Result1.일차E소요량(0).환기전력)
+        Sum_offsite = (Result1.생산E(0).태양광전력생산량_offsite + Result1.생산E(0).풍력전력생산량_offsite + Result1.생산E(0).연료전지전력생산량_offsite) / (Result1.일차E소요량(0).난방전력 + Result1.일차E소요량(0).냉방전력 + Result1.일차E소요량(0).급탕전력 + Result1.일차E소요량(0).조명전력 + Result1.일차E소요량(0).환기전력)
        난방 = Sum * Result1.일차E소요량(0).난방전력  '//아마게산이안도잇으니 여기값들이 0이잇을거에요.
        냉방 = Sum * Result1.일차E소요량(0).냉방전력
        조명 = Sum * Result1.일차E소요량(0).조명전력
--- a/ArinWarev1/Forms_Report/Frm_Upload.vb
+++ b/ArinWarev1/Forms_Report/Frm_Upload.vb
--- a/ArinWarev1/Forms_Report/Report_그래프.vb
+++ b/ArinWarev1/Forms_Report/Report_그래프.vb
@@ -44,6 +44,10 @@
        Dim param As New Microsoft.Reporting.WinForms.ReportParameter("ISJUGO", 주거형태)
        params.Add(param)

+        Dim bcustomstr As String = "0"
+        If Prj.UserAuthType_Real.StartsWith("BOTH_C") Then bcustomstr = "1"
+        Dim param0 As New Microsoft.Reporting.WinForms.ReportParameter("bcustomprofile", bcustomstr)
+        params.Add(param0)

        Dim param1 As New Microsoft.Reporting.WinForms.ReportParameter("자립률", 에너지자립률.ToString("N2"))
        params.Add(param1)
@@ -124,7 +128,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).조명전력 + 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 Sum_offsite As Decimal = (Result1.생산E(0).태양광전력생산량_offsite + 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).냉방전력
@@ -185,8 +189,8 @@



-                    Dim 전기 As Decimal = 난방면적 + 냉방면적 + 조명면적 + 급탕면적 + 환기면적
-                    Dim 전기_offsite As Decimal = 난방면적_offsite + 냉방면적_offsite + 조명면적_offsite + 급탕면적_offsite + 환기면적_offsite
+                    Dim 전기 As Decimal = 난방면적 + 냉방면적 + 조명면적 + 급탕면적 + 환기면적 '+ Result1.생산E(0).태양광전력생산량_offsite + Result1.생산E(0).연료전지전력생산량_offsite
+                    Dim 전기_offsite As Decimal = 난방면적_offsite + 냉방면적_offsite + 조명면적_offsite + 급탕면적_offsite + 환기면적_offsite ' + Result1.생산E(0).태양광전력생산량_offsite + Result1.생산E(0).연료전지전력생산량_offsite


                    '//열병합신재생에너지추가 130831 arin
@@ -205,7 +209,7 @@
                    Dr2 = Me.DSR.Graph_ReqUse.NewGraph_ReqUseRow
                    Dr2.Gubun = "1차소요량"
                    Dr2.type = "신재생에너지"
-                    Dr2.Req = 신재생에너지
+                    Dr2.Req = 신재생에너지 + 신재생에너지_offsite
                    Me.DSR.Graph_ReqUse.Rows.Add(Dr2)

                    난방에너지 = Math.Round(Result1.일차E소요량(0).난방면적, 1)
@@ -257,16 +261,21 @@
                        에너지자립률 = (Math.Round(단위면적당신재생1차에너지합, 1) / 단위면적당1차에너소비량합) * 100

                        Dim scale As Decimal = 0
-                        If 에너지자립률 >= 20 Then
+                        If Pub.Importsameaddress Then
                            scale = 1.0
-                        ElseIf 에너지자립률 >= 15 Then
-                            scale = 0.9
-                        ElseIf 에너지자립률 >= 10 Then
-                            scale = 0.8
                        Else
-                            scale = 0.7
+                            If 에너지자립률 >= 20 Then
+                                scale = 1.0
+                            ElseIf 에너지자립률 >= 15 Then
+                                scale = 0.9
+                            ElseIf 에너지자립률 >= 10 Then
+                                scale = 0.8
+                            Else
+                                scale = 0.7
+                            End If
                        End If

+
                        에너지자립률offsite = (Math.Round(단위면적당신재생1차에너지합offsite * scale, 1) / 단위면적당1차에너소비량합) * 100
                        에너지자립률 += 에너지자립률offsite

@@ -279,7 +288,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).조명전력 + Result1.일차E소요량(0).환기전력)
+                    Dim Sum As Decimal = (Result1.생산E(0).태양광전력생산량 + Result1.생산E(0).풍력전력생산량 + Result1.생산E(0).신재생열병합전력생산량 + Result1.생산E(0).연료전지전력생산량_offsite + +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).냉방전력
@@ -327,7 +336,7 @@


                    '//열병합신재생에너지추가 130831 arin
-                    신재생에너지 = Math.Round(-1 * (Result1.생산E(0).면적당생산량태양열 + 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 = "신재생에너지"
--- a/ArinWarev1/Forms_Report/그래프.rdlc
+++ b/ArinWarev1/Forms_Report/그래프.rdlc
@@ -1601,6 +1601,44 @@ 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 />
@@ -1642,6 +1680,12 @@ iif(Fields!type.Value="조명에너지","#765e00","#475e76")))))</Color>
      <AllowBlank>true</AllowBlank>
      <Prompt>ReportParameter1</Prompt>
    </ReportParameter>
+    <ReportParameter Name="bcustomprofile">
+      <DataType>String</DataType>
+      <Nullable>true</Nullable>
+      <AllowBlank>true</AllowBlank>
+      <Prompt>ReportParameter1</Prompt>
+    </ReportParameter>
  </ReportParameters>
  <Width>19.3417cm</Width>
  <Page>
@@ -1655,6 +1699,11 @@ iif(Fields!type.Value="조명에너지","#765e00","#475e76")))))</Color>
    <Style />
  </Page>
  <Language>ko-KR</Language>
+  <Variables>
+    <Variable Name="bcustomprofile">
+      <Value>0</Value>
+    </Variable>
+  </Variables>
  <ConsumeContainerWhitespace>true</ConsumeContainerWhitespace>
  <rd:ReportID>5ec02dd0-720b-446d-9ac5-21bd03e4b31f</rd:ReportID>
  <rd:ReportUnitType>Cm</rd:ReportUnitType>