From 7c33c8b4ad0058c1d4d35bd56f50dbadc97c473e Mon Sep 17 00:00:00 2001 From: leeheejin Date: Wed, 17 Dec 2025 14:31:25 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B9=84=EA=B3=A0=EB=A7=8C=20=EC=97=86?= =?UTF-8?q?=EC=95=A0=EB=86=93=EA=B3=A0=20=EA=B2=B0=EC=9E=AC=EC=83=81?= =?UTF-8?q?=EC=8B=A0=20=EC=98=AC=EB=A0=A4=EB=86=93=EC=9D=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../classes/com/pms/mapper/quality.xml | 130 ++++++++++++++---- WebContent/WEB-INF/view/quality/ecrList.jsp | 35 +++++ .../view/quality/ecrRegistFormPopUp.jsp | 2 + .../view/quality/ecrResultFormPopUp.jsp | 8 +- 4 files changed, 142 insertions(+), 33 deletions(-) diff --git a/WebContent/WEB-INF/classes/com/pms/mapper/quality.xml b/WebContent/WEB-INF/classes/com/pms/mapper/quality.xml index da1d3e4..62f9569 100644 --- a/WebContent/WEB-INF/classes/com/pms/mapper/quality.xml +++ b/WebContent/WEB-INF/classes/com/pms/mapper/quality.xml @@ -1012,10 +1012,35 @@ @@ -1112,6 +1167,7 @@ , (SELECT CODE_NAME FROM COMM_CODE WHERE CODE_ID = PID.PROCESS_CD) AS PROCESS_NAME , PID.PROJECT_OBJID , (SELECT PROJECT_NO FROM PROJECT_MGMT WHERE OBJID = PID.PROJECT_OBJID) AS PROJECT_NO + , (SELECT CODE_NAME(PRODUCT) FROM PROJECT_MGMT WHERE OBJID = PID.PROJECT_OBJID) AS PRODUCT_NAME , PID.PART_OBJID , PID.PART_NO , PID.PART_NAME @@ -1123,9 +1179,16 @@ , (SELECT DEPT_NAME FROM DEPT_INFO WHERE OBJID::VARCHAR = PID.DEPT_CD) AS DEPT_NAME , PID.USER_ID , (SELECT USER_NAME FROM USER_INFO WHERE USER_ID = PID.USER_ID) AS USER_NAME + , PID.INSPECTION_DATE + , PID.INSPECTOR_ID + , (SELECT USER_NAME FROM USER_INFO WHERE USER_ID = PID.INSPECTOR_ID) AS INSPECTOR_NAME , PID.REMARK , PID.ACTION_STATUS , PID.INSPECTION_RESULT + /* 이미지파일 카운트 */ + , (SELECT COUNT(*) FROM ATTACH_FILE_INFO F WHERE F.TARGET_OBJID = PID.OBJID AND F.DOC_TYPE = 'PROCESS_INSPECTION_IMAGE' AND UPPER(F.STATUS) = 'ACTIVE') AS IMAGE_FILE_CNT + /* 첨부파일 카운트 */ + , (SELECT COUNT(*) FROM ATTACH_FILE_INFO F WHERE F.TARGET_OBJID = PID.OBJID AND F.DOC_TYPE = 'PROCESS_INSPECTION_FILE' AND UPPER(F.STATUS) = 'ACTIVE') AS ATTACH_FILE_CNT FROM PROCESS_INSPECTION_DETAIL PID WHERE PID.MASTER_OBJID = #{MASTER_OBJID} ORDER BY PID.REG_DATE @@ -1176,6 +1239,8 @@ , MEASURING_DEVICE , DEPT_CD , USER_ID + , INSPECTION_DATE + , INSPECTOR_ID , REMARK , ACTION_STATUS , INSPECTION_RESULT @@ -1195,6 +1260,8 @@ , #{MEASURING_DEVICE} , #{DEPT_CD} , #{USER_ID} + , #{INSPECTION_DATE} + , #{INSPECTOR_ID} , #{REMARK} , #{ACTION_STATUS} , #{INSPECTION_RESULT} @@ -1213,6 +1280,8 @@ , MEASURING_DEVICE = #{MEASURING_DEVICE} , DEPT_CD = #{DEPT_CD} , USER_ID = #{USER_ID} + , INSPECTION_DATE = #{INSPECTION_DATE} + , INSPECTOR_ID = #{INSPECTOR_ID} , REMARK = #{REMARK} , ACTION_STATUS = #{ACTION_STATUS} , INSPECTION_RESULT = #{INSPECTION_RESULT} @@ -1776,7 +1845,8 @@ , CCS.QTY , CCS.CUSTOMER_OBJID , (SELECT CLIENT_NM FROM CLIENT_MNG WHERE OBJID::VARCHAR = CCS.CUSTOMER_OBJID) AS CUSTOMER_NAME - , CCS.MODEL_NAME + , CCS.MODEL_NAME AS PRODUCT_TYPE + , CODE_NAME(CCS.MODEL_NAME) AS PRODUCT_TYPE_NAME , CCS.PRODUCT_NAME , CCS.PART_NO , CCS.PRODUCT_NO @@ -1786,8 +1856,11 @@ , CCS.SERIAL_NO , CCS.MANUFACTURER , CCS.COMPLAINT_CONTENT + , CCS.ACTION_TYPE + , CODE_NAME(CCS.ACTION_TYPE) AS ACTION_TYPE_NAME , CCS.ACTION_CONTENT , CCS.BLAME_DECISION + , CASE CCS.BLAME_DECISION WHEN 'R' THEN 'RPS' WHEN 'C' THEN '고객사' WHEN 'O' THEN '외주업체' ELSE CCS.BLAME_DECISION END AS BLAME_DECISION_NAME , CCS.STATUS , CCS.REMARK , CCS.ACTION_DATE @@ -1806,8 +1879,8 @@ AND CCS.CUSTOMER_OBJID = #{search_customer_objid} - - AND UPPER(CCS.MODEL_NAME) LIKE UPPER('%' || #{search_model_name} || '%') + + AND CCS.MODEL_NAME = #{search_product_type} AND UPPER(CCS.PRODUCT_NO) LIKE UPPER('%' || #{search_product_no} || '%') @@ -1856,7 +1929,8 @@ , CCS.QTY , CCS.CUSTOMER_OBJID , (SELECT CLIENT_NM FROM CLIENT_MNG WHERE OBJID::VARCHAR = CCS.CUSTOMER_OBJID) AS CUSTOMER_NAME - , CCS.MODEL_NAME + , CCS.MODEL_NAME AS PRODUCT_TYPE + , CODE_NAME(CCS.MODEL_NAME) AS PRODUCT_TYPE_NAME , CCS.PRODUCT_NAME , CCS.PART_NO , CCS.PRODUCT_NO @@ -1866,8 +1940,11 @@ , CCS.SERIAL_NO , CCS.MANUFACTURER , CCS.COMPLAINT_CONTENT + , CCS.ACTION_TYPE + , CODE_NAME(CCS.ACTION_TYPE) AS ACTION_TYPE_NAME , CCS.ACTION_CONTENT , CCS.BLAME_DECISION + , CASE CCS.BLAME_DECISION WHEN 'R' THEN 'RPS' WHEN 'C' THEN '고객사' WHEN 'O' THEN '외주업체' ELSE CCS.BLAME_DECISION END AS BLAME_DECISION_NAME , CCS.STATUS , CCS.REMARK , CCS.ACTION_DATE @@ -1962,6 +2039,7 @@ , STATUS = #{STATUS} , REMARK = #{REMARK} , MOD_DATE = NOW() + , ACTION_TYPE = #{ACTION_TYPE} WHERE OBJID = #{OBJID} diff --git a/WebContent/WEB-INF/view/quality/ecrList.jsp b/WebContent/WEB-INF/view/quality/ecrList.jsp index fdc5ae0..5a93bec 100644 --- a/WebContent/WEB-INF/view/quality/ecrList.jsp +++ b/WebContent/WEB-INF/view/quality/ecrList.jsp @@ -67,6 +67,11 @@ $(document).ready(function(){ fn_registResultPopUp(); }); + // 결재상신 + $("#btnApproval").click(function(){ + fn_approval(); + }); + fn_search(); }); @@ -217,6 +222,35 @@ function fn_FileRegist(objId, docType, docTypeName){ fn_centerPopup(popup_width, popup_height, url); } + +// 결재상신 +function fn_approval(){ + var selected = _tabulGrid.getSelectedData(); + if(selected.length == 0){ + Swal.fire("결재상신할 데이터를 선택해주세요."); + return; + } + if(selected.length > 1){ + Swal.fire("한번에 한개의 결재만 가능합니다."); + return; + } + + var title = fnc_checkNull(selected[0].ECR_NO) + " " + fnc_checkNull(selected[0].PART_NO); + var objId = fnc_checkNull(selected[0].OBJID); + + Swal.fire({ + title: '결재상신', + text: '결재상신 하시겠습니까?', + icon: 'question', + showCancelButton: true, + confirmButtonText: '확인', + cancelButtonText: '취소' + }).then((result) => { + if(result.isConfirmed){ + window.open("/approval/registApproval.do?targetType=ECR&targetObjId="+objId+"&approvalTitle="+encodeURIComponent(title)+"&callbackFnc=fn_search","registApproval","width=700,height=700"); + } + }); +} @@ -233,6 +267,7 @@ function fn_FileRegist(objId, docType, docTypeName){ <%=menuName%>
+ diff --git a/WebContent/WEB-INF/view/quality/ecrRegistFormPopUp.jsp b/WebContent/WEB-INF/view/quality/ecrRegistFormPopUp.jsp index cd7cfa4..cf25af4 100644 --- a/WebContent/WEB-INF/view/quality/ecrRegistFormPopUp.jsp +++ b/WebContent/WEB-INF/view/quality/ecrRegistFormPopUp.jsp @@ -204,12 +204,14 @@ function fn_save(){ +
diff --git a/WebContent/WEB-INF/view/quality/ecrResultFormPopUp.jsp b/WebContent/WEB-INF/view/quality/ecrResultFormPopUp.jsp index e633693..b5d610d 100644 --- a/WebContent/WEB-INF/view/quality/ecrResultFormPopUp.jsp +++ b/WebContent/WEB-INF/view/quality/ecrResultFormPopUp.jsp @@ -353,13 +353,7 @@ function fn_save(){ - - - - - - - +