From 5a1626f4940dd6d694fc0d3aeb2659f508bc47dc Mon Sep 17 00:00:00 2001
From: hjjeong <hjjeong@wace.me>
Date: Mon, 9 Feb 2026 13:59:32 +0900
Subject: [PATCH 1/7] =?UTF-8?q?=EA=B0=80=EA=B3=B5=EC=97=85=EC=B2=B4=20?=
 =?UTF-8?q?=EA=B8=B0=EB=B3=B8=20RPS=20=EC=84=A0=ED=83=9D=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95(objid=EA=B0=92=20=EB=B3=80=EA=B2=BD)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/WEB-INF/view/productionplanning/mBomPopupLeft.jsp | 4 ++--
 WebContent/WEB-INF/view/salesMng/purchaseListFormPopUp.jsp   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/WebContent/WEB-INF/view/productionplanning/mBomPopupLeft.jsp b/WebContent/WEB-INF/view/productionplanning/mBomPopupLeft.jsp
index 6c7848a..f86b799 100644
--- a/WebContent/WEB-INF/view/productionplanning/mBomPopupLeft.jsp
+++ b/WebContent/WEB-INF/view/productionplanning/mBomPopupLeft.jsp
@@ -669,9 +669,9 @@ function fn_initGrid() {
 			formatter: function(cell) {
 				var value = cell.getValue();
 				
-				// 저장된 값이 없으면 기본값 '5001'(RPS) 설정
+				// 저장된 값이 없으면 기본값 '0000008377'(RPS) 설정
 				if(value === undefined || value === null || value === '') {
-					value = '5001';
+					value = '0000008377';
 					cell.getRow().update({PROCESSING_VENDOR: value}, false);
 				}
 				
diff --git a/WebContent/WEB-INF/view/salesMng/purchaseListFormPopUp.jsp b/WebContent/WEB-INF/view/salesMng/purchaseListFormPopUp.jsp
index c510365..381647f 100644
--- a/WebContent/WEB-INF/view/salesMng/purchaseListFormPopUp.jsp
+++ b/WebContent/WEB-INF/view/salesMng/purchaseListFormPopUp.jsp
@@ -678,9 +678,9 @@ function fn_initGrid() {
 			formatter: function(cell) {
 				var value = cell.getValue();
 				
-				// 저장된 값이 없으면 기본값 '5001'(RPS) 설정
+				// 저장된 값이 없으면 기본값 '0000008377'(RPS) 설정
 				if(value === undefined || value === null || value === '') {
-					value = '5001';
+					value = '0000008377';
 					cell.getRow().update({PROCESSING_VENDOR: value}, false);
 				}
 				
-- 
2.49.1


From 2810a7b764c2047e2e1f2c88c649e40e05a6f7ee Mon Sep 17 00:00:00 2001
From: hjjeong <hjjeong@wace.me>
Date: Mon, 9 Feb 2026 14:00:01 +0900
Subject: [PATCH 2/7] =?UTF-8?q?=EB=B7=B0=20=EB=AA=A8=EB=93=9C=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20=EB=8B=AB=EA=B8=B0=20=EB=B2=84=ED=8A=BC=20=ED=99=9C?=
 =?UTF-8?q?=EC=84=B1=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/WEB-INF/view/quality/ecrResultFormPopUp.jsp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/WebContent/WEB-INF/view/quality/ecrResultFormPopUp.jsp b/WebContent/WEB-INF/view/quality/ecrResultFormPopUp.jsp
index 750315b..3da8dbb 100644
--- a/WebContent/WEB-INF/view/quality/ecrResultFormPopUp.jsp
+++ b/WebContent/WEB-INF/view/quality/ecrResultFormPopUp.jsp
@@ -60,6 +60,8 @@ $(document).ready(function(){
 	// 뷰 모드일 경우 입력 필드 비활성화
 	if(isViewMode){
 		$("#form1 input, #form1 textarea, #form1 select").prop("disabled", true);
+		// 닫기 버튼은 뷰 모드에서도 동작해야 하므로 다시 활성화
+		$("#btnClose").prop("disabled", false);
 		$("#btnSave, #btnUpload, #btnImgUpload, #file1, #imgFile1").hide();
 		$(".delete_btn").parent().hide();
 	} else {
-- 
2.49.1


From 3068354cd04a69422e6ed4eae3128d395fa58115 Mon Sep 17 00:00:00 2001
From: hjjeong <hjjeong@wace.me>
Date: Mon, 9 Feb 2026 16:02:36 +0900
Subject: [PATCH 3/7] =?UTF-8?q?=EB=B6=84=ED=95=A0=EC=B6=9C=ED=95=98=20S/N?=
 =?UTF-8?q?=20=EC=9E=85=EB=A0=A5=ED=95=98=EB=8A=94=20=EB=B6=80=EB=B6=84=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95,=20=EB=94=94=EC=9E=90=EC=9D=B8=20=EA=B8=B0?=
 =?UTF-8?q?=EC=A1=B4=EA=B3=BC=20=EB=8F=99=EC=9D=BC=ED=95=98=EA=B2=8C=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salesmgmt/salesMgmt/splitShipmentForm.jsp | 507 ++++++++++++++----
 .../salesmgmt/mapper/salesNcollectMgmt.xml    |   5 +-
 .../service/SalesNcollectMgmtService.java     |  50 +-
 3 files changed, 423 insertions(+), 139 deletions(-)

diff --git a/WebContent/WEB-INF/view/salesmgmt/salesMgmt/splitShipmentForm.jsp b/WebContent/WEB-INF/view/salesmgmt/salesMgmt/splitShipmentForm.jsp
index 7ae4212..f417a83 100644
--- a/WebContent/WEB-INF/view/salesmgmt/salesMgmt/splitShipmentForm.jsp
+++ b/WebContent/WEB-INF/view/salesmgmt/salesMgmt/splitShipmentForm.jsp
@@ -1,22 +1,45 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<%@ include file="/init.jsp" %>
+<%@ include file="/init_new.jsp" %>
 <!DOCTYPE html>
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>분할출하 등록</title>
-<link rel="stylesheet" href="/css/ions-basic.css">
-<script type="text/javascript" src="/js/ions-common.js" ></script>
 <script>
+    // S/N 관리 전역 변수
+    var snList = [];
+    var snCounter = 1;
+    
     $(document).ready(function() {
         // select2 초기화
         $('.select2').select2();
         
         // 달력 초기화
-        fnc_makeDatepick();
+        _fnc_datepick();
 
         // 분할수량 자동 입력
         $("#splitQuantity").val("${param.splitQuantity}");
+        
+        // S/N 필드 클릭 이벤트
+        $("#serialNo").click(function() {
+            fn_openSnManagePopup();
+        });
+        
+        // 페이지 로드 시 기존 S/N 데이터가 있으면 파싱
+        var initialSnValue = $("#serialNo").val();
+        if(initialSnValue && initialSnValue.trim() != '') {
+            var snArray = initialSnValue.split(',');
+            var initialSnList = [];
+            for(var i = 0; i < snArray.length; i++) {
+                if(snArray[i].trim() != '') {
+                    initialSnList.push({ id: i + 1, value: snArray[i].trim() });
+                }
+            }
+            if(initialSnList.length > 0) {
+                $("#serialNoList").val(JSON.stringify(initialSnList));
+                snCounter = initialSnList.length + 1;
+            }
+        }
 
         // 닫기 버튼
         $("#btnClose").click(function() {
@@ -42,6 +65,23 @@
             $("#splitQuantity").focus();
             return;
         }
+        
+        // S/N 데이터 처리: JSON에서 값만 추출하여 콤마로 연결
+        var serialNoListValue = $("#serialNoList").val();
+        if(serialNoListValue && serialNoListValue.trim() != '') {
+            try {
+                var snArray = JSON.parse(serialNoListValue);
+                var snValues = [];
+                for(var i = 0; i < snArray.length; i++) {
+                    if(snArray[i].value) {
+                        snValues.push(snArray[i].value);
+                    }
+                }
+                $("#serialNo").val(snValues.join(','));
+            } catch(e) {
+                console.error("S/N JSON 파싱 오류:", e);
+            }
+        }
 
         if(confirm("분할출하를 등록하시겠습니까?")) {
             $.ajax({
@@ -53,9 +93,9 @@
                     alert(data.msg);
                     if (data.result) {
                         if(opener && opener.fn_search) {
-                            opener.fn_search(); // 부모창 그리드 새로고침
+                            opener.fn_search();
                         }
-                        window.close(); // 팝업 닫기
+                        window.close();
                     }
                 },
                 error: function(jqxhr, status, error) {
@@ -65,6 +105,219 @@
             });
         }
     }
+    
+    // S/N 화면 표시 업데이트
+    function fn_updateSnDisplay() {
+        var count = snList.length;
+        if(count > 0) {
+            var snValues = [];
+            for(var i = 0; i < snList.length; i++) {
+                snValues.push(snList[i].value);
+            }
+            $("#serialNo").val(snValues.join(', '));
+        } else {
+            $("#serialNo").val('');
+        }
+    }
+    
+    // S/N 관리 팝업 열기
+    function fn_openSnManagePopup() {
+        var serialNoListValue = $("#serialNoList").val();
+        
+        if(serialNoListValue && serialNoListValue.trim() != '') {
+            try {
+                snList = JSON.parse(serialNoListValue);
+                if(snList.length > 0) {
+                    var maxId = Math.max.apply(Math, snList.map(function(item) { return item.id; }));
+                    snCounter = maxId + 1;
+                }
+            } catch(e) {
+                snList = [];
+            }
+        } else {
+            var serialNoValue = $("#serialNo").val();
+            if(serialNoValue && serialNoValue.trim() != '') {
+                snList = [];
+                var snArray = serialNoValue.split(',');
+                for(var i = 0; i < snArray.length; i++) {
+                    if(snArray[i].trim() != '') {
+                        snList.push({ id: snCounter++, value: snArray[i].trim() });
+                    }
+                }
+            } else {
+                snList = [];
+            }
+        }
+        
+        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="snListContainer" 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="newSnInput" placeholder="S/N 입력" style="flex:1; padding:8px; border:1px solid #ddd; border-radius:4px; color:#333;">';
+        popupHtml += '      <button type="button" onclick="fn_addSn()" 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_openSequentialSnPopup()" class="plm_btns">연속번호생성</button>';
+        popupHtml += '      <button type="button" onclick="fn_confirmSnList()" class="plm_btns">확인</button>';
+        popupHtml += '      <button type="button" onclick="fn_closeSnPopup()" 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_renderSnList();
+                    $(".swal2-html-container #newSnInput").keypress(function(e) {
+                        if(e.which == 13) { fn_addSn(); return false; }
+                    });
+                }, 50);
+            }
+        });
+    }
+    
+    // S/N 목록 렌더링
+    function fn_renderSnList() {
+        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;">번호</th>';
+        html += '<th style="padding:10px; border:1px solid #ddd; text-align:center;">S/N</th>';
+        html += '<th style="padding:10px; border:1px solid #ddd; text-align:center;">삭제</th>';
+        html += '</tr></thead><tbody>';
+        
+        if(snList.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 < snList.length; i++) {
+                html += '<tr>';
+                html += '<td style="text-align:center; padding:8px; border:1px solid #ddd;">' + (i+1) + '</td>';
+                html += '<td style="padding:8px; border:1px solid #ddd;">' + snList[i].value + '</td>';
+                html += '<td style="text-align:center; padding:8px; border:1px solid #ddd;">';
+                html += '<button type="button" onclick="fn_deleteSn(' + snList[i].id + ')" class="plm_btns" style="padding:4px 8px; font-size:12px;">삭제</button>';
+                html += '</td></tr>';
+            }
+        }
+        html += '</tbody></table>';
+        $(".swal2-html-container #snListContainer").html(html);
+    }
+    
+    // S/N 추가
+    function fn_addSn() {
+        var newSn = $(".swal2-html-container #newSnInput").val().trim();
+        if(newSn == '') { alert('S/N을 입력해주세요.'); return; }
+        for(var i = 0; i < snList.length; i++) {
+            if(snList[i].value == newSn) { alert('이미 등록된 S/N입니다.'); return; }
+        }
+        snList.push({ id: snCounter++, value: newSn });
+        $(".swal2-html-container #newSnInput").val('');
+        fn_renderSnList();
+    }
+    
+    // S/N 삭제
+    function fn_deleteSn(snId) {
+        for(var i = 0; i < snList.length; i++) {
+            if(snList[i].id == snId) { snList.splice(i, 1); break; }
+        }
+        fn_renderSnList();
+    }
+    
+    // 연속번호 생성 팝업
+    function fn_openSequentialSnPopup() {
+        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="seqStartNo" 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="seqCount" 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: () => {
+                var startNo = $("#seqStartNo").val().trim();
+                var count = parseInt($("#seqCount").val());
+                if(!startNo) { Swal.showValidationMessage('시작번호를 입력해주세요.'); return false; }
+                if(!count || count < 1) { Swal.showValidationMessage('생성개수를 입력해주세요.'); return false; }
+                if(count > 100) { Swal.showValidationMessage('최대 100개까지 생성 가능합니다.'); return false; }
+                return {startNo: startNo, count: count};
+            }
+        }).then((result) => {
+            if(result.isConfirmed && result.value) {
+                fn_generateSequentialSn(result.value.startNo, result.value.count);
+            } else {
+                fn_openSnManagePopup();
+            }
+        });
+    }
+    
+    // 연속번호 생성 로직
+    function fn_generateSequentialSn(startNo, count) {
+        var match = startNo.match(/^(.*?)(\d+)$/);
+        if(!match) {
+            alert('올바른 형식이 아닙니다. 마지막에 숫자가 있어야 합니다. (예: ITEM-001)');
+            fn_openSequentialSnPopup();
+            return;
+        }
+        var prefix = match[1];
+        var startNum = parseInt(match[2]);
+        var numLength = match[2].length;
+        
+        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 < snList.length; j++) {
+                if(snList[j].value == newSn) { isDuplicate = true; break; }
+            }
+            if(!isDuplicate) {
+                snList.push({ id: snCounter++, value: newSn });
+            }
+        }
+        $("#serialNoList").val(JSON.stringify(snList));
+        fn_openSnManagePopup();
+    }
+    
+    // S/N 목록 확인 및 적용
+    function fn_confirmSnList() {
+        var snValues = [];
+        for(var i = 0; i < snList.length; i++) { snValues.push(snList[i].value); }
+        $("#serialNoList").val(JSON.stringify(snList));
+        fn_updateSnDisplay();
+        Swal.close();
+    }
+    
+    // S/N 팝업 닫기
+    function fn_closeSnPopup() {
+        Swal.close();
+    }
+
+    // 날짜 선택기 초기화
+    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
+            });
+        }
+    }
 </script>
 </head>
 <body>
