From 4396f98e105a2b04a3cfd5c7fbffcec25db41503 Mon Sep 17 00:00:00 2001 From: raytrace Date: Sun, 9 Dec 2018 20:43:15 +0900 Subject: [PATCH] .. --- ArinLogin/bin/Debug/ArinLogin.dll | Bin 15872 -> 15872 bytes ArinLogin/bin/Debug/ArinLogin.pdb | Bin 36352 -> 36352 bytes ArinLogin/obj/Debug/ArinLogin.dll | Bin 15872 -> 15872 bytes ArinLogin/obj/Debug/ArinLogin.pdb | Bin 36352 -> 36352 bytes ArinNet/bin/Debug/ArinNet.dll | Bin 13312 -> 13312 bytes ArinNet/bin/Debug/ArinNet.pdb | Bin 30208 -> 30208 bytes ArinNet/obj/Debug/ArinNet.dll | Bin 13312 -> 13312 bytes ArinNet/obj/Debug/ArinNet.pdb | Bin 30208 -> 30208 bytes ArinWarev1/MdiMain.vb | 8 ++++++-- CEnergy/ArinClassV2/bin/Debug/CEnergy.dll | Bin 25088 -> 25088 bytes CEnergy/ArinClassV2/bin/Debug/CEnergy.pdb | Bin 56832 -> 56832 bytes CEnergy/ArinClassV2/obj/Debug/CEnergy.dll | Bin 25088 -> 25088 bytes CEnergy/ArinClassV2/obj/Debug/CEnergy.pdb | Bin 56832 -> 56832 bytes 13 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ArinLogin/bin/Debug/ArinLogin.dll b/ArinLogin/bin/Debug/ArinLogin.dll index 4160358df789a8b75a1c3617fe3967844bc6943d..6d338f0964c5851bba13c0550402d3c9b174cd77 100644 GIT binary patch delta 355 zcmZpuX{edd!P5SlCuU<$fT;Rsrb1RdhQmxtS@alQGX(8X*q%;FJqbEZ*LmguRgECMynE@n{43^CVicex}0PAXI zXa>qQGgN~~pqk0~VzGuGlN=a9rY1m1kVrD)Y$l*dj9~K^K{}Edr5TPeCo?ur{wt=b z3ld)p7GDfBQHAjUSnmNwklqJiHUkrg&ANyq^1LW@(2HVbNhX3+r!6$2130dYGJ l%On7?0Rux&uuJgU1D#*LFwgSsV3yv0vbfTIvw^_{UI2s_Qbhm& delta 364 zcmZpuX{edd!SdPkeDubi0MYv0OmkTD7!ETn1(Khc3R(3Sn3)@ZBsVjNy_sn;Q2aF0 z5g>V)i3cchn@JK#er8Bv(qnkc+W?*7;W{_s!29hAQCqp+w zH)8^WGEg=dERqbC%>;_qF*Yz5ivT5>8LGh~NLw>QGlR;cUlsgg|$Dj=zzkE0SK6Y oxE+XP5`fr%fgvc^C3v;p)(~UC<<0n~fjaXy#0vM9hf!KI-r0SQoLhf5P# z4uCisWic!dKuS8wB3L%$f~7?#|11k;ae!z{VA*i+0xQsL`N@~d57+1Bl>jXj0%8zg zVtC>OVKFc;GUVp90XaNS0d%=ZKyd*aa*OcjTL+X=fa!BXv+x{H0+(YR0Ohz~8d3By zOpdOUW@liK1BSHd2K@6$|C=UmW4FCV{0LpPswyhT5Tu?oQ L1y4jZJmCcZ9KdkE delta 485 zcmZpe!_+W`X#)$F#Anm<(TofX46FUNet5BBkHeB2KgoI{zlhB;TyNyr{6d)ZA7pLj z(_(Sr`u`uOjNv~JY?jH1;9xm0(M4%;K)Lwj{t{1?fay@q=Mq;IhpA9baA_!u0E~0E zG?67?5>Q5?EQV#m6dwt0!Fnw-N28aS#cn(P8a?Asu92XFS z0IFkBCP!CFv!^h~0Rvlfa$=?U<|&nn7%dqX7O^ofh(UBPutRAO1&Wj%Ksj!x7^+;# P=KSiZEO=tC;R!DQ2gqTt diff --git a/ArinLogin/obj/Debug/ArinLogin.dll b/ArinLogin/obj/Debug/ArinLogin.dll index 4160358df789a8b75a1c3617fe3967844bc6943d..6d338f0964c5851bba13c0550402d3c9b174cd77 100644 GIT binary patch delta 355 zcmZpuX{edd!P5SlCuU<$fT;Rsrb1RdhQmxtS@alQGX(8X*q%;FJqbEZ*LmguRgECMynE@n{43^CVicex}0PAXI zXa>qQGgN~~pqk0~VzGuGlN=a9rY1m1kVrD)Y$l*dj9~K^K{}Edr5TPeCo?ur{wt=b z3ld)p7GDfBQHAjUSnmNwklqJiHUkrg&ANyq^1LW@(2HVbNhX3+r!6$2130dYGJ l%On7?0Rux&uuJgU1D#*LFwgSsV3yv0vbfTIvw^_{UI2s_Qbhm& delta 364 zcmZpuX{edd!SdPkeDubi0MYv0OmkTD7!ETn1(Khc3R(3Sn3)@ZBsVjNy_sn;Q2aF0 z5g>V)i3cchn@JK#er8Bv(qnkc+W?*7;W{_s!29hAQCqp+w zH)8^WGEg=dERqbC%>;_qF*Yz5ivT5>8LGh~NLw>QGlR;cUlsgg|$Dj=zzkE0SK6Y oxE+XP5`fr%fgvc^C3v;p)(~UC<<0n~fjaXy#0vM9hf!KI-r0SQoLhf5P# z4uCisWic!dKuS8wB3L%$f~7?#|11k;ae!z{VA*i+0xQsL`N@~d57+1Bl>jXj0%8zg zVtC>OVKFc;GUVp90XaNS0d%=ZKyd*aa*OcjTL+X=fa!BXv+x{H0+(YR0Ohz~8d3By zOpdOUW@liK1BSHd2K@6$|C=UmW4FCV{0LpPswyhT5Tu?oQ L1y4jZJmCcZ9KdkE delta 485 zcmZpe!_+W`X#)$F#Anm<(TofX46FUNet5BBkHeB2KgoI{zlhB;TyNyr{6d)ZA7pLj z(_(Sr`u`uOjNv~JY?jH1;9xm0(M4%;K)Lwj{t{1?fay@q=Mq;IhpA9baA_!u0E~0E zG?67?5>Q5?EQV#m6dwt0!Fnw-N28aS#cn(P8a?Asu92XFS z0IFkBCP!CFv!^h~0Rvlfa$=?U<|&nn7%dqX7O^ofh(UBPutRAO1&Wj%Ksj!x7^+;# P=KSiZEO=tC;R!DQ2gqTt diff --git a/ArinNet/bin/Debug/ArinNet.dll b/ArinNet/bin/Debug/ArinNet.dll index 1e56c1c5c7b1dfab7b0314ed71f7e495b5984f81..6a417e2ec795faee4ed00cf7bcfbe1a80d9651e3 100644 GIT binary patch delta 256 zcmZq3Xvmn*!P54dCuU=hl%R$-({&a-hTn|5KvJ1$Cy=xTi#UVH*NnfJ^%y=gvan1( zAt>kPz+lY4%jm!$%nLzOd#s;viW`<^< zY%@bOm;|YrY$Y_052VEzC=4PmGj4t+jQ3ZQe9gr^=fPe{zn}Jv+0f^NY7=nUbf~PV@{ygzE!fQhV Q&y{+$BZZp{)GqJ>01kyl7XSbN diff --git a/ArinNet/bin/Debug/ArinNet.pdb b/ArinNet/bin/Debug/ArinNet.pdb index b8c23a7d6245c2de9308de6fae11244428081669..8bcc399cccc8da9d22b3854264e6ac20273be86e 100644 GIT binary patch delta 489 zcmZp8!`SeKaRUpNMB8tk7)AyL2F1J{srzxOU6*;DDw62fI38+3p3Pjmt zNU=LfO#(^^Om@r=WpNIy`Cc>OCN%LIr)fSCbo zFqjSUupE#O1@qA5Oc;!Ta?&70K)}La0AT=0MxbeaObiS&amYPqW?*oFss`%QMA4|p z!oZM&kVKMWV3^#KDaFpfZ~>@WyV3 zr^aHznG96Lz>vm}wpltZl8xoZPi3Xa57I;@_oleBy!Zps z$p=%TSvo*U71BbPL8>a!Qdlw|%41kGegH)r(#_bx7BO&5bQGREA-#`@fnl;jh7^dh z$&dm{P6EmcOm@r=WoBSlG}$&o5+pStLkh?}H(4=55~$<>Pze`ENqs59D~U4kxI37Hu?* znn06sV3H_u=}MD(GNstll`a64a8I6?DGFrY2C_MUZ1KqtGWkH>{E#WdhtS5zU}Cgc OBI^w^o@mT_!VUm@H*cT- diff --git a/ArinNet/obj/Debug/ArinNet.dll b/ArinNet/obj/Debug/ArinNet.dll index 1e56c1c5c7b1dfab7b0314ed71f7e495b5984f81..6a417e2ec795faee4ed00cf7bcfbe1a80d9651e3 100644 GIT binary patch delta 256 zcmZq3Xvmn*!P54dCuU=hl%R$-({&a-hTn|5KvJ1$Cy=xTi#UVH*NnfJ^%y=gvan1( zAt>kPz+lY4%jm!$%nLzOd#s;viW`<^< zY%@bOm;|YrY$Y_052VEzC=4PmGj4t+jQ3ZQe9gr^=fPe{zn}Jv+0f^NY7=nUbf~PV@{ygzE!fQhV Q&y{+$BZZp{)GqJ>01kyl7XSbN diff --git a/ArinNet/obj/Debug/ArinNet.pdb b/ArinNet/obj/Debug/ArinNet.pdb index b8c23a7d6245c2de9308de6fae11244428081669..8bcc399cccc8da9d22b3854264e6ac20273be86e 100644 GIT binary patch delta 489 zcmZp8!`SeKaRUpNMB8tk7)AyL2F1J{srzxOU6*;DDw62fI38+3p3Pjmt zNU=LfO#(^^Om@r=WpNIy`Cc>OCN%LIr)fSCbo zFqjSUupE#O1@qA5Oc;!Ta?&70K)}La0AT=0MxbeaObiS&amYPqW?*oFss`%QMA4|p z!oZM&kVKMWV3^#KDaFpfZ~>@WyV3 zr^aHznG96Lz>vm}wpltZl8xoZPi3Xa57I;@_oleBy!Zps z$p=%TSvo*U71BbPL8>a!Qdlw|%41kGegH)r(#_bx7BO&5bQGREA-#`@fnl;jh7^dh z$&dm{P6EmcOm@r=WoBSlG}$&o5+pStLkh?}H(4=55~$<>Pze`ENqs59D~U4kxI37Hu?* znn06sV3H_u=}MD(GNstll`a64a8I6?DGFrY2C_MUZ1KqtGWkH>{E#WdhtS5zU}Cgc OBI^w^o@mT_!VUm@H*cT- 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 4339ea8f4c485ccd20eb7a2087c916c0151f794e..05e7a67524fa0521a0979cef794383b97ddb11c9 100644 GIT binary patch delta 288 zcmZoT!q{+xaY6@6`){6@jXhjC(%Gy@%z6yPtl1oT44)Z5>}W7MnYCr|Mjdy<2BriC zWd=2-WCm#lULYyV@Q*Q*p_^d}Qv-uBP`sI;8BA7#NuZj^n!1@{AQ=ZnklF+&2@;vS zLRZZkWLPGnGz*C2X0c^!U<4b(_?Q`J7^5`9W7cM%mP4$ajNJ??*cO0g7c(kP{;w;# zSxV1KMqqVx<&@x8POi&EOqK{}E(_RP;?=-3nbB8-n}?Bs-M3ONv^ceBv#{?+HXV>J t8GwKZi2H$9rU8gU7#M>1EV%B3QX3d_wQODh|mnnfknL&*ynL(K0 zA7e6uGy^YFCPOzv15*QoF;Kjjp&Cqr#G4tK8Pq0g>Sl_8)H*PN z7B!|!Mv#%2jNB}?Yz<%q&5Xhfhgh2#r5PRr$;ZrUOr4C~3@g|cfMpjmf-G4K7GKN= zv;@dj-Yl-?DJn+M_?}9{)BQgk0bS0M!dinE(I) diff --git a/CEnergy/ArinClassV2/bin/Debug/CEnergy.pdb b/CEnergy/ArinClassV2/bin/Debug/CEnergy.pdb index 4dd200add83350366d31006e7c60718ff2e84d3e..51243fea90d65aad4c8494c7f62ebe66c9739047 100644 GIT binary patch delta 2153 zcmaKuUr19?9LImQv#Ha}nTljC!L+i6tX3#lPKt<9Bf7O5Y3lXgcZ3S zB0{34D2T-fUqqaL-XbMJe5xP=iK3^TBG&hJ?zx+udG42;dw=Kmxxe4<{La0*+sLGA zWYU!p-ljW$tHWhPF(TRu{tV^mUJ!`cCp<$b5<;~adT!+?B>fp z%|yi$HhO2nqKS=Xvr*B_*NC}6ad!+xc&?*d)+Fzv{;f&5O3XVgAMxB4+X0MP<RA4uiGHI>{p!PhnImpU%eMw->6j7sj|G(Hp>443-}F0Y1}WzJhr% zSnK2R`5*A{&aqt9Ngm56pZBAa2IX_1enH&fK^*#2Hc=oXcPW8P{mQ4aELg9B{RTT^ zV9A}xbl3pTgLN6$J+MYzF{Cf%xtplXLM3b#>~@hA`{!JzJlHNn($jcq_Z9<{W$ny$ zu!!;?e?gpT3GA5i=&Zg1^In&wiesF#y1OJicD2f^f0L^Sjw zSX(m1GtLaAqawqZ`)N~*aUhl>BEwbD)E97*G z*?>7GT3Bb&XBeLx4=;^d*$D4^+|9UA>SP9(XNIvKHdK;L2@3W*=pn7PaYFSU^*E8&;3S@=)s@_=wuFlr?Anyo)sORzAv@EnJG@(lk9@ zMzp7Bok`bWF=@Vn6E*1#%sQyS?d3#|HTE1Y!|DD zGBA7pYT?K>qPv>Hcd#oOJAtQ6hsLhLCN`U8uk-^Dr)m#%F<)W$DQbUQ>dJ5(bUkZw zhW)D(Hs)}%b-36*7aP!-h3j-ghp6Fv diff --git a/CEnergy/ArinClassV2/obj/Debug/CEnergy.dll b/CEnergy/ArinClassV2/obj/Debug/CEnergy.dll index 4339ea8f4c485ccd20eb7a2087c916c0151f794e..05e7a67524fa0521a0979cef794383b97ddb11c9 100644 GIT binary patch delta 288 zcmZoT!q{+xaY6@6`){6@jXhjC(%Gy@%z6yPtl1oT44)Z5>}W7MnYCr|Mjdy<2BriC zWd=2-WCm#lULYyV@Q*Q*p_^d}Qv-uBP`sI;8BA7#NuZj^n!1@{AQ=ZnklF+&2@;vS zLRZZkWLPGnGz*C2X0c^!U<4b(_?Q`J7^5`9W7cM%mP4$ajNJ??*cO0g7c(kP{;w;# zSxV1KMqqVx<&@x8POi&EOqK{}E(_RP;?=-3nbB8-n}?Bs-M3ONv^ceBv#{?+HXV>J t8GwKZi2H$9rU8gU7#M>1EV%B3QX3d_wQODh|mnnfknL&*ynL(K0 zA7e6uGy^YFCPOzv15*QoF;Kjjp&Cqr#G4tK8Pq0g>Sl_8)H*PN z7B!|!Mv#%2jNB}?Yz<%q&5Xhfhgh2#r5PRr$;ZrUOr4C~3@g|cfMpjmf-G4K7GKN= zv;@dj-Yl-?DJn+M_?}9{)BQgk0bS0M!dinE(I) diff --git a/CEnergy/ArinClassV2/obj/Debug/CEnergy.pdb b/CEnergy/ArinClassV2/obj/Debug/CEnergy.pdb index 4dd200add83350366d31006e7c60718ff2e84d3e..51243fea90d65aad4c8494c7f62ebe66c9739047 100644 GIT binary patch delta 2153 zcmaKuUr19?9LImQv#Ha}nTljC!L+i6tX3#lPKt<9Bf7O5Y3lXgcZ3S zB0{34D2T-fUqqaL-XbMJe5xP=iK3^TBG&hJ?zx+udG42;dw=Kmxxe4<{La0*+sLGA zWYU!p-ljW$tHWhPF(TRu{tV^mUJ!`cCp<$b5<;~adT!+?B>fp z%|yi$HhO2nqKS=Xvr*B_*NC}6ad!+xc&?*d)+Fzv{;f&5O3XVgAMxB4+X0MP<RA4uiGHI>{p!PhnImpU%eMw->6j7sj|G(Hp>443-}F0Y1}WzJhr% zSnK2R`5*A{&aqt9Ngm56pZBAa2IX_1enH&fK^*#2Hc=oXcPW8P{mQ4aELg9B{RTT^ zV9A}xbl3pTgLN6$J+MYzF{Cf%xtplXLM3b#>~@hA`{!JzJlHNn($jcq_Z9<{W$ny$ zu!!;?e?gpT3GA5i=&Zg1^In&wiesF#y1OJicD2f^f0L^Sjw zSX(m1GtLaAqawqZ`)N~*aUhl>BEwbD)E97*G z*?>7GT3Bb&XBeLx4=;^d*$D4^+|9UA>SP9(XNIvKHdK;L2@3W*=pn7PaYFSU^*E8&;3S@=)s@_=wuFlr?Anyo)sORzAv@EnJG@(lk9@ zMzp7Bok`bWF=@Vn6E*1#%sQyS?d3#|HTE1Y!|DD zGBA7pYT?K>qPv>Hcd#oOJAtQ6hsLhLCN`U8uk-^Dr)m#%F<)W$DQbUQ>dJ5(bUkZw zhW)D(Hs)}%b-36*7aP!-h3j-ghp6Fv