From bed767994e3c2a5c89105e8febe77e122d3a7eba Mon Sep 17 00:00:00 2001
From: hjjeong <hjjeong@wace.me>
Date: Wed, 22 Oct 2025 20:53:46 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=EC=98=81=EC=97=85=20=EC=88=98=EC=A0=95=20?=
 =?UTF-8?q?=EC=BB=A4=EB=B0=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../view/contractMgmt/estimateList_new.jsp    |  32 +-
 .../view/contractMgmt/estimateTemplate1.jsp   |   6 +-
 .../view/contractMgmt/orderMgmtList.jsp       |   8 +-
 .../salesmgmt/salesMgmt/revenueMgmtList.jsp   | 291 ++++++++++++------
 .../SalesNcollectMgmtController.java          |  36 ++-
 .../salesmgmt/mapper/salesNcollectMgmt.xml    |  13 +-
 .../service/SalesNcollectMgmtService.java     |  45 +++
 7 files changed, 302 insertions(+), 129 deletions(-)

diff --git a/WebContent/WEB-INF/view/contractMgmt/estimateList_new.jsp b/WebContent/WEB-INF/view/contractMgmt/estimateList_new.jsp
index 74fd096..1c95d2b 100644
--- a/WebContent/WEB-INF/view/contractMgmt/estimateList_new.jsp
+++ b/WebContent/WEB-INF/view/contractMgmt/estimateList_new.jsp
@@ -310,20 +310,24 @@ var columns = [
 				}
 			}, 
 //				{headerHozAlign : 'center', hozAlign : 'center',	width : '100',		title : '견적단가',		field : 'EST_PRICE'	}, 
-				{headerHozAlign : 'center', hozAlign : 'center',	width : '130',		title : '견적공급가액',	 field : 'EST_TOTAL_AMOUNT',
-					formatter: function(cell, formatterParams, onRendered){
-						var value = fnc_checkNull(cell.getValue());
-						if(value === '' || value === '0') return '';
-						return addComma(value);
-					}
-				}, 
-				{headerHozAlign : 'center', hozAlign : 'center',	width : '150',		title : '견적원화환산공급가액',	 field : 'EST_TOTAL_AMOUNT_KRW',
-					formatter: function(cell, formatterParams, onRendered){
-						var value = fnc_checkNull(cell.getValue());
-						if(value === '' || value === '0') return '';
-						return addComma(value);
-					}
-				}, 
+			{headerHozAlign : 'center', hozAlign : 'right',	width : '130',		title : '견적공급가액',	 field : 'EST_TOTAL_AMOUNT',
+				formatter: function(cell, formatterParams, onRendered){
+					var value = fnc_checkNull(cell.getValue());
+					if(value === '' || value === '0') return '';
+					// 통화 기호 제거 후 콤마 추가
+					var numericValue = String(value).replace(/[^0-9.]/g, '');
+					return addComma(numericValue);
+				}
+			}, 
+			{headerHozAlign : 'center', hozAlign : 'right',	width : '150',		title : '견적원화환산공급가액',	 field : 'EST_TOTAL_AMOUNT_KRW',
+				formatter: function(cell, formatterParams, onRendered){
+					var value = fnc_checkNull(cell.getValue());
+					if(value === '' || value === '0') return '';
+					// 통화 기호 제거 후 콤마 추가
+					var numericValue = String(value).replace(/[^0-9.]/g, '');
+					return addComma(numericValue);
+				}
+			},
 				{headerHozAlign : 'center', hozAlign : 'center',	width : '80',		title : '견적환종',		field : 'CONTRACT_CURRENCY_NAME'	}, 
 				{headerHozAlign : 'center', hozAlign : 'center',	width : '80',		title : '견적환율',		field : 'EXCHANGE_RATE'	}, 
 
diff --git a/WebContent/WEB-INF/view/contractMgmt/estimateTemplate1.jsp b/WebContent/WEB-INF/view/contractMgmt/estimateTemplate1.jsp
index 99ba1c4..361887f 100644
--- a/WebContent/WEB-INF/view/contractMgmt/estimateTemplate1.jsp
+++ b/WebContent/WEB-INF/view/contractMgmt/estimateTemplate1.jsp
@@ -1054,9 +1054,9 @@ function fn_save() {
 		return;
 	}
 	
-	// 합계 계산 (콤마 제거한 순수 숫자)
-	var totalAmount = $("#totalAmount").text().replace(/,/g, "");
-	var totalAmountKRW = $("#totalAmountKRW").text().replace(/,/g, "");
+	// 합계 계산 (통화 기호와 콤마 제거한 순수 숫자)
+	var totalAmount = $("#totalAmount").text().replace(/[^0-9.]/g, "");
+	var totalAmountKRW = $("#totalAmountKRW").text().replace(/[^0-9.]/g, "");
 	
 	// 디버깅: 품목 데이터 확인
 	console.log("저장할 품목 데이터:", items);
