diff --git a/WebContent/WEB-INF/classes/com/pms/mapper/salesMng.xml b/WebContent/WEB-INF/classes/com/pms/mapper/salesMng.xml
index 51ad609..4c0da6b 100644
--- a/WebContent/WEB-INF/classes/com/pms/mapper/salesMng.xml
+++ b/WebContent/WEB-INF/classes/com/pms/mapper/salesMng.xml
@@ -3325,5 +3325,178 @@ ORDER BY V.PATH2
NOW()
)
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/WebContent/WEB-INF/view/salesMng/proposalMngList.jsp b/WebContent/WEB-INF/view/salesMng/proposalMngList.jsp
new file mode 100644
index 0000000..243c90c
--- /dev/null
+++ b/WebContent/WEB-INF/view/salesMng/proposalMngList.jsp
@@ -0,0 +1,220 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ page import="com.pms.common.utils.*"%>
+<%@ page import="java.util.*" %>
+<%@include file= "/init.jsp" %>
+
+
+
+
+
+
+<%=Constants.SYSTEM_NAME%>
+
+
+
+
+
+
+
+
+
diff --git a/src/com/pms/mapper/salesMng.xml b/src/com/pms/mapper/salesMng.xml
index 51ad609..4c0da6b 100644
--- a/src/com/pms/mapper/salesMng.xml
+++ b/src/com/pms/mapper/salesMng.xml
@@ -3325,5 +3325,178 @@ ORDER BY V.PATH2
NOW()
)
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/com/pms/salesmgmt/controller/SalesMngController.java b/src/com/pms/salesmgmt/controller/SalesMngController.java
index f68d98f..bebb1e7 100644
--- a/src/com/pms/salesmgmt/controller/SalesMngController.java
+++ b/src/com/pms/salesmgmt/controller/SalesMngController.java
@@ -1222,4 +1222,82 @@ public class SalesMngController {
}
return resultMap;
}
+
+ // ==================== 품의서 관리 ====================
+
+ /**
+ * 품의서 관리 - 목록 화면
+ * @param request
+ * @param paramMap
+ * @return
+ */
+ @RequestMapping("/salesMng/proposalMngList.do")
+ public String proposalMngList(HttpServletRequest request, @RequestParam Map paramMap){
+ String returnUrl = "/salesMng/proposalMngList";
+ Map code_map = new HashMap();
+
+ try {
+ // 구매유형
+ code_map.put("purchase_type", commonService.bizMakeOptionList("0001821", (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"));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ request.setAttribute("code_map", code_map);
+ return returnUrl;
+ }
+
+ /**
+ * 품의서 관리 - 목록 조회 (페이징)
+ * @param request
+ * @param paramMap
+ * @return
+ */
+ @ResponseBody
+ @RequestMapping("/salesMng/proposalMngGridList.do")
+ public Map getProposalMngGridList(HttpServletRequest request, @RequestParam Map paramMap){
+ commonService.selectListPagingNew("salesMng.getProposalMngGridList", request, paramMap);
+ return paramMap;
+ }
+
+ /**
+ * 품의서 상세 팝업
+ * @param request
+ * @param paramMap
+ * @return
+ */
+ @RequestMapping("/salesMng/proposalFormPopUp.do")
+ public String proposalFormPopUp(HttpServletRequest request, @RequestParam Map paramMap){
+ Map resultMap = new HashMap();
+ Map code_map = new HashMap();
+
+ try {
+ String proposalObjId = CommonUtils.checkNull(paramMap.get("PROPOSAL_OBJID"));
+
+ if(!"".equals(proposalObjId)){
+ resultMap = commonService.selectOne("salesMng.getProposalInfo", request, paramMap);
+ } else {
+ resultMap.put("OBJID", CommonUtils.createObjId());
+ resultMap.put("STATUS", "create");
+ }
+
+ // 구매유형
+ code_map.put("purchase_type", commonService.bizMakeOptionList("0001821", (String)resultMap.get("PURCHASE_TYPE"), "common.getCodeselect"));
+ // 주문유형
+ code_map.put("order_type", commonService.bizMakeOptionList("0001822", (String)resultMap.get("ORDER_TYPE"), "common.getCodeselect"));
+ // 제품구분
+ code_map.put("product_name", commonService.bizMakeOptionList("0000016", (String)resultMap.get("PRODUCT_NAME"), "common.getCodeselect"));
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ request.setAttribute("resultMap", resultMap);
+ request.setAttribute("code_map", code_map);
+ return "/salesMng/proposalFormPopUp";
+ }
}