fix finance memo

This commit is contained in:
fadlydev
2025-01-13 11:10:28 +07:00
parent 203b1f0e57
commit 2d95a5e0d9
3 changed files with 51 additions and 35 deletions

View File

@ -0,0 +1,46 @@
import {
Entity,
PrimaryGeneratedColumn,
Column,
CreateDateColumn,
UpdateDateColumn,
ManyToOne,
OneToMany,
JoinColumn,
} from 'typeorm';
import { User } from './users';
import { PaymentApproval } from './payment_approval';
@Entity('finance_memos')
export class FinanceMemo {
@PrimaryGeneratedColumn('uuid')
id: string;
@Column({
nullable: false,
type: 'text',
})
memo_content: string;
@OneToMany(() => PaymentApproval, (paymentApproval) => paymentApproval.financeMemo)
paymentApprovals: PaymentApproval[];
@ManyToOne(() => User, (user) => user.id, { nullable: false })
@JoinColumn({ name: 'created_by' })
createdBy: User;
@Column({
nullable: false,
type: 'uuid',
})
created_by: string;
@Column()
@CreateDateColumn()
created_at: Date;
@Column({ nullable: true })
@UpdateDateColumn()
updated_at: Date;
}

View File

@ -12,6 +12,7 @@ import {
import { User } from './users'; import { User } from './users';
import { RequestOrder } from './request_orders'; import { RequestOrder } from './request_orders';
import { AssetJournalEntry } from './journal_entries'; import { AssetJournalEntry } from './journal_entries';
import { FinanceMemo } from './finance_memo';
export enum ApprovalStatus { export enum ApprovalStatus {
PENDING = 'PENDING', PENDING = 'PENDING',
@ -63,7 +64,7 @@ export class PaymentApproval {
@OneToMany(() => AssetJournalEntry, (journalEntry) => journalEntry.paymentApproval) @OneToMany(() => AssetJournalEntry, (journalEntry) => journalEntry.paymentApproval)
journalEntries: AssetJournalEntry[]; journalEntries: AssetJournalEntry[];
@ManyToOne(() => FinanceMemo, (financeMemo) => financeMemo.paymentApprovals) @ManyToOne(() => FinanceMemo, (finance) => finance.paymentApprovals)
@JoinColumn({ name: 'finance_memo_id' }) @JoinColumn({ name: 'finance_memo_id' })
financeMemo: FinanceMemo; financeMemo: FinanceMemo;
@ -80,37 +81,4 @@ export class PaymentApproval {
@Column({ nullable: true }) @Column({ nullable: true })
@UpdateDateColumn() @UpdateDateColumn()
updated_at: Date; updated_at: Date;
} }
@Entity('finance_memos')
export class FinanceMemo {
@PrimaryGeneratedColumn('uuid')
id: string;
@Column({
nullable: false,
type: 'text',
})
memo_content: string;
@OneToMany(() => PaymentApproval, (paymentApproval) => paymentApproval.financeMemo)
paymentApprovals: PaymentApproval[];
@ManyToOne(() => User, (user) => user.id, { nullable: false })
@JoinColumn({ name: 'created_by' })
createdBy: User;
@Column({
nullable: false,
type: 'uuid',
})
created_by: string;
@Column()
@CreateDateColumn()
created_at: Date;
@Column({ nullable: true })
@UpdateDateColumn()
updated_at: Date;
}

View File

@ -63,6 +63,7 @@ import {Asset} from './entity/assets'
import { GoodsHandover } from "./entity/goods_handover"; import { GoodsHandover } from "./entity/goods_handover";
import { AssetJournalEntry } from "./entity/journal_entries"; import { AssetJournalEntry } from "./entity/journal_entries";
import { PaymentApproval } from "./entity/payment_approval"; import { PaymentApproval } from "./entity/payment_approval";
import { FinanceMemo } from "./entity/finance_memo";
export { export {
User, // User, //
@ -119,6 +120,7 @@ export {
GoodsHandover, GoodsHandover,
AssetJournalEntry, AssetJournalEntry,
PaymentApproval, PaymentApproval,
FinanceMemo,
Department, Department,
GoodsReceipt, GoodsReceipt,
RequestSubmission, RequestSubmission,