diff --git a/src/entity/pharmacy-logistic/order_item_detail.ts b/src/entity/pharmacy-logistic/order_item_detail.ts index 1dfe214..91ffe21 100644 --- a/src/entity/pharmacy-logistic/order_item_detail.ts +++ b/src/entity/pharmacy-logistic/order_item_detail.ts @@ -1,12 +1,16 @@ -import { Entity, PrimaryGeneratedColumn, Column, CreateDateColumn, UpdateDateColumn, DeleteDateColumn, Index, ManyToOne, JoinColumn } from 'typeorm'; +import { OneToMany,Entity, PrimaryGeneratedColumn, Column, CreateDateColumn, UpdateDateColumn, DeleteDateColumn, Index, ManyToOne, JoinColumn } from 'typeorm'; import { OrderItem } from './order_item'; import { ItemMaster } from '../pharmacy/item_master'; +import { ReceiveOrderDetail } from './receive_order_detail'; -@Entity({ schema: 'pharmacy_logistic', name: 'order_item_detail' }) +@Entity({ schema: 'pharmacy_logistic', name: 'order_item_detail' }) export class OrderItemDetail { @PrimaryGeneratedColumn('uuid') id: string; + @OneToMany(() => ReceiveOrderDetail, (detail) => detail.orderitemdetail) + orderitemdetail: ReceiveOrderDetail[]; + @Column({ nullable: false, type: 'int' @@ -20,7 +24,7 @@ export class OrderItemDetail { @ManyToOne(() => OrderItem, { onDelete: "NO ACTION" }) @JoinColumn() orderitem: OrderItem; - + @Column() @CreateDateColumn() created_at: Date; diff --git a/src/entity/pharmacy-logistic/receive_order.ts b/src/entity/pharmacy-logistic/receive_order.ts index 49590b4..fb89412 100644 --- a/src/entity/pharmacy-logistic/receive_order.ts +++ b/src/entity/pharmacy-logistic/receive_order.ts @@ -1,13 +1,16 @@ -import { Entity, PrimaryGeneratedColumn, Column, CreateDateColumn, UpdateDateColumn, DeleteDateColumn, Index, ManyToOne, JoinColumn } from 'typeorm'; +import { OneToMany,Entity, PrimaryGeneratedColumn, Column, CreateDateColumn, UpdateDateColumn, DeleteDateColumn, Index, ManyToOne, JoinColumn } from 'typeorm'; import { Supplier } from '../pharmacy/supplier'; -import { ItemOrigin } from '../pharmacy/item_origin'; import { OrderItem } from './order_item'; +import { ReceiveOrderDetail } from './receive_order_detail'; @Entity({ schema: 'pharmacy_logistic', name: 'receive_order' }) export class ReceiveOrder { @PrimaryGeneratedColumn('uuid') id: string; + @OneToMany(() => ReceiveOrderDetail, (detail) => detail.receiveorder) + receiveorderdetail: ReceiveOrderDetail[]; + @Column({ nullable: true, length: 128