3 files changed, 41 insertions, 3 deletions
diff --git a/src/modules/result/components/ImportModal.tsx b/src/modules/result/components/ImportModal.tsx
index 1bb7b26..daacb55 100644
--- a/src/modules/result/components/ImportModal.tsx
+++ b/src/modules/result/components/ImportModal.tsx
@@ -62,6 +62,17 @@ const ImportModal = ({ modal }: Props) => {
           <form className='pb-6' onSubmit={handleSubmit}>
             <input type='file' onChange={handleFileChange} accept='.xls, .xlsx' />
             <Spacer y={4} />
+            
+            <div className='text-xs p-3 bg-info-100 border border-info-200 text-info-700 rounded-medium flex items-start gap-2'>
+              <div className='flex-shrink-0'>ℹ️</div>
+              <div>
+                <p className='font-semibold'>Format File Excel:</p>
+                <p>Kolom 1-7: Nama, Barcode, Item Code, Qty On-hand, Qty Gudang Selisih, companyId, ID / External ID, value (per Unit)</p>
+                <p>Kolom 8 (opsional): Location</p>
+              </div>
+            </div>
+            <Spacer y={4} />
+            
             <Input
               type="text"
               label='Ketik ulang untuk konfirmasi'
diff --git a/src/modules/result/components/ProductModal.tsx b/src/modules/result/components/ProductModal.tsx
index cfd7382..df0a911 100644
--- a/src/modules/result/components/ProductModal.tsx
+++ b/src/modules/result/components/ProductModal.tsx
@@ -36,7 +36,7 @@ const ProductModal = ({ modal }: Props) => {
       })
       const response = await fetch(`/api/product?${searchParams}`)
       const data: {
-        products: (Product & { company: { id: number, name: string } })[],
+        products: (Product & { company: { id: number, name: string }, location?: { id: number, name: string } | null })[],
         page: number,
         totalPage: number
       } = await response.json()
@@ -89,6 +89,7 @@ const ProductModal = ({ modal }: Props) => {
                 <TableColumn>BARCODE</TableColumn>
                 <TableColumn>ON-HAND QTY</TableColumn>
                 <TableColumn>DIFFERENCE QTY</TableColumn>
+                <TableColumn>LOCATION</TableColumn>
                 <TableColumn>COMPANY</TableColumn>
               </TableHeader>
               <TableBody items={data?.products || []}>
@@ -99,6 +100,7 @@ const ProductModal = ({ modal }: Props) => {
                     <TableCell>{product.barcode}</TableCell>
                     <TableCell>{product.onhandQty}</TableCell>
                     <TableCell>{product.differenceQty}</TableCell>
+                    <TableCell>{(product as any).location?.name || '-'}</TableCell>
                     <TableCell>{product.company.name}</TableCell>
                   </TableRow>
                 )}
diff --git a/src/modules/stock-opname/index.tsx b/src/modules/stock-opname/index.tsx
index 2937a98..4456b11 100644
--- a/src/modules/stock-opname/index.tsx
+++ b/src/modules/stock-opname/index.tsx
@@ -37,6 +37,31 @@ const StockOpname = () => {
 
   }, [form.product, form.location, setOldOpname])
 
+  // Auto-populate location when a product with assigned location is selected
+  useEffect(() => {
+    const loadProductAndSetLocation = async () => {
+      if (form.product?.value) {
+        try {
+          const response = await fetch(`/api/product?search=`)
+          const data: { products: Product[] } = await response.json()
+          const selectedProduct = data?.products.find(p => p.id === form.product?.value)
+          
+          if (selectedProduct && (selectedProduct as any).location && !form.location?.value) {
+            const location = (selectedProduct as any).location
+            updateForm('location', {
+              value: location.id,
+              label: location.name
+            })
+          }
+        } catch (error) {
+          console.error('Error loading product location:', error)
+        }
+      }
+    }
+
+    loadProductAndSetLocation()
+  }, [form.product?.value, form.location?.value, updateForm])
+
   const handleSelectChange = (val: SingleValue<SelectOption>, action: ActionMeta<SelectOption>) => {
     updateForm(action.name as keyof typeof form, val)
   }
@@ -253,9 +278,9 @@ const loadProduct = async (inputValue: string) => {
   const response = await fetch(`/api/product?search=${inputValue}`)
   const data: { products: Product[] } = await response.json() || []
 
-  return data?.products.map((product) => ({
+  return data?.products.map((product: any) => ({
     value: product.id,
-    label: `${product.itemCode ? `[${product.itemCode}]` : ''} ${product.name} ${product.barcode ? ` [${product.barcode}]` : ''}`
+    label: `${product.itemCode ? `[${product.itemCode}]` : ''} ${product.name} ${product.barcode ? ` [${product.barcode}]` : ''} ${product.location ? `(Lokasi: ${product.location.name})` : ''}`
   }
   ))
 }