반품TO교환 임시 커밋

src/main/java/com/style24/admin/biz/service/TsaOrderChangeService.java

@@ -1,5 +1,7 @@
 package com.style24.admin.biz.service;
 
+import java.util.Collection;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
@@ -7,8 +9,10 @@ import org.springframework.transaction.annotation.Transactional;
 
 import com.gagaframework.web.parameter.GagaMap;
 import com.style24.core.biz.service.TscOrderChangeService;
+import com.style24.core.biz.service.TscWmsService;
 import com.style24.core.support.message.TscMessageByLocale;
 import com.style24.persistence.domain.OrderChange;
+import com.style24.persistence.domain.WmsDelivery;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -30,6 +34,9 @@ public class TsaOrderChangeService {
 
 	@Autowired
 	private TscOrderChangeService coreOrderChangeService;
+	
+	@Autowired
+	private TscWmsService coreWmsService;
 
 	/**
 	 * 반품 TO 교환 처리
@@ -40,18 +47,34 @@ public class TsaOrderChangeService {
 	 */
 	@Transactional("shopTxnManager")
 	public void returnToExchange(OrderChange orderChange) {
+		Integer ordChgSq = orderChange.getOrdChgSq();
 		// 1. 반품 철회 처리
 		GagaMap map = new GagaMap();
-		map.setInt("ordChgSq", orderChange.getOrdChgSq());
+		map.setInt("ordChgSq", ordChgSq);
 		map.setInt("ordNo", orderChange.getOrdNo());
 
 		int userNo = orderChange.getUserNo();
 
 		coreOrderChangeService.rtnReqCancel(map, userNo);
 
-		// 2. 교환 접수 처리
-		orderChange.setWdTargetYn("N");
+		// 2. WMS 회수지시 여부 체크 후 회시지시대상여부 컬럼 정보 설정
+		orderChange.setWdTargetYn("Y");
+
+		WmsDelivery wmsDelivery = new WmsDelivery();
+		wmsDelivery.setOrderExceptionNo(ordChgSq);
+		Collection<WmsDelivery> list = coreWmsService.getWmsWithdrawRequestInfo(wmsDelivery);
+
+		if (list != null && list.size() > 0) {
+			String ifStat = list.iterator().next().getIfStat();
+			if (!"0".equals(ifStat)) {
+				orderChange.setWdTargetYn("N");
+			}
+		}
+
+		// 3. WMS 반품 정보 삭제 처리
+		
 
+		// 4. 교환 접수 처리
 		coreOrderChangeService.exchReq(orderChange);
 	}
 }

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

@@ -825,9 +825,12 @@ public class TsaOrderChangeController extends TsaBaseController {
 	// }
 	
 	@PostMapping("/return/to/exchange")
-	public GagaResponse returnToExchange(OrderChange orderChange) {
+	@ResponseBody
+	public GagaResponse returnToExchange(@RequestBody OrderChange orderChange) {
 		int userNo = TsaSession.getInfo().getUserNo();
 		orderChange.setUserNo(userNo);
+		orderChange.setRegNo(userNo);
+		orderChange.setUpdNo(userNo);
 
 		orderChangeService.returnToExchange(orderChange);
 

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

@@ -587,23 +587,41 @@ var fnChangeChgReason = function(reasonCd){
 
 // 교환요청
 var fnExchange = function () {
-	var qty		= false;
-	var opt		= false;
+	var qty		= true;
+	var opt		= true;
 	var wdGb	= $('#wdGb:checked').val();
 
 	// 1. 교환수량 체크
-	$.each(cancelRequestTargetList, function(idx, item) {
-		if (item.chgQty > 0) {
-			qty = true;
+	//$.each(cancelRequestTargetList, function(idx, item) {
+	//	if (item.chgQty > 0) {
+	//		qty = true;
+	//
+	//		if (!gagajf.isNull(item.ordChgOpt)) {
+	//			opt = true;
+	//		}
+	//	}
+	//});
+	// 반품TO교환 신청 수량 설정
+	if (chgGb == 'G680_30') {
+		exchangeRequestList = cancelRequestTargetList;
+		$.each(exchangeRequestList, function(idx, exchangeRequest) {
+			$.each(exchangeInfoList , function(idx2, exchangeInfo) {
+				if (exchangeRequest.itemCd == exchangeInfo.itemCd && exchangeRequest.optCd1 == exchangeInfo.optCd1) {
+					exchangeRequest.chgQty = exchangeInfo.chgQty;
+				}
+			});
+		});
+	}
+	
+	$.each(exchangeRequestList, function(idx, item) {
+		if (item.chgQty == null || item.chgQty == 0) {
+			qty = false;
+		}
 
-			if (!gagajf.isNull(item.ordChgOpt)) {
-				opt = true;
-			}
+		if (gagajf.isNull(item.ordChgOpt)) {
+			opt = false;
 		}
 	});
-	//$.each(exchangeRequestList, function(idx, item)) {
-	//	if (item.chgQty == 0)
-	//}
 
 	if (qty == false) {
 		mcxDialog.alert('교환 할 수량을 입력하세요.');
@@ -616,11 +634,12 @@ var fnExchange = function () {
 	}
 
 	// 2. 교환사유 체크
-	var chgReason = $("#exchangeRequestFrm select[name=selectChgReason]").val();
+	//var chgReason = $("#exchangeRequestFrm select[name=selectChgReason]").val();
+	var chgReason = $('#exchangeRequestFrm input[name=chgReason]').val();
 
 	if (gagajf.isNull(chgReason)) {
 		mcxDialog.alert("교환사유를 입력하세요."); 
-		return ;
+		return;
 	}
 
 	// 5. 회수지정보설정
@@ -748,7 +767,7 @@ var fnExchange = function () {
 	} else {
 		url = '/orderChange/exchangeRequest/';
 	}
-	
+	console.log(jsonObj.ordChgSq);
 	mcxDialog.confirm('교환요청하시겠습니까?', {
 		cancelBtnText		: "반품",
 		sureBtnClick		: function(){

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

@@ -1350,7 +1350,6 @@ $(document).ready(function() {
 	fnSetChger();
 	
 	// 5. 반품신청, 반품철회 버튼 제어
-	alert(ordChgSq + ' ' + chgStat);
 	if (ordChgSq > 0) {
 		$("#rtnReqBtn").css("display", "none");