diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php
index 471a76cb..4aa01c2c 100644
--- a/app/Http/Controllers/MarhunController.php
+++ b/app/Http/Controllers/MarhunController.php
@@ -1581,21 +1581,22 @@ class MarhunController extends Controller
         $lelongDetail = Lelong::where('id', '=', $lelong_id)->first();
         $lelongbid = LelongBid::where('lelong_id', '=', $lelong_id)
             ->where('caw_id', '=', $caw->id)
-            ->get();
+            ->select('id')
+            ->get()
+            ->keyBy('id');
 
         $senaraiScanKeluar = ScanSemak::where('lelong_id', '=', $lelong_id)
             ->where('kodcaw', '=', $caw->caw_code)
             ->whereNull('scan_masuk')
-            ->orderBy('id', 'desc')
             ->get();
 
-        $senaraiScanMasuk = ScanSemak::where('lelong_id', '=', $lelong_id)
-            ->where('kodcaw', '=', $caw->caw_code)
-            ->whereNotNull('scan_masuk')
-            ->orderBy('id', 'desc')
-            ->get();
+        $pluckLelongBid = $lelongbid->pluck('id')->toArray();
+        $pluckScanKeluar = $senaraiScanKeluar->pluck('lelongbid_id')->toArray();
+        $diff_lelong_bid = array_diff($pluckLelongBid, $pluckScanKeluar);
 
-        return view('marhun.scanbarcode', compact('lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar', 'senaraiScanMasuk'));
+        $new_lelong_bid = LelongBid::with('scanSemakSelesai')->whereIn('id', $diff_lelong_bid)->get();
+
+        return view('marhun.scanbarcode', compact('lelong_id', 'lelongDetail', 'new_lelong_bid', 'senaraiScanKeluar'));
     }
 
     public function scanKeluarMarhun(Request $request)
diff --git a/app/Models/LelongBid.php b/app/Models/LelongBid.php
index ffc71a37..8eeeb9f0 100644
--- a/app/Models/LelongBid.php
+++ b/app/Models/LelongBid.php
@@ -66,4 +66,9 @@ class LelongBid extends Model
     {
         return $this->hasMany(LelongBidMarhun::class, 'lelongbid_id', 'id');
     }
+
+    public function scanSemakSelesai()
+    {
+        return $this->hasMany(ScanSemak::class, 'lelongbid_id', 'id')->whereNotNull('scan_masuk');
+    }
 }
diff --git a/resources/views/marhun/scanbarcode.blade.php b/resources/views/marhun/scanbarcode.blade.php
index 23d3bcd7..729602be 100644
--- a/resources/views/marhun/scanbarcode.blade.php
+++ b/resources/views/marhun/scanbarcode.blade.php
@@ -9,15 +9,15 @@
                 <div class="card-body">
                     @if ($message = Session::get('success'))
                     <div class="alert mt-2 alert-success">
-                        <p>{{ $message }}</p>
+                        {{ $message }}
                     </div>
                     @elseif ($message = Session::get('failed'))
                     <div class="alert mt-2 alert-danger">
-                        <p>{{ $message }}</p>
+                        {{ $message }}
                     </div>
                     @endif
                     <a class="btn btn-secondary mb-1" href="{{route('marhun.senarailelongscan')}}">Kembali</a>
-                    
+
                     <p>Tarikh Lelong:
                         @php
                         $myDateTime = DateTime::createFromFormat('Y-m-d', $lelongDetail['tarikh_lelong'] );
@@ -28,69 +28,44 @@
 
                     <ul class="nav mb-2 nav-tabs" id="myTab" role="tablist">
                         <li class="nav-item">
-                            <a class="nav-link active" id="senarai-tab" data-toggle="tab" href="#senarai" role="tab" aria-controls="senarai" aria-selected="true">Senarai</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" id="scan-keluar-tab" data-toggle="tab" href="#scan-keluar" role="tab" aria-controls="scan-keluar" aria-selected="false">SAG Keluar Peti Besi</a>
+                            <a class="nav-link active" id="scan-keluar-tab" data-toggle="tab" href="#scan-keluar" role="tab" aria-controls="scan-keluar" aria-selected="false">SAG Keluar Peti Besi</a>
                         </li>
                         <li class="nav-item">
                             <a class="nav-link" id="scan-masuk-tab" data-toggle="tab" href="#scan-masuk" role="tab" aria-controls="scan-masuk" aria-selected="false">SAG Masuk Peti Besi</a>
                         </li>
                     </ul>
                     <div class="tab-content" id="myTabContent">