diff --git a/WebContent/WEB-INF/view/contractMgmt/orderMgmtList.jsp b/WebContent/WEB-INF/view/contractMgmt/orderMgmtList.jsp
index a491d77..ef7cea3 100644
--- a/WebContent/WEB-INF/view/contractMgmt/orderMgmtList.jsp
+++ b/WebContent/WEB-INF/view/contractMgmt/orderMgmtList.jsp
@@ -169,16 +169,16 @@ var columns = [
 //				{headerHozAlign : 'center', hozAlign : 'center',	width : '100',		title : '단가',			field : 'ORDER_UNIT_PRICE',
 //					formatter:"money", formatterParams:{thousand:",", symbolAfter:"", precision:false,},	
 //				}, 
-			{headerHozAlign : 'center', hozAlign : 'center',	width : '120',		title : '수주공급가액',		field : 'ORDER_SUPPLY_PRICE_SUM',
+			{headerHozAlign : 'center', hozAlign : 'right',	width : '120',		title : '수주공급가액',		field : 'ORDER_SUPPLY_PRICE_SUM',
 				formatter:"money", formatterParams:{thousand:",", symbolAfter:"", precision:false,},	
 			}, 
-			{headerHozAlign : 'center', hozAlign : 'center',	width : '100',		title : '수주부가세',		field : 'ORDER_VAT_SUM',
+			{headerHozAlign : 'center', hozAlign : 'right',	width : '100',		title : '수주부가세',		field : 'ORDER_VAT_SUM',
 				formatter:"money", formatterParams:{thousand:",", symbolAfter:"", precision:false,},	
 			}, 
-			{headerHozAlign : 'center', hozAlign : 'center',	width : '100',		title : '수주총액',			field : 'ORDER_TOTAL_AMOUNT_SUM',
+			{headerHozAlign : 'center', hozAlign : 'right',	width : '100',		title : '수주총액',			field : 'ORDER_TOTAL_AMOUNT_SUM',
 				formatter:"money", formatterParams:{thousand:",", symbolAfter:"", precision:false,},	
 			}, 
-			{headerHozAlign : 'center', hozAlign : 'center',	width : '120',		title : '수주원화총액',		field : 'ORDER_TOTAL_AMOUNT_KRW',
+			{headerHozAlign : 'center', hozAlign : 'right',	width : '120',		title : '수주원화총액',		field : 'ORDER_TOTAL_AMOUNT_KRW',
 				formatter:"money", formatterParams:{thousand:",", symbolAfter:"", precision:false,},	
 			},
 				{headerHozAlign : 'center', hozAlign : 'center',	width : '80',		title : '견적환종',		field : 'CONTRACT_CURRENCY_NAME'	}, 
diff --git a/WebContent/WEB-INF/view/salesmgmt/salesMgmt/revenueMgmtList.jsp b/WebContent/WEB-INF/view/salesmgmt/salesMgmt/revenueMgmtList.jsp
index a2f2ac8..adbbec7 100644
--- a/WebContent/WEB-INF/view/salesmgmt/salesMgmt/revenueMgmtList.jsp
+++ b/WebContent/WEB-INF/view/salesmgmt/salesMgmt/revenueMgmtList.jsp
@@ -27,7 +27,21 @@
 	}
 	
 	$(document).ready(function(){
-		fnc_datepick();
+		_fnc_datepick();
+
+		// select2가 로드되었을 때만 초기화
+		if(typeof $.fn !== 'undefined' && typeof $.fn.select2 === 'function') {
+			$('.select2').select2();
+			
+			// 품번/품명 Select2 AJAX 초기화 (common.js의 새 함수 사용)
+			initPartSelect2Ajax("#search_partNo", "#search_partName", "#search_partObjId", {
+				debug: true  // 디버깅 모드 활성화
+			});
+		} else {
+			console.error('select2 라이브러리가 로드되지 않았습니다.');
+			console.error('$.fn:', $.fn);
+		}
+		
 		//엔터키로 조회
 	   	$("input").keyup(function(e){
 	   		if(e.keyCode == 13){
@@ -40,22 +54,78 @@
 			$("#page").val("1");
 			fn_search();
 		});
+
+		$("#btnDeadline").click(function(){
+			var targetObj = _tabulGrid.getSelectedData();
+				
+			if(1 == targetObj.length){
+				var OBJID = fnc_checkNull(targetObj[0].OBJID);
+				var status = fnc_checkNull(targetObj[0].SALES_STATUS);
+				//var settleAmount = fnc_checkNull(targetObj[0].SETTLE_AMOUNT);
+		
+				if(status == '' || status == null || status == '매출마감'){
+					Swal.fire({
+						title: '선택된 데이터를 매출마감 처리하시겠습니까?',
+						text: '',
+						icon: 'warning',
+						
+						showCancelButton: true, // cancel버튼 보이기. 기본은 원래 없음
+						confirmButtonColor: '#3085d6', // confrim 버튼 색깔 지정
+						cancelButtonColor: '#d33', // cancel 버튼 색깔 지정
+						confirmButtonText: '확인', // confirm 버튼 텍스트 지정
+						cancelButtonText: '취소', // cancel 버튼 텍스트 지정
+						reverseButtons: false, // 버튼 순서 거꾸로
+						
+						}).then(result => {
+						// 만약 Promise리턴을 받으면,
+						if (result.isConfirmed) { // 만약 모달창에서 confirm 버튼을 눌렀다면	
+							$.ajax({
+								url:"/salesNcollectMgmt/salesDeadlineConfirm.do",
+								type:"POST",
+								data: {"OBJID" : OBJID},
+								dataType:"json",
+								success:function(data){
+									Swal.fire(data.msg);
+									fn_search();
+								},
+								error: function(jqxhr, status, error){
+								}
+							});
+						}
+						});			
+				}else{
+					alert("매출마감 전 데이터만 매출마감 가능합니다.");
+					return false;
+				}
+				//var productGroup = fnc_checkNull(targetObj[0].PRODUCT_GROUP);
+				//var product = fnc_checkNull(targetObj[0].PRODUCT);
+				//var releaseObjId = fnc_checkNull(targetObj[0].RELEASE_OBJID);
+			}else if(0 == targetObj.length){
+				Swal.fire("선택된 내용이 없습니다.");
+				return false;
+			}else if(1 < targetObj.length){
+				Swal.fire("한번에 1개의 내용만 등록 가능합니다. ");
+				return false;
+			}
+			//fn_confirm();
+		});
 		
 		fn_search();
 	});
 </script>
 
 <script type="text/javascript">
+
 var columns = [
-	{headerHozAlign : 'center', hozAlign : 'center', width : '120', title : '프로젝트번호', field : 'PROJECT_NO', frozen : true,
-		formatter: fnc_createGridAnchorTag,
-		cellClick: function(e, cell){
-			var rowData = cell.getData();
-			var popup_width = 600;
-			var popup_height = 400;
-			var url = "/salesMgmt/salesRegForm.do?orderNo=" + rowData.PROJECT_NO + "&saleNo=" + (rowData.SALE_NO || '');
-			fn_centerPopup(popup_width, popup_height, url);
-		}
+	{headerHozAlign : 'center', hozAlign : 'center', width : '120', title : '프로젝트번호', field : 'PROJECT_NO', frozen : true
+		// formatter: fnc_createGridAnchorTag,
+		// cellClick: function(e, cell){
+		// 	var rowData = cell.getData();
+		// 	var popup_width = 600;
+		// 	var popup_height = 400;
+		// 	var url = "/salesMgmt/salesRegForm.do?orderNo=" + rowData.PROJECT_NO + "&saleNo=" + (rowData.SALE_NO || '');
+		// 	fn_centerPopup(popup_width, popup_height, url);
+		// }
 	},
 	{headerHozAlign : 'center', hozAlign : 'center', width : '100', title : '주문유형', field : 'ORDER_TYPE'},
 	{headerHozAlign : 'center', hozAlign : 'center', width : '100', title : '제품구분', field : 'PRODUCT_TYPE'},
@@ -167,6 +237,19 @@ function fn_search(){
 			_endLoading();
 		}
 	});
+
+	_tabulGrid = fnc_tabul_search(_tabul_layout_fitColumns, _tabulGrid, "/revenueMgmt/revenueGridList.do", columns, true);
+}
+
+function _fnc_datepick(){
+	var $dateinput = $("input.date_icon");
+	for(var i=0; i<$dateinput.length; i++){
+		$dateinput.eq(i).attr("size","10");
+		$dateinput.eq(i).datepicker({
+			changeMonth:true,
+			changeYear:true
+		});
+	}
 }
 
 // 엑셀 다운로드 실행 중 플래그
@@ -281,107 +364,121 @@ function fn_FileRegist(objId, docType, docTypeName){
 				</div>
 				<div id="plmSearchZon">
 					<table>
-						<colgroup>
-							<col width="120px">
-							<col width="20%">
-							<col width="120px">
-							<col width="20%">
-							<col width="120px">
-							<col width="20%">
-							<col width="120px">
-							<col width="*">
-						</colgroup>
+						
 					<tr>
 						<td class="label"><label for="">주문유형</label></td>
-						<td><select name="orderType" class="select2" style="width:120px;"><option value="">전체</option>${codeMap.orderTypeList}</select></td>
+						<td><select name="orderType" class="select2" style="width:150px;"><option value="">전체</option>${codeMap.orderTypeList}</select></td>
+						
 						<td class="label"><label for="">제품구분</label></td>
 						<td><select name="productType" class="select2" style="width:120px;"><option value="">전체</option>${codeMap.productTypeList}</select></td>
+						
 						<td class="label"><label for="">국내/해외</label></td>
 						<td>
-							<select name="nation" class="select2" style="width:120px;">
-								<option value="">전체</option>
-								<option value="D">국내</option>
-								<option value="E">해외</option>
+							<select name="nation" class="select2" style="width:150px;">
+								<option value="">선택</option>
+								${codeMap.nationList}
 							</select>
 						</td>
+
 						<td class="label"><label for="">유/무상</label></td>
 						<td>
-				<select name="paymentType" class="select2" style="width:120px;">
-					<option value="">전체</option>
-					<option value="N">유상</option>
-					<option value="Y">무상</option>
-				</select>
-			</td>
-       		</tr>
-       		<tr>
-       			<td class="label"><label for="">고객사</label></td>
-							<td><input type="text" name="customer" /></td>
-							<td class="label"><label for="">품번</label></td>
-							<td><input type="text" name="productNo" /></td>
-							<td class="label"><label for="">품명</label></td>
-							<td><input type="text" name="productName" /></td>
-							<td class="label"><label for="">S/N</label></td>
-							<td><input type="text" name="serialNo" /></td>
-						</tr>
-						<tr>
-							<td class="label"><label for="">수주상태</label></td>
-							<td><select name="orderStatus" class="select2" style="width:120px;"><option value="">전체</option>${codeMap.orderStatusList}</select></td>
-							<td class="label"><label for="">발주번호</label></td>
-							<td><input type="text" name="poNo" /></td>
-							<td class="label"><label for="">담당자</label></td>
-							<td><select name="manager" class="select2" style="width:120px;"><option value="">전체</option>${codeMap.managerList}</select></td>
-							<td class="label"><label for="">인도조건</label></td>
-							<td>
-					<select name="incoterms" class="select2" style="width:120px;">
-						<option value="">전체</option>
-						<option value="EXW">EXW</option>
-						<option value="FOB">FOB</option>
-						<option value="CIF">CIF</option>
-						<option value="DDP">DDP</option>
-					</select>
-				</td>
-       		</tr>
-       		<tr>
-       			<td class="label"><label for="">출하대기 상태</label></td>
-       			<td><select name="shippingStatus" class="select2" style="width:120px;"><option value="">전체</option>${codeMap.shippingStatusList}</select></td>
-       			<td class="label"><label for="">출고방법</label></td>
-       			<td>
-					<select name="shippingMethod" class="select2" style="width:120px;">
-						<option value="">전체</option>
-						<option value="DIRECT">직납</option>
-						<option value="PARCEL">택배</option>
-					</select>
-				</td>
-       			<td class="label"><label for="">요청납기</label></td>
-       			<td colspan="3"><input type="date" name="requestDateFrom" /> ~ <input type="date" name="requestDateTo" /></td>
-       		</tr>
-       		<tr>
-       			<td class="label"><label for="">발주일</label></td>
-       			<td colspan="3"><input type="date" name="orderDateFrom" /> ~ <input type="date" name="orderDateTo" /></td>
-       			<td class="label"><label for="">출고일</label></td>
-       			<td colspan="3"><input type="date" name="shippingDateFrom" /> ~ <input type="date" name="shippingDateTo" /></td>
-       		</tr>
-					</table>
-				</div>
+							<select name="paymentType" class="select2" style="width:120px;">
+								<option value="">전체</option>
+								<option value="N">유상</option>
+								<option value="Y">무상</option>
+							</select>
+						</td>
+						
+						<td><label for="customer_objid">고객사</label></td>
+						<td>
+							<select name="customer_objid" id="customer_objid" style="width:150px" class="select2" autocomplete="off">
+								<option value="">선택</option>
+								${codeMap.customer_cd}
+							</select>
+						</td>
+
+						<td class="align_r">
+							<label for="" class="">품번</label>
+						</td>
+						<td>
+							<select name="search_partNo" id="search_partNo" class="select2-part" style="width: 100%;">
+								<option value="">품번 선택</option>
+							</select>
+							<input type="hidden" name="search_partObjId" id="search_partObjId" value=""/>
+						</td>
+						<td class="align_r">
+							<label for="" class="">품명</label>
+						</td>
+						<td colspan="3">
+							<select name="search_partName" id="search_partName" class="select2-part" style="width: 100%;">
+								<option value="">품명 선택</option>
+							</select>
+						</td>
+					</tr>
+
+					<tr>						
+						<td class="label"><label for="">S/N</label></td>
+						<td><input type="text" name="serialNo" /></td>
+
+						<td class="label"><label for="">수주상태</label></td>
+						<td><select name="orderStatus" class="select2" style="width:120px;"><option value="">전체</option>${codeMap.orderStatusList}</select></td>
+						
+						<td class="label"><label for="">발주번호</label></td>
+						<td><input type="text" name="poNo" /></td>
+
+						<td class="label"><label for="">담당자</label></td>
+						<td><select name="manager" class="select2" style="width:120px;"><option value="">전체</option>${codeMap.managerList}</select></td>
+						
+						<td class="label"><label for="">인도조건</label></td>
+						<td>
+							<select name="incoterms" class="select2" style="width:150px;">
+								<option value="">전체</option>
+								<option value="EXW">EXW</option>
+								<option value="FOB">FOB</option>
+								<option value="CIF">CIF</option>
+								<option value="DDP">DDP</option>
+							</select>
+						</td>
+
+						<td class="label"><label for="">출하대기 상태</label></td>
+						<td><select name="shippingStatus" class="select2" style="width:150px;"><option value="">전체</option>${codeMap.shippingStatusList}</select></td>
+						<td class="label"><label for="">출고방법</label></td>
+						<td>
+							<select name="shippingMethod" class="select2" style="width:150px;">
+								<option value="">전체</option>
+								<option value="DIRECT">직납</option>
+								<option value="PARCEL">택배</option>
+							</select>
+						</td>
+					</tr>
+
+       				<tr>
+       			
+						<td class="label"><label for="">요청납기</label></td>
+						<td colspan="3"><input type="text" name="requestDateFrom" class="date_icon"/> ~ <input type="text" name="requestDateTo" class="date_icon"/></td>
+
+						<td class="label"><label for="">발주일</label></td>
+						<td colspan="3"><input type="text" name="orderDateFrom" class="date_icon"/> ~ <input type="text" name="orderDateTo" class="date_icon"/></td>
+						<td class="label"><label for="">출고일</label></td>
+						<td colspan="3"><input type="text" name="shippingDateFrom" class="date_icon"/> ~ <input type="text" name="shippingDateTo" class="date_icon"/></td>
+					</tr>
+				</table>
+			</div>
 				
 				<!-- Total 합계 표시 영역 -->
-				<div style="padding: 15px 0; background: #f5f5f5; border-radius: 4px; margin: 10px 0;">
-					<table style="width: 100%; max-width: 800px; margin: 0 auto;">
-						<tr>
-							<td style="text-align: center; padding: 8px; font-weight: bold; font-size: 14px;">
-								Total 공급가액: <span id="totalSupplyPrice" style="color: #2196F3;">0</span> 원
-							</td>
-							<td style="text-align: center; padding: 8px; font-weight: bold; font-size: 14px;">
-								Total 부가세: <span id="totalVat" style="color: #FF9800;">0</span> 원
-							</td>
-							<td style="text-align: center; padding: 8px; font-weight: bold; font-size: 14px;">
-								Total 총액: <span id="totalAmount" style="color: #4CAF50;">0</span> 원
-							</td>
-						</tr>
-					</table>
+				<div style="padding: 3px 10px; background: #f5f5f5; border-radius: 3px; margin: 0px 0;">
+					<span style="font-weight: bold; font-size: 12px; margin-right: 20px;">
+						Total 공급가액: <span id="totalSupplyPrice" style="color: #2196F3;">0</span> 원
+					</span>
+					<span style="font-weight: bold; font-size: 12px; margin-right: 20px;">
+						Total 부가세: <span id="totalVat" style="color: #FF9800;">0</span> 원
+					</span>
+					<span style="font-weight: bold; font-size: 12px;">
+						Total 총액: <span id="totalAmount" style="color: #4CAF50;">0</span> 원
+					</span>
 				</div>
 	        		
-	        		<%@include file= "/WEB-INF/view/common/common_gridArea.jsp" %>
+				<%@include file= "/WEB-INF/view/common/common_gridArea.jsp" %>
 			</div>
 		</div>
 	</div>
diff --git a/src/com/pms/salesmgmt/controller/SalesNcollectMgmtController.java b/src/com/pms/salesmgmt/controller/SalesNcollectMgmtController.java
index 7160bcb..01284b6 100644
--- a/src/com/pms/salesmgmt/controller/SalesNcollectMgmtController.java
+++ b/src/com/pms/salesmgmt/controller/SalesNcollectMgmtController.java
@@ -106,22 +106,24 @@ public class SalesNcollectMgmtController {
 			Map<String, Object> codeMap = new HashMap<String, Object>();
 			
 			// 주문유형
-			codeMap.put("orderTypeList", 
-					salesMgmtCommonService.bizMakeOptionList("GE", "", "salesMgmtCommon.getCodeList"));
+			codeMap.put("orderTypeList" , commonService.bizMakeOptionList("0000167", "" , "common.getCodeselect"));
+
 			// 제품구분
-			codeMap.put("productTypeList", 
-					salesMgmtCommonService.bizMakeOptionList("", "", "salesMgmtCommon.getGoodsList"));
+			codeMap.put("productTypeList", commonService.bizMakeOptionList("0000001", "", "common.getCodeselect"));
+
 			// 국내/해외
-			codeMap.put("nationList", 
-					salesMgmtCommonService.bizMakeOptionList("AR", "", "salesMgmtCommon.getCodeList"));
+			codeMap.put("nationList", commonService.bizMakeOptionList("0001219", "", "common.getCodeselect"));
+			//고객사
+			codeMap.put("customer_cd",commonService.bizMakeOptionList("", CommonUtils.nullToEmpty((String)paramMap.get("customer_objid")),"common.getsupplyselect"));
 			/*
 			// 유/무상
 			codeMap.put("paymentTypeList", 
 					salesMgmtCommonService.bizMakeOptionList("0000156", "", "salesMgmtCommon.getCodeList"));
 			*/
 			// 수주상태
-			codeMap.put("orderStatusList", 
-					commonService.bizMakeOptionList("0000932", "", "common.getCodeselect"));
+			codeMap.put("orderStatusList", commonService.bizMakeOptionList("0000963", "", "common.getCodeselect"));
+			//codeMap.put("orderStatusList", 
+			//		commonService.bizMakeOptionList("0000932", "", "common.getCodeselect"));
 			// 출하대기 상태
 			codeMap.put("shippingStatusList", 
 					salesMgmtCommonService.bizMakeOptionList("SH", "", "salesMgmtCommon.getCodeList"));
@@ -131,8 +133,9 @@ public class SalesNcollectMgmtController {
 					salesMgmtCommonService.bizMakeOptionList("SM", "", "salesMgmtCommon.getCodeList"));
 			*/
 			// 담당자
-			codeMap.put("managerList", 
-					salesMgmtCommonService.bizMakeOptionList("", "", "salesMgmtCommon.getSalesmanList"));
+			codeMap.put("managerList", commonService.bizMakeOptionList("", "", "common.getUserselect"));
+			//codeMap.put("managerList", 
+			//		salesMgmtCommonService.bizMakeOptionList("", "", "salesMgmtCommon.getSalesmanList"));
 			/*
 			// 인도조건
 			codeMap.put("incotermsList", 
@@ -725,4 +728,17 @@ public class SalesNcollectMgmtController {
 		
 		return resultMap;
 	}
+
+	/**
+	 * 매출마감 처리
+	 * @param request
+	 * @param paramMap
+	 * @return
+	 */
+	@ResponseBody
+	@RequestMapping("/salesNcollectMgmt/salesDeadlineConfirm.do")
+	public Map salesDeadlineConfirm(HttpServletRequest request, @RequestParam Map<String, Object> paramMap){
+		Map resultMap = salesNcollectMgmtService.salesDeadlineConfirm(request, paramMap);
+		return resultMap;
+	}
 }
diff --git a/src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml b/src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml
index 3fd34e5..93cd608 100644
--- a/src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml
+++ b/src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml
@@ -816,6 +816,8 @@
 	<select id="getSalesMgmtGridList" parameterType="map" resultType="map">
 		/* salesNcollectMgmt.getSalesMgmtGridList - project_mgmt 테이블 기반 조회 (S/N, 유무상 포함) */
 		SELECT 
+			T.OBJID,
+			T.CONTRACT_OBJID,
 			T.PROJECT_NO,
 			CODE_NAME(T.CATEGORY_CD) AS ORDER_TYPE,
 			CODE_NAME(T.PRODUCT) AS PRODUCT_TYPE,
@@ -963,7 +965,7 @@
 			LIMIT 1
 			
 		), '') AS INCOTERMS,
-			'N' AS SALES_STATUS,
+			T.SALES_STATUS,
 			T.OBJID::VARCHAR AS SALE_NO,
 			'ORIGINAL' AS RECORD_TYPE,
 			'' AS SPLIT_LOG_ID
@@ -978,6 +980,9 @@
 		<if test="nation != null and nation != ''">
 			AND T.AREA_CD = #{nation}
 		</if>
+		<if test="customer_objid != null and customer_objid != ''">
+			AND T.CUSTOMER_OBJID = #{customer_objid}
+		</if>
 		<if test="customer != null and customer != ''">
 			AND EXISTS (
 				SELECT 1 FROM SUPPLY_MNG 
@@ -1540,5 +1545,11 @@
 		WHERE T.PROJECT_NO = #{orderNo}
 	</select>
 	
+	<update id="salesDeadlineConfirm" parameterType="map">
+		UPDATE PROJECT_MGMT SET
+		     SALES_STATUS 		 = '완료'
+		WHERE OBJID = #{OBJID}
+	</update>
+
 </mapper>
 
diff --git a/src/com/pms/salesmgmt/service/SalesNcollectMgmtService.java b/src/com/pms/salesmgmt/service/SalesNcollectMgmtService.java
index 1d42f27..d3cda78 100644
--- a/src/com/pms/salesmgmt/service/SalesNcollectMgmtService.java
+++ b/src/com/pms/salesmgmt/service/SalesNcollectMgmtService.java
@@ -16,6 +16,7 @@ import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.session.SqlSession;
@@ -790,4 +791,48 @@ public class SalesNcollectMgmtService {
 		
 		return resultMap;
 	}
+
+	/**
+	 * 매출마감 처리
+	 * @param request
+	 * @param paramMap
+	 * @return
+	 */
+	public Map salesDeadlineConfirm(HttpServletRequest request,Map paramMap){
+		Map resultMap = new HashMap();
+		SqlSession sqlSession = SqlMapConfig.getInstance().getSqlSession(false);
+		try{
+			
+			/*String checkParam = CommonUtils.checkNull(paramMap.get("checkArr"));
+			String[] targetObjIdList = checkParam.split(","); 
+			
+			if(null != targetObjIdList && 0 < targetObjIdList.length){*/
+				
+				HttpSession session = request.getSession();
+				sqlSession = SqlMapConfig.getInstance().getSqlSession();
+				PersonBean person = (PersonBean)session.getAttribute(Constants.PERSON_BEAN);
+				
+				String userId = person.getUserId();
+				
+				/*for(int i=0;i<targetObjIdList.length;i++){*/
+					//String objId = CommonUtils.checkNull(targetObjIdList[i]);
+					//HashMap sqlParamMap = new HashMap();
+					//sqlParamMap.put("OBJID", objId);
+					//paramMap.put("PAYMENT_DATE", CommonUtils.getDateTime(new Date(), "yyyy-MM-dd"));
+					sqlSession.update("salesNcollectMgmt.salesDeadlineConfirm",paramMap);
+				/*}*/
+				sqlSession.commit();
+				resultMap.put("result", true);
+				resultMap.put("msg", "확인되었습니다");
+			/*}*/
+		}catch(Exception e){
+			resultMap.put("result", false);
+			resultMap.put("msg", "확인에 실패하였습니다");
+			sqlSession.rollback();
+			throw e;
+		}finally{
+			sqlSession.close();
+		}
+		return resultMap;
+	}
 }

From d45261788cd0175219e109c00be5bb7e720bb616 Mon Sep 17 00:00:00 2001
From: Johngreen <ramses203@naver.com>
Date: Wed, 22 Oct 2025 21:00:17 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=EC=88=98=EC=A3=BC/=EB=A7=A4=EC=B6=9C=20?=
 =?UTF-8?q?=EA=B4=80=EB=A6=AC=20=EA=B8=B0=EB=8A=A5=20=EC=88=98=EC=A0=95=20?=
 =?UTF-8?q?-=20ORDER=5FDATE=20=ED=95=84=EB=93=9C=20=EC=B6=94=EA=B0=80=20?=
 =?UTF-8?q?=EB=B0=8F=20=EC=88=98=EC=A3=BC=20=ED=95=A9=EA=B3=84=20=EC=A0=95?=
 =?UTF-8?q?=EB=B3=B4=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/pms/salesmgmt/mapper/contractMgmt.xml |  57 +--
 .../salesmgmt/mapper/salesNcollectMgmt.xml    | 446 ++++++------------
 .../salesmgmt/salesMgmt/revenueMgmtList.jsp   |   2 +-
 .../salesmgmt/salesMgmt/salesMgmtList.jsp     |   2 +-
 .../view/salesmgmt/salesMgmt/salesRegForm.jsp |  61 ++-
 .../SalesNcollectMgmtController.java          |  29 +-
 .../salesmgmt/mapper/salesNcollectMgmt.xml    | 153 +++---
 7 files changed, 306 insertions(+), 444 deletions(-)

diff --git a/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/contractMgmt.xml b/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/contractMgmt.xml
index 844c376..4717863 100644
--- a/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/contractMgmt.xml
+++ b/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/contractMgmt.xml
@@ -463,7 +463,7 @@
 					,TO_CHAR(REGDATE,'YYYY-MM-DD') AS REG_DATE
 					,WRITER
 					,(SELECT USER_NAME FROM USER_INFO AS O WHERE O.USER_ID = T.WRITER ) AS WRITER_NAME
-					,(SELECT COUNT(1) FROM ATTACH_FILE_INFO WHERE TARGET_OBJID = T.OBJID AND DOC_TYPE='ORDER_DOC' AND UPPER(STATUS) = 'ACTIVE') AS CU01_CNT
+					,(SELECT COUNT(1) FROM ATTACH_FILE_INFO WHERE TARGET_OBJID = T.OBJID AND DOC_TYPE IN ('FTC_ORDER', 'ORDER') AND UPPER(STATUS) = 'ACTIVE') AS CU01_CNT
 					<!-- ,(SELECT COUNT(1) FROM ATTACH_FILE_INFO WHERE TARGET_OBJID = T.OBJID AND DOC_TYPE='contractMgmt01' AND UPPER(STATUS) = 'ACTIVE') AS CU01_CNT
 					,(SELECT COUNT(1) FROM ATTACH_FILE_INFO WHERE TARGET_OBJID = T.OBJID AND DOC_TYPE='contractMgmt02' AND UPPER(STATUS) = 'ACTIVE') AS CU02_CNT -->
 					,(CASE WHEN (RESULT_CD is null or RESULT_CD ='') and (SPEC_RESULT_CD is null or RESULT_CD ='') and (EST_RESULT_CD is null or RESULT_CD ='') then '0'
@@ -574,7 +574,7 @@
 					AND DUE_DATE != ''
 				) AS OTHER_DUE_DATE_COUNT
 				,(
-					SELECT RETURN_REASON
+					SELECT CODE_NAME(RETURN_REASON)
 					FROM CONTRACT_ITEM
 					WHERE CONTRACT_OBJID = T.OBJID
 					AND STATUS = 'ACTIVE'
@@ -942,9 +942,7 @@
 			,CONTRACT_DEL_DATE
 			,CONTRACT_COMPANY
 			,CONTRACT_DATE
-			,PO_NO
 			,MANUFACTURE_PLANT
-			,CONTRACT_RESULT
 			,PROJECT_NAME
 			,SPEC_USER_ID
 			,SPEC_PLAN_DATE
@@ -968,12 +966,7 @@
 			,QUANTITY
 			,CUSTOMER_REQUEST
 			,EXCHANGE_RATE
-			,ORDER_DATE
-			,ORDER_UNIT_PRICE
-			,ORDER_SUPPLY_PRICE
-			,ORDER_VAT
-			,ORDER_TOTAL_AMOUNT
-	)
+		)
 	VALUES
 	(
 			#{objId}
@@ -1009,9 +1002,7 @@
 			,#{contract_del_date}
 			,#{contract_company}
 			,#{contract_date}
-			,#{po_no}
 			,#{manufacture_plant}
-			,#{contract_result}
 			,#{project_name}
 			,#{spec_user_id}
 			,#{spec_plan_date}
@@ -1035,12 +1026,7 @@
 			,#{quantity}
 			,#{customer_request}
 			,#{exchange_rate}
-			,#{order_date}
-			,#{unit_price}
-			,#{supply_price}
-			,#{vat}
-			,#{total_amount}
-	)
+		)
 	ON CONFLICT (OBJID) DO
 	UPDATE
 	   SET
@@ -1073,11 +1059,9 @@
 			,CONTRACT_DEL_DATE       =  #{contract_del_date}   
 			,CONTRACT_COMPANY        =  #{contract_company}    
 			,CONTRACT_DATE           =  #{contract_date}       
-			,PO_NO                   =  #{po_no}               
 			,MANUFACTURE_PLANT       =  #{manufacture_plant}   
-			,CONTRACT_RESULT         =  #{contract_result}   
 			,PROJECT_NAME  			 =  #{project_name}   
-			,SPEC_USER_ID            =  #{spec_user_id}  
+			,SPEC_USER_ID            =  #{spec_user_id}
 			,SPEC_PLAN_DATE          =  #{spec_plan_date}
 			,SPEC_COMP_DATE          =  #{spec_comp_date}
 			,SPEC_RESULT_CD          =  #{spec_result_cd}
@@ -1098,12 +1082,7 @@
 			,SERIAL_NO               =  #{serial_no} 
 			,QUANTITY                =  #{quantity} 
 			,CUSTOMER_REQUEST        =  #{customer_request} 
-			,EXCHANGE_RATE           =  #{exchange_rate} 
-            ,ORDER_DATE				 = #{order_date}
-            ,ORDER_UNIT_PRICE		 = #{unit_price}
-            ,ORDER_SUPPLY_PRICE		 = #{supply_price}
-            ,ORDER_VAT				 = #{vat}
-            ,ORDER_TOTAL_AMOUNT		 = #{total_amount}
+			,EXCHANGE_RATE           =  #{exchange_rate}
 	</update>
 
 	<update id="saveContractMgmtInfo_old" parameterType="map">
@@ -3979,6 +3958,7 @@ ORDER BY ASM.SUPPLY_NAME
 		TEMPLATE_OBJID,
 		SEQ,
 		CATEGORY,
+		PART_OBJID,
 		DESCRIPTION,
 		SPECIFICATION,
 		QUANTITY,
@@ -4001,6 +3981,7 @@ ORDER BY ASM.SUPPLY_NAME
 		TEMPLATE_OBJID,
 		SEQ,
 		CATEGORY,
+		PART_OBJID,
 		DESCRIPTION,
 		SPECIFICATION,
 		QUANTITY,
@@ -4115,6 +4096,7 @@ WHERE
 		TEMPLATE_OBJID,
 		SEQ,
 		CATEGORY,
+		PART_OBJID,
 		DESCRIPTION,
 		SPECIFICATION,
 		QUANTITY,
@@ -4128,18 +4110,13 @@ WHERE
 		#{template_objid},
 		(item->>'seq')::INTEGER,
 		item->>'category',
+		item->>'part_objid',
 		item->>'description',
 		item->>'specification',
 		item->>'quantity',
 		item->>'unit',
-		CASE 
-			WHEN item->>'unit_price' = '' THEN NULL
-			ELSE (item->>'unit_price')::NUMERIC
-		END,
-		CASE 
-			WHEN item->>'amount' = '' THEN NULL
-			ELSE (item->>'amount')::NUMERIC
-		END,
+		item->>'unit_price',
+		item->>'amount',
 		item->>'note',
 		item->>'remark'
 	FROM json_array_elements(#{items_json}::json) AS item
@@ -4707,4 +4684,14 @@ WHERE
 	WHERE ITEM_OBJID = #{itemObjId}
 </update>
 
+<!-- 고객사 담당자 정보 조회 -->
+<select id="getCustomerContactInfo" parameterType="map" resultType="map">
+	SELECT 
+		REG_ID AS CONTACT_PERSON,
+		SUPPLY_TEL_NO AS CELL_PHONE,
+		EMAIL
+	FROM SUPPLY_MNG
+	WHERE OBJID = #{customerObjId}::NUMERIC
+</select>
+
 </mapper>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml b/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml
index 3fd34e5..d3d579b 100644
--- a/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml
+++ b/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml
@@ -814,9 +814,10 @@
 	
 	<!-- 매출관리 그리드 목록 - project_mgmt 테이블 기반 조회 (S/N, 유무상 포함) -->
 	<select id="getSalesMgmtGridList" parameterType="map" resultType="map">
-		/* salesNcollectMgmt.getSalesMgmtGridList - project_mgmt 테이블 기반 조회 (S/N, 유무상 포함) */
+		/* salesNcollectMgmt.getSalesMgmtGridList - sales_registration LEFT JOIN으로 최적화 */
 		SELECT 
 			T.PROJECT_NO,
+			T.CONTRACT_OBJID,
 			CODE_NAME(T.CATEGORY_CD) AS ORDER_TYPE,
 			CODE_NAME(T.PRODUCT) AS PRODUCT_TYPE,
 			CODE_NAME(T.AREA_CD) AS NATION,
@@ -829,145 +830,68 @@
 					ELSE CM.PAID_TYPE
 				END 
 			FROM CONTRACT_MGMT CM WHERE CM.OBJID = T.CONTRACT_OBJID) AS PAYMENT_TYPE,
-			T.PART_NO AS PRODUCT_NO,
-			T.PART_NAME AS PRODUCT_NAME,
-			COALESCE(
-				(SELECT 
-					CASE 
-						WHEN COUNT(*) = 0 THEN ''
-						WHEN COUNT(*) = 1 THEN MIN(CIS.SERIAL_NO)
-						ELSE MIN(CIS.SERIAL_NO) || ' 외 ' || (COUNT(*) - 1)::TEXT || '건'
-					END
-				 FROM CONTRACT_ITEM CI
-				 LEFT JOIN CONTRACT_ITEM_SERIAL CIS ON CI.OBJID = CIS.ITEM_OBJID
-				 WHERE CI.CONTRACT_OBJID = T.CONTRACT_OBJID
-				 AND UPPER(CIS.STATUS) = 'ACTIVE'
-				), ''
-			) AS SERIAL_NO,
-			COALESCE(T.QUANTITY::numeric, 0) AS ORDER_QUANTITY,
-			T.DUE_DATE AS REQUEST_DATE,
-			T.CUSTOMER_PROJECT_NAME AS CUSTOMER_REQUEST,
+	T.PART_NO AS PRODUCT_NO,
+	T.PART_NAME AS PRODUCT_NAME,
+	-- S/N: CONTRACT_ITEM_SERIAL에서만 조회 (품목별로 정확하게 매칭)
+	(SELECT
+		CASE
+			WHEN COUNT(*) = 0 THEN ''
+			WHEN COUNT(*) = 1 THEN MIN(CIS.SERIAL_NO)
+			ELSE MIN(CIS.SERIAL_NO) || ' 외 ' || (COUNT(*) - 1)::TEXT || '건'
+		END
+	FROM CONTRACT_ITEM CI
+	LEFT JOIN CONTRACT_ITEM_SERIAL CIS ON CI.OBJID = CIS.ITEM_OBJID
+	WHERE CI.CONTRACT_OBJID = T.CONTRACT_OBJID 
+		AND CI.PART_OBJID = T.PART_OBJID
+		AND CI.STATUS = 'ACTIVE'
+		AND UPPER(CIS.STATUS) = 'ACTIVE' 
+		AND CIS.SERIAL_NO IS NOT NULL) AS SERIAL_NO,
+		COALESCE(T.QUANTITY::numeric, 0) AS ORDER_QUANTITY,
+		-- 요청납기: CONTRACT_ITEM 우선, 없으면 PROJECT_MGMT, 없으면 CONTRACT_MGMT
+		COALESCE(
+			(SELECT CI.DUE_DATE 
+			 FROM CONTRACT_ITEM CI 
+			 WHERE CI.CONTRACT_OBJID = T.CONTRACT_OBJID 
+			   AND CI.PART_OBJID = T.PART_OBJID 
+			   AND CI.STATUS = 'ACTIVE'),
+			T.DUE_DATE, 
+			(SELECT CM.due_date FROM CONTRACT_MGMT CM WHERE CM.OBJID = T.CONTRACT_OBJID)
+		) AS REQUEST_DATE,
+			COALESCE(T.CUSTOMER_PROJECT_NAME, (SELECT CM.customer_request FROM CONTRACT_MGMT CM WHERE CM.OBJID = T.CONTRACT_OBJID)) AS CUSTOMER_REQUEST,
 			CODE_NAME(T.CONTRACT_RESULT) AS ORDER_STATUS,
 			T.PO_NO,
-			T.CONTRACT_DATE AS ORDER_DATE,
+			COALESCE(T.CONTRACT_DATE, (SELECT CM.order_date FROM CONTRACT_MGMT CM WHERE CM.OBJID = T.CONTRACT_OBJID)) AS ORDER_DATE,
 			CASE WHEN EXISTS(
 				SELECT 1 FROM ATTACH_FILE_INFO 
-				WHERE TARGET_OBJID = T.OBJID::VARCHAR 
+				WHERE TARGET_OBJID = T.CONTRACT_OBJID
 				AND DOC_TYPE='ORDER_DOC' 
 				AND UPPER(STATUS) = 'ACTIVE'
-		) THEN 'Y' ELSE 'N' END AS ORDER_ATTACH,
-		(SELECT CM.PRODUCTION_STATUS FROM CONTRACT_MGMT CM WHERE CM.OBJID = T.CONTRACT_OBJID) AS PRODUCTION_STATUS,
-		COALESCE((
-			SELECT SL.SHIPPING_STATUS 
-			FROM SHIPMENT_LOG SL 
-			WHERE SL.TARGET_OBJID = T.PROJECT_NO 
-			AND SL.LOG_TYPE = 'SALES_REGISTRATION'
-			ORDER BY SL.REG_DATE DESC 
-			LIMIT 1
-		), '') AS SHIPPING_ORDER_STATUS,
-		COALESCE((
-			SELECT SL.SPLIT_QUANTITY 
-			FROM SHIPMENT_LOG SL 
-			WHERE SL.TARGET_OBJID = T.PROJECT_NO 
-			AND SL.LOG_TYPE = 'SALES_REGISTRATION'
-			ORDER BY SL.REG_DATE DESC 
-			LIMIT 1
-		), 0) AS SALES_QUANTITY,
-		COALESCE((
-			SELECT SL.SALES_UNIT_PRICE 
-			FROM SHIPMENT_LOG SL 
-			WHERE SL.TARGET_OBJID = T.PROJECT_NO 
-			AND SL.LOG_TYPE = 'SALES_REGISTRATION'
-			ORDER BY SL.REG_DATE DESC 
-			LIMIT 1
-		), 0) AS SALES_UNIT_PRICE,
-		COALESCE((
-			SELECT SL.SALES_SUPPLY_PRICE 
-			FROM SHIPMENT_LOG SL 
-			WHERE SL.TARGET_OBJID = T.PROJECT_NO 
-			AND SL.LOG_TYPE = 'SALES_REGISTRATION'
-			ORDER BY SL.REG_DATE DESC 
-			LIMIT 1
-		), 0) AS SALES_SUPPLY_PRICE,
-		COALESCE((
-			SELECT SL.SALES_VAT 
-			FROM SHIPMENT_LOG SL 
-			WHERE SL.TARGET_OBJID = T.PROJECT_NO 
-			AND SL.LOG_TYPE = 'SALES_REGISTRATION'
-			ORDER BY SL.REG_DATE DESC 
-			LIMIT 1
-		), 0) AS SALES_VAT,
-		COALESCE((
-			SELECT SL.SALES_TOTAL_AMOUNT 
-			FROM SHIPMENT_LOG SL 
-			WHERE SL.TARGET_OBJID = T.PROJECT_NO 
-			AND SL.LOG_TYPE = 'SALES_REGISTRATION'
-			ORDER BY SL.REG_DATE DESC 
-			LIMIT 1
-		), 0) AS SALES_TOTAL_AMOUNT,
-		COALESCE((
-			SELECT SL.SALES_TOTAL_AMOUNT 
-			FROM SHIPMENT_LOG SL 
-			WHERE SL.TARGET_OBJID = T.PROJECT_NO 
-			AND SL.LOG_TYPE = 'SALES_REGISTRATION'
-			ORDER BY SL.REG_DATE DESC 
-			LIMIT 1
-		), 0) AS SALES_TOTAL_AMOUNT_KRW,
-		COALESCE((
-			SELECT SL.SALES_CURRENCY 
-			FROM SHIPMENT_LOG SL 
-			WHERE SL.TARGET_OBJID = T.PROJECT_NO 
-			AND SL.LOG_TYPE = 'SALES_REGISTRATION'
-			ORDER BY SL.REG_DATE DESC 
-			LIMIT 1
-		), T.CONTRACT_CURRENCY) AS SALES_CURRENCY,
-		COALESCE((
-			SELECT SL.SALES_EXCHANGE_RATE 
-			FROM SHIPMENT_LOG SL 
-			WHERE SL.TARGET_OBJID = T.PROJECT_NO 
-			AND SL.LOG_TYPE = 'SALES_REGISTRATION'
-			ORDER BY SL.REG_DATE DESC 
-			LIMIT 1
-		), T.CONTRACT_PRICE_CURRENCY::numeric, 0) AS SALES_EXCHANGE_RATE,
-		COALESCE((
-			SELECT TO_CHAR(SL.SHIPPING_DATE, 'YYYY-MM-DD')
-			FROM SHIPMENT_LOG SL 
-			WHERE SL.TARGET_OBJID = T.PROJECT_NO 
-			AND SL.LOG_TYPE = 'SALES_REGISTRATION'
-			ORDER BY SL.REG_DATE DESC 
-			LIMIT 1
-		), '') AS SHIPPING_DATE,
-		COALESCE((
-			SELECT SL.SHIPPING_METHOD 
-			FROM SHIPMENT_LOG SL 
-			WHERE SL.TARGET_OBJID = T.PROJECT_NO 
-			AND SL.LOG_TYPE = 'SALES_REGISTRATION'
-			ORDER BY SL.REG_DATE DESC 
-			LIMIT 1
-		), '') AS SHIPPING_METHOD,
-		COALESCE((
-			SELECT U.USER_NAME 
-			FROM SHIPMENT_LOG SL 
-			LEFT JOIN USER_INFO U ON U.USER_ID = SL.MANAGER_USER_ID
-			WHERE SL.TARGET_OBJID = T.PROJECT_NO 
-			AND SL.LOG_TYPE = 'SALES_REGISTRATION'
-			ORDER BY SL.REG_DATE DESC 
-			LIMIT 1
-		), (SELECT USER_NAME FROM USER_INFO WHERE USER_ID = T.PM_USER_ID)) AS MANAGER,
-		COALESCE((
-			SELECT SL.INCOTERMS 
-			FROM SHIPMENT_LOG SL 
-			WHERE SL.TARGET_OBJID = T.PROJECT_NO 
-			AND SL.LOG_TYPE = 'SALES_REGISTRATION'
-			ORDER BY SL.REG_DATE DESC 
-			LIMIT 1
-			
-		), '') AS INCOTERMS,
-			'N' AS SALES_STATUS,
+			) THEN 'Y' ELSE 'N' END AS ORDER_ATTACH,
+			(SELECT CM.PRODUCTION_STATUS FROM CONTRACT_MGMT CM WHERE CM.OBJID = T.CONTRACT_OBJID) AS PRODUCTION_STATUS,
+		-- 판매 관련 필드들 (sales_registration 테이블에서 한 번에 가져오기)
+		COALESCE(SR.shipping_order_status, '') AS SHIPPING_ORDER_STATUS,
+		COALESCE(SR.sales_quantity, 0) AS SALES_QUANTITY,
+		COALESCE(SR.sales_unit_price, 0) AS SALES_UNIT_PRICE,
+		COALESCE(SR.sales_supply_price, 0) AS SALES_SUPPLY_PRICE,
+		COALESCE(SR.sales_vat, 0) AS SALES_VAT,
+		COALESCE(SR.sales_total_amount, 0) AS SALES_TOTAL_AMOUNT,
+		COALESCE(SR.sales_total_amount, 0) AS SALES_TOTAL_AMOUNT_KRW,
+		COALESCE(SR.sales_currency, T.CONTRACT_CURRENCY) AS SALES_CURRENCY,
+		CODE_NAME(COALESCE(SR.sales_currency, T.CONTRACT_CURRENCY)) AS SALES_CURRENCY_NAME,
+		COALESCE(SR.sales_exchange_rate, T.CONTRACT_PRICE_CURRENCY::numeric, 0) AS SALES_EXCHANGE_RATE,
+			COALESCE(TO_CHAR(SR.shipping_date, 'YYYY-MM-DD'), '') AS SHIPPING_DATE,
+			COALESCE(SR.shipping_method, '') AS SHIPPING_METHOD,
+			COALESCE(
+				(SELECT USER_NAME FROM USER_INFO WHERE USER_ID = SR.manager_user_id),
+				(SELECT USER_NAME FROM USER_INFO WHERE USER_ID = T.PM_USER_ID)
+			) AS MANAGER,
+			COALESCE(SR.incoterms, '') AS INCOTERMS,
+			T.SALES_STATUS,
 			T.OBJID::VARCHAR AS SALE_NO,
 			'ORIGINAL' AS RECORD_TYPE,
 			'' AS SPLIT_LOG_ID
 		FROM PROJECT_MGMT AS T
