WMS 배송/회수 정보 수정 임시 커밋

src/main/java/com/style24/front/biz/web/TsfMypageController.java

@@ -1,7 +1,11 @@
 package com.style24.front.biz.web;
 
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -1365,11 +1369,11 @@ public class TsfMypageController extends TsfBaseController {
 		}
 
 		try {
+			// 배송지 수정 처리
 			commonService.updateDeliverAddr(order);
-			commonService.updateDeliverAddrDelvMemo(order);
 
-			// TODO
-			// WMS IF TABLE 내 정보 업데이트 처리 필요
+			// WMS 배송지 수정 처리
+			coreWmsService.updateWmsDeliveryChangeAddr(order);
 		} catch (Exception e) {
 			result.set("status", GagaResponseStatus.FAIL.getCode());
 			result.set("message", message.getMessage("FAIL_0002"));
@@ -1400,7 +1404,11 @@ public class TsfMypageController extends TsfBaseController {
 		}
 
 		try {
+			// 배송메모 수정 처리
 			commonService.updateDeliverAddrDelvMemo(order);
+
+			// WMS 배송메모 수정 처리
+			coreWmsService.updateWmsDeliveryMemo(order);
 		} catch (Exception e) {
 			result.set("status", GagaResponseStatus.FAIL.getCode());
 			result.set("message", message.getMessage("FAIL_0002"));
@@ -1426,10 +1434,20 @@ public class TsfMypageController extends TsfBaseController {
 
 		try {
 			orderChange.setUpdNo(TsfSession.getInfo().getCustNo());
+
+			// 회수지 정보 수정 처리
 			coreOrderChangeService.updateChgerAddr(orderChange);
 
-			// TODO
-			// WMS IF TABLE 내 정보 업데이트 처리 필요
+			// WMS 회수지 정보 수정 처리
+			Order order = new Order();
+			order.setOrdNo(orderChange.getOrdNo());
+			order.setChgerZipcode(orderChange.getChgerZipcode());
+			order.setChgerBaseAddr(orderChange.getChgerBaseAddr());
+			order.setChgerDtlAddr(orderChange.getChgerDtlAddr());
+			order.setChgerRtnMemo(orderChange.getChgerRtnMemo());
+			order.setOrdChgSq(orderChange.getOrdChgSq());
+
+			coreWmsService.updateWmsRecallChangeAddr(order);
 		} catch (Exception e) {
 			result.set("status", GagaResponseStatus.FAIL.getCode());
 			result.set("message", message.getMessage("FAIL_0002"));
@@ -1455,10 +1473,16 @@ public class TsfMypageController extends TsfBaseController {
 
 		try {
 			orderChange.setUpdNo(TsfSession.getInfo().getCustNo());
+
+			// 반품메모 수정 처리
 			coreOrderChangeService.updateChgerRtnMemo(orderChange);
 
-			// TODO
-			// WMS IF TABLE 내 정보 업데이트 처리 필요
+			// WMS IF 반품메모 수정 처리
+			Order order = new Order();
+			order.setOrdNo(orderChange.getOrdNo());
+			order.setChgerRtnMemo(orderChange.getChgerRtnMemo());
+			order.setOrdChgSq(orderChange.getOrdChgSq());
+			coreWmsService.updateWmsRecallChangeMemo(order);
 		} catch (Exception e) {
 			throw new IllegalStateException(message.getMessage("FAIL_0002"));
 		}

src/main/java/com/style24/front/biz/web/TsfNoMemberController.java

@@ -389,11 +389,12 @@ public class TsfNoMemberController extends TsfBaseController {
 
 		try {
 			order.setCustNo(0);
+
+			// 배송지 수정 처리
 			commonService.updateDeliverAddr(order);
-			commonService.updateDeliverAddrDelvMemo(order);
 
-			// TODO
-			// WMS IF TABLE 내 정보 업데이트 처리 필요
+			// WMS 배송지 수정 처리
+			coreWmsService.updateWmsDeliveryChangeAddr(order);
 		} catch (Exception e) {
 			result.set("status", GagaResponseStatus.FAIL.getCode());
 			result.set("message", message.getMessage("FAIL_0002"));
@@ -420,7 +421,11 @@ public class TsfNoMemberController extends TsfBaseController {
 		order.setCustNo(0);
 
 		try {
+			// 배송메모 수정 처리
 			commonService.updateDeliverAddrDelvMemo(order);
+
+			// WMS 배송메모 수정 처리
+			coreWmsService.updateWmsDeliveryMemo(order);
 		} catch (Exception e) {
 			result.set("status", GagaResponseStatus.FAIL.getCode());
 			result.set("message", message.getMessage("FAIL_0002"));
@@ -446,10 +451,20 @@ public class TsfNoMemberController extends TsfBaseController {
 
 		try {
 			orderChange.setUpdNo(0);
+
+			// 회수지 정보 수정 처리
 			coreOrderChangeService.updateChgerAddr(orderChange);
 
-			// TODO
-			// WMS IF TABLE 내 정보 업데이트 처리 필요
+			// WMS 회수지 정보 수정 처리
+			Order order = new Order();
+			order.setOrdNo(orderChange.getOrdNo());
+			order.setChgerZipcode(orderChange.getChgerZipcode());
+			order.setChgerBaseAddr(orderChange.getChgerBaseAddr());
+			order.setChgerDtlAddr(orderChange.getChgerDtlAddr());
+			order.setChgerRtnMemo(orderChange.getChgerRtnMemo());
+			order.setOrdChgSq(orderChange.getOrdChgSq());
+
+			coreWmsService.updateWmsRecallChangeAddr(order);
 		} catch (Exception e) {
 			result.set("status", GagaResponseStatus.FAIL.getCode());
 			result.set("message", message.getMessage("FAIL_0002"));
@@ -475,10 +490,16 @@ public class TsfNoMemberController extends TsfBaseController {
 
 		try {
 			orderChange.setUpdNo(0);
+
+			// 반품메모 수정 처리
 			coreOrderChangeService.updateChgerRtnMemo(orderChange);
 
-			// TODO
-			// WMS IF TABLE 내 정보 업데이트 처리 필요
+			// WMS IF 반품메모 수정 처리
+			Order order = new Order();
+			order.setOrdNo(orderChange.getOrdNo());
+			order.setChgerRtnMemo(orderChange.getChgerRtnMemo());
+			order.setOrdChgSq(orderChange.getOrdChgSq());
+			coreWmsService.updateWmsRecallChangeMemo(order);
 		} catch (Exception e) {
 			throw new IllegalStateException(message.getMessage("FAIL_0002"));
 		}

src/main/webapp/WEB-INF/views/mob/mypage/MypageCreExchangeDetailFormMob.html

@@ -379,6 +379,7 @@
 	// 배송지 및 회수지 정보 설정
 	var delvAddrSet = function(delvObj) {
 		let url = '';
+		let ordNo			= oneData.ordNo;
 		let ordChgSq 		= oneData.ordChgSq;
 		let delvAddrSq 		= oneData.delvAddrSq;
 		let recipNm 		= delvObj.recipNm;
@@ -393,6 +394,7 @@
 
 		if (addrGb == 'chger') {
 			url = '/mypage/change/chger/addr';
+			data.ordNo			= ordNo;
 			data.ordChgSq 		= ordChgSq;
 			data.chgerNm 		= recipNm;
 			data.chgerPhnno 	= recipPhnno;
@@ -402,6 +404,7 @@
 			data.chgerRtnMemo 	= delvMemo;
 		} else {
 			url = '/mypage/change/delvery/addr';
+			data.ordNo			= ordNo;
 			data.delvAddrSq 	= delvAddrSq;
 			data.recipNm 		= recipNm;
 			data.recipPhnno 	= recipPhnno;

src/main/webapp/WEB-INF/views/mob/mypage/MypageCreReturnDetailFormMob.html

@@ -302,6 +302,7 @@ $(document).ready(function() {
 // 회수지 정보 설정
 var delvAddrSet = function(delvObj) {
 	let ordChgSq 		= oneData.ordChgSq;
+	let ordNo			= oneData.ordNo;
 	let chgerNm 		= delvObj.recipNm;
 	let chgerPhnno 		= delvObj.recipPhnno;
 	let chgerZipcode 	= delvObj.recipZipcode;
@@ -311,6 +312,7 @@ var delvAddrSet = function(delvObj) {
 	let chgerAddr 		= chgerBaseAddr + ' ' + chgerDtlAddr;
 
 	let data = {};
+	data.ordNo			= ordNo;
 	data.ordChgSq 		= ordChgSq;
 	data.chgerNm 		= chgerNm;
 	data.chgerPhnno 	= chgerPhnno;

src/main/webapp/WEB-INF/views/mob/mypage/MypageOrderDetailFormMob.html

@@ -999,6 +999,7 @@
 		
 		let url = '/mypage/change/delvery/addr';
 		let data = {};
+		data.ordNo			= ordNo;
 		data.delvAddrSq 	= delvAddrSq;
 		data.recipNm 		= recipNm;
 		data.recipPhnno 	= recipPhnno;

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberCreExchangeDetailFormMob.html

@@ -374,6 +374,7 @@
 	// 배송지 및 회수지 정보 설정
 	var delvAddrSet = function(delvObj) {
 		let url = '';
+		let ordNo			= oneData.ordNo;
 		let ordChgSq 		= oneData.ordChgSq;
 		let delvAddrSq 		= oneData.delvAddrSq;
 		let recipNm 		= delvObj.recipNm;
@@ -388,6 +389,7 @@
 
 		if (addrGb == 'chger') {
 			url = '/noMember/change/chger/addr';
+			data.ordNo			= ordNo;
 			data.ordChgSq 		= ordChgSq;
 			data.chgerNm 		= recipNm;
 			data.chgerPhnno 	= recipPhnno;
@@ -397,6 +399,7 @@
 			data.chgerRtnMemo 	= delvMemo;
 		} else {
 			url = '/noMember/change/delvery/addr';
+			data.ordNo			= ordNo;
 			data.delvAddrSq 	= delvAddrSq;
 			data.recipNm 		= recipNm;
 			data.recipPhnno 	= recipPhnno;

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberCreReturnDetailFormMob.html

@@ -291,6 +291,7 @@ $(document).ready(function() {
 // 회수지 정보 설정
 var delvAddrSet = function(delvObj) {
 	let ordChgSq 		= oneData.ordChgSq;
+	let ordNo			= oneData.ordNo;
 	let chgerNm 		= delvObj.recipNm;
 	let chgerPhnno 		= delvObj.recipPhnno;
 	let chgerZipcode 	= delvObj.recipZipcode;
@@ -300,6 +301,7 @@ var delvAddrSet = function(delvObj) {
 	let chgerAddr 		= chgerBaseAddr + ' ' + chgerDtlAddr;
 
 	let data = {};
+	data.ordNo			= ordNo;
 	data.ordChgSq 		= ordChgSq;
 	data.chgerNm 		= chgerNm;
 	data.chgerPhnno 	= chgerPhnno;

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberOrderDetailFormMob.html

@@ -779,6 +779,7 @@
 		
 		let url = '/noMember/change/delvery/addr';
 		let data = {};
+		data.ordNo			= ordNo;
 		data.delvAddrSq 	= delvAddrSq;
 		data.recipNm 		= recipNm;
 		data.recipPhnno 	= recipPhnno;

src/main/webapp/WEB-INF/views/web/mypage/MypageCreExchangeDetailFormWeb.html

@@ -345,6 +345,7 @@
 
 		if (addrGb == 'chger') {
 			url = '/mypage/change/chger/addr';
+			data.ordNo			= ordNo;
 			data.ordChgSq = ordChgSq;
 			data.chgerNm = recipNm;
 			data.chgerPhnno = recipPhnno;
@@ -354,6 +355,7 @@
 			data.chgerRtnMemo = delvMemo;
 		} else {
 			url = '/mypage/change/delvery/addr';
+			data.ordNo			= ordNo;
 			data.delvAddrSq = delvAddrSq;
 			data.recipNm = recipNm;
 			data.recipPhnno = recipPhnno;
@@ -393,10 +395,12 @@
 
 		if (memoGb == 'chger') {
 			url = '/mypage/change/chger/rtn/memo';
+			data.ordNo = ordNo;
 			data.ordChgSq = ordChgSq;
 			data.chgerRtnMemo = delvMemo;
 		} else {
 			url = '/mypage/change/delvery/memo';
+			data.ordNo = ordNo;
 			data.delvAddrSq = delvAddrSq;
 			data.delvMemo = delvMemo;
 		}

src/main/webapp/WEB-INF/views/web/mypage/MypageCreReturnDetailFormWeb.html

@@ -299,6 +299,7 @@
 		let chgerAddr = chgerBaseAddr + ' ' + chgerDtlAddr;
 
 		let data = {};
+		data.ordNo = ordNo;
 		data.ordChgSq = ordChgSq;
 		data.chgerNm = chgerNm;
 		data.chgerPhnno = chgerPhnno;

src/main/webapp/WEB-INF/views/web/mypage/MypageOrderDetailFormWeb.html

@@ -641,6 +641,7 @@
 		
 		let url = '/mypage/change/delvery/addr';
 		let data = {};
+		data.ordNo			= ordNo;
 		data.delvAddrSq = delvAddrSq;
 		data.recipNm = recipNm;
 		data.recipPhnno = recipPhnno;
@@ -662,6 +663,7 @@
 
 		let data = {};
 		data.delvMemo = delvMemo;
+		data.ordNo = ordNo;
 		data.delvAddrSq = oneData.delvAddrSq;
 
 		let jsonData = JSON.stringify(data);

src/main/webapp/WEB-INF/views/web/mypage/NoMemberCreExchangeDetailFormWeb.html

@@ -342,6 +342,7 @@
 
 		if (addrGb == 'chger') {
 			url = '/noMember/change/chger/addr';
+			data.ordNo			= ordNo;
 			data.ordChgSq = ordChgSq;
 			data.chgerNm = recipNm;
 			data.chgerPhnno = recipPhnno;
@@ -351,6 +352,7 @@
 			data.chgerRtnMemo = delvMemo;
 		} else {
 			url = '/noMember/change/delvery/addr';
+			data.ordNo			= ordNo;
 			data.delvAddrSq = delvAddrSq;
 			data.recipNm = recipNm;
 			data.recipPhnno = recipPhnno;
@@ -390,10 +392,12 @@
 
 		if (memoGb == 'chger') {
 			url = '/noMember/change/chger/rtn/memo';
+			data.ordNo = ordNo;
 			data.ordChgSq = ordChgSq;
 			data.chgerRtnMemo = delvMemo;
 		} else {
 			url = '/noMember/change/delvery/memo';
+			data.ordNo = ordNo;
 			data.delvAddrSq = delvAddrSq;
 			data.delvMemo = delvMemo;
 		}

src/main/webapp/WEB-INF/views/web/mypage/NoMemberCreReturnDetailFormWeb.html

@@ -296,6 +296,7 @@
 		let chgerAddr = chgerBaseAddr + ' ' + chgerDtlAddr;
 
 		let data = {};
+		data.ordNo = ordNo;
 		data.ordChgSq = ordChgSq;
 		data.chgerNm = chgerNm;
 		data.chgerPhnno = chgerPhnno;

src/main/webapp/WEB-INF/views/web/mypage/NoMemberOrderDetailFormWeb.html

@@ -486,6 +486,7 @@
 		
 		let url = '/noMember/change/delvery/addr';
 		let data = {};
+		data.ordNo			= ordNo;
 		data.delvAddrSq = delvAddrSq;
 		data.recipNm = recipNm;
 		data.recipPhnno = recipPhnno;
@@ -507,6 +508,7 @@
 
 		let data = {};
 		data.delvMemo = delvMemo;
+		data.ordNo = ordNo;
 		data.delvAddrSq = oneData.delvAddrSq;
 
 		let jsonData = JSON.stringify(data);

src/main/webapp/WEB-INF/views/web/order/OrderCompleteWeb.html

@@ -379,6 +379,7 @@ var delvAddrSet = function(delvObj) {
 	}
 	
 	let data = {};
+	data.ordNo				= ordNo;
 	data.delvAddrSq 		= delvAddrSq;
 	data.recipNm 			= delvObj.recipNm;
 	data.recipPhnno 		= delvObj.recipPhnno;
@@ -403,6 +404,7 @@ var delvMemoSet = function(delvMemoObj) {
 	// 변수값 설정
 	let data = {};
 	data.delvAddrSq = delvAddrSq;
+	data.ordNo = ordNo;
 	data.delvMemo = delvMemo;
 	
 	let jsonData = JSON.stringify(data);