교환취소수정

src/main/java/com/style24/persistence/mybatis/shop/TsaDelivery.xml

@@ -1192,7 +1192,7 @@
 		     , EDF.ORD_NO
 		     , EDF.ORD_DTL_NO
 		     , EDF.DELV_CNCL_YN
-		     , CASE WHEN DELV_CNCL_YN IN ('Y')
+		     , CASE WHEN DELV_CNCL_YN IN ('N')
 		            THEN '대기'
 		            ELSE '완료'
 		            END  DELV_CNCL_YN_NM

src/main/webapp/WEB-INF/views/delivery/ExchangeDelvFailListForm.html

@@ -111,8 +111,13 @@ var columnDefs = [
 			paramData 		+= '@' + params.data.ordDtlNo;
 			paramData 		+= '@' + params.data.delvFeeCd;
 			paramData 		+= '@' + params.data.delvFeeCdGrp;
-										
-			rtnStr = '<a href="javascript:void(0);" onclick="fnCancelRequest(\'' + paramData + '\',\'' + params.value + '\');">' + params.value + '</a>';
+			paramData 		+= '@' + params.data.delvCnclYn;
+			
+			if (params.data.delvCnclYn == 'N') {
+				rtnStr = '<a href="javascript:void(0);" onclick="fnCancelRequest(\'' + paramData + '\',\'' + params.value + '\');">' + params.value + '</a>';				
+			} else {
+				rtnStr = params.value;
+			}
 			return rtnStr;
 		}
 	},
@@ -191,6 +196,14 @@ var fnCancelRequest = function (paramData, ordChgSq) {
 	
 	var actionUrl = "/orderChange/cncl/req/form?" + param;
 	
+	alert(paramArr[4]);
+	// 2021.08.31 품절취소 완료 일때 
+	if (paramArr[4] == "Y") {
+		actionUrl = "/orderChange/cnclRtn/complete/view?" + param;	
+	}
+	
+	
+	
 	cfnOpenModalPopup(actionUrl, 'popupCancelRequestForm');
 	
 	return false;