From 787a077a2f24ace4ffa55708be708222ebc62a68 Mon Sep 17 00:00:00 2001
From: leeheejin <imleesinok@gmail.com>
Date: Fri, 19 Dec 2025 16:33:30 +0900
Subject: [PATCH] =?UTF-8?q?=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=EA=B4=80?=
 =?UTF-8?q?=EB=A6=AC=20=EA=B2=80=EC=83=89=ED=95=84=ED=84=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../classes/com/pms/mapper/project.xml        | 32 ++++++++++++++
 .../view/project/projectMgmtWbsList3.jsp      | 42 +++++++++++++++++++
 src/com/pms/mapper/project.xml                | 32 ++++++++++++++
 3 files changed, 106 insertions(+)

diff --git a/WebContent/WEB-INF/classes/com/pms/mapper/project.xml b/WebContent/WEB-INF/classes/com/pms/mapper/project.xml
index 6608d35..fce4c42 100644
--- a/WebContent/WEB-INF/classes/com/pms/mapper/project.xml
+++ b/WebContent/WEB-INF/classes/com/pms/mapper/project.xml
@@ -4243,6 +4243,38 @@
 				<if test="setup != null and !''.equals(setup)">
 				    AND UPPER(SETUP) LIKE UPPER('%${setup}%')
 				</if>
