chore: resolve conflict pull request

src/types/api/api-general.d.ts

@@ -53,3 +53,16 @@ export type BaseMetadata = {
 
 export type Override<BaseType, Overrides> = Omit<BaseType, keyof Overrides> &
   Overrides;
+
+export type flags =
+  | 'PAKAN'
+  | 'OBAT'
+  | 'VITAMIN'
+  | 'KIMIA'
+  | 'EKSPEDISI'
+  | 'IS_ACTIVE'
+  | 'DOC'
+  | 'PRE-STARTER'
+  | 'STARTER'
+  | 'FINISHER'
+  | 'OVK';

src/types/api/master-data/bank.d.ts

@@ -0,0 +1,20 @@
+import { BaseMetadata } from '@/types/api/api-general';
+
+export type BaseBank = {
+  id: number;
+  name: string;
+  alias: string;
+  owner?: string;
+  account_number: string;
+};
+
+export type Bank = BaseMetadata & BaseBank;
+
+export type CreateBankPayload = {
+  name: string;
+  alias: string;
+  account_number: string;
+  owner?: string;
+};
+
+export type UpdateBankPayload = CreateBankPayload;

src/types/api/master-data/fcr.d.ts

@@ -0,0 +1,30 @@
+import { BaseMetadata } from '@/types/api/api-general';
+
+export type BaseFcr = {
+  id: number;
+  name: string;
+};
+
+export type FcrStandard = {
+  id: number;
+  weight: number;
+  fcr_number: number;
+  mortality: number;
+};
+
+export type Fcr = BaseMetadata & BaseFcr;
+
+export type FcrWithStandards = Fcr & {
+  fcr_standards: FcrStandard[];
+};
+
+export type CreateFcrPayload = {
+  name: string;
+  fcr_standards: {
+    weight: number;
+    fcr_number: number;
+    mortality: number;
+  }[];
+};
+
+export type UpdateFcrPayload = CreateFcrPayload;

src/types/api/master-data/nonstock.d.ts

@@ -1,18 +1,23 @@
-import { BaseApiResponse } from '@/types/api/api-general';
+import { BaseApiResponse, BaseMetadata, flags } from '@/types/api/api-general';
+import { BaseUom } from '@/types/api/master-data/uom';
+import { BaseSupplier } from '@/types/api/master-data/supplier';
 
-export type Nonstock = {
+export type BaseNonstock = {
   id: number;
   name: string;
+  uom_id: number;
+  uom: BaseUom;
+  suppliers: BaseSupplier[];
+  flags: flags[];
 };
 
+export type Nonstock = BaseMetadata & BaseNonstock;
+
 export type CreateNonstockPayload = {
   name: string;
+  uom_id: number;
+  supplier_ids: number[];
+  flags: flags[];
 };
 
 export type UpdateNonstockPayload = CreateNonstockPayload;
-
-export type NonstockResponse = BaseApiResponse<Nonstock>;
-
-export type NonstocksResponse = BaseApiResponse<Nonstock[]>;
-
-export type DeleteNonstockResponse = BaseApiResponse;