mirror of
https://gitlab.com/mbugroup/lti-web-client.git
synced 2026-05-22 14:25:47 +00:00
Merge branch 'development' into feat/FE/US-164/TASK-200-204-205-206-207-expense-realization
This commit is contained in:
+1
-1
@@ -1,6 +1,6 @@
|
||||
import { Product } from '@/types/api/master-data/product';
|
||||
import { BaseMetadata } from '../base-metadata';
|
||||
import { Warehouse } from '@/types/api/master-data/warehouse';
|
||||
import { BaseMetadata } from '@/types/api/api-general';
|
||||
|
||||
export type BaseInventoryAdjustment = {
|
||||
id: number;
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ import {
|
||||
import { ProductWarehouse } from '@/types/api/inventory/product-warehouse';
|
||||
import { Kandang } from '@/types/api/master-data/kandang';
|
||||
import { id } from 'react-day-picker/locale';
|
||||
import { Warehouse } from '../master-data/warehouse';
|
||||
import { Warehouse } from '@/types/api/master-data/warehouse';
|
||||
|
||||
/**
|
||||
* Base Data Response
|
||||
|
||||
+12
@@ -1,4 +1,5 @@
|
||||
import { BaseMetadata } from '@/types/api/api-general';
|
||||
import { Uom } from '@/types/api/master-data/uom';
|
||||
|
||||
export type BaseSupplier = {
|
||||
id: number;
|
||||
@@ -19,6 +20,17 @@ export type BaseSupplier = {
|
||||
|
||||
export type Supplier = BaseMetadata & BaseSupplier;
|
||||
|
||||
export type SupplierProducts = Supplier & {
|
||||
products?: Array<{
|
||||
id: number;
|
||||
name: string;
|
||||
ProductPrice: number;
|
||||
SellingPrice?: number;
|
||||
uom: Uom;
|
||||
flags: string[];
|
||||
}>;
|
||||
};
|
||||
|
||||
export type CreateSupplierPayload = {
|
||||
name: string;
|
||||
alias: string;
|
||||
|
||||
+2
-2
@@ -1,8 +1,8 @@
|
||||
import { Kandang } from '@/type/master-data/kandang';
|
||||
import { ProjectFlock } from '@/types/api/production/project-flock';
|
||||
import { ProductWarehouse } from '@/types/api/inventory/product-warehouse';
|
||||
import { Supplier } from '../master-data/supplier';
|
||||
import { BaseApproval } from '../api-general';
|
||||
import { Supplier } from '@/types/api/master-data/supplier';
|
||||
import { BaseApproval } from '@/types/api/api-general';
|
||||
|
||||
export type BaseProjectFlockKandang = {
|
||||
id: number;
|
||||
|
||||
Vendored
+128
@@ -0,0 +1,128 @@
|
||||
import { BaseApproval, BaseMetadata } from '@/types/api/api-general';
|
||||
import { Supplier } from '@/types/api/master-data/supplier';
|
||||
import { Warehouse } from '@/types/api/master-data/warehouse';
|
||||
import { Product } from '@/types/api/master-data/product';
|
||||
import { ProductWarehouse } from '@/types/api/inventory/product-warehouse';
|
||||
import { Area } from '@/types/api/master-data/area';
|
||||
import { Location } from '@/types/api/master-data/location';
|
||||
|
||||
export type PurchaseItemProduct = {
|
||||
id: number;
|
||||
name: string;
|
||||
flags?: string[];
|
||||
uom?: {
|
||||
name: string;
|
||||
};
|
||||
product_category?:
|
||||
| {
|
||||
name: string;
|
||||
}
|
||||
| string;
|
||||
};
|
||||
|
||||
export type PurchaseItem = {
|
||||
id: number;
|
||||
product_id: number;
|
||||
warehouse: Warehouse;
|
||||
product: PurchaseItemProduct | Product;
|
||||
product_warehouse: ProductWarehouse;
|
||||
quantity: number;
|
||||
qty: number;
|
||||
sub_qty: number;
|
||||
total_qty: number;
|
||||
total_used: number;
|
||||
price: number;
|
||||
total_price: number;
|
||||
received_date?: string | null;
|
||||
travel_number?: string | null;
|
||||
travel_number_docs?: string | null;
|
||||
travel_document_path?: string | null;
|
||||
vehicle_number?: string | null;
|
||||
expedition_vendor_id?: number | null;
|
||||
expedition_vendor_name?: string | null;
|
||||
received_qty?: number | null;
|
||||
transport_per_item?: number | null;
|
||||
transport_total?: number | null;
|
||||
};
|
||||
|
||||
export type BasePurchase = {
|
||||
id: number;
|
||||
pr_number: string;
|
||||
po_number: string;
|
||||
po_document_path?: string | null;
|
||||
po_date: string;
|
||||
supplier: Supplier;
|
||||
credit_term: number;
|
||||
due_date: string;
|
||||
grand_total: number;
|
||||
notes?: string | null;
|
||||
deleted_at?: string | null;
|
||||
created_by: number;
|
||||
area?: Area;
|
||||
location?: Location;
|
||||
warehouse?: Warehouse;
|
||||
items?: PurchaseItem[];
|
||||
approval?: BaseApproval;
|
||||
};
|
||||
|
||||
export type Purchase = BaseMetadata & BasePurchase;
|
||||
|
||||
export type CreatePurchaseRequestPayload = {
|
||||
supplier_id: number;
|
||||
credit_term: number;
|
||||
notes?: string | null;
|
||||
items: {
|
||||
warehouse_id: number;
|
||||
product_id: number;
|
||||
qty: number;
|
||||
}[];
|
||||
};
|
||||
|
||||
export type CreateStaffApprovalRequestPayload = {
|
||||
action: 'APPROVED' | 'REJECTED';
|
||||
notes?: string | null;
|
||||
items: {
|
||||
purchase_item_id: number;
|
||||
qty: number;
|
||||
price: number;
|
||||
total_price: number;
|
||||
}[];
|
||||
};
|
||||
|
||||
export type UpdateStaffApprovalRequestPayload = {
|
||||
action: 'APPROVED' | 'REJECTED';
|
||||
notes?: string | null;
|
||||
items: Array<{
|
||||
purchase_item_id?: number;
|
||||
product_id?: number;
|
||||
warehouse_id?: number;
|
||||
qty: number;
|
||||
price: number;
|
||||
total_price: number;
|
||||
}>;
|
||||
};
|
||||
|
||||
export type CreateManagerApprovalRequestPayload = {
|
||||
notes?: string | null;
|
||||
};
|
||||
|
||||
export type CreateAcceptApprovalRequestPayload = {
|
||||
notes?: string;
|
||||
items: {
|
||||
purchase_item_id: number;
|
||||
received_date: string;
|
||||
travel_number: string;
|
||||
travel_document_path: string;
|
||||
vehicle_number: string;
|
||||
expedition_vendor_id: number;
|
||||
received_qty: number;
|
||||
transport_per_item: number;
|
||||
transport_total: number;
|
||||
}[];
|
||||
};
|
||||
|
||||
export type DeletePurchaseRequestItemPayload = {
|
||||
item_ids: number[];
|
||||
};
|
||||
|
||||
export type UpdatePurchaseRequestPayload = CreatePurchaseRequestPayload;
|
||||
Reference in New Issue
Block a user