From 38b251b6e3c3073d02870774ee12f7ab9d363f93 Mon Sep 17 00:00:00 2001
From: hjjeong <hjjeong@wace.me>
Date: Tue, 31 Mar 2026 10:33:19 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=EC=88=AB=EC=9E=90=20=EC=98=A4=EB=A5=B8?=
 =?UTF-8?q?=EC=AA=BD=20=EC=A0=95=EB=A0=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/pms/service/ApprovalService.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/com/pms/service/ApprovalService.java b/src/com/pms/service/ApprovalService.java
index cb195da..892f45b 100644
--- a/src/com/pms/service/ApprovalService.java
+++ b/src/com/pms/service/ApprovalService.java
@@ -2770,13 +2770,13 @@ public class ApprovalService {
 			for(Map item : itemList){
 				item = CommonUtils.toUpperCaseMapKey(item);
 				html.append("<tr>");
-				html.append("<td ").append(TD_ITEM).append(" style='border:1px solid #333;text-align:center;font-size:9pt;padding:4px;'>").append(no++).append("</td>");
+				html.append("<td style='border:1px solid #333;text-align:center;font-size:9pt;padding:4px;'>").append(no++).append("</td>");
 				html.append("<td ").append(TD_ITEM).append(">").append(escapeHtml(CommonUtils.checkNull(item.get("DESCRIPTION")))).append("</td>");
 				html.append("<td ").append(TD_ITEM).append(">").append(escapeHtml(CommonUtils.checkNull(item.get("SPECIFICATION")))).append("</td>");
-				html.append("<td ").append(TD_ITEM).append(" style='border:1px solid #333;text-align:right;font-size:9pt;padding:4px;'>").append(formatNumber(CommonUtils.checkNull(item.get("QUANTITY")))).append("</td>");
-				html.append("<td ").append(TD_ITEM).append(" style='border:1px solid #333;text-align:center;font-size:9pt;padding:4px;'>").append(escapeHtml(CommonUtils.checkNull(item.get("UNIT")))).append("</td>");
-				html.append("<td ").append(TD_ITEM).append(" style='border:1px solid #333;text-align:right;font-size:9pt;padding:4px;'>").append(formatDecimalNumber(CommonUtils.checkNull(item.get("UNIT_PRICE")))).append("</td>");
-				html.append("<td ").append(TD_ITEM).append(" style='border:1px solid #333;text-align:right;font-size:9pt;padding:4px;'>").append(formatDecimalNumber(CommonUtils.checkNull(item.get("AMOUNT")))).append("</td>");
+				html.append("<td style='border:1px solid #333;text-align:right;font-size:9pt;padding:4px;'>").append(formatNumber(CommonUtils.checkNull(item.get("QUANTITY")))).append("</td>");
+				html.append("<td style='border:1px solid #333;text-align:center;font-size:9pt;padding:4px;'>").append(escapeHtml(CommonUtils.checkNull(item.get("UNIT")))).append("</td>");
+				html.append("<td style='border:1px solid #333;text-align:right;font-size:9pt;padding:4px;'>").append(formatDecimalNumber(CommonUtils.checkNull(item.get("UNIT_PRICE")))).append("</td>");
+				html.append("<td style='border:1px solid #333;text-align:right;font-size:9pt;padding:4px;'>").append(formatDecimalNumber(CommonUtils.checkNull(item.get("AMOUNT")))).append("</td>");
 				html.append("<td ").append(TD_ITEM).append(">").append(escapeHtml(CommonUtils.checkNull(item.get("REMARK")))).append("</td>");
 				html.append("</tr>");
 			}

From 2083986ced7dd17495f621f4e0587a7276fdd9a5 Mon Sep 17 00:00:00 2001
From: hjjeong <hjjeong@wace.me>
Date: Tue, 31 Mar 2026 11:28:02 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=EC=A3=BC=EB=AC=B8=EC=84=9C=EA=B4=80?=
 =?UTF-8?q?=EB=A6=AC=20=EC=88=98=EC=A3=BC=EB=93=B1=EB=A1=9D=ED=99=94?=
 =?UTF-8?q?=EB=A9=B4=20=ED=92=88=EB=AA=A9=20=ED=95=98=EB=8B=A8=20=ED=95=A9?=
 =?UTF-8?q?=EA=B3=84=20=EC=9E=90=EB=8F=99=EA=B3=84=EC=82=B0=20=EC=98=81?=
 =?UTF-8?q?=EC=97=AD=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../contractMgmt/orderRegistFormPopup.jsp     | 47 +++++++++++++++++--
 1 file changed, 44 insertions(+), 3 deletions(-)

diff --git a/WebContent/WEB-INF/view/contractMgmt/orderRegistFormPopup.jsp b/WebContent/WEB-INF/view/contractMgmt/orderRegistFormPopup.jsp
index 419701b..ada99a8 100644
--- a/WebContent/WEB-INF/view/contractMgmt/orderRegistFormPopup.jsp
+++ b/WebContent/WEB-INF/view/contractMgmt/orderRegistFormPopup.jsp
@@ -41,6 +41,14 @@
  	width: 100%;
  	box-sizing: border-box;
  }
