Merge branch 'stage_tsit' of https://dev.azure.com/style24/style24/_git/style24.admin into 정산수식수정

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

@@ -32,6 +32,7 @@ import com.style24.core.biz.service.TscNaverPayService;
 import com.style24.core.biz.service.TscOrderChangeService;
 import com.style24.core.biz.service.TscOrderRefundService;
 import com.style24.core.biz.service.TscOrderService;
+import com.style24.core.biz.service.TscWmsService;
 import com.style24.core.support.env.TscConstants;
 import com.style24.core.support.message.TscMessageByLocale;
 import com.style24.persistence.TscPageRequest;
@@ -83,6 +84,9 @@ public class TsaOrderChangeController extends TsaBaseController {
 	@Autowired
 	private TscMailService coreMailService;
 
+	@Autowired
+	private TscWmsService coreWmsService;
+
 	@Autowired
 	private Environment env;
 	
@@ -1117,8 +1121,15 @@ public class TsaOrderChangeController extends TsaBaseController {
 			orderChange.setUpdNo(TsaSession.getInfo().getUserNo());
 			coreOrderChangeService.updateChgerAddr(orderChange);
 
-			// TODO
-			// WMS IF TABLE 내 정보 업데이트 처리 필요
+			// WMS 회수지 수정
+			Order order = new Order();
+			order.setChgerZipcode(orderChange.getChgerZipcode());
+			order.setChgerBaseAddr(orderChange.getChgerBaseAddr());
+			order.setChgerDtlAddr(orderChange.getChgerDtlAddr());
+			order.setChgerRtnMemo(orderChange.getChgerRtnMemo());
+			order.setOrdChgSq(orderChange.getOrdChgSq());
+			order.setOrdNo(orderChange.getOrdNo());
+			coreWmsService.updateWmsRecallChangeAddr(order);
 		} catch (Exception e) {
 			result.set("status", GagaResponseStatus.FAIL.getCode());
 			result.set("message", message.getMessage("FAIL_0002"));

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

@@ -222,7 +222,7 @@
 		)
 		VALUES (
 		        (
-		         SELECT IFNULL(MAX(SUPPLY_COMP_CD),0) + 1
+		         SELECT IFNULL(MAX(SUPPLY_COMP_CD * 1),0) + 1
 		         FROM   TB_SUPPLY_COMPANY Z
 		        )
 		     , #{supplyCompNm}

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

@@ -1233,6 +1233,7 @@ var fnChangeChgerInfo = function() {
 	}
 	
 	let data = {};
+	data.ordNo = ordNo;
 	data.ordChgSq = ordChgSq;
 	data.chgerNm = chgerNm;
 	data.chgerPhnno = chgerPhnno;
@@ -1294,6 +1295,7 @@ var fnChangeRecipInfo = function() {
 	}
 	
 	let data = {};
+	data.ordNo = ordNo;
 	data.delvAddrSq = delvAddrSq;
 	data.recipNm = recipNm;
 	data.recipPhnno = recipPhnno;

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

@@ -639,9 +639,10 @@ var gridOptionsOrderFreeGiftInfo = gagaAgGrid.getGridOptions(columnDefsOrderFree
 
 // 3.배송정보
 var columnDefsDeliveryInfo = [
+	{headerName: "주문번호"		, field: "ordNo"			, width: 80, cellClass: 'text-center', hide: true},
 	{headerName: "배송지번호"		, field: "delvAddrSq"		, width: 80, cellClass: 'text-center'},
 	{headerName: "주문구분"		, field: "exchGbNm"			, width: 80, cellClass: 'text-center'},
-	{headerName: "받는분"			, field: "recipNm"			, width: 80, cellClass: 'text-left', editable: true},
+	{headerName: "받는분"		, field: "recipNm"			, width: 80, cellClass: 'text-left', editable: true},
 	{headerName: "핸드폰번호"		, field: "recipPhnno"		, width: 120, cellClass: 'text-left', editable: true},
 	{
 		headerName		: "우편번호"		
@@ -1329,7 +1330,7 @@ var gridOrderChangeInfoSelectedIdx = '';
 var fnUpdateOrderAddr = function (rowIdx) {	
 	gridOptionsDeliveryInfo.api.stopEditing();
 	var jsonData = JSON.stringify(gridOptionsDeliveryInfo.api.getRowNode(rowIdx).data);
-	
+
 	mcxDialog.confirm("주소를 변경하시겠습니까?", {
 		cancelBtnText	: "취소",
 		sureBtnText		: "확인",

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

@@ -1756,6 +1756,7 @@ var fnChangeChgerInfo = function() {
 	}
 	
 	let data = {};
+	data.ordNo = ordNo;
 	data.ordChgSq = ordChgSq;
 	data.chgerNm = chgerNm;
 	data.chgerPhnno = chgerPhnno;