Merge branch 'returnOption' into develop

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

@@ -260,6 +260,7 @@ public class TsaOrderController extends TsaBaseController {
 				&& !TsaConstants.OrderDetailStat.PAYMENT_COMPLETE.value().equals(orderDetail.getOrdDtlStat())
 				&& !TsaConstants.OrderDetailStat.GOODS_PREPARE.value().equals(orderDetail.getOrdDtlStat())) {
 				allCanYn = "N";
+				break;
 			}
 		}
 

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

@@ -31,7 +31,7 @@
 
 				<div id="delvCdList">
 					<h4>배송정보</h4>
-					<div id="gridDelvCdList" style="width:100%; height: 140px;" class="ag-theme-balham"></div>
+					<div id="gridDelvCdList" style="width:100%; height: 66px;" class="ag-theme-balham"></div>
 				</div>
 				
 				<div style="text-align:right; padding-bottom:5px; padding-top:5px;">

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

@@ -278,9 +278,9 @@ var columnDefsGoodsInfo = [
 		headerName	: "주문상세정보",
 		children	: [
 			{headerName: "상세번호"	, field: "ordDtlNo"		, width: 80, cellClass: 'text-center'},
-			{headerName: "주문구분"	, field: "exchGbNm"		, width: 80, cellClass: 'text-center'},
+			{headerName: "주문구분"	, field: "exchGbNm"		, width: 70, cellClass: 'text-center'},
 			{
-				headerName: "상품코드", field: "goodsCd", width: 120, cellClass: 'text-center', sortable: true,
+				headerName: "상품코드", field: "goodsCd", width: 110, cellClass: 'text-center', sortable: true,
 				cellRenderer: function (params) {
 					if (roleCd.indexOf("C") < 0) {
 						return "<a href=\"javascript:void(0);\" onclick=\"cfnOpenGoodsDetailPopup('U','" + params.value + "');\">" + params.value + "</a>";
@@ -289,6 +289,7 @@ var columnDefsGoodsInfo = [
 					}
 				}
 			},
+			{headerName: "SKUCODE"	, field: "skuModelNo"		, width: 140, cellClass: 'text-center'},
 			{
 				headerName		: "상품명"
 				, field			: "goodsNm"
@@ -298,7 +299,7 @@ var columnDefsGoodsInfo = [
 					return '<a href="javascript:void(0);" onclick="cfnOpenFrontGoodsPopup(\'' + params.data.goodsCd + '\',\'' + params.data.siteCd + '\');">' + params.value + '</a>';
 				}
 			},
-			{headerName: "상품타입"	, field: "goodsTypeNm"	, width: 130, cellClass: 'text-center',
+			{headerName: "상품타입"	, field: "goodsTypeNm"	, width: 80, cellClass: 'text-center',
 				cellRenderer: function (params) {
 					var option;
 					if (params.data.goodsType == 'G056_S') {
@@ -309,44 +310,14 @@ var columnDefsGoodsInfo = [
 					return option;
 				}
 			},
-			{headerName: "브랜드"		, field: "brandGroupNm"	, width: 100, cellClass: 'text-center'},
-			{headerName: "옵션1"		, field: "colorNm"		, width: 80, cellClass: 'text-center'},
-			{headerName: "옵션2"		, field: "optCd2"		, width: 80, cellClass: 'text-center'},
-			{
-				headerName		: "정상가"
-				, field			: "listPrice"
-				, width			: 100
-				, cellClass		: 'text-right'
-				, cellRenderer	: function (params) {
-					return params.value.addComma();
-				}
-			},
-			{
-				headerName		: "판매가"
-				, field			: "currPrice"
-				, width			: 100
-				, cellClass		: 'text-right'
-				, cellRenderer	: function (params) {
-					return params.value.addComma();
-				}
-			},
-			{
-				headerName		: "옵션추가금액"
-				, field			: "optAddPrice"
-				, width			: 100
-				, cellClass		: 'text-right'
-				, cellRenderer	: function (params) {
-					return params.value.addComma();
-				}
-			},
-			{headerName: "주문수량"	, field: "ordQty"		, width: 80, cellClass: 'text-center'},
-			{headerName: "취소수량"	, field: "cnclRtnQty"	, width: 80, cellClass: 'text-center'},
-			{headerName: "변경요청수량"	, field: "ordReqChgQty"	, width: 100, cellClass: 'text-center'},
-			{headerName: "주문상태"	, field: "ordDtlStat"	, width: 120, cellClass: 'text-center', hide: true},
+			{headerName: "브랜드"		, field: "brandGroupNm"	, width: 80, cellClass: 'text-center'},
+			{headerName: "옵션1"		, field: "colorNm"		, width: 60, cellClass: 'text-center'},
+			{headerName: "옵션2"		, field: "optCd2"		, width: 60, cellClass: 'text-center'},
+			{headerName: "주문상태"	, field: "ordDtlStat"	, width: 100, cellClass: 'text-center', hide: true},
 			{
 				headerName		: "주문상태"
 				, field			: "ordDtlStatNm"
-				, width			: 120
+				, width			: 100
 				, cellClass		: 'text-center'
 				, cellRenderer	: function (params) {
 					var retVal = "";
@@ -427,6 +398,36 @@ var columnDefsGoodsInfo = [
 					return retStr;
 				}
 			},
+			{
+				headerName		: "정상가"
+				, field			: "listPrice"
+				, width			: 80
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+			},
+			{
+				headerName		: "판매가"
+				, field			: "currPrice"
+				, width			: 80
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+			},
+			{
+				headerName		: "옵션금액"
+				, field			: "optAddPrice"
+				, width			: 70
+				, cellClass		: 'text-right'
+				, cellRenderer	: function (params) {
+					return params.value.addComma();
+				}
+			},
+			{headerName: "주문수량"	, field: "ordQty"		, width: 70, cellClass: 'text-center'},
+			{headerName: "취소수량"	, field: "cnclRtnQty"	, width: 70, cellClass: 'text-center'},
+			{headerName: "변경수량"	, field: "ordReqChgQty"	, width: 70, cellClass: 'text-center'},
 		],
 	},
 	{

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

@@ -359,9 +359,11 @@ var columnCancelReqList = [
 	{headerName: "주문상세"		, field: "ordDtlNo"			, width: 80		, cellClass: 'text-center'},
 	{headerName: "주문상세"		, field: "ordDtlStat"		, width: 80		, cellClass: 'text-center'	, hide: temp1},
 	{headerName: "주문상세상태"	, field: "ordDtlStatNm"		, width: 100	, cellClass: 'text-center'	, hide: temp1},
-	{headerName: "상품코드"		, field: "goodsCd"			, width: 100	, cellClass: 'text-left'	, hide: temp2},
-	{headerName: "상품명"			, field: "goodsNm"			, width: 200	, cellClass: 'text-left'	, hide: temp2},
-	{headerName: "상품타입"		, field: "goodsTypeNm"		, width: 100	, cellClass: 'text-center'	, hide: temp2},
+	{headerName: "상품코드"		, field: "goodsCd"			, width: 110	, cellClass: 'text-left'	, hide: temp2},
+	{headerName: "상품명"		, field: "goodsNm"			, width: 200	, cellClass: 'text-left'	, hide: temp2},
+	{headerName: "상품타입"		, field: "goodsTypeNm"		, width: 80	, cellClass: 'text-center'	, hide: temp2},
+	{headerName: "옵션1"		, field: "optCd1"		, width: 60	, cellClass: 'text-center'	, hide: temp2},
+	{headerName: "옵션2"		, field: "optCd2"		, width: 60	, cellClass: 'text-center'	, hide: temp2},
 	{
 		headerName		: "옵션금액"
 		, field			: "optAddPrice"