From 3d555f45444f4fc040b1ed1d2b0c7f3d1e54b01c Mon Sep 17 00:00:00 2001
From: hjjeong <hjjeong@wace.me>
Date: Wed, 28 Jan 2026 15:30:28 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B5=AC=EB=A7=A4=EA=B4=80=EB=A6=AC=20?=
 =?UTF-8?q?=EA=B2=80=EC=83=89=EC=A1=B0=EA=B1=B4=20=EC=B6=94=EA=B0=80,=20?=
 =?UTF-8?q?=EC=BB=AC=EB=9F=BC=20=EC=B6=94=EA=B0=80=20=EB=93=B1...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deliveryMngAcceptanceList.jsp             | 22 +++++--
 .../purchaseOrder/purchaseOrderList_new.jsp   | 32 +++++++---
 .../WEB-INF/view/salesMng/proposalMngList.jsp | 57 ++++++++++++++----
 .../view/salesMng/salesRequestMngRegList.jsp  | 40 +++++++++++--
 .../controller/PurchaseOrderController.java   |  4 ++
 src/com/pms/mapper/purchaseOrder.xml          | 32 +++++++++-
 src/com/pms/mapper/salesMng.xml               | 58 +++++++++++++++++++
 .../controller/SalesMngController.java        | 21 +++++--
 8 files changed, 230 insertions(+), 36 deletions(-)

