diff --git a/WebContent/WEB-INF/classes/com/pms/mapper/purchaseOrder.xml b/WebContent/WEB-INF/classes/com/pms/mapper/purchaseOrder.xml index 66fd97a..e4fbb29 100644 --- a/WebContent/WEB-INF/classes/com/pms/mapper/purchaseOrder.xml +++ b/WebContent/WEB-INF/classes/com/pms/mapper/purchaseOrder.xml @@ -544,11 +544,14 @@ EFFECTIVE_DATE, PAYMENT_TERMS, REMARK, + REQUEST_CONTENT, WRITER, REGDATE, STATUS, SALES_REQUEST_OBJID, - SALES_MNG_USER_ID + SALES_MNG_USER_ID, + SALES_MNG_USER_ID2, + FORM_TYPE ,TITLE ,PURCHASE_DATE ,CONTRACT_MGMT_OBJID @@ -562,6 +565,7 @@ ,TOTAL_REAL_SUPPLY_PRICE ,DISCOUNT_PRICE ,TOTAL_PRICE + ,TOTAL_PRICE_ALL ,NEGO_RATE ,SUPPLY_BUS_NO ,SUPPLY_USER_NAME @@ -597,14 +601,17 @@ #{EFFECTIVE_DATE}, #{PAYMENT_TERMS}, #{REMARK}, + #{REQUEST_CONTENT}, #{WRITER}, NOW(), #{STATUS}, #{SALES_REQUEST_OBJID}, - #{SALES_MNG_USER_ID} + #{SALES_MNG_USER_ID}, + #{SALES_MNG_USER_ID2}, + #{FORM_TYPE} ,#{TITLE} ,#{PURCHASE_DATE} - ,#{CONTRACT_MGMT_OBJID}::NUMERIC + ,#{CONTRACT_MGMT_OBJID} ,#{TYPE } ,#{INSPECT_METHOD } ,#{TOTAL_PRICE_TXT } @@ -615,6 +622,7 @@ ,#{TOTAL_REAL_SUPPLY_PRICE} ,#{DISCOUNT_PRICE } ,#{TOTAL_PRICE } + ,#{TOTAL_PRICE_ALL } ,#{NEGO_RATE } ,#{SUPPLY_BUS_NO } ,#{SUPPLY_USER_NAME } @@ -650,12 +658,17 @@ EFFECTIVE_DATE = #{EFFECTIVE_DATE}, PAYMENT_TERMS = #{PAYMENT_TERMS}, REMARK = #{REMARK}, + REQUEST_CONTENT = #{REQUEST_CONTENT}, WRITER = #{WRITER}, STATUS = #{STATUS}, - SALES_MNG_USER_ID = #{SALES_MNG_USER_ID} + SALES_MNG_USER_ID = #{SALES_MNG_USER_ID}, + SALES_MNG_USER_ID2 = #{SALES_MNG_USER_ID2} + + ,FORM_TYPE = #{FORM_TYPE} + ,TITLE = #{TITLE} ,PURCHASE_DATE = #{PURCHASE_DATE} - ,CONTRACT_MGMT_OBJID = #{CONTRACT_MGMT_OBJID}::NUMERIC + ,CONTRACT_MGMT_OBJID = #{CONTRACT_MGMT_OBJID} ,TYPE = #{TYPE } ,INSPECT_METHOD = #{INSPECT_METHOD } ,TOTAL_PRICE_TXT = #{TOTAL_PRICE_TXT } @@ -669,6 +682,7 @@ ,TOTAL_REAL_SUPPLY_PRICE = #{TOTAL_REAL_SUPPLY_PRICE} ,DISCOUNT_PRICE = #{DISCOUNT_PRICE } ,TOTAL_PRICE = #{TOTAL_PRICE } + ,TOTAL_PRICE_ALL = #{TOTAL_PRICE_ALL } ,NEGO_RATE = #{NEGO_RATE } ,SUPPLY_BUS_NO = #{SUPPLY_BUS_NO } ,SUPPLY_USER_NAME = #{SUPPLY_USER_NAME } @@ -736,7 +750,8 @@ REGDATE, STATUS, SALES_REQUEST_OBJID, - SALES_MNG_USER_ID + SALES_MNG_USER_ID, + FORM_TYPE ,TITLE ,PURCHASE_DATE ,CONTRACT_MGMT_OBJID @@ -775,7 +790,8 @@ NOW(), 'create', #{SALES_REQUEST_OBJID}, - #{SALES_MNG_USER_ID} + #{SALES_MNG_USER_ID}, + #{FORM_TYPE} ,#{TITLE} ,#{PURCHASE_DATE} ,NULLIF(#{PROJECT_NO}::TEXT, '')::NUMERIC @@ -813,7 +829,7 @@ SALES_MNG_USER_ID = #{SALES_MNG_USER_ID} ,TITLE = #{TITLE} ,PURCHASE_DATE = #{PURCHASE_DATE} - ,CONTRACT_MGMT_OBJID = NULLIF(#{CONTRACT_MGMT_OBJID}::TEXT, '')::NUMERIC + ,CONTRACT_MGMT_OBJID = #{CONTRACT_MGMT_OBJID} ,TYPE = #{TYPE } ,INSPECT_METHOD = #{INSPECT_METHOD } ,TOTAL_PRICE_TXT = #{TOTAL_PRICE_TXT } @@ -970,7 +986,7 @@ #{SALES_MNG_USER_ID} ,#{TITLE} ,#{PURCHASE_DATE} - ,#{CONTRACT_MGMT_OBJID}::NUMERIC + ,#{CONTRACT_MGMT_OBJID} ,#{TYPE } ,#{INSPECT_METHOD } ,#{TOTAL_PRICE_TXT } @@ -1157,6 +1173,10 @@ ,STOCK_QTY ,REAL_ORDER_QTY ,REAL_SUPPLY_PRICE + ,PART_DELIVERY_PLACE + ,PRODUCT_NAME + ,WORK_ORDER_NO + ,DELIVERY_REQUEST_DATE ) VALUES ( @@ -1196,6 +1216,10 @@ ,REPLACE(#{STOCK_QTY} ::VARCHAR, ',', '') ,REPLACE(#{REAL_ORDER_QTY} ::VARCHAR, ',', '') ,REPLACE(#{REAL_SUPPLY_PRICE} ::VARCHAR, ',', '') + ,#{PART_DELIVERY_PLACE} + ,#{PRODUCT_NAME} + ,#{WORK_ORDER_NO} + ,#{DELIVERY_REQUEST_DATE} ) ON CONFLICT (OBJID) DO UPDATE SET @@ -1223,6 +1247,10 @@ ,STOCK_QTY = REPLACE(#{STOCK_QTY} ::VARCHAR, ',', '') ,REAL_ORDER_QTY = REPLACE(#{REAL_ORDER_QTY} ::VARCHAR, ',', '') ,REAL_SUPPLY_PRICE = REPLACE(#{REAL_SUPPLY_PRICE} ::VARCHAR, ',', '') + ,PART_DELIVERY_PLACE = #{PART_DELIVERY_PLACE} + ,PRODUCT_NAME = #{PRODUCT_NAME} + ,WORK_ORDER_NO = #{WORK_ORDER_NO} + ,DELIVERY_REQUEST_DATE = #{DELIVERY_REQUEST_DATE} SELECT T1.OBJID ,T1.BUS_REG_NO AS SUPPLY_BUS_NO - ,(CASE WHEN T2.OBJID IS NULL THEN T1.CHARGE_USER_NAME ELSE T2.CHARGER_NAME END) AS SUPPLY_USER_NAME - ,(CASE WHEN T2.OBJID IS NULL THEN T1.SUPPLY_TEL_NO ELSE T2.PHONE END) AS SUPPLY_USER_HP - ,(CASE WHEN T2.OBJID IS NULL THEN T1.OFFICE_NO ELSE T2.TEL END) AS SUPPLY_USER_TEL - ,(CASE WHEN T2.OBJID IS NULL THEN T1.SUPPLY_FAX_NO ELSE T2.FAX END) AS SUPPLY_USER_FAX - ,(CASE WHEN T2.OBJID IS NULL THEN T1.EMAIL ELSE T2.EMAIL END) AS SUPPLY_USER_EMAIL - ,T1.SUPPLY_ADDRESS AS SUPPLY_ADDR - FROM ADMIN_SUPPLY_MNG AS T1 - LEFT OUTER JOIN - (SELECT * FROM (SELECT DENSE_RANK() OVER(PARTITION BY T.SUPPLY_OBJID ORDER BY T.CHARGER_NAME ASC) AS TOP, T.* - FROM SUPPLY_CHARGER_MNG T WHERE CHARGER_TYPE = '0000330' /*발주서공급처담당*/ - ) AS T WHERE TOP = 1 - ) AS T2 - ON T1.OBJID = T2.SUPPLY_OBJID::NUMERIC + ,T1.CEO_NM AS SUPPLY_USER_NAME + ,T1.VENDOR_MOBILE AS SUPPLY_USER_HP + ,T1.TEL_NO AS SUPPLY_USER_TEL + ,T1.FAX_NO AS SUPPLY_USER_FAX + ,T1.EMAIL AS SUPPLY_USER_EMAIL + ,CONCAT(COALESCE(T1.ADDR1,''), ' ', COALESCE(T1.ADDR2,'')) AS SUPPLY_ADDR + FROM CLIENT_MNG AS T1 WHERE 1=1 - AND T1.OBJID = #{PARTNER_OBJID}::NUMERIC + AND T1.OBJID::VARCHAR = #{PARTNER_OBJID}::VARCHAR + SELECT + AP.ORDER_PART_OBJID AS OBJID + ,AP.PART_OBJID + ,COALESCE(CASE WHEN POM.TYPE IN ('0001070','0001069') THEN PM.PART_NO ELSE POP.PART_NO END, PM.PART_NO, '') AS PART_NO + ,COALESCE(POP.PART_NAME, PM.PART_NAME, '') AS PART_NAME + ,COALESCE(POP.PART_NAME, PM.PART_NAME, '') AS MODEL_NAME + ,COALESCE(POM.PURCHASE_ORDER_NO, '') AS WORK_ORDER_NO + ,COALESCE(SUM(AP.RECEIPT_QTY::NUMERIC), 0) AS RECEIPT_QTY + FROM ARRIVAL_PLAN AP + LEFT JOIN PURCHASE_ORDER_PART POP ON POP.OBJID = AP.ORDER_PART_OBJID + LEFT JOIN PART_MNG PM ON PM.OBJID::VARCHAR = AP.PART_OBJID OR PM.OBJID = POP.PART_OBJID + LEFT JOIN PURCHASE_ORDER_MASTER POM ON POM.OBJID = AP.PARENT_OBJID + WHERE AP.RECEIPT_QTY IS NOT NULL + AND AP.RECEIPT_QTY::NUMERIC > 0 + AND AP.INVENTORY_STATUS = 'Y' + GROUP BY AP.ORDER_PART_OBJID, AP.PART_OBJID, POP.PART_NO, POP.PART_NAME, PM.PART_NO, PM.PART_NAME, POM.PURCHASE_ORDER_NO, POM.TYPE + ORDER BY PART_NO + + \ No newline at end of file diff --git a/WebContent/WEB-INF/classes/com/pms/mapper/quality.xml b/WebContent/WEB-INF/classes/com/pms/mapper/quality.xml index 43abae3..62f9569 100644 --- a/WebContent/WEB-INF/classes/com/pms/mapper/quality.xml +++ b/WebContent/WEB-INF/classes/com/pms/mapper/quality.xml @@ -660,64 +660,205 @@ @@ -731,13 +872,13 @@ , A.INSPECTION_MEMO , A.WRITER , TO_CHAR(A.REG_DATE, 'YYYY-MM-DD') AS REG_DATE - FROM PMS_QUALITY_INCOMING_INSPECTION A + FROM QUALITY_INCOMING_INSPECTION A WHERE A.OBJID = #{OBJID} - INSERT INTO PMS_QUALITY_INCOMING_INSPECTION ( + INSERT INTO QUALITY_INCOMING_INSPECTION ( OBJID , PURCHASE_ORDER_MASTER_OBJID , INSPECTOR_ID @@ -760,7 +901,7 @@ - UPDATE PMS_QUALITY_INCOMING_INSPECTION + UPDATE QUALITY_INCOMING_INSPECTION SET INSPECTOR_ID = #{INSPECTOR_ID} , INSPECTION_DATE = TO_DATE(#{INSPECTION_DATE}, 'YYYY-MM-DD') , INSPECTION_RESULT = #{INSPECTION_RESULT} @@ -768,38 +909,1581 @@ WHERE OBJID = #{OBJID} - + + + + + + + + + + + + + + + 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 + , INSPECTION_DATE + , INSPECTOR_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} + , #{INSPECTION_DATE} + , #{INSPECTOR_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} + , INSPECTION_DATE = #{INSPECTION_DATE} + , INSPECTOR_ID = #{INSPECTOR_ID} + , REMARK = #{REMARK} + , ACTION_STATUS = #{ACTION_STATUS} + , INSPECTION_RESULT = #{INSPECTION_RESULT} + , MOD_DATE = NOW() + + + + + DELETE FROM PROCESS_INSPECTION_DETAIL WHERE MASTER_OBJID = #{MASTER_OBJID} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO PMS_QUALITY_SEMI_PRODUCT_INSPECTION ( + OBJID + , PROJECT_NO + , WORK_ORDER_NO + , PART_NO + , PART_NAME + , RECEIPT_QTY + , DISPOSITION_TYPE + , REMARK + , WRITER + , REG_DATE + ) VALUES ( + #{OBJID} + , #{PROJECT_NO} + , #{WORK_ORDER_NO} + , #{PART_NO} + , #{PART_NAME} + , #{RECEIPT_QTY}::NUMERIC + , #{DISPOSITION_TYPE} + , #{REMARK} + , #{WRITER} + , NOW() + ) + + + + + UPDATE PMS_QUALITY_SEMI_PRODUCT_INSPECTION + SET PROJECT_NO = #{PROJECT_NO} + , WORK_ORDER_NO = #{WORK_ORDER_NO} + , PART_NO = #{PART_NO} + , PART_NAME = #{PART_NAME} + , RECEIPT_QTY = #{RECEIPT_QTY}::NUMERIC + , DISPOSITION_TYPE = #{DISPOSITION_TYPE} + , REMARK = #{REMARK} + , WRITER = #{WRITER} + , REG_DATE = NOW() + WHERE OBJID = #{OBJID} + + + + + DELETE FROM PMS_QUALITY_SEMI_PRODUCT_INSPECTION + WHERE INSPECTION_GROUP_ID = #{INSPECTION_GROUP_ID} + + + + + INSERT INTO PMS_QUALITY_SEMI_PRODUCT_INSPECTION ( + OBJID + , MODEL_NAME + , PRODUCT_TYPE + , WORK_ORDER_NO + , PART_NO + , PART_NAME + , RECEIPT_QTY + , GOOD_QTY + , DEFECT_QTY + , DEFECT_TYPE + , DEFECT_CAUSE + , RESPONSIBLE_DEPT + , PROCESS_STATUS + , INSPECTION_DATE + , INSPECTOR + , DISPOSITION_TYPE + , REMARK + , WRITER + , REG_DATE + , DATA_TYPE + , INSPECTION_GROUP_ID + , IS_LOCKED + ) VALUES ( + #{OBJID} + , #{MODEL_NAME} + , #{PRODUCT_TYPE} + , #{WORK_ORDER_NO} + , #{PART_NO} + , #{PART_NAME} + , COALESCE(NULLIF(#{RECEIPT_QTY}, '')::NUMERIC, 0) + , COALESCE(NULLIF(#{GOOD_QTY}, '')::NUMERIC, 0) + , COALESCE(NULLIF(#{DEFECT_QTY}, '')::NUMERIC, 0) + , #{DEFECT_TYPE} + , #{DEFECT_CAUSE} + , #{RESPONSIBLE_DEPT} + , #{PROCESS_STATUS} + , CASE WHEN #{INSPECTION_DATE} = '' THEN NULL ELSE #{INSPECTION_DATE}::DATE END + , #{INSPECTOR} + , #{DISPOSITION_TYPE} + , #{REMARK} + , #{WRITER} + , NOW() + , #{DATA_TYPE} + , #{INSPECTION_GROUP_ID} + , COALESCE(#{IS_LOCKED}, 'N') + ) + + + + + UPDATE PMS_QUALITY_SEMI_PRODUCT_INSPECTION SET + MODEL_NAME = #{MODEL_NAME} + , PRODUCT_TYPE = #{PRODUCT_TYPE} + , WORK_ORDER_NO = #{WORK_ORDER_NO} + , PART_NO = #{PART_NO} + , PART_NAME = #{PART_NAME} + , RECEIPT_QTY = COALESCE(NULLIF(#{RECEIPT_QTY}, '')::NUMERIC, 0) + , GOOD_QTY = COALESCE(NULLIF(#{GOOD_QTY}, '')::NUMERIC, 0) + , DEFECT_QTY = COALESCE(NULLIF(#{DEFECT_QTY}, '')::NUMERIC, 0) + , DEFECT_TYPE = #{DEFECT_TYPE} + , DEFECT_CAUSE = #{DEFECT_CAUSE} + , RESPONSIBLE_DEPT = #{RESPONSIBLE_DEPT} + , PROCESS_STATUS = #{PROCESS_STATUS} + , INSPECTION_DATE = CASE WHEN #{INSPECTION_DATE} = '' THEN NULL ELSE #{INSPECTION_DATE}::DATE END + , INSPECTOR = #{INSPECTOR} + , DISPOSITION_TYPE = #{DISPOSITION_TYPE} + , REMARK = #{REMARK} + , IS_LOCKED = CASE WHEN IS_LOCKED = 'Y' THEN 'Y' ELSE COALESCE(#{IS_LOCKED}, 'N') END + WHERE OBJID = #{OBJID} + + + + + UPDATE PMS_QUALITY_SEMI_PRODUCT_INSPECTION + SET IS_LOCKED = 'Y' + WHERE OBJID = #{OBJID} + + + + + DELETE FROM PMS_QUALITY_SEMI_PRODUCT_INSPECTION + WHERE OBJID = #{OBJID} + + + + + DELETE FROM PMS_QUALITY_SEMI_PRODUCT_INSPECTION + WHERE INSPECTION_GROUP_ID = #{INSPECTION_GROUP_ID} + + AND OBJID NOT IN + + #{objId} + + + + + + + DELETE FROM PMS_QUALITY_SEMI_PRODUCT_INSPECTION + WHERE INSPECTION_GROUP_ID = #{INSPECTION_GROUP_ID} + AND DATA_TYPE = #{DATA_TYPE} + + AND OBJID NOT IN + + #{objId} + + + + + + + + + + + + + + + + + + INSERT INTO CUSTOMER_CS ( + OBJID + , RECEIPT_NO + , RECEIPT_DATE + , QTY + , CUSTOMER_OBJID + , MODEL_NAME + , PRODUCT_NO + , PRODUCT_NAME + , PART_NO + , PART_NAME + , PRODUCTION_DATE + , SALES_DATE + , SERIAL_NO + , MANUFACTURER + , COMPLAINT_CONTENT + , BLAME_DECISION + , STATUS + , REMARK + , WRITER + , REG_DATE + ) VALUES ( + #{OBJID} + , #{RECEIPT_NO} + , #{RECEIPT_DATE} + , NULLIF(#{QTY}, '')::NUMERIC + , #{CUSTOMER_OBJID} + , #{MODEL_NAME} + , #{PRODUCT_NO} + , #{PRODUCT_NAME} + , #{PART_NO} + , #{PART_NAME} + , #{PRODUCTION_DATE} + , #{SALES_DATE} + , #{SERIAL_NO} + , #{MANUFACTURER} + , #{COMPLAINT_CONTENT} + , #{BLAME_DECISION} + , #{STATUS} + , #{REMARK} + , #{WRITER} + , NOW() + ) + + + + + UPDATE CUSTOMER_CS SET + RECEIPT_DATE = #{RECEIPT_DATE} + , QTY = NULLIF(#{QTY}, '')::NUMERIC + , CUSTOMER_OBJID = #{CUSTOMER_OBJID} + , MODEL_NAME = #{MODEL_NAME} + , PRODUCT_NO = #{PRODUCT_NO} + , PRODUCT_NAME = #{PRODUCT_NAME} + , PART_NO = #{PART_NO} + , PART_NAME = #{PART_NAME} + , PRODUCTION_DATE = #{PRODUCTION_DATE} + , SALES_DATE = #{SALES_DATE} + , SERIAL_NO = #{SERIAL_NO} + , MANUFACTURER = #{MANUFACTURER} + , COMPLAINT_CONTENT = #{COMPLAINT_CONTENT} + , MOD_DATE = NOW() + WHERE OBJID = #{OBJID} + + + + + UPDATE CUSTOMER_CS SET + ACTION_CONTENT = #{ACTION_CONTENT} + , BLAME_DECISION = #{BLAME_DECISION} + , ACTION_DATE = #{ACTION_DATE} + , ACTION_USER_ID = #{ACTION_USER_ID} + , STATUS = #{STATUS} + , REMARK = #{REMARK} + , MOD_DATE = NOW() + , ACTION_TYPE = #{ACTION_TYPE} + WHERE OBJID = #{OBJID} + + + + + + + + + + + + + + + + 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} + + + + + + + + + + + + + + + + INSERT INTO INCOMING_INSPECTION_DETAIL ( + OBJID + , INVENTORY_IN_OBJID + , PURCHASE_ORDER_MASTER_OBJID + , REQUEST_DATE + , REQUEST_USER_ID + , INSPECTION_DATE + , INSPECTOR_ID + , INSPECTION_TYPE + , INSPECTION_YN + , DEFECT_TYPE + , DEFECT_REASON + , ACTION_STATUS + , INSPECTION_QTY + , DEFECT_QTY + , INSPECTION_RESULT + , ATTACH_FILE_OBJID + , REMARK + , WRITER + , REG_DATE + ) VALUES ( + #{NEW_OBJID} + , #{OBJID} + , #{PURCHASE_ORDER_MASTER_OBJID} + , #{REQUEST_DATE} + , #{REQUEST_USER_ID} + , #{INSPECTION_DATE} + , #{INSPECTOR_ID} + , #{INSPECTION_TYPE} + , #{INSPECTION_YN} + , #{DEFECT_TYPE} + , #{DEFECT_REASON} + , #{ACTION_STATUS} + , #{INSPECTION_QTY} + , #{DEFECT_QTY} + , #{INSPECTION_RESULT} + , #{ATTACH_FILE_OBJID} + , #{REMARK} + , #{WRITER} + , NOW() + ) + ON CONFLICT (INVENTORY_IN_OBJID) DO UPDATE SET + REQUEST_DATE = COALESCE(#{REQUEST_DATE}, INCOMING_INSPECTION_DETAIL.REQUEST_DATE) + , REQUEST_USER_ID = COALESCE(#{REQUEST_USER_ID}, INCOMING_INSPECTION_DETAIL.REQUEST_USER_ID) + , INSPECTION_DATE = COALESCE(#{INSPECTION_DATE}, INCOMING_INSPECTION_DETAIL.INSPECTION_DATE) + , INSPECTOR_ID = COALESCE(#{INSPECTOR_ID}, INCOMING_INSPECTION_DETAIL.INSPECTOR_ID) + , INSPECTION_TYPE = COALESCE(#{INSPECTION_TYPE}, INCOMING_INSPECTION_DETAIL.INSPECTION_TYPE) + , INSPECTION_YN = COALESCE(#{INSPECTION_YN}, INCOMING_INSPECTION_DETAIL.INSPECTION_YN) + , DEFECT_TYPE = COALESCE(#{DEFECT_TYPE}, INCOMING_INSPECTION_DETAIL.DEFECT_TYPE) + , DEFECT_REASON = COALESCE(#{DEFECT_REASON}, INCOMING_INSPECTION_DETAIL.DEFECT_REASON) + , ACTION_STATUS = COALESCE(#{ACTION_STATUS}, INCOMING_INSPECTION_DETAIL.ACTION_STATUS) + , INSPECTION_QTY = COALESCE(#{INSPECTION_QTY}, INCOMING_INSPECTION_DETAIL.INSPECTION_QTY) + , DEFECT_QTY = COALESCE(#{DEFECT_QTY}, INCOMING_INSPECTION_DETAIL.DEFECT_QTY) + , INSPECTION_RESULT = COALESCE(#{INSPECTION_RESULT}, INCOMING_INSPECTION_DETAIL.INSPECTION_RESULT) + , ATTACH_FILE_OBJID = COALESCE(#{ATTACH_FILE_OBJID}, INCOMING_INSPECTION_DETAIL.ATTACH_FILE_OBJID) + , REMARK = COALESCE(#{REMARK}, INCOMING_INSPECTION_DETAIL.REMARK) + , MODIFIER = #{WRITER} + , MOD_DATE = NOW() + + + + + + + + + + INSERT INTO INCOMING_INSPECTION_DEFECT ( + OBJID + , INSPECTION_DETAIL_OBJID + , INSPECTION_TYPE + , INSPECTION_DATE + , INSPECTOR_ID + , DEFECT_TYPE + , DEFECT_REASON + , ACTION_STATUS + , ACTION_RESULT + , INSPECTION_QTY + , DEFECT_QTY + , INSPECTION_RESULT + , REMARK + , WRITER + , REG_DATE + ) VALUES ( + #{OBJID} + , #{INSPECTION_DETAIL_OBJID} + , #{INSPECTION_TYPE} + , #{INSPECTION_DATE}::DATE + , #{INSPECTOR_ID} + , #{DEFECT_TYPE} + , #{DEFECT_REASON} + , #{ACTION_STATUS} + , #{ACTION_RESULT} + , #{INSPECTION_QTY} + , #{DEFECT_QTY} + , #{INSPECTION_RESULT} + , #{REMARK} + , #{WRITER} + , NOW() + ) + ON CONFLICT (OBJID) DO UPDATE SET + INSPECTION_TYPE = #{INSPECTION_TYPE} + , INSPECTION_DATE = #{INSPECTION_DATE}::DATE + , INSPECTOR_ID = #{INSPECTOR_ID} + , DEFECT_TYPE = #{DEFECT_TYPE} + , DEFECT_REASON = #{DEFECT_REASON} + , ACTION_STATUS = #{ACTION_STATUS} + , ACTION_RESULT = #{ACTION_RESULT} + , INSPECTION_QTY = #{INSPECTION_QTY} + , DEFECT_QTY = #{DEFECT_QTY} + , INSPECTION_RESULT = #{INSPECTION_RESULT} + , REMARK = #{REMARK} + , MODIFIER = #{WRITER} + , MOD_DATE = NOW() + + + + + DELETE FROM INCOMING_INSPECTION_DEFECT + WHERE OBJID = #{OBJID} + + + + + DELETE FROM INCOMING_INSPECTION_DEFECT + WHERE INSPECTION_DETAIL_OBJID = #{INSPECTION_DETAIL_OBJID} + + \ No newline at end of file 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(){ - - - - - - - + diff --git a/WebContent/WEB-INF/view/quality/incomingInspectionList.jsp b/WebContent/WEB-INF/view/quality/incomingInspectionList.jsp index c23a3f5..0088b76 100644 --- a/WebContent/WEB-INF/view/quality/incomingInspectionList.jsp +++ b/WebContent/WEB-INF/view/quality/incomingInspectionList.jsp @@ -76,11 +76,6 @@ $(document).ready(function(){ fn_requestPopUp(); }); - // 엑셀 다운로드 - $("#btnExcel").click(function(){ - fn_excelDownload(); - }); - fn_search(); }); @@ -184,14 +179,7 @@ function fn_formPopUp(objId){ hiddenForm.submit(); } -// 엑셀 다운로드 -function fn_excelDownload(){ - var form = document.form1; - form.action = "/quality/incomingInspectionExcelDownload.do"; - form.submit(); - form.action = ""; -} - +// 입고결과 조회 팝업 (view 전용) function fn_deliveryAcceptanceViewPopUp(objId,DELIVERY_STATUS){ var popup_width = 1560; var popup_height = 1050; @@ -229,7 +217,6 @@ function fn_deliveryAcceptanceViewPopUp(objId,DELIVERY_STATUS){
-
diff --git a/WebContent/WEB-INF/view/quality/processInspectionList.jsp b/WebContent/WEB-INF/view/quality/processInspectionList.jsp index 0449a98..f94a2a1 100644 --- a/WebContent/WEB-INF/view/quality/processInspectionList.jsp +++ b/WebContent/WEB-INF/view/quality/processInspectionList.jsp @@ -83,11 +83,6 @@ $(document).ready(function(){ fn_registPopUp(); }); - // 엑셀 다운로드 - $("#btnExcel").click(function(){ - fn_excelDownload(); - }); - fn_search(); }); @@ -156,13 +151,6 @@ function fn_registPopUp(){ window.open(url, "processInspectionPopUp", "width=" + popup_width + ",height=" + popup_height + ",scrollbars=yes,resizable=yes"); } -// 엑셀 다운로드 -function fn_excelDownload(){ - var form = document.form1; - form.action = "/quality/processInspectionExcelDownload.do"; - form.submit(); - form.action = ""; -} @@ -181,7 +169,6 @@ function fn_excelDownload(){
-
diff --git a/WebContent/WEB-INF/view/quality/semiProductInspectionExcel.jsp b/WebContent/WEB-INF/view/quality/semiProductInspectionExcel.jsp new file mode 100644 index 0000000..3851585 --- /dev/null +++ b/WebContent/WEB-INF/view/quality/semiProductInspectionExcel.jsp @@ -0,0 +1,96 @@ +<%@ page isThreadSafe = "true" %> +<%@ page buffer="256kb" %> +<%@ page autoFlush = "true" %> +<%@ page contentType="application/vnd.ms-excel;charset=UTF-8" %> +<%@ page import="com.pms.common.utils.*"%> +<%@ page import="java.util.*" %> +<% +java.text.SimpleDateFormat frm= new java.text.SimpleDateFormat ("yyyy_MM_dd_HH_mm"); +Calendar cal = Calendar.getInstance(); +String todayKor = frm.format(cal.getTime()); + +String excelName = "품질관리_반제품검사관리"; +String encodeName = excelName + todayKor + ".xls"; +String fileName = java.net.URLEncoder.encode(encodeName,"UTF-8"); + +response.setHeader("Content-Disposition", "attachment;filename=" + fileName); +response.setHeader("Content-Description", "JSP Generated Data"); +List list = (List)request.getAttribute("LIST"); +%> + + + + + +<%=Constants.SYSTEM_NAME%> + + +
+
+
+

