fix(resolve): fix resolve conflict

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

@@ -1,6 +1,6 @@
 import { Product } from '@/types/api/master-data/product';
-import { Warehouse } from '../master-data/warehouse';
 import { BaseMetadata } from '../base-metadata';
+import { Warehouse } from '@/types/api/master-data/warehouse';
 
 export type BaseInventoryAdjustment = {
   id: number;

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

@@ -5,6 +5,7 @@ import { BaseUser } from '@/types/api/user';
 export type BaseKandang = {
   id: number;
   name: string;
+  status: string;
   location: BaseLocation;
   pic: BaseUser;
 };

src/types/api/production/project-flock.d.ts

@@ -1,20 +1,19 @@
-import { Flock } from '@/types/api/master-data/flock';
-import { Area } from '@/types/api/master-data/area';
-import { ProductCategory } from '@/types/api/master-data/product-category';
-import { Fcr } from '@/types/api/master-data/fcr';
-import { Kandang } from '@/types/api/master-data/kandang';
-import { Location } from '@/types/api/master-data/location';
-import { BaseMetadata } from '@/types/api/api-general';
+import { Area } from "@/types/api/master-data/area";
+import { Fcr } from "@/types/api/master-data/fcr";
+import { Flock } from "@/types/api/master-data/flock";
+import { Kandang } from "@/types/api/master-data/kandang";
+import { Location } from "@/types/api/master-data/location";
+import { BaseMetadata } from "@/types/api/api-general";
 
 export type BaseProjectFlock = {
   id: number;
   name: string;
+  status: string;
   flock: Flock;
   flock_id: number;
   area: Area;
   area_id: number;
-  product_category: ProductCategory;
-  product_category_id: number;
+  category: string;
   fcr: Fcr;
   fcr_id: number;
   location: Location;
@@ -22,19 +21,24 @@ export type BaseProjectFlock = {
   period: number;
   kandang_ids: number[];
   kandangs: Kandang[];
-};
+}
 
-export type ProjectFlock = BaseMetadata & BaseProjectFlock;
+export type PeriodFlock = {
+  flock: Flock;
+  next_period: number;
+}
+
+
+export type ProjectFlock = BaseMetadata & BaseProjectFlock 
 
 export type CreateProjectFlockPayload = {
-  name: string;
   flock_id: number;
   area_id: number;
-  product_category_id: number;
+  category: string;
   fcr_id: number;
   location_id: number;
   period: number;
   kandang_ids: number[];
-};
+}
 
-export type UpdateProjectFlockPayload = CreateProjectFlockPayload;
+export type UpdateProjectFlockPayload = CreateProjectFlockPayload;