07.16

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

@@ -443,7 +443,8 @@
 			if(event.data.chgStat == "G685_21" || event.data.chgStat == "G685_51"){
 				return;
 			}
-			if(event.data.recallStat == "P" && event.data.rowspanRank == "1"){
+			//if(event.data.recallStat == "P" && event.data.rowspanRank == "1"){
+			if(event.data.recallStat == "P"){	
 				var params = {};
 				params.recallExceptionNo = event.data.recallExceptionNo;
 				params.csAddFee = event.data.csAddFee;
@@ -459,11 +460,13 @@
 				});
 			}
 		} else if(event.colDef.field == 'chgReason'){
-			if(event.data.recallStat == "P" && event.data.rowspanRank == "1" && event.data.chgStat != null){
+			//if(event.data.recallStat == "P" && event.data.rowspanRank == "1" && event.data.chgStat != null){
+			if(event.data.recallStat == "P"  && event.data.chgStat != null){
 				if (event.data.reasonCode == '00'){
 					
 				} else if(event.data.reasonCode == '01'){ // 반품미접수 
-					
+					// ?? 확인~~~
+					/*
 					if (event.data.chgGb == 'G680_30') { // 반품요청
 						refreshFlag  = "ban";
 						var ordChgSq = 0;
@@ -482,6 +485,7 @@
 						param += "&ordNo=" 			+ event.data.orderNo;
 						param += "&ordDtlNo=" 		+ event.data.orderDtlNo;
 						param += "&delvFeeCd="		+ event.data.delvFeeCd;
+						param += "&ordChgGb="		+ "G681_50"";
 						param += "&delvFeeCdGrp="	+ "WMS";
 						param += "&ordChgSq=" 		+ ordChgSq;
 						param += "&ordDtlNoArr=" 	+ ordDtlNoList.split(",");
@@ -489,6 +493,7 @@
 						var actionUrl = "/orderChange/rtn/req/form?" + param;
 						cfnOpenModalPopup(actionUrl, 'popupReturnRequestForm');
 					}
+				*/
 
 					
 				} else if (event.data.reasonCode == '02' || event.data.reasonCode == '03') { // 미착 , 과착 
@@ -537,7 +542,8 @@
 					
 				}
 				
-			} else if(event.data.recallStat == "P" && event.data.rowspanRank == "1" && event.data.chgStat == null){
+			//} else if(event.data.recallStat == "P" && event.data.rowspanRank == "1" && event.data.chgStat == null){
+			} else if(event.data.recallStat == "P" && event.data.chgStat == null){
 				refreshFlag  = "ban";
 				var ordChgSq = 0;
 				var param    = "";
@@ -557,6 +563,7 @@
 				param += "&ordNo=" 			+ event.data.orderNo;
 				param += "&ordDtlNo=" 		+ event.data.orderDtlNo;
 				param += "&delvFeeCd="		+ event.data.delvFeeCd;
+				param += "&ordChgGb="		+ "G681_50"";
 				param += "&delvFeeCdGrp="	+ "WMS";
 				param += "&ordChgSq=" 		+ ordChgSq;
 				param += "&ordDtlNoArr=" 	+ ordDtlNoList.split(",");