diff --git a/src/entity/goods.ts b/src/entity/goods.ts index 67ebea6..9fd1498 100644 --- a/src/entity/goods.ts +++ b/src/entity/goods.ts @@ -14,7 +14,7 @@ import { Status } from '../types/status'; import { User } from './users'; import { Supplier } from './supplier'; import { AssetCategory } from './asset_category'; -import { GoodsReceipt } from './goods_receipt'; + @Entity('goods') export class Goods { @PrimaryGeneratedColumn('uuid') @@ -89,10 +89,6 @@ export class Goods { @JoinColumn({ name: 'supplier_id' }) supplier: Supplier; - @ManyToOne(() => GoodsReceipt, (goodsReceipt) => goodsReceipt.goods, { nullable: true }) - @JoinColumn({ name: 'goods_receipt_id' }) - goodsReceipt: GoodsReceipt; - @Column({ nullable: false, type: 'uuid', diff --git a/src/entity/goods_receipt.ts b/src/entity/goods_receipt.ts index c0ce377..f8ebe31 100644 --- a/src/entity/goods_receipt.ts +++ b/src/entity/goods_receipt.ts @@ -15,7 +15,6 @@ import { User } from './users'; import { Supplier } from './supplier'; import { RequestOrder } from './request_orders'; import { Department } from './department'; -import { Goods } from './goods'; @Entity('goods_receipts') export class GoodsReceipt { @@ -64,9 +63,6 @@ export class GoodsReceipt { }) department_id: string; - @OneToMany(() => Goods, (goods) => goods.goodsReceipt, { cascade: true }) - goods: Goods[]; - @Column({ nullable: true, type: 'text',