@@ -74,122 +327,148 @@
         <input type="hidden" name="originalQuantity" value="${not empty info ? info.QUANTITY : param.originalQuantity}">
         <input type="hidden" name="contractObjid" value="${info.CONTRACT_OBJID}">
         <input type="hidden" name="partObjid" value="${info.PART_OBJID}">
+        <input type="hidden" name="orderUnitPrice" value="${info.ORDER_UNIT_PRICE}">
+        <input type="hidden" name="exchangeRate" value="${info.EXCHANGE_RATE}">
+        <input type="hidden" name="contractCurrency" value="${info.CONTRACT_CURRENCY}">
+        <!-- S/N JSON 데이터 저장용 (클라이언트 전용) -->
+        <input type="hidden" id="serialNoList" value="" />
         
-        <section>
+        <section class="business_popup_min_width">
             <div class="plm_menu_name">
                 <h2>
                     <span>분할출하 등록</span>
                 </h2>
             </div>
             
-            <div id="businessPopupFormWrap" >
-                <table class="pmsPopupForm">
+            <div id="EntirePopupFormWrap">
+                <table class="">
                     <colgroup>
-                        <col width="15%"/>
-                        <col width="35%"/>
-                        <col width="15%"/>
-                        <col width="35%"/>
+                        <col width="100%" />
                     </colgroup>
