diff --git a/WebContent/WEB-INF/view/quality/ecrList.jsp b/WebContent/WEB-INF/view/quality/ecrList.jsp index e1bdc82..fdc5ae0 100644 --- a/WebContent/WEB-INF/view/quality/ecrList.jsp +++ b/WebContent/WEB-INF/view/quality/ecrList.jsp @@ -18,10 +18,17 @@ String menuName = CommonUtils.getMenuName(menuObjId, "ECR 관리"); @@ -179,50 +240,69 @@ function fn_openAttachFilePopUp(objId){
-
-
- - - ~ - -
-
- - -
-
- - -
-
- - -
-
- - - ~ - -
-
- - -
-
- - -
-
- - -
-
- - - ~ - -
-
+ + + + + + + + + + + + + + + + + + + + + + + + +
+ ~ + + + + + + + + + + ~ + + + +
+ + + + + ~ + +
<%@include file= "/WEB-INF/view/common/common_gridArea.jsp" %> diff --git a/WebContent/WEB-INF/view/quality/ecrRegistFormPopUp.jsp b/WebContent/WEB-INF/view/quality/ecrRegistFormPopUp.jsp index 4af7f3c..cd7cfa4 100644 --- a/WebContent/WEB-INF/view/quality/ecrRegistFormPopUp.jsp +++ b/WebContent/WEB-INF/view/quality/ecrRegistFormPopUp.jsp @@ -3,21 +3,61 @@ <%@ 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" %> +<%@include file= "/init_new.jsp" %> <% String menuObjId = request.getParameter("menuObjId"); String menuName = CommonUtils.getMenuName(menuObjId, "ECR 등록"); +String actionType = CommonUtils.checkNull(request.getParameter("actionType")); + +// OBJID가 없으면 신규 생성 (첨부파일 연결용) +String objId = CommonUtils.checkNull(request.getAttribute("info") != null ? ((Map)request.getAttribute("info")).get("objid") : ""); +boolean isNew = objId.isEmpty() || "new".equals(actionType); +if(objId.isEmpty()){ + objId = String.valueOf(CommonUtils.createObjId()); +} %> <%=Constants.SYSTEM_NAME%> +
-
-
-

<%=menuName%>

-
- - -
+ + + + + +
+
+

+ <%=menuName%> +

+
+ +
+
+ 요청 정보
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
요청일요청자완료요청일
품번품명
조치부서조치담당자
이슈사항
비고
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + +
+ + + +
+ +
+ +
+ +
+
+ +
+
+ +
+ +
- diff --git a/WebContent/WEB-INF/view/quality/ecrResultFormPopUp.jsp b/WebContent/WEB-INF/view/quality/ecrResultFormPopUp.jsp index 9950319..e633693 100644 --- a/WebContent/WEB-INF/view/quality/ecrResultFormPopUp.jsp +++ b/WebContent/WEB-INF/view/quality/ecrResultFormPopUp.jsp @@ -3,23 +3,102 @@ <%@ 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" %> +<%@include file= "/init_new.jsp" %> <% String menuObjId = request.getParameter("menuObjId"); -String menuName = CommonUtils.getMenuName(menuObjId, "ECR 결과등록"); +String actionType = CommonUtils.checkNull(request.getParameter("actionType")); +// 뷰 모드인지 판단 +boolean isViewMode = "view".equals(actionType); +String menuName = isViewMode ? "ECR 결과조회" : CommonUtils.getMenuName(menuObjId, "ECR 결과등록"); + Map info = (Map)request.getAttribute("info"); if(info == null) info = new HashMap(); + +String objId = CommonUtils.checkNull(info.get("objid")); + +// 오늘 날짜 +String today = new java.text.SimpleDateFormat("yyyy-MM-dd").format(new java.util.Date()); +String completeDate = CommonUtils.checkNull(info.get("complete_date")); +if(completeDate.isEmpty()) completeDate = today; + +// 조치자 - 기본값 로그인 사용자 +String actionUserId = CommonUtils.checkNull(info.get("action_user_id")); +if(actionUserId.isEmpty()) actionUserId = connectUserId; %> <%=Constants.SYSTEM_NAME%> +
- "> -
-
-

<%=menuName%>

-
- - + + +
+
+

+ <%=menuName%> +

+
+ +
+
+ +
+
+ ECR 요청 정보 +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
${info.ecr_no}${info.request_date}
${info.requester_name}${info.due_date}
${info.part_no}${info.part_name}
${info.action_dept_name}${info.action_manager_name}
+ +
+ +
+
+
+ + +
+
+ 조치결과 등록 +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ +
+
+ + +
+
+
+
+
+ + +
+
+
+ + + + + + + + + + + + + +
No파일명등록일Size
+
+
+ + + + + + + + + +
+
+
+
+
-
-

■ ECR 요청 정보

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ECR No" readonly>요청일" readonly>요청자" readonly>
품번" readonly>품명" style="width:100%;" readonly>
완료요청일" readonly>조치부서" readonly>조치담당자" readonly>
이슈사항
- -

■ 조치 결과

- - - - - - - - - - - - - - - - - - - - - - - - -
조치자">완료일">
조치내용
비고
+
+ +
+
+ +
+ +
- diff --git a/src/com/pms/controller/QualityController.java b/src/com/pms/controller/QualityController.java index ea8c213..9035e09 100644 --- a/src/com/pms/controller/QualityController.java +++ b/src/com/pms/controller/QualityController.java @@ -592,16 +592,31 @@ public class QualityController { */ @RequestMapping("/quality/ecrList.do") public String qualityEcrList(HttpServletRequest request, @RequestParam Map paramMap){ + Map code_map = new HashMap(); + try { + // 요청자 목록 + code_map.put("requester_id", commonService.bizMakeOptionList("", CommonUtils.nullToEmpty((String)paramMap.get("search_requester")), "common.getUserselect")); + // 부서 목록 + code_map.put("dept_cd", commonService.bizMakeOptionList("", CommonUtils.nullToEmpty((String)paramMap.get("search_action_dept")), "common.getDeptselect")); + // 조치담당자 목록 + code_map.put("action_manager_id", commonService.bizMakeOptionList("", CommonUtils.nullToEmpty((String)paramMap.get("search_action_manager")), "common.getUserselect")); + // 조치자 목록 + code_map.put("action_user_id", commonService.bizMakeOptionList("", CommonUtils.nullToEmpty((String)paramMap.get("search_action_user")), "common.getUserselect")); + } catch(Exception e) { + e.printStackTrace(); + } + request.setAttribute("code_map", code_map); return "/quality/ecrList"; } /** * ECR 관리 그리드 목록 조회 */ + @ResponseBody @RequestMapping("/quality/ecrGridList.do") - public String ecrGridList(HttpServletRequest request, @RequestParam Map paramMap){ - request.setAttribute("RESULT", CommonUtils.getJsonArray(service.getEcrList(request, paramMap))); - return "/ajax/ajaxResult"; + public Map ecrGridList(HttpServletRequest request, @RequestParam Map paramMap){ + commonService.selectListPagingNew("quality.getEcrList", request, paramMap); + return paramMap; } /** @@ -609,17 +624,67 @@ public class QualityController { */ @RequestMapping("/quality/ecrRegistFormPopUp.do") public String ecrRegistFormPopUp(HttpServletRequest request, @RequestParam Map paramMap){ + Map code_map = new HashMap(); + Map info = new HashMap(); + + try { + String objId = CommonUtils.checkNull(paramMap.get("OBJID")); + if(!objId.isEmpty()) { + info = service.getEcrInfo(paramMap); + request.setAttribute("info", info); + } + // 부서 목록 + code_map.put("dept_cd", commonService.bizMakeOptionList("", CommonUtils.nullToEmpty((String)info.get("action_dept")), "common.getDeptselect")); + // 요청자 목록 + code_map.put("requester_id", commonService.bizMakeOptionList("", CommonUtils.nullToEmpty((String)info.get("requester_id")), "common.getUserselect")); + // 조치담당자 목록 + code_map.put("action_manager_id", commonService.bizMakeOptionList("", CommonUtils.nullToEmpty((String)info.get("action_manager_id")), "common.getUserselect")); + } catch(Exception e) { + e.printStackTrace(); + } + + request.setAttribute("code_map", code_map); return "/quality/ecrRegistFormPopUp"; } + /** + * ECR 저장 + */ + @ResponseBody + @RequestMapping("/quality/saveEcr.do") + public Map saveEcr(HttpServletRequest request, @RequestParam Map paramMap){ + return service.saveEcr(request, paramMap); + } + /** * ECR 결과등록 팝업 */ @RequestMapping("/quality/ecrResultFormPopUp.do") public String ecrResultFormPopUp(HttpServletRequest request, @RequestParam Map paramMap){ - Map info = service.getEcrInfo(paramMap); - request.setAttribute("info", info); + Map code_map = new HashMap(); + Map info = new HashMap(); + + try { + info = service.getEcrInfo(paramMap); + request.setAttribute("info", info); + + // 조치자 목록 + code_map.put("action_user_id", commonService.bizMakeOptionList("", CommonUtils.nullToEmpty((String)info.get("action_user_id")), "common.getUserselect")); + } catch(Exception e) { + e.printStackTrace(); + } + + request.setAttribute("code_map", code_map); return "/quality/ecrResultFormPopUp"; } + /** + * ECR 결과 저장 + */ + @ResponseBody + @RequestMapping("/quality/saveEcrResult.do") + public Map saveEcrResult(HttpServletRequest request, @RequestParam Map paramMap){ + return service.saveEcrResult(request, paramMap); + } + } diff --git a/src/com/pms/mapper/quality.xml b/src/com/pms/mapper/quality.xml index 7534ba4..0135031 100644 --- a/src/com/pms/mapper/quality.xml +++ b/src/com/pms/mapper/quality.xml @@ -1339,28 +1339,30 @@ @@ -1408,20 +1410,22 @@ + + + + + + INSERT INTO PMS_QUALITY_ECR ( + OBJID + , ECR_NO + , REQUEST_DATE + , REQUESTER_ID + , PART_OBJID + , PART_NO + , PART_NAME + , ISSUE_CONTENT + , DUE_DATE + , ACTION_DEPT + , ACTION_MANAGER_ID + , ATTACH_FILE_OBJID + , REMARK + , WRITER + , REG_DATE + ) VALUES ( + #{OBJID} + , #{ECR_NO} + , #{REQUEST_DATE} + , #{REQUESTER_ID} + , #{PART_OBJID} + , #{PART_NO} + , #{PART_NAME} + , #{ISSUE_CONTENT} + , #{DUE_DATE} + , #{ACTION_DEPT} + , #{ACTION_MANAGER_ID} + , #{ATTACH_FILE_OBJID} + , #{REMARK} + , #{WRITER} + , NOW() + ) + + + + + UPDATE PMS_QUALITY_ECR SET + REQUEST_DATE = #{REQUEST_DATE} + , REQUESTER_ID = #{REQUESTER_ID} + , PART_OBJID = #{PART_OBJID} + , PART_NO = #{PART_NO} + , PART_NAME = #{PART_NAME} + , ISSUE_CONTENT = #{ISSUE_CONTENT} + , DUE_DATE = #{DUE_DATE} + , ACTION_DEPT = #{ACTION_DEPT} + , ACTION_MANAGER_ID = #{ACTION_MANAGER_ID} + , REMARK = #{REMARK} + , MODIFIER = #{WRITER} + , MOD_DATE = NOW() + WHERE OBJID = #{OBJID} + + + + + UPDATE PMS_QUALITY_ECR SET + ACTION_USER_ID = #{ACTION_USER_ID} + , ACTION_CONTENT = #{ACTION_CONTENT} + , COMPLETE_DATE = #{COMPLETE_DATE} + , MODIFIER = #{MODIFIER} + , MOD_DATE = NOW() + WHERE OBJID = #{OBJID} + + diff --git a/src/com/pms/service/QualityService.java b/src/com/pms/service/QualityService.java index 60c4355..c5580b3 100644 --- a/src/com/pms/service/QualityService.java +++ b/src/com/pms/service/QualityService.java @@ -1039,23 +1039,7 @@ public class QualityService extends BaseService{ // ===================================================== // ECR 관리 // ===================================================== - - /** - * ECR 목록 조회 - */ - public List getEcrList(HttpServletRequest request, Map paramMap){ - List resultList = new ArrayList(); - SqlSession sqlSession = null; - try{ - sqlSession = SqlMapConfig.getInstance().getSqlSession(); - resultList = sqlSession.selectList("quality.getEcrList", paramMap); - }catch(Exception e){ - e.printStackTrace(); - }finally{ - sqlSession.close(); - } - return resultList; - } + /** * ECR 상세 조회 @@ -1074,6 +1058,96 @@ public class QualityService extends BaseService{ return resultMap; } + /** + * ECR 저장 (등록/수정) + */ + public Map saveEcr(HttpServletRequest request, Map paramMap){ + Map resultMap = new HashMap(); + SqlSession sqlSession = null; + + try{ + sqlSession = SqlMapConfig.getInstance().getSqlSession(); + + // 작성자 정보 설정 + PersonBean person = (PersonBean) request.getSession().getAttribute(Constants.PERSON_BEAN); + String writer = person != null ? person.getUserId() : ""; + + String objId = CommonUtils.checkNull(paramMap.get("OBJID")); + String isNew = CommonUtils.checkNull(paramMap.get("IS_NEW")); + paramMap.put("WRITER", writer); + + // IS_NEW 플래그로 신규/수정 구분 + if("true".equals(isNew)){ + // 신규 등록 + if(objId.isEmpty()){ + objId = CommonUtils.checkNull(CommonUtils.createObjId()); + paramMap.put("OBJID", objId); + } + + // ECR_NO 생성 (ECR-YYYYMM-순번) 예) ECR-202512-01 + String yyyymm = new java.text.SimpleDateFormat("yyyyMM").format(new java.util.Date()); + paramMap.put("YYYYMM", yyyymm); + Integer seq = sqlSession.selectOne("quality.getEcrSeq", paramMap); + if(seq == null) seq = 1; + String ecrNo = "ECR-" + yyyymm + "-" + String.format("%02d", seq); + paramMap.put("ECR_NO", ecrNo); + paramMap.put("ATTACH_FILE_OBJID", objId); + + sqlSession.insert("quality.insertEcr", paramMap); + } else { + // 수정 + sqlSession.update("quality.updateEcr", paramMap); + } + + sqlSession.commit(); + resultMap.put("RESULT", "SUCCESS"); + resultMap.put("MESSAGE", "저장되었습니다."); + + }catch(Exception e){ + if(sqlSession != null) sqlSession.rollback(); + resultMap.put("RESULT", "FAIL"); + resultMap.put("MESSAGE", e.getMessage()); + e.printStackTrace(); + }finally{ + if(sqlSession != null) sqlSession.close(); + } + + return resultMap; + } + + /** + * ECR 결과 저장 + */ + public Map saveEcrResult(HttpServletRequest request, Map paramMap){ + Map resultMap = new HashMap(); + SqlSession sqlSession = null; + + try{ + sqlSession = SqlMapConfig.getInstance().getSqlSession(); + + // 작성자 정보 설정 + PersonBean person = (PersonBean) request.getSession().getAttribute(Constants.PERSON_BEAN); + String writer = person != null ? person.getUserId() : ""; + paramMap.put("MODIFIER", writer); + + sqlSession.update("quality.updateEcrResult", paramMap); + + sqlSession.commit(); + resultMap.put("RESULT", "SUCCESS"); + resultMap.put("MESSAGE", "저장되었습니다."); + + }catch(Exception e){ + if(sqlSession != null) sqlSession.rollback(); + resultMap.put("RESULT", "FAIL"); + resultMap.put("MESSAGE", e.getMessage()); + e.printStackTrace(); + }finally{ + if(sqlSession != null) sqlSession.close(); + } + + return resultMap; + } + /*edhwang start*/ /*edhwang end*/