diff --git a/src/components/helper/form/FormActions.tsx b/src/components/helper/form/FormActions.tsx
index 7ced46cd..92c2a92c 100644
--- a/src/components/helper/form/FormActions.tsx
+++ b/src/components/helper/form/FormActions.tsx
@@ -64,7 +64,10 @@ export const FormActions = <T,>({
             type='reset'
             color='warning'
             className='px-4'
-            onClick={formik.handleReset}
+            onClick={() => {
+              formik.handleReset();
+              formik.validateForm();
+            }}
           >
             Reset
           </Button>
diff --git a/src/components/pages/inventory/movement/MovementTable.tsx b/src/components/pages/inventory/movement/MovementTable.tsx
index b39906d3..61be40f8 100644
--- a/src/components/pages/inventory/movement/MovementTable.tsx
+++ b/src/components/pages/inventory/movement/MovementTable.tsx
@@ -1,355 +1,56 @@
 'use client';
 
-import { useState, useMemo } from 'react';
+import { useState } from 'react';
+import useSWR from 'swr';
 import { SortingState } from '@tanstack/react-table';
-import { Icon } from '@iconify/react';
+
 import Table from '@/components/Table';
 import { useModal } from '@/components/Modal';
 import ConfirmationModal from '@/components/modal/ConfirmationModal';
-import { ROWS_OPTIONS } from '@/config/constant';
 import { Movement } from '@/types/api/inventory/movement';
+import { MovementApi } from '@/services/api/inventory';
+import { cn } from '@/lib/helper';
+import { isResponseSuccess } from '@/lib/api-helper';
+import { useTableFilter } from '@/services/hooks/useTableFilter';
+import { ROWS_OPTIONS } from '@/config/constant';
 import { TableToolbar } from '@/components/table/TableToolbar';
 import { TableRowSizeSelector } from '@/components/table/TableRowSizeSelector';
-import { TableRowOptions } from '@/components/table/TableRowOptions';
 import { OptionType } from '@/components/input/SelectInput';
-import Button from '@/components/Button';
-import { cn } from '@/lib/helper';
-
-// Dummy data
-const baseMetadata = {
-  created_user: {
-    id: 1,
-    id_user: 1,
-    email: 'user@example.com',
-    name: 'User',
-  },
-  created_at: '2024-06-01T00:00:00Z',
-  updated_at: '2024-06-01T00:00:00Z',
-};
-
-const dummyMovements: Movement[] = [
-  {
-    ...baseMetadata,
-    id: 1,
-    alasan_transfer: 'Restock',
-    tanggal_transfer: '2024-06-01',
-    warehouse_asal: {
-      ...baseMetadata,
-      id: 1,
-      name: 'Warehouse A',
-      type: 'AREA',
-      area: { id: 1, name: 'Area 1' },
-    },
-    warehouse_tujuan: {
-      ...baseMetadata,
-      id: 2,
-      name: 'Warehouse B',
-      type: 'AREA',
-      area: { id: 2, name: 'Area 2' },
-    },
-    product: [
-      {
-        product: {
-          ...baseMetadata,
-          id: 1,
-          name: 'Product X',
-          brand: 'Brand X',
-          sku: 'SKU-X',
-          product_price: 10000,
-          selling_price: 12000,
-          tax: 10,
-          expiry_period: 365,
-          uom: {
-            ...baseMetadata,
-            id: 1,
-            name: 'PCS',
-          },
-          product_category: {
-            ...baseMetadata,
-            id: 1,
-            code: 'CAT-1',
-            name: 'Category 1',
-          },
-          suppliers: [],
-          flags: [],
-        },
-        qty_product: 10,
-      },
-    ],
-    ekspedisi: [
-      {
-        product_id: 1,
-        qty: 10,
-        supplier: {
-          ...baseMetadata,
-          id: 1,
-          name: 'Supplier 1',
-          alias: 'S1',
-          category: 'General',
-          pic: 'PIC 1',
-          type: 'Type 1',
-          hatchery: 'Hatchery 1',
-          phone: '08123456789',
-          email: 'supplier1@example.com',
-          address: 'Address 1',
-          npwp: '1234567890123456',
-          account_number: '1234567890',
-          balance: 0,
-          due_date: 30,
-        },
-        plat_nomor: 'B 1234 CD',
-        no_surat_jalan: 'SJ-001',
-        dokumen: 'doc1.pdf',
-        biaya_ekspedisi: 50000,
-        nama_sopir: 'Andi',
-      },
-    ],
-  },
-  {
-    ...baseMetadata,
-    id: 2,
-    alasan_transfer: 'Mutasi Stok',
-    tanggal_transfer: '2024-06-02',
-    warehouse_asal: {
-      ...baseMetadata,
-      id: 2,
-      name: 'Warehouse B',
-      type: 'AREA',
-      area: { id: 2, name: 'Area 2' },
-    },
-    warehouse_tujuan: {
-      ...baseMetadata,
-      id: 3,
-      name: 'Warehouse C',
-      type: 'AREA',
-      area: { id: 3, name: 'Area 3' },
-    },
-    product: [
-      {
-        product: {
-          ...baseMetadata,
-          id: 2,
-          name: 'Product Y',
-          brand: 'Brand Y',
-          sku: 'SKU-Y',
-          product_price: 20000,
-          selling_price: 25000,
-          tax: 5,
-          expiry_period: 180,
-          uom: {
-            ...baseMetadata,
-            id: 2,
-            name: 'BOX',
-          },
-          product_category: {
-            ...baseMetadata,
-            id: 2,
-            code: 'CAT-2',
-            name: 'Category 2',
-          },
-          suppliers: [],
-          flags: [],
-        },
-        qty_product: 5,
-      },
-    ],
-    ekspedisi: [
-      {
-        product_id: 2,
-        qty: 5,
-        supplier: {
-          ...baseMetadata,
-          id: 2,
-          name: 'Supplier 2',
-          alias: 'S2',
-          category: 'Special',
-          pic: 'PIC 2',
-          type: 'Type 2',
-          hatchery: 'Hatchery 2',
-          phone: '08123456780',
-          email: 'supplier2@example.com',
-          address: 'Address 2',
-          npwp: '1234567890123457',
-          account_number: '1234567891',
-          balance: 1000,
-          due_date: 15,
-        },
-        plat_nomor: 'D 5678 EF',
-        no_surat_jalan: 'SJ-002',
-        dokumen: 'doc2.pdf',
-        biaya_ekspedisi: 60000,
-        nama_sopir: 'Budi',
-      },
-    ],
-  },
-  {
-    ...baseMetadata,
-    id: 3,
-    alasan_transfer: 'Pengembalian',
-    tanggal_transfer: '2024-06-03',
-    warehouse_asal: {
-      ...baseMetadata,
-      id: 3,
-      name: 'Warehouse C',
-      type: 'AREA',
-      area: { id: 3, name: 'Area 3' },
-    },
-    warehouse_tujuan: {
-      ...baseMetadata,
-      id: 1,
-      name: 'Warehouse A',
-      type: 'AREA',
-      area: { id: 1, name: 'Area 1' },
-    },
-    product: [
-      {
-        product: {
-          ...baseMetadata,
-          id: 3,
-          name: 'Product Z',
-          brand: 'Brand Z',
-          sku: 'SKU-Z',
-          product_price: 15000,
-          selling_price: 18000,
-          tax: 8,
-          expiry_period: 90,
-          uom: {
-            ...baseMetadata,
-            id: 3,
-            name: 'KG',
-          },
-          product_category: {
-            ...baseMetadata,
-            id: 3,
-            code: 'CAT-3',
-            name: 'Category 3',
-          },
-          suppliers: [],
-          flags: [],
-        },
-        qty_product: 8,
-      },
-    ],
-    ekspedisi: [
-      {
-        product_id: 3,
-        qty: 8,
-        supplier: {
-          ...baseMetadata,
-          id: 3,
-          name: 'Supplier 3',
-          alias: 'S3',
-          category: 'Return',
-          pic: 'PIC 3',
-          type: 'Type 3',
-          hatchery: 'Hatchery 3',
-          phone: '08123456781',
-          email: 'supplier3@example.com',
-          address: 'Address 3',
-          npwp: '1234567890123458',
-          account_number: '1234567892',
-          balance: 500,
-          due_date: 10,
-        },
-        plat_nomor: 'F 9101 GH',
-        no_surat_jalan: 'SJ-003',
-        dokumen: 'doc3.pdf',
-        biaya_ekspedisi: 40000,
-        nama_sopir: 'Cici',
-      },
-    ],
-  },
-  {
-    ...baseMetadata,
-    id: 4,
-    alasan_transfer: 'Transfer Internal',
-    tanggal_transfer: '2024-06-04',
-    warehouse_asal: {
-      ...baseMetadata,
-      id: 4,
-      name: 'Warehouse D',
-      type: 'AREA',
-      area: { id: 4, name: 'Area 4' },
-    },
-    warehouse_tujuan: {
-      ...baseMetadata,
-      id: 5,
-      name: 'Warehouse E',
-      type: 'AREA',
-      area: { id: 5, name: 'Area 5' },
-    },
-    product: [
-      {
-        product: {
-          ...baseMetadata,
-          id: 4,
-          name: 'Product A',
-          brand: 'Brand A',
-          sku: 'SKU-A',
-          product_price: 5000,
-          selling_price: 7000,
-          tax: 0,
-          expiry_period: 60,
-          uom: {
-            ...baseMetadata,
-            id: 4,
-            name: 'LITER',
-          },
-          product_category: {
-            ...baseMetadata,
-            id: 4,
-            code: 'CAT-4',
-            name: 'Category 4',
-          },
-          suppliers: [],
-          flags: [],
-        },
-        qty_product: 20,
-      },
-    ],
-    ekspedisi: [
-      {
-        product_id: 4,
-        qty: 20,
-        supplier: {
-          ...baseMetadata,
-          id: 4,
-          name: 'Supplier 4',
-          alias: 'S4',
-          category: 'Internal',
-          pic: 'PIC 4',
-          type: 'Type 4',
-          hatchery: 'Hatchery 4',
-          phone: '08123456782',
-          email: 'supplier4@example.com',
-          address: 'Address 4',
-          npwp: '1234567890123459',
-          account_number: '1234567893',
-          balance: 200,
-          due_date: 20,
-        },
-        plat_nomor: 'H 2345 IJ',
-        no_surat_jalan: 'SJ-004',
-        dokumen: 'doc4.pdf',
-        biaya_ekspedisi: 30000,
-        nama_sopir: 'Dedi',
-      },
-    ],
-  },
-];
+import RowDropdownOptions from '@/components/table/RowDropdownOptions';
+import RowCollapseOptions from '@/components/table/RowCollapseOptions';
+import { TableRowOptions } from '@/components/table/TableRowOptions';
 
 const MovementTable = () => {
-  const [search, setSearch] = useState('');
-  const [page, setPage] = useState(1);
-  const [pageSize, setPageSize] = useState(10);
+  const {
+    state: tableFilterState,
+    updateFilter,
+    setPage,
+    setPageSize,
+    toQueryString: getTableFilterQueryString,
+  } = useTableFilter({
+    initial: { search: '' },
+    paramMap: { page: 'page', pageSize: 'limit' },
+  });
+
   const [sorting, setSorting] = useState<SortingState>([]);
-  const [, setSelectedMovement] = useState<Movement | undefined>(undefined);
+  const [selectedMovement, setSelectedMovement] = useState<
+    Movement | undefined
+  >(undefined);
   const [isDeleteLoading, setIsDeleteLoading] = useState(false);
 
   const deleteModal = useModal();
 
+  const {
+    data: movements,
+    isLoading,
+    mutate: refreshMovements,
+  } = useSWR(
+    `${MovementApi.basePath}${getTableFilterQueryString()}`,
+    MovementApi.getAllFetcher
+  );
+
   const searchChangeHandler = (e: React.ChangeEvent<HTMLInputElement>) => {
-    setSearch(e.target.value);
+    updateFilter('search', e.target.value);
     setPage(1);
   };
 
@@ -361,17 +62,15 @@ const MovementTable = () => {
 
   const confirmationModalDeleteClickHandler = async () => {
     setIsDeleteLoading(true);
-    setTimeout(() => {
-      setIsDeleteLoading(false);
+    try {
+      await MovementApi.delete(selectedMovement?.id as number);
+      refreshMovements();
       deleteModal.closeModal();
-    }, 1000);
+    } finally {
+      setIsDeleteLoading(false);
+    }
   };
 
-  const paginatedData = useMemo(() => {
-    const start = (page - 1) * pageSize;
-    return dummyMovements.slice(start, start + pageSize);
-  }, [page, pageSize]);
-
   return (
     <div className='flex flex-col gap-4'>
       <div className='flex flex-col gap-2 mb-4'>
@@ -381,81 +80,120 @@ const MovementTable = () => {
             label: 'Tambah Movement',
           }}
           search={{
-            value: search,
+            value: tableFilterState.search,
             onChange: searchChangeHandler,
             placeholder: 'Cari Movement',
           }}
         />
         <TableRowSizeSelector
-          value={pageSize}
+          value={tableFilterState.pageSize}
           onChange={pageSizeChangeHandler}
           options={ROWS_OPTIONS}
         />
       </div>
 
-      <Table
-        data={paginatedData}
+      <Table<Movement>
+        data={isResponseSuccess(movements) ? movements?.data : []}
         columns={[
           {
             header: '#',
-            cell: (props) => pageSize * (page - 1) + props.row.index + 1,
-          },
-          {
-            accessorKey: 'warehouse_asal',
-            header: 'Gudang Asal',
-            cell: (props) => props.row.original.warehouse_asal.name,
-          },
-          {
-            accessorKey: 'warehouse_tujuan',
-            header: 'Gudang Tujuan',
-            cell: (props) => props.row.original.warehouse_tujuan.name,
-          },
-          {
-            accessorKey: 'product',
-            header: 'Nama Produk',
             cell: (props) =>
-              props.row.original.product.map((p) => p.product.name),
+              tableFilterState.pageSize * (tableFilterState.page - 1) +
+              props.row.index +
+              1,
           },
           {
-            accessorKey: 'alasan_transfer',
+            accessorFn: (row) => row.source_warehouse?.name,
+            header: 'Gudang Asal',
+          },
+          {
+            accessorFn: (row) => row.destination_warehouse?.name,
+            header: 'Gudang Tujuan',
+          },
+          {
+            accessorKey: 'transfer_reason',
             header: 'Catatan',
           },
           {
-            accessorKey: 'biaya_ekspedisi',
-            header: 'Biaya Ekspedisi',
+            accessorKey: 'transfer_date',
+            header: 'Tanggal',
             cell: (props) =>
-              props.row.original.ekspedisi.map((e) => e.biaya_ekspedisi),
+              new Date(props.row.original.transfer_date).toLocaleDateString(
+                'id-ID'
+              ),
           },
           {
-            id: 'actions',
-            cell: (props) => (
-              <div className='dropdown dropdown-end'>
-                <Button tabIndex={0} variant='ghost' className='px-2'>
-                  <Icon icon='carbon:overflow-menu-vertical' />
-                </Button>
-                <TableRowOptions
-                  type='dropdown'
-                  recordId={props.row.original.id}
-                  basePath='/inventory/movement'
-                  onDelete={() => {
-                    setSelectedMovement(props.row.original);
-                    deleteModal.openModal();
-                  }}
-                />
-              </div>
-            ),
+            accessorFn: (row) => {
+              const totalCost = row.deliveries?.reduce(
+                (sum, d) => sum + (d.shipping_cost_total || 0),
+                0
+              );
+              return totalCost?.toLocaleString('id-ID');
+            },
+            header: 'Biaya Pengiriman',
+          },
+          {
+            header: 'Aksi',
+            cell: (props) => {
+              const currentPageSize =
+                props.table.getPaginationRowModel().rows.length;
+              const currentPageRows =
+                props.table.getPaginationRowModel().flatRows;
+              const currentRowRelativeIndex =
+                currentPageRows.findIndex((r) => r.id === props.row.id) + 1;
+
+              const isLast2Rows = currentRowRelativeIndex > currentPageSize - 2;
+
+              const deleteClickHandler = () => {
+                setSelectedMovement(props.row.original);
+                deleteModal.openModal();
+              };
+
+              return (
+                <>
+                  {currentPageSize > 2 && (
+                    <RowDropdownOptions isLast2Rows={isLast2Rows}>
+                      <TableRowOptions
+                        type='dropdown'
+                        recordId={props.row.original.id}
+                        basePath='/inventory/movement'
+                        queryParam='movementId'
+                        showEdit={false}
+                        showDelete={false}
+                      />
+                    </RowDropdownOptions>
+                  )}
+
+                  {currentPageSize <= 2 && (
+                    <RowCollapseOptions>
+                      <TableRowOptions
+                        type='collapse'
+                        recordId={props.row.original.id}
+                        basePath='/inventory/movement'
+                        queryParam='movementId'
+                        showEdit={false}
+                        showDelete={false}
+                      />
+                    </RowCollapseOptions>
+                  )}
+                </>
+              );
+            },
           },
         ]}
-        pageSize={pageSize}
-        page={page}
-        totalItems={dummyMovements.length}
+        pageSize={tableFilterState.pageSize}
+        page={isResponseSuccess(movements) ? movements?.meta?.page : 0}
+        totalItems={
+          isResponseSuccess(movements) ? movements?.meta?.total_results : 0
+        }
         onPageChange={setPage}
-        isLoading={false}
+        isLoading={isLoading}
         sorting={sorting}
         setSorting={setSorting}
         className={{
           containerClassName: cn({
-            'mb-20': paginatedData.length === 0,
+            'mb-20':
+              isResponseSuccess(movements) && movements?.data?.length === 0,
           }),
           tableWrapperClassName: 'overflow-x-auto min-h-full!',
           tableClassName: 'font-inter w-full table-auto min-h-full!',
diff --git a/src/components/pages/inventory/movement/form/MovementForm.schema.ts b/src/components/pages/inventory/movement/form/MovementForm.schema.ts
index 453ca40b..f33888e2 100644
--- a/src/components/pages/inventory/movement/form/MovementForm.schema.ts
+++ b/src/components/pages/inventory/movement/form/MovementForm.schema.ts
@@ -7,27 +7,28 @@ export type ProductSchema = {
     label: string;
   } | null;
   product_id: number;
-  qty_product: number;
+  product_qty: number;
 };
 
-export type EkspedisiSchema = {
-  product: {
-    value: number;
-    label: string;
-  } | null;
-  product_id: number;
-  qty: number;
+export type DeliverySchema = {
+  delivery_cost: number;
+  delivery_cost_per_item?: number | undefined;
+  document?: File | string | null;
+  driver_name: string;
+  vehicle_plate: string;
   supplier: {
     value: number;
     label: string;
   } | null;
   supplier_id: number;
-  plat_nomor: string;
-  no_surat_jalan: string;
-  dokumen: string | File;
-  biaya_ekspedisi: number;
-  biaya_ekspedisi_per_item?: number | undefined;
-  nama_sopir: string;
+  products: {
+    product: {
+      value: number;
+      label: string;
+    } | null;
+    product_id: number;
+    product_qty: number;
+  }[];
 };
 
 const ProductObjectSchema: Yup.ObjectSchema<ProductSchema> = Yup.object({
@@ -36,94 +37,80 @@ const ProductObjectSchema: Yup.ObjectSchema<ProductSchema> = Yup.object({
     label: Yup.string().required(),
   }).nullable(),
   product_id: Yup.number().required('Produk wajib diisi!'),
-  qty_product: Yup.number()
+  product_qty: Yup.number()
     .required('Qty wajib diisi!')
     .min(1, 'Qty minimal 1!')
     .typeError('Qty harus berupa angka!'),
 });
 
-const EkspedisiObjectSchema: Yup.ObjectSchema<EkspedisiSchema> = Yup.object({
+const DeliveryProductObjectSchema = Yup.object({
   product: Yup.object({
     value: Yup.number().min(1).required(),
     label: Yup.string().required(),
   }).nullable(),
   product_id: Yup.number().required('Produk wajib diisi!'),
-  qty: Yup.number()
+  product_qty: Yup.number()
     .required('Qty wajib diisi!')
     .min(1, 'Qty minimal 1!')
-    .typeError('Qty harus berupa angka!')
-    .test('max-product-qty', 'Qty melebihi stok produk!', function (value) {
-      const { product_id } = this.parent;
-      const products = (this.options.context?.product ?? []) as {
-        product_id: number;
-        qty_product: number;
-      }[];
-      const product = products.find((p) => p.product_id === product_id);
-      if (!product) return true;
-      return (value ?? 0) <= Number(product.qty_product);
+    .typeError('Qty harus berupa angka!'),
+});
+
+const DeliveryObjectSchema: Yup.ObjectSchema<DeliverySchema> = Yup.object({
+  delivery_cost: Yup.number()
+    .required('Biaya pengiriman wajib diisi!')
+    .min(1, 'Biaya minimal 1!')
+    .typeError('Biaya harus berupa angka!'),
+  delivery_cost_per_item: Yup.number()
+    .transform((value) => (isNaN(value) ? undefined : value))
+    .min(1, 'Biaya per item minimal 1!')
+    .typeError('Biaya per item harus berupa angka!'),
+  document_index: Yup.number().optional(),
+  document: Yup.mixed<File | string>()
+    .nullable()
+    .test('fileSize', 'Ukuran dokumen maksimal 2 MB', (value) => {
+      if (!value) return true;
+      if (typeof value === 'string') return true;
+      if (value instanceof File) return value.size <= 2 * 1024 * 1024;
+      return false;
     }),
+  driver_name: Yup.string().required('Nama sopir wajib diisi!'),
+  vehicle_plate: Yup.string().required('Plat nomor wajib diisi!'),
   supplier: Yup.object({
     value: Yup.number().min(1).required(),
     label: Yup.string().required(),
   }).nullable(),
   supplier_id: Yup.number().required('Supplier wajib diisi!'),
-  plat_nomor: Yup.string().required('Plat nomor wajib diisi!'),
-  no_surat_jalan: Yup.string().required('No surat jalan wajib diisi!'),
-  dokumen: Yup.mixed<string | File>()
-    .required('Dokumen wajib diisi!')
-    .test(
-      'fileType',
-      'Mohon upload file berformat PDF atau JPEG/JPG.',
-      (value) =>
-        typeof value === 'string' ||
-        (value instanceof File &&
-          ['application/pdf', 'image/jpeg', 'image/jpg'].includes(value.type))
-    )
-    .test(
-      'fileSize',
-      'Ukuran dokumen maksimal 2 MB!',
-      (value) =>
-        typeof value === 'string' ||
-        (value instanceof File && value.size <= 2 * 1024 * 1024)
-    ),
-  biaya_ekspedisi: Yup.number()
-    .required('Biaya ekspedisi wajib diisi!')
-    .min(0, 'Biaya minimal 0!')
-    .typeError('Biaya harus berupa angka!'),
-  biaya_ekspedisi_per_item: Yup.number()
-    .transform((value) => (isNaN(value) ? undefined : value))
-    .min(0, 'Biaya per item minimal 0!')
-    .typeError('Biaya per item harus berupa angka!')
-    .optional()
-    .default(undefined),
-  nama_sopir: Yup.string().required('Nama sopir wajib diisi!'),
+  products: Yup.array()
+    .of(DeliveryProductObjectSchema)
+    .min(1, 'Minimal harus ada 1 produk!')
+    .required('Produk wajib diisi!'),
 });
 
 export const MovementFormSchema = Yup.object({
-  alasan_transfer: Yup.string().required('Alasan transfer wajib diisi!'),
-  tanggal_transfer: Yup.string().required('Tanggal transfer wajib diisi!'),
-  warehouse_asal: Yup.object({
+  transfer_reason: Yup.string().required('Alasan transfer wajib diisi!'),
+  transfer_date: Yup.string().required('Tanggal transfer wajib diisi!'),
+  source_warehouse: Yup.object({
     value: Yup.number().min(1).required(),
     label: Yup.string().required(),
   }).nullable(),
-  warehouse_asal_id: Yup.number()
+  source_warehouse_id: Yup.number()
     .required('Gudang asal wajib diisi!')
     .typeError('Gudang asal wajib diisi!'),
-  warehouse_tujuan: Yup.object({
+  destination_warehouse: Yup.object({
     value: Yup.number().min(1).required(),
     label: Yup.string().required(),
   }).nullable(),
-  warehouse_tujuan_id: Yup.number()
+  destination_warehouse_id: Yup.number()
     .required('Gudang tujuan wajib diisi!')
     .typeError('Gudang tujuan wajib diisi!'),
-  product: Yup.array()
+  products: Yup.array()
     .of(ProductObjectSchema)
     .min(1, 'Minimal harus ada 1 produk!')
     .required('Produk wajib diisi!'),
-  ekspedisi: Yup.array()
-    .of(EkspedisiObjectSchema)
-    .min(1, 'Minimal harus ada 1 ekspedisi!')
-    .required('Ekspedisi wajib diisi!'),
+  deliveries: Yup.array()
+    .of(DeliveryObjectSchema)
+    .min(1, 'Minimal harus ada 1 pengiriman!')
+    .required('Pengiriman wajib diisi!'),
 });
 
 export const UpdateMovementFormSchema = MovementFormSchema;
@@ -132,41 +119,61 @@ export type MovementFormValues = Yup.InferType<typeof MovementFormSchema>;
 
 export const getMovementFormInitialValues = (
   initialValues?: Movement
-): MovementFormValues => ({
-  alasan_transfer: initialValues?.alasan_transfer ?? '',
-  tanggal_transfer: initialValues?.tanggal_transfer ?? '',
-  warehouse_asal: initialValues?.warehouse_asal
-    ? {
-        value: initialValues.warehouse_asal.id,
-        label: initialValues.warehouse_asal.name,
-      }
-    : null,
-  warehouse_asal_id: initialValues?.warehouse_asal?.id ?? 0,
-  warehouse_tujuan: initialValues?.warehouse_tujuan
-    ? {
-        value: initialValues.warehouse_tujuan.id,
-        label: initialValues.warehouse_tujuan.name,
-      }
-    : null,
-  warehouse_tujuan_id: initialValues?.warehouse_tujuan?.id ?? 0,
-  product:
-    initialValues?.product?.map((p) => ({
-      product: { value: p.product.id, label: p.product.name },
-      product_id: p.product.id,
-      qty_product: p.qty_product,
-    })) ?? [],
-  ekspedisi:
-    initialValues?.ekspedisi?.map((e) => ({
-      product: { value: e.product_id, label: '' },
-      product_id: e.product_id,
-      qty: e.qty,
-      supplier: { value: e.supplier.id, label: e.supplier.name },
-      supplier_id: e.supplier.id,
-      plat_nomor: e.plat_nomor,
-      no_surat_jalan: e.no_surat_jalan,
-      dokumen: e.dokumen,
-      biaya_ekspedisi: e.biaya_ekspedisi,
-      biaya_ekspedisi_per_item: e.biaya_ekspedisi,
-      nama_sopir: e.nama_sopir,
-    })) ?? [],
-});
+): MovementFormValues => {
+  const detailIdToProductId = new Map<number, number>();
+  initialValues?.details?.forEach((detail) => {
+    detailIdToProductId.set(detail.id, detail.product_id);
+  });
+
+  return {
+    transfer_reason: initialValues?.transfer_reason ?? '',
+    transfer_date: initialValues?.transfer_date ?? '',
+    source_warehouse: initialValues?.source_warehouse
+      ? {
+          value: initialValues.source_warehouse.id,
+          label: initialValues.source_warehouse.name,
+        }
+      : null,
+    source_warehouse_id: initialValues?.source_warehouse?.id ?? 0,
+    destination_warehouse: initialValues?.destination_warehouse
+      ? {
+          value: initialValues.destination_warehouse.id,
+          label: initialValues.destination_warehouse.name,
+        }
+      : null,
+    destination_warehouse_id: initialValues?.destination_warehouse?.id ?? 0,
+    products:
+      initialValues?.details?.map((p) => ({
+        product: { value: p.product_id, label: `Product ID: ${p.product_id}` },
+        product_id: p.product_id,
+        product_qty: p.quantity,
+      })) ?? [],
+    deliveries:
+      initialValues?.deliveries?.map((d) => {
+        return {
+          delivery_cost: d.shipping_cost_total,
+          delivery_cost_per_item: d.shipping_cost_item,
+          document_index: 0,
+          document: d.document_path || null,
+          driver_name: d.driver_name,
+          vehicle_plate: d.vehicle_plate,
+          supplier: d.supplier
+            ? { value: d.supplier.id, label: d.supplier.name }
+            : null,
+          supplier_id: d.supplier_id,
+          products: d.items.map((item) => {
+            const productId =
+              detailIdToProductId.get(item.stock_transfer_detail_id) ?? 0;
+            return {
+              product:
+                productId > 0
+                  ? { value: productId, label: `Product ID: ${productId}` }
+                  : null,
+              product_id: productId,
+              product_qty: item.quantity,
+            };
+          }),
+        };
+      }) ?? [],
+  };
+};
diff --git a/src/components/pages/inventory/movement/form/MovementForm.tsx b/src/components/pages/inventory/movement/form/MovementForm.tsx
index e5c90f4a..3ff448f8 100644
--- a/src/components/pages/inventory/movement/form/MovementForm.tsx
+++ b/src/components/pages/inventory/movement/form/MovementForm.tsx
@@ -1,7 +1,7 @@
 'use client';
 
 import { useCallback, useEffect, useMemo, useState } from 'react';
-import { FormikProps, useFormik } from 'formik';
+import { useFormik } from 'formik';
 import useSWR from 'swr';
 
 import { Icon } from '@iconify/react';
@@ -22,14 +22,15 @@ import {
   UpdateMovementFormSchema,
   getMovementFormInitialValues,
   ProductSchema,
-  EkspedisiSchema,
+  DeliverySchema,
 } from '@/components/pages/inventory/movement/form/MovementForm.schema';
 import { useMovementFormHandlers } from './useMovementFormHandlers';
 import {
-  ProductApi,
   SupplierApi,
   WarehouseApi,
+  ProductApi,
 } from '@/services/api/master-data';
+import { ProductWarehouseApi } from '@/services/api/inventory';
 import { toast } from 'react-hot-toast';
 import FileInput from '@/components/input/FileInput';
 
@@ -38,28 +39,17 @@ interface MovementFormProps {
   initialValues?: Movement;
 }
 
-function getEkspedisiFieldError(
-  formik: FormikProps<MovementFormValues>,
-  idx: number,
-  field: keyof EkspedisiSchema
-) {
-  const errorObj = formik.errors.ekspedisi?.[idx];
-  const touched = formik.touched.ekspedisi?.[idx]?.[field];
-  const isError =
-    touched &&
-    typeof errorObj === 'object' &&
-    !!(errorObj as Record<string, unknown>)?.[field];
-  const errorMessage =
-    typeof errorObj === 'object'
-      ? (errorObj as Record<string, string>)?.[field]
-      : undefined;
-  return { isError, errorMessage };
-}
-
 const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
   const [, setMovementFormErrorMessage] = useState('');
+  const [
+    productWarehouseSelectInputValue,
+    setProductWarehouseSelectInputValue,
+  ] = useState('');
   const [selectedProducts, setSelectedProducts] = useState<number[]>([]);
-  const [selectedEkspedisi, setSelectedEkspedisi] = useState<number[]>([]);
+  const [selectedDeliveries, setSelectedDeliveries] = useState<number[]>([]);
+  const [fetchedProductIds, setFetchedProductIds] = useState<Set<number>>(
+    new Set()
+  );
 
   const {
     deleteModal,
@@ -82,39 +72,56 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
       type === 'edit' ? UpdateMovementFormSchema : MovementFormSchema,
     validateOnChange: true,
     validateOnBlur: true,
+    validateOnMount: false,
+    enableReinitialize: true,
     onSubmit: async (values) => {
       setMovementFormErrorMessage('');
+      const documents: File[] = [];
+      const deliveriesPayload = values.deliveries.map((d, idx) => {
+        let documentIndex = 0;
+
+        if (d.document && d.document instanceof File) {
+          documents.push(d.document);
+          documentIndex = documents.length - 1;
+        } else {
+        }
+
+        return {
+          delivery_cost: d.delivery_cost,
+          delivery_cost_per_item: d.delivery_cost_per_item ?? 0,
+          document_index: documentIndex,
+          driver_name: d.driver_name,
+          vehicle_plate: d.vehicle_plate,
+          supplier_id: d.supplier_id,
+          products: d.products.map((p) => ({
+            product_id: p.product_id,
+            product_qty: p.product_qty,
+          })),
+        };
+      });
+
       const payload: CreateMovementPayload = {
-        alasan_transfer: values.alasan_transfer,
-        tanggal_transfer: values.tanggal_transfer,
-        warehouse_asal_id: values.warehouse_asal_id,
-        warehouse_tujuan_id: values.warehouse_tujuan_id,
-        product: (values.product ?? []).map((p) => ({
+        transfer_reason: values.transfer_reason,
+        transfer_date: values.transfer_date,
+        source_warehouse_id: values.source_warehouse_id,
+        destination_warehouse_id: values.destination_warehouse_id,
+        products: values.products.map((p) => ({
           product_id: p.product_id,
-          qty_product: p.qty_product,
-        })),
-        ekspedisi: (values.ekspedisi ?? []).map((e) => ({
-          product_id: e.product_id,
-          qty: e.qty,
-          supplier_id: e.supplier_id,
-          plat_nomor: e.plat_nomor,
-          no_surat_jalan: e.no_surat_jalan,
-          dokumen:
-            e.dokumen instanceof File ? e.dokumen : (e.dokumen as string),
-          biaya_ekspedisi: e.biaya_ekspedisi,
-          biaya_ekspedisi_per_item: e.qty
-            ? e.biaya_ekspedisi / e.qty
-            : e.biaya_ekspedisi,
-          nama_sopir: e.nama_sopir,
+          product_qty: p.product_qty,
         })),
+        deliveries: deliveriesPayload,
       };
 
       switch (type) {
         case 'add':
-          await createMovementHandler(payload);
+          await createMovementHandler(payload, documents);
           break;
         case 'edit':
-          await updateMovementHandler(initialValues?.id as number, payload);
+          await updateMovementHandler(
+            initialValues?.id as number,
+            payload,
+            documents
+          );
           break;
       }
     },
@@ -122,65 +129,67 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
 
   const addProduct = () => {
     const newProducts = [
-      ...(formik.values.product || []),
+      ...(formik.values.products || []),
       {
         product: null,
         product_id: 0,
-        qty_product: 0,
+        product_qty: 0,
       },
     ];
-    formik.setFieldValue('product', newProducts);
+    formik.setFieldValue('products', newProducts);
   };
 
   const removeProduct = useCallback(
     (i: number) => {
       const updatedProducts =
-        formik.values.product?.reduce((acc: ProductSchema[], item, index) => {
+        formik.values.products?.reduce((acc: ProductSchema[], item, index) => {
           if (index !== i) {
             acc.push(item);
           }
           return acc;
         }, []) ?? [];
 
-      formik.setFieldValue('product', updatedProducts);
+      formik.setFieldValue('products', updatedProducts);
     },
     [formik]
   );
 
   const bulkRemoveProduct = useCallback(() => {
     const updatedProducts =
-      formik.values.product?.filter(
+      formik.values.products?.filter(
         (_, idx) => !selectedProducts.includes(idx)
       ) ?? [];
-    formik.setFieldValue('product', updatedProducts);
+    formik.setFieldValue('products', updatedProducts);
     setSelectedProducts([]);
   }, [formik, selectedProducts]);
 
-  const addEkspedisi = () => {
-    const newEkspedisi = [
-      ...(formik.values.ekspedisi || []),
+  const addDelivery = () => {
+    formik.setFieldValue('deliveries', [
+      ...(formik.values.deliveries || []),
       {
-        product: null,
-        product_id: 0,
-        qty: 0,
+        delivery_cost: 0,
+        delivery_cost_per_item: 0,
+        document: null,
+        driver_name: '',
+        vehicle_plate: '',
         supplier: null,
         supplier_id: 0,
-        plat_nomor: '',
-        no_surat_jalan: '',
-        dokumen: '',
-        biaya_ekspedisi: 0,
-        biaya_ekspedisi_per_item: 0,
-        nama_sopir: '',
+        products: [
+          {
+            product: null,
+            product_id: 0,
+            product_qty: 0,
+          },
+        ],
       },
-    ];
-    formik.setFieldValue('ekspedisi', newEkspedisi);
+    ]);
   };
 
-  const removeEkspedisi = useCallback(
+  const removeDelivery = useCallback(
     (i: number) => {
-      const updatedEkspedisi =
-        formik.values.ekspedisi?.reduce(
-          (acc: EkspedisiSchema[], item, index) => {
+      const updatedDeliveries =
+        formik.values.deliveries?.reduce(
+          (acc: DeliverySchema[], item, index) => {
             if (index !== i) {
               acc.push(item);
             }
@@ -189,39 +198,71 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
           []
         ) ?? [];
 
-      formik.setFieldValue('ekspedisi', updatedEkspedisi);
+      formik.setFieldValue('deliveries', updatedDeliveries);
     },
     [formik]
   );
 
-  const bulkRemoveEkspedisi = useCallback(() => {
-    const updatedEkspedisi =
-      formik.values.ekspedisi?.filter(
-        (_, idx) => !selectedEkspedisi.includes(idx)
+  const bulkRemoveDelivery = useCallback(() => {
+    const updatedDeliveries =
+      formik.values.deliveries?.filter(
+        (_, idx) => !selectedDeliveries.includes(idx)
       ) ?? [];
-    formik.setFieldValue('ekspedisi', updatedEkspedisi);
-    setSelectedEkspedisi([]);
-  }, [formik, selectedEkspedisi]);
+    formik.setFieldValue('deliveries', updatedDeliveries);
+    setSelectedDeliveries([]);
+  }, [formik, selectedDeliveries]);
 
-  const isRepeaterInputError = <T extends 'product' | 'ekspedisi'>(
+  const isRepeaterInputError = <T extends 'products' | 'deliveries'>(
     arrayName: T,
-    column: T extends 'product' ? keyof ProductSchema : keyof EkspedisiSchema,
+    column: T extends 'products' ? keyof ProductSchema : keyof DeliverySchema,
     idx: number
   ) => {
     if (
       !formik.touched[arrayName] ||
       !Array.isArray(formik.touched[arrayName])
     ) {
-      return false;
+      return {
+        isError: false,
+        errorMessage: undefined,
+      };
     }
 
     const touchedField = formik.touched[arrayName]?.[idx]?.[column as string];
     const errorField = formik.errors[arrayName]?.[idx] as Record<
       string,
-      unknown
+      string
     >;
 
-    return touchedField && Boolean(errorField?.[column as string]);
+    return {
+      isError: touchedField && Boolean(errorField?.[column as string]),
+      errorMessage: touchedField ? errorField?.[column as string] : undefined,
+    };
+  };
+
+  const isDeliveryProductInputError = (
+    deliveryIdx: number,
+    productIdx: number,
+    column: keyof DeliverySchema['products'][number]
+  ) => {
+    const touchedDelivery = formik.touched.deliveries?.[deliveryIdx];
+    const errorDelivery = formik.errors.deliveries?.[deliveryIdx] as
+      | { products: Array<Record<string, string>> }
+      | undefined;
+
+    if (!touchedDelivery?.products || !errorDelivery?.products) {
+      return {
+        isError: false,
+        errorMessage: undefined,
+      };
+    }
+
+    const touchedField = touchedDelivery.products[productIdx]?.[column];
+    const errorField = errorDelivery.products[productIdx]?.[column];
+
+    return {
+      isError: Boolean(touchedField && errorField),
+      errorMessage: touchedField ? errorField : undefined,
+    };
   };
 
   interface WarehouseOptionType extends OptionType {
@@ -249,15 +290,31 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
       }))
     : [];
 
-  // Product selection
-  const [productSelectInputValue, setProductSelectInputValue] = useState('');
-  const productsUrl = `${ProductApi.basePath}?${new URLSearchParams({ search: productSelectInputValue }).toString()}`;
-  const { data: products, isLoading: isLoadingProducts } = useSWR(
-    productsUrl,
-    ProductApi.getAllFetcher
-  );
-  const productOptions = isResponseSuccess(products)
-    ? products?.data.map((p) => ({ value: p.id, label: p.name }))
+  // Product Warehouse selection - Filter by source warehouse
+  const productWarehouseParams = new URLSearchParams({
+    search: productWarehouseSelectInputValue,
+  });
+  if (formik.values.source_warehouse_id) {
+    productWarehouseParams.append(
+      'warehouse_id',
+      formik.values.source_warehouse_id.toString()
+    );
+  }
+  const productWarehousesUrl = `${ProductWarehouseApi.basePath}?${productWarehouseParams.toString()}`;
+  const { data: productWarehouses, isLoading: isLoadingProductWarehouses } =
+    useSWR(
+      formik.values.source_warehouse_id ? productWarehousesUrl : null,
+      ProductWarehouseApi.getAllFetcher
+    );
+  const productWarehouseOptions = isResponseSuccess(productWarehouses)
+    ? productWarehouses?.data.map((pw) => ({
+        value: pw.id,
+        label: pw.product.name,
+        product_id: pw.product.id,
+        warehouse_id: pw.warehouse.id,
+        warehouse_name: pw.warehouse.name,
+        quantity: pw.quantity,
+      }))
     : [];
 
   // Supplier selection
@@ -271,61 +328,353 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
     ? suppliers?.data.map((s) => ({ value: s.id, label: s.name }))
     : [];
 
-  const { setValues: formikSetValues } = formik;
-
   useEffect(() => {
-    formikSetValues(formikInitialValues);
-  }, [formikSetValues, formikInitialValues]);
-
-  useEffect(() => {
-    formik.values.ekspedisi?.forEach((eks, idx) => {
-      if (eks.qty && eks.biaya_ekspedisi) {
-        const perItem = eks.biaya_ekspedisi / eks.qty;
+    formik.values.deliveries?.forEach((delivery, idx) => {
+      const productQty = delivery.products.reduce(
+        (sum, p) => sum + p.product_qty,
+        0
+      );
+      if (productQty && delivery.delivery_cost) {
+        const perItem = delivery.delivery_cost / productQty;
         formik.setFieldValue(
-          `ekspedisi.${idx}.biaya_ekspedisi_per_item`,
+          `deliveries.${idx}.delivery_cost_per_item`,
           perItem
         );
       }
     });
-  }, [formik.values.ekspedisi]);
+  }, [formik.values.deliveries]);
 
-  const getFilteredProductOptions = useCallback(() => {
+  useEffect(() => {
+    if (
+      formik.values.source_warehouse_id &&
+      type !== 'edit' &&
+      type !== 'detail'
+    ) {
+      formik.setFieldValue('products', []);
+      formik.setFieldValue('deliveries', []);
+    }
+  }, [formik.values.source_warehouse_id]);
+
+  // Effect to populate product labels from ProductWarehouse data
+  useEffect(() => {
+    if (!productWarehouses || !isResponseSuccess(productWarehouses)) return;
+    if (type !== 'edit' && type !== 'detail') return;
+
+    let hasUpdates = false;
+    const updatedProducts = formik.values.products?.map((product) => {
+      if (product.product && product.product.label.startsWith('Product ID:')) {
+        const productWarehouse = productWarehouses.data.find(
+          (pw) => pw.product.id === product.product_id
+        );
+        if (productWarehouse) {
+          hasUpdates = true;
+          return {
+            ...product,
+            product: {
+              value: productWarehouse.product.id,
+              label: productWarehouse.product.name,
+            },
+          };
+        }
+      }
+      return product;
+    });
+
+    if (hasUpdates && updatedProducts) {
+      formik.setFieldValue('products', updatedProducts);
+
+      const updatedDeliveries = formik.values.deliveries?.map((delivery) => {
+        const updatedDeliveryProducts = delivery.products.map(
+          (deliveryProduct) => {
+            if (
+              deliveryProduct.product &&
+              deliveryProduct.product.label.startsWith('Product ID:')
+            ) {
+              const productWarehouse = productWarehouses.data.find(
+                (pw) => pw.product.id === deliveryProduct.product_id
+              );
+              if (productWarehouse) {
+                return {
+                  ...deliveryProduct,
+                  product: {
+                    value: productWarehouse.product.id,
+                    label: productWarehouse.product.name,
+                  },
+                };
+              }
+            }
+            return deliveryProduct;
+          }
+        );
+        return {
+          ...delivery,
+          products: updatedDeliveryProducts,
+        };
+      });
+      formik.setFieldValue('deliveries', updatedDeliveries);
+    }
+  }, [productWarehouses, type]);
+
+  useEffect(() => {
+    if (type !== 'edit' && type !== 'detail') return;
+
+    const productIdsToFetch: number[] = [];
+
+    formik.values.products?.forEach((product) => {
+      if (
+        product.product &&
+        product.product.label.startsWith('Product ID:') &&
+        product.product_id > 0 &&
+        !fetchedProductIds.has(product.product_id)
+      ) {
+        productIdsToFetch.push(product.product_id);
+      }
+    });
+
+    formik.values.deliveries?.forEach((delivery) => {
+      delivery.products.forEach((deliveryProduct) => {
+        if (
+          deliveryProduct.product &&
+          deliveryProduct.product.label.startsWith('Product ID:') &&
+          deliveryProduct.product_id > 0 &&
+          !fetchedProductIds.has(deliveryProduct.product_id)
+        ) {
+          if (!productIdsToFetch.includes(deliveryProduct.product_id)) {
+            productIdsToFetch.push(deliveryProduct.product_id);
+          }
+        }
+      });
+    });
+
+    if (productIdsToFetch.length === 0) return;
+
+    const fetchProducts = async () => {
+      const productMap = new Map<number, { id: number; name: string }>();
+      const newFetchedIds = new Set(fetchedProductIds);
+
+      for (const productId of productIdsToFetch) {
+        try {
+          const response = await ProductApi.getSingle(productId);
+          if (isResponseSuccess(response)) {
+            const product = response.data;
+            productMap.set(product.id, { id: product.id, name: product.name });
+            newFetchedIds.add(productId);
+          }
+        } catch (error) {
+          console.error(`Failed to fetch product ${productId}:`, error);
+          newFetchedIds.add(productId);
+        }
+      }
+
+      if (productMap.size > 0) {
+        const updatedProducts = formik.values.products?.map((p) => {
+          const productData = productMap.get(p.product_id);
+          if (productData) {
+            return {
+              ...p,
+              product: {
+                value: productData.id,
+                label: productData.name,
+              },
+            };
+          }
+          return p;
+        });
+
+        const updatedDeliveries = formik.values.deliveries?.map((delivery) => {
+          const updatedDeliveryProducts = delivery.products.map(
+            (deliveryProduct) => {
+              const productData = productMap.get(deliveryProduct.product_id);
+              if (productData) {
+                return {
+                  ...deliveryProduct,
+                  product: {
+                    value: productData.id,
+                    label: productData.name,
+                  },
+                };
+              }
+              return deliveryProduct;
+            }
+          );
+          return {
+            ...delivery,
+            products: updatedDeliveryProducts,
+          };
+        });
+
+        if (updatedProducts) {
+          formik.setFieldValue('products', updatedProducts);
+        }
+        if (updatedDeliveries) {
+          formik.setFieldValue('deliveries', updatedDeliveries);
+        }
+      }
+
+      setFetchedProductIds(newFetchedIds);
+    };
+
+    fetchProducts();
+  }, [
+    formik.values.products,
+    formik.values.deliveries,
+    type,
+    fetchedProductIds,
+  ]);
+
+  const getFilteredProductWarehouseOptions = useCallback(() => {
     return (
-      formik.values.product
+      formik.values.products
         ?.filter((p) => p.product)
         .map((p) => ({
           value: p.product_id,
           label: (p.product as OptionType)?.label,
         })) ?? []
     );
-  }, [formik.values.product]);
+  }, [formik.values.products]);
 
-  const validateEkspedisiQty = (ekspedisiIdx: number, qty: number) => {
-    const productId = formik.values.ekspedisi?.[ekspedisiIdx]?.product_id;
-    if (!productId) return true;
-    const relatedProduct = formik.values.product?.find(
-      (p) => p.product_id === productId
+  const getAvailableStock = useCallback(
+    (productId: number) => {
+      if (type === 'detail') return 0;
+      const productWarehouse = productWarehouseOptions.find(
+        (pw) => pw.product_id === productId
+      );
+      return productWarehouse?.quantity ?? 0;
+    },
+    [productWarehouseOptions, type]
+  );
+
+  const getProductQtyError = useCallback(
+    (productIdx: number) => {
+      if (type === 'detail') return null;
+      const product = formik.values.products?.[productIdx];
+      if (!product || !product.product_id) return null;
+
+      const availableStock = getAvailableStock(product.product_id);
+      const requestedQty = Number(product.product_qty) || 0;
+
+      if (requestedQty > availableStock) {
+        return `Qty melebihi stok tersedia! Maksimal: ${availableStock.toLocaleString('id-ID')}`;
+      }
+
+      return null;
+    },
+    [formik.values.products, getAvailableStock, type]
+  );
+
+  const validateDeliveryQty = useCallback(
+    (deliveryIdx: number, deliveryProductIdx: number, qty: number) => {
+      if (type === 'detail') return true;
+      const delivery = formik.values.deliveries?.[deliveryIdx];
+      if (!delivery) return true;
+
+      const deliveryProduct = delivery.products[deliveryProductIdx];
+      if (!deliveryProduct) return true;
+
+      const productId = deliveryProduct.product_id;
+      if (!productId) return true;
+
+      const relatedProduct = formik.values.products?.find(
+        (p) => p.product_id === productId
+      );
+      if (!relatedProduct) return true;
+
+      const totalQtyUsed =
+        formik.values.deliveries?.reduce((total, d, dIdx) => {
+          const productQty = d.products.reduce((sum, p, pIdx) => {
+            if (
+              p.product_id === productId &&
+              !(dIdx === deliveryIdx && pIdx === deliveryProductIdx)
+            ) {
+              return sum + (Number(p.product_qty) || 0);
+            }
+            return sum;
+          }, 0);
+          return total + productQty;
+        }, 0) || 0;
+
+      return totalQtyUsed + qty <= Number(relatedProduct.product_qty);
+    },
+    [formik.values.deliveries, formik.values.products, type]
+  );
+
+  const getDeliveryQtyError = useCallback(
+    (deliveryIdx: number, deliveryProductIdx: number) => {
+      if (type === 'detail') return null;
+      const delivery = formik.values.deliveries?.[deliveryIdx];
+      if (!delivery) return null;
+
+      const deliveryProduct = delivery.products[deliveryProductIdx];
+      if (!deliveryProduct || !deliveryProduct.product_id) return null;
+
+      const qty = Number(deliveryProduct.product_qty) || 0;
+      const productId = deliveryProduct.product_id;
+
+      const relatedProduct = formik.values.products?.find(
+        (p) => p.product_id === productId
+      );
+      if (!relatedProduct) return null;
+
+      const totalQtyUsed =
+        formik.values.deliveries?.reduce((total, d, dIdx) => {
+          const productQty = d.products.reduce((sum, p, pIdx) => {
+            if (
+              p.product_id === productId &&
+              !(dIdx === deliveryIdx && pIdx === deliveryProductIdx)
+            ) {
+              return sum + (Number(p.product_qty) || 0);
+            }
+            return sum;
+          }, 0);
+          return total + productQty;
+        }, 0) || 0;
+
+      const availableQty = Number(relatedProduct.product_qty) - totalQtyUsed;
+
+      if (totalQtyUsed + qty > Number(relatedProduct.product_qty)) {
+        return `Qty melebihi stok produk! Tersedia: ${availableQty}, Total digunakan: ${totalQtyUsed + qty}`;
+      }
+
+      return null;
+    },
+    [formik.values.deliveries, formik.values.products, type]
+  );
+
+  const invalidQtyRows = useMemo(
+    () =>
+      type === 'detail'
+        ? []
+        : (formik.values.deliveries?.flatMap((delivery, deliveryIdx) =>
+            delivery.products.map((product, productIdx) => {
+              const qty = Number(product.product_qty) || 0;
+              return !validateDeliveryQty(deliveryIdx, productIdx, qty);
+            })
+          ) ?? []),
+    [
+      formik.values.deliveries,
+      formik.values.products,
+      validateDeliveryQty,
+      type,
+    ]
+  );
+
+  const hasInvalidQty = useMemo(
+    () => (type === 'detail' ? false : invalidQtyRows.some(Boolean)),
+    [invalidQtyRows, type]
+  );
+
+  const hasExceededStock = useMemo(() => {
+    if (type === 'detail') return false;
+    return (
+      formik.values.products?.some((product, idx) => {
+        return getProductQtyError(idx) !== null;
+      }) ?? false
     );
-    if (!relatedProduct) return true;
-    const totalQtyUsed =
-      formik.values.ekspedisi?.reduce((total, eks, i) => {
-        if (eks.product_id === productId && i !== ekspedisiIdx) {
-          return total + (Number(eks.qty) || 0);
-        }
-        return total;
-      }, 0) || 0;
-    return totalQtyUsed + qty <= Number(relatedProduct.qty_product);
-  };
-
-  const invalidQtyRows =
-    formik.values.ekspedisi?.map((eks, idx) => {
-      const qty = Number(eks.qty) || 0;
-      return !validateEkspedisiQty(idx, qty);
-    }) ?? [];
+  }, [formik.values.products, getProductQtyError, type]);
 
   return (
     <>
-      <section className='w-full max-w-5xl'>
+      <section className='w-full'>
         <FormHeader
           type={type}
           title='Movement'
@@ -339,34 +688,34 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
           {/* Top card - Movement details */}
           <div className='card bg-base-100 shadow mb-4'>
             <div className='card-body'>
-              <div className='flex gap-4'>
+              <div className='grid grid-cols-1 md:grid-cols-2 gap-4'>
                 <TextInput
                   required
                   label='Alasan Transfer'
-                  name='alasan_transfer'
-                  value={formik.values.alasan_transfer}
+                  name='transfer_reason'
+                  value={formik.values.transfer_reason}
                   onChange={formik.handleChange}
                   onBlur={formik.handleBlur}
                   isError={
-                    formik.touched.alasan_transfer &&
-                    Boolean(formik.errors.alasan_transfer)
+                    formik.touched.transfer_reason &&
+                    Boolean(formik.errors.transfer_reason)
                   }
-                  errorMessage={formik.errors.alasan_transfer}
+                  errorMessage={formik.errors.transfer_reason}
                   readOnly={type === 'detail'}
                 />
                 <TextInput
                   required
                   label='Tanggal Transfer'
                   type='date'
-                  name='tanggal_transfer'
-                  value={formik.values.tanggal_transfer}
+                  name='transfer_date'
+                  value={formik.values.transfer_date}
                   onChange={formik.handleChange}
                   onBlur={formik.handleBlur}
                   isError={
-                    formik.touched.tanggal_transfer &&
-                    Boolean(formik.errors.tanggal_transfer)
+                    formik.touched.transfer_date &&
+                    Boolean(formik.errors.transfer_date)
                   }
-                  errorMessage={formik.errors.tanggal_transfer}
+                  errorMessage={formik.errors.transfer_date}
                   readOnly={type === 'detail'}
                 />
               </div>
@@ -374,18 +723,18 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
           </div>
 
           {/* Warehouse cards */}
-          <div className='grid grid-cols-2 gap-4 mb-4'>
+          <div className='grid grid-cols-1 md:grid-cols-2 gap-4 mb-4'>
             <div className='card bg-base-100 shadow'>
               <div className='card-body space-y-4'>
                 <h3 className='card-title text-lg'>Gudang Asal</h3>
                 <SelectInput
                   required
                   label='Gudang'
-                  value={formik.values.warehouse_asal ?? undefined}
+                  value={formik.values.source_warehouse}
                   onChange={(val) => {
-                    formik.setFieldValue('warehouse_asal', val);
+                    formik.setFieldValue('source_warehouse', val);
                     formik.setFieldValue(
-                      'warehouse_asal_id',
+                      'source_warehouse_id',
                       (val as WarehouseOptionType)?.value
                     );
                   }}
@@ -393,10 +742,10 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
                   onInputChange={setWarehouseSelectInputValue}
                   isLoading={isLoadingWarehouses}
                   isError={
-                    formik.touched.warehouse_asal_id &&
-                    Boolean(formik.errors.warehouse_asal_id)
+                    formik.touched.source_warehouse_id &&
+                    Boolean(formik.errors.source_warehouse_id)
                   }
-                  errorMessage={formik.errors.warehouse_asal_id as string}
+                  errorMessage={formik.errors.source_warehouse_id as string}
                   isDisabled={type === 'detail'}
                   isClearable
                 />
@@ -405,9 +754,9 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
                 <div className='space-y-4'>
                   <TextInput
                     label='Area'
-                    name='warehouse_asal_area'
+                    name='source_warehouse_area'
                     value={
-                      (formik.values.warehouse_asal as WarehouseOptionType)
+                      (formik.values.source_warehouse as WarehouseOptionType)
                         ?.area || '-'
                     }
                     readOnly
@@ -418,9 +767,9 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
                   />
                   <TextInput
                     label='Lokasi'
-                    name='warehouse_asal_location'
+                    name='source_warehouse_location'
                     value={
-                      (formik.values.warehouse_asal as WarehouseOptionType)
+                      (formik.values.source_warehouse as WarehouseOptionType)
                         ?.location || '-'
                     }
                     readOnly
@@ -439,11 +788,11 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
                 <SelectInput
                   required
                   label='Gudang'
-                  value={formik.values.warehouse_tujuan ?? undefined}
+                  value={formik.values.destination_warehouse}
                   onChange={(val) => {
-                    formik.setFieldValue('warehouse_tujuan', val);
+                    formik.setFieldValue('destination_warehouse', val);
                     formik.setFieldValue(
-                      'warehouse_tujuan_id',
+                      'destination_warehouse_id',
                       (val as WarehouseOptionType)?.value
                     );
                   }}
@@ -451,10 +800,12 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
                   onInputChange={setWarehouseSelectInputValue}
                   isLoading={isLoadingWarehouses}
                   isError={
-                    formik.touched.warehouse_tujuan_id &&
-                    Boolean(formik.errors.warehouse_tujuan_id)
+                    formik.touched.destination_warehouse_id &&
+                    Boolean(formik.errors.destination_warehouse_id)
+                  }
+                  errorMessage={
+                    formik.errors.destination_warehouse_id as string
                   }
-                  errorMessage={formik.errors.warehouse_tujuan_id as string}
                   isDisabled={type === 'detail'}
                   isClearable
                 />
@@ -463,10 +814,12 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
                 <div className='space-y-4'>
                   <TextInput
                     label='Area'
-                    name='warehouse_tujuan_area'
+                    name='destination_warehouse_area'
                     value={
-                      (formik.values.warehouse_tujuan as WarehouseOptionType)
-                        ?.area || '-'
+                      (
+                        formik.values
+                          .destination_warehouse as WarehouseOptionType
+                      )?.area || '-'
                     }
                     readOnly
                     disabled
@@ -476,10 +829,12 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
                   />
                   <TextInput
                     label='Lokasi'
-                    name='warehouse_tujuan_location'
+                    name='destination_warehouse_location'
                     value={
-                      (formik.values.warehouse_tujuan as WarehouseOptionType)
-                        ?.location || '-'
+                      (
+                        formik.values
+                          .destination_warehouse as WarehouseOptionType
+                      )?.location || '-'
                     }
                     readOnly
                     disabled
@@ -506,15 +861,16 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
                             type='checkbox'
                             className='checkbox'
                             checked={
-                              formik.values.product?.length ===
+                              formik.values.products?.length ===
                                 selectedProducts.length &&
-                              formik.values.product?.length > 0
+                              formik.values.products?.length > 0
                             }
                             onChange={(e) => {
                               if (e.target.checked) {
                                 setSelectedProducts(
-                                  formik.values.product?.map((_, idx) => idx) ??
-                                    []
+                                  formik.values.products?.map(
+                                    (_, idx) => idx
+                                  ) ?? []
                                 );
                               } else {
                                 setSelectedProducts([]);
@@ -529,7 +885,7 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
                     </tr>
                   </thead>
                   <tbody>
-                    {formik.values.product?.map((product, idx) => (
+                    {formik.values.products?.map((product, idx) => (
                       <tr key={`product-row-${idx}-${product.product_id}`}>
                         {type !== 'detail' && (
                           <td>
@@ -558,44 +914,75 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
                             value={product.product ?? undefined}
                             onChange={(val) => {
                               formik.setFieldValue(
-                                `product.${idx}.product`,
+                                `products.${idx}.product`,
                                 val
                               );
                               formik.setFieldValue(
-                                `product.${idx}.product_id`,
+                                `products.${idx}.product_id`,
                                 (val as OptionType)?.value
                               );
                             }}
-                            options={productOptions}
-                            onInputChange={setProductSelectInputValue}
-                            isLoading={isLoadingProducts}
-                            isDisabled={type === 'detail'}
+                            options={productWarehouseOptions}
+                            onInputChange={setProductWarehouseSelectInputValue}
+                            isLoading={isLoadingProductWarehouses}
+                            isDisabled={
+                              type === 'detail' ||
+                              !formik.values.source_warehouse_id
+                            }
+                            placeholder={
+                              !formik.values.source_warehouse_id
+                                ? 'Pilih gudang asal terlebih dahulu'
+                                : 'Pilih produk'
+                            }
                             isClearable
-                            isError={isRepeaterInputError(
-                              'product',
+                            {...isRepeaterInputError(
+                              'products',
                               'product',
                               idx
                             )}
                           />
                         </td>
                         <td>
-                          <TextInput
-                            required
-                            type='number'
-                            name={`product.${idx}.qty_product`}
-                            value={product.qty_product ?? ''}
-                            onChange={formik.handleChange}
-                            onBlur={formik.handleBlur}
-                            isError={isRepeaterInputError(
-                              'product',
-                              'qty_product',
-                              idx
+                          <div className='flex flex-col gap-2'>
+                            <TextInput
+                              required
+                              type='number'
+                              name={`products.${idx}.product_qty`}
+                              value={product.product_qty ?? ''}
+                              onChange={formik.handleChange}
+                              onBlur={formik.handleBlur}
+                              isError={
+                                isRepeaterInputError(
+                                  'products',
+                                  'product_qty',
+                                  idx
+                                ).isError || Boolean(getProductQtyError(idx))
+                              }
+                              errorMessage={
+                                isRepeaterInputError(
+                                  'products',
+                                  'product_qty',
+                                  idx
+                                ).errorMessage ||
+                                getProductQtyError(idx) ||
+                                undefined
+                              }
+                              readOnly={type === 'detail'}
+                              className={{
+                                wrapper: 'w-full min-w-24',
+                              }}
+                            />
+                            {type !== 'detail' && product.product_id && (
+                              <div className='text-sm text-gray-600'>
+                                <span className='font-semibold'>
+                                  Stok tersedia:
+                                </span>{' '}
+                                {getAvailableStock(
+                                  product.product_id
+                                ).toLocaleString('id-ID')}
+                              </div>
                             )}
-                            readOnly={type === 'detail'}
-                            className={{
-                              wrapper: 'w-full min-w-24',
-                            }}
-                          />
+                          </div>
                         </td>
                         {type !== 'detail' && (
                           <td>
@@ -648,10 +1035,10 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
             </div>
           </div>
 
-          {/* Ekspedisi table */}
+          {/* Deliveries table */}
           <div className='card bg-base-100 shadow mb-4'>
             <div className='card-body'>
-              <h2 className='card-title mb-4'>Ekspedisi</h2>
+              <h2 className='card-title mb-4'>Pengiriman</h2>
               <div className='overflow-x-auto'>
                 <table className='table'>
                   <thead>
@@ -662,19 +1049,19 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
                             type='checkbox'
                             className='checkbox'
                             checked={
-                              formik.values.ekspedisi?.length ===
-                                selectedEkspedisi.length &&
-                              formik.values.ekspedisi?.length > 0
+                              formik.values.deliveries?.length ===
+                                selectedDeliveries.length &&
+                              formik.values.deliveries?.length > 0
                             }
                             onChange={(e) => {
                               if (e.target.checked) {
-                                setSelectedEkspedisi(
-                                  formik.values.ekspedisi?.map(
+                                setSelectedDeliveries(
+                                  formik.values.deliveries?.map(
                                     (_, idx) => idx
                                   ) ?? []
                                 );
                               } else {
-                                setSelectedEkspedisi([]);
+                                setSelectedDeliveries([]);
                               }
                             }}
                           />
@@ -684,34 +1071,31 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
                       <th>Qty</th>
                       <th>Supplier</th>
                       <th>Plat Nomor</th>
-                      <th>No Surat Jalan</th>
                       <th>Dokumen</th>
-                      <th>Biaya Ekspedisi (Rp.)</th>
-                      <th>Biaya Ekspedisi / Item (Rp.)</th>
+                      <th>Biaya Pengiriman (Rp.)</th>
+                      <th>Biaya Per Item (Rp.)</th>
                       <th>Nama Sopir</th>
                       {type !== 'detail' && <th>Aksi</th>}
                     </tr>
                   </thead>
                   <tbody>
-                    {formik.values.ekspedisi?.map((ekspedisi, idx) => (
-                      <tr
-                        key={`ekspedisi-row-${idx}-${ekspedisi.product_id}-${ekspedisi.supplier_id}`}
-                      >
+                    {formik.values.deliveries?.map((delivery, idx) => (
+                      <tr key={`delivery-row-${idx}`}>
                         {type !== 'detail' && (
                           <td>
                             <input
                               type='checkbox'
                               className='checkbox'
-                              checked={selectedEkspedisi.includes(idx)}
+                              checked={selectedDeliveries.includes(idx)}
                               onChange={(e) => {
                                 if (e.target.checked) {
-                                  setSelectedEkspedisi([
-                                    ...selectedEkspedisi,
+                                  setSelectedDeliveries([
+                                    ...selectedDeliveries,
                                     idx,
                                   ]);
                                 } else {
-                                  setSelectedEkspedisi(
-                                    selectedEkspedisi.filter((i) => i !== idx)
+                                  setSelectedDeliveries(
+                                    selectedDeliveries.filter((i) => i !== idx)
                                   );
                                 }
                               }}
@@ -721,37 +1105,40 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
                         <td>
                           <SelectInput
                             required
-                            value={ekspedisi.product ?? undefined}
+                            value={delivery.products[0]?.product ?? undefined}
                             onChange={(val) => {
                               formik.setFieldValue(
-                                `ekspedisi.${idx}.product`,
+                                `deliveries.${idx}.products.0.product`,
                                 val
                               );
                               formik.setFieldValue(
-                                `ekspedisi.${idx}.product_id`,
+                                `deliveries.${idx}.products.0.product_id`,
                                 (val as OptionType)?.value
                               );
-                              formik.setFieldValue(`ekspedisi.${idx}.qty`, '');
                             }}
-                            options={getFilteredProductOptions()}
+                            options={getFilteredProductWarehouseOptions()}
                             isDisabled={type === 'detail'}
                             isClearable
-                            isError={isRepeaterInputError(
-                              'ekspedisi',
-                              'product',
-                              idx
-                            )}
                           />
                         </td>
                         <td>
                           <TextInput
                             required
                             type='number'
-                            name={`ekspedisi.${idx}.qty`}
-                            value={ekspedisi.qty ?? ''}
+                            name={`deliveries.${idx}.products.0.product_qty`}
+                            value={delivery.products[0]?.product_qty ?? ''}
                             onChange={formik.handleChange}
                             onBlur={formik.handleBlur}
-                            {...getEkspedisiFieldError(formik, idx, 'qty')}
+                            isError={
+                              isDeliveryProductInputError(idx, 0, 'product_qty')
+                                .isError || Boolean(getDeliveryQtyError(idx, 0))
+                            }
+                            errorMessage={
+                              isDeliveryProductInputError(idx, 0, 'product_qty')
+                                .errorMessage ||
+                              getDeliveryQtyError(idx, 0) ||
+                              undefined
+                            }
                             readOnly={type === 'detail'}
                             className={{
                               wrapper: 'w-full min-w-24',
@@ -761,14 +1148,14 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
                         <td>
                           <SelectInput
                             required
-                            value={ekspedisi.supplier ?? undefined}
+                            value={delivery.supplier}
                             onChange={(val) => {
                               formik.setFieldValue(
-                                `ekspedisi.${idx}.supplier`,
+                                `deliveries.${idx}.supplier`,
                                 val
                               );
                               formik.setFieldValue(
-                                `ekspedisi.${idx}.supplier_id`,
+                                `deliveries.${idx}.supplier_id`,
                                 (val as OptionType)?.value
                               );
                             }}
@@ -777,128 +1164,74 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
                             isLoading={isLoadingSuppliers}
                             isDisabled={type === 'detail'}
                             isClearable
-                            isError={isRepeaterInputError(
-                              'ekspedisi',
-                              'supplier',
+                          />
+                        </td>
+                        <td>
+                          <TextInput
+                            required
+                            name={`deliveries.${idx}.vehicle_plate`}
+                            value={delivery.vehicle_plate}
+                            onChange={formik.handleChange}
+                            onBlur={formik.handleBlur}
+                            {...isRepeaterInputError(
+                              'deliveries',
+                              'vehicle_plate',
                               idx
                             )}
-                          />
-                        </td>
-                        <td>
-                          <TextInput
-                            required
-                            name={`ekspedisi.${idx}.plat_nomor`}
-                            value={ekspedisi.plat_nomor ?? ''}
-                            onChange={formik.handleChange}
-                            onBlur={formik.handleBlur}
-                            {...getEkspedisiFieldError(
-                              formik,
-                              idx,
-                              'plat_nomor'
-                            )}
                             readOnly={type === 'detail'}
-                            className={{
-                              wrapper: 'w-full min-w-24',
-                            }}
-                          />
-                        </td>
-                        <td>
-                          <TextInput
-                            required
-                            name={`ekspedisi.${idx}.no_surat_jalan`}
-                            value={ekspedisi.no_surat_jalan ?? ''}
-                            onChange={formik.handleChange}
-                            onBlur={formik.handleBlur}
-                            {...getEkspedisiFieldError(
-                              formik,
-                              idx,
-                              'no_surat_jalan'
-                            )}
-                            readOnly={type === 'detail'}
-                            className={{
-                              wrapper: 'w-full min-w-24',
-                            }}
                           />
                         </td>
                         <td>
                           <FileInput
-                            required
-                            name={`ekspedisi.${idx}.dokumen`}
+                            name={`deliveries.${idx}.document`}
                             onChange={(e) => {
                               const file = e.target.files?.[0];
                               if (file) {
-                                const allowedTypes = [
-                                  'application/pdf',
-                                  'image/jpeg',
-                                  'image/jpg',
-                                ];
-                                if (!allowedTypes.includes(file.type)) {
-                                  toast.error(
-                                    'Mohon upload file berformat PDF atau JPEG/JPG.'
-                                  );
-                                  return;
-                                }
                                 if (file.size > 2 * 1024 * 1024) {
                                   toast.error('Ukuran dokumen maksimal 2 MB!');
                                   return;
                                 }
                                 formik.setFieldValue(
-                                  `ekspedisi.${idx}.dokumen`,
+                                  `deliveries.${idx}.document`,
                                   file
                                 );
                               }
                             }}
-                            isError={isRepeaterInputError(
-                              'ekspedisi',
-                              'dokumen',
+                            {...isRepeaterInputError(
+                              'deliveries',
+                              'document',
                               idx
                             )}
                             readOnly={type === 'detail'}
-                            className={{
-                              wrapper: 'w-full min-w-24',
-                            }}
                           />
                         </td>
                         <td>
                           <TextInput
                             required
                             type='number'
-                            name={`ekspedisi.${idx}.biaya_ekspedisi`}
-                            value={ekspedisi.biaya_ekspedisi ?? ''}
+                            name={`deliveries.${idx}.delivery_cost`}
+                            value={delivery.delivery_cost}
                             onChange={formik.handleChange}
                             onBlur={formik.handleBlur}
-                            {...getEkspedisiFieldError(
-                              formik,
-                              idx,
-                              'biaya_ekspedisi'
+                            {...isRepeaterInputError(
+                              'deliveries',
+                              'delivery_cost',
+                              idx
                             )}
                             readOnly={type === 'detail'}
-                            className={{
-                              wrapper: 'w-full min-w-24',
-                            }}
                           />
                         </td>
                         <td>
                           <TextInput
                             disabled
-                            onChange={formik.handleChange}
-                            onBlur={formik.handleBlur}
-                            {...getEkspedisiFieldError(
-                              formik,
-                              idx,
-                              'biaya_ekspedisi_per_item'
-                            )}
-                            name={`ekspedisi.${idx}.biaya_ekspedisi_per_item`}
+                            name={`deliveries.${idx}.delivery_cost_per_item`}
                             value={
-                              ekspedisi.qty && ekspedisi.biaya_ekspedisi
-                                ? (
-                                    ekspedisi.biaya_ekspedisi / ekspedisi.qty
-                                  ).toLocaleString('id-ID')
-                                : '0'
+                              delivery.delivery_cost_per_item?.toLocaleString(
+                                'id-ID'
+                              ) ?? '0'
                             }
                             readOnly
                             className={{
-                              wrapper: 'w-full min-w-24',
                               input: 'bg-base-200',
                             }}
                           />
@@ -906,19 +1239,16 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
                         <td>
                           <TextInput
                             required
-                            name={`ekspedisi.${idx}.nama_sopir`}
-                            value={ekspedisi.nama_sopir ?? ''}
+                            name={`deliveries.${idx}.driver_name`}
+                            value={delivery.driver_name}
                             onChange={formik.handleChange}
                             onBlur={formik.handleBlur}
-                            {...getEkspedisiFieldError(
-                              formik,
-                              idx,
-                              'nama_sopir'
+                            {...isRepeaterInputError(
+                              'deliveries',
+                              'driver_name',
+                              idx
                             )}
                             readOnly={type === 'detail'}
-                            className={{
-                              wrapper: 'w-full min-w-24',
-                            }}
                           />
                         </td>
                         {type !== 'detail' && (
@@ -926,7 +1256,7 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
                             <Button
                               type='button'
                               color='error'
-                              onClick={() => removeEkspedisi(idx)}
+                              onClick={() => removeDelivery(idx)}
                             >
                               <Icon
                                 icon='material-symbols:delete-outline-rounded'
@@ -943,12 +1273,11 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
               </div>
               {type !== 'detail' && (
                 <div className='flex justify-center items-center mt-4 gap-4'>
-                  {selectedEkspedisi.length > 0 && (
+                  {selectedDeliveries.length > 0 && (
                     <Button
                       type='button'
                       color='error'
-                      onClick={bulkRemoveEkspedisi}
-                      disabled={selectedEkspedisi.length === 0}
+                      onClick={bulkRemoveDelivery}
                       className='w-fit'
                     >
                       <Icon
@@ -956,17 +1285,17 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
                         width={24}
                         height={24}
                       />
-                      Hapus Ekspedisi Terpilih ({selectedEkspedisi.length})
+                      Hapus Pengiriman Terpilih ({selectedDeliveries.length})
                     </Button>
                   )}
                   <Button
                     type='button'
                     color='success'
-                    onClick={addEkspedisi}
+                    onClick={addDelivery}
                     className='w-fit'
                   >
                     <Icon icon='ic:round-plus' width={24} height={24} />
-                    Tambah Ekspedisi
+                    Tambah Pengiriman
                   </Button>
                 </div>
               )}
@@ -983,7 +1312,7 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
                 : undefined
             }
             onDelete={deleteMovementClickHandler}
-            disableSubmit={invalidQtyRows.some(Boolean)}
+            disableSubmit={hasInvalidQty || hasExceededStock}
           />
 
           {movementFormErrorMessage && (
diff --git a/src/components/pages/inventory/movement/form/useMovementFormHandlers.ts b/src/components/pages/inventory/movement/form/useMovementFormHandlers.ts
index 0b6b0962..0ad31e38 100644
--- a/src/components/pages/inventory/movement/form/useMovementFormHandlers.ts
+++ b/src/components/pages/inventory/movement/form/useMovementFormHandlers.ts
@@ -8,7 +8,6 @@ import {
   UpdateMovementPayload,
 } from '@/types/api/inventory/movement';
 import { isResponseError } from '@/lib/api-helper';
-import { containsFile, toFormData } from '@/lib/form-data';
 
 export const useMovementFormHandlers = (initialValuesId?: number) => {
   const router = useRouter();
@@ -17,12 +16,16 @@ export const useMovementFormHandlers = (initialValuesId?: number) => {
   const [isDeleteLoading, setIsDeleteLoading] = useState(false);
 
   const createMovementHandler = useCallback(
-    async (payload: CreateMovementPayload) => {
-      const finalPayload = containsFile(payload)
-        ? (toFormData(payload) as unknown as CreateMovementPayload)
-        : payload;
+    async (payload: CreateMovementPayload, documents: File[] = []) => {
+      const formData = new FormData();
+      formData.append('data', JSON.stringify(payload));
+      documents.forEach((file, index) => {
+        formData.append(`documents[${index}]`, file);
+      });
 
-      const res = await MovementApi.create(finalPayload);
+      const res = await MovementApi.create(
+        formData as unknown as CreateMovementPayload
+      );
       if (isResponseError(res)) {
         setMovementFormErrorMessage(res.message);
         return;
@@ -34,10 +37,24 @@ export const useMovementFormHandlers = (initialValuesId?: number) => {
   );
 
   const updateMovementHandler = useCallback(
-    async (movementId: number, payload: UpdateMovementPayload) => {
-      const finalPayload = containsFile(payload)
-        ? (toFormData(payload) as unknown as UpdateMovementPayload)
-        : payload;
+    async (
+      movementId: number,
+      payload: UpdateMovementPayload,
+      documents: File[] = []
+    ) => {
+      let finalPayload: UpdateMovementPayload | FormData;
+
+      if (documents.length > 0) {
+        const formData = new FormData();
+        formData.append('data', JSON.stringify(payload));
+        documents.forEach((file, index) => {
+          formData.append(`documents[${index}]`, file);
+        });
+
+        finalPayload = formData as unknown as UpdateMovementPayload;
+      } else {
+        finalPayload = payload;
+      }
 
       const res = await MovementApi.update(movementId, finalPayload);
       if (res?.status === 'error') {
diff --git a/src/components/table/TableRowOptions.tsx b/src/components/table/TableRowOptions.tsx
index 61332b4f..4e2e2c93 100644
--- a/src/components/table/TableRowOptions.tsx
+++ b/src/components/table/TableRowOptions.tsx
@@ -7,6 +7,9 @@ interface TableRowOptionsProps {
   recordId: string | number;
   basePath: string;
   onDelete?: () => void;
+  queryParam?: string;
+  showEdit?: boolean;
+  showDelete?: boolean;
 }
 
 export const TableRowOptions = ({
@@ -14,6 +17,9 @@ export const TableRowOptions = ({
   recordId,
   basePath,
   onDelete,
+  queryParam = 'id',
+  showEdit = true,
+  showDelete = true,
 }: TableRowOptionsProps) => (
   <div
     tabIndex={type === 'dropdown' ? 0 : undefined}
@@ -26,7 +32,7 @@ export const TableRowOptions = ({
     )}
   >
     <Button
-      href={`${basePath}/detail/?id=${recordId}`}
+      href={`${basePath}/detail/?${queryParam}=${recordId}`}
       variant='ghost'
       color='primary'
       className='justify-start text-sm'
@@ -34,16 +40,18 @@ export const TableRowOptions = ({
       <Icon icon='mdi:eye-outline' width={16} height={16} />
       Detail
     </Button>
-    <Button
-      href={`${basePath}/detail/edit/?id=${recordId}`}
-      variant='ghost'
-      color='warning'
-      className='justify-start text-sm'
-    >
-      <Icon icon='material-symbols:edit-outline' width={16} height={16} />
-      Edit
-    </Button>
-    {onDelete && (
+    {showEdit && (
+      <Button
+        href={`${basePath}/detail/edit/?${queryParam}=${recordId}`}
+        variant='ghost'
+        color='warning'
+        className='justify-start text-sm'
+      >
+        <Icon icon='mdi:pencil-outline' width={16} height={16} />
+        Edit
+      </Button>
+    )}
+    {showDelete && onDelete && (
       <Button
         onClick={onDelete}
         variant='ghost'
@@ -51,9 +59,10 @@ export const TableRowOptions = ({
         className='text-error hover:text-inherit justify-start text-sm'
       >
         <Icon
-          icon='material-symbols:delete-outline-rounded'
+          icon='mdi:delete-outline'
           width={16}
           height={16}
+          className='justify-start text-sm'
         />
         Delete
       </Button>
diff --git a/src/config/constant.ts b/src/config/constant.ts
index b9f32344..668d7209 100644
--- a/src/config/constant.ts
+++ b/src/config/constant.ts
@@ -125,18 +125,6 @@ export const MAIN_DRAWER_LINKS: MAIN_DRAWER_MENU[] = [
       },
     ],
   },
-  {
-    title: 'Persediaan',
-    link: '/inventory',
-    icon: 'material-symbols:box-outline-rounded',
-    submenu: [
-      {
-        title: 'Penyesuaian Persediaan',
-        link: '/inventory/adjustment',
-        icon: 'material-symbols:box-edit-outline-rounded',
-      }
-    ]
-  },
 ] as const;
 
 export const ROWS_OPTIONS = [
diff --git a/src/services/api/inventory.ts b/src/services/api/inventory.ts
index 8c502972..ec58f6f2 100644
--- a/src/services/api/inventory.ts
+++ b/src/services/api/inventory.ts
@@ -1,4 +1,9 @@
 import { BaseApiService } from '@/services/api/base';
+import {
+  CreateProductWarehousePayload,
+  ProductWarehouse,
+  UpdateProductWarehousePayload,
+} from '@/types/api/inventory/product-warehouse';
 import {
   CreateMovementPayload,
   Movement,
@@ -7,17 +12,22 @@ import {
 import {
   CreateInventoryAdjustmentPayload,
   InventoryAdjustment,
-  UpdateInventoryAdjustmentPayload,
 } from '@/types/api/inventory/adjustment';
 
+export const ProductWarehouseApi = new BaseApiService<
+  ProductWarehouse,
+  CreateProductWarehousePayload,
+  UpdateProductWarehousePayload
+>('/inventory/product-warehouses');
+
 export const MovementApi = new BaseApiService<
   Movement,
   CreateMovementPayload,
   UpdateMovementPayload
->('/inventory/movements');
+>('/inventory/transfers');
 
 export const inventoryAdjustmentApi = new BaseApiService<
   InventoryAdjustment,
   CreateInventoryAdjustmentPayload,
-  UpdateInventoryAdjustmentPayload
+  unknown
 >('/inventory/adjustments');
diff --git a/src/services/http/client.ts b/src/services/http/client.ts
index adba75e9..9dd382ca 100644
--- a/src/services/http/client.ts
+++ b/src/services/http/client.ts
@@ -14,6 +14,9 @@ export async function httpClient<T, B = unknown>(
     (!opts.auth && opts.auth !== 'none' && opts.auth !== 'bearer');
   const isBearerAuth = opts.auth === 'bearer' && !!opts.token;
 
+  const isFormData =
+    typeof FormData !== 'undefined' && opts.body instanceof FormData;
+
   const config: AxiosRequestConfig = {
     url: path,
     method: opts.method ?? 'GET',
@@ -22,7 +25,7 @@ export async function httpClient<T, B = unknown>(
     timeout: opts.timeoutMs ?? 10_000,
     withCredentials: isCookieAuth && !isBearerAuth,
     headers: {
-      'Content-Type': 'application/json',
+      ...(isFormData ? {} : { 'Content-Type': 'application/json' }),
       ...(opts.headers ?? {}),
       ...(isBearerAuth && !isCookieAuth
         ? { Authorization: `Bearer ${opts.token}` }
diff --git a/src/types/api/inventory/movement.d.ts b/src/types/api/inventory/movement.d.ts
index d7f2776a..9e156a1e 100644
--- a/src/types/api/inventory/movement.d.ts
+++ b/src/types/api/inventory/movement.d.ts
@@ -1,51 +1,60 @@
 import { BaseMetadata } from '@/types/api/api-general';
-import { Product } from '@/types/api/master-data/product';
 import { Supplier } from '@/types/api/master-data/supplier';
 import { Warehouse } from '@/types/api/master-data/warehouse';
 
 export type BaseMovement = {
   id: number;
-  alasan_transfer: string;
-  tanggal_transfer: string;
-  warehouse_asal: Warehouse;
-  warehouse_tujuan: Warehouse;
-  product: {
-    product: Product;
-    qty_product: number;
-  }[];
-  ekspedisi: {
+  transfer_reason: string;
+  transfer_date: string;
+  source_warehouse: Warehouse;
+  destination_warehouse: Warehouse;
+  details: {
+    id: number;
     product_id: number;
-    qty: number;
+    quantity: number;
+    before_quantity: number;
+    after_quantity: number;
+  }[];
+  deliveries: {
+    id: number;
+    supplier_id: number;
     supplier: Supplier;
-    plat_nomor: string;
-    no_surat_jalan: string;
-    dokumen: string;
-    biaya_ekspedisi: number;
-    nama_sopir: string;
+    vehicle_plate: string;
+    driver_name: string;
+    document_number: string;
+    document_path: string;
+    shipping_cost_item: number;
+    shipping_cost_total: number;
+    items: {
+      id: number;
+      stock_transfer_detail_id: number;
+      quantity: number;
+    }[];
   }[];
 };
 
 export type Movement = BaseMetadata & BaseMovement;
 
 export type CreateMovementPayload = {
-  alasan_transfer: string;
-  tanggal_transfer: string;
-  warehouse_asal_id: number;
-  warehouse_tujuan_id: number;
-  product: {
+  transfer_reason: string;
+  transfer_date: string;
+  source_warehouse_id: number;
+  destination_warehouse_id: number;
+  products: {
     product_id: number;
-    qty_product: number;
+    product_qty: number;
   }[];
-  ekspedisi: {
-    product_id: number;
-    qty: number;
+  deliveries: {
+    delivery_cost: number;
+    delivery_cost_per_item: number;
+    document_index?: number;
+    driver_name: string;
+    vehicle_plate: string;
     supplier_id: number;
-    plat_nomor: string;
-    no_surat_jalan: string;
-    dokumen: string | File;
-    biaya_ekspedisi: number;
-    biaya_ekspedisi_per_item?: number;
-    nama_sopir: string;
+    products: {
+      product_id: number;
+      product_qty: number;
+    }[];
   }[];
 };
 
diff --git a/src/types/api/inventory/product-warehouse.d.ts b/src/types/api/inventory/product-warehouse.d.ts
new file mode 100644
index 00000000..eda8d1b8
--- /dev/null
+++ b/src/types/api/inventory/product-warehouse.d.ts
@@ -0,0 +1,22 @@
+import { BaseMetadata } from '@/types/api/api-general';
+import { Warehouse } from '@/types/api/master-data/warehouse';
+import { Product } from '@/types/api/master-data/product';
+
+export type BaseProductWarehouse = {
+  id: number;
+  product_id: number;
+  warehouse_id: number;
+  quantity: number;
+  product: Product;
+  warehouse: Warehouse;
+};
+
+export type ProductWarehouse = BaseMetadata & BaseProductWarehouse;
+
+export type CreateProductWarehousePayload = {
+  product_id: number;
+  warehouse_id: number;
+  quantity: number;
+};
+
+export type UpdateProductWarehousePayload = CreateProductWarehousePayload;