+		LEFT JOIN sales_registration SR ON T.PROJECT_NO = SR.project_no
 		WHERE 1 = 1
 		<if test="orderType != null and orderType != ''">
 			AND T.CATEGORY_CD = #{orderType}
@@ -1289,56 +1213,51 @@
 		)
 	</insert>
 	
-	<!--
+	<!-- 
 	/**
-	 * 판매 등록 저장 (shipment_log 테이블 사용)
+	 * 판매 등록 저장 (sales_registration 테이블 사용)
+	 * INSERT 또는 UPDATE (ON CONFLICT로 중복 방지)
 	 * @since 2025.10.22
 	 * @author johngreen
-	 * @version 1.0
+	 * @version 1.1
 	**/
 	-->
 	<insert id="insertSaleRegistration" parameterType="map">
-		/* salesNcollectMgmt.insertSaleRegistration - shipment_log에 판매 데이터 저장 */
-		INSERT INTO shipment_log (
-			target_objid,
-			log_type,
-			log_message,
-			split_quantity,
-			shipping_status,
+		/* salesNcollectMgmt.insertSaleRegistration - sales_registration에 판매 데이터 저장 */
+		INSERT INTO sales_registration (
+			project_no,
+			shipping_order_status,
+			serial_no,
+			sales_quantity,
 			sales_unit_price,
 			sales_supply_price,
 			sales_vat,
 			sales_total_amount,
 			sales_currency,
 			sales_exchange_rate,
-			serial_no,
 			shipping_date,
 			shipping_method,
 			manager_user_id,
 			incoterms,
-			is_split_record,
-			reg_date,
 			reg_user_id
 		) VALUES (
 			#{orderNo},
-			'SALES_REGISTRATION',
-			'판매 등록',
-		#{salesQuantity}::integer,
-		<choose>
-			<when test="shippingOrderStatus != null and shippingOrderStatus != ''">
-				#{shippingOrderStatus},
-			</when>
-			<otherwise>
-				'',
-			</otherwise>
-		</choose>
+			<choose>
+				<when test="shippingOrderStatus != null and shippingOrderStatus != ''">
+					#{shippingOrderStatus},
+				</when>
+				<otherwise>
+					'',
+				</otherwise>
+			</choose>
+			#{serialNo},
+			#{salesQuantity}::integer,
 			#{salesUnitPrice}::numeric,
 			#{salesSupplyPrice}::numeric,
 			#{salesVat}::numeric,
 			#{salesTotalAmount}::numeric,
 			#{salesCurrency},
 			#{salesExchangeRate}::numeric,
-			#{serialNo},
 			<choose>
 				<when test="shippingDate != null and shippingDate != ''">
 					TO_DATE(#{shippingDate}, 'YYYY-MM-DD'),
@@ -1350,10 +1269,25 @@
 			#{shippingMethod},
 			#{manager},
 			#{incoterms},
-			false,
-			NOW(),
 			#{cretEmpNo}
 		)
+		ON CONFLICT (project_no) 
+		DO UPDATE SET
+			shipping_order_status = EXCLUDED.shipping_order_status,
+			serial_no = EXCLUDED.serial_no,
+			sales_quantity = EXCLUDED.sales_quantity,
+			sales_unit_price = EXCLUDED.sales_unit_price,
+			sales_supply_price = EXCLUDED.sales_supply_price,
+			sales_vat = EXCLUDED.sales_vat,
+			sales_total_amount = EXCLUDED.sales_total_amount,
+			sales_currency = EXCLUDED.sales_currency,
+			sales_exchange_rate = EXCLUDED.sales_exchange_rate,
+			shipping_date = EXCLUDED.shipping_date,
+			shipping_method = EXCLUDED.shipping_method,
+			manager_user_id = EXCLUDED.manager_user_id,
+			incoterms = EXCLUDED.incoterms,
+			upd_date = NOW(),
+			upd_user_id = EXCLUDED.reg_user_id
 	</insert>
 	
 	<!-- 
@@ -1366,7 +1300,7 @@
 	**/
 	-->
 	<select id="getSaleInfo" parameterType="map" resultType="map">
-		/* salesNcollectMgmt.getSaleInfo - 판매등록 팝업용 프로젝트 정보 조회 (리스트와 동일한 구조) */
+		/* salesNcollectMgmt.getSaleInfo - 판매등록 팝업용 프로젝트 정보 조회 (sales_registration 테이블 사용) */
 		SELECT 
 			T.PROJECT_NO,
 			CODE_NAME(T.CATEGORY_CD) AS ORDER_TYPE,
@@ -1381,163 +1315,59 @@
 					ELSE CM.PAID_TYPE
 				END 
 			FROM CONTRACT_MGMT CM WHERE CM.OBJID = T.CONTRACT_OBJID) AS PAYMENT_TYPE,
-			T.PART_NO AS PRODUCT_NO,
-			T.PART_NAME AS PRODUCT_NAME,
-		-- S/N 정보 (리스트와 동일: "첫번째 S/N 외 N건")
+	T.PART_NO AS PRODUCT_NO,
+	T.PART_NAME AS PRODUCT_NAME,
+	-- S/N 정보 (CONTRACT_ITEM_SERIAL에서만 조회, 품목별로 정확하게 매칭)
+	(SELECT STRING_AGG(CIS.SERIAL_NO, ',' ORDER BY CIS.SEQ) 
+	 FROM CONTRACT_ITEM CI 
+	 LEFT JOIN CONTRACT_ITEM_SERIAL CIS ON CI.OBJID = CIS.ITEM_OBJID 
+	 WHERE CI.CONTRACT_OBJID = T.CONTRACT_OBJID 
+	   AND CI.PART_OBJID = T.PART_OBJID
+	   AND CI.STATUS = 'ACTIVE'
+	   AND UPPER(CIS.STATUS) = 'ACTIVE' 
+	   AND CIS.SERIAL_NO IS NOT NULL
+	) AS SERIAL_NO,
+		COALESCE(T.QUANTITY::numeric, 0) AS ORDER_QUANTITY,
+		-- 요청납기: CONTRACT_ITEM 우선, 없으면 PROJECT_MGMT, 없으면 CONTRACT_MGMT
 		COALESCE(
-			(SELECT 
-				CASE 
-					WHEN COUNT(*) = 0 THEN ''
-					WHEN COUNT(*) = 1 THEN MIN(CIS.SERIAL_NO)
-					ELSE MIN(CIS.SERIAL_NO) || ' 외 ' || (COUNT(*) - 1)::TEXT || '건'
-				END
-			 FROM CONTRACT_ITEM CI
-			 LEFT JOIN CONTRACT_ITEM_SERIAL CIS ON CI.OBJID = CIS.ITEM_OBJID
-			 WHERE CI.CONTRACT_OBJID = T.CONTRACT_OBJID
-			 AND UPPER(CIS.STATUS) = 'ACTIVE'
-			), ''
-		) AS SERIAL_NO,
-		-- S/N 전체 목록 JSON 형식으로
-		COALESCE(
-			(SELECT 
-				JSON_AGG(
-					JSON_BUILD_OBJECT(
-						'id', sn_data.row_num,
-						'value', sn_data.serial_no
-					)
-				)::TEXT
-			 FROM (
-				SELECT 
-					ROW_NUMBER() OVER (ORDER BY CIS.SERIAL_NO) AS row_num,
-					CIS.SERIAL_NO AS serial_no
-				FROM CONTRACT_ITEM CI
-				LEFT JOIN CONTRACT_ITEM_SERIAL CIS ON CI.OBJID = CIS.ITEM_OBJID
-				WHERE CI.CONTRACT_OBJID = T.CONTRACT_OBJID
-				AND UPPER(CIS.STATUS) = 'ACTIVE'
-				AND CIS.SERIAL_NO IS NOT NULL
-			 ) AS sn_data
-			), '[]'
-		) AS SERIAL_NO_LIST,
-			COALESCE(T.QUANTITY::numeric, 0) AS ORDER_QUANTITY,
-			T.DUE_DATE AS REQUEST_DATE,
-			T.CUSTOMER_PROJECT_NAME AS CUSTOMER_REQUEST,
+			(SELECT CI.DUE_DATE 
+			 FROM CONTRACT_ITEM CI 
+			 WHERE CI.CONTRACT_OBJID = T.CONTRACT_OBJID 
+			   AND CI.PART_OBJID = T.PART_OBJID 
+			   AND CI.STATUS = 'ACTIVE'),
+			T.DUE_DATE, 
+			(SELECT CM.due_date FROM CONTRACT_MGMT CM WHERE CM.OBJID = T.CONTRACT_OBJID)
+		) AS REQUEST_DATE,
+			COALESCE(T.CUSTOMER_PROJECT_NAME, (SELECT CM.customer_request FROM CONTRACT_MGMT CM WHERE CM.OBJID = T.CONTRACT_OBJID)) AS CUSTOMER_REQUEST,
 			CODE_NAME(T.CONTRACT_RESULT) AS ORDER_STATUS,
 			T.PO_NO,
