jothi/poc-pds1
1
0
Fork 0
forked from poc/pds
Code Pull Requests Activity

Removed required condition for heat_number column and its position changed and Removed heat_number column on Import OBD Weight Invoice

Browse Source
This commit is contained in:
dhanabalan
2025-05-27 18:19:42 +05:30
parent bfbb9f98ea
commit 569290658d
1 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
app/Filament/Resources/WeightValidationResource.php
View File

@@ -58,14 +58,13 @@ class WeightValidationResource extends Resource
Forms\Components\TextInput::make('batch_number') Forms\Components\TextInput::make('batch_number')
->label('Batch Number') ->label('Batch Number')
->required(), ->required(),
Forms\Components\TextInput::make('heat_number')
->label('Heat Number')
->required(),
Forms\Components\TextInput::make('obd_weight') Forms\Components\TextInput::make('obd_weight')
->label('OBD Weight') ->label('Actual Weight')
->required(), ->required(),
Forms\Components\TextInput::make('vehicle_number') Forms\Components\TextInput::make('vehicle_number')
->label('Vehicle Number'), ->label('Vehicle Number'),
Forms\Components\TextInput::make('heat_number')
->label('Heat Number'),
Forms\Components\TextInput::make('bundle_number') Forms\Components\TextInput::make('bundle_number')
->label('Bundle Number'), ->label('Bundle Number'),
Forms\Components\TextInput::make('picked_weight') Forms\Components\TextInput::make('picked_weight')
@@ -110,9 +109,6 @@ class WeightValidationResource extends Resource
Tables\Columns\TextColumn::make('batch_number') Tables\Columns\TextColumn::make('batch_number')
->label('Batch Number') ->label('Batch Number')
->alignCenter(), ->alignCenter(),
Tables\Columns\TextColumn::make('heat_number')
->label('Heat Number')
->alignCenter(),
Tables\Columns\TextColumn::make('obd_weight') Tables\Columns\TextColumn::make('obd_weight')
->label('Actual Weight') ->label('Actual Weight')
->alignCenter(), ->alignCenter(),
@@ -120,6 +116,9 @@ class WeightValidationResource extends Resource
->label('Vehicle Number') ->label('Vehicle Number')
->alignCenter() ->alignCenter()
->searchable(), ->searchable(),
Tables\Columns\TextColumn::make('heat_number')
->label('Heat Number')
->alignCenter(),
Tables\Columns\TextColumn::make('bundle_number') Tables\Columns\TextColumn::make('bundle_number')
->label('Bundle Number') ->label('Bundle Number')
->alignCenter(), ->alignCenter(),
@@ -259,7 +258,7 @@ class WeightValidationResource extends Resource
$invalidLines = []; $invalidLines = [];
$duplicateLines = []; $duplicateLines = [];
$invalidBatch = []; $invalidBatch = [];
$invalidHeat = []; // $invalidHeat = [];
$invalidWeight = []; $invalidWeight = [];
$materialCodes = []; $materialCodes = [];
$lineNumbers = []; $lineNumbers = [];
@@ -272,8 +271,8 @@ class WeightValidationResource extends Resource
$materialCode = trim($row[0]); $materialCode = trim($row[0]);
$lineNumber = trim($row[1]); $lineNumber = trim($row[1]);
$batchNumber = trim($row[2]); $batchNumber = trim($row[2]);
$heatNumber = trim($row[3]); // $heatNumber = trim($row[3]);
$actualWeight = trim($row[4]); $actualWeight = trim($row[3]);
if (empty($materialCode)) { if (empty($materialCode)) {
continue; continue;
@@ -308,11 +307,11 @@ class WeightValidationResource extends Resource
$validData = false; $validData = false;
$invalidBatch[] = $materialCode; $invalidBatch[] = $materialCode;
} }
if(Str::length($heatNumber) < 4) // if(Str::length($heatNumber) < 4)
{ // {
$validData = false; // $validData = false;
$invalidHeat[] = $materialCode; // $invalidHeat[] = $materialCode;
} // }
if(Str::length($actualWeight) < 1 || !is_numeric($actualWeight))//ctype_alnum if(Str::length($actualWeight) < 1 || !is_numeric($actualWeight))//ctype_alnum
{ {
$validData = false; $validData = false;
@@ -391,20 +390,20 @@ class WeightValidationResource extends Resource
return; return;
} }
$uniqueInvalidHeat = array_unique($invalidHeat); // $uniqueInvalidHeat = array_unique($invalidHeat);
if (!empty($uniqueInvalidHeat)) { // if (!empty($uniqueInvalidHeat)) {
Notification::make() // Notification::make()
->title('Invalid: Heat Numbers') // ->title('Invalid: Heat Numbers')
->body('Heat number should contain minimum 4 characters!<br>Following item codes has invalid heat number:<br>' . implode(', ', $uniqueInvalidHeat)) // ->body('Heat number should contain minimum 4 characters!<br>Following item codes has invalid heat number:<br>' . implode(', ', $uniqueInvalidHeat))
->danger() // ->danger()
->seconds(2) // ->seconds(2)
->send(); // ->send();
if ($disk->exists($path)) { // if ($disk->exists($path)) {
$disk->delete($path); // $disk->delete($path);
} // }
return; // return;
} // }
$uniqueInvalidWeight = array_unique($invalidWeight); $uniqueInvalidWeight = array_unique($invalidWeight);
if (!empty($uniqueInvalidWeight)) { if (!empty($uniqueInvalidWeight)) {
@@ -520,8 +519,8 @@ class WeightValidationResource extends Resource
$materialCode = trim($row[0]); $materialCode = trim($row[0]);
$lineNumber = trim($row[1]); $lineNumber = trim($row[1]);
$batchNumber = trim($row[2]); $batchNumber = trim($row[2]);
$heatNumber = trim($row[3]); // $heatNumber = trim($row[3]);
$actualWeight = trim($row[4]); $actualWeight = trim($row[3]);
if (empty($materialCode) || Str::length($materialCode) < 6) { if (empty($materialCode) || Str::length($materialCode) < 6) {
continue; continue;
@@ -543,7 +542,7 @@ class WeightValidationResource extends Resource
$recordExist->update([ $recordExist->update([
'item_id' => $masItem->id, 'item_id' => $masItem->id,
'batch_number' => $batchNumber, 'batch_number' => $batchNumber,
'heat_number' => $heatNumber, //'heat_number' => $heatNumber,
'obd_weight' => $actualWeight, 'obd_weight' => $actualWeight,
'updated_at' => now(), 'updated_at' => now(),
]); ]);
@@ -559,7 +558,7 @@ class WeightValidationResource extends Resource
'obd_number' => $originalNameOnly, 'obd_number' => $originalNameOnly,
'line_number' => $lineNumber, 'line_number' => $lineNumber,
'batch_number' => $batchNumber, 'batch_number' => $batchNumber,
'heat_number' => $heatNumber, //'heat_number' => $heatNumber,
'obd_weight' => $actualWeight, 'obd_weight' => $actualWeight,
]); ]);
if (in_array($lineNumber, $availLines)) if (in_array($lineNumber, $availLines))