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 @@ AND UPPER(SETUP) LIKE UPPER('%${setup}%') + + + AND CODE_NAME(AREA_CD) = #{area_cd} + + + + 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} + + + + AND UPPER(T.PART_NO) LIKE UPPER('%' || #{product_item_code} || '%') + + + + AND UPPER(T.PART_NAME) LIKE UPPER('%' || #{product_item_name} || '%') + + + + 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} || '%') + ) + ORDER BY SUBSTRING(PROJECT_NO,POSITION('-' IN PROJECT_NO)+1) DESC, OVERHAUL_ORDER DESC NULLS LAST 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){ + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- 입고지, 셋업지, PM 검색필터 주석처리 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 @@ AND UPPER(SETUP) LIKE UPPER('%${setup}%') + + + AND CODE_NAME(AREA_CD) = #{area_cd} + + + + 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} + + + + AND UPPER(T.PART_NO) LIKE UPPER('%' || #{product_item_code} || '%') + + + + AND UPPER(T.PART_NAME) LIKE UPPER('%' || #{product_item_name} || '%') + + + + 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} || '%') + ) + ORDER BY SUBSTRING(PROJECT_NO,POSITION('-' IN PROJECT_NO)+1) DESC, OVERHAUL_ORDER DESC NULLS LAST