From cf3f7cf0efa2753a401b36f6eb3a49cb9697ddce Mon Sep 17 00:00:00 2001 From: dujinkim Date: Tue, 9 Dec 2025 06:09:09 +0000 Subject: (최겸) 구매 rfq, 기술영업 rfq drm 해제 시 결재 상신에 첨부파일 포함 로직 적용 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/rfq-last/approval-actions.ts | 26 +++++++- lib/rfq-last/service.ts | 2 +- .../editor/vendor-response-editor.tsx | 44 +++++++++++++- lib/techsales-rfq/approval-actions.ts | 71 +++++++++++++++++++++- 4 files changed, 137 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/rfq-last/approval-actions.ts b/lib/rfq-last/approval-actions.ts index be435931..2f9d0843 100644 --- a/lib/rfq-last/approval-actions.ts +++ b/lib/rfq-last/approval-actions.ts @@ -8,6 +8,7 @@ import { ApprovalSubmissionSaga } from '@/lib/approval'; import { mapRfqSendToTemplateVariables } from './approval-handlers'; +import { prepareEmailAttachments } from './service'; interface RfqSendApprovalData { // RFQ 기본 정보 @@ -95,7 +96,27 @@ export async function requestRfqSendWithApproval(data: RfqSendApprovalData) { applicationReason: data.applicationReason, }); - // 3. 결재 상신용 payload 구성 + // 3. Knox 상신용 첨부파일 준비 (실제 파일 객체로 변환) + const emailAttachments = await prepareEmailAttachments(data.rfqId, data.attachmentIds); + type PreparedAttachment = { + filename?: string | null; + content: BlobPart; + contentType?: string | null; + }; + const knoxAttachments = (emailAttachments as PreparedAttachment[]) + .filter((att): att is PreparedAttachment => Boolean(att && att.content)) + .map( + (att) => + new File([att.content], att.filename || 'attachment', { + type: att.contentType || 'application/octet-stream', + }) + ); + + if (knoxAttachments.length === 0) { + throw new Error('상신할 첨부파일을 준비하지 못했습니다.'); + } + + // 4. 결재 상신용 payload 구성 // ⚠️ cronjob 환경에서 실행되므로 currentUser 정보를 포함해야 함 const approvalPayload = { rfqId: data.rfqId, @@ -113,7 +134,7 @@ export async function requestRfqSendWithApproval(data: RfqSendApprovalData) { }, }; - // 4. Saga로 결재 상신 + // 5. Saga로 결재 상신 const saga = new ApprovalSubmissionSaga( 'rfq_send_with_attachments', // 핸들러 키 approvalPayload, // 결재 승인 후 실행될 데이터 @@ -128,6 +149,7 @@ export async function requestRfqSendWithApproval(data: RfqSendApprovalData) { epId: data.currentUser.epId, email: data.currentUser.email, }, + attachments: knoxAttachments, } ); diff --git a/lib/rfq-last/service.ts b/lib/rfq-last/service.ts index 68cfdac7..23f5f63a 100644 --- a/lib/rfq-last/service.ts +++ b/lib/rfq-last/service.ts @@ -3349,7 +3349,7 @@ async function getProjectInfo(projectId: number) { return project; } -async function prepareEmailAttachments(rfqId: number, attachmentIds: number[]) { +export async function prepareEmailAttachments(rfqId: number, attachmentIds: number[]) { const attachments = await db .select({ attachment: rfqLastAttachments, diff --git a/lib/rfq-last/vendor-response/editor/vendor-response-editor.tsx b/lib/rfq-last/vendor-response/editor/vendor-response-editor.tsx index 8c70b8dd..18fc5d50 100644 --- a/lib/rfq-last/vendor-response/editor/vendor-response-editor.tsx +++ b/lib/rfq-last/vendor-response/editor/vendor-response-editor.tsx @@ -9,6 +9,14 @@ import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/com import { Button } from "@/components/ui/button" import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs" import { Badge } from "@/components/ui/badge" +import { + Dialog, + DialogContent, + DialogDescription, + DialogFooter, + DialogHeader, + DialogTitle, +} from "@/components/ui/dialog" import { toast } from "sonner" import RfqInfoHeader from "./rfq-info-header" import CommercialTermsForm from "./commercial-terms-form" @@ -130,6 +138,7 @@ export default function VendorResponseEditor({ const [deletedAttachments, setDeletedAttachments] = useState([]) const [uploadProgress, setUploadProgress] = useState(0) // 추가 const [currencyDecimalPlaces, setCurrencyDecimalPlaces] = useState(2) // 통화별 소수점 자리수 + const [confirmOpen, setConfirmOpen] = useState(false) console.log(existingResponse,"existingResponse") @@ -682,7 +691,7 @@ export default function VendorResponseEditor({ + {/* 최종 제출 확인 다이얼로그 */} + + + + 최종 제출 + + 최종 제출하시겠습니까? + + + + + + + + + diff --git a/lib/techsales-rfq/approval-actions.ts b/lib/techsales-rfq/approval-actions.ts index cf914592..c85a950f 100644 --- a/lib/techsales-rfq/approval-actions.ts +++ b/lib/techsales-rfq/approval-actions.ts @@ -97,7 +97,13 @@ export async function requestTechSalesRfqSendWithApproval(data: TechSalesRfqSend applicationReason: data.applicationReason, }); - // 5. 결재 상신용 payload 구성 + // 5. Knox 상신용 첨부파일 준비 + const knoxAttachments = await prepareKnoxDrmAttachments(data.drmAttachmentIds); + if (knoxAttachments.length === 0) { + throw new Error('상신할 DRM 첨부파일을 준비하지 못했습니다.'); + } + + // 6. 결재 상신용 payload 구성 const approvalPayload = { rfqId: data.rfqId, rfqCode: data.rfqCode, @@ -112,7 +118,7 @@ export async function requestTechSalesRfqSendWithApproval(data: TechSalesRfqSend }, }; - // 6. Saga로 결재 상신 + // 7. Saga로 결재 상신 const saga = new ApprovalSubmissionSaga( 'tech_sales_rfq_send_with_drm', // 핸들러 키 approvalPayload, // 결재 승인 후 실행될 데이터 @@ -127,6 +133,7 @@ export async function requestTechSalesRfqSendWithApproval(data: TechSalesRfqSend epId: data.currentUser.epId, email: data.currentUser.email, }, + attachments: knoxAttachments, } ); @@ -171,6 +178,59 @@ function getTechSalesRevalidationPath(rfqType: "SHIP" | "TOP" | "HULL"): string return "/evcp/budgetary-tech-sales-ship"; } } + +/** + * Knox 상신용 DRM 첨부파일을 File 객체로 준비 + */ +async function prepareKnoxDrmAttachments(attachmentIds: number[]): Promise { + if (!attachmentIds || attachmentIds.length === 0) return []; + + const db = (await import('@/db/db')).default; + const { techSalesAttachments } = await import('@/db/schema/techSales'); + const { inArray } = await import('drizzle-orm'); + + const attachments = await db.query.techSalesAttachments.findMany({ + where: inArray(techSalesAttachments.id, attachmentIds), + columns: { + id: true, + filePath: true, + originalFileName: true, + fileName: true, + fileType: true, + }, + }); + + const baseUrl = process.env.NEXT_PUBLIC_BASE_URL || process.env.NEXT_PUBLIC_URL; + const files: File[] = []; + + for (const attachment of attachments) { + if (!attachment.filePath || !baseUrl) { + console.error('[TechSales RFQ Approval] 첨부파일 경로나 BASE_URL이 없습니다.', attachment.id); + continue; + } + + const fileUrl = `${baseUrl}${attachment.filePath}`; + const response = await fetch(fileUrl); + + if (!response.ok) { + console.error(`[TechSales RFQ Approval] 첨부파일 다운로드 실패: ${fileUrl} (status: ${response.status})`); + continue; + } + + const blob = await response.blob(); + const file = new File( + [blob], + attachment.originalFileName || attachment.fileName || 'attachment', + { + type: attachment.fileType || blob.type || 'application/octet-stream', + } + ); + + files.push(file); + } + + return files; +} /** * 기술영업 RFQ DRM 첨부 해제 결재 상신 * @@ -214,6 +274,12 @@ export async function requestRfqResendWithDrmApproval(data: { applicationReason: data.applicationReason, }); + // DRM 첨부파일을 Knox 상신용 File 객체로 준비 + const knoxAttachments = await prepareKnoxDrmAttachments(data.drmAttachmentIds); + if (knoxAttachments.length === 0) { + throw new Error('상신할 DRM 첨부파일을 준비하지 못했습니다.'); + } + // 결재 payload 구성 const approvalPayload = { rfqId: data.rfqId, @@ -244,6 +310,7 @@ export async function requestRfqResendWithDrmApproval(data: { epId: data.currentUser.epId, email: data.currentUser.email, }, + attachments: knoxAttachments, } ); -- cgit v1.2.3