From a42873419d14652d3639d2ae02d2ea54653b4749 Mon Sep 17 00:00:00 2001 From: joonhoekim <26rote@gmail.com> Date: Wed, 2 Jul 2025 04:46:24 +0000 Subject: (김준회) 견적프로젝트 해양 TOP - nonsap(견적물량관리시스템) 데이터 가져오기 추가 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../table/projects-table-columns.tsx | 43 +++- .../table/projects-table-toolbar-actions.tsx | 36 +-- lib/bidding-projects/table/projects-table.tsx | 17 ++ .../table/update-project-sheet.tsx | 274 +++++++++++++++++++++ 4 files changed, 341 insertions(+), 29 deletions(-) create mode 100644 lib/bidding-projects/table/update-project-sheet.tsx (limited to 'lib/bidding-projects/table') diff --git a/lib/bidding-projects/table/projects-table-columns.tsx b/lib/bidding-projects/table/projects-table-columns.tsx index 08530ff0..b8f3b91b 100644 --- a/lib/bidding-projects/table/projects-table-columns.tsx +++ b/lib/bidding-projects/table/projects-table-columns.tsx @@ -7,7 +7,7 @@ import { DataTableColumnHeaderSimple } from "@/components/data-table/data-table- import { BiddingProjects } from "@/db/schema" import { bidProjectsColumnsConfig } from "@/config/bidProjectsColumnsConfig" import { Button } from "@/components/ui/button" -import { ListFilter } from "lucide-react" // Import an icon for the button +import { ListFilter, Edit } from "lucide-react" // Import an icon for the button interface GetColumnsProps { setRowAction: React.Dispatch | null>> @@ -76,18 +76,37 @@ export function getColumns({ setRowAction }: GetColumnsProps): ColumnDef { + const project = row.original + const isTopType = project.pjtType === "TOP" + return ( - +
+ + + {isTopType && ( + + )} +
) }, } diff --git a/lib/bidding-projects/table/projects-table-toolbar-actions.tsx b/lib/bidding-projects/table/projects-table-toolbar-actions.tsx index ee2f8c4e..3e2f3392 100644 --- a/lib/bidding-projects/table/projects-table-toolbar-actions.tsx +++ b/lib/bidding-projects/table/projects-table-toolbar-actions.tsx @@ -8,6 +8,7 @@ import { toast } from "sonner" import { exportTableToExcel } from "@/lib/export" import { Button } from "@/components/ui/button" import { BiddingProjects } from "@/db/schema" +import { syncProjectsFromNonSap } from "../actions" interface ItemsTableToolbarActionsProps { table: Table @@ -16,28 +17,29 @@ interface ItemsTableToolbarActionsProps { export function ProjectTableToolbarActions({ table }: ItemsTableToolbarActionsProps) { const [isLoading, setIsLoading] = React.useState(false) - // 프로젝트 동기화 API 호출 함수 + // 프로젝트 동기화 서버 액션 호출 함수 const syncProjects = async () => { try { setIsLoading(true) - // API 엔드포인트 호출 - const response = await fetch('/api/cron/bid-projects') + // 서버 액션 호출 (NONSAP에서 데이터 동기화) + const result = await syncProjectsFromNonSap() - if (!response.ok) { - const errorData = await response.json() - throw new Error(errorData.error || 'Failed to sync projects') + if (result.success) { + // 성공 메시지 표시 + toast.success(result.message) + + // 오류가 있었다면 추가 정보 표시 + if (result.errors && result.errors.length > 0) { + console.warn('동기화 오류:', result.errors) + toast.warning(`일부 프로젝트 동기화 중 오류가 발생했습니다. 콘솔을 확인해주세요.`) + } + + // 페이지 새로고침으로 테이블 데이터 업데이트 + window.location.reload() + } else { + throw new Error(result.error || '프로젝트 동기화에 실패했습니다.') } - - const data = await response.json() - - // 성공 메시지 표시 - toast.success( - `Projects synced successfully! ${data.result.items} items processed.` - ) - - // 페이지 새로고침으로 테이블 데이터 업데이트 - window.location.reload() } catch (error) { console.error('Error syncing projects:', error) toast.error( @@ -64,7 +66,7 @@ export function ProjectTableToolbarActions({ table }: ItemsTableToolbarActionsPr aria-hidden="true" /> - {isLoading ? 'Syncing...' : 'Get Projects'} + {isLoading ? '동기화 중...' : '해양 TOP 견적물량시스템 동기화'} diff --git a/lib/bidding-projects/table/projects-table.tsx b/lib/bidding-projects/table/projects-table.tsx index 0e0c48f9..130e1214 100644 --- a/lib/bidding-projects/table/projects-table.tsx +++ b/lib/bidding-projects/table/projects-table.tsx @@ -16,6 +16,7 @@ import { getBidProjectLists } from "../service" import { BiddingProjects } from "@/db/schema" import { ProjectTableToolbarActions } from "./projects-table-toolbar-actions" import { ProjectSeriesDialog } from "./project-series-dialog" +import { UpdateProjectSheet } from "./update-project-sheet" interface ItemsTableProps { promises: Promise< @@ -64,6 +65,16 @@ export function BidProjectsTable({ promises }: ItemsTableProps) { * 4. Date and boolean types: Adds support for filtering by date ranges and boolean values. */ const advancedFilterFields: DataTableAdvancedFilterField[] = [ + { + id: "pjtType", + label: "프로젝트 타입", + type: "select", + options: [ + { label: "SHIP", value: "SHIP" }, + { label: "HULL", value: "HULL" }, + { label: "TOP", value: "TOP" }, + ], + }, { id: "pspid", label: "견적프로젝트번호", @@ -151,6 +162,12 @@ export function BidProjectsTable({ promises }: ItemsTableProps) { onOpenChange={() => setRowAction(null)} project={rowAction?.row.original ?? null} /> + + setRowAction(null)} + project={rowAction?.row.original ?? null} + /> ) } diff --git a/lib/bidding-projects/table/update-project-sheet.tsx b/lib/bidding-projects/table/update-project-sheet.tsx new file mode 100644 index 00000000..b3275d58 --- /dev/null +++ b/lib/bidding-projects/table/update-project-sheet.tsx @@ -0,0 +1,274 @@ +"use client" + +import * as React from "react" +import { zodResolver } from "@hookform/resolvers/zod" +import { Loader } from "lucide-react" +import { useForm } from "react-hook-form" +import { toast } from "sonner" + +import { Button } from "@/components/ui/button" +import { + Form, + FormControl, + FormField, + FormItem, + FormLabel, + FormMessage, +} from "@/components/ui/form" +import { Input } from "@/components/ui/input" +import { + Sheet, + SheetClose, + SheetContent, + SheetDescription, + SheetFooter, + SheetHeader, + SheetTitle, +} from "@/components/ui/sheet" + +import { BiddingProjects } from "@/db/schema/projects" +import { updateBiddingProjectSchema, type UpdateBiddingProjectSchema } from "../validation" +import { updateBiddingProject } from "../actions" + +interface UpdateProjectSheetProps + extends React.ComponentPropsWithRef { + project: BiddingProjects | null +} + +export function UpdateProjectSheet({ project, ...props }: UpdateProjectSheetProps) { + const [isUpdatePending, startUpdateTransition] = React.useTransition() + + const form = useForm({ + resolver: zodResolver(updateBiddingProjectSchema), + }) + + React.useEffect(() => { + if (project) { + form.reset({ + id: project.id, + projNm: project.projNm || "", + kunnrNm: project.kunnrNm || "", + cls1Nm: project.cls1Nm || "", + ptypeNm: project.ptypeNm || "", + pmodelNm: project.pmodelNm || "", + pmodelSz: project.pmodelSz || "", + txt30: project.txt30 || "", + estmPm: project.estmPm || "", + }) + } + }, [project, form]) + + function onSubmit(input: UpdateBiddingProjectSchema) { + startUpdateTransition(async () => { + const result = await updateBiddingProject(input) + + if (result.success) { + toast.success(result.message) + props.onOpenChange?.(false) + form.reset() + } else { + toast.error(result.error) + } + }) + } + + return ( + + + + 프로젝트 정보 수정 + + 해양 TOP 프로젝트의 정보를 수정할 수 있습니다. + {project && ( +
+ {project.pspid} | {project.pjtType} +
+ )} +
+
+ +
+ + {/* Hidden ID field */} + ( + + )} + /> + + {/* 프로젝트명 */} + ( + + 프로젝트명 + + + + + + )} + /> + + {/* 선주명 */} + ( + + 선주명 + + + + + + )} + /> + + {/* 선급명 */} + ( + + 선급명 + + + + + + )} + /> + + {/* 선종명 */} + ( + + 선종명 + + + + + + )} + /> + + {/* 선형명 */} + ( + + 선형명 + + + + + + )} + /> + + {/* 선형크기 */} + ( + + 선형크기 + + + + + + )} + /> + + {/* 견적상태명 */} + ( + + 견적상태명 + + + + + + )} + /> + + {/* 견적대표PM */} + ( + + 견적대표PM + + + + + + )} + /> + + + + + + + + + +
+
+ ) +} \ No newline at end of file -- cgit v1.2.3