From d55bc64eb42f3b3072a0df4697946e6399cb1e4e Mon Sep 17 00:00:00 2001 From: joonhoekim <26rote@gmail.com> Date: Tue, 4 Nov 2025 13:39:00 +0900 Subject: (김준회) dolce: 이유란프로 B4 스테이지(일정) 관련 요구사항 반영 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/vendor-document-list/import-service.ts | 15 ++++ .../ship/enhanced-doc-table-columns.tsx | 84 ++++++++++++++++++++++ .../ship/enhanced-documents-table.tsx | 8 +-- 3 files changed, 103 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/vendor-document-list/import-service.ts b/lib/vendor-document-list/import-service.ts index 694b3d43..85c706ed 100644 --- a/lib/vendor-document-list/import-service.ts +++ b/lib/vendor-document-list/import-service.ts @@ -1882,6 +1882,21 @@ class ImportService { }) } + // SHI → GTT 스테이지 생성 (GTTInput) + if (!existingStageNames.includes('SHI → GTT')) { + await db.insert(issueStages).values({ + documentId: documentId, + stageName: 'SHI → GTT', + planDate: this.convertDolceDateToDate(dolceDoc.GTTInput_PlanDate), + actualDate: this.convertDolceDateToDate(dolceDoc.GTTInput_ResultDate), + stageStatus: 'PLANNED', + stageOrder: 3, + priority: 'MEDIUM', + reminderDays: 3, + description: 'SHI 제출 문서 단계' + }) + } + console.log(`Created issue stages for B4 document: ${drawingNo}`) } catch (error) { diff --git a/lib/vendor-document-list/ship/enhanced-doc-table-columns.tsx b/lib/vendor-document-list/ship/enhanced-doc-table-columns.tsx index 882ef885..a2ac622d 100644 --- a/lib/vendor-document-list/ship/enhanced-doc-table-columns.tsx +++ b/lib/vendor-document-list/ship/enhanced-doc-table-columns.tsx @@ -33,6 +33,7 @@ import { DocumentSelectionContext } from "@/components/ship-vendor-document/user interface GetColumnsProps { setRowAction?: React.Dispatch | null>> + b4FilterType?: 'all' | 'gtt_deliverable' | 'shi_input' } // 날짜 표시 컴포넌트 (간단 버전) @@ -51,6 +52,7 @@ const DateDisplay = ({ date, isSelected = false }: { date: string | null, isSele export function getSimplifiedDocumentColumns({ setRowAction, + b4FilterType = 'all', }: GetColumnsProps): ColumnDef[] { const columns: ColumnDef[] = [ @@ -258,6 +260,49 @@ export function getSimplifiedDocumentColumns({ ], }, + // 3차 스테이지 그룹 (SHI → GTT) + { + id: "thirdStageGroup", + header: ({ table }) => { + // 첫 번째 행의 thirdStageName을 그룹 헤더로 사용 + const firstRow = table.getRowModel().rows[0]?.original + const stageName = firstRow?.thirdStageName || "SHI → GTT" + return ( +
+ {stageName} +
+ ) + }, + columns: [ + { + accessorKey: "thirdStagePlanDate", + header: ({ column }) => ( + + ), + cell: ({ row }) => { + return + }, + enableResizing: true, + meta: { + excelHeader: "Third Planned Date" + }, + }, + { + accessorKey: "thirdStageActualDate", + header: ({ column }) => ( + + ), + cell: ({ row }) => { + return + }, + enableResizing: true, + meta: { + excelHeader: "Third Actual Date" + }, + }, + ], + }, + // 첨부파일 수 { accessorKey: "attachmentCount", @@ -341,6 +386,22 @@ export function getSimplifiedDocumentColumns({ // }, ] + // b4FilterType에 따라 스테이지 컬럼 필터링 + if (b4FilterType === 'gtt_deliverable') { + // GTT Deliverables: GTT → SHI 스테이지만 (firstStageGroup, secondStageGroup) + return columns.filter(col => { + const id = 'id' in col ? col.id : null + return id !== 'thirdStageGroup' + }) + } else if (b4FilterType === 'shi_input') { + // SHI Input Document: SHI → GTT 스테이지만 (thirdStageGroup) + return columns.filter(col => { + const id = 'id' in col ? col.id : null + return id !== 'firstStageGroup' && id !== 'secondStageGroup' + }) + } + + // All: 모든 컬럼 표시 return columns } @@ -471,6 +532,29 @@ function SecondStageActualDateCell({ row }: { row: any }) { ); } +function ThirdStagePlanDateCell({ row }: { row: any }) { + const { selectedDocumentId } = React.useContext(DocumentSelectionContext); + const isSelected = selectedDocumentId === row.original.documentId; + + return ; +} + +function ThirdStageActualDateCell({ row }: { row: any }) { + const { selectedDocumentId } = React.useContext(DocumentSelectionContext); + const isSelected = selectedDocumentId === row.original.documentId; + const date = row.original.thirdStageActualDate; + + return ( +
+ + {date && ✓ 완료} +
+ ); +} + function AttachmentCountCell({ count, documentId }: { count: number, documentId: number }) { const { selectedDocumentId } = React.useContext(DocumentSelectionContext); const isSelected = selectedDocumentId === documentId; diff --git a/lib/vendor-document-list/ship/enhanced-documents-table.tsx b/lib/vendor-document-list/ship/enhanced-documents-table.tsx index 13f8f8d4..d92f16dd 100644 --- a/lib/vendor-document-list/ship/enhanced-documents-table.tsx +++ b/lib/vendor-document-list/ship/enhanced-documents-table.tsx @@ -100,10 +100,10 @@ export function SimplifiedDocumentsTable({ } }, [data, onDataLoaded]) - // 🔥 컬럼 메모이제이션 최적화 + // 🔥 컬럼 메모이제이션 최적화 (b4FilterType에 따라 동적 변경) const columns = React.useMemo( - () => getSimplifiedDocumentColumns({}), - [] + () => getSimplifiedDocumentColumns({ b4FilterType }), + [b4FilterType] ) // 🔥 필터 필드들을 메모이제이션 @@ -391,7 +391,7 @@ export function SimplifiedDocumentsTable({ className="gap-2" > - GTT Deliverable + GTT Deliverables {b4Stats.gttDeliverableCount} -- cgit v1.2.3