diff --git a/WebContent/WEB-INF/view/quality/customerCsList.jsp b/WebContent/WEB-INF/view/quality/customerCsList.jsp index ec3775b..2662b1b 100644 --- a/WebContent/WEB-INF/view/quality/customerCsList.jsp +++ b/WebContent/WEB-INF/view/quality/customerCsList.jsp @@ -59,6 +59,11 @@ $(document).ready(function(){ fn_registActionPopUp(); }); + // 삭제 + $("#btnDelete").click(function(){ + fn_delete(); + }); + fn_search(); }); @@ -239,6 +244,67 @@ function fn_FileRegist(objId, docType, docTypeName){ fn_centerPopup(popup_width, popup_height, url); } + +// 삭제 +function fn_delete(){ + var selected = _tabulGrid.getSelectedData(); + if(selected.length == 0){ + Swal.fire("삭제할 데이터를 선택해주세요."); + return; + } + + // 선택된 OBJID 목록 추출 + var objIds = []; + for(var i = 0; i < selected.length; i++){ + objIds.push(selected[i].OBJID); + } + + Swal.fire({ + title: '삭제 확인', + text: selected.length + '건의 데이터를 삭제하시겠습니까?', + icon: 'warning', + showCancelButton: true, + confirmButtonColor: '#d33', + cancelButtonColor: '#3085d6', + confirmButtonText: '삭제', + cancelButtonText: '취소' + }).then((result) => { + if(result.isConfirmed){ + $.ajax({ + url: "/quality/deleteCustomerCs.do", + type: "POST", + data: { + objIds: JSON.stringify(objIds) + }, + dataType: "json", + success: function(response){ + if(response.result){ + Swal.fire({ + icon: 'success', + title: '삭제 완료', + text: response.msg + }).then(function(){ + fn_search(); + }); + } else { + Swal.fire({ + icon: 'error', + title: '삭제 실패', + text: response.msg + }); + } + }, + error: function(xhr, status, error){ + Swal.fire({ + icon: 'error', + title: '오류', + text: '삭제 중 오류가 발생했습니다.' + }); + } + }); + } + }); +} @@ -257,6 +323,7 @@ function fn_FileRegist(objId, docType, docTypeName){
+
@@ -284,25 +351,22 @@ function fn_FileRegist(objId, docType, docTypeName){ --> - + - + - + + - @@ -312,7 +376,7 @@ function fn_FileRegist(objId, docType, docTypeName){ - diff --git a/WebContent/WEB-INF/view/quality/processInspectionList.jsp b/WebContent/WEB-INF/view/quality/processInspectionList.jsp index 758201f..7cb6c00 100644 --- a/WebContent/WEB-INF/view/quality/processInspectionList.jsp +++ b/WebContent/WEB-INF/view/quality/processInspectionList.jsp @@ -141,17 +141,6 @@ function fn_search(){ _tabulGrid = fnc_tabul_search(_tabul_layout_fitColumns, _tabulGrid, "/quality/processInspectionGridList.do", columns, true); } -// 검색조건 초기화 -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_inspection_result").val(""); -} - // 공정검사 등록 팝업 function fn_registPopUp(){ var popup_width = 1500; @@ -184,7 +173,8 @@ function fn_excelDownload(){ search_inspection_date_from: $("#search_inspection_date_from").val() || "", search_inspection_date_to: $("#search_inspection_date_to").val() || "", search_inspector: $("#search_inspector").val() || "", - search_inspection_result: $("#search_inspection_result").val() || "" + search_inspection_result: $("#search_inspection_result").val() || "", + search_process_cd: $("#search_process_cd").val() || "" }; $.ajax({ @@ -351,7 +341,7 @@ async function fn_createExcelFile(data){ - @@ -360,7 +350,7 @@ async function fn_createExcelFile(data){ - @@ -384,12 +374,20 @@ async function fn_createExcelFile(data){ - + + + + + diff --git a/WebContent/WEB-INF/view/quality/semiProductInspectionList.jsp b/WebContent/WEB-INF/view/quality/semiProductInspectionList.jsp index 6cda045..3100b37 100644 --- a/WebContent/WEB-INF/view/quality/semiProductInspectionList.jsp +++ b/WebContent/WEB-INF/view/quality/semiProductInspectionList.jsp @@ -58,6 +58,15 @@ $(document).ready(function(){ $('.select2').select2(); fnc_datepick(); + // DOM 렌더링 완료 후 그리드 높이 계산 + setTimeout(function() { + fnc_calculateContentHeight("gridDiv", 10); + }, 100); + + $(window).resize(function() { + fnc_calculateContentHeight("gridDiv", 10); + }); + $("input").keyup(function(e){ if(e.keyCode == 13){ $("#page").val("1"); @@ -92,7 +101,9 @@ function fn_excelDownload(){ search_part_no: $("#search_part_no").val() || "", search_part_name: $("#search_part_name").val() || "", search_inspection_date: $("#search_inspection_date").val() || "", - search_writer: $("#search_writer").val() || "" + search_writer: $("#search_writer").val() || "", + search_defect_type: $("#search_defect_type").val() || "", + search_responsible_dept: $("#search_responsible_dept").val() || "" }; $.ajax({ @@ -243,9 +254,70 @@ var columns = [ } ]; -// 조회 +// 조회 (Total 합계 표시 포함) function fn_search(){ - _tabulGrid = fnc_tabul_search(_tabul_layout_fitColumns, _tabulGrid, "/quality/semiProductInspectionGridList.do", columns, true); + var formData = $("#form1").serializeObject(); + + $.ajax({ + url: "/quality/semiProductInspectionGridList.do", + type: "POST", + data: formData, + dataType: "json", + beforeSend: function(){ + _startLoading("Loading..."); + }, + complete: function(){ + _endLoading(); + }, + success: function(response) { + // 그리드 데이터 설정 + if(_tabulGrid){ + _tabulGrid.setData(response.RESULTLIST || []); + } else { + _tabulGrid = new Tabulator("#mainGrid", { + height: "100%", + layout: _tabul_layout_fitColumns, + columns: columns, + data: response.RESULTLIST || [], + selectable: true + }); + } + + // Total 합계 계산 + var totalReceiptQty = 0; // 총 입고수량 + var totalGoodQty = 0; // 총 양품수량 + var totalDefectiveQty = 0; // 총 불량수량 + var totalRegenerationQty = 0; // 총 재생수량 + var totalFinalGoodQty = 0; // 총 최종양품수량 + + if(response.RESULTLIST && response.RESULTLIST.length > 0) { + response.RESULTLIST.forEach(function(row) { + totalReceiptQty += parseFloat(row.RECEIPT_QTY || 0); + totalGoodQty += parseFloat(row.GOOD_QTY || 0); + totalDefectiveQty += parseFloat(row.DEFECTIVE_QTY || 0); + totalRegenerationQty += parseFloat(row.REGENERATION_QTY || 0); + totalFinalGoodQty += parseFloat(row.FINAL_GOOD_QTY || 0); + }); + } + + // 합계 표시 + $("#totalReceiptQty").text(Number(totalReceiptQty).toLocaleString()); + $("#totalGoodQty").text(Number(totalGoodQty).toLocaleString()); + $("#totalDefectiveQty").text(Number(totalDefectiveQty).toLocaleString()); + $("#totalRegenerationQty").text(Number(totalRegenerationQty).toLocaleString()); + $("#totalFinalGoodQty").text(Number(totalFinalGoodQty).toLocaleString()); + + // 페이징 HTML 업데이트 + if(response.PAGE_HTML){ + $(".table_paging_wrap").html(response.PAGE_HTML); + } + }, + error: function(xhr, status, error) { + _endLoading(); + alert("데이터 조회 중 오류가 발생했습니다."); + console.error("Error:", error); + } + }); } // 검사일 클릭 시 검사결과 확인/수정 팝업 @@ -370,9 +442,37 @@ function fn_registPopUp(){ + + + + + + + + + + + + +
+ + Total 총 입고수량: 0EA    + Total 총 양품수량: 0EA    + Total 총 불량수량: 0EA    + Total 총 재생수량: 0EA    + Total 총 최종양품수량: 0 + +
+ <%@include file= "/WEB-INF/view/common/common_gridArea.jsp" %> diff --git a/src/com/pms/controller/QualityController.java b/src/com/pms/controller/QualityController.java index ab9efce..2a7c9a5 100644 --- a/src/com/pms/controller/QualityController.java +++ b/src/com/pms/controller/QualityController.java @@ -524,8 +524,10 @@ public class QualityController { code_map.put("project_no", commonService.bizMakeOptionList("", (String)paramMap.get("search_project_no"), "common.getProjectNameList")); // 검사자 목록 code_map.put("inspector_id", commonService.bizMakeOptionList("", (String)paramMap.get("search_inspector"), "common.getUserselect")); - //제품구분 - code_map.put("product_cd", commonService.bizMakeOptionList("0000001", (String)paramMap.get("productType"),"common.getCodeselect")); + // 제품구분 + code_map.put("product_cd", commonService.bizMakeOptionList("0000001", (String)paramMap.get("productType"),"common.getCodeselect")); + // 진행공정 목록 + code_map.put("process_cd", commonService.bizMakeOptionList("0001870", (String)paramMap.get("search_process_cd"),"common.getCodeselect")); } catch(Exception e) { e.printStackTrace(); } @@ -642,6 +644,10 @@ public class QualityController { code_map.put("inspection_date", commonService.bizMakeOptionList("", (String)paramMap.get("search_inspection_date"), "quality.getSemiProductInspectionDateList")); // 검사자 드롭박스 code_map.put("writer", commonService.bizMakeOptionList("", (String)paramMap.get("search_writer"), "quality.getSemiProductWriterList")); + // 불량유형 드롭박스 + code_map.put("defect_type", commonService.bizMakeOptionList("", (String)paramMap.get("search_defect_type"), "quality.getSemiProductDefectTypeList")); + // 귀책부서 드롭박스 + code_map.put("responsible_dept", commonService.bizMakeOptionList("", (String)paramMap.get("search_responsible_dept"), "quality.getSemiProductResponsibleDeptList")); request.setAttribute("code_map", code_map); // 엑셀 다운로드 @@ -840,6 +846,15 @@ public class QualityController { return service.saveCustomerCsAction(request, paramMap); } + /** + * 고객 CS 삭제 + */ + @ResponseBody + @RequestMapping("/quality/deleteCustomerCs.do") + public Map deleteCustomerCs(HttpServletRequest request, @RequestParam Map paramMap){ + return service.deleteCustomerCs(paramMap); + } + // ===================================================== // ECR 관리 // ===================================================== diff --git a/src/com/pms/mapper/quality.xml b/src/com/pms/mapper/quality.xml index abf423f..7010232 100644 --- a/src/com/pms/mapper/quality.xml +++ b/src/com/pms/mapper/quality.xml @@ -1208,6 +1208,12 @@ AND (SELECT CASE WHEN COUNT(CASE WHEN PID.INSPECTION_RESULT = 'NG' THEN 1 END) > 0 THEN 'NG' ELSE 'OK' END FROM PROCESS_INSPECTION_DETAIL PID WHERE PID.MASTER_OBJID = PIM.OBJID) = #{search_inspection_result} + /* 진행공정 */ + + AND EXISTS (SELECT 1 FROM PROCESS_INSPECTION_DETAIL PID + WHERE PID.MASTER_OBJID = PIM.OBJID + AND PID.PROCESS_CD = #{search_process_cd}) + ORDER BY PIM.REG_DATE DESC @@ -1411,6 +1417,10 @@ AND PID.INSPECTION_RESULT = #{search_inspection_result} + /* 진행공정 */ + + AND PID.PROCESS_CD = #{search_process_cd} + ORDER BY PIM.INSPECTION_DATE DESC, PIM.REG_DATE DESC, PID.REG_DATE @@ -1486,17 +1496,17 @@ AND (T2.INSPECTOR IS NOT NULL OR T2.WRITER IS NOT NULL)) sub WHERE val IS NOT NULL AND val != '' ) AS WRITER_NAME - - , SUM(T.RECEIPT_QTY) AS RECEIPT_QTY - , SUM(T.GOOD_QTY) AS GOOD_QTY - , SUM(T.DEFECT_QTY) AS DEFECTIVE_QTY + + , SUM(CASE WHEN T.DATA_TYPE = 'GOOD' THEN T.RECEIPT_QTY ELSE 0 END) AS RECEIPT_QTY + , SUM(CASE WHEN T.DATA_TYPE = 'GOOD' THEN T.GOOD_QTY ELSE 0 END) AS GOOD_QTY + , SUM(CASE WHEN T.DATA_TYPE = 'DEFECT' THEN T.DEFECT_QTY ELSE 0 END) AS DEFECTIVE_QTY , CASE - WHEN SUM(T.RECEIPT_QTY) > 0 - THEN ROUND(SUM(T.DEFECT_QTY) * 100.0 / SUM(T.RECEIPT_QTY), 2) + WHEN SUM(CASE WHEN T.DATA_TYPE = 'GOOD' THEN T.RECEIPT_QTY ELSE 0 END) > 0 + THEN ROUND(SUM(CASE WHEN T.DATA_TYPE = 'DEFECT' THEN T.DEFECT_QTY ELSE 0 END) * 100.0 / SUM(CASE WHEN T.DATA_TYPE = 'GOOD' THEN T.RECEIPT_QTY ELSE 0 END), 2) ELSE 0 END AS DEFECT_RATE - , SUM(CASE WHEN T.DISPOSITION_TYPE = '수정' THEN T.DEFECT_QTY ELSE 0 END) AS REGENERATION_QTY - , SUM(T.GOOD_QTY) + SUM(CASE WHEN T.DISPOSITION_TYPE = '수정' THEN T.DEFECT_QTY ELSE 0 END) AS FINAL_GOOD_QTY + , SUM(CASE WHEN T.DATA_TYPE = 'DEFECT' AND T.DISPOSITION_TYPE = '수정' THEN T.DEFECT_QTY ELSE 0 END) AS REGENERATION_QTY + , SUM(CASE WHEN T.DATA_TYPE = 'GOOD' THEN T.GOOD_QTY ELSE 0 END) + SUM(CASE WHEN T.DATA_TYPE = 'DEFECT' AND T.DISPOSITION_TYPE = '수정' THEN T.DEFECT_QTY ELSE 0 END) AS FINAL_GOOD_QTY FROM ( SELECT SPI.OBJID , COALESCE(SPI.MODEL_NAME, '') AS MODEL_NAME @@ -1537,6 +1547,14 @@ AND SPI.WRITER = #{search_writer} + + + AND UPPER(SPI.DEFECT_TYPE) LIKE UPPER('%' || #{search_defect_type} || '%') + + + + AND UPPER(SPI.RESPONSIBLE_DEPT) LIKE UPPER('%' || #{search_responsible_dept} || '%') + ) T GROUP BY T.INSPECTION_GROUP_ID ORDER BY MIN(T.INSPECTION_DATE) DESC, T.INSPECTION_GROUP_ID @@ -1645,6 +1663,24 @@ ORDER BY NAME + + + + + +