07.07

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

@@ -302,7 +302,7 @@
 						  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 
 						  LEFT JOIN TB_OPTION C ON C.OPT_CD = B.SKU_CODE
-						  LEFT OUTER JOIN TB_ORDER_CHANGE_DETAIL  CD ON B.ORDER_DTL_NO = CD.ORD_DTL_NO AND CD.DEL_YN ='N' AND CD.CHG_STAT = 'G685_31'
+						  LEFT OUTER JOIN TB_ORDER_CHANGE_DETAIL  CD ON B.ORDER_DTL_NO = CD.ORD_DTL_NO AND CD.DEL_YN ='N'
 						  LEFT OUTER JOIN TB_ORDER_CHANGE         OC ON CD.ORD_CHG_SQ = OC.ORD_CHG_SQ 						  
 						  WHERE B.REASON_CODE IN('00','01','02','03','04','05','06','15')
 							<if test='customerName != null and customerName != ""'>

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

@@ -194,6 +194,7 @@
 		},
 		
 		{headerName: "사유", 			field: "chgReasonNm", 	width: 150, cellClass: "text-left"},
+		{headerName: "회수요청일", 		field: "regDt", 	width: 100, cellClass: "text-center"},
 		{headerName: "진행상태", 		field: "chgStatNm", 	width: 100, cellClass: "text-center"},
 		{headerName: "상품코드", 		field: "goodsCd", 		width: 120, cellClass: "text-center",
 			cellRenderer: function(params) { return gagajf.isNull(params.value) ? '' : '<a href="javascript:void(0);">' + params.value + '</a>'; }

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

@@ -243,7 +243,7 @@
 						}
 						
 					} else if(params.data.recallStat === 'P' && params.data.chgStat == null){
-						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 = '' }
 					return btnText;
 				}		
@@ -432,6 +432,32 @@
 						
 						cfnOpenModalPopup(actionUrl, 'popupExchangeRequestForm');
 					}
+				} else if(event.data.reasonCode == '01' || event.data.reasonCode == '03' ){
+/* 					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 += "&delvFeeCdGrp="	+ "WMS";
+					param += "&ordChgSq=" 		+ ordChgSq;
+					//param += "&ordDtlNoArr=" 	+ ordDtlNoList.split(",");
+					
+					var actionUrl = "/orderChange/rtn/req/form?" + param;
+					cfnOpenModalPopup(actionUrl, 'popupReturnRequestForm');
+					 */
 				} else {
 					actionUrl = "/withdraw/exception/change/form?ordChgSq=" + event.data.ordChgSq + '&chgGb=' + event.data.chgGb;
 					cfnOpenModalPopup(actionUrl, 'popupWithdrawChangeForm');