diff --git a/ArinLogin/bin/Debug/ArinLogin.dll b/ArinLogin/bin/Debug/ArinLogin.dll index 4160358..6d338f0 100644 Binary files a/ArinLogin/bin/Debug/ArinLogin.dll and b/ArinLogin/bin/Debug/ArinLogin.dll differ diff --git a/ArinLogin/bin/Debug/ArinLogin.pdb b/ArinLogin/bin/Debug/ArinLogin.pdb index e25b27b..95f29a6 100644 Binary files a/ArinLogin/bin/Debug/ArinLogin.pdb and b/ArinLogin/bin/Debug/ArinLogin.pdb differ diff --git a/ArinLogin/obj/Debug/ArinLogin.dll b/ArinLogin/obj/Debug/ArinLogin.dll index 4160358..6d338f0 100644 Binary files a/ArinLogin/obj/Debug/ArinLogin.dll and b/ArinLogin/obj/Debug/ArinLogin.dll differ diff --git a/ArinLogin/obj/Debug/ArinLogin.pdb b/ArinLogin/obj/Debug/ArinLogin.pdb index e25b27b..95f29a6 100644 Binary files a/ArinLogin/obj/Debug/ArinLogin.pdb and b/ArinLogin/obj/Debug/ArinLogin.pdb differ diff --git a/ArinNet/bin/Debug/ArinNet.dll b/ArinNet/bin/Debug/ArinNet.dll index 1e56c1c..6a417e2 100644 Binary files a/ArinNet/bin/Debug/ArinNet.dll and b/ArinNet/bin/Debug/ArinNet.dll differ diff --git a/ArinNet/bin/Debug/ArinNet.pdb b/ArinNet/bin/Debug/ArinNet.pdb index b8c23a7..8bcc399 100644 Binary files a/ArinNet/bin/Debug/ArinNet.pdb and b/ArinNet/bin/Debug/ArinNet.pdb differ diff --git a/ArinNet/obj/Debug/ArinNet.dll b/ArinNet/obj/Debug/ArinNet.dll index 1e56c1c..6a417e2 100644 Binary files a/ArinNet/obj/Debug/ArinNet.dll and b/ArinNet/obj/Debug/ArinNet.dll differ diff --git a/ArinNet/obj/Debug/ArinNet.pdb b/ArinNet/obj/Debug/ArinNet.pdb index b8c23a7..8bcc399 100644 Binary files a/ArinNet/obj/Debug/ArinNet.pdb and b/ArinNet/obj/Debug/ArinNet.pdb differ diff --git a/ArinWarev1/MdiMain.vb b/ArinWarev1/MdiMain.vb index fe1da8e..4727032 100644 --- a/ArinWarev1/MdiMain.vb +++ b/ArinWarev1/MdiMain.vb @@ -1424,7 +1424,7 @@ ENDSTAT: '// If 난방기기용량합 > 난방_MAX_기기용량합 Then 난방_MAX_기기용량합 = 난방기기용량합 - 난방_MAX_기기명칭 = dr.열생산기기방식 + 난방_MAX_기기명칭 = dr.설명 난방_MAX_기기방식 = dr.열생산기기방식 난방_MAX_연료방식 = dr.사용연료 End If @@ -1471,7 +1471,7 @@ ENDSTAT: '// 급탕기기용량합 = TOSG(T, dr.보일러정격출력) * TOSG(T, dr.보일러대수) If 급탕기기용량합 > 급탕_MAX_기기용량합 Then 급탕_MAX_기기용량합 = 급탕기기용량합 - 급탕_MAX_기기명칭 = dr.열생산기기방식 + 급탕_MAX_기기명칭 = dr.설명 급탕_MAX_기기방식 = dr.열생산기기방식 급탕_MAX_연료방식 = dr.사용연료 End If @@ -1521,12 +1521,16 @@ ENDSTAT: '// If 난방기기용량합 > 난방_MAX_기기용량합 Then 난방_MAX_기기용량합 = 난방기기용량합 난방_MAX_기기명칭 = dr.설명 + 난방_MAX_기기방식 = dr.열생산기기방식 난방_MAX_연료방식 = dr.사용연료 + + End If If 급탕기기용량합 > 급탕_MAX_기기용량합 Then 급탕_MAX_기기용량합 = 급탕기기용량합 급탕_MAX_기기명칭 = dr.설명 + 급탕_MAX_기기방식 = dr.열생산기기방식 급탕_MAX_연료방식 = dr.사용연료 End If diff --git a/CEnergy/ArinClassV2/bin/Debug/CEnergy.dll b/CEnergy/ArinClassV2/bin/Debug/CEnergy.dll index 4339ea8..05e7a67 100644 Binary files a/CEnergy/ArinClassV2/bin/Debug/CEnergy.dll and b/CEnergy/ArinClassV2/bin/Debug/CEnergy.dll differ diff --git a/CEnergy/ArinClassV2/bin/Debug/CEnergy.pdb b/CEnergy/ArinClassV2/bin/Debug/CEnergy.pdb index 4dd200a..51243fe 100644 Binary files a/CEnergy/ArinClassV2/bin/Debug/CEnergy.pdb and b/CEnergy/ArinClassV2/bin/Debug/CEnergy.pdb differ diff --git a/CEnergy/ArinClassV2/obj/Debug/CEnergy.dll b/CEnergy/ArinClassV2/obj/Debug/CEnergy.dll index 4339ea8..05e7a67 100644 Binary files a/CEnergy/ArinClassV2/obj/Debug/CEnergy.dll and b/CEnergy/ArinClassV2/obj/Debug/CEnergy.dll differ diff --git a/CEnergy/ArinClassV2/obj/Debug/CEnergy.pdb b/CEnergy/ArinClassV2/obj/Debug/CEnergy.pdb index 4dd200a..51243fe 100644 Binary files a/CEnergy/ArinClassV2/obj/Debug/CEnergy.pdb and b/CEnergy/ArinClassV2/obj/Debug/CEnergy.pdb differ