1
0
forked from poc/pds

Updated generate pallet number functionality globally instead of plant wise

This commit is contained in:
dhanabalan
2025-07-04 17:45:16 +05:30
parent cea7f86fed
commit 3e0633def2
2 changed files with 24 additions and 29 deletions

View File

@@ -330,7 +330,7 @@ class PalletFromLocator extends Page implements HasForms
->orWhere('pallet_number', ''); ->orWhere('pallet_number', '');
}) })
->where('locator_number', $locatorNo) ->where('locator_number', $locatorNo)
->orderByDesc('created_at') ->orderBy('created_at', 'asc') //orderByDesc('created_at')
->get() ->get()
->map(function ($record) use($operatorName) { ->map(function ($record) use($operatorName) {
return [ return [
@@ -673,14 +673,14 @@ class PalletFromLocator extends Page implements HasForms
$month = now()->format('m'); $month = now()->format('m');
$prefix = "EP-{$year}{$month}"; $prefix = "EP-{$year}{$month}";
$lastPallet = PalletValidation::where('pallet_number', 'like', "{$prefix}%") $lastPallet = PalletValidation::where('pallet_number', 'like', "{$prefix}%")->orderByDesc('pallet_number')->first(); //->where('plant_id', $plantId)
->where('plant_id', $plantId) $newNumber = '001'; // $lastPallet ? str_pad(intval(substr($lastPallet->pallet_number, -3)) + 1, 3, '0', STR_PAD_LEFT) : '001';
->orderByDesc('pallet_number') if ($lastPallet) {
->first(); $serialPart = substr($lastPallet->pallet_number, strlen($prefix));
// OR
$newNumber = $lastPallet // $serialPart = str_replace($prefix, '', $lastPallet->pallet_number);
? str_pad(intval(substr($lastPallet->pallet_number, -3)) + 1, 3, '0', STR_PAD_LEFT) $newNumber = str_pad(intval($serialPart) + 1, strlen($serialPart), '0', STR_PAD_LEFT);
: '001'; }
$newPalletNumber = "{$prefix}{$newNumber}"; $newPalletNumber = "{$prefix}{$newNumber}";

View File

@@ -68,7 +68,7 @@ class PalletValidationResource extends Resource
'x-on:keydown.enter.prevent' => '$wire.processPalletNo()', 'x-on:keydown.enter.prevent' => '$wire.processPalletNo()',
]) ])
->suffixAction(fn ($get,$set) => ->suffixAction(fn ($get,$set) =>
Forms\Components\Actions\Action::make('addPallet') Forms\Components\Actions\Action::make('addPallet')
->label('') ->label('')
->button() ->button()
->icon('heroicon-o-plus') ->icon('heroicon-o-plus')
@@ -79,28 +79,23 @@ class PalletValidationResource extends Resource
->action(function ($get, $set, $livewire) { ->action(function ($get, $set, $livewire) {
$plantId = $get('plant_id'); $plantId = $get('plant_id');
$user = Filament::auth()->user(); session(['pallet_clicked_time' => now()->toDateTimeString()]);
$operatorName = $user->name; session(['pallet_created_by' => Filament::auth()->user()->name]);
$clickedTime = now();
$created = $operatorName;
session(['pallet_clicked_time' => $clickedTime->toDateTimeString()]);
session(['pallet_created_by' => $created]);
$year = now()->format('y'); $year = now()->format('y');
$month = now()->format('m'); $month = now()->format('m');
$prefix = "EP-{$year}{$month}"; $prefix = "EP-{$year}{$month}";
$lastPallet = PalletValidation::where('pallet_number', 'like', "{$prefix}%")
->where('plant_id', $plantId) $lastPallet = PalletValidation::where('pallet_number', 'like', "{$prefix}%")->orderByDesc('pallet_number')->first(); //->where('plant_id', $plantId)
->orderByDesc('pallet_number') $newNumber = '001'; // $lastPallet ? str_pad(intval(substr($lastPallet->pallet_number, -3)) + 1, 3, '0', STR_PAD_LEFT) : '001';
->first(); if ($lastPallet) {
$newNumber = $lastPallet $serialPart = substr($lastPallet->pallet_number, strlen($prefix));
? str_pad(intval(substr($lastPallet->pallet_number, -3)) + 1, 3, '0', STR_PAD_LEFT) // OR
: '001'; // $serialPart = str_replace($prefix, '', $lastPallet->pallet_number);
$newNumber = str_pad(intval($serialPart) + 1, strlen($serialPart), '0', STR_PAD_LEFT);
}
$newPalletNumber = "{$prefix}{$newNumber}"; $newPalletNumber = "{$prefix}{$newNumber}";
$set('pallet_number', $newPalletNumber); $set('pallet_number', $newPalletNumber);
@@ -326,8 +321,8 @@ class PalletValidationResource extends Resource
->label('Locator Quantity') ->label('Locator Quantity')
->options([ ->options([
0 => 0, 0 => 0,
1 => '1', 1 => 1,
2 => '2', 2 => 2,
]) ])
->reactive(), ->reactive(),
DateTimePicker::make(name: 'created_from') DateTimePicker::make(name: 'created_from')