회수예외 수정

src/main/java/com/style24/persistence/domain/WithdrawExc.java

@@ -73,6 +73,7 @@ public class WithdrawExc extends TscBaseDomain {
 	private String wdBfSendYn;
 	private String Ifstat;
 	private String newOrdChgSqYn;
+	private String mallGb;
 	
 	private int chargeAmount;          // 요금총액
 	private int exceptionQty;          // 수량

src/main/webapp/WEB-INF/views/withdraw/WithdrawChangePopForm.html

@@ -177,6 +177,9 @@ var fnChangeChgReason = function(reasonCd) {
 				if(wdGb == "W" && spanRefundAmt < rtnDelvFee ){  // 회수요청 
 					changeYn = "Y";
 					addPayCost = rtnDelvFee;
+				} else {
+					changeYn = "Y";
+					addPayCost = rtnDelvFee;
 				}
 			}
 			

src/main/webapp/WEB-INF/views/withdraw/WithdrawExceptionListForm.html

@@ -212,19 +212,26 @@
 							paramData 		+= '@' + params.data.delvFeeCd;
 							paramData 		+= '@' + 'WMS';
 							
-							// 반품접수, 반품대기, 회수요청, 상품검수중, 결제대기, 반품진행중
-							if (params.data.chgStat == 'G685_50' || params.data.chgStat == 'G685_51' 
-									|| params.data.chgStat == 'G685_30' || params.data.chgStat == 'G685_31' || params.data.chgStat == 'G685_32' || params.data.chgStat == 'G685_33') {
-								rtnStr = '<a href="javascript:void(0);" onclick="fnReturnRequest(\'' + paramData + '\',\'' + params.value + '\');">' + params.value + '</a>';
-							}
-							// 교환접수, 교환대기, 회수요청, 상품검수중, 결제대기, 교환진행중
-							else if (params.data.chgStat == 'G685_20' || params.data.chgStat == 'G685_21' 
-									|| params.data.chgStat == 'G685_30' || params.data.chgStat == 'G685_31' || params.data.chgStat == 'G685_32' || params.data.chgStat == 'G685_34') {
-								rtnStr = '<a href="javascript:void(0);" onclick="fnExchangeRequest(\'' + paramData + '\',\'' + params.value + '\');">' + params.value + '</a>';
-							} 
-							else {
-								rtnStr = params.value;
+							if(params.data.chgGb == 'G680_30' ){
+								// 반품접수, 반품대기, 회수요청, 상품검수중, 결제대기, 반품진행중
+								if (params.data.chgStat == 'G685_50' || params.data.chgStat == 'G685_51' 
+										|| params.data.chgStat == 'G685_30' || params.data.chgStat == 'G685_31' || params.data.chgStat == 'G685_32' || params.data.chgStat == 'G685_33') {
+									rtnStr = '<a href="javascript:void(0);" onclick="fnReturnRequest(\'' + paramData + '\',\'' + params.value + '\');">' + params.value + '</a>';
+								}else {
+									rtnStr = params.value;
+								}
+							} else {
+								// 교환접수, 교환대기, 회수요청, 상품검수중, 결제대기, 교환진행중
+								if (params.data.chgStat == 'G685_20' || params.data.chgStat == 'G685_21' 
+										|| params.data.chgStat == 'G685_30' || params.data.chgStat == 'G685_31' || params.data.chgStat == 'G685_32' || params.data.chgStat == 'G685_34') {
+									rtnStr = '<a href="javascript:void(0);" onclick="fnExchangeRequest(\'' + paramData + '\',\'' + params.value + '\');">' + params.value + '</a>';
+								} 
+								else {
+									rtnStr = params.value;
+								}
 							}
+
+
 						}
 					} else {
 						rtnStr = params.value;
@@ -291,7 +298,13 @@
 								}
 							}
 						} else if(params.data.reasonCode == '04' ){ // 배송비 미동봉 
-							btnText= '<a href="javascript:void(0);"  class="btn btn-success btn-ssm">사유변경</a>';
+							
+							if(params.data.mallGb  == 'G011_10' ){
+								btnText= '<a href="javascript:void(0);"  class="btn btn-success btn-ssm">사유변경</a>';
+							} else {
+								btnText= '';
+							}
+							
 						} else if(params.data.reasonCode == '05'){ // 다른상품 반품
 							if(params.data.recallExceptionNo != null){
 								if(params.data.chgGb == 'G680_30' && params.data.newOrdChgSqYn == 'N'){
@@ -602,11 +615,13 @@
 							cfnOpenModalPopup(actionUrl, 'popupExchangeRequestForm');
 						}
 					} else if(event.data.reasonCode == '04'){ // 배송비 미동봉
-						
-						if(event.data.chgReason == "G688_10" || event.data.chgReason == "G689_10"){
+						if(event.data.mallGb  == 'G011_10'){
 							actionUrl = "/withdraw/exception/change/form?ordChgSq=" + event.data.ordChgSq + '&chgGb=' + event.data.chgGb;
 							cfnOpenModalPopup(actionUrl, 'popupWithdrawChangeForm');
 						}
+						//if(event.data.chgReason == "G688_10" || event.data.chgReason == "G689_10"){
+
+						//}
 					} else if(event.data.reasonCode == '05' ){ // 다른상품 반품 
 						refreshFlag  = "ban";
 						param += "&ordNo=" 			+ event.data.orderNo;