From f47b091dca1e2de761097750e7426e9bcdef9d64 Mon Sep 17 00:00:00 2001
From: hjjeong <hjjeong@wace.me>
Date: Sat, 18 Oct 2025 22:51:59 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B2=AC=EC=A0=81=EC=9A=94=EC=B2=AD=EB=93=B1?=
 =?UTF-8?q?=EB=A1=9D=ED=99=94=EB=A9=B4=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../view/contractMgmt/estimateList_new.jsp    |   89 +-
 .../contractMgmt/estimateRegistFormPopup.jsp  | 1011 +++++++++++++++--
 database/contract_item_tables.sql             |  230 ++++
 .../controller/ContractMgmtController.java    |   83 +-
 src/com/pms/salesmgmt/mapper/contractMgmt.xml |  247 +++-
 .../service/ContractMgmtService.java          |  197 ++++
 6 files changed, 1749 insertions(+), 108 deletions(-)
 create mode 100644 database/contract_item_tables.sql

diff --git a/WebContent/WEB-INF/view/contractMgmt/estimateList_new.jsp b/WebContent/WEB-INF/view/contractMgmt/estimateList_new.jsp
index dfdf6c6..b83babe 100644
--- a/WebContent/WEB-INF/view/contractMgmt/estimateList_new.jsp
+++ b/WebContent/WEB-INF/view/contractMgmt/estimateList_new.jsp
@@ -48,7 +48,7 @@ $(document).ready(function(){
 	
 	//영업활동 등록 팝업
 	$(".btnRegist").click(function(){
-		var popup_width = 1000;
+		var popup_width = 1400;
 		var popup_height = 560;	
 		var params = "?actionType=regist"
 		var url = "/contractMgmt/estimateRegistFormPopup.do"+params;
@@ -140,7 +140,8 @@ $(document).ready(function(){
 				return false;
 			}else{
 				if(confirm("결재상신 하시겠습니까?")){
-					var objId = fnc_checkNull(selectedData[0].OBJID);					
+					//var objId = fnc_checkNull(selectedData[0].OBJID);					
+					var objId = fnc_checkNull(selectedData[0].EST_OBJID);
 					var title = encodeURIComponent(fnc_checkNull(selectedData[0].CONTRACT_NO));
 					window.open("/approval/registApproval.do?targetType=CONTRACT_ESTIMATE&targetObjId="+objId+"&approvalTitle="+title,"registApproval","width=700,height=700");
 				}
@@ -194,6 +195,7 @@ $(document).ready(function(){
 });
 
 var columns = [	
+				{title:'EST_OBJID'	,field:'EST_OBJID'		,visible:false},
 				{headerHozAlign : 'center', hozAlign : 'center',	width : '90',		title : '영업번호',	field : 'CONTRACT_NO', frozen:true,	
 					formatter:fnc_createGridAnchorTag,
 					cellClick:function(e, cell){
@@ -203,36 +205,52 @@ var columns = [
 				}, 
 				{headerHozAlign : 'center', hozAlign : 'center',	width : '80',		title : '주문유형',		field : 'CATEGORY_NAME'	}, 
 				{headerHozAlign : 'center', hozAlign : 'center',	width : '80',		title : '제품구분',		field : 'PRODUCT_NAME'	}, 
-				{headerHozAlign : 'center', hozAlign : 'center',	width : '80',		title : '국내/해외',	field : 'AREA_NAME'	}, 
+				{headerHozAlign : 'center', hozAlign : 'center',	width : '88',		title : '국내/해외',	field : 'AREA_NAME'	}, 
 				{headerHozAlign : 'center', hozAlign : 'center',	width : '100',		title : '접수일',		field : 'RECEIPT_DATE'	}, 
 				{headerHozAlign : 'center', hozAlign : 'left',		width : '150',		title : '고객사',		field : 'CUSTOMER_NAME'	}, 
 				{headerHozAlign : 'center', hozAlign : 'center',	width : '80',		title : '유/무상',		field : 'PAID_TYPE'	}, 
-				{headerHozAlign : 'center', hozAlign : 'left',		width : '100',		title : '품번',			field : 'PART_NO'	}, 
-				{headerHozAlign : 'center', hozAlign : 'left',		width : '100',		title : '품명',			field : 'PART_NAME'	}, 
-				{headerHozAlign : 'center', hozAlign : 'center',	width : '150',		title : 'S/N',			field : 'SERIAL_NO',
-					formatter: function(cell, formatterParams, onRendered){
-						var value = fnc_checkNull(cell.getValue());
-						if(value === '') return '';
+//				{headerHozAlign : 'center', hozAlign : 'left',		width : '100',		title : '품번',			field : 'PART_NO'	}, 
+				{headerHozAlign : 'center', hozAlign : 'left',		width : '180',		title : '품명',			field : 'ITEM_SUMMARY'	}, 
+//				{headerHozAlign : 'center', hozAlign : 'center',	width : '150',		title : 'S/N',			field : 'SERIAL_NO',
+//					formatter: function(cell, formatterParams, onRendered){
+//						var value = fnc_checkNull(cell.getValue());
+//						if(value === '') return '';
+//						
+//						// 쉼표로 구분된 S/N 개수 계산
+//						var serialNumbers = value.split(',').map(function(s){ return s.trim(); }).filter(function(s){ return s !== ''; });
+//						var count = serialNumbers.length;
 						
-						// 쉼표로 구분된 S/N 개수 계산
-						var serialNumbers = value.split(',').map(function(s){ return s.trim(); }).filter(function(s){ return s !== ''; });
-						var count = serialNumbers.length;
-						
-						if(count === 0) return '';
-						if(count === 1) return '<a href="javascript:void(0);">' + serialNumbers[0] + '</a>';
+//						if(count === 0) return '';
+//						if(count === 1) return '<a href="javascript:void(0);">' + serialNumbers[0] + '</a>';
 						
 						// 2개 이상이면 "첫번째 외 N개" 형식
-						var displayText = serialNumbers[0] + ' 외 ' + (count - 1) + '개';
-						return '<a href="javascript:void(0);">' + displayText + '</a>';
-					},
-					cellClick:function(e, cell){
-						var serialNo = fnc_checkNull(cell.getData().SERIAL_NO);
-						fn_showSerialNoPopup(serialNo);
+//						var displayText = serialNumbers[0] + ' 외 ' + (count - 1) + '개';
+//						return '<a href="javascript:void(0);">' + displayText + '</a>';
+//					},
+//					cellClick:function(e, cell){
+//						var serialNo = fnc_checkNull(cell.getData().SERIAL_NO);
+//						fn_showSerialNoPopup(serialNo);
+//					}
+//				},
+//				{headerHozAlign : 'center', hozAlign : 'center',	width : '80',		title : '수량',			field : 'QUANTITY'	},   
+				{headerHozAlign : 'center', hozAlign : 'center',	width : '120',		title : '요청납기',		field : 'EARLIEST_DUE_DATE',
+					formatter: function(cell, formatterParams, onRendered){
+						var dueDate = fnc_checkNull(cell.getValue());
+						var otherCount = fnc_checkNull(cell.getData().OTHER_DUE_DATE_COUNT);
+						
+						if(dueDate === '') return '';
+						
+						// 다른 납기가 있으면 "날짜 외 N건" 형식으로 표시
+						if(otherCount && parseInt(otherCount) > 0){
+							return dueDate + ' 외 ' + otherCount + '건';
+						}
+						
+						return dueDate;
 					}
-				},
-				{headerHozAlign : 'center', hozAlign : 'center',	width : '80',		title : '수량',			field : 'QUANTITY'	},   
-				{headerHozAlign : 'center', hozAlign : 'center',	width : '100',		title : '요청납기',		field : 'DUE_DATE'	}, 
-				{headerHozAlign : 'center', hozAlign : 'left',		width : '150',		title : '고객요청사항',	field : 'CUSTOMER_REQUEST'	}, 
+				}, 
+				{headerHozAlign : 'center', hozAlign : 'left',		width : '120',		title : '반납사유',		field : 'RETURN_REASON_SUMMARY'	}, 
+//				{headerHozAlign : 'center', hozAlign : 'left',		width : '150',		title : '고객요청사항',	field : 'CUSTOMER_REQUEST'	}, 
+
 				{headerHozAlign : 'center', hozAlign : 'center',	width : '80',		title : '견적현황',		field : 'EST_STATUS',
 					formatter:fnc_subInfoValueFormatter,
 					cellClick:function(e, cell){
@@ -269,10 +287,15 @@ var columns = [
 //					}
 				}
 			}, 
-				{headerHozAlign : 'center', hozAlign : 'center',	width : '100',		title : '견적단가',		field : 'EST_PRICE'	}, 
-				{headerHozAlign : 'center', hozAlign : 'center',	width : '100',		title : '견적공급가액',	field : 'EST_SUPPLY_PRICE'	}, 
-				{headerHozAlign : 'center', hozAlign : 'center',	width : '80',		title : '환종',		field : 'CONTRACT_CURRENCY_NAME'	}, 
-				{headerHozAlign : 'center', hozAlign : 'center',	width : '80',		title : '환율',		field : 'EXCHANGE_RATE'	}, 
+//				{headerHozAlign : 'center', hozAlign : 'center',	width : '100',		title : '견적단가',		field : 'EST_PRICE'	}, 
+				{headerHozAlign : 'center', hozAlign : 'center',	width : '130',		title : '견적공급가액',	 field : 'EST_SUPPLY_PRICE',
+					formatter:"money", formatterParams:{thousand:",", symbolAfter:"p", precision:false,},	
+				}, 
+				{headerHozAlign : 'center', hozAlign : 'center',	width : '150',		title : '견적원화환산공급가액',	 field : 'EXC_EST_SUPPLY_PRICE',
+					formatter:"money", formatterParams:{thousand:",", symbolAfter:"p", precision:false,},	
+				}, 
+				{headerHozAlign : 'center', hozAlign : 'center',	width : '80',		title : '견적환종',		field : 'CONTRACT_CURRENCY_NAME'	}, 
+				{headerHozAlign : 'center', hozAlign : 'center',	width : '80',		title : '견적환율',		field : 'EXCHANGE_RATE'	}, 
 
 				// {title:"영업정보(상세)", headerHozAlign:'center',	    //고객정보
 				//        columns:[
@@ -422,7 +445,7 @@ function fn_FileRegist(objId, docType, docTypeName){
 }
 //영업활동등록 상세
 function fn_projectConceptDetail(objId){
-	var popup_width = 1000;
+	var popup_width = 1400;
 	var popup_height = 560;		
 	var url = "/contractMgmt/estimateRegistFormPopup.do?objId="+objId;
 
@@ -764,9 +787,9 @@ function openProjectFormPopUp(objId){
 		                <div class="btnArea">
 							<input type="button" value="조회" 		class="plm_btns" id="btnSearch" name="btnSearch">
 		                	<input type="button" value="삭제" 		class="plm_btns" id="btnDelete">
-		                    <input type="button" value="견적요청등록" class="plm_btns btnRegist">		                    
-		                    <input type="button" value="결재상신"	 class="plm_btns" id="btnApproval">
-							<input type="button" value="견적작성"	 class="plm_btns" id="btnEstimate">
+		                    <input type="button" value="견적요청등록" class="plm_btns btnRegist">		   
+							<input type="button" value="견적작성"	 class="plm_btns" id="btnEstimate">                 
+		                    <input type="button" value="결재상신"	 class="plm_btns" id="btnApproval">						
 							<input type="button" value="메일발송"	 class="plm_btns" id="btnMail">
 		                    <!-- <input type="button" value="Excel Download" class="plm_btns" id="btnExcel">
 							<input type="button" value="고객등록" class="plm_btns supplyMng create"> -->
diff --git a/WebContent/WEB-INF/view/contractMgmt/estimateRegistFormPopup.jsp b/WebContent/WEB-INF/view/contractMgmt/estimateRegistFormPopup.jsp
index 21a8a16..b65a108 100644
--- a/WebContent/WEB-INF/view/contractMgmt/estimateRegistFormPopup.jsp
+++ b/WebContent/WEB-INF/view/contractMgmt/estimateRegistFormPopup.jsp
@@ -38,6 +38,12 @@
  }
 </style>
 <script type="text/javascript">
+	// 품목 관리 변수
+	var itemCounter = 1;
+	var itemList = [];
+	
+	// 품번 데이터는 AJAX로 검색하므로 초기 데이터 없음
+	
 	$(function() {
 		//alert("${info.CATEGORY_CD}")
 		if("${info.CATEGORY_CD}" == '0000170' || "${info.CATEGORY_CD}" == '0000171'){//오버홀, 개조
@@ -89,6 +95,14 @@
 		});
 
 		$('.select2').select2();
+		
+		// 품목 추가 버튼
+		$("#btnAddItem").click(function() {
+			fn_addItemRow();
+		});
+		
+		// 기존 품목 데이터 로드
+		fn_loadExistingItems();
 
 		//첨부파일 - 주석처리
 		//fnc_setFileDropZone("contractMgmt01DropZone", "${objId}", "contractMgmt01", "contractMgmt01", "fileAreaDraw",false,null,null);
@@ -264,6 +278,11 @@
 
 	function fn_save() {
 		if (fnc_valitate("form1")) {
+			// 품목 유효성 검사
+			if(!fn_validateItems()) {
+				return false;
+			}
+			
 			if(fn_overlapOrder()){
 				var message = "수정";
 				if ("${actionType}" == 'regist') {
@@ -271,22 +290,29 @@
 				}
 				if (confirm(message + "하시겠습니까?")) {
 					$("#category_cd,#area_cd,#target_project_no,#customer_objid,#product,#contract_result,#overhaul_order").prop("disabled","");
-					// $("#facility_qty").val(
-					// 		$("#facility_qty").val().replace(/,/gi, ""));
-					// $("#contract_price").val(
-					// 		$("#contract_price").val().replace(/,/gi, ""));
-					// $("#contract_price_currency").val(
-					// 		$("#contract_price_currency").val().replace(/,/gi, ""));
-					// 날짜 - 제거
-					/* 		var $dateinput = $("input.date_icon");
-					for(var i=0; i<$dateinput.length; i++){
-						$dateinput.eq(i).val( $dateinput.eq(i).val().replace(/-/gi,"") );
-					} */
+					
+					// 저장 직전 S/N 확인
+					console.log("=== 저장 시작 ===");
+					$(".item-row").each(function(index) {
+						var itemId = $(this).attr("id");
+						var snListValue = $("#" + itemId + "_sn_list").val();
+						console.log("품목 " + (index+1) + " (" + itemId + ") S/N:", snListValue);
+					});
+					
+					// 품목 데이터 수집
+					var itemsData = fn_collectItemsData();
+					console.log("최종 전송 데이터:", JSON.stringify(itemsData, null, 2));
+					
+					// 기본 폼 데이터
+					var formData = $("#form1").serialize();
+					
+					// 품목 데이터를 JSON 문자열로 추가
+					formData += "&items_json=" + encodeURIComponent(JSON.stringify(itemsData));
 	
 					$.ajax({
 						url : "/contractMgmt/saveContractMgmtInfo.do",
 						type : "POST",
-						data : $("#form1").serialize(),
+						data : formData,
 						dataType : "json",
 						success : function(data) {
 							alert(data.msg);
@@ -294,12 +320,219 @@
 							self.close();
 						},
 						error : function(jqxhr, status, error) {
+							alert("저장 중 오류가 발생했습니다.");
 						}
 					});
 				}
 			}
 		}
 	}
+	
+	// 품목 유효성 검사
+	function fn_validateItems() {
+		var itemRows = $(".item-row");
+		
+		if(itemRows.length == 0) {
+			alert("최소 1개 이상의 품목을 등록해주세요.");
+			return false;
+		}
+		
+		for(var i = 0; i < itemRows.length; i++) {
+			var $row = $(itemRows[i]);
+			var partObjId = $row.find(".item-part-objid").val(); // hidden 필드에서 가져오기
+			var quantity = $row.find(".item-quantity").val().replace(/,/g, "").trim();
+			
+			if(!partObjId || partObjId == "") {
+				alert((i+1) + "번째 품목의 품번을 선택해주세요.");
+				$row.find(".item-part-no-select").focus();
+				return false;
+			}
+			
+			if(quantity == "" || quantity == "0") {
+				alert((i+1) + "번째 품목의 수량을 입력해주세요.");
+				$row.find(".item-quantity").focus();
+				return false;
+			}
+		}
+		
+		return true;
+	}
+	
+	// 품목 데이터 수집
+	function fn_collectItemsData() {
+		var items = [];
+		var itemRows = $(".item-row");
+		
+		itemRows.each(function(index) {
+			var $row = $(this);
+			var itemId = $row.attr("id");
+			
+			// S/N 목록 가져오기
+			var snListStr = $("#" + itemId + "_sn_list").val();
+			var snList = [];
+			if(snListStr && snListStr.trim() != "") {
+				try {
+					snList = JSON.parse(snListStr);
+				} catch(e) {
+					console.error("품목 " + (index+1) + " S/N 파싱 실패:", e);
+					snList = [];
+				}
+			}
+			
+			var item = {
+				partObjId: $row.find(".item-part-objid").val(),
+				partNo: $row.find(".item-part-no").val() ? $row.find(".item-part-no").val().trim() : "",
+				partName: $row.find(".item-part-name").val() ? $row.find(".item-part-name").val().trim() : "",
+				quantity: $row.find(".item-quantity").val().replace(/,/g, "").trim(),
+				dueDate: $row.find(".item-due-date").val().trim(),
+				customerRequest: $row.find(".item-customer-request").val().trim(),
+				returnReason: $row.find(".item-return-reason").val().trim(),
+				snList: snList
+			};
+			
+			items.push(item);
+		});
+		
+		return items;
+	}
+	
+	// 기존 품목 데이터 로드
+	function fn_loadExistingItems() {
+		<%
+		@SuppressWarnings("unchecked")
+		List<Map<String, Object>> itemList = (List<Map<String, Object>>) request.getAttribute("itemList");
+		if(itemList != null && itemList.size() > 0) {
+			for(int i = 0; i < itemList.size(); i++) {
+				Map<String, Object> item = itemList.get(i);
+				
+				// S/N 목록 가져오기
+				@SuppressWarnings("unchecked")
+				List<Map<String, Object>> snList = (List<Map<String, Object>>) item.get("SN_LIST");
+				
+				String snListJson = "[]";
+				if(snList != null && snList.size() > 0) {
+					StringBuilder sb = new StringBuilder("[");
+					for(int j = 0; j < snList.size(); j++) {
+						Map<String, Object> sn = snList.get(j);
+						
+						// SEQ와 SERIAL_NO를 대소문자 모두 시도
+						Object seqObj = sn.get("SEQ");
+						if(seqObj == null) seqObj = sn.get("seq");
+						if(seqObj == null) seqObj = sn.get("Seq");
+						
+						Object serialNoObj = sn.get("SERIAL_NO");
+						if(serialNoObj == null) serialNoObj = sn.get("serial_no");
+						if(serialNoObj == null) serialNoObj = sn.get("serialNo");
+						if(serialNoObj == null) serialNoObj = sn.get("SERIALNO");
+						
+						if(j > 0) sb.append(",");
+						sb.append("{");
+						sb.append("\"id\":").append(seqObj != null ? seqObj : "null").append(",");
+						sb.append("\"value\":\"").append(CommonUtils.checkNull(serialNoObj != null ? serialNoObj.toString() : "")).append("\"");
+						sb.append("}");
+					}
+					sb.append("]");
+					snListJson = sb.toString();
+				}
+		%>
+		// 품목 행 추가 - 품목 <%= i %>
+		(function() {
+			var itemId = 'item_' + itemCounter++;
+			// 대소문자 모두 시도
+			var savedPartObjId = "<%= item.get("PART_OBJID") != null ? item.get("PART_OBJID") : (item.get("part_objid") != null ? item.get("part_objid") : "") %>";
+			var savedPartNo = "<%= item.get("PART_NO") != null ? item.get("PART_NO") : (item.get("part_no") != null ? item.get("part_no") : "") %>";
+			var savedPartName = "<%= item.get("PART_NAME") != null ? item.get("PART_NAME") : (item.get("part_name") != null ? item.get("part_name") : "") %>";
+			// JSON 데이터를 안전하게 전달
+			var snJsonData = <%= snListJson %>;
+			
+			$("#noItemRow").hide();
+			
+			var html = '<tr id="' + itemId + '" class="item-row">';
+			html += '<td style="text-align:center; padding:5px; border:1px solid #ddd;">' + (itemCounter-1) + '</td>';
+			
+			// 품번 셀렉트박스
+			html += '<td style="padding:5px; border:1px solid #ddd;">';
+			html += '<select name="item_part_no_select[]" id="PART_NO_' + itemId + '" class="item-part-no-select" style="width:100%;" required>';
+			html += '<option value="">선택</option>';
+			html += '</select>';
+			html += '<input type="hidden" name="item_part_objid[]" class="item-part-objid" value="' + savedPartObjId + '" />';
+			html += '<input type="hidden" name="item_part_no[]" class="item-part-no" value="' + savedPartNo + '" />';
+			html += '</td>';
+			
+			// 품명 셀렉트박스
+			html += '<td style="padding:5px; border:1px solid #ddd;">';
+			html += '<select name="item_part_name_select[]" id="PART_NAME_' + itemId + '" class="item-part-name-select" style="width:100%;" required>';
+			html += '<option value="">선택</option>';
+			html += '</select>';
+			html += '<input type="hidden" name="item_part_name[]" class="item-part-name" value="' + savedPartName + '" />';
+			html += '</td>';
+			
+			// S/N, 수량, 납기일, 고객요청사항, 반납사유 - 대소문자 처리
+			var serialNos = "<%= item.get("SERIAL_NOS") != null ? item.get("SERIAL_NOS") : (item.get("serial_nos") != null ? item.get("serial_nos") : "") %>";
+			var quantity = "<%= item.get("QUANTITY") != null ? item.get("QUANTITY") : (item.get("quantity") != null ? item.get("quantity") : "") %>";
+			var dueDate = "<%= item.get("DUE_DATE") != null ? item.get("DUE_DATE") : (item.get("due_date") != null ? item.get("due_date") : "") %>";
+			var customerRequest = "<%= item.get("CUSTOMER_REQUEST") != null ? item.get("CUSTOMER_REQUEST") : (item.get("customer_request") != null ? item.get("customer_request") : "") %>";
+			var returnReason = "<%= item.get("RETURN_REASON") != null ? item.get("RETURN_REASON") : (item.get("return_reason") != null ? item.get("return_reason") : "") %>";
+			
+			html += '<td style="padding:5px; border:1px solid #ddd;">';
+			html += '<input type="text" name="item_serial_no[]" class="item-serial-no" placeholder="클릭하여 S/N 추가" readonly style="width:95%; padding:5px; cursor:pointer; background-color:#f8f9fa;" onclick="fn_openItemSnPopup(\'' + itemId + '\')" value="' + serialNos + '" />';
+			html += '<input type="hidden" name="item_serial_no_list[]" id="' + itemId + '_sn_list" value="" />';
+			html += '</td>';
+			html += '<td style="padding:5px; border:1px solid #ddd;">';
+			html += '<input type="text" name="item_quantity[]" class="item-quantity" style="width:90%; padding:5px;" value="' + quantity + '" required numberOnly />';
+			html += '</td>';
+			html += '<td style="padding:5px; border:1px solid #ddd;">';
+			html += '<input type="text" name="item_due_date[]" class="item-due-date date_icon" style="width:90%; padding:5px;" value="' + dueDate + '" />';
+			html += '</td>';
+			html += '<td style="padding:5px; border:1px solid #ddd;">';
+			html += '<input type="text" name="item_customer_request[]" class="item-customer-request" style="width:95%; padding:5px;" value="' + customerRequest + '" />';
+			html += '</td>';
+			html += '<td style="padding:5px; border:1px solid #ddd;">';
+			html += '<input type="text" name="item_return_reason[]" class="item-return-reason" style="width:95%; padding:5px;" value="' + returnReason + '" />';
+			html += '</td>';
+			html += '<td style="text-align:center; padding:5px; border:1px solid #ddd;">';
+			html += '<button type="button" onclick="fn_deleteItemRow(\'' + itemId + '\')" class="plm_btns" style="padding:5px 10px; font-size:12px;">삭제</button>';
+			html += '</td>';
+			html += '</tr>';
+			
+			$("#itemListBody").append(html);
+			
+			// S/N 데이터 설정 - JSON 객체를 문자열로 변환하여 저장
+			var snJsonString = JSON.stringify(snJsonData);
+			
+			// DOM이 완전히 준비된 후 값 설정
+			setTimeout(function() {
+				$("#" + itemId + "_sn_list").val(snJsonString);
+			}, 10);
+			
+			// 품번/품명 옵션 채우기 (저장된 품번/품명도 함께 전달)
+			fn_fillPartOptions(itemId, savedPartObjId, savedPartNo, savedPartName);
+			
+			// datepicker 적용
+			$("#" + itemId + " .date_icon").datepicker({
+				changeMonth: true,
+				changeYear: true
+			});
+			
+			// 숫자만 입력 처리 및 콤마 추가
+			$("#" + itemId + " .item-quantity").on("keyup", function() {
+				$(this).val(addComma($(this).val().replace(/[^0-9]/g, "")));
+			});
+			// 이미 저장된 수량에 콤마 추가
+			var qtyInput = $("#" + itemId + " .item-quantity");
+			qtyInput.val(addComma(qtyInput.val()));
+			
+			// 품목 정보 저장
+			itemList.push({
+				id: itemId,
+				snList: snJsonData
+			});
+		})();
+		<%
+			}
+		}
+		%>
+	}
 
 	function _fnc_datepick() {
 		var $dateinput = $("input.date_icon");
@@ -897,6 +1130,622 @@
 		}
 	}
 	
+	// ========== 품목 관리 함수 ==========
+	
+	// 품목 행 추가
+	function fn_addItemRow() {
+		var itemId = 'item_' + itemCounter++;
+		
+		// "품목 추가하세요" 메시지 행 제거
+		$("#noItemRow").hide();
+		
+		var html = '<tr id="' + itemId + '" class="item-row">';
+		html += '<td style="text-align:center; padding:5px; border:1px solid #ddd;">' + (itemCounter-1) + '</td>';
+		
+		// 품번 셀렉트박스
+		html += '<td style="padding:5px; border:1px solid #ddd;">';
+		html += '<select name="item_part_no_select[]" id="PART_NO_' + itemId + '" class="item-part-no-select" style="width:100%;" required>';
+		html += '<option value="">선택</option>';
+		html += '</select>';
+		html += '<input type="hidden" name="item_part_objid[]" class="item-part-objid" />';
+		html += '<input type="hidden" name="item_part_no[]" class="item-part-no" />';
+		html += '</td>';
+		
+		// 품명 셀렉트박스
+		html += '<td style="padding:5px; border:1px solid #ddd;">';
+		html += '<select name="item_part_name_select[]" id="PART_NAME_' + itemId + '" class="item-part-name-select" style="width:100%;" required>';
+		html += '<option value="">선택</option>';
+		html += '</select>';
+		html += '<input type="hidden" name="item_part_name[]" class="item-part-name" />';
+		html += '</td>';
+		
+		html += '<td style="padding:5px; border:1px solid #ddd;">';
+		html += '<input type="text" name="item_serial_no[]" class="item-serial-no" placeholder="클릭하여 S/N 추가" readonly style="width:95%; padding:5px; cursor:pointer; background-color:#f8f9fa;" onclick="fn_openItemSnPopup(\'' + itemId + '\')" />';
+		html += '<input type="hidden" name="item_serial_no_list[]" id="' + itemId + '_sn_list" value="" />';
+		html += '</td>';
+		html += '<td style="padding:5px; border:1px solid #ddd;">';
+		html += '<input type="text" name="item_quantity[]" class="item-quantity" style="width:90%; padding:5px;" required numberOnly />';
+		html += '</td>';
+		html += '<td style="padding:5px; border:1px solid #ddd;">';
+		html += '<input type="text" name="item_due_date[]" class="item-due-date date_icon" style="width:90%; padding:5px;" />';
+		html += '</td>';
+		html += '<td style="padding:5px; border:1px solid #ddd;">';
+		html += '<input type="text" name="item_customer_request[]" class="item-customer-request" style="width:95%; padding:5px;" />';
+		html += '</td>';
+		html += '<td style="padding:5px; border:1px solid #ddd;">';
+		html += '<input type="text" name="item_return_reason[]" class="item-return-reason" style="width:95%; padding:5px;" />';
+		html += '</td>';
+		html += '<td style="text-align:center; padding:5px; border:1px solid #ddd;">';
+		html += '<button type="button" onclick="fn_deleteItemRow(\'' + itemId + '\')" class="plm_btns" style="padding:5px 10px; font-size:12px;">삭제</button>';
+		html += '</td>';
+		html += '</tr>';
+		
+		$("#itemListBody").append(html);
+		
+		// 품번/품명 옵션 채우기 (신규 추가)
+		fn_fillPartOptions(itemId, null, null, null);
+		
+		// 추가된 행의 날짜 필드에 datepicker 적용
+		$("#" + itemId + " .date_icon").datepicker({
+			changeMonth: true,
+			changeYear: true
+		});
+		
+		// 숫자만 입력 처리
+		$("#" + itemId + " .item-quantity").on("keyup", function() {
+			$(this).val(addComma($(this).val().replace(/[^0-9]/g, "")));
+		});
+		
+		// 품목 정보 저장
+		itemList.push({
+			id: itemId,
+			snList: []
+		});
+	}
+	
+	// 품번/품명 셀렉트박스 옵션 채우기 (Select2 AJAX)
+	function fn_fillPartOptions(itemId, selectedObjId, savedPartNo, savedPartName) {
+		var $partNoSelect = $("#PART_NO_" + itemId);
+		var $partNameSelect = $("#PART_NAME_" + itemId);
+		
+		// null 문자열 체크
+		if(selectedObjId === "null" || !selectedObjId) selectedObjId = null;
+		if(savedPartNo === "null" || !savedPartNo) savedPartNo = null;
+		if(savedPartName === "null" || !savedPartName) savedPartName = null;
+		
+		// partObjId는 있는데 partNo/partName이 없는 경우 -> DB에서 조회
+		if(selectedObjId && (!savedPartNo || !savedPartName)) {
+			console.log("품번/품명 정보 없음. OBJID로 조회:", selectedObjId);
+			$.ajax({
+				url: '/contractMgmt/searchPartList.do',
+				type: 'POST',
+				data: { partObjId: selectedObjId },
+				async: false, // 동기 처리
+				success: function(data) {
+					if(data && data.length > 0) {
+						var part = data[0];
+						savedPartNo = part.PART_NO || part.part_no;
+						savedPartName = part.PART_NAME || part.part_name;
+						console.log("조회된 품번/품명:", savedPartNo, savedPartName);
+					}
+				},
+				error: function() {
+					console.error("품번/품명 조회 실패");
+				}
+			});
+		}
+		
+		// 품번 Select2 AJAX 설정
+		$partNoSelect.select2({
+			placeholder: "품번 입력하여 검색...",
+			allowClear: true,
+			width: '100%',
+			minimumInputLength: 1, // 최소 1글자 입력해야 검색
+			language: {
+				inputTooShort: function() {
+					return "최소 1글자 이상 입력하세요";
+				},
+				searching: function() {
+					return "검색 중...";
+				},
+				noResults: function() {
+					return "검색 결과가 없습니다";
+				}
+			},
+			ajax: {
+				url: '/contractMgmt/searchPartList.do',
+				dataType: 'json',
+				type: 'POST',
+				contentType: 'application/x-www-form-urlencoded; charset=UTF-8',
+				delay: 250, // 입력 후 250ms 대기
+				data: function(params) {
+					return {
+						searchTerm: params.term // 검색어
+					};
+				},
+				processResults: function(data) {
+					console.log("품번 검색 결과:", data);
+					if(data && data.length > 0) {
+						console.log("첫번째 항목:", data[0]);
+					}
+					
+					// 서버 응답을 Select2 형식으로 변환 (대소문자 모두 확인)
+					var results = $.map(data, function(item) {
+						var objId = item.OBJID || item.objid || item.objId;
+						var partNo = item.PART_NO || item.part_no || item.partNo;
+						var partName = item.PART_NAME || item.part_name || item.partName;
+						
+						return {
+							id: objId,
+							text: partNo,
+							partName: partName,
+							partNo: partNo
+						};
+					});
+					
+					console.log("변환된 결과:", results);
+					
+					return {
+						results: results
+					};
+				},
+				cache: true
+			}
+		});
+		
+		// 품명 Select2 AJAX 설정
+		$partNameSelect.select2({
+			placeholder: "품명 입력하여 검색...",
+			allowClear: true,
+			width: '100%',
+			minimumInputLength: 1,
+			language: {
+				inputTooShort: function() {
+					return "최소 1글자 이상 입력하세요";
+				},
+				searching: function() {
+					return "검색 중...";
+				},
+				noResults: function() {
+					return "검색 결과가 없습니다";
+				}
+			},
+			ajax: {
+				url: '/contractMgmt/searchPartList.do',
+				dataType: 'json',
+				type: 'POST',
+				contentType: 'application/x-www-form-urlencoded; charset=UTF-8',
+				delay: 250,
+				data: function(params) {
+					return {
+						searchTerm: params.term
+					};
+				},
+				processResults: function(data) {
+					console.log("품명 검색 결과:", data);
+					if(data && data.length > 0) {
+						console.log("첫번째 항목:", data[0]);
+					}
+					
+					var results = $.map(data, function(item) {
+						var objId = item.OBJID || item.objid || item.objId;
+						var partNo = item.PART_NO || item.part_no || item.partNo;
+						var partName = item.PART_NAME || item.part_name || item.partName;
+						
+						return {
+							id: objId,
+							text: partName,
+							partName: partName,
+							partNo: partNo
+						};
+					});
+					
+					console.log("변환된 결과:", results);
+					
+					return {
+						results: results
+					};
+				},
+				cache: true
+			}
+		});
+		
+		// 품번 변경 이벤트
+		$partNoSelect.off('change').on('change', function() {
+			var selectedData = $(this).select2('data')[0];
+			
+			if(selectedData && selectedData.id) {
+				// 무한루프 방지
+				$partNameSelect.data('syncing', true);
+				
+				// 품명 셀렉트박스에 옵션이 없으면 추가
+				if($partNameSelect.find("option[value='" + selectedData.id + "']").length === 0) {
+					var newOption = new Option(selectedData.partName, selectedData.id, true, true);
+					$(newOption).data('partNo', selectedData.partNo);
+					$partNameSelect.append(newOption);
+				}
+				
+				// 품명 셀렉트박스 값 설정
+				$partNameSelect.val(selectedData.id).trigger('change.select2');
+				
+				// hidden 필드에 값 설정
+				var $row = $("#" + itemId);
+				$row.find(".item-part-objid").val(selectedData.id);
+				$row.find(".item-part-no").val(selectedData.partNo);
+				$row.find(".item-part-name").val(selectedData.partName);
+				
+				console.log("품번 선택 후 hidden 필드 설정:", {
+					itemId: itemId,
+					partObjId: $row.find(".item-part-objid").val(),
+					partNo: $row.find(".item-part-no").val(),
+					partName: $row.find(".item-part-name").val()
+				});
+				
+				setTimeout(function() {
+					$partNameSelect.data('syncing', false);
+				}, 100);
+			}
+		});
+		
+		// 품명 변경 이벤트
+		$partNameSelect.off('change').on('change', function() {
+			// 무한루프 방지
+			if($(this).data('syncing')) return;
+			
+			var selectedData = $(this).select2('data')[0];
+			
+			if(selectedData && selectedData.id) {
+				// 무한루프 방지
+				$partNoSelect.data('syncing', true);
+				
+				// 품번 셀렉트박스에 옵션이 없으면 추가
+				if($partNoSelect.find("option[value='" + selectedData.id + "']").length === 0) {
+					var newOption = new Option(selectedData.partNo, selectedData.id, true, true);
+					$(newOption).data('partName', selectedData.partName);
+					$partNoSelect.append(newOption);
+				}
+				
+				// 품번 셀렉트박스 값 설정
+				$partNoSelect.val(selectedData.id).trigger('change.select2');
+				
+				// hidden 필드에 값 설정
+				var $row = $("#" + itemId);
+				$row.find(".item-part-objid").val(selectedData.id);
+				$row.find(".item-part-no").val(selectedData.partNo);
+				$row.find(".item-part-name").val(selectedData.partName);
+				
+				console.log("품명 선택 후 hidden 필드 설정:", {
+					itemId: itemId,
+					partObjId: $row.find(".item-part-objid").val(),
+					partNo: $row.find(".item-part-no").val(),
+					partName: $row.find(".item-part-name").val()
+				});
+				
+				setTimeout(function() {
+					$partNoSelect.data('syncing', false);
+				}, 100);
+			}
+		});
+		
+		// 기존 선택값이 있으면 로드 (수정 모드)
+		console.log("기존 데이터 로드 체크:", {objId: selectedObjId, partNo: savedPartNo, partName: savedPartName});
+		
+		if(selectedObjId && savedPartNo && savedPartName) {
+			console.log("기존 데이터 로드 실행");
+			
+			// Select2 초기화 전에 옵션 추가
+			var partNoOption = new Option(savedPartNo, selectedObjId, true, true);
+			$partNoSelect.append(partNoOption);
+			
+			var partNameOption = new Option(savedPartName, selectedObjId, true, true);
+			$partNameSelect.append(partNameOption);
+			
+			// hidden 필드에도 직접 값 설정 (이벤트 트리거 없이)
+			$("#" + itemId + " .item-part-objid").val(selectedObjId);
+			$("#" + itemId + " .item-part-no").val(savedPartNo);
+			$("#" + itemId + " .item-part-name").val(savedPartName);
+			
+			// Select2 수동 업데이트 (무한루프 방지 플래그 설정)
+			$partNoSelect.data('syncing', true);
+			$partNameSelect.data('syncing', true);
+			
+			$partNoSelect.trigger('change');
+			$partNameSelect.trigger('change');
+			
+			setTimeout(function() {
+				$partNoSelect.data('syncing', false);
+				$partNameSelect.data('syncing', false);
+			}, 100);
+		} else {
+			console.log("기존 데이터 없음 - 신규 등록");
+		}
+	}
+	
+	
+	// 품목 행 삭제
+	function fn_deleteItemRow(itemId) {
+		if(confirm("해당 품목을 삭제하시겠습니까?")) {
+			$("#" + itemId).remove();
+			
+			// itemList에서 제거
+			for(var i = 0; i < itemList.length; i++) {
+				if(itemList[i].id == itemId) {
+					itemList.splice(i, 1);
+					break;
+				}
+			}
+			
+			// 행 번호 재정렬
+			fn_reorderItemRows();
+			
+			// 모든 행이 삭제되면 안내 메시지 표시
+			if($(".item-row").length == 0) {
+				$("#noItemRow").show();
+			}
+		}
+	}
+	
+	// 품목 행 번호 재정렬
+	function fn_reorderItemRows() {
+		$(".item-row").each(function(index) {
+			$(this).find("td:first").text(index + 1);
+		});
+	}
+	
+	// 품목별 S/N 관리 팝업
+	var currentItemId = '';
+	var currentItemSnList = [];
+	var itemSnCounter = 1;
+	
+	function fn_openItemSnPopup(itemId) {
+		currentItemId = itemId;
+		
+		// 해당 품목의 S/N 목록 로드
+		var snListValue = $("#" + itemId + "_sn_list").val();
+		currentItemSnList = [];
+		
+		if(snListValue && snListValue.trim() != '') {
+			try {
+				currentItemSnList = JSON.parse(snListValue);
+				if(currentItemSnList.length > 0) {
+					var maxId = Math.max.apply(Math, currentItemSnList.map(function(item) { return item.id; }));
+					itemSnCounter = maxId + 1;
+				}
+			} catch(e) {
+				currentItemSnList = [];
+			}
+		}
+		
+		// 팝업 HTML 생성
+		var popupHtml = '<div style="padding:10px; color:#333;">';
+		popupHtml += '	<h3 style="margin:0 0 15px 0; text-align:center; color:#333;">S/N 관리</h3>';
+		popupHtml += '	<div id="itemSnListContainer" style="margin-bottom:15px; max-height:300px; overflow-y:auto; color:#333;"></div>';
+		popupHtml += '	<div style="margin-bottom:15px; display:flex; gap:5px;">';
+		popupHtml += '		<input type="text" id="newItemSnInput" placeholder="S/N 입력" style="flex:1; padding:8px; border:1px solid #ddd; border-radius:4px; color:#333;">';
+		popupHtml += '		<button type="button" onclick="fn_addItemSn()" class="plm_btns">추가</button>';
+		popupHtml += '	</div>';
+		popupHtml += '	<div style="text-align:center; margin-top:20px; display:flex; gap:10px; justify-content:center;">';
+		popupHtml += '		<button type="button" onclick="fn_openItemSequentialSnPopup()" class="plm_btns">연속번호생성</button>';
+		popupHtml += '		<button type="button" onclick="fn_confirmItemSnList()" class="plm_btns">확인</button>';
+		popupHtml += '		<button type="button" onclick="fn_closeItemSnPopup()" class="plm_btns">취소</button>';
+		popupHtml += '	</div>';
+		popupHtml += '</div>';
+		
+		// 팝업 오픈
+		Swal.fire({
+			html: popupHtml,
+			width: '700px',
+			showConfirmButton: false,
+			showCloseButton: true,
+			customClass: {
+				popup: 'sn-manage-popup'
+			},
+			onOpen: function() {
+				setTimeout(function() {
+					fn_renderItemSnList();
+					// 엔터키로 추가
+					$(".swal2-html-container #newItemSnInput").keypress(function(e) {
+						if(e.which == 13) {
+							fn_addItemSn();
+							return false;
+						}
+					});
+				}, 50);
+			}
+		});
+	}
+	
+	// 품목 S/N 목록 렌더링
+	function fn_renderItemSnList() {
+		var html = '<table style="width:100%; margin-bottom:10px; border-collapse:collapse; border:1px solid #ddd; color:#333;">';
+		html += '<colgroup><col width="15%"><col width="65%"><col width="20%"></colgroup>';
+		html += '<thead><tr style="background:#f5f5f5; color:#333;">';
+		html += '<th style="padding:10px; border:1px solid #ddd; text-align:center; color:#333;">번호</th>';
+		html += '<th style="padding:10px; border:1px solid #ddd; text-align:center; color:#333;">S/N</th>';
+		html += '<th style="padding:10px; border:1px solid #ddd; text-align:center; color:#333;">삭제</th>';
+		html += '</tr></thead>';
+		html += '<tbody>';
+		
+		if(currentItemSnList.length == 0) {
+			html += '<tr><td colspan="3" style="text-align:center; padding:30px; color:#999; border:1px solid #ddd;">등록된 S/N이 없습니다.</td></tr>';
+		} else {
+			for(var i = 0; i < currentItemSnList.length; i++) {
+				html += '<tr>';
+				html += '<td style="text-align:center; padding:8px; border:1px solid #ddd; color:#333;">' + (i+1) + '</td>';
+				html += '<td style="padding:8px; border:1px solid #ddd; color:#333;">' + currentItemSnList[i].value + '</td>';
+				html += '<td style="text-align:center; padding:8px; border:1px solid #ddd;">';
+				html += '<button type="button" onclick="fn_deleteItemSn(' + currentItemSnList[i].id + ')" class="plm_btns" style="padding:5px 10px; font-size:12px;">삭제</button>';
+				html += '</td>';
+				html += '</tr>';
+			}
+		}
+		
+		html += '</tbody></table>';
+		
+		$(".swal2-html-container #itemSnListContainer").html(html);
+	}
+	
+	// 품목 S/N 추가
+	function fn_addItemSn() {
+		var newSn = $(".swal2-html-container #newItemSnInput").val().trim();
+		
+		if(newSn == '') {
+			alert('S/N을 입력해주세요.');
+			return;
+		}
+		
+		// 중복 체크
+		for(var i = 0; i < currentItemSnList.length; i++) {
+			if(currentItemSnList[i].value == newSn) {
+				alert('이미 등록된 S/N입니다.');
+				return;
+			}
+		}
+		
+		// 추가
+		currentItemSnList.push({
+			id: itemSnCounter++,
+			value: newSn
+		});
+		
+		$(".swal2-html-container #newItemSnInput").val('');
+		fn_renderItemSnList();
+	}
+	
+	// 품목 S/N 삭제
+	function fn_deleteItemSn(snId) {
+		for(var i = 0; i < currentItemSnList.length; i++) {
+			if(currentItemSnList[i].id == snId) {
+				currentItemSnList.splice(i, 1);
+				break;
+			}
+		}
+		fn_renderItemSnList();
+	}
+	
+	// 품목 연속번호 생성 팝업
+	function fn_openItemSequentialSnPopup() {
+		Swal.fire({
+			title: '연속번호 생성',
+			html: 
+				'<div style="text-align:left; padding:5px; color:#333;">' +
+				'<div style="margin-bottom:10px;">' +
+				'<label style="display:block; margin-bottom:3px; font-size:13px; color:#333;">시작번호 <span style="color:red;">*</span></label>' +
+				'<input type="text" id="itemSeqStartNo" placeholder="예: ITEM-001" style="width:100%; padding:6px; border:1px solid #ddd; border-radius:3px; font-size:13px; color:#333;">' +
+				'</div>' +
+				'<div style="margin-bottom:10px;">' +
+				'<label style="display:block; margin-bottom:3px; font-size:13px; color:#333;">생성개수 <span style="color:red;">*</span></label>' +
+				'<input type="number" id="itemSeqCount" placeholder="예: 10" min="1" max="100" style="width:100%; padding:6px; border:1px solid #ddd; border-radius:3px; font-size:13px; color:#333;">' +
+				'</div>' +
+				'<div style="background:#f8f9fa; padding:8px; border-radius:3px; color:#666; font-size:11px; line-height:1.5;">' +
+				'예: ITEM-001, 개수 3 → ITEM-001, ITEM-002, ITEM-003<br>' +
+				'※ 최대 100개까지 생성 가능' +
+				'</div>' +
+				'</div>',
+			width: '400px',
+			showCancelButton: true,
+			confirmButtonText: '생성',
+			cancelButtonText: '취소',
+			preConfirm: () => {
+				const startNo = document.getElementById('itemSeqStartNo').value.trim();
+				const count = parseInt(document.getElementById('itemSeqCount').value);
+				
+				if(!startNo) {
+					Swal.showValidationMessage('시작 번호를 입력해주세요.');
+					return false;
+				}
+				
+				if(!count || count < 1) {
+					Swal.showValidationMessage('생성 개수를 1 이상 입력해주세요.');
+					return false;
+				}
+				
+				if(count > 100) {
+					Swal.showValidationMessage('최대 100개까지만 생성 가능합니다.');
+					return false;
+				}
+				
+				return { startNo: startNo, count: count };
+			}
+		}).then((result) => {
+			if(result.isConfirmed) {
+				fn_generateItemSequentialSn(result.value.startNo, result.value.count);
+			}
+		});
+	}
+	
+	// 품목 연속번호 생성
+	function fn_generateItemSequentialSn(startNo, count) {
+		var match = startNo.match(/^(.*?)(\d+)$/);
+		
+		if(!match) {
+			alert('올바른 형식이 아닙니다. 마지막에 숫자가 있어야 합니다. (예: ITEM-001)');
+			fn_openItemSequentialSnPopup();
+			return;
+		}
+		
+		var prefix = match[1];
+		var startNum = parseInt(match[2]);
+		var numLength = match[2].length;
+		
+		var addedCount = 0;
+		for(var i = 0; i < count; i++) {
+			var currentNum = startNum + i;
+			var paddedNum = String(currentNum).padStart(numLength, '0');
+			var newSn = prefix + paddedNum;
+			
+			// 중복 체크
+			var isDuplicate = false;
+			for(var j = 0; j < currentItemSnList.length; j++) {
+				if(currentItemSnList[j].value == newSn) {
+					isDuplicate = true;
+					break;
+				}
+			}
+			
+			if(!isDuplicate) {
+				currentItemSnList.push({
+					id: itemSnCounter++,
+					value: newSn
+				});
+				addedCount++;
+			}
+		}
+		
+		// 저장 후 팝업 재오픈
+		$("#" + currentItemId + "_sn_list").val(JSON.stringify(currentItemSnList));
+		fn_openItemSnPopup(currentItemId);
+	}
+	
+	// 품목 S/N 확인
+	function fn_confirmItemSnList() {
+		// hidden 필드에 저장
+		var jsonString = JSON.stringify(currentItemSnList);
+		$("#" + currentItemId + "_sn_list").val(jsonString);
+		
+		// display 필드에 표시
+		var snValues = [];
+		for(var i = 0; i < currentItemSnList.length; i++) {
+			snValues.push(currentItemSnList[i].value);
+		}
+		$("#" + currentItemId + " .item-serial-no").val(snValues.join(', '));
+		
+		// itemList 업데이트
+		for(var i = 0; i < itemList.length; i++) {
+			if(itemList[i].id == currentItemId) {
+				itemList[i].snList = currentItemSnList;
+				break;
+			}
+		}
+		
+		Swal.close();
+	}
+	
+	// 품목 S/N 팝업 닫기
+	function fn_closeItemSnPopup() {
+		Swal.close();
+	}
+	
 </script>
 </head>
 <body>
@@ -914,8 +1763,9 @@
 			</div>
 
 			<div id="EntirePopupFormWrap">
+				<!-- 기본정보 영역 -->
 				<div class="form_popup_title">
-					<span>견적요청 정보입력</span>
+					<span>견적요청 기본정보</span>
 				</div>
 				<table class="">
 					<colgroup>
@@ -929,13 +1779,13 @@
 									<col width="14%" />
 									<col width="12%" />
 									<col width="14%" />
-									<!-- <col width="12%" />
+									<col width="12%" />
 									<col width="14%" />
 									<col width="12%" />
-									<col width="10%" /> -->
+									<col width="10%" />
 								</colgroup>
 								
-								<!-- 첫번째 행: 주문유형(계약구분), 제품구분, 국내/해외, 고객사 -->
+								<!-- 첫번째 행: 주문유형, 제품구분, 국내/해외, 고객사 -->
 								<tr>
 									<td class="input_title"><label for="">주문유형 <span style="color:red;">*</span></label></td>
 									<td>
@@ -951,8 +1801,6 @@
 											${code_map.product_cd}
 										</select>
 									</td>
-								</tr>
-								<tr>
 									<td class="input_title"><label for="">국내/해외 <span style="color:red;">*</span></label></td>
 									<td>
 										<select name="area_cd" id="area_cd" reqTitle="국내/해외" type="select" class="select2" required>
@@ -969,66 +1817,22 @@
 									</td>
 								</tr>
 								
-								<!-- 두번째 행: 유/무상, 품번, 접수일, 품명 -->
+								<!-- 두번째 행: 유/무상, 접수일, 환종, 환율 -->
 								<tr>
-								<td class="input_title"><label for="">유/무상 <span style="color:red;">*</span></label></td>
-								<td>
-									<select name="paid_type" id="paid_type" reqTitle="유/무상" type="select" class="select2">
-										<option value="">선택</option>
-										<option value="paid" ${info.PAID_TYPE eq 'paid' ? 'selected' : ''}>유상</option>
-										<option value="free" ${info.PAID_TYPE eq 'free' ? 'selected' : ''}>무상</option>
-									</select>
-								</td>
-
+									<td class="input_title"><label for="">유/무상 <span style="color:red;">*</span></label></td>
+									<td>
+										<select name="paid_type" id="paid_type" reqTitle="유/무상" type="select" class="select2">
+											<option value="">선택</option>
+											<option value="paid" ${info.PAID_TYPE eq 'paid' ? 'selected' : ''}>유상</option>
+											<option value="free" ${info.PAID_TYPE eq 'free' ? 'selected' : ''}>무상</option>
+										</select>
+									</td>
 									<td class="input_title"><label for="">접수일 <span style="color:red;">*</span></label></td>
 									<td>
 										<input type="text" class="date_icon" name="receipt_date" id="receipt_date" reqTitle="접수일" value="${info.RECEIPT_DATE}" required>
 									</td>
-								</tr>
-								<tr>
-									<td class="input_title"><label for="">품번 <span style="color:red;">*</span></label></td>
-									<td>
-										<input type="text" name="part_no" id="part_no" required reqTitle="품번" value="${info.PART_NO}" />
-									</td>
-									
-									<td class="input_title"><label for="">품명 <span style="color:red;">*</span></label></td>
-									<td>
-										<input type="text" name="part_name" id="part_name" required reqTitle="품명" value="${info.PART_NAME}" />
-									</td>
-								</tr>
-								
-								<!-- 세번째 행: S/N(클릭하여 추가), 수량 -->
-								<tr>
-									<td class="input_title"><label for="">S/N</label></td>
-									<td colspan="">
-										<input type="text" name="serial_no" id="serial_no" placeholder="클릭하여 S/N 추가" reqTitle="S/N" value="${info.SERIAL_NO}" readonly style="cursor:pointer; background-color:#f8f9fa; color:#333 !important;" />
-									</td>
-									<td class="input_title"><label for="">수량 <span style="color:red;">*</span></label></td>
-									<td>
-										<input type="text" name="quantity" id="quantity" required reqTitle="수량" value="${info.QUANTITY}" numberOnly />
-									</td>
-								</tr>
-								
-								<!-- 네번째 행: 요청날짜 -->
-								<tr>
-									<td class="input_title"><label for="">요청납기</label></td>
-									<td colspan="3">
-										<input type="text" class="date_icon" name="due_date" id="due_date" reqTitle="요청납기" value="${info.DUE_DATE}" style="">
-									</td>
-								</tr>
-								
-								<!-- 다섯번째 행: 고객사요청사항 (넓은 textarea) -->
-								<tr>
-									<td class="input_title"><label for="">고객사요청사항</label></td>
-									<td colspan="3">
-										<textarea name="customer_request" id="customer_request" rows="4" style="width: 98.5%; resize: vertical;">${info.CUSTOMER_REQUEST}</textarea>
-									</td>
-								</tr>
-								
-								<!-- 여섯번째 행: 환종(통화), 환율 -->
-								<tr>
 									<td class="input_title"><label for="">환종</label></td>
-									<td colspan="">
+									<td>
 										<select name="contract_currency" id="contract_currency" reqTitle="환종" type="select" class="select2">
 											<option value="">선택</option>
 											${code_map.contract_currency}
@@ -1039,6 +1843,69 @@
 										<input type="text" name="exchange_rate" id="exchange_rate" reqTitle="환율" value="${info.EXCHANGE_RATE}" />
 									</td>
 								</tr>
+							</table>
+						</td>
+					</tr>
+				</table>
+				
+				<!-- 품목정보 영역 -->
+				<div class="form_popup_title" style="margin-top:15px;">
+					<span>품목정보</span>
+					<button type="button" id="btnAddItem" class="plm_btns" style="float:right; margin-top:-5px;">품목 추가</button>
+				</div>
+				<table class="">
+					<colgroup>
+						<col width="100%" />
+					</colgroup>
+					<tr>
+						<td>
+							<div style="max-height:300px; overflow-y:auto;">
+								<table class="pmsPopuptable" id="itemListTable">
+									<colgroup>
+										<col width="4%" />   <!-- 번호 -->
+										<col width="12%" />  <!-- 품번 -->
+										<col width="12%" />  <!-- 품명 -->
+										<col width="15%" />  <!-- S/N -->
+										<col width="7%" />   <!-- 수량 -->
+										<col width="10%" />  <!-- 요청납기 -->
+										<col width="20%" />  <!-- 고객요청사항 -->
+										<col width="15%" />  <!-- 반납사유 -->
+										<col width="5%" />   <!-- 삭제 -->
+									</colgroup>
+									<thead>
+										<tr style="background:#f5f5f5;">
+											<th style="text-align:center; padding:8px; border:1px solid #ddd;">No</th>
+											<th style="text-align:center; padding:8px; border:1px solid #ddd;">품번 <span style="color:red;">*</span></th>
+											<th style="text-align:center; padding:8px; border:1px solid #ddd;">품명 <span style="color:red;">*</span></th>
+											<th style="text-align:center; padding:8px; border:1px solid #ddd;">S/N</th>
+											<th style="text-align:center; padding:8px; border:1px solid #ddd;">견적수량 <span style="color:red;">*</span></th>
+											<th style="text-align:center; padding:8px; border:1px solid #ddd;">요청납기</th>
+											<th style="text-align:center; padding:8px; border:1px solid #ddd;">고객요청사항</th>
+											<th style="text-align:center; padding:8px; border:1px solid #ddd;">반납사유</th>
+											<th style="text-align:center; padding:8px; border:1px solid #ddd;">삭제</th>
+										</tr>
+									</thead>
+									<tbody id="itemListBody">
+										<!-- 품목 행이 동적으로 추가됩니다 -->
+										<tr id="noItemRow">
+											<td colspan="9" style="text-align:center; padding:30px; color:#999;">
+												품목 추가 버튼을 클릭하여 품목을 등록하세요.
+											</td>
+										</tr>
+									</tbody>
+								</table>
+							</div>
+						</td>
+					</tr>
+				</table>
+				
+				<table class="">
+					<colgroup>
+						<col width="100%" />
+					</colgroup>
+					<tr>
+						<td>
+							<table class="pmsPopuptable">
 								
 								<!-- 이전 필드들 (주석처리되어 보존) -->
 								<%-- 
diff --git a/database/contract_item_tables.sql b/database/contract_item_tables.sql
new file mode 100644
index 0000000..e9e3bdd
--- /dev/null
+++ b/database/contract_item_tables.sql
@@ -0,0 +1,230 @@
+-- 견적 품목 테이블 생성 스크립트
+-- 작성일: 2025-10-17
+-- 설명: 견적 요청 시 여러 품목을 등록할 수 있도록 품목 정보를 별도 테이블로 관리
+
+-- ====================================
+-- 1. 견적 품목 테이블 (CONTRACT_ITEM)
+-- ====================================
+-- 견적(CONTRACT_MGMT)에 속한 품목 정보를 저장
+CREATE TABLE IF NOT EXISTS CONTRACT_ITEM (
+    OBJID               VARCHAR(50)     PRIMARY KEY,                    -- 품목 고유 ID
+    CONTRACT_OBJID      VARCHAR(50)     NOT NULL,                       -- 견적 OBJID (FK)
+    SEQ                 INTEGER         NOT NULL,                       -- 품목 순번
+    PART_NO             VARCHAR(100)    NOT NULL,                       -- 품번
+    PART_NAME           VARCHAR(200)    NOT NULL,                       -- 품명
+    QUANTITY            INTEGER         NOT NULL DEFAULT 1,             -- 수량
+    DUE_DATE            VARCHAR(10),                                    -- 요청납기 (YYYY-MM-DD)
+    CUSTOMER_REQUEST    TEXT,                                           -- 고객요청사항
+    REGDATE             TIMESTAMP       NOT NULL DEFAULT NOW(),         -- 등록일시
+    WRITER              VARCHAR(50),                                    -- 등록자
+    CHGDATE             TIMESTAMP,                                      -- 수정일시
+    CHG_USER_ID         VARCHAR(50),                                    -- 수정자
+    STATUS              VARCHAR(20)     DEFAULT 'ACTIVE',               -- 상태 (ACTIVE/INACTIVE)
+    
+    -- 제약조건
+    CONSTRAINT FK_CONTRACT_ITEM_CONTRACT FOREIGN KEY (CONTRACT_OBJID) 
+        REFERENCES CONTRACT_MGMT(OBJID) ON DELETE CASCADE,
+    CONSTRAINT CHK_CONTRACT_ITEM_QUANTITY CHECK (QUANTITY > 0)
+);
+
+-- 인덱스 생성
+CREATE INDEX IDX_CONTRACT_ITEM_CONTRACT ON CONTRACT_ITEM(CONTRACT_OBJID);
+CREATE INDEX IDX_CONTRACT_ITEM_SEQ ON CONTRACT_ITEM(CONTRACT_OBJID, SEQ);
+
+-- 테이블 코멘트
+COMMENT ON TABLE CONTRACT_ITEM IS '견적 품목 정보';
+COMMENT ON COLUMN CONTRACT_ITEM.OBJID IS '품목 고유 ID';
+COMMENT ON COLUMN CONTRACT_ITEM.CONTRACT_OBJID IS '견적 OBJID (FK)';
+COMMENT ON COLUMN CONTRACT_ITEM.SEQ IS '품목 순번';
+COMMENT ON COLUMN CONTRACT_ITEM.PART_NO IS '품번';
+COMMENT ON COLUMN CONTRACT_ITEM.PART_NAME IS '품명';
+COMMENT ON COLUMN CONTRACT_ITEM.QUANTITY IS '수량';
+COMMENT ON COLUMN CONTRACT_ITEM.DUE_DATE IS '요청납기 (YYYY-MM-DD)';
+COMMENT ON COLUMN CONTRACT_ITEM.CUSTOMER_REQUEST IS '고객요청사항';
+COMMENT ON COLUMN CONTRACT_ITEM.REGDATE IS '등록일시';
+COMMENT ON COLUMN CONTRACT_ITEM.WRITER IS '등록자';
+COMMENT ON COLUMN CONTRACT_ITEM.CHGDATE IS '수정일시';
+COMMENT ON COLUMN CONTRACT_ITEM.CHG_USER_ID IS '수정자';
+COMMENT ON COLUMN CONTRACT_ITEM.STATUS IS '상태 (ACTIVE/INACTIVE)';
+
+
+-- ====================================
+-- 2. 품목별 S/N 테이블 (CONTRACT_ITEM_SERIAL)
+-- ====================================
+-- 각 품목에 속한 S/N 정보를 저장
+CREATE TABLE IF NOT EXISTS CONTRACT_ITEM_SERIAL (
+    OBJID               VARCHAR(50)     PRIMARY KEY,                    -- S/N 고유 ID
+    ITEM_OBJID          VARCHAR(50)     NOT NULL,                       -- 품목 OBJID (FK)
+    SEQ                 INTEGER         NOT NULL,                       -- S/N 순번
+    SERIAL_NO           VARCHAR(200)    NOT NULL,                       -- S/N
+    REGDATE             TIMESTAMP       NOT NULL DEFAULT NOW(),         -- 등록일시
+    WRITER              VARCHAR(50),                                    -- 등록자
+    STATUS              VARCHAR(20)     DEFAULT 'ACTIVE',               -- 상태 (ACTIVE/INACTIVE)
+    
+    -- 제약조건
+    CONSTRAINT FK_CONTRACT_ITEM_SERIAL_ITEM FOREIGN KEY (ITEM_OBJID) 
+        REFERENCES CONTRACT_ITEM(OBJID) ON DELETE CASCADE,
+    CONSTRAINT UQ_CONTRACT_ITEM_SERIAL UNIQUE (ITEM_OBJID, SERIAL_NO)
+);
+
+-- 인덱스 생성
+CREATE INDEX IDX_CONTRACT_ITEM_SERIAL_ITEM ON CONTRACT_ITEM_SERIAL(ITEM_OBJID);
+CREATE INDEX IDX_CONTRACT_ITEM_SERIAL_SEQ ON CONTRACT_ITEM_SERIAL(ITEM_OBJID, SEQ);
+
+-- 테이블 코멘트
+COMMENT ON TABLE CONTRACT_ITEM_SERIAL IS '품목별 S/N 정보';
+COMMENT ON COLUMN CONTRACT_ITEM_SERIAL.OBJID IS 'S/N 고유 ID';
+COMMENT ON COLUMN CONTRACT_ITEM_SERIAL.ITEM_OBJID IS '품목 OBJID (FK)';
+COMMENT ON COLUMN CONTRACT_ITEM_SERIAL.SEQ IS 'S/N 순번';
+COMMENT ON COLUMN CONTRACT_ITEM_SERIAL.SERIAL_NO IS 'S/N';
+COMMENT ON COLUMN CONTRACT_ITEM_SERIAL.REGDATE IS '등록일시';
+COMMENT ON COLUMN CONTRACT_ITEM_SERIAL.WRITER IS '등록자';
+COMMENT ON COLUMN CONTRACT_ITEM_SERIAL.STATUS IS '상태 (ACTIVE/INACTIVE)';
+
+
+-- ====================================
+-- 3. 시퀀스 생성 (OBJID 자동 생성용)
+-- ====================================
+-- 품목 OBJID 시퀀스
+CREATE SEQUENCE IF NOT EXISTS SEQ_CONTRACT_ITEM
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+-- S/N OBJID 시퀀스
+CREATE SEQUENCE IF NOT EXISTS SEQ_CONTRACT_ITEM_SERIAL
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+-- ====================================
+-- 4. 샘플 데이터 조회 쿼리
+-- ====================================
+/*
+-- 견적별 품목 목록 조회
+SELECT 
+    CI.OBJID,
+    CI.SEQ,
+    CI.PART_NO,
+    CI.PART_NAME,
+    CI.QUANTITY,
+    CI.DUE_DATE,
+    CI.CUSTOMER_REQUEST,
+    STRING_AGG(CIS.SERIAL_NO, ', ' ORDER BY CIS.SEQ) AS SERIAL_NOS,
+    COUNT(CIS.OBJID) AS SERIAL_COUNT
+FROM 
+    CONTRACT_ITEM CI
+    LEFT JOIN CONTRACT_ITEM_SERIAL CIS ON CI.OBJID = CIS.ITEM_OBJID AND CIS.STATUS = 'ACTIVE'
+WHERE 
+    CI.CONTRACT_OBJID = 'CONTRACT_OBJID_HERE'
+    AND CI.STATUS = 'ACTIVE'
+GROUP BY 
+    CI.OBJID, CI.SEQ, CI.PART_NO, CI.PART_NAME, CI.QUANTITY, CI.DUE_DATE, CI.CUSTOMER_REQUEST
+ORDER BY 
+    CI.SEQ;
+
+-- 품목별 S/N 목록 조회
+SELECT 
+    OBJID,
+    SEQ,
+    SERIAL_NO
+FROM 
+    CONTRACT_ITEM_SERIAL
+WHERE 
+    ITEM_OBJID = 'ITEM_OBJID_HERE'
+    AND STATUS = 'ACTIVE'
+ORDER BY 
+    SEQ;
+*/
+
+
+-- ====================================
+-- 5. 기존 데이터 마이그레이션 (선택사항)
+-- ====================================
+-- 기존 CONTRACT_MGMT 테이블의 PART_NO, PART_NAME, SERIAL_NO, QUANTITY 데이터를 
+-- 새로운 CONTRACT_ITEM 테이블로 마이그레이션
+
+/*
+-- 기존 품목 데이터를 CONTRACT_ITEM으로 복사
+INSERT INTO CONTRACT_ITEM (
+    OBJID,
+    CONTRACT_OBJID,
+    SEQ,
+    PART_NO,
+    PART_NAME,
+    QUANTITY,
+    DUE_DATE,
+    CUSTOMER_REQUEST,
+    REGDATE,
+    WRITER,
+    STATUS
+)
+SELECT 
+    'ITEM_' || CM.OBJID AS OBJID,
+    CM.OBJID AS CONTRACT_OBJID,
+    1 AS SEQ,
+    CM.PART_NO,
+    CM.PART_NAME,
+    COALESCE(CM.QUANTITY, 1) AS QUANTITY,
+    CM.DUE_DATE,
+    CM.CUSTOMER_REQUEST,
+    CM.REGDATE,
+    CM.WRITER,
+    'ACTIVE' AS STATUS
+FROM 
+    CONTRACT_MGMT CM
+WHERE 
+    CM.PART_NO IS NOT NULL 
+    AND CM.PART_NO != ''
+    AND NOT EXISTS (
+        SELECT 1 FROM CONTRACT_ITEM CI WHERE CI.CONTRACT_OBJID = CM.OBJID
+    );
+
+-- 기존 S/N 데이터를 CONTRACT_ITEM_SERIAL로 복사 (쉼표로 구분된 경우)
+-- PostgreSQL의 string_to_array 함수 사용
+INSERT INTO CONTRACT_ITEM_SERIAL (
+    OBJID,
+    ITEM_OBJID,
+    SEQ,
+    SERIAL_NO,
+    REGDATE,
+    WRITER,
+    STATUS
+)
+SELECT 
+    'SN_' || CI.OBJID || '_' || ROW_NUMBER() OVER (PARTITION BY CI.OBJID ORDER BY sn_value) AS OBJID,
+    CI.OBJID AS ITEM_OBJID,
+    ROW_NUMBER() OVER (PARTITION BY CI.OBJID ORDER BY sn_value) AS SEQ,
+    TRIM(sn_value) AS SERIAL_NO,
+    CI.REGDATE,
+    CI.WRITER,
+    'ACTIVE' AS STATUS
+FROM 
+    CONTRACT_ITEM CI
+    CROSS JOIN LATERAL UNNEST(string_to_array(
+        (SELECT SERIAL_NO FROM CONTRACT_MGMT WHERE OBJID = CI.CONTRACT_OBJID), 
+        ','
+    )) AS sn_value
+WHERE 
+    TRIM(sn_value) != ''
+    AND NOT EXISTS (
+        SELECT 1 FROM CONTRACT_ITEM_SERIAL CIS 
+        WHERE CIS.ITEM_OBJID = CI.OBJID 
+        AND CIS.SERIAL_NO = TRIM(sn_value)
+    );
+*/
+
+
+-- ====================================
+-- 6. 권한 설정 (필요시)
+-- ====================================
+-- GRANT SELECT, INSERT, UPDATE, DELETE ON CONTRACT_ITEM TO plm_user;
+-- GRANT SELECT, INSERT, UPDATE, DELETE ON CONTRACT_ITEM_SERIAL TO plm_user;
+-- GRANT USAGE, SELECT ON SEQUENCE SEQ_CONTRACT_ITEM TO plm_user;
+-- GRANT USAGE, SELECT ON SEQUENCE SEQ_CONTRACT_ITEM_SERIAL TO plm_user;
+
diff --git a/src/com/pms/salesmgmt/controller/ContractMgmtController.java b/src/com/pms/salesmgmt/controller/ContractMgmtController.java
index 8729c14..8f34e36 100644
--- a/src/com/pms/salesmgmt/controller/ContractMgmtController.java
+++ b/src/com/pms/salesmgmt/controller/ContractMgmtController.java
@@ -665,7 +665,57 @@ public class ContractMgmtController {
 	@RequestMapping("/contractMgmt/saveContractMgmtInfo.do")
 	public String saveContractMgmtInfo(HttpServletRequest request, @RequestParam Map<String, Object> paramMap){
     	try {
-    		request.setAttribute("RESULT", CommonUtils.getJsonMap(contractMgmtService.saveContractMgmtInfo(request, paramMap)) );
+    		// 기본 견적 정보 저장
+    		Map<String, Object> result = contractMgmtService.saveContractMgmtInfo(request, paramMap);
+    		
+    		// 품목 데이터 처리
+    		if(result.get("result") != null && (Boolean)result.get("result")) {
+    			// 수정 시에는 paramMap의 objId 사용, 신규 시에는 result의 objId 사용
+    			String contractObjId = (String) result.get("objId");
+    			if(contractObjId == null || contractObjId.isEmpty()) {
+    				contractObjId = (String) paramMap.get("objId");
+    			}
+    			String itemsJsonStr = (String) paramMap.get("items_json");
+    			
+    			System.out.println("=== Controller: 품목 저장 시작 ===");
+    			System.out.println("contractObjId: " + contractObjId);
+    			System.out.println("itemsJsonStr: " + (itemsJsonStr != null ? itemsJsonStr.substring(0, Math.min(100, itemsJsonStr.length())) : "null"));
+    			
+    			if(contractObjId != null && itemsJsonStr != null && !itemsJsonStr.isEmpty()) {
+    				// JSON 파싱
+    				try {
+    					com.google.gson.Gson gson = new com.google.gson.Gson();
+    					java.lang.reflect.Type listType = new com.google.gson.reflect.TypeToken<List<Map<String, Object>>>(){}.getType();
+    					List<Map<String, Object>> itemList = gson.fromJson(itemsJsonStr, listType);
+    					
+    					System.out.println("JSON 파싱 완료. itemList size: " + (itemList != null ? itemList.size() : 0));
+    					
+    					// 사용자 ID 가져오기
+    					HttpSession session = request.getSession();
+    					PersonBean person = (PersonBean) session.getAttribute(Constants.PERSON_BEAN);
+    					String userId = person.getUserId();
+    					
+    					System.out.println("userId: " + userId);
+    					
+    					// 품목 저장
+    					Map<String, Object> itemResult = contractMgmtService.saveContractItems(contractObjId, itemList, userId);
+    					
+    					System.out.println("품목 저장 결과: " + itemResult);
+    					
+    					if(itemResult.get("result") == null || !(Boolean)itemResult.get("result")) {
+    						result.put("msg", result.get("msg") + " (단, 품목 저장 실패: " + itemResult.get("msg") + ")");
+    					}
+    				} catch(Exception je) {
+    					je.printStackTrace();
+    					System.out.println("품목 저장 중 예외 발생: " + je.getMessage());
+    					result.put("msg", result.get("msg") + " (단, 품목 저장 중 오류 발생: " + je.getMessage() + ")");
+    				}
+    			} else {
+    				System.out.println("품목 저장 건너뜀 - contractObjId: " + contractObjId + ", itemsJsonStr isEmpty: " + (itemsJsonStr == null || itemsJsonStr.isEmpty()));
+    			}
+    		}
+    		
+    		request.setAttribute("RESULT", CommonUtils.getJsonMap(result));
     		
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -1649,7 +1699,9 @@ public class ContractMgmtController {
 			String mechanical_type     ="";//기계형식
 			String overhaul_order     ="";//오버홀차수
 			
-			Map info = null; 
+			Map info = null;
+			List<Map<String, Object>> itemList = new ArrayList<Map<String, Object>>();
+			
 			if(paramMap.get("objId")!=null){
 				paramMap.put("objId",objId);
 				info = CommonUtils.keyChangeUpperMap(contractMgmtService.getContractMgmtInfo(paramMap));
@@ -1675,6 +1727,9 @@ public class ContractMgmtController {
 				target_project_no   =     CommonUtils.nullToEmpty((String)info.get("TARGET_PROJECT_NO"));
 				mechanical_type   =     CommonUtils.nullToEmpty((String)info.get("MECHANICAL_TYPE"));
 				overhaul_order   =     CommonUtils.nullToEmpty((String)info.get("OVERHAUL_ORDER"));
+				
+				// 품목 목록 조회
+				itemList = contractMgmtService.getContractItemList(objId);
 			}
 			
 			if("".equals(objId)) objId = CommonUtils.createObjId();
@@ -1741,10 +1796,13 @@ public class ContractMgmtController {
 			code_map.put("mechanical_type", commonService.bizMakeOptionList("", mechanical_type,"common.getMechanicalTypeList"));
 			
 			
+			// 품번 목록은 AJAX로 검색하므로 제거
+			
 			request.setAttribute("code_map",code_map);
 			request.setAttribute("info", info);
 			request.setAttribute("objId", objId);
 			request.setAttribute("actionType", actionType);
+			request.setAttribute("itemList", itemList); // 품목 목록 추가
 			
 		}catch(Exception e){
 			e.printStackTrace();
@@ -1753,6 +1811,27 @@ public class ContractMgmtController {
 		return "/contractMgmt/estimateRegistFormPopup";
 	}
 	
+	/**
+	 * 품번 검색 (AJAX용)
+	 */
+	@RequestMapping(value = "/contractMgmt/searchPartList.do", produces = "application/json; charset=UTF-8")
+	@ResponseBody
+	public List<Map<String, Object>> searchPartList(@RequestParam Map<String, Object> paramMap) {
+		List<Map<String, Object>> resultList = new ArrayList<Map<String, Object>>();
+		
+		try {
+			resultList = contractMgmtService.searchPartList(paramMap);
+			System.out.println("품번 검색 결과 개수: " + resultList.size());
+			if(resultList.size() > 0) {
+				System.out.println("첫번째 결과: " + resultList.get(0));
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		
+		return resultList;
+	}
+	
 	@RequestMapping("/contractMgmt/saveEstimateInfo.do")
 	public String saveEstimateInfo(HttpServletRequest request, @RequestParam Map<String, Object> paramMap){
     	try {
diff --git a/src/com/pms/salesmgmt/mapper/contractMgmt.xml b/src/com/pms/salesmgmt/mapper/contractMgmt.xml
index 08e3dfb..540349e 100644
--- a/src/com/pms/salesmgmt/mapper/contractMgmt.xml
+++ b/src/com/pms/salesmgmt/mapper/contractMgmt.xml
@@ -525,6 +525,53 @@
 				,A.APPR_STATUS
 				,A.APPROVAL_OBJID
 				,A.ROUTE_OBJID
+				,(SELECT objid FROM ESTIMATE_TEMPLATE WHERE CONTRACT_OBJID = T.OBJID order by regdate desc limit 1) AS EST_OBJID
+				-- 품목 정보 요약
+				,(
+					WITH item_info AS (
+						SELECT 
+							COALESCE(PM.PART_NAME, CI.PART_NAME) AS PART_NAME,
+							COUNT(*) OVER() AS total_count,
+							ROW_NUMBER() OVER(ORDER BY CI.SEQ) AS rn
+						FROM CONTRACT_ITEM CI
+						LEFT JOIN PART_MNG PM ON CI.PART_OBJID = PM.OBJID
+						WHERE CI.CONTRACT_OBJID = T.OBJID
+						AND CI.STATUS = 'ACTIVE'
+					)
+					SELECT 
+						CASE 
+							WHEN total_count = 1 THEN PART_NAME
+							WHEN total_count > 1 THEN PART_NAME || ' 외 ' || (total_count - 1) || '건'
+							ELSE ''
+						END
+					FROM item_info
+					WHERE rn = 1
+				) AS ITEM_SUMMARY
+				,(
+					SELECT MIN(DUE_DATE)
+					FROM CONTRACT_ITEM
+					WHERE CONTRACT_OBJID = T.OBJID
+					AND STATUS = 'ACTIVE'
+					AND DUE_DATE IS NOT NULL
+					AND DUE_DATE != ''
+				) AS EARLIEST_DUE_DATE
+				,(
+					SELECT COUNT(*) - 1
+					FROM CONTRACT_ITEM
+					WHERE CONTRACT_OBJID = T.OBJID
+					AND STATUS = 'ACTIVE'
+					AND DUE_DATE IS NOT NULL
+					AND DUE_DATE != ''
+				) AS OTHER_DUE_DATE_COUNT
+				,(
+					SELECT RETURN_REASON
+					FROM CONTRACT_ITEM
+					WHERE CONTRACT_OBJID = T.OBJID
+					AND STATUS = 'ACTIVE'
+					AND RETURN_REASON IS NOT NULL
+					AND RETURN_REASON != ''
+					LIMIT 1
+				) AS RETURN_REASON_SUMMARY
 			FROM 
 				CONTRACT_MGMT AS T
 			LEFT OUTER JOIN
@@ -564,7 +611,7 @@
 							A.OBJID = B.APPROVAL_OBJID
 							AND TARGET_TYPE IN ('CONTRACT_ESTIMATE')
 					) A
-					ON T.OBJID::numeric = A.TARGET_OBJID
+					ON (SELECT objid FROM ESTIMATE_TEMPLATE WHERE CONTRACT_OBJID = T.OBJID order by regdate desc limit 1)::numeric = A.TARGET_OBJID
 		)
 	</sql>
 	
@@ -4190,4 +4237,202 @@ ORDER BY ASM.SUPPLY_NAME
 		EXCHANGE_RATE = #{exchange_rate}
 	WHERE OBJID = #{contractObjId}
 </update>
+
+<!-- ====================================
+     품목 관리 쿼리
+     ==================================== -->
+
+	<!-- 품번 목록 조회 (is_last = 1) -->
+	<select id="getPartList" parameterType="map" resultType="map">
+		SELECT 
+			OBJID,
+			PART_NO,
+			PART_NAME,
+			SPEC
+		FROM 
+			PART_MNG
+		WHERE 
+			IS_LAST = '1'
+			AND STATUS = 'release'
+		ORDER BY 
+			PART_NO
+	</select>
+	
+<!-- 품번 검색 (AJAX용 - 검색어 기반 또는 OBJID 기반) -->
+<select id="searchPartList" parameterType="map" resultType="map">
+	SELECT 
+		OBJID,
+		PART_NO,
+		PART_NAME,
+		SPEC
+	FROM 
+		PART_MNG
+	WHERE 
+		IS_LAST = '1'
+		AND STATUS = 'release'
+		<if test="partObjId != null and partObjId != ''">
+			AND OBJID = #{partObjId}
+		</if>
+		<if test="searchTerm != null and searchTerm != ''">
+			AND (
+				UPPER(PART_NO) LIKE '%' || UPPER(#{searchTerm}) || '%'
+				OR UPPER(PART_NAME) LIKE '%' || UPPER(#{searchTerm}) || '%'
+			)
+		</if>
+	ORDER BY 
+		PART_NO
+	LIMIT 100
+</select>
+
+<!-- 품목 저장 -->
+<insert id="insertContractItem" parameterType="map">
+	INSERT INTO CONTRACT_ITEM (
+		OBJID,
+		CONTRACT_OBJID,
+		SEQ,
+		PART_OBJID,
+		PART_NO,
+		PART_NAME,
+		QUANTITY,
+		DUE_DATE,
+		CUSTOMER_REQUEST,
+		RETURN_REASON,
+		REGDATE,
+		WRITER,
+		STATUS
+	) VALUES (
+		#{objId},
+		#{contractObjId},
+		#{seq},
+		#{partObjId},
+		#{partNo},
+		#{partName},
+		#{quantity},
+		#{dueDate},
+		#{customerRequest},
+		#{returnReason},
+		NOW(),
+		#{writer},
+		'ACTIVE'
+	)
+</insert>
+
+<!-- 품목별 S/N 저장 -->
+<insert id="insertContractItemSerial" parameterType="map">
+	INSERT INTO CONTRACT_ITEM_SERIAL (
+		OBJID,
+		ITEM_OBJID,
+		SEQ,
+		SERIAL_NO,
+		REGDATE,
+		WRITER,
+		STATUS
+	) VALUES (
+		#{objId},
+		#{itemObjId},
+		#{seq},
+		#{serialNo},
+		NOW(),
+		#{writer},
+		'ACTIVE'
+	)
+</insert>
+
+<!-- 견적의 품목 목록 조회 -->
+<select id="getContractItemList" parameterType="map" resultType="map">
+	SELECT 
+		CI.OBJID,
+		CI.CONTRACT_OBJID,
+		CI.SEQ,
+		CI.PART_OBJID,
+		CI.PART_NO,
+		CI.PART_NAME,
+		CI.QUANTITY,
+		CI.DUE_DATE,
+		CI.CUSTOMER_REQUEST,
+		CI.RETURN_REASON,
+		CI.REGDATE,
+		CI.WRITER,
+		STRING_AGG(CIS.SERIAL_NO, ', ' ORDER BY CIS.SEQ) AS SERIAL_NOS,
+		COUNT(CIS.OBJID) AS SERIAL_COUNT
+	FROM 
+		CONTRACT_ITEM CI
+		LEFT JOIN CONTRACT_ITEM_SERIAL CIS 
+			ON CI.OBJID = CIS.ITEM_OBJID 
+			AND CIS.STATUS = 'ACTIVE'
+	WHERE 
+		CI.CONTRACT_OBJID = #{contractObjId}
+		AND CI.STATUS = 'ACTIVE'
+	GROUP BY 
+		CI.OBJID, 
+		CI.CONTRACT_OBJID,
+		CI.SEQ,
+		CI.PART_OBJID,
+		CI.PART_NO, 
+		CI.PART_NAME, 
+		CI.QUANTITY, 
+		CI.DUE_DATE, 
+		CI.CUSTOMER_REQUEST,
+		CI.REGDATE,
+		CI.WRITER
+	ORDER BY 
+		CI.SEQ
+</select>
+
+<!-- 품목의 S/N 목록 조회 -->
+<select id="getContractItemSerialList" parameterType="map" resultType="map">
+	SELECT 
+		OBJID,
+		ITEM_OBJID,
+		SEQ,
+		SERIAL_NO,
+		REGDATE,
+		WRITER
+	FROM 
+		CONTRACT_ITEM_SERIAL
+	WHERE 
+		ITEM_OBJID = #{itemObjId}
+		AND STATUS = 'ACTIVE'
+	ORDER BY 
+		SEQ
+</select>
+
+<!-- 견적의 품목 전체 삭제 (상태 변경) -->
+<update id="deleteContractItems" parameterType="map">
+	UPDATE CONTRACT_ITEM
+	SET STATUS = 'INACTIVE',
+		CHGDATE = NOW(),
+		CHG_USER_ID = #{userId}
+	WHERE CONTRACT_OBJID = #{contractObjId}
+		AND STATUS = 'ACTIVE'
+</update>
+
+<!-- 품목의 S/N 전체 삭제 (상태 변경) -->
+<update id="deleteContractItemSerials" parameterType="map">
+	UPDATE CONTRACT_ITEM_SERIAL
+	SET STATUS = 'INACTIVE'
+	WHERE ITEM_OBJID IN (
+		SELECT OBJID 
+		FROM CONTRACT_ITEM 
+		WHERE CONTRACT_OBJID = #{contractObjId}
+			AND STATUS = 'ACTIVE'
+	)
+</update>
+
+<!-- 특정 품목 삭제 (상태 변경) -->
+<update id="deleteContractItem" parameterType="map">
+	UPDATE CONTRACT_ITEM
+	SET STATUS = 'INACTIVE',
+		CHGDATE = NOW(),
+		CHG_USER_ID = #{userId}
+	WHERE OBJID = #{itemObjId}
+</update>
+
+<!-- 특정 품목의 S/N 전체 삭제 -->
+<update id="deleteItemSerials" parameterType="map">
+	UPDATE CONTRACT_ITEM_SERIAL
+	SET STATUS = 'INACTIVE'
+	WHERE ITEM_OBJID = #{itemObjId}
+</update>
+
 </mapper>
\ No newline at end of file
diff --git a/src/com/pms/salesmgmt/service/ContractMgmtService.java b/src/com/pms/salesmgmt/service/ContractMgmtService.java
index 9c7063c..ce8bdc4 100644
--- a/src/com/pms/salesmgmt/service/ContractMgmtService.java
+++ b/src/com/pms/salesmgmt/service/ContractMgmtService.java
@@ -1888,4 +1888,201 @@ private String makeEstimateMailContents(Map contractInfo, Map estimateTemplate,
 		
 		return resultMap;
 	}
+	
+	/**
+	 * 품목 저장 (여러 건)
+	 * @param contractObjId 견적 OBJID
+	 * @param itemList 품목 목록
+	 * @param userId 사용자 ID
+	 * @return 성공 여부
+	 */
+	public Map<String, Object> saveContractItems(String contractObjId, List<Map<String, Object>> itemList, String userId) {
+		SqlSession sqlSession = SqlMapConfig.getInstance().getSqlSession();
+		Map<String, Object> resultMap = new HashMap<String, Object>();
+		
+		try {
+			System.out.println("=== saveContractItems 시작 ===");
+			System.out.println("contractObjId: " + contractObjId);
+			System.out.println("itemList size: " + (itemList != null ? itemList.size() : 0));
+			System.out.println("userId: " + userId);
+			
+			// 기존 품목 삭제 (상태 변경)
+			Map<String, Object> deleteParam = new HashMap<String, Object>();
+			deleteParam.put("contractObjId", contractObjId);
+			deleteParam.put("userId", userId);
+			
+			sqlSession.update("contractMgmt.deleteContractItemSerials", deleteParam);
+			sqlSession.update("contractMgmt.deleteContractItems", deleteParam);
+			System.out.println("기존 품목 삭제 완료");
+			
+			// 새 품목 저장
+			if (itemList != null && !itemList.isEmpty()) {
+				for (int i = 0; i < itemList.size(); i++) {
+					Map<String, Object> item = itemList.get(i);
+					
+					System.out.println("품목 " + (i+1) + " 처리 중: " + item);
+					
+					// 품목 OBJID 생성 (CommonUtils 사용)
+					String itemObjId = CommonUtils.createObjId();
+					
+				// 품목 저장
+				Map<String, Object> itemParam = new HashMap<String, Object>();
+				itemParam.put("objId", itemObjId);
+				itemParam.put("contractObjId", contractObjId);
+				itemParam.put("seq", i + 1);
+				itemParam.put("partObjId", item.get("partObjId"));
+				itemParam.put("partNo", item.get("partNo"));
+				itemParam.put("partName", item.get("partName"));
+				
+				// quantity를 Integer로 변환
+				Object quantityObj = item.get("quantity");
+				Integer quantity = null;
+				if(quantityObj != null) {
+					if(quantityObj instanceof Integer) {
+						quantity = (Integer) quantityObj;
+					} else if(quantityObj instanceof Double) {
+						quantity = ((Double) quantityObj).intValue();
+					} else {
+						// String인 경우 콤마 제거 후 변환
+						String quantityStr = quantityObj.toString().replace(",", "").trim();
+						if(!quantityStr.isEmpty()) {
+							quantity = Integer.parseInt(quantityStr);
+						}
+					}
+				}
+				itemParam.put("quantity", quantity);
+				
+				itemParam.put("dueDate", item.get("dueDate"));
+				itemParam.put("customerRequest", item.get("customerRequest"));
+				itemParam.put("returnReason", item.get("returnReason"));
+				itemParam.put("writer", userId);
+					
+					System.out.println("품목 INSERT 시도 - OBJID: " + itemObjId);
+					int result = sqlSession.insert("contractMgmt.insertContractItem", itemParam);
+					System.out.println("품목 INSERT 결과: " + result);
+					
+				// S/N 저장
+				@SuppressWarnings("unchecked")
+				List<Map<String, Object>> snList = (List<Map<String, Object>>) item.get("snList");
+				if (snList != null && !snList.isEmpty()) {
+					for (int j = 0; j < snList.size(); j++) {
+						Map<String, Object> sn = snList.get(j);
+						String serialNo = (String) sn.get("value");
+						
+						// S/N 값이 비어있으면 건너뛰기
+						if (serialNo == null || serialNo.trim().isEmpty()) {
+							System.out.println("S/N 값이 비어있어서 건너뜀");
+							continue;
+						}
+						
+						// S/N OBJID 생성 (CommonUtils 사용)
+						String snObjId = CommonUtils.createObjId();
+						
+						Map<String, Object> snParam = new HashMap<String, Object>();
+						snParam.put("objId", snObjId);
+						snParam.put("itemObjId", itemObjId);
+						snParam.put("seq", j + 1);
+						snParam.put("serialNo", serialNo);
+						snParam.put("writer", userId);
+						
+						sqlSession.insert("contractMgmt.insertContractItemSerial", snParam);
+					}
+				}
+				}
+			}
+			
+			sqlSession.commit();
+			resultMap.put("result", true);
+			resultMap.put("msg", "품목이 저장되었습니다.");
+			
+		} catch (Exception e) {
+			sqlSession.rollback();
+			resultMap.put("result", false);
+			resultMap.put("msg", "품목 저장 중 오류가 발생했습니다.");
+			e.printStackTrace();
+		} finally {
+			sqlSession.close();
+		}
+		
+		return resultMap;
+	}
+	
+	/**
+	 * 품번 목록 조회 (is_last = 1)
+	 * @return 품번 목록
+	 */
+	public List<Map<String, Object>> getPartList() {
+		SqlSession sqlSession = SqlMapConfig.getInstance().getSqlSession();
+		List<Map<String, Object>> partList = new ArrayList<Map<String, Object>>();
+		
+		try {
+			partList = sqlSession.selectList("contractMgmt.getPartList");
+		} catch (Exception e) {
+			e.printStackTrace();
+		} finally {
+			sqlSession.close();
+		}
+		
+		return partList;
+	}
+	
+	/**
+	 * 품번 검색 (검색어 기반)
+	 */
+	public List<Map<String, Object>> searchPartList(Map<String, Object> paramMap) {
+		SqlSession sqlSession = SqlMapConfig.getInstance().getSqlSession();
+		List<Map<String, Object>> partList = new ArrayList<Map<String, Object>>();
+		
+		try {
+			partList = sqlSession.selectList("contractMgmt.searchPartList", paramMap);
+		} catch (Exception e) {
+			e.printStackTrace();
+		} finally {
+			sqlSession.close();
+		}
+		
+		return partList;
+	}
+	
+	/**
+	 * 품목 목록 조회
+	 * @param contractObjId 견적 OBJID
+	 * @return 품목 목록
+	 */
+	public List<Map<String, Object>> getContractItemList(String contractObjId) {
+		SqlSession sqlSession = SqlMapConfig.getInstance().getSqlSession();
+		List<Map<String, Object>> itemList = new ArrayList<Map<String, Object>>();
+		
+		try {
+			Map<String, Object> param = new HashMap<String, Object>();
+			param.put("contractObjId", contractObjId);
+			
+			itemList = sqlSession.selectList("contractMgmt.getContractItemList", param);
+			
+		// 각 품목의 S/N 목록 조회
+		for (Map<String, Object> item : itemList) {
+			String itemObjId = (String) item.get("OBJID");
+			if(itemObjId == null) {
+				itemObjId = (String) item.get("objid");
+			}
+			
+			System.out.println("품목 OBJID: " + itemObjId);
+			
+			Map<String, Object> snParam = new HashMap<String, Object>();
+			snParam.put("itemObjId", itemObjId);
+			
+			List<Map<String, Object>> snList = sqlSession.selectList("contractMgmt.getContractItemSerialList", snParam);
+			System.out.println("조회된 S/N 개수: " + (snList != null ? snList.size() : 0));
+			
+			item.put("SN_LIST", snList);
+		}
+			
+		} catch (Exception e) {
+			e.printStackTrace();
+		} finally {
+			sqlSession.close();
+		}
+		
+		return itemList;
+	}
 }