diff options
Diffstat (limited to 'db/schema/procurementRFQ.ts')
| -rw-r--r-- | db/schema/procurementRFQ.ts | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/db/schema/procurementRFQ.ts b/db/schema/procurementRFQ.ts index 598bcd95..a69e8fba 100644 --- a/db/schema/procurementRFQ.ts +++ b/db/schema/procurementRFQ.ts @@ -2,7 +2,6 @@ import { foreignKey, pgTable, pgView, serial, varchar, text, timestamp, boolean, import { eq, sql, and, or, relations } from "drizzle-orm"; import { projects } from "./projects"; import { users } from "./users"; -import { items } from "./items"; import { vendors } from "./vendors"; export const procurementRfqs = pgTable( @@ -19,9 +18,12 @@ export const procurementRfqs = pgTable( series: varchar("series", { length: 50 }), - itemId: integer("item_id") - .notNull() - .references(() => items.id, { onDelete: "cascade" }), + // itemId: integer("item_id") + // .notNull() + // .references(() => items.id, { onDelete: "cascade" }), + + itemCode: varchar("item_code", { length: 100 }), + itemName: varchar("item_name", { length: 255 }), dueDate: date("due_date", { mode: "date" }) .$type<Date>() @@ -126,8 +128,8 @@ export const prItems = pgTable( prItem: varchar("pr_item", { length: 50 }), // 단위 prNo: varchar("pr_no", { length: 50 }), // 단위 - itemId: integer("item_id") - .references(() => items.id, { onDelete: "set null" }), + // itemId: integer("item_id") + // .references(() => items.id, { onDelete: "set null" }), materialCode: varchar("material_code", { length: 255 }), materialCategory: varchar("material_category", { length: 255 }), @@ -182,8 +184,8 @@ export const procurementRfqsView = pgView("procurement_rfqs_view").as((qb) => { projectName: sql<string | null>`${projects.name}`.as("project_name"), // Item information - itemCode: sql<string | null>`${items.itemCode}`.as("item_code"), - itemName: sql<string | null>`${items.itemName}`.as("item_name"), + itemCode: sql<string | null>`${procurementRfqs.itemCode}`.as("item_code"), + itemName: sql<string | null>`${procurementRfqs.itemName}`.as("item_name"), // Status and dates status: sql<string>`${procurementRfqs.status}`.as("status"), @@ -231,7 +233,7 @@ export const procurementRfqsView = pgView("procurement_rfqs_view").as((qb) => { }) .from(procurementRfqs) .leftJoin(projects, eq(procurementRfqs.projectId, projects.id)) - .leftJoin(items, eq(procurementRfqs.itemId, items.id)) + // .leftJoin(items, eq(procurementRfqs.itemId, items.id)) .leftJoin(createdByUser, eq(procurementRfqs.createdBy, createdByUser.id)) .leftJoin(updatedByUser, eq(procurementRfqs.updatedBy, updatedByUser.id)) .leftJoin(sentByUser, eq(procurementRfqs.sentBy, sentByUser.id)); @@ -246,7 +248,7 @@ export const prItemsView = pgView("pr_items_view").as((qb) => { rfqItem: prItems.rfqItem, prItem: prItems.prItem, prNo: prItems.prNo, - itemId: prItems.itemId, + // itemId: prItems.itemId, materialCode: prItems.materialCode, materialCategory: prItems.materialCategory, acc: prItems.acc, @@ -268,12 +270,11 @@ export const prItemsView = pgView("pr_items_view").as((qb) => { projectDl: prItems.projectDl, remark: prItems.remark, rfqCode: procurementRfqs.rfqCode, - itemCode: items.itemCode, - itemName: items.itemName + itemCode: procurementRfqs.itemCode, + itemName: procurementRfqs.itemName }) .from(prItems) .leftJoin(procurementRfqs, eq(prItems.procurementRfqsId, procurementRfqs.id)) - .leftJoin(items, eq(prItems.itemId, items.id)); }); export const procurementRfqDetailsView = pgView("procurement_rfq_details_view").as((qb) => { @@ -281,7 +282,6 @@ export const procurementRfqDetailsView = pgView("procurement_rfq_details_view"). const rfqDetailsTable = alias(procurementRfqDetails, "rfq_details"); const rfqsTable = alias(procurementRfqs, "rfqs"); const projectsTable = alias(projects, "projects"); - const itemsTable = alias(items, "items"); const vendorsTable = alias(vendors, "vendors"); const paymentTermsTable = alias(paymentTerms, "payment_terms"); const incotermsTable = alias(incoterms, "incoterms"); @@ -299,8 +299,8 @@ export const procurementRfqDetailsView = pgView("procurement_rfq_details_view"). projectName: sql<string | null>`${projectsTable.name}`.as("project_name"), // 아이템 관련 필드 - itemCode: sql<string | null>`${itemsTable.itemCode}`.as("item_code"), - itemName: sql<string | null>`${itemsTable.itemName}`.as("item_name"), + itemCode: sql<string | null>`${rfqsTable.itemCode}`.as("item_code"), + itemName: sql<string | null>`${rfqsTable.itemName}`.as("item_name"), // 벤더 관련 필드 vendorName: sql<string | null>`${vendorsTable.vendorName}`.as("vendor_name"), @@ -420,7 +420,7 @@ export const procurementRfqDetailsView = pgView("procurement_rfq_details_view"). // 기존 조인 유지 .leftJoin(rfqsTable, eq(rfqDetailsTable.procurementRfqsId, rfqsTable.id)) .leftJoin(projectsTable, eq(rfqsTable.projectId, projectsTable.id)) - .leftJoin(itemsTable, eq(rfqsTable.itemId, itemsTable.id)) + // .leftJoin(itemsTable, eq(rfqsTable.itemId, itemsTable.id)) .leftJoin(vendorsTable, eq(rfqDetailsTable.vendorsId, vendorsTable.id)) .leftJoin(paymentTermsTable, eq(rfqDetailsTable.paymentTermsCode, paymentTermsTable.code)) .leftJoin(incotermsTable, eq(rfqDetailsTable.incotermsCode, incotermsTable.code)) @@ -669,10 +669,10 @@ export const procurementRfqsRelations = relations( fields: [procurementRfqs.projectId], references: [projects.id], }), - item: one(items, { - fields: [procurementRfqs.itemId], - references: [items.id], - }), + // item: one(items, { + // fields: [procurementRfqs.itemId], + // references: [items.id], + // }), createdByUser: one(users, { fields: [procurementRfqs.createdBy], references: [users.id], @@ -760,7 +760,7 @@ export const procurementVendorQuotationsRelations = relations( relationName: "quotationVendor" // 명시적 관계명 추가 }), // Add this missing relation - items: many(procurementQuotationItems), + // items: many(procurementQuotationItems), // These are optional but good to have paymentTerms: one(paymentTerms, { fields: [procurementVendorQuotations.paymentTermsCode], |