diff options
| author | dujinkim <dujin.kim@dtsolution.co.kr> | 2025-06-13 07:08:01 +0000 |
|---|---|---|
| committer | dujinkim <dujin.kim@dtsolution.co.kr> | 2025-06-13 07:08:01 +0000 |
| commit | c72d0897f7b37843109c86f61d97eba05ba3ca0d (patch) | |
| tree | 887dd877f3f8beafa92b4d9a7b16c84b4a5795d8 /app | |
| parent | ff902243a658067fae858a615c0629aa2e0a4837 (diff) | |
(대표님) 20250613 16시 08분 b-rfq, document 등
Diffstat (limited to 'app')
| -rw-r--r-- | app/[lng]/evcp/(evcp)/b-rfq/[id]/initial/page.tsx | 55 | ||||
| -rw-r--r-- | app/[lng]/evcp/(evcp)/b-rfq/[id]/layout.tsx | 1 | ||||
| -rw-r--r-- | app/[lng]/evcp/(evcp)/b-rfq/[id]/page.tsx | 25 | ||||
| -rw-r--r-- | app/[lng]/partners/(partners)/document-list-ship/page.tsx | 135 | ||||
| -rw-r--r-- | app/api/upload/rfq-attachment-revision/route.ts | 67 | ||||
| -rw-r--r-- | app/api/upload/rfq-attachment/route.ts | 66 |
6 files changed, 335 insertions, 14 deletions
diff --git a/app/[lng]/evcp/(evcp)/b-rfq/[id]/initial/page.tsx b/app/[lng]/evcp/(evcp)/b-rfq/[id]/initial/page.tsx index e69de29b..1a9f4b18 100644 --- a/app/[lng]/evcp/(evcp)/b-rfq/[id]/initial/page.tsx +++ b/app/[lng]/evcp/(evcp)/b-rfq/[id]/initial/page.tsx @@ -0,0 +1,55 @@ +import { Separator } from "@/components/ui/separator" +import { type SearchParams } from "@/types/table" +import { getValidFilters } from "@/lib/data-table" +import { getMatchedVendors } from "@/lib/rfqs/service" +import { searchParamsMatchedVCache } from "@/lib/rfqs/validations" +import { MatchedVendorsTable } from "@/lib/rfqs/vendor-table/vendors-table" + +interface IndexPageProps { + // Next.js 13 App Router에서 기본으로 주어지는 객체들 + params: { + lng: string + id: string + } + searchParams: Promise<SearchParams> +} + +export default async function RfqPage(props: IndexPageProps) { + const resolvedParams = await props.params + const lng = resolvedParams.lng + const id = resolvedParams.id + + const idAsNumber = Number(id) + + // 2) SearchParams 파싱 (Zod) + // - "filters", "page", "perPage", "sort" 등 contact 전용 컬럼 + const searchParams = await props.searchParams + const search = searchParamsMatchedVCache.parse(searchParams) + const validFilters = getValidFilters(search.filters) + + const promises = Promise.all([ + getMatchedVendors({ + ...search, + filters: validFilters, + }, + idAsNumber) + ]) + + // 4) 렌더링 + return ( + <div className="space-y-6"> + <div> + <h3 className="text-lg font-medium"> + Vendors + </h3> + <p className="text-sm text-muted-foreground"> + 등록된 협력업체 중에서 이 RFQ 아이템에 매칭되는 업체를 보여줍니다. <br/>"발행하기" 버튼을 통해 RFQ를 전송하면 첨부파일과 함께 RFQ 내용이 메일로 전달되고 eVCP에도 협력업체가 입력할 수 있게 자동 생성됩니다. + </p> + </div> + <Separator /> + <div> + <MatchedVendorsTable promises={promises} rfqId={idAsNumber}/> + </div> + </div> + ) +}
\ No newline at end of file diff --git a/app/[lng]/evcp/(evcp)/b-rfq/[id]/layout.tsx b/app/[lng]/evcp/(evcp)/b-rfq/[id]/layout.tsx index 75ce5ee5..8dad7676 100644 --- a/app/[lng]/evcp/(evcp)/b-rfq/[id]/layout.tsx +++ b/app/[lng]/evcp/(evcp)/b-rfq/[id]/layout.tsx @@ -2,7 +2,6 @@ import { Metadata } from "next" import Link from "next/link" import { Separator } from "@/components/ui/separator" import { SidebarNav } from "@/components/layout/sidebar-nav" -import { RfqViewWithItems } from "@/db/schema/rfq" import { formatDate } from "@/lib/utils" import { Button } from "@/components/ui/button" import { ArrowLeft } from "lucide-react" diff --git a/app/[lng]/evcp/(evcp)/b-rfq/[id]/page.tsx b/app/[lng]/evcp/(evcp)/b-rfq/[id]/page.tsx index e8820af5..26dc45fb 100644 --- a/app/[lng]/evcp/(evcp)/b-rfq/[id]/page.tsx +++ b/app/[lng]/evcp/(evcp)/b-rfq/[id]/page.tsx @@ -1,6 +1,9 @@ import { Separator } from "@/components/ui/separator" import { type SearchParams } from "@/types/table" import { getValidFilters } from "@/lib/data-table" +import { searchParamsRfqAttachmentsCache } from "@/lib/b-rfq/validations" +import { getRfqAttachments } from "@/lib/b-rfq/service" +import { RfqAttachmentsTable } from "@/lib/b-rfq/attachment/attachment-table" interface IndexPageProps { // Next.js 13 App Router에서 기본으로 주어지는 객체들 @@ -18,36 +21,32 @@ export default async function RfqPage(props: IndexPageProps) { const idAsNumber = Number(id) - console.log(idAsNumber) // 2) SearchParams 파싱 (Zod) // - "filters", "page", "perPage", "sort" 등 contact 전용 컬럼 const searchParams = await props.searchParams - // const search = searchParamsMatchedVCache.parse(searchParams) - // const validFilters = getValidFilters(search.filters) + const search = searchParamsRfqAttachmentsCache.parse(searchParams) + const validFilters = getValidFilters(search.filters) - // const promises = Promise.all([ - // getMatchedVendors({ - // ...search, - // filters: validFilters, - // }, - // idAsNumber) - // ]) + const promises = getRfqAttachments({ + ...search, + filters: validFilters, + }, idAsNumber) // 4) 렌더링 return ( <div className="space-y-6"> <div> <h3 className="text-lg font-medium"> - 견적 RFQ 문서관리 + 견적 RFQ 문서관리 </h3> <p className="text-sm text-muted-foreground"> - 설계로부터 받은 RFQ 문서와 구매 RFQ 문서를 관리하고 Vendor 회신을 점검/관리하는 화면입니다. + 설계로부터 받은 RFQ 문서와 구매 RFQ 문서를 관리하고 Vendor 회신을 점검/관리하는 화면입니다. </p> </div> <Separator /> <div> - {/* <MatchedVendorsTable promises={promises} rfqId={idAsNumber}/> */} + <RfqAttachmentsTable promises={promises} rfqId={idAsNumber} /> </div> </div> ) diff --git a/app/[lng]/partners/(partners)/document-list-ship/page.tsx b/app/[lng]/partners/(partners)/document-list-ship/page.tsx new file mode 100644 index 00000000..8b7f61e2 --- /dev/null +++ b/app/[lng]/partners/(partners)/document-list-ship/page.tsx @@ -0,0 +1,135 @@ +// page.tsx (간단한 Promise 생성과 로그인 처리) +import * as React from "react" +import { type SearchParams } from "@/types/table" +import { getValidFilters } from "@/lib/data-table" +import { Skeleton } from "@/components/ui/skeleton" +import { DataTableSkeleton } from "@/components/data-table/data-table-skeleton" +import { Shell } from "@/components/shell" +import { searchParamsRfqsForVendorsCache } from "@/lib/rfqs/validations" +import { getServerSession } from "next-auth" +import { authOptions } from "@/app/api/auth/[...nextauth]/route" +import Link from "next/link" +import { Button } from "@/components/ui/button" +import { LogIn } from "lucide-react" +import { getUserVendorDocumentStats, getUserVendorDocuments } from "@/lib/vendor-document-list/enhanced-document-service" +import { UserVendorDocumentDisplay } from "@/components/ship-vendor-document/user-vendor-document-table-container" + +interface IndexPageProps { + searchParams: Promise<SearchParams> +} + +export default async function IndexPage(props: IndexPageProps) { + const searchParams = await props.searchParams + const search = searchParamsRfqsForVendorsCache.parse(searchParams) + const validFilters = getValidFilters(search.filters) + + // Get session + const session = await getServerSession(authOptions) + + // Check if user is logged in + if (!session || !session.user) { + return ( + <Shell className="gap-6"> + <div className="flex items-center justify-between"> + <div> + <h2 className="text-2xl font-bold tracking-tight"> + Document Management + </h2> + <p className="text-muted-foreground"> + 소속 회사의 모든 도서/도면을 확인하고 관리합니다. + </p> + </div> + </div> + + <div className="flex flex-col items-center justify-center py-12 text-center"> + <div className="rounded-lg border border-dashed p-10 shadow-sm"> + <h3 className="mb-2 text-xl font-semibold">로그인이 필요합니다</h3> + <p className="mb-6 text-muted-foreground"> + 문서를 확인하려면 먼저 로그인하세요. + </p> + <Button size="lg" asChild> + <Link href="/partners"> + <LogIn className="mr-2 h-4 w-4" /> + 로그인하기 + </Link> + </Button> + </div> + </div> + </Shell> + ) + } + + // User is logged in, get user ID + const requesterId = session.user.id ? Number(session.user.id) : null + + if (!requesterId) { + return ( + <Shell className="gap-6"> + <div className="flex items-center justify-between"> + <div> + <h2 className="text-2xl font-bold tracking-tight"> + Document Management + </h2> + </div> + </div> + <div className="flex flex-col items-center justify-center py-12 text-center"> + <div className="rounded-lg border border-dashed p-10 shadow-sm"> + <h3 className="mb-2 text-xl font-semibold">계정 오류</h3> + <p className="mb-6 text-muted-foreground"> + 사용자 정보가 올바르게 설정되지 않았습니다. 관리자에게 문의하세요. + </p> + </div> + </div> + </Shell> + ) + } + + // 검색 파라미터 정리 + const searchInput = { + ...search, + filters: validFilters, + } + + // Promise 생성 (모든 데이터를 페이지에서 처리) + const documentsPromise = getUserVendorDocuments(requesterId, searchInput) + const statsPromise = getUserVendorDocumentStats(requesterId) + + // Promise.all로 감싸서 전달 + const allPromises = Promise.all([documentsPromise, statsPromise]) + + return ( + <Shell className="gap-2"> + <div className="flex items-center justify-between space-y-2"> + <div> + <h2 className="text-2xl font-bold tracking-tight"> + 내 문서 관리 + </h2> + <p className="text-muted-foreground"> + 소속 회사의 모든 계약 문서를 확인하고 관리합니다. + </p> + </div> + </div> + + <React.Suspense fallback={<Skeleton className="h-7 w-52" />}> + {/* DateRangePicker can go here */} + </React.Suspense> + + <React.Suspense + fallback={ + <DataTableSkeleton + columnCount={8} + searchableColumnCount={1} + filterableColumnCount={3} + cellWidths={["10rem", "30rem", "15rem", "15rem", "15rem", "15rem", "8rem", "8rem"]} + shrinkZero + /> + } + > + <UserVendorDocumentDisplay + allPromises={allPromises} + /> + </React.Suspense> + </Shell> + ) +} + diff --git a/app/api/upload/rfq-attachment-revision/route.ts b/app/api/upload/rfq-attachment-revision/route.ts new file mode 100644 index 00000000..a7dd4117 --- /dev/null +++ b/app/api/upload/rfq-attachment-revision/route.ts @@ -0,0 +1,67 @@ +import { NextRequest, NextResponse } from "next/server" +import { writeFile, mkdir } from "fs/promises" +import { existsSync } from "fs" +import path from "path" + +export async function POST(request: NextRequest) { + try { + const formData = await request.formData() + const attachmentId = formData.get("attachmentId") as string + const file = formData.get("file") as File + const isRevision = formData.get("isRevision") as string + + if (!attachmentId) { + return NextResponse.json( + { message: "첨부파일 ID가 필요합니다." }, + { status: 400 } + ) + } + + if (!file) { + return NextResponse.json( + { message: "파일이 선택되지 않았습니다." }, + { status: 400 } + ) + } + + // 파일 크기 검증 + if (file.size > 10 * 1024 * 1024) { // 10MB + return NextResponse.json( + { message: `파일이 너무 큽니다. (최대 10MB)` }, + { status: 400 } + ) + } + + // 업로드 디렉토리 생성 (첨부파일 ID별) + const uploadDir = path.join(process.cwd(), "public", "uploads", "rfq", "revisions", attachmentId) + if (!existsSync(uploadDir)) { + await mkdir(uploadDir, { recursive: true }) + } + + // 고유한 파일명 생성 (리비전용) + const timestamp = Date.now() + const sanitizedName = file.name.replace(/[^a-zA-Z0-9.-]/g, "_") + const fileName = `${timestamp}_${sanitizedName}` + const filePath = `/uploads/rfq/revisions/${attachmentId}/${fileName}` + const fullPath = path.join(uploadDir, fileName) + + // 파일 저장 + const buffer = Buffer.from(await file.arrayBuffer()) + await writeFile(fullPath, buffer) + + return NextResponse.json({ + fileName, + originalFileName: file.name, + filePath, + fileSize: file.size, + fileType: file.type || path.extname(file.name).slice(1), + }) + + } catch (error) { + console.error("File upload error:", error) + return NextResponse.json( + { message: "파일 업로드 중 오류가 발생했습니다." }, + { status: 500 } + ) + } +}
\ No newline at end of file diff --git a/app/api/upload/rfq-attachment/route.ts b/app/api/upload/rfq-attachment/route.ts new file mode 100644 index 00000000..306919fb --- /dev/null +++ b/app/api/upload/rfq-attachment/route.ts @@ -0,0 +1,66 @@ +import { NextRequest, NextResponse } from "next/server" +import { writeFile, mkdir } from "fs/promises" +import { existsSync } from "fs" +import path from "path" + +export async function POST(request: NextRequest) { + try { + const formData = await request.formData() + const rfqId = formData.get("rfqId") as string + const file = formData.get("file") as File + + if (!rfqId) { + return NextResponse.json( + { message: "RFQ ID가 필요합니다." }, + { status: 400 } + ) + } + + if (!file) { + return NextResponse.json( + { message: "파일이 선택되지 않았습니다." }, + { status: 400 } + ) + } + + // 파일 크기 검증 + if (file.size > 10 * 1024 * 1024) { // 10MB + return NextResponse.json( + { message: `파일이 너무 큽니다. (최대 10MB)` }, + { status: 400 } + ) + } + + // 업로드 디렉토리 생성 + const uploadDir = path.join(process.cwd(), "public", "uploads", "rfq", rfqId) + if (!existsSync(uploadDir)) { + await mkdir(uploadDir, { recursive: true }) + } + + // 고유한 파일명 생성 (타임스탬프 + 원본명) + const timestamp = Date.now() + const sanitizedName = file.name.replace(/[^a-zA-Z0-9.-]/g, "_") + const fileName = `${timestamp}_${sanitizedName}` + const filePath = `/uploads/rfq/${rfqId}/${fileName}` + const fullPath = path.join(uploadDir, fileName) + + // 파일 저장 + const buffer = Buffer.from(await file.arrayBuffer()) + await writeFile(fullPath, buffer) + + return NextResponse.json({ + fileName, + originalFileName: file.name, + filePath, + fileSize: file.size, + fileType: file.type || path.extname(file.name).slice(1), + }) + + } catch (error) { + console.error("File upload error:", error) + return NextResponse.json( + { message: "파일 업로드 중 오류가 발생했습니다." }, + { status: 500 } + ) + } +}
\ No newline at end of file |