diff --git a/WebContent/WEB-INF/view/purchaseOrder/deliveryMngAcceptanceList.jsp b/WebContent/WEB-INF/view/purchaseOrder/deliveryMngAcceptanceList.jsp
index 491d89b..2d5b58a 100644
--- a/WebContent/WEB-INF/view/purchaseOrder/deliveryMngAcceptanceList.jsp
+++ b/WebContent/WEB-INF/view/purchaseOrder/deliveryMngAcceptanceList.jsp
@@ -89,17 +89,17 @@ $(document).ready(function(){
 var columns = [
 				// 요구사항: 품의서 No, 발주서 No, 프로젝트번호, 품번, 품명, 공급업체, 발주수량, 입고수량, 미입고수량, 검사성적서, 입고결과
 				{title:'STATUS'					,field:'STATUS'					,visible:false, frozen:true},
-				{title:'TOTAL_SUPPLY_PRICE'		,field:'TOTAL_SUPPLY_PRICE'		,visible:false, frozen:true},
-				{title:'TOTAL_DELIVERY_PRICE'	,field:'TOTAL_DELIVERY_PRICE'	,visible:false, frozen:true},
-				{title:'TOTAL_NOT_DELIVERY_PRICE',field:'TOTAL_NOT_DELIVERY_PRICE',visible:false, frozen:true},
+				//{title:'TOTAL_SUPPLY_PRICE'		,field:'TOTAL_SUPPLY_PRICE'		,visible:false, frozen:true},
+				//{title:'TOTAL_DELIVERY_PRICE'	,field:'TOTAL_DELIVERY_PRICE'	,visible:false, frozen:true},
+				//{title:'TOTAL_NOT_DELIVERY_PRICE',field:'TOTAL_NOT_DELIVERY_PRICE',visible:false, frozen:true},
 				{title:'FORM_TYPE'				,field:'FORM_TYPE'				,visible:false, frozen:true},
-				{headerHozAlign : 'center', hozAlign : 'center',	minWidth : 130,	widthGrow : 1,	title : '품의서 No',		field : 'PROPOSAL_NO',
+				{headerHozAlign : 'center', hozAlign : 'center',	minWidth : 120,	widthGrow : 1,	title : '품의서 No',		field : 'PROPOSAL_NO',
 					formatter: fnc_createGridAnchorTag, 
 					cellClick : function(e, cell) {
 						fn_openProposalFormPopUp(cell.getData().SALES_REQUEST_OBJID);
 					} 
 				},
-   				{headerHozAlign : 'center', hozAlign : 'center',	minWidth : 130,	widthGrow : 1,	title : '발주서 No',		field : 'PURCHASE_ORDER_NO',	
+   				{headerHozAlign : 'center', hozAlign : 'center',	minWidth : 120,	widthGrow : 1,	title : '발주서 No',		field : 'PURCHASE_ORDER_NO',	
 					formatter:fnc_createGridAnchorTag,
 					cellClick:function(e, cell){							
 						var objId = fnc_checkNull(cell.getData().OBJID);
@@ -107,10 +107,11 @@ var columns = [
 						fn_formPopUp(objId, formType);
 					}
 				},
-				{headerHozAlign : 'center', hozAlign : 'center',	minWidth : 140,	widthGrow : 1,	title : '프로젝트번호',		field : 'PROJECT_NO'},
+				{headerHozAlign : 'center', hozAlign : 'center',	minWidth : 130,	widthGrow : 1,	title : '프로젝트번호',		field : 'PROJECT_NO'},
 				{headerHozAlign : 'center', hozAlign : 'left',		minWidth : 140,	widthGrow : 2,	title : '품번',			field : 'PART_NO'	}, 
 				{headerHozAlign : 'center', hozAlign : 'left',		minWidth : 180,	widthGrow : 3,	title : '품명',			field : 'PART_NAME'	}, 
 				{headerHozAlign : 'center', hozAlign : 'left',		minWidth : 150,	widthGrow : 2,	title : '공급업체',		field : 'PARTNER_NAME'	}, 
+				{headerHozAlign : 'center', hozAlign : 'center',		minWidth : 90,	widthGrow : 1,	title : '구매담당자',	field : 'WRITER_NAME'	}, 
 				{headerHozAlign : 'center', hozAlign : 'right',		minWidth : 90,	widthGrow : 1,	title : '발주수량',		field : 'TOTAL_PO_QTY',
 					formatter:"money", formatterParams:{thousand:",", symbolAfter:"p", precision:false	}	
 				},
@@ -120,6 +121,15 @@ var columns = [
 				{headerHozAlign : 'center', hozAlign : 'right',		minWidth : 90,	widthGrow : 1,	title : '미입고수량',		field : 'NON_DELIVERY_QTY',
 					formatter:"money", formatterParams:{thousand:",", symbolAfter:"p", precision:false	}	
 				},
+				{headerHozAlign : 'center', hozAlign : 'right',		minWidth : 90,	widthGrow : 1,	title : '발주금액',		field : 'TOTAL_SUPPLY_PRICE',
+					formatter:"money", formatterParams:{thousand:",", symbolAfter:"p", precision:false	}	
+				},
+				{headerHozAlign : 'center', hozAlign : 'right',		minWidth : 90,	widthGrow : 1,	title : '입고금액',		field : 'TOTAL_DELIVERY_PRICE',
+					formatter:"money", formatterParams:{thousand:",", symbolAfter:"p", precision:false	}	
+				},
+				{headerHozAlign : 'center', hozAlign : 'right',		minWidth : 90,	widthGrow : 1,	title : '미입고금액',		field : 'TOTAL_NOT_DELIVERY_PRICE',
+					formatter:"money", formatterParams:{thousand:",", symbolAfter:"p", precision:false	}	
+				},
 				{headerHozAlign : 'center', hozAlign : 'center',	minWidth : 100,	widthGrow : 1,	title : '업체성적서',		field : 'INSPECTION_FILE_CNT',
 					formatter:fnc_subInfoValueFormatter,
 					cellClick:function(e, cell){
diff --git a/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderList_new.jsp b/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderList_new.jsp
index 0e0f59c..c96657c 100644
--- a/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderList_new.jsp
+++ b/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderList_new.jsp
@@ -334,7 +334,7 @@ var columns = [
 						}
 					}
 				},
-				{headerHozAlign:'center', hozAlign:'center', widthGrow:1, title:'프로젝트번호', field:'PROJECT_NO',
+				{headerHozAlign:'center', hozAlign:'center', widthGrow:1.1, title:'프로젝트번호', field:'PROJECT_NO',
 					formatter: fnc_createGridAnchorTag,
 					cellClick: function(e, cell){
 						var orderNo = cell.getData().PROJECT_NO;
@@ -342,9 +342,9 @@ var columns = [
 						fn_openSaleRegPopup(orderNo, "detail");
 					}
 				},
-				{headerHozAlign:'center', hozAlign:'center', widthGrow:1, title:'구매유형', field:'PURCHASE_TYPE_NAME'},
-				{headerHozAlign:'center', hozAlign:'center', widthGrow:1, title:'주문유형', field:'CATEGORY_NAME'},
-				{headerHozAlign:'center', hozAlign:'center', widthGrow:1, title:'제품구분', field:'PRODUCT_NAME'},
+				{headerHozAlign:'center', hozAlign:'center', widthGrow:0.9, title:'구매유형', field:'PURCHASE_TYPE_NAME'},
+				{headerHozAlign:'center', hozAlign:'center', widthGrow:0.9, title:'주문유형', field:'CATEGORY_NAME'},
+				{headerHozAlign:'center', hozAlign:'center', widthGrow:0.9, title:'제품구분', field:'PRODUCT_NAME'},
 				{headerHozAlign:'center', hozAlign:'left', widthGrow:1.5, title:'품번', field:'PART_NO'},
 				{headerHozAlign:'center', hozAlign:'left', widthGrow:2, title:'품명', field:'PART_NAME'},
 				{headerHozAlign:'center', hozAlign:'left', widthGrow:1.5, title:'공급업체', field:'PARTNER_NAME'},
@@ -364,11 +364,12 @@ var columns = [
 						} else if(value === 'Y'){
 							return '<span style="color:green;">발송완료</span>';
 						} else {
-							return '';
+							return '미발송';
 						}
 					}
 				},
-				{headerHozAlign:'center', hozAlign:'center', widthGrow:1, title:'발주일', field:'MAIL_SEND_DATE'}
+				{headerHozAlign:'center', hozAlign:'center', widthGrow:1, title:'발주일', field:'MAIL_SEND_DATE'},
+				{headerHozAlign:'center', hozAlign:'center', widthGrow:1, title:'구매담당자', field:'WRITER_NAME'}
 ];
 
 function editCheck (cell) {
@@ -1033,12 +1034,27 @@ function fn_executeOrderCancel(objId){
 								<input type="text" name="reg_end_date"   id="reg_end_date"   style="width:77px;" autocomplete="off" value="${param.reg_end_date  }" class="date_icon">
 							</td>
 							
-							<td><label for="">주문유형</label></td>
+						<td><label for="">주문유형</label></td>
 							<td><select name="category_cd" id="category_cd" class="select2" autocomplete="off" style=""><option value="">선택</option>${code_map.category_cd}</select></td>
 							
 							<td><label for="">제품구분</label></td>
 							<td><select name="product_cd" id="product_cd" class="select2" autocomplete="off" style=""><option value="">선택</option>${code_map.product_cd}</select></td>
-	                        
+							
+							<td><label for="">구매유형</label></td>
+							<td><select name="purchase_type" id="purchase_type" class="select2" autocomplete="off" style=""><option value="">선택</option>${code_map.purchase_type}</select></td>
+							
+							<td><label for="">구매담당자</label></td>
+							<td><select name="writer" id="writer" class="select2" autocomplete="off" style=""><option value="">선택</option>${code_map.writer}</select></td>
+							
+							<td><label for="">메일발송</label></td>
+							<td>
+								<select name="mail_send_yn" id="mail_send_yn" class="select2" autocomplete="off" style="">
+									<option value="">전체</option>
+									<option value="Y" ${param.mail_send_yn eq 'Y' ? 'selected' : ''}>발송완료</option>
+									<option value="N" ${param.mail_send_yn eq 'N' ? 'selected' : ''}>미발송</option>
+								</select>
+							</td>
+                        
 						</tr>
 		            </table>
 		        </div>
diff --git a/WebContent/WEB-INF/view/salesMng/proposalMngList.jsp b/WebContent/WEB-INF/view/salesMng/proposalMngList.jsp
index f828d4b..050f0d3 100644
--- a/WebContent/WEB-INF/view/salesMng/proposalMngList.jsp
+++ b/WebContent/WEB-INF/view/salesMng/proposalMngList.jsp
@@ -44,17 +44,16 @@ String menuName = CommonUtils.getMenuName(menuObjId, "구매관리_품의서관
     .select2-selection__rendered {
     	height: 18px !important;
     }
-    /* frozen 컬럼 오른쪽 굵은 선 제거 (헤더) */
-    .tabulator .tabulator-header .tabulator-frozen-left {
-    	border-right: none !important;
+    /* 구매유형 멀티선택 - 세로 스크롤 */
+    #purchase_type + .select2-container .select2-selection--multiple {
+    	max-height: 52px !important;
+    	min-height: 18px !important;
+    	overflow-y: auto !important;
     }
-    /* frozen 컬럼 기본 두꺼운 테두리 제거 */
-    .tabulator .tabulator-frozen-left {
-    	border-right: none !important;
-    }
-    /* 체크박스 컬럼 오른쪽에 얇은 구분선 추가 (데이터 행만) */
-    .tabulator .tabulator-tableholder .tabulator-table .tabulator-row .tabulator-cell.tabulator-frozen-left {
-    	border-right: 1px solid #ddd !important;
+    #purchase_type + .select2-container .select2-selection__rendered {
+    	height: auto !important;
+    	max-height: 48px !important;
+    	overflow-y: auto !important;
     }
 </style>
 <script>
@@ -201,7 +200,7 @@ function fn_createPurchaseOrder(selectedRowIds, formType) {
 var columns = [	
 	{title:'OBJID', field:'OBJID', visible: false},
 	{title:'STATUS', field:'STATUS', visible: false},
-	{headerHozAlign:'center', hozAlign:'center', title:"품의서 No", field:"PROPOSAL_NO", widthGrow:1.2, frozen:true,
+	{headerHozAlign:'center', hozAlign:'center', title:"품의서 No", field:"PROPOSAL_NO", widthGrow:1.2, 
 		formatter: fnc_createGridAnchorTag, 
 		cellClick : function(e, cell) {
 			fn_openProposalFormPopUp(cell.getData().OBJID);
@@ -227,6 +226,19 @@ var columns = [
 
 // 검색
 function fn_search(){
+	// 기존 hidden 제거
+	$("input[name='purchase_types']").remove();
+	
+	// 구매유형 멀티선택 값 처리
+	var selectedPurchaseTypes = $("#purchase_type").val();
+	if(selectedPurchaseTypes && selectedPurchaseTypes.length > 0) {
+		$('<input>').attr({
+			type: 'hidden',
+			name: 'purchase_types',
+			value: selectedPurchaseTypes.join(',')
+		}).appendTo('#form1');
+	}
+	
 	_tabulGrid = fnc_tabul_search(_tabul_layout_fitColumns, _tabulGrid, "/salesMng/proposalMngGridList.do", columns, true);
 }
 
@@ -292,6 +304,29 @@ function _fnc_datepick(){
 										<input type="text" name="regdate_start" id="regdate_start" style="width:110px;" autocomplete="off" value="${param.regdate_start}" class="date_icon">~
 										<input type="text" name="regdate_end" id="regdate_end" style="width:110px;" autocomplete="off" value="${param.regdate_end}" class="date_icon">
 									</td>
+									<%-- 구매유형 (멀티선택) --%>
+									<td class="align_r"><label for="purchase_type">구매유형</label></td>
+									<td>
+										<select name="purchase_type" id="purchase_type" class="select2" autocomplete="off" style="width:200px;" multiple="multiple">
+											${code_map.purchase_type}
+										</select>
+									</td>
+									<%-- 작성자 --%>
+									<td class="align_r"><label for="writer">작성자</label></td>
+									<td>
+										<select name="writer" id="writer" class="select2" autocomplete="off" style="">
+											<option value="">선택</option>
+											${code_map.writer}
+										</select>
+									</td>
+									<%-- 제품구분 --%>
+									<td class="align_r"><label for="part_type">제품구분</label></td>
+									<td>
+										<select name="part_type" id="part_type" class="select2" autocomplete="off" style="">
+											<option value="">선택</option>
+											${code_map.part_type}
+										</select>
+									</td>
 								</tr>
 							</tbody>
 						</table>
diff --git a/WebContent/WEB-INF/view/salesMng/salesRequestMngRegList.jsp b/WebContent/WEB-INF/view/salesMng/salesRequestMngRegList.jsp
index b3aa175..e9e7fa4 100644
--- a/WebContent/WEB-INF/view/salesMng/salesRequestMngRegList.jsp
+++ b/WebContent/WEB-INF/view/salesMng/salesRequestMngRegList.jsp
@@ -197,7 +197,7 @@ var columns = [
 			 }
    			,{headerHozAlign : 'center', hozAlign : 'center', title : "주문유형", 	field :"ORDER_TYPE_NAME"    ,  widthGrow:1.1 }
    			,{headerHozAlign : 'center', hozAlign : 'center', title : "제품구분", 	field :"PRODUCT_NAME_FULL"       ,  widthGrow:1.1}
-   			,{headerHozAlign : 'center', hozAlign : 'left'	, title : "고객사", 		field :"CUSTOMER_NAME"     ,  widthGrow:1.5 }
+   			,{headerHozAlign : 'center', hozAlign : 'left'	, title : "공급업체", 		field :"CUSTOMER_NAME"     ,  widthGrow:1.5 }
    			,{headerHozAlign : 'center', hozAlign : 'center', title : "유/무상", 	field :"PAID_TYPE_NAME"				,  widthGrow:0.9 }
    			,{headerHozAlign : 'center', hozAlign : 'left', title : "품번", 		field :"PART_NO"				, widthGrow:1.4}
    			,{headerHozAlign : 'center', hozAlign : 'left'	, title : "품명", 	field :"PART_NAME"   ,  widthGrow:1.8 }
@@ -241,7 +241,7 @@ var columns = [
  			// 		}
 			// 	}
 			// }
-   			,{headerHozAlign : 'center', hozAlign : 'center', title : "요청인", 		field :"REQUEST_USER_NAME"      ,  widthGrow:1.1,
+   			,{headerHozAlign : 'center', hozAlign : 'center', title : "작성자", 		field :"REQUEST_USER_NAME"      ,  widthGrow:1.1,
    				// 요청인: 구매요청서 작성 시에만 표시
    				formatter: function(cell, formatterParams, onRendered){
    					var data = cell.getData();
@@ -1059,8 +1059,40 @@ function fn_executeCreateQuotationRequests(salesRequestObjid, supplyVendorGroups
 									<%-- 작성일 활성화 --%>
 									<td class="align_r"><label>작성일</label></td>
 									<td>
-										<input type="text" name="regdate_start" id="regdate_start" style="width:120px;" autocomplete="off" value="${param.regdate_start}" class="date_icon">~
-										<input type="text" name="regdate_end"   id="regdate_end"   style="width:120px;" autocomplete="off" value="${param.regdate_end}" class="date_icon">
+										<input type="text" name="regdate_start" id="regdate_start" style="width:110px;" autocomplete="off" value="${param.regdate_start}" class="date_icon">~
+										<input type="text" name="regdate_end"   id="regdate_end"   style="width:110px;" autocomplete="off" value="${param.regdate_end}" class="date_icon">
+									</td>
+									<%-- 공급업체 --%>
+									<td class="align_r"><label for="customer_cd">공급업체</label></td>
+									<td>
+										<select name="customer_cd" id="customer_cd" class="select2" autocomplete="off" style="width:200px;">
+											<option value="">선택</option>
+											${code_map.customer_cd}
+										</select>
+									</td>
+									<%-- 작성자 --%>
+									<td class="align_r"><label for="request_user">작성자</label></td>
+									<td>
+										<select name="request_user" id="request_user" class="select2" autocomplete="off" style="">
+											<option value="">선택</option>
+											${code_map.request_user}
+										</select>
+									</td>
+									<%-- 제품구분 --%>
+									<td class="align_r"><label for="part_type">제품구분</label></td>
+									<td>
+										<select name="part_type" id="part_type" class="select2" autocomplete="off" style="">
+											<option value="">선택</option>
+											${code_map.part_type}
+										</select>
+									</td>
+									<%-- 프로젝트번호 --%>
+									<td class="align_r"><label for="project_no">프로젝트번호</label></td>
+									<td>
+										<select name="project_no" id="project_no" style="" class="select2" autocomplete="off">
+											<option value="">선택</option>
+											${code_map.project_no}
+										</select>
 									</td>
 								</tr>
 							</tbody>
diff --git a/src/com/pms/controller/PurchaseOrderController.java b/src/com/pms/controller/PurchaseOrderController.java
index ba8522b..ed7cf1c 100644
--- a/src/com/pms/controller/PurchaseOrderController.java
+++ b/src/com/pms/controller/PurchaseOrderController.java
@@ -1130,6 +1130,10 @@ public class PurchaseOrderController {
 			code_map.put("category_cd", commonService.bizMakeOptionList("0000167", CommonUtils.nullToEmpty((String)paramMap.get("category_cd")),"common.getCodeselect"));
 			//제품구분
 			code_map.put("product_cd", commonService.bizMakeOptionList("0000001", CommonUtils.nullToEmpty((String)paramMap.get("product_cd")),"common.getCodeselect"));
+			//구매유형 (0001814)
+			code_map.put("purchase_type", commonService.bizMakeOptionList("0001814", (String)paramMap.get("purchase_type"), "common.getCodeselect"));
+			//발주자(구매담당자)
+			code_map.put("writer", commonService.bizMakeOptionList("", (String)paramMap.get("writer"), "common.getUserselect"));
 			
 			if("excel".equals(actionType)){
 				list = commonService.selectList("purchaseOrder.purchaseOrderMasterList_new", request, paramMap);
diff --git a/src/com/pms/mapper/purchaseOrder.xml b/src/com/pms/mapper/purchaseOrder.xml
index 320d447..d9488c1 100644
--- a/src/com/pms/mapper/purchaseOrder.xml
+++ b/src/com/pms/mapper/purchaseOrder.xml
@@ -3236,6 +3236,8 @@ SELECT 	 POM.OBJID
 		,POM.TOTAL_SUPPLY_UNIT_PRICE
 		,POM.TOTAL_REAL_SUPPLY_PRICE
 		,POM.NEGO_RATE
+		,POM.WRITER
+		,(SELECT USER_NAME FROM USER_INFO WHERE USER_ID = POM.WRITER) AS WRITER_NAME
 		<!-- 
 		,POM.TOTAL_SUPPLY_UNIT_PRICE::NUMERIC - POM.DISCOUNT_PRICE::NUMERIC as TOTAL_SUPPLY_UNIT_PRICE_NEGO
 		 -->
@@ -3455,6 +3457,25 @@ WHERE 1=1
 			     AND TRIM(UPPER(POP.SPEC)) LIKE '%'||TRIM(UPPER(#{SEARCH_PART_SPEC}))||'%'
 			    )
 	</if>
+	<!-- 구매유형 필터 -->
+	<if test="purchase_type != null and purchase_type != ''">
+	AND SRM.PURCHASE_TYPE = #{purchase_type}
+	</if>
+	<!-- 발주자(구매담당자) 필터 -->
+	<if test="writer != null and writer != ''">
+	AND POM.WRITER = #{writer}
+	</if>
+	<!-- 메일발송 필터 -->
+	<if test="mail_send_yn != null and mail_send_yn != ''">
+		<choose>
+			<when test='mail_send_yn == "Y"'>
+				AND POM.MAIL_SEND_YN = 'Y'
+			</when>
+			<otherwise>
+				AND (POM.MAIL_SEND_YN IS NULL OR POM.MAIL_SEND_YN = '' OR POM.MAIL_SEND_YN = 'N')
+			</otherwise>
+		</choose>
+	</if>
 
  ORDER BY SPLIT_PART( PURCHASE_ORDER_NO, '-', 3)::NUMERIC DESC
 </select>
@@ -4295,6 +4316,8 @@ SELECT POM.OBJID
 		
 		,POM.SALES_MNG_USER_ID
 		,(SELECT USER_NAME FROM USER_INFO WHERE USER_ID = POM.SALES_MNG_USER_ID) AS SALES_MNG_USER_NAME
+		,POM.WRITER
+		,(SELECT USER_NAME FROM USER_INFO WHERE USER_ID = POM.WRITER) AS WRITER_NAME
 		,TO_CHAR(POM.REGDATE,'YYYY-MM-DD') AS REGDATE
 		,POM.TOTAL_PRICE
 		,POM.DISCOUNT_PRICE
@@ -4435,12 +4458,19 @@ SELECT POM.OBJID
 	<!-- <if test="sales_mng_user_id !=null and sales_mng_user_id != '' ">
 	AND POM.SALES_MNG_USER_ID = #{sales_mng_user_id}
 	</if> -->
-	<if test="sales_mng_user_ids != null and sales_mng_user_ids != ''">
+	<!-- <if test="sales_mng_user_ids != null and sales_mng_user_ids != ''">
 		AND POM.SALES_MNG_USER_ID IN
 		<foreach item="value" collection="sales_mng_user_ids.split(',')"
 			open="(" separator="," close=")">
 			#{value}
 		</foreach>
+	</if> -->
+	<if test="sales_mng_user_ids != null and sales_mng_user_ids != ''">
+		AND POM.WRITER IN
+		<foreach item="value" collection="sales_mng_user_ids.split(',')"
+			open="(" separator="," close=")">
+			#{value}
+		</foreach>
 	</if>
 	<if test="reg_start_date !=null and reg_start_date != '' ">
 	AND TO_DATE(TO_CHAR(POM.REGDATE,'YYYY-MM-DD') ,'YYYY-MM-DD') <![CDATA[ >= ]]> TO_DATE(#{reg_start_date}, 'YYYY-MM-DD')
diff --git a/src/com/pms/mapper/salesMng.xml b/src/com/pms/mapper/salesMng.xml
index 8971137..4d97221 100644
--- a/src/com/pms/mapper/salesMng.xml
+++ b/src/com/pms/mapper/salesMng.xml
@@ -1339,6 +1339,46 @@ VALUES
 		  	AND SRM.REGDATE::DATE <![CDATA[ <= ]]> #{regdate_end}::DATE
 		</if>
 		
+		<!-- 공급업체 검색 -->
+		<if test="customer_cd != null and !''.equals(customer_cd)">
+			AND (
+				-- 프로젝트에서 고객사 조회
+				SRM.PROJECT_NO IN (
+					SELECT PM.OBJID::VARCHAR 
+					FROM PROJECT_MGMT PM 
+					LEFT JOIN CONTRACT_MGMT CM ON CM.OBJID = PM.CONTRACT_OBJID 
+					WHERE CM.CUSTOMER_OBJID::VARCHAR = #{customer_cd}
+				)
+				-- 직접 저장된 고객사
+				OR SRM.CUSTOMER_OBJID = #{customer_cd}
+			)
+		</if>
+		
+		<!-- 작성자 검색 -->
+		<if test="request_user != null and !''.equals(request_user)">
+			AND (SRM.REQUEST_USER_ID = #{request_user} OR SRM.WRITER = #{request_user})
+		</if>
+		
+		<!-- 제품구분 검색 -->
+		<if test="part_type != null and !''.equals(part_type)">
+			AND (
+				-- 프로젝트에서 제품구분 조회
+				SRM.PROJECT_NO IN (
+					SELECT PM.OBJID::VARCHAR 
+					FROM PROJECT_MGMT PM 
+					LEFT JOIN CONTRACT_MGMT CM ON CM.OBJID = PM.CONTRACT_OBJID 
+					WHERE CM.PRODUCT = #{part_type}
+				)
+				-- 직접 저장된 제품구분
+				OR SRM.PRODUCT_NAME = #{part_type}
+			)
+		</if>
+		
+		<!-- 프로젝트번호 검색 (단일 선택) -->
+		<if test="project_no != null and !''.equals(project_no)">
+			AND SRM.PROJECT_NO = #{project_no}
+		</if>
+		
 		ORDER BY SRM.REGDATE desc
 	</select>
 	
@@ -4140,6 +4180,24 @@ ORDER BY V.PATH2
 		AND SRM.REGDATE::DATE <![CDATA[ <= ]]> #{regdate_end}::DATE
 	</if>
 	
+	<!-- 구매유형 검색 (멀티선택) -->
+	<if test="purchase_types != null and !''.equals(purchase_types)">
+		AND SRM.PURCHASE_TYPE IN
+		<foreach item="item" collection="purchase_types.split(',')" open="(" separator="," close=")">
+			#{item}
+		</foreach>
+	</if>
+	
+	<!-- 작성자 검색 -->
+	<if test="writer != null and !''.equals(writer)">
+		AND SRM.WRITER = #{writer}
+	</if>
+	
+	<!-- 제품구분 검색 -->
+	<if test="part_type != null and !''.equals(part_type)">
+		AND SRM.PRODUCT_NAME = #{part_type}
+	</if>
+	
 	ORDER BY SRM.REGDATE DESC
 </select>
 
diff --git a/src/com/pms/salesmgmt/controller/SalesMngController.java b/src/com/pms/salesmgmt/controller/SalesMngController.java
index 52110b0..6cc0f5a 100644
--- a/src/com/pms/salesmgmt/controller/SalesMngController.java
+++ b/src/com/pms/salesmgmt/controller/SalesMngController.java
@@ -162,8 +162,8 @@ public class SalesMngController {
 			
 			//list = salesMngService.getSalesRequestMasterList(request, paramMap);
 			
-			//프로젝트번호 project_no
-			code_map.put("contract_objid",commonService.bizMakeOptionList("", (String)paramMap.get("contract_objid"),"common.getProjectNameList"));
+			// 프로젝트번호
+			code_map.put("project_no", commonService.bizMakeOptionList("", (String)paramMap.get("project_no"), "common.getProjectNameList"));
 			//상태
 			code_map.put("act_status",commonService.bizMakeOptionList("0001062", (String)paramMap.get("act_status"),"common.getCodeselect"));
 			//접수자
@@ -172,6 +172,13 @@ public class SalesMngController {
 			code_map.put("request_cd",commonService.bizMakeOptionList("0000167", (String)paramMap.get("request_cd"),"common.getCodeselect"));
 			
 			code_map.put("product_code",commonService.bizMakeOptionList("", (String)paramMap.get("product_code"),"common.getProductCodeselect"));
+			
+			// 공급업체 (고객사: SUPPLY_MNG + CLIENT_MNG)
+			code_map.put("customer_cd", commonService.bizMakeOptionList("", (String)paramMap.get("customer_cd"), "common.getAllSupplySelect"));
+			// 작성자
+			code_map.put("request_user", commonService.bizMakeOptionList("", (String)paramMap.get("request_user"),"common.getUserselect"));
+			// 제품구분 (0000001)
+			code_map.put("part_type", commonService.bizMakeOptionList("0000001", (String)paramMap.get("part_type"), "common.getCodeselect"));
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -1310,12 +1317,14 @@ public class SalesMngController {
 		Map code_map = new HashMap();
 		
 		try {
-			// 구매유형
-			code_map.put("purchase_type", commonService.bizMakeOptionList("0001821", (String)paramMap.get("purchase_type"), "common.getCodeselect"));
+			// 구매유형 (0001814)
+			code_map.put("purchase_type", commonService.bizMakeOptionList("0001814", (String)paramMap.get("purchase_type"), "common.getCodeselect"));
 			// 주문유형
 			code_map.put("order_type", commonService.bizMakeOptionList("0001822", (String)paramMap.get("order_type"), "common.getCodeselect"));
-			// 제품구분
-			code_map.put("product_name", commonService.bizMakeOptionList("0000016", (String)paramMap.get("product_name"), "common.getCodeselect"));
+			// 제품구분 (0000001)
+			code_map.put("part_type", commonService.bizMakeOptionList("0000001", (String)paramMap.get("part_type"), "common.getCodeselect"));
+			// 작성자
+			code_map.put("writer", commonService.bizMakeOptionList("", (String)paramMap.get("writer"), "common.getUserselect"));
 		} catch (Exception e) {
 			e.printStackTrace();
 		}