..

ArinWarev1/Calculator/CSummary.vb

@@ -230,6 +230,8 @@
 #End Region
 
     Public Sub Make_ResultSheet()
+        Dim idx As Integer
+
         '//에너지요구량
         DSETR.TReqUse.Clear()
         DSETR.TReqUse.AcceptChanges()
@@ -640,26 +642,40 @@
             Array.Add(Result.생산E(i).수열생산량)
         Next
         Set_ReqUseRow("310", "열에너지 생산량(수열)", "[kWh]", "", "=", Array)
-        Array.Clear()
 
+        '//열병합추가 230804
+        Array.Clear()
+        For i As Integer = 0 To 12
+            Array.Add(Result.생산E(i).신재생열병합열생산량)
+        Next
+        Set_ReqUseRow("310", "열에너지 생산량(열병합)", "[kWh]", "", "=", Array)
+
+
+        Array.Clear()
         For i As Integer = 0 To 12
             Array.Add(Result.생산E(i).면적당생산량태양열)
         Next
-
         Set_ReqUseRow("310", "단위면적당 생산량(태양열)", "[kWh]", "", "=", Array, "N1")    '//71
+
         Array.Clear()
         For i As Integer = 0 To 12
             Array.Add(Result.생산E(i).면적당생산량지열)
         Next
-
         Set_ReqUseRow("310", "단위면적당 생산량(지열)", "[kWh]", "", "=", Array, "N1")  '//72
 
+        Array.Clear()
         For i As Integer = 0 To 12
             Array.Add(Result.생산E(i).면적당생산량수열)
         Next
-
         Set_ReqUseRow("310", "단위면적당 생산량(수열)", "[kWh]", "", "=", Array, "N1")  '//72
 
+        '//열병합추가 230804
+        Array.Clear()
+        For i As Integer = 0 To 12
+            Array.Add(Result.생산E(i).신재생면적당열생산량)
+        Next
+        Set_ReqUseRow("310", "단위면적당 생산량(열병합)", "[kWh]", "", "=", Array, "N1")  '//72
+
 
         '//CO2배출량
         Array.Clear()
@@ -672,17 +688,17 @@
             Array.Add(Result.Co2발생량(i).단위면적)
         Next
 
-        Set_ReqUseRow("400", "단위면적당 CO2 배출량", "[kg CO2/m²]", "", "", Array, "N1")    '//74
+        idx = Set_ReqUseRow("400", "단위면적당 CO2 배출량", "[kg CO2/m²]", "", "", Array, "N1")    '//74
         Array.Clear()
         For i As Integer = 0 To 12
             Array.Add(Result.Co2발생량(i).난방발생량)
         Next
-        Set_ReqUseRow("410", "난방 CO2 발생량", "", "", "", Array)  '//75
+        idx = Set_ReqUseRow("410", "난방 CO2 발생량", "", "", "", Array)  '//75
         Array.Clear()
         For i As Integer = 0 To 12
             Array.Add(Result.Co2발생량(i).난방등유)
         Next
-        Set_ReqUseRow("410", "난방유(등유) CO2 발생량", "[kg CO2]", CStr(Result.Co2배출계수.등유), "=", Array)
+        idx = Set_ReqUseRow("410", "난방유(등유) CO2 발생량", "[kg CO2]", CStr(Result.Co2배출계수.등유), "=", Array)
         Array.Clear()
         For i As Integer = 0 To 12
             Array.Add(Result.Co2발생량(i).난방LNG)
@@ -715,7 +731,7 @@
             Array.Add(Result.Co2발생량(i).난방면적)
         Next
 
-        Set_ReqUseRow("410", "단위면적당 CO2 발생량", "[kg CO2]", "", "=", Array, "N1")
+        idx = Set_ReqUseRow("410", "단위면적당 CO2 발생량", "[kg CO2]", "", "=", Array, "N1")
 
         Array.Clear()
         For i As Integer = 0 To 12
@@ -860,10 +876,11 @@
 
     End Sub
 
-    Private Sub Set_ReqUseRow(ByVal GRP As String, ByVal desc As String, ByVal unit As String, ByVal sign As String, ByVal eq As String, ByVal Value As ArrayList, Optional ByVal F As String = "N0")
+    Private Function Set_ReqUseRow(ByVal GRP As String, ByVal desc As String, ByVal unit As String, ByVal sign As String, ByVal eq As String, ByVal Value As ArrayList, Optional ByVal F As String = "N0") As Integer
         Dim DR As DSR.TReqUseRow : DR = DSETR.TReqUse.NewTReqUseRow
 
-        DR.Code = Format(DSETR.TReqUse.Rows.Count + 1, "000")
+        Dim idx As Integer = DSETR.TReqUse.Rows.Count + 1
+        DR.Code = Format(idx, "000")
         DR.GRP = GRP  '//그룹 출력할떄 그룹으로 뽑는다.
         DR.Desc = desc  '//설명
         DR.UNIT = unit  '//단위
@@ -884,7 +901,8 @@
         DR.M12 = TOSG(Value.Item(12))
         DR.F = F
         DSETR.TReqUse.AddTReqUseRow(DR)
-    End Sub
+        Return idx
+    End Function
     Private Sub Set_ReqUseRow(ByVal GRP As String, ByVal desc As String, ByVal unit As String, ByVal sign As String, ByVal eq As String, ByVal Value As Decimal, Optional ByVal F As String = "N0")
         Dim DR As DSR.TReqUseRow : DR = DSETR.TReqUse.NewTReqUseRow