-                    <tbody>
-                        <tr>
-                            <td colspan="4" style="height:15px;"></td>
-                        </tr>
-                        <tr>
-                            <td class="input_title"><label for="projectNo">프로젝트번호</label></td>
-                            <td class="input_sub_title">
-                                <input type="text" value="${not empty info ? info.PROJECT_NO : param.projectNo}" disabled style="width:100%; background-color:#f0f0f0;" />
-                            </td>
-                            <td class="input_title"><label for="originalQuantity">원본수량</label></td>
-                            <td class="input_sub_title">
-                                <input type="text" value="${not empty info ? info.QUANTITY : param.originalQuantity}" disabled style="width:100%; background-color:#f0f0f0;" />
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="input_title"><label for="partNo">품번</label></td>
-                            <td class="input_sub_title">
-                                <input type="text" value="${info.PART_NO}" disabled style="width:100%; background-color:#f0f0f0;" />
-                            </td>
-                            <td class="input_title"><label for="partName">품명</label></td>
-                            <td class="input_sub_title">
-                                <input type="text" value="${info.PART_NAME}" disabled style="width:100%; background-color:#f0f0f0;" />
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="input_title"><label for="customer">고객사</label></td>
-                            <td class="input_sub_title">
-                                <input type="text" value="${info.CUSTOMER}" disabled style="width:100%; background-color:#f0f0f0;" />
-                            </td>
-                            <td class="input_title"><label for="poNo">발주번호</label></td>
-                            <td class="input_sub_title">
-                                <input type="text" value="${info.PO_NO}" disabled style="width:100%; background-color:#f0f0f0;" />
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="input_title"><label for="remainingQuantity">잔여수량</label></td>
-                            <td class="input_sub_title">
-                                <input type="text" value="${info.REMAINING_QUANTITY}" disabled style="width:100%; background-color:#f0f0f0;" />
-                            </td>
-                            <td class="input_title"><label for="salesQuantity">출하수량</label></td>
-                            <td class="input_sub_title">
-                                <input type="text" value="${info.SALES_QUANTITY}" disabled style="width:100%; background-color:#f0f0f0;" />
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="input_title"><label for="splitQuantity">* 분할수량</label></td>
-                            <td class="input_sub_title">
-                                <input type="number" name="splitQuantity" id="splitQuantity" style="width:100%;" required />
-                            </td>
-                            <td class="input_title"><label for="serialNo">S/N</label></td>
-                            <td class="input_sub_title">
-                                <input type="text" name="serialNo" id="serialNo" style="width:100%;" />
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="input_title"><label for="shippingDate">* 출고일</label></td>
-                            <td class="input_sub_title">
-                                <input type="text" id="shippingDate" name="shippingDate" required class="date_icon" style="width: 100px !important;background-color:#fff;" autocomplete="off" />
-                            </td>
-                            <td class="input_title"><label for="shippingMethod">출고방법</label></td>
-                            <td class="input_sub_title">
-                                <select name="shippingMethod" id="shippingMethod" type="select" style="width:100%;" class="select2">
-                                    <option value="">선택</option>
-                                    <option value="D_D">내수/직납</option>
-                                    <option value="D_P">내수/택배</option>
-                                    <option value="D_E">내수/기타</option>
-                                    <option value="E">수출</option>
-                                </select>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="input_title"><label for="manager">담당자</label></td>
-                            <td class="input_sub_title">
-                                <select name="manager" id="manager" type="select" style="width:100%;" class="select2">
-                                    <option value="">선택</option>
-                                    ${codeMap.managerList}
-                                </select>
-                            </td>
-                            <td class="input_title"><label for="incoterms">인도조건</label></td>
-                            <td class="input_sub_title">
-                                <select name="incoterms" id="incoterms" type="select" style="width:100%;" class="select2">
-                                    <option value="">선택</option>
-                                    <option value="FOB">FOB</option>
-                                    <option value="EXW">EXW</option>
-                                    <option value="CIF">CIF</option>
-                                    <option value="DDP">DDP</option>
-                                    <option value="DAP">DAP</option>
-                                </select>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="input_title"><label for="remark">비고</label></td>
-                            <td class="input_sub_title" colspan="3">
-                                <textarea name="remark" id="remark" style="width:100%; height:60px;"></textarea>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="4" style="height:15px;"></td>
-                        </tr>
-                    </tbody>
+                    <tr>
+                        <td>
+                            <table class="pmsPopuptable">
+                                <colgroup>
+                                    <col width="15%" />
+                                    <col width="35%" />
+                                    <col width="15%" />
+                                    <col width="35%" />
+                                </colgroup>
+                                
+                                <!-- 1행: 프로젝트번호, 원본수량 -->
+                                <tr>
+                                    <td class="input_title"><label>프로젝트번호</label></td>
+                                    <td>
+                                        <input type="text" value="${not empty info ? info.PROJECT_NO : param.projectNo}" readonly style="background-color:#f5f5f5;" />
+                                    </td>
+                                    <td class="input_title"><label>원본수량</label></td>
+                                    <td>
+                                        <input type="text" value="${not empty info ? info.QUANTITY : param.originalQuantity}" readonly style="background-color:#f5f5f5;" />
+                                    </td>
+                                </tr>
+                                
+                                <!-- 2행: 품번, 품명 -->
+                                <tr>
+                                    <td class="input_title"><label>품번</label></td>
+                                    <td>
+                                        <input type="text" value="${info.PART_NO}" readonly style="background-color:#f5f5f5;" />
+                                    </td>
+                                    <td class="input_title"><label>품명</label></td>
+                                    <td>
+                                        <input type="text" value="${info.PART_NAME}" readonly style="background-color:#f5f5f5;" />
+                                    </td>
+                                </tr>
+                                
+                                <!-- 3행: 고객사, 발주번호 -->
+                                <tr>
+                                    <td class="input_title"><label>고객사</label></td>
+                                    <td>
+                                        <input type="text" value="${info.CUSTOMER}" readonly style="background-color:#f5f5f5;" />
+                                    </td>
+                                    <td class="input_title"><label>발주번호</label></td>
+                                    <td>
+                                        <input type="text" value="${info.PO_NO}" readonly style="background-color:#f5f5f5;" />
+                                    </td>
+                                </tr>
+                                
+                                <!-- 4행: 잔여수량, 출하수량 -->
+                                <tr>
+                                    <td class="input_title"><label>잔여수량</label></td>
+                                    <td>
+                                        <input type="text" value="${info.REMAINING_QUANTITY}" readonly style="background-color:#f5f5f5;" />
+                                    </td>
+                                    <td class="input_title"><label>출하수량</label></td>
+                                    <td>
+                                        <input type="text" value="${info.SALES_QUANTITY}" readonly style="background-color:#f5f5f5;" />
+                                    </td>
+                                </tr>
+                                
+                                <!-- 5행: 분할수량, S/N -->
+                                <tr>
+                                    <td class="input_title"><label for="splitQuantity">분할수량</label></td>
+                                    <td>
+                                        <input type="number" name="splitQuantity" id="splitQuantity" required />
+                                    </td>
+                                    <td class="input_title"><label for="serialNo">S/N</label></td>
+                                    <td>
+                                        <input type="text" name="serialNo" id="serialNo" 
+                                            placeholder="클릭하여 S/N 추가" 
+                                            style="cursor:pointer; background-color:#f8f9fa; color:#333 !important;" 
+                                            readonly />
+                                    </td>
+                                </tr>
+                                
+                                <!-- 6행: 출고일, 출고방법 -->
+                                <tr>
+                                    <td class="input_title"><label for="shippingDate">출고일</label></td>
+                                    <td>
+                                        <input type="text" id="shippingDate" name="shippingDate" required class="date_icon" autocomplete="off" />
+                                    </td>
+                                    <td class="input_title"><label for="shippingMethod">출고방법</label></td>
+                                    <td>
+                                        <select name="shippingMethod" id="shippingMethod" class="select2">
+                                            <option value="">선택</option>
+                                            <option value="D_D">내수/직납</option>
+                                            <option value="D_P">내수/택배</option>
+                                            <option value="D_E">내수/기타</option>
+                                            <option value="E">수출</option>
+                                        </select>
+                                    </td>
+                                </tr>
+                                
+                                <!-- 7행: 담당자, 인도조건 -->
+                                <tr>
+                                    <td class="input_title"><label for="manager">담당자</label></td>
+                                    <td>
+                                        <select name="manager" id="manager" class="select2">
+                                            <option value="">선택</option>
+                                            ${codeMap.managerList}
+                                        </select>
+                                    </td>
+                                    <td class="input_title"><label for="incoterms">인도조건</label></td>
+                                    <td>
+                                        <select name="incoterms" id="incoterms" class="select2">
+                                            <option value="">선택</option>
+                                            <option value="FOB">FOB</option>
+                                            <option value="EXW">EXW</option>
+                                            <option value="CIF">CIF</option>
+                                            <option value="DDP">DDP</option>
+                                            <option value="DAP">DAP</option>
+                                        </select>
+                                    </td>
+                                </tr>
+                                
+                                <!-- 8행: 비고 -->
+                                <tr>
+                                    <td class="input_title"><label for="remark">비고</label></td>
+                                    <td colspan="3">
+                                        <textarea name="remark" id="remark" style="width:100%; height:60px;"></textarea>
+                                    </td>
+                                </tr>
+                                
+                            </table>
+                        </td>
+                    </tr>
                 </table>
             </div>
             
