diff options
| author | joonhoekim <26rote@gmail.com> | 2025-07-02 04:46:24 +0000 |
|---|---|---|
| committer | joonhoekim <26rote@gmail.com> | 2025-07-02 04:46:24 +0000 |
| commit | a42873419d14652d3639d2ae02d2ea54653b4749 (patch) | |
| tree | 3823f94d9c919f88f05fdfa5f262ea093447e24a /lib/bidding-projects | |
| parent | 2acf5f8966a40c1c9a97680c8dc263ee3f1ad3d1 (diff) | |
(김준회) 견적프로젝트 해양 TOP - nonsap(견적물량관리시스템) 데이터 가져오기 추가
Diffstat (limited to 'lib/bidding-projects')
| -rw-r--r-- | lib/bidding-projects/actions.ts | 237 | ||||
| -rw-r--r-- | lib/bidding-projects/table/projects-table-columns.tsx | 43 | ||||
| -rw-r--r-- | lib/bidding-projects/table/projects-table-toolbar-actions.tsx | 36 | ||||
| -rw-r--r-- | lib/bidding-projects/table/projects-table.tsx | 17 | ||||
| -rw-r--r-- | lib/bidding-projects/table/update-project-sheet.tsx | 274 | ||||
| -rw-r--r-- | lib/bidding-projects/validation.ts | 15 |
6 files changed, 593 insertions, 29 deletions
diff --git a/lib/bidding-projects/actions.ts b/lib/bidding-projects/actions.ts new file mode 100644 index 00000000..bbb755aa --- /dev/null +++ b/lib/bidding-projects/actions.ts @@ -0,0 +1,237 @@ +"use server"; + +import { revalidatePath, revalidateTag } from "next/cache"; +import db from "@/db/db"; +import { biddingProjects, NewBiddingProject } from "@/db/schema/projects"; +import { plftbEstmProjMast } from "@/db/schema/NONSAP/nonsap"; +import { eq, desc } from "drizzle-orm"; +import { updateBiddingProjectSchema, type UpdateBiddingProjectSchema } from "./validation"; + +/** + * NONSAP에서 견적프로젝트 데이터를 가져와서 biddingProjects 테이블에 upsert하는 서버 액션 + */ +export async function syncProjectsFromNonSap() { + try { + // 1. NONSAP에서 IF_TRGT_YN = 'Y'인 데이터를 가져오되, + // 같은 ESTM_PROJ_NO에 대해 REV_NO가 가장 높은 것만 가져오기 + const nonsapProjects = await db + .select() + .from(plftbEstmProjMast) + .where(eq(plftbEstmProjMast.IF_TRGT_YN, "Y")) + .orderBy(desc(plftbEstmProjMast.REV_NO)); + + if (nonsapProjects.length === 0) { + return { + success: true, + message: "동기화할 프로젝트가 없습니다.", + syncedCount: 0, + }; + } + + // 2. 프로젝트 번호별로 가장 높은 REV_NO만 유지 + const latestProjects = new Map(); + for (const project of nonsapProjects) { + const existingProject = latestProjects.get(project.ESTM_PROJ_NO); + if ( + !existingProject || + (project.REV_NO && project.REV_NO > existingProject.REV_NO) + ) { + latestProjects.set(project.ESTM_PROJ_NO, project); + } + } + + let syncedCount = 0; + const errors: string[] = []; + + // 3. 각 프로젝트를 biddingProjects 형식으로 변환하고 upsert + for (const nonsapProject of latestProjects.values()) { + try { + // pspid가 없으면 해당 프로젝트는 건너뛰기 + if (!nonsapProject.ESTM_PROJ_NO?.trim()) { + console.warn(`프로젝트 번호가 없는 데이터 건너뛰기:`, nonsapProject); + continue; + } + + // 컬럼 매핑 및 타입 변환 + const biddingProject: NewBiddingProject = { + pspid: nonsapProject.ESTM_PROJ_NO.substring(0, 8), // 해양 TOP은 8자리만 사용 + projNm: nonsapProject.ESTM_PROJ_NM?.substring(0, 90) || null, // 90자 제한 + sector: nonsapProject.BIZ_CLS?.substring(0, 1) || null, // 1자 제한 + projMsrm: nonsapProject.SERS_CNT + ? (() => { + const numValue = Number(nonsapProject.SERS_CNT); + return isNaN(numValue) + ? null + : String(Math.min(Math.max(numValue, 0), 999)); + })() + : null, // precision 3,0 제한 (0~999, 숫자가 아니면 null) + kunnr: nonsapProject.OWNER_CD?.substring(0, 10) || null, // 10자 제한 + kunnrNm: null, // NONSAP에 없음 + cls1: nonsapProject.CLS_1?.substring(0, 10) || null, // 10자 제한 + cls1Nm: null, // NONSAP에 없음 + ptype: nonsapProject.SKND_CD?.substring(0, 3) || null, // 10 -> 3자 제한 + ptypeNm: null, // NONSAP에 없음 + pmodelCd: nonsapProject.SHTYPE_CD?.substring(0, 10) || null, // 10자 제한 + pmodelNm: null, // NONSAP에 없음 + pmodelSz: nonsapProject.SHTYPE_SIZE + ? String(nonsapProject.SHTYPE_SIZE).substring(0, 20) + : null, // numeric to varchar(20) + pmodelUom: nonsapProject.SHTYPE_UOM?.substring(0, 5) || null, // 10 -> 5자 제한 + txt04: nonsapProject.ESTM_TYPE?.substring(0, 4) || null, // 1 -> 4자 제한 + txt30: null, // NONSAP에 없음 + estmPm: null, // NONSAP에 없음 + pjtType: "TOP", // NONSAP에서 오는 것은 해양 탑으로 고정 + }; + + // upsert 처리 (pspid를 기준으로) + const existingProject = await db.query.biddingProjects.findFirst({ + where: eq(biddingProjects.pspid, biddingProject.pspid), + }); + + if (existingProject) { + // 업데이트 - 시트에서 수정 가능한 필드들은 제외하고 NONSAP 원본 데이터만 업데이트 + await db + .update(biddingProjects) + .set({ + // NONSAP 원본 데이터만 업데이트 (시트 수정 필드 제외) + pspid: biddingProject.pspid, + projNm: biddingProject.projNm, + sector: biddingProject.sector, + projMsrm: biddingProject.projMsrm, + kunnr: biddingProject.kunnr, + // kunnrNm: 시트에서 수정 가능하므로 제외 + cls1: biddingProject.cls1, + // cls1Nm: 시트에서 수정 가능하므로 제외 + ptype: biddingProject.ptype, + // ptypeNm: 시트에서 수정 가능하므로 제외 + pmodelCd: biddingProject.pmodelCd, + // pmodelNm: 시트에서 수정 가능하므로 제외 + pmodelSz: biddingProject.pmodelSz, + pmodelUom: biddingProject.pmodelUom, + txt04: biddingProject.txt04, + // txt30: 시트에서 수정 가능하므로 제외 + // estmPm: 시트에서 수정 가능하므로 제외 + pjtType: biddingProject.pjtType, + updatedAt: new Date(), + }) + .where(eq(biddingProjects.pspid, biddingProject.pspid)); + } else { + // 신규 등록 + await db.insert(biddingProjects).values(biddingProject); + } + + syncedCount++; + } catch (error) { + const errorMsg = `프로젝트 ${nonsapProject.ESTM_PROJ_NO} 동기화 실패: ${ + error instanceof Error ? error.message : "알 수 없는 오류" + }`; + errors.push(errorMsg); + console.error(errorMsg, error); + } + } + + // 4. 관련 페이지 재검증 (공격적으로) + revalidatePath("/ko/evcp/bid-projects"); // 국제화 경로 + revalidatePath("/en/evcp/bid-projects"); // 영어 경로 + revalidatePath("/ko/evcp/vendor-info/projects"); // 국제화 기존 경로 + revalidatePath("/en/evcp/vendor-info/projects"); // 영어 기존 경로 + + // 관련 태그들 재검증 + revalidateTag("bidding-projects"); + revalidateTag("projects"); + revalidateTag("bid-projects-list"); + revalidateTag("nonsap-projects"); + revalidateTag("vendor-info"); + + return { + success: true, + message: `${syncedCount}개 프로젝트가 성공적으로 동기화되었습니다.${ + errors.length > 0 ? ` (${errors.length}개 오류 발생)` : "" + }`, + syncedCount, + errors: errors.length > 0 ? errors : undefined, + }; + } catch (error) { + console.error("NONSAP 프로젝트 동기화 오류:", error); + return { + success: false, + error: + error instanceof Error + ? error.message + : "프로젝트 동기화에 실패했습니다.", + }; + } +} + +/** + * 견적 프로젝트 정보를 업데이트하는 서버 액션 + * @param input 업데이트할 프로젝트 데이터 + */ +export async function updateBiddingProject(input: UpdateBiddingProjectSchema) { + try { + // 입력 데이터 검증 + const validatedInput = updateBiddingProjectSchema.parse(input); + + // 프로젝트 존재 여부 확인 + const existingProject = await db.query.biddingProjects.findFirst({ + where: eq(biddingProjects.id, validatedInput.id), + }); + + if (!existingProject) { + return { + success: false, + error: "프로젝트를 찾을 수 없습니다.", + }; + } + + // TOP 타입만 수정 가능하도록 제한 + if (existingProject.pjtType !== "TOP") { + return { + success: false, + error: "해양 TOP 프로젝트만 수정할 수 있습니다.", + }; + } + + // 업데이트 실행 + await db + .update(biddingProjects) + .set({ + projNm: validatedInput.projNm, + kunnrNm: validatedInput.kunnrNm, + cls1Nm: validatedInput.cls1Nm, + ptypeNm: validatedInput.ptypeNm, + pmodelNm: validatedInput.pmodelNm, + pmodelSz: validatedInput.pmodelSz, + txt30: validatedInput.txt30, + estmPm: validatedInput.estmPm, + updatedAt: new Date(), + }) + .where(eq(biddingProjects.id, validatedInput.id)); + + // 관련 페이지 재검증 (공격적으로) + revalidatePath("/evcp/bid-projects"); // 해당 페이지 + revalidatePath("/evcp"); // 상위 경로 + revalidatePath("/"); // 루트 경로 + revalidatePath("/ko/evcp/bid-projects"); // 국제화 경로 + revalidatePath("/en/evcp/bid-projects"); // 영어 경로 + + // 관련 태그들 재검증 + revalidateTag("bidding-projects"); + revalidateTag("projects"); + revalidateTag("bid-projects-list"); + + return { + success: true, + message: "프로젝트가 성공적으로 업데이트되었습니다.", + }; + } catch (error) { + console.error("프로젝트 업데이트 오류:", error); + return { + success: false, + error: + error instanceof Error + ? error.message + : "프로젝트 업데이트에 실패했습니다.", + }; + } +} 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<React.SetStateAction<DataTableRowAction<BiddingProjects> | null>> @@ -76,18 +76,37 @@ export function getColumns({ setRowAction }: GetColumnsProps): ColumnDef<Bidding id: "actions", header: "Actions", cell: ({ row }) => { + const project = row.original + const isTopType = project.pjtType === "TOP" + return ( - <Button - variant="ghost" - size="sm" - className="flex items-center gap-1" - onClick={() => { - setRowAction({ row,type: "view-series" }) - }} - > - <ListFilter className="h-4 w-4" /> - 시리즈 보기 - </Button> + <div className="flex items-center gap-1"> + <Button + variant="ghost" + size="sm" + className="flex items-center gap-1" + onClick={() => { + setRowAction({ row, type: "view-series" }) + }} + > + <ListFilter className="h-4 w-4" /> + 시리즈 보기 + </Button> + + {isTopType && ( + <Button + variant="ghost" + size="sm" + className="flex items-center gap-1" + onClick={() => { + setRowAction({ row, type: "update" }) + }} + > + <Edit className="h-4 w-4" /> + 수정 + </Button> + )} + </div> ) }, } 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<BiddingProjects> @@ -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" /> <span className="hidden sm:inline"> - {isLoading ? 'Syncing...' : 'Get Projects'} + {isLoading ? '동기화 중...' : '해양 TOP 견적물량시스템 동기화'} </span> </Button> 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< @@ -65,6 +66,16 @@ export function BidProjectsTable({ promises }: ItemsTableProps) { */ const advancedFilterFields: DataTableAdvancedFilterField<BiddingProjects>[] = [ { + id: "pjtType", + label: "프로젝트 타입", + type: "select", + options: [ + { label: "SHIP", value: "SHIP" }, + { label: "HULL", value: "HULL" }, + { label: "TOP", value: "TOP" }, + ], + }, + { id: "pspid", label: "견적프로젝트번호", type: "text", @@ -151,6 +162,12 @@ export function BidProjectsTable({ promises }: ItemsTableProps) { onOpenChange={() => setRowAction(null)} project={rowAction?.row.original ?? null} /> + + <UpdateProjectSheet + open={rowAction?.type === "update"} + onOpenChange={() => 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<typeof Sheet> { + project: BiddingProjects | null +} + +export function UpdateProjectSheet({ project, ...props }: UpdateProjectSheetProps) { + const [isUpdatePending, startUpdateTransition] = React.useTransition() + + const form = useForm<UpdateBiddingProjectSchema>({ + 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 ( + <Sheet {...props}> + <SheetContent className="flex flex-col gap-6 sm:max-w-md"> + <SheetHeader className="text-left"> + <SheetTitle>프로젝트 정보 수정</SheetTitle> + <SheetDescription> + 해양 TOP 프로젝트의 정보를 수정할 수 있습니다. + {project && ( + <div className="mt-2 text-sm font-mono bg-muted p-2 rounded"> + {project.pspid} | {project.pjtType} + </div> + )} + </SheetDescription> + </SheetHeader> + + <Form {...form}> + <form + onSubmit={form.handleSubmit(onSubmit)} + className="flex flex-col gap-4" + > + {/* Hidden ID field */} + <FormField + control={form.control} + name="id" + render={({ field }) => ( + <input type="hidden" {...field} /> + )} + /> + + {/* 프로젝트명 */} + <FormField + control={form.control} + name="projNm" + render={({ field }) => ( + <FormItem> + <FormLabel>프로젝트명</FormLabel> + <FormControl> + <Input + placeholder="프로젝트명을 입력하세요" + {...field} + value={field.value || ""} + /> + </FormControl> + <FormMessage /> + </FormItem> + )} + /> + + {/* 선주명 */} + <FormField + control={form.control} + name="kunnrNm" + render={({ field }) => ( + <FormItem> + <FormLabel>선주명</FormLabel> + <FormControl> + <Input + placeholder="선주명을 입력하세요" + {...field} + value={field.value || ""} + /> + </FormControl> + <FormMessage /> + </FormItem> + )} + /> + + {/* 선급명 */} + <FormField + control={form.control} + name="cls1Nm" + render={({ field }) => ( + <FormItem> + <FormLabel>선급명</FormLabel> + <FormControl> + <Input + placeholder="선급명을 입력하세요" + {...field} + value={field.value || ""} + /> + </FormControl> + <FormMessage /> + </FormItem> + )} + /> + + {/* 선종명 */} + <FormField + control={form.control} + name="ptypeNm" + render={({ field }) => ( + <FormItem> + <FormLabel>선종명</FormLabel> + <FormControl> + <Input + placeholder="선종명을 입력하세요" + {...field} + value={field.value || ""} + /> + </FormControl> + <FormMessage /> + </FormItem> + )} + /> + + {/* 선형명 */} + <FormField + control={form.control} + name="pmodelNm" + render={({ field }) => ( + <FormItem> + <FormLabel>선형명</FormLabel> + <FormControl> + <Input + placeholder="선형명을 입력하세요" + {...field} + value={field.value || ""} + /> + </FormControl> + <FormMessage /> + </FormItem> + )} + /> + + {/* 선형크기 */} + <FormField + control={form.control} + name="pmodelSz" + render={({ field }) => ( + <FormItem> + <FormLabel>선형크기</FormLabel> + <FormControl> + <Input + placeholder="선형크기를 입력하세요" + {...field} + value={field.value || ""} + /> + </FormControl> + <FormMessage /> + </FormItem> + )} + /> + + {/* 견적상태명 */} + <FormField + control={form.control} + name="txt30" + render={({ field }) => ( + <FormItem> + <FormLabel>견적상태명</FormLabel> + <FormControl> + <Input + placeholder="견적상태명을 입력하세요" + {...field} + value={field.value || ""} + /> + </FormControl> + <FormMessage /> + </FormItem> + )} + /> + + {/* 견적대표PM */} + <FormField + control={form.control} + name="estmPm" + render={({ field }) => ( + <FormItem> + <FormLabel>견적대표PM</FormLabel> + <FormControl> + <Input + placeholder="견적대표PM을 입력하세요" + {...field} + value={field.value || ""} + /> + </FormControl> + <FormMessage /> + </FormItem> + )} + /> + + <SheetFooter className="gap-2 pt-2 sm:space-x-0"> + <SheetClose asChild> + <Button type="button" variant="outline"> + 취소 + </Button> + </SheetClose> + <Button disabled={isUpdatePending}> + {isUpdatePending && ( + <Loader className="mr-2 size-4 animate-spin" aria-hidden="true" /> + )} + 저장 + </Button> + </SheetFooter> + </form> + </Form> + </SheetContent> + </Sheet> + ) +}
\ No newline at end of file diff --git a/lib/bidding-projects/validation.ts b/lib/bidding-projects/validation.ts index e5f8b121..a7728613 100644 --- a/lib/bidding-projects/validation.ts +++ b/lib/bidding-projects/validation.ts @@ -30,3 +30,18 @@ export const searchParamsBidProjectsCache = createSearchParamsCache({ export type GetBidProjectListsSchema = Awaited<ReturnType<typeof searchParamsBidProjectsCache.parse>> + +// 프로젝트 업데이트 스키마 (TOP 타입용) +export const updateBiddingProjectSchema = z.object({ + id: z.number().int().positive(), + projNm: z.string().max(90).optional().nullable(), + kunnrNm: z.string().max(30).optional().nullable(), + cls1Nm: z.string().max(30).optional().nullable(), + ptypeNm: z.string().max(40).optional().nullable(), + pmodelNm: z.string().max(40).optional().nullable(), + pmodelSz: z.string().max(20).optional().nullable(), + txt30: z.string().max(30).optional().nullable(), + estmPm: z.string().max(30).optional().nullable(), +}) + +export type UpdateBiddingProjectSchema = z.infer<typeof updateBiddingProjectSchema> |
