Added uom column on report view and export

app/Console/Commands/SendInvoiceReport.php

@@ -34,6 +34,8 @@ class SendInvoiceReport extends Command
         // $scheduleType = $this->argument('scheduleType');
         $plantIdArg = (int) $this->argument('plant'); // can be 0 for all plants
 
+        // $mailRules = \App\Models\AlertMailRule::where('module', 'InvoiceValidation')->get()->groupBy('rule_name');
+
         $mailRules = \App\Models\AlertMailRule::where('module', 'InvoiceValidation')->get()->groupBy('rule_name');
 
         // $startDate = now()->setTime(8, 0, 0);

app/Filament/Exports/InvoiceValidationExporter.php

@@ -34,6 +34,8 @@ class InvoiceValidationExporter extends Exporter
                 ->label('ITEM CODE'),
             ExportColumn::make('stickerMaster.item.description')
                 ->label('ITEM DESCRIPTION'),
+            ExportColumn::make('stickerMaster.item.uom')
+                ->label('UNIT OF MEASURE'),
             ExportColumn::make('motor_scanned_status')
                 ->label('MOTOR SCANNED STATUS'),
             ExportColumn::make('pump_scanned_status')

app/Filament/Exports/ProcessOrderExporter.php

@@ -59,7 +59,6 @@ class ProcessOrderExporter extends Exporter
             ExportColumn::make('deleted_at')
                 ->enabledByDefault(false)
                 ->label('DELETED AT'),
-
         ];
     }
 

app/Filament/Imports/InvoiceValidationImporter.php

@@ -110,7 +110,7 @@ class InvoiceValidationImporter extends Importer
             ImportColumn::make('operator_id')
                 ->requiredMapping()
                 ->exampleHeader('OPERATOR ID')
-                ->example('USER1')
+                ->example('USER00001')
                 ->label('OPERATOR ID')
                 ->rules(['required']),
             ImportColumn::make('created_at')
@@ -122,19 +122,19 @@ class InvoiceValidationImporter extends Importer
             ImportColumn::make('created_by')
                 ->requiredMapping()
                 ->exampleHeader('CREATED BY')
-                ->example('USER1')
+                ->example('USER00001')
                 ->label('CREATED BY')
                 ->rules(['required']),
             ImportColumn::make('updated_at')
                 ->requiredMapping()
                 ->exampleHeader('UPDATED AT')
-                ->example('USER1')
+                ->example('')
                 ->label('UPDATED AT')
                 ->rules(['required']),
             ImportColumn::make('updated_by')
                 ->requiredMapping()
                 ->exampleHeader('UPDATED BY')
-                ->example('')
+                ->example('USER00001')
                 ->label('UPDATED BY')
                 ->rules(['required']),
         ];

app/Filament/Imports/PlantImporter.php

