diff --git a/src/com/pms/service/ApprovalService.java b/src/com/pms/service/ApprovalService.java
index dd6cbb9..cb195da 100644
--- a/src/com/pms/service/ApprovalService.java
+++ b/src/com/pms/service/ApprovalService.java
@@ -2285,8 +2285,8 @@ public class ApprovalService {
html.append("| ").append(escapeHtml(CommonUtils.checkNull(item.get("UNIT_NAME")))).append(" | ");
html.append("").append(escapeHtml(CommonUtils.checkNull(item.get("DUE_DATE")))).append(" | ");
html.append("").append(formatNumber(qty)).append(" | ");
- html.append("").append(formatNumber(unitPrice)).append(" | ");
- html.append("").append(formatNumber(itemSupply)).append(" | ");
+ html.append("").append(formatDecimalNumber(unitPrice)).append(" | ");
+ html.append("").append(formatDecimalNumber(itemSupply)).append(" | ");
html.append("");
}
}
@@ -2297,7 +2297,7 @@ public class ApprovalService {
html.append(" | ");
html.append("").append(formatNumber(totalQty)).append(" | ");
html.append(" | ");
- html.append("").append(formatNumber(supplyPrice)).append(" | ");
+ html.append("").append(formatDecimalNumber(supplyPrice)).append(" | ");
html.append("");
// 비고(합계 요약) - 4컬럼
@@ -2305,9 +2305,9 @@ public class ApprovalService {
html.append("");
html.append("| 비 고 | ");
html.append(" | ");
- html.append("공 급 가 액 합 계 | ").append(formatNumber(supplyPrice)).append(" |
");
- html.append("| 부 가 가 치 세 | ").append(formatNumber(vat)).append(" |
");
- html.append("| 총 계 | ").append(formatNumber(totalAmount)).append(" |
");
+ html.append("공 급 가 액 합 계 | ").append(formatDecimalNumber(supplyPrice)).append(" | ");
+ html.append("| 부 가 가 치 세 | ").append(formatDecimalNumber(vat)).append(" |
");
+ html.append("| 총 계 | ").append(formatDecimalNumber(totalAmount)).append(" |
");
html.append("");
// 하단 부가세 구분 + 날짜
html.append("");
@@ -2412,8 +2412,8 @@ public class ApprovalService {
html.append("| ").append(CommonUtils.checkNull(item.get("UNIT_NAME"))).append(" | ");
html.append("").append(CommonUtils.checkNull(item.get("DUE_DATE"))).append(" | ");
html.append("").append(formatNumber(qty)).append(" | ");
- html.append("").append(formatNumber(CommonUtils.checkNull(item.get("ORDER_UNIT_PRICE")))).append(" | ");
- html.append("").append(formatNumber(CommonUtils.checkNull(item.get("ORDER_SUPPLY_PRICE")))).append(" | ");
+ html.append("").append(formatDecimalNumber(CommonUtils.checkNull(item.get("ORDER_UNIT_PRICE")))).append(" | ");
+ html.append("").append(formatDecimalNumber(CommonUtils.checkNull(item.get("ORDER_SUPPLY_PRICE")))).append(" | ");
html.append("
");
}
}
@@ -2422,7 +2422,7 @@ public class ApprovalService {
html.append("| 합 계 |
");
html.append(" | ");
html.append("").append(formatNumber(totalQty)).append(" | | ");
- html.append("").append(formatNumber(supplyPrice)).append(" |
");
+ html.append("").append(formatDecimalNumber(supplyPrice)).append(" | ");
html.append("
");
// 비고 (4컬럼)
@@ -2430,9 +2430,9 @@ public class ApprovalService {
html.append("");
html.append("| 비 고 | ");
html.append(" | ");
- html.append("공 급 가 액 합 계 | ").append(formatNumber(supplyPrice)).append(" |
");
- html.append("| 부 가 가 치 세 | ").append(formatNumber(vat)).append(" |
");
- html.append("| 총 계 | ").append(formatNumber(totalAmount)).append(" |
");
+ html.append("공 급 가 액 합 계 | ").append(formatDecimalNumber(supplyPrice)).append(" | ");
+ html.append("| 부 가 가 치 세 | ").append(formatDecimalNumber(vat)).append(" |
");
+ html.append("| 총 계 | ").append(formatDecimalNumber(totalAmount)).append(" |
");
html.append("");
// 하단 부가세 구분 + 날짜
html.append("");
@@ -2615,10 +2615,10 @@ public class ApprovalService {
html.append("
| 합계금액 | ");
if(!totalAmountKrw.isEmpty() && !"0".equals(totalAmountKrw)){
- html.append(totalAmountKrw).append(" (KRW)");
- if(!totalAmount.isEmpty()) html.append(" / ").append(totalAmount).append(" (").append(currencyName).append(")");
+ html.append(formatDecimalNumber(totalAmountKrw)).append(" (KRW)");
+ if(!totalAmount.isEmpty()) html.append(" / ").append(formatDecimalNumber(totalAmount)).append(" (").append(currencyName).append(")");
} else {
- html.append(totalAmount);
+ html.append(formatDecimalNumber(totalAmount));
}
html.append(" |
|---|
");
html.append("");
@@ -2636,10 +2636,10 @@ public class ApprovalService {
html.append("").append(no++).append(" | ");
html.append("").append(CommonUtils.checkNull(item.get("DESCRIPTION"))).append(" | ");
html.append("").append(CommonUtils.checkNull(item.get("SPECIFICATION"))).append(" | ");
- html.append("").append(CommonUtils.checkNull(item.get("QUANTITY"))).append(" | ");
+ html.append("").append(formatNumber(CommonUtils.checkNull(item.get("QUANTITY")))).append(" | ");
html.append("").append(CommonUtils.checkNull(item.get("UNIT"))).append(" | ");
- html.append("").append(CommonUtils.checkNull(item.get("UNIT_PRICE"))).append(" | ");
- html.append("").append(CommonUtils.checkNull(item.get("AMOUNT"))).append(" | ");
+ html.append("").append(formatDecimalNumber(CommonUtils.checkNull(item.get("UNIT_PRICE")))).append(" | ");
+ html.append("").append(formatDecimalNumber(CommonUtils.checkNull(item.get("AMOUNT")))).append(" | ");
html.append("").append(CommonUtils.checkNull(item.get("REMARK"))).append(" | ");
html.append("");
}
@@ -2744,10 +2744,10 @@ public class ApprovalService {
html.append("| 합계금액 | ");
html.append("");
if(!totalAmountKrw.isEmpty() && !"0".equals(totalAmountKrw)){
- html.append(escapeHtml(totalAmountKrw)).append(" (KRW)");
- if(!totalAmount.isEmpty()) html.append(" / ").append(escapeHtml(totalAmount)).append(" (").append(escapeHtml(currencyName)).append(")");
+ html.append(formatDecimalNumber(totalAmountKrw)).append(" (KRW)");
+ if(!totalAmount.isEmpty()) html.append(" / ").append(formatDecimalNumber(totalAmount)).append(" (").append(escapeHtml(currencyName)).append(")");
} else {
- html.append(escapeHtml(totalAmount));
+ html.append(formatDecimalNumber(totalAmount));
}
html.append(" |
");
html.append("");
@@ -2773,10 +2773,10 @@ public class ApprovalService {
html.append("").append(no++).append(" | ");
html.append("").append(escapeHtml(CommonUtils.checkNull(item.get("DESCRIPTION")))).append(" | ");
html.append("").append(escapeHtml(CommonUtils.checkNull(item.get("SPECIFICATION")))).append(" | ");
- html.append("").append(escapeHtml(CommonUtils.checkNull(item.get("QUANTITY")))).append(" | ");
+ html.append("").append(formatNumber(CommonUtils.checkNull(item.get("QUANTITY")))).append(" | ");
html.append("").append(escapeHtml(CommonUtils.checkNull(item.get("UNIT")))).append(" | ");
- html.append("").append(escapeHtml(CommonUtils.checkNull(item.get("UNIT_PRICE")))).append(" | ");
- html.append("").append(escapeHtml(CommonUtils.checkNull(item.get("AMOUNT")))).append(" | ");
+ html.append("").append(formatDecimalNumber(CommonUtils.checkNull(item.get("UNIT_PRICE")))).append(" | ");
+ html.append("").append(formatDecimalNumber(CommonUtils.checkNull(item.get("AMOUNT")))).append(" | ");
html.append("").append(escapeHtml(CommonUtils.checkNull(item.get("REMARK")))).append(" | ");
html.append("");
}
@@ -3373,7 +3373,7 @@ public class ApprovalService {
html.append("").append(escapeHtml(deptName)).append(" | ");
html.append("기 안 자 | ");
html.append("").append(escapeHtml(writerOnly)).append(" | ");
- html.append("").append(formatNumber(totalAmount)).append(" | ");
+ html.append("").append(formatDecimalNumber(totalAmount)).append(" | ");
html.append("");
// 품목 테이블 (12컬럼 - JSP와 동일)
@@ -3528,7 +3528,7 @@ public class ApprovalService {
h.append("").append(escapeHtml(deptName)).append(" | ");
h.append("");
h.append("").append(escapeHtml(writerOnly)).append(" | ");
- h.append("").append(formatNumber(totalAmount)).append(" | ");
+ h.append("").append(formatDecimalNumber(totalAmount)).append(" | ");
h.append("");
// 품목 테이블 (12컬럼 - JSP와 동일)