[ST24PRJ-19] [CS개선][클레임] 취소/교환/반품>접수/상세>SKUCODE추가

src/main/java/com/style24/persistence/domain/Withdraw.java

@@ -42,6 +42,7 @@ public class Withdraw extends TscBaseDomain {
 	private String wdEddt;
 	private String wdMemo;
 	private String goodsCd;
+	private String optCd;
 	private String optCd1;
 	private String optCd2;
 	private String chgMemo;

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

@@ -386,13 +386,16 @@
 		SELECT
 		     B.ITEM_CD
 		   , (SELECT G.GOODS_NM FROM TB_GOODS G WHERE G.GOODS_CD = B.ITEM_CD) AS GOODS_NM
+		   , B.OPT_CD
 		   , B.OPT_CD1
+		   , IFNULL((SELECT COLOR_KNM FROM TB_COLOR WHERE COLOR_CD = IFNULL(NULLIF(B.OPT_CD1,'') , G.MAIN_COLOR_CD ) AND USE_YN  = 'Y'), ODI.OPT_CD1) AS COLOR_NM
 		   , B.OPT_CD2
 		   , B.ITEM_QTY
 		   , B.ITEM_PRICE
 		   , C.CURR_STOCK_QTY
 		   , C.BASE_STOCK_QTY
 		 FROM TB_ORDER_DETAIL A
+		 JOIN TB_GOODS G ON A.GOODS_CD = G.GOODS_CD
 		 JOIN TB_ORDER_DETAIL_ITEM B ON A.ORD_DTL_NO = B.ORD_DTL_NO
 		 JOIN VW_STOCK             C ON B.ITEM_CD    = C.GOODS_CD    AND B.OPT_CD = C.OPT_CD
 	    WHERE A.ORD_DTL_NO  = #{ordDtlNo}

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

@@ -737,6 +737,7 @@
 				, D.ORD_DTL_NO -- 주문상세번호 
 				, (SELECT S.GOODS_NM FROM TB_GOODS S WHERE S.GOODS_CD = C.GOODS_CD) AS GOODS_NM -- 상품명
 				, D.ITEM_CD  AS GOODS_CD -- 상품코드
+				, D.OPT_CD
 				, D.OPT_CD1 -- 옵션1 
 				, D.OPT_CD2 -- 옵션2
 				-- , B.CHG_QTY * D.ITEM_QTY AS CHG_QTY-- 신청수량 

src/main/webapp/WEB-INF/views/delivery/DeliveryDetailItemForm.html

@@ -16,7 +16,7 @@
  -->
 
 
-<div class="modalPopup" data-width="750" >
+<div class="modalPopup" data-width="850" >
 	<div class="panelStyle">
 		<div class="panelTitle">
 			<h2>세트구성 상품정보</h2>
@@ -39,6 +39,7 @@ var delvDetailItemList = [[${delvDetailItemList}]];
 	// specify the columns
 	var columnDefsDelvDetailItemInfo = [
 			{headerName: "상품코드",	field: "itemCd", 	width: 100, cellClass: 'text-center'},
+			{headerName: "SKUCODE",	field: "optCd", 	width: 100, cellClass: 'text-center'},
 			{headerName: "상품명", 	field: "goodsNm", 	width: 200, cellClass: 'text-left'},
 			{headerName: "색상",  	field: "optCd1", 	width: 80, cellClass: 'text-center'},
 			{headerName: "사이즈", 	field: "optCd2", 	width: 70, cellClass: 'text-center'},

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

@@ -261,8 +261,20 @@ var columnCnclRtnCompleteList = [
 	{headerName: "주문번호"		, field: "ordNo"			, width: 80		, cellClass: 'text-center'},
 	{headerName: "주문상세"		, field: "ordDtlNo"			, width: 80		, cellClass: 'text-center'},
 	{headerName: "상품코드"		, field: "goodsCd"			, width: 100	, cellClass: 'text-left'},
+	{headerName: "SKUCODE"		, field: "optCd"			, width: 100	, cellClass: 'text-center'},
 	{headerName: "상품명"		, field: "goodsNm"			, width: 200	, cellClass: 'text-left'},
-	{headerName: "상품타입"		, field: "goodsTypeNm"		, width: 100	, cellClass: 'text-center'},
+	//{headerName: "상품타입"		, field: "goodsTypeNm"		, width: 100	, cellClass: 'text-center'},
+	{headerName: "상품타입"	, field: "goodsTypeNm"	, width: 100, cellClass: 'text-center',
+		cellRenderer: function (params) {
+			var option;
+			if (params.data.goodsType == 'G056_S') {
+				option = "<a href=\"javascript:void(0);\" onclick=\"fnOrderDetailItemForm('" + params.data.ordDtlNo + "');\">" + params.value + "</a>";
+			} else {
+				option = params.value
+			}
+			return option;
+		}
+	},
 	{headerName: "옵션1"			, field: "colorNm"			, width: 80		, cellClass: 'text-center'},
 	{headerName: "옵션2"			, field: "optCd2"			, width: 80		, cellClass: 'text-center'},
 	{
@@ -611,6 +623,12 @@ $(document).ready(function() {
 	fnChangeChgReason(chgReason);
 
 });
+
+// 2021.06.17 구성상품 내역 팝업 호출 
+var fnOrderDetailItemForm = function (ordDtlNo) {
+	var actionUrl = "/delivery/detail/item/form/" + ordDtlNo;
+	cfnOpenModalPopup(actionUrl, 'popupDeliveryDetailItemForm');
+}
 </script>
 </html>
 

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

@@ -363,16 +363,29 @@ var columnCancelReqList = [
 	{headerName: "주문번호"		, field: "ordNo"			, width: 80		, cellClass: 'text-center'	, hide: temp1},
 	{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: "ordDtlStatNm"		, width: 100	, cellClass: 'text-center'	, hide: temp1},
 	{headerName: "상품코드"		, field: "goodsCd"			, width: 100	, cellClass: 'text-left'	, hide: temp2},
+	{headerName: "SKUCODE"		, field: "optCd"			, width: 100	, cellClass: 'text-center'	, hide: temp2},
 	{headerName: "상품명"			, field: "goodsNm"			, width: 200	, cellClass: 'text-left'	, hide: temp2},
-	{headerName: "상품타입"		, field: "goodsTypeNm"		, width: 100	, cellClass: 'text-center'	, hide: temp2},
+	//{headerName: "상품타입"		, field: "goodsTypeNm"		, width: 100	, cellClass: 'text-center'	, hide: temp2},
+	{headerName: "상품타입"	, field: "goodsTypeNm"	, width: 100, cellClass: 'text-center',
+		cellRenderer: function (params) {
+			var option;
+			if (params.data.goodsType == 'G056_S') {
+				option = "<a href=\"javascript:void(0);\" onclick=\"fnOrderDetailItemForm('" + params.data.ordDtlNo + "');\">" + params.value + "</a>";
+			} else {
+				option = params.value
+			}
+			return option;
+		},
+		hide: temp2
+	},
 	{headerName: "옵션1"			, field: "colorNm"			, width: 80		, cellClass: 'text-center'	, hide: temp2},
 	{headerName: "옵션2"			, field: "optCd2"			, width: 80		, cellClass: 'text-center'	, hide: temp2},
 	{
-		headerName		: "옵션금액"		
-		, field			: "optAddPrice"			
-		, width			: 80		
+		headerName		: "옵션금액"
+		, field			: "optAddPrice"
+		, width			: 80
 		, cellClass		: 'text-right'
 		, cellRenderer	: function (params) {
 			return params.value.addComma();
@@ -380,18 +393,18 @@ var columnCancelReqList = [
 		, hide			: temp1
 	},
 	{
-		headerName		: "주문"		
-		, field			: "ordQty"			
-		, width			: 80		
+		headerName		: "주문"
+		, field			: "ordQty"
+		, width			: 80
 		, cellClass		: 'text-center'
 		, cellRenderer	: function (params) {
 			return params.value.addComma();
 		}
 	},
 	{
-		headerName		: "취소/요청"		
-		, field			: "cnclRtnQty"			
-		, width			: 80		
+		headerName		: "취소/요청"
+		, field			: "cnclRtnQty"
+		, width			: 80
 		, cellClass		: 'text-center'
 		, cellRenderer	: function (params) {
 			var cnclRtnReqQty = parseInt(params.data.cnclRtnQty) + parseInt(params.data.ordReqChgQty);
@@ -399,9 +412,9 @@ var columnCancelReqList = [
 		}
 	},
 	{
-		headerName		: "취소/반품"		
+		headerName		: "취소/반품"
 		, field			: "ordCanChgQty"
-		, width			: 100		
+		, width			: 100
 		, cellClass		: 'text-center'
 		, cellRenderer	: function (params) {
 			var ordQty 			= parseInt(params.data.ordQty);
@@ -409,15 +422,15 @@ var columnCancelReqList = [
 			var ordReqChgQty 	= parseInt(params.data.ordReqChgQty);
 			var ordCanChgQty 	= parseInt(params.value);
 			var rtnStr 			= "";
-			
+
 			// 취소신청가능수량있으면 수량만 표시 (취소,반품,교환 신청정보 처리)
 			if (ordChgSq > 0 && chgStat != 'G685_40') {
 				rtnStr = ordCanChgQty;
 			} else {
 				ordCanChgQty = ordQty - (cnclRtnQty +  ordReqChgQty);
-				
+
 				rtnStr += "<select class='ordCanChgQty' name='ordCanChgQty' ordDtlNo='"+params.data.ordDtlNo+"' onChange='fnCalculateRefundAmt(this);'>";
-				
+
 				for (i=0 ; i<=ordCanChgQty ; i++) {
 					if (i == params.data.ordCanChgQty) {
 						rtnStr += "	<option value='"+i+"' selected>"+i+"</option>";
@@ -425,44 +438,44 @@ var columnCancelReqList = [
 						rtnStr += "	<option value='"+i+"'>"+i+"</option>";
 					}
 				}
-			
+
 				rtnStr += "</select>";
 			}
-			
+
 			return rtnStr;
 		}
 	},
 	{
 		headerName		: "주문"
-		, field			: "ordAmt"			
-		, width			: 80		
+		, field			: "ordAmt"
+		, width			: 80
 		, cellClass		: 'text-right'
 		, cellRenderer	: function (params) {
 			return params.value.addComma();
 		}
 	},
 	{
-		headerName		: "취소"		
-		, field			: "cnclRtnAmt"			
-		, width			: 80		
+		headerName		: "취소"
+		, field			: "cnclRtnAmt"
+		, width			: 80
 		, cellClass		: 'text-right'
 		, cellRenderer	: function (params) {
 			return params.value.addComma();
 		}
 	},
 	{
-		headerName		: "즉시할인"		
-		, field			: "cpn1DcAmt"			
-		, width			: 80		
+		headerName		: "즉시할인"
+		, field			: "cpn1DcAmt"
+		, width			: 80
 		, cellClass		: 'text-right'
 		, cellRenderer	: function (params) {
 			return params.value.addComma();
 		}
 	},
 	{
-		headerName		: "다다익선1"		
-		, field			: "tmtb1DcAmt"			
-		, width			: 80		
+		headerName		: "다다익선1"
+		, field			: "tmtb1DcAmt"
+		, width			: 80
 		, cellClass		: 'text-right'
 		, cellRenderer	: function (params) {
 			return params.value.addComma();
@@ -471,14 +484,14 @@ var columnCancelReqList = [
 	{
 		headerName		: "다다익선2"
 		, field			: "tmtb2DcAmt"
-		, width			: 80		
+		, width			: 80
 		, cellClass		: 'text-right'
 		, cellRenderer	: function (params) {
 			return params.value.addComma();
 		}
 	},
 	{
-		headerName		: "상품쿠폰"		
+		headerName		: "상품쿠폰"
 		, field			: "goodsCpnDcAmt"
 		, width			: 80
 		, cellClass		: 'text-right'
@@ -507,7 +520,7 @@ var columnCancelReqList = [
 	{
 		headerName		: "선포인트"
 		, field			: "prePntDcAmt"
-		, width			: 80		
+		, width			: 80
 		, cellClass		: 'text-right'
 		, cellRenderer	: function (params) {
 			return params.value.addComma();
@@ -525,16 +538,16 @@ var columnCancelReqList = [
 	{
 		headerName		: "실결제금액"
 		, field			: "realOrdAmt"
-		, width			: 100		
+		, width			: 100
 		, cellClass		: 'text-right'
 		, cellRenderer	: function (params) {
 			return params.value.addComma();
 		}
 	},
 	{
-		headerName		: "배송비"		
-		, field			: "delvFee"			
-		, width			: 80		
+		headerName		: "배송비"
+		, field			: "delvFee"
+		, width			: 80
 		, cellClass		: 'text-right'
 		, cellRenderer	: function (params) {
 			return params.value.addComma();
@@ -544,9 +557,9 @@ var columnCancelReqList = [
 	{headerName: "업체"			, field: "supplyCompCd"		, width: 100	, cellClass: 'text-center', hide: temp1},
 	{headerName: "배송비코드"		, field: "delvFeeCd"		, width: 100	, cellClass: 'text-center', hide: temp1},
 	{
-		headerName		: "무료배송비"		
-		, field			: "minOrdAmt"			
-		, width			: 80		
+		headerName		: "무료배송비"
+		, field			: "minOrdAmt"
+		, width			: 80
 		, cellClass		: 'text-right'
 		, cellRenderer	: function (params) {
 			return params.value.addComma();
@@ -554,9 +567,9 @@ var columnCancelReqList = [
 		, hide			: temp1
 	},
 	{
-		headerName		: "기본배송비"		
-		, field			: "orgDelvFee"			
-		, width			: 80		
+		headerName		: "기본배송비"
+		, field			: "orgDelvFee"
+		, width			: 80
 		, cellClass		: 'text-right'
 		, cellRenderer	: function (params) {
 			return params.value.addComma();
@@ -564,9 +577,9 @@ var columnCancelReqList = [
 		, hide			: temp1
 	},
 	{
-		headerName		: "반품배송비"		
-		, field			: "rtnDelvFee"			
-		, width			: 80		
+		headerName		: "반품배송비"
+		, field			: "rtnDelvFee"
+		, width			: 80
 		, cellClass		: 'text-right'
 		, cellRenderer	: function (params) {
 			return params.value.addComma();
@@ -574,9 +587,9 @@ var columnCancelReqList = [
 		, hide			: temp1
 	},
 	{
-		headerName		: "교환배송비"		
-		, field			: "excDelvFee"			
-		, width			: 80		
+		headerName		: "교환배송비"
+		, field			: "excDelvFee"
+		, width			: 80
 		, cellClass		: 'text-right'
 		, cellRenderer	: function (params) {
 			return params.value.addComma();
@@ -614,27 +627,27 @@ var columnCancelReqToBeList = [
 			{headerName: "칼라코드"		, field: "optCd1"			, width: 80		, cellClass: 'text-center', hide: temp1},
 			{headerName: "사이즈코드"		, field: "optCd2"			, width: 80		, cellClass: 'text-center', hide: temp2},
 			{
-				headerName		: "단품수량"		
-				, field			: "itemQty"			
-				, width			: 80		
+				headerName		: "단품수량"
+				, field			: "itemQty"
+				, width			: 80
 				, cellClass		: 'text-center'
 				, cellRenderer	: function (params) {
 					return params.value.addComma();
 				}
 			},
 			{
-				headerName		: "단품금액"		
-				, field			: "itemPrice"			
-				, width			: 80		
+				headerName		: "단품금액"
+				, field			: "itemPrice"
+				, width			: 80
 				, cellClass		: 'text-right'
 				, cellRenderer	: function (params) {
 					return params.value.addComma();
 				}
 			},
 			{
-				headerName		: "단품옵션금액"		
-				, field			: "optAddPrice"			
-				, width			: 80		
+				headerName		: "단품옵션금액"
+				, field			: "optAddPrice"
+				, width			: 80
 				, cellClass		: 'text-right'
 				, cellRenderer	: function (params) {
 					return params.value.addComma();
@@ -646,18 +659,18 @@ var columnCancelReqToBeList = [
 		headerName	: "주문상세수량",
 		children	: [
 			{
-				headerName		: "주문"		
-				, field			: "ordQty"			
-				, width			: 80		
+				headerName		: "주문"
+				, field			: "ordQty"
+				, width			: 80
 				, cellClass		: 'text-center'
 				, cellRenderer	: function (params) {
 					return params.value.addComma();
 				}
 			},
 			{
-				headerName		: "취소/요청"		
-				, field			: "cnclRtnQty"			
-				, width			: 80		
+				headerName		: "취소/요청"
+				, field			: "cnclRtnQty"
+				, width			: 80
 				, cellClass		: 'text-center'
 				, cellRenderer	: function (params) {
 					var cnclRtnReqQty = parseInt(params.data.cnclRtnQty) + parseInt(params.data.ordReqChgQty);
@@ -665,9 +678,9 @@ var columnCancelReqToBeList = [
 				}
 			},
 			{
-				headerName		: "취소/반품"		
-				, field			: "ordCanChgQty"			
-				, width			: 100		
+				headerName		: "취소/반품"
+				, field			: "ordCanChgQty"
+				, width			: 100
 				, cellClass		: 'text-center'
 				, cellRenderer	: function (params) {
 					return params.value.addComma();
@@ -680,53 +693,53 @@ var columnCancelReqToBeList = [
 		children	: [
 			{
 				headerName		: "주문"
-				, field			: "ordAmt"			
-				, width			: 80		
+				, field			: "ordAmt"
+				, width			: 80
 				, cellClass		: 'text-right'
 				, cellRenderer	: function (params) {
 					return params.value.addComma();
 				}
 			},
 			{
-				headerName		: "취소"		
-				, field			: "cnclRtnAmt"			
-				, width			: 80		
+				headerName		: "취소"
+				, field			: "cnclRtnAmt"
+				, width			: 80
 				, cellClass		: 'text-right'
 				, cellRenderer	: function (params) {
 					return params.value.addComma();
 				}
 			},
 			{
-				headerName		: "즉시할인"		
-				, field			: "cpn1DcAmt"			
-				, width			: 80		
+				headerName		: "즉시할인"
+				, field			: "cpn1DcAmt"
+				, width			: 80
 				, cellClass		: 'text-right'
 				, cellRenderer	: function (params) {
 					return params.value.addComma();
 				}
 			},
 			{
-				headerName		: "다다익선1"		
-				, field			: "tmtb1DcAmt"			
-				, width			: 80		
+				headerName		: "다다익선1"
+				, field			: "tmtb1DcAmt"
+				, width			: 80
 				, cellClass		: 'text-right'
 				, cellRenderer	: function (params) {
 					return params.value.addComma();
 				}
 			},
 			{
-				headerName		: "다다익선2"		
-				, field			: "tmtb2DcAmt"			
-				, width			: 80		
+				headerName		: "다다익선2"
+				, field			: "tmtb2DcAmt"
+				, width			: 80
 				, cellClass		: 'text-right'
 				, cellRenderer	: function (params) {
 					return params.value.addComma();
 				}
 			},
 			{
-				headerName		: "상품쿠폰"		
-				, field			: "goodsCpnDcAmt"			
-				, width			: 80		
+				headerName		: "상품쿠폰"
+				, field			: "goodsCpnDcAmt"
+				, width			: 80
 				, cellClass		: 'text-right'
 				, cellRenderer	: function (params) {
 					return params.value.addComma();
@@ -742,9 +755,9 @@ var columnCancelReqToBeList = [
 				}
 			},
 			{
-				headerName		: "포인트"		
-				, field			: "pntDcAmt"			
-				, width			: 80		
+				headerName		: "포인트"
+				, field			: "pntDcAmt"
+				, width			: 80
 				, cellClass		: 'text-right'
 				, cellRenderer	: function (params) {
 					return params.value.addComma();
@@ -753,25 +766,25 @@ var columnCancelReqToBeList = [
 			{
 				headerName		: "선포인트"
 				, field			: "prePntDcAmt"
-				, width			: 80		
+				, width			: 80
 				, cellClass		: 'text-right'
 				, cellRenderer	: function (params) {
 					return params.value.addComma();
 				}
 			},
 			{
-				headerName		: "상품권"		
-				, field			: "gfcdUseAmt"			
-				, width			: 80		
+				headerName		: "상품권"
+				, field			: "gfcdUseAmt"
+				, width			: 80
 				, cellClass		: 'text-right'
 				, cellRenderer	: function (params) {
 					return params.value.addComma();
 				}
 			},
 			{
-				headerName		: "환불금액"		
-				, field			: "realOrdAmt"			
-				, width			: 80		
+				headerName		: "환불금액"
+				, field			: "realOrdAmt"
+				, width			: 80
 				, cellClass		: 'text-right'
 				, cellRenderer	: function (params) {
 					return params.value.addComma();
@@ -795,9 +808,9 @@ var columnCancelReqToBeList = [
 			{headerName: "업체"			, field: "supplyCompCd"		, width: 100	, cellClass: 'text-center', hide: temp2},
 			{headerName: "배송비코드"		, field: "delvFeeCd"		, width: 100	, cellClass: 'text-center', hide: temp2},
 			{
-				headerName		: "무료배송비"		
-				, field			: "minOrdAmt"			
-				, width			: 80		
+				headerName		: "무료배송비"
+				, field			: "minOrdAmt"
+				, width			: 80
 				, cellClass		: 'text-right'
 				, cellRenderer	: function (params) {
 					return params.value.addComma();
@@ -805,9 +818,9 @@ var columnCancelReqToBeList = [
 				, hide			: temp2
 			},
 			{
-				headerName		: "기본배송비"		
-				, field			: "orgDelvFee"			
-				, width			: 80		
+				headerName		: "기본배송비"
+				, field			: "orgDelvFee"
+				, width			: 80
 				, cellClass		: 'text-right'
 				, cellRenderer	: function (params) {
 					return params.value.addComma();
@@ -815,9 +828,9 @@ var columnCancelReqToBeList = [
 				, hide			: temp2
 			},
 			{
-				headerName		: "반품배송비"		
-				, field			: "rtnDelvFee"			
-				, width			: 80		
+				headerName		: "반품배송비"
+				, field			: "rtnDelvFee"
+				, width			: 80
 				, cellClass		: 'text-right'
 				, cellRenderer	: function (params) {
 					return params.value.addComma();
@@ -849,26 +862,26 @@ var columnDelvCdList = [
 			{headerName: "배송비코드"		, field: "delvFeeCd"		, width: 100	, cellClass: 'text-center', hide: temp2},
 			{
 				headerName		: "주문"
-				, field			: "ordAmt"			
-				, width			: 100		
+				, field			: "ordAmt"
+				, width			: 100
 				, cellClass		: 'text-right'
 				, cellRenderer	: function (params) {
 					return params.value.addComma();
 				}
 			},
 			{
-				headerName		: "취소"		
-				, field			: "cnclRtnAmt"			
-				, width			: 100		
+				headerName		: "취소"
+				, field			: "cnclRtnAmt"
+				, width			: 100
 				, cellClass		: 'text-right'
 				, cellRenderer	: function (params) {
 					return params.value.addComma();
 				}
 			},
 			{
-				headerName		: "환불"		
-				, field			: "realOrdAmt"			
-				, width			: 100		
+				headerName		: "환불"
+				, field			: "realOrdAmt"
+				, width			: 100
 				, cellClass		: 'text-right'
 				, cellRenderer	: function (params) {
 					return params.value.addComma();
@@ -880,9 +893,9 @@ var columnDelvCdList = [
 		headerName	: "배송비정보",
 		children	: [
 			{
-				headerName		: "배송비"		
-				, field			: "delvFee"			
-				, width			: 100		
+				headerName		: "배송비"
+				, field			: "delvFee"
+				, width			: 100
 				, cellClass		: 'text-right'
 				, cellRenderer	: function (params) {
 					return params.value.addComma();
@@ -890,9 +903,9 @@ var columnDelvCdList = [
 				, hide			: temp2
 			},
 			{
-				headerName		: "무료배송비"		
-				, field			: "minOrdAmt"			
-				, width			: 100		
+				headerName		: "무료배송비"
+				, field			: "minOrdAmt"
+				, width			: 100
 				, cellClass		: 'text-right'
 				, cellRenderer	: function (params) {
 					return params.value.addComma();
@@ -900,9 +913,9 @@ var columnDelvCdList = [
 				, hide			: temp2
 			},
 			{
-				headerName		: "기본배송비"		
-				, field			: "orgDelvFee"			
-				, width			: 100		
+				headerName		: "기본배송비"
+				, field			: "orgDelvFee"
+				, width			: 100
 				, cellClass		: 'text-right'
 				, cellRenderer	: function (params) {
 					return params.value.addComma();
@@ -910,9 +923,9 @@ var columnDelvCdList = [
 				, hide			: temp2
 			},
 			{
-				headerName		: "반품배송비"		
-				, field			: "rtnDelvFee"			
-				, width			: 80		
+				headerName		: "반품배송비"
+				, field			: "rtnDelvFee"
+				, width			: 80
 				, cellClass		: 'text-right'
 				, cellRenderer	: function (params) {
 					return params.value.addComma();
@@ -920,9 +933,9 @@ var columnDelvCdList = [
 				, hide			: temp2
 			},
 			{
-				headerName		: "교환배송비"		
-				, field			: "excDelvFee"			
-				, width			: 80		
+				headerName		: "교환배송비"
+				, field			: "excDelvFee"
+				, width			: 80
 				, cellClass		: 'text-right'
 				, cellRenderer	: function (params) {
 					return params.value.addComma();
@@ -931,9 +944,9 @@ var columnDelvCdList = [
 			},
 			{headerName: "추가배송비여부"		, field: "addDelvFeeYn"		, width: 140	, cellClass: 'text-center', hide: temp2},
 			{
-				headerName		: "추가배송비"		
-				, field			: "addDelvFee"			
-				, width			: 100		
+				headerName		: "추가배송비"
+				, field			: "addDelvFee"
+				, width			: 100
 				, cellClass		: 'text-right'
 				, cellRenderer	: function (params) {
 					return params.value.addComma();
@@ -1538,6 +1551,12 @@ $(document).ready(function() {
 	var cancelRequestTargetHeight = 50 + (40 * cancelRequestTargetCnt);
 	$("#gridOrderCancelRequestList").css("height" , cancelRequestTargetHeight+"px");
 });
+
+// 2021.06.17 구성상품 내역 팝업 호출 
+var fnOrderDetailItemForm = function (ordDtlNo) {
+	var actionUrl = "/delivery/detail/item/form/" + ordDtlNo;
+	cfnOpenModalPopup(actionUrl, 'popupDeliveryDetailItemForm');
+}
 </script>
 </html>
 

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

@@ -289,7 +289,7 @@ var columnExchangeReqList = [
 			{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-center'},
-			{headerName: "상품명"			, field: "goodsNm"			, width: 200	, cellClass: 'text-center'},
+			{headerName: "상품명"			, field: "goodsNm"			, width: 130	, cellClass: 'text-center'},
 			{headerName: "상품타입"		, field: "goodsTypeNm"		, width: 100	, cellClass: 'text-center', hide: temp2}
 		]
 	},
@@ -298,7 +298,8 @@ var columnExchangeReqList = [
 		children	: [
 			{headerName: "단품번호"		, field: "ordDtlItemSq"		, width: 100	, cellClass: 'text-center', hide: temp2},
 			{headerName: "단품코드"		, field: "itemCd"			, width: 100	, cellClass: 'text-center'},
-			{headerName: "단품명"			, field: "itemNm"			, width: 200	, cellClass: 'text-center'},
+			{headerName: "SKUCODE"		, field: "optCd"			, width: 100	, cellClass: 'text-center'},
+			{headerName: "단품명"			, field: "itemNm"			, width: 130	, cellClass: 'text-center'},
 			{headerName: "옵션1"			, field: "optCd1"			, width: 60		, cellClass: 'text-center'},
 			{headerName: "옵션2"			, field: "optCd2"			, width: 60		, cellClass: 'text-center'},
 			{

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

@@ -373,8 +373,21 @@ var columnCancelReqList = [
 	{headerName: "주문상세"		, field: "ordDtlStat"		, width: 80		, cellClass: 'text-center'	, hide: temp1},
 	{headerName: "주문상세상태"	, field: "ordDtlStatNm"		, width: 100	, cellClass: 'text-center'	, hide: temp1},
 	{headerName: "상품코드"		, field: "goodsCd"			, width: 110	, cellClass: 'text-left'	, hide: temp2},
+	{headerName: "SKUCODE"		, field: "optCd"			, width: 100	, cellClass: 'text-center'	, hide: temp2},
 	{headerName: "상품명"		, field: "goodsNm"			, width: 200	, cellClass: 'text-left'	, hide: temp2},
-	{headerName: "상품타입"		, field: "goodsTypeNm"		, width: 80		, cellClass: 'text-center'	, hide: temp2},
+	//{headerName: "상품타입"		, field: "goodsTypeNm"		, width: 80		, cellClass: 'text-center'	, hide: temp2},
+	{headerName: "상품타입"	, field: "goodsTypeNm"	, width: 80, cellClass: 'text-center',
+		cellRenderer: function (params) {
+			var option;
+			if (params.data.goodsType == 'G056_S') {
+				option = "<a href=\"javascript:void(0);\" onclick=\"fnOrderDetailItemForm('" + params.data.ordDtlNo + "');\">" + params.value + "</a>";
+			} else {
+				option = params.value
+			}
+			return option;
+		},
+		hide: temp2
+	},
 	{headerName: "옵션1"			, field: "colorNm"			, width: 60		, cellClass: 'text-center'	, hide: temp2},
 	{headerName: "옵션2"			, field: "optCd2"			, width: 60		, cellClass: 'text-center'	, hide: temp2},
 	{
@@ -1951,6 +1964,12 @@ $(document).ready(function() {
 		}
 	}
 });
+
+// 2021.06.17 구성상품 내역 팝업 호출 
+var fnOrderDetailItemForm = function (ordDtlNo) {
+	var actionUrl = "/delivery/detail/item/form/" + ordDtlNo;
+	cfnOpenModalPopup(actionUrl, 'popupDeliveryDetailItemForm');
+}
 </script>
 </html>
 

src/main/webapp/WEB-INF/views/withdraw/RefundDetailForm.html

@@ -299,6 +299,7 @@
 				return "<a href=\"javascript:void(0);\" onclick=\"cfnOpenGoodsDetailPopup('U','" + params.value + "','');\">" + params.value + "</a>";
 			}
 		},
+		{headerName: "SKUCODE", 	field: "optCd", 	width: 100, minWidth: 100, cellClass: 'text-center'},
 		{headerName: "옵션1", 		field: "optCd1", 	width: 60, minWidth: 100, cellClass: 'text-center'},
 		{headerName: "옵션2", 		field: "optCd2", 	width: 60, minWidth: 100, cellClass: 'text-center'},
 		{headerName: "신청수량", 		field: "chgQty", 	width: 80, minWidth: 100, cellClass: 'text-center'},