+ 반제품검사 관리 +

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + <% + if(list != null && !list.isEmpty()){ + for(int i = 0 ; i < list.size() ; i++){ + Map map = (Map)list.get(i); + %> + + + + + + + + + + + + + + + + + + + + + + <% + } + } + %> +
No.품명(모델명)제품구분작업지시번호부품품번부품명입고수량양품수량불량수량불량율(%)불량유형불량원인귀책부서처리현황검사일검사자처리결과비고데이터타입
<%=i+1%><%=CommonUtils.checkNull(map.get("model_name"))%><%=CommonUtils.checkNull(map.get("product_type"))%><%=CommonUtils.checkNull(map.get("work_order_no"))%><%=CommonUtils.checkNull(map.get("part_no"))%><%=CommonUtils.checkNull(map.get("part_name"))%><%=CommonUtils.checkNull(map.get("receipt_qty"))%><%=CommonUtils.checkNull(map.get("good_qty"))%><%=CommonUtils.checkNull(map.get("defect_qty"))%><%=CommonUtils.checkNull(map.get("defect_rate"))%><%=CommonUtils.checkNull(map.get("defect_type"))%><%=CommonUtils.checkNull(map.get("defect_cause"))%><%=CommonUtils.checkNull(map.get("responsible_dept"))%><%=CommonUtils.checkNull(map.get("process_status"))%><%=CommonUtils.checkNull(map.get("inspection_date"))%><%=CommonUtils.checkNull(map.get("writer_name"))%><%=CommonUtils.checkNull(map.get("disposition_type"))%><%=CommonUtils.checkNull(map.get("remark"))%><%=CommonUtils.checkNull(map.get("data_type"))%>
+
+
+
+
+ + + diff --git a/WebContent/WEB-INF/view/quality/semiProductInspectionFormPopUp.jsp b/WebContent/WEB-INF/view/quality/semiProductInspectionFormPopUp.jsp index 489a000..e85da48 100644 --- a/WebContent/WEB-INF/view/quality/semiProductInspectionFormPopUp.jsp +++ b/WebContent/WEB-INF/view/quality/semiProductInspectionFormPopUp.jsp @@ -6,85 +6,1345 @@ <%@include file= "/init.jsp" %> <% String menuObjId = request.getParameter("menuObjId"); -String menuName = CommonUtils.getMenuName(menuObjId, "반제품검사 등록"); +String menuName = CommonUtils.getMenuName(menuObjId, "반제품검사"); +String OBJID = CommonUtils.checkNull(request.getParameter("OBJID")); +String INSPECTION_GROUP_ID = CommonUtils.checkNull(request.getParameter("INSPECTION_GROUP_ID")); +String WORK_ORDER_NO = CommonUtils.checkNull(request.getParameter("WORK_ORDER_NO")); +String actionType = CommonUtils.checkNull(request.getParameter("actionType")); +Map info = (Map)request.getAttribute("info"); + +// 로그인 사용자 정보 +PersonBean person = (PersonBean)session.getAttribute(Constants.PERSON_BEAN); +String loginUserName = CommonUtils.checkNull(person.getUserName()); +String loginUserId = CommonUtils.checkNull(person.getUserId()); %> + + - <%=Constants.SYSTEM_NAME%> + <%=Constants.SYSTEM_NAME%> + + + + + + - - -
-
-
-

