0723

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

@@ -70,7 +70,7 @@ public class WithdrawExc extends TscBaseDomain {
 	private String payGb;
 	private String recallStatNm;
 	private String statNm;
-	
+	private String wdBfSendYn;
 	
 	private int chargeAmount;          // 요금총액
 	private int exceptionQty;          // 수량

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

@@ -234,6 +234,7 @@
 							, NULL   AS WD_GB 
 							, NULL   AS CHG_REASON
 							, 'EXC'  AS CHG_GB 
+							, 'N'    AS WD_BF_SEND_YN
 						  FROM TB_ORDER_RECALL_EXCEPTION A 
 						  JOIN TB_ORDER_RECALL_EXCEPTION_ITEM B ON A.RECALL_EXCEPTION_NO = B.RECALL_EXCEPTION_NO
 						  LEFT JOIN TB_ORDER O ON O.ORD_NO = A.ORDER_NO 
@@ -302,6 +303,7 @@
 							, OC.WD_GB 
 							, OC.CHG_REASON
 							, OC.CHG_GB 
+							, OC.WD_BF_SEND_YN
 						  FROM TB_ORDER_RECALL_EXCEPTION A 
 						  JOIN TB_ORDER_RECALL_EXCEPTION_ITEM B ON A.RECALL_EXCEPTION_NO = B.RECALL_EXCEPTION_NO
 						  LEFT JOIN TB_ORDER O ON O.ORD_NO = A.ORDER_NO 

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

@@ -166,7 +166,7 @@
 					} else {
 						btnText= '<a href="javascript:void(0);"  class="btn btn-success btn-ssm">완료</a>';
 					}
-				} else { btnText = '완료' }
+				} else { btnText = '처리완료' }
 				return btnText;
 			}			
 		},
@@ -265,21 +265,29 @@
 							btnText = '';
 						} else if(params.data.reasonCode == '01'){ // 반품미접수
 							if(params.data.chgGb == 'G680_30'){
-								btnText= '<a href="javascript:void(0);"  class="btn btn-success btn-ssm">반품신청</a>';
+							//	btnText= '<a href="javascript:void(0);"  class="btn btn-success btn-ssm">반품신청</a>';
 							} else {
-								btnText= '<a href="javascript:void(0);"  class="btn btn-success btn-ssm">교환신청</a>';
+							//	btnText= '<a href="javascript:void(0);"  class="btn btn-success btn-ssm">교환신청</a>';
 							}
 						}else if(params.data.reasonCode == '02'){ // 미착 
 							if(params.data.chgGb == 'G680_30'){
 								btnText= '<a href="javascript:void(0);"  class="btn btn-success btn-ssm">반품변경</a>';
 							}else if(params.data.chgGb == 'G680_40'){
-								btnText= '<a href="javascript:void(0);"  class="btn btn-success btn-ssm">교환변경</a>';
+								if(params.data.wdBfSendYn == 'N'){
+									btnText= '<a href="javascript:void(0);"  class="btn btn-success btn-ssm">교환변경</a>';	
+								} else {
+									btnText = '선발송';
+								}
 							}
 						} else if(params.data.reasonCode == '03'){ // 과착 
 							if(params.data.chgGb == 'G680_30'){
 								btnText= '<a href="javascript:void(0);"  class="btn btn-success btn-ssm">반품신청</a>';
 							} else {
-								btnText= '<a href="javascript:void(0);"  class="btn btn-success btn-ssm">교환신청</a>';
+								if(params.data.wdBfSendYn == 'N'){
+									btnText= '<a href="javascript:void(0);"  class="btn btn-success btn-ssm">교환신청</a>';
+								} else {
+									btnText = '선발송';
+								}
 							}
 						} else if(params.data.reasonCode == '04' ){ // 배송비 미동봉 
 							btnText= '<a href="javascript:void(0);"  class="btn btn-success btn-ssm">사유변경</a>';
@@ -447,7 +455,7 @@
 		//if(params.data.chgStat == 'G685_21' || params.data.chgStat == 'G685_51'){
 			
 		
-		if (event.colDef.field == 'recallStat'){
+		if (event.colDef.field == 'recallStatNm'){
 			if(event.data.chgStat == "G685_21" || event.data.chgStat == "G685_51"){
 				return;
 			}
@@ -473,36 +481,6 @@
 				if (event.data.reasonCode == '00'){
 					
 				} else if(event.data.reasonCode == '01'){ // 반품미접수 
-					// ?? 확인~~~
-					/*
-					if (event.data.chgGb == 'G680_30') { // 반품요청
-						refreshFlag  = "ban";
-						var ordChgSq = 0;
-						var param    = "";
-						var ordDtlNoList ="";
-						
-						var allData =  gagaAgGrid.getAllRowData(gridOptions);
-
-						allData.forEach(function(item, index) {
-							if (event.data.orderNo == item.orderNo ){
-								ordDtlNoList = ordDtlNoList+","+item.orderDtlNo;
-							}
-						});
-						ordDtlNoList = ordDtlNoList.substring(1,ordDtlNoList.length);
-						
-						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(",");
-
-						var actionUrl = "/orderChange/rtn/req/form?" + param;
-						cfnOpenModalPopup(actionUrl, 'popupReturnRequestForm');
-					}
-				*/
-				
 					
 				} else if (event.data.reasonCode == '02' || event.data.reasonCode == '03') { // 미착 , 과착 
 					param += "&ordNo=" 			+ event.data.orderNo;
@@ -523,8 +501,11 @@
 						cfnOpenModalPopup(actionUrl, 'popupExchangeRequestForm');
 					}
 				} else if(event.data.reasonCode == '04'){ // 배송비 미동봉
-					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"){
+						actionUrl = "/withdraw/exception/change/form?ordChgSq=" + event.data.ordChgSq + '&chgGb=' + event.data.chgGb;
+						cfnOpenModalPopup(actionUrl, 'popupWithdrawChangeForm');
+					}
 				} else if(event.data.reasonCode == '05'){ // 다른상품 반품 
 					param += "&ordNo=" 			+ event.data.orderNo;
 					param += "&ordDtlNo=" 		+ event.data.orderDtlNo;