-			T.CONTRACT_DATE AS ORDER_DATE,
+			COALESCE(T.CONTRACT_DATE, (SELECT CM.order_date FROM CONTRACT_MGMT CM WHERE CM.OBJID = T.CONTRACT_OBJID)) AS ORDER_DATE,
 			CASE WHEN EXISTS(
 				SELECT 1 FROM ATTACH_FILE_INFO 
-				WHERE TARGET_OBJID = T.OBJID::VARCHAR 
+				WHERE TARGET_OBJID = T.CONTRACT_OBJID
 				AND DOC_TYPE='ORDER_DOC' 
 				AND UPPER(STATUS) = 'ACTIVE'
-		) THEN 'Y' ELSE 'N' END AS ORDER_ATTACH,
-		(SELECT CM.PRODUCTION_STATUS FROM CONTRACT_MGMT CM WHERE CM.OBJID = T.CONTRACT_OBJID) AS PRODUCTION_STATUS,
-		-- 판매 관련 필드들 (shipment_log에서 가져오기)
-		COALESCE((
-			SELECT SL.SHIPPING_STATUS 
-			FROM SHIPMENT_LOG SL 
-			WHERE SL.TARGET_OBJID = T.PROJECT_NO 
-			AND SL.LOG_TYPE = 'SALES_REGISTRATION'
-			ORDER BY SL.REG_DATE DESC 
-			LIMIT 1
-		), '') AS SHIPPING_ORDER_STATUS,
-		COALESCE((
-			SELECT SL.SPLIT_QUANTITY 
-			FROM SHIPMENT_LOG SL 
-			WHERE SL.TARGET_OBJID = T.PROJECT_NO 
-			AND SL.LOG_TYPE = 'SALES_REGISTRATION'
-			ORDER BY SL.REG_DATE DESC 
-			LIMIT 1
-		), 0) AS SALES_QUANTITY,
-		COALESCE((
-			SELECT SL.SALES_UNIT_PRICE 
-			FROM SHIPMENT_LOG SL 
-			WHERE SL.TARGET_OBJID = T.PROJECT_NO 
-			AND SL.LOG_TYPE = 'SALES_REGISTRATION'
-			ORDER BY SL.REG_DATE DESC 
-			LIMIT 1
-		), 0) AS SALES_UNIT_PRICE,
-		COALESCE((
-			SELECT SL.SALES_SUPPLY_PRICE 
-			FROM SHIPMENT_LOG SL 
-			WHERE SL.TARGET_OBJID = T.PROJECT_NO 
-			AND SL.LOG_TYPE = 'SALES_REGISTRATION'
-			ORDER BY SL.REG_DATE DESC 
-			LIMIT 1
-		), 0) AS SALES_SUPPLY_PRICE,
-		COALESCE((
-			SELECT SL.SALES_VAT 
-			FROM SHIPMENT_LOG SL 
-			WHERE SL.TARGET_OBJID = T.PROJECT_NO 
-			AND SL.LOG_TYPE = 'SALES_REGISTRATION'
-			ORDER BY SL.REG_DATE DESC 
-			LIMIT 1
-		), 0) AS SALES_VAT,
-		COALESCE((
-			SELECT SL.SALES_TOTAL_AMOUNT 
-			FROM SHIPMENT_LOG SL 
-			WHERE SL.TARGET_OBJID = T.PROJECT_NO 
-			AND SL.LOG_TYPE = 'SALES_REGISTRATION'
-			ORDER BY SL.REG_DATE DESC 
-			LIMIT 1
-		), 0) AS SALES_TOTAL_AMOUNT,
-		COALESCE((
-			SELECT SL.SALES_TOTAL_AMOUNT 
-			FROM SHIPMENT_LOG SL 
-			WHERE SL.TARGET_OBJID = T.PROJECT_NO 
-			AND SL.LOG_TYPE = 'SALES_REGISTRATION'
-			ORDER BY SL.REG_DATE DESC 
-			LIMIT 1
-		), 0) AS SALES_TOTAL_AMOUNT_KRW,
-		COALESCE((
-			SELECT SL.SALES_CURRENCY 
-			FROM SHIPMENT_LOG SL 
-			WHERE SL.TARGET_OBJID = T.PROJECT_NO 
-			AND SL.LOG_TYPE = 'SALES_REGISTRATION'
-			ORDER BY SL.REG_DATE DESC 
-			LIMIT 1
-		), T.CONTRACT_CURRENCY) AS SALES_CURRENCY,
-		COALESCE((
-			SELECT SL.SALES_EXCHANGE_RATE 
-			FROM SHIPMENT_LOG SL 
-			WHERE SL.TARGET_OBJID = T.PROJECT_NO 
-			AND SL.LOG_TYPE = 'SALES_REGISTRATION'
-			ORDER BY SL.REG_DATE DESC 
-			LIMIT 1
-		), T.CONTRACT_PRICE_CURRENCY::numeric, 0) AS SALES_EXCHANGE_RATE,
-		COALESCE((
-			SELECT TO_CHAR(SL.SHIPPING_DATE, 'YYYY-MM-DD')
-			FROM SHIPMENT_LOG SL 
-			WHERE SL.TARGET_OBJID = T.PROJECT_NO 
-			AND SL.LOG_TYPE = 'SALES_REGISTRATION'
-			ORDER BY SL.REG_DATE DESC 
-			LIMIT 1
-		), '') AS SHIPPING_DATE,
-		COALESCE((
-			SELECT SL.SHIPPING_METHOD 
-			FROM SHIPMENT_LOG SL 
-			WHERE SL.TARGET_OBJID = T.PROJECT_NO 
-			AND SL.LOG_TYPE = 'SALES_REGISTRATION'
-			ORDER BY SL.REG_DATE DESC 
-			LIMIT 1
-		), '') AS SHIPPING_METHOD,
-		COALESCE((
-			SELECT SL.MANAGER_USER_ID
-			FROM SHIPMENT_LOG SL 
-			WHERE SL.TARGET_OBJID = T.PROJECT_NO 
-			AND SL.LOG_TYPE = 'SALES_REGISTRATION'
-			ORDER BY SL.REG_DATE DESC 
-			LIMIT 1
-		), T.PM_USER_ID) AS MANAGER,
-		COALESCE((
-			SELECT SL.INCOTERMS 
-			FROM SHIPMENT_LOG SL 
-			WHERE SL.TARGET_OBJID = T.PROJECT_NO 
-			AND SL.LOG_TYPE = 'SALES_REGISTRATION'
-			ORDER BY SL.REG_DATE DESC 
-			LIMIT 1
-		), '') AS INCOTERMS
-		FROM PROJECT_MGMT AS T
-		WHERE T.PROJECT_NO = #{orderNo}
+			) THEN 'Y' ELSE 'N' END AS ORDER_ATTACH,
+			(SELECT CM.PRODUCTION_STATUS FROM CONTRACT_MGMT CM WHERE CM.OBJID = T.CONTRACT_OBJID) AS PRODUCTION_STATUS,
+		-- 판매 관련 필드들 (sales_registration 테이블에서 가져오기)
+		COALESCE(SR.shipping_order_status, '') AS SHIPPING_ORDER_STATUS,
+		COALESCE(SR.sales_quantity, 0) AS SALES_QUANTITY,
+		COALESCE(SR.sales_unit_price, 0) AS SALES_UNIT_PRICE,
+		COALESCE(SR.sales_supply_price, 0) AS SALES_SUPPLY_PRICE,
+	COALESCE(SR.sales_vat, 0) AS SALES_VAT,
+	COALESCE(SR.sales_total_amount, 0) AS SALES_TOTAL_AMOUNT,
+	COALESCE(SR.sales_total_amount, 0) AS SALES_TOTAL_AMOUNT_KRW,
+	COALESCE(NULLIF(SR.sales_currency, ''), CM.CONTRACT_CURRENCY) AS SALES_CURRENCY,
+	CODE_NAME(COALESCE(NULLIF(SR.sales_currency, ''), CM.CONTRACT_CURRENCY)) AS SALES_CURRENCY_NAME,
+	COALESCE(NULLIF(SR.sales_exchange_rate, 0), CM.EXCHANGE_RATE::numeric, 0) AS SALES_EXCHANGE_RATE,
+		COALESCE(TO_CHAR(SR.shipping_date, 'YYYY-MM-DD'), '') AS SHIPPING_DATE,
+		COALESCE(SR.shipping_method, '') AS SHIPPING_METHOD,
+		COALESCE(SR.manager_user_id, T.PM_USER_ID) AS MANAGER,
+		COALESCE(SR.incoterms, '') AS INCOTERMS
+	FROM PROJECT_MGMT AS T
+	LEFT JOIN sales_registration SR ON T.PROJECT_NO = SR.project_no
+	LEFT JOIN CONTRACT_MGMT CM ON CM.OBJID::VARCHAR = T.CONTRACT_OBJID
+	WHERE T.PROJECT_NO = #{orderNo}
 	</select>
 	
 </mapper>
