diff options
Diffstat (limited to 'lib/vendor-document-list')
6 files changed, 777 insertions, 320 deletions
diff --git a/lib/vendor-document-list/dolce-upload-service.ts b/lib/vendor-document-list/dolce-upload-service.ts index 0396e819..627e0eba 100644 --- a/lib/vendor-document-list/dolce-upload-service.ts +++ b/lib/vendor-document-list/dolce-upload-service.ts @@ -110,6 +110,7 @@ class DOLCEUploadService { } // 4. 각 리비전별로 처리 + // 4. 각 리비전별로 처리 for (const revision of revisionsToUpload) { try { console.log(`Processing revision ${revision.revision} for document ${revision.documentNo}`) @@ -117,8 +118,9 @@ class DOLCEUploadService { // 4-1. 파일이 있는 경우 먼저 업로드 let uploadId: string | undefined if (revision.attachments && revision.attachments.length > 0) { - const fileUploadResults = await this.uploadFiles(revision.attachments) - + // ✅ userId를 uploadFiles 메서드에 전달 + const fileUploadResults = await this.uploadFiles(revision.attachments, userId) + if (fileUploadResults.length > 0) { uploadId = fileUploadResults[0].uploadId // 첫 번째 파일의 UploadId 사용 uploadedFiles += fileUploadResults.length @@ -128,8 +130,8 @@ class DOLCEUploadService { // 4-2. 문서 정보 업로드 const dolceDoc = this.transformToDoLCEDocument( - revision, - contractInfo, + revision, + contractInfo, uploadId, contractInfo.vendorCode, firstRevisionMap @@ -170,7 +172,6 @@ class DOLCEUploadService { console.error(errorMessage, error) } } - return { success: errors.length === 0, uploadedDocuments, @@ -223,7 +224,7 @@ class DOLCEUploadService { map.set(item.issueStageId, item.firstRevision) } }) - + return map } @@ -242,17 +243,18 @@ class DOLCEUploadService { uploaderName: revisions.uploaderName, submittedDate: revisions.submittedDate, comment: revisions.comment, - + usage: revisions.comment, + // ✅ DOLCE 연동 필드들 (새로 추가) externalUploadId: revisions.externalUploadId, externalRegisterId: revisions.id, externalSentAt: revisions.submittedDate, - + // issueStages 테이블 정보 issueStageId: issueStages.id, stageName: issueStages.stageName, documentId: issueStages.documentId, - + // documents 테이블 정보 (DOLCE 업로드에 필요한 모든 필드) documentNo: documents.docNumber, documentName: documents.title, @@ -260,7 +262,7 @@ class DOLCEUploadService { drawingMoveGbn: documents.drawingMoveGbn, discipline: documents.discipline, registerGroupId: documents.registerGroupId, - + // DOLCE B4 전용 필드들 cGbn: documents.cGbn, dGbn: documents.dGbn, @@ -268,13 +270,13 @@ class DOLCEUploadService { deptGbn: documents.deptGbn, jGbn: documents.jGbn, sGbn: documents.sGbn, - + // DOLCE 추가 정보 manager: documents.manager, managerENM: documents.managerENM, managerNo: documents.managerNo, shiDrawingNo: documents.shiDrawingNo, - + // 외부 시스템 연동 정보 externalDocumentId: documents.externalDocumentId, externalSystemType: documents.externalSystemType, @@ -312,7 +314,13 @@ class DOLCEUploadService { /** * 파일 업로드 (PWPUploadService.ashx) */ - private async uploadFiles(attachments: any[]): Promise<Array<{uploadId: string, fileId: string, filePath: string}>> { + /** + * 파일 업로드 (PWPUploadService.ashx) - DB 업데이트 포함 + */ + private async uploadFiles( + attachments: any[], + userId: string + ): Promise<Array<{ uploadId: string, fileId: string, filePath: string }>> { const uploadResults = [] for (const attachment of attachments) { @@ -339,15 +347,29 @@ class DOLCEUploadService { throw new Error(`File upload failed: HTTP ${response.status} - ${errorText}`) } - const filePath = await response.text() // DOLCE에서 반환하는 파일 경로 + const dolceFilePath = await response.text() // DOLCE에서 반환하는 파일 경로 + + // ✅ 업로드 성공 후 documentAttachments 테이블 업데이트 + await db + .update(documentAttachments) + .set({ + uploadId: uploadId, + fileId: fileId, + uploadedBy: userId, + dolceFilePath: dolceFilePath, + uploadedAt: new Date(), + updatedAt: new Date() + }) + .where(eq(documentAttachments.id, attachment.id)) uploadResults.push({ uploadId, fileId, - filePath + filePath: dolceFilePath }) - console.log(`✅ File uploaded successfully: ${attachment.fileName} -> ${filePath}`) + console.log(`✅ File uploaded successfully: ${attachment.fileName} -> ${dolceFilePath}`) + console.log(`✅ DB updated for attachment ID: ${attachment.id}`) } catch (error) { console.error(`❌ File upload failed for ${attachment.fileName}:`, error) @@ -361,7 +383,7 @@ class DOLCEUploadService { /** * 문서 정보 업로드 (DetailDwgReceiptMgmtEdit) */ - private async uploadDocument(dwgList: DOLCEDocument[], userId: string): Promise<{success: boolean, error?: string, data?: any}> { + private async uploadDocument(dwgList: DOLCEDocument[], userId: string): Promise<{ success: boolean, error?: string, data?: any }> { try { const endpoint = `${this.BASE_URL}/Services/VDCSWebService.svc/DetailDwgReceiptMgmtEdit` @@ -403,7 +425,7 @@ class DOLCEUploadService { /** * 파일 매핑 정보 업로드 (MatchBatchFileDwgEdit) */ - private async uploadFileMapping(mappingList: DOLCEFileMapping[], userId: string): Promise<{success: boolean, error?: string, data?: any}> { + private async uploadFileMapping(mappingList: DOLCEFileMapping[], userId: string): Promise<{ success: boolean, error?: string, data?: any }> { try { const endpoint = `${this.BASE_URL}/Services/VDCSWebService.svc/MatchBatchFileDwgEdit` @@ -445,7 +467,7 @@ class DOLCEUploadService { /** * 리비전 데이터를 DOLCE 문서 형태로 변환 (업데이트된 스키마 사용) */ - private transformToDoLCEDocument( + private transformToDoLCEDocument( revision: any, contractInfo: any, uploadId?: string, @@ -454,7 +476,7 @@ class DOLCEUploadService { ): DOLCEDocument { // Mode 결정: 해당 issueStageId의 첫 번째 revision인지 확인 let mode: "ADD" | "MOD" = "MOD" // 기본값은 MOD - + if (firstRevisionMap && firstRevisionMap.has(revision.issueStageId)) { const firstRevision = firstRevisionMap.get(revision.issueStageId) if (revision.revision === firstRevision) { @@ -464,12 +486,36 @@ class DOLCEUploadService { // RegisterKind 결정: stageName에 따라 설정 let registerKind = "APPC" // 기본값 + if (revision.stageName) { const stageNameLower = revision.stageName.toLowerCase() - if (stageNameLower.includes("pre")) { - registerKind = "RECP" - } else if (stageNameLower.includes("working")) { - registerKind = "RECW" + + if (revision.drawingKind === "B4") { + // B4: 기존 로직 + if (stageNameLower.includes("pre")) { + registerKind = "RECP" + } else if (stageNameLower.includes("working")) { + registerKind = "RECW" + } + } else if (revision.drawingKind === "B5") { + // B5: FMEA 관련 + if (stageNameLower.includes("pre")) { + registerKind = "FMEA-R1" + } else if (stageNameLower.includes("working")) { + registerKind = "FMEA-R2" + } + } else if (revision.drawingKind === "B3") { + // B3: WORK/APPC + if (stageNameLower.includes("work") && revision.usage.includes('Partial')) { + registerKind = "WORK-P" + } else if (stageNameLower.includes("work") && revision.usage.includes('Full')) { + registerKind = "WORK" + } else if (stageNameLower.includes("approval") && revision.usage.includes('Partial')) { + registerKind = "APPC-P" + } + else if (stageNameLower.includes("approval") && revision.usage.includes('Full')) { + registerKind = "APPC" + } } } @@ -479,7 +525,7 @@ class DOLCEUploadService { if (!isNaN(numericValue)) { return numericValue } - + // 문자인 경우 (a=1, b=2, c=3, ...) if (typeof revisionValue === 'string' && revisionValue.length === 1) { const charCode = revisionValue.toLowerCase().charCodeAt(0) @@ -487,7 +533,7 @@ class DOLCEUploadService { return charCode - 96 // a=1, b=2, c=3, ... } } - + // 기본값 return 1 } @@ -558,7 +604,7 @@ class DOLCEUploadService { private async getFileBuffer(filePath: string): Promise<ArrayBuffer> { try { console.log(`Reading file from path: ${filePath}`) - + if (filePath.startsWith('http')) { // URL인 경우 직접 다운로드 const response = await fetch(filePath) @@ -570,9 +616,9 @@ class DOLCEUploadService { // 로컬 파일 경로인 경우 const fs = await import('fs') const path = await import('path') - + let actualFilePath: string - + if (filePath.startsWith('/documents/')) { // DB에 저장된 경로 형태: "/documents/[uuid].ext" // 실제 파일 시스템 경로로 변환: "public/documents/[uuid].ext" @@ -584,16 +630,16 @@ class DOLCEUploadService { // 상대 경로인 경우 그대로 사용 actualFilePath = filePath } - + // 파일 존재 여부 확인 if (!fs.existsSync(actualFilePath)) { throw new Error(`File not found: ${actualFilePath}`) } - + // 파일 읽기 const fileBuffer = fs.readFileSync(actualFilePath) console.log(`✅ File read successfully: ${actualFilePath} (${fileBuffer.length} bytes)`) - + // Buffer를 ArrayBuffer로 변환 (타입 안전성 보장) return new ArrayBuffer(fileBuffer.length).slice(0).constructor(fileBuffer) } @@ -615,7 +661,7 @@ class DOLCEUploadService { // 업로드 성공 시 관련 날짜 설정 if (status === 'SUBMITTED') { updateData.submittedDate = new Date().toISOString().slice(0, 10) - // updateData.externalSentAt = new Date().toISOString().slice(0, 10) + // updateData.externalSentAt = new Date().toISOString().slice(0, 10) } else if (status === 'APPROVED') { updateData.approvedDate = new Date().toISOString().slice(0, 10) } diff --git a/lib/vendor-document-list/import-service.ts b/lib/vendor-document-list/import-service.ts index 4a152299..d2a14980 100644 --- a/lib/vendor-document-list/import-service.ts +++ b/lib/vendor-document-list/import-service.ts @@ -37,10 +37,23 @@ interface DOLCEDocument { DrawingNo: string GTTInput_PlanDate?: string GTTInput_ResultDate?: string + AppDwg_PlanDate?: string + AppDwg_ResultDate?: string + WorDwg_PlanDate?: string + WorDwg_ResultDate?: string + + GTTPreDwg_PlanDate?: string GTTPreDwg_ResultDate?: string GTTWorkingDwg_PlanDate?: string GTTWorkingDwg_ResultDate?: string + + FMEAFirst_PlanDate?: string + FMEAFirst_ResultDate?: string + FMEASecond_PlanDate?: string + FMEASecond_ResultDate?: string + + JGbn?: string Manager: string ManagerENM: string @@ -72,12 +85,12 @@ class ImportService { // 2. 각 drawingKind별로 데이터 조회 const allDocuments: DOLCEDocument[] = [] const drawingKinds = ['B3', 'B4', 'B5'] - + for (const drawingKind of drawingKinds) { try { const documents = await this.fetchFromDOLCE( - contractInfo.projectCode, - contractInfo.vendorCode, + contractInfo.projectCode, + contractInfo.vendorCode, drawingKind ) allDocuments.push(...documents) @@ -87,7 +100,7 @@ class ImportService { // 개별 drawingKind 실패는 전체 실패로 처리하지 않음 } } - + if (allDocuments.length === 0) { return { success: true, @@ -107,13 +120,22 @@ class ImportService { for (const dolceDoc of allDocuments) { try { const result = await this.syncSingleDocument(contractId, dolceDoc, sourceSystem) - + if (result === 'NEW') { newCount++ // B4 문서의 경우 이슈 스테이지 자동 생성 if (dolceDoc.DrawingKind === 'B4') { await this.createIssueStagesForB4Document(dolceDoc.DrawingNo, contractId, dolceDoc) } + + if (dolceDoc.DrawingKind === 'B3') { + await this.createIssueStagesForB3Document(dolceDoc.DrawingNo, contractId, dolceDoc) + } + + + if (dolceDoc.DrawingKind === 'B5') { + await this.createIssueStagesForB5Document(dolceDoc.DrawingNo, contractId, dolceDoc) + } } else if (result === 'UPDATED') { updatedCount++ } else { @@ -151,7 +173,7 @@ class ImportService { vendorCode: string; } | null> { const [result] = await db - .select({ + .select({ projectCode: projects.code, vendorCode: vendors.vendorCode }) @@ -162,7 +184,7 @@ class ImportService { .limit(1) - return result?.projectCode && result?.vendorCode + return result?.projectCode && result?.vendorCode ? { projectCode: result.projectCode, vendorCode: result.vendorCode } : null } @@ -172,15 +194,15 @@ class ImportService { */ private async fetchFromDOLCE( projectCode: string, - vendorCode: string, + vendorCode: string, drawingKind: string ): Promise<DOLCEDocument[]> { const endpoint = process.env.DOLCE_DOC_LIST_API_URL || 'http://60.100.99.217:1111/Services/VDCSWebService.svc/DwgReceiptMgmt' - + const requestBody = { project: projectCode, drawingKind: drawingKind, // B3, B4, B5 - drawingMoveGbn: "", + drawingMoveGbn: "", drawingNo: "", drawingName: "", drawingVendor: vendorCode @@ -204,14 +226,32 @@ class ImportService { } const data = await response.json() - - // 응답 구조에 따라 조정 필요 (실제 API 응답 구조 확인 후) - if (Array.isArray(data)) { - return data as DOLCEDocument[] - } else if (data.documents && Array.isArray(data.documents)) { - return data.documents as DOLCEDocument[] - } else if (data.data && Array.isArray(data.data)) { - return data.data as DOLCEDocument[] + + // DOLCE API 응답 구조에 맞게 처리 + if (data.DwgReceiptMgmtResult) { + const result = data.DwgReceiptMgmtResult + + // drawingKind에 따라 적절한 배열에서 데이터 추출 + let documents: DOLCEDocument[] = [] + + switch (drawingKind) { + case 'B3': + documents = result.VendorDwgList || [] + break + case 'B4': + documents = result.GTTDwgList || [] + break + case 'B5': + documents = result.FMEADwgList || [] + break + default: + console.warn(`Unknown drawingKind: ${drawingKind}`) + documents = [] + } + + console.log(`Found ${documents.length} documents for ${drawingKind} in ${drawingKind === 'B3' ? 'VendorDwgList' : drawingKind === 'B4' ? 'GTTDwgList' : 'FMEADwgList'}`) + return documents as DOLCEDocument[] + } else { console.warn(`Unexpected DOLCE response structure:`, data) return [] @@ -222,7 +262,6 @@ class ImportService { throw error } } - /** * 단일 문서 동기화 */ @@ -247,17 +286,17 @@ class ImportService { docNumber: dolceDoc.DrawingNo, title: dolceDoc.DrawingName, status: 'ACTIVE', - + // DOLCE 전용 필드들 drawingKind: dolceDoc.DrawingKind, drawingMoveGbn: dolceDoc.DrawingMoveGbn, discipline: dolceDoc.Discipline, - + // 외부 시스템 정보 externalDocumentId: dolceDoc.DrawingNo, // DOLCE에서는 DrawingNo가 ID 역할 externalSystemType: sourceSystem, externalSyncedAt: new Date(), - + // B4 전용 필드들 cGbn: dolceDoc.CGbn, dGbn: dolceDoc.DGbn, @@ -265,7 +304,7 @@ class ImportService { deptGbn: dolceDoc.DeptGbn, jGbn: dolceDoc.JGbn, sGbn: dolceDoc.SGbn, - + // 추가 정보 shiDrawingNo: dolceDoc.SHIDrawingNo, manager: dolceDoc.Manager, @@ -273,19 +312,19 @@ class ImportService { managerNo: dolceDoc.ManagerNo, registerGroup: dolceDoc.RegisterGroup, registerGroupId: dolceDoc.RegisterGroupId, - + // 생성자 정보 createUserNo: dolceDoc.CreateUserNo, createUserId: dolceDoc.CreateUserId, createUserENM: dolceDoc.CreateUserENM, - + updatedAt: new Date() } if (existingDoc.length > 0) { // 업데이트 필요 여부 확인 const existing = existingDoc[0] - const hasChanges = + const hasChanges = existing.title !== documentData.title || existing.drawingMoveGbn !== documentData.drawingMoveGbn || existing.manager !== documentData.manager @@ -316,6 +355,36 @@ class ImportService { } } + private convertDolceDateToDate(dolceDate: string | undefined | null): Date | null { + if (!dolceDate || dolceDate.trim() === '') { + return null + } + + // "20250204" 형태의 문자열을 "2025-02-04" 형태로 변환 + if (dolceDate.length === 8 && /^\d{8}$/.test(dolceDate)) { + const year = dolceDate.substring(0, 4) + const month = dolceDate.substring(4, 6) + const day = dolceDate.substring(6, 8) + + try { + const date = new Date(`${year}-${month}-${day}`) + // 유효한 날짜인지 확인 + if (isNaN(date.getTime())) { + console.warn(`Invalid date format: ${dolceDate}`) + return null + } + return date + } catch (error) { + console.warn(`Failed to parse date: ${dolceDate}`, error) + return null + } + } + + console.warn(`Unexpected date format: ${dolceDate}`) + return null +} + + /** * B4 문서용 이슈 스테이지 자동 생성 */ @@ -353,23 +422,25 @@ class ImportService { if (!existingStageNames.includes('For Pre')) { await db.insert(issueStages).values({ documentId: documentId, - stageName: 'For Pre', - planDate: dolceDoc.GTTPreDwg_PlanDate ? dolceDoc.GTTPreDwg_PlanDate : null, - actualDate: dolceDoc.GTTPreDwg_ResultDate ? dolceDoc.GTTPreDwg_ResultDate : null, - stageStatus: dolceDoc.GTTPreDwg_ResultDate ? 'COMPLETED' : 'PLANNED', + stageName: 'GTT → SHI (For Pre.DWG)', + planDate: this.convertDolceDateToDate(dolceDoc.GTTPreDwg_PlanDate), + actualDate: this.convertDolceDateToDate(dolceDoc.GTTPreDwg_ResultDate), + stageStatus: 'PLANNED', stageOrder: 1, + priority: 'MEDIUM', // 기본값 + reminderDays: 3, // 기본값 description: 'GTT 예비 도면 단계' }) } // For Working 스테이지 생성 (GTTWorkingDwg) - if (!existingStageNames.includes('For Working')) { + if (!existingStageNames.includes('For Work')) { await db.insert(issueStages).values({ documentId: documentId, - stageName: 'For Working', - planDate: dolceDoc.GTTWorkingDwg_PlanDate ? dolceDoc.GTTWorkingDwg_PlanDate : null, - actualDate: dolceDoc.GTTWorkingDwg_ResultDate ? dolceDoc.GTTWorkingDwg_ResultDate : null, - stageStatus: dolceDoc.GTTWorkingDwg_ResultDate ? 'COMPLETED' : 'PLANNED', + stageName: 'GTT → SHI (For Work.DWG)', + planDate: this.convertDolceDateToDate(dolceDoc.GTTWorkingDwg_PlanDate), + actualDate: this.convertDolceDateToDate(dolceDoc.GTTWorkingDwg_ResultDate), + stageStatus: 'PLANNED', stageOrder: 2, description: 'GTT 작업 도면 단계' }) @@ -383,6 +454,141 @@ class ImportService { } } + private async createIssueStagesForB3Document( + drawingNo: string, + contractId: number, + dolceDoc: DOLCEDocument + ): Promise<void> { + try { + // 문서 ID 조회 + const [document] = await db + .select({ id: documents.id }) + .from(documents) + .where(and( + eq(documents.contractId, contractId), + eq(documents.docNumber, drawingNo) + )) + .limit(1) + + if (!document) { + throw new Error(`Document not found: ${drawingNo}`) + } + + const documentId = document.id + + // 기존 이슈 스테이지 확인 + const existingStages = await db + .select() + .from(issueStages) + .where(eq(issueStages.documentId, documentId)) + + const existingStageNames = existingStages.map(stage => stage.stageName) + + // For Pre 스테이지 생성 (GTTPreDwg) + if (!existingStageNames.includes('Approval')) { + await db.insert(issueStages).values({ + documentId: documentId, + stageName: 'Vendor → SHI (For Approval)', + + planDate: this.convertDolceDateToDate(dolceDoc.AppDwg_PlanDate), + actualDate: this.convertDolceDateToDate(dolceDoc.AppDwg_ResultDate), + + stageStatus: 'PLANNED', + stageOrder: 1, + description: 'Vendor 승인 도면 단계' + }) + } + + // For Working 스테이지 생성 (GTTWorkingDwg) + if (!existingStageNames.includes('Working')) { + await db.insert(issueStages).values({ + documentId: documentId, + stageName: 'Vendor → SHI (For Working)', + + planDate: this.convertDolceDateToDate(dolceDoc.WorDwg_PlanDate), + actualDate: this.convertDolceDateToDate(dolceDoc.WorDwg_ResultDate), + + stageStatus: 'PLANNED', + stageOrder: 2, + description: 'Vendor 작업 도면 단계' + }) + } + + console.log(`Created issue stages for B4 document: ${drawingNo}`) + + } catch (error) { + console.error(`Failed to create issue stages for ${drawingNo}:`, error) + // 이슈 스테이지 생성 실패는 전체 문서 생성을 막지 않음 + } + } + + private async createIssueStagesForB5Document( + drawingNo: string, + contractId: number, + dolceDoc: DOLCEDocument + ): Promise<void> { + try { + // 문서 ID 조회 + const [document] = await db + .select({ id: documents.id }) + .from(documents) + .where(and( + eq(documents.contractId, contractId), + eq(documents.docNumber, drawingNo) + )) + .limit(1) + + if (!document) { + throw new Error(`Document not found: ${drawingNo}`) + } + + const documentId = document.id + + // 기존 이슈 스테이지 확인 + const existingStages = await db + .select() + .from(issueStages) + .where(eq(issueStages.documentId, documentId)) + + const existingStageNames = existingStages.map(stage => stage.stageName) + + // For Pre 스테이지 생성 (GTTPreDwg) + if (!existingStageNames.includes('Approval')) { + await db.insert(issueStages).values({ + documentId: documentId, + stageName: 'Vendor → SHI (For Approval)', + + planDate: this.convertDolceDateToDate(dolceDoc.FMEAFirst_PlanDate), + actualDate: this.convertDolceDateToDate(dolceDoc.FMEAFirst_ResultDate), + + stageStatus: 'PLANNED', + stageOrder: 1, + description: 'FMEA 예비 도면 단계' + }) + } + + // For Working 스테이지 생성 (GTTWorkingDwg) + if (!existingStageNames.includes('Working')) { + await db.insert(issueStages).values({ + documentId: documentId, + stageName: 'Vendor → SHI (For Working)', + planDate: dolceDoc.FMEASecond_PlanDate ? dolceDoc.FMEASecond_PlanDate : null, + actualDate: dolceDoc.FMEASecond_ResultDate ? dolceDoc.FMEASecond_ResultDate : null, + stageStatus: 'PLANNED', + stageOrder: 2, + description: 'FMEA 작업 도면 단계' + }) + } + + console.log(`Created issue stages for B4 document: ${drawingNo}`) + + } catch (error) { + console.error(`Failed to create issue stages for ${drawingNo}:`, error) + // 이슈 스테이지 생성 실패는 전체 문서 생성을 막지 않음 + } + } + + /** * 가져오기 상태 조회 */ @@ -393,8 +599,8 @@ class ImportService { try { // 마지막 가져오기 시간 조회 const [lastImport] = await db - .select({ - lastSynced: sql<string>`MAX(${documents.externalSyncedAt})` + .select({ + lastSynced: sql<string>`MAX(${documents.externalSyncedAt})` }) .from(documents) .where(and( @@ -405,7 +611,7 @@ class ImportService { // 프로젝트 코드와 벤더 코드 조회 const contractInfo = await this.getContractInfoById(contractId) - console.log(contractInfo,"contractInfo") + console.log(contractInfo, "contractInfo") if (!contractInfo?.projectCode || !contractInfo?.vendorCode) { throw new Error(`Project code or vendor code not found for contract ${contractId}`) @@ -418,12 +624,12 @@ class ImportService { try { // 각 drawingKind별로 확인 const drawingKinds = ['B3', 'B4', 'B5'] - + for (const drawingKind of drawingKinds) { try { const externalDocs = await this.fetchFromDOLCE( - contractInfo.projectCode, - contractInfo.vendorCode, + contractInfo.projectCode, + contractInfo.vendorCode, drawingKind ) availableDocuments += externalDocs.length diff --git a/lib/vendor-document-list/table/enhanced-doc-table-columns.tsx b/lib/vendor-document-list/table/enhanced-doc-table-columns.tsx index c8487d82..191ce3e2 100644 --- a/lib/vendor-document-list/table/enhanced-doc-table-columns.tsx +++ b/lib/vendor-document-list/table/enhanced-doc-table-columns.tsx @@ -1,4 +1,4 @@ -// updated-enhanced-doc-table-columns.tsx +// enhanced-doc-table-columns-with-b4.tsx "use client" import * as React from "react" @@ -32,13 +32,15 @@ import { Edit, Trash2, Building, - Code + Code, + Settings } from "lucide-react" import { cn } from "@/lib/utils" interface GetColumnsProps { setRowAction: React.Dispatch<React.SetStateAction<DataTableRowAction<EnhancedDocumentsView> | null>> projectType: string | null + drawingKindFilter?: string // ✅ 추가 } // 유틸리티 함수들 @@ -140,11 +142,12 @@ const DueDateInfo = ({ export function getUpdatedEnhancedColumns({ setRowAction, - projectType + projectType, + drawingKindFilter = "all" // ✅ 추가 }: GetColumnsProps): ColumnDef<EnhancedDocumentsView>[] { const isPlantProject = projectType === "plant" + const showB4Columns = drawingKindFilter === "B4" // ✅ B4 컬럼 표시 여부 - // 기본 컬럼들 const baseColumns: ColumnDef<EnhancedDocumentsView>[] = [ // 체크박스 선택 @@ -174,7 +177,7 @@ export function getUpdatedEnhancedColumns({ enableHiding: false, }, - // 문서번호 + 우선순위 + // 문서번호 + Drawing Kind { accessorKey: "docNumber", header: ({ column }) => ( @@ -185,6 +188,11 @@ export function getUpdatedEnhancedColumns({ return ( <div className="flex flex-col gap-1 items-start"> <span className="font-mono text-sm font-medium">{doc.docNumber}</span> + {doc.drawingKind && ( + <Badge variant="outline" className="text-xs"> + {doc.drawingKind} + </Badge> + )} </div> ) }, @@ -196,7 +204,7 @@ export function getUpdatedEnhancedColumns({ }, ] - // ✅ Ship 프로젝트용 추가 컬럼들 + // ✅ Plant 프로젝트용 추가 컬럼들 const plantColumns: ColumnDef<EnhancedDocumentsView>[] = isPlantProject ? [ // 벤더 문서번호 { @@ -233,7 +241,6 @@ export function getUpdatedEnhancedColumns({ const doc = row.original return ( <div className="flex items-center gap-2"> - {/* <Code className="w-4 h-4 text-gray-500" /> */} <span className="font-mono text-sm font-medium text-gray-700"> {doc.projectCode || '-'} </span> @@ -258,7 +265,6 @@ export function getUpdatedEnhancedColumns({ return ( <div className="flex flex-col gap-1 items-start"> <div className="flex items-center gap-2"> - {/* <Building className="w-4 h-4 text-gray-500" /> */} <span className="text-sm font-medium text-gray-900"> {doc.vendorName || '-'} </span> @@ -279,6 +285,116 @@ export function getUpdatedEnhancedColumns({ }, ] : [] + // ✅ B4 전용 컬럼들 (B4 필터 선택 시에만 표시) + const b4Columns: ColumnDef<EnhancedDocumentsView>[] = showB4Columns ? [ + { + accessorKey: "cGbn", + header: ({ column }) => ( + <DataTableColumnHeaderSimple column={column} title="cGbn" /> + ), + cell: ({ row }) => { + const doc = row.original + return ( + <div className="flex items-center gap-2"> + <Badge variant="secondary" className="text-xs"> + {doc.cGbn || '-'} + </Badge> + </div> + ) + }, + size: 100, + enableResizing: true, + meta: { + excelHeader: "cGbn" + }, + }, + { + accessorKey: "dGbn", + header: ({ column }) => ( + <DataTableColumnHeaderSimple column={column} title="dGbn" /> + ), + cell: ({ row }) => { + const doc = row.original + return ( + <div className="flex items-center gap-2"> + <Badge variant="secondary" className="text-xs"> + {doc.dGbn || '-'} + </Badge> + </div> + ) + }, + size: 100, + enableResizing: true, + meta: { + excelHeader: "dGbn" + }, + }, + { + accessorKey: "degreeGbn", + header: ({ column }) => ( + <DataTableColumnHeaderSimple column={column} title="degreeGbn" /> + ), + cell: ({ row }) => { + const doc = row.original + return ( + <div className="flex items-center gap-2"> + <Badge variant="secondary" className="text-xs"> + {doc.degreeGbn || '-'} + </Badge> + </div> + ) + }, + size: 100, + enableResizing: true, + meta: { + excelHeader: "degreeGbn" + }, + }, + { + accessorKey: "deptGbn", + header: ({ column }) => ( + <DataTableColumnHeaderSimple column={column} title="deptGbn" /> + ), + cell: ({ row }) => { + const doc = row.original + return ( + <div className="flex items-center gap-2"> + <Badge variant="secondary" className="text-xs"> + {doc.deptGbn || '-'} + </Badge> + </div> + ) + }, + size: 100, + enableResizing: true, + meta: { + excelHeader: "deptGbn" + }, + }, + { + accessorKey: "sGbn", + header: ({ column }) => ( + <DataTableColumnHeaderSimple column={column} title="sGbn" /> + ), + cell: ({ row }) => { + const doc = row.original + return ( + <div className="flex items-center gap-2"> + <Badge variant="secondary" className="text-xs"> + {doc.sGbn || '-'} + </Badge> + </div> + ) + }, + size: 100, + enableResizing: true, + meta: { + excelHeader: "sGbn" + }, + }, + + ] : [] + // 나머지 공통 컬럼들 const commonColumns: ColumnDef<EnhancedDocumentsView>[] = [ // 문서명 + 담당자 @@ -310,7 +426,7 @@ export function getUpdatedEnhancedColumns({ </div> ) }, - size: isPlantProject ? 200 : 250, // Ship 프로젝트일 때는 너비 조정 + size: showB4Columns ? 180 : (isPlantProject ? 200 : 250), // ✅ B4 컬럼이 있을 때 너비 조정 enableResizing: true, meta: { excelHeader: "문서명" @@ -378,7 +494,7 @@ export function getUpdatedEnhancedColumns({ size: 140, enableResizing: true, meta: { - excelHeader: "계획일" + excelHeader: "일정" }, }, @@ -476,7 +592,6 @@ export function getUpdatedEnhancedColumns({ const canApprove = doc.currentStageStatus === 'SUBMITTED' const isPlantProject = projectType === "plant" - // 메뉴 아이템들을 그룹별로 정의 const viewActions = [ { key: "view", @@ -519,7 +634,6 @@ export function getUpdatedEnhancedColumns({ } ] - // 각 그룹에서 표시될 아이템이 있는지 확인 const hasEditActions = editActions.some(action => action.show) const hasFileActions = fileActions.some(action => action.show) const hasDangerActions = dangerActions.some(action => action.show) @@ -536,7 +650,6 @@ export function getUpdatedEnhancedColumns({ </Button> </DropdownMenuTrigger> <DropdownMenuContent align="end" className="w-48"> - {/* 기본 액션 그룹 */} {viewActions.map(action => action.show && ( <DropdownMenuItem key={action.key} @@ -551,7 +664,6 @@ export function getUpdatedEnhancedColumns({ </DropdownMenuItem> ))} - {/* 편집 액션 그룹 */} {hasEditActions && ( <> <DropdownMenuSeparator /> @@ -571,7 +683,6 @@ export function getUpdatedEnhancedColumns({ </> )} - {/* 파일 액션 그룹 */} {hasFileActions && ( <> <DropdownMenuSeparator /> @@ -591,7 +702,6 @@ export function getUpdatedEnhancedColumns({ </> )} - {/* 위험한 액션 그룹 */} {hasDangerActions && ( <> <DropdownMenuSeparator /> @@ -621,84 +731,8 @@ export function getUpdatedEnhancedColumns({ // ✅ 모든 컬럼을 순서대로 결합 return [ ...baseColumns, // 체크박스, 문서번호 - ...plantColumns, // Ship 전용 컬럼들 (조건부) + ...plantColumns, // Plant 전용 컬럼들 (조건부) + ...b4Columns, // B4 전용 컬럼들 (조건부) ...commonColumns // 나머지 공통 컬럼들 ] -} - -// 확장된 행 컨텐츠 컴포넌트 (업데이트된 버전) -export const UpdatedExpandedRowContent = ({ - document -}: { - document: EnhancedDocumentsView -}) => { - if (!document.allStages || document.allStages.length === 0) { - return ( - <div className="p-4 text-sm text-gray-500 italic"> - 스테이지 정보가 없습니다. - </div> - ) - } - - return ( - <div className="p-4 w-1/2"> - <h4 className="font-medium mb-3 flex items-center gap-2"> - <FileText className="w-4 h-4" /> - 전체 스테이지 현황 - </h4> - - <div className="grid gap-3"> - {document.allStages.map((stage, index) => ( - <div key={stage.id} className="flex items-center justify-between p-3 bg-white rounded-lg border"> - <div className="flex items-center gap-3"> - <div className="flex items-center gap-2"> - <div className="w-6 h-6 rounded-full bg-gray-100 flex items-center justify-center text-xs font-medium"> - {stage.stageOrder || index + 1} - </div> - <div className={cn( - "w-3 h-3 rounded-full", - stage.stageStatus === 'COMPLETED' ? 'bg-green-500' : - stage.stageStatus === 'IN_PROGRESS' ? 'bg-blue-500' : - stage.stageStatus === 'SUBMITTED' ? 'bg-purple-500' : - 'bg-gray-300' - )} /> - </div> - - <div> - <div className="font-medium text-sm">{stage.stageName}</div> - {stage.assigneeName && ( - <div className="text-xs text-gray-500 flex items-center gap-1 mt-1"> - <User className="w-3 h-3" /> - {stage.assigneeName} - </div> - )} - </div> - </div> - - <div className="flex items-center gap-4 text-sm"> - <div> - <span className="text-gray-500">계획: </span> - <span>{formatDate(stage.planDate)}</span> - </div> - {stage.actualDate && ( - <div> - <span className="text-gray-500">완료: </span> - <span>{formatDate(stage.actualDate)}</span> - </div> - )} - - <div className="flex items-center gap-2"> - <Badge variant={getPriorityColor(stage.priority)} className="text-xs"> - {getPriorityText(stage.priority)} - </Badge> - <Badge variant={getStatusColor(stage.stageStatus)} className="text-xs"> - {getStatusText(stage.stageStatus)} - </Badge> - </div> - </div> - </div> - ))} - </div> - </div> - ) }
\ No newline at end of file diff --git a/lib/vendor-document-list/table/enhanced-documents-table.tsx b/lib/vendor-document-list/table/enhanced-documents-table.tsx index 3bd6668d..cb49f796 100644 --- a/lib/vendor-document-list/table/enhanced-documents-table.tsx +++ b/lib/vendor-document-list/table/enhanced-documents-table.tsx @@ -1,6 +1,7 @@ +// enhanced-documents-table-with-drawing-filter.tsx "use client" -import * as React from "react" +import React from "react" import type { DataTableAdvancedFilterField, DataTableFilterField, @@ -10,7 +11,6 @@ import type { import { useDataTable } from "@/hooks/use-data-table" import { StageRevisionExpandedContent } from "./stage-revision-expanded-content" import { RevisionUploadDialog } from "./revision-upload-dialog" -// ✅ UpdateDocumentSheet import 추가 import { EnhancedDocTableToolbarActions } from "./enhanced-doc-table-toolbar-actions" import { getEnhancedDocuments } from "../enhanced-document-service" import type { EnhancedDocument } from "@/types/enhanced-documents" @@ -23,69 +23,102 @@ import { TrendingUp, Target, Users, + Settings, + Filter } from "lucide-react" import { getUpdatedEnhancedColumns } from "./enhanced-doc-table-columns" import { ExpandableDataTable } from "@/components/data-table/expandable-data-table" import { toast } from "sonner" import { UpdateDocumentSheet } from "./update-doc-sheet" +import { + Select, + SelectContent, + SelectItem, + SelectTrigger, + SelectValue, +} from "@/components/ui/select" +import { Label } from "@/components/ui/label" interface FinalIntegratedDocumentsTableProps { promises: Promise<[Awaited<ReturnType<typeof getEnhancedDocuments>>]> selectedPackageId: number projectType: "ship" | "plant" - // ✅ contractId 추가 (AddDocumentListDialog에서 필요) contractId: number + initialDrawingKind?: string } +// ✅ Drawing Kind 옵션 정의 +const DRAWING_KIND_OPTIONS = [ + { value: "all", label: "전체 문서" }, + { value: "B3", label: "B3: Vendor" }, + { value: "B4", label: "B4: GTT" }, + { value: "B5", label: "B5: FMEA" }, +] as const + export function EnhancedDocumentsTable({ promises, selectedPackageId, projectType, - contractId, // ✅ contractId 추가 + contractId, + initialDrawingKind = "all" }: FinalIntegratedDocumentsTableProps) { - // 데이터 로딩 const [{ data, pageCount, total }] = React.use(promises) - - // 상태 관리 + // ✅ Drawing Kind 필터 상태 추가 + const [drawingKindFilter, setDrawingKindFilter] = React.useState<string>(initialDrawingKind) + + // 기존 상태들 const [rowAction, setRowAction] = React.useState<DataTableRowAction<EnhancedDocument> | null>(null) const [expandedRows, setExpandedRows] = React.useState<Set<string>>(new Set()) const [quickFilter, setQuickFilter] = React.useState<'all' | 'overdue' | 'due_soon' | 'in_progress' | 'high_priority'>('all') - - // ✅ 스테이지 확장 상태 관리 (문서별로 관리) const [expandedStages, setExpandedStages] = React.useState<Record<string, Record<number, boolean>>>({}) - - // ✅ 다이얼로그 상태들 - editDialogOpen -> editSheetOpen으로 변경 const [uploadDialogOpen, setUploadDialogOpen] = React.useState(false) - const [editSheetOpen, setEditSheetOpen] = React.useState(false) // Sheet로 변경 + const [editSheetOpen, setEditSheetOpen] = React.useState(false) const [selectedDocument, setSelectedDocument] = React.useState<EnhancedDocument | null>(null) const [selectedStage, setSelectedStage] = React.useState<string>("") const [selectedRevision, setSelectedRevision] = React.useState<string>("") const [uploadMode, setUploadMode] = React.useState<'new' | 'append'>('new') + // ✅ Drawing Kind별 데이터 필터링 + const filteredByDrawingKind = React.useMemo(() => { + if (drawingKindFilter === "all") return data + return data.filter(doc => doc.drawingKind === drawingKindFilter) + }, [data, drawingKindFilter]) + + // ✅ Drawing Kind별 통계 계산 + const drawingKindStats = React.useMemo(() => { + const stats = DRAWING_KIND_OPTIONS.reduce((acc, option) => { + if (option.value === "all") { + acc[option.value] = data.length + } else { + acc[option.value] = data.filter(doc => doc.drawingKind === option.value).length + } + return acc + }, {} as Record<string, number>) + + return stats + }, [data]) + // 다음 리비전 계산 함수 const getNextRevision = React.useCallback((currentRevision: string): string => { if (!currentRevision) return "A" - // 알파벳 리비전 (A, B, C...) if (/^[A-Z]$/.test(currentRevision)) { const charCode = currentRevision.charCodeAt(0) - if (charCode < 90) { // Z가 아닌 경우 + if (charCode < 90) { return String.fromCharCode(charCode + 1) } - return "AA" // Z 다음은 AA + return "AA" } - // 숫자 리비전 (1, 2, 3...) if (/^\d+$/.test(currentRevision)) { return String(parseInt(currentRevision) + 1) } - // 기타 복잡한 리비전 형태는 그대로 반환 return currentRevision }, []) - // 컬럼 정의 + // ✅ 컬럼 정의 - drawingKindFilter 추가 const columns = React.useMemo( () => getUpdatedEnhancedColumns({ setRowAction: (action) => { @@ -93,17 +126,15 @@ export function EnhancedDocumentsTable({ if (action) { setSelectedDocument(action.row.original) - // 액션 타입에 따른 다이얼로그 열기 switch (action.type) { case "update": - setEditSheetOpen(true) // ✅ Sheet 열기로 변경 + setEditSheetOpen(true) break case "upload": setSelectedStage(action.row.original.currentStageName || "") setUploadDialogOpen(true) break case "view": - // 상세보기는 확장된 행으로 대체 const rowId = action.row.id const newExpanded = new Set(expandedRows) if (newExpanded.has(rowId)) { @@ -116,24 +147,25 @@ export function EnhancedDocumentsTable({ } } }, - projectType + projectType, + drawingKindFilter // ✅ 추가 }), - [expandedRows, projectType] + [expandedRows, projectType, drawingKindFilter] ) - // 통계 계산 + // 기존 통계 계산 const stats = React.useMemo(() => { - const totalDocs = data.length - const overdue = data.filter(doc => doc.isOverdue).length - const dueSoon = data.filter(doc => + const totalDocs = filteredByDrawingKind.length + const overdue = filteredByDrawingKind.filter(doc => doc.isOverdue).length + const dueSoon = filteredByDrawingKind.filter(doc => doc.daysUntilDue !== null && doc.daysUntilDue >= 0 && doc.daysUntilDue <= 3 ).length - const inProgress = data.filter(doc => doc.currentStageStatus === 'IN_PROGRESS').length - const highPriority = data.filter(doc => doc.currentStagePriority === 'HIGH').length + const inProgress = filteredByDrawingKind.filter(doc => doc.currentStageStatus === 'IN_PROGRESS').length + const highPriority = filteredByDrawingKind.filter(doc => doc.currentStagePriority === 'HIGH').length const avgProgress = totalDocs > 0 - ? Math.round(data.reduce((sum, doc) => sum + (doc.progressPercentage || 0), 0) / totalDocs) + ? Math.round(filteredByDrawingKind.reduce((sum, doc) => sum + (doc.progressPercentage || 0), 0) / totalDocs) : 0 return { @@ -144,66 +176,60 @@ export function EnhancedDocumentsTable({ highPriority, avgProgress } - }, [data]) + }, [filteredByDrawingKind]) // 빠른 필터링 const filteredData = React.useMemo(() => { switch (quickFilter) { case 'overdue': - return data.filter(doc => doc.isOverdue) + return filteredByDrawingKind.filter(doc => doc.isOverdue) case 'due_soon': - return data.filter(doc => + return filteredByDrawingKind.filter(doc => doc.daysUntilDue !== null && doc.daysUntilDue >= 0 && doc.daysUntilDue <= 3 ) case 'in_progress': - return data.filter(doc => doc.currentStageStatus === 'IN_PROGRESS') + return filteredByDrawingKind.filter(doc => doc.currentStageStatus === 'IN_PROGRESS') case 'high_priority': - return data.filter(doc => doc.currentStagePriority === 'HIGH') + return filteredByDrawingKind.filter(doc => doc.currentStagePriority === 'HIGH') default: - return data + return filteredByDrawingKind } - }, [data, quickFilter]) + }, [filteredByDrawingKind, quickFilter]) - // ✅ 핸들러 함수 수정: 모드 매개변수 추가 + // 나머지 핸들러 함수들 const handleUploadRevision = React.useCallback((document: EnhancedDocument, stageName?: string, currentRevision?: string, mode: 'new' | 'append' = 'new') => { setSelectedDocument(document) setSelectedStage(stageName || document.currentStageName || "") - setUploadMode(mode) // ✅ 모드 설정 + setUploadMode(mode) if (mode === 'new') { - // 새 리비전 생성: currentRevision이 있으면 다음 리비전을 자동 계산 if (currentRevision) { const nextRevision = getNextRevision(currentRevision) setSelectedRevision(nextRevision) } else { - // 스테이지의 최신 리비전을 찾아서 다음 리비전 계산 const latestRevision = findLatestRevisionInStage(document, stageName || document.currentStageName || "") if (latestRevision) { setSelectedRevision(getNextRevision(latestRevision)) } else { - setSelectedRevision("A") // 첫 번째 리비전 + setSelectedRevision("A") } } } else { - // 기존 리비전에 파일 추가: 같은 리비전 번호 사용 setSelectedRevision(currentRevision || "") } setUploadDialogOpen(true) }, [getNextRevision]) - // ✅ 스테이지에서 최신 리비전을 찾는 헬퍼 함수 const findLatestRevisionInStage = React.useCallback((document: EnhancedDocument, stageName: string) => { const stage = document.allStages?.find(s => s.stageName === stageName) if (!stage || !stage.revisions || stage.revisions.length === 0) { return null } - // 리비전들을 정렬해서 최신 것 찾기 (간단한 알파벳/숫자 정렬) const sortedRevisions = [...stage.revisions].sort((a, b) => { - // 알파벳과 숫자를 구분해서 정렬 const aIsAlpha = /^[A-Z]+$/.test(a.revision) const bIsAlpha = /^[A-Z]+$/.test(b.revision) @@ -212,20 +238,17 @@ export function EnhancedDocumentsTable({ } else if (!aIsAlpha && !bIsAlpha) { return parseInt(a.revision) - parseInt(b.revision) } else { - return aIsAlpha ? -1 : 1 // 알파벳이 숫자보다 먼저 + return aIsAlpha ? -1 : 1 } }) return sortedRevisions[sortedRevisions.length - 1]?.revision || null }, []) - // ✅ 새 문서 추가 핸들러 - EnhancedDocTableToolbarActions에서 AddDocumentListDialog를 직접 렌더링하므로 별도 상태 관리 불필요 const handleNewDocument = () => { // AddDocumentListDialog는 자체적으로 Dialog trigger를 가지므로 별도 처리 불필요 - // EnhancedDocTableToolbarActions에서 처리됨 } - // ✅ 스테이지 토글 핸들러 추가 const handleStageToggle = React.useCallback((documentId: string, stageId: number) => { setExpandedStages(prev => ({ ...prev, @@ -239,17 +262,14 @@ export function EnhancedDocumentsTable({ const handleBulkAction = async (action: string, selectedRows: any[]) => { try { if (action === 'bulk_approve') { - // 일괄 승인 로직 const stageIds = selectedRows .map(row => row.original.currentStageId) .filter(Boolean) if (stageIds.length > 0) { - // await bulkUpdateStageStatus(stageIds, 'APPROVED') toast.success(`${stageIds.length}개 항목이 승인되었습니다.`) } } else if (action === 'bulk_upload') { - // 일괄 업로드 로직 toast.info("일괄 업로드 기능은 준비 중입니다.") } } catch (error) { @@ -257,27 +277,25 @@ export function EnhancedDocumentsTable({ } } - // ✅ 다이얼로그 닫기 함수 수정 const closeAllDialogs = () => { setUploadDialogOpen(false) - setEditSheetOpen(false) // editDialogOpen -> editSheetOpen + setEditSheetOpen(false) setSelectedDocument(null) setSelectedStage("") setSelectedRevision("") - setUploadMode('new') // ✅ 모드 초기화 + setUploadMode('new') setRowAction(null) } - // ✅ EnhancedDocument를 UpdateDocumentSheet의 document 형식으로 변환하는 함수 const convertToUpdateFormat = React.useCallback((doc: EnhancedDocument | null) => { if (!doc) return null return { id: doc.documentId, - contractId: contractId, // contractId 사용 + contractId: contractId, docNumber: doc.docNumber, title: doc.title, - status: doc.status || "pending", // 기본값 설정 + status: doc.status || "pending", description: doc.description || null, remarks: doc.remarks || null, } @@ -309,6 +327,16 @@ export function EnhancedDocumentsTable({ type: "text", }, { + id: "drawingKind", + label: "문서종류", + type: "select", + options: [ + { label: "B3", value: "B3" }, + { label: "B4", value: "B4" }, + { label: "B5", value: "B5" }, + ], + }, + { id: "currentStageStatus", label: "스테이지 상태", type: "select", @@ -351,7 +379,6 @@ export function EnhancedDocumentsTable({ }, ] - // 데이터 테이블 훅 const { table } = useDataTable({ data: filteredData, columns, @@ -371,11 +398,15 @@ export function EnhancedDocumentsTable({ return ( <div className="space-y-6"> + + {/* 통계 대시보드 */} <div className="grid grid-cols-2 md:grid-cols-4 gap-4"> <Card className="cursor-pointer hover:shadow-md transition-shadow" onClick={() => setQuickFilter('all')}> <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2"> - <CardTitle className="text-sm font-medium">전체 문서</CardTitle> + <CardTitle className="text-sm font-medium"> + {drawingKindFilter === "all" ? "전체 문서" : `${DRAWING_KIND_OPTIONS.find(o => o.value === drawingKindFilter)?.label} 문서`} + </CardTitle> <TrendingUp className="h-4 w-4 text-muted-foreground" /> </CardHeader> <CardContent> @@ -420,80 +451,107 @@ export function EnhancedDocumentsTable({ </Card> </div> - {/* 빠른 필터 */} - <div className="flex gap-2 overflow-x-auto pb-2"> - <Badge - variant={quickFilter === 'all' ? 'default' : 'outline'} - className="cursor-pointer hover:bg-primary hover:text-primary-foreground whitespace-nowrap" - onClick={() => setQuickFilter('all')} - > - 전체 ({stats.total}) - </Badge> - <Badge - variant={quickFilter === 'overdue' ? 'destructive' : 'outline'} - className="cursor-pointer hover:bg-destructive hover:text-destructive-foreground whitespace-nowrap" - onClick={() => setQuickFilter('overdue')} - > - <AlertTriangle className="w-3 h-3 mr-1" /> - 지연 ({stats.overdue}) - </Badge> - <Badge - variant={quickFilter === 'due_soon' ? 'default' : 'outline'} - className="cursor-pointer hover:bg-orange-500 hover:text-white whitespace-nowrap" - onClick={() => setQuickFilter('due_soon')} - > - <Clock className="w-3 h-3 mr-1" /> - 마감임박 ({stats.dueSoon}) - </Badge> - <Badge - variant={quickFilter === 'in_progress' ? 'default' : 'outline'} - className="cursor-pointer hover:bg-blue-500 hover:text-white whitespace-nowrap" - onClick={() => setQuickFilter('in_progress')} - > - <Users className="w-3 h-3 mr-1" /> - 진행중 ({stats.inProgress}) - </Badge> - <Badge - variant={quickFilter === 'high_priority' ? 'destructive' : 'outline'} - className="cursor-pointer hover:bg-destructive hover:text-destructive-foreground whitespace-nowrap" - onClick={() => setQuickFilter('high_priority')} - > - <Target className="w-3 h-3 mr-1" /> - 높은우선순위 ({stats.highPriority}) - </Badge> + {/* 빠른 필터 + 문서 종류 필터 */} + <div className="flex flex-col sm:flex-row gap-4 justify-between items-start sm:items-center"> + {/* 왼쪽: 빠른 필터 */} + <div className="flex gap-2 overflow-x-auto pb-2"> + <Badge + variant={quickFilter === 'all' ? 'default' : 'outline'} + className="cursor-pointer hover:bg-primary hover:text-primary-foreground whitespace-nowrap" + onClick={() => setQuickFilter('all')} + > + 전체 ({stats.total}) + </Badge> + <Badge + variant={quickFilter === 'overdue' ? 'destructive' : 'outline'} + className="cursor-pointer hover:bg-destructive hover:text-destructive-foreground whitespace-nowrap" + onClick={() => setQuickFilter('overdue')} + > + <AlertTriangle className="w-3 h-3 mr-1" /> + 지연 ({stats.overdue}) + </Badge> + <Badge + variant={quickFilter === 'due_soon' ? 'default' : 'outline'} + className="cursor-pointer hover:bg-orange-500 hover:text-white whitespace-nowrap" + onClick={() => setQuickFilter('due_soon')} + > + <Clock className="w-3 h-3 mr-1" /> + 마감임박 ({stats.dueSoon}) + </Badge> + <Badge + variant={quickFilter === 'in_progress' ? 'default' : 'outline'} + className="cursor-pointer hover:bg-blue-500 hover:text-white whitespace-nowrap" + onClick={() => setQuickFilter('in_progress')} + > + <Users className="w-3 h-3 mr-1" /> + 진행중 ({stats.inProgress}) + </Badge> + <Badge + variant={quickFilter === 'high_priority' ? 'destructive' : 'outline'} + className="cursor-pointer hover:bg-destructive hover:text-destructive-foreground whitespace-nowrap" + onClick={() => setQuickFilter('high_priority')} + > + <Target className="w-3 h-3 mr-1" /> + 높은우선순위 ({stats.highPriority}) + </Badge> + </div> + + {/* 오른쪽: 문서 종류 필터 */} + <div className="flex items-center gap-2 flex-shrink-0"> + <Select value={drawingKindFilter} onValueChange={setDrawingKindFilter}> + <SelectTrigger className="w-[140px]"> + <SelectValue placeholder="문서 종류" /> + </SelectTrigger> + <SelectContent> + {DRAWING_KIND_OPTIONS.map(option => ( + <SelectItem key={option.value} value={option.value}> + <div className="flex items-center justify-between w-full"> + <span>{option.label}</span> + <Badge variant="outline" className="ml-2 text-xs"> + {drawingKindStats[option.value] || 0} + </Badge> + </div> + </SelectItem> + ))} + </SelectContent> + </Select> + + {/* B4 필드 표시 안내 (아이콘만) */} + {drawingKindFilter === "B4" && ( + <div className="flex items-center gap-1 text-blue-600 bg-blue-50 px-2 py-1 rounded text-xs"> + <Settings className="h-3 w-3" /> + <span className="hidden sm:inline">상세정보 확장가능</span> + </div> + )} + </div> </div> - {/* 메인 테이블 - 가로스크롤 문제 해결을 위한 구조 개선 */} + {/* 메인 테이블 */} <div className="space-y-4"> <div className="rounded-md border bg-white overflow-hidden"> - <ExpandableDataTable - table={table} - expandable={true} - expandedRows={expandedRows} - setExpandedRows={setExpandedRows} - renderExpandedContent={(document) => ( - <div className=""> - <StageRevisionExpandedContent - document={document} - onUploadRevision={handleUploadRevision} - projectType={projectType} - expandedStages={expandedStages[String(document.documentId)] || {}} - onStageToggle={(stageId) => handleStageToggle(String(document.documentId), stageId)} - /> - </div> - )} - expandedRowClassName="!p-0" - // clickableColumns={[ - // 'docNumber', - // 'title', - // 'currentStageStatus', - // 'progressPercentage', - // ]} - excludeFromClick={[ - 'actions', - 'select' - ]} - > + <ExpandableDataTable + table={table} + expandable={true} + expandedRows={expandedRows} + setExpandedRows={setExpandedRows} + renderExpandedContent={(document) => ( + <div className=""> + <StageRevisionExpandedContent + document={document} + onUploadRevision={handleUploadRevision} + projectType={projectType} + expandedStages={expandedStages[String(document.documentId)] || {}} + onStageToggle={(stageId) => handleStageToggle(String(document.documentId), stageId)} + // showB4Fields={document.drawingKind === "B4"} + /> + </div> + )} + expandedRowClassName="!p-0" + excludeFromClick={[ + 'actions', + 'select' + ]} + > <DataTableAdvancedToolbar table={table} filterFields={advancedFilterFields} @@ -503,7 +561,7 @@ export function EnhancedDocumentsTable({ table={table} projectType={projectType} selectedPackageId={selectedPackageId} - contractId={contractId} // ✅ contractId 추가 + contractId={contractId} onNewDocument={handleNewDocument} onBulkAction={handleBulkAction} /> @@ -512,9 +570,7 @@ export function EnhancedDocumentsTable({ </div> </div> - {/* ✅ 분리된 다이얼로그들 - UpdateDocumentSheet와 AddDocumentListDialog로 교체 */} - - {/* 리비전 업로드 다이얼로그 - mode props 추가 */} + {/* 다이얼로그들 */} <RevisionUploadDialog open={uploadDialogOpen} onOpenChange={(open) => { @@ -528,7 +584,6 @@ export function EnhancedDocumentsTable({ mode={uploadMode} /> - {/* ✅ 문서 편집 Sheet로 교체 */} <UpdateDocumentSheet open={editSheetOpen} onOpenChange={(open) => { diff --git a/lib/vendor-document-list/table/revision-upload-dialog.tsx b/lib/vendor-document-list/table/revision-upload-dialog.tsx index 546fa7a3..16fc9fbb 100644 --- a/lib/vendor-document-list/table/revision-upload-dialog.tsx +++ b/lib/vendor-document-list/table/revision-upload-dialog.tsx @@ -66,7 +66,29 @@ const revisionUploadSchema = z.object({ uploaderName: z.string().optional(), comment: z.string().optional(), attachments: z.array(z.instanceof(File)).min(1, "최소 1개 파일이 필요합니다"), -}) + // ✅ B3 문서용 usage 필드 추가 + usage: z.string().optional(), +}).refine((data) => { + // B3 문서이고 특정 stage인 경우 usage 필수 + // 이 검증은 컴포넌트 내에서 조건부로 처리 + return true; +}, { + message: "Usage는 필수입니다", + path: ["usage"], +}); + +const getUsageOptions = (stageName: string): string[] => { + const stageNameLower = stageName.toLowerCase(); + + if (stageNameLower.includes('approval')) { + return ['Approval (Partial)', 'Approval (Full)']; + } else if (stageNameLower.includes('working')) { + return ['Working (Partial)', 'Working (Full)']; + } + + return []; +}; + type RevisionUploadSchema = z.infer<typeof revisionUploadSchema> @@ -93,7 +115,7 @@ export function RevisionUploadDialog({ presetStage, presetRevision, mode = 'new', - onUploadComplete, // ✅ 추가된 prop + onUploadComplete, }: RevisionUploadDialogProps) { const targetSystem = React.useMemo( @@ -106,7 +128,6 @@ export function RevisionUploadDialog({ const [uploadProgress, setUploadProgress] = React.useState(0) const router = useRouter() - // ✅ next-auth session 가져오기 const { data: session } = useSession() // 사용 가능한 스테이지 옵션 @@ -125,17 +146,33 @@ export function RevisionUploadDialog({ uploaderName: session?.user?.name || "", comment: "", attachments: [], + usage: "", // ✅ usage 기본값 추가 }, }) - // ✅ session이 로드되면 uploaderName 업데이트 + // ✅ 현재 선택된 stage 값을 watch + const currentStage = form.watch('stage') + + // ✅ B3 문서 여부 확인 + const isB3Document = document?.drawingKind === 'B3' + + // ✅ 현재 stage에 따른 usage 옵션 + const usageOptions = React.useMemo(() => { + if (!isB3Document || !currentStage) return [] + return getUsageOptions(currentStage) + }, [isB3Document, currentStage]) + + // ✅ usage 필드가 필요한지 확인 + const isUsageRequired = isB3Document && usageOptions.length > 0 + + // session이 로드되면 uploaderName 업데이트 React.useEffect(() => { if (session?.user?.name) { form.setValue('uploaderName', session.user.name) } }, [session?.user?.name, form]) - // ✅ presetStage와 presetRevision이 변경될 때 폼 값 업데이트 + // presetStage와 presetRevision이 변경될 때 폼 값 업데이트 React.useEffect(() => { if (presetStage) { form.setValue('stage', presetStage) @@ -145,6 +182,22 @@ export function RevisionUploadDialog({ } }, [presetStage, presetRevision, form]) + // ✅ stage가 변경될 때 usage 값 리셋 + React.useEffect(() => { + if (isB3Document) { + const newUsageOptions = getUsageOptions(currentStage) + if (newUsageOptions.length === 0) { + form.setValue('usage', '') + } else { + // 기존 값이 새로운 옵션에 없으면 리셋 + const currentUsage = form.getValues('usage') + if (currentUsage && !newUsageOptions.includes(currentUsage)) { + form.setValue('usage', '') + } + } + } + }, [currentStage, isB3Document, form]) + // 파일 드롭 처리 const handleDropAccepted = (acceptedFiles: File[]) => { const newFiles = [...selectedFiles, ...acceptedFiles] @@ -159,26 +212,22 @@ export function RevisionUploadDialog({ form.setValue('attachments', updatedFiles, { shouldValidate: true }) } - // ✅ 캐시 갱신 함수 + // 캐시 갱신 함수 const refreshCaches = async () => { try { - // 1. 서버 컴포넌트 캐시 갱신 (Enhanced Documents 등) router.refresh() - // 2. SWR 캐시 갱신 (Sync Status) if (document?.contractId) { await mutate(`/api/sync/status/${document.contractId}/${targetSystem}`) console.log('✅ Sync status cache refreshed') } - // 3. 다른 관련 SWR 캐시들도 갱신 (필요시) await mutate(key => typeof key === 'string' && key.includes('sync') && key.includes(String(document?.contractId)) ) - // 4. 상위 컴포넌트 콜백 호출 onUploadComplete?.() console.log('✅ All caches refreshed after upload') @@ -187,10 +236,19 @@ export function RevisionUploadDialog({ } } - // 업로드 처리 + // ✅ 업로드 처리 - usage 필드 검증 및 전송 async function onSubmit(data: RevisionUploadSchema) { if (!document) return + // ✅ B3 문서에서 usage가 필요한 경우 검증 + if (isUsageRequired && !data.usage) { + form.setError('usage', { + type: 'required', + message: 'Usage 선택은 필수입니다' + }) + return + } + setIsUploading(true) setUploadProgress(0) @@ -210,6 +268,11 @@ export function RevisionUploadDialog({ formData.append("comment", data.comment) } + // ✅ B3 문서인 경우 usage 추가 + if (isB3Document && data.usage) { + formData.append("usage", data.usage) + } + // 파일들 추가 data.attachments.forEach((file) => { formData.append("attachments", file) @@ -220,7 +283,6 @@ export function RevisionUploadDialog({ setUploadProgress(Math.min(progress, 95)) } - // 파일 크기에 따른 진행률 시뮬레이션 const totalSize = data.attachments.reduce((sum, file) => sum + file.size, 0) let uploadedSize = 0 @@ -230,7 +292,6 @@ export function RevisionUploadDialog({ updateProgress(progress) }, 300) - // ✅ 실제 API 호출 const response = await fetch('/api/revision-upload', { method: 'POST', body: formData, @@ -253,7 +314,6 @@ export function RevisionUploadDialog({ console.log('✅ 업로드 성공:', result) - // ✅ 캐시 갱신 및 다이얼로그 닫기 setTimeout(async () => { await refreshCaches() handleDialogClose() @@ -275,6 +335,7 @@ export function RevisionUploadDialog({ uploaderName: session?.user?.name || "", comment: "", attachments: [], + usage: "", // ✅ usage 리셋 추가 }) setSelectedFiles([]) setIsUploading(false) @@ -295,14 +356,19 @@ export function RevisionUploadDialog({ mode === 'new' ? "문서에 새 리비전을 업로드합니다." : "기존 리비전에 파일을 추가합니다."} </DialogDescription> - <div className="flex items-center gap-2 pt-2"> + <div className="flex items-center gap-2 pt-2 flex-wrap"> <Badge variant={projectType === "ship" ? "default" : "secondary"}> {projectType === "ship" ? "조선 프로젝트" : "플랜트 프로젝트"} </Badge> - {/* ✅ 타겟 시스템 표시 추가 */} <Badge variant="outline" className="text-xs"> → {targetSystem} </Badge> + {/* ✅ B3 문서 표시 */} + {isB3Document && ( + <Badge variant="outline" className="text-xs bg-orange-50 text-orange-700 border-orange-200"> + B3 문서 + </Badge> + )} {session?.user?.name && ( <Badge variant="outline" className="text-xs"> 업로더: {session.user.name} @@ -379,6 +445,40 @@ export function RevisionUploadDialog({ /> </div> + {/* ✅ B3 문서용 Usage 필드 - 조건부 표시 */} + {isB3Document && usageOptions.length > 0 && ( + <FormField + control={form.control} + name="usage" + render={({ field }) => ( + <FormItem> + <FormLabel className="flex items-center gap-2"> + 용도 + {isUsageRequired && <span className="text-red-500">*</span>} + </FormLabel> + <Select onValueChange={field.onChange} value={field.value}> + <FormControl> + <SelectTrigger> + <SelectValue placeholder="용도를 선택하세요" /> + </SelectTrigger> + </FormControl> + <SelectContent> + {usageOptions.map((usage) => ( + <SelectItem key={usage} value={usage}> + {usage} + </SelectItem> + ))} + </SelectContent> + </Select> + <FormMessage /> + <p className="text-xs text-gray-500"> + {currentStage} 스테이지에 필요한 용도를 선택하세요. + </p> + </FormItem> + )} + /> + )} + <FormField control={form.control} name="uploaderName" diff --git a/lib/vendor-document-list/table/stage-revision-expanded-content.tsx b/lib/vendor-document-list/table/stage-revision-expanded-content.tsx index a4de03b7..6b9cffb9 100644 --- a/lib/vendor-document-list/table/stage-revision-expanded-content.tsx +++ b/lib/vendor-document-list/table/stage-revision-expanded-content.tsx @@ -494,6 +494,9 @@ export const StageRevisionExpandedContent = ({ <TableHead className="w-16 py-1 px-2 text-xs"></TableHead> <TableHead className="w-16 py-1 px-2 text-xs">리비전</TableHead> <TableHead className="w-20 py-1 px-2 text-xs">상태</TableHead> + {documentData.drawingKind === 'B3' && ( + <TableHead className="w-24 py-1 px-2 text-xs">용도</TableHead> + )} <TableHead className="w-24 py-1 px-2 text-xs">업로더</TableHead> <TableHead className="w-32 py-1 px-2 text-xs">등록일</TableHead> <TableHead className="w-32 py-1 px-2 text-xs">제출일</TableHead> @@ -529,6 +532,19 @@ export const StageRevisionExpandedContent = ({ </Badge> </TableCell> + {/* ✅ B3 문서일 때만 Usage 셀 표시 */} + {documentData.drawingKind === 'B3' && ( + <TableCell className="py-1 px-2"> + {revision.usage ? ( + <span className="text-xs bg-blue-50 text-blue-700 px-1.5 py-0.5 rounded border border-blue-200"> + {revision.usage} + </span> + ) : ( + <span className="text-gray-400 text-xs">-</span> + )} + </TableCell> + )} + {/* 업로더 */} <TableCell className="py-1 px-2"> <div className="flex items-center gap-1"> |