fix(FE-86): resolve merge conflict

src/types/api/inventory/adjustment.d.ts

@@ -1,4 +1,5 @@
 import { Product } from '@/types/api/master-data/product';
+import { BaseMetadata } from '../base-metadata';
 import { Warehouse } from '@/types/api/master-data/warehouse';
 
 export type BaseInventoryAdjustment = {
@@ -28,3 +29,6 @@ export type CreateInventoryAdjustmentPayload = {
   quantity: number;
   note: string;
 };
+
+export type UpdateInventoryAdjustmentPayload =
+  Partial<CreateInventoryAdjustmentPayload>;

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

@@ -1,14 +1,14 @@
-import { BaseMetadata } from "@/types/api/api-general";
+import { BaseMetadata } from '@/types/api/api-general';
 
 export type BaseFlock = {
   id: number;
   name: string;
-}
+};
 
 export type Flock = BaseMetadata & BaseFlock;
 
 export type CreateFlockPayload = {
   name: string;
-}
+};
 
-export type UpdateFlockPayload = CreateFlockPayload;
+export type UpdateFlockPayload = CreateFlockPayload;

src/types/api/production/recording.d.ts

@@ -0,0 +1,61 @@
+import { BaseMetadata } from '@/types/api/api-general';
+import { Location } from '@/types/api/master-data/location';
+import { Kandang } from '@/types/api/master-data/kandang';
+import { Flock } from '@/types/api/master-data/flock';
+
+export type BaseRecording = {
+  id: number;
+  flock: Flock;
+  recording_date: string;
+  location: Location;
+  coop: Kandang;
+  feed_data: {
+    feed_name: string;
+    feed_qty: number;
+    feed_stock: number;
+  }[];
+  body_weight: {
+    chicken_weight: number;
+    chicken_count: number;
+    average_chicken_weight: number;
+  }[];
+  vaccination: {
+    vaccine_name: string;
+    total_stock: number;
+    used_stock: number;
+  }[];
+  mortality: {
+    condition: string;
+    count: number;
+  }[];
+};
+
+export type Recording = BaseMetadata & BaseRecording;
+
+export type CreateRecordingPayload = {
+  flock_id: number;
+  recording_date: string;
+  location_id: number;
+  coop_id: number;
+  feed_data: {
+    feed_id: string;
+    feed_qty: number;
+    feed_stock: number;
+  }[];
+  body_weight: {
+    chicken_weight: number;
+    chicken_count: number;
+    average_chicken_weight: number;
+  }[];
+  vaccination: {
+    vaccine_id: string;
+    total_stock: number;
+    used_stock: number;
+  }[];
+  mortality: {
+    condition: string;
+    count: number;
+  }[];
+};
+
+export type UpdateRecordingPayload = CreateRecordingPayload;