Fix scan_marhun

2022-10-17 14:11:30 +08:00
parent 302bb3ae5b
commit 9547e967e3
2 changed files with 4 additions and 11 deletions
@@ -1626,6 +1626,9 @@ class MarhunController extends Controller

        $scanMasuk = ScanSemak::where('norujukan', '=', $request->norujukan_barcode)
            ->whereNotNull('serah_marhun')
+            ->whereNotNull('terima_marhun')
+            ->whereNull('scan_masuk')
+            ->orderBy('id', 'desc')
            ->first();

        if ($scanMasuk) {
@@ -1639,16 +1642,6 @@ class MarhunController extends Controller
        }
    }

-    public function senaraiScanKeluar(Request $request)
-    {
-        $user =  Auth::user();
-        $caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first();
-
-        $senaraiScanKeluar = ScanMarhun::where('lelong_id', '=', $request->lelong_id)
-            ->where('kodcaw', '=', $caw)
-            ->get();
-    }
-
    public function addPhotoMarhun(Request $request)
    {
        $data = base64_encode($request->gambarMarhun->get());