From 2411aaa23e99a01306fa160a1a64a047a2cb5322 Mon Sep 17 00:00:00 2001
From: hjjeong <hjjeong@wace.me>
Date: Mon, 9 Mar 2026 11:38:34 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B2=AC=EC=A0=81=EA=B4=80=EB=A6=AC=20?=
 =?UTF-8?q?=EB=93=B1=EB=A1=9D=EC=8B=9C=20=EA=B2=B0=EC=9E=AC=EC=97=AC?=
 =?UTF-8?q?=EB=B6=80=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../contractMgmt/estimateRegistFormPopup.jsp  | 26 +++++++++++++++++++
 src/com/pms/salesmgmt/mapper/contractMgmt.xml |  7 ++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/WebContent/WEB-INF/view/contractMgmt/estimateRegistFormPopup.jsp b/WebContent/WEB-INF/view/contractMgmt/estimateRegistFormPopup.jsp
index f908135..571cc21 100644
--- a/WebContent/WEB-INF/view/contractMgmt/estimateRegistFormPopup.jsp
+++ b/WebContent/WEB-INF/view/contractMgmt/estimateRegistFormPopup.jsp
@@ -288,6 +288,13 @@
 		}
 	}
 
+	// 결재여부 체크박스 토글 (단일 선택)
+	function fn_toggleApprovalRequired(clicked) {
+		$("input[name='approval_required_chk']").prop("checked", false);
+		$(clicked).prop("checked", true);
+		$("#approval_required").val($(clicked).val());
+	}
+	
 	function fn_save() {
 		if (fnc_valitate("form1")) {
 			// 품목 유효성 검사
@@ -1990,6 +1997,25 @@
 										<input type="text" name="exchange_rate" id="exchange_rate" reqTitle="환율" value="${info.EXCHANGE_RATE}" />
 									</td>
 								</tr>
+								
+								<!-- 세번째 행: 결재여부 -->
+								<tr>
+									<td class="input_title"><label>결재여부 <span style="color:red;">*</span></label></td>
+									<td colspan="7">
+										<label style="margin-right:15px; cursor:pointer;">
+											<input type="checkbox" name="approval_required_chk" value="Y"
+												${info.APPROVAL_REQUIRED eq 'Y' ? 'checked' : ''}
+												onchange="fn_toggleApprovalRequired(this)" /> 필요
+										</label>
+										<label style="cursor:pointer;">
+											<input type="checkbox" name="approval_required_chk" value="N"
+												${info.APPROVAL_REQUIRED ne 'Y' ? 'checked' : ''}
+												onchange="fn_toggleApprovalRequired(this)" /> 불필요
+										</label>
+										<input type="hidden" name="approval_required" id="approval_required" 
+											value="${info.APPROVAL_REQUIRED ne 'Y' ? 'N' : 'Y'}" />
+									</td>
+								</tr>
 							</table>
 						</td>
 					</tr>
diff --git a/src/com/pms/salesmgmt/mapper/contractMgmt.xml b/src/com/pms/salesmgmt/mapper/contractMgmt.xml
index 3749e46..bddd9bc 100644
--- a/src/com/pms/salesmgmt/mapper/contractMgmt.xml
+++ b/src/com/pms/salesmgmt/mapper/contractMgmt.xml
@@ -561,9 +561,10 @@
 			WHEN AMR.STATUS = 'reject' THEN '반려'
 			WHEN AMR.STATUS = 'create' THEN '작성중'
 			WHEN AMR.STATUS = 'notRequired' THEN '결재불필요'
+			WHEN COALESCE(T.APPROVAL_REQUIRED, 'N') = 'N' THEN '결재불필요'
 			ELSE ''
 		END AS APPR_STATUS
-		,COALESCE(AMR.STATUS, '') AS AMARANTH_STATUS
+		,COALESCE(AMR.STATUS, CASE WHEN COALESCE(T.APPROVAL_REQUIRED, 'N') = 'N' THEN 'notRequired' ELSE '' END) AS AMARANTH_STATUS
 		,CASE
 			WHEN AMR_ORDER.STATUS = 'complete' THEN '결재완료'
 			WHEN AMR_ORDER.STATUS = 'inProcess' THEN '결재중'
@@ -1285,6 +1286,7 @@
 			,QUANTITY
 			,CUSTOMER_REQUEST
 			,EXCHANGE_RATE
+			,APPROVAL_REQUIRED
 		)
 	VALUES
 	(
@@ -1345,6 +1347,7 @@
 			,#{quantity}
 			,#{customer_request}
 			,#{exchange_rate}
+			,COALESCE(#{approval_required}, 'N')
 		)
 	ON CONFLICT (OBJID) DO
 	UPDATE
@@ -1402,6 +1405,7 @@
 			,QUANTITY                =  #{quantity} 
 			,CUSTOMER_REQUEST        =  #{customer_request} 
 			,EXCHANGE_RATE           =  #{exchange_rate}
+			,APPROVAL_REQUIRED       =  COALESCE(#{approval_required}, 'N')
 	</update>
 
 	<update id="saveContractMgmtInfo_old" parameterType="map">
@@ -1792,6 +1796,7 @@ SELECT
 			,A.QUANTITY
 			,A.CUSTOMER_REQUEST
 			,A.EXCHANGE_RATE
+			,COALESCE(A.APPROVAL_REQUIRED, 'N') AS APPROVAL_REQUIRED
 			,A.ORDER_DATE
 			,A.ORDER_UNIT_PRICE
 			,A.ORDER_SUPPLY_PRICE