Merge branch 'develop' into bin2107

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

@@ -159,7 +159,8 @@ var columnDefs = [
 	{headerName: "요청수량",			field:"chgQty",				width:100, cellClass: 'text-center'},
 	{headerName: "교환상세번호",		field:"exchangeOrdDtlNo",	width:100, cellClass: 'text-center'},
 	{headerName: "교환옵션1",			field:"optCd11",			width:100, cellClass: 'text-center'},
-	{headerName: "교환옵션2",			field:"optCd12",			width:100, cellClass: 'text-center'}
+	{headerName: "교환옵션2",			field:"optCd12",			width:100, cellClass: 'text-center'},
+	{headerName: "물류메모",			field:"whMemo",				width:200, cellClass: 'text-left'	, editable:true}
 ];
 
 var gridOptions = gagaAgGrid.getGridOptions(columnDefs);
@@ -186,7 +187,7 @@ $('#btnSave').on('click', function () {
 		sureBtnText		: "확인",
 		sureBtnClick	: function(){
 			var jsonData = JSON.stringify(selectedData);
-			gagajf.ajaxJsonSubmit('/order/seller/widthdrawList/confirm/update', jsonData, fnSaveCallback);
+			gagajf.ajaxJsonSubmit('/orderChange/seller/widthdrawList/confirm/update', jsonData, fnSaveCallback);
 		}
 	});
 });

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

@@ -195,10 +195,11 @@ $("#widthdrawConfirmBtn").on("click", function(){
 	
 	for (i=0 ; i<orderWithdrawList.length ; i++) {
 		var obj = new Object();
-		obj.ordChgSq 	= orderWithdrawList[i].ordChgSq;
-		obj.ordNo 		= orderWithdrawList[i].ordNo;
-		obj.ordDtlNo	= orderWithdrawList[i].ordDtlNo;
-		obj.whMemo 		= orderWithdrawList[i].whMemo;
+		obj.ordChgSq 		= orderWithdrawList[i].ordChgSq;
+		obj.ordNo 			= orderWithdrawList[i].ordNo;
+		obj.ordDtlNo		= orderWithdrawList[i].ordDtlNo;
+		obj.whMemo 			= orderWithdrawList[i].whMemo;
+		obj.supplyCompCd	= orderWithdrawList[i].supplyCompCd;
 		
 		withdrawConfirmList.push(obj);
 	}
@@ -208,6 +209,7 @@ $("#widthdrawConfirmBtn").on("click", function(){
 		"ordNo"					: $('#cancelRequestFrm input[name=ordNo]').val()
 		,"ordChgSq"				: $('#cancelRequestFrm input[name=ordChgSq]').val()
 		,"chgReason" 			: $('#cancelRequestFrm input[name=chgReason]').val()
+		,"chgGb" 				: chgGb
 		,"chgMemo"				: $('#chgMemo').val()
 		,"isCustomer"			: isCustomer
 		,"withdrawConfirmList"	: withdrawConfirmList