KoPKB/lelong
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update scan barcode (10/11/22)

Browse Source
This commit is contained in:
Amirah22
2022-11-21 09:45:33 +08:00
parent 337727a25e
commit c11315d004
6 changed files with 152 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/MarhunController.php
+41 -19
View File
@@ -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){
resources/views/lelong/laporanlelong.blade.php
+2 -7
View File
@@ -17,17 +17,16 @@
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>ID Lelong</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
<th>Fasa</th>
<th>Cawangan</th>
{{-- <th class="text-center">Muat Turun</th> --}}
</tr>
</thead>
<tbody>
@foreach ($arraydetails as $laporan)
<tr>
<tr style="text-align: left">
<td>{{ $loop->iteration }}</td>
<td>{{ $laporan['laporan']['lelong_id']}}</td>
<td>@php
@@ -43,10 +42,6 @@
<span class="m-2">{{ $details['caw_name']}}</span><br>
@endforeach
</td>
{{-- <td class="text-center">
<a href="{{ route('report.senaraibrglelong',$laporan['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Senarai Barang Lelong" ><i class="fas fa-download"></i></a>
</td> --}}
</tr>
@endforeach
resources/views/marhun/scanbarcode.blade.php
+5 -4
View File
@@ -17,6 +17,7 @@
</div>
@endif
<a class="btn btn-secondary mb-1" href="{{route('marhun.senarailelongscan')}}">Kembali</a>
<a class="btn btn-primary" href="{{route('marhun.scanbarcodemasuk',$lelong_id )}}">Senarai SAG Keluar Peti Besi</a>
<p>Tarikh Lelong:
@php
@@ -30,9 +31,9 @@
<li class="nav-item">
<a class="nav-link active" id="scan-keluar-tab" data-toggle="tab" href="#scan-keluar" role="tab" aria-controls="scan-keluar" aria-selected="false">Senarai SAG Akan Dilelong</a>
</li>
<li class="nav-item">
{{-- <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">Senarai SAG Keluar/Masuk Peti Besi</a>
</li>
</li> --}}
</ul>
<div class="tab-content" id="myTabContent">
<div class="tab-pane fade show active" id="scan-keluar" role="tabpanel" aria-labelledby="scan-keluar-tab">
@@ -71,7 +72,7 @@
</tbody>
</table>
</div>
<div class="tab-pane fade" id="scan-masuk" role="tabpanel" aria-labelledby="scan-masuk-tab">
{{-- <div class="tab-pane fade" id="scan-masuk" role="tabpanel" aria-labelledby="scan-masuk-tab">
<div class="row justify-content-center mb-4">
<div class="col-5">
<form action="{{ route('marhun.scanmasukmarhun') }}" method="POST">
@@ -110,7 +111,7 @@
</table>
</div>
</div> --}}
</div>
</div>
</div>
resources/views/marhun/scanbarcodemasuk.blade.php
+91
View File
@@ -0,0 +1,91 @@
@extends('layouts.app')
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto p-4">
<div class="card">
<div class="card-header">Scan Barcode</div>
<div class="card-body">
@if ($message = Session::get('success'))
<div class="alert mt-2 alert-success">
{{ $message }}
</div>
@elseif ($message = Session::get('failed'))
<div class="alert mt-2 alert-danger">
{{ $message }}
</div>
@endif
<a class="btn btn-secondary mb-1" href="{{route('marhun.senarailelongscan')}}">Kembali</a>
<a class="btn btn-primary" href="{{route('marhun.scanbarcode',$lelong_id)}}">Senarai SAG Masuk Peti Besi</a>
<p>Tarikh Lelong:
@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $lelongDetail['tarikh_lelong'] );
$t_lelong = $myDateTime->format('d-m-Y');
echo($t_lelong);
@endphp
</p>
<ul class="nav mb-2 nav-tabs" id="myTab" role="tablist">
<li class="nav-item">
<a class="nav-link active" id="scan-masuk-tab" data-toggle="tab" href="#scan-masuk" role="tab" aria-controls="scan-masuk" aria-selected="false">Senarai SAG Keluar/Masuk Peti Besi</a>
</li>
</ul>
<div class="tab-content" id="myTabContent">
<div class="tab-pane fade show active" id="scan-masuk" role="tabpanel" aria-labelledby="scan-masuk-tab">
<div class="row justify-content-center mb-4">
<div class="col-5">
<form action="{{ route('marhun.scanmasukmarhun') }}" method="POST">
@csrf
<label>Scan Barcode Marhun Yang Dimasukkan Ke Peti Besi</label>
<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 Semasa</a>
<a href="{{ route('marhun.cetakmasukscanbarcode', $lelong_id) }}" class="btn btn-info">Laporan Masuk Semasa</a></div>
<table class="table table-bordered table-hover" id="table-scan-masuk" style="width: 100%;">
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>No Rujukan</th>
<th>Status</th>
<th>Tarikh/Masa Scan Keluar</th>
<th>Tarikh/Masa Terima Marhun</th>
<th>Tarikh/Masa Serah Marhun</th>
</tr>
</thead>
<tbody>
@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>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<script>
var tableScanMasuk = $('#table-scan-masuk').DataTable({});
</script>
@endsection
resources/views/marhun/senarailelongscan.blade.php
+11
View File
@@ -14,6 +14,8 @@
<th>Tarikh Lelong</th>
<th>Status Lelong</th>
<th>Tindakan</th>
<th>Scan Keluar</th>
<th>Scan Masuk</th>
</tr>
</thead>
<tbody>
@@ -34,9 +36,18 @@
<td>
@if($lel['info']['sts_lelong'] == 0)
<a href="{{ route('marhun.exportmarhundetails', ['lelong_id'=>$lel['info']['lelong_id']]) }}" data-toggle="tooltip" data-placement="top" title="Muat Turun Senarai Marhun" style="margin-right:40px"><i class="fas fa-download"></i></a>
@endif
</td>
<td>
@if($lel['info']['sts_lelong'] == 0)
<a href=" {{ route('marhun.scanbarcode', ['lelong_id'=>$lel['info']['lelong_id']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Lelong Marhun"><i class="far fa-edit"></i></a>
@endif
</td>
<td>
@if($lel['info']['sts_lelong'] == 0)
<a href=" {{ route('marhun.scanbarcodemasuk', ['lelong_id'=>$lel['info']['lelong_id']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Lelong Marhun"><i class="far fa-edit"></i></a>
@endif
</td>
</tr>
@endforeach
</tbody>
routes/web.php
+2
View File
@@ -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']);