ranjith-dev #630

Merged
jothi merged 3 commits from ranjith-dev into master 2026-05-21 14:09:18 +00:00
3 changed files with 12 additions and 2 deletions

View File

@@ -38,6 +38,8 @@ class ProductCharacteristicsMasterExporter extends Exporter
->label('CHARACTERISTICS TYPE'), ->label('CHARACTERISTICS TYPE'),
ExportColumn::make('name') ExportColumn::make('name')
->label('CHARACTERISTICS NAME'), ->label('CHARACTERISTICS NAME'),
ExportColumn::make('category')
->label('CATEGORY'),
ExportColumn::make('inspection_type') ExportColumn::make('inspection_type')
->label('INSPECTION TYPE'), ->label('INSPECTION TYPE'),
ExportColumn::make('lower') ExportColumn::make('lower')

View File

@@ -70,6 +70,11 @@ class ProductCharacteristicsMasterImporter extends Importer
->exampleHeader('CHARACTERISTICS NAME') ->exampleHeader('CHARACTERISTICS NAME')
->example(['TEST01', 'TEST02']) ->example(['TEST01', 'TEST02'])
->rules(['required']), ->rules(['required']),
ImportColumn::make('category')
->label('CATEGORY')
->requiredMapping()
->exampleHeader('CATEGORY')
->example(['Open Pump', 'Submersible Pump']),
ImportColumn::make('inspection_type') ImportColumn::make('inspection_type')
->label('INSPECTION TYPE') ->label('INSPECTION TYPE')
->requiredMapping() ->requiredMapping()
@@ -110,6 +115,7 @@ class ProductCharacteristicsMasterImporter extends Importer
$workCenter = trim($this->data['machine']) ?? null; $workCenter = trim($this->data['machine']) ?? null;
$charTyp = trim($this->data['characteristics_type']) ?? null; $charTyp = trim($this->data['characteristics_type']) ?? null;
$charNam = trim($this->data['name']) ?? null; $charNam = trim($this->data['name']) ?? null;
$category = trim($this->data['category']) ?? null;
$inspectTyp = trim($this->data['inspection_type']) ?? null; $inspectTyp = trim($this->data['inspection_type']) ?? null;
$lower = trim($this->data['lower']) ?? null; $lower = trim($this->data['lower']) ?? null;
$middle = trim($this->data['middle']) ?? null; $middle = trim($this->data['middle']) ?? null;
@@ -295,6 +301,7 @@ class ProductCharacteristicsMasterImporter extends Importer
'name' => $charNam, 'name' => $charNam,
], ],
[ [
'category' => $category,
'inspection_type' => $inspectTyp, 'inspection_type' => $inspectTyp,
'lower' => $lower, 'lower' => $lower,
'middle' => $middle, 'middle' => $middle,

View File

@@ -119,7 +119,8 @@ class VehicleEntryResource extends Resource
->label('Vehicle Number') ->label('Vehicle Number')
->alignCenter() ->alignCenter()
->sortable() ->sortable()
->searchable(), ->searchable()
->formatStateUsing(fn ($state) => strtoupper($state)),
Tables\Columns\TextColumn::make('entry_time') Tables\Columns\TextColumn::make('entry_time')
->label('Entry Time') ->label('Entry Time')
->alignCenter() ->alignCenter()
@@ -183,7 +184,7 @@ class VehicleEntryResource extends Resource
// return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::orderBy('code')->pluck('name', 'id')->toArray(); // return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::orderBy('code')->pluck('name', 'id')->toArray();
}) })
->afterStateUpdated(function ($state, callable $set, callable $get) { ->afterStateUpdated(function ($state, callable $set, callable $get) {
$set('Line', null); $set('vehicle_number', null);
}), }),
TextInput::make('vehicle_number') TextInput::make('vehicle_number')
->label('Vehicle Number') ->label('Vehicle Number')