택배사 회수 불가 시 회수요청상태에서 반품/교환철회 처리

src/main/webapp/WEB-INF/views/order/ExchangeRequestForm.html

@@ -36,7 +36,9 @@
 				
 				<div style="text-align:right; padding-bottom:5px; padding-top:5px;">
 					<button type="button" class="btn btn-success" th:unless="${ordChgSq > 0}" id="fnExchangeRequestSubmit" onclick="fnExchange()">교환요청</button>
-					<button type="button" class="btn btn-success" th:if="${chgStat == 'G685_20' or chgStat == 'G685_21' or (recallExceptionInfo != null and (chgStat == 'G685_30' or chgStat == 'G685_31'))}" id="fnExchangeCancelRequestSubmit" onclick="fnExchangeCancel()">교환철회</button>
+					<!-- 2021.07.22 택배사 회수 불가 시 회수요청상태에서 교환철회 처리 -->
+					<!-- <button type="button" class="btn btn-success" th:if="${chgStat == 'G685_20' or chgStat == 'G685_21' or (recallExceptionInfo != null and (chgStat == 'G685_30' or chgStat == 'G685_31'))}" id="fnExchangeCancelRequestSubmit" onclick="fnExchangeCancel()">교환철회</button> -->
+					<button type="button" class="btn btn-success" th:if="${chgStat == 'G685_20' or chgStat == 'G685_21' or chgStat == 'G685_30' or (recallExceptionInfo != null and chgStat == 'G685_31')}" id="fnExchangeCancelRequestSubmit" onclick="fnExchangeCancel()">교환철회</button>
 					<button type="button" class="btn btn-success" th:if="${ordChgSq > 0 and (ordChgGb == 'G681_20' or ordChgGb == 'G681_40')}" id="fnReturnToExchangeSubmit" onclick="fnExchange()">교환변경</button>
 				</div>
 				

src/main/webapp/WEB-INF/views/order/RtnReqForm.html

@@ -1502,7 +1502,9 @@ $(document).ready(function() {
 		
 		// 2021.05.25 반품접수, 반품대기 상태에서만 철회가능
 		// 2021.07.13 회수예외정보가 있고 회수요청, 상품검수중 상태에서 철회 가능 처리
-		if (chgStat != "G685_50" && chgStat != "G685_51" && (recallExceptionInfo == null || (chgStat != "G685_30" && chgStat != 'G685_31'))) {
+		// 2021.07.22 택배사 회수 불가 시 회수요청상태에서 반품철회 처리
+		//if (chgStat != "G685_50" && chgStat != "G685_51" && (recallExceptionInfo == null || (chgStat != "G685_30" && chgStat != 'G685_31'))) {
+		if (chgStat != "G685_50" && chgStat != "G685_51" && chgStat != "G685_30" && (recallExceptionInfo == null || chgStat != 'G685_31')) {
 			$("#rtnReqCancelBtn").css("display", "none");
 		}