@@ -82,7 +82,7 @@ class PlantImporter extends Importer
             $warnMsg[] = 'Name should contain at least 5 characters!';
         }
         if ($wareHouseNo == null || $wareHouseNo == '' || ! $wareHouseNo) {
-            $warnMsg[] = "Warehouse number can't be empty!";
+            // $warnMsg[] = "Warehouse number can't be empty!";
         } elseif (! is_numeric($wareHouseNo)) {
             $warnMsg[] = 'Warehouse number should contain only numeric values!';
         } elseif (Str::length($wareHouseNo) == 3) {

app/Filament/Imports/ProductCharacteristicsMasterImporter.php

@@ -102,7 +102,6 @@ class ProductCharacteristicsMasterImporter extends Importer
 
     public function resolveRecord(): ?ProductCharacteristicsMaster
     {
-
         $warnMsg = [];
         $plantCod = trim($this->data['plant']) ?? null;
         $itemCod = trim($this->data['item']) ?? null;

app/Filament/Imports/ProductionCharacteristicImporter.php

@@ -2,10 +2,17 @@
 
 namespace App\Filament\Imports;
 
+use App\Models\Item;
+use App\Models\Line;
+use App\Models\Machine;
+use App\Models\Plant;
 use App\Models\ProductionCharacteristic;
+use Filament\Actions\Imports\Exceptions\RowImportFailedException;
 use Filament\Actions\Imports\ImportColumn;
 use Filament\Actions\Imports\Importer;
 use Filament\Actions\Imports\Models\Import;
+use Filament\Facades\Filament;
+use Str;
 
 class ProductionCharacteristicImporter extends Importer
 {
@@ -16,40 +23,170 @@ class ProductionCharacteristicImporter extends Importer
         return [
             ImportColumn::make('plant')
                 ->requiredMapping()
-                ->relationship()
+                ->exampleHeader('PLANT CODE')
+                ->example('1200')
+                ->label('PLANT CODE')
+                ->relationship(resolveUsing: 'code')
                 ->rules(['required']),
             ImportColumn::make('line')
-                ->requiredMapping()
-                ->relationship()
-                ->rules(['required']),
+                ->exampleHeader('LINE NAME')
+                ->example('Poly Wrapped Wire SFG')
+                ->label('LINE NAME')
+                ->relationship(resolveUsing: 'name'),
             ImportColumn::make('item')
                 ->requiredMapping()
-                ->relationship()
+                ->exampleHeader('ITEM CODE')
+                ->example('123456')
+                ->label('ITEM CODE')
+                ->relationship(resolveUsing: 'code')
                 ->rules(['required']),
-            ImportColumn::make('machine')
+            ImportColumn::make('machine_name')
                 ->requiredMapping()
-                ->relationship()
+                ->exampleHeader('MACHINE NAME')
+                ->example('RMI001234')
+                ->label('MACHINE NAME')
+                // ->relationship(resolveUsing: 'work_center')
                 ->rules(['required']),
-            ImportColumn::make('production_order'),
-            ImportColumn::make('serial_number'),
-            ImportColumn::make('characteristic_name'),
-            ImportColumn::make('observed_value'),
-            ImportColumn::make('status'),
-            ImportColumn::make('inspection_status'),
-            ImportColumn::make('remark'),
-            ImportColumn::make('created_by'),
-            ImportColumn::make('updated_by'),
+            ImportColumn::make('production_order')
+                ->requiredMapping()
+                ->exampleHeader('PRODUCTION ORDER')
+                ->example('1880231')
+                ->label('PRODUCTION ORDER')
+                ->rules(['required']),
+            ImportColumn::make('serial_number')
+                ->requiredMapping()
+                ->exampleHeader('SERIAL NUMBER')
+                ->example('20001202121')
+                ->label('SERIAL NUMBER')
+                ->rules(['required']),
+            ImportColumn::make('characteristic_name')
+                ->requiredMapping()
+                ->exampleHeader('CHARACTERISTIC NAME')
+                ->example('Voltage')
+                ->label('CHARACTERISTIC NAME'),
+            ImportColumn::make('observed_value')
+                ->exampleHeader('OBSERVED VALUE')
+                ->example('0')
+                ->label('OBSERVED VALUE'),
+            ImportColumn::make('status')
+                ->exampleHeader('STATUS')
+                ->example('Ok')
+                ->label('STATUS'),
+            ImportColumn::make('remark')
+                ->exampleHeader('REMARK')
+                ->example('Issue')
+                ->label('REMARK'),
         ];
     }
 
     public function resolveRecord(): ?ProductionCharacteristic
     {
-        // return ProductionCharacteristic::firstOrNew([
-        //     // Update existing records, matching them by `$this->data['column_name']`
-        //     'email' => $this->data['email'],
-        // ]);
 
-        return new ProductionCharacteristic();
+        $warnMsg = [];
+        $plant = null;
+        $plantCod = trim($this->data['plant']) ?? '';
+        $plantId = null;
+        $iCode = trim($this->data['item']) ?? '';
+        $itemId = null;
+        $lineNam = trim($this->data['line']) ?? '';
+        $lineId = null;
+        $machineName = trim($this->data['machine_name'] ?? '');
+        $pOrder = trim($this->data['production_order'] ?? '');
+        $sNo = trim($this->data['serial_number'] ?? '');
+        $charName = trim($this->data['characteristic_name'] ?? '');
+        $obsValue = trim($this->data['observed_value'] ?? '');
+        $status = trim($this->data['status'] ?? '');
+        $remark = trim($this->data['remark'] ?? '');
+
+        if ($plantCod == null || $plantCod == '') {
+            $warnMsg[] = "Plant code can't be empty!";
+        } elseif (Str::length($plantCod) < 4 || ! is_numeric($plantCod) || ! preg_match('/^[1-9]\d{3,}$/', $plantCod)) {
+            $warnMsg[] = 'Invalid plant code found';
+        }
+        if ($iCode == null || $iCode == '') {
+            $warnMsg[] = "Item code can't be empty!";
+        } elseif (Str::length($iCode) < 6 || ! ctype_alnum($iCode)) {
+            $warnMsg[] = 'Invalid item code found!';
+        }
+        if ($machineName != null && $machineName != '' && Str::length($machineName) > 18) {
+            $warnMsg[] = 'Invalid machine name found!';
+        }
+
+        $plant = Plant::where('code', $plantCod)->first();
+        if (! $plant) {
+            $warnMsg[] = 'Plant not found!';
+        } else {
+            $plantId = $plant->id;
+        }
+
+        $itemCode = Item::where('code', $iCode)->first();
+        if (! $itemCode) {
+            $warnMsg[] = 'Item code not found!';
+        } else {
+            if ($plantId) {
+                $itemCode = Item::where('code', $iCode)->where('plant_id', $plantId)->first();
+                if (! $itemCode) {
+                    $warnMsg[] = 'Item code not found for the given plant!';
+                } else {
+                    $itemId = $itemCode->id;
+                }
+            }
+        }
+
+        $lineExists = Line::where('name', $lineNam)->first();
+        if (! $lineExists) {
+            $warnMsg[] = 'Line name not found!';
+        } else {
+            if ($plantId) {
+                $lineAgainstPlant = Line::where('name', $lineNam)->where('plant_id', $plantId)->first();
+                if (! $lineAgainstPlant) {
+                    $warnMsg[] = 'Line name not found for the given plant!';
+                } else {
+                    $lineId = $lineAgainstPlant->id;
+                }
+            }
+        }
+
+        $machineExists = Machine::where('work_center', $machineName)->first();
+        if (! $machineExists) {
+            $warnMsg[] = 'Machine not found!';
+        } else {
+            if ($plantId) {
+                $machineAgainstPlant = Machine::where('work_center', $machineName)->where('plant_id', $plantId)->first();
+                if (! $machineAgainstPlant) {
+                    $warnMsg[] = 'Machine not found for the given plant!';
+                } else {
+                    $machineId = $machineAgainstPlant->id;
+                }
+            }
+        }
+
+        if (! empty($warnMsg)) {
+            throw new RowImportFailedException(implode(', ', $warnMsg));
+        }
+
+        ProductionCharacteristic::Create(
+            [
+                'plant_id' => $plantId,
+                'line_id' => $lineId,
+                'item_id' => $itemId,
+                'machine_id' => $machineId,
+                'production_order' => $pOrder,
+                'serial_number' => $sNo,
+                'characteristic_name' => $charName,
+                'observed_value' => $obsValue,
+                'status' => $status,
+                'remark' => $remark,
+                'created_at' => now(),
+                'updated_at' => now(),
+                'created_by' => Filament::auth()->user()->name,
+                'updated_by' => Filament::auth()->user()->name,
+            ]
+        );
+
+        return null;
+
+        // return new ProductionCharacteristic();
     }
 
     public static function getCompletedNotificationBody(Import $import): string

app/Filament/Pages/Dashboard.php

@@ -23,6 +23,8 @@ class Dashboard extends \Filament\Pages\Dashboard
 
     protected static string $view = 'filament.pages.dashboard';
 
+    protected static ?string $slug = 'welcome';
+
 //     public function mount(): void
 //     {
 //        session()->forget(['selected_plant']);

app/Filament/Pages/ProductionQuantityPage.php

@@ -291,7 +291,6 @@ class ProductionQuantityPage extends Page implements HasForms
                         $machineId = $get('machine_id');
 
                         $this->mNam = $machineId;
-
                     })
                     ->extraAttributes(fn ($get) => [
                         // 'class' => $get('pqLineError') ? 'border-red-500' : '',

app/Filament/Resources/ImportTransitResource.php

@@ -22,6 +22,7 @@ use Filament\Notifications\Notification;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Storage;
 use Maatwebsite\Excel\Facades\Excel;
+// use PhpOffice\PhpSpreadsheet\IOFactory;
 
 class ImportTransitResource extends Resource
 {
@@ -446,6 +447,20 @@ class ImportTransitResource extends Resource
 
                             }
 
+                            // $spreadsheet = IOFactory::load($fullPath);
+
+                            // foreach ($spreadsheet->getAllSheets() as $sheet) {
+                            //     $state = $sheet->getSheetState();
+                            //     if ($state == \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet::SHEETSTATE_HIDDEN ||
+                            //         $state == \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet::SHEETSTATE_VERYHIDDEN) {
+                            //         Notification::make()
+                            //             ->title('Import Failed')
+                            //             ->body("Hidden sheet found: \"{$sheet->getTitle()}\". Please remove all hidden sheets and try again.")
+                            //             ->danger()
+                            //             ->send();
+                            //         return;
+                            //     }
+                            // }
 
                             try
                             {
@@ -459,6 +474,13 @@ class ImportTransitResource extends Resource
 
                                     try
                                     {
+
+                                        $formattedDate = null;
+                                        $formattedShipperDate = null;
+                                        $etaDate = null;
+                                        $etdDate = null;
+                                        $formattedBlRcvdDate = null;
+
                                         $criRfqNo        = trim($row[1] ?? '');
                                         $mailRcvdDate    = trim($row[2] ?? '');
                                         $pricolRefNo     = trim($row[3] ?? '');

app/Filament/Resources/InvoiceValidationResource.php

@@ -61,6 +61,7 @@ class InvoiceValidationResource extends Resource
                 Section::make('')
                     ->schema([
                         Forms\Components\Select::make('plant_id')
+                            ->label('Plant Name')
                             ->relationship('plant', 'name')
                             ->required()
                             // ->preload()
@@ -278,6 +279,11 @@ class InvoiceValidationResource extends Resource
                     ->alignCenter()
                     ->sortable() // ->searchable()
                     ->toggleable(isToggledHiddenByDefault: true),
+                Tables\Columns\TextColumn::make('stickerMaster.item.uom')
+                    ->label('Unit of Measure')
+                    ->alignCenter()
+                    ->sortable() // ->searchable()
+                    ->toggleable(isToggledHiddenByDefault: true),
                 Tables\Columns\TextColumn::make('serial_number')
                     ->label('Serial Number')
                     ->alignCenter()
@@ -323,7 +329,7 @@ class InvoiceValidationResource extends Resource
                     ->alignCenter()
                     ->numeric(),
                 Tables\Columns\TextColumn::make('plant.name')
-                    ->label('Plant')
+                    ->label('Plant Name')
                     ->alignCenter()
                     ->sortable(),
                 Tables\Columns\TextColumn::make('created_by')
@@ -381,7 +387,7 @@ class InvoiceValidationResource extends Resource
                                 return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::orderBy('code')->pluck('name', 'id')->toArray();
                             })
                             ->searchable()
-                            ->label('Select Plant')
+                            ->label('Search by Plant Name')
                             ->required()
                             ->default(function () {
                                 return optional(InvoiceValidation::latest()->first())->plant_id;
@@ -404,7 +410,7 @@ class InvoiceValidationResource extends Resource
                             ->reactive(),
 
                         FileUpload::make('invoice_serial_number')
-                            ->label('Invoice Serial Number')
+                            ->label('Choose Serial Invoice')
                             ->required()
                             ->acceptedFileTypes([
                                 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
@@ -732,7 +738,7 @@ class InvoiceValidationResource extends Resource
                                 return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::orderBy('code')->pluck('name', 'id')->toArray();
                             })
                             ->searchable()
-                            ->label('Select Plant')
+                            ->label('Search by Plant Name')
                             ->required()
                             ->default(function () {
                                 return optional(InvoiceValidation::latest()->first())->plant_id;
@@ -755,7 +761,7 @@ class InvoiceValidationResource extends Resource
                             ->reactive(),
 
                         FileUpload::make('invoice_material')
-                            ->label('Invoice Material')
+                            ->label('Choose Material Invoice')
                             ->required()
                             ->acceptedFileTypes([
                                 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',

app/Filament/Resources/InvoiceValidationResource/Pages/CreateInvoiceValidation.php

@@ -10,6 +10,8 @@ use App\Models\InvoiceValidation;
 use App\Models\Item;
 use App\Models\Plant;
 use App\Models\StickerMaster;
+use App\Models\WireMasterPacking;
+use DB;
 use Filament\Facades\Filament;
 use Filament\Notifications\Notification;
 use Filament\Pages\Concerns\ExposesTableToWidgets;
@@ -174,17 +176,15 @@ class CreateInvoiceValidation extends CreateRecord
             }
 
             if (isset($matches[1])) {
-                $invoiceNumber = $matches[1];
+                $invoiceNumber = strtoupper($matches[1]);
             }
+        } else {
+            $invoiceNumber = strtoupper($invoiceNumber);
         }
 
-        // dd($invoiceNumber);
-
-        // ..
-
         $updateStatus = $this->form->getState()['update_invoice'] ?? null;
 
-        $this->invoiceNumber = trim($this->form->getState()['invoice_number']) ?? $invoiceNumber;
+        $this->invoiceNumber = strtoupper(trim($this->form->getState()['invoice_number'])) ?? $invoiceNumber;
 
         $invoiceType = null;
         // $this->invoiceNumber = $this->invoiceNumber ?? $invoiceNumber;
@@ -2317,7 +2317,7 @@ class CreateInvoiceValidation extends CreateRecord
     protected function refreshInvoiceTable()
     {
         $this->plantId = $this->form->getState()['plant_id'] ?? '';
-        $this->invoiceNumber = $this->form->getState()['invoice_number'] ?? '';
+        $this->invoiceNumber = strtoupper(trim($this->form->getState()['invoice_number'])) ?? '';
 
         if (! empty($this->invoiceNumber)) {
             $hasInvoice = InvoiceValidation::where('invoice_number', $this->invoiceNumber)->where('plant_id', $this->plantId)->first();
@@ -2378,7 +2378,7 @@ class CreateInvoiceValidation extends CreateRecord
         $serialNumber = null;
         $plantId = $this->form->getState()['plant_id'];
         $this->plantId = $plantId;
-        $invoiceNumber = $this->form->getState()['invoice_number'];
+        $invoiceNumber = strtoupper(trim($this->form->getState()['invoice_number']));
         $this->invoiceNumber = $invoiceNumber;
 
         $plant = Plant::find($plantId);
@@ -2455,14 +2455,65 @@ class CreateInvoiceValidation extends CreateRecord
                     $this->dispatch('refreshMaterialInvoiceData', invoiceNumber: $invoiceNumber, plantId: $plantId);
                 }
 
+                $pattern0 = '/^(?<item_code>[^|]+)\|(?<batch_id>[^|]+)\|(?<batch_count>[^|]+)\|(?<batch_quantity>[0-9]+(?:\.[0-9]+)?)kg$/i';
                 $pattern1 = '/^(?<item_code>[^|]+)\|(?<batch_number>[^|]+)\|(?<batch_id>[^|]+)\|(?<batch_count>[^|]+)\/(?<batch_quantity>.+)$/i';
                 $pattern2 = '/^(?<item_code>[^|]+)\|(?<batch_number>[^|]+)\|(?<batch_id>[^|]+)\|(?<batch_count>.+)$/i';
                 $pattern3 = '/^(?<item_code>[^|]+)\|(?<batch_id>[^|]+)-(?<batch_count>.+)$/i';
+                $pattern4 = '/^MP-(?<code>.+)$/i';
                 $itemCode = '';
                 $batchNumber = '';
                 $curScanQty = '';
+                $wirePallet = '';
+                $curMaterialQty = '';
+                $curMaterialSer = '';
 
-                if (preg_match($pattern1, $serNo, $matches)) {
+                if (preg_match($pattern0, $serNo, $matches)) {
+                    $itemCode = $matches['item_code'];
+                    $this->currentItemCode = $itemCode;
+                    $curScanQty = $matches['batch_quantity'];
+                    $serialNumber = $matches['batch_id'].'-'.$matches['batch_count'];
+                    $serNo = null;
+
+                    if (empty($matches['batch_id']) || ! $matches['batch_id']) {
+                        Notification::make()
+                            ->danger()
+                            ->title('Invalid Material QR Format')
+                            ->body('Scan valid Material QR code to proceed!<br>Sample formats are:<br>123456|123456789|001|5kg (or)<br>123456|12345|12345678|1/1 (or)<br>123456|12345|12345678|1 (or)<br>123456|12345678-1')
+                            ->seconds(2)
+                            ->send();
+                        $this->dispatch('playWarnSound');
+
+                        $this->form->fill([
+                            'plant_id' => $plantId,
+                            'invoice_number' => $invoiceNumber,
+                            'serial_number' => null,
+                            'total_quantity' => $totQuan,
+                            'update_invoice' => false,
+                            'scanned_quantity' => $scanMQuan,
+                        ]);
+
+                        return;
+                    } elseif (empty($matches['batch_count']) || ! $matches['batch_count']) {
+                        Notification::make()
+                            ->danger()
+                            ->title('Invalid Material QR Format')
+                            ->body('Scan valid Material QR code to proceed!<br>Sample formats are:<br>123456|123456789|001|5kg (or)<br>123456|12345|12345678|1/1 (or)<br>123456|12345|12345678|1 (or)<br>123456|12345678-1')
+                            ->seconds(2)
+                            ->send();
+                        $this->dispatch('playWarnSound');
+
+                        $this->form->fill([
+                            'plant_id' => $plantId,
+                            'invoice_number' => $invoiceNumber,
+                            'serial_number' => null,
+                            'total_quantity' => $totQuan,
+                            'update_invoice' => false,
+                            'scanned_quantity' => $scanMQuan,
+                        ]);
+
+                        return;
+                    }
+                } elseif (preg_match($pattern1, $serNo, $matches)) {
                     $itemCode = $matches['item_code'];
                     $this->currentItemCode = $itemCode;
                     $batchNumber = $matches['batch_number'];
@@ -2470,11 +2521,45 @@ class CreateInvoiceValidation extends CreateRecord
                     $curScanQty = $matches['batch_quantity'];
                     $serNo = null;
 
-                    if (empty($matches['batch_id']) || ! $matches['batch_id']) {
+                    if (empty($matches['batch_number']) || ! $matches['batch_number']) {
                         Notification::make()
                             ->danger()
                             ->title('Invalid Material QR Format')
-                            ->body('Scan valid Material QR code proceed!<br>Sample formats are:<br>123456|12345|12345678|1/1 (or)<br>123456|12345|12345678|1 (or)<br>123456|12345678-1')
+                            ->body('Scan valid Material QR code to proceed!<br>Sample formats are:<br>123456|123456789|001|5kg (or)<br>123456|12345|12345678|1/1 (or)<br>123456|12345|12345678|1 (or)<br>123456|12345678-1')
+                            ->seconds(2)
+                            ->send();
+                        $this->dispatch('playWarnSound');
+
+                        // .Mail
+
+                        // $mailData = $this->getMail();
+                        // $mPlantName = $mailData['plant_name'];
+                        // $emails = $mailData['emails'];
+                        // $mInvoiceType = 'Material';
+
+                        // if (! empty($emails)) {
+                        //     Mail::to($emails)->send(
+                        //         new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat')
+                        //     );
+                        // } else {
+                        //     \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
+                        // }
+
+                        $this->form->fill([
+                            'plant_id' => $plantId,
+                            'invoice_number' => $invoiceNumber,
+                            'serial_number' => null,
+                            'total_quantity' => $totQuan,
+                            'update_invoice' => false,
+                            'scanned_quantity' => $scanMQuan,
+                        ]);
+
+                        return;
+                    } elseif (empty($matches['batch_id']) || ! $matches['batch_id']) {
+                        Notification::make()
+                            ->danger()
+                            ->title('Invalid Material QR Format')
+                            ->body('Scan valid Material QR code to proceed!<br>Sample formats are:<br>123456|123456789|001|5kg (or)<br>123456|12345|12345678|1/1 (or)<br>123456|12345|12345678|1 (or)<br>123456|12345678-1')
                             ->seconds(2)
                             ->send();
                         $this->dispatch('playWarnSound');
@@ -2508,42 +2593,7 @@ class CreateInvoiceValidation extends CreateRecord
                         Notification::make()
                             ->danger()
                             ->title('Invalid Material QR Format')
-                            ->body('Scan valid Material QR code proceed!<br>Sample formats are:<br>123456|12345|12345678|1/1 (or)<br>123456|12345|12345678|1 (or)<br>123456|12345678-1')
-                            ->seconds(2)
-                            ->send();
-                        $this->dispatch('playWarnSound');
-
-                        // .Mail
-
-                        // $mailData = $this->getMail();
-                        // $mPlantName = $mailData['plant_name'];
-                        // $emails = $mailData['emails'];
-                        // $mInvoiceType = 'Material';
-
-                        // if (! empty($emails)) {
-                        //     // Mail::to($emails)->send(new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType));
-                        //     Mail::to($emails)->send(
-                        //         new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat')
-                        //     );
-                        // } else {
-                        //     \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
-                        // }
-
-                        $this->form->fill([
-                            'plant_id' => $plantId,
-                            'invoice_number' => $invoiceNumber,
-                            'serial_number' => null,
-                            'total_quantity' => $totQuan,
-                            'update_invoice' => false,
-                            'scanned_quantity' => $scanMQuan,
-                        ]);
-
-                        return;
-                    } elseif (! is_numeric($curScanQty)) {
-                        Notification::make()
-                            ->danger()
-                            ->title('Invalid Material QR Format')
-                            ->body('Scan valid Material QR code proceed!<br>Sample formats are:<br>123456|12345|12345678|1/1 (or)<br>123456|12345|12345678|1 (or)<br>123456|12345678-1')
+                            ->body('Scan valid Material QR code to proceed!<br>Sample formats are:<br>123456|123456789|001|5kg (or)<br>123456|12345|12345678|1/1 (or)<br>123456|12345|12345678|1 (or)<br>123456|12345678-1')
                             ->seconds(2)
                             ->send();
                         $this->dispatch('playWarnSound');
@@ -2580,13 +2630,48 @@ class CreateInvoiceValidation extends CreateRecord
                     $this->currentItemCode = $itemCode;
                     $batchNumber = $matches['batch_number'];
                     $serialNumber = $matches['batch_id'].'-'.$matches['batch_count'];
+                    $curMaterialSer = $matches['batch_number'].'-'.$matches['batch_id'];
+                    $curMaterialQty = $matches['batch_count'];
                     $serNo = null;
 
-                    if (empty($matches['batch_id']) || ! $matches['batch_id']) {
+                    if (empty($matches['batch_number']) || ! $matches['batch_number']) {
                         Notification::make()
                             ->danger()
                             ->title('Invalid Material QR Format')
-                            ->body('Scan valid Material QR code proceed!<br>Sample formats are:<br>123456|12345|12345678|1/1 (or)<br>123456|12345|12345678|1 (or)<br>123456|12345678-1')
+                            ->body('Scan valid Material QR code to proceed!<br>Sample formats are:<br>123456|123456789|001|5kg (or)<br>123456|12345|12345678|1/1 (or)<br>123456|12345|12345678|1 (or)<br>123456|12345678-1')
+                            ->seconds(2)
+                            ->send();
+                        $this->dispatch('playWarnSound');
+                        // .Mail
+
+                        // $mailData = $this->getMail();
+                        // $mPlantName = $mailData['plant_name'];
+                        // $emails = $mailData['emails'];
+                        // $mInvoiceType = 'Material';
+
+                        // if (! empty($emails)) {
+                        //     Mail::to($emails)->send(
+                        //         new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat')
+                        //     );
+                        // } else {
+                        //     \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
+                        // }
+
+                        $this->form->fill([
+                            'plant_id' => $plantId,
+                            'invoice_number' => $invoiceNumber,
+                            'serial_number' => null,
+                            'total_quantity' => $totQuan,
+                            'update_invoice' => false,
+                            'scanned_quantity' => $scanMQuan,
+                        ]);
+
+                        return;
+                    } elseif (empty($matches['batch_id']) || ! $matches['batch_id']) {
+                        Notification::make()
+                            ->danger()
+                            ->title('Invalid Material QR Format')
+                            ->body('Scan valid Material QR code to proceed!<br>Sample formats are:<br>123456|123456789|001|5kg (or)<br>123456|12345|12345678|1/1 (or)<br>123456|12345|12345678|1 (or)<br>123456|12345678-1')
                             ->seconds(2)
                             ->send();
                         $this->dispatch('playWarnSound');
@@ -2619,7 +2704,7 @@ class CreateInvoiceValidation extends CreateRecord
                         Notification::make()
                             ->danger()
                             ->title('Invalid Material QR Format')
-                            ->body('Scan valid Material QR code proceed!<br>Sample formats are:<br>123456|12345|12345678|1/1 (or)<br>123456|12345|12345678|1 (or)<br>123456|12345678-1')
+                            ->body('Scan valid Material QR code to proceed!<br>Sample formats are:<br>123456|123456789|001|5kg (or)<br>123456|12345|12345678|1/1 (or)<br>123456|12345|12345678|1 (or)<br>123456|12345678-1')
                             ->seconds(2)
                             ->send();
                         $this->dispatch('playWarnSound');
@@ -2659,7 +2744,7 @@ class CreateInvoiceValidation extends CreateRecord
                         Notification::make()
                             ->danger()
                             ->title('Invalid Material QR Format')
-                            ->body('Scan valid Material QR code proceed!<br>Sample formats are:<br>123456|12345|12345678|1/1 (or)<br>123456|12345|12345678|1 (or)<br>123456|12345678-1')
+                            ->body('Scan valid Material QR code to proceed!<br>Sample formats are:<br>123456|123456789|001|5kg (or)<br>123456|12345|12345678|1/1 (or)<br>123456|12345|12345678|1 (or)<br>123456|12345678-1')
                             ->seconds(2)
                             ->send();
                         $this->dispatch('playWarnSound');
@@ -2693,7 +2778,7 @@ class CreateInvoiceValidation extends CreateRecord
                         Notification::make()
                             ->danger()
                             ->title('Invalid Material QR Format')
-                            ->body('Scan valid Material QR code proceed!<br>Sample formats are:<br>123456|12345|12345678|1/1 (or)<br>123456|12345|12345678|1 (or)<br>123456|12345678-1')
+                            ->body('Scan valid Material QR code to proceed!<br>Sample formats are:<br>123456|123456789|001|5kg (or)<br>123456|12345|12345678|1/1 (or)<br>123456|12345|12345678|1 (or)<br>123456|12345678-1')
                             ->seconds(2)
                             ->send();
                         $this->dispatch('playWarnSound');
@@ -2723,6 +2808,294 @@ class CreateInvoiceValidation extends CreateRecord
 
                         return;
                     }
+                } elseif (preg_match($pattern4, $serNo, $matches)) {
+                    $wirePallet = 'MP-'.$matches['code'];
+                    $wirePattern = '/^MP-(?<code>\d+)$/i';
+
+                    if (! preg_match($wirePattern, $serNo, $matches)) {
+                        Notification::make()
+                            ->title('Invalid Master Packing QR Format')
+                            ->body("Scan valid Master Packing QR code proceed!<br>Sample format : 'MP-2601001'")
+                            ->danger()
+                            ->seconds(1)
+                            ->send();
+
+                        return;
+                    }
+
+                    $wireMaster = WireMasterPacking::where('plant_id', $plantId)->where('wire_packing_number', $wirePallet)->first();
+
+                    if (! $wireMaster) {
+                        Notification::make()
+                            ->title('Master Pallet Not Found')
+                            ->body("No record found for this Master Packing QR $wirePallet")
+                            ->danger()
+                            ->seconds(2)
+                            ->send();
+
+                        return;
+                    }
+
+                    $wireItemCodes = WireMasterPacking::join('items', 'items.id', '=', 'wire_master_packings.item_id')
+                        ->where('wire_master_packings.plant_id', $plantId)
+                        ->where('wire_master_packings.wire_packing_number', $wirePallet)
+                        ->pluck('items.code')
+                        ->unique()
+                        ->toArray();
+
+                    $invoiceItemCodes = InvoiceValidation::join(
+                        'sticker_masters',
+                        'sticker_masters.id',
+                        '=',
+                        'invoice_validations.sticker_master_id'
+                    )
+                        ->join(
+                            'items',
+                            'items.id',
+                            '=',
+                            'sticker_masters.item_id'
+                        )
+                        ->where('invoice_validations.plant_id', $plantId)
+                        ->where('invoice_validations.invoice_number', $this->invoiceNumber)
+                        ->pluck('items.code')
+                        ->unique()
+                        ->toArray();
+
+                    $missedCodes = array_diff($wireItemCodes, $invoiceItemCodes);
+
+                    if (! empty($missedCodes)) {
+
+                        Notification::make()
+                            ->title('Items Missing in Invoice')
+                            ->body('Item codes are missing in invoice: '.implode(', ', $missedCodes))
+                            ->danger()
+                            ->seconds(3)
+                            ->send();
+
+                        return;
+                    }
+
+                    $duplicateSerial = [];
+                    $weightExceeded = [];
+                    $processedItems = [];
+                    $invalidMaterialItems = [];
+
+                    $wireItems1 = WireMasterPacking::join('items', 'items.id', '=', 'wire_master_packings.item_id')
+                        ->where('wire_master_packings.plant_id', $plantId)
+                        ->where('wire_master_packings.wire_packing_number', $wirePallet)
+                        ->select(
+                            'items.code as item_code',
+                            'wire_master_packings.process_order',
+                            DB::raw('SUM(wire_master_packings.weight::numeric) as pallet_weight')
+                        )
+                        ->groupBy('items.code', 'wire_master_packings.process_order')
+                        ->get();
+
+                    foreach ($wireItems1 as $wireItem) {
+                        $processOrder = $wireItem->process_order;
+                        $palletWeight = $wireItem->pallet_weight;
+                        $itemCode = $wireItem->item_code;
+
+                        $processedItems[] = $itemCode;
+
+                        $duplicate = InvoiceValidation::where('plant_id', $this->plantId)
+                            ->where('invoice_number', $this->invoiceNumber)
+                            ->where('serial_number', $processOrder)
+                            ->exists();
+
+                        if ($duplicate) {
+                            $duplicateSerial[] = $processOrder;
+
+                            continue;
+                        }
+
+                        $materialType = StickerMaster::where('item_id', function ($q) use ($itemCode) {
+                            $q->select('id')->from('items')->where('code', $itemCode);
+                        })->value('material_type');
+
+                        if ($materialType != 3) {
+                            if (! in_array($itemCode, $invalidMaterialItems)) {
+                                $invalidMaterialItems[] = $itemCode;
+                            }
+                        }
+
+                        $scannedQty = InvoiceValidation::join('sticker_masters', 'sticker_masters.id', '=', 'invoice_validations.sticker_master_id')
+                            ->join('items', 'items.id', '=', 'sticker_masters.item_id')
+                            ->where('invoice_validations.plant_id', $plantId)
+                            ->where('invoice_validations.invoice_number', $this->invoiceNumber)
+                            ->where('items.code', $itemCode)
+                            ->sum(DB::raw('invoice_validations.quantity::numeric'));
+
+                        if ($palletWeight > $scannedQty) {
+                            $weightExceeded[] = $itemCode;
+                        }
+                    }
+
+                    if (! empty($invalidMaterialItems)) {
+                        $uniqueInvalidItems = array_unique($invalidMaterialItems);
+                        Notification::make()
+                            ->title('Invalid Material Type')
+                            ->body(implode(', ', $uniqueInvalidItems)."<br>Invalid material type found for the invoice '$invoiceNumber'.")
+                            ->danger()
+                            ->seconds(4)
+                            ->send();
+
+                        return;
+                    } elseif (! empty($weightExceeded)) {
+                        Notification::make()
+                            ->title('Item Code Limit')
+                            ->body(implode(', ', $weightExceeded)."<br>Master pallet weight exceeds the remaining quantity in invoice '$invoiceNumber'.")
+                            ->danger()
+                            ->seconds(4)
+                            ->send();
+
+                        return;
+                    } elseif (! empty($duplicateSerial)) {
+                        Notification::make()
+                            ->title('Duplicate Serial Number')
+                            ->body(implode(', ', $duplicateSerial)."<br>Duplicate Serial numbers found for the invoice '$invoiceNumber'.")
+                            ->danger()
+                            ->seconds(4)
+                            ->send();
+
+                        return;
+                    }
+
+                    $itemExceeded = [];
+
+                    $invoiceRows = InvoiceValidation::where('plant_id', $plantId)
+                        ->where('invoice_number', $invoiceNumber)
+                        ->whereNull('serial_number')
+                        ->get();
+
+                    $palletItems = WireMasterPacking::where('wire_master_packings.plant_id', $plantId)
+                        ->where('wire_master_packings.wire_packing_number', $wirePallet)
+                        ->join('items', 'items.id', '=', 'wire_master_packings.item_id')
+                        ->select(
+                            'items.code as item_code',
+                            DB::raw('SUM(wire_master_packings.weight::numeric) as pallet_weight')
+                        )
+                        ->groupBy('items.code')
+                        ->get();
+
+                    foreach ($invoiceRows as $row) {
+                        $itemCode = $row->stickerMaster->item->code ?? null;
+
+                        if (! $itemCode) {
+                            continue;
+                        }
+
+                        $pallet = $palletItems->firstWhere('item_code', $itemCode);
+                        $palletWeight = $pallet->pallet_weight ?? 0;
+
+                        $remainingQty = $row->quantity;
+
+                        if ($palletWeight > $remainingQty) {
+                            $itemExceeded[] = $itemCode;
+                        }
+                    }
+
+                    $items = implode(', ', $itemExceeded);
+
+                    if (! empty($itemExceeded)) {
+                        Notification::make()
+                            ->title('Item Code Limit')
+                            ->body("Pallet weight exceeds remaining quantity for invoice number '$invoiceNumber'for below item codes <br>$items")
+                            ->danger()
+                            ->seconds(5)
+                            ->send();
+
+                        return;
+                    }
+
+                    $wireItems = WireMasterPacking::join('items', 'items.id', '=', 'wire_master_packings.item_id')
+                        ->where('wire_master_packings.wire_packing_number', $wirePallet)
+                        ->select(
+                            'items.code as item_code',
+                            'wire_master_packings.process_order',
+                            'wire_master_packings.weight as pallet_weight'
+                            // DB::raw('(wire_master_packings.weight::numeric) as pallet_weight')
+                        )
+                        ->get();
+
+                    foreach ($wireItems as $wireItem) {
+
+                        $itemCode = $wireItem->item_code;
+                        $palletWeight = $wireItem->pallet_weight;
+                        $processOrder = $wireItem->process_order;
+
+                        if (! $processOrder || $palletWeight <= 0) {
+                            continue;
+                        }
+
+                        $records = InvoiceValidation::join('sticker_masters', 'sticker_masters.id', '=', 'invoice_validations.sticker_master_id')
+                            ->join('items', 'items.id', '=', 'sticker_masters.item_id')
+                            ->where('invoice_validations.invoice_number', $invoiceNumber)
+                            ->where('invoice_validations.plant_id', $plantId)
+                            ->where('items.code', $itemCode)
+                            ->whereNull('invoice_validations.serial_number')
+                            ->where('invoice_validations.quantity', '>', 0)
+                            ->orderBy('invoice_validations.created_at')
+                            ->select('invoice_validations.*')
+                            ->get();
+
+                        if ($records->isEmpty()) {
+                            continue;
+                        }
+
+                        foreach ($records as $record) {
+
+                            if ($palletWeight <= 0) {
+                                break;
+                            }
+
+                            $usedQty = min($record->quantity, $palletWeight);
+
+                            $record->quantity -= $usedQty;
+
+                            if ($usedQty == $record->quantity + $usedQty) {
+                                $record->serial_number = $processOrder;
+                                $record->quantity = $palletWeight;
+                                $record->save();
+                            } else {
+                                $record->save();
+
+                                InvoiceValidation::create([
+                                    'sticker_master_id' => $record->sticker_master_id,
+                                    'plant_id' => $plantId,
+                                    'invoice_number' => $invoiceNumber,
+                                    'serial_number' => $processOrder,
+                                    'quantity' => $usedQty,
+                                    'operator_id' => $operatorName,
+                                    'created_by' => $operatorName,
+                                    'updated_by' => $operatorName,
+                                ]);
+                            }
+
+                            $palletWeight -= $usedQty;
+
+                            // if ($record->quantity <= 0) {
+                            //     $records->forget($key);
+                            // }
+                        }
+                    }
+
+                    $this->dispatch('refreshMaterialInvoiceData', invoiceNumber: $invoiceNumber, plantId: $plantId);
+
+                    $totQuan = InvoiceValidation::where('plant_id', $plantId)->where('invoice_number', $invoiceNumber)->count();
+
+                    $scanMQuan = InvoiceValidation::where('invoice_number', $invoiceNumber)->whereNotNull('serial_number')->where('serial_number', '!=', '')->where('plant_id', $plantId)->count();
+
+                    $this->form->fill([
+                        'plant_id' => $plantId,
+                        'invoice_number' => $invoiceNumber,
+                        'serial_number' => null,
+                        'total_quantity' => $totQuan,
+                        'update_invoice' => false,
+                        'scanned_quantity' => $scanMQuan,
+                    ]);
+
+                    return;
                 } else {
                     $itemCode = null;
                     $this->currentItemCode = '';
@@ -2733,7 +3106,7 @@ class CreateInvoiceValidation extends CreateRecord
                     Notification::make()
                         ->danger()
                         ->title('Invalid Material QR Format')
-                        ->body('Scan valid Material QR code proceed!<br>Sample formats are:<br>123456|12345|12345678|1/1 (or)<br>123456|12345|12345678|1 (or)<br>123456|12345678-1')
+                        ->body('Scan valid Material QR code to proceed!<br>Sample formats are:<br>123456|123456789|001|5kg (or)<br>123456|12345|12345678|1/1 (or)<br>123456|12345|12345678|1 (or)<br>123456|12345678-1')
                         ->seconds(1)
                         ->send();
 
@@ -2866,6 +3239,12 @@ class CreateInvoiceValidation extends CreateRecord
 
                 $hasQuanTyp = ($record->material_type == 3) ? true : false;
 
+                if ($hasQuanTyp && $curMaterialSer && $curMaterialQty) {
+                    $batchNumber = null;
+                    $serialNumber = $curMaterialSer;
+                    $curScanQty = $curMaterialQty;
+                }
+
                 $record = InvoiceValidation::where('invoice_number', $invoiceNumber)
                     ->where('plant_id', $plantId)
                     ->whereHas('stickerMasterRelation.item', function ($query) use ($itemCode) {
@@ -2948,7 +3327,7 @@ class CreateInvoiceValidation extends CreateRecord
                         Notification::make()
                             ->danger()
                             ->title('Invalid Quantity Material QR Format')
-                            ->body('Scan valid Quantity Material QR code proceed!<br>Ex:123456|12345|12345678|1/1')
+                            ->body('Scan valid Quantity Material QR code to proceed!<br>Sample formats are:<br>123456|123456789|001|5kg (or)<br>123456|12345|12345678|1/1 (or)<br>123456|12345|12345678|1')
                             ->seconds(2)
                             ->send();
                         $this->dispatch('playWarnSound');
@@ -2994,8 +3373,8 @@ class CreateInvoiceValidation extends CreateRecord
                         $record->serial_number = $serialNumber;
                         $record->batch_number = $batchNumber;
                         $record->operator_id = $operatorName;
-                        // $record->updated_by = $operatorName;
-                        // $record->updated_at = now();
+                        $record->updated_by = $operatorName;
+                        $record->updated_at = now();
                         $record->save();
 
                         // InvoiceValidation::create([
@@ -3231,7 +3610,6 @@ class CreateInvoiceValidation extends CreateRecord
                     }
 
                     $record = InvoiceValidation::where('serial_number', $serialNumber)->where('invoice_number', $invoiceNumber)->where('plant_id', $plantId)->first();
-                    // $invoiceNumber = $this->form->getState()['invoice_number'];
 
                     if (! $record) {
                         Notification::make()

app/Filament/Resources/PlantResource.php

@@ -132,7 +132,7 @@ class PlantResource extends Resource
                             ->hint(fn ($get) => $get('pNameError') ? $get('pNameError') : null)
                             ->hintColor('danger'),
                         Forms\Components\TextInput::make('warehouse_number')
-                            ->required()
+                            // ->required()
                             ->label('Warehouse Number')
                             ->placeholder('Scan the valid warehouse number')
                             ->unique(ignoreRecord: true)

app/Filament/Resources/ProductionCharacteristicResource.php

@@ -339,8 +339,9 @@ class ProductionCharacteristicResource extends Resource
                                 // 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) {
-                                $set('Item', null);
                                 $set('Line', null);
+                                $set('Item', null);
+                                $set('Machine', null);
                             }),
                         Select::make('Line')
                             ->label('Search by Line Name')
@@ -361,7 +362,7 @@ class ProductionCharacteristicResource extends Resource
                                 })->pluck('name', 'id');
                             })
                             ->afterStateUpdated(function ($state, callable $set, callable $get) {
-                                $set('process_order', null);
+                                $set('Machine', null);
                             }),
                         Select::make('Item')
                             ->label('Search by Item Code')

app/Filament/Resources/ProductionOrderResource.php

@@ -203,7 +203,6 @@ class ProductionOrderResource extends Resource
                             ->label('Production Order')
                             ->readOnly()
                             ->visible(fn ($get) => $get('quantity') > 0),
-                        // ->visible(fn ($get) => $get('show_extra_fields')),
                         Forms\Components\TextInput::make('from_serial_number')
                             ->label('From Serial Number')
                             ->readOnly()

app/Filament/Resources/ProductionOrderResource/Pages/CreateProductionOrder.php

@@ -245,7 +245,6 @@ class CreateProductionOrder extends CreateRecord
         } else {
             return redirect()->route('production-orders.printpanel', ['production_order' => $pOrder, 'plant_code' => $plantCode]);
         }
-
     }
 
     protected function getFormActions(): array

app/Filament/Resources/QualityValidationResource.php

@@ -94,7 +94,7 @@ class QualityValidationResource extends Resource
                 Forms\Components\Hidden::make('plant')
                     ->default(fn () => session('last_selected_plant_id'))
                     ->afterStateHydrated(function ($state, $set) {
-                        if (!$state && request()->has('plant_id')) {
+                        if (! $state && request()->has('plant_id')) {
                             $set('plant_id', request()->get('plant_id'));
                         }
                     }),
@@ -136,7 +136,7 @@ class QualityValidationResource extends Resource
                 Forms\Components\Hidden::make('line')
                     ->default(fn () => session('last_selected_line'))
                     ->afterStateHydrated(function ($state, $set) {
-                        if (!$state && request()->has('line_id')) {
+                        if (! $state && request()->has('line_id')) {
                             $set('line_id', request()->get('line_id'));
                         }
                     }),
@@ -178,7 +178,7 @@ class QualityValidationResource extends Resource
                 Forms\Components\Hidden::make('production')
                     ->default(fn () => session('last_selected_production'))
                     ->afterStateHydrated(function ($state, $set) {
-                        if (!$state && request()->has('production_order')) {
+                        if (! $state && request()->has('production_order')) {
                             $set('production_order', request()->get('production_order'));
                         }
                     }),
@@ -2423,7 +2423,6 @@ class QualityValidationResource extends Resource
                             $emails = $mailData['emails'];
                             $mUserName = Filament::auth()->user()->name;
 
-
                             if (! empty($emails)) {
                                 // Mail::to($emails)->send(new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType));
                                 Mail::to($emails)->send(
@@ -2519,7 +2518,6 @@ class QualityValidationResource extends Resource
                             $emails = $mailData['emails'];
                             $mUserName = Filament::auth()->user()->name;
 
-
                             if (! empty($emails)) {
                                 // Mail::to($emails)->send(new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType));
                                 Mail::to($emails)->send(
@@ -2711,7 +2709,6 @@ class QualityValidationResource extends Resource
                             $emails = $mailData['emails'];
                             $mUserName = Filament::auth()->user()->name;
 
-
                             if (! empty($emails)) {
                                 // Mail::to($emails)->send(new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType));
                                 Mail::to($emails)->send(
@@ -2864,16 +2861,6 @@ class QualityValidationResource extends Resource
                         'showChecklist' => $livewire->showChecklist,
                     ]),
 
-                // Forms\Components\View::make('components.production-checklist-wrapper')
-                // ->statePath('checklist')
-                // ->key('checklist-view')
-                // ->viewData(fn ($livewire) => [
-                //     'existingRecords' => is_array($livewire->existingRecords)
-                //                             ? $livewire->existingRecords
-                //                             : $livewire->existingRecords->toArray(),
-                //     'showChecklist' => $livewire->showChecklist,
-                // ]),
-
             ]);
     }
 
@@ -3066,7 +3053,6 @@ class QualityValidationResource extends Resource
             ])
 
             ->filters([
-
                 Tables\Filters\TrashedFilter::make(),
                 Filter::make('advanced_filters')
                     ->label('Advanced Filters')

app/Filament/Resources/TestingPanelReadingResource.php

@@ -630,7 +630,7 @@ class TestingPanelReadingResource extends Resource
                             ->options(function () {
                                 // return Plant::pluck('name', 'id');
                                 $userHas = Filament::auth()->user()->plant_id;
-                                
+
                                 if ($userHas && strlen($userHas) > 0) {
                                     return Plant::where('id', $userHas)->pluck('name', 'id')->toArray();
                                 } else {

app/Filament/Resources/VehicleEntryResource.php

@@ -37,6 +37,9 @@ class VehicleEntryResource extends Resource
                         return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::orderBy('code')->pluck('name', 'id')->toArray();
                     })
                     ->required(),
+                Forms\Components\TextInput::make('uuid')
+                    ->label('Uuid')
+                    ->required(),
                 Forms\Components\TextInput::make('vehicle_number')
                     ->label('Vehicle Number')
                     ->required(),
@@ -102,6 +105,11 @@ class VehicleEntryResource extends Resource
                     ->alignCenter()
                     ->sortable()
                     ->searchable(),
+                Tables\Columns\TextColumn::make('uuid')
+                    ->label('UUID')
+                    ->alignCenter()
+                    ->sortable()
+                    ->searchable(),
                 Tables\Columns\TextColumn::make('vehicle_number')
                     ->label('Vehicle Number')
                     ->alignCenter()

app/Filament/Resources/WireMasterPackingResource/Pages/CreateWireMasterPacking.php

@@ -3,6 +3,7 @@
 namespace App\Filament\Resources\WireMasterPackingResource\Pages;
 
 use App\Filament\Resources\WireMasterPackingResource;
+use App\Models\CustomerPoMaster;
 use App\Models\Item;
 use App\Models\Plant;
 use App\Models\WireMasterPacking;
@@ -81,7 +82,9 @@ class CreateWireMasterPacking extends CreateRecord
             return;
         }
 
-        $pattern = '/^([^|]+)\|([^|]+)\|(\d+(\.\d+)?)$/';
+        // $pattern = '/^([^|]+)\|([^|]+)\|(\d+(\.\d+)?)$/';
+        // $pattern = '/^([^|]+)\|([^|]+)\|([^|]+)\|(\d+(\.\d+)?)$/';
+        $pattern = '/^([^|]+)\|([^|]+)\|([^|]+)\|(\d+(\.\d+)?)(kg)?$/i';
 
         if (!preg_match($pattern, $processOrder, $matches))
         {
@@ -106,7 +109,8 @@ class CreateWireMasterPacking extends CreateRecord
 
         $materialCode   = $matches[1];
         $processOrderId = $matches[2];
-        $weight         = $matches[3];
+        $coilNo         = $matches[3];
+        $weight         = $matches[4];
 
         $icode = Item::where('code', $materialCode)->first();
 
@@ -160,7 +164,34 @@ class CreateWireMasterPacking extends CreateRecord
             return;
         }
 
-        $processOrderAgaPlant = WireMasterPacking::where('process_order', $processOrderId)->where('plant_id', $plantId)->first();
+        $itemId = Item::where('code', $materialCode)
+            ->where('plant_id', $plantId)
+            ->value('id');
+
+        $icodeAgaCPoPlant = CustomerPoMaster::where('item_id', $itemId)->where('plant_id', $plantId)->first();
+
+        if(!$icodeAgaCPoPlant)
+        {
+            Notification::make()
+                ->title("Unknown Item Code in Customer PO")
+                ->body("Item Code '$materialCode' not found in any active Customer PO against Plant Code '$plantcode'")
+                ->danger()
+                ->duration(5000)
+                ->send();
+
+            $this->form->fill([
+                'process_order' => null,
+                'plant_id' => $plantId,
+                'customer_po_master_id'  => $customerPo,
+                'wire_packing_number' => $wirePackNo,
+                'Sno_quantity' => 0,
+                'created_by'    => $operatorName,
+                'scanned_by'    => $operatorName,
+            ]);
+            return;
+        }
+
+        $processOrderAgaPlant = WireMasterPacking::where('process_order', $processOrderId . '-' . $coilNo)->where('plant_id', $plantId)->first();
 
         if($processOrderAgaPlant)
         {
@@ -182,6 +213,68 @@ class CreateWireMasterPacking extends CreateRecord
             ]);
             return;
         }
+
+        $customerPoRecord = CustomerPoMaster::where('id', $customerPo)
+            ->where('plant_id', $plantId)
+            ->first();
+
+        $customerPoName = $customerPoRecord->customer_po;
+
+        if ($customerPoRecord) {
+            $customerPoName = $customerPoRecord->customer_po;
+        } else {
+            $customerPoName = null;
+        }
+
+        if(!$customerPoRecord)
+        {
+            Notification::make()
+                ->title("PO Not Found")
+                ->body("Customer PO '$customerPoName' for Item '$materialCode' not found against Plant '$plantcode'")
+                ->danger()
+                ->duration(5000)
+                ->send();
+
+            $this->form->fill([
+                'process_order' => null,
+                'plant_id' => $plantId,
+                'customer_po_master_id'  => $customerPo,
+                'wire_packing_number' => $wirePackNo,
+                'Sno_quantity' => 0,
+                'created_by'    => $operatorName,
+                'scanned_by'    => $operatorName,
+            ]);
+            return;
+        }
+
+        $alreadyScannedQty = WireMasterPacking::where('customer_po_master_id', $customerPo)
+            ->where('plant_id', $plantId)
+            ->where('item_id', $itemId)
+            ->selectRaw('SUM(CAST(weight AS NUMERIC)) as total_weight')
+            ->value('total_weight');
+
+        $totalQty = (float)$alreadyScannedQty + (float)$weight;
+
+        if($totalQty > (float)$customerPoRecord->quantity)
+        {
+            Notification::make()
+                ->title("Scanned Weight Exceeds PO Quantity")
+                ->body("Scanned weight '$weight' and already scanned weight '$alreadyScannedQty' exceeds allowed quantity '{$customerPoRecord->quantity}' for PO '$customerPoName' and Item '$materialCode'")
+                ->danger()
+                ->duration(5000)
+                ->send();
+
+            $this->form->fill([
+                'process_order' => null,
+                'plant_id' => $plantId,
+                'customer_po_master_id'  => $customerPo,
+                'wire_packing_number' => $wirePackNo,
+                'Sno_quantity' => 0,
+                'created_by'    => $operatorName,
+                'scanned_by'    => $operatorName,
+            ]);
+            return;
+        }
         try
         {
             $existingPallet = WireMasterPacking::where('plant_id', $plantId)
@@ -200,7 +293,7 @@ class CreateWireMasterPacking extends CreateRecord
                 'plant_id'       => $plantId,
                 'item_id'        => $itemId,
                 'wire_packing_number'  => $wirePackNo,
-                'process_order'  => $processOrderId,
+                'process_order'  => $processOrderId . '-' . $coilNo,
                 'customer_po_master_id'    => $customerPo,
                 'weight'         => $weight,
                 'created_by'     => $createdBy,
@@ -590,6 +683,33 @@ class CreateWireMasterPacking extends CreateRecord
             return;
         }
 
+        $pattern = '/^([^|]+)\|([^|]+)\|([^|]+)\|(\d+(\.\d+)?)(kg)?$/i';
+
+        if (!preg_match($pattern, $processOrder, $matches))
+        {
+            Notification::make()
+                ->title("Scan Valid Qr code ")
+                ->body("Expected Format : (MaterialCode|Process Order|Id|Weight)")
+                ->danger()
+                ->duration(5000)
+                ->send();
+
+            $this->form->fill([
+                'process_order' => null,
+                'plant_id' => $plantId,
+                'customer_po_master_id'  => $customerPo,
+                'Sno_quantity' => 0,
+                'created_by'    => $operatorName,
+                'scanned_by'    => $operatorName,
+            ]);
+            return;
+        }
+
+        $materialCode   = $matches[1];
+        $processOrderId = $matches[2];
+        $coilNo =         $matches[3];
+        $weight         = $matches[4];
+
         $count = WireMasterPacking::where('plant_id', $plantId)
         ->where('wire_packing_number', $palletNumber)
         ->count('wire_packing_number');
@@ -618,7 +738,7 @@ class CreateWireMasterPacking extends CreateRecord
 
 
         $processOrderexist = WireMasterPacking::where('plant_id', $plantId)
-        ->where('process_order', $processOrder)
+        ->where('process_order', $processOrderId . '-' . $coilNo)
         ->first();
         if (!$processOrderexist)
         {
@@ -643,7 +763,7 @@ class CreateWireMasterPacking extends CreateRecord
         }
 
         $palletExist = WireMasterPacking::where('plant_id', $plantId)
-        ->where('process_order', $processOrder)
+        ->where('process_order', $processOrderId . '-' . $coilNo)
         ->where('wire_packing_number', '!=', '')
         ->where('wire_packing_number', '!=', null)
         ->first();
@@ -673,7 +793,7 @@ class CreateWireMasterPacking extends CreateRecord
 
         $deleted = WireMasterPacking::where('plant_id', $plantId)
             ->where('wire_packing_number', $palletNumber)
-            ->where('process_order', $processOrder)
+            ->where('process_order', $processOrderId . '-' . $coilNo)
             ->forceDelete();
 
             if ($deleted)

app/Http/Controllers/CharacteristicsController.php

@@ -520,9 +520,9 @@ class CharacteristicsController extends Controller
 
             if (Str::contains($modelHeading, 'PRESSURE BOOSTER SYSTEM', ignoreCase: true)) {
                 $typesToCreate = ['MOTOR', 'PUMP', 'NAME_PLATE'];
-            } elseif (Str::contains($modelHeading, 'PUMPSET', ignoreCase: true)) {
+            } elseif (Str::contains($modelHeading, 'PUMPS', ignoreCase: true) || Str::contains($modelHeading, 'PUMPSET', ignoreCase: true)) {
                 $typesToCreate = ['MOTOR', 'PUMP'];
-            } elseif (Str::contains($modelHeading, 'PUMP', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMP SET', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMPSET', ignoreCase: true)) {
+            } elseif (Str::contains($modelHeading, 'PUMP', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMP SET', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMPSET', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMPS', ignoreCase: true)) {
                 $typesToCreate = ['PUMP'];
             } elseif (Str::contains($modelHeading, 'MOTOR', ignoreCase: true)) {
                 $typesToCreate = ['MOTOR'];
@@ -649,7 +649,7 @@ class CharacteristicsController extends Controller
                     'status_code' => 'ERROR',
                     'status_description' => "Serial number '{$serialNumber}' doesn't have name plate model to proceed!",
                 ], 404);
-            } elseif (Str::contains($curHead, 'PUMP', ignoreCase: true) && ! Str::contains($curHead, 'PUMP SET', ignoreCase: true) && ! Str::contains($curHead, 'PUMPSET', ignoreCase: true)) {
+            } elseif (Str::contains($curHead, 'PUMP', ignoreCase: true) && ! Str::contains($curHead, 'PUMP SET', ignoreCase: true) && ! Str::contains($curHead, 'PUMPSET', ignoreCase: true) && ! Str::contains($curHead, 'PUMPS', ignoreCase: true)) {
                 if ($modelType == 'MOTOR') {
                     return response()->json([
                         'status_code' => 'ERROR',
@@ -673,7 +673,7 @@ class CharacteristicsController extends Controller
                     //         'status_description' => "Serial number '{$serialNumber}' doesn't have pumpset model to proceed!",
                     //     ], 404);
                 }
-            } elseif (! Str::contains($curHead, 'PUMPSET', ignoreCase: true)) {
+            } elseif (! Str::contains($curHead, 'PUMPS', ignoreCase: true) && ! Str::contains($curHead, 'PUMPSET', ignoreCase: true)) {
                 return response()->json([
                     'status_code' => 'ERROR',
                     'status_description' => "Serial number '{$serialNumber}' doesn't have valid model type to proceed!",
@@ -794,6 +794,7 @@ class CharacteristicsController extends Controller
 
                 if ($char['motor_pump_pumpset_status'] == '3') {
                     if ($modelType == 'MOTOR') {
+                        $curMMach = $char['motor_machine_name'] ?? $curMMach;
                         $motPhysiCnt = $motPhysiCnt + 1;
                         $motExpecTim = $motExpecTim + $expectedTime;
                         if ($motPhysiCnt >= $mvhsCnt) {
@@ -801,6 +802,7 @@ class CharacteristicsController extends Controller
                         }
                         $curMotorMarkBy = ($char['motor_marked_by'] == 'jothi') ? 'Admin' : $char['motor_marked_by'] ?? $curMotorMarkBy;
                     } elseif ($modelType == 'PUMP') {
+                        $curPMach = $char['pump_machine_name'] ?? $curPMach;
                         $pumPhysiCnt = $pumPhysiCnt + 1;
                         $pumExpecTim = $pumExpecTim + $expectedTime;
                         if ($pumPhysiCnt >= $mvhsCnt) {
@@ -808,6 +810,7 @@ class CharacteristicsController extends Controller
                         }
                         $curPumpMarkBy = ($char['pump_marked_by'] == 'jothi') ? 'Admin' : $char['pump_marked_by'] ?? $curPumpMarkBy;
                     } elseif ($modelType == 'NAME_PLATE') {
+                        $curNpMach = $char['name_plate_machine_name'] ?? $curNpMach;
                         $napExpecTim = $napExpecTim + $expectedTime;
                         $curNamePlateMarkStat = 'Marked';
                         $curNamePlateMarkBy = ($char['name_plate_marked_by'] == 'jothi') ? 'Admin' : $char['name_plate_marked_by'] ?? $curNamePlateMarkBy;
@@ -840,9 +843,9 @@ class CharacteristicsController extends Controller
                         'name_plate_marked_by' => $curNamePlateMarkBy,
                         'motor_pump_pumpset_status' => '3',
                         'winded_serial_number' => $char['winded_serial_number'] ?? $curWindNo,
-                        'motor_machine_name' => $char['motor_machine_name'] ?? $curMMach,
-                        'pump_machine_name' => $char['pump_machine_name'] ?? $curPMach,
-                        'name_plate_machine_name' => $char['name_plate_machine_name'] ?? $curNpMach,
+                        'motor_machine_name' => $curMMach,
+                        'pump_machine_name' => $curPMach,
+                        'name_plate_machine_name' => $curNpMach,
                         'part_validation_1' => $char['part_validation_1'] ?? $curPart1,
                         'part_validation_2' => $char['part_validation_2'] ?? $curPart2,
                         'samlight_logged_name' => $char['samlight_logged_name'] ?? $slUser,
@@ -874,10 +877,10 @@ class CharacteristicsController extends Controller
                         'name_plate_expected_time' => (string) $napExpecTim,
                         'name_plate_marked_by' => $curNamePlateMarkBy,
                         'motor_pump_pumpset_status' => '3',
-                        // 'winded_serial_number' => $char['winded_serial_number'] ?? $curWindNo,
+                        'winded_serial_number' => $char['winded_serial_number'] ?? $curWindNo,
                         'name_plate_machine_name' => $char['name_plate_machine_name'] ?? $curNpMach,
-                        // 'part_validation_1' => $char['part_validation_1'] ?? $curPart1,
-                        // 'part_validation_2' => $char['part_validation_2'] ?? $curPart2,
+                        'part_validation_1' => $char['part_validation_1'] ?? $curPart1,
+                        'part_validation_2' => $char['part_validation_2'] ?? $curPart2,
                         'samlight_logged_name' => $char['samlight_logged_name'] ?? $slUser,
                         'pending_released_status' => $char['pending_released_status'] ?? 0,
                         'has_work_flow_id' => $char['has_work_flow_id'] ?? $curWorkFlow,
@@ -913,10 +916,10 @@ class CharacteristicsController extends Controller
                         'pump_expected_time' => (string) $pumExpecTim,
                         'pump_marked_by' => $curPumpMarkBy,
                         'motor_pump_pumpset_status' => '3',
-                        // 'winded_serial_number' => $char['winded_serial_number'] ?? $curWindNo,
+                        'winded_serial_number' => $char['winded_serial_number'] ?? $curWindNo,
                         'pump_machine_name' => $char['pump_machine_name'] ?? $curPMach,
-                        // 'part_validation_1' => $char['part_validation_1'] ?? $curPart1,
-                        // 'part_validation_2' => $char['part_validation_2'] ?? $curPart2,
+                        'part_validation_1' => $char['part_validation_1'] ?? $curPart1,
+                        'part_validation_2' => $char['part_validation_2'] ?? $curPart2,
                         'samlight_logged_name' => $char['samlight_logged_name'] ?? $slUser,
                         'pending_released_status' => $char['pending_released_status'] ?? 0,
                         'has_work_flow_id' => $char['has_work_flow_id'] ?? $curWorkFlow,
@@ -964,6 +967,7 @@ class CharacteristicsController extends Controller
                     // $values = array_merge($values1 ?? [], $values2 ?? [], $values3 ?? [], $values4 ?? [], $values5 ?? []);
                 } elseif ($hasMvhs == true) {
                     if ($modelType == 'MOTOR') {
+                        $curMMach = $char['motor_machine_name'] ?? $curMMach;
                         $motPhysiCnt = $motPhysiCnt + 1;
                         $motExpecTim = $motExpecTim + $expectedTime;
                         if ($motPhysiCnt >= $mvhsCnt) {
@@ -971,6 +975,7 @@ class CharacteristicsController extends Controller
                         }
                         $curMotorMarkBy = ($char['motor_marked_by'] == 'jothi') ? 'Admin' : $char['motor_marked_by'] ?? $curMotorMarkBy;
                     } elseif ($modelType == 'PUMP') {
+                        $curPMach = $char['pump_machine_name'] ?? $curPMach;
                         $pumPhysiCnt = $pumPhysiCnt + 1;
                         $pumExpecTim = $pumExpecTim + $expectedTime;
                         if ($pumPhysiCnt >= $mvhsCnt) {
@@ -978,6 +983,7 @@ class CharacteristicsController extends Controller
                         }
                         $curPumpMarkBy = ($char['pump_marked_by'] == 'jothi') ? 'Admin' : $char['pump_marked_by'] ?? $curPumpMarkBy;
                     } elseif ($modelType == 'NAME_PLATE') {
+                        $curNpMach = $char['name_plate_machine_name'] ?? $curNpMach;
                         $napExpecTim = $napExpecTim + $expectedTime;
                         $curNamePlateMarkStat = 'Marked';
                         $curNamePlateMarkBy = ($char['name_plate_marked_by'] == 'jothi') ? 'Admin' : $char['name_plate_marked_by'] ?? $curNamePlateMarkBy;
@@ -1008,9 +1014,9 @@ class CharacteristicsController extends Controller
                         'name_plate_marked_by' => $curNamePlateMarkBy,
                         'motor_pump_pumpset_status' => null,
                         'winded_serial_number' => $char['winded_serial_number'] ?? $curWindNo,
-                        'motor_machine_name' => $char['motor_machine_name'] ?? $curMMach,
-                        'pump_machine_name' => $char['pump_machine_name'] ?? $curPMach,
-                        'name_plate_machine_name' => $char['name_plate_machine_name'] ?? $curNpMach,
+                        'motor_machine_name' => $curMMach,
+                        'pump_machine_name' => $curPMach,
+                        'name_plate_machine_name' => $curNpMach,
                         'part_validation_1' => $char['part_validation_1'] ?? $curPart1,
                         'part_validation_2' => $char['part_validation_2'] ?? $curPart2,
                         'samlight_logged_name' => $char['samlight_logged_name'] ?? $slUser,
@@ -1021,6 +1027,7 @@ class CharacteristicsController extends Controller
                     // $values = array_merge($values1 ?? [], $values2 ?? [], $values3 ?? [], $values4 ?? [], $values5 ?? []);
                 } else {
                     if ($modelType == 'MOTOR') {
+                        $curMMach = $char['motor_machine_name'] ?? $curMMach;
                         $motPhysiCnt = $motPhysiCnt + 1;
                         $motExpecTim = $motExpecTim + $expectedTime;
                         if ($motPhysiCnt >= $mvhsCnt) {
@@ -1028,6 +1035,7 @@ class CharacteristicsController extends Controller
                         }
                         $curMotorMarkBy = ($char['motor_marked_by'] == 'jothi') ? 'Admin' : $char['motor_marked_by'] ?? $curMotorMarkBy;
                     } elseif ($modelType == 'PUMP') {
+                        $curPMach = $char['pump_machine_name'] ?? $curPMach;
                         $pumPhysiCnt = $pumPhysiCnt + 1;
                         $pumExpecTim = $pumExpecTim + $expectedTime;
                         if ($pumPhysiCnt >= $mvhsCnt) {
@@ -1040,7 +1048,7 @@ class CharacteristicsController extends Controller
 
                     if ($curMotorMarkStat == 'Marked' && $curPumpMarkStat == 'Marked') {
                         $curMarkStat = 'Marked';
-                    } elseif (Str::contains($curHead, 'PUMP', ignoreCase: true) && ! Str::contains($curHead, 'PUMP SET', ignoreCase: true) && ! Str::contains($curHead, 'PUMPSET', ignoreCase: true)) {
+                    } elseif (Str::contains($curHead, 'PUMP', ignoreCase: true) && ! Str::contains($curHead, 'PUMP SET', ignoreCase: true) && ! Str::contains($curHead, 'PUMPSET', ignoreCase: true) && ! Str::contains($curHead, 'PUMPS', ignoreCase: true)) {
                         if ($modelType == 'PUMP' && $pumPhysiCnt >= $mvhsCnt) {
                             $curMarkStat = 'Marked';
                         }
@@ -1069,8 +1077,8 @@ class CharacteristicsController extends Controller
                         'name_plate_marked_by' => $curNamePlateMarkBy,
                         'motor_pump_pumpset_status' => null,
                         'winded_serial_number' => $char['winded_serial_number'] ?? $curWindNo,
-                        'motor_machine_name' => $char['motor_machine_name'] ?? $curMMach,
-                        'pump_machine_name' => $char['pump_machine_name'] ?? $curPMach,
+                        'motor_machine_name' => $curMMach,
+                        'pump_machine_name' => $curPMach,
                         'name_plate_machine_name' => $char['name_plate_machine_name'] ?? $curNpMach,
                         'part_validation_1' => $char['part_validation_1'] ?? $curPart1,
                         'part_validation_2' => $char['part_validation_2'] ?? $curPart2,
@@ -1110,6 +1118,14 @@ class CharacteristicsController extends Controller
                     //     ], 404);
                 }
 
+                if ($modelType == 'MOTOR') {
+                    $curMMach = $char['motor_machine_name'] ?? $curMMach;
+                } elseif ($modelType == 'PUMP') {
+                    $curPMach = $char['pump_machine_name'] ?? $curPMach;
+                } elseif ($modelType == 'NAME_PLATE') {
+                    $curNpMach = $char['name_plate_machine_name'] ?? $curNpMach;
+                }
+
                 $manStat = (intval($curStat->man_marked_status ?? 0) ?: 0) + 1;
                 // $manStat = ($curStat->man_marked_status == null || $curStat->man_marked_status == '' || $curStat->man_marked_status == '0') ? 0 : (int) $curStat->man_marked_status;
                 $values = [
@@ -1117,6 +1133,9 @@ class CharacteristicsController extends Controller
                     'man_marked_datetime' => $char['man_marked_datetime'] ?? now(),
                     'man_marked_by' => ($char['man_marked_by'] == 'jothi') ? 'Admin' : $char['man_marked_by'] ?? $curManualMarkBy,
                     'winded_serial_number' => $char['winded_serial_number'] ?? $curWindNo,
+                    'motor_machine_name' => $curMMach,
+                    'pump_machine_name' => $curPMach,
+                    'name_plate_machine_name' => $curNpMach,
                     'part_validation_1' => $char['part_validation_1'] ?? $curPart1,
                     'part_validation_2' => $char['part_validation_2'] ?? $curPart2,
                     'samlight_logged_name' => $char['samlight_logged_name'] ?? $slUser,
@@ -1543,9 +1562,9 @@ class CharacteristicsController extends Controller
 
                 if (Str::contains($modelHeading, 'PRESSURE BOOSTER SYSTEM', ignoreCase: true)) {
                     $typesToCreate = ['MOTOR', 'PUMP', 'NAME_PLATE'];
-                } elseif (Str::contains($modelHeading, 'PUMPSET', ignoreCase: true)) {
+                } elseif (Str::contains($modelHeading, 'PUMPS', ignoreCase: true) || Str::contains($modelHeading, 'PUMPSET', ignoreCase: true)) {
                     $typesToCreate = ['MOTOR', 'PUMP'];
-                } elseif (Str::contains($modelHeading, 'PUMP', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMP SET', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMPSET', ignoreCase: true)) {
+                } elseif (Str::contains($modelHeading, 'PUMP', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMP SET', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMPSET', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMPS', ignoreCase: true)) {
                     $typesToCreate = ['PUMP'];
                 } elseif (Str::contains($modelHeading, 'MOTOR', ignoreCase: true)) {
                     $typesToCreate = ['MOTOR'];
@@ -1922,9 +1941,9 @@ class CharacteristicsController extends Controller
 
             if (Str::contains($modelHeading, 'PRESSURE BOOSTER SYSTEM', ignoreCase: true)) {
                 $typesToCreate = ['MOTOR', 'PUMP', 'NAME_PLATE'];
-            } elseif (Str::contains($modelHeading, 'PUMPSET', ignoreCase: true)) {
+            } elseif (Str::contains($modelHeading, 'PUMPS', ignoreCase: true) || Str::contains($modelHeading, 'PUMPSET', ignoreCase: true)) {
                 $typesToCreate = ['MOTOR', 'PUMP'];
-            } elseif (Str::contains($modelHeading, 'PUMP', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMP SET', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMPSET', ignoreCase: true)) {
+            } elseif (Str::contains($modelHeading, 'PUMP', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMP SET', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMPSET', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMPS', ignoreCase: true)) {
                 $typesToCreate = ['PUMP'];
             } elseif (Str::contains($modelHeading, 'MOTOR', ignoreCase: true)) {
                 $typesToCreate = ['MOTOR'];
@@ -2356,7 +2375,7 @@ class CharacteristicsController extends Controller
                         'status_code' => 'ERROR',
                         'status_description' => "Serial number '{$serialNumber}' doesn't have name plate model to proceed!",
                     ], 404);
-                } elseif (Str::contains($curHead, 'PUMP', ignoreCase: true) && ! Str::contains($curHead, 'PUMP SET', ignoreCase: true) && ! Str::contains($curHead, 'PUMPSET', ignoreCase: true)) {
+                } elseif (Str::contains($curHead, 'PUMP', ignoreCase: true) && ! Str::contains($curHead, 'PUMP SET', ignoreCase: true) && ! Str::contains($curHead, 'PUMPSET', ignoreCase: true) && ! Str::contains($curHead, 'PUMPS', ignoreCase: true)) {
                     if ($modelType == 'MOTOR') {
                         return response()->json([
                             'status_code' => 'ERROR',
@@ -2380,7 +2399,7 @@ class CharacteristicsController extends Controller
                         //         'status_description' => "Serial number '{$serialNumber}' doesn't have pumpset model to proceed!",
                         //     ], 404);
                     }
-                } elseif (! Str::contains($curHead, 'PUMPSET', ignoreCase: true)) {
+                } elseif (! Str::contains($curHead, 'PUMPS', ignoreCase: true) && ! Str::contains($curHead, 'PUMPSET', ignoreCase: true)) {
                     return response()->json([
                         'status_code' => 'ERROR',
                         'status_description' => "Serial number '{$serialNumber}' doesn't have valid model type to proceed!",
@@ -3647,9 +3666,9 @@ class CharacteristicsController extends Controller
 
         if (Str::contains($modelHeading, 'PRESSURE BOOSTER SYSTEM', ignoreCase: true)) {
             $typesToCreate = ['MOTOR', 'PUMP', 'NAME_PLATE'];
-        } elseif (Str::contains($modelHeading, 'PUMPSET', ignoreCase: true)) {
+        } elseif (Str::contains($modelHeading, 'PUMPS', ignoreCase: true) || Str::contains($modelHeading, 'PUMPSET', ignoreCase: true)) {
             $typesToCreate = ['MOTOR', 'PUMP'];
-        } elseif (Str::contains($modelHeading, 'PUMP', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMP SET', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMPSET', ignoreCase: true)) {
+        } elseif (Str::contains($modelHeading, 'PUMP', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMP SET', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMPSET', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMPS', ignoreCase: true)) {
             $typesToCreate = ['PUMP'];
         } elseif (Str::contains($modelHeading, 'MOTOR', ignoreCase: true)) {
             $typesToCreate = ['MOTOR'];
@@ -3780,7 +3799,7 @@ class CharacteristicsController extends Controller
         if (! $cField) {
             return response()->json([
                 'status_code' => 'ERROR',
-                'status_description' => "Master characteristic field value '{$charField}'' not found in approver master!",
+                'status_description' => "Master characteristic field value '{$charField}' not found in approver master!",
             ], 404);
         }
 
@@ -3856,6 +3875,21 @@ class CharacteristicsController extends Controller
                     $query->where('approver_type', 'Characteristic');
                 })->where('machine_id', $machineId)->where('plant_id', $plantId)->get();
 
+            $requestQual = RequestCharacteristic::where('aufnr', $jobNo)->where('item_id', $itemId)->where('model_type', $modelType)
+                ->whereHas('approver', function ($query) {
+                    $query->where('approver_type', 'Quality');
+                })->where('machine_id', $machineId)->where('plant_id', $plantId)->orderBy('id')->get();
+
+            foreach ($requestQual as $row) {
+                $workFlowStatus = ($row->approver_status1 == 'Approved' || $row->approver_status2 == 'Approved' || $row->approver_status3 == 'Approved') ? '0' : '1';
+
+                TempClassCharacteristic::where('aufnr', $jobNo)->where('model_type', $modelType)->where('machine_id', $machineId)->where('plant_id', $plantId)
+                    ->update([
+                        'has_work_flow_id' => $workFlowStatus,
+                        'updated_by' => $userName,
+                    ]);
+            }
+
             $tempClassChars = TempClassCharacteristic::where('aufnr', $jobNo)->where('machine_id', $machineId)->where('plant_id', $plantId)->get();
 
             if (! $requestChars->isEmpty()) {
@@ -3966,6 +4000,21 @@ class CharacteristicsController extends Controller
                     $query->where('approver_type', 'Characteristic');
                 })->where('machine_id', $machineId)->where('plant_id', $plantId)->get();
 
+            $requestQual = RequestCharacteristic::where('aufnr', $jobNo)->where('item_id', $itemId)->where('model_type', $modelType)
+                ->whereHas('approver', function ($query) {
+                    $query->where('approver_type', 'Quality');
+                })->where('machine_id', $machineId)->where('plant_id', $plantId)->orderBy('id')->get();
+
+            foreach ($requestQual as $row) {
+                $workFlowStatus = ($row->approver_status1 == 'Approved' || $row->approver_status2 == 'Approved' || $row->approver_status3 == 'Approved') ? '0' : '1';
+
+                TempClassCharacteristic::where('aufnr', $jobNo)->where('model_type', $modelType)->where('machine_id', $machineId)->where('plant_id', $plantId)
+                    ->update([
+                        'has_work_flow_id' => $workFlowStatus,
+                        'updated_by' => $userName,
+                    ]);
+            }
+
             if (! $requestChars->isEmpty()) {
                 $hasCharPending = false;
 
@@ -4652,9 +4701,9 @@ class CharacteristicsController extends Controller
 
         if (Str::contains($modelHeading, 'PRESSURE BOOSTER SYSTEM', ignoreCase: true)) {
             $typesToCreate = ['MOTOR', 'PUMP', 'NAME_PLATE'];
-        } elseif (Str::contains($modelHeading, 'PUMPSET', ignoreCase: true)) {
+        } elseif (Str::contains($modelHeading, 'PUMPS', ignoreCase: true) || Str::contains($modelHeading, 'PUMPSET', ignoreCase: true)) {
             $typesToCreate = ['MOTOR', 'PUMP'];
-        } elseif (Str::contains($modelHeading, 'PUMP', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMP SET', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMPSET', ignoreCase: true)) {
+        } elseif (Str::contains($modelHeading, 'PUMP', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMP SET', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMPSET', ignoreCase: true) && ! Str::contains($modelHeading, 'PUMPS', ignoreCase: true)) {
             $typesToCreate = ['PUMP'];
         } elseif (Str::contains($modelHeading, 'MOTOR', ignoreCase: true)) {
             $typesToCreate = ['MOTOR'];
@@ -4980,6 +5029,21 @@ class CharacteristicsController extends Controller
                     $query->where('approver_type', 'Characteristic');
                 })->where('machine_id', $machineId)->where('plant_id', $plantId)->get();
 
+            $requestQual = RequestCharacteristic::where('aufnr', $jobNo)->where('item_id', $itemId)->where('model_type', $modelType)
+                ->whereHas('approver', function ($query) {
+                    $query->where('approver_type', 'Quality');
+                })->where('machine_id', $machineId)->where('plant_id', $plantId)->orderBy('id')->get();
+
+            foreach ($requestQual as $row) {
+                $workFlowStatus = ($row->approver_status1 == 'Approved' || $row->approver_status2 == 'Approved' || $row->approver_status3 == 'Approved') ? '0' : '1';
+
+                TempClassCharacteristic::where('aufnr', $jobNo)->where('model_type', $modelType)->where('machine_id', $machineId)->where('plant_id', $plantId)
+                    ->update([
+                        'has_work_flow_id' => $workFlowStatus,
+                        'updated_by' => $userName,
+                    ]);
+            }
+
             $tempClassChars = TempClassCharacteristic::where('aufnr', $jobNo)->where('machine_id', $machineId)->where('plant_id', $plantId)->get();
 
             if (! $requestChars->isEmpty()) {
@@ -5084,6 +5148,21 @@ class CharacteristicsController extends Controller
                     $query->where('approver_type', 'Characteristic');
                 })->where('machine_id', $machineId)->where('plant_id', $plantId)->get();
 
+            $requestQual = RequestCharacteristic::where('aufnr', $jobNo)->where('item_id', $itemId)->where('model_type', $modelType)
+                ->whereHas('approver', function ($query) {
+                    $query->where('approver_type', 'Quality');
+                })->where('machine_id', $machineId)->where('plant_id', $plantId)->orderBy('id')->get();
+
+            foreach ($requestQual as $row) {
+                $workFlowStatus = ($row->approver_status1 == 'Approved' || $row->approver_status2 == 'Approved' || $row->approver_status3 == 'Approved') ? '0' : '1';
+
+                TempClassCharacteristic::where('aufnr', $jobNo)->where('model_type', $modelType)->where('machine_id', $machineId)->where('plant_id', $plantId)
+                    ->update([
+                        'has_work_flow_id' => $workFlowStatus,
+                        'updated_by' => $userName,
+                    ]);
+            }
+
             if (! $requestChars->isEmpty()) {
                 $hasCharPending = false;
 
@@ -5160,12 +5239,20 @@ class CharacteristicsController extends Controller
                         'approver_status_3' => $row->approver_status3 ?? '',
                         'approver_remark_3' => $row->approver_remark3 ?? '',
                         'approved_at_3' => $row->approved3_at ?? '', // ? $row->approved3_at->format('d-m-Y H:i:s') : '',
+                        'mail_status' => ($row->mail_status == 'Sent') ? 'Sent-M1' : (($row->mail_status == 'Sent-Mail2') ? 'Sent-M2' : (($row->mail_status == 'Sent-Mail3') ? 'Sent-M3' : '-')),
+                        'triggered_at' => $row->trigger_at ?? '',
                         'requested_by' => ($row->created_by == 'Admin') ? 'jothi' : $row->created_by ?? '',
                         'requested_at' => $row->created_at ? $row->created_at->format('Y-m-d H:i:s') : '',
                     ];
                 } else {
                     $workFlowStatus = ($row->approver_status1 == 'Approved' || $row->approver_status2 == 'Approved' || $row->approver_status3 == 'Approved') ? '0' : '1';
 
+                    // / TempClassCharacteristic::where('aufnr', $jobNo)->where('model_type', $modelType)->where('machine_id', $machineId)->where('plant_id', $plantId)
+                    // /     ->update([
+                    // /         'has_work_flow_id' => $workFlowStatus,
+                    // /         'updated_by' => $userName,
+                    // /     ]);
+
                     if ($workFlowStatus == '1') {
                         $workFlowStatus = ($row->approver_status1 == 'Rejected' || $row->approver_status2 == 'Rejected' || $row->approver_status3 == 'Rejected') ? '2' : '1';
                     }
@@ -5191,6 +5278,8 @@ class CharacteristicsController extends Controller
                         'approver_status_3' => $row->approver_status3 ?? '',
                         'approver_remark_3' => $row->approver_remark3 ?? '',
                         'approved_at_3' => $row->approved3_at ?? '', // ? $row->approved3_at->format('d-m-Y H:i:s') : '',
+                        'mail_status' => ($row->mail_status == 'Sent') ? 'Sent-M1' : (($row->mail_status == 'Sent-Mail2') ? 'Sent-M2' : (($row->mail_status == 'Sent-Mail3') ? 'Sent-M3' : '-')),
+                        'triggered_at' => $row->trigger_at ?? '',
                         'requested_by' => ($row->created_by == 'Admin') ? 'jothi' : $row->created_by ?? '',
                         'requested_at' => $row->created_at ? $row->created_at->format('Y-m-d H:i:s') : '',
                     ];

app/Http/Controllers/PalletPrintController.php

@@ -107,7 +107,7 @@ class PalletPrintController extends Controller
 
         $index = $completedPallets->search($pallet);
 
-        $currentPalletNo = ($index != false) ? $index + 1 : 0;
+        $currentPalletNo = ($index !== false) ? $index + 1 : 0;
 
         $boxLabel = $currentPalletNo.'/'.$totalBoxes;
 
@@ -143,8 +143,10 @@ class PalletPrintController extends Controller
             'customerName' => $customerName,
             'masterBox' => $boxLabel,
             'items' => $items,
-            'grossWeight' => $grossWeight,
-            'netWeight' => $grossWeight - 3.05,
+            'grossWeight' => $grossWeight + 3.050,
+            'netWeight' => $grossWeight,
+            // 'grossWeight' => $grossWeight,
+            // 'netWeight' => $grossWeight - 3.05,
             'pallet' => $pallet,
         ])->setPaper([0, 0, $widthPt, $heightPt], 'portrait');
 

app/Http/Controllers/VehicleController.php

@@ -41,12 +41,11 @@ class VehicleController extends Controller
 
         if (!ctype_digit((string) $plantCode)) {
             return response()->json([
-                'status'  => 'error',
+                'status'  => 'ERROR',
                 'status_description' => "plant code must be $plantCode a numeric value",
             ], 404);
         }
 
-
         $plantCod = Plant::where('code', $plantCode)->first();
 
         if(!$plantCod){
@@ -58,100 +57,167 @@ class VehicleController extends Controller
 
         $plantId = $plantCod->id;
 
-        $data = $request->all();
+        // $data = $request->all();
 
-        $vehicleNo = $data['vehicle_number'] ?? '';
-        $entryTimeRaw  = $data['entry_time'] ?? '';
-        $exitTimeRaw   = $data['exit_time'] ?? '';
-        $duration = $data['duration'] ?? '';
-        $type = $data['type'] ?? '';
+        $data = $request->json()->all();
 
-        if(!$vehicleNo)
+        $results = [];
+
+        foreach ($data as $item) {
+
+            $uuid = $item['uuid'] ?? '';
+            $vehicleNo = trim($item['vehicle_number'] ?? '');
+            $entryTimeRaw = $item['entry_time'] ?? '';
+            $exitTimeRaw = $item['exit_time'] ?? '';
+            $duration = $item['duration'] ?? '';
+            $type = $item['type'] ?? '';
+
+            if (!$vehicleNo) {
+
+                $results[] = [
+                    'uuid' => $uuid,
+                    'status_code' => 'ERROR',
+                    'status_description' => "Vehicle number can't be empty!"
+                ];
+
+                continue;
+            }
+            elseif (strlen($vehicleNo) < 8) {
+
+                $results[] = [
+                    'uuid' => $uuid,
+                    'status_code' => 'ERROR',
+                    'status_description' => "Vehicle number '$vehicleNo' must be at least 8 characters long"
+                ];
+
+                continue;
+            }
+            elseif (!$entryTimeRaw) {
+
+                $results[] = [
+                    'uuid' => $uuid,
+                    'status_code' => 'ERROR',
+                    'status_description' => "Entry time can't be empty!"
+                ];
+
+                continue;
+            }
+            elseif (!$type) {
+
+                $results[] = [
+                    'uuid' => $uuid,
+                    'status_code' => 'ERROR',
+                    'status_description' => "Type can't be empty!"
+                ];
+
+                continue;
+            }
+            elseif ($entryTimeRaw && !Carbon::hasFormat($entryTimeRaw, 'd/m/Y h:i:s A')) {
+                $results[] = [
+                    'uuid' => $uuid,
+                    'status_code' => 'ERROR',
+                    'status_description' => "Invalid Entry time format $entryTimeRaw. Expected dd/mm/yyyy hh:mm:ss AM/PM"
+                ];
+                continue;
+            }
+            else if ($exitTimeRaw && !Carbon::hasFormat($exitTimeRaw, 'd/m/Y h:i:s A')) {
+
+                $results[] = [
+                    'uuid' => $uuid,
+                    'status_code' => 'ERROR',
+                    'status_description' => "Invalid Exit time format $exitTimeRaw. Expected dd/mm/yyyy hh:mm:ss AM/PM"
+                ];
+                continue;
+            }
+            elseif ($duration && !preg_match('/^\d{2}:\d{2}:\d{2}$/', $duration)) {
+
+                $results[] = [
+                    'uuid' => $uuid,
+                    'status_code' => 'ERROR',
+                    'status_description' => "Invalid duration format $duration"
+                ];
+                continue;
+            }
+        }
+
+        if(!empty($results)){
+            return response()->json($results, 404);
+        }
+
+        foreach ($data as $item) {
+
+            $uuid = $item['uuid'] ?? '';
+            $vehicleNo   = trim($item['vehicle_number'] ?? '');
+            $entryTimeRaw  = $item['entry_time'] ?? '';
+            $exitTimeRaw   = $item['exit_time'] ?? '';
+            $duration = $item['duration'] ?? '';
+            $type = $item['type'] ?? '';
+
+            if(!empty($entryTimeRaw)){
+                $entryTime = $entryTimeRaw
+                ? Carbon::createFromFormat('d/m/Y h:i:s A', $entryTimeRaw)
+                : null;
+            }
+
+            $exitTime = null;
+
+            if(!empty($exitTimeRaw)){
+
+                $exitTime = $exitTimeRaw
+                ? Carbon::createFromFormat('d/m/Y h:i:s A', $exitTimeRaw)
+                : null;
+            }
+
+            if (
+                empty($duration) &&
+                !empty($entryTime) &&
+                !empty($exitTime)
+            ) {
+
+                $totalSeconds = $entryTime->diffInSeconds($exitTime);
+
+                $hours = floor($totalSeconds / 3600);
+                $minutes = floor(($totalSeconds % 3600) / 60);
+                $seconds = $totalSeconds % 60;
+
+                $duration = sprintf(
+                    '%02d:%02d:%02d',
+                    $hours,
+                    $minutes,
+                    $seconds
+                );
+            }
+
+            $record = VehicleEntry::updateOrInsert(
+                [
+                    'plant_id' => $plantId,
+                    'uuid' => $uuid
+                ],
+                [
+                    'vehicle_number' => $vehicleNo,
+                    'entry_time'     => $entryTime,
+                    'exit_time'      => $exitTime ?? null,
+                    'duration'       => $duration ?: null,
+                    'type'           => $type,
+                    'updated_at'     => now(),
+                    'created_at'     => now(),
+                ]
+            );
+        }
+
+        if($record){
+            return response()->json([
+                'status'  => 'SUCCESS',
+                'status_description' => 'Vehicle entry inserted successfully'
+            ], 200);
+        }
+        else
         {
             return response()->json([
                 'status'  => 'ERROR',
-                'status_description' => "Vehicle number cant't be empty!",
+                'status_description' => 'Failed to insert record in the table vehicle entry'
             ], 404);
         }
-        else if (strlen($vehicleNo) < 8) {
-            return response()->json([
-                'status'  => 'ERROR',
-                'status_description' => "vehicle number '$vehicleNo' must be at least 8 characters long",
-            ], 404);
-        }
-        else if(!$entryTimeRaw)
-        {
-            return response()->json([
-                'status'  => 'ERROR',
-                'status_description' => "Entry time cant't be empty!",
-            ], 404);
-        }
-        else if(!$exitTimeRaw)
-        {
-            return response()->json([
-                'status'  => 'ERROR',
-                'status_description' => "Exit time cant't be empty!",
-            ], 404);
-        }
-        else if(!$duration)
-        {
-            return response()->json([
-                'status'  => 'ERROR',
-                'status_description' => "Duration cant't be empty!",
-            ], 404);
-        }
-        else if(!$type)
-        {
-            return response()->json([
-                'status'  => 'ERROR',
-                'status_description' => "type cant't be empty!",
-            ], 404);
-        }
-
-
-        if ($entryTimeRaw && !Carbon::hasFormat($entryTimeRaw, 'd/m/Y h:i:s A')) {
-            return response()->json([
-                'status'  => 'ERROR',
-                'status_description' => "Invalid Entry time format $entryTimeRaw. Expected dd/mm/yyyy hh:mm:ss AM/PM",
-            ], 404);
-        }
-        else if ($exitTimeRaw && !Carbon::hasFormat($exitTimeRaw, 'd/m/Y h:i:s A')) {
-            return response()->json([
-                'status'  => 'ERROR',
-                'status_description' => "Invalid Exit time format $exitTimeRaw. Expected dd/mm/yyyy hh:mm:ss AM/PM",
-            ], 404);
-        }
-        else if ($duration && !preg_match('/^\d{2}:\d{2}:\d{2}$/', $duration)) {
-            return response()->json([
-                'status'  => 'error',
-                'status_description' => "Invalid duration format $duration. Expected HH:MM:SS",
-            ], 404);
-        }
-
-        $entryTime = $entryTimeRaw
-        ? Carbon::createFromFormat('d/m/Y h:i:s A', $entryTimeRaw)
-        : null;
-
-        $exitTime = $exitTimeRaw
-            ? Carbon::createFromFormat('d/m/Y h:i:s A', $exitTimeRaw)
-            : null;
-
-        VehicleEntry::insert([
-            'plant_id'      => $plantId,
-            'vehicle_number' => $vehicleNo,
-            'entry_time'     => $entryTime,
-            'exit_time'      => $exitTime,
-            'duration'       => $duration,
-            'type'           => $type,
-            'created_at'     => now(),
-            'updated_at'     => now(),
-        ]);
-
-        return response()->json([
-            'status'  => 'success',
-            'status_description' => 'Vehicle entry inserted successfully'
-        ], 200);
-
     }
 
     /**

app/Mail/ProductionMail.php

@@ -4,28 +4,42 @@ namespace App\Mail;
 
 use DateTime;
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Mail\Mailable;
 use Illuminate\Mail\Mailables\Content;
 use Illuminate\Mail\Mailables\Envelope;
 use Illuminate\Queue\SerializesModels;
 
+// use App\Exports\ProductionExport;
+// use Illuminate\Mail\Mailables\Attachment;
+// use Maatwebsite\Excel\Facades\Excel;
+
 class ProductionMail extends Mailable
 {
     use Queueable, SerializesModels;
 
     public $tableData;
+
     public $scheduleType;
+    // public $excelData;
+    // public $dates;
 
     /**
      * Create a new message instance.
      */
-    public function __construct($scheduleType,$tableData = [])
+    public function __construct($scheduleType, $tableData = [])
     {
-         $this->scheduleType = $scheduleType;
-         $this->tableData = $tableData ?? [];
+        $this->scheduleType = $scheduleType;
+        $this->tableData = $tableData ?? [];
     }
 
+    // public function __construct($scheduleType,$tableData = [],$excelData = [],$dates = [])
+    // {
+    //     $this->scheduleType = $scheduleType;
+    //     $this->tableData    = $tableData;
+    //     $this->excelData    = $excelData;
+    //     $this->dates        = $dates;
+    // }
+
     /**
      * Get the message envelope.
      */
@@ -52,13 +66,14 @@ class ProductionMail extends Mailable
     //         ],
     //     );
     // }
+
     public function content(): Content
     {
         $greeting = "Dear Sir/Madam,<br><br>Kindly find the attached production report status details for the 'Target Quantity' and 'Production Quantity' count,";
 
         if ($this->scheduleType == 'Daily') {
-            $fromDate = (new DateTime('yesterday 08:00'))->format('d/m/Y H:i') . ':000';
-            $toDate = (new DateTime('today 07:59'))->format('d/m/Y H:i') . ':999';
+            $fromDate = (new DateTime('yesterday 08:00'))->format('d/m/Y H:i').':000';
+            $toDate = (new DateTime('today 07:59'))->format('d/m/Y H:i').':999';
             $reportPeriod = "The following report presents results from: $fromDate to $toDate.";
             $greeting .= $reportPeriod;
         }
@@ -74,22 +89,21 @@ class ProductionMail extends Mailable
         if ($this->scheduleType == 'Live') {
             $now = now();
             $fromMinute = $now->copy()->subMinute()->format('d/m/Y H:i:s');
-            $toMinute   = $now->format('d/m/Y H:i:s');
+            $toMinute = $now->format('d/m/Y H:i:s');
             $greeting .= "The following report presents results from: $fromMinute to $toMinute.";
         }
 
         return new Content(
             view: 'mail.production_report',
             with: [
-                'company' => "CRI Digital Manufacturing Solutions",
+                'company' => 'CRI Digital Manufacturing Solutions',
                 'greeting' => $greeting,
                 'tableData' => $this->tableData,
-                'wishes' => "Thanks & Regards,<br>CRI Digital Manufacturing Solutions"
+                'wishes' => 'Thanks & Regards,<br>CRI Digital Manufacturing Solutions',
             ],
         );
     }
 
-
     /**
      * Get the attachments for the message.
      *
@@ -98,5 +112,19 @@ class ProductionMail extends Mailable
     public function attachments(): array
     {
         return [];
+        // return [
+        //     Attachment::fromData(
+        //         fn () => Excel::raw(
+        //             new ProductionExport(
+        //                 $this->excelData,
+        //                 $this->dates
+        //             ),
+        //             \Maatwebsite\Excel\Excel::XLSX
+        //         ),
+        //         'production_plan_data.xlsx'
+        //     )->withMime(
+        //         'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+        //     ),
+        // ];
     }
 }

app/Models/RequestCharacteristic.php

@@ -34,7 +34,7 @@ class RequestCharacteristic extends Model
         'mail_status',
         'trigger_at',
         'work_flow_id',
-
+        'model_type',
         'created_at',
         'updated_at',
         'created_by',

app/Models/VehicleEntry.php

@@ -17,6 +17,7 @@ class VehicleEntry extends Model
         'exit_time',
         'duration',
         'type',
+        'uuid',
         'created_at',
         'created_by',
         'updated_at',

database/migrations/2026_02_07_175240_alter_data_type_quantity_column_to_invoice_validations.php

@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        DB::statement(<<<SQL
+            ALTER TABLE invoice_validations
+            ALTER COLUMN quantity TYPE NUMERIC(10,3)
+            USING quantity::NUMERIC(10,3);
+        SQL);
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        // Schema::table('invoice_validations', function (Blueprint $table) {
+        //     //
+        // });
+    }
+};

database/migrations/2026_04_08_144900_add_model_type_to_request_characteristics.php

@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        $sql1 = <<<'SQL'
+        ALTER TABLE request_characteristics
+        ADD COLUMN model_type TEXT DEFAULT NULL
+        SQL;
+
+        DB::statement($sql1);
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        // Schema::table('request_characteristics', function (Blueprint $table) {
+        //     //
+        // });
+    }
+};

database/migrations/2026_05_11_155640_add_uuid_to_vehicle_entries.php

@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        $sql1 = <<<'SQL'
+        ALTER TABLE vehicle_entries
+        ADD COLUMN uuid TEXT DEFAULT NULL
+        SQL;
+
+        DB::statement($sql1);
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        // Schema::table('vehicle_entries', function (Blueprint $table) {
+        //     //
+        // });
+    }
+};

database/seeders/AdminSeeder.php

@@ -21,7 +21,7 @@ class AdminSeeder extends Seeder
             // Data to update/create
             [
                 'name' => 'Admin',
-                'password' => Hash::make('jOtHi#9000'),
+                'password' => Hash::make('jOtHi$9000'),
                 'updated_at' => now(),
                 'created_at' => now(),
             ]

database/seeders/PermissionSeeder.php

@@ -210,7 +210,20 @@ class PermissionSeeder extends Seeder
         Permission::updateOrCreate(['name' => 'view import temp class characteristic']);
         Permission::updateOrCreate(['name' => 'view export temp class characteristic']);
 
+        Permission::updateOrCreate(['name' => 'view import production temp']);
+        Permission::updateOrCreate(['name' => 'view export production temp']);
 
+        Permission::updateOrCreate(['name' => 'view import production orders']);
+        Permission::updateOrCreate(['name' => 'view export production orders']);
 
+        Permission::updateOrCreate(['name' => 'view import transit']);
+        Permission::updateOrCreate(['name' => 'view export import transit']);
+
+        Permission::updateOrCreate(['name' => 'view reprint production order']);
+        Permission::updateOrCreate(['name' => 'create osp production sticker reprint page']);
+
+        Permission::updateOrCreate(['name' => 'view print production order button']);
+        Permission::updateOrCreate(['name' => 'view save production order button']);
+        Permission::updateOrCreate(['name' => 'view print panel production order button']);
     }
 }

resources/views/fields/camera-capture.blade.php

@@ -948,84 +948,80 @@ function cameraCapture() {
 
 
         async verifyPhoto() {
-    if (!this.capturedPhoto) {
-        alert("Please capture a photo first!");
-        return;
-    }
+        if (!this.capturedPhoto) {
+            alert("Please capture a photo first!");
+            return;
+        }
 
-    if (!this.isWorkerReady) {
-        alert("OCR worker not ready yet!");
-        return;
-    }
+        if (!this.isWorkerReady) {
+            alert("OCR worker not ready yet!");
+            return;
+        }
 
-    try {
-        const img = new Image();
-        img.src = this.capturedPhoto;
+        try {
+            const img = new Image();
+            img.src = this.capturedPhoto;
 
-        img.onload = async () => {
+            img.onload = async () => {
 
-            // Reuse the same temp canvas (no memory leak)
-            this.tempCanvas.width = img.width;
-            this.tempCanvas.height = img.height;
-            this.tempCtx.drawImage(img, 0, 0);
+                // Reuse the same temp canvas (no memory leak)
+                this.tempCanvas.width = img.width;
+                this.tempCanvas.height = img.height;
+                this.tempCtx.drawImage(img, 0, 0);
 
-            // Worker OCR — much faster
-            const result = await this.ocrWorker.recognize(this.tempCanvas);
+                // Worker OCR — much faster
+                const result = await this.ocrWorker.recognize(this.tempCanvas);
 
-            const detectedText = result.data.text.trim();
-            console.log("Detected Text:", detectedText);
+                const detectedText = result.data.text.trim();
+                console.log("Detected Text:", detectedText);
 
-            // -------------------------------------------------------
-            //   SERIAL EXTRACTION LOGIC — SAME AS YOUR ORIGINAL
-            // -------------------------------------------------------
-            const serialWithLabelRegex = /Serial\s*No[:\-]?\s*([A-Za-z0-9]+)/i;
-            const match = detectedText.match(serialWithLabelRegex);
+                const serialWithLabelRegex = /Serial\s*No[:\-]?\s*([A-Za-z0-9]+)/i;
+                const match = detectedText.match(serialWithLabelRegex);
 
-            if (match && match[1]) {
-                // "Serial No: XXXXX"
-                this.serialNumbers = [match[1].trim()];
-                console.log("Serial with Label:", this.serialNumbers[0]);
-            } else {
-                // Extract first 4 alphanumeric sequences of 4+ chars
-                const generalNums = detectedText.match(/[A-Za-z0-9]{4,}/g) || [];
-                this.serialNumbers = generalNums.slice(0, 4);
+                if (match && match[1]) {
+                    this.serialNumbers = [match[1].trim()];
+                    console.log("Serial with Label:", this.serialNumbers[0]);
+                }
+                else
+                {
+                    const generalNums = detectedText.match(/[A-Za-z0-9]{4,}/g) || [];
+                    this.serialNumbers = generalNums.slice(0, 4);
 
-                if (this.serialNumbers.length === 0) {
-                    alert("No serial numbers detected!");
-                    return;
+                    if (this.serialNumbers.length == 0) {
+                        alert("No serial numbers detected!");
+                        return;
+                    }
+
+                    console.log("Serial Numbers List:", this.serialNumbers);
                 }
 
-                console.log("Serial Numbers List:", this.serialNumbers);
+                // Save into hidden input (your original logic)
+                this.$refs.hiddenInputSerials.value = JSON.stringify(this.serialNumbers);
+
+                alert("Serial numbers:\n" + this.$refs.hiddenInputSerials.value);
+
+                fetch('/save-serials-to-session', {
+                    method: 'POST',
+                    credentials: 'same-origin',
+                    headers: {
+                        'Content-Type': 'application/json',
+                        'X-CSRF-TOKEN': document.querySelector('meta[name="csrf-token"]').content,
+                    },
+                    body: JSON.stringify({
+                        serial_numbers: this.serialNumbers,
+                    }),
+                })
+                .then(response => response.json())
+                .then(data => {
+                    console.log("Session Updated:", data);
+                    alert("✅ Serial numbers saved to session!");
+                });
+            };
+            } catch (err) {
+                console.error("OCR verify error:", err);
+                alert("OCR verify failed:\n" + (err.message || err));
             }
-
-            // Save into hidden input (your original logic)
-            this.$refs.hiddenInputSerials.value = JSON.stringify(this.serialNumbers);
-
-            alert("Serial numbers:\n" + this.$refs.hiddenInputSerials.value);
-
-            fetch('/save-serials-to-session', {
-                method: 'POST',
-                credentials: 'same-origin',
-                headers: {
-                    'Content-Type': 'application/json',
-                    'X-CSRF-TOKEN': document.querySelector('meta[name="csrf-token"]').content,
-                },
-                body: JSON.stringify({
-                    serial_numbers: this.serialNumbers,
-                }),
-            })
-            .then(response => response.json())
-            .then(data => {
-                console.log("Session Updated:", data);
-                alert("✅ Serial numbers saved to session!");
-            });
-        };
-
-    } catch (err) {
-        console.error("OCR verify error:", err);
-        alert("OCR verify failed:\n" + (err.message || err));
-    }
-},
+        },
 
         startDetection() {
             if (this.textDetectionInterval) {

resources/views/filament/pages/production-quantity.blade.php

@@ -101,7 +101,7 @@
         if (!scanInput) return;
 
         scanInput.addEventListener('keydown', function (event) {
-            if (event.key === 'Enter') {
+            if (event.key == 'Enter') {
                 event.preventDefault();
 
                 const value = scanInput.value.trim();

resources/views/livewire/production-check-list.blade.php

@@ -3,7 +3,8 @@
     <div class="bg-white max-h-[80vh] overflow-hidden p-6 rounded-lg shadow-lg pointer-events-auto"
     style="width:30vw !important; max-width:none !important;">
 
-        @if($records && $records->count())
+        {{-- @if($records && $records->count()) --}}
+        @if(!empty($records) && count($records))
             <div style="max-height:250px; overflow-y:auto; border:1px solid #ccc;">
 
             {{-- <table class="min-w-full border"> --}}

resources/views/mail/invoice-in-transit-report.blade.php

@@ -106,7 +106,6 @@
                                 -
                             @endif
                         </td>
-
                         {{-- <td>{{ $row['lr_bl_aw_date'] }}</td> --}}
                         <td>{{ $row['transit_days'] }}</td>
                         <td>{{ $row['status'] }}</td>