diff --git a/app/components/content/equipment/list.vue b/app/components/content/equipment/list.vue
index 4c82ed92..7f7b34a0 100644
--- a/app/components/content/equipment/list.vue
+++ b/app/components/content/equipment/list.vue
@@ -26,8 +26,13 @@ const items = [
 
 // Fungsi untuk fetch data equipment
 async function fetchEquipmentData(params: any) {
-  const endpoint = transform('/api/v1/equipment', params)
-  return await xfetch(endpoint)
+  // const endpoint = transform('/api/v1/equipment', params)
+  // return await xfetch(endpoint)
+  return await xfetch('/api/v1/material')
+}
+
+async function fetchUom() {
+  return await xfetch('/api/v1/uom')
 }
 
 // Menggunakan composable untuk pagination
@@ -169,10 +174,14 @@ const handleCancelConfirmation = () => {
   recAction.value = ''
   recItem.value = null
 }
+
+onMounted(async () => {
+  await fetchUom()
+})
 </script>
 
 <template>
-  <div class="rounded-md border p-4">
+  <div class="p-4">
     <Header v-model="searchInput" :prep="headerPrep" @search="handleSearch" />
     <div class="rounded-md border p-4">
       <AppEquipmentList :data="data" :pagination-meta="paginationMeta" @page-change="handlePageChange" />
diff --git a/app/models/equipment-material.ts b/app/models/equipment-material.ts
new file mode 100644
index 00000000..3adac0b2
--- /dev/null
+++ b/app/models/equipment-material.ts
@@ -0,0 +1,6 @@
+export interface EquipmentMaterial {
+  code: string;
+  name: string;
+  uom_code: string;
+  stock: number;
+}
diff --git a/server/api/[...req].ts b/server/api/[...req].ts
index cb7d872a..1add6703 100644
--- a/server/api/[...req].ts
+++ b/server/api/[...req].ts
@@ -7,9 +7,12 @@ export default defineEventHandler(async (event) => {
   const { method } = event.node.req
   const headers = getRequestHeaders(event)
   const url = getRequestURL(event)
+  const config = useRuntimeConfig()
+  
+  const apiOrigin = config.API_ORIGIN || API_ORIGIN
   const pathname = url.pathname.replace(/^\/api/, '')
 
-  const targetUrl = API_ORIGIN + pathname + (url.search || '')
+  const targetUrl = apiOrigin + pathname + (url.search || '')
 
   const verificationId = headers['verification-id'] as string | undefined
   let bearer = ''
@@ -35,6 +38,8 @@ export default defineEventHandler(async (event) => {
     }
   }
 
+  console.log(targetUrl)
+
   const res = await fetch(targetUrl, {
     method,
     headers: forwardHeaders,