diff --git a/app/Http/Controllers/AutoSerahanController.php b/app/Http/Controllers/AutoSerahanController.php
index e7e279c..b63e43f 100644
--- a/app/Http/Controllers/AutoSerahanController.php
+++ b/app/Http/Controllers/AutoSerahanController.php
@@ -411,7 +411,7 @@ class AutoSerahanController extends Controller
 
         $kodcaw = $this->interchangeCawangan($request->kodcaw,'v2');
 
-        $updated_serahan = $this->autoSerahanRemove('pendahuluan',$kodcaw,$request->amaun,$request->id);
+        $updated_serahan = $this->autoSerahanRemove('serahan',$kodcaw,$request->amaun,$request->array_approval);
 
         return response()->json($updated_serahan);
 
@@ -445,9 +445,9 @@ class AutoSerahanController extends Controller
         DB::connection('mysql7')->beginTransaction();
 
         try{
-            $approval = ApprovalWithdrawal::on('mysql7')->where('id',$id)->first();
-
             if($jenis == 'pendahuluan'){
+                $approval = ApprovalWithdrawal::on('mysql7')->where('id',$id)->first();
+
                 $totalpendahuluan = $pendahuluan - $amaun;
         
                 $bakiakhir = $bakiawal - $keluar + $masuk + $totalpendahuluan - $serahan - $totpanjaran;
@@ -458,13 +458,15 @@ class AutoSerahanController extends Controller
                     'bakieod' => $bakiakhir
                 ));
 
-                DenoPendSer::where('no', $approval['denopendser_id_v2'])->delete();
-                GlDetail::where('recno', $approval['gldetail_id_v3'])->delete();
+                GlDetail::on($cawangan['mysql'])->where('recno', $approval['gldetail_id_v3'])->delete();
+                DenoPendSer::on('mysql7')->where('no', $approval['denopendser_id_v2'])->delete();
 
                 ApprovalWithdrawal::on('mysql7')->where('id',$id)->update(array(
                     'updated_pendahuluan_v3' => 1,
                 ));
             }else{
+                $approval = $id;
+
                 $totalserahan = $serahan - $amaun;
 
                 $bakiakhir = $bakiawal - $keluar  + $masuk + $pendahuluan - $totalserahan - $totpanjaran;
@@ -475,8 +477,8 @@ class AutoSerahanController extends Controller
                     'bakieod' => $bakiakhir
                 ));
 
-                DenoPendSer::where('no', $approval['denopendser_id_v2'])->delete();
-                GlDetail::where('recno', $approval['gldetail_id_v2'])->delete();
+                GlDetail::on($cawangan['mysql'])->where('recno', $approval['gldetail_id_v2'])->delete();
+                DenoPendSer::on('mysql7')->where('no', $approval['denopendser_id_v2'])->delete();
 
                 ApprovalWithdrawal::on('mysql7')->where('id',$id)->update(array(
                     'updated_serahan_v2' => 1,
diff --git a/routes/web.php b/routes/web.php
index c9c9fd5..99932e1 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -686,8 +686,8 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->post('autoserahan/delete',['uses'=>'AutoSerahanController@deleteAutoSerahan']);
     $router->put('autoserahan/pendahuluan',['uses'=>'AutoSerahanController@pendahuluanAutoSerahan']);
     $router->put('autoserahan/serahan',['uses'=>'AutoSerahanController@serahanAutoSerahan']);
-    $router->put('autoserahan/delete/pendahuluan',['uses'=>'AutoSerahanController@pendahuluanAutoSerahan']);
-    $router->put('autoserahan/delete/serahan',['uses'=>'AutoSerahanController@serahanAutoSerahan']);
+    $router->put('autoserahan/delete/pendahuluan',['uses'=>'AutoSerahanController@removeAutoPendahuluan']);
+    $router->put('autoserahan/delete/serahan',['uses'=>'AutoSerahanController@removeAutoSerahan']);
     $router->put('autoserahan/setapproval',['uses'=>'AutoSerahanController@SetApprovalWithdrawal']);
     $router->get('autoserahan/get',['uses'=>'AutoSerahanController@getAutoSerahanApproval']);
     $router->get('autoserahan/checkapproval',['uses'=>'AutoSerahanController@checkProsesApproval']);