From 0ce9d438916020b2cfccffecf4851cd10d98f217 Mon Sep 17 00:00:00 2001 From: rosewiper Date: Mon, 15 Jan 2024 14:24:54 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9A=94=EA=B8=88=EC=82=AC=EC=9A=A9=EB=82=B4?= =?UTF-8?q?=EC=97=AD=20=EA=B1=B0=EB=9E=98=EB=AA=85=EC=84=B8=EC=84=9C,=20?= =?UTF-8?q?=EC=82=AC=EC=9A=A9=EB=82=B4=EC=97=AD=EC=84=9C=20Vat=20=ED=8F=AC?= =?UTF-8?q?=ED=95=A8=20/=20=EB=AF=B8=ED=8F=AC=ED=95=9C=20=ED=8C=9D?= =?UTF-8?q?=EC=97=85=20=ED=99=94=EB=A9=B4=20=EA=B0=9C=EC=84=A0=20=20-=20?= =?UTF-8?q?=EA=B8=B0=EC=A1=B4=20VAT=20=EB=B3=84=EB=8F=84=20=EB=82=B4?= =?UTF-8?q?=EC=97=AD=EB=A7=8C=20=EB=82=98=EC=98=A4=EB=8D=98=20=ED=99=94?= =?UTF-8?q?=EB=A9=B4=EC=9D=84=20=ED=8F=AC=ED=95=A8=EB=90=9C=20=EB=82=B4?= =?UTF-8?q?=EC=97=AD=EB=8F=84=20=EB=82=98=EC=98=A4=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itn/let/mjo/msg/service/MjonMsgVO.java | 7 ++ .../let/mjo/pay/web/MjonPayController.java | 13 ++++ .../jsp/web/pay/MsgPrintStatementPopUp.jsp | 35 +++++++-- .../jsp/web/pay/MsgPrintUsageDetailsPopUp.jsp | 75 +++++++++++++------ .../WEB-INF/jsp/web/pay/PayUserSWListAjax.jsp | 8 +- 5 files changed, 103 insertions(+), 35 deletions(-) diff --git a/src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java b/src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java index fed4e7dc..f29edcf9 100644 --- a/src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java +++ b/src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java @@ -500,6 +500,7 @@ public class MjonMsgVO extends ComDefaultVO{ private double supplyPrice; // 공급가액 private double vatPrice; // 부가세 private double totalPrice; // 금액 + private String addVatType; // 부가세 포함 여부 private String addrGrpId; // 주소록 그룹아이디 private String addrGrpNm; // 주소록 그룹명 @@ -1299,6 +1300,12 @@ public class MjonMsgVO extends ComDefaultVO{ public void setTotalPrice(double totalPrice) { this.totalPrice = totalPrice; } + public String getAddVatType() { + return addVatType; + } + public void setAddVatType(String addVatType) { + this.addVatType = addVatType; + } public String getDetailType() { return detailType; } diff --git a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java index 382c3826..dfefc82b 100644 --- a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java +++ b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java @@ -4869,6 +4869,12 @@ public class MjonPayController { model.addAttribute("mberNm", mberNm); model.addAttribute("managerNm", managerNm); model.addAttribute("moblphonNo", moblphonNo); + + //부가세 포함 가격 정보 계산 + double addTax = Math.round(totalSumPrice * 0.1); + + model.addAttribute("addTax", decFormat.format(addTax)); + model.addAttribute("addTaxSumPrice", decFormat.format(addTax+totalSumPrice)); return "/web/pay/MsgPrintUsageDetailsPopUp"; @@ -5111,6 +5117,13 @@ public class MjonPayController { model.addAttribute("managerNm", managerNm); model.addAttribute("moblphonNo", moblphonNo); + + //부가세 포함 가격 정보 계산 + double addTax = Math.round(totalSumPrice * 0.1); + + model.addAttribute("addTax", decFormat.format(addTax)); + model.addAttribute("addTaxSumPrice", decFormat.format(addTax+totalSumPrice)); + return "/web/pay/MsgPrintStatementPopUp"; } diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintStatementPopUp.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintStatementPopUp.jsp index ac45b2d0..f092e11d 100644 --- a/src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintStatementPopUp.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintStatementPopUp.jsp @@ -127,7 +127,14 @@ function f_print(){

총 사용금액

-

${totalSumPrice} 원(VAT 별도)

+ + +

${totalSumPrice} 원(VAT 별도)

+ + +

${addTaxSumPrice} 원(VAT 포함)

+ +

(단위 : 원, 건)

@@ -207,18 +214,32 @@ function f_print(){ - + - - - - - + + + + + + + + + + + + + + + + + + +
공급가액, 총 결제금액에 대한 표
공급가액${supplySumPrice} 원
총 결제금액${totalSumPrice} 원${supplySumPrice}
총 사용금액${totalSumPrice}
세액(부가세)${addTax}
총 사용금액${addTaxSumPrice}
diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintUsageDetailsPopUp.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintUsageDetailsPopUp.jsp index d3a85df0..f3f53c33 100644 --- a/src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintUsageDetailsPopUp.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintUsageDetailsPopUp.jsp @@ -85,7 +85,14 @@ function f_print(){

총 사용금액

-

${totalSumPrice} 원(VAT 별도)

+ + +

${totalSumPrice} 원(VAT 별도)

+ + +

${addTaxSumPrice} 원(VAT 포함)

+ +

(단위 : 원, 건)

@@ -150,29 +157,50 @@ function f_print(){ - + + + 사용내역이 없습니다. + + - + + + +
+ + +
+ + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -182,9 +210,8 @@ function f_print(){ - -
공급가액, 총 결제금액에 대한 표
공급가액${supplySumPrice}
총 공급가액2,227
세액(부가세)227
총 사용금액1,258
총 사용금액${totalSumPrice}
세액(부가세)${addTax}
총 사용금액${addTaxSumPrice}
-
+ +

${year} 년  ${month} 월  ${day} 일

diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWListAjax.jsp index fc5201d0..f1af48a1 100644 --- a/src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWListAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWListAjax.jsp @@ -111,7 +111,7 @@ function fnShowPrintPopup() { return; } } - + document.listForm.action = url; document.listForm.method = "post"; window.open("about:blank", 'printPop', 'width='+ popup_wid +', height='+ popup_ht +', left=' + popup_left + ', top='+ popup_top + ', fullscreen=no, menubar=no, status=no, toolbar=no, titlebar=yes, location=no, scrollbars=1'); @@ -411,9 +411,9 @@ function fnShowPdfPrintPopup(){ - + +