@@ -200,7 +479,7 @@
                 </div>
             </div>
         </section>
-    </form> 
+    </form>
 </body>
 </html>
 
diff --git a/src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml b/src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml
index d778578..3ca0119 100644
--- a/src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml
+++ b/src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml
@@ -2090,7 +2090,10 @@ ORDER BY T.REGDATE DESC, T.PROJECT_NO DESC
 			COALESCE(CM.PO_NO, '') AS PO_NO,
 			COALESCE(CM.ORDER_DATE, '') AS ORDER_DATE,
 			COALESCE((SELECT SUM(SR.SALES_QUANTITY) FROM SALES_REGISTRATION SR WHERE SR.PROJECT_NO = T.PROJECT_NO), 0) AS SALES_QUANTITY,
-			COALESCE(T.QUANTITY::NUMERIC, 0) - COALESCE((SELECT SUM(SR.SALES_QUANTITY) FROM SALES_REGISTRATION SR WHERE SR.PROJECT_NO = T.PROJECT_NO), 0) AS REMAINING_QUANTITY
+			COALESCE(T.QUANTITY::NUMERIC, 0) - COALESCE((SELECT SUM(SR.SALES_QUANTITY) FROM SALES_REGISTRATION SR WHERE SR.PROJECT_NO = T.PROJECT_NO), 0) AS REMAINING_QUANTITY,
+			COALESCE(NULLIF(CM.ORDER_UNIT_PRICE, '')::NUMERIC, 0) AS ORDER_UNIT_PRICE,
+			COALESCE(NULLIF(CM.EXCHANGE_RATE, '')::NUMERIC, 1) AS EXCHANGE_RATE,
+			COALESCE(CM.CONTRACT_CURRENCY, '') AS CONTRACT_CURRENCY
 		FROM PROJECT_MGMT T
 		LEFT JOIN CONTRACT_MGMT CM ON CM.OBJID = T.CONTRACT_OBJID
 		LEFT JOIN SUPPLY_MNG SM ON SM.OBJID = CASE WHEN T.CUSTOMER_OBJID ~ '^[0-9]+$' THEN T.CUSTOMER_OBJID::NUMERIC ELSE NULL END