+
+ #itemListTable .item-quantity,
+ #itemListTable .item-unit-price,
+ #itemListTable .item-supply-price,
+ #itemListTable .item-vat,
+ #itemListTable .item-total-amount {
+ 	text-align: right;
+ }
 </style>
 <script type="text/javascript">
 	// 품목 관리 변수
@@ -166,7 +174,10 @@
 			
 			// 번호 재정렬
 			fn_reorderItems();
-			
+
+			// 합계 재계산
+			fn_calculateTotal();
+
 			// 품목이 없으면 메시지 표시
 			if($("#itemListBody tr.item-row").length == 0) {
 				$("#itemListBody").html('<tr id="noItemRow"><td colspan="11" style="text-align:center; padding:30px; color:#999;">품목 추가 버튼을 클릭하여 품목을 등록하세요.</td></tr>');
@@ -200,16 +211,33 @@
 		// 총액 계산
 		var totalAmount = supplyPrice + vat;
 		$("#" + itemId + " .item-total-amount").val(addComma(totalAmount));
+		fn_calculateTotal();
 	}
-	
+
 	// 부가세 직접 입력 시 총액만 재계산
 	function fn_calculateTotalFromVat(itemId) {
 		var supplyPrice = parseFloat(removeComma($("#" + itemId + " .item-supply-price").val())) || 0;
 		var vat = parseFloat(removeComma($("#" + itemId + " .item-vat").val())) || 0;
-		
+
 		// 총액 계산
 		var totalAmount = supplyPrice + vat;
 		$("#" + itemId + " .item-total-amount").val(addComma(totalAmount));
+		fn_calculateTotal();
+	}
+
+	// 품목 합계 계산
+	function fn_calculateTotal() {
+		var totalQty = 0, totalSupply = 0, totalVat = 0, totalAmount = 0;
+		$(".item-row").each(function() {
+			totalQty += parseFloat(removeComma($(this).find(".item-quantity").val())) || 0;
+			totalSupply += parseFloat(removeComma($(this).find(".item-supply-price").val())) || 0;
+			totalVat += parseFloat(removeComma($(this).find(".item-vat").val())) || 0;
+			totalAmount += parseFloat(removeComma($(this).find(".item-total-amount").val())) || 0;
+		});
+		$("#totalQuantity").text(addCommaInt(totalQty));
+		$("#totalSupplyPrice").text(addComma(totalSupply));
+		$("#totalVat").text(addComma(totalVat));
+		$("#totalTotalAmount").text(addComma(totalAmount));
 	}
 
 	// 기존 품목 데이터 로드 (결재완료 시 ESTIMATE_TEMPLATE_ITEM, 아니면 CONTRACT_ITEM)
@@ -335,6 +363,8 @@
 							id: itemId
 						});
 					}
+					// 품목 로드 완료 후 합계 계산
+					fn_calculateTotal();
 				}
 			},
 			error: function() {
@@ -537,6 +567,17 @@
 											</td>
 										</tr>
 									</tbody>
+								<tfoot>
+									<tr id="totalRow" style="background:#f5f5f5; font-weight:bold;">
+										<td colspan="5" style="text-align:center; padding:8px; border:1px solid #ddd;">Total</td>
+										<td style="text-align:right; padding:8px; border:1px solid #ddd;" id="totalQuantity">0</td>
+										<td style="padding:8px; border:1px solid #ddd;"></td>
+										<td style="text-align:right; padding:8px; border:1px solid #ddd;" id="totalSupplyPrice">0.00</td>
+										<td style="text-align:right; padding:8px; border:1px solid #ddd;" id="totalVat">0.00</td>
+										<td style="text-align:right; padding:8px; border:1px solid #ddd;" id="totalTotalAmount">0.00</td>
+										<td style="padding:8px; border:1px solid #ddd;"></td>
+									</tr>
+								</tfoot>
 								</table>
 							</div>
 						</td>