diff --git a/WebContent/WEB-INF/view/quality/processInspectionFormPopUp.jsp b/WebContent/WEB-INF/view/quality/processInspectionFormPopUp.jsp index a50e899..62517ed 100644 --- a/WebContent/WEB-INF/view/quality/processInspectionFormPopUp.jsp +++ b/WebContent/WEB-INF/view/quality/processInspectionFormPopUp.jsp @@ -1,13 +1,16 @@ <%@ 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"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> <%@ page import="com.pms.common.utils.*"%> <%@ page import="java.util.*" %> <%@include file= "/init.jsp" %> + <% -String menuObjId = request.getParameter("menuObjId"); -String menuName = CommonUtils.getMenuName(menuObjId, "공정검사 등록"); +PersonBean person = (PersonBean) session.getAttribute(Constants.PERSON_BEAN); +String connector = person.getUserId(); %> + + @@ -15,88 +18,471 @@ String menuName = CommonUtils.getMenuName(menuObjId, "공정검사 등록"); <%=Constants.SYSTEM_NAME%> + + - -
-
-
-

<%=menuName%>

-
- - -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
검사일프로젝트번호
품번품명
불량수량작업환경상태
측정기검사자
검사결과 - -
비고
+ + + + +
+

공정검사 등록

+
+ + + +
+ +
+
+ + +
+
+ + +
+
+ +
diff --git a/WebContent/WEB-INF/view/quality/processInspectionList.jsp b/WebContent/WEB-INF/view/quality/processInspectionList.jsp index f63c41e..dc5ead3 100644 --- a/WebContent/WEB-INF/view/quality/processInspectionList.jsp +++ b/WebContent/WEB-INF/view/quality/processInspectionList.jsp @@ -83,11 +83,16 @@ $(document).ready(function(){ // 컬럼: 검사일, 프로젝트번호, 품번, 품명, 불량수량, 작업환경상태, 측정기, 검사자, 검사결과 var columns = [ - {headerHozAlign:'center', hozAlign:'center', minWidth:110, widthGrow:1, title:'검사일', field:'INSPECTION_DATE'}, - {headerHozAlign:'center', hozAlign:'center', minWidth:130, widthGrow:1, title:'프로젝트번호', field:'PROJECT_NO'}, - {headerHozAlign:'center', hozAlign:'left', minWidth:140, widthGrow:2, title:'품번', field:'PART_NO'}, - {headerHozAlign:'center', hozAlign:'left', minWidth:180, widthGrow:3, title:'품명', field:'PART_NAME'}, - {headerHozAlign:'center', hozAlign:'right', minWidth:100, widthGrow:1, title:'불량수량', field:'DEFECT_QTY', + {headerHozAlign:'center', hozAlign:'center', minWidth:110, widthGrow:1, title:'검사일', field:'INSPECTION_DATE', + formatter: fnc_createGridAnchorTag, + cellClick: function(e, cell){ + fn_openFormPopUp(cell.getData().OBJID); + } + }, + {headerHozAlign:'center', hozAlign:'center', minWidth:150, widthGrow:2, title:'프로젝트번호', field:'PROJECT_NO'}, + {headerHozAlign:'center', hozAlign:'left', minWidth:180, widthGrow:2, title:'품번', field:'PART_NO'}, + {headerHozAlign:'center', hozAlign:'left', minWidth:200, widthGrow:3, title:'품명', field:'PART_NAME'}, + {headerHozAlign:'center', hozAlign:'right', minWidth:100, widthGrow:1, title:'불량수량 합계', field:'DEFECT_QTY', formatter:"money", formatterParams:{thousand:",", precision:false} }, {headerHozAlign:'center', hozAlign:'center', minWidth:120, widthGrow:1, title:'작업환경상태', field:'WORK_ENV_STATUS'}, @@ -103,6 +108,14 @@ var columns = [ } ]; +// 수정 팝업 +function fn_openFormPopUp(objId){ + var popup_width = 1500; + var popup_height = 700; + var url = "/quality/processInspectionFormPopUp.do?OBJID=" + objId; + window.open(url, "processInspectionPopUp", "width=" + popup_width + ",height=" + popup_height + ",scrollbars=yes,resizable=yes"); +} + // 조회 function fn_search(){ _tabulGrid = fnc_tabul_search(_tabul_layout_fitColumns, _tabulGrid, "/quality/processInspectionGridList.do", columns, true); @@ -110,41 +123,22 @@ function fn_search(){ // 검색조건 초기화 function fn_reset(){ + $("#search_inspection_date_from").val(""); + $("#search_inspection_date_to").val(""); + $("#search_inspector").val(""); $("#search_project_no").val(""); $("#search_part_no").val(""); $("#search_part_name").val(""); - $("#search_work_env_status").val(""); - $("#search_measuring_device").val(""); - $("#search_inspector").val(""); - $("#search_inspection_date_from").val(""); - $("#search_inspection_date_to").val(""); $("#search_inspection_result").val(""); } // 공정검사 등록 팝업 function fn_registPopUp(){ - var selected = _tabulGrid.getSelectedData(); - if(selected.length == 0){ - Swal.fire("선택된 데이터가 없습니다."); - return; - } - if(selected.length > 1){ - Swal.fire("한건씩 등록 가능합니다."); - return; - } - - var popup_width = 1200; - var popup_height = 800; - var hiddenForm = document.hiddenForm; - var target = "processInspectionPopUp"; + var popup_width = 1500; + var popup_height = 700; var url = "/quality/processInspectionFormPopUp.do"; - fn_centerPopup(popup_width, popup_height, "", target); - - hiddenForm.action = url; - hiddenForm.OBJID.value = selected[0].OBJID; - hiddenForm.target = target; - hiddenForm.submit(); + window.open(url, "processInspectionPopUp", "width=" + popup_width + ",height=" + popup_height + ",scrollbars=yes,resizable=yes"); } // 엑셀 다운로드 @@ -178,6 +172,16 @@ function fn_excelDownload(){
+
+ + + ~ + +
+
+ + +
@@ -190,24 +194,6 @@ function fn_excelDownload(){
-
- - -
-
- - -
-
- - -
-
- - - ~ - -
+ + + \ No newline at end of file diff --git a/src/com/pms/mapper/quality.xml b/src/com/pms/mapper/quality.xml index 682b00f..f548edb 100644 --- a/src/com/pms/mapper/quality.xml +++ b/src/com/pms/mapper/quality.xml @@ -881,74 +881,221 @@ 공정검사 관리 ===================================================== --> - + - + + + + + + + INSERT INTO PROCESS_INSPECTION_MASTER ( + OBJID + , INSPECTION_DATE + , INSPECTOR_ID + , REMARK + , WRITER + , REG_DATE + ) VALUES ( + #{OBJID} + , #{INSPECTION_DATE} + , #{INSPECTOR_ID} + , #{REMARK} + , #{WRITER} + , NOW() + ) + + + + + UPDATE PROCESS_INSPECTION_MASTER SET + INSPECTION_DATE = #{INSPECTION_DATE} + , INSPECTOR_ID = #{INSPECTOR_ID} + , REMARK = #{REMARK} + , MOD_DATE = NOW() + WHERE OBJID = #{OBJID} + + + + + INSERT INTO PROCESS_INSPECTION_DETAIL ( + OBJID + , MASTER_OBJID + , PROCESS_CD + , PROJECT_OBJID + , PART_OBJID + , PART_NO + , PART_NAME + , INSPECTION_QTY + , DEFECT_QTY + , WORK_ENV_STATUS + , MEASURING_DEVICE + , DEPT_CD + , USER_ID + , REMARK + , ACTION_STATUS + , INSPECTION_RESULT + , WRITER + , REG_DATE + ) VALUES ( + #{OBJID} + , #{MASTER_OBJID} + , #{PROCESS_CD} + , #{PROJECT_OBJID} + , #{PART_OBJID} + , #{PART_NO} + , #{PART_NAME} + , NULLIF(#{INSPECTION_QTY}, '')::NUMERIC + , NULLIF(#{DEFECT_QTY}, '')::NUMERIC + , #{WORK_ENV_STATUS} + , #{MEASURING_DEVICE} + , #{DEPT_CD} + , #{USER_ID} + , #{REMARK} + , #{ACTION_STATUS} + , #{INSPECTION_RESULT} + , #{WRITER} + , NOW() + ) + ON CONFLICT (OBJID) DO UPDATE SET + PROCESS_CD = #{PROCESS_CD} + , PROJECT_OBJID = #{PROJECT_OBJID} + , PART_OBJID = #{PART_OBJID} + , PART_NO = #{PART_NO} + , PART_NAME = #{PART_NAME} + , INSPECTION_QTY = NULLIF(#{INSPECTION_QTY}, '')::NUMERIC + , DEFECT_QTY = NULLIF(#{DEFECT_QTY}, '')::NUMERIC + , WORK_ENV_STATUS = #{WORK_ENV_STATUS} + , MEASURING_DEVICE = #{MEASURING_DEVICE} + , DEPT_CD = #{DEPT_CD} + , USER_ID = #{USER_ID} + , REMARK = #{REMARK} + , ACTION_STATUS = #{ACTION_STATUS} + , INSPECTION_RESULT = #{INSPECTION_RESULT} + , MOD_DATE = NOW() + + + + + DELETE FROM PROCESS_INSPECTION_DETAIL WHERE MASTER_OBJID = #{MASTER_OBJID} + + diff --git a/src/com/pms/service/QualityService.java b/src/com/pms/service/QualityService.java index 5b8c6e3..1f4f3a1 100644 --- a/src/com/pms/service/QualityService.java +++ b/src/com/pms/service/QualityService.java @@ -792,6 +792,94 @@ public class QualityService extends BaseService{ return resultList; } + /** + * 공정검사 저장 (마스터 + 디테일) + */ + public Map saveProcessInspection(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 masterObjId = CommonUtils.checkNull(paramMap.get("MASTER_OBJID")); + String inspectionDate = CommonUtils.checkNull(paramMap.get("INSPECTION_DATE")); + String inspectorId = CommonUtils.checkNull(paramMap.get("INSPECTOR_ID")); + String masterRemark = CommonUtils.checkNull(paramMap.get("MASTER_REMARK")); + String dataListJson = CommonUtils.checkNull(paramMap.get("dataList")); + + // 마스터 저장 + Map masterParamMap = new HashMap(); + masterParamMap.put("INSPECTION_DATE", inspectionDate); + masterParamMap.put("INSPECTOR_ID", inspectorId); + masterParamMap.put("REMARK", masterRemark); + masterParamMap.put("WRITER", writer); + + if(masterObjId.isEmpty()){ + // 신규 등록 + masterObjId = CommonUtils.checkNull(CommonUtils.createObjId()); + masterParamMap.put("OBJID", masterObjId); + sqlSession.insert("quality.insertProcessInspectionMaster", masterParamMap); + } else { + // 수정 + masterParamMap.put("OBJID", masterObjId); + sqlSession.update("quality.updateProcessInspectionMaster", masterParamMap); + // 기존 디테일 삭제 후 재등록 + Map deleteParamMap = new HashMap(); + deleteParamMap.put("MASTER_OBJID", masterObjId); + sqlSession.delete("quality.deleteProcessInspectionDetailByMaster", deleteParamMap); + } + + // 디테일 저장 + if(dataListJson != null && !dataListJson.isEmpty()){ + com.google.gson.Gson gson = new com.google.gson.Gson(); + java.lang.reflect.Type listType = new com.google.gson.reflect.TypeToken>>(){}.getType(); + List> dataList = gson.fromJson(dataListJson, listType); + + for(Map rowData : dataList){ + Map sqlParamMap = new HashMap(); + + String detailObjId = CommonUtils.checkNull(CommonUtils.createObjId()); + + sqlParamMap.put("OBJID", detailObjId); + sqlParamMap.put("MASTER_OBJID", masterObjId); + sqlParamMap.put("PROCESS_CD", CommonUtils.checkNull(rowData.get("PROCESS_CD"))); + sqlParamMap.put("PROJECT_OBJID", CommonUtils.checkNull(rowData.get("PROJECT_OBJID"))); + sqlParamMap.put("PART_OBJID", CommonUtils.checkNull(rowData.get("PART_OBJID"))); + sqlParamMap.put("PART_NO", CommonUtils.checkNull(rowData.get("PART_NO"))); + sqlParamMap.put("PART_NAME", CommonUtils.checkNull(rowData.get("PART_NAME"))); + sqlParamMap.put("INSPECTION_QTY", CommonUtils.checkNull(rowData.get("INSPECTION_QTY"))); + sqlParamMap.put("DEFECT_QTY", CommonUtils.checkNull(rowData.get("DEFECT_QTY"))); + sqlParamMap.put("WORK_ENV_STATUS", CommonUtils.checkNull(rowData.get("WORK_ENV_STATUS"))); + sqlParamMap.put("MEASURING_DEVICE", CommonUtils.checkNull(rowData.get("MEASURING_DEVICE"))); + sqlParamMap.put("DEPT_CD", CommonUtils.checkNull(rowData.get("DEPT_CD"))); + sqlParamMap.put("USER_ID", CommonUtils.checkNull(rowData.get("USER_ID"))); + sqlParamMap.put("REMARK", CommonUtils.checkNull(rowData.get("REMARK"))); + sqlParamMap.put("ACTION_STATUS", CommonUtils.checkNull(rowData.get("ACTION_STATUS"))); + sqlParamMap.put("INSPECTION_RESULT", CommonUtils.checkNull(rowData.get("INSPECTION_RESULT"))); + sqlParamMap.put("WRITER", writer); + + sqlSession.insert("quality.saveProcessInspectionDetail", sqlParamMap); + } + } + + resultMap.put("RESULT", "SUCCESS"); + resultMap.put("MASTER_OBJID", masterObjId); + + }catch(Exception e){ + e.printStackTrace(); + resultMap.put("RESULT", "FAIL"); + resultMap.put("MESSAGE", e.getMessage()); + }finally{ + if(sqlSession != null) sqlSession.close(); + } + + return resultMap; + } + // ===================================================== // 반제품검사 관리 // =====================================================