From c11315d004ecb963a91ad2b6cecde5ef1fa95efc Mon Sep 17 00:00:00 2001 From: Amirah22 <94591077+Amirah22@users.noreply.github.com> Date: Mon, 21 Nov 2022 09:45:33 +0800 Subject: [PATCH] update scan barcode (10/11/22) --- app/Http/Controllers/MarhunController.php | 60 ++++++++---- .../views/lelong/laporanlelong.blade.php | 9 +- resources/views/marhun/scanbarcode.blade.php | 9 +- .../views/marhun/scanbarcodemasuk.blade.php | 91 +++++++++++++++++++ .../views/marhun/senarailelongscan.blade.php | 11 +++ routes/web.php | 2 + 6 files changed, 152 insertions(+), 30 deletions(-) create mode 100644 resources/views/marhun/scanbarcodemasuk.blade.php diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index a10447ea..e236d6e6 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -26,6 +26,7 @@ use App\Models\ScanSemak; use App\Models\TangguhLelong; use Carbon\Carbon; use App\Models\ScanJual; +use DateTime; class MarhunController extends Controller { @@ -1599,6 +1600,32 @@ class MarhunController extends Controller return view('marhun.scanbarcode', compact('lelong_id', 'lelongDetail', 'new_lelong_bid', 'senaraiScanKeluar')); } + public function listScanBarcodeMasuk($lelong_id) + { + $user = Auth::user(); + $caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first(); + + $lelongDetail = Lelong::where('id', '=', $lelong_id)->first(); + $lelongbid = LelongBid::where('lelong_id', '=', $lelong_id) + ->where('caw_id', '=', $caw->id) + ->select('id') + ->get() + ->keyBy('id'); + + $senaraiScanKeluar = ScanSemak::where('lelong_id', '=', $lelong_id) + ->where('kodcaw', '=', $caw->caw_code) + ->whereNull('scan_masuk') + ->get(); + + $pluckLelongBid = $lelongbid->pluck('id')->toArray(); + $pluckScanKeluar = $senaraiScanKeluar->pluck('lelongbid_id')->toArray(); + $diff_lelong_bid = array_diff($pluckLelongBid, $pluckScanKeluar); + + $new_lelong_bid = LelongBid::with('scanSemakSelesai')->whereIn('id', $diff_lelong_bid)->get(); + + return view('marhun.scanbarcodemasuk', compact('lelong_id', 'lelongDetail', 'new_lelong_bid', 'senaraiScanKeluar')); + } + public function scanKeluarMarhun(Request $request) { @@ -1958,21 +1985,15 @@ class MarhunController extends Controller $current = Carbon::now(); $current = new Carbon(); $tarikh_cetak = $current->toDateString(); + // dd($request->datehingga); - if($request->datemula == null){ - $mula_date = '2017-01-01'; - }else{ - $split_date = explode('-', $request->datemula); - $mula_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; - } - - if($request->datehingga == null){ - $hingga_date = $current->toDateString(); - }else{ - $split_date = explode('-', $request->datehingga); - $hingga_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; - } + + $myDateTime = DateTime::createFromFormat('Y-m-d', $request->datehingga ); + $datez = $myDateTime->modify('+1 day')->format('Y-m-d'); + $request->datehingga =$datez; + + $kodcaw = $auth_user['kodcaw']; $cawangan = Cawangan::where('caw_code','=',$kodcaw) @@ -1982,7 +2003,8 @@ class MarhunController extends Controller { $scan=ScanSemak::where('scan_semak.kodcaw','=',$kodcaw) ->join('users','scan_semak.khazanah_id','=','users.id') - ->where([['scan_keluar','>=',$request->datemula],['scan_keluar','<=',$request->datehingga]]) + ->where('scan_keluar','>=', $request->datemula) + ->where('scan_keluar','<=', $request->datehingga ) ->get(); return view('pdf.laporanscankeluar', compact('scan','auth_user','tarikh_cetak','cawangan')); @@ -1991,11 +2013,10 @@ class MarhunController extends Controller else if($request->jenis == 'masuk'){ - $scan=ScanSemak::where('scan_semak.kodcaw','=',$kodcaw) - ->join('users','scan_semak.khazanah_id','=','users.id') - ->where([['scan_masuk','>=',$request->datemula],['scan_masuk','<=',$request->datehingga]]) - ->get(); - // dd($scan); + $scan=ScanSemak::join('users','scan_semak.khazanah_id','=','users.id') + ->where('scan_semak.kodcaw','=',$kodcaw) + ->where([['scan_masuk','>=', $request->datemula],['scan_masuk','<=', $request->datehingga ]]) + ->get(); return view('pdf.laporanscanmasuk', compact('scan','auth_user','tarikh_cetak','cawangan')); @@ -2012,6 +2033,7 @@ class MarhunController extends Controller } + } public function senaraiterimaserah(Request $request){ diff --git a/resources/views/lelong/laporanlelong.blade.php b/resources/views/lelong/laporanlelong.blade.php index 5545cb2a..6e3a84bb 100644 --- a/resources/views/lelong/laporanlelong.blade.php +++ b/resources/views/lelong/laporanlelong.blade.php @@ -17,17 +17,16 @@ No - ID Lelong + Batch Lelong Tarikh Lelong Fasa Cawangan - {{-- Muat Turun --}} @foreach ($arraydetails as $laporan) - + {{ $loop->iteration }} {{ $laporan['laporan']['lelong_id']}} @php @@ -43,10 +42,6 @@ {{ $details['caw_name']}}
@endforeach - - {{-- - - --}} @endforeach diff --git a/resources/views/marhun/scanbarcode.blade.php b/resources/views/marhun/scanbarcode.blade.php index 1f3bcd4c..249c6ca2 100644 --- a/resources/views/marhun/scanbarcode.blade.php +++ b/resources/views/marhun/scanbarcode.blade.php @@ -17,6 +17,7 @@ @endif Kembali + Senarai SAG Keluar Peti Besi

Tarikh Lelong: @php @@ -30,9 +31,9 @@

  • Senarai SAG Akan Dilelong
    • -
  • + {{--
  • Senarai SAG Keluar/Masuk Peti Besi -
    • + --}}
    @@ -71,7 +72,7 @@
    -
    + {{--
    @@ -110,7 +111,7 @@ -
    +
    --}}
    diff --git a/resources/views/marhun/scanbarcodemasuk.blade.php b/resources/views/marhun/scanbarcodemasuk.blade.php new file mode 100644 index 00000000..756232bf --- /dev/null +++ b/resources/views/marhun/scanbarcodemasuk.blade.php @@ -0,0 +1,91 @@ +@extends('layouts.app') + +@section('content') +
    +
    +
    +
    +
    Scan Barcode
    +
    + @if ($message = Session::get('success')) +
    + {{ $message }} +
    + @elseif ($message = Session::get('failed')) +
    + {{ $message }} +
    + @endif + Kembali + Senarai SAG Masuk Peti Besi + + +

    Tarikh Lelong: + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $lelongDetail['tarikh_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp +

    + + +
    +
    +
    +
    + + @csrf + + + + +
    +
    + + + + + + + + + + + + + + + @foreach ($senaraiScanKeluar as $index) + + + + + + + + + @endforeach + + +
    BilNo RujukanStatusTarikh/Masa Scan KeluarTarikh/Masa Terima MarhunTarikh/Masa Serah Marhun
    {{$loop->iteration}}{{$index->norujukan}}Berada Di Luar Peti Besi{{$index->scan_keluar}}{{$index->terima_marhun}}{{$index->serah_marhun}}
    + +
    +
    + +
    +
    +
    +
    +
    + + + + +@endsection \ No newline at end of file diff --git a/resources/views/marhun/senarailelongscan.blade.php b/resources/views/marhun/senarailelongscan.blade.php index a9a3c2db..f508e873 100644 --- a/resources/views/marhun/senarailelongscan.blade.php +++ b/resources/views/marhun/senarailelongscan.blade.php @@ -14,6 +14,8 @@ Tarikh Lelong Status Lelong Tindakan + Scan Keluar + Scan Masuk @@ -34,9 +36,18 @@ @if($lel['info']['sts_lelong'] == 0) + @endif + + + @if($lel['info']['sts_lelong'] == 0) @endif + + @if($lel['info']['sts_lelong'] == 0) + + @endif + @endforeach diff --git a/routes/web.php b/routes/web.php index 4f161311..e890fc62 100644 --- a/routes/web.php +++ b/routes/web.php @@ -252,6 +252,8 @@ Route::group(['middleware' => ['permission:semakanmarhun','permission:kemaskinim Route::get('/senarailelongmarhun',['as'=>'marhun.senarailelongmarhun','uses'=>'MarhunController@senarailelongmarhun']); Route::get('/senarailelongscan',['as'=>'marhun.senarailelongscan','uses'=>'MarhunController@senarailelongscan']); Route::get('/scanbarcode/{lelong_id}',['as'=>'marhun.scanbarcode','uses'=>'MarhunController@listScanBarcode']); + Route::get('/scanbarcodemasuk/{lelong_id}',['as'=>'marhun.scanbarcodemasuk','uses'=>'MarhunController@listScanBarcodeMasuk']); + Route::post('/scankeluarmarhun',['as'=>'marhun.scankeluarmarhun','uses'=>'MarhunController@scanKeluarMarhun']); Route::post('/scanmasukmarhun',['as'=>'marhun.scanmasukmarhun','uses'=>'MarhunController@scanMasukMarhun']); Route::post('/terimamarhun',['as'=>'marhun.terimamarhun','uses'=>'MarhunController@terimaMarhun']);