-                        <div class="tab-pane fade show active" id="senarai" role="tabpanel" aria-labelledby="senarai-tab">
-                            <table class='table table-bordered table-hover' id='table-senarai'>
-                                <thead class="bg-primary text-white">
-                                    <tr>
-                                        <th>Bil</th>
-                                        <th>No Rujukan</th>
-                                        <th>Marhun</th>
-                                        <th>N. Marhun</th>
-                                        <th>Berat</th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    @foreach($lelongbid as $index)
-                                    <tr>
-                                        <td>{{$loop->iteration}}</td>
-                                        <td>{{$index->norujukan}}</td>
-                                        <td>{{$index->marhun}}</td>
-                                        <td>{{ number_format($index->nilaimarhun, 2, '.', ',')}}</td>
-                                        <td>{{$index->berat}}</td>
-                                    </tr>
-                                    @endforeach
-                                </tbody>
-                            </table>
-                        </div>
-                        <div class="tab-pane fade" id="scan-keluar" role="tabpanel" aria-labelledby="scan-keluar-tab">
+                        <div class="tab-pane fade show active" id="scan-keluar" role="tabpanel" aria-labelledby="scan-keluar-tab">
                             <div class="row justify-content-center mb-4">
                                 <div class="col-5">
                                     <form action="{{ route('marhun.scankeluarmarhun') }}" method="POST">
                                         @csrf
-                                        
+
                                         <div style="text-align: center;">Scan Barcode Marhun Yang Dibawa Keluar Dari Peti Besi</div>
                                         <input type="text" style="text-align: center;" class="form-control" name="norujukan_barcode" autocomplete="off" id="norujukan_barcode" placeholder="SILA SCAN BARCODE PADA SAG" />
                                         <input type="hidden" name="lelong_id" value="{{$lelong_id}}">
                                     </form>
                                 </div>
                             </div>
-                            <div style="text-align: left;"> <a  href="{{ route('marhun.cetakkeluarscanbarcode', $lelong_id) }}" class="btn btn-info">Laporan Keluar Peti Besi semasa</a><br></div>
+                            <div style="text-align: left;"> <a href="{{ route('marhun.cetakkeluarscanbarcode', $lelong_id) }}" class="btn btn-info">Laporan Keluar Peti Besi semasa</a><br></div>
                             <table class='table table-bordered table-hover' id='table-scan-keluar'>
                                 <thead class="bg-primary text-white">
                                     <tr>
                                         <th>Bil</th>
                                         <th>No Rujukan</th>
-                                        <th>Tarikh/Masa Scan Keluar</th>
-                                        <th>Status</th>
+                                        <th>N. Marhun</th>
+                                        <th>Berat</th>
+                                        <th>Bilangan Keluar</th>
                                     </tr>
                                 </thead>
                                 <tbody>
-                                    @foreach ($senaraiScanKeluar as $index)
+                                    @foreach($new_lelong_bid as $index)
                                     <tr>
                                         <td>{{$loop->iteration}}</td>
                                         <td>{{$index->norujukan}}</td>
-                                        <td>{{$index->scan_keluar}}</td>
-                                        <td><span class="badge badge-pill badge-danger">Berada Di Luar Peti Besi</span></td>
+                                        <td>{{ number_format($index->nilaimarhun, 2, '.', ',')}}</td>
+                                        <td>{{$index->berat}}</td>
+                                        <td>{{ $index->scanSemakSelesai->count() }}</td>
                                     </tr>
                                     @endforeach
                                 </tbody>
@@ -107,7 +82,7 @@
                                     </form>
                                 </div>
                             </div>
-                            <div style="text-align: left;"> <a  href="{{ route('marhun.cetakmasukscanbarcode', $lelong_id) }}" class="btn btn-info">Laporan Masuk Peti Besi semasa</a><br></div>
+                            <div style="text-align: left;"> <a href="{{ route('marhun.cetakmasukscanbarcode', $lelong_id) }}" class="btn btn-info">Laporan Masuk Peti Besi semasa</a><br></div>
                             <table class="table table-bordered table-hover" id="table-scan-masuk" style="width: 100%;">
                                 <thead class="bg-primary text-white">
                                     <tr>
@@ -117,25 +92,23 @@
                                         <th>Tarikh/Masa Scan Keluar</th>
                                         <th>Tarikh/Masa Terima Marhun</th>
                                         <th>Tarikh/Masa Serah Marhun</th>
-                                        <th>Tarikh/Masa Scan Masuk</th>
                                     </tr>
                                 </thead>
                                 <tbody>
-                                    @foreach ($senaraiScanMasuk as $index)
+                                    @foreach ($senaraiScanKeluar as $index)
                                     <tr>
                                         <td>{{$loop->iteration}}</td>
                                         <td>{{$index->norujukan}}</td>
+                                        <td><span class="badge badge-pill badge-danger">Berada Di Luar Peti Besi</span></td>
                                         <td>{{$index->scan_keluar}}</td>
                                         <td>{{$index->terima_marhun}}</td>
                                         <td>{{$index->serah_marhun}}</td>
-                                        <td>{{$index->scan_masuk}}</td>
-                                        <td><span class="badge badge-pill badge-success">Berada Di Dalam Peti Besi</span></td>
                                     </tr>
                                     @endforeach
                                 </tbody>
-                                
+
                             </table>
-                           
+
                         </div>
                     </div>
                 </div>
@@ -145,7 +118,6 @@
 </div>
 
 <script>
-    var tableSenarai = $('#table-senarai').DataTable({});
     var tableScanKeluar = $('#table-scan-keluar').DataTable({});
     var tableScanMasuk = $('#table-scan-masuk').DataTable({});
 </script>