입점업체 클레임 메뉴 작업 개발중

src/main/java/com/style24/scm/biz/web/TssOrderController.java

@@ -3,7 +3,6 @@ package com.style24.scm.biz.web;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -29,11 +28,13 @@ import com.gagaframework.web.util.GagaFileUtil;
 import com.style24.core.biz.service.TscOrderService;
 import com.style24.core.support.env.TscConstants;
 import com.style24.core.support.message.TscMessageByLocale;
+import com.style24.persistence.TscPageRequest;
 import com.style24.persistence.domain.Order;
 import com.style24.scm.biz.service.TssOrderService;
 import com.style24.scm.biz.service.TssRendererService;
 import com.style24.scm.support.controller.TssBaseController;
 import com.style24.scm.support.security.session.TssSession;
+
 import lombok.extern.slf4j.Slf4j;
 
 
@@ -320,9 +321,22 @@ public class TssOrderController extends TssBaseController {
 	 */
 	@PostMapping("/seller/claim/list")
 	@ResponseBody
-	public Collection<Order> getOrderSellerClaimList(@RequestBody Order order) throws Exception {
-		Collection<Order> OrderSellerClaimList = coreOrderService.getOrderSellerClaimList(order);
-		return OrderSellerClaimList;
+	public GagaMap getOrderSellerClaimList(@RequestBody Order order) throws Exception {
+		
+		GagaMap result = new GagaMap();
+		
+		order.setPageable(new TscPageRequest(order.getPageNo() - 1, order.getPageSize()));
+		
+		// 주문전체건수 조회
+		int totalCount = (int) coreOrderService.getOrderSellerClaimCount(order);
+		order.getPageable().setTotalCount(totalCount);
+		
+		Collection<Order> orderSellerClaimList = coreOrderService.getOrderSellerClaimList(order);
+		
+		result.set("pageing"				, order);
+		result.set("orderSellerClaimList"	, orderSellerClaimList);
+				
+		return result;
 	}
 	
 	/**

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

@@ -53,7 +53,7 @@
 					</colgroup>
 					<tr>
 						<th>업체/브랜드<em class="required" title="필수"></em></th>
-						<td colspan="5">
+						<td colspan="7">
 							<select name="supplyCompCd" id="supplyCompCd">
 								<option th:if="${supplyCompList}" th:each="oneData, status : ${supplyCompList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
 							</select>
@@ -105,21 +105,40 @@
 		</div>
 		
 		<div class="panelStyle">
-			<!-- 
 			<ul class="panelBar">
+				<!-- 
 				<li class="aR">
 					<button type="button" id="btnSave" class="btn btn-success btn-lg">입고확인</button>
 				</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="100" selected="selected">100개씩 보기</option>
+						<option value="500">500개씩 보기</option>
+						<option value="1000">1000개씩 보기</option>
+						<option value="5000">5000개씩 보기</option>
+					</select>
+					<input type="hidden" name="pageNo" id="pageNo" value ="1"/>
+				</li>
 			</ul>
-			 -->
 			
 			<div class="panelContent" style="overflow: hidden;">
 				<div id="gridList" style="width: 100%; height: 700px;" class="ag-theme-balham lh30"></div>
 			</div>
+			
+			<ul class="panelBar">
+				<li class="center">
+					<div class="tablePaging" id="orderListPagination"></div>
+				</li>
+			</ul>
 		</div>
 	</form>
 </div>
 
+<script type="text/javascript" src="/ux/plugins/gaga/gaga.paging.js?v=20210114"></script>
+
 <script th:inline="javascript">
 /*<![CDATA[*/
 var sessRoleCd 			= [[${sessionInfo.roleCd}]];
@@ -132,7 +151,7 @@ var columnDefs = [
 	{headerName: "브랜드",			field:"brandKnm",			width:100, cellClass: 'text-center'},
 	{headerName: "주문번호",			field:"ordNo",				width:100, cellClass: 'text-center'},
 	{headerName: "주문상세번호",		field:"ordDtlNo",			width:100, cellClass: 'text-center'},
-	{headerName: "주문변경번호",		field:"ordChgSq",			width:100, cellClass: 'text-center', hide: true},
+	{headerName: "주문변경번호",		field:"ordChgSq",			width:100, cellClass: 'text-center'},
 	{headerName: "변경구분",			field:"chgGbNm", 			width:100, cellClass: 'text-center'},
 	{headerName: "클레임상태",			field:"chgStatNm", 			width:100, cellClass: 'text-center'},
 	{headerName: "요청일시",			field:"regDt", 				width:150, cellClass: 'text-center'},
@@ -153,9 +172,6 @@ var columnDefs = [
 ];
 
 var gridOptions = gagaAgGrid.getGridOptions(columnDefs);
-gridOptions.suppressRowClickSelection 		= true;
-gridOptions.rowSelection 					= 'multiple';
-gridOptions.stopEditingWhenGridLosesFocus 	= true;
 
 // 초기화 클릭시
 $('#btnInit').on('click', function() {
@@ -212,31 +228,31 @@ $('#searchForm select[name=supplyCompCd]').on('change', function() {
 
 // 조회버튼
 $('#btnOrderSearch').on('click', function() {
+	// 페이징처리
+	$("#searchForm input[name=pageNo]").val('1');
 	fnSearch();
 });
 
 // 검색
-var fnSearch = function() {
+var fnSearch = function() {	
 	var formId 		= '#searchForm';
-	var ordNo 		= $('#searchForm input[name=ordNo]').val();
-	var stDate 		= $('#stDate').val();
-	var edDate 		= $('#edDate').val();
 	
-	if (gagajf.isNull(ordNo)) {
-		if (gagajf.isNull(stDate)) {
-			mcxDialog.alert('시작 기간을 입력하세요.');
-			return;
-		}
-
-		if (gagajf.isNull(edDate)) {
-			mcxDialog.alert('종료 기간을 입력하세요.');
-			return;
-		}
-	}
+	gagaPaging.init('searchForm', fnSearchCallBack, 'orderListPagination', $('#searchForm').find('#pageSize').val());
+	gagaPaging.load($("#searchForm input[name=pageNo]").val());
 	
 	gagaAgGrid.fetch($(formId).prop('action'), gridOptions, formId);
 }
 
+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());
+	
+	gridOptions.api.setRowData(result.orderSellerClaimList);
+	gagaPaging.createPagination(result.pageing.pageable);
+}
+
 //초기설정
 $(document).ready(function() {
 	// 달력기능 활성화

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

@@ -53,7 +53,7 @@
 					</colgroup>
 					<tr>
 						<th>업체/브랜드<em class="required" title="필수"></em></th>
-						<td colspan="5">
+						<td colspan="7">
 							<select name="supplyCompCd" id="supplyCompCd">
 								<option th:if="${supplyCompList}" th:each="oneData, status : ${supplyCompList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
 							</select>
@@ -130,7 +130,7 @@ var columnDefs = [
 	{headerName: "브랜드",			field:"brandKnm",			width:100, cellClass: 'text-center'},
 	{headerName: "주문번호",			field:"ordNo",				width:100, cellClass: 'text-center'},
 	{headerName: "주문상세번호",		field:"ordDtlNo",			width:100, cellClass: 'text-center'},
-	{headerName: "주문변경번호",		field:"ordChgSq",			width:100, cellClass: 'text-center', hide: true},
+	{headerName: "주문변경번호",		field:"ordChgSq",			width:100, cellClass: 'text-center'},
 	{headerName: "변경구분",			field:"chgGbNm", 			width:100, cellClass: 'text-center'},
 	{headerName: "클레임상태",			field:"chgStatNm", 			width:100, cellClass: 'text-center'},
 	{headerName: "요청일시",			field:"regDt", 				width:150, cellClass: 'text-center'},

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

@@ -53,7 +53,7 @@
 					</colgroup>
 					<tr>
 						<th>업체/브랜드<em class="required" title="필수"></em></th>
-						<td colspan="5">
+						<td colspan="7">
 							<select name="supplyCompCd" id="supplyCompCd">
 								<option th:if="${supplyCompList}" th:each="oneData, status : ${supplyCompList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
 							</select>
@@ -104,11 +104,13 @@
 		</div>
 		
 		<div class="panelStyle">
+			<!-- 
 			<ul class="panelBar">
 				<li class="aR">
 					<button type="button" id="btnSave" class="btn btn-success btn-lg">회수컨펌</button>
 				</li>
 			</ul>
+			 -->
 			
 			<div class="panelContent" style="overflow: hidden;">
 				<div id="gridList" style="width: 100%; height: 500px;" class="ag-theme-balham lh30"></div>
@@ -154,8 +156,8 @@ var columnDefs = [
 	{headerName: "업체상품코드",		field:"supplyGoodsCd",		width:100, cellClass: 'text-center'},
 	{headerName: "상품코드",			field:"goodsCd",			width:100, cellClass: 'text-center'},
 	{headerName: "상품명",			field:"goodsNm",			width:100, cellClass: 'text-center'},
-	{headerName: "옵션1",				field:"optCd1",				width:100, cellClass: 'text-center'},
-	{headerName: "옵션2",				field:"optCd2",				width:100, cellClass: 'text-center'},
+	{headerName: "옵션1",			field:"optCd1",				width:100, cellClass: 'text-center'},
+	{headerName: "옵션2",			field:"optCd2",				width:100, cellClass: 'text-center'},
 	{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'},