diff --git a/src/entity/request_submission.ts b/src/entity/request_submission.ts index eacefe9..6eadb1e 100644 --- a/src/entity/request_submission.ts +++ b/src/entity/request_submission.ts @@ -5,13 +5,8 @@ import { CreateDateColumn, UpdateDateColumn, DeleteDateColumn, - Index, - ManyToOne, - JoinColumn, } from 'typeorm'; -import { RequestOrder } from './request_orders'; - enum ApprovalStatus { PENDING = 'PENDING', APPROVED = 'APPROVED', @@ -23,15 +18,12 @@ export class RequestSubmission { @PrimaryGeneratedColumn('uuid') id: string; - @ManyToOne(() => RequestOrder, (order) => order.id, { nullable: true }) - @JoinColumn({ name: 'request_order_id' }) - requestOrder: RequestOrder; - @Column({ - nullable: false, type: 'uuid', + array: true, + nullable: false, }) - request_order_id: string; + request_order_id: string[]; @Column({ nullable: false, @@ -52,6 +44,12 @@ export class RequestSubmission { }) remarks: string; + @Column({ + nullable: true, + type: 'varchar', + }) + department: string; + @Column({ nullable: false, length: 64, @@ -90,15 +88,37 @@ export class RequestSubmission { }) updated_by: string; - @Column() + @Column({ + type: 'int', + nullable: false, + default: 0, + }) + quantity: number; + + @Column({ + type: 'decimal', + precision: 12, + scale: 2, + nullable: false, + default: 0.0, + }) + amount: number; + + @Column({ + type: 'decimal', + precision: 12, + scale: 2, + nullable: false, + default: 0.0, + }) + total: number; + @CreateDateColumn() created_at: Date; - @Column({ nullable: true }) @UpdateDateColumn() updated_at: Date; - @Column({ nullable: true }) @DeleteDateColumn() deleted_at: Date; }