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 @@
+
+
+
+ |
+
+
+
+
+ |
+
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')
@@ -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