From 63e07e03d094ec795fe6e760363de1121a67b0bf Mon Sep 17 00:00:00 2001
From: leeheejin <imleesinok@gmail.com>
Date: Fri, 21 Nov 2025 16:01:35 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B2=80=EC=83=89=ED=95=84=ED=84=B0=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../view/contractMgmt/orderMgmtList.jsp       | 193 +++++++++---------
 .../salesmgmt/salesMgmt/revenueMgmtList.jsp   | 111 +++++-----
 .../salesmgmt/salesMgmt/salesMgmtList.jsp     | 117 +++++------
 src/com/pms/common/utils/CommonUtils.java     |  19 +-
 src/com/pms/common/utils/Constants.java       |   4 +-
 .../service/ContractMgmtService.java          |  96 ++++-----
 6 files changed, 256 insertions(+), 284 deletions(-)

diff --git a/WebContent/WEB-INF/view/contractMgmt/orderMgmtList.jsp b/WebContent/WEB-INF/view/contractMgmt/orderMgmtList.jsp
index d73b576..a036c25 100644
--- a/WebContent/WEB-INF/view/contractMgmt/orderMgmtList.jsp
+++ b/WebContent/WEB-INF/view/contractMgmt/orderMgmtList.jsp
@@ -691,111 +691,108 @@ function openProjectFormPopUp(objId){
 	                    <input type="button" value="결재상신"	 class="plm_btns" id="btnApproval">		                    
 	                </div>
 		            </div>
-		            <div id="plmSearchZon">
-		            <table>
+	            <div id="plmSearchZon">
+	            <table style="table-layout: auto !important;">
 		            	<tr>
-							<td><label for="category_cd">주문유형</label></td>
-	                        <td>
-	                             <select name="category_cd" id="category_cd" style="width:150px" class="select2" autocomplete="off">
-									<option value="">선택</option>
-									${code_map.category_cd}
-								</select>
-	                        </td>                        
-	                        
-							<td class="">
-								<label for="" class="">발주번호</label>
-							</td>
-							<td>
-								<input type="text" name="search_poNo" id="search_poNo" value="${param.search_poNo}"/>
-							</td>
-							
-							<td><label for="customer_objid">고객사</label></td>
-							<td>
-								<select name="customer_objid" id="customer_objid" style="width:190px" class="select2" autocomplete="off">
-									<option value="">선택</option>
-									${code_map.customer_cd}
-								</select>
-							</td>
-							
-							<%-- 
-							<td><label for="product">제품구분</label></td>
-							<td>
-								<select name="product" id="product" style="width:130px" class="select2" autocomplete="off">
-									<option value="">선택</option>
-									${code_map.product_cd}
-								</select>
-							</td>
-
-	                        <td><label for="area_cd">국내/해외</label></td>
-	                        <td>
-	                             <select name="area_cd" id="area_cd" style="" class="select2" autocomplete="off">
-									<option value="">선택</option>
-									<option value="0001220">국내</option>
-									<option value="0001221">해외</option>
-								</select>
-	                        </td>	                        
-							
-							<td><label for="paid_type">유/무상</label></td>
-	                        <td>
-	                             <select name="paid_type" id="paid_type" style="width:130px" class="select2" autocomplete="off">
-									<option value="">선택</option>
-									<option value="paid">유상</option>
-									<option value="free">무상</option>
-								</select>
-	                        </td>
-							--%>
-
-						<td class="align_r">
-							<label for="" class="">품번</label>
+						<td class="label"><label for="category_cd">주문유형</label></td>
+                        <td>
+                             <select name="category_cd" id="category_cd" style="width:150px" class="select2" autocomplete="off">
+								<option value="">선택</option>
+								${code_map.category_cd}
+							</select>
+                        </td>                        
+                        
+						<td class="label">
+							<label for="" class="">발주번호</label>
 						</td>
 						<td>
-							<select name="search_partNo" id="search_partNo" class="select2-part" style="width: 100%;">
-								<option value="">품번 선택</option>
-							</select>
-							<input type="hidden" name="search_partObjId" id="search_partObjId" value=""/>
+							<input type="text" name="search_poNo" id="search_poNo" value="${param.search_poNo}"/>
 						</td>
-						<td class="align_r">
-							<label for="" class="">품명</label>
-						</td>
-						<td>
-							<select name="search_partName" id="search_partName" class="select2-part" style="width: 100%;">
-								<option value="">품명 선택</option>
-							</select>
-						</td>
-						</tr>
 						
-						<tr>
-							<td class="">
-								<label for="" class="">S/N</label>
-							</td>
-							<td>
-								<input type="text" name="search_serialNo" id="search_serialNo" value="${param.search_serialNo}"/>
-							</td>
+					<td class="label"><label for="customer_objid">고객사</label></td>
+						<td>
+							<select name="customer_objid" id="customer_objid" style="width:150px" class="select2" autocomplete="off">
+								<option value="">선택</option>
+								${code_map.customer_cd}
+							</select>
+						</td>
+						
+						<%-- 
+						<td><label for="product">제품구분</label></td>
+						<td>
+							<select name="product" id="product" style="width:130px" class="select2" autocomplete="off">
+								<option value="">선택</option>
+								${code_map.product_cd}
+							</select>
+						</td>
 
-							<td><label for="contract_result">수주상태</label></td> 
-							<td>
-								<select name="contract_result" id="contract_result" style="width:130px" class="select2" autocomplete="off">
-									<option value="">선택</option>
-									${code_map.result_cd}
-								</select>
-							</td>
+                        <td><label for="area_cd">국내/해외</label></td>
+                        <td>
+                             <select name="area_cd" id="area_cd" style="" class="select2" autocomplete="off">
+								<option value="">선택</option>
+								<option value="0001220">국내</option>
+								<option value="0001221">해외</option>
+							</select>
+                        </td>	                        
+						
+						<td><label for="paid_type">유/무상</label></td>
+                        <td>
+                             <select name="paid_type" id="paid_type" style="width:130px" class="select2" autocomplete="off">
+								<option value="">선택</option>
+								<option value="paid">유상</option>
+								<option value="free">무상</option>
+							</select>
+                        </td>
+						--%>
 
-							<td class="">
-								<label>발주일</label>
-							</td>
-							<td colspan="3">
-								<input type="text" name="order_start_date" id="order_start_date" style="width:90px;" autocomplete="off" value="${param.order_start_date}" class="date_icon">~
-								<input type="text" name="order_end_date" id="order_end_date" style="width:90px;" autocomplete="off" value="${param.order_end_date}" class="date_icon">
-							</td>
-
-							<td class="">
-								<label>요청납기</label>
-							</td>
-							<td colspan="3">
-								<input type="text" name="due_start_date" id="due_start_date" style="width:90px;" autocomplete="off" value="${param.due_start_date}" class="date_icon">~
-								<input type="text" name="due_end_date" id="due_end_date" style="width:90px;" autocomplete="off" value="${param.due_end_date}" class="date_icon">
-								</td>
-							</tr>
+					<td class="align_r label">
+						<label for="" class="">품번</label>
+					</td>
+					<td>
+						<select name="search_partNo" id="search_partNo" class="select2-part" style="width: 100%;">
+							<option value="">품번 선택</option>
+						</select>
+						<input type="hidden" name="search_partObjId" id="search_partObjId" value=""/>
+					</td>
+					<td class="align_r label">
+						<label for="" class="">품명</label>
+					</td>
+					<td>
+						<select name="search_partName" id="search_partName" class="select2-part" style="width: 100%;">
+							<option value="">품명 선택</option>
+						</select>
+					</td>
+					<td class="label">
+						<label for="" class="">S/N</label>
+					</td>
+					<td>
+						<input type="text" name="search_serialNo" id="search_serialNo" value="${param.search_serialNo}"/>
+					</td>
+					<td class="label"><label for="contract_result">수주상태</label></td>
+					<td>
+						<select name="contract_result" id="contract_result" style="width:130px" class="select2" autocomplete="off">
+							<option value="">선택</option>
+							${code_map.result_cd}
+						</select>
+					</td>
+					</tr>
+					
+				<tr>
+					<td class="label">
+						<label>발주일</label>
+					</td>
+					<td colspan="3" style="width: auto;">
+						<input type="text" name="order_start_date" id="order_start_date" autocomplete="off" value="${param.order_start_date}" class="date_icon"> ~ 
+						<input type="text" name="order_end_date" id="order_end_date" autocomplete="off" value="${param.order_end_date}" class="date_icon">
+					</td>
+					<td class="label">
+						<label>요청납기</label>
+					</td>
+					<td colspan="3" style="width: auto;">
+						<input type="text" name="due_start_date" id="due_start_date" autocomplete="off" value="${param.due_start_date}" class="date_icon"> ~ 
+						<input type="text" name="due_end_date" id="due_end_date" autocomplete="off" value="${param.due_end_date}" class="date_icon">
+					</td>
+				</tr>
 		            </table>
 		        </div>
 		        
diff --git a/WebContent/WEB-INF/view/salesmgmt/salesMgmt/revenueMgmtList.jsp b/WebContent/WEB-INF/view/salesmgmt/salesMgmt/revenueMgmtList.jsp
index 296be13..df2690e 100644
--- a/WebContent/WEB-INF/view/salesmgmt/salesMgmt/revenueMgmtList.jsp
+++ b/WebContent/WEB-INF/view/salesmgmt/salesMgmt/revenueMgmtList.jsp
@@ -545,69 +545,66 @@ function fn_calculateTotalKRW() {
 						<input type="button" value="매출마감" class="plm_btns" id="btnDeadline">
 					</div>
 				</div>
-				<div id="plmSearchZon">
-					<table>
-						<!-- 요청된 검색필터: 주문유형, 발주번호, 고객사, 제품구분, 품번, 품명, 국내/해외, S/N, 매출마감(기간), 발주일(기간), 출고일(기간) -->
-					<tr>
-						<td class="label"><label for="">주문유형</label></td>
-						<td><select name="orderType" class="select2" style="width:150px;"><option value="">전체</option>${codeMap.orderTypeList}</select></td>
-						
-						<td class="label"><label for="">발주번호</label></td>
-						<td><input type="text" name="poNo" /></td>
-						
-						<td><label for="customer_objid">고객사</label></td>
-						<td>
-							<select name="customer_objid" id="customer_objid" style="width:150px" class="select2" autocomplete="off">
-								<option value="">선택</option>
-								${codeMap.customer_cd}
-							</select>
-						</td>
+			<div id="plmSearchZon">
+				<table style="table-layout: auto !important;">
+					<!-- 1줄: 주문유형, 발주번호, 고객사, 제품구분, 품번, 품명, 국내/해외, S/N -->
+				<tr>
+					<td class="label"><label for="">주문유형</label></td>
+					<td><select name="orderType" class="select2" style="width:150px;"><option value="">전체</option>${codeMap.orderTypeList}</select></td>
+					
+					<td class="label"><label for="">발주번호</label></td>
+					<td><input type="text" name="poNo" /></td>
+					
+					<td class="label"><label for="customer_objid">고객사</label></td>
+					<td>
+						<select name="customer_objid" id="customer_objid" style="width:150px" class="select2" autocomplete="off">
+							<option value="">선택</option>
+							${codeMap.customer_cd}
+						</select>
+					</td>
 
-						<td class="label"><label for="">제품구분</label></td>
-						<td><select name="productType" class="select2" style="width:120px;"><option value="">전체</option>${codeMap.productTypeList}</select></td>
+					<td class="label"><label for="">제품구분</label></td>
+					<td><select name="productType" class="select2" style="width:120px;"><option value="">전체</option>${codeMap.productTypeList}</select></td>
 
-						<td class="align_r">
-							<label for="" class="">품번</label>
-						</td>
-						<td>
-							<select name="search_partNo" id="search_partNo" class="select2-part" style="width: 100%;">
-								<option value="">품번 선택</option>
-							</select>
-							<input type="hidden" name="search_partObjId" id="search_partObjId" value=""/>
-						</td>
-						<td class="align_r">
-							<label for="" class="">품명</label>
-						</td>
-						<td colspan="3">
-							<select name="search_partName" id="search_partName" class="select2-part" style="width: 100%;">
-								<option value="">품명 선택</option>
-							</select>
-						</td>
-					</tr>
+					<td class="align_r label">
+						<label for="" class="">품번</label>
+					</td>
+					<td>
+						<select name="search_partNo" id="search_partNo" class="select2-part" style="width: 100%;">
+							<option value="">품번 선택</option>
+						</select>
+						<input type="hidden" name="search_partObjId" id="search_partObjId" value=""/>
+					</td>
+					<td class="align_r label">
+						<label for="" class="">품명</label>
+					</td>
+					<td>
+						<select name="search_partName" id="search_partName" class="select2-part" style="width: 100%;">
+							<option value="">품명 선택</option>
+						</select>
+					</td>
+					<td class="label"><label for="">국내/해외</label></td>
+					<td>
+						<select name="nation" class="select2" style="width:150px;">
+							<option value="">전체</option>
+							${codeMap.nationList}
+						</select>
+					</td>
+					<td class="label"><label for="">S/N</label></td>
+					<td><input type="text" name="serialNo" /></td>
+				</tr>
 
-					<tr>
-						<td class="label"><label for="">국내/해외</label></td>
-						<td>
-							<select name="nation" class="select2" style="width:150px;">
-								<option value="">전체</option>
-								${codeMap.nationList}
-							</select>
-						</td>
-						
-						<td class="label"><label for="">S/N</label></td>
-						<td><input type="text" name="serialNo" /></td>
+				<!-- 2줄: 매출마감, 발주일, 출하일 -->
+				<tr>
+					<td class="label"><label for="">매출마감</label></td>
+					<td colspan="3" style="width: auto;"><input type="text" name="salesDeadlineFrom" class="date_icon" placeholder="시작일"/> ~ <input type="text" name="salesDeadlineTo" class="date_icon" placeholder="종료일"/></td>
 
-						<td class="label"><label for="">매출마감</label></td>
-						<td colspan="3"><input type="text" name="salesDeadlineFrom" class="date_icon" placeholder="시작일"/> ~ <input type="text" name="salesDeadlineTo" class="date_icon" placeholder="종료일"/></td>
+					<td class="label"><label for="">발주일</label></td>
+					<td colspan="3" style="width: auto;"><input type="text" name="orderDateFrom" class="date_icon"/> ~ <input type="text" name="orderDateTo" class="date_icon"/></td>
 
-						<td class="label"><label for="">발주일</label></td>
-						<td colspan="3"><input type="text" name="orderDateFrom" class="date_icon"/> ~ <input type="text" name="orderDateTo" class="date_icon"/></td>
-					</tr>
-
-       				<tr>
 					<td class="label"><label for="">출하일</label></td>
-					<td colspan="11"><input type="text" name="shippingDateFrom" class="date_icon"/> ~ <input type="text" name="shippingDateTo" class="date_icon"/></td>
-					</tr>
+					<td colspan="3" style="width: auto;"><input type="text" name="shippingDateFrom" class="date_icon"/> ~ <input type="text" name="shippingDateTo" class="date_icon"/></td>
+				</tr>
 					
 					<!-- 주석처리된 필터들 (필요없는 항목) -->
 					<!--
diff --git a/WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesMgmtList.jsp b/WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesMgmtList.jsp
index f4c5be7..a0bf970 100644
--- a/WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesMgmtList.jsp
+++ b/WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesMgmtList.jsp
@@ -607,6 +607,11 @@ function fn_bulkRegister(){
 	fn_openSaleRegPopupWithData(selectedRow);
 }
 </script>
+<style>
+body {
+	overflow-x: hidden !important;
+}
+</style>
 </head>
 <body>
 <form name="form1" id="form1" method="post">
@@ -624,77 +629,49 @@ function fn_bulkRegister(){
 						<input type="button" value="출하지시/판매등록" class="plm_btns" id="btnBulkRegister" style="background-color: #4CAF50; color: white;">
 					</div>
 				</div>
-				<div id="plmSearchZon">
-					<table>
-						
-					<tr>
-						<td class="label"><label for="">주문유형</label></td>
-						<td><select name="orderType" class="select2" style="width:150px;"><option value="">전체</option>${codeMap.orderTypeList}</select></td>
-						
-						<td class="label"><label for="">발주번호</label></td>
-						<td><input type="text" name="poNo" /></td>
-						
-						<td><label for="customer_objid">고객사</label></td>
-						<td>
-							<select name="customer_objid" id="customer_objid" style="width:150px" class="select2" autocomplete="off">
-								<option value="">선택</option>
-								${codeMap.customer_cd}
-							</select>
-						</td>
+			<div id="plmSearchZon">
+				<table style="table-layout: auto !important;">
+					
+				<tr>
+					<td class="label"><label for="">주문유형</label></td>
+					<td><select name="orderType" class="select2" style="width:150px;"><option value="">전체</option>${codeMap.orderTypeList}</select></td>
+					<td class="label"><label for="">발주번호</label></td>
+					<td><input type="text" name="poNo" /></td>
+					<td><label for="customer_objid">고객사</label></td>
+					<td>
+						<select name="customer_objid" id="customer_objid" style="width:150px" class="select2" autocomplete="off">
+							<option value="">선택</option>
+							${codeMap.customer_cd}
+						</select>
+					</td>
+					<td class="align_r">
+						<label for="" class="">품번</label>
+					</td>
+					<td>
+						<select name="search_partNo" id="search_partNo" class="select2-part" style="width: 100%;">
+							<option value="">품번 선택</option>
+						</select>
+						<input type="hidden" name="search_partObjId" id="search_partObjId" value=""/>
+					</td>
+					<td class="align_r">
+						<label for="" class="">품명</label>
+					</td>
+					<td>
+						<select name="search_partName" id="search_partName" class="select2-part" style="width: 100%;">
+							<option value="">품명 선택</option>
+						</select>
+					</td>
+					<td class="label"><label for="">S/N</label></td>
+					<td><input type="text" name="serialNo" /></td>
+					<td class="label"><label for="">출하지시상태</label></td>
+					<td><select name="shippingStatus" class="select2" style="width:150px;"><option value="">전체</option>${codeMap.shippingStatusList}</select></td>
+				</tr>
 
-						<%-- 
-						<td class="label"><label for="">제품구분</label></td>
-						<td><select name="productType" class="select2" style="width:120px;"><option value="">전체</option>${codeMap.productTypeList}</select></td>
-						
-						<td class="label"><label for="">국내/해외</label></td>
-						<td>
-							<select name="nation" class="select2" style="width:150px;">
-								<option value="">선택</option>
-								${codeMap.nationList}
-							</select>
-						</td>
-
-						<td class="label"><label for="">유/무상</label></td>
-						<td>
-							<select name="paymentType" class="select2" style="width:120px;">
-								<option value="">전체</option>
-								<option value="N">유상</option>
-								<option value="Y">무상</option>
-							</select>
-						</td>
-						--%>
-
-						<td class="align_r">
-							<label for="" class="">품번</label>
-						</td>
-						<td>
-							<select name="search_partNo" id="search_partNo" class="select2-part" style="width: 100%;">
-								<option value="">품번 선택</option>
-							</select>
-							<input type="hidden" name="search_partObjId" id="search_partObjId" value=""/>
-						</td>
-						<td class="align_r">
-							<label for="" class="">품명</label>
-						</td>
-						<td>
-							<select name="search_partName" id="search_partName" class="select2-part" style="width: 100%;">
-								<option value="">품명 선택</option>
-							</select>
-						</td>
-					</tr>
-
-					<tr>						
-						<td class="label"><label for="">S/N</label></td>
-						<td><input type="text" name="serialNo" /></td>
-
-						<td class="label"><label for="">출하지시상태</label></td>
-						<td><select name="shippingStatus" class="select2" style="width:150px;"><option value="">전체</option>${codeMap.shippingStatusList}</select></td>
-						
-						<td class="label"><label for="">발주일</label></td>
-						<td colspan="3"><input type="text" name="orderDateFrom" class="date_icon"/> ~ <input type="text" name="orderDateTo" class="date_icon"/></td>
-
-					<td class="label"><label for="">출하일</label></td>
-					<td colspan="3"><input type="text" name="shippingDateFrom" class="date_icon"/> ~ <input type="text" name="shippingDateTo" class="date_icon"/></td>
+			<tr>
+				<td class="label"><label for="">발주일</label></td>
+				<td colspan="3" style="width: auto;"><input type="text" name="orderDateFrom" class="date_icon"/> ~ <input type="text" name="orderDateTo" class="date_icon"/></td>
+				<td class="label"><label for="">출하일</label></td>
+				<td colspan="3" style="width: auto;"><input type="text" name="shippingDateFrom" class="date_icon"/> ~ <input type="text" name="shippingDateTo" class="date_icon"/></td>
 
 						<%-- 
 						<td class="label"><label for="">수주상태</label></td>
diff --git a/src/com/pms/common/utils/CommonUtils.java b/src/com/pms/common/utils/CommonUtils.java
index a79bd30..c2726c2 100644
--- a/src/com/pms/common/utils/CommonUtils.java
+++ b/src/com/pms/common/utils/CommonUtils.java
@@ -1449,15 +1449,16 @@ public class CommonUtils {
 			sb2.append("	<div class=\"table_Status\">");
 			sb2.append("	<b id=\"bTableStatus\">"+numberFormat(totalCount)+"</b> 건</div>");
 			
-			sb2.append("<select id=\"countPerPage\" name=\"countPerPage\" class=\"selectType02 listCount\" style='width:' onchange=\"javascript:fnc_goPage(1);\">");
-			sb2.append("	<option value=\"10\" "+ ("10".equals(countPerPage+"")?"selected ":"") +">10</option>");
-			sb2.append("	<option value=\"20\" "+ ("20".equals(countPerPage+"")?"selected ":"") +">20</option>");
-			sb2.append("	<option value=\"30\" "+ ("30".equals(countPerPage+"")?"selected ":"") +">30</option>");
-			sb2.append("	<option value=\"50\" "+ ("50".equals(countPerPage+"")?"selected ":"") +">50</option>");
-			sb2.append("	<option value=\"100\" "+ ("100".equals(countPerPage+"")?"selected ":"") +">100</option>");
-			sb2.append("	<option value=\"150\" "+ ("150".equals(countPerPage+"")?"selected ":"") +">150</option>");
-			sb2.append("	<option value=\"200\" "+ ("200".equals(countPerPage+"")?"selected ":"") +">200</option>");
-			sb2.append("	<option value=\"1000\" "+ ("1000".equals(countPerPage+"")?"selected ":"") +">1000</option>");
+		sb2.append("<select id=\"countPerPage\" name=\"countPerPage\" class=\"selectType02 listCount\" style='width:' onchange=\"javascript:fnc_goPage(1);\">");
+		sb2.append("	<option value=\"10\" "+ ("10".equals(countPerPage+"")?"selected ":"") +">10</option>");
+		sb2.append("	<option value=\"20\" "+ ("20".equals(countPerPage+"")?"selected ":"") +">20</option>");
+		sb2.append("	<option value=\"25\" "+ ("25".equals(countPerPage+"")?"selected ":"") +">25</option>");
+		sb2.append("	<option value=\"30\" "+ ("30".equals(countPerPage+"")?"selected ":"") +">30</option>");
+		sb2.append("	<option value=\"50\" "+ ("50".equals(countPerPage+"")?"selected ":"") +">50</option>");
+		sb2.append("	<option value=\"100\" "+ ("100".equals(countPerPage+"")?"selected ":"") +">100</option>");
+		sb2.append("	<option value=\"150\" "+ ("150".equals(countPerPage+"")?"selected ":"") +">150</option>");
+		sb2.append("	<option value=\"200\" "+ ("200".equals(countPerPage+"")?"selected ":"") +">200</option>");
+		sb2.append("	<option value=\"1000\" "+ ("1000".equals(countPerPage+"")?"selected ":"") +">1000</option>");
 			//sb2.append("	<option value=\"50\">50</option>");
 			sb2.append("</select>");
 			sb2.append("	</div>");
diff --git a/src/com/pms/common/utils/Constants.java b/src/com/pms/common/utils/Constants.java
index 1344908..cda5722 100644
--- a/src/com/pms/common/utils/Constants.java
+++ b/src/com/pms/common/utils/Constants.java
@@ -50,13 +50,13 @@ public class Constants {
 	public static final String MASTER_PWD = "qlalfqjsgh11";
 	
 	// PaginationInfo
-	public static final int COUNT_PER_PAGE = 20;
+	public static final int COUNT_PER_PAGE = 25;
 	public static final int PAGE_SIZE = 10;
 	/*리스트 개수관리 
 	 *   230330 페이징에서 전체조회로 변경 20 -> 999999999
 	 *   230804 페이징 원복
 	 **/
-	public static final int ADMIN_COUNT_PER_PAGE = 20;
+	public static final int ADMIN_COUNT_PER_PAGE = 25;
 	//public static final int ADMIN_COUNT_PER_PAGE = 999999999;
 	public static final int EO_COUNT_PER_PAGE = 7;
 	public static final int MAIN_VIEW_COUNT = 5;
diff --git a/src/com/pms/salesmgmt/service/ContractMgmtService.java b/src/com/pms/salesmgmt/service/ContractMgmtService.java
index d86195b..0ccb559 100644
--- a/src/com/pms/salesmgmt/service/ContractMgmtService.java
+++ b/src/com/pms/salesmgmt/service/ContractMgmtService.java
@@ -89,14 +89,14 @@ public class ContractMgmtService {
 		try {
 			sqlSession = SqlMapConfig.getInstance().getSqlSession();
 			
-			String countPerPage = CommonUtils.checkNull(request.getParameter("countPerPage"), Constants.ADMIN_COUNT_PER_PAGE+"");
-			paramMap.put("COUNT_PER_PAGE", Integer.parseInt(countPerPage));
-			
-			Map pageMap = (HashMap) sqlSession.selectOne("contractMgmt.getContractMgmtListCnt", paramMap);
-			pageMap = (HashMap) CommonUtils.setPagingInfo(request, pageMap);
-			
-			paramMap.put("PAGE_END", CommonUtils.checkNull(pageMap.get("PAGE_END")));
-			paramMap.put("PAGE_START", CommonUtils.checkNull(pageMap.get("PAGE_START")));
+		String countPerPage = CommonUtils.checkNull(request.getParameter("countPerPage"), Constants.ADMIN_COUNT_PER_PAGE+"");
+		paramMap.put("COUNT_PER_PAGE", Integer.parseInt(countPerPage));
+		
+		Map pageMap = (HashMap) sqlSession.selectOne("contractMgmt.getContractMgmtListCnt", paramMap);
+		pageMap = (HashMap) CommonUtils.setPagingInfo(request, pageMap, countPerPage);
+		
+		paramMap.put("PAGE_END", CommonUtils.checkNull(pageMap.get("PAGE_END")));
+		paramMap.put("PAGE_START", CommonUtils.checkNull(pageMap.get("PAGE_START")));
 			
 			resultList = (ArrayList) sqlSession.selectList("contractMgmt.getContractMgmtList", paramMap);	
 		} catch(Exception e) {
@@ -352,18 +352,18 @@ public class ContractMgmtService {
 		try{
 			sqlSession = SqlMapConfig.getInstance().getSqlSession();
 			
-			String countPerPage = CommonUtils.checkNull(request.getParameter("countPerPage"), Constants.ADMIN_COUNT_PER_PAGE+"");
-			paramMap.put("COUNT_PER_PAGE", Integer.parseInt(countPerPage));
-			
-			Map pageMap = (HashMap)sqlSession.selectOne("contractMgmt.contractListCnt", paramMap);
-			
-			
-			pageMap = (HashMap)CommonUtils.setPagingInfo(request, pageMap);
-			
-			paramMap.put("PAGE_END", pageMap.get("PAGE_END"));
-			paramMap.put("PAGE_START", pageMap.get("PAGE_START"));
-			
-			resultList = CommonUtils.keyChangeUpperList((ArrayList)sqlSession.selectList("contractMgmt.contractList", paramMap));
+		String countPerPage = CommonUtils.checkNull(request.getParameter("countPerPage"), Constants.ADMIN_COUNT_PER_PAGE+"");
+		paramMap.put("COUNT_PER_PAGE", Integer.parseInt(countPerPage));
+		
+		Map pageMap = (HashMap)sqlSession.selectOne("contractMgmt.contractListCnt", paramMap);
+		
+		
+		pageMap = (HashMap)CommonUtils.setPagingInfo(request, pageMap, countPerPage);
+		
+		paramMap.put("PAGE_END", pageMap.get("PAGE_END"));
+		paramMap.put("PAGE_START", pageMap.get("PAGE_START"));
+		
+		resultList = CommonUtils.keyChangeUpperList((ArrayList)sqlSession.selectList("contractMgmt.contractList", paramMap));
 			
 		}catch(Exception e){
 			e.printStackTrace();
@@ -419,16 +419,16 @@ public class ContractMgmtService {
 		try{
 			sqlSession = SqlMapConfig.getInstance().getSqlSession();
 			
-			String countPerPage = CommonUtils.checkNull(request.getParameter("countPerPage"), Constants.ADMIN_COUNT_PER_PAGE+"");
-			paramMap.put("COUNT_PER_PAGE", Integer.parseInt(countPerPage));
-			
-			Map pageMap = (HashMap)sqlSession.selectOne("contractMgmt.estimateListCnt", paramMap);
-			
-			
-			pageMap = (HashMap)CommonUtils.setPagingInfo(request, pageMap);
-			
-			paramMap.put("PAGE_END", pageMap.get("PAGE_END"));
-			paramMap.put("PAGE_START", pageMap.get("PAGE_START"));
+		String countPerPage = CommonUtils.checkNull(request.getParameter("countPerPage"), Constants.ADMIN_COUNT_PER_PAGE+"");
+		paramMap.put("COUNT_PER_PAGE", Integer.parseInt(countPerPage));
+		
+		Map pageMap = (HashMap)sqlSession.selectOne("contractMgmt.estimateListCnt", paramMap);
+		
+		
+		pageMap = (HashMap)CommonUtils.setPagingInfo(request, pageMap, countPerPage);
+		
+		paramMap.put("PAGE_END", pageMap.get("PAGE_END"));
+		paramMap.put("PAGE_START", pageMap.get("PAGE_START"));
 			
 			resultList = CommonUtils.keyChangeUpperList((ArrayList)sqlSession.selectList("contractMgmt.estimateList", paramMap));
 			
@@ -726,14 +726,14 @@ public class ContractMgmtService {
 		SqlSession sqlSession = SqlMapConfig.getInstance().getSqlSession();
 		try{
 			
-			String countPerPage = CommonUtils.checkNull(request.getParameter("countPerPage"), Constants.ADMIN_COUNT_PER_PAGE+"");
-			paramMap.put("COUNT_PER_PAGE", Integer.parseInt(countPerPage));
-			Map pageMap = (HashMap)sqlSession.selectOne("contractMgmt.getSUPPLYInfoListCnt", paramMap);
-			
-			pageMap = (HashMap)CommonUtils.setPagingInfo(request, pageMap);
-			
-			paramMap.put("PAGE_END", pageMap.get("PAGE_END"));
-			paramMap.put("PAGE_START", pageMap.get("PAGE_START"));
+		String countPerPage = CommonUtils.checkNull(request.getParameter("countPerPage"), Constants.ADMIN_COUNT_PER_PAGE+"");
+		paramMap.put("COUNT_PER_PAGE", Integer.parseInt(countPerPage));
+		Map pageMap = (HashMap)sqlSession.selectOne("contractMgmt.getSUPPLYInfoListCnt", paramMap);
+		
+		pageMap = (HashMap)CommonUtils.setPagingInfo(request, pageMap, countPerPage);
+		
+		paramMap.put("PAGE_END", pageMap.get("PAGE_END"));
+		paramMap.put("PAGE_START", pageMap.get("PAGE_START"));
 			
 			oemInfoList = (ArrayList)sqlSession.selectList("contractMgmt.getSUPPLYInfoList", paramMap);
 			
@@ -943,16 +943,16 @@ public class ContractMgmtService {
 		try{
 			sqlSession = SqlMapConfig.getInstance().getSqlSession();
 			
-			String countPerPage = CommonUtils.checkNull(request.getParameter("countPerPage"), Constants.ADMIN_COUNT_PER_PAGE+"");
-			paramMap.put("COUNT_PER_PAGE", Integer.parseInt(countPerPage));
-			
-			Map pageMap = (HashMap)sqlSession.selectOne("contractMgmt.counselingListCnt", paramMap);
-			
-			
-			pageMap = (HashMap)CommonUtils.setPagingInfo(request, pageMap);
-			
-			paramMap.put("PAGE_END", pageMap.get("PAGE_END"));
-			paramMap.put("PAGE_START", pageMap.get("PAGE_START"));
+		String countPerPage = CommonUtils.checkNull(request.getParameter("countPerPage"), Constants.ADMIN_COUNT_PER_PAGE+"");
+		paramMap.put("COUNT_PER_PAGE", Integer.parseInt(countPerPage));
+		
+		Map pageMap = (HashMap)sqlSession.selectOne("contractMgmt.counselingListCnt", paramMap);
+		
+		
+		pageMap = (HashMap)CommonUtils.setPagingInfo(request, pageMap, countPerPage);
+		
+		paramMap.put("PAGE_END", pageMap.get("PAGE_END"));
+		paramMap.put("PAGE_START", pageMap.get("PAGE_START"));
 			
 			resultList = CommonUtils.keyChangeUpperList((ArrayList)sqlSession.selectList("contractMgmt.counselingList", paramMap));