From 675b4e3d8ffcb57a041db285417d81e61284d900 Mon Sep 17 00:00:00 2001 From: dujinkim Date: Sun, 14 Sep 2025 05:28:01 +0000 Subject: (대표님) RFQ-last, tbe-last, 기본계약 템플릿 내 견적,입찰,계약 추가, env.dev NAS_PATH 수정 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/schema/basicContractDocumnet.ts | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'db/schema/basicContractDocumnet.ts') diff --git a/db/schema/basicContractDocumnet.ts b/db/schema/basicContractDocumnet.ts index 3a0b84a9..7fc975a0 100644 --- a/db/schema/basicContractDocumnet.ts +++ b/db/schema/basicContractDocumnet.ts @@ -2,6 +2,10 @@ import { pgTable, pgView, text, timestamp, integer, varchar, boolean , unique, d import { vendors } from './vendors'; import { eq, sql } from "drizzle-orm"; import { users } from './users'; +import { biddingCompanies } from './bidding'; +import { rfqLastVendorResponses } from './rfqVendor'; +import { rfqLastDetails } from './rfqLast'; +import { generalContracts } from './generalContract'; export const basicContractTemplates = pgTable('basic_contract_templates', { id: integer("id").primaryKey().generatedAlwaysAsIdentity(), @@ -33,6 +37,10 @@ export const basicContract = pgTable('basic_contract', { id: integer("id").primaryKey().generatedAlwaysAsIdentity(), templateId: integer('template_id').references(() => basicContractTemplates.id), vendorId: integer('vendor_id').references(() => vendors.id), + //biddingCompanies fk 추가, nullable + biddingCompanyId: integer('bidding_company_id').references(() => biddingCompanies.id), + rfqCompanyId: integer('rfq_company_id').references(() => rfqLastDetails.id), + generalContractId: integer('general_contract_id').references(() => generalContracts.id), requestedBy: integer('requested_by').references(() => users.id), // 상태값을 더 세분화 @@ -70,6 +78,12 @@ export const basicContractView = pgView('basic_contract_view').as((qb) => { vendorId: sql`${basicContract.vendorId}`.as('vendor_id'), requestedBy: sql`${basicContract.requestedBy}`.as('requested_by'), status: sql`${basicContract.status}`.as('basic_contract_status'), + + //견적,입찰, 계약 + rfqCompanyId: sql`${basicContract.rfqCompanyId}`.as('rfq_company_id'), + biddingCompanyId: sql`${basicContract.biddingCompanyId}`.as('bidding_company_id'), + generalContractId: sql`${basicContract.generalContractId}`.as('general_contract_id'), + // 새로 추가된 필드들 deadline: sql`${basicContract.deadline}`.as('deadline'), -- cgit v1.2.3