diff --git a/WebContent/WEB-INF/view/salesmgmt/salesMgmt/revenueMgmtList.jsp b/WebContent/WEB-INF/view/salesmgmt/salesMgmt/revenueMgmtList.jsp
index adbbec7..44898ac 100644
--- a/WebContent/WEB-INF/view/salesmgmt/salesMgmt/revenueMgmtList.jsp
+++ b/WebContent/WEB-INF/view/salesmgmt/salesMgmt/revenueMgmtList.jsp
@@ -171,7 +171,7 @@ var columns = [
 	{headerHozAlign : 'center', hozAlign : 'right', width : '120', title : '판매원화총액', field : 'SALES_TOTAL_AMOUNT_KRW',
 		formatter: "money", formatterParams: {thousand: ",", symbolAfter: "", precision: false}
 	},
-	{headerHozAlign : 'center', hozAlign : 'center', width : '80', title : '판매환종', field : 'SALES_CURRENCY'},
+	{headerHozAlign : 'center', hozAlign : 'center', width : '80', title : '판매환종', field : 'SALES_CURRENCY_NAME'},
 	{headerHozAlign : 'center', hozAlign : 'right', width : '100', title : '판매환율', field : 'SALES_EXCHANGE_RATE',
 		formatter: "money", formatterParams: {thousand: ",", symbolAfter: "", precision: 2}
 	},
diff --git a/WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesMgmtList.jsp b/WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesMgmtList.jsp
index 4956074..aa748ad 100644
--- a/WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesMgmtList.jsp
+++ b/WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesMgmtList.jsp
@@ -109,7 +109,7 @@ var columns = [
 	{headerHozAlign : 'center', hozAlign : 'right', width : '120', title : '판매원화총액', field : 'SALES_TOTAL_AMOUNT_KRW',
 		formatter: "money", formatterParams: {thousand: ",", symbolAfter: "", precision: false}
 	},
-	{headerHozAlign : 'center', hozAlign : 'center', width : '80', title : '판매환종', field : 'SALES_CURRENCY'},
+	{headerHozAlign : 'center', hozAlign : 'center', width : '80', title : '판매환종', field : 'SALES_CURRENCY_NAME'},
 	{headerHozAlign : 'center', hozAlign : 'right', width : '100', title : '판매환율', field : 'SALES_EXCHANGE_RATE',
 		formatter: "money", formatterParams: {thousand: ",", symbolAfter: "", precision: 2}
 	},
diff --git a/WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesRegForm.jsp b/WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesRegForm.jsp
index 497e0ac..f80db48 100644
--- a/WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesRegForm.jsp
+++ b/WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesRegForm.jsp
@@ -26,6 +26,9 @@
             $("#manager").val(managerValue).trigger('change');
         }
         
+        // 판매환종 초기값 설정 (견적환종과 동기화)
+        initializeSalesCurrency();
+        
         // S/N 필드 클릭 이벤트
         $("#serialNo").click(function() {
             fn_openSnManagePopup();
@@ -99,6 +102,37 @@
         $("#salesTotalAmount").val(totalAmount);
     }
     
+    // 판매환종 초기값 설정 (견적환종과 동기화하되, 사용자가 변경 가능)
+    function initializeSalesCurrency() {
+        var existingSalesCurrency = "${saleInfo.SALES_CURRENCY}";
+        var contractCurrency = "${orderInfo.SALES_CURRENCY}"; // 견적환종 (SALES_CURRENCY로 통일)
+        var contractExchangeRate = "${orderInfo.SALES_EXCHANGE_RATE}"; // 견적환율
+        
+        console.log("=== 판매환종 초기화 디버그 ===");
+        console.log("기존 판매환종:", existingSalesCurrency);
+        console.log("견적환종:", contractCurrency);
+        console.log("견적환율:", contractExchangeRate);
+        
+        // 이미 저장된 판매환종이 있으면 그대로 사용
+        if(existingSalesCurrency && existingSalesCurrency.trim() !== '') {
+            $("#salesCurrency").val(existingSalesCurrency).trigger('change');
+            console.log("기존 판매환종 사용:", existingSalesCurrency);
+        } 
+        // 없으면 견적환종을 기본값으로 설정
+        else if(contractCurrency && contractCurrency.trim() !== '') {
+            $("#salesCurrency").val(contractCurrency).trigger('change');
+            
+            // 견적환율도 함께 설정
+            if(contractExchangeRate && contractExchangeRate.trim() !== '') {
+                $("#salesExchangeRate").val(contractExchangeRate);
+            }
+            
+            console.log("판매환종 자동 설정: " + contractCurrency + " (견적환종과 동기화)");
+        } else {
+            console.log("견적환종이 없습니다. orderInfo를 확인하세요.");
+        }
+    }
+    
     // 환율 변경 시 원화 금액 재계산
     function fn_recalculateByExchangeRate() {
         var currency = $("#salesCurrency").val();
@@ -580,19 +614,20 @@
                                 <input type="number" name="salesTotalAmount" id="salesTotalAmount" style="width:100%; background-color: #f0f0f0;" value="${saleInfo.SALES_TOTAL_AMOUNT}" readonly />
                             </td>
                         </tr>
-                        <tr>
-                            <td class="input_title"><label for="salesCurrency">판매환종</label></td>
-                            <td class="input_sub_title">
-                                <select name="salesCurrency" id="salesCurrency" style="width:100%;" class="select2" onchange="fn_recalculateByExchangeRate()">
-                                    <option value="">선택</option>
-                                    ${codeMap.salesCurrency}
-                                </select>
-                            </td>
-                            <td class="input_title"><label for="salesExchangeRate">판매환율</label></td>
-                            <td class="input_sub_title">
-                                <input type="number" name="salesExchangeRate" id="salesExchangeRate" style="width:100%;" step="0.01" value="${saleInfo.SALES_EXCHANGE_RATE}" onchange="fn_recalculateByExchangeRate()" />
-                            </td>
-                        </tr>
+                    <tr>
+                        <td class="input_title"><label for="salesCurrency">판매환종</label></td>
+                        <td class="input_sub_title">
+                            <select name="salesCurrency" id="salesCurrency" style="width:100%;" class="select2" onchange="fn_recalculateByExchangeRate()">
+                                <option value="">선택</option>
+                                ${codeMap.salesCurrency}
+                            </select>
+                            <small style="color:#666;">* 최초 저장 시 견적환종이 자동 설정되며, 변경 가능합니다.</small>
+                        </td>
+                        <td class="input_title"><label for="salesExchangeRate">판매환율</label></td>
+                        <td class="input_sub_title">
+                            <input type="number" name="salesExchangeRate" id="salesExchangeRate" style="width:100%;" step="0.01" value="${saleInfo.SALES_EXCHANGE_RATE}" onchange="fn_recalculateByExchangeRate()" />
+                        </td>
+                    </tr>
                         <tr>
                             <td class="input_title"><label for="incoterms">인도조건</label></td>
                             <td class="input_sub_title">
diff --git a/src/com/pms/salesmgmt/controller/SalesNcollectMgmtController.java b/src/com/pms/salesmgmt/controller/SalesNcollectMgmtController.java
index 2754673..c6572a9 100644
--- a/src/com/pms/salesmgmt/controller/SalesNcollectMgmtController.java
+++ b/src/com/pms/salesmgmt/controller/SalesNcollectMgmtController.java
@@ -267,20 +267,23 @@ public class SalesNcollectMgmtController {
 		codeMap.put("managerList", 
 				salesMgmtCommonService.bizMakeOptionList("", "", "salesMgmtCommon.getSalesmanList"));
 		
-		// 기존 판매 정보 조회 후 환종(통화) 공통코드 세팅
-		Map<String, Object> saleInfo = null;
-		String salesCurrency = "";
-		if(paramMap.get("orderNo") != null && !paramMap.get("orderNo").equals("")) {
-			saleInfo = salesNcollectMgmtService.getSaleInfo(paramMap);
-			salesCurrency = CommonUtils.nullToEmpty((String)saleInfo.get("SALES_CURRENCY"));
-			request.setAttribute("saleInfo", saleInfo);
-		}
+	// 기존 판매 정보 조회 후 환종(통화) 공통코드 세팅
+	Map<String, Object> saleInfo = null;
+	String salesCurrency = "";
+	if(paramMap.get("orderNo") != null && !paramMap.get("orderNo").equals("")) {
+		saleInfo = salesNcollectMgmtService.getSaleInfo(paramMap);
+		salesCurrency = CommonUtils.nullToEmpty((String)saleInfo.get("SALES_CURRENCY"));
+		request.setAttribute("saleInfo", saleInfo);
 		
-		// 환종(통화) - 공통코드 0001533
-		codeMap.put("salesCurrency", 
-				commonService.bizMakeOptionList("0001533", salesCurrency, "common.getCodeselect"));
-		
-		request.setAttribute("codeMap", codeMap);
+		// orderInfo로 견적 정보 전달 (saleInfo가 이미 모든 필요한 정보를 포함)
+		request.setAttribute("orderInfo", saleInfo);
+	}
+	
+	// 환종(통화) - 공통코드 0001533
+	codeMap.put("salesCurrency", 
+			commonService.bizMakeOptionList("0001533", salesCurrency, "common.getCodeselect"));
+	
+	request.setAttribute("codeMap", codeMap);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
diff --git a/src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml b/src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml
index e539d51..d3d579b 100644
--- a/src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml
+++ b/src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml
@@ -830,36 +830,33 @@
 					ELSE CM.PAID_TYPE
 				END 
 			FROM CONTRACT_MGMT CM WHERE CM.OBJID = T.CONTRACT_OBJID) AS PAYMENT_TYPE,
-			T.PART_NO AS PRODUCT_NO,
-			T.PART_NAME AS PRODUCT_NAME,
-			-- S/N: sales_registration 우선, 없으면 CONTRACT_ITEM_SERIAL (모두 "외 몇건" 형태로 표시)
-			COALESCE(
-				(SELECT 
-					CASE 
-						WHEN SR.serial_no IS NULL OR SR.serial_no = '' THEN ''
-						ELSE
-							(SELECT 
-								CASE 
-									WHEN array_length(string_to_array(SR.serial_no, ','), 1) = 1 THEN SR.serial_no
-									ELSE (string_to_array(SR.serial_no, ','))[1] || ' 외 ' || (array_length(string_to_array(SR.serial_no, ','), 1) - 1)::TEXT || '건'
-								END
-							)
-					END
-				FROM sales_registration SR WHERE SR.project_no = T.PROJECT_NO
-				),
-				(SELECT
-					CASE
-						WHEN COUNT(*) = 0 THEN ''
-						WHEN COUNT(*) = 1 THEN MIN(CIS.SERIAL_NO)
-						ELSE MIN(CIS.SERIAL_NO) || ' 외 ' || (COUNT(*) - 1)::TEXT || '건'
-					END
-				FROM CONTRACT_ITEM CI
-				LEFT JOIN CONTRACT_ITEM_SERIAL CIS ON CI.OBJID = CIS.ITEM_OBJID
-				WHERE CI.CONTRACT_OBJID = T.CONTRACT_OBJID AND UPPER(CIS.STATUS) = 'ACTIVE' AND CIS.SERIAL_NO IS NOT NULL),
-				''
-			) AS SERIAL_NO,
-			COALESCE(T.QUANTITY::numeric, 0) AS ORDER_QUANTITY,
-			COALESCE(T.DUE_DATE, (SELECT CM.due_date FROM CONTRACT_MGMT CM WHERE CM.OBJID = T.CONTRACT_OBJID)) AS REQUEST_DATE,
+	T.PART_NO AS PRODUCT_NO,
+	T.PART_NAME AS PRODUCT_NAME,
+	-- S/N: CONTRACT_ITEM_SERIAL에서만 조회 (품목별로 정확하게 매칭)
+	(SELECT
+		CASE
+			WHEN COUNT(*) = 0 THEN ''
+			WHEN COUNT(*) = 1 THEN MIN(CIS.SERIAL_NO)
+			ELSE MIN(CIS.SERIAL_NO) || ' 외 ' || (COUNT(*) - 1)::TEXT || '건'
+		END
+	FROM CONTRACT_ITEM CI
+	LEFT JOIN CONTRACT_ITEM_SERIAL CIS ON CI.OBJID = CIS.ITEM_OBJID
+	WHERE CI.CONTRACT_OBJID = T.CONTRACT_OBJID 
+		AND CI.PART_OBJID = T.PART_OBJID
+		AND CI.STATUS = 'ACTIVE'
+		AND UPPER(CIS.STATUS) = 'ACTIVE' 
+		AND CIS.SERIAL_NO IS NOT NULL) AS SERIAL_NO,
+		COALESCE(T.QUANTITY::numeric, 0) AS ORDER_QUANTITY,
+		-- 요청납기: CONTRACT_ITEM 우선, 없으면 PROJECT_MGMT, 없으면 CONTRACT_MGMT
+		COALESCE(
+			(SELECT CI.DUE_DATE 
+			 FROM CONTRACT_ITEM CI 
+			 WHERE CI.CONTRACT_OBJID = T.CONTRACT_OBJID 
+			   AND CI.PART_OBJID = T.PART_OBJID 
+			   AND CI.STATUS = 'ACTIVE'),
+			T.DUE_DATE, 
+			(SELECT CM.due_date FROM CONTRACT_MGMT CM WHERE CM.OBJID = T.CONTRACT_OBJID)
+		) AS REQUEST_DATE,
 			COALESCE(T.CUSTOMER_PROJECT_NAME, (SELECT CM.customer_request FROM CONTRACT_MGMT CM WHERE CM.OBJID = T.CONTRACT_OBJID)) AS CUSTOMER_REQUEST,
 			CODE_NAME(T.CONTRACT_RESULT) AS ORDER_STATUS,
 			T.PO_NO,
@@ -871,16 +868,17 @@
 				AND UPPER(STATUS) = 'ACTIVE'
 			) THEN 'Y' ELSE 'N' END AS ORDER_ATTACH,
 			(SELECT CM.PRODUCTION_STATUS FROM CONTRACT_MGMT CM WHERE CM.OBJID = T.CONTRACT_OBJID) AS PRODUCTION_STATUS,
-			-- 판매 관련 필드들 (sales_registration 테이블에서 한 번에 가져오기)
-			COALESCE(SR.shipping_order_status, '') AS SHIPPING_ORDER_STATUS,
-			COALESCE(SR.sales_quantity, 0) AS SALES_QUANTITY,
-			COALESCE(SR.sales_unit_price, 0) AS SALES_UNIT_PRICE,
-			COALESCE(SR.sales_supply_price, 0) AS SALES_SUPPLY_PRICE,
-			COALESCE(SR.sales_vat, 0) AS SALES_VAT,
-			COALESCE(SR.sales_total_amount, 0) AS SALES_TOTAL_AMOUNT,
-			COALESCE(SR.sales_total_amount, 0) AS SALES_TOTAL_AMOUNT_KRW,
-			COALESCE(SR.sales_currency, T.CONTRACT_CURRENCY) AS SALES_CURRENCY,
-			COALESCE(SR.sales_exchange_rate, T.CONTRACT_PRICE_CURRENCY::numeric, 0) AS SALES_EXCHANGE_RATE,
+		-- 판매 관련 필드들 (sales_registration 테이블에서 한 번에 가져오기)
+		COALESCE(SR.shipping_order_status, '') AS SHIPPING_ORDER_STATUS,
+		COALESCE(SR.sales_quantity, 0) AS SALES_QUANTITY,
+		COALESCE(SR.sales_unit_price, 0) AS SALES_UNIT_PRICE,
+		COALESCE(SR.sales_supply_price, 0) AS SALES_SUPPLY_PRICE,
+		COALESCE(SR.sales_vat, 0) AS SALES_VAT,
+		COALESCE(SR.sales_total_amount, 0) AS SALES_TOTAL_AMOUNT,
+		COALESCE(SR.sales_total_amount, 0) AS SALES_TOTAL_AMOUNT_KRW,
+		COALESCE(SR.sales_currency, T.CONTRACT_CURRENCY) AS SALES_CURRENCY,
+		CODE_NAME(COALESCE(SR.sales_currency, T.CONTRACT_CURRENCY)) AS SALES_CURRENCY_NAME,
+		COALESCE(SR.sales_exchange_rate, T.CONTRACT_PRICE_CURRENCY::numeric, 0) AS SALES_EXCHANGE_RATE,
 			COALESCE(TO_CHAR(SR.shipping_date, 'YYYY-MM-DD'), '') AS SHIPPING_DATE,
 			COALESCE(SR.shipping_method, '') AS SHIPPING_METHOD,
 			COALESCE(
@@ -1317,22 +1315,29 @@
 					ELSE CM.PAID_TYPE
 				END 
 			FROM CONTRACT_MGMT CM WHERE CM.OBJID = T.CONTRACT_OBJID) AS PAYMENT_TYPE,
-			T.PART_NO AS PRODUCT_NO,
-			T.PART_NAME AS PRODUCT_NAME,
-			-- S/N 정보 (sales_registration 우선, 없으면 CONTRACT_ITEM_SERIAL에서)
-			COALESCE(
-				SR.serial_no,
-				(SELECT STRING_AGG(CIS.SERIAL_NO, ',' ORDER BY CIS.SERIAL_NO) 
-				 FROM CONTRACT_ITEM CI 
-				 LEFT JOIN CONTRACT_ITEM_SERIAL CIS ON CI.OBJID = CIS.ITEM_OBJID 
-				 WHERE CI.CONTRACT_OBJID = T.CONTRACT_OBJID 
-				   AND UPPER(CIS.STATUS) = 'ACTIVE' 
-				   AND CIS.SERIAL_NO IS NOT NULL
-				),
-				''
-			) AS SERIAL_NO,
-			COALESCE(T.QUANTITY::numeric, 0) AS ORDER_QUANTITY,
-			COALESCE(T.DUE_DATE, (SELECT CM.due_date FROM CONTRACT_MGMT CM WHERE CM.OBJID = T.CONTRACT_OBJID)) AS REQUEST_DATE,
+	T.PART_NO AS PRODUCT_NO,
+	T.PART_NAME AS PRODUCT_NAME,
+	-- S/N 정보 (CONTRACT_ITEM_SERIAL에서만 조회, 품목별로 정확하게 매칭)
+	(SELECT STRING_AGG(CIS.SERIAL_NO, ',' ORDER BY CIS.SEQ) 
+	 FROM CONTRACT_ITEM CI 
+	 LEFT JOIN CONTRACT_ITEM_SERIAL CIS ON CI.OBJID = CIS.ITEM_OBJID 
+	 WHERE CI.CONTRACT_OBJID = T.CONTRACT_OBJID 
+	   AND CI.PART_OBJID = T.PART_OBJID
+	   AND CI.STATUS = 'ACTIVE'
+	   AND UPPER(CIS.STATUS) = 'ACTIVE' 
+	   AND CIS.SERIAL_NO IS NOT NULL
+	) AS SERIAL_NO,
+		COALESCE(T.QUANTITY::numeric, 0) AS ORDER_QUANTITY,
+		-- 요청납기: CONTRACT_ITEM 우선, 없으면 PROJECT_MGMT, 없으면 CONTRACT_MGMT
+		COALESCE(
+			(SELECT CI.DUE_DATE 
+			 FROM CONTRACT_ITEM CI 
+			 WHERE CI.CONTRACT_OBJID = T.CONTRACT_OBJID 
+			   AND CI.PART_OBJID = T.PART_OBJID 
+			   AND CI.STATUS = 'ACTIVE'),
+			T.DUE_DATE, 
+			(SELECT CM.due_date FROM CONTRACT_MGMT CM WHERE CM.OBJID = T.CONTRACT_OBJID)
+		) AS REQUEST_DATE,
 			COALESCE(T.CUSTOMER_PROJECT_NAME, (SELECT CM.customer_request FROM CONTRACT_MGMT CM WHERE CM.OBJID = T.CONTRACT_OBJID)) AS CUSTOMER_REQUEST,
 			CODE_NAME(T.CONTRACT_RESULT) AS ORDER_STATUS,
 			T.PO_NO,
@@ -1344,23 +1349,25 @@
 				AND UPPER(STATUS) = 'ACTIVE'
 			) THEN 'Y' ELSE 'N' END AS ORDER_ATTACH,
 			(SELECT CM.PRODUCTION_STATUS FROM CONTRACT_MGMT CM WHERE CM.OBJID = T.CONTRACT_OBJID) AS PRODUCTION_STATUS,
-			-- 판매 관련 필드들 (sales_registration 테이블에서 가져오기)
-			COALESCE(SR.shipping_order_status, '') AS SHIPPING_ORDER_STATUS,
-			COALESCE(SR.sales_quantity, 0) AS SALES_QUANTITY,
-			COALESCE(SR.sales_unit_price, 0) AS SALES_UNIT_PRICE,
-			COALESCE(SR.sales_supply_price, 0) AS SALES_SUPPLY_PRICE,
-			COALESCE(SR.sales_vat, 0) AS SALES_VAT,
-			COALESCE(SR.sales_total_amount, 0) AS SALES_TOTAL_AMOUNT,
-			COALESCE(SR.sales_total_amount, 0) AS SALES_TOTAL_AMOUNT_KRW,
-			COALESCE(SR.sales_currency, T.CONTRACT_CURRENCY) AS SALES_CURRENCY,
-			COALESCE(SR.sales_exchange_rate, T.CONTRACT_PRICE_CURRENCY::numeric, 0) AS SALES_EXCHANGE_RATE,
-			COALESCE(TO_CHAR(SR.shipping_date, 'YYYY-MM-DD'), '') AS SHIPPING_DATE,
-			COALESCE(SR.shipping_method, '') AS SHIPPING_METHOD,
-			COALESCE(SR.manager_user_id, T.PM_USER_ID) AS MANAGER,
-			COALESCE(SR.incoterms, '') AS INCOTERMS
-		FROM PROJECT_MGMT AS T
-		LEFT JOIN sales_registration SR ON T.PROJECT_NO = SR.project_no
-		WHERE T.PROJECT_NO = #{orderNo}
+		-- 판매 관련 필드들 (sales_registration 테이블에서 가져오기)
+		COALESCE(SR.shipping_order_status, '') AS SHIPPING_ORDER_STATUS,
+		COALESCE(SR.sales_quantity, 0) AS SALES_QUANTITY,
+		COALESCE(SR.sales_unit_price, 0) AS SALES_UNIT_PRICE,
+		COALESCE(SR.sales_supply_price, 0) AS SALES_SUPPLY_PRICE,
+	COALESCE(SR.sales_vat, 0) AS SALES_VAT,
+	COALESCE(SR.sales_total_amount, 0) AS SALES_TOTAL_AMOUNT,
+	COALESCE(SR.sales_total_amount, 0) AS SALES_TOTAL_AMOUNT_KRW,
+	COALESCE(NULLIF(SR.sales_currency, ''), CM.CONTRACT_CURRENCY) AS SALES_CURRENCY,
+	CODE_NAME(COALESCE(NULLIF(SR.sales_currency, ''), CM.CONTRACT_CURRENCY)) AS SALES_CURRENCY_NAME,
+	COALESCE(NULLIF(SR.sales_exchange_rate, 0), CM.EXCHANGE_RATE::numeric, 0) AS SALES_EXCHANGE_RATE,
+		COALESCE(TO_CHAR(SR.shipping_date, 'YYYY-MM-DD'), '') AS SHIPPING_DATE,
+		COALESCE(SR.shipping_method, '') AS SHIPPING_METHOD,
+		COALESCE(SR.manager_user_id, T.PM_USER_ID) AS MANAGER,
+		COALESCE(SR.incoterms, '') AS INCOTERMS
+	FROM PROJECT_MGMT AS T
+	LEFT JOIN sales_registration SR ON T.PROJECT_NO = SR.project_no
+	LEFT JOIN CONTRACT_MGMT CM ON CM.OBJID::VARCHAR = T.CONTRACT_OBJID
+	WHERE T.PROJECT_NO = #{orderNo}
 	</select>
 	
 </mapper>