From b3536dab0ff3710c90eaccc060e3da6746ea0571 Mon Sep 17 00:00:00 2001 From: fro1991 Date: Thu, 6 Mar 2025 22:04:35 +0700 Subject: [PATCH] update --- src/entity/asset_purchase.ts | 9 +++++++++ src/entity/asset_request_order.ts | 14 ++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/src/entity/asset_purchase.ts b/src/entity/asset_purchase.ts index c4f9b58..4027b7b 100644 --- a/src/entity/asset_purchase.ts +++ b/src/entity/asset_purchase.ts @@ -33,6 +33,15 @@ export class AssetPurchase { }) quantity: number; + @Column({ type: 'float8', nullable: true }) + sub_total: number; + + @Column({ type: 'int2', nullable: true }) + tax_percent: number; + + @Column({ type: 'float8', nullable: true }) + tax_amount: number; + @Column({ type: 'float8', nullable: false, diff --git a/src/entity/asset_request_order.ts b/src/entity/asset_request_order.ts index 0e2fffd..59dfb9e 100644 --- a/src/entity/asset_request_order.ts +++ b/src/entity/asset_request_order.ts @@ -10,6 +10,7 @@ import { JoinTable } from 'typeorm'; import { AssetRequestOrderCategory } from './asset_request_order_category'; +import { AssetSupplier } from './asset_supplier'; @Entity('asset_request_orders') export class AssetRequestOrder { @@ -26,6 +27,10 @@ export class AssetRequestOrder { @Column({ type: 'varchar', length: 255 }) department_name: string; + @ManyToOne(() => AssetSupplier, { onDelete: 'NO ACTION', nullable: true }) + @JoinTable() + supplier: AssetSupplier; + @Column({ type: 'varchar', length: 50, unique: true }) code: string; @@ -44,6 +49,15 @@ export class AssetRequestOrder { @Column({ type: 'int2' }) quantity: number; + @Column({ type: 'float8', nullable: true }) + sub_total: number; + + @Column({ type: 'int2', nullable: true }) + tax_percent: number; + + @Column({ type: 'float8', nullable: true }) + tax_amount: number; + @Column({ type: 'float8' }) total: number;