diff --git a/WebContent/WEB-INF/classes/com/pms/mapper/quality.xml b/WebContent/WEB-INF/classes/com/pms/mapper/quality.xml
index aa9a253..43abae3 100644
--- a/WebContent/WEB-INF/classes/com/pms/mapper/quality.xml
+++ b/WebContent/WEB-INF/classes/com/pms/mapper/quality.xml
@@ -468,4 +468,338 @@
WHERE 1=1
AND OBJID = #{targetObjId}
+
+
+
+
+
+
+
+
+ INSERT INTO PMS_QUALITY_INSPECTION_TYPE (
+ OBJID
+ , INSPECTION_TYPE_NAME
+ , STATUS
+ , WRITER
+ , REG_DATE
+ ) VALUES (
+ #{OBJID}
+ , #{INSPECTION_TYPE_NAME}
+ , #{STATUS}
+ , #{writer}
+ , SYSDATE
+ )
+
+
+
+
+ UPDATE PMS_QUALITY_INSPECTION_TYPE
+ SET INSPECTION_TYPE_NAME = #{INSPECTION_TYPE_NAME}
+ , STATUS = #{STATUS}
+ WHERE OBJID = #{OBJID}
+
+
+
+
+ DELETE FROM PMS_QUALITY_INSPECTION_TYPE
+ WHERE OBJID = #{OBJID}
+
+
+
+
+
+
+
+ INSERT INTO PMS_QUALITY_DEFECT_TYPE (
+ OBJID
+ , DEFECT_TYPE_NAME
+ , STATUS
+ , WRITER
+ , REG_DATE
+ ) VALUES (
+ #{OBJID}
+ , #{DEFECT_TYPE_NAME}
+ , #{STATUS}
+ , #{writer}
+ , SYSDATE
+ )
+
+
+
+
+ UPDATE PMS_QUALITY_DEFECT_TYPE
+ SET DEFECT_TYPE_NAME = #{DEFECT_TYPE_NAME}
+ , STATUS = #{STATUS}
+ WHERE OBJID = #{OBJID}
+
+
+
+
+ DELETE FROM PMS_QUALITY_DEFECT_TYPE
+ WHERE OBJID = #{OBJID}
+
+
+
+
+
+
+
+ INSERT INTO PMS_QUALITY_DEFECT_REASON (
+ OBJID
+ , DEFECT_TYPE_OBJID
+ , DEFECT_REASON_NAME
+ , STATUS
+ , WRITER
+ , REG_DATE
+ ) VALUES (
+ #{OBJID}
+ , #{DEFECT_TYPE_OBJID}
+ , #{DEFECT_REASON_NAME}
+ , #{STATUS}
+ , #{writer}
+ , SYSDATE
+ )
+
+
+
+
+ UPDATE PMS_QUALITY_DEFECT_REASON
+ SET DEFECT_REASON_NAME = #{DEFECT_REASON_NAME}
+ , STATUS = #{STATUS}
+ WHERE OBJID = #{OBJID}
+
+
+
+
+ DELETE FROM PMS_QUALITY_DEFECT_REASON
+ WHERE OBJID = #{OBJID}
+
+
+
+
+ DELETE FROM PMS_QUALITY_DEFECT_REASON
+ WHERE DEFECT_TYPE_OBJID = #{OBJID}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ INSERT INTO PMS_QUALITY_INCOMING_INSPECTION (
+ OBJID
+ , PURCHASE_ORDER_MASTER_OBJID
+ , INSPECTOR_ID
+ , INSPECTION_DATE
+ , INSPECTION_RESULT
+ , INSPECTION_MEMO
+ , WRITER
+ , REG_DATE
+ ) VALUES (
+ #{OBJID}
+ , #{PURCHASE_ORDER_MASTER_OBJID}
+ , #{INSPECTOR_ID}
+ , TO_DATE(#{INSPECTION_DATE}, 'YYYY-MM-DD')
+ , #{INSPECTION_RESULT}
+ , #{INSPECTION_MEMO}
+ , #{writer}
+ , SYSDATE
+ )
+
+
+
+
+ UPDATE PMS_QUALITY_INCOMING_INSPECTION
+ SET INSPECTOR_ID = #{INSPECTOR_ID}
+ , INSPECTION_DATE = TO_DATE(#{INSPECTION_DATE}, 'YYYY-MM-DD')
+ , INSPECTION_RESULT = #{INSPECTION_RESULT}
+ , INSPECTION_MEMO = #{INSPECTION_MEMO}
+ WHERE OBJID = #{OBJID}
+
+
+
+
+
\ No newline at end of file
diff --git a/WebContent/WEB-INF/view/quality/customerCsActionFormPopUp.jsp b/WebContent/WEB-INF/view/quality/customerCsActionFormPopUp.jsp
new file mode 100644
index 0000000..9ddd305
--- /dev/null
+++ b/WebContent/WEB-INF/view/quality/customerCsActionFormPopUp.jsp
@@ -0,0 +1,136 @@
+<%@ 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" %>
+<%
+String menuObjId = request.getParameter("menuObjId");
+String menuName = CommonUtils.getMenuName(menuObjId, "조치결과 등록");
+Map info = (Map)request.getAttribute("info");
+if(info == null) info = new HashMap();
+%>
+
+
+
+
+ <%=Constants.SYSTEM_NAME%>
+
+
+
+
+
+
+
+
+
diff --git a/WebContent/WEB-INF/view/quality/customerCsDefectFormPopUp.jsp b/WebContent/WEB-INF/view/quality/customerCsDefectFormPopUp.jsp
new file mode 100644
index 0000000..e039471
--- /dev/null
+++ b/WebContent/WEB-INF/view/quality/customerCsDefectFormPopUp.jsp
@@ -0,0 +1,117 @@
+<%@ 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" %>
+<%
+String menuObjId = request.getParameter("menuObjId");
+String menuName = CommonUtils.getMenuName(menuObjId, "고객 불량 등록");
+%>
+
+
+
+
+ <%=Constants.SYSTEM_NAME%>
+
+
+
+
+
+
+
+
+
diff --git a/WebContent/WEB-INF/view/quality/customerCsList.jsp b/WebContent/WEB-INF/view/quality/customerCsList.jsp
new file mode 100644
index 0000000..0ae33ab
--- /dev/null
+++ b/WebContent/WEB-INF/view/quality/customerCsList.jsp
@@ -0,0 +1,271 @@
+<%@ 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" %>
+
+
+<%
+String menuObjId = request.getParameter("menuObjId");
+String menuName = CommonUtils.getMenuName(menuObjId, "고객 CS 관리");
+%>
+
+
+
+
+ <%=Constants.SYSTEM_NAME%>
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/WebContent/WEB-INF/view/quality/ecrList.jsp b/WebContent/WEB-INF/view/quality/ecrList.jsp
new file mode 100644
index 0000000..e1bdc82
--- /dev/null
+++ b/WebContent/WEB-INF/view/quality/ecrList.jsp
@@ -0,0 +1,233 @@
+<%@ 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" %>
+
+
+<%
+String menuObjId = request.getParameter("menuObjId");
+String menuName = CommonUtils.getMenuName(menuObjId, "ECR 관리");
+%>
+
+
+
+
+ <%=Constants.SYSTEM_NAME%>
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/WebContent/WEB-INF/view/quality/ecrRegistFormPopUp.jsp b/WebContent/WEB-INF/view/quality/ecrRegistFormPopUp.jsp
new file mode 100644
index 0000000..4af7f3c
--- /dev/null
+++ b/WebContent/WEB-INF/view/quality/ecrRegistFormPopUp.jsp
@@ -0,0 +1,94 @@
+<%@ 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" %>
+<%
+String menuObjId = request.getParameter("menuObjId");
+String menuName = CommonUtils.getMenuName(menuObjId, "ECR 등록");
+%>
+
+
+
+
+ <%=Constants.SYSTEM_NAME%>
+
+
+
+
+
+
+
+
+
diff --git a/WebContent/WEB-INF/view/quality/ecrResultFormPopUp.jsp b/WebContent/WEB-INF/view/quality/ecrResultFormPopUp.jsp
new file mode 100644
index 0000000..9950319
--- /dev/null
+++ b/WebContent/WEB-INF/view/quality/ecrResultFormPopUp.jsp
@@ -0,0 +1,121 @@
+<%@ 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" %>
+<%
+String menuObjId = request.getParameter("menuObjId");
+String menuName = CommonUtils.getMenuName(menuObjId, "ECR 결과등록");
+Map info = (Map)request.getAttribute("info");
+if(info == null) info = new HashMap();
+%>
+
+
+
+
+ <%=Constants.SYSTEM_NAME%>
+
+
+
+
+
+
+
+
+
diff --git a/WebContent/WEB-INF/view/quality/incomingInspectionFormPopUp.jsp b/WebContent/WEB-INF/view/quality/incomingInspectionFormPopUp.jsp
new file mode 100644
index 0000000..5414fe8
--- /dev/null
+++ b/WebContent/WEB-INF/view/quality/incomingInspectionFormPopUp.jsp
@@ -0,0 +1,187 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ 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/WebContent/WEB-INF/view/quality/incomingInspectionList.jsp b/WebContent/WEB-INF/view/quality/incomingInspectionList.jsp
new file mode 100644
index 0000000..7b48edf
--- /dev/null
+++ b/WebContent/WEB-INF/view/quality/incomingInspectionList.jsp
@@ -0,0 +1,300 @@
+<%@ 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" %>
+
+
+<%
+String menuObjId = request.getParameter("menuObjId");
+String menuName = CommonUtils.getMenuName(menuObjId, "수입검사 관리");
+%>
+
+
+
+
+ <%=Constants.SYSTEM_NAME%>
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/WebContent/WEB-INF/view/quality/processInspectionFormPopUp.jsp b/WebContent/WEB-INF/view/quality/processInspectionFormPopUp.jsp
new file mode 100644
index 0000000..a50e899
--- /dev/null
+++ b/WebContent/WEB-INF/view/quality/processInspectionFormPopUp.jsp
@@ -0,0 +1,102 @@
+<%@ 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" %>
+<%
+String menuObjId = request.getParameter("menuObjId");
+String menuName = CommonUtils.getMenuName(menuObjId, "공정검사 등록");
+%>
+
+
+
+
+ <%=Constants.SYSTEM_NAME%>
+
+
+
+
+
+
+
+
diff --git a/WebContent/WEB-INF/view/quality/processInspectionList.jsp b/WebContent/WEB-INF/view/quality/processInspectionList.jsp
new file mode 100644
index 0000000..f63c41e
--- /dev/null
+++ b/WebContent/WEB-INF/view/quality/processInspectionList.jsp
@@ -0,0 +1,227 @@
+<%@ 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" %>
+
+
+<%
+String menuObjId = request.getParameter("menuObjId");
+String menuName = CommonUtils.getMenuName(menuObjId, "공정검사 관리");
+%>
+
+
+
+
+ <%=Constants.SYSTEM_NAME%>
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/WebContent/WEB-INF/view/quality/qualityBasicInfoList.jsp b/WebContent/WEB-INF/view/quality/qualityBasicInfoList.jsp
new file mode 100644
index 0000000..d5c0190
--- /dev/null
+++ b/WebContent/WEB-INF/view/quality/qualityBasicInfoList.jsp
@@ -0,0 +1,668 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ page import="com.pms.common.utils.*"%>
+<%@ page import="java.util.*" %>
+<%@include file= "/init.jsp" %>
+<%
+ // 검사구분 목록
+ ArrayList inspectionTypeList = (ArrayList)request.getAttribute("inspectionTypeList");
+ if(null == inspectionTypeList) inspectionTypeList = new ArrayList();
+
+ // 불량유형 목록
+ ArrayList defectTypeList = (ArrayList)request.getAttribute("defectTypeList");
+ if(null == defectTypeList) defectTypeList = new ArrayList();
+
+ // 불량원인 목록
+ ArrayList defectReasonList = (ArrayList)request.getAttribute("defectReasonList");
+ if(null == defectReasonList) defectReasonList = new ArrayList();
+%>
+
+
+
+
+<%=Constants.SYSTEM_NAME%>
+
+
+
+
+
+
+
+
+
+
+
기초정보관리
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ※ 불량유형을 선택하면 해당 유형의 불량원인만 표시됩니다.
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/WebContent/WEB-INF/view/quality/semiProductInspectionFormPopUp.jsp b/WebContent/WEB-INF/view/quality/semiProductInspectionFormPopUp.jsp
new file mode 100644
index 0000000..489a000
--- /dev/null
+++ b/WebContent/WEB-INF/view/quality/semiProductInspectionFormPopUp.jsp
@@ -0,0 +1,90 @@
+<%@ 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" %>
+<%
+String menuObjId = request.getParameter("menuObjId");
+String menuName = CommonUtils.getMenuName(menuObjId, "반제품검사 등록");
+%>
+
+
+
+
+ <%=Constants.SYSTEM_NAME%>
+
+
+
+
+
+
+
+
+
diff --git a/WebContent/WEB-INF/view/quality/semiProductInspectionList.jsp b/WebContent/WEB-INF/view/quality/semiProductInspectionList.jsp
new file mode 100644
index 0000000..ef66061
--- /dev/null
+++ b/WebContent/WEB-INF/view/quality/semiProductInspectionList.jsp
@@ -0,0 +1,144 @@
+<%@ 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" %>
+
+
+<%
+String menuObjId = request.getParameter("menuObjId");
+String menuName = CommonUtils.getMenuName(menuObjId, "반제품검사 관리");
+%>
+
+
+
+
+ <%=Constants.SYSTEM_NAME%>
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/com/pms/controller/QualityController.java b/src/com/pms/controller/QualityController.java
index cbe0d16..f2672b1 100644
--- a/src/com/pms/controller/QualityController.java
+++ b/src/com/pms/controller/QualityController.java
@@ -193,4 +193,296 @@ public class QualityController {
return "/ajax/ajaxResult";
}
+ // =====================================================
+ // 품질관리 기초정보관리
+ // =====================================================
+
+ /**
+ * 기초정보관리 목록 화면
+ * @param request
+ * @param paramMap
+ * @return
+ */
+ @RequestMapping("/quality/qualityBasicInfoList.do")
+ public String qualityBasicInfoList(HttpServletRequest request, @RequestParam Map paramMap){
+ // 검사구분 목록
+ List inspectionTypeList = service.getInspectionTypeList(paramMap);
+ request.setAttribute("inspectionTypeList", inspectionTypeList);
+
+ // 불량유형 목록
+ List defectTypeList = service.getDefectTypeList(paramMap);
+ request.setAttribute("defectTypeList", defectTypeList);
+
+ // 불량원인 목록
+ List defectReasonList = service.getDefectReasonList(paramMap);
+ request.setAttribute("defectReasonList", defectReasonList);
+
+ return "/quality/qualityBasicInfoList";
+ }
+
+ /**
+ * 기초정보 저장
+ * @param request
+ * @param paramMap
+ * @return
+ */
+ @RequestMapping("/quality/saveQualityBasicInfo.do")
+ public String saveQualityBasicInfo(HttpServletRequest request, @RequestParam Map paramMap){
+ Map map = service.saveQualityBasicInfo(request, paramMap);
+ request.setAttribute("RESULT", CommonUtils.getJsonMap(map));
+ return "/ajax/ajaxResult";
+ }
+
+ /**
+ * 기초정보 삭제
+ * @param request
+ * @param paramMap
+ * @return
+ */
+ @RequestMapping("/quality/deleteQualityBasicInfo.do")
+ public String deleteQualityBasicInfo(HttpServletRequest request, @RequestParam Map paramMap){
+ Map map = service.deleteQualityBasicInfo(paramMap);
+ request.setAttribute("RESULT", CommonUtils.getJsonMap(map));
+ return "/ajax/ajaxResult";
+ }
+
+ // =====================================================
+ // 수입검사 관리
+ // =====================================================
+
+ /**
+ * 수입검사 관리 목록 화면
+ * @param request
+ * @param paramMap
+ * @return
+ */
+ @RequestMapping("/quality/incomingInspectionList.do")
+ public String incomingInspectionList(HttpServletRequest request, @RequestParam Map paramMap){
+ // 검색조건용 리스트 조회
+ List proposalNoList = service.getProposalNoList(paramMap);
+ List purchaseOrderNoList = service.getPurchaseOrderNoList(paramMap);
+ List projectNoList = service.getProjectNoList(paramMap);
+ List partnerList = service.getPartnerList(paramMap);
+ List inspectorList = service.getInspectorList(paramMap);
+
+ request.setAttribute("proposalNoList", proposalNoList);
+ request.setAttribute("purchaseOrderNoList", purchaseOrderNoList);
+ request.setAttribute("projectNoList", projectNoList);
+ request.setAttribute("partnerList", partnerList);
+ request.setAttribute("inspectorList", inspectorList);
+
+ return "/quality/incomingInspectionList";
+ }
+
+ /**
+ * 수입검사 관리 그리드 목록 조회
+ * @param request
+ * @param paramMap
+ * @return
+ */
+ @RequestMapping("/quality/incomingInspectionGridList.do")
+ public String incomingInspectionGridList(HttpServletRequest request, @RequestParam Map paramMap){
+ request.setAttribute("RESULT", CommonUtils.getJsonArray(service.getIncomingInspectionList(request, paramMap)));
+ return "/ajax/ajaxResult";
+ }
+
+ /**
+ * 수입검사 등록 팝업
+ * @param request
+ * @param paramMap
+ * @return
+ */
+ @RequestMapping("/quality/incomingInspectionFormPopUp.do")
+ public String incomingInspectionFormPopUp(HttpServletRequest request, @RequestParam Map paramMap){
+ Map info = service.getIncomingInspectionInfo(paramMap);
+ request.setAttribute("info", info);
+ return "/quality/incomingInspectionFormPopUp";
+ }
+
+ /**
+ * 수입검사 저장
+ * @param request
+ * @param paramMap
+ * @return
+ */
+ @RequestMapping("/quality/saveIncomingInspection.do")
+ public String saveIncomingInspection(HttpServletRequest request, @RequestParam Map paramMap){
+ Map map = service.saveIncomingInspection(request, paramMap);
+ request.setAttribute("RESULT", CommonUtils.getJsonMap(map));
+ return "/ajax/ajaxResult";
+ }
+
+ /**
+ * 수입검사 엑셀 다운로드
+ * @param request
+ * @param paramMap
+ * @return
+ */
+ @RequestMapping("/quality/incomingInspectionExcelDownload.do")
+ public String incomingInspectionExcelDownload(HttpServletRequest request, @RequestParam Map paramMap){
+ List list = service.getIncomingInspectionListForExcel(paramMap);
+ request.setAttribute("LIST", list);
+ return "/quality/incomingInspectionExcel";
+ }
+
+ // =====================================================
+ // 공정검사 관리
+ // =====================================================
+
+ /**
+ * 공정검사 관리 목록 화면
+ */
+ @RequestMapping("/quality/processInspectionList.do")
+ public String processInspectionList(HttpServletRequest request, @RequestParam Map paramMap){
+ return "/quality/processInspectionList";
+ }
+
+ /**
+ * 공정검사 관리 그리드 목록 조회
+ */
+ @RequestMapping("/quality/processInspectionGridList.do")
+ public String processInspectionGridList(HttpServletRequest request, @RequestParam Map paramMap){
+ request.setAttribute("RESULT", CommonUtils.getJsonArray(service.getProcessInspectionList(request, paramMap)));
+ return "/ajax/ajaxResult";
+ }
+
+ /**
+ * 공정검사 등록 팝업
+ */
+ @RequestMapping("/quality/processInspectionFormPopUp.do")
+ public String processInspectionFormPopUp(HttpServletRequest request, @RequestParam Map paramMap){
+ Map info = service.getProcessInspectionInfo(paramMap);
+ request.setAttribute("info", info);
+ return "/quality/processInspectionFormPopUp";
+ }
+
+ /**
+ * 공정검사 엑셀 다운로드
+ */
+ @RequestMapping("/quality/processInspectionExcelDownload.do")
+ public String processInspectionExcelDownload(HttpServletRequest request, @RequestParam Map paramMap){
+ List list = service.getProcessInspectionListForExcel(paramMap);
+ request.setAttribute("LIST", list);
+ return "/quality/processInspectionExcel";
+ }
+
+ // =====================================================
+ // 반제품검사 관리
+ // =====================================================
+
+ /**
+ * 반제품검사 관리 목록 화면
+ */
+ @RequestMapping("/quality/semiProductInspectionList.do")
+ public String semiProductInspectionList(HttpServletRequest request, @RequestParam Map paramMap){
+ return "/quality/semiProductInspectionList";
+ }
+
+ /**
+ * 반제품검사 관리 그리드 목록 조회
+ */
+ @RequestMapping("/quality/semiProductInspectionGridList.do")
+ public String semiProductInspectionGridList(HttpServletRequest request, @RequestParam Map paramMap){
+ request.setAttribute("RESULT", CommonUtils.getJsonArray(service.getSemiProductInspectionList(request, paramMap)));
+ return "/ajax/ajaxResult";
+ }
+
+ /**
+ * 반제품검사 등록 팝업
+ */
+ @RequestMapping("/quality/semiProductInspectionFormPopUp.do")
+ public String semiProductInspectionFormPopUp(HttpServletRequest request, @RequestParam Map paramMap){
+ Map info = service.getSemiProductInspectionInfo(paramMap);
+ request.setAttribute("info", info);
+ return "/quality/semiProductInspectionFormPopUp";
+ }
+
+ /**
+ * 반제품검사 엑셀 다운로드
+ */
+ @RequestMapping("/quality/semiProductInspectionExcelDownload.do")
+ public String semiProductInspectionExcelDownload(HttpServletRequest request, @RequestParam Map paramMap){
+ List list = service.getSemiProductInspectionList(request, paramMap);
+ request.setAttribute("LIST", list);
+ return "/quality/semiProductInspectionExcel";
+ }
+
+ // =====================================================
+ // 고객 CS 관리
+ // =====================================================
+
+ /**
+ * 고객 CS 관리 목록 화면
+ */
+ @RequestMapping("/quality/customerCsList.do")
+ public String customerCsList(HttpServletRequest request, @RequestParam Map paramMap){
+ return "/quality/customerCsList";
+ }
+
+ /**
+ * 고객 CS 관리 그리드 목록 조회
+ */
+ @RequestMapping("/quality/customerCsGridList.do")
+ public String customerCsGridList(HttpServletRequest request, @RequestParam Map paramMap){
+ request.setAttribute("RESULT", CommonUtils.getJsonArray(service.getCustomerCsList(request, paramMap)));
+ return "/ajax/ajaxResult";
+ }
+
+ /**
+ * 고객 불량 등록 팝업
+ */
+ @RequestMapping("/quality/customerCsDefectFormPopUp.do")
+ public String customerCsDefectFormPopUp(HttpServletRequest request, @RequestParam Map paramMap){
+ return "/quality/customerCsDefectFormPopUp";
+ }
+
+ /**
+ * 조치결과 등록 팝업
+ */
+ @RequestMapping("/quality/customerCsActionFormPopUp.do")
+ public String customerCsActionFormPopUp(HttpServletRequest request, @RequestParam Map paramMap){
+ Map info = service.getCustomerCsInfo(paramMap);
+ request.setAttribute("info", info);
+ return "/quality/customerCsActionFormPopUp";
+ }
+
+ // =====================================================
+ // ECR 관리
+ // =====================================================
+
+ /**
+ * ECR 관리 목록 화면
+ */
+ @RequestMapping("/quality/ecrList.do")
+ public String qualityEcrList(HttpServletRequest request, @RequestParam Map paramMap){
+ return "/quality/ecrList";
+ }
+
+ /**
+ * ECR 관리 그리드 목록 조회
+ */
+ @RequestMapping("/quality/ecrGridList.do")
+ public String ecrGridList(HttpServletRequest request, @RequestParam Map paramMap){
+ request.setAttribute("RESULT", CommonUtils.getJsonArray(service.getEcrList(request, paramMap)));
+ return "/ajax/ajaxResult";
+ }
+
+ /**
+ * ECR 등록 팝업
+ */
+ @RequestMapping("/quality/ecrRegistFormPopUp.do")
+ public String ecrRegistFormPopUp(HttpServletRequest request, @RequestParam Map paramMap){
+ return "/quality/ecrRegistFormPopUp";
+ }
+
+ /**
+ * ECR 결과등록 팝업
+ */
+ @RequestMapping("/quality/ecrResultFormPopUp.do")
+ public String ecrResultFormPopUp(HttpServletRequest request, @RequestParam Map paramMap){
+ Map info = service.getEcrInfo(paramMap);
+ request.setAttribute("info", info);
+ return "/quality/ecrResultFormPopUp";
+ }
+
}
diff --git a/src/com/pms/mapper/quality.xml b/src/com/pms/mapper/quality.xml
index aa9a253..cbb7e8a 100644
--- a/src/com/pms/mapper/quality.xml
+++ b/src/com/pms/mapper/quality.xml
@@ -468,4 +468,646 @@
WHERE 1=1
AND OBJID = #{targetObjId}
+
+
+
+
+
+
+
+
+ INSERT INTO PMS_QUALITY_INSPECTION_TYPE (
+ OBJID
+ , INSPECTION_TYPE_NAME
+ , STATUS
+ , WRITER
+ , REG_DATE
+ ) VALUES (
+ #{OBJID}
+ , #{INSPECTION_TYPE_NAME}
+ , #{STATUS}
+ , #{writer}
+ , SYSDATE
+ )
+
+
+
+
+ UPDATE PMS_QUALITY_INSPECTION_TYPE
+ SET INSPECTION_TYPE_NAME = #{INSPECTION_TYPE_NAME}
+ , STATUS = #{STATUS}
+ WHERE OBJID = #{OBJID}
+
+
+
+
+ DELETE FROM PMS_QUALITY_INSPECTION_TYPE
+ WHERE OBJID = #{OBJID}
+
+
+
+
+
+
+
+ INSERT INTO PMS_QUALITY_DEFECT_TYPE (
+ OBJID
+ , DEFECT_TYPE_NAME
+ , STATUS
+ , WRITER
+ , REG_DATE
+ ) VALUES (
+ #{OBJID}
+ , #{DEFECT_TYPE_NAME}
+ , #{STATUS}
+ , #{writer}
+ , SYSDATE
+ )
+
+
+
+
+ UPDATE PMS_QUALITY_DEFECT_TYPE
+ SET DEFECT_TYPE_NAME = #{DEFECT_TYPE_NAME}
+ , STATUS = #{STATUS}
+ WHERE OBJID = #{OBJID}
+
+
+
+
+ DELETE FROM PMS_QUALITY_DEFECT_TYPE
+ WHERE OBJID = #{OBJID}
+
+
+
+
+
+
+
+ INSERT INTO PMS_QUALITY_DEFECT_REASON (
+ OBJID
+ , DEFECT_TYPE_OBJID
+ , DEFECT_REASON_NAME
+ , STATUS
+ , WRITER
+ , REG_DATE
+ ) VALUES (
+ #{OBJID}
+ , #{DEFECT_TYPE_OBJID}
+ , #{DEFECT_REASON_NAME}
+ , #{STATUS}
+ , #{writer}
+ , SYSDATE
+ )
+
+
+
+
+ UPDATE PMS_QUALITY_DEFECT_REASON
+ SET DEFECT_REASON_NAME = #{DEFECT_REASON_NAME}
+ , STATUS = #{STATUS}
+ WHERE OBJID = #{OBJID}
+
+
+
+
+ DELETE FROM PMS_QUALITY_DEFECT_REASON
+ WHERE OBJID = #{OBJID}
+
+
+
+
+ DELETE FROM PMS_QUALITY_DEFECT_REASON
+ WHERE DEFECT_TYPE_OBJID = #{OBJID}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ INSERT INTO PMS_QUALITY_INCOMING_INSPECTION (
+ OBJID
+ , PURCHASE_ORDER_MASTER_OBJID
+ , INSPECTOR_ID
+ , INSPECTION_DATE
+ , INSPECTION_RESULT
+ , INSPECTION_MEMO
+ , WRITER
+ , REG_DATE
+ ) VALUES (
+ #{OBJID}
+ , #{PURCHASE_ORDER_MASTER_OBJID}
+ , #{INSPECTOR_ID}
+ , TO_DATE(#{INSPECTION_DATE}, 'YYYY-MM-DD')
+ , #{INSPECTION_RESULT}
+ , #{INSPECTION_MEMO}
+ , #{writer}
+ , SYSDATE
+ )
+
+
+
+
+ UPDATE PMS_QUALITY_INCOMING_INSPECTION
+ SET INSPECTOR_ID = #{INSPECTOR_ID}
+ , INSPECTION_DATE = TO_DATE(#{INSPECTION_DATE}, 'YYYY-MM-DD')
+ , INSPECTION_RESULT = #{INSPECTION_RESULT}
+ , INSPECTION_MEMO = #{INSPECTION_MEMO}
+ WHERE OBJID = #{OBJID}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/com/pms/service/QualityService.java b/src/com/pms/service/QualityService.java
index d87a5a8..9a00419 100644
--- a/src/com/pms/service/QualityService.java
+++ b/src/com/pms/service/QualityService.java
@@ -325,8 +325,546 @@ public class QualityService extends BaseService{
/*jmpark end*/
+ // =====================================================
+ // 품질관리 기초정보관리
+ // =====================================================
+ /**
+ * 검사구분 목록 조회
+ * @param paramMap
+ * @return
+ */
+ public List getInspectionTypeList(Map paramMap){
+ List resultList = new ArrayList();
+ SqlSession sqlSession = null;
+
+ try{
+ sqlSession = SqlMapConfig.getInstance().getSqlSession();
+ resultList = sqlSession.selectList("quality.getInspectionTypeList", paramMap);
+ }catch(Exception e){
+ e.printStackTrace();
+ }finally{
+ sqlSession.close();
+ }
+
+ return resultList;
+ }
+ /**
+ * 불량유형 목록 조회
+ * @param paramMap
+ * @return
+ */
+ public List getDefectTypeList(Map paramMap){
+ List resultList = new ArrayList();
+ SqlSession sqlSession = null;
+
+ try{
+ sqlSession = SqlMapConfig.getInstance().getSqlSession();
+ resultList = sqlSession.selectList("quality.getDefectTypeList", paramMap);
+ }catch(Exception e){
+ e.printStackTrace();
+ }finally{
+ sqlSession.close();
+ }
+
+ return resultList;
+ }
+
+ /**
+ * 불량원인 목록 조회
+ * @param paramMap
+ * @return
+ */
+ public List getDefectReasonList(Map paramMap){
+ List resultList = new ArrayList();
+ SqlSession sqlSession = null;
+
+ try{
+ sqlSession = SqlMapConfig.getInstance().getSqlSession();
+ resultList = sqlSession.selectList("quality.getDefectReasonList", paramMap);
+ }catch(Exception e){
+ e.printStackTrace();
+ }finally{
+ sqlSession.close();
+ }
+
+ return resultList;
+ }
+
+ /**
+ * 기초정보 저장
+ * @param request
+ * @param paramMap
+ * @return
+ */
+ public Map saveQualityBasicInfo(HttpServletRequest request, Map paramMap){
+ Map resultMap = new HashMap();
+ SqlSession sqlSession = null;
+
+ try{
+ sqlSession = SqlMapConfig.getInstance().getSqlSession(false);
+
+ PersonBean person = (PersonBean)request.getSession().getAttribute(Constants.PERSON_BEAN);
+ String writer = CommonUtils.checkNull(person.getUserId());
+ String type = CommonUtils.checkNull(paramMap.get("TYPE"));
+ String dataJson = CommonUtils.checkNull(paramMap.get("DATA"));
+
+ // JSON 파싱
+ com.google.gson.Gson gson = new com.google.gson.Gson();
+ java.lang.reflect.Type listType = new com.google.gson.reflect.TypeToken>>(){}.getType();
+ List