+				<!-- 국내/해외 필터 -->
+				<if test="area_cd != null and area_cd != ''">
+				    AND CODE_NAME(AREA_CD) = #{area_cd}
+				</if>
+				<!-- 유/무상 필터 -->
+				<if test="free_of_charge != null and free_of_charge != ''">
+				    AND (SELECT 
+						CASE 
+							WHEN O.PAID_TYPE = 'paid' THEN '유상'
+							WHEN O.PAID_TYPE = 'free' THEN '무상'
+							ELSE O.PAID_TYPE
+						END 
+					FROM CONTRACT_MGMT AS O WHERE O.OBJID = T.CONTRACT_OBJID) = #{free_of_charge}
+				</if>
+				<!-- 품번 필터 -->
+				<if test="product_item_code != null and product_item_code != ''">
+				    AND UPPER(T.PART_NO) LIKE UPPER('%' || #{product_item_code} || '%')
+				</if>
+				<!-- 품명 필터 -->
+				<if test="product_item_name != null and product_item_name != ''">
+				    AND UPPER(T.PART_NAME) LIKE UPPER('%' || #{product_item_name} || '%')
+				</if>
+				<!-- S/N 필터 -->
+				<if test="serial_no != null and serial_no != ''">
+				    AND EXISTS (
+						SELECT 1 FROM CONTRACT_ITEM AS I 
+						LEFT JOIN CONTRACT_ITEM_SERIAL AS S ON S.ITEM_OBJID = I.OBJID AND S.STATUS = 'ACTIVE'
+						WHERE I.CONTRACT_OBJID = T.CONTRACT_OBJID 
+						AND I.PART_OBJID = T.PART_OBJID
+						AND UPPER(S.SERIAL_NO) LIKE UPPER('%' || #{serial_no} || '%')
+					)
+				</if>
     			ORDER BY SUBSTRING(PROJECT_NO,POSITION('-' IN PROJECT_NO)+1) DESC, OVERHAUL_ORDER DESC NULLS LAST
 	</select>
 	
diff --git a/WebContent/WEB-INF/view/project/projectMgmtWbsList3.jsp b/WebContent/WEB-INF/view/project/projectMgmtWbsList3.jsp
index 533a2f2..68ae4b7 100644
--- a/WebContent/WEB-INF/view/project/projectMgmtWbsList3.jsp
+++ b/WebContent/WEB-INF/view/project/projectMgmtWbsList3.jsp
@@ -68,6 +68,14 @@ $(document).ready(function(){
 		//fn_apply("","regist");
 	});
 	
+	// 엔터키로 조회
+	$('#plmSearchZon input[type="text"]').keypress(function(e){
+		if(e.which == 13){
+			$("#page").val("1");
+			fn_search();
+		}
+	});
+	
 	fn_search();
 });
 
@@ -250,6 +258,40 @@ function openProjectFormPopUp(objId){
 								<input type="text" name="contract_end_date" id="contract_end_date" style="width:90px;" autocomplete="off" value="${param.contract_end_date}" class="date_icon">
 							</td>								
 						</tr>
+						<tr>
+							<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="국내"${param.area_cd eq '국내' ? ' selected':'' }>국내</option>
+									<option value="해외"${param.area_cd eq '해외' ? ' selected':'' }>해외</option>
+								</select>
+							</td>
+							
+							<td><label for="free_of_charge">유/무상</label></td>
+							<td>
+								<select name="free_of_charge" id="free_of_charge" style="" class="select2" autocomplete="off">
+									<option value="">선택</option>
+									<option value="유상"${param.free_of_charge eq '유상' ? ' selected':'' }>유상</option>
+									<option value="무상"${param.free_of_charge eq '무상' ? ' selected':'' }>무상</option>
+								</select>
+							</td>
+							
+							<td><label for="product_item_code">품번</label></td>
+							<td>
+								<input type="text" name="product_item_code" id="product_item_code" style="width:150px;" autocomplete="off" value="${param.product_item_code}">
+							</td>
+							
+							<td><label for="product_item_name">품명</label></td>
+							<td>
+								<input type="text" name="product_item_name" id="product_item_name" style="width:150px;" autocomplete="off" value="${param.product_item_name}">
+							</td>
+							
+							<td><label for="serial_no">S/N</label></td>
+							<td>
+								<input type="text" name="serial_no" id="serial_no" style="width:150px;" autocomplete="off" value="${param.serial_no}">
+							</td>
+						</tr>
 						
 						<%-- 입고지, 셋업지, PM 검색필터 주석처리
 						<tr>
diff --git a/src/com/pms/mapper/project.xml b/src/com/pms/mapper/project.xml
index 6608d35..fce4c42 100644
--- a/src/com/pms/mapper/project.xml
+++ b/src/com/pms/mapper/project.xml
@@ -4243,6 +4243,38 @@
 				<if test="setup != null and !''.equals(setup)">
 				    AND UPPER(SETUP) LIKE UPPER('%${setup}%')
 				</if>
+				<!-- 국내/해외 필터 -->
+				<if test="area_cd != null and area_cd != ''">
+				    AND CODE_NAME(AREA_CD) = #{area_cd}
+				</if>
+				<!-- 유/무상 필터 -->
+				<if test="free_of_charge != null and free_of_charge != ''">
+				    AND (SELECT 
+						CASE 
+							WHEN O.PAID_TYPE = 'paid' THEN '유상'
+							WHEN O.PAID_TYPE = 'free' THEN '무상'
+							ELSE O.PAID_TYPE
+						END 
+					FROM CONTRACT_MGMT AS O WHERE O.OBJID = T.CONTRACT_OBJID) = #{free_of_charge}
+				</if>
+				<!-- 품번 필터 -->
+				<if test="product_item_code != null and product_item_code != ''">
+				    AND UPPER(T.PART_NO) LIKE UPPER('%' || #{product_item_code} || '%')
+				</if>
+				<!-- 품명 필터 -->
+				<if test="product_item_name != null and product_item_name != ''">
+				    AND UPPER(T.PART_NAME) LIKE UPPER('%' || #{product_item_name} || '%')
+				</if>
+				<!-- S/N 필터 -->
+				<if test="serial_no != null and serial_no != ''">
+				    AND EXISTS (
+						SELECT 1 FROM CONTRACT_ITEM AS I 
+						LEFT JOIN CONTRACT_ITEM_SERIAL AS S ON S.ITEM_OBJID = I.OBJID AND S.STATUS = 'ACTIVE'
+						WHERE I.CONTRACT_OBJID = T.CONTRACT_OBJID 
+						AND I.PART_OBJID = T.PART_OBJID
+						AND UPPER(S.SERIAL_NO) LIKE UPPER('%' || #{serial_no} || '%')
+					)
+				</if>
     			ORDER BY SUBSTRING(PROJECT_NO,POSITION('-' IN PROJECT_NO)+1) DESC, OVERHAUL_ORDER DESC NULLS LAST
 	</select>