From 910cc442933952216abe46a1572608282ad2acd1 Mon Sep 17 00:00:00 2001
From: leeheejin <imleesinok@gmail.com>
Date: Fri, 19 Dec 2025 17:49:40 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B2=80=EC=83=89=ED=95=84=ED=84=B0=20?=
 =?UTF-8?q?=EB=B0=9C=EC=A3=BC=EC=84=9C=20=EA=B4=80=EB=A6=AC=EA=B9=8C?=
 =?UTF-8?q?=EC=A7=80=20=EC=A7=84=ED=96=89=20=EC=99=84=EB=A3=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../classes/com/pms/mapper/purchaseOrder.xml     | 16 ++++++++++++++--
 .../view/purchaseOrder/purchaseOrderList_new.jsp | 11 ++++++-----
 .../pms/controller/PurchaseOrderController.java  |  4 ++++
 src/com/pms/mapper/purchaseOrder.xml             | 13 +++++++++++--
 4 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/WebContent/WEB-INF/classes/com/pms/mapper/purchaseOrder.xml b/WebContent/WEB-INF/classes/com/pms/mapper/purchaseOrder.xml
index 8e0354b..13aacec 100644
--- a/WebContent/WEB-INF/classes/com/pms/mapper/purchaseOrder.xml
+++ b/WebContent/WEB-INF/classes/com/pms/mapper/purchaseOrder.xml
@@ -1429,6 +1429,9 @@
 				
 				-- 요청사항
 				,POM.REQUEST_CONTENT
+				
+				-- 양식 타입 (general/outsourcing)
+				,COALESCE(POM.FORM_TYPE, 'general') AS FORM_TYPE
 			FROM
 				PURCHASE_ORDER_MASTER POM
 				
@@ -3386,12 +3389,21 @@ WHERE 1=1
 			#{value}
 		</foreach>
 	</if>
+	<!-- 주문유형 필터 -->
+	<if test="category_cd != null and category_cd != ''">
+	AND CM.CATEGORY_CD = #{category_cd}
+	</if>
+	<!-- 제품구분 필터 -->
+	<if test="product_cd != null and product_cd != ''">
+	AND CM.PRODUCT = #{product_cd}
+	</if>
 	
+	<!-- 발주일 필터: MAIL_SEND_DATE (그리드 컬럼과 일치) -->
 	<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')
+	AND TO_DATE(POM.MAIL_SEND_DATE, 'YYYY-MM-DD') <![CDATA[ >= ]]> TO_DATE(#{reg_start_date}, 'YYYY-MM-DD')
 	</if>
 	<if test="reg_end_date !=null and reg_end_date != '' ">
-	AND TO_DATE(TO_CHAR(POM.REGDATE,'YYYY-MM-DD') ,'YYYY-MM-DD') <![CDATA[ <= ]]> TO_DATE(#{reg_end_date}, 'YYYY-MM-DD')
+	AND TO_DATE(POM.MAIL_SEND_DATE, 'YYYY-MM-DD') <![CDATA[ <= ]]> TO_DATE(#{reg_end_date}, 'YYYY-MM-DD')
 	</if>
 	<if test="appr_status !=null and appr_status != '' ">
 		<choose>
diff --git a/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderList_new.jsp b/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderList_new.jsp
index fbe5bb5..70bcdc1 100644
--- a/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderList_new.jsp
+++ b/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderList_new.jsp
@@ -895,17 +895,18 @@ function fn_openMailFormPopup(purchaseOrderObjId){
 								<input type="text" name="delivery_start_date" id="delivery_start_date" style="width:77px;" autocomplete="off" value="${param.delivery_start_date}" class="date_icon">~
 								<input type="text" name="delivery_end_date"   id="delivery_end_date"   style="width:77px;" autocomplete="off" value="${param.delivery_end_date  }" class="date_icon">
 							</td>
-	                        
-	                        <%-- 구매담당자 주석처리
-	                        <td><label for="">구매담당자</label></td>
-	                        <td><select name="sales_mng_user_id" id="sales_mng_user_id" class="select2" autocomplete="off" style="width:190px;" multiple="multiple" ><option value="">선택</option>${code_map.sales_mng_user_id}</select></td>
-	                        --%>
 							
 							<td><label>발주일</label></td>
 							<td>
 								<input type="text" name="reg_start_date" id="reg_start_date" style="width:77px;" autocomplete="off" value="${param.reg_start_date}" class="date_icon">~
 								<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><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>
 	                        
 						</tr>
 		            </table>
diff --git a/src/com/pms/controller/PurchaseOrderController.java b/src/com/pms/controller/PurchaseOrderController.java
index fff3ace..6e192fb 100644
--- a/src/com/pms/controller/PurchaseOrderController.java
+++ b/src/com/pms/controller/PurchaseOrderController.java
@@ -1126,6 +1126,10 @@ public class PurchaseOrderController {
 			code_map.put("appr_status",commonService.bizMakeOptionList("0000099", (String)paramMap.get("appr_status"),"common.getCodeselect"));
 			//발주구분
 			code_map.put("order_type_cd" , commonService.bizMakeOptionList("0001406", (String)paramMap.get("order_type_cd"),"common.getCodeselect"));
+			//주문유형
+			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"));
 			
 			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 4827f73..13aacec 100644
--- a/src/com/pms/mapper/purchaseOrder.xml
+++ b/src/com/pms/mapper/purchaseOrder.xml
@@ -3389,12 +3389,21 @@ WHERE 1=1
 			#{value}
 		</foreach>
 	</if>
+	<!-- 주문유형 필터 -->
+	<if test="category_cd != null and category_cd != ''">
+	AND CM.CATEGORY_CD = #{category_cd}
+	</if>
+	<!-- 제품구분 필터 -->
+	<if test="product_cd != null and product_cd != ''">
+	AND CM.PRODUCT = #{product_cd}
+	</if>
 	
+	<!-- 발주일 필터: MAIL_SEND_DATE (그리드 컬럼과 일치) -->
 	<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')
+	AND TO_DATE(POM.MAIL_SEND_DATE, 'YYYY-MM-DD') <![CDATA[ >= ]]> TO_DATE(#{reg_start_date}, 'YYYY-MM-DD')
 	</if>
 	<if test="reg_end_date !=null and reg_end_date != '' ">
-	AND TO_DATE(TO_CHAR(POM.REGDATE,'YYYY-MM-DD') ,'YYYY-MM-DD') <![CDATA[ <= ]]> TO_DATE(#{reg_end_date}, 'YYYY-MM-DD')
+	AND TO_DATE(POM.MAIL_SEND_DATE, 'YYYY-MM-DD') <![CDATA[ <= ]]> TO_DATE(#{reg_end_date}, 'YYYY-MM-DD')
 	</if>
 	<if test="appr_status !=null and appr_status != '' ">
 		<choose>