반품TO반품 임시 커밋

src/main/java/com/style24/admin/biz/web/TsaOrderChangeController.java

@@ -332,16 +332,20 @@ public class TsaOrderChangeController extends TsaBaseController {
 
 			// 반품상세 정보 설정
 			List<Integer> ordDtlNoList = new ArrayList<>();
+			List<Integer> chgQtyList = new ArrayList<>();
 			if (exchangeInfoList != null && exchangeInfoList.size() > 0) {
 				for (Order tmp : exchangeInfoList) {
 					if (tmp.getChgQty() > 0 && !ordDtlNoList.contains(tmp.getOrdDtlNo())) {
 						ordDtlNoList.add(tmp.getOrdDtlNo());
+						chgQtyList.add(tmp.getChgQty());
 					}
 				}
 
 				List<Order> tmpList = new ArrayList<>();
 				for (Order tmp : cancelRequestTargetList) {
 					if(ordDtlNoList.contains(tmp.getOrdDtlNo())) {
+						int chgQty = chgQtyList.get(ordDtlNoList.indexOf(tmp.getOrdDtlNo()));
+						tmp.setChgQty(chgQty);
 						tmpList.add(tmp);
 					}
 				}
@@ -649,16 +653,20 @@ public class TsaOrderChangeController extends TsaBaseController {
 
 			// 교환상세 정보 설정
 			List<Integer> ordDtlNoList = new ArrayList<>();
+			List<Integer> chgQtyList = new ArrayList<>();
 			if (exchangeInfoList != null && exchangeInfoList.size() > 0) {
 				for (Order tmp : exchangeInfoList) {
 					if (tmp.getChgQty() > 0 && !ordDtlNoList.contains(tmp.getOrdDtlNo())) {
 						ordDtlNoList.add(tmp.getOrdDtlNo());
+						chgQtyList.add(tmp.getChgQty());
 					}
 				}
 
 				Collection<Order> tmpList = new ArrayList<>();
 				for (Order tmp : cancelRequestTargetList) {
 					if(ordDtlNoList.contains(tmp.getOrdDtlNo())) {
+						int chgQty = chgQtyList.get(ordDtlNoList.indexOf(tmp.getOrdDtlNo()));
+						tmp.setChgQty(chgQty);
 						tmpList.add(tmp);
 					}
 				}

src/main/webapp/WEB-INF/views/order/OrderDetailForm.html

@@ -1189,7 +1189,6 @@ var fnReturnRequest = function (paramData, ordChgSq) {
 
 // 교환요청
 var fnExchangeRequest = function (paramData, ordChgSq) {
-	console.log(paramData);
 	// 취소요청 구분 (orChgSq null 이면 취소요청화면 있으면 취소요청정보화면)
 	if (ordChgSq == null) {
 		ordChgSq = 0;

src/main/webapp/WEB-INF/views/order/RtnReqForm.html

@@ -262,7 +262,7 @@ if (ordChgSq > 0) {
 if (gagajf.isNull(ordChgGb)) {
 	ordChgGb == '1';
 }
-console.log(ordChgGb);
+
 var temp1 = true;
 var temp2 = false;
 var temp3 = true;
@@ -322,8 +322,13 @@ var columnCancelReqList = [
 			if (ordChgSq > 0 && ordChgGb != 'G681_30') {
 				rtnStr = ordCanChgQty;
 			} else {
-				if (ordChgGb != 'G681_30') {
+				//if (ordChgGb != 'G681_30') {
 					ordCanChgQty = ordQty - (cnclRtnQty + ordReqChgQty);
+				//}
+				console.log(ordChgGb);
+				console.log(params.data);
+				if (ordChgGb == 'G681_30') {
+					ordCanChgQty = params.data.chgQty;
 				}
 				
 				rtnStr += "<select class='ordCanChgQty' name='ordCanChgQty' ordDtlNo='"+params.data.ordDtlNo+"' onChange='fnCalculateRefundAmt(this);'>";
@@ -888,6 +893,7 @@ var fnCalculateRefundAmt = function (obj) {
 	// 2021.05.25 수정
 	var ordDtlNoArr 		= [];
 	var cnclRtnReqQtyArr 	= [];
+	var chgQtyArr			= [];
 	
 	// 1. 반품신청수량 체크
 	for (i=0 ; i<cancelRequestTargetList.length ; i++) {
@@ -895,6 +901,8 @@ var fnCalculateRefundAmt = function (obj) {
 			// 반품신청값설정
 			ordDtlNoArr.push(cancelRequestTargetList[i].ordDtlNo);
 			cnclRtnReqQtyArr.push(cancelRequestTargetList[i].ordCanChgQty);
+			chgQtyArr.push(cancelRequestTargetList[i].chgQty);
+			console.log(cancelRequestTargetList[i].chgQty);
 		}
 	}
 
@@ -927,6 +935,14 @@ var fnCalculateRefundAmt = function (obj) {
 		'/orderChange/cancel/refundAmt'
 		, jsonData
 		, function(result) {
+			
+			$.each(result.cancelOrderRefundList, function(idx, item) {
+				let index = ordDtlNoArr.indexOf(item.ordDtlNo);
+				if (index >= 0) {
+					item.chgQty = chgQtyArr[index];
+				}
+			});
+			
 			gridOptionsCancelReqToBeList.api.setRowData(result.cancelOrderRefundList);
 			gridOptionsDelvCdList.api.setRowData(result.cancelDelvRefundList);
 			
@@ -1404,7 +1420,7 @@ $(document).ready(function() {
 		$("#chgMemo").text(chgMemo);															// 변경사유메모
 		$("#chgMemo").attr('readOnly', true);													// 변경사유메모 비활성화
 		$('input:radio[name=wdGb]').attr('disabled', true);										// 회수방법 비활성화
-		
+		console.log('chgReason');
 		fnChangeChgReason(chgReason);															// 귀책사유
 	}
 	
@@ -1415,7 +1431,7 @@ $(document).ready(function() {
 		$("#h4DelvCdList").css("display"					, "none");
 		$("#gridDelvCdList").css("display"					, "none");
 	}
-	
+	console.log('refundAmt');
 	// 7. 환불예상금액계산
 	fnCalculateRefundAmt(null);