(대표님) 20250613 16시 10분 global css, b-rfq, document 등

1 files changed, 9 insertions, 3 deletions

diff --git a/db/schema/vendorDocu.ts b/db/schema/vendorDocu.ts
index af48d74b..3b56022e 100644
--- a/db/schema/vendorDocu.ts
+++ b/db/schema/vendorDocu.ts
@@ -143,6 +143,7 @@ export const revisions = pgTable(
     uploaderName: varchar("uploader_name", { length: 100 }),
 
     usage:varchar("usage", { length: 100 }),
+    usageType:varchar("usage_type", { length: 255 }),
     
     // 확장된 상태 관리
     revisionStatus: varchar("revision_status", { length: 50 })
@@ -168,10 +169,13 @@ export const revisions = pgTable(
   },
   (table) => {
     return {
-      uniqueStageRev: uniqueIndex("unique_stage_rev").on(
+      uniqueStageRevisionUsage: uniqueIndex("unique_stage_revision_usage").on(
         table.issueStageId,
-        table.revision
+        table.revision,
+        table.usage,
+        sql`COALESCE(${table.usageType}, '')`
       ),
+      
     }
   }
 )
@@ -817,6 +821,7 @@ export const simplifiedDocumentsView = pgView("simplified_documents_view", {
       uploaderName: string | null;
       comment: string | null;
       usage: string | null;
+      usageType: string | null;
       revisionStatus: string;
       submittedDate: string | null;
       approvedDate: string | null;
@@ -885,6 +890,7 @@ export const simplifiedDocumentsView = pgView("simplified_documents_view", {
             'uploaderName', r.uploader_name,
             'comment', r.comment,
             'usage', r.usage,
+            'usageType', r.usage_type,
             'revisionStatus', r.revision_status,
             'submittedDate', r.submitted_date,
             'uploadedAt', r.uploaded_at,
@@ -1017,7 +1023,7 @@ export const simplifiedDocumentsView = pgView("simplified_documents_view", {
   FROM documents d
   -- contracts, projects, vendors 테이블 JOIN
   LEFT JOIN contracts c ON d.contract_id = c.id
-  LEFT JOIN projects p ON c.project_id = p.id
+  INNER JOIN projects  p ON c.project_id = p.id AND p.type = 'ship'
   LEFT JOIN vendors v ON c.vendor_id = v.id
   
   -- 스테이지 정보 JOIN