diff --git a/src/com/pms/salesmgmt/service/SalesNcollectMgmtService.java b/src/com/pms/salesmgmt/service/SalesNcollectMgmtService.java
index c990cc2..a3fb2d7 100644
--- a/src/com/pms/salesmgmt/service/SalesNcollectMgmtService.java
+++ b/src/com/pms/salesmgmt/service/SalesNcollectMgmtService.java
@@ -360,6 +360,14 @@ public Map<String, Object> saveSaleRegistration(HttpServletRequest request, Map<
 		System.out.println("saleNo (파라미터): " + saleNo);
 		System.out.println("salesQuantity: " + paramMap.get("salesQuantity"));
 		
+	// 폼 필드명(manager) → SQL 파라미터명(managerUserId) 매핑
+	if(paramMap.get("manager") != null && !"".equals(paramMap.get("manager"))) {
+		paramMap.put("managerUserId", paramMap.get("manager"));
+	}
+	
+	System.out.println("serialNo: " + paramMap.get("serialNo"));
+	System.out.println("manager → managerUserId: " + paramMap.get("managerUserId"));
+	
 	// 모든 판매를 shipment_log에 기록 (분할 출하 방식 통일)
 	// 1. 해당 프로젝트의 sales_registration 레코드 확인
 	Map<String, Object> checkParam = new HashMap<String, Object>();
@@ -391,9 +399,10 @@ public Map<String, Object> saveSaleRegistration(HttpServletRequest request, Map<
 		baseRecord.put("salesExchangeRate", paramMap.get("salesExchangeRate"));
 		baseRecord.put("shippingDate", paramMap.get("shippingDate"));
 		baseRecord.put("shippingMethod", paramMap.get("shippingMethod"));
-		baseRecord.put("managerUserId", paramMap.get("managerUserId"));
+		baseRecord.put("managerUserId", paramMap.get("managerUserId")); // 위에서 manager → managerUserId 매핑됨
 		baseRecord.put("incoterms", paramMap.get("incoterms"));
 		baseRecord.put("serialNo", paramMap.get("serialNo"));
+		System.out.println("insertSaleRegistration - serialNo: " + paramMap.get("serialNo"));
 		baseRecord.put("shippingOrderStatus", "출하지시"); // 자동으로 출하지시 상태 설정
 		baseRecord.put("cretEmpNo", paramMap.get("cretEmpNo"));
 		
@@ -495,22 +504,21 @@ public Map<String, Object> saveSaleRegistration(HttpServletRequest request, Map<
 			PersonBean person = (PersonBean) request.getSession().getAttribute(Constants.PERSON_BEAN);
 			String userId = person.getUserId();
 			
-			// 원본 데이터 조회
-			Map<String, Object> originalData = sqlSession.selectOne("salesNcollectMgmt.getContractByObjid", paramMap);
-			
-			if(originalData == null) {
-				resultMap.put("result", false);
-				resultMap.put("msg", "원본 데이터를 찾을 수 없습니다.");
-				return resultMap;
-			}
-			
 			// 분할 수량
 			int splitQuantity = Integer.parseInt(paramMap.get("splitQuantity").toString());
 			int originalQuantity = Integer.parseInt(paramMap.get("originalQuantity").toString());
 			
-			// 원본 데이터의 단가 정보 가져오기
-			BigDecimal unitPrice = new BigDecimal(originalData.get("order_unit_price").toString());
-			BigDecimal exchangeRate = new BigDecimal(originalData.get("exchange_rate").toString());
+			// 단가/환율은 폼 hidden 필드에서 직접 가져옴 (프로젝트 기반, contract_mgmt 직접 조회 불필요)
+			String unitPriceStr = CommonUtils.checkNull(paramMap.get("orderUnitPrice"));
+			String exchangeRateStr = CommonUtils.checkNull(paramMap.get("exchangeRate"));
+			String contractCurrency = CommonUtils.checkNull(paramMap.get("contractCurrency"));
+			
+			BigDecimal unitPrice = StringUtils.isNotBlank(unitPriceStr) ? new BigDecimal(unitPriceStr) : BigDecimal.ZERO;
+			BigDecimal exchangeRate = StringUtils.isNotBlank(exchangeRateStr) ? new BigDecimal(exchangeRateStr) : BigDecimal.ONE;
+			
+			System.out.println("=== splitShipment 디버그 ===");
+			System.out.println("projectNo: " + paramMap.get("projectNo"));
+			System.out.println("unitPrice: " + unitPrice + ", exchangeRate: " + exchangeRate + ", currency: " + contractCurrency);
 			
 			// 분할 금액 계산
 			BigDecimal splitSupplyPrice = unitPrice.multiply(new BigDecimal(splitQuantity));
@@ -527,19 +535,13 @@ public Map<String, Object> saveSaleRegistration(HttpServletRequest request, Map<
 			paramMap.put("salesSupplyPrice", splitSupplyPrice);
 			paramMap.put("salesVat", splitVat);
 			paramMap.put("salesTotalAmount", splitTotalAmount);
-			paramMap.put("salesCurrency", originalData.get("contract_currency"));
+			paramMap.put("salesCurrency", contractCurrency);
 			paramMap.put("salesExchangeRate", exchangeRate);
 			
-			// 팝업에서 입력한 데이터 우선, 없으면 원본 데이터 사용
-			paramMap.put("shippingMethod", 
-				StringUtils.isNotBlank((String)paramMap.get("shippingMethod")) ? 
-					paramMap.get("shippingMethod") : originalData.get("shipping_method"));
-			paramMap.put("incoterms", 
-				StringUtils.isNotBlank((String)paramMap.get("incoterms")) ? 
-					paramMap.get("incoterms") : originalData.get("incoterms"));
-			paramMap.put("managerUserId", 
-				StringUtils.isNotBlank((String)paramMap.get("manager")) ? 
-					paramMap.get("manager") : originalData.get("pm_user_id"));
+			// 담당자 매핑 (폼 필드명 manager → SQL 파라미터명 managerUserId)
+			if(StringUtils.isNotBlank((String)paramMap.get("manager"))) {
+				paramMap.put("managerUserId", paramMap.get("manager"));
+			}
 			
 			// 팝업에서 입력한 추가 정보
 			// serialNo, shippingDate, remark는 팝업에서만 입력 가능
-- 
2.49.1


From 92233da3f18329366747365ae15f459f1b791e12 Mon Sep 17 00:00:00 2001
From: hjjeong <hjjeong@wace.me>
Date: Mon, 9 Feb 2026 16:14:30 +0900
Subject: [PATCH 4/7] =?UTF-8?q?ECR=5FNO=20=EC=83=9D=EC=84=B1,=20=EC=9E=91?=
 =?UTF-8?q?=EC=84=B1=EC=9D=BC=20->=20=EC=9A=94=EC=B2=AD=EC=9D=BC=20?=
 =?UTF-8?q?=EA=B8=B0=EC=A4=80=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/pms/service/QualityService.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/com/pms/service/QualityService.java b/src/com/pms/service/QualityService.java
index 66538d8..0effc2a 100644
--- a/src/com/pms/service/QualityService.java
+++ b/src/com/pms/service/QualityService.java
@@ -1728,7 +1728,15 @@ public class QualityService extends BaseService{
 				}
 				
 				// ECR_NO 생성 (ECR-YYYYMM-순번) 예) ECR-202512-01
-				String yyyymm = new java.text.SimpleDateFormat("yyyyMM").format(new java.util.Date());
+				// 요청일 기준으로 YYYYMM 추출 (REQUEST_DATE 형식: yyyy-MM-dd)
+				String requestDate = CommonUtils.checkNull(paramMap.get("REQUEST_DATE"));
+				String yyyymm;
+				if(!requestDate.isEmpty() && requestDate.length() >= 7){
+					yyyymm = requestDate.substring(0, 4) + requestDate.substring(5, 7);
+				} else {
+					// 요청일이 없는 경우 현재 날짜로 대체
+					yyyymm = new java.text.SimpleDateFormat("yyyyMM").format(new java.util.Date());
+				}
 				paramMap.put("YYYYMM", yyyymm);
 				Integer seq = sqlSession.selectOne("quality.getEcrSeq", paramMap);
 				if(seq == null) seq = 1;
-- 
2.49.1


From 1739fdca7c41eff818eba3047b6a58fb773ebc06 Mon Sep 17 00:00:00 2001
From: hjjeong <hjjeong@wace.me>
Date: Mon, 9 Feb 2026 16:15:56 +0900
Subject: [PATCH 5/7] =?UTF-8?q?=EA=B2=AC=EC=A0=81=EC=9A=94=EC=B2=AD?=
 =?UTF-8?q?=EC=84=9C=20=EA=B2=80=EC=83=89=20=EC=9E=85=EB=A0=A5=20->=20?=
 =?UTF-8?q?=EC=85=80=EB=A0=89=ED=8A=B8=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/WEB-INF/view/salesMng/quotationRequestList.jsp | 2 +-
 src/com/pms/mapper/salesMng.xml                           | 8 ++++++++
 src/com/pms/salesmgmt/controller/SalesMngController.java  | 2 ++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/WebContent/WEB-INF/view/salesMng/quotationRequestList.jsp b/WebContent/WEB-INF/view/salesMng/quotationRequestList.jsp
index 97957fe..15d254a 100644
--- a/WebContent/WEB-INF/view/salesMng/quotationRequestList.jsp
+++ b/WebContent/WEB-INF/view/salesMng/quotationRequestList.jsp
@@ -351,7 +351,7 @@ function fn_openMailFormPopup(quotationRequestObjId){
                             <td><select name="PROJECT_NO" id="PROJECT_NO" class="select2" autocomplete="off" style="width:190px;"><option value="">선택</option>${code_map.project_no}</select></td>
                             
                             <td><label for="">견적요청서No.</label></td>
-                            <td><input type="text" name="QUOTATION_REQUEST_NO" id="QUOTATION_REQUEST_NO" autocomplete="off" value="${param.QUOTATION_REQUEST_NO}" style=""/></td>
+                            <td><select name="QUOTATION_REQUEST_NO" id="QUOTATION_REQUEST_NO" class="select2" autocomplete="off" style="width:160px;"><option value="">선택</option>${code_map.quotation_request_no}</select></td>
                             
                             <td><label for="">공급업체</label></td>
                             <td><select name="VENDOR_OBJID" id="VENDOR_OBJID" class="select2" autocomplete="off" style=""><option value="">선택</option>${code_map.vendor_objid}</select></td>
diff --git a/src/com/pms/mapper/salesMng.xml b/src/com/pms/mapper/salesMng.xml
index 3061ba6..87ddf81 100644
--- a/src/com/pms/mapper/salesMng.xml
+++ b/src/com/pms/mapper/salesMng.xml
@@ -5078,6 +5078,14 @@ ORDER BY V.PATH2
 	ORDER BY QRD.OBJID
 </select>
 
+<!-- 견적요청서 번호 셀렉트 목록 -->
+<select id="getQuotationRequestNoList" parameterType="map" resultType="map">
+	SELECT DISTINCT QUOTATION_REQUEST_NO AS "CODE", QUOTATION_REQUEST_NO AS "NAME"
+	FROM QUOTATION_REQUEST_MASTER
+	WHERE QUOTATION_REQUEST_NO IS NOT NULL AND QUOTATION_REQUEST_NO != ''
+	ORDER BY QUOTATION_REQUEST_NO DESC
+</select>
+
 <!-- 견적요청서 번호 생성 -->
 <select id="getNextQuotationRequestNo" parameterType="map" resultType="string">
 	SELECT 'Q' || TO_CHAR(NOW(), 'YYYYMMDD') || '-' || LPAD(NEXTVAL('SEQ_QUOTATION_REQUEST_NO')::VARCHAR, 3, '0')
diff --git a/src/com/pms/salesmgmt/controller/SalesMngController.java b/src/com/pms/salesmgmt/controller/SalesMngController.java
index 0f9b58f..6dffc5b 100644
--- a/src/com/pms/salesmgmt/controller/SalesMngController.java
+++ b/src/com/pms/salesmgmt/controller/SalesMngController.java
@@ -1648,6 +1648,8 @@ public class SalesMngController {
 		try {
 			// 프로젝트번호
 			code_map.put("project_no", commonService.bizMakeOptionList("", (String)paramMap.get("project_no"), "common.getProjectNameList"));
+			// 견적요청서 번호 목록
+			code_map.put("quotation_request_no", commonService.bizMakeOptionList("", (String)paramMap.get("QUOTATION_REQUEST_NO"), "salesMng.getQuotationRequestNoList"));
 			// 업체 목록
 			code_map.put("vendor_objid", commonService.bizMakeOptionList("", (String)paramMap.get("vendor_objid"), "common.getClientMngSupplySelect"));
 			// 상태
-- 
2.49.1


From 091e7723d415a757cafe91b1ba479424a2ae4562 Mon Sep 17 00:00:00 2001
From: hjjeong <hjjeong@wace.me>
Date: Mon, 9 Feb 2026 17:12:24 +0900
Subject: [PATCH 6/7] =?UTF-8?q?=EA=B2=AC=EC=A0=81=EC=9A=94=EC=B2=AD?=
 =?UTF-8?q?=EC=84=9C=EA=B4=80=EB=A6=AC=20=EA=B2=80=EC=83=89=ED=95=84?=
 =?UTF-8?q?=ED=84=B0=20=EC=83=81=ED=83=9C=20->=20=EB=A9=94=EC=9D=BC?=
 =?UTF-8?q?=EB=B0=9C=EC=86=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/view/salesMng/quotationRequestList.jsp   |  4 ++--
 src/com/pms/mapper/salesMng.xml                      | 12 ++++++++++--
 .../pms/salesmgmt/controller/SalesMngController.java | 10 ++++------
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/WebContent/WEB-INF/view/salesMng/quotationRequestList.jsp b/WebContent/WEB-INF/view/salesMng/quotationRequestList.jsp
index 15d254a..86e7fd1 100644
--- a/WebContent/WEB-INF/view/salesMng/quotationRequestList.jsp
+++ b/WebContent/WEB-INF/view/salesMng/quotationRequestList.jsp
@@ -356,8 +356,8 @@ function fn_openMailFormPopup(quotationRequestObjId){
                             <td><label for="">공급업체</label></td>
                             <td><select name="VENDOR_OBJID" id="VENDOR_OBJID" class="select2" autocomplete="off" style=""><option value="">선택</option>${code_map.vendor_objid}</select></td>
                             
-                            <td><label for="">상태</label></td>
-                            <td><select name="STATUS" id="STATUS" class="select2" autocomplete="off" style="">${code_map.status}</select></td>
+                            <td><label for="">메일발송</label></td>
+                            <td><select name="MAIL_SEND_YN" id="MAIL_SEND_YN" class="select2" autocomplete="off" style="">${code_map.mail_send_yn}</select></td>
                             
                             <td><label for="">작성자</label></td>
                             <td><select name="writer" id="writer" class="select2" autocomplete="off" style=""><option value="">선택</option>${code_map.writer}</select></td>
diff --git a/src/com/pms/mapper/salesMng.xml b/src/com/pms/mapper/salesMng.xml
index 87ddf81..a442284 100644
--- a/src/com/pms/mapper/salesMng.xml
+++ b/src/com/pms/mapper/salesMng.xml
@@ -4992,8 +4992,16 @@ ORDER BY V.PATH2
 	<if test="VENDOR_OBJID != null and VENDOR_OBJID != ''">
 		AND QRM.VENDOR_OBJID::VARCHAR = #{VENDOR_OBJID}
 	</if>
-	<if test="STATUS != null and STATUS != ''">
-		AND QRM.STATUS = #{STATUS}
+	<!-- 메일발송 여부 검색 (날짜 유무 기준) -->
+	<if test="MAIL_SEND_YN != null and MAIL_SEND_YN != ''">
+		<choose>
+			<when test="MAIL_SEND_YN == 'Y'.toString()">
+				AND QRM.MAIL_SEND_DATE IS NOT NULL
+			</when>
+			<otherwise>
+				AND QRM.MAIL_SEND_DATE IS NULL
+			</otherwise>
+		</choose>
 	</if>
 	<!-- 작성자 검색 -->
 	<if test="writer != null and writer != ''">
diff --git a/src/com/pms/salesmgmt/controller/SalesMngController.java b/src/com/pms/salesmgmt/controller/SalesMngController.java
index 6dffc5b..2459710 100644
--- a/src/com/pms/salesmgmt/controller/SalesMngController.java
+++ b/src/com/pms/salesmgmt/controller/SalesMngController.java
@@ -1652,14 +1652,12 @@ public class SalesMngController {
 			code_map.put("quotation_request_no", commonService.bizMakeOptionList("", (String)paramMap.get("QUOTATION_REQUEST_NO"), "salesMng.getQuotationRequestNoList"));
 			// 업체 목록
 			code_map.put("vendor_objid", commonService.bizMakeOptionList("", (String)paramMap.get("vendor_objid"), "common.getClientMngSupplySelect"));
-			// 상태
+			// 메일발송 상태 (미발송/발송)
 			String statusOptions = "";
 			statusOptions += "<option value=''>전체</option>";
-			statusOptions += "<option value='create'" + ("create".equals(paramMap.get("status")) ? " selected" : "") + ">작성중</option>";
-			statusOptions += "<option value='sent'" + ("sent".equals(paramMap.get("status")) ? " selected" : "") + ">발송완료</option>";
-			statusOptions += "<option value='received'" + ("received".equals(paramMap.get("status")) ? " selected" : "") + ">견적수신</option>";
-			statusOptions += "<option value='completed'" + ("completed".equals(paramMap.get("status")) ? " selected" : "") + ">완료</option>";
-			code_map.put("status", statusOptions);
+			statusOptions += "<option value='N'" + ("N".equals(paramMap.get("MAIL_SEND_YN")) ? " selected" : "") + ">미발송</option>";
+			statusOptions += "<option value='Y'" + ("Y".equals(paramMap.get("MAIL_SEND_YN")) ? " selected" : "") + ">발송</option>";
+			code_map.put("mail_send_yn", statusOptions);
 			// 작성자
 			code_map.put("writer", commonService.bizMakeOptionList("", (String)paramMap.get("writer"), "common.getUserselect"));
 			//제품구분
-- 
2.49.1


From 8eb82bd0ee69815a289258de87b4f68a8fc33f5d Mon Sep 17 00:00:00 2001
From: hjjeong <hjjeong@wace.me>
Date: Mon, 9 Feb 2026 18:08:44 +0900
Subject: [PATCH 7/7] =?UTF-8?q?=EA=B2=AC=EC=A0=81=EC=9A=94=EC=B2=AD?=
 =?UTF-8?q?=EC=84=9C=20=EC=9E=85=EA=B3=A0=EC=9A=94=EC=B2=AD=EC=9D=BC=20?=
 =?UTF-8?q?=EC=BB=AC=EB=9F=BC=20=EC=B6=94=EA=B0=80,=20=EA=B2=AC=EC=A0=81?=
 =?UTF-8?q?=20=EC=88=98=EC=8B=A0=20=ED=9B=84=20=EB=8B=A8=EA=B0=80,=20?=
 =?UTF-8?q?=EC=9E=85=EA=B3=A0=EC=9A=94=EC=B2=AD=EC=9D=BC=20=EC=9E=85?=
 =?UTF-8?q?=EB=A0=A5=EC=8B=9C=20mbom=5Fdetail=20=EC=97=90=20=EC=97=85?=
 =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=8A=B8(=ED=92=88=EC=9D=98=EC=84=9C?=
 =?UTF-8?q?=EC=97=90=20=EB=94=B0=EB=9D=BC=EA=B0=80=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=ED=95=98=EA=B8=B0=20=EC=9C=84=ED=95=B4)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../view/salesMng/quotationRequestFormPopup.jsp       | 11 +++++++++++
 .../view/salesmgmt/salesMgmt/salesMgmtList.jsp        |  8 ++++----
 src/com/pms/mapper/salesMng.xml                       |  7 ++++++-
 src/com/pms/salesmgmt/service/SalesMngService.java    |  7 +++++--
 4 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/WebContent/WEB-INF/view/salesMng/quotationRequestFormPopup.jsp b/WebContent/WEB-INF/view/salesMng/quotationRequestFormPopup.jsp
index 08d95b6..e9976de 100644
--- a/WebContent/WEB-INF/view/salesMng/quotationRequestFormPopup.jsp
+++ b/WebContent/WEB-INF/view/salesMng/quotationRequestFormPopup.jsp
@@ -306,6 +306,17 @@ function fn_initGrid() {
 		}
 	});
 	
+	// 입고요청일 (수정가능 - 달력 선택)
+	columns.push({
+		headerHozAlign: 'center',
+		hozAlign: 'center',
+		width: 130,
+		title: '<span style="background-color: #FFFF00; padding: 2px 5px;">입고요청일</span>',
+		field: 'DELIVERY_REQUEST_DATE',
+		editor: 'date',
+		editable: true
+	});
+	
 	// // 총단가 (자동계산) - 주석처리
 	// columns.push({
 	// 	headerHozAlign: 'center',
diff --git a/WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesMgmtList.jsp b/WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesMgmtList.jsp
index d471f83..514f289 100644
--- a/WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesMgmtList.jsp
+++ b/WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesMgmtList.jsp
@@ -175,7 +175,7 @@
 	
 	function fn_openSaleRegPopup(orderNo, saleNo){
 		var popup_width = 850;
-		var popup_height = 550;
+		var popup_height = 400;
 		// 한글 프로젝트 번호 인코딩 처리
 		var url = "/salesMgmt/salesRegForm.do?orderNo=" + encodeURIComponent(orderNo) + "&saleNo=" + (saleNo ? encodeURIComponent(saleNo) : "");
 		fn_centerPopup(popup_width, popup_height, url);
@@ -187,7 +187,7 @@
 		console.log("rowData:", rowData);
 		
 		var popup_width = 850;
-		var popup_height = 550;
+		var popup_height = 420;
 		
 		// 신규 판매등록: orderNo와 잔량 전달 (saleNo 없음)
 		var params = "orderNo=" + encodeURIComponent(rowData.PROJECT_NO);
@@ -649,8 +649,8 @@ function fn_splitShipment(){
 	}
 	
 	// 분할출하 팝업 열기
-	var popup_width = 800;
-	var popup_height = 600;
+	var popup_width = 900;
+	var popup_height = 450;
 	var url = "/salesMgmt/splitShipmentForm.do?projectNo=" + encodeURIComponent(projectNo);
 	fn_centerPopup(popup_width, popup_height, url);
 }
diff --git a/src/com/pms/mapper/salesMng.xml b/src/com/pms/mapper/salesMng.xml
index a442284..91adefd 100644
--- a/src/com/pms/mapper/salesMng.xml
+++ b/src/com/pms/mapper/salesMng.xml
@@ -5076,6 +5076,7 @@ ORDER BY V.PATH2
 		QRD.UNIT_PRICE,
 		QRD.REMARK,
 		QRD.REG_DATE,
+		QRD.DELIVERY_REQUEST_DATE,
 		-- 마스터 정보
 		QRM.VENDOR_TYPE,
 		QRM.VENDOR_OBJID,
@@ -5160,11 +5161,12 @@ ORDER BY V.PATH2
 	)
 </insert>
 
-<!-- 견적요청서 상세 단가 업데이트 -->
+<!-- 견적요청서 상세 단가/입고요청일 업데이트 -->
 <update id="updateQuotationRequestDetailPrice" parameterType="map">
 	UPDATE QUOTATION_REQUEST_DETAIL SET
 		UNIT_PRICE = #{UNIT_PRICE}::NUMERIC,
 		TOTAL_PRICE = #{QTY}::NUMERIC * #{UNIT_PRICE}::NUMERIC,
+		DELIVERY_REQUEST_DATE = CASE WHEN #{DELIVERY_REQUEST_DATE} IS NOT NULL AND #{DELIVERY_REQUEST_DATE} != '' THEN #{DELIVERY_REQUEST_DATE} ELSE NULL END,
 		EDIT_DATE = NOW()
 	WHERE OBJID = #{OBJID}::NUMERIC
 </update>
@@ -5191,6 +5193,9 @@ ORDER BY V.PATH2
 		<if test="VENDOR_TYPE == 'PROCESSING'">
 		PROCESSING_UNIT_PRICE = #{UNIT_PRICE}::NUMERIC
 		</if>
+		<if test="DELIVERY_REQUEST_DATE != null and DELIVERY_REQUEST_DATE != ''">
+		, DELIVERY_REQUEST_DATE = #{DELIVERY_REQUEST_DATE}
+		</if>
 		, EDIT_DATE = NOW()
 	WHERE OBJID IN (
 		SELECT MD2.OBJID 
diff --git a/src/com/pms/salesmgmt/service/SalesMngService.java b/src/com/pms/salesmgmt/service/SalesMngService.java
index 8abb060..616d505 100644
--- a/src/com/pms/salesmgmt/service/SalesMngService.java
+++ b/src/com/pms/salesmgmt/service/SalesMngService.java
@@ -2458,19 +2458,22 @@ public class SalesMngService {
 				String salesRequestPartObjid = CommonUtils.checkNull(detail.get("SALES_REQUEST_PART_OBJID"));
 				String unitPrice = CommonUtils.checkNull(detail.get("UNIT_PRICE"));
 				String qty = CommonUtils.checkNull(detail.get("QTY"));
+				String deliveryRequestDate = CommonUtils.checkNull(detail.get("DELIVERY_REQUEST_DATE"));
 				
-				// 1. 견적요청서 상세 단가 업데이트
+				// 1. 견적요청서 상세 단가/입고요청일 업데이트
 				Map updateParam = new HashMap();
 				updateParam.put("OBJID", detailObjid);
 				updateParam.put("UNIT_PRICE", unitPrice);
 				updateParam.put("QTY", qty);
+				updateParam.put("DELIVERY_REQUEST_DATE", deliveryRequestDate);
 				sqlSession.update("salesMng.updateQuotationRequestDetailPrice", updateParam);
 				
-				// 2. 구매리스트 단가 업데이트
+				// 2. 구매리스트 단가/입고요청일 업데이트
 				Map purchaseUpdateParam = new HashMap();
 				purchaseUpdateParam.put("SALES_REQUEST_PART_OBJID", salesRequestPartObjid);
 				purchaseUpdateParam.put("UNIT_PRICE", unitPrice);
 				purchaseUpdateParam.put("VENDOR_TYPE", vendorType);
+				purchaseUpdateParam.put("DELIVERY_REQUEST_DATE", deliveryRequestDate);
 				sqlSession.update("salesMng.updatePurchaseListPriceFromQuotation", purchaseUpdateParam);
 			}
 			
-- 
2.49.1