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){
~
-
- <%-- 구매담당자 주석처리
- |
- |
- --%>
|
~
|
+
+ |
+ |
+
+ |
+ |
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}