diff --git a/src/entity/goods.ts b/src/entity/goods.ts index da3fb8e..16025fb 100644 --- a/src/entity/goods.ts +++ b/src/entity/goods.ts @@ -12,8 +12,6 @@ import { import { AssetCategory } from './asset_category'; import { Supplier } from './supplier'; -import { RequestOrder } from './request_orders'; - @Entity('goods') export class Goods { @PrimaryGeneratedColumn('uuid') @@ -85,14 +83,6 @@ export class Goods { @JoinColumn({ name: 'supplier_id' }) supplier: Supplier; - - @ManyToOne(() => RequestOrder, (requestOrder) => requestOrder.goods, { - nullable: true, - onDelete: 'CASCADE', - }) - @JoinColumn({ name: 'request_order_id' }) - request_order: RequestOrder; - @Column({ nullable: false, default: true, diff --git a/src/entity/request_orders.ts b/src/entity/request_orders.ts index e9c7644..e0c1ea4 100644 --- a/src/entity/request_orders.ts +++ b/src/entity/request_orders.ts @@ -5,10 +5,7 @@ import { CreateDateColumn, UpdateDateColumn, DeleteDateColumn, - ManyToOne, - JoinColumn, } from 'typeorm'; -import { Goods } from './goods'; enum ApprovalStatus { PENDING = 'PENDING', @@ -114,10 +111,9 @@ export class RequestOrder { }) gm_approval_status: ApprovalStatus; - // Relation with Goods - @ManyToOne(() => Goods, (goods) => goods.request_order) - @JoinColumn({ name: 'goods_id' }) - goods: Goods; + // Store multiple goods IDs + @Column('uuid', { array: true, nullable: true }) + goods_ids: string[]; @CreateDateColumn() created_at: Date;