Merge remote-tracking branch 'origin/xodud1202' into develop

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

@@ -156,6 +156,15 @@ var shipCompanyList = gagajf.convertToArray([[${shipCompanyList}]]);
 var columnDefs = [
 	{width: 40, minWidth: 40, cellClass: 'text-right', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
 	{headerName: 'No', width: 60, cellClass: 'text-center', valueGetter: function(params) { return params.node.rowIndex + 1 }},
+	{headerName: "원주문/교환",		field:"ordExchGb",			width:100, cellClass: 'text-center'
+		,valueFormatter: function(params) {
+			if(params.value && params.value == "O") {
+				return "원주문";
+			} else {
+				return "교환";
+			}
+		}
+	},
 	{headerName: "입점업체",			field:"supplyCompNm",		width:100, cellClass: 'text-center'},
 	{headerName: "입점업체코드",		field:"supplyCompCd",		width:100, cellClass: 'text-center', hide: true},
 	{headerName: "브랜드",			field:"brandKnm",			width:100, cellClass: 'text-center'},

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

@@ -49,6 +49,15 @@ var shipCompanyList = gagajf.convertToArray([[${shipCompanyList}]]);
 var columnDefs = [
 	{width: 40, minWidth: 40, cellClass: 'text-right', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
 	{headerName: 'No', width: 60, cellClass: 'text-center', valueGetter: function(params) { return params.node.rowIndex + 1 }},
+	{headerName: "원주문/교환",		field:"ordExchGb",			width:100, cellClass: 'text-center'
+		,valueFormatter: function(params) {
+			if(params.value && params.value == "O") {
+				return "원주문";
+			} else {
+				return "교환";
+			}
+		}
+	},
 	{headerName: "입점업체",			field:"supplyCompNm",		width:70, cellClass: 'text-center'},
 	{headerName: "입점업체코드",		field:"supplyCompCd",		width:80, cellClass: 'text-center', hide: true},
 	{headerName: "브랜드",			field:"brandKnm",			width:80, cellClass: 'text-center'},

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

@@ -145,6 +145,15 @@ var shipCompanyList = gagajf.convertToArray([[${shipCompanyList}]]);
 var columnDefs = [
 	{width: 40, minWidth: 40, cellClass: 'text-right', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
 	{headerName: 'No', width: 60, cellClass: 'text-center', valueGetter: function(params) { return params.node.rowIndex + 1 }},
+	{headerName: "원주문/교환",		field:"ordExchGb",			width:100, cellClass: 'text-center'
+		,valueFormatter: function(params) {
+			if(params.value && params.value == "O") {
+				return "원주문";
+			} else {
+				return "교환";
+			}
+		}
+	},
 	{headerName: "입점업체",			field:"supplyCompNm",		width:100, cellClass: 'text-center'},
 	{headerName: "입점업체코드",		field:"supplyCompCd",		width:100, cellClass: 'text-center', hide: true},
 	{headerName: "브랜드",			field:"brandKnm",			width:100, cellClass: 'text-center'},