주문목록 페이징 기능 추가 개발중

style24.admin/src/main/java/com/style24/admin/biz/dao/TsaOrderDao.java

@@ -17,6 +17,15 @@ import com.style24.persistence.domain.Order;
 @ShopDs
 public interface TsaOrderDao {
 	
+	/**
+	 * 주문 목록 카운트
+	 * @param Order
+	 * @return
+	 * @author jsh77b	
+	 * @since 2020. 11. 18
+	 */
+	int getOrderListCount(Order order);
+	
 	/**
 	 * 주문 목록
 	 * @param Order
@@ -36,7 +45,7 @@ public interface TsaOrderDao {
 	Order getOrderListSumInfo(Order order);
 	
 	/**
-	 * 주문 정보
+	 * 주문기본정보
 	 *
 	 * @param Order - 주문 정보
 	 * @return
@@ -46,7 +55,7 @@ public interface TsaOrderDao {
 	Collection<Order> getOrderInfoList(Order order);
 	
 	/**
-	 * 주문상세 목록
+	 * 주문상품정보 목록
 	 *
 	 * @param Order - 주문 정보
 	 * @return
@@ -55,16 +64,6 @@ public interface TsaOrderDao {
 	 */
 	Collection<Order> getOrderDetailList(Order order);
 	
-	/**
-	 * 주문상세 단품 목록
-	 *
-	 * @param Order - 주문 정보
-	 * @return
-	 * @author jsh77b
-	 * @since 2020. 11. 18
-	 */
-	Collection<Order> getOrderDetailItemList(Order order);
-	
 	/**
 	 * 배송정보
 	 *

style24.admin/src/main/java/com/style24/admin/biz/service/TsaOrderService.java

@@ -41,6 +41,17 @@ public class TsaOrderService {
 	@Autowired
 	private ObjectMapper mapper;
 	
+	/**
+	 * 주문목록 카운트
+	 * @param Order
+	 * @return
+	 * @author jsh77b
+	 * @since 2020. 11. 18
+	 */
+	public int getOrderListCount(Order order) {
+		return orderDao.getOrderListCount(order);
+	}
+	
 	/**
 	 * 주문목록
 	 * @param Order
@@ -78,7 +89,7 @@ public class TsaOrderService {
 	}
 	
 	/**
-	 * 주문상세 정보
+	 * 주문기본정보
 	 *
 	 * @param order - 주문 정보
 	 * @return Collection<Order>
@@ -90,7 +101,7 @@ public class TsaOrderService {
 	}
 	
 	/**
-	 * 주문상세 목록
+	 * 주문상품정보 목록
 	 *
 	 * @param order - 주문 정보
 	 * @return Collection<Order>
@@ -113,18 +124,6 @@ public class TsaOrderService {
 		return orderDao.getDeliveryAddrList(order);
 	}
 	
-	/**
-	 * 주문상세 단품 목록
-	 *
-	 * @param order - 주문 정보
-	 * @return Collection<Order>
-	 * @author jsh77b
-	 * @since 2020. 11. 18
-	 */
-	public Collection<Order> getOrderDetailItemList(Order order) {
-		return orderDao.getOrderDetailItemList(order);
-	}
-	
 	/**
 	 * 결제내역 > 결제 기본정보
 	 *

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

@@ -30,6 +30,7 @@ import com.style24.admin.biz.service.TsaOrderService;
 import com.style24.admin.biz.service.TsaRendererService;
 import com.style24.admin.support.controller.TsaBaseController;
 import com.style24.admin.support.security.session.TsaSession;
+import com.style24.persistence.TsaPageRequest;
 import com.style24.persistence.domain.Order;
 
 import lombok.extern.slf4j.Slf4j;
@@ -94,9 +95,23 @@ public class TsaOrderController extends TsaBaseController {
 	 */
 	@PostMapping("/list")
 	@ResponseBody
-	public Collection<Order> getOrderList(@RequestBody Order order) throws Exception {		
-		Collection<Order> orderList = orderService.getOrderList(order); 
-		return orderList;
+	public GagaMap getOrderList(@RequestBody Order order) throws Exception {
+		GagaMap result = new GagaMap();
+		
+		order.setRegNo(TsaSession.getInfo().getUserNo()); // 엑셀조회시 로그인 사용자의 엑셀 상품조회시 사용
+		order.setPageable(new TsaPageRequest(order.getPageNo() - 1, order.getPageSize()));
+		
+		// 주문전체건수 조회
+		int totalCount = orderService.getOrderListCount(order);
+		order.getPageable().setTotalCount(totalCount);
+		
+		// 주문목록 페이지 조회
+		Collection<Order> orderList = orderService.getOrderList(order);
+		
+		result.set("pageing"	, order);
+		result.set("orderList"	, orderList);
+		
+		return result;
 	}
 	
 	/**
@@ -170,9 +185,8 @@ public class TsaOrderController extends TsaBaseController {
 		order.setOrdNo(ordNo);
 		
 		mav.addObject("ordNo"					, ordNo);												// 주문번호
-		mav.addObject("orderInfo"				, orderService.getOrderInfoList(order));				// 기본정보
+		mav.addObject("orderInfo"				, orderService.getOrderInfoList(order));				// 주문기본정보
 		mav.addObject("orderGoodsInfo"			, orderService.getOrderDetailList(order));				// 주문상품정보
-		//mav.addObject("orderGoodsItemInfo"		, orderService.getOrderDetailItemList(order));			// 주문상품단품정보
 		mav.addObject("orderDeliveryAddrInfo"	, orderService.getDeliveryAddrList(order));				// 배송정보
 		mav.addObject("orderPaymentInfo"		, orderService.getOrderPaymentBasicInfoList(order));	// 결제정보
 		mav.addObject("orderDeliveryFeeInfo"	, orderService.getDeliveryFeeList(order));				// 배송비정보

style24.admin/src/main/java/com/style24/persistence/domain/Order.java

@@ -1,6 +1,7 @@
 package com.style24.persistence.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.style24.persistence.TsaPageRequest;
 import com.style24.persistence.TscBaseDomain;
 
 import lombok.Data;
@@ -217,7 +218,13 @@ public class Order extends TscBaseDomain {
 	
 	private int itemQty;
 	private int itemPrice;
-
+	private String itemNm;
+	
+	// Pagination
+	private TsaPageRequest pageable;
+	private int pageNo = 1;
+	private int pageSize = 50;
+	private int pageUnit = 10;
 }
 
 

style24.admin/src/main/java/com/style24/persistence/mybatis/shop/TsaOrder.xml

@@ -2,57 +2,22 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.style24.admin.biz.dao.TsaOrderDao">
 
-	<!-- 주문목록 -->
-	<select id="getOrderList" parameterType="Order" resultType="Order">
-		/* order.getOrderList */
-		SELECT O.ORD_NO
-		     , O.ORD_NM
-		     , O.CUST_NO
-		     , OD.VENDOR_ID
-		     , O.FRONT_GB
-		     , DATE_FORMAT(O.ORD_DT,'%Y%m%d%H%i%S') AS ORD_DT
-		     , OD.ORD_EXCH_GB
-		     , OD.ORD_DTL_STAT
-		     , OD.DELV_LOC_CD
-		     , GI.IMG_PATH1
-		     , G.BRAND_CD
-		     , (SELECT Z.BRAND_ENM
-                FROM   TB_BRAND Z
-                WHERE  Z.BRAND_CD = G.BRAND_CD) AS BRAND_ENM
-		     , G.GOODS_CD
-		     , ODI.OPT_CD1
-		     , ODI.OPT_CD2
-		     , G.GOODS_NM
-		     , G.GOODS_TYPE
-		     , FN_GET_CODE_NM('G056', G.GOODS_TYPE) AS GOODS_TYPE_NM
-		     , OD.EXTMALL_ORDER_ID
-		     , OD.AGENT_ORDER_ID 
-		     , OD.ORD_QTY
-		     , OD.CNCL_RTN_QTY
-		     , OD.ORD_AMT
-		     , OD.CNCL_RTN_AMT
-		     , OD.CPN1_DC_AMT + TMTB1_DC_AMT + TMTB2_DC_AMT +  GOODS_CPN_DC_AMT + CART_CPN_DC_AMT + PNT_DC_AMT + PRE_PNT_DC_AMT AS TOT_DC_AMT
-		     , OD.REAL_ORD_AMT
-		     , ODI.ITEM_CD
-		     , G.SUPPLY_GOODS_CD
-		     , OD.FORMAL_GB
-		     , DATE_FORMAT(OD.DELV_ASSIGN_DT,'%Y%m%d%H%i%S') AS DELV_ASSIGN_DT 
-		     , OD.INVOICE_NO
-		     , OD.DELV_STDT
-		     , OD.SOLDOUT_YN
-		     , OD.SOLDOUT_MEMO
-		     , DATE_FORMAT(OD.SOLDOUT_REG_DT,'%Y%m%d%H%i%S') AS SOLDOUT_REG_DT 
-		     , OD.SOLDOUT_REG_NO     
+	<!-- 주문목록 카운트 -->
+	<select id="getOrderListCount" parameterType="Order" resultType="int">
+		/* order.getOrderListCnt */
+		SELECT COUNT(1)  
 		FROM   TB_ORDER O
 		INNER  JOIN TB_ORDER_DETAIL OD
 		ON     O.ORD_NO = OD.ORD_NO
+		INNER  JOIN TB_GOODS G1
+		ON     OD.GOODS_CD = G1.GOODS_CD
 		INNER  JOIN TB_ORDER_DETAIL_ITEM ODI
 		ON     OD.ORD_NO = ODI.ORD_NO
 		AND    OD.ORD_DTL_NO = ODI.ORD_DTL_NO
-		INNER  JOIN TB_GOODS G
-		ON     OD.GOODS_CD = G.GOODS_CD
+		INNER  JOIN TB_GOODS G2
+		ON     ODI.ITEM_CD = G2.GOODS_CD
 		INNER  JOIN TB_GOODS_IMG GI
-		ON     OD.GOODS_CD = GI.GOODS_CD
+		ON     ODI.ITEM_CD = GI.GOODS_CD
 		AND    ODI.OPT_CD1 = GI.COLOR_CD
 		INNER  JOIN TB_PAYMENT P
 		ON     O.ORD_NO = P.ORD_NO
@@ -70,7 +35,7 @@
 		AND    OD.SUPPLY_COMP_CD = #{supplyCompCd}
 		</if>
 		<if test="multiBrand != null and multiBrand != ''">
-        AND    G.BRAND_CD IN
+        AND    G1.BRAND_CD IN
 			<foreach collection="multiBrand" item="item" index="index"  open="(" close=")" separator=",">
         		#{item}
             </foreach>
@@ -104,13 +69,13 @@
 		AND    O.ORD_PHNNO = #{orderPhnno}
 		</if>
 		<if test='goodsCd != null and goodsCd != ""'>
-		AND    G.GOODS_CD = #{goodsCd}
+		AND    G1.GOODS_CD = #{goodsCd}
 		</if>
 		<if test='sizeCd != null and sizeCd != ""'>
 		AND    ODI.OPT_CD2 = #{sizeCd}
 		</if>
 		<if test='goodsNm != null and goodsNm != ""'>
-		AND    G.GOODS_NM = #{goodsNm}
+		AND    G1.GOODS_NM = #{goodsNm}
 		</if>
 		<if test='recipNm != null and recipNm != ""'>
 		AND    DA.RECIP_NM = #{recipNm}
@@ -142,7 +107,162 @@
         		#{item}
             </foreach>
         </if>
-        ORDER  BY O.REG_DT DESC
+	</select>
+
+	<!-- 주문목록 -->
+	<select id="getOrderList" parameterType="Order" resultType="Order">
+		/* order.getOrderList */
+		SELECT Z.*
+		FROM (
+			SELECT @rownum := @rownum + 1 AS RNUM
+			     , A.*
+			FROM (
+				SELECT O.ORD_NO
+				     , O.ORD_NM
+				     , O.CUST_NO
+				     , OD.VENDOR_ID
+				     , O.FRONT_GB
+				     , DATE_FORMAT(O.ORD_DT,'%Y%m%d%H%i%S') AS ORD_DT
+				     , OD.ORD_EXCH_GB
+				     , OD.ORD_DTL_STAT
+				     , OD.DELV_LOC_CD
+				     , G1.GOODS_CD 
+				     , G1.GOODS_NM
+				     , G1.GOODS_TYPE
+				     , FN_GET_CODE_NM('G056', G1.GOODS_TYPE) AS GOODS_TYPE_NM
+				     , GI.IMG_PATH1
+				     , G2.BRAND_CD
+				     , (SELECT Z.BRAND_ENM
+				        FROM   TB_BRAND Z
+				        WHERE  Z.BRAND_CD = G2.BRAND_CD) AS BRAND_ENM
+				     , G2.GOODS_CD AS ITEM_CD
+				     , G2.GOODS_NM AS ITEM_NM
+				     , ODI.OPT_CD1
+				     , ODI.OPT_CD2
+				     , OD.EXTMALL_ORDER_ID
+				     , OD.AGENT_ORDER_ID 
+				     , OD.ORD_QTY
+				     , OD.CNCL_RTN_QTY
+				     , ODI.ORD_AMT
+				     , ODI.CNCL_RTN_AMT
+				     , ODI.CPN1_DC_AMT + ODI.TMTB1_DC_AMT + ODI.TMTB2_DC_AMT +  ODI.GOODS_CPN_DC_AMT + ODI.CART_CPN_DC_AMT + ODI.PNT_DC_AMT + ODI.PRE_PNT_DC_AMT AS TOT_DC_AMT
+				     , ODI.REAL_ORD_AMT
+				     , G2.SUPPLY_GOODS_CD
+				     , OD.FORMAL_GB
+				     , DATE_FORMAT(OD.DELV_ASSIGN_DT,'%Y%m%d%H%i%S') AS DELV_ASSIGN_DT 
+				     , OD.INVOICE_NO
+				     , OD.DELV_STDT
+				     , OD.SOLDOUT_YN
+				     , OD.SOLDOUT_MEMO
+				     , DATE_FORMAT(OD.SOLDOUT_REG_DT,'%Y%m%d%H%i%S') AS SOLDOUT_REG_DT 
+				     , OD.SOLDOUT_REG_NO     
+				FROM   TB_ORDER O
+				INNER  JOIN TB_ORDER_DETAIL OD
+				ON     O.ORD_NO = OD.ORD_NO
+				INNER  JOIN TB_GOODS G1
+				ON     OD.GOODS_CD = G1.GOODS_CD
+				INNER  JOIN TB_ORDER_DETAIL_ITEM ODI
+				ON     OD.ORD_NO = ODI.ORD_NO
+				AND    OD.ORD_DTL_NO = ODI.ORD_DTL_NO
+				INNER  JOIN TB_GOODS G2
+				ON     ODI.ITEM_CD = G2.GOODS_CD
+				INNER  JOIN TB_GOODS_IMG GI
+				ON     ODI.ITEM_CD = GI.GOODS_CD
+				AND    ODI.OPT_CD1 = GI.COLOR_CD
+				INNER  JOIN TB_PAYMENT P
+				ON     O.ORD_NO = P.ORD_NO
+				AND    P.PAY_GB = 'O'
+				INNER  JOIN TB_DELIVERY_ADDR DA
+				ON     OD.DELV_ADDR_SQ = DA.DELV_ADDR_SQ
+				WHERE  1=1
+				<if test='siteCd != null and siteCd != ""'>
+				AND    O.SITE_CD = #{siteCd}
+				</if>
+				<if test='mallCd != null and mallCd != ""'>
+				AND    O.MALL_GB = #{mallCd}
+				</if>
+				<if test='supplyCompCd != null and supplyCompCd != ""'>
+				AND    OD.SUPPLY_COMP_CD = #{supplyCompCd}
+				</if>
+				<if test="multiBrand != null and multiBrand != ''">
+		        AND    G1.BRAND_CD IN
+					<foreach collection="multiBrand" item="item" index="index"  open="(" close=")" separator=",">
+		        		#{item}
+		            </foreach>
+		        </if>
+		        <if test="multiOrdDtlStat != null and multiOrdDtlStat != ''">
+		        AND    OD.ORD_DTL_STAT IN
+					<foreach collection="multiOrdDtlStat" item="item" index="index"  open="(" close=")" separator=",">
+		        		#{item}
+		            </foreach>
+		        </if>
+		        <if test='search != null and search == "searchOrdNo"'>
+		        	<if test="condition != null and condition != ''">
+				AND    O.ORD_NO = #{condition}
+					</if>
+				</if>
+				<if test='search != null and search == "searchExtmallOrderId"'>
+		        	<if test="condition != null and condition != ''">
+				AND    O.ORD_NO = #{condition}
+					</if>
+				</if>
+				<if test='payMeans != null and payMeans != ""'>
+				AND    P.PAY_MEANS = #{payMeans}
+				</if>
+				<if test='orderNm != null and orderNm != ""'>
+				AND    O.ORD_NM = #{orderNm}
+				</if>
+				<if test='custId != null and custId != ""'>
+				AND    O.CUST_NO = #{custId}
+				</if>
+				<if test='orderPhnno != null and orderPhnno != ""'>
+				AND    O.ORD_PHNNO = #{orderPhnno}
+				</if>
+				<if test='goodsCd != null and goodsCd != ""'>
+				AND    G1.GOODS_CD = #{goodsCd}
+				</if>
+				<if test='sizeCd != null and sizeCd != ""'>
+				AND    ODI.OPT_CD2 = #{sizeCd}
+				</if>
+				<if test='goodsNm != null and goodsNm != ""'>
+				AND    G1.GOODS_NM = #{goodsNm}
+				</if>
+				<if test='recipNm != null and recipNm != ""'>
+				AND    DA.RECIP_NM = #{recipNm}
+				</if>
+				<if test='invoiceNo != null and invoiceNo != ""'>
+				AND    OD.INVOICE_NO = #{invoiceNo}
+				</if>
+				<if test='wdInvoiceSendYn != null and wdInvoiceSendYn == "Y"'>
+				AND    OD.INVOICE_SEND_YN = 'Y'
+				</if>
+				<if test='wdInvoiceSendYn != null and wdInvoiceSendYn == "N"'>
+				AND    OD.INVOICE_SEND_YN = 'N'
+				</if>
+				<if test='searchDateGb != null and searchDateGb == "ordDt"'>
+				AND    O.ORD_DT >= DATE_FORMAT(#{stDate}, '%Y-%m-%d %H:%i:%S')
+				AND    O.ORD_DT <![CDATA[<]]> DATE_FORMAT(DATE_ADD(#{edDate}, INTERVAL 1 DAY), '%Y-%m-%d %H:%i:%S')
+				</if>
+				<if test='searchDateGb != null and searchDateGb == "delvStdt"'>
+				AND    OD.DELV_STDT >= DATE_FORMAT(#{stDate}, '%Y-%m-%d %H:%i:%S')
+				AND    OD.DELV_STDT <![CDATA[<]]> DATE_FORMAT(DATE_ADD(#{edDate}, INTERVAL 1 DAY), '%Y-%m-%d %H:%i:%S')
+				</if>
+				<if test='searchDateGb != null and searchDateGb == "soldoutDt"'>
+				AND    OD.SOLDOUT_REG_DT >= DATE_FORMAT(#{stDate}, '%Y-%m-%d %H:%i:%S')
+				AND    OD.SOLDOUT_REG_DT <![CDATA[<]]> DATE_FORMAT(DATE_ADD(#{edDate}, INTERVAL 1 DAY), '%Y-%m-%d %H:%i:%S')
+				</if>
+				<if test="ordNoList != null and ordNoList != ''">
+		        AND    OD.ORD_NO IN
+					<foreach collection="ordNoList" item="item" index="index"  open="(" close=")" separator=",">
+		        		#{item}
+		            </foreach>
+		        </if>
+		        ORDER  BY O.REG_DT DESC
+	        ) A
+			JOIN (SELECT @rownum := 0) R
+		) Z
+		WHERE  1=1
+        AND    Z.RNUM BETWEEN  #{pageable.startRow} AND #{pageable.endRow}
 	</select>
 	
 	<!-- 주문 목록 금액, 수량 정보-->

style24.admin/src/main/webapp/WEB-INF/views/order/OrderListForm.html

@@ -26,7 +26,6 @@
 	
 	<form id="searchForm" name="searchForm" action="#" th:action="@{'/order/list'}">
 		<input type="hidden" id="searchGb" name="searchGb" />
-		<input type="hidden" id="imageViewYn" name="imageViewYn" />
 		
 		<!-- 패널 영역1 -->
 		<div class="panelStyle" >
@@ -82,21 +81,6 @@
 						</td>
 					</tr>
 					<tr>
-						<!-- 
-						<th>주문상태</th>
-						<td>
-							<div class="multiCheckBox" style="width:200px">
-								<button type="button" class="sltBtn" style="overflow-x: hidden; padding-right:5px;">[전체]</button>
-								<ul style="display: none; box-shadow: 3px 3px 3px; overflow-y: scroll; height: 112px;">
-									<li th:if="${ordStatList}" th:each="oneData, status : ${ordStatList}">
-										<label class="chkBox">
-											<input type="checkbox" name="multiOrdStat" th:value="${oneData.cd}" th:text="|[${oneData.cd}] ${oneData.cdNm}|">
-										</label>
-									</li>
-								</ul>
-							</div>
-						</td>
-						 -->
 						<th>주문상세상태</th>
 						<td colspan="5">
 							<div class="multiCheckBox" style="width:270px">
@@ -223,6 +207,7 @@
 			<ul class="panelBar">
 				<li>
 					<button type="button" class="btn btn-info btn-lg" onclick="fnOrderExcelList();">엑셀다운로드</button>
+					<!--
 					<span style="margin-left:10px;">
 						주문금액 : <strong><span id="sumOrdAmt">0</span></strong>&nbsp;
 						판매금액 : <strong><span id="sumOrdCnclAmt">0</span></strong>&nbsp;
@@ -231,15 +216,30 @@
 						주문수량  : <strong><span id="sumOrdQty">0</span></strong>&nbsp;
 						판매수량  : <strong><span id="sumOrdCnclQty">0</span></strong>&nbsp;
 					</span>
+					  -->
 				</li>
 				<li class="aR">
 					검색결과 : <strong><span id="rowCntOrderList">0</span> 건</strong>&nbsp;
+					쪽번호 <span id="pgNo">0</span>/ <strong id="endPgNo">0</strong>&nbsp;&nbsp;
+					<select id="pageSize" name="pageSize">
+						<option value="50" selected="selected">50개씩 보기</option>
+						<option value="100">100개씩 보기</option>
+						<option value="500">500개씩 보기</option>
+						<option value="1000">1000개씩 보기</option>
+					</select>
+					<input type="hidden" name="pageNo" id="pageNo" value ="1"/>
 				</li>
 			</ul>
 			
 			<div class="panelContent" style="overflow: hidden;">
 				<div id="gridOrderList" style="width: 100%; height: 700px;" class="ag-theme-balham lh60"></div>
 			</div>
+			
+			<ul class="panelBar">
+				<li class="center">
+					<div class="tablePaging" id="orderListPagination"></div>
+				</li>
+			</ul>
 		</div>
 
 	</form>
@@ -248,7 +248,7 @@
 <label class="off">
 	<a href="javascript:void(0);" id="hdOrderExcelList" style="display: none;">엑셀다운로드</a>
 </label>
-	
+
 <script type="text/javascript" src="/ux/plugins/gaga/gaga.paging.js?v=2019072202"></script>
 <script th:inline="javascript">
 /*<![CDATA[*/
@@ -265,6 +265,7 @@ var formalGbList 	= gagajf.convertToArray([[${formalGbList}]]);
 var frontGbList 	= {'P': 'PC', 'M': 'MO'};
 var uploadGoodsUrl 	= [[${@environment.getProperty('upload.goods.view')}]];
 
+// 1. 주문기본정보
 var columnDefsOrderList = [
 	{
 		headerName	: "주문기본정보"
@@ -396,6 +397,28 @@ var columnDefsOrderList = [
 	{
 		headerName	: "주문상품정보"
 		, cellClass	: 'text-center'
+		, children	: [
+			{headerName: "상품코드"	, field: "goodsCd"		, width: 100	, cellClass: 'text-center'	, sortable: true},
+			{
+				headerName		: "상품명"
+				, field			: 'goodsNm'
+				, width			: 75
+				, cellClass		: 'text-center'
+				, sortable		: true
+				, cellRenderer	: function (params) {
+					var roleCd = [[${sessionInfo.roleCd}]];
+					if (!roleCd.startsWith("C")) {
+						return "<a href=\"javascript:void(0);\" onclick=\"fnOpenOrderDetailPopup('" + params.value + "');\">" + params.value + "</a>";
+					} else {
+						return params.value;
+					}
+				}
+			}
+		]
+	},
+	{
+		headerName	: "주문상품단품정보"
+		, cellClass	: 'text-center'
 		, children	: [
 			{
 				headerName		: "이미지"
@@ -421,8 +444,8 @@ var columnDefsOrderList = [
 			},
 			{headerName: "브랜드"		, field: "brandEnm"		, width: 130, cellClass: 'text-center', sortable: true},
 			{
-				headerName		: "상품코드"
-				, field			: "goodsCd"
+				headerName		: "단품코드"
+				, field			: "itemCd"
 				, width			: 130
 				, cellClass		: 'text-center'
 				, sortable		: true
@@ -437,7 +460,7 @@ var columnDefsOrderList = [
 			},
 			{headerName: "색상"		, field: "optCd1"		, width: 100	, cellClass: 'text-center'	, sortable: true},
 			{headerName: "사이즈"		, field: "optCd2"		, width: 60		, cellClass: 'text-center'	, sortable: true},
-			{headerName: "단품명"		, field: "goodsNm"		, width: 200	, cellClass: 'text-left'	, sortable: true},
+			{headerName: "단품명"		, field: "itemNm"		, width: 200	, cellClass: 'text-left'	, sortable: true},
 			{headerName: "구성유형"	, field: "goodsTypeNm"	, width: 200	, cellClass: 'text-left'	, sortable: true},
 			{
 				headerName		: "외부몰벤더"
@@ -505,7 +528,6 @@ var columnDefsOrderList = [
 					return params.data.realOrdAmt.addComma(); 
 				}
 			},
-			{headerName: "단품코드"	, field: "itemCd"			, width: 130, cellClass: 'text-center', sortable: true},
 			{headerName: "원코드"		, field: "supplyGoodsCd"	, width: 130, cellClass: 'text-center', sortable: true},
 			{
 				headerName		: "정상/이월"
@@ -640,9 +662,9 @@ var gridOptionsOrderList = {
 };
 
 // 상품이미지 노출을 위해 높이 조정
-gridOptionsOrderList.rowHeight = 60;
-gridOptionsOrderList.rowSelection = 'multiple';
-gridOptionsOrderList.suppressRowClickSelection = true;
+gridOptionsOrderList.rowHeight 					= 60;
+gridOptionsOrderList.rowSelection 				= 'multiple';
+gridOptionsOrderList.suppressRowClickSelection 	= true;
 gridOptionsOrderList.getRowStyle = function (params) {
 	if (params.data.ordExchGb === 'E') {
 		return {background: 'orange'}
@@ -675,14 +697,27 @@ var fnSearchList = function () {
 		}
 	}
 	
-	gagaAgGrid.fetch($('#searchForm').prop('action'), gridOptionsOrderList, '#searchForm', function () {
-		$("#rowCntOrderList").text(gridOptionsOrderList.api.getDisplayedRowCount());
-		
+	gagaPaging.init('searchForm', fnSearchCallBack, 'orderListPagination', $('#searchForm').find('#pageSize').val());
+	gagaPaging.load($("#searchForm input[name=pageNo]").val());
+	
+	// 2020.12.08 페이징 처리 때문에 주석 처리
+	//gagaAgGrid.fetch($('#searchForm').prop('action'), gridOptionsOrderList, '#searchForm', function (result) {
+		//$("#rowCntOrderList").text(gridOptionsOrderList.api.getDisplayedRowCount());
 		// 주문리스트 합계 정보
-		gagajf.ajaxFormSubmit('/order/list/sum/info', '#searchForm', fnOrderListSumInfoCallback);
-	});
+		//gagajf.ajaxFormSubmit('/order/list/sum/info', '#searchForm', fnOrderListSumInfoCallback);
+	//});
 };
 
+var fnSearchCallBack = function(result){
+	$('#searchForm').find('#gridRowTotalCount').html(result.pageing.pageable.totalCount.addComma());
+	$('#searchForm').find('#pageNo').val(result.pageing.pageable.pageNo.addComma());
+	$('#searchForm').find('#pgNo').html(result.pageing.pageable.pageNo.addComma());
+	$('#searchForm').find('#endPgNo').html(result.pageing.pageable.totalPage.addComma());
+	
+	gridOptionsOrderList.api.setRowData(result.orderList);
+	gagaPaging.createPagination(result.pageing.pageable);
+}
+
 // 주문리스트 합계 정보
 var fnOrderListSumInfoCallback = function(result) {
 	if (!gagajf.isNull(result)) {
@@ -799,6 +834,12 @@ $('#searchForm select[name=supplyCompCd]').on('change', function() {
 	cfnCreateMultiCombo(actionUrl,"multiBrand",  "[전체]",null, 'Y');
 });
 
+//페이징
+$('#searchForm select[name=pageSize]').on('change', function() {
+	$("#searchForm input[name=pageNo]").val('1');
+	fnGoodsListSearch($("#searchForm input[name=searchGb]").val());
+});
+
 // 초기설정
 $(document).ready(function() {
 	// 달력기능 활성화