<%=menuName%>

-
- - +
+ +
+

<%=menuName%>

+
+ + +
+ +
+
+ 양품 정보 +
+ + + +
+
+
+
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
프로젝트번호작업지시번호
품번품명
입고수량폐기/수정/특채 - -
비고
+ + +
+
+ 불량 상세 (좌측 행 선택 시 해당 불량 정보 표시) +
+ + + +
+
+
+
+
- + + +
+ + +
+
+ + - diff --git a/WebContent/WEB-INF/view/quality/semiProductInspectionList.jsp b/WebContent/WEB-INF/view/quality/semiProductInspectionList.jsp index ef66061..1dd4449 100644 --- a/WebContent/WEB-INF/view/quality/semiProductInspectionList.jsp +++ b/WebContent/WEB-INF/view/quality/semiProductInspectionList.jsp @@ -18,15 +18,45 @@ String menuName = CommonUtils.getMenuName(menuObjId, "반제품검사 관리");
+ + + + + +
+
@@ -130,11 +343,59 @@ function fn_excelDownload(){
- +
- + +
+ + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + +
+
<%@include file= "/WEB-INF/view/common/common_gridArea.jsp" %>
diff --git a/src/com/pms/controller/PurchaseOrderController.java b/src/com/pms/controller/PurchaseOrderController.java index 631fe44..2824457 100644 --- a/src/com/pms/controller/PurchaseOrderController.java +++ b/src/com/pms/controller/PurchaseOrderController.java @@ -2142,4 +2142,28 @@ public class PurchaseOrderController { return resultMap; } + + /** + * 입고관리 데이터 드롭다운용 조회 (반제품검사 팝업에서 사용) + * @param request + * @param paramMap + * @return + */ + @ResponseBody + @RequestMapping("/purchaseOrder/getDeliveryListForDropdown.do") + public Map getDeliveryListForDropdown(HttpServletRequest request, @RequestParam Map paramMap){ + Map resultMap = new HashMap(); + + try { + List list = purchaseOrderService.getDeliveryListForDropdown(request, paramMap); + resultMap.put("list", list); + resultMap.put("result", true); + } catch (Exception e) { + e.printStackTrace(); + resultMap.put("result", false); + resultMap.put("message", e.getMessage()); + } + + return resultMap; + } } diff --git a/src/com/pms/controller/QualityController.java b/src/com/pms/controller/QualityController.java index 9de9609..820a172 100644 --- a/src/com/pms/controller/QualityController.java +++ b/src/com/pms/controller/QualityController.java @@ -611,16 +611,42 @@ public class QualityController { */ @RequestMapping("/quality/semiProductInspectionList.do") public String semiProductInspectionList(HttpServletRequest request, @RequestParam Map paramMap){ - return "/quality/semiProductInspectionList"; + String actionType = CommonUtils.checkNull(paramMap.get("actionType")); + System.out.println("[DEBUG] semiProductInspectionList actionType: " + actionType); + Map code_map = new HashMap(); + List list = null; + try { + // 품명(모델명) 드롭박스 + code_map.put("model_name", commonService.bizMakeOptionList("", (String)paramMap.get("search_model_name"), "quality.getSemiProductModelNameList")); + // 부품품번 드롭박스 + code_map.put("part_no", commonService.bizMakeOptionList("", (String)paramMap.get("search_part_no"), "quality.getSemiProductPartNoList")); + // 부품명 드롭박스 + code_map.put("part_name", commonService.bizMakeOptionList("", (String)paramMap.get("search_part_name"), "quality.getSemiProductPartNameList")); + // 검사일 드롭박스 + 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")); + request.setAttribute("code_map", code_map); + + // 엑셀 다운로드 + if("excel".equals(actionType)){ + list = commonService.selectList("quality.getSemiProductInspectionListForExcel", request, paramMap); + request.setAttribute("LIST", list); + } + } catch(Exception e) { + e.printStackTrace(); + } + return "/quality/semiProductInspectionList" + ("excel".equals(actionType) ? "Excel" : ""); } /** * 반제품검사 관리 그리드 목록 조회 */ + @ResponseBody @RequestMapping("/quality/semiProductInspectionGridList.do") - public String semiProductInspectionGridList(HttpServletRequest request, @RequestParam Map paramMap){ - request.setAttribute("RESULT", CommonUtils.getJsonArray(service.getSemiProductInspectionList(request, paramMap))); - return "/ajax/ajaxResult"; + public Map semiProductInspectionGridList(HttpServletRequest request, @RequestParam Map paramMap){ + commonService.selectListPagingNew("quality.getSemiProductInspectionList", request, paramMap); + return paramMap; } /** @@ -634,15 +660,64 @@ public class QualityController { } /** - * 반제품검사 엑셀 다운로드 + * 반제품검사 저장 + */ + @RequestMapping("/quality/saveSemiProductInspection.do") + public String saveSemiProductInspection(HttpServletRequest request, @RequestParam Map paramMap){ + Map map = service.saveSemiProductInspection(request, paramMap); + request.setAttribute("RESULT", CommonUtils.getJsonMap(map)); + return "/ajax/ajaxResult"; + } + + /** + * 반제품검사 상세 조회 (팝업용) + */ + @ResponseBody + @RequestMapping("/quality/getSemiProductInspectionDetail.do") + public Map getSemiProductInspectionDetail(HttpServletRequest request, @RequestParam Map paramMap){ + return service.getSemiProductInspectionDetail(paramMap); + } + + /** + * 반제품검사 삭제 + */ + @ResponseBody + @RequestMapping("/quality/deleteSemiProductInspection.do") + public Map deleteSemiProductInspection(HttpServletRequest request, @RequestParam Map paramMap){ + return service.deleteSemiProductInspection(paramMap); + } + + /** + * 반제품검사 행 잠금 (수정 불가 처리) + */ + @ResponseBody + @RequestMapping("/quality/lockSemiProductInspection.do") + public Map lockSemiProductInspection(HttpServletRequest request, @RequestParam Map paramMap){ + return service.lockSemiProductInspection(paramMap); + } + + /** + * 반제품검사 엑셀 다운로드 (JSP 방식) */ @RequestMapping("/quality/semiProductInspectionExcelDownload.do") public String semiProductInspectionExcelDownload(HttpServletRequest request, @RequestParam Map paramMap){ - List list = service.getSemiProductInspectionList(request, paramMap); + List list = service.getSemiProductInspectionListForExcel(paramMap); request.setAttribute("LIST", list); return "/quality/semiProductInspectionExcel"; } + /** + * 반제품검사 엑셀 데이터 조회 (AJAX JSON) + */ + @ResponseBody + @RequestMapping("/quality/getSemiProductInspectionListForExcel.do") + public Map getSemiProductInspectionListForExcel(HttpServletRequest request, @RequestParam Map paramMap){ + Map result = new HashMap(); + List list = service.getSemiProductInspectionListForExcel(paramMap); + result.put("list", list); + return result; + } + // ===================================================== // 고객 CS 관리 // ===================================================== @@ -876,4 +951,23 @@ public class QualityController { return service.saveIncomingInspectionProgress(request, paramMap); } + /** + * OBJID 생성 (첨부파일 등록을 위한 미리 생성) + */ + @ResponseBody + @RequestMapping("/quality/generateObjId.do") + public Map generateObjId(HttpServletRequest request, @RequestParam Map paramMap){ + Map result = new HashMap(); + try { + String objId = CommonUtils.createObjId(); + result.put("OBJID", objId); + result.put("result", true); + } catch(Exception e) { + e.printStackTrace(); + result.put("result", false); + result.put("msg", e.getMessage()); + } + return result; + } + } diff --git a/src/com/pms/mapper/purchaseOrder.xml b/src/com/pms/mapper/purchaseOrder.xml index 2d74ade..b0b40d3 100644 --- a/src/com/pms/mapper/purchaseOrder.xml +++ b/src/com/pms/mapper/purchaseOrder.xml @@ -6082,4 +6082,26 @@ FROM( WHERE OBJID = #{OBJID} + + + + \ No newline at end of file diff --git a/src/com/pms/mapper/quality.xml b/src/com/pms/mapper/quality.xml index d0f5635..62f9569 100644 --- a/src/com/pms/mapper/quality.xml +++ b/src/com/pms/mapper/quality.xml @@ -1351,18 +1351,265 @@ 반제품검사 관리 ===================================================== --> - + + + + + + + + + + + + + + + + + + + @@ -1377,10 +1624,215 @@ , SPI.REMARK , SPI.WRITER , TO_CHAR(SPI.REG_DATE, 'YYYY-MM-DD') AS REG_DATE + , SPI.INSPECTION_GROUP_ID FROM PMS_QUALITY_SEMI_PRODUCT_INSPECTION SPI WHERE SPI.OBJID = #{OBJID} + + + + + + INSERT INTO PMS_QUALITY_SEMI_PRODUCT_INSPECTION ( + OBJID + , PROJECT_NO + , WORK_ORDER_NO + , PART_NO + , PART_NAME + , RECEIPT_QTY + , DISPOSITION_TYPE + , REMARK + , WRITER + , REG_DATE + ) VALUES ( + #{OBJID} + , #{PROJECT_NO} + , #{WORK_ORDER_NO} + , #{PART_NO} + , #{PART_NAME} + , #{RECEIPT_QTY}::NUMERIC + , #{DISPOSITION_TYPE} + , #{REMARK} + , #{WRITER} + , NOW() + ) + + + + + UPDATE PMS_QUALITY_SEMI_PRODUCT_INSPECTION + SET PROJECT_NO = #{PROJECT_NO} + , WORK_ORDER_NO = #{WORK_ORDER_NO} + , PART_NO = #{PART_NO} + , PART_NAME = #{PART_NAME} + , RECEIPT_QTY = #{RECEIPT_QTY}::NUMERIC + , DISPOSITION_TYPE = #{DISPOSITION_TYPE} + , REMARK = #{REMARK} + , WRITER = #{WRITER} + , REG_DATE = NOW() + WHERE OBJID = #{OBJID} + + + + + DELETE FROM PMS_QUALITY_SEMI_PRODUCT_INSPECTION + WHERE INSPECTION_GROUP_ID = #{INSPECTION_GROUP_ID} + + + + + INSERT INTO PMS_QUALITY_SEMI_PRODUCT_INSPECTION ( + OBJID + , MODEL_NAME + , PRODUCT_TYPE + , WORK_ORDER_NO + , PART_NO + , PART_NAME + , RECEIPT_QTY + , GOOD_QTY + , DEFECT_QTY + , DEFECT_TYPE + , DEFECT_CAUSE + , RESPONSIBLE_DEPT + , PROCESS_STATUS + , INSPECTION_DATE + , INSPECTOR + , DISPOSITION_TYPE + , REMARK + , WRITER + , REG_DATE + , DATA_TYPE + , INSPECTION_GROUP_ID + , IS_LOCKED + ) VALUES ( + #{OBJID} + , #{MODEL_NAME} + , #{PRODUCT_TYPE} + , #{WORK_ORDER_NO} + , #{PART_NO} + , #{PART_NAME} + , COALESCE(NULLIF(#{RECEIPT_QTY}, '')::NUMERIC, 0) + , COALESCE(NULLIF(#{GOOD_QTY}, '')::NUMERIC, 0) + , COALESCE(NULLIF(#{DEFECT_QTY}, '')::NUMERIC, 0) + , #{DEFECT_TYPE} + , #{DEFECT_CAUSE} + , #{RESPONSIBLE_DEPT} + , #{PROCESS_STATUS} + , CASE WHEN #{INSPECTION_DATE} = '' THEN NULL ELSE #{INSPECTION_DATE}::DATE END + , #{INSPECTOR} + , #{DISPOSITION_TYPE} + , #{REMARK} + , #{WRITER} + , NOW() + , #{DATA_TYPE} + , #{INSPECTION_GROUP_ID} + , COALESCE(#{IS_LOCKED}, 'N') + ) + + + + + UPDATE PMS_QUALITY_SEMI_PRODUCT_INSPECTION SET + MODEL_NAME = #{MODEL_NAME} + , PRODUCT_TYPE = #{PRODUCT_TYPE} + , WORK_ORDER_NO = #{WORK_ORDER_NO} + , PART_NO = #{PART_NO} + , PART_NAME = #{PART_NAME} + , RECEIPT_QTY = COALESCE(NULLIF(#{RECEIPT_QTY}, '')::NUMERIC, 0) + , GOOD_QTY = COALESCE(NULLIF(#{GOOD_QTY}, '')::NUMERIC, 0) + , DEFECT_QTY = COALESCE(NULLIF(#{DEFECT_QTY}, '')::NUMERIC, 0) + , DEFECT_TYPE = #{DEFECT_TYPE} + , DEFECT_CAUSE = #{DEFECT_CAUSE} + , RESPONSIBLE_DEPT = #{RESPONSIBLE_DEPT} + , PROCESS_STATUS = #{PROCESS_STATUS} + , INSPECTION_DATE = CASE WHEN #{INSPECTION_DATE} = '' THEN NULL ELSE #{INSPECTION_DATE}::DATE END + , INSPECTOR = #{INSPECTOR} + , DISPOSITION_TYPE = #{DISPOSITION_TYPE} + , REMARK = #{REMARK} + , IS_LOCKED = CASE WHEN IS_LOCKED = 'Y' THEN 'Y' ELSE COALESCE(#{IS_LOCKED}, 'N') END + WHERE OBJID = #{OBJID} + + + + + UPDATE PMS_QUALITY_SEMI_PRODUCT_INSPECTION + SET IS_LOCKED = 'Y' + WHERE OBJID = #{OBJID} + + + + + DELETE FROM PMS_QUALITY_SEMI_PRODUCT_INSPECTION + WHERE OBJID = #{OBJID} + + + + + DELETE FROM PMS_QUALITY_SEMI_PRODUCT_INSPECTION + WHERE INSPECTION_GROUP_ID = #{INSPECTION_GROUP_ID} + + AND OBJID NOT IN + + #{objId} + + + + + + + DELETE FROM PMS_QUALITY_SEMI_PRODUCT_INSPECTION + WHERE INSPECTION_GROUP_ID = #{INSPECTION_GROUP_ID} + AND DATA_TYPE = #{DATA_TYPE} + + AND OBJID NOT IN + + #{objId} + + + + diff --git a/src/com/pms/service/PurchaseOrderService.java b/src/com/pms/service/PurchaseOrderService.java index 4b2f6cd..cf43668 100644 --- a/src/com/pms/service/PurchaseOrderService.java +++ b/src/com/pms/service/PurchaseOrderService.java @@ -3135,6 +3135,17 @@ public class PurchaseOrderService { return sb.toString(); } + /** + * 입고관리 데이터 드롭다운용 조회 (반제품검사 팝업에서 사용) + * @param request + * @param paramMap + * @return + * @throws Exception + */ + public List getDeliveryListForDropdown(HttpServletRequest request, Map paramMap) throws Exception { + return commonService.selectList("purchaseOrder.getDeliveryListForDropdown", request, paramMap); + } + /** * 매입마감 처리 * PURCHASE_ORDER_MASTER의 PURCHASE_CLOSE_DATE를 현재일자로 업데이트 diff --git a/src/com/pms/service/QualityService.java b/src/com/pms/service/QualityService.java index ccd56dd..6bd95bc 100644 --- a/src/com/pms/service/QualityService.java +++ b/src/com/pms/service/QualityService.java @@ -965,6 +965,23 @@ public class QualityService extends BaseService{ return resultList; } + /** + * 반제품검사 엑셀 다운로드용 원본 데이터 조회 + */ + public List getSemiProductInspectionListForExcel(Map paramMap){ + List resultList = new ArrayList(); + SqlSession sqlSession = null; + try{ + sqlSession = SqlMapConfig.getInstance().getSqlSession(); + resultList = sqlSession.selectList("quality.getSemiProductInspectionListForExcel", paramMap); + }catch(Exception e){ + e.printStackTrace(); + }finally{ + sqlSession.close(); + } + return resultList; + } + /** * 반제품검사 상세 조회 */ @@ -982,6 +999,451 @@ public class QualityService extends BaseService{ return resultMap; } + /** + * 반제품검사 상세 조회 (팝업용 - 양품/불량 데이터 분리) + */ + public Map getSemiProductInspectionDetail(Map paramMap){ + Map resultMap = new HashMap(); + SqlSession sqlSession = null; + try{ + sqlSession = SqlMapConfig.getInstance().getSqlSession(); + + String inspectionGroupId = CommonUtils.checkNull(paramMap.get("INSPECTION_GROUP_ID")); + String objid = CommonUtils.checkNull(paramMap.get("OBJID")); + + Map searchMap = new HashMap(); + // INSPECTION_GROUP_ID가 있으면 우선 사용 + if(!inspectionGroupId.equals("")) { + searchMap.put("INSPECTION_GROUP_ID", inspectionGroupId); + } else if(!objid.equals("")) { + // OBJID로 해당 행의 INSPECTION_GROUP_ID 조회 + Map infoMap = sqlSession.selectOne("quality.getSemiProductInspectionInfo", paramMap); + if(infoMap != null && infoMap.get("inspection_group_id") != null) { + searchMap.put("INSPECTION_GROUP_ID", CommonUtils.checkNull(infoMap.get("inspection_group_id"))); + } else if(infoMap != null && infoMap.get("INSPECTION_GROUP_ID") != null) { + searchMap.put("INSPECTION_GROUP_ID", CommonUtils.checkNull(infoMap.get("INSPECTION_GROUP_ID"))); + } else { + // 그룹 ID가 없으면 OBJID로 단건 조회 + searchMap.put("OBJID", objid); + } + } + + // 양품 데이터 (DATA_TYPE = 'GOOD') + searchMap.put("DATA_TYPE", "GOOD"); + List leftData = sqlSession.selectList("quality.getSemiProductInspectionByType", searchMap); + resultMap.put("leftData", leftData); + + // 불량 데이터 (DATA_TYPE = 'DEFECT') + searchMap.put("DATA_TYPE", "DEFECT"); + List rightData = sqlSession.selectList("quality.getSemiProductInspectionByType", searchMap); + resultMap.put("rightData", rightData); + + }catch(Exception e){ + e.printStackTrace(); + }finally{ + if(sqlSession != null) sqlSession.close(); + } + return resultMap; + } + + /** + * 반제품검사 행 잠금 (IS_LOCKED = 'Y') + */ + public Map lockSemiProductInspection(Map paramMap){ + Map resultMap = new HashMap(); + SqlSession sqlSession = null; + try{ + sqlSession = SqlMapConfig.getInstance().getSqlSession(false); + + String objIdsJson = CommonUtils.checkNull(paramMap.get("objIds")); + + if(!objIdsJson.equals("") && !objIdsJson.equals("[]")){ + org.json.simple.parser.JSONParser parser = new org.json.simple.parser.JSONParser(); + org.json.simple.JSONArray objIdArr = (org.json.simple.JSONArray) parser.parse(objIdsJson); + + for(int i = 0; i < objIdArr.size(); i++){ + String objId = CommonUtils.checkNull(objIdArr.get(i)); + if(!objId.equals("")){ + Map lockParam = new HashMap(); + lockParam.put("OBJID", objId); + sqlSession.update("quality.lockSemiProductInspection", lockParam); + } + } + } + + sqlSession.commit(); + resultMap.put("result", true); + resultMap.put("msg", "잠금 처리되었습니다."); + + }catch(Exception e){ + resultMap.put("result", false); + resultMap.put("msg", "잠금 처리에 실패했습니다."); + if(sqlSession != null) sqlSession.rollback(); + e.printStackTrace(); + }finally{ + if(sqlSession != null) sqlSession.close(); + } + return resultMap; + } + + /** + * 반제품검사 삭제 (OBJID 목록으로 삭제) + */ + public Map deleteSemiProductInspection(Map paramMap){ + Map resultMap = new HashMap(); + SqlSession sqlSession = null; + try{ + sqlSession = SqlMapConfig.getInstance().getSqlSession(false); + + String objIdsJson = CommonUtils.checkNull(paramMap.get("objIds")); + + if(!objIdsJson.equals("") && !objIdsJson.equals("[]")){ + org.json.simple.parser.JSONParser parser = new org.json.simple.parser.JSONParser(); + org.json.simple.JSONArray objIdArr = (org.json.simple.JSONArray) parser.parse(objIdsJson); + + for(int i = 0; i < objIdArr.size(); i++){ + String objId = CommonUtils.checkNull(objIdArr.get(i)); + if(!objId.equals("")){ + Map deleteParam = new HashMap(); + deleteParam.put("OBJID", objId); + sqlSession.delete("quality.deleteSemiProductInspectionByObjId", deleteParam); + } + } + } + + sqlSession.commit(); + resultMap.put("result", true); + resultMap.put("msg", "삭제되었습니다."); + + }catch(Exception e){ + resultMap.put("result", false); + resultMap.put("msg", "삭제에 실패했습니다."); + if(sqlSession != null) sqlSession.rollback(); + e.printStackTrace(); + }finally{ + if(sqlSession != null) sqlSession.close(); + } + return resultMap; + } + + /** + * 반제품검사 저장 (새로운 팝업 형식) + * - 기존 INSPECTION_GROUP_ID가 있으면 수정 모드 (기존 OBJID 유지하면서 UPSERT) + * - 없으면 신규 등록 모드 + */ + public Map saveSemiProductInspection(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()); + + // JSON 데이터 파싱 + String leftDataStr = CommonUtils.checkNull(paramMap.get("leftData")); + String rightDataStr = CommonUtils.checkNull(paramMap.get("rightData")); + String existingGroupId = CommonUtils.checkNull(paramMap.get("INSPECTION_GROUP_ID")); + String saveType = CommonUtils.checkNull(paramMap.get("saveType"), "all"); // 저장 타입: left, right, all + String lockData = CommonUtils.checkNull(paramMap.get("lockData"), "N"); // 잠금 여부: Y, N + + System.out.println("=== saveSemiProductInspection ==="); + System.out.println("saveType: " + saveType); + System.out.println("lockData: " + lockData); + System.out.println("existingGroupId: " + existingGroupId); + + org.json.simple.parser.JSONParser parser = new org.json.simple.parser.JSONParser(); + + // 검사 그룹 ID 결정 (기존 있으면 유지, 없으면 새로 생성) + String inspectionGroupId = ""; + java.util.Set existingLeftObjIds = new java.util.HashSet(); // 저장할 좌측 OBJID 목록 + java.util.Set existingRightObjIds = new java.util.HashSet(); // 저장할 우측 OBJID 목록 + + if(!existingGroupId.equals("")){ + // 수정 모드: 기존 그룹 ID 유지 + inspectionGroupId = existingGroupId; + } else { + // 신규 등록 모드 + inspectionGroupId = CommonUtils.createObjId(); + } + + // 양품 정보 (leftData) 저장 + if(leftDataStr != null && !leftDataStr.equals("") && !leftDataStr.equals("[]")){ + org.json.simple.JSONArray leftArr = (org.json.simple.JSONArray) parser.parse(leftDataStr); + for(int i = 0; i < leftArr.size(); i++){ + org.json.simple.JSONObject item = (org.json.simple.JSONObject) leftArr.get(i); + + // OBJID 처리 + String existingObjId = CommonUtils.checkNull(item.get("OBJID")); + String rowId = CommonUtils.checkNull(item.get("ROW_ID")); + String objId = existingObjId; + + // OBJID가 비어있거나 임시 ID이면 새로 생성 + if(objId.equals("") || objId.startsWith("NEW_") || objId.startsWith("EXIST_")){ + objId = CommonUtils.createObjId(); + } + + existingLeftObjIds.add(objId); // 좌측 OBJID 목록에 추가 + + Map sqlParamMap = new HashMap(); + sqlParamMap.put("OBJID", objId); + sqlParamMap.put("MODEL_NAME", CommonUtils.checkNull(item.get("MODEL_NAME"))); + sqlParamMap.put("PRODUCT_TYPE", CommonUtils.checkNull(item.get("PRODUCT_TYPE"))); + sqlParamMap.put("WORK_ORDER_NO", CommonUtils.checkNull(item.get("WORK_ORDER_NO"))); + sqlParamMap.put("PART_NO", CommonUtils.checkNull(item.get("PART_NO"))); + sqlParamMap.put("PART_NAME", CommonUtils.checkNull(item.get("PART_NAME"))); + sqlParamMap.put("RECEIPT_QTY", CommonUtils.checkNull(item.get("RECEIPT_QTY"), "0")); + sqlParamMap.put("GOOD_QTY", CommonUtils.checkNull(item.get("GOOD_QTY"), "0")); + sqlParamMap.put("WRITER", writer); + sqlParamMap.put("DATA_TYPE", "GOOD"); + sqlParamMap.put("INSPECTION_GROUP_ID", inspectionGroupId); + + // 불량 정보 컬럼은 빈값으로 + sqlParamMap.put("DEFECT_QTY", "0"); + sqlParamMap.put("DEFECT_TYPE", ""); + sqlParamMap.put("DEFECT_CAUSE", ""); + sqlParamMap.put("RESPONSIBLE_DEPT", ""); + sqlParamMap.put("PROCESS_STATUS", ""); + sqlParamMap.put("INSPECTION_DATE", ""); + sqlParamMap.put("INSPECTOR", ""); + sqlParamMap.put("DISPOSITION_TYPE", ""); + sqlParamMap.put("REMARK", ""); + + // 잠금 여부 설정 + sqlParamMap.put("IS_LOCKED", lockData); + + // UPSERT: UPDATE 시도 후 실패하면 INSERT + int updateCnt = sqlSession.update("quality.updateSemiProductInspectionData", sqlParamMap); + if(updateCnt == 0){ + // UPDATE 실패 시 INSERT (신규 데이터) + sqlSession.insert("quality.insertSemiProductInspectionData", sqlParamMap); + } + } + } + + // 양품 데이터를 ROW_ID 기준 Map으로 변환 (불량 데이터 매칭용) + Map leftDataMap = new HashMap(); // ROW_ID -> leftData 아이템 + if(leftDataStr != null && !leftDataStr.equals("") && !leftDataStr.equals("[]")){ + org.json.simple.JSONArray leftArrForMap = (org.json.simple.JSONArray) parser.parse(leftDataStr); + for(int i = 0; i < leftArrForMap.size(); i++){ + org.json.simple.JSONObject leftItem = (org.json.simple.JSONObject) leftArrForMap.get(i); + String rowId = CommonUtils.checkNull(leftItem.get("ROW_ID")); + if(!rowId.equals("")){ + leftDataMap.put(rowId, leftItem); + } + } + } + + // 불량 정보 (rightData) 저장 - PARENT_ROW_ID를 기반으로 해당 양품 정보와 매칭 + if(rightDataStr != null && !rightDataStr.equals("") && !rightDataStr.equals("[]")){ + org.json.simple.JSONArray rightArr = (org.json.simple.JSONArray) parser.parse(rightDataStr); + for(int i = 0; i < rightArr.size(); i++){ + org.json.simple.JSONObject item = (org.json.simple.JSONObject) rightArr.get(i); + + // PARENT_ROW_ID로 해당 양품 정보 찾기 + String parentRowId = CommonUtils.checkNull(item.get("PARENT_ROW_ID")); + org.json.simple.JSONObject parentItem = (org.json.simple.JSONObject) leftDataMap.get(parentRowId); + + // 부모 양품 정보에서 값 추출 + String workOrderNo = ""; + String modelName = ""; + String productType = ""; + String partNo = ""; + String partName = ""; + + if(parentItem != null){ + // 좌측 데이터가 함께 전송된 경우 (전체 저장) + workOrderNo = CommonUtils.checkNull(parentItem.get("WORK_ORDER_NO")); + modelName = CommonUtils.checkNull(parentItem.get("MODEL_NAME")); + productType = CommonUtils.checkNull(parentItem.get("PRODUCT_TYPE")); + partNo = CommonUtils.checkNull(parentItem.get("PART_NO")); + partName = CommonUtils.checkNull(parentItem.get("PART_NAME")); + } else { + // 우측만 저장하는 경우: item에 직접 부모 정보가 포함되어 있음 + workOrderNo = CommonUtils.checkNull(item.get("WORK_ORDER_NO")); + modelName = CommonUtils.checkNull(item.get("MODEL_NAME")); + productType = CommonUtils.checkNull(item.get("PRODUCT_TYPE")); + partNo = CommonUtils.checkNull(item.get("PART_NO")); + partName = CommonUtils.checkNull(item.get("PART_NAME")); + } + + // OBJID 처리 + String existingObjId = CommonUtils.checkNull(item.get("OBJID")); + String objId = existingObjId; + + // OBJID가 비어있으면 새로 생성 + if(objId.equals("") || objId.startsWith("DEFECT_") || objId.startsWith("NEW_")){ + objId = CommonUtils.createObjId(); + } + + existingRightObjIds.add(objId); // 우측 OBJID 목록에 추가 + + Map sqlParamMap = new HashMap(); + sqlParamMap.put("OBJID", objId); + sqlParamMap.put("DEFECT_QTY", CommonUtils.checkNull(item.get("DEFECT_QTY"), "0")); + sqlParamMap.put("DEFECT_TYPE", CommonUtils.checkNull(item.get("DEFECT_TYPE"))); + sqlParamMap.put("DEFECT_CAUSE", CommonUtils.checkNull(item.get("DEFECT_CAUSE"))); + sqlParamMap.put("RESPONSIBLE_DEPT", CommonUtils.checkNull(item.get("RESPONSIBLE_DEPT"))); + sqlParamMap.put("PROCESS_STATUS", CommonUtils.checkNull(item.get("PROCESS_STATUS"))); + sqlParamMap.put("INSPECTION_DATE", CommonUtils.checkNull(item.get("INSPECTION_DATE"))); + sqlParamMap.put("INSPECTOR", CommonUtils.checkNull(item.get("INSPECTOR"))); + sqlParamMap.put("DISPOSITION_TYPE", CommonUtils.checkNull(item.get("DISPOSITION_TYPE"))); + sqlParamMap.put("REMARK", CommonUtils.checkNull(item.get("REMARK"))); + sqlParamMap.put("WRITER", writer); + sqlParamMap.put("DATA_TYPE", "DEFECT"); + sqlParamMap.put("INSPECTION_GROUP_ID", inspectionGroupId); + + // 해당 양품 데이터와 연결 (부모 정보 복사) + sqlParamMap.put("WORK_ORDER_NO", workOrderNo); + sqlParamMap.put("MODEL_NAME", modelName); + sqlParamMap.put("PRODUCT_TYPE", productType); + sqlParamMap.put("PART_NO", partNo); + sqlParamMap.put("PART_NAME", partName); + sqlParamMap.put("RECEIPT_QTY", "0"); + sqlParamMap.put("GOOD_QTY", "0"); + + // 잠금 여부 설정 + sqlParamMap.put("IS_LOCKED", lockData); + + // UPSERT: UPDATE 시도 후 실패하면 INSERT + int updateCnt = sqlSession.update("quality.updateSemiProductInspectionData", sqlParamMap); + if(updateCnt == 0){ + // UPDATE 실패 시 INSERT (신규 데이터) + sqlSession.insert("quality.insertSemiProductInspectionData", sqlParamMap); + } + } + } + + // 수정 모드일 때: 자동 삭제 비활성화 (사용자가 직접 삭제 버튼으로만 삭제) + // 데이터 손실 방지를 위해 자동 삭제 로직 제거 + // 삭제는 사용자가 그리드에서 행을 선택하고 삭제 버튼을 누를 때만 수행 + /* + if(!existingGroupId.equals("")){ + Map deleteParam = new HashMap(); + deleteParam.put("INSPECTION_GROUP_ID", inspectionGroupId); + + if("left".equals(saveType)){ + if(existingLeftObjIds.size() > 0){ + deleteParam.put("EXCLUDE_OBJIDS", existingLeftObjIds); + deleteParam.put("DATA_TYPE", "GOOD"); + sqlSession.delete("quality.deleteSemiProductInspectionByType", deleteParam); + } + } else if("right".equals(saveType)){ + if(existingRightObjIds.size() > 0){ + deleteParam.put("EXCLUDE_OBJIDS", existingRightObjIds); + deleteParam.put("DATA_TYPE", "DEFECT"); + sqlSession.delete("quality.deleteSemiProductInspectionByType", deleteParam); + } + } else { + java.util.Set allObjIds = new java.util.HashSet(); + allObjIds.addAll(existingLeftObjIds); + allObjIds.addAll(existingRightObjIds); + deleteParam.put("EXCLUDE_OBJIDS", allObjIds); + sqlSession.delete("quality.deleteSemiProductInspectionExcludeObjIds", deleteParam); + } + } + */ + + sqlSession.commit(); + resultMap.put("result", true); + resultMap.put("msg", "저장되었습니다."); + resultMap.put("inspectionGroupId", inspectionGroupId); // 생성된 그룹 ID 반환 + }catch(Exception e){ + resultMap.put("result", false); + resultMap.put("msg", "저장 중 오류가 발생했습니다: " + e.getMessage()); + if(sqlSession != null) sqlSession.rollback(); + e.printStackTrace(); + }finally{ + if(sqlSession != null) sqlSession.close(); + } + return resultMap; + } + + /** + * 반제품검사 품명(모델명) 드롭박스 목록 + */ + public List getSemiProductModelNameList(Map paramMap){ + List resultList = new ArrayList(); + SqlSession sqlSession = null; + try{ + sqlSession = SqlMapConfig.getInstance().getSqlSession(); + resultList = sqlSession.selectList("quality.getSemiProductModelNameList", paramMap); + }catch(Exception e){ + e.printStackTrace(); + }finally{ + sqlSession.close(); + } + return resultList; + } + + /** + * 반제품검사 부품품번 드롭박스 목록 + */ + public List getSemiProductPartNoList(Map paramMap){ + List resultList = new ArrayList(); + SqlSession sqlSession = null; + try{ + sqlSession = SqlMapConfig.getInstance().getSqlSession(); + resultList = sqlSession.selectList("quality.getSemiProductPartNoList", paramMap); + }catch(Exception e){ + e.printStackTrace(); + }finally{ + sqlSession.close(); + } + return resultList; + } + + /** + * 반제품검사 부품명 드롭박스 목록 + */ + public List getSemiProductPartNameList(Map paramMap){ + List resultList = new ArrayList(); + SqlSession sqlSession = null; + try{ + sqlSession = SqlMapConfig.getInstance().getSqlSession(); + resultList = sqlSession.selectList("quality.getSemiProductPartNameList", paramMap); + }catch(Exception e){ + e.printStackTrace(); + }finally{ + sqlSession.close(); + } + return resultList; + } + + /** + * 반제품검사 검사일 드롭박스 목록 + */ + public List getSemiProductInspectionDateList(Map paramMap){ + List resultList = new ArrayList(); + SqlSession sqlSession = null; + try{ + sqlSession = SqlMapConfig.getInstance().getSqlSession(); + resultList = sqlSession.selectList("quality.getSemiProductInspectionDateList", paramMap); + }catch(Exception e){ + e.printStackTrace(); + }finally{ + sqlSession.close(); + } + return resultList; + } + + /** + * 반제품검사 검사자 드롭박스 목록 + */ + public List getSemiProductWriterList(Map paramMap){ + List resultList = new ArrayList(); + SqlSession sqlSession = null; + try{ + sqlSession = SqlMapConfig.getInstance().getSqlSession(); + resultList = sqlSession.selectList("quality.getSemiProductWriterList", paramMap); + }catch(Exception e){ + e.printStackTrace(); + }finally{ + sqlSession.close(); + } + return resultList; + } + // ===================================================== // 고객 CS 관리 // =====================================================