diff --git a/src/components/pages/production/recording/form/RecordingForm.schema.ts b/src/components/pages/production/recording/form/RecordingForm.schema.ts
index 7bb1cd26..fb58b048 100644
--- a/src/components/pages/production/recording/form/RecordingForm.schema.ts
+++ b/src/components/pages/production/recording/form/RecordingForm.schema.ts
@@ -4,6 +4,7 @@ import {
   CreateGrowingRecordingPayload,
   CreateLayingRecordingPayload,
   CreateEggPayload,
+  CreateGradingPayload,
 } from '@/types/api/production/recording';
 
 export const RecordingGrowingFormSchema = Yup.object({
@@ -132,6 +133,35 @@ export const UpdateRecordingLayingFormSchema = RecordingLayingFormSchema.shape({
     .required('Project Flock Kandang wajib diisi!'),
 });
 
+export const RecordingGradingFormSchema = Yup.object({
+  recording_egg_id: Yup.number()
+    .required('Recording Egg ID wajib diisi!')
+    .min(1, 'Recording Egg ID minimal 1!')
+    .typeError('Recording Egg ID harus berupa angka!'),
+  eggs_grading: Yup.array()
+    .of(
+      Yup.object({
+        grade: Yup.string()
+          .required('Grade telur wajib diisi!')
+          .typeError('Grade telur harus berupa string!'),
+        qty: Yup.number()
+          .required('Jumlah telur wajib diisi!')
+          .min(1, 'Jumlah telur minimal 1!')
+          .typeError('Jumlah telur harus berupa angka!'),
+      })
+    )
+    .min(1, 'Minimal harus ada 1 data grading telur!')
+    .required('Data grading telur wajib diisi!'),
+});
+
+export const UpdateRecordingGradingFormSchema =
+  RecordingGradingFormSchema.shape({
+    recording_egg_id: Yup.number()
+      .required('Recording Egg ID wajib diisi!')
+      .min(1, 'Recording Egg ID minimal 1!')
+      .typeError('Recording Egg ID harus berupa angka!'),
+  });
+
 export type RecordingGrowingFormValues = Yup.InferType<
   typeof RecordingGrowingFormSchema
 >;
@@ -140,6 +170,10 @@ export type RecordingLayingFormValues = Yup.InferType<
   typeof RecordingLayingFormSchema
 >;
 
+export type RecordingGradingFormValues = Yup.InferType<
+  typeof RecordingGradingFormSchema
+>;
+
 type RecordingFormData = Partial<Recording> & {
   body_weights?: CreateGrowingRecordingPayload['body_weights'];
   stocks?: CreateGrowingRecordingPayload['stocks'];
@@ -211,3 +245,18 @@ export const getRecordingLayingFormInitialValues = (
     },
   ],
 });
+
+export const getRecordingGradingFormInitialValues = (
+  initialValues?: Partial<CreateGradingPayload>
+): RecordingGradingFormValues => ({
+  recording_egg_id: initialValues?.recording_egg_id ?? 0,
+  eggs_grading: initialValues?.eggs_grading?.map((grading) => ({
+    grade: grading.grade,
+    qty: grading.qty,
+  })) ?? [
+    {
+      grade: '',
+      qty: 0,
+    },
+  ],
+});
diff --git a/src/types/api/production/recording.d.ts b/src/types/api/production/recording.d.ts
index 42a02c09..55272533 100644
--- a/src/types/api/production/recording.d.ts
+++ b/src/types/api/production/recording.d.ts
@@ -86,9 +86,8 @@ export type CreateGrowingRecordingPayload = {
 };
 
 export type CreateGradingPayload = {
-  recording_id: number;
-  grading: {
-    product_warehouse_id: number;
+  recording_egg_id: number;
+  eggs_grading: {
     grade: string;
     qty: number;
   }[];
@@ -110,5 +109,6 @@ export type CreateRecordingPayload =
 
 export type UpdateGrowingRecordingPayload = CreateGrowingRecordingPayload;
 export type UpdateLayingRecordingPayload = CreateLayingRecordingPayload;
+export type UpdateGradingRecordingPayload = CreateGradingRecordingPayload;
 
 export type UpdateRecordingPayload = CreateRecordingPayload;